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

1 files changed, 50 insertions, 50 deletions

diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 37979d6d9..a0fa10275 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -16,7 +16,7 @@
 
 // Dewata Transportation
 //============================================================
-alberta,212,202,4	script	Dewata Sailor#alberta	536,{
+alberta,212,202,4	script	Dewata Sailor#alberta	4_M_DEWMAN,{
 	mes "[Dewata Sailor]";
 	mes "Do you want to visit ^8B4513Dewata Island^000000?";
 	mes "With it's dazzling waves and charming views it's a great place to relax.";
@@ -46,7 +46,7 @@ alberta,212,202,4	script	Dewata Sailor#alberta	536,{
 	}
 }
 
-dewata,229,49,6	script	Alberta Sailor#dewata	536,{
+dewata,229,49,6	script	Alberta Sailor#dewata	4_M_DEWMAN,{
 	mes "[Alberta Sailor]";
 	mes "Do you want to go back to Alberta?";
 	next;
@@ -69,7 +69,7 @@ dewata,229,49,6	script	Alberta Sailor#dewata	536,{
 
 // Generic Dewata NPCs
 //============================================================
-dewata,221,237,5	script	Young Man#dew-1	536,{
+dewata,221,237,5	script	Young Man#dew-1	4_M_DEWMAN,{
 	mes "[Fruit Fancier]";
 	mes "What's wrong with your faaaaaace? You must really be clueless!";
 	next;
@@ -165,7 +165,7 @@ dewata,221,237,5	script	Young Man#dew-1	536,{
 	}
 }
 
-dewata,114,243,6	script	Lazy Young Man#dew	536,1,1,{
+dewata,114,243,6	script	Lazy Young Man#dew	4_M_DEWMAN,1,1,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
 		mes "[Lazy Young Man]";
 		mes "Why are you carrying so much? Isn't it heavy?";
@@ -211,7 +211,7 @@ OnTouch:
 	end;
 }
 
-dewata,159,81,4	script	Tourist#dew-1	881,{
+dewata,159,81,4	script	Tourist#dew-1	4_M_SITDOWN,{
 	mes "[Nasolo]";
 	mes "Wow~ Pure ocean, a warm beach...";
 	mes "Perfect for a date with a girlfriend...";
@@ -226,7 +226,7 @@ dewata,159,81,4	script	Tourist#dew-1	881,{
 	close;
 }
 
-dewata,146,109,5	script	Restauranteur#dew	886,{
+dewata,146,109,5	script	Restauranteur#dew	4_COOK,{
 	if (checkweight(11532,1) == 0 || checkweight(11533,1) == 0 || MaxWeight - Weight < 500) {
 		mes "[Restauranteur]";
 		mes "You came to taste my dish? It is always good to eat with an empty stomach.";
@@ -311,7 +311,7 @@ dewata,146,109,5	script	Restauranteur#dew	886,{
 	}
 }
 
-dewata,147,107,6	script	Gourmet#dew	85,{
+dewata,147,107,6	script	Gourmet#dew	4_M_03,{
 	mes "[Gourmet]";
 	mes "Oh... it's like a party in my";
 	mes "mouth... and everyone's invited!";
@@ -327,7 +327,7 @@ dewata,147,107,6	script	Gourmet#dew	85,{
 	close;
 }
 
-dewata,154,107,4	script	Sightseer#dew	86,{
+dewata,154,107,4	script	Sightseer#dew	4_M_04,{
 	mes "[Tourist]";
 	mes "Wow...";
 	mes "How many has he already eaten?";
@@ -341,7 +341,7 @@ dewata,154,107,4	script	Sightseer#dew	86,{
 	close;
 }
 
-dewata,95,203,6	script	Travel Guide#dew	536,{
+dewata,95,203,6	script	Travel Guide#dew	4_M_DEWMAN,{
 	mes "[Guide]";
 	mes "This temple behind me is called Borobudur.";
 	mes "Borobudur temple was built in the 9th century";
@@ -366,7 +366,7 @@ dewata,95,203,6	script	Travel Guide#dew	536,{
 	close;
 }
 
-dewata,97,207,4	script	Tourist#dew1	803,{
+dewata,97,207,4	script	Tourist#dew1	1_F_SIGNZISK,{
 	mes "[Tourist]";
 	mes "Oh, dag-nabbit... I've gone and";
 	mes "picked the wrong tour guide...";
@@ -382,7 +382,7 @@ dewata,97,207,4	script	Tourist#dew1	803,{
 	close;
 }
 
-dewata,100,206,4	script	Tourist#dew2	59,{
+dewata,100,206,4	script	Tourist#dew2	1_M_ORIENT01,{
 	mes "[Tourist]";
 	mes "Hey, let's go there! Hurry up,";
 	mes "while the tour guide is explaining~";
