Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.

4 files changed, 30 insertions, 30 deletions

diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 2516a189c..1cfa2bc03 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -37,7 +37,7 @@
 
 // Black Cat Ears
 //============================================================
-payon,115,131,3	script	Neko Neko#1	725,{
+payon,115,131,3	script	Neko Neko#1	4_F_JOB_ASSASSIN,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -105,7 +105,7 @@ payon,115,131,3	script	Neko Neko#1	725,{
 
 // X Hairpin, Band Aid, Flower Hairpin
 //============================================================
-geffen,129,148,3	script	Argen#1	779,{
+geffen,129,148,3	script	Argen#1	4_M_YOYOROGUE,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "[Argen]";
@@ -295,7 +295,7 @@ geffen,129,148,3	script	Argen#1	779,{
 
 // Hot-blooded Headband
 //============================================================
-yuno,300,188,5	script	Zhenbolt#1	753,{
+yuno,300,188,5	script	Zhenbolt#1	4_M_MONK,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -391,7 +391,7 @@ yuno,300,188,5	script	Zhenbolt#1	753,{
 
 // Red Ribbon
 //============================================================
-prontera,165,232,3	script	Nephia#1	744,{
+prontera,165,232,3	script	Nephia#1	4_F_ALCHE,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -506,7 +506,7 @@ prontera,165,232,3	script	Nephia#1	744,{
 
 // Indian Headband
 //============================================================
-comodo,237,217,5	script	Meruntei#1	732,{
+comodo,237,217,5	script	Meruntei#1	4_M_JOB_HUNTER,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -560,7 +560,7 @@ comodo,237,217,5	script	Meruntei#1	732,{
 
 // Mushroom Band
 //============================================================
-geffen,67,87,3	script	Ipore#1	700,{
+geffen,67,87,3	script	Ipore#1	8_F_GIRL,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -640,7 +640,7 @@ geffen,67,87,3	script	Ipore#1	700,{
 
 // Angel Wing Ears, Devil Wing Ears
 //============================================================
-yuno,241,52,3	script	Old Blacksmith#hgear	813,{
+yuno,241,52,3	script	Old Blacksmith#hgear	2_M_OLDBLSMITH,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -961,7 +961,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 
 // Sea-Otter Hat
 //============================================================
-xmas,183,267,3	script	Pretty Lindsay#1	793,{
+xmas,183,267,3	script	Pretty Lindsay#1	4_F_NFLOSTGIRL,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -1076,7 +1076,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 
 // Teddybear Hat
 //============================================================
-xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
+xmas,175,156,3	script	Fuzzy Fuzz#1	4_M_05,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -1164,7 +1164,7 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
 
 // Model Training Hat
 //============================================================
-payon_in03,8,193,4	script	Nanhyang#1	77,{
+payon_in03,8,193,4	script	Nanhyang#1	1_F_ORIENT_03,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -1325,7 +1325,7 @@ payon_in03,8,193,4	script	Nanhyang#1	77,{
 
 // Tulip Hairpin
 //============================================================
-geffen,83,189,5	script	Seth#1	716,{
+geffen,83,189,5	script	Seth#1	4_M_KID2,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes " [Seth]";
@@ -1444,7 +1444,7 @@ geffen,83,189,5	script	Seth#1	716,{
 	
 // Party Hat, Straw Hat, Cowboy Hat, Sombrero, Beanie
 //============================================================
-xmas_in,35,30,3	script	Hat Merchant#zero	797,{
+xmas_in,35,30,3	script	Hat Merchant#zero	4_M_NFLOSTMAN,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
@@ -1735,7 +1735,7 @@ xmas_in,35,30,3	script	Hat Merchant#zero	797,{
 
 // Decorative Golden Bell, Crown of Ancient Queen, Crown of Mistress
 //============================================================
-yuno_in03,20,18,6	script	Nehris#1	726,{
+yuno_in03,20,18,6	script	Nehris#1	4_F_JOB_BLACKSMITH,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -1900,7 +1900,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 
 // Alarm Mask
 //============================================================
-alde_alche,88,180,0	script	Muscle Man#Alarm Mask	748,{
+alde_alche,88,180,0	script	Muscle Man#Alarm Mask	4_M_ALCHE_A,{
 	if (checkweight(1201,1) == 0) {
 		mes "[Muscle Man]";
 		mes "Hmmm...";
@@ -2073,7 +2073,7 @@ OnInit:
 
 // Drooping Cat, Smokie Leaf, Lazy Smokie, Blue Fish
 //============================================================
-morocc,273,79,4	script	Educated Traveller	99,{
+morocc,273,79,4	script	Educated Traveller	4W_M_03,{
 	disable_items;
 	if ((MaxWeight-Weight) < 5000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -2510,7 +2510,7 @@ OnTouch:
 	end;
 }
 
-pay_dun03,48,84,4	script	Nine Tails#Kitsune Man	762,{
+pay_dun03,48,84,4	script	Nine Tails#Kitsune Man	4_M_JPN2,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index 003019be9..a6af90a9e 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -16,7 +16,7 @@
 //= 1.3a Added 'disable_items' command. [Euphy]
 //============================================================
 
-yuno,222,116,3	script	Kasis#LhzHat	851,{
+yuno,222,116,3	script	Kasis#LhzHat	4_M_REPAIR,{
 	if(countitem(519) > 49 && countitem(7031) > 49 && countitem(548) > 49 && countitem(539) > 49)
 	{
 		mes "[Kasis]";
@@ -225,7 +225,7 @@ yuno,222,116,3	script	Kasis#LhzHat	851,{
 	}
 }
 
-lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
+lighthalzen,143,68,0	script	Strange Guy#LhzHat	1_M_01,{
 	disable_items;
 	if(DTHATQ == 0)
 	{
@@ -746,7 +746,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 	}
 }
 
-lighthalzen,360,313,3	script	Kid#LhzHat	706,{
+lighthalzen,360,313,3	script	Kid#LhzHat	4_M_KID1,{
 	mes "[Kid]";
 	if(Sex)
 		mes "Hello, mister!";
@@ -871,7 +871,7 @@ lighthalzen,360,313,3	script	Kid#LhzHat	706,{
 	}
 }
 
