Merge pull request #1 from HerculesWS/master

Update from original

7 files changed, 195 insertions, 209 deletions

diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index bfa7d422c..92b015bf4 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -4,8 +4,6 @@
 //= Muad_Dib, Aeomin
 //===== Current Version: =====================================
 //= 1.3a
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Alchemist / Creator -> Genetic.
@@ -17,7 +15,7 @@
 //= 1.3a Moved warps to separate file. [Euphy]
 //============================================================
 
-alde_alche,35,186,5	script	Alchemist Union Member	805,{
+alde_alche,35,186,5	script	Alchemist Union Member	1_M_SIGNALCHE,{
 	mes "[Alchemist Union Member]";
 	if (BaseLevel > 98 && JobLevel > 49){
 		if (BaseJob == Job_Alchemist) {
@@ -85,7 +83,7 @@ alde_alche,35,186,5	script	Alchemist Union Member	805,{
 	close;
 }
 
-job3_gen01,25,58,3	script	Devries#gen	865,{
+job3_gen01,25,58,3	script	Devries#gen	4_LGTSCIENCE,{
 	if (SkillPoint != 0) {
 		mes "- You still have some unused skill points. -";
 		close;
@@ -575,7 +573,7 @@ job3_gen01,25,58,3	script	Devries#gen	865,{
 	close;
 }
 
-job3_gen01,83,72,3	script	Delivery Box#generic	111,{
+job3_gen01,83,72,3	script	Delivery Box#generic	HIDDEN_NPC,{
 	mes "- There's a big box. -";
 	if (job_gen == 2) {
 		next;
@@ -604,7 +602,7 @@ job3_gen01,83,72,3	script	Delivery Box#generic	111,{
 	close;
 }
 
-job3_gen01,12,56,3	script	Plant Guide#generic	111,{
+job3_gen01,12,56,3	script	Plant Guide#generic	HIDDEN_NPC,{
 	mes "<The Easiest Alchemy in the World>";
 	mes "Written by Bob Ross.";
 	next;
@@ -668,32 +666,32 @@ function	script	Genetic_Job_Plant	{
 	close;
 }
 
-job3_gen01,36,55,3	script	Bigibigi Grass#gen	844,{
+job3_gen01,36,55,3	script	Bigibigi Grass#gen	CLEAR_NPC,{
 	callfunc "Genetic_Job_Plant",2209,"Bigibigi Grass","The size is quite big to be normal grass so it's called Bigibigi Grass.";
 	end;
 }
-job3_gen01,36,45,3	script	Muka Tree#gen	844,{
+job3_gen01,36,45,3	script	Muka Tree#gen	CLEAR_NPC,{
 	callfunc "Genetic_Job_Plant",2210,"Muka Tree","This is the Muka Tree which protects its delicate inside with sharp thorns.",1;
 	end;
 }
-job3_gen01,42,55,3	script	Bogi Vine#gen	844,{
+job3_gen01,42,55,3	script	Bogi Vine#gen	CLEAR_NPC,{
 	callfunc "Genetic_Job_Plant",2211,"Bogi Vine","This is a Bogi Vine which has a very fast growth speed.",1;
 	end;
 }
-job3_gen01,30,58,3	script	Aolatura#gen	844,{
+job3_gen01,30,58,3	script	Aolatura#gen	CLEAR_NPC,{
 	callfunc "Genetic_Job_Plant",2212,"Aolatura","This is known to blossom then thousand flowers as it only blooms once per lifetime.";
 	end;
 }
-job3_gen01,30,63,3	script	Congra#gen	844,{
+job3_gen01,30,63,3	script	Congra#gen	CLEAR_NPC,{
 	callfunc "Genetic_Job_Plant",2213,"Congra","It's a plant that has a big and solid stem with enormous leaves.";
 	end;
 }
-job3_gen01,32,38,3	script	Sticky Grass#gen	844,{
+job3_gen01,32,38,3	script	Sticky Grass#gen	CLEAR_NPC,{
 	callfunc "Genetic_Job_Plant",2214,"Sticky Grass","I may not know the name but it's sticky and can stick to just about anything.";
 	end;
 }
 
-job3_gen01,7,50,3	script	Testing Table#gen	844,{
+job3_gen01,7,50,3	script	Testing Table#gen	CLEAR_NPC,{
 	if (job_gen == 7) {
 		mes "- This is a testing table with a lot of equipment. I think I can study the combinations here with plants. -";
 		next;
@@ -773,11 +771,11 @@ job3_gen01,7,50,3	script	Testing Table#gen	844,{
 	close;
 }
 
-job3_gen01,21,67,3	script	Super Cultivator#gen	844,{
+job3_gen01,21,67,3	script	Super Cultivator#gen	CLEAR_NPC,{
 	end;
 }
 
-job3_gen01,91,48,3	script	Demi Calberine#gen	982,{
+job3_gen01,91,48,3	script	Demi Calberine#gen	4_F_SCIENCE,{
 	mes "[Demi Calberine]";
 	if (job_gen < 62) {
 		mes "Hmm~ Where'd that bolt go?";
@@ -969,15 +967,15 @@ OnTimer7000:
 	stopnpctimer;
 	end;
 }
-job3_gen01,84,45,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen1	111
-job3_gen01,77,41,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen2	111
-job3_gen01,78,57,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen3	111
-job3_gen01,89,59,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen4	111
-job3_gen01,90,51,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen5	111
-job3_gen01,83,27,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen6	111
-job3_gen01,74,45,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen7	111
+job3_gen01,84,45,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen1	HIDDEN_NPC
+job3_gen01,77,41,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen2	HIDDEN_NPC
+job3_gen01,78,57,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen3	HIDDEN_NPC
+job3_gen01,89,59,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen4	HIDDEN_NPC
+job3_gen01,90,51,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen5	HIDDEN_NPC
+job3_gen01,83,27,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen6	HIDDEN_NPC
+job3_gen01,74,45,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen7	HIDDEN_NPC
 
-job3_gen01,18,39,3	script	Warning#gen	837,{
+job3_gen01,18,39,3	script	Warning#gen	2_BULLETIN_BOARD,{
 	mes "= Warning =";
 	mes "If you bully my spores, I'll scream!!!";
 	if (job_gen < 75) close;
@@ -994,30 +992,30 @@ job3_gen01,18,39,3	script	Warning#gen	837,{
 	}
 }
 
-job3_gen01,80,12,1	script	Stacked Magazines#gen	111,{
+job3_gen01,80,12,1	script	Stacked Magazines#gen	HIDDEN_NPC,{
 	mes "- 'Monthly Bang!' magazines are piled up in disorder. -";
 	close;
 }
 
-job3_gen01,83,20,1	script	Bed#gen	111,{
+job3_gen01,83,20,1	script	Bed#gen	HIDDEN_NPC,{
 	mes "- A checker patterned blanket set which looks like it was picked carefully is too good for this dirty bed. -";
 	close;
 }
 