@@ -393,7 +393,7 @@ dewata,100,206,4	script	Tourist#dew2	59,{
 	close;
 }
 
-dewata,101,206,4	script	Tourist#dew3	90,{
+dewata,101,206,4	script	Tourist#dew3	4_F_01,{
 	mes "[Tourist]";
 	mes "Aren't we going to get lost without the guide?";
 	next;
@@ -402,7 +402,7 @@ dewata,101,206,4	script	Tourist#dew3	90,{
 	close;
 }
 
-dewata,99,203,4	script	Tourist#dew4	755,{
+dewata,99,203,4	script	Tourist#dew4	4_M_SAGE_C,{
 	mes "[Tourist]";
 	mes "Oh~ This is very interesting. A";
 	mes "temple that worships the Buddha...";
@@ -418,7 +418,7 @@ dewata,99,203,4	script	Tourist#dew4	755,{
 	close;
 }
 
-dewata,67,186,8	script	Monk#dew1	834,{
+dewata,67,186,8	script	Monk#dew1	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "I am a monk, content to spend my days in religious study.";
 	next;
@@ -430,7 +430,7 @@ dewata,67,186,8	script	Monk#dew1	834,{
 	close;
 }
 
-dewata,65,188,8	script	Monk#dew2	834,{
+dewata,65,188,8	script	Monk#dew2	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "Borobudur temple is one of few temples left for worshiping the Great Buddha.";
 	next;
@@ -439,7 +439,7 @@ dewata,65,188,8	script	Monk#dew2	834,{
 	close;
 }
 
-dewata,63,190,8	script	Monk#dew3	834,{
+dewata,63,190,8	script	Monk#dew3	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "Are you a Tourist? You can make an offering and a wish to one of the shrines.";
 	next;
@@ -448,7 +448,7 @@ dewata,63,190,8	script	Monk#dew3	834,{
 	close;
 }
 
-dewata,62,192,8	script	Monk#dew4	834,{
+dewata,62,192,8	script	Monk#dew4	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "Our great Buddha is the king of souls and the leader of all good Gods.";
 	next;
@@ -460,7 +460,7 @@ dewata,62,192,8	script	Monk#dew4	834,{
 	close;
 }
 
-dewata,89,191,6	script	Small Shrine#dew1	844,{
+dewata,89,191,6	script	Small Shrine#dew1	CLEAR_NPC,{
 	mes "There is a small shrine here. There are many people making wishes.";
 	next;
 	switch(select("Make a donation.:Make a wish.:Walk away.")) {
@@ -559,11 +559,11 @@ L_Wish:
 	next;
 	return;
 }
-dewata,89,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew2	844
-dewata,68,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew3	844
-dewata,68,191,6	duplicate(Small Shrine#dew1)	Small Shrine#dew4	844
+dewata,89,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew2	CLEAR_NPC
+dewata,68,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew3	CLEAR_NPC
+dewata,68,191,6	duplicate(Small Shrine#dew1)	Small Shrine#dew4	CLEAR_NPC
 
-dewata,75,122,6	script	Monk#dewt1	834,{
+dewata,75,122,6	script	Monk#dewt1	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "You are a stranger here. What brings here to this quiet place?";
 	next;
@@ -579,7 +579,7 @@ dewata,75,122,6	script	Monk#dewt1	834,{
 	}
 }
 
-dewata,69,101,6	script	Monk#dewt2	834,{
+dewata,69,101,6	script	Monk#dewt2	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "We have a pagoda for the worship of Buddhas. Each temple has one of these towers, though not many people come here besides other monks.";
 	next;
@@ -614,7 +614,7 @@ dewata,69,101,6	script	Monk#dewt2	834,{
 	}
 }
 
-dewata,71,79,6	script	Monk#dewt3	834,{
+dewata,71,79,6	script	Monk#dewt3	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "This tower is built on the edge of coastal cliff. You can pray with a cool ocean breeze in your hair.";
 	next;
@@ -623,7 +623,7 @@ dewata,71,79,6	script	Monk#dewt3	834,{
 	close;
 }
 
-dewata,211,272,4	script	Lodge Owner#dew	534,2,3,{
+dewata,211,272,4	script	Lodge Owner#dew	4_M_DEWOLDMAN,2,3,{
 OnTouch:
 	mes "[Lodge Owner]";
 	mes "These days, we have many honeymooners visiting here.";
@@ -640,7 +640,7 @@ OnTouch:
 	close;
 }
 
