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

1 files changed, 41 insertions, 41 deletions

diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 54a7b3e95..b9f086264 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -37,7 +37,7 @@
 
 // Soup Quest :: lou_tre
 //============================================================
-lou_in02,53,174,7	script	Employee#1	822,6,62,{
+lou_in02,53,174,7	script	Employee#1	4_M_CHNMAN,6,62,{
 	if (gettime(3) >= 10 && gettime(3) < 22) {
 		mes "[Chang Pai]";
 		mes "Welcome, welcome!";
@@ -112,7 +112,7 @@ OnTouch:
 	end;
 }
 
-lou_in02,76,181,3	script	Employee#2	822,2,2,{
+lou_in02,76,181,3	script	Employee#2	4_M_CHNMAN,2,2,{
 	if (gettime(3) >= 10 && gettime(3) < 22) {
 		mes "[Huang Jia Xian]";
 		mes "Welcome~";
@@ -202,7 +202,7 @@ OnTouch:
 	end;
 }
 
-lou_in02,61,175,3	script	Employee#3	818,2,2,{
+lou_in02,61,175,3	script	Employee#3	4_F_CHNWOMAN,2,2,{
 	if (gettime(3) >= 10 && gettime(3) < 22) {
 		if (ch_tre == 5) {
 			mes "[Ya Hua]";
@@ -299,7 +299,7 @@ OnTouch:
 	end;
 }
 
-lou_in02,62,183,3	script	Chef#1-2	820,2,2,{
+lou_in02,62,183,3	script	Chef#1-2	4_M_CHNCOOK,2,2,{
 	if (ch_tre > 0 && ch_tre < 4) {
 		mes "[Wang Shi Long]";
 		mes "Hm? Aren't you a customer? I am Wang Shi Long, the chef of this restaurant.";
@@ -435,7 +435,7 @@ OnTouch:
 	end;
 }
 
-lou_fild01,195,177,5	script	Jiu Lian Bu#1-1	819,{
+lou_fild01,195,177,5	script	Jiu Lian Bu#1-1	4_M_CHN8GUEK,{
 	//Remove outdated variables and attempt to preserve prior quest progress.
 	if (QL_ACCEPTSOUP) set ch_tre,1;
 	if (QL_GOTDRAGONSOUP) set ch_tre,2;
@@ -606,7 +606,7 @@ lou_fild01,195,177,5	script	Jiu Lian Bu#1-1	819,{
 	close;
 }
 
-lou_fild01,175,173,3	script	Jiu Lian Bu#1-2	819,{
+lou_fild01,175,173,3	script	Jiu Lian Bu#1-2	4_M_CHN8GUEK,{
 	emotion e_heh;
 	if (ch_tre == 4) {
 		mes "[Jiu Lian Bu]";
@@ -710,7 +710,7 @@ lou_fild01,175,173,3	script	Jiu Lian Bu#1-2	819,{
 	end;
 }
 
-lou_in02,50,185,5	script	Pot#1	111,{
+lou_in02,50,185,5	script	Pot#1	HIDDEN_NPC,{
 	if (ch_tre == 1) {
 		mes "^3131FFBeneath the shadows,";
 		mes "you find a large pot filled with dark, red liquid. What do you";
@@ -782,7 +782,7 @@ lou_in02,50,185,5	script	Pot#1	111,{
 	close;
 }
 
-lou_in02,49,185,5	script	Pot#2	111,{
+lou_in02,49,185,5	script	Pot#2	HIDDEN_NPC,{
 	if (ch_tre == 1) {
 		mes "^3131FFBeneath the shadows,";
 		mes "you find a large pot filled with dark, red liquid. What do you";
@@ -854,7 +854,7 @@ lou_in02,49,185,5	script	Pot#2	111,{
 	close;
 }
 
-lou_in02,58,183,5	script	Chef Assistant#lou1	823,5,5,{
+lou_in02,58,183,5	script	Chef Assistant#lou1	4_M_CHNMONK,5,5,{
 	mes "[Jin Wei Ling]";
 	mes "I used to be";
 	mes "an enthusiastic";
@@ -940,7 +940,7 @@ OnTouch:
 	end;
 }
 