-einbech,70,222,5	script	Metelle#LhzHat	91,{
+einbech,70,222,5	script	Metelle#LhzHat	4_F_02,{
 	if(countitem(983) && countitem(7267) > 998 && countitem(749) && Zeny > 49999)
 	{
 		mes "[Metelle]";
@@ -981,7 +981,7 @@ einbech,70,222,5	script	Metelle#LhzHat	91,{
 
 }
 
-lhz_in02,91,38,5	script	Margaret Mary#LhzHat	90,{
+lhz_in02,91,38,5	script	Margaret Mary#LhzHat	4_F_01,{
 
 	mes "[Margaret Mary]";
 	mes "The white rose, in its";
@@ -1084,7 +1084,7 @@ lhz_in02,91,38,5	script	Margaret Mary#LhzHat	90,{
 
 }
 
-lighthalzen,182,89,0	script	Relaxed-Looking Lady	91,{
+lighthalzen,182,89,0	script	Relaxed-Looking Lady	4_F_02,{
 	disable_items;
 	if(LHZBTQ == 0)
 	{
@@ -2107,7 +2107,7 @@ gl_prison1,100,48,5	script	Rybio#LhzHat	1201,{
 	}
 }
 
-airport,148,41,3	script	Freight Manager#toast	852,{
+airport,148,41,3	script	Freight Manager#toast	4_M_EIN_SOLDIER,{
 	mes "[Kirishu]";
 	mes "Oh man...";
 	mes "It's almost lunchtime,";
diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt
index ef754e122..8a63503c2 100644
--- a/npc/quests/newgears/2006_headgears.txt
+++ b/npc/quests/newgears/2006_headgears.txt
@@ -24,7 +24,7 @@
 
 // Censor Bar
 //============================================================
-rachel,91,273,8	script	?	930,{
+rachel,91,273,8	script	?	4_M_RACHMAN2,{
 	if (countitem(983) > 0 && countitem(7111) > 99 && countitem(938) > 98 && Zeny > 99999) {
 		mes "[?]";
 		mes "Giggle giggle...isn't it my partner, eh?";
@@ -92,7 +92,7 @@ rachel,91,273,8	script	?	930,{
 
 // Feather Beret
 //============================================================
-rachel,152,131,3	script	Sakjul	928,{
+rachel,152,131,3	script	Sakjul	4_M_MIDDLE1,{
 	if (countitem(5172) > 0 && countitem(7063) > 99 && countitem(982) > 0) {
 		mes "[Sakjul]";
 		mes "Great, you have brought everything";
@@ -208,7 +208,7 @@ rachel,152,131,3	script	Sakjul	928,{
 
 // Valkyrie Helm
 //============================================================
-hugel,147,103,3	script	Ghenirhemin	897,{
+hugel,147,103,3	script	Ghenirhemin	4_M_HUGRANFA,{
 	if (moza_valkylie == 5) {
 		set .@val2,rand(1,10);
 		if (.@val2 == 3) {
@@ -565,7 +565,7 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 }
 // Hahoe Mask / Mythical Lion Mask / Bride Mask
 //============================================================
-payon,135,320,3	script	Chungwolmang	97,{
+payon,135,320,3	script	Chungwolmang	4W_M_01,{
 	if (moza_tal == 2) {
 		if (countitem(7015) > 19 && countitem(952) > 99 && countitem(1028) > 99) {
 			//Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boar's_Mane
@@ -808,7 +808,7 @@ S_MakeMask:
 
 // Magistrate Hat / Ayam
 //============================================================
-payon_in03,139,124,3	script	Han Garam	88,{
+payon_in03,139,124,3	script	Han Garam	4_M_ORIENT01,{
 	if (moza_korea == 2 && countitem(954) > 299 && countitem(733) > 4 && countitem(975) > 0 && countitem(7166) > 49) {
 		mes "[Han Garam]";
 		mes "You came back faster than I expected.";
diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt
index 5de069de8..87d1a4693 100644
--- a/npc/quests/newgears/2008_headgears.txt
+++ b/npc/quests/newgears/2008_headgears.txt
@@ -12,7 +12,7 @@
 //= 1.0 First Version. [Masao]
 //============================================================
 
-gef_fild05,80,149,3	script	Myu#08_hat	877,{
+gef_fild05,80,149,3	script	Myu#08_hat	4_F_YUNYANG,{
 	mes "[Myu]";
 	mes "Meow...";
 	emotion e_omg;
@@ -197,7 +197,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 	close;
 }
 
-morocc_in,137,102,5	script	Trainee#2008hat01	82,{
+morocc_in,137,102,5	script	Trainee#2008hat01	4_KID01,{
 	mes "[Trainee Elgo]";
 	mes "Welcome.";
 	mes "Please talk to our teacher if you are here to make a dyes.";