summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-11-08 03:09:20 +0100
committerHaru <haru@dotalux.com>2013-11-08 03:12:33 +0100
commit0b7b3796ec987cbb1c263722b841cfa5795aa6d3 (patch)
treecc0aa01be6fdb5fa0e7fb0b0a1397bb2d71cbf90
parentbc9743ce3455f9d9cbc9c934b2a19343ad369fc5 (diff)
downloadhercules-0b7b3796ec987cbb1c263722b841cfa5795aa6d3.tar.gz
hercules-0b7b3796ec987cbb1c263722b841cfa5795aa6d3.tar.bz2
hercules-0b7b3796ec987cbb1c263722b841cfa5795aa6d3.tar.xz
hercules-0b7b3796ec987cbb1c263722b841cfa5795aa6d3.zip
Added support for monster spritename constants
- Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Replaced numeric IDs in NPC definitions and setnpcdisplay calls with the appropriate constants - Made possible thanks to Ind Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--npc/cities/amatsu.txt2
-rw-r--r--npc/custom/events/disguise.txt28
-rw-r--r--npc/custom/events/mushroom_event.txt2
-rw-r--r--npc/events/gdevent_sch.txt14
-rw-r--r--npc/events/halloween_2006.txt4
-rw-r--r--npc/jobs/2-1/priest.txt6
-rw-r--r--npc/other/arena/arena_room.txt2
-rw-r--r--npc/other/monster_museum.txt64
-rw-r--r--npc/other/poring_war.txt6
-rw-r--r--npc/quests/newgears/2004_headgears.txt16
-rw-r--r--npc/quests/newgears/2005_headgears.txt6
-rw-r--r--npc/quests/newgears/2008_headgears.txt2
-rw-r--r--npc/quests/okolnir.txt200
-rw-r--r--npc/quests/quests_13_1.txt6
-rw-r--r--npc/quests/quests_13_2.txt4
-rw-r--r--npc/quests/quests_hugel.txt8
-rw-r--r--npc/quests/quests_lighthalzen.txt2
-rw-r--r--npc/quests/quests_moscovia.txt2
-rw-r--r--npc/quests/quests_nameless.txt2
-rw-r--r--npc/quests/thana_quest.txt10
-rw-r--r--npc/quests/the_sign_quest.txt14
-rw-r--r--npc/re/cities/mora.txt2
-rw-r--r--npc/re/instances/OldGlastHeim.txt2
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt6
-rw-r--r--npc/re/quests/eden/eden_iro.txt2
-rw-r--r--npc/re/quests/quests_brasilis.txt10
-rw-r--r--npc/re/quests/quests_malaya.txt2
-rw-r--r--src/map/mob.c11
-rw-r--r--src/map/mob.h1
29 files changed, 225 insertions, 211 deletions
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 6d5e9e197..c86db8a67 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -418,7 +418,7 @@ amatsu,243,202,3 script Drama Teacher#ama 4_F_JPNOBA2,{
close;
}
-amatsu,283,203,1 script Bonubonu#ama1 1323,{
+amatsu,283,203,1 script Bonubonu#ama1 SEE_OTTER,{
end;
}
diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt
index a1d8c11c3..877916738 100644
--- a/npc/custom/events/disguise.txt
+++ b/npc/custom/events/disguise.txt
@@ -127,10 +127,12 @@ OnInit:
set .Prize,512;
set .PrizeAmt,1;
set .Rule,1;
- setarray .MVP[0],1038,1039,1046,1059,1086,1087,1112,1115,1147,1150,1157,1159,1190,1251,1252,1272,1312,1373,
- 1389,1399,1418,1492,1502,1511,1583,1623,1630,1646,1647,1648,1649,1650,1651,1658,1685,1688,
- 1708,1719,1734,1751,1768,1779,1785,1802,1832,1871,1874,1885,1917,1980,2022,2068,2087,2131,
- 2156,2165;
+ setarray .MVP[0], OSIRIS, BAPHOMET, DOPPELGANGER, MISTRESS, GOLDEN_BUG, ORK_HERO, DRAKE, EDDGA, MAYA, MOONLIGHT,
+ PHARAOH, PHREEONI, ORC_LORD, KNIGHT_OF_WINDSTORM, GARM, DARK_LORD, TURTLE_GENERAL, LORD_OF_DEATH, DRACULA, EVENT_BAPHO,
+ DARK_SNAKE_LORD, INCANTATION_SAMURAI, PORING_V, AMON_RA, TAO_GUNKA, RSX_0806, BACSOJIN_, B_SEYREN, B_EREMES, B_HARWORD,
+ B_MAGALETA, B_SHECIL, B_KATRINN, B_YGNIZEM, APOCALIPS_H, LADY_TANEE, THANATOS, DETALE, KIEL_, RANDGRIS,
+ GLOOMUNDERNIGHT, KTULLANUX, ATROCE, G_MAGALETA_, IFRIT, FALLINGBISHOP, BEELZEBUB_, GOPINICH, MOROCC_, KUBLIN,
+ S_NYDHOG, BOITATA, QUEEN_SCARABA, LOST_DRAGON, LEAK, I_QUEEN_SCARABA;
set .BlackList$, "1003,1006,1017,1021,1022,1027,1043,1075,1136,1137,1168," +
"1171,1172,1173,1181,1187,1210,1217,1218,1222,1223,1224,1225,1226,1227,1228," +
"1233,1284,1407,1411,1414,1495,1501,1900,1996,2000,2001,2002,2003,2004," +
@@ -199,22 +201,22 @@ OnTimer180000:
iDisguise:
if (.Rule==1) {
set .Winner,0;
- set .Monster,1000+rand(1,995);
- if (compare(","+.BlackList$+"," , ","+.Monster+",")) goto iDisguise;
- if (.Monster==.LastMonster) goto iDisguise;
- set .LastMonster,.Monster;
- set $MonsterName$,getmonsterinfo(.Monster,0);
+ set .@Monster, rand(SCORPION, PINGUICULA);
+ if (compare(","+.BlackList$+"," , ","+.@Monster+",")) goto iDisguise;
+ if (.@Monster==.LastMonster) goto iDisguise;
+ set .LastMonster,.@Monster;
+ set $MonsterName$,getmonsterinfo(.@Monster,0);
}
if (.Rule==2) {
set .Winner,0;
- set .Monster,rand(49);
- set $MonsterName$,getmonsterinfo(.MVP[.Monster],0);
+ set .@Monster, rand(getarraysize(.MVP));
+ set $MonsterName$,getmonsterinfo(.MVP[.@Monster],0);
}
deletepset 1;
defpattern 1,"([^:]+):.\\s*"+$MonsterName$+".*", "iCorrect";
activatepset 1;
- if (.Rule==1) setnpcdisplay "Disguise Event",.Monster;
- if (.Rule==2) setnpcdisplay "Disguise Event",.MVP[.Monster];
+ if (.Rule==1) setnpcdisplay "Disguise Event",.@Monster;
+ if (.Rule==2) setnpcdisplay "Disguise Event",.MVP[.@Monster];
set .Change,1;
setnpctimer 0;
end;
diff --git a/npc/custom/events/mushroom_event.txt b/npc/custom/events/mushroom_event.txt
index bab31ec79..1d632d3e9 100644
--- a/npc/custom/events/mushroom_event.txt
+++ b/npc/custom/events/mushroom_event.txt
@@ -12,7 +12,7 @@
//= 3.6a Slightly edited. [Euphy]
//============================================================
-prontera,142,228,6 script Find the Mushroom 1084,{
+prontera,142,228,6 script Find the Mushroom BLACK_MUSHROOM,{
mes "[ Find The Mushroom ]";
if (!.Status)
mes "There is no event at the moment!";
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 19ef7b8c3..343c21ead 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -479,19 +479,19 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
specialeffect EF_POISONHIT;
set .@sprchg_gd,rand(1,5);
if (.@sprchg_gd == 1) {
- setnpcdisplay "Pierrot Pier#sch_gd",950;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_GHOSTRING;
}
else if (.@sprchg_gd == 2) {
- setnpcdisplay "Pierrot Pier#sch_gd",715;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
}
else if (.@sprchg_gd == 3) {
- setnpcdisplay "Pierrot Pier#sch_gd",714;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_F_06;
}
else if (.@sprchg_gd == 4) {
- setnpcdisplay "Pierrot Pier#sch_gd",785;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_M_UMDANCEKID2;
}
else {
- setnpcdisplay "Pierrot Pier#sch_gd",876;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_CAT;
}
if (checkweight(1201,1) == 0) {
mes "- Wait!! -";
@@ -505,7 +505,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
if ($@gdeventv_s2 == 0) {
set .@que_2143,checkquest(2143,PLAYTIME);
if (.@que_2143 == -1) {
- setnpcdisplay "Pierrot Pier#sch_gd",715;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
mes "A lonely clown is juggling.";
next;
mes "When looked at closely, the clown is just a puppet that looks like a human.";
@@ -844,7 +844,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
}
else {
if ($@gdeventv_s2 == 0) {
- setnpcdisplay "Pierrot Pier#sch_gd",715;
+ setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
mes "A lonely clown is juggling.";
next;
mes "When looked at closely, the clown is just a puppet that looks like a human.";
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index ba603b207..5bc7c3332 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -20,7 +20,7 @@
// Pumpkin Mojo quest (Event 1)
//============================================================
-prontera,162,69,5 script Gloomy Jack#06_hw 1130,2,2,{
+prontera,162,69,5 script Gloomy Jack#06_hw JAKK,2,2,{
end;
OnTouch:
@@ -380,7 +380,7 @@ geffen,145,132,3 script Hoirin#06_hw 4_F_NOVICE,{
}
}
-nif_in,18,34,5 script Loli Ruri#06_hw 1505,2,2,{
+nif_in,18,34,5 script Loli Ruri#06_hw LOLI_RURI,2,2,{
end;
OnTouch:
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index e5aceea72..db88bc934 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -1306,7 +1306,7 @@ OnTouch:
// 3rd Test
//==========================================================
-job_prist,168,45,4 script Deviruchi#prst 1109,8,1,{
+job_prist,168,45,4 script Deviruchi#prst DEVIRUCHI,8,1,{
OnTouch:
if (BaseJob == Job_Priest) {
mes "[Deviruchi]";
@@ -1407,7 +1407,7 @@ OnTouch:
end;
}
-job_prist,168,80,4 script Doppelganger#prst 1046,8,1,{
+job_prist,168,80,4 script Doppelganger#prst DOPPELGANGER,8,1,{
OnTouch:
if (BaseJob == Job_Priest) {
mes "[Doppelganger]";
@@ -1476,7 +1476,7 @@ OnTouch:
}
}
-job_prist,168,115,4 script Dark Lord#prst 1272,8,1,{
+job_prist,168,115,4 script Dark Lord#prst DARK_LORD,8,1,{
OnTouch:
if (BaseJob == Job_Priest) {
mes "[Dark Lord]";
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index b459724c2..163f531eb 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -717,7 +717,7 @@ prt_are_in,98,14,3 script Givu#arena 4_F_JOB_KNIGHT,{
}
}
-prt_are_in,1,1,5 script #arena_1039 1039,{
+prt_are_in,1,1,5 script #arena_1039 BAPHOMET,{
end;
OnInit:
diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt
index b50419c8c..6917a9f93 100644
--- a/npc/other/monster_museum.txt
+++ b/npc/other/monster_museum.txt
@@ -60,7 +60,7 @@ yuno_in03,32,15,3 script Museum Guide 1_F_02,{
close;
}
-yuno_in03,36,21,3 script Deviace#yuno 1108,{
+yuno_in03,36,21,3 script Deviace#yuno DEVIACE,{
end;
}
yuno_in03,33,21,1 script #DEVIACE HIDDEN_NPC,{
@@ -86,7 +86,7 @@ yuno_in03,33,21,1 script #DEVIACE HIDDEN_NPC,{
close;
}
-yuno_in03,36,27,3 script Seal#yuno 1317,{
+yuno_in03,36,27,3 script Seal#yuno FUR_SEAL,{
end;
}
yuno_in03,33,27,1 script #FUR_SEAL HIDDEN_NPC,{
@@ -112,7 +112,7 @@ yuno_in03,33,27,1 script #FUR_SEAL HIDDEN_NPC,{
close;
}
-yuno_in03,36,33,3 script Sage Worm#yuno 1281,{
+yuno_in03,36,33,3 script Sage Worm#yuno SAGEWORM,{
end;
}
yuno_in03,33,33,1 script #SAGEWORM HIDDEN_NPC,{
@@ -134,7 +134,7 @@ yuno_in03,33,33,1 script #SAGEWORM HIDDEN_NPC,{
close;
}
-yuno_in03,39,39,3 script Penomena#yuno 1216,{
+yuno_in03,39,39,3 script Penomena#yuno PENOMENA,{
end;
}
yuno_in03,38,39,1 script #PENOMANA HIDDEN_NPC,{
@@ -160,7 +160,7 @@ yuno_in03,38,39,1 script #PENOMANA HIDDEN_NPC,{
close;
}
-yuno_in03,39,44,3 script Galapago#yuno 1391,{
+yuno_in03,39,44,3 script Galapago#yuno GALAPAGO,{
end;
}
yuno_in03,37,44,3 script #GALAPAGO HIDDEN_NPC,{
@@ -181,7 +181,7 @@ yuno_in03,37,44,3 script #GALAPAGO HIDDEN_NPC,{
close;
}
-yuno_in03,15,21,5 script Raydric#yuno 1163,{
+yuno_in03,15,21,5 script Raydric#yuno RAYDRIC,{
end;
}
yuno_in03,19,21,1 script #RAYDRIC HIDDEN_NPC,{
@@ -202,7 +202,7 @@ yuno_in03,19,21,1 script #RAYDRIC HIDDEN_NPC,{
close;
}
-yuno_in03,15,27,5 script Chepet#yuno 1250,{
+yuno_in03,15,27,5 script Chepet#yuno CHEPET,{
end;
}
yuno_in03,19,27,1 script #CHEPET HIDDEN_NPC,{
@@ -221,7 +221,7 @@ yuno_in03,19,27,1 script #CHEPET HIDDEN_NPC,{
close;
}
-yuno_in03,15,33,5 script Violy#yuno 1390,{
+yuno_in03,15,33,5 script Violy#yuno VIOLY,{
end;
}
yuno_in03,19,33,1 script #VIOLY HIDDEN_NPC,{
@@ -238,7 +238,7 @@ yuno_in03,19,33,1 script #VIOLY HIDDEN_NPC,{
close;
}
-yuno_in03,10,39,5 script Alice#yuno 1275,{
+yuno_in03,10,39,5 script Alice#yuno ALICE,{
end;
}
yuno_in03,12,39,1 script #ALICE HIDDEN_NPC,{
@@ -260,7 +260,7 @@ yuno_in03,12,39,1 script #ALICE HIDDEN_NPC,{
close;
}
-yuno_in03,10,45,5 script Assulter#yuno 1315,{
+yuno_in03,10,45,5 script Assulter#yuno ASSULTER,{
end;
}
yuno_in03,12,45,1 script #ASSULTER HIDDEN_NPC,{
@@ -285,17 +285,17 @@ yuno_in03,12,45,1 script #ASSULTER HIDDEN_NPC,{
close;
}
-yuno_in03,38,50,3 script PecoPeco Egg#yuno 1047,{
+yuno_in03,38,50,3 script PecoPeco Egg#yuno PECOPECO_EGG,{
end;
}
-yuno_in03,34,54,3 script Thief Bug Egg#yuno 1048,{
+yuno_in03,34,54,3 script Thief Bug Egg#yuno THIEF_BUG_EGG,{
end;
}
-yuno_in03,12,50,3 script Ant Egg#yuno 1097,{
+yuno_in03,12,50,3 script Ant Egg#yuno ANT_EGG,{
end;
}
-yuno_in03,18,96,5 script Wanderer#yuno 1208,{
+yuno_in03,18,96,5 script Wanderer#yuno WANDER_MAN,{
end;
}
yuno_in03,20,96,1 script #WANDER_MAN HIDDEN_NPC,{
@@ -317,7 +317,7 @@ yuno_in03,20,96,1 script #WANDER_MAN HIDDEN_NPC,{
close;
}
-yuno_in03,16,100,5 script Caterpillar#yuno 1300,{
+yuno_in03,16,100,5 script Caterpillar#yuno CATERPILLAR,{
end;
}
yuno_in03,18,100,1 script #CATERPILLAR HIDDEN_NPC,{
@@ -339,7 +339,7 @@ yuno_in03,18,100,1 script #CATERPILLAR HIDDEN_NPC,{
close;
}
-yuno_in03,16,104,5 script Male Thiefbug#yuno 1054,{
+yuno_in03,16,104,5 script Male Thiefbug#yuno THIEF_BUG__,{
end;
}
yuno_in03,18,104,1 script #THIEF_BUG__ HIDDEN_NPC,{
@@ -357,7 +357,7 @@ yuno_in03,18,104,1 script #THIEF_BUG__ HIDDEN_NPC,{
close;
}
-yuno_in03,16,108,5 script Tri Joint#yuno 1279,{
+yuno_in03,16,108,5 script Tri Joint#yuno TRI_JOINT,{
end;
}
yuno_in03,18,108,1 script #TRI_JOINT HIDDEN_NPC,{
@@ -377,7 +377,7 @@ yuno_in03,18,108,1 script #TRI_JOINT HIDDEN_NPC,{
close;
}
-yuno_in03,16,111,5 script Arclouz#yuno 1194,{
+yuno_in03,16,111,5 script Arclouz#yuno ARCLOUSE,{
end;
}
yuno_in03,18,111,1 script #ARCLOUSE HIDDEN_NPC,{
@@ -400,7 +400,7 @@ yuno_in03,18,111,1 script #ARCLOUSE HIDDEN_NPC,{
close;
}
-yuno_in03,16,117,5 script Dragon Tail#yuno 1321,{
+yuno_in03,16,117,5 script Dragon Tail#yuno DRAGON_TAIL,{
end;
}
yuno_in03,18,116,1 script #DRAGON_TAIL HIDDEN_NPC,{
@@ -419,7 +419,7 @@ yuno_in03,18,116,1 script #DRAGON_TAIL HIDDEN_NPC,{
close;
}
-yuno_in03,46,96,3 script Owl Duke#yuno 1320,{
+yuno_in03,46,96,3 script Owl Duke#yuno OWL_DUKE,{
end;
}
yuno_in03,44,96,1 script #OWL_DUKE HIDDEN_NPC,{
@@ -444,7 +444,7 @@ yuno_in03,44,96,1 script #OWL_DUKE HIDDEN_NPC,{
close;
}
-yuno_in03,48,100,3 script Marine Sphere#yuno 1142,{
+yuno_in03,48,100,3 script Marine Sphere#yuno MARINE_SPHERE,{
end;
}
yuno_in03,46,101,1 script #MARINE_SPHERE HIDDEN_NPC,{
@@ -468,7 +468,7 @@ yuno_in03,46,101,1 script #MARINE_SPHERE HIDDEN_NPC,{
close;
}
-yuno_in03,48,104,3 script Mandragora#yuno 1020,{
+yuno_in03,48,104,3 script Mandragora#yuno MANDRAGORA,{
end;
}
yuno_in03,46,105,1 script #MANDRAGORA HIDDEN_NPC,{
@@ -499,7 +499,7 @@ yuno_in03,46,105,1 script #MANDRAGORA HIDDEN_NPC,{
close;
}
-yuno_in03,48,108,3 script Geographer#yuno 1368,{
+yuno_in03,48,108,3 script Geographer#yuno GEOGRAPHER,{
end;
}
yuno_in03,46,108,1 script #GEOGRAPHER HIDDEN_NPC,{
@@ -533,7 +533,7 @@ yuno_in03,46,108,1 script #GEOGRAPHER HIDDEN_NPC,{
close;
}
-yuno_in03,48,112,3 script Rafflesia#yuno 1162,{
+yuno_in03,48,112,3 script Rafflesia#yuno RAFFLESIA,{
end;
}
yuno_in03,46,112,1 script #RAFFLESIA HIDDEN_NPC,{
@@ -558,7 +558,7 @@ yuno_in03,46,112,1 script #RAFFLESIA HIDDEN_NPC,{
close;
}
-yuno_in03,48,116,3 script Stem Worm#yuno 1215,{
+yuno_in03,48,116,3 script Stem Worm#yuno STEM_WORM,{
end;
}
yuno_in03,45,116,1 script #STEM_WORM HIDDEN_NPC,{
@@ -577,7 +577,7 @@ yuno_in03,45,116,1 script #STEM_WORM HIDDEN_NPC,{
close;
}
-yuno_in03,24,124,3 script Blazzer#yuno 1367,{
+yuno_in03,24,124,3 script Blazzer#yuno BLAZZER,{
end;
}
yuno_in03,24,122,1 script #BLAZZER HIDDEN_NPC,{
@@ -602,7 +602,7 @@ yuno_in03,24,122,1 script #BLAZZER HIDDEN_NPC,{
close;
}
-yuno_in03,28,124,5 script Ride Word#yuno 1195,{
+yuno_in03,28,124,5 script Ride Word#yuno RIDEWORD,{
end;
}
yuno_in03,28,122,1 script #RIDEWORD HIDDEN_NPC,{
@@ -617,7 +617,7 @@ yuno_in03,28,122,1 script #RIDEWORD HIDDEN_NPC,{
close;
}
-yuno_in03,31,124,3 script Megalodon#yuno 1064,{
+yuno_in03,31,124,3 script Megalodon#yuno MEGALODON,{
end;
}
yuno_in03,31,122,1 script #MEGALODON HIDDEN_NPC,{
@@ -635,7 +635,7 @@ yuno_in03,31,122,1 script #MEGALODON HIDDEN_NPC,{
close;
}
-yuno_in03,35,124,3 script Sleeper#yuno 1386,{
+yuno_in03,35,124,3 script Sleeper#yuno SLEEPER,{
end;
}
yuno_in03,35,122,1 script #SLEEPER HIDDEN_NPC,{
@@ -656,7 +656,7 @@ yuno_in03,35,122,1 script #SLEEPER HIDDEN_NPC,{
close;
}
-yuno_in03,39,124,3 script Ancient Mummy#yuno 1297,{
+yuno_in03,39,124,3 script Ancient Mummy#yuno ANCIENT_MUMMY,{
end;
}
yuno_in03,39,122,1 script #ANCIENT_MUMMY HIDDEN_NPC,{
@@ -685,7 +685,7 @@ yuno_in03,39,122,1 script #ANCIENT_MUMMY HIDDEN_NPC,{
close;
}
-yuno_in03,18,122,5 script Incubus#yuno 1374,{
+yuno_in03,18,122,5 script Incubus#yuno INCUBUS,{
end;
}
yuno_in03,19,120,1 script #INCUBUS HIDDEN_NPC,{
@@ -707,7 +707,7 @@ yuno_in03,19,120,1 script #INCUBUS HIDDEN_NPC,{
close;
}
-yuno_in03,44,120,3 script Succubus#yuno 1370,{
+yuno_in03,44,120,3 script Succubus#yuno SUCCUBUS,{
end;
}
yuno_in03,42,120,1 script #SUCCUBUS HIDDEN_NPC,{
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index 599f31cfb..58db2edcf 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -354,7 +354,7 @@ OnInit:
// Poring Registers
//============================================================
-poring_w01,91,97,3 script Poring#wop_door_all 1002,{
+poring_w01,91,97,3 script Poring#wop_door_all PORING,{
end;
OnInit:
@@ -377,7 +377,7 @@ OnDisable:
end;
}
-poring_w01,91,68,5 script Poring#wop_door_a 1002,{
+poring_w01,91,68,5 script Poring#wop_door_a PORING,{
end;
OnInit:
@@ -469,7 +469,7 @@ OnTimer58000:
end;
}
-poring_w01,112,68,3 script Poring#wop_door_d 1002,{
+poring_w01,112,68,3 script Poring#wop_door_d PORING,{
end;
OnInit:
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index a6638d6a7..a9ee31558 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -1919,7 +1919,7 @@ alde_alche,88,180,0 script Muscle Man#Alarm Mask 4_M_ALCHE_A,{
mes "It's sexy time!";
next;
specialeffect EF_FLASHER;
- setnpcdisplay "Muscle Man#Alarm Mask", 1193;
+ setnpcdisplay "Muscle Man#Alarm Mask", ALARM;
enablenpc " #Alarm Mask Man1";
enablenpc " #Alarm Mask Man2";
enablenpc " #Alarm Mask Man3";
@@ -2047,25 +2047,25 @@ OnTimer4000:
end;
}
-alde_alche,86,184,0 script #Alarm Mask Man1 1193,{
+alde_alche,86,184,0 script #Alarm Mask Man1 ALARM,{
OnInit:
disablenpc " #Alarm Mask Man1";
end;
}
-alde_alche,89,184,0 script #Alarm Mask Man2 1193,{
+alde_alche,89,184,0 script #Alarm Mask Man2 ALARM,{
OnInit:
disablenpc " #Alarm Mask Man2";
end;
}
-alde_alche,92,184,0 script #Alarm Mask Man3 1193,{
+alde_alche,92,184,0 script #Alarm Mask Man3 ALARM,{
OnInit:
disablenpc " #Alarm Mask Man3";
end;
}
-alde_alche,95,184,0 script #Alarm Mask Man4 1193,{
+alde_alche,95,184,0 script #Alarm Mask Man4 ALARM,{
OnInit:
disablenpc " #Alarm Mask Man4";
end;
@@ -2454,7 +2454,7 @@ morocc,273,79,4 script Educated Traveller 4W_M_03,{
// Kitsune Mask
//============================================================
-pay_dun03,48,84,4 script Nine Tails#Kitsune Mask 1180,1,1,{
+pay_dun03,48,84,4 script Nine Tails#Kitsune Mask NINE_TAIL,1,1,{
end;
OnInit:
@@ -2631,7 +2631,7 @@ OnMyMobDead2:
// Orc Hero Helmet
//============================================================
-in_orcs01,31,93,1 script Orc Warrior#1 1023,2,2,{
+in_orcs01,31,93,1 script Orc Warrior#1 ORK_WARRIOR,2,2,{
OnTouch:
disable_items;
if (checkweight(1201,1) == 0) {
@@ -3502,7 +3502,7 @@ OnTouch:
}
}
-in_orcs01,162,33,1 script Orc Hero#1 1087,2,2,{
+in_orcs01,162,33,1 script Orc Hero#1 ORK_HERO,2,2,{
OnTouch:
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index a6af90a9e..4b6981101 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -1381,7 +1381,7 @@ lighthalzen,182,89,0 script Relaxed-Looking Lady 4_F_02,{
}
}
-gl_prison1,137,138,5 script Zealotus#LhzHat 1200,{
+gl_prison1,137,138,5 script Zealotus#LhzHat ZHERLTHSH,{
if(ZLMASKQ == 0)
{
mes "[Zealotus]";
@@ -1588,7 +1588,7 @@ gl_prison1,137,138,5 script Zealotus#LhzHat 1200,{
}
-gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
+gl_prison1,97,104,1 script Phendark#LhzHat PHENDARK,{
if(ZLMASKQ == 0)
{
mes "[Phendark]";
@@ -1997,7 +1997,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{
}
}
-gl_prison1,100,48,5 script Rybio#LhzHat 1201,{
+gl_prison1,100,48,5 script Rybio#LhzHat RYBIO,{
if(ZLMASKQ == 2)
{
mes "[Rybio]";
diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt
index 87d1a4693..f45664f3b 100644
--- a/npc/quests/newgears/2008_headgears.txt
+++ b/npc/quests/newgears/2008_headgears.txt
@@ -748,7 +748,7 @@ morocc_in,137,102,5 script Trainee#2008hat01 4_KID01,{
}
}
-in_orcs01,119,106,3 script Orc Lady#2008hat03 1273,2,2,{
+in_orcs01,119,106,3 script Orc Lady#2008hat03 ORC_LADY,2,2,{
OnTouch:
mes "["+strcharinfo(0)+"]";
diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index 2c93ccc9f..395fda89d 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -1914,46 +1914,46 @@ OnInit:
disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@i;
end;
}
-que_qaru01,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru01_01 1752,4,4
-que_qaru01,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru01_02 1752,4,4
-que_qaru01,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru01_03 1752,4,4
-que_qaru01,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru01_04 1752,4,4
-que_qaru02,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru02_01 1752,4,4
-que_qaru02,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru02_02 1752,4,4
-que_qaru02,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru02_03 1752,4,4
-que_qaru02,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru02_04 1752,4,4
-que_qaru03,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru03_01 1752,4,4
-que_qaru03,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru03_02 1752,4,4
-que_qaru03,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru03_03 1752,4,4
-que_qaru03,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru03_04 1752,4,4
-que_qaru04,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru04_01 1752,4,4
-que_qaru04,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru04_02 1752,4,4
-que_qaru04,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru04_03 1752,4,4
-que_qaru04,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru04_04 1752,4,4
-que_qaru05,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru05_01 1752,4,4
-que_qaru05,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru05_02 1752,4,4
-que_qaru05,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru05_03 1752,4,4
-que_qaru05,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru05_04 1752,4,4
-que_qsch01,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch01_01 1752,4,4
-que_qsch01,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch01_02 1752,4,4
-que_qsch01,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch01_03 1752,4,4
-que_qsch01,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch01_04 1752,4,4
-que_qsch02,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch02_01 1752,4,4
-que_qsch02,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch02_02 1752,4,4
-que_qsch02,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch02_03 1752,4,4
-que_qsch02,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch02_04 1752,4,4
-que_qsch03,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch03_01 1752,4,4
-que_qsch03,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch03_02 1752,4,4
-que_qsch03,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch03_03 1752,4,4
-que_qsch03,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch03_04 1752,4,4
-que_qsch04,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch04_01 1752,4,4
-que_qsch04,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch04_02 1752,4,4
-que_qsch04,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch04_03 1752,4,4
-que_qsch04,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch04_04 1752,4,4
-que_qsch05,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch05_01 1752,4,4
-que_qsch05,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch05_02 1752,4,4
-que_qsch05,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch05_03 1752,4,4
-que_qsch05,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch05_04 1752,4,4
+que_qaru01,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru01_01 SKOGUL,4,4
+que_qaru01,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru01_02 SKOGUL,4,4
+que_qaru01,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru01_03 SKOGUL,4,4
+que_qaru01,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru01_04 SKOGUL,4,4
+que_qaru02,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru02_01 SKOGUL,4,4
+que_qaru02,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru02_02 SKOGUL,4,4
+que_qaru02,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru02_03 SKOGUL,4,4
+que_qaru02,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru02_04 SKOGUL,4,4
+que_qaru03,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru03_01 SKOGUL,4,4
+que_qaru03,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru03_02 SKOGUL,4,4
+que_qaru03,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru03_03 SKOGUL,4,4
+que_qaru03,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru03_04 SKOGUL,4,4
+que_qaru04,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru04_01 SKOGUL,4,4
+que_qaru04,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru04_02 SKOGUL,4,4
+que_qaru04,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru04_03 SKOGUL,4,4
+que_qaru04,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru04_04 SKOGUL,4,4
+que_qaru05,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru05_01 SKOGUL,4,4
+que_qaru05,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru05_02 SKOGUL,4,4
+que_qaru05,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru05_03 SKOGUL,4,4
+que_qaru05,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#aru05_04 SKOGUL,4,4
+que_qsch01,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch01_01 SKOGUL,4,4
+que_qsch01,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch01_02 SKOGUL,4,4
+que_qsch01,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch01_03 SKOGUL,4,4
+que_qsch01,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch01_04 SKOGUL,4,4
+que_qsch02,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch02_01 SKOGUL,4,4
+que_qsch02,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch02_02 SKOGUL,4,4
+que_qsch02,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch02_03 SKOGUL,4,4
+que_qsch02,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch02_04 SKOGUL,4,4
+que_qsch03,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch03_01 SKOGUL,4,4
+que_qsch03,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch03_02 SKOGUL,4,4
+que_qsch03,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch03_03 SKOGUL,4,4
+que_qsch03,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch03_04 SKOGUL,4,4
+que_qsch04,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch04_01 SKOGUL,4,4
+que_qsch04,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch04_02 SKOGUL,4,4
+que_qsch04,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch04_03 SKOGUL,4,4
+que_qsch04,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch04_04 SKOGUL,4,4
+que_qsch05,235,285,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch05_01 SKOGUL,4,4
+que_qsch05,224,290,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch05_02 SKOGUL,4,4
+que_qsch05,236,296,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch05_03 SKOGUL,4,4
+que_qsch05,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch05_04 SKOGUL,4,4
- script Bloody Hunter#main_all -1,{
end;
@@ -1988,46 +1988,46 @@ OnInit:
disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@i;
end;
}
-que_qaru01,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru01_ac01 1753,4,4
-que_qaru01,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru01_ac02 1753,4,4,
-que_qaru01,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru01_ac03 1753,4,4,
-que_qaru01,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru01_ac04 1753,4,4,
-que_qaru02,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru02_ac01 1753,4,4,
-que_qaru02,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru02_ac02 1753,4,4
-que_qaru02,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru02_ac03 1753,4,4
-que_qaru02,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru02_ac04 1753,4,4
-que_qaru03,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru03_ac01 1753,4,4
-que_qaru03,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru03_ac02 1753,4,4
-que_qaru03,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru03_ac03 1753,4,4
-que_qaru03,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru03_ac04 1753,4,4
-que_qaru04,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru04_ac01 1753,4,4
-que_qaru04,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru04_ac02 1753,4,4
-que_qaru04,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru04_ac03 1753,4,4
-que_qaru04,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru04_ac04 1753,4,4
-que_qaru05,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru05_ac01 1753,4,4
-que_qaru05,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru05_ac02 1753,4,4
-que_qaru05,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru05_ac03 1753,4,4
-que_qaru05,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru05_ac04 1753,4,4
-que_qsch01,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch01_ac01 1753,4,4
-que_qsch01,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch01_ac02 1753,4,4
-que_qsch01,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch01_ac03 1753,4,4
-que_qsch01,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch01_ac04 1753,4,4
-que_qsch02,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch02_ac01 1753,4,4
-que_qsch02,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch02_ac02 1753,4,4
-que_qsch02,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch02_ac03 1753,4,4
-que_qsch02,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch02_ac04 1753,4,4
-que_qsch03,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch03_ac01 1753,4,4
-que_qsch03,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch03_ac02 1753,4,4
-que_qsch03,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch03_ac03 1753,4,4
-que_qsch03,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch03_ac04 1753,4,4
-que_qsch04,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch04_ac01 1753,4,4
-que_qsch04,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch04_ac02 1753,4,4
-que_qsch04,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch04_ac03 1753,4,4
-que_qsch04,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch04_ac04 1753,4,4
-que_qsch05,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch05_ac01 1753,4,4
-que_qsch05,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch05_ac02 1753,4,4
-que_qsch05,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch05_ac03 1753,4,4
-que_qsch05,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch05_ac04 1753,4,4
+que_qaru01,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru01_ac01 FRUS,4,4
+que_qaru01,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru01_ac02 FRUS,4,4
+que_qaru01,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru01_ac03 FRUS,4,4
+que_qaru01,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru01_ac04 FRUS,4,4
+que_qaru02,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru02_ac01 FRUS,4,4
+que_qaru02,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru02_ac02 FRUS,4,4
+que_qaru02,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru02_ac03 FRUS,4,4
+que_qaru02,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru02_ac04 FRUS,4,4
+que_qaru03,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru03_ac01 FRUS,4,4
+que_qaru03,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru03_ac02 FRUS,4,4
+que_qaru03,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru03_ac03 FRUS,4,4
+que_qaru03,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru03_ac04 FRUS,4,4
+que_qaru04,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru04_ac01 FRUS,4,4
+que_qaru04,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru04_ac02 FRUS,4,4
+que_qaru04,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru04_ac03 FRUS,4,4
+que_qaru04,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru04_ac04 FRUS,4,4
+que_qaru05,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru05_ac01 FRUS,4,4
+que_qaru05,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru05_ac02 FRUS,4,4
+que_qaru05,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru05_ac03 FRUS,4,4
+que_qaru05,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#aru05_ac04 FRUS,4,4
+que_qsch01,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch01_ac01 FRUS,4,4
+que_qsch01,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch01_ac02 FRUS,4,4
+que_qsch01,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch01_ac03 FRUS,4,4
+que_qsch01,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch01_ac04 FRUS,4,4
+que_qsch02,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch02_ac01 FRUS,4,4
+que_qsch02,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch02_ac02 FRUS,4,4
+que_qsch02,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch02_ac03 FRUS,4,4
+que_qsch02,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch02_ac04 FRUS,4,4
+que_qsch03,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch03_ac01 FRUS,4,4
+que_qsch03,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch03_ac02 FRUS,4,4
+que_qsch03,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch03_ac03 FRUS,4,4
+que_qsch03,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch03_ac04 FRUS,4,4
+que_qsch04,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch04_ac01 FRUS,4,4
+que_qsch04,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch04_ac02 FRUS,4,4
+que_qsch04,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch04_ac03 FRUS,4,4
+que_qsch04,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch04_ac04 FRUS,4,4
+que_qsch05,266,296,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch05_ac01 FRUS,4,4
+que_qsch05,271,283,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch05_ac02 FRUS,4,4
+que_qsch05,270,307,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch05_ac03 FRUS,4,4
+que_qsch05,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch05_ac04 FRUS,4,4
- script Temple Keeper#main_all -1,{
end;
@@ -2060,26 +2060,26 @@ OnInit:
disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@i;
end;
}
-que_qaru01,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru01_ac01 1933,4,4
-que_qaru01,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru01_ac02 1933,4,4
-que_qaru02,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru02_ac01 1933,4,4
-que_qaru02,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru02_ac02 1933,4,4
-que_qaru03,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru03_ac01 1933,4,4
-que_qaru03,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru03_ac02 1933,4,4
-que_qaru04,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru04_ac01 1933,4,4
-que_qaru04,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru04_ac02 1933,4,4
-que_qaru05,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru05_ac01 1933,4,4
-que_qaru05,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru05_ac02 1933,4,4
-que_qsch01,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch01_ac01 1933,4,4
-que_qsch01,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch01_ac02 1933,4,4
-que_qsch02,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch02_ac01 1933,4,4
-que_qsch02,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch02_ac02 1933,4,4
-que_qsch03,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch03_ac01 1933,4,4
-que_qsch03,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch03_ac02 1933,4,4
-que_qsch04,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch04_ac01 1933,4,4
-que_qsch04,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch04_ac02 1933,4,4
-que_qsch05,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch05_ac01 1933,4,4
-que_qsch05,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch05_ac02 1933,4,4
+que_qaru01,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru01_ac01 GARDEN_WATCHER,4,4
+que_qaru01,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru01_ac02 GARDEN_WATCHER,4,4
+que_qaru02,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru02_ac01 GARDEN_WATCHER,4,4
+que_qaru02,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru02_ac02 GARDEN_WATCHER,4,4
+que_qaru03,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru03_ac01 GARDEN_WATCHER,4,4
+que_qaru03,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru03_ac02 GARDEN_WATCHER,4,4
+que_qaru04,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru04_ac01 GARDEN_WATCHER,4,4
+que_qaru04,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru04_ac02 GARDEN_WATCHER,4,4
+que_qaru05,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#aru05_ac01 GARDEN_WATCHER,4,4
+que_qaru05,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#aru05_ac02 GARDEN_WATCHER,4,4
+que_qsch01,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch01_ac01 GARDEN_WATCHER,4,4
+que_qsch01,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch01_ac02 GARDEN_WATCHER,4,4
+que_qsch02,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch02_ac01 GARDEN_WATCHER,4,4
+que_qsch02,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch02_ac02 GARDEN_WATCHER,4,4
+que_qsch03,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch03_ac01 GARDEN_WATCHER,4,4
+que_qsch03,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch03_ac02 GARDEN_WATCHER,4,4
+que_qsch04,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch04_ac01 GARDEN_WATCHER,4,4
+que_qsch04,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch04_ac02 GARDEN_WATCHER,4,4
+que_qsch05,247,330,5 duplicate(Temple Keeper#main_all) Temple Keeper#sch05_ac01 GARDEN_WATCHER,4,4
+que_qsch05,255,330,3 duplicate(Temple Keeper#main_all) Temple Keeper#sch05_ac02 GARDEN_WATCHER,4,4
- script Wish Maiden#main_boss -1,{
end;
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 4516ce917..a928466c9 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -7446,7 +7446,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{
}
}
-mid_camp,152,316,3 script Hillsrion#alba01 1989,3,3,{
+mid_camp,152,316,3 script Hillsrion#alba01 HILLSRION,3,3,{
OnEnable:
enablenpc "Hillsrion#alba01";
end;
@@ -7463,7 +7463,7 @@ OnTouch:
close;
}
-mid_camp,145,313,5 script Tatacho#alba02 1986,3,3,{
+mid_camp,145,313,5 script Tatacho#alba02 TATACHO,3,3,{
OnEnable:
enablenpc "Tatacho#alba02";
end;
@@ -7484,7 +7484,7 @@ OnTouch:
close;
}
-mid_camp,162,306,3 script Cornus#alba03 1992,5,5,{
+mid_camp,162,306,3 script Cornus#alba03 CORNUS,5,5,{
OnEnable:
enablenpc "Cornus#alba03";
end;
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 951ffab4d..3cf920833 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -3372,7 +3372,7 @@ nyd_dun02,201,166,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg16 4_D
nyd_dun02,203,167,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg17 4_DRAGON_EGG
nyd_dun02,201,164,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg18 4_DRAGON_EGG
-nyd_dun02,201,157,5 script Egg Keeper Draco#13_1 2013,3,3,{
+nyd_dun02,201,157,5 script Egg Keeper Draco#13_1 DRACO,3,3,{
OnEnable:
enablenpc "Egg Keeper Draco#13_1";
@@ -3388,7 +3388,7 @@ OnTouch:
end;
}
-nyd_dun02,206,157,3 script Egg Keeper Draco#13_2 2013,3,3,{
+nyd_dun02,206,157,3 script Egg Keeper Draco#13_2 DRACO,3,3,{
end;
OnEnable:
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index 99549715a..6c8a8978f 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -3868,7 +3868,7 @@ OnTimer20000:
end;
}
-hu_fild06,155,309,1 script Moks Bugs#Bug1 1053,{
+hu_fild06,155,309,1 script Moks Bugs#Bug1 THIEF_BUG_,{
if (hg_tre > 29 && hg_tre < 35) {
mes "- You found big brown Moks Bugs in the bushes. -";
next;
@@ -3923,7 +3923,7 @@ OnTimer20000:
end;
}
-hu_fild06,218,320,1 script Moks Bugs#Bug2 1053,{
+hu_fild06,218,320,1 script Moks Bugs#Bug2 THIEF_BUG_,{
if (hg_tre > 29 && hg_tre < 35) {
mes "- You found big brown Moks Bugs in the bushes. -";
next;
@@ -3978,7 +3978,7 @@ OnTimer20000:
end;
}
-hu_fild06,249,329,1 script Moks Bugs#Bug3 1053,{
+hu_fild06,249,329,1 script Moks Bugs#Bug3 THIEF_BUG_,{
if (hg_tre > 29 && hg_tre < 35) {
mes "- You found big brown Moks Bugs in the bushes. -";
next;
@@ -4033,7 +4033,7 @@ OnTimer20000:
end;
}
-hu_fild06,218,373,1 script Moks Bugs#Bug4 1053,{
+hu_fild06,218,373,1 script Moks Bugs#Bug4 THIEF_BUG_,{
if (hg_tre > 29 && hg_tre < 35) {
mes "- You found big brown Moks Bugs in the bushes. -";
next;
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index d14f5d54e..03f38edd9 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -4309,7 +4309,7 @@ lhz_que01,99,74,5 script #li_Man 1_M_02,{
end;
}
-lhz_que01,90,71,5 script #li_bird 1019,3,3,{
+lhz_que01,90,71,5 script #li_bird PECOPECO,3,3,{
mes "[Peco Peco]";
mes "You're a fool!";
mes "You're a fool!";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index d868926b6..fd68f6663 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -4118,7 +4118,7 @@ S_BS_1:
return;
}
mosk_fild01,113,108,3 duplicate(Squirrel#mos_main) Big Squirrel#mos HIDDEN_NPC
-mosk_fild01,113,108,5 duplicate(Squirrel#mos_main) #mos_sq 1104,2,2
+mosk_fild01,113,108,5 duplicate(Squirrel#mos_main) #mos_sq COCO,2,2
// Banish Winter :: mos_nowinter
//============================================================
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 1c60feaee..258f01bc6 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -1109,7 +1109,7 @@ OnInit:
end;
}
-nameless_in,13,53,1 script Creature#Monas 1864,3,1,{
+nameless_in,13,53,1 script Creature#Monas ZOMBIE_SLAUGHTER,3,1,{
end;
OnInit:
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 8aebaae31..e1bcb79da 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -2078,7 +2078,7 @@ OnTimer3000:
end;
}
-thana_boss,217,167,3 script Memory Seal#tt1 1711,3,3,{
+thana_boss,217,167,3 script Memory Seal#tt1 G_THA_MAERO,3,3,{
end;
OnEnable:
hideoffnpc strnpcinfo(0);
@@ -2157,9 +2157,9 @@ OnMyMobDead:
mapwarp "thana_boss","thana_boss",141,228;
end;
}
-thana_boss,202,75,3 duplicate(Memory Seal#tt1) Memory Seal#tt2 1712,3,3
-thana_boss,80,76,7 duplicate(Memory Seal#tt1) Memory Seal#tt3 1709,3,3
-thana_boss,62,171,5 duplicate(Memory Seal#tt1) Memory Seal#tt4 1710,3,3
+thana_boss,202,75,3 duplicate(Memory Seal#tt1) Memory Seal#tt2 G_THA_DOLOR,3,3
+thana_boss,80,76,7 duplicate(Memory Seal#tt1) Memory Seal#tt3 G_THA_ODIUM,3,3
+thana_boss,62,171,5 duplicate(Memory Seal#tt1) Memory Seal#tt4 G_THA_DESPERO,3,3
thana_boss,141,228,0 script #thanatos_seal HIDDEN_WARP_NPC,3,3,{
end;
@@ -2200,7 +2200,7 @@ OnTimer16000:
end;
}
-thana_boss,141,235,3 script Memory Seal#tt5 1708,{
+thana_boss,141,235,3 script Memory Seal#tt5 THANATOS,{
end;
OnInit:
disablenpc "Memory Seal#tt5";
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 7aed9b696..95421cd2d 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -960,7 +960,7 @@ prt_in,228,26,5 script Steward#sign 1_M_JOBTESTER,{
}
}
-prt_in,248,23,3 script Maid#sign 1275,{
+prt_in,248,23,3 script Maid#sign ALICE,{
end;
}
prt_in,248,23,0 script Maid#sign2 HIDDEN_NPC,{
@@ -1771,7 +1771,7 @@ payon,154,170,3 script Hagin#sign 1_F_ORIENT_04,{
}
}
-payon_in03,81,22,4 script Maid#a1 1170,{
+payon_in03,81,22,4 script Maid#a1 SOHEE,{
end;
}
@@ -1784,7 +1784,7 @@ payon_in03,81,22,4 script Maid#a2 HIDDEN_NPC,{
close;
}
-payon_in03,79,22,4 script Maid#b1 1404,{
+payon_in03,79,22,4 script Maid#b1 MIYABI_NINGYO,{
end;
}
@@ -1797,7 +1797,7 @@ payon_in03,79,22,4 script Maid#b2 HIDDEN_NPC,{
close;
}
-payon_in03,81,15,1 script Maid#c1 1170,{
+payon_in03,81,15,1 script Maid#c1 SOHEE,{
end;
}
@@ -1811,7 +1811,7 @@ payon_in03,81,15,1 script Maid#c2 HIDDEN_NPC,{
close;
}
-payon_in03,79,15,1 script Maid#d1 1404,{
+payon_in03,79,15,1 script Maid#d1 MIYABI_NINGYO,{
end;
}
@@ -1825,7 +1825,7 @@ payon_in03,79,15,1 script Maid#d2 HIDDEN_NPC,{
close;
}
-payon_in03,8,31,4 script Maid#e1 1416,{
+payon_in03,8,31,4 script Maid#e1 WICKED_NYMPH,{
end;
}
@@ -1845,7 +1845,7 @@ payon_in03,8,31,4 script Maid#e2 HIDDEN_NPC,{
close;
}
-payon_in03,13,31,4 script Maid#f1 1416,{
+payon_in03,13,31,4 script Maid#f1 WICKED_NYMPH,{
end;
}
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index c3c05d6f5..64f315fa9 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -1059,7 +1059,7 @@ mora,132,184,5 script Mora Villager#sleep6 4_M_RAFLE_OR,{
close;
}
-mora,133,184,1 script Mora Villager#sleep4 1790,{
+mora,133,184,1 script Mora Villager#sleep4 G_RAFFLESIA,{
mes "[Mora Villager]";
mes "Moan...";
end;
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 1e005e43b..47e9e8000 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -702,7 +702,7 @@ OnMyMobDead:
end;
}
-1@gl_k,145,54,6 script .#ghinstance1 2471,{
+1@gl_k,145,54,6 script .#ghinstance1 MG_KHALITZBURG,{
end;
OnInstanceInit:
donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index c206599bb..2d106dc4a 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3264,7 +3264,7 @@ OnMyMobDead:
end;
}
-job3_guil03,110,27,3 script Guard Dog#dog01 1866,3,1,{
+job3_guil03,110,27,3 script Guard Dog#dog01 HELL_POODLE,3,1,{
end;
OnEnable:
enablenpc "Guard Dog#dog01";
@@ -3287,7 +3287,7 @@ OnMyMobDead:
end;
}
-job3_guil03,119,27,3 script Guard Dog#dog02 1866,3,1,{
+job3_guil03,119,27,3 script Guard Dog#dog02 HELL_POODLE,3,1,{
end;
OnEnable:
enablenpc "Guard Dog#dog02";
@@ -3455,7 +3455,7 @@ job3_guil03,111,51,7 script Priest from Rachel 4_M_MIDDLE1,{
next;
mes "[Priest from Rachel]";
mes "Because of you, you ruined everything!";
- setnpcdisplay(strnpcinfo(0),2030);
+ setnpcdisplay(strnpcinfo(0), HIDEN_PRIEST);
next;
mes "[Priest from Rachel]";
mes "You want to destroy us forever!";
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 8b81b5c4f..b4400854f 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -567,7 +567,7 @@ moc_para01,13,22,4 script Merry Badger#xch 4_F_SITDOWN,{
//switch(select("Redeem Badges:Trade in FOR badges:Exchange Rates:15 Job Manuals - 1 JM Box")) {
}
-moc_para01,174,33,3 script Bathory#2012spirits 1102,{
+moc_para01,174,33,3 script Bathory#2012spirits BATHORY,{
mes "[Bathory]";
mes "Eheeheeheehee! The spotlight is on Glast Heim this week, so I'm ferrying people there for a mere 1,000z!";
next;
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index 5276fafe5..7c5ccbc7b 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -861,7 +861,7 @@ brasilis,59,226,3 script Poring#bra 4_PORING,{
end;
}
-bra_fild01,75,83,5 script Toucan#bra 2073,2,2,{
+bra_fild01,75,83,5 script Toucan#bra TOUCAN,2,2,{
OnTouch:
if (brazil_gua == 6) {
mes "[Toucan]";
@@ -921,7 +921,7 @@ OnTouch:
end;
}
-bra_fild01,34,184,5 script Jaguar#bra 2072,2,2,{
+bra_fild01,34,184,5 script Jaguar#bra JAGUAR,2,2,{
OnTouch_:
if (brazil_gua == 7) {
mes "[Jaguar]";
@@ -983,7 +983,7 @@ OnTouch_:
end;
}
-bra_fild01,245,53,3 script #Monkeybra 1057,{
+bra_fild01,245,53,3 script #Monkeybra YOYO,{
end;
}
@@ -2661,7 +2661,7 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{
}
}
-bra_in01,136,180,5 script Ghost#bra 1867,{
+bra_in01,136,180,5 script Ghost#bra BANSHEE,{
end;
OnInit:
@@ -2832,7 +2832,7 @@ bra_fild01,323,136,1 script Pipe#brafild CLEAR_NPC,{
}
}
-bra_in01,206,190,3 script Ghost#bra_end 1867,{
+bra_in01,206,190,3 script Ghost#bra_end BANSHEE,{
end;
OnInit:
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index 3487871b4..edc964053 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -2472,7 +2472,7 @@ L_SetQuest:
close;
}
-ma_in01,125,107,3 script Ghost Diwata 1761,4,4,{
+ma_in01,125,107,3 script Ghost Diwata G_SKOGUL,4,4,{
end;
OnTouch:
if (malaya_diwata == 0) {
diff --git a/src/map/mob.c b/src/map/mob.c
index b8a8ed6c5..c3c6fceee 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3874,6 +3874,7 @@ void mob_readdb(void) {
sv->readdb(map->db_path, filename[fi], ',', 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, -1, mob->readdb_sub);
}
+ mob->name_constants();
}
/*==========================================
@@ -3923,9 +3924,18 @@ int mob_read_sqldb(void) {
ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, mob_db_name[fi]);
}
+ mob->name_constants();
return 0;
}
+void mob_name_constants(void) {
+ int i;
+ for (i = 0; i < MAX_MOB_DB; i++) {
+ if (mob->db_data[i] && !mob->is_clone(i))
+ script->set_constant2(mob->db_data[i]->sprite, i, 0);
+ }
+}
+
/*==========================================
* MOB display graphic change data reading
*------------------------------------------*/
@@ -4759,6 +4769,7 @@ void mob_defaults(void) {
mob->readdb_sub = mob_readdb_sub;
mob->readdb = mob_readdb;
mob->read_sqldb = mob_read_sqldb;
+ mob->name_constants = mob_name_constants;
mob->readdb_mobavail = mob_readdb_mobavail;
mob->read_randommonster = mob_read_randommonster;
mob->parse_row_chatdb = mob_parse_row_chatdb;
diff --git a/src/map/mob.h b/src/map/mob.h
index 31a8666a2..61f718c30 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -345,6 +345,7 @@ struct mob_interface {
bool (*readdb_sub) (char *fields[], int columns, int current);
void (*readdb) (void);
int (*read_sqldb) (void);
+ void (*name_constants) (void);
bool (*readdb_mobavail) (char *str[], int columns, int current);
int (*read_randommonster) (void);
bool (*parse_row_chatdb) (char **str, const char *source, int line, int *last_msg_id);