-dewata,245,244,4	script	Lodge Employee#dew	536,2,3,{
+dewata,245,244,4	script	Lodge Employee#dew	4_M_DEWMAN,2,3,{
 OnTouch:
 	mes "[Lodge employee]";
 	mes "Argg~ This is really ticking me off!";
@@ -657,7 +657,7 @@ OnTouch:
 	close;
 }
 
-dewata,233,263,8	script	Sweet Married Couple#1	828,2,3,{
+dewata,233,263,8	script	Sweet Married Couple#1	4_M_ROGUE,2,3,{
 OnTouch:
 	mes "[Sweet Husband]";
 	mes "You are the most beautiful thing in the world baby~";
@@ -677,7 +677,7 @@ OnTouch:
 	close;
 }
 
-dewata,234,263,8	script	Sweet Married Couple#2	727,2,3,{
+dewata,234,263,8	script	Sweet Married Couple#2	4_F_JOB_HUNTER,2,3,{
 OnTouch:
 	mes "[Sweet Wife]";
 	mes "Baby~ You know what flower that is~?";
@@ -708,7 +708,7 @@ OnTouch:
 	close;
 }
 
-dewata,279,213,4	script	Tourist#dew-2	887,2,3,{
+dewata,279,213,4	script	Tourist#dew-2	4_M_LIEMAN,2,3,{
 OnTouch:
 	mes "[Reclining Tourist]";
 	mes "Wow~ This is really comfy~";
@@ -726,7 +726,7 @@ OnTouch:
 	close;
 }
 
-dewata,269,208,4	script	Little Kid in Town#dew	538,2,3,{
+dewata,269,208,4	script	Little Kid in Town#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Kid]";
 	mes "Hey "+((Sex)?"bro":"sis")+", look at that man!";
@@ -743,7 +743,7 @@ OnTouch:
 	close;
 }
 
-dewata,227,129,4	script	Sarr#dew	538,2,3,{
+dewata,227,129,4	script	Sarr#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Sarr]";
 	mes "They're hiding so I should seek.";
@@ -766,7 +766,7 @@ OnTouch:
 	close;
 }
 
-dewata,239,140,4	script	Siyak#dew	539,2,3,{
+dewata,239,140,4	script	Siyak#dew	4_M_DEWGIRL,2,3,{
 OnTouch:
 	mes "[Siyak]";
 	mes "Hey come on, move over~ He's gonna find me~~";
@@ -784,7 +784,7 @@ OnTouch:
 	close;
 }
 
-dewata,193,145,4	script	Sipo#dew	538,2,3,{
+dewata,193,145,4	script	Sipo#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Sipo]";
 	mes "Sarr won't find me here, right?";
@@ -801,7 +801,7 @@ OnTouch:
 	close;
 }
 
-dewata,228,177,4	script	Majya#dew	538,2,3,{
+dewata,228,177,4	script	Majya#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Majya]";
 	mes "I was playing hide-and-seek with my friends...";
@@ -815,7 +815,7 @@ OnTouch:
 	close;
 }
 
-dewata,278,100,4	script	Missing Child#dew	703,2,3,{
+dewata,278,100,4	script	Missing Child#dew	4_F_KID2,2,3,{
 OnTouch:
 	mes "[Ukki]";
 	mes "WaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaa~";
@@ -840,7 +840,7 @@ OnTouch:
 	close;
 }
 
-dewata,249,87,4	script	Mum#dew	101,2,3,{
+dewata,249,87,4	script	Mum#dew	4W_F_01,2,3,{
 OnTouch:
 	mes "[Mum]";
 	mes "Ukki~ Ukki~ Where did she go?";
@@ -855,7 +855,7 @@ OnTouch:
 	close;
 }
 
-dewata,251,85,6	script	Poppa#dew	97,2,3,{
+dewata,251,85,6	script	Poppa#dew	4W_M_01,2,3,{
 OnTouch:
 	mes "[Poppa]";
 	mes "Honey, is Ukki lost again?";
@@ -876,7 +876,7 @@ OnTouch:
 	close;
 }
 
