From 0b7b3796ec987cbb1c263722b841cfa5795aa6d3 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 8 Nov 2013 03:09:20 +0100 Subject: 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 --- npc/quests/newgears/2004_headgears.txt | 16 +-- npc/quests/newgears/2005_headgears.txt | 6 +- npc/quests/newgears/2008_headgears.txt | 2 +- npc/quests/okolnir.txt | 200 ++++++++++++++++----------------- npc/quests/quests_13_1.txt | 6 +- npc/quests/quests_13_2.txt | 4 +- npc/quests/quests_hugel.txt | 8 +- npc/quests/quests_lighthalzen.txt | 2 +- npc/quests/quests_moscovia.txt | 2 +- npc/quests/quests_nameless.txt | 2 +- npc/quests/thana_quest.txt | 10 +- npc/quests/the_sign_quest.txt | 14 +-- 12 files changed, 136 insertions(+), 136 deletions(-) (limited to 'npc/quests') 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; } -- cgit v1.2.3-60-g2f50