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

5 files changed, 44 insertions, 44 deletions

diff --git a/npc/custom/quests/thq/THQS_ChatingNPC.txt b/npc/custom/quests/thq/THQS_ChatingNPC.txt
index 5fce4d13d..a8cb49b9f 100644
--- a/npc/custom/quests/thq/THQS_ChatingNPC.txt
+++ b/npc/custom/quests/thq/THQS_ChatingNPC.txt
@@ -12,7 +12,7 @@
 //============================================================
 
 //Entrance Flags
-yuno,48,101,6	script	Notice	722,{
+yuno,48,101,6	script	Notice	GUILD_FLAG,{
 	mes "^FF0000[ Treasure Hunter Guild House ]^000000";
 	mes " ";
 	mes "Welcome to the Treasure Hunter's Guild House.";
@@ -24,7 +24,7 @@ yuno,48,101,6	script	Notice	722,{
 	close;
 }
 //Saver Girl;
-yuno_in01,32,178,3	script	Ahlma	94,{
+yuno_in01,32,178,3	script	Ahlma	4_F_MAID,{
 	mes "[Ahlma]";
 	if (Event_THQS == 0) goto N_Member;
 	mes "Welcome to The Treasure Hunter Guild.";
@@ -44,7 +44,7 @@ N_Member:
 	close;
 }
 //Retired Smile mask girl;
-yuno_in01,33,162,3	script	Smile Helper	92,{
+yuno_in01,33,162,3	script	Smile Helper	4_F_03,{
 	mes "[Smile Gal]";
 	mes "Oh man...I am so sick of";
 	mes "trading Mr. Smile masks for crap.";
@@ -53,7 +53,7 @@ yuno_in01,33,162,3	script	Smile Helper	92,{
 	close;
 }
 //Usless Female Assasin;
-yuno_in01,22,162,6	script	Female Assasin	725,{
+yuno_in01,22,162,6	script	Female Assasin	4_F_JOB_ASSASSIN,{
 	mes "[Sharlet]";
 	if (Event_THQS > 0) goto N_Member;
 	mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
@@ -74,7 +74,7 @@ N_Chat2:
 	close;
 }
 //another usless member
-yuno_in01,25,162,6	script	Female Wizard	123,{
+yuno_in01,25,162,6	script	Female Wizard	2_F_MAGICMASTER,{
 	mes "[Sasha]";
 	if (Event_THQS > 0) goto N_Member;
 	mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt
index 0e13645b7..a49c92ed3 100644
--- a/npc/custom/quests/thq/THQS_GuildNPC.txt
+++ b/npc/custom/quests/thq/THQS_GuildNPC.txt
@@ -11,7 +11,7 @@
 //= #Treasure_Token - used to keep track of tokens
 //============================================================
 
-yuno_in01,124,164,6	script	Guild Leader	108,{
+yuno_in01,124,164,6	script	Guild Leader	1_M_PRON_KING,{
 	mes "[Keegan]";
 	mes "What brings you here? Have something to say?";
 	next;
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 0bd234be2..b89279aec 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -16,7 +16,7 @@
 //= 1.4 Fixed typos. (bugreport:2607) [Kisuka]
 //============================================================
 
-yuno_in01,112,151,6	script	Quest Manager	62,{
+yuno_in01,112,151,6	script	Quest Manager	1_M_SIZ,{
 	mes "[Guy]";
 	mes "Welcome to the Treasure Hunters Guild "+strcharinfo(0)+".";
 	next;
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index 114a6bea5..40e89c18b 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -19,7 +19,7 @@
 
 ///////Job list 1///////
 //1-1
-mjolnir_09,187,189,6	script	Old Man	107,{
+mjolnir_09,187,189,6	script	Old Man	1_M_PAY_ELDER,{
 	if (one_qset==1) goto N_QuestStart;
 	mes "[Old Man]";
 	mes "Eh! Can't and old man walk in peace anymore?!";
@@ -37,7 +37,7 @@ N_QuestStart:
 	close;
 }
 //1-2;
-pay_arche,86,129,6	script	Archer	732,{
+pay_arche,86,129,6	script	Archer	4_M_JOB_HUNTER,{
 	if (one_qset == 2) goto N_QuestStart;
 	mes "[Kieth]";
 	mes "Sorry can't talk, I'm a busy man, I'm waiting for my package.";
@@ -58,7 +58,7 @@ N_QuestStart:
 	close;
 }
 //1-3
-prt_fild06,37,192,6	script	Farmer	125,{
+prt_fild06,37,192,6	script	Farmer	4_M_TELEPORTER,{
 	if (one_qset == 3 && countitem(909) > 19 && countitem(955) > 19 && countitem(914) > 19 && countitem(705) > 19) goto N_QuestComp;
 	if (one_qset==3) goto N_QuestStart;
 	mes "[Billy-Bob]";
@@ -85,7 +85,7 @@ N_QuestStart:
 	close;
 }
 //1-4
-prontera,264,353,6	script	Old Lady#thq	103,{
+prontera,264,353,6	script	Old Lady#thq	8_F_GRANDMOTHER,{
 	if (one_qset == 4 && countitem(934) > 14) goto N_QuestComp;
 	if (one_qset == 4) goto N_QuestStart;
 	mes "[Old Lady]";
@@ -114,7 +114,7 @@ N_QuestStart:
 }
 ///////Job list 2///////
 //2-1;
-morocc,59,109,6	script	Erika	700,{
+morocc,59,109,6	script	Erika	8_F_GIRL,{
 	if (two_qset == 1 && countitem(1072) > 0) goto N_QuestComp;
 	if (two_qset == 1) goto N_QuestStart;
 	mes "[Erika]";
@@ -149,7 +149,7 @@ N_QuestStart:
 	close;
 }
 //2-2;
-in_moc_16,15,30,6	script	Jeramiah	730,{
+in_moc_16,15,30,6	script	Jeramiah	4_M_JOB_ASSASSIN,{
 	if (two_qset == 2 && countitem(1998) > 0) goto N_QuestComp;
 	if (two_qset == 2) goto N_QuestStart;
 	mes "[Jeramiah]";
@@ -172,7 +172,7 @@ N_QuestStart:
 	close;
 }
 //2-3;
-prt_fild07,316,263,6	script	Marsh Man	84,{
+prt_fild07,316,263,6	script	Marsh Man	4_M_02,{
 	if (two_qset == 3 && countitem(518) > 19) goto N_QuestComp;
 	if (two_qset == 3) goto N_QuestStart;
 	mes "[Lenith]";
@@ -197,7 +197,7 @@ N_QuestStart:
 	close;
 }
 //2-4;
-payon,161,72,6	script	Molly	714,{
+payon,161,72,6	script	Molly	4_F_06,{
 	if (two_qset == 4 && countitem(7005) > 0) goto N_QuestComp;
 	if (two_qset == 4) goto N_QuestStart;
 	mes "[Molly]";
@@ -227,7 +227,7 @@ N_QuestStart:
 }
 ///////Job list 3///////
 //3-1;
-moc_fild04,208,322,6	script	Clark	65,{
+moc_fild04,208,322,6	script	Clark	1_M_YOUNGKNIGHT,{
 	if (three_qset == 1 && countitem(1040) > 29) goto N_QuestComp;
 	if (three_qset == 1) goto N_QuestStart;
 	mes "[Clark]";
@@ -256,7 +256,7 @@ N_QuestStart:
 	close;
 }
 //3-2;
-yuno_fild01,186,162,6	script	Flank	73,{
+yuno_fild01,186,162,6	script	Flank	1_F_MERCHANT_01,{
 	if (three_qset == 2 && countitem(1082) > 0) goto N_QuestComp;
 	if (three_qset == 2) goto N_QuestStart;
 	mes "[Flank]";
@@ -281,7 +281,7 @@ N_QuestStart:
 	close;
 }
 //3-3 Goes to 7-3 using callfunc
-prt_sewb1,120,245,6	script	Sewer Managment Knight	705,{
+prt_sewb1,120,245,6	script	Sewer Managment Knight	4_M_GEF_SOLDIER,{
 	if (three_qset == 3 && countitem(955) > 149) goto N_QuestComp;
 	if (three_qset == 3) goto N_QuestStart;
 	if (seven_qset == 3) goto N_QuestStart2;
@@ -309,7 +309,7 @@ N_QuestStart2:
 	close;
 }
 //3-4
-mjolnir_02,87,357,6	script	Man#01	51,{
+mjolnir_02,87,357,6	script	Man#01	1_M_BARD,{
 	if (three_qset == 4 && countitem(1041) > 49) goto N_QuestComp;
 	if (three_qset == 4) goto N_QuestStart;
 	mes "[Rudolfo]";
@@ -337,7 +337,7 @@ N_QuestStart:
 }
 ///////Job list 4///////
 //4-1;
-pay_arche,45,138,6	script	Flora	724,{
+pay_arche,45,138,6	script	Flora	4_F_07,{
 	if (four_qset == 1 && countitem(957) > 49) goto N_QuestComp;
 	if (four_qset == 1) goto N_QuestStart;
 	mes "[Flora]";
@@ -371,7 +371,7 @@ OnMobDead:
 	end;
 }
 //4-2;
-yuno,45,138,6	script	Zed	735,{
+yuno,45,138,6	script	Zed	4_M_JOB_WIZARD,{
 	if (four_qset == 2 && countitem(1999) > 0) goto N_QuestComp;
 	if (four_qset == 2) goto N_QuestStart;
 	mes "[Zed]";
@@ -396,7 +396,7 @@ N_QuestStart:
 	close;
 }
 //4-3;
-prontera,176,204,6	script	Dassy	95,{
+prontera,176,204,6	script	Dassy	4_F_SISTER,{
 	if (four_qset == 3 && countitem(711) > 19) goto N_QuestComp;
 	if (four_qset == 3) goto N_QuestStart;
 	mes "[Dassy]";
@@ -422,7 +422,7 @@ N_QuestStart:
 	close;
 }
 //4-4;
-prt_gld,157,99,6	script	Czhore	752,{
+prt_gld,157,99,6	script	Czhore	4_M_CRU_OLD,{
 	if (four_qset == 4 && countitem(714) > 0) goto N_QuestComp;
 	if (four_qset == 4) goto N_QuestStart;
 	mes "[Czhore]";
@@ -455,7 +455,7 @@ N_QuestStart:
 }
 ///////Job list 5///////
 //5-1;
-prt_maze01,18,184,6	script	Lithin#01	752,{
+prt_maze01,18,184,6	script	Lithin#01	4_M_CRU_OLD,{
 	if (five_qset == 1 && countitem(1028) > 14) goto N_QuestComp;
 	if (five_qset == 1) goto N_QuestStart;
 	mes "[Lithin]";
@@ -482,7 +482,7 @@ N_QuestStart:
 	close;
 }
 //5-2 goes to 6-2 using callfunc;
-moc_ruins,75,167,6	script	Lithin#02	87,{
+moc_ruins,75,167,6	script	Lithin#02	4_M_BARBER,{
 	if (five_qset == 2 && countitem(932) > 29) goto N_QuestComp;
 	if (five_qset == 2) goto N_QuestStart;
 	if (six_qset == 2) goto N_QuestStart2;
@@ -510,7 +510,7 @@ N_QuestStart2:
 	callfunc "six_qset2";
 }
 //5-3;
-geffen,57,130,6	script	Blonde Girl	724,{
+geffen,57,130,6	script	Blonde Girl	4_F_07,{
 	if (five_qset == 3 && countitem(744) > 0) goto N_QuestComp;
 	if (five_qset == 3) goto N_QuestStart;
 	mes "[Blonde Girl]";
@@ -534,7 +534,7 @@ N_QuestStart:
 	close;
 }
 //5-4;
-gef_tower,49,27,6	script	Wizard#01	735,{
+gef_tower,49,27,6	script	Wizard#01	4_M_JOB_WIZARD,{
 	if (five_qset == 4 && countitem(1059) > 49) goto N_QuestComp;
 	if (five_qset == 4) goto N_QuestStart;
 	mes "[Wizard]";
@@ -562,7 +562,7 @@ N_QuestStart:
 }
 ///////Job list 6///////
 //6-1;
-moc_prydb1,47,132,6	script	Thief	48,{
+moc_prydb1,47,132,6	script	Thief	1_M_02,{
 	if (six_qset == 1 && countitem(1083) > 0) goto N_QuestComp;
 	if (six_qset == 1) goto N_QuestStart;
 	mes "[Thief]";
@@ -608,7 +608,7 @@ N_QuestComp2:
 	close;
 }
 //6-3;
-xmas,144,136,6	script	Chirach	48,{
+xmas,144,136,6	script	Chirach	1_M_02,{
 	if (six_qset == 3 && countitem(1083) > 0) goto N_QuestComp;
 	if (six_qset == 3) goto N_QuestStart;
 	mes "[Chirach]";
@@ -631,7 +631,7 @@ N_QuestStart:
 	close;
 }
 //6-4;
-gef_tower,52,87,6	script	Wizard#02	735,{
+gef_tower,52,87,6	script	Wizard#02	4_M_JOB_WIZARD,{
 	if (six_qset == 4 && countitem(944) > 19) goto N_QuestComp;
 	if (six_qset == 4) goto N_QuestStart;
 	mes "[Zuuzuu]";
@@ -663,7 +663,7 @@ N_QuestStart:
 }
 ///////Job list 7///////
 //7-1 goes to 8-1 using callfunc;
-prontera,123,208,6	script	Little Girl#thq	717,{
+prontera,123,208,6	script	Little Girl#thq	4_F_KID3,{
 	if (seven_qset == 1 && countitem(531) > 4) goto N_QuestComp;
 	if (seven_qset == 1) goto N_QuestStart;
 	if (eight_qset == 1) goto N_QuestStart2;
@@ -690,7 +690,7 @@ N_QuestStart2:
 	callfunc "eight_qset1";
 }
 //7-2;
-alberta,101,84,6	script	Charles	48,{
+alberta,101,84,6	script	Charles	1_M_02,{
 	if (seven_qset == 2 && countitem(1082) > 0) goto N_QuestComp;
 	if (seven_qset == 2) goto N_QuestStart;
 	mes "[Charles]";
@@ -733,7 +733,7 @@ N_QuestComp2:
 	close;
 }
 //7-4;
-alb2trea,94,102,6	script	Scarlet	725,{
+alb2trea,94,102,6	script	Scarlet	4_F_JOB_ASSASSIN,{
 	if (seven_qset == 4 && countitem(1127) > 0) goto N_QuestComp;
 	if (seven_qset == 4) goto N_QuestStart;
 	mes "[Scarlet]";
@@ -778,7 +778,7 @@ N_QuestComp2:
 	close;
 }
 //8-2;
-morocc,165,55,6	script	Klye	48,{
+morocc,165,55,6	script	Klye	1_M_02,{
 	if (eight_qset == 2 && countitem(1081) > 0) goto N_QuestComp;
 	if (eight_qset == 2) goto N_QuestStart;
 	mes "[Klye]";
@@ -802,7 +802,7 @@ N_QuestStart:
 
 }
 //8-3;
-prt_maze02,103,86,6	script	Zack	751,{
+prt_maze02,103,86,6	script	Zack	4_M_CRU,{
 	if (eight_qset == 3 && countitem(923) > 0) goto N_QuestComp;
 	if (eight_qset == 3) goto N_QuestStart;
 	mes "[Zack]";
@@ -828,7 +828,7 @@ N_QuestStart:
 	close;
 }
 //8-4;
-payon,136,129,6	script	Flower	703,{
+payon,136,129,6	script	Flower	4_F_KID2,{
 	if (eight_qset == 4 && countitem(746) > 9) goto N_QuestComp;
 	if (eight_qset == 4) goto N_QuestStart;
 	mes "[Flower]";
@@ -854,7 +854,7 @@ N_QuestStart:
 }
 ///////Job list 9///////
 //9-1;
-geffen_in,168,124,6	script	Mage	48,{
+geffen_in,168,124,6	script	Mage	1_M_02,{
 	if (nine_qset == 1 && countitem(1082) > 0) goto N_QuestComp;
 	if (nine_qset == 1) goto N_QuestStart;
 	mes "[Mage]";
@@ -877,7 +877,7 @@ N_QuestStart:
 	close;
 }
 //9-2;
-pay_arche,98,74,6	script	School Girl	703,{
+pay_arche,98,74,6	script	School Girl	4_F_KID2,{
 	if (nine_qset == 2 && countitem(1020) > 19) goto N_QuestComp;
 	if (nine_qset == 2) goto N_QuestStart;
 	mes "[School Girl]";
@@ -905,7 +905,7 @@ N_QuestStart:
 	close;
 }
 //9-3
-payon_in02,19,33,6	script	Jack	740,{
+payon_in02,19,33,6	script	Jack	2_M_ALCHE,{
 	if (nine_qset == 3 && countitem(1022) > 0) goto N_QuestComp;
 	if (nine_qset == 3) goto N_QuestStart;
 	if (nine_qset == 4) goto N_QuestStart2;
@@ -951,7 +951,7 @@ N_QuestComp2:
 }
 ///////Job list 10///////
 //10-1
-morocc,193,51,6	script	Kreg	48,{
+morocc,193,51,6	script	Kreg	1_M_02,{
 	if (ten_qset == 1 && countitem(1082) > 0) goto N_QuestComp;
 	if (ten_qset == 1) goto N_QuestStart;
 	mes "[Kreg]";
@@ -974,7 +974,7 @@ N_QuestStart:
 	close;
 }
 //10-2;
-pay_fild10,145,252,6	script	Man#02	122,{
+pay_fild10,145,252,6	script	Man#02	2_M_DYEINGER,{
 	if (ten_qset == 2 && countitem(1029) > 0) goto N_QuestComp;
 	if (ten_qset == 2) goto N_QuestStart;
 	mes "[Man]";
@@ -999,7 +999,7 @@ N_QuestStart:
 	close;
 }
 //10-3;
-cmd_fild08,328,349,4	script	Caral	119,{
+cmd_fild08,328,349,4	script	Caral	2_M_SWORDMASTER,{
 	if (ten_qset == 3 && countitem(1015) > 0) goto N_QuestComp;
 	if (ten_qset == 3) goto N_QuestStart;
 	mes "[Caral]";
@@ -1024,7 +1024,7 @@ N_QuestStart:
 	close;
 }
 //10-4
-moc_fild15,250,251,6	script	Jeni	727,{
+moc_fild15,250,251,6	script	Jeni	4_F_JOB_HUNTER,{
 	if (ten_qset == 4 && countitem(1096) > 0) goto N_QuestComp;
 	if (ten_qset == 4) goto N_QuestStart;
 	mes "[Jeni]";
diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt
index 39038671e..c764de852 100644
--- a/npc/custom/quests/thq/THQS_TTShop.txt
+++ b/npc/custom/quests/thq/THQS_TTShop.txt
@@ -16,7 +16,7 @@
 
 prt_in,159,172,0	warp	thqwrp	3,3,yuno_in01,123,155
 
-prt_in,164,174,1	script	Treasure Hunter's Shop	65,{
+prt_in,164,174,1	script	Treasure Hunter's Shop	1_M_YOUNGKNIGHT,{
 	mes "[Ash]";
 	mes "Ahh, "+strcharinfo(0)+"! Welcome to the Offical Treasure Hunter's Guild Shop.";
 	mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!";