-lou_in02,80,173,3	script	Li Min#lou	746,{
+lou_in02,80,173,3	script	Li Min#lou	4_F_MONK,{
 	if (ch_tre == 5) {
 		mes "[Li Min]";
 		mes "^666666*Sigh*^000000 I am so disappointed. I came all the way down here to taste the food! I can't believe they don't sell it anymore!";
@@ -977,7 +977,7 @@ lou_in02,80,173,3	script	Li Min#lou	746,{
 	close;
 }
 
-lou_in02,42,186,5	script	Liu Jia Lim#lou	816,{
+lou_in02,42,186,5	script	Liu Jia Lim#lou	4_F_CHNDRESS2,{
 	if (ch_tre == 5) {
 		mes "[Liu Jia Lim]";
 		mes "Do you know what was this restaurant's best dish throughout all of its history? Dragon Soup!";
@@ -1005,7 +1005,7 @@ lou_in02,42,186,5	script	Liu Jia Lim#lou	816,{
 	close;
 }
 
-lou_in02,43,169,1	script	Jiang Rong#lou	827,{
+lou_in02,43,169,1	script	Jiang Rong#lou	4_M_GRANDMONK,{
 	mes "[Jiang Rong]";
 	mes "Dragon Soup is known for its spicy, yet sweet and refreshing taste.";
 	next;
@@ -1022,7 +1022,7 @@ lou_in02,43,169,1	script	Jiang Rong#lou	827,{
 	close;
 }
 
-louyang,261,123,3	script	Chi Wu Ping#lou	824,{
+louyang,261,123,3	script	Chi Wu Ping#lou	4_M_CHNOLD,{
 	mes "[Chi Wu Ping]";
 	mes "I don't feel good...";
 	mes "So... Totally out of it...";
@@ -1056,7 +1056,7 @@ louyang,261,123,3	script	Chi Wu Ping#lou	824,{
 	close;
 }
 
-louyang,174,150,5	script	Jiu Chi Ling#lou	815,{
+louyang,174,150,5	script	Jiu Chi Ling#lou	4_F_CHNDRESS1,{
 	if (ch_tre == 5) {
 		mes "[Jiu Chi Ling]";
 		mes "There's a strange rumor going around that the restaurant is no longer selling Dragon Soup...";
@@ -1088,7 +1088,7 @@ louyang,174,150,5	script	Jiu Chi Ling#lou	815,{
 
 // Doctor Quest :: dr_china
 //============================================================
-lou_in02,265,69,5	script	Doctor#lyang	814,{
+lou_in02,265,69,5	script	Doctor#lyang	4_F_CHNDOCTOR,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a minute! Right now, you're over weight, so you cannot receive more items. Please store some of your things in Kafra Storage and try again.^000000";
 		close;
@@ -1499,7 +1499,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 	close;
 }
 
-lou_in02,272,55,0	script	Familiar-Looking Patient	798,{
+lou_in02,272,55,0	script	Familiar-Looking Patient	4_M_NFMAN,{
 	if (ch_par == 0 ) {
 		mes "[??????]";
 		mes "Awwww.....";
@@ -1526,7 +1526,7 @@ lou_in02,272,55,0	script	Familiar-Looking Patient	798,{
 	}
 }
 
-lou_in02,248,166,2	script	Tool Shop Master#lou	824,{
+lou_in02,248,166,2	script	Tool Shop Master#lou	4_M_CHNOLD,{
 	if (ch_par < 2) {
 		mes "[Wang Chuiyi]";
 		mes "My business hasn't been doing";
@@ -1589,7 +1589,7 @@ lou_in02,248,166,2	script	Tool Shop Master#lou	824,{
 	}
 }
 
-lou_in02,201,166,4	script	Storage Keeper#lou	819,{
+lou_in02,201,166,4	script	Storage Keeper#lou	4_M_CHN8GUEK,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FF * Wait a moment!! *";
 		mes "Currently you're over weight, so you cannot receive more items into your inventory. Please store some of your items into Kafra Storage and try again.^000000";
@@ -1827,7 +1827,7 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 	close;
 }
 
