diff options
38 files changed, 61 insertions, 53 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 72527f8ee..c89dc4902 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 09/05/25 * Fixed losing skill list after base change. (bugreport:3106) [Inkfish] + * Now we can use 'boss_monster' to summon whatever monsters that need to be radared by Convex Mirror. (bugreport:2653) [Inkfish] 09/05/24 * Taro Card can now break shoes and garment and won't affect dead target. (bugreport:2513) [Inkfish] 09/05/23 diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 6985d3b05..0ffb8e818 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2009/05/25 + * Now use 'boss_monster' to summon the boss monsters so that Convex Mirror can work properly. [Inkfish] 2009/05/17 * Rev. 13782 First round of bug fixes for the Okolnir scripts. (bugreport:3085) [L0ne_W0lf] - Fixed two spawn locations of the key stones in Piamete's room. diff --git a/npc/mobs/dungeons/abbey.txt b/npc/mobs/dungeons/abbey.txt index a0c05c730..837c47d6b 100644 --- a/npc/mobs/dungeons/abbey.txt +++ b/npc/mobs/dungeons/abbey.txt @@ -98,7 +98,7 @@ abbey02,232,76,46,54 monster Zombie Slaughter 1864,30,63000,0,1 abbey02,232,76,46,54 monster Ragged Zombie 1865,10,0,0,1 abbey02,232,76,46,54 monster Flame Skull 1869,3,0,0,1 abbey02,232,76,46,54 monster Necromancer 1870,1,0,0,1 -abbey02,236,78,21,18 monster Fallen Bishop Hibram 1871,1,7200000,600000,1 +abbey02,236,78,21,18 boss_monster Fallen Bishop Hibram 1871,1,7200000,600000,1 abbey02,150,153,142,23 monster Zombie Slaughter 1864,30,122000,0,1 abbey02,150,153,142,23 monster Ragged Zombie 1865,10,0,0,1 abbey02,150,153,142,23 monster Flame Skull 1869,3,0,0,1 @@ -117,7 +117,7 @@ abbey02,232,220,46,58 monster Flame Skull 1869,3,0,0,1 abbey02,232,220,46,58 monster Necromancer 1870,1,0,0,1 // Cursed Abbey Dungeon 3 -abbey03,0,0,0,0 monster Beelzebub 1873,1,43200000,600000,1 +abbey03,0,0,0,0 boss_monster Beelzebub 1873,1,43200000,600000,1 abbey03,120,212,116,24 monster Necromancer 1870,10,0,0,1 abbey03,120,212,116,24 monster Banshee 1867,10,0,0,1 abbey03,120,212,116,24 monster Flame Skull 1869,5,0,0,1 diff --git a/npc/mobs/dungeons/abyss.txt b/npc/mobs/dungeons/abyss.txt index b68213117..d33b81993 100644 --- a/npc/mobs/dungeons/abyss.txt +++ b/npc/mobs/dungeons/abyss.txt @@ -59,4 +59,4 @@ abyss_03,0,0,0,0 monster Ferus 1714,10,300000,0,0 abyss_03,0,0,0,0 monster Ferus 1717,10,300000,0,0 abyss_03,0,0,0,0 monster Dragon Egg 1721,10,1800000,600000,0 abyss_03,0,0,0,0 monster Hydrolancer 1720,3,3000000,2400000,0 -abyss_03,0,0,0,0 monster Detardeurus 1719,1,10800000,600000,0 +abyss_03,0,0,0,0 boss_monster Detardeurus 1719,1,10800000,600000,0 diff --git a/npc/mobs/dungeons/ama_dun.txt b/npc/mobs/dungeons/ama_dun.txt index da5120dff..9918aed86 100644 --- a/npc/mobs/dungeons/ama_dun.txt +++ b/npc/mobs/dungeons/ama_dun.txt @@ -37,6 +37,6 @@ ama_dun03,0,0,0,0 monster Miyabi Doll 1404,1,0,0,0 ama_dun03,0,0,0,0 monster Tengu 1405,40,600000,300000,0 ama_dun03,0,0,0,0 monster Mimic 1191,5,0,0,0 ama_dun03,0,0,0,0 monster The Paper 1375,20,600000,300000,0 -ama_dun03,0,0,0,0 monster Samurai Specter 1492,1,5460000,600000,0 +ama_dun03,0,0,0,0 boss_monster Samurai Specter 1492,1,5460000,600000,0 ama_dun03,0,0,0,0 monster Shinobi 1401,20,5450000,3600000,0 ama_dun03,0,0,0,0 monster Tengu 1405,15,5440000,3600000,0 diff --git a/npc/mobs/dungeons/anthell.txt b/npc/mobs/dungeons/anthell.txt index f1c213631..ea010dd81 100644 --- a/npc/mobs/dungeons/anthell.txt +++ b/npc/mobs/dungeons/anthell.txt @@ -119,4 +119,4 @@ anthell02,0,0,0,0 monster Piere 1160,15,0,0,0 anthell02,0,0,0,0 monster Deniro 1105,15,0,0,0 anthell02,0,0,0,0 monster Vitata 1176,30,0,0,0 anthell02,0,0,0,0 monster Giearth 1121,3,0,0,0 -anthell02,0,0,0,0 monster Maya 1147,1,7200000,600000,1 +anthell02,0,0,0,0 boss_monster Maya 1147,1,7200000,600000,1 diff --git a/npc/mobs/dungeons/ayo_dun.txt b/npc/mobs/dungeons/ayo_dun.txt index 0a6ec54ff..8882c6bff 100644 --- a/npc/mobs/dungeons/ayo_dun.txt +++ b/npc/mobs/dungeons/ayo_dun.txt @@ -28,4 +28,4 @@ ayo_dun01,0,0,0,0 monster Ghoul 1036,30,0,0,0 ayo_dun02,0,0,0,0 monster Tamruan 1584,100,0,0,0 ayo_dun02,0,0,0,0 monster Whisper 1179,20,0,0,0 ayo_dun02,0,0,0,0 monster Kraben 1587,20,0,0,0 -ayo_dun02,150,90,15,30 monster Lady Tanee 1688,1,25200000,600000,0 +ayo_dun02,150,90,15,30 boss_monster Lady Tanee 1688,1,25200000,600000,0 diff --git a/npc/mobs/dungeons/beach_dun.txt b/npc/mobs/dungeons/beach_dun.txt index c14e2655f..23aee0e2e 100644 --- a/npc/mobs/dungeons/beach_dun.txt +++ b/npc/mobs/dungeons/beach_dun.txt @@ -20,7 +20,7 @@ beach_dun,0,0,0,0 monster Medusa 1148,60,0,0,0 beach_dun,0,0,0,0 monster Merman 1264,3,10000,5000,0 beach_dun,0,0,0,0 monster Nereid 1255,20,0,0,0 beach_dun,0,0,0,0 monster Pest 1256,20,0,0,0 -beach_dun,0,0,0,0 monster Tao Gunka 1583,1,18000000,600000,0 +beach_dun,0,0,0,0 boss_monster Tao Gunka 1583,1,18000000,600000,0 //================================================== // beach_dun2 - Ruande, the North Cave diff --git a/npc/mobs/dungeons/ein_dun.txt b/npc/mobs/dungeons/ein_dun.txt index 1f1260c42..315b73e85 100644 --- a/npc/mobs/dungeons/ein_dun.txt +++ b/npc/mobs/dungeons/ein_dun.txt @@ -37,4 +37,4 @@ ein_dun02,0,0,0,0 monster Teddy Bear 1622,10,0,0,0 ein_dun02,155,230,140,55 monster Teddy Bear 1622,20,480000,0,0 ein_dun02,0,0,0,0 monster Old Stove 1617,10,0,0,0 ein_dun02,154,80,134,55 monster Old Stove 1617,20,480000,0,0 -ein_dun02,0,0,0,0 monster RSX-0806 1623,1,7500000,600000,0 +ein_dun02,0,0,0,0 boss_monster RSX-0806 1623,1,7500000,600000,0 diff --git a/npc/mobs/dungeons/gef_dun.txt b/npc/mobs/dungeons/gef_dun.txt index 2d3c269a6..0c4a6203b 100644 --- a/npc/mobs/dungeons/gef_dun.txt +++ b/npc/mobs/dungeons/gef_dun.txt @@ -37,7 +37,7 @@ gef_dun01,0,0,0,0 monster Zombie 1015,25,0,0,0 gef_dun01,0,0,0,0 monster Ghoul 1036,40,0,0,0 gef_dun01,0,0,0,0 monster Jakk 1130,40,300000,100000,0 gef_dun01,234,121,0,0 monster Blue Plant 1079,1,300000,100000,0 -gef_dun01,0,0,0,0 monster Dracula 1389,1,3600000,600000,1 +gef_dun01,0,0,0,0 boss_monster Dracula 1389,1,3600000,600000,1 gef_dun01,0,0,0,0 monster Black Mushroom 1084,5,180000,90000,1 gef_dun01,188,104,10,10 monster White Plant 1082,3,180000,90000,1 gef_dun01,263,115,10,10 monster White Plant 1082,3,180000,90000,1 @@ -53,7 +53,7 @@ gef_dun02,0,0,0,0 monster Hunter Fly 1035,10,0,0,0 gef_dun02,0,0,0,0 monster Marionette 1143,20,0,0,0 gef_dun02,0,0,0,0 monster Deviruchi 1109,35,0,0,0 gef_dun02,0,0,0,0 monster Nightmare 1061,40,60000,0,0 -gef_dun02,0,0,0,0 monster Doppelganger 1046,1,7200000,600000,1 +gef_dun02,0,0,0,0 boss_monster Doppelganger 1046,1,7200000,600000,1 gef_dun02,214,212,10,10 monster White Plant 1082,3,180000,90000,1 gef_dun02,215,67,10,10 monster White Plant 1082,3,180000,90000,1 gef_dun02,72,210,20,20 monster White Plant 1082,3,180000,90000,1 diff --git a/npc/mobs/dungeons/glastheim.txt b/npc/mobs/dungeons/glastheim.txt index bdd7fb3d5..d22a58f4c 100644 --- a/npc/mobs/dungeons/glastheim.txt +++ b/npc/mobs/dungeons/glastheim.txt @@ -134,7 +134,7 @@ gl_chyard,0,0,0,0 monster Wraith 1192,45,0,0,0 gl_chyard,0,0,0,0 monster Evil Druid 1117,10,0,0,0 gl_chyard,0,0,0,0 monster Hunter Fly 1035,3,0,0,0 gl_chyard,0,0,0,0 monster Mimic 1191,3,0,0,0 -gl_chyard,0,0,0,0 monster Dark Lord 1272,1,3600000,600000,1 +gl_chyard,0,0,0,0 boss_monster Dark Lord 1272,1,3600000,600000,1 //================================================== // gl_sew01 - Glast Heim Culvert F1 diff --git a/npc/mobs/dungeons/gld_dun.txt b/npc/mobs/dungeons/gld_dun.txt index 658239568..f0ab5e20d 100644 --- a/npc/mobs/dungeons/gld_dun.txt +++ b/npc/mobs/dungeons/gld_dun.txt @@ -17,7 +17,7 @@ gld_dun01,0,0,0,0 monster Skeleton General 1290,10,0,0,0 gld_dun01,0,0,0,0 monster Am Mut 1301,20,0,0,0 gld_dun01,0,0,0,0 monster Cat o' Nine Tails 1307,3,1200000,0,0 gld_dun01,0,0,0,0 monster Gajomart 1309,10,0,0,0 -gld_dun01,0,0,0,0 monster Eddga 1115,1,28800000,7200000,1 +gld_dun01,0,0,0,0 boss_monster Eddga 1115,1,28800000,7200000,1 gld_dun01,0,0,0,0 monster Vagabond Wolf 1092,1,14400000,7200000,1 //================================================== @@ -28,7 +28,7 @@ gld_dun02,0,0,0,0 monster Giant Spider 1304,10,240000,120000,0 gld_dun02,0,0,0,0 monster Ancient Worm 1305,5,120000,60000,0 gld_dun02,0,0,0,0 monster Killer Mantis 1294,5,120000,60000,0 gld_dun02,0,0,0,0 monster Giant Hornet 1303,10,120000,60000,0 -gld_dun02,0,0,0,0 monster Doppelganger 1046,1,28800000,7200000,1 +gld_dun02,0,0,0,0 boss_monster Doppelganger 1046,1,28800000,7200000,1 //================================================== // gld_dun03 - Valkyrie Guild Dungeon @@ -38,7 +38,7 @@ gld_dun03,0,0,0,0 monster Caterpillar 1300,20,0,0,0 gld_dun03,0,0,0,0 monster Gullinbursti 1311,10,0,0,0 gld_dun03,0,0,0,0 monster Creamy Fear 1293,20,0,0,0 gld_dun03,0,0,0,0 monster Leib Olmai 1306,20,0,0,0 -gld_dun03,0,0,0,0 monster Maya 1147,1,28800000,7200000,1 +gld_dun03,0,0,0,0 boss_monster Maya 1147,1,28800000,7200000,1 //================================================== // gld_dun04 - Britoniah Guild Dungeon @@ -47,5 +47,5 @@ gld_dun04,0,0,0,0 monster Wraith Dead 1291,20,0,0,0 gld_dun04,0,0,0,0 monster Mini Demon 1292,20,0,0,0 gld_dun04,0,0,0,0 monster Zombie Master 1298,20,0,0,0 gld_dun04,0,0,0,0 monster Dark Illusion 1302,1,1200000,0,0 -gld_dun04,0,0,0,0 monster Dark Lord 1272,1,28800000,7200000,1 +gld_dun04,0,0,0,0 boss_monster Dark Lord 1272,1,28800000,7200000,1 gld_dun04,0,0,0,0 monster Ghostring 1120,1,14400000,7200000,1 diff --git a/npc/mobs/dungeons/gon_dun.txt b/npc/mobs/dungeons/gon_dun.txt index b44959886..c6755bc1d 100644 --- a/npc/mobs/dungeons/gon_dun.txt +++ b/npc/mobs/dungeons/gon_dun.txt @@ -41,4 +41,4 @@ gon_dun03,0,0,0,0 monster White Plant 1082,10,0,0,0 gon_dun03,0,0,0,0 monster Hermit Plant 1413,20,600000,300000,0 gon_dun03,0,0,0,0 monster Evil Nymph 1416,50,600000,300000,0 gon_dun03,0,0,0,0 monster Taoist Hermit 1412,30,0,0,0 -gon_dun03,0,0,0,0 monster Evil Snake Lord 1418,1,5650000,600000,0 +gon_dun03,0,0,0,0 boss_monster Evil Snake Lord 1418,1,5650000,600000,0 diff --git a/npc/mobs/dungeons/in_sphinx.txt b/npc/mobs/dungeons/in_sphinx.txt index fe64d381c..93d3194ee 100644 --- a/npc/mobs/dungeons/in_sphinx.txt +++ b/npc/mobs/dungeons/in_sphinx.txt @@ -53,4 +53,4 @@ in_sphinx5,0,0,0,0 monster Matyr 1146,10,0,0,0 in_sphinx5,0,0,0,0 monster Side Winder 1037,20,0,0,0 in_sphinx5,0,0,0,0 monster Anubis 1098,10,0,0,0 in_sphinx5,0,0,0,0 monster Mimic 1191,7,600000,300000,1 -in_sphinx5,0,0,0,0 monster Pharaoh 1157,1,3600000,600000,1 +in_sphinx5,0,0,0,0 boss_monster Pharaoh 1157,1,3600000,600000,1 diff --git a/npc/mobs/dungeons/juperos.txt b/npc/mobs/dungeons/juperos.txt index 98f89919f..8537d2e7e 100644 --- a/npc/mobs/dungeons/juperos.txt +++ b/npc/mobs/dungeons/juperos.txt @@ -57,4 +57,4 @@ jupe_core,0,0,0,0 monster Dimik 1671,40,0,0,1 jupe_core,0,0,0,0 monster Dimik 1672,40,0,0,1 jupe_core,0,0,0,0 monster Dimik 1673,40,0,0,1 jupe_core,0,0,0,0 monster Archdam 1668,40,0,0,1 -jupe_core,0,0,0,0 monster Vesper 1685,1,7200000,600000,1 +jupe_core,0,0,0,0 boss_monster Vesper 1685,1,7200000,600000,1 diff --git a/npc/mobs/dungeons/kh_dun.txt b/npc/mobs/dungeons/kh_dun.txt index 9976c61ea..28f324375 100644 --- a/npc/mobs/dungeons/kh_dun.txt +++ b/npc/mobs/dungeons/kh_dun.txt @@ -59,4 +59,4 @@ kh_dun02,0,0,0,0 monster Alicel 1735,30,0,0,0 kh_dun02,0,0,0,0 monster Aliza 1737,10,0,0,0 kh_dun02,0,0,0,0 monster Constant 1738,15,1800000,1200000,0 kh_dun02,0,0,0,0 monster Constant 1745,5,0,0,0 -kh_dun02,0,0,0,0 monster Kiel D-01 1734,1,7200000,3600000,0 +kh_dun02,0,0,0,0 boss_monster Kiel D-01 1734,1,7200000,3600000,0 diff --git a/npc/mobs/dungeons/lou_dun.txt b/npc/mobs/dungeons/lou_dun.txt index 9755a5731..0adb7dfdf 100644 --- a/npc/mobs/dungeons/lou_dun.txt +++ b/npc/mobs/dungeons/lou_dun.txt @@ -40,4 +40,4 @@ lou_dun03,0,0,0,0 monster Yao Jun 1512,25,120000,60000,0 lou_dun03,0,0,0,0 monster Zhu Po Long 1514,25,120000,60000,0 lou_dun03,0,0,0,0 monster Mao Guai 1513,15,0,0,0 lou_dun03,0,0,0,0 monster Green Maiden 1631,5,3000000,1800000,1 -lou_dun03,0,0,0,0 monster White Lady 1630,1,7000000,600000,1 +lou_dun03,0,0,0,0 boss_monster White Lady 1630,1,7000000,600000,1 diff --git a/npc/mobs/dungeons/moc_pryd.txt b/npc/mobs/dungeons/moc_pryd.txt index 5605a452a..e0ff59747 100644 --- a/npc/mobs/dungeons/moc_pryd.txt +++ b/npc/mobs/dungeons/moc_pryd.txt @@ -44,7 +44,7 @@ moc_pryd04,0,0,0,0 monster Mummy 1041,25,0,0,0 moc_pryd04,0,0,0,0 monster Ancient Mummy 1297,3,0,0,0 moc_pryd04,0,0,0,0 monster Isis 1029,50,150000,75000,0 moc_pryd04,0,0,0,0 monster Mimic 1191,15,600000,300000,1 -moc_pryd04,0,0,0,0 monster Osiris 1038,1,3600000,600000,0 +moc_pryd04,0,0,0,0 boss_monster Osiris 1038,1,3600000,600000,0 moc_pryd04,0,0,0,0 monster Matyr 1146,20,0,0,0 //================================================== @@ -61,4 +61,4 @@ moc_pryd06,0,0,0,0 monster Verit 1032,10,0,0,0 moc_pryd06,0,0,0,0 monster Arclouze 1194,20,0,0,0 moc_pryd06,100,90,80,50 monster Ancient Mummy 1297,20,0,0,0 moc_pryd06,100,90,80,50 monster Mimic 1191,20,0,0,0 -moc_pryd06,102,85,1,1 monster Amon Ra 1511,1,3600000,600000,0 +moc_pryd06,102,85,1,1 boss_monster Amon Ra 1511,1,3600000,600000,0 diff --git a/npc/mobs/dungeons/mosk_dun.txt b/npc/mobs/dungeons/mosk_dun.txt index 7918a6793..a4087bc7e 100644 --- a/npc/mobs/dungeons/mosk_dun.txt +++ b/npc/mobs/dungeons/mosk_dun.txt @@ -46,4 +46,4 @@ mosk_dun03,0,0,0,0 monster Mavka 1884,15,20000,10000,1 mosk_dun03,0,0,0,0 monster Yellow Plant 1081,10,0,0,0 mosk_dun03,0,0,0,0 monster White Plant 1082,10,0,0,0 mosk_dun03,0,0,0,0 monster Shining Plant 1083,5,10000,0,0 -mosk_dun03,207,221,5,5 monster Gopinich 1885,1,7200000,600000,1 +mosk_dun03,207,221,5,5 boss_monster Gopinich 1885,1,7200000,600000,1 diff --git a/npc/mobs/dungeons/odin.txt b/npc/mobs/dungeons/odin.txt index 21d5d921b..835d8a1ad 100644 --- a/npc/mobs/dungeons/odin.txt +++ b/npc/mobs/dungeons/odin.txt @@ -40,7 +40,7 @@ odin_tem02,172,292,3,3 monster Skogul 1761,1,30000,15000,0 odin_tem02,182,263,3,3 monster Frus 1762,1,30000,15000,0 odin_tem02,190,236,3,3 monster Skogul 1761,1,30000,15000,0 odin_tem02,205,198,3,3 monster Frus 1762,1,30000,15000,0 -odin_tem02,0,0,0,0 monster Valkyrie 1765,1,5400000,1800000,0 +odin_tem02,0,0,0,0 boss_monster Valkyrie 1765,1,5400000,1800000,0 odin_tem02,0,0,0,0 monster Blue Plant 1079,10,1800000,900000,1 //================================================== @@ -62,6 +62,6 @@ odin_tem03,205,240,3,3 monster Frus 1762,1,30000,15000,0 odin_tem03,238,265,3,3 monster Skogul 1761,1,30000,15000,0 odin_tem03,256,271,3,3 monster Frus 1762,1,30000,15000,0 odin_tem03,0,0,0,0 monster Valkyrie 1765,2,1800000,1200000,0 -odin_tem03,0,0,0,0 monster Valkyrie Randgris 1751,1,28800000,600000,1 +odin_tem03,0,0,0,0 boss_monster Valkyrie Randgris 1751,1,28800000,600000,1 odin_tem03,0,0,0,0 monster Blue Plant 1079,15,1800000,900000,1 odin_tem03,0,0,0,0 monster Shining Plant 1083,15,1800000,900000,1 diff --git a/npc/mobs/dungeons/pay_dun.txt b/npc/mobs/dungeons/pay_dun.txt index 103995700..0d9889ff7 100644 --- a/npc/mobs/dungeons/pay_dun.txt +++ b/npc/mobs/dungeons/pay_dun.txt @@ -147,7 +147,7 @@ pay_dun03,52,262,10,4 monster White Plant 1082,2,180000,90000,1 //================================================== pay_dun04,0,0,0,0 monster Dokebi 1110,40,0,0,0 pay_dun04,0,0,0,0 monster Horong 1129,30,0,0,0 -pay_dun04,120,115,0,0 monster Moonlight Flower 1150,1,3600000,600000,1 +pay_dun04,120,115,0,0 boss_monster Moonlight Flower 1150,1,3600000,600000,1 pay_dun04,0,0,0,0 monster Greatest General 1277,15,0,0,0 pay_dun04,0,0,0,0 monster Archer Skeleton 1016,15,0,0,0 pay_dun04,0,0,0,0 monster Nine Tail 1180,30,60000,30000,0 diff --git a/npc/mobs/dungeons/prt_maze.txt b/npc/mobs/dungeons/prt_maze.txt index 5a83a7f9a..7d9263706 100644 --- a/npc/mobs/dungeons/prt_maze.txt +++ b/npc/mobs/dungeons/prt_maze.txt @@ -85,7 +85,7 @@ prt_maze03,170,170,70,70 monster Mantis 1139,30,60000,30000,0 prt_maze03,170,170,70,70 monster Eclipse 1093,1,1920000,150000,1 prt_maze03,23,23,70,70 monster Mastering 1090,1,1920000,150000,1 prt_maze03,100,100,80,80 monster Baphomet Jr. 1101,25,0,0,0 -prt_maze03,0,0,0,0 monster Baphomet 1039,1,7200000,600000,1 +prt_maze03,0,0,0,0 boss_monster Baphomet 1039,1,7200000,600000,1 prt_maze03,61,98,10,10 monster Shining Plant 1083,1,1800000,900000,1 prt_maze03,61,98,10,10 monster Blue Plant 1079,1,1800000,900000,1 prt_maze03,61,98,10,10 monster Yellow Plant 1081,1,1800000,900000,1 diff --git a/npc/mobs/dungeons/prt_sew.txt b/npc/mobs/dungeons/prt_sew.txt index 1f8079807..233d2ef1e 100644 --- a/npc/mobs/dungeons/prt_sew.txt +++ b/npc/mobs/dungeons/prt_sew.txt @@ -50,4 +50,4 @@ prt_sewb4,0,0,0,0 monster Thief Bug Female 1053,20,0,0,0 prt_sewb4,0,0,0,0 monster Thief Bug Male 1054,70,0,0,0 prt_sewb4,0,0,0,0 monster Drainliar 1111,20,0,0,0 prt_sewb4,0,0,0,0 monster Cramp 1209,5,0,0,0 -prt_sewb4,0,0,0,0 monster Golden Thief Bug 1086,1,3600000,600000,1 +prt_sewb4,0,0,0,0 boss_monster Golden Thief Bug 1086,1,3600000,600000,1 diff --git a/npc/mobs/dungeons/ra_san.txt b/npc/mobs/dungeons/ra_san.txt index 1c5a74d76..f0e090907 100644 --- a/npc/mobs/dungeons/ra_san.txt +++ b/npc/mobs/dungeons/ra_san.txt @@ -79,4 +79,4 @@ ra_san05,0,0,0,0 monster Seeker 1774,20,0,0,0 ra_san05,0,0,0,0 monster Hodremlin 1773,20,0,0,0 ra_san05,0,0,0,0 monster Agav 1769,10,18000000,14400000,0 ra_san05,0,0,0,0 monster Echio 1770,10,18000000,14400000,0 -ra_san05,0,0,0,0 monster Gloom Under Night 1768,1,18000000,600000,0 +ra_san05,0,0,0,0 boss_monster Gloom Under Night 1768,1,18000000,600000,0 diff --git a/npc/mobs/dungeons/thor_v.txt b/npc/mobs/dungeons/thor_v.txt index d2ad08642..470d6dda4 100644 --- a/npc/mobs/dungeons/thor_v.txt +++ b/npc/mobs/dungeons/thor_v.txt @@ -65,4 +65,4 @@ thor_v03,0,0,0,0 monster Sword Master 1829,5,1800000,0,0 thor_v03,0,0,0,0 monster Bow Master 1830,5,0,0,0 thor_v03,0,0,0,0 monster Bow Master 1830,5,1800000,0,0 thor_v03,0,0,0,0 monster Byorgue 1839,5,1800000,0,0 -thor_v03,0,0,0,0 monster Ifrit 1832,1,39600000,600000,0 +thor_v03,0,0,0,0 boss_monster Ifrit 1832,1,39600000,600000,0 diff --git a/npc/mobs/dungeons/treasure.txt b/npc/mobs/dungeons/treasure.txt index 16f16ca3a..63d69657c 100644 --- a/npc/mobs/dungeons/treasure.txt +++ b/npc/mobs/dungeons/treasure.txt @@ -136,7 +136,7 @@ treasure02,101,143,0,0 monster Hydra 1068,1,300000,100000,1 treasure02,102,143,0,0 monster Hydra 1068,1,300000,100000,1 treasure02,103,143,0,0 monster Hydra 1068,1,300000,100000,1 treasure02,101,150,15,10 monster Whisper 1179,2,200000,100000,1 -treasure02,101,151,8,8 monster Drake 1112,1,7200000,600000,1 +treasure02,101,151,8,8 boss_monster Drake 1112,1,7200000,600000,1 treasure02,101,151,10,10 monster Mimic 1191,3,500000,200000,1 treasure02,101,151,10,10 monster Mimic 1191,2,100000,100000,1 treasure02,101,151,10,10 monster Penomena 1216,4,100000,100000,1 diff --git a/npc/mobs/fields/geffen.txt b/npc/mobs/fields/geffen.txt index 865cc0bf1..e08ad551a 100644 --- a/npc/mobs/fields/geffen.txt +++ b/npc/mobs/fields/geffen.txt @@ -41,7 +41,7 @@ gef_fild02,0,0,0,0 monster Orc Warrior 1023,60,0,0,0 gef_fild02,0,0,0,0 monster Coco 1104,10,0,0,0 gef_fild02,0,0,0,0 monster Smokie 1056,10,0,0,0 gef_fild02,0,0,0,0 monster Choco 1214,1,0,0,0 -gef_fild02,0,0,0,0 monster Orc Hero 1087,1,86400000,600000,1 +gef_fild02,0,0,0,0 boss_monster Orc Hero 1087,1,86400000,600000,1 gef_fild02,227,316,6,6 monster Green Plant 1080,8,360000,180000,1 gef_fild02,87,48,6,6 monster Red Mushroom 1085,5,360000,180000,1 gef_fild02,215,209,2,1 monster Blue Plant 1079,2,360000,180000,1 @@ -174,7 +174,7 @@ gef_fild09,277,201,5,5 monster Blue Plant 1079,3,900000,450000,1 //================================================== // gef_fild10 - Geffen Field //================================================== -gef_fild10,0,0,0,0 monster Orc Lord 1190,1,7200000,600000,0 +gef_fild10,0,0,0,0 boss_monster Orc Lord 1190,1,7200000,600000,0 gef_fild10,0,0,0,0 monster Orc Warrior 1023,20,0,0,0 gef_fild10,0,0,0,0 monster Orc Lady 1273,70,0,0,0 gef_fild10,0,0,0,0 monster Poporing 1031,15,0,0,0 @@ -224,7 +224,7 @@ gef_fild13,0,0,0,0 monster Ambernite 1094,30,0,0,0 // gef_fild14 - West Orc Village //================================================== gef_fild14,0,0,0,0 monster Orc Lady 1273,20,0,0,0 -gef_fild14,0,0,0,0 monster Orc Hero 1087,1,3600000,600000,1 +gef_fild14,0,0,0,0 boss_monster Orc Hero 1087,1,3600000,600000,1 gef_fild14,0,0,0,0 monster Orc Warrior 1023,10,0,0,0 gef_fild14,0,0,0,0 monster Orc Archer 1189,30,0,0,0 gef_fild14,0,0,0,0 monster High Orc 1213,70,0,0,0 diff --git a/npc/mobs/fields/lutie.txt b/npc/mobs/fields/lutie.txt index 40d3566af..21905b9a3 100644 --- a/npc/mobs/fields/lutie.txt +++ b/npc/mobs/fields/lutie.txt @@ -18,4 +18,4 @@ xmas_fild01,0,0,0,0 monster Marin 1242,35,0,0,0 xmas_fild01,0,0,0,0 monster Sasquatch 1243,20,0,0,0 xmas_fild01,0,0,0,0 monster Garm Baby 1515,1,1800000,0,0 -xmas_fild01,0,0,0,0 monster Garm 1252,1,7200000,600000,1 +xmas_fild01,0,0,0,0 boss_monster Garm 1252,1,7200000,600000,1 diff --git a/npc/mobs/fields/mjolnir.txt b/npc/mobs/fields/mjolnir.txt index 38caa125e..0d66d9ffc 100644 --- a/npc/mobs/fields/mjolnir.txt +++ b/npc/mobs/fields/mjolnir.txt @@ -100,7 +100,7 @@ mjolnir_04,0,0,0,0 monster Hornet 1004,70,0,0,0 mjolnir_04,0,0,0,0 monster Poporing 1031,10,0,0,0 mjolnir_04,0,0,0,0 monster Flora 1118,30,0,0,0 mjolnir_04,0,0,0,0 monster Argiope 1099,20,0,0,0 -mjolnir_04,0,0,0,0 monster Mistress 1059,1,7200000,600000,1 +mjolnir_04,0,0,0,0 boss_monster Mistress 1059,1,7200000,600000,1 mjolnir_04,200,200,30,30 monster Shining Plant 1083,3,1800000,900000,1 mjolnir_04,177,34,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_04,122,28,0,0 monster Green Plant 1080,1,180000,90000,1 diff --git a/npc/mobs/fields/morocc.txt b/npc/mobs/fields/morocc.txt index b1b0c2f8a..194095144 100644 --- a/npc/mobs/fields/morocc.txt +++ b/npc/mobs/fields/morocc.txt @@ -259,7 +259,7 @@ moc_fild17,0,0,0,0 monster Magnolia 1138,15,0,0,0 moc_fild17,0,0,0,0 monster Frilldora 1119,25,0,0,0 moc_fild17,0,0,0,0 monster Ant Egg 1097,10,0,0,0 moc_fild17,0,0,0,0 monster Scorpion 1001,5,0,0,0 -moc_fild17,0,0,0,0 monster Phreeoni 1159,1,7200000,600000,1 +moc_fild17,0,0,0,0 boss_monster Phreeoni 1159,1,7200000,600000,1 moc_fild17,40,258,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild17,144,151,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild17,243,138,0,0 monster Yellow Plant 1081,1,180000,90000,1 diff --git a/npc/mobs/fields/payon.txt b/npc/mobs/fields/payon.txt index 65beabb24..9da81082c 100644 --- a/npc/mobs/fields/payon.txt +++ b/npc/mobs/fields/payon.txt @@ -142,6 +142,6 @@ pay_fild10,66,332,10,10 monster Blue Plant 1079,1,360000,180000,1 pay_fild11,0,0,0,0 monster Greatest General 1277,30,0,0,0 pay_fild11,0,0,0,0 monster Nine Tail 1180,60,180000,0,0 pay_fild11,0,0,0,0 monster Dragon Tail 1321,50,180000,0,0 -pay_fild11,0,0,0,0 monster Eddga 1115,1,7200000,600000,1 +pay_fild11,0,0,0,0 boss_monster Eddga 1115,1,7200000,600000,1 pay_fild11,241,162,5,5 monster Red Mushroom 1085,3,360000,180000,1 pay_fild11,66,293,5,5 monster Red Mushroom 1085,3,360000,180000,1 diff --git a/npc/mobs/fields/rachel.txt b/npc/mobs/fields/rachel.txt index efa677118..84581ccf8 100644 --- a/npc/mobs/fields/rachel.txt +++ b/npc/mobs/fields/rachel.txt @@ -28,7 +28,7 @@ ra_fild01,0,0,0,0 monster Gryphon 1259,3,3600000,0,1 ra_fild02,0,0,0,0 monster Muscipular 1780,60,0,0,0 ra_fild02,0,0,0,0 monster Drosera 1781,20,0,0,0 ra_fild02,0,0,0,0 monster Galion 1783,15,0,0,0 -ra_fild02,0,0,0,0 monster Atroce 1785,1,14400000,600000,1 +ra_fild02,0,0,0,0 boss_monster Atroce 1785,1,14400000,600000,1 //================================================== // ra_fild03 - Rachel Field @@ -37,7 +37,7 @@ ra_fild03,0,0,0,0 monster Galion 1783,35,0,0,0 ra_fild03,0,0,0,0 monster Drosera 1781,10,0,0,1 ra_fild03,0,0,0,0 monster Roween 1782,10,0,0,0 ra_fild03,0,0,0,0 monster Stapo 1784,10,0,0,0 -ra_fild03,0,0,0,0 monster Atroce 1785,1,10800000,600000,1 +ra_fild03,0,0,0,0 boss_monster Atroce 1785,1,10800000,600000,1 //================================================== // ra_fild04 - Rachel Field @@ -46,7 +46,7 @@ ra_fild04,0,0,0,0 monster Roween 1782,60,0,0,0 ra_fild04,0,0,0,0 monster Stapo 1784,20,0,0,0 ra_fild04,0,0,0,0 monster Wild Rose 1261,10,0,0,0 ra_fild04,0,0,0,0 monster Galion 1783,3,0,0,0 -ra_fild04,0,0,0,0 monster Atroce 1785,1,18000000,600000,1 +ra_fild04,0,0,0,0 boss_monster Atroce 1785,1,18000000,600000,1 //================================================== // ra_fild05 - Rachel Field diff --git a/npc/mobs/fields/veins.txt b/npc/mobs/fields/veins.txt index 87d7d9eee..7d83e3b58 100644 --- a/npc/mobs/fields/veins.txt +++ b/npc/mobs/fields/veins.txt @@ -21,7 +21,7 @@ ve_fild01,0,0,0,0 monster Drops 1113,10,0,0,0 ve_fild01,0,0,0,0 monster Stapo 1784,20,0,0,0 ve_fild01,0,0,0,0 monster Muka 1055,70,0,0,0 ve_fild01,0,0,0,0 monster Side Winder 1037,10,0,0,0 -ve_fild01,0,0,0,0 monster Atroce 1785,1,10800000,0,0 +ve_fild01,0,0,0,0 boss_monster Atroce 1785,1,10800000,0,0 ve_fild01,0,0,0,0 monster Red Plant 1078,10,0,0,0 ve_fild01,0,0,0,0 monster Yellow Plant 1081,10,0,0,0 ve_fild01,270,80,20,7 monster Blue Plant 1079,4,840000,0,0 @@ -35,7 +35,7 @@ ve_fild02,65,220,14,14 monster Roween 1782,2,660000,0,0 ve_fild02,220,215,135,180 monster Roween 1782,18,0,0,0 ve_fild02,65,220,14,14 monster Side Winder 1037,1,900000,0,0 ve_fild02,220,215,135,180 monster Side Winder 1037,4,0,0,0 -ve_fild02,120,55,50,50 monster Atroce 1785,1,21600000,0,0 +ve_fild02,120,55,50,50 boss_monster Atroce 1785,1,21600000,0,0 ve_fild02,0,0,0,0 monster Red Plant 1078,10,0,0,0 ve_fild02,0,0,0,0 monster Yellow Plant 1081,10,0,0,0 diff --git a/src/map/map.c b/src/map/map.c index 7cad8961b..acf203615 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -476,7 +476,7 @@ int map_count_oncell(int m, int x, int y, int type) return count; } /* - * E̸ĪE˫ëȪ + * E̸ĪE˫ëȪ? */ struct skill_unit* map_find_skill_unit_oncell(struct block_list* target,int x,int y,int skill_id,struct skill_unit* out_unit) { @@ -710,7 +710,7 @@ int map_foreachinarea(int (*func)(struct block_list*,va_list), int m, int x0, in } /*========================================== - * `(x0,y0)-(x1,y1)(dx,dy)ړb + * `(x0,y0)-(x1,y1)(dx,dy)ړb? * ̈OɂȂ̈(`L`)?obj * ?funcĂ * @@ -1165,7 +1165,7 @@ int map_get_new_object_id(void) /*========================================== * ACe * - * data==0̎btimerŏ * data!=0̎b͏EŏbƂē + * data==0̎btimerŏ * data!=0̎b͏EŏbƂē? * * ҂́Amap_clearflooritem(id) * map.h?#defineĂ @@ -1462,7 +1462,7 @@ void map_addiddb(struct block_list *bl) TBL_MOB* md = (TBL_MOB*)bl; idb_put(mobid_db,bl->id,bl); - if( (md->db->status.mode&MD_BOSS) && md->db->mexp > 0 ) + if( md->boss ) idb_put(bossid_db, bl->id, bl); } @@ -1700,11 +1700,11 @@ struct mob_data * map_getmob_boss(int m) iter = db_iterator(bossid_db); for( md = (struct mob_data*)dbi_first(iter); dbi_exists(iter); md = (struct mob_data*)dbi_next(iter) ) { - if( md->bl.m != m || !md->spawn ) - continue; - - found = true; - break; + if( md->bl.m == m ) + { + found = true; + break; + } } dbi_destroy(iter); diff --git a/src/map/map.h b/src/map/map.h index 8aaccde2b..a2740bf56 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -239,6 +239,7 @@ struct block_list { // Expanded to specify all mob-related spawn data by [Skotlex] struct spawn_data { short class_; //Class, used because a mob can change it's class + unsigned boss : 1; unsigned short m,x,y; //Spawn information (map, point, spawn-area around point) signed short xs,ys; unsigned short num; //Number of mobs using this structure diff --git a/src/map/mob.c b/src/map/mob.c index 407c24456..531939885 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -211,6 +211,7 @@ struct mob_data* mob_spawn_dataset(struct spawn_data *data) md->bl.x = data->x; md->bl.y = data->y; md->class_ = data->class_; + md->boss = data->boss; md->db = mob_db(md->class_); memcpy(md->name, data->name, NAME_LENGTH); if (data->state.ai) diff --git a/src/map/mob.h b/src/map/mob.h index 0ea82abcd..b0a7a11e9 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -124,6 +124,7 @@ struct mob_data { int spawn_timer; //Required for Convex Mirror struct item *lootitem; short class_; + unsigned boss : 1; unsigned int tdmg; //Stores total damage given to the mob, for exp calculations. [Skotlex] int level; int target_id,attacked_id; diff --git a/src/map/npc.c b/src/map/npc.c index 042da1a0c..97e54a8fe 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2485,6 +2485,8 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c memset(&mob, 0, sizeof(struct spawn_data)); + mob.boss = !strcmpi(w2,"boss_monster"); + // w1=<map name>,<x>,<y>,<xs>,<ys> // w4=<mob id>,<amount>,<delay1>,<delay2>,<event> if( sscanf(w1, "%31[^,],%d,%d,%d,%d", mapname, &x, &y, &xs, &ys) < 3 @@ -3023,7 +3025,7 @@ void npc_parsesrcfile(const char* filepath) { p = npc_parse_duplicate(w1,w2,w3,w4, p, buffer, filepath); } - else if( strcmpi(w2,"monster") == 0 && count > 3 ) + else if( (strcmpi(w2,"monster") == 0 || strcmpi(w2,"boss_monster") == 0) && count > 3 ) { p = npc_parse_mob(w1, w2, w3, w4, p, buffer, filepath); } |