-job3_gen01,85,25,1	script	Opened Book#gen	111,{
+job3_gen01,85,25,1	script	Opened Book#gen	HIDDEN_NPC,{
 	mes "< Do you want to have my pretty room? Do you have enough zeny? Is there enough room? Run to the Lighthalzen Department Store right away and get the most high-end wall papers and interior accessories! >";
 	next;
 	mes "< Luxurious candles that'll lighten up your room, a huge golden mirror that every lady owns, you cannot miss any of them! >";
 	close;
 }
 
-job3_gen01,81,81,0	script	#dbroom	139,2,2,{
+job3_gen01,81,81,0	script	#dbroom	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	mes "- It's a room that looks like a storehouse, thanks to so many parcels piled up in the room. -";
 	close;
 }
 
-job3_gen01,24,32,0	script	The gaze of Devries	139,2,2,{
+job3_gen01,24,32,0	script	The gaze of Devries	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (checkquest(2223,HUNTING) == 2) {
 		mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map,"0x99CC00"; //FW_NORMAL 12 0 0
@@ -1044,4 +1042,4 @@ job3_gen01,23,33,0,0	monster	Poison Spore	1428,1,7000,0,0
 job3_gen01,21,30,0,0	monster	Poison Spore	1428,1,7000,0,0
 job3_gen01,26,34,0,0	monster	Poison Spore	1428,1,7000,0,0
 job3_gen01,23,33,0,0	monster	Poison Spore	1428,1,7000,0,0
-job3_gen01,21,30,0,0	monster	Poison Spore	1428,1,7000,0,0
\ No newline at end of file
+job3_gen01,21,30,0,0	monster	Poison Spore	1428,1,7000,0,0
diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt
index a9d584526..1435b23fd 100644
--- a/npc/re/jobs/3-2/minstrel.txt
+++ b/npc/re/jobs/3-2/minstrel.txt
@@ -1,22 +1,20 @@
 //===== Hercules Script ======================================
 //= Minstrel Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Bard / Clown -> Minstrel.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
 //= 1.1 Fix the checking of requirements before job change to Minstel [JayPee]
 //= 1.2 Optimized. [Euphy]
 //= 1.3 Updated script. [Euphy]
 //============================================================
 
-alberta,196,133,4	script	Bard#job_min	486,{
+alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 	if (job_min == 0) {
 		if (BaseJob == Job_Bard && BaseLevel > 98 && JobLevel > 49) {
 			mes "[Bard]";
@@ -239,7 +237,7 @@ alberta,196,133,4	script	Bard#job_min	486,{
 	close;
 }
 
-prontera,141,97,4	script	Warmhearted woman	701,{
+prontera,141,97,4	script	Warmhearted woman	4_F_GODEMOM,{
 	mes "[Warmhearted woman]";
 	if (job_min == 1) {
 		mes "Maestro Song?";
@@ -270,7 +268,7 @@ prontera,141,97,4	script	Warmhearted woman	701,{
 	close;
 }
 
-prontera,140,331,6	script	Glasses-wearing Man	883,{
+prontera,140,331,6	script	Glasses-wearing Man	4_M_ALCHE_D,{
 	mes "[Glasses-wearing Man]";
 	if (job_min == 2) {
 		mes "You mean Maestro Song?";
@@ -303,7 +301,7 @@ prontera,140,331,6	script	Glasses-wearing Man	883,{
 	close;
 }
 
-prontera,146,218,4	script	Woman#job_min	90,{
+prontera,146,218,4	script	Woman#job_min	4_F_01,{
 	if (job_min == 3) {
 		mes "[Woman]";
 		mes "Do you know who Maestro Song is?";
@@ -342,7 +340,7 @@ prontera,146,218,4	script	Woman#job_min	90,{
 	close;
 }
 
-airplane,222,67,6	script	Karian#job_min1	486,{
+airplane,222,67,6	script	Karian#job_min1	4_M_BARD,{
 	mes "[Karian]";
 	mes "Yup!!!!!!!!!!!!!!!!!!";
 	next;
@@ -362,7 +360,7 @@ airplane,222,67,6	script	Karian#job_min1	486,{
 	close;
 }
 
-hu_in01,267,5,3	script	Karian#job_min2	486,{
+hu_in01,267,5,3	script	Karian#job_min2	4_M_BARD,{
 	mes "[Karian]";
 	if (job_min == 6) {
 		mes "Eeeeh it's so painful.";
@@ -487,7 +485,7 @@ hu_in01,267,5,3	script	Karian#job_min2	486,{
 	close;
 }
 
-hu_in01,361,103,3	script	Tone-deaf person	995,{
+hu_in01,361,103,3	script	Tone-deaf person	4_M_CASMAN1,{
 	if (job_min == 7) {
 		mes "[Tone-deaf person]";
 		mes "Lala~ lala~";
@@ -707,7 +705,7 @@ hu_in01,361,103,3	script	Tone-deaf person	995,{
 	close;
 }
 
-tha_scene01,140,200,0	script	#min_receipt	139,3,3,{
+tha_scene01,140,200,0	script	#min_receipt	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (job_min == 10 || (job_min == 11 && countitem(6271) == 0)) {
 		mes "-There is a piece of paper on the ground.-";
@@ -749,7 +747,7 @@ OnTouch:
 	end;
 }
 
-tha_scene01,139,204,6	script	Karian#cmd1	486,{
+tha_scene01,139,204,6	script	Karian#cmd1	4_M_BARD,{
 	end;
 OnInit:
 	disablenpc "Karian#cmd1";
@@ -768,7 +766,7 @@ OnTimer15000:
 	end;
 }
 
-ve_fild07,129,132,5	script	Karian#cmd5	486,{
+ve_fild07,129,132,5	script	Karian#cmd5	4_M_BARD,{
 	end;
 OnInit:
 	disablenpc "Karian#cmd5";
@@ -787,7 +785,7 @@ OnTimer30000:
 	end;
 }
 
-prontera,155,49,4	script	Karian#cmd9	486,{
+prontera,155,49,4	script	Karian#cmd9	4_M_BARD,{
 	end;
 OnInit:
 	disablenpc "Karian#cmd9";
@@ -806,7 +804,7 @@ OnTimer300000:
 	end;
 }
 
-yuno,146,168,0	script	Karian#cmd2	486,{
+yuno,146,168,0	script	Karian#cmd2	4_M_BARD,{
 	end;
 OnInit:
 	disablenpc strnpcinfo(0);
@@ -824,13 +822,13 @@ OnTimer100000:
 	stopnpctimer;
 	end;
 }
-lighthalzen,160,124,6	duplicate(Karian#cmd2)	Karian#cmd3	486
-ra_in01,357,128,0	duplicate(Karian#cmd2)	Karian#cmd4	486
-comodo,184,109,0	duplicate(Karian#cmd2)	Karian#cmd6	486
-moc_fild16,204,231,0	duplicate(Karian#cmd2)	Karian#cmd7	486
-aldebaran,142,128,2	duplicate(Karian#cmd2)	Karian#cmd8	486
+lighthalzen,160,124,6	duplicate(Karian#cmd2)	Karian#cmd3	4_M_BARD
+ra_in01,357,128,0	duplicate(Karian#cmd2)	Karian#cmd4	4_M_BARD
+comodo,184,109,0	duplicate(Karian#cmd2)	Karian#cmd6	4_M_BARD
+moc_fild16,204,231,0	duplicate(Karian#cmd2)	Karian#cmd7	4_M_BARD
+aldebaran,142,128,2	duplicate(Karian#cmd2)	Karian#cmd8	4_M_BARD
 
-yuno,143,170,6	script	Mr. Click#job_min	748,{
+yuno,143,170,6	script	Mr. Click#job_min	4_M_ALCHE_A,{
 	mes "[Mr. Click]";
 	if (job_min == 11) {
 		mes "Hi~ welcome~";
@@ -954,7 +952,7 @@ yuno,143,170,6	script	Mr. Click#job_min	748,{
 	close;
 }
 
-lighthalzen,155,119,3	script	Little girl#job_min	891,3,3,{
+lighthalzen,155,119,3	script	Little girl#job_min	4_F_HUGIRL,3,3,{
 OnTouch:
 	if (checkquest(11145,HUNTING) == 2) {
 		if (job_min == 12) {
@@ -1084,7 +1082,7 @@ OnTouch:
 	close;
 }
 
-ice_dun01,157,15,0	script	#Minsicecave1	139,2,2,{
+ice_dun01,157,15,0	script	#Minsicecave1	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-A long time ago-";
@@ -1095,7 +1093,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,157,23,0	script	#Minsicecave2	139,2,2,{
+ice_dun01,157,23,0	script	#Minsicecave2	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-The giant born to ice-";
@@ -1106,7 +1104,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,141,41,0	script	#Minsicecave3	139,2,2,{
+ice_dun01,141,41,0	script	#Minsicecave3	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-died-";
@@ -1117,7 +1115,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,120,35,0	script	#Minsicecave4	139,2,2,{
+ice_dun01,120,35,0	script	#Minsicecave4	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-His body became the ground-";
@@ -1128,7 +1126,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,104,30,0	script	#Minsicecave5	139,2,2,{
+ice_dun01,104,30,0	script	#Minsicecave5	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-His bones became a mountain-";
@@ -1139,7 +1137,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,86,23,0	script	#Minsicecave6	139,2,2,{
+ice_dun01,86,23,0	script	#Minsicecave6	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-His skin became soil-";
@@ -1150,7 +1148,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,75,19,0	script	#Minsicecave7	139,2,2,{
+ice_dun01,75,19,0	script	#Minsicecave7	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-His blood became a river-";
@@ -1161,7 +1159,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,56,12,0	script	#Minsicecave8	139,2,2,{
+ice_dun01,56,12,0	script	#Minsicecave8	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-His hair became a plant-";
@@ -1172,7 +1170,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,29,26,0	script	#Minsicecave9	139,2,2,{
+ice_dun01,29,26,0	script	#Minsicecave9	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-His head became the sky-";
@@ -1183,7 +1181,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,25,46,0	script	#Minsicecave10	139,2,2,{
+ice_dun01,25,46,0	script	#Minsicecave10	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-His tears from his-";
@@ -1194,7 +1192,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,20,66,0	script	#Minsicecave11	139,2,2,{
+ice_dun01,20,66,0	script	#Minsicecave11	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-eyes became dew-";
@@ -1205,7 +1203,7 @@ OnTouch:
 	end;
 }
 
-ice_dun01,22,85,0	script	#Minsicecave12	139,2,2,{
+ice_dun01,22,85,0	script	#Minsicecave12	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 13) {
 		mes "-on the leaves-";
@@ -1219,7 +1217,7 @@ OnTouch:
 	end;
 }
 
-ra_in01,361,129,0	script	#jmRachelHotel	139,2,2,{
+ra_in01,361,129,0	script	#jmRachelHotel	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 14) {
 		mes "[Old Woman]";
@@ -1234,7 +1232,7 @@ OnTouch:
 	end;
 }
 
-ra_in01,358,130,4	script	Old Woman#job_min	979,{
+ra_in01,358,130,4	script	Old Woman#job_min	4_F_CAVE1,{
 	mes "[Old Woman]";
 	if (job_min == 14) {
 		mes "Huu!!";
@@ -1331,7 +1329,7 @@ ra_in01,358,130,4	script	Old Woman#job_min	979,{
 	close;
 }
 
-ve_fild07,131,132,5	script	=Notice=#job_min	837,{
+ve_fild07,131,132,5	script	=Notice=#job_min	2_BULLETIN_BOARD,{
 function Choice;
 	if (job_min == 16) {
 		mes "===Notice===";
@@ -1470,7 +1468,7 @@ function Choice;
 	}
 }
 
-comodo,184,108,0	script	#jmComodo Almost Dead	139,2,2,{
+comodo,184,108,0	script	#jmComodo Almost Dead	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 17) {
 		mes "["+strcharinfo(0)+"]";
@@ -1510,7 +1508,7 @@ OnTouch:
 	end;
 }
 
-comodo,192,119,0	script	Kayak Master#job_min	98,{
+comodo,192,119,0	script	Kayak Master#job_min	4W_M_02,{
 	mes "[Kayak Master]";
 	if (job_min == 18) {
 		mes "What?";
@@ -1535,7 +1533,7 @@ comodo,192,119,0	script	Kayak Master#job_min	98,{
 	close;
 }
 
-comodo,159,316,4	script	Woman Roasting Meat	701,{
+comodo,159,316,4	script	Woman Roasting Meat	4_F_GODEMOM,{
 	mes "[Woman Roasting Meat]";
 	if (job_min == 19) {
 		mes "Maestro Song?";
@@ -1579,7 +1577,7 @@ comodo,159,316,4	script	Woman Roasting Meat	701,{
 	close;
 }
 
-moc_fild16,206,232,0	script	#jmTransfer news	139,3,3,{
+moc_fild16,206,232,0	script	#jmTransfer news	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (job_min == 20) {
 		mes "["+strcharinfo(0)+"]";
@@ -1655,7 +1653,7 @@ OnTouch:
 	end;
 }
 
-aldebaran,140,130,0	script	#jmAldebaran Clock Tower	139,3,3,{
+aldebaran,140,130,0	script	#jmAldebaran Clock Tower	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (job_min == 21) {
 		mes "["+strcharinfo(0)+"]";
@@ -1720,7 +1718,7 @@ OnTouch:
 	end;
 }
 
-prontera,155,40,0	script	#jmprt1	139,2,2,{
+prontera,155,40,0	script	#jmprt1	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 22) {
 		mes "[Karian]";
@@ -1738,7 +1736,7 @@ OnTouch:
 	end;
 }
 
-prontera,155,42,0	script	#prtjm1	139,1,1,{
+prontera,155,42,0	script	#prtjm1	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
 	if (job_min == 23) {
 		mes "-Let me go back to my hometown.-";
@@ -1750,7 +1748,7 @@ OnTouch:
 	end;
 }
 
-prontera,155,44,0	script	#prtjm2	139,1,1,{
+prontera,155,44,0	script	#prtjm2	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
 	if (job_min == 24) {
 		mes "-There are many beautiful flowers.-";
@@ -1762,7 +1760,7 @@ OnTouch:
 	end;
 }
 
-prontera,155,46,0	script	#prtjm3	139,1,1,{
+prontera,155,46,0	script	#prtjm3	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
 	if (job_min == 25) {
 		mes "-The birds sing for me.-";
@@ -1774,7 +1772,7 @@ OnTouch:
 	end;
 }
 
-prontera,155,48,0	script	#prtjm4	139,1,1,{
+prontera,155,48,0	script	#prtjm4	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
 	if (job_min == 26 || job_min == 27) {
 		mes "-It's this old town.-";
@@ -1824,7 +1822,7 @@ OnTouch:
 	end;
 }
 
-prt_in,94,172,4	script	Karian#job_min3	480,{
+prt_in,94,172,4	script	Karian#job_min3	4_M_MINSTREL1,{
 	if (job_min == 27) {
 		if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 			mes "While you are on a trip, you gain lots of stuff. Make yourself lighter.";
@@ -1917,4 +1915,4 @@ prt_in,94,172,4	script	Karian#job_min3	480,{
 	mes "[Karian]";
 	mes "How did you get in here?";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index 614896133..82632ed36 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -1,20 +1,19 @@
 //===== Hercules Script ======================================
 //= Royal Guard Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Crusader / Paladin -> Royal Guard.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [brAthena]
 //= 1.1 Updated script. [Euphy]
+//= 1.2 Added GM management function. [Euphy]
 //============================================================
 
-prt_castle,48,161,3	script	Middle-aged Gentleman#rg	57,{
+prt_castle,48,161,3	script	Middle-aged Gentleman#rg	1_M_LIBRARYMASTER,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- Your pack is too heavy. -";
 		mes "- Lighten your body first -";
@@ -334,7 +333,7 @@ prt_castle,48,161,3	script	Middle-aged Gentleman#rg	57,{
 	}
 }
 
-glast_01,240,366,5	script	Memory of King Schmidtz	844,{
+glast_01,240,366,5	script	Memory of King Schmidtz	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- Your pack is too heavy. -";
 		mes "- Lighten your body first -";
@@ -435,7 +434,7 @@ glast_01,240,366,5	script	Memory of King Schmidtz	844,{
 	end;
 }
 
-gl_church,173,88,0	script	Delicate trace#01	844,{
+gl_church,173,88,0	script	Delicate trace#01	CLEAR_NPC,{
 	if (job_royal == 4 && countitem(6274) == 0) {
 		progressbar "ffff00",5;
 		set .@roy_ran, rand(1,70);
@@ -465,18 +464,18 @@ OnTimer40000:
 	specialeffect EF_MAPPILLAR;
 	end;
 }
-gl_church,158,103,0	duplicate(Delicate trace#01)	Delicate trace#02	844
-gl_church,139,90,0	duplicate(Delicate trace#01)	Delicate trace#03	844
-gl_church,126,62,0	duplicate(Delicate trace#01)	Delicate trace#04	844
-gl_church,148,5,0	duplicate(Delicate trace#01)	Delicate trace#05	844
-gl_church,185,72,0	duplicate(Delicate trace#01)	Delicate trace#06	844
-gl_church,185,72,0	duplicate(Delicate trace#01)	Delicate trace#07	844
-gl_church,211,94,0	duplicate(Delicate trace#01)	Delicate trace#08	844
-gl_church,185,125,0	duplicate(Delicate trace#01)	Delicate trace#09	844
-gl_church,143,125,0	duplicate(Delicate trace#01)	Delicate trace#10	844
-gl_church,105,115,0	duplicate(Delicate trace#01)	Delicate trace#11	844
+gl_church,158,103,0	duplicate(Delicate trace#01)	Delicate trace#02	CLEAR_NPC
+gl_church,139,90,0	duplicate(Delicate trace#01)	Delicate trace#03	CLEAR_NPC
+gl_church,126,62,0	duplicate(Delicate trace#01)	Delicate trace#04	CLEAR_NPC
+gl_church,148,5,0	duplicate(Delicate trace#01)	Delicate trace#05	CLEAR_NPC
+gl_church,185,72,0	duplicate(Delicate trace#01)	Delicate trace#06	CLEAR_NPC
+gl_church,185,72,0	duplicate(Delicate trace#01)	Delicate trace#07	CLEAR_NPC
+gl_church,211,94,0	duplicate(Delicate trace#01)	Delicate trace#08	CLEAR_NPC
+gl_church,185,125,0	duplicate(Delicate trace#01)	Delicate trace#09	CLEAR_NPC
+gl_church,143,125,0	duplicate(Delicate trace#01)	Delicate trace#10	CLEAR_NPC
+gl_church,105,115,0	duplicate(Delicate trace#01)	Delicate trace#11	CLEAR_NPC
 
-gl_church,158,100,0	script	#Clue of traces	111,4,4,{
+gl_church,158,100,0	script	#Clue of traces	HIDDEN_NPC,4,4,{
 	end;
 OnTouch:
 	if (job_royal == 4 && countitem(6274) == 0) {
@@ -497,8 +496,8 @@ OnTouch:
 	end;
 }
 
-/*
-sec_in02,12,43,3	script	sorcereryal	57,1,1,{
+sec_in02,12,43,3	script	sorcereryal	1_M_LIBRARYMASTER,1,1,{
+	callfunc "F_GM_NPC";
 	switch(select("Royal Guard:Rune Knight:Sorcerer")) {
 	case 1:
 		mes "1~5";
@@ -538,4 +537,3 @@ sec_in02,12,43,3	script	sorcereryal	57,1,1,{
 		close;
 	}
 }
-*/
\ No newline at end of file
diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt
index f9d27dc84..230d5b49c 100644
--- a/npc/re/jobs/3-2/shadow_chaser.txt
+++ b/npc/re/jobs/3-2/shadow_chaser.txt
@@ -1,22 +1,20 @@
 //===== Hercules Script ======================================
 //= Shadow Chaser Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Rogue / Stalker -> Shadow Chaser.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [ultragunner, Oshinoke]
 //= 1.1 Standardized. [Euphy]
 //= 1.2 Updated dialogue. [Joseph]
 //= 1.3 Updated to official script. [Euphy]
 //============================================================
 
-morocc,156,70,3	script	Girl#sc00	93,3,3,{
+morocc,156,70,3	script	Girl#sc00	4_F_04,3,3,{
 	mes "[Girl]";
 	if (BaseJob == Job_Rogue) {
 		if (job_sha == 0) {
@@ -75,7 +73,7 @@ OnTouch:
 	end;
 }
 
-in_rogue,376,100,5	script	Guild Member#sc01	828,{
+in_rogue,376,100,5	script	Guild Member#sc01	4_M_ROGUE,{
 	if (BaseJob == Job_Rogue) {
 		if (job_sha < 2) {
 			set @job_sha,0;
@@ -145,7 +143,7 @@ in_rogue,376,100,5	script	Guild Member#sc01	828,{
 	close;
 }
 
-in_rogue,379,99,1	script	Guild Member#sc02	747,{
+in_rogue,379,99,1	script	Guild Member#sc02	4_F_ROGUE,{
 	if (BaseJob == Job_Rogue) {
 		if (job_sha < 2) {
 			set @job_sha,1;
@@ -175,7 +173,7 @@ in_rogue,379,99,1	script	Guild Member#sc02	747,{
 	close;
 }
 
-in_rogue,379,101,3	script	Scary Man#sc03	810,{
+in_rogue,379,101,3	script	Scary Man#sc03	1_M_SIGNROGUE,{
 	if (job_sha == 0) {
 		if (BaseJob == Job_Rogue && BaseLevel > 98 && JobLevel > 49) {
 			mes "[Scary man]";
@@ -294,7 +292,7 @@ L_Code:
 	return;
 }
 
-s_atelier,65,123,5	script	Manager#sc04_prt	903,{
+s_atelier,65,123,5	script	Manager#sc04_prt	4_M_KHKYEL,{
 	if (job_sha == 2) {
 		mes "[Manager]";
 		mes "Where's Max!?";
@@ -613,7 +611,7 @@ L_Code:
 	close;
 }
 
-s_atelier,168,65,5	script	Manager#sc08_ra	923,{
+s_atelier,168,65,5	script	Manager#sc08_ra	4_M_DOCTOR,{
 	if (job_sha < 10) {
 		mes "[Manager]";
 		mes "Who are you?";
@@ -885,7 +883,7 @@ L_Code:
 	close;
 }
 
-s_atelier,167,129,3	script	Manager#sc06_yuno	806,{
+s_atelier,167,129,3	script	Manager#sc06_yuno	1_M_SIGNART,{
 	if (job_sha < 19) {
 		mes "[Manager]";
 		mes "What?";
@@ -1120,7 +1118,7 @@ L_Code:
 	return;
 }
 
-s_atelier,25,75,3	script	Manager#sc10_lgt	899,{
+s_atelier,25,75,3	script	Manager#sc10_lgt	4_M_HUMAN_02,{
 	if (job_sha < 26) {
 		mes "[Manager]";
 		mes "You are?";
@@ -1314,7 +1312,7 @@ s_atelier,25,75,3	script	Manager#sc10_lgt	899,{
 	close;
 }
 
-s_atelier,73,65,3	script	Vicente#sc12_lgt	899,{
+s_atelier,73,65,3	script	Vicente#sc12_lgt	4_M_HUMAN_02,{
 	mes "[Vicente]";
 	if (job_sha < 29) {
 		mes "If you don't have anything special to do here, you'd better leave.";
@@ -1340,7 +1338,7 @@ s_atelier,73,65,3	script	Vicente#sc12_lgt	899,{
 	close;
 }
 
-s_atelier,70,66,4	script	Dumk#sc13_lgh	481,{
+s_atelier,70,66,4	script	Dumk#sc13_lgh	4_M_SHADOWCHASER,{
 	if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
 		mes "[Dumk]";
 		mes "What is it?";
@@ -1670,7 +1668,7 @@ s_atelier,70,66,4	script	Dumk#sc13_lgh	481,{
 
 // Flames
 //============================================================
-tur_dun03,38,209,1	script	Blue Flame#sc_f01	802,{
+tur_dun03,38,209,1	script	Blue Flame#sc_f01	4_NFWISP,{
 	if (job_sha == 5) {
 		mes "A blue flame is roaring.";
 		mes "The deciphered code means...";
@@ -1755,7 +1753,7 @@ tur_dun03,38,209,1	script	Blue Flame#sc_f01	802,{
 	close;
 }
 
-ice_dun02,206,223,1	script	Red Flame#sc_f02	802,{
+ice_dun02,206,223,1	script	Red Flame#sc_f02	4_NFWISP,{
 	if (job_sha < 11) {
 		mes "An unknown red flame is roaring.";
 		close;
@@ -1819,7 +1817,7 @@ ice_dun02,206,223,1	script	Red Flame#sc_f02	802,{
 	close;
 }
 
-niflheim,230,276,1	script	Red Flame#sc_f03	802,{
+niflheim,230,276,1	script	Red Flame#sc_f03	4_NFWISP,{
 	if (job_sha < 21) {
 		mes "That's a mysterious flame.";
 		mes "It looks like cursing.";
@@ -1922,7 +1920,7 @@ niflheim,230,276,1	script	Red Flame#sc_f03	802,{
 
 // Boxes
 //============================================================
-job3_sha01,22,78,0	script	????#keybox01	844,{
+job3_sha01,22,78,0	script	????#keybox01	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You can't continue on in this quest because you are overweight. -";
 		close;
@@ -1992,13 +1990,13 @@ job3_sha01,22,78,0	script	????#keybox01	844,{
 	close;
 }
 
-job3_sha01,25,28,0	script	????#keybox02	844,{
+job3_sha01,25,28,0	script	????#keybox02	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You can't continue on in this quest because you are overweight. -";
 		close;
 	}
 	setarray .@Words$[0],"SEED","FOOT","COLD";
-	setarray .@Numbers[0],24,25,20;
+	setarray .@numbers[0],24,25,20;
 	set .@i,job_sha-14;
 	if (job_sha > 13 && job_sha < 17) {
 		mes "There are lots of boxes.";
@@ -2025,8 +2023,8 @@ job3_sha01,25,28,0	script	????#keybox02	844,{
 		switch(select("Input the answer.:I can't get it.")) {
 		case 1:
 			input .@input;
-			if (.@input == .@Numbers[.@i]) {
-				mes "You put 2 and "+(.@Numbers[.@i]-20)+".";
+			if (.@input == .@numbers[.@i]) {
+				mes "You put 2 and "+(.@numbers[.@i]-20)+".";
 				mes "The box opens and you get one key.";
 				next;
 				mes "You got the Key of Illusion.";
@@ -2071,7 +2069,7 @@ job3_sha01,25,28,0	script	????#keybox02	844,{
 	end;
 }
 
-job3_sha01,73,80,0	script	????#keybox03	844,{
+job3_sha01,73,80,0	script	????#keybox03	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You can't continue on in this quest because you are overweight. -";
 		close;
@@ -2208,7 +2206,7 @@ job3_sha01,73,80,0	script	????#keybox03	844,{
 	end;
 }
 
-job3_sha01,71,27,0	script	????#keybox04	844,{
+job3_sha01,71,27,0	script	????#keybox04	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You can't continue on in this quest because you are overweight. -";
 		close;
@@ -2269,7 +2267,7 @@ job3_sha01,71,27,0	script	????#keybox04	844,{
 
 // Brush Shops
 //============================================================
-s_atelier,29,119,3	script	Max#sc05_prt	97,{
+s_atelier,29,119,3	script	Max#sc05_prt	4W_M_01,{
 	mes "[Max]";
 	mes "Welcome~";
 	if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2306,7 +2304,7 @@ s_atelier,29,119,3	script	Max#sc05_prt	97,{
 			mes "Good luck!";
 			delitem 7150,.@i[2]; //Bamboo_Cut
 			delitem 949,.@i[3]; //Feather
-			set Zeny, Zeny - .@i[4];
+			Zeny -= .@i[4];
 			getitem .@i[1],1; //Makeover_Brush,Paint_Brush
 			close;
 		}
@@ -2334,7 +2332,7 @@ s_atelier,29,119,3	script	Max#sc05_prt	97,{
 	}
 }
 
-s_atelier,136,70,3	script	Titika#sc09_ra	914,{
+s_atelier,136,70,3	script	Titika#sc09_ra	4_F_CHILD,{
 	mes "[Titika]";
 	mes "Welcome.";
 	if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2359,7 +2357,7 @@ s_atelier,136,70,3	script	Titika#sc09_ra	914,{
 			mes "I'll exchange it with the goods that I made.";
 			delitem 7150,.@i[2]; //Bamboo_Cut
 			delitem 949,.@i[3]; //Feather
-			set Zeny, Zeny - .@i[4];
+			Zeny -= .@i[4];
 			getitem .@i[1],1; //Makeover_Brush,Paint_Brush
 			close;
 		}
@@ -2385,7 +2383,7 @@ s_atelier,136,70,3	script	Titika#sc09_ra	914,{
 	}
 }
 
-s_atelier,124,128,3	script	RimiGX#sc07_yuno	862,{
+s_atelier,124,128,3	script	RimiGX#sc07_yuno	4_F_LGTGIRL,{
 	mes "[RimiGX]";
 	mes "Welcome.";
 	if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2409,7 +2407,7 @@ s_atelier,124,128,3	script	RimiGX#sc07_yuno	862,{
 			mes "It will be fast when I exchange the stuff made?";
 			delitem 7150,.@i[2]; //Bamboo_Cut
 			delitem 949,.@i[3]; //Feather
-			set Zeny, Zeny - .@i[4];
+			Zeny -= .@i[4];
 			getitem .@i[1],1; //Makeover_Brush,Paint_Brush
 			close;
 		}
@@ -2434,7 +2432,7 @@ s_atelier,124,128,3	script	RimiGX#sc07_yuno	862,{
 	}
 }
 
-s_atelier,26,68,3	script	Vito#sc11_lgt	904,{
+s_atelier,26,68,3	script	Vito#sc11_lgt	4_M_KHMAN,{
 	mes "[Vito]";
 	mes "Welcome.";
 	if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2459,7 +2457,7 @@ s_atelier,26,68,3	script	Vito#sc11_lgt	904,{
 			mes "I'm going to exchange the blush I made before.";
 			delitem 7150,.@i[2]; //Bamboo_Cut
 			delitem 949,.@i[3]; //Feather
-			set Zeny, Zeny - .@i[4];
+			Zeny -= .@i[4];
 			getitem .@i[1],1; //Makeover_Brush,Paint_Brush
 			close;
 		}
@@ -2485,7 +2483,7 @@ s_atelier,26,68,3	script	Vito#sc11_lgt	904,{
 
 // Warp Portal
 //============================================================
-tha_t01,149,228,0	script	#shadowc02	45,2,2,{
+tha_t01,149,228,0	script	#shadowc02	WARPNPC,2,2,{
 	end;
 OnTouch:
 	mes "You can feel weird power.";
@@ -2503,4 +2501,4 @@ OnTouch:
 //============================================================
 tur_dun03,0,0,0,0	monster	Shadow of Deception	2076,1,1000,0,0
 ice_dun02,0,0,0,0	monster	Shadow of Illusion	2077,1,1000,0,0
-niflheim,0,0,0,0	monster	Shadow of Pleasure	2078,1,1000,0,0
\ No newline at end of file
+niflheim,0,0,0,0	monster	Shadow of Pleasure	2078,1,1000,0,0
diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt
index 71ec97e4b..05c568431 100644
--- a/npc/re/jobs/3-2/sorcerer.txt
+++ b/npc/re/jobs/3-2/sorcerer.txt
@@ -1,21 +1,19 @@
 //===== Hercules Script ======================================
 //= Sorcerer Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Sage / Professor -> Sorcerer.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
 //= 1.1 Cleaning. [Euphy]
 //= 1.2 Updated script, optimized. [Euphy]
 //============================================================
 
-gef_tower,102,34,5	script	Merito	742,{
+gef_tower,102,34,5	script	Merito	2_M_SAGE_B,{
 	mes "[Merito]";
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "You packed so much in your bag. Try again after emptying your bag.";
@@ -127,7 +125,7 @@ gef_tower,102,34,5	script	Merito	742,{
 	}
 }
 
-gef_tower,113,161,5	script	Karacas	754,{
+gef_tower,113,161,5	script	Karacas	4_M_SAGE_A,{
 	mes "[Karacas]";
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "Oh, it seems that you're too heavy. Empty your bag and then come again.";
@@ -414,7 +412,7 @@ gef_tower,113,161,5	script	Karacas	754,{
 	}
 	close;
 }
-thor_v01,64,252,0	duplicate(Spirit Detecting Staff#0)	Spirit Detecting Staff#1	836
-ice_dun01,274,274,0	duplicate(Spirit Detecting Staff#0)	Spirit Detecting Staff#2	836
-mjo_dun03,200,141,0	duplicate(Spirit Detecting Staff#0)	Spirit Detecting Staff#3	836
-gon_dun02,195,190,0	duplicate(Spirit Detecting Staff#0)	Spirit Detecting Staff#4	836
\ No newline at end of file
+thor_v01,64,252,0	duplicate(Spirit Detecting Staff#0)	Spirit Detecting Staff#1	2_BOARD2
+ice_dun01,274,274,0	duplicate(Spirit Detecting Staff#0)	Spirit Detecting Staff#2	2_BOARD2
+mjo_dun03,200,141,0	duplicate(Spirit Detecting Staff#0)	Spirit Detecting Staff#3	2_BOARD2
+gon_dun02,195,190,0	duplicate(Spirit Detecting Staff#0)	Spirit Detecting Staff#4	2_BOARD2
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index 311e95ec1..8bbc45cfe 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -1,21 +1,20 @@
 //===== Hercules Script ======================================
 //= Sura Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib, Gepard
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.3
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Monk / Champion -> Sura.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
 //= 1.1 Removed disablenpc which causes players stucked in waitingroom. [Joseph]
 //= 1.2 Updated script, optimized. [Euphy]
+//= 1.3 Added GM management function. [Euphy]
 //============================================================
 
-ve_in,237,125,0	script	King Crab#job_shu	107,{
+ve_in,237,125,0	script	King Crab#job_shu	1_M_PAY_ELDER,{
 	if (job_shu == 0) {
 		mes "[King Crab]";
 		mes "Khh ha ha ha ha ha ha.";
@@ -156,9 +155,9 @@ ve_in,237,125,0	script	King Crab#job_shu	107,{
 		close;
 	}
 }
-ve_in,241,128,4	duplicate(King Crab#job_shu)	Sludge Worm#job_shu	110
+ve_in,241,128,4	duplicate(King Crab#job_shu)	Sludge Worm#job_shu	4_M_MINISTER
 
-ve_in,244,126,3	script	Waitress#job_shu	69,{
+ve_in,244,126,3	script	Waitress#job_shu	1_F_04,{
 	mes "[Waitress]";
 	if (job_shu == 0) {
 		mes "Oh no~";
@@ -193,7 +192,7 @@ ve_in,244,126,3	script	Waitress#job_shu	69,{
 	close;
 }
 
-ve_in,240,131,0	script	???#bcmd	484,{
+ve_in,240,131,0	script	???#bcmd	4_F_SURA,{
 	end;
 OnInit:
 	disablenpc "???#bcmd";
@@ -212,7 +211,7 @@ OnTimer600000:
 	end;
 }
 
-ve_in,97,149,0	script	#Suraryokan	139,3,3,{
+ve_in,97,149,0	script	#Suraryokan	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (job_shu == 1) {
 		set .@n$, "["+strcharinfo(0)+"]";
@@ -270,7 +269,7 @@ OnTouch:
 	end;
 }
 
-ve_in,98,159,0	script	Fighter#job_shu	484,{
+ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 	if (job_shu < 2) {
 		mes "[Fighter]";
 		mes "Ahhhh~ I'm so tired.";
@@ -432,7 +431,7 @@ ve_in,98,159,0	script	Fighter#job_shu	484,{
 	close;
 }
 
-yuno_fild07,254,176,7	script	Buddy#job_shu	753,{
+yuno_fild07,254,176,7	script	Buddy#job_shu	4_M_MONK,{
 	if (job_shu < 4) {
 		mes "[Buddy]";
 		mes "Haaap!!! Haaaap!!! Whoo!! Haahhp!!!";
@@ -506,7 +505,7 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	753,{
 	end;
 }
 
-sword_1-1,223,243,4	script	Drawing Room	753,{
+sword_1-1,223,243,4	script	Drawing Room	4_M_MONK,{
 	end;
 OnInit:
 	waitingroom "Drawing Room",20,"Drawing Room::OnStartArena",1;
@@ -525,7 +524,7 @@ OnDisable:
 	end;
 }
 
-sword_1-1,223,243,4	script	Buddy#job_shu_Salong	753,{
+sword_1-1,223,243,4	script	Buddy#job_shu_Salong	4_M_MONK,{
 	mes "[Buddy]";
 	mes "My master doesn't like noise, so please ^f57d7dwait in the living room silently.^000000";
 	next;
@@ -543,7 +542,7 @@ sword_1-1,223,243,4	script	Buddy#job_shu_Salong	753,{
 	}
 }
 
-sword_2-1,1,1,0	script	Buddy#Sura_Salon	66,{
+sword_2-1,1,1,0	script	Buddy#Sura_Salon	1_F_01,{
 	end;
 OnInit:
 	disablenpc "Buddy#Sura_Salon";
@@ -644,7 +643,7 @@ OnTimer320000:
 	end;
 }
 
-sword_2-1,223,205,7	script	Buddy#job_shuaneh	753,{
+sword_2-1,223,205,7	script	Buddy#job_shuaneh	4_M_MONK,{
 	if (job_shu > 4) {
 		mes "I'll show you the way. This way.";
 		close2;
@@ -665,7 +664,7 @@ OnEnable:
 	end;
 }
 
-sword_2-1,223,205,0	script	#Sura_garajjom	139,10,10,{
+sword_2-1,223,205,0	script	#Sura_garajjom	HIDDEN_WARP_NPC,10,10,{
 OnTouch:
 	warp "sword_1-1",216,168;
 	end;
@@ -678,7 +677,7 @@ OnEnable:
 	end;
 }
 
-sword_1-1,222,169,5	script	Bruno#job_shu	484,{
+sword_1-1,222,169,5	script	Bruno#job_shu	4_F_SURA,{
 	if (job_shu > 4) {
 		mes "[Bruno]";
 		mes "Hey~ "+strcharinfo(0)+", what's up?";
@@ -743,7 +742,7 @@ sword_1-1,222,169,5	script	Bruno#job_shu	484,{
 	end;
 }
 
-sword_1-1,223,167,2	script	Master#job_shu	483,{
+sword_1-1,223,167,2	script	Master#job_shu	4_M_SURA,{
 	mes "[Master]";
 	if (job_shu == 5) {
 		mes "You must have bright eyes to see that you finally came to this room.";
@@ -829,8 +828,8 @@ sword_1-1,223,167,2	script	Master#job_shu	483,{
 	end;
 }
 
-/*
-sword_2-1,1,2,0	script	Button Girl#sura	66,{
+sword_2-1,1,2,0	script	Button Girl#sura	1_F_01,{
+	callfunc "F_GM_NPC";
 	switch(select("Turn on arena.:Turn off arena.:Turn on the living room.:Turn on Buddy.:Turn on Gara.:Turn off all.:Close")) {
 	case 1:
 		mes "Turn on arena.";
@@ -864,4 +863,3 @@ sword_2-1,1,2,0	script	Button Girl#sura	66,{
 		close;
 	}
 }
-*/
\ No newline at end of file
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index 41839b644..9ce297068 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -1,15 +1,13 @@
 //===== Hercules Script ======================================
 //= Wanderer Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib, Meyraw
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Dancer / Gypsy -> Wanderer.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Updated dialogue to be more official / accurate. Huge thanks to Muad_Dib! [Masao]
 //= 1.2 Fixed an endless loop in dialogue.
@@ -17,7 +15,7 @@
 //= 1.4 Updated script, optimized. [Euphy]
 //============================================================
 
-xmas,162,209,5	script	Aspiring Wanderer, Soy	714,{
+xmas,162,209,5	script	Aspiring Wanderer, Soy	4_F_06,{
 	if (job_wan == 0) {
 		mes "[Soy]";
 		mes "Mimi, what should I do?";
@@ -111,9 +109,9 @@ xmas,162,209,5	script	Aspiring Wanderer, Soy	714,{
 		close;
 	}
 }
-xmas,163,209,3	duplicate(Aspiring Wanderer, Soy)	Aspiring Wanderer, Mimi	714
+xmas,163,209,3	duplicate(Aspiring Wanderer, Soy)	Aspiring Wanderer, Mimi	4_F_06
 
-xmas,132,143,5	script	Performance Manager#wnd	713,{
+xmas,132,143,5	script	Performance Manager#wnd	4_M_06,{
 	mes "[Performance Manager]";
 	if (job_wan == 0) {
 		mes "Oh, what should I do?";
@@ -291,7 +289,7 @@ xmas,132,143,5	script	Performance Manager#wnd	713,{
 	close;
 }
 
-comodo,140,86,5	script	Cheerless Maestro	479,{
+comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 	if (job_wan < 2) {
 		mes "[Cheerless Maestro]";
 		mes "You can dance ~";
@@ -453,7 +451,7 @@ comodo,140,86,5	script	Cheerless Maestro	479,{
 			mes "[" + strcharinfo(0) + "]";
 			mes "It felt like hearing mommy's lullaby~ It was so beautiful and moving... You are the best artist of our time.";
 			next;
-			specialeffect 18;
+			specialeffect EF_STEAL;
 			mes "[Guitar Song]";
 			mes "Ha ha ha. I know that well, but it feels good to hear a compliment from you!";
 			next;
@@ -560,7 +558,7 @@ comodo,140,86,5	script	Cheerless Maestro	479,{
 	close;
 }
 
-hu_in01,305,251,5	script	Vacant Looking Lady#wnd	879,{
+hu_in01,305,251,5	script	Vacant Looking Lady#wnd	4_F_CAPEGIRL,{
 	if (job_wan < 4) {
 		mes "[Vacant Looking Lady]";
 		mes "(blank...)";
@@ -748,7 +746,7 @@ hu_in01,305,251,5	script	Vacant Looking Lady#wnd	879,{
 	close;
 }
 
-hu_fild05,342,130,5	script	Dancer Kim#fild	879,{
+hu_fild05,342,130,5	script	Dancer Kim#fild	4_F_CAPEGIRL,{
 	if (job_wan == 6) {
 		mes "[Dancer Kim]";
 		mes "Exercising together is good but if we compete for it, I think we'll get a better effect!";
@@ -860,18 +858,18 @@ OnTouch:
 	}
 	end;
 }
-hu_fild05,81,111,0	duplicate(wandererjcq)	#fildshout01	139,20,20
-hu_fild05,193,98,0	duplicate(wandererjcq)	#fildshout02	139,20,20
-hu_fild05,252,74,0	duplicate(wandererjcq)	#fildshout03	139,20,20
-hu_fild05,323,175,0	duplicate(wandererjcq)	#fildshout04	139,20,20
-hu_fild05,334,225,0	duplicate(wandererjcq)	#fildshout05	139,20,20
-hu_fild05,301,287,0	duplicate(wandererjcq)	#fildshout06	139,20,20
-hu_fild05,229,315,0	duplicate(wandererjcq)	#fildshout07	139,20,20
-hu_fild05,146,309,0	duplicate(wandererjcq)	#fildshout08	139,20,20
-hu_fild05,80,239,0	duplicate(wandererjcq)	#fildshout09	139,20,20
-hu_fild05,69,147,0	duplicate(wandererjcq)	#fildshout10	139,20,20
+hu_fild05,81,111,0	duplicate(wandererjcq)	#fildshout01	HIDDEN_WARP_NPC,20,20
+hu_fild05,193,98,0	duplicate(wandererjcq)	#fildshout02	HIDDEN_WARP_NPC,20,20
+hu_fild05,252,74,0	duplicate(wandererjcq)	#fildshout03	HIDDEN_WARP_NPC,20,20
+hu_fild05,323,175,0	duplicate(wandererjcq)	#fildshout04	HIDDEN_WARP_NPC,20,20
+hu_fild05,334,225,0	duplicate(wandererjcq)	#fildshout05	HIDDEN_WARP_NPC,20,20
+hu_fild05,301,287,0	duplicate(wandererjcq)	#fildshout06	HIDDEN_WARP_NPC,20,20
+hu_fild05,229,315,0	duplicate(wandererjcq)	#fildshout07	HIDDEN_WARP_NPC,20,20
+hu_fild05,146,309,0	duplicate(wandererjcq)	#fildshout08	HIDDEN_WARP_NPC,20,20
+hu_fild05,80,239,0	duplicate(wandererjcq)	#fildshout09	HIDDEN_WARP_NPC,20,20
+hu_fild05,69,147,0	duplicate(wandererjcq)	#fildshout10	HIDDEN_WARP_NPC,20,20
 
-xmas,148,131,0	script	#wandergogo	139,3,3,{
+xmas,148,131,0	script	#wandergogo	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (job_wan == 9) {
 		enablenpc "Dancer Kim#xmas";
@@ -886,7 +884,7 @@ OnTouch:
 	end;
 }
 
-xmas,147,135,5	script	Dancer Kim#xmas	485,{
+xmas,147,135,5	script	Dancer Kim#xmas	4_F_WANDERER,{
 	if (job_wan == 9) {
 		if (BaseJob != Job_Dancer && BaseLevel < 99 && JobLevel < 50) {
 			mes "- You can't continue the quest because the condition for the quest is not appropriate. -";
@@ -1028,10 +1026,10 @@ OnInit:
 	disablenpc strnpcinfo(0);
 	end;
 }
-xmas,149,135,3	duplicate(#wander_xmas)	Guitar Song#xmas	479
-xmas,142,130,7	duplicate(#wander_xmas)	Spectator#xmas1	711
-xmas,145,127,7	duplicate(#wander_xmas)	Spectator#xmas2	712
-xmas,148,127,7	duplicate(#wander_xmas)	Soy#xmas	714
-xmas,149,127,1	duplicate(#wander_xmas)	Mimi#xmas	714
-xmas,151,127,1	duplicate(#wander_xmas)	Spectator#xmas3	716
-xmas,154,129,1	duplicate(#wander_xmas)	Spectator#xmas4	797
\ No newline at end of file
+xmas,149,135,3	duplicate(#wander_xmas)	Guitar Song#xmas	4_M_MINSTREL
+xmas,142,130,7	duplicate(#wander_xmas)	Spectator#xmas1	4_F_05
+xmas,145,127,7	duplicate(#wander_xmas)	Spectator#xmas2	4_M_05
+xmas,148,127,7	duplicate(#wander_xmas)	Soy#xmas	4_F_06
+xmas,149,127,1	duplicate(#wander_xmas)	Mimi#xmas	4_F_06
+xmas,151,127,1	duplicate(#wander_xmas)	Spectator#xmas3	4_M_KID2
+xmas,154,129,1	duplicate(#wander_xmas)	Spectator#xmas4	4_M_NFLOSTMAN