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

23 files changed, 87 insertions, 87 deletions

diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index 6cf47ef25..ebb74afc7 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -15,7 +15,7 @@
 //= 1.3 Removed duplicates [L0ne_W0lf]
 //============================================================
 
-umbala,126,129,4	script	Bearded Man#bandit	120,{
+umbala,126,129,4	script	Bearded Man#bandit	2_M_PHARMACIST,{
 	if(BEARD_QUEST == 4 ) goto L_MAKE;
 	if(BEARD_QUEST >= 5 ) goto L_DONE;
 	if(BEARD_QUEST >= 1 ) goto L_THREAD;
@@ -100,7 +100,7 @@ L_NOITEMS:
 }  
 
 //Master Tailor----------
-izlude_in,123,175,4	script	Master Tailor#bandit	50,{
+izlude_in,123,175,4	script	Master Tailor#bandit	1_M_04,{
 	mes "[Master Tailor]";
 	mes "Good evening! I am the Master Tailor!";
 	if(BEARD_QUEST != 1 ) close;
@@ -117,7 +117,7 @@ izlude_in,123,175,4	script	Master Tailor#bandit	50,{
 	close;
 }
 // Karfa Thread Clerk---
-aldeba_in,70,179,5	script	Karfa Clerk#bandit	113,{
+aldeba_in,70,179,5	script	Karfa Clerk#bandit	4_F_KAFRA5,{
 	mes "[Karfa Clerk]";
 	if(BEARD_QUEST == 3 ) goto L_REPEAT;
 	if(BEARD_QUEST > 3 ) goto L_DONE;
@@ -155,7 +155,7 @@ L_DONE:
 }
 
 //Thread Merchant ------
-alberta,65,123,6	script	Man#bandit	85,{
+alberta,65,123,6	script	Man#bandit	4_M_03,{
 	if(BEARD_QUEST == 3 && $@beardMobD) goto L_KILLED;
 	if(BEARD_QUEST > 3) goto L_DONE;
 
diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt
index 6f58870eb..8827329d9 100644
--- a/npc/custom/quests/berzebub.txt
+++ b/npc/custom/quests/berzebub.txt
@@ -11,7 +11,7 @@
 //= 1.2 Optimized. [Euphy]
 //============================================================
 
