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 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'npc/quests/newgears') 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)+"]"; -- cgit v1.2.3-70-g09d2