-lou_in02,210,47,0	script	City Hall Officer#lou	825,{
+lou_in02,210,47,0	script	City Hall Officer#lou	4_M_CHNSOLDIER,{
 	if (ch_par < 5) {
 		mes "[Jin Chiyuan]";
 		mes "^666666*Yawn~*^000000";
@@ -1982,7 +1982,7 @@ lou_in02,210,47,0	script	City Hall Officer#lou	825,{
 	close;
 }
 
-lou_in02,156,38,0	script	Studying Officer#lou	822,{
+lou_in02,156,38,0	script	Studying Officer#lou	4_M_CHNMAN,{
 	if (ch_par < 5) {
 		mes "[Huang Zhishu]";
 		mes ".....";
@@ -2153,7 +2153,7 @@ lou_in02,156,38,0	script	Studying Officer#lou	822,{
 	close;
 }
 
-lou_in02,204,169,0	script	Supply Stack#1lou	111,{
+lou_in02,204,169,0	script	Supply Stack#1lou	HIDDEN_NPC,{
 	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again. ^000000";
@@ -2203,7 +2203,7 @@ lou_in02,204,169,0	script	Supply Stack#1lou	111,{
 	close;
 }
 
-lou_in02,207,168,0	script	Supply Stack#5lou	111,{
+lou_in02,207,168,0	script	Supply Stack#5lou	HIDDEN_NPC,{
 	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute !! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
@@ -2255,7 +2255,7 @@ lou_in02,207,168,0	script	Supply Stack#5lou	111,{
 	close;
 }
 
-lou_in02,206,163,0	script	Supply Stack#4lou	111,{
+lou_in02,206,163,0	script	Supply Stack#4lou	HIDDEN_NPC,{
 	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute !! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
@@ -2307,7 +2307,7 @@ lou_in02,206,163,0	script	Supply Stack#4lou	111,{
 	close;
 }
 
-lou_in02,198,170,0	script	Supply Stack#3lou	111,{
+lou_in02,198,170,0	script	Supply Stack#3lou	HIDDEN_NPC,{
 	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute !! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
@@ -2359,7 +2359,7 @@ lou_in02,198,170,0	script	Supply Stack#3lou	111,{
 	close;
 }
 
-lou_in02,192,170,0	script	Supply Stack#2	111,{
+lou_in02,192,170,0	script	Supply Stack#2	HIDDEN_NPC,{
 	if (MaxWeight - Weight < 2000) {
 		mes "^3355FF* Wait a minute !! *";
 		mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
@@ -2414,7 +2414,7 @@ lou_in02,203,159,0	warp	Storage Warp#4	1,1,louyang,129,118
 
 // Poison King Quest :: poison_king
 //============================================================
-lou_in02,123,39,4	script	Poison King#lou	824,{
+lou_in02,123,39,4	script	Poison King#lou	4_M_CHNOLD,{
 	// Attempt to preserve prior quest progress.
 	if (ch_poison == 0 && CL_POISONKING != 0) {
 		if (QL_POISONKING <= 12) set ch_poison,QL_POISONKING;
@@ -3406,7 +3406,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 	}
 }
 
-lou_in02,253,45,0	script	Employee#poison	822,{
+lou_in02,253,45,0	script	Employee#poison	4_M_CHNMAN,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FF * Wait a minute! *";
 		mes "You're carrying too many items with you right now. Please put some of your things into Kafra Storage and try again.^000000";
@@ -4096,7 +4096,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 	close;
 }
 
-lou_fild01,224,348,0	script	Lady#delivery	817,{
+lou_fild01,224,348,0	script	Lady#delivery	4_F_CHNDRESS3,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FF * Wait a minute! *";
 		mes "Currently, you're carrying too many items. Please put some of your things into Kafra Storage and try again.^000000";
@@ -4247,7 +4247,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 	}
 }
 
-lou_fild01,225,350,0	script	 #fire	139,{
+lou_fild01,225,350,0	script	 #fire	HIDDEN_WARP_NPC,{
 	end;
 }
 
@@ -4325,7 +4325,7 @@ OnTouch:
 	end;
 }
 
-louyang,217,278,0	script	 #lou_path	111,{
+louyang,217,278,0	script	 #lou_path	HIDDEN_NPC,{
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "["+strcharinfo(0)+"]";
 		mes "What's this?";
@@ -4341,7 +4341,7 @@ louyang,217,278,0	script	 #lou_path	111,{
 	end;
 }
 