-prontera,165,178,8	script	Old Woman	103,{
+prontera,165,178,8	script	Old Woman	8_F_GRANDMOTHER,{
 
 	setarray .@Items[0],714,25,1061,100,1095,200,618,10,1551,2,1614,1,727,20;
 	set .@n$,"[Old Woman]";
diff --git a/npc/custom/quests/dead_branch.txt b/npc/custom/quests/dead_branch.txt
index 13daa244b..95f0a95b7 100644
--- a/npc/custom/quests/dead_branch.txt
+++ b/npc/custom/quests/dead_branch.txt
@@ -12,7 +12,7 @@
 //= 1.1 Optimized, added Bloody Branch with 0.01% chance [Lupus]
 //============================================================
 
-niflheim,204,179,3	script	Mister Mobry	121,{
+niflheim,204,179,3	script	Mister Mobry	2_M_MOLGENSTEIN,{
 
 	mes "[Mister Mobry]";
 	mes "Trees possess spirits you know...";
diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt
index e412fcb67..25eb12080 100644
--- a/npc/custom/quests/elvenear.txt
+++ b/npc/custom/quests/elvenear.txt
@@ -11,7 +11,7 @@
 //= 1.2 Fixed exploit [Lupus]
 //============================================================
 
-geffen,127,49,5	script	Elven Ears Quest	84,{
+geffen,127,49,5	script	Elven Ears Quest	4_M_02,{
 	mes "[Elven Ears Quest]"; 
 	mes "Hi, today's quest is...."; 
 	mes "Ah, the ^61B031Elven Ears ^000000Quest!"; 
diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt
index ce3885be3..7352beef1 100644
--- a/npc/custom/quests/event_6_new_hats.txt
+++ b/npc/custom/quests/event_6_new_hats.txt
@@ -22,7 +22,7 @@
 //= 1.4 Fixed exploits. 1.4a fixed wrong item ID [Lupus] 
 //============================================================
 
-prt_in,130,66,5	script	Zac	704,{
+prt_in,130,66,5	script	Zac	4_M_BIBI,{
 	mes "[Zac]";
 	mes "I am the oldest and strongest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
 	next;
@@ -82,7 +82,7 @@ L3:
 	close;
 }
 
-prt_in,162,131,5	script	Blac	732,{
+prt_in,162,131,5	script	Blac	4_M_JOB_HUNTER,{
 	mes "[Blac]";
 	mes "I am the youngest and sexiest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
 	next;
@@ -136,7 +136,7 @@ L3:
 	close;
 }
 
-prt_in,53,56,5	script	Jac	107,{
+prt_in,53,56,5	script	Jac	1_M_PAY_ELDER,{
 	mes "[Jac]";
 	mes "I am the 2nd oldest and calmest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
 	next;
@@ -220,7 +220,7 @@ L3:
 	close;
 }
 
-prt_in,45,113,5	script	Pac	705,{
+prt_in,45,113,5	script	Pac	4_M_GEF_SOLDIER,{
 	mes "[Pac]";
 	mes "I am 3rd oldest and wisest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat so I can make them.";
 	next;
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index c1b2b62e2..d07ebb0d0 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -16,7 +16,7 @@
 //= 1.3a Added mission reset options.
 //============================================================
 
-prontera,152,187,6	script	Hunting Missions	951,{
+prontera,152,187,6	script	Hunting Missions	4_F_EDEN_MASTER,{
 function Chk; function Cm;
 	mes "[Hunting Missions]";
 	mes "Hello, "+strcharinfo(0)+"!";
diff --git a/npc/custom/quests/jewel_case.txt b/npc/custom/quests/jewel_case.txt
index 27770cb6b..d725a33f1 100644
--- a/npc/custom/quests/jewel_case.txt
+++ b/npc/custom/quests/jewel_case.txt
@@ -9,7 +9,7 @@
 //= with Jewel Case as a reward.
 //============================================================
 
-lighthalzen,108,229,2	script	La Fenn	766,{
+lighthalzen,108,229,2	script	La Fenn	4_M_JPNOJI,{
 	mes "[La Fenn]";
 	if(BaseLevel<99) {
 		if(Q_99LVL) {
diff --git a/npc/custom/quests/kaho_balmung.txt b/npc/custom/quests/kaho_balmung.txt
index 4da28bc38..fac8b85ff 100644
--- a/npc/custom/quests/kaho_balmung.txt
+++ b/npc/custom/quests/kaho_balmung.txt
@@ -11,7 +11,7 @@
 //= 1.1 Cleaned and optimized. [Euphy]
 //============================================================
 
-prontera,158,356,4	script	Royal Messenger	105,{
+prontera,158,356,4	script	Royal Messenger	8W_SOLDIER,{
 	
 	setarray .@Req1[0],1161,999,120,984,10,996,10,994,10,995,10,997,10;
 	setarray .@Req2[0],5013,2298,1,1001,10,996,10,994,10,995,10,997,10;
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt
index 4677dea8c..ea1916e50 100644
--- a/npc/custom/quests/kahohorn.txt
+++ b/npc/custom/quests/kahohorn.txt
@@ -10,7 +10,7 @@
 //= 1.1 Optimized, and fixed some requirements. [Euphy]
 //============================================================
 
-geffen,115,107,5	script	Lord Kaho's Servant	61,{
+geffen,115,107,5	script	Lord Kaho's Servant	1_M_PUBMASTER,{
 
 	setarray .@Items[0],7005, 968, 923, 734, 724,2268,7036,7020,5053,7018,741,742,743,750,751,752,753,754;
 	setarray .@Drops[0],1272,1087,1039,1260,1046,1115,1252,1147,1038,1059;
diff --git a/npc/custom/quests/kings_items.txt b/npc/custom/quests/kings_items.txt
index de908ab9e..b8c7a5538 100644
--- a/npc/custom/quests/kings_items.txt
+++ b/npc/custom/quests/kings_items.txt
@@ -11,7 +11,7 @@
 //= 1.1 Optimized. [Euphy]
 //============================================================
 
-prt_castle,80,170,4	script	King of Prontera	108,{
+prt_castle,80,170,4	script	King of Prontera	1_M_PRON_KING,{
 	mes "[King of Prontera]";
 	mes "Hello, can you help me?";
 	next;
@@ -62,7 +62,7 @@ prt_castle,80,170,4	script	King of Prontera	108,{
 	}
 }
 
-prt_castle,84,170,4	script	King's Daughter	62,{
+prt_castle,84,170,4	script	King's Daughter	1_M_SIZ,{
 	mes "[King's Daughter]";
 	mes "Hmph, I hate my dad right now!!";
 	next;
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index c354c6ae9..eda6b2aa6 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -12,7 +12,7 @@
 //= 1.01 translated the rest of dialogues
 //============================================================
 
-gonryun,187,140,4	script	Yakima	850,{
+gonryun,187,140,4	script	Yakima	4_F_EINWOMAN,{
 	mes "[Yakima]";
 	mes callfunc("F_Hi");
 	mes "I can make some items for you.";
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt
index c4794c341..9398826ba 100644
--- a/npc/custom/quests/quest_shop.txt
+++ b/npc/custom/quests/quest_shop.txt
@@ -21,7 +21,7 @@
 // Shop NPCs -- supplying no argument displays entire menu.
 //	callfunc "qshop"{,<shop ID>{,<shop ID>{,...}}};
 //============================================================
-prontera,164,203,6	script	Quest Shop#1	998,{ callfunc "qshop"; }
+prontera,164,203,6	script	Quest Shop#1	4_M_MOCASS2,{ callfunc "qshop"; }
 
 
 // Script Core
diff --git a/npc/custom/quests/questboard.txt b/npc/custom/quests/questboard.txt
index 265b24c60..28a25cc28 100644
--- a/npc/custom/quests/questboard.txt
+++ b/npc/custom/quests/questboard.txt
@@ -15,7 +15,7 @@
 // 1.4.4 Added Quest delay
 //============================================================
 
-prontera,129,215,5	script	Questboard	857,{
+prontera,129,215,5	script	Questboard	4_BOARD3,{
 		
 	if(c_run==1){
 		mes "[^FF7700Questboard^000000]";
diff --git a/npc/custom/quests/sphinx_mask.txt b/npc/custom/quests/sphinx_mask.txt
index 2d4cc8f94..b4e9c118c 100644
--- a/npc/custom/quests/sphinx_mask.txt
+++ b/npc/custom/quests/sphinx_mask.txt
@@ -11,7 +11,7 @@
 //= 1.3 Optimized, and coordinates moved. [Euphy]
 //============================================================
 
-morocc,208,90,6	script	Turban Thief	58,{
+morocc,208,90,6	script	Turban Thief	1_M_MERCHANT,{
 	mes "[Turban Thief]";
 	if(event_umbala < 2) {
 		mes "What do you wan te withz me? Be gone!";
diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt
index e58639cb1..a4c828457 100644
--- a/npc/custom/quests/sunglasses.txt
+++ b/npc/custom/quests/sunglasses.txt
@@ -15,7 +15,7 @@
 //= 1.8 Cleaning. [Euphy]
 //============================================================
 
-alberta,88,193,5	script	Sunglasses Trader	73,{
+alberta,88,193,5	script	Sunglasses Trader	1_F_MERCHANT_01,{
 	mes "[Sunglasses Trader]";
 	if(SG_QUEST1 == 1) {
 		mes "There is nothing more I can tell you.";
@@ -67,7 +67,7 @@ alberta,88,193,5	script	Sunglasses Trader	73,{
 	close;
 }
 
-moc_fild07,334,186,5	script	Maseph	702,{
+moc_fild07,334,186,5	script	Maseph	4_F_GON,{
 	mes "[Maseph]";
 	if(SG_QUEST1 != 1) {
 		mes "Lovely day, isn't it ?";
diff --git a/npc/custom/quests/tha_statues.txt b/npc/custom/quests/tha_statues.txt
index d072179f3..283615be9 100644
--- a/npc/custom/quests/tha_statues.txt
+++ b/npc/custom/quests/tha_statues.txt
@@ -13,7 +13,7 @@
 
 //Statue (NPC)(U: UP, D: DOWN, R: RIGHT, L: LEFT) :
 // Explain Npc
-tha_t08,69,106,4	script	Statue	111,{
+tha_t08,69,106,4	script	Statue	HIDDEN_NPC,{
 	mes "You can read on the back of the statue:";
 	mes "'By the spirit of olds, the walls are closed";
 	mes "Upper floors or foreign taboo";
@@ -28,7 +28,7 @@ tha_t08,69,106,4	script	Statue	111,{
 //(Mediane)(D,R)-->tha_t09,84,99,4
 //Script:
 
-tha_t09,17,158,4	script	Thalos	111,{
+tha_t09,17,158,4	script	Thalos	HIDDEN_NPC,{
 	if(TSQ_CHK == 1) goto done;
 	mes "[Thalos]";
 	mes "You must find the 2nd Statue now.";
@@ -41,7 +41,7 @@ done:
 	
 }
 
-tha_t09,84,99,4	script	Mediane	111,{
+tha_t09,84,99,4	script	Mediane	HIDDEN_NPC,{
 	if(TSQ_CHK != 1) goto nook;
 	mes "[Mediane]";
 	mes "Okay, i am warping you to the next floor now.";
@@ -61,7 +61,7 @@ nook:
 //(Veriaelle)(D,L)-->tha_t10,99,97,4
 //Script:
 
-tha_t10,130,159,4	script	Melkor	111,{
+tha_t10,130,159,4	script	Melkor	HIDDEN_NPC,{
 	if(TSQ_CHK == 1) goto done;
 	mes "[Melkor]";
 	mes "You must find the other Spirits now.";
@@ -74,7 +74,7 @@ done:
 	close;
 }
 
-tha_t10,160,98,4	script	Zebrus	111,{
+tha_t10,160,98,4	script	Zebrus	HIDDEN_NPC,{
 	if(TSQ_CHK != 1) goto nook;
 	mes "[Zebrus]";
 	mes "Keep on this way, There is one Spirit left";
@@ -88,7 +88,7 @@ nook:
 	close;
 }
 
-tha_t10,99,97,4	script	Veriaelle	111,{
+tha_t10,99,97,4	script	Veriaelle	HIDDEN_NPC,{
 	if(TSQ_CHK != 2) goto nook;
 	mes "[Veriaelle]";
 	mes "Okay, i am warping you to the next floor.";
@@ -111,7 +111,7 @@ nook:
 //(Seranes)(U,R)-->tha_t11,85,85,4
 //Script:
 
-tha_t11,16,85,4	script	Throtre	111,{
+tha_t11,16,85,4	script	Throtre	HIDDEN_NPC,{
 	if(TSQ_CHK == 1) goto done;
 	mes "[Throtre]";
 	mes "You got my authorization for the next floor";
@@ -124,7 +124,7 @@ done:
 	close;
 }
 
-tha_t11,85,16,4	script	Klermaz	111,{
+tha_t11,85,16,4	script	Klermaz	HIDDEN_NPC,{
 	if(TSQ_CHK != 1) goto nook;
 	mes "[Klermaz]";
 	mes "Hmm it seems that Throtre allowed you to pass.";
@@ -139,7 +139,7 @@ nook:
 	close;
 }
 
-tha_t11,16,16,4	script	Mihane	111,{
+tha_t11,16,16,4	script	Mihane	HIDDEN_NPC,{
 	if(TSQ_CHK != 2) goto nook;
 	mes "[Mihane]";
 	mes "Keep on this way, Only 1 Left.";
@@ -153,7 +153,7 @@ nook:
 	close;
 }
 
-tha_t11,85,85,4	script	Seranes	111,{
+tha_t11,85,85,4	script	Seranes	HIDDEN_NPC,{
 	if(TSQ_CHK != 3 ) goto nook;
 	mes "[Seranes]";
 	mes "Perfect, it seems that the other spirits grants you the access.";
@@ -178,7 +178,7 @@ nook:
 //(Sox)(U)-->tha_t12,128,88,4
 //Script:
 
-tha_t12,103,18,4	script	Nox	111,{
+tha_t12,103,18,4	script	Nox	HIDDEN_NPC,{
 	if(TSQ_CHK == 1 ) goto done;
 	mes "[Nox]";
 	mes "Fine, 4 Spirits left.";
@@ -190,7 +190,7 @@ done:
 	close;
 }
 
-tha_t12,162,58,4	script	Vox	111,{
+tha_t12,162,58,4	script	Vox	HIDDEN_NPC,{
 	if(TSQ_CHK != 1 ) goto nook;
 	mes "[Vox]";
 	mes "Keep on this way, 3 Spirits remaining !";
@@ -204,7 +204,7 @@ nook:
 	close;
 }
 
-tha_t12,96,57,4	script	Hox	111,{
+tha_t12,96,57,4	script	Hox	HIDDEN_NPC,{
 	if(TSQ_CHK != 2 ) goto nook;
 	mes "[Hox]";
 	mes "You are on the good way, 2 Spirits remaining !";
@@ -218,7 +218,7 @@ nook:
 	close;
 }
 
-tha_t12,153,17,4	script	Dox	111,{
+tha_t12,153,17,4	script	Dox	HIDDEN_NPC,{
 	if(TSQ_CHK != 3 ) goto nook;
 	mes "[Dox]";
 	mes "Perfect, 1 Spirit left.";
@@ -232,7 +232,7 @@ nook:
 	close;
 }
 
-tha_t12,128,88,4	script	Sox	111,{
+tha_t12,128,88,4	script	Sox	HIDDEN_NPC,{
 	if(TSQ_CHK != 4 ) goto nook;
 	mes "[Sox]";
 	mes "You have just passed the test successfully.";
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!!!";
diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt
index 6552f2b78..70ae07d28 100644
--- a/npc/custom/quests/umbalian_language.txt
+++ b/npc/custom/quests/umbalian_language.txt
@@ -8,7 +8,7 @@
 //= 1.1 Removed it from offical Umbala Quests [Lupus]
 //============================================================
 
-prontera,145,290,5	script	Mason	742,{
+prontera,145,290,5	script	Mason	2_M_SAGE_B,{
 	mes "[Mason]";
 	if(umb_lang==0) goto L_NOT_GOT_QUEST;
 	if(umb_lang==2 || umb_mason==1) goto L_AGAIN;
@@ -89,7 +89,7 @@ M_NO:
 	close;
 }
 
-aldebaran,153,212,1	script	Mojo	740,{
+aldebaran,153,212,1	script	Mojo	2_M_ALCHE,{
 	mes "[Mojo]";
 	if(umb_lang!=1) goto L_NOT_GOT_QUEST;
 	mes "Oh no!  I lost my teacher's ^FF0000old magic book^000000!";
@@ -102,7 +102,7 @@ L_NOT_GOT_QUEST:
 	close;
 }
 
-amatsu,267,189,4	script	Marie	744,{
+amatsu,267,189,4	script	Marie	4_F_ALCHE,{
 	mes "[Marie]";
 	if(umb_lang==0) goto L_NOT_GOT_QUEST;
 	if(umb_lang==2 || umb_marie==1) goto L_AGAIN;
@@ -152,7 +152,7 @@ L_AGAIN:
 	close;
 }
 
-yuno,157,366,2	script	Wise Man Fabius	743,{
+yuno,157,366,2	script	Wise Man Fabius	2_M_SAGE_OLD,{
 	mes "[Fabius]";
 	if(event_umbala >= 3) set umb_lang,2; //You already learnt Umbalian language from Umbalian Chief. So this Quest is disabled
 	if(umb_lang<2) goto L_QUEST;
diff --git a/npc/custom/quests/valhallen.txt b/npc/custom/quests/valhallen.txt
index b32b03acf..bb84e73e5 100644
--- a/npc/custom/quests/valhallen.txt
+++ b/npc/custom/quests/valhallen.txt
@@ -11,7 +11,7 @@
 //= 1.1 Optimized. [Euphy]
 //============================================================
 
-prontera,147,171,5	script	Lenneth	811,{
+prontera,147,171,5	script	Lenneth	4_F_VALKYRIE,{
 	mes "[Lenneth]";
 	mes "I come from Valhalla to aid you.";
 	mes "I can transmute for you many of the Valhallen items,";