-dewata,278,281,4	script	Happily Married Grandpa	534,{
+dewata,278,281,4	script	Happily Married Grandpa	4_M_DEWOLDMAN,{
 	mes "[Happily Married Grandpa]";
 	mes "Today, I should ask my lady to";
 	mes "cook me some ^006400fried rice^000000.";
@@ -892,7 +892,7 @@ dewata,278,281,4	script	Happily Married Grandpa	534,{
 	close;
 }
 
-dewata,280,277,4	script	Happily Married Grandma	535,{
+dewata,280,277,4	script	Happily Married Grandma	4_M_DEWOLDWOMAN,{
 	mes "[Happily Married Grandma]";
 	mes "In my younger days,";
 	mes "there were many gentleman callers";
@@ -920,7 +920,7 @@ dewata,280,277,4	script	Happily Married Grandma	535,{
 	close;
 }
 
-dewata,165,103,6	script	Adventurer Semangat#dew	534,{
+dewata,165,103,6	script	Adventurer Semangat#dew	4_M_DEWOLDMAN,{
 	mes "[Adventurer Semangat]";
 	mes "I also traveled around the World";
 	mes "When I was young like you.";
@@ -942,7 +942,7 @@ dewata,165,103,6	script	Adventurer Semangat#dew	534,{
 	close;
 }
 
-dewata,139,114,6	script	Semangat's Wife#dew	535,{
+dewata,139,114,6	script	Semangat's Wife#dew	4_M_DEWOLDWOMAN,{
 	mes "[Semangat's Wife]";
 	mes "Where's that old man";
 	mes "gone off to again?";
@@ -977,7 +977,7 @@ dewata,139,114,6	script	Semangat's Wife#dew	535,{
 	}
 }
 
-dewata,181,88,6	script	Young Man#dew-2	536,{
+dewata,181,88,6	script	Young Man#dew-2	4_M_DEWMAN,{
 	mes "[Young Man]";
 	mes "Isn't ^8B4513Dewata^000000 beach";
 	mes "really beautiful?";
@@ -994,7 +994,7 @@ dewata,181,88,6	script	Young Man#dew-2	536,{
 	close;
 }
 
-dewata,179,204,4	script	Young Lady#dew	537,{
+dewata,179,204,4	script	Young Lady#dew	4_M_DEWWOMAN,{
 	mes "[Young Lady]";
 	mes "When you are outside of the town,";
 	mes "and meet ^FF0000Tiger, Monkey, or pig^000000,";
@@ -1016,7 +1016,7 @@ dewata,179,204,4	script	Young Lady#dew	537,{
 	close;
 }
 
-dewata,280,236,4	script	Settler#dew	726,{
+dewata,280,236,4	script	Settler#dew	4_F_JOB_BLACKSMITH,{
 	mes "[Settler]";
 	mes "I'm not really from ^8B4513Dewata^000000.";
 	mes "But while traveling,";
@@ -1036,7 +1036,7 @@ dewata,280,236,4	script	Settler#dew	726,{
 	close;
 }
 
-dewata,204,230,6	script	Dieting Lady#dew	537,{
+dewata,204,230,6	script	Dieting Lady#dew	4_M_DEWWOMAN,{
 	if (countitem(11533) == 0) {
 		mes "[Dieting Lady]";
 		mes "Ah~ I'm starving!!";
@@ -1081,7 +1081,7 @@ dewata,204,230,6	script	Dieting Lady#dew	537,{
 	}
 }
 
-dewata,117,156,6	script	Dreaming Kid#dew	538,{
+dewata,117,156,6	script	Dreaming Kid#dew	4_M_DEWBOY,{
 	mes "[Dreaming Kid]";
 	mes "My granny says";
 	mes "There was once a bird named ^FF0000Garuda^000000";
@@ -1099,7 +1099,7 @@ dewata,117,156,6	script	Dreaming Kid#dew	538,{
 	close;
 }
 
-dewata,144,216,4	script	Energetic Kid#dew	538,{
+dewata,144,216,4	script	Energetic Kid#dew	4_M_DEWBOY,{
 	mes "[Energetic Kid]";
 	mes "My parents used to tell me...";
 	next;
@@ -1120,7 +1120,7 @@ dewata,144,216,4	script	Energetic Kid#dew	538,{
 	close;
 }
 
-dewata,127,248,6	script	Wishing Kid#dew	539,{
+dewata,127,248,6	script	Wishing Kid#dew	4_M_DEWGIRL,{
 	mes "[Kid wishing to be an adult]";
 	mes "My family has been brewing";
 	mes "traditional Dewata wine for ages.";
@@ -1140,7 +1140,7 @@ dewata,127,248,6	script	Wishing Kid#dew	539,{
 	close;
 }
 
-dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper	541,{
+dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper	4_M_DEWZATIMAN,{
 	mes "[Jaty Tribe Gatekeeper]";
 	mes "Welcome to ^FF0000Jaty^000000 town.";
 	mes "Our tribe reveres strength and bravery.";
@@ -1148,7 +1148,7 @@ dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper	541,{
 	close;
 }
 
-dew_fild01,106,306,4	script	R. Jaty Tribe Warrior	541,{
+dew_fild01,106,306,4	script	R. Jaty Tribe Warrior	4_M_DEWZATIMAN,{
 	mes "[Reserved Jaty Warrior]";
 	mes "I want to be the very best";
 	mes "like no one ever was.";