-lou_in01,107,163,0	script	 #lou_drink1	111,{
+lou_in01,107,163,0	script	 #lou_drink1	HIDDEN_NPC,{
 	if (ch_poison == 12) {
 		mes "^3355FFYou found a drink bottle that's possibly owned by Bai Long, lord of Louyang.^00000";
 		next;
@@ -4373,7 +4373,7 @@ lou_in01,107,163,0	script	 #lou_drink1	111,{
 	close;
 }
 
-lou_in01,118,167,0	script	 #lou_drink2	111,{
+lou_in01,118,167,0	script	 #lou_drink2	HIDDEN_NPC,{
 	if (ch_poison == 12) {
 		mes "^3355FFYou squeeze through the crack as quickly as you can.^000000";
 		close2;
@@ -4389,7 +4389,7 @@ lou_in01,118,167,0	script	 #lou_drink2	111,{
 	end;
 }
 
-lou_in01,99,158,4	script	Lord#bailong	821,{
+lou_in01,99,158,4	script	Lord#bailong	4_M_CHNGENERL,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FF * Wait a minute! *";
 		mes "Right now you're carrying too many items. Please put some of your things into Kafra Storage and try again.^000000";
@@ -4483,7 +4483,7 @@ lou_in01,99,158,4	script	Lord#bailong	821,{
 	}
 }
 
-lou_in01,111,151,4	script	Soldier#bailong1	825,{
+lou_in01,111,151,4	script	Soldier#bailong1	4_M_CHNSOLDIER,{
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Hey...";
@@ -4505,7 +4505,7 @@ lou_in01,111,151,4	script	Soldier#bailong1	825,{
 	close;
 }
 
-lou_in01,91,151,4	script	Soldier#bailong2	825,{
+lou_in01,91,151,4	script	Soldier#bailong2	4_M_CHNSOLDIER,{
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Huh...?";
@@ -4538,7 +4538,7 @@ lou_in01,91,151,4	script	Soldier#bailong2	825,{
 	close;
 }
 
-lou_in01,102,144,4	script	Soldier#bailong3	825,{
+lou_in01,102,144,4	script	Soldier#bailong3	4_M_CHNSOLDIER,{
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Huh...?";
@@ -4564,7 +4564,7 @@ lou_in01,102,144,4	script	Soldier#bailong3	825,{
 	close;
 }
 
-lou_in01,99,144,4	script	Soldier#bailong4	825,{
+lou_in01,99,144,4	script	Soldier#bailong4	4_M_CHNSOLDIER,{
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Who goes there?!";
@@ -4588,7 +4588,7 @@ lou_in01,99,144,4	script	Soldier#bailong4	825,{
 
 // Revolution Quest :: lou_zero
 //============================================================
-lou_in02,77,37,7	script	Hermit	824,{
+lou_in02,77,37,7	script	Hermit	4_M_CHNOLD,{
 	if (!QL_REVOL) {
 		mes "[Sun Mao]";
 		mes "Where there's a will,";
@@ -4864,7 +4864,7 @@ lou_in02,77,37,7	script	Hermit	824,{
 	}
 }
 
-lou_in01,43,147,3	script	Gunpowder Expert	750,{
+lou_in01,43,147,3	script	Gunpowder Expert	4_M_ALCHE_C,{
 	if (ch_make == 0) {
 		getpartymember(getcharid(1));
 		set @partymember,$@partymembercount;
@@ -4953,7 +4953,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 	}
 }
 
-lou_in01,45,138,3	script	Soldier#1	825,{
+lou_in01,45,138,3	script	Soldier#1	4_M_CHNSOLDIER,{
 	if (countitem(7204)) {
 		mes "[Soldier]";
 		mes "Hold on there!";
@@ -4971,7 +4971,7 @@ lou_in01,45,138,3	script	Soldier#1	825,{
 	end;
 }
 
-lou_in01,82,139,7	script	Soldier#2	825,{
+lou_in01,82,139,7	script	Soldier#2	4_M_CHNSOLDIER,{
 	if (countitem(7068) || countitem(7096) || countitem(7004)) {
 		mes "[Soldier]";
 		mes "I am sorry, but it is prohibited to enter with some of the products";