Merge pull request #1 from HerculesWS/master

Update from original

863 files changed, 81075 insertions, 51825 deletions

diff --git a/npc/MOTD.txt b/npc/MOTD.txt
index 7b2f086b4..ceb3f4cda 100644
--- a/npc/MOTD.txt
+++ b/npc/MOTD.txt
@@ -1,15 +1,15 @@
-//====================================================
-//=       _   _                     _           
-//=      | | | |                   | |          
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___ 
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//=                                                  
-//=            http://hercules.ws/board/                        
+//======= Hercules Script ===========================
+//=       _   _                     _                =
+//=      | | | |                   | |               =
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___      =
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|     =
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \     =
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/     =
+//=                                                  =
+//=            http://hercules.ws/board/             =
 //====================================================
 // run when any character logs in, attached to them.
 -	script	HerculesMOTD	-1,{
-message strcharinfo(0),"Welcome to Hercules! Enjoy! Please report any bugs you find.";
-end;
-}
\ No newline at end of file
+	message strcharinfo(0),"Welcome to Hercules! Enjoy! Please report any bugs you find.";
+	end;
+}
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index b45d20312..389e3c1ac 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -14,18 +14,18 @@
 //= -> Juno -> Hugel -> ...
 //============================================================
 
-airplane,243,73,0	script	#AirshipWarp-1	45,1,1,{
+airplane,243,73,0	script	#AirshipWarp-1	WARPNPC,1,1,{
 	end;
 
 OnInit:
 OnHide:
-	misceffect 16;
+	specialeffect EF_BASH;
 	disablenpc strnpcinfo(0);
 	end;
 
 OnUnhide:
 	enablenpc strnpcinfo(0);
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnTouch:
@@ -37,7 +37,7 @@ OnTouch:
 	}
 }
 
-airplane,243,29,0	duplicate(#AirshipWarp-1)	#AirshipWarp-2	45,1,1
+airplane,243,29,0	duplicate(#AirshipWarp-1)	#AirshipWarp-2	WARPNPC,1,1
 
 airplane,1,1,0	script	Domestic_Airship	-1,{
 	end;
@@ -167,14 +167,14 @@ OnTimer480000:
 	initnpctimer;
 }
 
-airplane,240,64,5	script	Exit#airplane1a::ExitAirplane	857,{
+airplane,240,64,5	script	Exit#airplane1a::ExitAirplane	4_BOARD3,{
 	end;
 }
-airplane,247,64,5	duplicate(ExitAirplane)	Exit#airplane1b	857
-airplane,240,40,1	duplicate(ExitAirplane)	Exit#airplane2a	857
-airplane,247,40,1	duplicate(ExitAirplane)	Exit#airplane2b	857
+airplane,247,64,5	duplicate(ExitAirplane)	Exit#airplane1b	4_BOARD3
+airplane,240,40,1	duplicate(ExitAirplane)	Exit#airplane2a	4_BOARD3
+airplane,247,40,1	duplicate(ExitAirplane)	Exit#airplane2b	4_BOARD3
 
-airplane,100,69,3	script	Airship Crew#ein-1	852,{
+airplane,100,69,3	script	Airship Crew#ein-1	4_M_EIN_SOLDIER,{
 	mes "[Airship Crew]";
 	mes "If we've landed at";
 	mes "your destination and";
@@ -185,7 +185,7 @@ airplane,100,69,3	script	Airship Crew#ein-1	852,{
 	close;
 }
 
-airplane,64,94,1	script	Umbala Kid#ein_p	787,{
+airplane,64,94,1	script	Umbala Kid#ein_p	4_M_UMKID,{
 	emotion e_swt2;
 	mes "[Kid]";
 	if (event_umbala >= 3) {
@@ -203,7 +203,7 @@ airplane,64,94,1	script	Umbala Kid#ein_p	787,{
 	close;
 }
 
-airplane,66,93,3	script	Umbala Lady#ein_p	783,{
+airplane,66,93,3	script	Umbala Lady#ein_p	4_F_UMWOMAN,{
 	emotion e_dots;
 	mes "[Lady]";
 	if (event_umbala >= 3) {
@@ -222,7 +222,7 @@ airplane,66,93,3	script	Umbala Lady#ein_p	783,{
 	close;
 }
 
-airplane,71,91,7	script	Umbala Man#ein_p	789,{
+airplane,71,91,7	script	Umbala Man#ein_p	4_M_UMSOLDIER,{
 	if (event_umbala >= 3) {
 		mes "[Chrmlim]";
 		mes "Hey there~";
@@ -265,7 +265,7 @@ airplane,71,91,7	script	Umbala Man#ein_p	789,{
 	close;
 }
 
-airplane,250,58,2	script	Airship Staff#airplane	67,{
+airplane,250,58,2	script	Airship Staff#airplane	1_F_02,{
 	// Hugel quest addition
 	if (hg_ma1 == 3) {
 		mes "[Airship Staff]";
@@ -329,7 +329,7 @@ airplane,250,58,2	script	Airship Staff#airplane	67,{
 	}
 }
 
-airplane,80,71,2	script	Zerta#01airplane	834,{
+airplane,80,71,2	script	Zerta#01airplane	4_M_BUDDHIST,{
 	mes "[Zerta]";
 	mes "Oh, hello adventurer.";
 	mes "I am currently on a";
@@ -339,7 +339,7 @@ airplane,80,71,2	script	Zerta#01airplane	834,{
 	close;
 }
 
-airplane,65,63,4	script	Maelin#01airplane	714,{
+airplane,65,63,4	script	Maelin#01airplane	4_F_06,{
 	mes "[Maelin]";
 	mes "Um, this Airship is";
 	mes "to Lutie, isn't it? I've";
@@ -349,7 +349,7 @@ airplane,65,63,4	script	Maelin#01airplane	714,{
 	close;
 }
 
-airplane,72,34,6	script	Aanos#01airplane	702,{
+airplane,72,34,6	script	Aanos#01airplane	4_F_GON,{
 	mes "[Aanos]";
 	mes "Oh wooow~";
 	mes "The sky looks";
@@ -358,7 +358,7 @@ airplane,72,34,6	script	Aanos#01airplane	702,{
 	close;
 }
 
-airplane,221,158,2	script	Pilot#airplane	852,{
+airplane,221,158,2	script	Pilot#airplane	4_M_EIN_SOLDIER,{
 	// Hugel quest addition
 	if (hg_ma1 == 3) {
 		mes "[Pilot]";
@@ -457,7 +457,7 @@ airplane,221,158,2	script	Pilot#airplane	852,{
 	}
 }
 
-airplane,50,66,5	script	Apple Merchant#airplane	86,{
+airplane,50,66,5	script	Apple Merchant#airplane	4_M_04,{
 	mes "[Fruitz]";
 	mes "Welcome to Fruitz's";
 	mes "Shop where you can";
@@ -531,7 +531,7 @@ airplane,50,66,5	script	Apple Merchant#airplane	86,{
 			close;
 		}
 		else {
-			set Zeny, Zeny - .@pay;
+			Zeny -= .@pay;
 			getitem 512,.@input; //Apple
 			mes "[Fruitz]";
 			mes "Thanks for stopping by";
@@ -643,18 +643,18 @@ airplane,50,66,5	script	Apple Merchant#airplane	86,{
 	}
 }
 
-//============================================================ 
+//============================================================
 //= International Airship Route
 //= ... -> Izlude -> Juno -> Rachel -> ...
-//============================================================ 
+//============================================================
 
-airplane_01,243,73,0	script	#AirshipWarp-3	45,1,1,{
+airplane_01,243,73,0	script	#AirshipWarp-3	WARPNPC,1,1,{
 	end;
 	
 OnTouch:
 	switch ($@airplanelocation2) {
 	case 0: warp "ra_fild12",292,204; end;
-	case 1: 
+	case 1:
 		if(checkre(0))
 			warp "izlude",200,73;
 		else
@@ -665,17 +665,17 @@ OnTouch:
 
 OnInit:
 OnHide:
-	misceffect 16;
+	specialeffect EF_BASH;
 	disablenpc strnpcinfo(0);
 	end;
 	
 OnUnhide:
 	enablenpc strnpcinfo(0);
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 }
 
-airplane_01,243,29,0	duplicate(#AirshipWarp-3)	#AirshipWarp-4	45,1,1
+airplane_01,243,29,0	duplicate(#AirshipWarp-3)	#AirshipWarp-4	WARPNPC,1,1
 
 airplane_01,1,1,0	script	International_Airship	-1,{
 	end;
@@ -755,14 +755,14 @@ OnTimer240000:
 	end;
 }
 
-airplane_01,240,64,5	script	Exit#airplane_011a::ExitAirplane01	857,{
+airplane_01,240,64,5	script	Exit#airplane_011a::ExitAirplane01	4_BOARD3,{
 	end;
 }
-airplane_01,247,64,5	duplicate(ExitAirplane01)	Exit#airplane_011b	857
-airplane_01,240,40,1	duplicate(ExitAirplane01)	Exit#airplane_012a	857
-airplane_01,247,40,1	duplicate(ExitAirplane01)	Exit#airplane_012b	857
+airplane_01,247,64,5	duplicate(ExitAirplane01)	Exit#airplane_011b	4_BOARD3
+airplane_01,240,40,1	duplicate(ExitAirplane01)	Exit#airplane_012a	4_BOARD3
+airplane_01,247,40,1	duplicate(ExitAirplane01)	Exit#airplane_012b	4_BOARD3
 
-airplane_01,250,58,2	script	Airship Staff#airplane01	67,{
+airplane_01,250,58,2	script	Airship Staff#airplane01	1_F_02,{
 	mes "[Airship Staff]";
 	mes "Welcome";
 	mes "to the Airship.";
@@ -813,7 +813,7 @@ airplane_01,250,58,2	script	Airship Staff#airplane01	67,{
 	}
 }
 
-airplane_01,50,66,5	script	Apple Merchant#air01	86,{
+airplane_01,50,66,5	script	Apple Merchant#air01	4_M_04,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -895,7 +895,7 @@ airplane_01,50,66,5	script	Apple Merchant#air01	86,{
 			close;
 		}
 		else {
-			set Zeny, Zeny - .@pay;
+			Zeny -= .@pay;
 			getitem 512,.@input; //Apple
 			mes "[Meltz]";
 			mes "Thanks for stopping by";
@@ -957,7 +957,7 @@ airplane_01,50,66,5	script	Apple Merchant#air01	86,{
 	}
 }
 
-airplane_01,221,158,2	script	Pilot#airplane_01	852,{
+airplane_01,221,158,2	script	Pilot#airplane_01	4_M_EIN_SOLDIER,{
 	switch (rand(1,4)) {
 	case 1:
 		mes "[Pilot]";
@@ -1013,7 +1013,7 @@ airplane_01,221,158,2	script	Pilot#airplane_01	852,{
 	}
 }
 
-airplane_01,83,61,2	script	Dianne#01airplane_01	72,2,2,{
+airplane_01,83,61,2	script	Dianne#01airplane_01	1_F_MARIA,2,2,{
 	mes "[Dianne]";
 	mes "It's so weird!";
 	mes "I went to visit the";
@@ -1028,7 +1028,7 @@ OnTouch:
 	end;
 }
 
-airplane_01,69,63,2	script	Mendel#01airplane_01	55,{
+airplane_01,69,63,2	script	Mendel#01airplane_01	1_M_JOBTESTER,{
 	mes "[Mendel]";
 	mes "As I expected, the";
 	mes "in-flight meals are";
@@ -1039,7 +1039,7 @@ airplane_01,69,63,2	script	Mendel#01airplane_01	55,{
 	close;
 }
 
-airplane_01,71,31,2	script	Swordsman Shimizu#air_01	106,{
+airplane_01,71,31,2	script	Swordsman Shimizu#air_01	1_M_MOC_LORD,{
 	mes "[Swordsman Shimizu]";
 	mes "Finally, after five";
 	mes "years of waiting...";
@@ -1054,10 +1054,10 @@ airplane_01,71,31,2	script	Swordsman Shimizu#air_01	106,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 //= Typing Challenge
-//============================================================ 
-airplane_01,32,61,4	script	Nils#ein	49,1,1,{
+//============================================================
+airplane_01,32,61,4	script	Nils#ein	1_M_03,1,1,{
 	mes "[Nils]";
 	mes "Welcome to the";
 	mes "^ff0000RO Typing Challenge^000000.";
@@ -1229,10 +1229,10 @@ airplane_01,32,61,4	script	Nils#ein	49,1,1,{
 	}
 }
 
-//============================================================ 
+//============================================================
 //= Apple Gambling
-//============================================================ 
-airplane_01,33,68,4	script	Clarice	74,{
+//============================================================
+airplane_01,33,68,4	script	Clarice	1_F_MERCHANT_02,{
 	mes "[Clarice]";
 	mes "Hi, I'm Clarice~";
 	mes "How would you like";
diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt
index 8143c68bf..774bd14b3 100644
--- a/npc/airports/einbroch.txt
+++ b/npc/airports/einbroch.txt
@@ -1,14 +1,14 @@
 //===== Hercules Script ======================================
 //= Einbroch Airport Staff
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf, Muad_Dib
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Einbroch Airport Staff
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Official NPCs.
-//============================================================ 
+//============================================================
 
-airport,143,43,5	script	Airport Staff#airport1a::airport1	90,{
+airport,143,43,5	script	Airport Staff#airport1a::airport1	4_F_01,{
 	mes "[Airport Staff]";
 	mes "Welcome to the";
 	mes "Einbroch Airport,";
@@ -31,7 +31,7 @@ airport,143,43,5	script	Airport Staff#airport1a::airport1	90,{
 				end;
 			}
 			if (Zeny >= 1200) {
-				set Zeny, Zeny - 1200;
+				Zeny -= 1200;
 				warp "airport",148,51;
 				end;
 			}
@@ -51,10 +51,10 @@ airport,143,43,5	script	Airport Staff#airport1a::airport1	90,{
 	close;
 }
 
-airport,158,43,5	duplicate(airport1)	Airport Staff#airport1b	90
-airport,126,43,5	duplicate(airport1)	Airport Staff#airport1c	90
+airport,158,43,5	duplicate(airport1)	Airport Staff#airport1b	4_F_01
+airport,126,43,5	duplicate(airport1)	Airport Staff#airport1c	4_F_01
 
-airport,143,49,3	script	Arrival Staff#airport2a::airport2	90,{
+airport,143,49,3	script	Arrival Staff#airport2a::airport2	4_F_01,{
 	mes "[Arrival Staff]";
 	mes "Welcome to Einbroch Airport.";
 	mes "If you are arriving from your";
@@ -83,10 +83,10 @@ airport,143,49,3	script	Arrival Staff#airport2a::airport2	90,{
 	close;
 }
 
-airport,126,51,3	duplicate(airport2)	Arrival Staff#airport2b	90
-airport,158,50,3	duplicate(airport2)	Arrival Staff#airport2c	90
+airport,126,51,3	duplicate(airport2)	Arrival Staff#airport2b	4_F_01
+airport,158,50,3	duplicate(airport2)	Arrival Staff#airport2c	4_F_01
 
-einbroch,94,267,3	script	Airship Staff#ein01	91,{
+einbroch,94,267,3	script	Airship Staff#ein01	4_F_02,{
 	mes "[Airship Staff]";
 	mes "Welcome to the";
 	mes "Einbroch Airport.";
diff --git a/npc/airports/hugel.txt b/npc/airports/hugel.txt
index 2d65fdc30..7d4b3f85a 100644
--- a/npc/airports/hugel.txt
+++ b/npc/airports/hugel.txt
@@ -8,7 +8,7 @@
 //= Official NPCs.
 //============================================================
 
-hugel,178,142,0	script	toairplane#hugel	45,1,1,{
+hugel,178,142,0	script	toairplane#hugel	WARPNPC,1,1,{
 	end;
 OnTouch:
 	mes "To use the airship, you are required to pay 1,200 zeny or a Free Airship Ticket.";
@@ -21,7 +21,7 @@ OnTouch:
 			end;
 		}
 		if (Zeny >= 1200) {
-			set Zeny, Zeny - 1200;
+			Zeny -= 1200;
 			warp "airplane",244,58;
 			end;
 		}
diff --git a/npc/airports/izlude.txt b/npc/airports/izlude.txt
index fe46c1169..aaf08b9a7 100644
--- a/npc/airports/izlude.txt
+++ b/npc/airports/izlude.txt
@@ -30,7 +30,7 @@
 				end;
 			}
 			if (Zeny >= 1200) {
-				set Zeny, Zeny - 1200;
+				Zeny -= 1200;
 				warp "airplane_01",244,58;
 				end;
 			}
diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt
index 817e4b2c3..de26fb0cc 100644
--- a/npc/airports/lighthalzen.txt
+++ b/npc/airports/lighthalzen.txt
@@ -1,14 +1,14 @@
 //===== Hercules Script ======================================
 //= Lighthalzen Airport Staff
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf, Muad_Dib
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Lighthalzen Airport Staff
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Official NPCs.
-//============================================================ 
+//============================================================
 
-lhz_airport,143,43,5	script	Airport Staff#lhz_air1a::lhz_airport1	90,{
+lhz_airport,143,43,5	script	Airport Staff#lhz_air1a::lhz_airport1	4_F_01,{
 	mes "[Airport Staff]";
 	mes "Welcome to the";
 	mes "Lighthalzen Airport,";
@@ -29,7 +29,7 @@ lhz_airport,143,43,5	script	Airport Staff#lhz_air1a::lhz_airport1	90,{
 				end;
 			}
 			if (Zeny >= 1200) {
-				set Zeny, Zeny - 1200;
+				Zeny -= 1200;
 				warp "lhz_airport",148,51;
 				end;
 			}
@@ -47,10 +47,10 @@ lhz_airport,143,43,5	script	Airport Staff#lhz_air1a::lhz_airport1	90,{
 	close;
 }
 
-lhz_airport,158,43,5	duplicate(lhz_airport1)	Airship Staff#lhz_air1b	90
-lhz_airport,126,43,5	duplicate(lhz_airport1)	Airship Staff#lhz_air1c	90
+lhz_airport,158,43,5	duplicate(lhz_airport1)	Airship Staff#lhz_air1b	4_F_01
+lhz_airport,126,43,5	duplicate(lhz_airport1)	Airship Staff#lhz_air1c	4_F_01
 
-lhz_airport,143,49,3	script	Arrival Staff#lhz_air2a::lhz_airport2	90,{
+lhz_airport,143,49,3	script	Arrival Staff#lhz_air2a::lhz_airport2	4_F_01,{
 	mes "[Arrival Staff]";
 	mes "Welcome to Lighthalzen Airport.";
 	mes "Please let me guide you to the";
@@ -77,5 +77,5 @@ lhz_airport,143,49,3	script	Arrival Staff#lhz_air2a::lhz_airport2	90,{
 	close;
 }
 
-lhz_airport,126,51,3	duplicate(lhz_airport2)	Arrival Staff#lhz_air2b	90
-lhz_airport,158,50,3	duplicate(lhz_airport2)	Arrival Staff#lhz_air2c	90
+lhz_airport,126,51,3	duplicate(lhz_airport2)	Arrival Staff#lhz_air2b	4_F_01
+lhz_airport,158,50,3	duplicate(lhz_airport2)	Arrival Staff#lhz_air2c	4_F_01
diff --git a/npc/airports/rachel.txt b/npc/airports/rachel.txt
index 88c48cd16..42a2a7e95 100644
--- a/npc/airports/rachel.txt
+++ b/npc/airports/rachel.txt
@@ -8,7 +8,7 @@
 //= Official NPCs.
 //============================================================
 
-ra_fild12,295,208,0	script	toairplane#rachel	45,1,1,{
+ra_fild12,295,208,0	script	toairplane#rachel	WARPNPC,1,1,{
 	end;
 OnTouch:
 	mes "To use the airship, you are required to pay 1,200 zeny or a Free Airship Ticket.";
@@ -21,7 +21,7 @@ OnTouch:
 			end;
 		}
 		if (Zeny >= 1200) {
-			set Zeny, Zeny - 1200;
+			Zeny -= 1200;
 			warp "airplane_01",245,60;
 			end;
 		}
@@ -31,4 +31,4 @@ OnTouch:
 	}
 	mes "Thank you, please come again.";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt
index ffcade3cc..2146dc671 100644
--- a/npc/airports/yuno.txt
+++ b/npc/airports/yuno.txt
@@ -1,14 +1,14 @@
 //===== Hercules Script ======================================
 //= Yuno Airport Staff
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf, Muad_Dib
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Yuno Airport Staff
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Official NPCs.
-//============================================================ 
+//============================================================
 
-y_airport,143,43,5	script	Airport Staff#y_air1a::y_airport1	90,{
+y_airport,143,43,5	script	Airport Staff#y_air1a::y_airport1	4_F_01,{
 	mes "[Airport Staff]";
 	mes "Welcome to Juno Airport where we offer domestic flights to Einbroch, Lighthalzen and Hugel,";
 	mes "and international flights to Izlude and Rachel.";
@@ -28,7 +28,7 @@ y_airport,143,43,5	script	Airport Staff#y_air1a::y_airport1	90,{
 				end;
 			}
 			if (Zeny >= 1200) {
-				set Zeny, Zeny - 1200;
+				Zeny -= 1200;
 				warp "y_airport",148,51;
 				end;
 			}
@@ -45,10 +45,10 @@ y_airport,143,43,5	script	Airport Staff#y_air1a::y_airport1	90,{
 	close;
 }
 
-y_airport,158,43,5	duplicate(y_airport1)	Airport Staff#y_air1b	90
-y_airport,126,43,5	duplicate(y_airport1)	Airport Staff#y_air1c	90
+y_airport,158,43,5	duplicate(y_airport1)	Airport Staff#y_air1b	4_F_01
+y_airport,126,43,5	duplicate(y_airport1)	Airport Staff#y_air1c	4_F_01
 
-y_airport,143,49,3	script	Arrival Staff#y_air2a::y_airport2	90,{
+y_airport,143,49,3	script	Arrival Staff#y_air2a::y_airport2	4_F_01,{
 	mes "[Airport Staff]";
 	mes "Welcome to Juno Airport. If you've just arrived from your";
 	mes "flight, let me guide you to the main terminal. Otherwise, please";
@@ -74,10 +74,10 @@ y_airport,143,49,3	script	Arrival Staff#y_air2a::y_airport2	90,{
 	close;
 }
 
-y_airport,126,51,3	duplicate(y_airport2)	Arrival Staff#y_air2b	90
-y_airport,158,50,3	duplicate(y_airport2)	Arrival Staff#y_air2c	90
+y_airport,126,51,3	duplicate(y_airport2)	Arrival Staff#y_air2b	4_F_01
+y_airport,158,50,3	duplicate(y_airport2)	Arrival Staff#y_air2c	4_F_01
 
-y_airport,145,63,5	script	Domestic Boarding	91,{
+y_airport,145,63,5	script	Domestic Boarding	4_F_02,{
 	mes "[Boarding Staff]";
 	mes "Would you like to board the";
 	mes "Airship that flies to Einbroch,";
@@ -97,7 +97,7 @@ y_airport,145,63,5	script	Domestic Boarding	91,{
 	close;
 }
 
-y_airport,140,63,5	script	International Boarding	91,{
+y_airport,140,63,5	script	International Boarding	4_F_02,{
 	mes "[Boarding Staff]";
 	mes "Would you like to board";
 	mes "the Airship which flies to";
@@ -118,7 +118,7 @@ y_airport,140,63,5	script	International Boarding	91,{
 	close;
 }
 
-yuno,14,262,5	script	Airship Staff#yuno01	91,{
+yuno,14,262,5	script	Airship Staff#yuno01	4_F_02,{
 	mes "[Airship Staff]";
 	mes "Welcome to Juno Airport.";
 	mes "Please use this door to";
@@ -138,7 +138,7 @@ yuno,14,262,5	script	Airship Staff#yuno01	91,{
 	close;
 }
 
-yuno,88,263,3	script	Airship Staff#yuno02	91,{
+yuno,88,263,3	script	Airship Staff#yuno02	4_F_02,{
 	mes "[Airship Staff]";
 	mes "Welcome to Juno Airport.";
 	mes "Please use this door to";
diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index 9a7d0fb51..81d41513e 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -1,30 +1,31 @@
 //===== Hercules Script ======================================
 // BattleGround System - Common NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= ????, L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
+//= [Official Conversion]
 //= Battleground NPCs:
 //= - Generals and Aides
 //= - Battleground Warper
 //= - Kafra and Repairman.
 //= - GM Management NPC (disabled by default)
 //= - Badge Exchanger (Tierra and Flavius)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Updated several NPCs to Official.
 //= 1.2 Updated Repairman NPC
 //= 1.3 Optimized "Erundek" NPC. [Euphy]
+//= 1.4 Added GM management function. [Euphy]
 //============================================================
 
 // Generals
 //============================================================
-bat_room,161,158,3	script	Gen. Guillaume's Aide#01	419,{ end; }
-bat_room,161,160,3	script	Gen. Guillaume's Aide#03	419,{ end; }
+bat_room,161,158,3	script	Gen. Guillaume's Aide#01	4_M_KY_HEAD,{ end; }
+bat_room,161,160,3	script	Gen. Guillaume's Aide#03	4_M_KY_HEAD,{ end; }
 
-bat_room,160,141,3	script	Prince Croix	416,{
+bat_room,160,141,3	script	Prince Croix	4_M_CRU_CRUA,{
 	cutin "bat_crua1",2;
 	mes "[Prince Croix]";
 	mes "Wise adventurer, why don't you lend us your power for victory?";
@@ -88,10 +89,10 @@ bat_room,160,141,3	script	Prince Croix	416,{
 	end;
 }
 
-bat_room,161,140,3	script	Prince Croix's Aide#01	415,{ end; }
-bat_room,161,142,3	script	Prince Croix's Aide#02	415,{ end; }
+bat_room,161,140,3	script	Prince Croix's Aide#01	4_M_CRU_HEAD,{ end; }
+bat_room,161,142,3	script	Prince Croix's Aide#02	4_M_CRU_HEAD,{ end; }
 
-bat_room,160,159,3	script	General Guillaume	420,{
+bat_room,160,159,3	script	General Guillaume	4_M_KY_KIYOM,{
 	cutin "bat_kiyom2",2;
 	mes "[General Guillaume]";
 	mes "Hot-blooded adventurer, we need your ability to win this battle.";
@@ -171,14 +172,14 @@ bat_room,160,159,3	script	General Guillaume	420,{
 
 // Flags
 //============================================================
-//bat_room,140,160,3	script	Guillaume Base#roomflag1	973,{ end; }
-//bat_room,167,160,3	script	Guillaume Base#roomflag2	973,{ end; }
-//bat_room,140,139,3	script	Croix Base#roomflag1	974,{ end; }
-//bat_room,167,139,3	script	Croix Base#roomflag2	974,{ end; }
+//bat_room,140,160,3	script	Guillaume Base#roomflag1	1_FLAG_LION,{ end; }
+//bat_room,167,160,3	script	Guillaume Base#roomflag2	1_FLAG_LION,{ end; }
+//bat_room,140,139,3	script	Croix Base#roomflag1	1_FLAG_EAGLE,{ end; }
+//bat_room,167,139,3	script	Croix Base#roomflag2	1_FLAG_EAGLE,{ end; }
 
 // BattleGround Warper
 //============================================================
-bat_room,148,150,5	script	Teleporter#Battlefield	124,{
+bat_room,148,150,5	script	Teleporter#Battlefield	4_F_TELEPORTER,{
 	mes "[Teleporter]";
 	mes "Do you wish to leave the battlefield? Use my services to return to town.";
 	next;
@@ -228,7 +229,7 @@ bat_room,148,150,5	script	Teleporter#Battlefield	124,{
 	end;
 }
 
--	script	Maroll Battle Recruiter::BatRecruit	728,{
+-	script	Maroll Battle Recruiter::BatRecruit	4_F_JOB_KNIGHT,{
 	mes "[Maroll Battle Recruiter]";
 	mes "Good day, adventurer.";
 	mes "I'm a knight from a far country called Maroll Kingdom.";
@@ -269,13 +270,13 @@ bat_room,148,150,5	script	Teleporter#Battlefield	124,{
 	end;
 }
 
-prontera,123,83,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit1	728
-moc_ruins,75,162,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit2	728
-aldebaran,146,109,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit3	728
-geffen,109,66,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit4	728
-payon,189,105,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit5	728
-lighthalzen,153,86,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit6	728
-rachel,149,138,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit7	728
+prontera,123,83,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit1	4_F_JOB_KNIGHT
+moc_ruins,75,162,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit2	4_F_JOB_KNIGHT
+aldebaran,146,109,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit3	4_F_JOB_KNIGHT
+geffen,109,66,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit4	4_F_JOB_KNIGHT
+payon,189,105,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit5	4_F_JOB_KNIGHT
+lighthalzen,153,86,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit6	4_F_JOB_KNIGHT
+rachel,149,138,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit7	4_F_JOB_KNIGHT
 
 // Additional warps
 // Empty
@@ -308,29 +309,29 @@ bat_room,253,211,0	warp	bat32	1,1,bat_room,154,149
 
 // Kafra
 //============================================================
-bat_room,148,147,4	script	Kafra Staff::kaf_bat	861,{
+bat_room,148,147,4	script	Kafra Staff::kaf_bat	4_F_KAFRA9,{
 	cutin "kafra_09",2;
 	callfunc "F_Kafra",0,2,1,150,0;
 }
 
 // Repairman
 //============================================================
-bat_room,138,144,4	script	Repairman#bg	86,{
+bat_room,138,144,4	script	Repairman#bg	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-/*
 // GM Management NPC
 //============================================================
-bat_room,1,151,3	script	Switch#batgnd	81,{
-	input .@input,0,2000;
-	if (.@input == 0) {
+bat_room,1,151,3	script	Switch#batgnd	4_DOG01,{
+	set .@i, callfunc("F_GM_NPC",1854,0);
+	if (.@i == -1) {
 		mes "The command has been cancelled.";
 		close;
-	}
-	else if (.@input == 1854) {
-		mes "May I help ypu?";
+	} else if (.@i == 0) {
+		end;
+	} else {
+		mes "May I help you?";
 		next;
 		switch(select("Close Battlefield:Open Battlefield:Reset a01:Reset b01:Reset a02:Reset b02")) {
 		case 1:
@@ -370,11 +371,10 @@ bat_room,1,151,3	script	Switch#batgnd	81,{
 		close;
 	}
 }
-*/
 
 // Badges Exchange
 //============================================================
-bat_room,160,150,3	script	Erundek	109,{
+bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -477,10 +477,10 @@ bat_room,160,150,3	script	Erundek	109,{
 			next;
 			switch(select("Garments / Shoes:Armor")) {
 			case 1:
-				setarray .@Items[0],2538,50,2539,50,2540,50,2435,50,2436,50,2437,50;
+				setarray .@items[0],2538,50,2539,50,2540,50,2435,50,2436,50,2437,50;
 				break;
 			case 2:
-				setarray .@Items[0],2376,80,2377,80,2378,80,2379,80,2380,80,2381,80,2382,80;
+				setarray .@items[0],2376,80,2377,80,2378,80,2379,80,2380,80,2381,80,2382,80;
 				break;
 			}
 			break;
@@ -489,7 +489,7 @@ bat_room,160,150,3	script	Erundek	109,{
 			mes "You chose ^3131FFAccessory^000000.";
 			mes "You can exchange the Medal of Honors with your Badges according to the job classes, as follows:";
 			next;
-			setarray .@Items[0],2733,500,2720,500,2721,500,2722,500,2723,500,2724,500,2725,500;
+			setarray .@items[0],2733,500,2720,500,2721,500,2722,500,2723,500,2724,500,2725,500;
 			set .@menu1$,"Gunslinger:Swordman/Taekwon Master:Thief:Acolyte:Magician:Archer:Merchant";
 			break;
 		case 4:
@@ -497,7 +497,7 @@ bat_room,160,150,3	script	Erundek	109,{
 			mes "You chose ^3131FFConsumable^000000.";
 			mes "The following consumable items are available for exchange with the battlefield badges:";
 			next;
-			setarray .@Items[0],12269,10,12270,10,12271,5,12272,10,12273,10;
+			setarray .@items[0],12269,10,12270,10,12271,5,12272,10,12273,10;
 			break;
 		}
 		break;
@@ -505,17 +505,17 @@ bat_room,160,150,3	script	Erundek	109,{
 		mes "[Erundek]";
 		mes "We have many items, so please take a look and purchase deliberately.";
 		close2;
-		ReadBook 11010,1;
+		readbook 11010,1;
 		end;
 	}
 	set .@menu$,"";
 	if (.@menu1$ != "") set .@menu$, .@menu1$;
-	else for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+2)
-		set .@menu$, .@menu$+getitemname(.@Items[.@i])+":";
+	else for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2)
+		set .@menu$, .@menu$+getitemname(.@items[.@i])+":";
 	set .@i, (select(.@menu$)-1)*2;
 	mes "[Erundek]";
-	mes "You chose ^3131FF"+getitemname(.@Items[.@i])+"^000000.";
-	switch(.@Items[.@i]) {
+	mes "You chose ^3131FF"+getitemname(.@items[.@i])+"^000000.";
+	switch(.@items[.@i]) {
 		case 2720: mes "This item is for Swordman and Taekwon Master Class only."; break;
 		case 2721: mes "This item is for Thief Class only."; break;
 		case 2722: mes "This item is for Acolyte Class only."; break;
@@ -525,7 +525,7 @@ bat_room,160,150,3	script	Erundek	109,{
 		case 2733: mes "This item is for Gunslinger only."; break;
 		default: break;
 	}
-	mes "You can exchange for this item with ^FF0000"+.@Items[.@i+1]+" "+getitemname(7828)+" or "+.@Items[.@i+1]+" "+getitemname(7829)+"^000000.";
+	mes "You can exchange for this item with ^FF0000"+.@items[.@i+1]+" "+getitemname(7828)+" or "+.@items[.@i+1]+" "+getitemname(7829)+"^000000.";
 	mes "Would you like to exchange?";
 	next;
 	switch(select("Do not exchange:Exchange")) {
@@ -536,7 +536,7 @@ bat_room,160,150,3	script	Erundek	109,{
 	case 2:
 		mes "[Erundek]";
 		mes "Which Badge do you want to exchange?";
-		mes "You need ^3131FF"+.@Items[.@i+1]+" Badges^000000 to exchange.";
+		mes "You need ^3131FF"+.@items[.@i+1]+" Badges^000000 to exchange.";
 		next;
 		if (.@item[0] < 12269 || .@item[0] > 12273 ) {
 			mes "[Erundek]";
@@ -550,10 +550,10 @@ bat_room,160,150,3	script	Erundek	109,{
 			break;
 		}
 		set .@cost, ((.@j==1)?7828:7829);
-		if (countitem(.@cost) >= .@Items[.@i+1]) {
+		if (countitem(.@cost) >= .@items[.@i+1]) {
 			mes "Thank you for exchanging.";
-			delitem .@cost, .@Items[.@i+1];
-			getitem .@Items[.@i],1;
+			delitem .@cost, .@items[.@i+1];
+			getitem .@items[.@i],1;
 		}
 		else mes "You do not have enough "+getitemname(.@cost)+"s.";
 		break;
diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt
index 42c230ff3..18f153d87 100644
--- a/npc/battleground/flavius/flavius01.txt
+++ b/npc/battleground/flavius/flavius01.txt
@@ -1,24 +1,26 @@
 //===== Hercules Script ======================================
 // BattleGround System - Flavius
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= Flavius Battleground.
 //= - Winning Team: 9 badges
 //= - Losing Team: 3 badge
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Fixed pink crystal spawning as blue. [L0ne_W0lf]
 //= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //= 1.3 Removed MaxLvl check in waitingrooms. Replaced setwall with setcell.
+//= 1.4 Label standardization. [Euphy]
+//= 1.5 Added GM management function. [Euphy]
 //============================================================
 
 // Waiting Room NPCs
 //============================================================
-bat_room,86,227,4	script	Lieutenant Ator	418,{
+bat_room,86,227,4	script	Lieutenant Ator	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
@@ -28,7 +30,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,85,204,0	script	Lieutenant Thelokus	414,{
+bat_room,85,204,0	script	Lieutenant Thelokus	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
@@ -41,7 +43,7 @@ OnEnterBG:
 bat_room,85,220,0	warp	back_bgroomb01a	1,1,bat_room,154,150
 bat_room,85,211,0	warp	back_bgroomb01b	1,1,bat_room,154,150
 
-bat_room,2,151,3	script	#bat_b01_timer	844,{
+bat_room,2,151,3	script	#bat_b01_timer	CLEAR_NPC,{
 	end;
 
 OnInit:
@@ -69,7 +71,7 @@ OnTimer1000:
 
 // Flavius Battleground Engine
 //============================================================
-bat_b01,15,15,3	script	start#bat_b01	844,{
+bat_b01,15,15,3	script	start#bat_b01	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_b01","bat_room",154,150;
 	end;
@@ -93,16 +95,16 @@ OnReadyCheck:
 
 	donpcevent "Lieutenant Ator::OnEnterBG";
 	donpcevent "Lieutenant Thelokus::OnEnterBG";
-	donpcevent "OBJ#bat_b01_a::Onkill";
+	donpcevent "OBJ#bat_b01_a::OnKill";
 	donpcevent "OBJ#bat_b01_a::OnEnable";
-	donpcevent "OBJ#bat_b01_b::Onkill";
+	donpcevent "OBJ#bat_b01_b::OnKill";
 	donpcevent "OBJ#bat_b01_b::OnEnable";
-	donpcevent "guardian#bat_b01_a::Onkill";
-	donpcevent "guardian#bat_b01_b::Onkill";
+	donpcevent "guardian#bat_b01_a::OnKill";
+	donpcevent "guardian#bat_b01_b::OnKill";
 	donpcevent "guardian#bat_b01_a::OnEnable";
 	donpcevent "guardian#bat_b01_b::OnEnable";
-	donpcevent "cell#bat_b01_a::Onred";
-	donpcevent "cell#bat_b01_b::Onred";
+	donpcevent "cell#bat_b01_a::OnRed";
+	donpcevent "cell#bat_b01_b::OnRed";
 	donpcevent "time#bat_b01::OnEnable";
 	disablenpc "Guillaume Vintenar#b01_a";
 	disablenpc "Croix Vintenar#b01_b";
@@ -115,16 +117,16 @@ OnReadyCheck:
 	end;
 
 OnReset:
-	donpcevent "OBJ#bat_b01_a::Onkill";
+	donpcevent "OBJ#bat_b01_a::OnKill";
 	donpcevent "OBJ#bat_b01_a::OnEnable";
-	donpcevent "OBJ#bat_b01_b::Onkill";
+	donpcevent "OBJ#bat_b01_b::OnKill";
 	donpcevent "OBJ#bat_b01_b::OnEnable";
-	donpcevent "guardian#bat_b01_a::Onkill";
-	donpcevent "guardian#bat_b01_b::Onkill";
+	donpcevent "guardian#bat_b01_a::OnKill";
+	donpcevent "guardian#bat_b01_b::OnKill";
 	donpcevent "guardian#bat_b01_a::OnEnable";
 	donpcevent "guardian#bat_b01_b::OnEnable";
-	donpcevent "cell#bat_b01_a::Onred";
-	donpcevent "cell#bat_b01_b::Onred";
+	donpcevent "cell#bat_b01_a::OnRed";
+	donpcevent "cell#bat_b01_b::OnRed";
 	donpcevent "time#bat_b01::OnEnable";
 	disablenpc "Guillaume Vintenar#b01_a";
 	disablenpc "Croix Vintenar#b01_b";
@@ -145,12 +147,12 @@ OnTimer10000:
 	end;
 }
 
-bat_b01,1,1,3	script	OBJ#bat_b01_a	844,{
+bat_b01,1,1,3	script	OBJ#bat_b01_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b01","OBJ#bat_b01_a::OnMyMobDead";
 	end;
 
@@ -162,12 +164,12 @@ OnMyMobDead:
 			set $@Croix_ScoreBG1,$@Croix_ScoreBG1+1;
 			enablenpc "Guillaume Vintenar#b01_a";
 			enablenpc "Croix Vintenar#b01_b";
-			donpcevent "time#bat_b01::Onstop";
+			donpcevent "time#bat_b01::OnStop";
 		}
 		else {
 			set $@Croix_ScoreBG1,1;
 			donpcevent "time#bat_b01::OnEnable";
-			donpcevent "start#bat_b01::onReset";
+			donpcevent "start#bat_b01::OnReset";
 		}
 		donpcevent "#bat_b01_timer::OnStop";
 		bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
@@ -178,12 +180,12 @@ OnMyMobDead:
 	end;
 }
 
-bat_b01,1,2,3	script	OBJ#bat_b01_b	844,{
+bat_b01,1,2,3	script	OBJ#bat_b01_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b01","OBJ#bat_b01_b::OnMyMobDead";
 	end;
 
@@ -195,12 +197,12 @@ OnMyMobDead:
 			set $@Guill_ScoreBG1,$@Guill_ScoreBG1+1;
 			enablenpc "Guillaume Vintenar#b01_a";
 			enablenpc "Croix Vintenar#b01_b";
-			donpcevent "time#bat_b01::Onstop";
+			donpcevent "time#bat_b01::OnStop";
 		}
 		else {
 			set $@Guill_ScoreBG1,1;
 			donpcevent "time#bat_b01::OnEnable";
-			donpcevent "start#bat_b01::onReset";
+			donpcevent "start#bat_b01::OnReset";
 		}
 		donpcevent "#bat_b01_timer::OnStop";
 		bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
@@ -211,79 +213,79 @@ OnMyMobDead:
 	end;
 }
 
-bat_b01,1,3,3	script	guardian#bat_b01_a	844,{
+bat_b01,1,3,3	script	guardian#bat_b01_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG1_id1,"bat_b01",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
 	bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b01","guardian#bat_b01_a::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("bat_b01","guardian#bat_b01_a::OnMyMobDead") < 1) {
-		donpcevent "cell#bat_b01_a::Ongreen";
+		donpcevent "cell#bat_b01_a::OnGreen";
 		mapannounce "bat_b01", "The Guardian protecting Guillaume's Crystal has been slain.",bc_map,"0xFFCE00";
 	}
 	end;
 }
 
-bat_b01,1,3,3	script	guardian#bat_b01_b	844,{
+bat_b01,1,3,3	script	guardian#bat_b01_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG1_id2,"bat_b01",307,160,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
 	bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b01","guardian#bat_b01_b::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("bat_b01","guardian#bat_b01_b::OnMyMobDead") < 1) {
-		donpcevent "cell#bat_b01_b::Ongreen";
+		donpcevent "cell#bat_b01_b::OnGreen";
 		mapannounce "bat_b01", "The Guardian protecting Croix's Crystal has been slain.",bc_map,"0xFFCE00";
 	}
 	end;
 }
 
-bat_b01,1,4,3	script	cell#bat_b01_a	844,{
-Onred:
+bat_b01,1,4,3	script	cell#bat_b01_a	CLEAR_NPC,{
+OnRed:
 	setcell "bat_b01",62,149,60,151,cell_basilica,1;
 	setcell "bat_b01",62,149,60,151,cell_walkable,0;
 	end;
 
-Ongreen:
+OnGreen:
 	setcell "bat_b01",62,149,60,151,cell_basilica,0;
 	setcell "bat_b01",62,149,60,151,cell_walkable,1;
 	end;
 }
 
-bat_b01,1,5,3	script	cell#bat_b01_b	844,{
-Onred:
+bat_b01,1,5,3	script	cell#bat_b01_b	CLEAR_NPC,{
+OnRed:
 	setcell "bat_b01",327,151,329,149,cell_basilica,1;
 	setcell "bat_b01",327,151,329,149,cell_walkable,0;
 	end;
 
-Ongreen:
+OnGreen:
 	setcell "bat_b01",327,151,329,149,cell_basilica,0;
 	setcell "bat_b01",327,151,329,149,cell_walkable,1;
 	end;
 }
 
-bat_b01,1,6,1	script	time#bat_b01	844,{
+bat_b01,1,6,1	script	time#bat_b01	CLEAR_NPC,{
 OnEnable:
 	donpcevent "Battle Therapist#b01_a::OnEnable";
 	donpcevent "Battle Therapist#b01_b::OnEnable";
 	end;
 
-Onstop:
+OnStop:
 	donpcevent "Battle Therapist#b01_a::OnStop";
 	donpcevent "Battle Therapist#b01_b::OnStop";
 	end;
 }
 
-bat_b01,10,294,3	script	Battle Therapist#b01_a	95,{
+bat_b01,10,294,3	script	Battle Therapist#b01_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -302,7 +304,7 @@ OnTimer26000:
 
 OnTimer26500:
 	stopnpctimer;
-	donpcevent "Battle Therapist#b01_a::onEnable";
+	donpcevent "Battle Therapist#b01_a::OnEnable";
 	end;
 
 OnEnable:
@@ -310,14 +312,14 @@ OnEnable:
 	enablenpc "Battle Therapist#b01_a";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_b01_rp1_a_warp";
 	disablenpc "Battle Therapist#b01_a";
 	stopnpctimer;
 	end;
 }
 
-bat_b01,10,290,0	script	bat_b01_rp1_a_warp	45,10,10,{
+bat_b01,10,290,0	script	bat_b01_rp1_a_warp	WARPNPC,10,10,{
 OnInit:
 	disablenpc "bat_b01_rp1_a_warp";
 	end;
@@ -328,7 +330,7 @@ OnTouch:
 	end;
 }
 
-bat_b01,389,14,3	script	Battle Therapist#b01_b	95,{
+bat_b01,389,14,3	script	Battle Therapist#b01_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -355,14 +357,14 @@ OnEnable:
 	enablenpc "Battle Therapist#b01_b";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_b01_rp1_b_warp";
 	disablenpc "Battle Therapist#b01_b";
 	stopnpctimer;
 	end;
 }
 
-bat_b01,389,10,0	script	bat_b01_rp1_b_warp	45,9,9,{
+bat_b01,389,10,0	script	bat_b01_rp1_b_warp	WARPNPC,9,9,{
 OnInit:
 	disablenpc "bat_b01_rp1_a_warp";
 	end;
@@ -387,7 +389,7 @@ OnTouch:
 	end;
 }
 
-bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	934,{
+bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 1) {
 			set .@your_medal,countitem(7829);
@@ -439,7 +441,7 @@ OnInit:
 	end;
 }
 
-bat_b01,389,14,3	script	Croix Vintenar#b01_b	934,{
+bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 2) {
 			set .@your_medal,countitem(7829);
@@ -491,7 +493,7 @@ OnInit:
 	end;
 }
 
-bat_b01,1,5,3	script	countdown#bat_b01	844,{
+bat_b01,1,5,3	script	countdown#bat_b01	CLEAR_NPC,{
 OnInit:
 	stopnpctimer;
 	end;
@@ -501,7 +503,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -534,7 +536,7 @@ OnTimer1825000:
 	end;
 
 OnTimer1830000:
-	donpcevent "time#bat_b01::Onstop";
+	donpcevent "time#bat_b01::OnStop";
 	bg_warp $@FlaviusBG1_id1,"bat_b01",10,290;
 	bg_warp $@FlaviusBG1_id2,"bat_b01",390,10;
 	enablenpc "Vintenar#bat_b01_aover";
@@ -543,35 +545,35 @@ OnTimer1830000:
 
 OnTimer1900000:
 	mapwarp "bat_b01","bat_room",154,150;
-	donpcevent "countdown#bat_b01::Onstop";
+	donpcevent "countdown#bat_b01::OnStop";
 	end;
 }
 
-bat_b01,81,83,3	script	Guillaume Camp#flag21	973,{ end; }
-bat_b01,94,83,3	script	Guillaume Camp#flag22	973,{ end; }
-bat_b01,81,66,3	script	Guillaume Camp#flag23	973,{ end; }
-bat_b01,94,66,3	script	Guillaume Camp#flag24	973,{ end; }
-bat_b01,139,142,3	script	Guillaume Camp#flag25	973,{ end; }
-bat_b01,139,158,3	script	Guillaume Camp#flag26	973,{ end; }
-bat_b01,110,161,3	script	Guillaume Camp#flag27	973,{ end; }
-bat_b01,110,137,3	script	Guillaume Camp#flag28	973,{ end; }
-bat_b01,63,135,3	script	Guillaume Camp#flag29	973,{ end; }
-bat_b01,63,165,3	script	Guillaume Camp#flag30	973,{ end; }
-bat_b01,10,296,3	script	Guillaume Camp#flag31	973,{ end; }
-
-bat_b01,306,233,3	script	Croix Camp#flag21	974,{ end; }
-bat_b01,317,233,3	script	Croix Camp#flag22	974,{ end; }
-bat_b01,306,216,3	script	Croix Camp#flag23	974,{ end; }
-bat_b01,317,216,3	script	Croix Camp#flag24	974,{ end; }
-bat_b01,257,158,3	script	Croix Camp#flag25	974,{ end; }
-bat_b01,257,141,3	script	Croix Camp#flag26	974,{ end; }
-bat_b01,297,164,3	script	Croix Camp#flag27	974,{ end; }
-bat_b01,297,136,3	script	Croix Camp#flag28	974,{ end; }
-bat_b01,336,161,3	script	Croix Camp#flag29	974,{ end; }
-bat_b01,336,139,3	script	Croix Camp#flag30	974,{ end; }
-bat_b01,389,16,3	script	Croix Camp#flag31	974,{ end; }
-
-bat_b01,10,294,3	script	Vintenar#bat_b01_aover	419,{
+bat_b01,81,83,3	script	Guillaume Camp#flag21	1_FLAG_LION,{ end; }
+bat_b01,94,83,3	script	Guillaume Camp#flag22	1_FLAG_LION,{ end; }
+bat_b01,81,66,3	script	Guillaume Camp#flag23	1_FLAG_LION,{ end; }
+bat_b01,94,66,3	script	Guillaume Camp#flag24	1_FLAG_LION,{ end; }
+bat_b01,139,142,3	script	Guillaume Camp#flag25	1_FLAG_LION,{ end; }
+bat_b01,139,158,3	script	Guillaume Camp#flag26	1_FLAG_LION,{ end; }
+bat_b01,110,161,3	script	Guillaume Camp#flag27	1_FLAG_LION,{ end; }
+bat_b01,110,137,3	script	Guillaume Camp#flag28	1_FLAG_LION,{ end; }
+bat_b01,63,135,3	script	Guillaume Camp#flag29	1_FLAG_LION,{ end; }
+bat_b01,63,165,3	script	Guillaume Camp#flag30	1_FLAG_LION,{ end; }
+bat_b01,10,296,3	script	Guillaume Camp#flag31	1_FLAG_LION,{ end; }
+
+bat_b01,306,233,3	script	Croix Camp#flag21	1_FLAG_EAGLE,{ end; }
+bat_b01,317,233,3	script	Croix Camp#flag22	1_FLAG_EAGLE,{ end; }
+bat_b01,306,216,3	script	Croix Camp#flag23	1_FLAG_EAGLE,{ end; }
+bat_b01,317,216,3	script	Croix Camp#flag24	1_FLAG_EAGLE,{ end; }
+bat_b01,257,158,3	script	Croix Camp#flag25	1_FLAG_EAGLE,{ end; }
+bat_b01,257,141,3	script	Croix Camp#flag26	1_FLAG_EAGLE,{ end; }
+bat_b01,297,164,3	script	Croix Camp#flag27	1_FLAG_EAGLE,{ end; }
+bat_b01,297,136,3	script	Croix Camp#flag28	1_FLAG_EAGLE,{ end; }
+bat_b01,336,161,3	script	Croix Camp#flag29	1_FLAG_EAGLE,{ end; }
+bat_b01,336,139,3	script	Croix Camp#flag30	1_FLAG_EAGLE,{ end; }
+bat_b01,389,16,3	script	Croix Camp#flag31	1_FLAG_EAGLE,{ end; }
+
+bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
@@ -649,7 +651,7 @@ OnInit:
 	end;
 }
 
-bat_b01,389,14,3	script	Vintenar#bat_b01_bover	415,{
+bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
@@ -727,14 +729,14 @@ OnInit:
 	end;
 }
 
-/*
-bat_b01,1,10,3	script	Release all#b01	81,{
-	input .@input,0,2000;
-	if (.@input == 0) {
+bat_b01,1,10,3	script	Release all#b01	4_DOG01,{
+	set .@i, callfunc("F_GM_NPC",1854,0);
+	if (.@i == -1) {
 		mes "Cancelled.";
 		close;
-	}
-	else if (.@input == 1854) {
+	} else if (.@i == 0) {
+		end;
+	} else {
 		mes "May I help you?";
 		next;
 		switch(select("Release all.:Cancel.")) {
@@ -749,4 +751,3 @@ bat_b01,1,10,3	script	Release all#b01	81,{
 		}
 	}
 }
-*/
diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index 67519bdc6..0a88b9919 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -1,25 +1,27 @@
 //===== Hercules Script ======================================
 // BattleGround System - Flavius Second
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.6
+//===== Description: =========================================
+//= [Official Conversion]
 //= Flavius Battleground.
 //= - Winning Team: 9 badges
 //= - Losing Team: 3 badge
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Fixed NPCs being called for waiting rooms. (bugreport:4395)
 //= 1.2 Fixed pink crystal spawning as blue. [L0ne_W0lf]
 //= 1.3 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //= 1.4 Removed MaxLvl check in waitingrooms. Replaced setwall with setcell.
+//= 1.5 Label standardization. [Euphy]
+//= 1.6 Added GM management function. [Euphy]
 //============================================================
 
 // Waiting Room NPCs
 //============================================================
-bat_room,142,227,4	script	Lieutenant Huvas	418,{
+bat_room,142,227,4	script	Lieutenant Huvas	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
@@ -29,7 +31,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,142,204,0	script	Lieutenant Yukon	414,{
+bat_room,142,204,0	script	Lieutenant Yukon	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
@@ -42,7 +44,7 @@ OnEnterBG:
 bat_room,141,220,0	warp	back_bgroomb02a	1,1,bat_room,154,150
 bat_room,141,211,0	warp	back_bgroomb02b	1,1,bat_room,154,150
 
-bat_room,2,151,3	script	#bat_b02_timer	844,{
+bat_room,2,151,3	script	#bat_b02_timer	CLEAR_NPC,{
 	end;
 
 OnInit:
@@ -70,7 +72,7 @@ OnTimer1000:
 
 // Flavius Battleground Engine
 //============================================================
-bat_b02,15,15,3	script	start#bat_b02	844,{
+bat_b02,15,15,3	script	start#bat_b02	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_b02","bat_room",154,150;
 	end;
@@ -94,16 +96,16 @@ OnReadyCheck:
 	bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
 	donpcevent "Lieutenant Huvas::OnEnterBG";
 	donpcevent "Lieutenant Yukon::OnEnterBG";
-	donpcevent "OBJ#bat_b02_a::Onkill";
+	donpcevent "OBJ#bat_b02_a::OnKill";
 	donpcevent "OBJ#bat_b02_a::OnEnable";
-	donpcevent "OBJ#bat_b02_b::Onkill";
+	donpcevent "OBJ#bat_b02_b::OnKill";
 	donpcevent "OBJ#bat_b02_b::OnEnable";
-	donpcevent "guardian#bat_b02_a::Onkill";
-	donpcevent "guardian#bat_b02_b::Onkill";
+	donpcevent "guardian#bat_b02_a::OnKill";
+	donpcevent "guardian#bat_b02_b::OnKill";
 	donpcevent "guardian#bat_b02_a::OnEnable";
 	donpcevent "guardian#bat_b02_b::OnEnable";
-	donpcevent "cell#bat_b02_a::Onred";
-	donpcevent "cell#bat_b02_b::Onred";
+	donpcevent "cell#bat_b02_a::OnRed";
+	donpcevent "cell#bat_b02_b::OnRed";
 	donpcevent "time#bat_b02::OnEnable";
 	disablenpc "Guillaume Vintenar#b02_a";
 	disablenpc "Croix Vintenar#b02_b";
@@ -116,16 +118,16 @@ OnReadyCheck:
 	end;
 
 OnReset:
-	donpcevent "OBJ#bat_b02_a::Onkill";
+	donpcevent "OBJ#bat_b02_a::OnKill";
 	donpcevent "OBJ#bat_b02_a::OnEnable";
-	donpcevent "OBJ#bat_b02_b::Onkill";
+	donpcevent "OBJ#bat_b02_b::OnKill";
 	donpcevent "OBJ#bat_b02_b::OnEnable";
-	donpcevent "guardian#bat_b02_a::Onkill";
-	donpcevent "guardian#bat_b02_b::Onkill";
+	donpcevent "guardian#bat_b02_a::OnKill";
+	donpcevent "guardian#bat_b02_b::OnKill";
 	donpcevent "guardian#bat_b02_a::OnEnable";
 	donpcevent "guardian#bat_b02_b::OnEnable";
-	donpcevent "cell#bat_b02_a::Onred";
-	donpcevent "cell#bat_b02_b::Onred";
+	donpcevent "cell#bat_b02_a::OnRed";
+	donpcevent "cell#bat_b02_b::OnRed";
 	donpcevent "time#bat_b02::OnEnable";
 	disablenpc "Guillaume Vintenar#b02_a";
 	disablenpc "Croix Vintenar#b02_b";
@@ -146,12 +148,12 @@ OnTimer10000:
 	end;
 }
 
-bat_b02,1,1,3	script	OBJ#bat_b02_a	844,{
+bat_b02,1,1,3	script	OBJ#bat_b02_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG2_id1,"bat_b02",61,150,"Pink Crystal",1915,"OBJ#bat_b02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b02","OBJ#bat_b02_a::OnMyMobDead";
 	end;
 
@@ -163,12 +165,12 @@ OnMyMobDead:
 			set $@Croix_ScoreBG2,$@Croix_ScoreBG2+1;
 			enablenpc "Guillaume Vintenar#b02_a";
 			enablenpc "Croix Vintenar#b02_b";
-			donpcevent "time#bat_b02::Onstop";
+			donpcevent "time#bat_b02::OnStop";
 		}
 		else {
 			set $@Croix_ScoreBG2,1;
 			donpcevent "time#bat_b02::OnEnable";
-			donpcevent "start#bat_b02::onReset";
+			donpcevent "start#bat_b02::OnReset";
 		}
 		donpcevent "#bat_b02_timer::OnStop";
 		bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
@@ -179,12 +181,12 @@ OnMyMobDead:
 	end;
 }
 
-bat_b02,1,2,3	script	OBJ#bat_b02_b	844,{
+bat_b02,1,2,3	script	OBJ#bat_b02_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG2_id2,"bat_b02",328,150,"Blue Crystal",1914,"OBJ#bat_b02_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b02","OBJ#bat_b02_b::OnMyMobDead";
 	end;
 
@@ -196,12 +198,12 @@ OnMyMobDead:
 			set $@Guill_ScoreBG2,$@Guill_ScoreBG2+1;
 			enablenpc "Guillaume Vintenar#b02_a";
 			enablenpc "Croix Vintenar#b02_b";
-			donpcevent "time#bat_b02::Onstop";
+			donpcevent "time#bat_b02::OnStop";
 		}
 		else {
 			set $@Guill_ScoreBG2,1;
 			donpcevent "time#bat_b02::OnEnable";
-			donpcevent "start#bat_b02::onReset";
+			donpcevent "start#bat_b02::OnReset";
 		}
 		donpcevent "#bat_b02_timer::OnStop";
 		bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
@@ -212,79 +214,79 @@ OnMyMobDead:
 	end;
 }
 
-bat_b02,1,3,3	script	guardian#bat_b02_a	844,{
+bat_b02,1,3,3	script	guardian#bat_b02_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG2_id1,"bat_b02",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b02_a::OnMyMobDead";
 	bg_monster $@FlaviusBG2_id1,"bat_b02",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b02","guardian#bat_b02_a::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("bat_b02","guardian#bat_b02_a::OnMyMobDead") < 1) {
-		donpcevent "cell#bat_b02_a::Ongreen";
+		donpcevent "cell#bat_b02_a::OnGreen";
 		mapannounce "bat_b02", "The Guardian protecting Guillaume's Crystal has been slain.",bc_map,"0xFFCE00";
 	}
 	end;
 }
 
-bat_b02,1,3,3	script	guardian#bat_b02_b	844,{
+bat_b02,1,3,3	script	guardian#bat_b02_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG2_id2,"bat_b02",307,160,"Croix Camp Guardian",1949,"guardian#bat_b02_b::OnMyMobDead";
 	bg_monster $@FlaviusBG2_id2,"bat_b02",307,138,"Croix Camp Guardian",1949,"guardian#bat_b02_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b02","guardian#bat_b02_b::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("bat_b02","guardian#bat_b02_b::OnMyMobDead") < 1) {
-		donpcevent "cell#bat_b02_b::Ongreen";
+		donpcevent "cell#bat_b02_b::OnGreen";
 		mapannounce "bat_b02", "The Guardian protecting Croix's Crystal has been slain.",bc_map,"0xFFCE00";
 	}
 	end;
 }
 
-bat_b02,1,4,3	script	cell#bat_b02_a	844,{
-Onred:
+bat_b02,1,4,3	script	cell#bat_b02_a	CLEAR_NPC,{
+OnRed:
 	setcell "bat_b02",62,149,60,151,cell_basilica,1;
 	setcell "bat_b02",62,149,60,151,cell_walkable,0;
 	end;
 
-Ongreen:
+OnGreen:
 	setcell "bat_b02",62,149,60,151,cell_basilica,0;
 	setcell "bat_b02",62,149,60,151,cell_walkable,1;
 	end;
 }
 
-bat_b02,1,5,3	script	cell#bat_b02_b	844,{
-Onred:
+bat_b02,1,5,3	script	cell#bat_b02_b	CLEAR_NPC,{
+OnRed:
 	setcell "bat_b02",327,151,329,149,cell_basilica,1;
 	setcell "bat_b02",327,151,329,149,cell_walkable,0;
 	end;
 
-Ongreen:
+OnGreen:
 	setcell "bat_b02",327,151,329,149,cell_basilica,0;
 	setcell "bat_b02",327,151,329,149,cell_walkable,1;
 	end;
 }
 
-bat_b02,1,6,1	script	time#bat_b02	844,{
+bat_b02,1,6,1	script	time#bat_b02	CLEAR_NPC,{
 OnEnable:
 	donpcevent "Battle Therapist#b02_a::OnEnable";
 	donpcevent "Battle Therapist#b02_b::OnEnable";
 	end;
 
-Onstop:
+OnStop:
 	donpcevent "Battle Therapist#b02_a::OnStop";
 	donpcevent "Battle Therapist#b02_b::OnStop";
 	end;
 }
 
-bat_b02,10,294,3	script	Battle Therapist#b02_a	95,{
+bat_b02,10,294,3	script	Battle Therapist#b02_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -303,7 +305,7 @@ OnTimer26000:
 
 OnTimer26500:
 	stopnpctimer;
-	donpcevent "Battle Therapist#b02_a::onEnable";
+	donpcevent "Battle Therapist#b02_a::OnEnable";
 	end;
 
 OnEnable:
@@ -311,14 +313,14 @@ OnEnable:
 	enablenpc "Battle Therapist#b02_a";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_b02_rp1_a_warp";
 	disablenpc "Battle Therapist#b02_a";
 	stopnpctimer;
 	end;
 }
 
-bat_b02,10,290,0	script	bat_b02_rp1_a_warp	45,10,10,{
+bat_b02,10,290,0	script	bat_b02_rp1_a_warp	WARPNPC,10,10,{
 OnInit:
 	disablenpc "bat_b02_rp1_a_warp";
 	end;
@@ -329,7 +331,7 @@ OnTouch:
 	end;
 }
 
-bat_b02,389,14,3	script	Battle Therapist#b02_b	95,{
+bat_b02,389,14,3	script	Battle Therapist#b02_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -356,14 +358,14 @@ OnEnable:
 	enablenpc "Battle Therapist#b02_b";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_b02_rp1_b_warp";
 	disablenpc "Battle Therapist#b02_b";
 	stopnpctimer;
 	end;
 }
 
-bat_b02,389,10,0	script	bat_b02_rp1_b_warp	45,9,9,{
+bat_b02,389,10,0	script	bat_b02_rp1_b_warp	WARPNPC,9,9,{
 OnInit:
 	disablenpc "bat_b02_rp1_a_warp";
 	end;
@@ -388,7 +390,7 @@ OnTouch:
 	end;
 }
 
-bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	934,{
+bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	4_M_RASWORD,{
 	if ($@FlaviusBG2_id1 == getcharid(4)) {
 		if ($@FlaviusBG2_Victory == 1) {
 			set .@your_medal,countitem(7829);
@@ -440,7 +442,7 @@ OnInit:
 	end;
 }
 
-bat_b02,389,14,3	script	Croix Vintenar#b02_b	934,{
+bat_b02,389,14,3	script	Croix Vintenar#b02_b	4_M_RASWORD,{
 	if ($@FlaviusBG2_id2 == getcharid(4)) {
 		if ($@FlaviusBG2_Victory == 2) {
 			set .@your_medal,countitem(7829);
@@ -492,7 +494,7 @@ OnInit:
 	end;
 }
 
-bat_b02,1,5,3	script	countdown#bat_b02	844,{
+bat_b02,1,5,3	script	countdown#bat_b02	CLEAR_NPC,{
 OnInit:
 	stopnpctimer;
 	end;
@@ -502,7 +504,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -535,7 +537,7 @@ OnTimer1825000:
 	end;
 
 OnTimer1830000:
-	donpcevent "time#bat_b02::Onstop";
+	donpcevent "time#bat_b02::OnStop";
 	bg_warp $@FlaviusBG2_id1,"bat_b02",10,290;
 	bg_warp $@FlaviusBG2_id2,"bat_b02",390,10;
 	enablenpc "Vintenar#bat_b02_aover";
@@ -544,35 +546,35 @@ OnTimer1830000:
 
 OnTimer1900000:
 	mapwarp "bat_b02","bat_room",154,150;
-	donpcevent "countdown#bat_b02::Onstop";
+	donpcevent "countdown#bat_b02::OnStop";
 	end;
 }
 
-bat_b02,81,83,3	script	Guillaume Camp#flag32	973,{ end; }
-bat_b02,94,83,3	script	Guillaume Camp#flag33	973,{ end; }
-bat_b02,81,66,3	script	Guillaume Camp#flag34	973,{ end; }
-bat_b02,94,66,3	script	Guillaume Camp#flag35	973,{ end; }
-bat_b02,139,142,3	script	Guillaume Camp#flag36	973,{ end; }
-bat_b02,139,158,3	script	Guillaume Camp#flag37	973,{ end; }
-bat_b02,110,161,3	script	Guillaume Camp#flag38	973,{ end; }
-bat_b02,110,137,3	script	Guillaume Camp#flag39	973,{ end; }
-bat_b02,63,135,3	script	Guillaume Camp#flag40	973,{ end; }
-bat_b02,63,165,3	script	Guillaume Camp#flag41	973,{ end; }
-bat_b02,10,296,3	script	Guillaume Camp#flag42	973,{ end; }
-
-bat_b02,306,233,3	script	Croix Camp#flag32	974,{ end; }
-bat_b02,317,233,3	script	Croix Camp#flag33	974,{ end; }
-bat_b02,306,216,3	script	Croix Camp#flag34	974,{ end; }
-bat_b02,317,216,3	script	Croix Camp#flag35	974,{ end; }
-bat_b02,257,158,3	script	Croix Camp#flag36	974,{ end; }
-bat_b02,257,141,3	script	Croix Camp#flag37	974,{ end; }
-bat_b02,297,164,3	script	Croix Camp#flag38	974,{ end; }
-bat_b02,297,136,3	script	Croix Camp#flag39	974,{ end; }
-bat_b02,336,161,3	script	Croix Camp#flag40	974,{ end; }
-bat_b02,336,139,3	script	Croix Camp#flag41	974,{ end; }
-bat_b02,389,16,3	script	Croix Camp#flag42	974,{ end; }
-
-bat_b02,10,294,3	script	Vintenar#bat_b02_aover	419,{
+bat_b02,81,83,3	script	Guillaume Camp#flag32	1_FLAG_LION,{ end; }
+bat_b02,94,83,3	script	Guillaume Camp#flag33	1_FLAG_LION,{ end; }
+bat_b02,81,66,3	script	Guillaume Camp#flag34	1_FLAG_LION,{ end; }
+bat_b02,94,66,3	script	Guillaume Camp#flag35	1_FLAG_LION,{ end; }
+bat_b02,139,142,3	script	Guillaume Camp#flag36	1_FLAG_LION,{ end; }
+bat_b02,139,158,3	script	Guillaume Camp#flag37	1_FLAG_LION,{ end; }
+bat_b02,110,161,3	script	Guillaume Camp#flag38	1_FLAG_LION,{ end; }
+bat_b02,110,137,3	script	Guillaume Camp#flag39	1_FLAG_LION,{ end; }
+bat_b02,63,135,3	script	Guillaume Camp#flag40	1_FLAG_LION,{ end; }
+bat_b02,63,165,3	script	Guillaume Camp#flag41	1_FLAG_LION,{ end; }
+bat_b02,10,296,3	script	Guillaume Camp#flag42	1_FLAG_LION,{ end; }
+
+bat_b02,306,233,3	script	Croix Camp#flag32	1_FLAG_EAGLE,{ end; }
+bat_b02,317,233,3	script	Croix Camp#flag33	1_FLAG_EAGLE,{ end; }
+bat_b02,306,216,3	script	Croix Camp#flag34	1_FLAG_EAGLE,{ end; }
+bat_b02,317,216,3	script	Croix Camp#flag35	1_FLAG_EAGLE,{ end; }
+bat_b02,257,158,3	script	Croix Camp#flag36	1_FLAG_EAGLE,{ end; }
+bat_b02,257,141,3	script	Croix Camp#flag37	1_FLAG_EAGLE,{ end; }
+bat_b02,297,164,3	script	Croix Camp#flag38	1_FLAG_EAGLE,{ end; }
+bat_b02,297,136,3	script	Croix Camp#flag39	1_FLAG_EAGLE,{ end; }
+bat_b02,336,161,3	script	Croix Camp#flag40	1_FLAG_EAGLE,{ end; }
+bat_b02,336,139,3	script	Croix Camp#flag41	1_FLAG_EAGLE,{ end; }
+bat_b02,389,16,3	script	Croix Camp#flag42	1_FLAG_EAGLE,{ end; }
+
+bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
 	if ($@FlaviusBG2_id1 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
@@ -650,7 +652,7 @@ OnInit:
 	end;
 }
 
-bat_b02,389,14,3	script	Vintenar#bat_b02_bover	415,{
+bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
 	if ($@FlaviusBG2_id2 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
@@ -728,14 +730,14 @@ OnInit:
 	end;
 }
 
-/*
-bat_b02,1,10,3	script	Release all#b02	81,{
-	input .@input,0,2000;
-	if (.@input == 0) {
+bat_b02,1,10,3	script	Release all#b02	4_DOG01,{
+	set .@i, callfunc("F_GM_NPC",1854,0);
+	if (.@i == -1) {
 		mes "Cancelled.";
 		close;
-	}
-	else if (.@input == 1854) {
+	} else if (.@i == 0) {
+		end;
+	} else {
 		mes "May I help you?";
 		next;
 		switch(select("Release all.:Cancel.")) {
@@ -750,4 +752,3 @@ bat_b02,1,10,3	script	Release all#b02	81,{
 		}
 	}
 }
-*/
diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt
index 18176f4d2..d63130007 100644
--- a/npc/battleground/flavius/flavius_enter.txt
+++ b/npc/battleground/flavius/flavius_enter.txt
@@ -1,19 +1,19 @@
 //===== Hercules Script ======================================
 // BattleGround System - Flavius Entrance NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Flavius Battleground Entrance NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //============================================================
 
 // Flavius Officer - Guillaume
 //============================================================
-bat_room,133,178,5	script	Flavius Officer#01a	418,{
+bat_room,133,178,5	script	Flavius Officer#01a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -27,7 +27,7 @@ bat_room,133,178,5	script	Flavius Officer#01a	418,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -80,7 +80,7 @@ bat_room,133,178,5	script	Flavius Officer#01a	418,{
 	close;
 }
 
-bat_room,133,121,1	script	Flavius Officer#01b	414,{
+bat_room,133,121,1	script	Flavius Officer#01b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -94,7 +94,7 @@ bat_room,133,121,1	script	Flavius Officer#01b	414,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -147,7 +147,7 @@ bat_room,133,121,1	script	Flavius Officer#01b	414,{
 	close;
 }
 
-bat_room,135,178,5	script	Guillaume Knight#3	417,{
+bat_room,135,178,5	script	Guillaume Knight#3	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -169,7 +169,7 @@ bat_room,135,178,5	script	Guillaume Knight#3	417,{
 	close;
 }
 
-bat_room,151,178,5	script	Guillaume Knight#4	417,{
+bat_room,151,178,5	script	Guillaume Knight#4	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -191,7 +191,7 @@ bat_room,151,178,5	script	Guillaume Knight#4	417,{
 	close;
 }
 
-bat_room,135,121,1	script	Croix Knight#3	413,{
+bat_room,135,121,1	script	Croix Knight#3	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -213,7 +213,7 @@ bat_room,135,121,1	script	Croix Knight#3	413,{
 	close;
 }
 
-bat_room,151,121,1	script	Croix Knight#4	413,{
+bat_room,151,121,1	script	Croix Knight#4	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -237,7 +237,7 @@ bat_room,151,121,1	script	Croix Knight#4	413,{
 
 // Flavius Officer - Croix
 //============================================================
-bat_room,148,178,5	script	Flavius Officer#02a	418,{
+bat_room,148,178,5	script	Flavius Officer#02a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -251,7 +251,7 @@ bat_room,148,178,5	script	Flavius Officer#02a	418,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -304,7 +304,7 @@ bat_room,148,178,5	script	Flavius Officer#02a	418,{
 	close;
 }
 
-bat_room,148,121,1	script	Flavius Officer#02b	414,{
+bat_room,148,121,1	script	Flavius Officer#02b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -318,7 +318,7 @@ bat_room,148,121,1	script	Flavius Officer#02b	414,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index f89a8f66a..b4888be88 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -1,15 +1,15 @@
 //===== Hercules Script ======================================
 // BattleGround System - KvM 80-99
-//===== By: ================================================== 
+//===== By: ==================================================
 //= ???, L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground for levels 80 to 99
 //= - Winning Team: 5 points
 //= - Losing Team: 1 point
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Updated using official Aegis files. [L0ne_W0lf]
 //= 1.2 Upated some announces and dialogs from iRO.
@@ -19,7 +19,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,169,226,5	script	KVM Waiting Room#a::KvM01R_Guillaume	418,{
+bat_room,169,226,5	script	KVM Waiting Room#a::KvM01R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -33,7 +33,7 @@ OnEnterBG:
 
 bat_room,169,220,0	warp	#kvm801	2,2,bat_room,154,150
 
-bat_room,169,205,3	script	KVM Waiting Room#b::KvM01R_Croix	414,{
+bat_room,169,205,3	script	KVM Waiting Room#b::KvM01R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -52,32 +52,32 @@ bat_room,169,211,0	warp	#kvm802	2,2,bat_room,154,150
 -	script	KVM01::CellEffect	-1,{
 	end;
 
-OnKvM01One: 
-	misceffect EF_CHANGECOLD;
+OnKvM01One:
+	specialeffect EF_CHANGECOLD;
 	end;
 
-OnKvM01Two: 
-	misceffect EF_CHANGEPOISON;
+OnKvM01Two:
+	specialeffect EF_CHANGEPOISON;
 	end;
 }
 
-bat_c01,54,124,3	duplicate(CellEffect)	#RedcellA1-1	139
-bat_c01,55,124,3	duplicate(CellEffect)	#RedcellA2-1	139
-bat_c01,56,124,3	duplicate(CellEffect)	#RedcellA3-1	139
-bat_c01,57,124,3	duplicate(CellEffect)	#RedcellA4-1	139
-bat_c01,57,125,3	duplicate(CellEffect)	#RedcellA5-1	139
-bat_c01,57,126,3	duplicate(CellEffect)	#RedcellA6-1	139
-bat_c01,57,127,3	duplicate(CellEffect)	#RedcellA7-1	139
+bat_c01,54,124,3	duplicate(CellEffect)	#RedcellA1-1	HIDDEN_WARP_NPC
+bat_c01,55,124,3	duplicate(CellEffect)	#RedcellA2-1	HIDDEN_WARP_NPC
+bat_c01,56,124,3	duplicate(CellEffect)	#RedcellA3-1	HIDDEN_WARP_NPC
+bat_c01,57,124,3	duplicate(CellEffect)	#RedcellA4-1	HIDDEN_WARP_NPC
+bat_c01,57,125,3	duplicate(CellEffect)	#RedcellA5-1	HIDDEN_WARP_NPC
+bat_c01,57,126,3	duplicate(CellEffect)	#RedcellA6-1	HIDDEN_WARP_NPC
+bat_c01,57,127,3	duplicate(CellEffect)	#RedcellA7-1	HIDDEN_WARP_NPC
 
-bat_c01,145,59,3	duplicate(CellEffect)	#RedcellB1-1	139
-bat_c01,144,59,3	duplicate(CellEffect)	#RedcellB2-1	139
-bat_c01,143,59,3	duplicate(CellEffect)	#RedcellB3-1	139
-bat_c01,142,59,3	duplicate(CellEffect)	#RedcellB4-1	139
-bat_c01,142,56,3	duplicate(CellEffect)	#RedcellB5-1	139
-bat_c01,142,57,3	duplicate(CellEffect)	#RedcellB6-1	139
-bat_c01,142,58,3	duplicate(CellEffect)	#RedcellB7-1	139
+bat_c01,145,59,3	duplicate(CellEffect)	#RedcellB1-1	HIDDEN_WARP_NPC
+bat_c01,144,59,3	duplicate(CellEffect)	#RedcellB2-1	HIDDEN_WARP_NPC
+bat_c01,143,59,3	duplicate(CellEffect)	#RedcellB3-1	HIDDEN_WARP_NPC
+bat_c01,142,59,3	duplicate(CellEffect)	#RedcellB4-1	HIDDEN_WARP_NPC
+bat_c01,142,56,3	duplicate(CellEffect)	#RedcellB5-1	HIDDEN_WARP_NPC
+bat_c01,142,57,3	duplicate(CellEffect)	#RedcellB6-1	HIDDEN_WARP_NPC
+bat_c01,142,58,3	duplicate(CellEffect)	#RedcellB7-1	HIDDEN_WARP_NPC
 
-bat_c01,54,128,3	script	#A_camp_start01	139,4,4,{
+bat_c01,54,128,3	script	#A_camp_start01	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -98,7 +98,7 @@ OnTouch:
 	end;
 }
 
-bat_c01,146,56,3	script	#B_camp_start01	139,4,4,{
+bat_c01,146,56,3	script	#B_camp_start01	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -357,7 +357,7 @@ OnTimer5000:
 	mapannounce "bat_c01", "Please be careful.",bc_map,"0x00ff00";
 	end;
 
-OnTimer:55000:
+OnTimer55000:
 	mapannounce "bat_c01", "You will be sent back.",bc_map,"0x00ff00";
 	end;
 
@@ -369,7 +369,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c01,51,130,5	script	KVM Officer#KVM01A	419,{
+bat_c01,51,130,5	script	KVM Officer#KVM01A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == Bat_Team )
@@ -380,9 +380,7 @@ bat_c01,51,130,5	script	KVM Officer#KVM01A	419,{
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 5";
 			close2;
-		}
-		else
-		{ // 
+		} else {
 			set kvm_point,kvm_point + 1;
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
@@ -398,7 +396,7 @@ bat_c01,51,130,5	script	KVM Officer#KVM01A	419,{
 	end;
 }
 
-bat_c01,148,53,1	script	KVM Officer#KVM01B	415,{
+bat_c01,148,53,1	script	KVM Officer#KVM01B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == Bat_Team )
@@ -409,9 +407,7 @@ bat_c01,148,53,1	script	KVM Officer#KVM01B	415,{
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 5";
 			close2;
-		}
-		else
-		{ // 
+		} else {
 			set kvm_point,kvm_point + 1;
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index e01225fbb..06f3a2dcf 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -1,15 +1,15 @@
 //===== Hercules Script ======================================
 // BattleGround System - KvM 1-59
-//===== By: ================================================== 
+//===== By: ==================================================
 //= ???, L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground for levels 1 to 59
 //= - Winning Team: 1 point
 //= - Losing Team: 0 points
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Updated using official Aegis files. [L0ne_W0lf]
 //= 1.2 Upated some announces and dialogs from iRO.
@@ -21,7 +21,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,197,226,5	script	KVM Waiting Room#a2::KvM02R_Guillaume	418,{
+bat_room,197,226,5	script	KVM Waiting Room#a2::KvM02R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -35,7 +35,7 @@ OnEnterBG:
 
 bat_room,197,220,0	warp	#kvm601	2,2,bat_room,154,150
 
-bat_room,197,205,3	script	KVM Waiting Room#b2::KvM02R_Croix	414,{
+bat_room,197,205,3	script	KVM Waiting Room#b2::KvM02R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -54,32 +54,32 @@ bat_room,197,211,0	warp	#kvm602	2,2,bat_room,154,150
 -	script	KVM02::CellEffect2	-1,{
 	end;
 
-OnKvM02One: 
-	misceffect EF_CHANGECOLD;
+OnKvM02One:
+	specialeffect EF_CHANGECOLD;
 	end;
 
-OnKvM02Two: 
-	misceffect EF_CHANGEPOISON;
+OnKvM02Two:
+	specialeffect EF_CHANGEPOISON;
 	end;
 }
 
-bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	139
-bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	139
-bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	139
-bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	139
-bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	139
-bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	139
-bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	139
+bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	HIDDEN_WARP_NPC
+bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	HIDDEN_WARP_NPC
+bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	HIDDEN_WARP_NPC
+bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	HIDDEN_WARP_NPC
+bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	HIDDEN_WARP_NPC
+bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	HIDDEN_WARP_NPC
+bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	HIDDEN_WARP_NPC
 
-bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	139
-bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	139
-bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	139
-bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	139
-bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	139
-bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	139
-bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	139
+bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	HIDDEN_WARP_NPC
+bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	HIDDEN_WARP_NPC
+bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	HIDDEN_WARP_NPC
+bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	HIDDEN_WARP_NPC
+bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	HIDDEN_WARP_NPC
+bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	HIDDEN_WARP_NPC
+bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	HIDDEN_WARP_NPC
 
-bat_c02,54,128,3	script	#A_camp_start02	139,4,4,{
+bat_c02,54,128,3	script	#A_camp_start02	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -100,7 +100,7 @@ OnTouch:
 	end;
 }
 
-bat_c02,146,56,3	script	#B_camp_start02	139,4,4,{
+bat_c02,146,56,3	script	#B_camp_start02	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -359,7 +359,7 @@ OnTimer5000:
 	mapannounce "bat_c02", "Please be careful.",bc_map,"0x00ff00";
 	end;
 
-OnTimer:55000:
+OnTimer55000:
 	mapannounce "bat_c02", "You will be sent back.",bc_map,"0x00ff00";
 	end;
 
@@ -371,7 +371,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c02,51,130,5	script	KVM Officer#KVM02A	419,{
+bat_c02,51,130,5	script	KVM Officer#KVM02A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM02BG_Victory == Bat_Team )
@@ -382,9 +382,7 @@ bat_c02,51,130,5	script	KVM Officer#KVM02A	419,{
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 1";
 			close2;
-		}
-		else
-		{ // 
+		} else {
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
 			mes "I wish you better luck next time.";
@@ -399,7 +397,7 @@ bat_c02,51,130,5	script	KVM Officer#KVM02A	419,{
 	end;
 }
 
-bat_c02,148,53,1	script	KVM Officer#KVM02B	415,{
+bat_c02,148,53,1	script	KVM Officer#KVM02B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM02BG_Victory == Bat_Team )
@@ -410,9 +408,7 @@ bat_c02,148,53,1	script	KVM Officer#KVM02B	415,{
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 1";
 			close2;
-		}
-		else
-		{ // 
+		} else {
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
 			mes "I wish you better luck next time.";
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index 05cf76dc0..ea7dc3d47 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -1,15 +1,15 @@
 //===== Hercules Script ======================================
 // BattleGround System - KvM 60-80
-//===== By: ================================================== 
+//===== By: ==================================================
 //= ???, L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground for levels 60 to 80
 //= - Winning Team: 2 points
 //= - Losing Team: 1 point
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Updated using official Aegis files. [L0ne_W0lf]
 //= 1.2 Upated some announces and dialogs from iRO.
@@ -20,7 +20,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,225,226,5	script	KVM Waiting Room#a3::KvM03R_Guillaume	418,{
+bat_room,225,226,5	script	KVM Waiting Room#a3::KvM03R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -34,7 +34,7 @@ OnEnterBG:
 
 bat_room,225,220,0	warp	#kvm701	2,2,bat_room,154,150
 
-bat_room,225,205,3	script	KVM Waiting Room#b3::KvM03R_Croix	414,{
+bat_room,225,205,3	script	KVM Waiting Room#b3::KvM03R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -53,32 +53,32 @@ bat_room,225,211,0	warp	#kvm702	2,2,bat_room,154,150
 -	script	KVM03::CellEffect3	-1,{
 	end;
 
-OnKvM03One: 
-	misceffect EF_CHANGECOLD;
+OnKvM03One:
+	specialeffect EF_CHANGECOLD;
 	end;
 
-OnKvM03Two: 
-	misceffect EF_CHANGEPOISON;
+OnKvM03Two:
+	specialeffect EF_CHANGEPOISON;
 	end;
 }
 
-bat_c03,54,124,3	duplicate(CellEffect3)	#RedcellA1-3	139
-bat_c03,55,124,3	duplicate(CellEffect3)	#RedcellA2-3	139
-bat_c03,56,124,3	duplicate(CellEffect3)	#RedcellA3-3	139
-bat_c03,57,124,3	duplicate(CellEffect3)	#RedcellA4-3	139
-bat_c03,57,125,3	duplicate(CellEffect3)	#RedcellA5-3	139
-bat_c03,57,126,3	duplicate(CellEffect3)	#RedcellA6-3	139
-bat_c03,57,127,3	duplicate(CellEffect3)	#RedcellA7-3	139
+bat_c03,54,124,3	duplicate(CellEffect3)	#RedcellA1-3	HIDDEN_WARP_NPC
+bat_c03,55,124,3	duplicate(CellEffect3)	#RedcellA2-3	HIDDEN_WARP_NPC
+bat_c03,56,124,3	duplicate(CellEffect3)	#RedcellA3-3	HIDDEN_WARP_NPC
+bat_c03,57,124,3	duplicate(CellEffect3)	#RedcellA4-3	HIDDEN_WARP_NPC
+bat_c03,57,125,3	duplicate(CellEffect3)	#RedcellA5-3	HIDDEN_WARP_NPC
+bat_c03,57,126,3	duplicate(CellEffect3)	#RedcellA6-3	HIDDEN_WARP_NPC
+bat_c03,57,127,3	duplicate(CellEffect3)	#RedcellA7-3	HIDDEN_WARP_NPC
 
-bat_c03,145,59,3	duplicate(CellEffect3)	#RedcellB1-3	139
-bat_c03,144,59,3	duplicate(CellEffect3)	#RedcellB2-3	139
-bat_c03,143,59,3	duplicate(CellEffect3)	#RedcellB3-3	139
-bat_c03,142,59,3	duplicate(CellEffect3)	#RedcellB4-3	139
-bat_c03,142,56,3	duplicate(CellEffect3)	#RedcellB5-3	139
-bat_c03,142,57,3	duplicate(CellEffect3)	#RedcellB6-3	139
-bat_c03,142,58,3	duplicate(CellEffect3)	#RedcellB7-3	139
+bat_c03,145,59,3	duplicate(CellEffect3)	#RedcellB1-3	HIDDEN_WARP_NPC
+bat_c03,144,59,3	duplicate(CellEffect3)	#RedcellB2-3	HIDDEN_WARP_NPC
+bat_c03,143,59,3	duplicate(CellEffect3)	#RedcellB3-3	HIDDEN_WARP_NPC
+bat_c03,142,59,3	duplicate(CellEffect3)	#RedcellB4-3	HIDDEN_WARP_NPC
+bat_c03,142,56,3	duplicate(CellEffect3)	#RedcellB5-3	HIDDEN_WARP_NPC
+bat_c03,142,57,3	duplicate(CellEffect3)	#RedcellB6-3	HIDDEN_WARP_NPC
+bat_c03,142,58,3	duplicate(CellEffect3)	#RedcellB7-3	HIDDEN_WARP_NPC
 
-bat_c03,54,128,3	script	#A_camp_start03	139,4,4,{
+bat_c03,54,128,3	script	#A_camp_start03	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -99,7 +99,7 @@ OnTouch:
 	end;
 }
 
-bat_c03,146,56,3	script	#B_camp_start03	139,4,4,{
+bat_c03,146,56,3	script	#B_camp_start03	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -358,7 +358,7 @@ OnTimer5000:
 	mapannounce "bat_c03", "Please be careful.",bc_map,"0x00ff00";
 	end;
 
-OnTimer:55000:
+OnTimer55000:
 	mapannounce "bat_c03", "You will be sent back.",bc_map,"0x00ff00";
 	end;
 
@@ -370,7 +370,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c03,51,130,5	script	KVM Officer#KVM03A	419,{
+bat_c03,51,130,5	script	KVM Officer#KVM03A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM03BG_Victory == Bat_Team )
@@ -381,9 +381,7 @@ bat_c03,51,130,5	script	KVM Officer#KVM03A	419,{
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 2";
 			close2;
-		}
-		else
-		{ // 
+		} else {
 			set kvm_point,kvm_point + 1;
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
@@ -399,7 +397,7 @@ bat_c03,51,130,5	script	KVM Officer#KVM03A	419,{
 	end;
 }
 
-bat_c03,148,53,1	script	KVM Officer#KVM03B	415,{
+bat_c03,148,53,1	script	KVM Officer#KVM03B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM03BG_Victory == Bat_Team )
@@ -410,9 +408,7 @@ bat_c03,148,53,1	script	KVM Officer#KVM03B	415,{
 			mes "May the glory of KVM be with you.";
 			mes "You aquire the winning points: 2";
 			close2;
-		}
-		else
-		{ // 
+		} else {
 			set kvm_point,kvm_point + 1;
 			mes "[KVM Officer]";
 			mes "I am so sorry.";
diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt
index 512e12dbd..1b5e9062c 100644
--- a/npc/battleground/kvm/kvm_enter.txt
+++ b/npc/battleground/kvm/kvm_enter.txt
@@ -1,14 +1,14 @@
 //===== Hercules Script ======================================
 // BattleGround System - KvM Entrance NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground Entrance NPCs
 //= Original NPCs scrapped from bg_common.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Corrected some typos, and shifted messages around.
 //=     Corrected iRO style quest log entries, however it's
@@ -17,7 +17,7 @@
 
 // KvM Officer - Guillaume
 //============================================================
-bat_room,164,178,5	script	KVM Mercenary Officer#1	418,{
+bat_room,164,178,5	script	KVM Mercenary Officer#1	4_M_KY_KNT,{
 	/*
 	set .@kvm,checkquest(6026,PLAYTIME);
 	if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -57,7 +57,7 @@ bat_room,164,178,5	script	KVM Mercenary Officer#1	418,{
 
 // Guillaume Knight - KvM
 //============================================================
-bat_room,167,178,5	script	Guillaume Knight#kvm	417,{
+bat_room,167,178,5	script	Guillaume Knight#kvm	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Hello.";
 	mes "What do you want to know?";
@@ -117,7 +117,7 @@ bat_room,167,178,5	script	Guillaume Knight#kvm	417,{
 
 // KvM Officer - Croix
 //============================================================
-bat_room,164,121,1	script	KVM Mercenary Officer#2	414,{
+bat_room,164,121,1	script	KVM Mercenary Officer#2	4_M_CRU_KNT,{
 	/*
 	set .@kvm,checkquest(6025,PLAYTIME);
 	if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -157,7 +157,7 @@ bat_room,164,121,1	script	KVM Mercenary Officer#2	414,{
 
 // Croix Knight - KvM
 //============================================================
-bat_room,167,121,1	script	Croix Knight#kvm	413,{
+bat_room,167,121,1	script	Croix Knight#kvm	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Hello.";
 	mes "What do you want to know?";
diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt
index 9257e92b3..fa14455d6 100644
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -1,22 +1,22 @@
 //===== Hercules Script ======================================
 // BattleGround System - KvM Item Dealer
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Kreiger Von Midgard Battleground Point redemption NPC
-//= * NOTE * 
+//= * NOTE *
 //= KvM Does NOT use items, but a character variable to
 //= keep track of points. This NPC when talked to will
 //= convert already-given tokens and convert them to points.
 //= under the player variable kvm_point.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //============================================================
 
-bat_room,151,144,3	script	KVM Logistic Officer#a	734,{
+bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 	if (countitem(7773)) {
 		set .@pointstoadd,countitem(7773);
 		delitem 7773,.@pointstoadd;
@@ -55,7 +55,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	734,{
 		mes "points. So, be carefull when";
 		mes "selecting a reward.";
 		close2;
-		ReadBook 11017,1;
+		readbook 11017,1;
 		end;
 	case 2:
 		mes "[Logistics]";
@@ -77,7 +77,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	734,{
 				mes "Please select a sub-category.";
 				next;
 				switch(select("Dagger:One-handed Sword:Two-handed Sword:One-handed Spear:Two-handed Spear")) {
-				case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1 
+				case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1
 				case 2:
 					mes "[Logistics]";
 					mes "You have selected the 'One-handed Sword' category.";
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index 4dec175c2..10e2bfc85 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -1,24 +1,26 @@
 //===== Hercules Script ======================================
 // BattleGround System - Tierra Gorge
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= Tierra Gorge Battleground.
 //= - Winning Team: 3 badges
 //= - Losing Team: 1 badge
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Corrected setwalls for barricades. [L0ne_W0lf]
 //= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //= 1.3 Removed MaxLvl check in waitingrooms.
+//= 1.4 Label standardization. [Euphy]
+//= 1.5 Added GM management function. [Euphy]
 //============================================================
 
 // Waiting Room NPCs
 //============================================================
-bat_room,57,227,5	script	Lieutenant Kalos	418,{
+bat_room,57,227,5	script	Lieutenant Kalos	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -30,7 +32,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,58,204,1	script	Lieutenant Eyor	414,{
+bat_room,58,204,1	script	Lieutenant Eyor	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -42,10 +44,10 @@ OnEnterBG:
 	end;
 }
 
-bat_room,1,151,3	script	#bat_a01_timer	844,{
+bat_room,1,151,3	script	#bat_a01_timer	CLEAR_NPC,{
 	end;
 
-onInit:
+OnInit:
 OnEnable:
 	initnpctimer;
 	end;
@@ -90,24 +92,24 @@ bat_room,57,211,0	warp	back_bgrooma01b	1,1,bat_room,154,150
 
 // Tierra Gorge Battleground Engine
 //============================================================
-bat_a01,15,15,3	script	start#bat_a01	844,{
+bat_a01,15,15,3	script	start#bat_a01	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_a01","bat_room",154,150;
 	end;
 
 OnEnable:
-	donpcevent "OBJ#bat_a01_a::Onkill";
+	donpcevent "OBJ#bat_a01_a::OnKill";
 	donpcevent "OBJ#bat_a01_a::OnEnable";
-	donpcevent "OBJ#bat_a01_b::Onkill";
+	donpcevent "OBJ#bat_a01_b::OnKill";
 	donpcevent "OBJ#bat_a01_b::OnEnable";
-	donpcevent "barricade#bat_a01_a::Onkill";
+	donpcevent "barricade#bat_a01_a::OnKill";
 	donpcevent "barricade#bat_a01_a::OnEnable";
-	donpcevent "barricade#bat_a01_b::Onkill";
+	donpcevent "barricade#bat_a01_b::OnKill";
 	donpcevent "barricade#bat_a01_b::OnEnable";
-	donpcevent "OBJ#bat_a01_n::Onkill";
+	donpcevent "OBJ#bat_a01_n::OnKill";
 	donpcevent "OBJ#bat_a01_n::OnEnable";
-	donpcevent "NOBJ_mob#bat_a01_a::Onkill";
-	donpcevent "NOBJ_mob#bat_a01_b::Onkill";
+	donpcevent "NOBJ_mob#bat_a01_a::OnKill";
+	donpcevent "NOBJ_mob#bat_a01_b::OnKill";
 	donpcevent "Battle Therapist#a01_a::OnEnable";
 	donpcevent "Battle Therapist#a01_b::OnEnable";
 	donpcevent "countdown#bat_a01::OnEnable";
@@ -136,7 +138,7 @@ OnReadyCheck:
 	set $@TierraBG1,1;
 	donpcevent "Lieutenant Kalos::OnEnterBG";
 	donpcevent "Lieutenant Eyor::OnEnterBG";
-	donpcevent "start#bat_a01::onEnable";
+	donpcevent "start#bat_a01::OnEnable";
 	bg_warp $@TierraBG1_id1,"bat_a01",352,342;
 	bg_warp $@TierraBG1_id2,"bat_a01",353,52;
 	initnpctimer;
@@ -148,12 +150,12 @@ OnTimer10000:
 	end;
 }
 
-bat_a01,15,16,3	script	OBJ#bat_a01_a	844,{
+bat_a01,15,16,3	script	OBJ#bat_a01_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG1_id1,"bat_a01",177,345,"Food Storage",1909,"OBJ#bat_a01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","OBJ#bat_a01_a::OnMyMobDead";
 	end;
 
@@ -171,12 +173,12 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,17,3	script	OBJ#bat_a01_b	844,{
+bat_a01,15,17,3	script	OBJ#bat_a01_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG1_id2,"bat_a01",167,50,"Food Depot",1910,"OBJ#bat_a01_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","OBJ#bat_a01_b::OnMyMobDead";
 	end;
 
@@ -194,14 +196,14 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,18,3	script	barricade#bat_a01_a	844,{
+bat_a01,15,18,3	script	barricade#bat_a01_a	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
 		bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead";
 	setwall "bat_a01",186,266,16,6,1,"bat_a01_c1";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","barricade#bat_a01_a::OnMyMobDead";
 	delwall "bat_a01_c1";
 	end;
@@ -216,14 +218,14 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,19,3	script	barricade#bat_a01_b	844,{
+bat_a01,15,19,3	script	barricade#bat_a01_b	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
 		bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead";
 	setwall "bat_a01",170,129,16,6,1,"bat_a01_g1";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","barricade#bat_a01_b::OnMyMobDead";
 	delwall "bat_a01_g1";
 	end;
@@ -238,12 +240,12 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,20,3	script	OBJ#bat_a01_n	844,{
+bat_a01,15,20,3	script	OBJ#bat_a01_n	CLEAR_NPC,{
 OnEnable:
 	monster "bat_a01",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a01_n::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","OBJ#bat_a01_n::OnMyMobDead";
 	end;
 
@@ -262,15 +264,15 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,21,3	script	NOBJ_mob#bat_a01_a	844,{
+bat_a01,15,21,3	script	NOBJ_mob#bat_a01_a	CLEAR_NPC,{
 OnEnable:
-	donpcevent "NOBJ_mob#bat_a01_b::Onkill";
+	donpcevent "NOBJ_mob#bat_a01_b::OnKill";
 	bg_monster $@TierraBG1_id1,"bat_a01",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	bg_monster $@TierraBG1_id1,"bat_a01",272,213,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	bg_monster $@TierraBG1_id1,"bat_a01",273,197,"Guillaume Camp Guardian",1950,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","NOBJ_mob#bat_a01_a::OnMyMobDead";
 	end;
 
@@ -278,15 +280,15 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,22,3	script	NOBJ_mob#bat_a01_b	844,{
+bat_a01,15,22,3	script	NOBJ_mob#bat_a01_b	CLEAR_NPC,{
 OnEnable:
-	donpcevent "NOBJ_mob#bat_a01_a::Onkill";
+	donpcevent "NOBJ_mob#bat_a01_a::OnKill";
 	bg_monster $@TierraBG1_id2,"bat_a01",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	bg_monster $@TierraBG1_id2,"bat_a01",272,213,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	bg_monster $@TierraBG1_id2,"bat_a01",273,197,"Croix Camp Guardian",1950,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","NOBJ_mob#bat_a01_b::OnMyMobDead";
 	end;
 
@@ -294,7 +296,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,185,270,1	script	Guillaume Blacksmith#a01	851,{
+bat_a01,185,270,1	script	Guillaume Blacksmith#a01	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG1_id1) {
 		mes "[Guillaume Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -378,7 +380,7 @@ OnInit:
 	end;
 }
 
-bat_a01,170,121,5	script	Croix Blacksmith#bat_a01	851,{
+bat_a01,170,121,5	script	Croix Blacksmith#bat_a01	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG1_id2) {
 		mes "[Croix Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -462,7 +464,7 @@ OnInit:
 	end;
 }
 
-bat_a01,53,377,3	script	Battle Therapist#a01_a	95,{
+bat_a01,53,377,3	script	Battle Therapist#a01_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -481,7 +483,7 @@ OnEnable:
 	enablenpc "Battle Therapist#a01_a";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_a01_rp1_a_warp";
 	disablenpc "Battle Therapist#a01_a";
 	stopnpctimer;
@@ -512,7 +514,7 @@ OnTouch_:
 	end;
 }
 
-bat_a01,45,19,3	script	Battle Therapist#a01_b	95,{
+bat_a01,45,19,3	script	Battle Therapist#a01_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -531,7 +533,7 @@ OnEnable:
 	enablenpc "Battle Therapist#a01_b";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_a01_rp1_b_warp";
 	disablenpc "Battle Therapist#a01_b";
 	stopnpctimer;
@@ -562,7 +564,7 @@ OnTouch:
 	end;
 }
 
-bat_a01,60,216,3	script	Valley Ghost#bat_a01_n	950,{
+bat_a01,60,216,3	script	Valley Ghost#bat_a01_n	4_GHOSTRING,{
 	specialeffect2 EF_HEAL;
 	mes "[Valley Ghost]";
 	mes "Boo...Boo...";
@@ -611,7 +613,7 @@ OnTouch:
 
 bat_a01,194,265,0	script	barri_warp_down#bat_a01a	-1,7,0,{
 OnTouch:
-	if (getcharid(4) == $@TierraBG1_id1) 
+	if (getcharid(4) == $@TierraBG1_id1)
 		warp "bat_a01",194,270;
 	end;
 }
@@ -646,39 +648,39 @@ OnTouch:
 	end;
 }
 
-bat_a01,169,227,0	script	underladd#bat_a01_1	45,1,1,{
+bat_a01,169,227,0	script	underladd#bat_a01_1	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a01",178,228;
 	end;
 }
 
-bat_a01,208,164,0	script	underladd#bat_a01_2	45,1,1,{
+bat_a01,208,164,0	script	underladd#bat_a01_2	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a01",200,171;
 	end;
 }
 
-bat_a01,171,309,3	script	Guillaume Camp#flag1	973,{ end; }
-bat_a01,149,310,3	script	Guillaume Camp#flag2	973,{ end; }
-bat_a01,119,336,3	script	Guillaume Camp#flag3	973,{ end; }
-bat_a01,118,357,3	script	Guillaume Camp#flag4	973,{ end; }
-bat_a01,150,380,3	script	Guillaume Camp#flag5	973,{ end; }
-bat_a01,173,380,3	script	Guillaume Camp#flag6	973,{ end; }
-bat_a01,210,344,3	script	Guillaume Camp#flag7	973,{ end; }
-bat_a01,350,325,3	script	Guillaume Camp#flag8	973,{ end; }
-bat_a01,358,325,3	script	Guillaume Camp#flag9	973,{ end; }
-
-bat_a01,138,12,3	script	Croix Camp#flag1	974,{ end; }
-bat_a01,108,36,3	script	Croix Camp#flag2	974,{ end; }
-bat_a01,108,63,3	script	Croix Camp#flag3	974,{ end; }
-bat_a01,136,87,3	script	Croix Camp#flag4	974,{ end; }
-bat_a01,167,86,3	script	Croix Camp#flag5	974,{ end; }
-bat_a01,199,49,3	script	Croix Camp#flag6	974,{ end; }
-bat_a01,168,16,3	script	Croix Camp#flag7	974,{ end; }
-bat_a01,357,74,3	script	Croix Camp#flag8	974,{ end; }
-bat_a01,348,74,3	script	Croix Camp#flag9	974,{ end; }
-
-bat_a01,53,377,3	script	Guillaume Vintenar#a01_a	419,{
+bat_a01,171,309,3	script	Guillaume Camp#flag1	1_FLAG_LION,{ end; }
+bat_a01,149,310,3	script	Guillaume Camp#flag2	1_FLAG_LION,{ end; }
+bat_a01,119,336,3	script	Guillaume Camp#flag3	1_FLAG_LION,{ end; }
+bat_a01,118,357,3	script	Guillaume Camp#flag4	1_FLAG_LION,{ end; }
+bat_a01,150,380,3	script	Guillaume Camp#flag5	1_FLAG_LION,{ end; }
+bat_a01,173,380,3	script	Guillaume Camp#flag6	1_FLAG_LION,{ end; }
+bat_a01,210,344,3	script	Guillaume Camp#flag7	1_FLAG_LION,{ end; }
+bat_a01,350,325,3	script	Guillaume Camp#flag8	1_FLAG_LION,{ end; }
+bat_a01,358,325,3	script	Guillaume Camp#flag9	1_FLAG_LION,{ end; }
+
+bat_a01,138,12,3	script	Croix Camp#flag1	1_FLAG_EAGLE,{ end; }
+bat_a01,108,36,3	script	Croix Camp#flag2	1_FLAG_EAGLE,{ end; }
+bat_a01,108,63,3	script	Croix Camp#flag3	1_FLAG_EAGLE,{ end; }
+bat_a01,136,87,3	script	Croix Camp#flag4	1_FLAG_EAGLE,{ end; }
+bat_a01,167,86,3	script	Croix Camp#flag5	1_FLAG_EAGLE,{ end; }
+bat_a01,199,49,3	script	Croix Camp#flag6	1_FLAG_EAGLE,{ end; }
+bat_a01,168,16,3	script	Croix Camp#flag7	1_FLAG_EAGLE,{ end; }
+bat_a01,357,74,3	script	Croix Camp#flag8	1_FLAG_EAGLE,{ end; }
+bat_a01,348,74,3	script	Croix Camp#flag9	1_FLAG_EAGLE,{ end; }
+
+bat_a01,53,377,3	script	Guillaume Vintenar#a01_a	4_M_KY_HEAD,{
 	if (getcharid(4) == $@TierraBG1_id1) {
 		if ($@TierraBG1_Victory == 1) {
 			set .@your_medal,countitem(7828);
@@ -772,7 +774,7 @@ OnInit:
 	end;
 }
 
-bat_a01,45,19,3	script	Croix Vintenar#a01_b	415,{
+bat_a01,45,19,3	script	Croix Vintenar#a01_b	4_M_CRU_HEAD,{
 	if (getcharid(4) == $@TierraBG1_id2) {
 		if ($@TierraBG1_Victory == 2) {
 			set .@your_medal,countitem(7828);
@@ -866,12 +868,12 @@ OnInit:
 	end;
 }
 
-bat_a01,1,5,3	script	countdown#bat_a01	844,{
+bat_a01,1,5,3	script	countdown#bat_a01	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -905,30 +907,30 @@ OnTimer1825000:
 
 OnTimer1830000:
 	mapwarp "bat_a01","bat_room",154,150;
-	donpcevent "countdown#bat_a01::Onstop";
+	donpcevent "countdown#bat_a01::OnStop";
 	end;
 }
 
 /*
-bat_a01,351,75,3	script	Croix Camp Soldier#bat_a01_guide	934,{
+bat_a01,351,75,3	script	Croix Camp Soldier#bat_a01_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 
-bat_a01,356,326,3	script	Guillaume Camp Soldier#bat_a01_guide	934,{
+bat_a01,356,326,3	script	Guillaume Camp Soldier#bat_a01_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 */
 
-/*
-bat_a01,1,1,3	script	Release all#a01	81,{
-	input .@input,0,2000;
-	if (.@input == 0) {
+bat_a01,1,1,3	script	Release all#a01	4_DOG01,{
+	set .@i, callfunc("F_GM_NPC",1854,0);
+	if (.@i == -1) {
 		mes "Cancelled.";
 		close;
-	}
-	else if (.@input == 1854) {
+	} else if (.@i == 0) {
+		end;
+	} else {
 		mes "May I help you?";
 		next;
 		switch(select("Release all.:Cancel.")) {
@@ -939,8 +941,7 @@ bat_a01,1,1,3	script	Release all#a01	81,{
 			end;
 		case 2:
 			mes "Cancelled.";
+			close;
 		}
 	}
 }
-*/
-
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index aa5f09215..0e7cc773d 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -1,23 +1,25 @@
 //===== Hercules Script ======================================
 // BattleGround System - Tierra Gorge 2
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
+//= [Official Conversion]
 //= Second Tierra Gorge Battleground.
 //= - Winning Team: 3 badges
 //= - Losing Team: 1 badge
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //= 1.2 Removed MaxLvl check in waitingrooms.
+//= 1.3 Label standardization. [Euphy]
+//= 1.4 Added GM management function. [Euphy]
 //============================================================
 
 // Waiting Room NPCs
 //============================================================
-bat_room,114,227,5	script	Lieutenant Rundel	418,{
+bat_room,114,227,5	script	Lieutenant Rundel	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -29,7 +31,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,114,204,1	script	Lieutenant Guerrit	414,{
+bat_room,114,204,1	script	Lieutenant Guerrit	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -41,10 +43,10 @@ OnEnterBG:
 	end;
 }
 
-bat_room,1,151,3	script	#bat_a02_timer	844,{
+bat_room,1,151,3	script	#bat_a02_timer	CLEAR_NPC,{
 	end;
 
-onInit:
+OnInit:
 OnEnable:
 	initnpctimer;
 	end;
@@ -89,24 +91,24 @@ bat_room,113,211,0	warp	back_bgrooma02b	1,1,bat_room,154,150
 
 // Tierra Gorge Battleground Engine
 //============================================================
-bat_a02,15,15,3	script	start#bat_a02	844,{
+bat_a02,15,15,3	script	start#bat_a02	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_a02","bat_room",154,150;
 	end;
 
 OnEnable:
-	donpcevent "OBJ#bat_a02_a::Onkill";
+	donpcevent "OBJ#bat_a02_a::OnKill";
 	donpcevent "OBJ#bat_a02_a::OnEnable";
-	donpcevent "OBJ#bat_a02_b::Onkill";
+	donpcevent "OBJ#bat_a02_b::OnKill";
 	donpcevent "OBJ#bat_a02_b::OnEnable";
-	donpcevent "barricade#bat_a02_a::Onkill";
+	donpcevent "barricade#bat_a02_a::OnKill";
 	donpcevent "barricade#bat_a02_a::OnEnable";
-	donpcevent "barricade#bat_a02_b::Onkill";
+	donpcevent "barricade#bat_a02_b::OnKill";
 	donpcevent "barricade#bat_a02_b::OnEnable";
-	donpcevent "OBJ#bat_a02_n::Onkill";
+	donpcevent "OBJ#bat_a02_n::OnKill";
 	donpcevent "OBJ#bat_a02_n::OnEnable";
-	donpcevent "NOBJ_mob#bat_a02_a::Onkill";
-	donpcevent "NOBJ_mob#bat_a02_b::Onkill";
+	donpcevent "NOBJ_mob#bat_a02_a::OnKill";
+	donpcevent "NOBJ_mob#bat_a02_b::OnKill";
 	donpcevent "Battle Therapist#a02_a::OnEnable";
 	donpcevent "Battle Therapist#a02_b::OnEnable";
 	donpcevent "countdown#bat_a02::OnEnable";
@@ -135,7 +137,7 @@ OnReadyCheck:
 	set $@TierraBG2,1;
 	donpcevent "Lieutenant Rundel::OnEnterBG";
 	donpcevent "Lieutenant Guerrit::OnEnterBG";
-	donpcevent "start#bat_a02::onEnable";
+	donpcevent "start#bat_a02::OnEnable";
 	bg_warp $@TierraBG2_id1,"bat_a02",352,342;
 	bg_warp $@TierraBG2_id2,"bat_a02",353,52;
 	initnpctimer;
@@ -147,12 +149,12 @@ OnTimer10000:
 	end;
 }
 
-bat_a02,15,16,3	script	OBJ#bat_a02_a	844,{
+bat_a02,15,16,3	script	OBJ#bat_a02_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG2_id1,"bat_a02",177,345,"Food Storage",1909,"OBJ#bat_a02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","OBJ#bat_a02_a::OnMyMobDead";
 	end;
 
@@ -170,12 +172,12 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,17,3	script	OBJ#bat_a02_b	844,{
+bat_a02,15,17,3	script	OBJ#bat_a02_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG2_id2,"bat_a02",167,50,"Food Depot",1910,"OBJ#bat_a02_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","OBJ#bat_a02_b::OnMyMobDead";
 	end;
 
@@ -193,14 +195,14 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,18,3	script	barricade#bat_a02_a	844,{
+bat_a02,15,18,3	script	barricade#bat_a02_a	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
 		bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead";
 	setwall "bat_a02",186,266,16,6,1,"bat_a02_c1";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","barricade#bat_a02_a::OnMyMobDead";
 	delwall "bat_a02_c1";
 	end;
@@ -215,14 +217,14 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,19,3	script	barricade#bat_a02_b	844,{
+bat_a02,15,19,3	script	barricade#bat_a02_b	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
 		bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead";
 	setwall "bat_a02",170,129,16,6,1,"bat_a02_g1";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","barricade#bat_a02_b::OnMyMobDead";
 	delwall "bat_a02_g1";
 	end;
@@ -237,12 +239,12 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,20,3	script	OBJ#bat_a02_n	844,{
+bat_a02,15,20,3	script	OBJ#bat_a02_n	CLEAR_NPC,{
 OnEnable:
 	monster "bat_a02",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a02_n::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","OBJ#bat_a02_n::OnMyMobDead";
 	end;
 
@@ -261,15 +263,15 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,21,3	script	NOBJ_mob#bat_a02_a	844,{
+bat_a02,15,21,3	script	NOBJ_mob#bat_a02_a	CLEAR_NPC,{
 OnEnable:
-	donpcevent "NOBJ_mob#bat_a02_b::Onkill";
+	donpcevent "NOBJ_mob#bat_a02_b::OnKill";
 	bg_monster $@TierraBG2_id1,"bat_a02",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	bg_monster $@TierraBG2_id1,"bat_a02",272,213,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	bg_monster $@TierraBG2_id1,"bat_a02",273,197,"Guillaume Camp Guardian",1950,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","NOBJ_mob#bat_a02_a::OnMyMobDead";
 	end;
 
@@ -277,15 +279,15 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,22,3	script	NOBJ_mob#bat_a02_b	844,{
+bat_a02,15,22,3	script	NOBJ_mob#bat_a02_b	CLEAR_NPC,{
 OnEnable:
-	donpcevent "NOBJ_mob#bat_a02_a::Onkill";
+	donpcevent "NOBJ_mob#bat_a02_a::OnKill";
 	bg_monster $@TierraBG2_id2,"bat_a02",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	bg_monster $@TierraBG2_id2,"bat_a02",272,213,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	bg_monster $@TierraBG2_id2,"bat_a02",273,197,"Croix Camp Guardian",1950,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","NOBJ_mob#bat_a02_b::OnMyMobDead";
 	end;
 
@@ -293,7 +295,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,185,270,1	script	Guillaume Blacksmith#a02	851,{
+bat_a02,185,270,1	script	Guillaume Blacksmith#a02	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG2_id1) {
 		mes "[Guillaume Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -377,7 +379,7 @@ OnInit:
 	end;
 }
 
-bat_a02,170,121,5	script	Croix Blacksmith#bat_a02	851,{
+bat_a02,170,121,5	script	Croix Blacksmith#bat_a02	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG2_id2) {
 		mes "[Croix Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -461,7 +463,7 @@ OnInit:
 	end;
 }
 
-bat_a02,53,377,3	script	Battle Therapist#a02_a	95,{
+bat_a02,53,377,3	script	Battle Therapist#a02_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -480,7 +482,7 @@ OnEnable:
 	enablenpc "Battle Therapist#a02_a";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_a02_rp1_a_warp";
 	disablenpc "Battle Therapist#a02_a";
 	stopnpctimer;
@@ -511,7 +513,7 @@ OnTouch_:
 	end;
 }
 
-bat_a02,45,19,3	script	Battle Therapist#a02_b	95,{
+bat_a02,45,19,3	script	Battle Therapist#a02_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -530,7 +532,7 @@ OnEnable:
 	enablenpc "Battle Therapist#a02_b";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_a02_rp1_b_warp";
 	disablenpc "Battle Therapist#a02_b";
 	stopnpctimer;
@@ -561,7 +563,7 @@ OnTouch:
 	end;
 }
 
-bat_a02,60,216,3	script	Valley Ghost#bat_a02_n	950,{
+bat_a02,60,216,3	script	Valley Ghost#bat_a02_n	4_GHOSTRING,{
 	specialeffect2 EF_HEAL;
 	mes "[Valley Ghost]";
 	mes "Boo...Boo...";
@@ -610,7 +612,7 @@ OnTouch:
 
 bat_a02,194,265,0	script	barri_warp_down#bat_a02a	-1,7,0,{
 OnTouch:
-	if (getcharid(4) == $@TierraBG2_id1) 
+	if (getcharid(4) == $@TierraBG2_id1)
 		warp "bat_a02",194,270;
 	end;
 }
@@ -645,39 +647,39 @@ OnTouch:
 	end;
 }
 
-bat_a02,169,227,0	script	underladd#bat_a02_1	45,1,1,{
+bat_a02,169,227,0	script	underladd#bat_a02_1	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a02",178,228;
 	end;
 }
 
-bat_a02,208,164,0	script	underladd#bat_a02_2	45,1,1,{
+bat_a02,208,164,0	script	underladd#bat_a02_2	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a02",200,171;
 	end;
 }
 
-bat_a02,171,309,3	script	Guillaume Camp#flag11	973,{ end; }
-bat_a02,149,310,3	script	Guillaume Camp#flag12	973,{ end; }
-bat_a02,119,336,3	script	Guillaume Camp#flag13	973,{ end; }
-bat_a02,118,357,3	script	Guillaume Camp#flag14	973,{ end; }
-bat_a02,150,380,3	script	Guillaume Camp#flag15	973,{ end; }
-bat_a02,173,380,3	script	Guillaume Camp#flag16	973,{ end; }
-bat_a02,210,344,3	script	Guillaume Camp#flag17	973,{ end; }
-bat_a02,350,325,3	script	Guillaume Camp#flag18	973,{ end; }
-bat_a02,358,325,3	script	Guillaume Camp#flag19	973,{ end; }
-
-bat_a02,138,12,3	script	Croix Camp#flag11	974,{ end; }
-bat_a02,108,36,3	script	Croix Camp#flag12	974,{ end; }
-bat_a02,108,63,3	script	Croix Camp#flag13	974,{ end; }
-bat_a02,136,87,3	script	Croix Camp#flag14	974,{ end; }
-bat_a02,167,86,3	script	Croix Camp#flag15	974,{ end; }
-bat_a02,199,49,3	script	Croix Camp#flag16	974,{ end; }
-bat_a02,168,16,3	script	Croix Camp#flag17	974,{ end; }
-bat_a02,357,74,3	script	Croix Camp#flag18	974,{ end; }
-bat_a02,348,74,3	script	Croix Camp#flag19	974,{ end; }
-
-bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	419,{
+bat_a02,171,309,3	script	Guillaume Camp#flag11	1_FLAG_LION,{ end; }
+bat_a02,149,310,3	script	Guillaume Camp#flag12	1_FLAG_LION,{ end; }
+bat_a02,119,336,3	script	Guillaume Camp#flag13	1_FLAG_LION,{ end; }
+bat_a02,118,357,3	script	Guillaume Camp#flag14	1_FLAG_LION,{ end; }
+bat_a02,150,380,3	script	Guillaume Camp#flag15	1_FLAG_LION,{ end; }
+bat_a02,173,380,3	script	Guillaume Camp#flag16	1_FLAG_LION,{ end; }
+bat_a02,210,344,3	script	Guillaume Camp#flag17	1_FLAG_LION,{ end; }
+bat_a02,350,325,3	script	Guillaume Camp#flag18	1_FLAG_LION,{ end; }
+bat_a02,358,325,3	script	Guillaume Camp#flag19	1_FLAG_LION,{ end; }
+
+bat_a02,138,12,3	script	Croix Camp#flag11	1_FLAG_EAGLE,{ end; }
+bat_a02,108,36,3	script	Croix Camp#flag12	1_FLAG_EAGLE,{ end; }
+bat_a02,108,63,3	script	Croix Camp#flag13	1_FLAG_EAGLE,{ end; }
+bat_a02,136,87,3	script	Croix Camp#flag14	1_FLAG_EAGLE,{ end; }
+bat_a02,167,86,3	script	Croix Camp#flag15	1_FLAG_EAGLE,{ end; }
+bat_a02,199,49,3	script	Croix Camp#flag16	1_FLAG_EAGLE,{ end; }
+bat_a02,168,16,3	script	Croix Camp#flag17	1_FLAG_EAGLE,{ end; }
+bat_a02,357,74,3	script	Croix Camp#flag18	1_FLAG_EAGLE,{ end; }
+bat_a02,348,74,3	script	Croix Camp#flag19	1_FLAG_EAGLE,{ end; }
+
+bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	4_M_KY_HEAD,{
 	if (getcharid(4) == $@TierraBG2_id1) {
 		if ($@TierraBG2_Victory == 1) {
 			set .@your_medal,countitem(7828);
@@ -771,7 +773,7 @@ OnInit:
 	end;
 }
 
-bat_a02,45,19,3	script	Croix Vintenar#a02_b	415,{
+bat_a02,45,19,3	script	Croix Vintenar#a02_b	4_M_CRU_HEAD,{
 	if (getcharid(4) == $@TierraBG2_id2) {
 		if ($@TierraBG2_Victory == 2) {
 			set .@your_medal,countitem(7828);
@@ -865,12 +867,12 @@ OnInit:
 	end;
 }
 
-bat_a02,1,5,3	script	countdown#bat_a02	844,{
+bat_a02,1,5,3	script	countdown#bat_a02	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -904,30 +906,30 @@ OnTimer1825000:
 
 OnTimer1830000:
 	mapwarp "bat_a02","bat_room",154,150;
-	donpcevent "countdown#bat_a02::Onstop";
+	donpcevent "countdown#bat_a02::OnStop";
 	end;
 }
 
 /*
-bat_a02,351,75,3	script	Croix Camp Soldier#bat_a02_guide	934,{
+bat_a02,351,75,3	script	Croix Camp Soldier#bat_a02_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 
-bat_a02,356,326,3	script	Guillaume Camp Soldier#bat_a02_guide	934,{
+bat_a02,356,326,3	script	Guillaume Camp Soldier#bat_a02_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 */
 
-/*
-bat_a02,1,1,3	script	Release all#a02	81,{
-	input .@input,0,2000;
-	if (.@input == 0) {
+bat_a02,1,1,3	script	Release all#a02	4_DOG01,{
+	set .@i, callfunc("F_GM_NPC",1854,0);
+	if (.@i == -1) {
 		mes "Cancelled.";
 		close;
-	}
-	else if (.@input == 1854) {
+	} else if (.@i == 0) {
+		end;
+	} else {
 		mes "May I help you?";
 		next;
 		switch(select("Release all.:Cancel.")) {
@@ -938,8 +940,7 @@ bat_a02,1,1,3	script	Release all#a02	81,{
 			end;
 		case 2:
 			mes "Cancelled.";
+			close;
 		}
 	}
 }
-*/
-	
diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt
index df2568125..e68058247 100644
--- a/npc/battleground/tierra/tierra_enter.txt
+++ b/npc/battleground/tierra/tierra_enter.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 // BattleGround System - Tierra Gorge Entrance NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Tierra Gorge Battleground Entrance NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Fixed silly copy paste errors. (bugreport:4401)
 //============================================================
 
 // First Tierra Gorge Officers - Guillaume
 //============================================================
-bat_room,124,178,5	script	Tierra Gorge Officer#01a	418,{
+bat_room,124,178,5	script	Tierra Gorge Officer#01a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -28,7 +28,7 @@ bat_room,124,178,5	script	Tierra Gorge Officer#01a	418,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -81,7 +81,7 @@ bat_room,124,178,5	script	Tierra Gorge Officer#01a	418,{
 	close;
 }
 
-bat_room,140,178,5	script	Tierra Gorge Officer#02a	418,{
+bat_room,140,178,5	script	Tierra Gorge Officer#02a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -95,7 +95,7 @@ bat_room,140,178,5	script	Tierra Gorge Officer#02a	418,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -148,7 +148,7 @@ bat_room,140,178,5	script	Tierra Gorge Officer#02a	418,{
 	close;
 }
 
-bat_room,127,178,5	script	Guillaume Knight#1	417,{
+bat_room,127,178,5	script	Guillaume Knight#1	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -172,7 +172,7 @@ bat_room,127,178,5	script	Guillaume Knight#1	417,{
 	close;
 }
 
-bat_room,143,178,5	script	Guillaume Knight#2	417,{
+bat_room,143,178,5	script	Guillaume Knight#2	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -196,7 +196,7 @@ bat_room,143,178,5	script	Guillaume Knight#2	417,{
 	close;
 }
 
-bat_room,127,121,1	script	Croix Knight#1	413,{
+bat_room,127,121,1	script	Croix Knight#1	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -220,7 +220,7 @@ bat_room,127,121,1	script	Croix Knight#1	413,{
 	close;
 }
 
-bat_room,143,121,1	script	Croix Knight#2	413,{
+bat_room,143,121,1	script	Croix Knight#2	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -246,7 +246,7 @@ bat_room,143,121,1	script	Croix Knight#2	413,{
 
 // Second Tierra Gorge Officers - Croix
 //============================================================
-bat_room,125,121,1	script	Tierra Gorge Officer#01b	414,{
+bat_room,125,121,1	script	Tierra Gorge Officer#01b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -260,7 +260,7 @@ bat_room,125,121,1	script	Tierra Gorge Officer#01b	414,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
@@ -313,7 +313,7 @@ bat_room,125,121,1	script	Tierra Gorge Officer#01b	414,{
 	close;
 }
 
-bat_room,140,121,1	script	Tierra Gorge Officer#02b	414,{
+bat_room,140,121,1	script	Tierra Gorge Officer#02b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -327,7 +327,7 @@ bat_room,140,121,1	script	Tierra Gorge Officer#02b	414,{
 	next;
 	switch(select("I want to join your army!:End Conversation")) {
 	case 1:
-		if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
 		}
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 3909d63b2..232fb5da3 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Alberta Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= DZeroX
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Town-specific Alberta NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Converted from Aegis 10.4 [DZeroX]
 //= 1.1 Optimized, missing next, REMOVED .GATs! again [Lupus]
 //= 1.2 Implemented progression fixes provided by $ephiroth. [L0ne_W0lf]
@@ -17,7 +17,7 @@
 //= 1.6 Added Izlude RE coordinates. [Euphy]
 //============================================================
 
-alberta,97,51,0	script	Fabian	84,{
+alberta,97,51,0	script	Fabian	4_M_02,{
 	mes "[Fabian]";
 	mes "Man... When you travel all around the world, you'll hear of some crazy things.";
 	next;
@@ -32,7 +32,7 @@ alberta,97,51,0	script	Fabian	84,{
 	close;
 }
 
-alberta,53,39,0	script	Steiner	100,{
+alberta,53,39,0	script	Steiner	4W_SAILOR,{
 	mes "[Steiner]";
 	mes "Oh...!";
 	mes "Welcome to Alberta,";
@@ -46,7 +46,7 @@ alberta,53,39,0	script	Steiner	100,{
 	close;
 }
 
-alberta,20,183,0	script	Chad	49,{
+alberta,20,183,0	script	Chad	1_M_03,{
 	mes "[Chad]";
 	mes "People say the legendary weapon Gungnir never misses its target. I wonder if it's possibly true...";
 	next;
@@ -61,50 +61,54 @@ alberta,20,183,0	script	Chad	49,{
 	close;
 }
 
-alberta,131,139,2	script	Drunken Old Man	54,{
+alberta,131,139,2	script	Drunken Old Man	1_M_JOBGUIDER,{
 	mes "[Deagle]";
 	mes "^666666*Hiccup*^000000";
 	mes "Wh-what are you";
 	mes "staring at? Get lost!!";
 	next;
-	if(select("Say nothing.","Leave him alone.") == 1) {
-		mes "[Deagle]";
-		mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'";
-		next;
-		if(select("Never heard of it.","Really? No kidding!") == 1) {
-			mes "[Deagle]";
-			mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000";
-			next;
+	switch(select("Say nothing.","Leave him alone.")) {
+		case 1:
 			mes "[Deagle]";
-			mes "Ah~ The ol'days. If only... If only we hadn't run into that STORM...^666666*hiccup*^000000";
+			mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'";
 			next;
+			switch(select("Never heard of it.","Really? No kidding!")) {
+				case 1:
+					mes "[Deagle]";
+					mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000";
+					next;
+					mes "[Deagle]";
+					mes "Ah~ The ol'days. If only... If only we hadn't run into that STORM...^666666*hiccup*^000000";
+					next;
+					mes "[Deagle]";
+					mes "AH~ Captain. I miss our cap'n more than anything... No foe survived before cap'n's sword.";
+					close;
+				case 2:
+					mes "[Deagle]";
+					mes "That's right! NOBODY meshes with the crew of the 'Going Mary!' And nobody can beat out cap'n in a sword fight!";
+					next;
+					mes "[Deagle]";
+					mes "CAPTAIN~!!! ^666666*HICCUP~*^000000 He would swing his sword like this, then... THEN!!";
+					next;
+					mes "[Deagle]";
+					mes "The bastard the captain was fighting, and anyone of his friends near him, were surrounded in flame!";
+					next;
+					mes "[Deagle]";
+					mes "Man, that sword must have had some sort of mysterious power, or the captain was just that good...!";
+					next;
+					mes "[Deagle]";
+					mes "Phew~~ ^666666*Sob* *Sob...*^000000 God, I miss everyone! Now I'm depressed! Please, go away now.";
+					close;
+			}
+		case 2:
 			mes "[Deagle]";
-			mes "AH~ Captain. I miss our cap'n more than anything... No foe survived before cap'n's sword.";
+			mes "That's right!";
+			mes "Go AWAY~";
 			close;
-		}
-		mes "[Deagle]";
-		mes "That's right! NOBODY meshes with the crew of the 'Going Mary!' And nobody can beat out cap'n in a sword fight!";
-		next;
-		mes "[Deagle]";
-		mes "CAPTAIN~!!! ^666666*HICCUP~*^000000 He would swing his sword like this, then... THEN!!";
-		next;
-		mes "[Deagle]";
-		mes "The bastard the captain was fighting, and anyone of his friends near him, were surrounded in flame!";
-		next;
-		mes "[Deagle]";
-		mes "Man, that sword must have had some sort of mysterious power, or the captain was just that good...!";
-		next;
-		mes "[Deagle]";
-		mes "Phew~~ ^666666*Sob* *Sob...*^000000 God, I miss everyone! Now I'm depressed! Please, go away now.";
-		close;
 	}
-	mes "[Deagle]";
-	mes "That's right!";
-	mes "Go AWAY~";
-	close;
 }
 
-alberta,58,80,2	script	Shakir	99,{
+alberta,58,80,2	script	Shakir	4W_M_03,{
 	mes "[Shakir]";
 	if (rand(2)) {
 		mes "We Merchants have our own negotiating skill when we sell goods. This skill can get us more money than when other people sell goods.";
@@ -131,7 +135,7 @@ alberta,58,80,2	script	Shakir	99,{
 	close;
 }
 
-alberta,62,156,2	script	Sonya	102,{
+alberta,62,156,2	script	Sonya	8_F,{
 	mes "[Sonya]";
 	switch(rand(3)){
 	case 0:
@@ -167,7 +171,7 @@ alberta,62,156,2	script	Sonya	102,{
 	}
 }
 
-alberta,93,174,2	script	Grandmother Alma	103,{
+alberta,93,174,2	script	Grandmother Alma	8_F_GRANDMOTHER,{
 	mes "[Grandmother Alma]";
 	mes "Some time ago,";
 	mes "a derelict ship";
@@ -188,7 +192,7 @@ alberta,93,174,2	script	Grandmother Alma	103,{
 	close;
 }
 
-alberta,189,151,5	script	Fisk	100,{
+alberta,189,151,5	script	Fisk	4W_SAILOR,{
 	mes "[Fisk]";
 	mes "Ahoy mate,";
 	mes "where'd ya";
@@ -201,7 +205,7 @@ alberta,189,151,5	script	Fisk	100,{
 				mes "Hey now, don't try to cheat me! I said 250 zeny!";
 				close;
 			}
-			set Zeny,Zeny - 250;
+			Zeny -= 250;
 			warp "alb2trea",43,53;
 			end;
 		case 2:
@@ -210,7 +214,7 @@ alberta,189,151,5	script	Fisk	100,{
 				mes "Ain't no way yer getting there without the 500 zeny first!";
 				close;
 			}
-			set Zeny,Zeny - 500;
+			Zeny -= 500;
 			if(checkre(0))
 				warp "izlude",195,212;
 			else
@@ -224,16 +228,16 @@ alberta,189,151,5	script	Fisk	100,{
 	}
 }
 
-alb2trea,39,50,6	script	Fisk#a2t	100,{
+alb2trea,39,50,6	script	Fisk#a2t	4W_SAILOR,{
 	mes "[Fisk]";
 	mes "So you wanna head back to the mainland in Alberta, eh?";
 	next;
-	if(select("Yes please.","I changed my mind.") == 1)
+	if(select("Yes please.","I changed my mind.")==1)
 		warp "alberta",192,169;
 	close;
 }
 
-alberta,195,151,2	script	Paul	86,{
+alberta,195,151,2	script	Paul	4_M_04,{
 	mes "[Paul]";
 	mes "Good day~";
 	mes "Would you like";
@@ -251,25 +255,28 @@ alberta,195,151,2	script	Paul	86,{
 	mes "fee is only";
 	mes "200 Zeny.";
 	next;
-	if(select("Sign me up!","Uh, no thanks.") == 1) {
-		if (Zeny < 200) {
+	switch(select("Sign me up!","Uh, no thanks.")) {
+		case 1:
+			if (Zeny < 200) {
+				mes "[Paul]";
+				mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
+				close;
+			} else {
+				Zeny -= 200;
+				warp "alb2trea",62,69;
+				close;
+			}
+		case 2:
 			mes "[Paul]";
-			mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
+			mes "Alright, well...";
+			mes "I'll be around";
+			mes "if you change";
+			mes "your mind.";
 			close;
-		}
-		set Zeny,Zeny - 200;
-		warp "alb2trea",62,69;
-		close;
 	}
-	mes "[Paul]";
-	mes "Alright, well...";
-	mes "I'll be around";
-	mes "if you change";
-	mes "your mind.";
-	close;
 }
 
-alberta,190,173,4	script	Phelix	85,{
+alberta,190,173,4	script	Phelix	4_M_03,{
 	set .@weight,MaxWeight-Weight;
 	mes "[Phelix]";
 	if ((.@weight) < 10000) {
@@ -292,106 +299,111 @@ alberta,190,173,4	script	Phelix	85,{
 		mes "If you're interested in my offer, get me the stuff I mentioned.";
 		set @event_zelopy,1;
 		close;
-	}
-	mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
-	next;
-	if(select("Red Potions please.","Carrots please.") == 1) {
-		mes "[Phelix]";
-		mes "Alright...";
-		mes "Let's see";
-		mes "what'cha got...";
-		next;
-		mes "[Phelix]";
-		if (countitem(909) < 10) {
-			mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
-			close;
-		}
-		set .@max,countitem(909)/10;
-		mes "Hmm, not bad...";
-		mes "How many potions";
-		mes "do you want to get?";
+	} else {
+		mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
 		next;
-		switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
+		switch(select("Red Potions please.","Carrots please.")) {
 		case 1:
-			delitem 909,.@max*10;	// Jellopy
-			getitem 501,.@max;	// Red_Potion
-			break;
-		case 2:
 			mes "[Phelix]";
-			mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
-			mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
-			input .@amount;
+			mes "Alright...";
+			mes "Let's see";
+			mes "what'cha got...";
 			next;
 			mes "[Phelix]";
-			if (.@amount <= 0) {
-				mes "Much obliged, come again anytime.";
+			if (countitem(909) < 10) {
+				mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
 				close;
-			}
-			if (.@amount > 100) {
-				mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!";
+			} else {
+				set .@max,countitem(909)/10;
+				mes "Hmm, not bad...";
+				mes "How many potions";
+				mes "do you want to get?";
+				next;
+				switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
+				case 1:
+					delitem 909,.@max*10;	// Jellopy
+					getitem 501,.@max;	// Red_Potion
+					break;
+				case 2:
+					mes "[Phelix]";
+					mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
+					mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
+					input .@amount;
+					next;
+					mes "[Phelix]";
+					if (.@amount <= 0) {
+						mes "Much obliged, come again anytime.";
+						close;
+					}
+					if (.@amount > 100) {
+						mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!";
+						close;
+					}
+					if (countitem(909) < .@amount*10) {
+						mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me.";
+						close;
+					}
+					delitem 909,.@amount*10;	// Jellopy
+					getitem 501,.@amount;	// Red_Potion
+					break;
+				case 3:
+					mes "[Phelix]";
+					mes "No problem,";
+					mes "see you next time.";
+					close;
+				}
+				mes "[Phelix]";
+				mes "There you go! As I promised. Don't go suckin' them all down at once.";
 				close;
 			}
-			if (countitem(909) < .@amount*10) {
-				mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me.";
+		case 2:
+			mes "[Phelix]";
+			mes "Alright, let's see what ya got...";
+			next;
+			mes "[Phelix]";
+			if (countitem(909) < 3) {
+				mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
+				close;
+			} else {
+				set .@max,countitem(909)/3;
+				mes "Not too bad pansy...";
+				mes "How many do you want?";
+				next;
+				switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
+				case 1:
+					delitem 909,.@max*3;	// Jellopy
+					getitem 515,.@max;	// Carrot
+					break;
+				case 2:
+					mes "[Phelix]";
+					mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
+					input .@amount;
+					next;
+					mes "[Phelix]";
+					if (.@amount == 0) {
+						mes "Alright then, see you next time.";
+						close;
+					}
+					if (.@amount > 100) {
+						mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!";
+						close;
+					}
+					if (countitem(909) < .@amount*10) {
+						mes "Seems you don't have enough. Go get some more if you want anything else.";
+						close;
+					}
+					delitem 909,.@amount*3;	// Jellopy
+					getitem 515,.@amount;	// Carrot
+					break;
+				case 3:
+					mes "[Phelix]";
+					mes "Catch'ya later.";
+					close;
+				}
+				mes "[Phelix]";
+				mes "There you go~! As I promised. Try not to stuff yer face.";
 				close;
 			}
-			delitem 909,.@amount*10;	// Jellopy
-			getitem 501,.@amount;	// Red_Potion
-			break;
-		case 3:
-			mes "[Phelix]";
-			mes "No problem,";
-			mes "see you next time.";
-			close;
 		}
-		mes "[Phelix]";
-		mes "There you go! As I promised. Don't go suckin' them all down at once.";
-		close;
-	}
-	mes "[Phelix]";
-	mes "Alright, let's see what ya got...";
-	next;
-	mes "[Phelix]";
-	if (countitem(909) < 3) {
-		mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
-		close;
 	}
-	set .@max,countitem(909)/3;
-	mes "Not too bad pansy...";
-	mes "How many do you want?";
-	next;
-	switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
-	case 1:
-		delitem 909,.@max*3;	// Jellopy
-		getitem 515,.@max;	// Carrot
-		break;
-	case 2:
-		mes "[Phelix]";
-		mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
-		input .@amount;
-		next;
-		mes "[Phelix]";
-		if (.@amount == 0) {
-			mes "Alright then, see you next time.";
-			close;
-		}
-		if (.@amount > 100) {
-			mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!";
-			close;
-		}
-		if (countitem(909) < .@amount*10) {
-			mes "Seems you don't have enough. Go get some more if you want anything else.";
-			close;
-		}
-		delitem 909,.@amount*3;	// Jellopy
-		getitem 515,.@amount;	// Carrot
-		break;
-	case 3:
-		mes "[Phelix]";
-		mes "Catch'ya later.";
-		close;
-	}
-	mes "[Phelix]";
-	mes "There you go~! As I promised. Try not to stuff yer face.";
-	close;
 }
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index d49a4f8f0..33acb60c2 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -1,17 +1,17 @@
 //===== Hercules Script ======================================
 //= Al De Baran Town
-//===== By: ================================================== 
-//= L0ne_W0lf, rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== By: ==================================================
+//= rAthena Dev Team; L0ne_W0lf
+//===== Current Version: =====================================
 //= 2.3
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Al De Baran Town NPCs
-//===== Additional Comments: ================================= 
-//= v1.1 Added RS125 NPC.  Added another Kafra Reserve points agent.
-//= The 2nd reserve points agent is not complete yet.
+//===== Additional Comments: =================================
+//= 1.1 Added RS125 NPC.  Added another Kafra Reserve points agent.
+//=     The 2nd reserve points agent is not complete yet.
 //= 1.2 Lottery input number fix [Lupus], 1.2a - label typo fixed
-//= 1.3 Gatekeeper's bug fixed (wrong check and wrong item ID 
+//= 1.3 Gatekeeper's bug fixed (wrong check and wrong item ID
 //=     for underground), fixed some typos [Lupus]
 //= 1.4 Fixed Typos & Spellcheck [massdriller]
 //= 1.5 Finally added the Special Reserve 2 Lotto 8))
@@ -21,8 +21,8 @@
 //= 1.7 Fixed exploits [Lupus] 1.8 Removed Duplicates [Silent]
 //= 1.9 Fixed a bunch of typos with information from Crono/Hollengrhen [Evera]
 //= 1.9a Now Pavianne doesn't sell Kafra Passes. She refunds them [Lupus]
-//= 2.0	Re-made all the dialog-only NPCs with official dialogs.
-//=		Kafra and Clock Tower NPCs pending remake. [DZeroX]
+//= 2.0 Re-made all the dialog-only NPCs with official dialogs.
+//=     Kafra and Clock Tower NPCs pending remake. [DZeroX]
 //= 2.01 removed all .GATs [Lupus]
 //= 2.1 Rescripted most NPCs to Aegis 10.3 standards. [L0ne_W0lf]
 //= 2.2 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
@@ -31,7 +31,7 @@
 
 // Al De Baran
 //============================================================
-aldebaran,113,70,4	script	Forger Munster#alde	48,{
+aldebaran,113,70,4	script	Forger Munster#alde	1_M_02,{
 	mes "[Munster]";
 	mes "My family used to live in Geffen. So I guess it was natural that we studied forging and eventually became Blacksmiths. Then, we finally moved to this town,";
 	mes "Al De Baran.";
@@ -56,7 +56,7 @@ aldebaran,113,70,4	script	Forger Munster#alde	48,{
 	close;
 }
 
-aldebaran,64,104,4	script	Smithing Guy#alde	55,{
+aldebaran,64,104,4	script	Smithing Guy#alde	1_M_JOBTESTER,{
 	mes "[Quatro]";
 	mes "Have you heard that a famous Blacksmith moved here from Geffen?";
 	next;
@@ -79,7 +79,7 @@ aldebaran,64,104,4	script	Smithing Guy#alde	55,{
 	close;
 }
 
-aldebaran,49,93,4	script	Young Man#alde	83,{
+aldebaran,49,93,4	script	Young Man#alde	4_M_01,{
 	mes "[Miller]";
 	mes "Aren't level 4 weapons cool!";
 	mes "I can't believe such powerful";
@@ -90,7 +90,7 @@ aldebaran,49,93,4	script	Young Man#alde	83,{
 	close;
 }
 
-aldebaran,81,61,4	script	Shell Gathering Lady#ald	101,{
+aldebaran,81,61,4	script	Shell Gathering Lady#ald	4W_F_01,{
 	mes "[Joanne]";
 	mes "I enjoy gathering shells from the sea. It's really fun and relaxing~";
 	next;
@@ -120,7 +120,7 @@ aldebaran,81,61,4	script	Shell Gathering Lady#ald	101,{
 	close;
 }
 
-aldebaran,46,129,4	script	Canal Guy#alde	97,{
+aldebaran,46,129,4	script	Canal Guy#alde	4W_M_01,{
 	mes "[Panama]";
 	mes "Al De Baran is known world wide as the City of Canals. The waterways really add a sophisticated, romantic touch to our fair city.";
 	next;
@@ -142,7 +142,7 @@ aldebaran,46,129,4	script	Canal Guy#alde	97,{
 	}
 }
 
-aldebaran,67,154,4	script	Forest Guy#alde	98,{
+aldebaran,67,154,4	script	Forest Guy#alde	4W_M_02,{
 	mes "[Isenberg]";
 	mes "Mt. Mjolnir and Payon Forest.";
 	mes "Both of those places are tough";
@@ -181,7 +181,7 @@ aldebaran,67,154,4	script	Forest Guy#alde	98,{
 	}
 }
 
-aldebaran,90,170,4	script	Slot Guy#alde	47,{
+aldebaran,90,170,4	script	Slot Guy#alde	1_M_01,{
 	mes "[Epthiel]";
 	mes "Some weapons or armor have Slots where you can insert Cards obtained from monsters.";
 	next;
@@ -213,7 +213,7 @@ aldebaran,90,170,4	script	Slot Guy#alde	47,{
 	}
 }
 
-aldebaran,117,181,4	script	Phracon Guy#alde	48,{
+aldebaran,117,181,4	script	Phracon Guy#alde	1_M_02,{
 	mes "[Joy]";
 	mes "Level 1 weapons, which are the lowest grade, need a metal named ^3355FFPhracon^000000 in order to be upgraded.";
 	next;
@@ -242,7 +242,7 @@ aldebaran,117,181,4	script	Phracon Guy#alde	48,{
 	}
 }
 
-aldebaran,121,231,4	script	Alchemy Guy#alde	49,{
+aldebaran,121,231,4	script	Alchemy Guy#alde	1_M_03,{
 	mes "[Chemirre]";
 	mes "Alchemists, one of the 2nd Jobs, are able to create items out of several materials using knowledge from the ancient age of Al De Baran.";
 	next;
@@ -313,7 +313,7 @@ aldebaran,121,231,4	script	Alchemy Guy#alde	49,{
 	}
 }
 
-aldebaran,86,228,4	script	Little Kid#alde	62,{
+aldebaran,86,228,4	script	Little Kid#alde	1_M_SIZ,{
 	mes "[Bebe]";
 	mes "A while ago I went out for a walk toward Mt. Mjolnir with my pet Savage Bebe. His name is NukNuk!";
 	mes "We got attacked, but luckily we weren't hurt.";
@@ -347,7 +347,7 @@ aldebaran,86,228,4	script	Little Kid#alde	62,{
 	}
 }
 
-aldebaran,159,242,4	script	Insect Guy#alde	119,{
+aldebaran,159,242,4	script	Insect Guy#alde	2_M_SWORDMASTER,{
 	mes "[Stromme]";
 	mes "Even to a strong Swordman, the Insects or Mt. Mjolnir pose a considerable threat. You've got to know your enemy before engaging it in battle!";
 	next;
@@ -376,7 +376,7 @@ aldebaran,159,242,4	script	Insect Guy#alde	119,{
 	close;
 }
 
-aldebaran,60,70,4	script	Sylvia#alde	69,{
+aldebaran,60,70,4	script	Sylvia#alde	1_F_04,{
 	mes "[Sylvia]";
 	mes "I came all the way here from Prontera because I heard the Kafra Main Office was somewhere here in Al De Baran.";
 	next;
@@ -406,7 +406,7 @@ aldebaran,60,70,4	script	Sylvia#alde	69,{
 	close;
 }
 
-aldebaran,93,80,4	script	Issei#alde	48,{
+aldebaran,93,80,4	script	Issei#alde	1_M_02,{
 	mes "[Issei]";
 	mes "Al De Baran is such a wonderful place with its romantic canals and classic architecture. I love nothing more than to stroll through this city with my beautiful girlfriend.";
 	next;
@@ -432,7 +432,7 @@ aldebaran,93,80,4	script	Issei#alde	48,{
 	close;
 }
 
-aldebaran,180,46,4	script	Joo Jahk#alde	88,{
+aldebaran,180,46,4	script	Joo Jahk#alde	4_M_ORIENT01,{
 	mes "[Joo Jahk]";
 	mes "I'm a tourist";
 	mes "from Payon,";
@@ -457,7 +457,7 @@ aldebaran,180,46,4	script	Joo Jahk#alde	88,{
 	close;
 }
 
-aldebaran,212,122,4	script	Citizen#alde	97,{
+aldebaran,212,122,4	script	Citizen#alde	4W_M_01,{
 	mes "[Gavin]";
 	mes "Welcome!";
 	mes "The town of";
@@ -489,7 +489,7 @@ aldebaran,212,122,4	script	Citizen#alde	97,{
 	close;
 }
 
-aldebaran,146,124,4	script	Town Girl#alde	101,{
+aldebaran,146,124,4	script	Town Girl#alde	4W_F_01,{
 	mes "[Nastasia]";
 	mes "Somewhere in the world there is an ^3355FFAssassin Guild^000000, where they teach people the subtle art of assassination.";
 	next;
@@ -512,7 +512,7 @@ aldebaran,146,124,4	script	Town Girl#alde	101,{
 	close;
 }
 
-aldebaran,143,136,4	script	Bell Keeper#A	89,{
+aldebaran,143,136,4	script	Bell Keeper#A	4_M_ORIENT02,{
 	mes "[Bell Keeper]";
 	mes "I have been charged by the Committee of 'Heaven on Earth' to guard this entrance of the Clock Tower.";
 	next;
@@ -537,7 +537,7 @@ aldebaran,143,136,4	script	Bell Keeper#A	89,{
 
 // Inside Al De Baran
 //============================================================
-aldeba_in,232,241,4	script	RS125#alde	48,{
+aldeba_in,232,241,4	script	RS125#alde	1_M_02,{
 	mes "[RS125]";
 	mes "I may sound unhuman rather robotic";
 	mes "however, I hope you will not be afraid of me. I am as humane as you are.";
@@ -580,7 +580,7 @@ aldeba_in,232,241,4	script	RS125#alde	48,{
 	close;
 }
 
-aldeba_in,223,121,4	script	Threatening-Looking Man	63,{
+aldeba_in,223,121,4	script	Threatening-Looking Man	1_M_SMITH,{
 	mes "[Threatening-Looking Man]";
 	mes "Hey, you don't come inside someone else's house without permission.";
 	mes "This is ridiculous!";
@@ -626,7 +626,7 @@ aldeba_in,223,121,4	script	Threatening-Looking Man	63,{
 	close;
 }
 
-aldeba_in,219,61,4	script	Friendly-Looking Man#ald	109,{
+aldeba_in,219,61,4	script	Friendly-Looking Man#ald	4_M_MANAGER,{
 	mes "[Friendly-Looking Man]";
 	mes "You don't have to listen to a guy right next to my room.";
 	mes "Two years ago, he was in a mercenary training center and fell off from a tree";
@@ -638,7 +638,7 @@ aldeba_in,219,61,4	script	Friendly-Looking Man#ald	109,{
 	close;
 }
 
-aldeba_in,152,47,4	script	Fussy Man#alde	97,{
+aldeba_in,152,47,4	script	Fussy Man#alde	4W_M_01,{
 	mes "[Fussy Man]";
 	mes "Aaaaarrrggghhh...I AM IN TROUBLE!";
 	mes "My little chicken has left me!";
@@ -670,7 +670,7 @@ aldeba_in,152,47,4	script	Fussy Man#alde	97,{
 	close;
 }
 
-aldeba_in,156,179,4	script	Master#alde	61,{
+aldeba_in,156,179,4	script	Master#alde	1_M_PUBMASTER,{
 	mes "[Master]";
 	mes "The Kafra Corporation Headquarters is located here in Al De Baran.";
 	mes "Do you know";
@@ -685,7 +685,7 @@ aldeba_in,156,179,4	script	Master#alde	61,{
 	mes "Who's your";
 	mes "favorite Kafra girl?";
 	next;
-	if (sex == 0) {
+	if (Sex == 0) {
 		mes "[Master]";
 		mes "Oh, and don't worry. I know that girls have some kind of opinion about how pretty other girls are.";
 		next;
@@ -759,7 +759,7 @@ aldeba_in,156,179,4	script	Master#alde	61,{
 	close;
 }
 
-aldeba_in,84,166,4	script	Kafra Service#alde	117,{
+aldeba_in,84,166,4	script	Kafra Service#alde	4_F_KAFRA1,{
 	cutin "kafra_01",2;
 	mes "[Kafra Pavianne]";
 	mes "Welcome! I'm Pavianne,";
@@ -800,7 +800,7 @@ aldeba_in,84,166,4	script	Kafra Service#alde	117,{
 					end;
 				}
 				delitem 1084,countitem(1084); //Kapra's_Pass
-				set Zeny,Zeny+.@kafrapassmoney;
+				Zeny += .@kafrapassmoney;
 				mes "[Kafra Pavianne]";
 				mes "Thank you.";
 			}
@@ -817,7 +817,7 @@ aldeba_in,84,166,4	script	Kafra Service#alde	117,{
 	end;
 }
 
-aldeba_in,83,245,4	script	Kafra Service#2alde	116,{
+aldeba_in,83,245,4	script	Kafra Service#2alde	4_F_KAFRA2,{
 	cutin "kafra_02",2;
 	mes "[Kafra Blossom]";
 	mes "Welcome to the";
@@ -883,7 +883,7 @@ aldeba_in,83,245,4	script	Kafra Service#2alde	116,{
 	end;
 }
 
-aldeba_in,24,245,4	script	Kafra Jasmine#alde	115,{
+aldeba_in,24,245,4	script	Kafra Jasmine#alde	4_F_KAFRA3,{
 	cutin "kafra_03",2;
 	mes "[Kafra Jasmine]";
 	mes "Welcome!";
@@ -943,7 +943,7 @@ aldeba_in,24,245,4	script	Kafra Jasmine#alde	115,{
 	end;
 }
 
-aldeba_in,142,238,4	script	Kafra Service#3alde	114,{
+aldeba_in,142,238,4	script	Kafra Service#3alde	4_F_KAFRA4,{
 	cutin "kafra_04",2;
 	mes "[Kafra Roxie]";
 	mes "Welcome~!";
@@ -1019,7 +1019,7 @@ aldeba_in,142,238,4	script	Kafra Service#3alde	114,{
 	end;
 }
 
-aldeba_in,91,244,4	script	Kafra Service#4alde	112,{
+aldeba_in,91,244,4	script	Kafra Service#4alde	4_F_KAFRA6,{
 	cutin "kafra_06",2;
 	mes "[Kafra Curly Sue]";
 	mes "Hello, hello!!";
@@ -1048,7 +1048,7 @@ aldeba_in,91,244,4	script	Kafra Service#4alde	112,{
 // Kafra Special Reserve Point NPCs
 //============================================================
 // Special Reserve ----------------------------------------------
-aldeba_in,79,161,6	script	Kafra#04	115,{
+aldeba_in,79,161,6	script	Kafra#04	4_F_KAFRA3,{
 	cutin "kafra_03",2;
 	mes "[Kafra]";
 	mes "Welcome, ^6666FF" + strcharinfo(0) + "^000000.  This is where you can trade in your special reserve points for useful items and cool prizes.";
@@ -1235,7 +1235,7 @@ M_Menu:
 }
 
 // Special Reserve 2 ----------------------------------------------
-aldeba_in,88,161,3	script	Kafra#05	115,{
+aldeba_in,88,161,3	script	Kafra#05	4_F_KAFRA3,{
 	cutin "kafra_03",2;
 	mes "[Kafra]";
 	mes "Welcome ^5577FF"+strcharinfo(0)+"^000000.  We are currently having a special event for our customers.";
@@ -1250,7 +1250,7 @@ aldeba_in,88,161,3	script	Kafra#05	115,{
 		mes "You have the following amount of special reserve points: ^5544FF"+RESRVPTS+"^000000.";
 		mes "Make a choice and test your luck!";
 		next;
-		menu "5000pts = 1st Lottery Chance!",sM_1st, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End; 
+		menu "5000pts = 1st Lottery Chance!",sM_1st, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End;
 
 		sM_1st:
 			if(RESRVPTS < 5000) goto sL_NotEnuf;
@@ -1377,14 +1377,14 @@ sF_Spin:
 
 // Inside Clock Tower
 //============================================================
-c_tower3,10,249,4	script	Gatekeeper#ct	84,{
+c_tower3,10,249,4	script	Gatekeeper#ct	4_M_02,{
 	//Key_Of_Clock_Tower
-	callfunc "F_ClockTowerGate","4th",7026,"c_tower4",185,44; 
+	callfunc "F_ClockTowerGate","4th",7026,"c_tower4",185,44;
 }
 
-alde_dun03,264,16,4	script	Gatekeeper#ct1	101,{
+alde_dun03,264,16,4	script	Gatekeeper#ct1	4W_F_01,{
 	//Underground_Key
-	callfunc "F_ClockTowerGate","B4th",7027,"alde_dun04",79,267; 
+	callfunc "F_ClockTowerGate","B4th",7027,"alde_dun04",79,267;
 }
 
 function	script	F_ClockTowerGate	{
@@ -1463,7 +1463,7 @@ function	script	F_ClockTowerGate	{
 			mes "Please,You may enter.";
 			mes "May God bless you ..";
 			close2;
-			delitem getarg(1),1; 
+			delitem getarg(1),1;
 			warp getarg(2),getarg(3),getarg(4);
 			end;
 		}
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index de68aff7b..18ae79bdc 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 //= Amatsu Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Aegis Conversion]
 //= Amatsu Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
-//=	Moved elemental stone trader to 'elemental_trader.txt'
+//=     Moved elemental stone trader to 'elemental_trader.txt'
 //= 1.4 Moved Alberta NPC to pre-re/re paths. [Euphy]
 //============================================================
 
 // Amatsu Transportation
-//=====================================================
+//============================================================
 -	script	::Sea_Captain_amatsu	-1,{
 	mes "[Walter Moers]";
 	mes "Hey, there.";
@@ -96,7 +96,7 @@
 				mes "[Walter Moers]";
 				mes "Alright, I will start the engine!";
 				close2;
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				warp "amatsu",197,83;
 				end;
 			}
@@ -122,7 +122,7 @@
 	}
 }
 
-amatsu,194,79,5	script	Sea Captain#ama2	709,{
+amatsu,194,79,5	script	Sea Captain#ama2	4_M_SEAMAN,{
 	mes "[Walter Moers]";
 	mes "You came... Did you enjoy";
 	mes "your trip to Amatsu...?";
@@ -149,8 +149,8 @@ amatsu,194,79,5	script	Sea Captain#ama2	709,{
 }
 
 // Generic Amatsu NPCs
-//=====================================================
-amatsu,230,160,3	script	Well-side Maiden#ama	757,{
+//============================================================
+amatsu,230,160,3	script	Well-side Maiden#ama	4_F_JPN2,{
 	mes "[Yuuko]";
 	mes "I usually come to this well to";
 	mes "draw water, but never when it's";
@@ -166,7 +166,7 @@ amatsu,230,160,3	script	Well-side Maiden#ama	757,{
 	close;
 }
 	
-amatsu,179,107,4	script	John#ama	86,{
+amatsu,179,107,4	script	John#ama	4_M_04,{
 	mes "[John]";
 	mes "Yo~";
 	mes "You're not from around here.";
@@ -223,7 +223,7 @@ amatsu,179,107,4	script	John#ama	86,{
 	close;
 }
 	
-amatsu,205,163,3	script	Mimi#ama	759,{
+amatsu,205,163,3	script	Mimi#ama	4_F_JPNCHIBI,{
 	mes "[Mimi]";
 	mes "Puhuhu~!";
 	mes "Did you see Miss Amatsu near";
@@ -241,7 +241,7 @@ amatsu,205,163,3	script	Mimi#ama	759,{
 	close;
 }
 	
-amatsu,185,115,3	script	Drunken Man#ama	765,{
+amatsu,185,115,3	script	Drunken Man#ama	4_M_JPNOJI2,{
 	mes "[Kosake]";
 	mes "*Hiccup*...My wife is just like,";
 	mes "...like a man...*Hiccup*...";
@@ -281,7 +281,7 @@ amatsu,185,115,3	script	Drunken Man#ama	765,{
 	close;
 }
 	
-amatsu,217,179,1	script	Grandma#ama	760,{
+amatsu,217,179,1	script	Grandma#ama	4_F_JPNOBA2,{
 	mes "[Hatsue]";
 	mes "I'm worried about my husband.";
 	mes "He lost a lot of money in some distant town today.";
@@ -293,7 +293,7 @@ amatsu,217,179,1	script	Grandma#ama	760,{
 	close;
 }
 	
-amatsu,287,266,3	script	Jyaburo#ama	766,{
+amatsu,287,266,3	script	Jyaburo#ama	4_M_JPNOJI,{
 	mes "[Jyaburo]";
 	mes "This place is special to me.";
 	mes "It's filled with memories of my wife.";
@@ -337,8 +337,8 @@ amatsu,287,266,3	script	Jyaburo#ama	766,{
 }
 
 // Legendary Tree
-//=====================================================
-amatsu,269,221,1	script	Propose Girl#ama	758,{
+//============================================================
+amatsu,269,221,1	script	Propose Girl#ama	4_F_JPN,{
 	set jap_tree,1;
 	mes "[Hutari Shioko]";
 	mes "It is a pleasure to meet you.";
@@ -373,7 +373,7 @@ amatsu,269,221,1	script	Propose Girl#ama	758,{
 	close;
 }
 	
-amatsu,243,202,3	script	Drama Teacher#ama	760,{
+amatsu,243,202,3	script	Drama Teacher#ama	4_F_JPNOBA2,{
 	set jap_tree,2;
 	mes "[Garakame sensei]";
 	mes "This is a beautiful place";
@@ -418,11 +418,11 @@ amatsu,243,202,3	script	Drama Teacher#ama	760,{
 	close;
 }
 	
-amatsu,283,203,1	script	Bonubonu#ama1	1323,{
+amatsu,283,203,1	script	Bonubonu#ama1	SEE_OTTER,{
 	end;
 }
 
-amatsu,283,203,1	script	Bonubonu#ama2	111,{
+amatsu,283,203,1	script	Bonubonu#ama2	HIDDEN_NPC,{
 	set jap_tree,3;
 	emotion e_swt2;
 	mes "[Bonubonu]";
@@ -452,7 +452,7 @@ amatsu,283,203,1	script	Bonubonu#ama2	111,{
 	close;
 }
 	
-amatsu,274,178,7	script	Veterinarian#ama	735,{
+amatsu,274,178,7	script	Veterinarian#ama	4_M_JOB_WIZARD,{
 	set jap_tree,4;
 	mes "[Sakura Seiichi]";
 	mes "Ah... I'm not a weirdo so";
@@ -505,7 +505,7 @@ amatsu,274,178,7	script	Veterinarian#ama	735,{
 	close;
 }
 	
-amatsu,262,197,1	script	Legendary Tree	111,{
+amatsu,262,197,1	script	Legendary Tree	HIDDEN_NPC,{
 	if (jap_tree == 1) {
 		mes "^3355FFAs she mentioned, this tree";
 		mes "seems to be a famous place";
@@ -584,9 +584,9 @@ amatsu,262,197,1	script	Legendary Tree	111,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Amatsu Town NPCs : Revision 2 (Fox quest fix)
 //= Translated by Makenshi and dj
 //= Revisions and edits by Valaris and Darkchild
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 1c22c2975..a4e214582 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -1,21 +1,21 @@
 //===== Hercules Script ======================================
 //= Ayotaya Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
 //= 1.9
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Ayotaya Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.7 Fixed character's anme bugs [Lupus]
 //= 1.8 Moved Alberta NPC to pre-re/re paths. [Euphy]
-//= 1.9 Updated Warp coordinates to Alberta
-//============================================================ 
+//= 1.9 Updated Renewal warp coordinates.
+//============================================================
 
-// Ayothaya Transportation NPC
-//============================================================ 
+// Ayothaya Transportation
+//============================================================
 -	script	::Aibakthing_ayothaya	-1,{
 	mes "[Aibakthing]";
 	mes "Hoo! Hah! Hoo! Hah!";
@@ -56,7 +56,7 @@
 				mes "Let us be off! Back to my";
 				mes "beautiful Ayotaya!";
 				close2;
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				warp "ayothaya",149,71;
 				end;
 			}
@@ -82,7 +82,7 @@
 	}
 }
 
-ayothaya,152,68,1	script	Aibakthing#ayo2	843,{
+ayothaya,152,68,1	script	Aibakthing#ayo2	4_M_THAIONGBAK,{
 	mes "[Aibakthing]";
 	mes "Hoo! Hah! Hmm! Hah!";
 	mes "So, how did you like Ayotaya? Did you get a chance to try Tom Yum Goong? When you're ready, I shall take you back home.";
@@ -104,8 +104,8 @@ ayothaya,152,68,1	script	Aibakthing#ayo2	843,{
 }
 
 // Generic Ayothaya NPCs
-//============================================================ 
-ayothaya,189,120,3	script	Young Man#Thang	843,{
+//============================================================
+ayothaya,189,120,3	script	Young Man#Thang	4_M_THAIONGBAK,{
 	mes "[Thang]";
 	mes "There's an ancient,";
 	mes "dreadful building in";
@@ -121,7 +121,7 @@ ayothaya,189,120,3	script	Young Man#Thang	843,{
 	close;
 }
 	
-ayothaya,171,152,5	script	Girl#Lalitha	838,{
+ayothaya,171,152,5	script	Girl#Lalitha	4_F_THAIAYO,{
 	set .@sit,rand(1,5);
 	if (.@sit > 0 && .@sit < 3) {
 		mes "[Lalitha]";
@@ -192,7 +192,7 @@ ayothaya,171,152,5	script	Girl#Lalitha	838,{
 	close;
 }
 	
-ayothaya,143,102,5	script	Old Man#ayothaya	842,{
+ayothaya,143,102,5	script	Old Man#ayothaya	4_M_THAIOLD,{
 	mes "[Villager]";
 	mes "Ummm.";
 	mes "Hmmmmm...";
@@ -237,7 +237,7 @@ ayothaya,143,102,5	script	Old Man#ayothaya	842,{
 	close;
 }
 	
-ayothaya,197,189,5	script	Young Man#1ayothaya	841,{
+ayothaya,197,189,5	script	Young Man#1ayothaya	4_M_THAIAYO,{
 	mes "[Kwan]";
 	mes "Phew, isn't it";
 	mes "soooo hot today?";
@@ -263,7 +263,7 @@ ayothaya,197,189,5	script	Young Man#1ayothaya	841,{
 	close;
 }
 	
-ayothaya,214,142,5	script	Young Man#5ayothaya	843,{
+ayothaya,214,142,5	script	Young Man#5ayothaya	4_M_THAIONGBAK,{
 	mes "[Detzi]";
 	mes "In Ayotaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong.";
 	next;
@@ -272,7 +272,7 @@ ayothaya,214,142,5	script	Young Man#5ayothaya	843,{
 	close;
 }
 	
-ayothaya,241,264,5	script	Young Man#5ayothaya2	843,{
+ayothaya,241,264,5	script	Young Man#5ayothaya2	4_M_THAIONGBAK,{
 	mes "[Eik]";
 	mes "Hey...";
 	mes "You look pretty strong";
@@ -296,14 +296,14 @@ ayothaya,241,264,5	script	Young Man#5ayothaya2	843,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 0.1 Added a Sailor NPC to get back to Alberta [ZoDIaC]
 //= 0.2 fixed coords, dialogues
-//= 0.3 Fixed Warp name, ayotaya doesn't exist, even though iRO 
-//= 	decided to call it Ayotaya, it really is Ayothaya, like 
-//=	that Yuno/Juno thing
+//= 0.3 Fixed Warp name, ayotaya doesn't exist, even though iRO
+//=     decided to call it Ayotaya, it really is Ayothaya, like
+//=     that Yuno/Juno thing
 //= 0.4 Added the official warp npc for Ayothaya. [MasterOfMuppets]
 //= 1.0 Added most of the official npcs. The following quests were added: [MasterOfMuppets]
 //=     Tom Yum Goong quest, Holy Threads quest and Holier threads quest.
@@ -314,4 +314,4 @@ ayothaya,241,264,5	script	Young Man#5ayothaya2	843,{
 //= 1.3 Removed Duplicates [Silent]
 //= 1.4 Moved quests to quests/quests_ayothaya.txt [Evera]
 //= 1.5 Moved a few NPC's to quests/quests_ayothaya.txt [MasterOfMuppets]
-//============================================================ 
+//============================================================
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 31d108710..f8a3f967f 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Comodo Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Comodo Town NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Not complete.
 //= 1.1 Rolled back from the wrong Kashy's fix
 //= Implemented the 'Cheese'/Stone of Awakening quest.  Re-organized stuff. [kobra_k88]
@@ -24,7 +24,7 @@
 
 // Inside Comodo
 //============================================================
-cmd_in02,73,81,4	script	Martine#cmd	48,{
+cmd_in02,73,81,4	script	Martine#cmd	1_M_02,{
 	mes "[Martine]";
 	mes "Gambling...? The games";
 	mes "provided here in the Comodo";
@@ -49,7 +49,7 @@ cmd_in02,73,81,4	script	Martine#cmd	48,{
 	close;
 }
 
-cmd_in02,48,55,4	script	Scoursege#cmd	51,{
+cmd_in02,48,55,4	script	Scoursege#cmd	1_M_BARD,{
 	mes "[Scoursege]";
 	mes "Damn it! Where did that";
 	mes "guy go? He promised me that";
@@ -65,7 +65,7 @@ cmd_in02,48,55,4	script	Scoursege#cmd	51,{
 	close;
 }
 
-cmd_in02,64,43,4	script	Roberto#cmd	709,{
+cmd_in02,64,43,4	script	Roberto#cmd	4_M_SEAMAN,{
 	mes "[Roberto]";
 	mes "Heh heh heh...";
 	mes "Whaaaat a gullible";
@@ -76,7 +76,7 @@ cmd_in02,64,43,4	script	Roberto#cmd	709,{
 	close;
 }
 
-cmd_in02,89,72,4	script	Deniroz#cmd	89,{
+cmd_in02,89,72,4	script	Deniroz#cmd	4_M_ORIENT02,{
 	mes "[Deniroz]";
 	mes "All I need is for this";
 	mes "little steel bead to fall";
@@ -94,7 +94,7 @@ cmd_in02,89,72,4	script	Deniroz#cmd	89,{
 	close;
 }
 
-cmd_in02,178,92,4	script	Shalone#cmd	101,{
+cmd_in02,178,92,4	script	Shalone#cmd	4W_F_01,{
 	mes "[Shalone]";
 	mes "Oh, I'm sorry, sir,";
 	mes "but it looks like you";
@@ -105,7 +105,7 @@ cmd_in02,178,92,4	script	Shalone#cmd	101,{
 	close;
 }
 
-cmd_in02,178,86,4	script	Stonae#cmd	98,{
+cmd_in02,178,86,4	script	Stonae#cmd	4W_M_02,{
 	mes "[Stonae]";
 	mes "N-no...";
 	mes "I lost again?!";
@@ -116,7 +116,7 @@ cmd_in02,178,86,4	script	Stonae#cmd	98,{
 	close;
 }
 
-cmd_in02,172,105,4	script	G . J#cmd	86,{
+cmd_in02,172,105,4	script	G . J#cmd	4_M_04,{
 	mes "[G . J]";
 	mes "The more I think about it,";
 	mes "it seems easier to become";
@@ -141,7 +141,7 @@ cmd_in02,172,105,4	script	G . J#cmd	86,{
 	close;
 }
 
-cmd_in02,174,126,4	script	Loyar#cmd	83,{
+cmd_in02,174,126,4	script	Loyar#cmd	4_M_01,{
 	mes "[Loyar]";
 	mes "Comodo Casino's interior";
 	mes "design is so pleasing to the";
@@ -197,7 +197,7 @@ cmd_in02,174,126,4	script	Loyar#cmd	83,{
 	}
 }
 
-cmd_in02,57,62,4	script	Moo#cmd	109,{
+cmd_in02,57,62,4	script	Moo#cmd	4_M_MANAGER,{
 	set mooz,rand(1,10);
 	if (mooz == 1) {
 		mes "[Moo]";
@@ -236,7 +236,7 @@ cmd_in02,57,62,4	script	Moo#cmd	109,{
 
 // Comodo Field
 //============================================================
-cmd_fild04,188,74,4	script	Zyosegirl#cmd	93,{
+cmd_fild04,188,74,4	script	Zyosegirl#cmd	4_F_04,{
 	mes "[Zyosegirl]";
 	mes "People call me the";
 	mes "Sea Lady because I'm";
@@ -254,7 +254,7 @@ cmd_fild04,188,74,4	script	Zyosegirl#cmd	93,{
 	close;
 }
 
-cmd_fild04,248,86,4	script	Ziyaol#cmd	709,{
+cmd_fild04,248,86,4	script	Ziyaol#cmd	4_M_SEAMAN,{
 	mes "[Ziyaol]";
 	mes "Ahhh, it's nice being";
 	mes "a fisherman. You just";
@@ -281,7 +281,7 @@ cmd_fild04,248,86,4	script	Ziyaol#cmd	709,{
 	close;
 }
 
-cmd_fild04,267,137,4	script	Daeguro#cmd	703,{
+cmd_fild04,267,137,4	script	Daeguro#cmd	4_F_KID2,{
 	mes "[Daeguro]";
 	mes "I love playing in";
 	mes "the sand-- it's so soft";
@@ -292,7 +292,7 @@ cmd_fild04,267,137,4	script	Daeguro#cmd	703,{
 	close;
 }
 
-cmd_fild07,192,58,4	script	Rahasu#cmd	100,{
+cmd_fild07,192,58,4	script	Rahasu#cmd	4W_SAILOR,{
 	mes "[Rahasu]";
 	mes "Hey, I'm Rahasu.";
 	mes "If you want to learn";
@@ -326,7 +326,7 @@ cmd_fild07,192,58,4	script	Rahasu#cmd	100,{
 	close;
 }
 
-cmd_fild07,52,280,4	script	Hallosu#cmd	100,{
+cmd_fild07,52,280,4	script	Hallosu#cmd	4W_SAILOR,{
 	mes "[Hallosu]";
 	mes "Hello, this is one of the";
 	mes "lighthouses that make up";
@@ -337,7 +337,7 @@ cmd_fild07,52,280,4	script	Hallosu#cmd	100,{
 	close;
 }
 
-cmd_fild07,299,83,4	script	Zain#cmd	100,{
+cmd_fild07,299,83,4	script	Zain#cmd	4W_SAILOR,{
 	set .@n$,"["+strnpcinfo(1)+"]";
 	mes .@n$;
 	mes "Would you like to";
@@ -349,12 +349,12 @@ cmd_fild07,299,83,4	script	Zain#cmd	100,{
 	switch(select("Alberta - 600 Zeny:Izlude - 800 Zeny:Cancel")) {
 	case 1:
 		if (Zeny < 600) break;
-		set zeny,zeny-600;
+		Zeny -= 600;
 		warp "alberta",192,169;
 		end;
 	case 2:
 		if (Zeny < 800) break;
-		set zeny,zeny-800;
+		Zeny -= 800;
 		if(checkre(0))
 			warp "izlude",195,212;
 		else
@@ -375,9 +375,9 @@ cmd_fild07,299,83,4	script	Zain#cmd	100,{
 	mes "zeny for the boarding fare.";
 	close;
 }
-cmd_fild07,94,134,4	duplicate(Zain#cmd)	Sarumane#cmd	100
+cmd_fild07,94,134,4	duplicate(Zain#cmd)	Sarumane#cmd	4W_SAILOR
 
-cmd_in02,146,180,4	script	Kafra Employee::kaf_comodo2	721,{
+cmd_in02,146,180,4	script	Kafra Employee::kaf_comodo2	4_F_KAFRA7,{
 	cutin "kafra_07",2;
 	mes "[Kafra Misty]";
 	mes "Welcome to the";
@@ -400,7 +400,7 @@ cmd_in02,146,180,4	script	Kafra Employee::kaf_comodo2	721,{
 
 // Morroc Field
 //============================================================
-moc_fild12,35,303,4	script	Serutero#cmd	59,{
+moc_fild12,35,303,4	script	Serutero#cmd	1_M_ORIENT01,{
 	mes "[Serutero]";
 	mes "Hello, I'm Serutero,";
 	mes "guardian of the roads that";
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index a4c969910..d3d853846 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Einbech Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Description: ========================================= 
+//===== Description: =========================================
 //=
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 0.1  Started writing Einbech npc's. [Muad_Dib]
 //= 0.1a Conversion to eA format [MasterOfMuppets]
 //= 0.1b Added missing tabs. [Mass Zero] 0.1c more missing tabs [Lupus]
@@ -16,7 +16,7 @@
 //= 1.0 Added the last of the town npcs, [MasterOfMuppets]
 //=     all credits to muad_dib for scripting them.
 //= 1.1 Made some changes according to the Shinokas quest, [MasterOfMuppets]
-//=	thanks to Dj-Yhn for scripting them.
+//=     thanks to Dj-Yhn for scripting them.
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Implemented the Lover's quest. [MasterOfMuppets]
 //= 1.4 Moved quests to quests/quests_ein.txt [Evera]
@@ -24,7 +24,7 @@
 //= 1.6 Replaced occurances of PcName. [L0ne_W0lf]
 //============================================================
 
-einbech,172,113,4	script	Nemuk#ein	855,{
+einbech,172,113,4	script	Nemuk#ein	4_M_EINMAN,{
 	mes "[Nemuk]";
 	mes "You seem to be an";
 	mes "outsider, so let me";
@@ -79,7 +79,7 @@ einbech,172,113,4	script	Nemuk#ein	855,{
 	}
 }
 
-einbech,197,139,4	script	Young Man#air2	855,{
+einbech,197,139,4	script	Young Man#air2	4_M_EINMAN,{
 	mes "[Heinz]";
 	mes "Wow...";
 	mes "An adventurer from";
@@ -114,7 +114,7 @@ einbech,197,139,4	script	Young Man#air2	855,{
 	close;
 }
 
-einbech,128,238,5	script	Mogan#ein	848,{
+einbech,128,238,5	script	Mogan#ein	4_M_EINMINER,{
 	mes "[Mogan]";
 	mes "Recently, there were a few";
 	mes "cave-ins where many miners";
@@ -139,7 +139,7 @@ einbech,128,238,5	script	Mogan#ein	848,{
 	close;
 }
 
-einbech,129,234,5	script	Hander#ein	848,{
+einbech,129,234,5	script	Hander#ein	4_M_EINMINER,{
 	mes "[Hander]";
 	mes "Those Einbroch bastards!";
 	mes "Living off the resources we";
@@ -163,7 +163,7 @@ einbech,129,234,5	script	Hander#ein	848,{
 	close;
 }
 
-einbech,105,218,5	script	Gushenmu#ein	848,{
+einbech,105,218,5	script	Gushenmu#ein	4_M_EINMINER,{
 	mes "[Gushenmu]";
 	mes "I've lived here a long time";
 	mes "and, believe it or not, things";
@@ -195,7 +195,7 @@ einbech,105,218,5	script	Gushenmu#ein	848,{
 	close;
 }
 
-einbech,39,215,5	script	Train Station Staff#ein3	852,{
+einbech,39,215,5	script	Train Station Staff#ein3	4_M_EIN_SOLDIER,{
 	mes "[Staff]";
 	mes "Welcome to";
 	mes "the Train Station.";
@@ -212,7 +212,7 @@ einbech,39,215,5	script	Train Station Staff#ein3	852,{
 			mes "we hope you enjoy";
 			mes "the ride. All aboard!";
 			close2;
-			set zeny,zeny-200;
+			Zeny -= 200;
 			warp "einbroch",226,276;
 			end;
 		}
@@ -233,7 +233,7 @@ einbech,39,215,5	script	Train Station Staff#ein3	852,{
 	}
 }
 
-einbech,157,215,3	script	Train Station Manager#ei	852,{
+einbech,157,215,3	script	Train Station Manager#ei	4_M_EIN_SOLDIER,{
 	mes "[Train Station Manager]";
 	mes "This train station";
 	mes "is strictly for trains";
@@ -243,7 +243,7 @@ einbech,157,215,3	script	Train Station Manager#ei	852,{
 	close;
 }
 
-einbech,151,168,3	script	Tollaf#ein	855,{
+einbech,151,168,3	script	Tollaf#ein	4_M_EINMAN,{
 	mes "[Tollaf]";
 	mes "Ah...!";
 	mes "This is killing me!";
@@ -260,7 +260,7 @@ einbech,151,168,3	script	Tollaf#ein	855,{
 	close;
 }
 
-einbech,93,139,5	script	Raust#ein	847,{
+einbech,93,139,5	script	Raust#ein	4_M_EINOLD,{
 	mes "[Raust]";
 	mes "I don't get it!";
 	mes "Einbroch gets bigger";
@@ -288,7 +288,7 @@ einbech,93,139,5	script	Raust#ein	847,{
 	close;
 }
 
-einbech,149,154,3	script	Mjunia#ein	850,{
+einbech,149,154,3	script	Mjunia#ein	4_F_EINWOMAN,{
 	mes "[Mjunia]";
 	mes "It's hard being a woman";
 	mes "in this town. By being born";
@@ -327,7 +327,7 @@ einbech,149,154,3	script	Mjunia#ein	850,{
 	close;
 }
 
-einbech,130,253,1	script	Ekuri#ein	848,{
+einbech,130,253,1	script	Ekuri#ein	4_M_EINMINER,{
 	mes "[Ekuri]";
 	mes "Yo-heave-ho!";
 	mes "Yo-heave-ho~!";
@@ -356,42 +356,42 @@ einbech,130,253,1	script	Ekuri#ein	848,{
 	close;
 }
 
-einbech,135,250,5	script	Bulletin Board#einbech11	858,{
+einbech,135,250,5	script	Bulletin Board#einbech11	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Mine Dungeon Entrance ";
 	mes " ";
 	close;
 }
 
-einbech,90,214,5	script	Bulletin Board#einbech22	858,{
+einbech,90,214,5	script	Bulletin Board#einbech22	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Train Station ";
 	mes " ";
 	close;
 }
 
-einbech,158,189,4	script	Bulletin Board#einbech33	858,{
+einbech,158,189,4	script	Bulletin Board#einbech33	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Freight Train Station ";
 	mes " ";
 	close;
 }
 
-einbech,180,136,5	script	Bulletin Board#einbech44	858,{
+einbech,180,136,5	script	Bulletin Board#einbech44	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Tool Shop ";
 	mes " ";
 	close;
 }
 
-einbech,133,114,5	script	Bulletin Board#einbech55	858,{
+einbech,133,114,5	script	Bulletin Board#einbech55	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Tavern ";
 	mes " ";
 	close;
 }
 
-einbech,77,105,5	script	Bulletin Board#einbech01	858,{
+einbech,77,105,5	script	Bulletin Board#einbech01	4_BULLETIN_BOARD2,{
 	mes "Welcome to 'Einbech'.";
 	next;
 	mes "East - Tavern, Tool Shop";
@@ -399,14 +399,14 @@ einbech,77,105,5	script	Bulletin Board#einbech01	858,{
 	close;
 }
 
-einbech,181,127,5	script	Bulletin Board#einbech03	858,{
+einbech,181,127,5	script	Bulletin Board#einbech03	4_BULLETIN_BOARD2,{
 	mes "Northwest - Train Station";
 	mes "South - Tavern";
 	mes "North - Tool Shop, Mine Dungeon";
 	close;
 }
 
-ein_in01,279,92,3	script	Tavern Lady#ein	854,{
+ein_in01,279,92,3	script	Tavern Lady#ein	4_M_EINMAN2,{
 	mes "[Tavern Lady]";
 	mes "Most Einbech men are";
 	mes "crude and primitive male";
@@ -430,7 +430,7 @@ ein_in01,279,92,3	script	Tavern Lady#ein	854,{
 	close;
 }
 	
-ein_in01,277,95,7	script	Ryan Danger#air#einbech	855,{
+ein_in01,277,95,7	script	Ryan Danger#air#einbech	4_M_EINMAN,{
 	mes "[R.D. Kim]";
 	mes "Oooh...";
 	next;
@@ -482,7 +482,7 @@ ein_in01,277,95,7	script	Ryan Danger#air#einbech	855,{
 	close;
 }
 	
-ein_in01,281,85,3	script	Drunken Man#einbech	849,{
+ein_in01,281,85,3	script	Drunken Man#einbech	4_M_DIEMAN,{
 	mes "[Drunken Man]";
 	mes "...^333333*Hiccup*^000000...";
 	mes "^333333*Hiccup*^000000...";
@@ -493,7 +493,7 @@ ein_in01,281,85,3	script	Drunken Man#einbech	849,{
 	close;
 }
 
-einbech,46,107,6	script	Shena#ein::EinMonsters	846,{
+einbech,46,107,6	script	Shena#ein::EinMonsters	4_F_EINOLD,{
 	mes "[Shena]";
 	mes "I think it's weird!";
 	mes "How do you youngsters";
@@ -741,9 +741,9 @@ einbech,46,107,6	script	Shena#ein::EinMonsters	846,{
 	}
 }
 	
-einbech,48,107,4	duplicate(EinMonsters)	Luda#ein	850,{
+einbech,48,107,4	duplicate(EinMonsters)	Luda#ein	4_F_EINWOMAN,{
 
-einbech,148,242,5	script	Jung#ein	855,{
+einbech,148,242,5	script	Jung#ein	4_M_EINMAN,{
 	mes "[Jung]";
 	mes "I'm one of the few";
 	mes "people who's lived";
@@ -878,7 +878,7 @@ einbech,148,242,5	script	Jung#ein	855,{
 	}
 }
 
-einbech,148,246,5	script	Franz#ein	851,{
+einbech,148,246,5	script	Franz#ein	4_M_REPAIR,{
 	mes "[Franz]";
 	mes "So bored...";
 	mes "Starving for...";
@@ -987,7 +987,7 @@ einbech,148,246,5	script	Franz#ein	851,{
 			mes "Now those aggressive teddy";
 			mes "bears are scattered all over";
 			mes "the place and the government";
-			mes "	has classified them as monsters. Kill with extreme prejudice!";
+			mes "has classified them as monsters. Kill with extreme prejudice!";
 			next;
 			mes "[Franz]";
 			mes "According to adventurers";
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index 27f561007..714b0bde6 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -1,26 +1,26 @@
 //===== Hercules Script ======================================
 //= Einbroch Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Everybody mentioned in the comments
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.7
-//===== Description: ========================================= 
+//===== Description: =========================================
 //=
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 0.2 Added some NPCs [MasterOfMuppets]
 //= 0.3 Added a few npcs by reddozen [MasterOfMuppets]
 //= 0.4 Added a crappy quest, have fun guys... [MasterOfMuppets]
 //= 0.4a Added exp bonus for the factory quest, borrowed from a Korean fansite.
 //= 0.4b Added missing close [Komurka]
 //= 0.5 Added Temporal Locations of Gunslinger Job Change map.
-//=	Info provided by RockmanEXE [erKURITA]
+//=     Info provided by RockmanEXE [erKURITA]
 //= 0.6 Implemented a crap quest [MasterOfMuppets]
 //= 0.7 Implemented an inn NPC [MasterOfMuppets]
 //= 0.8 Implemented the Shinokas quest, thanks to [MasterOfMuppets]
-//= 	Dj-Yhn for scripting it.
+//=      Dj-Yhn for scripting it.
 //= 0.9 Removed Duplicates [Silent]
 //= 1.0 Implemented the Lover's quest. [MasterOfMuppets]
-//= 1.1	Split quests into quests/cities_einbroch.txt [Evera]
+//= 1.1 Split quests into quests/cities_einbroch.txt [Evera]
 //= 1.2 Split more quests into above file [Evera]
 //= 1.3 Added (finally) the Garrison quest npc [erKURITA]
 //= 1.4 Implemented the polution script. [MasterOfMuppets]
@@ -30,12 +30,12 @@
 //= 1.8 Fixed Occurances of PcName. [L0ne_W0lf]
 //============================================================
 
-einbroch,218,198,5	script	Mark#ein	855,{
+einbroch,218,198,5	script	Mark#ein	4_M_EINMAN,{
 	callfunc "EinTower","Mark";
 	end;
 }
 
-einbroch,175,196,5	script	Morei#ein	854,{
+einbroch,175,196,5	script	Morei#ein	4_M_EINMAN2,{
 	mes "[Morei]";
 	mes "Greetings,";
 	mes "I am Morei,";
@@ -79,11 +79,11 @@ einbroch,175,196,5	script	Morei#ein	854,{
 	}
 }
 
-einbroch,173,229,5	script	Oberu#ein	855,{
+einbroch,173,229,5	script	Oberu#ein	4_M_EINMAN,{
 	callfunc "EinTower","Oberu";
 	end;
 }
-einbroch,176,172,5	script	Khemko#ein	855,{
+einbroch,176,172,5	script	Khemko#ein	4_M_EINMAN,{
 	callfunc "EinTower","Khemko";
 	end;
 }
@@ -128,7 +128,7 @@ function	script	EinTower	{
 			mes "using our services.";
 			mes "Let me guide you to";
 			mes "the tower right away.";
-			set zeny,zeny-10;
+			Zeny -= 10;
 			close2;
 			warp "einbroch",181,196;
 			end;
@@ -155,7 +155,7 @@ function	script	EinTower	{
 				mes "using our services.";
 				mes "Let me guide you to";
 				mes "the tower right away.";
-				set zeny,zeny-20;
+				Zeny -= 20;
 				getitem 512,1; //Apple
 				close2;
 				warp "einbroch",174,204;
@@ -179,7 +179,7 @@ function	script	EinTower	{
 	}
 }
 
-einbroch,232,272,3	script	Train Station Staff#ein1::EinbrochTrain	852,{
+einbroch,232,272,3	script	Train Station Staff#ein1::EinbrochTrain	4_M_EIN_SOLDIER,{
 	mes "[Staff]";
 	mes "Welcome to";
 	mes "the Train Station.";
@@ -203,7 +203,7 @@ einbroch,232,272,3	script	Train Station Staff#ein1::EinbrochTrain	852,{
 			mes "Have a safe trip.";
 			mes "^333333*Ahem*^000000 All aboard!";
 			close2;
-			set zeny,zeny-200;
+			Zeny -= 200;
 			warp "einbech",43,215;
 			end;
 		}
@@ -238,9 +238,9 @@ einbroch,232,272,3	script	Train Station Staff#ein1::EinbrochTrain	852,{
 	}
 }
 	
-einbroch,252,301,3	duplicate(EinbrochTrain)	Train Station Staff#ein2	852
+einbroch,252,301,3	duplicate(EinbrochTrain)	Train Station Staff#ein2	4_M_EIN_SOLDIER
 
-einbroch,259,326,3	script	Leslie#ein_1	846,{
+einbroch,259,326,3	script	Leslie#ein_1	4_F_EINOLD,{
 	mes "[Leslie]";
 	mes "^666666*Cough cough!*^000000";
 	mes "Laaaand sakes!";
@@ -262,7 +262,7 @@ einbroch,259,326,3	script	Leslie#ein_1	846,{
 	close;
 }
 
-einbroch,236,191,3	script	Tan#ein	855,{
+einbroch,236,191,3	script	Tan#ein	4_M_EINMAN,{
 	mes "[Tan]";
 	mes "All the factories";
 	mes "here in Einbroch are";
@@ -286,7 +286,7 @@ einbroch,236,191,3	script	Tan#ein	855,{
 	close;
 }
 	
-einbroch,228,121,5	script	Little Toby#ein-1	855,{
+einbroch,228,121,5	script	Little Toby#ein-1	4_M_EINMAN,{
 	mes "[Little Toby]";
 	mes "Excuse me...";
 	mes "But I'm lost!";
@@ -309,7 +309,7 @@ einbroch,228,121,5	script	Little Toby#ein-1	855,{
 	close;
 }
 
-einbroch,40,116,1	script	Airship Engineer#ein-1	855,{
+einbroch,40,116,1	script	Airship Engineer#ein-1	4_M_EINMAN,{
 	mes "[Airship Engineer]";
 	mes "H-hey! Don't";
 	mes "touch my precious";
@@ -373,7 +373,7 @@ einbroch,40,116,1	script	Airship Engineer#ein-1	855,{
 	}
 }
 
-einbroch,294,312,3	script	Centzu#ein	854,{
+einbroch,294,312,3	script	Centzu#ein	4_M_EINMAN2,{
 	mes "[Centzu]";
 	mes "I've lived here for";
 	mes "a long time and I see";
@@ -398,7 +398,7 @@ einbroch,294,312,3	script	Centzu#ein	854,{
 	close;
 }
 
-einbroch,232,255,5	script	Khowropher#ein	847,{
+einbroch,232,255,5	script	Khowropher#ein	4_M_EINOLD,{
 	mes "[Khowropher]";
 	mes "^666666*Cough cough*^000000";
 	mes "Jiminy! The air here";
@@ -423,7 +423,7 @@ einbroch,232,255,5	script	Khowropher#ein	847,{
 	close;
 }
 
-einbroch,143,109,5	script	Khetine#ein	855,{
+einbroch,143,109,5	script	Khetine#ein	4_M_EINMAN,{
 	mes "[Khetine]";
 	mes "Lately, there's been";
 	mes "talk about this empty";
@@ -441,7 +441,7 @@ einbroch,143,109,5	script	Khetine#ein	855,{
 	close;
 }
 
-einbroch,229,149,3	script	Sleik#ein	854,{
+einbroch,229,149,3	script	Sleik#ein	4_M_EINMAN2,{
 	mes "[Sleik]";
 	mes "Surprisingly, we have";
 	mes "a Train Station that everyone";
@@ -459,7 +459,7 @@ einbroch,229,149,3	script	Sleik#ein	854,{
 	close;
 }
 
-airport,174,41,6	script	Young Man#air	99,{
+airport,174,41,6	script	Young Man#air	4W_M_03,{
 	mes "[Runnan]";
 	mes "...And that's why";
 	mes "I travel around the";
@@ -478,7 +478,7 @@ airport,174,41,6	script	Young Man#air	99,{
 	close;
 }
 
-airport,176,41,4	script	Old Man#air	88,{
+airport,176,41,4	script	Old Man#air	4_M_ORIENT01,{
 	mes "[Zhen Lan]";
 	mes "Now, I hear that the";
 	mes "monsters around here";
@@ -508,7 +508,7 @@ airport,176,41,4	script	Old Man#air	88,{
 	close;
 }
 
-ein_in01,113,211,3	script	Teinz#ein	851,{
+ein_in01,113,211,3	script	Teinz#ein	4_M_REPAIR,{
 	mes "[Teinz]";
 	mes "If you just pay me money,";
 	mes "I'll be your slave! There's";
@@ -525,7 +525,7 @@ ein_in01,113,211,3	script	Teinz#ein	851,{
 	close;
 }
 
-ein_in01,48,220,5	script	Lowe#ein	851,{
+ein_in01,48,220,5	script	Lowe#ein	4_M_REPAIR,{
 	mes "[Lowe]";
 	mes "...";
 	mes "......";
@@ -552,7 +552,7 @@ ein_in01,48,220,5	script	Lowe#ein	851,{
 	close;
 }
 
-ein_in01,87,237,5	script	Dinje#ein	850,{
+ein_in01,87,237,5	script	Dinje#ein	4_F_EINWOMAN,{
 	mes "[Dinje]";
 	mes "Do you know why a woman";
 	mes "like me has to work in this";
@@ -580,7 +580,7 @@ ein_in01,87,237,5	script	Dinje#ein	850,{
 	close;
 }
 
-ein_in01,84,218,3	script	Tsuen#ein	851,{
+ein_in01,84,218,3	script	Tsuen#ein	4_M_REPAIR,{
 	mes "[Tsuen]";
 	mes "There was a time";
 	mes "when I dreamed of";
@@ -613,7 +613,7 @@ ein_in01,84,218,3	script	Tsuen#ein	851,{
 	close;
 }
 
-ein_in01,103,239,1	script	Gesin#ein	849,{
+ein_in01,103,239,1	script	Gesin#ein	4_M_DIEMAN,{
 	mes "[Gesin]";
 	mes "Arrrgh!";
 	mes "This is killing me!";
@@ -644,7 +644,7 @@ ein_in01,103,239,1	script	Gesin#ein	849,{
 	close;
 }
 
-ein_in01,33,275,1	script	Pevtatin#ein	848,{
+ein_in01,33,275,1	script	Pevtatin#ein	4_M_EINMINER,{
 	mes "[Pevtatin]";
 	mes "Good god!";
 	mes "I'm so stressed!";
@@ -666,7 +666,7 @@ ein_in01,33,275,1	script	Pevtatin#ein	848,{
 	close;
 }
 
-ein_in01,36,204,3	script	Rombell#ein	851,{
+ein_in01,36,204,3	script	Rombell#ein	4_M_REPAIR,{
 	mes "[Rombell]";
 	mes "It's great that the";
 	mes "factory is making good";
@@ -692,7 +692,7 @@ ein_in01,36,204,3	script	Rombell#ein	851,{
 	close;
 }
 
-ein_in01,64,271,3	script	Vonstein#ein	855,{
+ein_in01,64,271,3	script	Vonstein#ein	4_M_EINMAN,{
 	mes "[Vonstein]";
 	mes "Staring at this";
 	mes "bubbling hot liquid";
@@ -709,7 +709,7 @@ ein_in01,64,271,3	script	Vonstein#ein	855,{
 	close;
 }
 
-ein_in01,49,202,3	script	Dorf#ein	851,{
+ein_in01,49,202,3	script	Dorf#ein	4_M_REPAIR,{
 	mes "[Dorf]";
 	mes "Machines are sooo";
 	mes "convenient. Just look";
@@ -732,7 +732,7 @@ ein_in01,49,202,3	script	Dorf#ein	851,{
 	close;
 }
 
-ein_in01,68,209,5	script	Khashurantze#ein	852,{
+ein_in01,68,209,5	script	Khashurantze#ein	4_M_EIN_SOLDIER,{
 	mes "[Khashurantze]";
 	mes "I'm sorry, but you need";
 	mes "special authority in order";
@@ -743,7 +743,7 @@ ein_in01,68,209,5	script	Khashurantze#ein	852,{
 	end;
 }
 
-ein_in01,85,261,3	script	Zherin#ein	851,{
+ein_in01,85,261,3	script	Zherin#ein	4_M_REPAIR,{
 	mes "[Zherin]";
 	mes "I'm in charge of this";
 	mes "blast furnace which";
@@ -767,7 +767,7 @@ ein_in01,85,261,3	script	Zherin#ein	851,{
 	close;
 }
 
-ein_in01,43,252,3	script	Canphotii#ein	852,{
+ein_in01,43,252,3	script	Canphotii#ein	4_M_EIN_SOLDIER,{
 	mes "[Canphotii]";
 	mes "Hustle, hustle!";
 	mes "Pick up the pace!";
@@ -791,7 +791,7 @@ ein_in01,43,252,3	script	Canphotii#ein	852,{
 	close;
 }
 
-ein_in01,206,224,3	script	Hotel Employee#ein	855,{
+ein_in01,206,224,3	script	Hotel Employee#ein	4_M_EINMAN,{
 	mes "[Hotel Employee]";
 	mes "Good day, welcome to the";
 	mes "Einbroch Hotel. The staff is";
@@ -834,7 +834,7 @@ ein_in01,206,224,3	script	Hotel Employee#ein	855,{
 				mes "Please enjoy";
 				mes "your rest~";
 				close2;
-				set zeny,zeny-5000;
+				Zeny -= 5000;
 				percentheal 100,100;
 				warp "ein_in01",272,167;
 				end;
@@ -860,56 +860,56 @@ ein_in01,206,224,3	script	Hotel Employee#ein	855,{
 	close;
 }
 
-einbroch,244,255,5	script	Bulletin Board#ein1	858,{
+einbroch,244,255,5	script	Bulletin Board#ein1	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Train Station ";
 	mes " ";
 	close;
 }
 
-einbroch,253,203,5	script	Bulletin Board#ein2	858,{
+einbroch,253,203,5	script	Bulletin Board#ein2	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Hotel ";
 	mes " ";
 	close;
 }
 
-einbroch,68,206,5	script	Bulletin Board#ein3	858,{
+einbroch,68,206,5	script	Bulletin Board#ein3	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Airship Airport ";
 	mes " ";
 	close;
 }
 
-einbroch,90,84,5	script	Bulletin Board#ein4	858,{
+einbroch,90,84,5	script	Bulletin Board#ein4	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Laboratory ";
 	mes " ";
 	close;
 }
 
-einbroch,101,106,5	script	Bulletin Board#ein5	858,{
+einbroch,101,106,5	script	Bulletin Board#ein5	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Airship Repair Shop ";
 	mes " ";
 	close;
 }
 
-einbroch,220,208,5	script	Bulletin Board#ein6	858,{
+einbroch,220,208,5	script	Bulletin Board#ein6	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Weapon Shop ";
 	mes " ";
 	close;
 }
 
-einbroch,132,76,5	script	Bulletin Board#ein7	858,{
+einbroch,132,76,5	script	Bulletin Board#ein7	4_BULLETIN_BOARD2,{
 	mes " ";
 	mes " Factory ";
 	mes " ";
 	close;
 }
 
-einbroch,152,46,5	script	Bulletin Board#ein11	858,{
+einbroch,152,46,5	script	Bulletin Board#ein11	4_BULLETIN_BOARD2,{
 	mes "West - Laboratory, Airship Repair Shop";
 	mes "South - Einbroch Front Gate";
 	mes "North - Airport";
@@ -917,14 +917,14 @@ einbroch,152,46,5	script	Bulletin Board#ein11	858,{
 	close;
 }
 
-einbroch,235,141,5	script	Bulletin Board#ein22	858,{
+einbroch,235,141,5	script	Bulletin Board#ein22	4_BULLETIN_BOARD2,{
 	mes "Southwest - Airship Repair Shop, Laboratory";
 	mes "Northwest - Airport";
 	mes "North - Weapon Shop, Hotel, Train Station";
 	close;
 }
 
-einbroch,162,256,5	script	Bulletin Board#ein33	858,{
+einbroch,162,256,5	script	Bulletin Board#ein33	4_BULLETIN_BOARD2,{
 	mes "East - Train Station";
 	mes "Southeast - Hotel";
 	mes "South - Weapon Shop,Factory";
@@ -932,7 +932,7 @@ einbroch,162,256,5	script	Bulletin Board#ein33	858,{
 	close;
 }
 
-einbroch,183,174,5	script	Bulletin Board#ein44	858,{
+einbroch,183,174,5	script	Bulletin Board#ein44	4_BULLETIN_BOARD2,{
 	mes "East - Weapon Shop, Hotel";
 	mes "South - Factory";
 	mes "Southwest - Airship Repair Shop, Laboratory";
@@ -940,14 +940,14 @@ einbroch,183,174,5	script	Bulletin Board#ein44	858,{
 	close;
 }
 
-einbroch,104,202,5	script	Bulletin Board#ein55	858,{
+einbroch,104,202,5	script	Bulletin Board#ein55	4_BULLETIN_BOARD2,{
 	mes "Northeast - Train Station";
 	mes "East - Weapon Shop,Hotel";
 	mes "South - Airship Repair Shop, Laboratory";
 	close;
 }
 
-ein_in01,31,217,3	script	Cendadt#ein	851,{
+ein_in01,31,217,3	script	Cendadt#ein	4_M_REPAIR,{
 	mes "[Cendadt]";
 	mes "This factory has a lot";
 	mes "of things that need fixing,";
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index bc337bf3c..16702126f 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -1,15 +1,15 @@
 //===== Hercules Script ======================================
 //= Geffen Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Everybody mentioned in the comments
-//===== Current Version: ===================================== 
-//= 1.9
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 2.0
+//===== Description: =========================================
+//= [Official Conversion]
 //= Geffen Town NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
-//= 1.1 - Spell Checked [massdriller]
+//= 1.1 Spell Checked [massdriller]
 //= 1.2 Fixed more typos [Nexon]
 //= 1.3 added a Level 4 weapon quest related NPC [MasterOfMuppets]
 //= 1.4 Removed Duplicates [Silent]
@@ -20,9 +20,10 @@
 //= 1.7 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.8 Fixed character's name and swapped gender dialogues [Lupus]
 //= 1.9 Replaced effect numerics with constants. [Samuray22]
+//= 2.0 Bug fixes (bugreport:7928) [DeadlySilence]
 //============================================================
 
-geffen,59,143,0	script	Meera	91,{
+geffen,59,143,0	script	Meera	4_F_02,{
 	mes "[Meera]";
 	mes "Welcome to Geffen,";
 	mes "the City of Magic!";
@@ -45,7 +46,7 @@ geffen,59,143,0	script	Meera	91,{
 	close;
 }
 
-geffen,156,190,0	script	Orwalk	82,{
+geffen,156,190,0	script	Orwalk	4_KID01,{
 	mes "[Orwalk]";
 	mes "...Interesting.";
 	mes "Most intriguing.";
@@ -63,7 +64,7 @@ geffen,156,190,0	script	Orwalk	82,{
 	close;
 }
 
-geffen_in,164,109,0	script	Wizard Stanza	64,{
+geffen_in,164,109,0	script	Wizard Stanza	1_M_WIZARD,{
 	mes "[Stanza]";
 	mes "I sense the presence of a mighty spirit. Can it be you...?";
 	next;
@@ -76,7 +77,7 @@ geffen_in,164,109,0	script	Wizard Stanza	64,{
 	}
 	else if (Class == Job_Novice)
 		mes "Although you may not be able to use magic or any other kind of powerful skills for now, this knowledge may be helpful in the future, young Novice...";
-	else 
+	else
 		mes "Although you are not formally trained in the use of magic, you use skills which draw upon otherworldly energies, whether you know it or not...";
 	next;
 	mes "[Stanza]";
@@ -91,7 +92,7 @@ geffen_in,164,109,0	script	Wizard Stanza	64,{
 	close;
 }
 
-geffen,147,26,0	script	Ralphie	97,{
+geffen,147,26,0	script	Ralphie	4W_M_01,{
 	mes "[Ralphie]";
 	mes "Somewhere in this world, there is a rare Staff which can transform psychic energy into physical force, endowing its owner with ^990000destructive power^000000...";
 	next;
@@ -99,7 +100,7 @@ geffen,147,26,0	script	Ralphie	97,{
 	mes "With that, anyone could be as strong as Hercules... Even a weakling like me! Hahahahahah,";
 	mes "I must have it!";
 	next;
-	Emotion e_gasp;
+	emotion e_gasp;
 	mes "[Ralphie]";
 	mes "...Good Heavens!";
 	mes "Since when were";
@@ -121,14 +122,14 @@ geffen,147,26,0	script	Ralphie	97,{
 	close;
 }
 
-geffen,111,48,0	script	Stacey	101,{
+geffen,111,48,0	script	Stacey	4W_F_01,{
 	if (getequipid(1) == 2299) {
 		mes "[Stacey]";
 		mes "Oh...!";
 		mes "Is that an Orc Helm you're wearing?! That's so cool! Wow...";
 		next;
 		mes "[Stacey]";
-		if (sex) {
+		if (Sex) {
 			mes "You look so...";
 			mes "Rugged and manly~";
 		}
@@ -149,11 +150,11 @@ geffen,111,48,0	script	Stacey	101,{
 		mes "of Orc Hero!";
 		next;
 		mes "[Stacey]";
-		if (sex) {
+		if (Sex) {
 			mes "It's...";
 			mes "It's like you're surrounded by this incredibly masculine aura! Oooh~! You must be irresistable to all the girls!";
 			next;
-			Emotion e_lv;
+			emotion e_lv;
 			mes "[Stacey]";
 			mes "And I'm no exception.";
 		}
@@ -181,7 +182,7 @@ geffen,111,48,0	script	Stacey	101,{
 	}
 }
 	
-geffen_in,34,170,0	script	Theodore	47,{
+geffen_in,34,170,0	script	Theodore	1_M_01,{
 	mes "[Theodore]";
 	mes "Hello!";
 	mes "Isn't it a";
@@ -213,7 +214,7 @@ geffen_in,34,170,0	script	Theodore	47,{
 	close;
 }
 
-geffen,146,148,4	script	Suspicious Guy	99,6,6,{
+geffen,146,148,4	script	Suspicious Guy	4W_M_03,6,6,{
 	end;
 
 OnTouch:
@@ -223,7 +224,7 @@ OnTouch:
 	mes "You wanna get your hands on some great stuff? Come on over!^000000";
 	next;
 	mes "[Suspicious Guy]";
-	if (sex)
+	if (Sex)
 		mes "Hey there tough guy. You look smart enough to recognize a bargain when it's right in front of your eyes.";
 	else
 		mes "Well, well, well. Aren't you a pretty girl. Today just happens to be your lucky day!";
@@ -258,7 +259,7 @@ OnTouch:
 			input .@input;
 			if (.@input == 0) {
 				mes "[Suspicious Guy]";
-				if (sex)
+				if (Sex)
 					mes "Ah duuuuuude~ You're breakin' my heart! I mean, at these prices, I'm practically performing charity!";
 				else
 					mes "W-waaaait! You didn't let me tell you the part about how Red Potions help you lose and gain weight in all the right places! Waaaaait!";
@@ -285,12 +286,12 @@ OnTouch:
 			mes "^333333Now I gotta find some other sucker to dump this junk on!^000000 *Ahem* I mean, come again!";
 			close;
 		}
-		set zeny,zeny-.@Red_potion_hap;
+		Zeny -= .@Red_potion_hap;
 		getitem 501,.@input; //Red_Potion
 		break;
 	case 2:
 		mes "[Suspicious Guy]";
-		if (sex) {
+		if (Sex) {
 			mes "What would a strong guy like you want a knife for? Those will just break under the force of your incredibly powerful swings!";
 			next;
 			mes "[Suspicious Guy]";
@@ -350,12 +351,12 @@ OnTouch:
 			mes "When the greatest deal in your life is right before your eyes?! Tragic, truly tragic...";
 			close;
 		}
-		set zeny,zeny-.@Main_gauche_hap;
+		Zeny -= .@Main_gauche_hap;
 		getitem 1207,.@input; //Main_Gauche
 		break;
 	case 3:
 		mes "[Suspicious Guy]";
-		if (sex)
+		if (Sex)
 			mes "A Manteau? That's old news! You know what's the latest in protective armors?";
 		else
 			mes "Now why would such a beautiful woman wear something out of style? You know what would make you look even better?";
@@ -396,13 +397,13 @@ OnTouch:
 				break;
 		}
 		set .@Hood__hap,.@input * 930;
-		if (zeny < .@Hood__hap) {
+		if (Zeny < .@Hood__hap) {
 			mes "[Suspicious Guy]";
 			mes "Oh nuts...";
 			mes "Short on zeny, eh?";
 			close;
 		}
-		set zeny,zeny-.@Hood__hap;
+		Zeny -= .@Hood__hap;
 		getitem 2501,.@input; //Hood
 		break;
 	case 4:
@@ -422,7 +423,7 @@ OnTouch:
 	close;
 }
 
-geffen_in,22,125,1	script	Crumpler	52,{
+geffen_in,22,125,1	script	Crumpler	1_M_HOF,{
 	mes "[Crumpler]";
 	mes "Ooooh~!";
 	mes "You sure are dressed pretty,";
@@ -457,7 +458,7 @@ geffen_in,22,125,1	script	Crumpler	52,{
 			mes "[Crumpler]";
 			mes "Ooooooooh";
 			mes "crraaaap!";
-			Emotion e_gasp;
+			emotion e_gasp;
 			next;
 			mes "[Crumpler]";
 			mes "Help meeeee!";
@@ -495,7 +496,7 @@ geffen_in,22,125,1	script	Crumpler	52,{
 		mes "[Crumpler]";
 		mes "A...";
 		mes "Sage?";
-		Emotion e_What;
+		emotion e_what;
 		next;
 		mes "[Crumpler]";
 		mes "I don't know what that is. But I guess it can't be half as bad as a Mage.";
@@ -520,7 +521,7 @@ geffen_in,22,125,1	script	Crumpler	52,{
 	}
 }
 
-geffen_in,59,61,1	script	Skyler	61,{
+geffen_in,59,61,1	script	Skyler	1_M_PUBMASTER,{
 	mes "[Skyler]";
 	mes "Hello hello.";
 	mes "You're not looking";
@@ -545,7 +546,7 @@ geffen_in,59,61,1	script	Skyler	61,{
 	close;
 }
 
-geffen_in,27,134,5	script	Waitress#elen	91,{
+geffen_in,27,134,5	script	Waitress#elen	4_F_02,{
 	mes "[Elenore]";
 	mes "This place...";
 	mes "Certainly has";
@@ -609,7 +610,7 @@ geffen_in,27,134,5	script	Waitress#elen	91,{
 		mes "I hear there's this person somewhere in Rune-Midgard...";
 		next;
 		mes "[Elenore]";
-		if (sex)
+		if (Sex)
 			mes "Tell me, have you ever heard of "+strcharinfo(0)+"? He's supposed to be the suavest hero around!";
 		else
 			mes "Have you ever heard of "+strcharinfo(0)+"? People say she's one of the prettiest girls in all of Rune-Midgard!";
@@ -649,7 +650,7 @@ geffen_in,27,134,5	script	Waitress#elen	91,{
 			mes "^990000Hey you sex crazed bastard!! Stop looking at my daughter like that before I rip out your eyes, and eat them with pasta!^000000";
 			next;
 			mes "["+strcharinfo(0)+"]";
-			if (sex) {
+			if (Sex) {
 				mes "Huh...?";
 				mes "C-come again?";
 				next;
@@ -684,7 +685,7 @@ geffen_in,27,134,5	script	Waitress#elen	91,{
 	close;
 }
 
-geffen_in,70,67,3	script	Waitress#elise	90,{
+geffen_in,70,67,3	script	Waitress#elise	4_F_01,{
 	mes "[Elisa]";
 	mes "Hello there~";
 	mes "Can I help you";
@@ -765,7 +766,7 @@ geffen_in,70,67,3	script	Waitress#elise	90,{
 			mes "^990000Stay away from my daughter, or I'll beat your brains out, punk! Elisa's gonna marry a doctor! Or a lawyer!^000000";
 			next;
 			mes "["+strcharinfo(0)+"]";
-			if (sex) {
+			if (Sex) {
 				mes "Y-y-y-yes, sir!";
 				next;
 				mes "^3355FFThat was scary...!";
@@ -805,7 +806,7 @@ geffen_in,70,67,3	script	Waitress#elise	90,{
 	close;
 }
 
-geffen_in,79,76,2	script	Merchant Daven	120,{
+geffen_in,79,76,2	script	Merchant Daven	2_M_PHARMACIST,{
 	mes "[Merchant Daven]";
 	mes "I remember Geffen";
 	mes "back when it was boring. ";
@@ -872,7 +873,7 @@ geffen_in,79,76,2	script	Merchant Daven	120,{
 	close;
 }
 	
-geffen_in,114,73,5	script	Hadenheim	709,{
+geffen_in,114,73,5	script	Hadenheim	4_M_SEAMAN,{
 	mes "[Hans Hadenheim]";
 	mes "Man, the Rune-Midgard continent sure is big! How's it going, youngster?";
 	next;
@@ -918,7 +919,7 @@ geffen_in,114,73,5	script	Hadenheim	709,{
 	close;
 }
 
-geffen_in,39,127,2	script	Psychic Advisor	704,{
+geffen_in,39,127,2	script	Psychic Advisor	4_M_BIBI,{
 	mes "[Psychic Advisor]";
 	mes "Ah...";
 	mes "Don't tell me! You've come to have your fortune told, yes? I know,";
@@ -1036,7 +1037,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 			break;
 		case 3:
 			mes "Um...";
-			if (sex)
+			if (Sex)
 				mes "The girl that you";
 			else
 				mes "The boy that you";
@@ -1053,8 +1054,8 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 				mes "[Psychic Advisor]";
 				mes "You didn't let me finish my sentence. What I meant to say was...";
 				next;
-				mes "[Psychic Advisor]"				;
-				if (sex)
+				mes "[Psychic Advisor]";
+				if (Sex)
 					mes "The girl that you";
 				else
 					mes "The boy that you";
@@ -1073,7 +1074,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 				mes "Sometimes, I get the future and the present mixed up. You know, since I'm always looking into the future...?";
 				next;
 				mes "[Psychic Advisor]";
-				if (sex) {
+				if (Sex) {
 					mes "What I meant to say was";
 					mes "^3355FFyou and the perfect woman will soon fall in love^000000. Yes, that's what I meant!";
 				}
@@ -1202,6 +1203,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 		mes "Well, in any case, concentrating on your studies is tough, but it can be rewarding. I hope you do well in whatever you choose to do~";
 		close;
 	case 5:
+		mes "[Psychic Advisor]";
 		mes "The future? I thought it was implied that any fortune I tell you is about the future in the specific field that you choose.";
 		next;
 		mes "[Psychic Advisor]";
@@ -1263,6 +1265,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 		mes "That's my prediction. Can you really argue with the wisdom of the spirit world?";
 		close;
 	case 6:
+		mes "[Psychic Advisor]";
 		mes "Fashion...?";
 		mes "What does that have to do with matters of the supernatural? Well, um, let me contact the spirits. Ah! Here we go...";
 		next;
@@ -1333,7 +1336,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 	}
 }
 	
-geffen_in,109,72,2	script	Monster Scholar	90,{
+geffen_in,109,72,2	script	Monster Scholar	4_F_01,{
 	mes "[Estheres]";
 	mes "Hello, I'm the resident expert of Monsterology here in Geffen. Is there anything in particular that you're curious about?";
 	next;
@@ -1348,7 +1351,7 @@ geffen_in,109,72,2	script	Monster Scholar	90,{
 		mes "[Estheres]";
 		if (BaseLevel > 40)
 			mes "You look strong enough for that kind of challenge. But if you see anyone more reckless cross the Western bridge, you might want to give them a warning.";
-		else 
+		else
 			mes "Um, but if you're planning to go there, you better not go alone. I really recommend that you be well prepared if you're gonna fight those kinds of monsters.";
 		break;
 	case 2:
@@ -1401,7 +1404,7 @@ geffen_in,109,72,2	script	Monster Scholar	90,{
 
 // Lvl 4 weapon quest related NPC ------------------------------------------------------
 
-geffen,203,146,5	script	Citizen	97,{
+geffen,203,146,5	script	Citizen	4W_M_01,{
 	mes "[Citizen]";
 	mes "There was a skillful weaponsmith";
 	mes "in Al De Baran who had 4 sons.";
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index 4d2141e00..9c51dcd48 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 //= Kunlun Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= x[tsk], KarLaeda
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Kunlun Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Moved Lost Knife mini-quest to quest file.
+//=     Moved Lost Knife mini-quest to quest file.
 //= 1.6 Moved Alberta NPC to pre-re/re paths. [Euphy]
 //============================================================
 
 // Kunlun Transportation
-//============================================================ 
+//============================================================
 -	script	::Kunlun_Envoy_gonryun	-1,{
 	mes "[Wa Bai Hu]";
 	mes "Good day~";
@@ -100,7 +100,7 @@
 				mes "[Wa Bai Hu]";
 				mes "Thank you, let me guide you there immediately.";
 				close2;
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				warp "gon_fild01",258,82;
 				end;
 			}
@@ -128,7 +128,7 @@
 	}
 }
 
-gon_fild01,255,79,7	script	Kunlun Envoy#gon2	776,{
+gon_fild01,255,79,7	script	Kunlun Envoy#gon2	4_M_TWMIDMAN,{
 	mes "[Wa Bai Hu]";
 	mes "So, did you enjoy your trip?";
 	mes "I guess it's the time for you to";
@@ -155,7 +155,7 @@ gon_fild01,255,79,7	script	Kunlun Envoy#gon2	776,{
 	close;
 }
 
-gon_fild01,187,239,7	script	Kunlun Envoy#gon3	776,{
+gon_fild01,187,239,7	script	Kunlun Envoy#gon3	4_M_TWMIDMAN,{
 	mes "[Zhang Quing Long]";
 	mes "Please head north to enter Kunlun.";
 	mes "I hope you will have a great time";
@@ -163,7 +163,7 @@ gon_fild01,187,239,7	script	Kunlun Envoy#gon3	776,{
 	close;
 }
 
-gonryun,153,64,7	script	Kunlun Envoy#gon4	776,{
+gonryun,153,64,7	script	Kunlun Envoy#gon4	4_M_TWMIDMAN,{
 	mes "[Zhang Quing Long]";
 	mes "Please make yourself comfortable.";
 	mes "If you want to go back, I will";
@@ -187,8 +187,8 @@ gonryun,153,64,7	script	Kunlun Envoy#gon4	776,{
 }
 
 // Generic Kunlun NPCs
-//============================================================ 
-gonryun,200,82,3	script	Jian Chung Xun#gon	774,{
+//============================================================
+gonryun,200,82,3	script	Jian Chung Xun#gon	4_M_TWBOY,{
 	mes "[Jian Chung Xun]";
 	mes "I simply adore festivals.";
 	mes "That's why I love this town.";
@@ -197,7 +197,7 @@ gonryun,200,82,3	script	Jian Chung Xun#gon	774,{
 	close;
 }
 
-gonryun,268,88,3	script	Liang Zhun Bu#gon	776,{
+gonryun,268,88,3	script	Liang Zhun Bu#gon	4_M_TWMIDMAN,{
 	mes "[Liang Zhun Bu]";
 	mes "We are proud to be an independent";
 	mes "nation, and have been fighting";
@@ -213,7 +213,7 @@ gonryun,268,88,3	script	Liang Zhun Bu#gon	776,{
 	close;
 }
 
-gonryun,118,111,5	script	Qian Yuen Shuang#gon	89,{
+gonryun,118,111,5	script	Qian Yuen Shuang#gon	4_M_ORIENT02,{
 	mes "[Qian Yuen Shuang]";
 	mes "The chief of this town is a man";
 	mes "who opens his heart to others.";
@@ -228,7 +228,7 @@ gonryun,118,111,5	script	Qian Yuen Shuang#gon	89,{
 	close;
 }
 
-gonryun,181,161,3	script	Jing Wen Zhen#gon	773,{
+gonryun,181,161,3	script	Jing Wen Zhen#gon	4_F_TWMIDWOMAN,{
 	mes "[Jing Wen Zhen]";
 	mes "The men in our town, Kunlun, are";
 	mes "all brave and courageous.";
@@ -244,7 +244,7 @@ gonryun,181,161,3	script	Jing Wen Zhen#gon	773,{
 	close;
 }
 
-gonryun,113,135,6	script	Gatekeeper#gon	780,{
+gonryun,113,135,6	script	Gatekeeper#gon	8_M_TWSOLDIER,{
 	mes "[Kunlun Guard]";
 	mes "Welcome.";
 	mes "This is the residence of Shi Yan Wen, the chief of Kunlun.";
@@ -261,7 +261,7 @@ gonryun,113,135,6	script	Gatekeeper#gon	780,{
 	close;
 }
 
-gonryun,113,127,6	script	Gatekeeper#gon2	780,{
+gonryun,113,127,6	script	Gatekeeper#gon2	8_M_TWSOLDIER,{
 	mes "[Kunlun Guard]";
 	mes "Welcome.";
 	mes "This is the residence of Shi Yan Wen, the chief of Kunlun.";
@@ -278,7 +278,7 @@ gonryun,113,127,6	script	Gatekeeper#gon2	780,{
 	close;
 }
 
-gon_in,73,82,5	script	Ji Chung Zhe#gon	778,{
+gon_in,73,82,5	script	Ji Chung Zhe#gon	4_M_TWTEAMAN,{
 	if (nakha >= 0 && nakha <= 2) {
 		mes "[Ji Chung Zhe]";
 		mes "............";
@@ -311,7 +311,7 @@ gon_in,73,82,5	script	Ji Chung Zhe#gon	778,{
 	}
 }
 
-gon_in,173,27,3	script	Yu Jiu Xia#gon	774,{
+gon_in,173,27,3	script	Yu Jiu Xia#gon	4_M_TWBOY,{
 	mes "[Yu Jiu Xia]";
 	mes "Geez, just as I thought.";
 	mes "They won't sell alcohol to me.";
@@ -327,7 +327,7 @@ gon_in,173,27,3	script	Yu Jiu Xia#gon	774,{
 	close;
 }
 
-gonryun,166,196,3	script	Soldier#gon	780,{
+gonryun,166,196,3	script	Soldier#gon	8_M_TWSOLDIER,{
 	if (b_sword < 7) {
 		mes "[Wa Qiu Wu]";
 		mes "Let me tell you something";
@@ -388,7 +388,7 @@ gonryun,166,196,3	script	Soldier#gon	780,{
 	close;
 }
 
-gonryun,169,71,3	script	Guidev#gon	770,{
+gonryun,169,71,3	script	Guidev#gon	4_F_TWGIRL,{
 	mes "[Li Xi Jiao]";
 	mes "Welcome to Kunlun!";
 	mes "Did you enjoy all the incredible";
@@ -410,9 +410,9 @@ gonryun,169,71,3	script	Guidev#gon	770,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 // May be missing npc's and dialogue.
 //= 1.1 Fixed Typos [Nexon]
 //= 1.2 Removed Duplicates [Silent]
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index 845b81015..aae031ebd 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -12,13 +12,13 @@
 //= Plus no one knows what the NPCs are talking right now :/ [Poki#3]
 //= Note: Not all the sprites were correct :P [erKURITA]
 //= 1.0 Added the first shop, firecrackers. Thanks RockmanEXE for the info [erKURITA]
-//=	Added more missing npc, but again, only locations and temp names =/ [erKURITA]
-//=	Started the basis of Poring Track. [erKURITA]
-//=	Moved the old lady to npc\guides\guides_hu.txt, since it's Hugel's guard [erKURITA]
-//=	Special thanks to RockmanEXE who provided all necesary info =3
-//=	Abducted/Moved Yan and Yalmire(temp names) to npc\events\custom\p_track. [erKURITA]
+//=     Added more missing npc, but again, only locations and temp names =/ [erKURITA]
+//=     Started the basis of Poring Track. [erKURITA]
+//=     Moved the old lady to npc\guides\guides_hu.txt, since it's Hugel's guard [erKURITA]
+//=     Special thanks to RockmanEXE who provided all necesary info =3
+//=     Abducted/Moved Yan and Yalmire(temp names) to npc\events\custom\p_track. [erKURITA]
 //= 1.1 Commented out the whole list of dummy npcs. They're there for nothing anyway,
-//=	just using up memory. [erKURITA]
+//=     just using up memory. [erKURITA]
 //= 1.2 Added a few NPCs scripted by Munin and fixed up format a little [Playtester]
 //= 1.3 Moved some quests-related NPCs to proper file. [SinSloth]
 //= 1.4 Optimized the Party Supplies Shop [DZeroX]
@@ -29,7 +29,7 @@
 
 // Hugel
 //============================================================
-hugel,189,143,5	script	Young Man	898,{
+hugel,189,143,5	script	Young Man	4_M_HUMAN_01,{
 	mes "[Young Man]";
 	mes "Huh. So that giant";
 	mes "air pouch can make";
@@ -39,7 +39,7 @@ hugel,189,143,5	script	Young Man	898,{
 	close;
 }
 
-hugel,126,151,3	script	Emily	90,{
+hugel,126,151,3	script	Emily	4_F_01,{
 	mes "[Emily]";
 	mes "I feel so blessed to";
 	mes "live in this quant, little";
@@ -56,7 +56,7 @@ hugel,126,151,3	script	Emily	90,{
 	close;
 }
  
-hugel,86,165,5	script	Kayplas	896,{
+hugel,86,165,5	script	Kayplas	4_M_HUBOY,{
 	mes "[Kayplas]";
 	mes "Ooh, I really want to";
 	mes "have that red bottle.";
@@ -66,7 +66,7 @@ hugel,86,165,5	script	Kayplas	896,{
 	close;
 }
 
-hugel,71,197,3	script	Lisa	90,{
+hugel,71,197,3	script	Lisa	4_F_01,{
 	mes "[Lisa]";
 	mes "Hugel is a pretty";
 	mes "small, homely village.";
@@ -83,7 +83,7 @@ hugel,71,197,3	script	Lisa	90,{
 	close;
 }
 
-hugel,169,112,5	script	Old Nikki	892,{
+hugel,169,112,5	script	Old Nikki	4_F_HUGRANMA,{
 	mes "[Old Nikki]";
 	mes "You must not be from";
 	mes "around here. Ah, you're";
@@ -100,7 +100,7 @@ hugel,169,112,5	script	Old Nikki	892,{
 	close;
 }
 
-hugel,175,115,5	script	Marius	897,{
+hugel,175,115,5	script	Marius	4_M_HUGRANFA,{
 	mes "[Marius]";
 	mes "Yes, I'm an old man, but";
 	mes "I can lick a whippersnapper";
@@ -120,7 +120,7 @@ hugel,175,115,5	script	Marius	897,{
 
 // Inside Hugel
 //============================================================
-hu_in01,111,386,4	script	Chris	86,{
+hu_in01,111,386,4	script	Chris	4_M_04,{
 	mes "[Chris]";
 	mes "You know, the people don't";
 	mes "fight harmful monsters, they";
@@ -136,7 +136,7 @@ hu_in01,111,386,4	script	Chris	86,{
 	close;
 }
 
-hu_in01,23,311,4	script	Party Supplies Shop	898,{
+hu_in01,23,311,4	script	Party Supplies Shop	4_M_HUMAN_01,{
 	mes "[Shopkeeper]";
 	mes "Welcome to the party supplies";
 	mes "shop!";
@@ -148,13 +148,13 @@ hu_in01,23,311,4	script	Party Supplies Shop	898,{
 	next;
 	switch (select("Buy:Cancel")) {
 		case 1:
-			if (Zeny < 500) { 
+			if (Zeny < 500) {
 				mes "[Shopkeeper]";
 				mes "I am sorry, but you don't have";
 				mes "enough money~";
 				close;
 			}
-			set Zeny,Zeny-500;
+			Zeny -= 500;
 			getitem 12018,5;	// Fire_Cracker
 			mes "[Shopkeeper]";
 			mes "Here you go!";
@@ -167,7 +167,7 @@ hu_in01,23,311,4	script	Party Supplies Shop	898,{
 	}
 }
 
-hu_in01,18,94,0	script	A Part-Timer#1	49,{
+hu_in01,18,94,0	script	A Part-Timer#1	1_M_03,{
 	mes "[Luda]";
 	mes "Welcome to the";
 	mes "Shrine Expedition Office.";
@@ -194,7 +194,7 @@ hu_in01,18,94,0	script	A Part-Timer#1	49,{
 	close;
 }
 
-hu_in01,26,77,4	script	A Part-Timer#2	50,{
+hu_in01,26,77,4	script	A Part-Timer#2	1_M_04,{
 	mes "^3355FFThis part-timer is";
 	mes "completely engrossed";
 	mes "in his task of organizing";
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index da7b650d7..5aaceb709 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -1,32 +1,33 @@
 //===== Hercules Script ======================================
 //= Izlude Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.8a
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.9a
+//===== Description: =========================================
+//= [Official Conversion]
 //= Izlude town NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= 1.1 fixed 2 zeny bugs/checks [Lupus]
 //= 1.2 Fixed a lot of typos [Nexon]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Added a Jawaii related npc. 1.4a Fixed a small bug to
-//=	the Jawaii warper, thanks to reddozen and Silent [MasterOfMuppets]
+//=     the Jawaii warper, thanks to reddozen and Silent [MasterOfMuppets]
 //= 1.5 Replaced iz_move_alberta with MISC_QUEST & 16 [Lupus]
 //= 1.6 Removed Duplicates [Silent]
 //= 1.7 Split quest to quests/quests_izlude.txt [Evera]
 //= 1.71 Optimized. Also thanks to CAHTEXHuK [Lupus]
 //= 1.72 Small bugfix [Paradox924X]
 //= 1.8 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
-//=	Removed Honeymoon Helper, as she is a Jawaii NPC.
-//=	Moved Signs to the msg_boards file.
+//=     Removed Honeymoon Helper, as she is a Jawaii NPC.
+//=     Moved Signs to the msg_boards file.
 //= 1.8a Made Red/Cebalis as a single NPC + duplicate [Lupus]
 //= 1.9 Fixed a small problem with Dega. (Ne default case) [L0ne_W0lf]
-//=	Re-added NPC dialog for Cebalis. The dialog differs
-//=	(even if slightly,) after the five or so lines.
+//=     Re-added NPC dialog for Cebalis. The dialog differs
+//=     (even if slightly,) after the five or so lines.
+//= 1.9a A part of Kylick's dialogue is Pre-Renewal only. [Euphy]
 //============================================================
 
 // Izlude
@@ -47,7 +48,7 @@
 			mes "Only 150 Zeny to ride!";
 			close;
 		}
-		set Zeny, Zeny - 150;
+		Zeny -= 150;
 		warp "izlu2dun",107,50;
 		end;
 	case 2:
@@ -57,7 +58,7 @@
 			mes "Only 500 Zeny to ride!";
 			close;
 		}
-		set Zeny, Zeny - 500;
+		Zeny -= 500;
 		warp "alberta",188,169;
 		end;
 	case 3:
@@ -101,7 +102,7 @@
 		mes "[Charfri]";
 		mes "You'll have to board on a ship at the port to get to Byalan Island. There are dangerous dungeons on that island, so don't go snooping around just anywhere.";
 		close;
-	Default:
+	default:
 		mes "Though it is very beautiful, Byalan Island has a mysterious dungeon that extends deep under the sea.";
 		next;
 		mes "[Charfri]";
@@ -132,7 +133,7 @@
 		mes "[Cuskoal]";
 		mes "So, whaddya say?";
 		close;
-	Default:
+	default:
 		mes "The pubs in Prontera are always full of people from local areas and from out-of-town. It can get pretty busy.";
 		next;
 		mes "[Cuskoal]";
@@ -166,7 +167,7 @@
 		mes "[Dega]";
 		mes "If you try to cast magic near it, it will notice and saunter over to smash you. So you better watch out for Golem.";
 		close;
-	Default:
+	default:
 		mes "There's a very delightful place where you can find every";
 		mes "type of Poring.";
 		next;
@@ -220,9 +221,18 @@
 }
 
 -	script	::Kylick_izlude	-1,{
-	mes "[Kylick]";
-	switch(rand(2)) {
-	case 1:
+	if (!checkre(0) && rand(2)) {
+		mes "[Kylick]";
+		mes "I was thinking, even though the people of Izlude live so close to the ocean...";
+		next;
+		mes "[Kylick]";
+		mes "There are other cultures that have completely developed by living off of the sea. Of course, I'm talking about Amatsu.";
+		next;
+		mes "[Kylick]";
+		mes "I hear the cuisine there is really good! Although the idea of eating raw fish is new to me, I would love to go there, and try it just once!";
+		close;
+	} else {
+		mes "[Kylick]";
 		mes "Don't you think Binoculars";
 		mes "are really COOL?! You can";
 		mes "see all sorts of places...!";
@@ -239,15 +249,6 @@
 		mes "a pound of cure";
 		mes "after all, right?";
 		close;
-	Default:
-		mes "I was thinking, even though the people of Izlude live so close to the ocean...";
-		next;
-		mes "[Kylick]";
-		mes "There are other cultures that have completely developed by living off of the sea. Of course, I'm talking about Amatsu.";
-		next;
-		mes "[Kylick]";
-		mes "I hear the cuisine there is really good! Although the idea of eating raw fish is new to me, I would love to go there, and try it just once!";
-		close;
 	}
 }
 
@@ -457,7 +458,7 @@
 
 // Inside Izlude
 //============================================================
-izlude_in,125,164,2	script	Aaron#izlude	65,{
+izlude_in,125,164,2	script	Aaron#izlude	1_M_YOUNGKNIGHT,{
 	mes "[Aaron]";
 	mes "Don't you think Strong VIT and training in a unique breathing method which enables quick HP recovery are the greatest advantages for a Swordman?";
 	next;
@@ -499,7 +500,7 @@ izlude_in,125,164,2	script	Aaron#izlude	65,{
 
 // Izlude Dungeon
 //============================================================
-izlu2dun,108,27,0	script	Sailor#2izlude	100,{
+izlu2dun,108,27,0	script	Sailor#2izlude	4W_SAILOR,{
 	mes "[Sailor]";
 	mes "Wanna";
 	mes "head back?";
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index a54e2a487..1069cf01c 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -25,9 +25,9 @@
 //= 2.02 Fixed Classic Suite NPC warping directly above a warp [Evera]
 //= 3.0 Rescripted to Aegis 10.3 standard. Contains all Jawaii-related NPCs. [L0ne_W0lf]
 //= 3.1 Fixed bugs with getpartnerid() (it never returns 1), fixed some conditons,
-//=		replaced getpartnerid() with ispartneron() at some tri-forks [Lupus]
+//=     replaced getpartnerid() with ispartneron() at some tri-forks [Lupus]
 //= 3.2 Reverted ispartneron() BACK to getpartnerid(). [L0ne_W0lf]
-//=	None of the NPCs need the player's partner to be online.
+//=     None of the NPCs need the player's partner to be online.
 //= 3.3 Just a small fix up on the Bartender. [L0ne_W0lf]
 //= 3.3a Just a little typo error. [Samuray22]
 //= 3.4 Added missing checkweights. [L0ne_W0lf]
@@ -36,9 +36,9 @@
 //= 3.7 Added Izlude RE coordinates. [Euphy]
 //============================================================
 
-// Jawaii
+// Jawaii Transportation
 //============================================================
-jawaii,239,112,7	script	Mariner#toizu	100,{
+jawaii,239,112,7	script	Mariner#toizu	4W_SAILOR,{
 	mes "[Mariner]";
 	mes "This ship";
 	mes "is heading";
@@ -73,7 +73,7 @@ jawaii,239,112,7	script	Mariner#toizu	100,{
 	close;
 }
 
-jawaii,122,263,5	script	Mariner#toalbe	100,{
+jawaii,122,263,5	script	Mariner#toalbe	4W_SAILOR,{
 	mes "[Mariner]";
 	mes "This ship";
 	mes "is headed back";
@@ -105,7 +105,9 @@ jawaii,122,263,5	script	Mariner#toalbe	100,{
 	close;
 }
 
-jawaii,188,218,7	script	Tavern Lady#Jawaii	80,{
+// Generic Jawaii NPCs
+//============================================================
+jawaii,188,218,7	script	Tavern Lady#Jawaii	1_F_PUBGIRL,{
 	mes "[Lady]";
 	mes "Oh, dear!";
 	mes "You're not going";
@@ -138,7 +140,7 @@ jawaii,188,218,7	script	Tavern Lady#Jawaii	80,{
 	close;
 }
 
-jawaii,220,235,3	script	Jawaii Resident#heart	724,{
+jawaii,220,235,3	script	Jawaii Resident#heart	4_F_07,{
 	mes "[Jawa Jawa]";
 	mes "You know what's";
 	mes "the most beautiful";
@@ -160,7 +162,7 @@ jawaii,220,235,3	script	Jawaii Resident#heart	724,{
 	close;
 }
 
-jawaii,240,146,5	script	Jawaii Resident#desc1	724,{
+jawaii,240,146,5	script	Jawaii Resident#desc1	4_F_07,{
 	mes "[Waii Waii]";
 	mes "Welcome to Jawaii!";
 	next;
@@ -173,7 +175,7 @@ jawaii,240,146,5	script	Jawaii Resident#desc1	724,{
 	close;
 }
 
-jawaii,168,247,5	script	Jawaii Resident#desc2	724,{
+jawaii,168,247,5	script	Jawaii Resident#desc2	4_F_07,{
 	mes "[Waja Waja]";
 	mes "Ah, you must be a tourist.";
 	mes "If you're lost, just head West. Accomodations for newlyweds";
@@ -189,7 +191,7 @@ jawaii,168,247,5	script	Jawaii Resident#desc2	724,{
 	close;
 }
 
-jawaii,165,121,1	script	Jawaii Resident#desc3	724,{
+jawaii,165,121,1	script	Jawaii Resident#desc3	4_F_07,{
 	mes "[Iwa Iwa]";
 	mes "Jawaii~";
 	mes "Jawa~ii~";
@@ -214,7 +216,7 @@ jawaii,165,121,1	script	Jawaii Resident#desc3	724,{
 	close;
 }
 
-jawaii,141,200,3	script	Employee#sroom	798,{
+jawaii,141,200,3	script	Employee#sroom	4_M_NFMAN,{
 	mes "[Alowa]";
 	mes "W-Welcome...?";
 	mes "This is o-o-our";
@@ -237,13 +239,13 @@ jawaii,141,200,3	script	Employee#sroom	798,{
 	next;
 	if (select("Use.:Cancel.") == 1) {
 		mes "[Alowa]";
-		if (zeny > 999) {
+		if (Zeny > 999) {
 			mes "T-Thank you ssso much!";
 			mes "L-Let open the room door";
 			mes "ffffor you. Thank y-you.";
 			mes "Ha-have a good time.";
 			close2;
-			set zeny,zeny-1000;
+			Zeny -= 1000;
 			warp "jawaii_in",116,64;
 			end;
 		}
@@ -256,11 +258,11 @@ jawaii,141,200,3	script	Employee#sroom	798,{
 	mes "[Alowa]";
 	mes "^666666*Sniff*^000000";
 	mes "B-but I promise th-that this room is the nicest and cl-cleanest room! P-Please! C-come back!";
-	Emotion e_sob;
+	emotion e_sob;
 	close;
 }
 
-jawaii,108,199,5	script	Employee#antroom	74,{
+jawaii,108,199,5	script	Employee#antroom	1_F_MERCHANT_02,{
 	mes "[Pine Oran]";
 	mes "Welcome to";
 	mes "the Antique room.";
@@ -284,7 +286,7 @@ jawaii,108,199,5	script	Employee#antroom	74,{
 	next;
 	if (select("Use.:Cancel.") == 1) {
 		mes "[Pine Oran]";
-		if (zeny > 999) {
+		if (Zeny > 999) {
 			mes "Thank you";
 			mes "for using";
 			mes "our services.";
@@ -292,7 +294,7 @@ jawaii,108,199,5	script	Employee#antroom	74,{
 			mes "Make yourself";
 			mes "comfortable.";
 			close2;
-			set zeny,zeny-1000;
+			Zeny -= 1000;
 			warp "jawaii_in",129,110;
 			end;
 		}
@@ -308,7 +310,7 @@ jawaii,108,199,5	script	Employee#antroom	74,{
 	close;
 }
 
-jawaii,107,189,5	script	Employee#horoom	93,{
+jawaii,107,189,5	script	Employee#horoom	4_F_04,{
 	mes "[Sharkie Rania]";
 	mes "I'll take you";
 	mes "to the Honey Room.";
@@ -319,11 +321,11 @@ jawaii,107,189,5	script	Employee#horoom	93,{
 	next;
 	if (select("Use.:Cancel.") == 1) {
 		mes "[Sharkie Rania]";
-		if (zeny > 999) {
+		if (Zeny > 999) {
 			mes "Eh, alright.";
 			mes "Let's get going.";
 			close2;
-			set zeny,zeny-1000;
+			Zeny -= 1000;
 			warp "jawaii_in",86,117;
 			end;
 		}
@@ -339,7 +341,7 @@ jawaii,107,189,5	script	Employee#horoom	93,{
 	close;
 }
 
-jawaii,112,173,7	script	Employee#villroom	93,{
+jawaii,112,173,7	script	Employee#villroom	4_F_04,{
 	mes "[Larks Rania]";
 	mes "Hello dear,";
 	mes "how are you?";
@@ -362,11 +364,11 @@ jawaii,112,173,7	script	Employee#villroom	93,{
 	next;
 	if (select("Use.:Cancel.") == 1) {
 		mes "[Larks Rania]";
-		if (zeny > 999) {
+		if (Zeny > 999) {
 			mes "Thank you~";
 			mes "Enjoy your stay.";
 			close2;
-			set zeny,zeny-1000;
+			Zeny -= 1000;
 			warp "jawaii_in",87,75;
 			end;
 		}
@@ -384,7 +386,7 @@ jawaii,112,173,7	script	Employee#villroom	93,{
 	close;
 }
 
-jawaii,214,168,5	script	Honeymoon Helper#Jawaii	71,{
+jawaii,214,168,5	script	Honeymoon Helper#Jawaii	1_F_LIBRARYGIRL,{
 	mes "[Helper]";
 	mes "There is no place";
 	mes "better for having your";
@@ -410,9 +412,9 @@ jawaii,214,168,5	script	Honeymoon Helper#Jawaii	71,{
 	next;
 	if (select("I shall buy it.:No, thanks.") == 1) {
 		mes "[Helper]";
-		if (zeny > 49999) {
-			set zeny,zeny-50000;
-			getitem 681,1; //Memory_Of_Wedding 
+		if (Zeny > 49999) {
+			Zeny -= 50000;
+			getitem 681,1; //Memory_Of_Wedding
 			mes "Thank you very much~!";
 			mes "Please remember, you";
 			mes "should use this with your";
@@ -431,7 +433,7 @@ jawaii,214,168,5	script	Honeymoon Helper#Jawaii	71,{
 
 // Inside Jawaii
 //============================================================
-jawaii_in,25,94,0	script	Employee#jaw1	724,{
+jawaii_in,25,94,0	script	Employee#jaw1	4_F_07,{
 	mes "[Employee Tryteh]";
 	mes "Welcome to Jawaii Tavern~";
 	if (getpartnerid()) {
@@ -453,14 +455,14 @@ jawaii_in,25,94,0	script	Employee#jaw1	724,{
 	close;
 
 OnWelcome:
-	Emotion e_kis;
+	emotion e_kis;
 	end;
 OnSolo:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-jawaii_in,25,96,0	script	Employee#jaw2	724,{
+jawaii_in,25,96,0	script	Employee#jaw2	4_F_07,{
 	mes "[Employee Fey]";
 	mes "Welcome to Jawaii Tavern~";
 	if (getpartnerid()) {
@@ -483,14 +485,14 @@ jawaii_in,25,96,0	script	Employee#jaw2	724,{
 	close;
 
 OnWelcome:
-	Emotion e_kis;
+	emotion e_kis;
 	end;
 OnSolo:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-jawaii_in,25,98,0	script	Employee#jaw3	724,{
+jawaii_in,25,98,0	script	Employee#jaw3	4_F_07,{
 	mes "[Employee Buffy]";
 	mes "Welcome to Jawaii Tavern~";
 	if (getpartnerid()) {
@@ -499,7 +501,7 @@ jawaii_in,25,98,0	script	Employee#jaw3	724,{
 		mes "Oh~";
 		mes "Look at you...";
 		mes "You look perfect";
-		if (sex)
+		if (Sex)
 			mes "for your wife~";
 		else
 			mes "with your husband~";
@@ -513,7 +515,7 @@ jawaii_in,25,98,0	script	Employee#jaw3	724,{
 		mes "Hmm...?";
 		mes "You don't look like";
 		mes "you're married, are you?";
-		if (sex) {
+		if (Sex) {
 			next;
 			mes "[Employee Buffy]";
 			mes "I'm pretty good";
@@ -527,14 +529,14 @@ jawaii_in,25,98,0	script	Employee#jaw3	724,{
 	close;
 
 OnWelcome:
-	Emotion e_kis;
+	emotion e_kis;
 	end;
 OnSolo:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-jawaii_in,25,100,0	script	Employee#jaw4	724,{
+jawaii_in,25,100,0	script	Employee#jaw4	4_F_07,{
 	mes "[Employee Itere]";
 	mes "Welcome to";
 	mes "Jawaii Tavern~";
@@ -566,14 +568,14 @@ jawaii_in,25,100,0	script	Employee#jaw4	724,{
 	close;
 
 OnWelcome:
-	Emotion e_kis;
+	emotion e_kis;
 	end;
 OnSolo:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-jawaii_in,30,94,4	script	Employee#jaw5	724,{
+jawaii_in,30,94,4	script	Employee#jaw5	4_F_07,{
 	mes "[Employee Tonia]";
 	mes "Welcome to Jawaii Tavern~";
 	if (getpartnerid()) {
@@ -599,14 +601,14 @@ jawaii_in,30,94,4	script	Employee#jaw5	724,{
 	close;
 
 OnWelcome:
-	Emotion e_kis;
+	emotion e_kis;
 	end;
 OnSolo:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-jawaii_in,30,96,4	script	Employee#jaw6	724,{
+jawaii_in,30,96,4	script	Employee#jaw6	4_F_07,{
 	mes "[Employee Kay]";
 	mes "Welcome to Jawaii Tavern~";
 	if (getpartnerid()) {
@@ -624,14 +626,14 @@ jawaii_in,30,96,4	script	Employee#jaw6	724,{
 	close;
 	
 OnWelcome:
-	Emotion e_kis;
+	emotion e_kis;
 	end;
 OnSolo:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-jawaii_in,30,98,4	script	Employee#jaw7	724,{
+jawaii_in,30,98,4	script	Employee#jaw7	4_F_07,{
 	mes "[Employee Amy]";
 	mes "Welcome to Jawaii Tavern~";
 	if (getpartnerid()) {
@@ -658,14 +660,14 @@ jawaii_in,30,98,4	script	Employee#jaw7	724,{
 	close;
 
 OnWelcome:
-	Emotion e_kis;
+	emotion e_kis;
 	end;
 OnSolo:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-jawaii_in,30,100,4	script	Employee#jaw8	724,{
+jawaii_in,30,100,4	script	Employee#jaw8	4_F_07,{
 	mes "[Employee Yasmine]";
 	mes "Welcome to Jawaii Tavern~";
 	if (getpartnerid()) {
@@ -682,10 +684,10 @@ jawaii_in,30,100,4	script	Employee#jaw8	724,{
 	close;
 
 OnWelcome:
-	Emotion e_kis;
+	emotion e_kis;
 	end;
 OnSolo:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
@@ -713,7 +715,7 @@ OnTouch:
 	end;
 }
 	
-jawaii_in,15,104,0	script	Waitress#jawaii	80,{
+jawaii_in,15,104,0	script	Waitress#jawaii	1_F_PUBGIRL,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FF * Wait a minute! *";
 		mes "You're carrying too many items with you right now. Please store some of your things into Kafra Storage and try again.^000000";
@@ -723,7 +725,7 @@ jawaii_in,15,104,0	script	Waitress#jawaii	80,{
 		mes "[Waitress]";
 		mes "Hello,";
 		mes "how can I help you?";
-		Emotion e_kis;
+		emotion e_kis;
 		next;
 		switch(select("Give me food.:Bring me drink.:Where's the bar?")) {
 		case 1:
@@ -734,8 +736,8 @@ jawaii_in,15,104,0	script	Waitress#jawaii	80,{
 			next;
 			if (select("Yes.:Wha--! It's too expensive!") == 1) {
 				mes "[Waitress]";
-				if (zeny > 999) {
-					set zeny,zeny-1000;
+				if (Zeny > 999) {
+					Zeny -= 1000;
 					getitem 517,1; //Meat
 					mes "There you go~";
 					mes "Enjoy your meal~!";
@@ -760,8 +762,8 @@ jawaii_in,15,104,0	script	Waitress#jawaii	80,{
 			next;
 			if (select("Yes.:Wha--! It's too expensive!") == 1) {
 				mes "[Waitress]";
-				if (zeny > 999) {
-					set zeny,zeny-1000;
+				if (Zeny > 999) {
+					Zeny -= 1000;
 					getitem 503,1; //Yelow_Potion
 					mes "There you go~";
 					mes "Enjoy your meal~!";
@@ -785,7 +787,7 @@ jawaii_in,15,104,0	script	Waitress#jawaii	80,{
 			close;
 		}
 	}
-	Emotion e_omg;
+	emotion e_omg;
 	mes "[Waitress]";
 	mes "Hey, hey...!";
 	mes "I have no idea";
@@ -796,7 +798,7 @@ jawaii_in,15,104,0	script	Waitress#jawaii	80,{
 	mes "Just have your drink";
 	mes "and then leave!";
 	next;
-	if (Select("I'm a member of Single Army!!:...I just wanted to congratulate them...") == 1) {
+	if (select("I'm a member of Single Army!!:...I just wanted to congratulate them...") == 1) {
 		mes "[Employee]";
 		mes "Yeah, right.";
 		mes "Knock it off already.";
@@ -827,14 +829,14 @@ jawaii_in,15,104,0	script	Waitress#jawaii	80,{
 	close;
 }
 
-jawaii_in,28,124,0	script	Bartender#jaw	46,{
+jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 	mes "[Bartender]";
 	mes "Welcome to the";
 	mes "Jawaii Tavern bar.";
 	mes "What would you";
 	mes "like to drink?";
 	next;
-	if (zeny < 99) {
+	if (Zeny < 99) {
 		set .@r_jaw,rand(1,100);
 		mes "[Bartender]";
 		if (.@r_jaw > 29) {
@@ -893,7 +895,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	46,{
 				percentheal -100,0;
 				end;
 			}
-			if (zeny > 99) set zeny,zeny-100;
+			if (Zeny > 99) Zeny -= 100;
 			switch(rand(4)) {
 			case 1:
 				mes "[Bartender]";
@@ -968,7 +970,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	46,{
 				percentheal -20,0;
 				next;
 				break;
-			Default:
+			default:
 				mes "[Bartender]";
 				mes "I see...";
 				mes "Let me think";
@@ -1103,7 +1105,7 @@ S_KillChar:
 		percentheal -100,0;
 		end;
 	}
-	if (zeny > 99) set zeny,zeny-100;
+	if (Zeny > 99) Zeny -= 100;
 	set .@roof_jaw,.@roof_jaw+getarg(0);
 	mes "[Bartender]";
 	mes "There you go.";
@@ -1112,9 +1114,9 @@ S_KillChar:
 	return;
 }
 	
-jawaii_in,43,115,0	script	Customer#jaw_1	97,{
+jawaii_in,43,115,0	script	Customer#jaw_1	4W_M_01,{
 	if (!getpartnerid()) {
-		if (zeny > 99) {
+		if (Zeny > 99) {
 			mes "[Buchi]";
 			mes "Grrrr...";
 			mes "Damn! I don't";
@@ -1164,7 +1166,7 @@ jawaii_in,43,115,0	script	Customer#jaw_1	97,{
 	close;
 }
 
-jawaii_in,41,106,3	script	Customer#Cage	98,{
+jawaii_in,41,106,3	script	Customer#Cage	4W_M_02,{
 	mes "[Cage]";
 	if (getpartnerid()) {
 		mes "....Bah!";
@@ -1172,7 +1174,7 @@ jawaii_in,41,106,3	script	Customer#Cage	98,{
 		mes "After all, everyone knows marriage is a sham for desperate, lonely people!";
 		next;
 		mes "[Cage]";
-		if (sex) {
+		if (Sex) {
 			mes "I don't trust anybody!";
 			mes "You're a fool for chaining";
 			mes "yourself to some gorgeous";
@@ -1213,7 +1215,7 @@ jawaii_in,41,106,3	script	Customer#Cage	98,{
 
 // Inside Prontera
 //============================================================
-prt_in,173,13,4	script	Customer#SoloHan	86,{
+prt_in,173,13,4	script	Customer#SoloHan	4_M_04,{
 	mes "[SoloHan]";
 	if (!getpartnerid()) {
 		mes "Oh man...";
@@ -1355,7 +1357,7 @@ prt_in,173,13,4	script	Customer#SoloHan	86,{
 		mes "...Wha!?";
 		mes "Oh man!";
 		mes "Get outta my face!";
-		if (sex) {
+		if (Sex) {
 			mes "You smell like,";
 			mes "whupped boyfriend";
 			mes "or something!";
@@ -1387,7 +1389,7 @@ prt_in,173,13,4	script	Customer#SoloHan	86,{
 	close;
 }
 	
-prt_in,170,14,0	script	Customer#Bachewcca	89,{
+prt_in,170,14,0	script	Customer#Bachewcca	4_M_ORIENT02,{
 	mes "[Bachewcca]";
 	mes "..............";
 	mes "^666666*Gulp....gulp...*^000000";
@@ -1428,8 +1430,8 @@ prt_in,170,14,0	script	Customer#Bachewcca	89,{
 			mes "Unfortunately, singles are not allowed on the island. Why don't you go forget your loneliness in the Prontera pub?";
 			close;
 		}
-		else if (zeny > 99999) {
-			set zeny,zeny-100000;
+		else if (Zeny > 99999) {
+			Zeny -= 100000;
 			mes "Bon Voyage...!!";
 			mes "Let me guide";
 			mes "you to 'Jawaii!'";
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index 35af28b2d..6768da33c 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
 //= Lighthalzen City
-//===== By: ================================================== 
+//===== By: ==================================================
 //=  erKURITA, Au{R}oN (Translated by Alan), $ephiroth
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Lighthalzen NPCs (Temporal names for now) [erKURITA]
 //===== Additional Comments: ==================================
 //= 2.0 Added missing Lab Staff#amano08 NPC. (bugreport:4319) [Gepard]
@@ -12,7 +12,7 @@
 //= 2.2 Added missing NPC found in AEGIS files. [L0ne_W0lf]
 //=============================================================
 
-lighthalzen,198,285,5	script	Jiwon#zen5	862,{
+lighthalzen,198,285,5	script	Jiwon#zen5	4_F_LGTGIRL,{
 	mes "[Jiwon]";
 	mes "I think we're really";
 	mes "fortunate to be able to";
@@ -29,7 +29,7 @@ lighthalzen,198,285,5	script	Jiwon#zen5	862,{
 	close;
 }
 
-lighthalzen,220,244,3	script	Samnang#zen2	863,{
+lighthalzen,220,244,3	script	Samnang#zen2	4_F_LGTGRAND,{
 	mes "[Samnang]";
 	mes "^333333*Sigh...*^000000";
 	mes "It gets harder for me";
@@ -55,7 +55,7 @@ lighthalzen,220,244,3	script	Samnang#zen2	863,{
 	close;
 }
 
-lighthalzen,261,112,3	script	Ruth#zen4	862,{
+lighthalzen,261,112,3	script	Ruth#zen4	4_F_LGTGIRL,{
 	mes "[Ruth]";
 	mes "Sweety, isn't it";
 	mes "nice to be together";
@@ -78,7 +78,7 @@ lighthalzen,261,112,3	script	Ruth#zen4	862,{
 	close;
 }
 
-lighthalzen,259,108,7	script	Oyoung#zen14	869,{
+lighthalzen,259,108,7	script	Oyoung#zen14	4_M_LGTMAN,{
 	mes "[Oyoung]";
 	mes "Girl, you look like";
 	mes "you're comin' down with";
@@ -104,7 +104,7 @@ lighthalzen,259,108,7	script	Oyoung#zen14	869,{
 	close;
 }
 
-lighthalzen,233,121,3	script	Kariya#li_01	72,{
+lighthalzen,233,121,3	script	Kariya#li_01	1_F_MARIA,{
 	mes "[Kariya]";
 	mes "I think ''Lighthalzen'' is";
 	mes "supposed to mean ''crest of";
@@ -122,7 +122,7 @@ lighthalzen,233,121,3	script	Kariya#li_01	72,{
 }
 
 
-lighthalzen,233,82,5	script	Sung#A	716,{
+lighthalzen,233,82,5	script	Sung#A	4_M_KID2,{
 	mes "[Sung]";
 	mes "When I grow up, I want";
 	mes "to become such a great";
@@ -147,7 +147,7 @@ lighthalzen,233,82,5	script	Sung#A	716,{
 	close;
 }
 
-lighthalzen,89,73,3	script	Sameer#zen15	854,{
+lighthalzen,89,73,3	script	Sameer#zen15	4_M_EINMAN2,{
 	mes "[Sameer]";
 	mes "There are too many";
 	mes "loving couples in this city.";
@@ -181,7 +181,7 @@ lighthalzen,89,73,3	script	Sameer#zen15	854,{
 	close;
 }
 
-lighthalzen,45,59,7	script	Janice#zen03	863,{
+lighthalzen,45,59,7	script	Janice#zen03	4_F_LGTGRAND,{
 	mes "[Janice]";
 	mes "Oh no, I think I got";
 	mes "lost again. The roads";
@@ -192,7 +192,7 @@ lighthalzen,45,59,7	script	Janice#zen03	863,{
 	close;
 }
 
-lighthalzen,66,94,3	script	Elmer Keays#li_03	866,{
+lighthalzen,66,94,3	script	Elmer Keays#li_03	4_M_LGTGRAND,{
 	mes "[Elmer Keays]";
 	mes "Walking side by side";
 	mes "with you like this reminds";
@@ -211,7 +211,7 @@ lighthalzen,66,94,3	script	Elmer Keays#li_03	866,{
 	close;
 }
 
-lighthalzen,65,94,5	script	Margie Keays#li_02	863,{
+lighthalzen,65,94,5	script	Margie Keays#li_02	4_F_LGTGRAND,{
 	mes "[Margie Keays]";
 	mes "Oh darling, the";
 	mes "weather is so nice";
@@ -222,7 +222,7 @@ lighthalzen,65,94,5	script	Margie Keays#li_02	863,{
 	close;
 }
 
-lighthalzen,78,120,3	script	Maivi#zen1	862,{
+lighthalzen,78,120,3	script	Maivi#zen1	4_F_LGTGIRL,{
 	mes "[Maivi]";
 	mes "...";
 	next;
@@ -249,7 +249,7 @@ lighthalzen,78,120,3	script	Maivi#zen1	862,{
 }
 
 /*
-lighthalzen,226,210,3	script	Nannan	86,{
+lighthalzen,226,210,3	script	Nannan	4_M_04,{
 	mes "[Nannan]";
 	mes "You know, I always thought";
 	mes "that all Alchemists were bookish,";
@@ -277,7 +277,7 @@ lighthalzen,226,210,3	script	Nannan	86,{
 }
 */
 
-lighthalzen,230,182,4	script	Klaubis#zen3	866,{
+lighthalzen,230,182,4	script	Klaubis#zen3	4_M_LGTGRAND,{
 	mes "[Klaubis]";
 	mes "Excuse me, but are you";
 	mes "a tourist? Well, welcome";
@@ -324,7 +324,7 @@ lighthalzen,230,182,4	script	Klaubis#zen3	866,{
 	}
 }
 
-lighthalzen,232,156,3	script	Sigmund#zen3	869,{
+lighthalzen,232,156,3	script	Sigmund#zen3	4_M_LGTMAN,{
 	mes "[Sigmund Ting]";
 	mes "You know what I noticed?";
 	mes "The guards at the border";
@@ -342,7 +342,7 @@ lighthalzen,232,156,3	script	Sigmund#zen3	869,{
 	close;
 }
 
-lighthalzen,190,134,5	script	Joyce#zen	862,{
+lighthalzen,190,134,5	script	Joyce#zen	4_F_LGTGIRL,{
 	mes "[Joyce]";
 	mes "I can sense your";
 	mes "longing look within";
@@ -352,7 +352,7 @@ lighthalzen,190,134,5	script	Joyce#zen	862,{
 	close;
 }
 
-lighthalzen,191,134,3	script	Dan Song#zen2	869,{
+lighthalzen,191,134,3	script	Dan Song#zen2	4_M_LGTMAN,{
 	mes "[Dan Song]";
 	mes "Those eyes of yours...";
 	mes "So pure and so deep,";
@@ -361,7 +361,7 @@ lighthalzen,191,134,3	script	Dan Song#zen2	869,{
 	close;
 }
 
-lighthalzen,115,159,3	script	Collins#zen1	866,{
+lighthalzen,115,159,3	script	Collins#zen1	4_M_LGTGRAND,{
 	mes "[Collins]";
 	mes "I really wish that my";
 	mes "son will be able to join";
@@ -379,7 +379,7 @@ lighthalzen,115,159,3	script	Collins#zen1	866,{
 	close;
 }
 
-lighthalzen,77,157,5	script	Villagomez#li_01	866,{
+lighthalzen,77,157,5	script	Villagomez#li_01	4_M_LGTGRAND,{
 	mes "[Villagomez]";
 	mes "I just step out to get";
 	mes "a haircut and now I'm";
@@ -389,7 +389,7 @@ lighthalzen,77,157,5	script	Villagomez#li_01	866,{
 	close;
 }
 
-lighthalzen,125,68,5	script	Kemp#zen13	97,{
+lighthalzen,125,68,5	script	Kemp#zen13	4W_M_01,{
 	mes "[Kemp]";
 	mes "Have you ever seen the";
 	mes "people who work in that big";
@@ -405,7 +405,7 @@ lighthalzen,125,68,5	script	Kemp#zen13	97,{
 	close;
 }
 
-lighthalzen,138,50,7	script	Mauro#zen3	847,{
+lighthalzen,138,50,7	script	Mauro#zen3	4_M_EINOLD,{
 	mes "[Mauro]";
 	mes "The youth in this city";
 	mes "have no appreciation for";
@@ -424,7 +424,7 @@ lighthalzen,138,50,7	script	Mauro#zen3	847,{
 	close;
 }
 
-lighthalzen,132,103,5	script	Sefith#li_01	734,{
+lighthalzen,132,103,5	script	Sefith#li_01	4_M_JOB_KNIGHT2,{
 	mes "[Sefith]";
 	mes "Good looks. Intelligence.";
 	mes "Excellent manners. A strong,";
@@ -441,7 +441,7 @@ lighthalzen,132,103,5	script	Sefith#li_01	734,{
 	close;
 }
 
-lighthalzen,239,64,5	script	Jade#zen2	862,{
+lighthalzen,239,64,5	script	Jade#zen2	4_F_LGTGIRL,{
 	mes "[Jade]";
 	mes "I've heard that there's a";
 	mes "strange kingdom out there";
@@ -467,7 +467,7 @@ lighthalzen,239,64,5	script	Jade#zen2	862,{
 	close;
 }
 
-lighthalzen,205,208,4	script	Greedy Looking Man#li_01	853,{
+lighthalzen,205,208,4	script	Greedy Looking Man#li_01	4_M_YURI,{
 	mes "[Khramptd]";
 	mes "The land around here";
 	mes "is some pretty expensive";
@@ -478,7 +478,7 @@ lighthalzen,205,208,4	script	Greedy Looking Man#li_01	853,{
 	close;
 }
 
-lhz_in02,34,212,4	script	Maggie#05	91,{
+lhz_in02,34,212,4	script	Maggie#05	4_F_02,{
 	mes "[Maggie]";
 	mes "Sure, I sell a lot";
 	mes "of flowers here, but";
@@ -496,7 +496,7 @@ lhz_in02,34,212,4	script	Maggie#05	91,{
 	close;
 }
 
-lighthalzen,202,94,5	script	Wallace#zen2	847,{
+lighthalzen,202,94,5	script	Wallace#zen2	4_M_EINOLD,{
 	mes "[Wallace]";
 	mes "......";
 	mes "That lady, working";
@@ -513,7 +513,7 @@ lighthalzen,202,94,5	script	Wallace#zen2	847,{
 	close;
 }
 
-lighthalzen,182,102,3	script	Lucius#zen5	866,{
+lighthalzen,182,102,3	script	Lucius#zen5	4_M_LGTGRAND,{
 	if (Zeny < 90000) {
 		mes "[Lucius]";
 		mes "Hello youngster~";
@@ -563,7 +563,7 @@ lighthalzen,182,102,3	script	Lucius#zen5	866,{
 				mes "as much as you possibly can...";
 				close;
 			}
-			set zeny,zeny-.@input;
+			Zeny -= .@input;
 			set $donatedzeny,$donatedzeny + .@input;
 			mes "[Lucius]";
 			mes "So far, I've received";
@@ -610,7 +610,7 @@ lighthalzen,182,102,3	script	Lucius#zen5	866,{
 	close;
 }
 
-lighthalzen,147,105,3	script	Laqumet#li_02	869,{
+lighthalzen,147,105,3	script	Laqumet#li_02	4_M_LGTMAN,{
 	mes "[Laqumet]";
 	mes "Sure, manliness is quite";
 	mes "attractive, but I think women";
@@ -628,7 +628,7 @@ lighthalzen,147,105,3	script	Laqumet#li_02	869,{
 	close;
 }
 
-lhz_in02,242,172,1	script	Hotel Employee#zen3	868,{
+lhz_in02,242,172,1	script	Hotel Employee#zen3	4_M_LGTGUARD,{
 	mes "[Hotel Employee]";
 	mes "If you are experiencing";
 	mes "any sort of inconvenience,";
@@ -645,7 +645,7 @@ lhz_in02,242,172,1	script	Hotel Employee#zen3	868,{
 	close;
 }
 
-lhz_in02,210,189,3	script	Christopher Michael#zen	849,{
+lhz_in02,210,189,3	script	Christopher Michael#zen	4_M_DIEMAN,{
 	mes "[Christopher Michael]";
 	mes "OoooOoh~";
 	mes "Soooo comfortable.";
@@ -655,7 +655,7 @@ lhz_in02,210,189,3	script	Christopher Michael#zen	849,{
 	close;
 }
 
-lhz_in02,201,181,7	script	Safwat Fahmy	853,{
+lhz_in02,201,181,7	script	Safwat Fahmy	4_M_YURI,{
 	mes "[Safwat Fahmy]";
 	mes "This hotel is nice";
 	mes "and comfortable, but";
@@ -681,7 +681,7 @@ lhz_in02,201,181,7	script	Safwat Fahmy	853,{
 	close;
 }
 
-lhz_in02,251,212,3	script	Hotel Employee#zen2	868,{
+lhz_in02,251,212,3	script	Hotel Employee#zen2	4_M_LGTGUARD,{
 	mes "[Hotel Employee]";
 	mes "This is the Couple Suite.";
 	mes "A single can also check";
@@ -691,7 +691,7 @@ lhz_in02,251,212,3	script	Hotel Employee#zen2	868,{
 	close;
 }
 
-lhz_in02,229,217,3	script	Tanoue#zen04	863,{
+lhz_in02,229,217,3	script	Tanoue#zen04	4_F_LGTGRAND,{
 	mes "[Tanoue]";
 	mes "This chair looks";
 	mes "very nice, but it really";
@@ -707,7 +707,7 @@ lhz_in02,229,217,3	script	Tanoue#zen04	863,{
 	close;
 }
 
-lhz_in02,209,277,5	script	Ben Allen#zen11	84,{
+lhz_in02,209,277,5	script	Ben Allen#zen11	4_M_02,{
 	mes "[Ben Allen]";
 	mes "Aaahhh Oooooh~";
 	mes "It's sooooo comfy~";
@@ -724,7 +724,7 @@ lhz_in02,209,277,5	script	Ben Allen#zen11	84,{
 	close;
 }
 
-lhz_in02,221,276,1	script	Harp#zen8	869,{
+lhz_in02,221,276,1	script	Harp#zen8	4_M_LGTMAN,{
 	mes "[Harp]";
 	mes "Oh sweet jiminy...";
 	mes "That Kafra Lady is so hot.";
@@ -741,7 +741,7 @@ lhz_in02,221,276,1	script	Harp#zen8	869,{
 	close;
 }
 
-lhz_in02,238,275,5	script	Hotel Employee#zen1	869,{
+lhz_in02,238,275,5	script	Hotel Employee#zen1	4_M_LGTMAN,{
 	mes "[Hotel Employee]";
 	mes "''Hospitality with a smile";
 	mes "and total devotion to your";
@@ -752,7 +752,7 @@ lhz_in02,238,275,5	script	Hotel Employee#zen1	869,{
 	close;
 }
 
-lhz_in02,247,275,1	script	Hotel Employee#zen4	868,{
+lhz_in02,247,275,1	script	Hotel Employee#zen4	4_M_LGTGUARD,{
 	mes "[Hotel Employee]";
 	mes "Welcome to the";
 	mes "Royal Dragon Hotel Bar.";
@@ -769,7 +769,7 @@ lhz_in02,247,275,1	script	Hotel Employee#zen4	868,{
 	close;
 }
 
-lhz_in02,271,281,2	script	Citizen#amano09	47,{
+lhz_in02,271,281,2	script	Citizen#amano09	1_M_01,{
 	mes "[Hachi]";
 	mes "Oh yeah. I love-love-love";
 	mes "bars. If I don't come here";
@@ -786,7 +786,7 @@ lhz_in02,271,281,2	script	Citizen#amano09	47,{
 	close;
 }
 
-lhz_in02,277,285,4	script	Bartender#amano07	61,{
+lhz_in02,277,285,4	script	Bartender#amano07	1_M_PUBMASTER,{
 	mes "[Duff]";
 	mes "Hey, you're from";
 	mes "Rune-Midgarts, right?";
@@ -797,7 +797,7 @@ lhz_in02,277,285,4	script	Bartender#amano07	61,{
 	close;
 }
 
-lhz_in02,281,280,6	script	Customer#amano13	816,{
+lhz_in02,281,280,6	script	Customer#amano13	4_F_CHNDRESS2,{
 	mes "[Rona]";
 	mes "I hate it when guys";
 	mes "just sidle up and sort";
@@ -814,7 +814,7 @@ lhz_in02,281,280,6	script	Customer#amano13	816,{
 	close;
 }
 
-lhz_in02,287,282,4	script	Customer#amano10	853,{
+lhz_in02,287,282,4	script	Customer#amano10	4_M_YURI,{
 	mes "[Greenfield]";
 	mes "I don't believe it...";
 	mes "This unlucky streak";
@@ -833,7 +833,7 @@ lhz_in02,287,282,4	script	Customer#amano10	853,{
 	close;
 }
 
-lhz_in02,287,273,3	script	Customer#amano11	50,{
+lhz_in02,287,273,3	script	Customer#amano11	1_M_04,{
 	mes "[Terry]";
 	mes "I'm not big on drinking,";
 	mes "but the atmosphere in this";
@@ -850,7 +850,7 @@ lhz_in02,287,273,3	script	Customer#amano11	50,{
 	close;
 }
 
-lhz_in02,283,276,4	script	Customer#amano12	815,{
+lhz_in02,283,276,4	script	Customer#amano12	4_F_CHNDRESS1,{
 	mes "[Sei]";
 	mes "You see that guy?";
 	mes "That guy over there is";
@@ -876,7 +876,7 @@ lhz_in02,283,276,4	script	Customer#amano12	815,{
 	close;
 }
 
-lighthalzen,123,212,4	script	Merpi#zen2	700,{
+lighthalzen,123,212,4	script	Merpi#zen2	8_F_GIRL,{
 	mes "[Merpi]";
 	mes "Isn't the weather nice";
 	mes "today? All this sunlight";
@@ -920,7 +920,7 @@ lighthalzen,123,212,4	script	Merpi#zen2	700,{
 	}
 }
 
-lighthalzen,296,239,3	script	Berru#lhz_01	706,{
+lighthalzen,296,239,3	script	Berru#lhz_01	4_M_KID1,{
 	switch(rand(1,3)) {
 	case 1:
 		mes "[Berru]";
@@ -994,9 +994,9 @@ lighthalzen,296,239,3	script	Berru#lhz_01	706,{
 	}
 }
 
-lighthalzen,297,239,3	duplicate(Berru#lhz_01)	Pilia#lhz_01	818
+lighthalzen,297,239,3	duplicate(Berru#lhz_01)	Pilia#lhz_01	4_F_CHNWOMAN
 
-lighthalzen,312,233,3	script	Beggar#lhz_02	777,3,1,{
+lighthalzen,312,233,3	script	Beggar#lhz_02	4_M_TWOLDMAN,3,1,{
 	end;
 
 OnTouch:
@@ -1020,7 +1020,7 @@ OnTouch:
 		mes "[" + strcharinfo(0) + "]";
 		mes "Here you go,";
 		mes "take this.";
-		set zeny,zeny-50;
+		Zeny -= 50;
 		next;
 		mes "[Beggar]";
 		mes "Thank you so much.";
@@ -1203,7 +1203,7 @@ OnTouch:
 	close;
 }
 
-lighthalzen,311,194,3	script	Reuben#lhz_02	870,{
+lighthalzen,311,194,3	script	Reuben#lhz_02	4_M_LGTPOOR,{
 	if (rand(1,2)) {
 		mes "[Reuben]";
 		mes "Someday...";
@@ -1231,7 +1231,7 @@ lighthalzen,311,194,3	script	Reuben#lhz_02	870,{
 	close;
 }
 
-lighthalzen,306,324,3	script	Shengwen#zen7	870,{
+lighthalzen,306,324,3	script	Shengwen#zen7	4_M_LGTPOOR,{
 	mes "[Shengwen]";
 	mes "Am I just getting";
 	mes "paranoid? I really";
@@ -1250,7 +1250,7 @@ lighthalzen,306,324,3	script	Shengwen#zen7	870,{
 	close;
 }
 
-lhz_in03,26,167,5	script	Shayna#li	850,{
+lhz_in03,26,167,5	script	Shayna#li	4_F_EINWOMAN,{
 	mes "[Shayna]";
 	mes "^333333*Sigh...*^000000";
 	mes "Oh, you poor";
@@ -1258,7 +1258,7 @@ lhz_in03,26,167,5	script	Shayna#li	850,{
 	close;
 }
 
-lhz_in01,134,45,3	script	Cenku Dekdam#delic	869,{
+lhz_in01,134,45,3	script	Cenku Dekdam#delic	4_M_LGTMAN,{
 	mes "[Cenku Dekdam]";
 	mes "Man, if you were";
 	mes "gonna take this whole";
@@ -1275,7 +1275,7 @@ lhz_in01,134,45,3	script	Cenku Dekdam#delic	869,{
 	close;
 }
 
-lighthalzen,330,276,3	script	Nun#light	79,{
+lighthalzen,330,276,3	script	Nun#light	1_F_PRIEST,{
 	mes "[Angela]";
 	mes "Greetings, adventurer.";
 	mes "I'm Angela, a social";
@@ -1299,7 +1299,7 @@ lighthalzen,330,276,3	script	Nun#light	79,{
 	close;
 }
 
-lighthalzen,337,296,3	script	Employee	867,{
+lighthalzen,337,296,3	script	Employee	4_M_LGTGUARD2,{
 	if (hg_tre > 54) {
 		mes "[Rekenber Employee]";
 		mes "Greetings. As part of our";
@@ -1321,7 +1321,7 @@ lighthalzen,337,296,3	script	Employee	867,{
 	end;
 }
 
-lhz_in01,134,38,3	script	Bankri Kun#kagun	798,{
+lhz_in01,134,38,3	script	Bankri Kun#kagun	4_M_NFMAN,{
 	mes "[Bankri Kun]";
 	mes "Must work...";
 	mes "Must focus...";
@@ -1347,7 +1347,7 @@ lhz_in01,134,38,3	script	Bankri Kun#kagun	798,{
 	close;
 }
 
-lhz_in01,139,40,7	script	Enoz#oz	53,{
+lhz_in01,139,40,7	script	Enoz#oz	1_M_INNKEEPER,{
 	mes "[Enoz]";
 	mes "So, the novel I ordered from";
 	mes "the Rune-Midgarts Kingdom";
@@ -1365,7 +1365,7 @@ lhz_in01,139,40,7	script	Enoz#oz	53,{
 	close;
 }
 
-lhz_in01,124,28,3	script	Ellette#tre	66,{
+lhz_in01,124,28,3	script	Ellette#tre	1_F_01,{
 	mes "[Ellette]";
 	mes "...";
 	next;
@@ -1402,7 +1402,7 @@ lhz_in01,124,28,3	script	Ellette#tre	66,{
 	close;
 }
 
-lhz_in01,125,40,3	script	Dowbow Ryuei#ryusei	843,{
+lhz_in01,125,40,3	script	Dowbow Ryuei#ryusei	4_M_THAIONGBAK,{
 	mes "[Dowbow Ryuei]";
 	mes "Just out of, oh I dunno,";
 	mes "curiosity, which word do";
@@ -1427,7 +1427,7 @@ lhz_in01,125,40,3	script	Dowbow Ryuei#ryusei	843,{
 	close;
 }
 
-lhz_in01,125,46,3	script	Leekal#lackee	849,{
+lhz_in01,125,46,3	script	Leekal#lackee	4_M_DIEMAN,{
 	mes "[Leekal]";
 	mes "So... Very broke.";
 	mes "Why did I spend so much";
@@ -1445,7 +1445,7 @@ lhz_in01,125,46,3	script	Leekal#lackee	849,{
 	close;
 }
 
-lhz_in01,116,53,7	script	Ninjose#nina	841,{
+lhz_in01,116,53,7	script	Ninjose#nina	4_M_THAIAYO,{
 	mes "[Ninjose]";
 	mes "At long last, I've finally";
 	mes "bought my own home. You";
@@ -1456,7 +1456,7 @@ lhz_in01,116,53,7	script	Ninjose#nina	841,{
 	close;
 }
 
-lhz_in01,116,39,7	script	Kejulle Rekenber#reken	822,{
+lhz_in01,116,39,7	script	Kejulle Rekenber#reken	4_M_CHNMAN,{
 	mes "[Kejulle Rekenber]";
 	mes "Hm? Sure, my last name";
 	mes "is Rekenber and that's the";
@@ -1467,7 +1467,7 @@ lhz_in01,116,39,7	script	Kejulle Rekenber#reken	822,{
 	close;
 }
 
-lhz_in01,110,40,3	script	Jorjerro#fhero	89,{
+lhz_in01,110,40,3	script	Jorjerro#fhero	4_M_ORIENT02,{
 	mes "^3355FFThis man here";
 	mes "is motionless,";
 	mes "and for all intents";
@@ -1476,7 +1476,7 @@ lhz_in01,110,40,3	script	Jorjerro#fhero	89,{
 	close;
 }
 
-lhz_in01,116,45,7	script	Joshua#aya	704,{
+lhz_in01,116,45,7	script	Joshua#aya	4_M_BIBI,{
 	mes "[Joshua]";
 	mes "What am I doing here?";
 	mes "Waiting for my dream";
@@ -1493,7 +1493,7 @@ lhz_in01,116,45,7	script	Joshua#aya	704,{
 	close;
 }
 
-lighthalzen,326,249,5	script	Grinnel#zen6	870,{
+lighthalzen,326,249,5	script	Grinnel#zen6	4_M_LGTPOOR,{
 	mes "[Grinnel]";
 	mes "You know the men in";
 	mes "black suits? Boy, did";
@@ -1519,7 +1519,7 @@ lighthalzen,326,249,5	script	Grinnel#zen6	870,{
 	close;
 }
 
-lhz_in03,192,19,3	script	Haggar#zen1	855,{
+lhz_in03,192,19,3	script	Haggar#zen1	4_M_EINMAN,{
 	mes "[Haggar]";
 	mes "Whiskey!";
 	mes "I need me some";
@@ -1533,7 +1533,7 @@ lhz_in03,192,19,3	script	Haggar#zen1	855,{
 	close;
 }
 
-lhz_in03,193,25,2	script	Bartender#12	61,{
+lhz_in03,193,25,2	script	Bartender#12	1_M_PUBMASTER,{
 	mes "[Tony]";
 	if (Sex) {
 		mes "Hey man, I know this";
@@ -1565,7 +1565,7 @@ lhz_in03,193,25,2	script	Bartender#12	61,{
 	close;
 }
 
-lhz_in03,185,20,6	script	Bad Drunk#amano06	869,2,2,{
+lhz_in03,185,20,6	script	Bad Drunk#amano06	4_M_LGTMAN,2,2,{
 	mes "[Garry]";
 	mes "Hey! Hey you...!";
 	mes "D'you wanna, you";
@@ -1583,7 +1583,7 @@ lhz_in03,185,20,6	script	Bad Drunk#amano06	869,2,2,{
 	close;
 }
 
-lhz_in03,186,29,7	script	Bad Drunk#12	869,{
+lhz_in03,186,29,7	script	Bad Drunk#12	4_M_LGTMAN,{
 	mes "[Bonse]";
 	mes "*Hiccup* I loooove";
 	mes "this rum! I caught a cold";
@@ -1602,7 +1602,7 @@ lhz_in03,186,29,7	script	Bad Drunk#12	869,{
 	close;
 }
 
-lhz_in02,265,273,6	script	Lab Staff#amano08	865,{
+lhz_in02,265,273,6	script	Lab Staff#amano08	4_LGTSCIENCE,{
 	mes "[Assam]";
 	mes "This place is nice";
 	mes "and usually pretty quiet.";
@@ -1619,7 +1619,7 @@ lhz_in02,265,273,6	script	Lab Staff#amano08	865,{
 	close;
 }
 
-lhz_in03,192,93,3	script	City Girl#amano05	862,{
+lhz_in03,192,93,3	script	City Girl#amano05	4_F_LGTGIRL,{
 	mes "[Lanko]";
 	mes "Oh, I'm only here";
 	mes "working as a waitress";
@@ -1638,7 +1638,7 @@ lhz_in03,192,93,3	script	City Girl#amano05	862,{
 	close;
 }
 
-lhz_in03,189,87,5	script	Drunken Man#amano01	869,{
+lhz_in03,189,87,5	script	Drunken Man#amano01	4_M_LGTMAN,{
 	mes "[Enku]";
 	mes "*Sob* I just got";
 	mes "dumped! Yeah, I thought";
@@ -1656,7 +1656,7 @@ lhz_in03,189,87,5	script	Drunken Man#amano01	869,{
 	close;
 }
 
-lhz_in03,183,82,7	script	Drunken Man#amano02	870,{
+lhz_in03,183,82,7	script	Drunken Man#amano02	4_M_LGTPOOR,{
 	mes "[Linus]";
 	mes "After ten years";
 	mes "of marriage. My";
@@ -1672,7 +1672,7 @@ lhz_in03,183,82,7	script	Drunken Man#amano02	870,{
 	close;
 }
 
-lhz_in03,180,83,6	script	Citizen#amano03	86,{
+lhz_in03,180,83,6	script	Citizen#amano03	4_M_04,{
 	mes "[Mitchell]";
 	mes "You know, everyone";
 	mes "is different, but I think";
@@ -1696,7 +1696,7 @@ lhz_in03,180,83,6	script	Citizen#amano03	86,{
 	close;
 }
 
-lhz_in03,176,85,5	script	Citizen#amano04	869,{
+lhz_in03,176,85,5	script	Citizen#amano04	4_M_LGTMAN,{
 	mes "[Dique]";
 	mes "One of the things I look";
 	mes "forward to during my day";
@@ -1714,7 +1714,7 @@ lhz_in03,176,85,5	script	Citizen#amano04	869,{
 	close;
 }
 
-lhz_in03,184,38,3	script	Loudmouth	55,{
+lhz_in03,184,38,3	script	Loudmouth	1_M_JOBTESTER,{
 	mes "[Loudmouth]";
 	mes "Do you know who I am?!";
 	mes "Just look at this peg leg.";
@@ -1729,7 +1729,7 @@ lhz_in03,184,38,3	script	Loudmouth	55,{
 	close;
 }
 
-lhz_in01,173,28,4	script	Guard#01::LhzRekGuard	868,{
+lhz_in01,173,28,4	script	Guard#01::LhzRekGuard	4_M_LGTGUARD,{
 	mes "[Guard]";
 	mes "This is a";
 	mes "restricted area.";
@@ -1740,9 +1740,9 @@ lhz_in01,173,28,4	script	Guard#01::LhzRekGuard	868,{
 	close;
 }
 
-lhz_in01,180,28,4	duplicate(LhzRekGuard)	Guard#03	868
+lhz_in01,180,28,4	duplicate(LhzRekGuard)	Guard#03	4_M_LGTGUARD
 
-lhz_in01,72,209,5	script	Guide#lt0	862,{
+lhz_in01,72,209,5	script	Guide#lt0	4_F_LGTGIRL,{
 	mes "[Lasoei]";
 	mes "Oh phooey.";
 	mes "The same customers";
@@ -1758,7 +1758,7 @@ lhz_in01,72,209,5	script	Guide#lt0	862,{
 	close;
 }
 
-lhz_in01,72,195,0	script	Guide#lt1	90,{
+lhz_in01,72,195,0	script	Guide#lt1	4_F_01,{
 	mes "[Geonuii]";
 	mes "Greetings. This path";
 	mes "leads to the Library and";
@@ -1769,14 +1769,14 @@ lhz_in01,72,195,0	script	Guide#lt1	90,{
 	close;
 }
 
-lhz_in01,73,188,0	script	Guide#lt2	862,{
+lhz_in01,73,188,0	script	Guide#lt2	4_F_LGTGIRL,{
 	mes "[Bonnie]";
 	mes "Oh no...";
 	mes "Where did I put it?";
 	close;
 }
 
-lhz_in01,35,226,5	script	Rekenber Guard#li01	867,{
+lhz_in01,35,226,5	script	Rekenber Guard#li01	4_M_LGTGUARD2,{
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Rekenber Guard]";
 		mes "^3355FF(Whoa, it's a member";
@@ -1806,7 +1806,7 @@ lhz_in01,35,226,5	script	Rekenber Guard#li01	867,{
 	close;
 }
 
-lhz_in01,23,132,3	script	Rekenber Guard#li02	867,5,5,{
+lhz_in01,23,132,3	script	Rekenber Guard#li02	4_M_LGTGUARD2,5,5,{
 OnTouch:
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Rekenber Guard]";
@@ -1830,7 +1830,7 @@ OnTouch:
 	end;
 }
 
-lhz_in01,217,121,3	script	Repairman#li_01	851,{
+lhz_in01,217,121,3	script	Repairman#li_01	4_M_REPAIR,{
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Repairman]";
 		mes "No wonder these things";
@@ -1860,7 +1860,7 @@ lhz_in01,217,121,3	script	Repairman#li_01	851,{
 	}
 }
 
-lhz_in01,203,123,3	script	Scientist#li_02	750,{
+lhz_in01,203,123,3	script	Scientist#li_02	4_M_ALCHE_C,{
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Scientist]";
 		mes "Alright. Pull one test";
@@ -1890,7 +1890,7 @@ lhz_in01,203,123,3	script	Scientist#li_02	750,{
 	end;
 }
 
-lhz_in01,199,137,3	script	Scientist#li_03	865,{
+lhz_in01,199,137,3	script	Scientist#li_03	4_LGTSCIENCE,{
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Scientist]";
 		mes "Whoa whoa~!";
@@ -1912,7 +1912,7 @@ lhz_in01,199,137,3	script	Scientist#li_03	865,{
 	end;
 }
 
-lhz_in01,46,125,3	script	Rekenber Guard#li03	867,5,5,{
+lhz_in01,46,125,3	script	Rekenber Guard#li03	4_M_LGTGUARD2,5,5,{
 OnTouch:
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Rekenber Guard]";
@@ -1936,7 +1936,7 @@ OnTouch:
 	end;
 }
 
-lhz_in01,25,141,4	script	Regenschirm Guard	868,{
+lhz_in01,25,141,4	script	Regenschirm Guard	4_M_LGTGUARD,{
 
 	mes "[Regenschirm Guard]";
 	if(isequipped(2241) && isequipped(2243)){
@@ -1975,7 +1975,7 @@ lhz_in01,25,141,4	script	Regenschirm Guard	868,{
 
 // Lighthalzen Bank Area ------------------------------------------------------
 
-lhz_in02,34,41,1	script	Arthur#zen16	849,{
+lhz_in02,34,41,1	script	Arthur#zen16	4_M_DIEMAN,{
 	mes "[Arthur]";
 	mes "The chairs here are";
 	mes "so not ergonomic. And";
@@ -1986,7 +1986,7 @@ lhz_in02,34,41,1	script	Arthur#zen16	849,{
 	close;
 }
 
-lhz_in02,28,39,3	script	Helen#zen6	703,{
+lhz_in02,28,39,3	script	Helen#zen6	4_F_KID2,{
 	mes "[Helen]";
 	mes "You know, maybe when";
 	mes "I grow up, I'll be a bank";
@@ -1996,7 +1996,7 @@ lhz_in02,28,39,3	script	Helen#zen6	703,{
 	close;
 }
 
-lhz_in02,31,34,3	script	Tadem#zen6	847,{
+lhz_in02,31,34,3	script	Tadem#zen6	4_M_EINOLD,{
 	mes "[Tadem]";
 	mes "I do so enjoy the";
 	mes "architectural structure";
@@ -2007,7 +2007,7 @@ lhz_in02,31,34,3	script	Tadem#zen6	847,{
 	close;
 }
 
-lhz_in02,31,33,3	script	Gracie#5	863,{
+lhz_in02,31,33,3	script	Gracie#5	4_F_LGTGRAND,{
 	mes "[Gracie]";
 	mes "Oh, it's so comfortable";
 	mes "in here~ Though, why are";
@@ -2026,7 +2026,7 @@ lhz_in02,31,33,3	script	Gracie#5	863,{
 	close;
 }
 
-lhz_in02,21,38,7	script	Bank Clerk#1::BankClerk	86,{
+lhz_in02,21,38,7	script	Bank Clerk#1::BankClerk	4_M_04,{
 	mes "[Bank Clerk]";
 	mes "Due to some critical system";
 	mes "errors, all of the bank services";
@@ -2035,12 +2035,12 @@ lhz_in02,21,38,7	script	Bank Clerk#1::BankClerk	86,{
 	close;
 }
 
-lhz_in02,21,25,7	duplicate(BankClerk)	Bank Clerk#2	86
-lhz_in02,34,22,1	duplicate(BankClerk)	Bank Clerk#3	755
+lhz_in02,21,25,7	duplicate(BankClerk)	Bank Clerk#2	4_M_04
+lhz_in02,34,22,1	duplicate(BankClerk)	Bank Clerk#3	4_M_SAGE_C
 
 // Lightalzen Prison Area -------------------------------------------------------------
 
-lhz_in02,145,177,0	script	Togii#07	849,{
+lhz_in02,145,177,0	script	Togii#07	4_M_DIEMAN,{
 	mes "[Togii]";
 	mes "Oooh yeah...";
 	mes "Goes down smooth.";
@@ -2050,7 +2050,7 @@ lhz_in02,145,177,0	script	Togii#07	849,{
 	close;
 }
 
-lhz_in02,159,198,7	script	Healthy Looking Guy#hol	85,{
+lhz_in02,159,198,7	script	Healthy Looking Guy#hol	4_M_03,{
 	mes "[Healthy Looking Guy]";
 	mes "Grrrrrr! Leave me alone!";
 	mes "How many times do I have";
@@ -2060,7 +2060,7 @@ lhz_in02,159,198,7	script	Healthy Looking Guy#hol	85,{
 	close;
 }
 
-lhz_in02,157,201,6	script	Hinkley#06	870,{
+lhz_in02,157,201,6	script	Hinkley#06	4_M_LGTPOOR,{
 	mes "[Hinkley]";
 	mes "Meh heh heh...";
 	mes "^333333*Hiccup*^000000 Believe";
@@ -2076,7 +2076,7 @@ lhz_in02,157,201,6	script	Hinkley#06	870,{
 	close;
 }
 
-lhz_in02,153,206,4	script	Millette#05	853,{
+lhz_in02,153,206,4	script	Millette#05	4_M_YURI,{
 	mes "[Millette]";
 	mes "Let me go!";
 	mes "Let me GO!!";
@@ -2095,7 +2095,7 @@ lhz_in02,153,206,4	script	Millette#05	853,{
 	close;
 }
 
-lhz_in02,147,222,3	script	Officer Guo#06::off_guo	85,{
+lhz_in02,147,222,3	script	Officer Guo#06::off_guo	4_M_03,{
 	mes "[Officer Guo]";
 	mes "Tell me...!";
 	mes "TELL ME...!!";
@@ -2168,11 +2168,11 @@ lhz_in02,147,222,3	script	Officer Guo#06::off_guo	85,{
 	close;
 }
 
-lhz_in02,142,222,6	duplicate(off_guo)	Suspect#6	870
+lhz_in02,142,222,6	duplicate(off_guo)	Suspect#6	4_M_LGTPOOR
 
-// New ----------------------------------------------------------------------- 
+// New -----------------------------------------------------------------------
 
-lhz_in01,14,28,3	script	Banquet Staff	109,{
+lhz_in01,14,28,3	script	Banquet Staff	4_M_MANAGER,{
 	mes "[Banquet Staff]";
 	mes "This Banquet Hall is used";
 	mes "to hold events such as dinner";
@@ -2191,7 +2191,7 @@ lhz_in01,14,28,3	script	Banquet Staff	109,{
 	close;
 }
 
-lhz_in01,43,52,3	script	Luccet#li_party	703,{
+lhz_in01,43,52,3	script	Luccet#li_party	4_F_KID2,{
 	mes "[Luccet]";
 	mes "Shhhh! Hey, my brother's";
 	mes "''it,'' so I gotta find a place";
@@ -2202,7 +2202,7 @@ lhz_in01,43,52,3	script	Luccet#li_party	703,{
 	close;
 }
 
-lhz_in01,28,33,7	script	Hanccet#li_party	706,{
+lhz_in01,28,33,7	script	Hanccet#li_party	4_M_KID1,{
 	mes "[Hanccet]";
 	mes "Man... I hate being ''it!''";
 	mes "I'm horrible at this game!";
@@ -2213,7 +2213,7 @@ lhz_in01,28,33,7	script	Hanccet#li_party	706,{
 	close;
 }
 
-lhz_in01,21,50,7	script	Annette#li_party	91,{
+lhz_in01,21,50,7	script	Annette#li_party	4_F_02,{
 	mes "[Annette]";
 	mes "I've heard that the";
 	mes "Rekenber Banquet Hall";
@@ -2230,7 +2230,7 @@ lhz_in01,21,50,7	script	Annette#li_party	91,{
 	close;
 }
 
-lhz_in01,129,54,1	script	Mereth#erem	869,{
+lhz_in01,129,54,1	script	Mereth#erem	4_M_LGTMAN,{
 	mes "^3355FF*Shhhhhhzzzz*";
 	mes "*Shhhhhhzzzz*^000000";
 	next;
@@ -2248,14 +2248,14 @@ lhz_in01,129,54,1	script	Mereth#erem	869,{
 	close;
 }
 
-lhz_in01,108,53,3	script	#horri	111,{
+lhz_in01,108,53,3	script	#horri	HIDDEN_NPC,{
 	mes "^3355FFThis is simply a pile";
 	mes "of files, a smattering of";
 	mes "books and a family portrait.^000000";
 	close;
 }
 
-lhz_in01,108,47,3	script	#never	111,{
+lhz_in01,108,47,3	script	#never	HIDDEN_NPC,{
 	mes "^3355FFThis desk is very";
 	mes "neat and well organized";
 	mes "in comparison to the other";
@@ -2265,7 +2265,7 @@ lhz_in01,108,47,3	script	#never	111,{
 	close;
 }
 
-lhz_in01,166,55,3	script	#crazy4u	111,{
+lhz_in01,166,55,3	script	#crazy4u	HIDDEN_NPC,{
 	mes "^3355FFThis desk has a bookshelf";
 	mes "that is crammed with all sorts";
 	mes "of books. Out of curiosity, you";
@@ -2279,7 +2279,7 @@ lhz_in01,166,55,3	script	#crazy4u	111,{
 	close;
 }
 
-lhz_in01,148,45,3	script	Noama#amano	97,{
+lhz_in01,148,45,3	script	Noama#amano	4W_M_01,{
 	mes "[Noama]";
 	mes "Hee hee~!";
 	mes "You wanna hear";
@@ -2301,7 +2301,7 @@ lhz_in01,148,45,3	script	Noama#amano	97,{
 	close;
 }
 
-lhz_in01,147,40,1	script	Mazwon#minus1	828,{
+lhz_in01,147,40,1	script	Mazwon#minus1	4_M_ROGUE,{
 	mes "[Mazwon]";
 	mes "Crap. Crap! Crap";
 	mes "crap crap crap crap!";
@@ -2321,7 +2321,7 @@ lhz_in01,147,40,1	script	Mazwon#minus1	828,{
 	close;
 }
 
-lhz_in01,157,47,1	script	Mareth#seram	797,{
+lhz_in01,157,47,1	script	Mareth#seram	4_M_NFLOSTMAN,{
 	mes "[Mareth]";
 	mes "Yoo hoo hoo~";
 	mes "Oh, how I love";
@@ -2336,7 +2336,7 @@ lhz_in01,157,47,1	script	Mareth#seram	797,{
 	close;
 }
 
-lhz_in01,164,45,3	script	Eiya#iaiai	91,{
+lhz_in01,164,45,3	script	Eiya#iaiai	4_F_02,{
 	mes "[Eiya]";
 	mes "Jorje seems so cranky";
 	mes "recently. He's usually";
@@ -2352,7 +2352,7 @@ lhz_in01,164,45,3	script	Eiya#iaiai	91,{
 	close;
 }
 
-lhz_in01,135,57,3	script	Blackboard#li	111,{
+lhz_in01,135,57,3	script	Blackboard#li	HIDDEN_NPC,{
 	mes "^3355FFYou found a blackboard";
 	mes "filled with scribbling. You";
 	mes "can only read some of the";
@@ -2382,7 +2382,7 @@ lhz_in01,135,57,3	script	Blackboard#li	111,{
 	close;
 }
 
-lhz_in03,100,18,3	script	Rocky#li_house	81,{
+lhz_in03,100,18,3	script	Rocky#li_house	4_DOG01,{
 	if (rand(1,2) == 1) {
 		mes "[Rocky]";
 		mes "Woof woof!";
@@ -2393,7 +2393,7 @@ lhz_in03,100,18,3	script	Rocky#li_house	81,{
 	close;
 }
 
-lhz_in03,130,41,5	script	Jay#li_house	706,{
+lhz_in03,130,41,5	script	Jay#li_house	4_M_KID1,{
 	mes "[Jay]";
 	mes "My mommy and daddy";
 	mes "always come home late.";
@@ -2408,7 +2408,7 @@ lhz_in03,130,41,5	script	Jay#li_house	706,{
 	close;
 }
 
-lhz_in03,129,22,7	script	Housemaid Jane#li_house1	850,{
+lhz_in03,129,22,7	script	Housemaid Jane#li_house1	4_F_EINWOMAN,{
 	mes "[Housemaid Jane]";
 	mes "This house is enormous...";
 	mes "It's clearly much too big";
@@ -2425,7 +2425,7 @@ lhz_in03,129,22,7	script	Housemaid Jane#li_house1	850,{
 	close;
 }
 
-lhz_in03,124,117,1	script	Housemaid Brenda#li	74,{
+lhz_in03,124,117,1	script	Housemaid Brenda#li	1_F_MERCHANT_02,{
 	mes "[Housemaid Brenda]";
 	mes "I better dust extra";
 	mes "gently around this vase.";
@@ -2435,7 +2435,7 @@ lhz_in03,124,117,1	script	Housemaid Brenda#li	74,{
 	close;
 }
 
-lighthalzen,159,222,1	script	Rekenber Employee#li	109,{
+lighthalzen,159,222,1	script	Rekenber Employee#li	4_M_MANAGER,{
 	mes "[Benatuth]";
 	mes "Down there, the repairman";
 	mes "is just finishing maintenance";
@@ -2453,7 +2453,7 @@ lighthalzen,159,222,1	script	Rekenber Employee#li	109,{
 	close;
 }
 
-lighthalzen,162,304,7	script	Rekenber Guard Drew#li	868,{
+lighthalzen,162,304,7	script	Rekenber Guard Drew#li	4_M_LGTGUARD,{
 	mes "[Rekenber Guard Drew]";
 	mes "Dude, check it out~";
 	mes "Official glossy photos";
@@ -2488,7 +2488,7 @@ lighthalzen,162,304,7	script	Rekenber Guard Drew#li	868,{
 	close;
 }
 
-lighthalzen,163,306,3	script	Rekenber Guard Tan#li	867,{
+lighthalzen,163,306,3	script	Rekenber Guard Tan#li	4_M_LGTGUARD2,{
 	mes "[Rekenber Guard Tan]";
 	mes "Whoa, whoa. Now this...";
 	mes "This is art. The lighting,";
@@ -2510,7 +2510,7 @@ lighthalzen,163,306,3	script	Rekenber Guard Tan#li	867,{
 	close;
 }
 
-lighthalzen,70,227,4	script	Delna#li_reken	102,{
+lighthalzen,70,227,4	script	Delna#li_reken	8_F,{
 	mes "[Delna]";
 	mes "Sometimes the simple";
 	mes "pleasures can give you";
@@ -2528,7 +2528,7 @@ lighthalzen,70,227,4	script	Delna#li_reken	102,{
 	close;
 }
 
-lhz_in02,289,277,3	script	Martial Artist#1	753,{
+lhz_in02,289,277,3	script	Martial Artist#1	4_M_MONK,{
 	mes "[Martial Artist]";
 	mes "Curses...";
 	mes "I've come to the";
@@ -2547,7 +2547,7 @@ lhz_in02,289,277,3	script	Martial Artist#1	753,{
 	close;
 }
 
-lighthalzen,107,107,3	script	Kosit#zen1	869,{
+lighthalzen,107,107,3	script	Kosit#zen1	4_M_LGTMAN,{
 	mes "[Kosit]";
 	mes "This city might have";
 	mes "more guards and rules";
@@ -2571,7 +2571,7 @@ lighthalzen,107,107,3	script	Kosit#zen1	869,{
 	close;
 }
 
-lhz_in03,32,99,3	script	Sopheap#zen1	863,{
+lhz_in03,32,99,3	script	Sopheap#zen1	4_F_LGTGRAND,{
 	mes "[Sopheap]";
 	mes "Oh, you youngsters.";
 	mes "Always traveling around";
@@ -2588,7 +2588,7 @@ lhz_in03,32,99,3	script	Sopheap#zen1	863,{
 	close;
 }
 
-lhz_in03,25,105,5	script	Gopal#zen4	869,{
+lhz_in03,25,105,5	script	Gopal#zen4	4_M_LGTMAN,{
 	mes "[Gopal]";
 	mes "Granny may be happy";
 	mes "just sitting around and";
@@ -2605,7 +2605,7 @@ lhz_in03,25,105,5	script	Gopal#zen4	869,{
 	close;
 }
 
-lighthalzen,176,65,5	script	Kimmy#zen3	862,{
+lighthalzen,176,65,5	script	Kimmy#zen3	4_F_LGTGIRL,{
 	mes "[Kimmy]";
 	mes "Unlike most places,";
 	mes "Lighthalzen has many";
@@ -2624,7 +2624,7 @@ lighthalzen,176,65,5	script	Kimmy#zen3	862,{
 	close;
 }
 
-lighthalzen,364,282,3	script	Bodger#zen5	870,{
+lighthalzen,364,282,3	script	Bodger#zen5	4_M_LGTPOOR,{
 	mes "[Bodger]";
 	mes "Another hungry day...";
 	mes "I don't have any money";
@@ -2642,7 +2642,7 @@ lighthalzen,364,282,3	script	Bodger#zen5	870,{
 	close;
 }
 
-lhz_in03,239,38,3	script	Avetis#zen10	849,{
+lhz_in03,239,38,3	script	Avetis#zen10	4_M_DIEMAN,{
 	mes "[Avetis]";
 	mes "A-ack...";
 	mes "^333333*Cough cough*^000000";
@@ -2661,7 +2661,7 @@ lhz_in03,239,38,3	script	Avetis#zen10	849,{
 	close;
 }
 
-lhz_in02,267,25,4	script	Diana#npc	747,{
+lhz_in02,267,25,4	script	Diana#npc	4_F_ROGUE,{
 	mes "[Diana]";
 	mes "Oh wow, that weapon";
 	mes "is fantastic! But I'm sure";
@@ -2721,7 +2721,7 @@ lhz_in02,267,25,4	script	Diana#npc	747,{
 	close;
 }
 
-lhz_in02,267,22,1	script	Shop Assistant#cobo	91,{
+lhz_in02,267,22,1	script	Shop Assistant#cobo	4_F_02,{
 	mes "[Shop Assistant]";
 	mes "Welcome to our";
 	mes "store where we offer";
@@ -2739,7 +2739,7 @@ lhz_in02,267,22,1	script	Shop Assistant#cobo	91,{
 	close;
 }
 
-lighthalzen,192,63,4	script	Sergei#zen1	92,{
+lighthalzen,192,63,4	script	Sergei#zen1	4_F_03,{
 	mes "[Sergei]";
 	mes "You know, there's an";
 	mes "interesting story about";
@@ -2780,7 +2780,7 @@ lighthalzen,192,63,4	script	Sergei#zen1	92,{
 	close;
 }
 
-lighthalzen,258,223,3	script	Srinivas#zen4	866,{
+lighthalzen,258,223,3	script	Srinivas#zen4	4_M_LGTGRAND,{
 	mes "[Srinivas]";
 	mes "Those rundown buildings";
 	mes "in the slums are an eyesore";
@@ -2791,7 +2791,7 @@ lighthalzen,258,223,3	script	Srinivas#zen4	866,{
 	close;
 }
 
-lighthalzen,77,203,3	script	Victor Perfecto#zen9	869,{
+lighthalzen,77,203,3	script	Victor Perfecto#zen9	4_M_LGTMAN,{
 	mes "[Victor Perfecto]";
 	mes "I've heard that the";
 	mes "Rekenber Corporation";
@@ -2817,7 +2817,7 @@ lighthalzen,77,203,3	script	Victor Perfecto#zen9	869,{
 	close;
 }
 
-lighthalzen,40,107,4	script	Vergil#zen4	869,{
+lighthalzen,40,107,4	script	Vergil#zen4	4_M_LGTMAN,{
 	mes "[Vergil]";
 	mes "The weather is so";
 	mes "nice today, like always.";
@@ -2900,7 +2900,7 @@ lighthalzen,40,107,4	script	Vergil#zen4	869,{
 	}
 }
 
-lhz_in01,144,53,3	script	Jorje#zero	98,1,1,{
+lhz_in01,144,53,3	script	Jorje#zero	4W_M_02,1,1,{
 OnTouch:
 	switch(rand(1,3)) {
 	case 1:
@@ -2938,7 +2938,7 @@ OnTouch:
 	end;
 }
 
-lhz_in01,139,48,7	script	Leimi#mimir	73,{
+lhz_in01,139,48,7	script	Leimi#mimir	1_F_MERCHANT_01,{
 	mes "[Leimi]";
 	mes "...";
 	mes "......";
@@ -2986,7 +2986,7 @@ OnTouch:
 	end;
 }
 
-lhz_in02,36,274,4	script	Cool Event Staff#Saera	831,{
+lhz_in02,36,274,4	script	Cool Event Staff#Saera	4_F_ZONDAGIRL,{
 	mes "[Saera]";
 	mes "Welcome to the";
 	mes "temporary headquarters";
@@ -3064,7 +3064,7 @@ lhz_in02,36,274,4	script	Cool Event Staff#Saera	831,{
 	}
 }
 
-lhz_in02,40,280,6	script	Event Planner	833,{
+lhz_in02,40,280,6	script	Event Planner	4_M_ZONDAOYAJI,{
 	mes "[Jellarin]";
 	mes "I don't like this.";
 	mes "But I don't like that";
@@ -3080,7 +3080,7 @@ lhz_in02,40,280,6	script	Event Planner	833,{
 	close;
 }
 
-lhz_in02,110,286,5	script	Cool Event Manager	853,{
+lhz_in02,110,286,5	script	Cool Event Manager	4_M_YURI,{
 	mes "[Baoto]";
 	mes "Hmmm...";
 	mes "The employees seem";
@@ -3098,7 +3098,7 @@ lhz_in02,110,286,5	script	Cool Event Manager	853,{
 	close;
 }
 
-lhz_in02,36,284,0	script	Cool Event Staff#Cesuna	874,{
+lhz_in02,36,284,0	script	Cool Event Staff#Cesuna	4_M_ZONDAMAN,{
 	mes "[Cesuna]";
 	mes "Ack! I'm totally";
 	mes "swamped with all this";
@@ -3116,7 +3116,7 @@ lhz_in02,36,284,0	script	Cool Event Staff#Cesuna	874,{
 }
 
 /*
-lhz_in02,19,274,2	script	Maintenance Guy#lhz	851,{
+lhz_in02,19,274,2	script	Maintenance Guy#lhz	4_M_REPAIR,{
 	mes "[Kudiuu]";
 	mes "Holy...!";
 	mes "Will this place";
@@ -3128,7 +3128,7 @@ lhz_in02,19,274,2	script	Maintenance Guy#lhz	851,{
 }
 */
 
-lighthalzen,337,296,3	script	Rekenber Employee#li_2	868,{
+lighthalzen,337,296,3	script	Rekenber Employee#li_2	4_M_LGTGUARD,{
 	if (hg_tre > 54) {
 		mes "[Rekenber Employee]";
 		mes "Greetings. As part of our";
@@ -3149,7 +3149,7 @@ lighthalzen,337,296,3	script	Rekenber Employee#li_2	868,{
 	}
 }
 
-lhz_in01,221,131,7	script	Scientist#li_01	865,{
+lhz_in01,221,131,7	script	Scientist#li_01	4_LGTSCIENCE,{
 	if (isequipped(2241) && isequipped(2243)) {
 		if (hg_tre > 54) {
 			mes "[A Scientist]";
@@ -3205,7 +3205,7 @@ lhz_in01,157,54,0,0	monster	Red Mushroom	1085,1,120000,100000,0
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Massive NPC clean up, includes corrected dialogs and [L0ne_W0lf]
 //=	added missing dialogs, fixed indentation, corrected some NPC
-//=	facing positions, NPC names are more unique now. Removed 
+//=	facing positions, NPC names are more unique now. Removed
 //=	whitespace (empty lines after header and before end curly)
 //=	reduced usage of the command "goto", grammatical corrections.
 //=	Added additional missing NPCs.
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index 9f4b41f80..b0aa53dbc 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -1,23 +1,23 @@
-//===== Hercules Script ====================================== 
-//= Louyang City NPC's 
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= Louyang City NPCs
+//===== By: ==================================================
 //= Vidar (1.0)
 //= Mass Zero (1.1)
 //= Dino9021, roughly translated by Celest (1.2)
 //= Mass Zero (1.3)
 //= MasterOfMuppets (2.0)
 //= rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.0
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Louyang Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.9 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //= 3.0 Moved Alberta NPC to pre-re/re paths. [Euphy]
 //============================================================
 
-// Louyang Transportaion
+// Louyang Transportation
 //============================================================
 -	script	::Girl_louyang	-1,{
 	mes "[Girl]";
@@ -70,7 +70,7 @@
 				mes "Ready!";
 				mes "Have fun!";
 				close2;
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				warp "lou_fild01",190,101;
 				end;
 			}
@@ -95,7 +95,7 @@
 	}
 }
 
-lou_fild01,190,100,7	script	Girl#1lou	815,{
+lou_fild01,190,100,7	script	Girl#1lou	4_F_CHNDRESS1,{
 	mes "[Girl]";
 	mes "Would you";
 	mes "like to go back";
@@ -135,7 +135,7 @@ lou_fild01,190,100,7	script	Girl#1lou	815,{
 
 // Generic Louyang NPCs
 //============================================================
-louyang,297,167,2	script	Muscular Woman#lou	815,{
+louyang,297,167,2	script	Muscular Woman#lou	4_F_CHNDRESS1,{
 	if (!Sex) {
 		mes "[Zhi Ching Li]";
 		mes "All the members of the Maiden Palace, including myself and our master, are all female.";
@@ -158,7 +158,7 @@ louyang,297,167,2	script	Muscular Woman#lou	815,{
 	close;
 }
 
-louyang,274,136,4	script	Powerful-looking guy#lou	819,{
+louyang,274,136,4	script	Powerful-looking guy#lou	4_M_CHN8GUEK,{
 	mes "[Akiira]";
 	mes "I am practicing my 'Claw of Dragon.' I not only need to use the power of my fists, I must also condition myself spiritually.";
 	next;
@@ -180,7 +180,7 @@ louyang,274,136,4	script	Powerful-looking guy#lou	819,{
 	close;
 }
 
-louyang,276,136,4	script	Fist master#lou	819,{
+louyang,276,136,4	script	Fist master#lou	4_M_CHN8GUEK,{
 	mes "[Zhiang Xiau Ji]";
 	mes "Finally...";
 	mes "I have mastered";
@@ -205,7 +205,7 @@ louyang,276,136,4	script	Fist master#lou	819,{
 	close;
 }
 
-louyang,276,133,0	script	Trainee#1lou::LouTrainee	819,{
+louyang,276,133,0	script	Trainee#1lou::LouTrainee	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Yeeeyap~!";
 	mes "Taaaaaah~~!!";
@@ -213,7 +213,7 @@ louyang,276,133,0	script	Trainee#1lou::LouTrainee	819,{
 	close;
 }
 
-louyang,276,131,0	script	Trainee#2lou	819,{
+louyang,276,131,0	script	Trainee#2lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Tah Tah Tah!";
 	mes "Taaaaaah~~!!";
@@ -221,14 +221,14 @@ louyang,276,131,0	script	Trainee#2lou	819,{
 	close;
 }
 
-louyang,276,129,0	script	Trainee#3lou	819,{
+louyang,276,129,0	script	Trainee#3lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Si!";
 	mes "Ayah!!";
 	close;
 }
 
-louyang,274,133,0	script	Trainee#4lou	819,{
+louyang,274,133,0	script	Trainee#4lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Dergh!";
 	mes "Dergh!";
@@ -236,7 +236,7 @@ louyang,274,133,0	script	Trainee#4lou	819,{
 	close;
 }
 
-louyang,274,131,0	script	Trainee#5lou	819,{
+louyang,274,131,0	script	Trainee#5lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Yah Yah Yah!";
 	mes "Taaaaaah~~!!";
@@ -244,7 +244,7 @@ louyang,274,131,0	script	Trainee#5lou	819,{
 	close;
 }
 
-louyang,274,129,0	script	Trainee#6lou	819,{
+louyang,274,129,0	script	Trainee#6lou	4_M_CHN8GUEK,{
 	mes "[Trainee]";
 	mes "Yeeeyap~!";
 	mes "Taaaaaah~~!!";
@@ -252,16 +252,16 @@ louyang,274,129,0	script	Trainee#6lou	819,{
 	close;
 }
 
-louyang,278,133,0	duplicate(LouTrainee)	Trainee#7lou	819
-louyang,278,131,0	duplicate(LouTrainee)	Trainee#8lou	819
-louyang,278,129,0	duplicate(LouTrainee)	Trainee#9lou	819
-louyang,272,133,0	duplicate(LouTrainee)	Trainee#10lou	819
-louyang,272,131,0	duplicate(LouTrainee)	Trainee#11lou	819
-louyang,272,129,0	duplicate(LouTrainee)	Trainee#12lou	819
+louyang,278,133,0	duplicate(LouTrainee)	Trainee#7lou	4_M_CHN8GUEK
+louyang,278,131,0	duplicate(LouTrainee)	Trainee#8lou	4_M_CHN8GUEK
+louyang,278,129,0	duplicate(LouTrainee)	Trainee#9lou	4_M_CHN8GUEK
+louyang,272,133,0	duplicate(LouTrainee)	Trainee#10lou	4_M_CHN8GUEK
+louyang,272,131,0	duplicate(LouTrainee)	Trainee#11lou	4_M_CHN8GUEK
+louyang,272,129,0	duplicate(LouTrainee)	Trainee#12lou	4_M_CHN8GUEK
 
 // Louyang Viewing Tower
 //============================================================
-lou_in01,25,23,5	script	Friendly Looking Lady#lo	817,{
+lou_in01,25,23,5	script	Friendly Looking Lady#lo	4_F_CHNDRESS3,{
 	mes "[Hong Miao]";
 	mes "Welcome.";
 	next;
@@ -292,7 +292,7 @@ lou_in01,25,23,5	script	Friendly Looking Lady#lo	817,{
 		mes "We are trying to provide you with the best of service. Please";
 		mes "come again.";
 		next;
-		set zeny,zeny-500;
+		Zeny -= 500;
 		warp "lou_in01",17,19;
 		end;
 	case 3:
@@ -304,7 +304,7 @@ lou_in01,25,23,5	script	Friendly Looking Lady#lo	817,{
 	}
 }
 
-louyang,84,254,0	script	Exit#lou	111,{
+louyang,84,254,0	script	Exit#lou	HIDDEN_NPC,{
 	mes "^3355FFThere is some sort";
 	mes "of descent apparatus.";
 	mes "Would you like to use it?^000000";
@@ -323,22 +323,22 @@ louyang,84,254,0	script	Exit#lou	111,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Originally made for Vidar
-//= 1.2 - Added official warp NPC's
-//= 1.3 - Fixed gramatical errors. (Like wtf's with the weird
-//	  texts celest? xD)
-//= 2.0 - Completely rewrote the current scripts based on iRO.
-//        Added the 'Shouting Quest' and the 'Medicine Quest'
+//= 1.2 Added official warp NPC's
+//= 1.3 Fixed gramatical errors. (Like wtf's with the weird
+//=     texts celest? xD)
+//= 2.0 Completely rewrote the current scripts based on iRO.
+//=     Added the 'Shouting Quest' and the 'Medicine Quest'
 //= 2.1 Optimized, made quest vars unique [Lupus]
 //= 2.1a minor fix, 2.1b Fixed Typos [Nexon]
 //= 2.2 Fixed exploits [Lupus]
 //= 2.2a Updated the color codes a little and fixed the shouting quest
-//=	 to broadcast green text.
+//=     to broadcast green text.
 //= 2.2b A small fix to the shout quest npc in louyang field not warping you
-//=	 back up to the tower if you died or teleported out of there. [MasterOfMuppets]
+//=     back up to the tower if you died or teleported out of there. [MasterOfMuppets]
 //= 2.3 A small fix, the code is so messy I can't believe I scripted it >.< [MasterOfMuppets]
 //= 2.4 Implemented a few more npcs, thanks to Prometheus for them. [MasterOfMuppets]
 //= 2.5 Implemented the Poison King quest, beware of potential bugs. [MasterOfMuppets]
diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt
index 95fce1beb..def5e03ab 100644
--- a/npc/cities/lutie.txt
+++ b/npc/cities/lutie.txt
@@ -1,16 +1,16 @@
 //===== Hercules Script ======================================
 //= Lutie Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.7
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Lutie - City NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Edited some text and updated/enabled some triggers
-//= for the quest.[kobra_k88]
+//=     for the quest.[kobra_k88]
 //= 1.2 Fixed exploit. Checked for Bard Job Quest compatibility [Lupus]
-//= 1.3 Fixed typos [Nexon] 
+//= 1.3 Fixed typos [Nexon]
 //= 1.4 Fixed exploit [Lupus]
 //= 1.5 Fixed a bug that could reset Lutie quest state [Lupus]
 //= 1.6 Heavy optimization to all the NPCs [DZeroX]
@@ -19,7 +19,7 @@
 
 // Teleport to Lutie
 //============================================================
-aldebaran,223,222,4	script	Mr. Claus	718,{
+aldebaran,223,222,4	script	Mr. Claus	4_M_SANTA,{
 	mes "[Mr. Claus]";
 	mes "Ho Ho Ho~";
 	mes "Merry Christmas!!";
@@ -27,48 +27,48 @@ aldebaran,223,222,4	script	Mr. Claus	718,{
 	mes "and Christmas cheer!";
 	next;
 	switch(select("Info about Lutie:Move to 'Lutie':Cancel")) {
-		case 1:
-			mes "[Mr. Claus]";
-			mes "^3355FFLutie^000000, the fantastic Christmas Town! Always filled with the spirit of giving, Lutie is filled with appetizing cakes, tiny toy soldiers, and all sorts of wonderful things~!";
-			next;
-			mes "[Mr. Claus]";
-			mes "Ho Ho Ho~";
-			mes "It's an amazing land blessed with the beauty of winter, and a year round atmosphere of festivity!";
-			next;
-			mes "[Mr. Claus]";
-			mes "I'm a Santa that will guide people to Lutie, the Christmas Town. Ask me at any time, and I'll magically send you there~";
-			close;
-		case 2:
-			mes "[Mr. Claus]";
-			mes "Ho Ho Ho~";
-			mes "The only way to get to Lutie is here in Al de Baran!";
-			next;
-			mes "[Mr. Claus]";
-			mes "I keep this place and personally transport people who want to visit Lutie. Please ask Santa Claus over there if you want to leave town. He will let you know the way out of Lutie.";
-			next;
-			mes "[Mr. Claus]";
-			mes "Ho Ho Ho~";
-			mes "Well, are you ready?";
-			mes "Have a nice trip!";
-			mes "Meeeeerry Christmas!";
-			close2;
-			warp "xmas_fild01",78,68;
-			end;
-		case 3:
-			mes "[Mr. Claus]";
-			mes "Ho Ho Ho~";
-			mes "Whenever you want to visit Lutie, be my guest. Just let me know when you want to leave.";
-			next;
-			mes "[Mr. Claus]";
-			mes "Ho ho hooooo!!";
-			mes "Haaaaappy Holidays!";
-			close;
+	case 1:
+		mes "[Mr. Claus]";
+		mes "^3355FFLutie^000000, the fantastic Christmas Town! Always filled with the spirit of giving, Lutie is filled with appetizing cakes, tiny toy soldiers, and all sorts of wonderful things~!";
+		next;
+		mes "[Mr. Claus]";
+		mes "Ho Ho Ho~";
+		mes "It's an amazing land blessed with the beauty of winter, and a year round atmosphere of festivity!";
+		next;
+		mes "[Mr. Claus]";
+		mes "I'm a Santa that will guide people to Lutie, the Christmas Town. Ask me at any time, and I'll magically send you there~";
+		close;
+	case 2:
+		mes "[Mr. Claus]";
+		mes "Ho Ho Ho~";
+		mes "The only way to get to Lutie is here in Al de Baran!";
+		next;
+		mes "[Mr. Claus]";
+		mes "I keep this place and personally transport people who want to visit Lutie. Please ask Santa Claus over there if you want to leave town. He will let you know the way out of Lutie.";
+		next;
+		mes "[Mr. Claus]";
+		mes "Ho Ho Ho~";
+		mes "Well, are you ready?";
+		mes "Have a nice trip!";
+		mes "Meeeeerry Christmas!";
+		close2;
+		warp "xmas_fild01",78,68;
+		end;
+	case 3:
+		mes "[Mr. Claus]";
+		mes "Ho Ho Ho~";
+		mes "Whenever you want to visit Lutie, be my guest. Just let me know when you want to leave.";
+		next;
+		mes "[Mr. Claus]";
+		mes "Ho ho hooooo!!";
+		mes "Haaaaappy Holidays!";
+		close;
 	}
 }
 
 // Inside Lutie
 //============================================================
-xmas_in,100,96,4	script	Santa Claus	718,{
+xmas_in,100,96,4	script	Santa Claus	4_M_SANTA,{
 	mes "[Santa Claus]";
 	mes "Ho Ho Ho~";
 	mes "Meeeerry Christmas !!";
@@ -89,8 +89,8 @@ xmas_in,100,96,4	script	Santa Claus	718,{
 	close;
 }
 
-xmas_in,167,173,4	script	Duffle	711,{
-	if(xmas_npc == 1) {
+xmas_in,167,173,4	script	Duffle	4_F_05,{
+	if (xmas_npc == 1) {
 		mes "[Duffle]";
 		mes "Merry Christmas!";
 		mes "Welcome to Lutie!";
@@ -149,8 +149,8 @@ xmas_in,167,173,4	script	Duffle	711,{
 	}
 }
 
-xmas_in,27,103,4	script	Lenient Aunt	701,{
-switch (xmas_npc) {
+xmas_in,27,103,4	script	Lenient Aunt	4_F_GODEMOM,{
+	switch (xmas_npc) {
 	case 5:
 		mes "[Thachentze]";
 		mes "Hmm? The Hairy guy";
@@ -274,8 +274,8 @@ switch (xmas_npc) {
 
 // Lutie
 //============================================================
-xmas,117,304,4	script	Poze	713,{
-	if(xmas_npc == 3 || xmas_npc == 4) {
+xmas,117,304,4	script	Poze	4_M_06,{
+	if (xmas_npc == 3 || xmas_npc == 4) {
 		mes "[Poze]";
 		mes "You've gone to";
 		mes "^3355FFSnowysnow^000000 and he";
@@ -298,7 +298,7 @@ xmas,117,304,4	script	Poze	713,{
 		mes "But that's pretty much all I know. For the actual details, you should ask ^3355FFUncle Hairy Cantata^000000.";
 		set xmas_npc,4;
 		close;
-	}else{
+	} else {
 		mes "[Poze]";
 		mes "Welcome to Lutie,";
 		mes "the town which blesses";
@@ -318,14 +318,14 @@ xmas,117,304,4	script	Poze	713,{
 	}
 }
 
-xmas,176,236,4	script	Uncle Hairy	712,{
-	if(xmas_npc == 4) {
-		if(countitem(1024) > 0 && countitem(938) > 0) {
+xmas,176,236,4	script	Uncle Hairy	4_M_05,{
+	if (xmas_npc == 4) {
+		if (countitem(1024) > 0 && countitem(938) > 0) {
 			mes "[Cantata]";
 			mes "Oh? Y-y-you've got the stuff? Goooooooood. It's been so long since I've been able to have some of this... G-give it to me!";
 			next;
-			delitem 1024,1;	// Chinese_Ink
-			delitem 938,1;	// Sticky_Mucus
+			delitem 1024,1; // Chinese_Ink
+			delitem 938,1; // Sticky_Mucus
 			mes "^3355FFYou quickly handed him the Squid Ink and Sticky Mucus and watched with a little disgust as he relished the flavor.^000000";
 			next;
 			mes "[Cantata]";
@@ -383,7 +383,7 @@ xmas,176,236,4	script	Uncle Hairy	712,{
 			mes "^3355FFThachentze^000000, that lovely pickle maker, knows more about it. So if you're curious, you should go talk to her. Alrighty then, Merry Christmas!";
 			set xmas_npc,5;
 			close;
-		}else{
+		} else {
 			mes "[Cantata]";
 			mes "Oh yeah? Heard about me from Poze, did you? Haw haw haw! Yeah, I know a little bit about Snowysnow. In fact, I may even be his weak point, since...";
 			next;
@@ -451,7 +451,7 @@ xmas,176,236,4	script	Uncle Hairy	712,{
 	}
 }
 
-xmas,134,112,4	script	Snowman	710,{
+xmas,134,112,4	script	Snowman	4_M_SNOWMAN,{
 	if (checkweight(1201,1) == 0 ) {
 		cutin "rutie_snownow01.bmp",2;
 		mes "- Wait a minute !! -";
@@ -459,7 +459,9 @@ xmas,134,112,4	script	Snowman	710,{
 		mes "- too many items with you. -";
 		mes "- Please try again -";
 		mes "- after you loose some weight. -";
-		close2;	cutin "",255;	end;
+		close2;
+		cutin "",255;
+		end;
 	}
 	cutin "rutie_snownow03.bmp",2;
 	mes "[Snowysnow]";
@@ -505,8 +507,10 @@ xmas,134,112,4	script	Snowman	710,{
 			next;
 			mes "[Snowysnow]";
 			mes "So will you be my friend? If you do, I'll be your friend too~";
-			close2;	cutin "",255;	end;
-		}else{
+			close2;
+			cutin "",255;
+			end;
+		} else {
 			switch(xmas_npc) {
 			case 2:
 				cutin "rutie_snownow01.bmp",2;
@@ -535,7 +539,9 @@ xmas,134,112,4	script	Snowman	710,{
 				mes "^3355FFSnowysnow is immersed in his deep thoughts, and seems^000000";
 				mes "^3355FFfixated on Poze's memento.^000000";
 				set xmas_npc,3;
-				close2;	cutin "",255; end;
+				close2;
+				cutin "",255;
+				end;
 			case 3:
 				cutin "rutie_snownow01.bmp",2;
 				mes "[Snowysnow]";
@@ -543,7 +549,9 @@ xmas,134,112,4	script	Snowman	710,{
 				next;
 				mes "^3355FFSnowysnow is immersed in his deep thoughts, and seems^000000";
 				mes "^3355FFfixated on Poze's memento.^000000";
-				close2;	cutin "",255;	end;
+				close2;
+				cutin "",255;
+				end;
 			case 4:
 				cutin "rutie_snownow01.bmp",2;
 				mes "[Snowysnow]";
@@ -563,7 +571,9 @@ xmas,134,112,4	script	Snowman	710,{
 				next;
 				mes "[Snowysnow]";
 				mes "But I know that's because she likes him a whole whole lot! Hee hee hee!";
-				close2;	cutin "",255;	end;
+				close2;
+				cutin "",255;
+				end;
 			case 5:
 				cutin "rutie_snownow01.bmp",2;
 				mes "[Snowysnow]";
@@ -577,7 +587,9 @@ xmas,134,112,4	script	Snowman	710,{
 				next;
 				mes "[Snowysnow]";
 				mes "Of course, he still enjoys drinking strange things. They say it's a miracle that he doesn't have a tummyache. Hee hee~! Oh, I love that guy!";
-				close2;	cutin "",255;	end;
+				close2;
+				cutin "",255;
+				end;
 			case 6:
 				cutin "rutie_snownow01.bmp",2;
 				mes "[Snowysnow]";
@@ -593,14 +605,18 @@ xmas,134,112,4	script	Snowman	710,{
 				next;
 				mes "[Snowysnow]";
 				mes "I like her cooking because it's soooo delicious! Sometimes, she gives me grape syrup on snow flakes. Anyway, please deliver that salt for me, buddy~!";
-				close2;	cutin "",255;	end;
+				close2;
+				cutin "",255;
+				end;
 			case 7:
 				cutin "rutie_snownow01.bmp",2;
 				mes "[Snowysnow]";
 				mes "'^3355FFThe roughest";
 				mes "salt in the world^000000...'";
 				mes "Wow. Now, that's rough! Aunt Tachentze is always making pickles, so she sure could use it soon!";
-				close2;	cutin "",255;	end;
+				close2;
+				cutin "",255;
+				end;
 			case 8:
 				cutin "rutie_snownow01.bmp",2;
 				mes "[Snowysnow]";
@@ -608,7 +624,9 @@ xmas,134,112,4	script	Snowman	710,{
 				next;
 				mes "[Snowysnow]";
 				mes "He's always trying his best to make those two orphans laugh and forget their troubles...";
-				close2;	cutin "",255;	end;
+				close2;
+				cutin "",255;
+				end;
 			case 9:
 				cutin "rutie_snownow01.bmp",2;
 				mes "[Snowysnow]";
@@ -618,7 +636,9 @@ xmas,134,112,4	script	Snowman	710,{
 				mes "[Snowysnow]";
 				mes "I'm sure of it!";
 				mes "Hee hee hee~!";
-				close2;	cutin "",255;	end;
+				close2;
+				cutin "",255;
+				end;
 			case 10:
 				cutin "rutie_snownow01.bmp",2;
 				mes "[Snowysnow]";
@@ -640,7 +660,7 @@ xmas,134,112,4	script	Snowman	710,{
 				switch(.@snownow) {
 				case 1:
 					set xmas_npc,11;
-					getitem 529,5;	// Candy
+					getitem 529,5; // Candy
 					cutin "rutie_snownow02.bmp",2;
 					mes "[Snowysnow]";
 					mes "Wow~!";
@@ -649,7 +669,7 @@ xmas,134,112,4	script	Snowman	710,{
 					break;
 				case 2:
 					set xmas_npc,11;
-					getitem 529,10;	// Candy
+					getitem 529,10; // Candy
 					cutin "rutie_snownow02.bmp",2;
 					mes "[Snowysnow]";
 					mes "Ooh~!";
@@ -657,7 +677,7 @@ xmas,134,112,4	script	Snowman	710,{
 					break;
 				case 3:
 					set xmas_npc,11;
-					getitem 530,5;	// Candy_Striper
+					getitem 530,5; // Candy_Striper
 					cutin "rutie_snownow02.bmp",2;
 					mes "[Snowysnow]";
 					mes "Hoooraaaay~!";
@@ -665,7 +685,7 @@ xmas,134,112,4	script	Snowman	710,{
 					break;
 				case 4:
 					set xmas_npc,11;
-					getitem 530,10;	// Candy_Striper
+					getitem 530,10; // Candy_Striper
 					cutin "rutie_snownow02.bmp",2;
 					mes "[Snowysnow]";
 					mes "Wow, that's so great!";
@@ -673,7 +693,7 @@ xmas,134,112,4	script	Snowman	710,{
 					break;
 				case 5:
 					set xmas_npc,11;
-					getitem 539,1;	// Piece_Of_Cake
+					getitem 539,1; // Piece_Of_Cake
 					cutin "rutie_snownow02.bmp",2;
 					mes "[Snowysnow]";
 					mes "Aren't you lucky!";
@@ -681,7 +701,7 @@ xmas,134,112,4	script	Snowman	710,{
 					break;
 				case 6:
 					set xmas_npc,11;
-					getitem 539,2;	// Piece_Of_Cake
+					getitem 539,2; // Piece_Of_Cake
 					cutin "rutie_snownow02.bmp",2;
 					mes "[Snowysnow]";
 					mes "Now, isn't that nice?";
@@ -689,7 +709,7 @@ xmas,134,112,4	script	Snowman	710,{
 					break;
 				case 7:
 					set xmas_npc,11;
-					getitem 538,5;	// Well_Baked_Cookie
+					getitem 538,5; // Well_Baked_Cookie
 					cutin "rutie_snownow02.bmp",2;
 					mes "[Snowysnow]";
 					mes "Oh woooooow~!";
@@ -697,7 +717,7 @@ xmas,134,112,4	script	Snowman	710,{
 					break;
 				case 8:
 					set xmas_npc,11;
-					getitem 538,10;	// Well_Baked_Cookie
+					getitem 538,10; // Well_Baked_Cookie
 					cutin "rutie_snownow02.bmp",2;
 					mes "[Snowysnow]";
 					mes "*Gasp!* Ooh~";
@@ -707,7 +727,9 @@ xmas,134,112,4	script	Snowman	710,{
 				next;
 				mes "[Snowysnow]";
 				mes "My dear friend, please visit me from time to time, so that we can chitchat, okay? See you soon! And Merry Christmas!";
-				close2;	cutin "",255;	end;
+				close2;
+				cutin "",255;
+				end;
 			case 11:
 				cutin "rutie_snownow02.bmp",2;
 				mes "[Snowysnow]";
@@ -715,7 +737,9 @@ xmas,134,112,4	script	Snowman	710,{
 				next;
 				mes "[Snowysnow]";
 				mes "You're always welcome in Lutie, especially by me, Snowysnow! Happy Kwanza, Happy Hannukah and Merry Christmas~!";
-				close2;	cutin "",255;	end;
+				close2;
+				cutin "",255;
+				end;
 			}
 		}
 		case 2:
@@ -729,18 +753,22 @@ xmas,134,112,4	script	Snowman	710,{
 			cutin "rutie_snownow01.bmp",2;
 			mes "[Snowysnow]";
 			mes "Isn't that soooo exciting?! *Sigh* Even if it is a dungeon, I would like to go inside just to look. If only I was a real boy, or even had legs...";
-			close2;	cutin "",255;	end;
+			close2;
+			cutin "",255;
+			end;
 		case 3:
 			cutin "rutie_snownow03.bmp",2;
 			mes "[Snowysnow]";
 			mes "Bye bye, friend~!";
 			mes "Thank you for listening me~";
 			mes "I'll see you again, someday! You'll always be in my heart~";
-			close2;	cutin "",255;	end;
+			close2;
+			cutin "",255;
+			end;
 		}
 }
 
-xmas,146,136,4	script	Hashokii	715,{
+xmas,146,136,4	script	Hashokii	4_M_PIERROT,{
 	mes "[Hashokii]";
 	mes "Meeee~RrrrrYYYY Christmas~!";
 	mes "La La La~!";
@@ -785,7 +813,7 @@ xmas,146,136,4	script	Hashokii	715,{
 			mes "Why don't you go meet those 2 children? They might tell you the story we've never got the chance to hear. Okay then, good luck~! Bye bye!";
 			set xmas_npc,9;
 			close;
-		}else{
+		} else {
 			mes "[Hashokii]";
 			mes "Ah... ^3355FFSnowysnow^000000?";
 			mes "Of course I know him! Anyone who doesn't know Snowysnow is a total stranger around here! Sometimes, he and I share a nice chat...";
@@ -814,7 +842,7 @@ xmas,146,136,4	script	Hashokii	715,{
 	}
 }
 
-xmas,206,168,4	script	Little Boy	706,{
+xmas,206,168,4	script	Little Boy	4_M_KID1,{
 	if (xmas_npc == 9) {
 		mes "[Charu Charu]";
 		mes "Errrm?";
@@ -825,7 +853,7 @@ xmas,206,168,4	script	Little Boy	706,{
 		mes "He's a nice snowman!";
 		mes "You want to know more about Snowysnow? Ummm, I'm not that smart! Ask Marcell!";
 		close;
-	}else{
+	} else {
 		mes "[Charu Charu]";
 		mes "Merry Merry Christmas!";
 		mes "Heheheheheh~!";
@@ -856,7 +884,7 @@ xmas,206,168,4	script	Little Boy	706,{
 	}
 }
 
-xmas,208,168,4	script	Little Girl	703,{
+xmas,208,168,4	script	Little Girl	4_F_KID2,{
 	if (xmas_npc == 9 || xmas_npc == 10) {
 		switch(xmas_npc) {
 		case 9:
@@ -896,7 +924,7 @@ xmas,208,168,4	script	Little Girl	703,{
 			mes "More than anybody else, you know the most about Snowysnow! Please talk to Mr.Snowysnow, he'll be happy to know you care about him. Merry Christmas!";
 			close;
 		}
-	}else{
+	} else {
 		mes "[Marcell]";
 		mes "Merry Christmas~!";
 		next;
diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt
index cd4181552..77c5306ed 100644
--- a/npc/cities/manuk.txt
+++ b/npc/cities/manuk.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Manuk Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Town-specific NPCs for Manuk.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Added more town NPCs
 //= 1.2 Added more town NPCs
@@ -15,7 +15,7 @@
 //============================================================
 
 // cat_enhance
-manuk,304,195,5	script	Soldier#ep13pa829	454,{
+manuk,304,195,5	script	Soldier#ep13pa829	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Food Provider]";
 		mes "The Manuk family subsists mostly on refining Gray Hollows that were burried a long time ago deep down under the ground.";
@@ -28,7 +28,7 @@ manuk,304,195,5	script	Soldier#ep13pa829	454,{
 	}
 }
 
-manuk,274,239,5	script	Soldier#ep13_2	455,{
+manuk,274,239,5	script	Soldier#ep13_2	4_MAN_PIOM2,{
 	if (isequipped(2782) == 1) {
 		mes "[Injured Manuk Soldier]";
 		mes "I can't absorb Bradium Essence anymore because of my fatal injury.";
@@ -48,7 +48,7 @@ manuk,274,239,5	script	Soldier#ep13_2	455,{
 	}
 }
 
-manuk,107,233,5	script	Soldier#ep13_3	454,{
+manuk,107,233,5	script	Soldier#ep13_3	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Anxious Soldier]";
 		mes "Hurry, I am in big trouble. I lost all the Manuk Coins. I think I dropped them somewhere on the snowfield. Gosh, I saw them right before I fell asleep!";
@@ -62,7 +62,7 @@ manuk,107,233,5	script	Soldier#ep13_3	454,{
 }
 
 // ep13_2_hiki
-manuk,100,100,3	script	Piom	454,{
+manuk,100,100,3	script	Piom	4_MAN_PIOM,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Piom]";
 		mes "You are... tiny. But you don't seem like a Fairy.";
@@ -81,7 +81,7 @@ manuk,100,100,3	script	Piom	454,{
 	}
 }
 
-manuk,188,216,3	script	Benknee#ep13_2_1	449,{
+manuk,188,216,3	script	Benknee#ep13_2_1	4_MAN_BENKUNI,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Benknee]";
 		mes "What brings you here?";
@@ -108,7 +108,7 @@ manuk,188,216,3	script	Benknee#ep13_2_1	449,{
 	}
 }
 
-manuk,169,260,3	script	Piom#ep13_2_1	455,{
+manuk,169,260,3	script	Piom#ep13_2_1	4_MAN_PIOM2,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Piom]";
 		mes "We, Saphas are always together!";
@@ -127,7 +127,7 @@ manuk,169,260,3	script	Piom#ep13_2_1	455,{
 	}
 }
 
-manuk,218,163,3	script	Galtun#ep13_2_1	450,{
+manuk,218,163,3	script	Galtun#ep13_2_1	4_MAN_GALTUN,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Galtun]";
 		mes "Recently, tiny things have been flying around.";
@@ -155,7 +155,7 @@ manuk,218,163,3	script	Galtun#ep13_2_1	450,{
 	}
 }
 
-manuk,266,199,5	script	Galtun#ep13_2_2	450,{
+manuk,266,199,5	script	Galtun#ep13_2_2	4_MAN_GALTUN,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Galtun]";
 		mes "I can relax now that we have those piles of Bradium.";
@@ -172,7 +172,7 @@ manuk,266,199,5	script	Galtun#ep13_2_2	450,{
 	}
 }
 
-manuk,225,129,5	script	Benknee#ep13_2_2	449,{
+manuk,225,129,5	script	Benknee#ep13_2_2	4_MAN_BENKUNI,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Benknee]";
 		mes "Huh? Who?? Who are you??";
@@ -191,7 +191,7 @@ manuk,225,129,5	script	Benknee#ep13_2_2	449,{
 	}
 }
 
-manuk,286,147,3	script	Piom#ep13_2_2	454,{
+manuk,286,147,3	script	Piom#ep13_2_2	4_MAN_PIOM,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Piom]";
 		mes "I'll never forget the deep-rooted rancor against those traitors.";
@@ -218,7 +218,7 @@ manuk,286,147,3	script	Piom#ep13_2_2	454,{
 	}
 }
 
-manuk,183,185,5	script	Piom#ep13_2_3	454,{
+manuk,183,185,5	script	Piom#ep13_2_3	4_MAN_PIOM,{
 	set tongyeok,Ring_Of_Wise_King;
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Piom]";
@@ -248,7 +248,7 @@ manuk,183,185,5	script	Piom#ep13_2_3	454,{
 	}
 }
 
-manuk,256,143,3	script	Galtun#ep13_2_3	450,{
+manuk,256,143,3	script	Galtun#ep13_2_3	4_MAN_GALTUN,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Galtun]";
 		mes "I will devote myself to";
@@ -265,7 +265,7 @@ manuk,256,143,3	script	Galtun#ep13_2_3	450,{
 	}
 }
 
-manuk,245,124,3	script	Piom#ep13_2_4	455,{
+manuk,245,124,3	script	Piom#ep13_2_4	4_MAN_PIOM2,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Piom]";
 		mes "Human, you think our battle is stupid, don't you?";
@@ -288,7 +288,7 @@ manuk,245,124,3	script	Piom#ep13_2_4	455,{
 }
 
 // ep13_2_npc
-man_in01,346,135,0	script	 Worker#ep13bsg1	454,{
+man_in01,346,135,0	script	 Worker#ep13bsg1	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Worker]";
 		mes "It is dangerous if the valve is not checked properly every day.";
@@ -305,7 +305,7 @@ man_in01,346,135,0	script	 Worker#ep13bsg1	454,{
 	}
 }
 
-man_in01,393,134,3	script	Worker#ep13bsg2	454,{
+man_in01,393,134,3	script	Worker#ep13bsg2	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Worker]";
 		mes "What!! Wh.. Oh... I... I didn't fall asleep!!";
@@ -320,7 +320,7 @@ man_in01,393,134,3	script	Worker#ep13bsg2	454,{
 	}
 }
 
-man_in01,377,143,5	script	Worker#ep13bsg3	454,{
+man_in01,377,143,5	script	Worker#ep13bsg3	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Worker]";
 		mes "Hmm... It's working just fine... No probems at all...";
@@ -333,7 +333,7 @@ man_in01,377,143,5	script	Worker#ep13bsg3	454,{
 	}
 }
 
-man_in01,333,128,5	script	Worker#ep13bsg4	454,{
+man_in01,333,128,5	script	Worker#ep13bsg4	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Worker]";
 		mes "My eyesight is getting weaker these days.";
@@ -346,7 +346,7 @@ man_in01,333,128,5	script	Worker#ep13bsg4	454,{
 	}
 }
 
-man_in01,336,128,5	script	Worker#ep13bsg5	454,{
+man_in01,336,128,5	script	Worker#ep13bsg5	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Worker]";
 		mes "Isn't this fabulous?";
@@ -359,7 +359,7 @@ man_in01,336,128,5	script	Worker#ep13bsg5	454,{
 	}
 }
 
-man_in01,283,288,3	script	Worker#ep13bsg6	454,{
+man_in01,283,288,3	script	Worker#ep13bsg6	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Worker]";
 		mes "It is fortunate to have lots of fine quality Bradium today.";
@@ -379,7 +379,7 @@ man_in01,283,288,3	script	Worker#ep13bsg6	454,{
 }
 
 // ep13_2_tre
-manuk,103,354,5	script	Manuk Galtun#door1	450,{
+manuk,103,354,5	script	Manuk Galtun#door1	4_MAN_GALTUN,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Manuk Galtun]";
 		mes "Here is Manuk where the Sapha who is descendant of Hwergelmir lives.";
@@ -392,7 +392,7 @@ manuk,103,354,5	script	Manuk Galtun#door1	450,{
 	}
 }
 
-manuk,122,354,3	script	Manuk Galtun#door2	450,{
+manuk,122,354,3	script	Manuk Galtun#door2	4_MAN_GALTUN,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Manuk Galtun]";
 		mes "Here is Manuk where the Sapha who is descendant of Hwergelmir lives.";
@@ -405,7 +405,7 @@ manuk,122,354,3	script	Manuk Galtun#door2	450,{
 	}
 }
 
-manuk,99,334,5	script	Manuk Piom#tre1	460,{
+manuk,99,334,5	script	Manuk Piom#tre1	4_MAN_PIOM3,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Manuk Piom]";
 		mes "Galtuns are brave Sapha warriors.";
@@ -426,7 +426,7 @@ manuk,99,334,5	script	Manuk Piom#tre1	460,{
 	}
 }
 
-manuk,103,311,3	script	Manuk Piom#tre2	455,{
+manuk,103,311,3	script	Manuk Piom#tre2	4_MAN_PIOM2,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Manuk Piom]";
 		mes "My leg...";
@@ -441,21 +441,17 @@ manuk,103,311,3	script	Manuk Piom#tre2	455,{
 	}
 }
 
-/*
-manuk,194,189,3	script	Manuk Galtun#tre3	450,{
+manuk,194,189,3	script	Manuk Galtun#tre3	4_MAN_GALTUN,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Manuk Galtun]";
-		mes "��?������U�?�";
-		mes "��?��?��?���";
-		
-	}
-	else {
-		end;
+		mes "Welcome to Manuk.";
+		mes "How can I help you?";
+		close;
 	}
+	end;
 }
-*/
 
-manuk,293,203,3	script	Manuk Piom#tre4	454,{
+manuk,293,203,3	script	Manuk Piom#tre4	4_MAN_PIOM,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Manuk Piom]";
 		mes "Hey, Be careful!";
@@ -472,7 +468,7 @@ manuk,293,203,3	script	Manuk Piom#tre4	454,{
 	}
 }
 
-manuk,253,173,3	script	Manuk Benknee#tre5	449,{
+manuk,253,173,3	script	Manuk Benknee#tre5	4_MAN_BENKUNI,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Manuk Benknee]";
 		mes "Can you see that statue?";
@@ -490,7 +486,7 @@ manuk,253,173,3	script	Manuk Benknee#tre5	449,{
 }
 
 // ep12_2_dailybs
-manuk,251,180,5	script	Young Villager#ep13bs	454,{
+manuk,251,180,5	script	Young Villager#ep13bs	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Young Villager]";
 		mes "It's past the time of our date, why isn't she here yet!!?";
@@ -503,7 +499,7 @@ manuk,251,180,5	script	Young Villager#ep13bs	454,{
 	}
 }
 
-man_in01,360,137,5	script	Mechanic#ep13bs	454,{
+man_in01,360,137,5	script	Mechanic#ep13bs	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Mechanic]";
 		mes "Alien races are not allowed to enter.";
@@ -518,7 +514,7 @@ man_in01,360,137,5	script	Mechanic#ep13bs	454,{
 	}
 }
 
-man_in01,68,187,0	script	Worker#ep13bs1	454,{
+man_in01,68,187,0	script	Worker#ep13bs1	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Worker]";
 		mes "Hmm, it smells delicious.";
@@ -539,7 +535,7 @@ man_in01,68,187,0	script	Worker#ep13bs1	454,{
 	}
 }
 
-man_in01,74,181,3	script	Worker#ep13bs2	454,{
+man_in01,74,181,3	script	Worker#ep13bs2	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		mes "[Worker]";
 		mes "Chef Cook, how many plates should I put down?";
@@ -552,7 +548,7 @@ man_in01,74,181,3	script	Worker#ep13bs2	454,{
 	}
 }
 
-man_in01,227,280,5	script	Scientist#ep13bs	449,{
+man_in01,227,280,5	script	Scientist#ep13bs	4_MAN_BENKUNI,{
 	if (isequipped(2782) == 1) {
 		mes "[Scientist]";
 		mes "Is there only one way we can survive..?";
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 83065d2c6..cb5b608e9 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Morroc Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Morroc Town NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= Fixed Lapidary sprite, Implemented ANTHELL trigger
 //= (in both NPC/Warps) [Lupus]. Removed it from NPC and put in Warp
@@ -27,7 +27,7 @@
 
 // Morroc
 //============================================================
-morocc,150,120,5	script	Soldier - Morroc#01::MocSoldier	707,3,3,{
+morocc,150,120,5	script	Soldier - Morroc#01::MocSoldier	4_M_MOC_SOLDIER,3,3,{
 	mes "[Morroc Soldier]";
 	mes "Hey, you! Stop there.";
 	next;
@@ -44,7 +44,7 @@ OnTouch:
 	close;
 }
 
-morocc,202,244,0	script	Volunteer - Morroc#01	745,{
+morocc,202,244,0	script	Volunteer - Morroc#01	4_F_CRU,{
 	mes "[Morroc Volunteer]";
 	mes "After that terrible incident wiped out the entire Morroc, Rune-Midgard Kingdom has gathered us valunteers to help restorations.";
 	next;
@@ -53,7 +53,7 @@ morocc,202,244,0	script	Volunteer - Morroc#01	745,{
 	close;
 }
 
-morocc,88,133,3	script	Volunteer - Morroc#02	748,{
+morocc,88,133,3	script	Volunteer - Morroc#02	4_M_ALCHE_A,{
 	mes "[Morroc Volunteer]";
 	mes "We're... We're flooded with work...";
 	next;
@@ -66,7 +66,7 @@ morocc,88,133,3	script	Volunteer - Morroc#02	748,{
 	close;
 }
 
-morocc,202,110,0	script	Volunteer - Morroc#03	730,{
+morocc,202,110,0	script	Volunteer - Morroc#03	4_M_JOB_ASSASSIN,{
 	mes "[Morroc Volunteer]";
 	mes "We're still unable to estimate the overall damage.";
 	next;
@@ -78,7 +78,7 @@ morocc,202,110,0	script	Volunteer - Morroc#03	730,{
 	close;
 }
 
-morocc,268,287,3	script	Volunteer - Morroc#04	727,{
+morocc,268,287,3	script	Volunteer - Morroc#04	4_F_JOB_HUNTER,{
 	mes "[Morroc Volunteer]";
 	mes "As bad as it seems, we can't even ask for more support.";
 	mes "This sure must be the worst thing ever happened in Rune-Midgard's history.";
@@ -88,7 +88,7 @@ morocc,268,287,3	script	Volunteer - Morroc#04	727,{
 	close;
 }
 
-morocc,37,287,0	script	Volunteer - Morroc#05	79,{
+morocc,37,287,0	script	Volunteer - Morroc#05	1_F_PRIEST,{
 	mes "[Morroc Volunteer]";
 	mes "The town's all shattered, but the real problem is the towners.";
 	next;
@@ -100,7 +100,7 @@ morocc,37,287,0	script	Volunteer - Morroc#05	79,{
 	close;
 }
 
-morocc,223,102,0	script	Volunteer - Morroc#06::MocVolunteer	741,{
+morocc,223,102,0	script	Volunteer - Morroc#06::MocVolunteer	2_M_BARD_ORIENT,{
 	mes "[Morroc Volunteer]";
 	mes "Ugh.. It's kinda spooky, here.. Even this dry wind of the desert seems to have a dark nature.";
 	next;
@@ -139,9 +139,9 @@ morocc,223,102,0	script	Volunteer - Morroc#06::MocVolunteer	741,{
 	close;
 }
 
-morocc,226,102,4	duplicate(MocVolunteer)	Volunteer - Morroc#07	726
+morocc,226,102,4	duplicate(MocVolunteer)	Volunteer - Morroc#07	4_F_JOB_BLACKSMITH
 
-moc_ruins,123,154,0	script	Young Man#moc01	99,{
+moc_ruins,123,154,0	script	Young Man#moc01	4W_M_03,{
 	mes "[Young Man]";
 	mes "The town's completely destroyed, but that giant triangular structure hasn't been harmed at all. Maybe it's protected by some kinda special power.";
 	next;
@@ -159,7 +159,7 @@ moc_ruins,123,154,0	script	Young Man#moc01	99,{
 	close;
 }
 
-moc_ruins,128,153,0	script	Grampa#moc	61,{
+moc_ruins,128,153,0	script	Grampa#moc	1_M_PUBMASTER,{
 	mes "[Old Scholar]";
 	mes "I've devoted my life to researching the mysterious pyramids near Morroc. I haven't been able to concretely confirm anything yet, but...";
 	next;
@@ -168,7 +168,7 @@ moc_ruins,128,153,0	script	Grampa#moc	61,{
 	close;
 }
 
-moc_ruins,132,144,0	script	Wolf Young Man#moc	85,{
+moc_ruins,132,144,0	script	Wolf Young Man#moc	4_M_03,{
 	mes "[Young Man]";
 	mes "I remember I said the bandits of desert are the desert wolves.. Those bastards always roam around in a bunch and they would get so cruel and outrageous if one of them got attacked.";
 	next;
@@ -181,7 +181,7 @@ moc_ruins,132,144,0	script	Wolf Young Man#moc	85,{
 	close;
 }
 
-moc_ruins,115,144,3	script	Muka Young Man#moc	83,{
+moc_ruins,115,144,3	script	Muka Young Man#moc	4_M_01,{
 	mes "[Young Man]";
 	mes "I work in the trading business, so I always have to cross the hot, dry Morroc Desert on business.";
 	next;
@@ -200,7 +200,7 @@ moc_ruins,115,144,3	script	Muka Young Man#moc	83,{
 	close;
 }
 
-moc_ruins,109,138,0	script	Diamond Young Man#moc	99,{
+moc_ruins,109,138,0	script	Diamond Young Man#moc	4W_M_03,{
 	mes "[Young Man]";
 	mes "The undisputed queen of jewels has to be the Diamond. After looking at it just once, no one can deny its beauty.";
 	next;
@@ -218,7 +218,7 @@ moc_ruins,109,138,0	script	Diamond Young Man#moc	99,{
 	close;
 }
 
-morocc,54,251,0	script	Young Man#moc02	89,{
+morocc,54,251,0	script	Young Man#moc02	4_M_ORIENT02,{
 	mes "[Drunken Young Man]";
 	mes "Wait a second..! Are you perhaps an adventurer? Welcome! How's your trip?";
 	mes "Heh heh~ Let me tell you a story. You know I just got out of that Tavern, there, huh?";
@@ -238,7 +238,7 @@ morocc,54,251,0	script	Young Man#moc02	89,{
 	close;
 }
 
-moc_ruins,94,117,0	script	Pale Looking Young Man	48,{
+moc_ruins,94,117,0	script	Pale Looking Young Man	1_M_02,{
 	mes "[Pale-looking Young Man]";
 	mes "... That day... I saw the bloody moon in the sky. It was too silent that it felt so spooky.";
 	next;
@@ -259,7 +259,7 @@ moc_ruins,94,117,0	script	Pale Looking Young Man	48,{
 	close;
 }
 
-moc_ruins,115,82,0	script	Little Girl#moc	703,{
+moc_ruins,115,82,0	script	Little Girl#moc	4_F_KID2,{
 	mes "[Little Girl]";
 	mes "-Crying-";
 	next;
@@ -274,7 +274,7 @@ moc_ruins,115,82,0	script	Little Girl#moc	703,{
 	close;
 }
 
-moc_ruins,118,82,1	script	Little Boy#moc	706,{
+moc_ruins,118,82,1	script	Little Boy#moc	4_M_KID1,{
 	mes "[Little Boy]";
 	mes "............... Let's stop crying, Eliese...";
 	next;
@@ -292,7 +292,7 @@ moc_ruins,118,82,1	script	Little Boy#moc	706,{
 	close;
 }
 
-moc_ruins,121,116,4	script	Picky Lady#moc	66,{
+moc_ruins,121,116,4	script	Picky Lady#moc	1_F_01,{
 	mes "[Syvia]";
 	mes "The fields of Rune-Midgard are infested with wild and dangerous monsters..But, you've got to admit a bunch of them are soooo cute!";
 	mes "You know, like how Spore sticks out its tongue after you kill it..";
@@ -342,7 +342,7 @@ moc_ruins,121,116,4	script	Picky Lady#moc	66,{
 	}
 }
 
-moc_ruins,155,107,4	script	Ant Man#moc	47,{
+moc_ruins,155,107,4	script	Ant Man#moc	1_M_01,{
 	mes "[Akira]";
 	mes "Hey, you. Did you cross the desert?";
 	next;
@@ -394,7 +394,7 @@ moc_ruins,155,107,4	script	Ant Man#moc	47,{
 	}
 }
 
-moc_ruins,143,43,4	script	Assassin Boy#moc	118,{
+moc_ruins,143,43,4	script	Assassin Boy#moc	2_M_THIEFMASTER,{
 	mes "[Slayer Kid]";
 	mes "Unbeatable in man-to-man fights, Assassins always overcome their enemies! Erm, always overcome their enemies without a trace.";
 	next;
@@ -447,7 +447,7 @@ moc_ruins,143,43,4	script	Assassin Boy#moc	118,{
 	}
 }
 
-moc_ruins,173,141,4	script	Dimitri#moc	49,{
+moc_ruins,173,141,4	script	Dimitri#moc	1_M_03,{
 	mes "[Dimitri]";
 	mes "The desert of Morroc has the highest average temperature in Midgard. You might as well think twice before you sit on the sand in the middle of the desert, cause your ass will be toasted.";
 	next;
@@ -489,7 +489,7 @@ moc_ruins,173,141,4	script	Dimitri#moc	49,{
 	}
 }
 
-moc_ruins,174,120,4	script	Fly Man#moc	54,{
+moc_ruins,174,120,4	script	Fly Man#moc	1_M_JOBGUIDER,{
 	mes "[Armani]";
 	mes "Ooh, Woooowwww.";
 	next;
@@ -521,7 +521,7 @@ moc_ruins,174,120,4	script	Fly Man#moc	54,{
 	}
 }
 
-moc_ruins,173,70,4	script	Uncle Morroc#moc	48,{
+moc_ruins,173,70,4	script	Uncle Morroc#moc	1_M_02,{
 	mes "[Phlanette]";
 	mes "Morroc is located in an extremely dry region, surrounded by desert.";
 	mes "No place in the world is as hot as Morroc.";
@@ -561,7 +561,7 @@ moc_ruins,173,70,4	script	Uncle Morroc#moc	48,{
 	}
 }
 
-moc_fild16,199,212,4	script	 Uncle Assassin#moc	55,{
+moc_fild16,199,212,4	script	 Uncle Assassin#moc	1_M_JOBTESTER,{
 	mes "[Hashisid]";
 	mes "...Assassins are trained";
 	mes "to approach their enemies steathily,";
@@ -621,7 +621,7 @@ moc_fild16,199,212,4	script	 Uncle Assassin#moc	55,{
 	}
 }
 
-moc_fild16,211,254,4	script	Assassin#07rhea_30	118,{
+moc_fild16,211,254,4	script	Assassin#07rhea_30	2_M_THIEFMASTER,{
 	mes "[La Conte]";
 	mes "Once Thiefs are promoted";
 	mes "to Assassins, which is very professional";
@@ -715,14 +715,14 @@ moc_fild16,211,254,4	script	Assassin#07rhea_30	118,{
 //============================================================
 //Bartender
 /*
-morocc_in,166,76,3	script	Bartender#02	46,{
+morocc_in,166,76,3	script	Bartender#02	1_ETC_01,{
 	mes "[Bartender]";
 	mes "What are you going to order?";
 	next;
 	switch(select("Tropical Sograt:Vemillion the Beach:Nothing.")) {
 	case 1:
-		if (zeny >= 1000 ) {
-			set zeny,zeny-1000;
+		if (Zeny >= 1000 ) {
+			Zeny -= 1000;
 			getitem 12112,1;
 			mes "[Bartender]";
 			mes "Here you go.";
@@ -732,8 +732,8 @@ morocc_in,166,76,3	script	Bartender#02	46,{
 		}
 		break;
 	case 2:
-		if (zeny >= 1000 ) {
-			set zeny,zeny-1000;
+		if (Zeny >= 1000 ) {
+			Zeny -= 1000;
 			getitem 12113,1;
 			mes "[Bartender]";
 			mes "Here you go.";
@@ -756,7 +756,7 @@ morocc_in,166,76,3	script	Bartender#02	46,{
 
 // Assassin Guild Guards
 //===================================================
-moc_fild16,195,281,4	script	Assassin Guardian#1::SinGuard	707,{
+moc_fild16,195,281,4	script	Assassin Guardian#1::SinGuard	4_M_MOC_SOLDIER,{
 	mes "[Assassin Guardian]";
 	if(BaseJob == Job_Assassin) {
 		mes "Welcome.";
@@ -770,11 +770,11 @@ moc_fild16,195,281,4	script	Assassin Guardian#1::SinGuard	707,{
 	close;
 }
 
-moc_fild16,204,281,4	duplicate(SinGuard)	Assassin Guardian#2	707
-moc_fild16,207,281,4	duplicate(SinGuard)	Assassin Guardian#3	707
-moc_fild16,216,281,4	duplicate(SinGuard)	Assassin Guardian#4	707
-moc_fild16,200,231,4	duplicate(SinGuard)	Assassin Guardian#5	707
-moc_fild16,211,231,4	duplicate(SinGuard)	Assassin Guardian#6	707
-moc_fild16,200,257,4	duplicate(SinGuard)	Assassin Guardian#7	707
-moc_fild16,211,257,4	duplicate(SinGuard)	Assassin Guardian#8	707
+moc_fild16,204,281,4	duplicate(SinGuard)	Assassin Guardian#2	4_M_MOC_SOLDIER
+moc_fild16,207,281,4	duplicate(SinGuard)	Assassin Guardian#3	4_M_MOC_SOLDIER
+moc_fild16,216,281,4	duplicate(SinGuard)	Assassin Guardian#4	4_M_MOC_SOLDIER
+moc_fild16,200,231,4	duplicate(SinGuard)	Assassin Guardian#5	4_M_MOC_SOLDIER
+moc_fild16,211,231,4	duplicate(SinGuard)	Assassin Guardian#6	4_M_MOC_SOLDIER
+moc_fild16,200,257,4	duplicate(SinGuard)	Assassin Guardian#7	4_M_MOC_SOLDIER
+moc_fild16,211,257,4	duplicate(SinGuard)	Assassin Guardian#8	4_M_MOC_SOLDIER
 
diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
index 50e5d0e69..ac6ef0bb4 100644
--- a/npc/cities/moscovia.txt
+++ b/npc/cities/moscovia.txt
@@ -1,19 +1,19 @@
 //===== Hercules Script ======================================
 //= Moscovia Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Moscovia Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Kisuka]
 //= 1.1 Removed villagers (they are part of a quest). [Kisuka]
 //= 1.2 Moved Alberta NPC to pre-re/re paths. [Euphy]
 //============================================================
 
-// Moscovia Transportation
-//============================================================ 
+// Moscovia Transportation :: mosk_trans
+//============================================================
 -	script	::PR_Officer_moscovia	-1,{
 	mes "[Moscovia P.R. Officer]";
 	mes "Moscovia! Do you know Moscovia?";
@@ -73,11 +73,11 @@
 				mes "to go to Moscovia";
 				mes "Thank you.";
 				close;
-			}else{
+			} else {
 				mes "[Moscovia P.R. Officer]";
 				mes "Ok then, we're leaving now.";
 				close2;
-				set Zeny,Zeny - 10000;
+				Zeny -= 10000;
 				warp "moscovia",163,55;
 				end;
 			}
@@ -90,7 +90,7 @@
 	}
 }
 
-moscovia,166,53,4	script	Moscovia P.R. Officer#2	960,{
+moscovia,166,53,4	script	Moscovia P.R. Officer#2	4_F_RUSWOMAN2,{
 	mes "[Moscovia P.R. Officer]";
 	mes "How was your trip?";
 	mes "Do you have good memories from Moscovia?";
@@ -114,9 +114,10 @@ moscovia,166,53,4	script	Moscovia P.R. Officer#2	960,{
 	end;
 }
 
-// Generic Moscovia NPCs
-//============================================================ 
-moscovia,253,166,4	script	Soldier#mosk1	966,{
+
+// Moscovia Palace :: mos_swan
+//============================================================
+moscovia,253,166,4	script	Soldier#mosk1	4_M_RUSKNIGHT,{
 	mes "[Soldier]";
 	mes "Our dear Csar Alexsay III is in the palace.";
 	mes "He rules over Moscovia.";
@@ -124,15 +125,12 @@ moscovia,253,166,4	script	Soldier#mosk1	966,{
 	close;
 }
 
-// Moscovia Palace
-//============================================================ 
--	script	Soldier#mosk::MoscSoldier	966,{
+-	script	Soldier#mosk::MoscSoldier	4_M_RUSKNIGHT,{
 	mes "[Soldier]";
 	mes "Please be silent or the Csar will be angry.";
 	close;
 }
-
-mosk_in,118,66,5	duplicate(MoscSoldier)	Soldier#mosk02	966
-mosk_in,133,110,3	duplicate(MoscSoldier)	Soldier#mosk03	966
-mosk_in,133,73,3	duplicate(MoscSoldier)	Soldier#mosk04	966
-mosk_in,113,124,5	duplicate(MoscSoldier)	Soldier#mosk05	966
+mosk_in,118,66,5	duplicate(MoscSoldier)	Soldier#mosk02	4_M_RUSKNIGHT
+mosk_in,133,110,3	duplicate(MoscSoldier)	Soldier#mosk03	4_M_RUSKNIGHT
+mosk_in,133,73,3	duplicate(MoscSoldier)	Soldier#mosk04	4_M_RUSKNIGHT
+mosk_in,113,124,5	duplicate(MoscSoldier)	Soldier#mosk05	4_M_RUSKNIGHT
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index d9a6cb19a..4e6ba1f97 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -1,38 +1,38 @@
 //===== Hercules Script ======================================
-//= Niflheim Script 
-//===== By: ================================================== 
+//= Niflheim Script
+//===== By: ==================================================
 //= Fyrien, Dizzy, PKGINGO
 //= Official NPCs translated and re-edited by Celest
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Official NPC's for Niflheim
 //= 1.01 Splitted file(guides, shops). Fixed rand() bugs,
-//= missing labels bugs, optimization [Lupus]
+//=      missing labels bugs, optimization [Lupus]
 //= 1.03 fixed end; -> close;
 //= 1.04-1.05 fixed several bugs with missing CLOSE button, wrong var name
-//=	in Piano Keys quest
+//=     in Piano Keys quest
 //=     fixed zeny/item, exploit in Sairin, some optimizations [Lupus]
 //= 1.06 some typos in some variables fixed (thx 2 Dr.Evil) [Lupus]
 //= 1.07 Fixed typos [Nexon]
-//= 1.08 Commented "Traveler" out as it is not official & we have correct Bungee quest in. 
+//= 1.08 Commented "Traveler" out as it is not official & we have correct Bungee quest in.
 //=     Also removed TODO, as they are already done. [Vicious_Pucca]
 //= 1.1 Replaced nif_q_done with MISC_QUEST & 32. nif_t -> @nif_t [Lupus]
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Moved Book of Devil and Piano quest to quests/quests_niflheim.txt [Evera]
 //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Removed Cursed Spirits as they were custom.
+//=     Removed Cursed Spirits as they were custom.
 //= 1.5 Added dummy "OnMyMobDead" event to Cursed Spirit. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-niflheim,52,147,3	script	Keedz#nif	796,{
+niflheim,52,147,3	script	Keedz#nif	4_M_NFDEADSWDMAN,{
 	mes "[Keedz]";
 	mes "I don't allow any living person";
 	mes "to come in this place!";
 	close;
 }
 
-niflheim,195,211,6	script	Gigantia#nif	796,3,3,{
+niflheim,195,211,6	script	Gigantia#nif	4_M_NFDEADSWDMAN,3,3,{
 	if (isequipped(5038) || isequipped(2257) || isequipped(2256)) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "What's up?";
@@ -67,7 +67,7 @@ OnTouch:
 	end;
 }
 
-nif_in,16,27,1	script	Undead Chicken#nif	800,{
+nif_in,16,27,1	script	Undead Chicken#nif	4_NFCOCK,{
 	percentheal -5,0;
 	mes "[Undead Chicken]";
 	mes "I lived a peaceful life as a normal chicken. But then came the day I was tragically killed and eaten by humans. Well... Heh heh~! Now it's my turn! *Cackles*";
@@ -86,7 +86,7 @@ nif_in,16,27,1	script	Undead Chicken#nif	800,{
 	close;
 }
 
-nif_in,16,30,4	script	Undead Familiar#nif	799,{
+nif_in,16,30,4	script	Undead Familiar#nif	4_NFBAT,{
 	percentheal -5,0;
 	mes "[Vatoman]";
 	mes "Oooh, how handy, a living";
@@ -106,7 +106,7 @@ nif_in,16,30,4	script	Undead Familiar#nif	799,{
 	close;
 }
 
-nif_in,156,93,5	script	Child#niflheim	793,{
+nif_in,156,93,5	script	Child#niflheim	4_F_NFLOSTGIRL,{
 	mes "[Alakina Ann]";
 	mes "Where...where am I...?";
 	mes "I remember I was sleeping";
@@ -162,7 +162,7 @@ nif_in,156,93,5	script	Child#niflheim	793,{
 	}
 }
 
-niflheim,350,258,1	script	Cursed Spirit#nif	802,{
+niflheim,350,258,1	script	Cursed Spirit#nif	4_NFWISP,{
 	killmonster "niflheim","Cursed Spirit#nif::OnMyMobDead";
 	mes "[Ashe Bruce]";
 	mes "I sense you're cursed";
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index feea5ed88..3bbe52908 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -1,17 +1,17 @@
 //===== Hercules Script ======================================
 //= Payon City
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad Dib (1.0) Darkchild (1.1) Muad Dib (1.2)
 //= Darkchild (1.3) DracoRPG (1.5) L0ne_W0lf (2.1)
-//===== Current Version: ===================================== 
-//= 2.1b
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.1c
+//===== Description: =========================================
 //= Payon City Npcs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Most Credits To Muad Dib, Some Stuff By Me
-//= 1.4 - Corrected a few typos
-//= 1.5 - Rescripted old NPCs + scripted new ones (from iRO Sak) [DracoRPG]
-//= 1.5b - Used Dino9021's script for the Gemstone exchanger [DracoRPG]
+//= 1.4 Corrected a few typos
+//= 1.5 Rescripted old NPCs + scripted new ones (from iRO Sak) [DracoRPG]
+//= 1.5b Used Dino9021's script for the Gemstone exchanger [DracoRPG]
 //= 1.5b1 fixed Gemstone Exchanger NPC [Lupus]
 //= 1.5b2 added adv.classes/baby classes support [Lupus]
 //= 1.6 Fixed typos [Nexon]
@@ -20,14 +20,15 @@
 //= 1.9 Fixed missing next;'s [Evera]
 //= 2.0 fixed some bugs, optimized script, added missing msg [Lupus]
 //= 2.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Moved Gemstone Trader "Jade" to /merchants/gemstone.txt
-//=	Moved Fortune Teller to /other/fortune.txt
+//=     Moved Gemstone Trader "Jade" to /merchants/gemstone.txt
+//=     Moved Fortune Teller to /other/fortune.txt
 //= 2.1b Added a missing close in the Monster Scholar. [L0ne_W0lf]
-//============================================================ 
+//= 2.1c Minor bug fixes. [Euphy]
+//============================================================
 
 // Payon
-//============================================================ 
-payon,246,154,0	script	Lady#payon	90,{
+//============================================================
+payon,246,154,0	script	Lady#payon	4_F_01,{
 	mes "[Lady]";
 	mes "A long time ago,";
 	mes "when Payon was still";
@@ -55,7 +56,7 @@ payon,246,154,0	script	Lady#payon	90,{
 	close;
 }
 
-payon,134,211,4	script	Young Man#payon	59,{
+payon,134,211,4	script	Young Man#payon	1_M_ORIENT01,{
 	mes "[Young Man]";
 	mes "From your attire,";
 	mes "I can see that you";
@@ -76,7 +77,7 @@ payon,134,211,4	script	Young Man#payon	59,{
 	close;
 }
 
-payon,173,82,0	script	Young Man#2payon	88,{
+payon,173,82,0	script	Young Man#2payon	4_M_ORIENT01,{
 	mes "[Young Man]";
 	mes "I remember the story my dearly departed grandfather has told me.";
 	next;
@@ -109,7 +110,7 @@ payon,173,82,0	script	Young Man#2payon	88,{
 	close;
 }
 
-payon,158,246,3	script	Guardsman#payon	708,3,3,{
+payon,158,246,3	script	Guardsman#payon	4_M_PAY_SOLDIER,3,3,{
 	end;
 
 OnTouch:
@@ -124,7 +125,7 @@ OnTouch:
 	close;
 }
 
-payon,249,156,1	script	Woman#payon	66,{
+payon,249,156,1	script	Woman#payon	1_F_01,{
 	mes "[Woman]";
 	mes "Welcome to Payon.";
 	mes "You must have had";
@@ -139,7 +140,7 @@ payon,249,156,1	script	Woman#payon	66,{
 	mes " To be honest, things are getting tough because of all those monsters. ^666666*Sigh...*^000000";
 	next;
 	mes "[Woman]";
-	if (sex == 1)
+	if (Sex == 1)
 		mes "Whoa~! I just noticed those arms of yours look pretty solid. You look pretty strong, guy. Just how many monsters have you killed?!";
 	else
 		mes "Oooh! I didn't notice before, but you look pretty strong beneath all of that feminine charm.";
@@ -176,7 +177,7 @@ payon,249,156,1	script	Woman#payon	66,{
 	close;
 }
 
-payon,246,158,5	script	Woman#2payon	66,0,0,{
+payon,246,158,5	script	Woman#2payon	1_F_01,0,0,{
 	mes "[Jim's Mother]";
 	mes "Oh boy~";
 	mes "There she goes again.";
@@ -188,7 +189,7 @@ payon,246,158,5	script	Woman#2payon	66,0,0,{
 	mes "of the people living in Payon by her behavior. She's the only loudmouth. I guess she's just too excited about what the fortune teller told her.";
 	next;
 	mes "[Jim's Mother]";
-	if (sex == 1) {
+	if (Sex == 1) {
 		mes "Ooh...!";
 		mes "You've got";
 		mes "such broad shoulders!";
@@ -223,7 +224,7 @@ payon,246,158,5	script	Woman#2payon	66,0,0,{
 	close;
 }
 
-payon,210,110,1	script	Drunkard#payon	120,{
+payon,210,110,1	script	Drunkard#payon	2_M_PHARMACIST,{
 	if (Class != Job_Archer) {
 		mes "[Drunkard]";
 		mes "Hey...";
@@ -250,9 +251,9 @@ payon,210,110,1	script	Drunkard#payon	120,{
 		mes "Buy me a drink?!";
 	}
 	next;
-	switch(select("Alright, but only one drink. :No thanks, pal.:Oh my God! Hell no! ")) {
+	switch(select("Alright, but only one drink.:No thanks, pal.:Oh my God! Hell no!")) {
 	case 1:
-		set zeny,zeny-100;
+		Zeny = (Zeny < 100) ? 0 : (Zeny - 100);
 		mes "[Drunkard]";
 		mes "Thanks...!";
 		mes "..Brother!";
@@ -295,7 +296,7 @@ payon,210,110,1	script	Drunkard#payon	120,{
 	close;
 }
 
-payon,132,235,3	script	Monster Scholar#02	98,{
+payon,132,235,3	script	Monster Scholar#02	4W_M_02,{
 	mes "[Monster Scholar Vuicokk]";
 	mes "Nice to meet you.";
 	mes "I am called Vuicokk.";
@@ -369,8 +370,8 @@ payon,132,235,3	script	Monster Scholar#02	98,{
 }
 
 // Inside Payon
-//============================================================ 
-payon_in01,180,7,2	script	Waitress#payon	90,{
+//============================================================
+payon_in01,180,7,2	script	Waitress#payon	4_F_01,{
 	mes "[Pub Lady]";
 	mes "This place is always bustling with busy people. Little Novices come and go to become Archers, and everyone else is buying arrows while I have to stay here in this small shop.";
 	next;
@@ -384,8 +385,8 @@ payon_in01,180,7,2	script	Waitress#payon	90,{
 	mes "And lonely...";
 	next;
 	mes "[Pub Lady]";
-	if (sex == 1)
-		mes "Where I can find the right person, a hot and sexy hunk who can take me away from here? Um, hey mister, are you listening?";
+	if (Sex == 1)
+		mes "Where I can find the right person, a hot and Sexy hunk who can take me away from here? Um, hey mister, are you listening?";
 	else {
 		mes "Where I can find the right person, a cute, yet hard-bodied hunk who can take me away from here?";
 		mes "Um, hey lady, are";
@@ -462,7 +463,7 @@ payon_in01,180,7,2	script	Waitress#payon	90,{
 	close;
 }
 
-payon_in03,96,116,3	script	Chief Guardsman#payon	708,3,3,{
+payon_in03,96,116,3	script	Chief Guardsman#payon	4_M_PAY_SOLDIER,3,3,{
 	end;
 
 OnTouch:
@@ -480,7 +481,7 @@ OnTouch:
 	close;
 }
 
-payon_in01,66,64,5	script	Archer Zakk#payon	88,{
+payon_in01,66,64,5	script	Archer Zakk#payon	4_M_ORIENT01,{
 	mes "[Archer Zakk]";
 	mes "I'm kind of worried";
 	mes "about one of my pals.";
@@ -535,7 +536,7 @@ payon_in01,66,64,5	script	Archer Zakk#payon	88,{
 	close;
 }
 
-payon_in01,47,59,2	script	Archer Wolt#payon	88,{
+payon_in01,47,59,2	script	Archer Wolt#payon	4_M_ORIENT01,{
 	mes "[Archer Wolt]";
 	mes "Archers should";
 	mes "practice as much";
@@ -826,7 +827,7 @@ payon_in01,47,59,2	script	Archer Wolt#payon	88,{
 	close;
 }
 
-payon_in03,99,190,4	script	Chief#payon	107,2,2,{
+payon_in03,99,190,4	script	Chief#payon	1_M_PAY_ELDER,2,2,{
 	end;
 
 OnTouch:
@@ -953,6 +954,7 @@ OnTouch:
 		mes "I'd better rest.";
 		mes "Please, take care";
 		mes "of yourself.";
+		close;
 
 		//This actually never happens on iRO
 		//if (.@oldman_random == 2) {
@@ -963,30 +965,32 @@ OnTouch:
 		//	mes "coming back later?";
 		//}
 	}
-	close;
+	end;
 }
 
-payon_in03,102,185,5	script	Guard#payon	708,{
+payon_in03,102,185,5	script	Guard#payon	4_M_PAY_SOLDIER,{
 	if (BaseLevel < 30) {
 		mes "[Guard]";
 		mes "Hey...!";
 		mes "You're not";
 		mes "allowed here!";
 		mes "Go back outside!";
+		close;
 	}
-	if (Baselevel > 30) {
+	if (BaseLevel > 30) {
 		mes "[Guard]";
 		mes "I'm sorry,";
 		mes "but you're";
 		mes "not allowed here.";
 		mes "Please leave.";
+		close;
 	}
-	close;
+	end;
 }
 
 // Payon Archer Village
-//============================================================ 
-pay_arche,77,131,2	script	Archer Joe#payon	88,{
+//============================================================
+pay_arche,77,131,2	script	Archer Joe#payon	4_M_ORIENT01,{
 	mes "[Archer Joe]";
 	mes "Payon!";
 	mes "Such a wonderful";
@@ -1070,4 +1074,3 @@ pay_arche,77,131,2	script	Archer Joe#payon	88,{
 	}
 	close;
 }
-
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index 5c81cadce..792ddc972 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Prontera Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.1
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= NPCs in Prontera
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= +AntiNovice exploit fix [Lupus] 1.2 added baby novice check
 //= Spellchecked [massdriller]
@@ -23,16 +23,16 @@
 
 // Prontera
 //============================================================
-prontera,160,330,0	script	Guard#pront::prtguard	105,{
+prontera,160,330,0	script	Guard#pront::prtguard	8W_SOLDIER,{
 	mes "[Prontera Guard]";
 	mes "Welcome to Prontera.";
 	close;
 }
-prontera,223,99,1	duplicate(prtguard)	Guard#2pront	105
-prontera,229,104,5	duplicate(prtguard)	Guard#3pront	105
-prontera,47,339,5	duplicate(prtguard)	Guard#4pront	105
+prontera,223,99,1	duplicate(prtguard)	Guard#2pront	8W_SOLDIER
+prontera,229,104,5	duplicate(prtguard)	Guard#3pront	8W_SOLDIER
+prontera,47,339,5	duplicate(prtguard)	Guard#4pront	8W_SOLDIER
 
-prontera,101,288,3	script	Shuger#pront	98,{
+prontera,101,288,3	script	Shuger#pront	4W_M_02,{
 	mes "[Shuger]";
 	mes "Outside the safety of the city, there is a pink beast known as ^000077Poring^000000.";
 	next;
@@ -47,7 +47,7 @@ prontera,101,288,3	script	Shuger#pront	98,{
 	close;
 }
 
-prontera,54,240,6	script	Tono#pront	97,{
+prontera,54,240,6	script	Tono#pront	4W_M_01,{
 	mes "[Tono]";
 	mes "Did you know?";
 	next;
@@ -65,7 +65,7 @@ prontera,54,240,6	script	Tono#pront	97,{
 	close;
 }
 
-prontera,106,116,6	script	Merideth#pront	91,{
+prontera,106,116,6	script	Merideth#pront	4_F_02,{
 	mes "[Merideth]";
 	mes "The weather was nice on my day off so my family and I went for a picnic. We chose to go to a slightly secluded area where I saw something really interesting...";
 	next;
@@ -77,7 +77,7 @@ prontera,106,116,6	script	Merideth#pront	91,{
 	close;
 }
 
-prontera,160,133,2	script	YuPi#pront	102,{
+prontera,160,133,2	script	YuPi#pront	8_F,{
 	mes "[YuPi]";
 	mes "Although many monsters may look the same, be careful! There are variations among monsters that have the same basic form.";
 	next;
@@ -89,7 +89,7 @@ prontera,160,133,2	script	YuPi#pront	102,{
 	close;
 }
 
-prontera,149,202,2	script	YuNa#pront	700,{
+prontera,149,202,2	script	YuNa#pront	8_F_GIRL,{
 	mes "[YuNa]";
 	mes "Behold...";
 	mes "Mighty Odin!";
@@ -113,7 +113,7 @@ prontera,149,202,2	script	YuNa#pront	700,{
 	close;
 }
 
-prontera,216,70,2	script	Strife#pront	48,{
+prontera,216,70,2	script	Strife#pront	1_M_02,{
 	if (Class == Job_Novice) {
 		if (event_prt_nov_dreamtalk == 0) {
 			mes "[Strife]";
@@ -210,7 +210,7 @@ prontera,216,70,2	script	Strife#pront	48,{
 	}
 }
 
-prontera,78,150,3	script	Dairenne#pront	90,{
+prontera,78,150,3	script	Dairenne#pront	4_F_01,{
 	mes "[Towngirl Dairenne]";
 	mes "Ahh...";
 	mes "The streets are too crowded these days. *Cough Cough* Look at all this dust, not everything about living in the capital city is good. Anyway, may I help you?";
@@ -234,8 +234,8 @@ prontera,78,150,3	script	Dairenne#pront	90,{
 // inside Prontera
 //============================================================
 /*
-//This NPC has been disabled officiall.
-prt_in,178,92,0	script	Curator of Library#pront	57,{
+//This NPC has been disabled officially.
+prt_in,178,92,0	script	Curator of Library#pront	1_M_LIBRARYMASTER,{
 	mes "[Curator Guiss]";
 	mes "Here, in the Western branch of the Prontera Library, ";
 	mes "we keep records of monsters found in various dungeons scattered around the Rune-Midgarts Kingdom.";
@@ -251,14 +251,14 @@ prt_in,178,92,0	script	Curator of Library#pront	57,{
 }
 */
 
-prt_in,175,50,0	script	Library Girl#pront	71,{
+prt_in,175,50,0	script	Library Girl#pront	1_F_LIBRARYGIRL,{
 	mes "[Library Girl Ellen]";
 	mes "Here in the Eastern branch of the Prontera Library, we provide Monster Encyclopedias in which creatures are organized by their properties. We also have books on Merchant and Blacksmith skills.";
 	mes "Ooh~! The other branch of our library also has many interesting things to read! So if you get a chance, you just might want to visit.";
 	close;
 }
 
-prt_in,47,141,0	script	An Old Man#pront	56,{
+prt_in,47,141,0	script	An Old Man#pront	1_M_KNIGHTMASTER,{
 	mes "[Old Man]";
 	mes "The Prontera Culvert sewers have been left unattended for a long time. Now that place is infested with ^000077Thief Bugs^000000!";
 	next;
@@ -267,7 +267,7 @@ prt_in,47,141,0	script	An Old Man#pront	56,{
 	close;
 }
 
-prt_in,26,31,0	script	An Old Man#2pront	54,{
+prt_in,26,31,0	script	An Old Man#2pront	1_M_JOBGUIDER,{
 	mes "[Old Man]";
 	mes "I dunno if you'll believe me, but I saw the weirdest thing down in the ^000077Culvert Sewers^000000...";
 	next;
@@ -288,7 +288,7 @@ prt_in,26,31,0	script	An Old Man#2pront	54,{
 	close;
 }
 
-prt_in,180,20,2	script	Bartender#pront	61,{
+prt_in,180,20,2	script	Bartender#pront	1_M_PUBMASTER,{
 	mes "[Bartender]";
 	mes "Sigh...as more and more people coming into Prontera,";
 	mes "better and better my business has become nowadays. But...";
@@ -339,7 +339,7 @@ prt_in,180,20,2	script	Bartender#pront	61,{
 
 }
 
-prt_in,173,24,2	script	Shevild#pront	85,{
+prt_in,173,24,2	script	Shevild#pront	4_M_03,{
 	mes "[Shevild]";
 	mes "Hey, come on over and let's drink! I have lots of interesting stories to tell!";
 	mes "I know lots of things about Prontera. I have seen many fine views and I also have explored some monster lairs around this city.";
@@ -411,7 +411,7 @@ prt_in,173,24,2	script	Shevild#pront	85,{
 	close;
 }
 
-prt_in,177,20,2	script	TenSue#pront	97,{
+prt_in,177,20,2	script	TenSue#pront	4W_M_01,{
 	switch(rand(3)) {
 	case 1:
 		mes "[TenSue]";
@@ -444,7 +444,7 @@ prt_in,177,20,2	script	TenSue#pront	97,{
 		mes "[TenSue]";
 		mes "The headquarters of Kafra Corporation is also located in Al de Baran. You should really stop by and check it out for yourself.";
 		close;
-	Default:
+	default:
 		mes "[TenSue]";
 		mes "The kingdom of";
 		mes "Rune-Midgarts is ruled";
@@ -468,12 +468,12 @@ prt_in,177,20,2	script	TenSue#pront	97,{
 	}
 }
 
-prt_in,177,18,2	script	Marvin#pront	80,{
+prt_in,177,18,2	script	Marvin#pront	1_F_PUBGIRL,{
 	mes "[Marvin]";
 	mes "Whether it's schmoozing with a member of the opposite sex, or battling monsters, I gotta say, it's all about ^333399skills^000000.";
 	next;
 	mes "[Marvin]";
-	if (sex)
+	if (Sex)
 		mes "I can't help you much when it comes to the subject of talking to attractive women such as myself, but I can tell you a little more about skills that help in battle.";
 	else
 		mes "I don't really have any advice for skills when it comes to talking to a cute guy, but I can let you in on what I know about skills that help in battle.";
@@ -492,7 +492,7 @@ prt_in,177,18,2	script	Marvin#pront	80,{
 	close;
 }
 
-prt_in,284,168,3	script	Ginedin Rephere#pront	55,{
+prt_in,284,168,3	script	Ginedin Rephere#pront	1_M_JOBTESTER,{
 	mes "[Tailor Ginedin Rephere]";
 	mes "11...";
 	mes "12...";
@@ -540,7 +540,7 @@ prt_in,284,168,3	script	Ginedin Rephere#pront	55,{
 
 // Prontera Church
 //============================================================
-prt_church,103,76,0	script	Garnet#pront	67,{
+prt_church,103,76,0	script	Garnet#pront	1_F_02,{
 	mes "[Garnet]";
 	mes "Hello there~";
 	mes "Are you interested in learning more about helping and supporting other people?";
@@ -631,14 +631,14 @@ prt_church,103,76,0	script	Garnet#pront	67,{
 			mes "Alright, I've";
 			mes "heard enough.";
 			close2;
-			set .@SkilLChat,0;
+			set .@SkillChat,0;
 			break;
 		}
 	}
 	end;
 }
 
-prt_church,103,71,0	script	Henson#pront	120,{
+prt_church,103,71,0	script	Henson#pront	2_M_PHARMACIST,{
 	mes "[Henson]";
 	mes "We Priests and Acolytes are not only limited to easing the suffering of our fellow man...";
 	next;
@@ -649,7 +649,7 @@ prt_church,103,71,0	script	Henson#pront	120,{
 	mes "Did you have any questions about Acolyte and Priest skills?";
 	next;
 	set .@SkillChat,1;
-	while(.@Skillchat) {
+	while(.@SkillChat) {
 		switch(select("About Divine Protection:About Demon Bane:About Decrease AGI:About Signum Crusis :About Pneuma:About Ruwach:About Teleport:End conversation.")) {
 		case 1:
 			mes "[Henson]";
@@ -729,7 +729,7 @@ prt_church,103,71,0	script	Henson#pront	120,{
 			mes "[Henson]";
 			mes "If you wish to understand more about an Acolyte or Priest skill, you are welcome to visit me at any time.";
 			close2;
-			set .@SkilLChat,0;
+			set .@SkillChat,0;
 			break;
 		}
 	}
@@ -738,7 +738,7 @@ prt_church,103,71,0	script	Henson#pront	120,{
 
 // Hidden Temple
 //============================================================
-prt_maze02,100,69,0	script	Soldier#pront	105,{
+prt_maze02,100,69,0	script	Soldier#pront	8W_SOLDIER,{
 	mes "[Soldier]";
 	mes "H-hey!";
 	mes "What are";
@@ -750,7 +750,7 @@ prt_maze02,100,69,0	script	Soldier#pront	105,{
 	close;
 }
 
-prt_maze02,110,69,0	script	Soldier#2pront	105,{
+prt_maze02,110,69,0	script	Soldier#2pront	8W_SOLDIER,{
 	mes "[Soldier]";
 	mes "*Sigh...* The last guy that entered this place haven't come back at all. He didn't listen to me and went in to gather Herbs or something dumb like that...";
 	next;
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index 88eb359f1..b4beb95af 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -4,21 +4,22 @@
 //= First Version: Tsuyuki and Harp
 //= iRO Version: L0ne_W0lf
 //===== Current Version: =====================================
-//= 0.9
+//= 0.9a
 //===== Description: =========================================
-//= [Partial Aegis Conversion]
+//= [Partial Official Conversion]
 //= Arunafeltz NPCs
 //===== Additional Comments: =================================
-//= 0.5 Text translated from Korean > English, incomplete, 
+//= 0.5 Text translated from Korean > English, incomplete,
 //= possibly missing some NPCs and missing all quests.
 //= 0.6 Removed Inn Keeper (it's in inn.txt), name duplicates [Lupus]
 //= 0.7 Total update of most if not all NPCs. [L0ne_W0lf]
 //= 0.8 Updated "Frozen Boy" dialog. (euRO) [L0ne_W0lf]
 //= 0.9 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 0.9a Added 'consumeitem' command. [Euphy]
 //============================================================
 
 //===== Set 1 ================================================
-ice_dun04,33,166,3	script	Frozen Boy	925,{
+ice_dun04,33,166,3	script	Frozen Boy	4_M_FROZEN,{
 	cutin "ra_sboy.bmp",2;
 	mes "["+strcharinfo(0)+"]";
 	mes "This boy must be the one who Ktullanux tried to protect.";
@@ -40,7 +41,7 @@ ice_dun04,33,166,3	script	Frozen Boy	925,{
 	end;
 }
 
-ra_san04,137,48,3	script	Loomin-1st Class Secret	111,{
+ra_san04,137,48,3	script	Loomin-1st Class Secret	HIDDEN_NPC,{
 	mes "^3131FFLoomin, the boy";
 	mes "trapped in the Ice Cave.^000000";
 	mes "Class: 1st";
@@ -89,7 +90,7 @@ ra_san04,137,48,3	script	Loomin-1st Class Secret	111,{
 	close;
 }
 
-rachel,124,132,1	script	Citizen#1 	921,{
+rachel,124,132,1	script	Citizen#1 	4_M_CHILD1,{
 	mes "[Citizen]";
 	mes "May Freya bless";
 	mes "you, and give you an";
@@ -105,7 +106,7 @@ rachel,124,132,1	script	Citizen#1 	921,{
 	close;
 }
 
-rachel,74,150,7	script	Girl#1	914,{
+rachel,74,150,7	script	Girl#1	4_F_CHILD,{
 	mes "[Girl]";
 	mes "I've never seen our pope";
 	mes "before, I hear that she has";
@@ -132,7 +133,7 @@ rachel,74,150,7	script	Girl#1	914,{
 	close;
 }
 
-rachel,144,243,5	script	Cheshrumnir Guard::ChesGuard	934,{
+rachel,144,243,5	script	Cheshrumnir Guard::ChesGuard	4_M_RASWORD,{
 	mes "[Cheshrumnir Guard]";
 	mes "You are at Cheshrumnir,";
 	mes "the hallowed grounds occupied";
@@ -143,10 +144,10 @@ rachel,144,243,5	script	Cheshrumnir Guard::ChesGuard	934,{
 	close;
 }
 
-rachel,155,243,3	duplicate(ChesGuard)	Cheshrumnir Guard	934
+rachel,155,243,3	duplicate(ChesGuard)	Cheshrumnir Guard	4_M_RASWORD
 
 
-rachel,209,198,3	script	Kinos#aru	921,{
+rachel,209,198,3	script	Kinos#aru	4_M_CHILD1,{
 	mes "[Kid]";
 	mes "If you open this door, you";
 	mes "can go inside this house,";
@@ -163,7 +164,7 @@ rachel,209,198,3	script	Kinos#aru	921,{
 	close;
 }
 
-rachel,260,175,3	script	Anku#aru	914,{
+rachel,260,175,3	script	Anku#aru	4_F_CHILD,{
 	mes "[Anku]";
 	mes "It's been so long";
 	mes "already! I can't find";
@@ -179,7 +180,7 @@ rachel,260,175,3	script	Anku#aru	914,{
 	close;
 }
 
-rachel,272,141,3	script	Himuhimu#aru	921,{
+rachel,272,141,3	script	Himuhimu#aru	4_M_CHILD1,{
 	mes "[Himuhimu]";
 	mes "Zzzz...Z...";
 	mes "Anku, you'll never";
@@ -189,7 +190,7 @@ rachel,272,141,3	script	Himuhimu#aru	921,{
 	close;
 }
 
-rachel,268,120,1	script	Rachel Guard#1aru::RaGuard	934,{
+rachel,268,120,1	script	Rachel Guard#1aru::RaGuard	4_M_RASWORD,{
 	mes "[Rachel Guard]";
 	mes "Welcome to Rachel";
 	mes "the capital of Arunafeltz.";
@@ -200,11 +201,11 @@ rachel,268,120,1	script	Rachel Guard#1aru::RaGuard	934,{
 	close;
 }
 
-rachel,125,33,5	duplicate(RaGuard)	Rachel Guard#2aru	934
+rachel,125,33,5	duplicate(RaGuard)	Rachel Guard#2aru	4_M_RASWORD
 
-rachel,31,130,3	duplicate(RaGuard)	Rachel Guard#3aru	934
+rachel,31,130,3	duplicate(RaGuard)	Rachel Guard#3aru	4_M_RASWORD
 
-rachel,76,77,3	script	Rachel Priest	927,{
+rachel,76,77,3	script	Rachel Priest	4_M_MASK,{
 	mes "[Rachel Priest]";
 	mes "Bwahahaha! Somehow,";
 	mes "drinks taste much better";
@@ -212,7 +213,7 @@ rachel,76,77,3	script	Rachel Priest	927,{
 	close;
 }
 
-ra_fild12,45,230,3	script	Airship Guide#Fild	934,{
+ra_fild12,45,230,3	script	Airship Guide#Fild	4_M_RASWORD,{
 	mes "[Airship Guide]";
 	mes "The Schwaltzvalt Republic's";
 	mes "international Airship service";
@@ -224,8 +225,8 @@ ra_fild12,45,230,3	script	Airship Guide#Fild	934,{
 	close;
 }
 
-//rachel,201,174,3	script	Freya's Follower	927,{
-rachel,201,174,3	script	Freya's Follower	926,{
+//rachel,201,174,3	script	Freya's Follower	4_M_MASK,{
+rachel,201,174,3	script	Freya's Follower	4_M_MASK1,{
 	mes "[Freya's Follower]";
 	mes "All of Arunafeltz believes";
 	mes "in the goddess Freya, but";
@@ -265,7 +266,7 @@ rachel,201,174,3	script	Freya's Follower	926,{
 	close;
 }
 
-rachel,206,30,3	script	Freya's Priest#play	920,{
+rachel,206,30,3	script	Freya's Priest#play	4_F_TRAINEE,{
 	mes "[Freya's Priest]";
 	mes "This...";
 	mes "bores me...";
@@ -273,7 +274,7 @@ rachel,206,30,3	script	Freya's Priest#play	920,{
 	mes "[Freya's Priest]";
 	mes "You!";
 	mes "Entertain me!";
-	Emotion e_ag;
+	emotion e_ag;
 	next;
 	if (select("What? You can't tell me what to do!:You got it.") == 1) {
 		mes "[Freya's Priest]";
@@ -306,15 +307,16 @@ rachel,206,30,3	script	Freya's Priest#play	920,{
 	mes "Oh? Oh! That's wonderful!";
 	close2;
 	set .@play,rand(1,10);
-	if (.@play == 1) warp "Random",0,0;
-	else if (.@play == 2) warp "Random",0,0;
-	else if (.@play == 3) sc_start SC_MOVHASTE_INFINITY,5000,0;
-	else if (.@play == 4) sc_start SC_MOVHASTE_INFINITY,5000,0;
-	else sc_start SC_SlowDown,5000,0;
+	if (.@play < 3)
+		consumeitem 601; //Wing_Of_Fly
+	else if (.@play < 5)
+		consumeitem 12016; //Speed_Up_Potion
+	else
+		consumeitem 12017; //Slow_Down_Potion
 	end;
 }
 
-rachel,197,137,3	script	Bard#aru	51,{
+rachel,197,137,3	script	Bard#aru	1_M_BARD,{
 	mes "[Bard]";
 	mes "I've wandered this";
 	mes "land, singing my songs~";
@@ -338,11 +340,11 @@ rachel,197,137,3	script	Bard#aru	51,{
 	mes ".........";
 	mes ".........";
 	mes ".........";
-	Emotion e_sob;
+	emotion e_sob;
 	close;
 }
 
-ra_temple,148,91,3	script	Follower Akarna	916,{
+ra_temple,148,91,3	script	Follower Akarna	4_F_MASK1,{
 	mes "[Follower Akarna]";
 	mes "Cheshrumnir...";
 	mes "It is said that one";
@@ -353,7 +355,7 @@ ra_temple,148,91,3	script	Follower Akarna	916,{
 	close;
 }
 
-ra_temple,115,148,7	script	Follower Yakum	916,{
+ra_temple,115,148,7	script	Follower Yakum	4_F_MASK1,{
 	mes "[Follower Yakum]";
 	mes "......";
 	mes ".........";
@@ -367,7 +369,7 @@ ra_temple,115,148,7	script	Follower Yakum	916,{
 	close;
 }
 
-ra_temin,287,88,7	script	Follower Lekua	926,{
+ra_temin,287,88,7	script	Follower Lekua	4_M_MASK1,{
 	mes "[Follower Lekua]";
 	mes "Look at these flowers.";
 	mes "Aren't they so beautiful?";
@@ -383,8 +385,8 @@ ra_temin,287,88,7	script	Follower Lekua	926,{
 	close;
 }
 
-//ra_temin,228,303,5	script	Freya's Follower#in1	927,{
-ra_temin,228,303,5	script	Freya's Follower#in1	926,{
+//ra_temin,228,303,5	script	Freya's Follower#in1	4_M_MASK,{
+ra_temin,228,303,5	script	Freya's Follower#in1	4_M_MASK1,{
 	mes "[Freya's Follower]";
 	mes "Once again, I didn't get";
 	mes "any sleep yesterday... I'm";
@@ -395,8 +397,8 @@ ra_temin,228,303,5	script	Freya's Follower#in1	926,{
 	close;
 }
 
-//ra_temin,230,303,3	script	Freya's Follower#in2	927,{
-ra_temin,230,303,3	script	Freya's Follower#in2	926,{
+//ra_temin,230,303,3	script	Freya's Follower#in2	4_M_MASK,{
+ra_temin,230,303,3	script	Freya's Follower#in2	4_M_MASK1,{
 	mes "[Freya's Follower]";
 	mes "You have done well,";
 	mes "my brother. I am certain";
@@ -405,7 +407,7 @@ ra_temin,230,303,3	script	Freya's Follower#in2	926,{
 	close;
 }
 
-ra_temin,138,64,5	script	Child Follower#in1	921,{
+ra_temin,138,64,5	script	Child Follower#in1	4_M_CHILD1,{
 	mes "[Child Follower]";
 	mes "No! My Mingming is dead!";
 	next;
@@ -430,7 +432,7 @@ ra_temin,138,64,5	script	Child Follower#in1	921,{
 
 
 //===== Set 2 ================================================
-ra_fild12,283,208,3	script	Apprentice Priestess	914,{
+ra_fild12,283,208,3	script	Apprentice Priestess	4_F_CHILD,{
 	if ($rachel_donate < 10000) {
 		mes "[Papaii]";
 		mes "Welcome to Arunafeltz,";
@@ -536,7 +538,7 @@ ra_fild12,283,208,3	script	Apprentice Priestess	914,{
 	close;
 }
 
-rachel,127,117,4	script	Child Follower#2	914,{
+rachel,127,117,4	script	Child Follower#2	4_F_CHILD,{
 	mes "[Deno]";
 	mes "Although we pray to";
 	mes "the goddess Freya and";
@@ -562,7 +564,7 @@ rachel,127,117,4	script	Child Follower#2	914,{
 	close;
 }
 
-ra_temple,167,155,4	script	Child Follower#3	914,{
+ra_temple,167,155,4	script	Child Follower#3	4_F_CHILD,{
 	mes "[Lewei]";
 	mes "Shushh!";
 	mes "Be quiet.";
@@ -591,7 +593,7 @@ ra_temple,167,155,4	script	Child Follower#3	914,{
 	close;
 }
 
-ra_temple,179,161,7	script	Child Follower#4	921,{
+ra_temple,179,161,7	script	Child Follower#4	4_M_CHILD1,{
 	mes "[Zhikka]";
 	mes "Shh! I'm playing";
 	mes "Hide-and-Seek. Would";
@@ -602,7 +604,7 @@ ra_temple,179,161,7	script	Child Follower#4	921,{
 	close;
 }
 
-ra_temple,77,114,7	script	Child Follower#5	921,{
+ra_temple,77,114,7	script	Child Follower#5	4_M_CHILD1,{
 	mes "[Emmet]";
 	mes "Oh my Freya! You scared me!";
 	mes "I thought you were one of the";
@@ -612,7 +614,7 @@ ra_temple,77,114,7	script	Child Follower#5	921,{
 	close;
 }
 
-ra_temple,172,113,5	script	Child Follower#6	921,{
+ra_temple,172,113,5	script	Child Follower#6	4_M_CHILD1,{
 	mes "[Harse]";
 	mes "Where are yoooou~";
 	mes "Come out, come out";
@@ -627,7 +629,7 @@ ra_temple,172,113,5	script	Child Follower#6	921,{
 	close;
 }
 
-airplane,238,54,7	script	Adventurer	59,{
+airplane,238,54,7	script	Adventurer	1_M_ORIENT01,{
 	if ($rachel_donate < 10000) {
 		mes "[Adventurer]";
 		mes "You know that the temple";
diff --git a/npc/cities/splendide.txt b/npc/cities/splendide.txt
index 2a961040d..b06bd6487 100644
--- a/npc/cities/splendide.txt
+++ b/npc/cities/splendide.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 //= Splendide Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Town-specific NPCs for Splendide.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Added more town NPCs
 //= 1.2 Added more town NPCs
 //============================================================
 
 // cat_enhance
-splendide,218,193,3	script	Fairy#ep13_1	441,{
+splendide,218,193,3	script	Fairy#ep13_1	4_F_FAIRYKID6,{
 	if (isequipped(2782) == 1) {
 		mes "[Exhausted Fairy]";
 		mes "Wait, don't come any closer. I can't stand your smell, it makes me feel dizzy.";
@@ -27,7 +27,7 @@ splendide,218,193,3	script	Fairy#ep13_1	441,{
 	}
 }
 
-splendide,180,223,3	script	Fairy#ep13_2	440,{
+splendide,180,223,3	script	Fairy#ep13_2	4_F_FAIRYKID5,{
 	if (isequipped(2782) == 1) {
 		mes "[Kalua]";
 		mes "You don't look sophisticated, but I think you are better than those uncivilized guys who are around the snowfield.";
@@ -40,7 +40,7 @@ splendide,180,223,3	script	Fairy#ep13_2	440,{
 	}
 }
 
-splendide,125,227,3	script	Fairy#ep13_3	444,{
+splendide,125,227,3	script	Fairy#ep13_3	4_M_FAIRYKID3,{
 	if (isequipped(2782) == 1) {
 		mes "[Flowa]";
 		mes "No offense, I was not looking at you with sympathy.";
@@ -56,7 +56,7 @@ splendide,125,227,3	script	Fairy#ep13_3	444,{
 }
 
 // ep13_2_hiki
-splendide,159,164,3	script	Fairy#13_2_1	461,{
+splendide,159,164,3	script	Fairy#13_2_1	4_M_FAIRYSOLDIER2,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "It is shame that I have to";
@@ -73,7 +73,7 @@ splendide,159,164,3	script	Fairy#13_2_1	461,{
 	}
 }
 
-splendide,229,54,3	script	Fairy#13_2_2	439,{
+splendide,229,54,3	script	Fairy#13_2_2	4_F_FAIRYKID4,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "Huh? You are a human.";
@@ -98,7 +98,7 @@ splendide,229,54,3	script	Fairy#13_2_2	439,{
 	}
 }
 
-splendide,89,235,5	script	Fairy#13_2_3	446,{
+splendide,89,235,5	script	Fairy#13_2_3	4_M_FAIRYKID5,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "Lalalalal~Lala~Lalala~";
@@ -121,7 +121,7 @@ splendide,89,235,5	script	Fairy#13_2_3	446,{
 	}
 }
 
-splendide,245,243,3	script	Fairy#13_2_4	462,{
+splendide,245,243,3	script	Fairy#13_2_4	4_F_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "This land was such a waste land.";
@@ -151,7 +151,7 @@ splendide,245,243,3	script	Fairy#13_2_4	462,{
 	}
 }
 
-splendide,230,142,3	script	Fairy#13_2_5	439,{
+splendide,230,142,3	script	Fairy#13_2_5	4_F_FAIRYKID4,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "Ah-Ha, I am so stunning.";
@@ -164,7 +164,7 @@ splendide,230,142,3	script	Fairy#13_2_5	439,{
 	}
 }
 
-splendide,274,203,3	script	Fairy#13_2_6	444,{
+splendide,274,203,3	script	Fairy#13_2_6	4_M_FAIRYKID3,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "Hey, you~! Human! How did you find us?";
@@ -181,7 +181,7 @@ splendide,274,203,3	script	Fairy#13_2_6	444,{
 	}
 }
 
-splendide,275,141,3	script	Fairy#13_2_7	447,{
+splendide,275,141,3	script	Fairy#13_2_7	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "Don't talk to me. What do you want?";
@@ -204,7 +204,7 @@ splendide,275,141,3	script	Fairy#13_2_7	447,{
 	}
 }
 
-splendide,224,230,3	script	Fairy#13_2_8	440,{
+splendide,224,230,3	script	Fairy#13_2_8	4_F_FAIRYKID5,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "Listen carefully and learn more!";
@@ -227,7 +227,7 @@ splendide,224,230,3	script	Fairy#13_2_8	440,{
 	}
 }
 
-splendide,223,36,3	script	Fairy#13_2_9	462,{
+splendide,223,36,3	script	Fairy#13_2_9	4_F_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "I don't want to touch them at all.";
@@ -256,7 +256,7 @@ splendide,223,36,3	script	Fairy#13_2_9	462,{
 	}
 }
 
-splendide,305,129,3	script	Fairy#13_2_10	436,{
+splendide,305,129,3	script	Fairy#13_2_10	4_F_FAIRYKID,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "Hu...feel sleepy.";
@@ -284,7 +284,7 @@ splendide,305,129,3	script	Fairy#13_2_10	436,{
 	}
 }
 
-splendide,142,315,3	script	Fairy#13_2_11	462,{
+splendide,142,315,3	script	Fairy#13_2_11	4_F_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "Flying in the sky is not easy.";
@@ -312,7 +312,7 @@ splendide,142,315,3	script	Fairy#13_2_11	462,{
 	}
 }
 
-splendide,181,107,5	script	Fairy#13_2_12	462,{
+splendide,181,107,5	script	Fairy#13_2_12	4_F_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Fairy]";
 		mes "Neatness, tidiness and cleanness!";
@@ -332,7 +332,7 @@ splendide,181,107,5	script	Fairy#13_2_12	462,{
 }
 
 // ep13_2_tre
-splendide,188,76,5	script	Splendide Soldier#tre1	461,{
+splendide,188,76,5	script	Splendide Soldier#tre1	4_M_FAIRYSOLDIER2,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Splendide Soldier]";
 		mes "This is Splendide, the garrison base of the Laphine.";
@@ -345,7 +345,7 @@ splendide,188,76,5	script	Splendide Soldier#tre1	461,{
 	}
 }
 
-splendide,201,76,3	script	Splendide Soldier#tre2	461,{
+splendide,201,76,3	script	Splendide Soldier#tre2	4_M_FAIRYSOLDIER2,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Splendide Soldier]";
 		mes "This is Splendide, the garrison base of the Laphine.";
@@ -358,7 +358,7 @@ splendide,201,76,3	script	Splendide Soldier#tre2	461,{
 	}
 }
 
-splendide,207,97,5	script	Middle-Ranked Laphine#1	443,{
+splendide,207,97,5	script	Middle-Ranked Laphine#1	4_M_FAIRYKID2,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Middle-Ranked Laphine]";
 		mes "Haap-!";
@@ -375,7 +375,7 @@ splendide,207,97,5	script	Middle-Ranked Laphine#1	443,{
 	}
 }
 
-splendide,210,95,3	script	Middle-Ranked Laphine#2	442,{
+splendide,210,95,3	script	Middle-Ranked Laphine#2	4_M_FAIRYKID,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Middle-Ranked Laphine]";
 		mes "Wow~ Great!!";
@@ -390,7 +390,7 @@ splendide,210,95,3	script	Middle-Ranked Laphine#2	442,{
 	}
 }
 
-spl_in01,190,314,5	script	Security Officer#tre	461,{
+spl_in01,190,314,5	script	Security Officer#tre	4_M_FAIRYSOLDIER2,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Security Officer]";
 		mes "This is the underground prison of Splendide.";
@@ -409,7 +409,7 @@ spl_in01,190,314,5	script	Security Officer#tre	461,{
 	}
 }
 
-spl_in01,281,329,3	script	Splendide Guard#tre	447,{
+spl_in01,281,329,3	script	Splendide Guard#tre	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Splendide Guard]";
 		mes "If you make too much noise, the prisoners will cause trouble. So try to keep quiet at all times.";
@@ -422,7 +422,7 @@ spl_in01,281,329,3	script	Splendide Guard#tre	447,{
 	}
 }
 
-spl_in01,287,306,3	script	#spl_prs	111,{
+spl_in01,287,306,3	script	#spl_prs	HIDDEN_NPC,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Manuk Prisoner]";
 		mes "My, my body...!!";
@@ -456,9 +456,9 @@ OnTouch:
 }
 
 // ep13_spl_extra
-spl_in01,172,225,3	script	Wandering Poet#ep13	51,{
+spl_in01,172,225,3	script	Wandering Poet#ep13	1_M_BARD,{
 	cutin "god_nelluad02",2;
-	mes "[Poet Nell]"	;
+	mes "[Poet Nell]";
 	mes "Hi~~ do you hear the beautiful music comeing from afar~?";
 	next;
 	select("Who are you?");
@@ -538,7 +538,7 @@ spl_in01,172,225,3	script	Wandering Poet#ep13	51,{
 			next;
 			mes "^4d4dff Alberich swears with the last of his breath, that his treasured ring will curse it's wearer till death.";
 			next;
-			mes "^4d4dff Forever will the bearer be, cursed with Rocky's jealousy."				;
+			mes "^4d4dff Forever will the bearer be, cursed with Rocky's jealousy.";
 			break;
 		}
 		break;
@@ -557,7 +557,7 @@ spl_in01,172,225,3	script	Wandering Poet#ep13	51,{
 		next;
 		mes "[Poet Nell]";
 		mes "Yes, I look quite common...";
-		mes "But I doubt we've ever met before."		;
+		mes "But I doubt we've ever met before.";
 		next;
 		cutin "god_nelluad01",255;
 		mes "- Nell seems embarrassed, then starts playing very complicated music -";
@@ -568,7 +568,7 @@ spl_in01,172,225,3	script	Wandering Poet#ep13	51,{
 	end;
 }
 
-spl_in01,182,213,1	script	Resting Laphine#ep13_1	438,{
+spl_in01,182,213,1	script	Resting Laphine#ep13_1	4_F_FAIRYKID3,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[Resting Laphine]";
 		mes "The poet on the stagie is mysterious.";
@@ -589,7 +589,7 @@ spl_in01,182,213,1	script	Resting Laphine#ep13_1	438,{
 	}
 }
 
-spl_in01,181,218,5	script	Resting Laphine#ep13_2	446,{
+spl_in01,181,218,5	script	Resting Laphine#ep13_2	4_M_FAIRYKID5,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "- He is nodding his head to the sound of the music -";
 		next;
@@ -609,7 +609,7 @@ spl_in01,181,218,5	script	Resting Laphine#ep13_2	446,{
 	}
 }
 
-spl_in01,161,213,7	script	Dining Laphine#ep13	447,{
+spl_in01,161,213,7	script	Dining Laphine#ep13	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[Dining Laphine]";
 		mes "I got bored eating home cooked food.";
@@ -630,7 +630,7 @@ spl_in01,161,213,7	script	Dining Laphine#ep13	447,{
 	}
 }
 
-spl_in01,162,202,5	script	Laphine taking notes#1	436,{
+spl_in01,162,202,5	script	Laphine taking notes#1	4_F_FAIRYKID,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[Laphine taking notes]";
 		mes "We are quite impressed by the poet.";
@@ -655,12 +655,12 @@ spl_in01,162,202,5	script	Laphine taking notes#1	436,{
 	}
 }
 
-spl_in01,167,207,7	script	Silent Laphine#ep13	445,{
+spl_in01,167,207,7	script	Silent Laphine#ep13	4_M_FAIRYKID4,{
 	mes "- He is almost sleeping but he is still managing to hold a cup with a drink in it. He must be really tired-";
 	close;
 }
 
-spl_in01,180,201,3	script	Laphine Soldier#ep13_1	461,{
+spl_in01,180,201,3	script	Laphine Soldier#ep13_1	4_M_FAIRYSOLDIER2,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[Laphine Soldier]";
 		mes "You are a stranger here, aren't you?";
@@ -688,7 +688,7 @@ spl_in01,180,201,3	script	Laphine Soldier#ep13_1	461,{
 	}
 }
 
-spl_in01,189,207,3	script	Laphine Staff#ep13_1	439,{
+spl_in01,189,207,3	script	Laphine Staff#ep13_1	4_F_FAIRYKID4,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[Laphine Staff]";
 		mes "Hm, what's up?";
@@ -713,7 +713,7 @@ spl_in01,189,207,3	script	Laphine Staff#ep13_1	439,{
 	}
 }
 
-spl_in01,154,207,5	script	Laphine Staff#ep13_2	440,{
+spl_in01,154,207,5	script	Laphine Staff#ep13_2	4_F_FAIRYKID5,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[Laphine Staff]";
 		mes "his camp serves a military purpose. But we also have a need for bars.";
@@ -734,7 +734,7 @@ spl_in01,154,207,5	script	Laphine Staff#ep13_2	440,{
 	}
 }
 
-spl_in01,122,314,5	script	High-Ranked Soldier#ep13	461,{
+spl_in01,122,314,5	script	High-Ranked Soldier#ep13	4_M_FAIRYSOLDIER2,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[High-Ranked Soldier]";
 		mes "Are ther any new supplies?";
@@ -763,7 +763,7 @@ spl_in01,122,314,5	script	High-Ranked Soldier#ep13	461,{
 	}
 }
 
-spl_in01,122,311,1	script	Laphine Soldier#ep13_2	447,{
+spl_in01,122,311,1	script	Laphine Soldier#ep13_2	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[Laphine Soldier]";
 		mes "Are you a stranger?";
@@ -792,7 +792,7 @@ spl_in01,122,311,1	script	Laphine Soldier#ep13_2	447,{
 }
 
 // ep33_2_dailybs
-splendide,121,259,3	script	Fairy#ep13bs1	436,{
+splendide,121,259,3	script	Fairy#ep13bs1	4_F_FAIRYKID,{
 	if (isequipped(2782) == 1) {
 		mes "[Fairy]";
 		mes "Have you ever gone to the East side?";
@@ -809,7 +809,7 @@ splendide,121,259,3	script	Fairy#ep13bs1	436,{
 	}
 }
 
-splendide,163,264,3	script	Fairy#ep13bs2	438,{
+splendide,163,264,3	script	Fairy#ep13bs2	4_F_FAIRYKID3,{
 	if (isequipped(2782) == 1) {
 		mes "[Fairy]";
 		mes "What are you looking at!";
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index cb8a1e0c0..6436f3521 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -5,28 +5,28 @@
 //===== Current Version: =====================================
 //= 2.1
 //===== Description: =========================================
-//- [Aegis Conversion]
+//- [Official Conversion]
 //= Umbala Town Npcs
 //===== Additional Comments: =================================
-//= 1.0 - Done By jAthena (dunno Who)
-//= 1.1 - Translated by Fusion Dev Team
-//= 1.2 - Fixed Something by Muad Dib
-//= 1.3 - Fixed up For eA by Darkchild
-//= 1.4 - Fixed some wrong item names [Lupus]
-//= 1.5 - Spell Checked [massdriller]
-//= 1.6 - Fixed item names, added a chance to get to Niflheim via Jumping Bungy Area [Lupus]
-//= 1.7 - Fixed bugs and exploits [Lupus]
-//= 1.8 - Warps you to Niff with 1HP [Lance]
-//= 1.9 - Moved Umbala Event, Create Essence/Dismantle Stone, and Skeletal Gate to npc/quests/quests_umbala.txt [Evera]
-//= 2.0 - Removed duplicates, max NPC name length is 23, so Utan Tribe Young Adult#1, the 1 is skipped [Toms]
-//= 2.1 - Updated to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.0 Done By jAthena (dunno Who)
+//= 1.1 Translated by Fusion Dev Team
+//= 1.2 Fixed Something by Muad Dib
+//= 1.3 Fixed up For eA by Darkchild
+//= 1.4 Fixed some wrong item names [Lupus]
+//= 1.5 Spell Checked [massdriller]
+//= 1.6 Fixed item names, added a chance to get to Niflheim via Jumping Bungy Area [Lupus]
+//= 1.7 Fixed bugs and exploits [Lupus]
+//= 1.8 Warps you to Niff with 1HP [Lance]
+//= 1.9 Moved Umbala Event, Create Essence/Dismantle Stone, and Skeletal Gate to npc/quests/quests_umbala.txt [Evera]
+//= 2.0 Removed duplicates, max NPC name length is 23, so Utan Tribe Young Adult#1, the 1 is skipped [Toms]
+//= 2.1 Updated to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-comodo,170,137,7	script	La Ed#um	84,{
+comodo,170,137,7	script	La Ed#um	4_M_02,{
 	end;
 }
 
-comodo,171,137,1	script	Haith#um	92,{
+comodo,171,137,1	script	Haith#um	4_F_03,{
 	mes "[La Ed]";
 	mes "There MUST be a treasure hidden in that place!";
 	next;
@@ -76,7 +76,7 @@ comodo,171,137,1	script	Haith#um	92,{
 	next;
 	if (select("Pay 1,000 zeny:Refuse to pay") == 1) {
 		if (Zeny > 999) {
-			set zeny,zeny-1000;
+			Zeny -= 1000;
 			mes "[Haith]";
 			mes "Hahahaha! You the man!";
 			next;
@@ -136,7 +136,7 @@ comodo,171,137,1	script	Haith#um	92,{
 	close;
 }
 
-cmd_in01,175,120,3	script	Iriya#um	69,{
+cmd_in01,175,120,3	script	Iriya#um	1_F_04,{
 	mes "[Iriya]";
 	mes "Mr. Niels is at the table in the";
 	mes "corner. He has many interesting";
@@ -156,7 +156,7 @@ cmd_in01,175,120,3	script	Iriya#um	69,{
 	close;
 }
 
-cmd_in01,164,115,1	script	Niels#um	731,{
+cmd_in01,164,115,1	script	Niels#um	4_M_JOB_BLACKSMITH,{
 	mes "[Niels]";
 	mes "Hmm? What's that look for?";
 	mes "Ah~ You must of heard the rumors";
@@ -236,7 +236,7 @@ cmd_in01,164,115,1	script	Niels#um	731,{
 	close;
 }
 
-umbala,70,106,3	script	Utan Kid#um	781,{
+umbala,70,106,3	script	Utan Kid#um	4_F_UMGIRL,{
 	if (event_umbala >= 3) {
 		mes "[???]";
 		mes "Huh?";
@@ -272,8 +272,8 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 			mes "Whoaaaa!!";
 			mes "You the man~!";
 			mes "Thank you so much, yay~!";
-			if (zeny > 1000) {
-				set zeny,zeny-1000;
+			if (Zeny > 1000) {
+				Zeny -= 1000;
 				if (checkweight(517,1)) {
 					getitem 517,1; //Meat
 				}
@@ -333,8 +333,8 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 			mes "Umbaumbah!!";
 			mes "Um~bahumbah~ Um~baumbah~";
 			mes "Um~baumbah~ um~baumbah~";
-			if (zeny > 1000) {
-				set zeny,zeny-1000;
+			if (Zeny > 1000) {
+				Zeny -= 1000;
 				if (checkweight(517,1)) {
 					getitem 517,1; //Meat
 				}
@@ -361,7 +361,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 	close;
 }
 
-umbala,59,243,5	script	Utan Kid#1	787,{
+umbala,59,243,5	script	Utan Kid#1	4_M_UMKID,{
 	if (event_umbala >= 3) {
 		mes "[Kotan]";
 		mes "............";
@@ -437,7 +437,7 @@ umbala,59,243,5	script	Utan Kid#1	787,{
 	}
 }
 
-umbala,177,153,3	script	Pasto#um	97,{
+umbala,177,153,3	script	Pasto#um	4W_M_01,{
 	mes "[Pasto]";
 	emotion e_gasp;
 	mes "Oh my god~! Finally,";
@@ -488,7 +488,7 @@ umbala,177,153,3	script	Pasto#um	97,{
 	close;
 }
 
-umbala,80,146,4	script	Yuwooki#um	753,{
+umbala,80,146,4	script	Yuwooki#um	4_M_MONK,{
 	mes "[Yuwooki]";
 	mes "Umbah umbah woogawoo...";
 	mes "oops, sorry! I'm so used";
@@ -542,7 +542,7 @@ umbala,80,146,4	script	Yuwooki#um	753,{
 	close;
 }
 
-umbala,140,157,6	script	Utan Man#1	785,{
+umbala,140,157,6	script	Utan Man#1	4_M_UMDANCEKID2,{
 	if (event_umbala >= 3) {
 		mes "[Jertan]";
 		mes "Bungee jumping can be dangerous,";
@@ -562,7 +562,7 @@ umbala,140,157,6	script	Utan Man#1	785,{
 	}
 }
 
-umbala,146,157,4	script	Utan Man#2	786,{
+umbala,146,157,4	script	Utan Man#2	4_M_UMDANCEKID,{
 	if (event_umbala >= 3) {
 		mes "[Arotan]";
 		mes "Completing the bungee jump";
@@ -580,7 +580,7 @@ umbala,146,157,4	script	Utan Man#2	786,{
 	}
 }
 
-umbala,149,165,4	script	Utan Kid#3	781,{
+umbala,149,165,4	script	Utan Kid#3	4_F_UMGIRL,{
 	if (event_umbala >= 3) {
 		mes "[Klumatan]";
 		mes "It's really scary, falling from";
@@ -606,7 +606,7 @@ umbala,149,165,4	script	Utan Kid#3	781,{
 	}
 }
 
-umbala,92,159,4	script	Bertan#um	785,{
+umbala,92,159,4	script	Bertan#um	4_M_UMDANCEKID2,{
 	if (event_umbala >= 3) {
 		mes "[Bertan]";
 		mes "What up, loser!";
@@ -802,7 +802,7 @@ umbala,92,159,4	script	Bertan#um	785,{
 	close;
 }
 
-umbala,194,104,4	script	Utan Kid#2	787,{
+umbala,194,104,4	script	Utan Kid#2	4_M_UMKID,{
 	if (event_umbala >= 3) {
 		mes "[Boorkatan]";
 		mes "Huh? You're from Rune-Midgard,";
@@ -845,7 +845,7 @@ umbala,194,104,4	script	Utan Kid#2	787,{
 	}
 }
 
-umbala,193,208,6	script	Utan Man#3	789,{
+umbala,193,208,6	script	Utan Man#3	4_M_UMSOLDIER,{
 	if (event_umbala >= 3) {
 		mes "[Weitan]";
 		mes "I too did the bungee jump when I";
@@ -873,7 +873,7 @@ umbala,193,208,6	script	Utan Man#3	789,{
 	}
 }
 
-umbala,139,205,4	script	Utan Man#5	785,{
+umbala,139,205,4	script	Utan Man#5	4_M_UMDANCEKID2,{
 	if (event_umbala >= 3) {
 		mes "[Jooltan]";
 		mes "It's been a long time since I last";
@@ -928,7 +928,7 @@ umbala,139,205,4	script	Utan Man#5	785,{
 	}
 }
 
-um_in,158,71,3	script	Utan villager#um	787,{
+um_in,158,71,3	script	Utan villager#um	4_M_UMKID,{
 	if (event_umbala >= 3) {
 		mes "[Mutakutan]";
 		mes "Umbala has many many trees!";
diff --git a/npc/cities/veins.txt b/npc/cities/veins.txt
index f07955587..d0b40a07d 100644
--- a/npc/cities/veins.txt
+++ b/npc/cities/veins.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.1
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Veins Town Npcs
 //===== Additional Comments: =================================
 //= 1.0 First version [L0ne_W0lf]
@@ -13,8 +13,8 @@
 //============================================================
 
 // Veins
-//============================================================ 
-veins,162,34,5	script	Towner#ve1	943,{
+//============================================================
+veins,162,34,5	script	Towner#ve1	4_M_DESERT,{
 	mes "[Towner]";
 	mes "I love cacti. They're";
 	mes "the most beautiful plants";
@@ -38,7 +38,7 @@ veins,162,34,5	script	Towner#ve1	943,{
 	close;
 }
 
-veins,148,41,3	script	Towner#ve2	940,{
+veins,148,41,3	script	Towner#ve2	4_F_DESERT,{
 	mes "[Towner]";
 	mes "Welcome to Veins, the";
 	mes "town near the Temple of";
@@ -61,7 +61,7 @@ veins,148,41,3	script	Towner#ve2	940,{
 	close;
 }
 
-veins,137,179,5	script	Towner#ve3	943,{
+veins,137,179,5	script	Towner#ve3	4_M_DESERT,{
 	mes "[Towner]";
 	mes "Geez, why is our weapon";
 	mes "shop so boring? Nothing";
@@ -78,7 +78,7 @@ veins,137,179,5	script	Towner#ve3	943,{
 	close;
 }
 
-veins,166,91,5	script	Towner#ve4	946,{
+veins,166,91,5	script	Towner#ve4	4_M_DST_MASTER,{
 	mes "[Towner]";
 	mes "Though we're in the";
 	mes "middle of the desert,";
@@ -96,7 +96,7 @@ veins,166,91,5	script	Towner#ve4	946,{
 	close;
 }
 
-veins,138,71,5	script	Kid#ve1	941,{
+veins,138,71,5	script	Kid#ve1	4_F_DST_CHILD,{
 	mes "[Kid]";
 	mes "Whoa, get out of here!";
 	mes "Can't you see that I'm";
@@ -105,7 +105,7 @@ veins,138,71,5	script	Kid#ve1	941,{
 	close;
 }
 
-veins,253,133,3	script	Kid#ve2	944,{
+veins,253,133,3	script	Kid#ve2	4_M_DST_CHILD,{
 	mes "[Kid]";
 	mes "Gosh, where could she";
 	mes "be hiding? I hate being";
@@ -116,7 +116,7 @@ veins,253,133,3	script	Kid#ve2	944,{
 	close;
 }
 
-veins,270,164,5	script	Old Man#ve1	945,{
+veins,270,164,5	script	Old Man#ve1	4_M_DST_GRAND,{
 	mes "[Old Man]";
 	mes "Praise be to Freya";
 	mes "for blessing me with";
@@ -133,7 +133,7 @@ veins,270,164,5	script	Old Man#ve1	945,{
 	close;
 }
 
-veins,310,195,1	script	Towner#ve5	946,{
+veins,310,195,1	script	Towner#ve5	4_M_DST_MASTER,{
 	mes "[Towner]";
 	mes "Cacti are wonderful,";
 	mes "they're the most beautiful";
@@ -150,7 +150,7 @@ veins,310,195,1	script	Towner#ve5	946,{
 	close;
 }
 
-veins,320,254,5	script	Towner#ve6	943,{
+veins,320,254,5	script	Towner#ve6	4_M_DESERT,{
 	mes "[Towner]";
 	mes "What do you want?";
 	mes "Sorry, but I'm just";
@@ -165,7 +165,7 @@ veins,320,254,5	script	Towner#ve6	943,{
 	close;
 }
 
-veins,333,318,3	script	Towner#ve7	940,{
+veins,333,318,3	script	Towner#ve7	4_F_DESERT,{
 	mes "[Towner]";
 	mes "What's an adventurer";
 	mes "doing here in such an";
@@ -176,7 +176,7 @@ veins,333,318,3	script	Towner#ve7	940,{
 	close;
 }
 
-veins,218,323,1	script	Towner#ve8	945,{
+veins,218,323,1	script	Towner#ve8	4_M_DST_GRAND,{
 	mes "[Towner]";
 	mes "Whoa, it's been a while";
 	mes "seen I've seen tourists";
@@ -204,7 +204,7 @@ veins,218,323,1	script	Towner#ve8	945,{
 	close;
 }
 
-veins,206,275,3	script	Kid#ve3	941,{
+veins,206,275,3	script	Kid#ve3	4_F_DST_CHILD,{
 	mes "[Kid]";
 	mes "I really want to look";
 	mes "inside the temple, but";
@@ -214,7 +214,7 @@ veins,206,275,3	script	Kid#ve3	941,{
 	close;
 }
 
-veins,171,256,3	script	Towner#ve9	943,{
+veins,171,256,3	script	Towner#ve9	4_M_DESERT,{
 	mes "[Towner]";
 	mes "Don't get me wrong:";
 	mes "I'd give my life in Freya's";
@@ -225,7 +225,7 @@ veins,171,256,3	script	Towner#ve9	943,{
 	close;
 }
 
-veins,197,219,5	script	Towner#ve10	943,{
+veins,197,219,5	script	Towner#ve10	4_M_DESERT,{
 	mes "[Towner]";
 	mes "I guess you can tell";
 	mes "from this withered tree";
@@ -236,7 +236,7 @@ veins,197,219,5	script	Towner#ve10	943,{
 	close;
 }
 
-veins,232,169,5	script	Old lady#ve1	942,{
+veins,232,169,5	script	Old lady#ve1	4_F_DST_GRAND,{
 	mes "[Old Lady]";
 	mes "When I look down on";
 	mes "Veins from here, I've";
@@ -254,7 +254,7 @@ veins,232,169,5	script	Old lady#ve1	942,{
 	close;
 }
 
-veins,121,199,3	script	Old Man#ve2	945,{
+veins,121,199,3	script	Old Man#ve2	4_M_DST_GRAND,{
 	mes "[Old Man]";
 	mes "This isn't good.";
 	mes "The elderly outnumber";
@@ -273,7 +273,7 @@ veins,121,199,3	script	Old Man#ve2	945,{
 	close;
 }
 
-veins,111,50,3	script	Towner#ve11	943,{
+veins,111,50,3	script	Towner#ve11	4_M_DESERT,{
 	mes "[Towner]";
 	mes "People cherish water";
 	mes "around here, but I've";
@@ -291,7 +291,7 @@ veins,111,50,3	script	Towner#ve11	943,{
 	close;
 }
 
-veins,112,51,3	script	Towner#ve12	940,{
+veins,112,51,3	script	Towner#ve12	4_F_DESERT,{
 	mes "[Towner]";
 	mes "Well, I'm actually";
 	mes "a little tired of coming";
@@ -309,7 +309,7 @@ veins,112,51,3	script	Towner#ve12	940,{
 	close;
 }
 
-veins,191,134,3	script	Old Man#ve3	945,{
+veins,191,134,3	script	Old Man#ve3	4_M_DST_GRAND,{
 	mes "[Old Man]";
 	mes "Why don't you take";
 	mes "a look at my goods?";
@@ -326,7 +326,7 @@ veins,191,134,3	script	Old Man#ve3	945,{
 	close;
 }
 
-veins,177,147,3	script	Old Lady#ve2	942,{
+veins,177,147,3	script	Old Lady#ve2	4_F_DST_GRAND,{
 	mes "[Old Lady]";
 	mes "Owning a lot of stuff";
 	mes "might seem great, but";
@@ -350,7 +350,7 @@ veins,177,147,3	script	Old Lady#ve2	942,{
 	close;
 }
 
-veins,223,165,5	script	Kid#ve4	944,{
+veins,223,165,5	script	Kid#ve4	4_M_DST_CHILD,{
 	mes "[Kid]";
 	mes "Hey! Do you think";
 	mes "I can reach the bridge";
@@ -368,7 +368,7 @@ veins,223,165,5	script	Kid#ve4	944,{
 	close;
 }
 
-veins,263,153,5	script	Towner#ve13	943,{
+veins,263,153,5	script	Towner#ve13	4_M_DESERT,{
 	mes "[Towner]";
 	mes "The clothes we make here";
 	mes "are high, airy, and sewn";
@@ -387,7 +387,7 @@ veins,263,153,5	script	Towner#ve13	943,{
 	close;
 }
 
-veins,296,184,3	script	Towner#ve14	940,{
+veins,296,184,3	script	Towner#ve14	4_F_DESERT,{
 	mes "[Towner]";
 	mes "Let me tell you a secret.";
 	mes "But promise not to tell";
@@ -417,7 +417,7 @@ veins,296,184,3	script	Towner#ve14	940,{
 	close;
 }
 
-veins,291,205,3	script	Kid#ve5	944,{
+veins,291,205,3	script	Kid#ve5	4_M_DST_CHILD,{
 	mes "[Kid]";
 	mes "Argh! I'm a war god";
 	mes "protecting Goddess Freya";
@@ -438,7 +438,7 @@ veins,291,205,3	script	Kid#ve5	944,{
 	close;
 }
 
-veins,291,259,3	script	Old Man#ve4	945,{
+veins,291,259,3	script	Old Man#ve4	4_M_DST_GRAND,{
 	mes "[Old Man]";
 	mes "Fr... Fr...";
 	next;
@@ -463,7 +463,7 @@ veins,291,259,3	script	Old Man#ve4	945,{
 	close;
 }
 
-veins,291,284,3	script	Old Lady#ve3	942,{
+veins,291,284,3	script	Old Lady#ve3	4_F_DST_GRAND,{
 	mes "[Old Lady]";
 	mes "I wonder what my";
 	mes "standing with Freya";
@@ -474,7 +474,7 @@ veins,291,284,3	script	Old Lady#ve3	942,{
 	close;
 }
 
-veins,248,301,3	script	Kid#ve6	944,{
+veins,248,301,3	script	Kid#ve6	4_M_DST_CHILD,{
 	mes "[Kid]";
 	mes "Huh? You don't live here.";
 	mes "Are you... Are you a traveler?";
@@ -493,7 +493,7 @@ veins,248,301,3	script	Kid#ve6	944,{
 	close;
 }
 
-veins,161,63,3	script	Old Man#ve5	945,{
+veins,161,63,3	script	Old Man#ve5	4_M_DST_GRAND,{
 	mes "[Old Man]";
 	mes "Oh. You must be";
 	mes "sightseeing. Um,";
@@ -518,7 +518,7 @@ veins,161,63,3	script	Old Man#ve5	945,{
 	close;
 }
 
-veins,157,123,3	script	Towner#ve15	946,{
+veins,157,123,3	script	Towner#ve15	4_M_DST_MASTER,{
 	mes "[Towner]";
 	mes "You know what's good";
 	mes "about the desert? No?";
@@ -533,8 +533,8 @@ veins,157,123,3	script	Towner#ve15	946,{
 }
 
 // Inside Veins
-//============================================================ 
-ve_in,119,386,3	script	Prisoner#ve1	946,{
+//============================================================
+ve_in,119,386,3	script	Prisoner#ve1	4_M_DST_MASTER,{
 	mes "[Prisoner]";
 	mes "Unbelievable!";
 	mes "What kind of country";
@@ -551,7 +551,7 @@ ve_in,119,386,3	script	Prisoner#ve1	946,{
 	close;
 }
 
-ve_in,111,379,8	script	Ward#ve1	946,{
+ve_in,111,379,8	script	Ward#ve1	4_M_DST_MASTER,{
 	mes "[Ward]";
 	mes "This place ensures that";
 	mes "dangerous criminals aren't";
@@ -562,7 +562,7 @@ ve_in,111,379,8	script	Ward#ve1	946,{
 	close;
 }
 
-ve_in,126,378,3	script	Ward#ve2	946,{
+ve_in,126,378,3	script	Ward#ve2	4_M_DST_MASTER,{
 	mes "[Ward]";
 	mes "I'm grateful that our";
 	mes "town is relatively peaceful.";
@@ -577,7 +577,7 @@ ve_in,126,378,3	script	Ward#ve2	946,{
 	close;
 }
 
-ve_in,101,314,1	script	Towner#ve16	943,{
+ve_in,101,314,1	script	Towner#ve16	4_M_DESERT,{
 	mes "[Towner]";
 	mes "^333333*Pant Pant*^000000";
 	mes "I must study as hard as I can";
@@ -591,7 +591,7 @@ ve_in,101,314,1	script	Towner#ve16	943,{
 	close;
 }
 
-ve_in,90,298,3	script	Towner#ve17	849,{
+ve_in,90,298,3	script	Towner#ve17	4_M_DIEMAN,{
 	mes "[Towner]";
 	mes "It's too hot...";
 	next;
@@ -600,7 +600,7 @@ ve_in,90,298,3	script	Towner#ve17	849,{
 	close;
 }
 
-ve_in,361,243,5	script	Towner#ve18	849,{
+ve_in,361,243,5	script	Towner#ve18	4_M_DIEMAN,{
 	mes "[Towner]";
 	mes "...............";
 	mes "...............";
@@ -618,7 +618,7 @@ ve_in,361,243,5	script	Towner#ve18	849,{
 	close;
 }
 
-ve_in,242,124,3	script	Towner#ve19	849,{
+ve_in,242,124,3	script	Towner#ve19	4_M_DIEMAN,{
 	mes "[Towner]";
 	mes "The drinks in this";
 	mes "town are so... They're...";
@@ -636,7 +636,7 @@ ve_in,242,124,3	script	Towner#ve19	849,{
 	close;
 }
 
-ve_in,180,232,5	script	Towner#ve20	946,{
+ve_in,180,232,5	script	Towner#ve20	4_M_DST_MASTER,{
 	mes "[Towner]";
 	mes "It's nice when a town";
 	mes "is peaceful and quiet...";
@@ -653,7 +653,7 @@ ve_in,180,232,5	script	Towner#ve20	946,{
 	close;
 }
 
-ve_in,163,212,3	script	Towner#ve21	940,{
+ve_in,163,212,3	script	Towner#ve21	4_F_DESERT,{
 	mes "[Towner]";
 	mes "There's nothing but";
 	mes "old people and children";
@@ -670,7 +670,7 @@ ve_in,163,212,3	script	Towner#ve21	940,{
 	close;
 }
 
-ve_in,190,215,3	script	Towner#ve22	946,{
+ve_in,190,215,3	script	Towner#ve22	4_M_DST_MASTER,{
 	mes "[Towner]";
 	mes "Well, our town doesn't";
 	mes "have a choice but to";
@@ -694,7 +694,7 @@ ve_in,190,215,3	script	Towner#ve22	946,{
 	close;
 }
 
-ve_in,318,121,3	script	Towner#ve23	943,{
+ve_in,318,121,3	script	Towner#ve23	4_M_DESERT,{
 	mes "[Towner]";
 	mes "This storage solely";
 	mes "exists for serious drinkers.";
@@ -718,7 +718,7 @@ ve_in,318,121,3	script	Towner#ve23	943,{
 	close;
 }
 
-ve_in,222,125,5	script	Towner#ve24	943,{
+ve_in,222,125,5	script	Towner#ve24	4_M_DESERT,{
 	mes "[Towner]";
 	mes "I really want to";
 	mes "ask out the woman";
@@ -732,7 +732,7 @@ ve_in,222,125,5	script	Towner#ve24	943,{
 	close;
 }
 
-ve_in,222,122,1	script	Towner#ve25	940,{
+ve_in,222,122,1	script	Towner#ve25	4_F_DESERT,{
 	mes "[Towner]";
 	mes "I heard all that...";
 	mes "Gosh, he's so clueless.";
@@ -743,7 +743,7 @@ ve_in,222,122,1	script	Towner#ve25	940,{
 	close;
 }
 
-ve_in,232,135,5	script	Towner#ve26	946,{
+ve_in,232,135,5	script	Towner#ve26	4_M_DST_MASTER,{
 	mes "[Towner]";
 	mes "If you enjoy a good,";
 	mes "stiff drink, then you have";
@@ -758,7 +758,7 @@ ve_in,232,135,5	script	Towner#ve26	946,{
 	close;
 }
 
-ve_in,239,135,5	script	Towner#ve27	946,{
+ve_in,239,135,5	script	Towner#ve27	4_M_DST_MASTER,{
 	mes "[Towner]";
 	mes "Isn't the sun so hot?";
 	mes "Doesn't it make you feel";
@@ -776,7 +776,7 @@ ve_in,239,135,5	script	Towner#ve27	946,{
 	close;
 }
 
-ve_in,232,124,5	script	Towner#ve28	943,{
+ve_in,232,124,5	script	Towner#ve28	4_M_DESERT,{
 	mes "[Towner]";
 	mes "A lone wolf of the desert.";
 	mes "That's me. Well, that's why";
@@ -789,7 +789,7 @@ ve_in,232,124,5	script	Towner#ve28	943,{
 	close;
 }
 
-ve_in,234,105,3	script	Towner#ve29	946,{
+ve_in,234,105,3	script	Towner#ve29	4_M_DST_MASTER,{
 	mes "[Towner]";
 	mes "Man, the world is just...";
 	mes "It's just desires...!";
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index f681aa4e4..8ecc4910b 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -1,28 +1,30 @@
 //===== Hercules Script ======================================
 //= Juno City
-//===== By: ================================================== 
+//===== By: ==================================================
 //= KitsuneStarwind, kobra_k88, L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.4a
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= NPCs for the City of Juno
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Added additional npcs.  Added Metto quest. [kobra_k88]
 //= Moved item quest to quest folder. Re-edited a majority of the npcs. [kobra_k88]
 //=a Removed duplicate npcs already found in the sage quest.
 //= Fixed & Spellchecked [massdriller]
 //= 1.3 Started updating Juno NPCs based on iRO. 10% complete.
 //= 1.3.2 Started updating Juno NPCs based on iRO. 30% complete.
-//= 1.3.3 Removed Noyee	NPC (it's implemented in sleipnir_seal.txt)
+//= 1.3.3 Removed Noyee NPC (it's implemented in sleipnir_seal.txt)
 //= 1.4 Updated to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Added Juno Airship Representative.
+//=     Added Juno Airship Representative.
 //= 1.4a Corrected a Typo error (bugreport:716) [Samuray22]
-//============================================================ 
+//= 1.5 Added Renewal coordinates for Payon and Izlude. [Euphy]
+//=     Split Soldier NPCs into Pre-RE/RE (sprite change).
+//============================================================
 
 // Juno
-//============================================================ 
-yuno,184,173,4	script	Freidrich#juno	729,{
+//============================================================
+yuno,184,173,4	script	Freidrich#juno	4_F_NOVICE,{
 	if (rand(1,5) == 1) {
 		mes "[Freidrich]";
 		mes "^3355FFJuno^000000 is kept aloft in the air by an ancient and mysterious force.";
@@ -55,7 +57,7 @@ yuno,184,173,4	script	Freidrich#juno	729,{
 	}
 }
 	
-yuno,337,227,4	script	Juno Granny#juno	103,{
+yuno,337,227,4	script	Juno Granny#juno	8_F_GRANDMOTHER,{
 	mes "[Granny]";
 	if (rand(1,50) == 1) {
 		if (Zeny > 999) {
@@ -74,7 +76,7 @@ yuno,337,227,4	script	Juno Granny#juno	103,{
 				mes "[Granny]";
 				mes "*Giggle*";
 				mes "There you go~";
-				set zeny,zeny-1000;
+				Zeny -= 1000;
 				getitem 529,1; //Candy
 				next;
 				mes "[Granny]";
@@ -109,7 +111,7 @@ yuno,337,227,4	script	Juno Granny#juno	103,{
 	}
 }
 
-yuno,328,239,4	script	Juno Fighter#juno	732,{
+yuno,328,239,4	script	Juno Fighter#juno	4_M_JOB_HUNTER,{
 	mes "[Sergiof]";
 	mes "My name is Sergiof,";
 	mes "the fighter who";
@@ -123,7 +125,7 @@ yuno,328,239,4	script	Juno Fighter#juno	732,{
 	close;
 }
 
-yuno,343,68,4	script	Juno Despot#juno	730,{
+yuno,343,68,4	script	Juno Despot#juno	4_M_JOB_ASSASSIN,{
 	mes "[Ninno]";
 	if (rand(1,1000) == 1) {
 		mes "You are very lucky to have me tell you this story. This only happens by ^FF33551 out of a 1,000 chance^000000.";
@@ -147,7 +149,7 @@ yuno,343,68,4	script	Juno Despot#juno	730,{
 	close;
 }
 
-yuno,165,111,4	script	Juno Sage#juno	123,,{
+yuno,165,111,4	script	Juno Sage#juno	2_F_MAGICMASTER,,{
 	mes "[Le Morpheus]";
 	if (rand(1,50) == 25) {
 		if (Zeny > 4999) {
@@ -165,7 +167,7 @@ yuno,165,111,4	script	Juno Sage#juno	123,,{
 			if (select("Choose ^FF3355Red Herb^000000:Choose ^3355FFBlue Herb^000000.") == 1) {
 				mes "[Le Morpheus]";
 				mes "As you have chosen, you will forget everything, and remain in this virtual reality.";
-				set zeny,zeny-5000;
+				Zeny -= 5000;
 				getitem 507,1; //Red_Herb
 				close2;
 				warp "prontera",182,206;
@@ -173,7 +175,7 @@ yuno,165,111,4	script	Juno Sage#juno	123,,{
 			}
 			mes "[Le Morpheus]";
 			mes "You will see the truth.";
-			set zeny,zeny-5000;
+			Zeny -= 5000;
 			getitem 510,1; //Blue_Herb
 			close2;
 			warp "pay_dun03",200,222;
@@ -194,7 +196,7 @@ yuno,165,111,4	script	Juno Sage#juno	123,,{
 	}
 }
 	
-yuno,157,205,4	script	Juno Artisan#juno	54,{
+yuno,157,205,4	script	Juno Artisan#juno	1_M_JOBGUIDER,{
 	mes "[Artisan]";
 	mes "*Mumble mumble...*";
 	next;
@@ -237,7 +239,7 @@ yuno,157,205,4	script	Juno Artisan#juno	54,{
 	}
 }
 
-yuno,150,283,4	script	Juno Soldier#juno	105,{
+-	script	::JunoSoldier1	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -251,8 +253,8 @@ yuno,150,283,4	script	Juno Soldier#juno	105,{
 	mes "You'd better be careful when you encounter this monster. It will damage armor and weapons in the twinkling of an eye.";
 	close;
 }
-	
-yuno,165,283,4	script	Juno Soldier#2juno	105,{
+
+-	script	::JunoSoldier2	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -267,8 +269,8 @@ yuno,165,283,4	script	Juno Soldier#2juno	105,{
 	mes "The name of this monster originated from a story about a poor geographer who, unfortunately, was eaten by this monster while he was immersed in his studies.";
 	close;
 }
-	
-yuno,227,292,4	script	Juno Soldier#3juno	105,{
+
+-	script	::JunoSoldier3	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -279,8 +281,8 @@ yuno,227,292,4	script	Juno Soldier#3juno	105,{
 	mes "Don't be fooled by its appearance, or you'll find yourself in trouble.";
 	close;
 }
-	
-yuno,165,228,4	script	Juno Soldier#4juno	105,{
+
+-	script	::JunoSoldier4	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -294,8 +296,8 @@ yuno,165,228,4	script	Juno Soldier#4juno	105,{
 	mes "Goat's legs are so strong because it's always climbing cliffs when it's not busy slaughtering the innocent.";
 	close;
 }
-	
-yuno,150,228,4	script	Juno Soldier#5juno	105,{
+
+-	script	::JunoSoldier5	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -310,8 +312,8 @@ yuno,150,228,4	script	Juno Soldier#5juno	105,{
 	mes "shining jellopy even exists!";
 	close;
 }
-	
-yuno,334,182,4	script	Juno Soldier#6juno	105,{
+
+-	script	::JunoSoldier6	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -322,8 +324,8 @@ yuno,334,182,4	script	Juno Soldier#6juno	105,{
 	mes "Its use is limited to the Sage class, and it increases the chance of inflicting critical attacks. So, for Sages, that dagger can be very useful, as well as make them look stylish in battle.";
 	close;
 }
-	
-yuno,263,320,4	script	Juno Soldier#7juno	105,{
+
+-	script	::JunoSoldier7	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -335,7 +337,7 @@ yuno,263,320,4	script	Juno Soldier#7juno	105,{
 	close;
 }
 
-yuno,142,183,5	script	Airship Representative	100,{
+yuno,142,183,5	script	Airship Representative	4W_SAILOR,{
 	mes "[Airship Representative]";
 	mes "Good day, I am here to inform you";
 	mes "about the Juno Airship which";
@@ -364,19 +366,19 @@ yuno,142,183,5	script	Airship Representative	100,{
 	mes "The teleport fee is 1,800 zeny, regardless of where you want to go. Please let me know your desired destination.";
 	next;
 	switch(select("Prontera:Izlude:Geffen:Morroc:Payon:Alberta:Comodo:Cancel")) {
-	case 1: callsub S_Warp,"prontera",116,72;
-	case 2: callsub S_Warp,"izlude",94,103;
-	case 3: callsub S_Warp,"geffen",120,39;
-	case 4: callsub S_Warp,"morocc",156,46;
-	case 5: callsub S_Warp,"payon",69,100;
-	case 6: callsub S_Warp,"alberta",117,56;
-	case 7: callsub S_Warp,"comodo",209,143;
-	case 8: close;
+		case 1: callsub S_Warp,"prontera",116,72;
+		case 2: if (checkre(0)) callsub S_Warp,"izlude",128,98; else callsub S_Warp,"izlude",94,103;
+		case 3: callsub S_Warp,"geffen",120,39;
+		case 4: callsub S_Warp,"morocc",156,46;
+		case 5: if (checkre(0)) callsub S_Warp,"payon",162,59; else callsub S_Warp,"payon",69,100;
+		case 6: callsub S_Warp,"alberta",117,56;
+		case 7: callsub S_Warp,"comodo",209,143;
+		case 8: close;
 	}
 
 S_Warp:
 	if (Zeny >= 1800) {
-		set zeny,zeny-1800;
+		Zeny -= 1800;
 		warp getarg(0),getarg(1),getarg(2);
 		end;
 	}
diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt
index 49e48c293..895191961 100644
--- a/npc/custom/battleground/bg_common.txt
+++ b/npc/custom/battleground/bg_common.txt
@@ -5,7 +5,7 @@
 // BattleGround Warper - Entrance
 // *********************************************************************
 
--	script	Maroll Battle Recruiter::BatRecruit	728,{
+-	script	Maroll Battle Recruiter::BatRecruit	4_F_JOB_KNIGHT,{
 	mes "[Maroll Battle Recruiter]";
 	mes "Good day, adventurer.";
 	mes "I'm a knight from a far country called Maroll Kingdom.";
@@ -26,17 +26,17 @@
 	end;
 }
 
-payon,189,104,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit1	728
-prontera,123,83,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit2	728
-rachel,149,138,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit3	728
-moc_ruins,75,162,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit4	728
-aldebaran,146,109,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit5	728
-lighthalzen,153,86,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit6	728
+payon,189,104,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit1	4_F_JOB_KNIGHT
+prontera,123,83,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit2	4_F_JOB_KNIGHT
+rachel,149,138,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit3	4_F_JOB_KNIGHT
+moc_ruins,75,162,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit4	4_F_JOB_KNIGHT
+aldebaran,146,109,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit5	4_F_JOB_KNIGHT
+lighthalzen,153,86,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit6	4_F_JOB_KNIGHT
 
 // BattleGround Warper - Exit
 // *********************************************************************
 
-bat_room,148,150,4	script	Teleporter#bat	124,{
+bat_room,148,150,4	script	Teleporter#bat	4_F_TELEPORTER,{
 	mes "[Teleporter]";
 	mes "Do you wish to leave the battlefield? Use my service to return to town.";
 	next;
@@ -59,14 +59,14 @@ bat_room,148,150,4	script	Teleporter#bat	124,{
 
 // Kafra
 // *********************************************************************
-bat_room,148,147,4	script	Kafra Staff::kaf_bat	861,{
+bat_room,148,147,4	script	Kafra Staff::kaf_bat	4_F_KAFRA9,{
 	cutin "kafra_09",2;
 	callfunc "F_Kafra",0,2,1,150,0;
 }
 
 // General Guillaume
 // *********************************************************************
-bat_room,160,159,3	script	General Guillaume	420,{
+bat_room,160,159,3	script	General Guillaume	4_M_KY_KIYOM,{
 	cutin "bat_kiyom2",2;
 	mes "[General Guillaume]";
 	mes "Hot-blooded adventurer, we need your ability to win this battle.";
@@ -105,7 +105,7 @@ bat_room,160,159,3	script	General Guillaume	420,{
 
 // General Croix
 // *********************************************************************
-bat_room,160,140,3	script	Prince Croix	416,{
+bat_room,160,140,3	script	Prince Croix	4_M_CRU_CRUA,{
 	cutin "bat_crua1",2;
 	mes "[Prince Croix]";
 	mes "Wise adventurer, why don't you lend us your power for victory?";
@@ -136,14 +136,14 @@ bat_room,160,140,3	script	Prince Croix	416,{
 // Time calculation Function
 // *********************************************************************
 function	script	Time2Str	{
-	set .@Time_Left, getarg(0) - gettimetick(2);
+	set .@time_left, getarg(0) - gettimetick(2);
 	
-	set .@Days, .@Time_Left / 86400;
-	set .@Time_Left, .@Time_Left - (.@Days * 86400);
-	set .@Hours, .@Time_Left / 3600;
-	set .@Time_Left, .@Time_Left - (.@Hours * 3600);
-	set .@Minutes, .@Time_Left / 60;
-	set .@Time_Left, .@Time_Left - (.@Minutes * 60);
+	set .@Days, .@time_left / 86400;
+	set .@time_left, .@time_left - (.@Days * 86400);
+	set .@Hours, .@time_left / 3600;
+	set .@time_left, .@time_left - (.@Hours * 3600);
+	set .@Minutes, .@time_left / 60;
+	set .@time_left, .@time_left - (.@Minutes * 60);
 	
 	set .@Time$, "";
 	if( .@Days > 1 )
@@ -161,17 +161,17 @@ function	script	Time2Str	{
 	else if( .@Minutes > 0 )
 		set .@Time$, .@Time$ + .@Minutes + " minute, ";
 
-	if( .@Time_Left > 1 || .@Time_Left == 0 )
-		set .@Time$, .@Time$ + .@Time_Left + " seconds.";
-	else if( .@Time_Left == 1 )
-		set .@Time$, .@Time$ + .@Time_Left + " second.";
+	if( .@time_left > 1 || .@time_left == 0 )
+		set .@Time$, .@Time$ + .@time_left + " seconds.";
+	else if( .@time_left == 1 )
+		set .@Time$, .@Time$ + .@time_left + " second.";
 	
 	return .@Time$;
 }
 
 // Guillaume Knight - Tierra Valley
 // *********************************************************************
-bat_room,159,178,5	script	Guillaume Knight#1	417,{
+bat_room,159,178,5	script	Guillaume Knight#1	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -190,7 +190,7 @@ bat_room,159,178,5	script	Guillaume Knight#1	417,{
 
 // Tierra Officer - Guillaume
 // *********************************************************************
-bat_room,156,178,5	script	Tierra Valley Officer#1	418,{
+bat_room,156,178,5	script	Tierra Valley Officer#1	4_M_KY_KNT,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -241,7 +241,7 @@ bat_room,156,178,5	script	Tierra Valley Officer#1	418,{
 
 // Croix Knight - Tierra Valley
 // *********************************************************************
-bat_room,159,121,1	script	Croix Knight#1	413,{
+bat_room,159,121,1	script	Croix Knight#1	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -260,7 +260,7 @@ bat_room,159,121,1	script	Croix Knight#1	413,{
 
 // Tierra Officer - Croix
 // *********************************************************************
-bat_room,156,121,1	script	Tierra Valley Officer#2	414,{
+bat_room,156,121,1	script	Tierra Valley Officer#2	4_M_CRU_KNT,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -311,7 +311,7 @@ bat_room,156,121,1	script	Tierra Valley Officer#2	414,{
 
 // Guillaume Knight - Tierra
 // *********************************************************************
-bat_room,167,178,5	script	Guillaume Knight#2	417,{
+bat_room,167,178,5	script	Guillaume Knight#2	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -330,7 +330,7 @@ bat_room,167,178,5	script	Guillaume Knight#2	417,{
 
 // Tierra Officer - Guillaume
 // *********************************************************************
-bat_room,164,178,5	script	Tierra Valley Officer#3	418,{
+bat_room,164,178,5	script	Tierra Valley Officer#3	4_M_KY_KNT,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -381,7 +381,7 @@ bat_room,164,178,5	script	Tierra Valley Officer#3	418,{
 
 // Croix Knight - Tierra
 // *********************************************************************
-bat_room,167,121,1	script	Croix Knight#2	413,{
+bat_room,167,121,1	script	Croix Knight#2	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -400,7 +400,7 @@ bat_room,167,121,1	script	Croix Knight#2	413,{
 
 // Tierra Officer - Croix
 // *********************************************************************
-bat_room,164,121,1	script	Tierra Valley Officer#4	414,{
+bat_room,164,121,1	script	Tierra Valley Officer#4	4_M_CRU_KNT,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -451,7 +451,7 @@ bat_room,164,121,1	script	Tierra Valley Officer#4	414,{
 
 // Guillaune Knight - Flavius
 // *********************************************************************
-bat_room,175,178,5	script	Guillaume Knight#3	417,{
+bat_room,175,178,5	script	Guillaume Knight#3	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -471,7 +471,7 @@ bat_room,175,178,5	script	Guillaume Knight#3	417,{
 
 // Flavius Officer - Guillaume
 // *********************************************************************
-bat_room,172,178,5	script	Flavius Officer#1	418,{
+bat_room,172,178,5	script	Flavius Officer#1	4_M_KY_KNT,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -522,7 +522,7 @@ bat_room,172,178,5	script	Flavius Officer#1	418,{
 
 // Croix Knight - Flavius
 // *********************************************************************
-bat_room,175,121,1	script	Croix Knight#3	413,{
+bat_room,175,121,1	script	Croix Knight#3	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -542,7 +542,7 @@ bat_room,175,121,1	script	Croix Knight#3	413,{
 
 // Flavius Officerer - Croix
 // *********************************************************************
-bat_room,172,121,1	script	Flavius Officer#2	414,{
+bat_room,172,121,1	script	Flavius Officer#2	4_M_CRU_KNT,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -593,7 +593,7 @@ bat_room,172,121,1	script	Flavius Officer#2	414,{
 
 // Guillaune Knight - Flavius
 // *********************************************************************
-bat_room,151,178,5	script	Guillaume Knight#4	417,{
+bat_room,151,178,5	script	Guillaume Knight#4	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -613,7 +613,7 @@ bat_room,151,178,5	script	Guillaume Knight#4	417,{
 
 // Flavius Officerer - Guillaume
 // *********************************************************************
-bat_room,148,178,5	script	Flavius Officer#3	418,{
+bat_room,148,178,5	script	Flavius Officer#3	4_M_KY_KNT,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -664,7 +664,7 @@ bat_room,148,178,5	script	Flavius Officer#3	418,{
 
 // Croix Knight - Flavius
 // *********************************************************************
-bat_room,151,121,1	script	Croix Knight#4	413,{
+bat_room,151,121,1	script	Croix Knight#4	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -684,7 +684,7 @@ bat_room,151,121,1	script	Croix Knight#4	413,{
 
 // Flavius Officerer - Croix
 // *********************************************************************
-bat_room,148,121,1	script	Flavius Officer#4	414,{
+bat_room,148,121,1	script	Flavius Officer#4	4_M_CRU_KNT,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -735,7 +735,7 @@ bat_room,148,121,1	script	Flavius Officer#4	414,{
 
 // Guillaume Knight - KvM
 // *********************************************************************
-bat_room,143,178,5	script	Guillaume Knight#5	417,{
+bat_room,143,178,5	script	Guillaume Knight#5	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -752,7 +752,7 @@ bat_room,143,178,5	script	Guillaume Knight#5	417,{
 
 // KvM Officerer - Guillaume
 // *********************************************************************
-bat_room,140,178,5	script	KVM [80-99] Officer#1	418,{
+bat_room,140,178,5	script	KVM [80-99] Officer#1	4_M_KY_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -803,7 +803,7 @@ bat_room,140,178,5	script	KVM [80-99] Officer#1	418,{
 
 // Croix Knight - KvM
 // *********************************************************************
-bat_room,143,121,1	script	Croix Knight#5	413,{
+bat_room,143,121,1	script	Croix Knight#5	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -820,7 +820,7 @@ bat_room,143,121,1	script	Croix Knight#5	413,{
 
 // KvM Officer - Croix
 // *********************************************************************
-bat_room,140,121,1	script	KVM [80-99] Officer#2	414,{
+bat_room,140,121,1	script	KVM [80-99] Officer#2	4_M_CRU_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -871,7 +871,7 @@ bat_room,140,121,1	script	KVM [80-99] Officer#2	414,{
 
 // Guillaume Knight - KvM
 // *********************************************************************
-bat_room,135,178,5	script	Guillaume Knight#6	417,{
+bat_room,135,178,5	script	Guillaume Knight#6	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -888,7 +888,7 @@ bat_room,135,178,5	script	Guillaume Knight#6	417,{
 
 // KvM Officerer - Guillaume
 // *********************************************************************
-bat_room,132,178,5	script	KVM [60-79] Officer#1	418,{
+bat_room,132,178,5	script	KVM [60-79] Officer#1	4_M_KY_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -939,7 +939,7 @@ bat_room,132,178,5	script	KVM [60-79] Officer#1	418,{
 
 // Croix Knight - KvM
 // *********************************************************************
-bat_room,135,121,1	script	Croix Knight#6	413,{
+bat_room,135,121,1	script	Croix Knight#6	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -956,7 +956,7 @@ bat_room,135,121,1	script	Croix Knight#6	413,{
 
 // KvM Officer - Croix
 // *********************************************************************
-bat_room,132,121,1	script	KVM [60-79] Officer#2	414,{
+bat_room,132,121,1	script	KVM [60-79] Officer#2	4_M_CRU_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -1007,7 +1007,7 @@ bat_room,132,121,1	script	KVM [60-79] Officer#2	414,{
 
 // Guillaume Knight - KvM
 // *********************************************************************
-bat_room,127,178,5	script	Guillaume Knight#7	417,{
+bat_room,127,178,5	script	Guillaume Knight#7	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -1024,7 +1024,7 @@ bat_room,127,178,5	script	Guillaume Knight#7	417,{
 
 // KvM Officerer - Guillaume
 // *********************************************************************
-bat_room,124,178,5	script	KVM [1-59] Officer#1	418,{
+bat_room,124,178,5	script	KVM [1-59] Officer#1	4_M_KY_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -1075,7 +1075,7 @@ bat_room,124,178,5	script	KVM [1-59] Officer#1	418,{
 
 // Croix Knight - KvM
 // *********************************************************************
-bat_room,127,121,1	script	Croix Knight#7	413,{
+bat_room,127,121,1	script	Croix Knight#7	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -1092,7 +1092,7 @@ bat_room,127,121,1	script	Croix Knight#7	413,{
 
 // KvM Officer - Croix
 // *********************************************************************
-bat_room,124,121,1	script	KVM [1-59] Officer#2	414,{
+bat_room,124,121,1	script	KVM [1-59] Officer#2	4_M_CRU_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -1144,16 +1144,16 @@ bat_room,124,121,1	script	KVM [1-59] Officer#2	414,{
 // Guard Dummy
 // *********************************************************************
 
-bat_room,161,141,3	script	Prince Croix's Aid::bat_aid	415,{ end; }
-bat_room,161,139,3	duplicate(bat_aid)	Prince Croix's Aid::bat_aid2	415
-bat_room,161,160,3	duplicate(bat_aid)	General Guillaume's Aid::bat_aid3	419
-bat_room,161,158,3	duplicate(bat_aid)	General Guillaume's Aid::bat_aid4	419
+bat_room,161,141,3	script	Prince Croix's Aid::bat_aid	4_M_CRU_HEAD,{ end; }
+bat_room,161,139,3	duplicate(bat_aid)	Prince Croix's Aid::bat_aid2	4_M_CRU_HEAD
+bat_room,161,160,3	duplicate(bat_aid)	General Guillaume's Aid::bat_aid3	4_M_KY_HEAD
+bat_room,161,158,3	duplicate(bat_aid)	General Guillaume's Aid::bat_aid4	4_M_KY_HEAD
 
 // Flags
 // *********************************************************************
 
--	script	Guillaume camp#bat	973,{ end; }
--	script	Croix camp#bat	974,{ end; }
+-	script	Guillaume camp#bat	1_FLAG_LION,{ end; }
+-	script	Croix camp#bat	1_FLAG_EAGLE,{ end; }
 
 // Exit from Registration
 // *********************************************************************
@@ -1167,58 +1167,58 @@ OnTouch:
 }
 
 // Flavius bat_b02
-bat_room,57,81,0	duplicate(warp2bat_room)	bat1	45,1,1
-bat_room,57,90,0	duplicate(warp2bat_room)	bat2	45,1,1
+bat_room,57,81,0	duplicate(warp2bat_room)	bat1	WARPNPC,1,1
+bat_room,57,90,0	duplicate(warp2bat_room)	bat2	WARPNPC,1,1
 // Free BG
-bat_room,57,220,0	duplicate(warp2bat_room)	bat3	45,1,1
-bat_room,57,211,0	duplicate(warp2bat_room)	bat4	45,1,1
+bat_room,57,220,0	duplicate(warp2bat_room)	bat3	WARPNPC,1,1
+bat_room,57,211,0	duplicate(warp2bat_room)	bat4	WARPNPC,1,1
 // Tierra Valley bat_a02
-bat_room,85,81,0	duplicate(warp2bat_room)	bat5	45,1,1
-bat_room,85,90,0	duplicate(warp2bat_room)	bat6	45,1,1
+bat_room,85,81,0	duplicate(warp2bat_room)	bat5	WARPNPC,1,1
+bat_room,85,90,0	duplicate(warp2bat_room)	bat6	WARPNPC,1,1
 // Tierra Valley bat_a01
-bat_room,85,220,0	duplicate(warp2bat_room)	bat7	45,1,1
-bat_room,85,211,0	duplicate(warp2bat_room)	bat8	45,1,1
+bat_room,85,220,0	duplicate(warp2bat_room)	bat7	WARPNPC,1,1
+bat_room,85,211,0	duplicate(warp2bat_room)	bat8	WARPNPC,1,1
 // Free BG
-bat_room,113,81,0	duplicate(warp2bat_room)	bat9	45,1,1
-bat_room,113,90,0	duplicate(warp2bat_room)	bat10	45,1,1
+bat_room,113,81,0	duplicate(warp2bat_room)	bat9	WARPNPC,1,1
+bat_room,113,90,0	duplicate(warp2bat_room)	bat10	WARPNPC,1,1
 // Free BG
-bat_room,113,220,0	duplicate(warp2bat_room)	bat11	45,1,1
-bat_room,113,211,0	duplicate(warp2bat_room)	bat12	45,1,1
+bat_room,113,220,0	duplicate(warp2bat_room)	bat11	WARPNPC,1,1
+bat_room,113,211,0	duplicate(warp2bat_room)	bat12	WARPNPC,1,1
 // Free BG
-bat_room,141,81,0	duplicate(warp2bat_room)	bat13	45,1,1
-bat_room,141,90,0	duplicate(warp2bat_room)	bat14	45,1,1
+bat_room,141,81,0	duplicate(warp2bat_room)	bat13	WARPNPC,1,1
+bat_room,141,90,0	duplicate(warp2bat_room)	bat14	WARPNPC,1,1
 // Free BG
-bat_room,141,220,0	duplicate(warp2bat_room)	bat15	45,1,1
-bat_room,141,211,0	duplicate(warp2bat_room)	bat16	45,1,1
+bat_room,141,220,0	duplicate(warp2bat_room)	bat15	WARPNPC,1,1
+bat_room,141,211,0	duplicate(warp2bat_room)	bat16	WARPNPC,1,1
 // Free BG
-bat_room,169,81,0	duplicate(warp2bat_room)	bat17	45,1,1
-bat_room,169,90,0	duplicate(warp2bat_room)	bat18	45,1,1
+bat_room,169,81,0	duplicate(warp2bat_room)	bat17	WARPNPC,1,1
+bat_room,169,90,0	duplicate(warp2bat_room)	bat18	WARPNPC,1,1
 // Free BG
-bat_room,169,220,0	duplicate(warp2bat_room)	bat19	45,1,1
-bat_room,169,211,0	duplicate(warp2bat_room)	bat20	45,1,1
+bat_room,169,220,0	duplicate(warp2bat_room)	bat19	WARPNPC,1,1
+bat_room,169,211,0	duplicate(warp2bat_room)	bat20	WARPNPC,1,1
 // Free BG
-bat_room,197,81,0	duplicate(warp2bat_room)	bat21	45,1,1
-bat_room,197,90,0	duplicate(warp2bat_room)	bat22	45,1,1
+bat_room,197,81,0	duplicate(warp2bat_room)	bat21	WARPNPC,1,1
+bat_room,197,90,0	duplicate(warp2bat_room)	bat22	WARPNPC,1,1
 // KvM bat_c03
-bat_room,197,220,0	duplicate(warp2bat_room)	bat23	45,1,1
-bat_room,197,211,0	duplicate(warp2bat_room)	bat24	45,1,1
+bat_room,197,220,0	duplicate(warp2bat_room)	bat23	WARPNPC,1,1
+bat_room,197,211,0	duplicate(warp2bat_room)	bat24	WARPNPC,1,1
 // Free BG
-bat_room,225,81,0	duplicate(warp2bat_room)	bat25	45,1,1
-bat_room,225,90,0	duplicate(warp2bat_room)	bat26	45,1,1
+bat_room,225,81,0	duplicate(warp2bat_room)	bat25	WARPNPC,1,1
+bat_room,225,90,0	duplicate(warp2bat_room)	bat26	WARPNPC,1,1
 // KvM bat_c02
-bat_room,225,220,0	duplicate(warp2bat_room)	bat27	45,1,1
-bat_room,225,211,0	duplicate(warp2bat_room)	bat28	45,1,1
+bat_room,225,220,0	duplicate(warp2bat_room)	bat27	WARPNPC,1,1
+bat_room,225,211,0	duplicate(warp2bat_room)	bat28	WARPNPC,1,1
 // Flavius bat_b01
-bat_room,253,81,0	duplicate(warp2bat_room)	bat29	45,1,1
-bat_room,253,90,0	duplicate(warp2bat_room)	bat30	45,1,1
+bat_room,253,81,0	duplicate(warp2bat_room)	bat29	WARPNPC,1,1
+bat_room,253,90,0	duplicate(warp2bat_room)	bat30	WARPNPC,1,1
 // KvM bat_c01
-bat_room,253,220,0	duplicate(warp2bat_room)	bat31	45,1,1
-bat_room,253,211,0	duplicate(warp2bat_room)	bat32	45,1,1
+bat_room,253,220,0	duplicate(warp2bat_room)	bat31	WARPNPC,1,1
+bat_room,253,211,0	duplicate(warp2bat_room)	bat32	WARPNPC,1,1
 
 // Badges Repairman
 // *********************************************************************
 
-bat_room,138,144,5	script	Repairman#bg	99,{
+bat_room,138,144,5	script	Repairman#bg	4W_M_03,{
 	callfunc "repairmain","Repairman";
 	end;
 }
@@ -1226,7 +1226,7 @@ bat_room,138,144,5	script	Repairman#bg	99,{
 // Badges Exchange
 // *********************************************************************
 
-bat_room,160,150,3	script	Erundek	109,{
+bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 	mes "[Erundek]";
 	mes "Welcome, mighty warrior.";
 	mes "What can I do for you today ?";
@@ -1237,7 +1237,7 @@ bat_room,160,150,3	script	Erundek	109,{
 			mes "[Erundek]";
 			mes "We have many items, so please take a look and purchase deliberately.";
 			close2;
-			Readbook 11010,1;
+			readbook 11010,1;
 			end;
 		case 5:
 			mes "[Erundek]";
@@ -1292,12 +1292,12 @@ bat_room,160,150,3	script	Erundek	109,{
 	mes "If you are not sure, check the catalog.";
 	next;
 
-	set .@Menu$, "";
-	set .@Count, getarraysize(.@Item_DB);
-	for( set .@i, 0; .@i < .@Count; set .@i, .@i + 1 )
-		set .@Menu$, .@Menu$ + getitemname(.@Item_DB[.@i]) + ":";
+	set .@menu$, "";
+	set .@count, getarraysize(.@Item_DB);
+	for( set .@i, 0; .@i < .@count; set .@i, .@i + 1 )
+		set .@menu$, .@menu$ + getitemname(.@Item_DB[.@i]) + ":";
 
-	set .@Item_ID, .@Item_DB[select(.@Menu$) - 1];
+	set .@Item_ID, .@Item_DB[select(.@menu$) - 1];
 
 	mes "[Erundek]";
 	mes "Would you like to exchange ^FF0000" + .@Value + " " + getitemname(.@Badge) + "^000000 for a ^0000FF" + getitemname(.@Item_ID) + "^000000?";
diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index 4bb6fa7be..fd0cf9112 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,86,227,4	script	Registration::Fl1R_Guillaume	418,{
+bat_room,86,227,4	script	Registration::Fl1R_Guillaume	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Flavius_BG1::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,85,204,0	script	Registration::Fl1R_Croix	414,{
+bat_room,85,204,0	script	Registration::Fl1R_Croix	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Flavius_BG1::OnCroixJoin",1;
@@ -268,7 +268,7 @@ OnReset:
 // Battleground rewards
 // *********************************************************************
 
-bat_b01,390,13,5	script	Guillaume Vintenar#fl1	419,{
+bat_b01,390,13,5	script	Guillaume Vintenar#fl1	4_M_KY_HEAD,{
 	if( $@FlaviusBG1_Victory )
 	{
 		if( $@FlaviusBG1_Victory == Bat_Team )
@@ -278,20 +278,18 @@ bat_b01,390,13,5	script	Guillaume Vintenar#fl1	419,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
-		}
-		else
-		{ // 
+			set .@reward, 9;
+		} else {
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
 			mes "Just take this defeat a lesson, and later you would definitely learn.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -299,7 +297,7 @@ bat_b01,390,13,5	script	Guillaume Vintenar#fl1	419,{
 	end;
 }
 
-bat_b01,10,293,5	script	Croix Vintenar#fl1	415,{
+bat_b01,10,293,5	script	Croix Vintenar#fl1	4_M_CRU_HEAD,{
 	if( $@FlaviusBG1_Victory )
 	{
 		if( $@FlaviusBG1_Victory == Bat_Team )
@@ -309,20 +307,18 @@ bat_b01,10,293,5	script	Croix Vintenar#fl1	415,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
-		}
-		else
-		{ // 
+			set .@reward, 9;
+		} else {
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
 			mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -333,7 +329,7 @@ bat_b01,10,293,5	script	Croix Vintenar#fl1	415,{
 // Battleground Therapist
 // *********************************************************************
 
-bat_b01,390,13,5	script	Therapist in battle#fl12	95,{
+bat_b01,390,13,5	script	Therapist in battle#fl12	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -341,7 +337,7 @@ bat_b01,390,13,5	script	Therapist in battle#fl12	95,{
 	close;
 }
 
-bat_b01,10,293,5	script	Therapist in battle#fl11	95,{
+bat_b01,10,293,5	script	Therapist in battle#fl11	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -352,7 +348,7 @@ bat_b01,10,293,5	script	Therapist in battle#fl11	95,{
 // Battleground Respawn
 // *********************************************************************
 
-bat_b01,390,10,0	script	#gfl1_respawn	139,{
+bat_b01,390,10,0	script	#gfl1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -374,7 +370,7 @@ OnTimer25000:
 	end;
 }
 
-bat_b01,10,290,0	script	#cfl1_respawn	139,{
+bat_b01,10,290,0	script	#cfl1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -399,30 +395,30 @@ OnTimer25000:
 // Flags
 // *********************************************************************
 
-bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat1	973
-bat_b01,319,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat2	973
-bat_b01,304,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat3	973
-bat_b01,319,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat4	973
-bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat5	973
-bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat6	973
-bat_b01,335,142,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat7	973
-bat_b01,335,157,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat8	973
-bat_b01,390,16,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat9	973
-bat_b01,292,163,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat19	973
-bat_b01,292,136,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat20	973
-bat_b01,241,185,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat21	973
-bat_b01,247,179,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat22	973
-
-bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat1	974
-bat_b01,96,68,1	duplicate(Croix camp#bat)	Croix camp#bat2	974
-bat_b01,79,81,1	duplicate(Croix camp#bat)	Croix camp#bat3	974
-bat_b01,79,68,1	duplicate(Croix camp#bat)	Croix camp#bat4	974
-bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat5	974
-bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat6	974
-bat_b01,59,164,1	duplicate(Croix camp#bat)	Croix camp#bat7	974
-bat_b01,59,137,1	duplicate(Croix camp#bat)	Croix camp#bat8	974
-bat_b01,10,296,1	duplicate(Croix camp#bat)	Croix camp#bat9	974
-bat_b01,110,162,1	duplicate(Croix camp#bat)	Croix camp#bat18	974
-bat_b01,110,137,1	duplicate(Croix camp#bat)	Croix camp#bat19	974
-bat_b01,152,120,1	duplicate(Croix camp#bat)	Croix camp#bat20	974
-bat_b01,158,114,1	duplicate(Croix camp#bat)	Croix camp#bat21	974
+bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat1	1_FLAG_LION
+bat_b01,319,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat2	1_FLAG_LION
+bat_b01,304,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat3	1_FLAG_LION
+bat_b01,319,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat4	1_FLAG_LION
+bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat5	1_FLAG_LION
+bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat6	1_FLAG_LION
+bat_b01,335,142,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat7	1_FLAG_LION
+bat_b01,335,157,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat8	1_FLAG_LION
+bat_b01,390,16,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat9	1_FLAG_LION
+bat_b01,292,163,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat19	1_FLAG_LION
+bat_b01,292,136,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat20	1_FLAG_LION
+bat_b01,241,185,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat21	1_FLAG_LION
+bat_b01,247,179,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat22	1_FLAG_LION
+
+bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat1	1_FLAG_EAGLE
+bat_b01,96,68,1	duplicate(Croix camp#bat)	Croix camp#bat2	1_FLAG_EAGLE
+bat_b01,79,81,1	duplicate(Croix camp#bat)	Croix camp#bat3	1_FLAG_EAGLE
+bat_b01,79,68,1	duplicate(Croix camp#bat)	Croix camp#bat4	1_FLAG_EAGLE
+bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat5	1_FLAG_EAGLE
+bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat6	1_FLAG_EAGLE
+bat_b01,59,164,1	duplicate(Croix camp#bat)	Croix camp#bat7	1_FLAG_EAGLE
+bat_b01,59,137,1	duplicate(Croix camp#bat)	Croix camp#bat8	1_FLAG_EAGLE
+bat_b01,10,296,1	duplicate(Croix camp#bat)	Croix camp#bat9	1_FLAG_EAGLE
+bat_b01,110,162,1	duplicate(Croix camp#bat)	Croix camp#bat18	1_FLAG_EAGLE
+bat_b01,110,137,1	duplicate(Croix camp#bat)	Croix camp#bat19	1_FLAG_EAGLE
+bat_b01,152,120,1	duplicate(Croix camp#bat)	Croix camp#bat20	1_FLAG_EAGLE
+bat_b01,158,114,1	duplicate(Croix camp#bat)	Croix camp#bat21	1_FLAG_EAGLE
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index 4dc180d14..f7b7756f4 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,142,227,4	script	Registration::Fl2R_Guillaume	418,{
+bat_room,142,227,4	script	Registration::Fl2R_Guillaume	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Flavius_BG2::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,142,204,0	script	Registration::Fl2R_Croix	414,{
+bat_room,142,204,0	script	Registration::Fl2R_Croix	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Flavius_BG2::OnCroixJoin",1;
@@ -268,7 +268,7 @@ OnReset:
 // Battleground rewards
 // *********************************************************************
 
-bat_b02,390,13,5	script	Guillaume Vintenar#fl2	419,{
+bat_b02,390,13,5	script	Guillaume Vintenar#fl2	4_M_KY_HEAD,{
 	if( $@FlaviusBG2_Victory )
 	{
 		if( $@FlaviusBG2_Victory == Bat_Team )
@@ -278,20 +278,18 @@ bat_b02,390,13,5	script	Guillaume Vintenar#fl2	419,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
-		}
-		else
-		{ // 
+			set .@reward, 9;
+		} else {
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
 			mes "Just take this defeat a lesson, and later you would definitely learn.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -299,7 +297,7 @@ bat_b02,390,13,5	script	Guillaume Vintenar#fl2	419,{
 	end;
 }
 
-bat_b02,10,293,5	script	Croix Vintenar#fl2	415,{
+bat_b02,10,293,5	script	Croix Vintenar#fl2	4_M_CRU_HEAD,{
 	if( $@FlaviusBG2_Victory )
 	{
 		if( $@FlaviusBG2_Victory == Bat_Team )
@@ -309,20 +307,18 @@ bat_b02,10,293,5	script	Croix Vintenar#fl2	415,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
-		}
-		else
-		{ // 
+			set .@reward, 9;
+		} else {
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
 			mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -333,7 +329,7 @@ bat_b02,10,293,5	script	Croix Vintenar#fl2	415,{
 // Battleground Therapist
 // *********************************************************************
 
-bat_b02,390,13,5	script	Therapist in battle#fl22	95,{
+bat_b02,390,13,5	script	Therapist in battle#fl22	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -341,7 +337,7 @@ bat_b02,390,13,5	script	Therapist in battle#fl22	95,{
 	close;
 }
 
-bat_b02,10,293,5	script	Therapist in battle#fl21	95,{
+bat_b02,10,293,5	script	Therapist in battle#fl21	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -352,7 +348,7 @@ bat_b02,10,293,5	script	Therapist in battle#fl21	95,{
 // Battleground Respawn
 // *********************************************************************
 
-bat_b02,390,10,0	script	#gfl2_respawn	139,{
+bat_b02,390,10,0	script	#gfl2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -374,7 +370,7 @@ OnTimer25000:
 	end;
 }
 
-bat_b02,10,290,0	script	#cfl2_respawn	139,{
+bat_b02,10,290,0	script	#cfl2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -399,30 +395,30 @@ OnTimer25000:
 // Flags
 // *********************************************************************
 
-bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat32	973
-bat_b02,319,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat33	973
-bat_b02,304,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat34	973
-bat_b02,319,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat35	973
-bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat36	973
-bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat37	973
-bat_b02,335,142,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat38	973
-bat_b02,335,157,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat39	973
-bat_b02,390,16,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat40	973
-bat_b02,292,163,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat41	973
-bat_b02,292,136,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat42	973
-bat_b02,241,185,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat43	973
-bat_b02,247,179,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat44	973
-
-bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat30	974
-bat_b02,96,68,1	duplicate(Croix camp#bat)	Croix camp#bat31	974
-bat_b02,79,81,1	duplicate(Croix camp#bat)	Croix camp#bat32	974
-bat_b02,79,68,1	duplicate(Croix camp#bat)	Croix camp#bat33	974
-bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat34	974
-bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat35	974
-bat_b02,59,164,1	duplicate(Croix camp#bat)	Croix camp#bat36	974
-bat_b02,59,137,1	duplicate(Croix camp#bat)	Croix camp#bat37	974
-bat_b02,10,296,1	duplicate(Croix camp#bat)	Croix camp#bat38	974
-bat_b02,110,162,1	duplicate(Croix camp#bat)	Croix camp#bat39	974
-bat_b02,110,137,1	duplicate(Croix camp#bat)	Croix camp#bat40	974
-bat_b02,152,120,1	duplicate(Croix camp#bat)	Croix camp#bat41	974
-bat_b02,158,114,1	duplicate(Croix camp#bat)	Croix camp#bat42	974
+bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat32	1_FLAG_LION
+bat_b02,319,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat33	1_FLAG_LION
+bat_b02,304,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat34	1_FLAG_LION
+bat_b02,319,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat35	1_FLAG_LION
+bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat36	1_FLAG_LION
+bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat37	1_FLAG_LION
+bat_b02,335,142,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat38	1_FLAG_LION
+bat_b02,335,157,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat39	1_FLAG_LION
+bat_b02,390,16,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat40	1_FLAG_LION
+bat_b02,292,163,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat41	1_FLAG_LION
+bat_b02,292,136,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat42	1_FLAG_LION
+bat_b02,241,185,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat43	1_FLAG_LION
+bat_b02,247,179,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat44	1_FLAG_LION
+
+bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat30	1_FLAG_EAGLE
+bat_b02,96,68,1	duplicate(Croix camp#bat)	Croix camp#bat31	1_FLAG_EAGLE
+bat_b02,79,81,1	duplicate(Croix camp#bat)	Croix camp#bat32	1_FLAG_EAGLE
+bat_b02,79,68,1	duplicate(Croix camp#bat)	Croix camp#bat33	1_FLAG_EAGLE
+bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat34	1_FLAG_EAGLE
+bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat35	1_FLAG_EAGLE
+bat_b02,59,164,1	duplicate(Croix camp#bat)	Croix camp#bat36	1_FLAG_EAGLE
+bat_b02,59,137,1	duplicate(Croix camp#bat)	Croix camp#bat37	1_FLAG_EAGLE
+bat_b02,10,296,1	duplicate(Croix camp#bat)	Croix camp#bat38	1_FLAG_EAGLE
+bat_b02,110,162,1	duplicate(Croix camp#bat)	Croix camp#bat39	1_FLAG_EAGLE
+bat_b02,110,137,1	duplicate(Croix camp#bat)	Croix camp#bat40	1_FLAG_EAGLE
+bat_b02,152,120,1	duplicate(Croix camp#bat)	Croix camp#bat41	1_FLAG_EAGLE
+bat_b02,158,114,1	duplicate(Croix camp#bat)	Croix camp#bat42	1_FLAG_EAGLE
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index 36c758f37..aa12759b9 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,253,227,4	script	Registration::KvM01R_Guillaume	418,{ // KvM Guillaume
+bat_room,253,227,4	script	Registration::KvM01R_Guillaume	4_M_KY_KNT,{ // KvM Guillaume
 	end;
 
 OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,253,204,0	script	Registration::KvM01R_Croix	414,{ // KvM Croix
+bat_room,253,204,0	script	Registration::KvM01R_Croix	4_M_CRU_KNT,{ // KvM Croix
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
 // Light Effects
 // *********************************************************************
 
-bat_c01,54,123,0	script	#bat_c01a	111,{
+bat_c01,54,123,0	script	#bat_c01a	HIDDEN_NPC,{
 	end;
 
 OnKvM01LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM01LightB: misceffect 55; end;
 OnKvM01LightC: misceffect 56; end;
 }
 
-bat_c01,56,125,0	duplicate(#bat_c01a)	#bat_c01b	111
-bat_c01,58,127,0	duplicate(#bat_c01a)	#bat_c01c	111
-bat_c01,141,56,0	duplicate(#bat_c01a)	#bat_c01d	111
-bat_c01,143,58,0	duplicate(#bat_c01a)	#bat_c01e	111
-bat_c01,145,60,0	duplicate(#bat_c01a)	#bat_c01f	111
+bat_c01,56,125,0	duplicate(#bat_c01a)	#bat_c01b	HIDDEN_NPC
+bat_c01,58,127,0	duplicate(#bat_c01a)	#bat_c01c	HIDDEN_NPC
+bat_c01,141,56,0	duplicate(#bat_c01a)	#bat_c01d	HIDDEN_NPC
+bat_c01,143,58,0	duplicate(#bat_c01a)	#bat_c01e	HIDDEN_NPC
+bat_c01,145,60,0	duplicate(#bat_c01a)	#bat_c01f	HIDDEN_NPC
 
 // Battleground Engine
 // *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
 // Battleground Therapist
 // *********************************************************************
 
-bat_c01,51,130,5	script	Therapist in battle::TherapistKvM01a	95,{
+bat_c01,51,130,5	script	Therapist in battle::TherapistKvM01a	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c01,51,130,5	script	Therapist in battle::TherapistKvM01a	95,{
 	close;
 }
 
-bat_c01,148,53,1	script	Therapist in battle::TherapistKvM01b	95,{
+bat_c01,148,53,1	script	Therapist in battle::TherapistKvM01b	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c01,148,53,1	script	Therapist in battle::TherapistKvM01b	95,{
 // Battleground rewards
 // *********************************************************************
 
-bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	419,{
+bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == 3 )
@@ -313,16 +313,14 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	419,{
 		}
 		else if( $@KvM01BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 5;
+			set .@reward, 5;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 1;
+		} else {
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -331,7 +329,7 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	419,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -339,7 +337,7 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	419,{
 	end;
 }
 
-bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	415,{
+bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == 3 )
@@ -351,16 +349,14 @@ bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	415,{
 		}
 		else if( $@KvM01BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 5;
+			set .@reward, 5;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 1;
+		} else {
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -369,7 +365,7 @@ bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	415,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index 5bfbba328..f2f5f7ca1 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,225,227,4	script	Registration::KvM02R_Guillaume	418,{ // KvM Guillaume
+bat_room,225,227,4	script	Registration::KvM02R_Guillaume	4_M_KY_KNT,{ // KvM Guillaume
 	end;
 
 OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,225,204,0	script	Registration::KvM02R_Croix	414,{ // KvM Croix
+bat_room,225,204,0	script	Registration::KvM02R_Croix	4_M_CRU_KNT,{ // KvM Croix
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
 // Light Effects
 // *********************************************************************
 
-bat_c02,54,123,0	script	#bat_c02a	111,{
+bat_c02,54,123,0	script	#bat_c02a	HIDDEN_NPC,{
 	end;
 
 OnKvM02LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM02LightB: misceffect 55; end;
 OnKvM02LightC: misceffect 56; end;
 }
 
-bat_c02,56,125,0	duplicate(#bat_c02a)	#bat_c02b	111
-bat_c02,58,127,0	duplicate(#bat_c02a)	#bat_c02c	111
-bat_c02,141,56,0	duplicate(#bat_c02a)	#bat_c02d	111
-bat_c02,143,58,0	duplicate(#bat_c02a)	#bat_c02e	111
-bat_c02,145,60,0	duplicate(#bat_c02a)	#bat_c02f	111
+bat_c02,56,125,0	duplicate(#bat_c02a)	#bat_c02b	HIDDEN_NPC
+bat_c02,58,127,0	duplicate(#bat_c02a)	#bat_c02c	HIDDEN_NPC
+bat_c02,141,56,0	duplicate(#bat_c02a)	#bat_c02d	HIDDEN_NPC
+bat_c02,143,58,0	duplicate(#bat_c02a)	#bat_c02e	HIDDEN_NPC
+bat_c02,145,60,0	duplicate(#bat_c02a)	#bat_c02f	HIDDEN_NPC
 
 // Battleground Engine
 // *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
 // Battleground Therapist
 // *********************************************************************
 
-bat_c02,51,130,5	script	Therapist in battle::TherapistKvM02a	95,{
+bat_c02,51,130,5	script	Therapist in battle::TherapistKvM02a	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c02,51,130,5	script	Therapist in battle::TherapistKvM02a	95,{
 	close;
 }
 
-bat_c02,148,53,1	script	Therapist in battle::TherapistKvM02b	95,{
+bat_c02,148,53,1	script	Therapist in battle::TherapistKvM02b	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c02,148,53,1	script	Therapist in battle::TherapistKvM02b	95,{
 // Battleground rewards
 // *********************************************************************
 
-bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	419,{
+bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	4_M_KY_HEAD,{
 	if( $@KvM02BG_Victory )
 	{
 		if( $@KvM02BG_Victory == 3 )
@@ -313,16 +313,14 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	419,{
 		}
 		else if( $@KvM02BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 1;
+		} else {
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -331,7 +329,7 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	419,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -339,7 +337,7 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	419,{
 	end;
 }
 
-bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	415,{
+bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	4_M_CRU_HEAD,{
 	if( $@KvM02BG_Victory )
 	{
 		if( $@KvM02BG_Victory == 3 )
@@ -351,16 +349,14 @@ bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	415,{
 		}
 		else if( $@KvM02BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 1;
+		} else {
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -369,7 +365,7 @@ bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	415,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index 6efa99e4c..f38e81bd1 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,197,227,4	script	Registration::KvM03R_Guillaume	418,{ // KvM Guillaume
+bat_room,197,227,4	script	Registration::KvM03R_Guillaume	4_M_KY_KNT,{ // KvM Guillaume
 	end;
 
 OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,197,204,0	script	Registration::KvM03R_Croix	414,{ // KvM Croix
+bat_room,197,204,0	script	Registration::KvM03R_Croix	4_M_CRU_KNT,{ // KvM Croix
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
 // Light Effects
 // *********************************************************************
 
-bat_c03,54,123,0	script	#bat_c03a	111,{
+bat_c03,54,123,0	script	#bat_c03a	HIDDEN_NPC,{
 	end;
 
 OnKvM03LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM03LightB: misceffect 55; end;
 OnKvM03LightC: misceffect 56; end;
 }
 
-bat_c03,56,125,0	duplicate(#bat_c03a)	#bat_c03b	111
-bat_c03,58,127,0	duplicate(#bat_c03a)	#bat_c03c	111
-bat_c03,141,56,0	duplicate(#bat_c03a)	#bat_c03d	111
-bat_c03,143,58,0	duplicate(#bat_c03a)	#bat_c03e	111
-bat_c03,145,60,0	duplicate(#bat_c03a)	#bat_c03f	111
+bat_c03,56,125,0	duplicate(#bat_c03a)	#bat_c03b	HIDDEN_NPC
+bat_c03,58,127,0	duplicate(#bat_c03a)	#bat_c03c	HIDDEN_NPC
+bat_c03,141,56,0	duplicate(#bat_c03a)	#bat_c03d	HIDDEN_NPC
+bat_c03,143,58,0	duplicate(#bat_c03a)	#bat_c03e	HIDDEN_NPC
+bat_c03,145,60,0	duplicate(#bat_c03a)	#bat_c03f	HIDDEN_NPC
 
 // Battleground Engine
 // *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
 // Battleground Therapist
 // *********************************************************************
 
-bat_c03,51,130,5	script	Therapist in battle::TherapistKvM03a	95,{
+bat_c03,51,130,5	script	Therapist in battle::TherapistKvM03a	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c03,51,130,5	script	Therapist in battle::TherapistKvM03a	95,{
 	close;
 }
 
-bat_c03,148,53,1	script	Therapist in battle::TherapistKvM03b	95,{
+bat_c03,148,53,1	script	Therapist in battle::TherapistKvM03b	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c03,148,53,1	script	Therapist in battle::TherapistKvM03b	95,{
 // Battleground rewards
 // *********************************************************************
 
-bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	419,{
+bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	4_M_KY_HEAD,{
 	if( $@KvM03BG_Victory )
 	{
 		if( $@KvM03BG_Victory == 3 )
@@ -313,16 +313,14 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	419,{
 		}
 		else if( $@KvM03BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 0;
+		} else {
+			set .@reward, 0;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -331,7 +329,7 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	419,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -339,7 +337,7 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	419,{
 	end;
 }
 
-bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	415,{
+bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	4_M_CRU_HEAD,{
 	if( $@KvM03BG_Victory )
 	{
 		if( $@KvM03BG_Victory == 3 )
@@ -351,16 +349,14 @@ bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	415,{
 		}
 		else if( $@KvM03BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 0;
+		} else {
+			set .@reward, 0;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -369,7 +365,7 @@ bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	415,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index 4c65d0462..671c2d929 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,58,227,4	script	Registration::TV1R_Guillaume	418,{
+bat_room,58,227,4	script	Registration::TV1R_Guillaume	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Tierra_BG1::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,58,204,0	script	Registration::TV1R_Croix	414,{
+bat_room,58,204,0	script	Registration::TV1R_Croix	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Tierra_BG1::OnCroixJoin",1;
@@ -241,23 +241,23 @@ OnReset:
 // Other Flags
 // *********************************************************************
 
-bat_a01,148,85,1	duplicate(Croix camp#bat)	Croix camp#bat10	974
-bat_a01,155,85,1	duplicate(Croix camp#bat)	Croix camp#bat11	974
-bat_a01,357,75,1	duplicate(Croix camp#bat)	Croix camp#bat12	974
-bat_a01,348,74,1	duplicate(Croix camp#bat)	Croix camp#bat13	974
-bat_a01,199,49,1	duplicate(Croix camp#bat)	Croix camp#bat14	974
-bat_a01,168,16,1	duplicate(Croix camp#bat)	Croix camp#bat15	974
-bat_a01,138,12,1	duplicate(Croix camp#bat)	Croix camp#bat16	974
-bat_a01,108,35,1	duplicate(Croix camp#bat)	Croix camp#bat17	974
-bat_a01,164,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat10	973
-bat_a01,157,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat11	973
-bat_a01,359,327,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat12	973
-bat_a01,350,326,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat13	973
-bat_a01,209,344,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat14	973
-bat_a01,173,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat15	973
-bat_a01,150,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat16	973
-bat_a01,118,357,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat17	973
-bat_a01,119,336,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat18	973
+bat_a01,148,85,1	duplicate(Croix camp#bat)	Croix camp#bat10	1_FLAG_EAGLE
+bat_a01,155,85,1	duplicate(Croix camp#bat)	Croix camp#bat11	1_FLAG_EAGLE
+bat_a01,357,75,1	duplicate(Croix camp#bat)	Croix camp#bat12	1_FLAG_EAGLE
+bat_a01,348,74,1	duplicate(Croix camp#bat)	Croix camp#bat13	1_FLAG_EAGLE
+bat_a01,199,49,1	duplicate(Croix camp#bat)	Croix camp#bat14	1_FLAG_EAGLE
+bat_a01,168,16,1	duplicate(Croix camp#bat)	Croix camp#bat15	1_FLAG_EAGLE
+bat_a01,138,12,1	duplicate(Croix camp#bat)	Croix camp#bat16	1_FLAG_EAGLE
+bat_a01,108,35,1	duplicate(Croix camp#bat)	Croix camp#bat17	1_FLAG_EAGLE
+bat_a01,164,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat10	1_FLAG_LION
+bat_a01,157,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat11	1_FLAG_LION
+bat_a01,359,327,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat12	1_FLAG_LION
+bat_a01,350,326,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat13	1_FLAG_LION
+bat_a01,209,344,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat14	1_FLAG_LION
+bat_a01,173,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat15	1_FLAG_LION
+bat_a01,150,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat16	1_FLAG_LION
+bat_a01,118,357,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat17	1_FLAG_LION
+bat_a01,119,336,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat18	1_FLAG_LION
 
 // Barricades
 // *********************************************************************
@@ -317,21 +317,19 @@ OnWall:
 // Battleground rewards
 // *********************************************************************
 
-bat_a01,45,19,3	script	Croix Vintenar#tv1	415,{
+bat_a01,45,19,3	script	Croix Vintenar#tv1	4_M_CRU_HEAD,{
 	if( $@TierraBG1_Victory )
 	{
 		if( $@TierraBG1_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 1;
+		} else {
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -340,7 +338,7 @@ bat_a01,45,19,3	script	Croix Vintenar#tv1	415,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -348,21 +346,19 @@ bat_a01,45,19,3	script	Croix Vintenar#tv1	415,{
 	end;
 }
 
-bat_a01,53,377,3	script	Guillaume Vintenar#tv1	419,{
+bat_a01,53,377,3	script	Guillaume Vintenar#tv1	4_M_KY_HEAD,{
 	if( $@TierraBG1_Victory )
 	{
 		if( $@TierraBG1_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 1;
+		} else {
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -371,7 +367,7 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	419,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -382,14 +378,14 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	419,{
 // Battleground Therapist
 // *********************************************************************
 
-bat_a01,60,216,3	script	Ghost#tv13	950,{
+bat_a01,60,216,3	script	Ghost#tv13	4_GHOSTRING,{
 	mes "[Ghost in valley]";
 	mes "Boo...Boo...";
 	specialeffect2 312;
 	close;
 }
 
-bat_a01,53,377,3	script	Therapist in battle#tv12	95,{
+bat_a01,53,377,3	script	Therapist in battle#tv12	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -397,7 +393,7 @@ bat_a01,53,377,3	script	Therapist in battle#tv12	95,{
 	close;
 }
 
-bat_a01,45,18,3	script	Therapist in battle#tv11	95,{
+bat_a01,45,18,3	script	Therapist in battle#tv11	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -408,7 +404,7 @@ bat_a01,45,18,3	script	Therapist in battle#tv11	95,{
 // Battleground Respawn
 // *********************************************************************
 
-bat_a01,57,213,0	script	#ntv1_respawn	139,{
+bat_a01,57,213,0	script	#ntv1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -430,7 +426,7 @@ OnTimer20000:
 	end;
 }
 
-bat_a01,50,374,0	script	#gtv1_respawn	139,{
+bat_a01,50,374,0	script	#gtv1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -452,7 +448,7 @@ OnTimer25000:
 	end;
 }
 
-bat_a01,42,16,0	script	#ctv1_respawn	139,{
+bat_a01,42,16,0	script	#ctv1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index 7f72cdb3d..c6cebf581 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,114,227,4	script	Registration::TV2R_Guillaume	418,{
+bat_room,114,227,4	script	Registration::TV2R_Guillaume	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Tierra_BG2::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,114,204,0	script	Registration::TV2R_Croix	414,{
+bat_room,114,204,0	script	Registration::TV2R_Croix	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Tierra_BG2::OnCroixJoin",1;
@@ -241,23 +241,23 @@ OnReset:
 // Other Flags
 // *********************************************************************
 
-bat_a02,148,85,1	duplicate(Croix camp#bat)	Croix camp#bat22	974
-bat_a02,155,85,1	duplicate(Croix camp#bat)	Croix camp#bat23	974
-bat_a02,357,75,1	duplicate(Croix camp#bat)	Croix camp#bat24	974
-bat_a02,348,74,1	duplicate(Croix camp#bat)	Croix camp#bat25	974
-bat_a02,199,49,1	duplicate(Croix camp#bat)	Croix camp#bat26	974
-bat_a02,168,16,1	duplicate(Croix camp#bat)	Croix camp#bat27	974
-bat_a02,138,12,1	duplicate(Croix camp#bat)	Croix camp#bat28	974
-bat_a02,108,35,1	duplicate(Croix camp#bat)	Croix camp#bat29	974
-bat_a02,164,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat23	973
-bat_a02,157,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat24	973
-bat_a02,359,327,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat25	973
-bat_a02,350,326,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat26	973
-bat_a02,209,344,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat27	973
-bat_a02,173,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat28	973
-bat_a02,150,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat29	973
-bat_a02,118,357,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat30	973
-bat_a02,119,336,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat31	973
+bat_a02,148,85,1	duplicate(Croix camp#bat)	Croix camp#bat22	1_FLAG_EAGLE
+bat_a02,155,85,1	duplicate(Croix camp#bat)	Croix camp#bat23	1_FLAG_EAGLE
+bat_a02,357,75,1	duplicate(Croix camp#bat)	Croix camp#bat24	1_FLAG_EAGLE
+bat_a02,348,74,1	duplicate(Croix camp#bat)	Croix camp#bat25	1_FLAG_EAGLE
+bat_a02,199,49,1	duplicate(Croix camp#bat)	Croix camp#bat26	1_FLAG_EAGLE
+bat_a02,168,16,1	duplicate(Croix camp#bat)	Croix camp#bat27	1_FLAG_EAGLE
+bat_a02,138,12,1	duplicate(Croix camp#bat)	Croix camp#bat28	1_FLAG_EAGLE
+bat_a02,108,35,1	duplicate(Croix camp#bat)	Croix camp#bat29	1_FLAG_EAGLE
+bat_a02,164,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat23	1_FLAG_LION
+bat_a02,157,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat24	1_FLAG_LION
+bat_a02,359,327,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat25	1_FLAG_LION
+bat_a02,350,326,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat26	1_FLAG_LION
+bat_a02,209,344,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat27	1_FLAG_LION
+bat_a02,173,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat28	1_FLAG_LION
+bat_a02,150,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat29	1_FLAG_LION
+bat_a02,118,357,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat30	1_FLAG_LION
+bat_a02,119,336,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat31	1_FLAG_LION
 
 // Barricades
 // *********************************************************************
@@ -317,21 +317,19 @@ OnWall:
 // Battleground rewards
 // *********************************************************************
 
-bat_a02,45,19,3	script	Croix Vintenar#tv2	415,{
+bat_a02,45,19,3	script	Croix Vintenar#tv2	4_M_CRU_HEAD,{
 	if( $@TierraBG2_Victory )
 	{
 		if( $@TierraBG2_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 1;
+		} else {
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -340,7 +338,7 @@ bat_a02,45,19,3	script	Croix Vintenar#tv2	415,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -348,21 +346,19 @@ bat_a02,45,19,3	script	Croix Vintenar#tv2	415,{
 	end;
 }
 
-bat_a02,53,377,3	script	Guillaume Vintenar#tv2	419,{
+bat_a02,53,377,3	script	Guillaume Vintenar#tv2	4_M_KY_HEAD,{
 	if( $@TierraBG2_Victory )
 	{
 		if( $@TierraBG2_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-		}
-		else
-		{ // 
-			set .@Reward, 1;
+		} else {
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -371,7 +367,7 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	419,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -382,14 +378,14 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	419,{
 // Battleground Therapist
 // *********************************************************************
 
-bat_a02,60,216,3	script	Ghost#tv23	950,{
+bat_a02,60,216,3	script	Ghost#tv23	4_GHOSTRING,{
 	mes "[Ghost in valley]";
 	mes "Boo...Boo...";
 	specialeffect2 312;
 	close;
 }
 
-bat_a02,53,377,3	script	Therapist in battle#tv22	95,{
+bat_a02,53,377,3	script	Therapist in battle#tv22	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -397,7 +393,7 @@ bat_a02,53,377,3	script	Therapist in battle#tv22	95,{
 	close;
 }
 
-bat_a02,45,18,3	script	Therapist in battle#tv21	95,{
+bat_a02,45,18,3	script	Therapist in battle#tv21	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -408,7 +404,7 @@ bat_a02,45,18,3	script	Therapist in battle#tv21	95,{
 // Battleground Respawn
 // *********************************************************************
 
-bat_a02,57,213,0	script	#ntv2_respawn	139,{
+bat_a02,57,213,0	script	#ntv2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -430,7 +426,7 @@ OnTimer20000:
 	end;
 }
 
-bat_a02,50,374,0	script	#gtv2_respawn	139,{
+bat_a02,50,374,0	script	#gtv2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -452,7 +448,7 @@ OnTimer25000:
 	end;
 }
 
-bat_a02,42,16,0	script	#ctv2_respawn	139,{
+bat_a02,42,16,0	script	#ctv2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt
new file mode 100644
index 000000000..36e02e86d
--- /dev/null
+++ b/npc/custom/bgqueue/flavius.txt
@@ -0,0 +1,780 @@
+//===== Hercules Script ======================================
+// BattleGround System - Flavius
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.5b
+//===== Description: =========================================
+//= [AEGIS Conversion]
+//= Flavius Battleground.
+//= - Winning Team: 9 badges
+//= - Losing Team: 3 badge
+//===== Additional Comments: =================================
+//= 1.0  First Version.
+//= 1.1  Fixed pink crystal spawning as blue. [L0ne_W0lf]
+//= 1.2  Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
+//= 1.3  Removed MaxLvl check in waitingrooms. Replaced setwall with setcell.
+//= 1.4  Attempt at implementing BG Queue [Ind/Hercules]
+//= 1.5  Attempt at implementing BG Queue team-algorithm [jaBote]
+//= 1.5b Adjustments to the team-splitting algorithm [Haruna]
+//============================================================
+
+
+//Tacham, while the script is under testings the original will remain, meaning if you wanna test this you need to disable the other, or they'll conflict.
+bat_b01,15,15,3	script	start#bat_b01	CLEAR_NPC,{
+OnInit:
+	mapwarp "bat_b01","bat_room",154,150;
+	end;
+
+//$@bg_queue_id is cleared after this event ends
+OnPlayerListReady:
+	
+ 	set $@FlaviusBG1_id1, bg_create_team("bat_b01",10,290);
+	set $@FlaviusBG1_id2, bg_create_team("bat_b01",390,10);
+
+	set $@Croix_QueueBG1, queue();
+	set $@Guill_QueueBG1, queue();
+	
+	queueopt($@Guill_QueueBG1,HQO_OnLogout,"start#bat_b01::OnGuillaumeQuit");
+	queueopt($@Croix_QueueBG1,HQO_OnLogout,"start#bat_b01::OnCroixQuit");
+	
+	set .@i, 0;
+	
+	copyarray .@bg_member[0],$@bg_member[0],$@bg_member_size;
+	copyarray .@bg_member_group[0],$@bg_member_group[0],$@bg_member_size;
+	copyarray .@bg_member_type[0],$@bg_member_type[0],$@bg_member_size;
+	
+	freeloop(1);
+	// Counting all participants and determining sizes, condensing .@bg_member_group
+	set .@nogroupcount, 0;
+	for (set .@i, 0; .@i < getarraysize(.@bg_member); set .@i, .@i + 1) {
+		if (.@bg_member_group[.@i] == 0) { // Just count them
+			set .@nogroupcount, .@nogroupcount + 1;
+			continue;
+		}
+		// check if .@bg_member_group and .@bg_member_type already exists on these groups.
+		for (set .@j, 0; .@j < getarraysize(.@bg_groups); set .@j, .@j + 1) { // <= since it has to start working even if the array is still blank
+			if ( (.@bg_member_group[.@i] == .@bg_groups[.@j]) && (.@bg_member_type[.@i] == .@bg_types[.@j]) ) {
+				set .@bg_count[.@j], .@bg_count[.@j] + 1;
+				break;
+			}
+			// Else keep running the loop until we find there's a group already made or make a new one
+		}
+		if (.@j == (getarraysize(.@bg_groups)) ) { // It isn't there, insert a new entry at j
+			set .@bg_groups[.@j], .@bg_member_group[.@i];
+			set .@bg_types[.@j], .@bg_member_type[.@i];
+			set .@bg_count[.@j], 1;
+		}
+	}
+	
+	// Now, sorting the group arrays from amount of population descending! Bubble sort powers, I call upon thee!
+	// Type doesn't matter here for precedence checks, but also needs to be sorted the same way along with groups
+	for (set .@i, 0; .@i < getarraysize(.@bg_groups); set .@i, .@i + 1) {
+		for (set .@j, 0; .@j < (getarraysize(.@bg_groups) - .@i); set .@j, .@j + 1) {
+			if (.@bg_count[.@j] < .@bg_count[.@j+1]){
+				set .@temp1, .@bg_groups[.@j];
+				set .@temp2, .@bg_types[.@j];
+				set .@temp3, .@bg_count[.@j];
+				set .@bg_groups[.@j], .@bg_groups[.@j+1];
+				set .@bg_types[.@j], .@bg_types[.@j+1];
+				set .@bg_count[.@j], .@bg_count[.@j+1];
+				set .@bg_groups[.@j+1], .@temp1;
+				set .@bg_types[.@j+1], .@temp2;
+				set .@bg_count[.@j+1], .@temp3;
+			}
+		}
+	}
+	
+	// Add the groups to the queues! :D
+	for (set .@i, 0; .@i < getarraysize(.@bg_groups); set .@i, .@i + 1){
+		if (queuesize($@Croix_QueueBG1) <= queuesize($@Guill_QueueBG1)){ // Catch'em all and add to the queue!
+			for (set .@j, 0; .@j < getarraysize(.@bg_member); set .@j, .@j + 1) {
+				if ( (.@bg_groups[.@i] == .@bg_member_group[.@j]) && (.@bg_types[.@i] == .@bg_member_type[.@j]) ) {
+					bg_join_team($@FlaviusBG1_id1,.@bg_member[.@j]);
+					queueadd($@Croix_QueueBG1, .@bg_member[.@j]);
+				}
+			}
+		}
+		else {
+			for (set .@j, 0; .@j < getarraysize(.@bg_member); set .@j, .@j + 1) {
+				if ( (.@bg_groups[.@i] == .@bg_member_group[.@j]) && (.@bg_types[.@i] == .@bg_member_type[.@j]) ) {
+					bg_join_team($@FlaviusBG1_id2,.@bg_member[.@j]);
+					queueadd($@Guill_QueueBG1, .@bg_member[.@j]);
+				}
+			}
+		}
+	}
+	// Don't forget the people that go on their own!
+	for (set .@i, 0; .@i <= getarraysize(.@bg_member); set .@i, .@i+1) {
+		if (.@bg_member_group[.@i] == 0) { // Get alone people only
+			if (queuesize($@Croix_QueueBG1) <= queuesize($@Guill_QueueBG1)) {
+				bg_join_team($@FlaviusBG1_id1,.@bg_member[.@i]);
+				queueadd($@Croix_QueueBG1, .@bg_member[.@i]);
+			}
+			else {
+				bg_join_team($@FlaviusBG1_id2,.@bg_member[.@i]);
+				queueadd($@Guill_QueueBG1, .@bg_member[.@i]);
+			}
+		}
+	}
+	freeloop(0);
+
+	set $@FlaviusBG1, 1;
+	set $@FlaviusBG1_Victory, 0;
+	set $@Croix_ScoreBG1, 0;
+	set $@Guill_ScoreBG1, 0;
+	
+	bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
+
+	donpcevent "OBJ#bat_b01_a::OnKill";
+	donpcevent "OBJ#bat_b01_a::OnEnable";
+	donpcevent "OBJ#bat_b01_b::OnKill";
+	donpcevent "OBJ#bat_b01_b::OnEnable";
+	donpcevent "guardian#bat_b01_a::OnKill";
+	donpcevent "guardian#bat_b01_b::OnKill";
+	donpcevent "guardian#bat_b01_a::OnEnable";
+	donpcevent "guardian#bat_b01_b::OnEnable";
+	donpcevent "cell#bat_b01_a::OnRed";
+	donpcevent "cell#bat_b01_b::OnRed";
+	donpcevent "time#bat_b01::OnEnable";
+	disablenpc "Guillaume Vintenar#b01_a";
+	disablenpc "Croix Vintenar#b01_b";
+	disablenpc "Vintenar#bat_b01_aover";
+	disablenpc "Vintenar#bat_b01_bover";
+	bg_warp $@FlaviusBG1_id1,"bat_b01",87,75;
+	bg_warp $@FlaviusBG1_id2,"bat_b01",311,224;
+	
+	/* after warp */
+	queueopt($@Guill_QueueBG1,HQO_OnMapChange,"start#bat_b01::OnGuillaumeQuit");
+	queueopt($@Croix_QueueBG1,HQO_OnMapChange,"start#bat_b01::OnCroixQuit");
+	
+	donpcevent "countdown#bat_b01::OnEnable";
+	end;
+
+OnReset:
+	donpcevent "OBJ#bat_b01_a::OnKill";
+	donpcevent "OBJ#bat_b01_a::OnEnable";
+	donpcevent "OBJ#bat_b01_b::OnKill";
+	donpcevent "OBJ#bat_b01_b::OnEnable";
+	donpcevent "guardian#bat_b01_a::OnKill";
+	donpcevent "guardian#bat_b01_b::OnKill";
+	donpcevent "guardian#bat_b01_a::OnEnable";
+	donpcevent "guardian#bat_b01_b::OnEnable";
+	donpcevent "cell#bat_b01_a::OnRed";
+	donpcevent "cell#bat_b01_b::OnRed";
+	donpcevent "time#bat_b01::OnEnable";
+	disablenpc "Guillaume Vintenar#b01_a";
+	disablenpc "Croix Vintenar#b01_b";
+	disablenpc "Vintenar#bat_b01_aover";
+	disablenpc "Vintenar#bat_b01_bover";
+	bg_warp $@FlaviusBG1_id1,"bat_b01",87,75;
+	bg_warp $@FlaviusBG1_id2,"bat_b01",311,224;
+	end;
+
+OnCroixQuit:
+	queueremove($@Croix_QueueBG1,getcharid(3));
+	callsub L_OnPlayerQuit;
+	end;
+
+OnGuillaumeQuit:
+	queueremove($@Guill_QueueBG1,getcharid(3));
+	callsub L_OnPlayerQuit;
+	end;
+	
+L_OnPlayerQuit:
+	bg_leave;
+	setd $@bg_delay_var$,gettimetick(2);
+	if( queuesize($@Guill_QueueBG1) == 0 || queuesize($@Croix_QueueBG1) == 0 ) /* todo check score and decide a winner if anyone left */
+		callsub OnMatchOver;
+	end;
+	
+OnMatchOver:
+	if( $@FlaviusBG1_id1 || $@FlaviusBG1_id2 ) {
+		queuedel($@Croix_QueueBG1);
+		queuedel($@Guill_QueueBG1);
+		bg_match_over("Flavius");
+	}
+	if( $@FlaviusBG1_id1 ) { bg_destroy $@FlaviusBG1_id1; set $@FlaviusBG1_id1, 0; }
+	if( $@FlaviusBG1_id2 ) { bg_destroy $@FlaviusBG1_id2; set $@FlaviusBG1_id2, 0; }
+	end;
+}
+
+bat_b01,1,1,3	script	OBJ#bat_b01_a	CLEAR_NPC,{
+OnEnable:
+	bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead";
+	end;
+
+OnKill:
+	killmonster "bat_b01","OBJ#bat_b01_a::OnMyMobDead";
+	end;
+
+OnMyMobDead:
+	if (mobcount("bat_b01","OBJ#bat_b01_a::OnMyMobDead") < 1) {
+		mapannounce "bat_b01", "Guillaume's Crystal has been destroyed.",bc_map,"0xFFCE00";
+		if ($@Croix_ScoreBG1 > 0) {
+			set $@FlaviusBG1_Victory,2;
+			set $@Croix_ScoreBG1,$@Croix_ScoreBG1+1;
+			enablenpc "Guillaume Vintenar#b01_a";
+			enablenpc "Croix Vintenar#b01_b";
+			donpcevent "time#bat_b01::OnStop";
+			donpcevent "start#bat_b01::OnMatchOver";
+		}
+		else {
+			set $@Croix_ScoreBG1,1;
+			donpcevent "time#bat_b01::OnEnable";
+			donpcevent "start#bat_b01::OnReset";
+		}
+		bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
+		bg_warp $@FlaviusBG1_id1,"bat_b01",10,290;
+		bg_warp $@FlaviusBG1_id2,"bat_b01",390,10;
+	}
+	end;
+}
+bat_b01,1,2,3	script	OBJ#bat_b01_b	CLEAR_NPC,{
+OnEnable:
+	bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead";
+	end;
+
+OnKill:
+	killmonster "bat_b01","OBJ#bat_b01_b::OnMyMobDead";
+	end;
+
+OnMyMobDead:
+	if (mobcount("bat_b01","OBJ#bat_b01_b::OnMyMobDead") < 1) {
+		mapannounce "bat_b01", "Croix's Crystal has been destroyed.",bc_map,"0xFFCE00";
+		if ($@Guill_ScoreBG1 > 0) {
+			set $@FlaviusBG1_Victory,1;
+			set $@Guill_ScoreBG1,$@Guill_ScoreBG1+1;
+			enablenpc "Guillaume Vintenar#b01_a";
+			enablenpc "Croix Vintenar#b01_b";
+			donpcevent "time#bat_b01::OnStop";
+			donpcevent "start#bat_b01::OnMatchOver";
+		}
+		else {
+			set $@Guill_ScoreBG1,1;
+			donpcevent "time#bat_b01::OnEnable";
+			donpcevent "start#bat_b01::OnReset";
+		}
+		bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
+		bg_warp $@FlaviusBG1_id1,"bat_b01",10,290;
+		bg_warp $@FlaviusBG1_id2,"bat_b01",390,10;
+	}
+	end;
+}
+
+bat_b01,1,3,3	script	guardian#bat_b01_a	CLEAR_NPC,{
+OnEnable:
+	bg_monster $@FlaviusBG1_id1,"bat_b01",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
+	bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
+	end;
+
+OnKill:
+	killmonster "bat_b01","guardian#bat_b01_a::OnMyMobDead";
+	end;
+
+OnMyMobDead:
+	if (mobcount("bat_b01","guardian#bat_b01_a::OnMyMobDead") < 1) {
+		donpcevent "cell#bat_b01_a::OnGreen";
+		mapannounce "bat_b01", "The Guardian protecting Guillaume's Crystal has been slain.",bc_map,"0xFFCE00";
+	}
+	end;
+}
+
+bat_b01,1,3,3	script	guardian#bat_b01_b	CLEAR_NPC,{
+OnEnable:
+	bg_monster $@FlaviusBG1_id2,"bat_b01",307,160,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
+	bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
+	end;
+
+OnKill:
+	killmonster "bat_b01","guardian#bat_b01_b::OnMyMobDead";
+	end;
+
+OnMyMobDead:
+	if (mobcount("bat_b01","guardian#bat_b01_b::OnMyMobDead") < 1) {
+		donpcevent "cell#bat_b01_b::OnGreen";
+		mapannounce "bat_b01", "The Guardian protecting Croix's Crystal has been slain.",bc_map,"0xFFCE00";
+	}
+	end;
+}
+
+bat_b01,1,4,3	script	cell#bat_b01_a	CLEAR_NPC,{
+OnRed:
+	setcell "bat_b01",62,149,60,151,cell_basilica,1;
+	setcell "bat_b01",62,149,60,151,cell_walkable,0;
+	end;
+
+OnGreen:
+	setcell "bat_b01",62,149,60,151,cell_basilica,0;
+	setcell "bat_b01",62,149,60,151,cell_walkable,1;
+	end;
+}
+
+bat_b01,1,5,3	script	cell#bat_b01_b	CLEAR_NPC,{
+OnRed:
+	setcell "bat_b01",327,151,329,149,cell_basilica,1;
+	setcell "bat_b01",327,151,329,149,cell_walkable,0;
+	end;
+
+OnGreen:
+	setcell "bat_b01",327,151,329,149,cell_basilica,0;
+	setcell "bat_b01",327,151,329,149,cell_walkable,1;
+	end;
+}
+
+bat_b01,1,6,1	script	time#bat_b01	CLEAR_NPC,{
+OnEnable:
+	donpcevent "Battle Therapist#b01_a::OnEnable";
+	donpcevent "Battle Therapist#b01_b::OnEnable";
+	end;
+
+OnStop:
+	donpcevent "Battle Therapist#b01_a::OnStop";
+	donpcevent "Battle Therapist#b01_b::OnStop";
+	end;
+}
+
+bat_b01,10,294,3	script	Battle Therapist#b01_a	4_F_SISTER,{
+	specialeffect2 EF_HEAL;
+	mes "[Battle Therapist]";
+	mes "Just close your eyes,";
+	mes "and take a deep breath.";
+	mes "You can be free from pain.";
+	close;
+
+OnTimer25000:
+	specialeffect EF_SANCTUARY;
+	enablenpc "bat_b01_rp1_a_warp";
+	end;
+
+OnTimer26000:
+	disablenpc "bat_b01_rp1_a_warp";
+	end;
+
+OnTimer26500:
+	stopnpctimer;
+	donpcevent "Battle Therapist#b01_a::OnEnable";
+	end;
+
+OnEnable:
+	initnpctimer;
+	enablenpc "Battle Therapist#b01_a";
+	end;
+
+OnStop:
+	disablenpc "bat_b01_rp1_a_warp";
+	disablenpc "Battle Therapist#b01_a";
+	stopnpctimer;
+	end;
+}
+
+bat_b01,10,290,0	script	bat_b01_rp1_a_warp	WARPNPC,10,10,{
+OnInit:
+	disablenpc "bat_b01_rp1_a_warp";
+	end;
+
+OnTouch:
+	percentheal 100,100;
+	warp "bat_b01",87,73;
+	end;
+}
+
+bat_b01,389,14,3	script	Battle Therapist#b01_b	4_F_SISTER,{
+	specialeffect2 EF_HEAL;
+	mes "[Battle Therapist]";
+	mes "Just close your eyes,";
+	mes "and take a deep breath.";
+	mes "You can be free from pain.";
+	close;
+
+OnTimer25000:
+	specialeffect EF_SANCTUARY;
+	enablenpc "bat_b01_rp1_b_warp";
+	end;
+
+OnTimer26000:
+	disablenpc "bat_b01_rp1_b_warp";
+	end;
+
+OnTimer26500:
+	stopnpctimer;
+	donpcevent "Battle Therapist#b01_b::OnEnable";
+	end;
+
+OnEnable:
+	initnpctimer;
+	enablenpc "Battle Therapist#b01_b";
+	end;
+
+OnStop:
+	disablenpc "bat_b01_rp1_b_warp";
+	disablenpc "Battle Therapist#b01_b";
+	stopnpctimer;
+	end;
+}
+
+bat_b01,389,10,0	script	bat_b01_rp1_b_warp	WARPNPC,9,9,{
+OnInit:
+	disablenpc "bat_b01_rp1_a_warp";
+	end;
+
+OnTouch:
+	percentheal 100,100;
+	warp "bat_b01",312,225;
+	end;
+}
+
+bat_b01,87,76,0	script	A_CODE#bat_b01	-1,5,5,{
+OnTouch:
+	if (checkquest(2070) < 0)
+		setquest 2070;
+	end;
+}
+
+bat_b01,312,224,0	script	B_CODE#bat_b01	-1,5,5,{
+OnTouch:
+	if (checkquest(2070) < 0)
+		setquest 2070;
+	end;
+}
+
+bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
+	if ($@FlaviusBG1_id1 == getcharid(4)) {
+		if ($@FlaviusBG1_Victory == 1) {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 8) {
+				mes "[Axl Rose]";
+				mes "Blessed Guillaume!";
+				mes "Let's enjoy our glorious victory!";
+				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
+				close2;
+				getitem 7829,9; //BF_Badge2
+			}
+			else {
+				mes "[Axl Rose]";
+				mes "Blessed Guillaume!";
+				mes "Let's enjoy our glorious victory!";
+				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+		else {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 2) {
+				mes "[Axl Rose]";
+				mes "You lost, but you're dedicated to this battle.";
+				mes "This is a reward for your great dedication by Guillaume Marollo!";
+				mes "Just take this defeat as a lesson, next time you will definitely win.";
+				close2;
+				getitem 7829,3; //BF_Badge2
+			}
+			else {
+				mes "[Axl Rose]";
+				mes "You lost, but you're dedicated to this battle.";
+				mes "This is a reward for your great dedication by Guillaume Marollo!";
+				mes "Just take this defeat as a lesson, next time you will definitely win.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+	}
+	bg_leave;
+	warp "bat_room",154,150;
+	end;
+
+OnInit:
+	disablenpc "Guillaume Vintenar#b01_a";
+	end;
+}
+
+bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
+	if ($@FlaviusBG1_id2 == getcharid(4)) {
+		if ($@FlaviusBG1_Victory == 2) {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 8) {
+				mes "[Swandery]";
+				mes "Blessed Croix!";
+				mes "Let's enjoy our glorious victory!";
+				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
+				close2;
+				getitem 7829,9; //BF_Badge2
+			}
+			else {
+				mes "[Swandery]";
+				mes "Blessed Croix!";
+				mes "Let's enjoy our glorious victory!";
+				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+		else {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 2) {
+				mes "[Swandery]";
+				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
+				mes "Even though we didn't win, we did our best.";
+				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
+				close2;
+				getitem 7829,3; //BF_Badge2
+			}
+			else {
+				mes "[Swandery]";
+				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
+				mes "Even though we didn't win, we did our best.";
+				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+	}
+	bg_leave;
+	warp "bat_room",154,150;
+	end;
+
+OnInit:
+	disablenpc "Croix Vintenar#b01_b";
+	end;
+}
+
+bat_b01,1,5,3	script	countdown#bat_b01	CLEAR_NPC,{
+OnInit:
+	stopnpctimer;
+	end;
+
+OnEnable:
+	stopnpctimer;
+	initnpctimer;
+	end;
+
+OnStop:
+	stopnpctimer;
+	end;
+
+OnTimer7000:
+	mapannounce "bat_b01", "Guillaume Vintenar Axl Rose : Let's attack to destroy that Crystal!",bc_map,"0xFF9900";
+	end;
+
+OnTimer8000:
+	mapannounce "bat_b01", "Croix Vintenar Swandery : Even though Guillaume is struggling to win against us, the victory is ours. Let's show them our power.",bc_map,"0xFF99CC";
+	end;
+
+OnTimer1800000:
+	mapannounce "bat_b01", "Marollo VII : Guillaume Marollo, Croix Marollo! And their followers!",bc_map,"0x99CC00";
+	end;
+
+OnTimer1803000:
+	mapannounce "bat_b01", "Marollo VII : Both camps are competitive, so it's hard to judge which team is superior.",bc_map,"0x99CC00";
+	end;
+
+OnTimer1808000:
+	mapannounce "bat_b01", "Marollo VII : This battle of Flavian is such a waste of time. I will decide victory and defeat by your progress.",bc_map,"0x99CC00";
+	end;
+
+OnTimer1822000:
+	mapannounce "bat_b01", "Marollo VII : If you can't accept the results, try again in another valley battle!",bc_map,"0x99CC00";
+	end;
+
+OnTimer1825000:
+	mapannounce "bat_b01", "Axl Rose, Swandery : Yes, sir.",bc_map,"0x99CC00";
+	end;
+
+OnTimer1830000:
+	donpcevent "time#bat_b01::OnStop";
+	bg_warp $@FlaviusBG1_id1,"bat_b01",10,290;
+	bg_warp $@FlaviusBG1_id2,"bat_b01",390,10;
+	enablenpc "Vintenar#bat_b01_aover";
+	enablenpc "Vintenar#bat_b01_bover";
+	end;
+
+OnTimer1900000:
+	mapwarp "bat_b01","bat_room",154,150;
+	donpcevent "countdown#bat_b01::OnStop";
+	donpcevent "start#bat_b01::OnMatchOver";
+	end;
+}
+
+bat_b01,81,83,3	script	Guillaume Camp#flag21	1_FLAG_LION,{ end; }
+bat_b01,94,83,3	script	Guillaume Camp#flag22	1_FLAG_LION,{ end; }
+bat_b01,81,66,3	script	Guillaume Camp#flag23	1_FLAG_LION,{ end; }
+bat_b01,94,66,3	script	Guillaume Camp#flag24	1_FLAG_LION,{ end; }
+bat_b01,139,142,3	script	Guillaume Camp#flag25	1_FLAG_LION,{ end; }
+bat_b01,139,158,3	script	Guillaume Camp#flag26	1_FLAG_LION,{ end; }
+bat_b01,110,161,3	script	Guillaume Camp#flag27	1_FLAG_LION,{ end; }
+bat_b01,110,137,3	script	Guillaume Camp#flag28	1_FLAG_LION,{ end; }
+bat_b01,63,135,3	script	Guillaume Camp#flag29	1_FLAG_LION,{ end; }
+bat_b01,63,165,3	script	Guillaume Camp#flag30	1_FLAG_LION,{ end; }
+bat_b01,10,296,3	script	Guillaume Camp#flag31	1_FLAG_LION,{ end; }
+
+bat_b01,306,233,3	script	Croix Camp#flag21	1_FLAG_EAGLE,{ end; }
+bat_b01,317,233,3	script	Croix Camp#flag22	1_FLAG_EAGLE,{ end; }
+bat_b01,306,216,3	script	Croix Camp#flag23	1_FLAG_EAGLE,{ end; }
+bat_b01,317,216,3	script	Croix Camp#flag24	1_FLAG_EAGLE,{ end; }
+bat_b01,257,158,3	script	Croix Camp#flag25	1_FLAG_EAGLE,{ end; }
+bat_b01,257,141,3	script	Croix Camp#flag26	1_FLAG_EAGLE,{ end; }
+bat_b01,297,164,3	script	Croix Camp#flag27	1_FLAG_EAGLE,{ end; }
+bat_b01,297,136,3	script	Croix Camp#flag28	1_FLAG_EAGLE,{ end; }
+bat_b01,336,161,3	script	Croix Camp#flag29	1_FLAG_EAGLE,{ end; }
+bat_b01,336,139,3	script	Croix Camp#flag30	1_FLAG_EAGLE,{ end; }
+bat_b01,389,16,3	script	Croix Camp#flag31	1_FLAG_EAGLE,{ end; }
+
+bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
+	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
+	if ($@FlaviusBG1_id1 == getcharid(4)) {
+		if (.@A_B_gap > 0) {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 8) {
+				mes "[Axl Rose]";
+				mes "Blessed Guillaume!";
+				mes "Let's enjoy our glorious victory!";
+				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
+				close2;
+				getitem 7829,9; //BF_Badge2
+			}
+			else {
+				mes "[Axl Rose]";
+				mes "Blessed Guillaume!";
+				mes "Let's enjoy our glorious victory!";
+				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+		else if (.@A_B_gap == 0) {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 2) {
+				mes "[Axl Rose]";
+				mes "You lost, but you're dedicated to this battle.";
+				mes "This is a reward for your great dedication by Guillaume Marollo!";
+				mes "Just take this defeat as a lesson, next time you will definitely win.";
+				close2;
+				getitem 7829,3; //BF_Badge2
+			}
+			else {
+				mes "[Axl Rose]";
+				mes "You lost, but you're dedicated to this battle.";
+				mes "This is a reward for your great dedication by Guillaume Marollo!";
+				mes "Just take this defeat as a lesson, next time you will definitely win.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+		else {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 2) {
+				mes "[Axl Rose]";
+				mes "You lost, but you're dedicated to this battle.";
+				mes "This is a reward for your great dedication by Guillaume Marollo!";
+				mes "Just take this defeat as a lesson, next time you will definitely win.";
+				close2;
+				getitem 7829,3; //BF_Badge2
+			}
+			else {
+				mes "[Axl Rose]";
+				mes "You lost, but you're dedicated to this battle.";
+				mes "This is a reward for your great dedication by Guillaume Marollo!";
+				mes "Just take this defeat as a lesson, next time you will definitely win.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+	}
+	else {
+		mes "[Axl Rose]";
+		mes "Why are you here, Croix mercenary? I am definitely sure of victory against foolish Croix such as you. Ha!";
+		close;
+	}
+	bg_leave;
+	warp "bat_room",154,150;
+	end;
+
+OnInit:
+	disablenpc "Vintenar#bat_b01_aover";
+	end;
+}
+
+bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
+	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
+	if ($@FlaviusBG1_id2 == getcharid(4)) {
+		if (.@A_B_gap > 0) {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 2) {
+				mes "[Swandery]";
+				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
+				mes "Even though we didn't win, we did our best.";
+				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
+				close2;
+				getitem 7829,3; //BF_Badge2
+			}
+			else {
+				mes "[Swandery]";
+				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
+				mes "Even though we didn't win, we did our best.";
+				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+		else if (.@A_B_gap == 0) {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 2) {
+				mes "[Swandery]";
+				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
+				mes "Even though we didn't win, we did our best.";
+				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
+				close2;
+				getitem 7829,3; //BF_Badge2
+			}
+			else {
+				mes "[Swandery]";
+				mes "Oh, "+strcharinfo(0)+". Don't be sad.";
+				mes "Even though we didn't win, we did our best.";
+				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+		else {
+			set .@your_medal,countitem(7829);
+			set .@medal_gap,500 - .@your_medal;
+			if (.@medal_gap > 8) {
+				mes "[Swandery]";
+				mes "Blessed Croix!";
+				mes "Let's enjoy our glorious victory!";
+				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
+				close2;
+				getitem 7829,9; //BF_Badge2
+			}
+			else {
+				mes "[Swandery]";
+				mes "Blessed Croix!";
+				mes "Let's enjoy our glorious victory!";
+				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
+				close2;
+				getitem 7829,.@medal_gap; //BF_Badge2
+			}
+		}
+	}
+	else {
+		mes "[Swandery]";
+		mes "Why do you come here as a Guillaume? You will be sent to where you should be!";
+		close;
+	}
+	bg_leave;
+	warp "bat_room",154,150;
+	end;
+
+OnInit:
+	disablenpc "Vintenar#bat_b01_bover";
+	end;
+}
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index 2bb3c6274..0222f5b3a 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -3,42 +3,54 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Description: =========================================
 //= One-click automatic mount rentals.
 //= Replaced 'close' with 'end' [Streusel]
+//= Fixed 'close' issues. [Joseph]
 //============================================================
 
-prontera,124,201,1	script	Universal Rental NPC	726,{
+prontera,124,201,1	script	Universal Rental NPC	4_F_JOB_BLACKSMITH,{
 	if (ismounting()) {
 		message strcharinfo(0),"You must first remove your mount.";
-		end; }
-	else if ((eaclass()&EAJ_THIRDMASK==EAJ_RANGER) && !countitem(6124)) {
+		end;
+	}
+	else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(6124)) {
 		if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) {
 			if(select(" ~ Falcon: ~ Warg")==1) setfalcon;
-			else getitem 6124,1; }
-		else getitem 6124,1; }
-	else if ((eaclass()&EAJ_THIRDMASK==EAJ_MECHANIC) && !checkcart() && getskilllv("MC_PUSHCART")) {
+			else getitem 6124,1;
+			specialeffect2 EF_TEIHIT3;
+			close;
+		}
+		else getitem 6124,1;
+	}
+	else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv("MC_PUSHCART")) {
 		if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) {
 			if(select(" ~ Cart: ~ Mado")==1) setcart;
-			else setmadogear; }
-		else setcart; }
+			else setmadogear;
+			specialeffect2 EF_TEIHIT3;
+			close;
+		}
+		else setcart;
+	}
 	else if (!checkcart() && getskilllv("MC_PUSHCART")) setcart;
 	else if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) setfalcon;
 	else if (!checkriding() && getskilllv("KN_RIDING")) {
-		if (eaclass()&EAJ_THIRDMASK==EAJ_RUNE_KNIGHT) setdragon;
-		else setriding; }
+		if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) setdragon;
+		else setriding;
+	}
 	else if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) setmadogear;
 	else {
 		message strcharinfo(0),"You do not meet requirements to rent.";
-		end; }
+		end;
+	}
 	specialeffect2 EF_TEIHIT3;
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= A Free PecoPeco and Falcon Breeder
 //= 1.1 FIXED checkriding/cart/falcon funcs [Lupus]
 //= 1.2 Added Rebirth/Advanced Class support [Mass Zero]
diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt
index 45e5e42c8..e3aa2bb5b 100644
--- a/npc/custom/card_remover.txt
+++ b/npc/custom/card_remover.txt
@@ -4,8 +4,6 @@
 //= TyrNemesis^
 //===== Current Version: =====================================
 //= 1.2a
-//===== Compatible With: =====================================
-//= Hercules Git
 //===== Description: =========================================
 //= Removes cards from equipped items.
 //===== Additional Comments: =================================
@@ -14,7 +12,7 @@
 //= 1.2a Added 'disable_items' command. [Euphy]
 //============================================================
 
-prt_in,28,73,4	script	Wise Old Woman#eAcustom	78,{
+prt_in,28,73,4	script	Wise Old Woman#eAcustom	1_F_ORIENT_04,{
 
 	set .zenycost,200000; // Set base cost in zeny of the card remover services
 	set .percardcost,25000; // set cost per card of the card remover services
@@ -52,7 +50,7 @@ prt_in,28,73,4	script	Wise Old Woman#eAcustom	78,{
 		}
 		set .@cardcount,getequipcardcnt(.@part);
 		
-		if (!checkweight(1202,(.@cardcount+1))) { 
+		if (!checkweight(1202,(.@cardcount+1))) {
 			mes "^3355FFJust a minute!";
 			mes "I can't offer any of my";
 			mes "services to you because";
@@ -69,7 +67,7 @@ prt_in,28,73,4	script	Wise Old Woman#eAcustom	78,{
 			mes "Very well. Return at once if you seek my services.";
 			close;
 		}
-		if((zeny < (.zenycost+(.@cardcount * .percardcost))) || (countitem(1000) < 1) || (countitem(715) < 1)) {
+		if((Zeny < (.zenycost+(.@cardcount * .percardcost))) || (countitem(1000) < 1) || (countitem(715) < 1)) {
 			mes "[Wise Old Woman]";
 			mes "You do not have all the items I require to work my magic, child. Come again when you do.";
 			close;
@@ -90,7 +88,7 @@ prt_in,28,73,4	script	Wise Old Woman#eAcustom	78,{
 		}
 		mes "[Wise Old Woman]";
 		mes "Very well. I shall begin.";
-		set zeny,zeny - (.zenycost+(.@cardcount * .percardcost));
+		Zeny -= (.zenycost+(.@cardcount * .percardcost));
 		delitem 1000,1;
 		delitem 715,1;
 		
diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt
index 637d38e61..fc79584fe 100644
--- a/npc/custom/etc/airplane.txt
+++ b/npc/custom/etc/airplane.txt
@@ -21,101 +21,101 @@ OnInit:
 	deletearray $locationsx[0],500;
 	deletearray $locationsy[0],500;
 	deletearray $alreadygoneto[0],500;
-	setarray $locationsname$[0],"Airport"; 
-	setarray $locationsname$[1],"Prontera"; 
-	setarray $locationsname$[2],"Payon"; 
-	setarray $locationsname$[3],"Aldebaran"; 
-	setarray $locationsname$[4],"Alberta"; 
-	setarray $locationsname$[5],"Geffen"; 
-	setarray $locationsname$[6],"Morocc"; 
-	setarray $locationsname$[7],"Glast Heim"; 
-	setarray $locationsname$[8],"Umbala"; 
-	setarray $locationsname$[9],"Comodo"; 
-	setarray $locationsname$[10],"Amatsu"; 
-	setarray $locationsname$[11],"Niflheim"; 
-	setarray $locationsname$[12],"Lutie"; 
-	setarray $locationsname$[13],"Louyang"; 
-	setarray $locationsname$[14],"Gonryun"; 
-	setarray $locationsname$[15],"Yuno"; 
-	setarray $locationsname$[16],"Ant Hell"; 
-	setarray $locationsname$[17],"Jawaii"; 
-	setarray $locationsname$[18],"Orc Village"; 
-	setarray $locationsname$[19],"Mjolnir Coal Mines"; 
-	setarray $locationsname$[20],"Gefenia Ruins"; 
-	setarray $locationsname$[21],"Ayothaya"; 
-	setarray $locationsname$[22],"Lighthalzen"; 
-	setarray $locationsname$[23],"Juperos"; 
-	setarray $locationsmap$[0],"airport"; 
-	setarray $locationsmap$[1],"prt_fild08"; 
-	setarray $locationsmap$[2],"pay_fild08"; 
-	setarray $locationsmap$[3],"mjolnir_12"; 
-	setarray $locationsmap$[4],"pay_fild03"; 
-	setarray $locationsmap$[5],"gef_fild00"; 
-	setarray $locationsmap$[6],"moc_fild10"; 
-	setarray $locationsmap$[7],"glast_01"; 
-	setarray $locationsmap$[8],"umbala"; 
-	setarray $locationsmap$[9],"comodo"; 
-	setarray $locationsmap$[10],"amatsu"; 
-	setarray $locationsmap$[11],"niflheim"; 
-	setarray $locationsmap$[12],"xmas"; 
-	setarray $locationsmap$[13],"louyang"; 
-	setarray $locationsmap$[14],"gonryun"; 
-	setarray $locationsmap$[15],"yuno"; 
-	setarray $locationsmap$[16],"moc_fild04"; 
-	setarray $locationsmap$[17],"jawaii"; 
-	setarray $locationsmap$[18],"gef_fild10"; 
-	setarray $locationsmap$[19],"mjolnir_02"; 
-	setarray $locationsmap$[20],"gefenia01"; 
-	setarray $locationsmap$[21],"ayothaya"; 
+	setarray $locationsname$[0],"Airport";
+	setarray $locationsname$[1],"Prontera";
+	setarray $locationsname$[2],"Payon";
+	setarray $locationsname$[3],"Aldebaran";
+	setarray $locationsname$[4],"Alberta";
+	setarray $locationsname$[5],"Geffen";
+	setarray $locationsname$[6],"Morocc";
+	setarray $locationsname$[7],"Glast Heim";
+	setarray $locationsname$[8],"Umbala";
+	setarray $locationsname$[9],"Comodo";
+	setarray $locationsname$[10],"Amatsu";
+	setarray $locationsname$[11],"Niflheim";
+	setarray $locationsname$[12],"Lutie";
+	setarray $locationsname$[13],"Louyang";
+	setarray $locationsname$[14],"Gonryun";
+	setarray $locationsname$[15],"Yuno";
+	setarray $locationsname$[16],"Ant Hell";
+	setarray $locationsname$[17],"Jawaii";
+	setarray $locationsname$[18],"Orc Village";
+	setarray $locationsname$[19],"Mjolnir Coal Mines";
+	setarray $locationsname$[20],"Gefenia Ruins";
+	setarray $locationsname$[21],"Ayothaya";
+	setarray $locationsname$[22],"Lighthalzen";
+	setarray $locationsname$[23],"Juperos";
+	setarray $locationsmap$[0],"airport";
+	setarray $locationsmap$[1],"prt_fild08";
+	setarray $locationsmap$[2],"pay_fild08";
+	setarray $locationsmap$[3],"mjolnir_12";
+	setarray $locationsmap$[4],"pay_fild03";
+	setarray $locationsmap$[5],"gef_fild00";
+	setarray $locationsmap$[6],"moc_fild10";
+	setarray $locationsmap$[7],"glast_01";
+	setarray $locationsmap$[8],"umbala";
+	setarray $locationsmap$[9],"comodo";
+	setarray $locationsmap$[10],"amatsu";
+	setarray $locationsmap$[11],"niflheim";
+	setarray $locationsmap$[12],"xmas";
+	setarray $locationsmap$[13],"louyang";
+	setarray $locationsmap$[14],"gonryun";
+	setarray $locationsmap$[15],"yuno";
+	setarray $locationsmap$[16],"moc_fild04";
+	setarray $locationsmap$[17],"jawaii";
+	setarray $locationsmap$[18],"gef_fild10";
+	setarray $locationsmap$[19],"mjolnir_02";
+	setarray $locationsmap$[20],"gefenia01";
+	setarray $locationsmap$[21],"ayothaya";
 	setarray $locationsmap$[22],"lighthalzen";
 	setarray $locationsmap$[23],"jupe_gate";
-	setarray $locationsx[0],148; 
-	setarray $locationsx[1],206; 
-	setarray $locationsx[2],159; 
-	setarray $locationsx[3],62; 
-	setarray $locationsx[4],194; 
-	setarray $locationsx[5],50; 
-	setarray $locationsx[6],163; 
-	setarray $locationsx[7],196; 
+	setarray $locationsx[0],148;
+	setarray $locationsx[1],206;
+	setarray $locationsx[2],159;
+	setarray $locationsx[3],62;
+	setarray $locationsx[4],194;
+	setarray $locationsx[5],50;
+	setarray $locationsx[6],163;
+	setarray $locationsx[7],196;
 	setarray $locationsx[8],187;
-	setarray $locationsx[9],203; 
+	setarray $locationsx[9],203;
 	setarray $locationsx[10],115;
 	setarray $locationsx[11],132;
 	setarray $locationsx[12],232;
-	setarray $locationsx[13],36; 
-	setarray $locationsx[14],82; 
+	setarray $locationsx[13],36;
+	setarray $locationsx[14],82;
 	setarray $locationsx[15],58;
 	setarray $locationsx[16],209;
-	setarray $locationsx[17],248; 
+	setarray $locationsx[17],248;
 	setarray $locationsx[18],158;
 	setarray $locationsx[19],76;
-	setarray $locationsx[20],98; 
+	setarray $locationsx[20],98;
 	setarray $locationsx[21],183;
 	setarray $locationsx[22],99;
 	setarray $locationsx[23],46;
-	setarray $locationsy[0],45; 
+	setarray $locationsy[0],45;
 	setarray $locationsy[1],280;
-	setarray $locationsy[2],92; 
+	setarray $locationsy[2],92;
 	setarray $locationsy[3],381;
 	setarray $locationsy[4],182;
 	setarray $locationsy[5],365;
 	setarray $locationsy[6],172;
 	setarray $locationsy[7],327;
 	setarray $locationsy[8],98;
-	setarray $locationsy[9],76; 
+	setarray $locationsy[9],76;
 	setarray $locationsy[10],79;
 	setarray $locationsy[11],241;
 	setarray $locationsy[12],308;
-	setarray $locationsy[13],279; 
-	setarray $locationsy[14],96; 
+	setarray $locationsy[13],279;
+	setarray $locationsy[14],96;
 	setarray $locationsy[15],194;
 	setarray $locationsy[16],326;
-	setarray $locationsy[17],175; 
+	setarray $locationsy[17],175;
 	setarray $locationsy[18],95;
 	setarray $locationsy[19],363;
-	setarray $locationsy[20],21; 
+	setarray $locationsy[20],21;
 	setarray $locationsy[21],104;
-	setarray $locationsy[22],240; 
+	setarray $locationsy[22],240;
 	setarray $locationsy[23],19;
 	goto resetgoneto;
 	end;
@@ -123,7 +123,7 @@ OnInit:
 setrandomitin:
 	set $@settervariable,$@settervariable + 1;
 	setarray $locationn[$@settervariable],rand(0,getarraysize($locationsname$) - 1);
-	if($alreadygoneto[$locationn[$@settervariable]]==1)set $@settervariable,$@settervariable - 1; 
+	if($alreadygoneto[$locationn[$@settervariable]]==1)set $@settervariable,$@settervariable - 1;
 	if($alreadygoneto[$locationn[$@settervariable]]==1)goto setrandomitin;
 	setarray $alreadygoneto[$locationn[$@settervariable]], 1;
 	if($@settervariable<12)goto setrandomitin;
@@ -252,8 +252,8 @@ L_Nope:
 
 Notime:
 	mes "^FF0000[Porter]^000000";
-	if(sex==0) mes "Sorry, ma'am, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
-	if(sex==1) mes "Sorry, sir, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
+	if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
+	if(Sex==1) mes "Sorry, sir, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
 	next;
 	menu "Yes, please.",Itin,"No thanks.",L_Nope;
 	close;
@@ -264,84 +264,84 @@ Itin:
 	callfunc "F_Itin";
 }
 
-airport,153,43,5	script	Airport Porter	774,{
+airport,153,43,5	script	Airport Porter	4_M_TWBOY,{
 	callfunc "F_Porter",0;
 }
-prt_fild08,206,279,5	script	Porter#01	774,{
+prt_fild08,206,279,5	script	Porter#01	4_M_TWBOY,{
 	callfunc "F_Porter",1;
 }
-gef_fild00,50,364,5	script	Porter#02	774,{
+gef_fild00,50,364,5	script	Porter#02	4_M_TWBOY,{
 	callfunc "F_Porter",5;
 }
-moc_fild10,163,173,5	script	Porter#03	774,{
+moc_fild10,163,173,5	script	Porter#03	4_M_TWBOY,{
 	callfunc "F_Porter",6;
 }
-mjolnir_12,61,380,5	script	Porter#04	774,{
+mjolnir_12,61,380,5	script	Porter#04	4_M_TWBOY,{
 	callfunc "F_Porter",3;
 }
-pay_fild08,159,91,5	script	Porter#05	774,{
+pay_fild08,159,91,5	script	Porter#05	4_M_TWBOY,{
 	callfunc "F_Porter",2;
 }
-pay_fild03,194,181,5	script	Porter#06	774,{
+pay_fild03,194,181,5	script	Porter#06	4_M_TWBOY,{
 	callfunc "F_Porter",4;
 }
-glast_01,196,326,1	script	Porter#07	774,{
+glast_01,196,326,1	script	Porter#07	4_M_TWBOY,{
 	callfunc "F_Porter",7;
 }
-umbala,188,98,3	script	Porter#08	774,{
+umbala,188,98,3	script	Porter#08	4_M_TWBOY,{
 	callfunc "F_Porter",8;
 }
-comodo,203,75,8	script	Porter#09	774,{
+comodo,203,75,8	script	Porter#09	4_M_TWBOY,{
 	callfunc "F_Porter",9;
 }
-amatsu,115,78,8	script	Porter#10	774,{
+amatsu,115,78,8	script	Porter#10	4_M_TWBOY,{
 	callfunc "F_Porter",10;
 }
-niflheim,132,242,5	script	Porter#11	774,{
+niflheim,132,242,5	script	Porter#11	4_M_TWBOY,{
 	callfunc "F_Porter",11;
 }
-xmas,232,309,5	script	Porter#12	774,{
+xmas,232,309,5	script	Porter#12	4_M_TWBOY,{
 	callfunc "F_Porter",12;
 }
-louyang,35,279,8	script	Porter#13	774,{
+louyang,35,279,8	script	Porter#13	4_M_TWBOY,{
 	callfunc "F_Porter",13;
 }
-gonryun,82,95,7	script	Porter#14	774,{
+gonryun,82,95,7	script	Porter#14	4_M_TWBOY,{
 	callfunc "F_Porter",14;
 }
-yuno,58,195,4	script	Porter#15	774,{
+yuno,58,195,4	script	Porter#15	4_M_TWBOY,{
 	callfunc "F_Porter",15;
 }
-moc_fild04,210,326,2	script	Porter#16	774,{
+moc_fild04,210,326,2	script	Porter#16	4_M_TWBOY,{
 	callfunc "F_Porter",16;
 }
-jawaii,247,174,7	script	Porter#17	774,{
+jawaii,247,174,7	script	Porter#17	4_M_TWBOY,{
 	callfunc "F_Porter",17;
 }
-gef_fild10,159,95,2	script	Porter#18	774,{
+gef_fild10,159,95,2	script	Porter#18	4_M_TWBOY,{
 	callfunc "F_Porter",18;
 }
-mjolnir_02,76,364,5	script	Porter#19	774,{
+mjolnir_02,76,364,5	script	Porter#19	4_M_TWBOY,{
 	callfunc "F_Porter",19;
 }
-gefenia01,97,22,6	script	Porter#20	774,{
+gefenia01,97,22,6	script	Porter#20	4_M_TWBOY,{
 	callfunc "F_Porter",20;
 }
-ayothaya,182,105,5	script	Porter#21	774,{
+ayothaya,182,105,5	script	Porter#21	4_M_TWBOY,{
 	callfunc "F_Porter",21;
 }
-lighthalzen,99,241,4	script	Porter#22	774,{
+lighthalzen,99,241,4	script	Porter#22	4_M_TWBOY,{
 	callfunc "F_Porter",22;
 }
-jupe_gate,46,18,7	script	Porter#23	774,{
+jupe_gate,46,18,7	script	Porter#23	4_M_TWBOY,{
 	callfunc "F_Porter",23;
 }
-airport,141,43,5	script	Itinerary Schedule	837,{
+airport,141,43,5	script	Itinerary Schedule	2_BULLETIN_BOARD,{
 	mes "^FF0000[Itinerary]^000000";
 	callfunc "F_Itin";
 }
 
-airplane,102,68,5	script	Docker	852,{
+airplane,102,68,5	script	Docker	4_M_EIN_SOLDIER,{
 	if($destination == 250) goto Nowhere;
 	mes "^FF0000[Airplane Attendant]^000000";
 	if($destination == 250)goto Notime;
@@ -363,8 +363,8 @@ Lnope:
 
 Notime:
 	mes "^FF0000[Airplane Attendant]^000000";
-	if(sex==0) mes "Sorry, ma'am, but the plane currently isn't docked.  Please wait.";
-	if(sex==1) mes "Sorry, sir, but the plane currently isn't docked.  Please wait.";
+	if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't docked.  Please wait.";
+	if(Sex==1) mes "Sorry, sir, but the plane currently isn't docked.  Please wait.";
 	close;
 
 Nowhere:
diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt
index 00ebc66c8..e6e75c9f3 100644
--- a/npc/custom/etc/bank.txt
+++ b/npc/custom/etc/bank.txt
@@ -1,19 +1,19 @@
 //===== Hercules Script ======================================
-//= Banker Script 
-//===== By: ================================================== 
+//= Banker Script
+//===== By: ==================================================
 //= Syrus22 (1.0)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= An account wide Banker to store Zeny
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Syrus22 - There's an optional transaction fee at the top of
 //= the script. To use it simply change the first set command
 //= to set the cost variable to whatever you want the fee to be.
 //= Version 2.0: Optimized and brought the script up to standard. [Jguy]
-//============================================================ 
+//============================================================
 
-prontera,132,217,5	script	Banker	109,{
+prontera,132,217,5	script	Banker	4_M_MANAGER,{
 set @cost,500;
 mes "[Banker]";
 mes "Welcome to the First Bank of Prontera. How can I help you today?";
@@ -42,8 +42,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
 			close;
 		}
 		else {
-		set Zeny,Zeny - @deposit;
-		set Zeny,Zeny - @cost;
+		Zeny -= @deposit;
+		Zeny -= @cost;
 		set #bankstorage,#bankstorage + @deposit;
 		mes "[Banker]";
 		mes "Thank you very much... Your zeny is in good hands.";
@@ -80,8 +80,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
 				set #bankstorage,#bankstorage - @cost;
 				set @cost,0;
 				next;
-				set Zeny,Zeny - @cost;
-				set Zeny,Zeny + @withdrawl;
+				Zeny -= @cost;
+				Zeny += @withdrawl;
 				set #bankstorage,#bankstorage - @withdrawl;
 				mes "[Banker]";
 				mes "There's your Zeny. Have a good day.";
@@ -93,8 +93,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
 			}
 		}
 		else {
-			set Zeny,Zeny - @cost;
-			set Zeny,Zeny + @withdrawl;
+			Zeny -= @cost;
+			Zeny += @withdrawl;
 			set #bankstorage,#bankstorage - @withdrawl;
 			mes "[Banker]";
 			mes "There's your Zeny. Have a good day.";
diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt
index 12f35aff5..ea662499f 100644
--- a/npc/custom/etc/bank_kafra.txt
+++ b/npc/custom/etc/bank_kafra.txt
@@ -18,7 +18,7 @@
 // 1.2a Corrected bad duplicate names. (bugreport:921) [Samuray22]
 //============================================================
 
--	script	Bank Clerk::bankg	833,{
+-	script	Bank Clerk::bankg	4_M_ZONDAOYAJI,{
 	mes"[Maniss]";
 	mes strcharinfo(0)+", welcome to the 2nd Bank of Prontera!";
 
@@ -47,8 +47,8 @@ L_NoIncomeToday:
 	if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT;
 
 	if(@kafrabank<1000) goto L_LESS_1000;
-	if(@kafrabank>zeny) goto L_NOT_ENOUGH;
-	set zeny,zeny-@kafrabank;
+	if(@kafrabank>Zeny) goto L_NOT_ENOUGH;
+	Zeny -= @kafrabank;
 	set #kafrabank,#kafrabank+@kafrabank;
 	mes"[Maniss]";
 	mes "You've made a deposit of ^135445" + @kafrabank + "z^000000.";
@@ -67,7 +67,7 @@ M_WITHDRAW:
 	if(@kafrabank<1) goto B_EXIT2;
 	if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH;
 	set #kafrabank,#kafrabank-@kafrabank;
-	set zeny,zeny+@kafrabank;
+	Zeny += @kafrabank;
 	mes"[Maniss]";
 	mes "Here is your ^135445" + @kafrabank + "z^000000, put your sign here...";
 	//we log these zeny operations into the log db
@@ -108,7 +108,7 @@ B_EXIT2:
 	close;
 }
 
-prontera,131,190,1	duplicate(bankg)	Bank Clerk#1-1	833
-geffen,125,73,3	duplicate(bankg)	Bank Clerk#2-1	833
-izlude,145,107,1	duplicate(bankg)	Bank Clerk#3-1	833
-morocc,147,84,7	duplicate(bankg)	Bank Clerk#4-1	833
+prontera,131,190,1	duplicate(bankg)	Bank Clerk#1-1	4_M_ZONDAOYAJI
+geffen,125,73,3	duplicate(bankg)	Bank Clerk#2-1	4_M_ZONDAOYAJI
+izlude,145,107,1	duplicate(bankg)	Bank Clerk#3-1	4_M_ZONDAOYAJI
+morocc,147,84,7	duplicate(bankg)	Bank Clerk#4-1	4_M_ZONDAOYAJI
diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt
index 15e74865c..ee1e7904b 100644
--- a/npc/custom/etc/blackjack.txt
+++ b/npc/custom/etc/blackjack.txt
@@ -12,10 +12,10 @@
 //= Currently does not allow for "insurance", or "splitting"
 //= of pairs.
 //===== Additional Comments: =================================
-//= 
+//=
 //============================================================
 
-cmd_in02,188,89,1	script	Black Jack Dealer	57,{
+cmd_in02,188,89,1	script	Black Jack Dealer	1_M_LIBRARYMASTER,{
 	mes "[Dealer]";
 	mes "Hello there! Would you like to play a game of Black Jack?";
 M_Menu:
@@ -233,12 +233,12 @@ sL_Win:
 	mes "[Dealer]";
 	mes "Congratulations, you've won!";
 	next;
-	set Zeny, Zeny + @bet;
+	Zeny += @bet;
 	goto L_Play;
 sL_Lose:
 	mes "[Dealer]";
 	mes "I'm sorry but you've lost.";
-	set Zeny, Zeny - @bet;
+	Zeny -= @bet;
 	next;
 	goto L_Play;
 sL_Push:
diff --git a/npc/custom/etc/floating_rates.txt b/npc/custom/etc/floating_rates.txt
index f499a4f9d..ff3b6e8fa 100644
--- a/npc/custom/etc/floating_rates.txt
+++ b/npc/custom/etc/floating_rates.txt
@@ -4,8 +4,6 @@
 //= Lupus
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= It's a simply example of setbattleflag
 //= This script will change your server rates from 1x to 1.5x every 6 hours
diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt
index 1e35280a4..9d4c4df38 100644
--- a/npc/custom/etc/lottery.txt
+++ b/npc/custom/etc/lottery.txt
@@ -4,8 +4,6 @@
 //= acky
 //===== Current Version: =====================================
 //= 1.2.1a
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Daily lottery draw
 //===== Additional Comments: =================================
@@ -65,9 +63,9 @@ Pick6:
 
 	// BROADCASTS DRAW
 L_Broadcast:
-	Announce "Lottery: Welcome to tonight's lotto draw!",8;
-	Announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8;
-	Announce "Congratulations to the winners of tonight!",8;
+	announce "Lottery: Welcome to tonight's lotto draw!",8;
+	announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8;
+	announce "Congratulations to the winners of tonight!",8;
 
 	// GENERATES DRAW ID CODE
 L_GenID:
@@ -88,7 +86,7 @@ L_Rigged_Draw:
 	goto L_Broadcast;
 }
 
-prontera,141,182,5	script	Lottery	76,{
+prontera,141,182,5	script	Lottery	1_F_ORIENT_02,{
 L_Begin:
 	mes "[Lottery]";
 	mes "Winning Lotto Numbers ("+$LID2+"):";
@@ -108,8 +106,8 @@ L_Buy:
 	mes "The Jackpot is ^FF0000" + $L_Prize_Money + "z^000000.";
 	next;
 	menu "Buy Ticket",-,"Cancel",L_Cancel;
-	if (zeny < $L_TicketPrice) goto L_NoZeny;
-	set zeny,zeny-$L_TicketPrice;
+	if (Zeny < $L_TicketPrice) goto L_NoZeny;
+	Zeny -= $L_TicketPrice;
 	mes "[Lottery]";
 	mes "Would you like your numbers hand picked or computer generated?";
 	next;
@@ -294,8 +292,8 @@ LWinBig:
 	mes "You have matched all six numbers!";
 	mes "Jackpot!";
 	mes "You've won ^0000FF" + $L_Prize_Money + "z^000000.";
-	set zeny,zeny+$L_Prize_Money;
-	Announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8;
+	Zeny += $L_Prize_Money;
+	announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8;
 	set #LID,0;
 	close;
 
@@ -304,8 +302,8 @@ LWinSmall:
 	mes "[Lottery]";
 	mes "You have matched at least 4 numbers!";
 	mes "You've won ^0000FF" + $L_Prize_Money_Small + "z^000000.";
-	set zeny,zeny+$L_Prize_Money_Small;
-	Announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8;
+	Zeny += $L_Prize_Money_Small;
+	announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8;
 	set #LID,0;
 	close;
 
@@ -375,9 +373,9 @@ GMPick6:
 
 // BROADCASTS DRAW
 L_Broadcast:
-	Announce "Lottery: Welcome to the special GM's lotto draw!",8;
-	Announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8;
-	Announce "Congratulations to the winners!",8;
+	announce "Lottery: Welcome to the special GM's lotto draw!",8;
+	announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8;
+	announce "Congratulations to the winners!",8;
 
 // GENERATES DRAW ID CODE
 L_GenID:
@@ -408,29 +406,29 @@ L_GM_Rig:
 	set $LR5,0;
 	set $LR6,0;
 GMInput1:
-	Input $LR1;
+	input $LR1;
 	if ($LR1 < 1 || $LR1 > 40) goto GMInput1;
 	mes $LR1;
 GMInput2:
-	Input $LR2;
+	input $LR2;
 	if ($LR2 < 1 || $LR2 > 40) goto GMInput2;
 	if ($LR2 == $LR1) goto GMInput2;
 	mes $LR2;
 GMInput3:
-	Input $LR3;
+	input $LR3;
 	if ($LR3 < 1 || $LR3 > 40) goto GMInput3;
 	if ($LR3 == $LR1) goto GMInput3;
 	if ($LR3 == $LR2) goto GMInput3;
 	mes $LR3;
 GMInput4:
-	Input $LR4;
+	input $LR4;
 	if ($LR4 < 1 || $LR4 > 40) goto GMInput4;
 	if ($LR4 == $LR1) goto GMInput4;
 	if ($LR4 == $LR2) goto GMInput4;
 	if ($LR4 == $LR3) goto GMInput4;
 	mes $LR4;
 GMInput5:
-	Input $LR5;
+	input $LR5;
 	if ($LR5 < 1 || $LR5 > 40) goto GMInput5;
 	if ($LR5 == $LR1) goto GMInput5;
 	if ($LR5 == $LR2) goto GMInput5;
@@ -438,7 +436,7 @@ GMInput5:
 	if ($LR5 == $LR4) goto GMInput5;
 	mes $LR5;
 GMInput6:
-	Input $LR6;
+	input $LR6;
 	if ($LR6 < 1 || $LR6 > 40) goto GMInput6;
 	if ($LR6 == $LR1) goto GMInput6;
 	if ($LR6 == $LR2) goto GMInput6;
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 00f44193a..0d25be9d5 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -4,8 +4,6 @@
 //= AppleGirl, Evera
 //===== Current Version: =====================================
 //= 2.9
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Fully working wedding script for all kind of weddings
 //===== Additional Comments: =================================
@@ -14,7 +12,7 @@
 // 2.9 Somewhat iRO-official NPC names [DracoRPG]
 //============================================================
 
-// Configuration Variables: 
+// Configuration Variables:
 -	script	marriage_init	-1,{
 OnInit:
 	set $@wed_allow, 0;	//If 1, allows same sex marriages.
@@ -32,7 +30,7 @@ OnInit:
 
 // Other Configuration:
 // Line 61,62: Priest location, sprite and name.
-// Line 437,438: Registration location, sprite and name. 
+// Line 437,438: Registration location, sprite and name.
 // Line 813,814: Divorcing location, sprite and name.
 
 // Variable Notes:
@@ -54,7 +52,7 @@ OnInit:
 // $@divorcee id of the partner, who has to accept the divorce and pay.
 
 //The Priest - official iRO sprite & in-dialog name (on-map name not confirmed)
-prt_church,100,123,4	script	Vomars	60,{
+prt_church,100,123,4	script	Vomars	1_M_PASTOR,{
 	set @name$,"Vomars";
 
 	function SF_wed_end;
@@ -394,19 +392,19 @@ OnTimer55000:
 
 //Subfunction: Checks that the groom/bride is still wearing their stuff.
 function SF_equip_check {
-	if (sex && getequipid(2) != 7170) {
+	if (Sex && getequipid(2) != 7170) {
 		mes "["+@name$+"]";
 		mes "Child, what did you do with your "+getitemname(7170)+"?";
 		emotion e_dots;
 		return 0;
 	}
-	if (sex == 0 && getequipid(2) != 2338) {
+	if (Sex == 0 && getequipid(2) != 2338) {
 		mes "["+@name$+"]";
 		mes "Child, you are supposed to wear a "+getitemname(2338)+" at all times during the ceremony...";
 		emotion e_dots;
 		return 0;
 	}
-	if (sex == 0 && $@wed_veil && getequipid(1) != 2206) {
+	if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) {
 		mes "["+@name$+"]";
 		mes "Child, you can't take off your "+getitemname(2206)+" yet....";
 		emotion e_dots;
@@ -435,7 +433,7 @@ OnInit:
 }
 
 //Registration & Status
-prt_church,106,99,3	script	Happy Marry	67,{
+prt_church,106,99,3	script	Happy Marry	1_F_02,{
 	set @name$,"Marry";
 	if (getpartnerid() > 0) {
 		mes "["+@name$+"]";
@@ -489,7 +487,7 @@ function SF_Register {
 		mes "Very well, whom would you like to register as?";
 		next;
 		set @submenu, select("Groom","Bride","Cancel");
-	} else if (sex) { //Groom
+	} else if (Sex) { //Groom
 		mes "["+@name$+"]";
 		mes "Very well, will you register as the Groom?";
 		next;
@@ -543,13 +541,13 @@ function SF_WedProgress {
 	}
 	if (strcharinfo(0) == $wed_bride$) {
 		mes "["+@name$+"]";
-		if ($wed_groom_progress > 0) 
+		if ($wed_groom_progress > 0)
 			mes "The Priest will handle the rest of the ceremony.";
 		else
 			mes "Tell your groom to register, what is taking so long? Time is running out.";
 		close;
 	}
-	if (($wed_groom_progress == 0) && (sex == 1 || $@wed_allow == 1)) {
+	if (($wed_groom_progress == 0) && (Sex == 1 || $@wed_allow == 1)) {
 		mes "["+@name$+"]";
 		mes $wed_bride$+" is waiting for the groom to register. Are you the one who came to register as groom?";
 		next;
@@ -558,7 +556,7 @@ function SF_WedProgress {
 			stopnpctimer;
 			set $wed_groom_progress,1;
 			mes "["+@name$+"]";
-			mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin."; 
+			mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
 			emotion e_no1;
 			close2;
 			npctalk "Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
@@ -571,7 +569,7 @@ function SF_WedProgress {
 		}
 
 	}
-	if (($wed_bride_progress == 0) && (sex == 0 || $@wed_allow == 1)) {
+	if (($wed_bride_progress == 0) && (Sex == 0 || $@wed_allow == 1)) {
 		mes "["+@name$+"]";
 		mes $wed_groom$+" is waiting for the bride to register. Are you the one who came to register as the bride?";
 		next;
@@ -579,7 +577,7 @@ function SF_WedProgress {
 			SF_TryRegister(1);
 			stopnpctimer;
 			mes "["+@name$+"]";
-			mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin."; 
+			mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
 			emotion e_no1;
 			close2;
 			npctalk "Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
@@ -687,7 +685,7 @@ function SF_TryRegister {
 		emotion e_gasp;
 		close;
 	}
-	if (sex)
+	if (Sex)
 		set @item, 7170;
 	else
 		set @item, 2338;
@@ -697,7 +695,7 @@ function SF_TryRegister {
 		mes "You should be wearing a "+getitemname(@item)+" if you want to get married.";
 		close;
 	}
-	if (sex == 0 && $@wed_veil && getequipid(1) != 2206) {
+	if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) {
 		mes "["+@name$+"]";
 		mes "Where is your "+getitemname(2206)+"? It's a necessary complement to your dress.";
 		close;
@@ -709,27 +707,27 @@ function SF_TryRegister {
 	}
 	if (@bride)
 		set @cost, $@wed_bride_reg;
-	else 
+	else
 		set @cost, $@wed_groom_reg;
 
 	if (Zeny < @cost) {
 		mes "["+@name$+"]";
 		mes "I am sorry, but you don't have enough to pay for the registration fee.";
-		mes "Come back once you have collected "+@cost+"z."; 
+		mes "Come back once you have collected "+@cost+"z.";
 		close;
 	}
-	set Zeny,Zeny-@cost;
-	sc_start SC_Wedding,3600000000,1; //Start Wedding Effect (SC_WEDDING)
+	Zeny -= @cost;
+	sc_start SC_WEDDING,3600000,1; //Start Wedding Effect (SC_WEDDING)
 	if (@bride) {
 		set $wed_bride_progress,1;
 		set $wed_bride$,strcharinfo(0);
-		set $wed_bride_sex, sex;
+		set $wed_bride_sex, Sex;
 		if ($@wedding_effect == 1) //Store account id for effect.
 			set $wedding_effect_id, getcharid(3);
 	} else {
 		set $wed_groom_progress,1;
 		set $wed_groom$,strcharinfo(0);
-		set $wed_groom_sex, sex;
+		set $wed_groom_sex, Sex;
 		if ($@wedding_effect == 2) //Store account id for effect.
 			set $wedding_effect_id, getcharid(3);
 	}
@@ -811,7 +809,7 @@ function SF_Procedure {
 }
 }
 
-prt_church,94,99,4	script	Sister Lisa	79,{
+prt_church,94,99,4	script	Sister Lisa	1_F_PRIEST,{
 	set @name$,"Lisa";
 
 	function SF_DivorceEnd;
@@ -866,7 +864,7 @@ prt_church,94,99,4	script	Sister Lisa	79,{
 				mes "["+@name$+"]";
 				mes "You should think this through.";
 				close;
-			} 
+			}
 			mes "["+@name$+"]";
 			set $@divorcee,getpartnerid();
 			set $@divorcer$,strcharinfo(0);
@@ -879,7 +877,7 @@ prt_church,94,99,4	script	Sister Lisa	79,{
 end;
 
 function SF_InProgress {
-	if (strcharinfo(0) == $@divorcer$) { 
+	if (strcharinfo(0) == $@divorcer$) {
 		mes "["+@name$+"]";
 		mes "...I am still waiting for your partner to confirm the divorce procedure.";
 		close;
@@ -913,7 +911,7 @@ function SF_InProgress {
 		emotion e_swt2;
 		close;
 	}
-	set Zeny,Zeny-$@wed_divorce_fee;
+	Zeny -= $@wed_divorce_fee;
 	announce $@divorcer$+" has just divorced "+strcharinfo(0)+"...", 8;
 	mes "["+@name$+"]";
 	mes "Your divorce has been filed. You are no longer wed.";
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 52ffa115b..82f764977 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -4,8 +4,6 @@
 //= acky
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Players train monsters and battle other players.
 //= Experience can be earned and monsters upgraded.
@@ -24,7 +22,7 @@
 //============================================================
 
 // Entrance //
-prontera,158,193,6	script	Monster Arena	702,{
+prontera,158,193,6	script	Monster Arena	4_F_GON,{
 	mes "[Monster Arena]";
 	mes "Would you like to enter the Monster Arena?";
 	mes "Currently ^FF0000" + getmapusers("gon_test") + "^000000 players";
@@ -98,7 +96,7 @@ function	script	monstersummon	{
 }
 
 // Referee //
--	script	monsterreferee	61,{
+-	script	monsterreferee	1_M_PUBMASTER,{
 	if (@fighting == 1) end;
 	if (@battle == 1) goto L_Start;
 	end;
@@ -195,11 +193,11 @@ L_Exit:
 	mes "Alright";
 	close;
 }
-gon_test,56,91,6	duplicate(monsterreferee)	Referee#01	61
+gon_test,56,91,6	duplicate(monsterreferee)	Referee#01	1_M_PUBMASTER
 
 
 // Usher //
-gon_test,58,94,6	script	Usher	86,{
+gon_test,58,94,6	script	Usher	4_M_04,{
 	set @marena,1;
 	mes "[Usher]";
 	mes "What would you like to do?";
@@ -276,7 +274,7 @@ L_Cancel:
 }
 
 // Monster Trainer //
-gon_test,52,103,6	script	Monster Trainer	87,{
+gon_test,52,103,6	script	Monster Trainer	4_M_BARBER,{
 	mes "[Monster Trainer]";
 	if (#monster != 0) goto L_Mon;
 
@@ -290,8 +288,8 @@ gon_test,52,103,6	script	Monster Trainer	87,{
 	next;
 	menu "Yes",-,"No",L_Exit;
 
-	if (zeny < 1000) goto L_NoZeny;
-	set zeny,zeny-1000;
+	if (Zeny < 1000) goto L_NoZeny;
+	Zeny -= 1000;
 	set #monster,10;
 	mes "[Monster Trainer]";
 	mes "Congratulations!";
@@ -329,7 +327,7 @@ L_Sell:
 	if (@sellexp > #monpoints) goto L_NoExp;
 	set #monpoints,#monpoints-@sellexp;
 	set @sellearn,100*@sellexp; // Price of exp
-	set zeny,zeny+@sellearn;
+	Zeny += @sellearn;
 	mes "[Monster Trainer]";
 	mes "You earned ^0000FF" + @sellearn + "^000000z.";
 	close;
@@ -733,7 +731,7 @@ function	script	illegalkill	{
 }
 
 // Healer //
-gon_test,55,103,6	script	Nurse	90,{
+gon_test,55,103,6	script	Nurse	4_F_01,{
 	if (@battle == 1 || #heal == 0) goto L_NoHeal;
 	if (#heal == 1 && @healing < 100) goto L_Heal; //Total healing required
 	set @fighting,0;
@@ -754,14 +752,14 @@ L_NoHeal:
 }
 
 // Warps players //
-gon_test,57,86,5	script	Summon Pad 1::SummonPad	111,2,2,{
+gon_test,57,86,5	script	Summon Pad 1::SummonPad	HIDDEN_NPC,2,2,{
 	end;
 OnTouch:
 	set @marena,1;
 	warp "gon_test",57,99;
 }
-gon_test,43,87,5	duplicate(SummonPad)	Summon Pad 2	111,2,2
-gon_test,72,87,5	duplicate(SummonPad)	Summon Pad 3	111,2,2
+gon_test,43,87,5	duplicate(SummonPad)	Summon Pad 2	HIDDEN_NPC,2,2
+gon_test,72,87,5	duplicate(SummonPad)	Summon Pad 3	HIDDEN_NPC,2,2
 
 
 
@@ -769,7 +767,7 @@ gon_test,72,87,5	duplicate(SummonPad)	Summon Pad 3	111,2,2
 gon_test	mapflag	noskill
 
 // Duel Arena //
-gon_test,58,103,5	script	Duel Master#01	92,{
+gon_test,58,103,5	script	Duel Master#01	4_F_03,{
 	if ($@duelist1$ == "") set @duel,0;
 	if ($@monster1 == "") set @duel,0;
 	set @marena,1;
@@ -861,7 +859,7 @@ L_NeedHeal:
 }
 
 // Duel Exit //
-gon_test,42,8,5	script	Duel Master#02	92,{
+gon_test,42,8,5	script	Duel Master#02	4_F_03,{
 	mes "[Duel Master]";
 	mes "Would you like to return?";
 	menu "Yes",L_Leave,"No",-;
@@ -893,5 +891,5 @@ L_Leave2:
 	goto L_Leave3;
 }
 
-gon_test,49,5,5	duplicate(SummonPad)	Summon Pad 4	111,2,2
-gon_test,55,8,6	duplicate(monsterreferee)	Referee#02	61
+gon_test,49,5,5	duplicate(SummonPad)	Summon Pad 4	HIDDEN_NPC,2,2
+gon_test,55,8,6	duplicate(monsterreferee)	Referee#02	1_M_PUBMASTER
diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt
index 34614538a..48ee8e47e 100644
--- a/npc/custom/etc/morroc_raceway.txt
+++ b/npc/custom/etc/morroc_raceway.txt
@@ -4,8 +4,6 @@
 //= acky
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Lets players race around Morroc (pvp_y_1-5)
 //===== Additional Comments: =================================
@@ -21,7 +19,7 @@
 //============================================================
 
 //Warps you into race way
-morocc,166,105,6	script	Race Girl#01	116,{
+morocc,166,105,6	script	Race Girl#01	4_F_KAFRA2,{
 	mes "[Race Girl]";
 	mes "Would you like to visit ^0000FFMorroc Raceway^000000?";
 	next;
@@ -35,7 +33,7 @@ L_Warp:
 }
 
 //Warps you out of raceway
-pvp_y_1-5,169,265,5	script	Race Girl#02	116,{
+pvp_y_1-5,169,265,5	script	Race Girl#02	4_F_KAFRA2,{
 	mes "[Race Girl]";
 	mes "Welcome to Morroc Raceway!";
 	next;
@@ -58,7 +56,7 @@ L_Cancel:
 }
 
 //Counts down and starts race
-pvp_y_1-5,145,269,5	script	Starter	733,{
+pvp_y_1-5,145,269,5	script	Starter	4_M_JOB_KNIGHT1,{
 	if ($@race != 0) goto L_Started;
 	if ($@counting != 0) goto L_Started;
 	if ($@racecount == 1) goto L_Started;
@@ -112,7 +110,7 @@ OnInit:
 }
 
 //Checkpoint 1
-pvp_y_1-5,144,262,5	script	Check Point 1	111,0,5,{
+pvp_y_1-5,144,262,5	script	Check Point 1	HIDDEN_NPC,0,5,{
 	end;
 OnTouch:
 	if (@raceid != $@raceid) goto L_Started;
@@ -130,7 +128,7 @@ L_Finished:
 }
 
 //Checkpoint 2
-pvp_y_1-5,73,247,5	script	Check Point 2	111,6,6,{
+pvp_y_1-5,73,247,5	script	Check Point 2	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@race != 1) goto L_Miss;
@@ -143,7 +141,7 @@ L_Miss:
 }
 
 //Checkpoint 3
-pvp_y_1-5,77,44,5	script	Check Point 3	111,6,6,{
+pvp_y_1-5,77,44,5	script	Check Point 3	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@race != 2) goto L_Miss;
@@ -156,7 +154,7 @@ L_Miss:
 }
 
 //Checkpoint 3
-pvp_y_1-5,249,60,5	script	Check Point 4	111,6,6,{
+pvp_y_1-5,249,60,5	script	Check Point 4	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@race != 3) goto L_Miss;
@@ -169,7 +167,7 @@ L_Miss:
 }
 
 //Checkpoint 4
-pvp_y_1-5,255,256,5	script	Check Point 5	111,6,6,{
+pvp_y_1-5,255,256,5	script	Check Point 5	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@race != 4) goto L_Miss;
@@ -182,7 +180,7 @@ L_Miss:
 }
 
 //Finish Line
-pvp_y_1-5,174,244,5	script	Finish Line	111,6,6,{
+pvp_y_1-5,174,244,5	script	Finish Line	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@raceid != $@raceid) goto L_WrongRace;
@@ -200,39 +198,39 @@ L_WrongRace:
 }
 
 //Check Point Marker Flags
-pvp_y_1-5,144,267,4	script	Check Point 1#01	722,{
+pvp_y_1-5,144,267,4	script	Check Point 1#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,144,257,4	script	Check Point 1#02	722,{
+pvp_y_1-5,144,257,4	script	Check Point 1#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,70,252,3	script	Check Point 2#01	722,{
+pvp_y_1-5,70,252,3	script	Check Point 2#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,77,243,3	script	Check Point 2#02	722,{
+pvp_y_1-5,77,243,3	script	Check Point 2#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,81,48,1	script	Check Point 3#01	722,{
+pvp_y_1-5,81,48,1	script	Check Point 3#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,72,40,1	script	Check Point 3#02	722,{
+pvp_y_1-5,72,40,1	script	Check Point 3#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,244,65,7	script	Check Point 4#01	722,{
+pvp_y_1-5,244,65,7	script	Check Point 4#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,252,57,7	script	Check Point 4#02	722,{
+pvp_y_1-5,252,57,7	script	Check Point 4#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,259,260,5	script	Check Point 5#01	722,{
+pvp_y_1-5,259,260,5	script	Check Point 5#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,251,252,5	script	Check Point 5#02	722,{
+pvp_y_1-5,251,252,5	script	Check Point 5#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,174,249,4	script	Finish Line#01	722,{
+pvp_y_1-5,174,249,4	script	Finish Line#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,174,238,4	script	Finish Line#02	722,{
+pvp_y_1-5,174,238,4	script	Finish Line#02	GUILD_FLAG,{
 	end;
 }
diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt
index d95ed7621..3a1249274 100644
--- a/npc/custom/etc/mvp_arena.txt
+++ b/npc/custom/etc/mvp_arena.txt
@@ -4,8 +4,6 @@
 //= Darkchild
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Rooms containing 16 different MVPs
 //===== Additional Comments: =================================
@@ -17,7 +15,7 @@
 //============================================================
 
 // Entrance
-prontera,154,197,3	script	MVP Warper	768,{
+prontera,154,197,3	script	MVP Warper	8_M_JPNMASTER,{
 	mes "[ ^0065DFMVP Warper^000000 ]";
 	mes "Would you like to enter";
 	mes "the MVP Arena?";
@@ -27,7 +25,7 @@ prontera,154,197,3	script	MVP Warper	768,{
 }
 
 // Information
-quiz_00,49,31,4	script	MVP Arena Guide	778,{
+quiz_00,49,31,4	script	MVP Arena Guide	4_M_TWTEAMAN,{
 	mes "[ ^0065DFMVP Arena Guide^000000 ]";
 	mes "Welcome and behold this sacred place. Here you will find out if you truly have what it takes to call yourself a warrior.";
 	next;
@@ -66,10 +64,10 @@ function	script	Keeper	{
 	warp "pvp_n_"+.@i+"-"+getarg(0),102,102;
 	close;
 }
-quiz_00,56,31,4	script	Alpha MVP	770,{ callfunc "Keeper",2; }
-quiz_00,58,31,4	script	Beta MVP	773,{ callfunc "Keeper",3; }
-quiz_00,60,31,4	script	Theta MVP	774,{ callfunc "Keeper",4; }
-quiz_00,62,31,4	script	Epsilon MVP	776,{ callfunc "Keeper",5; }
+quiz_00,56,31,4	script	Alpha MVP	4_F_TWGIRL,{ callfunc "Keeper",2; }
+quiz_00,58,31,4	script	Beta MVP	4_F_TWMIDWOMAN,{ callfunc "Keeper",3; }
+quiz_00,60,31,4	script	Theta MVP	4_M_TWBOY,{ callfunc "Keeper",4; }
+quiz_00,62,31,4	script	Epsilon MVP	4_M_TWMIDMAN,{ callfunc "Keeper",5; }
 
 // Protectors
 function	script	Protector	{
@@ -87,38 +85,38 @@ function	script	Protector	{
 		end;
 	}
 }
-pvp_n_1-2,100,100,4	script	MVP-Protector#01	727,{ callfunc "Protector","pvp_n_2-2"; }
-pvp_n_2-2,100,100,4	script	MVP-Protector#02	727,{ callfunc "Protector","pvp_n_3-2"; }
-pvp_n_3-2,100,100,4	script	MVP-Protector#03	727,{ callfunc "Protector","pvp_n_4-2"; }
-pvp_n_4-2,100,100,4	script	MVP-Protector#04	727,{ callfunc "Protector","pvp_n_5-2"; }
-pvp_n_5-2,100,100,4	script	MVP-Protector#05	727,{ callfunc "Protector","pvp_n_6-2"; }
-pvp_n_6-2,100,100,4	script	MVP-Protector#06	727,{ callfunc "Protector","pvp_n_7-2"; }
-pvp_n_7-2,100,100,4	script	MVP-Protector#07	727,{ callfunc "Protector","pvp_n_8-2"; }
-pvp_n_8-2,100,100,4	script	MVP-Protector#08	727,{ callfunc "Protector",""; }
-pvp_n_1-3,100,100,4	script	MVP-Protector#09	727,{ callfunc "Protector","pvp_n_2-3"; }
-pvp_n_2-3,100,100,4	script	MVP-Protector#10	727,{ callfunc "Protector","pvp_n_3-3"; }
-pvp_n_3-3,100,100,4	script	MVP-Protector#11	727,{ callfunc "Protector","pvp_n_4-3"; }
-pvp_n_4-3,100,100,4	script	MVP-Protector#12	727,{ callfunc "Protector","pvp_n_5-3"; }
-pvp_n_5-3,100,100,4	script	MVP-Protector#13	727,{ callfunc "Protector","pvp_n_6-3"; }
-pvp_n_6-3,100,100,4	script	MVP-Protector#14	727,{ callfunc "Protector","pvp_n_7-3"; }
-pvp_n_7-3,100,100,4	script	MVP-Protector#15	727,{ callfunc "Protector","pvp_n_8-3"; }
-pvp_n_8-3,100,100,4	script	MVP-Protector#16	727,{ callfunc "Protector",""; }
-pvp_n_1-4,100,100,4	script	MVP-Protector#17	727,{ callfunc "Protector","pvp_n_2-4"; }
-pvp_n_2-4,100,100,4	script	MVP-Protector#18	727,{ callfunc "Protector","pvp_n_3-4"; }
-pvp_n_3-4,100,100,4	script	MVP-Protector#19	727,{ callfunc "Protector","pvp_n_4-4"; }
-pvp_n_4-4,100,100,4	script	MVP-Protector#20	727,{ callfunc "Protector","pvp_n_5-4"; }
-pvp_n_5-4,100,100,4	script	MVP-Protector#21	727,{ callfunc "Protector","pvp_n_6-4"; }
-pvp_n_6-4,100,100,4	script	MVP-Protector#22	727,{ callfunc "Protector","pvp_n_7-4"; }
-pvp_n_7-4,100,100,4	script	MVP-Protector#23	727,{ callfunc "Protector","pvp_n_8-4"; }
-pvp_n_8-4,100,100,4	script	MVP-Protector#24	727,{ callfunc "Protector",""; }
-pvp_n_1-5,100,100,4	script	MVP-Protector#25	727,{ callfunc "Protector","pvp_n_2-5"; }
-pvp_n_2-5,100,100,4	script	MVP-Protector#26	727,{ callfunc "Protector","pvp_n_3-5"; }
-pvp_n_3-5,100,100,4	script	MVP-Protector#27	727,{ callfunc "Protector","pvp_n_4-5"; }
-pvp_n_4-5,100,100,4	script	MVP-Protector#28	727,{ callfunc "Protector","pvp_n_5-5"; }
-pvp_n_5-5,100,100,4	script	MVP-Protector#29	727,{ callfunc "Protector","pvp_n_6-5"; }
-pvp_n_6-5,100,100,4	script	MVP-Protector#30	727,{ callfunc "Protector","pvp_n_7-5"; }
-pvp_n_7-5,100,100,4	script	MVP-Protector#31	727,{ callfunc "Protector","pvp_n_8-5"; }
-pvp_n_8-5,100,100,4	script	MVP-Protector#32	727,{ callfunc "Protector",""; }
+pvp_n_1-2,100,100,4	script	MVP-Protector#01	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-2"; }
+pvp_n_2-2,100,100,4	script	MVP-Protector#02	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-2"; }
+pvp_n_3-2,100,100,4	script	MVP-Protector#03	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-2"; }
+pvp_n_4-2,100,100,4	script	MVP-Protector#04	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-2"; }
+pvp_n_5-2,100,100,4	script	MVP-Protector#05	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-2"; }
+pvp_n_6-2,100,100,4	script	MVP-Protector#06	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-2"; }
+pvp_n_7-2,100,100,4	script	MVP-Protector#07	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-2"; }
+pvp_n_8-2,100,100,4	script	MVP-Protector#08	4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-3,100,100,4	script	MVP-Protector#09	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-3"; }
+pvp_n_2-3,100,100,4	script	MVP-Protector#10	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-3"; }
+pvp_n_3-3,100,100,4	script	MVP-Protector#11	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-3"; }
+pvp_n_4-3,100,100,4	script	MVP-Protector#12	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-3"; }
+pvp_n_5-3,100,100,4	script	MVP-Protector#13	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-3"; }
+pvp_n_6-3,100,100,4	script	MVP-Protector#14	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-3"; }
+pvp_n_7-3,100,100,4	script	MVP-Protector#15	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-3"; }
+pvp_n_8-3,100,100,4	script	MVP-Protector#16	4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-4,100,100,4	script	MVP-Protector#17	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-4"; }
+pvp_n_2-4,100,100,4	script	MVP-Protector#18	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-4"; }
+pvp_n_3-4,100,100,4	script	MVP-Protector#19	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-4"; }
+pvp_n_4-4,100,100,4	script	MVP-Protector#20	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-4"; }
+pvp_n_5-4,100,100,4	script	MVP-Protector#21	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-4"; }
+pvp_n_6-4,100,100,4	script	MVP-Protector#22	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-4"; }
+pvp_n_7-4,100,100,4	script	MVP-Protector#23	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-4"; }
+pvp_n_8-4,100,100,4	script	MVP-Protector#24	4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-5,100,100,4	script	MVP-Protector#25	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-5"; }
+pvp_n_2-5,100,100,4	script	MVP-Protector#26	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-5"; }
+pvp_n_3-5,100,100,4	script	MVP-Protector#27	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-5"; }
+pvp_n_4-5,100,100,4	script	MVP-Protector#28	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-5"; }
+pvp_n_5-5,100,100,4	script	MVP-Protector#29	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-5"; }
+pvp_n_6-5,100,100,4	script	MVP-Protector#30	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-5"; }
+pvp_n_7-5,100,100,4	script	MVP-Protector#31	4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-5"; }
+pvp_n_8-5,100,100,4	script	MVP-Protector#32	4_F_JOB_HUNTER,{ callfunc "Protector",""; }
 
 // Alpha
 pvp_n_1-2,0,0,0,0	monster	Eddga	1115,3,60000,66000
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index 414458cb9..e78833b66 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -1,11 +1,9 @@
 //===== Hercules Script ======================================
-//= Penal Servitude 
+//= Penal Servitude
 //===== By: ==================================================
 //= Lupus
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= A simple Penal Servitude Script.
 //= It could cheer up your prisoners a bit.
@@ -16,10 +14,10 @@
 // 1.2 Stricted the conditions a bit
 //============================================================
 
-sec_pri,36,58,1	script	Chief Warder	105,{ 
+sec_pri,36,58,1	script	Chief Warder	8W_SOLDIER,{
 	mes "[Saddeus]";
 	emotion 1;
-	if(sex) {
+	if(Sex) {
 		mes "Mr. Prisoner #"+BaseLevel+JobLevel+",";
 	} else {
 		mes "Ms. Prisoner #"+BaseLevel+JobLevel+",";
@@ -45,7 +43,7 @@ M_PAY:
 
 M_PAYCASH:
 	if (@MUSTPAY>Zeny) goto L_NOCASH;
-	set Zeny,Zeny-@MUSTPAY;
+	Zeny -= @MUSTPAY;
 	mes "[Saddeus]";
 	mes "OK, sing here and there.";
 	goto L_RELEASE;
@@ -122,14 +120,14 @@ L_W4:
 	close;
 
 M_NO_THANKS:
-	mes "[Saddeus]";  
+	mes "[Saddeus]";
 	if (rand(2)) mes "Is today X-Mas time, huh?";
 	mes "Now shut up and back off!";
 	if (rand(2)) emotion 23;
-	close;  
+	close;
 }
 
-sec_in02,137,57,1	script	Overseer	708,{ 
+sec_in02,137,57,1	script	Overseer	4_M_PAY_SOLDIER,{
 	mes "[Oliver]";
 
 	delitem 4002,countitem(4002);//Items: Fabre_Card,
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index 840325636..b9bfcf74f 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -4,8 +4,6 @@
 //= DZeroX, Darkchild, Neouni
 //===== Current Version: =====================================
 //= 2.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warper that works only after locations are unlocked.
 //===== Additional Comments: =================================
@@ -96,7 +94,7 @@ function	script	Q_Warpra	{
 	case 10: goto L_GStorage;
 	case 11:
 	default:
-		goto L_end;
+		goto L_End;
 	}
 
 //=====================GM-Menu=Functions===========================
@@ -322,14 +320,14 @@ L_town:
 	freeloop(0);
 	set @TWMenu,select(.@menu$);
 
-	if (@Tmenuref[@TWMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+	if (@Tmenuref[@TWMenu-1] == 57005) goto L_End; // 57005='dead' in hex
 
 	if(Zeny<@pTprice[@Tmenuref[@TWMenu-1]]) callsub L_Short_on_zeny,0;
-	set Zeny, Zeny-@pTprice[@Tmenuref[@TWMenu-1]];
+	Zeny -= @pTprice[@Tmenuref[@TWMenu-1]];
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@pTprice[@Tmenuref[@TWMenu-1]]/16);
 	warp @pTmap$[@Tmenuref[@TWMenu-1]],@pTXcoords[@Tmenuref[@TWMenu-1]],@pTYcoords[@Tmenuref[@TWMenu-1]];
 	close2;
-	set Zeny, Zeny+@pTprice[@Tmenuref[@TWMenu-1]];
+	Zeny += @pTprice[@Tmenuref[@TWMenu-1]];
 	end;
 
 //=========================Dungeons================================
@@ -343,7 +341,7 @@ L_dungeon:
 	freeloop(0);
 	set @DWMenu,select(.@menu$);
 
-	if (@Dmenuref[@DWMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+	if (@Dmenuref[@DWMenu-1] == 57005) goto L_End; // 57005='dead' in hex
 	set @DwarpMenu, (@Dmenuref[@DWMenu-1]);
 	callfunc "QWS_DLarray";
 
@@ -357,17 +355,17 @@ L_dungeon:
 	freeloop(0);
 	set @DWLMenu,select(.@menu$);
 
-	if (@DWLmenuref[@DWLMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+	if (@DWLmenuref[@DWLMenu-1] == 57005) goto L_End; // 57005='dead' in hex
 
 	set @Darrayref, @DWLmenuref[@DWLMenu-1];
 	set @warpprice, @pDprice[@Dmenuref[@DWMenu-1]]+(getd(@pDfee$[@Dmenuref[@DWMenu-1]])*(@DDepth[@Darrayref]));
 
 	if(Zeny<@warpprice) callsub L_Short_on_zeny,1;
-	set Zeny, Zeny-(@warpprice);
+	Zeny -= (@warpprice);
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@warpprice/16);
 	warp @DGat$[@Darrayref],@DXcoords[@Darrayref],@DYcoords[@Darrayref];
 	close2;
-	set Zeny, Zeny+@pTprice[@Tmenuref[@DWMenu-1]];
+	Zeny += @pTprice[@Tmenuref[@DWMenu-1]];
 	end;
 
 //=============================Healing=============================
@@ -375,7 +373,7 @@ L_dungeon:
 L_heal_Full:
 	set @healfee, $QW_HF_PRICE;
 	if(Zeny<@healfee) callsub L_Short_on_zeny,4;
-	set Zeny, Zeny-@healfee;
+	Zeny -= @healfee;
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@healfee/500);
 	next;
 	mes "[Warpra]";
@@ -389,28 +387,28 @@ L_heal_Part:
 	if (@healchoice == 1) callsub PHeal,1,1;
 	if (@healchoice == 2) callsub PHeal,1,0;
 	if (@healchoice == 3) callsub PHeal,0,1;
-	goto L_end;
+	goto L_End;
 	
 PHeal:
 	next;
 	set @Hp, MaxHp-Hp;
 	set @Sp, MaxSp-Sp;
-	set @HpPrice, @hp*$QW_HP_H_PRICE;
-	set @SpPrice, @sp*$QW_HP_S_PRICE;
+	set @HpPrice, @Hp*$QW_HP_H_PRICE;
+	set @SpPrice, @Sp*$QW_HP_S_PRICE;
 	mes "[Warpra]";
 	if(getarg(0) == 1) mes ""+@HpPrice+" Zeny for "+@Hp+" health points";
 	if(getarg(1) == 1) mes ""+@SpPrice+" Zeny for "+@Sp+" skill points";
 	set @total, @HpPrice+@SpPrice;
 	mes "for a total of "+@total+" zeny";
-    	if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
-    	
-    	if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
+	if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
+
+	if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
 	if(getarg(1) == 1)set @SpPrice, (MaxSp-Sp)*$QW_HP_S_PRICE;
 	set @healfee, @HpPrice+@SpPrice;
 	if (getarg(0) == 1)&&(getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_Short_Both;
 	if (getarg(0) == 1)&&(Zeny<@healfee) goto Zeny_short_HP;
 	if (getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_short_SP;
-	set Zeny, Zeny-@healfee;
+	Zeny -= @healfee;
 	if (getarg(0) == 1)&&(getarg(1) == 1) percentheal 100,100;
 	if (getarg(0) == 1) percentheal 100,0;
 	if (getarg(1) == 1) percentheal 0,100;
@@ -421,18 +419,18 @@ Zeny_Short_Both:
 	mes "[Warpra]";
 	mes "Choose another option, you can afford both.";
 	mes "I can heal as much as you can afford, too.";
-	if (select("OK","Exit") == 2) goto L_end;
+	if (select("OK","Exit") == 2) goto L_End;
 	goto PHeal;
 
 Zeny_short_HP:
 	mes "[Warpra]";
 	mes "Do you want me to partly heal your HP?";
-	if (select("Yes","No") == 2) goto L_end;
+	if (select("Yes","No") == 2) goto L_End;
 	set @Hp, Zeny/$QW_HP_H_PRICE;
-    	set @HpPrice, @Hp*$QW_HP_H_PRICE;
-    	if (@Hp == 1) mes "You're not worth the effort.";
-    	if (@Hp == 1) goto L_end;
-    	set Zeny, Zeny-@HpPrice;
+	set @HpPrice, @Hp*$QW_HP_H_PRICE;
+	if (@Hp == 1) mes "You're not worth the effort.";
+	if (@Hp == 1) goto L_End;
+	Zeny -= @HpPrice;
 	heal @Hp,0;
 	close;
 	end;
@@ -440,12 +438,12 @@ Zeny_short_HP:
 Zeny_short_SP:
 	mes "[Warpra]";
 	mes "Do you want me to partly heal your SP?";
-	if (select("Yes","No") == 2) goto L_end;
+	if (select("Yes","No") == 2) goto L_End;
 	set @Sp, Zeny/$QW_HP_S_PRICE;
-    	set @SpPrice, @Sp*$QW_HP_S_PRICE;
-    	if (@Sp == 1) mes "You're not worth the effort.";
-    	if (@Sp == 1) goto L_end;
-    	set Zeny, Zeny-@SpPrice;
+	set @SpPrice, @Sp*$QW_HP_S_PRICE;
+	if (@Sp == 1) mes "You're not worth the effort.";
+	if (@Sp == 1) goto L_End;
+	Zeny -= @SpPrice;
 	heal 0,@Sp;
 	close;
 	end;
@@ -459,7 +457,7 @@ L_Storage:
 	if ($QW_S_PRICE == 60)&&(BaseJob == Job_Novice) set @fee, 30;
 	if ($QW_S_PRICE == 60)&&(BaseJob != Job_Novice) set @fee, 60;
 	if(Zeny<@fee) callsub L_Short_on_zeny,2;
-	set Zeny, Zeny-@fee;
+	Zeny -= @fee;
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@fee/5);
 
 	mes "[Warpra]";
@@ -493,16 +491,16 @@ L_GStorage:
 		end;
 	}
 	if (Zeny<$QW_GS_PRICE) callsub L_Short_on_zeny,3;
-	set Zeny, Zeny-$QW_GS_PRICE;
+	Zeny -= $QW_GS_PRICE;
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + ($QW_GS_PRICE/5);
 	next;
 	mes "[Warpra]";
-	mes "Close this window and I will open the ^5533FF" + GetGuildName(@GID) + "^000000 storage.";
+	mes "Close this window and I will open the ^5533FF" + getguildname(@GID) + "^000000 storage.";
 	close2;
 	guildopenstorage;
 	end;
 	
-L_end:
+L_End:
 	close;
 	end;
 
@@ -680,7 +678,7 @@ function	script	QWS_MMarray	{
 //	QWS_Make_Town_Menu 0;	// Use a free number (last used is 30, Eclage)
 //
 // Adding a warpra:
-//	map,x,y,facing	script	Warpra#example	113,{
+//	map,x,y,facing	script	Warpra#example	4_F_KAFRA5,{
 //		callfunc "QWS_Town_Warpra",<town number>,"Your Town";
 //		close;
 //	}
@@ -1024,7 +1022,7 @@ menu_item:
 //	QWS_Make_Dungeon_Menu 0;	// Use a free number (last used is 28, Kiel Dungeon)
 //
 // Adding a warpra:
-//	map,x,y,facing	script	Warpra Helper#example	112,{
+//	map,x,y,facing	script	Warpra Helper#example	4_F_KAFRA6,{
 //		callfunc "QWS_Dungeon_Warpra",<dungeon number>,"Your Dungeon";
 //		close;
 //	}
@@ -1067,7 +1065,7 @@ function	script	QWS_Darray	{
 	QWS_Make_Dungeon_Menu 1;
 
 //----------------ANT HELL
-	setarray @pDmenuitems$[@Di], "Ant Hell Dungeon"; 
+	setarray @pDmenuitems$[@Di], "Ant Hell Dungeon";
 	setarray @pDprice[@Di], $QW_BW_PRICE;
 	setarray @pDfee$[@Di], "$QW_BW_FEE";
 	setarray @DLevels[2], 2;
@@ -1614,79 +1612,79 @@ binget:
 //============================Warpras==============================
 
 -	script	Warpra#0	-1,{ callfunc "Q_Warpra",1; }
-alb2trea,73,101,4	duplicate(Warpra#0)	Warpra#1	113
-ama_fild01,178,325,1	duplicate(Warpra#0)	Warpra#2	113
-gef_fild10,71,339,4	duplicate(Warpra#0)	Warpra#3	113
-izlu2dun,104,82,4	duplicate(Warpra#0)	Warpra#4	113
-mjolnir_02,85,363,4	duplicate(Warpra#0)	Warpra#5	113
-moc_fild04,207,331,4	duplicate(Warpra#0)	Warpra#6	113
-moc_fild19,106,97,4	duplicate(Warpra#0)	Warpra#7	113
-moc_ruins,64,166,4	duplicate(Warpra#0)	Warpra#8	113
-niflheim,197,192,3	duplicate(Warpra#0)	Warpra#9	113
-pay_arche,39,135,4	duplicate(Warpra#0)	Warpra#10	113
-prt_fild05,273,215,4	duplicate(Warpra#0)	Warpra#11	113
-tur_dun01,148,239,4	duplicate(Warpra#0)	Warpra#12	113
-valkyrie,48,35,8	duplicate(Warpra#0)	Warpra#13	113
-yuno_fild03,37,135,4	duplicate(Warpra#0)	Warpra#14	113
-
-alberta,32,240,4	script	Warpra#15	113,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; }
-aldebaran,146,118,4	script	Warpra#16	113,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; }
-ayothaya,216,171,5	script	Warpra#17	113,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; }
-amatsu,193,81,1	script	Warpra#18	113,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; }
-comodo,195,158,4	script	Warpra#19	113,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; }
-einbroch,229,196,5	script	Warpra#20	113,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; }
-einbech,173,131,5	script	Warpra#21	113,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; }
-geffen,116,66,4	script	Warpra#22	113,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; }
-gonryun,152,130,4	script	Warpra#23	113,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; }
-hugel,90,127,5	script	Warpra#24	113,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; }
-jawaii,107,182,5	script	Warpra#25	113,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; }
-izlude,132,116,4	script	Warpra#26	113,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; }
-lighthalzen,153,100,5	script	Warpra#27	113,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; }
-louyang,211,106,4	script	Warpra#28	113,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; }
-morocc,157,95,4	script	Warpra#29	113,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; }
-nif_fild01,319,77,1	script	Warpra#30	113,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; }
-payon,183,110,4	script	Warpra#31	113,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; }
-prontera,147,172,5	script	Warpra#32	113,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; }
-umbala,133,130,4	script	Warpra#33	113,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; }
-xmas,151,136,4	script	Warpra#34	113,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; }
-yuno,138,162,4	script	Warpra#35	113,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; }
-brasilis,201,222,4	script	Warpra#36	113,{ callfunc "QWS_Town_Warpra",21,"Brasilis Town"; close; }
-dicastes01,194,194,6	script	Warpra#37	113,{ callfunc "QWS_Town_Warpra",22,"El Dicastes Town"; close; }
-manuk,262,177,4	script	Warpra#38	113,{ callfunc "QWS_Town_Warpra",23,"Manuk Town"; close; }
-mora,110,100,4	script	Warpra#39	113,{ callfunc "QWS_Town_Warpra",24,"Mora Town"; close; }
-moscovia,216,196,6	script	Warpra#40	113,{ callfunc "QWS_Town_Warpra",25,"Moscovia Town"; close; }
-rachel,135,116,4	script	Warpra#41	113,{ callfunc "QWS_Town_Warpra",26,"Rachel Town"; close; }
-splendide,205,153,4	script	Warpra#42	113,{ callfunc "QWS_Town_Warpra",27,"Splendide Town"; close; }
-veins,214,123,4	script	Warpra#43	113,{ callfunc "QWS_Town_Warpra",28,"Veins Town"; close; }
-dewata,194,178,6	script	Warpra#44	113,{ callfunc "QWS_Town_Warpra",29,"Dewata Town"; close; }
-eclage,107,37,4	script	Warpra#45	113,{ callfunc "QWS_Town_Warpra",30,"Eclage Town"; close; }
-
-abyss_02,274,266,1	script	Warpra Helper#0	112,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; }
-ama_dun02,192,118,5	script	Warpra Helper#1	112,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; }
-anthell02,170,165,3	script	Warpra Helper#2	112,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; }
-ayo_dun02,258,193,5	script	Warpra Helper#3	112,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; }
-ein_dun02,292,282,1	script	Warpra Helper#4	112,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; }
-iz_dun03,202,47,2	script	Warpra Helper#5	112,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; }
-c_tower3,129,106,4	script	Warpra Helper#6	112,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; }
-mjo_dun02,39,25,4	script	Warpra Helper#7	112,{ callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon"; close; }
-prt_sewb2,176,30,3	script	Warpra Helper#8	112,{ callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon"; close; }
-gefenia03,137,34,0	script	Warpra Helper#9	112,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; }
-gef_dun02,218,61,2	script	Warpra Helper#10	112,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; }
-glast_01,371,308,3	script	Warpra Helper#11	112,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; }
-gon_dun01,167,273,4	script	Warpra Helper#12	112,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; }
-juperos_02,127,154,5	script	Warpra Helper#13	112,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; }
-kh_dun01,14,224,3	script	Warpra Helper#14	112,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; }
-lhz_dun02,156,151,5	script	Warpra Helper#15	112,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; }
-lou_dun02,168,264,4	script	Warpra Helper#16	112,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; }
-mag_dun02,46,41,3	script	Warpra Helper#17	112,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; }
-odin_tem01,115,148,3	script	Warpra Helper#18	112,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; }
-orcsdun01,185,11,3	script	Warpra Helper#19	112,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; }
-pay_dun03,162,143,3	script	Warpra Helper#20	112,{ callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon"; close; }
-moc_pryd02,101,95,3	script	Warpra Helper#21	112,{ callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon"; close; }
-in_sphinx2,274,268,1	script	Warpra Helper#22	112,{ callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon"; close; }
-tha_t07,111,162,3	script	Warpra Helper#23	112,{ callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower"; close; }
-treasure02,104,40,3	script	Warpra Helper#24	112,{ callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon"; close; }
-xmas_dun02,124,131,3	script	Warpra Helper#25	112,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; }
-um_dun02,44,28,3	script	Warpra Helper#26	112,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; }
-tur_dun02,162,23,3	script	Warpra Helper#27	112,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; }
-prt_maze02,102,69,4	script	Warpra Helper#28	112,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; }
\ No newline at end of file
+alb2trea,73,101,4	duplicate(Warpra#0)	Warpra#1	4_F_KAFRA5
+ama_fild01,178,325,1	duplicate(Warpra#0)	Warpra#2	4_F_KAFRA5
+gef_fild10,71,339,4	duplicate(Warpra#0)	Warpra#3	4_F_KAFRA5
+izlu2dun,104,82,4	duplicate(Warpra#0)	Warpra#4	4_F_KAFRA5
+mjolnir_02,85,363,4	duplicate(Warpra#0)	Warpra#5	4_F_KAFRA5
+moc_fild04,207,331,4	duplicate(Warpra#0)	Warpra#6	4_F_KAFRA5
+moc_fild19,106,97,4	duplicate(Warpra#0)	Warpra#7	4_F_KAFRA5
+moc_ruins,64,166,4	duplicate(Warpra#0)	Warpra#8	4_F_KAFRA5
+niflheim,197,192,3	duplicate(Warpra#0)	Warpra#9	4_F_KAFRA5
+pay_arche,39,135,4	duplicate(Warpra#0)	Warpra#10	4_F_KAFRA5
+prt_fild05,273,215,4	duplicate(Warpra#0)	Warpra#11	4_F_KAFRA5
+tur_dun01,148,239,4	duplicate(Warpra#0)	Warpra#12	4_F_KAFRA5
+valkyrie,48,35,8	duplicate(Warpra#0)	Warpra#13	4_F_KAFRA5
+yuno_fild03,37,135,4	duplicate(Warpra#0)	Warpra#14	4_F_KAFRA5
+
+alberta,32,240,4	script	Warpra#15	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; }
+aldebaran,146,118,4	script	Warpra#16	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; }
+ayothaya,216,171,5	script	Warpra#17	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; }
+amatsu,193,81,1	script	Warpra#18	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; }
+comodo,195,158,4	script	Warpra#19	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; }
+einbroch,229,196,5	script	Warpra#20	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; }
+einbech,173,131,5	script	Warpra#21	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; }
+geffen,116,66,4	script	Warpra#22	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; }
+gonryun,152,130,4	script	Warpra#23	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; }
+hugel,90,127,5	script	Warpra#24	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; }
+jawaii,107,182,5	script	Warpra#25	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; }
+izlude,132,116,4	script	Warpra#26	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; }
+lighthalzen,153,100,5	script	Warpra#27	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; }
+louyang,211,106,4	script	Warpra#28	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; }
+morocc,157,95,4	script	Warpra#29	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; }
+nif_fild01,319,77,1	script	Warpra#30	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; }
+payon,183,110,4	script	Warpra#31	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; }
+prontera,147,172,5	script	Warpra#32	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; }
+umbala,133,130,4	script	Warpra#33	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; }
+xmas,151,136,4	script	Warpra#34	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; }
+yuno,138,162,4	script	Warpra#35	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; }
+brasilis,201,222,4	script	Warpra#36	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",21,"Brasilis Town"; close; }
+dicastes01,194,194,6	script	Warpra#37	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",22,"El Dicastes Town"; close; }
+manuk,262,177,4	script	Warpra#38	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",23,"Manuk Town"; close; }
+mora,110,100,4	script	Warpra#39	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",24,"Mora Town"; close; }
+moscovia,216,196,6	script	Warpra#40	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",25,"Moscovia Town"; close; }
+rachel,135,116,4	script	Warpra#41	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",26,"Rachel Town"; close; }
+splendide,205,153,4	script	Warpra#42	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",27,"Splendide Town"; close; }
+veins,214,123,4	script	Warpra#43	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",28,"Veins Town"; close; }
+dewata,194,178,6	script	Warpra#44	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",29,"Dewata Town"; close; }
+eclage,107,37,4	script	Warpra#45	4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",30,"Eclage Town"; close; }
+
+abyss_02,274,266,1	script	Warpra Helper#0	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; }
+ama_dun02,192,118,5	script	Warpra Helper#1	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; }
+anthell02,170,165,3	script	Warpra Helper#2	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; }
+ayo_dun02,258,193,5	script	Warpra Helper#3	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; }
+ein_dun02,292,282,1	script	Warpra Helper#4	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; }
+iz_dun03,202,47,2	script	Warpra Helper#5	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; }
+c_tower3,129,106,4	script	Warpra Helper#6	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; }
+mjo_dun02,39,25,4	script	Warpra Helper#7	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon"; close; }
+prt_sewb2,176,30,3	script	Warpra Helper#8	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon"; close; }
+gefenia03,137,34,0	script	Warpra Helper#9	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; }
+gef_dun02,218,61,2	script	Warpra Helper#10	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; }
+glast_01,371,308,3	script	Warpra Helper#11	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; }
+gon_dun01,167,273,4	script	Warpra Helper#12	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; }
+juperos_02,127,154,5	script	Warpra Helper#13	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; }
+kh_dun01,14,224,3	script	Warpra Helper#14	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; }
+lhz_dun02,156,151,5	script	Warpra Helper#15	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; }
+lou_dun02,168,264,4	script	Warpra Helper#16	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; }
+mag_dun02,46,41,3	script	Warpra Helper#17	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; }
+odin_tem01,115,148,3	script	Warpra Helper#18	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; }
+orcsdun01,185,11,3	script	Warpra Helper#19	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; }
+pay_dun03,162,143,3	script	Warpra Helper#20	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon"; close; }
+moc_pryd02,101,95,3	script	Warpra Helper#21	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon"; close; }
+in_sphinx2,274,268,1	script	Warpra Helper#22	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon"; close; }
+tha_t07,111,162,3	script	Warpra Helper#23	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower"; close; }
+treasure02,104,40,3	script	Warpra Helper#24	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon"; close; }
+xmas_dun02,124,131,3	script	Warpra Helper#25	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; }
+um_dun02,44,28,3	script	Warpra Helper#26	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; }
+tur_dun02,162,23,3	script	Warpra Helper#27	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; }
+prt_maze02,102,69,4	script	Warpra Helper#28	4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; }
diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt
index 87048a97b..22123580d 100644
--- a/npc/custom/etc/rpsroulette.txt
+++ b/npc/custom/etc/rpsroulette.txt
@@ -4,8 +4,6 @@
 //= acky
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Plays a hybrid Russian Roulette Rock Scissors Paper game.
 //===== Additional Comments: =================================
@@ -13,12 +11,12 @@
 //= 1.2 Fixes by Blackthunder and me [Poki#3]
 //============================================================
 
-cmd_in02,182,126,2	script	Crazy Boris	85,{
+cmd_in02,182,126,2	script	Crazy Boris	4_M_03,{
 	mes "Crazy Boris";
 	set @counter,1;
 	mes "Hey you! Up for Rock Scissors Roulette?";
 	next;
-	menu "Let me play.",PLAY,"Explain the rules.",RULES,"Leave",LEAVE;
+	menu "Let me play.",PLAY,"Explain the rules.",L_Rules,"Leave",LEAVE;
 	SAME:
 	mes "Draw! Again!";
 	next;
@@ -39,9 +37,9 @@ LOSE:
 PLAY:
 	mes "Rock... Paper...";
 	set @opp,rand (1,3);
-	menu "^0000FFROCK!",ROCK,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
+	menu "^0000FFROCK!",L_Rock,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
 
-ROCK:
+L_Rock:
   	if (@lastchoice == 1) set @opp,rand (1,3);
   	if (@opp == 1) emotion 11;
   	if (@opp == 2) emotion 10;
@@ -205,7 +203,7 @@ KILL:
 	next;
 	goto PRIZE;
 
-RULES:
+L_Rules:
 	mes "Ok here are the rules:";
 	mes "I have with me a ^FF00006^000000 chamber pistol with ^FF00001^000000 round. First we play ^FF0000Scissors ^00FF00Paper ^0000FFRock^000000. The loser pulls the trigger. The winner is whoever comes out best.";
 	mes "Beat me to win a prize.";
diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt
index d0fe41d45..f01a328fb 100644
--- a/npc/custom/etc/shifty_assassin.txt
+++ b/npc/custom/etc/shifty_assassin.txt
@@ -4,8 +4,6 @@
 //= acky
 //===== Current Version: =====================================
 //= 1.1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Players buy ninjas to assassinate other players
 //===== Additional Comments: =================================
@@ -13,7 +11,7 @@
 //= 1.1.2 Updated WoE Check. [Paradox924X]
 //============================================================
 
-morocc,148,86,5	script	Shifty Assassin	725,{
+morocc,148,86,5	script	Shifty Assassin	4_F_JOB_ASSASSIN,{
 	set $ninja_price,250000;
 
 	// STARTS THE MENU //
@@ -50,14 +48,14 @@ M_Buy:
 	if ($ninja_avail < 1) goto NoNinjas;
 	if ($ninja_avail < @buy) goto NotEnoughNinjas;
 	set @price,@buy*$ninja_price;
-	if (zeny < @price ) goto NoZeny;
+	if (Zeny < @price ) goto NoZeny;
 
 	mes "[Shifty Assassin]";
 	mes "That will cost you ^0000FF" + @price + " zeny^000000.";
 	next;
 	menu "Continue",-,"Cancel",M_Exit;
 
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	set #ninjas,#ninjas+@buy;
 	set $ninja_avail,$ninja_avail-@buy;
 
diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt
index 26d368cdf..060228317 100644
--- a/npc/custom/etc/stock_market.txt
+++ b/npc/custom/etc/stock_market.txt
@@ -4,8 +4,6 @@
 //= acky
 //===== Current Version: =====================================
 //= 1.3.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= NPC for a stock market game.
 //===== Additional Comments: =================================
@@ -172,7 +170,7 @@ S_Fluc:
 	end;
 }
 
-prontera,140,181,5	script	Stock Market::stockmarket	109,{
+prontera,140,181,5	script	Stock Market::stockmarket	4_M_MANAGER,{
 	// Ensures no trading when default prices have not been set //
 	set @stotal,$S1+$S2+$S3+$S4+$S5+$S6+$S7+$S8+$S9+$S10;
 	if (@stotal > 0) goto S_Start;
@@ -279,15 +277,15 @@ S_Sell:
 	set @sellamount,0;
 	input @sellamount;
 	if (@sellamount < 1) goto S_SellInv;
-	if (zeny < $S_Trans) goto S_NoZeny;
-	set zeny,zeny-$S_Trans;
+	if (Zeny < $S_Trans) goto S_NoZeny;
+	Zeny -= $S_Trans;
 
 SELLS1:
 	if (@sellname$ != $S1N$) goto SELLS2;
 	if (@sellamount > #S1) goto S_SellTooHigh;
 	set @price,@sellamount*$S1;
 	set #S1,#S1-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S1N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -299,7 +297,7 @@ SELLS2:
 	if (@sellamount > #S2) goto S_SellTooHigh;
 	set @price,@sellamount*$S2;
 	set #S2,#S2-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S2N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -311,7 +309,7 @@ SELLS3:
 	if (@sellamount > #S3) goto S_SellTooHigh;
 	set @price,@sellamount*$S3;
 	set #S3,#S3-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S3N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -323,7 +321,7 @@ SELLS4:
 	if (@sellamount > #S4) goto S_SellTooHigh;
 	set @price,@sellamount*$S4;
 	set #S4,#S4-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S4N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -335,7 +333,7 @@ SELLS5:
 	if (@sellamount > #S5) goto S_SellTooHigh;
 	set @price,@sellamount*$S5;
 	set #S5,#S5-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S5N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -347,7 +345,7 @@ SELLS6:
 	if (@sellamount > #S6) goto S_SellTooHigh;
 	set @price,@sellamount*$S6;
 	set #S6,#S6-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S6N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -359,7 +357,7 @@ SELLS7:
 	if (@sellamount > #S7) goto S_SellTooHigh;
 	set @price,@sellamount*$S7;
 	set #S7,#S7-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S7N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -371,7 +369,7 @@ SELLS8:
 	if (@sellamount > #S8) goto S_SellTooHigh;
 	set @price,@sellamount*$S8;
 	set #S8,#S8-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S8N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -383,7 +381,7 @@ SELLS9:
 	if (@sellamount > #S9) goto S_SellTooHigh;
 	set @price,@sellamount*$S9;
 	set #S9,#S9-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S9N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -395,7 +393,7 @@ SELLS10:
 	if (@sellamount > #S10) goto S_SellTooHigh;
 	set @price,@sellamount*$S10;
 	set #S10,#S10-@sellamount;
-	set zeny,zeny+@price;
+	Zeny += @price;
 	next;
 	mes "Sold " + @sellamount + " " + $S10N$ + " shares.";
 	mes "Earned ^0000FF"+@price+"z^000000.";
@@ -444,18 +442,18 @@ S_Buy:
 	// Checks valid number //
 	if (@buyamount < $S_BuyMin) goto S_TooLow;
 	if (@buyamount > $S_BuyMax) goto S_TooHigh;
-	if (zeny < $S_Trans) goto S_NoZeny;
-	set zeny,zeny-$S_Trans;
+	if (Zeny < $S_Trans) goto S_NoZeny;
+	Zeny -= $S_Trans;
 
 	// Purchases the shares //
 
 PURS1:
 	if (@buyname$ != $S1N$) goto PURS2;
 	set @price,@buyamount*$S1;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S1,#S1+@buyamount;
 	set @price,@buyamount*$S1;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S1N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -464,9 +462,9 @@ PURS1:
 PURS2:
 	if (@buyname$ != $S2N$) goto PURS3;
 	set @price,@buyamount*$S2;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S2,#S2+@buyamount;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S2N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -475,9 +473,9 @@ PURS2:
 PURS3:
 	if (@buyname$ != $S3N$) goto PURS4;
 	set @price,@buyamount*$S3;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S3,#S3+@buyamount;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S3N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -486,9 +484,9 @@ PURS3:
 PURS4:
 	if (@buyname$ != $S4N$) goto PURS5;
 	set @price,@buyamount*$S4;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S4,#S4+@buyamount;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S4N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -497,9 +495,9 @@ PURS4:
 PURS5:
 	if (@buyname$ != $S5N$) goto PURS6;
 	set @price,@buyamount*$S5;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S5,#S5+@buyamount;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S5N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -508,9 +506,9 @@ PURS5:
 PURS6:
 	if (@buyname$ != $S6N$) goto PURS7;
 	set @price,@buyamount*$S6;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S6,#S6+@buyamount;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S6N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -519,9 +517,9 @@ PURS6:
 PURS7:
 	if (@buyname$ != $S7N$) goto PURS8;
 	set @price,@buyamount*$S7;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S7,#S7+@buyamount;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S7N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -530,9 +528,9 @@ PURS7:
 PURS8:
 	if (@buyname$ != $S8N$) goto PURS9;
 	set @price,@buyamount*$S8;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S8,#S8+@buyamount;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S8N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -541,9 +539,9 @@ PURS8:
 PURS9:
 	if (@buyname$ != $S9N$) goto PURS10;
 	set @price,@buyamount*$S9;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S9,#S9+@buyamount;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S9N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
@@ -552,9 +550,9 @@ PURS9:
 PURS10:
 	if (@buyname$ != $S10N$) goto PURS11;
 	set @price,@buyamount*$S10;
-	if (zeny < @price) goto S_NoZeny;
+	if (Zeny < @price) goto S_NoZeny;
 	set #S10,#S10+@buyamount;
-	set zeny,zeny-@price;
+	Zeny -= @price;
 	mes "Bought " + @buyamount + " " + $S10N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt
index cf296cb18..1f32f9f25 100644
--- a/npc/custom/events/cluckers.txt
+++ b/npc/custom/events/cluckers.txt
@@ -5,8 +5,8 @@
 //===== Current Version: =====================================
 //= 1.2a
 //===== Description: =========================================
-//= Click the chicken and try retrieve the item at a low 
-//= chance. If you fail he will nuke, freeze, stone, 
+//= Click the chicken and try retrieve the item at a low
+//= chance. If you fail he will nuke, freeze, stone,
 //= stun, or make you fall asleep.
 //= The prize is configurable and triggered by the NPC.
 //===== Additional Comments: =================================
@@ -16,7 +16,7 @@
 //= 1.2a Switched 'atcommand' to 'unitskilluseid'.
 //============================================================
 
-prontera,156,219,4	script	Cluckers	800,{
+prontera,156,219,4	script	Cluckers	4_NFCOCK,{
 
 	set .@GMAccess,80;	// GM level required to access NPC
 
@@ -26,16 +26,16 @@ prontera,156,219,4	script	Cluckers	800,{
 			case 0: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break;
 			case 1: npctalk "Cluuuuuck!~"; break;
 			case 2: unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; break;
-			case 3: sc_start SC_Freeze,10000,0; break;
+			case 3: sc_start SC_FREEZE,10000,0; break;
 			case 4: npctalk "CLUUUUUUUUUCK!!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break;
-			case 5: sc_start SC_Sleep,10000,0; break;
-			case 6: sc_start SC_Stone,10000,0; emotion 29; break;
+			case 5: sc_start SC_SLEEP,10000,0; break;
+			case 6: sc_start SC_STONE,10000,0; emotion 29; break;
 			case 7: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break;
 			case 8: npctalk "Cluck! CLUUUCK!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break;
-			case 9: sc_start SC_Stun,10000,0; break;
-			case 10: sc_start SC_Sleep,10000,0; emotion 29; break;
+			case 9: sc_start SC_STUN,10000,0; break;
+			case 10: sc_start SC_SLEEP,10000,0; emotion 29; break;
 			case 11: npctalk "Cluck! Cluck!"; break;
-			case 12: sc_start SC_Stun,10000,0; break;
+			case 12: sc_start SC_STUN,10000,0; break;
 			case 13: unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; break;
 			default:
 				if (rand(50) < 4) {
@@ -111,4 +111,4 @@ OnTimer40000:
 	if (!$cluck_item_amount) set $cluck_item_amount,1;
 	set .startcluck,1;
 	end;
-}
\ No newline at end of file
+}
diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt
index ad5ba1185..5e03f5802 100644
--- a/npc/custom/events/disguise.txt
+++ b/npc/custom/events/disguise.txt
@@ -4,15 +4,13 @@
 //= GmOcean
 //===== Current Version: =====================================
 //= 5.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Additional Comments: =================================  
+//===== Additional Comments: =================================
 //= Note: This script requires PCRE to run properly.
 //= 5.0 Last update by GmOcean.
 //= 5.1 Cleaned and standardized, mostly. [Euphy]
 //============================================================
 
-prontera,160,155,4	script	Disguise Event	795,{
+prontera,160,155,4	script	Disguise Event	4_M_NFDEADMAN,{
 
 	// Currently set to run every two hours.
 	// To change times, edit the OnClock labels below.
@@ -40,7 +38,7 @@ prontera,160,155,4	script	Disguise Event	795,{
 				setnpctimer 0; stopnpctimer;
 				announce "A GM has decided to turn the Disguise Event off. As a result no further prizes will be given.",bc_map | bc_blue;
 				deletepset 1;
-				setnpcdisplay "Disguise Event",795;
+				setnpcdisplay "Disguise Event", 4_M_NFDEADMAN;
 				close;
 			}
 			set .EventON,1; set .Timer,1; setnpctimer 0; initnpctimer;
@@ -129,19 +127,21 @@ OnInit:
 	set .Prize,512;
 	set .PrizeAmt,1;
 	set .Rule,1;
-	setarray .MVP[0],1038,1039,1046,1059,1086,1087,1112,1115,1147,1150,1157,1159,1190,1251,1252,1272,1312,1373,
-	                  1389,1399,1418,1492,1502,1511,1583,1623,1630,1646,1647,1648,1649,1650,1651,1658,1685,1688,
-				   1708,1719,1734,1751,1768,1779,1785,1802,1832,1871,1874,1885,1917,1980,2022,2068,2087,2131,
-				   2156,2165;
-	set .BlackList$, "1003,1006,1017,1021,1022,1027,1043,1075,1136,1137,1168," + 
-	    "1171,1172,1173,1181,1187,1210,1217,1218,1222,1223,1224,1225,1226,1227,1228," + 
-	    "1233,1284,1407,1411,1414,1495,1501,1900,1996,2000,2001,2002,2003,2004," + 
-	    "2005,2006,2007,2011,2012,2025,2028,2029,2030,2031,2032,2033,2034,2035," + 
-	    "2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049," + 
-	    "2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063," + 
-	    "2064,2065,2066,2067,2075,2076,2077,2078,2079,2080,2081,2083,2084,2085," + 
-	    "2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099," + 
-	    "2100,2101,2012,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113," + 
+	setarray .MVP[0], OSIRIS, BAPHOMET, DOPPELGANGER, MISTRESS, GOLDEN_BUG, ORK_HERO, DRAKE, EDDGA, MAYA, MOONLIGHT,
+		PHARAOH, PHREEONI, ORC_LORD, KNIGHT_OF_WINDSTORM, GARM, DARK_LORD, TURTLE_GENERAL, LORD_OF_DEATH, DRACULA, EVENT_BAPHO,
+		DARK_SNAKE_LORD, INCANTATION_SAMURAI, PORING_V, AMON_RA, TAO_GUNKA, RSX_0806, BACSOJIN_, B_SEYREN, B_EREMES, B_HARWORD,
+		B_MAGALETA, B_SHECIL, B_KATRINN, B_YGNIZEM, APOCALIPS_H, LADY_TANEE, THANATOS, DETALE, KIEL_, RANDGRIS,
+		GLOOMUNDERNIGHT, KTULLANUX, ATROCE, G_MAGALETA_, IFRIT, FALLINGBISHOP, BEELZEBUB_, GOPINICH, MOROCC_, KUBLIN,
+		S_NYDHOG, BOITATA, QUEEN_SCARABA, LOST_DRAGON, LEAK, I_QUEEN_SCARABA;
+	set .Blacklist$, "1003,1006,1017,1021,1022,1027,1043,1075,1136,1137,1168," +
+	    "1171,1172,1173,1181,1187,1210,1217,1218,1222,1223,1224,1225,1226,1227,1228," +
+	    "1233,1284,1407,1411,1414,1495,1501,1900,1996,2000,2001,2002,2003,2004," +
+	    "2005,2006,2007,2011,2012,2025,2028,2029,2030,2031,2032,2033,2034,2035," +
+	    "2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049," +
+	    "2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063," +
+	    "2064,2065,2066,2067,2075,2076,2077,2078,2079,2080,2081,2083,2084,2085," +
+	    "2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099," +
+	    "2100,2101,2012,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113," +
 	    "2114,2115,2116,2117,2118,2119,2120,2121,2123,2124,2125,1496,";
 	end;
 OnClock0000:
@@ -173,7 +173,7 @@ OnTimer10000:
 OnTimer30000:
 	if (.Timer) end;
 	set .Change,0;
-	setnpcdisplay "Disguise Event",795;
+	setnpcdisplay "Disguise Event", 4_M_NFDEADMAN;
 	npctalk "You took too long to guess what I was. Please wait 10 seconds while I disguise again.";
 	specialeffect 725;
 	set $MonsterName$,"";
@@ -201,22 +201,22 @@ OnTimer180000:
 iDisguise:
 	if (.Rule==1) {
 		set .Winner,0;
-		set .Monster,1000+rand(1,995);
-		if (compare(","+.BlackList$+"," , ","+.Monster+",")) goto iDisguise;
-		if (.Monster==.LastMonster) goto iDisguise;
-		set .LastMonster,.Monster;
-		set $MonsterName$,getmonsterinfo(.Monster,0);
+		set .@monster, rand(SCORPION, PINGUICULA);
+		if (compare(","+.Blacklist$+"," , ","+.@monster+",")) goto iDisguise;
+		if (.@monster==.LastMonster) goto iDisguise;
+		set .LastMonster,.@monster;
+		set $MonsterName$,getmonsterinfo(.@monster,0);
 	}
 	if (.Rule==2) {
 		set .Winner,0;
-		set .Monster,rand(49);
-		set $MonsterName$,getmonsterinfo(.MVP[.Monster],0);
+		set .@monster, rand(getarraysize(.MVP));
+		set $MonsterName$,getmonsterinfo(.MVP[.@monster],0);
 	}
 	deletepset 1;
 	defpattern 1,"([^:]+):.\\s*"+$MonsterName$+".*", "iCorrect";
 	activatepset 1;
-	if (.Rule==1) setnpcdisplay "Disguise Event",.Monster;
-	if (.Rule==2) setnpcdisplay "Disguise Event",.MVP[.Monster];
+	if (.Rule==1) setnpcdisplay "Disguise Event",.@monster;
+	if (.Rule==2) setnpcdisplay "Disguise Event",.MVP[.@monster];
 	set .Change,1;
 	setnpctimer 0;
 	end;
@@ -232,13 +232,13 @@ iCorrect:
 	getitem .Prize,.PrizeAmt;
 	announce strcharinfo(0)+" is correct! I was disguised as: "+$MonsterName$+"",bc_map | bc_blue;
 	if (.RoundCount>=.Rounds) {
-		setnpcdisplay "Disguise Event",795;
+		setnpcdisplay "Disguise Event", 4_M_NFDEADMAN;
 		set .RoundCount,0; set .Change,0; set .EventON,0;
 		setnpctimer 0; stopnpctimer;
 		npctalk "Thank you all for playing. That was the last round of the Disguise Event. Come play again later.";
 		end;
 	}
-	setnpcdisplay "Disguise Event",795;
+	setnpcdisplay "Disguise Event", 4_M_NFDEADMAN;
 	set .Change,0;
 	setnpctimer 0;
 	end;
diff --git a/npc/custom/events/hallow06.txt b/npc/custom/events/hallow06.txt
index 4663ab996..01a122320 100644
--- a/npc/custom/events/hallow06.txt
+++ b/npc/custom/events/hallow06.txt
@@ -4,8 +4,6 @@
 //= Stryker
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Halloween Event Script
 //===== Additional Comments: =================================
@@ -13,7 +11,7 @@
 //= 1.2 fixed bugs, optimized. Now uses 1 var instead of 3 [Lupus]
 //============================================================
 
-prontera,151,190,5	script	Hallows' Eve Event	807,{
+prontera,151,190,5	script	Hallows' Eve Event	1_M_SIGNMCNT,{
 	mes "[Hallows' Eve Event]";
 	if(Class == Job_Novice){
 		mes "I am sorry but you have to got a job to complete the event.";
diff --git a/npc/custom/events/mushroom_event.txt b/npc/custom/events/mushroom_event.txt
index c13bde1cc..1d632d3e9 100644
--- a/npc/custom/events/mushroom_event.txt
+++ b/npc/custom/events/mushroom_event.txt
@@ -1,11 +1,9 @@
 //===== Hercules Script ======================================
 //= Find the Mushroom
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Mysterious
 //===== Current Version: =====================================
 //= 3.6a
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Find the Mushroom - random amount of Mushrooms spawns in random maps.
 //= Players need to find these mushrooms and kill them to gain prizes!
@@ -14,7 +12,7 @@
 //= 3.6a Slightly edited. [Euphy]
 //============================================================
 
-prontera,142,228,6	script	Find the Mushroom	1084,{
+prontera,142,228,6	script	Find the Mushroom	BLACK_MUSHROOM,{
 	mes "[ Find The Mushroom ]";
 	if (!.Status)
 		mes "There is no event at the moment!";
diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt
index 50262933d..d48e5f928 100644
--- a/npc/custom/events/uneasy_cemetery.txt
+++ b/npc/custom/events/uneasy_cemetery.txt
@@ -1,23 +1,21 @@
 //===== Hercules Script ======================================
 //= Uneasy Prontera Cemetery Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2a (Tested and fully working!)
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= A periodical quest of the Uneasy Cemetery (Kill undead / Prevent their appearance)
 //= Every day, at the midnight Prontera receive a wave of Undeads.
 //= They come from Uneasy Cemetery of Prontera. To protect the players
 //= from the undeads terror you may either kill the enemy. Or supply Mother Mathana
-//= with needed amount of Holy Water. Every citizen can take his part in the 
+//= with needed amount of Holy Water. Every citizen can take his part in the
 //= saving of Prontera city. After some days of quiet life... the Cemetery strikes back.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 More advanced ver. Added some bonus the the one who'd kill the last walking undead
 //= 1.2 Added coords to the script to make label OmMobDead working
 //= 1.2a Changed item names to item IDs. [Samuray22]
-//============================================================ 
+//============================================================
 
 prontera,3,3,3	script	Uneasy_Check	-1,{
 	end;
@@ -66,7 +64,7 @@ L_Start_Undead:
 	mapannounce "prontera","[Mother Mathana]: The cememtery has become restless!  In the name of Odin, hurry to the Sanctuary! Save the city of Prontera!",0;
 }
 
-prontera,257,313,5	script	Mother Mathana	79,{
+prontera,257,313,5	script	Mother Mathana	1_F_PRIEST,{
 	mes "[Mother Mathana]";
 	if ($UNEASY_DL <= 0) goto L_Undead_Walk;
 	mes "I'm afraid there's something wrong with our old cemetery...";
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index 065d4e32d..5a94bc913 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -4,8 +4,6 @@
 //= Lupus (based on Muad_Dib's work)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 // Close to other official stValentine event (added white chocolate)
 // Custom: Handmade choco gives some EXP bonuses to married people
@@ -16,11 +14,11 @@
 //============================================================
 
 // Tine - Valentine Event Chocolate Even Guide ------------------
-prontera,156,172,4	script	Tine	58,{
+prontera,156,172,4	script	Tine	1_M_MERCHANT,{
 //  Debug info for item effects and tricky conditions 8)
 //	mes "@dsv: "+@dsv;
 //	mes "ispartneron()=="+ispartneron();
-//	mes "sex == "+sex;
+//	mes "sex == "+Sex;
 //	if(@dsv == gettime(3)+1) mes "@dsv == gettime(3)+1";
 
 	mes "[Tine]";
@@ -62,9 +60,9 @@ M_INFO:
 
 OnInit:
 	//559,Hand-made_Chocolate
-	setitemscript 559,"{ itemheal 50,50; if(sex==0 || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }";
+	setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }";
 	//560,Hand-made_White_Chocolate
-	setitemscript 560,"{ itemheal 50,50; if(sex || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }";
+	setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }";
 
 	//2634,Wedding_Ring_M,Wedding Ring,5,,10,0,,0,,0,127918079,7,1,136,,0,0,0,{ skill 334,1; skill 335,1; skill 336,1; }
 	setitemscript 2634,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(3)+1 && ispartneron()){ bonus2 bExpAddRace,5,50; bonus2 bExpAddRace,6,50; bonus2 bExpAddRace,7,50; bonus2 bExpAddRace,8,50; bonus2 bExpAddRace,1,50; } }";
@@ -74,7 +72,7 @@ OnInit:
 }
 
 // Stephen - Valentine Event Chocolate seller ------------------
-alberta,26,243,4	script	Stephen#val1	58,{
+alberta,26,243,4	script	Stephen#val1	1_M_MERCHANT,{
 	mes "[Stephen]";
 	mes "Guess what I've got?";
 	mes "A tasty treat not easily found in Rune-Midgard....";
@@ -107,7 +105,7 @@ M_CHOCO:
 	if (@flag_num > 5) goto L_ERR;
 	set @needmon,@flag_num*5000;
 	if (Zeny < @needmon) goto L_NOTENO;
-	set Zeny,Zeny - @needmon;
+	Zeny -= @needmon;
 	getitem 558,@flag_num;
 	mes "[Stephen]";
 	mes "There you go!";
@@ -129,7 +127,7 @@ L_NOTENO:
 }
 
 // Jainie -- Gives information about Valentine Event ------------------------
-alberta,29,243,4	script	Jainie#val1	53,{
+alberta,29,243,4	script	Jainie#val1	1_M_INNKEEPER,{
 	mes "[Jainie]";
 	mes "You know what? The chocolate that my boyfriend sells are from me!";
 	mes "I made them by myself. Now I need some Milk for my special White Chocolate.";
@@ -169,7 +167,7 @@ M_CHOCO:
 	set @needmon,@flag_num*4500;
 	if (Zeny < @needmon) goto L_NOTENO;
 	if (countitem(519) < @flag_num) goto L_NOMILK;
-	set Zeny,Zeny - @needmon;
+	Zeny -= @needmon;
 	delitem 519,@flag_num;
 	getitem 561,@flag_num;
 	mes "[Jainie]";
@@ -197,11 +195,11 @@ L_NOMILK:
 }
 
 // Carl Orleans -- Valentine Event Chocolate maker ------------------
-prt_castle,54,34,4	script	Carl Orleans#val1	47,{
+prt_castle,54,34,4	script	Carl Orleans#val1	1_M_01,{
 	mes "[Carl Orleans]";
 	mes "Yes? What can I cook for you?";
 	next;
-	menu "Black handmade Chocolate, please",-,"I want a White handmade Chocolate...",M_WHITE,"I'm lost, sorry to bother you.",M_END;
+	menu "Black handmade Chocolate, please",-,"I want a White handmade Chocolate...",M_WHITE,"I'm lost, sorry to bother you.",M_End;
      
 	mes "[Carl Orleans]";
 	mes "Well, I just might be able to fulfill your needs...";
@@ -268,7 +266,7 @@ M_WHITE:
 	mes "Enjoy.";
 	close;
 
-M_END:
+M_End:
 	mes "[Carl Orleans]";
 	mes "Oh.. well, if you want me to make some of my special handmade Chocolate....";
 	mes "You will need to give me at least ^0000FF 3 Chocolates^000000 or ^0000FF 3 White Chocolates^000000.";
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index 7c0ec5bf0..e031ea129 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -4,8 +4,6 @@
 //= Lupus (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Custom event: Karachun (from 8 Dec till 8 Jan), X-Mas, HNY
 //===== Additional Comments: =================================
@@ -14,7 +12,7 @@
 //= 1.2 Fixed double quotes not being escaped [brianluau]
 //============================================================
 
-prontera,156,174,4	script	Snower	713,{
+prontera,156,174,4	script	Snower	4_M_06,{
 	mes "[Snower]";
 	if(Q_XMSRINGS==2){
 		mes "Oh.. is it true? You've helped my sis Sneewy? Thank you.";
@@ -99,7 +97,7 @@ OnInit:
 	end;
 }
 
-louyang,224,249,4	script	Sneewy	717,{
+louyang,224,249,4	script	Sneewy	4_F_KID3,{
 	mes "[Sneewy]";
 	if(Q_XMSRINGS==0){
 		mes "Hi! I'm waithing for my sister's birdy with mail...";
@@ -113,7 +111,7 @@ louyang,224,249,4	script	Sneewy	717,{
 		mes "[Sneewy]";
 		mes "Oh, hello. Has my brother Snower told you everything?";
 		next;
-		menu "Here are your 4 Gift Boxes",-, "I don't know any Snowhatevers...",M_END;
+		menu "Here are your 4 Gift Boxes",-, "I don't know any Snowhatevers...",M_End;
 
 		mes "[Sneewy]";
 		if(countitem(644)<4){
@@ -135,14 +133,14 @@ louyang,224,249,4	script	Sneewy	717,{
 	mes "Thanks again! No children will meet the holidays without the gifts!";
 	close;
 
-M_END:
+M_End:
 	mes "[Sneewy]";
 	mes "Pity... I've got a magic Santa's ring... I'd exchange it for 4 Gift Boxes...";
 	emotion e_swt;
 	close;
 }
 
-izlu2dun,133,160,2	script	Snoowy	714,{
+izlu2dun,133,160,2	script	Snoowy	4_F_06,{
 	mes "[Snoowy]";
 	if(Q_XMSRINGS==0){
 		mes "Helloooou! Do you know my bro and sis? How so? My brother Snower's well known in Prontera!! Just ask any child there.";
@@ -165,7 +163,7 @@ izlu2dun,133,160,2	script	Snoowy	714,{
 		mes "[Snoowy]";
 		mes "But I too need 3 more gifts for my marine folk friends...";
 		next;
-		menu "Have these gifts!",-, "I need a li'l something in return",M_END;
+		menu "Have these gifts!",-, "I need a li'l something in return",M_End;
 
 		mes "[Snoowy]";
 		if(countitem(644)<3){
@@ -185,7 +183,7 @@ izlu2dun,133,160,2	script	Snoowy	714,{
 	if(rand(2))mes "Didn't you know that Santa's Hat reveals the real power of the rings?";
 	close;
 
-M_END:
+M_End:
 	mes "[Snoowy]";
 	mes "I'd exchange a GOLD magic ring for 3 gift boxes...";
 	emotion e_swt;
diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt
index a6f028e8a..59d67b083 100644
--- a/npc/custom/healer.txt
+++ b/npc/custom/healer.txt
@@ -3,67 +3,76 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2
 //===== Description: =========================================
 //= Basic healer script.
+//===== Additional Comments: =================================
+//= 1.0 Initial script.
+//= 1.1 Aligned coordinates with @go.
+//= 1.2 Fix variables and character stuck at healing
 //============================================================
 
 -	script	Healer	-1,{
-	
-	set .@Price,0;	// Zeny required for heal
-	set .@Buffs,0;	// Also buff players? (1: yes / 0: no)
-	set .@Delay,0;	// Heal delay, in seconds
 
-	callfunc "F_ClearGarbage",0;
+	.@price = 0;	// Zeny required for heal
+	.@Buffs = 0;	// Also buff players? (1: yes / 0: no)
+	.@Delay = 0;	// Heal delay, in seconds
+
 	if (@HD > gettimetick(2)) end;
-	if (.@Price) {
-		message strcharinfo(0),"Healing costs "+.@Price+" Zeny.";
-		if (Zeny < .@Price) end;
+	if (.@price) {
+		message strcharinfo(0),"Healing costs "+.@price+" Zeny.";
+		if (Zeny < .@price) end;
 		if(select("^0055FFHeal^000000:^777777Cancel^000000") == 2) close;
-		set Zeny, Zeny-.@Price;
+		Zeny -= .@price;
 	}
-	specialeffect2 313; percentheal 100,100;
+	specialeffect2 EF_HEAL2; percentheal 100,100;
 	if (.@Buffs) {
 		specialeffect2 EF_INCAGILITY; sc_start SC_INC_AGI,240000,10;
 		specialeffect2 EF_BLESSING; sc_start SC_BLESSING,240000,10;
 	}
-	if (.@Delay) set @HD, gettimetick(2)+.@Delay;
-	end;
+	if (.@Delay) @HD = gettimetick(2)+.@Delay;
+	close;
 }
 
-alberta,25,240,6	duplicate(Healer)	Healer#alb	909
-aldebaran,135,118,6	duplicate(Healer)	Healer#alde	909
-amatsu,200,79,4	duplicate(Healer)	Healer#ama	909
-ayothaya,207,169,6	duplicate(Healer)	Healer#ayo	909
-brasilis,194,221,6	duplicate(Healer)	Healer#bra	909
-comodo,184,158,6	duplicate(Healer)	Healer#com	909
-dewata,193,175,6	duplicate(Healer)	Healer#dew	909
-eclage,105,35,4	duplicate(Healer)	Healer#ecl	909
-einbech,142,244,4	duplicate(Healer)	Healer#einbe	909
-einbroch,57,202,6	duplicate(Healer)	Healer#einbr	909
-dicastes01,201,194,4	duplicate(Healer)	Healer#dic	909
-geffen,115,72,6	duplicate(Healer)	Healer#gef	909
-gonryun,156,122,6	duplicate(Healer)	Healer#gon	909
-hugel,89,150,6	duplicate(Healer)	Healer#hug	909
-izlude,125,118,5	duplicate(Healer)	Healer#izl	909
-lighthalzen,149,103,6	duplicate(Healer)	Healer#li	909
-louyang,225,103,4	duplicate(Healer)	Healer#lou	909
-malangdo,226,188,4	duplicate(Healer)	Healer#mal	909
-malaya,205,205,6	duplicate(Healer)	Healer#malay	909
-manuk,256,176,6	duplicate(Healer)	Healer#man	909
-mid_camp,203,289,6	duplicate(Healer)	Healer#mid	909
-mora,106,100,6	duplicate(Healer)	Healer#mora	909
-morocc,153,97,6	duplicate(Healer)	Healer#mor	909
-moscovia,215,194,6	duplicate(Healer)	Healer#mos	909
-niflheim,188,180,5	duplicate(Healer)	Healer#nif	909
-payon,179,106,4	duplicate(Healer)	Healer#pay	909
-prontera,162,193,4	duplicate(Healer)	Healer#pront	909
-rachel,125,116,6	duplicate(Healer)	Healer#rac	909
-splendide,201,153,4	duplicate(Healer)	Healer#spl	909
-thor_camp,249,74,4	duplicate(Healer)	Healer#thor	909
-umbala,129,132,4	duplicate(Healer)	Healer#umb	909
-veins,217,121,4	duplicate(Healer)	Healer#ve	909
-xmas,143,136,6	duplicate(Healer)	Healer#xmas	909
-yuno,164,45,4	duplicate(Healer)	Healer#yuno	909
+
+// Duplicates
+//============================================================
+alberta,25,240,6	duplicate(Healer)	Healer#alb	4_PORING
+aldebaran,135,118,6	duplicate(Healer)	Healer#alde	4_PORING
+amatsu,200,79,4	duplicate(Healer)	Healer#ama	4_PORING
+ayothaya,207,169,6	duplicate(Healer)	Healer#ayo	4_PORING
+comodo,184,158,6	duplicate(Healer)	Healer#com	4_PORING
+einbech,57,36,6	duplicate(Healer)	Healer#einbe	4_PORING
+einbroch,57,202,6	duplicate(Healer)	Healer#einbr	4_PORING
+geffen,115,72,6	duplicate(Healer)	Healer#gef	4_PORING
+gonryun,156,122,6	duplicate(Healer)	Healer#gon	4_PORING
+hugel,89,150,6	duplicate(Healer)	Healer#hug	4_PORING
+izlude,125,118,5	duplicate(Healer)	Healer#izl	4_PORING
+jawaii,250,139,4	duplicate(Healer)	Healer#jaw	4_PORING
+lighthalzen,152,100,6	duplicate(Healer)	Healer#lhz	4_PORING
+louyang,226,103,4	duplicate(Healer)	Healer#lou	4_PORING
+manuk,272,144,6	duplicate(Healer)	Healer#man	4_PORING
+mid_camp,203,289,6	duplicate(Healer)	Healer#mid	4_PORING
+moc_ruins,72,164,4	duplicate(Healer)	Healer#moc	4_PORING
+morocc,153,97,6	duplicate(Healer)	Healer#mor	4_PORING
+moscovia,220,191,4	duplicate(Healer)	Healer#mos	4_PORING
+niflheim,212,182,5	duplicate(Healer)	Healer#nif	4_PORING
+payon,179,106,4	duplicate(Healer)	Healer#pay	4_PORING
+prontera,162,193,4	duplicate(Healer)	Healer#prt	4_PORING
+rachel,125,116,6	duplicate(Healer)	Healer#rac	4_PORING
+splendide,201,153,4	duplicate(Healer)	Healer#spl	4_PORING
+thor_camp,249,74,4	duplicate(Healer)	Healer#thor	4_PORING
+umbala,105,148,3	duplicate(Healer)	Healer#umb	4_PORING
+veins,217,121,4	duplicate(Healer)	Healer#ve	4_PORING
+xmas,143,136,4	duplicate(Healer)	Healer#xmas	4_PORING
+yuno,164,45,4	duplicate(Healer)	Healer#yuno	4_PORING
+
+// Duplicates (Renewal)
+//============================================================
+brasilis,194,221,6	duplicate(Healer)	Healer#bra	4_PORING
+dewata,195,187,4	duplicate(Healer)	Healer#dew	4_PORING
+dicastes01,201,194,4	duplicate(Healer)	Healer#dic	4_PORING
+ecl_in01,45,60,4	duplicate(Healer)	Healer#ecl	4_PORING
+malangdo,132,114,6	duplicate(Healer)	Healer#mal	4_PORING
+malaya,205,205,6	duplicate(Healer)	Healer#ma	4_PORING
+mora,55,152,4	duplicate(Healer)	Healer#mora	4_PORING
diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt
index b70244ed1..243ca29c2 100644
--- a/npc/custom/item_signer.txt
+++ b/npc/custom/item_signer.txt
@@ -4,8 +4,6 @@
 //= Lupus
 //===== Current Version: =====================================
 //= 1.1a
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Write you name on your rare equipment or weapon ^_-
 //===== Additional Comments: =================================
@@ -13,10 +11,10 @@
 //= 1.1a Added 'disable_items' command. [Euphy]
 //============================================================
 
-prt_in,24,61,7	script	Perchik	47,{
+prt_in,24,61,7	script	Perchik	1_M_01,{
 	
-	setarray .@Item[0],644,3;	// Item requirements: <ID>,<Count>{,...} (0 to disable)
-	setarray .@Cost[0],0,5000;	// Zeny requirements: <base price>,<price per refine>
+	setarray .@item[0],644,3;	// Item requirements: <ID>,<Count>{,...} (0 to disable)
+	setarray .@cost[0],0,5000;	// Zeny requirements: <base price>,<price per refine>
 
 	disable_items;
 	mes "[Perchik]";
@@ -28,12 +26,12 @@ prt_in,24,61,7	script	Perchik	47,{
 		emotion e_ic;
 		next;
 		mes "[Perchik]";
-		if (getarraysize(.@Item) || getarraysize(.@Cost)) {
+		if (getarraysize(.@item) || getarraysize(.@cost)) {
 			mes "For my work I accept:";
-			if (getarraysize(.@Item)) for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2)
-				mes " ~ "+.@Item[.@i+1]+"x "+getitemname(.@Item[.@i]);
-			if (.@Cost[0]) mes " ~ "+.@Cost[0]+" Zeny";
-			if (.@Cost[1]) mes " ~ "+.@Cost[1]+" Zeny per refine";
+			if (getarraysize(.@item)) for(set .@i,0; .@i<getarraysize(.@item); set .@i,.@i+2)
+				mes " ~ "+.@item[.@i+1]+"x "+getitemname(.@item[.@i]);
+			if (.@cost[0]) mes " ~ "+.@cost[0]+" Zeny";
+			if (.@cost[1]) mes " ~ "+.@cost[1]+" Zeny per refine";
 		}
 		else mes "I work for free, but...";
 		next;
@@ -93,12 +91,12 @@ prt_in,24,61,7	script	Perchik	47,{
 			emotion e_hmm;
 			close;
 		}
-	set .@price, .@Cost[0]+(.@Cost[1]*.@ref);
-	if (getarraysize(.@Item) || .@price) {
+	set .@price, .@cost[0]+(.@cost[1]*.@ref);
+	if (getarraysize(.@item) || .@price) {
 		mes "I will need:";
-		if (getarraysize(.@Item)) for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2) {
-			mes " ~ "+.@Item[.@i+1]+"x "+getitemname(.@Item[.@i]);
-			if (countitem(.@Item[.@i]) < .@Item[.@i+1]) set .@nr,1;
+		if (getarraysize(.@item)) for(set .@i,0; .@i<getarraysize(.@item); set .@i,.@i+2) {
+			mes " ~ "+.@item[.@i+1]+"x "+getitemname(.@item[.@i]);
+			if (countitem(.@item[.@i]) < .@item[.@i+1]) set .@nr,1;
 		}
 		if (.@price) mes " ~ "+.@price+" Zeny";
 	}
@@ -123,9 +121,9 @@ prt_in,24,61,7	script	Perchik	47,{
 		emotion e_wah;
 		close;
 	}
-	if (.@price) set Zeny, Zeny-.@price;
-	if (getarraysize(.@Item))  for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2)
-		delitem .@Item[.@i], .@Item[.@i+1];
+	if (.@price) Zeny -= .@price;
+	if (getarraysize(.@item))  for(set .@i,0; .@i<getarraysize(.@item); set .@i,.@i+2)
+		delitem .@item[.@i], .@item[.@i+1];
 	delitem2 .@id,1,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3];
 	mes "Done!";
 	emotion e_proud;
diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt
new file mode 100644
index 000000000..7d2c4ba62
--- /dev/null
+++ b/npc/custom/itembind.txt
@@ -0,0 +1,133 @@
+//===== Hercules Script =======================================
+//= Item Bind Script
+//===== By: ==================================================
+//= Akinari
+//===== Compatible With: =====================================
+//= Revision 17351+ (rAthena)
+//= Revision 12949+ (Hercules)
+//===== Description: =========================================
+//= Item Bind Script
+//= Allows users to pay a price to make an item bound to
+//= Account, Character, or Guild
+//============================================================
+
+prontera,144,174,4	script	Bound Items	4_M_JP_MID,{
+
+	mes "I can bind your items to your account, guild, or character"+((.bindprice)?" for a ^0000FF"+.bindprice+"^000000 zeny fee":"")+".";
+	next;
+	mes "With this, you can rest assured your items are safe.";
+	next;
+	mes "What would you like to do?";
+	if(select("Bind:Unbind") == 1) {
+		if(Zeny < .bindprice) {
+			mes "You don't have enough zeny to bind an item.";
+			close;
+		}
+		mes "What kind of bind?";
+		.@boundtype = 1 << (select("Account:Guild:Character")-1);
+		if(.@boundtype == 2 && (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(0))) {
+			mes "In order for me to bind an item to a guild you must be the master of one.";
+			close;
+		}
+		getinventorylist();
+		for(.@i = 0; .@i < @inventorylist_count; .@i++) {
+			//We only show the items that you allow to be bound
+			//Allows equipment (default)
+			if(@inventorylist_bound[.@i])
+				continue;
+			if(((.allowbind & 1) && (getiteminfo(@inventorylist_id[.@i],2) == (4|5))) ||
+				((.allowbind & 2) && (getiteminfo(@inventorylist_id[.@i],2) == (0|2|11|18))) ||
+				((.allowbind & 4) && (getiteminfo(@inventorylist_id[.@i],2) == (3|6|7|8|10)))
+			) {
+				set .@bindlist$, .@bindlist$ + ":" + getitemname(@inventorylist_id[.@i]) + " - " + @inventorylist_id[.@i];
+				set .@bindlist[.@j],.@i;
+				.@j++;
+			}
+		}
+		.@item = .@bindlist[select(.@bindlist$)-2];
+		next;
+		mes "Before I continue, I want you to know I can't tell the difference between multiple items.  If you have a specific item you want bounded, please remove any duplicates from inventory.";
+		if(select("I understand, continue:Wait a minute") == 2) {
+			next;
+			mes "I'll be here when you're ready.";
+			close;
+		}
+		next;
+		mes "Are you sure you'd like to bind your "+ getitemname(@inventorylist_id[.@item]) +" to your "+.boundtypes$[.@boundtype]+"?";
+		if(select("Yes:No") == 1) {
+			Zeny -= .bindprice;
+			delitem2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item];
+			getitembound2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item],.@boundtype;
+			mes "All done!";
+			if(.logbinds)
+				logmes "Bound "+ @inventorylist_amount[.@item]+" "+@inventorylist_id[.@item]+" as "+.boundtypes$[.@boundtype]+" type.";
+		}
+	} else {
+		if(!countbound()) {
+			mes "You don't have any bound items in your inventory.  Not much I can do here.";
+			close;
+		}
+		countbound(2);
+		if(.unbindprice) {
+			mes "Unbinding an item has a fee of ^0000FF"+.unbindprice+"^000000 zeny.";
+			if(Zeny < .unbindprice) {
+				mes "You don't have enough to unbind an item.";
+				close;
+			}
+		}
+		getinventorylist();
+		for(.@i = 0; .@i < @inventorylist_count; .@i++) {
+			if(@inventorylist_bound[.@i]) {
+				set .@bindlist$, .@bindlist$ + ":" + getitemname(@inventorylist_id[.@i]) + " - " + @inventorylist_id[.@i];
+				set .@bindlist[.@j],.@i;
+				.@j++;
+			}
+		}
+		.@item = .@bindlist[select(.@bindlist$)-2];
+		next;
+		for(.@i = 0; .@i < getarraysize(@bound_items); .@i++) {
+			if(@inventorylist_id[.@item] == @bound_items[.@i] &&
+				(!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(0))
+			) {
+				mes "I will only unbind guild bound items that the guild master requests.";
+				close;
+			}
+		}
+		mes "Before I continue, I want you to know I can't tell the difference between multiple items.  If you have a specific item you want unbounded, please remove any duplicates from inventory.";
+		if(select("I understand, continue:Wait a minute") == 2) {
+			next;
+			mes "I'll be here when you're ready.";
+			close;
+		}
+		next;
+		mes "Are you sure you'd like to unbind your "+ getitemname(@inventorylist_id[.@item]) +"?";
+		if(select("Yes:No") == 1) {
+			Zeny -= .unbindprice;
+			delitem2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item];
+			getitem2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item];
+			mes "All done!";
+			if(.logbinds)
+				logmes "Unbound "+ @inventorylist_amount[.@item]+" "+@inventorylist_id[.@item]+".";
+		}
+	}
+	close;
+
+OnInit:
+	//* Configuration *\\
+	//Price
+	.bindprice = 0;
+	.unbindprice = 100000;
+
+	//What to allow to be bound - Add as necessary
+	//1 = Equipment - 2 = Consumables - 4 = Etc
+	.allowbind = 1;
+
+	//Log binds via NPC?
+	.logbinds = 1;
+
+	//Other stuff
+	.boundtypes$[1] = "account";
+	.boundtypes$[2] = "guild";
+	.boundtypes$[4] = "character";
+	end;
+}
diff --git a/npc/custom/itemmall.txt b/npc/custom/itemmall.txt
index 6eb162f9c..7e1aa1199 100644
--- a/npc/custom/itemmall.txt
+++ b/npc/custom/itemmall.txt
@@ -4,41 +4,39 @@
 //= Masao
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Street shops in Prontera.
 //============================================================
 
-prontera,147,240,5	shop	Armor	99,2304:10000,2306:20000,2308:20000,2310:50000,2311:50000,2313:50000,2315:75000,2317:100000,2322:20000,2326:60000,2331:75000,2342:100000,2353:75000,2364:150000,2367:100000,2399:50000
-prontera,147,242,5	shop	Shield	99,2102:10000,2106:60000,2108:60000,2110:85000,2114:30000,2116:30000,2123:50000,2124:50000
-prontera,147,244,5	shop	Footgear	99,2404:10000,2406:20000,2409:30000,2412:50000,2417:50000,2418:50000,2424:50000,2425:20000
-prontera,147,246,5	shop	Mace	99,1502:10000,1505:20000,1511:20000,1514:-1,1517:-1,1520:50000,1522:100000,1523:25000,1528:50000,1529:50000,1531:50000
-prontera,147,248,5	shop	Knuckle	494,1802:20000,1804:50000,1806:60000,1808:75000,1810:70000,1812:60000,1813:100000,1814:100000,1822:150000
-prontera,147,250,5	shop	Whips	494,1951:10000,1953:20000,1955:30000,1962:20000,1963:50000,1972:10000,1974:10000,1976:50000
-prontera,147,252,5	shop	Instruments	494,1902:10000,1904:20000,1906:-1,1908:50000,1913:50000,1914:50000,1915:50000,1916:50000,1917:50000
-prontera,147,254,5	shop	Books	494,1550:30000,1551:60000,1552:51000,1559:25000,1561:75000,1564:25000,1568:70000,1569:70000,1570:70000,1571:70000,1572:50000
-prontera,147,256,5	shop	Guns	497,13103:60000,13105:100000,13106:200000,13101:10000,13150:6000,13152:30000,13153:50000,13155:60000,13156:100000,13154:30000,13159:250000,13157:150000,13161:300000,13162:500000
-prontera,147,258,5	shop	Fuuma Shuriken	497,7522:500,7521:500,7523:500
-prontera,147,260,5	shop	One-Handed Swords	497,1108:10000,1117:10000,1120:100000,1124:50000,1130:100000,1131:50000,1133:50000,1138:200000,1139:200000,1145:-1,1149:50000
-prontera,147,262,5	shop	Two-Handed Swords	497,1155:50000,1158:90000,1163:120000,1164:50000,1165:50000,1166:75000,1168:50000,1169:500000,1172:200000,1175:75000
-prontera,147,264,5	shop	Spears	731,1405:20000,1408:50000,1415:100000,1417:75000,1421:75000,1422:25000
-prontera,147,238,1	shop	Dagger	731,1208:20000,1211:20000,1217:20000,1223:50000,1231:75000,1235:75000,1236:75000,1237:75000
-prontera,164,264,4	shop	Axes	731,1302:10000,1306:20000,1307:45000,1309:75000,1352:20000,1355:30000,1358:75000,1363:50000,1364:50000,1365:50000,1366:50000,1371:100000
-prontera,164,262,4	shop	Accessories	731,2621:-1,2622:-1,2624:30000,2618:10000,2625:30000,2626:30000,2674:10000,2648:50000,2649:50000,2627:-1,2701:75000
-prontera,164,260,4	shop	Bows	731,1702:20000,1705:50000,1708:20000,1720:50000,1723:75000,1724:75000,1725:75000
-prontera,164,258,4	shop	Staffs / Rods	731,1602:20000,1605:20000,1608:20000,1611:45000,1618:85000,1620:85000,1622:50000,1624:50000,1625:50000,1626:50000
-prontera,164,256,4	shop	Garments	405,2504:10000,2506:40000,2507:82000,2508:56000,2514:50000,2518:60000,2519:60000,2528:85000,2531:10000,2553:10000
-prontera,164,254,4	shop	Katars	405,1251:50000,1253:100000,1255:75000,1261:125000,1262:20000,1263:20000,1265:100000,1275:100000,1276:100000,1277:100000,1278:100000
-prontera,164,252,4	shop	Lower Headgear	405,2218:10000,5054:30000,2267:5000,5107:100000,2265:5000,2266:50000,2269:50000,2270:50000
-prontera,164,250,4	shop	Middle Headgear	405,2201:5000,2203:4000,2205:3500,2212:5000,2225:10000,2229:50000,2231:50000,2234:50000,2235:50000,2281:25000,2292:50000,2296:50000
-prontera,164,248,4	shop	Upper Headgear	405,2210:1000,2211:1000,2213:10000,2214:20000,2217:10000,2221:5000,2223:10000,2246:75000,2256:75000,2264:100000,2280:20000,2299:30000
-prontera,164,246,4	shop	Headgear 01	832,5380:40000,5382:40000,2269:5000,2270:5000,5107:15000,5110:15000,2247:30000:5206:10000,2245:30000,2286:35000,2296:15000,2258:45000,5161:200000,5104:40000,2295:20000,5026:30000,5032:100000,5038:30000,5229:65000,5227:65000,5228:65000,5198:50000,5058:300000,5253:80000,5252:60000,5296:100000,5231:300000,5232:300000,5233:300000,5230:300000,5234:300000,5076:50000
-prontera,164,244,4	shop	Headgear 02	832,5059:100000,5235:75000,5236:75000,5237:75000,5293:150000,5303:35000,5304:65000,5312:65000,5315:45000,5317:45000,5319:75000,5320:120000,5323:588888,5336:50000,5337:50000,5338:50000,5339:50000,5346:50000
-prontera,164,242,4	shop	Headgear 03	832,5181:300000,5102:500000,5016:75000,5349:150000,5013:700000,5022:500000,5171:1250000,5135:500000,5029:50000,5033:65000,5040:100000,5047:35000,5065:65000,5068:50000,5074:50000,5084:75000,5086:150000,5108:350000,5121:100000,5133:50000,5137:100000,5138:150000,5140:55000,5146:75000,5151:75000,5152:150000,5170:150000,5173:75000,5174:75000,5175:75000,5184:50000,5185:45000,5187:75000,5188:50000,5191:25000,5192:25000,5193:25000,5194:25000,5195:25000,5196:25000,5197:25000
-prontera,164,240,4	shop	Headgear 04	832,5200:75000,5205:100000,5211:75000,5226:50000,5238:75000,5239:75000,5240:75000,5241:75000,5242:75000,5243:50000,5325:75000,5254:100000,5255:65000,5257:50000,5297:100000,2202:45000,5258:35000,5298:50000,5276:50000,5273:50000,5275:50000,5274:50000,5259:50000,5271:250000,5272:50000,5284:50000,5286:75000,5288:50000,5289:50000,5291:55000,5292:55000,5294:55000,5352:50000,5324:100000,5359:50000,5360:50000
-prontera,164,238,4	shop	Headgear 05	832,5340:50000,5341:50000,5342:50000,5343:50000,5344:50000,5345:50000,5354:50000,5355:50000,5361:65000,5365:50000,5373:75000,5374:350000,5379:50000,5383:60000,5384:88888,5390:88888,5388:50000,5411:50000,5393:75000,5397:35000,5399:50000,5800:175000,5801:300000,5802:150000
-prontera,151,284,4	shop	Ammunition	880,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50
-prontera,153,284,4	shop	Alchemist Dealer	880,715:600,716:600,717:600,1025:200,7136:500,7135:500,7137:500,7138:500,7139:500
-prontera,155,284,4	shop	Street Dealer	880,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650
-prontera,157,284,4	shop	Sheepy Gonzales	895,12028:1000,12262:500,12016:750
+prontera,147,240,5	shop	Armor	4W_M_03,2304:10000,2306:20000,2308:20000,2310:50000,2311:50000,2313:50000,2315:75000,2317:100000,2322:20000,2326:60000,2331:75000,2342:100000,2353:75000,2364:150000,2367:100000,2399:50000
+prontera,147,242,5	shop	Shield	4W_M_03,2102:10000,2106:60000,2108:60000,2110:85000,2114:30000,2116:30000,2123:50000,2124:50000
+prontera,147,244,5	shop	Footgear	4W_M_03,2404:10000,2406:20000,2409:30000,2412:50000,2417:50000,2418:50000,2424:50000,2425:20000
+prontera,147,246,5	shop	Mace	4W_M_03,1502:10000,1505:20000,1511:20000,1514:-1,1517:-1,1520:50000,1522:100000,1523:25000,1528:50000,1529:50000,1531:50000
+prontera,147,248,5	shop	Knuckle	4_M_ROKI,1802:20000,1804:50000,1806:60000,1808:75000,1810:70000,1812:60000,1813:100000,1814:100000,1822:150000
+prontera,147,250,5	shop	Whips	4_M_ROKI,1951:10000,1953:20000,1955:30000,1962:20000,1963:50000,1972:10000,1974:10000,1976:50000
+prontera,147,252,5	shop	Instruments	4_M_ROKI,1902:10000,1904:20000,1906:-1,1908:50000,1913:50000,1914:50000,1915:50000,1916:50000,1917:50000
+prontera,147,254,5	shop	Books	4_M_ROKI,1550:30000,1551:60000,1552:51000,1559:25000,1561:75000,1564:25000,1568:70000,1569:70000,1570:70000,1571:70000,1572:50000
+prontera,147,256,5	shop	Guns	4_M_CATMAN1,13103:60000,13105:100000,13106:200000,13101:10000,13150:6000,13152:30000,13153:50000,13155:60000,13156:100000,13154:30000,13159:250000,13157:150000,13161:300000,13162:500000
+prontera,147,258,5	shop	Fuuma Shuriken	4_M_CATMAN1,7522:500,7521:500,7523:500
+prontera,147,260,5	shop	One-Handed Swords	4_M_CATMAN1,1108:10000,1117:10000,1120:100000,1124:50000,1130:100000,1131:50000,1133:50000,1138:200000,1139:200000,1145:-1,1149:50000
+prontera,147,262,5	shop	Two-Handed Swords	4_M_CATMAN1,1155:50000,1158:90000,1163:120000,1164:50000,1165:50000,1166:75000,1168:50000,1169:500000,1172:200000,1175:75000
+prontera,147,264,5	shop	Spears	4_M_JOB_BLACKSMITH,1405:20000,1408:50000,1415:100000,1417:75000,1421:75000,1422:25000
+prontera,147,238,1	shop	Dagger	4_M_JOB_BLACKSMITH,1208:20000,1211:20000,1217:20000,1223:50000,1231:75000,1235:75000,1236:75000,1237:75000
+prontera,164,264,4	shop	Axes	4_M_JOB_BLACKSMITH,1302:10000,1306:20000,1307:45000,1309:75000,1352:20000,1355:30000,1358:75000,1363:50000,1364:50000,1365:50000,1366:50000,1371:100000
+prontera,164,262,4	shop	Accessories	4_M_JOB_BLACKSMITH,2621:-1,2622:-1,2624:30000,2618:10000,2625:30000,2626:30000,2674:10000,2648:50000,2649:50000,2627:-1,2701:75000
+prontera,164,260,4	shop	Bows	4_M_JOB_BLACKSMITH,1702:20000,1705:50000,1708:20000,1720:50000,1723:75000,1724:75000,1725:75000
+prontera,164,258,4	shop	Staffs / Rods	4_M_JOB_BLACKSMITH,1602:20000,1605:20000,1608:20000,1611:45000,1618:85000,1620:85000,1622:50000,1624:50000,1625:50000,1626:50000
+prontera,164,256,4	shop	Garments	4_M_YOUNGKNIGHT,2504:10000,2506:40000,2507:82000,2508:56000,2514:50000,2518:60000,2519:60000,2528:85000,2531:10000,2553:10000
+prontera,164,254,4	shop	Katars	4_M_YOUNGKNIGHT,1251:50000,1253:100000,1255:75000,1261:125000,1262:20000,1263:20000,1265:100000,1275:100000,1276:100000,1277:100000,1278:100000
+prontera,164,252,4	shop	Lower Headgear	4_M_YOUNGKNIGHT,2218:10000,5054:30000,2267:5000,5107:100000,2265:5000,2266:50000,2269:50000,2270:50000
+prontera,164,250,4	shop	Middle Headgear	4_M_YOUNGKNIGHT,2201:5000,2203:4000,2205:3500,2212:5000,2225:10000,2229:50000,2231:50000,2234:50000,2235:50000,2281:25000,2292:50000,2296:50000
+prontera,164,248,4	shop	Upper Headgear	4_M_YOUNGKNIGHT,2210:1000,2211:1000,2213:10000,2214:20000,2217:10000,2221:5000,2223:10000,2246:75000,2256:75000,2264:100000,2280:20000,2299:30000
+prontera,164,246,4	shop	Headgear 01	4_M_REIDIN_KURS,5380:40000,5382:40000,2269:5000,2270:5000,5107:15000,5110:15000,2247:30000:5206:10000,2245:30000,2286:35000,2296:15000,2258:45000,5161:200000,5104:40000,2295:20000,5026:30000,5032:100000,5038:30000,5229:65000,5227:65000,5228:65000,5198:50000,5058:300000,5253:80000,5252:60000,5296:100000,5231:300000,5232:300000,5233:300000,5230:300000,5234:300000,5076:50000
+prontera,164,244,4	shop	Headgear 02	4_M_REIDIN_KURS,5059:100000,5235:75000,5236:75000,5237:75000,5293:150000,5303:35000,5304:65000,5312:65000,5315:45000,5317:45000,5319:75000,5320:120000,5323:588888,5336:50000,5337:50000,5338:50000,5339:50000,5346:50000
+prontera,164,242,4	shop	Headgear 03	4_M_REIDIN_KURS,5181:300000,5102:500000,5016:75000,5349:150000,5013:700000,5022:500000,5171:1250000,5135:500000,5029:50000,5033:65000,5040:100000,5047:35000,5065:65000,5068:50000,5074:50000,5084:75000,5086:150000,5108:350000,5121:100000,5133:50000,5137:100000,5138:150000,5140:55000,5146:75000,5151:75000,5152:150000,5170:150000,5173:75000,5174:75000,5175:75000,5184:50000,5185:45000,5187:75000,5188:50000,5191:25000,5192:25000,5193:25000,5194:25000,5195:25000,5196:25000,5197:25000
+prontera,164,240,4	shop	Headgear 04	4_M_REIDIN_KURS,5200:75000,5205:100000,5211:75000,5226:50000,5238:75000,5239:75000,5240:75000,5241:75000,5242:75000,5243:50000,5325:75000,5254:100000,5255:65000,5257:50000,5297:100000,2202:45000,5258:35000,5298:50000,5276:50000,5273:50000,5275:50000,5274:50000,5259:50000,5271:250000,5272:50000,5284:50000,5286:75000,5288:50000,5289:50000,5291:55000,5292:55000,5294:55000,5352:50000,5324:100000,5359:50000,5360:50000
+prontera,164,238,4	shop	Headgear 05	4_M_REIDIN_KURS,5340:50000,5341:50000,5342:50000,5343:50000,5344:50000,5345:50000,5354:50000,5355:50000,5361:65000,5365:50000,5373:75000,5374:350000,5379:50000,5383:60000,5384:88888,5390:88888,5388:50000,5411:50000,5393:75000,5397:35000,5399:50000,5800:175000,5801:300000,5802:150000
+prontera,151,284,4	shop	Ammunition	4_M_MASKMAN,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50
+prontera,153,284,4	shop	Alchemist Dealer	4_M_MASKMAN,715:600,716:600,717:600,1025:200,7136:500,7135:500,7137:500,7138:500,7139:500
+prontera,155,284,4	shop	Street Dealer	4_M_MASKMAN,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650
+prontera,157,284,4	shop	Sheepy Gonzales	4_F_KHELLY,12028:1000,12262:500,12016:750
diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
index 00963bf36..88a1897da 100644
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@@ -3,72 +3,91 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
+//= 1.4
 //===== Description: =========================================
 //= A fully functional job changer.
-//===== Additional Comments: =================================  
+//===== Additional Comments: =================================
 //= 1.1 Fixed reset on Baby job change. [Euphy]
 //= 1.2 Added Expanded Super Novice support and initial Kagerou/Oboro support. [Euphy]
 //= 1.3 Kagerou/Oboro added. [Euphy]
+//= 1.4 Improved legibility (renamed variables, replaced
+//      numbers with constants; Changed syntax to match
+//      Hercules standards; Fixed status point exploit upon
+//      Baby Novice job change. [Haru]
 //============================================================
 
-prontera,153,193,6	script	Job Master	123,{
-function Job_Menu; function A_An;
+prontera,153,193,6	script	Job Master	2_F_MAGICMASTER,{
+	function Job_Menu; function A_An;
 
 	mes "[Job Master]";
-	if (Class > 4049) {
+	if (Class > Job_Soul_Linker) {
 		mes "No more jobs are available.";
 		close;
 	}
 	if (checkfalcon() || checkcart() || checkriding() || ismounting()) {
-		mes "Please remove your "+((checkfalcon())?"falcon":"")+((checkcart())?"cart":"")+((checkriding())?"Peco":"")+((ismounting())?"mount":"")+" before proceeding.";
+		mes "Please remove your "+((checkfalcon())?"falcon":"")+((checkcart())?"cart":"")+((checkriding())?"Peco":"")+((ismounting())?"mount":"")
+		    +" before proceeding.";
 		close;
 	}
-	if (.SkillPointCheck && SkillPoint) {
+	if (.skill_point_check && SkillPoint > 0) {
 		mes "Please use all your skill points before proceeding.";
 		close;
 	}
 
-	set .@eac, eaclass();
-	set .@i, ((.ThirdClass)?roclass(.@eac&EAJ_UPPERMASK):Class);
-	if (.@i > 6 && .@i < 22) {
-		if (BaseLevel < .Rebirth[0] || JobLevel < .Rebirth[1]) {
-			set .@blvl, .Rebirth[0]-BaseLevel; set .@jlvl, .Rebirth[1]-JobLevel;
-			mes "You need "+((.@blvl>0)?.@blvl+" more base levels "+((.@jlvl>0)?"/ ":""):"")+((.@jlvl>0)?.@jlvl+" more job levels ":"")+"to continue.";
+	.@eac = eaclass();
+	.@base = .third_classes ? roclass(.@eac&EAJ_UPPERMASK) : Class;
+	if (.@base >= Job_Knight && .@base <= Job_Crusader2) {
+		if (BaseLevel < .rebirth_blevel || JobLevel < .rebirth_jlevel) {
+			.@blvl = .rebirth_blevel - BaseLevel;
+			.@jlvl = .rebirth_jlevel - JobLevel;
+			mes "You need "
+			    + (BaseLevel < .rebirth_blevel ? ((.rebirth_blevel - BaseLevel) +" more base levels "+ (JobLevel < .rebirth_jlevel ? "and " : "")) : "")
+			    + (JobLevel < .rebirth_jlevel ? (.rebirth_jlevel - JobLevel) +" more job levels " : "")
+			    + "to continue.";
 			close;
 		}
-		if (Class > 21) {
+		if (Class > Job_Crusader2) {
 			mes "Switch to third class?";
 			next;
 			Job_Menu(roclass(.@eac|EAJL_THIRD));
 			close;
 		}
-		while(1) {
+		while (true) {
 			mes "Select an option.";
 			next;
-			set .@i, select(" ~ ^0055FFRebirth^000000:"+((.ThirdClass)?" ~ ^FF0000Third Class^000000":"")+": ~ ^777777Cancel^000000");
-			if (.@i==3) close;
+			.@choice = select(" ~ ^0055FFRebirth^000000:"+(.third_classes ? " ~ ^FF0000Third Class^000000" : "")+": ~ ^777777Cancel^000000");
+			if (.@choice == 3)
+				close;
 			mes "[Job Master]";
 			mes "Are you sure?";
 			next;
-			Job_Menu(((.@i==1)?4001:roclass(.@eac|EAJL_THIRD)));
+			if (.@choice == 1)
+				Job_Menu(Job_Novice_High);
+			else
+				Job_Menu(roclass(.@eac|EAJL_THIRD));
 			mes "[Job Master]";
 		}
 	}
-	set .@j1, roclass(.@eac|EAJL_2_1); set .@j2,roclass(.@eac|EAJL_2_2);
-	if ((.@eac&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE) setarray .@exp[0],roclass(.@eac|EAJL_THIRD),99;
-	if (Class == Job_Ninja) setarray .@exp[0],.@j1,70;
-	if (.@exp[0] && .ThirdClass) {
-		if (BaseLevel < .Rebirth[0] || JobLevel < .@exp[1]) {
-			set .@blvl, .Rebirth[0]-BaseLevel; set .@jlvl, .@exp[1]-JobLevel;
-			mes "You need "+((.@blvl>0)?.@blvl+" more base levels "+((.@jlvl>0)?"/ ":""):"")+((.@jlvl>0)?.@jlvl+" more job levels ":"")+"to continue.";
+	.@job1 = roclass(.@eac|EAJL_2_1);
+	.@job2 = roclass(.@eac|EAJL_2_2);
+	if ((.@eac&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE) {
+		.@newclass = roclass(.@eac|EAJL_THIRD);
+		.@required_jlevel = 99;
+	} else if (Class == Job_Ninja) {
+		.@newclass = .@job1;
+		.@required_jlevel = 70;
+	}
+	if (.@newclass && .third_classes) {
+		if (BaseLevel < .rebirth_blevel || JobLevel < .@required_jlevel) {
+			mes "You need "
+			    + (BaseLevel < .rebirth_blevel ? ((.rebirth_blevel - BaseLevel) +" more base levels "+ (JobLevel < .@required_jlevel ? "and " : "")) : "")
+			    + (JobLevel < .@required_jlevel ? (.@required_jlevel - JobLevel) +" more job levels " : "")
+			    + "to continue.";
 			close;
 		}
-		mes "Switch to "+jobname(.@exp[0])+"?";
+		mes "Switch to "+jobname(.@newclass)+"?";
 		next;
-		Job_Menu(.@exp[0]);
+		Job_Menu(.@newclass);
 		close;
 	}
 	if (.@eac&EAJL_2)
@@ -77,114 +96,167 @@ function Job_Menu; function A_An;
 			close;
 		}
 	if ((.@eac&EAJ_BASEMASK) == EAJ_NOVICE) {
-		if (JobLevel < .JobReq[0])
-			mes "A job level of "+.JobReq[0]+" is required to change into the 1st Class.";
-		else if (Class == 4001 && .LastJob && lastJob) {
+		if (JobLevel < .jobchange_first) {
+			mes "A job level of "+.jobchange_first+" is required to change into the 1st Class.";
+		} else if (Class == Job_Novice_High && .linear_jobchange && lastJob) {
 			mes "Switch classes now?";
 			next;
 			Job_Menu(roclass((eaclass(lastJob)&EAJ_BASEMASK)|EAJL_UPPER));
-		} else switch(Class) {
-			case 0: Job_Menu(1,2,3,4,5,6,23,4046,24,25,4023);
-			case 4001: Job_Menu(4002,4003,4004,4005,4006,4007);
-			case 4023: Job_Menu(4024,4025,4026,4027,4028,4029,4045);
-			default: mes "An error has occurred."; break;
+		} else if (Class == Job_Novice) {
+			Job_Menu(Job_Swordman, Job_Mage, Job_Archer, Job_Acolyte, Job_Merchant, Job_Thief,
+			         Job_SuperNovice, Job_Taekwon, Job_Gunslinger, Job_Ninja, Job_Baby);
+		} else if (Class == Job_Novice_High) {
+			Job_Menu(Job_Swordman_High, Job_Mage_High, Job_Archer_High, Job_Acolyte_High, Job_Merchant_High, Job_Thief_High);
+		} else if (Class == Job_Baby) {
+			Job_Menu(Job_Baby_Swordman, Job_Baby_Mage, Job_Baby_Archer, Job_Baby_Acolyte, Job_Baby_Merchant, Job_Baby_Thief,
+			         Job_Super_Baby);
+		} else {
+			mes "An error has occurred.";
 		}
 		close;
 	}
-	if (roclass(.@eac|EAJL_2_1) == -1 || roclass(.@eac|EAJL_2_2) == -1)
+	if (roclass(.@eac|EAJL_2_1) == -1 || roclass(.@eac|EAJL_2_2) == -1) {
 		mes "No more jobs are available.";
-	else if (!(.@eac&EAJL_2) && JobLevel < .JobReq[1])
-		mes "A job level of "+.JobReq[1]+" is required to change into the 2nd Class.";
-	else if (.LastJob && lastJob && (.@eac&EAJL_UPPER)) {
+	} else if (!(.@eac&EAJL_2) && JobLevel < .jobchange_second) {
+		mes "A job level of "+.jobchange_second+" is required to change into the 2nd Class.";
+	} else if (.linear_jobchange && lastJob && (.@eac&EAJL_UPPER)) {
 		mes "Switch classes now?";
 		next;
-		Job_Menu(lastJob+4001);
-	} else
-		Job_Menu(.@j1,.@j2);
+		Job_Menu(lastJob+Job_Novice_High);
+	} else {
+		Job_Menu(.@job1, .@job2);
+	}
 	close;
 
 function Job_Menu {
-	while(1) {
+	while (true) {
 		if (getargcount() > 1) {
 			mes "Select a job.";
-			set .@menu$,"";
-			for(set .@i,0; .@i<getargcount(); set .@i,.@i+1)
-				set .@menu$, .@menu$+" ~ "+jobname(getarg(.@i))+":";
-			set .@menu$, .@menu$+" ~ ^777777Cancel^000000";
+			.@menu$ = "";
+			for (.@i = 0; .@i < getargcount(); ++.@i)
+				.@menu$ += " ~ "+jobname(getarg(.@i))+":";
+			.@menu$ += " ~ ^777777Cancel^000000";
 			next;
-			set .@i, getarg(select(.@menu$)-1,0);
-			if (!.@i) close;
-			if ((.@i == 23 || .@i == 4045) && BaseLevel < .SNovice) {
+			.@newjob = getarg(select(.@menu$)-1, 0);
+			if (!.@newjob) close;
+			if ((.@newjob == Job_SuperNovice || .@newjob == Job_Super_Baby) && BaseLevel < .supernovice_level) {
 				mes "[Job Master]";
-				mes "A base level of "+.SNovice+" is required to turn into a "+jobname(.@i)+".";
+				mes "A base level of "+.supernovice_level+" is required to turn into a "+jobname(.@newjob)+".";
 				close;
 			}
 			mes "[Job Master]";
 			mes "Are you sure?";
 			next;
-		} else
-			set .@i, getarg(0);
-		if (select(" ~ Change into ^0055FF"+jobname(.@i)+"^000000 class: ~ ^777777"+((getargcount() > 1)?"Go back":"Cancel")+"^000000") == 1) {
+		} else {
+			.@newjob = getarg(0);
+		}
+		if (select(" ~ Change into ^0055FF"+jobname(.@newjob)+"^000000 class: ~ ^777777"+(getargcount() > 1 ? "Go back" : "Cancel")+"^000000") == 1) {
 			mes "[Job Master]";
-			mes "You are now "+A_An(jobname(.@i))+"!";
-			if (.@i==4001 && .LastJob) set lastJob, Class;
-			jobchange .@i;
-			if (.@i==4001 || .@i==4023) resetlvl(1);
-			specialeffect2 338; specialeffect2 432;
-			if (.Platinum) callsub Get_Platinum;
+			mes "You are now "+A_An(jobname(.@newjob))+"!";
+			if (.@newjob == Job_Novice_High && .linear_jobchange)
+				lastJob = Class; // Note: This is incompatible with the Valkyrie rebirth script.
+			jobchange .@newjob;
+			if (.@newjob == Job_Novice_High)
+				resetlvl(1);
+			if (.@newjob == Job_Baby) {
+				resetlvl(4);
+				SkillPoint = 0;
+			}
+			specialeffect2 EF_ANGEL2;
+			specialeffect2 EF_ELECTRIC;
+			if (.platinum)
+				callsub Get_Platinum;
 			close;
 		}
-		if (getargcount() == 1) return;
+		if (getargcount() == 1)
+			return;
 		mes "[Job Master]";
 	}
 	end;
 }
 
 function A_An {
-	setarray .@A$[0],"a","e","i","o","u";
-	set .@B$, "_"+getarg(0);
-	for(set .@i,0; .@i<5; set .@i,.@i+1)
-		if (compare(.@B$,"_"+.@A$[.@i])) return "an "+getarg(0);
+	setarray .@vowels$, "a", "e", "i", "o", "u";
+	.@firstletter$ = strtolower(charat(getarg(0), 0));
+	for (.@i = 0; .@i < getarraysize(.@vowels); ++.@i) {
+		if (.@vowels$[.@i] == .@firstletter$)
+			return "an "+getarg(0);
+	}
 	return "a "+getarg(0);
 }
 
 Get_Platinum:
-	skill 142,1,0;
-	switch(BaseClass) {
-		case 0: if (Class !=23) skill 143,1,0; break;
-		case 1: skill 144,1,0; skill 145,1,0; skill 146,1,0; break;
-		case 2: skill 157,1,0; break;
-		case 3: skill 147,1,0; skill 148,1,0; break;
-		case 4: skill 156,1,0; break;
-		case 5: skill 153,1,0; skill 154,1,0; skill 155,1,0; break;
-		case 6: skill 149,1,0; skill 150,1,0; skill 151,1,0; skill 152,1,0; break;
-		default: break;
+	skill NV_FIRSTAID, 1, 0;
+	if (BaseClass == Job_Novice) {
+		if (Class != Job_SuperNovice)
+			skill NV_TRICKDEAD, 1, 0;
+	} else if (BaseClass == Job_Swordman) {
+		skill SM_MOVINGRECOVERY, 1, 0;
+		skill SM_FATALBLOW, 1, 0;
+		skill SM_AUTOBERSERK, 1, 0;
+	} else if (BaseClass == Job_Mage) {
+		skill MG_ENERGYCOAT, 1, 0;
+	} else if (BaseClass == Job_Archer) {
+		skill AC_MAKINGARROW, 1, 0;
+		skill AC_CHARGEARROW, 1, 0;
+	} else if (BaseClass == Job_Acolyte) {
+		skill AL_HOLYLIGHT, 1, 0;
+	} else if (BaseClass == Job_Merchant) {
+		skill MC_CARTREVOLUTION, 1, 0;
+		skill MC_CHANGECART, 1, 0;
+		skill MC_LOUD, 1, 0;
+	} else if (BaseClass == Job_Thief) {
+		skill TF_SPRINKLESAND, 1, 0;
+		skill TF_BACKSLIDING, 1, 0;
+		skill TF_PICKSTONE, 1, 0;
+		skill TF_THROWSTONE, 1, 0;
 	}
-	switch(BaseJob) {
-		case 7: skill 1001,1,0; break;
-		case 8: skill 1014,1,0; break;
-		case 9: skill 1006,1,0; break;
-		case 10: skill 1012,1,0; skill 1013,1,0; break;
-		case 11: skill 1009,1,0; break;
-		case 12: skill 1003,1,0; skill 1004,1,0; break;
-		case 14: skill 1002,1,0; break;
-		case 15: skill 1015,1,0; skill 1016,1,0; break;
-		case 16: skill 1007,1,0; skill 1008,1,0; skill 1017,1,0; skill 1018,1,0; skill 1019,1,0; break;
-		case 17: skill 1005,1,0; break;
-		case 18: skill 238,1,0; break;
-		case 19: skill 1010,1,0; break;
-		case 20: skill 1011,1,0; break;
-		default: break;
+
+	if (BaseJob == Job_Knight) {
+		skill KN_CHARGEATK, 1, 0;
+	} else if (BaseJob == Job_Priest) {
+		skill PR_REDEMPTIO, 1, 0;
+	} else if (BaseJob == Job_Wizard) {
+		skill WZ_SIGHTBLASTER, 1, 0;
+	} else if (BaseJob == Job_Blacksmith) {
+		skill BS_UNFAIRLYTRICK, 1, 0;
+		skill BS_GREED, 1, 0;
+	} else if (BaseJob == Job_Hunter) {
+		skill HT_PHANTASMIC, 1, 0;
+	} else if (BaseJob == Job_Assassin) {
+		skill AS_SONICACCEL, 1, 0;
+		skill AS_VENOMKNIFE, 1, 0;
+	} else if (BaseJob == Job_Crusader) {
+		skill CR_SHRINK, 1, 0;
+	} else if (BaseJob == Job_Monk) {
+		skill MO_KITRANSLATION, 1, 0;
+		skill MO_BALKYOUNG, 1, 0;
+	} else if (BaseJob == Job_Sage) {
+		skill SA_CREATECON, 1, 0;
+		skill SA_ELEMENTWATER, 1, 0;
+		skill SA_ELEMENTGROUND, 1, 0;
+		skill SA_ELEMENTFIRE, 1, 0;
+		skill SA_ELEMENTWIND, 1, 0;
+	} else if (BaseJob == Job_Rogue) {
+		skill RG_CLOSECONFINE, 1, 0;
+	} else if (BaseJob == Job_Alchemist) {
+		skill AM_BIOETHICS, 1, 0;
+	} else if (BaseJob == Job_Bard) {
+		skill BA_PANGVOICE, 1, 0;
+	} else if (BaseJob == Job_Dancer) {
+		skill DC_WINKCHARM, 1, 0;
 	}
 	return;
 
 OnInit:
-	setarray .Rebirth[0],99,50;	// Minimum base level, job level to rebirth OR change to third class
-	setarray .JobReq[0],10,40;	// Minimum job level to turn into 1st class, 2nd class
-	set .ThirdClass,1;		// Enable third classes? (1: yes / 0: no)
-	set .SNovice,45;		// Minimum base level to turn into Super Novice
-	set .LastJob,1;			// Enforce linear class changes? (1: yes / 0: no)
-	set .SkillPointCheck,1;		// Force player to use up all skill points? (1: yes / 0: no)
-	set .Platinum,1;		// Get platinum skills automatically? (1: yes / 0: no)
+	.rebirth_blevel = 99;    // Minimum base level to reborn OR change to third class
+	.rebirth_jlevel = 50;    // Minimum base job level to reborn OR change to third class
+	.jobchange_first = 10;   // Minimum job level to turn into 1st class
+	.jobchange_second = 40;  // Minimum job level to turn into 2nd class
+	.third_classes = 1;      // Enable third classes? (1: yes / 0: no)
+	.supernovice_level = 45; // Minimum base level to turn into Super Novice
+	.linear_jobchange = 1;   // Enforce linear class changes? (1: yes / 0: no)
+	.skill_point_check = 1;  // Force player to use up all skill points? (1: yes / 0: no)
+	.platinum = 1;           // Get platinum skills automatically? (1: yes / 0: no)
 	end;
-}
\ No newline at end of file
+}
diff --git a/npc/custom/platinum_skills.txt b/npc/custom/platinum_skills.txt
index 7f80158a3..da35da389 100644
--- a/npc/custom/platinum_skills.txt
+++ b/npc/custom/platinum_skills.txt
@@ -4,8 +4,6 @@
 //= Keichii, DarkChild
 //===== Current Version: =====================================
 //= 2.8
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Single NPC that assigns quests skills for all classes
 //===== Additional Comments: =================================
@@ -20,7 +18,7 @@
 //= 2.8 Clustered conditionals replaced with switch to include all Upper types. [Euphy]
 //============================================================
 
-prontera,128,200,6	script	Platinum Skill NPC	94,{
+prontera,128,200,6	script	Platinum Skill NPC	4_F_MAID,{
 	mes "[Platinum Skill NPC]";
 	mes "I can give you the special skills available to your job.";
 	mes "Would you like these skills now?";
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index 175471f56..68c13727b 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Bandit Beard Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Mega Man Expert & Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= A harmless quest for a simply item w/o any bonuses "Bandit Beard"
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working.
 //= 1.0 First release
 //= 1.1 Fixed some exploits, bugs and typos. Optimized 8) [Lupus]
@@ -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;
@@ -44,7 +44,7 @@ L_THREAD:
 	mes "[Bearded Man]";
 	mes "Also I would need you to get me some things for the beard.";
 	mes "They are:";
-L_LIST:
+L_List:
 	mes "^8080FFElastic Band^000000";
 	mes "^8080FF5 Animal Skins^000000";
 	mes "^8080FFBlack Dye Stuff^000000";
@@ -96,11 +96,11 @@ L_NOITEMS:
 	mes "What the hell! I can't make a beard without the items!";
 	mes "Here is the list again:";
 	emotion 23;
-	goto L_LIST;
-}  
+	goto L_List;
+}
 
 //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,14 +117,14 @@ 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;
 
 	mes "What can I do for you?";
 	next;
-	if(BEARD_QUEST == 2 ) goto L_DELIVERY;
+	if(BEARD_QUEST == 2 ) goto L_Delivery;
 
 	menu "What's in the boxes?",-,"Nothing.",M_NOPE;
 
@@ -133,7 +133,7 @@ aldeba_in,70,179,5	script	Karfa Clerk#bandit	113,{
 M_NOPE:
 	close;
 
-L_DELIVERY:
+L_Delivery:
 
 	mes "[Karfa Clerk]";
 	mes "Sorry but we have not received any ^8080FFThread^000000.";
@@ -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;
 
@@ -209,7 +209,7 @@ M_NO:
 //mobsummons -------
 alberta,1,1,1	script	BRDQ_MOBS	-1,{
 OnStart:
-	set $@beardMob,10;
+	set $@beardmob,10;
 	set $@beardMobD,0;
 	monster "alberta",65,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
 	monster "alberta",66,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
@@ -227,9 +227,9 @@ OnDie:
 	if($@beardmob > 0) end;
 	set $@beardMobD,1;
 	end;
-On1201:
-On0001:
-	set $@beardMob,0;
+OnClock1201:
+OnClock0001:
+	set $@beardmob,0;
 	set $@beardMobD,0;
 	end;
 }
diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt
index 1ba44211e..8a57d4f3e 100644
--- a/npc/custom/quests/berzebub.txt
+++ b/npc/custom/quests/berzebub.txt
@@ -11,9 +11,9 @@
 //= 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;
+	setarray .@items[0],714,25,1061,100,1095,200,618,10,1551,2,1614,1,727,20;
 	set .@n$,"[Old Woman]";
 
 	mes .@n$;
@@ -37,9 +37,9 @@ prontera,165,178,8	script	Old Woman	103,{
 	next;
 	mes .@n$;
 	mes "I need all of the following items:";
-	for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+2) {
-		mes " ~ "+.@Items[.@i+1]+"x "+getitemname(.@Items[.@i]);
-		if (countitem(.@Items[.@i]) < .@Items[.@i+1]) set .@nr,1; }
+	for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2) {
+		mes " ~ "+.@items[.@i+1]+"x "+getitemname(.@items[.@i]);
+		if (countitem(.@items[.@i]) < .@items[.@i+1]) set .@nr,1; }
 	next;
 	if(select("I have all of that!:I'll get those ASAP")==2) goto M_Leave;
 
@@ -47,8 +47,8 @@ prontera,165,178,8	script	Old Woman	103,{
 	if (.@nr) {
 		mes "You lie! Get out of here and get those items, you sorry excuse for a rock star.";
 		close; }
-	for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+2)
-		delitem .@Items[.@i], .@Items[.@i+1];
+	for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2)
+		delitem .@items[.@i], .@items[.@i+1];
 	getitem 4145,1;
 	set BerzQuest, 1;
 	mes "Congratulations! You have all the items. Here is your ^FF0000Berzebub Card^000000, as promised.";
@@ -59,4 +59,4 @@ M_Leave:
 	mes .@n$;
 	mes "Such a great item I have right here...";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/custom/quests/dead_branch.txt b/npc/custom/quests/dead_branch.txt
index 306a553c8..ef49db159 100644
--- a/npc/custom/quests/dead_branch.txt
+++ b/npc/custom/quests/dead_branch.txt
@@ -4,17 +4,15 @@
 //= GM-Yevon
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
 //===== Description: =========================================
 // Simple item trade-in quest, a person can get a Dead Branch
-// by simply providing the items: Log x3 (7201), Wooden Heart x1 (7189), 
+// by simply providing the items: Log x3 (7201), Wooden Heart x1 (7189),
 // Trunk x5 (1019), and Wooden Gnarl x1 (7222).
 //===== Additional Comments: =================================
 //= 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...";
@@ -27,10 +25,10 @@ niflheim,204,179,3	script	Mister Mobry	121,{
 	mes "[Mister Mobry]";
 	mes "I can create a spirited branch... That is, if you can provide me with the correct materials...";
 	next;
-	goto L_MENU;
+	goto L_Menu;
 
-L_MENU:
-	menu "What Do I Need?",-,"Where Can I find this Crap?",M_FIND,"Make me a Dead Branch!",M_CREATE,"Forget it...",M_END;
+L_Menu:
+	menu "What Do I Need?",-,"Where Can I find this Crap?",M_FIND,"Make me a Dead Branch!",M_CREATE,"Forget it...",M_End;
 
 	mes "[Mister Mobry]";
 	mes "Mwehehe... I see you want to control tree spirits am I right? Ok... I need:";
@@ -39,7 +37,7 @@ L_MENU:
 	mes "^1354455 Trunk^000000";
 	mes "^1354451 Wooden Gnarl^000000";
 	next;
-	goto L_MENU;
+	goto L_Menu;
 
 M_FIND:
 	mes "[Mister Mobry]";
@@ -49,7 +47,7 @@ M_FIND:
 	mes "^135445Trunks? Seriously, think wood...^000000";
 	mes "^135445Wooden Gnarl... Gibbet...^000000";
 	next;
-	goto L_MENU;
+	goto L_Menu;
 
 L_NOLOG:
 	mes "[Mister Mobry]";
@@ -97,7 +95,7 @@ L_GIVE2:
 	getitem 12103,1; //Bloody Branch
 	close;
 
-M_END:
+M_End:
 	mes "[Mister Mobry]";
 	mes "No spirit for you... then go!";
 	close;
diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt
index 4cb5c11de..eb2d1ba4c 100644
--- a/npc/custom/quests/elvenear.txt
+++ b/npc/custom/quests/elvenear.txt
@@ -4,8 +4,6 @@
 //= someone
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Elven Ears (require 75+ Base Level)
 //===== Additional Comments: =================================
@@ -13,17 +11,17 @@
 //= 1.2 Fixed exploit [Lupus]
 //============================================================
 
-geffen,127,49,5	script	Elven Ears Quest	84,{
-	mes "[Elven Ears Quest]"; 
-	mes "Hi, today's quest is...."; 
-	mes "Ah, the ^61B031Elven Ears ^000000Quest!"; 
-	next; 
+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!";
+	next;
 	menu "Requirements",L_Bl, "Make Item",-,"Cancel",L_Cancel;
 
 	mes "[Elven Ears quest]";
-	mes "Good good, let me just check"; 
+	mes "Good good, let me just check";
 	next;
-	if(countitem(2213)<1 || countitem(1040)<20 || countitem(919)<20) goto L_NoMake; 
+	if(countitem(2213)<1 || countitem(1040)<20 || countitem(919)<20) goto L_NoMake;
 	delitem 2213,1;
 	delitem 1040,20;
 	delitem 919,20;
@@ -41,11 +39,11 @@ L_NoMake:
 	mes "Please come back another time...";
 	close;
 
-L_Bl: 
+L_Bl:
 	mes "[Elven Ears Quest]";
-	mes "Ok all you have to do is collect:"; 
-	mes "^362ED61 Kitty Band^000000"; 
-	mes "^362ED620 Elder Pixie Mustaches^000000"; 
+	mes "Ok all you have to do is collect:";
+	mes "^362ED61 Kitty Band^000000";
+	mes "^362ED620 Elder Pixie Mustaches^000000";
 	mes "and ^362ED620 Animal Skin^000000";
 	next;
 	menu "Accept",-, "Leave",L_Leave;
diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt
index 37b5e52b7..497fae849 100644
--- a/npc/custom/quests/event_6_new_hats.txt
+++ b/npc/custom/quests/event_6_new_hats.txt
@@ -4,8 +4,6 @@
 //= RedxSwordxHero, Lupus
 //===== Current Version: =====================================
 //= 1.4b
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= 4 brothers give you quests to get 6 new hats (missing
 //=   from official quests)
@@ -15,16 +13,16 @@
 //= -Kafra Band, Panda Hat
 //= -Crescent Hairpin
 //===== Additional Comments: =================================
-//= Event New Hats by RedxSwordxHero 
+//= Event New Hats by RedxSwordxHero
 //= Ported and improved with timers [Lupus]
 //= Thanks to x[tsk],fixed all item requirements to iRO specs exept
 //= for hats which cannot be made on the real server. [Lupus]
 //= 1.2 removed already existing official hat quests [Lupus]
 //= 1.3 Spiffed up the NPC coords and their appearance [Lupus]
-//= 1.4 Fixed exploits. 1.4a fixed wrong item ID [Lupus] 
+//= 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;
@@ -84,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;
@@ -138,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;
@@ -222,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 fd07b8de6..c4e8187de 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -3,15 +3,23 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
+//= 1.4a
 //===== Description: =========================================
 //= Random hunting missions.
 //= Rewards are based on quest difficulty.
+//===== Additional Comments: =================================
+//= 1.0 Initial script.
+//= 1.1 Small improvements and fixes.
+//= 1.2 Added party support and replaced blacklists with an
+//=     SQL query, both thanks to AnnieRuru.
+//= 1.3 Re-added a blacklist adapted for the SQL query.
+//= 1.3a Added mission reset options.
+//= 1.4 Fix ranking table using new SQL database [ossi0110]
+//= 1.4a Fix a bug when a character has deleted, that account
+//=     can't do mission. [AnnieRuru]
 //============================================================
 
-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)+"!";
@@ -36,7 +44,7 @@ function Chk; function Cm;
 	switch(select(((!Mission0)?" ~ New Mission::":": ~ Mission Status: ~ Abandon Mission")+": ~ Information: ~ Mission Shop: ~ View Top Hunters: ~ ^777777Cancel^000000")) {
 	case 1:
 		mes "[Hunting Missions]";
-		if (#Mission_Count) {
+		if ( query_sql( "SELECT 1 FROM `char_reg_num_db` WHERE `key` = 'Mission0' AND `char_id` IN ( SELECT `char_id` FROM `char` WHERE `account_id` = "+ getcharid(3) +" )", .@dummy ) && #Mission_Count ) {
 			mes "You've started a mission";
 			mes "on another character.";
 			close;
@@ -72,10 +80,24 @@ function Chk; function Cm;
 		mes "[Hunting Missions]";
 		mes "Do you really want to";
 		mes "abandon your mission?";
-		if (.Delay) mes "Your delay time will not be reset.";
+		if (.Reset < 0 && .Delay)
+			mes "Your delay time will not be reset.";
+		else if (.Reset > 0)
+			mes "It will cost "+Cm(.Reset)+" Zeny.";
 		next;
 		switch(select(" ~ Abandon...: ~ ^777777Cancel^000000")) {
 		case 1:
+			if (.Reset > 0) {
+				if (Zeny < .Reset) {
+					mes "[Hunting Missions]";
+					mes "You don't have enough";
+					mes "Zeny to drop this mission.";
+					emotion e_sry;
+					close;
+				}
+				Zeny -= .Reset;
+				emotion e_cash;
+			}
 			mes "[Hunting Missions]";
 			mes "Alright, I've dropped";
 			mes "your current mission.";
@@ -85,7 +107,7 @@ function Chk; function Cm;
 				setd "Mission"+.@i+"_",0;
 			}
 			set #Mission_Count,0;
-			if (.Delay) set #Mission_Delay, gettimetick(2)+(.Delay*3600);
+			if (.Reset < 0 && .Delay) set #Mission_Delay, gettimetick(2)+(.Delay*3600);
 			close;
 		case 2:
 			mes "[Hunting Missions]";
@@ -107,7 +129,7 @@ function Chk; function Cm;
 	case 6:
 		mes "[Hunting Missions]";
 		mes "The top hunters are:";
-		query_sql("SELECT char_id AS id, (SELECT `name` FROM `char` WHERE char_id = id),`value` FROM `global_reg_value` WHERE str = 'Mission_Total' ORDER BY CAST(`value` AS SIGNED) DESC LIMIT 5",.@id,.@name$,.@val);
+		query_sql("SELECT char_id AS id, (SELECT `name` FROM `char` WHERE char_id = id),`value` FROM `char_reg_num_db` WHERE `key` = 'Mission_Total' ORDER BY `value` DESC LIMIT 5",.@id,.@name$,.@val);
 		for(set .@i,0; .@i<5; set .@i,.@i+1)
 			mes "  [Rank "+(.@i+1)+"]  "+((.@name$[.@i] == "")?"^777777none":"^0055FF"+.@name$[.@i]+"^000000 : ^FF0000"+.@val[.@i]+" pt.")+"^000000";
 		close;
@@ -133,7 +155,7 @@ Mission_Status:
 	set .@Mission_Points, 3+(.@j[.Quests]/.Quests/6);
 	set .@Base_Exp, #Mission_Count*.@j[.Quests+1]/5;
 	set .@Job_Exp, #Mission_Count*.@j[.Quests+2]/5;
-	set .@Zeny, #Mission_Count*.Quests*.@j[.@i]*.Modifier[2];
+	set .@zeny, #Mission_Count*.Quests*.@j[.@i]*.Modifier[2];
 
 	next;
 	mes "[Hunting Missions]";
@@ -141,7 +163,7 @@ Mission_Status:
 	mes " > Mission Points: ^0055FF"+.@Mission_Points+"^000000";
 	mes " > Base Experience: ^0055FF"+Cm(.@Base_Exp)+"^000000";
 	mes " > Job Experience: ^0055FF"+Cm(.@Job_Exp)+"^000000";
-	mes " > Zeny: ^0055FF"+Cm(.@Zeny)+"^000000";
+	mes " > Zeny: ^0055FF"+Cm(.@zeny)+"^000000";
 	if (@f) { set @f,0; return; }
 	next;
 	mes "[Hunting Missions]";
@@ -154,7 +176,7 @@ Mission_Status:
 	set #Mission_Points, #Mission_Points+.@Mission_Points;
 	set BaseExp, BaseExp+.@Base_Exp;
 	set JobExp, JobExp+.@Job_Exp;
-	set Zeny, Zeny+.@Zeny;
+	Zeny += .@zeny;
 	for(set .@i,0; .@i<.Quests; set .@i,.@i+1) {
 		setd "Mission"+.@i,0;
 		setd "Mission"+.@i+"_",0;
@@ -162,8 +184,8 @@ Mission_Status:
 	set #Mission_Count,0;
 	if (.Delay) set #Mission_Delay, gettimetick(2)+(.Delay*3600);
 	set Mission_Total, Mission_Total+1;
-	if (Mission_Total == 1) query_sql("INSERT INTO `global_reg_value` (`char_id`,`str`,`value`,`type`,`account_id`) VALUES ("+getcharid(0)+",'Mission_Total','1',3,0)");
-	else query_sql("UPDATE `global_reg_value` SET `value` = "+Mission_Total+" WHERE char_id = "+getcharid(0)+" AND `str` = 'Mission_Total'");
+	if (Mission_Total == 1) query_sql("INSERT INTO `char_reg_num_db` (`char_id`,`key`,`index`,`value`) VALUES ("+getcharid(0)+",'Mission_Total','0',1)");
+	else query_sql("UPDATE `char_reg_num_db` SET `value` = "+Mission_Total+" WHERE `char_id` = "+getcharid(0)+" AND `key` = 'Mission_Total'");
 	close;
 
 Mission_Info:
@@ -240,7 +262,7 @@ OnNPCKillEvent:
 		for(set .@i,0; .@i<$@partymembercount; set .@i,.@i+1) {
 			if (isloggedin($@partymemberaid[.@i], $@partymembercid[.@i])) {
 				attachrid $@partymemberaid[.@i];
-				if (#Mission_Count && Mission0 && HP > 0) {
+				if (#Mission_Count && Mission0 && Hp > 0) {
 					getmapxy(.@map2$,.@x2,.@y2,0);
 					if ((.@map1$ == .@map2$ || .Party == 1) && (distance(.@x1,.@y1,.@x2,.@y2) <= 30 || .Party < 3)) {
 						for(set .@j,0; .@j<.Quests; set .@j,.@j+1) {
@@ -262,6 +284,7 @@ OnInit:
 	set .Delay,12;		// Quest delay, in hours (0 to disable).
 	set .Quests,4;		// Number of subquests per mission (increases rewards).
 	set .Party,3;		// Party options: 0 (exclude party kills), 1 (include party kills), 2 (same map only), 3 (screen area only)
+	set .Reset,-1;		// Reset options: -1 (abandoning mission sets delay time), 0 (no delay time), [Zeny] (cost to abandon mission, no delay time)
 	setarray .Count[0],	// Min and max monsters per subquest (increases rewards).
 		40,70;
 	setarray .Modifier[0],	// Multipliers for Base Exp, Job Exp, and Zeny rewards.
@@ -280,4 +303,4 @@ OnInit:
 		npcshopadditem "mission_shop", .Shop[.@i], .Shop[.@i+1];
 	end;
 }
--	shop	mission_shop	-1,512:-1
\ No newline at end of file
+-	shop	mission_shop	-1,512:-1
diff --git a/npc/custom/quests/jewel_case.txt b/npc/custom/quests/jewel_case.txt
index 9ec952a23..d725a33f1 100644
--- a/npc/custom/quests/jewel_case.txt
+++ b/npc/custom/quests/jewel_case.txt
@@ -4,14 +4,12 @@
 //= Lupus
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= A quest for players at base level 99,
 //= 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 a2a154acf..4e598922d 100644
--- a/npc/custom/quests/kaho_balmung.txt
+++ b/npc/custom/quests/kaho_balmung.txt
@@ -4,8 +4,6 @@
 //= MagicalTux
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Custom quests for Balmung and Lord Kaho's Horns.
 //= WARNING: The quests are very easy, so be careful!
@@ -13,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;
@@ -44,8 +42,8 @@ prontera,158,356,4	script	Royal Messenger	105,{
 		close; }
 	for(set .@j,1; .@j<13; set .@j,.@j+2)
 		delitem getd(".@Req"+.@i+"["+.@j+"]"), getd(".@Req"+.@i+"["+(.@j+1)+"]");
-	set Zeny, Zeny-1000000;
+	Zeny -= 1000000;
 	mes "I see you already have all the items you need. Here's your "+getitemname(getd(".@Req"+.@i+"[0]"))+", as promised.";
 	getitem getd(".@Req"+.@i+"[0]"),1;
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt
index 031631b74..8c5c4d8cf 100644
--- a/npc/custom/quests/kahohorn.txt
+++ b/npc/custom/quests/kahohorn.txt
@@ -1,20 +1,18 @@
 //===== Hercules Script ======================================
 //= Lord Kaho's Horns Quest
 //===== By: ==================================================
-//= 
+//=
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Custom quest for Lord Kaho's Horns.
 //===== Additional Comments: =================================
 //= 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 .@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;
 	set .@n$, "[Lord Kaho's Servant]";
 
@@ -32,17 +30,17 @@ geffen,115,107,5	script	Lord Kaho's Servant	61,{
 	next;
 	mes .@n$;
 	for(set .@i,0; .@i<10; set .@i,.@i+1)
-		mes "1x ^0055FF"+getitemname(.@Items[.@i])+"^000000 (from "+strmobinfo(1,.@Drops[.@i])+")";
+		mes "1x ^0055FF"+getitemname(.@items[.@i])+"^000000 (from "+strmobinfo(1,.@Drops[.@i])+")";
 	next;
 	mes .@n$;
 	mes "We're not done yet, sweetie...";
 	mes "I'm a big fan of dolls, so you need to bring me these cuties!";
 	for(set .@i,10; .@i<18; set .@i,.@i+1)
-		mes "1x ^0055FF"+getitemname(.@Items[.@i])+"^000000";
+		mes "1x ^0055FF"+getitemname(.@items[.@i])+"^000000";
 	next;
 	mes .@n$;
 	mes "Finally, I've worked hard to make these horns for my master with all the items mentioned above...";
-	mes "Please include ^0055FF5 million Zeny^000000 for my efforts."; 
+	mes "Please include ^0055FF5 million Zeny^000000 for my efforts.";
 	next;
 	mes .@n$;
 	mes "Are you ready for me to make this special item?";
@@ -54,16 +52,16 @@ geffen,115,107,5	script	Lord Kaho's Servant	61,{
 		close; }
 	mes .@n$;
 	for(set .@i,0; .@i<18; set .@i,.@i+1)
-		if (!countitem(.@Items[.@i])) { set .@nr,1; break; }
+		if (!countitem(.@items[.@i])) { set .@nr,1; break; }
 	if (.@nr || countitem(714) < 3 || Zeny < 5000000) {
 		mes "I can't afford to make this if you don't bring all materials needed. Please understand this is to benefit heroes such as yourself!";
 		close; }
 	for(set .@i,0; .@i<18; set .@i,.@i+1)
-		delitem .@Items[.@i],1;
+		delitem .@items[.@i],1;
 	delitem 714,3;
-	set Zeny, Zeny-5000000;
+	Zeny -= 5000000;
 	mes "Wow! You are brave indeed!";
 	getitem 5013,1;
 	mes "Enjoy being God of Rune-Midgard!";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/custom/quests/kings_items.txt b/npc/custom/quests/kings_items.txt
index d935dac08..055315810 100644
--- a/npc/custom/quests/kings_items.txt
+++ b/npc/custom/quests/kings_items.txt
@@ -1,19 +1,17 @@
 //===== Hercules Script ======================================
 //= Event King Items
-//===== By: ================================================== 
+//===== By: ==================================================
 //= $ephiroth
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Grand Circlet Quest combined with Excalibur Quest.
 //===== Additional Comments: =================================
 //= 2006/09/27: 1.0 Release and fully working. [$ephiroth]
 //= 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;
@@ -26,15 +24,15 @@ prt_castle,80,170,4	script	King of Prontera	108,{
 	mes "If you get her these items I'm sure she'll calm down.";
 	mes "I'll give you my crown or my sword as a reward.";
 	next;
-	setarray .@Items1[0],5007,742,30,741,50,753,20,732,1,710,20,629,20;
-	setarray .@Items2[0],1137,2254,1,2282,1,714,1;
+	setarray .@items1[0],5007,742,30,741,50,753,20,732,1,710,20,629,20;
+	setarray .@items2[0],1137,2254,1,2282,1,714,1;
 	switch(select("What do you need?:I have the items!:Forget it.")) {
 		case 1:
 			for(set .@i,1; .@i<3; set .@i,.@i+1) {
 				mes "[King of Prontera]";
 				mes "If you could get me:";
-				for(set .@j,1; .@j<getarraysize(getd(".@Items"+.@i)); set .@j,.@j+2)
-					mes " ~ ^0055FF"+getd(".@Items"+.@i+"["+(.@j+1)+"]")+"^000000x "+getitemname(getd(".@Items"+.@i+"["+.@j+"]"));
+				for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2)
+					mes " ~ ^0055FF"+getd(".@items"+.@i+"["+(.@j+1)+"]")+"^000000x "+getitemname(getd(".@items"+.@i+"["+.@j+"]"));
 				mes "I'll give my "+((.@i)?"sword.":"crown.");
 				if (.@i==2) close;
 				next; }
@@ -43,16 +41,16 @@ prt_castle,80,170,4	script	King of Prontera	108,{
 			mes "What item do you want?";
 			next;
 			set .@i, select("Crown:Sword");
-			for(set .@j,1; .@j<getarraysize(getd(".@Items"+.@i)); set .@j,.@j+2)
-				if (countitem(getd(".@Items"+.@i+"["+.@j+"]")) < getd(".@Items"+.@i+"["+(.@j+1)+"]")) set .@nr,1;
+			for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2)
+				if (countitem(getd(".@items"+.@i+"["+.@j+"]")) < getd(".@items"+.@i+"["+(.@j+1)+"]")) set .@nr,1;
 			mes "[King of Prontera]";
-			if (.@nr) { 
+			if (.@nr) {
 				mes "You're missing something.";
 				mes "Come back after you get ALL the items.";
 				close; }
-			for(set .@j,1; .@j<getarraysize(getd(".@Items"+.@i)); set .@j,.@j+2)
-				delitem getd(".@Items"+.@i+"["+.@j+"]"), getd(".@Items"+.@i+"["+(.@j+1)+"]");
-			getitem getd(".@Items"+.@i+"[0]"),1;
+			for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2)
+				delitem getd(".@items"+.@i+"["+.@j+"]"), getd(".@items"+.@i+"["+(.@j+1)+"]");
+			getitem getd(".@items"+.@i+"[0]"),1;
 			mes "THANK YOU SOO MUCH!!";
 			mes "This will surely calm her down.";
 			mes "As promised, here is my "+((.@i==1)?"crown.":"sword.");
@@ -64,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;
@@ -76,4 +74,4 @@ prt_castle,84,170,4	script	King's Daughter	62,{
 	mes "Well, he won't give me what I want!!";
 	mes "He's the King of Prontera. He should be able to get me ANYTHING!!!";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index e0f1f87ee..ce2c09764 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -5,23 +5,21 @@
 //= Lupus
 //===== Current Version: =====================================
 //= 1.01
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= Custom quest for some RO mobile game bonus items 
+//= Custom quest for some RO mobile game bonus items
 //===== Additional Comments: =================================
 //= 1 May, 2006
 //= 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.";
 	mes "They are quite rare novadays...";
 	specialeffect 417;
 	next;
-	menu "Bird Nest",-,"Lion Mask",M_2,"Skeleton Manteau",M_3,"Fashion Hip Sack",M_4,"Sales Banner",M_5,"Leave",M_EXIT;
+	menu "Bird Nest",-,"Lion Mask",M_2,"Skeleton Manteau",M_3,"Fashion Hip Sack",M_4,"Sales Banner",M_5,"Leave",M_Exit;
 
 	mes "[Yakima]";
 	mes "Oh.. it's an excellent item for any beast hunter.";
@@ -36,9 +34,9 @@ gonryun,187,140,4	script	Yakima	850,{
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(5067) < 1 || countitem(916) < 920 || countitem(925) < 310) GOTO L_NOITEM;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds,
+	if(countitem(5067) < 1 || countitem(916) < 920 || countitem(925) < 310) goto L_NOITEM;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds,
 	delitem 5067,1;//Items: Sombrero,
 	delitem 916,920;//Items: Feather_of_Birds,
 	delitem 925,310;//Items: Bill_of_Birds,
@@ -63,9 +61,9 @@ M_2:
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(5098) < 1 || countitem(1030) < 10 || countitem(1029) < 30 || countitem(7267) < 300) GOTO L_NOITEM;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
+	if(countitem(5098) < 1 || countitem(1030) < 10 || countitem(1029) < 30 || countitem(7267) < 300) goto L_NOITEM;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
 	delitem 5098,1;//Items: Tiger_Mask,
 	delitem 1030,10;//Items: Tiger's_Footskin,
 	delitem 1029,30;//Items: Tiger_Skin,
@@ -92,9 +90,9 @@ M_3:
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(2508) < 1 || countitem(2506) < 2 || countitem(2609) < 3 || countitem(7207) < 10) GOTO L_NOITEM;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau,
+	if(countitem(2508) < 1 || countitem(2506) < 2 || countitem(2609) < 3 || countitem(7207) < 10) goto L_NOITEM;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau,
 	delitem 2508,1;//Items: Ragamuffin_Manteau,
 	delitem 2506,2;//Items: Manteau_,
 	delitem 2609,3;//Items: Skull_Ring,
@@ -121,9 +119,9 @@ M_4:
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(2269) < 3 || countitem(2207) < 3 || countitem(2612) < 2 || countitem(2287)<3 ) GOTO L_NOITEM;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring,
+	if(countitem(2269) < 3 || countitem(2207) < 3 || countitem(2612) < 2 || countitem(2287)<3 ) goto L_NOITEM;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring,
 	delitem 2269,3;//Items: Romantic_Flower,
 	delitem 2207,3;//Items: Fancy_Flower,
 	delitem 2612,2;//Items: Flower_Ring,
@@ -152,9 +150,9 @@ M_5:
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(975) < 1 || countitem(980) < 1 || countitem(2272) < 2 || countitem(2262) < 3 || countitem(7298) < 180 || countitem(7164) < 20) GOTO L_NOITEM;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach,
+	if(countitem(975) < 1 || countitem(980) < 1 || countitem(2272) < 2 || countitem(2262) < 3 || countitem(7298) < 180 || countitem(7164) < 20) goto L_NOITEM;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach,
 	delitem 975,1;//Items: Scarlet_Dyestuff,
 	delitem 980,1;//Items: Orange_Dyestuff,
 	delitem 2272,2;//Items: Stop_Post,
@@ -173,7 +171,7 @@ L_NOITEM:
 	emotion e_sry;
 	close;
 
-M_EXIT:
+M_Exit:
 	mes "[Yakima]";
 	mes callfunc("F_Bye");
 	close;
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt
index 3f69c73ef..fb5b7993d 100644
--- a/npc/custom/quests/quest_shop.txt
+++ b/npc/custom/quests/quest_shop.txt
@@ -3,24 +3,30 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.6
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.6a
 //===== Description: =========================================
 //= A dynamic quest shop based on Lunar's, with easier config.
 //= Includes support for multiple shops & cashpoints.
 //= Item Preview script by ToastOfDoom.
+//===== Additional Comments: =================================
+//= 1.0 Initial script.
+//= 1.2 Added category support.
+//= 1.3 More options and fixes.
+//= 1.4 Added debug settings.
+//= 1.5 Replaced categories with shop IDs.
+//= 1.6 Added support for purchasing stackables.
+//= 1.6a Added support for previewing costumes and robes.
 //============================================================
 
 // 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
 //============================================================
--	script	quest_shop	-1,{ 
+-	script	quest_shop	-1,{
 function Add; function Chk; function Slot; function A_An;
 OnInit:
 	freeloop(1);
@@ -116,13 +122,13 @@ OnBuyItem:
 		mes " > "+Chk(countitem(.@q[.@i]),.@q[.@i+1]*.@q[1])+((.ShowID)?"{"+.@q[.@i]+"} ":"")+Slot(.@q[.@i])+" ("+countitem(.@q[.@i])+"/"+(.@q[.@i+1]*.@q[1])+")^000000";
 	next;
 	setarray @qe[1], getiteminfo(.@q[0],5), getiteminfo(.@q[0],11);
-	if (((@qe[1] & 1) || (@qe[1] & 256) || (@qe[1] & 512)) && @qe[2] > 0)
+	if (@qe[2] > 0 && ((@qe[1] & 1) || (@qe[1] & 256) || (@qe[1] & 512) || (@qe[1] & 1024) || (@qe[1] & 2048) || (@qe[1] & 4096) || (@qe[1] & 4) || (@qe[1] & 8192)))
 		set .@preview,1;
 	addtimer 1000, strnpcinfo(0)+"::OnEnd";
 	while(1) {
-		switch(select(" ~ Purchase ^0055FF"+getitemname(.@q[0])+"^000000:"+((.@preview && !@qe[6])?" ~ Preview...":"")+": ~ ^777777Cancel^000000")) {
+		switch(select(" ~ Purchase ^0055FF"+getitemname(.@q[0])+"^000000:"+((.@preview && !@qe[7])?" ~ Preview...":"")+": ~ ^777777Cancel^000000")) {
 		case 1:
-			if (@qe[0]) { 
+			if (@qe[0]) {
 				mes "[Quest Shop]";
 				mes "You're missing one or more quest requirements.";
 				close;
@@ -132,19 +138,20 @@ OnBuyItem:
 				mes "^FF0000You need "+(((.@q[2]*getiteminfo(.@q[0],6))+Weight-MaxWeight)/10)+" additional weight capacity to complete this trade.^000000";
 				close;
 			}
-			if (.@q[4]) set Zeny, Zeny-(.@q[4]*.@q[1]);
+			if (.@q[4]) Zeny -= (.@q[4]*.@q[1]);
 			if (.@q[5]) setd .Points$[0], getd(.Points$[0])-(.@q[5]*.@q[1]);
 			if (.@q[6]) for(set .@i,6; .@i<getarraysize(.@q); set .@i,.@i+2)
 				delitem .@q[.@i],.@q[.@i+1]*.@q[1];
 			getitem .@q[0],.@q[2];
 			if (.Announce) announce strcharinfo(0)+" has created "+((.@q[2] > 1)?.@q[2]+"x "+getitemname(.@q[0]):A_An(getitemname(.@q[0])))+"!",0;
-			specialeffect2 699;
+			specialeffect2 EF_FLOWERLEAF;
 			close;
 		case 2:
-			setarray @qe[3], getlook(LOOK_HEAD_BOTTOM), getlook(LOOK_HEAD_TOP), getlook(LOOK_HEAD_MID), 1;
-			if (@qe[1] & 1) changelook LOOK_HEAD_BOTTOM, @qe[2];
-			if (@qe[1] & 256) changelook LOOK_HEAD_TOP, @qe[2];
-			if (@qe[1] & 512) changelook LOOK_HEAD_MID, @qe[2];
+			setarray @qe[3], getlook(LOOK_HEAD_BOTTOM), getlook(LOOK_HEAD_TOP), getlook(LOOK_HEAD_MID), getlook(LOOK_ROBE), 1;
+			if ((@qe[1] & 1) || (@qe[1] & 4096)) changelook LOOK_HEAD_BOTTOM, @qe[2];
+			else if ((@qe[1] & 256) || (@qe[1] & 1024)) changelook LOOK_HEAD_TOP, @qe[2];
+			else if ((@qe[1] & 512) || (@qe[1] & 2048)) changelook LOOK_HEAD_MID, @qe[2];
+			else if ((@qe[1] & 4) || (@qe[1] & 8192)) changelook LOOK_ROBE, @qe[2];
 			break;
 		case 3:
 			close;
@@ -152,12 +159,13 @@ OnBuyItem:
 	}
 
 OnEnd:
-	if (@qe[6]) {
+	if (@qe[7]) {
 		changelook LOOK_HEAD_BOTTOM, @qe[3];
 		changelook LOOK_HEAD_TOP, @qe[4];
 		changelook LOOK_HEAD_MID, @qe[5];
+		changelook LOOK_ROBE, @qe[6];
 	}
-	deletearray @qe[0],7;
+	deletearray @qe[0],8;
 	end;
 
 function Add {
@@ -219,4 +227,4 @@ function	script	qshop	{
 -	shop	qshop2	-1,909:-1
 -	shop	qshop3	-1,909:-1
 -	shop	qshop4	-1,909:-1
--	shop	qshop5	-1,909:-1
\ No newline at end of file
+-	shop	qshop5	-1,909:-1
diff --git a/npc/custom/quests/questboard.txt b/npc/custom/quests/questboard.txt
index abfb61a4d..3e7a90d9d 100644
--- a/npc/custom/quests/questboard.txt
+++ b/npc/custom/quests/questboard.txt
@@ -4,11 +4,9 @@
 //= tr0n
 //===== Current Version: =====================================
 //= 1.4.4
-//===== Compatible With: ===================================== 
-//= Hercules
 //===== Description: =========================================
 //= Easily add collection and hunting quests.
-//===== Additional Comments: =================================  
+//===== Additional Comments: =================================
 // 1.0.0 Release
 // 1.1.0 Added zeny reward
 // 1.2.0 Rewrote checkmob and killcounter
@@ -17,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]";
@@ -196,7 +194,7 @@ L_checkitems:
 	mes "[^FF7700Questboard^000000]";
 	mes "Congratulation! Here is your Reward.";
 	if(getd("." +currentquest$+"_collectionprize")!=0) getitem(getd("." +currentquest$+"_collectionprize"),getd("." +currentquest$+"_collectionamount"));
-	set Zeny,Zeny+getd("." +currentquest$+"_collectionzeny");
+	Zeny += getd("." +currentquest$+"_collectionzeny");
 	getexp getd("." +currentquest$+"_collectionexp["+0+"]"),getd("." +currentquest$+"_collectionexp["+1+"]");
 	setd(currentquest$ + "_collection_delay"),gettimetick(2)+.quest_delay;
 	set currentquest$, "";
@@ -230,7 +228,7 @@ L_checkmobs2:
 		setd(currentquest$+"_"+.@currentmob+"_"+.@x+"_killcount", 0);
 	}
 	if(getd("." +currentquest$+"_huntingprize")!=0) getitem(getd("." +currentquest$+"_huntingprize"),getd("." +currentquest$+"_huntingamount"));
-	set Zeny, Zeny+getd("." +currentquest$+"_huntingzeny");
+	Zeny += getd("." +currentquest$+"_huntingzeny");
 	getexp getd("." +currentquest$+"_huntingexp["+0+"]"),getd("." +currentquest$+"_huntingexp["+1+"]");
 	setd(currentquest$ + "_hunting_delay"),gettimetick(2)+.quest_delay;
 	set currentquest$, "";
@@ -288,12 +286,12 @@ function AddCollection {
 	setd ("." +.collectionquestcount+"_collectionzeny", getarg(5));
 	set .@argcount, 6;
 	set .@size, getarraysize(getd("."+ .collectionquestcount + "_collectionexp"));
-	setd ("." +.collectionquestcount+"_collectionexp["+.@size+"]",getarg(.@argcount)); 
-	setd ("." +.collectionquestcount+"_collectionexp["+(.@size+1)+"]",getarg(.@argcount+1)); 
+	setd ("." +.collectionquestcount+"_collectionexp["+.@size+"]",getarg(.@argcount));
+	setd ("." +.collectionquestcount+"_collectionexp["+(.@size+1)+"]",getarg(.@argcount+1));
 	set .@argcount, .@argcount+2;
 	while(getarg(.@argcount,-1)!=-1 && getarg(.@argcount+1,-1)!=-1) {
 		set .@size, getarraysize(getd("."+ .collectionquestcount + "_collectionitem"));
-		setd ("."+.collectionquestcount+"_collectionitem["+.@size+"]",getarg(.@argcount)); 
+		setd ("."+.collectionquestcount+"_collectionitem["+.@size+"]",getarg(.@argcount));
 		setd ("."+.collectionquestcount+"_collectionitem["+(.@size+1)+"]",getarg(.@argcount+1));
 		set .@argcount,.@argcount+2;
 	}
@@ -311,11 +309,11 @@ function AddHunting {
 	set .@size, getarraysize(getd("."+ .huntingquestcount + "_huntingexp"));
 	set .@argcount, 6;
 	setd ("." +.huntingquestcount+"_huntingexp["+.@size+"]",getarg(.@argcount));
-	setd ("." +.huntingquestcount+"_huntingexp["+(.@size+1)+"]",getarg(.@argcount+1)); 
+	setd ("." +.huntingquestcount+"_huntingexp["+(.@size+1)+"]",getarg(.@argcount+1));
 	set .@argcount, .@argcount+2;
 	while(getarg(.@argcount,-1)!=-1 && getarg(.@argcount+1,-1)!=-1) {
 		set .@size, getarraysize(getd("."+ .huntingquestcount + "_huntingmob"));
-		setd ("."+.huntingquestcount+"_huntingmob["+.@size+"]",getarg(.@argcount)); 
+		setd ("."+.huntingquestcount+"_huntingmob["+.@size+"]",getarg(.@argcount));
 		setd ("."+.huntingquestcount+"_huntingmob["+(.@size+1)+"]",getarg(.@argcount+1));
 		set .@argcount, .@argcount+2;
 	}
diff --git a/npc/custom/quests/sphinx_mask.txt b/npc/custom/quests/sphinx_mask.txt
index b2cf64559..a32828b8b 100644
--- a/npc/custom/quests/sphinx_mask.txt
+++ b/npc/custom/quests/sphinx_mask.txt
@@ -1,19 +1,17 @@
 //===== Hercules Script ======================================
 //= Sphinx Mask Quest (custom)
-//===== By: ================================================== 
+//===== By: ==================================================
 //= sabernet09
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= This quest is related to Umbalian Chief.
 //= 1.1 Removed it from official Umbala quests [Lupus]
 //= 1.2 Added a missing variable (sphmask_q) [erKURITA]
 //= 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!";
@@ -44,9 +42,9 @@ L_Menu:
 	if (Zeny < getarg(2)) {
 		mes "Are youz playin wit me? You don't have ze money!";
 		close; }
-	set Zeny, Zeny-getarg(2);
+	Zeny -= getarg(2);
 	mes "O ho ho, it's a deal, then!";
 	getitem 7114,1;
 	set sphmask_q,1;
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt
index 6e44ce007..447fca877 100644
--- a/npc/custom/quests/sunglasses.txt
+++ b/npc/custom/quests/sunglasses.txt
@@ -4,8 +4,6 @@
 //= amichan
 //===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Quest to get Slotted Sunglasses.
 //= Will reset after quest completion.
@@ -17,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.";
@@ -58,7 +56,7 @@ alberta,88,193,5	script	Sunglasses Trader	73,{
 		close; }
 	delitem 730,1;
 	delitem 949,50;
-	set Zeny, Zeny-100000;
+	Zeny -= 100000;
 	set SG_QUEST1,1;
 	mes "[Sunglasses Trader]";
 	mes "Great. Now, listen carefully.";
@@ -69,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 ?";
@@ -96,7 +94,7 @@ moc_fild07,334,186,5	script	Maseph	702,{
 		mes "You do not have enough Zeny. Come back to me when you do.";
 		close; }
 	delitem 2201,1;
-	set Zeny, Zeny-400000;
+	Zeny -= 400000;
 	mes "Thank you. I will get on it right away...";
 	next;
 	mes "[Maseph]";
@@ -105,4 +103,4 @@ moc_fild07,334,186,5	script	Maseph	702,{
 	getitem 2202,1;
 	set SG_QUEST1,0;
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/custom/quests/tha_statues.txt b/npc/custom/quests/tha_statues.txt
index a9c53a033..c4787fcd3 100644
--- a/npc/custom/quests/tha_statues.txt
+++ b/npc/custom/quests/tha_statues.txt
@@ -4,8 +4,6 @@
 //= Bibilol, Moryagorn
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Custom Thanatos Tower Quest
 //===== Additional Comments: =================================
@@ -15,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";
@@ -30,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.";
@@ -43,13 +41,13 @@ 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.";
 	next;
 	set TSQ_CHK,0;
-	warp "tha_t10",	165,	138; 
+	warp "tha_t10",	165,	138;
 	close;
 nook:
 	mes "[Mediane]";
@@ -63,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.";
@@ -76,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";
@@ -90,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.";
@@ -113,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";
@@ -126,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.";
@@ -141,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.";
@@ -155,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.";
@@ -180,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.";
@@ -192,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 !";
@@ -206,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 !";
@@ -220,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.";
@@ -234,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 752681e39..8ade6d8fd 100644
--- a/npc/custom/quests/thq/THQS_ChatingNPC.txt
+++ b/npc/custom/quests/thq/THQS_ChatingNPC.txt
@@ -4,8 +4,6 @@
 //= Fredzilla
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Start for Treasure hunter quests
 //===== Additional Comments: =================================
@@ -14,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.";
@@ -26,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.";
@@ -46,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.";
@@ -55,15 +53,15 @@ 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!";
 	close;
 N_Member:
-	set @TEMP,rand(1,2);
-	if (@TEMP == 1) goto N_Chat1;
-	if (@TEMP == 2) goto N_Chat2;
+	set @temp,rand(1,2);
+	if (@temp == 1) goto N_Chat1;
+	if (@temp == 2) goto N_Chat2;
 	mes "How are you reading this???";
 	mes "Well unless you are reading the code :)";
 	close;
@@ -76,14 +74,14 @@ 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!";
 	close;
 N_Member:
-	set @TEMP,rand(2);
-	if (@TEMP == 1) goto N_Chat;
+	set @temp,rand(2);
+	if (@temp == 1) goto N_Chat;
 	mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(0)+".";
 	mes "Did you hear about that goat man running around in the trees?";
 	mes " ";
diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt
index 01b14687f..326735a7a 100644
--- a/npc/custom/quests/thq/THQS_GuildNPC.txt
+++ b/npc/custom/quests/thq/THQS_GuildNPC.txt
@@ -4,8 +4,6 @@
 //= Fredzilla
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Start for Treasure hunter quests
 //===== Additional Comments: =================================
@@ -13,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;
@@ -27,8 +25,8 @@ yuno_in01,124,164,6	script	Guild Leader	108,{
 	mes "Umm... Well that is all you need to do. Hahaha.";
 	next;
 	menu "Pay ^FF000025,000z^000000.",-,"Thats way to high!!",N_HighPrice;
-	if (zeny < 25000) goto N_NoZeny;
-	set Zeny,Zeny-25000;
+	if (Zeny < 25000) goto N_NoZeny;
+	Zeny -= 25000;
 	//getitem 7950, 1;
 	//getitem 7951, 1;
 	set Event_THQS,1;
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 5b4d98a27..76790221b 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -4,8 +4,6 @@
 //= Fredzilla
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Start for Treasure hunter quests
 //===== Additional Comments: =================================
@@ -18,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;
@@ -32,7 +30,7 @@ yuno_in01,112,151,6	script	Quest Manager	62,{
 	mes "Good well get back out there.";
 	close;
 N_PayZeny:
-	if (zeny < 2500) goto N_ZenyFail;
+	if (Zeny < 2500) goto N_ZenyFail;
 	set one_qset, 0;
 	set two_qset, 0;
 	set three_qset, 0;
@@ -44,9 +42,9 @@ N_PayZeny:
 	set nine_qset, 0;
 	set ten_qset, 0;
 	set On_Quest, 0;
-	set Zeny,Zeny-2500;
+	Zeny -= 2500;
 	//add time delay penalty. You can get another quest after 2 - 3 hours. [Lupus]
-	set #THQ_DELAY, (GetTime(7)*12*31*24+GetTime(6)*31*24+GetTime(5)*24+GetTime(3)+rand(2,3));
+	set #THQ_DELAY, (gettime(7)*12*31*24+gettime(6)*31*24+gettime(5)*24+gettime(3)+rand(2,3));
 	mes "[Guy]";
 	mes "Its sad to see someone give a quest up...";
 	mes "Shame on you.";
@@ -61,7 +59,7 @@ N_ZenyFail:
 N_NewQuest:
 	if (Event_THQS == 0) goto N_Signup;
 	//checking if time penalty is over [Lupus]
-	if (#THQ_DELAY > (GetTime(7)*12*31*24 + GetTime(6)*31*24 + GetTime(5)*24 + GetTime(3)) ) goto L_NoQuestsForYet;
+	if (#THQ_DELAY > (gettime(7)*12*31*24 + gettime(6)*31*24 + gettime(5)*24 + gettime(3)) ) goto L_NoQuestsForYet;
 	mes "[Guy]";
 	mes "Ahh welcome fellow Treasure Hunter.";
 	mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!";
@@ -73,7 +71,7 @@ N_NewQuest:
 	mes "Ok lets see what quest we can give you today.";
 	mes "The quest names in ^FF0000This Colour^000000 mean that they are more challanging then the rest, but have better rewards.";
 	next;
-	set #THQ_DELAY,(GetTime(7)*12*31*24+GetTime(6)*31*24+GetTime(5)*24+GetTime(3) + 1); //you can get another quest after 1 hour [Lupus]
+	set #THQ_DELAY,(gettime(7)*12*31*24+gettime(6)*31*24+gettime(5)*24+gettime(3) + 1); //you can get another quest after 1 hour [Lupus]
 	emotion 21;
 	if(@treasure_job==0) set @treasure_job,rand(1,10); //doesn't allow cheaters to pick any quest they want
 	if(@treasure_job==2) goto N_JobList2;
@@ -102,7 +100,7 @@ N_Signup:
 L_NoQuestsForYet:
 	mes "[Guy]";
 	mes "I'm afraid there aren't any Quests for you yet.";
-	mes "Call in "+ (#THQ_DELAY - (GetTime(7)*12*31*24+GetTime(6)*31*24+GetTime(5)*24+GetTime(3)) )+" hours later.";
+	mes "Call in "+ (#THQ_DELAY - (gettime(7)*12*31*24+gettime(6)*31*24+gettime(5)*24+gettime(3)) )+" hours later.";
 	emotion 17;
 	close;
 
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index 70494ab9b..40e89c18b 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -4,8 +4,6 @@
 //= Fredzilla
 //===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Start for Treasure hunter quests
 //===== Additional Comments: =================================
@@ -21,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?!";
@@ -39,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.";
@@ -60,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]";
@@ -87,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]";
@@ -116,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]";
@@ -151,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]";
@@ -174,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]";
@@ -199,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]";
@@ -229,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]";
@@ -258,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]";
@@ -283,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;
@@ -311,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]";
@@ -339,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]";
@@ -373,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]";
@@ -398,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]";
@@ -424,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]";
@@ -457,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]";
@@ -484,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;
@@ -512,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]";
@@ -536,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]";
@@ -564,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]";
@@ -610,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]";
@@ -633,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]";
@@ -665,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;
@@ -692,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]";
@@ -735,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]";
@@ -780,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]";
@@ -804,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]";
@@ -830,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]";
@@ -856,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]";
@@ -879,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]";
@@ -907,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;
@@ -953,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]";
@@ -976,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]";
@@ -1001,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]";
@@ -1026,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 0a706869b..c92c375ec 100644
--- a/npc/custom/quests/thq/THQS_TTShop.txt
+++ b/npc/custom/quests/thq/THQS_TTShop.txt
@@ -3,9 +3,7 @@
 //===== By: ==================================================
 //= Fredzilla
 //===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2a
 //===== Description: =========================================
 //= Start for Treasure hunter quests
 //===== Additional Comments: =================================
@@ -14,503 +12,193 @@
 //= 1.0 - Straight conversion of Aegis NPC file
 //= 1.1 - balanced some prices, fixed 1 missing label
 //=       removed Executioner&Mysteltain swords [Lupus]
+//= 1.2 - Optmized and fixed small error [Panikon]
+//= 1.2a - Fixed zeny formula [Panikon]
 //============================================================
 
 prt_in,159,172,0	warp	thqwrp	3,3,yuno_in01,123,155
 
-prt_in,164,174,1	script	Treasure Hunter's Shop	65,{
-	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!!!";
-	next;
-	menu "How does this place work?",-,"What do you have in stock?",N_Shop,"Nevermind",N_NVM;
-	mes "[Ash]";
-	mes "Well you see here you can exchange your treasure hunter tokens for zeny or rare weapons forged by our blacksmiths.";
-	mes " ";
-	mes "Everything has its own price value and the only way you can get the tokens is by completing quests assigned to you,the system normally works like this.";
-	mes " ";
-	mes "The harder the mission the more Tokens you will earn. All red quests are worth 4-8 Tokens, and the rest are worth 1-5.";
-	mes " ";
-	mes "Hope that solves your problem and questions.";
-	close;
-N_NVM:
-	close;
+// Main configuration object
+-	script	THQS#Configuration	-1,{
+OnInit:
+	// Axes
+	setarray $THQS_menu_weapons_1[0], Sabbath, Slaughter, Tomahawk, Great_Axe, Guillotine;
+	setarray $THQS_menu_price_1[0], 160, 160, 180, 200, 200;
+	// One Handed Swords
+	setarray $THQS_menu_weapons_2[0], Edge, Solar_Sword, Scissores_Sword, Nagan, Immaterial_Sword, Excalibur, Byeorrun_Gum, Tale_Fing_;
+	setarray $THQS_menu_price_2[0], 130, 150, 170, 180, 200, 200, 240, 320;
+	// Two Handed Swords
+	setarray $THQS_menu_weapons_3[0],Dragon_Slayer, Schweizersabel, Katzbalger, Muramasa, Masamune, Balmung;
+	setarray $THQS_menu_price_3[0], 140,200,300,300,400,2000;
+	// Books
+	setarray $THQS_menu_weapons_4[0],Book_Of_Blazing_Sun, Book_Of_Billows, Book_Of_Gust_Of_Wind, Book_Of_Mother_Earth, Book_Of_The_Apocalypse, Bible, Tablet;
+	setarray $THQS_menu_price_4[0], 80, 80, 80, 80, 80, 90, 120;
+	// Bows
+	setarray $THQS_menu_weapons_5[0], Bow_Of_Rudra, Bow_Of_Roguemaster;
+	setarray $THQS_menu_price_5[0], 150, 150;
+	// Katars
+	setarray $THQS_menu_weapons_6[0], Katar_Of_Cold_Icicle,Katar_Of_Thornbush,Katar_Of_Raging_Blaze,Katar_Of_Piercing_Wind,Ghoul_Leg,Infiltrator;
+	setarray $THQS_menu_price_6[0],70,70,70,70,125,150;
+	// Knuckles
+	setarray $THQS_menu_weapons_7[0],Kaiser_Knuckle,Berserk;
+	setarray $THQS_menu_price_7[0],75,75;
+	// Maces
+	setarray $THQS_menu_weapons_8[0],Spike,Slash,Grand_Cross,Quadrille,Mjolnir;
+	setarray $THQS_menu_price_8[0],65,90,100,110,1000;
+	// Whips
+	setarray $THQS_menu_weapons_9[0],Rapture_Rose,Chemeti;
+	setarray $THQS_menu_price_9[0],50,65;
+	// Wands
+	setarray $THQS_menu_weapons_10[0],Mighty_Staff,Wizardy_Staff,Bone_Wand,Staff_Of_Soul;
+	setarray $THQS_menu_price_10[0],90,150,110,120;
+	// Cards
+	setarray $THQS_menu_cards[0],Poring_Card, Pasana_Card, Dokebi_Card, Sword_Fish_Card, Sand_Man_Card, Drainliar_Card,
+								Kaho_Card,Mandragora_Card,Vadon_Card,Mummy_Card,Zenorc_Card,Condor_Card, Zombie_Card;
+	setarray $THQS_menu_price[0],2,420,420,420,420,360,360,360,360,540,240,240,210;
 	end;
-N_Shop:
-//This is when it gets hard :)
-	mes "[Ash]";
-	mes "Ok here is our Big list of goods.";
-	mes " ";
-	mes "(Note T stands for a Treasure Token.)";
-	next;
-	menu "Trade for Zeny",-,"Trade for Weapons",N_BuyWeps,"Trade for Cards",N_BuyCards,"Nevermind",N_NVM;
-	mes "[Ash]";
-	mes "This is what we have to offer.";
-	next;
-	menu "1000z - 1T",-,"10000z - 10T",N_10T,"100000z - 100T",N_100T,"Nevermind",N_NVM;
-	if (#Treasure_Token > 0) goto N_GetZeny1k;
-	mes "You don't have enough tokens!";
-	close;
-N_GetZeny1k:
-	set #Treasure_Token,#Treasure_Token-1;
-	set zeny,zeny+1000;
-	close;
-N_10T:
-	if (#Treasure_Token > 9) goto N_GetZeny10k;
-	mes "You don't have enough tokens!";
-	close;
-N_GetZeny10k:
-	set #Treasure_Token,#Treasure_Token-10;
-	set zeny,zeny+10000;
-	close;
-N_100T:
-	if (#Treasure_Token > 99) goto N_GetZeny100k;
-	mes "You don't have enough tokens!";
-	close;
-N_GetZeny100k:
-	set #Treasure_Token,#Treasure_Token-100;
-	set zeny,zeny+100000;
-	close;
-
-N_BuyWeps:
-	mes "[Ash]";
-	mes "This is what we have to offer.";
-	next;
-	menu "Axe's",-,"1 Handed Swords",N_1HandSword,"2 Handed Swords",N_2HandSword,"Book's",N_Book,"Bow's",N_Bow,"Katar's",N_Katar,"Knuckle's",N_Knuckle,"Mace's",N_Mace,"Whips",N_Whip,"Wands",N_Wand,"Nevermind",N_NVM;
-
-	mes "[Ash]";
-	mes "This is what we have to offer.";
-	next;
-	menu "Sabbath - 160T",-,"Slaughter - 160T",N_Slau,"Tomahawk - 180T",N_Toma,"Great Axe - 200T",N_GreatA,"Guillotine - 200T",N_Guill,"Nevermind",N_NVM;
-
-	if (#Treasure_Token < 160) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-160;
-	getitem 1365,1;
-	logmes "Treasure Token: Bought a Sabbath";
-	close;
-N_Slau:
-	if (#Treasure_Token < 160) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-160;
-	getitem 1367,1;
-	logmes "Treasure Token: Bought a Slaughter";
-	close;
-N_Toma:
-	if (#Treasure_Token < 180) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-180;
-	getitem 1368,1;
-	logmes "Treasure Token: Bought a Tomahawk";
-	close;
-N_GreatA:
-	if (#Treasure_Token < 200) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-200;
-	getitem 1364,1;
-	logmes "Treasure Token: Bought a Great Axe";
-	close;
-N_Guill:
-	if (#Treasure_Token < 200) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-200;
-	getitem 1369,1;
-	logmes "Treasure Token: Bought a Guillotine";
-	close;
-N_NeedToken:
-	mes "[Ash]";
-	mes "You don't have enough tokens!";
-	close;
-
-
-N_1HandSword:
-	mes "[Ash]";
-	mes "This is what we have to offer.";
-	next;
-	menu "Edge - 130T",-,"Solar Sword - 150T",N_SolarS,"Caesar's Sword - 170T",N_CaesarS,"Nagan - 180T",N_Nagan,"Immaterial Sword - 200T",N_ImmatS,"Excalibur - 200T",N_Excal,"Byeollungum - 240T",N_Byeoll,"Talefing - 320T",N_Talef,"Nevermind",N_NVM;
-
-	if (#Treasure_Token < 130) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-130;
-	getitem 1132,1;
-	logmes "Treasure Token: Bought a Edge";
-	close;
-N_SolarS:
-	if (#Treasure_Token < 150) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-150;
-	logmes "Treasure Token: Bought a Solar Sword";
-	getitem 1136,1;
-	close;
-N_CaesarS:
-	if (#Treasure_Token < 170) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-170;
-	logmes "Treasure Token: Bought a Caesars Sword";
-	getitem 1134,1;
-	close;
-N_Nagan:
-	if (#Treasure_Token < 180) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-180;
-	logmes "Treasure Token: Bought a Nagan";
-	getitem 1130,1;
-	close;
-N_ImmatS:
-	if (#Treasure_Token < 200) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-200;
-	logmes "Treasure Token: Bought a Immaterial Sword";
-	getitem 1141,1;
-	close;
-N_Excal:
-	if (#Treasure_Token < 200) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-200;
-	logmes "Treasure Token: Bought a Excalibur";
-	getitem 1137,1;
-	close;
-N_Byeoll:
-	if (#Treasure_Token < 240) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-240;
-	logmes "Treasure Token: Bought a Byeollungum";
-	getitem 1140,1;
-	close;
-N_Talef:
-	if (#Treasure_Token < 320) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-320;
-	logmes "Treasure Token: Bought a Talefing";
-	getitem 1139,1;
-	close;
+}
 
+// Trades tokens
+// getarg(0) - number of tokens to be traded
+function	script	thqs_trade_token	{
+	@type = getarg(0);
+	if( @type == 4 )
+		close;
 
-N_2HandSword:
-	mes "[Ash]";
-	mes "This is what we have to offer.";
-	next;
-	menu "Dragon Slayer - 140T",-,"Schweizersabel - 200T",N_Schwe,"Katzbalger - 300T",N_Katzb,"Muramasa - 300T",N_Murama,"Masamune - 400T",N_Masamu,"Balmung - 2000T",N_Balmu,"Nevermind",N_NVM;
+	// 10^0, 10^1, 10^2
+	@type -= 1;
+	@price = pow(10, @type);
 
-	if (#Treasure_Token < 140) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-140;
-	logmes "Treasure Token: Bought a Dragon Slayer";
-	getitem 1166,1;
-	close;
-N_Schwe:
-	if (#Treasure_Token < 200) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-200;
-	logmes "Treasure Token: Bought a Schweizersabel";
-	getitem 1167,1;
-	close;
-N_Katzb:
-	if (#Treasure_Token < 300) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-300;
-	logmes "Treasure Token: Bought a Katzbalger";
-	getitem 1170,1;
-	close;
-N_Murama:
-	if (#Treasure_Token < 300) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-300;
-	logmes "Treasure Token: Bought a Muramasa";
-	getitem 1164,1;
-	close;
-N_Masamu:
-	if (#Treasure_Token < 400) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-400;
-	logmes "Treasure Token: Bought a Masamune";
-	getitem 1165,1;
-	close;
-N_Balmu:
-	if (#Treasure_Token < 2000) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-2000;
-	logmes "Treasure Token: Bought a Balmung";
-	getitem 1161,1;
-	close;
-
-
-N_Book:
-	mes "[Ash]";
-	mes "This is what we have to offer.";
-	next;
-	menu "Book of the Burning Sun - 80T",-,"Book of the Rough Seas - 80T",N_RoughSea,"Book of the Dry Winds - 80T",N_DryWinds,"Book of the Ripe Earth - 80T",N_RipeEarth,"Book of the Revelations - 80T",N_Revela,"Bible - 90T",N_Bible,"Tablet - 120T",N_Tablet,"Nevermind",N_NVM;
+	// 10^3, 10^4, 10^5
+	@type += 3; // So we can use pow later to determine the qt of Zeny
+	@prize = pow(10, @type);
 
-	if (#Treasure_Token < 80) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-80;
-	logmes "Treasure Token: Bought a Book of the Burning Sun";
-	getitem 1555,1;
-	close;
-N_RoughSea:
-	if (#Treasure_Token < 80) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-80;
-	logmes "Treasure Token: Bought a Book of the Rough Seas";
-	getitem 1553,1;
-	close;
-N_DryWinds:
-	if (#Treasure_Token < 80) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-80;
-	logmes "Treasure Token: Bought a Book of the Dry Winds";
-	getitem 1556,1;
-	close;
-N_RipeEarth:
-	if (#Treasure_Token < 80) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-80;
-	logmes "Treasure Token: Bought a Book of the Ripe Earth";
-	getitem 1554,1;
-	close;
-N_Revela:
-	if (#Treasure_Token < 80) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-80;
-	logmes "Treasure Token: Bought a Book of the Revelations";
-	getitem 1557,1;
-	close;
-N_Bible:
-	if (#Treasure_Token < 90) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-90;
-	logmes "Treasure Token: Bought a Bible";
-	getitem 1551,1;
-	close;
-N_Tablet:
-	if (#Treasure_Token < 120) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-120;
-	logmes "Treasure Token: Bought a Tablet";
-	getitem 1552,1;
-	close;
+	if( #Treasure_Token < @price ) {
+		mes "You don't have enough tokens!";
+		close;
+	}
 
-N_Bow:
-	mes "[Ash]";
-	mes "This is what we have to offer.";
-	next;
-	menu "Rudra's Bow - 150T",-,"Roguemaster's Bow - 150T",N_Rogue,"Nevermind",N_NVM;
+	if( Zeny == MAX_ZENY ) {
+		mes "You can't add more zeny to your character";
+		close;
+	}
 
-	if (#Treasure_Token < 150) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-150;
-	logmes "Treasure Token: Bought a Rudra Bow";
-	getitem 1720,1;
+	Zeny += @prize;
+	#Treasure_Token -= @price;
 	close;
-N_Rogue:
-	if (#Treasure_Token < 150) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-150;
-	logmes "Treasure Token: Bought a Roguemaster Bow";
-	getitem 1719,1;
-	close;
-
-N_Katar:
-	mes "[Ash]";
-	mes "This is what we have to offer.";
-	next;
-	menu "Katar of the Blazing Rage - 70T",-,"Katar of the Cold Icicle - 70T",N_ColdIce,"Katar of the Piercing Wind - 70T",N_PiercWind,"Katar of the Dusty Thornbush - 70T",N_DustyT,"Sharpened Legbone of Ghoul - 125T",N_Legbone,"Infiltrator - 150T",N_Infiltra,"Nevermind",N_NVM;
+}
 
-	if (#Treasure_Token < 70) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-70;
-	logmes "Treasure Token: Bought a Katar of the Blazing Rage";
-	getitem 1258,1;
-	close;
-N_ColdIce:
-	if (#Treasure_Token < 70) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-70;
-	logmes "Treasure Token: Bought a Katar of the Cold Icicle";
-	getitem 1256,1;
-	close;
-N_PiercWind:
-	if (#Treasure_Token < 70) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-70;
-	logmes "Treasure Token: Bought a Katar of the Piercing Wind";
-	getitem 1259,1;
-	close;
-N_DustyT:
-	if (#Treasure_Token < 70) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-70;
-	logmes "Treasure Token: Bought a Katar of the Dusty Thornbush";
-	getitem 1257,1;
-	close;
-N_Legbone:
-	if (#Treasure_Token < 125) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-125;
-	logmes "Treasure Token: Bought a Sharpened Legbone of Ghoul";
-	getitem 1260,1;
-	close;
-N_Infiltra:
-	if (#Treasure_Token < 150) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-150;
-	logmes "Treasure Token: Bought a Infiltrator";
-	getitem 1261,1;
+// Creates a buying menu
+// getarg(0) - .@mw$ -> ID
+// getarg(1) - .@mp$ -> PRICE
+function	script	thqs_menu_buy	{
+	if( getargcount() != 2 ) {
+		debugmes "thqs_menu_buy: Wrong number of arguments!!";
+		close;
+	}
+
+	.@mw$ = getarg(0);
+	.@mp$ = getarg(1);
+
+	if( getarraysize( getd(.@mw$) ) != getarraysize( getd(.@mp$) ) ) {
+		debugmes "thqs_menu_buy: Missing entries in data!";
+		close;
+	}
+
+	// Dynamic menu
+	// Uses a dynamic string and then applies it to a *select
+	.@select_menu$ = "";
+	for( .@i = 0; .@i < getarraysize( getd(.@mw$) ); .@i++ ) {
+		.@price = getd(.@mp$+"["+.@i+"]");
+
+		if( .@select_menu$ != "")
+			.@select_menu$ = .@select_menu$+":"+getitemname( getd(.@mw$+"["+.@i+"]") )+" - "+.@price+"T";
+		else
+			.@select_menu$ = getitemname( getd(.@mw$+"["+.@i+"]") )+" - "+.@price+"T";
+	}
+	.@select_menu$ = .@select_menu$ + ":Nevermind";
+	select(.@select_menu$);
+
+	if( @menu == (.@i+1) )
+		close;
+
+	@index = @menu - 1; // Arrays are 0 indexed while our menu is not
+	@item_id = getd(.@mw$+"["+@index+"]");
+	@price = getd(.@mp$+"["+@index+"]");
+	if( #Treasure_Token < @price ) {
+		mes "You don't have enough tokens!";
+		close;
+	}
+	#Treasure_Token -= @price;
+	logmes "Treasure Token: Bought a "+getitemname(@item_id);
+	getitem @item_id,1;
 	close;
+}
 
-N_Knuckle:
+// Creates the first weapon menu
+// getarg(0) - @menu
+function	script	ths_menu_weapons	{
+	@first_option = getarg(0);
+	if( @first_option == 11 )
+		close;
 	mes "[Ash]";
-	mes "This is what we have to offer.";
+	mes "This is what we have to offer."+@first_option;
 	next;
-	menu "Kaiser Knuckle - 75T",-,"Berserk - 75T",N_Berserk,"Nevermind",N_NVM;
+	// Array names so they can be used by thqs_menu_buy
+	.@mw$ = "$THQS_menu_weapons_"+@first_option;
+	.@mp$ = "$THQS_menu_price_"+@first_option;
 
-	if (#Treasure_Token < 75) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-75;
-	logmes "Treasure Token: Bought a Kaiser Knuckle";
-	getitem 1813,1;
-	close;
-N_Berserk:
-	if (#Treasure_Token < 75) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-75;
-	logmes "Treasure Token: Bought a Berserk";
-	getitem 1814,1;
-	close;
+	thqs_menu_buy(.@mw$,.@mp$);
+}
 
-N_Mace:
+// Main script
+prt_in,164,174,1	script	Treasure Hunter's Shop	1_M_YOUNGKNIGHT,{
 	mes "[Ash]";
-	mes "This is what we have to offer.";
+	mes "Ahh, "+strcharinfo(0)+"! Welcome to the Offical Treasure Hunter's Guild Shop.";
+	mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!";
 	next;
-	menu "Spike - 65T",-,"Slash - 90T",N_Slash,"Grand Cross - 100T",N_GrandC,"Quadrille - 110T",N_Quadr,"Mjolnir - 1000T",N_MJ,"Nevermind",N_NVM;
-
-	if (#Treasure_Token < 65) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-65;
-	logmes "Treasure Token: Bought a Spike";
-	getitem 1523,1;
-	close;
-N_Slash:
-	if (#Treasure_Token < 90) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-90;
-	logmes "Treasure Token: Bought a Slash";
-	getitem 1526,1;
-	close;
-N_GrandC:
-	if (#Treasure_Token < 100) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-100;
-	logmes "Treasure Token: Bought a Grand Cross";
-	getitem 1528,1;
-	close;
-N_Quadr:
-	if (#Treasure_Token < 110) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-110;
-	logmes "Treasure Token: Bought a Quadrille";
-	getitem 1527,1;
-	close;
-N_MJ:
-	if (#Treasure_Token < 1000) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-1000;
-	logmes "Treasure Token: Bought a Mjolnir";
-	getitem 1530,1;
-	close;
+	switch( select("How does this place work?","What do you have in stock?","Nevermind") ) {
+		case 1:
+			mes "[Ash]";
+			mes "Well you see here you can exchange your treasure hunter tokens for zeny or rare weapons forged by our blacksmiths.";
+			mes " ";
+			mes "Everything has its own price value and the only way you can get the tokens is by completing quests assigned to you,the system normally works like this.";
+			mes " ";
+			mes "The harder the mission the more Tokens you will earn. All red quests are worth 4-8 Tokens, and the rest are worth 1-5.";
+			mes " ";
+			mes "Hope that solves your problem and questions.";
+			close;
+		case 2:
+			break;
+		case 3:
+			close;
+	}
 
-N_Whip:
 	mes "[Ash]";
-	mes "This is what we have to offer.";
+	mes "Ok here is our Big list of goods.";
+	mes " ";
+	mes "(Note T stands for a Treasure Token.)";
 	next;
-	menu "Rapture Rose - 50T",-,"Chemeti - 65T",N_Chemeti,"Nevermind",N_NVM;
-
-	if (#Treasure_Token < 50) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-50;
-	logmes "Treasure Token: Bought a Rapture Rose";
-	getitem 1963,1;
-	close;
-N_Chemeti:
-	if (#Treasure_Token < 65) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-65;
-	logmes "Treasure Token: Bought a Chemeti";
-	getitem 1964,1;
-	close;
-
-N_Wand:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Mighty Staff - 90T",-,"Wizardry Staff - 150T",N_Wizardry,"Bone Wand - 110T",N_BoneW,"Staff of Soul - 120T",N_SOSoul,"Nevermind",N_NVM;
-
-	if (#Treasure_Token < 90) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-90;
-	logmes "Treasure Token: Bought a Mighty Staff";
-	getitem 1613,1;//Items: Mighty_Staff,
-	close;
-N_Wizardry:
-	if (#Treasure_Token < 150) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-150;
-	logmes "Treasure Token: Bought a Wizardry Staff";
-	getitem 1473,1;//Items: Wizardy_Staff,
-	close;
-N_BoneW:
-	if (#Treasure_Token < 110) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-110;
-	logmes "Treasure Token: Bought a Bone Wand";
-	getitem 1615,1;//Items: Bone_Wand,
-	close;
-N_SOSoul:
-	if (#Treasure_Token < 120) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-120;
-	logmes "Treasure Token: Bought a Staff of Soul";
-	getitem 1472,1;//Items: Staff_of_Soul,
-	close;
-
-N_BuyCards:
-	mes "[Ash]";
-	mes "This is what we have to offer. All Cards are 300T";
-	next;
-	menu "Poring Card - 2T",-,"Pasana Card - 420T",N_CPasana,"Dokebi Card - 420T",N_CDok,"Swordfish Card - 420T",N_CSFish,
-		"Sandman Card - 420T",N_CSMan,"Drainliar Card - 360T",N_CDrain,"Kaho Card - 360T",N_CKaho,"Mandragora Card - 360T",N_CMand,
-		"Vadon Card - 360T",N_CVadon,"Mummy Card - 540T",N_CMummy,"Zenorc Card - 240T",N_CZeno,"Condor Card - 240T",N_CCond,
-		"Zombie Card - 210T",N_CZomb,"Nevermind",N_NVM;
-
-	if (#Treasure_Token < 2) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-2;
-	logmes "Treasure Token: Bought a Poring Card";
-	getitem 4001,1;//Items: Poring_Card,
-	close;
-
-N_CPasana:
-	if (#Treasure_Token < 420) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-420;
-	logmes "Treasure Token: Bought a Pasana Card";
-	getitem 4099,1;//Items: Pasana_Card,
-	close;
-N_CDok:
-	if (#Treasure_Token < 420) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-420;
-	logmes "Treasure Token: Bought a Dokebi Card";
-	getitem 4098,1;//Items: Dokebi_Card,
-	close;
-N_CSFish:
-	if (#Treasure_Token < 420) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-420;
-	logmes "Treasure Token: Bought a Swordfish Card";
-	getitem 4089,1;//Items: Sword_Fish_Card,
-	close;
-N_CSMan:
-	if (#Treasure_Token < 420) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-420;
-	logmes "Treasure Token: Bought a Sandman Card";
-	getitem 4101,1;//Items: Sand_Man_Card,
-	close;
-N_CDrain:
-	if (#Treasure_Token < 360) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-360;
-	logmes "Treasure Token: Bought a Drainliar Card";
-	getitem 4069,1;//Items: Drainliar_Card,
-	close;
-N_CKaho:
-	if (#Treasure_Token < 360) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-360;
-	logmes "Treasure Token: Bought a Kaho Card";
-	getitem 4065,1;//Items: Kaho_Card,
-	close;
-N_CMand:
-	if (#Treasure_Token < 360) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-360;
-	logmes "Treasure Token: Bought a Mandragora Card";
-	getitem 4030,1;//Items: Mandragora_Card,
-	close;
-N_CVadon:
-	if (#Treasure_Token < 360) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-360;
-	logmes "Treasure Token: Bought a Vadon Card";
-	getitem 4049,1;//Items: Vadon_Card,
-	close;
-N_CMummy:
-	if (#Treasure_Token < 540) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-540;
-	logmes "Treasure Token: Bought a Mummy Card";
-	getitem 4106,1;//Items: Mummy_Card,
-	close;
-N_CZeno:
-	if (#Treasure_Token < 240) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-240;
-	logmes "Treasure Token: Bought a Zenorc Card";
-	getitem 4096,1;//Items: Zenorc_Card,
-	close;
-N_CCond:
-	if (#Treasure_Token < 240) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-240;
-	logmes "Treasure Token: Bought a Condor Card";
-	getitem 4015,1;//Items: Condor_Card,
-	close;
-N_CZomb:
-	if (#Treasure_Token < 210) goto N_NeedToken;
-	set #Treasure_Token,#Treasure_Token-210;
-	logmes "Treasure Token: Bought a Zombie Card";
-	getitem 4038,1;//Items: Zombie_Card,
-	close;
+	switch( select("Trade for zeny", "Trade for Weapons", "Trade for Cards", "Nevermind") ) {
+		case 1:
+			select("1000z - 1T","10000z - 10T","100000z - 100T","Nevermind");
+			thqs_trade_token(@menu);
+		case 2:
+			mes "[Ash]";
+			mes "This is what we have to offer.";
+			next;
+			select("Axe's","1 Handed Swords","2 Handed Swords","Book's","Bow's","Katar's","Knuckle's","Mace's","Whips","Wands","Nevermind");
+			ths_menu_weapons(@menu);
+		case 3:
+			mes "[Ash]";
+			mes "This is what we have to offer.";
+			next;
+			thqs_menu_buy("$THQS_menu_cards","$THQS_menu_price");
+		case 4:
+			close;
+	}
+	end;
 }
diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt
index f41b5500e..5bb17955e 100644
--- a/npc/custom/quests/umbalian_language.txt
+++ b/npc/custom/quests/umbalian_language.txt
@@ -4,13 +4,11 @@
 //= sabernet09
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= 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;
@@ -91,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!";
@@ -104,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;
@@ -154,13 +152,13 @@ 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;
+	if(umb_lang<2) goto L_Quest;
 	mes "You speak Umbalian fluently! So you will never forget the language of Umbalians!";
 	close;
-L_QUEST:
+L_Quest:
 	if((countitem(1006) < 1) || (countitem(7118) < 1) || (countitem(7117) < 1)) goto L_DONE;//Items: Old Magic Book, Torn Scroll, Torn Spell Book,
 	delitem 1006,1;	//Items: Old Magic Book,
 	delitem 7118,1;	//Items: Torn Scroll,
diff --git a/npc/custom/quests/valhallen.txt b/npc/custom/quests/valhallen.txt
index 07112c1c8..c70de008b 100644
--- a/npc/custom/quests/valhallen.txt
+++ b/npc/custom/quests/valhallen.txt
@@ -4,8 +4,6 @@
 //= Avaji
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= All-in-one: Mjolnir,Sleipnir,Brisingamen,Gleipnir,Megingjard
 //= Custom quest, ingredients based on official RO FAQ
@@ -13,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,";
@@ -23,46 +21,46 @@ prontera,147,171,5	script	Lenneth	811,{
 		case 1:
 			mes "[Lenneth]";
 			mes "^3355FFMjolnir^000000 is the mighty Hammer of Thor.";
-			setarray .@Items[0],1530,1531,2,984,20,985,5,969,40,7074,2,7075,4,7078,5,7087,5,7089,5;
+			setarray .@items[0],1530,1531,2,984,20,985,5,969,40,7074,2,7075,4,7078,5,7087,5,7089,5;
 			break;
 		case 2:
 			mes "[Lenneth]";
 			mes "^3355FFSleipnir^000000 are boots made after Odin's War Horse.";
-			setarray .@Items[0],2410,2406,2,984,1,969,20,985,10,7076,3,7079,5,7083,3,7086,3;
+			setarray .@items[0],2410,2406,2,984,1,969,20,985,10,7076,3,7079,5,7083,3,7086,3;
 			break;
 		case 3:
 			mes "[Lenneth]";
 			mes "^3355FFBrisingammen^000000 is the magical Necklace of Freyja, goddess of Beauty.";
-			setarray .@Items[0],2630,2603,1,726,2,722,3,727,10,723,5,969,20,7073,4,7077,4,7088,3,7090,3,7092,3;
+			setarray .@items[0],2630,2603,1,726,2,722,3,727,10,723,5,969,20,7073,4,7077,4,7088,3,7090,3,7092,3;
 			break;
 		case 4:
 			mes "[Lenneth]";
 			mes "The ^3355FFGleipnir^000000 is a light yet strong rope required to make ^3355FFMegingjard^000000";
-			setarray .@Items[0],7058,7080,4,7081,5,7082,4,7084,3,7085,3;
+			setarray .@items[0],7058,7080,4,7081,5,7082,4,7084,3,7085,3;
 			break;
 		case 5:
 			mes "[Lenneth]";
 			mes "The ^3355FFMegingjard^000000 is the powerful Belt of Thor.";
-			setarray .@Items[0],2629,7058,1,2627,1,969,10,726,10,984,5;
+			setarray .@items[0],2629,7058,1,2627,1,969,10,726,10,984,5;
 			break; }
 	mes "^FF0000The items I need are as follows:^000000";
-	for(set .@i,1; .@i<getarraysize(.@Items[0]); set .@i,.@i+2) {
-		mes " ~ "+.@Items[.@i+1]+"x ^3355FF"+getitemname(.@Items[.@i])+"^000000";
-		if (countitem(.@Items[.@i]) < .@Items[.@i+1]) set .@nr,1; }
+	for(set .@i,1; .@i<getarraysize(.@items[0]); set .@i,.@i+2) {
+		mes " ~ "+.@items[.@i+1]+"x ^3355FF"+getitemname(.@items[.@i])+"^000000";
+		if (countitem(.@items[.@i]) < .@items[.@i+1]) set .@nr,1; }
 	if (.@nr) close;
 	next;
 	mes "[Lenneth]";
-	mes "Do you desire ^3355FF"+getitemname(.@Items[0])+"^000000?";
+	mes "Do you desire ^3355FF"+getitemname(.@items[0])+"^000000?";
 	next;
 	if(select("Yes:No")==2) {
 		mes "[Lenneth]";
 		mes "Please return if you change your mind.";
 		close; }
 	mes "[Lenneth]";
-	mes "Here is your ^3355FF"+getitemname(.@Items[0])+"^000000.";
+	mes "Here is your ^3355FF"+getitemname(.@items[0])+"^000000.";
 	mes "May it serve you well.";
-	for(set .@i,1; .@i<getarraysize(.@Items); set .@i,.@i+2)
-		delitem .@Items[.@i], .@Items[.@i+1];
-	getitem .@Items[0],1;
+	for(set .@i,1; .@i<getarraysize(.@items); set .@i,.@i+2)
+		delitem .@items[.@i], .@items[.@i+1];
+	getitem .@items[0],1;
 	close;
 }
diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt
index cbb633e6a..1f8448111 100644
--- a/npc/custom/resetnpc.txt
+++ b/npc/custom/resetnpc.txt
@@ -13,7 +13,7 @@
 //= 1.3 All statuses removed upon skill reset. [Euphy]
 //============================================================
 
-prontera,150,193,4	script	Reset Girl	124,{
+prontera,150,193,4	script	Reset Girl	4_F_TELEPORTER,{
 
 	set .@ResetStat,5000;	// Zeny for stat reset
 	set .@ResetSkill,5000;	// Zeny for skill reset
@@ -33,9 +33,9 @@ prontera,150,193,4	script	Reset Girl	124,{
 			mes "Sorry, you don't have enough Zeny.";
 			close;
 		}
-		set Zeny, Zeny-.@ResetSkill;
+		Zeny -= .@ResetSkill;
 		sc_end SC_ALL;
-		ResetSkill;
+		resetskill;
 		mes "There you go!";
 		close;
 	case 2:
@@ -44,8 +44,8 @@ prontera,150,193,4	script	Reset Girl	124,{
 			mes "Sorry, you don't have enough Zeny.";
 			close;
 		}
-		set Zeny, Zeny-.@ResetStat;
-		ResetStatus;
+		Zeny -= .@ResetStat;
+		resetstatus;
 		mes "There you go!";
 		close;
 	case 3:
@@ -54,10 +54,10 @@ prontera,150,193,4	script	Reset Girl	124,{
 			mes "Sorry, you don't have enough Zeny.";
 			close;
 		}
-		set Zeny, Zeny-.@ResetBoth;
+		Zeny -= .@ResetBoth;
 		sc_end SC_ALL;
-		ResetSkill;
-		ResetStatus;
+		resetskill;
+		resetstatus;
 		mes "There you go!";
 		close;
 	case 4:
diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt
index 853553f26..4bbc8f8dd 100644
--- a/npc/custom/stylist.txt
+++ b/npc/custom/stylist.txt
@@ -4,33 +4,31 @@
 //= Euphy
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Changes your hair style, hair color, and cloth color.
-//===== Additional Comments: =================================  
+//===== Additional Comments: =================================
 //= 1.1 Switched to 'getbattleflag', credits to Saithis. [Euphy]
 //============================================================
 
-prontera,170,180,1	script	Stylist#custom_stylist	122,{
+prontera,170,180,1	script	Stylist#custom_stylist	2_M_DYEINGER,{
 
-	setarray .@Styles[1],getbattleflag("max_cloth_color"),getbattleflag("max_hair_style"),getbattleflag("max_hair_color");
+	setarray .@styles[1],getbattleflag("max_cloth_color"),getbattleflag("max_hair_style"),getbattleflag("max_hair_color");
 	setarray .@Look[1],7,1,6;
 	set .@s, select(" ~ Cloth color: ~ Hairstyle: ~ Hair color");
 	set .@Revert, getlook(.@Look[.@s]);
-	set .@Style,1;
+	set .@style,1;
 	while(1) {
-		setlook .@Look[.@s], .@Style;
-		message strcharinfo(0),"This is style #"+.@Style+".";
-		set .@menu$, " ~ Next (^0055FF"+((.@Style!=.@Styles[.@s])?.@Style+1:1)+"^000000): ~ Previous (^0055FF"+((.@Style!=1)?.@Style-1:.@Styles[.@s])+"^000000): ~ Jump to...: ~ Revert to original (^0055FF"+.@Revert+"^000000)";
+		setlook .@Look[.@s], .@style;
+		message strcharinfo(0),"This is style #"+.@style+".";
+		set .@menu$, " ~ Next (^0055FF"+((.@style!=.@styles[.@s])?.@style+1:1)+"^000000): ~ Previous (^0055FF"+((.@style!=1)?.@style-1:.@styles[.@s])+"^000000): ~ Jump to...: ~ Revert to original (^0055FF"+.@Revert+"^000000)";
 		switch(select(.@menu$)) {
-			case 1: set .@Style, ((.@Style!=.@Styles[.@s])?.@Style+1:1); break;
-			case 2: set .@Style, ((.@Style!=1)?.@Style-1:.@Styles[.@s]); break;
-			case 3: message strcharinfo(0),"Choose a style between 1 - "+.@Styles[.@s]+".";
-				input .@Style,0,.@Styles[.@s];
-				if (!.@Style) set .@Style, rand(1,.@Styles[.@s]);
+			case 1: set .@style, ((.@style!=.@styles[.@s])?.@style+1:1); break;
+			case 2: set .@style, ((.@style!=1)?.@style-1:.@styles[.@s]); break;
+			case 3: message strcharinfo(0),"Choose a style between 1 - "+.@styles[.@s]+".";
+				input .@style,0,.@styles[.@s];
+				if (!.@style) set .@style, rand(1,.@styles[.@s]);
 				break;
-			case 4: set .@Style, .@Revert; setlook .@Look[.@s], .@Revert; break;
+			case 4: set .@style, .@Revert; setlook .@Look[.@s], .@Revert; break;
 		}
 	}
 }
diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index 14dcfebf0..0b66c6a03 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -1,18 +1,23 @@
 //===== Hercules Script ======================================
 //= Warper
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= Hercules
-//===== Description: ========================================= 
+//= 1.4
+//===== Description: =========================================
 //= A complete - but very condensed - warper script.
-//= Coordinates written largely by Tekno-Kanix and ToastOfDoom.
+//= Some coordinates written by Tekno-Kanix and ToastOfDoom.
+//===== Additional Comments: =================================
+//= 1.0 Initial script.
+//= 1.1 Added missing duplicates and fixed coordinates.
+//= 1.2 Added new episodes and simplified functions.
+//= 1.3 Added Renewal checks and Instances menu.
+//=     Aligned coordinates with @go.
+//= 1.4 Added new Guild Dungeons.
 //============================================================
 
 -	script	Warper	-1,{
-function Go; function Disp; function Pick;
+function Go; function Disp; function Pick; function Restrict;
 
 // --------------------------------------------------
 //	Main Menu:
@@ -20,21 +25,31 @@ function Go; function Disp; function Pick;
 
 menu	"Last Warp ^777777["+lastwarp$+"]^000000",-,
 	" ~ Towns",Towns, " ~ Fields",Fields, " ~ Dungeons",Dungeons,
-	" ~ Guild Castles",Castles, " ~ Special Areas",Special;
+	" ~ Guild Castles",Castles, " ~ Guild Dungeons",Guild_Dungeons,
+	" ~ Instances",Instances, " ~ Special Areas",Special;
 
-	if (lastwarp$ == "") dispbottom "You have not warped anywhere yet.";
-		else warp lastwarp$,lastwarpx,lastwarpy;
+	if (lastwarp$ == "")
+		message strcharinfo(0),"You haven't warped anywhere yet.";
+	else
+		warp lastwarp$,lastwarpx,lastwarpy;
 	close;
 
 // ------------------- Functions -------------------
 // * Go("<map>",<x>,<y>);
 //	~ Warps directly to a map.
+//
 // * Disp("<Menu Option>",<first option>,<last option>);
 // * Pick("<map_prefix>"{,<index offset>});
-//	~ Dynamic menu and map selection.
-// * Disp("","<Option 1>:<Option 2>:<etc.>");
+//	~ Dynamic menu and map selection (auto-numbered).
+//
+// * Disp("<Option 1>:<Option 2>:<etc.>");
 // * Pick("","<map1>","<map2>","<etc.>");
-//	~ Manual menu and map selection.
+//	~ Manual menu and map selection (listed).
+//
+// * Restrict("<RE | Pre-RE>"{,<menu option numbers>});
+//	~ Only allows map for Renewal or Pre-Renewal modes.
+//     If menu option numbers are given, only those maps
+//     will be restricted (i.e. not for "Go").
 //
 // Other notes:
 //   ~ Array @c[] holds all (x,y) coordinates.
@@ -45,150 +60,194 @@ menu	"Last Warp ^777777["+lastwarp$+"]^000000",-,
 function Go {
 	warp getarg(0),getarg(1,0),getarg(2,0);
 	getmapxy(lastwarp$,lastwarpx,lastwarpy,0);
-	close;
+	end;
 }
 function Disp {
-	set @menu$,"";
-	if(getarg(0)=="") {
-		set @menu$,getarg(1);
-		return;
+	if (getargcount() < 3)
+		set @menu$, getarg(0);
+	else {
+		set @menu$,"";
+		for(set .@i,getarg(1); .@i<=getarg(2); set .@i,.@i+1)
+			set @menu$, @menu$+getarg(0)+" "+.@i+":";
 	}
-	for(set .@i,getarg(1); .@i<=getarg(2); set .@i,.@i+1)
-		set @menu$, @menu$+getarg(0)+" "+.@i+":";
 	return;
 }
 function Pick {
-	if(getarg(0)=="") {
-		set .@i, select(@menu$);
-		warp getarg(.@i),@c[.@i*2],@c[.@i*2+1];
+	set .@warp_block,@warp_block;
+	set @warp_block,0;
+	if (getarg(0) == "") {
+		set .@select, select(@menu$);
+		set .@i, .@select;
+		set .@map$, getarg(.@i);
 	} else {
-		set .@i, select(@menu$)-getarg(1,0);
-		warp getarg(0)+((.@i<10)?"0":"")+.@i,@c[.@i*2],@c[.@i*2+1];
+		set .@select, select(@menu$);
+		set .@i, .@select-getarg(1,0);
+		set .@map$, getarg(0)+((.@i<10)?"0":"")+.@i;
 	}
+	if (.@warp_block & (1<<.@select)) {
+		message strcharinfo(0),"This map is not enabled in "+((checkre(0))?"":"Pre-")+"Renewal.";
+		close;
+	}
+	warp .@map$,@c[.@i*2],@c[.@i*2+1];
 	getmapxy(lastwarp$,lastwarpx,lastwarpy,0);
-	close;
+	deletearray @c[0],getarraysize(@c);
+	end;
+}
+function Restrict {
+	if ((getarg(0) == "RE" && !checkre(0)) || (getarg(0) == "Pre-RE" && checkre(0))) {
+		if (getarg(1,0)) {
+			set @warp_block,0;
+			for(set .@i,1; .@i<getargcount(); set .@i,.@i+1)
+				set @warp_block, @warp_block | (1<<getarg(.@i));
+		} else {
+			message strcharinfo(0),"This map is not enabled in "+((checkre(0))?"":"Pre-")+"Renewal.";
+			close;
+		}
+	}
+	return;
 }
 
 // --------------------------------------------------
 	Towns:
 // --------------------------------------------------
 menu	"Prontera",T1, "Alberta",T2, "Aldebaran",T3, "Amatsu",T4, "Ayothaya",T5,
-	"Brasilis",T6, "Comodo",T7, "Dewata",T33, "Eclage",T34, "Einbech",T8, 
-	"Einbroch",T9, "El Dicastes",T10, "Geffen",T11, "Gonryun",T12, "Hugel",T13,
-	"Izlude",T14, "Jawaii",T15, "Lighthalzen",T16, "Louyang",T17, "Lutie",T18,
-	"Malangdo",T35, "Malaya",T36, "Manuk",T19, "Midgarts Expedition Camp",T20,
-	"Mora",T21, "Morroc",T22, "Moscovia",T23, "Nameless Island",T24,
-	"Niflheim",T25, "Payon",T26, "Rachel",T27, "Splendide",T28, "Thor Camp",T29,
-	"Umbala",T30, "Veins",T31, "Yuno",T32;
+	"Brasilis",T6, "Comodo",T7, "Dewata",T8, "Eclage",T9, "Einbech",T10,
+	"Einbroch",T11, "El Dicastes",T12, "Geffen",T13, "Gonryun",T14, "Hugel",T15,
+	"Izlude",T16, "Jawaii",T17, "Lighthalzen",T18, "Louyang",T19, "Lutie",T20,
+	"Malangdo",T21, "Malaya",T22, "Manuk",T23, "Midgarts Expedition Camp",T24,
+	"Mora",T25, "Morroc",T26, "Moscovia",T27, "Nameless Island",T28,
+	"Niflheim",T29, "Payon",T30, "Rachel",T31, "Splendide",T32, "Thor Camp",T33,
+	"Umbala",T34, "Veins",T35, "Yuno",T36;
 
 T1: Go("prontera",155,183);
 T2: Go("alberta",28,234);
 T3: Go("aldebaran",140,131);
 T4: Go("amatsu",198,84);
 T5: Go("ayothaya",208,166);
-T6: Go("brasilis",195,220);
+T6: Restrict("RE");
+	Go("brasilis",196,217);
 T7: Go("comodo",209,143);
-T8: Go("einbech",138,243);
-T9: Go("einbroch",64,200);
-T10: Go("dicastes01",197,187);
-T11: Go("geffen",120,68);
-T12: Go("gonryun",160,121);
-T13: Go("hugel",96,145);
-T14: Go("izlude",128,114);
-T15: Go("jawaii",213,230);
-T16: Go("lighthalzen",158,92);
-T17: Go("louyang",217,100);
-T18: Go("xmas",147,134);
-T19: Go("manuk",260,175);
-T20: Go("mid_camp",210,288);
-T21: Go("mora",111,97);
-T22: Go("morocc",156,93);
-T23: Go("moscovia",219,193);
-T24: Go("nameless_n",256,215);
-T25: Go("niflheim",202,174);
-T26: Go("payon",179,100);
-T27: Go("rachel",130,111);
-T28: Go("splendide",200,153);
-T29: Go("thor_camp",246,68);
-T30: Go("umbala",127,128);
-T31: Go("veins",216,123);
-T32: Go("yuno",157,51);
-T33: Go("dewata",199,179);
-T34: Go("eclage",111,39);
-T35: Go("malangdo",224,184);
-T36: Go("malaya",212,206);
+T8: Restrict("RE");
+	Go("dewata",200,180);
+T9: Restrict("RE");
+	Go("ecl_in01",48,53);
+T10: Go("einbech",63,35);
+T11: Go("einbroch",64,200);
+T12: Restrict("RE");
+	Go("dicastes01",198,187);
+T13: Go("geffen",119,59);
+T14: Go("gonryun",160,120);
+T15: Go("hugel",96,145);
+T16: Go("izlude",128,114);
+T17: Go("jawaii",251,132);
+T18: Go("lighthalzen",158,92);
+T19: Go("louyang",217,100);
+T20: Go("xmas",147,134);
+T21: Restrict("RE");
+	Go("malangdo",140,114);
+T22: Restrict("RE");
+	Go("malaya",212,206);
+T23: Go("manuk",282,138);
+T24: Go("mid_camp",210,288);
+T25: Restrict("RE");
+	Go("mora",55,146);
+T26: Go("morocc",156,93);
+T27: Go("moscovia",223,184);
+T28: Go("nameless_n",256,215);
+T29: Go("niflheim",202,174);
+T30: Go("payon",179,100);
+T31: Go("rachel",130,110);
+T32: Go("splendide",201,147);
+T33: Go("thor_camp",246,68);
+T34: Go("umbala",97,153);
+T35: Go("veins",216,123);
+T36: Go("yuno",157,51);
 
 // --------------------------------------------------
 	Fields:
 // --------------------------------------------------
 menu	"Amatsu Fields",F1, "Ayothaya Fields",F2, "Bifrost Fields", F3,
-	"Brasilis Fields",F4, "Comodo Fields",F5, "Dewata Fields",F26,
-	"Eclage Fields",F27, "Einbroch Fields",F6, "El Dicastes Fields",F7,
-	"Geffen Fields",F8, "Gonryun Fields",F9, "Hugel Fields",F10,
-	"Lighthalzen Fields",F11, "Louyang Field",F12, "Lutie Field",F13,
-	"Malaya Fields",F28, "Manuk Fields",F14, "Mjolnir Fields",F15,
-	"Moscovia Fields",F16, "Niflheim Fields",F17, "Payon Forests",F18,
-	"Prontera Fields",F19, "Rachel Fields",F20, "Sograt Deserts",F21,
-	"Splendide Fields",F22, "Umbala Fields",F23, "Veins Fields",F24,
-	"Yuno Fields",F25;
+	"Brasilis Fields",F4, "Comodo Fields",F5, "Dewata Fields",F6,
+	"Eclage Fields",F7, "Einbroch Fields",F8, "El Dicastes Fields",F9,
+	"Geffen Fields",F10, "Gonryun Fields",F11, "Hugel Fields",F12,
+	"Lighthalzen Fields",F13, "Louyang Field",F14, "Lutie Field",F15,
+	"Malaya Fields",F16, "Manuk Fields",F17, "Mjolnir Fields",F18,
+	"Moscovia Fields",F19, "Niflheim Fields",F20, "Payon Forests",F21,
+	"Prontera Fields",F22, "Rachel Fields",F23, "Sograt Deserts",F24,
+	"Splendide Fields",F25, "Umbala Fields",F26, "Veins Fields",F27,
+	"Yuno Fields",F28;
 
 F1: setarray @c[2],190,197;
 	Disp("Amatsu Field",1,1); Pick("ama_fild");
 F2: setarray @c[2],173,134,212,150;
 	Disp("Ayothaya Field",1,2); Pick("ayo_fild");
-F3: setarray @c[2],193,220,220,187;
+F3: Restrict("RE");
+	setarray @c[2],193,220,220,187;
 	Disp("Bifrost Field",1,2); Pick("bif_fild");
-F4: setarray @c[2],74,32;
+F4: Restrict("RE");
+	setarray @c[2],74,32;
 	Disp("Brasilis Field",1,1); Pick("bra_fild");
-F5: setarray @c[2],180,178,231,160,191,172,228,194,224,203,190,223,234,177,194,175,172,172;
+F5: Restrict("Pre-RE",5);
+	setarray @c[2],180,178,231,160,191,172,228,194,224,203,190,223,234,177,194,175,172,172;
 	Disp("Comodo Field",1,9); Pick("cmd_fild");
-F6: setarray @c[2],142,225,182,141,187,228,185,173,216,173,195,148,272,220,173,214,207,174,196,200;
+F6: Restrict("RE");
+	setarray @c[2],371,212;
+	Disp("Dewata Field",1,1); Pick("dew_fild");
+F7: Restrict("RE");
+	setarray @c[2],97,314;
+	Disp("Eclage Field",1,1); Pick("ecl_fild");
+F8: Restrict("Pre-RE",2,10);
+	setarray @c[2],142,225,182,141,187,228,185,173,216,173,195,148,272,220,173,214,207,174,196,200;
 	Disp("Einbroch Field",1,10); Pick("ein_fild");
-F7: setarray @c[2],143,132,143,217;
+F9: Restrict("RE");
+	setarray @c[2],143,132,143,217;
 	Disp("El Dicastes Field",1,2); Pick("dic_fild");
-F8: setarray @c[0],46,199,213,204,195,212,257,192,188,171,166,263,248,158,195,191,186,183,221,117,178,218,136,328,240,181,235,235,211,185;
+F10: Restrict("Pre-RE",13,15);
+	setarray @c[0],46,199,213,204,195,212,257,192,188,171,166,263,248,158,195,191,186,183,221,117,178,218,136,328,240,181,235,235,211,185;
 	Disp("Geffen Field",0,14); Pick("gef_fild",1);
-F9: setarray @c[2],220,227;
+F11: setarray @c[2],220,227;
 	Disp("Gonryun Field",1,1); Pick("gon_fild");
-F10: setarray @c[2],268,101,222,193,232,185,252,189,196,106,216,220,227,197;
+F12: Restrict("Pre-RE",3,7);
+	setarray @c[2],268,101,222,193,232,185,252,189,196,106,216,220,227,197;
 	Disp("Hugel Field",1,7); Pick("hu_fild");
-F11: setarray @c[2],240,179,185,235,240,226;
+F13: setarray @c[2],240,179,185,235,240,226;
 	Disp("Lighthalzen Field",1,3); Pick("lhz_fild");
-F12: setarray @c[2],229,187;
+F14: setarray @c[2],229,187;
 	Disp("Louyang Field",1,1); Pick("lou_fild");
-F13: setarray @c[2],115,145;
+F15: setarray @c[2],115,145;
 	Disp("Lutie Field",1,1); Pick("xmas_fild");
-F14: setarray @c[2],35,236,35,262,84,365;
+F16: Restrict("RE");
+	setarray @c[2],40,272,207,180;
+	Disp("Malaya Field",1,2); Pick("ma_fild");
+F17: setarray @c[2],35,236,35,262,84,365;
 	Disp("Manuk Field",1,3); Pick("man_fild");
-F15: setarray @c[2],204,120,175,193,208,213,179,180,181,240,195,270,235,202,188,215,205,144,245,223,180,206,196,208;
+F18: setarray @c[2],204,120,175,193,208,213,179,180,181,240,195,270,235,202,188,215,205,144,245,223,180,206,196,208;
 	Disp("Mjolnir Field",1,12); Pick("mjolnir_");
-F16: setarray @c[2],82,104,131,147;
+F19: setarray @c[2],82,104,131,147;
 	Disp("Moscovia Field",1,2); Pick("mosk_fild");
-F17: setarray @c[2],215,229,167,234;
+F20: setarray @c[2],215,229,167,234;
 	Disp("Niflheim Field",1,2); Pick("nif_fild");
-F18: setarray @c[2],158,206,151,219,205,148,186,247,134,204,193,235,200,177,137,189,201,224,160,205,194,150;
+F21: Restrict("Pre-RE",5,11);
+	setarray @c[2],158,206,151,219,205,148,186,247,134,204,193,235,200,177,137,189,201,224,160,205,194,150;
 	Disp("Payon Forest",1,11); Pick("pay_fild");
-F19: setarray @c[0],208,227,190,206,240,206,190,143,307,252,239,213,185,188,193,194,187,218,210,183,195,149,198,164;
+F22: setarray @c[0],208,227,190,206,240,206,190,143,307,252,239,213,185,188,193,194,187,218,210,183,195,149,198,164;
 	Disp("Prontera Field",0,11); Pick("prt_fild",1);
-F20: setarray @c[2],192,162,235,166,202,206,202,208,225,202,202,214,263,196,217,201,87,121,277,181,221,185,175,200,174,197;
+F23: Restrict("Pre-RE",2,7,9,10,11,13);
+	setarray @c[2],192,162,235,166,202,206,202,208,225,202,202,214,263,196,217,201,87,121,277,181,221,185,175,200,174,197;
 	Disp("Rachel Field",1,13); Pick("ra_fild");
-F21: setarray @c[2],219,205,177,206,194,182,224,170,198,216,156,187,185,263,206,228,208,238,209,223,85,97,207,202,31,195,38,195;
-	Disp("","Sograt Desert 1:Sograt Desert 2:Sograt Desert 3:Sograt Desert 7:Sograt Desert 11:Sograt Desert 12:Sograt Desert 13:Sograt Desert 16:Sograt Desert 17:Sograt Desert 18:Sograt Desert 19:Sograt Desert 20:Sograt Desert 21:Sograt Desert 22");
+F24: setarray @c[2],219,205,177,206,194,182,224,170,198,216,156,187,185,263,206,228,208,238,209,223,85,97,207,202,31,195,38,195;
+	Disp("Sograt Desert 1:Sograt Desert 2:Sograt Desert 3:Sograt Desert 7:Sograt Desert 11:Sograt Desert 12:Sograt Desert 13:Sograt Desert 16:Sograt Desert 17:Sograt Desert 18:Sograt Desert 19:Sograt Desert 20:Sograt Desert 21:Sograt Desert 22");
 	Pick("","moc_fild01","moc_fild02","moc_fild03","moc_fild07","moc_fild11","moc_fild12","moc_fild13","moc_fild16","moc_fild17","moc_fild18","moc_fild19","moc_fild20","moc_fild21","moc_fild22");
-F22: setarray @c[2],175,186,236,184,188,204;
+F25: setarray @c[2],175,186,236,184,188,204;
 	Disp("Splendide Field",1,3); Pick("spl_fild");
-F23: setarray @c[2],217,206,223,221,237,215,202,197;
+F26: setarray @c[2],217,206,223,221,237,215,202,197;
 	Disp("Umbala Field",1,4); Pick("um_fild");
-F24: setarray @c[2],186,175,196,370,222,45,51,250,202,324,150,223,149,307;
+F27: Restrict("Pre-RE",5);
+	setarray @c[2],186,175,196,370,222,45,51,250,202,324,150,223,149,307;
 	Disp("Veins Field",1,7); Pick("ve_fild");
-F25: setarray @c[2],189,224,192,207,221,157,226,199,223,177,187,232,231,174,196,203,183,214,200,124,195,226,210,304;
+F28: Restrict("Pre-RE",5,10);
+	setarray @c[2],189,224,192,207,221,157,226,199,223,177,187,232,231,174,196,203,183,214,200,124,195,226,210,304;
 	Disp("Yuno Field",1,12); Pick("yuno_fild");
-F26: setarray @c[2],371,212;
-	Disp("Dewata Field",1,1); Pick("dew_fild");
-F27: setarray @c[2],97,314;
-	Disp("Eclage Field",1,1); Pick("ecl_fild");
-F28: setarray @c[2],40,272,207,180;
-	Disp("Malaya Field",1,2); Pick("ma_fild");
 
 // --------------------------------------------------
 	Dungeons:
@@ -196,16 +255,15 @@ F28: setarray @c[2],40,272,207,180;
 menu	"Abyss Lakes",D1, "Amatsu Dungeon",D2, "Anthell",D3,
 	"Ayothaya Dungeon",D4, "Beach Dungeon",D5, "Bio Labs",D6,
 	"Brasilis Dungeon",D7, "Byalan Dungeon",D8, "Clock Tower",D9,
-	"Coal Mines",D10, "Culvert",D11, "Cursed Abbey",D12, "Dewata Dungeon",D41,
-	"Einbroch Dungeon",D13, "Endless Tower",D14, "Gefenia",D15,
-	"Geffen Dungeon",D16, "Glast Heim",D17, "Gonryun Dungeon",D18,
-	"Guild Dungeons",GD, "Hidden Dungeon",D19, "Ice Dungeon",D20,
-	"Juperos",D21, "Kiel Dungeon",D22, "Louyang Dungeon",D23,
-	"Magma Dungeon",D24, "Malangdo Dungeon",D42, "Moscovia Dungeon",D25,
-	"Nidhogg's Dungeon",D26, "Odin Temple",D27, "Orc Dungeon",D28, "Payon Dungeon",D29,
-	"Pyramids",D30, "Rachel Sanctuary",D31, "Scaraba Hole",D32, "Sealed Shrine",D33,
-	"Sphinx",D34, "Sunken Ship",D35, "Thanatos Tower",D36, "Thor Volcano",D37,
-	"Toy Factory",D38, "Turtle Dungeon",D39, "Umbala Dungeon",D40;
+	"Coal Mines",D10, "Culvert",D11, "Cursed Abbey",D12, "Dewata Dungeon",D13,
+	"Einbroch Dungeon",D14, "Gefenia",D15, "Geffen Dungeon",D16,
+	"Glast Heim",D17, "Gonryun Dungeon",D18, "Hidden Dungeon",D19,
+	"Ice Dungeon",D20, "Juperos",D21, "Kiel Dungeon",D22, "Louyang Dungeon",D23,
+	"Magma Dungeon",D24, "Malangdo Dungeon",D25, "Moscovia Dungeon",D26,
+	"Nidhogg's Dungeon",D27, "Odin Temple",D28, "Orc Dungeon",D29,
+	"Payon Dungeon",D30, "Pyramids",D31, "Rachel Sanctuary",D32,
+	"Scaraba Hole",D33, "Sphinx",D34, "Sunken Ship",D35, "Thanatos Tower",D36,
+	"Thor Volcano",D37, "Toy Factory",D38, "Turtle Dungeon",D39, "Umbala Dungeon",D40;
 
 D1: setarray @c[2],261,272,275,270,116,27;
 	Disp("Abyss Lakes",1,3); Pick("abyss_");
@@ -214,17 +272,20 @@ D2: setarray @c[2],228,11,34,41,119,14;
 D3: setarray @c[2],35,262,168,170;
 	Disp("Anthell",1,2); Pick("anthell");
 D4: setarray @c[2],275,19,24,26;
-	Disp("","Ancient Shrine Maze:Inside Ancient Shrine"); Pick("ayo_dun");
+	Disp("Ancient Shrine Maze:Inside Ancient Shrine"); Pick("ayo_dun");
 D5: setarray @c[2],266,67,255,244,23,260;
 	Disp("Beach Dungeon",1,3); Pick("","beach_dun","beach_dun2","beach_dun3");
-D6: setarray @c[2],150,288,150,18,140,134;
-	Disp("Bio Lab",1,3); Pick("lhz_dun");
-D7: setarray @c[2],87,47,262,262;
+D6: Restrict("RE",4);
+	setarray @c[2],150,288,150,18,140,134,244,52;
+	Disp("Bio Lab",1,4); Pick("lhz_dun");
+D7: Restrict("RE");
+	setarray @c[2],87,47,262,262;
 	Disp("Brasilis Dungeon",1,2); Pick("bra_dun");
-D8: setarray @c[0],168,168,253,252,236,204,32,63,26,27;
-	Disp("Byalan Dungeon",1,5); Pick("iz_dun",1);
+D8: Restrict("RE",6);
+	setarray @c[0],168,168,253,252,236,204,32,63,26,27,141,187;
+	Disp("Byalan Dungeon",1,6); Pick("iz_dun",1);
 D9: setarray @c[2],199,159,148,283,65,147,56,155,297,25,127,169,277,178,268,74;
-	Disp("","Clock Tower 1:Clock Tower 2:Clock Tower 3:Clock Tower 4:Basement 1:Basement 2:Basement 3:Basement 4");
+	Disp("Clock Tower 1:Clock Tower 2:Clock Tower 3:Clock Tower 4:Basement 1:Basement 2:Basement 3:Basement 4");
 	Pick("","c_tower1","c_tower2","c_tower3","c_tower4","alde_dun01","alde_dun02","alde_dun03","alde_dun04");
 D10: setarray @c[2],52,17,381,343,302,262;
 	Disp("Coal Mines",1,3); Pick("mjo_dun");
@@ -232,16 +293,17 @@ D11: setarray @c[2],131,247,19,19,180,169,100,92;
 	Disp("Culvert",1,4); Pick("","prt_sewb1","prt_sewb2","prt_sewb3","prt_sewb4");
 D12: setarray @c[2],51,14,150,11,120,10;
 	Disp("Cursed Abbey",1,3); Pick("abbey");
-D13: setarray @c[2],22,14,292,290;
+D13: Restrict("RE");
+	setarray @c[2],285,160,299,29;
+	Disp("Dewata Dungeon",1,2); Pick("dew_dun");
+D14: setarray @c[2],22,14,292,290;
 	Disp("Einbroch Dungeon",1,2); Pick("ein_dun");
-D14: setarray @c[2],72,112;
-	Disp("","Misty Island"); Pick("","e_tower");
 D15: setarray @c[2],40,103,203,34,266,168,130,272;
 	Disp("Gefenia",1,4); Pick("gefenia",0);
 D16: setarray @c[0],104,99,115,236,106,132,203,200;
 	Disp("Geffen Dungeon",1,4); Pick("gef_dun",1);
-D17: setarray @c[2],375,304,199,29,104,25,150,15,157,287,147,15,258,255,108,291,171,283,68,277,156,7,12,7,133,271,224,274,14,70,150,14;
-	Disp("","Entrance:Castle 1:Castle 2:Chivalry 1:Chivalry 2:Churchyard:Culvert 1:Culvert 2:Culvert 3:Culvert 4:St. Abbey:Staircase Dungeon:Underground Cave 1:Underground Cave 2:Underground Prison 1:Underground Prison 2");
+D17: setarray @c[2],370,304,199,29,104,25,150,15,157,287,147,15,258,255,108,291,171,283,68,277,156,7,12,7,133,271,224,274,14,70,150,14;
+	Disp("Entrance:Castle 1:Castle 2:Chivalry 1:Chivalry 2:Churchyard:Culvert 1:Culvert 2:Culvert 3:Culvert 4:St. Abbey:Staircase Dungeon:Underground Cave 1:Underground Cave 2:Underground Prison 1:Underground Prison 2");
 	Pick("","glast_01","gl_cas01","gl_cas02","gl_knt01","gl_knt02","gl_chyard","gl_sew01","gl_sew02","gl_sew03","gl_sew04","gl_church","gl_step","gl_dun01","gl_dun02","gl_prison","gl_prison1");
 D18: setarray @c[2],153,53,28,113,68,16;
 	Disp("Gonryun Dungeon",1,3); Pick("gon_dun");
@@ -250,32 +312,34 @@ D19: setarray @c[2],176,7,93,20,23,8;
 D20: setarray @c[2],157,14,151,155,149,22,33,158;
 	Disp("Ice Dungeon",1,4); Pick("ice_dun");
 D21: setarray @c[2],140,51,53,247,37,63,150,285;
-	Disp("","Entrance:Juperos 1:Juperos 2:Core");
+	Disp("Entrance:Juperos 1:Juperos 2:Core");
 	Pick("","jupe_cave","juperos_01","juperos_02","jupe_core");
 D22: setarray @c[2],28,226,41,198;
 	Disp("Kiel Dungeon",1,2); Pick("kh_dun");
 D23: setarray @c[2],218,196,282,20,165,38;
-	Disp("","The Royal Tomb:Inside the Royal Tomb:Suei Long Gon"); Pick("lou_dun");
+	Disp("The Royal Tomb:Inside the Royal Tomb:Suei Long Gon"); Pick("lou_dun");
 D24: setarray @c[2],126,68,47,30;
 	Disp("Magma Dungeon",1,2); Pick("mag_dun");
-D25: setarray @c[2],189,48,165,30,32,135;
+D25: Restrict("RE");
+	setarray @c[2],33,230;
+	Disp("Malangdo Dungeon",1,1); Pick("mal_dun");
+D26: setarray @c[2],189,48,165,30,32,135;
 	Disp("Moscovia Dungeon",1,3); Pick("mosk_dun");
-D26: setarray @c[2],61,239,60,271;
+D27: setarray @c[2],61,239,60,271;
 	Disp("Nidhogg's Dungeon",1,2); Pick("nyd_dun");
-D27: setarray @c[2],298,167,224,149,266,280;
+D28: setarray @c[2],298,167,224,149,266,280;
 	Disp("Odin Temple",1,3); Pick("odin_tem");
-D28: setarray @c[2],32,170,21,185;
+D29: setarray @c[2],32,170,21,185;
 	Disp("Orc Dungeon",1,2); Pick("orcsdun");
-D29: setarray @c[0],21,183,19,33,19,63,155,159,201,204;
+D30: setarray @c[0],21,183,19,33,19,63,155,159,201,204;
 	Disp("Payon Dungeon",1,5); Pick("pay_dun",1);
-D30: setarray @c[2],192,9,10,192,100,92,181,11,94,96,192,8;
-	Disp("","Pyramids 1:Pyramids 2:Pyramids 3:Pyramids 4:Basement 1:Basement 2"); Pick("moc_pryd");
-D31: setarray @c[2],140,11,32,21,4,149,204,218,150,9;
+D31: setarray @c[2],192,9,10,192,100,92,181,11,94,96,192,8;
+	Disp("Pyramids 1:Pyramids 2:Pyramids 3:Pyramids 4:Basement 1:Basement 2"); Pick("moc_pryd");
+D32: setarray @c[2],140,11,32,21,4,149,204,218,150,9;
 	Disp("Rachel Sanctuary",1,5); Pick("ra_san");
-D32: setarray @c[2],364,44,101,141;
+D33: Restrict("RE");
+	setarray @c[2],364,44,101,141;
 	Disp("Scaraba Hole",1,2); Pick("dic_dun");
-D33: setarray @c[2],306,143;
-	Disp("","Friar Patrick"); Pick("","monk_test");
 D34: setarray @c[2],288,9,149,81,210,54,10,222,100,99;
 	Disp("Sphinx",1,5); Pick("","in_sphinx1","in_sphinx2","in_sphinx3","in_sphinx4","in_sphinx5");
 D35: setarray @c[2],69,24,102,27;
@@ -287,17 +351,11 @@ D37: setarray @c[2],21,228,75,205,34,272;
 D38: setarray @c[2],205,15,129,133;
 	Disp("Toy Factory",1,2); Pick("xmas_dun");
 D39: setarray @c[2],154,49,148,261,132,189,100,192;
-	Disp("","Entrance:Turtle Dungeon 1:Turtle Dungeon 2:Turtle Dungeon 3"); Pick("tur_dun");
-D40: setarray @c[2],42,31,48,30,204,78;
-	Disp("","Carpenter's Shop in the Tree:Passage to a Foreign World:Hvergermil's Fountain");
+	Disp("Entrance:Turtle Dungeon 1:Turtle Dungeon 2:Turtle Dungeon 3"); Pick("tur_dun");
+D40: Restrict("Pre-RE",1,2);
+	setarray @c[2],42,31,48,30,204,78;
+	Disp("Carpenter's Shop in the Tree:Passage to a Foreign World:Hvergermil's Fountain");
 	Pick("","um_dun01","um_dun02","yggdrasil01");
-D41: setarray @c[2],285,160,299,29;
-	Disp("Dewata Dungeon",1,2); Pick("dew_dun");
-D42: setarray @c[2],33,230;
-	Disp("Malangdo Dungeon",1,1); Pick("mal_dun");
-GD: setarray @c[2],119,93,39,161,50,44,116,45,199,195,200,124;
-	Disp("","Baldur:Luina:Valkyrie:Britoniah:Arunafeltz:Schwaltzvalt");
-	Pick("","gld_dun01","gld_dun02","gld_dun03","gld_dun04","arug_dun01","schg_dun01");
 
 // --------------------------------------------------
 	Castles:
@@ -306,86 +364,132 @@ menu	"Aldebaran Castles",C1, "Geffen Castles",C2, "Payon Castles",C3,
 	"Prontera Castles",C4, "Arunafeltz Castles",C5, "Schwaltzvalt Castles",C6;
 
 C1: setarray @c[2],48,83,95,249,142,85,239,242,264,90;
-	Disp("","Neuschwanstein:Hohenschwangau:Nuenberg:Wuerzburg:Rothenburg");
+	Disp("Neuschwanstein:Hohenschwangau:Nuenberg:Wuerzburg:Rothenburg");
 	Pick("","alde_gld","alde_gld","alde_gld","alde_gld","alde_gld");
 C2: setarray @c[2],214,75,308,240,143,240,193,278,305,87;
-	Disp("","Repherion:Eeyolbriggar:Yesnelph:Bergel:Mersetzdeitz");
+	Disp("Repherion:Eeyolbriggar:Yesnelph:Bergel:Mersetzdeitz");
 	Pick("","gef_fild13","gef_fild13","gef_fild13","gef_fild13","gef_fild13");
 C3: setarray @c[2],121,233,295,116,317,293,140,160,204,266;
-	Disp("","Bright Arbor:Scarlet Palace:Holy Shadow:Sacred Altar:Bamboo Grove Hill");
+	Disp("Bright Arbor:Scarlet Palace:Holy Shadow:Sacred Altar:Bamboo Grove Hill");
 	Pick("","pay_gld","pay_gld","pay_gld","pay_gld","pay_gld");
 C4: setarray @c[2],134,65,240,128,153,137,111,240,208,240;
-	Disp("","Kriemhild:Swanhild:Fadhgridh:Skoegul:Gondul");
+	Disp("Kriemhild:Swanhild:Fadhgridh:Skoegul:Gondul");
 	Pick("","prt_gld","prt_gld","prt_gld","prt_gld","prt_gld");
 C5: setarray @c[2],158,272,83,47,68,155,299,345,292,107;
-	Disp("","Mardol:Cyr:Horn:Gefn:Banadis");
+	Disp("Mardol:Cyr:Horn:Gefn:Banadis");
 	Pick("","aru_gld","aru_gld","aru_gld","aru_gld","aru_gld");
 C6: setarray @c[2],293,100,288,252,97,196,137,90,71,315;
-	Disp("","Himinn:Andlangr:Viblainn:Hljod:Skidbladnir");
+	Disp("Himinn:Andlangr:Viblainn:Hljod:Skidbladnir");
 	Pick("","sch_gld","sch_gld","sch_gld","sch_gld","sch_gld");
 
 // --------------------------------------------------
+	Guild_Dungeons:
+// --------------------------------------------------
+menu	"Baldur",G1, "Luina",G2, "Valkyrie",G3, "Britoniah",G4,
+	"Arunafeltz",G5, "Schwaltzvalt",G6;
+
+G1: Restrict("RE",2,3);
+	setarray @c[2],119,93,119,93,120,130;
+	Disp("Baldur F1:Baldur F2:Hall of Abyss");
+	Pick("","gld_dun01","gld_dun01_2","gld2_pay");
+G2: Restrict("RE",2,3);
+	setarray @c[2],39,161,39,161,147,155;
+	Disp("Luina F1:Luina F2:Hall of Abyss");
+	Pick("","gld_dun02","gld_dun02_2","gld2_ald");
+G3: Restrict("RE",2,3);
+	setarray @c[2],50,44,50,44,140,132;
+	Disp("Valkyrie F1:Valkyrie F2:Hall of Abyss");
+	Pick("","gld_dun03","gld_dun03_2","gld2_prt");
+G4: Restrict("RE",2,3);
+	setarray @c[2],116,45,116,45,152,118;
+	Disp("Britoniah F1:Britoniah F2:Hall of Abyss");
+	Pick("","gld_dun04","gld_dun04_2","gld2_gef");
+G5: Go("arug_dun01",199,195);
+G6: Go("schg_dun01",200,124);
+
+// --------------------------------------------------
+	Instances:
+// --------------------------------------------------
+
+menu	"Endless Tower",I1, "Hazy Forest",I2, "Malangdo Culvert",I3,
+	"Nidhoggur's Nest",I4, "Octopus Cave",I5, "Orc's Memory",I6, "Sealed Shrine",I7;
+
+I1: Go("e_tower",72,112);
+I2: Restrict("RE");
+	Go("bif_fild01",161,334);
+I3: Restrict("RE");
+	Go("mal_in01",164,21);
+I4: Go("nyd_dun02",95,193);
+I5: Restrict("RE");
+	Go("mal_dun01",152,230);
+I6: Go("gef_fild10",240,198);
+I7: Go("monk_test",306,143);
+
+// --------------------------------------------------
 	Special:
 // --------------------------------------------------
-menu	"Auction Hall",S1, "Battlegrounds",S2, "Casino",S3, "Gonryun Arena",S4,
-	"Izlude Arena",S5, "Monster Race Arena",S6, "Turbo Track",S7;
+menu	"Auction Hall",S1, "Battlegrounds",S2, "Casino",S3, "Eden Group Headquarters",S4,
+	"Gonryun Arena",S5, "Izlude Arena",S6, "Monster Race Arena",S7, "Turbo Track",S8;
 
 S1: Go("auction_01",22,68);
 S2: Go("bat_room",154,150);
 S3: Go("cmd_in02",179,129);
-S4: Go("gon_test",48,10);
-S5: Go("arena_room",100,88);
-S6: Go("p_track01",62,41);
-S7: Go("turbo_room",99,114);
+S4: Restrict("RE");
+	Go("moc_para01",31,14);
+S5: Go("gon_test",48,10);
+S6: Go("arena_room",100,88);
+S7: Go("p_track01",62,41);
+S8: Go("turbo_room",99,114);
 }
 
 // --------------------------------------------------
 //	Duplicates:
 // --------------------------------------------------
-prontera,159,192,4	duplicate(Warper)	Warper#1	811
-rachel,135,116,4	duplicate(Warper)	Warper#2	811
-alberta,28,240,4	duplicate(Warper)	Warper#3	811
-aldebaran,145,118,4	duplicate(Warper)	Warper#4	811
-amatsu,203,87,4	duplicate(Warper)	Warper#5	811
-ayothaya,209,169,6	duplicate(Warper)	Warper#6	811
-comodo,194,158,4	duplicate(Warper)	Warper#7	811
-einbech,142,246,4	duplicate(Warper)	Warper#8	811
-einbroch,69,202,4	duplicate(Warper)	Warper#9	811
-hugel,101,151,4	duplicate(Warper)	Warper#10	811
-lighthalzen,151,101,6	duplicate(Warper)	Warper#11	811
-geffen,124,72,4	duplicate(Warper)	Warper#12	811
-izlude,132,120,4	duplicate(Warper)	Warper#13	811
-xmas,150,136,4	duplicate(Warper)	Warper#14	811
-morocc,159,97,4	duplicate(Warper)	Warper#15	811
-payon,182,108,4	duplicate(Warper)	Warper#16	811
-yuno,162,47,4	duplicate(Warper)	Warper#17	811
-moc_fild04,207,331,4	duplicate(Warper)	Warper#18	811
-izlu2dun,104,82,4	duplicate(Warper)	Warper#19	811
-mjolnir_02,85,363,4	duplicate(Warper)	Warper#20	811
-prt_fild05,273,215,4	duplicate(Warper)	Warper#21	811
-glast_01,370,308,4	duplicate(Warper)	Warper#22	811
-yuno_fild03,37,135,4	duplicate(Warper)	Warper#23	811
-gef_fild10,71,339,4	duplicate(Warper)	Warper#24	811
-pay_arche,39,135,4	duplicate(Warper)	Warper#25	811
-moc_ruins,64,166,4	duplicate(Warper)	Warper#26	811
-moc_fild19,106,97,4	duplicate(Warper)	Warper#27	811
-alb2trea,73,101,4	duplicate(Warper)	Warper#28	811
-tur_dun01,148,239,4	duplicate(Warper)	Warper#29	811
-gonryun,162,122,4	duplicate(Warper)	Warper#30	811
-louyang,208,103,6	duplicate(Warper)	Warper#31	811
-umbala,132,130,4	duplicate(Warper)	Warper#32	811
-brasilis,201,222,4	duplicate(Warper)	Warper#33	811
-manuk,262,177,4	duplicate(Warper)	Warper#34	811
-splendide,205,153,4	duplicate(Warper)	Warper#35	811
-mid_camp,216,288,4	duplicate(Warper)	Warper#36	811
-dicastes01,194,194,6	duplicate(Warper)	Warper#37	811
-mora,110,100,4	duplicate(Warper)	Warper#38	811
-moscovia,216,196,6	duplicate(Warper)	Warper#39	811
-nameless_n,259,213,4	duplicate(Warper)	Warper#40	811
-niflheim,205,179,4	duplicate(Warper)	Warper#41	811
-thor_camp,249,76,4	duplicate(Warper)	Warper#42	811
-veins,214,123,4	duplicate(Warper)	Warper#43	811
-dewata,194,178,6	duplicate(Warper)	Warper#44	811
-eclage,107,37,4	duplicate(Warper)	Warper#45	811
-malaya,210,205,4	duplicate(Warper)	Warper#46	811
-malangdo,220,188,6	duplicate(Warper)	Warper#47	811
+alb2trea,57,70,6	duplicate(Warper)	Warper#tre	4_F_VALKYRIE
+alberta,28,240,4	duplicate(Warper)	Warper#alb	4_F_VALKYRIE
+aldebaran,145,118,4	duplicate(Warper)	Warper#alde	4_F_VALKYRIE
+amatsu,203,87,4	duplicate(Warper)	Warper#ama	4_F_VALKYRIE
+ayothaya,209,169,6	duplicate(Warper)	Warper#ayo	4_F_VALKYRIE
+comodo,194,158,4	duplicate(Warper)	Warper#com	4_F_VALKYRIE
+einbech,59,38,6	duplicate(Warper)	Warper#einbe	4_F_VALKYRIE
+einbroch,69,202,4	duplicate(Warper)	Warper#einbr	4_F_VALKYRIE
+gef_fild10,71,339,4	duplicate(Warper)	Warper#orc	4_F_VALKYRIE
+geffen,124,72,4	duplicate(Warper)	Warper#gef	4_F_VALKYRIE
+glast_01,372,308,4	duplicate(Warper)	Warper#glh	4_F_VALKYRIE
+gonryun,162,122,4	duplicate(Warper)	Warper#gon	4_F_VALKYRIE
+hugel,101,151,4	duplicate(Warper)	Warper#hug	4_F_VALKYRIE
+izlu2dun,110,92,4	duplicate(Warper)	Warper#izd	4_F_VALKYRIE
+izlude,132,120,4	duplicate(Warper)	Warper#izl	4_F_VALKYRIE
+jawaii,253,138,4	duplicate(Warper)	Warper#jaw	4_F_VALKYRIE
+lighthalzen,162,102,4	duplicate(Warper)	Warper#lhz	4_F_VALKYRIE
+louyang,208,103,6	duplicate(Warper)	Warper#lou	4_F_VALKYRIE
+manuk,274,146,6	duplicate(Warper)	Warper#man	4_F_VALKYRIE
+mid_camp,216,288,4	duplicate(Warper)	Warper#mid	4_F_VALKYRIE
+mjolnir_02,85,364,4	duplicate(Warper)	Warper#mjo	4_F_VALKYRIE
+moc_ruins,64,164,4	duplicate(Warper)	Warper#moc	4_F_VALKYRIE
+morocc,159,97,4	duplicate(Warper)	Warper#mor	4_F_VALKYRIE
+moscovia,229,191,4	duplicate(Warper)	Warper#mos	4_F_VALKYRIE
+nameless_n,259,213,4	duplicate(Warper)	Warper#nam	4_F_VALKYRIE
+niflheim,205,179,4	duplicate(Warper)	Warper#nif	4_F_VALKYRIE
+pay_arche,42,134,4	duplicate(Warper)	Warper#arc	4_F_VALKYRIE
+payon,182,108,4	duplicate(Warper)	Warper#pay	4_F_VALKYRIE
+prontera,159,192,4	duplicate(Warper)	Warper#prt	4_F_VALKYRIE
+prt_fild05,279,223,6	duplicate(Warper)	Warper#cul	4_F_VALKYRIE
+rachel,135,116,4	duplicate(Warper)	Warper#rac	4_F_VALKYRIE
+splendide,205,153,4	duplicate(Warper)	Warper#spl	4_F_VALKYRIE
+thor_camp,249,76,4	duplicate(Warper)	Warper#thor	4_F_VALKYRIE
+umbala,106,150,3	duplicate(Warper)	Warper#umb	4_F_VALKYRIE
+veins,214,123,4	duplicate(Warper)	Warper#ve	4_F_VALKYRIE
+xmas,150,136,6	duplicate(Warper)	Warper#xmas	4_F_VALKYRIE
+yuno,162,47,4	duplicate(Warper)	Warper#yuno	4_F_VALKYRIE
+
+// --------------------------------------------------
+//	Duplicates (Renewal):
+// --------------------------------------------------
+brasilis,201,222,4	duplicate(Warper)	Warper#bra	4_F_VALKYRIE
+dewata,204,186,6	duplicate(Warper)	Warper#dew	4_F_VALKYRIE
+dicastes01,194,194,6	duplicate(Warper)	Warper#dic	4_F_VALKYRIE
+ecl_in01,51,60,4	duplicate(Warper)	Warper#ecl	4_F_VALKYRIE
+malangdo,134,117,6	duplicate(Warper)	Warper#mal	4_F_VALKYRIE
+malaya,210,205,4	duplicate(Warper)	Warper#ma	4_F_VALKYRIE
+mora,57,152,4	duplicate(Warper)	Warper#mora	4_F_VALKYRIE
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index c7d3f4e9e..824fa4a4f 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -4,8 +4,6 @@
 //= Euphy
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= A controller for War of Emperium designed for
 //= simplicity and ease of use.
@@ -19,7 +17,7 @@
 
 // Information NPC
 //============================================================
-prontera,149,193,4	script	WOE Information	835,{
+prontera,149,193,4	script	WOE Information	2_BOARD1,{
 	doevent "WOE_CONTROL::OnMenu";
 	end;
 OnAgitStart:
@@ -107,7 +105,7 @@ OnMinute00:
 			if (gettime(4) == $WOE_CONTROL[.@i] && gettime(3) == $WOE_CONTROL[.@i+2]) {
 			OnWOEEnd:
 				announce "The War Of Emperium is over!",bc_all|bc_woe;
-				AgitEnd; AgitEnd2;
+				agitend; agitend2;
 				sleep 1000;
 				for(set .@j,0; .@j<30; set .@j,.@j+1) {
 					if (.Active[0]&(1<<.@j)) Disp_Owner(.Castles$[.@j],1);
@@ -125,10 +123,10 @@ OnMinute00:
 			if (gettime(4) == $WOE_CONTROL[.@i] && gettime(3) >= $WOE_CONTROL[.@i+1] && gettime(3) < $WOE_CONTROL[.@i+2]) {
 				deletearray .Active[0],2;
 				set .Active[0], $WOE_CONTROL[.@i+3];
-				if (.Init) { AgitEnd; AgitEnd2; }
+				if (.Init) { agitend; agitend2; }
 				else announce "The War Of Emperium has begun!",bc_all|bc_woe;
 				sleep 1000;
-				AgitStart; AgitStart2;
+				agitstart; agitstart2;
 				for(set .@j,0; .@j<30; set .@j,.@j+1) {
 					if (.Active[0]&(1<<.@j)) {
 						if (!.Init) Disp_Owner(.Castles$[.@j],0);
@@ -165,9 +163,9 @@ OnReward:
 	freeloop(1);
 	for(set .@i,0; .@i<30; set .@i,.@i+1)
 		if (getarg(0)&(1<<.@i)) {
-			set .@gid, getcastledata(.Castles$[.@i],1);
-			if (!.@gid) continue;
-			set .@size, query_sql("SELECT account_id,char_id FROM `guild_member` WHERE guild_id = '"+.@gid+"' AND "+.@sql$,.@aid,.@cid);
+			set .@GID, getcastledata(.Castles$[.@i],1);
+			if (!.@GID) continue;
+			set .@size, query_sql("SELECT account_id,char_id FROM `guild_member` WHERE guild_id = '"+.@GID+"' AND "+.@sql$,.@aid,.@cid);
 			for(set .@j,0; .@j<.@size; set .@j,.@j+1) {
 				if (.Options&8 && !(.Options&4)) {
 					set .@ip$, replacestr(getcharip(.@aid[.@j]),".","a");
@@ -275,7 +273,7 @@ while(1) {
 		for(set .@i,0; .@i<6; set .@i,.@i+1) {
 			set .@k, .@i*5;
 			mes "> ^FF0000"+.Regions$[.@i]+"^000000";
-			for(set .@j,.@k; .@j<(.@k+5); set .@j,.@j+1) { 
+			for(set .@j,.@k; .@j<(.@k+5); set .@j,.@j+1) {
 				set .@t, getcastledata(.Castles$[.@j],1);
 				mes "  ~ "+getcastlename(.Castles$[.@j])+": "+((.@t)?"^0055FF"+getguildname(.@t):"^777777unoccupied")+"^000000";
 			}
@@ -299,26 +297,26 @@ while(1) {
 			}
 			mes "Select a day.";
 			next;
-			set .@Day, select(" ~ "+implode(.Days$,": ~ "))-1;
+			set .@day, select(" ~ "+implode(.Days$,": ~ "))-1;
 			mes "[New Session]";
-			mes "Select a start time for ^0055FF"+.Days$[.@Day]+"^000000.";
+			mes "Select a start time for ^0055FF"+.Days$[.@day]+"^000000.";
 			next;
 			set .@menu$,"";
 			for(set .@i,0; .@i<23; set .@i,.@i+1)
 				set .@menu$, .@menu$+" ~ "+Add_Zero(.@i,1)+":";
-			set .@Start, select(.@menu$)-1;
+			set .@start, select(.@menu$)-1;
 			mes "[New Session]";
-			mes "Select an end time for ^0055FF"+.Days$[.@Day]+"^000000.";
+			mes "Select an end time for ^0055FF"+.Days$[.@day]+"^000000.";
 			next;
 			set .@menu$,"";
-			for(set .@i,.@Start+1; .@i<24; set.@i,.@i+1)
+			for(set .@i,.@start+1; .@i<24; set.@i,.@i+1)
 				set .@menu$, .@menu$+" ~ "+Add_Zero(.@i,1)+":";
-			set .@End, select(.@menu$)+.@Start;
+			set .@end, select(.@menu$)+.@start;
 			for(set .@i,0; .@i<.Size; set .@i,.@i+4)
-				if (.@Day == $WOE_CONTROL[.@i] &&
-				   ((.@Start >= $WOE_CONTROL[.@i+1] && .@Start < $WOE_CONTROL[.@i+2]) ||
-				    (.@End > $WOE_CONTROL[.@i+1] && .@End <= $WOE_CONTROL[.@i+2]) ||
-				    (.@Start <= $WOE_CONTROL[.@i+1] && .@End >= $WOE_CONTROL[.@i+2]))) {
+				if (.@day == $WOE_CONTROL[.@i] &&
+				   ((.@start >= $WOE_CONTROL[.@i+1] && .@start < $WOE_CONTROL[.@i+2]) ||
+				    (.@end > $WOE_CONTROL[.@i+1] && .@end <= $WOE_CONTROL[.@i+2]) ||
+				    (.@start <= $WOE_CONTROL[.@i+1] && .@end >= $WOE_CONTROL[.@i+2]))) {
 					mes "[New Session]";
 					mes "The chosen times overlap with an existing session.";
 					next;
@@ -326,22 +324,22 @@ while(1) {
 					break;
 				}
 			if (.@d) { set .@d,0; break; }
-			set .@Castle,0;
+			set .@castle,0;
 			while(1) {
 				mes "[New Session]";
-				mes "^0055FF"+.Days$[.@Day]+" ("+Add_Zero(.@Start)+"-"+Add_Zero(.@End)+")^000000";
+				mes "^0055FF"+.Days$[.@day]+" ("+Add_Zero(.@start)+"-"+Add_Zero(.@end)+")^000000";
 				mes " > Castles:";
-				if (!.@Castle)
+				if (!.@castle)
 					mes "   ~ ^777777(none selected)^000000";
 				else for(set .@i,0; .@i<30; set .@i,.@i+1)
-					if (.@Castle&(1<<.@i)) mes "   ~ "+getcastlename(.Castles$[.@i])+" ("+.Castles$[.@i]+")";
+					if (.@castle&(1<<.@i)) mes "   ~ "+getcastlename(.Castles$[.@i])+" ("+.Castles$[.@i]+")";
 				next;
-				set .@menu$,((.@Castle)?" ~ ^FF0000Finished...^000000":"")+":";
+				set .@menu$,((.@castle)?" ~ ^FF0000Finished...^000000":"")+":";
 				for(set .@i,0; .@i<30; set .@i,.@i+1)
-					set .@menu$, .@menu$+" ~ "+((.@Castle&(1<<.@i))?"^0055FF":"")+getcastlename(.Castles$[.@i])+" ("+.Castles$[.@i]+")^000000:";
+					set .@menu$, .@menu$+" ~ "+((.@castle&(1<<.@i))?"^0055FF":"")+getcastlename(.Castles$[.@i])+" ("+.Castles$[.@i]+")^000000:";
 				set .@i, select(.@menu$)-1;
 				if (.@i)
-					set .@Castle, .@Castle^(1<<(.@i-1));
+					set .@castle, .@castle^(1<<(.@i-1));
 				else {
 					mes "[New Session]";
 					mes "Are you sure?";
@@ -349,13 +347,13 @@ while(1) {
 					switch(select(" ~ ^0055FFAdd session...^000000: ~ Continue selecting castles...: ~ ^777777Cancel^000000")) {
 					case 1:
 						for(set .@i,0; .@i<.Size; set .@i,.@i+4)
-							if ((.@Day == $WOE_CONTROL[.@i] && .@End <= $WOE_CONTROL[.@i+1]) || .@Day < $WOE_CONTROL[.@i]) {
+							if ((.@day == $WOE_CONTROL[.@i] && .@end <= $WOE_CONTROL[.@i+1]) || .@day < $WOE_CONTROL[.@i]) {
 								set .@d,1;
 								break;
 							}
 						if (!.@d) { set .@d,1; set .@i,.Size; }
 						copyarray $WOE_CONTROL[.@i+4], $WOE_CONTROL[.@i], .Size-.@i;
-						setarray $WOE_CONTROL[.@i], .@Day, .@Start, .@End, .@Castle;
+						setarray $WOE_CONTROL[.@i], .@day, .@start, .@end, .@castle;
 						set .Size, getarraysize($WOE_CONTROL);
 					case 3:
 						mes "[New Session]";
@@ -447,4 +445,4 @@ while(1) {
 	case 5:
 		close;
 	} }
-}
\ No newline at end of file
+}
diff --git a/npc/dev/test.txt b/npc/dev/test.txt
new file mode 100644
index 000000000..f9e4fc410
--- /dev/null
+++ b/npc/dev/test.txt
@@ -0,0 +1,739 @@
+//===== Hercules Script ======================================
+//= Script engine self-tests
+//===== By: ==================================================
+//= Haru
+//===== Current Version: =====================================
+//= 2.0
+//===== Version History: =====================================
+//= 1.0 Initial version.
+//= 2.0 Moved tests to a function to allow them to be called
+//      externally.
+//===== Description: =========================================
+//= Script to test operators and possibly other elements of
+//= the script engine, useful for regression testing.
+
+function	script	F_TestReturnValue	{
+	return getarg(0);
+}
+
+function	script	F_TestScopeVars	{
+	.@x = 2;
+	return .@x+1;
+}
+
+function	script	F_TestNPCVars	{
+	.x = 2;
+	return .x+1;
+}
+
+function	script	F_TestDeepNestedScope	{
+	if (getarg(0) <= 0)
+		return getarg(1); // Stop recursion
+	if (getarg(1))
+		return callfunc("F_TestDeepNestedScope", getarg(0)-1, getarg(1)); // Recursion step
+	.@x = 1;
+	return callfunc("F_TestDeepNestedScope", getarg(0)-1, .@x); // First step
+}
+
+function	script	F_TestDeepNestedScopeNPC2	{
+	if (getarg(0) <= 0)
+		return getarg(1); // Stop recursion
+	if (getarg(1))
+		return callfunc("F_TestDeepNestedScopeNPC", getarg(0)-1, getarg(1)); // Recursion step
+	.x = 1;
+	return callfunc("F_TestDeepNestedScopeNPC", getarg(0)-1, .x); // First step
+}
+
+function	script	F_TestDeepNestedScopeNPC	{
+	if (getarg(0) <= 0)
+		return getarg(1); // Stop recursion
+	if (getarg(1))
+		return callfunc("F_TestDeepNestedScopeNPC2", getarg(0)-1, getarg(1)); // Recursion step
+	.x = 1;
+	return callfunc("F_TestDeepNestedScopeNPC2", getarg(0)-1, .x); // First step
+}
+
+function	script	F_TestNestedScope	{
+	.@x = 1;
+	.@y = callfunc("F_TestReturnValue", .@x);
+	return .@y;
+}
+
+function	script	F_TestNestedScopeNPC	{
+	.x = 1;
+	.y = callfunc("F_TestReturnValue", .x);
+	return .y;
+}
+
+function	script	F_TestArrayRefs	{
+	return getelementofarray(getarg(0), getarraysize(getarg(0)) - 1);
+}
+
+function	script	F_TestReturnArrayRef	{
+	setarray getarg(0), 5, 6, 7, 8;
+	return getarraysize(getarg(0));
+}
+
+function	script	F_TestScopeArrays	{
+	setarray .@x, 1, 2, 3, 4;
+	copyarray .@y, getarg(0), getarraysize(getarg(0));
+	return getarraysize(.@y);
+}
+
+function	script	F_TestNPCArrays	{
+	setarray .x, 1, 2, 3, 4;
+	copyarray .y, getarg(0), getarraysize(getarg(0));
+	return getarraysize(.y);
+}
+
+function	script	HerculesSelfTestHelper	{
+	if (.once > 0)
+		return .errors;
+	.once = 1;
+	.errors = 0;
+
+	// Callsub (basic)
+	callsub(OnCheck, "Callsub", 1, 1);
+	callsub(OnCheck, "Callsub (getarg default values)", 1);
+
+
+	// Array subscript
+	setarray .@a, 3, 2, 1;
+	callsub(OnCheck, "Array subscript", .@a[2]);
+
+
+	// Increment and decrement operators ++, --
+	.@x = 1;
+	.@y = .@x++; // .@y = .@x; .@x = .@x + 1;
+	callsub(OnCheck, "Suffix increment ++", .@y);
+	callsub(OnCheck, "Suffix increment ++", .@x, 2);
+	.@x = 1;
+	.@y = .@x--; // .@y = .@x; .@x = .@x - 1;
+	callsub(OnCheck, "Suffix decrement --", .@y);
+	callsub(OnCheck, "Suffix decrement --", .@x, 0);
+	.@x = 0;
+	.@y = ++.@x; // .@x = .@x + 1; .@y = .@x;
+	callsub(OnCheck, "Prefix increment ++", .@y);
+	callsub(OnCheck, "Prefix increment ++", .@x);
+	.@x = 2;
+	.@y = --.@x; // .@x = .@x - 1; .@y = .@x;
+	callsub(OnCheck, "Prefix decrement --", .@y);
+	callsub(OnCheck, "Prefix decrement --", .@x);
+
+	// Order of [] and --/++
+	.@a[1] = 0;
+	.@a[1]++; // .@a[1] = .@a[1] + 1;
+	callsub(OnCheck, "Order of [] and ++", .@a[1]);
+	.@a[1] = 2;
+	.@a[1]--; // .@a[1] = .@a[1] - 1;
+	callsub(OnCheck, "Order of [] and --", .@a[1]);
+
+
+	// Unary operators -, !, ~
+	.@x = 1;
+	.@y = -.@x; // .@y = 0 - .@x;
+	callsub(OnCheck, "Unary operator -", .@y, -1);
+	.@x = 1;
+	.@y = !.@x; // if(.@x == 0) .@y = 1; else .@y = 0;
+	callsub(OnCheck, "Unary operator !", .@y, 0);
+	.@x = 0x00000001;
+	.@y = ~.@x; // One's complement of 0x00000001 is 0xfffffffe, which is -2
+	callsub(OnCheck, "Unary operator ~", .@y, -2);
+
+	// Associativity of unary operators -, !, ~
+	.@x = 1;
+	.@y = ~ ! .@x; // .@y = ~(!.@x);
+	callsub(OnCheck, "Associativity of unary ~ and !", .@y, -1);
+	.@x = 0;
+	.@y = - ! .@x; // .@y = -(!.@x);
+	callsub(OnCheck, "Associativity of unary - and !", .@y, -1);
+	.@x = 1;
+	.@y = ~ - .@x; // .@y = ~(-.@x);
+	callsub(OnCheck, "Associativity of unary ~ and -", .@y, 0);
+	.@x = 1;
+	.@y = - ~ .@x; // .@y = -(~.@x);
+	callsub(OnCheck, "Associativity of unary - and ~", .@y, 2);
+
+	// Order of unary -, !, ~ and prefix/suffix ++/--
+	.@x = 2;
+	.@y = - --.@x; // .@y = -(--.@x);
+	callsub(OnCheck, "Order of unary - and prefix --", .@y, -1);
+	callsub(OnCheck, "Order of unary - and prefix --", .@x);
+	.@x = 1;
+	.@y = - .@x--; // .@y = -(.@x--);
+	callsub(OnCheck, "Order of unary - and suffix --", .@y, -1);
+	callsub(OnCheck, "Order of unary - and suffix --", .@x, 0);
+	.@x = 0;
+	.@y = - ++.@x; // .@y = -(++.@x);
+	callsub(OnCheck, "Order of unary - and prefix ++", .@y, -1);
+	callsub(OnCheck, "Order of unary - and prefix ++", .@x);
+	.@x = 1;
+	.@y = - .@x++; // .@y = -(.@x++);
+	callsub(OnCheck, "Order of unary - and suffix ++", .@y, -1);
+	callsub(OnCheck, "Order of unary - and suffix ++", .@x, 2);
+	.@x = 1;
+	.@y = !--.@x; // .@y = !(--.@x);
+	callsub(OnCheck, "Order of unary ! and prefix --", .@y);
+	callsub(OnCheck, "Order of unary ! and prefix --", .@x, 0);
+	.@x = 1;
+	.@y = !.@x--; // .@y = !(.@x--);
+	callsub(OnCheck, "Order of unary ! and suffix --", .@y, 0);
+	callsub(OnCheck, "Order of unary ! and suffix --", .@x, 0);
+	.@x = 0;
+	.@y = !++.@x; // .@y = !(++.@x);
+	callsub(OnCheck, "Order of unary ! and prefix ++", .@y, 0);
+	callsub(OnCheck, "Order of unary ! and prefix ++", .@x);
+	.@x = 0;
+	.@y = !.@x++; // .@y = !(.@x++);
+	callsub(OnCheck, "Order of unary ! and suffix ++", .@y);
+	callsub(OnCheck, "Order of unary ! and suffix ++", .@x);
+	.@x = 2;
+	.@y = ~--.@x; // .@y = ~(--.@x);
+	callsub(OnCheck, "Order of unary ~ and prefix --", .@y, -2);
+	callsub(OnCheck, "Order of unary ~ and prefix --", .@x, 1);
+	.@x = 1;
+	.@y = ~.@x--; // .@y = ~(.@x--);
+	callsub(OnCheck, "Order of unary ~ and suffix --", .@y, -2);
+	callsub(OnCheck, "Order of unary ~ and suffix --", .@x, 0);
+	.@x = 0;
+	.@y = ~++.@x; // .@y = ~(++.@x);
+	callsub(OnCheck, "Order of unary ~ and prefix ++", .@y, -2);
+	callsub(OnCheck, "Order of unary ~ and prefix ++", .@x, 1);
+	.@x = 1;
+	.@y = ~.@x++; // .@y = ~(.@x++);
+	callsub(OnCheck, "Order of unary ~ and suffix ++", .@y, -2);
+	callsub(OnCheck, "Order of unary ~ and suffix ++", .@x, 2);
+
+	// Binary *, /, % operators
+	.@x = 2 * 3; // .@x = 6;
+	callsub(OnCheck, "Binary * operator", .@x, 6);
+	.@x = 7 / 2; // .@x = 3;
+	callsub(OnCheck, "Binary / operator", .@x, 3);
+	.@x = 7 % 2; // .@x = 1;
+	callsub(OnCheck, "Binary % operator", .@x, 1);
+
+	// Associativity of *, /, %
+	.@x = 8 * 3 / 2; // .@x = (8 * 3) / 2;
+	callsub(OnCheck, "Associativity of * and /", .@x, 12);
+
+	// Order of binary *%/ and unary !-~
+	.@x = 2 * ! 3; // .@x = 2 * (!3);
+	callsub(OnCheck, "Order of binary * and unary !", .@x, 0);
+	.@x = ~ 1 * 2; // .@x = (~1) * 2;
+	callsub(OnCheck, "Order of unary ~ and binary *", .@x, -4);
+
+
+	// Binary +, - operators
+	.@x = 1 + 3; // .@x = 4;
+	callsub(OnCheck, "Binary + operator", .@x, 4);
+	.@x = 1 - 3; // .@x = -2;
+	callsub(OnCheck, "Binary - operator", .@x, -2);
+
+	// Associativity of +,-
+	.@x = 0x7fffffff - 0x7ffffff0 + 1; // .@x = (0x7fffffff - 0x7ffffff0) + 1; (without overflow)
+	callsub(OnCheck, "Associativity of + and -", .@x, 16);
+
+	// Order of +, - and *, /, %
+	.@x = 1 + 3 * 2; // .@x = 1 + (3 * 2);
+	callsub(OnCheck, "Order of + and *", .@x, 7);
+
+
+	// << and >> operators
+	.@x = 1<<3; // .@x = 1*2*2*2;
+	callsub(OnCheck, "Left shift << operator", .@x, 8);
+	.@x = 12>>2; // .@x = 12/2/2;
+	callsub(OnCheck, "Right shift >> operator", .@x, 3);
+
+	// Associativity of << and >>
+	.@x = 0x40000000 >> 4 << 2; // .@x = (0x40000000 >> 4) << 2
+	callsub(OnCheck, "Associativity of >> and <<", .@x, 0x10000000);
+
+	// Order of <</>> and +/-
+	.@x = 4 << 2 + 1; // .@x = 4 << (2+1);
+	callsub(OnCheck, "Order of << and +", .@x, 32);
+
+
+	// <, <=, >, >= operators
+	.@x = (1 < 2); // true
+	.@y = (2 < 2); // false
+	callsub(OnCheck, "< operator", .@x);
+	callsub(OnCheck, "< operator", .@y, 0);
+	.@x = (1 <= 2); // true
+	.@y = (2 <= 2); // true
+	callsub(OnCheck, "<= operator", .@x);
+	callsub(OnCheck, "<= operator", .@y);
+	.@x = (2 > 1); // true
+	.@y = (2 > 2); // false
+	callsub(OnCheck, "> operator", .@x);
+	callsub(OnCheck, "> operator", .@y, 0);
+	.@x = (2 >= 1); // true
+	.@y = (2 >= 2); // true
+	callsub(OnCheck, ">= operator", .@x);
+	callsub(OnCheck, ">= operator", .@y);
+
+	// Associativity of <,<=,>,>=
+	.@x = 1 > 0 > 0; // (1 > 0) > 0  -->  1 > 0  -->  true
+	callsub(OnCheck, "Associativity of > operators", .@x);
+
+	// Order of >>/<< and </<=/>/>=
+	.@x = 1 < 1 << 2; // .@x = 1 < (1<<2);
+	callsub(OnCheck, "Order of < and <<", .@x);
+
+
+	// ==, !=, ~=, ~! operators
+	.@x = (0 == 0); // true
+	.@y = (1 == 0); // false
+	callsub(OnCheck, "== operator", .@x);
+	callsub(OnCheck, "== operator", .@y, 0);
+	.@x = (1 != 0); // true
+	.@y = (1 != 1); // false
+	callsub(OnCheck, "!= operator", .@x);
+	callsub(OnCheck, "!= operator", .@y, 0);
+	.@x$ = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "
+			"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. "
+			"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. "
+			"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+	.@y = (.@x$ ~= "^Lorem.*, ([a-z]*).*(Duis).* ([a-z.]*)$");
+	callsub(OnCheck, "~= operator", .@y, 4);
+	callsub(OnCheck, "~= operator", $@regexmatchcount, 4);
+	if( $@regexmatchcount == 4 ) {
+		callsub(OnCheck, "~= operator", $@regexmatch$[0], .@x$);
+		callsub(OnCheck, "~= operator", $@regexmatch$[1], "quis");
+		callsub(OnCheck, "~= operator", $@regexmatch$[2], "Duis");
+		callsub(OnCheck, "~= operator", $@regexmatch$[3], "laborum.");
+	}
+	.@y = (.@x$ ~! "^Not Lorem.*, ([a-z]*).*(Duis).* ([a-z.]*)$");
+	callsub(OnCheck, "~! operator", .@y);
+
+	// Associativity of ==, !=
+	.@x = (1 == 0 == 0); // (1 == 0) == 0  -->  0 == 0  --> 1
+	.@y = (1 != 0 == 0); // (1 != 0) == 0  -->  1 == 0  --> 0
+	callsub(OnCheck, "Associativity of != and == operators", .@x);
+	callsub(OnCheck, "Associativity of != and == operators", .@y, 0);
+
+	// Order of </<=/>/>= and ==/!=
+	.@x = (1 == 2 > 1); // true
+	.@y = (1 < 2 == 1); // true
+	callsub(OnCheck, "Order of <,>,==", .@x);
+	callsub(OnCheck, "Order of <,>,==", .@y);
+
+
+	.@x$ = "string "
+		"concatenation" /* test */ " succeeded";
+	callsub(OnCheckStr, "String concatenation", .@x$, "string concatenation succeeded");
+
+
+	// Bitwise & operator
+	.@x = (7&4); // 0111 & 0100 --> 0100
+	.@y = (4&1); // 0100 & 0001 --> 0000
+	callsub(OnCheck, "Bitwise & operator", .@x, 4);
+	callsub(OnCheck, "Bitwise & operator", .@y, 0);
+
+	// Order of & and ==/!=
+	.@x = (4 == 7 & 4); // (4 == 7)&4
+	.@y = (1 & 3 != 1); // 1 & (3 != 1)
+	callsub(OnCheck, "Order of ==/!= and &", .@x, 0);
+	callsub(OnCheck, "Order of ==/!= and &", .@y);
+
+
+	// Bitwise ^ operator
+	.@x = (3^1); // 0011 ^ 0001 --> 0010
+	callsub(OnCheck, "Bitwise ^ operator", .@x, 2);
+
+	// Order of ^ and &
+	.@x = (0 & 2 ^ 2); // (0 & 2) ^ 2 --> (0000 & 0010) | 0010 --> 0000 ^ 0010 --> 0010
+	.@y = (2 ^ 2 & 0); // 2 ^ (2 & 0) --> 0010 | (0010 & 0000) --> 0010 ^ 0000 --> 0010
+	callsub(OnCheck, "Order of ^ and &", .@x, 2);
+	callsub(OnCheck, "Order of ^ and &", .@y, 2);
+
+
+	// Bitwise | operator
+	.@x = (3|4); // 0011 | 0100 --> 0111
+	.@y = (4|1); // 0100 | 0001 --> 0101
+	callsub(OnCheck, "Bitwise | operator", .@x, 7);
+	callsub(OnCheck, "Bitwise | operator", .@y, 5);
+
+	// Order of ^ and |
+	.@x = (2 ^ 2 | 2); // (2 ^ 1) | 4 --> (0010 ^ 0010) | 0010 --> 0000 | 0010 --> 0010
+	.@y = (2 | 2 ^ 2); // 4 | (1 ^ 2) --> 0010 | (0010 ^ 0010) --> 0010 | 0000 --> 0010
+	callsub(OnCheck, "Order of | and ^", .@x, 2);
+	callsub(OnCheck, "Order of | and ^", .@y, 2);
+
+
+	// Logical && operator
+	.@x = (1 && 1); // true
+	.@y = (0 && 1); // false
+	callsub(OnCheck, "Logical && operator", .@x);
+	callsub(OnCheck, "Logical && operator", .@y, 0);
+
+	// Associativity of && and short-circuit
+	.@x = 0;
+	.@y = (1 && 0 && (.@x = 1)); // should short circuit as false before evaluating the assignment
+	//FIXME callsub(OnCheck, "Short-circuit of &&", .@x, 0);
+	callsub(OnCheck, "Associativity of &&", .@y, 0);
+
+	// Order of bitwise | and logical &&
+	.@x = (1 && 0 | 4); // 1 && (0|4)
+	.@y = (4 | 0 && 1); // (4|0) && 1
+	callsub(OnCheck, "Order of && and |", .@x);
+	callsub(OnCheck, "Order of && and |", .@y);
+
+
+	// Logical || operator
+	.@x = (1 || 1); // true
+	.@y = (0 || 1); // true
+	callsub(OnCheck, "Logical || operator", .@x);
+	callsub(OnCheck, "Logical || operator", .@y);
+
+	// Associativity of || and short-circuit
+	.@x = 0;
+	.@y = (1 || 0 || (.@x = 1)); // should short circuit as true before evaluating the assignment
+	//FIXME callsub(OnCheck, "Short-circuit of ||", .@x, 0);
+	callsub(OnCheck, "Associativity of ||", .@y);
+
+	// Order of logical && and ||
+	.@x = (0 && 1 || 1); // (0 && 1) || 1
+	.@y = (1 || 1 && 0); // 1 || (1 && 0)
+	callsub(OnCheck, "Order of && and ||", .@x);
+	callsub(OnCheck, "Order of && and ||", .@y);
+
+	// Ternary conditional operator ?:
+	.@x = (1 ? 2 : 3); // 2
+	.@y = (0 ? 2 : 3); // 3
+	callsub(OnCheck, "Ternary conditional operator", .@x, 2);
+	callsub(OnCheck, "Ternary conditional operator", .@y, 3);
+
+	// Associativity of ?:
+	.@x = (1 ? 2 : 0 ? 3 : 4);
+	.@y = (1 ? 1 ? 2 : 3 : 5);
+	callsub(OnCheck, "Associativity of ?:", .@x, 2);
+	callsub(OnCheck, "Associativity of ?:", .@y, 2);
+
+	// Order of logical || and ternary ?:
+	.@x = (1 ? 0 : 0 || 1); // 1 ? 0 : (0 || 1) --> false
+	callsub(OnCheck, "Order of || and ?:", .@x, 0);
+
+
+	// Assignment operators
+	.@x = 1;
+	callsub(OnCheck, "Direct assignment operator =", .@x);
+	.@x += 7; // 1 + 7
+	callsub(OnCheck, "Assignment by sum +=", .@x, 8);
+	.@x -= 1; // 8 - 1
+	callsub(OnCheck, "Assignment by difference -=", .@x, 7);
+	.@x *= 2; // 7 * 2
+	callsub(OnCheck, "Assignment by product *=", .@x, 14);
+	.@x /= 2; // 14 / 2
+	callsub(OnCheck, "Assignment by quotient /=", .@x, 7);
+	.@x %= 4; // 7 % 4
+	callsub(OnCheck, "Assignment by remainder %=", .@x, 3);
+	.@x <<= 2; // 3 << 2
+	callsub(OnCheck, "Assignment by bitwise left shift <<=", .@x, 12);
+	.@x >>= 1; // 12 >> 1
+	callsub(OnCheck, "Assignment by bitwise right shift >>=", .@x, 6);
+	.@x &= 5; // 6 & 5 (0110 & 0101 --> 0100)
+	callsub(OnCheck, "Assignment by bitwise and &=", .@x, 4);
+	.@x ^= 5; // 4 ^ 5 (0100 ^ 0101 --> 0001)
+	callsub(OnCheck, "Assignment by bitwise xor ^=", .@x, 1);
+	.@x |= 2; // 1 | 2 (0001 | 0010 --> 0011)
+	callsub(OnCheck, "Assignment by bitwise or |=", .@x, 3);
+
+	// Associativity of assignment operators
+	.@x = 0; .@y = 0;
+	.@x = .@y = 1;
+	callsub(OnCheck, "Associativity of =", .@x);
+	callsub(OnCheck, "Associativity of =", .@y);
+	.@x = 0; .@y = 1;
+	.@x = .@y += 4;
+	callsub(OnCheck, "Associativity of = and +=", .@x, 5);
+	callsub(OnCheck, "Associativity of = and +=", .@y, 5);
+	.@x = 5; .@y = 3;
+	.@z = 8;
+	.@x *= .@y += 1;
+	callsub(OnCheck, "Associativity of *= and +=", .@x, 20);
+	callsub(OnCheck, "Associativity of *= and +=", .@y, 4);
+
+	.@x = 1; .@y = 3;
+	.@x += .@y * 10;
+	callsub(OnCheck, "Order of += and *", .@x, 31);
+	.@x = 1; .@y = 3;
+	.@x = .@y != 3 ? .@y = 2 : 4;
+	callsub(OnCheck, "Order of = and ?:", .@x, 4);
+	// FIXME callsub(OnCheck, "Short-circuit of ?:", .@y, 3);
+
+	.@x = 0;
+	if (0)
+		if (1)
+			.@x = 2;
+		else
+			.@x = 3;
+	callsub(OnCheck, "Dangling else", .@x, 0);
+
+
+	// Array operations
+	.@x[0] = 1;
+	callsub(OnCheck, "Array size (single value)", getarraysize(.@x), 1);
+	.@x[0] = 0;
+	callsub(OnCheck, "Array size (single value removal)", getarraysize(.@x), 0);
+
+	.@x[0] = 1;
+	.@x[1] = 2;
+	.@x[2] = 3;
+	.@x[5] = 4;
+	.@x[8] = 5;
+	.@x[9] = 0;
+	setarray .@y[0], 1, 2, 3, 0, 0, 4, 0, 0, 5;
+	callsub(OnCheck, "Array size (assignment)", getarraysize(.@x), 9);
+	callsub(OnCheck, "Array size (setarray)", getarraysize(.@y), 9);
+	for (.@i = 0; .@i < 10; ++.@i) {
+		callsub(OnCheck, "Array subscript and setarray [" + .@i + "]", .@x[.@i], .@y[.@i]);
+	}
+
+	cleararray .@x[1], 8, 6;
+	callsub(OnCheck, "cleararray (value) [0]", .@x[0], 1);
+	for (.@i = 1; .@i < 7; ++.@i) {
+		callsub(OnCheck, "cleararray (value) [" + .@i + "]", .@x[.@i], 8);
+	}
+	callsub(OnCheck, "cleararray (value) [7]", .@x[7], 0);
+	callsub(OnCheck, "cleararray (value) [8]", .@x[8], 5);
+	callsub(OnCheck, "cleararray (value) [9]", .@x[9], 0);
+
+	cleararray .@x, 0, getarraysize(.@x);
+	cleararray .@y, 0, getarraysize(.@y);
+	callsub(OnCheck, "cleararray and getarraysize", getarraysize(.@x), 0);
+	for (.@i = 0; .@i < 10; ++.@i) {
+		callsub(OnCheck, "cleararray (zero) [" + .@i + "]", .@x[.@i], 0);
+	}
+
+	cleararray .@x, 0, getarraysize(.@x);
+	setarray .@x[1], 1, 2, 0, 0, 0, 6, 7, 8, 0, 0, 0, 13, 14, 15, 16;
+	deletearray .@x;
+	callsub(OnCheck, "deletearray (clear) and getarraysize", getarraysize(.@x), 0);
+	for (.@i = 0; .@i < 18; ++.@i) {
+		callsub(OnCheck, "deletearray (clear) [" + .@i + "]", .@x[.@i], 0);
+	}
+
+	deletearray .@x;
+	deletearray .@y;
+	setarray .@x[1], 1, 2, 0, 0, 0, 6, 7, 8, 0, 0, 0, 0, 13, 14, 15, 16;
+	setarray .@y, 0, 1, 2, 0, 0, 0, 6, 7, 8,    0, 0, 0, 13, 14, 15, 16;
+	deletearray .@x[9], 1;
+	callsub(OnCheck, "deletearray (single) and getarraysize", getarraysize(.@x), 16);
+	for (.@i = 0; .@i < 18; ++.@i) {
+		callsub(OnCheck, "deletearray (single) [" + .@i + "]", .@x[.@i], .@y[.@i]);
+	}
+
+	deletearray .@x;
+	deletearray .@y;
+	setarray .@x[1], 1, 2, 0, 0, 0, 6, 7, 8, 0, 0, 0, 13, 14, 15, 16;
+	setarray .@y, 0, 1,             6, 7, 8, 0, 0, 0, 13, 14, 15, 16;
+	deletearray .@x[2], 4;
+	callsub(OnCheck, "deletearray (multiple) and getarraysize", getarraysize(.@x), 12);
+	for (.@i = 0; .@i < 18; ++.@i) {
+		callsub(OnCheck, "deletearray (multiple) [" + .@i + "]", .@x[.@i], .@y[.@i]);
+	}
+
+	deletearray .@x;
+	deletearray .@y;
+	setarray .@x[1], 1, 2, 0, 0, 0, 6, 7, 8, 0, 0, 0, 13, 14, 15, 16;
+	setarray .@y, 0, 1;
+	deletearray .@x[2], 1000;
+	callsub(OnCheck, "deletearray (large count) and getarraysize", getarraysize(.@x), 2);
+	for (.@i = 0; .@i < 18; ++.@i) {
+		callsub(OnCheck, "deletearray (large count) [" + .@i + "]", .@x[.@i], .@y[.@i]);
+	}
+
+	deletearray .@x;
+	deletearray .@y;
+	setarray .@x[1], 1, 2, 0, 0, 0, 6, 7, 8, 0, 0, 0, 13, 14, 15, 16;
+	setarray .@y, 0, 1;
+	deletearray .@x[2];
+	callsub(OnCheck, "deletearray (truncate) and getarraysize", getarraysize(.@x), 2);
+	for (.@i = 0; .@i < 18; ++.@i) {
+		callsub(OnCheck, "deletearray (truncate) [" + .@i + "]", .@x[.@i], .@y[.@i]);
+	}
+
+	deletearray .@x;
+	.@x[1] = 2;
+	.@x[65536] = 1;
+	callsub(OnCheck, "large array index", .@x[65536], 1);
+	callsub(OnCheck, "large array index and getarraysize", getarraysize(.@x), 65537);
+	.@x[65536] = 0;
+	callsub(OnCheck, "large array index (shrink)", .@x[65536], 0);
+	callsub(OnCheck, "large array index and getarraysize (shrink)", getarraysize(.@x), 2);
+	.@x[1] = 0;
+	callsub(OnCheck, "array shrink", .@x[1], 0);
+	callsub(OnCheck, "array shrink and getarraysize", getarraysize(.@x), 0);
+
+
+	// Constants
+	callsub(OnCheck, "'true' constant", true, 1);
+	callsub(OnCheck, "'false' constant", false, 0);
+	callsub(OnCheck, "'PORING' mob ID", PORING, 1002);
+	callsub(OnCheck, "'NV_BASIC' skill ID", NV_BASIC, 1);
+	callsub(OnCheck, "'Red_Potion' item ID", Red_Potion, 501);
+	callsub(OnCheck, "'Monster's_Feed' item ID", Monster's_Feed, 528);
+
+
+	// setd/getd
+	.@x = 1; .@x$ = ".@x";
+	callsub(OnCheck, "getd", getd(".@x"), 1);
+	callsub(OnCheck, "getd arguments", getd(.@x$), 1);
+	.@y = 0; .@y$ = ".@y";
+	setd(".@y", .@x);
+	callsub(OnCheck, "setd", .@y, 1);
+	setd(.@y$, 2);
+	callsub(OnCheck, "setd arguments", .@y, 2);
+	set getd(".@x"), getd(".@y");
+	callsub(OnCheck, "set getd", .@x, .@y);
+	.@y = 1;
+	setd(".@x", getd(".@y"));
+	callsub(OnCheck, "setd getd", .@x, .@y);
+
+
+	// Callsub (advanced)
+	callsub(OnCheck, "Callsub return value", callsub(OnTestReturnValue, 1));
+	.@x = 1;
+	callsub(OnCheck, "Callsub return with scope variables", callsub(OnTestScopeVars), 3);
+	callsub(OnCheck, "Callsub (parent scope vars isolation)", .@x, 1);
+	callsub(OnCheck, "Callsub (nested scopes)", callsub(OnTestNestedScope), 1);
+	callsub(OnCheck, "Callsub (deeply nested scopes)", callsub(OnTestDeepNestedScope, 30, 0), 1);
+	deletearray .@x;
+	setarray .@x, 1, 2, 3, 4;
+	callsub(OnCheck, "Callsub (array references)", callsub(OnTestArrayRefs, .@x), 4);
+	deletearray .@x;
+	.@y = callsub(OnTestReturnArrayRef, .@x);
+	callsub(OnCheck, "Callsub return array references (size check)", getarraysize(.@x), .@y);
+	callsub(OnCheck, "Callsub return array references", getelementofarray(.@x, 3), 8);
+	deletearray .@x;
+	deletearray .@y;
+	setarray .@x, 1, 2;
+	.@z = getarraysize(.@x);
+	setarray .@y, 5, 6, 7, 8, 9;
+	callsub(OnCheck, "Callsub (copyarray from reference with the same name)", getarraysize(.@y), callsub(OnTestScopeArrays, .@y));
+	callsub(OnCheck, "Callsub (parent array vars isolation)", getarraysize(.@x), .@z);
+	deletearray .@x;
+	deletearray .@y;
+
+	// Callfunc
+	callsub(OnCheck, "Callfunc return value", callfunc("F_TestReturnValue", 1));
+	.@x = 1;
+	callsub(OnCheck, "Callfunc return with scope variables", callfunc("F_TestScopeVars"), 3);
+	callsub(OnCheck, "Callfunc (parent scope vars isolation)", .@x, 1);
+	callsub(OnCheck, "Callfunc (nested scopes)", callfunc("F_TestNestedScope"), 1);
+	callsub(OnCheck, "Callfunc (deeply nested scopes)", callfunc("F_TestDeepNestedScope", 30, 0), 1);
+	deletearray .@x;
+	setarray .@x, 1, 2, 3, 4;
+	callsub(OnCheck, "Callfunc (array references)", callfunc("F_TestArrayRefs", .@x), 4);
+	deletearray .@x;
+	.@y = callfunc("F_TestReturnArrayRef", .@x);
+	callsub(OnCheck, "Callfunc return array references (size check)", getarraysize(.@x), .@y);
+	callsub(OnCheck, "Callfunc return array references", getelementofarray(.@x, 3), 8);
+	deletearray .@x;
+	deletearray .@y;
+	setarray .@x, 1, 2;
+	.@z = getarraysize(.@x);
+	setarray .@y, 5, 6, 7, 8, 9;
+	callsub(OnCheck, "Callfunc (copyarray from reference with the same name)", getarraysize(.@y), callfunc("F_TestScopeArrays", .@y));
+	callsub(OnCheck, "Callfunc (parent array vars isolation)", getarraysize(.@x), .@z);
+	deletearray .@x;
+	deletearray .@y;
+	.x = 1;
+	callsub(OnCheck, "Callfunc return with NPC variables", callfunc("F_TestNPCVars"), 3);
+	callsub(OnCheck, "Callfunc (parent NPC vars isolation)", .x, 1);
+	callsub(OnCheck, "Callfunc (nested scopes and NPC variables)", callfunc("F_TestNestedScopeNPC"), 1);
+	callsub(OnCheck, "Callfunc (deeply nested scopes and NPC variables)", callfunc("F_TestDeepNestedScopeNPC", 30, 0), 1);
+	deletearray .x;
+	setarray .x, 1, 2, 3, 4;
+	callsub(OnCheck, "Callfunc (array references and NPC variables)", callfunc("F_TestArrayRefs", .x), 4);
+	deletearray .x;
+	.y = callfunc("F_TestReturnArrayRef", .x);
+	callsub(OnCheck, "Callfunc return array references with NPC variables (size check)", getarraysize(.x), .y);
+	callsub(OnCheck, "Callfunc return array references wuth NPC variables", getelementofarray(.x, 3), 8);
+	deletearray .x;
+	deletearray .y;
+	setarray .x, 1, 2;
+	.@z = getarraysize(.@x);
+	setarray .y, 5, 6, 7, 8, 9;
+	callsub(OnCheck, "Callfunc (copyarray from NPC variable reference with the same name)", getarraysize(.@y), callfunc("F_TestNPCArrays", .@y));
+	callsub(OnCheck, "Callfunc (parent array NPC vars isolation)", getarraysize(.@x), .@z);
+	deletearray .x;
+	deletearray .y;
+
+	if (.errors) {
+		debugmes "Script engine self-test   [ \033[0;31mFAILED\033[0m ]";
+		debugmes "**** The test was completed with " + .errors + " errors. ****";
+	} else {
+		debugmes "Script engine self-test   [ \033[0;32mPASSED\033[0m ]";
+	}
+	return .errors;
+	end;
+
+OnTestReturnValue:
+	return getarg(0);
+
+OnTestScopeVars:
+	.@x = 2;
+	return .@x+1;
+
+OnTestDeepNestedScope:
+	if (getarg(0) <= 0)
+		return getarg(1); // Stop recursion
+	if (getarg(1))
+		return callsub(OnTestDeepNestedScope, getarg(0)-1, getarg(1)); // Recursion step
+	.@x = 1;
+	return callsub(OnTestDeepNestedScope, getarg(0)-1, .@x); // First step
+
+OnTestNestedScope:
+	.@x = 1;
+	.@y = callsub(OnTestReturnValue, .@x);
+	return .@y;
+
+OnTestArrayRefs:
+	return getelementofarray(getarg(0), getarraysize(getarg(0)) - 1);
+
+OnTestReturnArrayRef:
+	setarray getarg(0), 5, 6, 7, 8;
+	return getarraysize(getarg(0));
+
+OnTestScopeArrays:
+	setarray .@x, 1, 2, 3, 4;
+	copyarray .@y, getarg(0), getarraysize(getarg(0));
+	return getarraysize(.@y);
+
+OnReportError:
+	.@msg$ = getarg(0,"Unknown Error");
+	.@val$ = getarg(1,"");
+	.@ref$ = getarg(2,"");
+	if (.errors == 1)
+		debugmes "**** WARNING: Any self-test results past this point are unreliable because of previous errors. ****";
+	debugmes "Error: "+.@msg$+": '"+.@val$+"' (found) != '"+.@ref$+"' (expected)";
+	++.errors;
+	//end;
+	return;
+
+OnCheck:
+	.@msg$ = getarg(0,"Unknown Error");
+	.@val = getarg(1,0);
+	.@ref = getarg(2,1);
+	if (.@val != .@ref) {
+		callsub(OnReportError, .@msg$, ""+.@val, ""+.@ref); // String coercion
+	}
+	return;
+OnCheckStr:
+	.@msg$ = getarg(0,"Unknown Error");
+	.@val$ = getarg(1,"");
+	.@ref$ = getarg(2,"");
+	if (.@val$ != .@ref$) {
+		callsub(OnReportError, .@msg$, .@val$, .@ref$);
+	}
+	return;
+}
+
+-	script	HerculesSelfTest	-1,{
+	end;
+
+OnInit:
+	callfunc("HerculesSelfTestHelper");
+	end;
+}
diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt
index 96c24bdfa..2c64c5b75 100644
--- a/npc/events/MemorialDay_2008.txt
+++ b/npc/events/MemorialDay_2008.txt
@@ -14,8 +14,8 @@
 
 // Lauds
 //============================================================
-prontera,182,214,4	script	Lauds#Memorial	58,{
-	if(Memorial08 < 1) {
+prontera,182,214,4	script	Lauds#Memorial	1_M_MERCHANT,{
+	if (Memorial08 < 1) {
 		mes "[Mad Sago Lauds]";
 		mes "Hey, yo!";
 		mes "What are you doing there!?";
@@ -27,7 +27,7 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		next;
 		mes "[Mad Sago Lauds]";
 		mes "What is this!?";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Mad Sago Lauds]";
 		mes "Where is your towel!?";
@@ -67,14 +67,14 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		close;
 	}
 
-	else if(Memorial08 == 1) {
+	else if (Memorial08 == 1) {
 		if (countitem(1059) < 30 || countitem(914) < 20) {
 			mes "[Mad Sago Lauds]";
 			mes "What are these? They aren't enough?!";
 			mes "*Sigh* Do I really have to tell you again?!";
 			mes "Bring me ^FF000030 Fabric and 20 Fluffs^000000.";
 			close;
-		}else{
+		} else {
 			mes "***Mad Sago Lauds appears to be muttering to himself***";
 			next;
 			mes "[Mad Sago Lauds]";
@@ -96,7 +96,7 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		}
 	}
 	
-	else if(Memorial08 == 2) {
+	else if (Memorial08 == 2) {
 		mes "[Mad Sago Lauds]";
 		mes "Ah, you have fluffy new towel now I even put your name on it";
 		next;
@@ -118,20 +118,20 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		close;
 	}
 
-	else if(Memorial08 == 3) {
+	else if (Memorial08 == 3) {
 		mes "[Mad Sago Lauds]";
 		mes "What are you still doing here?";
 		mes "I told you to go speak to Grast in Prontera!";
 		close;
 	}
 
-	else if(Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) {
+	else if (Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) {
 		mes "[Mad Sago Lauds]";
 		mes "Go help Grast, and then come back.";
 		close;
 	}
 
-	else if(Memorial08 == 7) {
+	else if (Memorial08 == 7) {
 		mes "[Mad Sago Lauds]";
 		mes "Oh, you've brought them all.";
 		mes "Hahaha!";
@@ -153,38 +153,38 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		close;
 	}
 
-	else if(Memorial08 == 8) {
+	else if (Memorial08 == 8) {
 		mes "[Mad Sago Lauds]";
 		mes "Stop trying to give me your garbage!";
 		mes "Go to the plaque at 12 o'clock direction in Prontera for your journey!";
 		close;
 	}
 	
-	else if(Memorial08 >= 9) {
+	else if (Memorial08 >= 9) {
 		set .@RandomMsg, rand(1,5);
-		if(.@RandomMsg == 1) {
+		if (.@RandomMsg == 1) {
 			mes "[Mad Sago Lauds]";
 			mes "Don't panic!";
-			emotion 0;
+			emotion e_gasp;
 			close;
 		}
-		else if(.@RandomMsg == 2) {
+		else if (.@RandomMsg == 2) {
 			mes "[Mad Sago Lauds]";
 			mes "Life... is like a grapefruit.";
 			mes "It's orange and squishy, and has a few pips in it, and some folks have half a one for breakfast.";
 			close;
 		}
-		else if(.@RandomMsg == 3) {
+		else if (.@RandomMsg == 3) {
 			mes "[Mad Sago Lauds]";
 			mes "There was a point to this story, but it has temporarily escaped the chronicler's mind.";
 			close;
 		}
-		else if(.@RandomMsg == 4) {
+		else if (.@RandomMsg == 4) {
 			mes "[Mad Sago Lauds]";
 			mes "42!";
 			close;
 		}
-		else if(.@RandomMsg == 5) {
+		else if (.@RandomMsg == 5) {
 			mes "[Mad Sago Lauds]";
 			mes "It is a mistake to think you can solve any major problems just with potatoes.";
 			close;
@@ -194,14 +194,14 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		
 // Memorial Plaque
 //============================================================
-prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
-	if(Memorial08 < 8) {
+prontera,153,286,4	script	Memorial Plaque#Memorial	4_BOARD3,{
+	if (Memorial08 < 8) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "- It's a dusty old plaque.-";
 		close;
 	}
 	
-	else if(Memorial08 == 8) {
+	else if (Memorial08 == 8) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "- It's a dusty old plaque.-";
 		mes "'This must be what Lauds was talking about.'";
@@ -212,7 +212,7 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		goto L_CleanPlaque;
 	}
 	
-	else if(Memorial08 >= 9) {
+	else if (Memorial08 >= 9) {
 		goto L_CleanPlaque;
 	}
 	
@@ -223,7 +223,7 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		mes "-nor engraved stone bear record of their deeds,-";
 		mes "-yet will their remembrance be as lasting as the land they honored.-";
 		mes "-Daniel Webster-";
-		if(Memorial08 == 9) {
+		if (Memorial08 == 9) {
 			getexp 93750,43750;
 		}
 		next;
@@ -232,7 +232,7 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		mes "-I may not have gone where I intended to go,-";
 		mes "-but I think I have ended up where I needed to be.-";
 		mes "- Douglas Adams.-";
-		if(Memorial08 == 9) { 
+		if (Memorial08 == 9) {
 			getexp 93750,43750;
 		}
 		next;
@@ -242,7 +242,7 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		mes "-It is not the urge to surpass all others at whatever cost,-";
 		mes "- but the urge to serve others at whatever cost. -";
 		mes "- Arthur Ashe -";
-		if(Memorial08 == 9) { 
+		if (Memorial08 == 9) {
 			getexp 93750,43750;
 			set Memorial08,10;
 		}
@@ -251,15 +251,15 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 
 // Grast
 //============================================================
-prontera,150,270,4	script	Grast#Memorial	900,{
-	if(Memorial08 < 3) {
+prontera,150,270,4	script	Grast#Memorial	4_M_HUMERCHANT,{
+	if (Memorial08 < 3) {
 		mes "[Grast]";
 		mes "Memorial Day is a sad and yet glorious day.";
 		mes "I wonder how many people remember them...";
 		close;
 	}
 	
-	else if(Memorial08 == 3) {
+	else if (Memorial08 == 3) {
 		mes "[Grast]";
 		mes "Oh, isn't that a Towel of Memory?";
 		mes "I'm so glad to meet someone who understands the meaning of Memorial Day.";
@@ -277,7 +277,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 		close;
 	}
 
-	else if(Memorial08 == 4) {
+	else if (Memorial08 == 4) {
 		if (countitem(501) < 1 || countitem(506) < 1 || countitem(656) < 1 || countitem(602) < 1) {
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
@@ -293,7 +293,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 				goto L_GiveUp;
 			}
 			goto L_Continue;
-		}else{
+		} else {
 			mes "[Grast]";
 			mes "Oh, you've brought the materials I asked.";
 			next;
@@ -308,7 +308,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 		}
 	}
 	
-	else if(Memorial08 == 5) {
+	else if (Memorial08 == 5) {
 		if (countitem(1065) < 1 || countitem(610) < 1 || countitem(717) < 1 || countitem(747) < 1 || countitem(517) < 1 || countitem(515) < 1) {
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
@@ -323,7 +323,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 				goto L_GiveUp;
 			}
 			goto L_Continue;
-		}else{
+		} else {
 			mes "[Grast]";
 			mes "Oh, you've brought everything I asked.";
 			mes "Hmm, I think you need just a little bit more.";
@@ -335,7 +335,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 		}
 	}
 	
-	else if(Memorial08 == 6) {
+	else if (Memorial08 == 6) {
 		if (countitem(643) < 1 || countitem(12018) < 1 || countitem(741) < 1 || countitem(745) < 1) {
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
@@ -354,7 +354,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 				goto L_GiveUp;
 			}
 			goto L_Continue;
-		}else{
+		} else {
 			mes "[Grast]";
 			mes "Have you brought the materials I asked?";
 			mes "Ah, thank you for your hard work you've brought all of them.";
@@ -390,14 +390,14 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 		}
 	}
 	
-	else if(Memorial08 == 7) {
+	else if (Memorial08 == 7) {
 		mes "[Grast]";
 		mes "Have you met Lauds?";
 		mes "I hope you'll remember your freedom and happiness are built on thousands of lives sacrificed in war.";
 		close;
 	}
 
-	else if(Memorial08 >= 8) {
+	else if (Memorial08 >= 8) {
 		mes "[Grast]";
 		mes "A towel is about the most massively useful thing an adventurer can have.";
 		close;
diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt
new file mode 100644
index 000000000..992bd7bd3
--- /dev/null
+++ b/npc/events/RWC_2011.txt
@@ -0,0 +1,533 @@
+//===== Hercules Script ======================================
+//= RWC 2011 Golden Poring
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Collect blue cards dropped by Golden Porings to spell out
+//= 'RWC2011' and win a prize!
+//===== Additional Comments: =================================
+//= 1.0 First Version. [Euphy]
+//============================================================
+
+prontera,114,81,5	script	RWC2011 Agent#2	4_M_ATEIL,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
+		mes "[New Agent]";
+		mes "You have too many items. Please make room in your inventory and come back.";
+		close;
+	}
+	if (oversea_event == 0) {
+		mes "[New Agent]";
+		mes "Wow~ Finally!! It's the season we've all been waiting for!";
+		emotion e_lv2;
+		next;
+		mes "[New Agent]";
+		mes "It's RWC time!";
+		next;
+		set .@loop,1;
+		while(.@loop) {
+			switch(select("What is RWC?:Are you a New Agent?:I don't care.")) {
+			case 1:
+				mes "[New Agent]";
+				if (BaseLevel < 70)
+					mes "You must be a new adventurer. I will kindly explain it to you.";
+				else
+					mes "It seems you've traveled quite enough but you're not good with hearing the news around the world.";
+				next;
+				mes "[New Agent]";
+				mes "There are few adventurers in Rune-Midgard whose lives are dedicated to battle, who never skip their training, live in seclusion, and are experts in their art.";
+				next;
+				mes "[New Agent]";
+				mes "The RWC is the festival where those adventurers can compete with each other and find out who is the best!";
+				next;
+				mes "[New Agent]";
+				mes "But this cannot be achieved all alone. Your friends will have a huge role in the competition.";
+				next;
+				mes "[New Agent]";
+				mes "If you're interested in this festival, start looking for friends you can trust!";
+				next;
+				break;
+			case 2:
+				mes "[New Agent]";
+				mes "Many events are organized for RWC promotion every year.";
+				next;
+				mes "[New Agent]";
+				mes "And this year, a special mission has been entrusted to a new agent... myself!";
+				next;
+				mes "[New Agent]";
+				mes "I am supposed to attach blue cards with the letters RWC2011 all over the world to promote the event. But... but...";
+				next;
+				mes "- He thought of something and then looked at your eyes. -";
+				next;
+				mes "[New Agent]";
+				mes "Would you like to listen to my story?";
+				next;
+				if(select("Sure, let me hear it.:No, thank you.") == 2) {
+					mes "[New Agent]";
+					mes "Arrgg!! Are you ignoring me because I'm new? Usually people listen...";
+					next;
+					mes "- New Agent is looking at you with pitiable eyes. -";
+					next;
+					mes "- His brimming small eyes seem to tell you something. ^FF0000Please talk to me again...^000000 -";
+					close;
+				}
+				set .@loop,0;
+				break;
+			case 3:
+				mes "[New Agent]";
+				mes "This is my first mission but people's reaction is not good.";
+				next;
+				mes "- New Agent is looking at you with pitiable eyes. -";
+				next;
+				mes "- His twinkling small eyes seem to tell you something. ^FF0000Please talk to me again...^000000 -";
+				close;
+			}
+		}
+		mes "[New Agent]";
+		mes "I used to be a very normal boy in Morocc.";
+		mes "I am not an adventurer and I don't even know how to buy/sell things. Sometimes I'm just very happy to see adventurers. You know... I am just an ordinary boy.";
+		next;
+		mes "[New Agent]";
+		mes "People used to tell me that since I was very shy.";
+		mes "I would spend my life in a suburb.";
+		next;
+		mes "[New Agent]";
+		mes "But eventually, my patience and restrained personality motivated me to become an agent for RWC2011!";
+		mes "I was so happy that I couldn't sleep! I would finally have a chance to meet lots of adventurers and get to know them.";
+		next;
+		mes "[New Agent]";
+		mes "This mission was so important to me,";
+		mes "I was afraid of being attacked by monsters when attaching the blue cards for RWC2011 in the streets.";
+		next;
+		mes "[New Agent]";
+		mes "......";
+		next;
+		mes "[New Agent]";
+		mes "And you know what?";
+		mes "^FF0000It really happened!^000000";
+		next;
+		select("Are you serious!?");
+		mes "[New Agent]";
+		mes "I had turned off the light and was trying to get some sleep, then I saw this bright light through the window.";
+		mes "Suddenly, the window was broken and it appeared!";
+		next;
+		select("It?");
+		mes "[New Agent]";
+		mes "It was a shining poring! And it ate all blue cards I had prepared in less than a second!";
+		next;
+		mes "[New Agent]";
+		mes "I was so shocked, I tried to calm down and think... I had neither heard about nor seen any shining poring!";
+		next;
+		mes "[New Agent]";
+		mes "^FF0000Yes! It must be a dream!^000000 That's the conclusion I came up with and went back to sleep.";
+		next;
+		mes "[New Agent]";
+		mes "But it wasn't a dream. When I woke up, I realized all the blue cards were gone...";
+		next;
+		mes "[New Agent]";
+		mes "If I ruin this promotion, I might lose the job and have to go back to where I used to live alone...";
+		next;
+		mes "[New Agent]";
+		mes "If you see the Golden Poring, could you please find the precious blue cards for me?";
+		next;
+		emotion e_sob;
+		mes "- He looks at you with imploring eyes. -";
+		next;
+		if(select("Ok, I will help you!:How much money can you offer me?") == 2) {
+			mes "[New Agent]";
+			mes "Have you decided to help me? Well, I will prepare some gifts. I'm sure you'll like them.";
+			next;
+		}
+		mes "[New Agent]";
+		mes "What you are looking for are large cards with the letters ^FF0000RWC2011^000000. Some of them might already be digested though.";
+		next;
+		mes "[New Agent]";
+		mes "Try to gather remaining cards until you make the word, 'RWC2011'.";
+		next;
+		mes "[New Agent]";
+		mes "Please help me out!! My life is in your hands!";
+		set oversea_event,1;
+		setquest 13000;
+		close;
+	} else if (oversea_event == 1) {
+		if (countitem(6485) && countitem(6486) && countitem(6487) > 1 && countitem(7602) && countitem(7470) && countitem(6012)) {
+			mes "[RWC2011 Agent]";
+			mes "Have you gathered all the cards?";
+			next;
+			mes "[RWC2011 Agent]";
+			mes "Wow~ You bring light in my life again!";
+			next;
+			mes "[RWC2011 Agent]";
+			mes "Here are the gifts I promised... Let's see...";
+			next;
+			delitem 6485,1; //BlueCard_2
+			delitem 6486,1; //BlueCard_0
+			delitem 6487,2; //BlueCard_1
+			delitem 7602,1; //BlueCard_R
+			delitem 7470,1; //BlueCard_W
+			delitem 6012,1; //Blue_Card_C
+			//SavePPL BlueCard_2
+			set oversea_event,2;
+			erasequest 13000;
+			setquest 13001;
+			set .@i, rand(1,100);
+	 		     if (.@i == 1) getitem 12690,1; //Old_C_Album_Helm
+	 		else if (.@i == 2) getitem 12691,1; //Old_C_Album_Armor
+	 		else if (.@i == 3) getitem 12693,1; //Old_C_Album_Garment
+	 		else if (.@i == 4) getitem 12694,1; //Old_C_Album_Shoes
+	 		else if (.@i == 5) getitem 12698,1; //Old_C_Album_Weapon
+	 		else if (.@i == 6) getitem 12695,1; //Old_C_Album_Acc
+	 		else if (.@i == 7) getitem 12692,1; //Old_C_Album_Shield
+	 		else if (.@i < 28) getitem 547,10; //White_Slim_Potion
+	 		else if (.@i < 38) getitem 607,1; //Yggdrasilberry
+	 		else if (.@i < 51) getitem 608,1; //Seed_Of_Yggdrasil
+	 		else {
+				getitem 12696,5; //RWC_Cele_Fire
+				getitem 12697,5; //RWC_Cele_Fire2
+	 		}
+	 		mes "[RWC2011 Agent]";
+	 		mes "It's not much but please keep it! Haha, we still have lots of cards to be found. I hope you can help me tomorrow as well.";
+	 		next;
+	 		mes "[RWC2011 Agent]";
+	 		mes "Thank you!! I can continue working now. Nothing is impossible when we have great adventurers like you in this world!";
+	 		next;
+	 		mes "[RWC2011 Agent]";
+	 		mes "ADIOS!";
+	 		next;
+	 		mes "- Agent muttered something to himself. -";
+	 		close;
+		} else {
+			mes "[RWC2011 Agent]";
+			mes "Mmmm~ not yet? We're short-handed... Please help me.";
+			next;
+			mes "[RWC2011 Agent]";
+			mes "I'm just saying that out of concern for you. You need TWO ^FF0000Blue 1 Card^000000. It's \"2011\"... Got it?";
+			close;
+		}
+	} else if (oversea_event == 2) {
+		set .@playtime, checkquest(13001,PLAYTIME);
+		if (.@playtime == 0 || .@playtime == 1) {
+			mes "[RWC2011 Agent]";
+			mes "First, I will start attaching cards you found... I'll take the rest of cards tomorrow.";
+			mes "Please come back tomorrow.";
+			close;
+		} else if (.@playtime == 2)
+			erasequest 13001;
+		mes "[RWC2011 Agent]";
+		mes "Thanks for the last time.";
+		mes "I must keep on promoting the event so I want to ask you again~!";
+		set oversea_event,3;
+		close;
+	} else if (oversea_event == 3) {
+		mes "[RWC2011 Agent]";
+		mes "You've come again~";
+		mes "Thanks for the last time! We still have lots of cards to find. Could you help me out?";
+		next;
+		switch(select("Ok!:I'm busy now.")) {
+		case 1:
+			mes "[RWC2011 Agent]";
+			mes "It's the same mission as before.";
+			mes "Try to gather blue cards and make the word, ^FF0000R W C 2 0 1 1 ^000000.";
+			mes "Good Luck!";
+			set oversea_event,1;
+			setquest 13000;
+			close;
+		case 2:
+			mes "[RWC2011 Agent]";
+			mes "...I see...";
+			mes "I still have lots of cards to find so if you have time, please come back and help again.";
+			close;
+		}
+	} else {
+		mes "[RWC2011 Agent]";
+		mes "... huh...?";
+		mes "I am... a new agent.";
+		close;
+	}
+}
+
+// Monster Spawns
+//============================================================
+dic_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+dew_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+dew_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+dew_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mal_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+iz_dun05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+man_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+man_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+spl_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+spl_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+man_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+spl_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+nyd_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+bra_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+bra_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+bra_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+dic_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+dic_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+dic_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+dic_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+bif_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+bif_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+abbey01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+abbey02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+abbey03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+abyss_01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+abyss_02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+abyss_03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+alde_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+alde_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+alde_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+alde_dun04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ama_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ama_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ama_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ama_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+anthell01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+anthell02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ayo_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ayo_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ayo_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ayo_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+beach_dun,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+beach_dun2,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+beach_dun3,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+c_tower1,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+c_tower2,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+c_tower3,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+c_tower4,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+cmd_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+cmd_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+cmd_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+cmd_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+cmd_fild06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+cmd_fild07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+cmd_fild08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+cmd_fild09,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ein_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ein_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ein_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ein_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ein_fild05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ein_fild06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ein_fild07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ein_fild08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ein_fild09,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_dun00,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild00,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild09,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild10,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild11,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gef_fild13,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gefenia01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gefenia02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gefenia03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gefenia04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_cas01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_cas02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_church,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_chyard,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_in01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_knt01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_knt02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_prison,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_prison1,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_sew01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_sew02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_sew03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_sew04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gl_step,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+glast_01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gon_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gon_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gon_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+gon_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+hu_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+hu_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+hu_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+hu_fild05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+hu_fild06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ice_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ice_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ice_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+in_sphinx1,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+in_sphinx2,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+in_sphinx3,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+in_sphinx4,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+in_sphinx5,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+iz_dun00,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+iz_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+iz_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+iz_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+iz_dun04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+jupe_core,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+juperos_01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+juperos_02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+kh_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+kh_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lhz_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lhz_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lhz_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lhz_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lhz_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lhz_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lou_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lou_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lou_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+lou_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mag_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mag_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+man_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjo_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjo_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjo_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_09,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_10,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_11,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+mjolnir_12,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild09,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild10,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild11,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild12,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild13,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild14,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild15,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild16,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild17,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_fild18,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_pryd01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_pryd02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_pryd03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_pryd04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_pryd05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+moc_pryd06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+nameless_n,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+nif_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+nif_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+nyd_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+odin_tem01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+odin_tem02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+odin_tem03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+orcsdun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+orcsdun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_dun00,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_dun04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_fild06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_fild07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_fild08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_fild09,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+pay_fild10,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild00,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild09,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild10,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_fild11,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_maze01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_maze02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_maze03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_sewb1,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_sewb2,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_sewb3,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+prt_sewb4,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_fild05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_fild06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_fild08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_fild12,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_san01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_san02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_san03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_san04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ra_san05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+spl_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t09,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t10,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t11,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tha_t12,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+thor_v01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+thor_v02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+thor_v03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+treasure01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+treasure02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tur_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tur_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tur_dun03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+tur_dun04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+um_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+um_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+um_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+um_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ve_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ve_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ve_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ve_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ve_fild05,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+ve_fild07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+xmas_dun01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+xmas_dun02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+xmas_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild01,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild02,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild03,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild04,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild06,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild07,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild08,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild09,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild10,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
+yuno_fild12,0,0,0,0	monster	Golden Poring	2248,3,5000,0,0
diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt
new file mode 100644
index 000000000..33e3cec84
--- /dev/null
+++ b/npc/events/RWC_2012.txt
@@ -0,0 +1,326 @@
+//===== Hercules Script ======================================
+//= RWC 2012 Enchants
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Adds slots and enchantments to 2012 RWC Memory accessories.
+//===== Additional Comments: =================================
+//= 1.0 First Version. [Euphy]
+//============================================================
+
+prontera,147,61,3	script	Driller#pron	4_M_BARBER,{
+	disable_items;
+	if (checkweight(1201,1) == 0) {
+		mes "You're carrying too many items in your inventory. Visit Kafra storage and try again.";
+		close;
+	}
+	if (MaxWeight - Weight < 10000) {
+		mes "You cannot proceed because you're overweight.";
+		close;
+	}
+	set .@part, EQI_ACC_L;
+	if (!getequipisequiped(.@part)) {
+		mes "[Driller]";
+		mes "My job is to drill a card slot into RWC Memorial accessories.";
+		next;
+		mes "[Driller]";
+		mes "I'm sorry but you don't have any item equipped on your right accessory position.";
+		close;
+	}
+	mes "[Driller]";
+	mes "My job is to drill a card slot into RWC Memorial accessories. Moreover, I only treat ^ff0000pure items^000000, or those which have not been enchanted.";
+	next;
+	set .@equip_id, getequipid(.@part);
+	if (.@equip_id != 2966 && .@equip_id != 2968) {
+		mes "[Driller]";
+		mes "However, I can see that the accessory you are wearing on the right side cannot be treated. Please equip a RWC Memorial accessory.";
+		close;
+	}
+	mes "[Driller]";
+	mes "You should also know that making a card slot it extremely dangerous. ^ff0000Chances to succeed are about 50%.^000000 Do you wish to proceed?";
+	next;
+	if(select("Cancel:Let's go!") == 1) {
+		mes "[Driller]";
+		mes "See ya then.";
+		close;
+	}
+	if (.@equip_id == 2966) {
+		set .@slotted, 2967; //RWC_2012_Ring_
+		set .@name$,"RWC 2012 Memorial Ring";
+		set .@str$,"ring";
+	} else if (.@equip_id == 2968) {
+		set .@slotted, 2969; //RWC_2012_Pendant_
+		set .@name$,"RWC 2012 Memorial Pendant";
+		set .@str$,"pendant";
+	} else {
+		mes "[Driller]";
+		mes "I can't identify the accessory item you're wearing on your right hand. I can't work on it.";
+		close;
+	}
+	if (getequipcardid(.@part,3) > 0) {
+		mes "[Driller]";
+		mes "This item has already been enchanted. I can't work on this as it is against the rules.";
+		close;
+	}
+	delequip .@part;
+	if (rand(1,10) > 5) {
+		getitem .@slotted,1;
+		specialeffect2 EF_REPAIRWEAPON;
+		mes "[Driller]";
+		mes "Yay! Success! Your "+.@name$+" now has a card slot. Check it out!";
+		close;
+	} else {
+		specialeffect2 EF_LORD;
+		mes "[Driller]";
+		mes "Awww... Damn weak "+.@str$+"... It broke during the procedure. I'm sorry.";
+		close;
+	}
+}
+
+prontera,147,59,3	script	Goldberg#pron	4_M_OILMAN,{
+	disable_items;
+	if (checkweight(1201,1) == 0) {
+		mes "You are carrying too many items. Come back after you have organized your inventory.";
+		close;
+	}
+	if (MaxWeight - Weight < 10000) {
+		mes "You cannot proceed because you're overweight.";
+		close;
+	}
+	mes "[Goldberg]";
+	mes "Hello! I am in charge of enchanting RWC Memorial accessories with some mystic powers.";
+	next;
+	set .@part, EQI_ACC_L;
+	if (!getequipisequiped(.@part)) {
+		mes "[Goldberg]";
+		mes "I'm sorry but you don't have any item equipped on your right accessory position.";
+		close;
+	}
+	set .@equip_id, getequipid(.@part);
+	if (.@equip_id < 2966 || .@equip_id > 2969) {
+		mes "[Goldberg]";
+		mes "However, I can see that the accessory you are wearing is not something I can work on. Please equip a RWC Memorial accessory.";
+		close;
+	}
+	set .@select, select("Sorry, not interested.:Please, empower my accessory.:Remove the Enchant.")-1;
+	if (.@select == 0) {
+		mes "[Goldberg]";
+		mes "Alright, then, see you next time...";
+		close;
+	}
+	set .@equip_refine, getequiprefinerycnt(.@part);
+	setarray .@equip_card[0], getequipcardid(.@part,0),getequipcardid(.@part,1),getequipcardid(.@part,2),getequipcardid(.@part,3);
+	if (.@select == 1) {
+		switch(getequipid(.@part)) {
+		case 2966:
+			setarray .@option[0],2,2,4,4;
+			break;
+		case 2967:
+			setarray .@option[0],0,2,4,4;
+			break;
+		case 2968:
+			setarray .@option[0],1,1,3,3;
+			break;
+		case 2969:
+			setarray .@option[0],0,1,3,3;
+			break;
+		default:
+			mes "[Goldberg]";
+			mes "I'm sorry, but I cannot work on the accessory you are currently wearing.";
+			mes "If you have equipped your RWC Memorial accessory on the left side, try to swap it to the right side.";
+			close;
+		}
+		for(set .@i,3; .@i>=0; set .@i,.@i-1) {
+			if (.@equip_card[.@i] == 0) {
+				set .@slot, .@i;
+				set .@op_type, .@option[.@i];
+				break;
+			}
+		}
+		switch(.@op_type) {
+		case 4:
+			mes "[Goldberg]";
+			mes "Which enchantment would you like to infuse?";
+			next;
+			setarray .@enchant_select[0],1,2,3,4;
+			set .@i, select("Cancel:Fighting Spirit:ATK (%):Max HP:HP")-2;
+			break;
+		case 3:
+			setarray .@enchant_select[0],5,6,7;
+			set .@i, select("Cancel:Spell:MATK (%):SP")-2;
+			break;
+		case 2:
+			mes "[Goldberg]";
+			mes "^ff0000Be careful! There is about a 25% chance that the enchantment will fail. If this happens, the item will be destroyed.^000000 Which enchantment would you like to infuse?";
+			next;
+			setarray .@enchant_select[0],8,9,10,11,12,13,14;
+			set .@i, select("Cancel:STR:AGI:VIT:INT:DEX:LUK:SP")-2;
+			break;
+		case 1:
+			mes "[Goldberg]";
+			mes "^ff0000There is about a 25% chance that the enchantment will fail. If this happens, the item will be destroyed.^000000 Which enchantment would you like to infuse?";
+			next;
+			setarray .@enchant_select[0],8,9,10,11,12,13,15,16;
+			set .@i, select("Cancel:STR:AGI:VIT:INT:DEX:LUK:MHP:HP")-2;
+			break;
+		case 0:
+			mes "[Goldberg]";
+			mes "Your accessory has received so many enchantments that I can hardly work on it anymore.";
+			close;
+		}
+		if (.@i == -1) {
+			mes "[Goldberg]";
+			mes "Alright, then, see you next time.";
+			close;
+		}
+		mes "[Goldberg]";
+		mes "The power of the enchantment will be randomly chosen. ^ff0000Once infused, the enchantment cannot be removed.^000000 Shall we continue?";
+		next;
+		if(select("No, please stop.:Yes, please proceed.") == 1) {
+			mes "[Goldberg]";
+			mes "Alright, then, see you next time...";
+			close;
+		}
+		set .@enchant_type, .@enchant_select[.@i];
+		if (!getequipisequiped(.@part)) {
+			mes "[Goldberg]";
+			mes "Do not take off your equipment while I'm working, okay?";
+			close;
+		}
+		switch(.@enchant_type) {
+		case 1:
+			setarray .@enc[0],4811,4810,4809; //Fighting_Spirit1,Fighting_Spirit2,Fighting_Spirit3
+			break;
+		case 2:
+			setarray .@enc[0],4819,4766,4767; //Atk1,Atk2,Atk3
+			break;
+		case 3:
+			setarray .@enc[0],4861,4862,4867; //MHP1,MHP2,MHP3
+			break;
+		case 4:
+			setarray .@enc[0],4795,4796,4797; //HP100,HP200,HP300
+			break;
+		case 5:
+			setarray .@enc[0],4760,4761,4806; //Matk1,Matk2,Matk3
+			break;
+		case 6:
+			setarray .@enc[0],4815,4814,4813; //Spell1,Spell2,Spell3
+			break;
+		case 7:
+			setarray .@enc[0],4870,4800,4871; //SP25,SP50,SP75
+			break;
+		case 8:
+			setarray .@enc[0],4700,4701,4702; //Strength1,Strength2,Strength3
+			break;
+		case 9:
+			setarray .@enc[0],4730,4731,4732; //Agility1,Agility2,Agility3
+			break;
+		case 10:
+			setarray .@enc[0],4740,4741,4742; //Vitality1,Vitality2,Vitality3
+			break;
+		case 11:
+			setarray .@enc[0],4710,4711,4712; //Inteligence1,Inteligence2,Inteligence3
+			break;
+		case 12:
+			setarray .@enc[0],4720,4721,4722; //Dexterity1,Dexterity2,Dexterity3
+			break;
+		case 13:
+			setarray .@enc[0],4750,4751,4752; //Luck1,Luck2,Luck3
+			break;
+		case 14:
+			setarray .@enc[0],4870,4800,4871; //SP25,SP50,SP75
+			break;
+		case 15:
+			setarray .@enc[0],4861,4862,4867; //MHP1,MHP2,MHP3
+			break;
+		case 16:
+			setarray .@enc[0],4795,4796,4797; //HP100,HP200,HP300
+			break;
+		default:
+			mes "[Goldberg]";
+			mes "We have got a problem, let me check it up.";
+			close;
+		}
+
+		if (.@enchant_type < 8)
+			set .@i, rand(1,300); // 0% break chance.
+		else
+			set .@i, rand(1,400); // 25% break chance.
+
+		     if (.@i < 151) set .@enchant, .@enc[0];
+		else if (.@i < 251) set .@enchant, .@enc[1];
+		else if (.@i < 301) set .@enchant, .@enc[2];
+		else set .@enchant,9;
+
+		set .@equip_card[.@slot], .@enchant;
+		if (.@slot == 2 && .@enchant == 0) {
+			set .@equip_card[3],0;
+		} else if (.@slot == 1 && .@enchant == 0) {
+			set .@equip_card[2],0;
+			set .@equip_card[3],0;
+		} else if (.@slot == 0 && .@enchant == 0) {
+			set .@equip_card[1],0;
+			set .@equip_card[2],0;
+			set .@equip_card[3],0;
+		}
+
+		delequip .@part;
+		if (.@enchant == 9) {
+			mes "[Goldberg]";
+			mes "Oh gosh!";
+ 			mes "The item was not strong enough to bear the enchantment and thus got destroyed. I am sorry.";
+			specialeffect2 EF_LORD;
+			close;
+		}
+		if (.@enchant == 0) { // Should never happen.
+			mes "[Goldberg]";
+			mes "Oh... It looks like there was an instability of some sort between all the powers infused. This caused all the enchantments to vanish. It is a shame, but please try again!";
+		} else {
+			mes "[Goldberg]";
+			mes "Great!";
+			mes "The enchantment is a success! It will be applied in socket No.^990000"+(.@slot+1)+"^000000.";
+			specialeffect2 EF_REPAIRWEAPON;
+		}
+
+//		GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
+		getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
+
+		close;
+	} else if (.@select == 2) {
+		mes "[Goldberg]";
+		mes "I will just initialize the enchant option without doing anything to the slotted card. You wanna continue?";
+		next;
+		if(select("I will stop.:Yep, sure, go on.") == 1) {
+			mes "[Goldberg]";
+			mes "Come back if you change your mind.";
+			close;
+		}
+		if (countitem(6665) == 0) {
+			mes "[Goldberg]";
+			mes "I'm sorry. But you don't have the RWC Initialization coupon. Can you check your inventory?";
+			close;
+		}
+		if (.@equip_card[3] == 0) {
+			mes "[Goldberg]";
+			mes "Hm... this equipment is clean. I cannot initialize it if there's nothing! Check it again.";
+			close;
+		}
+		specialeffect2 EF_REPAIRWEAPON;
+		mes "[Goldberg]";
+		mes "The enchant option in your item will be initialized.";
+		delitem 6665,1; //RWC_Inicializer
+		delequip .@part;
+	
+//		GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
+		for(set .@i,0; .@i<4; set .@i,.@i+1) {
+			if (.@equip_card[.@i] >= 4700) // Armor Enchant System
+				set .@equip_card[.@i],0;
+		}
+		getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
+		
+		close;
+	}
+}
diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt
index bb736955f..c1816374f 100644
--- a/npc/events/StPatrick_2008.txt
+++ b/npc/events/StPatrick_2008.txt
@@ -13,7 +13,7 @@
 //= you must use the mob edits provided for this quest.
 //= Enable in mob_db2.txt
 //=
-//= The item 12715 Black_Treasure_Chest contains a script 
+//= The item 12715 Black_Treasure_Chest contains a script
 //= that relies explicitly on this script being loaded.
 //= Remove the "end" from the item script to enable.
 //= In addition to that, you must enable the item_avail
@@ -24,13 +24,13 @@
 //= 1.0 First version. [Kisuka]
 //= 1.1 Fixed checkitems for ale, fixed ale prize(gives the correct one now). [Kisuka]
 //= 1.2 Optimized. Uses only one variable now. [L0ne_W0lf]
-//=	Corrected EXP rewards, and some typos.
+//=     Corrected EXP rewards, and some typos.
 //= 1.3 Corrected random in item function. [L0ne_W0lf]
 //= 1.4 Replaced effect numerics with constants. [Samuray22]
 //= 1.5 Revamped the script. [Kisuka]
 //============================================================
 
-prt_fild05,170,286,4	script	Anxious Leprechaun#8pday	954,{
+prt_fild05,170,286,4	script	Anxious Leprechaun#8pday	4_M_PATRICK,{
 	if (StPatrick2008 < 1) {
 		mes "[O'Riley the Leprechaun]";
 		mes "Hmm...";
@@ -170,7 +170,7 @@ prt_fild05,170,286,4	script	Anxious Leprechaun#8pday	954,{
 			mes "[O'Riley the Leprechaun]";
 			mes "Thank you. Here's your ale~";
 			if (countitem(7915) >= 10) {
-				getitem 12135,1; 
+				getitem 12135,1;
 				delitem 7915,10;
 			}
 			close;
@@ -178,7 +178,7 @@ prt_fild05,170,286,4	script	Anxious Leprechaun#8pday	954,{
 			mes "[O'Riley the Leprechaun]";
 			mes "Thank you. Here's your ale~";
 			if (countitem(7916) >= 5) {
-				getitem 12135,1; 
+				getitem 12135,1;
 				delitem 7916,5;
 			}
 			close;
@@ -186,7 +186,7 @@ prt_fild05,170,286,4	script	Anxious Leprechaun#8pday	954,{
 			mes "[O'Riley the Leprechaun]";
 			mes "Thank you. Here's your ale~";
 			if (countitem(7720) >= 1) {
-				getitem 12135,1; 
+				getitem 12135,1;
 				delitem 7720,1;
 			}
 			close;
diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt
index ee71a940b..8bb48661c 100644
--- a/npc/events/bossnia.txt
+++ b/npc/events/bossnia.txt
@@ -1,18 +1,20 @@
 //===== Hercules Script ======================================
 //= Bossnia Warp NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Masao
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Description: ========================================= 
-//= Bossnia Warp NPC's.
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= Bossnia MVP event.
+//===== Additional Comments: =================================
 //= 1.0 Converted from the official script.
 //= 1.1 Optimized. [Euphy]
-//============================================================ 
-
-prontera,132,125,4	script	Bossnia Staff::bsw	908,{
+//= 1.2 Moved spawns and warps (by Masao) to this file. [Euphy]
+//============================================================
 
+// Entrance NPCs
+//============================================================
+prontera,132,125,4	script	Bossnia Staff#1	4_M_PHILMAN,{
 	mes "[Riss]";
 	mes "Hello?";
 	mes "I found some beautiful places";
@@ -62,7 +64,7 @@ prontera,132,125,4	script	Bossnia Staff::bsw	908,{
 	next;
 	if (Zeny > 4999) {
 		mes "[Riss]";
-		mes "Would you really like to take the challenge??";
+		mes "Would you really like to take the challenge?";
 		mes "Ok, just choose the course.";
 		next;
 		set .@i, select("First","Second","Third","Fourth");
@@ -70,7 +72,7 @@ prontera,132,125,4	script	Bossnia Staff::bsw	908,{
 		mes "Take care, boy~";
 		mes "Don't hold a grudge against me.";
 		close2;
-		set Zeny, Zeny - 5000;
+		Zeny -= 5000;
 		warp "bossnia_0"+.@i,rand(202,204),rand(202,204);
 		end;
 	}
@@ -79,9 +81,194 @@ prontera,132,125,4	script	Bossnia Staff::bsw	908,{
 	mes "Come back when you have at least 5,000 zeny.";
 	close;
 }
+geffen,124,169,4	duplicate(Bossnia Staff#1)	Bossnia Staff#2	4_M_PHILMAN
+payon,165,150,4	duplicate(Bossnia Staff#1)	Bossnia Staff#3	4_M_PHILMAN
+morocc,142,100,4	duplicate(Bossnia Staff#1)	Bossnia Staff#4	4_M_PHILMAN
+lighthalzen,203,140,4	duplicate(Bossnia Staff#1)	Bossnia Staff#5	4_M_PHILMAN
+rachel,132,144,4	duplicate(Bossnia Staff#1)	Bossnia Staff#6	4_M_PHILMAN
+
+// Warp Portals
+//============================================================
+bossnia_01,204,204,0	warp	bossnia01	1,1,prontera,155,180
+bossnia_02,204,204,0	warp	bossnia02	1,1,prontera,155,180
+bossnia_03,204,204,0	warp	bossnia03	1,1,prontera,155,180
+bossnia_04,204,204,0	warp	bossnia04	1,1,prontera,155,180
+
+// Monster Spawns
+//============================================================
+
+//----------------------------------------------------------------------------
+// bossnia_01 - Bossnia
+//----------------------------------------------------------------------------
+bossnia_01,0,0,0,0	monster	Garm	1252,5,7200000,0,1
+bossnia_01,0,0,0,0	monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Dark Lord	1272,3,7200000,0,1
+bossnia_01,0,0,0,0	monster	Doppelganger	1046,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Dracula	1389,5,1800000,0,1
+bossnia_01,0,0,0,0	monster	Drake	1112,10,1800000,0,1
+bossnia_01,0,0,0,0	monster	Detale	1719,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Maya	1147,10,1800000,0,1
+bossnia_01,0,0,0,0	monster	Mistress	1059,1,1800000,0,1
+bossnia_01,0,0,0,0	monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_01,0,0,0,0	monster	Amon Ra	1511,1,1800000,0,1
+bossnia_01,0,0,0,0	monster	Atroce	1785,10,1800000,0,1
+bossnia_01,0,0,0,0	monster	Vesper	1685,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Eddga	1115,1,1800000,0,1
+bossnia_01,0,0,0,0	monster	Osiris	1038,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Orc Lord	1190,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Orc Hero	1087,2,1800000,0,1
+bossnia_01,0,0,0,0	monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Ktullanux	1779,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Turtle General	1312,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Pharaoh	1157,2,3600000,0,1
+bossnia_01,0,0,0,0	monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_01,0,0,0,0	monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_01,0,0,0,0	monster	Phreeoni	1159,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_01,0,0,0,0	monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	RSX-0806	1623,5,7200000,0,1
+bossnia_01,0,0,0,0	monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_01,0,0,0,0	monster	Nidhoggr's Shadow	2022,1,28800000,0,1
+bossnia_01,137,118,1,1	monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_01,122,195,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_01,142,61,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_01,34,34,1,1	monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_01,45,118,1,1	monster	Ifrit	1832,1,0,0,1
+
+//----------------------------------------------------------------------------
+// bossnia_02 - Bossnia
+//----------------------------------------------------------------------------
+bossnia_02,0,0,0,0	monster	Garm	1252,5,7200000,0,1
+bossnia_02,0,0,0,0	monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Dark Lord	1272,3,7200000,0,1
+bossnia_02,0,0,0,0	monster	Doppelganger	1046,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Dracula	1389,5,1800000,0,1
+bossnia_02,0,0,0,0	monster	Drake	1112,10,1800000,0,1
+bossnia_02,0,0,0,0	monster	Detale	1719,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Maya	1147,10,1800000,0,1
+bossnia_02,0,0,0,0	monster	Mistress	1059,1,1800000,0,1
+bossnia_02,0,0,0,0	monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_02,0,0,0,0	monster	Amon Ra	1511,1,1800000,0,1
+bossnia_02,0,0,0,0	monster	Atroce	1785,10,1800000,0,1
+bossnia_02,0,0,0,0	monster	Vesper	1685,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Eddga	1115,1,1800000,0,1
+bossnia_02,0,0,0,0	monster	Osiris	1038,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Orc Lord	1190,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Orc Hero	1087,2,1800000,0,1
+bossnia_02,0,0,0,0	monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Ktullanux	1779,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Turtle General	1312,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Pharaoh	1157,2,3600000,0,1
+bossnia_02,0,0,0,0	monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_02,0,0,0,0	monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_02,0,0,0,0	monster	Phreeoni	1159,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_02,0,0,0,0	monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	RSX-0806	1623,5,7200000,0,1
+bossnia_02,0,0,0,0	monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_02,0,0,0,0	monster	Nidhoggr's Shadow	2022,1,28800000,0,1
+bossnia_02,137,118,1,1	monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_02,122,195,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_02,142,61,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_02,34,34,1,1	monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_02,45,118,1,1	monster	Ifrit	1832,1,0,0,1
+
+//----------------------------------------------------------------------------
+// bossnia_03 - Bossnia
+//----------------------------------------------------------------------------
+bossnia_03,0,0,0,0	monster	Garm	1252,5,7200000,0,1
+bossnia_03,0,0,0,0	monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Dark Lord	1272,3,7200000,0,1
+bossnia_03,0,0,0,0	monster	Doppelganger	1046,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Dracula	1389,5,1800000,0,1
+bossnia_03,0,0,0,0	monster	Drake	1112,10,1800000,0,1
+bossnia_03,0,0,0,0	monster	Detale	1719,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Maya	1147,10,1800000,0,1
+bossnia_03,0,0,0,0	monster	Mistress	1059,1,1800000,0,1
+bossnia_03,0,0,0,0	monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_03,0,0,0,0	monster	Amon Ra	1511,1,1800000,0,1
+bossnia_03,0,0,0,0	monster	Atroce	1785,10,1800000,0,1
+bossnia_03,0,0,0,0	monster	Vesper	1685,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Eddga	1115,1,1800000,0,1
+bossnia_03,0,0,0,0	monster	Osiris	1038,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Orc Lord	1190,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Orc Hero	1087,2,1800000,0,1
+bossnia_03,0,0,0,0	monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Ktullanux	1779,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Turtle General	1312,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Pharaoh	1157,2,3600000,0,1
+bossnia_03,0,0,0,0	monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_03,0,0,0,0	monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_03,0,0,0,0	monster	Phreeoni	1159,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_03,0,0,0,0	monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	RSX-0806	1623,5,7200000,0,1
+bossnia_03,0,0,0,0	monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_03,0,0,0,0	monster	Nidhoggr's Shadow	2022,1,28800000,0,1
+bossnia_03,137,118,1,1	monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_03,122,195,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_03,142,61,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_03,34,34,1,1	monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_03,45,118,1,1	monster	Ifrit	1832,1,0,0,1
 
-geffen,124,169,4	duplicate(bsw)	Bossnia Staff#2	908
-payon,165,150,4	duplicate(bsw)	Bossnia Staff#3	908
-morocc,142,100,4	duplicate(bsw)	Bossnia Staff#4	908
-lighthalzen,203,140,4	duplicate(bsw)	Bossnia Staff#5	908
-rachel,132,144,4	duplicate(bsw)	Bossnia Staff#6	908
+//----------------------------------------------------------------------------
+// bossnia_04 - Bossnia
+//----------------------------------------------------------------------------
+bossnia_04,0,0,0,0	monster	Garm	1252,5,7200000,0,1
+bossnia_04,0,0,0,0	monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Dark Lord	1272,3,7200000,0,1
+bossnia_04,0,0,0,0	monster	Doppelganger	1046,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Dracula	1389,5,1800000,0,1
+bossnia_04,0,0,0,0	monster	Drake	1112,10,1800000,0,1
+bossnia_04,0,0,0,0	monster	Detale	1719,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Maya	1147,10,1800000,0,1
+bossnia_04,0,0,0,0	monster	Mistress	1059,1,1800000,0,1
+bossnia_04,0,0,0,0	monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_04,0,0,0,0	monster	Amon Ra	1511,1,1800000,0,1
+bossnia_04,0,0,0,0	monster	Atroce	1785,10,1800000,0,1
+bossnia_04,0,0,0,0	monster	Vesper	1685,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Eddga	1115,1,1800000,0,1
+bossnia_04,0,0,0,0	monster	Osiris	1038,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Orc Lord	1190,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Orc Hero	1087,2,1800000,0,1
+bossnia_04,0,0,0,0	monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Ktullanux	1779,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Turtle General	1312,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Pharaoh	1157,2,3600000,0,1
+bossnia_04,0,0,0,0	monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_04,0,0,0,0	monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_04,0,0,0,0	monster	Phreeoni	1159,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_04,0,0,0,0	monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	RSX-0806	1623,5,7200000,0,1
+bossnia_04,0,0,0,0	monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_04,0,0,0,0	monster	Nidhoggr's Shadow	2022,1,28800000,0,1
+bossnia_04,137,118,1,1	monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_04,122,195,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_04,142,61,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_04,34,34,1,1	monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_04,45,118,1,1	monster	Ifrit	1832,1,0,0,1
diff --git a/npc/events/children_week.txt b/npc/events/children_week.txt
index cc4fb543c..48e9231d6 100644
--- a/npc/events/children_week.txt
+++ b/npc/events/children_week.txt
@@ -5,27 +5,27 @@
 //===== Current Version: =====================================
 //= 1.1
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Indian Ro: Children Week Event
 //===== Additional Comments: =================================
 //= 1.1 First Beta. [Samuray22]
 //============================================================
 
-prontera,146,91,5	script	Pandit chacha#child07	61,{
-	if(BaseLevel > 50) {
+prontera,146,91,5	script	Pandit chacha#child07	1_M_PUBMASTER,{
+	if (BaseLevel > 50) {
 		mes "[Pandit chacha]";
 		mes "Hahaha~";
 		mes "It is special day, comes only one time in a year.";
 		mes "If you see little adventurers around you send to me~";
 		mes "I will give the special gift.";
 		close;
-	} else if(BaseLevel < 20) {
+	} else if (BaseLevel < 20) {
 		mes "[Pandit chacha]";
 		mes "Hahaha~";
 		mes "You are a baby adventurer not little adventurer.";
 		mes "When you more grow up, come back again. hahaha.";
 		close;
-	} else if(oversea_event9 < 1) {
+	} else if (oversea_event9 < 1) {
 		mes "[Pandit chacha]";
 		mes "Hahaha~";
 		mes "Welcome, little adventurers!";
@@ -33,7 +33,7 @@ prontera,146,91,5	script	Pandit chacha#child07	61,{
 		mes "I would like to give the small gift to little adventurer...";
 		mes "What about you? Do you want to take it?";
 		next;
-		if(select("No. I will take it later.","Sure, i want.") == 1) {
+		if(select("No. I will take it later.:Sure, I want.") == 1) {
 			mes "[Pandit chacha]";
 			mes "That's too bad.... hum...";
 			mes "I gathered some stuffs from far a way world to make it....";
@@ -41,21 +41,21 @@ prontera,146,91,5	script	Pandit chacha#child07	61,{
 			close;
 		}
 		set oversea_event9,1;
-		getitem 11705,10; //Children's Potion
+		getitem 11705,10; //Special_White_Potion
 		mes "[Pandit chacha]";
 		mes "Look. This is a child Potion.";
 		mes "The weight is just 1 but recover much HP.";
 		mes "If you want to get more, bring the 1 Wedding Bouquet and 1 Witherless Rose.";
 		close;
-	} else if(oversea_event9 == 1) {
-		if(countitem(745) > 0 && countitem(748) > 0) {
+	} else if (oversea_event9 == 1) {
+		if (countitem(745) > 0 && countitem(748) > 0) {
 			mes "[Pandit chacha]";
 			mes "Ahha!!";
 			mes "You have remembered my beautiful composition.";
 			mes "You did good work.";
 			mes "Could you give me 1 Wedding Bouquet and 1 Witherless Rose? ";
 			next;
-			if(select("Not yet.","Sure, take it.") == 1) {
+			if(select("Not yet.:Sure, take it.") == 1) {
 				mes "[Pandit chacha]";
 				mes "If you are not prepared yet, call me when you ready.";
 				close;
@@ -66,10 +66,10 @@ prontera,146,91,5	script	Pandit chacha#child07	61,{
 			mes "Here, I will exchange to the 50 child potion.";
 			mes "Once you get this 50 child potion, I won't give any more.";
 			close2;
-			delitem 745,1; //Wedding Bouquet
-			delitem 748,1; //Witherless Rose
+			delitem 745,1; //Wedding_Bouquet
+			delitem 748,1; //Witherless_Rose
 			set oversea_event9,2;
-			getitem 11705,50; //Children's Potion
+			getitem 11705,50; //Special_White_Potion
 			end;
 		}
 		mes "[Pandit chacha]";
diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index a5af84273..5236e5a54 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.2
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Event 1: Louise's Kim creates Louise's Santa Hat.
 //= Event 2: Enjoy Happymerry Chistmas Event summons monsters.
 //= Event 3: Oholy requires you to hunt Deviruchi NPCs.
@@ -24,7 +24,7 @@
 //============================================================
 
 // Louise's Santa Hat (Event 1)
-xmas_in,89,92,5	script	Louise Kim#designer	714,{
+xmas_in,89,92,5	script	Louise Kim#designer	4_F_06,{
 	mes "[Designer Louise Kim]";
 	mes "Cone shaped red Santa hat is too ordinary.";
 	mes "It's old fashioned.";
@@ -51,7 +51,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 	mes "";
 	emotion e_lv;
 	next;
-	if(countitem(2236) > 0) {
+	if (countitem(2236) > 0) {
 		if (select("Here.:It's ok.") == 1) {
 			mes "[Designer Louise Kim]";
 			mes "Nice choice!!";
@@ -189,7 +189,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 }
 
 // Enjoy Happymerry Chistmas Event (Event 2)
-prontera,155,285,3	script	Enjoy#enjoy	753,{
+prontera,155,285,3	script	Enjoy#enjoy	4_M_MONK,{
 	if (!christ_solo05){
 		mes "[Enjoy]";
 		mes "Oh~~~";
@@ -294,7 +294,7 @@ prontera,155,285,3	script	Enjoy#enjoy	753,{
 			end;
 		}
 	}
-	else if((christ_solo05 > 0) && (christ_solo05 < 5)){
+	else if ((christ_solo05 > 0) && (christ_solo05 < 5)){
 		mes "[Enjoy]";
 		mes "Each should have one person's phone number.";
 		mes "We must keep it secret before we put in action.";
@@ -395,7 +395,7 @@ prontera,155,285,3	script	Enjoy#enjoy	753,{
 			donpcevent "Christ#christ02::OnCommandEmotion";
 			donpcevent "Mas#mas02::OnCommandEmotion";
 			donpcevent "Event#event02::OnCommandEmotion";
-			misceffect 376; //_HITLINE2
+			misceffect EF_HITLINE2;
 			delitem 604,5; //Branch_of_Dead_Tree
 			set christ_solo05,6;
 			donpcevent "Happymerry#happymerry02::OnCommandOff";
@@ -506,7 +506,7 @@ OnTimer180000:
 	end;
 }
 
-prontera,150,286,5	script	Happymerry#happymerry02	869,{
+prontera,150,286,5	script	Happymerry#happymerry02	4_M_LGTMAN,{
 	end;
 
 OnInit:
@@ -535,7 +535,7 @@ OnTimer60000:
 	end;
 }
 
-prontera,161,286,4	script	Christ#christ02	875,{
+prontera,161,286,4	script	Christ#christ02	4_M_PECOKNIGHT,{
 	end;
 OnInit:
 	disablenpc "Christ#christ02";
@@ -552,7 +552,7 @@ OnCommandOff:
 	end;
 }
 
-prontera,161,281,1	script	Mas#mas02	748,{
+prontera,161,281,1	script	Mas#mas02	4_M_ALCHE_A,{
 	end;
 OnInit:
 	disablenpc "Mas#mas02";
@@ -569,7 +569,7 @@ OnCommandOff:
 	end;
 }
 
-prontera,150,281,7	script	Event#event02	881,{
+prontera,150,281,7	script	Event#event02	4_M_SITDOWN,{
 	end;
 OnInit:
 	disablenpc "Event#event02";
@@ -586,7 +586,7 @@ OnCommandOff:
 	end;
 }
 
-prontera,188,177,4	script	Happymerry#happymerry	869,{
+prontera,188,177,4	script	Happymerry#happymerry	4_M_LGTMAN,{
 	if (christ_solo05==1) {
 		mes "[Happymerry]";
 		mes "Holgren~~!!";
@@ -666,7 +666,7 @@ prontera,188,177,4	script	Happymerry#happymerry	869,{
 	}
 }
 
-prontera,62,339,3	script	Christ#christ	875,{
+prontera,62,339,3	script	Christ#christ	4_M_PECOKNIGHT,{
 	if (christ_solo05 == 2) {
 		mes "[Christ]";
 		mes "Now~finally!!!";
@@ -719,7 +719,7 @@ prontera,62,339,3	script	Christ#christ	875,{
 		set christ_solo05,3;
 		close;
 	}
-	else if(christ_solo05 > 2) {
+	else if (christ_solo05 > 2) {
 		mes "[Christ]";
 		mes "Than,see you there!!";
 		mes "I'll go meet Enjoy!";
@@ -754,8 +754,8 @@ prontera,62,339,3	script	Christ#christ	875,{
 	}
 }
 
-prontera,163,66,7	script	Mas#mas	748,{
-	if(christ_solo05 == 3) {
+prontera,163,66,7	script	Mas#mas	4_M_ALCHE_A,{
+	if (christ_solo05 == 3) {
 		mes "[Mas]";
 		mes "Herds!!!!!How long does it take!";
 		mes "Somebody know the regenerating time of Herb?!!";
@@ -810,7 +810,7 @@ prontera,163,66,7	script	Mas#mas	748,{
 		set christ_solo05,4;
 		close;
 	}
-	else if(christ_solo05 > 3) {
+	else if (christ_solo05 > 3) {
 		mes "[Mas]";
 		mes "If you excuse me, I'll go ahead and meat Enjoy.";
 		mes "And don't forget to tell ^0000FFEvent^000000 about this.";
@@ -836,8 +836,8 @@ prontera,163,66,7	script	Mas#mas	748,{
 	}
 }
 
-prontera,35,209,5	script	Event#event	881,{
-	if(christ_solo05 == 4) {
+prontera,35,209,5	script	Event#event	4_M_SITDOWN,{
+	if (christ_solo05 == 4) {
 		mes "[Event]";
 		mes "........................";
 		next;
@@ -891,7 +891,7 @@ prontera,35,209,5	script	Event#event	881,{
 		set christ_solo05,5;
 		close;
 	}
-	else if(christ_solo05 > 4) {
+	else if (christ_solo05 > 4) {
 		mes "[Event]";
 		mes "Wait for me miss Kafra~~~";
 		mes "Don't be so lonely~.";
@@ -933,7 +933,7 @@ prontera,35,209,5	script	Event#event	881,{
 }
 
 // Oholy (Event 3)
-prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
+prontera,156,242,0	script	Oholy#pron::OholyDup	1_F_PRIEST,{
 	if (!christ_carol05) {
 		mes "[Oholy]";
 		mes "Joy to the world!";
@@ -1104,7 +1104,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			close;
 		}
 	}
-	else if(christ_carol05 == 1) {
+	else if (christ_carol05 == 1) {
 		mes "[Oholy]";
 		mes "He should not be able to escape";
 		mes "from the town. Please find the";
@@ -1113,8 +1113,8 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 		mes "Punish the wicked devil who is ruining Christmas!!!";
 		close;
 	}
-	else if(christ_carol05 == 2) {
-		if(!checkweight(1201,1)) {
+	else if (christ_carol05 == 2) {
+		if (!checkweight(1201,1)) {
 			mes "^3355FFWait a second!";
 			mes "Right now, you're carrying";
 			mes "too many things with you.";
@@ -1123,8 +1123,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "to store some of your items.^000000";
 			close;
 		}
-		set .@now_weight,MaxWeight-Weight;
-		if(.@now_weight < 2000) {
+		if (MaxWeight - Weight < 2000) {
 			mes "^3355FFWait a second!";
 			mes "Right now, you're carrying";
 			mes "too many things with you.";
@@ -1441,7 +1440,7 @@ function	script	F_carol_devi	{
 			disablenpc getarg(0);
 			next;
 			mes "-You are now cursed!!!-";
-			sc_start SC_Curse,5000,0;
+			sc_start SC_CURSE,5000,0;
 			emotion e_omg,1;
 			close;
 		case 3:
@@ -1458,7 +1457,7 @@ function	script	F_carol_devi	{
 			disablenpc getarg(0);
 			next;
 			mes "-You are blinded!!!-";
-			sc_start SC_Blind,5000,0;
+			sc_start SC_BLIND,5000,0;
 			emotion e_omg,1;
 			close;
 		case 4:
@@ -1475,7 +1474,7 @@ function	script	F_carol_devi	{
 			disablenpc getarg(0);
 			next;
 			mes "-You are poisoned!!!-";
-			sc_start SC_Poison,5000,0;
+			sc_start SC_POISON,5000,0;
 			emotion e_omg,1;
 			close;
 		}
@@ -1539,7 +1538,7 @@ function	script	F_carol_devi2	{
 	end;
 }
 
-prontera,94,297,3	script	Deviruchi#pron_01	738,3,3,{
+prontera,94,297,3	script	Deviruchi#pron_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","prontera",155,230);
 	end;
 
@@ -1548,7 +1547,7 @@ OnTouch:
 	end;
 }
 
-prontera,205,242,3	script	Deviruchi#pron_02	738,3,3,{
+prontera,205,242,3	script	Deviruchi#pron_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","prontera",155,230);
 	end;
 
@@ -1557,7 +1556,7 @@ OnTouch:
 	end;
 }
 
-prontera,126,118,3	script	Deviruchi#pron_03	738,3,3,{
+prontera,126,118,3	script	Deviruchi#pron_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","prontera",155,230);
 	end;
 
@@ -1567,8 +1566,8 @@ OnTouch:
 }
 
 // Payon
-payon,165,153,3	duplicate(OholyDup)	Oholy#payon	79
-payon,142,203,3	script	Deviruchi#payon_01	738,3,3,{
+payon,165,153,3	duplicate(OholyDup)	Oholy#payon	1_F_PRIEST
+payon,142,203,3	script	Deviruchi#payon_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","payon",166,60);
 	end;
 
@@ -1577,7 +1576,7 @@ OnTouch:
 	end;
 }
 
-payon,248,239,3	script	Deviruchi#payon_02	738,3,3,{
+payon,248,239,3	script	Deviruchi#payon_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","payon",166,60);
 	end;
 
@@ -1586,7 +1585,7 @@ OnTouch:
 	end;
 }
 
-payon,140,56,3	script	Deviruchi#payon_03	738,3,3,{
+payon,140,56,3	script	Deviruchi#payon_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","payon",166,60);
 	end;
 
@@ -1595,8 +1594,8 @@ OnTouch:
 	end;
 }
 
-morocc,161,85,0	duplicate(OholyDup)	Oholy#morocc	79
-morocc,52,134,3	script	Deviruchi#morocc_01	738,3,3,{
+morocc,161,85,0	duplicate(OholyDup)	Oholy#morocc	1_F_PRIEST
+morocc,52,134,3	script	Deviruchi#morocc_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","morocc",160,51);
 	end;
 
@@ -1605,7 +1604,7 @@ OnTouch:
 	end;
 }
 
-morocc,210,264,3	script	Deviruchi#morocc_02	738,3,3,{
+morocc,210,264,3	script	Deviruchi#morocc_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","morocc",160,51);
 	end;
 
@@ -1614,7 +1613,7 @@ OnTouch:
 	end;
 }
 
-morocc,223,74,3	script	Deviruchi#morocc_03	738,3,3,{
+morocc,223,74,3	script	Deviruchi#morocc_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","morocc",160,51);
 	end;
 
@@ -1624,8 +1623,8 @@ OnTouch:
 }
 
 // Geffen
-geffen,120,188,0	duplicate(OholyDup)	Oholy#geffen	79
-geffen,173,163,3	script	Deviruchi#geffen_01	738,3,3,{
+geffen,120,188,0	duplicate(OholyDup)	Oholy#geffen	1_F_PRIEST
+geffen,173,163,3	script	Deviruchi#geffen_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","geffen",120,34);
 	end;
 
@@ -1634,7 +1633,7 @@ OnTouch:
 	end;
 }
 
-geffen,49,95,3	script	Deviruchi#geffen_02	738,3,3,{
+geffen,49,95,3	script	Deviruchi#geffen_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","geffen",120,34);
 	end;
 
@@ -1643,7 +1642,7 @@ OnTouch:
 	end;
 }
 
-geffen,111,101,3	script	Deviruchi#geffen_03	738,3,3,{
+geffen,111,101,3	script	Deviruchi#geffen_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","geffen",120,34);
 	end;
 
@@ -1653,8 +1652,8 @@ OnTouch:
 }
 
 // Alberta
-alberta,54,237,0	duplicate(OholyDup)	Oholy#alberta	79
-alberta,97,86,3	script	Deviruchi#alberta_01	738,3,3,{
+alberta,54,237,0	duplicate(OholyDup)	Oholy#alberta	1_F_PRIEST
+alberta,97,86,3	script	Deviruchi#alberta_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","alberta",28,235);
 	end;
 
@@ -1663,7 +1662,7 @@ OnTouch:
 	end;
 }
 
-alberta,180,48,3	script	Deviruchi#alberta_02	738,3,3,{
+alberta,180,48,3	script	Deviruchi#alberta_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","alberta",28,235);
 	end;
 
@@ -1672,7 +1671,7 @@ OnTouch:
 	end;
 }
 
-alberta,54,132,3	script	Deviruchi#alberta_03	738,3,3,{
+alberta,54,132,3	script	Deviruchi#alberta_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","alberta",28,235);
 	end;
 
diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt
index 91555424a..192bf25ec 100644
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -4,6 +4,8 @@
 //= Kisuka
 //===== Current Version: =====================================
 //= 1.1
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
 //===== Description: =========================================
 //= iRO Christmas Event. (2008)
 //= Create Music Box and Cake.
@@ -18,7 +20,7 @@
 
 // Caroller - Music Box
 //============================================================
-prontera,226,306,4	script	Caroller#iROxmas08	79,{
+prontera,226,306,4	script	Caroller#iROxmas08	1_F_PRIEST,{
 	if (iROxmas08carol < 1 || iROxmas08carol == 3) {
 		if (iROxmas08carol == 3) {
 			mes "[Caroller]";
@@ -29,7 +31,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "Merry Christmas!";
 			mes "Hey! You! What comes to mind when you think about Christmas?";
 			next;
-		}else{
+		} else {
 			mes "[Caroller]";
 			mes "Jingle Bells! Jingle Bells! Jingle all the way!";
 			next;
@@ -41,7 +43,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "Merry Christmas!";
 			if (Sex) {
 				mes "Hey, boy! What comes to mind when";
-			}else{
+			} else {
 				mes "Hey, girl! What comes to mind when";
 			}
 			mes "you think about Christmas?";
@@ -67,7 +69,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "If you win over Santa, you can get a gift. Would you go for it?";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Isn't that big news?";
@@ -85,7 +87,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "Furthermore, he has put bad magic on the gifts so that they become monsters!";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Isn't it amazing?";
@@ -113,7 +115,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 						mes "[Caroller]";
 						mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 						close;
-					}else{
+					} else {
 						mes "[Caroller]";
 						mes "Wow, you have them.";
 						next;
@@ -131,13 +133,13 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 							mes "[Caroller]";
 							mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 							next;
-							emotion 18;
+							emotion e_heh;
 							delitem 6092,6;
 							getnameditem 12354,"+strcharinfo(0)+";
 							mes "[Caroller]";
 							mes "Let's care about others around you on this Christmas season!";
 							close;
-						}else{
+						} else {
 							mes "[Caroller]";
 							mes "Oh!";
 							mes "Shyness!";
@@ -152,7 +154,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 							mes "[Caroller]";
 							mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 							next;
-							emotion 18;
+							emotion e_heh;
 							delitem 6092,6;
 							getitem 12354,1;
 							mes "[Caroller]";
@@ -230,7 +232,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 					mes "Please, for our children's hope!!!?";
 					mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!";
 					next;
-					emotion 33;
+					emotion e_ok;
 					mes "[Caroller]";
 					mes "They're definitely as harsh as their name.";
 					mes "Go on please!";
@@ -252,7 +254,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "Are there some spcial abilities within them?";
 				mes "There's still the designer in the Christmas village... How about asking her to make that costume?";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "It's hot, huh?";
@@ -270,7 +272,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "And he isn't alone anymore... is what I heard...";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Hotness, right?";
@@ -293,13 +295,13 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "For all of the children of this world!!!";
 			mes "Please bring me ^0000FFSinging Crystal Pieces^000000 from ^0000FFViolent Gift Boxes^000000!";
 			next;
-			emotion 33;
+			emotion e_ok;
 			mes "[Caroller]";
 			mes "Be careful!";
 			mes "They're definitely as harsh as their name.";
 			mes "Take care!!!";
 			close;
-		}else{
+		} else {
 			specialeffect EF_GLORIA;
 			mes "[Caroller]";
 			mes "Don't cry, don't cry!";
@@ -335,7 +337,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
 			next;
 			delitem 6092,6;
-			emotion 33;
+			emotion e_ok;
 			set iROxmas08carol,2;
 			mes "[Caroller]";
 			mes "Those are all needed.";
@@ -354,12 +356,12 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "So, we need more of some materials.";
 			mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
 			next;
-			emotion 33;
+			emotion e_ok;
 			mes "[Caroller]";
 			mes "That's all we need.";
 			mes "Isn't that easy?";
 			close;
-		}else{
+		} else {
 			specialeffect EF_GLORIA;
 			mes "[Caroller]";
 			mes "Jingle bells, jingle bells,";
@@ -414,7 +416,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "[Caroller]";
 			mes "Don't worry, it tastes good.";
 			next;
-			emotion 33;
+			emotion e_ok;
 			getitem 2784,1;
 			getnameditem 12354,"+strcharinfo(0)+";
 			delitem 1019,10;
@@ -434,7 +436,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 
 // Santa Claus - Card Game
 //============================================================
--	script	Santa Claus#iROxmas08::08santa	718,{
+-	script	Santa Claus#iROxmas08::08santa	4_M_SANTA,{
 	mes "[Santa Claus]";
 	mes "Wow! Were you naughty or nice this year?";
 	mes "All right, what comes to your mind when you think about Christmas?";
@@ -454,7 +456,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "[Santa Claus]";
 		if (Sex) {
 			mes "Ho ho ho! What a good boy!";
-		}else{
+		} else {
 			mes "Ho ho ho! What a good girl!";
 		}
 		next;
@@ -526,7 +528,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "Let's get started!";
 		next;
 		while(.@SantaCardTurn != 5) {
-			emotion 56;
+			emotion e_loud;
 			mes "[Santa Claus]";
 			mes "First let me shuffle up these cards... Ok!!!";
 			next;
@@ -581,28 +583,28 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "Let's see!!";
 			mes "One! Two! Three!";
 			if (.@SantaCardNpc == 1) {
-				cutin "Æ÷¸µÄ«µå",4;
+				cutin "Æ÷¸µÄ«µå",4; // Poring Card
 			}
 			else if (.@SantaCardNpc == 2) {
-				cutin "¿£�©¸µÄ«µå",4;
+				cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 			}
 			else if (.@SantaCardNpc == 3) {
-				cutin "°í½ºÆ®¸µÄ«µå",4;
+				cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 			}
 			next;
 			set .@SantaCardTurn,.@SantaCardTurn+1;
 			if (.@SantaCardP == .@SantaCardNpc) {
 				set .@SantaCardWins,.@SantaCardWins+1;
-				emotion 0;
-				emotion 5,1;
+				emotion e_gasp;
+				emotion e_ic,1;
 				cutin "",255;
 				mes "[Santa Claus]";
 				mes "You're lucky.";
 				mes "Can you guess the right card the next time around?";
 				next;
-			}else{
-				emotion 0;
-				emotion 23,1;
+			} else {
+				emotion e_gasp;
+				emotion e_omg,1;
 				cutin "",255;
 				mes "[Santa Claus]";
 				mes "Aww maybe next time...";
@@ -617,7 +619,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "[Santa Claus]";
 			mes "Whenever you want.";
 			close;
-		}else{
+		} else {
 			mes "[Santa Claus]";
 			mes "You're so good!";
 			next;
@@ -687,7 +689,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "........................";
 		if (Sex) {
 			mes "Oh! Poor boy...";
-		}else{
+		} else {
 			mes "Oh! Poor girl...";
 		}
 		next;
@@ -695,7 +697,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "........................";
 		if (Sex) {
 			mes "Oh! Poor boy...";
-		}else{
+		} else {
 			mes "Oh! Poor girl...";
 		}
 		mes "...";
@@ -707,15 +709,15 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 	}
 }
 
-payon,171,109,4	duplicate(08santa)	Santa Claus#0801	718
-prontera,156,285,4	duplicate(08santa)	Santa Claus#0802	718
-alberta,117,66,4	duplicate(08santa)	Santa Claus#0803	718
-geffen,119,70,4	duplicate(08santa)	Santa Claus#0804	718
-morocc,158,104,4	duplicate(08santa)	Santa Claus#0805	718
+payon,171,109,4	duplicate(08santa)	Santa Claus#0801	4_M_SANTA
+prontera,156,285,4	duplicate(08santa)	Santa Claus#0802	4_M_SANTA
+alberta,117,66,4	duplicate(08santa)	Santa Claus#0803	4_M_SANTA
+geffen,119,70,4	duplicate(08santa)	Santa Claus#0804	4_M_SANTA
+morocc,158,104,4	duplicate(08santa)	Santa Claus#0805	4_M_SANTA
 
 // Louise Kim - Santa Suit
 //============================================================
-xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
+xmas_in,89,92,4	script	Louise Kim#iROxmas08	4_F_06,{
 	mes "[Louise Kim]";
 	mes "I always thought about how boring Santa Claus is wearing a too boring costume.";
 	mes "Too boring!";
@@ -728,7 +730,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	mes "The reason catching up to him is so hard, is that his clothes have been given strong power!";
 	mes "I blessed them with good luck!";
 	next;
-	emotion 3;
+	emotion e_lv;
 	mes "[Louise Kim]";
 	mes "Preta Porter!!";
 	mes "Which is quite luxurious but sold at good price ~";
@@ -745,7 +747,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "Ah!";
 		mes "You're silly! You lost your big chance!";
 		next;
-		emotion 18;
+		emotion e_heh;
 		mes "[Louise Kim]";
 		mes "Come to me later if you want to get the mission.";
 		mes "I, Louise Kim, am generous enough to accept you next time.";
@@ -763,7 +765,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	mes "Anyway, can you bring me some stuff?";
 	next;
 	if (select("Why not? What do you need?:Sorry, no time.") == 2) {
-		emotion 18;
+		emotion e_heh;
 		mes "[Louise Kim]";
 		mes "What?";
 		mes "You will definitely regret it.";
@@ -781,13 +783,13 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 			mes "[Louise Kim]";
 			mes "If you were to bring me all the stuff, I would make you a wonderful costume, for free...";
 			next;
-			emotion 3;
+			emotion e_lv;
 			mes "[Louise Kim]";
 			mes "Please see me again if you are interested.";
 			close;
-	}else{
+	} else {
 		select("Here you are.");
-		emotion 33;
+		emotion e_ok;
 		mes "[Louise Kim]";
 		mes "Oh! Good!";
 		mes "Let's not delay.";
@@ -799,7 +801,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-and many blessings she sings.-";
 		next;
 		specialeffect EF_BLESSING;
-		emotion 2;
+		emotion e_ho;
 		mes "[Louise Kim]";
 		mes "By artist, Louise Kim!";
 		mes "All over the world will be blessed tonight!";
@@ -813,7 +815,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-Count your blessings and sing!-";
 		next;
 		specialeffect EF_GLORIA;
-		emotion 2;
+		emotion e_ho;
 		mes "[Louise Kim]";
 		mes "By artist, Louise Kim!";
 		mes "All over the world will be blessed tonight!";
@@ -825,7 +827,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-cheer and goodwill!-";
 		next;
 		specialeffect EF_BENEDICTIO;
-		emotion 3;
+		emotion e_lv;
 		mes "[Louise Kim]";
 		mes "This is miraculous!";
 		mes "I am a genius of the world.";
@@ -837,7 +839,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "My fashion is radiant.";
 		mes "I ain't envious of Designer Pierre.";
 		next;
-		emotion 18;
+		emotion e_heh;
 		mes "[Louise Kim]";
 		mes "I am supposed to get paid well, however I will just let it be free, since this is Christmas!";
 		next;
diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt
index 44135389b..6c5a3b6b5 100644
--- a/npc/events/dumplingfestival.txt
+++ b/npc/events/dumplingfestival.txt
@@ -11,7 +11,7 @@
 //= 1.01 fixed bugs [Lupus]
 //============================================================
   
-payon,93,81,4	script	Exorcist Master Fahae	834,{
+payon,93,81,4	script	Exorcist Master Fahae	4_M_BUDDHIST,{
 
 	mes "[Exorcist Master Fahae]";
 	mes "Greetings young warrior, I'm the Exorcist Master Fahae.";
@@ -37,8 +37,8 @@ payon,93,81,4	script	Exorcist Master Fahae	834,{
 	input @input;
 	if(@input==0) close;
 	if(@input>5) goto L_SORRY;
-	if(Zeny< @input*20000) goto L_NOZENY;
-	set Zeny,Zeny-20000*@input;
+	if(Zeny< @input*20000) goto L_NoZeny;
+	Zeny -= 20000*@input;
 	getitem 682,@input;
 	mes "[Exorcist Master Fahae]";
 	mes "Here you go, I hope you may succeed in my quest.";
@@ -64,14 +64,14 @@ M_HERB:
 	input @input;
 	if(@input==0) close;
 	if(@input>5) goto L_SORRY;
-	if(Zeny< @input*10000) goto L_NOZENY;
-	set Zeny,Zeny-10000*@input;
+	if(Zeny< @input*10000) goto L_NoZeny;
+	Zeny -= 10000*@input;
 	getitem 683,@input;
 	mes "[Exorcist Master Fahae]";
 	mes "Here you go, I hope you may succeed in my quest.";
 	close;
 
-L_NOZENY:
+L_NoZeny:
 	mes "[Exorcist Master Fahae]";
 	mes "Money doesn't bring joy to everyone, but we need it to support the temple and myself. Please, try to kill some monsters and take their drops.";
 	close;
diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt
index fe6e02c85..79dfc4cce 100644
--- a/npc/events/easter_2008.txt
+++ b/npc/events/easter_2008.txt
@@ -14,7 +14,7 @@
 //============================================================
 
 // Prontera
-prontera,111,99,5	script	Egg Salesman#prt::EggVendor	98,{
+prontera,111,99,5	script	Egg Salesman#prt::EggVendor	4W_M_02,{
 	mes "[Egg Salesman]";
 	mes "^FF0000Chicken Eggs^000000! Come and";
 	mes "buy as many Chicken Eggs";
@@ -91,7 +91,7 @@ prontera,111,99,5	script	Egg Salesman#prt::EggVendor	98,{
 				}
 				else {
 					set .@egg_zeny,.@input*500;
-					if (zeny < .@egg_zeny) {
+					if (Zeny < .@egg_zeny) {
 						mes "[Egg Salesman]";
 						mes "You don't have enough Zeny.";
 						next;
@@ -118,7 +118,7 @@ prontera,111,99,5	script	Egg Salesman#prt::EggVendor	98,{
 							mes "them, but I don't know anything";
 							mes "about that. Well, have a good";
 							mes "time, and I'll see you again!";
-							set zeny,zeny-.@egg_zeny;
+							Zeny -= .@egg_zeny;
 							getitem 7605,.@input; //Chicken_Egg
 							close;
 						}
@@ -138,7 +138,7 @@ prontera,111,99,5	script	Egg Salesman#prt::EggVendor	98,{
 	}
 }
 
-prontera,113,98,0	script	Dowdy Matron#prt::EggMatron	701,{
+prontera,113,98,0	script	Dowdy Matron#prt::EggMatron	4_F_GODEMOM,{
 	mes "[Dowdy Matron]";
 	mes "This festival is going";
 	mes "to be so much fun! Ooh!";
@@ -155,7 +155,7 @@ prontera,113,98,0	script	Dowdy Matron#prt::EggMatron	701,{
 	close;
 }
 
-prontera,108,96,5	script	Cantankerous Geezer#prt::EggGeezer	709,{
+prontera,108,96,5	script	Cantankerous Geezer#prt::EggGeezer	4_M_SEAMAN,{
 	mes "[Cantankerous Geezer]";
 	mes ".Hey, do you know how";
 	mes "Chicken Eggs got to be so";
@@ -179,27 +179,27 @@ prontera,108,96,5	script	Cantankerous Geezer#prt::EggGeezer	709,{
 }
 
 // Payon
-payon,172,173,5	duplicate(EggVendor)	Egg Salesman#pay	98
-payon,175,171,1	duplicate(EggMatron)	Dowdy Matron#pay	701
-payon,170,171,5	duplicate(EggGeezer)	Cantankerous Geezer#pay	709
+payon,172,173,5	duplicate(EggVendor)	Egg Salesman#pay	4W_M_02
+payon,175,171,1	duplicate(EggMatron)	Dowdy Matron#pay	4_F_GODEMOM
+payon,170,171,5	duplicate(EggGeezer)	Cantankerous Geezer#pay	4_M_SEAMAN
 
 // Geffen
-geffen,136,64,5	duplicate(EggVendor)	Egg Salesman#gef	98
-geffen,138,63,1	duplicate(EggMatron)	Dowdy Matron#gef	701
-geffen,133,63,5	duplicate(EggGeezer)	Cantankerous Geezer#gef	709
+geffen,136,64,5	duplicate(EggVendor)	Egg Salesman#gef	4W_M_02
+geffen,138,63,1	duplicate(EggMatron)	Dowdy Matron#gef	4_F_GODEMOM
+geffen,133,63,5	duplicate(EggGeezer)	Cantankerous Geezer#gef	4_M_SEAMAN
 
 // Al De Baran
-aldebaran,133,119,5	duplicate(EggVendor)	Egg Salesman#alde	98
-aldebaran,135,117,1	duplicate(EggMatron)	Dowdy Matron#ald	701
-aldebaran,132,116,5	duplicate(EggGeezer)	Cantankerous Geezer#ald	709
+aldebaran,133,119,5	duplicate(EggVendor)	Egg Salesman#alde	4W_M_02
+aldebaran,135,117,1	duplicate(EggMatron)	Dowdy Matron#ald	4_F_GODEMOM
+aldebaran,132,116,5	duplicate(EggGeezer)	Cantankerous Geezer#ald	4_M_SEAMAN
 
 // Alberta
-alberta,90,55,5	duplicate(EggVendor)	Egg Salesman#alb	98
-alberta,92,53,1	duplicate(EggMatron)	Dowdy Matron#alb	701
-alberta,88,52,5	duplicate(EggGeezer)	Cantankerous Geezer#alb	709
+alberta,90,55,5	duplicate(EggVendor)	Egg Salesman#alb	4W_M_02
+alberta,92,53,1	duplicate(EggMatron)	Dowdy Matron#alb	4_F_GODEMOM
+alberta,88,52,5	duplicate(EggGeezer)	Cantankerous Geezer#alb	4_M_SEAMAN
 
 // Create Holy Eggs
-prontera,230,312,3	script	Nerlen#es07	79,{
+prontera,230,312,3	script	Nerlen#es07	1_F_PRIEST,{
 	mes "[Nerlen]";
 	mes "Hello! If you'd like,";
 	mes "I can take your Chicken";
@@ -312,7 +312,7 @@ prontera,230,312,3	script	Nerlen#es07	79,{
 }
 
 // Easter Quest
-morocc,131,26,5	script	Secret Corps#egg	880,{
+morocc,131,26,5	script	Secret Corps#egg	4_M_MASKMAN,{
 	if (easter2008 == 1) {
 		mes "[Corps Member]";
 		mes "How are you doing?";
@@ -626,7 +626,7 @@ morocc,131,26,5	script	Secret Corps#egg	880,{
 	}
 }
 
-pay_dun00,22,127,0	script	Trace#egg1	844,{
+pay_dun00,22,127,0	script	Trace#egg1	CLEAR_NPC,{
 	if (easter2008 == 5) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Well...";
@@ -678,7 +678,7 @@ pay_dun00,22,127,0	script	Trace#egg1	844,{
 	}
 }
 
-iz_dun02,340,346,0	script	Trace#egg	844,{
+iz_dun02,340,346,0	script	Trace#egg	CLEAR_NPC,{
 	if (easter2008 == 6) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Well...";
@@ -730,7 +730,7 @@ iz_dun02,340,346,0	script	Trace#egg	844,{
 	}
 }
 
-mjo_dun03,308,256,0	script	Trace#egg2	844,{
+mjo_dun03,308,256,0	script	Trace#egg2	CLEAR_NPC,{
 	if (easter2008 == 7) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Well...";
@@ -782,7 +782,7 @@ mjo_dun03,308,256,0	script	Trace#egg2	844,{
 	}
 }
 
-gl_prison,157,176,0	script	Trace#egg3	844,{
+gl_prison,157,176,0	script	Trace#egg3	CLEAR_NPC,{
 	if (easter2008 == 8) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Well...";
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt
new file mode 100644
index 000000000..292b91948
--- /dev/null
+++ b/npc/events/easter_2010.txt
@@ -0,0 +1,618 @@
+//===== Hercules Script ======================================
+//= Easter Event (2010)
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Lift Lina's curse for an Easter Egg Shell.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+prontera,202,297,3	script	Rina#Easter	4_F_JOB_HUNTER,{
+	disable_items;
+	if (BaseLevel < 40) {
+		mes "[Rina]";
+		mes "Hi~!";
+		mes "You are an adventurer like me.";
+		next;
+		mes "[Rina]";
+		mes "I am put under a curse.";
+		mes "I know you want to help me,";
+		mes "but your experience is not enough.";
+		next;
+		consumeitem 607; //Yggdrasilberry
+		consumeitem 12068; //Luk_Dish03
+		consumeitem 12063; //Dex_Dish03
+		consumeitem 12053; //Vit_Dish03
+		npcskill "AL_INCAGI",1,0,0;
+		npcskill "AL_BLESSING",1,0,0;
+		mes "[Rina]";
+		mes "I am not in the good condition,";
+		mes "so what I can do for you";
+		mes "is just like this.";
+		mes "Then, good bye.";
+		mes "Take care~!";
+		close;
+	}
+	set .@quest1, checkquest(9117);
+	if (.@quest1 == -1) {
+		playbgm "30.mp3"; // One Step Closer
+		mes "[Rina]";
+		mes "Hi~!";
+		mes "You are an adventurer like me.";
+		mes "Well... In fact, I am";
+		mes "put under a strange curse.";
+		next;
+		mes "[Rina]";
+		mes "To release this curse,";
+		mes "somebody needs to do ^800080Oath-taking ceremony^000000";
+		mes "with me,";
+		mes "and then needs to solve";
+		mes "several problems instead of me.";
+		next;
+		if (select("Let's help ^800080Rina^000000.:Just skip it.") == 2) {
+			emotion e_sigh;
+			mes "[Rina]";
+			mes "To help me,";
+			mes "I need a competent adventurer.";
+			mes "If you know those people,";
+			mes "I hope you to introduce them to me later.";
+			close;
+		}
+		emotion e_awsm;
+		mes "[Rina]";
+		mes "Are you really going to help me?";
+		mes "Thank you.";
+		mes "You are so brave.";
+		next;
+		playbgm "01.mp3"; // Title
+		mes "[Rina]";
+		mes "Then I'll start ^800080Oath-taking ceremony^000000.";
+		mes " ";
+		mes "^787878( A mysterious atmosphere hangs in the air. )^000000";
+		next;
+		specialeffect2 EF_COUPLECASTING;
+		next;
+		mes "[Rina]";
+		mes "Blah blah blah...";
+		mes " ";
+		mes "Blah blah blah...";
+		mes " ";
+		mes "^787878( ... This is a strange spell. )^000000";
+		next;
+		specialeffect2 EF_SIGNUM;
+		mes "[Rina]";
+		mes "Haaaaah~";
+		mes "^800080Oath-taking ceremony^000000 is done enough now.";
+		mes "Isn't that so simple?";
+		next;
+		emotion e_dum;
+		mes "[Rina]";
+		mes "Okay, from no on,";
+		mes "you need to go on ^006400a real adventure";
+		mes "to release my curse^000000.";
+		mes "Let me know when you are ready.";
+		setquest 9117;
+		close;
+	} else if (.@quest1 == 0 || .@quest1 == 1) {
+	L_HuntingInfo:
+		mes "[Rina]";
+		mes "What you need to do is";
+		mes "to choose one monster among";
+		mes "^FF0000DEVIRUCHI,^000000 ^FF0000WRAITH DEAD,^000000";
+		mes "^FF0000DULLAHAN,^000000 ^FF0000NIGHTMARE TERROR^000000";
+		mes "and then kill ^0000FF50^000000 monsters";
+		mes "and come back to me.";
+		next;
+		mes "[Rina]";
+		mes "It must be a tough task,";
+		mes "but you are the right person";
+		mes "who did the oath-taking ceremony.";
+		mes "I hope you succeed.";
+		if (.@quest1 < 2) {
+			completequest 9117;
+			setquest 9118;
+			setquest 9119;
+			setquest 9120;
+			setquest 9121;
+		}
+		close2;
+		npcskill "AL_INCAGI",1,0,0;
+		npcskill "AL_BLESSING",1,0,0;
+		end;
+	} else if (.@quest1 == 2) {
+		if (checkquest(9118) < 2 || checkquest(9119) < 2 || checkquest(9120) < 2 || checkquest(9121) < 2) {
+			if (checkquest(9118,HUNTING) == 2 || checkquest(9119,HUNTING) == 2 || checkquest(9120,HUNTING) == 2 || checkquest(9121,HUNTING) == 2) {
+				mes "[Rina]";
+				mes "You did it.";
+				mes "I can feel that my body is recovering.";
+				mes "But it is not enough.";
+				next;
+				mes "[Rina]";
+				mes "^006400You have one more thing to do.^000000";
+				mes "Let me know when you're ready.";
+				close2;
+				completequest 9118;
+				completequest 9119;
+				completequest 9120;
+				completequest 9121;
+				setquest 9122;
+			} else
+				goto L_HuntingInfo;
+			end;
+		}
+	}
+	set .@quest2, checkquest(9122);
+	if (.@quest2 == 0 || .@quest2 == 1) {
+		mes "[Rina]";
+		mes "I will check one thing.";
+		mes "For this task,";
+		mes "You need to feel the music.";
+		next;
+		mes "[Rina]";
+		mes "You cannot complete the task";
+		mes "without the music.";
+		mes "do you have any problem?";
+		next;
+		mes "- Check! -";
+		mes "^787878- BGM option should be turned on -^000000";
+		mes "^787878- in the game option menu. -^000000";
+		mes "^787878- Please check -^000000";
+		mes "^787878- whether you can listen -^000000";
+		mes "^787878- to the music sound. -^000000";
+		next;
+		if(select("[I'm ready to listen to the BGM.]:[I can't listen to the BGM.]") == 2) {
+			mes "[Rina]";
+			mes "I am so shocked that";
+			mes "you cannot feel the music.";
+			mes "What should we do now...";
+			close2;
+			emotion e_sob;
+			end;
+		}
+		mes "[Rina]";
+		mes "Listen carefully";
+		mes "the feelings of it...";
+		mes "I can't hear it,";
+		mes "but you can hear the sound.";
+		next;
+		if (oversea_event2 < 520 || oversea_event3 < 270 || oversea_event6 < 245 || oversea_event9 < 197) {
+			     if (oversea_event2 == 520) playbgm "13.mp3"; // Theme of Geffen
+			else if (oversea_event3 == 270) playbgm "59.mp3"; // Theme of Lutie
+			else if (oversea_event6 == 245) playbgm "70.mp3"; // Theme of Juno
+			else if (oversea_event9 == 197) playbgm "94.mp3"; // Theme of Rachel
+			else {
+				switch(rand(1,4)) {
+					case 1: playbgm "13.mp3"; set oversea_event2,520; break;
+					case 2: playbgm "59.mp3"; set oversea_event3,270; break;
+					case 3: playbgm "70.mp3"; set oversea_event6,245; break;
+					case 4: playbgm "94.mp3"; set oversea_event9,197; break;
+				}
+			}
+		}
+		mes "[Rina]";
+		mes "^006400The music you're hearing now^000000";
+		mes "has something to do with the one specific city.";
+		mes "Think carefully ^006400what kind of city^000000";
+		mes "has similar feeling with this music.";
+		next;
+		mes "[Rina]";
+		mes "And...";
+		mes "Go to ^006400the city";
+		mes "where you can remind by this music^000000.";
+		next;
+		mes "[Rina]";
+		mes "After that,";
+		mes "find ^FF0000the strange mark^000000";
+		mes "around the entrances of the city.";
+		mes "Then you can release the curse on me.";
+		next;
+		mes "[Rina]";
+		mes "It must be tough";
+		mes "but I hope you good luck.";
+		close2;
+		emotion e_sigh;
+		end;
+	} else {
+		set .@quest3, checkquest(9123);
+		if (.@quest3 == 0 || .@quest3 == 1) {
+			emotion e_kis;
+			mes "[Rina]";
+			mes "You're back~!";
+			mes "My curse has been released.";
+			mes "Thank you so much.";
+			next;
+			if (checkweight(5852,1) == 0) {
+				mes "[Rina]";
+				mes "Your bag is too full.";
+				mes "I have a present for you";
+				mes "so make your bag lighter.";
+				mes "I'll wait for you.";
+				close;
+			}
+			completequest 9123;
+			getitem 5852,1; //Easter_Egg_Shell
+			set .@BaseExp, (BaseLevel * (BaseLevel / 4)) * ((BaseLevel / 29) + (BaseLevel / 6)) + (5 * BaseLevel / 2);
+			if (ADVJOB == 0) {
+				     if (BaseLevel < 40) set .@nBaseExp, .@BaseExp;
+				else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel);
+				else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20));
+				else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
+				else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
+				else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
+				else if (BaseLevel < 99) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
+				else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2);
+
+				set .@nJobExp, (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2;
+			} else {
+				     if (BaseLevel < 30) set .@nBaseExp, .@BaseExp;
+				else if (BaseLevel < 40) set .@nBaseExp, .@BaseExp + (BaseLevel * 10);
+				else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * 2);
+				else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
+				else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
+				else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
+				else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
+				else if (BaseLevel < 98) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel);
+				else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2);
+
+				set .@nJobExp, (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3;
+			}
+			getexp .@nBaseExp,.@nJobExp;
+			mes "[Rina]";
+			mes "This is the present for you.";
+			mes "It's not a big one";
+			mes "but please take it";
+			mes "as a token of my gratitude.";
+			next;
+			mes "[Rina]";
+			mes "I'll take a rest for a few days";
+			mes "and then I'll go on an adventure.";
+			mes "See you again.";
+			close2;
+			consumeitem 607; //Yggdrasilberry
+			consumeitem 12068; //Luk_Dish03
+			consumeitem 12063; //Dex_Dish03
+			consumeitem 12053; //Vit_Dish03
+			npcskill "AL_INCAGI",1,0,0;
+			npcskill "AL_BLESSING",1,0,0;
+			end;
+		} else {
+			mes "[Rina]";
+			mes "Thank you for releasing my curse.";
+			mes "I'll take a rest for a few days";
+			mes "and then go on an adventure again.";
+			mes "Have a happy day~!";
+			close2;
+			consumeitem 607; //Yggdrasilberry
+			npcskill "AL_INCAGI",1,0,0;
+			npcskill "AL_BLESSING",1,0,0;
+			end;
+		}
+	}
+}
+
+geffen,207,114,4	script	#Hiddne01Easter	CLEAR_NPC,{
+	if (oversea_event2 > 519) {
+	OnRelease:
+		specialeffect EF_PATTACK;
+		mes "- I found ^0000FFthe strange mark^000000. -";
+		next;
+		specialeffect2 EF_HOLYHIT;
+		mes "- I can definitely feel that";
+		mes "- ^0000FFRina^000000 has been released";
+		mes "- from the curse.";
+		mes "- ^006400Let's go back to Rina!^000000";
+		if (checkquest(9122) < 2) {
+			completequest 9122;
+			setquest 9123;
+		}
+		close;
+	}
+	end;
+}
+
+xmas,144,52,4	script	#Hiddne02Easter	CLEAR_NPC,{
+	if (oversea_event3 > 269)
+		doevent "#Hiddne01Easter::OnRelease";
+	end;
+}
+
+yuno,164,46,4	script	#Hiddne03Easter	CLEAR_NPC,{
+	if (oversea_event6 > 244)
+		doevent "#Hiddne01Easter::OnRelease";
+	end;
+}
+
+rachel,36,132,4	script	#Hiddne04Easter	CLEAR_NPC,{
+	if (oversea_event9 > 196)
+		doevent "#Hiddne01Easter::OnRelease";
+	end;
+}
+
+prontera,204,297,3	script	Rina's Little Friend	4_DRAGON_EGG,{
+	disable_items;
+	if (checkquest(9117) == -1) {
+		emotion e_swt2;
+		mes "[Rina's Little Friend]";
+		mes ".......";
+		mes " ";
+		mes "^787878( No response. )^000000";
+		close;
+	}
+	if (checkquest(9123) == 2) {
+		emotion e_meh;
+		mes "[Rina's Little Friend]";
+		mes "Hi.";
+		mes "I guess you're the trustworthy friend.";
+		mes "Are you here to make a deal with me?";
+		next;
+		switch(select("Yes.:No.:What do you mean?")) {
+		case 1:
+			if (ADVJOB == 0) {
+				if (BaseLevel < 70)
+					set .@nCharge,400000;
+				else if (BaseLevel < 90)
+					set .@nCharge,450000;
+				else
+					set .@nCharge,480000;
+			} else
+				set .@nCharge,500000;
+			if (countitem(574) < 1 || countitem(1001) < 20 || Zeny < .@nCharge) {
+				mes "[Rina's Little Friend]";
+				mes "Hmm.";
+				mes "The material is not enough.";
+				mes "Please check the things you need.";
+				close;
+			}
+			mes "[Rina's Little Friend]";
+			mes "Cool... if you give me the materials";
+			mes "I will start it right now.";
+			mes "Are you ready for it?";
+			next;
+			if(select("Yes, let's start it.:No, stop it.") == 2) {
+				mes "[Rina's Little Friend]";
+				mes "Heh. It's boring.";
+				close;
+			}
+			mes "[Rina's Little Friend]";
+			mes "Okay, I will start it now.";
+			mes " ";
+			mes "^787878( A mysterious atmosphere hangs in the air. )^000000";
+			next;
+			specialeffect EF_ASPERSIO;
+			delitem 574,1; //Egg
+			delitem 1001,20; //Sparkling_Dust
+			Zeny -= .@nCharge;
+			set .@nPercentage, rand(1,100);
+			if (.@nPercentage <= 41) {
+				mes "[Rina's Little Friend]";
+				mes "Life is given to the egg.";
+				mes "Aaaaah~ I got to take some rest.";
+				mes "Good bye~!";
+				if (.@nPercentage <= 12)
+					getitem 9003,1; //Poporing_Egg
+				else if (.@nPercentage <= 24)
+					getitem 9005,1; //Picky_Egg
+				else if (.@nPercentage <= 36)
+					getitem 9009,1; //Savage_Bebe_Egg
+				else
+					getitem 9023,1; //Deviruchi_Egg
+				close2;
+				emotion e_yawn;
+				end;
+			} else if (.@nPercentage <= 60) {
+				if (.@nPercentage >= 42 && .@nPercentage <= 45)
+					getitem 5852,1; //Easter_Egg_Shell
+				else
+					getitem 12019,5; //Holy_Egg
+				mes "[Rina's Little Friend]";
+				mes "It seems that you have quite interesting things.";
+				mes "I need to take some rest.";
+				mes "Good bye~!";
+				close2;
+				emotion e_yawn;
+				end;
+			} else if (.@nPercentage <= 85) {
+				if (.@nPercentage >= 61 && .@nPercentage <= 75) {
+					getitem 1001,20; //Sparkling_Dust
+					getitem 607,1; //Yggdrasilberry
+				} else {
+					getitem 574,1; //Egg
+					getitem 608,2; //Seed_Of_Yggdrasil
+				}
+				mes "[Rina's Little Friend]";
+				mes "There was no change.";
+				mes "I didn't mean to do it,";
+				mes "but I'm sorry...";
+				mes "I hope to see you again, my friend.";
+				emotion e_dum;
+				close;
+			} else {
+				getitem 12093,2; //Dex_Dish08
+				mes "[Rina's Little Friend]";
+				mes "Hmm.";
+				mes "It became a dish.";
+				mes "Looks delicious.";
+				mes "Then, good bye~!";
+				close2;
+				emotion e_rice;
+				end;
+			}
+		case 2:
+			mes "[Rina's Little Friend]";
+			mes "You are here just to see my cute looks?";
+			mes "Aren't you peeking at Rina";
+			mes "pretending to see me?";
+			mes "It's funny... haha~";
+			close2;
+			emotion e_gg;
+			end;
+		case 3:
+			playbgm "23.mp3"; // Travel
+			mes "[Rina's Little Friend]";
+			mes "Huh?!";
+			mes "I never told you before?";
+			mes "Then listen carefully.";
+			next;
+			mes "[Rina's Little Friend]";
+			mes "I have a";
+			mes "special ability.";
+			mes "It's to give a special strength";
+			mes "to ^0000FFthe egg^000000.";
+			next;
+			mes "[Rina's Little Friend]";
+			mes "Well, I cannot do that unlimitedly.";
+			mes "There is no magic that is done forever.";
+			mes "So I need some additional cost.";
+			next;
+			mes "[Rina's Little Friend]";
+			mes "And I cannot sure";
+			mes "to what the egg will be changed.";
+			mes "It may be end in failure";
+			mes "and it can be something like Pet Egg.";
+			next;
+			if(select("Ask the cost.:Stop listening because it feels like a trick.") == 2) {
+				mes "[Rina's Little Friend]";
+				mes "Well... I don't really care.";
+				mes "Good bye.";
+				close2;
+				playbgm "08.mp3"; // Theme of Prontera
+				end;
+			}
+			mes "[Rina's Little Friend]";
+			mes "Do you want to make a deal?";
+			mes "You need";
+			mes "^0000FF1 Egg^000000, ^0000FF20 Light Granule^000000 and";
+			if (ADVJOB == 0) {
+				if (BaseLevel < 70)
+					mes "^B8860B400,000 Zeny.";
+				else if (BaseLevel < 90)
+					mes "^B8860B450,000 Zeny^000000.";
+				else
+					mes "^B8860B480,000 Zeny^000000.";
+			} else
+				mes "^B8860B500,000 Zeny^000000.";
+			next;
+			mes "[Rina's Little Friend]";
+			mes "If you are interested";
+			mes "make that zeny and come again.";
+			mes "Haha...";
+			mes "I'll be waiting for you.";
+			close2;
+			playbgm "08.mp3"; // Theme of Prontera
+			emotion e_gg;
+			end;
+		}
+	}
+	emotion e_meh;
+	mes "[Rina's Little Friend]";
+	mes "Ahem!";
+	mes "Why? Are you surprised to see me speaking?";
+	mes "Well, I understand you.";
+	mes "Only the person who did";
+	mes "the oath-taking ceremony can talk with me.";
+	next;
+	mes "[Rina's Little Friend]";
+	mes "If Rina's curse is released,";
+	mes "I can also";
+	mes "suggest you";
+	mes "an interesting thing.";
+	next;
+	mes "[Rina's Little Friend]";
+	mes "I will let you know";
+	mes "the detailed explanation later.";
+	mes "Then see you later, my friend.";
+	close;
+}
+
+prontera,116,82,5	script	Traveler#01Easter	4_M_03,{
+	mes "[Traveler]";
+	mes "I'm a traveler";
+	mes "and I often visit ^8B4513Prontera^000000.";
+	mes "Hmm, I think I might";
+	mes "see you around here before.";
+	next;
+	if(select("Listen some more.:Just ignore it.") == 2) {
+		mes "[Traveler]";
+		mes "As I expected,";
+		mes "you are a silent person. Ha ha.";
+		mes "Good bye.";
+		close;
+	}
+	mes "[Traveler]";
+	mes "A few days ago,";
+	mes "I saw a new adventurer";
+	mes "who were standing";
+	mes "near the ^8B4513Cathedral^000000.";
+	next;
+	emotion e_lv;
+	mes "[Traveler]";
+	mes "That adventurer seemed pretty.";
+	mes "But...";
+	mes "I feel some strange energy";
+	mes "so I don't come close to that person.";
+	next;
+	mes "[Traveler]";
+	mes "Look like";
+	mes "you're interested in";
+	mes "that new adventurer?";
+	mes "Or that is just your face look. Ha ha.";
+	next;
+	if(select("I'm interested in it.:I don't care at all.") == 2) {
+		mes "[Traveler]";
+		mes "Ah~ I see~!";
+		mes "Then, Good bye.";
+		close;
+	}
+	mes "[Traveler]";
+	mes "Just as I expected!";
+	mes "You can find";
+	mes "that new adventurer";
+	mes "on the way to the ^8B4513Cathedral^000000";
+	mes "at the direction of 1o'clock in ^8B4513Prontera^000000.";
+	next;
+	mes "[Traveler]";
+	mes "She was carrying";
+	mes "^800080a big egg thing^000000.";
+	mes "That's what I know.";
+	close;
+OnInit:
+	initnpctimer;
+	end;
+OnTimer5000:
+	emotion e_gasp;
+	stopnpctimer;
+	initnpctimer;
+	end;
+}
+
+prontera,163,194,5	script	Traveler#02Easter	4_F_03,{
+	mes "[Traveler]";
+	mes "A while ago,";
+	mes "I met a lady";
+	mes "and she said she has been";
+	mes "under a strange curse.";
+	next;
+	mes "[Traveler]";
+	mes "I wanted to help her";
+	mes "but my experience is not enough.";
+	mes "So I couldn't help her.";
+	next;
+	mes "[Traveler]";
+	mes "If you are more than";
+	mes "level ^0000FF40^000000,";
+	mes "go to the ^8B4513Cathedral^000000";
+	mes "at the direction of 1'o clock.";
+	mes "I hope you can help her...";
+	close;
+OnInit:
+	initnpctimer;
+	end;
+OnTimer5000:
+	emotion e_gasp;
+	stopnpctimer;
+	initnpctimer;
+	end;
+}
diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt
index 893e0c92b..718fe2e0e 100644
--- a/npc/events/event_skill_reset.txt
+++ b/npc/events/event_skill_reset.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
 //= Official Skill Resetter Event in Yuno (kRO & idRO)
-//===== By: ================================================== 
+//===== By: ==================================================
 //= $ephiroth
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.02
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= 2006 - Edition Skill Reset NPC
 //= 2006/11/16: 1.0 Release and fully working. [$ephiroth]
 //= 1.01 Checked, fixed typos, now uses MISC_QUEST var [Lupus]
@@ -13,7 +13,7 @@
 //= Skill Reset with payment, minimum BaseLv.60 to reset skill.
 //= Each 1 BaseLv need 20.000 Zeny, so be careful to use skill.
 //============================================================
-yuno,138,187,4	script	Hypnotist Teacher	124,{
+yuno,138,187,4	script	Hypnotist Teacher	4_F_TELEPORTER,{
 	set @npcname$,"[^D5A500Hypnotist^000000]";
 	mes @npcname$;
 
@@ -58,7 +58,7 @@ yuno,138,187,4	script	Hypnotist Teacher	124,{
 
 	mes @npcname$;
 	mes "You know where to find me,";
-	mes "if you ever want a reset!!"; 
+	mes "if you ever want a reset!!";
 	close;
 
 L_Info:
@@ -80,10 +80,10 @@ L_Info:
 L_Reset:
 	mes @npcname$;
 	mes "Before skill reset in starting.";
-	mes "You shall have to first tell me your Base Level."; 
+	mes "You shall have to first tell me your Base Level.";
 	next;
 	mes "^D5A500[" + strcharinfo(0) + "]^000000";
-	mes "My Base level is ^AA00AALevel " + BaseLevel + "BaseLv.^000000"; 
+	mes "My Base level is ^AA00AALevel " + BaseLevel + "BaseLv.^000000";
 	next;
 	set @zeny,BaseLevel*20000;
 	mes @npcname$;
@@ -96,7 +96,7 @@ L_Reset:
 		emotion e_hmm;
 		close;
 	}
-	set Zeny, Zeny-@zeny;
+	Zeny -= @zeny;
 	set MISC_QUEST,MISC_QUEST | 1024;
 	resetskill;
 	mes @npcname$;
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index cafb8f01e..22d30e12c 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -1,18 +1,19 @@
 //===== Hercules Script ======================================
 //= Guild dungeon event, Arunafeltz.
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= Guild dungeon event, Arunafeltz. Retrieve Morestone's
 //= pickaxe from Kublin.
 //===== Additional Comments: =================================
 //= 1.0 First version
 //= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf]
+//= 1.2 Added GM management function. [Euphy]
 //============================================================
 
-arug_dun01,1,1,1	script	Monster Controler#aru_gd	81,{
+arug_dun01,1,1,1	script	Monster Controler#aru_gd	4_DOG01,{
 OnInit:
 	donpcevent "Monster Controler1#aru::OnKill";
 	initnpctimer;
@@ -26,7 +27,7 @@ OnTimer3600000:
 	end;
 }
 
-arug_dun01,1,2,1	script	Monster Controler1#aru	81,{
+arug_dun01,1,2,1	script	Monster Controler1#aru	4_DOG01,{
 OnEnable:
 	set .@callwhere,rand(1,4);
 	if (.@callwhere == 1) {
@@ -43,12 +44,12 @@ OnEnable:
 	}
 	end;
 
-Onkill:
-	killmonster "arug_dun01","Monster Controler1#aru::OnMyMObDead";
+OnKill:
+	killmonster "arug_dun01","Monster Controler1#aru::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	if (mobcount("arug_dun01","Monster Controler1#aru::OnMyMObDead") == 0) {
+	if (mobcount("arug_dun01","Monster Controler1#aru::OnMyMobDead") == 0) {
 		mapannounce "arug_dun01", "Kublin: Aargh!",bc_map,"0x99CC00";
 		mapannounce "arug_dun01", "Morestone: I thought I heard Kublin screaming!! Who is there? What happened to Kublin? Hey you!",bc_map,"0x99CC00";
 		donpcevent "Dwarf#aru_gd::OnEnable";
@@ -56,7 +57,7 @@ OnMyMobDead:
 	end;
 }
 
-arug_dun01,199,195,5	script	Dwarf#aru_gd	826,{
+arug_dun01,199,195,5	script	Dwarf#aru_gd	4_M_DWARF,{
 	if (getcharid(2) == 0) {
 		mes "[Dwarf]";
 		mes "Hey did you see an ugly Goblin come by? He stole something from me!";
@@ -475,23 +476,23 @@ OnEnable:
 	end;
 }
 
-arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
+arug_que01,100,81,3	script	Pierrot Pier#aru_gd	4_M_PIERROT,{
 	specialeffect EF_POISONHIT;
 	set .@sprchg_gd,rand(1,5);
 	if (.@sprchg_gd == 1) {
-		setnpcdisplay "Pierrot Pier#aru_gd",950;
+		setnpcdisplay "Pierrot Pier#aru_gd", 4_GHOSTRING;
 	}
 	else if (.@sprchg_gd == 2) {
-		setnpcdisplay "Pierrot Pier#aru_gd",715;
+		setnpcdisplay "Pierrot Pier#aru_gd", 4_M_PIERROT;
 	}
 	else if (.@sprchg_gd == 3) {
-		setnpcdisplay "Pierrot Pier#aru_gd",714;
+		setnpcdisplay "Pierrot Pier#aru_gd", 4_F_06;
 	}
 	else if (.@sprchg_gd == 4) {
-		setnpcdisplay "Pierrot Pier#aru_gd",785;
+		setnpcdisplay "Pierrot Pier#aru_gd", 4_M_UMDANCEKID2;
 	}
 	else {
-		setnpcdisplay "Pierrot Pier#aru_gd",876;
+		setnpcdisplay "Pierrot Pier#aru_gd", 4_CAT;
 	}
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait!! -";
@@ -505,7 +506,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 		if ($@gdeventv_a2 == 0) {
 			set .@que_2143,checkquest(2143,PLAYTIME);
 			if (.@que_2143 == -1) {
-				setnpcdisplay "Pierrot Pier#aru_gd",715;
+				setnpcdisplay "Pierrot Pier#aru_gd", 4_M_PIERROT;
 				mes "A lonely clown is juggling.";
 				next;
 				mes "When looked at closely, the clown is just a puppet that looks like a human.";
@@ -659,7 +660,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 					mes "Let the game.. Begin!";
 					mapannounce "arug_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00";
 					set $@gdeventv_a2,1;
-					donpcevent "Controller#gdevent_a::Ongame_start";
+					donpcevent "Controller#gdevent_a::OnGame_start";
 					erasequest 2143;
 					close;
 				}
@@ -674,9 +675,9 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
-				donpcevent "eff_mvp#aru_gd::Onmvp";
+				donpcevent "eff_mvp#aru_gd::OnMVP";
 				mes "[Pierrot Pier]";
 				mes "Wow~~!!";
 				mes "Success~!!";
@@ -761,7 +762,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 				mes "Let the game.. Begin!";
 				mapannounce "arug_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00";
 				set $@gdeventv_a2,10;
-				donpcevent "Controller#gdevent_a::Ongame_start";
+				donpcevent "Controller#gdevent_a::OnGame_start";
 				close;
 			}
 		}
@@ -783,7 +784,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "You've completeled an unbelievable task, I will give you the wonderful gift master has prepared!! Ha!";
 			mapannounce "arug_que01", "Pierrot Pier: You've completeled an unbelievable task, I will give you the wonderful gift my master has prepared!! Ha!",bc_map,"0x99CC00";
 			mapannounce "arug_que01", "Pierrot Pier: Here, take Pierre's Treasure Boxes.",bc_map,"0x99CC00";
-			donpcevent "eff_mvp#aru_gd::Onmvp";
+			donpcevent "eff_mvp#aru_gd::OnMVP";
 			set $@gdeventv_a2,5;
 			getitem 14596,10; //Pierre_Treasurebox
 			close;
@@ -816,9 +817,9 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "Let me see.";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
-				donpcevent "eff_mvp#aru_gd::Onmvp";
+				donpcevent "eff_mvp#aru_gd::OnMVP";
 				mes "[Pierrot Pier]";
 				mes "Wow~~!!";
 				mes "Success~!!";
@@ -844,7 +845,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 	}
 	else {
 		if ($@gdeventv_a2 == 0) {
-			setnpcdisplay "Pierrot Pier#aru_gd",715;
+			setnpcdisplay "Pierrot Pier#aru_gd", 4_M_PIERROT;
 			mes "A lonely clown is juggling.";
 			next;
 			mes "When looked at closely, the clown is just a puppet that looks like a human.";
@@ -902,7 +903,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 				mes "When is that person coming? I am very bored~!";
 				close;
 			}
-			emotion 18;
+			emotion e_heh;
 			mes "[Pierrot Pier]";
 			mes "^3131FF<Although you're a weirdo, you seem to be very dedicated>^000000. Beep beep.";
 			next;
@@ -926,9 +927,9 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
-				donpcevent "eff_mvp#aru_gd::Onmvp";
+				donpcevent "eff_mvp#aru_gd::OnMVP";
 				mes "[Pierrot Pier]";
 				mes "Wow~~!!";
 				mes "Success~!!";
@@ -983,16 +984,16 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 		}
 		else {
 			mes "[Pierrot Pier]";
-			mes "Voc� encontrou o tesouro?";
-			mes "Mostre-me o que voc� tem nas m�os agora.";
+			mes "Did you find the treasure?";
+			mes "Show me that thing you are holding, now!";
 			next;
 			mes "[Pierrot Pier]";
-			mes "Deixe-me ver...";
+			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
-				donpcevent "eff_mvp#aru_gd::Onmvp";
+				donpcevent "eff_mvp#aru_gd::OnMVP";
 				mes "[Pierrot Pier]";
 				mes "Wow~~!!";
 				mes "Success~!!";
@@ -1018,16 +1019,16 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 	}
 }
 
-arug_que01,10,10,3	script	Controller#gdevent_a	81,{
+arug_que01,10,10,3	script	Controller#gdevent_a	4_DOG01,{
 OnInit:
 	set $@gdeventv_a2,0;
 	end;
 
-Onwin:
+OnWin:
 	donpcevent "treg#aru_gd::OnEnable";
 	end;
 
-Ongame_start:
+OnGame_start:
 	initnpctimer;
 	donpcevent "paper_sp_1_a::OnEnable";
 	donpcevent "paper_sp_2_a::OnEnable";
@@ -1040,35 +1041,35 @@ Ongame_start:
 	donpcevent "paper_sp_9_a::OnEnable";
 	set .@roulette_where,rand(1,9);
 	if (.@roulette_where == 1) {
-		donpcevent "paper_sp_1_a::Onbingo";
+		donpcevent "paper_sp_1_a::OnBingo";
 	}
 	else if (.@roulette_where == 2) {
-		donpcevent "paper_sp_2_a::Onbingo";
+		donpcevent "paper_sp_2_a::OnBingo";
 	}
 	else if (.@roulette_where == 3) {
-		donpcevent "paper_sp_3_a::Onbingo";
+		donpcevent "paper_sp_3_a::OnBingo";
 	}
 	else if (.@roulette_where == 4) {
-		donpcevent "paper_sp_4_a::Onbingo";
+		donpcevent "paper_sp_4_a::OnBingo";
 	}
 	else if (.@roulette_where == 5) {
-		donpcevent "paper_sp_5_a::Onbingo";
+		donpcevent "paper_sp_5_a::OnBingo";
 	}
 	else if (.@roulette_where == 6) {
-		donpcevent "paper_sp_6_a::Onbingo";
+		donpcevent "paper_sp_6_a::OnBingo";
 	}
 	else if (.@roulette_where == 7) {
-		donpcevent "paper_sp_7_a::Onbingo";
+		donpcevent "paper_sp_7_a::OnBingo";
 	}
 	else if (.@roulette_where == 8) {
-		donpcevent "paper_sp_8_a::Onbingo";
+		donpcevent "paper_sp_8_a::OnBingo";
 	}
 	else {
-		donpcevent "paper_sp_9_a::Onbingo";
+		donpcevent "paper_sp_9_a::OnBingo";
 	}
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -1088,7 +1089,7 @@ OnTimer63000:
 	end;
 }
 
-arug_que01,87,93,0	script	paper_sp_1_a	139,{
+arug_que01,87,93,0	script	paper_sp_1_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1106,14 +1107,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x1,rand(81,95);
 	set .@paper_y1,rand(87,100);
 	makeitem 6031,1,"arug_que01",.@paper_x1,.@paper_y1; //Glitering_PaperB
 	end;
 }
 
-arug_que01,102,93,0	script	paper_sp_2_a	139,{
+arug_que01,102,93,0	script	paper_sp_2_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1131,14 +1132,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x2,rand(96,110);
 	set .@paper_y2,rand(87,100);
 	makeitem 6031,1,"arug_que01",.@paper_x2,.@paper_y2; //Glitering_PaperB
 	end;
 }
 
-arug_que01,117,93,0	script	paper_sp_3_a	139,{
+arug_que01,117,93,0	script	paper_sp_3_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1156,14 +1157,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x3,rand(111,124);
 	set .@paper_y3,rand(87,100);
 	makeitem 6031,1,"arug_que01",.@paper_x3,.@paper_y3; //Glitering_PaperB
 	end;
 }
 
-arug_que01,87,80,0	script	paper_sp_4_a	139,{
+arug_que01,87,80,0	script	paper_sp_4_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1181,14 +1182,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x4,rand(81,95);
 	set .@paper_y4,rand(73,86);
 	makeitem 6031,1,"arug_que01",.@paper_x4,.@paper_y4; //Glitering_PaperB
 	end;
 }
 
-arug_que01,102,80,0	script	paper_sp_5_a	139,{
+arug_que01,102,80,0	script	paper_sp_5_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1206,14 +1207,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x5,rand(96,110);
 	set .@paper_y5,rand(73,86);
 	makeitem 6031,1,"arug_que01",.@paper_x5,.@paper_y5; //Glitering_PaperB
 	end;
 }
 
-arug_que01,117,80,0	script	paper_sp_6_a	139,{
+arug_que01,117,80,0	script	paper_sp_6_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1231,14 +1232,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x6,rand(111,124);
 	set .@paper_y6,rand(73,86);
 	makeitem 6031,1,"arug_que01",.@paper_x6,.@paper_y6; //Glitering_PaperB
 	end;
 }
 
-arug_que01,87,65,0	script	paper_sp_7_a	139,{
+arug_que01,87,65,0	script	paper_sp_7_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1256,14 +1257,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x7,rand(81,95);
 	set .@paper_y7,rand(59,72);
 	makeitem 6031,1,"arug_que01",.@paper_x7,.@paper_y7; //Glitering_PaperB
 	end;
 }
 
-arug_que01,102,65,0	script	paper_sp_8_a	139,{
+arug_que01,102,65,0	script	paper_sp_8_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1281,14 +1282,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x8,rand(96,110);
 	set .@paper_y8,rand(59,72);
 	makeitem 6031,1,"arug_que01",.@paper_x8,.@paper_y8; //Glitering_PaperB
 	end;
 }
 
-arug_que01,117,65,0	script	paper_sp_9_a	139,{
+arug_que01,117,65,0	script	paper_sp_9_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1306,7 +1307,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x9,rand(111,124);
 	set .@paper_y9,rand(59,72);
 	makeitem 6031,1,"arug_que01",.@paper_x9,.@paper_y9; //Glitering_PaperB
@@ -1330,10 +1331,10 @@ OnTouch2:
 	end;
 }
 
-arug_que01,6,6,1	script	eff_mvp#aru_gd	844,{
+arug_que01,6,6,1	script	eff_mvp#aru_gd	CLEAR_NPC,{
 	end;
 
-Onmvp:
+OnMVP:
 	initnpctimer;
 	end;
 
@@ -1369,7 +1370,7 @@ OnTimer4000:
 	end;
 }
 
-arug_que01,100,75,5	script	Gergath#aru_gd	412,{
+arug_que01,100,75,5	script	Gergath#aru_gd	4_M_OLDFRIAR,{
 	end;
 
 OnInit:
@@ -1428,7 +1429,7 @@ OnTimer50000:
 arug_que01,104,140,0	warp	back#aru_gd	1,1,arug_dun01,199,192
 
 /*
-arug_que01,104,140,1	script	treg#aru_gd	844,{
+arug_que01,104,140,1	script	treg#aru_gd	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -1452,69 +1453,70 @@ OnMyMobDead:
 }
 */
 
-arug_que01,98,105,3	script	#aru_flower_01::GD_Ev_Flower	978,{
+arug_que01,98,105,3	script	#aru_flower_01::GD_Ev_Flower	4_YELL_FLOWER,{
 	end;
 }
 
-arug_que01,94,105,3	duplicate(GD_Ev_Flower)	#aru_flower_02	977
-arug_que01,90,105,3	duplicate(GD_Ev_Flower)	#aru_flower_03	978
-arug_que01,86,105,3	duplicate(GD_Ev_Flower)	#aru_flower_04	977
-arug_que01,82,105,3	duplicate(GD_Ev_Flower)	#aru_flower_05	978
-arug_que01,79,103,3	duplicate(GD_Ev_Flower)	#aru_flower_06	977
-arug_que01,79,100,3	duplicate(GD_Ev_Flower)	#aru_flower_07	978
-arug_que01,79,97,3	duplicate(GD_Ev_Flower)	#aru_flower_08	977
-arug_que01,79,97,3	duplicate(GD_Ev_Flower)	#aru_flower_09	978
-arug_que01,79,94,3	duplicate(GD_Ev_Flower)	#aru_flower_10	977
-arug_que01,79,91,3	duplicate(GD_Ev_Flower)	#aru_flower_11	978
-arug_que01,79,88,3	duplicate(GD_Ev_Flower)	#aru_flower_12	977
-arug_que01,79,85,3	duplicate(GD_Ev_Flower)	#aru_flower_13	978
-arug_que01,79,82,3	duplicate(GD_Ev_Flower)	#aru_flower_14	977
-arug_que01,79,79,3	duplicate(GD_Ev_Flower)	#aru_flower_15	978
-arug_que01,79,76,3	duplicate(GD_Ev_Flower)	#aru_flower_16	977
-arug_que01,79,73,3	duplicate(GD_Ev_Flower)	#aru_flower_17	978
-arug_que01,79,70,3	duplicate(GD_Ev_Flower)	#aru_flower_18	977
-arug_que01,79,67,3	duplicate(GD_Ev_Flower)	#aru_flower_19	978
-arug_que01,79,64,3	duplicate(GD_Ev_Flower)	#aru_flower_20	977
-arug_que01,79,61,3	duplicate(GD_Ev_Flower)	#aru_flower_21	978
-arug_que01,79,58,3	duplicate(GD_Ev_Flower)	#aru_flower_22	977
-arug_que01,84,58,3	duplicate(GD_Ev_Flower)	#aru_flower_23	978
-arug_que01,89,58,3	duplicate(GD_Ev_Flower)	#aru_flower_24	977
-arug_que01,94,58,3	duplicate(GD_Ev_Flower)	#aru_flower_25	978
-arug_que01,99,58,3	duplicate(GD_Ev_Flower)	#aru_flower_26	977
-arug_que01,104,58,3	duplicate(GD_Ev_Flower)	#aru_flower_27	978
-arug_que01,109,58,3	duplicate(GD_Ev_Flower)	#aru_flower_28	977
-arug_que01,114,58,3	duplicate(GD_Ev_Flower)	#aru_flower_29	978
-arug_que01,119,58,3	duplicate(GD_Ev_Flower)	#aru_flower_30	977
-arug_que01,124,58,3	duplicate(GD_Ev_Flower)	#aru_flower_31	978
-arug_que01,129,58,3	duplicate(GD_Ev_Flower)	#aru_flower_32	977
-arug_que01,129,105,3	duplicate(GD_Ev_Flower)	#aru_flower_33	978
-arug_que01,129,103,3	duplicate(GD_Ev_Flower)	#aru_flower_34	977
-arug_que01,129,100,3	duplicate(GD_Ev_Flower)	#aru_flower_35	978
-arug_que01,129,97,3	duplicate(GD_Ev_Flower)	#aru_flower_36	977
-arug_que01,129,97,3	duplicate(GD_Ev_Flower)	#aru_flower_37	978
-arug_que01,129,94,3	duplicate(GD_Ev_Flower)	#aru_flower_38	977
-arug_que01,129,91,3	duplicate(GD_Ev_Flower)	#aru_flower_39	978
-arug_que01,129,88,3	duplicate(GD_Ev_Flower)	#aru_flower_40	977
-arug_que01,129,85,3	duplicate(GD_Ev_Flower)	#aru_flower_41	978
-arug_que01,129,82,3	duplicate(GD_Ev_Flower)	#aru_flower_42	977
-arug_que01,129,79,3	duplicate(GD_Ev_Flower)	#aru_flower_43	978
-arug_que01,129,76,3	duplicate(GD_Ev_Flower)	#aru_flower_44	977
-arug_que01,129,73,3	duplicate(GD_Ev_Flower)	#aru_flower_45	978
-arug_que01,129,70,3	duplicate(GD_Ev_Flower)	#aru_flower_46	977
-arug_que01,129,67,3	duplicate(GD_Ev_Flower)	#aru_flower_47	978
-arug_que01,129,64,3	duplicate(GD_Ev_Flower)	#aru_flower_48	977
-arug_que01,129,61,3	duplicate(GD_Ev_Flower)	#aru_flower_49	978
-arug_que01,129,58,3	duplicate(GD_Ev_Flower)	#aru_flower_50	977
-arug_que01,124,105,3	duplicate(GD_Ev_Flower)	#aru_flower_51	978
-arug_que01,119,105,3	duplicate(GD_Ev_Flower)	#aru_flower_52	977
-arug_que01,114,105,3	duplicate(GD_Ev_Flower)	#aru_flower_53	978
-arug_que01,109,105,3	duplicate(GD_Ev_Flower)	#aru_flower_54	977
-arug_que01,104,105,3	duplicate(GD_Ev_Flower)	#aru_flower_55	976
-
-/*
-arug_dun01,5,5,1	script	Event controller#aru_gd	81,{
-	input .@input; //,0,9999;
-	if (input == 1854) {
+arug_que01,94,105,3	duplicate(GD_Ev_Flower)	#aru_flower_02	4_RED_FLOWER
+arug_que01,90,105,3	duplicate(GD_Ev_Flower)	#aru_flower_03	4_YELL_FLOWER
+arug_que01,86,105,3	duplicate(GD_Ev_Flower)	#aru_flower_04	4_RED_FLOWER
+arug_que01,82,105,3	duplicate(GD_Ev_Flower)	#aru_flower_05	4_YELL_FLOWER
+arug_que01,79,103,3	duplicate(GD_Ev_Flower)	#aru_flower_06	4_RED_FLOWER
+arug_que01,79,100,3	duplicate(GD_Ev_Flower)	#aru_flower_07	4_YELL_FLOWER
+arug_que01,79,97,3	duplicate(GD_Ev_Flower)	#aru_flower_08	4_RED_FLOWER
+arug_que01,79,97,3	duplicate(GD_Ev_Flower)	#aru_flower_09	4_YELL_FLOWER
+arug_que01,79,94,3	duplicate(GD_Ev_Flower)	#aru_flower_10	4_RED_FLOWER
+arug_que01,79,91,3	duplicate(GD_Ev_Flower)	#aru_flower_11	4_YELL_FLOWER
+arug_que01,79,88,3	duplicate(GD_Ev_Flower)	#aru_flower_12	4_RED_FLOWER
+arug_que01,79,85,3	duplicate(GD_Ev_Flower)	#aru_flower_13	4_YELL_FLOWER
+arug_que01,79,82,3	duplicate(GD_Ev_Flower)	#aru_flower_14	4_RED_FLOWER
+arug_que01,79,79,3	duplicate(GD_Ev_Flower)	#aru_flower_15	4_YELL_FLOWER
+arug_que01,79,76,3	duplicate(GD_Ev_Flower)	#aru_flower_16	4_RED_FLOWER
+arug_que01,79,73,3	duplicate(GD_Ev_Flower)	#aru_flower_17	4_YELL_FLOWER
+arug_que01,79,70,3	duplicate(GD_Ev_Flower)	#aru_flower_18	4_RED_FLOWER
+arug_que01,79,67,3	duplicate(GD_Ev_Flower)	#aru_flower_19	4_YELL_FLOWER
+arug_que01,79,64,3	duplicate(GD_Ev_Flower)	#aru_flower_20	4_RED_FLOWER
+arug_que01,79,61,3	duplicate(GD_Ev_Flower)	#aru_flower_21	4_YELL_FLOWER
+arug_que01,79,58,3	duplicate(GD_Ev_Flower)	#aru_flower_22	4_RED_FLOWER
+arug_que01,84,58,3	duplicate(GD_Ev_Flower)	#aru_flower_23	4_YELL_FLOWER
+arug_que01,89,58,3	duplicate(GD_Ev_Flower)	#aru_flower_24	4_RED_FLOWER
+arug_que01,94,58,3	duplicate(GD_Ev_Flower)	#aru_flower_25	4_YELL_FLOWER
+arug_que01,99,58,3	duplicate(GD_Ev_Flower)	#aru_flower_26	4_RED_FLOWER
+arug_que01,104,58,3	duplicate(GD_Ev_Flower)	#aru_flower_27	4_YELL_FLOWER
+arug_que01,109,58,3	duplicate(GD_Ev_Flower)	#aru_flower_28	4_RED_FLOWER
+arug_que01,114,58,3	duplicate(GD_Ev_Flower)	#aru_flower_29	4_YELL_FLOWER
+arug_que01,119,58,3	duplicate(GD_Ev_Flower)	#aru_flower_30	4_RED_FLOWER
+arug_que01,124,58,3	duplicate(GD_Ev_Flower)	#aru_flower_31	4_YELL_FLOWER
+arug_que01,129,58,3	duplicate(GD_Ev_Flower)	#aru_flower_32	4_RED_FLOWER
+arug_que01,129,105,3	duplicate(GD_Ev_Flower)	#aru_flower_33	4_YELL_FLOWER
+arug_que01,129,103,3	duplicate(GD_Ev_Flower)	#aru_flower_34	4_RED_FLOWER
+arug_que01,129,100,3	duplicate(GD_Ev_Flower)	#aru_flower_35	4_YELL_FLOWER
+arug_que01,129,97,3	duplicate(GD_Ev_Flower)	#aru_flower_36	4_RED_FLOWER
+arug_que01,129,97,3	duplicate(GD_Ev_Flower)	#aru_flower_37	4_YELL_FLOWER
+arug_que01,129,94,3	duplicate(GD_Ev_Flower)	#aru_flower_38	4_RED_FLOWER
+arug_que01,129,91,3	duplicate(GD_Ev_Flower)	#aru_flower_39	4_YELL_FLOWER
+arug_que01,129,88,3	duplicate(GD_Ev_Flower)	#aru_flower_40	4_RED_FLOWER
+arug_que01,129,85,3	duplicate(GD_Ev_Flower)	#aru_flower_41	4_YELL_FLOWER
+arug_que01,129,82,3	duplicate(GD_Ev_Flower)	#aru_flower_42	4_RED_FLOWER
+arug_que01,129,79,3	duplicate(GD_Ev_Flower)	#aru_flower_43	4_YELL_FLOWER
+arug_que01,129,76,3	duplicate(GD_Ev_Flower)	#aru_flower_44	4_RED_FLOWER
+arug_que01,129,73,3	duplicate(GD_Ev_Flower)	#aru_flower_45	4_YELL_FLOWER
+arug_que01,129,70,3	duplicate(GD_Ev_Flower)	#aru_flower_46	4_RED_FLOWER
+arug_que01,129,67,3	duplicate(GD_Ev_Flower)	#aru_flower_47	4_YELL_FLOWER
+arug_que01,129,64,3	duplicate(GD_Ev_Flower)	#aru_flower_48	4_RED_FLOWER
+arug_que01,129,61,3	duplicate(GD_Ev_Flower)	#aru_flower_49	4_YELL_FLOWER
+arug_que01,129,58,3	duplicate(GD_Ev_Flower)	#aru_flower_50	4_RED_FLOWER
+arug_que01,124,105,3	duplicate(GD_Ev_Flower)	#aru_flower_51	4_YELL_FLOWER
+arug_que01,119,105,3	duplicate(GD_Ev_Flower)	#aru_flower_52	4_RED_FLOWER
+arug_que01,114,105,3	duplicate(GD_Ev_Flower)	#aru_flower_53	4_YELL_FLOWER
+arug_que01,109,105,3	duplicate(GD_Ev_Flower)	#aru_flower_54	4_RED_FLOWER
+arug_que01,104,105,3	duplicate(GD_Ev_Flower)	#aru_flower_55	4_BLUE_FLOWER
+
+arug_dun01,5,5,1	script	Event controller#aru_gd	4_DOG01,{
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "Incorrect password.";
+		close;
+	} else {
 		mes "How can I help you?";
 		next;
 		switch(select("Reset.:No, thanks.")) {
@@ -1532,9 +1534,4 @@ arug_dun01,5,5,1	script	Event controller#aru_gd	81,{
 			close;
 		}
 	}
-	else {
-		mes "Incorrect password.";
-		close;
-	}
 }
-*/
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 786164320..31537763e 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -1,18 +1,19 @@
 //===== Hercules Script ======================================
 //= Guild dungeon event, Schwaltzvalt.
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= Guild dungeon event, Schwaltzvalt. Retrieve Morestone's
 //= pickaxe from Kublin.
 //===== Additional Comments: =================================
 //= 1.0 First version
 //= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf]
+//= 1.2 Added GM management function. [Euphy]
 //============================================================
 
-schg_dun01,1,1,1	script	Monster Controler#sch_gd	81,{
+schg_dun01,1,1,1	script	Monster Controler#sch_gd	4_DOG01,{
 OnInit:
 	donpcevent "Monster Controler1#sch::OnKill";
 	initnpctimer;
@@ -26,7 +27,7 @@ OnTimer3600000:
 	end;
 }
 
-schg_dun01,1,2,1	script	Monster Controler1#sch	81,{
+schg_dun01,1,2,1	script	Monster Controler1#sch	4_DOG01,{
 OnEnable:
 	set .@callwhere,rand(1,4);
 	if (.@callwhere == 1) {
@@ -43,12 +44,12 @@ OnEnable:
 	}
 	end;
 
-Onkill:
-	killmonster "schg_dun01","Monster Controler1#sch::OnMyMObDead";
+OnKill:
+	killmonster "schg_dun01","Monster Controler1#sch::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	if (mobcount("schg_dun01","Monster Controler1#sch::OnMyMObDead") == 0) {
+	if (mobcount("schg_dun01","Monster Controler1#sch::OnMyMobDead") == 0) {
 		mapannounce "schg_dun01", "Kublin: Aargh!",bc_map,"0x99CC00";
 		mapannounce "schg_dun01", "Morestone: I thought I heard Kublin screaming!! Who is there? What happened to Kublin? Hey you!",bc_map,"0x99CC00";
 		donpcevent "Dwarf#sch_gd::OnEnable";
@@ -56,7 +57,7 @@ OnMyMobDead:
 	end;
 }
 
-schg_dun01,194,148,5	script	Dwarf#sch_gd	826,{
+schg_dun01,194,148,5	script	Dwarf#sch_gd	4_M_DWARF,{
 	if (getcharid(2) == 0) {
 		mes "[Dwarf]";
 		mes "Hey did you see an ugly Goblin come by? He stole something from me!";
@@ -474,23 +475,23 @@ OnEnable:
 	end;
 }
 
-schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
+schg_que01,100,81,3	script	Pierrot Pier#sch_gd	4_M_PIERROT,{
 	specialeffect EF_POISONHIT;
 	set .@sprchg_gd,rand(1,5);
 	if (.@sprchg_gd == 1) {
-		setnpcdisplay "Pierrot Pier#sch_gd",950;
+		setnpcdisplay "Pierrot Pier#sch_gd", 4_GHOSTRING;
 	}
 	else if (.@sprchg_gd == 2) {
-		setnpcdisplay "Pierrot Pier#sch_gd",715;
+		setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
 	}
 	else if (.@sprchg_gd == 3) {
-		setnpcdisplay "Pierrot Pier#sch_gd",714;
+		setnpcdisplay "Pierrot Pier#sch_gd", 4_F_06;
 	}
 	else if (.@sprchg_gd == 4) {
-		setnpcdisplay "Pierrot Pier#sch_gd",785;
+		setnpcdisplay "Pierrot Pier#sch_gd", 4_M_UMDANCEKID2;
 	}
 	else {
-		setnpcdisplay "Pierrot Pier#sch_gd",876;
+		setnpcdisplay "Pierrot Pier#sch_gd", 4_CAT;
 	}
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait!! -";
@@ -504,7 +505,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 		if ($@gdeventv_s2 == 0) {
 			set .@que_2143,checkquest(2143,PLAYTIME);
 			if (.@que_2143 == -1) {
-				setnpcdisplay "Pierrot Pier#sch_gd",715;
+				setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
 				mes "A lonely clown is juggling.";
 				next;
 				mes "When looked at closely, the clown is just a puppet that looks like a human.";
@@ -658,7 +659,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 					mes "Let the game.. Begin!";
 					mapannounce "schg_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00";
 					set $@gdeventv_s2,1;
-					donpcevent "Controller#gdevent_s::Ongame_start";
+					donpcevent "Controller#gdevent_s::OnGame_start";
 					erasequest 2143;
 					close;
 				}
@@ -673,9 +674,9 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
-				donpcevent "eff_mvp#sch_gd::Onmvp";
+				donpcevent "eff_mvp#sch_gd::OnMVP";
 				mes "[Pierrot Pier]";
 				mes "Wow~~!!";
 				mes "Success~!!";
@@ -760,7 +761,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 				mes "Let the game.. Begin!";
 				mapannounce "schg_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00";
 				set $@gdeventv_s2,10;
-				donpcevent "Controller#gdevent_s::Ongame_start";
+				donpcevent "Controller#gdevent_s::OnGame_start";
 				close;
 			}
 		}
@@ -782,7 +783,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "You've completeled an unbelievable task, I will give you the wonderful gift master has prepared!! Ha!";
 			mapannounce "schg_que01", "Pierrot Pier: You've completeled an unbelievable task, I will give you the wonderful gift my master has prepared!! Ha!",bc_map,"0x99CC00";
 			mapannounce "schg_que01", "Pierrot Pier: Here, take Pierre's Treasure Boxes.",bc_map,"0x99CC00";
-			donpcevent "eff_mvp#sch_gd::Onmvp";
+			donpcevent "eff_mvp#sch_gd::OnMVP";
 			set $@gdeventv_s2,5;
 			getitem 14596,10; //Pierre_Treasurebox
 			close;
@@ -815,9 +816,9 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "Let me see.";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
-				donpcevent "eff_mvp#sch_gd::Onmvp";
+				donpcevent "eff_mvp#sch_gd::OnMVP";
 				mes "[Pierrot Pier]";
 				mes "Wow~~!!";
 				mes "Success~!!";
@@ -843,7 +844,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 	}
 	else {
 		if ($@gdeventv_s2 == 0) {
-			setnpcdisplay "Pierrot Pier#sch_gd",715;
+			setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
 			mes "A lonely clown is juggling.";
 			next;
 			mes "When looked at closely, the clown is just a puppet that looks like a human.";
@@ -901,7 +902,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 				mes "When is that person coming? I am very bored~!";
 				close;
 			}
-			emotion 18;
+			emotion e_heh;
 			mes "[Pierrot Pier]";
 			mes "^3131FF<Although you're a weirdo, you seem to be very dedicated>^000000. Beep beep.";
 			next;
@@ -925,9 +926,9 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
-				donpcevent "eff_mvp#sch_gd::Onmvp";
+				donpcevent "eff_mvp#sch_gd::OnMVP";
 				mes "[Pierrot Pier]";
 				mes "Wow~~!!";
 				mes "Success~!!";
@@ -982,16 +983,16 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 		}
 		else {
 			mes "[Pierrot Pier]";
-			mes "Voc� encontrou o tesouro?";
-			mes "Mostre-me o que voc� tem nas m�os agora.";
+			mes "Did you find the treasure?";
+			mes "Show me that thing you are holding, now!";
 			next;
 			mes "[Pierrot Pier]";
-			mes "Deixe-me ver...";
+			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
-				donpcevent "eff_mvp#sch_gd::Onmvp";
+				donpcevent "eff_mvp#sch_gd::OnMVP";
 				mes "[Pierrot Pier]";
 				mes "Wow~~!!";
 				mes "Success~!!";
@@ -1017,16 +1018,16 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 	}
 }
 
-schg_que01,10,10,3	script	Controller#gdevent_s	81,{
+schg_que01,10,10,3	script	Controller#gdevent_s	4_DOG01,{
 OnInit:
 	set $@gdeventv_s2,0;
 	end;
 
-Onwin:
+OnWin:
 	donpcevent "treg#sch_gd::OnEnable";
 	end;
 
-Ongame_start:
+OnGame_start:
 	initnpctimer;
 	donpcevent "paper_sp_1_s::OnEnable";
 	donpcevent "paper_sp_2_s::OnEnable";
@@ -1039,35 +1040,35 @@ Ongame_start:
 	donpcevent "paper_sp_9_s::OnEnable";
 	set .@roulette_where,rand(1,9);
 	if (.@roulette_where == 1) {
-		donpcevent "paper_sp_1_s::Onbingo";
+		donpcevent "paper_sp_1_s::OnBingo";
 	}
 	else if (.@roulette_where == 2) {
-		donpcevent "paper_sp_2_s::Onbingo";
+		donpcevent "paper_sp_2_s::OnBingo";
 	}
 	else if (.@roulette_where == 3) {
-		donpcevent "paper_sp_3_s::Onbingo";
+		donpcevent "paper_sp_3_s::OnBingo";
 	}
 	else if (.@roulette_where == 4) {
-		donpcevent "paper_sp_4_s::Onbingo";
+		donpcevent "paper_sp_4_s::OnBingo";
 	}
 	else if (.@roulette_where == 5) {
-		donpcevent "paper_sp_5_s::Onbingo";
+		donpcevent "paper_sp_5_s::OnBingo";
 	}
 	else if (.@roulette_where == 6) {
-		donpcevent "paper_sp_6_s::Onbingo";
+		donpcevent "paper_sp_6_s::OnBingo";
 	}
 	else if (.@roulette_where == 7) {
-		donpcevent "paper_sp_7_s::Onbingo";
+		donpcevent "paper_sp_7_s::OnBingo";
 	}
 	else if (.@roulette_where == 8) {
-		donpcevent "paper_sp_8_s::Onbingo";
+		donpcevent "paper_sp_8_s::OnBingo";
 	}
 	else {
-		donpcevent "paper_sp_9_s::Onbingo";
+		donpcevent "paper_sp_9_s::OnBingo";
 	}
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -1087,7 +1088,7 @@ OnTimer63000:
 	end;
 }
 
-schg_que01,87,93,0	script	paper_sp_1_s	139,{
+schg_que01,87,93,0	script	paper_sp_1_s	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1105,14 +1106,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x1,rand(81,95);
 	set .@paper_y1,rand(87,100);
 	makeitem 6031,1,"schg_que01",.@paper_x1,.@paper_y1; //Glitering_PaperB
 	end;
 }
 
-schg_que01,102,93,0	script	paper_sp_2_s	139,{
+schg_que01,102,93,0	script	paper_sp_2_s	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1130,14 +1131,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x2,rand(96,110);
 	set .@paper_y2,rand(87,100);
 	makeitem 6031,1,"schg_que01",.@paper_x2,.@paper_y2; //Glitering_PaperB
 	end;
 }
 
-schg_que01,117,93,0	script	paper_sp_3_s	139,{
+schg_que01,117,93,0	script	paper_sp_3_s	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1155,14 +1156,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x3,rand(111,124);
 	set .@paper_y3,rand(87,100);
 	makeitem 6031,1,"schg_que01",.@paper_x3,.@paper_y3; //Glitering_PaperB
 	end;
 }
 
-schg_que01,87,80,0	script	paper_sp_4_s	139,{
+schg_que01,87,80,0	script	paper_sp_4_s	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1180,14 +1181,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x4,rand(81,95);
 	set .@paper_y4,rand(73,86);
 	makeitem 6031,1,"schg_que01",.@paper_x4,.@paper_y4; //Glitering_PaperB
 	end;
 }
 
-schg_que01,102,80,0	script	paper_sp_5_s	139,{
+schg_que01,102,80,0	script	paper_sp_5_s	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1205,14 +1206,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x5,rand(96,110);
 	set .@paper_y5,rand(73,86);
 	makeitem 6031,1,"schg_que01",.@paper_x5,.@paper_y5; //Glitering_PaperB
 	end;
 }
 
-schg_que01,117,80,0	script	paper_sp_6_s	139,{
+schg_que01,117,80,0	script	paper_sp_6_s	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1230,14 +1231,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x6,rand(111,124);
 	set .@paper_y6,rand(73,86);
 	makeitem 6031,1,"schg_que01",.@paper_x6,.@paper_y6; //Glitering_PaperB
 	end;
 }
 
-schg_que01,87,65,0	script	paper_sp_7_s	139,{
+schg_que01,87,65,0	script	paper_sp_7_s	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1255,14 +1256,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x7,rand(81,95);
 	set .@paper_y7,rand(59,72);
 	makeitem 6031,1,"schg_que01",.@paper_x7,.@paper_y7; //Glitering_PaperB
 	end;
 }
 
-schg_que01,102,65,0	script	paper_sp_8_s	139,{
+schg_que01,102,65,0	script	paper_sp_8_s	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1280,14 +1281,14 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x8,rand(96,110);
 	set .@paper_y8,rand(59,72);
 	makeitem 6031,1,"schg_que01",.@paper_x8,.@paper_y8; //Glitering_PaperB
 	end;
 }
 
-schg_que01,117,65,0	script	paper_sp_9_s	139,{
+schg_que01,117,65,0	script	paper_sp_9_s	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1305,7 +1306,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x9,rand(111,124);
 	set .@paper_y9,rand(59,72);
 	makeitem 6031,1,"schg_que01",.@paper_x9,.@paper_y9; //Glitering_PaperB
@@ -1329,10 +1330,10 @@ OnTouch2:
 	end;
 }
 
-schg_que01,6,6,1	script	eff_mvp#sch_gd	844,{
+schg_que01,6,6,1	script	eff_mvp#sch_gd	CLEAR_NPC,{
 	end;
 
-Onmvp:
+OnMVP:
 	initnpctimer;
 	end;
 
@@ -1368,7 +1369,7 @@ OnTimer4000:
 	end;
 }
 
-schg_que01,100,75,5	script	Gergath#sch_gd	412,{
+schg_que01,100,75,5	script	Gergath#sch_gd	4_M_OLDFRIAR,{
 	end;
 
 OnInit:
@@ -1427,7 +1428,7 @@ OnTimer50000:
 schg_que01,104,140,0	warp	back#sch_gd	1,1,schg_dun01,199,192
 
 /*
-schg_que01,104,140,1	script	treg#sch_gd	844,{
+schg_que01,104,140,1	script	treg#sch_gd	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -1451,69 +1452,70 @@ OnMyMobDead:
 }
 */
 
-schg_que01,98,105,3	script	#sch_flower_01::GD_Ev_Flower2	978,{
+schg_que01,98,105,3	script	#sch_flower_01::GD_Ev_Flower2	4_YELL_FLOWER,{
 	end;
 }
 
-schg_que01,94,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_02	977
-schg_que01,90,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_03	978
-schg_que01,86,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_04	977
-schg_que01,82,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_05	978
-schg_que01,79,103,3	duplicate(GD_Ev_Flower2)	#sch_flower_06	977
-schg_que01,79,100,3	duplicate(GD_Ev_Flower2)	#sch_flower_07	978
-schg_que01,79,97,3	duplicate(GD_Ev_Flower2)	#sch_flower_08	977
-schg_que01,79,97,3	duplicate(GD_Ev_Flower2)	#sch_flower_09	978
-schg_que01,79,94,3	duplicate(GD_Ev_Flower2)	#sch_flower_10	977
-schg_que01,79,91,3	duplicate(GD_Ev_Flower2)	#sch_flower_11	978
-schg_que01,79,88,3	duplicate(GD_Ev_Flower2)	#sch_flower_12	977
-schg_que01,79,85,3	duplicate(GD_Ev_Flower2)	#sch_flower_13	978
-schg_que01,79,82,3	duplicate(GD_Ev_Flower2)	#sch_flower_14	977
-schg_que01,79,79,3	duplicate(GD_Ev_Flower2)	#sch_flower_15	978
-schg_que01,79,76,3	duplicate(GD_Ev_Flower2)	#sch_flower_16	977
-schg_que01,79,73,3	duplicate(GD_Ev_Flower2)	#sch_flower_17	978
-schg_que01,79,70,3	duplicate(GD_Ev_Flower2)	#sch_flower_18	977
-schg_que01,79,67,3	duplicate(GD_Ev_Flower2)	#sch_flower_19	978
-schg_que01,79,64,3	duplicate(GD_Ev_Flower2)	#sch_flower_20	977
-schg_que01,79,61,3	duplicate(GD_Ev_Flower2)	#sch_flower_21	978
-schg_que01,79,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_22	977
-schg_que01,84,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_23	978
-schg_que01,89,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_24	977
-schg_que01,94,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_25	978
-schg_que01,99,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_26	977
-schg_que01,104,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_27	978
-schg_que01,109,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_28	977
-schg_que01,114,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_29	978
-schg_que01,119,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_30	977
-schg_que01,124,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_31	978
-schg_que01,129,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_32	977
-schg_que01,129,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_33	978
-schg_que01,129,103,3	duplicate(GD_Ev_Flower2)	#sch_flower_34	977
-schg_que01,129,100,3	duplicate(GD_Ev_Flower2)	#sch_flower_35	978
-schg_que01,129,97,3	duplicate(GD_Ev_Flower2)	#sch_flower_36	977
-schg_que01,129,97,3	duplicate(GD_Ev_Flower2)	#sch_flower_37	978
-schg_que01,129,94,3	duplicate(GD_Ev_Flower2)	#sch_flower_38	977
-schg_que01,129,91,3	duplicate(GD_Ev_Flower2)	#sch_flower_39	978
-schg_que01,129,88,3	duplicate(GD_Ev_Flower2)	#sch_flower_40	977
-schg_que01,129,85,3	duplicate(GD_Ev_Flower2)	#sch_flower_41	978
-schg_que01,129,82,3	duplicate(GD_Ev_Flower2)	#sch_flower_42	977
-schg_que01,129,79,3	duplicate(GD_Ev_Flower2)	#sch_flower_43	978
-schg_que01,129,76,3	duplicate(GD_Ev_Flower2)	#sch_flower_44	977
-schg_que01,129,73,3	duplicate(GD_Ev_Flower2)	#sch_flower_45	978
-schg_que01,129,70,3	duplicate(GD_Ev_Flower2)	#sch_flower_46	977
-schg_que01,129,67,3	duplicate(GD_Ev_Flower2)	#sch_flower_47	978
-schg_que01,129,64,3	duplicate(GD_Ev_Flower2)	#sch_flower_48	977
-schg_que01,129,61,3	duplicate(GD_Ev_Flower2)	#sch_flower_49	978
-schg_que01,129,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_50	977
-schg_que01,124,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_51	978
-schg_que01,119,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_52	977
-schg_que01,114,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_53	978
-schg_que01,109,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_54	977
-schg_que01,104,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_55	976
-
-/*
-schg_dun01,5,5,1	script	Event controller#sch_gd	81,{
-	input .@input; //,0,9999;
-	if (input == 1854) {
+schg_que01,94,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_02	4_RED_FLOWER
+schg_que01,90,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_03	4_YELL_FLOWER
+schg_que01,86,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_04	4_RED_FLOWER
+schg_que01,82,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_05	4_YELL_FLOWER
+schg_que01,79,103,3	duplicate(GD_Ev_Flower2)	#sch_flower_06	4_RED_FLOWER
+schg_que01,79,100,3	duplicate(GD_Ev_Flower2)	#sch_flower_07	4_YELL_FLOWER
+schg_que01,79,97,3	duplicate(GD_Ev_Flower2)	#sch_flower_08	4_RED_FLOWER
+schg_que01,79,97,3	duplicate(GD_Ev_Flower2)	#sch_flower_09	4_YELL_FLOWER
+schg_que01,79,94,3	duplicate(GD_Ev_Flower2)	#sch_flower_10	4_RED_FLOWER
+schg_que01,79,91,3	duplicate(GD_Ev_Flower2)	#sch_flower_11	4_YELL_FLOWER
+schg_que01,79,88,3	duplicate(GD_Ev_Flower2)	#sch_flower_12	4_RED_FLOWER
+schg_que01,79,85,3	duplicate(GD_Ev_Flower2)	#sch_flower_13	4_YELL_FLOWER
+schg_que01,79,82,3	duplicate(GD_Ev_Flower2)	#sch_flower_14	4_RED_FLOWER
+schg_que01,79,79,3	duplicate(GD_Ev_Flower2)	#sch_flower_15	4_YELL_FLOWER
+schg_que01,79,76,3	duplicate(GD_Ev_Flower2)	#sch_flower_16	4_RED_FLOWER
+schg_que01,79,73,3	duplicate(GD_Ev_Flower2)	#sch_flower_17	4_YELL_FLOWER
+schg_que01,79,70,3	duplicate(GD_Ev_Flower2)	#sch_flower_18	4_RED_FLOWER
+schg_que01,79,67,3	duplicate(GD_Ev_Flower2)	#sch_flower_19	4_YELL_FLOWER
+schg_que01,79,64,3	duplicate(GD_Ev_Flower2)	#sch_flower_20	4_RED_FLOWER
+schg_que01,79,61,3	duplicate(GD_Ev_Flower2)	#sch_flower_21	4_YELL_FLOWER
+schg_que01,79,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_22	4_RED_FLOWER
+schg_que01,84,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_23	4_YELL_FLOWER
+schg_que01,89,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_24	4_RED_FLOWER
+schg_que01,94,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_25	4_YELL_FLOWER
+schg_que01,99,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_26	4_RED_FLOWER
+schg_que01,104,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_27	4_YELL_FLOWER
+schg_que01,109,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_28	4_RED_FLOWER
+schg_que01,114,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_29	4_YELL_FLOWER
+schg_que01,119,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_30	4_RED_FLOWER
+schg_que01,124,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_31	4_YELL_FLOWER
+schg_que01,129,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_32	4_RED_FLOWER
+schg_que01,129,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_33	4_YELL_FLOWER
+schg_que01,129,103,3	duplicate(GD_Ev_Flower2)	#sch_flower_34	4_RED_FLOWER
+schg_que01,129,100,3	duplicate(GD_Ev_Flower2)	#sch_flower_35	4_YELL_FLOWER
+schg_que01,129,97,3	duplicate(GD_Ev_Flower2)	#sch_flower_36	4_RED_FLOWER
+schg_que01,129,97,3	duplicate(GD_Ev_Flower2)	#sch_flower_37	4_YELL_FLOWER
+schg_que01,129,94,3	duplicate(GD_Ev_Flower2)	#sch_flower_38	4_RED_FLOWER
+schg_que01,129,91,3	duplicate(GD_Ev_Flower2)	#sch_flower_39	4_YELL_FLOWER
+schg_que01,129,88,3	duplicate(GD_Ev_Flower2)	#sch_flower_40	4_RED_FLOWER
+schg_que01,129,85,3	duplicate(GD_Ev_Flower2)	#sch_flower_41	4_YELL_FLOWER
+schg_que01,129,82,3	duplicate(GD_Ev_Flower2)	#sch_flower_42	4_RED_FLOWER
+schg_que01,129,79,3	duplicate(GD_Ev_Flower2)	#sch_flower_43	4_YELL_FLOWER
+schg_que01,129,76,3	duplicate(GD_Ev_Flower2)	#sch_flower_44	4_RED_FLOWER
+schg_que01,129,73,3	duplicate(GD_Ev_Flower2)	#sch_flower_45	4_YELL_FLOWER
+schg_que01,129,70,3	duplicate(GD_Ev_Flower2)	#sch_flower_46	4_RED_FLOWER
+schg_que01,129,67,3	duplicate(GD_Ev_Flower2)	#sch_flower_47	4_YELL_FLOWER
+schg_que01,129,64,3	duplicate(GD_Ev_Flower2)	#sch_flower_48	4_RED_FLOWER
+schg_que01,129,61,3	duplicate(GD_Ev_Flower2)	#sch_flower_49	4_YELL_FLOWER
+schg_que01,129,58,3	duplicate(GD_Ev_Flower2)	#sch_flower_50	4_RED_FLOWER
+schg_que01,124,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_51	4_YELL_FLOWER
+schg_que01,119,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_52	4_RED_FLOWER
+schg_que01,114,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_53	4_YELL_FLOWER
+schg_que01,109,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_54	4_RED_FLOWER
+schg_que01,104,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_55	4_BLUE_FLOWER
+
+schg_dun01,5,5,1	script	Event controller#sch_gd	4_DOG01,{
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "Incorrect password.";
+		close;
+	} else {
 		mes "How can I help you?";
 		next;
 		switch(select("Reset.:No, thanks.")) {
@@ -1531,9 +1533,4 @@ schg_dun01,5,5,1	script	Event controller#sch_gd	81,{
 			close;
 		}
 	}
-	else {
-		mes "Incorrect password.";
-		close;
-	}
 }
-*/
diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt
index 5ceeebd44..54bf2b6d3 100644
--- a/npc/events/god_se_festival.txt
+++ b/npc/events/god_se_festival.txt
@@ -1,25 +1,26 @@
 //===== Hercules Script ======================================
 //= Valkyrie's Gift NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Post-God Item SE Creation Summoning Event 
-//= Second Sister is a cusotm translation.
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Post-God Item SE Creation Summoning Event
+//= Second Sister is a custom translation.
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
-//============================================================ 
+//= 1.1 Added GM management function. [Euphy]
+//============================================================
 
-/*
-yuno,1,1,0	script	Festival Manager#gq_fes00	891,{
+// Original name: "Festival Manager#god_se_fes00"
+yuno,1,1,0	script	Festival Manager#gq_fes0	4_F_HUGIRL,{
+	callfunc "F_GM_NPC";
 	mes "[Festival Manager]";
 	mes "I am the festival NPC manager for the God SE quest.";
 	mes "Please enter your password.";
 	next;
-	input .@input$;
-	if (.@input$ != "07godsefes") {
+	if (callfunc("F_GM_NPC","07godsefes",1) == 0) {
 		mes "[Festival Manager]";
 		mes "Password is incorrect.";
 		close;
@@ -31,20 +32,19 @@ yuno,1,1,0	script	Festival Manager#gq_fes00	891,{
 	case 1:
 		mes "[Festival Manager]";
 		mes "Ending festivals and disabling NPCs.";
-		donpcevent "Rmimi Ravies#gq_fes01::Onover";
-		donpcevent "Rmimi Ravies#gq_fes01::Onover";
+		donpcevent "Rmimi Ravies#gq_fes01::OnOver";
+		donpcevent "Rmimi Ravies#gq_fes01::OnOver";
 		close;
 	case 2:
 		mes "[Festival Manager]";
 		mes "Resetting festivals and enabling NPCs.";
-		donpcevent "Rmimi Ravies#gq_fes01::Onover";
+		donpcevent "Rmimi Ravies#gq_fes01::OnOver";
 		donpcevent "Rmimi Ravies#gq_fes01::OnEnable";
 		close;
 	}
 }
-*/
 
-yuno,118,192,5	script	Rmimi Ravies#gq_fes01	891,{
+yuno,118,192,5	script	Rmimi Ravies#gq_fes01	4_F_HUGIRL,{
 	set .@GID, getcharid(2);
 	if (countitem(7840) > 0) {
 		mes "[Rmimi Ravies]";
@@ -119,9 +119,9 @@ yuno,118,192,5	script	Rmimi Ravies#gq_fes01	891,{
 				next;
 				mes "[Rmimi Ravies]";
 				mes "Have a good time.";
-				donpcevent "Rmimi Ravies#gq_fes01::Onstart";
+				donpcevent "Rmimi Ravies#gq_fes01::OnStart";
 				
-				announce "["+ strcharinfo(0) +"] member of ["+ GetGuildName(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb";
+				announce "["+ strcharinfo(0) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb";
 				close;
 			}
 			else {
@@ -164,12 +164,12 @@ OnDisable:
 	disablenpc "Rmimi Ravies#gq_fes01";
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	set $@gqse_festival,1;
 	end;
 
-Oncall:
+OnCall:
 	if (mobcount("yuno","Rmimi Ravies#gq_fes01::OnMyMobDead") < 31) {
 		monster "yuno",0,0,"Valkyrie's Blessing",1083,100,"Rmimi Ravies#gq_fes01::OnMyMobDead";
 		monster "yuno",0,0,"Valkyrie's Gift",1951,25,"Rmimi Ravies#gq_fes01::OnMyMobDead";
@@ -195,7 +195,7 @@ Oncall:
 	}
 	end;
 
-Onover:
+OnOver:
 	killmonster "yuno","Rmimi Ravies#gq_fes01::OnMyMobDead";
 	set $@gqse_festival,0;
 	stopnpctimer;
@@ -230,7 +230,7 @@ OnTimer243000:
 
 OnTimer300000:
 	announce "The first 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer303000:
@@ -243,7 +243,7 @@ OnTimer308000:
 
 OnTimer600000:
 	announce "The second 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer603000:
@@ -256,7 +256,7 @@ OnTimer608000:
 
 OnTimer900000:
 	announce "The third 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer903000:
@@ -269,7 +269,7 @@ OnTimer908000:
 
 OnTimer1200000:
 	announce "The fourth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer1203000:
@@ -282,7 +282,7 @@ OnTimer1208000:
 
 OnTimer1500000:
 	announce "The fifth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer1503000:
@@ -295,7 +295,7 @@ OnTimer1508000:
 
 OnTimer1800000:
 	announce "The sixth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer1803000:
@@ -308,7 +308,7 @@ OnTimer1808000:
 
 OnTimer2100000:
 	announce "The seventh 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer2103000:
@@ -321,7 +321,7 @@ OnTimer2108000:
 
 OnTimer2400000:
 	announce "The eighth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer2403000:
@@ -334,7 +334,7 @@ OnTimer2408000:
 
 OnTimer2700000:
 	announce "The ninth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer2703000:
@@ -347,7 +347,7 @@ OnTimer2708000:
 
 OnTimer3000000:
 	announce "The first0 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer3003000:
@@ -360,7 +360,7 @@ OnTimer3008000:
 
 OnTimer3300000:
 	announce "The eleventh 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer3303000:
@@ -373,7 +373,7 @@ OnTimer3308000:
 
 OnTimer3600000:
 	announce "The twelfth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+	donpcevent "Rmimi Ravies#gq_fes01::OnCall";
 	end;
 
 OnTimer3603000:
@@ -386,23 +386,19 @@ OnTimer3608000:
 
 OnTimer3900000:
 	announce "The entire ceremony is over now, I am sure all of you had fun.",bc_all,"0x70dbdb";
-	donpcevent "Rmimi Ravies#gq_fes01::Onover";
+	donpcevent "Rmimi Ravies#gq_fes01::OnOver";
 	end;
 }
 
-//===============================================================================================
-//                                             Rachel                                              
-//===============================================================================================
 
-//-------------------------------------Rachel Festival Manager-----------------------------------
-/*
-rachel,1,1,0	script	Festival Manager#god_se_fes02	891,{
+// Original name: "Festival Manager#god_se_fes02"
+rachel,1,1,0	script	Festival Manager#gq_fes2	4_F_HUGIRL,{
+	callfunc "F_GM_NPC";
 	mes "[Festival Manager]";
 	mes "I am the festival NPC manager for the God SE quest.";
 	mes "Please enter your password.";
 	next;
-	input .@input$;
-	if (.@input$ != "07godsefes") {
+	if (callfunc("F_GM_NPC","07godsefes",1) == 0) {
 		mes "[Festival Manager]";
 		mes "Password is incorrect.";
 		close;
@@ -414,21 +410,19 @@ rachel,1,1,0	script	Festival Manager#god_se_fes02	891,{
 	case 1:
 		mes "[Festival Manager]";
 		mes "Ending festivals and disabling NPCs.";
-		donpcevent "Rhehe Ravies#gq_fes03::Onover";
-		donpcevent "Rhehe Ravies#gq_fes03::Ondisable";
+		donpcevent "Rhehe Ravies#gq_fes03::OnOver";
+		donpcevent "Rhehe Ravies#gq_fes03::OnDisable";
 		close;
 	case 2:
 		mes "[Festival Manager]";
 		mes "Resetting festivals and enabling NPCs.";
-		donpcevent "Rhehe Ravies#gq_fes03::Onover";
+		donpcevent "Rhehe Ravies#gq_fes03::OnOver";
 		donpcevent "Rhehe Ravies#gq_fes03::OnEnable";
 		close;
 	}
 }
-*/
-//----------------------------------------Rhehe Ravies----------------------------------------
 
-rachel,132,117,3	script	Rhehe Ravies#gq_fes03	891,{
+rachel,132,117,3	script	Rhehe Ravies#gq_fes03	4_F_HUGIRL,{
 	set .@GID, getcharid(2);
 	if (countitem(7840) > 0) {
 		mes "[Rhehe Ravies]";
@@ -507,8 +501,8 @@ rachel,132,117,3	script	Rhehe Ravies#gq_fes03	891,{
 				next;
 				mes "[Rhehe Ravies]";
 				mes "I hope you enjoy yourself!";
-				donpcevent "Rhehe Ravies#gq_fes03::Onstart";
-				announce "["+ strcharinfo(0) +"] member of ["+ GetGuildName(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb";
+				donpcevent "Rhehe Ravies#gq_fes03::OnStart";
+				announce "["+ strcharinfo(0) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb";
 				close;
 			}
 			else {
@@ -552,12 +546,12 @@ OnDisable:
 	disablenpc "Rhehe Ravies#gq_fes03";
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	set $@gqse_festival,1;
 	end;
 
-Oncall:
+OnCall:
 	if (mobcount("rachel","Rhehe Ravies#gq_fes03::OnMyMobDead") < 31) {
 		monster "rachel",0,0,"Valkyrie's Blessing",1083,100,"Rhehe Ravies#gq_fes03::OnMyMobDead";
 		monster "rachel",0,0,"Valkyrie's Gift",1951,25,"Rhehe Ravies#gq_fes03::OnMyMobDead";
@@ -583,7 +577,7 @@ Oncall:
 	}
 	end;
 
-Onover:
+OnOver:
 	killmonster "rachel","Rhehe Ravies#gq_fes03::OnMyMobDead";
 	set $@gqse_festival,0;
 	stopnpctimer;
@@ -618,7 +612,7 @@ OnTimer243000:
 
 OnTimer300000:
 	announce "The first 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer303000:
@@ -631,7 +625,7 @@ OnTimer308000:
 
 OnTimer600000:
 	announce "The second 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer603000:
@@ -644,7 +638,7 @@ OnTimer608000:
 
 OnTimer900000:
 	announce "The third 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer903000:
@@ -657,7 +651,7 @@ OnTimer908000:
 
 OnTimer1200000:
 	announce "The fourth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer1203000:
@@ -670,7 +664,7 @@ OnTimer1208000:
 
 OnTimer1500000:
 	announce "The fifth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer1503000:
@@ -683,7 +677,7 @@ OnTimer1508000:
 
 OnTimer1800000:
 	announce "The sixth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer1803000:
@@ -696,7 +690,7 @@ OnTimer1808000:
 
 OnTimer2100000:
 	announce "The seventh 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer2103000:
@@ -709,7 +703,7 @@ OnTimer2108000:
 
 OnTimer2400000:
 	announce "The eighth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer2403000:
@@ -722,7 +716,7 @@ OnTimer2408000:
 
 OnTimer2700000:
 	announce "The ninth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer2703000:
@@ -735,7 +729,7 @@ OnTimer2708000:
 
 OnTimer3000000:
 	announce "The tenth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer3003000:
@@ -748,7 +742,7 @@ OnTimer3008000:
 
 OnTimer3300000:
 	announce "The eleventh 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer3303000:
@@ -761,7 +755,7 @@ OnTimer3308000:
 
 OnTimer3600000:
 	announce "The twelfth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+	donpcevent "Rhehe Ravies#gq_fes03::OnCall";
 	end;
 
 OnTimer3603000:
@@ -774,6 +768,6 @@ OnTimer3608000:
 
 OnTimer3900000:
 	announce "The entire ceremony is over now, I am sure all of you had fun.",bc_all,"0x70dbdb";
-	donpcevent "Rhehe Ravies#gq_fes03::Onover";
+	donpcevent "Rhehe Ravies#gq_fes03::OnOver";
 	end;
 }
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index b8664de2e..06c101529 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Event 1: Redeem "Pumpkin Mojo" for pumpkin headgear.
 //= Event 2: Create "Pumpkin Pie" item.
 //===== Additional Comments: =================================
@@ -20,7 +20,7 @@
 
 // Pumpkin Mojo quest (Event 1)
 //============================================================
-prontera,162,69,5	script	Gloomy Jack#06_hw	1130,2,2,{
+prontera,162,69,5	script	Gloomy Jack#06_hw	JAKK,2,2,{
 	end;
 
 OnTouch:
@@ -39,9 +39,8 @@ OnEffect2:
 	end;
 }
 
-prontera,164,69,3	script	Cool Devi#06_hw	738,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
+prontera,164,69,3	script	Cool Devi#06_hw	4_DEVIRUCHI,{
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -236,9 +235,8 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 }
 
 
-geffen,145,132,3	script	Hoirin#06_hw	729,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
+geffen,145,132,3	script	Hoirin#06_hw	4_F_NOVICE,{
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -382,7 +380,7 @@ geffen,145,132,3	script	Hoirin#06_hw	729,{
 	}
 }
 
-nif_in,18,34,5	script	Loli Ruri#06_hw	1505,2,2,{
+nif_in,18,34,5	script	Loli Ruri#06_hw	LOLI_RURI,2,2,{
 	end;
 
 OnTouch:
@@ -392,9 +390,8 @@ OnTouch:
 	close;
 }
 
-nif_in,19,32,3	script	Deviruchi#06_hw	738,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
+nif_in,19,32,3	script	Deviruchi#06_hw	4_DEVIRUCHI,{
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -485,9 +482,8 @@ nif_in,19,32,3	script	Deviruchi#06_hw	738,{
 
 // Creation of Pumpkin Pie (Event 2)
 //============================================================
-nif_fild01,165,115,3	script	Chicken Masta#06_hw	794,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
+nif_fild01,165,115,3	script	Chicken Masta#06_hw	4_M_NFDEADMAN2,{
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -521,7 +517,7 @@ nif_fild01,165,115,3	script	Chicken Masta#06_hw	794,{
 					mes "[Chicken Masta]";
 					mes "Thanks.";
 					mes "Here are the eggs.";
-					set Zeny,Zeny-2000;
+					Zeny -= 2000;
 					set halloween, 102;
 					getitem 574,2; //Egg
 					close;
@@ -537,7 +533,7 @@ nif_fild01,165,115,3	script	Chicken Masta#06_hw	794,{
 					mes "[Chicken Masta]";
 					mes "Thanks.";
 					mes "Here are the eggs.";
-					set Zeny,Zeny-1000;
+					Zeny -= 1000;
 					set halloween, 102;
 					getitem 574,1; //Egg
 					close;
@@ -628,7 +624,7 @@ nif_fild01,165,115,3	script	Chicken Masta#06_hw	794,{
 		mes "Here you are.";
 		mes "But no more.";
 		mes "If you want more eggs, find me more chickens.";
-		set Zeny,Zeny-@hw_egg;
+		Zeny -= @hw_egg;
 		getitem 574, @input;//Egg
 		set halloween, 102;
 		close;
@@ -645,7 +641,7 @@ nif_fild01,165,115,3	script	Chicken Masta#06_hw	794,{
 	}
 }
 
-nif_fild01,167,113,3	script	Masta's chicken#06_hw01	800,{
+nif_fild01,167,113,3	script	Masta's chicken#06_hw01	4_NFCOCK,{
 	mes "Drowsing chicken.";
 	close;
 }
@@ -719,14 +715,14 @@ OnInit:
 }
 
 
-nif_fild01,270,145,3	duplicate(HwChicken)	Masta's chicken#06_hw02	800
-nif_fild01,219,267,4	duplicate(HwChicken)	Masta's chicken#06_hw03	800
-nif_fild01,199,240,5	duplicate(HwChicken)	Masta's chicken#06_hw04	800
-nif_fild01,316,97,6	duplicate(HwChicken)	Masta's chicken#06_hw05	800
-nif_fild01,147,343,7	duplicate(HwChicken)	Masta's chicken#06_hw06	800
-nif_fild01,185,325,8	duplicate(HwChicken)	Masta's chicken#06_hw07	800
-nif_fild01,133,105,1	duplicate(HwChicken)	Masta's chicken#06_hw08	800
-nif_fild01,331,329,2	duplicate(HwChicken)	Masta's chicken#06_hw09	800
+nif_fild01,270,145,3	duplicate(HwChicken)	Masta's chicken#06_hw02	4_NFCOCK
+nif_fild01,219,267,4	duplicate(HwChicken)	Masta's chicken#06_hw03	4_NFCOCK
+nif_fild01,199,240,5	duplicate(HwChicken)	Masta's chicken#06_hw04	4_NFCOCK
+nif_fild01,316,97,6	duplicate(HwChicken)	Masta's chicken#06_hw05	4_NFCOCK
+nif_fild01,147,343,7	duplicate(HwChicken)	Masta's chicken#06_hw06	4_NFCOCK
+nif_fild01,185,325,8	duplicate(HwChicken)	Masta's chicken#06_hw07	4_NFCOCK
+nif_fild01,133,105,1	duplicate(HwChicken)	Masta's chicken#06_hw08	4_NFCOCK
+nif_fild01,331,329,2	duplicate(HwChicken)	Masta's chicken#06_hw09	4_NFCOCK
 
 pay_dun03,1,1,0	script	#06_hw_timer01	-1,{
 OnInit:
@@ -866,47 +862,47 @@ OnTimer4200000:
 }
 
 
-pay_dun03,151,138,3	duplicate(HwChicken3)	Chicken#06_hw_p01	800
-pay_dun03,151,138,3	duplicate(HwChicken2)	Chicken#06_hw_p02	800
-pay_dun03,152,138,3	duplicate(HwChicken2)	Chicken#06_hw_p03	800
-pay_dun03,154,138,3	duplicate(HwChicken2)	Chicken#06_hw_p04	800
-pay_dun03,155,138,3	duplicate(HwChicken2)	Chicken#06_hw_p05	800
-pay_dun03,157,138,3	duplicate(HwChicken2)	Chicken#06_hw_p06	800
-pay_dun03,158,138,3	duplicate(HwChicken3)	Chicken#06_hw_p07	800
-pay_dun03,150,137,3	duplicate(HwChicken2)	Chicken#06_hw_p08	800
-pay_dun03,153,137,3	duplicate(HwChicken2)	Chicken#06_hw_p09	800
-pay_dun03,156,137,3	duplicate(HwChicken3)	Chicken#06_hw_p10	800
-pay_dun03,159,137,3	duplicate(HwChicken2)	Chicken#06_hw_p11	800
-pay_dun03,149,136,3	duplicate(HwChicken2)	Chicken#06_hw_p12	800
-pay_dun03,152,136,3	duplicate(HwChicken3)	Chicken#06_hw_p13	800
-pay_dun03,157,136,3	duplicate(HwChicken2)	Chicken#06_hw_p14	800
-pay_dun03,160,136,3	duplicate(HwChicken2)	Chicken#06_hw_p15	800
-pay_dun03,149,135,3	duplicate(HwChicken3)	Chicken#06_hw_p16	800
-pay_dun03,151,135,3	duplicate(HwChicken2)	Chicken#06_hw_p17	800
-pay_dun03,152,135,3	duplicate(HwChicken2)	Chicken#06_hw_p18	800
-pay_dun03,153,135,3	duplicate(HwChicken3)	Chicken#06_hw_p19	800
-pay_dun03,156,135,3	duplicate(HwChicken2)	Chicken#06_hw_p20	800
-pay_dun03,157,135,3	duplicate(HwChicken2)	Chicken#06_hw_p21	800
-pay_dun03,158,135,3	duplicate(HwChicken3)	Chicken#06_hw_p22	800
-pay_dun03,160,135,3	duplicate(HwChicken2)	Chicken#06_hw_p23	800
-pay_dun03,149,134,3	duplicate(HwChicken2)	Chicken#06_hw_p24	800
-pay_dun03,152,134,3	duplicate(HwChicken3)	Chicken#06_hw_p25	800
-pay_dun03,157,134,3	duplicate(HwChicken2)	Chicken#06_hw_p26	800
-pay_dun03,160,134,3	duplicate(HwChicken2)	Chicken#06_hw_p27	800
-pay_dun03,149,133,3	duplicate(HwChicken3)	Chicken#06_hw_p28	800
-pay_dun03,160,133,3	duplicate(HwChicken2)	Chicken#06_hw_p29	800
-pay_dun03,150,132,3	duplicate(HwChicken2)	Chicken#06_hw_p30	800
-pay_dun03,153,132,3	duplicate(HwChicken3)	Chicken#06_hw_p31	800
-pay_dun03,156,132,3	duplicate(HwChicken2)	Chicken#06_hw_p32	800
-pay_dun03,159,132,3	duplicate(HwChicken2)	Chicken#06_hw_p33	800
-pay_dun03,151,131,3	duplicate(HwChicken2)	Chicken#06_hw_p34	800
-pay_dun03,152,131,3	duplicate(HwChicken2)	Chicken#06_hw_p35	800
-pay_dun03,153,131,3	duplicate(HwChicken3)	Chicken#06_hw_p36	800
-pay_dun03,154,131,3	duplicate(HwChicken2)	Chicken#06_hw_p37	800
-pay_dun03,155,131,3	duplicate(HwChicken2)	Chicken#06_hw_p38	800
-pay_dun03,156,131,3	duplicate(HwChicken3)	Chicken#06_hw_p39	800
-pay_dun03,157,131,3	duplicate(HwChicken2)	Chicken#06_hw_p40	800
-pay_dun03,158,131,3	duplicate(HwChicken3)	Chicken#06_hw_p41	800
+pay_dun03,151,138,3	duplicate(HwChicken3)	Chicken#06_hw_p01	4_NFCOCK
+pay_dun03,151,138,3	duplicate(HwChicken2)	Chicken#06_hw_p02	4_NFCOCK
+pay_dun03,152,138,3	duplicate(HwChicken2)	Chicken#06_hw_p03	4_NFCOCK
+pay_dun03,154,138,3	duplicate(HwChicken2)	Chicken#06_hw_p04	4_NFCOCK
+pay_dun03,155,138,3	duplicate(HwChicken2)	Chicken#06_hw_p05	4_NFCOCK
+pay_dun03,157,138,3	duplicate(HwChicken2)	Chicken#06_hw_p06	4_NFCOCK
+pay_dun03,158,138,3	duplicate(HwChicken3)	Chicken#06_hw_p07	4_NFCOCK
+pay_dun03,150,137,3	duplicate(HwChicken2)	Chicken#06_hw_p08	4_NFCOCK
+pay_dun03,153,137,3	duplicate(HwChicken2)	Chicken#06_hw_p09	4_NFCOCK
+pay_dun03,156,137,3	duplicate(HwChicken3)	Chicken#06_hw_p10	4_NFCOCK
+pay_dun03,159,137,3	duplicate(HwChicken2)	Chicken#06_hw_p11	4_NFCOCK
+pay_dun03,149,136,3	duplicate(HwChicken2)	Chicken#06_hw_p12	4_NFCOCK
+pay_dun03,152,136,3	duplicate(HwChicken3)	Chicken#06_hw_p13	4_NFCOCK
+pay_dun03,157,136,3	duplicate(HwChicken2)	Chicken#06_hw_p14	4_NFCOCK
+pay_dun03,160,136,3	duplicate(HwChicken2)	Chicken#06_hw_p15	4_NFCOCK
+pay_dun03,149,135,3	duplicate(HwChicken3)	Chicken#06_hw_p16	4_NFCOCK
+pay_dun03,151,135,3	duplicate(HwChicken2)	Chicken#06_hw_p17	4_NFCOCK
+pay_dun03,152,135,3	duplicate(HwChicken2)	Chicken#06_hw_p18	4_NFCOCK
+pay_dun03,153,135,3	duplicate(HwChicken3)	Chicken#06_hw_p19	4_NFCOCK
+pay_dun03,156,135,3	duplicate(HwChicken2)	Chicken#06_hw_p20	4_NFCOCK
+pay_dun03,157,135,3	duplicate(HwChicken2)	Chicken#06_hw_p21	4_NFCOCK
+pay_dun03,158,135,3	duplicate(HwChicken3)	Chicken#06_hw_p22	4_NFCOCK
+pay_dun03,160,135,3	duplicate(HwChicken2)	Chicken#06_hw_p23	4_NFCOCK
+pay_dun03,149,134,3	duplicate(HwChicken2)	Chicken#06_hw_p24	4_NFCOCK
+pay_dun03,152,134,3	duplicate(HwChicken3)	Chicken#06_hw_p25	4_NFCOCK
+pay_dun03,157,134,3	duplicate(HwChicken2)	Chicken#06_hw_p26	4_NFCOCK
+pay_dun03,160,134,3	duplicate(HwChicken2)	Chicken#06_hw_p27	4_NFCOCK
+pay_dun03,149,133,3	duplicate(HwChicken3)	Chicken#06_hw_p28	4_NFCOCK
+pay_dun03,160,133,3	duplicate(HwChicken2)	Chicken#06_hw_p29	4_NFCOCK
+pay_dun03,150,132,3	duplicate(HwChicken2)	Chicken#06_hw_p30	4_NFCOCK
+pay_dun03,153,132,3	duplicate(HwChicken3)	Chicken#06_hw_p31	4_NFCOCK
+pay_dun03,156,132,3	duplicate(HwChicken2)	Chicken#06_hw_p32	4_NFCOCK
+pay_dun03,159,132,3	duplicate(HwChicken2)	Chicken#06_hw_p33	4_NFCOCK
+pay_dun03,151,131,3	duplicate(HwChicken2)	Chicken#06_hw_p34	4_NFCOCK
+pay_dun03,152,131,3	duplicate(HwChicken2)	Chicken#06_hw_p35	4_NFCOCK
+pay_dun03,153,131,3	duplicate(HwChicken3)	Chicken#06_hw_p36	4_NFCOCK
+pay_dun03,154,131,3	duplicate(HwChicken2)	Chicken#06_hw_p37	4_NFCOCK
+pay_dun03,155,131,3	duplicate(HwChicken2)	Chicken#06_hw_p38	4_NFCOCK
+pay_dun03,156,131,3	duplicate(HwChicken3)	Chicken#06_hw_p39	4_NFCOCK
+pay_dun03,157,131,3	duplicate(HwChicken2)	Chicken#06_hw_p40	4_NFCOCK
+pay_dun03,158,131,3	duplicate(HwChicken3)	Chicken#06_hw_p41	4_NFCOCK
 
 // Payon Field chickens
 //============================================================
@@ -1005,35 +1001,35 @@ OnTimer6000000:
 	end;
 }
 
-pay_fild08,147,353,3	duplicate(HwChicken3)	Chicken#06_hw_pf01	800
-pay_fild08,147,354,3	duplicate(HwChicken2)	Chicken#06_hw_pf02	800
-pay_fild08,147,355,3	duplicate(HwChicken2)	Chicken#06_hw_pf03	800
-pay_fild08,148,352,3	duplicate(HwChicken3)	Chicken#06_hw_pf04	800
-pay_fild08,148,356,3	duplicate(HwChicken2)	Chicken#06_hw_pf05	800
-pay_fild08,149,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf06	800
-pay_fild08,149,354,3	duplicate(HwChicken3)	Chicken#06_hw_pf07	800
-pay_fild08,149,357,3	duplicate(HwChicken2)	Chicken#06_hw_pf08	800
-pay_fild08,150,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf09	800
-pay_fild08,150,357,3	duplicate(HwChicken3)	Chicken#06_hw_pf10	800
-pay_fild08,151,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf11	800
-pay_fild08,151,353,3	duplicate(HwChicken2)	Chicken#06_hw_pf12	800
-pay_fild08,151,355,3	duplicate(HwChicken3)	Chicken#06_hw_pf13	800
-pay_fild08,151,357,3	duplicate(HwChicken2)	Chicken#06_hw_pf14	800
-pay_fild08,152,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf15	800
-pay_fild08,152,357,3	duplicate(HwChicken3)	Chicken#06_hw_pf16	800
-pay_fild08,153,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf17	800
-pay_fild08,153,357,3	duplicate(HwChicken2)	Chicken#06_hw_pf18	800
-pay_fild08,154,351,3	duplicate(HwChicken3)	Chicken#06_hw_pf19	800
-pay_fild08,154,353,3	duplicate(HwChicken2)	Chicken#06_hw_pf20	800
-pay_fild08,154,355,3	duplicate(HwChicken2)	Chicken#06_hw_pf21	800
-pay_fild08,154,357,3	duplicate(HwChicken3)	Chicken#06_hw_pf22	800
-pay_fild08,155,350,3	duplicate(HwChicken2)	Chicken#06_hw_pf23	800
-pay_fild08,155,352,3	duplicate(HwChicken2)	Chicken#06_hw_pf24	800
-pay_fild08,155,354,3	duplicate(HwChicken3)	Chicken#06_hw_pf25	800
-pay_fild08,155,356,3	duplicate(HwChicken2)	Chicken#06_hw_pf26	800
-pay_fild08,155,358,3	duplicate(HwChicken3)	Chicken#06_hw_pf27	800
-
-prontera,155,285,3	script	Familiar#06_hw01::HWFamiDup	799,{
+pay_fild08,147,353,3	duplicate(HwChicken3)	Chicken#06_hw_pf01	4_NFCOCK
+pay_fild08,147,354,3	duplicate(HwChicken2)	Chicken#06_hw_pf02	4_NFCOCK
+pay_fild08,147,355,3	duplicate(HwChicken2)	Chicken#06_hw_pf03	4_NFCOCK
+pay_fild08,148,352,3	duplicate(HwChicken3)	Chicken#06_hw_pf04	4_NFCOCK
+pay_fild08,148,356,3	duplicate(HwChicken2)	Chicken#06_hw_pf05	4_NFCOCK
+pay_fild08,149,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf06	4_NFCOCK
+pay_fild08,149,354,3	duplicate(HwChicken3)	Chicken#06_hw_pf07	4_NFCOCK
+pay_fild08,149,357,3	duplicate(HwChicken2)	Chicken#06_hw_pf08	4_NFCOCK
+pay_fild08,150,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf09	4_NFCOCK
+pay_fild08,150,357,3	duplicate(HwChicken3)	Chicken#06_hw_pf10	4_NFCOCK
+pay_fild08,151,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf11	4_NFCOCK
+pay_fild08,151,353,3	duplicate(HwChicken2)	Chicken#06_hw_pf12	4_NFCOCK
+pay_fild08,151,355,3	duplicate(HwChicken3)	Chicken#06_hw_pf13	4_NFCOCK
+pay_fild08,151,357,3	duplicate(HwChicken2)	Chicken#06_hw_pf14	4_NFCOCK
+pay_fild08,152,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf15	4_NFCOCK
+pay_fild08,152,357,3	duplicate(HwChicken3)	Chicken#06_hw_pf16	4_NFCOCK
+pay_fild08,153,351,3	duplicate(HwChicken2)	Chicken#06_hw_pf17	4_NFCOCK
+pay_fild08,153,357,3	duplicate(HwChicken2)	Chicken#06_hw_pf18	4_NFCOCK
+pay_fild08,154,351,3	duplicate(HwChicken3)	Chicken#06_hw_pf19	4_NFCOCK
+pay_fild08,154,353,3	duplicate(HwChicken2)	Chicken#06_hw_pf20	4_NFCOCK
+pay_fild08,154,355,3	duplicate(HwChicken2)	Chicken#06_hw_pf21	4_NFCOCK
+pay_fild08,154,357,3	duplicate(HwChicken3)	Chicken#06_hw_pf22	4_NFCOCK
+pay_fild08,155,350,3	duplicate(HwChicken2)	Chicken#06_hw_pf23	4_NFCOCK
+pay_fild08,155,352,3	duplicate(HwChicken2)	Chicken#06_hw_pf24	4_NFCOCK
+pay_fild08,155,354,3	duplicate(HwChicken3)	Chicken#06_hw_pf25	4_NFCOCK
+pay_fild08,155,356,3	duplicate(HwChicken2)	Chicken#06_hw_pf26	4_NFCOCK
+pay_fild08,155,358,3	duplicate(HwChicken3)	Chicken#06_hw_pf27	4_NFCOCK
+
+prontera,155,285,3	script	Familiar#06_hw01::HWFamiDup	4_NFBAT,{
 	mes "[Familiar]";
 	mes "Hello.";
 	mes "I'm Loli Ruri's faithful and cute Familiar.";
@@ -1076,10 +1072,10 @@ prontera,155,285,3	script	Familiar#06_hw01::HWFamiDup	799,{
 	mes "He likes it.";
 	close;
 }
-payon,156,231,3	duplicate(HWFamiDup)	Familiar#06_hw02	799
-morocc,159,143,3	duplicate(HWFamiDup)	Familiar#06_hw03	799
-geffen,120,188,3	duplicate(HWFamiDup)	Familiar#06_hw04	799
-alberta,80,171,3	duplicate(HWFamiDup)	Familiar#06_hw05	799
+payon,156,231,3	duplicate(HWFamiDup)	Familiar#06_hw02	4_NFBAT
+morocc,159,143,3	duplicate(HWFamiDup)	Familiar#06_hw03	4_NFBAT
+geffen,120,188,3	duplicate(HWFamiDup)	Familiar#06_hw04	4_NFBAT
+alberta,80,171,3	duplicate(HWFamiDup)	Familiar#06_hw05	4_NFBAT
 
 // Event Lude Monster Spawns
 //============================================================
diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt
index 78407465f..6aad72358 100644
--- a/npc/events/halloween_2008.txt
+++ b/npc/events/halloween_2008.txt
@@ -15,9 +15,8 @@
 //= 1.1 Some small changes. [Kisuka]
 //============================================================
 
-payon,162,176,4	script	Halloween Magician#iRO08	704,{
-	
-	if(Hallow08 < 1) {
+payon,162,176,4	script	Halloween Magician#iRO08	4_M_BIBI,{
+	if (Hallow08 < 1) {
 		mes "[Halloween Magician]";
 		mes "Kkkkkkkkk!";
 		mes "I have a special event this Halloween that tests your luck and agility.";
@@ -30,7 +29,6 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 		next;
 		goto MainMenu;
 	}
-
 	if (Hallow08Kill == 1) {
 		mes "[Halloween Magician]";
 		mes "You a 'fraidy cat or something?!";
@@ -43,7 +41,6 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 		}
 		goto Participate;
 	}
-
 	if (Hallow08Kill == 2) {
 		mes "[Halloween Magician]";
 		mes "Oh, well done! You are alright!";
@@ -59,14 +56,13 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 		mes "You can get Halloween tickets for cool items.";
 		close;
 	}
-
-	if(Hallow08 > 0) {
+	if (Hallow08 > 0) {
 		mes "[Halloween Magician]";
 		mes "Well, do you want to hear the rules again or, just get back to it...";
 		next;
 		goto MainMenu2;
 	}
-	
+
 		Rules:
 			mes "[Halloween Magician]";
 			mes "This village is like a virtual Payon.";
@@ -96,10 +92,10 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 				mes "Hey...";
 				mes "Come back once you're ready.";
 				close;
-			}else{
+			} else {
 				goto MainMenu;
 			}
-			
+
 		Participate:
 			mes "[Halloween Magician]";
 			mes "Ok, you are ready.";
@@ -114,7 +110,7 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 				mes "You think I wouldn't notice that your weight is above '0'?";
 				mes "You're overweight...";
 				close;
-			}else{
+			} else {
 				mes "[Halloween Magician]";
 				mes "You seem good to go, and your weight is just right.";
 				next;
@@ -138,7 +134,7 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 				warp "evt_zombie",155,246;
 				end;
 			}
-			
+
 		TicketExchange:
 			mes "[Halloween Magician]";
 			mes "You want to exchange tickets for prizes?";
@@ -158,52 +154,52 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 			mes "What would you like to exchange for?";
 			next;
 			switch(select("Pumpkin Pie:Pumpkin-Head:Old Blue Box:Old Purple Box:Old Card Album")) {
-				case 1:
-					if(countitem(7941) < 5) {
-						goto NotEnough;
-					}else{
-						delitem 7941,5;
-						getitem 12192,1;
-						goto Enough;
-					}
-					break;
-				case 2:
-					if(countitem(7941) < 20) {
-						goto NotEnough;
-					}else{
-						delitem 7941,20;
-						getitem 5134,1;
-						goto Enough;
-					}
-					break;
-				case 3:
-					if(countitem(7941) < 50) {
-						goto NotEnough;
-					}else{
-						delitem 7941,50;
-						getitem 603,1;
-						goto Enough;
-					}
-					break;
-				case 4:
-					if(countitem(7941) < 70) {
-						goto NotEnough;
-					}else{
-						delitem 7941,70;
-						getitem 617,1;
-						goto Enough;
-					}
-					break;
-				case 5:
-					if(countitem(7941) < 200) {
-						goto NotEnough;
-					}else{
-						delitem 7941,200;
-						getitem 616,1;
-						goto Enough;
-					}
+			case 1:
+				if (countitem(7941) < 5) {
+					goto NotEnough;
+				} else {
+					delitem 7941,5;
+					getitem 12192,1;
+					goto Enough;
+				}
+				break;
+			case 2:
+				if (countitem(7941) < 20) {
+					goto NotEnough;
+				} else {
+					delitem 7941,20;
+					getitem 5134,1;
+					goto Enough;
+				}
+				break;
+			case 3:
+				if (countitem(7941) < 50) {
+					goto NotEnough;
+				} else {
+					delitem 7941,50;
+					getitem 603,1;
+					goto Enough;
+				}
+				break;
+			case 4:
+				if (countitem(7941) < 70) {
+					goto NotEnough;
+				} else {
+					delitem 7941,70;
+					getitem 617,1;
+					goto Enough;
+				}
+				break;
+			case 5:
+				if (countitem(7941) < 200) {
+					goto NotEnough;
+				} else {
+					delitem 7941,200;
+					getitem 616,1;
+					goto Enough;
+				}
 			}
-					
+
 		NextTime:
 			mes "[Halloween Magician]";
 			mes "Ok, see you then.";
@@ -231,36 +227,36 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 		next;
 		if (Hallow08 == 1) {
 			goto MainMenu2;
-		}else{
+		} else {
 			goto MainMenu;
 		}
 }
 
-evt_zombie,16,142,1	script	zombiewarp001	45,2,2,{
+evt_zombie,16,142,1	script	zombiewarp001	WARPNPC,2,2,{
 OnTouch:
 	if (@Hallow08Warp == 1) {
 		set Hallow08Kill,2;
-		specialeffect 16;
+		specialeffect EF_BASH;
 		warp "payon",28,142;
 	}
 	end;
 }
 
-evt_zombie,122,27,1	script	zombiewarp002	45,2,2,{
+evt_zombie,122,27,1	script	zombiewarp002	WARPNPC,2,2,{
 OnTouch:
 	if (@Hallow08Warp == 2) {
 		set Hallow08Kill,2;
-		specialeffect 16;
+		specialeffect EF_BASH;
 		warp "payon",121,40;
 	}
 	end;
 }
 
-evt_zombie,267,89,1	script	zombiewarp003	45,2,2,{
+evt_zombie,267,89,1	script	zombiewarp003	WARPNPC,2,2,{
 OnTouch:
 	if (@Hallow08Warp == 3) {
 		set Hallow08Kill,2;
-		specialeffect 16;
+		specialeffect EF_BASH;
 		warp "payon",253,95;
 	}
 	end;
diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt
index a5faf713e..95b3e2a11 100644
--- a/npc/events/halloween_2009.txt
+++ b/npc/events/halloween_2009.txt
@@ -20,7 +20,7 @@
 
 // Headgear Quest - Pumpkin Hat
 //============================================================
-prontera,152,192,5	script	Pumpkin Hat Researcher	712,{
+prontera,152,192,5	script	Pumpkin Hat Researcher	4_M_05,{
 	if(BaseLevel < 45) {
 		mes "[Pumpkin Hat Researcher]";
 		mes "Shoo, I don't need a child. Shoo! I don't talk to novices.";
@@ -94,7 +94,7 @@ prontera,152,192,5	script	Pumpkin Hat Researcher	712,{
 
 // Buffs - Trick or Treaters
 //============================================================
--	script	Trick or Treater::09Treats	706,2,2,{
+-	script	Trick or Treater::09Treats	4_M_KID1,2,2,{
 OnTouch:
 	hideoffnpc strnpcinfo(3);
 	initnpctimer;
@@ -106,7 +106,7 @@ OnTouch:
 		mes "[Trick or Treater]";
 		mes "!!!!";
 		mes "Fine. I have no choice but to trick you back!";
-		sc_start SC_Stun,5000,0;
+		sc_start SC_STUN,5000,0;
 		close;
 	}
 	mes "[Trick or Treater]";
@@ -131,7 +131,7 @@ OnTouch:
 				mes "[Trick or Treater]";
 				mes "At least a Candy, a Candy Cane or a Well-baked Cookie is all I ask for a treat.";
 				mes "Fine. I have no choice but to trick you!";
-				sc_start SC_Stun,5000,0;
+				sc_start SC_STUN,5000,0;
 				close;
 			}
 		case 2:
@@ -152,7 +152,7 @@ OnTouch:
 				mes "[Trick or Treater]";
 				mes "At least a Candy, a Candy Cane or a Well-baked Cookie is all I ask for a treat.";
 				mes "Fine. I have no choice but to trick you!";
-				sc_start SC_Stun,5000,0;
+				sc_start SC_STUN,5000,0;
 				close;
 			}
 		case 3:
@@ -173,14 +173,14 @@ OnTouch:
 				mes "[Trick or Treater]";
 				mes "At least a Candy, a Candy Cane or a Well-baked Cookie is all I ask for a treat.";
 				mes "Fine. I have no choice but to trick you!";
-				sc_start SC_Stun,5000,0;
+				sc_start SC_STUN,5000,0;
 				close;
 			}
 		case 4:
 			mes "[Trick or Treater]";
 			mes "At least a Candy, a Candy Cane or a Well-baked Cookie is all I ask for a treat.";
 			mes "Fine. I have no choice but to trick you!";
-			sc_start SC_Stun,5000,0;
+			sc_start SC_STUN,5000,0;
 			close;
 	}
 OnInit:
@@ -209,18 +209,18 @@ OnTimer300000:
 	stopnpctimer;
 	end;
 }
-prontera,151,173,5	duplicate(09Treats)	Trick or Treater#iRO1	706,2,2
-prontera,270,350,5	duplicate(09Treats)	Trick or Treater#iRO2	706,2,2
-prontera,234,310,5	duplicate(09Treats)	Trick or Treater#iRO3	706,2,2
-prontera,156,321,5	duplicate(09Treats)	Trick or Treater#iRO4	706,2,2
-prontera,156,283,5	duplicate(09Treats)	Trick or Treater#iRO5	706,2,2
-prontera,142,214,5	duplicate(09Treats)	Trick or Treater#iRO6	706,2,2
-prontera,134,125,5	duplicate(09Treats)	Trick or Treater#iRO7	706,2,2
-prontera,220,72,5	duplicate(09Treats)	Trick or Treater#iRO8	706,2,2
+prontera,151,173,5	duplicate(09Treats)	Trick or Treater#iRO1	4_M_KID1,2,2
+prontera,270,350,5	duplicate(09Treats)	Trick or Treater#iRO2	4_M_KID1,2,2
+prontera,234,310,5	duplicate(09Treats)	Trick or Treater#iRO3	4_M_KID1,2,2
+prontera,156,321,5	duplicate(09Treats)	Trick or Treater#iRO4	4_M_KID1,2,2
+prontera,156,283,5	duplicate(09Treats)	Trick or Treater#iRO5	4_M_KID1,2,2
+prontera,142,214,5	duplicate(09Treats)	Trick or Treater#iRO6	4_M_KID1,2,2
+prontera,134,125,5	duplicate(09Treats)	Trick or Treater#iRO7	4_M_KID1,2,2
+prontera,220,72,5	duplicate(09Treats)	Trick or Treater#iRO8	4_M_KID1,2,2
 
 // Monster Summoning - Halloween Wizard
 //============================================================
--	script	Halloween Wizard#iRO09::09HallowWiz	737,{
+-	script	Halloween Wizard#iRO09::09HallowWiz	4_DARKLORD,{
 	mes "[Halloween Wizard]";
 	mes "...";
 	mes "Do you want to play a trick on someone?";
@@ -433,8 +433,8 @@ prontera,220,72,5	duplicate(09Treats)	Trick or Treater#iRO8	706,2,2
 		}
 	}
 }
-prontera,156,195,5	duplicate(09HallowWiz)	Halloween Wizard#1	737
-geffen,133,122,5	duplicate(09HallowWiz)	Halloween Wizard#2	737
-payon,156,196,5	duplicate(09HallowWiz)	Halloween Wizard#3	737
-alberta,96,57,5	duplicate(09HallowWiz)	Halloween Wizard#4	737
-aldebaran,146,122,5	duplicate(09HallowWiz)	Halloween Wizard#5	737
+prontera,156,195,5	duplicate(09HallowWiz)	Halloween Wizard#1	4_DARKLORD
+geffen,133,122,5	duplicate(09HallowWiz)	Halloween Wizard#2	4_DARKLORD
+payon,156,196,5	duplicate(09HallowWiz)	Halloween Wizard#3	4_DARKLORD
+alberta,96,57,5	duplicate(09HallowWiz)	Halloween Wizard#4	4_DARKLORD
+aldebaran,146,122,5	duplicate(09HallowWiz)	Halloween Wizard#5	4_DARKLORD
diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt
index c4c06f07f..97d018f0a 100644
--- a/npc/events/idul_fitri.txt
+++ b/npc/events/idul_fitri.txt
@@ -1,16 +1,16 @@
 //===== Hercules Script ======================================
 //= Feast Day Of Ramadan Idul Fitri Event
-//===== By: ================================================== 
+//===== By: ==================================================
 //= $ephiroth
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Info : Official idRO
 //= 2006/10/16: 1.0 Release and fully working. [$ephiroth]
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
 //============================================================
 
-prontera,146,92,3	script	Cellerb	58,{
+prontera,146,92,3	script	Cellerb	1_M_MERCHANT,{
 	mes "[Staff Idul Fitri]";
 	if((gettime(6)==10 && (gettime(5)==24 || gettime(5)==25))==0) {
 		mes "Congratulation! Celebrate Feast Day Of Ramadan Idul Fitri 1427 H.";
@@ -39,7 +39,7 @@ prontera,146,92,3	script	Cellerb	58,{
 		mes "^000088~2 Green Herb, 5 Stem~.^000000";
 		next;
 		mes "[Staff Idul Fitri]";
-		if ( (countitem(552)<5 || countitem(515)<5 ||countitem(516)<5 || countitem(517)<10 || countitem(511)<2 || countitem(905)<5) ) { 
+		if ( (countitem(552)<5 || countitem(515)<5 ||countitem(516)<5 || countitem(517)<10 || countitem(511)<2 || countitem(905)<5) ) {
 			mes "You don't have enough items.";
 			mes "Come back when you have them all.";
 			close;
@@ -68,4 +68,4 @@ prontera,146,92,3	script	Cellerb	58,{
 		emotion e_hmm;
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt
index 72ebe644b..6c81d0d38 100644
--- a/npc/events/lunar_2008.txt
+++ b/npc/events/lunar_2008.txt
@@ -22,7 +22,7 @@
 //= 1.1 Added missing checkweights. [L0ne_W0lf]
 //============================================================
 
-payon_in01,193,30,4	script	Rice Mill Grandma#rat	78,{
+payon_in01,193,30,4	script	Rice Mill Grandma#rat	1_F_ORIENT_04,{
 	mes "[Rice Mill Grandma]";
 	if (!lunar_rat) {
 		mes "Those filthy little";
@@ -170,7 +170,7 @@ payon_in01,193,30,4	script	Rice Mill Grandma#rat	78,{
 	}
 }
 
-payon,215,127,4	script	Rice Mill Man#rat	54,{
+payon,215,127,4	script	Rice Mill Man#rat	1_M_JOBGUIDER,{
 	mes "[Rice Mill Man]";
 	if (!lunar_rat) {
 		mes "Breaks my heart...";
@@ -223,8 +223,8 @@ payon,215,127,4	script	Rice Mill Man#rat	54,{
 	}
 }
 
-//payon,126,113,4	script	Miss Lunar#rat	862,{
-payon,126,113,4	script	Miss Lunar#rat	719,{
+//payon,126,113,4	script	Miss Lunar#rat	4_F_LGTGIRL,{
+payon,126,113,4	script	Miss Lunar#rat	4_F_NACORURI,{
 	mes "[Lunar]";
 	if ((MaxWeight-Weight) < 3000 || checkweight(1201,1) == 0) {
 		mes "Oh, I'm sorry, but we";
@@ -257,7 +257,7 @@ payon,126,113,4	script	Miss Lunar#rat	719,{
 		next;
 		if (select("Yes:No") == 1) {
 			if (Zeny >= 3000) {
-				set Zeny,Zeny-3000;
+				Zeny -= 3000;
 				getitem 554,10; // Mojji
 				mes "[Lunar]";
 				mes "Thank you, and I hope you";
diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt
index 7f191290b..9b24c50b6 100644
--- a/npc/events/nguild/nguild_dunsw.txt
+++ b/npc/events/nguild/nguild_dunsw.txt
@@ -14,7 +14,7 @@
 
 //==================================================
 function	script	F_GldDunSw	{
-	set .@GID, GetCastleData(getarg(0),1);
+	set .@GID, getcastledata(getarg(0),1);
 	if (.@GID == 0) {
 		mes "[ Echoing Voice ]";
 		mes " ' The one who can overcome an ordeal and show true bravery... will find the way... ' ";
@@ -41,25 +41,25 @@ function	script	F_GldDunSw	{
 }
 
 // Castle 1 ===============================================
-nguild_alde,212,181,0	script	Switch#DunN01	111,{
+nguild_alde,212,181,0	script	Switch#DunN01	HIDDEN_NPC,{
 	callfunc "F_GldDunSw","nguild_alde","02",32,122;
 	close;
 }
 
 // Castle 2 ===============================================
-nguild_gef,78,84,0	script	Switch#DunN02	111,{
+nguild_gef,78,84,0	script	Switch#DunN02	HIDDEN_NPC,{
 	callfunc "F_GldDunSw","nguild_gef","04",39,258;
 	close;
 }
 
 // Castle 3 ===============================================
-nguild_pay,101,25,0	script	Switch#DunN03	111,{
+nguild_pay,101,25,0	script	Switch#DunN03	HIDDEN_NPC,{
 	callfunc "F_GldDunSw","nguild_pay","01",186,165;
 	close;
 }
 
 // Castle 4 ===============================================
-nguild_prt,94,200,0	script	Switch#DunN04	111,{
+nguild_prt,94,200,0	script	Switch#DunN04	HIDDEN_NPC,{
 	callfunc "F_GldDunSw","nguild_prt","03",28,251;
 	close;
 }
diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt
index 96c16136c..097abb53c 100644
--- a/npc/events/nguild/nguild_ev_agit.txt
+++ b/npc/events/nguild/nguild_ev_agit.txt
@@ -21,10 +21,10 @@ function	script	F_AgitStart	{
 	set .@empx, getarg(2);
 	set .@empy, getarg(3);
 
-	MapRespawnGuildID .@map$,GetCastleData(.@map$,1),2;
+	maprespawnguildid .@map$,getcastledata(.@map$,1),2;
 	monster .@map$,.@empx,.@empy,"Emperium",1288,1,"Agit_"+.@castle$+"::OnAgitBreak";
-	GvgOn .@map$;
-	if (GetCastleData(.@map$,1) != 0) return;
+	gvgon .@map$;
+	if (getcastledata(.@map$,1) != 0) return;
 	end;
 }
 
@@ -35,10 +35,10 @@ function	script	F_GuildBreak	{
 
 	killmonsterall .@map$;
 
-	Announce "Guild Base [" + GetCastleName(.@map$) + "] has been abandoned.",0;
+	announce "Guild Base [" + getcastlename(.@map$) + "] has been abandoned.",0;
 	disablenpc "Kafra Staff#"+.@castle$;
 
-	SetCastleData .@map$,0,0;
+	setcastledata .@map$,0,0;
 	return;
 }
 
@@ -50,29 +50,29 @@ function	script	F_AgitBreak	{
 	set .@GID,getcharid(2);
 	if (.@GID <= 0) return;
 
-	set .@Economy,GetCastleData(.@map$,2) - 5;
+	set .@Economy,getcastledata(.@map$,2) - 5;
 	if (.@Economy < 0) set .@Economy, 0;
-	SetCastleData .@map$, 2, .@Economy;
+	setcastledata .@map$, 2, .@Economy;
 
-	set .@Defence,GetCastleData(.@map$,3) - 5;
-	if (.@Defence < 0) set .@Defence, 0;
-	SetCastleData .@map$, 3, .@Defence;
+	set .@defence,getcastledata(.@map$,3) - 5;
+	if (.@defence < 0) set .@defence, 0;
+	setcastledata .@map$, 3, .@defence;
 
-	SetCastleData .@map$,1, .@GID;
-	MapAnnounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF;
-	Announce "The [" + GetCastleName(.@map$) + "] castle has been conquered by the [" + GetGuildName(.@GID) + "] guild.",bc_all;
+	setcastledata .@map$,1, .@GID;
+	mapannounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF;
+	announce "The [" + getcastlename(.@map$) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all;
 	donpcevent "::OnRecvCastle"+.@castle$;
 
 	disablenpc "Kafra Staff#"+.@castle$;
 
 	// remove investment data and kafra
 	for( set .@i, 4; .@i <= 9; set .@i, .@i+1 )
-		SetCastleData .@map$, .@i, 0;
+		setcastledata .@map$, .@i, 0;
 
 	// if the new guild doesn't have Guardian Research, erase guardians
 	if( getgdskilllv(.@GID,10002) == 0 )
 		for( set .@i, 10; .@i <= 17; set .@i, .@i+1 )
-			SetCastleData .@map$, .@i, 0;
+			setcastledata .@map$, .@i, 0;
 
 	return;
 }
@@ -83,12 +83,12 @@ function	script	F_AgitEnd	{
 	set .@map$, getarg(0);
 	set .@castle$, getarg(1);
 
-	GvgOff .@map$;
+	gvgoff .@map$;
 	// Disable the following if statment to keep empty
 	// castles from being aquired after after WoE ends.
-	if (GetCastleData(.@map$,1) == 0) return;
-	MapRespawnGuildID .@map$,GetCastleData(.@map$,1),4;
-	KillMonster .@map$,"Agit_"+.@castle$+"::OnAgitBreak";
+	if (getcastledata(.@map$,1) == 0) return;
+	maprespawnguildid .@map$,getcastledata(.@map$,1),4;
+	killmonster .@map$,"Agit_"+.@castle$+"::OnAgitBreak";
 	end;
 }
 
@@ -98,7 +98,7 @@ OnInterIfInitOnce:
 	donpcevent "::OnRecvCastleN01";
 	end;
 OnRecvCastleN01:
-	RequestGuildInfo GetCastleData("nguild_alde",1);
+	requestguildinfo getcastledata("nguild_alde",1);
 	end;
 OnAgitStart:
 	callfunc "F_AgitStart","nguild_alde","N01",216,24;
@@ -111,8 +111,8 @@ OnGuildBreak:
 	callfunc "F_GuildBreak","nguild_alde","N01";
 	end;
 OnAgitEliminate:
-	MapRespawnGuildID "nguild_alde",GetCastleData("nguild_alde",1),6;
-	Monster "nguild_alde",216,24,"EMPERIUM",1288,1,"Agit_N01::OnAgitBreak";
+	maprespawnguildid "nguild_alde",getcastledata("nguild_alde",1),6;
+	monster "nguild_alde",216,24,"EMPERIUM",1288,1,"Agit_N01::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","nguild_alde","N01";
@@ -125,7 +125,7 @@ OnInterIfInitOnce:
 	donpcevent "::OnRecvCastleN02";
 	end;
 OnRecvCastleN02:
-	RequestGuildInfo GetCastleData("nguild_gef",1);
+	requestguildinfo getcastledata("nguild_gef",1);
 	end;
 OnAgitStart:
 	callfunc "F_AgitStart","nguild_gef","N02",198,182;
@@ -138,8 +138,8 @@ OnGuildBreak:
 	callfunc "F_GuildBreak","nguild_gef","N02";
 	end;
 OnAgitEliminate:
-	MapRespawnGuildID "nguild_gef",GetCastleData("nguild_gef",1),6;
-	Monster "nguild_gef",198,182,"EMPERIUM",1288,1,"Agit_N02::OnAgitBreak";
+	maprespawnguildid "nguild_gef",getcastledata("nguild_gef",1),6;
+	monster "nguild_gef",198,182,"EMPERIUM",1288,1,"Agit_N02::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","nguild_gef","N02";
@@ -152,7 +152,7 @@ OnInterIfInitOnce:
 	donpcevent "::OnRecvCastleN03";
 	end;
 OnRecvCastleN03:
-	RequestGuildInfo GetCastleData("nguild_pay",1);
+	requestguildinfo getcastledata("nguild_pay",1);
 	end;
 OnAgitStart:
 	callfunc "F_AgitStart","nguild_pay","N03",139,139;
@@ -165,8 +165,8 @@ OnGuildBreak:
 	callfunc "F_GuildBreak","nguild_pay","N03";
 	end;
 OnAgitEliminate:
-	MapRespawnGuildID "nguild_pay",GetCastleData("nguild_pay",1),6;
-	Monster "nguild_pay",139,139,"EMPERIUM",1288,1,"Agit_N03::OnAgitBreak";
+	maprespawnguildid "nguild_pay",getcastledata("nguild_pay",1),6;
+	monster "nguild_pay",139,139,"EMPERIUM",1288,1,"Agit_N03::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","nguild_pay","N03";
@@ -179,7 +179,7 @@ OnInterIfInitOnce:
 	donpcevent "::OnRecvCastleN04";
 	end;
 OnRecvCastleN04:
-	RequestGuildInfo GetCastleData("nguild_prt",1);
+	requestguildinfo getcastledata("nguild_prt",1);
 	end;
 OnAgitStart:
 	callfunc "F_AgitStart","nguild_prt","N04",197,197;
@@ -192,8 +192,8 @@ OnGuildBreak:
 	callfunc "F_GuildBreak","nguild_prt","N04";
 	end;
 OnAgitEliminate:
-	MapRespawnGuildID "nguild_prt",GetCastleData("nguild_prt",1),6;
-	Monster "nguild_prt",197,197,"EMPERIUM",1288,1,"Agit_N04::OnAgitBreak";
+	maprespawnguildid "nguild_prt",getcastledata("nguild_prt",1),6;
+	monster "nguild_prt",197,197,"EMPERIUM",1288,1,"Agit_N04::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","nguild_prt","N04";
diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt
index 178125643..8c629adf9 100644
--- a/npc/events/nguild/nguild_flags.txt
+++ b/npc/events/nguild/nguild_flags.txt
@@ -16,7 +16,7 @@
 /// Flag Function
 //============================================================
 function	script	F_Flags	{
-	set .@GID, GetCastleData(getarg(1),1);
+	set .@GID, getcastledata(getarg(1),1);
 	if (getarg(5) == 0) return;
 	if (.@GID == 0) {
 		mes " [ Edict of the Divine Rune Midgard Kingdom ]";
@@ -38,7 +38,7 @@ function	script	F_Flags	{
 			mes "Do you wish to return to your honorable place?";
 			next;
 			if (select("Return to the guild castle.:Quit.") == 1) {
-				if (getcharid(2) == GetCastleData(getarg(1),1))
+				if (getcharid(2) == getcastledata(getarg(1),1))
 					warp getarg(1),getarg(2),getarg(3);
 			}
 			return;
@@ -48,10 +48,10 @@ function	script	F_Flags	{
 		mes "1. Following the ordinance of the";
 		mes "Divine Rune Midgard Kingdom,";
 		mes "we approve that this place is in";
-		mes "the private possession of ^ff0000" + GetGuildName(.@GID) + "^000000 Guild.";
+		mes "the private possession of ^ff0000" + getguildname(.@GID) + "^000000 Guild.";
 		mes " ";
-		mes "2. The guild Master of ^ff0000"+ GetGuildName(.@GID) + "^000000 Guild is";
-		mes "^FF0000" + GetGuildMaster(.@GID) + "^000000";
+		mes "2. The guild Master of ^ff0000"+ getguildname(.@GID) + "^000000 Guild is";
+		mes "^FF0000" + getguildmaster(.@GID) + "^000000";
 		mes "If there is anyone who objects to this,";
 		mes " prove your strength and honor with a steel blade in your hand.";
 		return;
@@ -61,38 +61,38 @@ function	script	F_Flags	{
 //============================================================================//
 // 			Castle 1
 //============================================================================//
-n_castle,110,96,1	script	NGuild Aldebaran#a1-1	722,{
+n_castle,110,96,1	script	NGuild Aldebaran#a1-1	GUILD_FLAG,{
 	callfunc "F_Flags","Al De Baran","nguild_alde",218,170,1,1;
 	close;
 
 OnRecvCastleN01:
-	FlagEmblem GetCastleData("nguild_alde",1);
+	flagemblem getcastledata("nguild_alde",1);
 	end;
 }
 
-nguild_alde,30,248,4	script	NGuild Aldebaran#a1-6::NGuildAlde	722,{
+nguild_alde,30,248,4	script	NGuild Aldebaran#a1-6::NGuildAlde	GUILD_FLAG,{
 	callfunc "F_Flags","Al De Baran","nguild_alde",218,170,0,1;
 	close;
 
 OnRecvCastleN01:
-	FlagEmblem GetCastleData("nguild_alde",1);
+	flagemblem getcastledata("nguild_alde",1);
 	end;
 }
 // In Castle ============================================
-nguild_alde,30,246,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-7	722
-nguild_alde,37,248,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-8	722
-nguild_alde,37,246,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-9	722
-nguild_alde,95,80,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-10	722
-nguild_alde,95,59,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-11	722
-nguild_alde,62,75,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-12	722
-nguild_alde,70,75,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-13	722
-nguild_alde,74,75,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-14	722
-nguild_alde,62,64,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-15	722
-nguild_alde,66,64,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-16	722
-nguild_alde,70,64,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-17	722
-nguild_alde,74,64,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-18	722
-nguild_alde,203,150,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-19	722
-nguild_alde,210,150,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-20	722
+nguild_alde,30,246,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-7	GUILD_FLAG
+nguild_alde,37,248,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-8	GUILD_FLAG
+nguild_alde,37,246,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-9	GUILD_FLAG
+nguild_alde,95,80,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-10	GUILD_FLAG
+nguild_alde,95,59,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-11	GUILD_FLAG
+nguild_alde,62,75,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-12	GUILD_FLAG
+nguild_alde,70,75,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-13	GUILD_FLAG
+nguild_alde,74,75,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-14	GUILD_FLAG
+nguild_alde,62,64,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-15	GUILD_FLAG
+nguild_alde,66,64,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-16	GUILD_FLAG
+nguild_alde,70,64,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-17	GUILD_FLAG
+nguild_alde,74,64,2	duplicate(NGuildAlde)	NGuild Aldebaran#a1-18	GUILD_FLAG
+nguild_alde,203,150,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-19	GUILD_FLAG
+nguild_alde,210,150,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-20	GUILD_FLAG
 
 
 
@@ -100,60 +100,60 @@ nguild_alde,210,150,4	duplicate(NGuildAlde)	NGuild Aldebaran#a1-20	722
 //============================================================================//
 // 			Castle 2
 //============================================================================//
-n_castle,110,109,3	script	NGuild Geffen#g1-1	722,{
+n_castle,110,109,3	script	NGuild Geffen#g1-1	GUILD_FLAG,{
 	callfunc "F_Flags","Geffen","nguild_gef",83,47,1,1;
 	close;
 
 OnRecvCastleN02:
-	FlagEmblem GetCastleData("nguild_gef",1);
+	flagemblem getcastledata("nguild_gef",1);
 	end;
 }
 
-nguild_gef,28,157,4	script	NGuild Geffen#g1-6::NGuildGef	722,{
+nguild_gef,28,157,4	script	NGuild Geffen#g1-6::NGuildGef	GUILD_FLAG,{
 	callfunc "F_Flags","Geffen","nguild_gef",83,47,0,1;
 	close;
 
 OnRecvCastleN02:
-	FlagEmblem GetCastleData("nguild_gef",1);
+	flagemblem getcastledata("nguild_gef",1);
 	end;
 }
 // In Castle =============================================
-nguild_gef,32,157,4	duplicate(NGuildGef)	NGuild Geffen#g1-7	722
-nguild_gef,22,156,5	duplicate(NGuildGef)	NGuild Geffen#g1-8	722
-nguild_gef,68,185,3	duplicate(NGuildGef)	NGuild Geffen#g1-9	722
-nguild_gef,17,171,5	duplicate(NGuildGef)	NGuild Geffen#g1-10	722
-nguild_gef,59,16,4	duplicate(NGuildGef)	NGuild Geffen#g1-11	722
-nguild_gef,64,16,4	duplicate(NGuildGef)	NGuild Geffen#g1-12	722
+nguild_gef,32,157,4	duplicate(NGuildGef)	NGuild Geffen#g1-7	GUILD_FLAG
+nguild_gef,22,156,5	duplicate(NGuildGef)	NGuild Geffen#g1-8	GUILD_FLAG
+nguild_gef,68,185,3	duplicate(NGuildGef)	NGuild Geffen#g1-9	GUILD_FLAG
+nguild_gef,17,171,5	duplicate(NGuildGef)	NGuild Geffen#g1-10	GUILD_FLAG
+nguild_gef,59,16,4	duplicate(NGuildGef)	NGuild Geffen#g1-11	GUILD_FLAG
+nguild_gef,64,16,4	duplicate(NGuildGef)	NGuild Geffen#g1-12	GUILD_FLAG
 
 
 
 //============================================================================//
 // 			Castle 3
 //============================================================================//
-n_castle,94,109,5	script	NGuild Payon#f1-1	722,{
+n_castle,94,109,5	script	NGuild Payon#f1-1	GUILD_FLAG,{
 	callfunc "F_Flags","Payon","nguild_pay",87,29,1,1;
 	close;
 
 OnRecvCastleN03:
-	FlagEmblem GetCastleData("nguild_pay",1);
+	flagemblem getcastledata("nguild_pay",1);
 	end;
 }
 
-nguild_pay,238,67,4	script	NGuild Payon#f1-6::NGuildPay	722,{
+nguild_pay,238,67,4	script	NGuild Payon#f1-6::NGuildPay	GUILD_FLAG,{
 	callfunc "F_Flags","Payon","nguild_pay",87,29,0,1;
 	close;
 
 OnRecvCastleN03:
-	FlagEmblem GetCastleData("nguild_pay",1);
+	flagemblem getcastledata("nguild_pay",1);
 	end;
 }
 // In Castle ===============================================
-nguild_pay,238,67,4	duplicate(NGuildPay)	NGuild Payon#f1-6	722
-nguild_pay,233,67,4	duplicate(NGuildPay)	NGuild Payon#f1-7	722
-nguild_pay,221,123,4	duplicate(NGuildPay)	NGuild Payon#f1-8	722
-nguild_pay,221,116,4	duplicate(NGuildPay)	NGuild Payon#f1-9	722
-nguild_pay,206,108,4	duplicate(NGuildPay)	NGuild Payon#f1-10	722
-nguild_pay,212,108,4	duplicate(NGuildPay)	NGuild Payon#f1-11	722
+nguild_pay,238,67,4	duplicate(NGuildPay)	NGuild Payon#f1-6	GUILD_FLAG
+nguild_pay,233,67,4	duplicate(NGuildPay)	NGuild Payon#f1-7	GUILD_FLAG
+nguild_pay,221,123,4	duplicate(NGuildPay)	NGuild Payon#f1-8	GUILD_FLAG
+nguild_pay,221,116,4	duplicate(NGuildPay)	NGuild Payon#f1-9	GUILD_FLAG
+nguild_pay,206,108,4	duplicate(NGuildPay)	NGuild Payon#f1-10	GUILD_FLAG
+nguild_pay,212,108,4	duplicate(NGuildPay)	NGuild Payon#f1-11	GUILD_FLAG
 
 
 
@@ -161,30 +161,30 @@ nguild_pay,212,108,4	duplicate(NGuildPay)	NGuild Payon#f1-11	722
 //=============================================================================//
 // 			Castle 4
 //=============================================================================//
-n_castle,94,96,7	script	NGuild Prontera#p1-1	722,{
+n_castle,94,96,7	script	NGuild Prontera#p1-1	GUILD_FLAG,{
 	callfunc "F_Flags","Prontera","nguild_prt",97,174,1,1;
 	close;
 
 OnRecvCastleN04:
-	FlagEmblem GetCastleData("nguild_prt",1);
+	flagemblem getcastledata("nguild_prt",1);
 	end;
 }
 
-nguild_prt,58,56,4	script	NGuild Prontera#p1-7::NGuildPrt	722,{
+nguild_prt,58,56,4	script	NGuild Prontera#p1-7::NGuildPrt	GUILD_FLAG,{
 	callfunc "F_Flags","Prontera","nguild_prt",97,174,0,1;
 	close;
 
 OnRecvCastleN04:
-	FlagEmblem GetCastleData("nguild_prt",1);
+	flagemblem getcastledata("nguild_prt",1);
 	end;
 }
 // In Castle =============================================
-nguild_prt,64,56,4	duplicate(NGuildPrt)	NGuild Prontera#p1-8	722
-nguild_prt,76,32,4	duplicate(NGuildPrt)	NGuild Prontera#p1-9	722
-nguild_prt,84,32,4	duplicate(NGuildPrt)	NGuild Prontera#p1-10	722
-nguild_prt,94,39,4	duplicate(NGuildPrt)	NGuild Prontera#p1-11	722
-nguild_prt,94,24,4	duplicate(NGuildPrt)	NGuild Prontera#p1-12	722
-nguild_prt,73,14,4	duplicate(NGuildPrt)	NGuild Prontera#p1-13	722
-nguild_prt,73,6,4	duplicate(NGuildPrt)	NGuild Prontera#p1-14	722
-nguild_prt,55,46,4	duplicate(NGuildPrt)	NGuild Prontera#p1-15	722
-nguild_prt,45,46,4	duplicate(NGuildPrt)	NGuild Prontera#p1-16	722
+nguild_prt,64,56,4	duplicate(NGuildPrt)	NGuild Prontera#p1-8	GUILD_FLAG
+nguild_prt,76,32,4	duplicate(NGuildPrt)	NGuild Prontera#p1-9	GUILD_FLAG
+nguild_prt,84,32,4	duplicate(NGuildPrt)	NGuild Prontera#p1-10	GUILD_FLAG
+nguild_prt,94,39,4	duplicate(NGuildPrt)	NGuild Prontera#p1-11	GUILD_FLAG
+nguild_prt,94,24,4	duplicate(NGuildPrt)	NGuild Prontera#p1-12	GUILD_FLAG
+nguild_prt,73,14,4	duplicate(NGuildPrt)	NGuild Prontera#p1-13	GUILD_FLAG
+nguild_prt,73,6,4	duplicate(NGuildPrt)	NGuild Prontera#p1-14	GUILD_FLAG
+nguild_prt,55,46,4	duplicate(NGuildPrt)	NGuild Prontera#p1-15	GUILD_FLAG
+nguild_prt,45,46,4	duplicate(NGuildPrt)	NGuild Prontera#p1-16	GUILD_FLAG
diff --git a/npc/events/nguild/nguild_guardians.txt b/npc/events/nguild/nguild_guardians.txt
index 7b0e5bab4..3b2a7088b 100644
--- a/npc/events/nguild/nguild_guardians.txt
+++ b/npc/events/nguild/nguild_guardians.txt
@@ -15,73 +15,73 @@
 //------------------------------------------------------------------------------
 nguild_alde,216,24,0	script	Guardian_N01	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_alde",10) == 1) guardian "nguild_alde",18,219,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",0;
-	if (GetCastleData("nguild_alde",11) == 1) guardian "nguild_alde",117,42,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",1;
-	if (GetCastleData("nguild_alde",12) == 1) guardian "nguild_alde",207,153,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",2;
-	if (GetCastleData("nguild_alde",13) == 1) guardian "nguild_alde",68,70,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",3;
-	if (GetCastleData("nguild_alde",14) == 1) guardian "nguild_alde",187,140,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",4;
-	if (GetCastleData("nguild_alde",15) == 1) guardian "nguild_alde",62,204,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",5;
-	if (GetCastleData("nguild_alde",16) == 1) guardian "nguild_alde",113,100,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",6;
-	if (GetCastleData("nguild_alde",17) == 1) guardian "nguild_alde",211,174,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",7;
+	if (getcastledata("nguild_alde",10) == 1) guardian "nguild_alde",18,219,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",0;
+	if (getcastledata("nguild_alde",11) == 1) guardian "nguild_alde",117,42,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",1;
+	if (getcastledata("nguild_alde",12) == 1) guardian "nguild_alde",207,153,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",2;
+	if (getcastledata("nguild_alde",13) == 1) guardian "nguild_alde",68,70,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",3;
+	if (getcastledata("nguild_alde",14) == 1) guardian "nguild_alde",187,140,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",4;
+	if (getcastledata("nguild_alde",15) == 1) guardian "nguild_alde",62,204,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",5;
+	if (getcastledata("nguild_alde",16) == 1) guardian "nguild_alde",113,100,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",6;
+	if (getcastledata("nguild_alde",17) == 1) guardian "nguild_alde",211,174,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "nguild_alde","A Guardian Has Fallen",17;
+	mapannounce "nguild_alde","A Guardian Has Fallen",17;
 	end;
 }
 
 //------------------------------------------------------------------------------
 nguild_gef,198,182,0	script	Guardian_N02	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_gef",10) == 1) guardian "nguild_gef",30,178,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",0;
-	if (GetCastleData("nguild_gef",11) == 1) guardian "nguild_gef",64,180,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",1;
-	if (GetCastleData("nguild_gef",12) == 1) guardian "nguild_gef",61,25,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",2;
-	if (GetCastleData("nguild_gef",13) == 1) guardian "nguild_gef",61,44,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",3;
-	if (GetCastleData("nguild_gef",14) == 1) guardian "nguild_gef",189,43,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",4;
-	if (GetCastleData("nguild_gef",15) == 1) guardian "nguild_gef",51,192,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",5;
-	if (GetCastleData("nguild_gef",16) == 1) guardian "nguild_gef",49,67,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",6;
-	if (GetCastleData("nguild_gef",17) == 1) guardian "nguild_gef",181,14,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",7;
+	if (getcastledata("nguild_gef",10) == 1) guardian "nguild_gef",30,178,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",0;
+	if (getcastledata("nguild_gef",11) == 1) guardian "nguild_gef",64,180,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",1;
+	if (getcastledata("nguild_gef",12) == 1) guardian "nguild_gef",61,25,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",2;
+	if (getcastledata("nguild_gef",13) == 1) guardian "nguild_gef",61,44,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",3;
+	if (getcastledata("nguild_gef",14) == 1) guardian "nguild_gef",189,43,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",4;
+	if (getcastledata("nguild_gef",15) == 1) guardian "nguild_gef",51,192,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",5;
+	if (getcastledata("nguild_gef",16) == 1) guardian "nguild_gef",49,67,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",6;
+	if (getcastledata("nguild_gef",17) == 1) guardian "nguild_gef",181,14,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "nguild_gef","A Guardian Has Fallen",17;
+	mapannounce "nguild_gef","A Guardian Has Fallen",17;
 	end;
 }
 //------------------------------------------------------------------------------
 nguild_pay,139,139,0	script	Guardian_N03	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_pay",10) == 1) guardian "nguild_pay",210,120,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",0;
-	if (GetCastleData("nguild_pay",11) == 1) guardian "nguild_pay",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1; 
-	if (GetCastleData("nguild_pay",12) == 1) guardian "nguild_pay",23,141,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",2;
-	if (GetCastleData("nguild_pay",13) == 1) guardian "nguild_pay",224,87,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",3;
-	if (GetCastleData("nguild_pay",14) == 1) guardian "nguild_pay",81,45,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",4;
-	if (GetCastleData("nguild_pay",15) == 1) guardian "nguild_pay",214,53,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",5;
-	if (GetCastleData("nguild_pay",16) == 1) guardian "nguild_pay",69,26,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",6;
-	if (GetCastleData("nguild_pay",17) == 1) guardian "nguild_pay",23,141,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",7;
+	if (getcastledata("nguild_pay",10) == 1) guardian "nguild_pay",210,120,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",0;
+	if (getcastledata("nguild_pay",11) == 1) guardian "nguild_pay",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1;
+	if (getcastledata("nguild_pay",12) == 1) guardian "nguild_pay",23,141,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",2;
+	if (getcastledata("nguild_pay",13) == 1) guardian "nguild_pay",224,87,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",3;
+	if (getcastledata("nguild_pay",14) == 1) guardian "nguild_pay",81,45,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",4;
+	if (getcastledata("nguild_pay",15) == 1) guardian "nguild_pay",214,53,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",5;
+	if (getcastledata("nguild_pay",16) == 1) guardian "nguild_pay",69,26,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",6;
+	if (getcastledata("nguild_pay",17) == 1) guardian "nguild_pay",23,141,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "nguild_pay","A Guardian Has Fallen",17;
+	mapannounce "nguild_pay","A Guardian Has Fallen",17;
 	end;
 }
 //------------------------------------------------------------------------------
 nguild_prt,197,197,0	script	Guardian_N04	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_prt",10) == 1) guardian "nguild_prt",196,92,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",0;
-	if (GetCastleData("nguild_prt",11) == 1) guardian "nguild_prt",113,200,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",1;
-	if (GetCastleData("nguild_prt",12) == 1) guardian "nguild_prt",111,186,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",2;
-	if (GetCastleData("nguild_prt",13) == 1) guardian "nguild_prt",76,202,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",3;
-	if (GetCastleData("nguild_prt",14) == 1) guardian "nguild_prt",90,26,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",4;
-	if (GetCastleData("nguild_prt",15) == 1) guardian "nguild_prt",58,59,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",5;
-	if (GetCastleData("nguild_prt",16) == 1) guardian "nguild_prt",112,200,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",6;
-	if (GetCastleData("nguild_prt",17) == 1) guardian "nguild_prt",101,194,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",7;
+	if (getcastledata("nguild_prt",10) == 1) guardian "nguild_prt",196,92,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",0;
+	if (getcastledata("nguild_prt",11) == 1) guardian "nguild_prt",113,200,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",1;
+	if (getcastledata("nguild_prt",12) == 1) guardian "nguild_prt",111,186,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",2;
+	if (getcastledata("nguild_prt",13) == 1) guardian "nguild_prt",76,202,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",3;
+	if (getcastledata("nguild_prt",14) == 1) guardian "nguild_prt",90,26,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",4;
+	if (getcastledata("nguild_prt",15) == 1) guardian "nguild_prt",58,59,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",5;
+	if (getcastledata("nguild_prt",16) == 1) guardian "nguild_prt",112,200,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",6;
+	if (getcastledata("nguild_prt",17) == 1) guardian "nguild_prt",101,194,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "nguild_prt","A Guardian Has Fallen",17;
+	mapannounce "nguild_prt","A Guardian Has Fallen",17;
 	end;
 }
diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt
index 11d748ab4..100751f7a 100644
--- a/npc/events/nguild/nguild_kafras.txt
+++ b/npc/events/nguild/nguild_kafras.txt
@@ -16,11 +16,11 @@
 
 function	script	F_GKafra	{
 	cutin "kafra_01",2;
-	set @GID, GetCastleData(getarg(0),1);
+	set @GID, getcastledata(getarg(0),1);
 	if (getcharid(2) == @GID && getgdskilllv(@GID,10001)) goto L_StartG;
 
 	mes "[Kafra Service]";
-	mes "I am contracted to provide service only for the ^ff0000" + GetGuildName(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience.";
+	mes "I am contracted to provide service only for the ^ff0000" + getguildname(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience.";
 	cutin "",255;
 	close;
 L_StartG:
@@ -32,38 +32,38 @@ L_StartG:
 }
 
 // Castle 1 ===============================================
-nguild_alde,218,170,0	script	Kafra Service#N01	117,{
+nguild_alde,218,170,0	script	Kafra Service#N01	4_F_KAFRA1,{
 	callfunc "F_GKafra", "nguild_alde", "Prontera";
 	end;
 OnRecvCastleN01:
-	if (GetCastleData("nguild_alde",9) < 1) disablenpc "Kafra Service#N01";
+	if (getcastledata("nguild_alde",9) < 1) disablenpc "Kafra Service#N01";
 	end;
 }
 
 // Castle 2 ===============================================
-//nguild_gef,96,173,0	script	Kafra Service#N02	117,{
-nguild_gef,35,37,0	script	Kafra Service#N02	117,{
+//nguild_gef,96,173,0	script	Kafra Service#N02	4_F_KAFRA1,{
+nguild_gef,35,37,0	script	Kafra Service#N02	4_F_KAFRA1,{
 	callfunc "F_GKafra", "nguild_gef", "Prontera";
 	end;
 OnRecvCastleN02:
-	if (GetCastleData("nguild_gef",9) < 1) disablenpc "Kafra Service#N02";
+	if (getcastledata("nguild_gef",9) < 1) disablenpc "Kafra Service#N02";
 	end;
 }
 
 // Castle 3 ===============================================
-nguild_pay,128,58,3	script	Kafra Service#N03	117,{
+nguild_pay,128,58,3	script	Kafra Service#N03	4_F_KAFRA1,{
 	callfunc "F_GKafra", "nguild_pay", "Prontera";
 	end;
 OnRecvCastleN03:
-	if (GetCastleData("nguild_pay",9) < 1) disablenpc "Kafra Service#N03";
+	if (getcastledata("nguild_pay",9) < 1) disablenpc "Kafra Service#N03";
 	end;
 }
 
 // Castle 4 ===============================================
-nguild_prt,96,173,0	script	Kafra Service#N04	117,{
+nguild_prt,96,173,0	script	Kafra Service#N04	4_F_KAFRA1,{
 	callfunc "F_GKafra", "nguild_prt", "Prontera";
 	end;
 OnRecvCastleN04:
-	if (GetCastleData("nguild_prt",9) < 1) disablenpc "Kafra Service#N04";
+	if (getcastledata("nguild_prt",9) < 1) disablenpc "Kafra Service#N04";
 	end;
 }
diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt
index 0b35108f7..d6ecfbf2f 100644
--- a/npc/events/nguild/nguild_managers.txt
+++ b/npc/events/nguild/nguild_managers.txt
@@ -23,7 +23,7 @@
 //==============================================
 function	script	F_GldManager	{
 
-	set @GID, GetCastleData(getarg(1),1);
+	set @GID, getcastledata(getarg(1),1);
 	mes "[ "+getarg(0)+" ]";
 	if (@GID == 0){
 		mes "I am waiting for my master.  Brave adventurer, follow your destiny!";
@@ -48,7 +48,7 @@ function	script	F_GldManager	{
 	M_Kaf:
 	//======
 		mes "[ "+getarg(0)+" ]";
-		if (GetCastleData(getarg(1),9) == 1) goto L_Dismiss;
+		if (getcastledata(getarg(1),9) == 1) goto L_Dismiss;
 		if (getgdskilllv(@GID,10001) == 0){
 			mes "Master, you don't have a contract with the Kafra Staff Company.";
 			mes "In order to hire a Kafra, you must first learn the Guild skill ^5533FFContract With Kafra^000000.";
@@ -65,9 +65,9 @@ function	script	F_GldManager	{
 					mes "Master, you do not have enough money to employ a Kafra. Employment has been cancelled.";
 					return;
 				}
-				set Zeny,Zeny-10000;
+				Zeny -= 10000;
 				enablenpc "Kafra Staff#"+getarg(4);
-				SetCastleData getarg(1),9,1;
+				setcastledata getarg(1),9,1;
 				mes "You have created a contract with the Kafra Staff Company.";
 				next;
 				cutin "kafra_01",2;
@@ -100,7 +100,7 @@ function	script	F_GldManager	{
 					mes "It's unfortunate that I won't be able to serve your guild anymore....";
 					next;
 					disablenpc "Kafra Staff#"+getarg(4);
-					SetCastleData getarg(1),9,0;
+					setcastledata getarg(1),9,0;
 					cutin "kafra_01",255;
 					mes "[ "+getarg(0)+" ]";
 					mes "The Kafra has been dismissed.  But... we should really get a Kafra as soon as possible!";
@@ -145,28 +145,28 @@ function	script	F_GldManager	{
 }
 
 // Castle 1 ==================================================================================
-nguild_alde,218,175,0	script	Frolo	55,{
+nguild_alde,218,175,0	script	Frolo	1_M_JOBTESTER,{
 	callfunc "F_GldManager","Frolo","nguild_alde",119,223,"N01";
 	close;
 }
 
 
 // Castle 2 ==================================================================================
-nguild_gef,40,48,5	script	Leiber	55,{
+nguild_gef,40,48,5	script	Leiber	1_M_JOBTESTER,{
 	callfunc "F_GldManager","Leiber","nguild_gef",155,112,"N02";
 	close;
 }
 
 
 // Castle 3 ==================================================================================
-nguild_pay,120,58,4	script	Dundar	55,{
+nguild_pay,120,58,4	script	Dundar	1_M_JOBTESTER,{
 	callfunc "F_GldManager","Dundar","nguild_pay",290,7,"N03";
 	close;
 }
 
 
 // Castle 4 ==================================================================================
-nguild_prt,112,181,0	script	Thefton	55,{
+nguild_prt,112,181,0	script	Thefton	1_M_JOBTESTER,{
 	callfunc "F_GldManager","Thefton","nguild_prt",15,209,"N04";
 	close;
 }
diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt
index 485a58e70..750eab88a 100644
--- a/npc/events/nguild/nguild_treas.txt
+++ b/npc/events/nguild/nguild_treas.txt
@@ -26,13 +26,13 @@ function	script	F_GldTreas	{
 		//killmonster getarg(0),"Treasure_"+getarg(1)+"::OnDied";
 
 		// Don't spawn treasures if Castle is empty, or Eco is greater than 100
-		if(GetCastleData(getarg(0),2) > 100 || GetCastleData(getarg(0),1) == 0) return;
+		if(getcastledata(getarg(0),2) > 100 || getcastledata(getarg(0),1) == 0) return;
 
 		// Only spawn one treasure chest for novice castles.
 		if (compare(getarg(0),"nguild"))
 			set getarg(2),1;
 		else
-			set getarg(2),GetCastleData(getarg(0),2)/5+4;
+			set getarg(2),getcastledata(getarg(0),2)/5+4;
 
 		if (getarg(2) <= 0) return;
 
@@ -48,7 +48,7 @@ function	script	F_GldTreas	{
 }
 
 //==============================================================
-//  Treasure Room Switch 
+//  Treasure Room Switch
 //===============================================================
 function	script	F_GldTreasSw	{
 	mes " ";
@@ -62,7 +62,7 @@ function	script	F_GldTreasSw	{
 	close;
 }
 
-//<=============================== Castle 1 =================================>\\
+//<===============================Castle 1 =================================>\\
 
 // Treasure Spawn -----------------------
 nguild_alde,1,1,1	script	Treasure_N01	-1,{
@@ -83,12 +83,12 @@ OnDied:
 }
 
 // Treasure Room Switch --------------------
-nguild_alde,123,223,0	script	Switch#TresN01	111,{
+nguild_alde,123,223,0	script	Switch#TresN01	HIDDEN_NPC,{
 	callfunc "F_GldTreasSw", "nguild_alde",218,176;
 	end;
 }
 
-//<================================ Castle 2 ================================>\\
+//<================================Castle 2 ================================>\\
 
 // Treasure Spawn ----------------------------
 nguild_gef,1,1,1	script	Treasure_N02	-1,{
@@ -109,12 +109,12 @@ OnDied:
 }
 
 // Room Switch ---------------------------------------------------------
-nguild_gef,152,117,0	script	Switch#TresN02	111,{
+nguild_gef,152,117,0	script	Switch#TresN02	HIDDEN_NPC,{
 	callfunc "F_GldTreasSw","nguild_gef",40,49;
 	end;
 }
 
-//<================================ Castle 3 ================================>\\
+//<================================Castle 3 ================================>\\
 
 // Treasure Spawn ---------------------------
 nguild_pay,1,1,0	script	Treasure_N03	-1,{
@@ -134,12 +134,12 @@ OnDied:
 }
 
 // Treasure Room Switch ---------------------------------------------------
-nguild_pay,295,8,0	script	Switch#TresN03	111,{
+nguild_pay,295,8,0	script	Switch#TresN03	HIDDEN_NPC,{
 	callfunc "F_GldTreasSw", "nguild_pay",120,59;
 	end;
 }
 
-//<================================ Castle 4 ================================>\\
+//<================================Castle 4 ================================>\\
 
 // Treasure Spawn -------------------------------
 nguild_prt,1,1,0	script	Treasure_N04	-1,{
@@ -159,7 +159,7 @@ OnDied:
 }
 
 // Treasure Room Switch ----------------------------------------------------
-nguild_prt,15,209,0	script	Switch#TresN04	111,{
+nguild_prt,15,209,0	script	Switch#TresN04	HIDDEN_NPC,{
 	callfunc "F_GldTreasSw", "nguild_prt",109,179;
 	end;
 }
diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt
index ac54c0716..6ad9d02ab 100644
--- a/npc/events/nguild/nguild_warper.txt
+++ b/npc/events/nguild/nguild_warper.txt
@@ -11,10 +11,10 @@
 //= dungeons. And 2nd Classes can't seize these Castles.
 //= These new castles need a new strategy. It would bring some
 //= fun and live to your game.
-//= NOTE: If your Guild Master is 2nd class, then he could 
+//= NOTE: If your Guild Master is 2nd class, then he could
 //=       rule the Castles and gather Treasure Boxes after WoE
 //= 1.1 Now 2nd classes can't enter NC place at all
-//= 1.2 Restricted access of SG/SL. On warp clear some 
+//= 1.2 Restricted access of SG/SL. On warp clear some
 //=     unallowed buffs [Lupus]
 //= 1.3 Restricted TK,High classes >=90 BaseLevel,
 //=     updated list of unallowed buffs [Lupus]
@@ -26,11 +26,11 @@
 //= TODO: The official entrance is in Izlude.
 //============================================================
 
-prontera,146,163,6	script	Novice Castles	729,{
+prontera,146,163,6	script	Novice Castles	4_F_NOVICE,{
 	mes "[Cita]";
 	if (!getcharid(2)) {
 		mes "^FF0000You have to enter a guild to be able to hit Emperium!^000000";
-	} else if (getgdskilllv(getcharid(2),10013) || 
+	} else if (getgdskilllv(getcharid(2),10013) ||
 	         (getgdskilllv(getcharid(2),10000) +
 	          getgdskilllv(getcharid(2),10001) +
 	          getgdskilllv(getcharid(2),10002) +
@@ -80,7 +80,7 @@ prontera,146,163,6	script	Novice Castles	729,{
 	close;
 }
 
-n_castle,102,107,5	script	Cita	729,{
+n_castle,102,107,5	script	Cita	4_F_NOVICE,{
 	mes "[Cita]";
 	mes "Hello, "+ strcharinfo(0) +". Can I help you?";
 	next;
diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt
index 1e0505ffd..524351661 100644
--- a/npc/events/twintowers.txt
+++ b/npc/events/twintowers.txt
@@ -13,7 +13,7 @@
 //= 1.6 Fixed wrong sprite id on main npc [ultramage]
 //============================================================
 
-prontera,146,92,4	script	Twin Towers#tt1::Twin-Towers	812,{
+prontera,146,92,4	script	Twin Towers#tt1::Twin-Towers	TW_TOWER,{
 	mes "[Twin Towers]";
 	mes "How are you? We are the Twin Towers.";
 	mes "It is such a pleasure to be able to meet you here.";
@@ -32,7 +32,7 @@ prontera,146,92,4	script	Twin Towers#tt1::Twin-Towers	812,{
 	menu "I shall accept your offer.",YES,"I'll ask for your service next time.",NO;
 
 	NO:
-	mes "[Twin Towers]"; 
+	mes "[Twin Towers]";
 	mes "Er, what a pity. Traveling by yourself is still the best evidence of adventure.";
 	mes "Isn't this proving that you are still young?";
 	mes "We respect brave hearts like this";
@@ -84,10 +84,10 @@ prontera,146,92,4	script	Twin Towers#tt1::Twin-Towers	812,{
 			close;
 }
 
-morocc,160,97,4	duplicate(Twin-Towers)	Twin Towers#tt2	812
-payon,176,226,4	duplicate(Twin-Towers)	Twin Towers#tt3	812
-izlude,134,92,4	duplicate(Twin-Towers)	Twin Towers#tt4	812
-alberta,25,238,4	duplicate(Twin-Towers)	Twin Towers#tt5	812
-geffen,120,60,4	duplicate(Twin-Towers)	Twin Towers#tt6	812
-aldebaran,143,116,4	duplicate(Twin-Towers)	Twin Towers#tt7	812
-comodo,194,158,4	duplicate(Twin-Towers)	Twin Towers#tt8	812
+morocc,160,97,4	duplicate(Twin-Towers)	Twin Towers#tt2	TW_TOWER
+payon,176,226,4	duplicate(Twin-Towers)	Twin Towers#tt3	TW_TOWER
+izlude,134,92,4	duplicate(Twin-Towers)	Twin Towers#tt4	TW_TOWER
+alberta,25,238,4	duplicate(Twin-Towers)	Twin Towers#tt5	TW_TOWER
+geffen,120,60,4	duplicate(Twin-Towers)	Twin Towers#tt6	TW_TOWER
+aldebaran,143,116,4	duplicate(Twin-Towers)	Twin Towers#tt7	TW_TOWER
+comodo,194,158,4	duplicate(Twin-Towers)	Twin Towers#tt8	TW_TOWER
diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt
index 8f2bd85d5..5f6289d13 100644
--- a/npc/events/valentinesday.txt
+++ b/npc/events/valentinesday.txt
@@ -15,7 +15,7 @@
 
 // Stephen - Valentine Event Chocolate seller
 //============================================================
-alberta,26,243,4	script	Stephen	58,{
+alberta,26,243,4	script	Stephen	1_M_MERCHANT,{
 	mes "[Stephen]";
 	mes "Guess what I've got?";
 	mes "A tasty treat not easily found in Rune-Midgard....";
@@ -48,7 +48,7 @@ alberta,26,243,4	script	Stephen	58,{
 	if (Zeny < .@i*5000) {
 		mes "I'm sorry, but it seems you can't afford to buy these off me.";
 		close; }
-	set Zeny, Zeny - .@i*5000;
+	Zeny -= .@i*5000;
 	getitem 558,.@i;
 	mes "There you go!";
 	mes "You can give that to someone as a gift, or enjoy it yourself!";
@@ -59,7 +59,7 @@ alberta,26,243,4	script	Stephen	58,{
 
 // Jainie -- Gives information about Valentine Event
 //============================================================
-alberta,29,243,4	script	Jainie	53,{
+alberta,29,243,4	script	Jainie	1_M_INNKEEPER,{
 	mes "[Jainie]";
 	mes "You know what? The chocolate that my boyfriend sells are from me!";
 	mes "I made them by myself.";
@@ -83,7 +83,7 @@ alberta,29,243,4	script	Jainie	53,{
 
 // Carl Orleans -- Valentine Event Chocolate maker
 //============================================================
-prt_castle,54,34,4	script	Carl Orleans	47,{
+prt_castle,54,34,4	script	Carl Orleans	1_M_01,{
 	mes "[Carl Orleans]";
 	mes "Yes?";
 	next;
@@ -126,4 +126,4 @@ prt_castle,54,34,4	script	Carl Orleans	47,{
 	mes "[Carl Orleans]";
 	mes "Enjoy.";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt
index dd09f4470..edb151c6e 100644
--- a/npc/events/valentinesday_2009.txt
+++ b/npc/events/valentinesday_2009.txt
@@ -23,7 +23,7 @@
 
 // Marco Bassinio (Chocolate/Chocolate Box maker)
 //============================================================
-prontera,164,174,4	script	Trader#Val09	58,{
+prontera,164,174,4	script	Trader#Val09	1_M_MERCHANT,{
 	mes "[Marco Bassinio]";
 	mes "Hey, folks! Here's something you don't see everyday!";
 	mes "Something you can never find in Rune-Midgarts!";
@@ -82,7 +82,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 				mes "Maybe you should borrow some zeny from a friend.";
 				mes "Cuz, I'm not gonna be here everyday.";
 				close;
-			}else{
+			} else {
 				mes "[Marco Bassinio]";
 				mes "Good for you!";
 				mes "It's also perfect as a gift!";
@@ -91,7 +91,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 				mes "[Marco Bassinio]";
 				mes "If you want more, you should come back.";
 				mes "Might be a good idea to buy some more while you have a chance...!";
-				set Zeny,Zeny - .@price;
+				Zeny -= .@price;
 				getitem 558,.@input;
 				close;
 			}
@@ -103,7 +103,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 			mes "You also need to pay 500 zeny to carve your name on the box.";
 			mes "Are you all prepared...?";
 			next;
-			if(countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 500) {
+			if (countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 500) {
 				mes "[Marco Bassinio]";
 				mes "Hmm.. Looks like you don't have enough materials to decorate the gift box..";
 				mes "You can't just put your gift into some plain looking box..";
@@ -114,7 +114,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 				mes "Oh, also bring 500 zeny, and don't forget to bring your true loving heart with you!!";
 				close;
 			}
-			if(countitem(558) < 1) {
+			if (countitem(558) < 1) {
 				mes "[Marco Bassinio]";
 				mes "Hey, look, adventurer!";
 				mes "I can't create something right away!";
@@ -140,7 +140,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 			delitem 7175,1;
 			delitem 7174,1;
 			delitem 7948,1;
-			set Zeny,Zeny-500;
+			Zeny -= 500;
 			getnameditem 12744,strcharinfo(0);
 			mes "[Marco Bassinio]";
 			mes "Happy Valentine's Day!";
@@ -160,7 +160,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 
 // Packs Trader (Sells Wrapping Paper, Lace, and Box)
 //============================================================
-prontera,147,171,5	script	Packs Trader#Val09	58,{
+prontera,147,171,5	script	Packs Trader#Val09	1_M_MERCHANT,{
 	mes "[Packs Trader]";
 	mes "Hello.";
 	mes "I am a Packs Trader, I sell paper boxes and supplies for packing presents.";
@@ -202,11 +202,11 @@ prontera,147,171,5	script	Packs Trader#Val09	58,{
 					mes "Please check your wallet.";
 					next;
 					break;
-				}else{
+				} else {
 					mes "[Packs Trader]";
 					mes "Here they are.";
 					mes "Hope it makes your Valentine's Day more pleasing!";
-					set Zeny,Zeny-.@price;
+					Zeny -= .@price;
 					getitem 7175,.@input;
 					next;
 					break;
@@ -243,11 +243,11 @@ prontera,147,171,5	script	Packs Trader#Val09	58,{
 					mes "Please check your wallet.";
 					next;
 					break;
-				}else{
+				} else {
 					mes "[Packs Trader]";
 					mes "Here they are.";
 					mes "Hope it makes your Valentine's Day more pleasing!";
-					set Zeny,Zeny-.@price;
+					Zeny -= .@price;
 					getitem 7174,.@input;
 					next;
 					break;
@@ -284,11 +284,11 @@ prontera,147,171,5	script	Packs Trader#Val09	58,{
 					mes "Please check your wallet.";
 					next;
 					break;
-				}else{
+				} else {
 					mes "[Packs Trader]";
 					mes "Here they are.";
 					mes "Hope it makes your Valentine's Day more pleasing!";
-					set Zeny,Zeny-.@price;
+					Zeny -= .@price;
 					getitem 7948,.@input;
 					next;
 					break;
@@ -304,7 +304,7 @@ prontera,147,171,5	script	Packs Trader#Val09	58,{
 
 // Event Ring Maker (Makes ring for players)
 //============================================================
-prontera,154,185,5	script	Event Ring Maker#Val09	721,{
+prontera,154,185,5	script	Event Ring Maker#Val09	4_F_KAFRA7,{
 	if (BaseLevel < 75) {
 		mes "[Event Ring Maker]";
 		mes "Hello, I only make the Valentine rings to those experienced adventurer Level 75 or above.";
@@ -363,7 +363,7 @@ prontera,154,185,5	script	Event Ring Maker#Val09	721,{
 		mes "Just follow your heart!";
 		close;
 	}
-	if(countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 1000) {
+	if (countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 1000) {
 		mes "[Event Ring Maker]";
 		mes "Well, you don't have enough materials to make a gift box.";
 		mes "Check what you have, and come back later with all the materials.";
@@ -376,11 +376,11 @@ prontera,154,185,5	script	Event Ring Maker#Val09	721,{
 	delitem 7175,1;
 	delitem 7174,1;
 	delitem 7948,1;
-	set Zeny,Zeny-1000;
+	Zeny -= 1000;
 	set iROval09ring,1;
 	if (Sex) {
 		getnameditem 12742,strcharinfo(0);
-	}else{
+	} else {
 		getnameditem 12743,strcharinfo(0);
 	}
 	mes "[Event Ring Maker]";
@@ -398,7 +398,7 @@ prontera,154,185,5	script	Event Ring Maker#Val09	721,{
 
 // Valentine Vote Manager (Registers votes)
 //============================================================
-prontera,157,185,4	script	Valentine Vote Manager#v	113,{
+prontera,157,185,4	script	Valentine Vote Manager#v	4_F_KAFRA5,{
 	mes "[Valentine Vote Manager]";
 	mes "Hello, I'm the Valentine's Vote Manager.";
 	mes "I'm in charge of collecting rings for this event!";
@@ -464,7 +464,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	113,{
 					}
 					next;
 					break;
-				}else{
+				} else {
 					if (countitem(7946) > .@input) {
 						mes "[Valentine Vote Manager]";
 						mes "Seems like the value you entered is too small.";
@@ -519,7 +519,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	113,{
 
 // Charles Orleans (Makes Home-Made Chocolates)
 //============================================================
-prt_castle,42,35,3	script	Dessert Manager#Val09	47,{
+prt_castle,42,35,3	script	Dessert Manager#Val09	1_M_01,{
 	if (Sex) {
 		mes "[Charles Orleans]";
 		mes "Monsieur~! What brings you to my beautiful atelier?";
@@ -552,7 +552,7 @@ prt_castle,42,35,3	script	Dessert Manager#Val09	47,{
 		mes "Please.. I feel like my soul is lost..";
 		close;
 	}
-	if(countitem(558) < 3) {
+	if (countitem(558) < 3) {
 		mes "[Charles Orleans]";
 		mes "Ahhh, Mademoiselle.";
 		mes "I'm not an alchemist, or a magician.";
@@ -590,7 +590,7 @@ prt_castle,42,35,3	script	Dessert Manager#Val09	47,{
 		mes "Adios, Mademoiselle.....";
 		mes "I'll be waiting for you.";
 		close;
-	}else{
+	} else {
 		if (!checkweight(559,1)) {
 			mes "[Charles Orleans]";
 			mes "You're carrying too many items.";
diff --git a/npc/events/valentinesday_2012.txt b/npc/events/valentinesday_2012.txt
index a8597cd22..2d74cb1a5 100644
--- a/npc/events/valentinesday_2012.txt
+++ b/npc/events/valentinesday_2012.txt
@@ -12,7 +12,7 @@
 //= 1.1 Standardized and fixed. [Euphy]
 //============================================================
 
-mosk_in,21,246,5	script	Pinkamenia	71,{
+mosk_in,21,246,5	script	Pinkamenia	1_F_LIBRARYGIRL,{
 	set .@n$,"^0000FF[Pinkamenia]^000000";
 	if (#V_QUE12==3) {
 		set .@LFlowerID,7864;
@@ -104,7 +104,7 @@ OnInit:
 	end;
 }
 
-mosk_in,21,244,3	script	Baker Extraordinaire	410,{
+mosk_in,21,244,3	script	Baker Extraordinaire	4_M_NOVELIST,{
 	set .@n$,"^0000FF[Baker Extraordinaire]^000000";
 	if(#V_QUE12==3) {
 		mes .@n$;
@@ -114,7 +114,7 @@ mosk_in,21,244,3	script	Baker Extraordinaire	410,{
 		mes .@n$;
 		mes "Bring 15 Love Flowers to Pinkamenia!";
 		close;
-	} else if(#V_QUE12==1) { 
+	} else if(#V_QUE12==1) {
 		mes .@n$;
 		if (getequipid(1) == 5024 && getequiprefinerycnt(1) >= 8) {
 			mes "Ah, so Pinkamenia told you";
@@ -153,4 +153,4 @@ mosk_in,21,244,3	script	Baker Extraordinaire	410,{
 		mes "Hello, "+strcharinfo(0)+"!";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt
index d0acc8426..ac76c52a5 100644
--- a/npc/events/whiteday.txt
+++ b/npc/events/whiteday.txt
@@ -11,7 +11,7 @@
 //= Converted to rAthena format by Dr.Evil
 //============================================================
 
-alberta,188,64,4	script	Sugar	91,{
+alberta,188,64,4	script	Sugar	4_F_02,{
 	set @maplenum,0;
 	set @mapleItemID,0;
 	set @maplePrice,0;
@@ -29,7 +29,7 @@ alberta,188,64,4	script	Sugar	91,{
 	mes "heartfelt like";
 	mes "the sweetness of the present some how.";
 	next;
-	menu "Please give me!",-,"I don't need it.",M_END,"The teacher.",M_L1;
+	menu "Please give me!",-,"I don't need it.",M_End,"The teacher.",M_L1;
 
 	mes "[Sugar]";
 	mes "Yes!";
@@ -59,7 +59,7 @@ L0_2:
 	goto L_INPUT;
 L0_3:
 	set @maplePrice,2000;
-	set @mapleItemID,538; 
+	set @mapleItemID,538;
 	mes "[Sugar]";
 	mes "It is a well baked cookie, and the price is";
 	mes "2000 Zeny each.";
@@ -69,10 +69,10 @@ L0_3:
 L_INPUT:
 	input @maplenum;
 	if (@maplenum > 5) goto L_ERROR;
-	if (@maplenum == 0) goto M_END;
+	if (@maplenum == 0) goto M_End;
 	set @maplePriceT,@maplePrice*@maplenum;
 	if (Zeny < @maplePriceT) goto L_ERROR2;
-	set Zeny,Zeny- @maplePriceT;
+	Zeny -= @maplePriceT;
 	getitem @mapleItemID,@maplenum;
 	mes "[Sugar]";
 	mes "Thank you!!!";
@@ -115,7 +115,7 @@ L_ERROR2:
 	mes "I will ask you to check your money first.";
 	close;
 
-M_END:
+M_End:
 	mes "[Sugar]";
 	mes "Really .... You might regret it..";
 	mes "If you change your mind.";
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index 99b3fdec9..d8423dda7 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -20,7 +20,7 @@
 //= 1.4 Added a fix to make Lutie & Bard quests passable during this event [Lupus]
 //============================================================
 
-xmas_in,100,96,4	script	Father Christmas::Santa2	718,{
+xmas_in,100,96,4	script	Santa Claus::Santa2	4_M_SANTA,{
 	mes "[Santa Claus]";
 	if(xmas_npc==0) set xmas_npc, 1; // For Lutie & Bard quest
 	if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start;
@@ -104,7 +104,7 @@ L_Start:
 		close;
 
 OnInit:
-	disablenpc "Santa1";
+	disablenpc "Santa Claus";
 	end;
 }
 
diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt
index 283807a46..de55029fc 100644
--- a/npc/guild/agit_controller.txt
+++ b/npc/guild/agit_controller.txt
@@ -48,7 +48,7 @@ OnAgitInit:
 	   (gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23) ||
 	   (gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) {
 		if (!agitcheck()) {
-			AgitStart;
+			agitstart;
 			callsub S_DisplayOwners;
 		}
 		end;
@@ -57,9 +57,9 @@ OnAgitInit:
 	// end time checks
 	if ((gettime(4)==2) && (gettime(3)==23) ||
 	    (gettime(4)==4) && (gettime(3)==23) ||
-	    (gettime(4)==6) && (gettime(3)==18)) { 
+	    (gettime(4)==6) && (gettime(3)==18)) {
 		if (agitcheck()) {
-			AgitEnd;
+			agitend;
 			callsub S_DisplayOwners;
 		}
 		end;
@@ -72,10 +72,10 @@ S_DisplayOwners:
 	setarray .@maps$[10],"payg_cas01","payg_cas02","payg_cas03","payg_cas04","payg_cas05";
 	setarray .@maps$[15],"prtg_cas01","prtg_cas02","prtg_cas03","prtg_cas04","prtg_cas05";
 	for( set .@i, 0; .@i <= 19; set .@i, .@i+1 ) {
-		if (GetCastleData(.@maps$[.@i],1))
-			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle has been conquered by the [" + GetGuildName(GetCastleData(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe;
+		if (getcastledata(.@maps$[.@i],1))
+			announce "The [" + getcastlename(.@maps$[.@i]) + "] castle has been conquered by the [" + getguildname(getcastledata(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe;
 		else
-			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe;
+			announce "The [" + getcastlename(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe;
 	}
 	end;
 }
diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt
index 5253fbe16..dc799a21f 100644
--- a/npc/guild/agit_main.txt
+++ b/npc/guild/agit_main.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.9a
+//= 2.0
 //===== Description: =========================================
 //= [ Aegis Conversion]
 //= ----------------------------------------------------------
@@ -31,7 +31,7 @@
 //=   treasure chest spawned.
 //===== Additional Comments: =================================
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
-//= 1.1 Daily investement will now be reset. [L0ne_W0lf]
+//= 1.1 Daily investment will now be reset. [L0ne_W0lf]
 //=     Template will no longer try to spawn chests.
 //= 1.2 Fixed Eco Invest option charging twice. [L0ne_W0lf]
 //= 1.3 Fixed a loading flag emblem for Payon 1. [L0ne_W0lf]
@@ -46,10 +46,11 @@
 //= 1.6a Corrected conditions in the new investing blocks. [L0ne_W0lf]
 //= 1.6b Moved where investments are added to eco/def. [L0ne_W0lf]
 //= 1.7 Updated Agitbreak announcements, added bc_woe [L0ne_W0lf]
-//=     and added extended anouncement format for mapannounce.
+//=     and added extended announcement format for mapannounce.
 //= 1.8 Fixed a possible exploit in guild castle investment. [Brian]
 //= 1.9 Partially rewrote Script. [Masao]
 //= 1.9a Fixed incorrect setcastledata parameter. [Euphy]
+//= 2.0 Fixed an issue where Castle Manager couldn't be fired. [Joseph]
 //============================================================
 
 // WoE : Main Functions
@@ -60,8 +61,8 @@
 // War of Emperium has started.
 OnAgitStart:
 	if (strnpcinfo(0) == "Gld_Agit_Manager") end;
-	MapRespawnGuildID strnpcinfo(2),GetCastleData(strnpcinfo(2),1),6;
-	GvgOn strnpcinfo(2);
+	maprespawnguildid strnpcinfo(2),getcastledata(strnpcinfo(2),1),6;
+	gvgon strnpcinfo(2);
 
 // Spawn (fall through), or respawn the Emperium once it has been broken.
 OnStartArena:
@@ -106,31 +107,31 @@ OnAgitBreak:
 		end;
 	}
 	// Adjust Economy Invest Level for Castle
-	set .@Economy,GetCastleData(strnpcinfo(2),2) - 5;
+	set .@Economy,getcastledata(strnpcinfo(2),2) - 5;
 	if (.@Economy < 0) set .@Economy, 0;
-	SetCastleData strnpcinfo(2), 2, .@Economy;
+	setcastledata strnpcinfo(2), 2, .@Economy;
 	// Adjust Defense Invest Level for Castle
-	set .@Defence,GetCastleData(strnpcinfo(2),3) - 5;
-	if (.@Defence < 0) set .@Defence, 0;
-	SetCastleData strnpcinfo(2), 3, .@Defence;
+	set .@defence,getcastledata(strnpcinfo(2),3) - 5;
+	if (.@defence < 0) set .@defence, 0;
+	setcastledata strnpcinfo(2), 3, .@defence;
 
 	// Set new Castle Occupant
-	SetCastleData strnpcinfo(2),1, .@GID;
+	setcastledata strnpcinfo(2),1, .@GID;
 
 	// Announce that the Emperium is destroyed, and respawn all but new castle-occupants.
 	mapannounce strnpcinfo(2),"The emperium has been destroyed.",bc_map|bc_woe,"0x00CCFF",FW_NORMAL,12;
-	MapRespawnGuildID strnpcinfo(2),.@GID,6;
+	maprespawnguildid strnpcinfo(2),.@GID,6;
 
 	// Refresh castle data, disable Kafra and reset Invest information.
 	donpcevent strnpcinfo(0)+"::OnRecvCastle";
 	disablenpc "Kafra Staff#"+strnpcinfo(2);
 	for( set .@i, 4; .@i <= 9; set .@i, .@i+1 ) {
-		SetCastleData strnpcinfo(2), .@i, 0;
+		setcastledata strnpcinfo(2), .@i, 0;
 	}
 	// Erase Guardian Database information if the new owners do not have Guardian Research.
 	if( getgdskilllv(.@GID,10002) == 0 ) {
 		for( set .@i, 10; .@i <= 17; set .@i, .@i+1 ) {
-			SetCastleData strnpcinfo(2), .@i, 0;
+			setcastledata strnpcinfo(2), .@i, 0;
 		}
 	}
 	// Respawn the Emperium, and display new owners.
@@ -138,16 +139,16 @@ OnAgitBreak:
 	if( agitcheck() )
 		donpcevent "Agit#"+strnpcinfo(2)+"::OnStartArena";
 	sleep 7000;
-	announce "The [" + getcastlename(strnpcinfo(2)) + "] castle has been conquered by the [" + getguildName(.@GID) + "] guild.",bc_all|bc_woe;
+	announce "The [" + getcastlename(strnpcinfo(2)) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all|bc_woe;
 	end;
 
 // War of Emperium has ended.
 OnAgitEnd:
 	if (strnpcinfo(0) == "Gld_Agit_Manager") end;
-	GvgOff strnpcinfo(2);
+	gvgoff strnpcinfo(2);
 	// If the castle has no owner at the end of WoE, do not kill Emperium.
-	if (GetCastleData(strnpcinfo(2),1)) {
-		KillMonster strnpcinfo(2),"Agit#"+strnpcinfo(2)+"::OnAgitBreak";
+	if (getcastledata(strnpcinfo(2),1)) {
+		killmonster strnpcinfo(2),"Agit#"+strnpcinfo(2)+"::OnAgitBreak";
 	}
 	end;
 
@@ -157,10 +158,10 @@ OnGuildBreak:
 	// Kill guardians, disable the Kafra, and set owner to 0.
 	killmonster strnpcinfo(2),"Guardian#"+strnpcinfo(2)+"::OnGuardianDied";
 	disablenpc "Kafra Staff#"+strnpcinfo(2);
-	SetCastleData strnpcinfo(2),1,0;
+	setcastledata strnpcinfo(2),1,0;
 	// Wait before refreshing guild information.
 	sleep 7000;
-	Announce "Guild Base [" + GetCastleName(strnpcinfo(2)) + "] has been abandoned.",0;
+	announce "Guild Base [" + getcastlename(strnpcinfo(2)) + "] has been abandoned.",0;
 	donpcevent strnpcinfo(0)+"::OnRecvCastle";
 	end;
 
@@ -168,7 +169,7 @@ OnAgitInit:
 OnRecvCastle:
 	if (strnpcinfo(0) == "Gld_Agit_Manager") end;
 	// Spawn Monsters if the castle is empty.
-	set .@GID, GetCastleData(strnpcinfo(2),1);
+	set .@GID, getcastledata(strnpcinfo(2),1);
 	if (.@GID == 0) {
 		killmonsterall strnpcinfo(2);
 		if (compare(strnpcinfo(2),"aldeg")) {
@@ -306,7 +307,7 @@ OnRecvCastle:
 		// And load purchased Guardian in castles.
 		donpcevent "Guardian#"+strnpcinfo(2)+"::OnSpawnGuardians";
 		// And display Kafra if purchased.
-		if (GetCastleData(strnpcinfo(2),9) < 1) disablenpc "Kafra Staff#"+strnpcinfo(2);
+		if (getcastledata(strnpcinfo(2),9) < 1) disablenpc "Kafra Staff#"+strnpcinfo(2);
 	}
 	end;
 }
@@ -315,7 +316,7 @@ OnRecvCastle:
 //============================================================
 -	script	Kafra Staff#woe::guildkafra	-1,{
 
-	set .@GID,GetCastleData(strnpcinfo(2),1);
+	set .@GID,getcastledata(strnpcinfo(2),1);
 
 	if (compare(strnpcinfo(2),"aldeg")) {
 		setarray .@destination$[0],"Al De Baran","aldebaran";
@@ -341,7 +342,7 @@ OnRecvCastle:
 	cutin "kafra_01",2;
 	if (getcharid(2) == .@GID) {
 		mes "[Kafra Employee]";
-		mes "Welcome. ^ff0000" + GetGuildName(.@GID) + "^000000 Member.";
+		mes "Welcome. ^ff0000" + getguildname(.@GID) + "^000000 Member.";
 		mes "The Kafra Corporation will stay with you wherever you go.";
 		next;
 		switch (select("Use Storage:Use Teleport Service:Rent a Pushcart:Cancel")) {
@@ -382,7 +383,7 @@ OnRecvCastle:
 					cutin "",255;
 					end;
 				}
-				set Zeny, Zeny - 200;
+				Zeny -= 200;
 				set RESRVPTS,RESRVPTS+2;
 				close2;
 				warp .@destination$[1],.@coordinates[0],.@coordinates[1];
@@ -434,7 +435,7 @@ OnRecvCastle:
 					end;
 				}
 				set RESRVPTS,RESRVPTS+8;
-				set Zeny, Zeny - 800;
+				Zeny -= 800;
 				setcart;
 				close2;
 				cutin "",255;
@@ -454,7 +455,7 @@ OnRecvCastle:
 		}
 	}
 	mes "[Kafra Employee]";
-	mes "I am instructed to only offer my services to the ^ff0000"+GetGuildName(.@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience.";
+	mes "I am instructed to only offer my services to the ^ff0000"+getguildname(.@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience.";
 	close2;
 	cutin "",255;
 	end;
@@ -464,7 +465,7 @@ OnRecvCastle:
 //============================================================
 -	script	Castle Manager#cm::cm	-1,{
 
-	set .@GID,GetCastleData(strnpcinfo(2),1);
+	set .@GID,getcastledata(strnpcinfo(2),1);
 
 	// .@guardiantype = Defines the types of guardians per castle basis.
 	// 1 - Soldier Guardian, 2 - Archer Guardian, 3 - Knight Guardian
@@ -473,7 +474,7 @@ OnRecvCastle:
 	// .@guardianposy = Define the y spawn point for each guardian.
 	// [0] = 1st guardian's y spawn point.
 	// .@masterroom = Defines the coordinates of the Treasure Room.
-	if (strnpcinfo(2) == "aldeg_cas01") { 
+	if (strnpcinfo(2) == "aldeg_cas01") {
 		setarray .@guardiantype[0],1,2,2,2,2,3,3,3;
 		setarray .@guardianposx[0],17,39,38,45,21,218,213,73;
 		setarray .@guardianposy[0],218,208,196,228,194,24,24,70;
@@ -607,9 +608,9 @@ OnRecvCastle:
 		mes "Brave soul... fate will guide you towards your future...";
 		close;
 	}
-	if (GetGuildMaster(.@GID) != strcharinfo(0)) {
+	if (getguildmaster(.@GID) != strcharinfo(0)) {
 		mes "["+strnpcinfo(1)+"]";
-		mes "No matter how much you pester me, I'll still follow my master ^ff0000"+GetGuildMaster(.@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!";
+		mes "No matter how much you pester me, I'll still follow my master ^ff0000"+getguildmaster(.@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!";
 		close;
 	}
 	mes "["+strnpcinfo(1)+"]";
@@ -621,19 +622,19 @@ OnRecvCastle:
 		mes "["+strnpcinfo(1)+"]";
 		mes "I will report the Castle briefing, Master.";
 		mes " ";
-		mes "^0000ffNow, the commercial growth level is "+GetCastleData(strnpcinfo(2),2)+".";
-		if (GetCastleData(strnpcinfo(2),4)) {
-			mes " You invested "+GetCastleData(strnpcinfo(2),4)+" times in past 1 day.";
+		mes "^0000ffNow, the commercial growth level is "+getcastledata(strnpcinfo(2),2)+".";
+		if (getcastledata(strnpcinfo(2),4)) {
+			mes " You invested "+getcastledata(strnpcinfo(2),4)+" times in past 1 day.";
 		}
-		mes " Now, the Castle Defense level is "+GetCastleData(strnpcinfo(2),3)+".^000000";
-		if (GetCastleData(strnpcinfo(2),5)) {
-			mes " ^0000ff- You invested "+GetCastleData(strnpcinfo(2),5)+" times in past 1 day.^000000";
+		mes " Now, the Castle Defense level is "+getcastledata(strnpcinfo(2),3)+".^000000";
+		if (getcastledata(strnpcinfo(2),5)) {
+			mes " ^0000ff- You invested "+getcastledata(strnpcinfo(2),5)+" times in past 1 day.^000000";
 		}
 		mes " ";
 		mes "That's all I have to report, Master.";
 		close;
 	case 2:
-		set .@Economy,GetCastleData(strnpcinfo(2),2);
+		set .@Economy,getcastledata(strnpcinfo(2),2);
 		if (.@Economy < 6) { set .@eco_invest,5000; }
 		else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; }
 		else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; }
@@ -655,7 +656,7 @@ OnRecvCastle:
 		else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; }
 		else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; }
 		//Quadruple the cost of investing if you've already invested once.
-		if (GetCastleData(strnpcinfo(2),4)) {
+		if (getcastledata(strnpcinfo(2),4)) {
 			set .@eco_invest,.@eco_invest*4;
 		}
 		mes "["+strnpcinfo(1)+"]";
@@ -667,12 +668,12 @@ OnRecvCastle:
 			mes "^ff0000The commercial growth level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great economist like you, Master.^000000";
 			close;
 		}
-		if (GetCastleData(strnpcinfo(2),4) >= 2) {
+		if (getcastledata(strnpcinfo(2),4) >= 2) {
 			mes " ";
 			mes "^ff0000You have already invested twice today. You cannot invest any more.^000000 I expect riches of the guild to grow at a high rate.";
 			close;
 		}
-		if (GetCastleData(strnpcinfo(2),4) == 0) {
+		if (getcastledata(strnpcinfo(2),4) == 0) {
 			mes " ";
 			mes "The current investment amount required is ^ff0000"+.@eco_invest+"^000000 zeny. Will you invest?";
 		}
@@ -688,8 +689,8 @@ OnRecvCastle:
 				mes "I'm sorry but there is not enough zeny to invest. You will have to try again when you have the funds, Master.";
 				close;
 			}
-			set Zeny, Zeny - .@eco_invest;
-			SetCastleData strnpcinfo(2),4,GetCastleData(strnpcinfo(2),4)+1;
+			Zeny -= .@eco_invest;
+			setcastledata strnpcinfo(2),4,getcastledata(strnpcinfo(2),4)+1;
 			mes "[ "+strnpcinfo(1)+"]";
 			mes "We finished the investment safely. I expect that our growth level will be increased by tomorrow.";
 			close;
@@ -699,46 +700,46 @@ OnRecvCastle:
 			close;
 		}
 	case 3:
-		set .@Defence,GetCastleData(strnpcinfo(2),3);
-		if (.@Defence < 6) { set .@def_invest,10000; }
-		else if ((.@Defence >= 6) && (.@Defence <= 10)) { set .@def_invest,20000; }
-		else if ((.@Defence >= 11) && (.@Defence <= 15)) { set .@def_invest,40000; }
-		else if ((.@Defence >= 16) && (.@Defence <= 20)) { set .@def_invest,70000; }
-		else if ((.@Defence >= 21) && (.@Defence <= 25)) { set .@def_invest,110000; }
-		else if ((.@Defence >= 26) && (.@Defence <= 30)) { set .@def_invest,160000; }
-		else if ((.@Defence >= 31) && (.@Defence <= 35)) { set .@def_invest,220000; }
-		else if ((.@Defence >= 36) && (.@Defence <= 40)) { set .@def_invest,290000; }
-		else if ((.@Defence >= 41) && (.@Defence <= 45)) { set .@def_invest,370000; }
-		else if ((.@Defence >= 46) && (.@Defence <= 50)) { set .@def_invest,460000; }
-		else if ((.@Defence >= 51) && (.@Defence <= 55)) { set .@def_invest,560000; }
-		else if ((.@Defence >= 56) && (.@Defence <= 60)) { set .@def_invest,670000; }
-		else if ((.@Defence >= 61) && (.@Defence <= 65)) { set .@def_invest,790000; }
-		else if ((.@Defence >= 66) && (.@Defence <= 70)) { set .@def_invest,920000; }
-		else if ((.@Defence >= 71) && (.@Defence <= 75)) { set .@def_invest,1060000; }
-		else if ((.@Defence >= 76) && (.@Defence <= 80)) { set .@def_invest,1210000; }
-		else if ((.@Defence >= 81) && (.@Defence <= 85)) { set .@def_invest,1370000; }
-		else if ((.@Defence >= 86) && (.@Defence <= 90)) { set .@def_invest,1540000; }
-		else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; }
-		else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; }
+		set .@defence,getcastledata(strnpcinfo(2),3);
+		if (.@defence < 6) { set .@def_invest,10000; }
+		else if ((.@defence >= 6) && (.@defence <= 10)) { set .@def_invest,20000; }
+		else if ((.@defence >= 11) && (.@defence <= 15)) { set .@def_invest,40000; }
+		else if ((.@defence >= 16) && (.@defence <= 20)) { set .@def_invest,70000; }
+		else if ((.@defence >= 21) && (.@defence <= 25)) { set .@def_invest,110000; }
+		else if ((.@defence >= 26) && (.@defence <= 30)) { set .@def_invest,160000; }
+		else if ((.@defence >= 31) && (.@defence <= 35)) { set .@def_invest,220000; }
+		else if ((.@defence >= 36) && (.@defence <= 40)) { set .@def_invest,290000; }
+		else if ((.@defence >= 41) && (.@defence <= 45)) { set .@def_invest,370000; }
+		else if ((.@defence >= 46) && (.@defence <= 50)) { set .@def_invest,460000; }
+		else if ((.@defence >= 51) && (.@defence <= 55)) { set .@def_invest,560000; }
+		else if ((.@defence >= 56) && (.@defence <= 60)) { set .@def_invest,670000; }
+		else if ((.@defence >= 61) && (.@defence <= 65)) { set .@def_invest,790000; }
+		else if ((.@defence >= 66) && (.@defence <= 70)) { set .@def_invest,920000; }
+		else if ((.@defence >= 71) && (.@defence <= 75)) { set .@def_invest,1060000; }
+		else if ((.@defence >= 76) && (.@defence <= 80)) { set .@def_invest,1210000; }
+		else if ((.@defence >= 81) && (.@defence <= 85)) { set .@def_invest,1370000; }
+		else if ((.@defence >= 86) && (.@defence <= 90)) { set .@def_invest,1540000; }
+		else if ((.@defence >= 91) && (.@defence <= 95)) { set .@def_invest,1720000; }
+		else if ((.@defence >= 96) && (.@defence <= 100)) { set .@def_invest,1910000; }
 		//Quadruple the cost of investing if you've already invested once.
-		if (GetCastleData(strnpcinfo(2),5)) {
+		if (getcastledata(strnpcinfo(2),5)) {
 			set .@def_invest,.@def_invest*4;
 		}
 		mes "["+strnpcinfo(1)+"]";
 		mes "If you raise Castle Defenses, the durability of Guardians and the Emperium will increase. Therefore, if you consider our coming battles, some investment in this area will be required.";
 		mes " ";
 		mes "Originally you can invest just once but if you pay more money, you can invest twice.";
-		if (.@Defence >= 100) {
+		if (.@defence >= 100) {
 			mes " ";
 			mes "^ff0000But the Castle Defense level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great strategist like you, Master.^000000";
 			close;
 		}
-		if (GetCastleData(strnpcinfo(2),5) >= 2) {
+		if (getcastledata(strnpcinfo(2),5) >= 2) {
 			mes " ";
 			mes "^ff0000You have already invested twice today. You cannot invest any more.^000000 I expect the Defenses of the guild to grow at a high rate.";
 			close;
 		}
-		if (GetCastleData(strnpcinfo(2),5) == 0) {
+		if (getcastledata(strnpcinfo(2),5) == 0) {
 			mes " ";
 			mes "The current investment amount required is ^ff0000"+.@def_invest+"^000000 zeny. Will you invest?";
 		}
@@ -754,8 +755,8 @@ OnRecvCastle:
 				mes "I'm sorry but there is not enough zeny to invest. You will have to try again when you have the funds, Master.";
 				close;
 			}
-			set Zeny, Zeny - .@def_invest;
-			SetCastleData strnpcinfo(2),5,GetCastleData(strnpcinfo(2),5)+1;
+			Zeny -= .@def_invest;
+			setcastledata strnpcinfo(2),5,getcastledata(strnpcinfo(2),5)+1;
 			mes "[ "+strnpcinfo(1)+"]";
 			mes "We finished the investment safely. I expect that our Castle Defense level will be increased by tomorrow.";
 			close;
@@ -792,7 +793,7 @@ OnRecvCastle:
 				mes "Master, we have not the resources to Summon the Guardian. If you want to accumulate them, you have to learn the Guild skill. We failed to summon the Guardian.";
 				close;
 			}
-			if (GetCastleData(strnpcinfo(2),.@GDnum) == 1) {
+			if (getcastledata(strnpcinfo(2),.@GDnum) == 1) {
 				mes "["+strnpcinfo(1)+"]";
 				mes "Master, you already have summoned that Guardian. We cannot summon another.";
 				close;
@@ -802,8 +803,8 @@ OnRecvCastle:
 				mes "Well... I'm sorry but we don't have funds to summon the Guardian. We failed to summon the Guardian.";
 				close;
 			}
-			set Zeny, Zeny - 10000;
-			SetCastleData strnpcinfo(2),.@GDnum,1; // mark as 'installed'
+			Zeny -= 10000;
+			setcastledata strnpcinfo(2),.@GDnum,1; // mark as 'installed'
 			set .@UseGID,.@GDnum - 10;
 			if (.@guardiantype[.@UseGID] == 1) { set .@type,1287; }
 			else if (.@guardiantype[.@UseGID] == 2) { set .@type,1285; }
@@ -818,7 +819,7 @@ OnRecvCastle:
 			close;
 		}
 	case 5:
-		if (GetCastleData(strnpcinfo(2),9) == 1) {
+		if (getcastledata(strnpcinfo(2),9) == 1) {
 			mes "["+strnpcinfo(1)+"]";
 			mes "We are currently hiring a Kafra Employee... Do you want to fire the Kafra Employee?";
 			next;
@@ -834,19 +835,20 @@ OnRecvCastle:
 					mes "Oh, my goodness! This is nonsense!";
 					next;
 					cutin "",255;
-					close;
+					break;
 				case 2:
 					mes "[ Hired Kafra Employee ]";
 					mes "I'll work hard for you... Thank you!";
 					close;
 				}
+				break;
 			case 2:
 				mes "["+strnpcinfo(1)+"]";
 				mes "She worked hard in my opinion. It was a good decision to keep her.";
 				close;
 			}
 			disablenpc "Kafra Staff#"+strnpcinfo(2);
-			SetCastleData strnpcinfo(2),9,0;
+			setcastledata strnpcinfo(2),9,0;
 			mes "["+strnpcinfo(1)+"]";
 			mes "....";
 			mes "I have discharged the Kafra Employee... But... are you unsatisfied with something?";
@@ -868,9 +870,9 @@ OnRecvCastle:
 				mes "Well... I'm sorry but we don't have enough funds to hire a Kafra Employee.";
 				close;
 			}
-			set Zeny, Zeny - 10000;
+			Zeny -= 10000;
 			enablenpc "Kafra Staff#"+strnpcinfo(2);
-			SetCastleData strnpcinfo(2),9,1;
+			setcastledata strnpcinfo(2),9,1;
 			mes "["+strnpcinfo(1)+"]";
 			mes "We obtained a contract with the kafra Main Office, and hired a Kafra Employee.";
 			next;
@@ -915,7 +917,7 @@ OnRecvCastle:
 //============================================================
 -	script	Lever#gd::gdlever	-1,{
 
-	set .@GID,GetCastleData(strnpcinfo(2),1);
+	set .@GID,getcastledata(strnpcinfo(2),1);
 
 	if (.@GID == 0) {
 		mes "[Ringing Voice]";
@@ -993,7 +995,7 @@ OnSpawnGuardians:
 	// Define the y spawn point for each uardian.
 	// [0] = 1st guardian's y spawn point.
 	// Aldebaran (Luina) Castles
-	if (strnpcinfo(2) == "aldeg_cas01") { 
+	if (strnpcinfo(2) == "aldeg_cas01") {
 		setarray .@guardiantype[0],1,2,2,2,2,3,3,3;
 		setarray .@guardianposx[0],17,39,38,45,21,218,213,73;
 		setarray .@guardianposy[0],218,208,196,228,194,24,24,70;
@@ -1110,7 +1112,7 @@ OnSpawnGuardians:
 		if (.@guardiantype[.@i] == 1) { set .@type,1287; }
 		else if (.@guardiantype[.@i] == 2) { set .@type,1285; }
 		else { set .@type,1286; }
-		if (GetCastleData(strnpcinfo(2),.@UseGID)) {
+		if (getcastledata(strnpcinfo(2),.@UseGID)) {
 			guardian strnpcinfo(2),.@guardianposx[.@i],.@guardianposy[.@i],strmobinfo(2,.@type),.@type,"Guardian#"+strnpcinfo(2)+"::OnGuardianDied",.@i;
 		}
 	}
@@ -1129,111 +1131,111 @@ OnClock0001:
 	// Do nothing if this script is the template.
 	if (strnpcinfo(1) == "Gld_Trea_Spawn") end;
 	
-	set .@GID, GetCastleData(strnpcinfo(2),1);
+	set .@GID, getcastledata(strnpcinfo(2),1);
 	
 	// If there is no owner, do nothing.
 	if (!.@GID) end;
 
 	// Is there Economy in this castle?
-	set .@Treasure,GetCastleData(strnpcinfo(2),2)/5+4;
+	set .@Treasure,getcastledata(strnpcinfo(2),2)/5+4;
 
 	// Set information
-	if (strnpcinfo(2) == "aldeg_cas01") { 
+	if (strnpcinfo(2) == "aldeg_cas01") {
 		set .@treasurebox,1324;
 		setarray .@treasurex[0],115,122,115,122,116,117,118,119,120,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116;
 		setarray .@treasurey[0],226,226,219,219,225,225,225,225,225,225,224,223,222,221,220,220,220,220,220,220,221,222,223,224;
 	}
-	else if (strnpcinfo(2) == "aldeg_cas02") { 
+	else if (strnpcinfo(2) == "aldeg_cas02") {
 		set .@treasurebox,1326;
 		setarray .@treasurex[0],134,135,135,134,132,133,134,135,136,137,137,137,137,137,137,136,135,134,133,132,132,132,132,132;
 		setarray .@treasurey[0],231,231,230,230,233,233,233,233,233,233,232,231,230,229,228,228,228,228,228,228,229,230,231,232;
 	}
-	else if (strnpcinfo(2) == "aldeg_cas03") { 
+	else if (strnpcinfo(2) == "aldeg_cas03") {
 		set .@treasurebox,1328;
 		setarray .@treasurex[0],224,225,225,224,222,223,224,225,226,227,227,227,227,227,227,226,225,224,223,222,222,222,222,222;
 		setarray .@treasurey[0],269,269,268,268,271,271,271,271,271,271,270,269,268,267,266,266,266,266,266,266,267,268,269,270;
 	}
-	else if (strnpcinfo(2) == "aldeg_cas04") { 
+	else if (strnpcinfo(2) == "aldeg_cas04") {
 		set .@treasurebox,1330;
 		setarray .@treasurex[0],84,85,85,84,82,83,84,85,86,87,87,87,87,87,87,86,85,84,83,82,82,82,82,82;
 		setarray .@treasurey[0],13,13,12,12,15,15,15,15,15,15,14,13,12,11,10,10,10,10,10,10,11,12,13,14;
 	}
-	else if (strnpcinfo(2) == "aldeg_cas05") { 
+	else if (strnpcinfo(2) == "aldeg_cas05") {
 		set .@treasurebox,1332;
 		setarray .@treasurex[0],61,62,62,61,59,60,61,62,63,64,64,64,64,64,64,63,62,61,60,59,59,59,59,59;
 		setarray .@treasurey[0],12,12,11,11,14,14,14,14,14,14,13,12,11,10,9,9,9,9,9,9,10,11,12,13;
 	}
-	else if (strnpcinfo(2) == "gefg_cas01") { 
+	else if (strnpcinfo(2) == "gefg_cas01") {
 		set .@treasurebox,1334;
 		setarray .@treasurex[0],153,154,154,153,151,152,153,154,155,156,156,156,156,156,156,155,154,153,152,151,151,151,151,151;
 		setarray .@treasurey[0],113,113,112,112,115,115,115,115,115,115,114,113,112,111,110,110,110,110,110,110,111,112,113,114;
 	}
-	else if (strnpcinfo(2) == "gefg_cas02") { 
+	else if (strnpcinfo(2) == "gefg_cas02") {
 		set .@treasurebox,1336;
 		setarray .@treasurex[0],139,140,140,139,137,138,139,140,141,142,142,142,142,142,142,141,140,139,138,137,137,137,137,137;
 		setarray .@treasurey[0],115,115,114,114,117,117,117,117,117,117,116,115,114,113,112,112,112,112,112,112,113,114,115,116;
 	}
-	else if (strnpcinfo(2) == "gefg_cas03") { 
+	else if (strnpcinfo(2) == "gefg_cas03") {
 		set .@treasurebox,1338;
 		setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267;
 		setarray .@treasurey[0],291,291,290,290,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288,288,289,290,291,292;
 	}
-	else if (strnpcinfo(2) == "gefg_cas04") { 
+	else if (strnpcinfo(2) == "gefg_cas04") {
 		set .@treasurebox,1340;
 		setarray .@treasurex[0],115,116,116,115,113,114,115,116,117,118,118,118,118,118,118,117,116,115,114,113,113,113,113,113;
 		setarray .@treasurey[0],119,119,118,118,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116,116,117,118,119,120;
 	}
-	else if (strnpcinfo(2) == "gefg_cas05") { 
+	else if (strnpcinfo(2) == "gefg_cas05") {
 		set .@treasurebox,1342;
 		setarray .@treasurex[0],143,144,144,143,141,142,143,144,145,146,146,146,146,146,146,145,144,143,142,141,141,141,141,141;
 		setarray .@treasurey[0],110,110,109,109,112,112,112,112,112,112,111,110,109,108,107,107,107,107,107,107,108,109,110,111;
 	}
-	else if (strnpcinfo(2) == "payg_cas01") { 
+	else if (strnpcinfo(2) == "payg_cas01") {
 		set .@treasurebox,1344;
 		setarray .@treasurex[0],289,292,292,289,288,289,290,291,292,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288;
 		setarray .@treasurey[0],10,10,7,7,11,11,11,11,11,11,10,9,8,7,6,6,6,6,6,6,7,8,9,10;
 	}
-	else if (strnpcinfo(2) == "payg_cas02") { 
+	else if (strnpcinfo(2) == "payg_cas02") {
 		set .@treasurebox,1346;
 		setarray .@treasurex[0],143,146,146,143,142,143,144,145,146,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142;
 		setarray .@treasurey[0],146,146,143,143,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142,142,143,144,145,146;
 	}
-	else if (strnpcinfo(2) == "payg_cas03") { 
+	else if (strnpcinfo(2) == "payg_cas03") {
 		set .@treasurebox,1348;
 		setarray .@treasurex[0],158,159,159,158,156,157,158,159,160,161,161,161,161,161,161,160,159,158,157,156,156,156,156,156;
 		setarray .@treasurey[0],169,169,168,168,171,171,171,171,171,171,170,169,168,167,166,166,166,166,166,166,167,168,169,170;
 	}
-	else if (strnpcinfo(2) == "payg_cas04") { 
+	else if (strnpcinfo(2) == "payg_cas04") {
 		set .@treasurebox,1350;
 		setarray .@treasurex[0],146,147,147,146,144,145,146,147,148,149,149,149,149,149,149,148,147,146,145,144,144,144,144,144;
 		setarray .@treasurey[0],48,48,47,47,50,50,50,50,50,50,49,48,47,46,45,45,45,45,45,45,46,47,48,49;
 	}
-	else if (strnpcinfo(2) == "payg_cas05") { 
+	else if (strnpcinfo(2) == "payg_cas05") {
 		set .@treasurebox,1352;
 		setarray .@treasurex[0],155,158,158,155,154,155,156,157,158,159,159,159,159,159,159,158,157,156,155,154,154,154,154,154;
 		setarray .@treasurey[0],134,134,131,131,135,135,135,135,135,135,134,133,132,131,130,130,130,130,130,130,131,132,133,134;
 	}
-	else if (strnpcinfo(2) == "prtg_cas01") { 
+	else if (strnpcinfo(2) == "prtg_cas01") {
 		set .@treasurebox,1354;
 		setarray .@treasurex[0],10,11,11,10,8,9,10,11,12,13,13,13,13,13,13,12,11,10,9,8,8,8,8,8;
 		setarray .@treasurey[0],209,209,208,208,211,211,211,211,211,211,210,209,208,207,206,206,206,206,206,206,207,208,209,210;
 	}
-	else if (strnpcinfo(2) == "prtg_cas02") { 
+	else if (strnpcinfo(2) == "prtg_cas02") {
 		set .@treasurebox,1356;
 		setarray .@treasurex[0],201,202,202,201,199,200,201,202,203,204,204,204,204,204,204,203,202,201,200,199,199,199,199,199;
 		setarray .@treasurey[0],228,228,227,227,230,230,230,230,230,230,229,228,227,226,225,225,225,225,225,225,226,227,228,229;
 	}
-	else if (strnpcinfo(2) == "prtg_cas03") { 
+	else if (strnpcinfo(2) == "prtg_cas03") {
 		set .@treasurebox,1358;
 		setarray .@treasurex[0],187,188,188,187,185,186,187,188,189,190,190,190,190,190,190,189,188,187,186,185,185,185,185,185;
 		setarray .@treasurey[0],132,132,131,131,134,134,134,134,134,134,133,132,131,130,129,129,129,129,129,129,130,131,132,133;
 	}
-	else if (strnpcinfo(2) == "prtg_cas04") { 
+	else if (strnpcinfo(2) == "prtg_cas04") {
 		set .@treasurebox,1360;
 		setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267;
 		setarray .@treasurey[0],162,162,161,161,164,164,164,164,164,164,163,162,161,160,159,159,159,159,159,159,160,161,162,163;
 	}
-	else if (strnpcinfo(2) == "prtg_cas05") { 
+	else if (strnpcinfo(2) == "prtg_cas05") {
 		set .@treasurebox,1362;
 		setarray .@treasurex[0],275,276,276,275,273,274,275,276,277,278,278,278,278,278,278,277,276,275,274,273,273,273,273,273;
 		setarray .@treasurey[0],178,178,177,177,180,180,180,180,180,180,179,178,177,176,175,175,175,175,175,175,176,177,178,179;
@@ -1245,15 +1247,15 @@ OnClock0001:
 
 	// Apply investment to Eco. and Def. Only happens if there were investments made.
 	// Permanent Development can only happen once per day.
-	if (GetCastleData(strnpcinfo(2),4)) {
-		set .@Economy,GetCastleData(strnpcinfo(2),2);
-		SetCastleData strnpcinfo(2),2,.@Economy + GetCastleData(strnpcinfo(2),4) + (rand(2) && getgdskilllv(.@GID,10014));
-		if (GetCastleData(strnpcinfo(2),2) > 100) SetCastleData strnpcinfo(2),2,100;
-	}
-	if (GetCastleData(strnpcinfo(2),5)) {
-		set .@Defence,GetCastleData(strnpcinfo(2),3);
-		SetCastleData strnpcinfo(2),3,.@Defence + GetCastleData(strnpcinfo(2),5);
-		if (GetCastleData(strnpcinfo(2),3) > 100) SetCastleData strnpcinfo(2),3,100;
+	if (getcastledata(strnpcinfo(2),4)) {
+		set .@Economy,getcastledata(strnpcinfo(2),2);
+		setcastledata strnpcinfo(2),2,.@Economy + getcastledata(strnpcinfo(2),4) + (rand(2) && getgdskilllv(.@GID,10014));
+		if (getcastledata(strnpcinfo(2),2) > 100) setcastledata strnpcinfo(2),2,100;
+	}
+	if (getcastledata(strnpcinfo(2),5)) {
+		set .@defence,getcastledata(strnpcinfo(2),3);
+		setcastledata strnpcinfo(2),3,.@defence + getcastledata(strnpcinfo(2),5);
+		if (getcastledata(strnpcinfo(2),3) > 100) setcastledata strnpcinfo(2),3,100;
 	}
 	// Reset daily investment limits.
 	setcastledata strnpcinfo(2),4,0;
diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt
index 0707d4725..82b09d608 100644
--- a/npc/guild/aldeg_cas01.txt
+++ b/npc/guild/aldeg_cas01.txt
@@ -14,9 +14,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Neuschwanstein#1::OutsideFlagsA1	722,{
+-	script	Neuschwanstein#1::OutsideFlagsA1	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas01",1);
+	set .@GID, getcastledata("aldeg_cas01",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas01",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas01",1)) {
 				warp "aldeg_cas01",218,170;
 				end;
 			}
@@ -51,68 +51,68 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleA01:
-	FlagEmblem GetCastleData("aldeg_cas01",1);
+	flagemblem getcastledata("aldeg_cas01",1);
 	end;
 }
 
-alde_gld,61,87,6	duplicate(OutsideFlagsA1)	Neuschwanstein#1-2	722
-alde_gld,61,79,6	duplicate(OutsideFlagsA1)	Neuschwanstein#2	722
-alde_gld,45,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#3	722
-alde_gld,51,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#4	722
+alde_gld,61,87,6	duplicate(OutsideFlagsA1)	Neuschwanstein#1-2	GUILD_FLAG
+alde_gld,61,79,6	duplicate(OutsideFlagsA1)	Neuschwanstein#2	GUILD_FLAG
+alde_gld,45,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#3	GUILD_FLAG
+alde_gld,51,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Neuschwanstein#5::InsideFlagsA1	722,{
+-	script	Neuschwanstein#5::InsideFlagsA1	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA01:
-	FlagEmblem GetCastleData("aldeg_cas01",1);
+	flagemblem getcastledata("aldeg_cas01",1);
 	end;
 }
 
-aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#5-2	722
-aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#6	722
-aldeg_cas01,37,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#7	722
-aldeg_cas01,37,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#8	722
-aldeg_cas01,30,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#9	722
-aldeg_cas01,95,80,2	duplicate(InsideFlagsA1)	Neuschwanstein#10	722
-aldeg_cas01,95,59,2	duplicate(InsideFlagsA1)	Neuschwanstein#11	722
-aldeg_cas01,62,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#12	722
-aldeg_cas01,66,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#13	722
-aldeg_cas01,70,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#14	722
-aldeg_cas01,74,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#15	722
-aldeg_cas01,62,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#16	722
-aldeg_cas01,66,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#17	722
-aldeg_cas01,70,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#18	722
-aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#19	722
-aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#20	722
-aldeg_cas01,203,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#21	722
-aldeg_cas01,210,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#22	722
+aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#5-2	GUILD_FLAG
+aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#6	GUILD_FLAG
+aldeg_cas01,37,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#7	GUILD_FLAG
+aldeg_cas01,37,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#8	GUILD_FLAG
+aldeg_cas01,30,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#9	GUILD_FLAG
+aldeg_cas01,95,80,2	duplicate(InsideFlagsA1)	Neuschwanstein#10	GUILD_FLAG
+aldeg_cas01,95,59,2	duplicate(InsideFlagsA1)	Neuschwanstein#11	GUILD_FLAG
+aldeg_cas01,62,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#12	GUILD_FLAG
+aldeg_cas01,66,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#13	GUILD_FLAG
+aldeg_cas01,70,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#14	GUILD_FLAG
+aldeg_cas01,74,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#15	GUILD_FLAG
+aldeg_cas01,62,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#16	GUILD_FLAG
+aldeg_cas01,66,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#17	GUILD_FLAG
+aldeg_cas01,70,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#18	GUILD_FLAG
+aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#19	GUILD_FLAG
+aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#20	GUILD_FLAG
+aldeg_cas01,203,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#21	GUILD_FLAG
+aldeg_cas01,210,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#22	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,152,97,4	duplicate(InsideFlagsA1)	Neuschwanstein#23	722
+aldebaran,152,97,4	duplicate(InsideFlagsA1)	Neuschwanstein#23	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas01,218,170,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas01	117
+aldeg_cas01,218,170,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas01	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas01,218,175,0	duplicate(cm)	Alfredo#aldeg_cas01	55
+aldeg_cas01,218,175,0	duplicate(cm)	Alfredo#aldeg_cas01	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-aldeg_cas01,123,223,0	script	#lever_A01	111,{
+aldeg_cas01,123,223,0	script	#lever_A01	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -127,7 +127,7 @@ aldeg_cas01,123,223,0	script	#lever_A01	111,{
 
 // Guild Dungeon Switch
 //============================================================
-aldeg_cas01,211,181,0	duplicate(gdlever)	#aldeg_cas01	111
+aldeg_cas01,211,181,0	duplicate(gdlever)	#aldeg_cas01	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt
index 06371f14d..fe98f22a8 100644
--- a/npc/guild/aldeg_cas02.txt
+++ b/npc/guild/aldeg_cas02.txt
@@ -14,9 +14,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Hohenschwangau#1::OutsideFlagsA2	722,{
+-	script	Hohenschwangau#1::OutsideFlagsA2	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas02",1);
+	set .@GID, getcastledata("aldeg_cas02",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas02",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas02",1)) {
 				warp "aldeg_cas02",220,190;
 				end;
 			}
@@ -51,62 +51,62 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleA02:
-	FlagEmblem GetCastleData("aldeg_cas02",1);
+	flagemblem getcastledata("aldeg_cas02",1);
 	end;
 }
 
-alde_gld,99,251,4	duplicate(OutsideFlagsA2)	Hohenschwangau#1-2	722
-alde_gld,99,244,4	duplicate(OutsideFlagsA2)	Hohenschwangau#2	722
+alde_gld,99,251,4	duplicate(OutsideFlagsA2)	Hohenschwangau#1-2	GUILD_FLAG
+alde_gld,99,244,4	duplicate(OutsideFlagsA2)	Hohenschwangau#2	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Hohenschwangau#3::InsideFlagsA2	722,{
+-	script	Hohenschwangau#3::InsideFlagsA2	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA02:
-	FlagEmblem GetCastleData("aldeg_cas02",1);
+	flagemblem getcastledata("aldeg_cas02",1);
 	end;
 }
 
-aldeg_cas02,82,71,2	duplicate(InsideFlagsA2)	Hohenschwangau#3-2	722
-aldeg_cas02,67,30,2	duplicate(InsideFlagsA2)	Hohenschwangau#4	722
-aldeg_cas02,183,140,2	duplicate(InsideFlagsA2)	Hohenschwangau#5	722
-aldeg_cas02,212,152,2	duplicate(InsideFlagsA2)	Hohenschwangau#6	722
-aldeg_cas02,108,39,2	duplicate(InsideFlagsA2)	Hohenschwangau#7	722
-aldeg_cas02,57,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#8	722
-aldeg_cas02,103,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#9	722
-aldeg_cas02,73,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#10	722
-aldeg_cas02,63,41,2	duplicate(InsideFlagsA2)	Hohenschwangau#11	722
-aldeg_cas02,229,6,2	duplicate(InsideFlagsA2)	Hohenschwangau#12	722
-aldeg_cas02,230,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#13	722
-aldeg_cas02,197,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#14	722
-aldeg_cas02,32,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#15	722
-aldeg_cas02,121,29,2	duplicate(InsideFlagsA2)	Hohenschwangau#16	722
+aldeg_cas02,82,71,2	duplicate(InsideFlagsA2)	Hohenschwangau#3-2	GUILD_FLAG
+aldeg_cas02,67,30,2	duplicate(InsideFlagsA2)	Hohenschwangau#4	GUILD_FLAG
+aldeg_cas02,183,140,2	duplicate(InsideFlagsA2)	Hohenschwangau#5	GUILD_FLAG
+aldeg_cas02,212,152,2	duplicate(InsideFlagsA2)	Hohenschwangau#6	GUILD_FLAG
+aldeg_cas02,108,39,2	duplicate(InsideFlagsA2)	Hohenschwangau#7	GUILD_FLAG
+aldeg_cas02,57,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#8	GUILD_FLAG
+aldeg_cas02,103,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#9	GUILD_FLAG
+aldeg_cas02,73,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#10	GUILD_FLAG
+aldeg_cas02,63,41,2	duplicate(InsideFlagsA2)	Hohenschwangau#11	GUILD_FLAG
+aldeg_cas02,229,6,2	duplicate(InsideFlagsA2)	Hohenschwangau#12	GUILD_FLAG
+aldeg_cas02,230,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#13	GUILD_FLAG
+aldeg_cas02,197,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#14	GUILD_FLAG
+aldeg_cas02,32,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#15	GUILD_FLAG
+aldeg_cas02,121,29,2	duplicate(InsideFlagsA2)	Hohenschwangau#16	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,149,97,4	duplicate(InsideFlagsA2)	Hohenschwangau#17	722
+aldebaran,149,97,4	duplicate(InsideFlagsA2)	Hohenschwangau#17	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas02,84,74,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas02	117
+aldeg_cas02,84,74,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas02	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas02,78,74,0	duplicate(cm)	Chenchenlie#aldeg_cas02	55
+aldeg_cas02,78,74,0	duplicate(cm)	Chenchenlie#aldeg_cas02	1_M_JOBTESTER
 
 // Treasure Room Lever
 //============================================================
-aldeg_cas02,139,234,0	script	#lever_A02	111,{
+aldeg_cas02,139,234,0	script	#lever_A02	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ aldeg_cas02,139,234,0	script	#lever_A02	111,{
 
 // Guild Dungeon Lever
 //============================================================
-aldeg_cas02,194,136,0	duplicate(gdlever)	#aldeg_cas02	111
+aldeg_cas02,194,136,0	duplicate(gdlever)	#aldeg_cas02	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt
index 299ffdadc..d5aa3535c 100644
--- a/npc/guild/aldeg_cas03.txt
+++ b/npc/guild/aldeg_cas03.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Nuernberg#1::OutsideFlagsA3	722,{
+-	script	Nuernberg#1::OutsideFlagsA3	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas03",1);
+	set .@GID, getcastledata("aldeg_cas03",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas03",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas03",1)) {
 				warp "aldeg_cas03",205,186;
 				end;
 			}
@@ -51,65 +51,65 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleA03:
-	FlagEmblem GetCastleData("aldeg_cas03",1);
+	flagemblem getcastledata("aldeg_cas03",1);
 	end;
 }
 
-alde_gld,146,82,8	duplicate(OutsideFlagsA3)	Nuernberg#1-2	722
-alde_gld,138,82,8	duplicate(OutsideFlagsA3)	Nuernberg#2	722
+alde_gld,146,82,8	duplicate(OutsideFlagsA3)	Nuernberg#1-2	GUILD_FLAG
+alde_gld,138,82,8	duplicate(OutsideFlagsA3)	Nuernberg#2	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Nuernberg#3::InsideFlagsA3	722,{
+-	script	Nuernberg#3::InsideFlagsA3	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA03:
-	FlagEmblem GetCastleData("aldeg_cas03",1);
+	flagemblem getcastledata("aldeg_cas03",1);
 	end;
 }
 
-aldeg_cas03,176,175,2	duplicate(InsideFlagsA3)	Nuernberg#3-2	722
-aldeg_cas03,77,115,2	duplicate(InsideFlagsA3)	Nuernberg#4	722
-aldeg_cas03,77,215,2	duplicate(InsideFlagsA3)	Nuernberg#5	722
-aldeg_cas03,112,107,2	duplicate(InsideFlagsA3)	Nuernberg#6	722
-aldeg_cas03,112,117,2	duplicate(InsideFlagsA3)	Nuernberg#7	722
-aldeg_cas03,69,71,2	duplicate(InsideFlagsA3)	Nuernberg#8	722
-aldeg_cas03,91,69,2	duplicate(InsideFlagsA3)	Nuernberg#9	722
-aldeg_cas03,108,60,2	duplicate(InsideFlagsA3)	Nuernberg#10	722
-aldeg_cas03,121,73,2	duplicate(InsideFlagsA3)	Nuernberg#11	722
-aldeg_cas03,121,73,2	duplicate(InsideFlagsA3)	Nuernberg#12	722
-aldeg_cas03,75,102,2	duplicate(InsideFlagsA3)	Nuernberg#13	722
-aldeg_cas03,199,169,2	duplicate(InsideFlagsA3)	Nuernberg#14	722
-aldeg_cas03,181,179,2	duplicate(InsideFlagsA3)	Nuernberg#15	722
-aldeg_cas03,192,44,2	duplicate(InsideFlagsA3)	Nuernberg#16	722
-aldeg_cas03,208,145,2	duplicate(InsideFlagsA3)	Nuernberg#17	722
-aldeg_cas03,207,75,2	duplicate(InsideFlagsA3)	Nuernberg#18	722
-aldeg_cas03,96,62,2	duplicate(InsideFlagsA3)	Nuernberg#19	722
+aldeg_cas03,176,175,2	duplicate(InsideFlagsA3)	Nuernberg#3-2	GUILD_FLAG
+aldeg_cas03,77,115,2	duplicate(InsideFlagsA3)	Nuernberg#4	GUILD_FLAG
+aldeg_cas03,77,215,2	duplicate(InsideFlagsA3)	Nuernberg#5	GUILD_FLAG
+aldeg_cas03,112,107,2	duplicate(InsideFlagsA3)	Nuernberg#6	GUILD_FLAG
+aldeg_cas03,112,117,2	duplicate(InsideFlagsA3)	Nuernberg#7	GUILD_FLAG
+aldeg_cas03,69,71,2	duplicate(InsideFlagsA3)	Nuernberg#8	GUILD_FLAG
+aldeg_cas03,91,69,2	duplicate(InsideFlagsA3)	Nuernberg#9	GUILD_FLAG
+aldeg_cas03,108,60,2	duplicate(InsideFlagsA3)	Nuernberg#10	GUILD_FLAG
+aldeg_cas03,121,73,2	duplicate(InsideFlagsA3)	Nuernberg#11	GUILD_FLAG
+aldeg_cas03,121,73,2	duplicate(InsideFlagsA3)	Nuernberg#12	GUILD_FLAG
+aldeg_cas03,75,102,2	duplicate(InsideFlagsA3)	Nuernberg#13	GUILD_FLAG
+aldeg_cas03,199,169,2	duplicate(InsideFlagsA3)	Nuernberg#14	GUILD_FLAG
+aldeg_cas03,181,179,2	duplicate(InsideFlagsA3)	Nuernberg#15	GUILD_FLAG
+aldeg_cas03,192,44,2	duplicate(InsideFlagsA3)	Nuernberg#16	GUILD_FLAG
+aldeg_cas03,208,145,2	duplicate(InsideFlagsA3)	Nuernberg#17	GUILD_FLAG
+aldeg_cas03,207,75,2	duplicate(InsideFlagsA3)	Nuernberg#18	GUILD_FLAG
+aldeg_cas03,96,62,2	duplicate(InsideFlagsA3)	Nuernberg#19	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,134,97,4	duplicate(InsideFlagsA3)	Nuernberg#20	722
+aldebaran,134,97,4	duplicate(InsideFlagsA3)	Nuernberg#20	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas03,118,76,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas03	117
+aldeg_cas03,118,76,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas03	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas03,110,118,0	duplicate(cm)	Nahzarf#aldeg_cas03	55
+aldeg_cas03,110,118,0	duplicate(cm)	Nahzarf#aldeg_cas03	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-aldeg_cas03,229,267,0	script	#lever_A03	111,{
+aldeg_cas03,229,267,0	script	#lever_A03	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -124,7 +124,7 @@ aldeg_cas03,229,267,0	script	#lever_A03	111,{
 
 // Guild Dungeon Switch
 //============================================================
-aldeg_cas03,200,177,0	duplicate(gdlever)	#aldeg_cas03	111
+aldeg_cas03,200,177,0	duplicate(gdlever)	#aldeg_cas03	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt
index 91e38c96d..4f6bb1265 100644
--- a/npc/guild/aldeg_cas04.txt
+++ b/npc/guild/aldeg_cas04.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Wuerzburg#1::OutsideFlagsA4	722,{
+-	script	Wuerzburg#1::OutsideFlagsA4	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas04",1);
+	set .@GID, getcastledata("aldeg_cas04",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas04",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas04",1)) {
 				warp "aldeg_cas04",116,217;
 				end;
 			}
@@ -51,65 +51,65 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleA04:
-	FlagEmblem GetCastleData("aldeg_cas04",1);
+	flagemblem getcastledata("aldeg_cas04",1);
 	end;
 }
 
-alde_gld,239,246,2	duplicate(OutsideFlagsA4)	Wuerzburg#1-2	722
-alde_gld,239,239,2	duplicate(OutsideFlagsA4)	Wuerzburg#2	722
+alde_gld,239,246,2	duplicate(OutsideFlagsA4)	Wuerzburg#1-2	GUILD_FLAG
+alde_gld,239,239,2	duplicate(OutsideFlagsA4)	Wuerzburg#2	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Wuerzburg#3::InsideFlagsA4	722,{
+-	script	Wuerzburg#3::InsideFlagsA4	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA04:
-	FlagEmblem GetCastleData("aldeg_cas04",1);
+	flagemblem getcastledata("aldeg_cas04",1);
 	end;
 }
 
-aldeg_cas04,167,61,2	duplicate(InsideFlagsA4)	Wuerzburg#3-2	722
-aldeg_cas04,164,90,2	duplicate(InsideFlagsA4)	Wuerzburg#4	722
-aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#5	722
-aldeg_cas04,112,206,2	duplicate(InsideFlagsA4)	Wuerzburg#6	722
-aldeg_cas04,113,212,2	duplicate(InsideFlagsA4)	Wuerzburg#7	722
-aldeg_cas04,77,117,2	duplicate(InsideFlagsA4)	Wuerzburg#8	722
-aldeg_cas04,186,42,2	duplicate(InsideFlagsA4)	Wuerzburg#9	722
-aldeg_cas04,30,69,2	duplicate(InsideFlagsA4)	Wuerzburg#10	722
-aldeg_cas04,55,97,2	duplicate(InsideFlagsA4)	Wuerzburg#11	722
-aldeg_cas04,45,98,2	duplicate(InsideFlagsA4)	Wuerzburg#12	722
-aldeg_cas04,33,116,2	duplicate(InsideFlagsA4)	Wuerzburg#13	722
-aldeg_cas04,130,180,2	duplicate(InsideFlagsA4)	Wuerzburg#14	722
-aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#15	722
-aldeg_cas04,33,107,2	duplicate(InsideFlagsA4)	Wuerzburg#16	722
-aldeg_cas04,133,220,2	duplicate(InsideFlagsA4)	Wuerzburg#17	722
-aldeg_cas04,169,22,2	duplicate(InsideFlagsA4)	Wuerzburg#18	722
-aldeg_cas04,169,15,2	duplicate(InsideFlagsA4)	Wuerzburg#19	722
+aldeg_cas04,167,61,2	duplicate(InsideFlagsA4)	Wuerzburg#3-2	GUILD_FLAG
+aldeg_cas04,164,90,2	duplicate(InsideFlagsA4)	Wuerzburg#4	GUILD_FLAG
+aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#5	GUILD_FLAG
+aldeg_cas04,112,206,2	duplicate(InsideFlagsA4)	Wuerzburg#6	GUILD_FLAG
+aldeg_cas04,113,212,2	duplicate(InsideFlagsA4)	Wuerzburg#7	GUILD_FLAG
+aldeg_cas04,77,117,2	duplicate(InsideFlagsA4)	Wuerzburg#8	GUILD_FLAG
+aldeg_cas04,186,42,2	duplicate(InsideFlagsA4)	Wuerzburg#9	GUILD_FLAG
+aldeg_cas04,30,69,2	duplicate(InsideFlagsA4)	Wuerzburg#10	GUILD_FLAG
+aldeg_cas04,55,97,2	duplicate(InsideFlagsA4)	Wuerzburg#11	GUILD_FLAG
+aldeg_cas04,45,98,2	duplicate(InsideFlagsA4)	Wuerzburg#12	GUILD_FLAG
+aldeg_cas04,33,116,2	duplicate(InsideFlagsA4)	Wuerzburg#13	GUILD_FLAG
+aldeg_cas04,130,180,2	duplicate(InsideFlagsA4)	Wuerzburg#14	GUILD_FLAG
+aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#15	GUILD_FLAG
+aldeg_cas04,33,107,2	duplicate(InsideFlagsA4)	Wuerzburg#16	GUILD_FLAG
+aldeg_cas04,133,220,2	duplicate(InsideFlagsA4)	Wuerzburg#17	GUILD_FLAG
+aldeg_cas04,169,22,2	duplicate(InsideFlagsA4)	Wuerzburg#18	GUILD_FLAG
+aldeg_cas04,169,15,2	duplicate(InsideFlagsA4)	Wuerzburg#19	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,131,97,4	duplicate(InsideFlagsA4)	Wuerzburg#20	722
+aldebaran,131,97,4	duplicate(InsideFlagsA4)	Wuerzburg#20	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas04,45,88,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas04	117
+aldeg_cas04,45,88,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas04	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas04,67,116,0	duplicate(cm)	Brymhensen#aldeg_cas04	55
+aldeg_cas04,67,116,0	duplicate(cm)	Brymhensen#aldeg_cas04	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-aldeg_cas04,83,17,0	script	#lever_A04	111,{
+aldeg_cas04,83,17,0	script	#lever_A04	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -124,7 +124,7 @@ aldeg_cas04,83,17,0	script	#lever_A04	111,{
 
 // Guild Dungeon Switch
 //============================================================
-aldeg_cas04,76,64,0	duplicate(gdlever)	#aldeg_cas04	111
+aldeg_cas04,76,64,0	duplicate(gdlever)	#aldeg_cas04	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt
index 85bb272f1..8712d314a 100644
--- a/npc/guild/aldeg_cas05.txt
+++ b/npc/guild/aldeg_cas05.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Rothenburg#1::OutsideFlagsA5	722,{
+-	script	Rothenburg#1::OutsideFlagsA5	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas05",1);
+	set .@GID, getcastledata("aldeg_cas05",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas05",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas05",1)) {
 				warp "aldeg_cas05",167,225;
 				end;
 			}
@@ -51,64 +51,64 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleA05:
-	FlagEmblem GetCastleData("aldeg_cas05",1);
+	flagemblem getcastledata("aldeg_cas05",1);
 	end;
 }
 
-alde_gld,265,93,6	duplicate(OutsideFlagsA5)	Rothenburg#1-2	722
-alde_gld,265,87,6	duplicate(OutsideFlagsA5)	Rothenburg#2	722
+alde_gld,265,93,6	duplicate(OutsideFlagsA5)	Rothenburg#1-2	GUILD_FLAG
+alde_gld,265,87,6	duplicate(OutsideFlagsA5)	Rothenburg#2	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Rothenburg#3::InsideFlagsA5	722,{
+-	script	Rothenburg#3::InsideFlagsA5	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA05:
-	FlagEmblem GetCastleData("aldeg_cas05",1);
+	flagemblem getcastledata("aldeg_cas05",1);
 	end;
 }
 
-aldeg_cas05,170,85,2	duplicate(InsideFlagsA5)	Rothenburg#3-2	722
-aldeg_cas05,142,212,2	duplicate(InsideFlagsA5)	Rothenburg#4	722
-aldeg_cas05,149,196,2	duplicate(InsideFlagsA5)	Rothenburg#5	722
-aldeg_cas05,41,180,2	duplicate(InsideFlagsA5)	Rothenburg#6	722
-aldeg_cas05,38,201,2	duplicate(InsideFlagsA5)	Rothenburg#7	722
-aldeg_cas05,65,182,2	duplicate(InsideFlagsA5)	Rothenburg#8	722
-aldeg_cas05,65,205,2	duplicate(InsideFlagsA5)	Rothenburg#9	722
-aldeg_cas05,10,218,2	duplicate(InsideFlagsA5)	Rothenburg#10	722
-aldeg_cas05,10,218,2	duplicate(InsideFlagsA5)	Rothenburg#11	722
-aldeg_cas05,164,201,2	duplicate(InsideFlagsA5)	Rothenburg#12	722
-aldeg_cas05,14,117,2	duplicate(InsideFlagsA5)	Rothenburg#13	722
-aldeg_cas05,10,225,2	duplicate(InsideFlagsA5)	Rothenburg#14	722
-aldeg_cas05,187,59,2	duplicate(InsideFlagsA5)	Rothenburg#15	722
-aldeg_cas05,154,51,2	duplicate(InsideFlagsA5)	Rothenburg#16	722
-aldeg_cas05,22,211,2	duplicate(InsideFlagsA5)	Rothenburg#17	722
-aldeg_cas05,150,202,2	duplicate(InsideFlagsA5)	Rothenburg#18	722
+aldeg_cas05,170,85,2	duplicate(InsideFlagsA5)	Rothenburg#3-2	GUILD_FLAG
+aldeg_cas05,142,212,2	duplicate(InsideFlagsA5)	Rothenburg#4	GUILD_FLAG
+aldeg_cas05,149,196,2	duplicate(InsideFlagsA5)	Rothenburg#5	GUILD_FLAG
+aldeg_cas05,41,180,2	duplicate(InsideFlagsA5)	Rothenburg#6	GUILD_FLAG
+aldeg_cas05,38,201,2	duplicate(InsideFlagsA5)	Rothenburg#7	GUILD_FLAG
+aldeg_cas05,65,182,2	duplicate(InsideFlagsA5)	Rothenburg#8	GUILD_FLAG
+aldeg_cas05,65,205,2	duplicate(InsideFlagsA5)	Rothenburg#9	GUILD_FLAG
+aldeg_cas05,10,218,2	duplicate(InsideFlagsA5)	Rothenburg#10	GUILD_FLAG
+aldeg_cas05,10,218,2	duplicate(InsideFlagsA5)	Rothenburg#11	GUILD_FLAG
+aldeg_cas05,164,201,2	duplicate(InsideFlagsA5)	Rothenburg#12	GUILD_FLAG
+aldeg_cas05,14,117,2	duplicate(InsideFlagsA5)	Rothenburg#13	GUILD_FLAG
+aldeg_cas05,10,225,2	duplicate(InsideFlagsA5)	Rothenburg#14	GUILD_FLAG
+aldeg_cas05,187,59,2	duplicate(InsideFlagsA5)	Rothenburg#15	GUILD_FLAG
+aldeg_cas05,154,51,2	duplicate(InsideFlagsA5)	Rothenburg#16	GUILD_FLAG
+aldeg_cas05,22,211,2	duplicate(InsideFlagsA5)	Rothenburg#17	GUILD_FLAG
+aldeg_cas05,150,202,2	duplicate(InsideFlagsA5)	Rothenburg#18	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,128,97,4	duplicate(InsideFlagsA5)	Rothenburg#19	722
+aldebaran,128,97,4	duplicate(InsideFlagsA5)	Rothenburg#19	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas05,31,190,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas05	117
+aldeg_cas05,31,190,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas05	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas05,51,179,0	duplicate(cm)	Esmarehk#aldeg_cas05	55
+aldeg_cas05,51,179,0	duplicate(cm)	Esmarehk#aldeg_cas05	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-aldeg_cas05,64,8,0	script	#lever_A05	111,{
+aldeg_cas05,64,8,0	script	#lever_A05	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -123,7 +123,7 @@ aldeg_cas05,64,8,0	script	#lever_A05	111,{
 
 // Guild Dungeon Switch
 //============================================================
-aldeg_cas05,22,205,0	duplicate(gdlever)	#aldeg_cas05	111
+aldeg_cas05,22,205,0	duplicate(gdlever)	#aldeg_cas05	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas01.txt b/npc/guild/gefg_cas01.txt
index 527a1a9a6..71a227173 100644
--- a/npc/guild/gefg_cas01.txt
+++ b/npc/guild/gefg_cas01.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Repherion#1::OutsideFlagsG1	722,{
+-	script	Repherion#1::OutsideFlagsG1	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas01",1);
+	set .@GID, getcastledata("gefg_cas01",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas01",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas01",1)) {
 				warp "gefg_cas01",197,36;
 				end;
 			}
@@ -51,56 +51,56 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleG01:
-	FlagEmblem GetCastleData("gefg_cas01",1);
+	flagemblem getcastledata("gefg_cas01",1);
 	end;
 }
 
-gef_fild13,148,51,5	duplicate(OutsideFlagsG1)	Repherion#1-2	722
-gef_fild13,155,54,5	duplicate(OutsideFlagsG1)	Repherion#2	722
-gef_fild13,212,79,6	duplicate(OutsideFlagsG1)	Repherion#3	722
-gef_fild13,211,71,6	duplicate(OutsideFlagsG1)	Repherion#4	722
+gef_fild13,148,51,5	duplicate(OutsideFlagsG1)	Repherion#1-2	GUILD_FLAG
+gef_fild13,155,54,5	duplicate(OutsideFlagsG1)	Repherion#2	GUILD_FLAG
+gef_fild13,212,79,6	duplicate(OutsideFlagsG1)	Repherion#3	GUILD_FLAG
+gef_fild13,211,71,6	duplicate(OutsideFlagsG1)	Repherion#4	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Repherion#5::InsideFlagsG1	722,{
+-	script	Repherion#5::InsideFlagsG1	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG01:
-	FlagEmblem GetCastleData("gefg_cas01",1);
+	flagemblem getcastledata("gefg_cas01",1);
 	end;
 }
 
-gefg_cas01,28,157,4	duplicate(InsideFlagsG1)	Repherion#5-2	722
-gefg_cas01,22,156,5	duplicate(InsideFlagsG1)	Repherion#6	722
-gefg_cas01,68,185,3	duplicate(InsideFlagsG1)	Repherion#7	722
-gefg_cas01,17,171,5	duplicate(InsideFlagsG1)	Repherion#8	722
-gefg_cas01,59,16,4	duplicate(InsideFlagsG1)	Repherion#9	722
-gefg_cas01,64,16,4	duplicate(InsideFlagsG1)	Repherion#10	722
+gefg_cas01,28,157,4	duplicate(InsideFlagsG1)	Repherion#5-2	GUILD_FLAG
+gefg_cas01,22,156,5	duplicate(InsideFlagsG1)	Repherion#6	GUILD_FLAG
+gefg_cas01,68,185,3	duplicate(InsideFlagsG1)	Repherion#7	GUILD_FLAG
+gefg_cas01,17,171,5	duplicate(InsideFlagsG1)	Repherion#8	GUILD_FLAG
+gefg_cas01,59,16,4	duplicate(InsideFlagsG1)	Repherion#9	GUILD_FLAG
+gefg_cas01,64,16,4	duplicate(InsideFlagsG1)	Repherion#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,109,123,2	duplicate(InsideFlagsG1)	Repherion#11	722
+geffen,109,123,2	duplicate(InsideFlagsG1)	Repherion#11	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas01,83,47,3	duplicate(guildkafra)	Kafra Staff#gefg_cas01	117
+gefg_cas01,83,47,3	duplicate(guildkafra)	Kafra Staff#gefg_cas01	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas01,40,48,5	duplicate(cm)	Gnahcher#gefg_cas01	55
+gefg_cas01,40,48,5	duplicate(cm)	Gnahcher#gefg_cas01	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas01,152,117,0	script	#lever_G01	111,{
+gefg_cas01,152,117,0	script	#lever_G01	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -115,7 +115,7 @@ gefg_cas01,152,117,0	script	#lever_G01	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas01,78,84,0	duplicate(gdlever)	#gefg_cas01	111
+gefg_cas01,78,84,0	duplicate(gdlever)	#gefg_cas01	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas02.txt b/npc/guild/gefg_cas02.txt
index dfb20f93b..8aa183045 100644
--- a/npc/guild/gefg_cas02.txt
+++ b/npc/guild/gefg_cas02.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Eeyorbriggar#1::OutsideFlagsG2	722,{
+-	script	Eeyorbriggar#1::OutsideFlagsG2	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas02",1);
+	set .@GID, getcastledata("gefg_cas02",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas02",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas02",1)) {
 				warp "gefg_cas02",178,43;
 				end;
 			}
@@ -51,57 +51,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleG02:
-	FlagEmblem GetCastleData("gefg_cas02",1);
+	flagemblem getcastledata("gefg_cas02",1);
 	end;
 }
 
-gef_fild13,303,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#1-2	722
-gef_fild13,312,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#2	722
-gef_fild13,290,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#3	722
-gef_fild13,324,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#4	722
+gef_fild13,303,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#1-2	GUILD_FLAG
+gef_fild13,312,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#2	GUILD_FLAG
+gef_fild13,290,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#3	GUILD_FLAG
+gef_fild13,324,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#4	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Eeyorbriggar#5::InsideFlagsG2	722,{
+-	script	Eeyorbriggar#5::InsideFlagsG2	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG02:
-	FlagEmblem GetCastleData("gefg_cas02",1);
+	flagemblem getcastledata("gefg_cas02",1);
 	end;
 }
 
-gefg_cas02,65,130,5	duplicate(InsideFlagsG2)	Eeyorbriggar#5-2	722
-gefg_cas02,30,123,5	duplicate(InsideFlagsG2)	Eeyorbriggar#6	722
-gefg_cas02,65,139,6	duplicate(InsideFlagsG2)	Eeyorbriggar#7	722
-gefg_cas02,37,177,6	duplicate(InsideFlagsG2)	Eeyorbriggar#8	722
-gefg_cas02,37,168,6	duplicate(InsideFlagsG2)	Eeyorbriggar#9	722
-gefg_cas02,68,47,2	duplicate(InsideFlagsG2)	Eeyorbriggar#10	722
-gefg_cas02,68,36,2	duplicate(InsideFlagsG2)	Eeyorbriggar#11	722
+gefg_cas02,65,130,5	duplicate(InsideFlagsG2)	Eeyorbriggar#5-2	GUILD_FLAG
+gefg_cas02,30,123,5	duplicate(InsideFlagsG2)	Eeyorbriggar#6	GUILD_FLAG
+gefg_cas02,65,139,6	duplicate(InsideFlagsG2)	Eeyorbriggar#7	GUILD_FLAG
+gefg_cas02,37,177,6	duplicate(InsideFlagsG2)	Eeyorbriggar#8	GUILD_FLAG
+gefg_cas02,37,168,6	duplicate(InsideFlagsG2)	Eeyorbriggar#9	GUILD_FLAG
+gefg_cas02,68,47,2	duplicate(InsideFlagsG2)	Eeyorbriggar#10	GUILD_FLAG
+gefg_cas02,68,36,2	duplicate(InsideFlagsG2)	Eeyorbriggar#11	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,112,129,1	duplicate(InsideFlagsG2)	Eeyorbriggar#12	722
+geffen,112,129,1	duplicate(InsideFlagsG2)	Eeyorbriggar#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas02,23,66,3	duplicate(guildkafra)	Kafra Staff#gefg_cas02	117
+gefg_cas02,23,66,3	duplicate(guildkafra)	Kafra Staff#gefg_cas02	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas02,12,66,5	duplicate(cm)	Esmarehk#gefg_cas02	55
+gefg_cas02,12,66,5	duplicate(cm)	Esmarehk#gefg_cas02	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas02,145,114,0	script	#lever_G02	111,{
+gefg_cas02,145,114,0	script	#lever_G02	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -116,7 +116,7 @@ gefg_cas02,145,114,0	script	#lever_G02	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas02,167,40,0	duplicate(gdlever)	#gefg_cas02	111
+gefg_cas02,167,40,0	duplicate(gdlever)	#gefg_cas02	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas03.txt b/npc/guild/gefg_cas03.txt
index b46ed18c7..50ba0005b 100644
--- a/npc/guild/gefg_cas03.txt
+++ b/npc/guild/gefg_cas03.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Yesnelph#1::OutsideFlagsG3	722,{
+-	script	Yesnelph#1::OutsideFlagsG3	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas03",1);
+	set .@GID, getcastledata("gefg_cas03",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas03",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas03",1)) {
 				warp "gefg_cas03",221,30;
 				end;
 			}
@@ -51,60 +51,60 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleG03:
-	FlagEmblem GetCastleData("gefg_cas03",1);
+	flagemblem getcastledata("gefg_cas03",1);
 	end;
 }
 
-gef_fild13,78,182,4	duplicate(OutsideFlagsG3)	Yesnelph#1-2	722
-gef_fild13,87,182,4	duplicate(OutsideFlagsG3)	Yesnelph#2	722
-gef_fild13,73,295,7	duplicate(OutsideFlagsG3)	Yesnelph#3	722
-gef_fild13,113,274,7	duplicate(OutsideFlagsG3)	Yesnelph#4	722
-gef_fild13,144,235,6	duplicate(OutsideFlagsG3)	Yesnelph#5	722
-gef_fild13,144,244,6	duplicate(OutsideFlagsG3)	Yesnelph#6	722
+gef_fild13,78,182,4	duplicate(OutsideFlagsG3)	Yesnelph#1-2	GUILD_FLAG
+gef_fild13,87,182,4	duplicate(OutsideFlagsG3)	Yesnelph#2	GUILD_FLAG
+gef_fild13,73,295,7	duplicate(OutsideFlagsG3)	Yesnelph#3	GUILD_FLAG
+gef_fild13,113,274,7	duplicate(OutsideFlagsG3)	Yesnelph#4	GUILD_FLAG
+gef_fild13,144,235,6	duplicate(OutsideFlagsG3)	Yesnelph#5	GUILD_FLAG
+gef_fild13,144,244,6	duplicate(OutsideFlagsG3)	Yesnelph#6	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Yesnelph#7::InsideFlagsG3	722,{
+-	script	Yesnelph#7::InsideFlagsG3	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG03:
-	FlagEmblem GetCastleData("gefg_cas03",1);
+	flagemblem getcastledata("gefg_cas03",1);
 	end;
 }
 
-gefg_cas03,122,220,6	duplicate(InsideFlagsG3)	Yesnelph#7-2	722
-gefg_cas03,122,229,6	duplicate(InsideFlagsG3)	Yesnelph#8	722
-gefg_cas03,91,257,7	duplicate(InsideFlagsG3)	Yesnelph#9	722
-gefg_cas03,52,276,7	duplicate(InsideFlagsG3)	Yesnelph#10	722
-gefg_cas03,56,164,4	duplicate(InsideFlagsG3)	Yesnelph#11	722
-gefg_cas03,65,164,4	duplicate(InsideFlagsG3)	Yesnelph#12	722
-gefg_cas03,37,214,1	duplicate(InsideFlagsG3)	Yesnelph#13	722
-gefg_cas03,34,208,1	duplicate(InsideFlagsG3)	Yesnelph#14	722
+gefg_cas03,122,220,6	duplicate(InsideFlagsG3)	Yesnelph#7-2	GUILD_FLAG
+gefg_cas03,122,229,6	duplicate(InsideFlagsG3)	Yesnelph#8	GUILD_FLAG
+gefg_cas03,91,257,7	duplicate(InsideFlagsG3)	Yesnelph#9	GUILD_FLAG
+gefg_cas03,52,276,7	duplicate(InsideFlagsG3)	Yesnelph#10	GUILD_FLAG
+gefg_cas03,56,164,4	duplicate(InsideFlagsG3)	Yesnelph#11	GUILD_FLAG
+gefg_cas03,65,164,4	duplicate(InsideFlagsG3)	Yesnelph#12	GUILD_FLAG
+gefg_cas03,37,214,1	duplicate(InsideFlagsG3)	Yesnelph#13	GUILD_FLAG
+gefg_cas03,34,208,1	duplicate(InsideFlagsG3)	Yesnelph#14	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,120,132,8	duplicate(InsideFlagsG3)	Yesnelph#15	722
+geffen,120,132,8	duplicate(InsideFlagsG3)	Yesnelph#15	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas03,116,89,5	duplicate(guildkafra)	Kafra Staff#gefg_cas03	117
+gefg_cas03,116,89,5	duplicate(guildkafra)	Kafra Staff#gefg_cas03	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas03,106,23,5	duplicate(cm)	Jyang#gefg_cas03	55
+gefg_cas03,106,23,5	duplicate(cm)	Jyang#gefg_cas03	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas03,275,289,0	script	#lever_G03	111,{
+gefg_cas03,275,289,0	script	#lever_G03	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ gefg_cas03,275,289,0	script	#lever_G03	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas03,221,43,0	duplicate(gdlever)	#gefg_cas03	111
+gefg_cas03,221,43,0	duplicate(gdlever)	#gefg_cas03	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt
index b42055293..67c490baf 100644
--- a/npc/guild/gefg_cas04.txt
+++ b/npc/guild/gefg_cas04.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Bergel#1::OutsideFlagsG4	722,{
+-	script	Bergel#1::OutsideFlagsG4	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas04",1);
+	set .@GID, getcastledata("gefg_cas04",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas04",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas04",1)) {
 				warp "gefg_cas04",168,43;
 				end;
 			}
@@ -51,56 +51,56 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleG04:
-	FlagEmblem GetCastleData("gefg_cas04",1);
+	flagemblem getcastledata("gefg_cas04",1);
 	end;
 }
 
-gef_fild13,190,283,3	duplicate(OutsideFlagsG4)	Bergel#1-2	722
-gef_fild13,199,274,3	duplicate(OutsideFlagsG4)	Bergel#2	722
+gef_fild13,190,283,3	duplicate(OutsideFlagsG4)	Bergel#1-2	GUILD_FLAG
+gef_fild13,199,274,3	duplicate(OutsideFlagsG4)	Bergel#2	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Bergel#3::InsideFlagsG4	722,{
+-	script	Bergel#3::InsideFlagsG4	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG04:
-	FlagEmblem GetCastleData("gefg_cas04",1);
+	flagemblem getcastledata("gefg_cas04",1);
 	end;
 }
 
-gefg_cas04,24,157,4	duplicate(InsideFlagsG4)	Bergel#3-2	722
-gefg_cas04,35,158,4	duplicate(InsideFlagsG4)	Bergel#4	722
-gefg_cas04,44,184,4	duplicate(InsideFlagsG4)	Bergel#5	722
-gefg_cas04,51,184,4	duplicate(InsideFlagsG4)	Bergel#6	722
-gefg_cas04,39,212,7	duplicate(InsideFlagsG4)	Bergel#7	722
-gefg_cas04,29,212,1	duplicate(InsideFlagsG4)	Bergel#8	722
-gefg_cas04,24,73,1	duplicate(InsideFlagsG4)	Bergel#9	722
-gefg_cas04,35,73,4	duplicate(InsideFlagsG4)	Bergel#10	722
+gefg_cas04,24,157,4	duplicate(InsideFlagsG4)	Bergel#3-2	GUILD_FLAG
+gefg_cas04,35,158,4	duplicate(InsideFlagsG4)	Bergel#4	GUILD_FLAG
+gefg_cas04,44,184,4	duplicate(InsideFlagsG4)	Bergel#5	GUILD_FLAG
+gefg_cas04,51,184,4	duplicate(InsideFlagsG4)	Bergel#6	GUILD_FLAG
+gefg_cas04,39,212,7	duplicate(InsideFlagsG4)	Bergel#7	GUILD_FLAG
+gefg_cas04,29,212,1	duplicate(InsideFlagsG4)	Bergel#8	GUILD_FLAG
+gefg_cas04,24,73,1	duplicate(InsideFlagsG4)	Bergel#9	GUILD_FLAG
+gefg_cas04,35,73,4	duplicate(InsideFlagsG4)	Bergel#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,127,130,7	duplicate(InsideFlagsG4)	Bergel#11	722
+geffen,127,130,7	duplicate(InsideFlagsG4)	Bergel#11	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas04,59,70,3	duplicate(guildkafra)	Kafra Staff#gefg_cas04	117
+gefg_cas04,59,70,3	duplicate(guildkafra)	Kafra Staff#gefg_cas04	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas04,73,46,3	duplicate(cm)	Kellvahni#gefg_cas04	55
+gefg_cas04,73,46,3	duplicate(cm)	Kellvahni#gefg_cas04	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas04,116,123,0	script	#lever_G04	111,{
+gefg_cas04,116,123,0	script	#lever_G04	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -115,7 +115,7 @@ gefg_cas04,116,123,0	script	#lever_G04	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas04,58,75,0	duplicate(gdlever)	#gefg_cas04	111
+gefg_cas04,58,75,0	duplicate(gdlever)	#gefg_cas04	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas05.txt b/npc/guild/gefg_cas05.txt
index ce53a3d04..aa802ea15 100644
--- a/npc/guild/gefg_cas05.txt
+++ b/npc/guild/gefg_cas05.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Mersetzdeitz#1::OutsideFlagsG5	722,{
+-	script	Mersetzdeitz#1::OutsideFlagsG5	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas05",1);
+	set .@GID, getcastledata("gefg_cas05",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas05",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas05",1)) {
 				warp "gefg_cas05",168,31;
 				end;
 			}
@@ -51,56 +51,56 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleG05:
-	FlagEmblem GetCastleData("gefg_cas05",1);
+	flagemblem getcastledata("gefg_cas05",1);
 	end;
 }
 
-gef_fild13,302,87,7	duplicate(OutsideFlagsG5)	Mersetzdeitz#1-2	722
-gef_fild13,313,83,0	duplicate(OutsideFlagsG5)	Mersetzdeitz#2	722
-gef_fild13,252,51,2	duplicate(OutsideFlagsG5)	Mersetzdeitz#3	722
-gef_fild13,26,147,2	duplicate(OutsideFlagsG5)	Mersetzdeitz#4	722
+gef_fild13,302,87,7	duplicate(OutsideFlagsG5)	Mersetzdeitz#1-2	GUILD_FLAG
+gef_fild13,313,83,0	duplicate(OutsideFlagsG5)	Mersetzdeitz#2	GUILD_FLAG
+gef_fild13,252,51,2	duplicate(OutsideFlagsG5)	Mersetzdeitz#3	GUILD_FLAG
+gef_fild13,26,147,2	duplicate(OutsideFlagsG5)	Mersetzdeitz#4	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Mersetzdeitz#5::InsideFlagsG5	722,{
+-	script	Mersetzdeitz#5::InsideFlagsG5	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG05:
-	FlagEmblem GetCastleData("gefg_cas05",1);
+	flagemblem getcastledata("gefg_cas05",1);
 	end;
 }
 
-gefg_cas05,77,185,7	duplicate(InsideFlagsG5)	Mersetzdeitz#5-2	722
-gefg_cas05,92,181,0	duplicate(InsideFlagsG5)	Mersetzdeitz#6	722
-gefg_cas05,83,158,1	duplicate(InsideFlagsG5)	Mersetzdeitz#7	722
-gefg_cas05,62,144,7	duplicate(InsideFlagsG5)	Mersetzdeitz#8	722
-gefg_cas05,62,66,4	duplicate(InsideFlagsG5)	Mersetzdeitz#9	722
-gefg_cas05,69,66,4	duplicate(InsideFlagsG5)	Mersetzdeitz#10	722
+gefg_cas05,77,185,7	duplicate(InsideFlagsG5)	Mersetzdeitz#5-2	GUILD_FLAG
+gefg_cas05,92,181,0	duplicate(InsideFlagsG5)	Mersetzdeitz#6	GUILD_FLAG
+gefg_cas05,83,158,1	duplicate(InsideFlagsG5)	Mersetzdeitz#7	GUILD_FLAG
+gefg_cas05,62,144,7	duplicate(InsideFlagsG5)	Mersetzdeitz#8	GUILD_FLAG
+gefg_cas05,62,66,4	duplicate(InsideFlagsG5)	Mersetzdeitz#9	GUILD_FLAG
+gefg_cas05,69,66,4	duplicate(InsideFlagsG5)	Mersetzdeitz#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,131,123,6	duplicate(InsideFlagsG5)	Mersetzdeitz#11	722
+geffen,131,123,6	duplicate(InsideFlagsG5)	Mersetzdeitz#11	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas05,61,52,5	duplicate(guildkafra)	Kafra Staff#gefg_cas05	117
+gefg_cas05,61,52,5	duplicate(guildkafra)	Kafra Staff#gefg_cas05	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas05,70,52,3	duplicate(cm)	Byohre#gefg_cas05	55
+gefg_cas05,70,52,3	duplicate(cm)	Byohre#gefg_cas05	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas05,149,107,0	script	#lever_G05	111,{
+gefg_cas05,149,107,0	script	#lever_G05	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -115,7 +115,7 @@ gefg_cas05,149,107,0	script	#lever_G05	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas05,65,22,0	duplicate(gdlever)	#gefg_cas05	111
+gefg_cas05,65,22,0	duplicate(gdlever)	#gefg_cas05	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt
index bd33111cd..2b172929b 100644
--- a/npc/guild/payg_cas01.txt
+++ b/npc/guild/payg_cas01.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Bright Arbor#1::OutsideFlagsPA1	722,{
+-	script	Bright Arbor#1::OutsideFlagsPA1	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas01",1);
+	set .@GID, getcastledata("payg_cas01",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas01",1)) {
+			if (getcharid(2) == getcastledata("payg_cas01",1)) {
 					warp "payg_cas01",54,144;
 				end;
 			}
@@ -53,57 +53,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePy01:
-	FlagEmblem GetCastleData("payg_cas01",1);
+	flagemblem getcastledata("payg_cas01",1);
 	end;
 }
 
-pay_gld,125,236,4	duplicate(OutsideFlagsPA1)	Bright Arbor#1-2	722
-pay_gld,110,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#2	722
-pay_gld,116,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#3	722
-pay_gld,91,239,2	duplicate(OutsideFlagsPA1)	Bright Arbor#4	722
+pay_gld,125,236,4	duplicate(OutsideFlagsPA1)	Bright Arbor#1-2	GUILD_FLAG
+pay_gld,110,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#2	GUILD_FLAG
+pay_gld,116,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#3	GUILD_FLAG
+pay_gld,91,239,2	duplicate(OutsideFlagsPA1)	Bright Arbor#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Bright Arbor#5::InsideFlagsPA1	722,{
+-	script	Bright Arbor#5::InsideFlagsPA1	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy01:
-	FlagEmblem GetCastleData("payg_cas01",1);
+	flagemblem getcastledata("payg_cas01",1);
 	end;
 }
 
-payg_cas01,238,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#5-2	722
-payg_cas01,233,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#6	722
-payg_cas01,221,123,4	duplicate(InsideFlagsPA1)	Bright Arbor#7	722
-payg_cas01,221,116,4	duplicate(InsideFlagsPA1)	Bright Arbor#8	722
-payg_cas01,206,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#9	722
-payg_cas01,212,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#10	722
+payg_cas01,238,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#5-2	GUILD_FLAG
+payg_cas01,233,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#6	GUILD_FLAG
+payg_cas01,221,123,4	duplicate(InsideFlagsPA1)	Bright Arbor#7	GUILD_FLAG
+payg_cas01,221,116,4	duplicate(InsideFlagsPA1)	Bright Arbor#8	GUILD_FLAG
+payg_cas01,206,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#9	GUILD_FLAG
+payg_cas01,212,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,90,322,4	duplicate(InsideFlagsPA1)	Bright Arbor#11	722
-payon,166,177,3	duplicate(InsideFlagsPA1)	Bright Arbor#12	722
+payon,90,322,4	duplicate(InsideFlagsPA1)	Bright Arbor#11	GUILD_FLAG
+payon,166,177,3	duplicate(InsideFlagsPA1)	Bright Arbor#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas01,128,58,3	duplicate(guildkafra)	Kafra Staff#payg_cas01	117
+payg_cas01,128,58,3	duplicate(guildkafra)	Kafra Staff#payg_cas01	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas01,120,58,4	duplicate(cm)	Kurunnadi#payg_cas01	55
+payg_cas01,120,58,4	duplicate(cm)	Kurunnadi#payg_cas01	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas01,295,8,0	script	#lever_PA01	111,{
+payg_cas01,295,8,0	script	#lever_PA01	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -118,7 +118,7 @@ payg_cas01,295,8,0	script	#lever_PA01	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas01,101,25,0	duplicate(gdlever)	#payg_cas01	111
+payg_cas01,101,25,0	duplicate(gdlever)	#payg_cas01	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt
index 27e5fc4f0..cb7403c6a 100644
--- a/npc/guild/payg_cas02.txt
+++ b/npc/guild/payg_cas02.txt
@@ -17,9 +17,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Scarlet Palace#1::OutsideFlagsPA2	722,{
+-	script	Scarlet Palace#1::OutsideFlagsPA2	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas02",1);
+	set .@GID, getcastledata("payg_cas02",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -42,7 +42,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas02",1)) {
+			if (getcharid(2) == getcastledata("payg_cas02",1)) {
 					warp "payg_cas02",278,251;
 				end;
 			}
@@ -54,57 +54,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePy02:
-	FlagEmblem GetCastleData("payg_cas02",1);
+	flagemblem getcastledata("payg_cas02",1);
 	end;
 }
 
-pay_gld,292,112,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#1-2	722
-pay_gld,292,120,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#2	722
-pay_gld,291,135,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#3	722
-pay_gld,271,163,0	duplicate(OutsideFlagsPA2)	Scarlet Palace#4	722
+pay_gld,292,112,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#1-2	GUILD_FLAG
+pay_gld,292,120,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#2	GUILD_FLAG
+pay_gld,291,135,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#3	GUILD_FLAG
+pay_gld,271,163,0	duplicate(OutsideFlagsPA2)	Scarlet Palace#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Scarlet Palace#5::InsideFlagsPA2	722,{
+-	script	Scarlet Palace#5::InsideFlagsPA2	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy02:
-	FlagEmblem GetCastleData("payg_cas02",1);
+	flagemblem getcastledata("payg_cas02",1);
 	end;
 }
 
-payg_cas02,254,40,6	duplicate(InsideFlagsPA2)	Scarlet Palace#5-2	722
-payg_cas02,254,48,6	duplicate(InsideFlagsPA2)	Scarlet Palace#6	722
-payg_cas02,202,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#7	722
-payg_cas02,209,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#8	722
-payg_cas02,59,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#9	722
-payg_cas02,70,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#10	722
+payg_cas02,254,40,6	duplicate(InsideFlagsPA2)	Scarlet Palace#5-2	GUILD_FLAG
+payg_cas02,254,48,6	duplicate(InsideFlagsPA2)	Scarlet Palace#6	GUILD_FLAG
+payg_cas02,202,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#7	GUILD_FLAG
+payg_cas02,209,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#8	GUILD_FLAG
+payg_cas02,59,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#9	GUILD_FLAG
+payg_cas02,70,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,97,322,4	duplicate(InsideFlagsPA2)	Scarlet Palace#11	722
-payon,166,173,3	duplicate(InsideFlagsPA2)	Scarlet Palace#12	722
+payon,97,322,4	duplicate(InsideFlagsPA2)	Scarlet Palace#11	GUILD_FLAG
+payon,166,173,3	duplicate(InsideFlagsPA2)	Scarlet Palace#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas02,22,275,5	duplicate(guildkafra)	Kafra Staff#payg_cas02	117
+payg_cas02,22,275,5	duplicate(guildkafra)	Kafra Staff#payg_cas02	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas02,22,260,7	duplicate(cm)	Cherieos#payg_cas02	55
+payg_cas02,22,260,7	duplicate(cm)	Cherieos#payg_cas02	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas02,149,149,0	script	#lever_PA02	111,{
+payg_cas02,149,149,0	script	#lever_PA02	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ payg_cas02,149,149,0	script	#lever_PA02	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas02,278,247,0	duplicate(gdlever)	#payg_cas02	111
+payg_cas02,278,247,0	duplicate(gdlever)	#payg_cas02	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas03.txt b/npc/guild/payg_cas03.txt
index e67b9798f..54c69087e 100644
--- a/npc/guild/payg_cas03.txt
+++ b/npc/guild/payg_cas03.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Holy Shadow#1::OutsideFlagsPA3	722,{
+-	script	Holy Shadow#1::OutsideFlagsPA3	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas03",1);
+	set .@GID, getcastledata("payg_cas03",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas03",1)) {
+			if (getcharid(2) == getcastledata("payg_cas03",1)) {
 					warp "payg_cas03",9,263;
 				end;
 			}
@@ -53,57 +53,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePy03:
-	FlagEmblem GetCastleData("payg_cas03",1);
+	flagemblem getcastledata("payg_cas03",1);
 	end;
 }
 
-pay_gld,321,298,2	duplicate(OutsideFlagsPA3)	Holy Shadow#1-2	722
-pay_gld,321,289,2	duplicate(OutsideFlagsPA3)	Holy Shadow#2	722
-pay_gld,327,304,1	duplicate(OutsideFlagsPA3)	Holy Shadow#3	722
-pay_gld,333,254,4	duplicate(OutsideFlagsPA3)	Holy Shadow#4	722
+pay_gld,321,298,2	duplicate(OutsideFlagsPA3)	Holy Shadow#1-2	GUILD_FLAG
+pay_gld,321,289,2	duplicate(OutsideFlagsPA3)	Holy Shadow#2	GUILD_FLAG
+pay_gld,327,304,1	duplicate(OutsideFlagsPA3)	Holy Shadow#3	GUILD_FLAG
+pay_gld,333,254,4	duplicate(OutsideFlagsPA3)	Holy Shadow#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Holy Shadow#5::InsideFlagsPA3	722,{
+-	script	Holy Shadow#5::InsideFlagsPA3	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy03:
-	FlagEmblem GetCastleData("payg_cas03",1);
+	flagemblem getcastledata("payg_cas03",1);
 	end;
 }
 
-payg_cas03,236,54,2	duplicate(InsideFlagsPA3)	Holy Shadow#5-2	722
-payg_cas03,236,45,2	duplicate(InsideFlagsPA3)	Holy Shadow#6	722
-payg_cas03,259,66,4	duplicate(InsideFlagsPA3)	Holy Shadow#7	722
-payg_cas03,266,66,4	duplicate(InsideFlagsPA3)	Holy Shadow#8	722
-payg_cas03,34,31,4	duplicate(InsideFlagsPA3)	Holy Shadow#9	722
-payg_cas03,43,31,4	duplicate(InsideFlagsPA3)	Holy Shadow#10	722
+payg_cas03,236,54,2	duplicate(InsideFlagsPA3)	Holy Shadow#5-2	GUILD_FLAG
+payg_cas03,236,45,2	duplicate(InsideFlagsPA3)	Holy Shadow#6	GUILD_FLAG
+payg_cas03,259,66,4	duplicate(InsideFlagsPA3)	Holy Shadow#7	GUILD_FLAG
+payg_cas03,266,66,4	duplicate(InsideFlagsPA3)	Holy Shadow#8	GUILD_FLAG
+payg_cas03,34,31,4	duplicate(InsideFlagsPA3)	Holy Shadow#9	GUILD_FLAG
+payg_cas03,43,31,4	duplicate(InsideFlagsPA3)	Holy Shadow#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,113,322,4	duplicate(InsideFlagsPA3)	Holy Shadow#11	722
-payon,166,169,3	duplicate(InsideFlagsPA3)	Holy Shadow#12	722
+payon,113,322,4	duplicate(InsideFlagsPA3)	Holy Shadow#11	GUILD_FLAG
+payon,166,169,3	duplicate(InsideFlagsPA3)	Holy Shadow#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas03,9,263,5	duplicate(guildkafra)	Kafra Staff#payg_cas03	117
+payg_cas03,9,263,5	duplicate(guildkafra)	Kafra Staff#payg_cas03	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas03,50,261,3	duplicate(cm)	Gheriot#payg_cas03	55
+payg_cas03,50,261,3	duplicate(cm)	Gheriot#payg_cas03	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas03,163,167,0	script	#lever_PA03	111,{
+payg_cas03,163,167,0	script	#lever_PA03	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -118,7 +118,7 @@ payg_cas03,163,167,0	script	#lever_PA03	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas03,38,42,0	duplicate(gdlever)	#payg_cas03	111
+payg_cas03,38,42,0	duplicate(gdlever)	#payg_cas03	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt
index 4f584e368..265ace62f 100644
--- a/npc/guild/payg_cas04.txt
+++ b/npc/guild/payg_cas04.txt
@@ -17,9 +17,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Sacred Altar#1::OutsideFlagsPA4	722,{
+-	script	Sacred Altar#1::OutsideFlagsPA4	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas04",1);
+	set .@GID, getcastledata("payg_cas04",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -42,7 +42,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas04",1)) {
+			if (getcharid(2) == getcastledata("payg_cas04",1)) {
 					warp "payg_cas04",40,235;
 				end;
 			}
@@ -54,57 +54,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePy04:
-	FlagEmblem GetCastleData("payg_cas04",1);
+	flagemblem getcastledata("payg_cas04",1);
 	end;
 }
 
-pay_gld,137,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#1-2	722
-pay_gld,143,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#2	722
-pay_gld,133,151,2	duplicate(OutsideFlagsPA4)	Sacred Altar#3	722
-pay_gld,153,166,1	duplicate(OutsideFlagsPA4)	Sacred Altar#4	722
+pay_gld,137,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#1-2	GUILD_FLAG
+pay_gld,143,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#2	GUILD_FLAG
+pay_gld,133,151,2	duplicate(OutsideFlagsPA4)	Sacred Altar#3	GUILD_FLAG
+pay_gld,153,166,1	duplicate(OutsideFlagsPA4)	Sacred Altar#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Sacred Altar#5::InsideFlagsPA4	722,{
+-	script	Sacred Altar#5::InsideFlagsPA4	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy04:
-	FlagEmblem GetCastleData("payg_cas04",1);
+	flagemblem getcastledata("payg_cas04",1);
 	end;
 }
 
-payg_cas04,255,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#5-2	722
-payg_cas04,248,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#6	722
-payg_cas04,248,168,6	duplicate(InsideFlagsPA4)	Sacred Altar#7	722
-payg_cas04,248,160,6	duplicate(InsideFlagsPA4)	Sacred Altar#8	722
-payg_cas04,232,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#9	722
-payg_cas04,239,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#10	722
+payg_cas04,255,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#5-2	GUILD_FLAG
+payg_cas04,248,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#6	GUILD_FLAG
+payg_cas04,248,168,6	duplicate(InsideFlagsPA4)	Sacred Altar#7	GUILD_FLAG
+payg_cas04,248,160,6	duplicate(InsideFlagsPA4)	Sacred Altar#8	GUILD_FLAG
+payg_cas04,232,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#9	GUILD_FLAG
+payg_cas04,239,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,118,322,4	duplicate(InsideFlagsPA4)	Sacred Altar#11	722
-payon,166,165,3	duplicate(InsideFlagsPA4)	Sacred Altar#12	722
+payon,118,322,4	duplicate(InsideFlagsPA4)	Sacred Altar#11	GUILD_FLAG
+payon,166,165,3	duplicate(InsideFlagsPA4)	Sacred Altar#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas04,40,235,1	duplicate(guildkafra)	Kafra Staff#payg_cas04	117
+payg_cas04,40,235,1	duplicate(guildkafra)	Kafra Staff#payg_cas04	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas04,38,284,3	duplicate(cm)	DJ#payg_cas04	55
+payg_cas04,38,284,3	duplicate(cm)	DJ#payg_cas04	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas04,151,47,0	script	#lever_PA04	111,{
+payg_cas04,151,47,0	script	#lever_PA04	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ payg_cas04,151,47,0	script	#lever_PA04	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas04,52,48,0	duplicate(gdlever)	#payg_cas04	111
+payg_cas04,52,48,0	duplicate(gdlever)	#payg_cas04	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas05.txt b/npc/guild/payg_cas05.txt
index ce5ee2f06..ec616656e 100644
--- a/npc/guild/payg_cas05.txt
+++ b/npc/guild/payg_cas05.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Bamboo Grove Hill#1::OutsideFlagsPA5	722,{
+-	script	Bamboo Grove Hill#1::OutsideFlagsPA5	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas05",1);
+	set .@GID, getcastledata("payg_cas05",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas05",1)) {
+			if (getcharid(2) == getcastledata("payg_cas05",1)) {
 					warp "payg_cas05",243,27;
 				end;
 			}
@@ -53,57 +53,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePy05:
-	FlagEmblem GetCastleData("payg_cas05",1);
+	flagemblem getcastledata("payg_cas05",1);
 	end;
 }
 
-pay_gld,208,268,4	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#1-2	722
-pay_gld,199,268,4	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#2	722
-pay_gld,190,277,3	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#3	722
-pay_gld,187,294,2	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#4	722
+pay_gld,208,268,4	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#1-2	GUILD_FLAG
+pay_gld,199,268,4	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#2	GUILD_FLAG
+pay_gld,190,277,3	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#3	GUILD_FLAG
+pay_gld,187,294,2	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Bamboo Grove Hill#5::InsideFlagsPA5	722,{
+-	script	Bamboo Grove Hill#5::InsideFlagsPA5	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy05:
-	FlagEmblem GetCastleData("payg_cas05",1);
+	flagemblem getcastledata("payg_cas05",1);
 	end;
 }
 
-payg_cas05,32,249,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#5-2	722
-payg_cas05,24,249,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#6	722
-payg_cas05,62,271,0	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#7	722
-payg_cas05,57,271,0	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#8	722
-payg_cas05,55,252,2	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#9	722
-payg_cas05,55,260,2	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#10	722
+payg_cas05,32,249,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#5-2	GUILD_FLAG
+payg_cas05,24,249,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#6	GUILD_FLAG
+payg_cas05,62,271,0	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#7	GUILD_FLAG
+payg_cas05,57,271,0	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#8	GUILD_FLAG
+payg_cas05,55,252,2	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#9	GUILD_FLAG
+payg_cas05,55,260,2	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,123,322,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#11	722
-payon,166,161,3	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#12	722
+payon,123,322,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#11	GUILD_FLAG
+payon,166,161,3	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas05,276,227,1	duplicate(guildkafra)	Kafra Staff#payg_cas05	117
+payg_cas05,276,227,1	duplicate(guildkafra)	Kafra Staff#payg_cas05	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas05,277,249,3	duplicate(cm)	Nahzarf#payg_cas05	55
+payg_cas05,277,249,3	duplicate(cm)	Nahzarf#payg_cas05	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas05,161,136,0	script	#lever_PA05	111,{
+payg_cas05,161,136,0	script	#lever_PA05	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -118,7 +118,7 @@ payg_cas05,161,136,0	script	#lever_PA05	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas05,249,15,0	duplicate(gdlever)	#payg_cas05	111
+payg_cas05,249,15,0	duplicate(gdlever)	#payg_cas05	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt
index 25206d922..a99f37ac9 100644
--- a/npc/guild/prtg_cas01.txt
+++ b/npc/guild/prtg_cas01.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Kriemhild#1::OutsideFlagsPR1	722,{
+-	script	Kriemhild#1::OutsideFlagsPR1	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas01",1);
+	set .@GID, getcastledata("prtg_cas01",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas01",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas01",1)) {
 				warp "prtg_cas01",96,173;
 				end;
 			}
@@ -53,60 +53,60 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePt01:
-	FlagEmblem GetCastleData("prtg_cas01",1);
+	flagemblem getcastledata("prtg_cas01",1);
 	end;
 }
 
-prt_gld,131,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#1-2	722
-prt_gld,138,68,6	duplicate(OutsideFlagsPR1)	Kriemhild#2	722
-prt_gld,138,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#3	722
-prt_gld,135,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#4	722
+prt_gld,131,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#1-2	GUILD_FLAG
+prt_gld,138,68,6	duplicate(OutsideFlagsPR1)	Kriemhild#2	GUILD_FLAG
+prt_gld,138,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#3	GUILD_FLAG
+prt_gld,135,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Kriemhild#5::InsideFlagsPR1	722,{
+-	script	Kriemhild#5::InsideFlagsPR1	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt01:
-	FlagEmblem GetCastleData("prtg_cas01",1);
+	flagemblem getcastledata("prtg_cas01",1);
 	end;
 }
 
-prtg_cas01,58,56,4	duplicate(InsideFlagsPR1)	Kriemhild#5-2	722
-prtg_cas01,64,56,4	duplicate(InsideFlagsPR1)	Kriemhild#6	722
-prtg_cas01,76,32,4	duplicate(InsideFlagsPR1)	Kriemhild#7	722
-prtg_cas01,84,32,4	duplicate(InsideFlagsPR1)	Kriemhild#8	722
-prtg_cas01,94,39,4	duplicate(InsideFlagsPR1)	Kriemhild#9	722
-prtg_cas01,94,24,4	duplicate(InsideFlagsPR1)	Kriemhild#10	722
-prtg_cas01,73,14,4	duplicate(InsideFlagsPR1)	Kriemhild#11	722
-prtg_cas01,73,6,4	duplicate(InsideFlagsPR1)	Kriemhild#12	722
-prtg_cas01,55,46,4	duplicate(InsideFlagsPR1)	Kriemhild#13	722
-prtg_cas01,45,46,4	duplicate(InsideFlagsPR1)	Kriemhild#14	722
+prtg_cas01,58,56,4	duplicate(InsideFlagsPR1)	Kriemhild#5-2	GUILD_FLAG
+prtg_cas01,64,56,4	duplicate(InsideFlagsPR1)	Kriemhild#6	GUILD_FLAG
+prtg_cas01,76,32,4	duplicate(InsideFlagsPR1)	Kriemhild#7	GUILD_FLAG
+prtg_cas01,84,32,4	duplicate(InsideFlagsPR1)	Kriemhild#8	GUILD_FLAG
+prtg_cas01,94,39,4	duplicate(InsideFlagsPR1)	Kriemhild#9	GUILD_FLAG
+prtg_cas01,94,24,4	duplicate(InsideFlagsPR1)	Kriemhild#10	GUILD_FLAG
+prtg_cas01,73,14,4	duplicate(InsideFlagsPR1)	Kriemhild#11	GUILD_FLAG
+prtg_cas01,73,6,4	duplicate(InsideFlagsPR1)	Kriemhild#12	GUILD_FLAG
+prtg_cas01,55,46,4	duplicate(InsideFlagsPR1)	Kriemhild#13	GUILD_FLAG
+prtg_cas01,45,46,4	duplicate(InsideFlagsPR1)	Kriemhild#14	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,155,190,4	duplicate(InsideFlagsPR1)	Kriemhild#15	722
+prontera,155,190,4	duplicate(InsideFlagsPR1)	Kriemhild#15	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas01,96,173,0	duplicate(guildkafra)	Kafra Staff#prtg_cas01	117
+prtg_cas01,96,173,0	duplicate(guildkafra)	Kafra Staff#prtg_cas01	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas01,112,181,0	duplicate(cm)	Ahvray#prtg_cas01	55
+prtg_cas01,112,181,0	duplicate(cm)	Ahvray#prtg_cas01	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas01,15,208,0	script	#Lever_PR01	111,{
+prtg_cas01,15,208,0	script	#Lever_PR01	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ prtg_cas01,15,208,0	script	#Lever_PR01	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas01,94,200,0	duplicate(gdlever)	#prtg_cas01	111
+prtg_cas01,94,200,0	duplicate(gdlever)	#prtg_cas01	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas02.txt b/npc/guild/prtg_cas02.txt
index 4ddb3f64f..ceaae4821 100644
--- a/npc/guild/prtg_cas02.txt
+++ b/npc/guild/prtg_cas02.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Swanhild#1::OutsideFlagsPR2	722,{
+-	script	Swanhild#1::OutsideFlagsPR2	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas02",1);
+	set .@GID, getcastledata("prtg_cas02",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas02",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas02",1)) {
 				warp "prtg_cas02",169,55;
 				end;
 			}
@@ -53,62 +53,62 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePt02:
-	FlagEmblem GetCastleData("prtg_cas02",1);
+	flagemblem getcastledata("prtg_cas02",1);
 	end;
 }
 
-prt_gld,244,126,8	duplicate(OutsideFlagsPR2)	Swanhild#1-2	722
-prt_gld,244,128,8	duplicate(OutsideFlagsPR2)	Swanhild#2	722
-prt_gld,236,126,8	duplicate(OutsideFlagsPR2)	Swanhild#3	722
-prt_gld,236,128,8	duplicate(OutsideFlagsPR2)	Swanhild#4	722
+prt_gld,244,126,8	duplicate(OutsideFlagsPR2)	Swanhild#1-2	GUILD_FLAG
+prt_gld,244,128,8	duplicate(OutsideFlagsPR2)	Swanhild#2	GUILD_FLAG
+prt_gld,236,126,8	duplicate(OutsideFlagsPR2)	Swanhild#3	GUILD_FLAG
+prt_gld,236,128,8	duplicate(OutsideFlagsPR2)	Swanhild#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Swanhild#5::InsideFlagsPR2	722,{
+-	script	Swanhild#5::InsideFlagsPR2	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt02:
-	FlagEmblem GetCastleData("prtg_cas02",1);
+	flagemblem getcastledata("prtg_cas02",1);
 	end;
 }
 
-prtg_cas02,40,227,4	duplicate(InsideFlagsPR2)	Swanhild#5-2	722
-prtg_cas02,46,227,4	duplicate(InsideFlagsPR2)	Swanhild#6	722
-prtg_cas02,11,219,4	duplicate(InsideFlagsPR2)	Swanhild#7	722
-prtg_cas02,11,214,4	duplicate(InsideFlagsPR2)	Swanhild#8	722
-prtg_cas02,20,219,4	duplicate(InsideFlagsPR2)	Swanhild#9	722
-prtg_cas02,20,214,4	duplicate(InsideFlagsPR2)	Swanhild#10	722
-prtg_cas02,79,227,8	duplicate(InsideFlagsPR2)	Swanhild#11	722
-prtg_cas02,70,227,8	duplicate(InsideFlagsPR2)	Swanhild#12	722
-prtg_cas02,38,189,8	duplicate(InsideFlagsPR2)	Swanhild#13	722
-prtg_cas02,34,189,8	duplicate(InsideFlagsPR2)	Swanhild#14	722
-prtg_cas02,153,161,4	duplicate(InsideFlagsPR2)	Swanhild#15	722
-prtg_cas02,162,161,4	duplicate(InsideFlagsPR2)	Swanhild#16	722
+prtg_cas02,40,227,4	duplicate(InsideFlagsPR2)	Swanhild#5-2	GUILD_FLAG
+prtg_cas02,46,227,4	duplicate(InsideFlagsPR2)	Swanhild#6	GUILD_FLAG
+prtg_cas02,11,219,4	duplicate(InsideFlagsPR2)	Swanhild#7	GUILD_FLAG
+prtg_cas02,11,214,4	duplicate(InsideFlagsPR2)	Swanhild#8	GUILD_FLAG
+prtg_cas02,20,219,4	duplicate(InsideFlagsPR2)	Swanhild#9	GUILD_FLAG
+prtg_cas02,20,214,4	duplicate(InsideFlagsPR2)	Swanhild#10	GUILD_FLAG
+prtg_cas02,79,227,8	duplicate(InsideFlagsPR2)	Swanhild#11	GUILD_FLAG
+prtg_cas02,70,227,8	duplicate(InsideFlagsPR2)	Swanhild#12	GUILD_FLAG
+prtg_cas02,38,189,8	duplicate(InsideFlagsPR2)	Swanhild#13	GUILD_FLAG
+prtg_cas02,34,189,8	duplicate(InsideFlagsPR2)	Swanhild#14	GUILD_FLAG
+prtg_cas02,153,161,4	duplicate(InsideFlagsPR2)	Swanhild#15	GUILD_FLAG
+prtg_cas02,162,161,4	duplicate(InsideFlagsPR2)	Swanhild#16	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,146,194,3	duplicate(InsideFlagsPR2)	Swanhild#17	722
+prontera,146,194,3	duplicate(InsideFlagsPR2)	Swanhild#17	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas02,71,36,4	duplicate(guildkafra)	Kafra Staff#prtg_cas02	117
+prtg_cas02,71,36,4	duplicate(guildkafra)	Kafra Staff#prtg_cas02	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas02,94,61,4	duplicate(cm)	Roy#prtg_cas02	55
+prtg_cas02,94,61,4	duplicate(cm)	Roy#prtg_cas02	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas02,207,228,0	script	#Lever_PR02	111,{
+prtg_cas02,207,228,0	script	#Lever_PR02	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -123,7 +123,7 @@ prtg_cas02,207,228,0	script	#Lever_PR02	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas02,84,72,0	duplicate(gdlever)	#prtg_cas02	111
+prtg_cas02,84,72,0	duplicate(gdlever)	#prtg_cas02	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt
index 28dea58d4..b0e0515ec 100644
--- a/npc/guild/prtg_cas03.txt
+++ b/npc/guild/prtg_cas03.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Fadhgridh#1::OutsideFlagsPR3	722,{
+-	script	Fadhgridh#1::OutsideFlagsPR3	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas03",1);
+	set .@GID, getcastledata("prtg_cas03",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas03",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas03",1)) {
 				warp "prtg_cas03",181,215;
 				end;
 			}
@@ -53,60 +53,60 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePt03:
-	FlagEmblem GetCastleData("prtg_cas03",1);
+	flagemblem getcastledata("prtg_cas03",1);
 	end;
 }
 
-prt_gld,147,140,4	duplicate(OutsideFlagsPR3)	Fadhgridh#1-2	722
-prt_gld,147,136,4	duplicate(OutsideFlagsPR3)	Fadhgridh#2	722
-prt_gld,158,140,4	duplicate(OutsideFlagsPR3)	Fadhgridh#3	722
-prt_gld,158,136,4	duplicate(OutsideFlagsPR3)	Fadhgridh#4	722
+prt_gld,147,140,4	duplicate(OutsideFlagsPR3)	Fadhgridh#1-2	GUILD_FLAG
+prt_gld,147,136,4	duplicate(OutsideFlagsPR3)	Fadhgridh#2	GUILD_FLAG
+prt_gld,158,140,4	duplicate(OutsideFlagsPR3)	Fadhgridh#3	GUILD_FLAG
+prt_gld,158,136,4	duplicate(OutsideFlagsPR3)	Fadhgridh#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Fadhgridh#5::InsideFlagsPR3	722,{
+-	script	Fadhgridh#5::InsideFlagsPR3	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt03:
-	FlagEmblem GetCastleData("prtg_cas03",1);
+	flagemblem getcastledata("prtg_cas03",1);
 	end;
 }
 
-prtg_cas03,168,28,4	duplicate(InsideFlagsPR3)	Fadhgridh#5-2	722
-prtg_cas03,182,28,4	duplicate(InsideFlagsPR3)	Fadhgridh#6	722
-prtg_cas03,43,50,4	duplicate(InsideFlagsPR3)	Fadhgridh#7	722
-prtg_cas03,48,50,4	duplicate(InsideFlagsPR3)	Fadhgridh#8	722
-prtg_cas03,43,58,4	duplicate(InsideFlagsPR3)	Fadhgridh#9	722
-prtg_cas03,48,58,4	duplicate(InsideFlagsPR3)	Fadhgridh#10	722
-prtg_cas03,158,210,4	duplicate(InsideFlagsPR3)	Fadhgridh#11	722
-prtg_cas03,169,210,4	duplicate(InsideFlagsPR3)	Fadhgridh#12	722
-prtg_cas03,162,201,4	duplicate(InsideFlagsPR3)	Fadhgridh#13	722
-prtg_cas03,165,201,4	duplicate(InsideFlagsPR3)	Fadhgridh#14	722
+prtg_cas03,168,28,4	duplicate(InsideFlagsPR3)	Fadhgridh#5-2	GUILD_FLAG
+prtg_cas03,182,28,4	duplicate(InsideFlagsPR3)	Fadhgridh#6	GUILD_FLAG
+prtg_cas03,43,50,4	duplicate(InsideFlagsPR3)	Fadhgridh#7	GUILD_FLAG
+prtg_cas03,48,50,4	duplicate(InsideFlagsPR3)	Fadhgridh#8	GUILD_FLAG
+prtg_cas03,43,58,4	duplicate(InsideFlagsPR3)	Fadhgridh#9	GUILD_FLAG
+prtg_cas03,48,58,4	duplicate(InsideFlagsPR3)	Fadhgridh#10	GUILD_FLAG
+prtg_cas03,158,210,4	duplicate(InsideFlagsPR3)	Fadhgridh#11	GUILD_FLAG
+prtg_cas03,169,210,4	duplicate(InsideFlagsPR3)	Fadhgridh#12	GUILD_FLAG
+prtg_cas03,162,201,4	duplicate(InsideFlagsPR3)	Fadhgridh#13	GUILD_FLAG
+prtg_cas03,165,201,4	duplicate(InsideFlagsPR3)	Fadhgridh#14	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,143,203,2	duplicate(InsideFlagsPR3)	Fadhgridh#15	722
+prontera,143,203,2	duplicate(InsideFlagsPR3)	Fadhgridh#15	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas03,181,215,4	duplicate(guildkafra)	Kafra Staff#prtg_cas03	117
+prtg_cas03,181,215,4	duplicate(guildkafra)	Kafra Staff#prtg_cas03	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas03,51,100,4	duplicate(cm)	Sttick#prtg_cas03	55
+prtg_cas03,51,100,4	duplicate(cm)	Sttick#prtg_cas03	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas03,193,130,0	script	#Lever_PR03	111,{
+prtg_cas03,193,130,0	script	#Lever_PR03	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ prtg_cas03,193,130,0	script	#Lever_PR03	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas03,5,70,0	duplicate(gdlever)	#prtg_cas03	111
+prtg_cas03,5,70,0	duplicate(gdlever)	#prtg_cas03	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt
index d6bb7c15c..08f1522db 100644
--- a/npc/guild/prtg_cas04.txt
+++ b/npc/guild/prtg_cas04.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Skoegul#1::OutsideFlagsPR4	722,{
+-	script	Skoegul#1::OutsideFlagsPR4	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas04",1);
+	set .@GID, getcastledata("prtg_cas04",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas04",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas04",1)) {
 					warp "prtg_cas04",258,247;
 				end;
 			}
@@ -53,60 +53,60 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePt04:
-	FlagEmblem GetCastleData("prtg_cas04",1);
+	flagemblem getcastledata("prtg_cas04",1);
 	end;
 }
 
-prt_gld,120,243,6	duplicate(OutsideFlagsPR4)	Skoegul#1-2	722
-prt_gld,120,236,6	duplicate(OutsideFlagsPR4)	Skoegul#2	722
-prt_gld,122,243,6	duplicate(OutsideFlagsPR4)	Skoegul#3	722
-prt_gld,122,236,6	duplicate(OutsideFlagsPR4)	Skoegul#4	722
+prt_gld,120,243,6	duplicate(OutsideFlagsPR4)	Skoegul#1-2	GUILD_FLAG
+prt_gld,120,236,6	duplicate(OutsideFlagsPR4)	Skoegul#2	GUILD_FLAG
+prt_gld,122,243,6	duplicate(OutsideFlagsPR4)	Skoegul#3	GUILD_FLAG
+prt_gld,122,236,6	duplicate(OutsideFlagsPR4)	Skoegul#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Skoegul#5::InsideFlagsPR4	722,{
+-	script	Skoegul#5::InsideFlagsPR4	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt04:
-	FlagEmblem GetCastleData("prtg_cas04",1);
+	flagemblem getcastledata("prtg_cas04",1);
 	end;
 }
 
-prtg_cas04,82,29,4	duplicate(InsideFlagsPR4)	Skoegul#5-2	722
-prtg_cas04,75,29,4	duplicate(InsideFlagsPR4)	Skoegul#6	722
-prtg_cas04,75,27,4	duplicate(InsideFlagsPR4)	Skoegul#7	722
-prtg_cas04,82,27,4	duplicate(InsideFlagsPR4)	Skoegul#8	722
-prtg_cas04,59,29,4	duplicate(InsideFlagsPR4)	Skoegul#9	722
-prtg_cas04,67,29,4	duplicate(InsideFlagsPR4)	Skoegul#10	722
-prtg_cas04,258,25,4	duplicate(InsideFlagsPR4)	Skoegul#11	722
-prtg_cas04,258,20,4	duplicate(InsideFlagsPR4)	Skoegul#12	722
-prtg_cas04,263,20,4	duplicate(InsideFlagsPR4)	Skoegul#13	722
-prtg_cas04,263,27,4	duplicate(InsideFlagsPR4)	Skoegul#14	722
+prtg_cas04,82,29,4	duplicate(InsideFlagsPR4)	Skoegul#5-2	GUILD_FLAG
+prtg_cas04,75,29,4	duplicate(InsideFlagsPR4)	Skoegul#6	GUILD_FLAG
+prtg_cas04,75,27,4	duplicate(InsideFlagsPR4)	Skoegul#7	GUILD_FLAG
+prtg_cas04,82,27,4	duplicate(InsideFlagsPR4)	Skoegul#8	GUILD_FLAG
+prtg_cas04,59,29,4	duplicate(InsideFlagsPR4)	Skoegul#9	GUILD_FLAG
+prtg_cas04,67,29,4	duplicate(InsideFlagsPR4)	Skoegul#10	GUILD_FLAG
+prtg_cas04,258,25,4	duplicate(InsideFlagsPR4)	Skoegul#11	GUILD_FLAG
+prtg_cas04,258,20,4	duplicate(InsideFlagsPR4)	Skoegul#12	GUILD_FLAG
+prtg_cas04,263,20,4	duplicate(InsideFlagsPR4)	Skoegul#13	GUILD_FLAG
+prtg_cas04,263,27,4	duplicate(InsideFlagsPR4)	Skoegul#14	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,167,203,6	duplicate(InsideFlagsPR4)	Skoegul#15	722
+prontera,167,203,6	duplicate(InsideFlagsPR4)	Skoegul#15	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas04,258,247,4	duplicate(guildkafra)	Kafra Staff#prtg_cas04	117
+prtg_cas04,258,247,4	duplicate(guildkafra)	Kafra Staff#prtg_cas04	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas04,259,265,4	duplicate(cm)	Van Dreth#prtg_cas04	55
+prtg_cas04,259,265,4	duplicate(cm)	Van Dreth#prtg_cas04	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas04,275,160,0	script	#Lever_PR04	111,{
+prtg_cas04,275,160,0	script	#Lever_PR04	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ prtg_cas04,275,160,0	script	#Lever_PR04	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas04,56,283,0	duplicate(gdlever)	#prtg_cas04	111
+prtg_cas04,56,283,0	duplicate(gdlever)	#prtg_cas04	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt
index 40c485f95..69ac3eb32 100644
--- a/npc/guild/prtg_cas05.txt
+++ b/npc/guild/prtg_cas05.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Gondul#1::OutsideFlagsPR5	722,{
+-	script	Gondul#1::OutsideFlagsPR5	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas05",1);
+	set .@GID, getcastledata("prtg_cas05",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas05",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas05",1)) {
 				warp "prtg_cas05",52,41;
 				end;
 			}
@@ -53,58 +53,58 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastlePt05:
-	FlagEmblem GetCastleData("prtg_cas05",1);
+	flagemblem getcastledata("prtg_cas05",1);
 	end;
 }
 
-prt_gld,199,243,2	duplicate(OutsideFlagsPR5)	Gondul#1-2	722
-prt_gld,199,236,2	duplicate(OutsideFlagsPR5)	Gondul#2	722
-prt_gld,197,243,2	duplicate(OutsideFlagsPR5)	Gondul#3	722
-prt_gld,197,236,2	duplicate(OutsideFlagsPR5)	Gondul#4	722
+prt_gld,199,243,2	duplicate(OutsideFlagsPR5)	Gondul#1-2	GUILD_FLAG
+prt_gld,199,236,2	duplicate(OutsideFlagsPR5)	Gondul#2	GUILD_FLAG
+prt_gld,197,243,2	duplicate(OutsideFlagsPR5)	Gondul#3	GUILD_FLAG
+prt_gld,197,236,2	duplicate(OutsideFlagsPR5)	Gondul#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Gondul#5::InsideFlagsPR5	722,{
+-	script	Gondul#5::InsideFlagsPR5	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt05:
-	FlagEmblem GetCastleData("prtg_cas05",1);
+	flagemblem getcastledata("prtg_cas05",1);
 	end;
 }
 
-prtg_cas05,19,247,4	duplicate(InsideFlagsPR5)	Gondul#5-2	722
-prtg_cas05,19,243,4	duplicate(InsideFlagsPR5)	Gondul#6	722
-prtg_cas05,26,247,4	duplicate(InsideFlagsPR5)	Gondul#7	722
-prtg_cas05,26,243,4	duplicate(InsideFlagsPR5)	Gondul#8	722
-prtg_cas05,249,289,4	duplicate(InsideFlagsPR5)	Gondul#9	722
-prtg_cas05,256,289,4	duplicate(InsideFlagsPR5)	Gondul#10	722
-prtg_cas05,253,271,4	duplicate(InsideFlagsPR5)	Gondul#11	722
-prtg_cas05,273,257,4	duplicate(InsideFlagsPR5)	Gondul#12	722
+prtg_cas05,19,247,4	duplicate(InsideFlagsPR5)	Gondul#5-2	GUILD_FLAG
+prtg_cas05,19,243,4	duplicate(InsideFlagsPR5)	Gondul#6	GUILD_FLAG
+prtg_cas05,26,247,4	duplicate(InsideFlagsPR5)	Gondul#7	GUILD_FLAG
+prtg_cas05,26,243,4	duplicate(InsideFlagsPR5)	Gondul#8	GUILD_FLAG
+prtg_cas05,249,289,4	duplicate(InsideFlagsPR5)	Gondul#9	GUILD_FLAG
+prtg_cas05,256,289,4	duplicate(InsideFlagsPR5)	Gondul#10	GUILD_FLAG
+prtg_cas05,253,271,4	duplicate(InsideFlagsPR5)	Gondul#11	GUILD_FLAG
+prtg_cas05,273,257,4	duplicate(InsideFlagsPR5)	Gondul#12	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,165,194,5	duplicate(InsideFlagsPR5)	Gondul#13	722
+prontera,165,194,5	duplicate(InsideFlagsPR5)	Gondul#13	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas05,52,41,4	duplicate(guildkafra)	Kafra Staff#prtg_cas05	117
+prtg_cas05,52,41,4	duplicate(guildkafra)	Kafra Staff#prtg_cas05	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas05,36,37,4	duplicate(cm)	Raynor#prtg_cas05	55
+prtg_cas05,36,37,4	duplicate(cm)	Raynor#prtg_cas05	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas05,281,176,0	script	#Lever_PR05	111,{
+prtg_cas05,281,176,0	script	#Lever_PR05	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ prtg_cas05,281,176,0	script	#Lever_PR05	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas05,212,95,0	duplicate(gdlever)	#prtg_cas05	111
+prtg_cas05,212,95,0	duplicate(gdlever)	#prtg_cas05	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/trs_rp.txt b/npc/guild/trs_rp.txt
index 7b3ae5545..260aa6162 100644
--- a/npc/guild/trs_rp.txt
+++ b/npc/guild/trs_rp.txt
@@ -1,16 +1,16 @@
 //===== Hercules Script ======================================
 //= Treasure Room Protection
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Masao
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Warps every Player out of the Treasure Room except for the
 //= Guildleader.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Converted from the official script.
 //= 1.1 Reverted back and optimized. [Daegaladh]
-//============================================================ 
+//============================================================
 
 -	script	Gld_Trea_Protect::Gld_Trea_Protect	-1,{
 
@@ -52,4 +52,4 @@ gefg_cas01,154,112,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas01	-1,6,6
 gefg_cas02,140,116,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas02	-1,6,6
 gefg_cas03,271,290,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas03	-1,6,6
 gefg_cas04,116,119,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas04	-1,6,6
-gefg_cas05,144,110,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas05	-1,6,6
\ No newline at end of file
+gefg_cas05,144,110,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas05	-1,6,6
diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt
index cea4d2223..77e8cdd7c 100644
--- a/npc/guild2/agit_main_se.txt
+++ b/npc/guild2/agit_main_se.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.4
+//= 1.4a
 //===== Description: =========================================
 //= Like agit_main, this file is required
 //= for SE castles to function.
@@ -14,6 +14,7 @@
 //= 1.2 Hopefully fixed a processing error. [Euphy]
 //= 1.3 Fixed barricade issue in schg_cas02. [Cookie]
 //= 1.4 Added OnGuildBreak event and a spawn check. [Euphy]
+//= 1.4a Fixed Guardian Stone respawns. [Euphy]
 //============================================================
 
 // Core, triggers all other events
@@ -48,7 +49,6 @@ OnAgitStart2:
 	if (agitcheck2()) {
 		maprespawnguildid strnpcinfo(2),getcastledata(strnpcinfo(2),1),2;
 		gvgon strnpcinfo(2);
-		setmapflag strnpcinfo(2),mf_zone,"GvG2";
 		donpcevent strnpcinfo(0)+"::OnStart";
 	}
 	else for(set .@i,0; .@i<4; set .@i,.@i+1)
@@ -58,7 +58,6 @@ OnAgitStart2:
 OnAgitEnd2:
 	if (strnpcinfo(2) == "template") end;
 	gvgoff strnpcinfo(2);
-	removemapflag strnpcinfo(2),mf_zone;
 	if (getcastledata(strnpcinfo(2),1)) {
 		set .@str$,substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
 		killmonster strnpcinfo(2),"Steward#"+.@str$+"::OnStartArena";
@@ -109,8 +108,8 @@ OnEmpSpawn:
 
 OnReset:
 	set .@str$, substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
-	donpcevent "df1#"+strnpcinfo(2)+"::OnEnable";
-	donpcevent "df2#"+strnpcinfo(2)+"::OnEnable";
+	donpcevent "df1#"+strnpcinfo(2)+"::OnDisable";
+	donpcevent "df2#"+strnpcinfo(2)+"::OnDisable";
 	donpcevent "gard1#"+strnpcinfo(2)+"::OnReset";
 	donpcevent "gard2#"+strnpcinfo(2)+"::OnReset";
 	donpcevent "1st Guardian Stone#"+.@str$+"::OnDisable";
@@ -144,8 +143,8 @@ OnClock0001:
 		setcastledata strnpcinfo(2),4,0;
 	}
 	if (getcastledata(strnpcinfo(2),5)) {
-		set .@Defence,getcastledata(strnpcinfo(2),3);
-		setcastledata strnpcinfo(2),3,.@Defence+getcastledata(strnpcinfo(2),5);
+		set .@defence,getcastledata(strnpcinfo(2),3);
+		setcastledata strnpcinfo(2),3,.@defence+getcastledata(strnpcinfo(2),5);
 		if (getcastledata(strnpcinfo(2),3) > 100) setcastledata strnpcinfo(2),3,100;
 		setcastledata strnpcinfo(2),5,0;
 	}
@@ -153,12 +152,12 @@ OnClock0001:
 	if (!.@Treasure) end;
 	freeloop(1);
 	if (compare(strnpcinfo(2),"arug")) {
-		if (strnpcinfo(2) == "arug_cas01") { 
+		if (strnpcinfo(2) == "arug_cas01") {
 			set .@treasurebox,1943;
 			setarray .@treasurex[0],251,252,253,254,255,256,257,258,251,252,253,254,255,256,257,258,251,252,253,254,255,256,257,258;
 			setarray .@treasurey[0],369,369,369,369,368,368,368,368,367,367,367,367,366,366,366,366,365,365,365,365,364,364,364,364;
 		}
-		else if (strnpcinfo(2) == "arug_cas02") { 
+		else if (strnpcinfo(2) == "arug_cas02") {
 			set .@treasurebox,1944;
 			setarray .@treasurex[0],382,383,384,385,386,387,384,385,386,387,388,389,382,383,384,385,386,387,384,385,386,387,388,389;
 			setarray .@treasurey[0],231,231,231,231,231,231,230,230,230,230,230,230,225,225,225,225,225,225,224,224,224,224,224,224;
@@ -170,12 +169,12 @@ OnClock0001:
 		}
 	}
 	else {
-		if (strnpcinfo(2) == "schg_cas02") { 
+		if (strnpcinfo(2) == "schg_cas02") {
 			set .@treasurebox,1939;
 			setarray .@treasurex[0],249,250,251,252,253,246,247,248,249,250,250,251,252,253,246,247,248,249,250,249,250,251,252,253;
 			setarray .@treasurey[0],378,378,378,378,378,376,376,376,376,376,374,374,374,374,372,372,372,372,372,370,370,370,370,370;
 		}
-		else if (strnpcinfo(2) == "schg_cas03") { 
+		else if (strnpcinfo(2) == "schg_cas03") {
 			set .@treasurebox,1940;
 			setarray .@treasurex[0],189,190,191,192,193,194,189,190,191,192,193,194,189,190,191,192,193,194,189,190,191,192,193,194;
 			setarray .@treasurey[0], 21, 21, 21, 21, 21, 21, 19, 19, 19, 19, 19, 19, 17, 17, 17, 17, 17, 17, 15, 15, 15, 15, 15, 15;
@@ -331,7 +330,7 @@ OnTreasureDied:
 				mes "for the guild today.";
 				close;
 			}
-			set Zeny, Zeny-.@eco_invest;
+			Zeny -= .@eco_invest;
 			setcastledata strnpcinfo(4),4,getcastledata(strnpcinfo(4),4)+1;
 			mes "[ Steward ]";
 			mes "A wise use of the guild's";
@@ -345,11 +344,11 @@ OnTreasureDied:
 			close;
 		}
 	case 3:
-		set .@Defence,getcastledata(strnpcinfo(4),3);
+		set .@defence,getcastledata(strnpcinfo(4),3);
 		setarray .@cost[0],10000,20000,40000,70000,110000,160000,220000,290000,370000,460000,560000,670000,790000,920000,1060000,1210000,1370000,1540000,1720000,1910000;
 		set .@j,0;
 		for(set .@i,6; .@i<101; set .@i,.@i+5) {
-			if (.@Defence < .@i) {
+			if (.@defence < .@i) {
 				set .@def_invest,.@cost[.@j];
 				break;
 			}
@@ -419,7 +418,7 @@ OnTreasureDied:
 				mes "for the guild today.";
 				close;
 			}
-			set Zeny, Zeny-.@def_invest;
+			Zeny -= .@def_invest;
 			setcastledata strnpcinfo(4),5,getcastledata(strnpcinfo(4),5)+1;
 			mes "[ Steward ]";
 			mes "A wise use of the guild's";
@@ -511,7 +510,7 @@ OnTreasureDied:
 					mes "funds to pay the contract fee.";
 					close;
 				}
-				set Zeny, Zeny-10000;
+				Zeny -= 10000;
 				enablenpc "Kafra Employee#"+strnpcinfo(2);
 				setcastledata strnpcinfo(4),9,1;
 				mes "[ Steward ]";
@@ -608,9 +607,9 @@ OnStartArena:
 	if (.@Economy < 0) set .@Economy, 0;
 	setcastledata strnpcinfo(4),2,.@Economy;
 	// Lower Castle Defence
-	set .@Defence,getcastledata(strnpcinfo(4),3)-5;
-	if (.@Defence < 0) set .@Defence, 0;
-	setcastledata strnpcinfo(4),3,.@Defence;
+	set .@defence,getcastledata(strnpcinfo(4),3)-5;
+	if (.@defence < 0) set .@defence, 0;
+	setcastledata strnpcinfo(4),3,.@defence;
 	// Set new owner
 	setcastledata strnpcinfo(4),1,.@GID;
 	// Clear castle's data.
@@ -624,7 +623,7 @@ OnStartArena:
 	donpcevent "Manager#"+strnpcinfo(4)+"::OnReset";
 	maprespawnguildid strnpcinfo(4),getcastledata(strnpcinfo(4),1),2;
 	donpcevent "Manager#"+strnpcinfo(4)+"::OnRecvCastle2";
-	donpcevent "::OnRecvCastle"+strnpcinfo(2);
+	donpcevent "::OnRecvCastle"+ strtoupper( substr( strnpcinfo(2), 0, 0 ) ) + substr( strnpcinfo(2), 1, getstrlen( strnpcinfo(2) ) -1 );
 	sleep 10000;
 	if (agitcheck2()) {
 		donpcevent "Manager#"+strnpcinfo(4)+"::OnChange";
@@ -841,7 +840,7 @@ OnInit:
 	if (getcharid(2) == .@GID && getgdskilllv(.@GID,10001)) {
 		mes "[Kafra Employee]";
 		mes "Welcome, proud member";
-		mes "of the ^FF0000"+GetGuildName(.@GID)+"^000000 Guild!";
+		mes "of the ^FF0000"+getguildname(.@GID)+"^000000 Guild!";
 		mes "The Kafra Corporation is ready";
 		mes "to assist you wherever you go!";
 		next;
@@ -872,7 +871,7 @@ OnInit:
 					cutin "kafra_01",255;
 					end;
 				}
-				set Zeny, Zeny-200;
+				Zeny -= 200;
 				warp "rachel",115,125;
 				end;
 			case 2:
@@ -910,7 +909,7 @@ OnInit:
 						cutin "kafra_01",255;
 						end;
 					}
-					set Zeny, Zeny-800;
+					Zeny -= 800;
 					setcart;
 					break;
 				case 2:
@@ -966,6 +965,7 @@ OnInit:
 		mes "5 Red Gemstones";
 		next;
 		mes "^3355FFDo you want to continue?^000000";
+		next;
 		if(select("No:Continue") == 1) {
 			mes "^3355FFWork canceled.^000000";
 			close;
@@ -1503,8 +1503,9 @@ OnGuardianStoneDied:
 	end;
 
 OnTimer300000:
+	set .@num, atoi(charat(strnpcinfo(1),2));
 	set .@str$,substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
-	donpcevent "1st Guardian Stone#"+.@str$+"::OnEnable";
+	donpcevent ((.@num == 1)?"1st":"2nd")+" Guardian Stone#"+.@str$+"::OnEnable";
 	setd "$agit_"+.@str$+"["+(atoi(charat(strnpcinfo(1),2))-1)+"]",2;
 	stopnpctimer;
 	end;
diff --git a/npc/guild2/agit_start_se.txt b/npc/guild2/agit_start_se.txt
index ec9de3d9b..74f03cb28 100644
--- a/npc/guild2/agit_start_se.txt
+++ b/npc/guild2/agit_start_se.txt
@@ -31,7 +31,7 @@ OnAgitInit2:
 	   (gettime(4)==4) && (gettime(3)>=18 && gettime(3)<21) ||
 	   (gettime(4)==6) && (gettime(3)>=22 && gettime(3)<23)) {
 		if (!agitcheck2()) {
-			AgitStart2;
+			agitstart2;
 		}
 		end;
 	}
@@ -39,9 +39,9 @@ OnAgitInit2:
 	// end time checks
 	if ((gettime(4)==2) && (gettime(3)==21) ||
 	    (gettime(4)==4) && (gettime(3)==21) ||
-	    (gettime(4)==6) && (gettime(3)==23)) { 
+	    (gettime(4)==6) && (gettime(3)==23)) {
 		if (agitcheck2()) {
-			AgitEnd2;
+			agitend2;
 		}
 		end;
 	}
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index a2b929347..be190c77f 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -18,58 +18,58 @@
 -	duplicate(RL#template)	RL2#arug_cas01	-1
 -	duplicate(RL#template)	RL3#arug_cas01	-1
 
-arug_cas01,92,380,3	duplicate(Steward#template)	Steward#ar01	55
-arug_cas01,112,193,1	duplicate(Guardian#template)	Brace#ar01	868
-arug_cas01,31,362,3	duplicate(Kafra#template)	Kafra Employee#ar01	117
-arug_cas01,211,234,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar01	844
-arug_cas01,308,189,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar01	844
-arug_cas01,247,52,0	duplicate(Control#template)	Control Device01#ar01	111
-arug_cas01,118,131,0	duplicate(Control#template)	Control Device02#ar01	111
-arug_cas01,82,172,0	duplicate(Control#template)	Control Device03#ar01	111
-arug_cas01,259,371,0	duplicate(Switch#template)	#aru01_switch	111
-arug_cas01,157,345,3	duplicate(Sunflower#template)	Mysterious Sunflower#06	977
+arug_cas01,92,380,3	duplicate(Steward#template)	Steward#ar01	1_M_JOBTESTER
+arug_cas01,112,193,1	duplicate(Guardian#template)	Brace#ar01	4_M_LGTGUARD
+arug_cas01,31,362,3	duplicate(Kafra#template)	Kafra Employee#ar01	4_F_KAFRA1
+arug_cas01,211,234,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar01	CLEAR_NPC
+arug_cas01,308,189,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar01	CLEAR_NPC
+arug_cas01,247,52,0	duplicate(Control#template)	Control Device01#ar01	HIDDEN_NPC
+arug_cas01,118,131,0	duplicate(Control#template)	Control Device02#ar01	HIDDEN_NPC
+arug_cas01,82,172,0	duplicate(Control#template)	Control Device03#ar01	HIDDEN_NPC
+arug_cas01,259,371,0	duplicate(Switch#template)	#aru01_switch	HIDDEN_NPC
+arug_cas01,157,345,3	duplicate(Sunflower#template)	Mysterious Sunflower#06	4_RED_FLOWER
 
-arug_cas01,74,232,0	script	LF-01#arug_cas01	111,{ callfunc "LinkFlag","First Gate House",158,237,"Second Gate House",297,248; }
-arug_cas01,77,232,0	script	LF-02#arug_cas01	111,{ callfunc "LinkFlag","Defense Area 1-1",197,144,"Defense Area 1-2",245,103; }
-arug_cas01,80,232,0	script	LF-03#arug_cas01	111,{ callfunc "LinkFlag","Defense Area 2-1",256,35,"Defense Area 2-2",186,26; }
-arug_cas01,83,232,0	script	LF-04#arug_cas01	111,{ callfunc "LinkFlag","Defense Area 2-3",146,65,"Defense Area 2-4",176,111; }
-arug_cas01,86,232,0	script	LF-05#arug_cas01	111,{ callfunc "LinkFlag","Defense Area 3-1",94,126,"Defense Area 3-2",126,126; }
-arug_cas01,89,232,0	script	LF-06#arug_cas01	111,{ callfunc "LinkFlag","Defense Area 3-3",68,171,"Defense Area 3-4",105,182; }
-arug_cas01,92,232,0	script	LF-07#arug_cas01	111,{ callfunc "LinkFlag","Gate House Fork",233,130; }
-arug_cas01,95,232,0	script	LF-08#arug_cas01	111,{ callfunc "LinkFlag","Area 1-1",197,144,"Area 2-1",256,35,"Area 3-1",146,65; }
-arug_cas01,98,232,0	script	LF-09#arug_cas01	111,{ callfunc "LinkFlag","Area 1-2",245,103,"Area 2-2",186,26,"Area 3-3",68,171; }
-arug_cas01,101,232,0	script	LF-10#arug_cas01	111,{ callfunc "LinkFlag","Convenience Facility",121,357; }
-arug_cas01,72,176,0	script	Mardol#LF_ar01_1::LF_ar01_1	111,{ callfunc "LinkFlag","Emperium Center",67,193; }
-arug_cas01,103,186,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_2	111
-arug_cas01,92,126,4	script	Mardol#LF_ar01_3::LF_ar01_2	111,{
+arug_cas01,74,232,0	script	LF-01#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",158,237,"Second Gate House",297,248; }
+arug_cas01,77,232,0	script	LF-02#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",197,144,"Defense Area 1-2",245,103; }
+arug_cas01,80,232,0	script	LF-03#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",256,35,"Defense Area 2-2",186,26; }
+arug_cas01,83,232,0	script	LF-04#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",146,65,"Defense Area 2-4",176,111; }
+arug_cas01,86,232,0	script	LF-05#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",94,126,"Defense Area 3-2",126,126; }
+arug_cas01,89,232,0	script	LF-06#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-3",68,171,"Defense Area 3-4",105,182; }
+arug_cas01,92,232,0	script	LF-07#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Gate House Fork",233,130; }
+arug_cas01,95,232,0	script	LF-08#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-1",197,144,"Area 2-1",256,35,"Area 3-1",146,65; }
+arug_cas01,98,232,0	script	LF-09#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",245,103,"Area 2-2",186,26,"Area 3-3",68,171; }
+arug_cas01,101,232,0	script	LF-10#arug_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",121,357; }
+arug_cas01,72,176,0	script	Mardol#LF_ar01_1::LF_ar01_1	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",67,193; }
+arug_cas01,103,186,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_2	HIDDEN_NPC
+arug_cas01,92,126,4	script	Mardol#LF_ar01_3::LF_ar01_2	HIDDEN_NPC,{
 	callfunc "LinkFlag","Emperium Center",67,193;
 	end;
 OnAgitInit2:
 OnRecvCastleAr01:
-	FlagEmblem GetCastleData("arug_cas01",1);
+	flagemblem getcastledata("arug_cas01",1);
 	end;
 }
-arug_cas01,127,126,4	duplicate(LF_ar01_2)	Mardol#LF_ar01_3	111
-arug_cas01,150,102,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_4	111
-arug_cas01,208,68,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_5	111
-arug_cas01,249,52,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_6	111
-arug_cas01,234,76,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_7	111
-arug_cas01,249,76,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_8	111
-arug_cas01,204,142,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_9	111
-arug_cas01,183,244,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_10	111
-arug_cas01,292,219,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_11	111
-arug_cas01,102,120,4	duplicate(LF_ar01_2)	Mardol#LF_ar01_12	722
-arug_cas01,117,120,4	duplicate(LF_ar01_2)	Mardol#LF_ar01_13	722
-arug_cas01,233,140,4	duplicate(LF_ar01_2)	Mardol#LF_ar01_14	722
+arug_cas01,127,126,4	duplicate(LF_ar01_2)	Mardol#LF_ar01_3	HIDDEN_NPC
+arug_cas01,150,102,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_4	HIDDEN_NPC
+arug_cas01,208,68,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_5	HIDDEN_NPC
+arug_cas01,249,52,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_6	HIDDEN_NPC
+arug_cas01,234,76,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_7	HIDDEN_NPC
+arug_cas01,249,76,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_8	HIDDEN_NPC
+arug_cas01,204,142,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_9	HIDDEN_NPC
+arug_cas01,183,244,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_10	HIDDEN_NPC
+arug_cas01,292,219,0	duplicate(LF_ar01_1)	Mardol#LF_ar01_11	HIDDEN_NPC
+arug_cas01,102,120,4	duplicate(LF_ar01_2)	Mardol#LF_ar01_12	GUILD_FLAG
+arug_cas01,117,120,4	duplicate(LF_ar01_2)	Mardol#LF_ar01_13	GUILD_FLAG
+arug_cas01,233,140,4	duplicate(LF_ar01_2)	Mardol#LF_ar01_14	GUILD_FLAG
 
-aru_gld,164,270,4	script	Mardol#flag_Ar01_1::Ar01_Flag	722,{
+aru_gld,164,270,4	script	Mardol#flag_Ar01_1::Ar01_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas01",1;
 	end;
 OnAgitInit2:
 OnRecvCastleAr01:
-	FlagEmblem GetCastleData("arug_cas01",1);
+	flagemblem getcastledata("arug_cas01",1);
 	end;
 }
-aru_gld,142,235,4	duplicate(Ar01_Flag)	Mardol#flag_Ar01_2	722
-aru_gld,164,245,5	duplicate(Ar01_Flag)	Mardol#flag_Ar01_3	722
-aru_gld,182,255,5	duplicate(Ar01_Flag)	Mardol#flag_Ar01_4	722
\ No newline at end of file
+aru_gld,142,235,4	duplicate(Ar01_Flag)	Mardol#flag_Ar01_2	GUILD_FLAG
+aru_gld,164,245,5	duplicate(Ar01_Flag)	Mardol#flag_Ar01_3	GUILD_FLAG
+aru_gld,182,255,5	duplicate(Ar01_Flag)	Mardol#flag_Ar01_4	GUILD_FLAG
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index a6b7f0d55..bf7f639eb 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -18,63 +18,63 @@
 -	duplicate(RL#template)	RL2#arug_cas02	-1
 -	duplicate(RL#template)	RL3#arug_cas02	-1
 
-arug_cas02,303,341,3	duplicate(Steward#template)	Steward#ar02	55
-arug_cas02,38,259,5	duplicate(Guardian#template)	Yumenes#ar02	868
-arug_cas02,354,326,3	duplicate(Kafra#template)	Kafra Employee#ar02	117
-arug_cas02,33,168,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar02	844
-arug_cas02,245,168,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar02	844
-arug_cas02,143,228,0	duplicate(Control#template)	Control Device01#ar02	111
-arug_cas02,118,356,0	duplicate(Control#template)	Control Device02#ar02	111
-arug_cas02,56,308,0	duplicate(Control#template)	Control Device03#ar02	111
-arug_cas02,386,227,0	duplicate(Switch#template)	#aru02_switch	111
-arug_cas02,350,294,3	duplicate(Sunflower#template)	Mysterious Sunflower#07	977
+arug_cas02,303,341,3	duplicate(Steward#template)	Steward#ar02	1_M_JOBTESTER
+arug_cas02,38,259,5	duplicate(Guardian#template)	Yumenes#ar02	4_M_LGTGUARD
+arug_cas02,354,326,3	duplicate(Kafra#template)	Kafra Employee#ar02	4_F_KAFRA1
+arug_cas02,33,168,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar02	CLEAR_NPC
+arug_cas02,245,168,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar02	CLEAR_NPC
+arug_cas02,143,228,0	duplicate(Control#template)	Control Device01#ar02	HIDDEN_NPC
+arug_cas02,118,356,0	duplicate(Control#template)	Control Device02#ar02	HIDDEN_NPC
+arug_cas02,56,308,0	duplicate(Control#template)	Control Device03#ar02	HIDDEN_NPC
+arug_cas02,386,227,0	duplicate(Switch#template)	#aru02_switch	HIDDEN_NPC
+arug_cas02,350,294,3	duplicate(Sunflower#template)	Mysterious Sunflower#07	4_RED_FLOWER
 
-arug_cas02,98,270,0	script	LF-01#arug_cas02	111,{ callfunc "LinkFlag","First Gate House",10,187,"Second Gate House",268,187; }
-arug_cas02,98,266,0	script	LF-02#arug_cas02	111,{ callfunc "LinkFlag","Defense Area 1-1",66,31,"Defense Area 1-2",212,31; }
-arug_cas02,98,262,0	script	LF-03#arug_cas02	111,{ callfunc "LinkFlag","Defense Area 1-3",90,120,"Defense Area 1-4",188,119; }
-arug_cas02,98,258,0	script	LF-04#arug_cas02	111,{ callfunc "LinkFlag","Defense Area 2-1",119,183,"Defense Area 2-2",159,183; }
-arug_cas02,98,253,0	script	LF-05#arug_cas02	111,{ callfunc "LinkFlag","Defense Area 2-3",156,324,"Defense Area 2-4",174,372; }
-arug_cas02,98,249,0	script	LF-06#arug_cas02	111,{ callfunc "LinkFlag","Defense Area 3-1",28,325,"Defense Area 3-2",57,325; }
-arug_cas02,98,245,0	script	LF-07#arug_cas02	111,{ callfunc "LinkFlag","Center 2nd Area",156,263,"Center 3rd Area",43,354; }
-arug_cas02,98,241,0	script	LF-08#arug_cas02	111,{ callfunc "LinkFlag","Convenience Facility",387,323; }
-arug_cas02,216,92,0	script	Cyr#LF_ar02_1::LF_ar02_1	111,{ callfunc "LinkFlag","Emperium Center",43,256; }
-arug_cas02,63,92,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_2	111
-arug_cas02,127,133,4	duplicate(LF_ar02_1)	Cyr#LF_ar02_3	111
-arug_cas02,152,133,4	duplicate(LF_ar02_1)	Cyr#LF_ar02_4	111
-arug_cas02,149,218,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_5	111
-arug_cas02,162,218,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_6	111
-arug_cas02,128,350,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_7	111
-arug_cas02,128,341,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_8	111
-arug_cas02,49,317,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_9	111
-arug_cas02,30,317,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_10	111
-arug_cas02,9,190,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_11	111
-arug_cas02,271,190,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_12	111
-arug_cas02,129,178,4	script	Cyr#LF_ar02_13::LF_ar02_2	722,{
+arug_cas02,98,270,0	script	LF-01#arug_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",10,187,"Second Gate House",268,187; }
+arug_cas02,98,266,0	script	LF-02#arug_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",66,31,"Defense Area 1-2",212,31; }
+arug_cas02,98,262,0	script	LF-03#arug_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-3",90,120,"Defense Area 1-4",188,119; }
+arug_cas02,98,258,0	script	LF-04#arug_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",119,183,"Defense Area 2-2",159,183; }
+arug_cas02,98,253,0	script	LF-05#arug_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",156,324,"Defense Area 2-4",174,372; }
+arug_cas02,98,249,0	script	LF-06#arug_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",28,325,"Defense Area 3-2",57,325; }
+arug_cas02,98,245,0	script	LF-07#arug_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Center 2nd Area",156,263,"Center 3rd Area",43,354; }
+arug_cas02,98,241,0	script	LF-08#arug_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",387,323; }
+arug_cas02,216,92,0	script	Cyr#LF_ar02_1::LF_ar02_1	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",43,256; }
+arug_cas02,63,92,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_2	HIDDEN_NPC
+arug_cas02,127,133,4	duplicate(LF_ar02_1)	Cyr#LF_ar02_3	HIDDEN_NPC
+arug_cas02,152,133,4	duplicate(LF_ar02_1)	Cyr#LF_ar02_4	HIDDEN_NPC
+arug_cas02,149,218,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_5	HIDDEN_NPC
+arug_cas02,162,218,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_6	HIDDEN_NPC
+arug_cas02,128,350,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_7	HIDDEN_NPC
+arug_cas02,128,341,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_8	HIDDEN_NPC
+arug_cas02,49,317,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_9	HIDDEN_NPC
+arug_cas02,30,317,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_10	HIDDEN_NPC
+arug_cas02,9,190,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_11	HIDDEN_NPC
+arug_cas02,271,190,0	duplicate(LF_ar02_1)	Cyr#LF_ar02_12	HIDDEN_NPC
+arug_cas02,129,178,4	script	Cyr#LF_ar02_13::LF_ar02_2	GUILD_FLAG,{
 	callfunc "LinkFlag","Emperium Center",43,256;
 	end;
 OnAgitInit2:
 OnRecvCastleAr02:
-	FlagEmblem GetCastleData("arug_cas02",1);
+	flagemblem getcastledata("arug_cas02",1);
 	end;
 }
-arug_cas02,149,178,4	duplicate(LF_ar02_2)	Cyr#LF_ar02_14	722
-arug_cas02,132,38,4	duplicate(LF_ar02_2)	Cyr#LF_ar02_15	722
-arug_cas02,147,38,4	duplicate(LF_ar02_2)	Cyr#LF_ar02_16	722
+arug_cas02,149,178,4	duplicate(LF_ar02_2)	Cyr#LF_ar02_14	GUILD_FLAG
+arug_cas02,132,38,4	duplicate(LF_ar02_2)	Cyr#LF_ar02_15	GUILD_FLAG
+arug_cas02,147,38,4	duplicate(LF_ar02_2)	Cyr#LF_ar02_16	GUILD_FLAG
 
-aru_gld,80,41,6	script	Cyr#flag_Ar02_1::Ar02_Flag	722,{
+aru_gld,80,41,6	script	Cyr#flag_Ar02_1::Ar02_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas02",1;
 	end;
 OnAgitInit2:
 OnRecvCastleAr02:
-	FlagEmblem GetCastleData("arug_cas02",1);
+	flagemblem getcastledata("arug_cas02",1);
 	end;
 }
-aru_gld,80,52,6	duplicate(Ar02_Flag)	Cyr#flag_Ar02_2	722
-aru_gld,120,83,5	script	Cyr#flag_Ar02_3	722,{
+aru_gld,80,52,6	duplicate(Ar02_Flag)	Cyr#flag_Ar02_2	GUILD_FLAG
+aru_gld,120,83,5	script	Cyr#flag_Ar02_3	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas02",0;
 	end;
 OnAgitInit2:
 OnRecvCastleAr02:
-	FlagEmblem GetCastleData("arug_cas02",1);
+	flagemblem getcastledata("arug_cas02",1);
 	end;
-}
\ No newline at end of file
+}
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index bf11c9449..0a1665566 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -18,55 +18,55 @@
 -	duplicate(RL#template)	RL2#arug_cas03	-1
 -	duplicate(RL#template)	RL3#arug_cas03	-1
 
-arug_cas03,328,98,3	duplicate(Steward#template)	Steward#ar03	55
-arug_cas03,146,315,3	duplicate(Guardian#template)	Yehsus#ar03	868
-arug_cas03,315,98,5	duplicate(Kafra#template)	Kafra Employee#ar03	117
-arug_cas03,65,171,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar03	844
-arug_cas03,212,149,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar03	844
-arug_cas03,136,158,0	duplicate(Control#template)	Control Device01#ar03	111
-arug_cas03,135,212,0	duplicate(Control#template)	Control Device02#ar03	111
-arug_cas03,134,266,0	duplicate(Control#template)	Control Device03#ar03	111
-arug_cas03,299,277,0	duplicate(Switch#template)	#aru03_switch	111
-arug_cas03,312,154,3	duplicate(Sunflower#template)	Mysterious Sunflower#08	977
+arug_cas03,328,98,3	duplicate(Steward#template)	Steward#ar03	1_M_JOBTESTER
+arug_cas03,146,315,3	duplicate(Guardian#template)	Yehsus#ar03	4_M_LGTGUARD
+arug_cas03,315,98,5	duplicate(Kafra#template)	Kafra Employee#ar03	4_F_KAFRA1
+arug_cas03,65,171,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar03	CLEAR_NPC
+arug_cas03,212,149,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar03	CLEAR_NPC
+arug_cas03,136,158,0	duplicate(Control#template)	Control Device01#ar03	HIDDEN_NPC
+arug_cas03,135,212,0	duplicate(Control#template)	Control Device02#ar03	HIDDEN_NPC
+arug_cas03,134,266,0	duplicate(Control#template)	Control Device03#ar03	HIDDEN_NPC
+arug_cas03,299,277,0	duplicate(Switch#template)	#aru03_switch	HIDDEN_NPC
+arug_cas03,312,154,3	duplicate(Sunflower#template)	Mysterious Sunflower#08	4_RED_FLOWER
 
-arug_cas03,122,314,0	script	LF-01#arug_cas03	111,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
-arug_cas03,125,314,0	script	LF-02#arug_cas03	111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
-arug_cas03,128,314,0	script	LF-03#arug_cas03	111,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
-arug_cas03,131,314,0	script	LF-04#arug_cas03	111,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
-arug_cas03,134,314,0	script	LF-05#arug_cas03	111,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
-arug_cas03,149,314,0	script	LF-06#arug_cas03	111,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
-arug_cas03,152,314,0	script	LF-07#arug_cas03	111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
-arug_cas03,155,314,0	script	LF-08#arug_cas03	111,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
-arug_cas03,158,314,0	script	LF-09#arug_cas03	111,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
-arug_cas03,161,314,0	script	LF-10#arug_cas03	111,{ callfunc "LinkFlag","Convenience Facility",321,57; }
-arug_cas03,45,158,0	script	Horn#LF_ar03_01::LF_ar03_01	111,{ callfunc "LinkFlag","Emperium Center",121,318; }
-arug_cas03,226,156,0	duplicate(LF_ar03_01)	Horn#LF_ar03_01	111
-arug_cas03,134,62,4	duplicate(LF_ar03_01)	Horn#LF_ar03_02	111
-arug_cas03,149,62,4	duplicate(LF_ar03_01)	Horn#LF_ar03_03	111
-arug_cas03,123,154,0	duplicate(LF_ar03_01)	Horn#LF_ar03_04	111
-arug_cas03,160,154,0	duplicate(LF_ar03_01)	Horn#LF_ar03_05	111
-arug_cas03,135,205,0	duplicate(LF_ar03_01)	Horn#LF_ar03_06	111
-arug_cas03,148,205,0	duplicate(LF_ar03_01)	Horn#LF_ar03_07	111
-arug_cas03,134,260,0	duplicate(LF_ar03_01)	Horn#LF_ar03_08	111
-//arug_cas03,204,142,0	duplicate(LF_ar03_01)	Horn#LF_ar03_09	111
-arug_cas03,148,103,4	script	Horn#LF_ar03_10::LF_ar03_02	722,{
+arug_cas03,122,314,0	script	LF-01#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
+arug_cas03,125,314,0	script	LF-02#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
+arug_cas03,128,314,0	script	LF-03#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
+arug_cas03,131,314,0	script	LF-04#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
+arug_cas03,134,314,0	script	LF-05#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
+arug_cas03,149,314,0	script	LF-06#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
+arug_cas03,152,314,0	script	LF-07#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
+arug_cas03,155,314,0	script	LF-08#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
+arug_cas03,158,314,0	script	LF-09#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
+arug_cas03,161,314,0	script	LF-10#arug_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",321,57; }
+arug_cas03,45,158,0	script	Horn#LF_ar03_01::LF_ar03_01	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",121,318; }
+arug_cas03,226,156,0	duplicate(LF_ar03_01)	Horn#LF_ar03_01	HIDDEN_NPC
+arug_cas03,134,62,4	duplicate(LF_ar03_01)	Horn#LF_ar03_02	HIDDEN_NPC
+arug_cas03,149,62,4	duplicate(LF_ar03_01)	Horn#LF_ar03_03	HIDDEN_NPC
+arug_cas03,123,154,0	duplicate(LF_ar03_01)	Horn#LF_ar03_04	HIDDEN_NPC
+arug_cas03,160,154,0	duplicate(LF_ar03_01)	Horn#LF_ar03_05	HIDDEN_NPC
+arug_cas03,135,205,0	duplicate(LF_ar03_01)	Horn#LF_ar03_06	HIDDEN_NPC
+arug_cas03,148,205,0	duplicate(LF_ar03_01)	Horn#LF_ar03_07	HIDDEN_NPC
+arug_cas03,134,260,0	duplicate(LF_ar03_01)	Horn#LF_ar03_08	HIDDEN_NPC
+//arug_cas03,204,142,0	duplicate(LF_ar03_01)	Horn#LF_ar03_09	HIDDEN_NPC
+arug_cas03,148,103,4	script	Horn#LF_ar03_10::LF_ar03_02	GUILD_FLAG,{
 	callfunc "LinkFlag","Emperium Center",121,318;
 	end;
 OnAgitInit2:
 OnRecvCastleAr03:
-	FlagEmblem GetCastleData("arug_cas03",1);
+	flagemblem getcastledata("arug_cas03",1);
 	end;
 }
-arug_cas03,135,103,4	duplicate(LF_ar03_02)	Horn#LF_ar03_11	722
-arug_cas03,63,51,7	duplicate(LF_ar03_02)	Horn#LF_ar03_12	722
-arug_cas03,214,51,1	duplicate(LF_ar03_02)	Horn#LF_ar03_13	722
+arug_cas03,135,103,4	duplicate(LF_ar03_02)	Horn#LF_ar03_11	GUILD_FLAG
+arug_cas03,63,51,7	duplicate(LF_ar03_02)	Horn#LF_ar03_12	GUILD_FLAG
+arug_cas03,214,51,1	duplicate(LF_ar03_02)	Horn#LF_ar03_13	GUILD_FLAG
 
-aru_gld,60,174,0	script	Horn#flag_Ar03_1::Ar03_Flag	722,{
+aru_gld,60,174,0	script	Horn#flag_Ar03_1::Ar03_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas03",1;
 	end;
 OnAgitInit2:
 OnRecvCastleAr03:
-	FlagEmblem GetCastleData("arug_cas03",1);
+	flagemblem getcastledata("arug_cas03",1);
 	end;
 }
-aru_gld,74,174,0	duplicate(Ar03_Flag)	Horn#flag_Ar03_2	722
\ No newline at end of file
+aru_gld,74,174,0	duplicate(Ar03_Flag)	Horn#flag_Ar03_2	GUILD_FLAG
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index c46c7ff15..e6d734684 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -18,64 +18,64 @@
 -	duplicate(RL#template)	RL2#arug_cas04	-1
 -	duplicate(RL#template)	RL3#arug_cas04	-1
 
-arug_cas04,328,98,3	duplicate(Steward#template)	Steward#ar04	55
-arug_cas04,146,315,3	duplicate(Guardian#template)	Nios#ar04	868
-arug_cas04,315,98,5	duplicate(Kafra#template)	Kafra Employee#ar04	117
-arug_cas04,65,171,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar04	844
-arug_cas04,212,149,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar04	844
-arug_cas04,136,158,0	duplicate(Control#template)	Control Device01#ar04	111
-arug_cas04,135,212,0	duplicate(Control#template)	Control Device02#ar04	111
-arug_cas04,134,266,0	duplicate(Control#template)	Control Device03#ar04	111
-arug_cas04,299,277,0	duplicate(Switch#template)	#aru04_switch	111
-arug_cas04,312,154,3	duplicate(Sunflower#template)	Mysterious Sunflower#09	977
+arug_cas04,328,98,3	duplicate(Steward#template)	Steward#ar04	1_M_JOBTESTER
+arug_cas04,146,315,3	duplicate(Guardian#template)	Nios#ar04	4_M_LGTGUARD
+arug_cas04,315,98,5	duplicate(Kafra#template)	Kafra Employee#ar04	4_F_KAFRA1
+arug_cas04,65,171,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar04	CLEAR_NPC
+arug_cas04,212,149,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar04	CLEAR_NPC
+arug_cas04,136,158,0	duplicate(Control#template)	Control Device01#ar04	HIDDEN_NPC
+arug_cas04,135,212,0	duplicate(Control#template)	Control Device02#ar04	HIDDEN_NPC
+arug_cas04,134,266,0	duplicate(Control#template)	Control Device03#ar04	HIDDEN_NPC
+arug_cas04,299,277,0	duplicate(Switch#template)	#aru04_switch	HIDDEN_NPC
+arug_cas04,312,154,3	duplicate(Sunflower#template)	Mysterious Sunflower#09	4_RED_FLOWER
 
-arug_cas04,122,314,0	script	LF-01#arug_cas04	111,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
-arug_cas04,125,314,0	script	LF-02#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
-arug_cas04,128,314,0	script	LF-03#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
-arug_cas04,131,314,0	script	LF-04#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
-arug_cas04,134,314,0	script	LF-05#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
-arug_cas04,149,314,0	script	LF-06#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
-arug_cas04,152,314,0	script	LF-07#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
-arug_cas04,155,314,0	script	LF-08#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
-arug_cas04,158,314,0	script	LF-09#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
-arug_cas04,161,314,0	script	LF-10#arug_cas04	111,{ callfunc "LinkFlag","Convenience Facility",321,57; }
-arug_cas04,45,158,0	script	Gefn#LF_ar04_01::LF_ar04_01	111,{ callfunc "LinkFlag","Emperium Center",121,318; }
-arug_cas04,226,156,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_01	111
-arug_cas04,134,62,4	duplicate(LF_ar04_01)	Gefn#LF_ar04_02	111
-arug_cas04,149,62,4	duplicate(LF_ar04_01)	Gefn#LF_ar04_03	111
-arug_cas04,123,154,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_04	111
-arug_cas04,160,154,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_05	111
-arug_cas04,135,205,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_06	111
-arug_cas04,148,205,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_07	111
-arug_cas04,134,260,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_08	111
-//arug_cas04,204,142,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_09	111
-arug_cas04,148,103,4	script	Gefn#LF_ar04_10::LF_ar04_02	722,{
+arug_cas04,122,314,0	script	LF-01#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
+arug_cas04,125,314,0	script	LF-02#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
+arug_cas04,128,314,0	script	LF-03#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
+arug_cas04,131,314,0	script	LF-04#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
+arug_cas04,134,314,0	script	LF-05#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
+arug_cas04,149,314,0	script	LF-06#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
+arug_cas04,152,314,0	script	LF-07#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
+arug_cas04,155,314,0	script	LF-08#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
+arug_cas04,158,314,0	script	LF-09#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
+arug_cas04,161,314,0	script	LF-10#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",321,57; }
+arug_cas04,45,158,0	script	Gefn#LF_ar04_01::LF_ar04_01	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",121,318; }
+arug_cas04,226,156,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_01	HIDDEN_NPC
+arug_cas04,134,62,4	duplicate(LF_ar04_01)	Gefn#LF_ar04_02	HIDDEN_NPC
+arug_cas04,149,62,4	duplicate(LF_ar04_01)	Gefn#LF_ar04_03	HIDDEN_NPC
+arug_cas04,123,154,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_04	HIDDEN_NPC
+arug_cas04,160,154,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_05	HIDDEN_NPC
+arug_cas04,135,205,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_06	HIDDEN_NPC
+arug_cas04,148,205,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_07	HIDDEN_NPC
+arug_cas04,134,260,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_08	HIDDEN_NPC
+//arug_cas04,204,142,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_09	HIDDEN_NPC
+arug_cas04,148,103,4	script	Gefn#LF_ar04_10::LF_ar04_02	GUILD_FLAG,{
 	callfunc "LinkFlag","Emperium Center",121,318;
 	end;
 OnAgitInit2:
-OnRecvCastlear04:
-	FlagEmblem GetCastleData("arug_cas04",1);
+OnRecvCastleAr04:
+	flagemblem getcastledata("arug_cas04",1);
 	end;
 }
-arug_cas04,135,103,4	duplicate(LF_ar04_02)	Gefn#LF_ar04_11	722
-arug_cas04,63,51,7	duplicate(LF_ar04_02)	Gefn#LF_ar04_12	722
-arug_cas04,214,51,1	duplicate(LF_ar04_02)	Gefn#LF_ar04_13	722
+arug_cas04,135,103,4	duplicate(LF_ar04_02)	Gefn#LF_ar04_11	GUILD_FLAG
+arug_cas04,63,51,7	duplicate(LF_ar04_02)	Gefn#LF_ar04_12	GUILD_FLAG
+arug_cas04,214,51,1	duplicate(LF_ar04_02)	Gefn#LF_ar04_13	GUILD_FLAG
 
-aru_gld,306,359,6	script	Gefn#flag_ar04_1::ar04_Flag	722,{
+aru_gld,306,359,6	script	Gefn#flag_ar04_1::ar04_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas04",1;
 	end;
 OnAgitInit2:
-OnRecvCastlear04:
-	FlagEmblem GetCastleData("arug_cas04",1);
+OnRecvCastleAr04:
+	flagemblem getcastledata("arug_cas04",1);
 	end;
 }
-aru_gld,306,348,6	duplicate(ar04_Flag)	Gefn#flag_ar04_2	722
-aru_gld,301,318,4	script	Gefn#flag_ar04_3::ar04_Flag2	722,{
+aru_gld,306,348,6	duplicate(ar04_Flag)	Gefn#flag_ar04_2	GUILD_FLAG
+aru_gld,301,318,4	script	Gefn#flag_ar04_3::ar04_Flag2	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas04",0;
 	end;
 OnAgitInit2:
-OnRecvCastlear04:
-	FlagEmblem GetCastleData("arug_cas04",1);
+OnRecvCastleAr04:
+	flagemblem getcastledata("arug_cas04",1);
 	end;
 }
-aru_gld,313,318,4	duplicate(ar04_Flag2)	Gefn#flag_ar04_4	722
\ No newline at end of file
+aru_gld,313,318,4	duplicate(ar04_Flag2)	Gefn#flag_ar04_4	GUILD_FLAG
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index b250a9385..e4848b346 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -18,64 +18,64 @@
 -	duplicate(RL#template)	RL2#arug_cas05	-1
 -	duplicate(RL#template)	RL3#arug_cas05	-1
 
-arug_cas05,328,98,3	duplicate(Steward#template)	Steward#ar05	55
-arug_cas05,146,315,3	duplicate(Guardian#template)	Eeos#ar05	868
-arug_cas05,315,98,5	duplicate(Kafra#template)	Kafra Employee#ar05	117
-arug_cas05,65,171,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar05	844
-arug_cas05,212,149,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar05	844
-arug_cas05,136,158,0	duplicate(Control#template)	Control Device01#ar05	111
-arug_cas05,135,212,0	duplicate(Control#template)	Control Device02#ar05	111
-arug_cas05,134,266,0	duplicate(Control#template)	Control Device03#ar05	111
-arug_cas05,299,277,0	duplicate(Switch#template)	#aru05_switch	111
-arug_cas05,312,154,3	duplicate(Sunflower#template)	Mysterious Sunflower#10	977
+arug_cas05,328,98,3	duplicate(Steward#template)	Steward#ar05	1_M_JOBTESTER
+arug_cas05,146,315,3	duplicate(Guardian#template)	Eeos#ar05	4_M_LGTGUARD
+arug_cas05,315,98,5	duplicate(Kafra#template)	Kafra Employee#ar05	4_F_KAFRA1
+arug_cas05,65,171,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar05	CLEAR_NPC
+arug_cas05,212,149,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar05	CLEAR_NPC
+arug_cas05,136,158,0	duplicate(Control#template)	Control Device01#ar05	HIDDEN_NPC
+arug_cas05,135,212,0	duplicate(Control#template)	Control Device02#ar05	HIDDEN_NPC
+arug_cas05,134,266,0	duplicate(Control#template)	Control Device03#ar05	HIDDEN_NPC
+arug_cas05,299,277,0	duplicate(Switch#template)	#aru05_switch	HIDDEN_NPC
+arug_cas05,312,154,3	duplicate(Sunflower#template)	Mysterious Sunflower#10	4_RED_FLOWER
 
-arug_cas05,122,314,0	script	LF-01#arug_cas05	111,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
-arug_cas05,125,314,0	script	LF-02#arug_cas05	111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
-arug_cas05,128,314,0	script	LF-03#arug_cas05	111,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
-arug_cas05,131,314,0	script	LF-04#arug_cas05	111,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
-arug_cas05,134,314,0	script	LF-05#arug_cas05	111,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
-arug_cas05,149,314,0	script	LF-06#arug_cas05	111,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
-arug_cas05,152,314,0	script	LF-07#arug_cas05	111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
-arug_cas05,155,314,0	script	LF-08#arug_cas05	111,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
-arug_cas05,158,314,0	script	LF-09#arug_cas05	111,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
-arug_cas05,161,314,0	script	LF-10#arug_cas05	111,{ callfunc "LinkFlag","Convenience Facility",321,57; }
-arug_cas05,45,158,0	script	Banadis#LF_ar05_01::LF_ar05_01	111,{ callfunc "LinkFlag","Emperium Center",121,318; }
-arug_cas05,226,156,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_01	111
-arug_cas05,134,62,4	duplicate(LF_ar05_01)	Banadis#LF_ar05_02	111
-arug_cas05,149,62,4	duplicate(LF_ar05_01)	Banadis#LF_ar05_03	111
-arug_cas05,123,154,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_04	111
-arug_cas05,160,154,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_05	111
-arug_cas05,135,205,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_06	111
-arug_cas05,148,205,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_07	111
-arug_cas05,134,260,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_08	111
-//arug_cas05,204,142,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_09	111
-arug_cas05,148,103,4	script	Banadis#LF_ar05_10::LF_ar05_02	722,{
+arug_cas05,122,314,0	script	LF-01#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
+arug_cas05,125,314,0	script	LF-02#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
+arug_cas05,128,314,0	script	LF-03#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
+arug_cas05,131,314,0	script	LF-04#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
+arug_cas05,134,314,0	script	LF-05#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
+arug_cas05,149,314,0	script	LF-06#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
+arug_cas05,152,314,0	script	LF-07#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
+arug_cas05,155,314,0	script	LF-08#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
+arug_cas05,158,314,0	script	LF-09#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
+arug_cas05,161,314,0	script	LF-10#arug_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",321,57; }
+arug_cas05,45,158,0	script	Banadis#LF_ar05_01::LF_ar05_01	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",121,318; }
+arug_cas05,226,156,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_01	HIDDEN_NPC
+arug_cas05,134,62,4	duplicate(LF_ar05_01)	Banadis#LF_ar05_02	HIDDEN_NPC
+arug_cas05,149,62,4	duplicate(LF_ar05_01)	Banadis#LF_ar05_03	HIDDEN_NPC
+arug_cas05,123,154,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_04	HIDDEN_NPC
+arug_cas05,160,154,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_05	HIDDEN_NPC
+arug_cas05,135,205,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_06	HIDDEN_NPC
+arug_cas05,148,205,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_07	HIDDEN_NPC
+arug_cas05,134,260,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_08	HIDDEN_NPC
+//arug_cas05,204,142,0	duplicate(LF_ar05_01)	Banadis#LF_ar05_09	HIDDEN_NPC
+arug_cas05,148,103,4	script	Banadis#LF_ar05_10::LF_ar05_02	GUILD_FLAG,{
 	callfunc "LinkFlag","Emperium Center",121,318;
 	end;
 OnAgitInit2:
-OnRecvCastlear05:
-	FlagEmblem GetCastleData("arug_cas05",1);
+OnRecvCastleAr05:
+	flagemblem getcastledata("arug_cas05",1);
 	end;
 }
-arug_cas05,135,103,4	duplicate(LF_ar05_02)	Banadis#LF_ar05_11	722
-arug_cas05,63,51,7	duplicate(LF_ar05_02)	Banadis#LF_ar05_12	722
-arug_cas05,214,51,1	duplicate(LF_ar05_02)	Banadis#LF_ar05_13	722
+arug_cas05,135,103,4	duplicate(LF_ar05_02)	Banadis#LF_ar05_11	GUILD_FLAG
+arug_cas05,63,51,7	duplicate(LF_ar05_02)	Banadis#LF_ar05_12	GUILD_FLAG
+arug_cas05,214,51,1	duplicate(LF_ar05_02)	Banadis#LF_ar05_13	GUILD_FLAG
 
-aru_gld,289,103,6	script	Banadis#flag_ar05_1::ar05_Flag	722,{
+aru_gld,289,103,6	script	Banadis#flag_ar05_1::ar05_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas05",1;
 	end;
 OnAgitInit2:
-OnRecvCastlear05:
-	FlagEmblem GetCastleData("arug_cas05",1);
+OnRecvCastleAr05:
+	flagemblem getcastledata("arug_cas05",1);
 	end;
 }
-aru_gld,289,112,6	duplicate(ar05_Flag)	Banadis#flag_ar05_2	722
-aru_gld,350,98,6	script	Banadis#flag_ar05_3::ar05_Flag2	722,{
+aru_gld,289,112,6	duplicate(ar05_Flag)	Banadis#flag_ar05_2	GUILD_FLAG
+aru_gld,350,98,6	script	Banadis#flag_ar05_3::ar05_Flag2	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas05",0;
 	end;
 OnAgitInit2:
-OnRecvCastlear05:
-	FlagEmblem GetCastleData("arug_cas05",1);
+OnRecvCastleAr05:
+	flagemblem getcastledata("arug_cas05",1);
 	end;
 }
-aru_gld,350,88,6	duplicate(ar05_Flag2)	Banadis#flag_ar05_4	722
\ No newline at end of file
+aru_gld,350,88,6	duplicate(ar05_Flag2)	Banadis#flag_ar05_4	GUILD_FLAG
diff --git a/npc/guild2/guild_flags.txt b/npc/guild2/guild_flags.txt
index c5cf9bbc1..bfbca227d 100644
--- a/npc/guild2/guild_flags.txt
+++ b/npc/guild2/guild_flags.txt
@@ -11,93 +11,93 @@
 //============================================================
 
 // Juno
-yuno,109,167,5	script	Himinn	722,{
+yuno,109,167,5	script	Himinn	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc01:
-	FlagEmblem GetCastleData("schg_cas01",1);
+OnRecvCastleSc01:
+	flagemblem getcastledata("schg_cas01",1);
 	end;
 }
 
-yuno,110,171,5	script	Andlangr	722,{
+yuno,110,171,5	script	Andlangr	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc02:
-	FlagEmblem GetCastleData("schg_cas02",1);
+OnRecvCastleSc02:
+	flagemblem getcastledata("schg_cas02",1);
 	end;
 }
 
-yuno,111,175,5	script	Viblainn	722,{
+yuno,111,175,5	script	Viblainn	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc03:
-	FlagEmblem GetCastleData("schg_cas03",1);
+OnRecvCastleSc03:
+	flagemblem getcastledata("schg_cas03",1);
 	end;
 }
 
-yuno,112,179,5	script	Hljod	722,{
+yuno,112,179,5	script	Hljod	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc04:
-	FlagEmblem GetCastleData("schg_cas04",1);
+OnRecvCastleSc04:
+	flagemblem getcastledata("schg_cas04",1);
 	end;
 }
 
-yuno,114,183,5	script	Skidbladnir	722,{
+yuno,114,183,5	script	Skidbladnir	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc05:
-	FlagEmblem GetCastleData("schg_cas05",1);
+OnRecvCastleSc05:
+	flagemblem getcastledata("schg_cas05",1);
 	end;
 }
 
 // Arunafeltz
-rachel,124,120,3	script	Mardol	722,{
+rachel,124,120,3	script	Mardol	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear01:
-	FlagEmblem GetCastleData("arug_cas01",1);
+OnRecvCastleAr01:
+	flagemblem getcastledata("arug_cas01",1);
 	end;
 }
 
-rachel,136,120,5	script	Cyr	722,{
+rachel,136,120,5	script	Cyr	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear02:
-	FlagEmblem GetCastleData("arug_cas02",1);
+OnRecvCastleAr02:
+	flagemblem getcastledata("arug_cas02",1);
 	end;
 }
 
-rachel,138,126,6	script	Horn	722,{
+rachel,138,126,6	script	Horn	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear03:
-	FlagEmblem GetCastleData("arug_cas03",1);
+OnRecvCastleAr03:
+	flagemblem getcastledata("arug_cas03",1);
 	end;
 }
 
-rachel,135,131,7	script	Gefn	722,{
+rachel,135,131,7	script	Gefn	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear04:
-	FlagEmblem GetCastleData("arug_cas04",1);
+OnRecvCastleAr04:
+	flagemblem getcastledata("arug_cas04",1);
 	end;
 }
 
-rachel,124,130,1	script	Banadis	722,{
+rachel,124,130,1	script	Banadis	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear05:
-	FlagEmblem GetCastleData("arug_cas05",1);
+OnRecvCastleAr05:
+	flagemblem getcastledata("arug_cas05",1);
 	end;
 }
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index 8200b49a0..ba9da886b 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -18,55 +18,55 @@
 -	duplicate(RL#template)	RL2#schg_cas01	-1
 -	duplicate(RL#template)	RL3#schg_cas01	-1
 
-schg_cas01,247,305,3	duplicate(Steward#template)	Steward#sc01	55
-schg_cas01,123,306,3	duplicate(Guardian#template)	Ef#sc01	868
-schg_cas01,300,287,5	duplicate(Kafra#template)	Kafra Employee#sc01	117
-schg_cas01,27,36,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc01	844
-schg_cas01,208,75,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc01	844
-schg_cas01,124,52,0	duplicate(Control#template)	Control Device01#sc01	111
-schg_cas01,128,157,0	duplicate(Control#template)	Control Device02#sc01	111
-schg_cas01,109,247,0	duplicate(Control#template)	Control Device03#sc01	111
-schg_cas01,391,391,0	duplicate(Switch#template)	 #sch01_switch	111
-schg_cas01,280,391,3	duplicate(Sunflower#template)	Mysterious Sunflower#01	976
+schg_cas01,247,305,3	duplicate(Steward#template)	Steward#sc01	1_M_JOBTESTER
+schg_cas01,123,306,3	duplicate(Guardian#template)	Ef#sc01	4_M_LGTGUARD
+schg_cas01,300,287,5	duplicate(Kafra#template)	Kafra Employee#sc01	4_F_KAFRA1
+schg_cas01,27,36,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc01	CLEAR_NPC
+schg_cas01,208,75,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc01	CLEAR_NPC
+schg_cas01,124,52,0	duplicate(Control#template)	Control Device01#sc01	HIDDEN_NPC
+schg_cas01,128,157,0	duplicate(Control#template)	Control Device02#sc01	HIDDEN_NPC
+schg_cas01,109,247,0	duplicate(Control#template)	Control Device03#sc01	HIDDEN_NPC
+schg_cas01,391,391,0	duplicate(Switch#template)	 #sch01_switch	HIDDEN_NPC
+schg_cas01,280,391,3	duplicate(Sunflower#template)	Mysterious Sunflower#01	4_BLUE_FLOWER
 
-schg_cas01,106,302,0	script	LF-01#schg_cas01	111,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
-schg_cas01,109,302,0	script	LF-02#schg_cas01	111,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
-schg_cas01,112,302,0	script	LF-03#schg_cas01	111,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
-schg_cas01,115,302,0	script	LF-04#schg_cas01	111,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
-schg_cas01,118,302,0	script	LF-05#schg_cas01	111,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
-schg_cas01,121,302,0	script	LF-06#schg_cas01	111,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
-schg_cas01,124,302,0	script	LF-07#schg_cas01	111,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
-schg_cas01,127,302,0	script	LF-08#schg_cas01	111,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
-schg_cas01,130,302,0	script	LF-09#schg_cas01	111,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
-schg_cas01,133,302,0	script	LF-10#schg_cas01	111,{ callfunc "LinkFlag","Convenience Facility",275,244; }
-schg_cas01,17,45,0	script	Himinn#LF_sc01_1::LF_sc01_1	111,{ callfunc "LinkFlag","Emperium Center",120,290; }
-schg_cas01,207,95,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_2	111
-schg_cas01,111,46,4	script	Himinn#LF_sc01_3::LF_sc01_2	722,{
+schg_cas01,106,302,0	script	LF-01#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
+schg_cas01,109,302,0	script	LF-02#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
+schg_cas01,112,302,0	script	LF-03#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
+schg_cas01,115,302,0	script	LF-04#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
+schg_cas01,118,302,0	script	LF-05#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
+schg_cas01,121,302,0	script	LF-06#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
+schg_cas01,124,302,0	script	LF-07#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
+schg_cas01,127,302,0	script	LF-08#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
+schg_cas01,130,302,0	script	LF-09#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
+schg_cas01,133,302,0	script	LF-10#schg_cas01	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",275,244; }
+schg_cas01,17,45,0	script	Himinn#LF_sc01_1::LF_sc01_1	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",120,290; }
+schg_cas01,207,95,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_2	HIDDEN_NPC
+schg_cas01,111,46,4	script	Himinn#LF_sc01_3::LF_sc01_2	GUILD_FLAG,{
 	callfunc "LinkFlag","Emperium Center",120,290;
 	end;
 OnAgitInit2:
 OnRecvCastleSc01:
-	FlagEmblem GetCastleData("schg_cas01",1);
+	flagemblem getcastledata("schg_cas01",1);
 	end;
 }
-schg_cas01,129,46,4	duplicate(LF_sc01_2)	Himinn#LF_sc01_4	722
-schg_cas01,99,77,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_5	111
-schg_cas01,140,77,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_6	111
-schg_cas01,109,150,4	duplicate(LF_sc01_2)	Himinn#LF_sc01_7	722
-schg_cas01,130,150,4	duplicate(LF_sc01_2)	Himinn#LF_sc01_8	722
-schg_cas01,112,212,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_9	111
-schg_cas01,127,212,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_10	111
-schg_cas01,113,238,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_11	111
-schg_cas01,126,238,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_12	111
-schg_cas01,95,247,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_13	111
-schg_cas01,144,247,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_14	111
+schg_cas01,129,46,4	duplicate(LF_sc01_2)	Himinn#LF_sc01_4	GUILD_FLAG
+schg_cas01,99,77,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_5	HIDDEN_NPC
+schg_cas01,140,77,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_6	HIDDEN_NPC
+schg_cas01,109,150,4	duplicate(LF_sc01_2)	Himinn#LF_sc01_7	GUILD_FLAG
+schg_cas01,130,150,4	duplicate(LF_sc01_2)	Himinn#LF_sc01_8	GUILD_FLAG
+schg_cas01,112,212,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_9	HIDDEN_NPC
+schg_cas01,127,212,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_10	HIDDEN_NPC
+schg_cas01,113,238,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_11	HIDDEN_NPC
+schg_cas01,126,238,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_12	HIDDEN_NPC
+schg_cas01,95,247,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_13	HIDDEN_NPC
+schg_cas01,144,247,0	duplicate(LF_sc01_1)	Himinn#LF_sc01_14	HIDDEN_NPC
 
-sch_gld,290,90,0	script	Himinn#flag_sc01_1::Sc01_Flag	722,{
+sch_gld,290,90,0	script	Himinn#flag_sc01_1::Sc01_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","schg_cas01",1;
 	end;
 OnAgitInit2:
-OnRecvCastlesc01:
-	FlagEmblem GetCastleData("schg_cas01",1);
+OnRecvCastleSc01:
+	flagemblem getcastledata("schg_cas01",1);
 	end;
 }
-sch_gld,297,90,0	duplicate(Sc01_Flag)	Himinn#flag_sc01_2	722
\ No newline at end of file
+sch_gld,297,90,0	duplicate(Sc01_Flag)	Himinn#flag_sc01_2	GUILD_FLAG
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index 0a39f484a..798fb9c8b 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -18,47 +18,47 @@
 -	duplicate(RL#template)	RL2#schg_cas02	-1
 -	duplicate(RL#template)	RL3#schg_cas02	-1
 
-schg_cas02,105,378,3	duplicate(Steward#template)	Steward#sc02	55
-schg_cas02,140,184,3	duplicate(Guardian#template)	Endeef#sc02	868
-schg_cas02,131,365,3	duplicate(Kafra#template)	Kafra Employee#sc02	117
-schg_cas02,231,57,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc02	844
-schg_cas02,335,231,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc02	844
-schg_cas02,288,97,0	duplicate(Control#template)	Control Device01#sc02	111
-schg_cas02,230,209,0	duplicate(Control#template)	Control Device02#sc02	111
-schg_cas02,159,143,0	duplicate(Control#template)	Control Device03#sc02	111
-schg_cas02,257,369,0	duplicate(Switch#template)	#sc02_switch 	111
-schg_cas02,174,328,3	duplicate(Sunflower#template)	Mysterious Sunflower#02	976
+schg_cas02,105,378,3	duplicate(Steward#template)	Steward#sc02	1_M_JOBTESTER
+schg_cas02,140,184,3	duplicate(Guardian#template)	Endeef#sc02	4_M_LGTGUARD
+schg_cas02,131,365,3	duplicate(Kafra#template)	Kafra Employee#sc02	4_F_KAFRA1
+schg_cas02,231,57,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc02	CLEAR_NPC
+schg_cas02,335,231,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc02	CLEAR_NPC
+schg_cas02,288,97,0	duplicate(Control#template)	Control Device01#sc02	HIDDEN_NPC
+schg_cas02,230,209,0	duplicate(Control#template)	Control Device02#sc02	HIDDEN_NPC
+schg_cas02,159,143,0	duplicate(Control#template)	Control Device03#sc02	HIDDEN_NPC
+schg_cas02,257,369,0	duplicate(Switch#template)	#sc02_switch 	HIDDEN_NPC
+schg_cas02,174,328,3	duplicate(Sunflower#template)	Mysterious Sunflower#02	4_BLUE_FLOWER
 
-schg_cas02,143,198,0	script	LF-01#schg_cas02	111,{ callfunc "LinkFlag","First Gate House",235,44,"Second Gate House",302,233; }
-schg_cas02,143,202,0	script	LF-02#schg_cas02	111,{ callfunc "LinkFlag","Defense Area 1-1",317,83,"Defense Area 1-2",359,83; }
-schg_cas02,143,206,0	script	LF-03#schg_cas02	111,{ callfunc "LinkFlag","Defense Area 2-1",283,79,"Defense Area 2-2",280,122; }
-schg_cas02,145,208,0	script	LF-04#schg_cas02	111,{ callfunc "LinkFlag","Defense Area 3-1",215,110,"Defense Area 3-2",255,215; }
-schg_cas02,180,208,0	script	LF-05#schg_cas02	111,{ callfunc "LinkFlag","Center 1 Area",338,153,"Center 2 Area",213,226; }
-schg_cas02,182,206,0	script	LF-06#schg_cas02	111,{ callfunc "LinkFlag","Defense Area 1-1",317,83,"Defense Area 2-1",283,79,"Defense Area 3-1",215,110; }
-schg_cas02,182,202,0	script	LF-07#schg_cas02	111,{ callfunc "LinkFlag","Area 1-2",359,83,"Area 2-2",280,122,"Area 3-2",255,215; }
-schg_cas02,182,198,0	script	LF-08#schg_cas02	111,{ callfunc "LinkFlag","Convenience Facility",101,306; }
-schg_cas02,235,222,0	script	Andlangr#LF_sc02_1::LF_sc02_1	111,{ callfunc "LinkFlag","Emperium Center",136,188; }
-schg_cas02,157,136,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_2	111
-schg_cas02,168,136,4	duplicate(LF_sc02_1)	Andlangr#LF_sc02_3	111
-schg_cas02,320,232,4	duplicate(LF_sc02_1)	Andlangr#LF_sc02_4	111
-schg_cas02,295,109,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_5	111
-schg_cas02,295,92,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_6	111
-schg_cas02,285,90,4	duplicate(LF_sc02_1)	Andlangr#LF_sc02_7	111
-schg_cas02,285,190,4	duplicate(LF_sc02_1)	Andlangr#LF_sc02_8	111
-schg_cas02,238,66,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_9	111
-schg_cas02,230,45,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_10	111
-schg_cas02,233,120,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_11	111
-schg_cas02,247,120,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_12	111
-schg_cas02,261,162,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_13	111
-schg_cas02,244,162,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_14	111
-schg_cas02,235,207,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_15	111
+schg_cas02,143,198,0	script	LF-01#schg_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",235,44,"Second Gate House",302,233; }
+schg_cas02,143,202,0	script	LF-02#schg_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",317,83,"Defense Area 1-2",359,83; }
+schg_cas02,143,206,0	script	LF-03#schg_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",283,79,"Defense Area 2-2",280,122; }
+schg_cas02,145,208,0	script	LF-04#schg_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",215,110,"Defense Area 3-2",255,215; }
+schg_cas02,180,208,0	script	LF-05#schg_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",338,153,"Center 2 Area",213,226; }
+schg_cas02,182,206,0	script	LF-06#schg_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",317,83,"Defense Area 2-1",283,79,"Defense Area 3-1",215,110; }
+schg_cas02,182,202,0	script	LF-07#schg_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",359,83,"Area 2-2",280,122,"Area 3-2",255,215; }
+schg_cas02,182,198,0	script	LF-08#schg_cas02	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",101,306; }
+schg_cas02,235,222,0	script	Andlangr#LF_sc02_1::LF_sc02_1	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",136,188; }
+schg_cas02,157,136,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_2	HIDDEN_NPC
+schg_cas02,168,136,4	duplicate(LF_sc02_1)	Andlangr#LF_sc02_3	HIDDEN_NPC
+schg_cas02,320,232,4	duplicate(LF_sc02_1)	Andlangr#LF_sc02_4	HIDDEN_NPC
+schg_cas02,295,109,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_5	HIDDEN_NPC
+schg_cas02,295,92,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_6	HIDDEN_NPC
+schg_cas02,285,90,4	duplicate(LF_sc02_1)	Andlangr#LF_sc02_7	HIDDEN_NPC
+schg_cas02,285,190,4	duplicate(LF_sc02_1)	Andlangr#LF_sc02_8	HIDDEN_NPC
+schg_cas02,238,66,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_9	HIDDEN_NPC
+schg_cas02,230,45,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_10	HIDDEN_NPC
+schg_cas02,233,120,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_11	HIDDEN_NPC
+schg_cas02,247,120,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_12	HIDDEN_NPC
+schg_cas02,261,162,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_13	HIDDEN_NPC
+schg_cas02,244,162,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_14	HIDDEN_NPC
+schg_cas02,235,207,0	duplicate(LF_sc02_1)	Andlangr#LF_sc02_15	HIDDEN_NPC
 
-sch_gld,296,247,4	script	Andlangr#flag_sc02_1::Sc02_Flag	722,{
+sch_gld,296,247,4	script	Andlangr#flag_sc02_1::Sc02_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","schg_cas02",1;
 	end;
 OnAgitInit2:
-OnRecvCastlesc02:
-	FlagEmblem GetCastleData("schg_cas02",1);
+OnRecvCastleSc02:
+	flagemblem getcastledata("schg_cas02",1);
 	end;
 }
-sch_gld,280,247,4	duplicate(Sc02_Flag)	Andlangr#flag_sc02_2	722
\ No newline at end of file
+sch_gld,280,247,4	duplicate(Sc02_Flag)	Andlangr#flag_sc02_2	GUILD_FLAG
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 6adfa0ca1..77d50195e 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -18,55 +18,55 @@
 -	duplicate(RL#template)	RL2#schg_cas03	-1
 -	duplicate(RL#template)	RL3#schg_cas03	-1
 
-schg_cas03,88,90,3	duplicate(Steward#template)	Steward#sc03	55
-schg_cas03,287,226,5	duplicate(Guardian#template)	Elzee#sc03	868
-schg_cas03,50,50,3	duplicate(Kafra#template)	Kafra Employee#sc03	117
-schg_cas03,242,309,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc03	844
-schg_cas03,376,250,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc03	844
-schg_cas03,335,298,0	duplicate(Control#template)	Control Device01#sc03	111
-schg_cas03,200,227,0	duplicate(Control#template)	Control Device02#sc03	111
-schg_cas03,273,205,0	duplicate(Control#template)	Control Device03#sc03	111
-schg_cas03,199,25,0	duplicate(Switch#template)	#sch03_switch	111
-schg_cas03,25,22,3	duplicate(Sunflower#template)	Mysterious Sunflower#03	976
+schg_cas03,88,90,3	duplicate(Steward#template)	Steward#sc03	1_M_JOBTESTER
+schg_cas03,287,226,5	duplicate(Guardian#template)	Elzee#sc03	4_M_LGTGUARD
+schg_cas03,50,50,3	duplicate(Kafra#template)	Kafra Employee#sc03	4_F_KAFRA1
+schg_cas03,242,309,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc03	CLEAR_NPC
+schg_cas03,376,250,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc03	CLEAR_NPC
+schg_cas03,335,298,0	duplicate(Control#template)	Control Device01#sc03	HIDDEN_NPC
+schg_cas03,200,227,0	duplicate(Control#template)	Control Device02#sc03	HIDDEN_NPC
+schg_cas03,273,205,0	duplicate(Control#template)	Control Device03#sc03	HIDDEN_NPC
+schg_cas03,199,25,0	duplicate(Switch#template)	#sch03_switch	HIDDEN_NPC
+schg_cas03,25,22,3	duplicate(Sunflower#template)	Mysterious Sunflower#03	4_BLUE_FLOWER
 
-schg_cas03,346,211,0	script	LF-01#schg_cas03	111,{ callfunc "LinkFlag","First Gate House",262,323,"Second Gate House",378,263; }
-schg_cas03,346,207,0	script	LF-02#schg_cas03	111,{ callfunc "LinkFlag","Center 1 Area",306,320; }
-schg_cas03,346,203,0	script	LF-03#schg_cas03	111,{ callfunc "LinkFlag","Defense Area 2-1",309,292,"Defense Area 2-2",348,292; }
-schg_cas03,346,199,0	script	LF-04#schg_cas03	111,{ callfunc "LinkFlag","Center 2 Area",266,263; }
-schg_cas03,346,195,0	script	LF-05#schg_cas03	111,{ callfunc "LinkFlag","Defense Area 3-1",226,220,"Defense Area 3-2",185,249; }
-schg_cas03,346,191,0	script	LF-06#schg_cas03	111,{ callfunc "LinkFlag","Center 3 Area",271,226; }
-schg_cas03,301,213,0	script	LF-07#schg_cas03	111,{ callfunc "LinkFlag","Area 1-2",262,323,"Area 2-2",378,263,"Area 3-2",306,320; }
-schg_cas03,301,209,0	script	LF-08#schg_cas03	111,{ callfunc "LinkFlag","Area 2-1",309,292,"Area 2-2",348,292,"Center 2 Area",326,263; }
-schg_cas03,301,194,0	script	LF-09#schg_cas03	111,{ callfunc "LinkFlag","Area 3-1",226,220,"Area 3-2",185,249,"Center 3 Area",271,226; }
-schg_cas03,301,190,0	script	LF-10#schg_cas03	111,{ callfunc "LinkFlag","Convenience Facility",57,13; }
-schg_cas03,335,305,0	script	Vidblainn#LF_sc03_1::LF_sc03_1	111,{ callfunc "LinkFlag","Emperium Center",308,202; }
-schg_cas03,322,305,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_2	111
-schg_cas03,352,248,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_3	111
-schg_cas03,320,283,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_4	111
-schg_cas03,337,283,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_5	111
-schg_cas03,233,320,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_6	111
-schg_cas03,207,239,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_7	111
-schg_cas03,207,228,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_8	111
-schg_cas03,266,206,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_9	111
-schg_cas03,266,197,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_10	111
-schg_cas03,283,206,2	script	Vidblainn#LF_sc03_11::LF_sc03_2	722,{
+schg_cas03,346,211,0	script	LF-01#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",262,323,"Second Gate House",378,263; }
+schg_cas03,346,207,0	script	LF-02#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",306,320; }
+schg_cas03,346,203,0	script	LF-03#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",309,292,"Defense Area 2-2",348,292; }
+schg_cas03,346,199,0	script	LF-04#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Center 2 Area",266,263; }
+schg_cas03,346,195,0	script	LF-05#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",226,220,"Defense Area 3-2",185,249; }
+schg_cas03,346,191,0	script	LF-06#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Center 3 Area",271,226; }
+schg_cas03,301,213,0	script	LF-07#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",262,323,"Area 2-2",378,263,"Area 3-2",306,320; }
+schg_cas03,301,209,0	script	LF-08#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Area 2-1",309,292,"Area 2-2",348,292,"Center 2 Area",326,263; }
+schg_cas03,301,194,0	script	LF-09#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Area 3-1",226,220,"Area 3-2",185,249,"Center 3 Area",271,226; }
+schg_cas03,301,190,0	script	LF-10#schg_cas03	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",57,13; }
+schg_cas03,335,305,0	script	Vidblainn#LF_sc03_1::LF_sc03_1	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",308,202; }
+schg_cas03,322,305,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_2	HIDDEN_NPC
+schg_cas03,352,248,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_3	HIDDEN_NPC
+schg_cas03,320,283,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_4	HIDDEN_NPC
+schg_cas03,337,283,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_5	HIDDEN_NPC
+schg_cas03,233,320,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_6	HIDDEN_NPC
+schg_cas03,207,239,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_7	HIDDEN_NPC
+schg_cas03,207,228,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_8	HIDDEN_NPC
+schg_cas03,266,206,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_9	HIDDEN_NPC
+schg_cas03,266,197,0	duplicate(LF_sc03_1)	Vidblainn#LF_sc03_10	HIDDEN_NPC
+schg_cas03,283,206,2	script	Vidblainn#LF_sc03_11::LF_sc03_2	GUILD_FLAG,{
 	callfunc "LinkFlag","Emperium Center",308,202;
 	end;
 OnAgitInit2:
-OnRecvCastlesc03:
-	FlagEmblem GetCastleData("schg_cas03",1);
+OnRecvCastleSc03:
+	flagemblem getcastledata("schg_cas03",1);
 	end;
 }
-schg_cas03,283,197,2	duplicate(LF_sc03_2)	Vidblainn#LF_sc03_12	722
-schg_cas03,332,323,6	duplicate(LF_sc03_2)	Vidblainn#LF_sc03_13	722
-schg_cas03,343,323,2	duplicate(LF_sc03_2)	Vidblainn#LF_sc03_14	722
+schg_cas03,283,197,2	duplicate(LF_sc03_2)	Vidblainn#LF_sc03_12	GUILD_FLAG
+schg_cas03,332,323,6	duplicate(LF_sc03_2)	Vidblainn#LF_sc03_13	GUILD_FLAG
+schg_cas03,343,323,2	duplicate(LF_sc03_2)	Vidblainn#LF_sc03_14	GUILD_FLAG
 
-sch_gld,91,191,0	script	Vidblainn#flag_sc03_1::Sc03_Flag	722,{
+sch_gld,91,191,0	script	Vidblainn#flag_sc03_1::Sc03_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","schg_cas03",1;
 	end;
 OnAgitInit2:
-OnRecvCastlesc03:
-	FlagEmblem GetCastleData("schg_cas03",1);
+OnRecvCastleSc03:
+	flagemblem getcastledata("schg_cas03",1);
 	end;
 }
-sch_gld,104,191,0	duplicate(Sc03_Flag)	Bidblind#flag_sc03_2	722
\ No newline at end of file
+sch_gld,104,191,0	duplicate(Sc03_Flag)	Bidblind#flag_sc03_2	GUILD_FLAG
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index 8da46dec5..dd81e16c6 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -18,55 +18,55 @@
 -	duplicate(RL#template)	RL2#schg_cas04	-1
 -	duplicate(RL#template)	RL3#schg_cas04	-1
 
-schg_cas04,247,305,3	duplicate(Steward#template)	Steward#sc04	55
-schg_cas04,123,306,3	duplicate(Guardian#template)	Ef#sc04	868
-schg_cas04,300,287,5	duplicate(Kafra#template)	Kafra Employee#sc04	117
-schg_cas04,27,36,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc04	844
-schg_cas04,208,75,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc04	844
-schg_cas04,124,52,0	duplicate(Control#template)	Control Device01#sc04	111
-schg_cas04,128,157,0	duplicate(Control#template)	Control Device02#sc04	111
-schg_cas04,109,247,0	duplicate(Control#template)	Control Device03#sc04	111
-schg_cas04,391,391,0	duplicate(Switch#template)	 #sch04_switch	111
-schg_cas04,280,391,3	duplicate(Sunflower#template)	Mysterious Sunflower#04	976
+schg_cas04,247,305,3	duplicate(Steward#template)	Steward#sc04	1_M_JOBTESTER
+schg_cas04,123,306,3	duplicate(Guardian#template)	Ef#sc04	4_M_LGTGUARD
+schg_cas04,300,287,5	duplicate(Kafra#template)	Kafra Employee#sc04	4_F_KAFRA1
+schg_cas04,27,36,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc04	CLEAR_NPC
+schg_cas04,208,75,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc04	CLEAR_NPC
+schg_cas04,124,52,0	duplicate(Control#template)	Control Device01#sc04	HIDDEN_NPC
+schg_cas04,128,157,0	duplicate(Control#template)	Control Device02#sc04	HIDDEN_NPC
+schg_cas04,109,247,0	duplicate(Control#template)	Control Device03#sc04	HIDDEN_NPC
+schg_cas04,391,391,0	duplicate(Switch#template)	 #sch04_switch	HIDDEN_NPC
+schg_cas04,280,391,3	duplicate(Sunflower#template)	Mysterious Sunflower#04	4_BLUE_FLOWER
 
-schg_cas04,106,302,0	script	LF-01#schg_cas04	111,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
-schg_cas04,109,302,0	script	LF-02#schg_cas04	111,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
-schg_cas04,112,302,0	script	LF-03#schg_cas04	111,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
-schg_cas04,115,302,0	script	LF-04#schg_cas04	111,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
-schg_cas04,118,302,0	script	LF-05#schg_cas04	111,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
-schg_cas04,121,302,0	script	LF-06#schg_cas04	111,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
-schg_cas04,124,302,0	script	LF-07#schg_cas04	111,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
-schg_cas04,127,302,0	script	LF-08#schg_cas04	111,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
-schg_cas04,130,302,0	script	LF-09#schg_cas04	111,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
-schg_cas04,133,302,0	script	LF-10#schg_cas04	111,{ callfunc "LinkFlag","Convenience Facility",275,244; }
-schg_cas04,17,45,0	script	Hljod#LF_sc04_1::LF_sc04_1	111,{ callfunc "LinkFlag","Emperium Center",120,290; }
-schg_cas04,207,95,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_2	111
-schg_cas04,111,46,4	script	Hljod#LF_sc04_3::LF_sc04_2	722,{
+schg_cas04,106,302,0	script	LF-01#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
+schg_cas04,109,302,0	script	LF-02#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
+schg_cas04,112,302,0	script	LF-03#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
+schg_cas04,115,302,0	script	LF-04#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
+schg_cas04,118,302,0	script	LF-05#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
+schg_cas04,121,302,0	script	LF-06#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
+schg_cas04,124,302,0	script	LF-07#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
+schg_cas04,127,302,0	script	LF-08#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
+schg_cas04,130,302,0	script	LF-09#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
+schg_cas04,133,302,0	script	LF-10#schg_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",275,244; }
+schg_cas04,17,45,0	script	Hljod#LF_sc04_1::LF_sc04_1	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",120,290; }
+schg_cas04,207,95,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_2	HIDDEN_NPC
+schg_cas04,111,46,4	script	Hljod#LF_sc04_3::LF_sc04_2	GUILD_FLAG,{
 	callfunc "LinkFlag","Emperium Center",120,290;
 	end;
 OnAgitInit2:
-OnRecvCastlesc04:
-	FlagEmblem GetCastleData("schg_cas04",1);
+OnRecvCastleSc04:
+	flagemblem getcastledata("schg_cas04",1);
 	end;
 }
-schg_cas04,129,46,4	duplicate(LF_sc04_2)	Hljod#LF_sc04_4	722
-schg_cas04,99,77,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_5	111
-schg_cas04,140,77,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_6	111
-schg_cas04,109,150,4	duplicate(LF_sc04_2)	Hljod#LF_sc04_7	722
-schg_cas04,130,150,4	duplicate(LF_sc04_2)	Hljod#LF_sc04_8	722
-schg_cas04,112,212,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_9	111
-schg_cas04,127,212,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_10	111
-schg_cas04,113,238,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_11	111
-schg_cas04,126,238,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_12	111
-schg_cas04,95,247,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_13	111
-schg_cas04,144,247,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_14	111
+schg_cas04,129,46,4	duplicate(LF_sc04_2)	Hljod#LF_sc04_4	GUILD_FLAG
+schg_cas04,99,77,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_5	HIDDEN_NPC
+schg_cas04,140,77,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_6	HIDDEN_NPC
+schg_cas04,109,150,4	duplicate(LF_sc04_2)	Hljod#LF_sc04_7	GUILD_FLAG
+schg_cas04,130,150,4	duplicate(LF_sc04_2)	Hljod#LF_sc04_8	GUILD_FLAG
+schg_cas04,112,212,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_9	HIDDEN_NPC
+schg_cas04,127,212,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_10	HIDDEN_NPC
+schg_cas04,113,238,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_11	HIDDEN_NPC
+schg_cas04,126,238,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_12	HIDDEN_NPC
+schg_cas04,95,247,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_13	HIDDEN_NPC
+schg_cas04,144,247,0	duplicate(LF_sc04_1)	Hljod#LF_sc04_14	HIDDEN_NPC
 
-sch_gld,134,97,4	script	Hljod#flag_sc04_1::sc04_Flag	722,{
+sch_gld,134,97,4	script	Hljod#flag_sc04_1::sc04_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","schg_cas04",1;
 	end;
 OnAgitInit2:
-OnRecvCastlesc04:
-	FlagEmblem GetCastleData("schg_cas04",1);
+OnRecvCastleSc04:
+	flagemblem getcastledata("schg_cas04",1);
 	end;
 }
-sch_gld,141,97,4	duplicate(sc04_Flag)	Hljod#flag_sc04_2	722
\ No newline at end of file
+sch_gld,141,97,4	duplicate(sc04_Flag)	Hljod#flag_sc04_2	GUILD_FLAG
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index 46b03e8bd..ca69a2dd6 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -18,57 +18,57 @@
 -	duplicate(RL#template)	RL2#schg_cas05	-1
 -	duplicate(RL#template)	RL3#schg_cas05	-1
 
-schg_cas05,247,305,3	duplicate(Steward#template)	Steward#sc05	55
-schg_cas05,123,306,3	duplicate(Guardian#template)	Ef#sc05	868
-schg_cas05,300,287,5	duplicate(Kafra#template)	Kafra Employee#sc05	117
-schg_cas05,27,36,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc05	844
-schg_cas05,208,75,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc05	844
-schg_cas05,124,52,0	duplicate(Control#template)	Control Device01#sc05	111
-schg_cas05,128,157,0	duplicate(Control#template)	Control Device02#sc05	111
-schg_cas05,109,247,0	duplicate(Control#template)	Control Device03#sc05	111
-schg_cas05,391,391,0	duplicate(Switch#template)	 #sch05_switch	111
-schg_cas05,280,391,3	duplicate(Sunflower#template)	Mysterious Sunflower#05	976
+schg_cas05,247,305,3	duplicate(Steward#template)	Steward#sc05	1_M_JOBTESTER
+schg_cas05,123,306,3	duplicate(Guardian#template)	Ef#sc05	4_M_LGTGUARD
+schg_cas05,300,287,5	duplicate(Kafra#template)	Kafra Employee#sc05	4_F_KAFRA1
+schg_cas05,27,36,0	duplicate(Guardian Stone#template)	1st Guardian Stone#sc05	CLEAR_NPC
+schg_cas05,208,75,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#sc05	CLEAR_NPC
+schg_cas05,124,52,0	duplicate(Control#template)	Control Device01#sc05	HIDDEN_NPC
+schg_cas05,128,157,0	duplicate(Control#template)	Control Device02#sc05	HIDDEN_NPC
+schg_cas05,109,247,0	duplicate(Control#template)	Control Device03#sc05	HIDDEN_NPC
+schg_cas05,391,391,0	duplicate(Switch#template)	 #sch05_switch	HIDDEN_NPC
+schg_cas05,280,391,3	duplicate(Sunflower#template)	Mysterious Sunflower#05	4_BLUE_FLOWER
 
-schg_cas05,106,302,0	script	LF-01#schg_cas05	111,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
-schg_cas05,109,302,0	script	LF-02#schg_cas05	111,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
-schg_cas05,112,302,0	script	LF-03#schg_cas05	111,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
-schg_cas05,115,302,0	script	LF-04#schg_cas05	111,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
-schg_cas05,118,302,0	script	LF-05#schg_cas05	111,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
-schg_cas05,121,302,0	script	LF-06#schg_cas05	111,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
-schg_cas05,124,302,0	script	LF-07#schg_cas05	111,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
-schg_cas05,127,302,0	script	LF-08#schg_cas05	111,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
-schg_cas05,130,302,0	script	LF-09#schg_cas05	111,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
-schg_cas05,133,302,0	script	LF-10#schg_cas05	111,{ callfunc "LinkFlag","Convenience Facility",275,244; }
-schg_cas05,17,45,0	script	Skidbladnir#LF_sc05_1::LF_sc05_1	111,{ callfunc "LinkFlag","Emperium Center",120,290; }
-schg_cas05,207,95,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_2	111
-schg_cas05,111,46,4	script	Skidbladnir#LF_sc05_3::LF_sc05_2	722,{
+schg_cas05,106,302,0	script	LF-01#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
+schg_cas05,109,302,0	script	LF-02#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
+schg_cas05,112,302,0	script	LF-03#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
+schg_cas05,115,302,0	script	LF-04#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
+schg_cas05,118,302,0	script	LF-05#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
+schg_cas05,121,302,0	script	LF-06#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
+schg_cas05,124,302,0	script	LF-07#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
+schg_cas05,127,302,0	script	LF-08#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
+schg_cas05,130,302,0	script	LF-09#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
+schg_cas05,133,302,0	script	LF-10#schg_cas05	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",275,244; }
+schg_cas05,17,45,0	script	Skidbladnir#LF_sc05_1::LF_sc05_1	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",120,290; }
+schg_cas05,207,95,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_2	HIDDEN_NPC
+schg_cas05,111,46,4	script	Skidbladnir#LF_sc05_3::LF_sc05_2	GUILD_FLAG,{
 	callfunc "LinkFlag","Emperium Center",120,290;
 	end;
 OnAgitInit2:
-OnRecvCastlesc05:
-	FlagEmblem GetCastleData("schg_cas05",1);
+OnRecvCastleSc05:
+	flagemblem getcastledata("schg_cas05",1);
 	end;
 }
-schg_cas05,129,46,4	duplicate(LF_sc05_2)	Skidbladnir#LF_sc05_4	722
-schg_cas05,99,77,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_5	111
-schg_cas05,140,77,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_6	111
-schg_cas05,109,150,4	duplicate(LF_sc05_2)	Skidbladnir#LF_sc05_7	722
-schg_cas05,130,150,4	duplicate(LF_sc05_2)	Skidbladnir#LF_sc05_8	722
-schg_cas05,112,212,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_9	111
-schg_cas05,127,212,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_10	111
-schg_cas05,113,238,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_11	111
-schg_cas05,126,238,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_12	111
-schg_cas05,95,247,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_13	111
-schg_cas05,144,247,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_14	111
+schg_cas05,129,46,4	duplicate(LF_sc05_2)	Skidbladnir#LF_sc05_4	GUILD_FLAG
+schg_cas05,99,77,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_5	HIDDEN_NPC
+schg_cas05,140,77,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_6	HIDDEN_NPC
+schg_cas05,109,150,4	duplicate(LF_sc05_2)	Skidbladnir#LF_sc05_7	GUILD_FLAG
+schg_cas05,130,150,4	duplicate(LF_sc05_2)	Skidbladnir#LF_sc05_8	GUILD_FLAG
+schg_cas05,112,212,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_9	HIDDEN_NPC
+schg_cas05,127,212,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_10	HIDDEN_NPC
+schg_cas05,113,238,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_11	HIDDEN_NPC
+schg_cas05,126,238,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_12	HIDDEN_NPC
+schg_cas05,95,247,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_13	HIDDEN_NPC
+schg_cas05,144,247,0	duplicate(LF_sc05_1)	Skidbladnir#LF_sc05_14	HIDDEN_NPC
 
-sch_gld,101,284,4	script	Skidbladnir#flag_sc05_1::sc05_Flag	722,{
+sch_gld,101,284,4	script	Skidbladnir#flag_sc05_1::sc05_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","schg_cas05",1;
 	end;
 OnAgitInit2:
-OnRecvCastlesc05:
-	FlagEmblem GetCastleData("schg_cas05",1);
+OnRecvCastleSc05:
+	flagemblem getcastledata("schg_cas05",1);
 	end;
 }
-sch_gld,91,284,4	duplicate(sc05_Flag)	Skidbladnir#flag_sc05_2	722
-sch_gld,66,320,6	duplicate(sc05_Flag)	Skidbladnir#flag_sc05_3	722
-sch_gld,66,310,6	duplicate(sc05_Flag)	Skidbladnir#flag_sc05_4	722
\ No newline at end of file
+sch_gld,91,284,4	duplicate(sc05_Flag)	Skidbladnir#flag_sc05_2	GUILD_FLAG
+sch_gld,66,320,6	duplicate(sc05_Flag)	Skidbladnir#flag_sc05_3	GUILD_FLAG
+sch_gld,66,310,6	duplicate(sc05_Flag)	Skidbladnir#flag_sc05_4	GUILD_FLAG
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 68cf25000..2da7c8719 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -3,10 +3,10 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.1
+//= 2.4
 //===== Description: =========================================
 //= [Official Conversion]
-//= Endless Tower Memorial Dungeon
+//= Endless Tower Memorial Dungeon.
 //= Consists of 101 floors.
 //===== Additional Comments: =================================
 //= 1.0 First version.
@@ -25,15 +25,25 @@
 //=     warps between floors. (bugreport:4623)
 //=     Added missing end's to prevent infinite mobspawn (bugreport:4540)
 //=     Commented out remaining GM-only NPCs. [Gepard]
-//= 1.8 Adjusted Instance Attach Map to Validate ALL Maps, instead of 
+//= 1.8 Adjusted Instance Attach Map to Validate ALL Maps, instead of
 //=     only 1@tower -> 5@tower (bugreport:4983)
 //= 1.9 Added 'instance_check_party' command to the script for proper checking if
-//=		the invoking party meets the requirements to join the Memorial Dungeon.
+//=     the invoking party meets the requirements to join the Memorial Dungeon.
 //= 2.0 Fixed broken else/if chaining. [Joseph]
 //= 2.1 Updated to match latest official script. [Euphy]
+//= 2.2 Instance system rewrite. [Euphy]
+//= 2.3 Added some missing announcements. [Euphy]
+//= 2.4 Added GM management function. [Euphy]
 //============================================================
 
-alberta,214,77,6	script	Captain Janssen	709,{
+1@tower	mapflag	src4instance
+2@tower	mapflag	src4instance
+3@tower	mapflag	src4instance
+4@tower	mapflag	src4instance
+5@tower	mapflag	src4instance
+6@tower	mapflag	src4instance
+//============================================================
+alberta,214,77,6	script	Captain Janssen	4_M_SEAMAN,{
 	if (checkweight(1201,1) == 0) {
 		mes "^008800Wait here!!";
 		mes "You're carrying too much stuff. Why don't you put some of it away, and then come back.^000000";
@@ -67,8 +77,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 		mes "^0000ffAt least half of his story sounded grossly exaggerated, but something caught your ear: he insists that a humongous tower exists on the ocean, and that it's so tall, it scrapes across the sky.^000000";
 		set in_102tower,2;
 		close;
-	}
-	else if (in_102tower == 2) {
+	} else if (in_102tower == 2) {
 		mes "[Captain Janssen]";
 		mes "So all I could do was cast anchor at that humongous tower after my fleet was wrecked. At first, we were only going to stay there until the rainstorm was over, but it didn't end as soon as we had hoped.";
 		next;
@@ -112,8 +121,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 		mes "Welcome aboard, first mate.";
 		set in_102tower,3;
 		close;
-	}
-	else if (in_102tower == 3) {
+	} else if (in_102tower == 3) {
 		mes "[Captain Janssen]";
 		mes "Shall we leave now?";
 		next;
@@ -130,8 +138,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 			mes "Sure, no problem. Come back when you're ready.";
 			close;
 		}
-	}
-	else if (in_102tower > 3) {
+	} else if (in_102tower > 3) {
 		mes "[Captain Janssen]";
 		mes "Well, to travel the ocean again, we need to restock on goods. If you give me 10,000 Zeny, I'll take care of the rest.";
 		next;
@@ -144,7 +151,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 			mes "Sure, no problem. I'll be waiting for your return.";
 			close;
 		case 2:
-			if (zeny < 10000) {
+			if (Zeny < 10000) {
 				mes "[Captain Janssen]";
 				mes "I'm sorry, but you don't have enough money. I need at least 10,000 Zeny to restock our supplies...";
 				close;
@@ -152,14 +159,13 @@ alberta,214,77,6	script	Captain Janssen	709,{
 			else {
 				mes "[Captain Janssen]";
 				mes "Excellent! Now we're good to go. Let's pull up the anchor again!";
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				close2;
 				warp "e_tower",70,114;
 				end;
 			}
 		}
-	}
-	else {
+	} else {
 		mes "[Captain Janssen]";
 		mes "Excuse me, are you an adventurer?";
 		next;
@@ -181,12 +187,11 @@ alberta,214,77,6	script	Captain Janssen	709,{
 			mes "[Captain Janssen]";
 			mes "Huh? Are you sure that you don't mind giving me that much money? Wow, thank you so much!";
 			next;
-			if (zeny < 10000) {
+			if (Zeny < 10000) {
 				mes "[Captain Janssen]";
 				mes "...I'm sorry, but I don't think you have 10,000 Zeny. Thank you for your kindness, but I need more than that.";
 				close;
-			}
-			else {
+			} else {
 				mes "["+.@name$+"]";
 				mes "I don't know why you'd need so much money, but here. You can take it.";
 				next;
@@ -194,7 +199,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 				next;
 				mes "[Captain Janssen]";
 				mes "Thank you so much! Now I can stock up on food and materials for my ship. You're kind, very kind!";
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				set in_102tower,1;
 				close;
 			}
@@ -202,167 +207,72 @@ alberta,214,77,6	script	Captain Janssen	709,{
 	}
 }
 
-e_tower,81,105,0	script	Tower Protection Stone	406,{
+e_tower,81,105,0	script	Tower Protection Stone	2_MONEMUS,{
 
 	set .@party_id,getcharid(1);
-	set .@ins_mas,getpartyleader(.@party_id,2);
 	set .@p_name$,getpartyname(.@party_id);
-	set .@p_reader$,strcharinfo(0);
 	set .@md_name$,"Endless Tower";
-	set .@p_name2$,strcharinfo(0);
 
 	set .@etower_timer,checkquest(60200,PLAYTIME); // 1 week
 	set .@etower_timer2,checkquest(60201,PLAYTIME); // 4 hours
 
-	set .@dun_lim_time,etower_timer+604800; // 1 week
-	set .@dun_lim_time2,etower_timer+14400; // 4 hours
-	set .@dun_cur_time,gettimetick(2);
-	set .@dun_ent_t,(.@dun_lim_time - .@dun_cur_time);
-	set .@dun_h,(.@dun_ent_t / 3600);
-	set .@dun_m,(.@dun_ent_t - (.@dun_h * 3600)) / 60;
-	set .@dun_s,.@dun_ent_t - ((.@dun_h * 3600) + (.@dun_m * 60));
-
-	if(!instance_check_party(.@party_id,2)){
-		mes "I'm sorry but your Party does not meet the requirements to join the Memorial Dungeon.";
+	if (!instance_check_party(.@party_id,2)) {
+		mes "Make or join a party with more than 1 member and try again.";
 		close;
 	}
-
 	if (.@etower_timer == -1) {
-		if (.@ins_mas == getcharid(0)) {
+		if (getcharid(0) == getpartyleader(.@party_id,2)) {
 			mes "Confirmed the party has been made. Would you like to reserve entrance to the Endless Tower?";
 			next;
-			switch(select(.@md_name$ + " Dungeon Generated:Enter the dungeon:Return to Alberta:Cancel")) {
+			switch(select("Generate dungeon "+.@md_name$+":Enter the dungeon:Return to Alberta:Cancel")) {
 			case 1:
-				set .@instance, instance_create(.@md_name$, .@party_id);
+				set .@instance, instance_create(.@md_name$,.@party_id);
 				if (.@instance < 0) {
-					mes "Party Name:"+.@p_name$+"";
-					mes "Party Leader:"+.@p_reader$+"";
+					mes "Party Name: "+.@p_name$;
+					mes "Party Leader: "+strcharinfo(0);
 					mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
-				} else {
-					mes "^0000ff"+.@md_name$+"^000000 - Try to reserve";
-					mes "After making a reservation, you have to talk to NPC behind and select the menu 'Enter the Dungeon' to enter the dungeon.";
-					// 1,2,3,4,5,6
-					for( set .@i, 1; .@i <= 6; set .@i, .@i + 1 ) {
-						if( instance_attachmap(.@i + "@tower", .@instance) == "" ) {
-							mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
-							instance_destroy(.@instance);
-							close;
-						}
+					close;
+				}
+				mes "^0000ff"+.@md_name$+"^000000 - Try to reserve";
+				mes "After making a reservation, you have to talk to NPC behind and select the menu 'Enter the Dungeon' to enter the dungeon.";
+				for( set .@i, 1; .@i <= 6; set .@i, .@i + 1 ) {
+					if( instance_attachmap(.@i + "@tower", .@instance) == "" ) {
+						mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
+						instance_destroy(.@instance);
+						close;
 					}
-					instance_attach(.@instance);
-					instance_set_timeout 14400,300,.@instance;
-					instance_init(.@instance);
-					// Spawn the first floor of each map, which will then spawn the rest when cleared.
-					donpcevent instance_npcname("#1F Controller", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Immortal Furnace#1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Immortal Furnace#2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Immortal Furnace#3", instance_id())+"::OnInstanceInit";
-					// Disable the warps on all floor. (enable as floors are cleared)
-					for( set .@i, 1; .@i <= 99; set .@i, .@i + 1 )
-						donpcevent instance_npcname(.@i+"FGate102tower", instance_id())+"::OnInstanceInit";
-					// Warps activate on timer, so players can't get unlimited Ashes.
-					donpcevent instance_npcname("25FGate102tower-2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("50FGate102tower-2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("75FGate102tower-2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("99FGate102tower-2", instance_id())+"::OnInstanceInit";
-					// Disable and ready NPCs for the 100th and 101st floors.
-					donpcevent instance_npcname("Lucid Crystal#102", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#102Effect1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#102Effect2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#102FShadowDust1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#102FShadowDust", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Life Spring#1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Tyrant's Throne#", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Lost Soul#102", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Effect30", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Effect31", instance_id())+"::OnInstanceInit";
 				}
-				break;
+				instance_set_timeout 14400,300,.@instance;
+				instance_init(.@instance);
+				close;
 			case 2:
-				if (has_instance("1@tower") == "") {
-					mes "The memorial dungeon " + .@md_name$ + " does not exist.";
-					mes "The party leader did not generate the dungeon yet.";
-				} else if((party_instance_id != 0) && (party_instance_id != getcharid(1))) {
-					mes "Due to the tower's aftereffects, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon.";
-					next;
-					mes "It is dangerous here. Let me move you to Alberta.";
-					close2;
-					warp "alberta",223,36;
-					end;
-				} else {
-					mapannounce "e_tower", .@p_name2$ + " of the party, " + .@p_name$ + ", is entering the dungeon, " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL,12;
-					set party_instance_id,getcharid(1);
-					set etower_timer,gettimetick(2);
-					setquest 60200;
-					setquest 60201;
-					warp "1@tower",52,354;
-					end;
-				}
-				break;
+				callsub L_Enter,0,1,.@md_name$,.@p_name$;
 			case 3:
 				mes "I will move you to Alberta.";
 				close2;
 				warp "alberta",223,36;
 				end;
 			case 4:
-				break;
-			}
-			close;
-		} else {
-			switch(select(.@md_name$ + " Enter the dungeon:Return to Alberta:Cancel")) {
-			case 1:
-				if (has_instance("1@tower") == "") {
-					mes "The memorial dungeon " + .@md_name$ + " does not exist.";
-					mes "The party leader did not generate the dungeon yet.";
-				} else if((party_instance_id != 0) && (party_instance_id != getcharid(1))) {
-					mes "Due to the tower's aftereffects, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon.";
-					next;
-					mes "It is dangerous here. Let me move you to Alberta.";
-					close2;
-					warp "alberta",223,36;
-					end;
-				} else {
-					mapannounce "e_tower", .@p_name2$ + " of the party, " + .@p_name$ + ", is entering the dungeon, " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL,12;
-					set party_instance_id,getcharid(1);
-					set etower_timer,gettimetick(2);
-					setquest 60200;
-					setquest 60201;
-					warp "1@tower",52,354;
-					end;
-				}
-				break;
-			case 2:
-				mes "I will move you to Alberta.";
-				close2;
-				warp "alberta",223,36;
-				end;
-			case 3:
-				break;
+				close;
 			}
-			close;
+		}
+		switch(select("Enter the "+.@md_name$+":Return to Alberta:Cancel")) {
+		case 1:
+			callsub L_Enter,1,1,.@md_name$,.@p_name$;
+		case 2:
+			mes "I will move you to Alberta.";
+			close2;
+			warp "alberta",223,36;
+			end;
+		case 3:
+			end;
 		}
 	} else if ((.@etower_timer >= 0) && (.@etower_timer2 < 2)) {
 		mes "If you have the dungeon generated already, you can enter it. ";
 		next;
-		switch(select(.@md_name$ + " Enter the dungeon:Return to Alberta:Cancel")) {
+		switch(select("Enter the "+.@md_name$+":Return to Alberta:Cancel")) {
 		case 1:
-			if (has_instance("1@tower") == "") {
-				mes "The memorial dungeon " + .@md_name$ + " does not exist.";
-				mes "The party leader did not generate the dungeon yet.";
-			} else if((party_instance_id != 0) && (party_instance_id != getcharid(1))) {
-				mes "Due to the tower's aftereffects, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon.";
-				next;
-				mes "It is dangerous here. Let me move you to Alberta.";
-				close2;
-				warp "alberta",223,36;
-				end;
-			} else {
-				mapannounce "e_tower", .@p_name2$ + " of the party, " + .@p_name$ + ", is entering the dungeon, " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL,12;
-				set party_instance_id,getcharid(1);
-				warp "1@tower",52,354;
-				end;
-			}
-			break;
+			callsub L_Enter,0,0,.@md_name$,.@p_name$;
 		case 2:
 			mes "I will move you to Alberta.";
 			close2;
@@ -373,6 +283,15 @@ e_tower,81,105,0	script	Tower Protection Stone	406,{
 		}
 		close;
 	} else if ((.@etower_timer >= 0) && (.@etower_timer < 2) && (.@etower_timer2 == 2)) {
+
+		set .@dun_lim_time,etower_timer+604800; // 1 week
+		set .@dun_lim_time2,etower_timer+14400; // 4 hours
+		set .@dun_cur_time,gettimetick(2);
+		set .@dun_ent_t,(.@dun_lim_time - .@dun_cur_time);
+		set .@dun_h,(.@dun_ent_t / 3600);
+		set .@dun_m,(.@dun_ent_t - (.@dun_h * 3600)) / 60;
+		set .@dun_s,.@dun_ent_t - ((.@dun_h * 3600) + (.@dun_m * 60));
+
 		mes "Due to the tower's aftereffects, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon.";
 		next;
 		mes "It is dangerous here. Let me move you to Alberta.";
@@ -383,27 +302,45 @@ e_tower,81,105,0	script	Tower Protection Stone	406,{
 		set etower_timer,0;
 		erasequest 60200;
 		erasequest 60201;
-		set party_instance_id,0;
 		mes "^0000ffThe records and after effects related to the Endless Tower have been removed. You can generate and enter the Endless Tower again.^000000";
 		close;
 	}
-	mes "Make or join a party with more than 1 member and try again.";
-	close;
+
+L_Enter:
+	if (has_instance("1@tower") == "") {
+		mes "The memorial dungeon " +getarg(2)+ " does not exist.";
+		mes "The party leader did not generate the dungeon yet.";
+		close;
+	} else {
+		mapannounce "e_tower", strcharinfo(0)+" of the party, " +getarg(3)+", is entering the dungeon, Endless Tower.",bc_map,"0x00ff99",FW_NORMAL,12;
+		if (getarg(1)) {
+			set etower_timer,gettimetick(2);
+			setquest 60200;
+			setquest 60201;
+		}
+		warp "1@tower",52,354;
+		if (getarg(0) == 0)
+			close;
+		else
+			end;
+	}
 }
 
-e_tower,30,30,2	script	Huge Vortex	844,2,2,{
+e_tower,30,30,2	script	Huge Vortex	CLEAR_NPC,2,2,{
+	end;
 OnTouch:
 	mapannounce "e_tower","[ " + strcharinfo(0) + " ], seems to be engulfed by a huge vortex",bc_map,"0x00ff99",FW_NORMAL,12;
 	warp "alberta",223,36;
 	end;
 }
 
-/*
-e_tower,1,1,2	script	#102Administrator Mode104	844,{
+// Original name: "#102Administrator Mode104"
+e_tower,1,1,2	script	#102Administrator Mode	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "Please enter the password";
-	input .@inputstr$;
+	set .@i, callfunc("F_GM_NPC","dmc2008",1);
 	next;
-	if (.@inputstr$ == "dmc2008") {
+	if (.@i == 1) {
 		switch(select("Generate Purification Stone:Remove Purification Stone:Cancel")) {
 		case 1:
 			mes "Create the Purification Stone that stays for 30 minutes.";
@@ -418,14 +355,13 @@ e_tower,1,1,2	script	#102Administrator Mode104	844,{
 			break;
 		}
 		close;
-	}
-	else {
+	} else {
 		mes "Enter the password exactly.";
 		close;
 	}
 }
 
-e_tower,69,117,4	script	Purification Stone#et1	406,{
+e_tower,69,117,4	script	Purification Stone#et1	2_MONEMUS,{
 	set etower_timer,0;
 	mes "^0000ffThe records and aftereffects related to the Endless Tower have been removed. You can generate and enter the Endless Tower again.^000000";
 	close;
@@ -456,1001 +392,1000 @@ OnTimer1800000:
 	end;
 }
 
-e_tower,151,185,4	script	Purification Stone#et2	844,{
+e_tower,151,185,4	script	Purification Stone#et2	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	set etower_timer,0;
 	mes "^0000ffThe records and aftereffects related to the Endless Tower have been removed. You can generate and enter the Endless Tower again.^000000";
-	close;
+	close2;
 	warp "e_tower",75,108;
 	end;
 }
-*/
 
-// Levels 1-25
+// Core Functions
 //============================================================
-1@tower,50,360,0	script	Immortal Brazier#	844,{
-	mes "- A Message is Engraved on the Brazier -";
-	mes "The one who scatters the ashes of the darkness in this place shall become one step closer to Nacht Sieger, the Hegemon King of the Darkness...";
-	next;
-	set .@move_name$,strcharinfo(0);
-	switch(select("26th Level:51st Level:76th Level")) {
+function	script	F_Tower_Monster	{
+
+	set .@level, getarg(0);
+	set .@map$, getarg(1);
+	set .@label$, getarg(2);
+
+	switch(.@level) {
 	case 1:
-		if (countitem(6000) < 1) {
-			mes "-Warning-";
-			mes "To warp to the 26th Level, you need 1 Ashes of the Darkness.";
-			close;
-		}
-		else {
-			delitem 6000,1; //Dark_Ashes
-			instance_announce -1, .@move_name$ + ". You will be warped to the 26th Level.",bc_map,"0x00ff99";
-			warp "2@tower",52,354;
-		}
+		areamonster .@map$,7,351,17,387,"Metaling",1613,15,.@label$;
+		areamonster .@map$,7,351,17,387,"Marin",1242,5,.@label$;
+		areamonster .@map$,7,351,17,387,"Poporing",1031,5,.@label$;
+		areamonster .@map$,7,351,17,387,"Drops",1113,5,.@label$;
+		areamonster .@map$,7,351,17,387,"Mastering",1090,1,.@label$;
+		areamonster .@map$,7,351,17,387,"Poring",1002,5,.@label$;
 		break;
 	case 2:
-		if (countitem(6000) < 2) {
-			mes "-Warning-";
-			mes "To warp to the 51st Level, you need 2 Ashes of the Darkness.";
-			close;
-		}
-		else {
-			delitem 6000,2; //Dark_Ashes
-			instance_announce -1, .@move_name$ + ". You will be warped to the 51st Level.",bc_map,"0x00ff99";
-			warp "3@tower",52,354;
-		}
+		areamonster .@map$,93,351,103,387,"Desert Wolf",1106,20,.@label$;
+		areamonster .@map$,93,351,103,387,"Vagabond Wolf",1092,1,.@label$;
+		areamonster .@map$,93,351,103,387,"Baby Desert Wolf",1107,10,.@label$;
 		break;
 	case 3:
-		if (countitem(6000) < 3) {
-			mes "-Warning-";
-			mes "To warp to the 76th Level, you need 3 Ashes of the Darkness.";
-			close;
-		}
-		else {
-			delitem 6000,3; //Dark_Ashes
-			instance_announce -1, .@move_name$ + ". You will be warped to the 76th Level.",bc_map,"0x00ff99";
-			warp "4@tower",52,354;
+		areamonster .@map$,181,351,191,387,"Archer Skeleton",1016,5,.@label$;
+		areamonster .@map$,181,351,191,387,"Skel Worker",1169,5,.@label$;
+		areamonster .@map$,181,351,191,387,"Soldier Skeleton",1028,5,.@label$;
+		areamonster .@map$,181,351,191,387,"Orc Skeleton",1152,5,.@label$;
+		areamonster .@map$,181,351,191,387,"Pirate Skeleton",1071,5,.@label$;
+		areamonster .@map$,181,351,191,387,"Skeleton",1076,5,.@label$;
+		break;
+	case 4:
+		areamonster .@map$,267,351,277,387,"Argiope",1099,15,.@label$;
+		areamonster .@map$,267,351,277,387,"Mantis",1139,5,.@label$;
+		areamonster .@map$,267,351,277,387,"Argos",1100,5,.@label$;
+		areamonster .@map$,267,351,277,387,"Vocal",1088,1,.@label$;
+		areamonster .@map$,267,351,277,387,"Rocker",1052,5,.@label$;
+		areamonster .@map$,267,351,277,387,"Hornet",1004,5,.@label$;
+		break;
+	case 5:
+		areamonster .@map$,352,351,362,387,"Golden Thief Bug",1086,1,.@label$;
+		areamonster .@map$,352,351,362,387,"Thief Bug Male",1054,15,.@label$;
+		areamonster .@map$,352,351,362,387,"Thief Bug Female",1053,15,.@label$;
+		areamonster .@map$,352,351,362,387,"Thief Bug",1051,15,.@label$;
+		areamonster .@map$,352,351,362,387,"Thief Bug Egg",1048,5,.@label$;
+		break;
+	case 6:
+		areamonster .@map$,9,267,19,303,"Dragon Egg",1721,5,.@label$;
+		areamonster .@map$,9,267,19,303,"Thief Bug Egg",1048,5,.@label$;
+		areamonster .@map$,9,267,19,303,"Ant Egg",1097,5,.@label$;
+		areamonster .@map$,9,267,19,303,"Pupa",1008,5,.@label$;
+		break;
+	case 7:
+		areamonster .@map$,93,267,103,303,"Explosion",1383,15,.@label$;
+		areamonster .@map$,93,267,103,303,"Drainliar",1111,15,.@label$;
+		areamonster .@map$,93,267,103,303,"Anopheles",1627,15,.@label$;
+		areamonster .@map$,93,267,103,303,"Farmiliar",1005,15,.@label$;
+		break;
+	case 8:
+		areamonster .@map$,181,267,191,303,"Firelock Soldier",1403,15,.@label$;
+		areamonster .@map$,181,267,191,303,"Cruiser",1248,15,.@label$;
+		break;
+	case 9:
+		areamonster .@map$,267,267,277,303,"Obsidian",1615,15,.@label$;
+		areamonster .@map$,267,267,277,303,"Golem",1040,15,.@label$;
+		areamonster .@map$,267,267,277,303,"Stapo",1784,10,.@label$;
+		break;
+	case 10:
+		areamonster .@map$,352,267,362,303,"Mistress",1059,1,.@label$;
+		areamonster .@map$,352,267,362,303,"Giant Hornet",1303,25,.@label$;
+		areamonster .@map$,352,267,362,303,"Hornet",1004,20,.@label$;
+		break;
+	case 11:
+		areamonster .@map$,9,180,19,216,"Dryad",1493,15,.@label$;
+		areamonster .@map$,9,180,19,216,"Parasite",1500,15,.@label$;
+		areamonster .@map$,9,180,19,216,"Hermit Plant",1413,15,.@label$;
+		areamonster .@map$,9,180,19,216,"Rafflesia",1162,5,.@label$;
+		break;
+	case 12:
+		areamonster .@map$,93,180,103,216,"Demon Pungus",1378,25,.@label$;
+		areamonster .@map$,93,180,103,216,"Punk",1199,25,.@label$;
+		break;
+	case 13:
+		areamonster .@map$,181,180,191,216,"Yao Yun",1512,15,.@label$;
+		areamonster .@map$,181,180,191,216,"Bongunn",1188,15,.@label$;
+		areamonster .@map$,181,180,191,216,"Munak",1026,10,.@label$;
+		break;
+	case 14:
+		areamonster .@map$,267,180,277,216,"High Orc",1213,15,.@label$;
+		areamonster .@map$,267,180,277,216,"Orc Archer",1189,10,.@label$;
+		areamonster .@map$,267,180,277,216,"Orc Lady",1273,10,.@label$;
+		areamonster .@map$,267,180,277,216,"Orc Warrior",1023,5,.@label$;
+		areamonster .@map$,267,180,277,216,"Orc Baby",1686,5,.@label$;
+		break;
+	case 15:
+		areamonster .@map$,352,180,362,216,"Maya",1147,1,.@label$;
+		areamonster .@map$,352,180,362,216,"Phreeoni",1159,1,.@label$;
+		areamonster .@map$,352,180,362,216,"Deniro",1105,15,.@label$;
+		areamonster .@map$,352,180,362,216,"Pierre",1160,15,.@label$;
+		areamonster .@map$,352,180,362,216,"Andre",1095,15,.@label$;
+		areamonster .@map$,352,180,362,216,"Ant Egg",1097,5,.@label$;
+		break;
+	case 16:
+		areamonster .@map$,9,96,19,132,"Raydric Archer",1276,10,.@label$;
+		areamonster .@map$,9,96,19,132,"Orc Archer",1189,10,.@label$;
+		areamonster .@map$,9,96,19,132,"Gargoyle",1253,10,.@label$;
+		areamonster .@map$,9,96,19,132,"Archer Skeleton",1016,10,.@label$;
+		break;
+	case 17:
+		areamonster .@map$,93,96,103,132,"Merman",1264,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Baphomet Jr.",1101,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Strouf",1065,15,.@label$;
+		areamonster .@map$,93,96,103,132,"Hill Wind",1629,5,.@label$;
+		break;
+	case 18:
+		areamonster .@map$,181,96,191,132,"Cramp",1209,25,.@label$;
+		areamonster .@map$,181,96,191,132,"Tarou",1175,15,.@label$;
+		break;
+	case 19:
+		areamonster .@map$,267,96,277,132,"Deviace",1108,10,.@label$;
+		areamonster .@map$,267,96,277,132,"Megalodon",1064,10,.@label$;
+		areamonster .@map$,267,96,277,132,"Swordfish",1069,10,.@label$;
+		areamonster .@map$,267,96,277,132,"Phen",1158,10,.@label$;
+		break;
+	case 20:
+		areamonster .@map$,352,96,362,132,"Drake",1112,1,.@label$;
+		areamonster .@map$,352,96,362,132,"Pirate Skeleton",1071,50,.@label$;
+		break;
+	case 21:
+		areamonster .@map$,9,9,19,45,"Plasma",1693,10,.@label$;
+		areamonster .@map$,9,9,19,45,"Plasma",1696,10,.@label$;
+		areamonster .@map$,9,9,19,45,"Plasma",1695,5,.@label$;
+		areamonster .@map$,9,9,19,45,"Plasma",1697,5,.@label$;
+		areamonster .@map$,9,9,19,45,"Plasma",1694,5,.@label$;
+		break;
+	case 22:
+		areamonster .@map$,93,9,103,45,"Muscipular",1780,15,.@label$;
+		areamonster .@map$,93,9,103,45,"Drosera",1781,15,.@label$;
+		areamonster .@map$,93,9,103,45,"Flora",1118,15,.@label$;
+		areamonster .@map$,93,9,103,45,"Hydra",1068,15,.@label$;
+		areamonster .@map$,93,9,103,45,"Mandragora",1020,10,.@label$;
+		areamonster .@map$,93,9,103,45,"Rafflesia",1162,10,.@label$;
+		break;
+	case 23:
+		areamonster .@map$,181,9,191,45,"Penomena",1216,15,.@label$;
+		areamonster .@map$,181,9,191,45,"Obeaune",1044,10,.@label$;
+		areamonster .@map$,181,9,191,45,"Marse",1144,10,.@label$;
+		areamonster .@map$,181,9,191,45,"Swordfish",1069,10,.@label$;
+		areamonster .@map$,181,9,191,45,"Hydra",1068,5,.@label$;
+		break;
+	case 24:
+		areamonster .@map$,267,9,277,45,"Joker",1131,15,.@label$;
+		areamonster .@map$,267,9,277,45,"Carat",1267,15,.@label$;
+		areamonster .@map$,267,9,277,45,"Jakk",1130,10,.@label$;
+		break;
+	case 25:
+		areamonster .@map$,352,9,362,45,"Cat o' Nine Tails",1307,15,.@label$;
+		areamonster .@map$,352,9,362,45,"Moonlight",1150,1,.@label$;
+		areamonster .@map$,352,9,362,45,"Nine Tail",1180,15,.@label$;
+		break;
+	case 26:
+		areamonster .@map$,9,351,19,387,"Gibbet",1503,10,.@label$;
+		areamonster .@map$,9,351,19,387,"Enchanted Peach Tree",1410,10,.@label$;
+		areamonster .@map$,9,351,19,387,"Wooden Golem",1497,10,.@label$;
+		areamonster .@map$,9,351,19,387,"Stone Shooter",1495,10,.@label$;
+		areamonster .@map$,9,351,19,387,"Elder Willow",1033,5,.@label$;
+		break;
+	case 27:
+		areamonster .@map$,93,351,103,387,"Goblin Archer",1258,10,.@label$;
+		areamonster .@map$,93,351,103,387,"Goblin",1122,10,.@label$;
+		areamonster .@map$,93,351,103,387,"Goblin",1123,5,.@label$;
+		areamonster .@map$,93,351,103,387,"Goblin",1124,5,.@label$;
+		areamonster .@map$,93,351,103,387,"Gobin",1125,5,.@label$;
+		areamonster .@map$,93,351,103,387,"Goblin",1126,5,.@label$;
+		break;
+	case 28:
+		areamonster .@map$,181,351,191,387,"Arclouse",1194,30,.@label$;
+		areamonster .@map$,181,351,191,387,"Neraid",1255,15,.@label$;
+		areamonster .@map$,181,351,191,387,"Pest",1256,15,.@label$;
+		areamonster .@map$,181,351,191,387,"Kukre",1070,10,.@label$;
+		break;
+	case 29:
+		areamonster .@map$,267,351,277,387,"Dark Frame",1260,10,.@label$;
+		areamonster .@map$,267,351,277,387,"The Paper",1375,10,.@label$;
+		areamonster .@map$,267,351,277,387,"Hylozoist",1510,10,.@label$;
+		areamonster .@map$,267,351,277,387,"Quve",1508,5,.@label$;
+		areamonster .@map$,267,351,277,387,"Lude",1509,5,.@label$;
+		areamonster .@map$,267,351,277,387,"Whisper",1179,10,.@label$;
+		break;
+	case 30:
+		areamonster .@map$,352,351,362,387,"White Lady",1630,1,.@label$;
+		areamonster .@map$,352,351,362,387,"Evil Nymph",1416,30,.@label$;
+		break;
+	case 31:
+		areamonster .@map$,9,267,19,303,"Gig",1387,20,.@label$;
+		areamonster .@map$,9,267,19,303,"Iron Fist",1212,15,.@label$;
+		areamonster .@map$,9,267,19,303,"Argiope",1099,10,.@label$;
+		areamonster .@map$,9,267,19,303,"Scorpion",1001,5,.@label$;
+		break;
+	case 32:
+		areamonster .@map$,93,267,103,303,"Goblin Leader",1299,1,.@label$;
+		areamonster .@map$,93,267,103,303,"Goblin Archer",1258,10,.@label$;
+		areamonster .@map$,93,267,103,303,"Goblin",1122,10,.@label$;
+		areamonster .@map$,93,267,103,303,"Goblin",1123,5,.@label$;
+		areamonster .@map$,93,267,103,303,"Goblin",1124,5,.@label$;
+		areamonster .@map$,93,267,103,303,"Goblin",1125,5,.@label$;
+		areamonster .@map$,93,267,103,303,"Goblin",1126,5,.@label$;
+		break;
+	case 33:
+		areamonster .@map$,181,267,191,303,"Kobold Leader",1296,1,.@label$;
+		areamonster .@map$,181,267,191,303,"Kobold",1133,15,.@label$;
+		areamonster .@map$,181,267,191,303,"Kobold_Archer",1282,15,.@label$;
+		areamonster .@map$,181,267,191,303,"Kobold",1134,10,.@label$;
+		areamonster .@map$,181,267,191,303,"Kobold",1135,5,.@label$;
+		break;
+	case 34:
+		areamonster .@map$,267,267,277,303,"Flame Skull",1869,20,.@label$;
+		areamonster .@map$,267,267,277,303,"Whisper",1179,10,.@label$;
+		areamonster .@map$,267,267,277,303,"Giant Whisper",1186,10,.@label$;
+		break;
+	case 35:
+		areamonster .@map$,352,267,362,303,"Turtle General",1312,1,.@label$;
+		areamonster .@map$,352,267,362,303,"Freezer",1319,10,.@label$;
+		areamonster .@map$,352,267,362,303,"Solider",1316,10,.@label$;
+		areamonster .@map$,352,267,362,303,"Heater",1318,10,.@label$;
+		areamonster .@map$,352,267,362,303,"Permeter",1314,10,.@label$;
+		break;
+	case 36:
+		areamonster .@map$,9,180,19,216,"Anolian",1206,30,.@label$;
+		areamonster .@map$,9,180,19,216,"Grove",1687,10,.@label$;
+		areamonster .@map$,9,180,19,216,"Alligator",1271,10,.@label$;
+		break;
+	case 37:
+		areamonster .@map$,93,180,103,216,"Clock Tower Manager",1270,10,.@label$;
+		areamonster .@map$,93,180,103,216,"Clock",1269,10,.@label$;
+		areamonster .@map$,93,180,103,216,"Alarm",1193,30,.@label$;
+		break;
+	case 38:
+		areamonster .@map$,181,180,191,216,"Death Word",1698,25,.@label$;
+		areamonster .@map$,181,180,191,216,"Rideword",1195,25,.@label$;
+		break;
+	case 39:
+		areamonster .@map$,267,180,277,216,"Evil Nymph",1416,10,.@label$;
+		areamonster .@map$,267,180,277,216,"Mao Gui",1513,10,.@label$;
+		areamonster .@map$,267,180,277,216,"Taoist Hermit",1412,10,.@label$;
+		areamonster .@map$,267,180,277,216,"Zhu Po Long",1514,10,.@label$;
+		areamonster .@map$,267,180,277,216,"Jin Guai",1517,5,.@label$;
+		break;
+	case 40:
+		areamonster .@map$,352,180,362,216,"Samurai Specter",1492,1,.@label$;
+		areamonster .@map$,352,180,362,216,"Shinobi",1401,10,.@label$;
+		areamonster .@map$,352,180,362,216,"Tengu",1405,10,.@label$;
+		areamonster .@map$,352,180,362,216,"Firelock Soldier",1403,5,.@label$;
+		areamonster .@map$,352,180,362,216,"Miyabi Doll",1404,10,.@label$;
+		areamonster .@map$,352,180,362,216,"Karakasa",1400,5,.@label$;
+		break;
+	case 41:
+		areamonster .@map$,9,96,19,132,"Kraben",1587,50,.@label$;
+		break;
+	case 42:
+		areamonster .@map$,93,96,103,132,"Sleeper",1386,20,.@label$;
+		areamonster .@map$,93,96,103,132,"Sting",1207,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Mi Gao",1516,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Sandman",1165,5,.@label$;
+		areamonster .@map$,93,96,103,132,"Hode",1127,5,.@label$;
+		break;
+	case 43:
+		areamonster .@map$,181,96,191,132,"Medusa",1148,10,.@label$;
+		areamonster .@map$,181,96,191,132,"Sidewinder",1037,40,.@label$;
+		areamonster .@map$,181,96,191,132,"Anacondaq",1030,5,.@label$;
+		areamonster .@map$,181,96,191,132,"Boa",1025,5,.@label$;
+		break;
+	case 44:
+		areamonster .@map$,267,96,277,132,"Hatii Baby",1515,20,.@label$;
+		areamonster .@map$,267,96,277,132,"Baphomet Jr.",1101,20,.@label$;
+		areamonster .@map$,267,96,277,132,"Orc Baby",1686,1,.@label$;
+		areamonster .@map$,267,96,277,132,"Baby Desert Wolf",1107,10,.@label$;
+		areamonster .@map$,267,96,277,132,"Savage Babe",1167,10,.@label$;
+		break;
+	case 45:
+		areamonster .@map$,352,96,362,132,"Osiris",1038,1,.@label$;
+		areamonster .@map$,352,96,362,132,"Ancient Mummy",1297,15,.@label$;
+		areamonster .@map$,352,96,362,132,"Verit",1032,15,.@label$;
+		areamonster .@map$,352,96,362,132,"Mummy",1041,20,.@label$;
+		break;
+	case 46:
+		areamonster .@map$,9,9,19,45,"Seeker",1774,20,.@label$;
+		areamonster .@map$,9,9,19,45,"Beholder",1633,20,.@label$;
+		break;
+	case 47:
+		areamonster .@map$,93,9,103,45,"Deleter",1384,20,.@label$;
+		areamonster .@map$,93,9,103,45,"Deleter",1385,10,.@label$;
+		areamonster .@map$,93,9,103,45,"Petite",1156,10,.@label$;
+		areamonster .@map$,93,9,103,45,"Petite",1155,10,.@label$;
+		break;
+	case 48:
+		areamonster .@map$,181,9,191,45,"Ancient Worm",1305,10,.@label$;
+		areamonster .@map$,181,9,191,45,"Ancient Mummy",1297,10,.@label$;
+		areamonster .@map$,181,9,191,45,"Ancient Mimic",1699,10,.@label$;
+		break;
+	case 49:
+		areamonster .@map$,267,9,277,45,"Grizzly",1381,20,.@label$;
+		areamonster .@map$,267,9,277,45,"Leib Olmai",1306,7,.@label$;
+		areamonster .@map$,267,9,277,45,"Zipper Bear",1417,5,.@label$;
+		areamonster .@map$,267,9,277,45,"Sasquatch",1243,5,.@label$;
+		areamonster .@map$,267,9,277,45,"Bigfoot",1060,5,.@label$;
+		break;
+	case 50:
+		areamonster .@map$,352,9,362,45,"Pharaoh",1157,1,.@label$;
+		areamonster .@map$,352,9,362,45,"Amon Ra",1511,1,.@label$;
+		areamonster .@map$,352,9,362,45,"Anubis",1098,10,.@label$;
+		areamonster .@map$,352,9,362,45,"Marduk",1140,10,.@label$;
+		areamonster .@map$,352,9,362,45,"Matyr",1146,10,.@label$;
+		break;
+	case 51:
+		areamonster .@map$,9,351,19,387,"Mini Demon",1292,20,.@label$;
+		areamonster .@map$,9,351,19,387,"Diabolic",1382,20,.@label$;
+		areamonster .@map$,9,351,19,387,"Deviruchi",1109,10,.@label$;
+		break;
+	case 52:
+		areamonster .@map$,93,351,103,387,"Harpy",1376,20,.@label$;
+		areamonster .@map$,93,351,103,387,"Grand Peco",1369,10,.@label$;
+		areamonster .@map$,93,351,103,387,"Bloody Butterfly",1408,10,.@label$;
+		areamonster .@map$,93,351,103,387,"Gargoyle",1253,10,.@label$;
+		areamonster .@map$,93,351,103,387,"Hill Wind",1680,5,.@label$;
+		areamonster .@map$,93,351,103,387,"Hill Wind",1629,5,.@label$;
+		break;
+	case 53:
+		areamonster .@map$,181,351,191,387,"Assaulter",1315,25,.@label$;
+		areamonster .@map$,181,351,191,387,"Shinobi",1401,30,.@label$;
+		break;
+	case 54:
+		areamonster .@map$,267,351,277,387,"Chepet",1250,10,.@label$;
+		areamonster .@map$,267,351,277,387,"Mariontte",1143,10,.@label$;
+		areamonster .@map$,267,351,277,387,"Miyabi Doll",1404,10,.@label$;
+		break;
+	case 55:
+		areamonster .@map$,352,351,362,387,"Medusa",1148,25,.@label$;
+		areamonster .@map$,352,351,362,387,"Evil Snake Lord",1418,1,.@label$;
+		areamonster .@map$,352,351,362,387,"Isis",1029,15,.@label$;
+		areamonster .@map$,352,351,362,387,"Sidewinder",1037,15,.@label$;
+		break;
+	case 56:
+		areamonster .@map$,9,267,19,303,"Freezer",1319,10,.@label$;
+		areamonster .@map$,9,267,19,303,"Hatii Baby",1515,10,.@label$;
+		areamonster .@map$,9,267,19,303,"Ice Titan",1777,15,.@label$;
+		areamonster .@map$,9,267,19,303,"Snowier",1775,10,.@label$;
+		areamonster .@map$,9,267,19,303,"Gazeti",1778,10,.@label$;
+		break;
+	case 57:
+		areamonster .@map$,93,267,103,303,"Arc Angeling",1388,1,.@label$;
+		areamonster .@map$,93,267,103,303,"Deviling",1582,1,.@label$;
+		areamonster .@map$,93,267,103,303,"Angeling",1096,1,.@label$;
+		areamonster .@map$,93,267,103,303,"Ghostring",1120,1,.@label$;
+		areamonster .@map$,93,267,103,303,"Mastering",1090,1,.@label$;
+		areamonster .@map$,93,267,103,303,"Metaling",1613,25,.@label$;
+		areamonster .@map$,93,267,103,303,"Marin",1242,5,.@label$;
+		areamonster .@map$,93,267,103,303,"Poporing",1031,5,.@label$;
+		areamonster .@map$,93,267,103,303,"Drops",1113,5,.@label$;
+		break;
+	case 58:
+		areamonster .@map$,181,267,191,303,"Phendark",1202,20,.@label$;
+		areamonster .@map$,181,267,191,303,"Rybio",1201,10,.@label$;
+		areamonster .@map$,181,267,191,303,"Zombie Prisoner",1197,10,.@label$;
+		areamonster .@map$,181,267,191,303,"Skeleton Prisoner",1196,5,.@label$;
+		areamonster .@map$,181,267,191,303,"Injustice",1257,5,.@label$;
+		break;
+	case 59:
+		areamonster .@map$,267,267,277,303,"Ancient Mimic",1699,30,.@label$;
+		areamonster .@map$,267,267,277,303,"Mimic",1191,20,.@label$;
+		areamonster .@map$,267,267,277,303,"Mystcase",1249,10,.@label$;
+		break;
+	case 60:
+		areamonster .@map$,352,267,362,303,"Egnigem Cenia",1658,1,.@label$;
+		areamonster .@map$,352,267,362,303,"Doppelganger",1046,1,.@label$;
+		areamonster .@map$,352,267,362,303,"Armeyer Dinze",1654,10,.@label$;
+		areamonster .@map$,352,267,362,303,"Wickebine Tres",1653,10,.@label$;
+		areamonster .@map$,352,267,362,303,"Laurell Winder",1657,10,.@label$;
+		areamonster .@map$,352,267,362,303,"Kavach Icarus",1656,10,.@label$;
+		areamonster .@map$,352,267,362,303,"Errende Ebecee",1655,10,.@label$;
+		areamonster .@map$,352,267,362,303,"Egnigem Cenia",1652,10,.@label$;
+		break;
+	case 61:
+		areamonster .@map$,9,180,19,216,"Agav",1769,10,.@label$;
+		areamonster .@map$,9,180,19,216,"Echio",1770,10,.@label$;
+		areamonster .@map$,9,180,19,216,"Isilla",1772,5,.@label$;
+		areamonster .@map$,9,180,19,216,"Mobster",1313,10,.@label$;
+		areamonster .@map$,9,180,19,216,"Pasana",1154,10,.@label$;
+		areamonster .@map$,9,180,19,216,"Vanberk",1771,5,.@label$;
+		break;
+	case 62:
+		areamonster .@map$,93,180,103,216,"Wanderer",1208,35,.@label$;
+		break;
+	case 63:
+		areamonster .@map$,181,180,191,216,"Ragged Zombie",1865,20,.@label$;
+		areamonster .@map$,181,180,191,216,"Zombie Master",1298,10,.@label$;
+		areamonster .@map$,181,180,191,216,"Zombie Prisoner",1197,5,.@label$;
+		areamonster .@map$,181,180,191,216,"Orc Zombie",1153,5,.@label$;
+		areamonster .@map$,181,180,191,216,"Zombie",1015,5,.@label$;
+		break;
+	case 64:
+		areamonster .@map$,267,180,277,216,"Ungoliant",1618,30,.@label$;
+		areamonster .@map$,267,180,277,216,"Ancient Worm",1305,2,.@label$;
+		areamonster .@map$,267,180,277,216,"Caterpillar",1300,2,.@label$;
+		areamonster .@map$,267,180,277,216,"Creamy Fear",1293,2,.@label$;
+		areamonster .@map$,267,180,277,216,"Killer Mantis",1294,2,.@label$;
+		areamonster .@map$,267,180,277,216,"Giant Hornet",1303,2,.@label$;
+		break;
+	case 65:
+		areamonster .@map$,352,180,362,216,"Atros",1785,1,.@label$;
+		areamonster .@map$,352,180,362,216,"Galion",1783,20,.@label$;
+		break;
+	case 66:
+		areamonster .@map$,9,96,19,132,"Incubus",1374,20,.@label$;
+		areamonster .@map$,9,96,19,132,"Aliot",1736,20,.@label$;
+		areamonster .@map$,9,96,19,132,"Injustice",1257,10,.@label$;
+		break;
+	case 67:
+		areamonster .@map$,93,96,103,132,"Acidus",1716,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Acidus",1713,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Deleter",1384,5,.@label$;
+		areamonster .@map$,93,96,103,132,"Mutant Dragonoid",1262,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Petite",1156,5,.@label$;
+		break;
+	case 68:
+		areamonster .@map$,181,96,191,132,"Lava Golem",1366,10,.@label$;
+		areamonster .@map$,181,96,191,132,"Stalactic Golem",1278,10,.@label$;
+		areamonster .@map$,181,96,191,132,"Ice Titan",1777,10,.@label$;
+		areamonster .@map$,181,96,191,132,"Wooden Golem",1497,5,.@label$;
+		areamonster .@map$,181,96,191,132,"Golem",1040,5,.@label$;
+		break;
+	case 69:
+		areamonster .@map$,267,96,277,132,"Dame of Sentinel",1700,20,.@label$;
+		areamonster .@map$,267,96,277,132,"Mistress of Shelter",1701,10,.@label$;
+		areamonster .@map$,267,96,277,132,"Baroness of Retribution",1702,10,.@label$;
+		areamonster .@map$,267,96,277,132,"Lady Solace",1703,10,.@label$;
+		areamonster .@map$,267,96,277,132,"False Angel",1371,10,.@label$;
+		break;
+	case 70:
+		areamonster .@map$,352,96,362,132,"Orc Hero",1087,1,.@label$;
+		areamonster .@map$,352,96,362,132,"Orc Lord",1190,1,.@label$;
+		areamonster .@map$,352,96,362,132,"Orc Baby",1686,20,.@label$;
+		break;
+	case 71:
+		areamonster .@map$,9,9,19,45,"Succubus",1370,20,.@label$;
+		areamonster .@map$,9,9,19,45,"Nightmare Terror",1379,20,.@label$;
+		areamonster .@map$,9,9,19,45,"Incubus",1374,20,.@label$;
+		areamonster .@map$,9,9,19,45,"Nightmare",1061,5,.@label$;
+		break;
+	case 72:
+		areamonster .@map$,93,9,103,45,"Margaretha Sorin",1637,10,.@label$;
+		areamonster .@map$,93,9,103,45,"Permeter",1314,10,.@label$;
+		areamonster .@map$,93,9,103,45,"Errende Ebecee",1655,10,.@label$;
+		areamonster .@map$,93,9,103,45,"Enchanted Peach Tree",1410,10,.@label$;
+		break;
+	case 73:
+		areamonster .@map$,181,9,191,45,"Succubus",1370,10,.@label$;
+		areamonster .@map$,181,9,191,45,"Loli Ruri",1505,20,.@label$;
+		areamonster .@map$,181,9,191,45,"Aliza",1737,10,.@label$;
+		areamonster .@map$,181,9,191,45,"Zealotus",1200,5,.@label$;
+		areamonster .@map$,181,9,191,45,"Alice",1275,5,.@label$;
+		areamonster .@map$,181,9,191,45,"Green Maiden",1631,10,.@label$;
+		break;
+	case 74:
+		areamonster .@map$,267,9,277,45,"Dimik",1671,6,.@label$;
+		areamonster .@map$,267,9,277,45,"Dimik",1673,6,.@label$;
+		areamonster .@map$,267,9,277,45,"Dimik",1672,6,.@label$;
+		areamonster .@map$,267,9,277,45,"Venatu",1677,6,.@label$;
+		areamonster .@map$,267,9,277,45,"Dimik",1670,6,.@label$;
+		areamonster .@map$,267,9,277,45,"Archdam",1668,6,.@label$;
+		areamonster .@map$,267,9,277,45,"Venatu",1678,6,.@label$;
+		areamonster .@map$,267,9,277,45,"Venatu",1679,6,.@label$;
+		areamonster .@map$,267,9,277,45,"Venatu",1676,6,.@label$;
+		break;
+	case 75:
+		areamonster .@map$,352,9,362,45,"Baphomet",1039,1,.@label$;
+		areamonster .@map$,352,9,362,45,"Dark Lord",1272,1,.@label$;
+		areamonster .@map$,352,9,362,45,"Baphomet Jr.",1101,20,.@label$;
+		areamonster .@map$,352,9,362,45,"Dark Illusion",1302,10,.@label$;
+		break;
+	case 76:
+		areamonster .@map$,9,351,19,387,"Abysmal Knight",1219,30,.@label$;
+		areamonster .@map$,9,351,19,387,"Nightmare Terror",1379,20,.@label$;
+		areamonster .@map$,9,351,19,387,"Nightmare",1061,10,.@label$;
+		break;
+	case 77:
+		areamonster .@map$,93,351,103,387,"Banshee",1867,30,.@label$;
+		areamonster .@map$,93,351,103,387,"Wraith Dead",1291,10,.@label$;
+		areamonster .@map$,93,351,103,387,"Evil Druid",1117,10,.@label$;
+		areamonster .@map$,93,351,103,387,"Wraith",1192,10,.@label$;
+		areamonster .@map$,93,351,103,387,"Wind Ghost",1263,10,.@label$;
+		break;
+	case 78:
+		areamonster .@map$,181,351,191,387,"Sword Master",1829,5,.@label$;
+		areamonster .@map$,181,351,191,387,"Bloody Knight",1268,10,.@label$;
+		areamonster .@map$,181,351,191,387,"Abysmal Knight",1219,5,.@label$;
+		areamonster .@map$,181,351,191,387,"Dullahan",1504,10,.@label$;
+		areamonster .@map$,181,351,191,387,"Raydric",1163,20,.@label$;
+		break;
+	case 79:
+		areamonster .@map$,267,351,277,387,"Hydro",1720,10,.@label$;
+		areamonster .@map$,267,351,277,387,"Ferus",1714,10,.@label$;
+		areamonster .@map$,267,351,277,387,"Ferus",1717,10,.@label$;
+		areamonster .@map$,267,351,277,387,"Deleter",1385,5,.@label$;
+		areamonster .@map$,267,351,277,387,"Petite",1155,5,.@label$;
+		break;
+	case 80:
+		areamonster .@map$,352,351,362,387,"Falling Bishop",1871,1,.@label$;
+		areamonster .@map$,352,351,362,387,"Necromancer",1870,15,.@label$;
+		break;
+	case 81:
+		areamonster .@map$,9,267,19,303,"Mysteltainn",1203,20,.@label$;
+		areamonster .@map$,9,267,19,303,"Ogretooth",1204,20,.@label$;
+		areamonster .@map$,9,267,19,303,"Executioner",1205,20,.@label$;
+		break;
+	case 82:
+		areamonster .@map$,93,267,103,303,"Bloody Knight",1268,10,.@label$;
+		areamonster .@map$,93,267,103,303,"Agav",1769,10,.@label$;
+		areamonster .@map$,93,267,103,303,"Bloody Murderer",1507,10,.@label$;
+		areamonster .@map$,93,267,103,303,"Skogul",1752,10,.@label$;
+		areamonster .@map$,93,267,103,303,"Injustice",1257,10,.@label$;
+		break;
+	case 83:
+		areamonster .@map$,181,267,191,303,"Skeggiold",1754,10,.@label$;
+		areamonster .@map$,181,267,191,303,"Dark Illusion",1302,10,.@label$;
+		areamonster .@map$,181,267,191,303,"Gryphon",1259,10,.@label$;
+		areamonster .@map$,181,267,191,303,"Chimera",1283,10,.@label$;
+		break;
+	case 84:
+		areamonster .@map$,267,267,277,303,"Succubus",1370,10,.@label$;
+		areamonster .@map$,267,267,277,303,"Dark Illusion",1302,20,.@label$;
+		areamonster .@map$,267,267,277,303,"Owl Duke",1320,10,.@label$;
+		areamonster .@map$,267,267,277,303,"Owl Baron",1295,10,.@label$;
+		areamonster .@map$,267,267,277,303,"Incubus",1374,10,.@label$;
+		break;
+	case 85:
+		areamonster .@map$,352,267,362,303,"Ifrit",1832,1,.@label$;
+		break;
+	case 86:
+		areamonster .@map$,9,180,19,216,"Hydro",1720,10,.@label$;
+		areamonster .@map$,9,180,19,216,"Gryphon",1259,10,.@label$;
+		areamonster .@map$,9,180,19,216,"Chimera",1283,10,.@label$;
+		areamonster .@map$,9,180,19,216,"Majoruros",1310,10,.@label$;
+		break;
+	case 87:
+		areamonster .@map$,93,180,103,216,"Salamander",1831,15,.@label$;
+		areamonster .@map$,93,180,103,216,"Kasa",1833,20,.@label$;
+		areamonster .@map$,93,180,103,216,"Lava Golem",1366,15,.@label$;
+		areamonster .@map$,93,180,103,216,"Gajomart",1309,10,.@label$;
+		break;
+	case 88:
+		areamonster .@map$,181,180,191,216,"Necromancer",1870,15,.@label$;
+		areamonster .@map$,181,180,191,216,"Anubis",1098,15,.@label$;
+		areamonster .@map$,181,180,191,216,"Wraith Dead",1291,10,.@label$;
+		areamonster .@map$,181,180,191,216,"Ancient Mummy",1297,10,.@label$;
+		areamonster .@map$,181,180,191,216,"Khalitzburg",1132,10,.@label$;
+		break;
+	case 89:
+		areamonster .@map$,267,180,277,216,"Odium of Thanatos",1704,6,.@label$;
+		areamonster .@map$,267,180,277,216,"Despero of Thanatos",1705,6,.@label$;
+		areamonster .@map$,267,180,277,216,"Maero of Thanatos",1706,6,.@label$;
+		areamonster .@map$,267,180,277,216,"Dolor of Thanatos",1707,6,.@label$;
+		break;
+	case 90:
+		areamonster .@map$,352,180,362,216,"Valkyrie Randgris",1751,1,.@label$;
+		areamonster .@map$,352,180,362,216,"Baroness of Retribution",1702,10,.@label$;
+		areamonster .@map$,352,180,362,216,"Lady Solace",1703,10,.@label$;
+		areamonster .@map$,352,180,362,216,"False Angel",1371,10,.@label$;
+		break;
+	case 91:
+		areamonster .@map$,9,96,19,132,"Cecil Damon",1638,10,.@label$;
+		areamonster .@map$,9,96,19,132,"Bow Master",1830,10,.@label$;
+		areamonster .@map$,9,96,19,132,"Kavac",1656,30,.@label$;
+		break;
+	case 92:
+		areamonster .@map$,93,96,103,132,"Kathryne Keyron",1639,15,.@label$;
+		areamonster .@map$,93,96,103,132,"Elder",1377,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Laurell Weinder",1657,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Wind Ghost",1263,10,.@label$;
+		areamonster .@map$,93,96,103,132,"Marduk",1140,10,.@label$;
+		break;
+	case 93:
+		areamonster .@map$,181,96,191,132,"Seyren Windsor",1634,15,.@label$;
+		areamonster .@map$,181,96,191,132,"Bloody Knight",1268,10,.@label$;
+		areamonster .@map$,181,96,191,132,"Abysmal Knight",1219,10,.@label$;
+		areamonster .@map$,181,96,191,132,"Wanderer",1208,10,.@label$;
+		break;
+	case 94:
+		areamonster .@map$,267,96,277,132,"Sword Master",1829,15,.@label$;
+		areamonster .@map$,267,96,277,132,"Bow Master",1830,15,.@label$;
+		break;
+	case 95:
+		areamonster .@map$,352,96,362,132,"Beelzebub",1873,1,.@label$;
+		areamonster .@map$,352,96,362,132,"Hunter Fly",1035,30,.@label$;
+		areamonster .@map$,352,96,362,132,"Steel Chonchon",1042,5,.@label$;
+		areamonster .@map$,352,96,362,132,"Dragon FLy",1091,5,.@label$;
+		areamonster .@map$,352,96,362,132,"Chonchon",1011,5,.@label$;
+		break;
+	case 96:
+		areamonster .@map$,9,9,19,45,"Valkyrie",1765,5,.@label$;
+		areamonster .@map$,9,9,19,45,"Skeggiold",1755,10,.@label$;
+		areamonster .@map$,9,9,19,45,"Skeggiold",1754,10,.@label$;
+		break;
+	case 97:
+		areamonster .@map$,93,9,103,45,"Incarnation of Morroc",1918,5,.@label$;
+		areamonster .@map$,93,9,103,45,"Incarnation of Morroc",1919,5,.@label$;
+		areamonster .@map$,93,9,103,45,"Incarnation of Morroc",1920,5,.@label$;
+		areamonster .@map$,93,9,103,45,"Incarnation of Morroc",1921,5,.@label$;
+		break;
+	case 98:
+		areamonster .@map$,181,9,191,45,"Kathryne Keyron",1639,2,.@label$;
+		areamonster .@map$,181,9,191,45,"Seyren Windsor",1634,2,.@label$;
+		areamonster .@map$,181,9,191,45,"Margaretha Sorin",1637,2,.@label$;
+		areamonster .@map$,181,9,191,45,"Eremes Guile",1635,2,.@label$;
+		areamonster .@map$,181,9,191,45,"Howard Alt-Eisen",1636,2,.@label$;
+		areamonster .@map$,181,9,191,45,"Cecil Damon",1638,2,.@label$;
+		break;
+	case 99:
+		for(set .@i,1; .@i<=7; set .@i,.@i+1) {
+			set .@mob_ran,rand(1,30);
+			if (.@mob_ran == 1)
+				areamonster .@map$,267,9,277,45,"Kathryne Keyron",1639,2,.@label$;
+			else if (.@mob_ran == 2)
+				areamonster .@map$,267,9,277,45,"Seyren Windsor",1634,2,.@label$;
+			else if (.@mob_ran == 3)
+				areamonster .@map$,267,9,277,45,"Margaretha Sorin",1637,2,.@label$;
+			else if (.@mob_ran == 4)
+				areamonster .@map$,267,9,277,45,"Eremes Guile",1635,2,.@label$;
+			else if (.@mob_ran == 5)
+				areamonster .@map$,267,9,277,45,"Howard Alt-Eisen",1636,2,.@label$;
+			else if (.@mob_ran == 6)
+				areamonster .@map$,267,9,277,45,"Cecil Damon",1638,2,.@label$;
+			else if (.@mob_ran == 7)
+				areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1918,5,.@label$;
+			else if (.@mob_ran == 8)
+				areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1919,5,.@label$;
+			else if (.@mob_ran == 9)
+				areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1920,5,.@label$;
+			else if (.@mob_ran == 10)
+				areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1921,5,.@label$;
+			else if (.@mob_ran == 11)
+				areamonster .@map$,267,9,277,45,"Valkyrie",1765,5,.@label$;
+			else if (.@mob_ran == 12)
+				areamonster .@map$,267,9,277,45,"Skeggiold",1755,10,.@label$;
+			else if (.@mob_ran == 13)
+				areamonster .@map$,267,9,277,45,"Skeggiold",1754,10,.@label$;
+			else if (.@mob_ran == 14)
+				areamonster .@map$,267,9,277,45,"Seyren Windsor",1634,15,.@label$;
+			else if (.@mob_ran == 15)
+				areamonster .@map$,267,9,277,45,"Bloody Knight",1268,10,.@label$;
+			else if (.@mob_ran == 16)
+				areamonster .@map$,267,9,277,45,"Abysmal Knight",1219,10,.@label$;
+			else if (.@mob_ran == 17)
+				areamonster .@map$,267,9,277,45,"Wanderer",1208,10,.@label$;
+			else if (.@mob_ran == 18)
+				areamonster .@map$,267,9,277,45,"Sword Master",1829,15,.@label$;
+			else if (.@mob_ran == 19)
+				areamonster .@map$,267,9,277,45,"Bow Master",1830,15,.@label$;
+			else if (.@mob_ran == 20)
+				areamonster .@map$,267,9,277,45,"Kathryne Keyron",1639,15,.@label$;
+			else if (.@mob_ran == 21)
+				areamonster .@map$,267,9,277,45,"Elder",1377,10,.@label$;
+			else if (.@mob_ran == 22)
+				areamonster .@map$,267,9,277,45,"Laurell Weinder",1657,10,.@label$;
+			else if (.@mob_ran == 23)
+				areamonster .@map$,267,9,277,45,"Wind Ghost",1263,10,.@label$;
+			else if (.@mob_ran == 24)
+				areamonster .@map$,267,9,277,45,"Marduk",1140,10,.@label$;
+			else if (.@mob_ran == 25)
+				areamonster .@map$,267,9,277,45,"Cecil Damon",1638,10,.@label$;
+			else if (.@mob_ran == 26)
+				areamonster .@map$,267,9,277,45,"Bow Master",1830,10,.@label$;
+			else if (.@mob_ran == 27)
+				areamonster .@map$,267,9,277,45,"Kavach Icarus",1656,30,.@label$;
+			else if (.@mob_ran == 28)
+				areamonster .@map$,267,9,277,45,"Baroness of Retribution",1702,10,.@label$;
+			else if (.@mob_ran == 29)
+				areamonster .@map$,267,9,277,45,"Lady Solace",1703,10,.@label$;
+			else
+				areamonster .@map$,267,9,277,45,"False Angel",1371,10,.@label$;
 		}
 		break;
 	}
-	end;
-}
-
-1@tower,29,365,1	script	#1F Controller	844,{
-	end;
-
-OnInstanceInit:
-	areamonster "1@tower",7,351,17,387,"Metaling",1613,15,instance_npcname("#1F Controller", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",7,351,17,387,"Marin",1242,5,instance_npcname("#1F Controller", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",7,351,17,387,"Poporing",1031,5,instance_npcname("#1F Controller", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",7,351,17,387,"Drops",1113,5,instance_npcname("#1F Controller", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",7,351,17,387,"Mastering",1090,1,instance_npcname("#1F Controller", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",7,351,17,387,"Poring",1002,5,instance_npcname("#1F Controller", instance_id())+"::OnMyMobDead";
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("#1F Controller", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 1
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 1st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 1st Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("1FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,12,393,0	script	1FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("1FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("1FGate102tower", instance_id());
-	areamonster "1@tower",93,351,103,387,"Desert Wolf",1106,20,instance_npcname("1FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,351,103,387,"Vagabond Wolf",1092,1,instance_npcname("1FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,351,103,387,"Baby Desert Wolf",1107,10,instance_npcname("1FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",136,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("1FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 2
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 2nd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 2nd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("2FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,96,393,0	script	2FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("2FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("2FGate102tower", instance_id());
-	areamonster "1@tower",181,351,191,387,"Archer Skeleton",1016,5,instance_npcname("2FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,351,191,387,"Skel Worker",1169,5,instance_npcname("2FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,351,191,387,"Soldier Skeleton",1028,5,instance_npcname("2FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,351,191,387,"Orc Skeleton",1152,5,instance_npcname("2FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,351,191,387,"Pirate Skeleton",1071,5,instance_npcname("2FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,351,191,387,"Skeleton",1076,5,instance_npcname("2FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",224,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("2FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 3
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 3rd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 3rd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("3FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,184,393,0	script	3FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("3FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("3FGate102tower", instance_id());
-	areamonster "1@tower",267,351,277,387,"Argiope",1099,15,instance_npcname("3FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,351,277,387,"Mantis",1139,5,instance_npcname("3FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,351,277,387,"Argos",1100,5,instance_npcname("3FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,351,277,387,"Vocal",1088,1,instance_npcname("3FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,351,277,387,"Rocker",1052,5,instance_npcname("3FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,351,277,387,"Hornet",1004,5,instance_npcname("3FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",310,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("3FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 4
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 4th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 4th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("4FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,270,393,0	script	4FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("4FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("4FGate102tower", instance_id());
-	areamonster "1@tower",352,351,362,387,"Golden Thief Bug",1086,1,instance_npcname("4FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,351,362,387,"Thief Bug Male",1054,15,instance_npcname("4FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,351,362,387,"Thief Bug Female",1053,15,instance_npcname("4FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,351,362,387,"Thief Bug",1051,15,instance_npcname("4FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,351,362,387,"Thief Bug Egg",1048,5,instance_npcname("4FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",395,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("4FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 5
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 5th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 5th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("5FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,355,393,0	script	5FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("5FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("5FGate102tower", instance_id());
-	areamonster "1@tower",9,267,19,303,"Dragon Egg",1721,5,instance_npcname("5FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,267,19,303,"Thief Bug Egg",1048,5,instance_npcname("5FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,267,19,303,"Ant Egg",1097,5,instance_npcname("5FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,267,19,303,"Pupa",1008,5,instance_npcname("5FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",52,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("5FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 6
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 6th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 6th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("6FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,12,309,0	script	6FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("6FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("6FGate102tower", instance_id());
-	areamonster "1@tower",93,267,103,303,"Explosion",1383,15,instance_npcname("6FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,267,103,303,"Drainliar",1111,15,instance_npcname("6FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,267,103,303,"Anopheles",1627,15,instance_npcname("6FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,267,103,303,"Farmiliar",1005,15,instance_npcname("6FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",136,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("6FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 7
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 7th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 7th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("7FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,96,309,0	script	7FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("7FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("7FGate102tower", instance_id());
-	areamonster "1@tower",181,267,191,303,"Firelock Soldier",1403,15,instance_npcname("7FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,267,191,303,"Cruiser",1248,15,instance_npcname("7FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",224,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("7FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 8
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 8th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 8th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("8FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,184,309,0	script	8FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("8FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("8FGate102tower", instance_id());
-	areamonster "1@tower",267,267,277,303,"Obsidian",1615,15,instance_npcname("8FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,267,277,303,"Golem",1040,15,instance_npcname("8FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,267,277,303,"Stapo",1784,10,instance_npcname("8FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",310,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("8FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 9
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 9th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 9th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("9FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,270,309,0	script	9FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("9FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("9FGate102tower", instance_id());
-	areamonster "1@tower",352,267,362,303,"Mistress",1059,1,instance_npcname("9FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,267,362,303,"Giant Hornet",1303,25,instance_npcname("9FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,267,362,303,"Hornet",1004,20,instance_npcname("9FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",395,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("9FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 10
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 10th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 10th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("10FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,355,309,0	script	10FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("10FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("10FGate102tower", instance_id());
-	areamonster "1@tower",9,180,19,216,"Dryad",1493,15,instance_npcname("10FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,180,19,216,"Parasite",1500,15,instance_npcname("10FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,180,19,216,"Hermit Plant",1413,15,instance_npcname("10FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,180,19,216,"Rafflesia",1162,5,instance_npcname("10FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",52,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("10FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 11
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 11th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 11th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("11FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,12,222,0	script	11FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("11FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("11FGate102tower", instance_id());
-	areamonster "1@tower",93,180,103,216,"Demon Pungus",1378,25,instance_npcname("11FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,180,103,216,"Punk",1199,25,instance_npcname("11FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",136,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("11FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 12
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 12th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 12th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("12FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,96,222,0	script	12FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("12FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("12FGate102tower", instance_id());
-	areamonster "1@tower",181,180,191,216,"Yao Yun",1512,15,instance_npcname("12FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,180,191,216,"Bongunn",1188,15,instance_npcname("12FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,180,191,216,"Munak",1026,10,instance_npcname("12FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",224,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("12FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 13
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 13th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 13th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("13FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,184,222,0	script	13FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("13FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("13FGate102tower", instance_id());
-	areamonster "1@tower",267,180,277,216,"High Orc",1213,15,instance_npcname("13FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,180,277,216,"Orc Archer",1189,10,instance_npcname("13FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,180,277,216,"Orc Lady",1273,10,instance_npcname("13FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,180,277,216,"Orc Warrior",1023,5,instance_npcname("13FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,180,277,216,"Orc Baby",1686,5,instance_npcname("13FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",310,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("13FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 14
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 14th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 14th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("14FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
+	return;
+}
+
+function	script	F_Tower_Warp	{
+
+	set .@level, getarg(0);
+	set .@map$, getarg(1);
+
+	switch(.@level) {
+		case 2: warp .@map$,136,354; break;
+		case 3: warp .@map$,224,354; break;
+		case 4: warp .@map$,310,354; break;
+		case 5: warp .@map$,395,354; break;
+		case 6: warp .@map$,52,270; break;
+		case 7: warp .@map$,136,270; break;
+		case 8: warp .@map$,224,270; break;
+		case 9: warp .@map$,310,270; break;
+		case 10: warp .@map$,395,270; break;
+		case 11: warp .@map$,52,183; break;
+		case 12: warp .@map$,136,183; break;
+		case 13: warp .@map$,224,183; break;
+		case 14: warp .@map$,310,183; break;
+		case 15: warp .@map$,395,183; break;
+		case 16: warp .@map$,52,99; break;
+		case 17: warp .@map$,136,99; break;
+		case 18: warp .@map$,224,99; break;
+		case 19: warp .@map$,310,99; break;
+		case 20: warp .@map$,395,99; break;
+		case 21: warp .@map$,52,12; break;
+		case 22: warp .@map$,136,12; break;
+		case 23: warp .@map$,224,12; break;
+		case 24: warp .@map$,310,12; break;
+		case 25: warp .@map$,395,12; break;
+
+		case 27: warp .@map$,136,354; break;
+		case 28: warp .@map$,224,354; break;
+		case 29: warp .@map$,310,354; break;
+		case 30: warp .@map$,395,354; break;
+		case 31: warp .@map$,52,270; break;
+		case 32: warp .@map$,136,270; break;
+		case 33: warp .@map$,224,270; break;
+		case 34: warp .@map$,310,270; break;
+		case 35: warp .@map$,395,270; break;
+		case 36: warp .@map$,52,183; break;
+		case 37: warp .@map$,136,183; break;
+		case 38: warp .@map$,224,183; break;
+		case 39: warp .@map$,310,183; break;
+		case 40: warp .@map$,395,183; break;
+		case 41: warp .@map$,52,99; break;
+		case 42: warp .@map$,136,99; break;
+		case 43: warp .@map$,224,99; break;
+		case 44: warp .@map$,310,99; break;
+		case 45: warp .@map$,395,99; break;
+		case 46: warp .@map$,52,12; break;
+		case 47: warp .@map$,136,12; break;
+		case 48: warp .@map$,224,12; break;
+		case 49: warp .@map$,310,12; break;
+		case 50: warp .@map$,395,12; break;
+
+		case 52: warp .@map$,136,354; break;
+		case 53: warp .@map$,224,354; break;
+		case 54: warp .@map$,310,354; break;
+		case 55: warp .@map$,395,354; break;
+		case 56: warp .@map$,52,270; break;
+		case 57: warp .@map$,136,270; break;
+		case 58: warp .@map$,224,270; break;
+		case 59: warp .@map$,310,270; break;
+		case 60: warp .@map$,395,270; break;
+		case 61: warp .@map$,52,183; break;
+		case 62: warp .@map$,136,183; break;
+		case 63: warp .@map$,224,183; break;
+		case 64: warp .@map$,310,183; break;
+		case 65: warp .@map$,395,183; break;
+		case 66: warp .@map$,52,99; break;
+		case 67: warp .@map$,136,99; break;
+		case 68: warp .@map$,224,99; break;
+		case 69: warp .@map$,310,99; break;
+		case 70: warp .@map$,395,99; break;
+		case 71: warp .@map$,52,12; break;
+		case 72: warp .@map$,136,12; break;
+		case 73: warp .@map$,224,12; break;
+		case 74: warp .@map$,310,12; break;
+		case 75: warp .@map$,395,12; break;
+
+		case 77: warp .@map$,136,354; break;
+		case 78: warp .@map$,224,354; break;
+		case 79: warp .@map$,310,354; break;
+		case 80: warp .@map$,395,354; break;
+		case 81: warp .@map$,52,270; break;
+		case 82: warp .@map$,136,270; break;
+		case 83: warp .@map$,224,270; break;
+		case 84: warp .@map$,310,270; break;
+		case 85: warp .@map$,395,270; break;
+		case 86: warp .@map$,52,183; break;
+		case 87: warp .@map$,136,183; break;
+		case 88: warp .@map$,224,183; break;
+		case 89: warp .@map$,310,183; break;
+		case 90: warp .@map$,395,183; break;
+		case 91: warp .@map$,52,99; break;
+		case 92: warp .@map$,136,99; break;
+		case 93: warp .@map$,224,99; break;
+		case 94: warp .@map$,310,99; break;
+		case 95: warp .@map$,395,99; break;
+		case 96: warp .@map$,52,12; break;
+		case 97: warp .@map$,136,12; break;
+		case 98: warp .@map$,224,12; break;
+		case 99: warp .@map$,309,12; break;
+	}
+	return;
 }
 
-1@tower,270,222,0	script	14FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("14FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("14FGate102tower", instance_id());
-	areamonster "1@tower",352,180,362,216,"Maya",1147,1,instance_npcname("14FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,180,362,216,"Phreeoni",1159,1,instance_npcname("14FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,180,362,216,"Deniro",1105,15,instance_npcname("14FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,180,362,216,"Pierre",1160,15,instance_npcname("14FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,180,362,216,"Andre",1095,15,instance_npcname("14FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,180,362,216,"Ant Egg",1097,5,instance_npcname("14FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-
-	warp "1@tower",395,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("14FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 15
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 15th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 15th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("15FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,355,222,0	script	15FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("15FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("15FGate102tower", instance_id());
-	areamonster "1@tower",9,96,19,132,"Raydric Archer",1276,10,instance_npcname("15FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,96,19,132,"Orc Archer",1189,10,instance_npcname("15FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,96,19,132,"Gargoyle",1253,10,instance_npcname("15FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,96,19,132,"Archer Skeleton",1016,10,instance_npcname("15FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",52,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("15FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 16
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 16th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 16th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("16FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,12,138,0	script	16FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("16FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("16FGate102tower", instance_id());
-	areamonster "1@tower",93,96,103,132,"Merman",1264,10,instance_npcname("16FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,96,103,132,"Baphomet Jr.",1101,10,instance_npcname("16FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,96,103,132,"Strouf",1065,15,instance_npcname("16FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,96,103,132,"Hill Wind",1629,5,instance_npcname("16FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",136,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("16FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 17
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 17th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 17th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("17FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,96,138,0	script	17FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("17FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("17FGate102tower", instance_id());
-	areamonster "1@tower",181,96,191,132,"Cramp",1209,25,instance_npcname("17FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,96,191,132,"Tarou",1175,15,instance_npcname("17FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",224,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("17FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 18
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 18th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 18th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("18FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,184,138,0	script	18FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("18FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("18FGate102tower", instance_id());
-	areamonster "1@tower",267,96,277,132,"Deviace",1108,10,instance_npcname("18FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,96,277,132,"Megalodon",1064,10,instance_npcname("18FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,96,277,132,"Swordfish",1069,10,instance_npcname("18FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,96,277,132,"Phen",1158,10,instance_npcname("18FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
+// Levels 1-25
+//============================================================
+1@tower,50,360,0	script	Immortal Brazier#	CLEAR_NPC,{
+	mes "- A Message is Engraved on the Brazier -";
+	mes "The one who scatters the ashes of the darkness in this place shall become one step closer to Nacht Sieger, the Hegemon King of the Darkness...";
+	next;
 
-OnTouch_:
-	warp "1@tower",310,99;
-	end;
+	setarray .@level$[1],"26th","51st","76th";
+	setarray .@map$[1],"2@tower","3@tower","4@tower";
+	set .@i, select("26th Level:51st Level:76th Level");
 
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("18FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 19
+	if (countitem(6000) < .@i) {
+		mes "-Warning-";
+		mes "To warp to the "+.@level$[.@i]+" Level, you need "+.@i+" Ashes of the Darkness.";
+		close;
 	}
-	else
-		instance_announce -1, "Remaining Monsters on the 19th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 19th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("19FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-1@tower,270,138,0	script	19FGate102tower	45,2,2,{
-	end;
+	delitem 6000,.@i; //Dark_Ashes
+	mapannounce instance_mapname("1@tower"), strcharinfo(0)+". You will be warped to the "+.@level$[.@i]+" Level.",bc_map,"0x00ff99";
+	warp instance_mapname(.@map$[.@i]),52,354;
+	close;
 
 OnInstanceInit:
-	disablenpc instance_npcname("19FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("19FGate102tower", instance_id());
-	areamonster "1@tower",352,96,362,132,"Drake",1112,1,instance_npcname("19FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,96,362,132,"Pirate Skeleton",1071,50,instance_npcname("19FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",395,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("19FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 20
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 20th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
+	initnpctimer;
 	end;
 
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 20th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("20FGate102tower", instance_id())+"::OnEnable";
+OnTimer10000:
+	mapannounce instance_mapname("1@tower"), "Notice : Taming a monster does not count towards defeating them.",bc_map,"0xff0000";
 	stopnpctimer;
 	end;
 }
 
-1@tower,355,138,0	script	20FGate102tower	45,2,2,{
+1@tower,29,365,1	script	#1F Controller	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("20FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("20FGate102tower", instance_id());
-	areamonster "1@tower",9,9,19,45,"Plasma",1693,10,instance_npcname("20FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,9,19,45,"Plasma",1696,10,instance_npcname("20FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,9,19,45,"Plasma",1695,5,instance_npcname("20FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,9,19,45,"Plasma",1697,5,instance_npcname("20FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",9,9,19,45,"Plasma",1694,5,instance_npcname("20FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",52,12;
+	callfunc "F_Tower_Monster",
+		1,
+		instance_mapname("1@tower"),
+		instance_npcname("#1F Controller")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("20FGate102tower", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("1@tower");
+	set .@mob_dead_num,mobcount(.@map$,instance_npcname("#1F Controller")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
 		initnpctimer;
-		//SetItemPartyInMap in_102floor 21
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 21st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
+		//SetItemPartyInMap in_102floor 1
+	} else
+		mapannounce .@map$, "Remaining Monsters on the 1st Level - "+.@mob_dead_num,bc_map,"0x00ff99";
 	end;
 
 OnTimer5000:
-	instance_announce -1, "All Monsters on the 21st Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("21FGate102tower", instance_id())+"::OnEnable";
+	mapannounce instance_mapname("1@tower"), "All Monsters on the 1st Level have been defeated.",bc_map,"0xffff00";
+	donpcevent instance_npcname("1FGate102tower")+"::OnEnable";
 	stopnpctimer;
 	end;
 }
 
-1@tower,12,51,0	script	21FGate102tower	45,2,2,{
+1@tower,12,393,0	script	1FGate102tower	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("21FGate102tower", instance_id());
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("21FGate102tower", instance_id());
-	areamonster "1@tower",93,9,103,45,"Muscipular",1780,15,instance_npcname("21FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,9,103,45,"Drosera",1781,15,instance_npcname("21FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,9,103,45,"Flora",1118,15,instance_npcname("21FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,9,103,45,"Hydra",1068,15,instance_npcname("21FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,9,103,45,"Mandragora",1020,10,instance_npcname("21FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",93,9,103,45,"Rafflesia",1162,10,instance_npcname("21FGate102tower", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname(strnpcinfo(0));
+	callfunc "F_Tower_Monster",
+		atoi(replacestr(strnpcinfo(0),"FGate102tower","")) + 1,
+		strnpcinfo(4),
+		instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
 	end;
 
 OnTouch_:
-	warp "1@tower",136,12;
+	callfunc "F_Tower_Warp",
+		atoi(replacestr(strnpcinfo(0),"FGate102tower","")) + 1,
+		strnpcinfo(4);
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("21FGate102tower", instance_id())+"::OnMyMobDead");
+	set .@map$, strnpcinfo(4);
+	set .@level, atoi(replacestr(strnpcinfo(0),"FGate102tower","")) + 1;
+	set .@mob_dead_num,mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
 		initnpctimer;
-		//SetItemPartyInMap in_102floor 22
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 22nd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
+		//SetItemPartyInMap in_102floor .@level
+	} else
+		mapannounce .@map$, "Remaining Monsters on the "+callsub(L_Display,.@level)+" Level - "+.@mob_dead_num,bc_map,"0x00ff99";
 	end;
 
 OnTimer5000:
-	instance_announce -1, "All Monsters on the 22nd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("22FGate102tower", instance_id())+"::OnEnable";
+	set .@level, atoi(replacestr(strnpcinfo(0),"FGate102tower","")) + 1;
+	mapannounce strnpcinfo(4), "All Monsters on the "+callsub(L_Display,.@level)+" Level have been defeated.",bc_map,"0xffff00";
+	donpcevent instance_npcname(.@level+"FGate102tower")+"::OnEnable";
 	stopnpctimer;
 	end;
-}
-
-1@tower,96,51,0	script	22FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("22FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("22FGate102tower", instance_id());
-	areamonster "1@tower",181,9,191,45,"Penomena",1216,15,instance_npcname("22FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,9,191,45,"Obeaune",1044,10,instance_npcname("22FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,9,191,45,"Marse",1144,10,instance_npcname("22FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,9,191,45,"Swordfish",1069,10,instance_npcname("22FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",181,9,191,45,"Hydra",1068,5,instance_npcname("22FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "1@tower",224,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("22FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 23
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 23rd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
 
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 23rd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("23FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
+L_Display:
+	// Display level properly.
+	set .@mod, getarg(0) % 10;
+	if (.@mod == 1 && getarg(0) != 11) return getarg(0)+"st";
+	else if (.@mod == 2 && getarg(0) != 12) return getarg(0)+"nd";
+	else if (.@mod == 3 && getarg(0) != 13) return getarg(0)+"rd";
+	else return getarg(0)+"th";
 }
+1@tower,96,393,0	duplicate(1FGate102tower)	2FGate102tower	WARPNPC,2,2
+1@tower,184,393,0	duplicate(1FGate102tower)	3FGate102tower	WARPNPC,2,2
+1@tower,270,393,0	duplicate(1FGate102tower)	4FGate102tower	WARPNPC,2,2
+1@tower,355,393,0	duplicate(1FGate102tower)	5FGate102tower	WARPNPC,2,2
+1@tower,12,309,0	duplicate(1FGate102tower)	6FGate102tower	WARPNPC,2,2
+1@tower,96,309,0	duplicate(1FGate102tower)	7FGate102tower	WARPNPC,2,2
+1@tower,184,309,0	duplicate(1FGate102tower)	8FGate102tower	WARPNPC,2,2
+1@tower,270,309,0	duplicate(1FGate102tower)	9FGate102tower	WARPNPC,2,2
+1@tower,355,309,0	duplicate(1FGate102tower)	10FGate102tower	WARPNPC,2,2
+1@tower,12,222,0	duplicate(1FGate102tower)	11FGate102tower	WARPNPC,2,2
+1@tower,96,222,0	duplicate(1FGate102tower)	12FGate102tower	WARPNPC,2,2
+1@tower,184,222,0	duplicate(1FGate102tower)	13FGate102tower	WARPNPC,2,2
+1@tower,270,222,0	duplicate(1FGate102tower)	14FGate102tower	WARPNPC,2,2
+1@tower,355,222,0	duplicate(1FGate102tower)	15FGate102tower	WARPNPC,2,2
+1@tower,12,138,0	duplicate(1FGate102tower)	16FGate102tower	WARPNPC,2,2
+1@tower,96,138,0	duplicate(1FGate102tower)	17FGate102tower	WARPNPC,2,2
+1@tower,184,138,0	duplicate(1FGate102tower)	18FGate102tower	WARPNPC,2,2
+1@tower,270,138,0	duplicate(1FGate102tower)	19FGate102tower	WARPNPC,2,2
+1@tower,355,138,0	duplicate(1FGate102tower)	20FGate102tower	WARPNPC,2,2
+1@tower,12,51,0	duplicate(1FGate102tower)	21FGate102tower	WARPNPC,2,2
+1@tower,96,51,0	duplicate(1FGate102tower)	22FGate102tower	WARPNPC,2,2
+1@tower,184,51,0	duplicate(1FGate102tower)	23FGate102tower	WARPNPC,2,2
+1@tower,270,51,0	duplicate(1FGate102tower)	24FGate102tower	WARPNPC,2,2
 
-1@tower,184,51,0	script	23FGate102tower	45,2,2,{
+1@tower,355,51,0	script	25FGate102tower	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("23FGate102tower", instance_id());
+	disablenpc instance_npcname("25FGate102tower");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("23FGate102tower", instance_id());
-	areamonster "1@tower",267,9,277,45,"Joker",1131,15,instance_npcname("23FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,9,277,45,"Carat",1267,15,instance_npcname("23FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",267,9,277,45,"Jakk",1130,10,instance_npcname("23FGate102tower", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("25FGate102tower");
+	initnpctimer;
 	end;
 
 OnTouch_:
-	warp "1@tower",310,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("23FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 24
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 24th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
+	getitem 6000,1; //Dark_Ashes
+	warp instance_mapname("2@tower"),52,354;
 	end;
 
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 24th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("24FGate102tower", instance_id())+"::OnEnable";
+OnTimer120000:
+	disablenpc instance_npcname("25FGate102tower");
+	donpcevent instance_npcname("25FGate102tower-2")+"::OnEnable";
 	stopnpctimer;
 	end;
 }
 
-1@tower,270,51,0	script	24FGate102tower	45,2,2,{
+1@tower,355,51,0	script	25FGate102tower-2	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("24FGate102tower", instance_id());
+	disablenpc instance_npcname("25FGate102tower-2");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("24FGate102tower", instance_id());
-	areamonster "1@tower",352,9,362,45,"Cat o' Nine Tails",1307,15,instance_npcname("24FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,9,362,45,"Moonlight",1150,1,instance_npcname("24FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "1@tower",352,9,362,45,"Nine Tail",1180,15,instance_npcname("24FGate102tower", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("25FGate102tower-2");
 	end;
 
 OnTouch_:
-	warp "1@tower",395,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@tower",instance_npcname("24FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 25
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 25th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 25th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("25FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
+	warp instance_mapname("2@tower"),52,354;
 	end;
 }
 
-1@tower,355,51,0	script	25FGate102tower	45,2,2,{
+1@tower,71,4,0	script	#Broadcast Mode1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("25FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("25FGate102tower", instance_id());
 	initnpctimer;
 	end;
 
-OnTouch_:
-	getitem 6000,1; //Dark_Ashes
-	warp "2@tower",52,354;
+OnTimer15000:
+OnTimer60000:
+	mapannounce instance_mapname("1@tower"), "Notice : In any abnormal situation where you defeat a monster, you can't advance to the next level!",bc_map,"0xff0000";
 	end;
-
 OnTimer120000:
-	disablenpc instance_npcname("25FGate102tower", instance_id());
-	donpcevent instance_npcname("25FGate102tower-2", instance_id())+"::OnEnable";
+	mapannounce instance_mapname("1@tower"), "Notice : In any abnormal situation where you defeat a monster, you can't advance to the next level!",bc_map,"0xff0000";
 	stopnpctimer;
 	end;
 }
 
-1@tower,355,51,0	script	25FGate102tower-2	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("25FGate102tower-2", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("25FGate102tower-2", instance_id());
-	end;
-
-OnTouch_:
-	warp "2@tower",52,354;
-	end;
-}
-
-/*
-1@tower,71,1,0	script	#Manager Mode1	844,{
+1@tower,71,1,0	script	#Manager Mode1	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "Please enter the password.";
-	input .@inputstr$;
+	set .@i, callfunc("F_GM_NPC","dmc2008",1);
 	next;
-	if (.@inputstr$ == "dmc2008") {
+	if (.@i == 1) {
 		mes "This NPC manages the tower from the 1st to the 25th Level.";
 		mes "Please enter the Level number to open.";
 		mes "(i.g.: 1F->1, 25F->25)";
@@ -1459,957 +1394,114 @@ OnTouch_:
 		if (.@input < 1 || .@input > 25)
 			mes "You can only enter a number from 1 to 25.";
 		else {
-			donpcevent instance_npcname(.@input+"FGate102tower", instance_id())+"::OnEnable";
+			donpcevent instance_npcname(.@input+"FGate102tower")+"::OnEnable";
 			mes "*** Level "+ .@input + " is now being opened. ***";
 		}
 	}
 	close;
 }
-*/
 
 // Levels 26-50
 //============================================================
-2@tower,29,365,2	script	Immortal Furnace#1	844,{
+2@tower,29,365,2	script	Immortal Furnace#1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	areamonster "2@tower",9,351,19,387,"Gibbet",1503,10,instance_npcname("Immortal Furnace#1", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,351,19,387,"Enchanted Peach Tree",1410,10,instance_npcname("Immortal Furnace#1", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,351,19,387,"Wooden Golem",1497,10,instance_npcname("Immortal Furnace#1", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,351,19,387,"Stone Shooter",1495,10,instance_npcname("Immortal Furnace#1", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,351,19,387,"Elder Willow",1033,5,instance_npcname("Immortal Furnace#1", instance_id())+"::OnMyMobDead";
+	callfunc "F_Tower_Monster",
+		26,
+		instance_mapname("2@tower"),
+		instance_npcname("Immortal Furnace#1")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("Immortal Furnace#1", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("2@tower");
+	set .@mob_dead_num,mobcount(.@map$,instance_npcname("Immortal Furnace#1")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
 		initnpctimer;
 		//SetItemPartyInMap in_102floor 26
 	}
 	else
-		instance_announce -1, "Remaining Monsters on the 26th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 26th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("26FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,12,393,0	script	26FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("26FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("26FGate102tower", instance_id());
-	areamonster "2@tower",93,351,103,387,"Goblin Archer",1258,10,instance_npcname("26FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,351,103,387,"Goblin",1122,10,instance_npcname("26FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,351,103,387,"Goblin",1123,5,instance_npcname("26FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,351,103,387,"Goblin",1124,5,instance_npcname("26FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,351,103,387,"Gobin",1125,5,instance_npcname("26FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,351,103,387,"Goblin",1126,5,instance_npcname("26FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",136,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("26FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 27
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 27th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 27th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("27FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,96,393,0	script	27FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("27FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("27FGate102tower", instance_id());
-	areamonster "2@tower",181,351,191,387,"Arclouse",1194,30,instance_npcname("27FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,351,191,387,"Neraid",1255,15,instance_npcname("27FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,351,191,387,"Pest",1256,15,instance_npcname("27FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,351,191,387,"Kukre",1070,10,instance_npcname("27FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",224,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("27FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 28
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 28th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 28th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("28FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,184,393,0	script	28FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("28FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("28FGate102tower", instance_id());
-	areamonster "2@tower",267,351,277,387,"Dark Frame",1260,10,instance_npcname("28FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,351,277,387,"The Paper",1375,10,instance_npcname("28FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,351,277,387,"Hylozoist",1510,10,instance_npcname("28FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,351,277,387,"Quve",1508,5,instance_npcname("28FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,351,277,387,"Lude",1509,5,instance_npcname("28FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,351,277,387,"Whisper",1179,10,instance_npcname("28FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",310,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("28FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 29
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 29th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
+		mapannounce .@map$, "Remaining Monsters on the 26th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
 	end;
 
 OnTimer5000:
-	instance_announce -1, "All Monsters on the 29th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("29FGate102tower", instance_id())+"::OnEnable";
+	mapannounce instance_mapname("2@tower"), "All Monsters on the 26th Level have been defeated.",bc_map,"0xffff00";
+	donpcevent instance_npcname("26FGate102tower")+"::OnEnable";
 	stopnpctimer;
 	end;
 }
 
-2@tower,270,393,0	script	29FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("29FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("29FGate102tower", instance_id());
-	areamonster "2@tower",352,351,362,387,"White Lady",1630,1,instance_npcname("29FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,351,362,387,"Evil Nymph",1416,30,instance_npcname("29FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
+2@tower,12,393,0	duplicate(1FGate102tower)	26FGate102tower	WARPNPC,2,2
+2@tower,96,393,0	duplicate(1FGate102tower)	27FGate102tower	WARPNPC,2,2
+2@tower,184,393,0	duplicate(1FGate102tower)	28FGate102tower	WARPNPC,2,2
+2@tower,270,393,0	duplicate(1FGate102tower)	29FGate102tower	WARPNPC,2,2
+2@tower,355,393,0	duplicate(1FGate102tower)	30FGate102tower	WARPNPC,2,2
+2@tower,12,309,0	duplicate(1FGate102tower)	31FGate102tower	WARPNPC,2,2
+2@tower,96,309,0	duplicate(1FGate102tower)	32FGate102tower	WARPNPC,2,2
+2@tower,184,309,0	duplicate(1FGate102tower)	33FGate102tower	WARPNPC,2,2
+2@tower,270,309,0	duplicate(1FGate102tower)	34FGate102tower	WARPNPC,2,2
+2@tower,355,309,0	duplicate(1FGate102tower)	35FGate102tower	WARPNPC,2,2
+2@tower,12,222,0	duplicate(1FGate102tower)	36FGate102tower	WARPNPC,2,2
+2@tower,96,222,0	duplicate(1FGate102tower)	37FGate102tower	WARPNPC,2,2
+2@tower,184,222,0	duplicate(1FGate102tower)	38FGate102tower	WARPNPC,2,2
+2@tower,270,222,0	duplicate(1FGate102tower)	39FGate102tower	WARPNPC,2,2
+2@tower,355,222,0	duplicate(1FGate102tower)	40FGate102tower	WARPNPC,2,2
+2@tower,12,138,0	duplicate(1FGate102tower)	41FGate102tower	WARPNPC,2,2
+2@tower,96,138,0	duplicate(1FGate102tower)	42FGate102tower	WARPNPC,2,2
+2@tower,184,138,0	duplicate(1FGate102tower)	43FGate102tower	WARPNPC,2,2
+2@tower,270,138,0	duplicate(1FGate102tower)	44FGate102tower	WARPNPC,2,2
+2@tower,355,138,0	duplicate(1FGate102tower)	45FGate102tower	WARPNPC,2,2
+2@tower,12,51,0	duplicate(1FGate102tower)	46FGate102tower	WARPNPC,2,2
+2@tower,96,51,0	duplicate(1FGate102tower)	47FGate102tower	WARPNPC,2,2
+2@tower,184,51,0	duplicate(1FGate102tower)	48FGate102tower	WARPNPC,2,2
+2@tower,270,51,0	duplicate(1FGate102tower)	49FGate102tower	WARPNPC,2,2
 
-OnTouch_:
-	warp "2@tower",395,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("29FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 30
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 30th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 30th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("30FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,355,393,0	script	30FGate102tower	45,2,2,{
+2@tower,355,51,0	script	50FGate102tower	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("30FGate102tower", instance_id());
+	disablenpc instance_npcname("50FGate102tower");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("30FGate102tower", instance_id());
-	areamonster "2@tower",9,267,19,303,"Gig",1387,20,instance_npcname("30FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,267,19,303,"Iron Fist",1212,15,instance_npcname("30FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,267,19,303,"Argiope",1099,10,instance_npcname("30FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,267,19,303,"Scorpion",1001,5,instance_npcname("30FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",52,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("30FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 31
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 31st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 31st Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("31FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,12,309,0	script	31FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("31FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("31FGate102tower", instance_id());
-	areamonster "2@tower",93,267,103,303,"Goblin Leader",1299,1,instance_npcname("31FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,267,103,303,"Goblin Archer",1258,10,instance_npcname("31FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,267,103,303,"Goblin",1122,10,instance_npcname("31FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,267,103,303,"Goblin",1123,5,instance_npcname("31FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,267,103,303,"Goblin",1124,5,instance_npcname("31FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,267,103,303,"Goblin",1125,5,instance_npcname("31FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,267,103,303,"Goblin",1126,5,instance_npcname("31FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",136,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("31FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 32
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 32nd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 32nd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("32FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,96,309,0	script	32FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("32FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("32FGate102tower", instance_id());
-	areamonster "2@tower",181,267,191,303,"Kobold Leader",1296,1,instance_npcname("32FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,267,191,303,"Kobold",1133,15,instance_npcname("32FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,267,191,303,"Kobold_Archer",1282,15,instance_npcname("32FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,267,191,303,"Kobold",1134,10,instance_npcname("32FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,267,191,303,"Kobold",1135,5,instance_npcname("32FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",224,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("32FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 33
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 33rd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 33rd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("33FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,184,309,0	script	33FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("33FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("33FGate102tower", instance_id());
-	areamonster "2@tower",267,267,277,303,"Flame Skull",1869,20,instance_npcname("33FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,267,277,303,"Whisper",1179,10,instance_npcname("33FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,267,277,303,"Giant Whisper",1186,10,instance_npcname("33FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",310,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("33FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 34
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 34th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 34th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("34FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,270,309,0	script	34FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("34FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("34FGate102tower", instance_id());
-	areamonster "2@tower",352,267,362,303,"Turtle General",1312,1,instance_npcname("34FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,267,362,303,"Freezer",1319,10,instance_npcname("34FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,267,362,303,"Solider",1316,10,instance_npcname("34FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,267,362,303,"Heater",1318,10,instance_npcname("34FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,267,362,303,"Permeter",1314,10,instance_npcname("34FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",395,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("34FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 35
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 35th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 35th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("35FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,355,309,0	script	35FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("35FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("35FGate102tower", instance_id());
-	areamonster "2@tower",9,180,19,216,"Anolian",1206,30,instance_npcname("35FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,180,19,216,"Grove",1687,10,instance_npcname("35FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,180,19,216,"Alligator",1271,10,instance_npcname("35FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",52,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("35FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 36
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 36th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 36th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("36FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,12,222,0	script	36FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("36FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("36FGate102tower", instance_id());
-	areamonster "2@tower",93,180,103,216,"Clock Tower Manager",1270,10,instance_npcname("36FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,180,103,216,"Clock",1269,10,instance_npcname("36FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,180,103,216,"Alarm",1193,30,instance_npcname("36FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",136,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("36FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 37
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 37th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 37th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("37FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,96,222,0	script	37FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("37FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("37FGate102tower", instance_id());
-	areamonster "2@tower",181,180,191,216,"Death Word",1698,25,instance_npcname("37FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,180,191,216,"Rideword",1195,25,instance_npcname("37FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",224,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("37FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 38
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 38th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 38th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("38FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,184,222,0	script	38FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("38FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("38FGate102tower", instance_id());
-	areamonster "2@tower",267,180,277,216,"Evil Nymph",1416,10,instance_npcname("38FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,180,277,216,"Mao Gui",1513,10,instance_npcname("38FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,180,277,216,"Taoist Hermit",1412,10,instance_npcname("38FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,180,277,216,"Zhu Po Long",1514,10,instance_npcname("38FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,180,277,216,"Jin Guai",1517,5,instance_npcname("38FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",310,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("38FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 39
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 39th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 39th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("39FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,270,222,0	script	39FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("39FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("39FGate102tower", instance_id());
-	areamonster "2@tower",352,180,362,216,"Samurai Specter",1492,1,instance_npcname("39FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,180,362,216,"Shinobi",1401,10,instance_npcname("39FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,180,362,216,"Tengu",1405,10,instance_npcname("39FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,180,362,216,"Firelock Soldier",1403,5,instance_npcname("39FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,180,362,216,"Miyabi Doll",1404,10,instance_npcname("39FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,180,362,216,"Karakasa",1400,5,instance_npcname("39FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",395,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("39FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 40
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 40th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 40th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("40FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,355,222,0	script	40FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("40FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("40FGate102tower", instance_id());
-	areamonster "2@tower",9,96,19,132,"Kraben",1587,50,instance_npcname("40FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",52,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("40FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 41
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 41st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 41st Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("41FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,12,138,0	script	41FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("41FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("41FGate102tower", instance_id());
-	areamonster "2@tower",93,96,103,132,"Sleeper",1386,20,instance_npcname("41FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,96,103,132,"Sting",1207,10,instance_npcname("41FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,96,103,132,"Mi Gao",1516,10,instance_npcname("41FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,96,103,132,"Sandman",1165,5,instance_npcname("41FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,96,103,132,"Hode",1127,5,instance_npcname("41FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",136,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("41FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 42
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 42nd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 42nd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("42FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,96,138,0	script	42FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("42FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("42FGate102tower", instance_id());
-	areamonster "2@tower",181,96,191,132,"Medusa",1148,10,instance_npcname("42FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,96,191,132,"Sidewinder",1037,40,instance_npcname("42FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,96,191,132,"Anacondaq",1030,5,instance_npcname("42FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,96,191,132,"Boa",1025,5,instance_npcname("42FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",224,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("42FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 43
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 43rd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 43rd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("43FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,184,138,0	script	43FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("43FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("43FGate102tower", instance_id());
-	areamonster "2@tower",267,96,277,132,"Hatii Baby",1515,20,instance_npcname("43FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,96,277,132,"Baphomet Jr.",1101,20,instance_npcname("43FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,96,277,132,"Orc Baby",1686,1,instance_npcname("43FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,96,277,132,"Baby Desert Wolf",1107,10,instance_npcname("43FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,96,277,132,"Savage Babe",1167,10,instance_npcname("43FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",310,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("43FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 44
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 44th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 44th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("44FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,270,138,0	script	44FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("44FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("44FGate102tower", instance_id());
-	areamonster "2@tower",352,96,362,132,"Osiris",1038,1,instance_npcname("44FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,96,362,132,"Ancient Mummy",1297,15,instance_npcname("44FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,96,362,132,"Verit",1032,15,instance_npcname("44FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,96,362,132,"Mummy",1041,20,instance_npcname("44FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",395,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("44FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 45
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 45th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 45th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("45FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,355,138,0	script	45FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("45FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("45FGate102tower", instance_id());
-	areamonster "2@tower",9,9,19,45,"Seeker",1774,20,instance_npcname("45FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",9,9,19,45,"Beholder",1633,20,instance_npcname("45FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",52,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("45FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 46
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 46th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 46th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("46FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,12,51,0	script	46FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("46FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("46FGate102tower", instance_id());
-	areamonster "2@tower",93,9,103,45,"Deleter",1384,20,instance_npcname("46FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,9,103,45,"Deleter",1385,10,instance_npcname("46FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,9,103,45,"Petite",1156,10,instance_npcname("46FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",93,9,103,45,"Petite",1155,10,instance_npcname("46FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",136,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("46FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 47
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 47 Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 47th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("47FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,96,51,0	script	47FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("47FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("47FGate102tower", instance_id());
-	areamonster "2@tower",181,9,191,45,"Ancient Worm",1305,10,instance_npcname("47FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,9,191,45,"Ancient Mummy",1297,10,instance_npcname("47FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",181,9,191,45,"Ancient Mimic",1699,10,instance_npcname("47FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",224,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("47FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 48
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 48th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 48th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("48FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,184,51,0	script	48FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("48FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("48FGate102tower", instance_id());
-	areamonster "2@tower",267,9,277,45,"Grizzly",1381,20,instance_npcname("48FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,9,277,45,"Leib Olmai",1306,7,instance_npcname("48FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,9,277,45,"Zipper Bear",1417,5,instance_npcname("48FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,9,277,45,"Sasquatch",1243,5,instance_npcname("48FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",267,9,277,45,"Bigfoot",1060,5,instance_npcname("48FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",310,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("48FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 49
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 49th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 49th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("49FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,270,51,0	script	49FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("49FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("49FGate102tower", instance_id());
-	areamonster "2@tower",352,9,362,45,"Pharaoh",1157,1,instance_npcname("49FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,9,362,45,"Amon Ra",1511,1,instance_npcname("49FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,9,362,45,"Anubis",1098,10,instance_npcname("49FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,9,362,45,"Marduk",1140,10,instance_npcname("49FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "2@tower",352,9,362,45,"Matyr",1146,10,instance_npcname("49FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "2@tower",395,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@tower",instance_npcname("49FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 50
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 50th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 50th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("50FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-2@tower,355,51,0	script	50FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("50FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("50FGate102tower", instance_id());
+	enablenpc instance_npcname("50FGate102tower");
 	initnpctimer;
 	end;
 
 OnTouch_:
 	getitem 6000,1; //Dark_Ashes
-	warp "3@tower",52,354;
+	warp instance_mapname("3@tower"),52,354;
 	end;
 
 OnTimer120000:
-	disablenpc instance_npcname("50FGate102tower", instance_id());
-	donpcevent instance_npcname("50FGate102tower-2", instance_id())+"::OnEnable";
+	disablenpc instance_npcname("50FGate102tower");
+	donpcevent instance_npcname("50FGate102tower-2")+"::OnEnable";
 	stopnpctimer;
 	end;
 }
 
-2@tower,355,51,0	script	50FGate102tower-2	45,2,2,{
+2@tower,355,51,0	script	50FGate102tower-2	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("50FGate102tower-2", instance_id());
+	disablenpc instance_npcname("50FGate102tower-2");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("50FGate102tower-2", instance_id());
+	enablenpc instance_npcname("50FGate102tower-2");
 	end;
 
 OnTouch_:
-	warp "3@tower",52,354;
+	warp instance_mapname("3@tower"),52,354;
 	end;
 }
 
-/*
-2@tower,71,1,0	script	#Manager Mode2	844,{
+2@tower,71,1,0	script	#Manager Mode2	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "Please enter the password.";
-	input .@inputstr$;
+	set .@i, callfunc("F_GM_NPC","dmc2008",1);
 	next;
-	if (.@inputstr$ == "dmc2008") {
+	if (.@i == 1) {
 		mes "This NPC manages the tower from the 26st to the 50th Level.";
 		mes "Please enter the Level number to open.";
 		mes "(i.g.: 26F->26, 50F->50)";
@@ -2418,969 +1510,114 @@ OnTouch_:
 		if (.@onput < 26 || .@input > 50)
 			mes "You can only enter a number from 26 to 50.";
 		else {
-			donpcevent instance_npcname(.@input+"FGate102tower", instance_id())+"::OnEnable";
+			donpcevent instance_npcname(.@input+"FGate102tower")+"::OnEnable";
 			mes "*** Level "+ .@input + " is now being opened. ***";
 		}
 	}
 	close;
 }
-*/
 
 // Levels 51-75
 //============================================================
-3@tower,29,365,2	script	Immortal Furnace#2	844,{
+3@tower,29,365,2	script	Immortal Furnace#2	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	areamonster "3@tower",9,351,19,387,"Mini Demon",1292,20,instance_npcname("Immortal Furnace#2", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,351,19,387,"Diabolic",1382,20,instance_npcname("Immortal Furnace#2", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,351,19,387,"Deviruchi",1109,10,instance_npcname("Immortal Furnace#2", instance_id())+"::OnMyMobDead";
+	callfunc "F_Tower_Monster",
+		51,
+		instance_mapname("3@tower"),
+		instance_npcname("Immortal Furnace#2")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("Immortal Furnace#2", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("3@tower");
+	set .@mob_dead_num,mobcount(.@map$,instance_npcname("Immortal Furnace#2")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
 		initnpctimer;
 		//SetItemPartyInMap in_102floor 51
 	}
 	else
-		instance_announce -1, "Remaining Monsters on the 51st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 51st Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("51FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,12,393,0	script	51FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("51FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("51FGate102tower", instance_id());
-	areamonster "3@tower",93,351,103,387,"Harpy",1376,20,instance_npcname("51FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,351,103,387,"Grand Peco",1369,10,instance_npcname("51FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,351,103,387,"Bloody Butterfly",1408,10,instance_npcname("51FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,351,103,387,"Gargoyle",1253,10,instance_npcname("51FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,351,103,387,"Hill Wind",1680,5,instance_npcname("51FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,351,103,387,"Hill Wind",1629,5,instance_npcname("51FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",136,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("51FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 52
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 52nd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 52nd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("52FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,96,393,0	script	52FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("52FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("52FGate102tower", instance_id());
-	areamonster "3@tower",181,351,191,387,"Assaulter",1315,25,instance_npcname("52FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,351,191,387,"Shinobi",1401,30,instance_npcname("52FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",224,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("52FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 53
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 53rd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 53rd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("53FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,184,393,0	script	53FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("53FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("53FGate102tower", instance_id());
-	areamonster "3@tower",267,351,277,387,"Chepet",1250,10,instance_npcname("53FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,351,277,387,"Mariontte",1143,10,instance_npcname("53FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,351,277,387,"Miyabi Doll",1404,10,instance_npcname("53FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",310,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("53FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 54
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 54th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 54th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("54FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,270,393,0	script	54FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("54FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("54FGate102tower", instance_id());
-	areamonster "3@tower",352,351,362,387,"Medusa",1148,25,instance_npcname("54FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,351,362,387,"Evil Snake Lord",1418,1,instance_npcname("54FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,351,362,387,"Isis",1029,15,instance_npcname("54FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,351,362,387,"Sidewinder",1037,15,instance_npcname("54FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",395,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("54FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 55
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 55th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 55th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("55FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,355,393,0	script	55FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("55FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("55FGate102tower", instance_id());
-	areamonster "3@tower",9,267,19,303,"Freezer",1319,10,instance_npcname("55FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,267,19,303,"Hatii Baby",1515,10,instance_npcname("55FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,267,19,303,"Ice Titan",1777,15,instance_npcname("55FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,267,19,303,"Snowier",1775,10,instance_npcname("55FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,267,19,303,"Gazeti",1778,10,instance_npcname("55FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",52,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("55FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 56
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 56th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 56th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("56FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,12,309,0	script	56FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("56FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("56FGate102tower", instance_id());
-	areamonster "3@tower",93,267,103,303,"Arc Angeling",1388,1,instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,267,103,303,"Deviling",1582,1,instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,267,103,303,"Angeling",1096,1,instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,267,103,303,"Ghostring",1120,1,instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,267,103,303,"Mastering",1090,1,instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,267,103,303,"Metaling",1613,25,instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,267,103,303,"Marin",1242,5,instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,267,103,303,"Poporing",1031,5,instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,267,103,303,"Drops",1113,5,instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",136,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("56FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 57
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 57th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 57th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("57FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,96,309,0	script	57FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("57FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("57FGate102tower", instance_id());
-	areamonster "3@tower",181,267,191,303,"Phendark",1202,20,instance_npcname("57FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,267,191,303,"Rybio",1201,10,instance_npcname("57FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,267,191,303,"Zombie Prisoner",1197,10,instance_npcname("57FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,267,191,303,"Skeleton Prisoner",1196,5,instance_npcname("57FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,267,191,303,"Injustice",1257,5,instance_npcname("57FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",224,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("57FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 58
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 58th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 58th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("58FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,184,309,0	script	58FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("58FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("58FGate102tower", instance_id());
-	areamonster "3@tower",267,267,277,303,"Ancient Mimic",1699,30,instance_npcname("58FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,267,277,303,"Mimic",1191,20,instance_npcname("58FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,267,277,303,"Mystcase",1249,10,instance_npcname("58FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",310,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("58FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 59
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 59th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 59th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("59FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,270,309,0	script	59FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("59FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("59FGate102tower", instance_id());
-	areamonster "3@tower",352,267,362,303,"Egnigem Cenia",1658,1,instance_npcname("59FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,267,362,303,"Doppelganger",1046,1,instance_npcname("59FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,267,362,303,"Armeyer Dinze",1654,10,instance_npcname("59FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,267,362,303,"Wickebine Tres",1653,10,instance_npcname("59FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,267,362,303,"Laurell Winder",1657,10,instance_npcname("59FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,267,362,303,"Kavach Icarus",1656,10,instance_npcname("59FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,267,362,303,"Errende Ebecee",1655,10,instance_npcname("59FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,267,362,303,"Egnigem Cenia",1652,10,instance_npcname("59FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",395,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("59FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 60
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 60th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 60th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("60FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,355,309,0	script	60FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("60FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("60FGate102tower", instance_id());
-	areamonster "3@tower",9,180,19,216,"Agav",1769,10,instance_npcname("60FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,180,19,216,"Echio",1770,10,instance_npcname("60FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,180,19,216,"Isilla",1772,5,instance_npcname("60FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,180,19,216,"Mobster",1313,10,instance_npcname("60FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,180,19,216,"Pasana",1154,10,instance_npcname("60FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,180,19,216,"Vanberk",1771,5,instance_npcname("60FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",52,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("60FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 61
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 61st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 61st Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("61FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,12,222,0	script	61FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("61FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("61FGate102tower", instance_id());
-	areamonster "3@tower",93,180,103,216,"Wanderer",1208,35,instance_npcname("61FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",136,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("61FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 62
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 62nd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 62nd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("62FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,96,222,0	script	62FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("62FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("62FGate102tower", instance_id());
-	areamonster "3@tower",181,180,191,216,"Ragged Zombie",1865,20,instance_npcname("62FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,180,191,216,"Zombie Master",1298,10,instance_npcname("62FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,180,191,216,"Zombie Prisoner",1197,5,instance_npcname("62FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,180,191,216,"Orc Zombie",1153,5,instance_npcname("62FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,180,191,216,"Zombie",1015,5,instance_npcname("62FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",224,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("62FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 63
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 63rd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 63rd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("63FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,184,222,0	script	63FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("63FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("63FGate102tower", instance_id());
-	areamonster "3@tower",267,180,277,216,"Ungoliant",1618,30,instance_npcname("63FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,180,277,216,"Ancient Worm",1305,2,instance_npcname("63FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,180,277,216,"Caterpillar",1300,2,instance_npcname("63FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,180,277,216,"Creamy Fear",1293,2,instance_npcname("63FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,180,277,216,"Killer Mantis",1294,2,instance_npcname("63FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,180,277,216,"Giant Hornet",1303,2,instance_npcname("63FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",310,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("63FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 64
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 64th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 64th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("64FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,270,222,0	script	64FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("64FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("64FGate102tower", instance_id());
-	areamonster "3@tower",352,180,362,216,"Atros",1785,1,instance_npcname("64FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,180,362,216,"Galion",1783,20,instance_npcname("64FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",395,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("64FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 65
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 65th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 65th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("65FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,355,222,0	script	65FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("65FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("65FGate102tower", instance_id());
-	areamonster "3@tower",9,96,19,132,"Incubus",1374,20,instance_npcname("65FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,96,19,132,"Aliot",1736,20,instance_npcname("65FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,96,19,132,"Injustice",1257,10,instance_npcname("65FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",52,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("65FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 66
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 66th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 66th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("66FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,12,138,0	script	66FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("66FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("66FGate102tower", instance_id());
-	areamonster "3@tower",93,96,103,132,"Acidus",1716,10,instance_npcname("66FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,96,103,132,"Acidus",1713,10,instance_npcname("66FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,96,103,132,"Deleter",1384,5,instance_npcname("66FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,96,103,132,"Mutant Dragonoid",1262,10,instance_npcname("66FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,96,103,132,"Petite",1156,5,instance_npcname("66FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",136,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("66FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 67
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 67th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 67th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("67FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,96,138,0	script	67FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("67FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("67FGate102tower", instance_id());
-	areamonster "3@tower",181,96,191,132,"Lava Golem",1366,10,instance_npcname("67FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,96,191,132,"Stalactic Golem",1278,10,instance_npcname("67FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,96,191,132,"Ice Titan",1777,10,instance_npcname("67FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,96,191,132,"Wooden Golem",1497,5,instance_npcname("67FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,96,191,132,"Golem",1040,5,instance_npcname("67FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",224,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("67FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 68
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 68th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 68th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("68FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,184,138,0	script	68FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("68FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("68FGate102tower", instance_id());
-	areamonster "3@tower",267,96,277,132,"Dame of Sentinel",1700,20,instance_npcname("68FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,96,277,132,"Mistress of Shelter",1701,10,instance_npcname("68FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,96,277,132,"Baroness of Retribution",1702,10,instance_npcname("68FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,96,277,132,"Lady Solace",1703,10,instance_npcname("68FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,96,277,132,"False Angel",1371,10,instance_npcname("68FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",310,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("68FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 69
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 69th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 69th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("69FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,270,138,0	script	69FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("69FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("69FGate102tower", instance_id());
-	areamonster "3@tower",352,96,362,132,"Orc Hero",1087,1,instance_npcname("69FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,96,362,132,"Orc Lord",1190,1,instance_npcname("69FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,96,362,132,"Orc Baby",1686,20,instance_npcname("69FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",395,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("69FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 70
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 70th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 70th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("70FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,355,138,0	script	70FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("70FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("70FGate102tower", instance_id());
-	areamonster "3@tower",9,9,19,45,"Succubus",1370,20,instance_npcname("70FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,9,19,45,"Nightmare Terror",1379,20,instance_npcname("70FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,9,19,45,"Incubus",1374,20,instance_npcname("70FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",9,9,19,45,"Nightmare",1061,5,instance_npcname("70FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",52,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("70FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 71
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 71st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 71st Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("71FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,12,51,0	script	71FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("71FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("71FGate102tower", instance_id());
-	areamonster "3@tower",93,9,103,45,"Margaretha Sorin",1637,10,instance_npcname("71FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,9,103,45,"Permeter",1314,10,instance_npcname("71FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,9,103,45,"Errende Ebecee",1655,10,instance_npcname("71FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",93,9,103,45,"Enchanted Peach Tree",1410,10,instance_npcname("71FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",136,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("71FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 72
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 72nd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 72nd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("72FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,96,51,0	script	72FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("72FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("72FGate102tower", instance_id());
-	areamonster "3@tower",181,9,191,45,"Succubus",1370,10,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,9,191,45,"Loli Ruri",1505,20,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,9,191,45,"Aliza",1737,10,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,9,191,45,"Zealotus",1200,5,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,9,191,45,"Alice",1275,5,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",181,9,191,45,"Green Maiden",1631,10,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",224,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 73
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 73rd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
+		mapannounce .@map$, "Remaining Monsters on the 51st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
 	end;
 
 OnTimer5000:
-	instance_announce -1, "All Monsters on the 73rd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("73FGate102tower", instance_id())+"::OnEnable";
+	mapannounce instance_mapname("3@tower"), "All Monsters on the 51st Level have been defeated.",bc_map,"0xffff00";
+	donpcevent instance_npcname("51FGate102tower")+"::OnEnable";
 	stopnpctimer;
 	end;
 }
 
-3@tower,184,51,0	script	73FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("73FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("73FGate102tower", instance_id());
-	areamonster "3@tower",267,9,277,45,"Dimik",1671,6,instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,9,277,45,"Dimik",1673,6,instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,9,277,45,"Dimik",1672,6,instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,9,277,45,"Venatu",1677,6,instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,9,277,45,"Dimik",1670,6,instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,9,277,45,"Archdam",1668,6,instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,9,277,45,"Venatu",1678,6,instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,9,277,45,"Venatu",1679,6,instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",267,9,277,45,"Venatu",1676,6,instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",310,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("73FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 74
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 74th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 74th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("74FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-3@tower,270,51,0	script	74FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("74FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("74FGate102tower", instance_id());
-	areamonster "3@tower",352,9,362,45,"Baphomet",1039,1,instance_npcname("74FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,9,362,45,"Dark Lord",1272,1,instance_npcname("74FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,9,362,45,"Baphomet Jr.",1101,20,instance_npcname("74FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "3@tower",352,9,362,45,"Dark Illusion",1302,10,instance_npcname("74FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "3@tower",395,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("3@tower",instance_npcname("74FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 75
-	}
-	else
-		instance_announce -1, "Remaining Monsters on the 75th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1, "All Monsters on the 75th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("75FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
+3@tower,12,393,0	duplicate(1FGate102tower)	51FGate102tower	WARPNPC,2,2
+3@tower,96,393,0	duplicate(1FGate102tower)	52FGate102tower	WARPNPC,2,2
+3@tower,184,393,0	duplicate(1FGate102tower)	53FGate102tower	WARPNPC,2,2
+3@tower,270,393,0	duplicate(1FGate102tower)	54FGate102tower	WARPNPC,2,2
+3@tower,355,393,0	duplicate(1FGate102tower)	55FGate102tower	WARPNPC,2,2
+3@tower,12,309,0	duplicate(1FGate102tower)	56FGate102tower	WARPNPC,2,2
+3@tower,96,309,0	duplicate(1FGate102tower)	57FGate102tower	WARPNPC,2,2
+3@tower,184,309,0	duplicate(1FGate102tower)	58FGate102tower	WARPNPC,2,2
+3@tower,270,309,0	duplicate(1FGate102tower)	59FGate102tower	WARPNPC,2,2
+3@tower,355,309,0	duplicate(1FGate102tower)	60FGate102tower	WARPNPC,2,2
+3@tower,12,222,0	duplicate(1FGate102tower)	61FGate102tower	WARPNPC,2,2
+3@tower,96,222,0	duplicate(1FGate102tower)	62FGate102tower	WARPNPC,2,2
+3@tower,184,222,0	duplicate(1FGate102tower)	63FGate102tower	WARPNPC,2,2
+3@tower,270,222,0	duplicate(1FGate102tower)	64FGate102tower	WARPNPC,2,2
+3@tower,355,222,0	duplicate(1FGate102tower)	65FGate102tower	WARPNPC,2,2
+3@tower,12,138,0	duplicate(1FGate102tower)	66FGate102tower	WARPNPC,2,2
+3@tower,96,138,0	duplicate(1FGate102tower)	67FGate102tower	WARPNPC,2,2
+3@tower,184,138,0	duplicate(1FGate102tower)	68FGate102tower	WARPNPC,2,2
+3@tower,270,138,0	duplicate(1FGate102tower)	69FGate102tower	WARPNPC,2,2
+3@tower,355,138,0	duplicate(1FGate102tower)	70FGate102tower	WARPNPC,2,2
+3@tower,12,51,0	duplicate(1FGate102tower)	71FGate102tower	WARPNPC,2,2
+3@tower,96,51,0	duplicate(1FGate102tower)	72FGate102tower	WARPNPC,2,2
+3@tower,184,51,0	duplicate(1FGate102tower)	73FGate102tower	WARPNPC,2,2
+3@tower,270,51,0	duplicate(1FGate102tower)	74FGate102tower	WARPNPC,2,2
 
-3@tower,355,51,0	script	75FGate102tower	45,1,1,{
+3@tower,355,51,0	script	75FGate102tower	WARPNPC,1,1,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("75FGate102tower", instance_id());
+	disablenpc instance_npcname("75FGate102tower");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("75FGate102tower", instance_id());
+	enablenpc instance_npcname("75FGate102tower");
 	initnpctimer;
 	end;
 
 OnTouch_:
 	getitem 6000,1; //Dark_Ashes
-	warp "4@tower",52,354;
+	warp instance_mapname("4@tower"),52,354;
 	end;
 
 OnTimer120000:
-	disablenpc instance_npcname("75FGate102tower", instance_id());
-	donpcevent instance_npcname("75FGate102tower-2", instance_id())+"::OnEnable";
+	disablenpc instance_npcname("75FGate102tower");
+	donpcevent instance_npcname("75FGate102tower-2")+"::OnEnable";
 	stopnpctimer;
 	end;
 }
 
-3@tower,355,51,0	script	75FGate102tower-2	45,2,2,{
+3@tower,355,51,0	script	75FGate102tower-2	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("75FGate102tower-2", instance_id());
+	disablenpc instance_npcname("75FGate102tower-2");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("75FGate102tower-2", instance_id());
+	enablenpc instance_npcname("75FGate102tower-2");
 	end;
 
 OnTouch_:
-	warp "4@tower",52,354;
+	warp instance_mapname("4@tower"),52,354;
 	end;
 }
 
-/*
-3@tower,71,1,0	script	#Manager Mode3	844,{
+3@tower,71,1,0	script	#Manager Mode3	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "Please enter the password.";
-	input .@inputstr$;
+	set .@i, callfunc("F_GM_NPC","dmc2008",1);
 	next;
-	if (.@inputstr$ == "dmc2008") {
+	if (.@i == 1) {
 		mes "This NPC manages the tower from the 51st to the 75th Level.";
 		mes "Please enter the Level number to open.";
 		mes "(i.g.: 51F->51, 75F->75)";
@@ -3389,975 +1626,113 @@ OnTouch_:
 		if (.@input < 51 || .@input > 75)
 			mes "You can only enter a number from 51 to 75.";
 		else {
-			donpcevent instance_npcname(.@input+"FGate102tower", instance_id())+"::OnEnable";
+			donpcevent instance_npcname(.@input+"FGate102tower")+"::OnEnable";
 			mes "*** Level "+ .@input + " is now being opened. ***";
 		}
 	}
 	close;
 }
-*/
 
 // Levels 76-99
 //============================================================
-4@tower,29,365,2	script	Immortal Furnace#3	844,{
+4@tower,29,365,2	script	Immortal Furnace#3	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	areamonster "4@tower",9,351,19,387,"Abysmal Knight",1219,30,instance_npcname("Immortal Furnace#3", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,351,19,387,"Nightmare Terror",1379,20,instance_npcname("Immortal Furnace#3", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,351,19,387,"Nightmare",1061,10,instance_npcname("Immortal Furnace#3", instance_id())+"::OnMyMobDead";
+	callfunc "F_Tower_Monster",
+		76,
+		instance_mapname("4@tower"),
+		instance_npcname("Immortal Furnace#3")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("Immortal Furnace#3", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("4@tower");
+	set .@mob_dead_num,mobcount(.@map$,instance_npcname("Immortal Furnace#3")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
 		initnpctimer;
 		//SetItemPartyInMap in_102floor 76
 	}
 	else
-		instance_announce -1,"Remaining Monsters on the 76th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 76th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("76FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,12,393,0	script	76FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("76FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("76FGate102tower", instance_id());
-	areamonster "4@tower",93,351,103,387,"Banshee",1867,30,instance_npcname("76FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,351,103,387,"Wraith Dead",1291,10,instance_npcname("76FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,351,103,387,"Evil Druid",1117,10,instance_npcname("76FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,351,103,387,"Wraith",1192,10,instance_npcname("76FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,351,103,387,"Wind Ghost",1263,10,instance_npcname("76FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",136,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("76FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 77
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 77th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 77th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("77FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,96,393,0	script	77FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("77FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("77FGate102tower", instance_id());
-	areamonster "4@tower",181,351,191,387,"Sword Master",1829,5,instance_npcname("77FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,351,191,387,"Bloody Knight",1268,10,instance_npcname("77FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,351,191,387,"Abysmal Knight",1219,5,instance_npcname("77FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,351,191,387,"Dullahan",1504,10,instance_npcname("77FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,351,191,387,"Raydric",1163,20,instance_npcname("77FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",224,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("77FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 78
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 78th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the Level 78th have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("78FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,184,393,0	script	78FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("78FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("78FGate102tower", instance_id());
-	areamonster "4@tower",267,351,277,387,"Hydro",1720,10,instance_npcname("78FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,351,277,387,"Ferus",1714,10,instance_npcname("78FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,351,277,387,"Ferus",1717,10,instance_npcname("78FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,351,277,387,"Deleter",1385,5,instance_npcname("78FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,351,277,387,"Petite",1155,5,instance_npcname("78FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",310,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("78FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 79
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 79th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 79th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("79FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,270,393,0	script	79FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("79FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("79FGate102tower", instance_id());
-	areamonster "4@tower",352,351,362,387,"Falling Bishop",1871,1,instance_npcname("79FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",352,351,362,387,"Necromancer",1870,15,instance_npcname("79FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",395,354;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("79FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 80
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 80th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 80th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("80FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,355,393,0	script	80FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("80FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("80FGate102tower", instance_id());
-	areamonster "4@tower",9,267,19,303,"Mysteltainn",1203,20,instance_npcname("80FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,267,19,303,"Ogretooth",1204,20,instance_npcname("80FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,267,19,303,"Executioner",1205,20,instance_npcname("80FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",52,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("80FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 81
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 81st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
+		mapannounce .@map$,"Remaining Monsters on the 76th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
 	end;
 
 OnTimer5000:
-	instance_announce -1,"All Monsters on the 81st Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("81FGate102tower", instance_id())+"::OnEnable";
+	mapannounce instance_mapname("4@tower"),"All Monsters on the 76th Level have been defeated.",bc_map,"0xffff00";
+	donpcevent instance_npcname("76FGate102tower")+"::OnEnable";
 	stopnpctimer;
 	end;
 }
 
-4@tower,12,309,0	script	81FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("81FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("81FGate102tower", instance_id());
-	areamonster "4@tower",93,267,103,303,"Bloody Knight",1268,10,instance_npcname("81FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,267,103,303,"Agav",1769,10,instance_npcname("81FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,267,103,303,"Bloody Murderer",1507,10,instance_npcname("81FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,267,103,303,"Skogul",1752,10,instance_npcname("81FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,267,103,303,"Injustice",1257,10,instance_npcname("81FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",136,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("81FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 82
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 82nd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 82nd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("82FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,96,309,0	script	82FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("82FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("82FGate102tower", instance_id());
-	areamonster "4@tower",181,267,191,303,"Skeggiold",1754,10,instance_npcname("82FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,267,191,303,"Dark Illusion",1302,10,instance_npcname("82FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,267,191,303,"Gryphon",1259,10,instance_npcname("82FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,267,191,303,"Chimera",1283,10,instance_npcname("82FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
+4@tower,12,393,0	duplicate(1FGate102tower)	76FGate102tower	WARPNPC,2,2
+4@tower,96,393,0	duplicate(1FGate102tower)	77FGate102tower	WARPNPC,2,2
+4@tower,184,393,0	duplicate(1FGate102tower)	78FGate102tower	WARPNPC,2,2
+4@tower,270,393,0	duplicate(1FGate102tower)	79FGate102tower	WARPNPC,2,2
+4@tower,355,393,0	duplicate(1FGate102tower)	80FGate102tower	WARPNPC,2,2
+4@tower,12,309,0	duplicate(1FGate102tower)	81FGate102tower	WARPNPC,2,2
+4@tower,96,309,0	duplicate(1FGate102tower)	82FGate102tower	WARPNPC,2,2
+4@tower,184,309,0	duplicate(1FGate102tower)	83FGate102tower	WARPNPC,2,2
+4@tower,270,309,0	duplicate(1FGate102tower)	84FGate102tower	WARPNPC,2,2
+4@tower,355,309,0	duplicate(1FGate102tower)	85FGate102tower	WARPNPC,2,2
+4@tower,12,222,0	duplicate(1FGate102tower)	86FGate102tower	WARPNPC,2,2
+4@tower,96,222,0	duplicate(1FGate102tower)	87FGate102tower	WARPNPC,2,2
+4@tower,184,222,0	duplicate(1FGate102tower)	88FGate102tower	WARPNPC,2,2
+4@tower,270,222,0	duplicate(1FGate102tower)	89FGate102tower	WARPNPC,2,2
+4@tower,355,222,0	duplicate(1FGate102tower)	90FGate102tower	WARPNPC,2,2
+4@tower,12,138,0	duplicate(1FGate102tower)	91FGate102tower	WARPNPC,2,2
+4@tower,96,138,0	duplicate(1FGate102tower)	92FGate102tower	WARPNPC,2,2
+4@tower,184,138,0	duplicate(1FGate102tower)	93FGate102tower	WARPNPC,2,2
+4@tower,270,138,0	duplicate(1FGate102tower)	94FGate102tower	WARPNPC,2,2
+4@tower,355,138,0	duplicate(1FGate102tower)	95FGate102tower	WARPNPC,2,2
+4@tower,12,51,0	duplicate(1FGate102tower)	96FGate102tower	WARPNPC,2,2
+4@tower,96,51,0	duplicate(1FGate102tower)	97FGate102tower	WARPNPC,2,2
+4@tower,184,51,0	duplicate(1FGate102tower)	98FGate102tower	WARPNPC,2,2
 
-OnTouch_:
-	warp "4@tower",224,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("82FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 83
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 83rd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 83rd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("83FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,184,309,0	script	83FGate102tower	45,2,2,{
+4@tower,271,51,0	script	99FGate102tower	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("83FGate102tower", instance_id());
+	disablenpc instance_npcname("99FGate102tower");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("83FGate102tower", instance_id());
-	areamonster "4@tower",267,267,277,303,"Succubus",1370,10,instance_npcname("83FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,267,277,303,"Dark Illusion",1302,20,instance_npcname("83FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,267,277,303,"Owl Duke",1320,10,instance_npcname("83FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,267,277,303,"Owl Baron",1295,10,instance_npcname("83FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,267,277,303,"Incubus",1374,10,instance_npcname("83FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",310,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("83FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 84
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 84th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 84th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("84FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,270,309,0	script	84FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("84FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("84FGate102tower", instance_id());
-	areamonster "4@tower",352,267,362,303,"Ifrit",1832,1,instance_npcname("84FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",395,270;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("84FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 85
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 85th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 85th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("85FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,355,309,0	script	85FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("85FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("85FGate102tower", instance_id());
-	areamonster "4@tower",9,180,19,216,"Hydro",1720,10,instance_npcname("85FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,180,19,216,"Gryphon",1259,10,instance_npcname("85FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,180,19,216,"Chimera",1283,10,instance_npcname("85FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,180,19,216,"Majoruros",1310,10,instance_npcname("85FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",52,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("85FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 86
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 86th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 86th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("86FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,12,222,0	script	86FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("86FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("86FGate102tower", instance_id());
-	areamonster "4@tower",93,180,103,216,"Salamander",1831,15,instance_npcname("86FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,180,103,216,"Kasa",1833,20,instance_npcname("86FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,180,103,216,"Lava Golem",1366,15,instance_npcname("86FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,180,103,216,"Gajomart",1309,10,instance_npcname("86FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",136,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("86FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 87
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 87th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 87th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("87FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,96,222,0	script	87FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("87FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("87FGate102tower", instance_id());
-	areamonster "4@tower",181,180,191,216,"Necromancer",1870,15,instance_npcname("87FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,180,191,216,"Anubis",1098,15,instance_npcname("87FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,180,191,216,"Wraith Dead",1291,10,instance_npcname("87FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,180,191,216,"Ancient Mummy",1297,10,instance_npcname("87FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,180,191,216,"Khalitzburg",1132,10,instance_npcname("87FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",224,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("87FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 88
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 88th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 88th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("88FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,184,222,0	script	88FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("88FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("88FGate102tower", instance_id());
-	areamonster "4@tower",267,180,277,216,"Odium of Thanatos",1704,6,instance_npcname("88FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,180,277,216,"Despero of Thanatos",1705,6,instance_npcname("88FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,180,277,216,"Maero of Thanatos",1706,6,instance_npcname("88FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,180,277,216,"Dolor of Thanatos",1707,6,instance_npcname("88FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",310,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("88FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 89
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 89th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 89th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("89FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,270,222,0	script	89FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("89FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("89FGate102tower", instance_id());
-	areamonster "4@tower",352,180,362,216,"Valkyrie Randgris",1751,1,instance_npcname("89FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",352,180,362,216,"Baroness of Retribution",1702,10,instance_npcname("89FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",352,180,362,216,"Lady Solace",1703,10,instance_npcname("89FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",352,180,362,216,"False Angel",1371,10,instance_npcname("89FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",395,183;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("89FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 90
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 90th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 90th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("90FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,355,222,0	script	90FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("90FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("90FGate102tower", instance_id());
-	areamonster "4@tower",9,96,19,132,"Cecil Damon",1638,10,instance_npcname("90FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,96,19,132,"Bow Master",1830,10,instance_npcname("90FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,96,19,132,"Kavac",1656,30,instance_npcname("90FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",52,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("90FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 91
-	}
-	else 
-		instance_announce -1,"Remaining Monsters on the 91st Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 91st Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("91FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,12,138,0	script	91FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("91FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("91FGate102tower", instance_id());
-	areamonster "4@tower",93,96,103,132,"Kathryne Keyron",1639,15,instance_npcname("91FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,96,103,132,"Elder",1377,10,instance_npcname("91FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,96,103,132,"Laurell Weinder",1657,10,instance_npcname("91FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,96,103,132,"Wind Ghost",1263,10,instance_npcname("91FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,96,103,132,"Marduk",1140,10,instance_npcname("91FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",136,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("91FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 92
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 92nd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 92nd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("92FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,96,138,0	script	92FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("92FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("92FGate102tower", instance_id());
-	areamonster "4@tower",181,96,191,132,"Seyren Windsor",1634,15,instance_npcname("92FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,96,191,132,"Bloody Knight",1268,10,instance_npcname("92FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,96,191,132,"Abysmal Knight",1219,10,instance_npcname("92FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,96,191,132,"Wanderer",1208,10,instance_npcname("92FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",224,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("92FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 93
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 93rd Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 93rd Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("93FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,184,138,0	script	93FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("93FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("93FGate102tower", instance_id());
-	areamonster "4@tower",267,96,277,132,"Sword Master",1829,15,instance_npcname("93FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",267,96,277,132,"Bow Master",1830,15,instance_npcname("93FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",310,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("93FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 94
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 94th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 94th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("94FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,270,138,0	script	94FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("94FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("94FGate102tower", instance_id());
-	areamonster "4@tower",352,96,362,132,"Beelzebub",1873,1,instance_npcname("94FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",352,96,362,132,"Hunter Fly",1035,30,instance_npcname("94FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",352,96,362,132,"Steel Chonchon",1042,5,instance_npcname("94FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",352,96,362,132,"Dragon FLy",1091,5,instance_npcname("94FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",352,96,362,132,"Chonchon",1011,5,instance_npcname("94FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",395,99;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("94FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 95
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 95th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 95th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("95FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,355,138,0	script	95FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("95FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("95FGate102tower", instance_id());
-	areamonster "4@tower",9,9,19,45,"Valkyrie",1765,5,instance_npcname("95FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,9,19,45,"Skeggiold",1755,10,instance_npcname("95FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",9,9,19,45,"Skeggiold",1754,10,instance_npcname("95FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",52,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("95FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 96
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 96th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 96th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("96FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,12,51,0	script	96FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("96FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("96FGate102tower", instance_id());
-	areamonster "4@tower",93,9,103,45,"Incarnation of Morroc",1918,5,instance_npcname("96FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,9,103,45,"Incarnation of Morroc",1919,5,instance_npcname("96FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,9,103,45,"Incarnation of Morroc",1920,5,instance_npcname("96FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",93,9,103,45,"Incarnation of Morroc",1921,5,instance_npcname("96FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",136,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("96FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 97
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 97th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 97th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("97FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,96,51,0	script	97FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("97FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("97FGate102tower", instance_id());
-	areamonster "4@tower",181,9,191,45,"Kathryne Keyron",1639,2,instance_npcname("97FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,9,191,45,"Seyren Windsor",1634,2,instance_npcname("97FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,9,191,45,"Margaretha Sorin",1637,2,instance_npcname("97FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,9,191,45,"Eremes Guile",1635,2,instance_npcname("97FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,9,191,45,"Howard Alt-Eisen",1636,2,instance_npcname("97FGate102tower", instance_id())+"::OnMyMobDead";
-	areamonster "4@tower",181,9,191,45,"Cecil Damon",1638,2,instance_npcname("97FGate102tower", instance_id())+"::OnMyMobDead";
-	end;
-
-OnTouch_:
-	warp "4@tower",224,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("97FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 98
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 98th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 98th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("98FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,184,51,0	script	98FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("98FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("98FGate102tower", instance_id());
-	for( set .@i, 1; .@i <= 7; set .@i, .@i + 1 ) {
-		set .@mob_ran,rand(1,30);
-		if (.@mob_ran == 1) 
-			areamonster "4@tower",267,9,277,45,"Kathryne Keyron",1639,2,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 2) 
-			areamonster "4@tower",267,9,277,45,"Seyren Windsor",1634,2,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 3) 
-			areamonster "4@tower",267,9,277,45,"Margaretha Sorin",1637,2,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 4) 
-			areamonster "4@tower",267,9,277,45,"Eremes Guile",1635,2,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 5) 
-			areamonster "4@tower",267,9,277,45,"Howard Alt-Eisen",1636,2,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 6) 
-			areamonster "4@tower",267,9,277,45,"Cecil Damon",1638,2,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 7) 
-			areamonster "4@tower",267,9,277,45,"Incarnation of Morroc",1918,5,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 8) 
-			areamonster "4@tower",267,9,277,45,"Incarnation of Morroc",1919,5,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 9) 
-			areamonster "4@tower",267,9,277,45,"Incarnation of Morroc",1920,5,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 10) 
-			areamonster "4@tower",267,9,277,45,"Incarnation of Morroc",1921,5,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 11) 
-			areamonster "4@tower",267,9,277,45,"Valkyrie",1765,5,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 12) 
-			areamonster "4@tower",267,9,277,45,"Skeggiold",1755,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 13) 
-			areamonster "4@tower",267,9,277,45,"Skeggiold",1754,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 14) 
-			areamonster "4@tower",267,9,277,45,"Seyren Windsor",1634,15,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 15) 
-			areamonster "4@tower",267,9,277,45,"Bloody Knight",1268,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 16) 
-			areamonster "4@tower",267,9,277,45,"Abysmal Knight",1219,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 17) 
-			areamonster "4@tower",267,9,277,45,"Wanderer",1208,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 18) 
-			areamonster "4@tower",267,9,277,45,"Sword Master",1829,15,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 19) 
-			areamonster "4@tower",267,9,277,45,"Bow Master",1830,15,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 20) 
-			areamonster "4@tower",267,9,277,45,"Kathryne Keyron",1639,15,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 21) 
-			areamonster "4@tower",267,9,277,45,"Elder",1377,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 22) 
-			areamonster "4@tower",267,9,277,45,"Laurell Weinder",1657,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 23) 
-			areamonster "4@tower",267,9,277,45,"Wind Ghost",1263,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 24) 
-			areamonster "4@tower",267,9,277,45,"Marduk",1140,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 25) 
-			areamonster "4@tower",267,9,277,45,"Cecil Damon",1638,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 26) 
-			areamonster "4@tower",267,9,277,45,"Bow Master",1830,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 27) 
-			areamonster "4@tower",267,9,277,45,"Kavach Icarus",1656,30,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 28) 
-			areamonster "4@tower",267,9,277,45,"Baroness of Retribution",1702,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else if (.@mob_ran == 29) 
-			areamonster "4@tower",267,9,277,45,"Lady Solace",1703,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-		else 
-			areamonster "4@tower",267,9,277,45,"False Angel",1371,10,instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead";
-	}
-	end;
-
-OnTouch_:
-	warp "4@tower",309,12;
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("4@tower",instance_npcname("98FGate102tower", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		initnpctimer;
-		//SetItemPartyInMap in_102floor 99
-	}
-	else
-		instance_announce -1,"Remaining Monsters on the 99th Level - " + .@mob_dead_num,bc_map,"0x00ff99";
-	end;
-
-OnTimer5000:
-	instance_announce -1,"All Monsters on the 99th Level have been defeated.",bc_map,"0xffff00";
-	donpcevent instance_npcname("99FGate102tower", instance_id())+"::OnEnable";
-	stopnpctimer;
-	end;
-}
-
-4@tower,271,51,0	script	99FGate102tower	45,2,2,{
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("99FGate102tower", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("99FGate102tower", instance_id());
+	enablenpc instance_npcname("99FGate102tower");
 	initnpctimer;
 	end;
 
 OnTouch_:
 	getitem 6000,1; //Dark_Ashes
-	warp "5@tower",101,72;
+	warp instance_mapname("5@tower"),101,72;
 	end;
 
 OnTimer120000:
-	disablenpc instance_npcname("99FGate102tower", instance_id());
-	donpcevent instance_npcname("99FGate102tower-2", instance_id())+"::OnEnable";
+	disablenpc instance_npcname("99FGate102tower");
+	donpcevent instance_npcname("99FGate102tower-2")+"::OnEnable";
 	stopnpctimer;
 	end;
 }
 
-4@tower,271,51,0	script	99FGate102tower-2	45,2,2,{
+4@tower,271,51,0	script	99FGate102tower-2	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("99FGate102tower-2", instance_id());
+	disablenpc instance_npcname("99FGate102tower-2");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("99FGate102tower-2", instance_id());
+	enablenpc instance_npcname("99FGate102tower-2");
 	end;
 
 OnTouch_:
-	warp "5@tower",101,72;
+	warp instance_mapname("5@tower"),101,72;
 	end;
 }
 
-/*
-4@tower,71,1,0	script	#Manager Mode4	844,{
+4@tower,71,1,0	script	#Manager Mode4	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "Please enter the password.";
-	input .@inputstr$;
+	set .@i, callfunc("F_GM_NPC","dmc2008",1);
 	next;
-	if (.@inputstr$ == "dmc2008") {
+	if (.@i == 1) {
 		mes "This NPC manages the tower from the 76th to the 99th Level.";
 		mes "Please enter the Level number to open.";
 		mes "(i.g.: 76F->76, 99F->99)";
@@ -4366,17 +1741,16 @@ OnTouch_:
 		if (.@input < 76 || .@input > 99)
 			mes "You can only enter a number from 76 to 99.";
 		else {
-			donpcevent instance_npcname(.@input+"FGate102tower", instance_id())+"::OnEnable";
+			donpcevent instance_npcname(.@input+"FGate102tower")+"::OnEnable";
 			mes "*** Level "+ .@input + " is now being opened. ***";
 		}
 	}
 	close;
 }
-*/
 
 // Level 100
 //============================================================
-5@tower,106,109,2	script	Lucid Crystal#102	844,{
+5@tower,106,109,2	script	Lucid Crystal#102	CLEAR_NPC,{
 	if (in_102tower < 10) {
 		mes "^0000ffA mysterious voice echoes through the room as you touch the lucid crystal radiating a strong light.^000000";
 		next;
@@ -4413,173 +1787,164 @@ OnTouch_:
 		mes "[Mysterious Voice]";
 		mes "I now allow you to come receive an audience from me. Come to me, to Nacht Sieger the Hegemon-King of the Darkness!";
 		close2;
-		warp "6@tower",32,12;
+		warp instance_mapname("6@tower"),32,12;
 	}
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("Lucid Crystal#102", instance_id());
-	end;
-
 OnDisable:
-	disablenpc instance_npcname("Lucid Crystal#102", instance_id());
+	disablenpc instance_npcname("Lucid Crystal#102");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("Lucid Crystal#102", instance_id());
-	donpcevent instance_npcname("#102Effect1", instance_id())+"::OnEnable";
+	enablenpc instance_npcname("Lucid Crystal#102");
+	donpcevent instance_npcname("#102Effect1")+"::OnEnable";
 	end;
 }
 
-5@tower,106,109,2	script	#102Effect1	844,{
+5@tower,106,109,2	script	#102Effect1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#102Effect1", instance_id());
+	disablenpc instance_npcname("#102Effect1");
 	end;
 
 OnDisable:
-	disablenpc instance_npcname("#102Effect1", instance_id());
+	disablenpc instance_npcname("#102Effect1");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("#102Effect1", instance_id());
+	enablenpc instance_npcname("#102Effect1");
 	initnpctimer;
 	end;
 
 OnTimer500:
 	specialeffect EF_ENHANCE;
 	stopnpctimer;
-	donpcevent instance_npcname("#102Effect2", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("#102Effect2")+"::OnEnable";
 	end;
 }
 
-5@tower,106,109,2	script	#102Effect2	844,{
+5@tower,106,109,2	script	#102Effect2	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#102Effect2", instance_id());
+	disablenpc instance_npcname("#102Effect2");
 	end;
 
 OnDisable:
-	disablenpc instance_npcname("#102Effect2", instance_id());
+	disablenpc instance_npcname("#102Effect2");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("#102Effect2", instance_id());
+	enablenpc instance_npcname("#102Effect2");
 	initnpctimer;
 	end;
 
 OnTimer500:
 	specialeffect EF_ENHANCE;
 	stopnpctimer;
-	donpcevent instance_npcname("#102Effect1", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("#102Effect1")+"::OnEnable";
 	end;
 }
 
-5@tower,82,112,2	script	#102FShadowDust1	844,{
+5@tower,82,112,2	script	#102FShadowDust1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	donpcevent instance_npcname("#102FShadowDust", instance_id())+"::OnEnable";
-	monster "5@tower",83,85,"Entweihen Crothen",1957,1,instance_npcname("#102FShadowDust1", instance_id())+"::OnMyMobDead";
+	donpcevent instance_npcname("#102FShadowDust")+"::OnEnable";
+	monster instance_mapname("5@tower"),83,85,"Entweihen Crothen",1957,1,instance_npcname("#102FShadowDust1")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("5@tower",instance_npcname("#102FShadowDust1", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("5@tower");
+	set .@mob_dead_num,mobcount(.@map$,instance_npcname("#102FShadowDust1")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
-		instance_announce -1, "Mysterious Voice: Who are you to dare intrude upon my sanctuary?!",bc_map,"0xffff00";
-		donpcevent instance_npcname("#102FShadowDust", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("Lucid Crystal#102", instance_id())+"::OnEnable";
+		mapannounce .@map$, "Mysterious Voice: Who are you to dare intrude upon my sanctuary?!",bc_map,"0xffff00";
+		donpcevent instance_npcname("#102FShadowDust")+"::OnDisable";
+		donpcevent instance_npcname("Lucid Crystal#102")+"::OnEnable";
 		//SetItemPartyInMap in_102floor 100
 	}
 	end;
 }
 
-5@tower,82,113,2	script	#102FShadowDust	844,{
+5@tower,82,113,2	script	#102FShadowDust	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#102FShadowDust", instance_id());
+	disablenpc instance_npcname("#102FShadowDust");
 	end;
 
 OnDisable:
-	killmonsterall "5@tower";
-	end;
-
-OnEnable:
-	monster "5@tower",72,93,"Thorny Skeleton",1958,1;
-	monster "5@tower",70,87,"Thorn of Magic",1960,1;
-	monster "5@tower",68,83,"Thorn of Pureness",1961,1;
-	monster "5@tower",70,80,"Thorny Skeleton",1958,1;
-	monster "5@tower",74,81,"Thorn of Magic",1960,1;
-	monster "5@tower",78,72,"Thorn of Magic",1960,1;
-	monster "5@tower",81,70,"Thorny Skeleton",1958,1;
-	monster "5@tower",78,84,"Thorn of Recovery",1959,1;
-	monster "5@tower",85,72,"Thorn of Magic",1960,1;
-	monster "5@tower",91,74,"Thorny Skeleton",1958,1;
-	monster "5@tower",79,77,"Thorn of Pureness",1961,1;
-	monster "5@tower",82,80,"Thorn of Recovery",1959,1;
-	monster "5@tower",87,83,"Thorn of Recovery",1959,1;
-	monster "5@tower",80,92,"Thorn of Pureness",1961,1;
-	monster "5@tower",81,89,"Thorny Skeleton",1958,1;
-	monster "5@tower",85,93,"Thorn of Magic",1960,1;
-	monster "5@tower",86,90,"Thorn of Recovery",1959,1;
-	monster "5@tower",88,88,"Thorny Skeleton",1958,1;
-	monster "5@tower",91,87,"Thorn of Magic",1960,1;
-	monster "5@tower",95,94,"Thorn of Magic",1960,1;
-	monster "5@tower",91,96,"Thorny Skeleton",1958,1;
-	monster "5@tower",90,82,"Thorn of Pureness",1961,1;
-	monster "5@tower",96,98,"Thorn of Magic",1960,1;
-	monster "5@tower",83,76,"Thorny Skeleton",1958,1;
-	monster "5@tower",74,85,"Thorny Skeleton",1958,1;
-	set .@mob_ran,rand(1,3);
-	if (.@mob_ran == 1)
-		monster "5@tower",82,85,"Thorny Skeleton",1958,1;
-	else if (.@mob_ran == 2)
-		monster "5@tower",82,85,"Thorn of Magic",1960,1;
-	else
-		monster "5@tower",82,85,"Thorn of Pureness",1961,1;
-	set .@mob_ran2,rand(1,3);
-	if (.@mob_ran2 == 1)
-		monster "5@tower",84,85,"Thorny Skeleton",1958,1;
-	else if (.@mob_ran2 == 2)
-		monster "5@tower",84,85,"Thorn of Magic",1960,1;
-	else
-		monster "5@tower",84,85,"Thorn of Pureness",1961,1;
-	end;
-}
-
-/*
-5@tower,71,1,0	script	#Manager Mode5	844,{
+	killmonsterall instance_mapname("5@tower");
+	end;
+
+OnEnable:
+	set .@map$, instance_mapname("5@tower");
+	monster .@map$,72,93,"Thorny Skeleton",1958,1;
+	monster .@map$,70,87,"Thorn of Magic",1960,1;
+	monster .@map$,68,83,"Thorn of Pureness",1961,1;
+	monster .@map$,70,80,"Thorny Skeleton",1958,1;
+	monster .@map$,74,81,"Thorn of Magic",1960,1;
+	monster .@map$,78,72,"Thorn of Magic",1960,1;
+	monster .@map$,81,70,"Thorny Skeleton",1958,1;
+	monster .@map$,78,84,"Thorn of Recovery",1959,1;
+	monster .@map$,85,72,"Thorn of Magic",1960,1;
+	monster .@map$,91,74,"Thorny Skeleton",1958,1;
+	monster .@map$,79,77,"Thorn of Pureness",1961,1;
+	monster .@map$,82,80,"Thorn of Recovery",1959,1;
+	monster .@map$,87,83,"Thorn of Recovery",1959,1;
+	monster .@map$,80,92,"Thorn of Pureness",1961,1;
+	monster .@map$,81,89,"Thorny Skeleton",1958,1;
+	monster .@map$,85,93,"Thorn of Magic",1960,1;
+	monster .@map$,86,90,"Thorn of Recovery",1959,1;
+	monster .@map$,88,88,"Thorny Skeleton",1958,1;
+	monster .@map$,91,87,"Thorn of Magic",1960,1;
+	monster .@map$,95,94,"Thorn of Magic",1960,1;
+	monster .@map$,91,96,"Thorny Skeleton",1958,1;
+	monster .@map$,90,82,"Thorn of Pureness",1961,1;
+	monster .@map$,96,98,"Thorn of Magic",1960,1;
+	monster .@map$,83,76,"Thorny Skeleton",1958,1;
+	monster .@map$,74,85,"Thorny Skeleton",1958,1;
+	switch(rand(1,3)) {
+		case 1: monster .@map$,82,85,"Thorny Skeleton",1958,1; break;
+		case 2: monster .@map$,82,85,"Thorn of Magic",1960,1; break;
+		case 3: monster .@map$,82,85,"Thorn of Pureness",1961,1; break;
+	}
+	switch(rand(1,3)) {
+		case 1: monster .@map$,84,85,"Thorny Skeleton",1958,1; break;
+		case 2: monster .@map$,84,85,"Thorn of Magic",1960,1; break;
+		case 3: monster .@map$,84,85,"Thorn of Pureness",1961,1; break;
+	}
+	end;
+}
+
+5@tower,71,1,0	script	#Manager Mode5	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "This NPC manages the crystal on the 100th Level. Please enter the password.";
-	input .@inputstr$;
+	set .@i, callfunc("F_GM_NPC","dmc2008",1);
 	next;
-	if (.@inputstr$ == "dmc2008") {
-		donpcevent instance_npcname("Lucid Crystal#102", instance_id())+"::OnEnable";
+	if (.@i == 1) {
+		donpcevent instance_npcname("Lucid Crystal#102")+"::OnEnable";
 		mes "The 100th Level's crystal has been activated.";
-	}
-	else
+	} else
 		mes "Please enter the correct password.";
 	close;
-} */
+}
 
 // Level 101
 //============================================================
-6@tower,45,89,2	script	Life Spring#1	844,{
-	set .@pc_hp,MaxHp-Hp;
-	set .@pc_sp,MaxSp-Sp;
+6@tower,45,89,2	script	Life Spring#1	CLEAR_NPC,{
 	mes "^0066ffYou took a sip of the spring's clear water, and you feel invigorated.^000000";
-	percentheal .@pc_hp,.@pc_sp;
+	heal (MaxHp-Hp),(MaxSp-Sp);
 	close;
 
 OnInstanceInit:
-	donpcevent instance_npcname("Life Spring#2", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("Life Spring#2")+"::OnEnable";
 	end;
-
 }
 
-6@tower,45,89,2	script	Life Spring#2	844,{
+6@tower,45,89,2	script	Life Spring#2	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -4589,11 +1954,11 @@ OnEnable:
 
 OnTimer2000:
 	stopnpctimer;
-	donpcevent instance_npcname("Life Spring#3", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("Life Spring#3")+"::OnEnable";
 	end;
 }
 
-6@tower,45,89,2	script	Life Spring#3	844,{
+6@tower,45,89,2	script	Life Spring#3	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -4603,29 +1968,29 @@ OnEnable:
 
 OnTimer2000:
 	stopnpctimer;
-	donpcevent instance_npcname("Life Spring#2", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("Life Spring#2")+"::OnEnable";
 	end;
 }
 
 6@tower,32,100,0	warp	102FGate102tower	2,2,6@tower,155,64
 
-6@tower,156,151,2	script	Tyrant's Throne#	844,{
+6@tower,156,151,2	script	Tyrant's Throne#	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	areamonster "6@tower",154,73,156,75,"Watcher's Son",1627,10,instance_npcname("Tyrant's Throne#", instance_id())+"::OnMyMobDead";
+	areamonster instance_mapname("6@tower"),154,73,156,75,"Watcher's Son",1627,10,instance_npcname("Tyrant's Throne#")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("6@tower",instance_npcname("Tyrant's Throne#", instance_id())+"::OnMyMobDead");
+	set .@mob_dead_num,mobcount(instance_mapname("6@tower"),instance_npcname("Tyrant's Throne#")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
-		donpcevent instance_npcname("#1st Beeper", instance_id())+"::OnEnable";
-		disablenpc instance_npcname("Tyrant's Throne#", instance_id());
+		donpcevent instance_npcname("#1st Beeper")+"::OnEnable";
+		disablenpc instance_npcname("Tyrant's Throne#");
 	}
 	end;
 }
 
-6@tower,156,151,2	script	#1st Beeper	844,{
+6@tower,156,151,2	script	#1st Beeper	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -4633,40 +1998,42 @@ OnEnable:
 	end;
 
 OnTimer500:
-	instance_announce -1,"Guests, huh? I hope you've come here knowing that you'll be buried in this place. If you didn't know, well... it's too late!",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"Guests, huh? I hope you've come here knowing that you'll be buried in this place. If you didn't know, well... it's too late!",bc_map,"0x00ffcc";
 	end;
 
 OnTimer5500:
-	instance_announce -1,"This is why you adventurers always end up dead.",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"This is why you adventurers always end up dead.",bc_map,"0x00ffcc";
 	end;
 
 OnTimer10500:
-	instance_announce -1,"I may applaud you for your courage... Of course, I intend to play with you a little bit first.",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"I may applaud you for your courage... Of course, I intend to play with you a little bit first.",bc_map,"0x00ffcc";
 	end;
 
 OnTimer15500:
-	instance_announce -1,"You know, I like watching humans running around in fear.",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"You know, I like watching humans running around in fear.",bc_map,"0x00ffcc";
 	end;
 
 OnTimer20500:
-	instance_announce -1,"Let's see who runs fastest. Are you ready?",bc_map,"0x00ffcc";
+	set .@map$, instance_mapname("6@tower");
+	mapannounce .@map$,"Let's see who runs fastest. Are you ready?",bc_map,"0x00ffcc";
 	stopnpctimer;
-	areamonster "6@tower",151,66,153,106,"Bone Guardian",1152,50,instance_npcname("#1st Beeper", instance_id())+"::OnMyMobDead";
-	areamonster "6@tower",158,66,160,106,"Bone Guardian",1152,50,instance_npcname("#1st Beeper", instance_id())+"::OnMyMobDead";
+	areamonster .@map$,151,66,153,106,"Bone Guardian",1152,50,instance_npcname("#1st Beeper")+"::OnMyMobDead";
+	areamonster .@map$,158,66,160,106,"Bone Guardian",1152,50,instance_npcname("#1st Beeper")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("6@tower",instance_npcname("#1st Beeper", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("6@tower");
+	set .@mob_dead_num,mobcount(.@map$,instance_npcname("#1st Beeper")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
-		donpcevent instance_npcname("#2nd Beeper", instance_id())+"::OnEnable";
+		donpcevent instance_npcname("#2nd Beeper")+"::OnEnable";
 		//SetItemPartyInMap in_102floor 101
 	}
 	else
-		instance_announce -1,"Remaining Targets " + .@mob_dead_num + "ea",bc_map,"0x00ff99";
+		mapannounce .@map$,"Remaining Targets " + .@mob_dead_num + "ea",bc_map,"0x00ff99";
 	end;
 }
 
-6@tower,156,151,2	script	#2nd Beeper	844,{
+6@tower,156,151,2	script	#2nd Beeper	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -4674,32 +2041,34 @@ OnEnable:
 	end;
 
 OnTimer500:
-	instance_announce -1,"Well, I guess they aren't too challenging for you.",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"Well, I guess they aren't too challenging for you.",bc_map,"0x00ffcc";
 	end;
 
 OnTimer5500:
-	instance_announce -1,"Let's speed up a little bit, shall we?",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"Let's speed up a little bit, shall we?",bc_map,"0x00ffcc";
 	end;
 
 OnTimer10500:
-	instance_announce -1,"I demand an encore!",bc_map,"0x00ffcc";
+	set .@map$, instance_mapname("6@tower");
+	mapannounce .@map$,"I demand an encore!",bc_map,"0x00ffcc";
 	stopnpctimer;
-	areamonster "6@tower",151,66,153,106,"Wind Guardian",1263,30,instance_npcname("#2nd Beeper", instance_id())+"::OnMyMobDead";
-	areamonster "6@tower",158,66,160,106,"Wind Guardian",1263,30,instance_npcname("#2nd Beeper", instance_id())+"::OnMyMobDead";
+	areamonster .@map$,151,66,153,106,"Wind Guardian",1263,30,instance_npcname("#2nd Beeper")+"::OnMyMobDead";
+	areamonster .@map$,158,66,160,106,"Wind Guardian",1263,30,instance_npcname("#2nd Beeper")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("6@tower",instance_npcname("#2nd Beeper", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("6@tower");
+	set .@mob_dead_num,mobcount(.@map$,instance_npcname("#2nd Beeper")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
-		donpcevent instance_npcname("#3rd Beeper", instance_id())+"::OnEnable";
+		donpcevent instance_npcname("#3rd Beeper")+"::OnEnable";
 		//SetItemPartyInMap in_102floor 102
 	}
 	else
-		instance_announce -1,"Remaining Targets " + .@mob_dead_num + "ea",bc_map,"0x00ff99";
+		mapannounce .@map$,"Remaining Targets " + .@mob_dead_num + "ea",bc_map,"0x00ff99";
 	end;
 }
 
-6@tower,156,151,2	script	#3rd Beeper	844,{
+6@tower,156,151,2	script	#3rd Beeper	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -4707,32 +2076,34 @@ OnEnable:
 	end;
 
 OnTimer500:
-	instance_announce -1,"Yes, this is getting exciting!",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"Yes, this is getting exciting!",bc_map,"0x00ffcc";
 	end;
 
 OnTimer5500:
-	instance_announce -1,"I'll remember you as one of a few that have managed to entertain me.",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"I'll remember you as one of a few that have managed to entertain me.",bc_map,"0x00ffcc";
 	end;
 
 OnTimer10500:
-	instance_announce -1,"How would you like to play one more round?",bc_map,"0x00ffcc";
+	set .@map$, instance_mapname("6@tower");
+	mapannounce .@map$,"How would you like to play one more round?",bc_map,"0x00ffcc";
 	stopnpctimer;
-	areamonster "6@tower",151,66,153,106,"Sword Edge Guardian",1132,20,instance_npcname("#3rd Beeper", instance_id())+"::OnMyMobDead";
-	areamonster "6@tower",158,66,160,106,"Sword Edge Guardian",1132,20,instance_npcname("#3rd Beeper", instance_id())+"::OnMyMobDead";
+	areamonster .@map$,151,66,153,106,"Sword Edge Guardian",1132,20,instance_npcname("#3rd Beeper")+"::OnMyMobDead";
+	areamonster .@map$,158,66,160,106,"Sword Edge Guardian",1132,20,instance_npcname("#3rd Beeper")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("6@tower",instance_npcname("#3rd Beeper", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("6@tower");
+	set .@mob_dead_num,mobcount(.@map$,instance_npcname("#3rd Beeper")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
-		donpcevent instance_npcname("#4th Beeper", instance_id())+"::OnEnable";
+		donpcevent instance_npcname("#4th Beeper")+"::OnEnable";
 		//SetItemPartyInMap in_102floor 103
 	}
 	else
-		instance_announce -1,"Remaining Targets " + .@mob_dead_num + "ea",bc_map,"0x00ff99";
+		mapannounce .@map$,"Remaining Targets " + .@mob_dead_num + "ea",bc_map,"0x00ff99";
 	end;
 }
 
-6@tower,156,151,2	script	#4th Beeper	844,{
+6@tower,156,151,2	script	#4th Beeper	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -4740,25 +2111,26 @@ OnEnable:
 	end;
 
 OnTimer500:
-	instance_announce -1,"Okay, the time has come to make my appearance!",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"Okay, the time has come to make my appearance!",bc_map,"0x00ffcc";
 	end;
 
 OnTimer5500:
-	instance_announce -1,"Do you want to know who I am?",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"Do you want to know who I am?",bc_map,"0x00ffcc";
 	end;
 
 OnTimer10500:
-	instance_announce -1,"You'll soon know. Mine is the face of death!",bc_map,"0x00ffcc";
+	set .@map$, instance_mapname("6@tower");
+	mapannounce .@map$,"You'll soon know. Mine is the face of death!",bc_map,"0x00ffcc";
 	stopnpctimer;
-	monster "6@tower",156,147,"Nacht Sieger",1956,1,instance_npcname("#4th Beeper", instance_id())+"::OnMyMobDead";
+	monster .@map$,156,147,"Nacht Sieger",1956,1,instance_npcname("#4th Beeper")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	donpcevent instance_npcname("Lost Soul#102", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("Lost Soul#102")+"::OnEnable";
 	end;
 }
 
-6@tower,169,127,2	script	Lost Soul#102	796,{
+6@tower,169,127,2	script	Lost Soul#102	4_M_NFDEADSWDMAN,{
 	if (checkweight(1201,1) == 0) {
 		mes "You're carrying too much stuff. Why don't you put some of it away, and then come back?";
 		close;
@@ -4814,35 +2186,35 @@ OnMyMobDead:
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("Lost Soul#102", instance_id());
+	disablenpc instance_npcname("Lost Soul#102");
 	end;
 
 OnEnable:
 	initnpctimer;
-	enablenpc instance_npcname("Lost Soul#102", instance_id());
-	donpcevent instance_npcname("#Effect30", instance_id())+"::OnEnable";
+	enablenpc instance_npcname("Lost Soul#102");
+	donpcevent instance_npcname("#Effect30")+"::OnEnable";
 	//SetItemPartyInMap in_102floor 104
 	end;
 
 OnTimer500:
-	instance_announce -1,"This... This can't be happening! I can't be defeated!",bc_map,"0xffff00";
+	mapannounce instance_mapname("6@tower"),"This... This can't be happening! I can't be defeated!",bc_map,"0xffff00";
 	end;
 
 OnTimer5500:
-	instance_announce -1,"Nooo! My soul... My shell...! Nooo~!",bc_map,"0xffff00";
+	mapannounce instance_mapname("6@tower"),"Nooo! My soul... My shell...! Nooo~!",bc_map,"0xffff00";
 	end;
 
 OnTimer10500:
-	instance_announce -1,"Nacht Sieger's body has turned into dark ashes that scattered in the wind.",bc_map,"0x00ffcc";
+	mapannounce instance_mapname("6@tower"),"Nacht Sieger's body has turned into dark ashes that scattered in the wind.",bc_map,"0x00ffcc";
 	stopnpctimer;
 	end;
 }
 
-6@tower,169,127,2	script	#Effect30	844,{
+6@tower,169,127,2	script	#Effect30	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#Effect30", instance_id());
+	disablenpc instance_npcname("#Effect30");
 	end;
 
 OnEnable:
@@ -4852,15 +2224,15 @@ OnEnable:
 
 OnTimer1000:
 	stopnpctimer;
-	donpcevent instance_npcname("#Effect31", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("#Effect31")+"::OnEnable";
 	end;
 }
 
-6@tower,169,127,2	script	#Effect31	844,{
+6@tower,169,127,2	script	#Effect31	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#Effect31", instance_id());
+	disablenpc instance_npcname("#Effect31");
 	end;
 
 OnEnable:
@@ -4870,6 +2242,6 @@ OnEnable:
 
 OnTimer1000:
 	stopnpctimer;
-	donpcevent instance_npcname("#Effect30", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("#Effect30")+"::OnEnable";
 	end;
 }
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index f2fe3fc68..9ccdade10 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf, various sources
 //===== Current Version: =====================================
-//= 1.4
+//= 1.6
 //===== Description: =========================================
 //= [Official Conversion]
 //= Nidhoggr's Nest Instance
@@ -12,11 +12,16 @@
 //= 1.1 Minor dialog updates.
 //= 1.2 No longer glitches when anyone but party leader talks to the first NPC.
 //= 1.3 Added 'instance_check_party' command to the script for proper checking if
-//=		the invoking party meets the requirements to join the Memorial Dungeon.
+//=     the invoking party meets the requirements to join the Memorial Dungeon.
 //= 1.4 Cleaning. [Euphy]
+//= 1.5 Instance system rewrite. [Euphy]
+//= 1.6 Added GM management NPCs. [Euphy]
 //============================================================
 
-nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	111,8,8,{
+1@nyd	mapflag	src4instance
+2@nyd	mapflag	src4instance
+//============================================================
+nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 	if (ins_nyd == 0) {
 		mes "A great stone gate stands before you. The sculpture of a terrible dragon spreads its powerful looking wings.";
 		next;
@@ -24,47 +29,25 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	111,8,8,{
 		next;
 		switch(select("Move closer to look more carefully.:Step back.")) {
 		case 1:
-			if (ep13_1_edq == 14) {
-				specialeffect2 EF_HOLYHIT;
-				pushpc 3,3;
+			specialeffect2 EF_HOLYHIT;
+			pushpc 3,3;
+			if (ep13_1_edq == 14)
 				set ep13_1_edq,15;
-				mes "A mysterious power prevents you from getting too close. It looks like there is something strong beyond the door...";
-				next;
-				mes "Perhaps there's a great hidden secret beyond the gate, beyond expectation.";
-				next;
-				mes "It would be better to go back to camp and inform the others and ask for help.";
-				set ins_nyd,1;
-				close;
-			}
-			else if (ep13_1_edq == 15) {
-				specialeffect2 EF_HOLYHIT;
-				pushpc 3,3;
-				mes "A mysterious power prevents you from getting too close. It looks like there is something strong beyond the door...";
-				next;
-				mes "Perhaps there's a great hidden secret beyond the gate, beyond expectation.";
-				next;
-				mes "It would be better to go back to camp and inform the others and ask for help.";
-				set ins_nyd,1;
-				close;
-			}
-			else {
-				specialeffect2 EF_HOLYHIT;
-				pushpc 3,3;
-				mes "A mysterious power prevents you from getting too close. It looks like there is something strong beyond the door...";
-				next;
-				mes "Perhaps there's a great hidden secret beyond the gate, beyond expectation.";
-				next;
-				mes "It would be better to go back to camp and inform the others and ask for help.";
+			mes "A mysterious power prevents you from getting too close. It looks like there is something strong beyond the door...";
+			next;
+			mes "Perhaps there's a great hidden secret beyond the gate, beyond expectation.";
+			next;
+			mes "It would be better to go back to camp and inform the others and ask for help.";
+			if (ep13_1_edq != 15) {
 				next;
 				mes "You'll have to obtain the others trust in the expendition camp by working hard.";
-				set ins_nyd,1;
-				close;
 			}
+			set ins_nyd,1;
+			close;
 		case 2:
 			close;
 		}
-	}
-	else if (ins_nyd == 1) {
+	} else if (ins_nyd == 1) {
 		mes "A mysterious power prevents you from getting too close. It looks like there is something strong beyond the door...";
 		next;
 		mes "Perhaps there's a great hidden secret beyond the gate, beyond expectation.";
@@ -74,13 +57,10 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	111,8,8,{
 			set ep13_1_edq,15;
 			close;
 		}
-		else {
-			next;
-			mes "You'll have to obtain the others trust in the expendition camp by working hard.";
-			close;
-		}
-	}
-	else if (ins_nyd == 111 || ins_nyd == 112) {
+		next;
+		mes "You'll have to obtain the others trust in the expendition camp by working hard.";
+		close;
+	} else if (ins_nyd == 111 || ins_nyd == 112) {
 		specialeffect2 EF_CHANGECOLD;
 		mes "The strange sensation surrounding your body has disappeared";
 		next;
@@ -107,177 +87,104 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	111,8,8,{
 		case 2:
 			close;
 		}
-	}
-	else if (ins_nyd == 131 || ins_nyd == 132 || ins_nyd > 199) {
+	} else if (ins_nyd == 131 || ins_nyd == 132 || ins_nyd > 199) {
+
+		set .@party_id,getcharid(1);
+		set .@md_name$,"Nidhoggur's Nest";
+
 		set .@ins_nyd_check,checkquest(3135,PLAYTIME); // 3 Day cooldown
 		set .@ins_nyd_check2,checkquest(3136,PLAYTIME); // 4 Hour play limit
-		if (.@ins_nyd_check == -1) {
-			mes "As I put my hands on the stone gate, a voice sounded from the depth of my heart.";
-			next;
-			mes "[Yggdrasil Gatekeeper]";
-			mes "The loyal servants of the Guardian... what can I do for you?";
-			next;
-			switch(select("Please allow me to enter.:I want to go in.:I want to leave.")) {
-			case 1:
-				set .@party,getcharid(1);
-				set .@leader,getpartyleader(.@party,2);
-				set .@md_name$,"Nidhoggur's Nest";
-
-				if(!instance_check_party(.@party,2,70)){
-					mes "I'm sorry but your Party does not meet the requirements to join the Memorial Dungeon.";
-					close;
-				}
 
-				if (.@leader == getcharid(0)) {
-					set .@instance, instance_create(.@md_name$, .@party);
+		mes "As I put my hands on the stone gate, a voice sounded from the depth of my heart.";
+		next;
+		if (.@ins_nyd_check == -1 && .@ins_nyd_check2 == -1) {
+			if (!instance_check_party(.@party_id,2,70)) {
+				mes "[Yggdrasil Gatekeeper]";
+				mes "Where are the other servants, so you can work together? Each servant cannot be admitted here individually...";
+				next;
+				mes "[Yggdrasil Gatekeeper]";
+				mes "Come with at least 1 more servant... Only party leaders can accept admission to Nidhoggur's Nest.";
+				next;
+				mes "[Yggdrasil Gatekeeper]";
+				mes "And only 1 representative of you needs to talk to me, so don't annoy me...";
+				close;
+			}
+			if (getcharid(0) == getpartyleader(.@party_id,2)) {
+				mes "[Yggdrasil Gatekeeper]";
+				mes "The loyal servants of the Guardian... what can I do for you?";
+				next;
+				switch(select("Please allow me to enter.:I want to go in.:I want to leave.")) {
+				case 1:
+					set .@instance, instance_create(.@md_name$, .@party_id);
 					if (.@instance < 0) {
 						mes "[Yggdrasil Gatekeeper]";
 						mes "The Guardian seems to wish to be alone. I will go in and check, please wait out here.";
 						close;
 					}
-					else {
-						for( set .@i, 1; .@i <= 2; set .@i, .@i + 1 ) {
-							if( instance_attachmap(.@i + "@nyd", .@instance) == "" )
-								break;
-						}
-						if( .@i < 2 ) {
-							instance_destroy(.@instance);
-							close;
-						}
-						instance_attach(.@instance);
-						instance_set_timeout 144000,300,.@instance;
-						instance_init(.@instance);
-
-						// Spawn standard mobs
-						donpcevent instance_npcname("ins_nyd1_spawn_mobs", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("ins_nyd2_spawn_mobs", instance_id())+"::OnInstanceInit";
-						// Activate Floor 1
-						donpcevent instance_npcname("nyd_call_mon_1", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("ins_nyd_1f_timer", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_to2f_warp", instance_id())+"::OnInstanceInit";
-						// Active Floor 2
-						donpcevent instance_npcname("nyd_2f_enter_broad", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_boss_enter", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_boss_enter_call", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_boss_enter_logic", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("World Tree Yggdrasil#2F", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_red_c", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_red_warp1", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_red_warp2", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_red_warp3", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_white_c", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_white_warp1", instance_id())+"::OnInstanceInit";;
-						donpcevent instance_npcname("nyd_2f_white_warp2", instance_id())+"::OnInstanceInit";;
-						donpcevent instance_npcname("nyd_2f_white_warp3", instance_id())+"::OnInstanceInit";;
-						donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_yellow_warp1", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_yellow_warp2", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_yellow_warp3", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_green_c", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_green_warp1", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_green_warp2", instance_id())+"::OnInstanceInit";
-						donpcevent instance_npcname("nyd_2f_green_warp3", instance_id())+"::OnInstanceInit";
-
-						mes "[Yggdrasil Gatekeeper]";
-						mes "I've recorded your request, are you ready to go inside?";
-						next;
-						mes "[Yggdrasil Gatekeeper]";
-						mes "If you are ready, I will allow you to enter.";
+					for( set .@i, 1; .@i <= 2; set .@i, .@i + 1 ) {
+						if( instance_attachmap(.@i + "@nyd", .@instance) == "" )
+							break;
+					}
+					if( .@i < 2 ) {
+						instance_destroy(.@instance);
 						close;
 					}
-				}
-				else {
+					instance_set_timeout 144000,300,.@instance;
+					instance_init(.@instance);
 					mes "[Yggdrasil Gatekeeper]";
-					mes "When you touch the stone gate, you can hear the voice in your heart.";
+					mes "I've recorded your request, are you ready to go inside?";
 					next;
 					mes "[Yggdrasil Gatekeeper]";
-					mes "Where are the other servants, so you can work together? Each servant cannot be admitted here individually...";
-					next;
+					mes "If you are ready, I will allow you to enter.";
+					close;
+				case 2:
+					goto L_Enter;
+				case 3:
+					close;
+				}
+			}
+			mes "[Yggdrasil Gatekeeper]";
+			mes "If you have the dungeon generated already, you can enter it.";
+			next;
+			if(select("I want to go in.:I want to leave.") == 2)
+				close;
+			goto L_Enter;
+		} else {
+			if (.@ins_nyd_check == 0 || .@ins_nyd_check == 1) {
+				if ('ins_nyd2 == 3 || 'ins_nyd2 == 4) {
 					mes "[Yggdrasil Gatekeeper]";
-					mes "Come with at least 1 more servant... Only party leaders can accept admission to Nidhoggur's Nest.";
+					mes "With the defeat of Nidhoggur's Shadow, the roots of the World Tree Yggdrasil are also affected.";
 					next;
 					mes "[Yggdrasil Gatekeeper]";
-					mes "And only 1 representative of you needs to talk to me, so don't annoy me...";
+					mes "After Nidhoggur's Shadow disappears, at least 3 days is needed for stabilizing.";
 					close;
 				}
-			case 2:
-				if (.@ins_nyd_check2 < 2) { // Added check to avoid people from re-partting up.
-					set .@party,getcharid(1);
-					set .@leader,getpartyleader(.@party,2);
-					set .@p_name$,getpartyname(.@party);
-					set .@p_name2$,strcharinfo(0);
-					set .@md_name$,"Nidhoggur's Nest";
-
-					if(!instance_check_party(.@party,2,70)){
-						mes "I'm sorry but your Party does not meet the requirements to join the Memorial Dungeon.";
-						close;
-					}
-
-					if (has_instance("1@nyd") == "") {
-						mes "[Yggdrasil Gatekeeper]";
-						mes "You did not request for entrance. Please let your leader request entrance.";
-						close;
-					}
-					if((party_instance_id2 != 0) && (party_instance_id2 != getcharid(1))) {
-						//Custom
-						mes "[Yggdrasil Gatekeeper]";
-						mes "You are no longer able to enter Nidhogger's Nest, as your instance has expired.";
-						next;
-						mes "[Yggdrasil Gatekeeper]";
-						mes "After Nidhoggur's Shadow disappears, at least 3 days is needed for stabilizing.";
-						close;
-					}
-					else {
-						mapannounce "nyd_dun02", .@p_name$ + "'s Party member " + .@p_name2$ + " has entered " + .@md_name$,bc_map,"0x00ff99";
-						set party_instance_id2,getcharid(1);
-						if (checkquest(3135) == -1) setquest 3135;
-						if (checkquest(3136) == -1) setquest 3136;
-						warp "1@nyd",32,37;
-						close;
-					}
-				}
-				else {
-					//Custom
+				mes "[Yggdrasil Gatekeeper]";
+				mes "If you have the dungeon generated already, you can enter it.";
+				next;
+				if(select("I want to go in.:I want to leave.") == 2)
+					close;
+				goto L_Enter;
+			} else if (.@ins_nyd_check == 2) {
+				if (.@ins_nyd_check2 == 0 || .@ins_nyd_check2 == 1) {
+					mes "[Yggdrasil Gatekeeper]";
+					mes "The time limit to enter the dungeon has expired. You must wait for the World Tree to stabilize its power before trying to re-enter.";
+					close;
+				} else if (.@ins_nyd_check2 == 2) {
 					mes "[Yggdrasil Gatekeeper]";
-					mes "You are no longer able to enter Nidhogger's Nest, as your instance has expired.";
+					mes "The World Tree Yggdrasil has stabilized. Would you like to enter Nidhoggur's Nest again?";
 					next;
 					mes "[Yggdrasil Gatekeeper]";
-					mes "After Nidhoggur's Shadow disappears, at least 3 days is needed for stabilizing.";
+					mes "If you would like to enter again, please register with me.";
+					erasequest 3135;
+					erasequest 3136;
+					set 'ins_nyd2,0;
 					close;
 				}
-			case 3:
-				close;
 			}
 		}
-		else if (.@ins_nyd_check == 0 || .@ins_nyd_check == 1) {
-			mes "[Yggdrasil Gatekeeper]";
-			mes "With the defeat of Nidhoggur's Shadow, the roots of the World Tree Yggdrasil are also affected.";
-			next;
-			mes "[Yggdrasil Gatekeeper]";
-			mes "After Nidhoggur's Shadow disappears, at least 3 days is needed for stabilizing.";
-			close;
-		}
-		else if (.@ins_nyd_check == 2) {
-			mes "[Yggdrasil Gatekeeper]";
-			mes "The World Tree Yggdrasil has stabilized. Would you like to enter Nidhoggur's Nest again?";
-			next;
-			mes "[Yggdrasil Gatekeeper]";
-			mes "If you would like to enter again, please register with me.";
-			set party_instance_id2,0;
-			erasequest 3135;
-			erasequest 3136;
-			set 'ins_nyd2,0;
-			close;
-		}
-		else {
-			close;
-		}
-	}
-	else {
+		close;
+	} else {
 		mes "A great stone gate stands before you. The sculpture of a terrible dragon spreads its powerful looking wings.";
 		next;
 		mes "Near the bottom of the gate, Laphine tribeswomen have been turned to stone and now look like they are part of the great door.";
@@ -296,15 +203,28 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	111,8,8,{
 	}
 	close;
 
+L_Enter:
+	if (has_instance("1@nyd") == "") {
+		mes "[Yggdrasil Gatekeeper]";
+		mes "You did not request for entrance. Please let your leader request entrance.";
+		close;
+	} else {
+		mapannounce "nyd_dun02", getpartyname(getcharid(1))+"'s party member "+strcharinfo(0)+" has entered Nidhoggur's Nest.",bc_map,"0x00ff99";
+		if (checkquest(3135) == -1) setquest 3135;
+		if (checkquest(3136) == -1) setquest 3136;
+		warp "1@nyd",32,37;
+		close;
+	}
+
 OnTouch_:
 	if (ins_nyd == 0) {
 		specialeffect2 EF_CHANGECOLD;
-		specialeffect EF_CHANGECOLD,"Yggdrasil Gatekeeper";
+		specialeffect EF_CHANGECOLD;
 	}
 	end;
 }
 
-mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
+mid_camp,271,299,3	script	Historian Magnifier#edq	4_M_SAGE_C,3,3,{
 	mes "[Historian Magniffer]";
 	if (ins_nyd == 1) {
 		mes "Sure, the mainland also has lots of interesting adventures... Hello, I am Magnifier, a historian dispatched from the Prontera royal court.";
@@ -318,8 +238,7 @@ mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
 		mes "[Historian Magniffer]";
 		mes "We are expecting a lot from you, expert adventurer. So, if you find anything... just tell me.";
 		close;
-	}
-	else if (ins_nyd == 2) {
+	} else if (ins_nyd == 2) {
 		mes "Does Commander Agip want to talk to me? Let's listen to his story.";
 		next;
 		mes "[Historian Magniffer]";
@@ -361,12 +280,10 @@ mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
 		mes "I will definitely help you find a way to enter the World Tree directly so, just believe in me! Okay~!!";
 		set ins_nyd,3;
 		close;
-	}
-	else if (ins_nyd == 3) {
+	} else if (ins_nyd == 3) {
 		mes "Why are you standing there? Go to my assistant in the Prontera Library!";
 		close;
-	}
-	else if (ins_nyd == 4) {
+	} else if (ins_nyd == 4) {
 		mes "You've come back... Good, how's Naomi? Actually, I don't need to worry about her. She is always cheerful. Haha.";
 		next;
 		mes "[Historian Magnifier]";
@@ -422,8 +339,7 @@ mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
 			set ins_nyd,5;
 			close;
 		}
-	}
-	else if ((ins_nyd == 5) || (ins_nyd == 51) || (ins_nyd == 52)) {
+	} else if ((ins_nyd == 5) || (ins_nyd == 51) || (ins_nyd == 52)) {
 		mes "Okay, let's try to contact them first, to be clear about any caves or treasures.";
 		next;
 		mes "[Historian Magnifier]";
@@ -432,8 +348,7 @@ mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
 		mes "[Historian Magnifier]";
 		mes "I'll also keep searching here. If you find anything, come back and let me know.";
 		close;
-	}
-	else if ((ins_nyd == 61) || (ins_nyd == 62)) {
+	} else if ((ins_nyd == 61) || (ins_nyd == 62)) {
 		mes "Ah, you've come at a proper time. I found a curious thing while looking for reports from Arunafeltz.";
 		next;
 		mes "[Historian Magnifier]";
@@ -462,12 +377,10 @@ mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
 		mes "Let's report to Commander Agip about the situation so far. Then, we wait on his decision.";
 		set ins_nyd,7;
 		close;
-	}
-	else if ((ins_nyd == 7) || (ins_nyd == 8)) {
+	} else if ((ins_nyd == 7) || (ins_nyd == 8)) {
 		mes "Report to Commander Hibba Agip about what we have discovered, since time is dependent on his decision.";
 		close;
-	}
-	else if ((ins_nyd == 121) || (ins_nyd == 122) || (ins_nyd == 131) || (ins_nyd == 132) || (ins_nyd ==14)) {
+	} else if ((ins_nyd == 121) || (ins_nyd == 122) || (ins_nyd == 131) || (ins_nyd == 132) || (ins_nyd ==14)) {
 		mes "So that's how it is... we were right about some parts of it... it's called the Guardian's Nest.";
 		next;
 		mes "[Historian Magnifier]";
@@ -482,8 +395,7 @@ mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
 		mes "[Historian Magnifier]";
 		mes "First, report to Commander Agip, then act according to the situation. Let me organize my research findings...";
 		close;
-	}
-	else {
+	} else {
 		mes "Sure, the mainland also has lots of interesting adventures... Hello, I am Magnifier, a historian dispatched from the Prontera royal court.";
 		next;
 		mes "[Historian Magnifier]";
@@ -498,7 +410,7 @@ mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
 	}
 }
 
-prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
+prt_in,171,94,3	script	Assistant Naomi#edq	4_F_HUWOMAN,3,3,{
 	mes "[Assistant Naomi]";
 	set .@name$,strcharinfo(0);
 	if (ins_nyd == 3) {
@@ -610,8 +522,7 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 			set ins_nyd,4;
 			close;
 		}
-	}
-	else if (ins_nyd == 4) {
+	} else if (ins_nyd == 4) {
 		mes "Browse around, to take a look at the books.";
 		next;
 		switch(select("Discovery of Heterogeneity:Report of Indigenous Tribes")) {
@@ -676,8 +587,7 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 			mes "They have declared they will attend to the high courts for the first time in 1000 human years, since the end of the battles of Gods vs. Magicians.";
 			close;
 		}
-	}
-	else {
+	} else {
 		mes "The doctor never ever tries to come back, and there're too many things to do... How can I do it all...";
 		next;
 		mes "[Assistant Naomi]";
@@ -686,7 +596,7 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 	}
 }
 
-splendide,198,178,3	script	Grumbling Soldier#edq	447,3,3,{
+splendide,198,178,3	script	Grumbling Soldier#edq	4_M_FAIRYSOLDIER,3,3,{
 	mes "[Grumbling Soldier]";
 	if (isequipped(2782) == 1) {
 		mes "Nowadays, the world has turned unstable. I can't even fly comfortably anymore.";
@@ -723,8 +633,7 @@ splendide,198,178,3	script	Grumbling Soldier#edq	447,3,3,{
 			case 3:
 				close;
 			}
-		}
-		else {
+		} else {
 			mes "[Grumbling Soldier]";
 			mes "Nowadays, the world has turned unstable. I can't even fly comfortably anymore.";
 			next;
@@ -741,14 +650,13 @@ splendide,198,178,3	script	Grumbling Soldier#edq	447,3,3,{
 			mes "Although they ignore your track record, still, one should be careful...";
 			close;
 		}
-	}
-	else {
+	} else {
 		mes "SeLarsmar Di marThusVil U SeMushVohl";
 		close;
 	}
 }
 
-splendide,240,164,3	script	Sighing Soldier#edq	461,3,3,{
+splendide,240,164,3	script	Sighing Soldier#edq	4_M_FAIRYSOLDIER2,3,3,{
 	mes "[Sighing Soldier]";
 	if (isequipped(2782) == 1) {
 		mes "When will we be finished with this combat with the Sapha? Ugghhhh...";
@@ -788,8 +696,7 @@ splendide,240,164,3	script	Sighing Soldier#edq	461,3,3,{
 			case 3:
 				close;
 			}
-		}
-		else {
+		} else {
 			mes "[Sighing Soldier]";
 			mes "When will we be finished with this combat with the Sapha? Ugghhhh...";
 			next;
@@ -800,14 +707,13 @@ splendide,240,164,3	script	Sighing Soldier#edq	461,3,3,{
 			mes "Is there no way to resolve this by communicating? There's no meaning in useless combat! Geez.";
 			close;
 		}
-	}
-	else {
+	} else {
 		mes "VohlLarsmar Ha DielCyatas";
 		close;
 	}
 }
 
-spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
+spl_in01,109,60,3	script	Commander Lebiordirr#edq	4_F_FAIRY,3,3,{
 	mes "[Commander Lebiordirr]";
 	if (isequipped(2782) == 1) {
 		if (ins_nyd == 51) {
@@ -857,8 +763,7 @@ spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
 			mes "Now, if you understand this, inform your friends.";
 			set ins_nyd,61;
 			close;
-		}
-		else if (ins_nyd == 61) {
+		} else if (ins_nyd == 61) {
 			mes "If you can't follow this rule, I will stop associating with you and ban all of your people from here.";
 			next;
 			mes "[Commander Lebiordirr]";
@@ -867,8 +772,7 @@ spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
 			mes "[Commander Lebiordirr]";
 			mes "Now, if you understand this, inform your friends.";
 			close;
-		}
-		else if (ins_nyd == 81) {
+		} else if (ins_nyd == 81) {
 			mes "Why have you come back, outsider?";
 			next;
 			select("To ask the Laphines about exploring...");
@@ -941,12 +845,10 @@ spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
 			mes "Here, outsider. Arioss will explain the situation with the giants. Talk with him...";
 			set ins_nyd,91;
 			close;
-		}
-		else if ((ins_nyd == 91) || (ins_nyd == 101) || (ins_nyd == 111) || (ins_nyd == 200) || (ins_nyd == 201) || (ins_nyd == 202)) {
+		} else if ((ins_nyd == 91) || (ins_nyd == 101) || (ins_nyd == 111) || (ins_nyd == 200) || (ins_nyd == 201) || (ins_nyd == 202)) {
 			mes "Outsider. Arioss here will explain the situation with the giants, talk with him...";
 			close;
-		}
-		else if ((ins_nyd == 72) || (ins_nyd == 82) || (ins_nyd == 92) || (ins_nyd == 102) || (ins_nyd == 112) || (ins_nyd == 122) || (ins_nyd == 132)) {
+		} else if ((ins_nyd == 72) || (ins_nyd == 82) || (ins_nyd == 92) || (ins_nyd == 102) || (ins_nyd == 112) || (ins_nyd == 122) || (ins_nyd == 132)) {
 			mes "Welcome to the Laphine camp in Splendide, outsider... I am Lebiordirr. I am in charge here.";
 			next;
 			mes "[Commander Lebiordirr]";
@@ -955,8 +857,7 @@ spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
 			mes "[Commander Lebiordirr]";
 			mes "If you are cautious with your actions, I won't place any harm on you. Fare well.";
 			close;
-		}
-		else if (ins_nyd == 203) {
+		} else if (ins_nyd == 203) {
 			mes "I was waiting for you. You came back safe, that's good news. Did you find anything?";
 			next;
 			select("Explain about the guardian Nidhoggur's leave.");
@@ -1007,12 +908,10 @@ spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
 			mes "Commander...";
 			set ins_nyd,121;
 			close;
-		}
-		else if ((ins_nyd == 121) || (ins_nyd == 131)) {
+		} else if ((ins_nyd == 121) || (ins_nyd == 131)) {
 			mes "Strange one, thank you for your cooperation in such situations... Please forget what has happened today...";
 			close;
-		}
-		else {
+		} else {
 			mes "Welcome to the Laphine camp in Splendide, outsider... I am Lebiordirr. I am in charge here.";
 			next;
 			mes "[Commander Lebiordirr]";
@@ -1022,14 +921,13 @@ spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
 			mes "If you are cautious with your actions, I won't place any harm on you. Fare well.";
 			close;
 		}
-	}
-	else {
+	} else {
 		mes "ThusDurnah Ra SharVeldIyaz U UorAmanDur Yee neaOsaAdor Yee...";
 		close;
 	}
 }
 
-spl_in01,104,56,3	script	Aide Arioss#edq	437,3,3,{
+spl_in01,104,56,3	script	Aide Arioss#edq	4_F_FAIRYKID2,3,3,{
 	mes "[Aide Arioss]";
 	if (isequipped(2782) == 1) {
 		if (ins_nyd == 91) {
@@ -1082,8 +980,7 @@ spl_in01,104,56,3	script	Aide Arioss#edq	437,3,3,{
 			mes "I have already told you what you wanted to know... If you need anything else, just let me know.";
 			set ins_nyd,101;
 			close;
-		}
-		else if (ins_nyd == 101) {
+		} else if (ins_nyd == 101) {
 			mes "Ah, you said that there is a strange power blocking the entrance to the Guardian's nest, right?";
 			next;
 			mes "[Aide Arioss]";
@@ -1124,18 +1021,15 @@ spl_in01,104,56,3	script	Aide Arioss#edq	437,3,3,{
 			mes "Please meet the Guardian, and come back with an answer to everything. I believe in you.";
 			set ins_nyd,111;
 			close;
-		}
-		else if ((ins_nyd == 101) || (ins_nyd == 111) || (ins_nyd == 200) || (ins_nyd == 201) || (ins_nyd == 202)) {
+		} else if ((ins_nyd == 101) || (ins_nyd == 111) || (ins_nyd == 200) || (ins_nyd == 201) || (ins_nyd == 202)) {
 			mes "Please meet with the Guardian and take a wise answer from him. I will trust you.";
 			close;
-		}
-		else if ((ins_nyd == 72) || (ins_nyd == 82) || (ins_nyd == 92) || (ins_nyd == 102) || (ins_nyd == 112)) {
+		} else if ((ins_nyd == 72) || (ins_nyd == 82) || (ins_nyd == 92) || (ins_nyd == 102) || (ins_nyd == 112)) {
 			mes "... ...";
 			next;
 			mes "Not even caring about this a single bit? What a stupid woman...";
 			close;
-		}
-		else if (ins_nyd == 121) {
+		} else if (ins_nyd == 121) {
 			mes "Things have actually become like this... as priests of the Guardian, it's our responsibility...";
 			next;
 			mes "[Aide Arioss]";
@@ -1149,19 +1043,16 @@ spl_in01,104,56,3	script	Aide Arioss#edq	437,3,3,{
 			mes "[Aide Arioss]";
 			mes "If we can help you with anything in the future, we will do all we can to assist you. Once again, thank you.";
 			close;
-		}
-		else if (ins_nyd == 131) {
+		} else if (ins_nyd == 131) {
 			mes "If we can help you with anything in the future, we will do all we can to assist you. Once again, thank you.";
 			close;
-		}
-		else {
+		} else {
 			mes "... ...";
 			next;
 			mes "Never give attention to... um... a blunt woman...";
 			close;
 		}
-	}
-	else {
+	} else {
 		mes "AmanVilShar Ie DorLuShar Mu Re";
 		close;
 	}
@@ -1181,21 +1072,21 @@ OnTouch_:
 	end;
 }
 
-spl_in01,101,52,5	script	Splendide Guard#1_edq	447,1,1,{
+spl_in01,101,52,5	script	Splendide Guard#1_edq	4_M_FAIRYSOLDIER,1,1,{
 	mes "[Splendide Guard]";
 	if (isequipped(2782) == 1) mes "This is the Splendide office. Don't act impolitely.";
 	else mes "ThusDurnah Ra SharVeldIyaz U UorAmanDur Yee neaOsaAdor Yee ";
 	close;
 }
 
-spl_in01,118,52,3	script	Splendide Guard#2_edq	447,1,1,{
+spl_in01,118,52,3	script	Splendide Guard#2_edq	4_M_FAIRYSOLDIER,1,1,{
 	mes "[Splendide Guard]";
 	if (isequipped(2782) == 1) mes "This is the Splendide office. Don't act impolitely.";
 	else mes "ThusDurnah Ra SharVeldIyaz U UorAmanDur Yee neaOsaAdor Yee ";
 	close;
 }
 
-man_in01,311,57,3	script	Neat Etorr#edq	453,3,3,{
+man_in01,311,57,3	script	Neat Etorr#edq	4_MAN_NITT,3,3,{
 	mes "[Neat Etorr]";
 	if (isequipped(2782) == 1) {
 		if (ins_nyd == 52) {
@@ -1251,8 +1142,7 @@ man_in01,311,57,3	script	Neat Etorr#edq	453,3,3,{
 			mes "You have heard it all, now please report back to your race.";
 			set ins_nyd,62;
 			close;
-		}
-		else if (ins_nyd == 62) {
+		} else if (ins_nyd == 62) {
 			mes "That captive is the only reference for our tribe, so we have taken good care of her. She is related to your current investigation.";
 			next;
 			mes "[Neat Etorr]";
@@ -1261,15 +1151,13 @@ man_in01,311,57,3	script	Neat Etorr#edq	453,3,3,{
 			mes "[Neat Etorr]";
 			mes "If you don't accept our request, then do not expect any cooperations between our races in the future.";
 			close;
-		}
-		else if (ins_nyd == 72) {
+		} else if (ins_nyd == 72) {
 			mes "Recently, because you do not understand the current situations, you have done some things that I, as a leader, can't ignore any longer.";
 			next;
 			mes "[Neat Etorr]";
 			mes "I hope that your people will becareful of your actions on this land, and terminate any unnecessary interventions.";
 			close;
-		}
-		else if (ins_nyd == 82) {
+		} else if (ins_nyd == 82) {
 			mes "Do you need me for something, strange one?";
 			next;
 			select("Received invitation from the Sapha tribe to cooperate and investigate.");
@@ -1339,19 +1227,16 @@ man_in01,311,57,3	script	Neat Etorr#edq	453,3,3,{
 			mes "Strange one, we hope our cooperation will be a good one. Now please go interrogate the Laphine prisoner.";
 			set ins_nyd,92;
 			close;
-		}
-		else if ((ins_nyd == 92) || (ins_nyd == 102) || (ins_nyd == 112) || (ins_nyd == 200) || (ins_nyd == 201) || (ins_nyd == 202)) {
+		} else if ((ins_nyd == 92) || (ins_nyd == 102) || (ins_nyd == 112) || (ins_nyd == 200) || (ins_nyd == 201) || (ins_nyd == 202)) {
 			mes "Strange one, we hope our cooperation will be a good one. Now please go interrogate the Laphine prisoner.";
 			close;
-		}
-		else if ((ins_nyd == 71) || (ins_nyd == 81) || (ins_nyd == 91) || (ins_nyd == 101) || (ins_nyd == 111) || (ins_nyd == 121) || (ins_nyd == 131)) {
+		} else if ((ins_nyd == 71) || (ins_nyd == 81) || (ins_nyd == 91) || (ins_nyd == 101) || (ins_nyd == 111) || (ins_nyd == 121) || (ins_nyd == 131)) {
 			mes "Outsider. Welcome to Manuk, the village of the Sapha. I am its representative, Neat Etorr.";
 			next;
 			mes "[Neat Etorr]";
 			mes "We are just a small village, nothing special... but rest comfortably.";
 			close;
-		}
-		else if (ins_nyd == 203) {
+		} else if (ins_nyd == 203) {
 			mes "I was waiting for you. It's good that you're safe. Did you find anything?";
 			next;
 			select("Explain the sudden leave of the Guardian.");
@@ -1392,40 +1277,37 @@ man_in01,311,57,3	script	Neat Etorr#edq	453,3,3,{
 			getitem 6080,10; //Manuk_Coin
 			set ins_nyd,132;
 			close;
-		}
-		else if (ins_nyd == 132) {
+		} else if (ins_nyd == 132) {
 			mes "Strange one, thank you for helping us in the time of need. I will never forget your kindness.";
 			close;
-		}
-		else {
+		} else {
 			mes "Outsider. Welcome to the Manuk village of Sapha. I am its representative, Neat Etorr.";
 			next;
 			mes "[Neat Etorr]";
 			mes "We are just a small village, nothing special... but rest comfortably.";
 			close;
 		}
-	}
-	else {
+	} else {
 		mes "Tkeh likek Ohek QekhlHkl PkedlioH.";
 		close;
 	}
 }
 
-man_in01,286,61,5	script	Manuk Guard#1_edq	450,1,1,{
+man_in01,286,61,5	script	Manuk Guard#1_edq	4_MAN_GALTUN,1,1,{
 	mes "[Manuk Guard]";
 	if (isequipped(2782) == 1) mes "I'm guarding this Laphine prisoner. Leave me alone.";
 	else mes "Klekod Oi Thekd Pheid Okei.";
 	close;
 }
 
-man_in01,295,61,3	script	Manuk Guard#2_edq	450,1,1,{
+man_in01,295,61,3	script	Manuk Guard#2_edq	4_MAN_GALTUN,1,1,{
 	mes "[Manuk Guard]";
 	if (isequipped(2782) == 1) mes "I'm guarding this Laphine prisoner. Leave me alone.";
 	else mes "Liek QUekdk Ohei Vue.";
 	close;
 }
 
-man_in01,291,62,3	script	Laphine Prisoner#edq	437,3,3,{
+man_in01,291,62,3	script	Laphine Prisoner#edq	4_F_FAIRYKID2,3,3,{
 	mes "[Laphine Prisoner]";
 	if (isequipped(2782) == 1) {
 		if (ins_nyd == 5) {
@@ -1484,8 +1366,7 @@ man_in01,291,62,3	script	Laphine Prisoner#edq	437,3,3,{
 			case 4:
 				close;
 			}
-		}
-		else if (ins_nyd == 92) {
+		} else if (ins_nyd == 92) {
 			mes "The sapha tribe went as far as cooperating with an unknown race?";
 			next;
 			mes "[Laphine Prisoner]";
@@ -1541,8 +1422,7 @@ man_in01,291,62,3	script	Laphine Prisoner#edq	437,3,3,{
 			mes "I have already told you everything you wanted to hear. If you have any other requests, please let me know.";
 			set ins_nyd,102;
 			close;
-		}
-		else if (ins_nyd == 102) {
+		} else if (ins_nyd == 102) {
 			mes "Ah, you said that there is a strange power blocking the entrance to the Guardian's nest, right?";
 			next;
 			mes "[Laphine Prisoner]";
@@ -1583,19 +1463,16 @@ man_in01,291,62,3	script	Laphine Prisoner#edq	437,3,3,{
 			mes "Please meet the Guardian, and come back with an answer to everything. And tell the answer to...";
 			set ins_nyd,112;
 			close;
-		}
-		else if ((ins_nyd == 71) || (ins_nyd == 81) || (ins_nyd == 91) || (ins_nyd == 101) || (ins_nyd == 111) || (ins_nyd == 121) || (ins_nyd == 131)) {
+		} else if ((ins_nyd == 71) || (ins_nyd == 81) || (ins_nyd == 91) || (ins_nyd == 101) || (ins_nyd == 111) || (ins_nyd == 121) || (ins_nyd == 131)) {
 			mes "... ...";
 			next;
 			mes "[Manuk Guard]";
 			mes "Hey, outsider! Step away from the prisoner!";
 			close;
-		}
-		else if (ins_nyd == 112) {
+		} else if (ins_nyd == 112) {
 			mes "Please meet the Guardian, and come back with an answer to everything. And tell the answer to...";
 			close;
-		}
-		else if (ins_nyd == 132) {
+		} else if (ins_nyd == 132) {
 			mes "Yes...I heard your conversation with the Sapha tribe...";
 			next;
 			mes "[Laphine Prisoner]";
@@ -1610,16 +1487,14 @@ man_in01,291,62,3	script	Laphine Prisoner#edq	437,3,3,{
 			mes "[Laphine Prisoner]";
 			mes "It's...it's better if you don't believe the one called Etorr...the minds of the Sapha tribe is unpredictable.";
 			close;
-		}
-		else {
+		} else {
 			mes "... ...";
 			next;
 			mes "[Manuk Guard]";
 			mes "Hey, outsider! Step away from the prisoner!";
 			close;
 		}
-	}
-	else {
+	} else {
 		mes "AmanVilShar Ie DorLuShar Mu Re";
 		close;
 	}
@@ -1641,14 +1516,14 @@ OnTouch_:
 
 // First floor
 //============================================================
-1@nyd,213,277,5	script	Murdered Yggdrasilid#1F	437,5,5,{
+1@nyd,213,277,5	script	Murdered Yggdrasilid#1F	4_F_FAIRYKID2,5,5,{
 	if ('ins_nyd2 == 0) {
 		mes "When a faint light enters your heart, a voice sounds in your head.";
 		next;
 		mes "[World Tree World Tree Yggdrasil]";
 		mes "It's all over... servants of the Guardian... Hurry up and leave this place.";
 		next;
-		while (1) {
+		while(1) {
 			switch(select("Who are you?:What do you mean?")) {
 			case 1:
 				mes "[World Tree World Tree Yggdrasil]";
@@ -1713,12 +1588,13 @@ OnTouch_:
 		mes "[World Tree Yggdrasil]";
 		mes "Are you willing to accept this mission? Even if it means to pay with your life?";
 		next;
-		if(select("Leave it to us.:We can't do it.")==2) close;
+		if(select("Leave it to us.:We can't do it.") == 2)
+			close;
 		mes "[World Tree Yggdrasil]";
 		mes "I thank you deeply for your decision. I will use what is left of my powers to open up the path towards the Guardian's Nest.";
 		next;
 		mes "[World Tree Yggdrasil]";
-		if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+		if (getcharid(0) == getpartyleader(getcharid(1),2)) {
 			mes "The path to the Guardian's Nest is just past the waterfall by the large World Tree Yggdrasil to the North. The defensive mechanisms of the Sanctuary will start immediately.";
 			next;
 			mes "[World Tree Yggdrasil]";
@@ -1733,8 +1609,8 @@ OnTouch_:
 			mes "[World Tree Yggdrasil]";
 			mes "And... Be careful... Be careful of the shadow's power.";
 			set 'ins_nyd2,1;
-			donpcevent instance_npcname("ins_nyd_1f_timer", instance_id())+"::OnEnable";
-			donpcevent instance_npcname("nyd_call_mon_1", instance_id())+"::OnEnable";
+			donpcevent instance_npcname("ins_nyd_1f_timer")+"::OnEnable";
+			donpcevent instance_npcname("nyd_call_mon_1")+"::OnEnable";
 			close;
 		} else {
 			mes "The path to the Guardian's Nest is just past the waterfall by the large World Tree Yggdrasil to the North. The defensive mechanisms will start immediately.";
@@ -1752,8 +1628,7 @@ OnTouch_:
 			mes "And... Be careful... Be careful of the shadow's power.";
 			close;
 		}
-	}
-	else if ('ins_nyd2 == 1) {
+	} else if ('ins_nyd2 == 1) {
 		mes "[World Tree Yggdrasil]";
 		mes "The path to the Guardian's Nest is just past the waterfall by the large World Tree Yggdrasil to the North. The defensive mechanisms will start immediately.";
 		next;
@@ -1763,8 +1638,7 @@ OnTouch_:
 		mes "[World Tree Yggdrasil]";
 		mes "The gate will open soon. Go defeat all of the guardians.";
 		close;
-	}
-	else if ('ins_nyd2 == 2) {
+	} else if ('ins_nyd2 == 2) {
 		mes "[World Tree Yggdrasil]";
 		mes "The path to the Guardian's Nest is just past the waterfall by the large World Tree Yggdrasil to the North.";
 		next;
@@ -1772,11 +1646,9 @@ OnTouch_:
 		mes "Use your powers... and destroy the vile Shadow...";
 		next;
 		mes "[World Tree Yggdrasil]";
-		mes "This is.. all I can do for you...";
+		mes "This is... all I can do for you...";
 		close;
-
-	}
-	else {
+	} else {
 		mes "[World Tree Yggdrasil]";
 		mes "Those who want to taint the sacred Sanctuary of the Guardian... Get out.";
 		warp "mid_camp",100,100;
@@ -1791,121 +1663,139 @@ OnTouch:
 		close;
 	}
 	end;
+
+OnInstanceInit: // Temporary fix for @reloadscript.
+	set 'ins_nyd2,0;
+	end;
 }
 
 1@nyd,1,1,0	script	nyd_call_mon_1	-1,{
 OnInstanceInit:
-	enablenpc instance_npcname("nyd_call_mon_1", instance_id());
+	enablenpc instance_npcname("nyd_call_mon_1");
 	end;
 
 OnEnable:
-	monster "1@nyd",220,250,"Nidhoggur's Guardian#1",2020,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",220,252,"Nidhoggur's Guardian#2",2020,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",240,270,"Nidhoggur's Guardian#3",2020,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",240,272,"Nidhoggur's Guardian#4",2020,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",200,200,"Nidhoggur's Guardian#5",2020,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",210,210,"Nidhoggur's Guardian#6",2020,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",225,265,"Nidhoggur's Guardian#7",2021,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",225,270,"Nidhoggur's Guardian#8",2021,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",245,235,"Nidhoggur's Guardian#9",2021,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",255,255,"Nidhoggur's Guardian#10",2021,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",225,245,"Nidhoggur's Guardian#11",2021,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	monster "1@nyd",230,280,"Nidhoggur's Guardian#12",2021,1,instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	instance_announce -1, "Nidhoggur's Guardian : Protect the Guardian's Sanctuary. Get rid of the intruders.",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@nyd");
+	monster .@map$,220,250,"Nidhoggur's Guardian#1",2020,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,220,252,"Nidhoggur's Guardian#2",2020,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,240,270,"Nidhoggur's Guardian#3",2020,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,240,272,"Nidhoggur's Guardian#4",2020,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,200,200,"Nidhoggur's Guardian#5",2020,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,210,210,"Nidhoggur's Guardian#6",2020,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,225,265,"Nidhoggur's Guardian#7",2021,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,225,270,"Nidhoggur's Guardian#8",2021,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,245,235,"Nidhoggur's Guardian#9",2021,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,255,255,"Nidhoggur's Guardian#10",2021,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,225,245,"Nidhoggur's Guardian#11",2021,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	monster .@map$,230,280,"Nidhoggur's Guardian#12",2021,1,instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	mapannounce .@map$, "Nidhoggur's Guardian : Protect the Guardian's Sanctuary. Get rid of the intruders.",bc_map,"0x00ff99";
 	end;
 
 OnDisable:
-	killmonster "1@nyd",instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead";
-	disablenpc instance_npcname("nyd_call_mon_1", instance_id());
+	killmonster instance_mapname("1@nyd"),instance_npcname("nyd_call_mon_1")+"::OnMyMobDead";
+	disablenpc instance_npcname("nyd_call_mon_1");
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("1@nyd", instance_npcname("nyd_call_mon_1", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("1@nyd");
+	set .@mob_dead_num,mobcount(.@map$, instance_npcname("nyd_call_mon_1")+"::OnMyMobDead");
 	if (.@mob_dead_num < 1) {
-		instance_announce -1, "All of Nidhoggur's Guardians have been defeated!",bc_map,"0x00ff99";
-		donpcevent instance_npcname("ins_nyd_1f_timer", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_to2f_warp", instance_id())+"::OnEnable";
+		mapannounce .@map$, "All of Nidhoggur's Guardians have been defeated!",bc_map,"0x00ff99";
+		donpcevent instance_npcname("ins_nyd_1f_timer")+"::OnDisable";
+		donpcevent instance_npcname("nyd_to2f_warp")+"::OnEnable";
 		set 'ins_nyd2,2;
 	}
 	end;
 }
 
 1@nyd,1,2,0	script	ins_nyd_1f_timer	-1,{
-
 OnInstanceInit:
-	disablenpc instance_npcname("ins_nyd_1f_timer", instance_id());
+	disablenpc instance_npcname("ins_nyd_1f_timer");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("ins_nyd_1f_timer", instance_id());
+	enablenpc instance_npcname("ins_nyd_1f_timer");
 	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc instance_npcname("ins_nyd_1f_timer", instance_id());
+	disablenpc instance_npcname("ins_nyd_1f_timer");
 	stopnpctimer;
-	killmonsterall "1@nyd";
+	killmonsterall instance_mapname("1@nyd");
 	end;
 
 OnTimer900000:
-	instance_announce -1, "World Tree Yggdrasil : There's not much time left. Please hurry.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@nyd"), "World Tree Yggdrasil : There's not much time left. Please hurry.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer1200000:
-	instance_announce -1, "World Tree Yggdrasil : My powers are slowly disappearing. Please hurry.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@nyd"), "World Tree Yggdrasil : My powers are slowly disappearing. Please hurry.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer1500000:
-	instance_announce -1, "World Tree Yggdrasil : I'm... almost at my limit... please hurry up."	,bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@nyd"), "World Tree Yggdrasil : I'm... almost at my limit... please hurry up.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer1800000:
-	instance_announce -1, "World Tree Yggdrasil : You've failed... but I will use what power I have left... to send you out of here.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@nyd"), "World Tree Yggdrasil : You've failed... but I will use what power I have left... to send you out of here.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer1830000:
-	instance_announce -1, "Opening of the Gate has failed.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@nyd"), "Opening of the Gate has failed.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer1850000:
-	donpcevent instance_npcname("ins_nyd_1f_timer", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("nyd_call_mon_1", instance_id())+"::OnDisable";
+	donpcevent instance_npcname("ins_nyd_1f_timer")+"::OnDisable";
+	donpcevent instance_npcname("nyd_call_mon_1")+"::OnDisable";
 	instance_warpall "mid_camp",310,150;
 	stopnpctimer;
 	end;
 }
 
-1@nyd,195,320,0	script	nyd_to2f_warp	45,5,5,{
-
+1@nyd,195,320,0	script	nyd_to2f_warp	WARPNPC,5,5,{
 OnInstanceInit:
-	disablenpc instance_npcname("nyd_to2f_warp", instance_id());
+OnDisable:
+	disablenpc instance_npcname("nyd_to2f_warp");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("nyd_to2f_warp", instance_id());
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_to2f_warp", instance_id());
+	enablenpc instance_npcname("nyd_to2f_warp");
 	end;
 
 OnTouch:
-	warp "2@nyd",200,10;
+	set 'ins_nyd2,3;
+	warp instance_mapname("2@nyd"),200,10;
 	end;
 }
 
 1@nyd,1,1,0	script	ins_nyd1_spawn_mobs	-1,{
 OnInstanceInit:
-	monster "1@nyd",0,0,"Ancient Tree",2019,20;
-	monster "1@nyd",0,0,"Rhyncho",2020,15;
-	monster "1@nyd",0,0,"Phylla",2021,15;
-	monster "1@nyd",0,0,"Aqua Elemental",2016,15;
-	monster "1@nyd",0,0,"Dark Pinguicula",2015,15;
-	monster "1@nyd",0,0,"Ancient Tree",2019,20;
-	monster "1@nyd",0,0,"Rhyncho",2020,15;
-	monster "1@nyd",0,0,"Phylla",2021,15;
-	monster "1@nyd",0,0,"Aqua Elemental",2016,15;
-	monster "1@nyd",0,0,"Dark Pinguicula",2015,15;
+	set .@map$, instance_mapname("1@nyd");
+	monster .@map$,0,0,"Ancient Tree",2019,40,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyTreeDead";
+	monster .@map$,0,0,"Rhyncho",2020,30,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyRhynDead";
+	monster .@map$,0,0,"Phylla",2021,30,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyPhyDead";
+	monster .@map$,0,0,"Aqua Elemental",2016,30,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyAquaDead";
+	monster .@map$,0,0,"Dark Pinguicula",2015,30,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyPingDead";
+	end;
+
+OnMyTreeDead:
+	monster instance_mapname("1@nyd"),0,0,"Ancient Tree",2019,1,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyTreeDead";
+	end;
+
+OnMyRhynDead:
+	monster instance_mapname("1@nyd"),0,0,"Rhyncho",2020,1,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyRhynDead";
+	end;
+
+OnMyPhyDead:
+	monster instance_mapname("1@nyd"),0,0,"Phylla",2021,1,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyPhyDead";
+	end;
+
+OnMyAquaDead:
+	monster instance_mapname("1@nyd"),0,0,"Aqua Elemental",2016,1,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyAquaDead";
+	end;
+
+OnMyPingDead:
+	monster instance_mapname("1@nyd"),0,0,"Dark Pinguicula",2015,1,instance_npcname("ins_nyd1_spawn_mobs")+"::OnMyPingDead";
 	end;
 }
 
@@ -1913,41 +1803,35 @@ OnInstanceInit:
 //============================================================
 2@nyd,200,14,0	script	nyd_2f_enter	-1,6,6,{
 OnTouch_:
-	donpcevent instance_npcname("nyd_2f_enter_broad", instance_id())+"::OnEnable";
-	disablenpc instance_npcname("nyd_2f_enter", instance_id());
+	donpcevent instance_npcname("nyd_2f_enter_broad")+"::OnEnable";
+	disablenpc instance_npcname("nyd_2f_enter");
 	end;
 }
 
 2@nyd,1,1,0	script	nyd_2f_enter_broad	-1,{
 OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_enter_broad", instance_id());
+OnDisable:
+	disablenpc instance_npcname("nyd_2f_enter_broad");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("nyd_2f_enter_broad", instance_id());
+	enablenpc instance_npcname("nyd_2f_enter_broad");
 	initnpctimer;
 	end;
 
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_enter_broad", instance_id());
-	end;
-
 OnTimer12000:
-	instance_announce -1, "Nidhoggur's Shadow : No more...I can't stand this anymore...",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@nyd"), "Nidhoggur's Shadow : No more... I can't stand this anymore...",bc_map,"0xFFFF00";
 	end;
 
 OnTimer15000:
-	instance_announce -1, "Nidhoggur's Shadow : I need...I need the World Tree Yggdrasil's powers...",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@nyd"), "Nidhoggur's Shadow : I need... I need the World Tree Yggdrasil's powers...",bc_map,"0xFFFF00";
 	end;
 
 OnTimer18000:
-	instance_announce -1, "Nidhoggur's Shadow : Destroy...everything...",bc_map,"0xFFFF00";
-	end;
-	/*
+	mapannounce instance_mapname("2@nyd"), "Nidhoggur's Shadow : Destroy... everything...",bc_map,"0xFFFF00";
 	stopnpctimer;
-	disablenpc instance_npcname("nyd_2f_enter_broad", instance_id());
+	disablenpc instance_npcname("nyd_2f_enter_broad");
 	end;
-	*/
 }
 
 2@nyd,199,178,0	script	nyd_2f_ddr_control	-1,6,6,{
@@ -1957,19 +1841,15 @@ OnTouch:
 	next;
 	mes "The strange power slowly surrounds your body, the dimension is starting to shift.";
 	close2;
-	warp "2@nyd",199,255;
+	warp instance_mapname("2@nyd"),199,255;
 	end;
 }
 
 2@nyd,199,268,0	script	nyd_2f_boss_enter	-1,8,8,{
-OnInstanceInit:
-	enablenpc instance_npcname("nyd_2f_boss_enter", instance_id());
-	end;
-
 OnTouch_:
-	if (getpartyleader(getcharid(1),2) == getcharid(0)) {
-		donpcevent instance_npcname("nyd_2f_boss_enter_call", instance_id())+"::OnEnable";
-		disablenpc instance_npcname("nyd_2f_boss_enter", instance_id());
+	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+		donpcevent instance_npcname("nyd_2f_boss_enter_call")+"::OnEnable";
+		disablenpc instance_npcname("nyd_2f_boss_enter");
 		end;
 	}
 	end;
@@ -1977,84 +1857,83 @@ OnTouch_:
 
 2@nyd,2,2,0	script	nyd_2f_boss_enter_call	-1,{
 OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_boss_enter_call", instance_id());
+	disablenpc instance_npcname("nyd_2f_boss_enter_call");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("nyd_2f_boss_enter_call", instance_id());
-	monster "2@nyd",199,327,"Nidhoggur's Shadow#",2022,1,instance_npcname("nyd_2f_boss_enter_call", instance_id())+"::OnMyMobDead";
-	instance_announce -1, "Nidhoggur's Shadow : I will devour all of you...you and the World Tree Yggdrasil.",bc_map,"0x00ff99";
-	//donpcevent instance_npcname("nyd_2f_boss_enter_call", instance_id())+"::Ongo";
+	enablenpc instance_npcname("nyd_2f_boss_enter_call");
+	set .@map$, instance_mapname("2@nyd");
+	monster .@map$,199,327,"Nidhoggur's Shadow",2022,1,instance_npcname("nyd_2f_boss_enter_call")+"::OnMyMobDead";
+	mapannounce .@map$, "Nidhoggur's Shadow : I will devour all of you... you and the World Tree Yggdrasil.",bc_map,"0x00ff99";
+	//donpcevent instance_npcname("nyd_2f_boss_enter_call")+"::OnGo";
 	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc instance_npcname("nyd_2f_boss_enter_call", instance_id());
-	killmonster "2@nyd",instance_npcname("nyd_2f_boss_enter_call", instance_id())+"::OnMyMobDead";
+	killmonster instance_mapname("2@nyd"),instance_npcname("nyd_2f_boss_enter_call")+"::OnMyMobDead";
+	disablenpc instance_npcname("nyd_2f_boss_enter_call");
 	end;
 
 OnTimer180000:
-	set .@rullet,rand(1,4);
-	if (.@rullet == 1) {
-		instance_announce -1, "Nidhoggur's Shadow : In this chaos... your blood is just what I need.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,278;
+	stopnpctimer;
+OnWarpColor:
+	set .@map$, instance_mapname("2@nyd");
+	switch(rand(1,4)) {
+	case 1:
+		mapannounce .@map$, "Nidhoggur's Shadow : In this chaos... your blood is just what I need.",bc_map,"0xFFFF00";
+		donpcevent instance_npcname("nyd_2f_white")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_yellow")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_green")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_red")+"::OnEnable";
+		instance_warpall .@map$,115,278;
 		end;
-	}
-	else if (.@rullet == 2) {
-		instance_announce -1, "Nidhoggur's Shadow : I will freeze every last drop of your blood.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,373;
+	case 2:
+		mapannounce .@map$, "Nidhoggur's Shadow : I will freeze every last drop of your blood.",bc_map,"0xFFFF00";
+		donpcevent instance_npcname("nyd_2f_red")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_yellow")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_green")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_white")+"::OnEnable";
+		instance_warpall .@map$,115,373;
 		end;
-	}
-	else if (.@rullet == 3) {
-		instance_announce -1, "Nidhoggur's Shadow : Sleep for eternity in an empty illusion.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,278;
+	case 3:
+		mapannounce .@map$, "Nidhoggur's Shadow : Sleep for eternity in an empty illusion.",bc_map,"0xFFFF00";
+		donpcevent instance_npcname("nyd_2f_red")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_white")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_green")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_yellow")+"::OnEnable";
+		instance_warpall .@map$,284,278;
 		end;
-	}
-	else if (.@rullet == 4) {
-		instance_announce -1, "Nidhoggur's Shadow : I'll let you enjoy the pain of dying slowly.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,374;
+	case 4:
+		mapannounce .@map$, "Nidhoggur's Shadow : I'll let you enjoy the pain of dying slowly.",bc_map,"0xFFFF00";
+		donpcevent instance_npcname("nyd_2f_red")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_white")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_yellow")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_green")+"::OnEnable";
+		instance_warpall .@map$,284,374;
 		end;
 	}
-	stopnpctimer;
 	end;
 
 OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@nyd",instance_npcname("nyd_2f_boss_enter_call", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		instance_announce -1, "Nidhoggur's Shadow : World Tree Yggdrasil's guardian... his powers are disappearing...",bc_map,"0x00ff99";
-		donpcevent instance_npcname("World Tree Yggdrasil#2F", instance_id())+"::OnEnable";
-		donpcevent instance_npcname("nyd_2f_boss_enter_call", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_boss_enter_logic", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_red_c", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white_c", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green_c", instance_id())+"::OnDisable";
+	set .@map$, instance_mapname("2@nyd");
+	if (mobcount(.@map$,instance_npcname("nyd_2f_boss_enter_call")+"::OnMyMobDead") < 1) {
+		mapannounce .@map$, "Nidhoggur's Shadow : World Tree Yggdrasil's guardian... his powers are disappearing...",bc_map,"0x00ff99";
+		donpcevent instance_npcname("World Tree Yggdrasil#2F")+"::OnEnable";
+		donpcevent instance_npcname("nyd_2f_boss_enter_call")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_boss_enter_logic")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_red_c")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_white_c")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_yellow_c")+"::OnDisable";
+		donpcevent instance_npcname("nyd_2f_green_c")+"::OnDisable";
+		set 'ins_nyd2,4;
 		end;
 	}
-	 else {
-		end;
-	 }
+	end;
 }
 
 2@nyd,2,4,0	script	nyd_2f_boss_enter_logic	-1,{
 OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_boss_enter_logic", instance_id());
+	disablenpc instance_npcname("nyd_2f_boss_enter_logic");
 	end;
 
 OnEnable:
@@ -2064,52 +1943,16 @@ OnEnable:
 
 OnDisable:
 	stopnpctimer;
-	disablenpc instance_npcname("nyd_2f_boss_enter_logic", instance_id());
+	disablenpc instance_npcname("nyd_2f_boss_enter_logic");
 	end;
 
 OnTimer180000:
-	set .@rullet,rand(1,4);
-	if (.@rullet == 1) {
-		instance_announce -1, "Nidhoggur's Shadow : In this chaos... your blood is just what I need.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,278;
-		end;
-	}
-	else if (.@rullet == 2) {
-		instance_announce -1, "Nidhoggur's Shadow : I will freeze every last drop of your blood.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,373;
-		end;
-	}
-	else if (.@rullet == 3) {
-		instance_announce -1, "Nidhoggur's Shadow : Sleep for eternity in an empty illusion.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,278;
-		end;
-	}
-	else if (.@rullet == 4) {
-		instance_announce -1, "Nidhoggur's Shadow : I'll let you enjoy the pain of dying slowly.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,374;
-		end;
-	}
 	stopnpctimer;
+	donpcevent instance_npcname("nyd_2f_boss_enter_call")+"::OnWarpColor";
 	end;
 }
 
-2@nyd,202,324,5	script	World Tree Yggdrasil#2F	437,3,3,{
+2@nyd,202,324,5	script	World Tree Yggdrasil#2F	4_F_FAIRYKID2,3,3,{
 	mes "[World Tree Yggdrasil]";
 	mes "Thank you. You're the saviour of humans and the Laphine Tribe.";
 	next;
@@ -2145,684 +1988,298 @@ OnTimer180000:
 	}
 
 OnInstanceInit:
-	disablenpc instance_npcname("World Tree Yggdrasil#2F", instance_id());
+OnDisable:
+	disablenpc instance_npcname("World Tree Yggdrasil#2F");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("World Tree Yggdrasil#2F", instance_id());
-	instance_announce -1, "World Tree Yggdrasil : You did good. Have everyone go to the Magic Circle in the middle, and get ready for the destruction of the nest.",bc_map,"0x00ff99";
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("World Tree Yggdrasil#2F", instance_id());
+	enablenpc instance_npcname("World Tree Yggdrasil#2F");
+	mapannounce instance_mapname("2@nyd"), "World Tree Yggdrasil : You did good. Have everyone go to the Magic Circle in the middle, and get ready for the destruction of the nest.",bc_map,"0x00ff99";
 	end;
 }
 
 2@nyd,115,278,0	script	nyd_2f_red	-1,5,5,{
 OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_red", instance_id());
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("nyd_2f_red", instance_id());
-	donpcevent instance_npcname("nyd_2f_red_warp1", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_red_warp2", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_red_warp3", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_red_c", instance_id())+"::OnEnable";
+	enablenpc instance_npcname(strnpcinfo(0));
+	donpcevent instance_npcname(strnpcinfo(0)+"_warp1")+"::OnEnable";
+	donpcevent instance_npcname(strnpcinfo(0)+"_warp2")+"::OnEnable";
+	donpcevent instance_npcname(strnpcinfo(0)+"_warp3")+"::OnEnable";
+	donpcevent instance_npcname(strnpcinfo(0)+"_c")+"::OnEnable";
 	initnpctimer;
 	end;
 
 OnDisable:
-	donpcevent instance_npcname("nyd_2f_red_warp1", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("nyd_2f_red_warp2", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("nyd_2f_red_warp3", instance_id())+"::OnDisable";
-	disablenpc instance_npcname("nyd_2f_red", instance_id());
+	donpcevent instance_npcname(strnpcinfo(0)+"_warp1")+"::OnDisable";
+	donpcevent instance_npcname(strnpcinfo(0)+"_warp2")+"::OnDisable";
+	donpcevent instance_npcname(strnpcinfo(0)+"_warp3")+"::OnDisable";
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnTouch:
-	percentheal -50,0;
-	percentheal -30,0;
-	sc_start SC_BLOODING,60000,0;
+	if (compare(strnpcinfo(0),"red")) {
+		percentheal -50,0;
+		percentheal -30,0;
+		sc_start SC_BLOODING,60000,0;
+	} else if (compare(strnpcinfo(0),"white")) {
+		percentheal -50,0;
+		sc_start SC_FREEZE,20000,0;
+	} else if (compare(strnpcinfo(0),"yellow")) {
+		percentheal 0,-50;
+		sc_start SC_SLEEP,20000,0;
+		sc_start SC_CONFUSION,60000,0;
+	} else if (compare(strnpcinfo(0),"green")) {
+		percentheal -50,-50;
+		sc_start SC_POISON,60000,0;
+	}
 	end;
 
 OnTimer10000:
-	disablenpc instance_npcname("nyd_2f_red", instance_id());
+	disablenpc instance_npcname(strnpcinfo(0));
 	stopnpctimer;
 	end;
 }
 
 2@nyd,6,6,0	script	nyd_2f_red_c	-1,{
 OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_red_c", instance_id());
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("nyd_2f_red_c", instance_id());
+	enablenpc instance_npcname(strnpcinfo(0));
 	initnpctimer;
-	monster "2@nyd",120,285,"Nidhoggur's Guardian#1",2020,1,instance_npcname("nyd_2f_red_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",119,286,"Nidhoggur's Guardian#2",2020,1,instance_npcname("nyd_2f_red_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",120,270,"Nidhoggur's Guardian#3",2020,1,instance_npcname("nyd_2f_red_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",119,269,"Nidhoggur's Guardian#4",2021,1,instance_npcname("nyd_2f_red_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",118,270,"Nidhoggur's Guardian#5",2021,1,instance_npcname("nyd_2f_red_c", instance_id())+"::OnMyMobDead";
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@nyd",instance_npcname("nyd_2f_red_c", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		instance_announce -1, "Nidhoggur's Shadow : You're not bad... but I will be your opponent this time.",bc_map,"0x00ff99";
-		donpcevent instance_npcname("nyd_2f_red_c", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_boss_enter_logic", instance_id())+"::OnEnable";
-		end;
+	set .@map$, instance_mapname("2@nyd");
+	set .@label$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	if (compare(strnpcinfo(0),"red")) {
+		monster .@map$,120,285,"Nidhoggur's Guardian#1",2020,1,.@label$;
+		monster .@map$,119,286,"Nidhoggur's Guardian#2",2020,1,.@label$;
+		monster .@map$,120,270,"Nidhoggur's Guardian#3",2020,1,.@label$;
+		monster .@map$,119,269,"Nidhoggur's Guardian#4",2021,1,.@label$;
+		monster .@map$,118,270,"Nidhoggur's Guardian#5",2021,1,.@label$;
+	} else if (compare(strnpcinfo(0),"white")) {
+		monster .@map$,120,380,"Nidhoggur's Guardian#1",2020,1,.@label$;
+		monster .@map$,119,381,"Nidhoggur's Guardian#2",2020,1,.@label$;
+		monster .@map$,120,367,"Nidhoggur's Guardian#3",2020,1,.@label$;
+		monster .@map$,119,366,"Nidhoggur's Guardian#4",2021,1,.@label$;
+		monster .@map$,118,365,"Nidhoggur's Guardian#5",2021,1,.@label$;
+	} else if (compare(strnpcinfo(0),"yellow")) {
+		monster .@map$,282,284,"Nidhoggur's Guardian#1",2020,1,.@label$;
+		monster .@map$,283,283,"Nidhoggur's Guardian#2",2020,1,.@label$;
+		monster .@map$,280,275,"Nidhoggur's Guardian#3",2020,1,.@label$;
+		monster .@map$,281,276,"Nidhoggur's Guardian#4",2021,1,.@label$;
+		monster .@map$,281,277,"Nidhoggur's Guardian#5",2021,1,.@label$;
+	} else if (compare(strnpcinfo(0),"green")) {
+		monster .@map$,282,378,"Nidhoggur's Guardian#1",2020,1,.@label$;
+		monster .@map$,283,377,"Nidhoggur's Guardian#2",2020,1,.@label$;
+		monster .@map$,280,368,"Nidhoggur's Guardian#3",2020,1,.@label$;
+		monster .@map$,281,368,"Nidhoggur's Guardian#4",2021,1,.@label$;
+		monster .@map$,281,367,"Nidhoggur's Guardian#5",2021,1,.@label$;
 	}
 	end;
 
-OnDisable:
-	donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-	disablenpc instance_npcname("nyd_2f_red_c", instance_id());
-	stopnpctimer;
-	end;
-
-OnTimer180000:
-	killmonster "2@nyd",instance_npcname("nyd_2f_red_c", instance_id())+"::OnMyMobDead";;
-	stopnpctimer;
-	set .@rullet,rand(1,4);
-	if (.@rullet == 1) {
-		instance_announce -1, "Nidhoggur's Shadow : In this chaos... your blood is just what I need.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,278;
-		end;
-	}
-	else if (.@rullet == 2) {
-		instance_announce -1, "Nidhoggur's Shadow : I will freeze every last drop of your blood.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,373;
-		end;
-	}
-	else if (.@rullet == 3) {
-		instance_announce -1, "Nidhoggur's Shadow : Sleep for eternity in an empty illusion.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,278;
-		end;
-	}
-	else if (.@rullet == 4) {
-		instance_announce -1, "Nidhoggur's Shadow : I'll let you enjoy the pain of dying slowly.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,374;
+OnMyMobDead:
+	set .@map$, instance_mapname("2@nyd");
+	if (mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) {
+		mapannounce .@map$, "Nidhoggur's Shadow : You're not bad... but I will be your opponent this time.",bc_map,"0x00ff99";
+		donpcevent instance_npcname("nyd_2f_boss_enter_logic")+"::OnEnable";
+		donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
 		end;
 	}
 	end;
-}
-
-2@nyd,130,298,0	script	nyd_2f_red_warp1	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_red_warp1", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_red_warp1", instance_id());
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_red_warp1", instance_id());
-	end;
-
-OnTouch:
-	warp "2@nyd",115,278;
-	end;
-}
-
-2@nyd,142,296,0	script	nyd_2f_red_warp2	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_red_warp2", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_red_warp2", instance_id());
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_red_warp2", instance_id());
-	end;
-
-OnTouch:
-	warp "2@nyd",115,278;
-	end;
-}
-
-2@nyd,145,283,0	script	nyd_2f_red_warp3	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_red_warp3", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_red_warp3", instance_id());
-	end;
 
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_red_warp3", instance_id());
-	end;
-
-OnTouch:
-	warp "2@nyd",115,278;
-	end;
-}
-
-2@nyd,115,373,0	script	nyd_2f_white	-1,5,5,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_white", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_white", instance_id());
-	donpcevent instance_npcname("nyd_2f_white_warp1", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_white_warp2", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_white_warp3", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_white_c", instance_id())+"::OnEnable";
-	initnpctimer;
-	end;
-
-OnDisable:
-	donpcevent instance_npcname("nyd_2f_white_warp1", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("nyd_2f_white_warp2", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("nyd_2f_white_warp3", instance_id())+"::OnDisable";
-	disablenpc instance_npcname("nyd_2f_white", instance_id());
-	end;
-
-OnTouch:
-	percentheal -50,0;
-	sc_start SC_FREEZE,20000,0;
-	end;
-
-OnTimer10000:
-	disablenpc instance_npcname("nyd_2f_white", instance_id());
-	stopnpctimer;
-	end;
-}
-
-2@nyd,6,7,0	script	nyd_2f_white_c	-1,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_white_c", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_white_c", instance_id());
-	initnpctimer;
-	monster "2@nyd",120,380,"Nidhoggur's Guardian#1",2020,1,instance_npcname("nyd_2f_white_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",119,381,"Nidhoggur's Guardian#2",2020,1,instance_npcname("nyd_2f_white_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",120,367,"Nidhoggur's Guardian#3",2020,1,instance_npcname("nyd_2f_white_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",119,366,"Nidhoggur's Guardian#4",2021,1,instance_npcname("nyd_2f_white_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",118,365,"Nidhoggur's Guardian#5",2021,1,instance_npcname("nyd_2f_white_c", instance_id())+"::OnMyMobDead";
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@nyd",instance_npcname("nyd_2f_white_c", instance_id())+"::OnMyMobDead");
-	 if (.@mob_dead_num < 1) {
-		instance_announce -1, "Nidhoggur's Shadow : You're not bad... but I will be your opponent this time.",bc_map,"0x00ff99";
-		donpcevent instance_npcname("nyd_2f_white_c", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_boss_enter_logic", instance_id())+"::OnEnable";
-		end;
-	}
+/*
+OnReset:	// Label not called.
+	killmonster instance_mapname("2@nyd"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
 	end;
+*/
 
 OnDisable:
-	donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-	disablenpc instance_npcname("nyd_2f_white_c", instance_id());
 	stopnpctimer;
+	killmonster instance_mapname("2@nyd"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; //custom
+	donpcevent instance_npcname(substr(strnpcinfo(0),0,getstrlen(strnpcinfo(0))-3))+"::OnDisable";
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnTimer180000:
-	killmonster "2@nyd",instance_npcname("nyd_2f_white_c", instance_id())+"::OnMyMobDead";
+	killmonster instance_mapname("2@nyd"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
 	stopnpctimer;
-	set .@rullet,rand(1,4);
-	if (.@rullet == 1) {
-		instance_announce -1, "Nidhoggur's Shadow : In this chaos... your blood is just what I need.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,278;
-		end;
-	}
-	else if (.@rullet == 2) {
-		instance_announce -1, "Nidhoggur's Shadow : I will freeze every last drop of your blood.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,373;
-		end;
-	}
-	else if (.@rullet == 3) {
-		instance_announce -1, "Nidhoggur's Shadow : Sleep for eternity in an empty illusion.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,278;
-		end;
-	}
-	else if (.@rullet == 4) {
-		instance_announce -1, "Nidhoggur's Shadow : I'll let you enjoy the pain of dying slowly.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,374;
-		end;
-	}
+	donpcevent instance_npcname("nyd_2f_boss_enter_call")+"::OnWarpColor";
 	end;
 }
 
-2@nyd,127,354,0	script	nyd_2f_white_warp1	-1,6,6,{
+2@nyd,130,298,0	script	nyd_2f_red_warp1	-1,6,6,{
 OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_white_warp1", instance_id());;
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_white_warp1", instance_id());;
-	end;
-
 OnDisable:
-	disablenpc instance_npcname("nyd_2f_white_warp1", instance_id());;
-	end;
-
-OnTouch:
-	warp "2@nyd",115,373;
-	end;
-}
-
-2@nyd,140,357,0	script	nyd_2f_white_warp2	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_white_warp2", instance_id());;
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("nyd_2f_white_warp2", instance_id());;
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_white_warp2", instance_id());;
+	enablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnTouch:
-	warp "2@nyd",115,373;
+	if (compare(strnpcinfo(0),"red"))
+		warp instance_mapname("2@nyd"),115,278;
+	else if (compare(strnpcinfo(0),"white"))
+		warp instance_mapname("2@nyd"),115,373;
+	else if (compare(strnpcinfo(0),"yellow"))
+		warp instance_mapname("2@nyd"),284,278;
+	else if (compare(strnpcinfo(0),"green"))
+		warp instance_mapname("2@nyd"),284,374;
 	end;
 }
+2@nyd,142,296,0	duplicate(nyd_2f_red_warp1)	nyd_2f_red_warp2	-1,6,6
+2@nyd,145,283,0	duplicate(nyd_2f_red_warp1)	nyd_2f_red_warp3	-1,6,6
+
+2@nyd,115,373,0	duplicate(nyd_2f_red)	nyd_2f_white	-1,5,5
+2@nyd,6,7,0	duplicate(nyd_2f_red_c)	nyd_2f_white_c	-1
+2@nyd,127,354,0	duplicate(nyd_2f_red_warp1)	nyd_2f_white_warp1	-1,6,6,
+2@nyd,140,357,0	duplicate(nyd_2f_red_warp1)	nyd_2f_white_warp2	-1,6,6
+2@nyd,145,367,0	duplicate(nyd_2f_red_warp1)	nyd_2f_white_warp3	-1,6,6
+
+2@nyd,284,278,0	duplicate(nyd_2f_red)	nyd_2f_yellow	-1,5,5
+2@nyd,6,8,0	duplicate(nyd_2f_red_c)	nyd_2f_yellow_c	-1
+2@nyd,255,285,0	duplicate(nyd_2f_red_warp1)	nyd_2f_yellow_warp1	-1,6,6
+2@nyd,257,296,0	duplicate(nyd_2f_red_warp1)	nyd_2f_yellow_warp2	-1,6,6
+2@nyd,268,300,0	duplicate(nyd_2f_red_warp1)	nyd_2f_yellow_warp3	-1,6,6
+
+2@nyd,284,374,0	duplicate(nyd_2f_red)	nyd_2f_green	-1,5,5
+2@nyd,6,9,0	duplicate(nyd_2f_red_c)	nyd_2f_green_c	-1
+2@nyd,274,356,0	duplicate(nyd_2f_red_warp1)	nyd_2f_green_warp1	-1,6,6
+2@nyd,260,356,0	duplicate(nyd_2f_red_warp1)	nyd_2f_green_warp2	-1,6,6
+2@nyd,258,368,0	duplicate(nyd_2f_red_warp1)	nyd_2f_green_warp3	-1,6,6
 
-2@nyd,145,367,0	script	nyd_2f_white_warp3	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_white_warp3", instance_id());;
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_white_warp3", instance_id());;
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_white_warp3", instance_id());;
-	end;
-
-OnTouch:
-	warp "2@nyd",115,373;
-	end;
-}
-
-2@nyd,284,278,0	script	nyd_2f_yellow	-1,5,5,{
+2@nyd,1,1,0	script	ins_nyd2_spawn_mobs	-1,{
 OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_yellow", instance_id());
+	set .@map$, instance_mapname("2@nyd");
+	areamonster .@map$,200,92,180,80,"Rhyncho",2020,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead";
+	areamonster .@map$,200,92,180,80,"Phylla",2021,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead";
+	areamonster .@map$,200,92,180,80,"Dark Shadow",2023,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead";
+	areamonster .@map$,200,92,180,80,"Dark Pinguicula",2015,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead";
 	end;
 
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_yellow", instance_id());
-	donpcevent instance_npcname("nyd_2f_yellow_warp1", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_yellow_warp2", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_yellow_warp3", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnEnable";
-	initnpctimer;
+OnMyRhynDead:
+	areamonster instance_mapname("2@nyd"),200,92,180,80,"Rhyncho",2020,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead";
 	end;
 
-OnDisable:
-	donpcevent instance_npcname("nyd_2f_yellow_warp1", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("nyd_2f_yellow_warp2", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("nyd_2f_yellow_warp3", instance_id())+"::OnDisable";
-	disablenpc instance_npcname("nyd_2f_yellow", instance_id());
+OnMyPhyDead:
+	areamonster instance_mapname("2@nyd"),200,92,180,80,"Phylla",2021,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead";
 	end;
 
-OnTouch:
-	percentheal 0,-50;
-	sc_start SC_SLEEP,20000,0;
-	sc_start SC_CONFUSION,60000,0;
+OnMyDarkshaDead:
+	areamonster instance_mapname("2@nyd"),200,92,180,80,"Dark Shadow",2023,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead";
 	end;
 
-OnTimer10000:
-	disablenpc instance_npcname("nyd_2f_yellow", instance_id());
-	stopnpctimer;
+OnMyPingDead:
+	areamonster instance_mapname("2@nyd"),200,92,180,80,"Dark Pinguicula",2015,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead";
 	end;
 }
 
-2@nyd,6,8,0	script	nyd_2f_yellow_c	-1,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_yellow_c", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_yellow_c", instance_id());
-	initnpctimer;
-	monster "2@nyd",282,284,"Nidhoggur's Guardian#1",2020,1,instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",283,283,"Nidhoggur's Guardian#2",2020,1,instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",280,275,"Nidhoggur's Guardian#3",2020,1,instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",281,276,"Nidhoggur's Guardian#4",2021,1,instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",281,277,"Nidhoggur's Guardian#5",2021,1,instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnMyMobDead";
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@nyd",instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		instance_announce -1, "Nidhoggur's Shadow : You're not bad...but I will be your opponent this time.",bc_map,"0x00ff99";
-		donpcevent instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_boss_enter_logic", instance_id())+"::OnEnable";
-		end;
+// GM Management NPCs
+//============================================================
+sec_in02,36,167,3	script	Nidhoggur Manager	4_M_FAIRYSOLDIER,1,1,{
+	callfunc "F_GM_NPC";
+	mes "Enter the password.";
+	next;
+	if (callfunc("F_GM_NPC","1854",1) == 0) {
+		mes "Incorrect password.";
+		close;
 	}
-	else {
-		end;
+	mes "What do you need to do?";
+	next;
+	switch(select("Reset variables to allow entrance to Nidhoggur:change variable 'ins_nyd':Remove 3 day timer 3135:Confirm variable number")) {
+	case 1:
+		set ins_nyd,200;
+		set ins_nyd2,0;
+		erasequest 3135;
+		mes "ins_nyd set to 200 ins_nyd2 set to 0";
+		mes "quest 3135 erased.";
+		close;
+	case 2:
+		mes "Which variable do you want to change?";
+		next;
+		switch(select("ins_nyd:ins_nyd2")) {
+			case 1: set .@var$,"ins_nyd"; break;
+			case 2: set .@var$,"ins_nyd2"; break;
+		}
+		mes "Input the variable number";
+		next;
+		input .@input;
+		setd .@var$, .@input;
+		mes .@var$+" has been set to "+.@input+" .";
+		close;
+	case 3:
+		mes "The 3 day timer will be removed when you close this dialog.";
+		next;
+		erasequest 3135;
+		mes "Finished removing Quest Timer.";
+		close;
+	case 4:
+		mes "ins_nyd is at "+ins_nyd+".";
+		mes "ins_nyd2 is at "+ins_nyd2+".";
+		close;
 	}
+}
 
-Onreset:
-	killmonster "2@nyd",instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnMyMobDead";
-	donpcevent instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnDisable";
-	end;
-
-OnDisable:
-	donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-	disablenpc instance_npcname("nyd_2f_yellow_c", instance_id());
-	stopnpctimer;
-	end;
-
-OnTimer180000:
-	killmonster "2@nyd",instance_npcname("nyd_2f_yellow_c", instance_id())+"::OnMyMobDead";
-	stopnpctimer;
-	set .@rullet,rand(1,4);
-	if (.@rullet == 1) {
-		instance_announce -1, "Nidhoggur's Shadow : In this chaos... your blood is just what I need.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,278;
-		end;
-	}
-	else if (.@rullet == 2) {
-		instance_announce -1, "Nidhoggur's Shadow : I will freeze every last drop of your blood.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,373;
-		end;
-	}
-	else if (.@rullet == 3) {
-		instance_announce -1, "Nidhoggur's Shadow : Sleep for eternity in an empty illusion.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,278;
-		end;
+nyd_dun02,7,7,2	script	Purification Admin#nyd2	CLEAR_NPC,2,0,{
+	callfunc "F_GM_NPC";
+	mes "Please enter the password";
+	set .@i, callfunc("F_GM_NPC","dragonslayer",1);
+	next;
+	if (.@i == 0) {
+		mes "Enter the password exactly.";
+		close;
 	}
-	else if (.@rullet == 4) {
-		instance_announce -1, "Nidhoggur's Shadow : I'll let you enjoy the pain of dying slowly.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,374;
-		end;
+	switch(select("Generate Purification Stone:Remove Purification Stone:Turn Entrance NPC OFF:Turn Entrance NPC On:Cancel")) {
+	case 1:
+		mes "Purification stone has been created and will stay on for 30 minutes.";
+		donpcevent "Purification Stone#nyd2::OnEnable";
+		close;
+	case 2:
+		mes "The Purification Stone has been destroyed.";
+		donpcevent "Purification Stone#nyd2::OnDisable";
+		close;
+	case 3:
+		mes "The Yggdrasil Gatekeeper at nyd_dun02 100 201 is now OFF.";
+		disablenpc "Yggdrasil Gatekeeper";
+		close;
+	case 4:
+		mes "The Yggdrasil Gatekeeper at nyd_dun02 100 201 is now On.";
+		enablenpc "Yggdrasil Gatekeeper";
+		close;
+	case 5:
+		close;
 	}
-	end;
-}
-
-2@nyd,255,285,0	script	nyd_2f_yellow_warp1	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_yellow_warp1", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_yellow_warp1", instance_id());
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_yellow_warp1", instance_id());
-	end;
-
-OnTouch:
-	warp "2@nyd",284,278;
-	end;
-}
-
-2@nyd,257,296,0	script	nyd_2f_yellow_warp2	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_yellow_warp2", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_yellow_warp2", instance_id());
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_yellow_warp2", instance_id());
-	end;
-
-OnTouch:
-	warp "2@nyd",284,278;
-	end;
 }
 
-2@nyd,268,300,0	script	nyd_2f_yellow_warp3	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_yellow_warp3", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_yellow_warp3", instance_id());
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_yellow_warp3", instance_id());
-	end;
-
-OnTouch:
-	warp "2@nyd",284,278;
-	end;
-}
-
-2@nyd,284,374,0	script	nyd_2f_green	-1,5,5,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_green", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_green", instance_id());
-	donpcevent instance_npcname("nyd_2f_green_warp1", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_green_warp2", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_green_warp3", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("nyd_2f_green_c", instance_id())+"::OnEnable";
-	initnpctimer;
-	end;
-
-OnDisable:
-	donpcevent instance_npcname("nyd_2f_green_warp1", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("nyd_2f_green_warp2", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("nyd_2f_green_warp3", instance_id())+"::OnDisable";
-	disablenpc instance_npcname("nyd_2f_green", instance_id());
-	end;
-
-OnTouch:
-	percentheal -50,-50;
-	sc_start SC_POISON,60000,0;
-	end;
-
-OnTimer10000:
-	disablenpc instance_npcname("nyd_2f_green", instance_id());
-	stopnpctimer;
-	end;
-}
-
-2@nyd,6,9,0	script	nyd_2f_green_c	-1,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_green_c", instance_id());
+nyd_dun02,88,195,4	script	Purification Stone#nyd2	2_MONEMUS,{
+	erasequest 3135;
+	erasequest 3136;
+	set ins_nyd,200;
+	set ins_nyd2,0;
+	mes "^0000FFThe records and after-effect related to the Nidhoggur's Nest have been removed. You can generate and enter the dungeon again.^000000";
+	close;
+OnInit:
+	disablenpc "Purification Stone#nyd2";
 	end;
-
 OnEnable:
-	enablenpc instance_npcname("nyd_2f_green_c", instance_id());
 	initnpctimer;
-	monster "2@nyd",282,378,"Nidhoggur's Guardian#1",2020,1,instance_npcname("nyd_2f_green_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",283,377,"Nidhoggur's Guardian#2",2020,1,instance_npcname("nyd_2f_green_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",280,368,"Nidhoggur's Guardian#3",2020,1,instance_npcname("nyd_2f_green_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",281,368,"Nidhoggur's Guardian#4",2021,1,instance_npcname("nyd_2f_green_c", instance_id())+"::OnMyMobDead";
-	monster "2@nyd",281,367,"Nidhoggur's Guardian#5",2021,1,instance_npcname("nyd_2f_green_c", instance_id())+"::OnMyMobDead";
-	end;
-
-OnMyMobDead:
-	set .@mob_dead_num,mobcount("2@nyd",instance_npcname("nyd_2f_green_c", instance_id())+"::OnMyMobDead");
-	if (.@mob_dead_num < 1) {
-		instance_announce -1, "Nidhoggur's Shadow : You're not bad... but I will be your opponent this time.",bc_map,"0x00ff99";
-		donpcevent instance_npcname("nyd_2f_green_c", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_boss_enter_logic", instance_id())+"::OnEnable";
-		end;
-	}
-	else {
-		end;
-	}
-
-Onreset:
-	killmonster "2@nyd",instance_npcname("nyd_2f_green_c", instance_id())+"::OnMyMobDead";
-	donpcevent instance_npcname("nyd_2f_green_c", instance_id())+"::OnDisable";
 	end;
-
 OnDisable:
-	donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-	disablenpc instance_npcname("nyd_2f_green_c", instance_id());
-	stopnpctimer;
-	end;
-
-OnTimer180000:
-	killmonster "2@nyd",instance_npcname("nyd_2f_green_c", instance_id())+"::OnMyMobDead";
 	stopnpctimer;
-	set .@rullet,rand(1,4);
-	if (.@rullet == 1) {
-		instance_announce -1, "Nidhoggur's Shadow : In this chaos... your blood is just what I need.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,278;
-		end;
-	}
-	else if (.@rullet == 2) {
-		instance_announce -1, "Nidhoggur's Shadow : I will freeze every last drop of your blood.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",115,373;
-		end;
-	}
-	else if (.@rullet == 3) {
-		instance_announce -1, "Nidhoggur's Shadow : Sleep for eternity in an empty illusion.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,278;
-		end;
-	}
-	else if (.@rullet == 4) {
-		instance_announce -1, "Nidhoggur's Shadow : I'll let you enjoy the pain of dying slowly.",bc_map,"0xFFFF00";
-		donpcevent instance_npcname("nyd_2f_red", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_white", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_yellow", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("nyd_2f_green", instance_id())+"::OnEnable";
-		instance_warpall "2@nyd",284,374;
-		end;
-	}
-	end;
-}
-
-2@nyd,274,356,0	script	nyd_2f_green_warp1	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_green_warp1", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_green_warp1", instance_id());
+	disablenpc "Purification Stone#nyd2";
 	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_green_warp1", instance_id());
+OnTimer1000:
+	enablenpc "Purification Stone#nyd2";
 	end;
-
-OnTouch:
-	warp "2@nyd",284,374;
+OnTimer1740000:
+	mapannounce "nyd_dun02","The Purification Stone will be destroyed in one minute.",bc_map,"0x00FF99",FW_NORMAL,12;
 	end;
-}
-
-2@nyd,260,356,0	script	nyd_2f_green_warp2	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_green_warp2", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_green_warp2", instance_id());
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_green_warp2", instance_id());
-	end;
-
-OnTouch:
-	warp "2@nyd",284,374;
-	end;
-}
-
-2@nyd,258,368,0	script	nyd_2f_green_warp3	-1,6,6,{
-OnInstanceInit:
-	disablenpc instance_npcname("nyd_2f_green_warp3", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("nyd_2f_green_warp3", instance_id());
-	end;
-
-OnDisable:
-	disablenpc instance_npcname("nyd_2f_green_warp3", instance_id());
-	end;
-
-OnTouch:
-	warp "2@nyd",284,374;
-	end;
-}
-
-2@nyd,1,1,0	script	ins_nyd2_spawn_mobs	-1,{
-OnInstanceInit:
-	areamonster "2@nyd",200,92,180,80,"Rhyncho",2020,20;
-	areamonster "2@nyd",200,92,180,80,"Phylla",2021,20;
-	areamonster "2@nyd",200,92,180,80,"Dark Shadow",2023,20;
-	areamonster "2@nyd",200,92,180,80,"Dark Pinguicula",2015,20;
-	areamonster "2@nyd",200,92,180,80,"Rhyncho",2020,20;
-	areamonster "2@nyd",200,92,180,80,"Phylla",2021,20;
-	areamonster "2@nyd",200,92,180,80,"Dark Shadow",2023,20;
-	areamonster "2@nyd",200,92,180,80,"Dark Pinguicula",2015,20;
+OnTimer1800000:
+	disablenpc "Purification Stone#nyd2";
 	end;
 }
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index 325b1a739..55f88f99d 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -3,14 +3,17 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
+//===== Description: =========================================
+//= [Official Conversion]
+//= Relive the memory of an orc.
 //===== Description: =========================================
 //= [Official Conversion]
 //= Relive the memory of an orc.
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 First round of bugfixes. (bugreport:3928) [L0ne_W0lf]
-//=     Fixed some npcs calling wrong events. 
+//=     Fixed some npcs calling wrong events.
 //=     Fixed Depraved Orc Spirit spawn point
 //=     Fixed an NPC that was never being enabled.
 //= 1.1a Second round from bugreport. (bugreport:3928) [L0ne_W0lf]
@@ -27,172 +30,98 @@
 //= 1.4 Fixed donpcevent calling non-existant npc. (bugreport:4039) [L0ne_W0lf]
 //= 1.5 Fixed a checkquest condition never setting quest. [L0ne_W0lf]
 //= 1.6 Added 'instance_check_party' command to the script for proper checking if
-//=		the invoking party meets the requirements to join the Memorial Dungeon.
+//=     the invoking party meets the requirements to join the Memorial Dungeon.
+//= 1.7 Instance system rewrite. [Euphy]
+//============================================================
+
+1@orcs	mapflag	src4instance
+2@orcs	mapflag	src4instance
 //============================================================
 
 // Entrance
 //============================================================
-gef_fild10,242,202,0	script	Dimensional Gorge Piece	406,{
+gef_fild10,242,202,0	script	Dimensional Gorge Piece	2_MONEMUS,{
 
 	set .@party_id,getcharid(1);
-	set .@ins_mas,getpartyleader(.@party_id,1);
 	set .@p_name$,getpartyname(.@party_id);
-	set .@p_leader$,rid2name(.@ins_mas);
 	set .@md_name$,"Orc's Memory";
 
-	if(!instance_check_party(.@party_id,2,30,80)){
-		mes "I'm sorry but your Party does not meet the requirements to join the Memorial Dungeon.";
+	if (!instance_check_party(.@party_id,2,30,80)) {
+		mes "Only users between Levels ^ff000030 ~ 80^000000 can enter this Dungeon.";
 		close;
 	}
 
 	set .@orctime,checkquest(12059,PLAYTIME);
 	if (.@orctime == -1) {
-		if (.@ins_mas == getcharid(3)) {
+		if (getcharid(0) == getpartyleader(.@party_id,2)) {
 			mes "Party status confirmed. Would you like to book entrance to the "+.@md_name$+"?";
 			next;
 			switch(select("Reserve the "+.@md_name$+":Enter the Dungeon:Cancel")) {
 			case 1:
 				set .@instance,instance_create(.@md_name$,.@party_id);
 				if (.@instance < 0) {
-					mes "Party Name: "+.@p_name$+"";
-					mes "Party Leader: "+.@p_leader$+"";
+					mes "Party Name: "+.@p_name$;
+					mes "Party Leader: "+strcharinfo(0);
 					mes "^0000ff"+.@md_name$+" ^000000 - Reservation Failed.";
 					close;
-				} else {
-					mes "^0000ff"+.@md_name$+"^000000- Attempting to book an entrance";
-					mes "After making a reservation, you have to select 'Enter the Dungeon' from the menu if you wish to enter the "+.@md_name$+".";
-					for( set .@i, 1; .@i <= 2; set .@i, .@i + 1 ) {
-						if( instance_attachmap(.@i + "@orcs", .@instance) == "" )
-							break;
-					}
-					if( .@i < 2 ) {
-						instance_destroy(.@instance);
-						close;
-					}
-					instance_attach(.@instance);
-					instance_set_timeout 7200,300,.@instance;
-					instance_init(.@instance);
-
-					// First Floor
-					donpcevent instance_npcname("#Resurrect Monsters1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Resurrect Monsters2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Resurrect Monsters3", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Resurrect Monsters4", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("B1 Area 1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("B1 Area 2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("B1 Area 3", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("B1 Area 4", instance_id())+"::OnInstanceInit";
-					disablenpc instance_npcname("Kurger#1-2", instance_id());
-
-					// Second Floor
-					donpcevent instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#1-1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#1-2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#1-3", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#1-4", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#2-2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#2-3", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#2-4", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#3-2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#3-3", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Torch#3-4", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Warp2-1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Warp2-2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Warp2-3", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Boss Control", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Warp Outside Orc Dun", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Kruger#", instance_id())+"::OnInstanceInit";
-					disablenpc instance_npcname("Kruger#2-2", instance_id());
-					close;
 				}
-			case 2:
-				if (has_instance("1@orcs") == "") {
-					mes "Memorial Dungeon "+.@md_name$+" does not exist.";
-					mes "The party leader has not reserved entrance to the dungeon yet.";
-					next;
-					mes "Once the reservation is complete, the dungeon will be generated.";
-					mes "If your dungeon has been destroyed you must wait 7 days before re-entering.";
-					close;
+				mes "^0000ff"+.@md_name$+"^000000- Attempting to book an entrance";
+				for( set .@i, 1; .@i <= 2; set .@i, .@i + 1 ) {
+					if( instance_attachmap(.@i + "@orcs", .@instance) == "" )
+						break;
 				}
-				if((party_instance_id3 != 0) && (party_instance_id3 != getcharid(1))) {
-					mes "The Memorial Dungeon "+.@md_name$+" does not exist.";
-					mes "The Memorial Dungeon has been destroyed by the Party Leader or because of the time limit. Please try again after 2 hours.";
+				if( .@i < 2 ) {
+					instance_destroy(.@instance);
 					close;
 				}
-				mapannounce "gef_fild10", .@p_leader$ + " of the party, " + .@p_name$ + " is entering the "+.@md_name$+".",bc_map,"0x00ff99";
-				if (checkquest(12059)== -1) setquest 12059;
-				set party_instance_id3,getcharid(1);
-				warp "1@orcs",179,15;
-				end;
+				instance_set_timeout 7200,300,.@instance;
+				instance_init(.@instance);
+				mes "After making a reservation, you have to select 'Enter the Dungeon' from the menu if you wish to enter the "+.@md_name$+".";
+				close;
+			case 2:
+				callsub L_Enter,0;
 			case 3:
 				close;
 			}
 		}
-		switch(select(.@md_name$ + " Enter the Memorial Dungeon:Cancel")) {
-		case 1:
-			if (has_instance("1@orcs") == "") {
-				mes "The Memorial Dungeon "+.@md_name$+" does not exist.";
-				mes "The Memorial Dungeon has been destroyed by the Party Leader or because of the time limit. Please try again after 2 hours.";
-				close;
-			}
-			if((party_instance_id3 != 0) && (party_instance_id3 != getcharid(1))) {
-				mes "The Memorial Dungeon "+.@md_name$+" does not exist.";
-				mes "The Memorial Dungeon has been destroyed by the Party Leader or because of the time limit. Please try again after 2 hours.";
-				close;
-			}
-			mapannounce "gef_fild10",.@p_name$+" Party's member "+.@p_leader$+" has entered the "+.@md_name$+".",bc_map,"0x00ff99";
-			set party_instance_id3,getcharid(1);
-			if (checkquest(12059)== -1) setquest 12059;
-			warp "1@orcs",179,15;
+		if(select(.@md_name$ + " Enter the Memorial Dungeon:Cancel") == 2)
 			end;
-		case 2:
-			close;
-		}
+		callsub L_Enter,1;
 	} else if (.@orctime == 0 || .@orctime == 1) {
 		mes "You can enter the Dungeon if it has been generated.";
 		next;
-		switch(select("Enter the Dungeon "+.@md_name$+":Cancel")) {
-		case 1:
-			if (has_instance("1@orcs") == "") {
-				mes "The Memorial Dungeon "+.@md_name$+" does not exist.";
-				mes "The Memorial Dungeon has been destroyed by the Party Leader or because of the time limit. Please try again after 2 hours.";
-				close;
-			}
-			if((party_instance_id3 != 0) && (party_instance_id3 != getcharid(1))) {
-				mes "The Memorial Dungeon "+.@md_name$+" does not exist.";
-				mes "The Memorial Dungeon has been destroyed by the Party Leader or because of the time limit. Please try again after 2 hours.";
-				close;
-			}
-			mapannounce "gef_fild10",.@p_name$+" Party's member "+.@p_leader$+" has entered the "+.@md_name$+".",bc_map,"0x00ff99";
-			if (checkquest(12059)== -1) setquest 12059;
-			set party_instance_id3,getcharid(1);
-			warp "1@orcs",179,15;
-			end;
-		case 2:
+		if(select("Enter the Dungeon "+.@md_name$+":Cancel") == 2)
 			close;
-		}
-	}
-	else if (.@orctime == 2) {
+		callsub L_Enter,0;
+	} else if (.@orctime == 2) {
 		mes "^0000ffAll records and after-effects related to the Orc's Memory Dungeon are deleted. You can now regenerate or re-enter the dungeon.^000000";
-		set party_instance_id3,0;
 		erasequest 12059;
 		close;
 	}
 	mes "In order to generate a dungeon you must be the Party Leader and have at least 2 members in the party.";
 	close;
+L_Enter:
+	if (has_instance("1@orcs") == "") {
+		mes "Memorial Dungeon "+.@md_name$+" does not exist.";
+		mes "The party leader has not reserved entrance to the dungeon yet.";
+		next;
+		mes "Once the reservation is complete, the dungeon will be generated.";
+		mes "If your dungeon has been destroyed you must wait 7 days before re-entering.";
+		close;
+	} else {
+		mapannounce "gef_fild10", .@p_leader$ + " of the party, " + .@p_name$ + " is entering the "+.@md_name$+".",bc_map,"0x00ff99";
+		if (checkquest(12059)== -1) setquest 12059;
+		warp "1@orcs",179,15;
+		end;
+	}
 }
 
-gef_fild10,238,202,6	script	Mad Scientist#orc	865,{
+gef_fild10,238,202,6	script	Mad Scientist#orc	4_LGTSCIENCE,{
 	if (BaseLevel < 50) {
 		mes "The Mad Scientist doesn't seem to notice you and keeps mumbling to himself...";
 		close;
 	}
-	if (mad > 1) {
-		set mad,1;
-	}
-	else if (mad < 1) {
+	if (mad == 0) {
 		mes "[Mad Scientist]";
 		mes "Haha, no Orcs are coming near me!";
 		mes "The power of the Dimensional Gorge is undefeatable!!";
@@ -211,117 +140,84 @@ gef_fild10,238,202,6	script	Mad Scientist#orc	865,{
 			next;
 			break;
 		}
-		switch(select("Oh? Like what, travel to alternate space?")) {
-		case 1:
-			mes "[Mad Scientist]";
-			mes "Very smart! I have actually just done that! See that statue over there? It's not your normal Monolith!";
-			next;
-			mes "[Mad Scientist]";
-			mes "I have created it with a combination of our technology and the unlimited energy I discovered from the Gorge! Want to try it?";
-			next;
-			break;
-		}
-		switch(select("... Um, that doesn't sound legal?")) {
-		case 1:
-			mes "[Mad Scientist]";
-			mes "Hey, since when did something so interesting have to be legal!? How about it! You can talk to the Orcs! C'mon!";
-			next;
-			mes "[Mad Scientist]";
-			mes "Chances are they'll just give you lots of instructions once they see you, so just wing it! They're always saying the same thing, to the point where I memorized them!";
-			next;
-			break;
-		}
+		select("Oh? Like what, travel to alternate space?");
+		mes "[Mad Scientist]";
+		mes "Very smart! I have actually just done that! See that statue over there? It's not your normal Monolith!";
+		next;
+		mes "[Mad Scientist]";
+		mes "I have created it with a combination of our technology and the unlimited energy I discovered from the Gorge! Want to try it?";
+		next;
+		select("...Um, that doesn't sound legal?");
+		mes "[Mad Scientist]";
+		mes "Hey, since when did something so interesting have to be legal!? How about it! You can talk to the Orcs! C'mon!";
+		next;
+		mes "[Mad Scientist]";
+		mes "Chances are they'll just give you lots of instructions once they see you, so just wing it! They're always saying the same thing, to the point where I memorized them!";
+		next;
 		switch(select("Alright... What do I do?:Umm, maybe not.")) {
 		case 1:
 			mes "[Mad Scientist]";
 			mes "Very good! Just sit in the hands of this statue! And try to act natural when you're in there!";
 			set mad,1;
-			break;
+			close;
 		case 2:
 			mes "[Mad Scientist]";
 			mes "Oh fine, be that way!";
-			break;
+			close;
 		}
-	}
-	else {
+	} else if (mad == 1) {
 		mes "[Mad Scientist]";
 		mes "Hmm? Put your hand on that Monemus Statue if you want to experience traveling through dimensions!";
+		close;
+	} else {
+		set mad,1;
+		end;
 	}
-	close;
 }
 
 // Orc's Memory Floor 1
 //============================================================
-1@orcs,180,30,0	script	#Resurrect Monsters1	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#Resurrect Monsters1", instance_id());
+	disablenpc instance_npcname("#Resurrect Monsters1");
 	end;
 
 OnDisable:
-	killmonster "1@orcs",instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+	stopnpctimer;
+	killmonster instance_mapname("1@orcs"),instance_npcname("#Resurrect Monsters1")+"::OnMyMobDead";
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("#Resurrect Monsters1", instance_id());
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Warrior",1023,1,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("#Resurrect Monsters1");
+	monster instance_mapname("1@orcs"),0,0,"Orc Warrior",1023,30,instance_npcname("#Resurrect Monsters1")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@callnum,30;
-	set .@c_mob_num,mobcount("1@orcs",instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead");
-	set .@mob_dead_num,.@callnum - .@c_mob_num;
+	set .@map$, instance_mapname("1@orcs");
+	set .@mob_dead_num, 30 - mobcount(.@map$,instance_npcname("#Resurrect Monsters1")+"::OnMyMobDead");
 	if (.@mob_dead_num > 0) {
 		set .@mob_ran,rand(1,30);
 		if (.@mob_ran > 29) {
-			monster "1@orcs",0,0,"Orc Warrior",1023,.@mob_dead_num,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+			monster .@map$,0,0,"Orc Warrior",1023,.@mob_dead_num,instance_npcname("#Resurrect Monsters1")+"::OnMyMobDead";
 		}
 		else if ((.@mob_ran > 28) && (.@mob_ran < 30)) {
-			monster "1@orcs",0,0,"High Orc",1213,.@mob_dead_num,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+			monster .@map$,0,0,"High Orc",1213,.@mob_dead_num,instance_npcname("#Resurrect Monsters1")+"::OnMyMobDead";
 			if (rand(1,10) == 9) {
-				instance_announce -1, "High Orc: We need more defenses! Get more people here!",bc_map,"0xff4444";
+				mapannounce .@map$, "High Orc: We need more defenses! Get more people here!",bc_map,"0xff4444";
 			}
 		}
 		else if ((.@mob_ran > 26) && (.@mob_ran < 29)) {
-			areamonster "1@orcs",41,91,51,81,"High Orc",1213,.@mob_dead_num,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+			areamonster .@map$,41,91,51,81,"High Orc",1213,.@mob_dead_num,instance_npcname("#Resurrect Monsters1")+"::OnMyMobDead";
 			if (rand(1,10) == 9) {
-				instance_announce -1, "Where are the High Orcs!? Get them to stop the enemies!",bc_map,"0xff4444";
+				mapannounce .@map$, "Where are the High Orcs!? Get them to stop the enemies!",bc_map,"0xff4444";
 			}
 		}
 		else {
-			areamonster "1@orcs",17,187,27,177,"High Orc",1213,.@mob_dead_num,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+			areamonster .@map$,17,187,27,177,"High Orc",1213,.@mob_dead_num,instance_npcname("#Resurrect Monsters1")+"::OnMyMobDead";
 			if (rand(1,5) == 3) {
-				instance_announce -1, "Caution: The army's starting to concentrate at Zone No. 4.",bc_map,"0x77ff77";
+				mapannounce .@map$, "Caution: The army's starting to concentrate at Zone No. 4.",bc_map,"0x77ff77";
 			}
 			if (rand(1,100) == 50) {
 				initnpctimer;
@@ -331,313 +227,278 @@ OnMyMobDead:
 	end;
 
 OnTimer10:
-	instance_announce -1, "Shouts of the Chief Orc of Safeguards: Looks like this will take longer than expected. Summon the Stalactic Golems!",bc_map,"0xff4444";
+	mapannounce instance_mapname("1@orcs"), "Shouts of the Chief Orc of Safeguards: Looks like this will take longer than expected. Summon the Stalactic Golems!",bc_map,"0xff4444";
 	end;
 
 OnTimer4010:
-	instance_announce -1, "Stalactic Golems are digging out of the deep underground.",bc_map,"0x77ff77";
-	areamonster "1@orcs",17,187,27,177,"Stalactic Golem",1278,20,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@orcs");
+	mapannounce .@map$, "Stalactic Golems are digging out of the deep underground.",bc_map,"0x77ff77";
+	areamonster .@map$,17,187,27,177,"Stalactic Golem",1278,20,instance_npcname("#Resurrect Monsters1")+"::OnMyMobDead";
 	stopnpctimer;
 	end;
 }
 
-1@orcs,180,30,0	script	#Resurrect Monsters2	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters2	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#Resurrect Monsters2", instance_id());
+	disablenpc instance_npcname("#Resurrect Monsters2");
 	end;
 
 OnDisable:
-	killmonster "1@orcs",instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
+	killmonster instance_mapname("1@orcs"),instance_npcname("#Resurrect Monsters2")+"::OnMyMobDead";
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("#Resurrect Monsters2", instance_id());
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Trained Wolf",1106,1,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("#Resurrect Monsters2");
+	monster instance_mapname("1@orcs"),0,0,"Trained Wolf",1106,15,instance_npcname("#Resurrect Monsters2")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@callnum,15;
-	set .@c_mob_num,mobcount("1@orcs",instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead");
-	set .@mob_dead_num,.@callnum - .@c_mob_num;
+	set .@map$, instance_mapname("1@orcs");
+	set .@mob_dead_num, 15 - mobcount(.@map$,instance_npcname("#Resurrect Monsters2")+"::OnMyMobDead");
 	if (rand(1,30) > 15) {
 		if (.@mob_dead_num > 0) {
-			monster "1@orcs",0,0,"Trained Wolf",1106,.@mob_dead_num,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
+			monster .@map$,0,0,"Trained Wolf",1106,.@mob_dead_num,instance_npcname("#Resurrect Monsters2")+"::OnMyMobDead";
 		}
 	}
 	else {
 		if (.@mob_dead_num > 0) {
-			areamonster "1@orcs",17,187,27,177,"Trained Wolf",1106,.@mob_dead_num,instance_npcname("#Resurrect Monsters2", instance_id())+"::OnMyMobDead";
+			areamonster .@map$,17,187,27,177,"Trained Wolf",1106,.@mob_dead_num,instance_npcname("#Resurrect Monsters2")+"::OnMyMobDead";
 		}
 	}
 	end;
 }
 
-1@orcs,180,30,0	script	#Resurrect Monsters3	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters3	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#Resurrect Monsters3", instance_id());
+	disablenpc instance_npcname("#Resurrect Monsters3");
 	end;
 
 OnDisable:
-	killmonster "1@orcs",instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+	killmonster instance_mapname("1@orcs"),instance_npcname("#Resurrect Monsters3")+"::OnMyMobDead";
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("#Resurrect Monsters3", instance_id());
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "1@orcs",0,0,"Orc Archer",1189,1,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("#Resurrect Monsters3");
+	monster instance_mapname("1@orcs"),0,0,"Orc Archer",1189,15,instance_npcname("#Resurrect Monsters3")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@callnum,15;
-	set .@c_mob_num,mobcount("1@orcs",instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead");
-	set .@mob_dead_num,.@callnum - .@c_mob_num;
+	set .@map$, instance_mapname("1@orcs");
+	set .@mob_dead_num, 15 - mobcount(.@map$,instance_npcname("#Resurrect Monsters3")+"::OnMyMobDead");
 	set .@mob_ran,rand(1,30);
 	if (.@mob_ran > 29) {
 		if (.@mob_dead_num > 0) {
-			monster "1@orcs",0,0,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+			monster .@map$,0,0,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#Resurrect Monsters3")+"::OnMyMobDead";
 		}
 	}
 	else if ((.@mob_ran > 26) && (.@mob_ran < 30)) {
 		if (.@mob_dead_num > 0) {
-			areamonster "1@orcs",43,155,47,159,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+			areamonster .@map$,43,155,47,159,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#Resurrect Monsters3")+"::OnMyMobDead";
 			if (rand(1,3) == 3) {
-				instance_announce -1, "High Orc: Attack them from behind! Cut off their support!",bc_map,"0xff4444";
+				mapannounce .@map$, "High Orc: Attack them from behind! Cut off their support!",bc_map,"0xff4444";
 			}
 		}
 	}
 	else {
 		if (.@mob_dead_num > 0) {
-			areamonster "1@orcs",17,187,27,177,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+			areamonster .@map$,17,187,27,177,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#Resurrect Monsters3")+"::OnMyMobDead";
 		}
 	}
 	end;
 }
 
-1@orcs,180,30,0	script	#Resurrect Monsters4	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters4	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	enablenpc instance_npcname("#Resurrect Monsters4", instance_id());
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	areamonster "1@orcs",98,35,178,115,"Anopheles",1627,1,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("#Resurrect Monsters4");
+	areamonster instance_mapname("1@orcs"),98,35,178,115,"Anopheles",1627,10,instance_npcname("#Resurrect Monsters4")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@callnum,10;
-	set .@c_mob_num,mobcount("1@orcs",instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead");
-	set .@mob_dead_num,.@callnum - .@c_mob_num;
+	set .@map$, instance_mapname("1@orcs");
+	set .@mob_dead_num, 10 - mobcount(.@map$,instance_npcname("#Resurrect Monsters4")+"::OnMyMobDead");
 	if (.@mob_dead_num > 0) {
-		monster "1@orcs",0,0,"Anopheles",1627,.@mob_dead_num,instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
+		monster .@map$,0,0,"Anopheles",1627,.@mob_dead_num,instance_npcname("#Resurrect Monsters4")+"::OnMyMobDead";
 	}
 	end;
 
 OnDisable:
-	killmonster "1@orcs",instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead";
+	killmonster instance_mapname("1@orcs"),instance_npcname("#Resurrect Monsters4")+"::OnMyMobDead";
 	end;
 }
 
-1@orcs,180,29,4	script	Kurger#1-1	433,{
-	donpcevent instance_npcname("Kurger#1-2", instance_id())+"::OnEnable";
+1@orcs,180,29,4	script	Kruger#1-1	4_ORCWARRIOR,{
+	donpcevent instance_npcname("Kruger#1-2")+"::OnEnable";
 	end;
 }
 
-1@orcs,180,29,4	script	Kurger#1-2	433,{
+1@orcs,180,29,4	script	Kruger#1-2	4_ORCWARRIOR,{
+	end;
+
+OnInstanceInit:
+	disablenpc instance_npcname("Kruger#1-2");
 	end;
 
 OnEnable:
-	disablenpc instance_npcname("Kurger#1-1", instance_id());
-	enablenpc instance_npcname("Kurger#1-2", instance_id());
+	disablenpc instance_npcname("Kruger#1-1");
+	enablenpc instance_npcname("Kruger#1-2");
 	initnpctimer;
 	end;
 
 OnTimer10:
-	instance_announce -1, "Kruger: Damn... What took you so long!! I don't have all day!!",bc_map,"0xffff00";
+	mapannounce instance_mapname("1@orcs"), "Kruger: Damn... What took you so long!! I don't have all day!!",bc_map,"0xffff00";
 	end;
 
 OnTimer5710:
-	instance_announce -1, "Kruger: My plan was to let our comrades open the gate, but it's all ruined since I got busted by the Orc Shaman.",bc_map,"0xffff00";
+	mapannounce instance_mapname("1@orcs"), "Kruger: My plan was to let our comrades open the gate, but it's all ruined since I got busted by the Orc Shaman.",bc_map,"0xffff00";
 	end;
 
 OnTimer14610:
-	instance_announce -1, "Shouts of the Chief Orc of Safeguards: I smell a rat.. Send some patrols to the entrance!!",bc_map,"0xff4444";
+	mapannounce instance_mapname("1@orcs"), "Shouts of the Chief Orc of Safeguards: I smell a rat.. Send some patrols to the entrance!!",bc_map,"0xff4444";
 	end;
 
 OnTimer20210:
-	instance_announce -1, "Kruger: Darn it.. They'll be here any minute. Ok. Listen to me now.",bc_map,"0xffff00";
+	mapannounce instance_mapname("1@orcs"), "Kruger: Darn it.. They'll be here any minute. Ok. Listen to me now.",bc_map,"0xffff00";
 	end;
 
 OnTimer24910:
-	instance_announce -1, "Kruger: The Orc Shaman has sealed the 1st basement by dividing it into 4 zones. Each zone has one Enchanted Orc who has the power to unseal the next zone.",bc_map,"0xffff00";
+	mapannounce instance_mapname("1@orcs"), "Kruger: The Orc Shaman has sealed the 1st basement by dividing it into 4 zones. Each zone has one Enchanted Orc who has the power to unseal the next zone.",bc_map,"0xffff00";
 	end;
 
 OnTimer34310:
-	instance_announce -1, "Kruger: Find those Enchanted Orcs and get rid of them to move to the next zone.",bc_map,"0xffff00";
+	mapannounce instance_mapname("1@orcs"), "Kruger: Find those Enchanted Orcs and get rid of them to move to the next zone.",bc_map,"0xffff00";
 	end;
 
 OnTimer39710:
-	instance_announce -1, "Kruger: Try to avoid encountering Orcs other then the Enchanted ones. Everytime you kill a normal Orc, High Orcs will gather at the last path to the 2nd floor.",bc_map,"0xffff00";
+	mapannounce instance_mapname("1@orcs"), "Kruger: Try to avoid encountering Orcs other then the Enchanted ones. Everytime you kill a normal Orc, High Orcs will gather at the last path to the 2nd floor.",bc_map,"0xffff00";
 	end;
 
 OnTimer49210:
-	instance_announce -1, "Kruger: In the worst case, the path to the 2nd floor could be completely blocked. For your own sake, you should be as sneaky as possible.",bc_map,"0xffff00";
+	mapannounce instance_mapname("1@orcs"), "Kruger: In the worst case, the path to the 2nd floor could be completely blocked. For your own sake, you should be as sneaky as possible.",bc_map,"0xffff00";
 	end;
 
 OnTimer56310:
-	instance_announce -1, "Mission: Sneak in and get rid of the 'Enchanted Orcs'. Avoiding battles with other Orcs is the best way of getting into the 2nd floor.",bc_map,"0x44ffff";
-	donpcevent instance_npcname("#Resurrect Monsters1", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("#Resurrect Monsters2", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("#Resurrect Monsters3", instance_id())+"::OnEnable";
-	disablenpc instance_npcname("Kurger#1-2", instance_id());
+	mapannounce instance_mapname("1@orcs"), "Mission: Sneak in and get rid of the 'Enchanted Orcs'. Avoiding battles with other Orcs is the best way of getting into the 2nd floor.",bc_map,"0x44ffff";
+	donpcevent instance_npcname("#Resurrect Monsters1")+"::OnEnable";
+	donpcevent instance_npcname("#Resurrect Monsters2")+"::OnEnable";
+	donpcevent instance_npcname("#Resurrect Monsters3")+"::OnEnable";
+	disablenpc instance_npcname("Kruger#1-2");
 	end;
 
 OnTimer60000:
-	areamonster "1@orcs",137,83,143,89,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs", instance_id())+"::OnMyMobDead";
+	areamonster instance_mapname("1@orcs"),137,83,143,89,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead";
 	stopnpctimer;
 	end;
 
 }
 
-1@orcs,168,125,0	script	B1 Area 1	45,3,3,{
+1@orcs,168,125,0	script	B1 Area 1	WARPNPC,3,3,{
 OnInstanceInit:
-	disablenpc instance_npcname("B1 Area 1", instance_id());
+	disablenpc instance_npcname("B1 Area 1");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("B1 Area 1", instance_id());
-	areamonster "1@orcs",103,105,109,111,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs", instance_id())+"::OnMyMobDead1";
+	enablenpc instance_npcname("B1 Area 1");
+	areamonster instance_mapname("1@orcs"),103,105,109,111,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead1";
 	end;
 
 OnTouch:
-	warp "1@orcs",168,130;
+	warp instance_mapname("1@orcs"),168,130;
 	end;
 
 OnContinue:
-	donpcevent instance_npcname("B1 Area 2", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("B1 Area 2")+"::OnEnable";
 	initnpctimer;
 	end;
 
 OnTimer10300:
-	instance_announce -1, "Kruger's Whisper: The Orcs here used to be my companions. They just lost their will ever since the Orc Shaman started to control them with her magic.",bc_map,"0xff4499";
+	mapannounce instance_mapname("1@orcs"), "Kruger's Whisper: The Orcs here used to be my companions. They just lost their will ever since the Orc Shaman started to control them with her magic.",bc_map,"0xff4499";
 	end;
 
 OnTimer18700:
-	instance_announce -1, "Kruger's Whisper: There's nothing we can do but to defeat the Orc Shaman if we want to save the remaining tribes.",bc_map,"0xff4499";
+	mapannounce instance_mapname("1@orcs"), "Kruger's Whisper: There's nothing we can do but to defeat the Orc Shaman if we want to save the remaining tribes.",bc_map,"0xff4499";
 	stopnpctimer;
 	end;
 }
 
-1@orcs,89,94,0	script	B1 Area 2	45,3,3,{
+1@orcs,89,94,0	script	B1 Area 2	WARPNPC,3,3,{
 OnInstanceInit:
-	disablenpc instance_npcname("B1 Area 2", instance_id());
+	disablenpc instance_npcname("B1 Area 2");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("B1 Area 2", instance_id());
-	areamonster "1@orcs",32,40,38,46,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs", instance_id())+"::OnMyMobDead2";
+	enablenpc instance_npcname("B1 Area 2");
+	areamonster instance_mapname("1@orcs"),32,40,38,46,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead2";
 	end;
 
 OnTouch:
-	warp "1@orcs",85,85;
+	warp instance_mapname("1@orcs"),85,85;
 	end;
 
 OnContinue:
-	donpcevent instance_npcname("B1 Area 3", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("B1 Area 3")+"::OnEnable";
 	initnpctimer;
 	end;
 
 OnTimer30300:
-	instance_announce -1, "Kruger's Whisper: I saw the bodies of our tribe. It seems that the Orc Shaman used those Orcs for her rituals.",bc_map,"0xff4499";
+	mapannounce instance_mapname("1@orcs"), "Kruger's Whisper: I saw the bodies of our tribe. It seems that the Orc Shaman used those Orcs for her rituals.",bc_map,"0xff4499";
 	end;
 
 OnTimer37600:
-	instance_announce -1, "Kruger's Whisper: ... It all has to do with me. I am responsible for this evil.",bc_map,"0xff4499";
+	mapannounce instance_mapname("1@orcs"), "Kruger's Whisper: ... It all has to do with me. I am responsible for this evil.",bc_map,"0xff4499";
 	stopnpctimer;
 	end;
 }
 
-1@orcs,38,105,0	script	B1 Area 3	45,3,3,{
+1@orcs,38,105,0	script	B1 Area 3	WARPNPC,3,3,{
 OnInstanceInit:
-	disablenpc instance_npcname("B1 Area 3", instance_id());
+	disablenpc instance_npcname("B1 Area 3");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("B1 Area 3", instance_id());
-	areamonster "1@orcs",19,177,25,183,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs", instance_id())+"::OnMyMobDead3";
+	enablenpc instance_npcname("B1 Area 3");
+	areamonster instance_mapname("1@orcs"),19,177,25,183,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead3";
 	end;
 
 OnTouch:
-	warp "1@orcs",38,110;
+	warp instance_mapname("1@orcs"),38,110;
 	end;
 
 OnContinue:
-	donpcevent instance_npcname("B1 Area 4", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("B1 Area 4")+"::OnEnable";
 	initnpctimer;
 	end;
 
 OnTimer30300:
-	instance_announce -1, "Please, hang in there!",bc_map,"0xff4499";
+	mapannounce instance_mapname("1@orcs"), "Please, hang in there!",bc_map,"0xff4499";
 	end;
 
 OnTimer32700:
-	instance_announce -1, "We'll get some rest when we get to the 2nd basement after passing through here.",bc_map,"0xff4499";
+	mapannounce instance_mapname("1@orcs"), "We'll get some rest when we get to the 2nd basement after passing through here.",bc_map,"0xff4499";
 	stopnpctimer;
 	end;
 }
 
-1@orcs,21,189,0	script	B1 Area 4	45,3,3,{
+1@orcs,21,189,0	script	B1 Area 4	WARPNPC,3,3,{
 OnInstanceInit:
-	disablenpc instance_npcname("B1 Area 4", instance_id());
+	disablenpc instance_npcname("B1 Area 4");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("B1 Area 4", instance_id());
-	donpcevent instance_npcname("#Resurrect Monsters1", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("#Resurrect Monsters2", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("#Resurrect Monsters3", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("#Resurrect Monsters4", instance_id())+"::OnDisable";
+	enablenpc instance_npcname("B1 Area 4");
+	donpcevent instance_npcname("#Resurrect Monsters1")+"::OnDisable";
+	donpcevent instance_npcname("#Resurrect Monsters2")+"::OnDisable";
+	donpcevent instance_npcname("#Resurrect Monsters3")+"::OnDisable";
+	donpcevent instance_npcname("#Resurrect Monsters4")+"::OnDisable";
 	end;
 
 OnTouch:
-	warp "2@orcs",32,171;
+	warp instance_mapname("2@orcs"),32,171;
 	end;
 }
 
@@ -645,92 +506,62 @@ OnTouch:
 	end;
 
 OnMyMobDead:
-	donpcevent instance_npcname("B1 Area 1", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("B1 Area 1")+"::OnEnable";
 	end;
 
 OnMyMobDead1:
-	donpcevent instance_npcname("B1 Area 1", instance_id())+"::OnContinue";
+	donpcevent instance_npcname("B1 Area 1")+"::OnContinue";
 	end;
 
 OnMyMobDead2:
-	donpcevent instance_npcname("B1 Area 2", instance_id())+"::OnContinue";
+	donpcevent instance_npcname("B1 Area 2")+"::OnContinue";
 	end;
 
 OnMyMobDead3:
-	donpcevent instance_npcname("B1 Area 3", instance_id())+"::OnContinue";
+	donpcevent instance_npcname("B1 Area 3")+"::OnContinue";
 	end;
 }
 
 // Orc's Memory Floor 2
 //============================================================
-2@orcs,36,171,0	script	#2Resurrect Monsters1	844,{
+2@orcs,36,171,0	script	#2Resurrect Monsters1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#2Resurrect Monsters1", instance_id());
+	disablenpc instance_npcname("#2Resurrect Monsters1");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("#2Resurrect Monsters1", instance_id());
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Vengeful Orc",1152,1,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("#2Resurrect Monsters1");
+	monster instance_mapname("2@orcs"),0,0,"Vengeful Orc",1152,30,instance_npcname("#2Resurrect Monsters1")+"::OnMyMobDead";
 	end;
 
 OnDisable:
-	killmonster "2@orcs",instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+	stopnpctimer;
+	killmonster instance_mapname("2@orcs"),instance_npcname("#2Resurrect Monsters1")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@callnum,30;
-	set .@c_mob_num,mobcount("2@orcs",instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead");
-	set .@mob_dead_num,.@callnum - .@c_mob_num;
+	set .@map$, instance_mapname("2@orcs");
+	set .@mob_dead_num, 30 - mobcount(.@map$,instance_npcname("#2Resurrect Monsters1")+"::OnMyMobDead");
 	if (.@mob_dead_num > 0) {
 		set .@mob_ran,rand(1,30);
 		if (.@mob_ran > 29) {
-			monster "2@orcs",0,0,"Vengeful Orc",1152,.@mob_dead_num,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+			monster .@map$,0,0,"Vengeful Orc",1152,.@mob_dead_num,instance_npcname("#2Resurrect Monsters1")+"::OnMyMobDead";
 		}
 		else if ((.@mob_ran > 28) && (.@mob_ran < 30)) {
-			monster "2@orcs",0,0,"High Orc",1213,.@mob_dead_num,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
-			set mob_ran2,rand(1,10);
+			monster .@map$,0,0,"High Orc",1213,.@mob_dead_num,instance_npcname("#2Resurrect Monsters1")+"::OnMyMobDead";
 		}
 		else if ((.@mob_ran > 26) && (.@mob_ran < 29)) {
-			areamonster "2@orcs",157,112,167,122,"High Orc",1213,.@mob_dead_num,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+			areamonster .@map$,157,112,167,122,"High Orc",1213,.@mob_dead_num,instance_npcname("#2Resurrect Monsters1")+"::OnMyMobDead";
 			if (rand(1,10) == 9) {
-				instance_announce -1, "Warning: High Orcs are gathering near area 3.",bc_map,"0xff4444";
+				mapannounce .@map$, "Warning: High Orcs are gathering near area 3.",bc_map,"0xff4444";
 			}
 		}
 		else {
-			areamonster "2@orcs",173,13,183,23,"High Orc",1213,.@mob_dead_num,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+			areamonster .@map$,173,13,183,23,"High Orc",1213,.@mob_dead_num,instance_npcname("#2Resurrect Monsters1")+"::OnMyMobDead";
 			if (rand(1,5) == 3) {
-				instance_announce -1, "Caution: The Forces have started to concentrate at the Shaman's Altar.",bc_map,"0x77ff77";
+				mapannounce .@map$, "Caution: The Forces have started to concentrate at the Shaman's Altar.",bc_map,"0x77ff77";
 			}
 			if (rand(1,70) == 50) {
 				initnpctimer;
@@ -740,234 +571,141 @@ OnMyMobDead:
 	end;
 
 OnTimer10:
-	instance_announce -1, "Voice from somewhere: Foolish... Do you really think the altar would fall like that?",bc_map,"0xff4444";
+	mapannounce instance_mapname("2@orcs"), "Voice from somewhere: Foolish... Do you really think the altar would fall like that?",bc_map,"0xff4444";
 	end;
 
 OnTimer4010:
-	instance_announce -1, "[ Wraiths were summoned by an unknown power ]",bc_map,"0x77ff77";
-	areamonster "2@orcs",167,25,177,35,"Wraith",1475,30,instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead";
+	set .@map$, instance_mapname("2@orcs");
+	mapannounce .@map$, "[ Wraiths were summoned by an unknown power ]",bc_map,"0x77ff77";
+	areamonster .@map$,167,25,177,35,"Wraith",1475,30,instance_npcname("#2Resurrect Monsters1")+"::OnMyMobDead";
 	stopnpctimer;
 	end;
 }
 
-2@orcs,36,171,0	script	#2Resurrect Monsters3	844,{
+2@orcs,36,171,0	script	#2Resurrect Monsters3	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#2Resurrect Monsters3", instance_id());
+	disablenpc instance_npcname("#2Resurrect Monsters3");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("#2Resurrect Monsters3", instance_id());
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Orc Zombie",1153,1,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("#2Resurrect Monsters3");
+	monster instance_mapname("2@orcs"),0,0,"Orc Zombie",1153,15,instance_npcname("#2Resurrect Monsters3")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@callnum,15;
-	set .@c_mob_num,mobcount("2@orcs",instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead");
-	set .@mob_dead_num,.@callnum - .@c_mob_num;
+	set .@map$, instance_mapname("2@orcs");
+	set .@mob_dead_num, 15 - mobcount(.@map$,instance_npcname("#2Resurrect Monsters3")+"::OnMyMobDead");
 	set .@mob_ran,rand(1,30);
 	if (.@mob_ran > 29) {
 		if (.@mob_dead_num > 0) {
-			monster "2@orcs",0,0,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+			monster .@map$,0,0,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#2Resurrect Monsters3")+"::OnMyMobDead";
 		}
 	}
 	else if ((.@mob_ran > 6) && (.@mob_ran < 30)) {
 		if (.@mob_dead_num > 0) {
-			areamonster "2@orcs",168,10,184,26,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+			areamonster .@map$,168,10,184,26,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#2Resurrect Monsters3")+"::OnMyMobDead";
 			if (rand(1,15) == 3) {
-				instance_announce -1, "Warning: Orc Archer teams are gathering near the altar.",bc_map,"0xff4444";
+				mapannounce .@map$, "Warning: Orc Archer teams are gathering near the altar.",bc_map,"0xff4444";
 			}
 		}
 	}
 	else {
 		if (.@mob_dead_num > 0) {
-			areamonster "2@orcs",168,21,184,21,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+			areamonster .@map$,168,21,184,21,"Orc Archer",1189,.@mob_dead_num,instance_npcname("#2Resurrect Monsters3")+"::OnMyMobDead";
 		}
 	}
 	end;
 
 OnDisable:
-	killmonster "2@orcs",instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead";
+	killmonster instance_mapname("2@orcs"),instance_npcname("#2Resurrect Monsters3")+"::OnMyMobDead";
 	end;
 }
 
-2@orcs,180,30,0	script	#2Resurrect Monsters4	844,{
+2@orcs,180,30,0	script	#2Resurrect Monsters4	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	enablenpc instance_npcname("#2Resurrect Monsters4", instance_id());
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("#2Resurrect Monsters4");
+	monster instance_mapname("2@orcs"),0,0,"Anopheles",1627,10,instance_npcname("#2Resurrect Monsters4")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	set .@callnum,10;
-	set .@c_mob_num,mobcount("2@orcs",instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead");
-	set .@mob_dead_num,.@callnum - .@c_mob_num;
+	set .@map$, instance_mapname("2@orcs");
+	set .@mob_dead_num, 10 - mobcount(.@map$,instance_npcname("#2Resurrect Monsters4")+"::OnMyMobDead");
 	if (.@mob_dead_num > 0) {
-		monster "2@orcs",0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4", instance_id())+"::OnMyMobDead";
+		monster .@map$,0,0,"Anopheles",1627,1,instance_npcname("#2Resurrect Monsters4")+"::OnMyMobDead";
 	}
 	end;
 }
 
-2@orcs,35,169,4	script	Kruger#2-1	433,{
-	donpcevent instance_npcname("Kruger#2-2", instance_id())+"::OnEnable";
+2@orcs,35,169,4	script	Kruger#2-1	4_ORCWARRIOR,{
+	donpcevent instance_npcname("Kruger#2-2")+"::OnEnable";
 	end;
 }
 
-2@orcs,35,169,4	script	Kruger#2-2	433,{
+2@orcs,35,169,4	script	Kruger#2-2	4_ORCWARRIOR,{
+	end;
+
+OnInstanceInit:
+	disablenpc instance_npcname("Kruger#2-2");
 	end;
 
 OnEnable:
-	disablenpc instance_npcname("Kruger#2-1", instance_id());
-	enablenpc instance_npcname("Kruger#2-2", instance_id());
+	disablenpc instance_npcname("Kruger#2-1");
+	enablenpc instance_npcname("Kruger#2-2");
 	initnpctimer;
 	end;
 
 OnTimer10:
-	instance_announce -1, "Kruger's Whisper: I'll tell you how to get to the Shaman's altar.",bc_map,"0xffff00";
+	mapannounce instance_mapname("2@orcs"), "Kruger's Whisper: I'll tell you how to get to the Shaman's altar.",bc_map,"0xffff00";
 	end;
 
 OnTimer3510:
-	instance_announce -1, "Kruger's Whisper: Do you see the braziers that light the path? Unseal the next zone by strengthening their flames.",bc_map,"0xffff00";
+	mapannounce instance_mapname("2@orcs"), "Kruger's Whisper: Do you see the braziers that light the path? Unseal the next zone by strengthening their flames.",bc_map,"0xffff00";
 	end;
 
 OnTimer10710:
-	instance_announce -1, "Kruger's Whisper: Of course those monsters won't let you touch the braziers that easily.",bc_map,"0xffff00";
+	mapannounce instance_mapname("2@orcs"), "Kruger's Whisper: Of course those monsters won't let you touch the braziers that easily.",bc_map,"0xffff00";
 	end;
 
 OnTimer16310:
-	instance_announce -1, "Kruger's Whisper: But still, try keep the battles not too noticable so the Shaman won't guard the altar with her army squad.",bc_map,"0xffff00";
+	mapannounce instance_mapname("2@orcs"), "Kruger's Whisper: But still, try keep the battles not too noticable so the Shaman won't guard the altar with her army squad.",bc_map,"0xffff00";
 	end;
 
 OnTimer21910:
-	instance_announce -1, "Kruger's Whisper: Only the Party Leader can strengthen the flames, so protect your leader.",bc_map,"0xffff00";
+	mapannounce instance_mapname("2@orcs"), "Kruger's Whisper: Only the Party Leader can strengthen the flames, so protect your leader.",bc_map,"0xffff00";
 	end;
 
 OnTimer23910:
-	instance_announce -1, "Mission: Unseal the zone by lighting the braziers. They can only be lit in a certain order, so be careful.",bc_map,"0x4444ff";
-	donpcevent instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("Torch#1-1", instance_id())+"::OnEnable";
-	disablenpc instance_npcname("Kruger#2-2", instance_id());
-	end;
-}
-
-2@orcs,26,164,0	script	Torch#1-1	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("Torch#1-2", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#1-1", instance_id());
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Torch#1-1", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("Torch#1-1", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
-	end;
-}
-
-2@orcs,55,155,0	script	Torch#1-2	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("Torch#1-3", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#1-2", instance_id());
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Torch#1-2", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("Torch#1-2", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
-	end;
-}
-
-2@orcs,108,146,0	script	Torch#1-3	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("Torch#1-4", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#1-3", instance_id());
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Torch#1-3", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("Torch#1-3", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
+	mapannounce instance_mapname("2@orcs"), "Mission: Unseal the zone by lighting the braziers. They can only be lit in a certain order, so be careful.",bc_map,"0x4444ff";
+	donpcevent instance_npcname("#2Resurrect Monsters1")+"::OnEnable";
+	donpcevent instance_npcname("#2Resurrect Monsters3")+"::OnEnable";
+	donpcevent instance_npcname("Torch#1-1")+"::OnEnable";
+	disablenpc instance_npcname("Kruger#2-2");
 	end;
 }
 
-2@orcs,98,171,0	script	Torch#1-4	844,{
+2@orcs,26,164,0	script	Torch#1-1	CLEAR_NPC,{
 	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
 	progressbar "ffff00",5;
-	donpcevent instance_npcname("#Warp2-1", instance_id())+"::OnEnable";
+	setarray .@id[0], atoi(charat(strnpcinfo(2),0)), atoi(charat(strnpcinfo(2),2));
+	if (.@id[1] == 4)
+		donpcevent instance_npcname("#Warp2-"+.@id[0])+"::OnEnable";
+	else
+		donpcevent instance_npcname("Torch#"+.@id[0]+"-"+(.@id[1]+1))+"::OnEnable";
 	initnpctimer;
-	disablenpc instance_npcname("Torch#1-4", instance_id());
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("Torch#1-4", instance_id());
+	if (strnpcinfo(0) != "Torch#2-1" && strnpcinfo(0) != "Torch#3-1")
+		disablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("Torch#1-4", instance_id());
+	enablenpc instance_npcname(strnpcinfo(0));
 	end;
 
 OnTimer100:
@@ -979,332 +717,158 @@ OnTimer2000:
 	stopnpctimer;
 	end;
 }
+2@orcs,55,155,0	duplicate(Torch#1-1)	Torch#1-2	CLEAR_NPC
+2@orcs,108,146,0	duplicate(Torch#1-1)	Torch#1-3	CLEAR_NPC
+2@orcs,98,171,0	duplicate(Torch#1-1)	Torch#1-4	CLEAR_NPC
 
-2@orcs,48,100,0	script	#Warp2-1	45,3,3,{
+2@orcs,48,100,0	script	#Warp2-1	WARPNPC,3,3,{
 OnInstanceInit:
-	disablenpc instance_npcname("#Warp2-1", instance_id());
+	disablenpc instance_npcname("#Warp2-1");
 	end;
 
 OnEnable:
-	monster "2@orcs",109,156,"Safeguard Chief",1981,1,instance_npcname("#Mobs Control", instance_id())+"::OnMyMobDead1";
-	instance_announce -1, "The Chief Orc of Safeguards: Oh!! Looks like I have company. Defeat me if you can!!",bc_map,"0xff8888";
+	set .@map$, instance_mapname("2@orcs");
+	monster .@map$,109,156,"Safeguard Chief",1981,1,instance_npcname("#Mobs Control")+"::OnMyMobDead1";
+	mapannounce .@map$, "The Chief Orc of Safeguards: Oh!! Looks like I have company. Defeat me if you can!!",bc_map,"0xff8888";
 	end;
 
 OnContinue:
-	enablenpc instance_npcname("#Warp2-1", instance_id());
+	enablenpc instance_npcname("#Warp2-1");
 	initnpctimer;
 	end;
 
 OnTimer10000:
-	areamonster "2@orcs",28,158,40,170,"Safeguard Chief",1981,1,instance_npcname("#Mobs Control", instance_id())+"::OnMyMobDead1";
+	areamonster instance_mapname("2@orcs"),28,158,40,170,"Safeguard Chief",1981,1,instance_npcname("#Mobs Control")+"::OnMyMobDead1";
 	stopnpctimer;
 	end;
 
 OnTouch:
-	warp "2@orcs",47,93;
-	end;
-}
-
-2@orcs,35,92,0	script	Torch#2-1	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("Torch#2-2", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#2-1", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
-	end;
-}
-
-2@orcs,32,70,0	script	Torch#2-2	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("Torch#2-3", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#2-2", instance_id());
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Torch#2-2", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("Torch#2-2", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
-	end;
-}
-
-2@orcs,70,31,0	script	Torch#2-3	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("Torch#2-4", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#2-3", instance_id());
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Torch#2-3", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("Torch#2-3", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
+	warp instance_mapname("2@orcs"),47,93;
 	end;
 }
 
-2@orcs,84,51,0	script	Torch#2-4	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("#Warp2-2", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#2-4", instance_id());
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Torch#2-4", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("Torch#2-4", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
-	end;
-}
+2@orcs,35,92,0	duplicate(Torch#1-1)	Torch#2-1	CLEAR_NPC
+2@orcs,32,70,0	duplicate(Torch#1-1)	Torch#2-2	CLEAR_NPC
+2@orcs,70,31,0	duplicate(Torch#1-1)	Torch#2-3	CLEAR_NPC
+2@orcs,84,51,0	duplicate(Torch#1-1)	Torch#2-4	CLEAR_NPC
 
-2@orcs,101,55,0	script	#Warp2-2	45,3,3,{
+2@orcs,101,55,0	script	#Warp2-2	WARPNPC,3,3,{
 OnInstanceInit:
-	disablenpc instance_npcname("#Warp2-2", instance_id());
+	disablenpc instance_npcname("#Warp2-2");
 	end;
 
 OnEnable:
-	monster "2@orcs",67,64,"Orc Sniper",1982,1,instance_npcname("#Mobs Control", instance_id())+"::OnMyMobDead2";
-	instance_announce -1, "Orc Sniper: Hah! Pretty impressive that you made it this far, but your foolish little trip ends here...",bc_map,"0xff8888";
+	set .@map$, instance_mapname("2@orcs");
+	monster .@map$,67,64,"Orc Sniper",1982,1,instance_npcname("#Mobs Control")+"::OnMyMobDead2";
+	mapannounce .@map$, "Orc Sniper: Hah! Pretty impressive that you made it this far, but your foolish little trip ends here...",bc_map,"0xff8888";
 	end;
 
 OnContinue:
-	enablenpc instance_npcname("#Warp2-2", instance_id());
+	enablenpc instance_npcname("#Warp2-2");
 	initnpctimer;
 	end;
 
 OnTimer10000:
-	areamonster "2@orcs",40,91,52,103,"Orc Sniper",1982,1,instance_npcname("#Mobs Control", instance_id())+"::OnMyMobDead2";
+	areamonster instance_mapname("2@orcs"),40,91,52,103,"Orc Sniper",1982,1,instance_npcname("#Mobs Control")+"::OnMyMobDead2";
 	stopnpctimer;
 	end;
 
 OnTouch:
-	warp "2@orcs",107,55;
-	end;
-}
-
-2@orcs,142,145,0	script	Torch#3-1	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("Torch#3-2", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#3-1", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
-	end;
-}
-
-2@orcs,162,134,0	script	Torch#3-2	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("Torch#3-3", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#3-2", instance_id());
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Torch#3-2", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("Torch#3-2", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
-	end;
-}
-
-2@orcs,144,117,0	script	Torch#3-3	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("Torch#3-4", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#3-3", instance_id());
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Torch#3-3", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("Torch#3-3", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
+	warp instance_mapname("2@orcs"),107,55;
 	end;
 }
 
-2@orcs,136,98,0	script	Torch#3-4	844,{
-	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
-	progressbar "ffff00",5;
-	donpcevent instance_npcname("#Warp2-3", instance_id())+"::OnEnable";
-	initnpctimer;
-	disablenpc instance_npcname("Torch#3-4", instance_id());
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Torch#3-4", instance_id());
-	end;
-
-OnEnable:
-	enablenpc instance_npcname("Torch#3-4", instance_id());
-	end;
-
-OnTimer100:
-	specialeffect EF_FIREPILLAR;
-	end;
-
-OnTimer2000:
-	specialeffect EF_FIREPILLARBOMB;
-	stopnpctimer;
-	end;
-}
+2@orcs,142,145,0	duplicate(Torch#1-1)	Torch#3-1	CLEAR_NPC
+2@orcs,162,134,0	duplicate(Torch#1-1)	Torch#3-2	CLEAR_NPC
+2@orcs,144,117,0	duplicate(Torch#1-1)	Torch#3-3	CLEAR_NPC
+2@orcs,136,98,0	duplicate(Torch#1-1)	Torch#3-4	CLEAR_NPC
 
-2@orcs,167,104,0	script	#Warp2-3	45,3,3,{
+2@orcs,167,104,0	script	#Warp2-3	WARPNPC,3,3,{
 OnInstanceInit:
-	disablenpc instance_npcname("#Warp2-3", instance_id());
+	disablenpc instance_npcname("#Warp2-3");
 	end;
 
 OnEnable:
-	monster "2@orcs",152,147,"Depraved Orc Spirit",1983,1,instance_npcname("#Mobs Control", instance_id())+"::OnMyMobDead3";
-	instance_announce -1, "Depraved Orc Spirit: I smell flesh! Hungry! Wanna try some human meat!!",bc_map,"0xff8888";
+	set .@map$, instance_mapname("2@orcs");
+	monster .@map$,152,147,"Depraved Orc Spirit",1983,1,instance_npcname("#Mobs Control")+"::OnMyMobDead3";
+	mapannounce .@map$, "Depraved Orc Spirit: I smell flesh! Hungry! Wanna try some human meat!!",bc_map,"0xff8888";
 	end;
 
 OnContinue:
-	//areamonster "2@orcs",117,61,129,73,"Depraved Orc Spirit",1983,1,instance_npcname("#Mobs Control", instance_id())+"::OnMyMobDead3";
-	donpcevent instance_npcname("#Boss Control", instance_id())+"::OnEnable";
-	enablenpc instance_npcname("#Warp2-3", instance_id());
+	areamonster instance_mapname("2@orcs"),117,61,129,73,"Depraved Orc Spirit",1983,1;
+	donpcevent instance_npcname("#Boss Control")+"::OnEnable";
+	enablenpc instance_npcname("#Warp2-3");
 	initnpctimer;
 	end;
 
 OnTimer10:
-	instance_announce -1, "Shaman Cargalache: Hahaha!! So, you finally made it here. The assassin you sent was just terrible. That stupid Orc is getting cold under my feet.",bc_map,"0xffff00";
+	mapannounce instance_mapname("2@orcs"), "Shaman Cargalache: Hahaha!! So, you finally made it here. The assassin you sent was just terrible. That stupid Orc is getting cold under my feet.",bc_map,"0xffff00";
 	end;
 
 OnTimer6810:
-	instance_announce -1, "Shaman Cargalache: My loyal slave, go get those intruders!",bc_map,"0xffff00";
+	mapannounce instance_mapname("2@orcs"), "Shaman Cargalache: My loyal slave, go get those intruders!",bc_map,"0xffff00";
 	end;
 
 OnTimer10310:
-	instance_announce -1, "Depraved Orc Hero: Whatever you say, my lord.",bc_map,"0xff7777";
+	mapannounce instance_mapname("2@orcs"), "Depraved Orc Hero: Whatever you say, my lord.",bc_map,"0xff7777";
 	end;
 
 OnTimer13110:
-	instance_announce -1, "Caution: You have been discovered by Shaman Cargalache. Kruger's plan to assassinate the Shaman has failed. You must defeat Cargalache and find traces of Kruger.",bc_map,"0x8888ff";
+	mapannounce instance_mapname("2@orcs"), "Caution: You have been discovered by Shaman Cargalache. Kruger's plan to assassinate the Shaman has failed. You must defeat Cargalache and find traces of Kruger.",bc_map,"0x8888ff";
 	stopnpctimer;
 	end;
 
 OnTouch:
-	warp "2@orcs",167,95;
+	warp instance_mapname("2@orcs"),167,95;
 	end;
 }
 
-2@orcs,36,171,0	script	#Boss Control	844,{
+2@orcs,36,171,0	script	#Boss Control	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("#Boss Control", instance_id());
+	disablenpc instance_npcname("#Boss Control");
 	end;
 
 OnEnable:
-	monster "2@orcs",185,8,"Shaman Cargalache",1984,1,instance_npcname("#Boss Control", instance_id())+"::OnMyMobDead";
-	monster "2@orcs",179,15,"Depraved Orc Hero",1087,1;
-	enablenpc instance_npcname("#Boss Control", instance_id());
+	set .@map$, instance_mapname("2@orcs");
+	monster .@map$,185,8,"Shaman Cargalache",1984,1,instance_npcname("#Boss Control")+"::OnMyMobDead";
+	monster .@map$,179,15,"Depraved Orc Hero",1087,1;
+	enablenpc instance_npcname("#Boss Control");
 	end;
 
 OnMyMobDead:
-	donpcevent instance_npcname("Kruger#", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("Kruger#")+"::OnEnable";
+	set .@map$, instance_mapname("2@orcs");
 	set .@mob_ran,rand(1,5);
 	if (.@mob_ran == 1) {
-		instance_announce -1, "Shaman Cargalache: How... How could this be... How could someone like you...!!",bc_map,"0xffff00";
+		mapannounce .@map$, "Shaman Cargalache: How... How could this be... How could someone like you...!!",bc_map,"0xffff00";
 	}
 	else if (.@mob_ran == 2) {
-		instance_announce -1, "Shaman Cargalache: How is it that I've been overpowered by mere humans!",bc_map,"0xffff00";
+		mapannounce .@map$, "Shaman Cargalache: How is it that I've been overpowered by mere humans!",bc_map,"0xffff00";
 	}
 	else if (.@mob_ran == 3) {
-		instance_announce -1, "Shaman Cargalache: This... This can't be the end...",bc_map,"0xffff00";
+		mapannounce .@map$, "Shaman Cargalache: This... This can't be the end...",bc_map,"0xffff00";
 	}
 	else if (.@mob_ran == 4) {
-		instance_announce -1, "Shaman Cargalache: I... Can't die... Yet...!",bc_map,"0xffff00";
+		mapannounce .@map$, "Shaman Cargalache: I... Can't die... Yet...!",bc_map,"0xffff00";
 	}
 	else {
-		instance_announce -1, "Shaman Cargalache: Defeated by these fools... It can't be happening...!",bc_map,"0xffff00";
+		mapannounce .@map$, "Shaman Cargalache: Defeated by these fools... It can't be happening...!",bc_map,"0xffff00";
 	}
-	donpcevent instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnDisable";
-	donpcevent instance_npcname("#Warp Outside Orc Dun", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("#2Resurrect Monsters1")+"::OnDisable";
+	donpcevent instance_npcname("#2Resurrect Monsters3")+"::OnDisable";
+	donpcevent instance_npcname("#Warp Outside Orc Dun")+"::OnEnable";
 	end;
 }
 
-2@orcs,182,8,0	script	#Warp Outside Orc Dun	45,3,3,{
+2@orcs,182,8,0	script	#Warp Outside Orc Dun	WARPNPC,3,3,{
 OnInstanceInit:
-	disablenpc instance_npcname("#Warp Outside Orc Dun", instance_id());
+	disablenpc instance_npcname("#Warp Outside Orc Dun");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("#Warp Outside Orc Dun", instance_id());
+	enablenpc instance_npcname("#Warp Outside Orc Dun");
 	end;
 
 OnTouch:
@@ -1312,7 +876,7 @@ OnTouch:
 	end;
 }
 
-2@orcs,172,13,0	script	Kruger#	434,{
+2@orcs,172,13,0	script	Kruger#	4_ORCWARRIOR2,{
 	if (yong_odun < 2) {
 		mes "[Kruger]";
 		mes "*Coughing*";
@@ -1345,26 +909,26 @@ OnTouch:
 	}
 
 OnInstanceInit:
-	disablenpc instance_npcname("Kruger#", instance_id());
+	disablenpc instance_npcname("Kruger#");
 	end;
 
 OnEnable:
-	enablenpc instance_npcname("Kruger#", instance_id());
+	enablenpc instance_npcname("Kruger#");
 	end;
 }
 
-2@orcs,36,171,0	script	#Mobs Control	844,{
+2@orcs,36,171,0	script	#Mobs Control	CLEAR_NPC,{
 	end;
 
 OnMyMobDead1:
-	donpcevent instance_npcname("#Warp2-1", instance_id())+"::OnContinue";
+	donpcevent instance_npcname("#Warp2-1")+"::OnContinue";
 	end;
 
 OnMyMobDead2:
-	donpcevent instance_npcname("#Warp2-2", instance_id())+"::OnContinue";
+	donpcevent instance_npcname("#Warp2-2")+"::OnContinue";
 	end;
 
 OnMyMobDead3:
-	donpcevent instance_npcname("#Warp2-3", instance_id())+"::OnContinue";
+	donpcevent instance_npcname("#Warp2-3")+"::OnContinue";
 	end;
 }
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index b893a1816..215ceffeb 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.2
+//= 2.3
 //===== Description: =========================================
 //= [Official Conversion]
 //= Seal away the Great Demon Baphomet.
@@ -19,16 +19,21 @@
 //=     Removed checking quest 3045, unofficial check.
 //= 1.7 Fixed a checkquest condition never setting quest. [L0ne_W0lf]
 //= 1.8 Added 'instance_check_party' command to the script for proper checking if
-//=		the invoking party meets the requirements to join the Memorial Dungeon.
+//=     the invoking party meets the requirements to join the Memorial Dungeon.
 //= 1.9 Fixed broken else/if chaining. [Joseph]
 //= 2.0 Some optimization. [Euphy]
 //= 2.1 Fixed quest being removed before the 12 hours cool down. [Joseph]
 //= 2.2 Removed extra setquest (quest id:3040).	[Joseph]
+//= 2.3 Instance system rewrite. [Euphy]
+//============================================================
+
+1@cata	mapflag	src4instance
+2@cata	mapflag	src4instance
 //============================================================
 
 // Sealed Catacomb Entrance
 //============================================================
-monk_test,309,146,3	script	Friar Patrick#edq	412,{
+monk_test,309,146,3	script	Friar Patrick#edq	4_M_OLDFRIAR,{
 	cutin "ins_cata_pri_n",2;
 	mes "[Friar Patrick]";
 	mes "The peace of this world cannot last forever... The hands of Evil are reaching into the world again...";
@@ -92,7 +97,7 @@ monk_test,309,146,3	script	Friar Patrick#edq	412,{
 		}
 		break;
 	case 2:
-		if (BaseLevel > 74) {
+		if (BaseLevel >= 75) {
 
 			set .@party_id,getcharid(1);
 
@@ -105,22 +110,16 @@ monk_test,309,146,3	script	Friar Patrick#edq	412,{
 			// Two hour play limit
 			//set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
 
-			if(!instance_check_party(.@party_id,2,75)){
-				mes "I'm sorry but your Party does not meet the requirements to join the Memorial Dungeon.";
-				close;
-			}
-
 			if (.@ins_bapho_check == -1) {
-				if (getpartyleader(.@party_id,2) == getcharid(0)) {
-					set .@instance, instance_create("Sealed Catacombs", .@party_id);
+				if (getpartyleader(.@party_id,2) == getcharid(0) && instance_check_party(.@party_id,2,75)) {
+					mes "[Friar Patrick]";
+					mes "Party name is "+getpartyname(.@party_id)+"...";
+					mes "Name of the leader is "+strcharinfo(0)+"...";
+					set .@instance, instance_create("Sealed Catacomb",.@party_id);
 					if (.@instance < 0) {
-						mes "[Friar Patrick]";
-						mes "Party name is "+getpartyname(.@party_id)+"...";
-						mes "Name of the leader is "+.@partymembername$[0]+"...";
 						mes "Umm... But it seems that there is a problem here... I'll check quickly. Please wait.";
 					}
 					else {
-
 						for( set .@i, 1; .@i <= 2; set .@i, .@i + 1 ) {
 							if( instance_attachmap("" + .@i + "@cata", .@instance) == "" )
 								break;
@@ -130,47 +129,9 @@ monk_test,309,146,3	script	Friar Patrick#edq	412,{
 							close;
 						}
 
-						instance_attach(.@instance);
 						instance_set_timeout 7200,300,.@instance;
 						instance_init(.@instance);
-
-						// First Floor
-						disablenpc instance_npcname("Ancient Hero's Soul#1F", instance_id());
-						disablenpc instance_npcname("ins_bapho_to_2f", instance_id());
-
-						for( set .@i, 1; .@i < 13; set .@i, .@i + 1 ) {
-							disablenpc instance_npcname("Gravestone#1F_"+.@i+"T", instance_id());
-							disablenpc instance_npcname("Gravestone#1F_"+.@i+"F", instance_id());
-						}
-						for( set .@i, 1; .@i <= 12; set .@i, .@i + 1 ) {
-							disablenpc instance_npcname("Bobbing Torch#"+.@i, instance_id());
-						}
-
-						// Second Floor
-						disablenpc instance_npcname("ins_baphomet_1f_timer", instance_id());
-						disablenpc instance_npcname("ins_2f_enter_broad", instance_id());
-						disablenpc instance_npcname("Magical Seal#0", instance_id());
-						disablenpc instance_npcname("Magical Seal#2", instance_id());
-						disablenpc instance_npcname("Magical Seal#4", instance_id());
-						disablenpc instance_npcname("Magical Seal#8", instance_id());
-						disablenpc instance_npcname("Magical Seal#10", instance_id());
-						disablenpc instance_npcname("Ancient Hero's Soul#2F", instance_id());
-						disablenpc instance_npcname("control_baphomet", instance_id());
-						disablenpc instance_npcname("ins_2f_hero_broad2", instance_id());
-						disablenpc instance_npcname("2f_callmon_pattern_c", instance_id());
-						disablenpc instance_npcname("2f_callmon_pattern", instance_id());
-						disablenpc instance_npcname("ins_2f_hero_pattern_c", instance_id());
-						disablenpc instance_npcname("ins_2f_hero_pattern", instance_id());
-
-						// Pick proper grave
-						donpcevent instance_npcname("ins_baphomet_lotto", instance_id())+"::OnEnable";
-
-						// Spawn monsters.
-						donpcevent instance_npcname("ins_1f_spawn_mobs", instance_id())+"::OnEnable";
-
-						mes "[Friar Patrick]";
-						mes "Party name is "+getpartyname(.@party_id)+"...";
-						mes "Name of the leader is "+.@partymembername$[0]+"...";
+						
 						mes "Okay... I'll adjust the shrine's seal so that you and your group can enter.";
 						next;
 						mes "[Friar Patrick]";
@@ -208,10 +169,9 @@ monk_test,309,146,3	script	Friar Patrick#edq	412,{
 				mes "[Friar Patrick]";
 				mes "Haaaaaaap... Hocus Pocus Wingardium Abracadabra!!!!!";
 				next;
-				if (checkquest(3040)>=0) erasequest 3040;
+				erasequest 3040;
 				if (checkquest(3041)>=0) erasequest 3041;
 				if (checkquest(3045)>=0) erasequest 3045;
-				set party_instance_id4,0;
 				mes "[Friar Patrick]";
 				mes "Huu... It's over. Now that I've released Baphomet's Curse, you can enter again.";
 			}
@@ -256,62 +216,51 @@ monk_test,309,146,3	script	Friar Patrick#edq	412,{
 	end;
 }
 
-monk_test,306,151,3	script	Grave of Baphomet#edq	111,{
+monk_test,306,151,3	script	Grave of Baphomet#edq	HIDDEN_NPC,{
 	if (countitem(6002)) delitem 6002,countitem(6002); //Token_Of_Apostle
 	mes "This gravestone has a carving of a wicked devil with large horns. It arouses an ominous feeling.";
 	next;
-	switch(select("Touch the stone.:Step back.")) {
-	case 1:
-		set .@party_id,getcharid(1);
-		
-		// 12 hour cooldown
-		set .@ins_bapho_check,checkquest(3040,PLAYTIME);
-		// Two hour play limit
-		//set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
-		
-		if(!instance_check_party(.@party_id,2,75)){
-			mes "I'm sorry but your Party does not meet the requirements to join the Memorial Dungeon.";
+	if(select("Touch the stone.:Step back.") == 2)
+		close;
+
+	// 12 hour cooldown
+	set .@ins_bapho_check,checkquest(3040,PLAYTIME);
+	// Two hour play limit
+	//set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
+
+	if (.@ins_bapho_check == -1) {
+		if (has_instance("1@cata") == "") {
+			mes "It's cold to the touch. It doesn't respond.";
 			close;
+		} else {
+			mapannounce "monk_test","[" + strcharinfo(0) + "] member of the [" + getpartyname(.@party_id) + "] party has entered the Sealed Shrine.",bc_map,"0x00ff99";
+			setquest 3040;
+			warp "1@cata",100,224;
+			end;
 		}
-		if (.@ins_bapho_check == -1) {
-			if (has_instance("1@cata") == "") {
-				mes "It's cold to the touch. It doesn't respond.";
-			} else if((party_instance_id4 != 0) && (party_instance_id4 != getcharid(1))) {
-				mes "It seems you have entered this shrine recently... You cannot reenter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
-			} else {
-				mapannounce "monk_test","[" + strcharinfo(0) + "] member of the [" + getpartyname(.@party_id) + "] party has entered the Sealed Shrine.",bc_map,"0x00ff99";
-				if (checkquest(3040) == -1) setquest 3040;
-				set party_instance_id4,getcharid(1);
-				warp "1@cata",100,224;
-				end;
-			}
-		} else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) {
-			mes "[Friar Patrick]";
-			mes "It seems you have entered this shrine recently... You cannot reenter because the curse of Baphomet still remains.";
-			mes "The curse of Baphomet disappears after a certain amount of time after you entered.";
-		} else if (.@ins_bapho_check == 2) {
-			mes "[Friar Patrick]";
-			mes "Umm... It seems the curse of Baphomet weakened. I'll clear the bad curse.";
-			next;
-			mes "[Friar Patrick]";
-			mes "Haaaaaaap... Wingardium Leviosa Expecto Patronum !!!!!";
-			specialeffect2 EF_HOLYHIT;
-			if (checkquest(3040)>=0) erasequest 3040;
-			if (checkquest(3041)>=0) erasequest 3041;
-			if (checkquest(3045)>=0) erasequest 3045;
-			set party_instance_id4,0;
-			next;
-			mes "[Friar Patrick]";
-			mes "Huu... It's over. Now I released all of the curses on you. You can enter again.";
-		}
-		break;
-	case 2:
-		break;
+	} else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) {
+		mes "[Friar Patrick]";
+		mes "It seems you have entered this shrine recently... You cannot reenter because the curse of Baphomet still remains.";
+		mes "The curse of Baphomet disappears after a certain amount of time after you entered.";
+		close;
+	} else if (.@ins_bapho_check == 2) {
+		mes "[Friar Patrick]";
+		mes "Umm... It seems the curse of Baphomet weakened. I'll clear the bad curse.";
+		next;
+		mes "[Friar Patrick]";
+		mes "Haaaaaaap... Wingardium Leviosa Expecto Patronum !!!!!";
+		specialeffect2 EF_HOLYHIT;
+		erasequest 3040;
+		if (checkquest(3041)>=0) erasequest 3041;
+		if (checkquest(3045)>=0) erasequest 3045;
+		next;
+		mes "[Friar Patrick]";
+		mes "Huu... It's over. Now I released all of the curses on you. You can enter again.";
+		close;
 	}
-	close;
 }
 
-prt_monk,261,91,3	script	Rust Blackhand#edq	826,{
+prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 	set .@new_maje,checkquest(3043);
 	mes "[Rust Blackhand]";
 	mes "Who are you? What do you want me for?";
@@ -340,7 +289,7 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	826,{
 			delitem 2256,1; //Magestic_Goat
 			delitem 7799,30; //Dark_Crystal
 			delitem 7798,50; //Dark_Debris
-			set zeny,zeny-990000;
+			Zeny -= 990000;
 			completequest 3043;
 			getitem 5374,1; //L_Magestic_Goat
 			mes "[Rust Blackhand]";
@@ -481,250 +430,52 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	826,{
 // Sealed Shrine Interior
 //============================================================
 1@cata,1,2,0	script	ins_baphomet_lotto	-1,{
-OnEnable:
-	switch(rand(1,13)) {
-	case 1:
-		enablenpc instance_npcname("Gravestone#1F_1T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 2:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 3:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 4:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 5:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 6:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 7:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 8:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 9:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 10:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 11:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 12:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12T", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13F", instance_id());
-		end;
-	case 13:
-		enablenpc instance_npcname("Gravestone#1F_1F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_2F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_3F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_4F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_5F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_6F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_7F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_8F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_9F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_10F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_11F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_12F", instance_id());
-		enablenpc instance_npcname("Gravestone#1F_13T", instance_id());
-		end;
+OnInstanceInit:
+	// Pick one "true" Gravestone and 12 "false" Gravestones.
+	set .@true, rand(1,13);
+	for(set .@i,1; .@i<13; set .@i,.@i+1) {
+		disablenpc instance_npcname("Gravestone#1F_1"+((.@i == .@true)?"F":"T"));
 	}
+	disablenpc instance_npcname("ins_baphomet_lotto");
 	end;
 }
 
 1@cata,3,2,0	script	ins_baphomet_lotto2	-1,{
 OnEnable:
-	enablenpc instance_npcname("Bobbing Torch#1", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#2", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#3", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#4", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#5", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#6", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#7", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#8", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#9", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#10", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#11", instance_id());
-	enablenpc instance_npcname("Bobbing Torch#12", instance_id());
+	for(set .@i,1; .@i<12; set .@i,.@i+1)
+		enablenpc instance_npcname("Bobbing Torch#"+.@i);
 	end;
 }
 
 1@cata,4,2,0	script	ins_baphomet_lotto3	-1,{
 OnEnable:
-	monster "1@cata",0,0,"Apostle of Baphomet",1869,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1291,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1869,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1291,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1869,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1291,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1869,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1132,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1117,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1132,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1117,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1132,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1291,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1117,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
-	monster "1@cata",0,0,"Apostle of Baphomet",1869,1,instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
+	set .@label$, instance_npcname("ins_baphomet_lotto3")+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@cata");
+	monster .@map$,0,0,"Apostle of Baphomet",1869,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1291,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1869,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1291,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1869,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1291,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1869,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1132,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1117,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1132,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1117,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1132,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1291,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1117,1,.@label$;
+	monster .@map$,0,0,"Apostle of Baphomet",1869,1,.@label$;
 	end;
 
 OnDisable:
-	killmonster "1@cata",instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead";
+	killmonster instance_mapname("1@cata"),instance_npcname("ins_baphomet_lotto3")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	if (mobcount("1@cata",instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnMyMobDead") < 1) {
-		instance_announce -1, "All apostles of Baphomet are dead!",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@cata");
+	if (mobcount(.@map$,instance_npcname("ins_baphomet_lotto3")+"::OnMyMobDead") < 1) {
+		mapannounce .@map$, "All apostles of Baphomet are dead!",bc_map,"0x00ff99";
 	}
 	getitem 6002,1; //Token_Of_Apostle
 	end;
@@ -732,7 +483,7 @@ OnMyMobDead:
 
 // Soul of hero near the north grave
 //============================================================
-1@cata,141,221,0	script	Gravestone#	844,3,3,{
+1@cata,141,221,0	script	Gravestone#	CLEAR_NPC,3,3,{
 	set .@party_id,getcharid(1);
 	if ('ins_baphomet == 0) {
 		mes "The gravestone is trembling...";
@@ -800,12 +551,12 @@ OnMyMobDead:
 			mes "Yes... This is... My pendant...";
 			next;
 			delitem 6003,1; //Soul_Pendant
-			enablenpc instance_npcname("Ancient Hero's Soul#1F", instance_id());
-			disablenpc instance_npcname("Gravestone#", instance_id());
+			enablenpc instance_npcname("Ancient Hero's Soul#1F");
+			disablenpc instance_npcname("Gravestone#");
 			mes "[Voice of the Gravestone]";
 			mes "Now I can substantialize my soul. I'll wait for you in front of the altar of fire located at the center of this grave. Let's meet there.";
 			next;
-			instance_announce -1, "Ancient Hero's Soul : I'll wait for you in front of the altar of fire located at the center",bc_map,"0xFFFF00";
+			mapannounce instance_mapname("1@cata"), "Ancient Hero's Soul : I'll wait for you in front of the altar of fire located at the center",bc_map,"0xFFFF00";
 			mes "I can feel the voice becoming faint.";
 			close;
 		}
@@ -833,9 +584,13 @@ OnTouch:
 		close;
 	}
 	end;
+
+OnInstanceInit: // Temporary fix for @reloadscript.
+	set 'ins_baphomet,0;
+	end;
 }
 
-1@cata,176,119,4	script	Ancient Hero's Soul#1F	411,{
+1@cata,176,119,4	script	Ancient Hero's Soul#1F	4_M_CHAMPSOUL,{
 	set .@party_id,getcharid(1);
 	cutin "ins_cata_champ_n",2;
 	if ('ins_baphomet == 2) {
@@ -954,9 +709,9 @@ OnTouch:
 			mes "[Ancient Hero's Soul]";
 			mes "To remind you again, I must be substantialized within the next hour. So everyone, finish your work within that time!";
 			set 'ins_baphomet,3;
-			donpcevent instance_npcname("ins_baphomet_1f_timer", instance_id())+"::OnEnable";
-			donpcevent instance_npcname("ins_baphomet_lotto2", instance_id())+"::OnEnable";
-			donpcevent instance_npcname("ins_baphomet_lotto3", instance_id())+"::OnEnable";
+			donpcevent instance_npcname("ins_baphomet_1f_timer")+"::OnEnable";
+			donpcevent instance_npcname("ins_baphomet_lotto2")+"::OnEnable";
+			donpcevent instance_npcname("ins_baphomet_lotto3")+"::OnEnable";
 		}
 		else {
 			mes "[Ancient Hero's Soul]";
@@ -1011,7 +766,7 @@ OnTouch:
 		next;
 		set 'ins_baphomet,5;
 		specialeffect EF_TELEPORTATION;
-		enablenpc instance_npcname("ins_bapho_to_2f", instance_id());
+		enablenpc instance_npcname("ins_bapho_to_2f");
 		mes "[Ancient Hero's Soul]";
 		mes "Now you can go to the main altar. It is located in the bottom right corner of this floor.";
 		next;
@@ -1021,7 +776,7 @@ OnTouch:
 		mes "[Ancient Hero's Soul]";
 		mes "Go ahead, warriors.";
 		cutin "",255;
-		instance_announce -1, "Ancient Hero's Soul : Now you can go to the Main Altar's gate. It is located in the Southeast",bc_map,"0xFFFF00";
+		mapannounce instance_mapname("1@cata"), "Ancient Hero's Soul : Now you can go to the Main Altar's gate. It is located in the Southeast",bc_map,"0xFFFF00";
 		close;
 	}
 	else if ('ins_baphomet == 4) {
@@ -1048,16 +803,20 @@ OnTouch:
 		cutin "",255;
 		close;
 	}
+
+OnInstanceInit:
+	disablenpc instance_npcname("Ancient Hero's Soul#1F");
+	end;
 }
 
 // To 2F Warp
 //============================================================
-1@cata,281,12,0	script	ins_bapho_to_2f	45,1,1,{
+1@cata,281,12,0	script	ins_bapho_to_2f	WARPNPC,1,1,{
 OnTouch:
 	if (countitem(6002) > 0) {
 		delitem 6002,countitem(6002); //Token_Of_Apostle
 		set 'ins_baphomet,5;
-		warp "2@cata",80,144;
+		warp instance_mapname("2@cata"),80,144;
 		end;
 	}
 	else {
@@ -1065,6 +824,10 @@ OnTouch:
 		mes "Where is your Token of Apostle? I said you should carry the Token of Apostle to pass this gate.";
 		close;
 	}
+
+OnInstanceInit:
+	disablenpc instance_npcname("ins_bapho_to_2f");
+	end;
 }
 
 // Gravestones
@@ -1084,37 +847,37 @@ OnTouch:
 		close;
 	}
 }
-1@cata,86,214,0	duplicate(Gravestone#SS1)	Gravestone#1F_1T	844
-1@cata,200,209,0	duplicate(Gravestone#SS1)	Gravestone#1F_2T	844
-1@cata,230,195,0	duplicate(Gravestone#SS1)	Gravestone#1F_3T	844
-1@cata,118,182,0	duplicate(Gravestone#SS1)	Gravestone#1F_4T	844
-1@cata,193,182,0	duplicate(Gravestone#SS1)	Gravestone#1F_5T	844
-1@cata,253,156,0	duplicate(Gravestone#SS1)	Gravestone#1F_6T	844
-1@cata,88,154,0	duplicate(Gravestone#SS1)	Gravestone#1F_7T	844
-1@cata,127,116,0	duplicate(Gravestone#SS1)	Gravestone#1F_8T	844
-1@cata,90,98,0	duplicate(Gravestone#SS1)	Gravestone#1F_9T	844
-1@cata,188,84,0	duplicate(Gravestone#SS1)	Gravestone#1F_10T	844
-1@cata,244,42,0	duplicate(Gravestone#SS1)	Gravestone#1F_11T	844
-1@cata,127,32,0	duplicate(Gravestone#SS1)	Gravestone#1F_12T	844
-1@cata,267,30,0	duplicate(Gravestone#SS1)	Gravestone#1F_13T	844
+1@cata,86,214,0	duplicate(Gravestone#SS1)	Gravestone#1F_1T	CLEAR_NPC
+1@cata,200,209,0	duplicate(Gravestone#SS1)	Gravestone#1F_2T	CLEAR_NPC
+1@cata,230,195,0	duplicate(Gravestone#SS1)	Gravestone#1F_3T	CLEAR_NPC
+1@cata,118,182,0	duplicate(Gravestone#SS1)	Gravestone#1F_4T	CLEAR_NPC
+1@cata,193,182,0	duplicate(Gravestone#SS1)	Gravestone#1F_5T	CLEAR_NPC
+1@cata,253,156,0	duplicate(Gravestone#SS1)	Gravestone#1F_6T	CLEAR_NPC
+1@cata,88,154,0	duplicate(Gravestone#SS1)	Gravestone#1F_7T	CLEAR_NPC
+1@cata,127,116,0	duplicate(Gravestone#SS1)	Gravestone#1F_8T	CLEAR_NPC
+1@cata,90,98,0	duplicate(Gravestone#SS1)	Gravestone#1F_9T	CLEAR_NPC
+1@cata,188,84,0	duplicate(Gravestone#SS1)	Gravestone#1F_10T	CLEAR_NPC
+1@cata,244,42,0	duplicate(Gravestone#SS1)	Gravestone#1F_11T	CLEAR_NPC
+1@cata,127,32,0	duplicate(Gravestone#SS1)	Gravestone#1F_12T	CLEAR_NPC
+1@cata,267,30,0	duplicate(Gravestone#SS1)	Gravestone#1F_13T	CLEAR_NPC
 
 -	script	Gravestone#SS2	-1,{
 	mes "I can only feel gloom from this Gravestone.";
 	close;
 }
-1@cata,86,214,0	duplicate(Gravestone#SS2)	Gravestone#1F_1F	844
-1@cata,200,209,0	duplicate(Gravestone#SS2)	Gravestone#1F_2F	844
-1@cata,230,195,0	duplicate(Gravestone#SS2)	Gravestone#1F_3F	844
-1@cata,118,182,0	duplicate(Gravestone#SS2)	Gravestone#1F_4F	844
-1@cata,193,182,0	duplicate(Gravestone#SS2)	Gravestone#1F_5F	844
-1@cata,253,156,0	duplicate(Gravestone#SS2)	Gravestone#1F_6F	844
-1@cata,88,154,0	duplicate(Gravestone#SS2)	Gravestone#1F_7F	844
-1@cata,127,116,0	duplicate(Gravestone#SS2)	Gravestone#1F_8F	844
-1@cata,90,98,0	duplicate(Gravestone#SS2)	Gravestone#1F_9F	844
-1@cata,188,84,0	duplicate(Gravestone#SS2)	Gravestone#1F_10F	844
-1@cata,244,42,0	duplicate(Gravestone#SS2)	Gravestone#1F_11F	844
-1@cata,127,32,0	duplicate(Gravestone#SS2)	Gravestone#1F_12F	844
-1@cata,267,30,0	duplicate(Gravestone#SS2)	Gravestone#1F_13F	844
+1@cata,86,214,0	duplicate(Gravestone#SS2)	Gravestone#1F_1F	CLEAR_NPC
+1@cata,200,209,0	duplicate(Gravestone#SS2)	Gravestone#1F_2F	CLEAR_NPC
+1@cata,230,195,0	duplicate(Gravestone#SS2)	Gravestone#1F_3F	CLEAR_NPC
+1@cata,118,182,0	duplicate(Gravestone#SS2)	Gravestone#1F_4F	CLEAR_NPC
+1@cata,193,182,0	duplicate(Gravestone#SS2)	Gravestone#1F_5F	CLEAR_NPC
+1@cata,253,156,0	duplicate(Gravestone#SS2)	Gravestone#1F_6F	CLEAR_NPC
+1@cata,88,154,0	duplicate(Gravestone#SS2)	Gravestone#1F_7F	CLEAR_NPC
+1@cata,127,116,0	duplicate(Gravestone#SS2)	Gravestone#1F_8F	CLEAR_NPC
+1@cata,90,98,0	duplicate(Gravestone#SS2)	Gravestone#1F_9F	CLEAR_NPC
+1@cata,188,84,0	duplicate(Gravestone#SS2)	Gravestone#1F_10F	CLEAR_NPC
+1@cata,244,42,0	duplicate(Gravestone#SS2)	Gravestone#1F_11F	CLEAR_NPC
+1@cata,127,32,0	duplicate(Gravestone#SS2)	Gravestone#1F_12F	CLEAR_NPC
+1@cata,267,30,0	duplicate(Gravestone#SS2)	Gravestone#1F_13F	CLEAR_NPC
 
 // Bobbing Torches
 //============================================================
@@ -1129,7 +892,7 @@ OnTouch:
 			specialeffect2 EF_HOLYHIT;
 			getitem 6001,1; //Essence_Of_Fire
 			mes "The symbol of inheritor shines. Then a small crystal falls into my hand from the torch.";
-			disablenpc instance_npcname(strnpcinfo(0), instance_id());
+			disablenpc instance_npcname(strnpcinfo(0));
 			close;
 		}
 		else if (('ins_baphomet == 3) && (countitem(6001) > 10)) {
@@ -1150,49 +913,57 @@ OnTouch:
 		percentheal -50,0;
 		close;
 	}
+
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
 }
-1@cata,267,210,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#1	844
-1@cata,85,182,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#2	844
-1@cata,267,154,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#3	844
-1@cata,157,139,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#4	844
-1@cata,193,138,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#5	844
-1@cata,193,102,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#6	844
-1@cata,157,102,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#7	844
-1@cata,113,112,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#8	844
-1@cata,253,56,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#9	844
-1@cata,239,56,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#10	844
-1@cata,71,42,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#11	844
-1@cata,155,14,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#12	844
+1@cata,267,210,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#1	CLEAR_NPC
+1@cata,85,182,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#2	CLEAR_NPC
+1@cata,267,154,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#3	CLEAR_NPC
+1@cata,157,139,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#4	CLEAR_NPC
+1@cata,193,138,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#5	CLEAR_NPC
+1@cata,193,102,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#6	CLEAR_NPC
+1@cata,157,102,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#7	CLEAR_NPC
+1@cata,113,112,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#8	CLEAR_NPC
+1@cata,253,56,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#9	CLEAR_NPC
+1@cata,239,56,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#10	CLEAR_NPC
+1@cata,71,42,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#11	CLEAR_NPC
+1@cata,155,14,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#12	CLEAR_NPC
 
 1@cata,1,1,0	script	ins_baphomet_1f_timer	-1,{
+OnInstanceInit:
+	disablenpc instance_npcname("ins_baphomet_1f_timer");
+	end;
+
 OnEnable:
-	enablenpc instance_npcname("ins_baphomet_1f_timer", instance_id());
+	enablenpc instance_npcname("ins_baphomet_1f_timer");
 	initnpctimer;
 	end;
 
-OnDisable:;
-	disablenpc instance_npcname("ins_baphomet_1f_timer", instance_id());
+OnDisable:
+	disablenpc instance_npcname("ins_baphomet_1f_timer");
 	stopnpctimer;
 	end;
 
 OnTimer1800000:
-	instance_announce -1, "Ancient Hero's Soul : We don't have enough time! Hurry up!",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@cata"), "Ancient Hero's Soul : We don't have enough time! Hurry up!",bc_map,"0xFFFF00";
 	end;
 
 OnTimer2400000:
-	instance_announce -1, "Ancient Hero's Soul : My body is disappearing... Hurry up!",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@cata"), "Ancient Hero's Soul : My body is disappearing... Hurry up!",bc_map,"0xFFFF00";
 	end;
 
 OnTimer3000000:
-	instance_announce -1, "Ancient Hero's Soul : Everything is over... There is no other way but to wait for the next chance...",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@cata"), "Ancient Hero's Soul : Everything is over... There is no other way but to wait for the next chance...",bc_map,"0xFFFF00";
 	end;
 
 OnTimer3050000:
-	instance_announce -1, "Ancient Hero's Soul : We failed... However... We still have a chance. I hope you will train yourselves until the time comes.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@cata"), "Ancient Hero's Soul : We failed... However... We still have a chance. I hope you will train yourselves until the time comes.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer3100000:
-	instance_announce -1, "You've failed to open the seal of main altar.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@cata"), "You've failed to open the seal of main altar.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer3500000:
@@ -1203,106 +974,110 @@ OnTimer3500000:
 
 2@cata,80,144,0	script	ins_2f_enter	-1,3,3,{
 OnTouch:
-	donpcevent instance_npcname("ins_2f_enter_broad", instance_id())+"::OnEnable";
-	disablenpc instance_npcname("ins_2f_enter", instance_id());
+	donpcevent instance_npcname("ins_2f_enter_broad")+"::OnEnable";
+	disablenpc instance_npcname("ins_2f_enter");
 	end;
 }
 
 2@cata,1,1,0	script	ins_2f_enter_broad	-1,{
-OnEnable:
-	enablenpc instance_npcname("ins_2f_enter_broad", instance_id());
-	initnpctimer;
+OnInstanceInit:
+OnDisable:
+	disablenpc instance_npcname("ins_2f_enter_broad");
 	end;
 
-OnDisable:
-	disablenpc instance_npcname("ins_2f_enter_broad", instance_id());
+OnEnable:
+	enablenpc instance_npcname("ins_2f_enter_broad");
+	initnpctimer;
 	end;
 
 OnTimer10000:
-	instance_announce -1, "Baphomet : Humans... interfering again...",bc_map,"0xdb7093";
+	mapannounce instance_mapname("2@cata"), "Baphomet : Humans... interfering again...",bc_map,"0xdb7093";
 	end;
 
 OnTimer13000:
-	instance_announce -1, "Apostle of Baphomet : Humans! Humans have invaded our sanctum!",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Apostle of Baphomet : Humans! Humans have invaded our sanctum!",bc_map,"0xFFFF00";
 	end;
 
 OnTimer16000:
-	instance_announce -1, "Apostle of Baphomet : Kill the humans! Do not stop the revival of our Master!",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Apostle of Baphomet : Kill the humans! Do not stop the revival of our Master!",bc_map,"0xFFFF00";
 	end;
 
 OnTimer18000:
-	instance_announce -1, "Apostle of Baphomet : Hurry up and release the seals of the altars! Our Master's return is upon us!",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Apostle of Baphomet : Hurry up and release the seals of the altars! Our Master's return is upon us!",bc_map,"0xFFFF00";
 	stopnpctimer;
-	disablenpc instance_npcname("ins_2f_enter_broad", instance_id());
+	disablenpc instance_npcname("ins_2f_enter_broad");
 	end;
 }
 
 2@cata,50,67,0	script	slave_left	-1,5,5,{
 OnTouch:
-	disablenpc instance_npcname("slave_left", instance_id());
-	instance_announce -1, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
-	monster "2@cata",55,67,"Apostle of Baphomet",1869,1;
-	monster "2@cata",51,67,"Apostle of Baphomet",1291,1;
-	monster "2@cata",58,67,"Apostle of Baphomet",1292,1;
-	monster "2@cata",53,67,"Apostle of Baphomet",1291,1;
-	monster "2@cata",54,67,"Apostle of Baphomet",1869,1;
-	monster "2@cata",55,67,"Apostle of Baphomet",1291,1;
-	monster "2@cata",56,67,"Apostle of Baphomet",1117,1;
-	monster "2@cata",58,66,"Apostle of Baphomet",1869,1;
-	monster "2@cata",56,66,"Apostle of Baphomet",1117,1;
-	monster "2@cata",60,66,"Apostle of Baphomet",1132,1;
-	monster "2@cata",59,66,"Apostle of Baphomet",1117,1;
-	monster "2@cata",54,66,"Apostle of Baphomet",1132,1;
-	monster "2@cata",55,66,"Apostle of Baphomet",1292,1;
-	monster "2@cata",56,66,"Apostle of Baphomet",1132,1;
-	monster "2@cata",50,65,"Apostle of Baphomet",1867,1;
-	monster "2@cata",61,65,"Apostle of Baphomet",1292,1;
+	set .@map$, instance_mapname("2@cata");
+	mapannounce .@map$, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
+	monster .@map$,55,67,"Apostle of Baphomet",1869,1;
+	monster .@map$,51,67,"Apostle of Baphomet",1291,1;
+	monster .@map$,58,67,"Apostle of Baphomet",1292,1;
+	monster .@map$,53,67,"Apostle of Baphomet",1291,1;
+	monster .@map$,54,67,"Apostle of Baphomet",1869,1;
+	monster .@map$,55,67,"Apostle of Baphomet",1291,1;
+	monster .@map$,56,67,"Apostle of Baphomet",1117,1;
+	monster .@map$,58,66,"Apostle of Baphomet",1869,1;
+	monster .@map$,56,66,"Apostle of Baphomet",1117,1;
+	monster .@map$,60,66,"Apostle of Baphomet",1132,1;
+	monster .@map$,59,66,"Apostle of Baphomet",1117,1;
+	monster .@map$,54,66,"Apostle of Baphomet",1132,1;
+	monster .@map$,55,66,"Apostle of Baphomet",1292,1;
+	monster .@map$,56,66,"Apostle of Baphomet",1132,1;
+	monster .@map$,50,65,"Apostle of Baphomet",1867,1;
+	monster .@map$,61,65,"Apostle of Baphomet",1292,1;
+	disablenpc instance_npcname("slave_left");
 	end;
 }
 
 2@cata,109,67,0	script	slave_right	-1,5,5,{
 OnTouch:
-	disablenpc instance_npcname("slave_right", instance_id());
-	instance_announce -1, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
-	monster "2@cata",105,67,"Apostle of Baphomet",1869,1;
-	monster "2@cata",104,67,"Apostle of Baphomet",1291,1;
-	monster "2@cata",107,67,"Apostle of Baphomet",1869,1;
-	monster "2@cata",106,67,"Apostle of Baphomet",1291,1;
-	monster "2@cata",102,67,"Apostle of Baphomet",1869,1;
-	monster "2@cata",103,67,"Apostle of Baphomet",1291,1;
-	monster "2@cata",103,67,"Apostle of Baphomet",1117,1;
-	monster "2@cata",109,66,"Apostle of Baphomet",1117,1;
-	monster "2@cata",108,66,"Apostle of Baphomet",1132,1;
-	monster "2@cata",101,66,"Apostle of Baphomet",1117,1;
-	monster "2@cata",106,66,"Apostle of Baphomet",1292,1;
-	monster "2@cata",102,66,"Apostle of Baphomet",1132,1;
-	monster "2@cata",104,66,"Apostle of Baphomet",1292,1;
-	monster "2@cata",103,66,"Apostle of Baphomet",1132,1;
-	monster "2@cata",109,65,"Apostle of Baphomet",1867,1;
-	monster "2@cata",108,65,"Apostle of Baphomet",1292,1;
+	set .@map$, instance_mapname("2@cata");
+	mapannounce .@map$, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
+	monster .@map$,105,67,"Apostle of Baphomet",1869,1;
+	monster .@map$,104,67,"Apostle of Baphomet",1291,1;
+	monster .@map$,107,67,"Apostle of Baphomet",1869,1;
+	monster .@map$,106,67,"Apostle of Baphomet",1291,1;
+	monster .@map$,102,67,"Apostle of Baphomet",1869,1;
+	monster .@map$,103,67,"Apostle of Baphomet",1291,1;
+	monster .@map$,103,67,"Apostle of Baphomet",1117,1;
+	monster .@map$,109,66,"Apostle of Baphomet",1117,1;
+	monster .@map$,108,66,"Apostle of Baphomet",1132,1;
+	monster .@map$,101,66,"Apostle of Baphomet",1117,1;
+	monster .@map$,106,66,"Apostle of Baphomet",1292,1;
+	monster .@map$,102,66,"Apostle of Baphomet",1132,1;
+	monster .@map$,104,66,"Apostle of Baphomet",1292,1;
+	monster .@map$,103,66,"Apostle of Baphomet",1132,1;
+	monster .@map$,109,65,"Apostle of Baphomet",1867,1;
+	monster .@map$,108,65,"Apostle of Baphomet",1292,1;
+	disablenpc instance_npcname("slave_right");
 	end;
 }
 
 2@cata,79,39,0	script	slave_down	-1,5,5,{
 OnTouch:
-	disablenpc instance_npcname("slave_down", instance_id());
-	instance_announce -1, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
-	monster "2@cata",78,41,"Apostle of Baphomet",1869,1;
-	monster "2@cata",79,42,"Apostle of Baphomet",1291,1;
-	monster "2@cata",78,46,"Apostle of Baphomet",1869,1;
-	monster "2@cata",81,41,"Apostle of Baphomet",1291,1;
-	monster "2@cata",81,42,"Apostle of Baphomet",1869,1;
-	monster "2@cata",79,43,"Apostle of Baphomet",1291,1;
-	monster "2@cata",77,40,"Apostle of Baphomet",1117,1;
-	monster "2@cata",79,41,"Apostle of Baphomet",1132,1;
-	monster "2@cata",79,42,"Apostle of Baphomet",1117,1;
-	monster "2@cata",79,43,"Apostle of Baphomet",1132,1;
-	monster "2@cata",79,48,"Apostle of Baphomet",1117,1;
-	monster "2@cata",78,49,"Apostle of Baphomet",1132,1;
-	monster "2@cata",78,41,"Apostle of Baphomet",1292,1;
-	monster "2@cata",74,42,"Apostle of Baphomet",1292,1;
-	monster "2@cata",72,48,"Apostle of Baphomet",1867,1;
-	monster "2@cata",72,38,"Apostle of Baphomet",1292,1;
+	set .@map$, instance_mapname("2@cata");
+	mapannounce .@map$, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
+	monster .@map$,78,41,"Apostle of Baphomet",1869,1;
+	monster .@map$,79,42,"Apostle of Baphomet",1291,1;
+	monster .@map$,78,46,"Apostle of Baphomet",1869,1;
+	monster .@map$,81,41,"Apostle of Baphomet",1291,1;
+	monster .@map$,81,42,"Apostle of Baphomet",1869,1;
+	monster .@map$,79,43,"Apostle of Baphomet",1291,1;
+	monster .@map$,77,40,"Apostle of Baphomet",1117,1;
+	monster .@map$,79,41,"Apostle of Baphomet",1132,1;
+	monster .@map$,79,42,"Apostle of Baphomet",1117,1;
+	monster .@map$,79,43,"Apostle of Baphomet",1132,1;
+	monster .@map$,79,48,"Apostle of Baphomet",1117,1;
+	monster .@map$,78,49,"Apostle of Baphomet",1132,1;
+	monster .@map$,78,41,"Apostle of Baphomet",1292,1;
+	monster .@map$,74,42,"Apostle of Baphomet",1292,1;
+	monster .@map$,72,48,"Apostle of Baphomet",1867,1;
+	monster .@map$,72,38,"Apostle of Baphomet",1292,1;
+	disablenpc instance_npcname("slave_down");
 	end;
 }
 
@@ -1319,28 +1094,33 @@ OnTouch:
 	}
 	if (.@seal_check == 2) erasequest 3041;
 	specialeffect EF_LEXDIVINA;
-	disablenpc instance_npcname(strnpcinfo(0), instance_id());
-	if (strnpcinfo(2) == "0") areamobuseskill "2@cata",79,81,10,1929,686,1,0,0,26,0;
-	else if (strnpcinfo(2) == "2") areamobuseskill "2@cata",123,109,10,1929,686,1,0,0,26,0;
-	else if (strnpcinfo(2) == "4") areamobuseskill "2@cata",123,22,10,1929,686,1,0,0,26,0;
-	else if (strnpcinfo(2) == "8") areamobuseskill "2@cata",35,21,10,1929,686,1,0,0,26,0;
-	else if (strnpcinfo(2) == "10") areamobuseskill "2@cata",35,109,10,1929,686,1,0,0,26,0;
+	disablenpc instance_npcname(strnpcinfo(0));
+	set .@map$, instance_mapname("2@cata");
+	if (strnpcinfo(2) == "0") areamobuseskill .@map$,79,81,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
+	else if (strnpcinfo(2) == "2") areamobuseskill .@map$,123,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
+	else if (strnpcinfo(2) == "4") areamobuseskill .@map$,123,22,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
+	else if (strnpcinfo(2) == "8") areamobuseskill .@map$,35,21,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
+	else if (strnpcinfo(2) == "10") areamobuseskill .@map$,35,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
 	percentheal -50,0;
 	sc_start Eff_Stone,20000,0;
 	setquest 3041;
-	instance_announce -1, "The seal activated by putting magical power into the altar.",bc_map,"0x87ceeb";
+	mapannounce .@map$, "The seal activated by putting magical power into the altar.",bc_map,"0x87ceeb";
 	mes "I can feel the power of the altar came back by adding magical power.";
 	next;
 	mes "But you can't use your magic for 3 minutes because you used your SP on the altar.";
 	close;
+
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
 }
-2@cata,79,81,0	duplicate(Magical Seal#SS)	Magical Seal#0	844
-2@cata,123,109,0	duplicate(Magical Seal#SS)	Magical Seal#2	844
-2@cata,123,22,0	duplicate(Magical Seal#SS)	Magical Seal#4	844
-2@cata,35,21,0	duplicate(Magical Seal#SS)	Magical Seal#8	844
-2@cata,35,109,0	duplicate(Magical Seal#SS)	Magical Seal#10	844
+2@cata,79,81,0	duplicate(Magical Seal#SS)	Magical Seal#0	CLEAR_NPC
+2@cata,123,109,0	duplicate(Magical Seal#SS)	Magical Seal#2	CLEAR_NPC
+2@cata,123,22,0	duplicate(Magical Seal#SS)	Magical Seal#4	CLEAR_NPC
+2@cata,35,21,0	duplicate(Magical Seal#SS)	Magical Seal#8	CLEAR_NPC
+2@cata,35,109,0	duplicate(Magical Seal#SS)	Magical Seal#10	CLEAR_NPC
 
-2@cata,79,65,0	script	The Main Altar#ss	844,{
+2@cata,79,65,0	script	The Main Altar#ss	CLEAR_NPC,{
 	set .@party_id,getcharid(1);
 	if (('ins_baphomet == 5) && (getpartyleader(.@party_id,2) == getcharid(0))) {
 		mes "An evil power, too terrible to describe, lies under the great altar radiating a violet color.";
@@ -1352,10 +1132,10 @@ OnTouch:
 		specialeffect EF_METEORSTORM;
 		specialeffect EF_METEORSTORM;
 		mes "[" + strcharinfo(0) + "]";
-		mes "Watch out! Something... Something is comming.";
+		mes "Watch out! Something... Something is coming.";
 		set 'ins_baphomet,6;
-		donpcevent instance_npcname("ins_2f_hero_broad", instance_id())+"::OnEnable";
-		disablenpc instance_npcname("The Main Altar#ss", instance_id());
+		donpcevent instance_npcname("ins_2f_hero_broad")+"::OnEnable";
+		disablenpc instance_npcname("The Main Altar#ss");
 		close;
 	}
 	else {
@@ -1367,15 +1147,13 @@ OnTouch:
 	end;
 }
 
-2@cata,80,63,4	script	Ancient Hero's Soul#2F	411,{
+2@cata,80,63,4	script	Ancient Hero's Soul#2F	4_M_CHAMPSOUL,{
 	cutin "ins_cata_champ_s",2;
 	if (checkquest(3041)>=0) erasequest 3041;
 	mes "[Ancient Hero's Soul]";
 	mes "Good job, my descendants... You've finished the long-cherished task that me and my bretheren could not complete.";
 	next;
 	mes "[Ancient Hero's Soul]";
-	next;
-	mes "[Ancient Hero's Soul]";
 	mes "I really appreciate your help.";
 	mes "Our souls can finally rest in peace...";
 	next;
@@ -1399,291 +1177,316 @@ OnTouch:
 		cutin "",255;
 		close;
 	}
+
+OnInstanceInit:
+	disablenpc instance_npcname("Ancient Hero's Soul#2F");
+	end;
 }
 
 2@cata,1,2,0	script	ins_2f_hero_broad	-1,{
 OnEnable:
-	enablenpc instance_npcname("ins_2f_hero_broad", instance_id());
+	enablenpc instance_npcname("ins_2f_hero_broad");
 	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc instance_npcname("ins_2f_hero_broad", instance_id());
+	disablenpc instance_npcname("ins_2f_hero_broad");
 	end;
 
 OnTimer3000:
-	instance_announce -1, "Ancient Hero's Soul : My God! The seal of the Main Altar is weakening!",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : My God! The seal of the Main Altar is weakening!",bc_map,"0xFFFF00";
 	end;
 
 OnTimer6000:
-	instance_announce -1, "Ancient Hero's Soul : My descendants... Listen carefully to what I'm going to say.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : My descendants... Listen carefully to what I'm going to say.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer9000:
-	instance_announce -1, "Ancient Hero's Soul : The altars that control the Main Altar's power are located in the Northeast, Southeast, Southwest and Northwest corners of this room.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : The altars that control the Main Altar's power are located in the Northeast, Southeast, Southwest and Northwest corners of this room.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer12000:
-	instance_announce -1, "Ancient Hero's Soul : Find these altars and activate their seals before Baphomet revives.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : Find these altars and activate their seals before Baphomet revives.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer15000:
-	instance_announce -1, "Baphomet : It's too late, weaklings... Now, you'll feel the despair of death!",bc_map,"0xdb7093";
+	mapannounce instance_mapname("2@cata"), "Baphomet : It's too late, weaklings... Now, you'll feel the despair of death!",bc_map,"0xdb7093";
 	end;
 
 OnTimer17000:
-	instance_announce -1, "Baphomet : No one can harm me here. You will be my first sacrifice.",bc_map,"0xdb7093";
-	donpcevent instance_npcname("control_baphomet", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("ins_2f_hero_broad2", instance_id())+"::OnEnable";
+	mapannounce instance_mapname("2@cata"), "Baphomet : No one can harm me here. You will be my first sacrifice.",bc_map,"0xdb7093";
+	donpcevent instance_npcname("control_baphomet")+"::OnEnable";
+	donpcevent instance_npcname("ins_2f_hero_broad2")+"::OnEnable";
 	stopnpctimer;
-	disablenpc instance_npcname("ins_2f_hero_broad", instance_id());
+	disablenpc instance_npcname("ins_2f_hero_broad");
 	end;
 }
 
 2@cata,3,3,0	script	control_baphomet	-1,{
-OnEnable:
-	enablenpc instance_npcname("control_baphomet", instance_id());
-	donpcevent instance_npcname("2f_callmon_pattern_c", instance_id())+"::OnEnable";
-	monster "2@cata",79,64,"Baphomet#",1929,1,instance_npcname("control_baphomet", instance_id())+"::OnMyMobDead";
+OnInstanceInit:
+OnDisable:
+	disablenpc instance_npcname("control_baphomet");
 	end;
 
-OnDisable:
-	disablenpc "control_baphomet";
+OnEnable:
+	enablenpc instance_npcname("control_baphomet");
+	donpcevent instance_npcname("2f_callmon_pattern_c")+"::OnEnable";
+	monster instance_mapname("2@cata"),79,64,"Baphomet#",1929,1,instance_npcname("control_baphomet")+"::OnMyMobDead";
 	end;
 
 OnMyMobDead:
-	if (mobcount("2@cata",instance_npcname("control_baphomet", instance_id())+"::OnMyMobDead") < 1) {
+	set .@map$, instance_mapname("2@cata");
+	if (mobcount(.@map$,instance_npcname("control_baphomet")+"::OnMyMobDead") < 1) {
 		set 'ins_baphomet,7;
 		erasequest 3041;
-		instance_announce -1, "Baphomet : No! Nonono! How dare these weaklings defeat me!... No!!...",bc_map,"0xdb7093";
-		enablenpc instance_npcname("Ancient Hero's Soul#2F", instance_id());
-		disablenpc instance_npcname("slave_down", instance_id());
-		disablenpc instance_npcname("slave_left", instance_id());
-		disablenpc instance_npcname("slave_right", instance_id());
-		donpcevent instance_npcname("ins_2f_hero_broad", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("ins_2f_hero_broad2", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("ins_2f_hero_pattern_c", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("2f_callmon_pattern_c", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("2f_callmon_pattern", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("ins_2f_hero_pattern", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("ins_2f_enter_broad", instance_id())+"::OnDisable";
-		donpcevent instance_npcname("control_baphomet", instance_id())+"::OnDisable";
-		disablenpc instance_npcname("control_baphomet", instance_id());
+		mapannounce .@map$, "Baphomet : No! Nonono! How dare these weaklings defeat me!... No!!...",bc_map,"0xdb7093";
+		enablenpc instance_npcname("Ancient Hero's Soul#2F");
+		disablenpc instance_npcname("slave_down");
+		disablenpc instance_npcname("slave_left");
+		disablenpc instance_npcname("slave_right");
+		donpcevent instance_npcname("ins_2f_hero_broad")+"::OnDisable";
+		donpcevent instance_npcname("ins_2f_hero_broad2")+"::OnDisable";
+		donpcevent instance_npcname("ins_2f_hero_pattern_c")+"::OnDisable";
+		donpcevent instance_npcname("2f_callmon_pattern_c")+"::OnDisable";
+		donpcevent instance_npcname("2f_callmon_pattern")+"::OnDisable";
+		donpcevent instance_npcname("ins_2f_hero_pattern")+"::OnDisable";
+		donpcevent instance_npcname("ins_2f_enter_broad")+"::OnDisable";
+		donpcevent instance_npcname("control_baphomet")+"::OnDisable";
+		disablenpc instance_npcname("control_baphomet");
 	}
 	end;
 }
 
 2@cata,2,2,0	script	ins_2f_hero_broad2	-1,{
-OnEnable:
-	enablenpc instance_npcname("ins_2f_hero_broad2", instance_id());
-	initnpctimer;
+OnInstanceInit:
+OnDisable:
+	disablenpc instance_npcname("ins_2f_hero_broad2");
 	end;
 
-OnDisable:
-	disablenpc instance_npcname("ins_2f_hero_broad2", instance_id());
+OnEnable:
+	enablenpc instance_npcname("ins_2f_hero_broad2");
+	initnpctimer;
 	end;
 
 OnTimer8000:
-	instance_announce -1, "Ancient Hero's Soul : Don't be discouraged, Baphomet can still be defeated!",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : Don't be discouraged, Baphomet can still be defeated!",bc_map,"0xFFFF00";
 	end;
 
 OnTimer11000:
-	instance_announce -1, "Ancient Hero's Soul : Go to the altars and activate their seals.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : Go to the altars and activate their seals.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer13000:
-	instance_announce -1, "Ancient Hero's Soul : Once the seals recover their power, Baphomet will be vulnerable.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : Once the seals recover their power, Baphomet will be vulnerable.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer16000:
-	instance_announce -1, "Ancient Hero's Soul : You should lure Baphomet to the unsealed Altars. Otherwise, your efforts will be futile.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : You should lure Baphomet to the unsealed Altars. Otherwise, your efforts will be futile.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer19000:
-	instance_announce -1, "Ancient Hero's Soul : We have only 1 hour to stop Baphomet. If time runs out, the power of the seals will be useless.",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : We have only 1 hour to stop Baphomet. If time runs out, the power of the seals will be useless.",bc_map,"0xFFFF00";
 	end;
 
 OnTimer22000:
-	instance_announce -1, "Baphomet : It's useless. Make more seals. I'll crush them all. None of you will survive!",bc_map,"0xdb7093";
+	mapannounce instance_mapname("2@cata"), "Baphomet : It's useless. Make more seals. I'll crush them all. None of you will survive!",bc_map,"0xdb7093";
 	end;
 
 OnTimer26000:
-	instance_announce -1, "Ancient Hero's Soul : The magical power of the central seal is running out. Go to the central seal and put the magical power.",bc_map,"0xFFFF00";
-	enablenpc instance_npcname("Magical Seal#0", instance_id());
-	disablenpc instance_npcname("Magical Seal#2", instance_id());
-	disablenpc instance_npcname("Magical Seal#4", instance_id());
-	disablenpc instance_npcname("Magical Seal#8", instance_id());
-	disablenpc instance_npcname("Magical Seal#10", instance_id());
-	donpcevent instance_npcname("ins_2f_hero_pattern_c", instance_id())+"::OnEnable";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : The magical power of the central seal is running out. Go to the central seal and put the magical power.",bc_map,"0xFFFF00";
+	enablenpc instance_npcname("Magical Seal#0");
+	disablenpc instance_npcname("Magical Seal#2");
+	disablenpc instance_npcname("Magical Seal#4");
+	disablenpc instance_npcname("Magical Seal#8");
+	disablenpc instance_npcname("Magical Seal#10");
+	donpcevent instance_npcname("ins_2f_hero_pattern_c")+"::OnEnable";
 	stopnpctimer;
-	disablenpc instance_npcname("ins_2f_hero_broad2", instance_id());
+	disablenpc instance_npcname("ins_2f_hero_broad2");
 	end;
 }
 
 2@cata,4,1,0	script	2f_callmon_pattern_c	-1,{
+OnInstanceInit:
+	disablenpc instance_npcname("2f_callmon_pattern_c");
+	end;
+
 OnEnable:
-	enablenpc instance_npcname("2f_callmon_pattern_c", instance_id());
+	enablenpc instance_npcname("2f_callmon_pattern_c");
 	initnpctimer;
-	donpcevent instance_npcname("2f_callmon_pattern_c", instance_id())+"::Ongo";
+	donpcevent instance_npcname("2f_callmon_pattern_c")+"::OnGo";
 	end;
 
 OnDisable:
 	stopnpctimer;
-	disablenpc instance_npcname("2f_callmon_pattern_c", instance_id());
+	disablenpc instance_npcname("2f_callmon_pattern_c");
 	end;
 
-Ongo:
-	donpcevent instance_npcname("2f_callmon_pattern", instance_id())+"::OnEnable";
+OnGo:
+	donpcevent instance_npcname("2f_callmon_pattern")+"::OnEnable";
 	end;
 
 OnTimer3600000:
-	donpcevent instance_npcname("2f_callmon_pattern_c", instance_id())+"::OnDisable";
+	donpcevent instance_npcname("2f_callmon_pattern_c")+"::OnDisable";
 	end;
 }
 
 2@cata,4,2,0	script	2f_callmon_pattern	-1,{
+OnInstanceInit:
+	disablenpc instance_npcname("2f_callmon_pattern");
+	end;
+
 OnEnable:
-	enablenpc instance_npcname("2f_callmon_pattern", instance_id());
+	enablenpc instance_npcname("2f_callmon_pattern");
 	stopnpctimer;
 	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc instance_npcname("2f_callmon_pattern", instance_id());
+	disablenpc instance_npcname("2f_callmon_pattern");
 	stopnpctimer;
 	end;
 
 OnTimer300000:
-	enablenpc instance_npcname("slave_down", instance_id());
-	enablenpc instance_npcname("slave_left", instance_id());
-	enablenpc instance_npcname("slave_right", instance_id());
-	donpcevent instance_npcname("2f_callmon_pattern_c", instance_id())+"::Ongo";
+	enablenpc instance_npcname("slave_down");
+	enablenpc instance_npcname("slave_left");
+	enablenpc instance_npcname("slave_right");
+	donpcevent instance_npcname("2f_callmon_pattern_c")+"::OnGo";
 	end;
 }
 
 2@cata,3,1,0	script	ins_2f_hero_pattern_c	-1,{
+OnInstanceInit:
+	disablenpc instance_npcname("ins_2f_hero_pattern_c");
+	end;
+
 OnEnable:
-	enablenpc instance_npcname("ins_2f_hero_pattern_c", instance_id());
+	enablenpc instance_npcname("ins_2f_hero_pattern_c");
 	initnpctimer;
-	donpcevent instance_npcname("ins_2f_hero_pattern_c", instance_id())+"::Ongo";
+	donpcevent instance_npcname("ins_2f_hero_pattern_c")+"::OnGo";
 	end;
 
-Ongo:
-	donpcevent instance_npcname("ins_2f_hero_pattern", instance_id())+"::OnEnable";
+OnGo:
+	donpcevent instance_npcname("ins_2f_hero_pattern")+"::OnEnable";
 	end;
 
 OnDisable:
 	stopnpctimer;
-	disablenpc instance_npcname("Magical Seal#0", instance_id());
-	disablenpc instance_npcname("Magical Seal#2", instance_id());
-	disablenpc instance_npcname("Magical Seal#4", instance_id());
-	disablenpc instance_npcname("Magical Seal#8", instance_id());
-	disablenpc instance_npcname("Magical Seal#10", instance_id());
-	donpcevent instance_npcname("ins_2f_hero_pattern", instance_id())+"::OnDisable";
-	disablenpc instance_npcname("ins_2f_hero_pattern_c", instance_id());
+	disablenpc instance_npcname("Magical Seal#0");
+	disablenpc instance_npcname("Magical Seal#2");
+	disablenpc instance_npcname("Magical Seal#4");
+	disablenpc instance_npcname("Magical Seal#8");
+	disablenpc instance_npcname("Magical Seal#10");
+	donpcevent instance_npcname("ins_2f_hero_pattern")+"::OnDisable";
+	disablenpc instance_npcname("ins_2f_hero_pattern_c");
 	end;
 
 OnTimer3600000:
-	instance_announce -1, "Baphomet : krrrr... Now you can't stop me with the seals. All you can do is wait for death!",bc_map,"0xdb7093";
+	mapannounce instance_mapname("2@cata"), "Baphomet : krrrr... Now you can't stop me with the seals. All you can do is wait for death!",bc_map,"0xdb7093";
 	end;
 
 OnTimer3605000:
-	instance_announce -1, "Ancient Hero's Soul : We can't stop Baphomet with the magical power of the seals anymore. Now everything depends on God...",bc_map,"0xFFFF00";
-	donpcevent instance_npcname("ins_2f_hero_pattern_c", instance_id())+"::OnDisable";
+	mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : We can't stop Baphomet with the magical power of the seals anymore. Now everything depends on God...",bc_map,"0xFFFF00";
+	donpcevent instance_npcname("ins_2f_hero_pattern_c")+"::OnDisable";
 	end;
 }
 
 2@cata,3,2,0	script	ins_2f_hero_pattern	-1,{
+OnInstanceInit:
+	disablenpc instance_npcname("ins_2f_hero_pattern");
+	end;
+
 OnEnable:
-	enablenpc instance_npcname("ins_2f_hero_pattern", instance_id());
+	enablenpc instance_npcname("ins_2f_hero_pattern");
 	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc instance_npcname("ins_2f_hero_pattern", instance_id());
+	disablenpc instance_npcname("ins_2f_hero_pattern");
 	stopnpctimer;
 	end;
 
 OnTimer70000:
 	switch(rand(1,5)) {
 	case 1:
-		instance_announce -1, "Ancient Hero's Soul : The seal of the Main Altar is running out. Strengthen the Main Altar's seal!",bc_map,"0xFFFF00";
-		enablenpc instance_npcname("Magical Seal#0", instance_id());
-		disablenpc instance_npcname("Magical Seal#2", instance_id());
-		disablenpc instance_npcname("Magical Seal#4", instance_id());
-		disablenpc instance_npcname("Magical Seal#8", instance_id());
-		disablenpc instance_npcname("Magical Seal#10", instance_id());
+		mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : The seal of the Main Altar is running out. Strengthen the Main Altar's seal!",bc_map,"0xFFFF00";
+		enablenpc instance_npcname("Magical Seal#0");
+		disablenpc instance_npcname("Magical Seal#2");
+		disablenpc instance_npcname("Magical Seal#4");
+		disablenpc instance_npcname("Magical Seal#8");
+		disablenpc instance_npcname("Magical Seal#10");
 		break;
 	case 2:
-		instance_announce -1, "Ancient Hero's Soul : The magical power of the seal at 2 o'clock is running out. Go to 2 o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
-		disablenpc instance_npcname("Magical Seal#0", instance_id());
-		enablenpc instance_npcname("Magical Seal#2", instance_id());
-		disablenpc instance_npcname("Magical Seal#4", instance_id());
-		disablenpc instance_npcname("Magical Seal#8", instance_id());
-		disablenpc instance_npcname("Magical Seal#10", instance_id());
+		mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : The magical power of the seal at 2 o'clock is running out. Go to 2 o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
+		disablenpc instance_npcname("Magical Seal#0");
+		enablenpc instance_npcname("Magical Seal#2");
+		disablenpc instance_npcname("Magical Seal#4");
+		disablenpc instance_npcname("Magical Seal#8");
+		disablenpc instance_npcname("Magical Seal#10");
 		break;
 	case 3:
-		instance_announce -1, "Ancient Hero's Soul : The magical power of the seal at 4 o'clock is running out. Go to 4 o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
-		disablenpc instance_npcname("Magical Seal#0", instance_id());
-		disablenpc instance_npcname("Magical Seal#2", instance_id());
-		enablenpc instance_npcname("Magical Seal#4", instance_id());
-		disablenpc instance_npcname("Magical Seal#8", instance_id());
-		disablenpc instance_npcname("Magical Seal#10", instance_id());
+		mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : The magical power of the seal at 4 o'clock is running out. Go to 4 o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
+		disablenpc instance_npcname("Magical Seal#0");
+		disablenpc instance_npcname("Magical Seal#2");
+		enablenpc instance_npcname("Magical Seal#4");
+		disablenpc instance_npcname("Magical Seal#8");
+		disablenpc instance_npcname("Magical Seal#10");
 		break;
 	case 4:
-		instance_announce -1, "Ancient Hero's Soul : The magical power of the seal at 8 o'clock is running out. Go to 8 o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
-		disablenpc instance_npcname("Magical Seal#0", instance_id());
-		disablenpc instance_npcname("Magical Seal#2", instance_id());
-		disablenpc instance_npcname("Magical Seal#4", instance_id());
-		enablenpc instance_npcname("Magical Seal#8", instance_id());
-		disablenpc instance_npcname("Magical Seal#10", instance_id());
+		mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : The magical power of the seal at 8 o'clock is running out. Go to 8 o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
+		disablenpc instance_npcname("Magical Seal#0");
+		disablenpc instance_npcname("Magical Seal#2");
+		disablenpc instance_npcname("Magical Seal#4");
+		enablenpc instance_npcname("Magical Seal#8");
+		disablenpc instance_npcname("Magical Seal#10");
 		break;
 	case 5:
-		instance_announce -1, "Ancient Hero's Soul : The magical power of the seal at 10 o'clock is running out. Go to 10 o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
-		disablenpc instance_npcname("Magical Seal#0", instance_id());
-		disablenpc instance_npcname("Magical Seal#2", instance_id());
-		disablenpc instance_npcname("Magical Seal#4", instance_id());
-		disablenpc instance_npcname("Magical Seal#8", instance_id());
-		enablenpc instance_npcname("Magical Seal#10", instance_id());
+		mapannounce instance_mapname("2@cata"), "Ancient Hero's Soul : The magical power of the seal at 10 o'clock is running out. Go to 10 o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
+		disablenpc instance_npcname("Magical Seal#0");
+		disablenpc instance_npcname("Magical Seal#2");
+		disablenpc instance_npcname("Magical Seal#4");
+		disablenpc instance_npcname("Magical Seal#8");
+		enablenpc instance_npcname("Magical Seal#10");
 	}
 	stopnpctimer;
-	donpcevent instance_npcname("ins_2f_hero_pattern_c", instance_id())+"::Ongo";
+	donpcevent instance_npcname("ins_2f_hero_pattern_c")+"::OnGo";
 	end;
 }
 
 
 1@cata,1,1,0	script	ins_1f_spawn_mobs	-1,{
-OnEnable:
-	monster "1@cata",0,0,"Zombie Master",1298,10;
-	monster "1@cata",0,0,"Wraith Dead",1291,10;
-	//monster "1@cata",0,0,"Ancient Mimic",1699,10;
-	monster "1@cata",0,0,"Flame Skull",1869,10;
-	monster "1@cata",0,0,"Skeleton General",1290,10;
-	monster "1@cata",0,0,"Zombie Master",1298,10;
-	monster "1@cata",0,0,"Skeleton General",1290,10;
-	monster "1@cata",0,0,"Flame Skull",1869,10;
-	monster "1@cata",0,0,"Wraith Dead",1291,10;
-	monster "1@cata",0,0,"Wraith Dead",1291,10;
-	monster "1@cata",0,0,"Khalitzburg",1132,10;
-	monster "1@cata",0,0,"Khalitzburg",1132,10;
-	monster "1@cata",0,0,"Flame Skull",1869,10;
-	monster "1@cata",0,0,"Flame Skull",1869,10;
-	monster "1@cata",0,0,"Ancient Mimic",1699,10;
-	monster "1@cata",0,0,"Zombie Master",1298,10;
-	monster "1@cata",0,0,"Ancient Mimic",1699,10;
-	monster "1@cata",0,0,"Zombie Master",1298,10;
-	monster "1@cata",0,0,"Wraith Dead",1291,10;
-	monster "1@cata",0,0,"Skeleton General",1290,10;
-	monster "1@cata",0,0,"Skeleton General",1290,10;
-	monster "1@cata",0,0,"Wind Ghost",1263,10;
-	monster "1@cata",0,0,"Wind Ghost",1263,10;
-	monster "1@cata",0,0,"Wind Ghost",1263,10;
-	monster "1@cata",0,0,"Lude",1509,10;
-	monster "1@cata",0,0,"Lude",1509,10;
-	monster "1@cata",0,0,"Evil Druid",1117,10;
-	monster "1@cata",0,0,"Evil Druid",1117,10;
-	monster "1@cata",0,0,"Evil Druid",1117,10;
-	monster "1@cata",0,0,"Banshee",1867,10;
-	monster "1@cata",0,0,"Dark Illusion",1302,1;
+OnInstanceInit:
+	set .@map$, instance_mapname("1@cata");
+	monster .@map$,0,0,"Zombie Master",1298,10;
+	monster .@map$,0,0,"Wraith Dead",1291,10;
+	//monster .@map$,0,0,"Ancient Mimic",1699,10;
+	monster .@map$,0,0,"Flame Skull",1869,10;
+	monster .@map$,0,0,"Skeleton General",1290,10;
+	monster .@map$,0,0,"Zombie Master",1298,10;
+	monster .@map$,0,0,"Skeleton General",1290,10;
+	monster .@map$,0,0,"Flame Skull",1869,10;
+	monster .@map$,0,0,"Wraith Dead",1291,10;
+	monster .@map$,0,0,"Wraith Dead",1291,10;
+	monster .@map$,0,0,"Khalitzburg",1132,10;
+	monster .@map$,0,0,"Khalitzburg",1132,10;
+	monster .@map$,0,0,"Flame Skull",1869,10;
+	monster .@map$,0,0,"Flame Skull",1869,10;
+	monster .@map$,0,0,"Ancient Mimic",1699,10;
+	monster .@map$,0,0,"Zombie Master",1298,10;
+	monster .@map$,0,0,"Ancient Mimic",1699,10;
+	monster .@map$,0,0,"Zombie Master",1298,10;
+	monster .@map$,0,0,"Wraith Dead",1291,10;
+	monster .@map$,0,0,"Skeleton General",1290,10;
+	monster .@map$,0,0,"Skeleton General",1290,10;
+	monster .@map$,0,0,"Wind Ghost",1263,10;
+	monster .@map$,0,0,"Wind Ghost",1263,10;
+	monster .@map$,0,0,"Wind Ghost",1263,10;
+	monster .@map$,0,0,"Lude",1509,10;
+	monster .@map$,0,0,"Lude",1509,10;
+	monster .@map$,0,0,"Evil Druid",1117,10;
+	monster .@map$,0,0,"Evil Druid",1117,10;
+	monster .@map$,0,0,"Evil Druid",1117,10;
+	monster .@map$,0,0,"Banshee",1867,10;
+	monster .@map$,0,0,"Dark Illusion",1302,1;
+	disablenpc instance_npcname("ins_1f_spawn_mobs");
 	end;
 }
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index 4b768a58a..aafe2d0c4 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -1,34 +1,32 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Gunslinger Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= erKURITA, RockmanEXE, Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Gunslinger Job Change Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Made the NPC [erKURITA]
 //= 1.5 Couple fixes to the npc, aswell as adding the missing
-//=	  3 green herbs. [erKURITA]
+//=     3 green herbs. [erKURITA]
 //= 1.6 job number->const, commonized variable name,
-//= 	optimized [Lupus]
+//=     optimized [Lupus]
 //= 1.7 Now uses only ONE variable GUNS_Q [Lupus]
 //= 1.7a Grammar fixes, few spelling fixes, etc [CBMaster]
 //= 1.7b Parenthesis fixes [KarLaeda]
 //= 1.8 Fixed the reward you can get [Playtester]
 //= 1.9 Removed some 'clever' script constructs [ultramage]
 //= 2.0 Updated to official version - Thanks to Omega for
-//= his first try [SinSloth] 1.10b - removed .GATs [Lupus]
+//=     his first try [SinSloth] 1.10b - removed .GATs [Lupus]
 //= 2.1 Wise Bull Horn now deletes all items. Thanks to yyCC. [L0ne_W0lf]
 //= 2.1a Corrected a Typo error ";;". [Samuray22]
 //= 2.1b Corrected some typos errors. (bugreport:1549) [Samuray22]
 //= 2.1c Fixed some missing/messed up item checks. (bugreport:2693) [Kisuka]
 //= 2.2 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
-//============================================================ 
+//============================================================
 
-que_ng,152,167,3	script	Master Miller	901,{
+que_ng,152,167,3	script	Master Miller	4_M_HUOLDARMY,{
 	if (Upper == 2) {
 		mes "[Master Miller]";
 		mes "Well, aren't you an";
@@ -92,7 +90,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			setquest 6020;
 			close;
 		}
-		else if(GUNS_Q == 1) {
+		else if (GUNS_Q == 1) {
 			mes "[Master Miller]";
 			mes "Take that letter of";
 			mes "introduction I've written";
@@ -102,7 +100,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "Gunslinger material.";
 			close;
 		}
-		else if(GUNS_Q == 2) {
+		else if (GUNS_Q == 2) {
 			mes "[Master Miller]";
 			mes "Hmm... Wise Bull Horn";
 			mes "asked you to collect the";
@@ -111,7 +109,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "part of his qualification test.";
 			close;
 		}
-		else if(GUNS_Q == 3) {
+		else if (GUNS_Q == 3) {
 			mes "[Master Miller]";
 			mes "Wise Bull Horn asked";
 			mes "you to bring him some";
@@ -120,7 +118,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "for favors. Good luck, friend.";
 			close;
 		}
-		else if(GUNS_Q == 4) {
+		else if (GUNS_Q == 4) {
 			mes "[Master Miller]";
 			mes "I expect to hear good";
 			mes "news from you soon. You";
@@ -128,8 +126,8 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "you'll become a Gunslinger.";
 			close;
 		}
-		else if(GUNS_Q == 5) {
-			if (Skillpoint != 0) {
+		else if (GUNS_Q == 5) {
+			if (SkillPoint != 0) {
 				mes "[Master Miller]";
 				mes "Hey, you have leftover";
 				mes "Skill Points. You better";
@@ -184,13 +182,13 @@ que_ng,152,167,3	script	Master Miller	901,{
 			set GUNS_Q,6;
 			completequest 6024;
 			if (rand(1,2) == 1) {
-				getitem 13100,1;	// Six_Shooter
-			}else{
-				getitem 13150,1;	// Branch
+				getitem 13100,1; // Six_Shooter
+			} else {
+				getitem 13150,1; // Branch
 			}
 			close;
 		}
-	}else{
+	} else {
 		if (Class == Job_Gunslinger) {
 			mes "[Master Miller]";
 			mes "Oh! Long time, no see,";
@@ -200,7 +198,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 			mes "Take care of it, and it'll take";
 			mes "care of you. Remember it.";
 			close;
-		}else{
+		} else {
 			mes "[Master Miller]";
 			mes "If you don't have";
 			mes "any business with me,";
@@ -210,7 +208,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 	}
 }
 
-payon,184,65,3	script	Wise Bull Horn	866,{
+payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 	if (GUNS_Q == 1) {
 		mes "[Wise Bull Horn]";
 		mes "Hello, young wolf.";
@@ -266,7 +264,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		changequest 6020,6021;
 		close;
 	}
-	else if(GUNS_Q == 2) {
+	else if (GUNS_Q == 2) {
 		if (countitem(912) < 3 || countitem(914) < 3 || countitem(1019) < 1 || countitem(935) < 10 || countitem(511) < 3 || countitem(1013) < 3) {
 			mes "[Wise Bull Horn]";
 			mes "I can make a voucher that";
@@ -293,12 +291,12 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 			mes "a Gunslinger.";
 			close;
 		}
-		delitem 912,3;	// Zargon
-		delitem 914,3;	// Fluff
-		delitem 1019,1;	// Wooden_Block
-		delitem 935,10;	// Shell
-		delitem 511,3;	// Green_Herb
-		delitem 1013,3;	// Colorful_Shell
+		delitem 912,3; // Zargon
+		delitem 914,3; // Fluff
+		delitem 1019,1; // Wooden_Block
+		delitem 935,10; // Shell
+		delitem 511,3; // Green_Herb
+		delitem 1013,3; // Colorful_Shell
 		set GUNS_Q,3;
 		changequest 6021,6022;
 		mes "[Wise Bull Horn]";
@@ -310,7 +308,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		mes "I should be finished with it.";
 		close;
 	}
-	else if(GUNS_Q == 3) {
+	else if (GUNS_Q == 3) {
 		mes "[Wise Bull Horn]";
 		mes "Oh, you've arrived just";
 		mes "in time. It's been a while";
@@ -350,7 +348,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		changequest 6022,6023;
 		close;
 	}
-	else if(GUNS_Q == 4) {
+	else if (GUNS_Q == 4) {
 		if (countitem(519) < 1) {
 			mes "[Wise Bull Horn]";
 			mes "I'm an old man that will";
@@ -360,7 +358,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 			mes "a cold glass of Milk, please?";
 			close;
 		}
-		delitem 519,1;	// Milk
+		delitem 519,1; // Milk
 		set GUNS_Q,5;
 		changequest 6023,6024;
 		mes "[Wise Bull Horn]";
@@ -390,7 +388,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		mes "Yippee Yippee Yai Yocaiyay~";
 		close;
 	}
-	else if(GUNS_Q == 5) {
+	else if (GUNS_Q == 5) {
 		mes "[Wise Bull Horn]";
 		mes "Please take this voucher";
 		mes "to Miller, the Black Fox, with";
@@ -406,7 +404,7 @@ payon,184,65,3	script	Wise Bull Horn	866,{
 		mes "Yippee Yippee Yai Yocaiyay~";
 		close;
 	}
-	else if(GUNS_Q == 6) {
+	else if (GUNS_Q == 6) {
 		mes "[Wise Bull Horn]";
 		mes "AAh, long time no see.";
 		mes "I hope that you become";
diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index dcd9a851a..90cc08edc 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.txt
@@ -1,23 +1,21 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Ninja Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Legionaire, Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Ninja Job Change Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Optimized, updated, checked [Lupus]
 //= 1.2 Added Akagi [Playtester]
 //= 1.3 Updated dialogs to official ones and optimized [SinSloth]
 //= 1.4 Fixed a minor bug [SinSloth]
 //= 1.5 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
 //= 1.6 Fixed AEGIS amatsu warp typo. [Kisuka]
-//============================================================ 
+//============================================================
 
-alberta,30,65,3	script	Akagi	730,{
+alberta,30,65,3	script	Akagi	4_M_JOB_ASSASSIN,{
 	if (Class == Job_Novice) {
 		if (JobLevel == 10) {
 			mes "[Akagi]";
@@ -53,7 +51,7 @@ alberta,30,65,3	script	Akagi	730,{
 					warp "amatsu",178,176;
 					end;
 			}
-		}else{
+		} else {
 			mes "[Akagi]";
 			mes "Hm? I cannot be";
 			mes "of any service to";
@@ -61,7 +59,7 @@ alberta,30,65,3	script	Akagi	730,{
 			mes "a little stronger...";
 			close;
 		}
-	}else{
+	} else {
 		mes "[Akagi]";
 		mes "Hmm...";
 		mes "You and I...";
@@ -73,7 +71,7 @@ alberta,30,65,3	script	Akagi	730,{
 	}
 }
 
-que_ng,30,65,3	script	Cougar#nq	730,{
+que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 	if (Upper == 2) {
 		mes "[Cougar]";
 		mes "I... I've never";
@@ -192,7 +190,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			setquest 6015;
 			close;
 		}
-		else if(NINJ_Q == 1) {
+		else if (NINJ_Q == 1) {
 			mes "[Cougar]";
 			mes "Even if this task";
 			mes "isn't that urgent,";
@@ -201,7 +199,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "my letter to Wildcat Joe.";
 			close;
 		}
-		else if(NINJ_Q == 2) {
+		else if (NINJ_Q == 2) {
 			mes "[Cougar]";
 			mes "Did you deliver that";
 			mes "letter to Wildcat Joe?";
@@ -211,7 +209,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "if you can needle him for it.";
 			close;
 		}
-		else if(NINJ_Q == 3) {
+		else if (NINJ_Q == 3) {
 			mes "[Cougar]";
 			mes "Ah, you've returned.";
 			mes "So did Wildcat Joe send";
@@ -259,7 +257,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			changequest 6017,6018;
 			close;
 		}
-		else if(NINJ_Q == 4) {
+		else if (NINJ_Q == 4) {
 			if (countitem(7053) < 5 || countitem(1010) < 1) {
 				mes "[Cougar]";
 				mes "Hurry and bring";
@@ -270,7 +268,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 				mes "against Wildcat Joe!";
 				close;
 			}
-			if (Skillpoint != 0) {
+			if (SkillPoint != 0) {
 				mes "[Cougar]";
 				mes "Whoa, whoa...";
 				mes "You still have some";
@@ -350,7 +348,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "the respect of any Ninja~";
 			close;
 		}
-	}else{
+	} else {
 		if (Class == Job_Ninja) {
 			mes "[Cougar]";
 			mes "How have you been?";
@@ -360,7 +358,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "can do that, you'll get";
 			mes "the respect of any Ninja~";
 			close;
-		}else{
+		} else {
 			mes "[Cougar]";
 			mes "What...?";
 			mes "How were you able";
@@ -373,7 +371,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 	}
 }
 
-einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
+einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 	if (NINJ_Q == 1) {
 		mes "[Suspicious Man]";
 		mes "I've traveled to many";
@@ -436,7 +434,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		changequest 6015,6016;
 		close;
 	}
-	else if(NINJ_Q == 2) {
+	else if (NINJ_Q == 2) {
 		if (countitem(7053) < 5 || countitem(1010) < 1) {
 			mes "[Suspicious Man]";
 			mes "Please bring";
@@ -532,7 +530,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		warp "amatsu",113,127;
 		end;
 	}
-	else if(NINJ_Q == 3) {
+	else if (NINJ_Q == 3) {
 		mes "[Red Leopard Joe]";
 		mes "Eh? I'm not sure what";
 		mes "happened, but it seems";
@@ -555,7 +553,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		warp "amatsu",113,127;
 		end;
 	}
-	else if(NINJ_Q == 4) {
+	else if (NINJ_Q == 4) {
 		mes "[Red Leopard Joe]";
 		mes "Cougar asked you to";
 		mes "gather some materials";
@@ -565,7 +563,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		mes "to beat him in a fair fight~";
 		close;
 	}
-	else if(NINJ_Q == 5 && Class == Job_Ninja) {
+	else if (NINJ_Q == 5 && Class == Job_Ninja) {
 		mes "[Red Leopard Joe]";
 		mes "Oh, you're a Ninja~";
 		mes "I hope you continue to";
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 6d748530f..6403c2648 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -1,22 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Taekwon Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Tsuyuki & Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena/Freya
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Official iRO TaeKwon Job Change Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Replaced previous TK Job Quest with this one [Tsuyuki]
 //= 1.1 Rewrote to the Aegis Standars. [Samuray22]
 //= 1.2 Fixed position the npc is facing. [Kisuka]
 //= 1.3 Added Quest Log commands. [Kisuka]
 //= 1.4 Removed use of 'goto', and fixed some indentation. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-payon,157,141,5	script	Phoenix#TKJobChange	753,{
+payon,157,141,5	script	Phoenix#TKJobChange	4_M_MONK,{
 	if(Upper == 2) {
 		mes "[Phoenix]";
 		mes "Hello, child.";
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 126db3baf..d778d789a 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1,33 +1,33 @@
 //===== Hercules Script ======================================
 //= Assassin Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
-//= 3.5
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 3.6
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Assassin class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Used some dialogue from the aegis Assassin script translated By: Pgro Team (OwNaGe)
-//= Also converted the booby traps from the aegis script.[kobra_k88]
+//=     Also converted the booby traps from the aegis script.[kobra_k88]
 //= 1.1 Made adjustments to ontouch npcs to work with the new "ontouch" functionality.
-//= Fixed some duplicate npc names.  Added missing waitingroom triggers.
-//= Fixed warp in "TimerSin", was supposed to be an areawarp.
-//= For some reason sometimes the "Nameless One" would have message windows
-//= without controls.  Changed the doevent that triggers him to an
-//= addtimer and that seemed make the prob. go away[kobra_k88]
+//=     Fixed some duplicate npc names.  Added missing waitingroom triggers.
+//=     Fixed warp in "TimerSin", was supposed to be an areawarp.
+//=     For some reason sometimes the "Nameless One" would have message windows
+//=     without controls.  Changed the doevent that triggers him to an
+//=     addtimer and that seemed make the prob. go away[kobra_k88]
 //= 1.2 Fixed WRONG skillpoint check! [Lupus]
 //= 1.2b Fixed missing commands and typos [Lupus]
 //= 1.3 Baby class Support added [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Removed Duplicates [Silent]
 //= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus]
-//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I 
-//= was still able to bypass it) [Toms]
+//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I
+//=     was still able to bypass it) [Toms]
 //= 2.4 Fixed skipping of Nameless NPC [Lupus]
 //= 2.5 Fixed a Rogue exploit [Lupus]
 //= 2.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
@@ -46,9 +46,10 @@
 //= 3.3 Added Quest Log commands. [Kisuka]
 //= 3.4 Removed the need for use of 'goto.' [L0ne_W0lf]
 //= 3.5 Fixed the waitingroom where player can enter the Test Area without passing the written exam. Now player will not be warp inside the Test Area when did not passed the written exam instead the player will be warp back to the written exam entrance [JayPee]
-//============================================================ 
+//= 3.6 Fixed broken event calls. [Euphy]
+//============================================================
 
-in_moc_16,19,33,1	script	Guildsman#asn	55,{
+in_moc_16,19,33,1	script	Guildsman#asn	1_M_JOBTESTER,{
 	if (Upper == 1) {
 		mes "[Ferocious-looking guy]";
 		mes "Hm? You....?";
@@ -253,9 +254,9 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 					mes "you to the office.";
 					close2;
 					set ASSIN_Q,0;
-					if(checkquest(8000) != -1) {
+					if (checkquest(8000) != -1) {
 						changequest 8000,8001;
-					}else{
+					} else {
 						setquest 8001;
 					}
 					warp "in_moc_16",19,76;
@@ -289,10 +290,10 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 	}
 }
 
-in_moc_16,25,90,1	script	Guildsman#ASN2	730,2,2,{
+in_moc_16,25,90,1	script	Guildsman#ASN2	4_M_JOB_ASSASSIN,2,2,{
 	mes "[Assassin 'Khai']";
 	mes "Umm?!";
-	Emotion e_gasp;
+	emotion e_gasp;
 	next;
 	mes "[Assassin 'Khai']";
 	mes "Come closer. I prefer to talk to people face to face. It really irritates me if I have to raise my voice, just so you can hear me.";
@@ -380,7 +381,7 @@ OnTouch:
 			close;
 		case 2:
 			mes "[Assassin 'Khai']";
-			if (sex) {
+			if (Sex) {
 				mes "Huh. You must have a lot of self confidence to be a Thief nowadays.";
 				next;
 				mes "[Assassin 'Khai']";
@@ -980,12 +981,12 @@ OnTouch:
 			mes "[The Anonymous One]";
 			mes "7. Choose the maximum AGI bonus an Assassin can get at job level 50.";
 			next;
-			if (select("7:8:9:10") == 4) 
+			if (select("7:8:9:10") == 4)
 				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "8. Choose the item that an Assassin cannot equip.";
 			next;
-			if (select("Dagger:Helm:Boots:Brooch") == 2) 
+			if (select("Dagger:Helm:Boots:Brooch") == 2)
 				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "9. Choose the job change item for Thief.";
@@ -1093,7 +1094,7 @@ OnTouch:
 	}
 }
 
-in_moc_16,21,165,2	script	Standby Room#ASNTEST	725,{
+in_moc_16,21,165,2	script	Standby Room#ASNTEST	4_F_JOB_ASSASSIN,{
 	end;
 
 OnInit:
@@ -1105,12 +1106,10 @@ OnInit:
 OnStartArena:
 	warpwaitingpc "in_moc_16", 66, 151;
 	attachrid($@warpwaitingpc[0]);
-	if(ASSIN_Q2<5)
-	{
+	if (ASSIN_Q2 < 5) {
 		warpchar "in_moc_16",20,145,getcharid(0);
 		end;
 	}
-	
 	donpcevent "Beholder#ASNTEST::OnEnable";
 	donpcevent "Keeper of the Door#ASN::OnDisable";
 	set getvariableofnpc(.DisableTraps,"Beholder#ASNTEST"),0;
@@ -1122,7 +1121,7 @@ OnStart:
 	end;
 }
 
-in_moc_16,21,165,2	script	Test Guide#ASN	725,4,4,{
+in_moc_16,21,165,2	script	Test Guide#ASN	4_F_JOB_ASSASSIN,4,4,{
 	end;
 
 OnTouch:
@@ -1256,7 +1255,7 @@ OnReset:
 	donpcevent "Standby Room#ASNTEST::OnStart";
 	end;
 
-OnResetmob:
+OnResetMob:
 	killmonster "in_moc_16","Beholder#ASNTEST::OnMyMobDead";
 	killmonster "in_moc_16","Beholder#ASNTEST::OnMyMobDead2";
 	stopnpctimer;
@@ -1270,7 +1269,7 @@ OnMyMobDead:
 		changequest 8003,8004;
 		donpcevent "timestopper#1::OnEnable";
 		donpcevent "Keeper of the Door#ASN::OnEnable";
-		donpcevent "Beholder#ASNTEST::OnResetmob";
+		donpcevent "Beholder#ASNTEST::OnResetMob";
 		set .DisableTraps,1;
 		stopnpctimer;
 	}
@@ -1355,7 +1354,7 @@ OnTouch:
 		mapannounce "in_moc_16",strcharinfo(0) + ", you're trapped. You will be sent back.",bc_map;
 		set ASSIN_Q,2;
 		warp "in_moc_16",19,161;
-		donpcevent "Beholder#ASNTEST::OnResetmob";
+		donpcevent "Beholder#ASNTEST::OnResetMob";
 		donpcevent "Standby Room#ASNTEST::OnStart";
 	}
 	end;
@@ -1445,7 +1444,7 @@ in_moc_16,86,147,0	duplicate(SinTrap)	18_2	-1,0,0
 in_moc_16,87,146,0	duplicate(SinTrap)	18_3	-1,0,0
 in_moc_16,87,147,0	duplicate(SinTrap)	18_4	-1,0,0
 
-in_moc_16,87,137,0	script	Keeper of the Door#ASN	45,2,1,{
+in_moc_16,87,137,0	script	Keeper of the Door#ASN	WARPNPC,2,1,{
 OnInit:
 	disablenpc "Keeper of the Door#ASN";
 	end;
@@ -1493,7 +1492,7 @@ OnMyMobDead:
 	end;
 }
 
-in_moc_16,89,98,1	script	Thomas#ASNTEST	118,5,1,{
+in_moc_16,89,98,1	script	Thomas#ASNTEST	2_M_THIEFMASTER,5,1,{
 	end;
 
 OnTouch:
@@ -1583,7 +1582,7 @@ OnDisable:
 	end;
 }
 
-in_moc_16,87,48,2	script	Barcardi#ASN	725,2,2,{
+in_moc_16,87,48,2	script	Barcardi#ASN	4_F_JOB_ASSASSIN,2,2,{
 OnTouch:
 	donpcevent "timestopper#1::OnDisable";
 	donpcevent "Thomas#ASNTEST::OnDisable";
@@ -1597,7 +1596,7 @@ OnTouch:
 	end;
 }
 
-in_moc_16,182,169,0	script	Maze Assistant	45,1,1,{
+in_moc_16,182,169,0	script	Maze Assistant	WARPNPC,1,1,{
 OnTouch:
 	if (ASSIN_Q == 5 || ASSIN_Q == 6) {
 		warp "in_moc_16",181,183;
@@ -1607,7 +1606,7 @@ OnTouch:
 	else {
 		mapannounce "in_moc_16",strcharinfo(0)+" has entered 'Guildmaster's room.'",bc_map;
 		savepoint "in_moc_16",181,183;
-		donpcevent "Guildmaster#ASN2::OnDisable";
+		donpcevent "Guildmaster#ASN1::OnCast";
 		warp "in_moc_16",167,113;
 		end;
 	}
@@ -1629,12 +1628,12 @@ OnTouch:
 	mes "at the end of maze.";
 	close;
 
-OnDisable:
+OnCast:
 	mapannounce "in_moc_16","...Next volunteer, please come in.",bc_map;
 	end;
 }
 
-in_moc_16,149,80,4	script	Guildmaster#ASN2	106,1,1,{
+in_moc_16,149,80,4	script	Guildmaster#ASN2	1_M_MOC_LORD,1,1,{
 OnTouch:
 	savepoint "morocc",100,100;
 	if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
@@ -1882,7 +1881,7 @@ OnTouch:
 				mes "Haha, the needs of the body are sometimes hard to ignore. It's best to accept that part of human nature.";
 				next;
 				mes "[Guildmaster]";
-				if (sex )
+				if (Sex)
 					mes "But you must never reveal to her the Assassin side of your life. No matter what it takes.";
 				else
 					mes "But you must never reveal to him the Assassin side of your life, no matter what it takes.";
@@ -1996,7 +1995,7 @@ OnTouch:
 		mes "'Beholder,' what";
 		mes "is your opinion?";
 		next;
-		donpcevent "[Huey]::OnDisable";
+		disablenpc "[Huey]";
 		mes "[Beholder]";
 		mes "Well, I don't like the course score. But, somehow the whole test was passed. I'm okay with this person.";
 		next;
@@ -2173,7 +2172,7 @@ OnTouch:
 	}
 }
 
-in_moc_16,186,81,1	script	Master Assist	55,1,1,{
+in_moc_16,186,81,1	script	Master Assist	1_M_JOBTESTER,1,1,{
 	mes "[Assistent Gayle Maroubitz]";
 	mes "Sorry, but I'm not in charge of job changes. Go to the Guildmaster, as he has told you.";
 	close;
@@ -2240,58 +2239,17 @@ OnTouch:
 	close;
 }
 
-in_moc_16,156,87,1	script	[Huey]	55,{
-	end;
-
-OnInit:
-	disablenpc "[Huey]";
-	end;
-}
-
-in_moc_16,156,85,1	script	[Khai]	730,{
-	end;
-
-OnInit:
-	disablenpc "[Khai]";
-	end;
-}
-
-in_moc_16,156,83,1	script	[The Anonymous One]	106,{
-	end;
-
-OnInit:
-	disablenpc "[The Anonymous One]";
-	end;
-}
-
-in_moc_16,156,81,2	script	[Barcardi]	725,{
-	end;
-
-OnInit:
-	disablenpc "[Barcardi]";
-	end;
-}
-
-in_moc_16,156,79,1	script	[Beholder]	118,{
-	end;
-
-OnInit:
-	disablenpc "[Beholder]";
-	end;
-}
-
-in_moc_16,156,77,1	script	[Thomas]	118,{
-	end;
-
-OnInit:
-	disablenpc "[Thomas]";
-	end;
-}
-
-in_moc_16,156,75,1	script	[Gayle Maroubitz]	55,{
+-	script	#moc_assin_dup	-1,{
 	end;
 
 OnInit:
-	disablenpc "[Gayle Maroubitz]";
+	disablenpc strnpcinfo(0);
 	end;
 }
+in_moc_16,156,87,1	duplicate(#moc_assin_dup)	[Huey]	1_M_JOBTESTER
+in_moc_16,156,85,1	duplicate(#moc_assin_dup)	[Khai]	4_M_JOB_ASSASSIN
+in_moc_16,156,83,1	duplicate(#moc_assin_dup)	[The Anonymous One]	1_M_MOC_LORD
+in_moc_16,156,81,2	duplicate(#moc_assin_dup)	[Barcardi]	4_F_JOB_ASSASSIN
+in_moc_16,156,79,1	duplicate(#moc_assin_dup)	[Beholder]	2_M_THIEFMASTER
+in_moc_16,156,77,1	duplicate(#moc_assin_dup)	[Thomas]	2_M_THIEFMASTER
+in_moc_16,156,75,1	duplicate(#moc_assin_dup)	[Gayle Maroubitz]	1_M_JOBTESTER
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index ba60ca5b4..c466925e1 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -14,13 +14,13 @@
 //===== Additional Comments: =================================
 //= Changed some npc names to the iRO names. Changed some variable
 //= names and labels. Edited some text.[kobra_k88]
-//= Removed "if(JobLevel > 48) goto higher". It was a left over line.
+//= Removed "if (JobLevel > 48) goto higher". It was a left over line.
 //= Thx to "Decker".[kobra_k88]
 //= Fixed some typos, thanks to Riotblade [celest]
 //= 1.3-1.5 Added Baby Class support [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 1.7 item quantity/ids typos fix
 //= 1.8 Moved the Quest to Einbroch [Poki#3]
 //= 2.0 Changed numbers to constants. [Vicious]
@@ -40,7 +40,7 @@
 //= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
 //==============================================================
 
-ein_in01,18,28,4	script	Guildsman#BLS	731,{
+ein_in01,18,28,4	script	Guildsman#BLS	4_M_JOB_BLACKSMITH,{
 	if (Upper == 1) {
 		mes "[Altiregen]";
 		mes "Hey hey. I don't have time for chit-chat, I'm a pretty busy guy. There's all these Merchants working hard to become Blacksmiths.";
@@ -72,7 +72,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 	mes "and tools is truly a form of art!";
 	next;
 	if (BaseClass == Job_Novice) {
-		if (sex == 0) {
+		if (Sex == 0) {
 			mes "[Altiregen]";
 			mes "Oh~";
 			mes "what a very";
@@ -248,7 +248,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 		else if (BSMITH_Q == 17 && countitem(1005) > 0 && JobLevel > 39) {
 			mes "[Altiregen]";
 			mes "Excellent, I can tell by the twinkle in your eye that you were successful. I can now bestow upon you the gift of the smithing, the art of the Blacksmith.";
-			if(checkquest(2015) != -1) {
+			if (checkquest(2015) != -1) {
 				changequest 2015,2016;
 			}
 			next;
@@ -269,14 +269,14 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 			mes "Congratulations!!!";
 			if (.@joblvl > 48)
 				getitem 999,30; //Steel
-			else 
+			else
 				getitem 999,5; //Steel
 			close;
 		}
 	}
 }
 
-ein_in01,201,27,3	script	Guildsman#alberta	63,{
+ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 	mes "[Geschupenschte]";
 	mes "Hello there!";
 	mes "I'm ^8E6B23Geschupenschte^000000,";
@@ -483,9 +483,9 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				mes "Let's see...your score is..." + .@black_q + " points.";
 				if (.@black_q == 100) {
 					set BSMITH_Q,3;
-					if(checkquest(2001) != -1) {
+					if (checkquest(2001) != -1) {
 						changequest 2001,2002;
-					}else{
+					} else {
 						changequest 2000,2002;
 					}
 					mes "Oh ho ho~";
@@ -500,7 +500,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 					close;
 				}
 				set BSMITH_Q,2;
-				if(checkquest(2001) == -1) {
+				if (checkquest(2001) == -1) {
 					changequest 2000,2001;
 				}
 				mes ".............";
@@ -653,7 +653,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				case 9:
 					mes "Okay, now take this to ^8E6B23Baisulist^000000 in Geffen of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
 					getitem 1610,1; //Arc_Wand
-					if(checkquest(2003) != -1) {
+					if (checkquest(2003) != -1) {
 						changequest 2003,2008;
 					}
 					next;
@@ -678,7 +678,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				case 10:
 					mes "Okay, now take this to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
 					getitem 1219,1; //Gladius
-					if(checkquest(2004) != -1) {
+					if (checkquest(2004) != -1) {
 						changequest 2004,2009;
 					}
 					next;
@@ -700,10 +700,10 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 					mes "Anyway, take this";
 					mes "to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom,";
 					break;
-				Case 11:
+				case 11:
 					mes "Okay, now take this to ^8E6B23Krongast^000000 in Lighthalzen. Simply deliver it and bring me the receipt.";
 					getitem 1119,1; //Tsurugi
-					if(checkquest(2005) != -1) {
+					if (checkquest(2005) != -1) {
 						changequest 2005,2010;
 					}
 					next;
@@ -729,7 +729,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				case 12:
 					mes "Okay, now take this to ^8E6B23Talpiz^000000 in Payon of Rune-Midgarts Kingdom. Simply deliver this and bring me the receipt.";
 					getitem 1713,1; //Arbalest
-					if(checkquest(2006) != -1) {
+					if (checkquest(2006) != -1) {
 						changequest 2006,2011;
 					}
 					next;
@@ -753,7 +753,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				case 13:
 					mes "Okay, now take this to ^8E6B23Bismarc^000000 in Hugel. Simply deliver this and bring back the receipt.";
 					getitem 1122,1; //Ring_Pommel_Saber
-					if(checkquest(2007) != -1) {
+					if (checkquest(2007) != -1) {
 						changequest 2007,2012;
 					}
 					next;
@@ -850,16 +850,16 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 				if (countitem(1073) > 0) {
 					set BSMITH_Q,15;
 					delitem 1073,1; //Merchant_Voucher_1
-					if(checkquest(2008) != -1) {
+					if (checkquest(2008) != -1) {
 						changequest 2008,2013;
 					}
-					else if(checkquest(2009) != -1) {
+					else if (checkquest(2009) != -1) {
 						changequest 2009,2013;
 					}
-					else if(checkquest(2010) != -1) {
+					else if (checkquest(2010) != -1) {
 						changequest 2010,2013;
 					}
-					else if(checkquest(2011) != -1) {
+					else if (checkquest(2011) != -1) {
 						changequest 2011,2013;
 					}
 					else {
@@ -931,7 +931,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 	}
 }
 
-geffen,46,164,1	script	Baisulist#BLS	69,{
+geffen,46,164,1	script	Baisulist#BLS	1_F_04,{
 	if (BSMITH_Q == 9 && countitem(1610) > 0) {
 		mes "[Baisulist]";
 		mes "Oh, hello!";
@@ -1006,7 +1006,7 @@ geffen,46,164,1	script	Baisulist#BLS	69,{
 	}
 }
 
-morocc,27,112,4	script	Wickebine#BLS	725,{
+morocc,27,112,4	script	Wickebine#BLS	4_F_JOB_ASSASSIN,{
 	if (BSMITH_Q == 10 && countitem(1219) > 0) {
 		cutin "Job_Black_hucke01",2;
 		mes "[Wickebine]";
@@ -1107,7 +1107,7 @@ morocc,27,112,4	script	Wickebine#BLS	725,{
 	}
 }
 
-lighthalzen,209,80,4	script	Krongast#BLS	734,{
+lighthalzen,209,80,4	script	Krongast#BLS	4_M_JOB_KNIGHT2,{
 	if (BSMITH_Q == 11 && countitem(1119) > 0) {
 		mes "[Krongast]";
 		mes "Ohhhhhh~";
@@ -1185,7 +1185,7 @@ lighthalzen,209,80,4	script	Krongast#BLS	734,{
 	}
 }
 
-payon,214,79,4	script	Talpiz#BLS	59,{
+payon,214,79,4	script	Talpiz#BLS	1_M_ORIENT01,{
 	if (BSMITH_Q == 12 && countitem(1713) > 0) {
 		mes "[Talpiz]";
 		mes "Oh~";
@@ -1259,7 +1259,7 @@ payon,214,79,4	script	Talpiz#BLS	59,{
 	}
 }
 
-hugel,168,183,1	script	Bismarc#BLS	118,{
+hugel,168,183,1	script	Bismarc#BLS	2_M_THIEFMASTER,{
 	if (BSMITH_Q == 13 && countitem(1122) > 0) {
 		mes "[Bismarc]";
 		mes "Sweet God...";
@@ -1356,7 +1356,7 @@ hugel,168,183,1	script	Bismarc#BLS	118,{
 	}
 }
 
-ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
+ein_in01,24,41,5	script	Blacksmith Guildsman#moc	4_F_JOB_BLACKSMITH,{
 	if (BSMITH_Q == 16) {
 		emotion e_hmm;
 		mes "[Mitehmaeeuh]";
@@ -1578,7 +1578,7 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 	}
 }
 
-geffen_in,109,170,3	script	Blacksmith Guildsman#gef	726,{
+geffen_in,109,170,3	script	Blacksmith Guildsman#gef	4_F_JOB_BLACKSMITH,{
 	mes "[Blacksmith Guildsman]";
 	mes "Good day, are you here to visit Blacksmith Guild?";
 	next;
@@ -1616,7 +1616,7 @@ geffen_in,109,170,3	script	Blacksmith Guildsman#gef	726,{
 			mes "Excuse me, but you do not have enough money.";
 			close;
 		}
-		set zeny,zeny-600;
+		Zeny -= 600;
 		warp "izlude",94,103;
 		end;
 	case 3:
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 2777e0a43..1acb63a8b 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -1,17 +1,15 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Hunter Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= EREMES THE CANIVALIZER (Aegis)Translated by yoshiki (Aegis)
 //= Converted by kobra_k88
 //= Further bugfixed and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Hunter class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 0.5 Fully working.
 //= 0.6 Changed global variable names to unique ones.
 //= 0.7 - 0.8 Updates for rAthena +Knight2,Crusader2 fix
@@ -22,8 +20,8 @@
 //= 1.3 Added Baby Class support [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 1.6a Infinite Arrows exploit fix (thanx to Lorky, that
 //= reported the bug) [Lupus]
 //= 1.7 Moved the Job QUest to Hugel [Poki#3]
@@ -46,19 +44,19 @@
 //= 3.0a Corrected a Typo error ";;". [Samuray22]
 //= 3.1 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
 //= 3.2 Fixes a bug where the timer was stopped causing the [L0ne_W0lf]
-//=	test to freeze. (bugreport:1099)
+//=     test to freeze. (bugreport:1099)
 //= 3.3 Added missing next. [L0ne_W0lf]
 //= 3.4 Corrected some Issues with the Waiting Room. (bugreport:1890) [Samuray22]
-//=	-Deleted a Unnecesary Next; on Hunter Guildsman#hnt. (bugreports:1665,2239,2179)
+//=     Deleted a Unnecesary Next; on Hunter Guildsman#hnt. (bugreports:1665,2239,2179)
 //= 3.5 Added Quest Log commands. [Kisuka]
 //= 3.6 Removed the need for use of 'goto.' [L0ne_W0lf]
 //= 3.7 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
-//============================================================ 
+//============================================================
 
 // Notices in the old Hunter Guild.
-//============================================================ 
-in_hunter,99,99,4	script	Hunter Info#hnt::HntNotice	727,{
-	mes "============ Notice ============";
+//============================================================
+in_hunter,99,99,4	script	Hunter Info#hnt::HntNotice	4_F_JOB_HUNTER,{
+	mes "============Notice ============";
 	mes "We would like to inform that the Hunter Job Change Location";
 	mes "has been moved to ^ff0000Hugel^000000 in the Schwaltzvalt Republic.";
 	next;
@@ -74,11 +72,11 @@ in_hunter,99,99,4	script	Hunter Info#hnt::HntNotice	727,{
 	close;
 }
 
-pay_fild10,148,252,3	duplicate(HntNotice)	Job Change Location#hu	857
+pay_fild10,148,252,3	duplicate(HntNotice)	Job Change Location#hu	4_BOARD3
 
 // Actual Job quest start
-//============================================================ 
-hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
+//============================================================
+hu_in01,386,373,4	script	Hunter Guildsman#hnt	4_F_JOB_HUNTER,{
 	if (Upper == 1) {
 		mes "[Hunter Sherin]";
 		mes "Oh, how have you been? It's been a long time, hasn't it?";
@@ -125,7 +123,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 		mes "Oh, a person who serves God! Nice to meet you. There aren't many people like you that visit this place~ Hehe.";
 		close;
 	}
-	else if (Baseclass == Job_Merchant) {
+	else if (BaseClass == Job_Merchant) {
 		mes "[Hunter Guildsman]";
 		mes "Oh...";
 		mes "How's your business coming along?";
@@ -182,7 +180,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 			mes "[Hunter Sherin]";
 			mes "Tada~ Congratulations!";
 			mes "You look great as a Hunter!!";
-			set .@joblvl,joblevel;
+			set .@joblvl, JobLevel;
 			completequest 4013;
 			callfunc "Job_Change",Job_Hunter;
 			callfunc "F_ClearJobVar";		// clears all job variables for the current player
@@ -438,7 +436,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 			mes "Just give the item to the Demon Hunter, the guy who's all the way to the left in this area~";
 			next;
 			mes "[Hunter Sherin]";
-			if (sex)
+			if (Sex)
 				mes "If you decide to become a Hunter, promise to come visit me. I want to see you as a Hunter. You would look great!!";
 			else
 				mes "If you decide to become a Hunter, come and visit me, okay? You're pretty, but... You'd be even prettier as a Hunter. Hehe~";
@@ -470,7 +468,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 	close;
 }
 
-hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
+hu_in01,382,382,4	script	Guild Receptionist#hnt	4_M_JOB_HUNTER,{
 	if (HNTR_Q == 2) {
 		mes "[Guild Receptionist]";
 		mes "Greetings. They call me... ^660000The Demon Hunter^000000. I am the one in charge of processing applications. Your name is ... " + strcharinfo(0) + ", correct?";
@@ -517,7 +515,7 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 		case 5: setarray .@items[0], 935,9, 955,9, 508,9, 7; changequest 4001,4006; break;
 		//Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
 		case 6: setarray .@items[0], 913,3, 938,1, 948,1, 8; changequest 4001,4007; break;
-		//Porcupine_Spike, Yoyo_Tailm Acorn
+		//Porcupine_Spike, Yoyo_Tail, Acorn
 		case 7: setarray .@items[0], 1027,2, 942,1, 1026,1, 9; changequest 4001,4008; break;
 		}
 		if (.@selection == 1) {
@@ -538,7 +536,7 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 		switch(HNTR_Q) {
 		//Insect_Feeler/Claw_Of_Desert_Wolf, Wooden_Block, White_Herb
 		case 3: setarray .@items[0], (.@i?928:7030),5, 1019,5, 509,3, 10; break;
-		//Bill_Of_Birds, Skel_Bonem Green_Herb
+		//Bill_Of_Birds, Skel_Bone, Green_Herb
 		case 4: setarray .@items[0], 925,3, 932,5, 511,3, 10; break;
 		//Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb
 		case 5: setarray .@items[0], (.@i?1013:937),3, 919,3, 507,5, 10; break;
@@ -548,7 +546,7 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 		case 7: setarray .@items[0], 935,9, 955,9, 508,9, 11; break;
 		//Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
 		case 8: setarray .@items[0], 913,3, 938,1, 948,1, 11; break;
-		//Porcupine_Spike, Yoyo_Tailm Acorn
+		//Porcupine_Spike, Yoyo_Tail, Acorn
 		case 9: setarray .@items[0], 1027,2, 942,1, 1026,1, 11; break;
 		}
 		mes "[Demon Hunter]";
@@ -614,7 +612,7 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 	}
 }
 
-payon_in03,131,7,3	script	Hunter#htnGM	59,{
+payon_in03,131,7,3	script	Hunter#htnGM	1_M_ORIENT01,{
 	if (HNTR_Q == 10) {
 		mes "[Hunter Guildmaster]";
 		mes "Hmpf. You must be here for the Hunter job test. Let me tell you about the testing process. What would you like to know?";
@@ -767,7 +765,7 @@ payon_in03,131,7,3	script	Hunter#htnGM	59,{
 	}
 }
 
-payon_in02,21,31,1	script	Hunter#htnGM2	59,{
+payon_in02,21,31,1	script	Hunter#htnGM2	1_M_ORIENT01,{
 	cutin "job_huntermaster",2;
 	if (HNTR_Q == 11) {
 		mes "[Hunter Guildmaster]";
@@ -968,7 +966,7 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 	}
 }
 
-job_hunte,178,32,1	script	Guide#hnt	107,5,2,{
+job_hunte,178,32,1	script	Guide#hnt	1_M_PAY_ELDER,5,2,{
 OnTouch:
 	if (HNTR_Q == 12) {
 		mes "[Guide]";
@@ -1025,7 +1023,7 @@ OnTouch:
 	end;
 }
 
-job_hunte,178,38,1	script	Waiting Room#hnt	66,{
+job_hunte,178,38,1	script	Waiting Room#hnt	1_F_01,{
 	end;
 
 OnInit:
@@ -1044,7 +1042,7 @@ OnStart:
 	end;
 }
 
-job_hunte,1,1,1	script	Manager#hnt	66,{
+job_hunte,1,1,1	script	Manager#hnt	1_F_01,{
 OnInit:
 	disablenpc "Manager#hnt";
 	end;
@@ -1099,7 +1097,7 @@ OnMyMobDead:
 	if (.MyMobs < 3) {
 		mapannounce "job_hunte","Okay, good job... Now, find the switch in the center of the map!! Be careful of the traps!!",bc_map;
 		set HNTR_Q,14;
-		donpcevent "switch#hnt::OnEnable";
+		donpcevent "Switch#hnt::OnEnable";
 		donpcevent "Manager#hnt::OnDisable";
 	}
 	else {
@@ -1205,7 +1203,7 @@ OnTimer197000:
 	end;
 }
 
-job_hunte,93,101,1	script	Switch#hnt	723,1,1,{
+job_hunte,93,101,1	script	Switch#hnt	1_SHADOW_NPC,1,1,{
 OnTouch:
 	mes "^3355FFThere are 3 buttons";
 	mes "on the escape switch.^000000";
@@ -1248,7 +1246,7 @@ OnEnable:
 	end;
 }
 
-job_hunte,89,139,0	script	exit#hnttest	45,2,2,{
+job_hunte,89,139,0	script	exit#hnttest	WARPNPC,2,2,{
 OnInit:
 	disablenpc "exit#hnttest";
 	end;
@@ -1265,7 +1263,7 @@ OnTouch:
 }
 
 // Hunter Job test traps.
-//============================================================ 
+//============================================================
 job_hunte,52,140,0	script	1-1::HntTrap	-1,0,1,{
 OnTouch:
 	switch(rand(200)) {
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index f3b31c0a0..da1d8a8e4 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -1,17 +1,15 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Knight Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= PGRO TEAM (Aegis).
 //= Converted by kobra_k88
 //= Further bugfixed and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Knight class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Fully working.  Please comment out any pre-existing warps for the
 //= test rooms in any other files so that the ones specified here can work.
 //= 1.1 Fixed a major bug.  Now using the initnpctimer command,
@@ -30,7 +28,7 @@
 //= 2.3 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
 //= 2.4 Minor fixes to timer#knt. [L0ne_W0lf]
 //= 2.5 Fixes a small bug with making claymores. [L0ne_W0lf]
-//=	Corrected usages of killmonster and killmonsterall.
+//=     Corrected usages of killmonster and killmonsterall.
 //= 2.6 Corrected an improper areawarp destination. [L0ne_W0lf]
 //= 2.7 Deleted unused variables. [Samuray22]
 //= 2.7a Corrected a Typo error ";;". [Samuray22]
@@ -40,9 +38,9 @@
 //= 3.1 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
 //= 3.2 More Renewal updates and some optimization. [Euphy]
 //= 3.3 Fixed missing changequest. [Joseph]
-//============================================================ 
+//============================================================
 
-prt_in,88,101,4	script	Chivalry Captain#knt	56,{
+prt_in,88,101,4	script	Chivalry Captain#knt	1_M_KNIGHTMASTER,{
 	mes "[Captain Herman]";
 	if (Upper == 1) {
 		mes "Hm? You're... What is it about you? I've been an honorable Knight for a long time, but I cannot understand this feeling I'm getting from you...";
@@ -373,7 +371,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 		mes "to Amy's opinion.";
 		next;
 		mes "[Lady Amy]";
-		if (sex) {
+		if (Sex) {
 			mes "Mmm~ He's so polite!";
 			mes "He'll grow to be a wonderful Knight. And he's got such cute widdle cheeeeks~ Hee hee!";
 		}
@@ -392,7 +390,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 		mes "your mind.";
 		next;
 		mes "[Sir Edmond]";
-		if (sex) {
+		if (Sex) {
 			mes "He seems a little rough, but something bright shines within him. With polish and refinement, his true value will shine forth";
 			mes "as the sun.";
 		}
@@ -466,7 +464,7 @@ L_Mission:
 	}
 }
 
-prt_in,75,107,4	script	Sir Andrew#knt	65,{
+prt_in,75,107,4	script	Sir Andrew#knt	1_M_YOUNGKNIGHT,{
 	mes "[Sir Andrew]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -670,7 +668,7 @@ prt_in,75,107,4	script	Sir Andrew#knt	65,{
 	}
 }
 
-prt_in,71,91,0	script	Sir Siracuse#knt	65,{
+prt_in,71,91,0	script	Sir Siracuse#knt	1_M_YOUNGKNIGHT,{
 	mes "[Sir Siracuse]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -694,7 +692,7 @@ prt_in,71,91,0	script	Sir Siracuse#knt	65,{
 			mes "If you catch any of the new guys acting in a way unbecoming of a Knight, scold them for me please?";
 			close;
 		}
-		else if (Baseclass == Job_Novice) {
+		else if (BaseClass == Job_Novice) {
 			mes "Oh?";
 			mes "What is a Novice";
 			mes "doing here?";
@@ -1055,7 +1053,7 @@ prt_in,71,91,0	script	Sir Siracuse#knt	65,{
 	}
 }
 
-prt_in,79,94,4	script	Sir Windsor#knt	733,{
+prt_in,79,94,4	script	Sir Windsor#knt	4_M_JOB_KNIGHT1,{
 	mes "[Sir Windsor]";
 	mes "...";
 	next;
@@ -1119,7 +1117,7 @@ prt_in,79,94,4	script	Sir Windsor#knt	733,{
 			mes "......";
 			next;
 			mes "[Sir Windsor]";
-			if (KNIGHT_Q == 6) 
+			if (KNIGHT_Q == 6)
 				mes "...Follow me.";
 			else {
 				mes "...Fine.";
@@ -1150,7 +1148,7 @@ prt_in,79,94,4	script	Sir Windsor#knt	733,{
 
 // Test 2 part 1
 //==========================================================
-job_knt,89,106,4	script	Knight Windsor#knt	733,{
+job_knt,89,106,4	script	Knight Windsor#knt	4_M_JOB_KNIGHT1,{
 	mes "[Sir Windsor]";
 	mes "...";
 	next;
@@ -1223,7 +1221,7 @@ job_knt,89,106,4	script	Knight Windsor#knt	733,{
 	}
 }
 
-job_knt,89,106,4	script	Windsor Benedict#knt	733,{
+job_knt,89,106,4	script	Windsor Benedict#knt	4_M_JOB_KNIGHT1,{
 	end;
 
 OnInit:
@@ -1445,7 +1443,7 @@ OnTimer182000:
 
 // Test 3 (Manners)
 //==========================================================
-prt_in,69,107,6	script	Lady Amy#knt	728,{
+prt_in,69,107,6	script	Lady Amy#knt	4_F_JOB_KNIGHT,{
 	mes "[Lady Amy]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -1787,7 +1785,7 @@ prt_in,69,107,6	script	Lady Amy#knt	728,{
 
 // Test 4 (patience)
 //==========================================================
-prt_in,70,99,6	script	Sir Edmond#knt	734,{
+prt_in,70,99,6	script	Sir Edmond#knt	4_M_JOB_KNIGHT2,{
 	mes "[Sir Edmond]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -1940,7 +1938,7 @@ prt_in,70,99,6	script	Sir Edmond#knt	734,{
 	}
 }
 
-job_knt,1,1,1	script	Timer#knt	107,{
+job_knt,1,1,1	script	Timer#knt	1_M_PAY_ELDER,{
 OnTimer300000:
 	enablenpc "Warp#knt";
 	end;
@@ -1989,7 +1987,7 @@ OnMyMobDead:
 	end;
 }
 
-job_knt,145,57,1	script	Warp#knt	107,22,22,{
+job_knt,145,57,1	script	Warp#knt	1_M_PAY_ELDER,22,22,{
 OnInit:
 	disablenpc "Warp#knt";
 	end;
@@ -2002,7 +2000,7 @@ OnTouch:
 
 // Test 5, and creates Claymores for knights
 //==========================================================
-prt_in,87,92,4	script	Sir Gray#knt	119,{
+prt_in,87,92,4	script	Sir Gray#knt	2_M_SWORDMASTER,{
 	mes "[Sir Gray]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -2028,8 +2026,7 @@ prt_in,87,92,4	script	Sir Gray#knt	119,{
 				mes "1 ^3355FFSteel^000000 because of the Claymore's characteristics. If you like, I can create one for you. For the honor of the Prontera Chivalry!";
 				close;
 			case 2:
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 1800) {
+				if (MaxWeight - Weight < 1800) {
 					mes "[Sir Gray]";
 					mes "Oh no...";
 					mes "It seems that you are carrying too many things. You don't have enough space for a heavy Claymore in your inventory.";
@@ -2065,7 +2062,7 @@ prt_in,87,92,4	script	Sir Gray#knt	119,{
 						mes "You attained a reliable item.";
 						mes "It'll be a good companion on your adventures.";
 						delitem 999,1; //Steel
-						set Zeny, Zeny - 74000;
+						Zeny -= 74000;
 						getitem 1163,1; //Claymore
 						close;
 					}
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index c05b140aa..57f6a2647 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -1,22 +1,24 @@
 //===== Hercules Script ======================================
 //= Priest Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Translated By: Pgro Team (OwNaGe)(Aegis)
 //= Converted by: kobra_k88.
 //= Further bugfixed and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.6
-//===== Description: ========================================= 
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Priest class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working.  Changed the way Priests enter the test room to help Acos.
 //= Must use this with the included Acolyte quest to work properely.
 //= 1.3 Added Baby Class support, fixed 3 wrong constants bugs [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Merged JFunc [Lupus]
 //= 2.1a Fixed typo [KarLaeda]
@@ -30,7 +32,7 @@
 //= 2.6 Removed the need for use of 'goto.' [L0ne_W0lf]
 //==========================================================
 
-prt_church,16,41,4	script	High Bishop#prst	60,{
+prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 	// Uncomment the following 'if' statement to allow High Priests to assist Acolytes with the job change quest.
 	// Officially High Priests are blocked from helping by an indiscriminate check if you are a transcended character.
 	//if (Class == Job_High_Priest) set .@AllowHPAssist,1;
@@ -47,7 +49,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		if (BaseJob == Job_Priest) {
 			mes "[Bishop Paul]";
 			mes "Ah...";
-			if (sex)
+			if (Sex)
 				mes "It is good to see you again, Brother " + strcharinfo(0) + ". Once again, God's grace has caused our paths to cross.";
 			else
 				mes "It is good to see you once again, Sister " + strcharinfo(0) + ". The grace of God has brought you once more before me.";
@@ -114,7 +116,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		else if (BaseClass == Job_Novice) {
 			mes "[Bishop Paul]";
 			mes "May God be";
-			if (sex)
+			if (Sex)
 				mes "with you, brother.";
 			else
 				mes "with you, sister.";
@@ -147,7 +149,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		else {
 			mes "[Bishop Paul]";
 			mes "May God be";
-			if (sex)
+			if (Sex)
 				mes "with you, brother.";
 			else
 				mes "with you, sister.";
@@ -202,7 +204,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 	if (PRIEST_Q == 0) {
 		mes "[Bishop Paul]";
 		mes "May God bless";
-		if (sex)
+		if (Sex)
 			mes "you, Brother.";
 		else
 			mes "you, Sister.";
@@ -242,7 +244,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 				set PRIEST_Q,1;
 				setquest 8009;
 					mes "[Bishop Paul]";
-				if (sex)
+				if (Sex)
 					mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Brother " + strcharinfo(0) + ".";
 				else
 					mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Sister " + strcharinfo(0) + ".";
@@ -327,7 +329,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 			mes "Thank you for asking.";
 			next;
 			mes "[Bishop Paul]";
-			if (sex)
+			if (Sex)
 				mes "I hope you will continue to go on your mission as God's servant, brother.";
 			else
 				mes "I hope you will continue to go on your mission as God's servant, sister.";
@@ -499,7 +501,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "[Bishop Paul]";
 		mes "God, grant your power to your servant standing before you.";
 		changequest 8015,8016;
-		if (sex)
+		if (Sex)
 			mes "Let him send your message throughout the ends of the earth.";
 		else
 			mes "Let her send your message throughout the ends of the earth.";
@@ -530,7 +532,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 	}
 }
 
-prt_church,27,24,1	script	Sister Cecilia	79,{
+prt_church,27,24,1	script	Sister Cecilia	1_F_PRIEST,{
 	mes "[Sister Cecilia]";
 	if (BaseJob != Job_Acolyte) {
 		if (BaseJob == Job_Priest) {
@@ -575,7 +577,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		close;
 	}
 	if (PRIEST_Q == 0) {
-		if (sex)
+		if (Sex)
 			mes "May God bless you, brother.";
 		else
 			mes "May God bless you, sister.";
@@ -656,7 +658,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		mes "Welcome. You demonstrated great effort to accomplish your first trial. Now, speak to Bishop Paul so that you can begin your next trial on your path to Priesthood.";
 		next;
 		mes "[Sister Cecilia]";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
@@ -702,14 +704,14 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		}
 		next;
 		mes "[Sister Cecilia]";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
 		mes "We will now begin your formal oath for the Priesthood. Make yourself comfortable, and just answer with your heart.";
 		next;
 		mes "[Sister Cecilia]";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +",";
 		else
 			mes "Sister "+ strcharinfo(0) +",";
@@ -800,7 +802,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 			close;
 		}
 		mes "[Sister Cecilia]";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
@@ -842,11 +844,11 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 
 // 2nd Test
 //==========================================================
-job_prist,24,187,4	script	Peter S. Alberto	110,{
+job_prist,24,187,4	script	Peter S. Alberto	4_M_MINISTER,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"!";
 		else
 			mes "Sister "+ strcharinfo(0) +"!";
@@ -1030,11 +1032,11 @@ OnDisable:
 	end;
 }
 
-job_prist,23,187,1	script	Peter S. Alberto#2	110,{
+job_prist,23,187,1	script	Peter S. Alberto#2	4_M_MINISTER,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
-		if (sex)
+		if (Sex)
 			mes "Brother "+ strcharinfo(0) +"!";
 		else
 			mes "Sister "+ strcharinfo(0) +"!";
@@ -1085,7 +1087,7 @@ OnDisable:
 	end;
 }
 
--	script	Zombie_Generator#prst	110,{
+-	script	Zombie_Generator#prst	4_M_MINISTER,{
 OnInit:
 	disablenpc "Zombie_Generator#prst";
 	end;
@@ -1099,30 +1101,30 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onm1:
+OnM1:
 	set .MyMobs,13;
 	monster "job_prist",24,52,"Theft",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",18,52,"Want of Virtue",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",30,52,"Jealousy",1015,1,"Z_C#prst::OnMyMobDead";
 	end;
 
-Onm2:
+OnM2:
 	monster "job_prist",21,62,"Fury",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",27,62,"Envy",1015,1,"Z_C#prst::OnMyMobDead";
 	end;
 
-Onm3:
+OnM3:
 	monster "job_prist",24,72,"Arrogance",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",18,72,"Lewdness",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",30,72,"Sloth",1015,1,"Z_C#prst::OnMyMobDead";
 	end;
 
-Onm4:
+OnM4:
 	monster "job_prist",21,82,"Gluttony",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",27,82,"Greed",1015,1,"Z_C#prst::OnMyMobDead";
 	end;
 
-Onm5:
+OnM5:
 	monster "job_prist",24,92,"Despair",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",18,92,"Distrust",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",30,92,"Fear",1015,1,"Z_C#prst::OnMyMobDead";
@@ -1194,7 +1196,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm1";
+		donpcevent "Zombie_Generator#prst::OnM1";
 		donpcevent "Zombie1_1::OnDisable";
 	}
 	end;
@@ -1215,7 +1217,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm2";
+		donpcevent "Zombie_Generator#prst::OnM2";
 		donpcevent "Zombie2_1::OnDisable";
 	}
 	end;
@@ -1236,7 +1238,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm3";
+		donpcevent "Zombie_Generator#prst::OnM3";
 		donpcevent "Zombie3_1::OnDisable";
 	}
 	end;
@@ -1257,7 +1259,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm4";
+		donpcevent "Zombie_Generator#prst::OnM4";
 		donpcevent "Zombie4_1::OnDisable";
 	}
 	end;
@@ -1277,7 +1279,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm5";
+		donpcevent "Zombie_Generator#prst::OnM5";
 		donpcevent "Zombie5_1::OnDisable";
 	}
 	end;
@@ -1290,7 +1292,7 @@ OnDisable:
 	disablenpc "Zombie5_1";
 }
 
-job_prist,24,109,4	script	prst1_1	45,3,3,{
+job_prist,24,109,4	script	prst1_1	WARPNPC,3,3,{
 OnTouch:
 	set .@mobs,getvariableofnpc(.MyMobs,"Zombie_Generator#prst");
 	if (BaseJob == Job_Priest) warp "job_prist",168,17;
@@ -1306,7 +1308,7 @@ OnTouch:
 
 // 3rd Test
 //==========================================================
-job_prist,168,45,4	script	Deviruchi#prst	1109,8,1,{
+job_prist,168,45,4	script	Deviruchi#prst	DEVIRUCHI,8,1,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
 		mes "[Deviruchi]";
@@ -1370,7 +1372,7 @@ OnTouch:
 		mes "[Deviruchi]";
 		mes "But how about this...? Now, isn't this an attractive sight? A nice, shiny new card. Mint condition. Not too many people have this you know. But I happen to have soooo many, my pockets hurt.";
 		next;
-		cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",4;
+		cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",4; // Mistress Card
 		mes "[Deviruchi]";
 		mes "Isn't it everyone's dream to have one of these? Think about it, being a Priest can only bring you suffering...";
 		next;
@@ -1380,7 +1382,7 @@ OnTouch:
 			mes "This card can";
 			mes "can be yours...";
 			next;
-			cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255;
+			cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255; // Mistress Card
 			mes "[Deviruchi]";
 			mes "Theoretically!";
 			mes "BWAHAHAHAHAHAHAHA!";
@@ -1389,7 +1391,7 @@ OnTouch:
 			warp "mjolnir_05",200,200;
 			end;
 		}
-		cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255;
+		cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255; // Mistress Card
 		mes "[Deviruchi]";
 		mes "Did...";
 		mes "Did you just tell";
@@ -1407,7 +1409,7 @@ OnTouch:
 	end;
 }
 
-job_prist,168,80,4	script	Doppelganger#prst	1046,8,1,{
+job_prist,168,80,4	script	Doppelganger#prst	DOPPELGANGER,8,1,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
 		mes "[Doppelganger]";
@@ -1476,7 +1478,7 @@ OnTouch:
 	}
 }
 
-job_prist,168,115,4	script	Dark Lord#prst	1272,8,1,{
+job_prist,168,115,4	script	Dark Lord#prst	DARK_LORD,8,1,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
 		mes "[Dark Lord]";
@@ -1533,7 +1535,7 @@ OnTouch:
 	}
 }
 
-job_prist,168,150,4	script	Baphomet#prst	736,8,1,{
+job_prist,168,150,4	script	Baphomet#prst	4_BAPHOMET,8,1,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
 		mes "[Baphomet]";
@@ -1595,7 +1597,7 @@ OnTouch:
 	}
 }
 
-job_prist,168,180,4	script	prst2_1	45,3,3,{
+job_prist,168,180,4	script	prst2_1	WARPNPC,3,3,{
 OnTouch:
 	if (BaseJob == Job_Priest) warp "job_prist",98,40;
 	else if (BaseClass == Job_Acolyte) {
@@ -1607,7 +1609,7 @@ OnTouch:
 
 // 4th Test
 //==========================================================
-job_prist,1,2,1	script	Mummy_Generator	110,1,1,{
+job_prist,1,2,1	script	Mummy_Generator	4_M_MINISTER,1,1,{
 OnInit:
 	disablenpc "Mummy_Generator";
 	end;
@@ -1618,17 +1620,17 @@ OnEnable:
 	donpcevent "Mummy3_1::OnEnable";
 	end;
 
-Onm1:
+OnM1:
 	monster "job_prist",90,55,"Khamoz",1041,1;
 	monster "job_prist",105,55,"Amocsis",1041,1;
 	end;
 
-Onm2:
+OnM2:
 	monster "job_prist",90,70,"Mentuhoteph",1041,1;
 	monster "job_prist",105,70,"Akenaten",1041,1;
 	end;
 
-Onm3:
+OnM3:
 	monster "job_prist",90,85,"Mehnes",1041,1;
 	monster "job_prist",105,85,"Snepheru",1041,1;
 	end;
@@ -1646,7 +1648,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Mummy_Generator::Onm1";
+		donpcevent "Mummy_Generator::OnM1";
 		donpcevent "Mummy1_1::OnDisable";
 	}
 	end;
@@ -1667,7 +1669,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Mummy_Generator::Onm2";
+		donpcevent "Mummy_Generator::OnM2";
 		donpcevent "Mummy2_1::OnDisable";
 	}
 	end;
@@ -1688,7 +1690,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Mummy_Generator::Onm3";
+		donpcevent "Mummy_Generator::OnM3";
 		donpcevent "Mummy3_1::OnDisable";
 	}
 	end;
@@ -1702,11 +1704,11 @@ OnDisable:
 	end;
 }
 
-job_prist,98,105,4	script	prst3_1	45,3,3,{
+job_prist,98,105,4	script	prst3_1	WARPNPC,3,3,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
 		warp "prt_church",15,36;
-		end; 
+		end;
 	}
 	else if (BaseClass == Job_Acolyte) {
 		set PRIEST_Q,7;
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index 6598a0cc2..b1b4d05ab 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Wizard Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= (Aegis) Translated by yoshiki, converted by kobra_k88
 //= Further bugfixed and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Wizard class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 2.5 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
 //= 2.5a More bugfixes care of Barron-Monster. [L0ne_W0lf]
@@ -18,7 +16,7 @@
 //= 2.5c Bug fixes. Cleaned up some NPCs slightly. [L0ne_W0lf]
 //= 2.6 Fixed Water Room not warping on time-up. [L0ne_W0lf]
 //= 2.7 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
-//= 	Other minor fixes to various NPCs.
+//=     Other minor fixes to various NPCs.
 //= 2.7a Added end; :D (bugreport:2038) [Yommy]
 //= 2.8 Fixed donpcevent to doevent. (bugreport:2311) [SoulBlaker]
 //= 2.9 Reverted the change of donpcevent to doevent. [L0ne_W0lf]
@@ -27,9 +25,9 @@
 //= 3.1 Removed the need for use of 'goto.' [L0ne_W0lf]
 //= 3.2 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
 //= 3.3 Fixed waitingroom bug. [Euphy]
-//============================================================ 
+//============================================================
 
-gef_tower,111,37,4	script	Wizard Guildsman	70,{
+gef_tower,111,37,4	script	Wizard Guildsman	1_F_GYPSY,{
 	if (Upper == 1) {
 		mes "[Catherine]";
 		mes "? Excuse me, I am wondering if we have met before...?";
@@ -47,7 +45,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 			mes "Now, excuse me.";
 			next;
 			mes "[Catherine]";
-			if (sex)
+			if (Sex)
 				mes "Well, If you intended to ask me on a date... I appreciate it...hohoho.";
 			else
 				mes "Well, if you fix me up with a cute guy... I'd appreciate it...hohoho!.";
@@ -375,7 +373,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "You...*sigh*...I didn't think you would do such a dishonorable thing.";
 		next;
 		mes "[Catherine]";
-		if (sex) {
+		if (Sex) {
 			mes "Granted you're a mage, but how could a guy be so weak?!";
 			mes "Well, at least your alive still. Go back and try harder this time. ~tehehehe";
 		}
@@ -448,7 +446,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 	}
 }
 
-gef_tower,102,24,2	script	Gloomy Wizard	735,{
+gef_tower,102,24,2	script	Gloomy Wizard	4_M_JOB_WIZARD,{
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Wizard) {
 			mes "[Raulel]";
@@ -457,7 +455,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 			next;
 			mes "[Raulel]";
 			mes "Don't live dishonestly, or impolitely, or else one day you'll be caught in a spell you can't control, and BOOM, your dead!";
-			if (sex == 1) {
+			if (Sex) {
 				mes "If you don't want that to happen, then learn how to use spells properly!";
 				next;
 				mes "[Raulel]";
@@ -1055,7 +1053,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 	}
 }
 
-job_wiz,50,165,4	script	Arena Assistant	700,{
+job_wiz,50,165,4	script	Arena Assistant	8_F_GIRL,{
 	mes "[Arena Assistant]";
 	mes "Welcome to the Wizard Job Change Arena.";
 	mes "If you would like to take the final test, then please enter the waiting room.";
@@ -1088,7 +1086,7 @@ OnStart:
 
 // Water Room (Test 2 part 1)
 //==========================================================
-job_wiz,1,1,1	script	Room of Water	66,{
+job_wiz,1,1,1	script	Room of Water	1_F_01,{
 OnInit:
 	disablenpc "Room of Water";
 	end;
@@ -1182,7 +1180,7 @@ OnTimer186000:
 	end;
 }
 
-job_wiz,1,2,1	script	Room of Water#Door	66,{
+job_wiz,1,2,1	script	Room of Water#Door	1_F_01,{
 OnInit:
 	disablenpc "Room of Water#Door";
 	end;
@@ -1261,7 +1259,7 @@ OnTouch:
 
 // Earth Room (Test 2 part 2)
 //==========================================================
-job_wiz,1,3,1	script	Room of Earth	66,{
+job_wiz,1,3,1	script	Room of Earth	1_F_01,{
 OnInit:
 	disablenpc "Room of Earth";
 	end;
@@ -1356,7 +1354,7 @@ OnTimer186000:
 	end;
 }
 
-job_wiz,1,4,1	script	Room of Earth#Door	66,{
+job_wiz,1,4,1	script	Room of Earth#Door	1_F_01,{
 OnInit:
 	disablenpc "Room of Earth#Door";
 	end;
@@ -1441,7 +1439,7 @@ OnTouch:
 
 // Fire Room (Test 2 part 3)
 //==========================================================
-job_wiz,1,5,1	script	Room of Fire	66,{
+job_wiz,1,5,1	script	Room of Fire	1_F_01,{
 OnInit:
 	disablenpc "Room of Fire";
 	end;
@@ -1534,7 +1532,7 @@ OnTimer186000:
 	end;
 }
 
-job_wiz,1,6,1	script	Room of Fire#Door	66,{
+job_wiz,1,6,1	script	Room of Fire#Door	1_F_01,{
 OnInit:
 	disablenpc "Room of Fire#Door";
 	end;
@@ -1621,7 +1619,7 @@ OnTouch:
 	end;
 }
 
-job_wiz,1,7,1	script	Test Helper#wiz	66,{
+job_wiz,1,7,1	script	Test Helper#wiz	1_F_01,{
 	end;
 
 OnInit:
@@ -1659,7 +1657,7 @@ OnTimer9000:
 	end;
 }
 
-gef_tower,107,36,4	script	White Dog#wiz	81,{
+gef_tower,107,36,4	script	White Dog#wiz	4_DOG01,{
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Wizard) {
 			mes "[Maria]";
@@ -1962,9 +1960,9 @@ gef_tower,107,36,4	script	White Dog#wiz	81,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 Now using the initnpctimer command, donpcevent,
 //= and new waitingroom event commands.  No more addtimer spamming.
 //= No longer have to talk to the npc to take the test.  Just enter the chat room.
diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt
index a1f12d64b..a9fdee622 100644
--- a/npc/jobs/2-1a/AssassinCross.txt
+++ b/npc/jobs/2-1a/AssassinCross.txt
@@ -3,17 +3,17 @@
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
+valkyrie,44,58,5	script	Assassin Cross#Valkyrie	4_F_JOB_ASSASSIN,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt
index ae96a122e..e7dffe9b9 100644
--- a/npc/jobs/2-1a/HighPriest.txt
+++ b/npc/jobs/2-1a/HighPriest.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
+valkyrie,44,42,5	script	High Priest#Valkyrie	1_M_PASTOR,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 58f1bfce8..ab5dc6424 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
+valkyrie,44,47,5	script	High Wizard#Valkyrie	4_M_JOB_WIZARD,{
 	if (ADVJOB == 0 ||  Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
@@ -62,7 +60,7 @@ valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
 			mes "all of your remaining Skill Points before returning to me.";
 			close;
 		}
-		jobchange Job_high_Wizard;
+		jobchange Job_High_Wizard;
 		set ADVJOB,0;
 		mes "[High Wizard]";
 		mes "Congratulations.";
diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt
index ba998483e..eb310e360 100644
--- a/npc/jobs/2-1a/LordKnight.txt
+++ b/npc/jobs/2-1a/LordKnight.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,44,39,5	script	Lord Knight#Valkyrie	56,{
+valkyrie,44,39,5	script	Lord Knight#Valkyrie	1_M_KNIGHTMASTER,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt
index cf5f4881e..c7060cdf6 100644
--- a/npc/jobs/2-1a/Sniper.txt
+++ b/npc/jobs/2-1a/Sniper.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
+valkyrie,44,55,5	script	Sniper#Valkyrie	4_F_JOB_HUNTER,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt
index 42ac6164b..590f68143 100644
--- a/npc/jobs/2-1a/WhiteSmith.txt
+++ b/npc/jobs/2-1a/WhiteSmith.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
+valkyrie,44,50,5	script	MasterSmith#Valkyrie	4_M_JOB_BLACKSMITH,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
@@ -40,7 +38,7 @@ valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
 		mes "crafting...";
 		close;
 	}
-	else if (ADVJOB == Job_WhiteSmith && Class == Job_Merchant_High && JobLevel > 39) {
+	else if (ADVJOB == Job_Whitesmith && Class == Job_Merchant_High && JobLevel > 39) {
 		mes "[MasterSmith]";
 		mes "The time has come!";
 		mes "Our world needs brave,";
diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index 778aa09c9..ca04c46c9 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.txt
@@ -1,25 +1,23 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Star Gladiator Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Celestria, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Star Gladiator class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Updated to the Aegis Standards. [Samuray22]
 //= 1.1a Corrected a minor error respect to the header. [Samuray22]
 //= 1.1b Corrected NPC name length warning. [L0ne_W0lf]
 //= 1.1c Changed item names to item IDs. [Samuray22]
 //= 1.2 Another round of updates to the script. [L0ne_W0lf]
-//=	Removes the use of labels, and correcets other errors.
+//=     Removes the use of labels, and correcets other errors.
 //= 1.3 Added Quest Log commands. [Kisuka]
 //============================================================
 
-payon,215,102,3	script	Moohyun#job_star	828,3,3,{
+payon,215,102,3	script	Moohyun#job_star	4_M_ROGUE,3,3,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 0) {
 			mes "[Moohyun]";
@@ -355,7 +353,7 @@ OnTouch:
 	close;
 }
 	
-comodo,172,230,3	script	Wandering Master#job_sta	730,{
+comodo,172,230,3	script	Wandering Master#job_sta	4_M_JOB_ASSASSIN,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 1) {
 			mes "[Moogang]";
@@ -818,7 +816,7 @@ comodo,172,230,3	script	Wandering Master#job_sta	730,{
 	close;
 }
 
-job_star,29,33,0	script	Daru#job_star	59,{
+job_star,29,33,0	script	Daru#job_star	1_M_ORIENT01,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 3) {
 			mes "[Daru]";
@@ -1103,7 +1101,7 @@ job_star,29,33,0	script	Daru#job_star	59,{
 	close;
 }
 
-job_star,95,33,0	script	Beeryu#job_star	106,{
+job_star,95,33,0	script	Beeryu#job_star	1_M_MOC_LORD,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 4) {
 			mes "[Beeryu]";
@@ -1415,7 +1413,7 @@ job_star,95,33,0	script	Beeryu#job_star	106,{
 	close;
 }
 
-job_star,161,33,0	script	Cheehee#job_star	77,{
+job_star,161,33,0	script	Cheehee#job_star	1_F_ORIENT_03,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 6) {
 			mes "[Cheehee]";
@@ -1636,11 +1634,11 @@ job_star,161,33,0	script	Cheehee#job_star	77,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= A temp Star Gladiator Job Changer based on the kRO quest.
 //= Quest info from RagnaInfo.
 //= Sprites from kRO screenshots, bar two which I just had to guess at.
 //= 1.0 Optimized, updated [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index dd568b9ef..7e5ca7e33 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -2,22 +2,23 @@
 //= Alchemist Job Quest
 //===== By: ==================================================
 //= nestor_zulueta (Fusion), converted by Darkchild
-//===== Current Version: ===================================== 
-//= 3.0
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 3.1
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Alchemist classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 2.6 Corrected a bug in advanced class checking. [L0ne_W0lf]
 //= 2.7 Added missing checkweights. [L0ne_W0lf]
 //= 2.8 Fixed minor typo in test section. [L0ne_W0lf]
 //= 2.9 Added Quest Log commands. [Kisuka]
 //= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
-//============================================================ 
+//= 3.1 Added missing changequest commands. [Kisuka]
+//============================================================
 
-alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
+alde_alche,27,185,5	script	Alchemist Guildsman#am	4_F_ALCHE,{
 	mes "[Parmy Gianino]";
 	if (Upper == 1) {
 		mes "Welcome to the";
@@ -175,7 +176,7 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 					mes "Come back to me when you have 50,000 Zeny, otherwise we can't process your application.";
 					close;
 				}
-				set zeny,zeny-50000;
+				Zeny -= 50000;
 				mes "[Parmy Gianino]";
 				mes "Let's see.";
 				mes "" + strcharinfo(0);
@@ -320,7 +321,7 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 	}
 }
 
-alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
+alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 	mes "[Raspuchin Gregory]";
 	if (BaseJob != Job_Merchant) {
 		if (BaseJob == Job_Alchemist) {
@@ -440,7 +441,7 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 				mes "Wait...";
 				mes "Maybe I've";
 				mes "misjudged you.";
-				if (sex == 1) {
+				if (Sex) {
 					mes "You might be a pretty boy,";
 					mes "but I can tell you're smart";
 					mes "from your eyes.";
@@ -465,6 +466,7 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 				mes "He'll teach you how to do the experiments. Just tell him that";
 				mes "I sent you.";
 				set ALCH_Q,6;
+				changequest 2031,2032;
 				close;
 			}
 			else {
@@ -789,7 +791,7 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 	close;
 }
 
-alde_alche,13,15,7	script	Studying Man#am	750,{
+alde_alche,13,15,7	script	Studying Man#am	4_M_ALCHE_C,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you are carrying -";
@@ -1090,6 +1092,7 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			mes "and cast away the last";
 			mes "vestiges of Merchant life!!";
 			set ALCH_Q,40;
+			changequest 2033,2034;
 			close;
 		}
 		else if (countitem(7134) > 2 && countitem(713) > 2 && countitem(507) > 0 && countitem(508) > 0 && countitem(509) > 0) {
@@ -1333,7 +1336,7 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 	}
 }
 
-alde_alche,79,19,5	script	Experiment Expert#am	748,{
+alde_alche,79,19,5	script	Experiment Expert#am	4_M_ALCHE_A,{
 	mes "[Van Helmont]";
 	if (BaseJob != Job_Merchant) {
 		if (BaseJob == Job_Alchemist) {
@@ -1585,7 +1588,7 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 	}
 }
 
-alde_alche,101,184,4	script	Master Alchemist#am	122,{
+alde_alche,101,184,4	script	Master Alchemist#am	2_M_DYEINGER,{
 	cutin "job_alche_vincent",2;
 	mes "[Vincent Carsciallo]";
 	if (Upper == 1) {
@@ -1687,6 +1690,9 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 		if(checkquest(2039) != -1) {
 			changequest 2039,2040;
 		}
+		if(checkquest(2034) != -1) {
+			changequest 2034,2040;
+		}
 		mes "Ah, well done.";
 		mes "I can see that you";
 		mes "have learned all of";
@@ -1703,7 +1709,6 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 		mes "illustrious Union.";
 		mes "I hope you learn a lot...";
 		next;
-
 		if (.@jlevel == 50) {
 			getitem 7133,1; //Slim_Potion_Create_Book
 			mes "[Vincent Carsciallo]";
@@ -1767,7 +1772,7 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 	}
 }
 
-alde_alche,145,19,1	script	Chief Researcher#am	57,{
+alde_alche,145,19,1	script	Chief Researcher#am	1_M_LIBRARYMASTER,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you are carrying -";
@@ -1888,8 +1893,7 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 		}
 	}
 	else if (ALCH_Q == 22) {
-		set .@now_weight,MaxWeight-Weight;
-		if (.@now_weight < 1370) {
+		if (MaxWeight - Weight < 1370) {
 			mes "[Nicholas Flamel]";
 			mes "Whoa...";
 			mes "You're carrying too much stuff! First, put some of your things in Kafra Storage.";
@@ -1978,23 +1982,24 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0 Working.
-//= npc/quests/counteragent_mixture.txt Also Needed
-//= npc/quests/quests_yuno.txt Also Needed [Darkchild]
-//= v1.1 Fixed some minor bugs.  Optimized some lines. Re-organized the script a bit. 
-//= Giving Parmry NPC, Hammer and Old Book now waves the 50000 fee. (based of mRO website)
-//= Having a joblvl of 50 allows you to skip Rasputin's test. (based of mRO website) [kobra_k88]
+//============================================================
+//= 1.0 Working.
+//=     npc/quests/counteragent_mixture.txt Also Needed
+//=     npc/quests/quests_yuno.txt Also Needed [Darkchild]
+//= 1.1 Fixed some minor bugs.  Optimized some lines. Re-organized the script a bit.
+//=     Giving Parmry NPC, Hammer and Old Book now waves the 50000 fee. (based of mRO website)
+//=     Having a joblvl of 50 allows you to skip Rasputin's test. (based of mRO website) [kobra_k88]
 //= 1.2 fixed a few typos (have to hunt more) [Lupus]
 //= 1.3 Added Baby Class Support [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 1.6a fixed some wrong answers, thanks to zlider for info [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.2 Got rid of 'al_morgen' var. Now uses (MISC_QUEST & 4) [Lupus]
 //= 2.3 Optimized, changed job numbers to constants. Fixed some spelling [Lupus]
 //= 2.4 Added alternative prizes according to JobLevel [Lupus]
 //= 2.4a Fixed 2 wrong answers in Rasputin's test [Lupus]
+//============================================================
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 77a81374f..24d49cbce 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -2,9 +2,9 @@
 //= Bard Job Quest
 //===== By: ==================================================
 //= Muad_Dib(The Prometheus Project), Lupus, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.6
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Bard class
 //===== Additional Comments: =================================
@@ -25,7 +25,7 @@
 
 // Ayealo
 //============================================================
-comodo,226,123,5	script	Wandering Bard	741,{
+comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 	if(Upper == 1) {
 		mes "[Lalo]";
 		mes "Chosen ones who are destined to become Gods";
@@ -80,7 +80,7 @@ comodo,226,123,5	script	Wandering Bard	741,{
 			mes "Always full of happy moments~";
 			next;
 			mes "[Lalo]";
-			if (sex) {
+			if (Sex) {
 				mes "Forget about your worries~";
 				mes "And enjoy everything~";
 			}
@@ -94,7 +94,7 @@ comodo,226,123,5	script	Wandering Bard	741,{
 	else if(BARD_Q == 0) {
 		cutin "job_bard_aiolo01",2;
 		mes "[Lalo]";
-		if (sex) mes "Hi! Delightful Archer.";
+		if (Sex) mes "Hi! Delightful Archer.";
 		else mes "Hello! Beautiful Archer Lady.";
 		mes "How can a wanderer like me help you?";
 		next;
@@ -485,7 +485,7 @@ comodo,226,123,5	script	Wandering Bard	741,{
 				mes "Turned into a dragon and ate him.";
 				next;
 				input .@Song$;
-				if (.@Song$ != "There was a man") 
+				if (.@Song$ != "There was a man")
 					set .@w_point,.@w_point+1;
 
 				mes "^3377FFThere was a man";
@@ -935,16 +935,17 @@ S_ChangeJob:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 07/06/05 : Added 1st Version. [Muad_Dib]
 //= Converted to rAthena format by Dr.Evil
-//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0 
+//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0
 //= 1.1 Optimized, changed some stuff, fixed some bugs [Lupus]
 //= 1.1a minor song test fix [Lupus]
 //= 1.2 Fixed wrong item ID, added missing commands [Lupus]
 //= 1.3 Updated flower sub-quest according to official [Lupus]
 //= 1.4 Changed priority for the gifts. Now you can win the 1st
-//= prize, too. Added Izidor flower [Lupus]
+//=     prize, too. Added Izidor flower [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
+//============================================================
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 3fa61960f..d5bcd70ea 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Crusader Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Made by: Black Dragon
 //= Converted by: Shin
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Crusader classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.2 Updated All NPCs to the officials one [Samuray22]
 //=     -Based on the ASB 4.0 Package.
 //=-Maybe need be checked the monsters in the test 2 and 4.
@@ -34,9 +32,9 @@
 //= 3.3 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================
 
-
-//=============== Senior Crusader: 1st Collect Items Test============================
-prt_castle,45,169,5	script	Senior Crusader	752,{
+// Senior Crusader: 1st Collect Items Test
+//============================================================
+prt_castle,45,169,5	script	Senior Crusader	4_M_CRU_OLD,{
 	mes "[Michael Halig]";
 	if (Upper == 1) { //the baby classes were totally blocked... due to missing == 1
 		mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it.";
@@ -45,7 +43,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		mes "You don't belong here, my friend.";
 		mes "Be advised to continue practicing yourself.";
 		close;
-	} 
+	}
 	else if(BaseJob != Job_Swordman) {
 		if(BaseJob == Job_Crusader) {
 			mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it.";
@@ -70,7 +68,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		mes "[Michael Halig]";
 		mes "As it happened one thousand years ago, evil forces will one day attack in droves in an attempt to take over the world once again.";
 		close;
-	} 
+	}
 	else if(CRUS_Q <= 3 && countitem(1004) && countitem(1009)) {
 		mes "Ah...";
 		mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities.";
@@ -126,8 +124,8 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 					mes "[Michael Halig]";
 					mes "Train yourself more as a Swordsman and wait for your calling. I understand your intent, but as of now, you cannot join us.";
 					close;
-				} 
-				if (Skillpoint) {
+				}
+				if (SkillPoint) {
 					mes "[Michael Halig]";
 					mes "You haven't finished learning everything as a Swordsman. Use all of your remaining skill points, and then return to me.";
 					close;
@@ -207,7 +205,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			close;
 		}
 		mes "[Michael Halig]";
-		if (sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
+		if (Sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
 		else mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming.";
 		close;
 	}
@@ -216,25 +214,25 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		next;
 		switch(CRUS_Q) {
 		case 1:
-			set @item1, 957;
-			set @item2, 959;
-			set @item3, 1099;
-			set @item4, 901;
+			set .@item1, 957;
+			set .@item2, 959;
+			set .@item3, 1099;
+			set .@item4, 901;
 			break;
-		Case 2:
-			set @item1, 932;
-			set @item2, 1043;
-			set @item3, 1098;
-			set @item4, 1094;
+		case 2:
+			set .@item1, 932;
+			set .@item2, 1043;
+			set .@item3, 1098;
+			set .@item4, 1094;
 			break;
-		Case 3:
-			set @item1, 958;
-			set @item2, 930;
-			set @item3, 1041;
-			set @item4, 1062;
+		case 3:
+			set .@item1, 958;
+			set .@item2, 930;
+			set .@item3, 1041;
+			set .@item4, 1062;
 			break;
 		}
-		if (countitem(@item1) > 9 && countitem(@item2) > 9 && countitem(@item3) > 9 && countitem(@item4) > 9) {
+		if (countitem(.@item1) > 9 && countitem(.@item2) > 9 && countitem(.@item3) > 9 && countitem(.@item4) > 9) {
 			mes "[Michael Halig]";
 			mes "Ah, well done.";
 			mes "I must acknowledge your efforts and determination. You may now proceed to take the next test.";
@@ -242,10 +240,10 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			mes "[Michael Halig]";
 			mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
 			next;
-			delitem @item1, 10;
-			delitem @item2, 10;
-			delitem @item3, 10;
-			delitem @item4, 10;
+			delitem .@item1, 10;
+			delitem .@item2, 10;
+			delitem .@item3, 10;
+			delitem .@item4, 10;
 			set CRUS_Q, 4;
 			if(checkquest(3006) != -1) {
 				changequest 3006,3009;
@@ -264,10 +262,10 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		mes "Ah, you still have not completed the task I have given to you. Bring me the following items, and prove your will to become a Crusader to me...";
 		next;
 		mes "[Michael Halig]";
-		mes "10 ^3355FF"+getitemname(@item1)+"^000000";
-		mes "10 ^3355FF"+getitemname(@item2)+"^000000";
-		mes "10 ^3355FF"+getitemname(@item3)+"^000000";
-		mes "10 ^3355FF"+getitemname(@item4)+"^000000";
+		mes "10 ^3355FF"+getitemname(.@item1)+"^000000";
+		mes "10 ^3355FF"+getitemname(.@item2)+"^000000";
+		mes "10 ^3355FF"+getitemname(.@item3)+"^000000";
+		mes "10 ^3355FF"+getitemname(.@item4)+"^000000";
 		next;
 		mes "[Michael Halig]";
 		mes "If you put forth the effort, you'll be able to accomplish this task. May Odin protect you on your journeys.";
@@ -295,10 +293,10 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		mes "[Michael Halig]";
 		mes "Now you are";
 		mes "one of us!";
-		if (sex) mes "...Brother.";
+		if (Sex) mes "...Brother.";
 		else mes "...Comrade.";
 		next;
-		if(.@JobLevel != 50) getitem 504, 6;
+		if(.@Joblevel != 50) getitem 504, 6;
 		else getitem 504, 12;
 		mes "[Michael Halig]";
 		mes "And use this in times of dire peril. It will give you strength when your wounds are most grievous.";
@@ -314,8 +312,9 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 	close;
 }
 
-//===================== Suffering Man: 2nd Endurance Test ===============================================
-prt_castle,164,32,1	script	Man in Anguish	733,{
+// Suffering Man: 2nd Endurance Test
+//============================================================
+prt_castle,164,32,1	script	Man in Anguish	4_M_JOB_KNIGHT1,{
 	mes "[Murnak Mijoul]";
 	if(BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Crusader) {
@@ -346,7 +345,7 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 	else if(CRUS_Q == 4) {
 		mes "What is it...?";
 		mes "Do you have business";
-		if (sex) mes "with me, man of the sword?";
+		if (Sex) mes "with me, man of the sword?";
 		else mes "with me, woman of the sword?";
 		next;
 		if (select("I'd like to take the Crusader test.:Nothing.") == 1) {
@@ -447,8 +446,9 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 	close;
 }
 
-//===================== Gabriel Valentine: 3rd Knowledge Test =================================
-prt_church,95,127,3	script	Crusader	745,{
+// Gabriel Valentine: 3rd Knowledge Test
+//============================================================
+prt_church,95,127,3	script	Crusader	4_F_CRU,{
 	mes "[Gabriel Valentine]";
 	if(BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Crusader) {
@@ -550,7 +550,7 @@ prt_church,95,127,3	script	Crusader	745,{
 			mes "4. Which Undead monster";
 			mes "has the highest HP?";
 			next;
-			if (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner") == 4) 
+			if (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner") == 4)
 				set .@cru_t,.@cru_t+10;
 
 			mes "[Gabriel Valentine]";
@@ -769,7 +769,7 @@ prt_church,95,127,3	script	Crusader	745,{
 		mes "[Gabriel Valentine]";
 		mes "Don't stress, you need to know a lot in order to pass this test. In any case, I'll be waiting right here. When you think you're ready, come back, alright?";
 		close;
-	} 
+	}
 	else if(CRUS_Q == 8 || CRUS_Q == 9) {
 		mes "Like I mentioned before, you should go to Prontera Castle and meet with Bliant Piyord to take your next test. Good luck, and become a Crusder soon, alright?";
 		close;
@@ -795,8 +795,9 @@ prt_church,95,127,3	script	Crusader	745,{
 	close;
 }
 
-//===================== Crusader: 4th Purification Test =====================================================
-prt_castle,35,151,5	script	Patron Knight	751,{
+// Crusader: 4th Purification Test
+//============================================================
+prt_castle,35,151,5	script	Patron Knight	4_M_CRU,{
 	mes "[Bliant Piyord]";
 	mes "Welcome.";
 	if(BaseJob != Job_Swordman) {
@@ -937,7 +938,7 @@ prt_castle,35,151,5	script	Patron Knight	751,{
 		mes "I shall be";
 		mes "waiting.";
 		close;
-	} 
+	}
 	else if(CRUS_Q == 10) {
 		mes "Congratulations.";
 		mes "You have completed";
@@ -970,8 +971,12 @@ prt_castle,35,151,5	script	Patron Knight	751,{
 
 
 
-//=== Actual tests ========================================
-//=== Endurance Test ======================================
+// Actual tests
+//============================================================
+
+//----------------------------------------------------------------------------
+// Endurance Test
+//----------------------------------------------------------------------------
 job_cru,1,1,1	script	Summoner#cr1	-1,{
 OnTimer300000:
 	donpcevent "Summoner#cr1::OnReset";
@@ -1108,7 +1113,7 @@ OnInit:
 	monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#cr3::OnDead";
 	monster "job_cru",92,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
 	monster "job_cru",104,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
-	Initnpctimer;
+	initnpctimer;
 	end;
 
 OnStart:
@@ -1121,7 +1126,7 @@ OnStart:
 	monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#cr3::OnDead";
 	monster "job_cru",92,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
 	monster "job_cru",104,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
-	Initnpctimer;
+	initnpctimer;
 	end;
 
 OnReset:
@@ -1197,7 +1202,7 @@ OnDead:
 }
 
 
-job_cru,98,105,4	script	 Summoner#cr5	45,3,3,{
+job_cru,98,105,4	script	 Summoner#cr5	WARPNPC,3,3,{
 OnTouch:
 	set CRUS_Q,6;
 	changequest 3010,3011;
@@ -1205,8 +1210,10 @@ OnTouch:
 	end;
 }
 
-//=== Purification Test ===================================
-job_cru,24,187,4	script	Patron Knight#2	751,{
+//----------------------------------------------------------------------------
+// Purification Test
+//----------------------------------------------------------------------------
+job_cru,24,187,4	script	Patron Knight#2	4_M_CRU,{
 	mes "[Bliant Piyord]";
 	mes "Welcome.";
 	mes "You will take";
@@ -1223,7 +1230,7 @@ job_cru,24,187,4	script	Patron Knight#2	751,{
 	close;
 }
 
-job_cru,24,187,2	script	Waiting Room#cr1	700,{
+job_cru,24,187,2	script	Waiting Room#cr1	8_F_GIRL,{
 	end;
 
 OnInit:
@@ -1401,7 +1408,7 @@ OnDead:
 	end;
 }
 
-job_cru,168,180,4	script	Monster Summon#cr5	45,3,3,{
+job_cru,168,180,4	script	Monster Summon#cr5	WARPNPC,3,3,{
 OnInit:
 	disablenpc "Monster Summon#cr5";
 	end;
@@ -1458,9 +1465,9 @@ OnStop:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Need optimalization and fixing
 //= thanks to Komurka, KiLLaLeN, Lupus (fixing error)
 //= just a temp Job Quest
@@ -1478,4 +1485,5 @@ OnStop:
 //=     Hand of God allow to skip item gathering [DracoRPG]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Fixed endless loop, wrong condition check [Lupus]
-//=	also changed all job numbers to constants, fixed logic
+//=     also changed all job numbers to constants, fixed logic
+//============================================================
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index b52d808fd..6b4ddf5b0 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -1,18 +1,16 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Dancer Job Quest
 //===== By: ==================================================
 //= Kalen - Original jAthena
 //= Fredzilla - Converted, Lupus
-//===== Current Version: ===================================== 
-//= 3.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 3.7a
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Dancer classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 3.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 3.2a Deleted unused variables. [Samuray22]
 //= 3.3 Updated waiting room. (Removes global var) [L0ne_W0lf]
 //= 3.4 Fixed bad variables, bugreport:1685 [Brainstorm]
@@ -20,9 +18,10 @@
 //= 3.6 Applied Correction bug with for loop. [L0ne_W0lf]
 //= 3.6a Fixed a little Exploit to bug the quest with a timeout. (bugreport:2252) [Samuray22]
 //= 3.7 Added Quest Log commands. [Kisuka]
+//= 3.7a Fixed a label execution. [Euphy]
 //============================================================
 
-comodo,180,153,4	script	Sonotora#1	90,{
+comodo,180,153,4	script	Sonotora#1	4_F_01,{
 	mes "[Athena Sonotora]";
 	mes "They say the";
 	mes "famous dance school";
@@ -42,7 +41,7 @@ comodo,180,153,4	script	Sonotora#1	90,{
 	close;
 }
 
-comodo,193,151,4	script	Bor Robin#1	86,{
+comodo,193,151,4	script	Bor Robin#1	4_M_04,{
 	mes "[Bor Robin]";
 	mes "Aah....";
 	mes "A prima donna";
@@ -75,7 +74,7 @@ comodo,193,151,4	script	Bor Robin#1	86,{
 	close;
 }
 
-job_duncer,43,93,4	script	Aile#da	724,{
+job_duncer,43,93,4	script	Aile#da	4_F_07,{
 	if (Upper == 1) {
 		mes "[Aile]";
 		mes "One two three four,";
@@ -132,7 +131,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 		cutin "",255;
 		end;
 	}
-	if (DANC_Q == 0 && sex == 0 && BaseJob == Job_Archer) {
+	if (DANC_Q == 0 && Sex == 0 && BaseJob == Job_Archer) {
 		cutin "job_dancer_eir01",2;
 		mes "[Aile]";
 		mes "Welcome~!";
@@ -208,7 +207,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 		cutin "",255;
 		end;
 	}
-	else if (sex == 1) {
+	else if (Sex == 1) {
 		cutin "job_dancer_eir03",2;
 		mes "[Aile]";
 		mes "Welco--Mmm?";
@@ -287,15 +286,15 @@ job_duncer,43,93,4	script	Aile#da	724,{
 	}
 	else if (DANC_Q >= 2 && DANC_Q <= 4) {
 		switch(DANC_Q) {
-		case 2: 
+		case 2:
 			setarray .@item[0], 938,909,501,2403;
 			setarray .@count[0], 20,3,5,1;
 			break;
-		case 3: 
+		case 3:
 			setarray .@item[0], 1055,2405;
 			setarray .@count[0], 5,1;
 			break;
-		case 4: 
+		case 4:
 			setarray .@item[0], 965,503,909,1020,2401;
 			setarray .@count[0], 2,5,20,10,1;
 			break;
@@ -317,7 +316,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 			mes "tuition fee.";
 			next;
 			cutin "job_dancer_eir01",2;
-			set zeny,zeny-10000;
+			Zeny -= 10000;
 			mes "[Aile]";
 			mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you.";
 			set DANC_Q,5;
@@ -409,7 +408,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 	}
 }
 
-job_duncer,95,93,4	script	Bijou#da	101,{
+job_duncer,95,93,4	script	Bijou#da	4W_F_01,{
 	if (SkillPoint) {
 		mes "[Bijou]";
 		mes "You can't change jobs";
@@ -890,11 +889,11 @@ job_duncer,95,93,4	script	Bijou#da	101,{
 			getitem 1950,1; //Rope
 		close;
 	}
-} 
+}
 
 // Waiting Room
-//============================================================ 
-job_duncer,32,154,1	script	Waiting Room#dance	66,{
+//============================================================
+job_duncer,32,154,1	script	Waiting Room#dance	1_F_01,{
 	end;
 
 OnInit:
@@ -919,7 +918,7 @@ OnEnable:
 	end;
 }
 
-job_duncer,32,154,1	script	Waiting Room#click	66,{
+job_duncer,32,154,1	script	Waiting Room#click	1_F_01,{
 	mes "[Pyorgin]";
 	mes "Please wait in";
 	mes "the waiting room.";
@@ -935,7 +934,7 @@ job_duncer,32,154,1	script	Waiting Room#click	66,{
 }
 
 // Dance Timer
-//============================================================ 
+//============================================================
 job_duncer,69,105,0	script	Bijou#dance_timer	-1,{
 OnEnable:
 	initnpctimer;
@@ -1288,7 +1287,7 @@ OnEnable:
 }
 
 // Dance Move Triggers
-//============================================================ 
+//============================================================
 -	script	dancestep::StepTrigger	-1,1,1,{
 OnTouch:
 	donpcevent "Backdancer#1::OnOmg";
@@ -1322,65 +1321,65 @@ OnDisable:
 }
 
 // Backup Dancers
-//============================================================ 
-job_duncer,63,110,4	script	Backdancer#1::BackDancer	724,{
+//============================================================
+job_duncer,63,110,4	script	Backdancer#1	4_F_07,{
 	end;
 
 OnSmile:
-	Emotion e_no1;
+	emotion e_no1;
 	donpcevent "Backdancer#2::OnSmile";
 	donpcevent "Backdancer#3::OnSmile";
 	donpcevent "Backdancer#4::OnSmile";
 	end;
 
 OnOmg:
-	Emotion e_omg;
+	emotion e_omg;
 	donpcevent "Backdancer#2::OnOmg";
 	donpcevent "Backdancer#3::OnOmg";
 	donpcevent "Backdancer#4::OnOmg";
 	end;
 }
 
-job_duncer,66,113,4	script	Backdancer#2	724,{
+job_duncer,66,113,4	script	Backdancer#2	4_F_07,{
 	end;
 
 OnSmile:
-	Emotion e_no1;
+	emotion e_no1;
 	end;
 
 OnOmg:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-job_duncer,72,113,4	script	Backdancer#3	724,{
+job_duncer,72,113,4	script	Backdancer#3	4_F_07,{
 	end;
 
 OnSmile:
-	Emotion e_no1;
+	emotion e_no1;
 	end;
 
 OnOmg:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-job_duncer,75,110,4	script	Backdancer#4	724,{
+job_duncer,75,110,4	script	Backdancer#4	4_F_07,{
 	end;
 
 OnSmile:
-	Emotion e_no1;
+	emotion e_no1;
 	end;
 
 OnOmg:
-	Emotion e_omg;
+	emotion e_omg;
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= 1.1 Removed the warp I left here my accident, added a check for using 
+//============================================================
+//= 1.1 Removed the warp I left here my accident, added a check for using
 //=     Improved Concentration and arrow shower, people could get away with it
 //=     [Fredzilla]
 //= 1.0 I tried to keep as much the same from the Jap version as possible
@@ -1389,14 +1388,15 @@ OnOmg:
 //=     along with some optimization. [Fredzilla]
 //= 1.5 Added Baby Class Support [Fredzilla]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Script check #1. [Lance]
 //= 2.2 Fixed unpassable part, thx2 Alis [Lupus]
 //= 2.3 Updated initnpctimer to attach player to jobDq script [Skotlex]
 //= 2.4 Attached chrid to be able obtain player's SP on mobs death, optimized a bit [Lupus]
 //= 2.5 Final fix of chrid issues, changed 'Improved
-//=	Concentration' to 'Attention Concentrate' [Lupus]
+//=     Concentration' to 'Attention Concentrate' [Lupus]
 //= 3.0 Some optimization, typos, added missing dialogues (4Kb lighter) [Lupus]
 //= 3.1 Implemented JOBLVL as in other quests [Lupus]
+//============================================================
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 125c01034..90fccf68c 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -1,24 +1,22 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Monk Job Quest
 //===== By: ==================================================
 //= Dino9021, Edited / Translated by Celest
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Monk classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.3a Deleted unused variables. [Samuray22]
 //= 2.4 Added Quest Log commands. [Kisuka]
 //= 2.5 Removed the need for use of 'goto.' [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-prt_monk,59,247,1	script	Guarding Monk#mk	120,6,2,{
+prt_monk,59,247,1	script	Guarding Monk#mk	2_M_PHARMACIST,6,2,{
 	if (Upper == 1) {
 		mes "[Tohobu]";
 		mes "Hmm? What business do you have here?";
@@ -323,7 +321,7 @@ OnTouch:
 	end;
 }
 
-monk_in,99,58,1	script	Sensei Moohae#mk	60,{
+monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 	mes "[Sensei Moohae]";
 	mes "Greetings, you seem to be on a pure path.";
 	mes "Come in, come in, what can I do for you today?";
@@ -397,13 +395,13 @@ monk_in,99,58,1	script	Sensei Moohae#mk	60,{
 		next;
 		mes "[Sensei Moohae]";
 		switch (.@items[6]) {
-		case 3: mes "Why the face? This is a test of your abilities."; break; 
-		case 4: mes "What's wrong? This is a test of your abilities."; break; 
-		case 5: mes "You do understand don't you? This is a test of your abilities."; break; 
-		case 6: mes "Don't look at me like that. This is a test of your abilities."; break; 
-		case 7: mes "You don't seem concerned, this is a test of your abilities You should take this seriously."; break; 
-		case 8: mes "It is a test of your abilities so make sure you acquire these on your own."; break; 
-		case 9: mes "Don't be concerned, I believe you can do it. This is only to test your abilities."; break; 
+		case 3: mes "Why the face? This is a test of your abilities."; break;
+		case 4: mes "What's wrong? This is a test of your abilities."; break;
+		case 5: mes "You do understand don't you? This is a test of your abilities."; break;
+		case 6: mes "Don't look at me like that. This is a test of your abilities."; break;
+		case 7: mes "You don't seem concerned, this is a test of your abilities You should take this seriously."; break;
+		case 8: mes "It is a test of your abilities so make sure you acquire these on your own."; break;
+		case 9: mes "Don't be concerned, I believe you can do it. This is only to test your abilities."; break;
 		}
 		next;
 		mes "[Sensei Moohae]";
@@ -903,7 +901,7 @@ monk_in,99,58,1	script	Sensei Moohae#mk	60,{
 	}
 }
 
-prt_monk,251,255,1	script	Touha#mk	79,{
+prt_monk,251,255,1	script	Touha#mk	1_F_PRIEST,{
 	if (MONK_Q >= 10 && MONK_Q < 14) {
 		if (MONK_Q == 10) {
 			mes "[Touha]";
@@ -1682,7 +1680,7 @@ prt_monk,251,255,1	script	Touha#mk	79,{
 	}
 }
 
-prt_monk,57,179,1	script	Boohae#mk	110,{
+prt_monk,57,179,1	script	Boohae#mk	4_M_MINISTER,{
 	if (MONK_Q == 14 && BaseJob == Job_Acolyte) {
 		mes "[Boohae]";
 		mes "...";
@@ -1848,7 +1846,7 @@ prt_monk,57,179,1	script	Boohae#mk	110,{
 	}
 }
 
-prt_monk,199,169,3	script	Door Keeper#mk	746,{
+prt_monk,199,169,3	script	Door Keeper#mk	4_F_MONK,{
 	mes "[Keeper Chorip]";
 	mes "....this place is for those";
 	mes " in testing for becoming a monk.";
@@ -1881,7 +1879,7 @@ prt_monk,199,169,3	script	Door Keeper#mk	746,{
 	}
 }
 
-monk_test,329,61,3	script	Bashu#mk	753,{
+monk_test,329,61,3	script	Bashu#mk	4_M_MONK,{
 	if (MONK_Q > 14 && MONK_Q < 25) {
 		if (MONK_Q == 15) {
 			mes "[Bashu]";
@@ -1932,7 +1930,7 @@ monk_test,329,61,3	script	Bashu#mk	753,{
 	}
 }
 
-monk_test,386,388,4	script	Apprentice Monk#mk	110,{
+monk_test,386,388,4	script	Apprentice Monk#mk	4_M_MINISTER,{
 	mes "[Monk Apprentice]";
 	mes "W... welcome!";
 	mes "Th... this place is for testing the tolerance of monk candidates!";
@@ -1967,7 +1965,7 @@ monk_test,386,388,4	script	Apprentice Monk#mk	110,{
 	close;
 }
 
-monk_test,387,350,0	script	Supervisor#race_monk	45,2,2,{
+monk_test,387,350,0	script	Supervisor#race_monk	WARPNPC,2,2,{
 OnTouch:
 	if (MONK_Q >= 15 && MONK_Q <= 23) {
 		set MONK_Q,MONK_Q+1;
@@ -2025,7 +2023,7 @@ monk_test,387,42,0	duplicate(MonkTrap)	Trap#t_monk7_2	-1,1,0
 monk_test,389,43,0	duplicate(MonkTrap)	Trap#t_monk7_3	-1
 monk_test,389,42,0	duplicate(MonkTrap)	Trap#t_monk7_4	-1
 
-job_monk,225,180,1	script	Hyunmoo#mk	89,{
+job_monk,225,180,1	script	Hyunmoo#mk	4_M_ORIENT02,{
 	if ((countitem(1069) > 0 || countitem(1070) > 0) && (countitem(1069) < 30 || countitem(1070) < 30)) {
 		mes "[Hyunmoo]";
 		mes "You didn't bring enough mushrooms... go get some more.";
@@ -2117,7 +2115,7 @@ job_monk,225,180,1	script	Hyunmoo#mk	89,{
 	}
 }
 
-prt_monk,225,180,1	script	Hyunmoo#mk2	89,{
+prt_monk,225,180,1	script	Hyunmoo#mk2	4_M_ORIENT02,{
 	if (MONK_Q < 25) {
 		mes "[Hyunmoo]";
 		mes "As I see vegetables growing, I feel myself growing within.";
@@ -2158,7 +2156,7 @@ prt_monk,225,180,1	script	Hyunmoo#mk2	89,{
 	}
 }
 
-monk_test,319,139,1	script	Tomoon#mk	52,{
+monk_test,319,139,1	script	Tomoon#mk	1_M_HOF,{
 	if (MONK_Q == 25) {
 		mes "[Tomoon]";
 		mes "Welcome young one.";
@@ -2229,7 +2227,7 @@ monk_test,319,139,1	script	Tomoon#mk	52,{
 	}
 }
 
-monk_test,82,85,1	script	Proctor#mk	95,{
+monk_test,82,85,1	script	Proctor#mk	4_F_SISTER,{
 	mes "[Proctor]";
 	mes "So, are you ready to undergo the spiritual training?";
 	next;
@@ -2321,7 +2319,7 @@ OnDisable:
 	end;
 }
 
-monk_test,166,278,0	script	exit_monk#1	45,1,1,{
+monk_test,166,278,0	script	exit_monk#1	WARPNPC,1,1,{
 OnTouch:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2336,7 +2334,7 @@ OnTouch:
 	end;
 }
 
-monk_test,88,91,1	script	Proctor#mk2	52,{
+monk_test,88,91,1	script	Proctor#mk2	1_M_HOF,{
 	mes "[Proctor]";
 	mes "So, are you ready to undergo this spiritual training?";
 	next;
@@ -2428,7 +2426,7 @@ OnDisable:
 	end;
 }
 
-monk_test,166,178,0	script	exit_monk#2	45,1,1,{
+monk_test,166,178,0	script	exit_monk#2	WARPNPC,1,1,{
 OnTouch:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2443,7 +2441,7 @@ OnTouch:
 	end;
 }
 
-monk_test,95,85,1	script	Proctor#btl#3	79,{
+monk_test,95,85,1	script	Proctor#btl#3	1_F_PRIEST,{
 	mes "[Proctor]";
 	mes "So, are you ready to undergo this spiritual training?";
 	next;
@@ -2535,7 +2533,7 @@ OnDisable:
 	end;
 }
 
-monk_test,270,278,0	script	exit_monk#3	45,1,1,{
+monk_test,270,278,0	script	exit_monk#3	WARPNPC,1,1,{
 OnTouch:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2577,7 +2575,7 @@ OnEnable:
 	end;
 }
 
-monk_test,137,338,1	script	switchreset#monkmonk	79,{
+monk_test,137,338,1	script	switchreset#monkmonk	1_F_PRIEST,{
 	mes "Grrrr...";
 	mes "All monsters in the monk job chance place have been reset.";
 	mes "Timer's activated.";
@@ -2600,25 +2598,27 @@ monk_test,137,338,1	script	switchreset#monkmonk	79,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Monsters of Mushroom Collecting
-//============================================================ 
+//============================================================
 job_monk,0,0,0,0	monster	Thief Mushroom	1182,70,0,0,0
 job_monk,0,0,0,0	monster	Thief Bug Larva	1051,20,0,0,0
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 Fixed missing '";'. Now it's loading fine [Lupus]
 //= 1.1+ Edited/Translated 5% [Celest]
 //= 1.2 Made Poetry Quiz passable, Fixed Marathon Part [Lupus]
 //= 1.3 Added Baby Class Support [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus] 1.7 Fixed warps19/20 [Yor]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
+//= 1.7 Fixed warps19/20 [Yor]
 //= 1.8 Fixed bugs. Fixed Green Potion exploit. Getting rid of Jfunc mess [Lupus]
 //= 1.9 Added a missing check in Fuhai and fixed a LOT of Engrish. [Zephiris]
 //= 1.9b Fixed another bug in Fuhai. [Zephiris]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Removed Duplicates [Silent]
+//============================================================
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index e8ce1904f..cf20d5203 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -1,29 +1,27 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Rogue Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.9
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Rogue classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 2.4a Deleted unused variables. [Samuray22]
-//= 2.4b Changed a Problem with JobLevel what made 
-//=	impossible get a Gladius [3]. (bugreport:481) [Samuray22]
+//= 2.4b Changed a Problem with JobLevel what made
+//=     impossible get a Gladius [3]. (bugreport:481) [Samuray22]
 //= 2.4c Corrected a Typo error ";;" and a typo error with "rouge". (bugreport:909) [Samuray22]
 //= 2.5 Added dummy "OnMyMobDead" labels. (bugreport:1100) [L0ne_W0lf]
 //= 2.6 Fixed a few bugs in the Rogue Guildsman. [L0ne_W0lf]
 //= 2.7 Fixed a bug on Markie question 5, bugreport:1600 [Brainstorm]
 //= 2.8 Moved "Thug" to Morroc Ruins. [L0ne_W0lf]
 //= 2.9 Added Quest Log commands. [Kisuka]
-//============================================================ 
+//============================================================
 
-moc_ruins,86,103,1	script	Thug#rg	118,{
+moc_ruins,86,103,1	script	Thug#rg	2_M_THIEFMASTER,{
 	mes "[Thug]";
 	mes "*Sigh...*";
 	mes "What is life?";
@@ -54,7 +52,7 @@ moc_ruins,86,103,1	script	Thug#rg	118,{
 	close;
 }
 
-in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
+in_rogue,363,122,4	script	Rogue Guildsman#rg	4_F_ROGUE,{
 	if (Upper == 1) {
 		mes "[Markie]";
 		mes "Eh? You...you...?!";
@@ -84,7 +82,7 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				mes "[Rogue Guildsman]";
 				mes "So what's a kid";
 				mes "like you doin' here?";
-				if (sex == 1) {
+				if (Sex) {
 					mes "Oh, I get it now...";
 					mes "The widdle boy wants";
 				}
@@ -489,7 +487,7 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 	}
 }
 
-in_rogue,376,23,1	script	Mr. Smith#rg	57,{
+in_rogue,376,23,1	script	Mr. Smith#rg	1_M_LIBRARYMASTER,{
 	if (ROGUE_Q == 2) {
 		mes "[Mr. Smith]";
 		mes "Welcome to";
@@ -656,14 +654,14 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 		else if (ROGUE_Q == 4) callsub S_CheckItems,511,10,910,10,926,10,964,10;
 		else if (ROGUE_Q == 5) callsub S_CheckItems,508,10,948,10,935,10,940,10;
 		else if (ROGUE_Q == 6) {
-			if (zeny > 9999 && countitem(915) > 4 && countitem(713) > 4 && countitem(1002) > 4 &&
+			if (Zeny > 9999 && countitem(915) > 4 && countitem(713) > 4 && countitem(1002) > 4 &&
 			countitem(953) > 4 && countitem(507) > 4 && countitem(919) > 4 && countitem(715) > 4 &&
 			countitem(913) > 4 && countitem(904) > 4 && countitem(942) > 4 && countitem(528) > 4 &&
 			countitem(914) > 4 && countitem(705) > 4 && countitem(916) > 4 && countitem(917) > 4 &&
 			countitem(908) > 4 && countitem(945) > 4) {
 				mes "[Mr. Smith]";
 				mes "Ummm...let's see...";
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				delitem 915,5; //Chrysalis
 				delitem 713,5; //Empty_Bottle
 				delitem 1002,5; //Iron_Ore
@@ -976,7 +974,7 @@ S_CheckItems:
 	if (Zeny > 9999 && countitem(getarg(0)) >= getarg(1) && countitem(getarg(2)) >= getarg(3) && countitem(getarg(4)) >= getarg(5) && countitem(getarg(6)) >= getarg(7)) {
 		mes "[Mr. Smith]";
 		mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, "+getarg(1)+" "+getitemname(getarg(0))+", "+getarg(3)+" "+getitemname(getarg(2))+", "+getarg(5)+" "+getitemname(getarg(4))+" and "+getarg(7)+" "+getitemname(getarg(6))+"...";
-		set zeny,zeny-10000;
+		Zeny -= 10000;
 		delitem getarg(0),getarg(1);
 		delitem getarg(2),getarg(3);
 		delitem getarg(4),getarg(5);
@@ -1011,7 +1009,7 @@ S_CheckItems:
 	close;
 }
 
-cmd_fild09,106,195,0	script	Warp#1	45,1,1,{
+cmd_fild09,106,195,0	script	Warp#1	WARPNPC,1,1,{
 OnTouch:
 	mes "[???]";
 	mes "Who's there?!";
@@ -1081,7 +1079,7 @@ OnTouch:
 	}
 }
 
-cmd_fild09,335,143,0	script	Warp#2	45,1,1,{
+cmd_fild09,335,143,0	script	Warp#2	WARPNPC,1,1,{
 OnTouch:
 	mes "[???]";
 	mes "Who's there?!";
@@ -1151,7 +1149,7 @@ OnTouch:
 	}
 }
 
-cmd_fild04,304,180,0	script	Warp#3	45,1,1,{
+cmd_fild04,304,180,0	script	Warp#3	WARPNPC,1,1,{
 OnTouch:
 	mes "[???]";
 	mes "Who's there?!";
@@ -1174,7 +1172,7 @@ OnTouch:
 		break;
 	case 4:
 		mes "[" + strcharinfo(0) + "]";
-		mes "Hollgrehenn"; 
+		mes "Hollgrehenn";
 		break;
 	}
 	switch(select("enjoys:doesn't enjoy:likes:doesn't like")) {
@@ -1221,7 +1219,7 @@ OnTouch:
 	}
 }
 
-in_rogue,272,135,1	script	Hermanthorn Jr#rg	85,{
+in_rogue,272,135,1	script	Hermanthorn Jr#rg	4_M_03,{
 	if (ROGUE_Q == 8) {
 		mes "[HermanthornJr.]";
 		mes "I see...";
@@ -1271,7 +1269,7 @@ in_rogue,272,135,1	script	Hermanthorn Jr#rg	85,{
 	}
 }
 
-in_rogue,270,130,0	script	he_to_rogue#rg	45,1,1,{
+in_rogue,270,130,0	script	he_to_rogue#rg	WARPNPC,1,1,{
 OnTouch:
 	mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000";
 	next;
@@ -1279,7 +1277,7 @@ OnTouch:
 	if (.@input < 1 || .@input > 10000) {
 		if (ROGUE_Q == 12)
 			mes "^3355FFIt didn't work. Please re-enter the four number combination.^000000";
-		else 
+		else
 			mes "^3355FFPlease enter a combination of four numbers.^000000";
 		close;
 	}
@@ -1384,7 +1382,7 @@ OnMyMobDead:
 	end;
 }
 
-in_rogue,9,389,0	script	oneway_to_gu	45,1,1,{
+in_rogue,9,389,0	script	oneway_to_gu	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "gen_ro#4::OnDisable";
 	set ROGUE_Q,17;
@@ -1392,7 +1390,7 @@ OnTouch:
 	end;
 }
 
-in_rogue,244,39,1	script	Aragham Junior#rg	99,{
+in_rogue,244,39,1	script	Aragham Junior#rg	4W_M_03,{
 	if (ROGUE_Q == 9) {
 		mes "[Aragham Jr.]";
 		mes "Oh, you must be";
@@ -1478,7 +1476,7 @@ in_rogue,244,39,1	script	Aragham Junior#rg	99,{
 	}
 }
 
-in_rogue,160,34,1	script	Hollgrehenn junior#rg	85,{
+in_rogue,160,34,1	script	Hollgrehenn junior#rg	4_M_03,{
 	if (ROGUE_Q == 11) {
 		mes "[Hollgrehenn Jr.]";
 		mes "Huh...";
@@ -1564,7 +1562,7 @@ in_rogue,160,34,1	script	Hollgrehenn junior#rg	85,{
 	}
 }
 
-in_rogue,177,109,1	script	Antonio junior#rg	88,{
+in_rogue,177,109,1	script	Antonio junior#rg	4_M_ORIENT01,{
 	if (ROGUE_Q == 10) {
 		mes "[Antonio Jr.]";
 		mes "You're from";
@@ -1649,7 +1647,7 @@ in_rogue,177,109,1	script	Antonio junior#rg	88,{
 	}
 }
 
-in_rogue,370,320,0	script	quest_out	45,1,1,{
+in_rogue,370,320,0	script	quest_out	WARPNPC,1,1,{
 OnTouch:
 	set ROGUE_Q,16;
 	warp "in_rogue",378,113;
@@ -1713,7 +1711,7 @@ OnTouch:
 	end;
 
 OnDisable:
-	killmonster "in_rogue","mob_rogue#3::OnMyMObDead";
+	killmonster "in_rogue","mob_rogue#3::OnMyMobDead";
 	end;
 
 OnMyMobDead:
@@ -1990,7 +1988,7 @@ OnInit:
 	end;
 }
 
-in_rogue,399,286,1	script	switch#rogreset	88,{
+in_rogue,399,286,1	script	switch#rogreset	4_M_ORIENT01,{
 	mes "^F08080Tah dah~";
 	mes "Monsters for the";
 	mes "Rogue Job Change";
@@ -2012,19 +2010,20 @@ in_rogue,399,286,1	script	switch#rogreset	88,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 fixed 3 wrong questions, added missing lines [Lupus]
 //= 1.3 Baby Class Support + 40/50 JobLevel Item fix [Lupus]
 //= 1.5 Fixed possible EXP abuse [Lupus]
 //= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Removed Duplicates [Silent]
 //= 2.2 Merged JFunc [Lupus]
 //= 2.3 Added a possibility for players doing Meginjyard quest
-//= to enter Rogue guild as there's a NPC inside [SinSloth]
+//=     to enter Rogue guild as there's a NPC inside [SinSloth]
 //= 2.3a fixed test4 person interaction, let BABY thieves pass
-//=	the test, too [Lupus]
+//=     the test, too [Lupus]
+//============================================================
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 1e188778e..72bacfaf1 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -4,14 +4,14 @@
 //= jAthena (0.9) - I guess
 //= Unknown Translator (1.0)
 //= Darkchild (1.2)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.8
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Sage classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.1 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
+//=     No longer uses function "F_BlockHigh"
 //= 2.2 Small bug fix (== -> !=) thanks to Saithis. [L0ne_W0lf]
 //= 2.2b ANotehr smaLL bugfix, pointed out by Cara. [L0ne_W0lf]
 //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
@@ -19,15 +19,15 @@
 //= 2.4a Deleted unused variables. [Samuray22]
 //= 2.5 Updated waiting room. (Removes global var) [L0ne_W0lf]
 //= 2.5a Corrected some "mes"s without the getitemname. (bugreport:1564) [Samuray22]
-//	-Changed an incorrect "!=" to "==". (bugreport:1572) 
-//	-And Small Typo Error
+//=     -Changed an incorrect "!=" to "==". (bugreport:1572)
+//=     -And Small Typo Error
 //= 2.6 Fixed Kayron Grik cutin not being removed as reported by jc1991, bugreport:1825 [Brainstorm]
 //= 2.6a Fixed a Little Bug with Whispers Summoned in the Last Test. (bugreport:2253) [Samuray22]
 //= 2.7 Added Quest Log commands. [Kisuka]
 //= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-yuno_in02,38,61,5	script	Dean of the Academy#sa	743,{
+yuno_in02,38,61,5	script	Dean of the Academy#sa	2_M_SAGE_OLD,{
 	cutin "job_sage_kayron",2;
 	mes "[Kayron Grik]";
 	if (Upper == 1) {
@@ -193,7 +193,7 @@ yuno_in02,38,61,5	script	Dean of the Academy#sa	743,{
 	end;
 }
 
-yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
+yuno_in03,154,35,4	script	Staff of the Academy#a	2_M_SAGE_B,{
 	mes "[Metheus Sylphe]";
 	if (Upper == 1) {
 		mes "Welcome to the";
@@ -343,7 +343,7 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
 				next;
 				if (select("Pay 70,000 zeny.:Give him Old Magicbook and Necklace of Wisdom.") == 1) {
 					if (Zeny > 69999) {
-						set zeny,zeny-70000;
+						Zeny -= 70000;
 						mes "[Metheus Sylphe]";
 						mes "Thank you, your application has been accepted.";
 						mes "Next, you will take an entrance test.";
@@ -515,7 +515,7 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
 			next;
 		}
 		else if (Zeny > 69999) {
-			set zeny,zeny-70000;
+			Zeny -= 70000;
 			mes "[Metheus Sylphe]";
 			mes "Well done. Let me proceed with your application request.";
 			set SAGE_Q,4;
@@ -525,8 +525,8 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
 			switch (SAGE_Q) {
 			case 1:
 				//Feather_Of_Bird, Fluff, Iron_Ore
-				setarray .@item[0], 916,914,1002; 
-				setarray .@count[0], 50,50,25; 
+				setarray .@item[0], 916,914,1002;
+				setarray .@count[0], 50,50,25;
 				break;
 			case 2:
 				//Clover, Feather, Chinese_Ink
@@ -539,13 +539,13 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
 				setarray .@count[0], 50,50,50,50;
 				break;
 			}
-			set .@size, (getarraysize(.@item)-1); 
+			set .@size, (getarraysize(.@item)-1);
 			for( set .@i,0 ; .@i < .@size && countitem(.@item[.@i]) >= .@count[.@i] ; set .@i,.@i+1 );
-			if(.@i == .@size) {  
+			if(.@i == .@size) {
 				if (Zeny > 29999) {
 					for (set .@i, 0; .@i < .@size ; set .@i, .@i+1)
-						delitem .@item[.@i], .@count[.@i];  
-					set zeny,zeny-30000;
+						delitem .@item[.@i], .@count[.@i];
+					Zeny -= 30000;
 					mes "[Metheus Sylphe]";
 					mes "Well done. Let me proceed with your application request.";
 					set .@SAGE_Q_T,SAGE_Q;
@@ -634,7 +634,7 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
 	}
 }
 
-yuno_in03,105,177,5	script	Written Test Professor#s	754,{
+yuno_in03,105,177,5	script	Written Test Professor#s	4_M_SAGE_A,{
 	mes "[Claytos Verdo]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -1054,7 +1054,7 @@ L_AskQuestions:
 }
 
 //Practical Examination Professer
-yuno_in03,169,180,3	script	Practical Examination P	755,{
+yuno_in03,169,180,3	script	Practical Examination P	4_M_SAGE_C,{
 	mes "[Hermes Tris]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -1255,7 +1255,7 @@ yuno_in03,169,180,3	script	Practical Examination P	755,{
 	}
 }
 
-yuno_in03,62,176,2	script	History Professor#sa	109,{
+yuno_in03,62,176,2	script	History Professor#sa	4_M_MANAGER,{
 	mes "[Saphien Layless]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -1696,7 +1696,7 @@ yuno_in03,62,176,2	script	History Professor#sa	109,{
 	}
 }
 
-yuno_in03,32,102,1	script	Biology Professor#sa	755,{
+yuno_in03,32,102,1	script	Biology Professor#sa	4_M_SAGE_C,{
 	mes "[Lucius Celsus]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -2123,7 +2123,7 @@ yuno_in03,32,102,1	script	Biology Professor#sa	755,{
 	}
 }
 
-yuno_in03,244,31,3	script	Physics Professor#sa	120,{
+yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 	mes "[Aebecee George]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -2542,7 +2542,7 @@ yuno_in03,244,31,3	script	Physics Professor#sa	120,{
 	}
 }
 
-job_sage,50,165,4	script	Test Helper#talk	700,{
+job_sage,50,165,4	script	Test Helper#talk	8_F_GIRL,{
 	mes "[Test Helper]";
 	mes "Welcome to the Sage practical examination hall.";
 	mes "If you wish to take the test right now, please enter the waiting room.";
@@ -2557,7 +2557,7 @@ job_sage,50,165,4	script	Test Helper#talk	700,{
 	close;
 }
 
-job_sage,50,165,4	script	Waiting Room#sg	700,{
+job_sage,50,165,4	script	Waiting Room#sg	8_F_GIRL,{
 	end;
 
 OnInit:
@@ -2577,7 +2577,7 @@ OnEnable:
 	end;
 }
 
--	script	Arena#1	66,{
+-	script	Arena#1	1_F_01,{
 OnInit:
 	disablenpc "Arena#1";
 	end;
@@ -2891,9 +2891,9 @@ OnTimer9000:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Script mostly based on translated jA script
 //= Written test questions/answers weren't translated 100% corectly
 //= So a lot of those are based upon mRO site and my own info
diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt
index 5e080f304..7f0f743cd 100644
--- a/npc/jobs/2-2a/Champion.txt
+++ b/npc/jobs/2-2a/Champion.txt
@@ -3,17 +3,17 @@
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,53,42,3	script	Champion#Valkyrie	52,{
+valkyrie,53,42,3	script	Champion#Valkyrie	1_M_HOF,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index 656557647..1d9b200bf 100644
--- a/npc/jobs/2-2a/Clown.txt
+++ b/npc/jobs/2-2a/Clown.txt
@@ -1,23 +1,21 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //= 1.3a Corrected a Little Typo error. [Samuray22]
-//	-Thanks to Myllena.
-//============================================================ 
+//=     Thanks to Myllena.
+//============================================================
 
-valkyrie,53,54,3	script	Minstrel#Valkyrie	741,{
+valkyrie,53,54,3	script	Minstrel#Valkyrie	2_M_BARD_ORIENT,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index 3b85907e9..5ccde106a 100644
--- a/npc/jobs/2-2a/Creator.txt
+++ b/npc/jobs/2-2a/Creator.txt
@@ -1,24 +1,23 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//= 1.4 Corrected check for the Bioethics quest variable [Haru]
+//= 1.5 Fixed issue resulting in never regaining Bioethics. [Kisuka]
+//============================================================
 
-valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
-	if (ADVJOB == 0 || Upper != 1) {
-		set .@karma_d,rand(1,10);
-		if (.@karma_d > 4) {
+valkyrie,53,50,3	script	Biochemist#Valkyrie	2_M_DYEINGER,{
+	if (ADVJOB == 0 && Upper != 1) {
+		if (rand(1,10) > 4) {
 			mes "[Biochemist]";
 			mes "Congratulations.";
 			mes "Honor to the warriors!";
@@ -39,8 +38,7 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 		mes "fought that earned me";
 		mes "a place in Valhalla...";
 		close;
-	}
-	else if (ADVJOB == Job_Creator && Class == Job_Merchant_High && JobLevel > 39) {
+	} else if (ADVJOB == Job_Creator && Class == Job_Merchant_High && JobLevel > 39) {
 		mes "[Biochemist]";
 		mes "Yes...";
 		mes "It's about time.";
@@ -65,7 +63,7 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 			close;
 		}
 		jobchange Job_Creator;
-		set ADVJOB,0;
+		ADVJOB = 0;
 		mes "[Biochemist]";
 		mes "Congratulations!";
 		mes "As a Biochemist,";
@@ -73,64 +71,60 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 		mes "vast knowledge for the";
 		mes "right purposes.";
 		close;
-	}
-	else {
-		if (Class == Job_Creator && MISC_QUEST & 64 && getskilllv("AM_BIOETHICS") == 0) {
+	} else if (Class == Job_Creator && bioeth == 13 && getskilllv("AM_BIOETHICS") == 0) {
+		mes "[Biochemist]";
+		mes "Ah, have you come to";
+		mes "retrieve the memories";
+		mes "lost to you? Yes, you";
+		mes "must be here for the";
+		mes "secrets of life that";
+		mes "were once yours...";
+		next;
+		if (select("Yes:No") == 1) {
 			mes "[Biochemist]";
-			mes "Ah, have you come to";
-			mes "retrieve the memories";
-			mes "lost to you? Yes, you";
-			mes "must be here for the";
-			mes "secrets of life that";
-			mes "were once yours...";
+			mes "Close your eyes and";
+			mes "put your mind at rest.";
+			mes "We will return to your";
+			mes "past to recollect the";
+			mes "fragments of your lost";
+			mes "memories.";
 			next;
-			if (select("Yes:No") == 1) {
-				mes "[Biochemist]";
-				mes "Close your eyes and";
-				mes "put your mind at rest.";
-				mes "We will return to your";
-				mes "past to recollect the";
-				mes "fragments of your lost";
-				mes "memories.";
-				next;
-				mes "[Biochemist]";
-				mes "When you open your eyes,";
-				mes "you will clearly remember";
-				mes "the secret of life. You will";
-				mes "also remember the weight of";
-				mes "responsibility in using these";
-				mes "secrets for the right ends...";
-				next;
-				skill 238,1,0;
-				mes "[Biochemist]";
-				mes "Open your eyes...";
-				mes "Now that you have";
-				mes "remembered how to";
-				mes "create artificial life, I only";
-				mes "ask that you treat all of your";
-				mes "creations with respect.";
-				close;
-			}
 			mes "[Biochemist]";
-			mes "If you wish to";
-			mes "retrieve your lost";
-			mes "memories, please";
-			mes "come back to me.";
-			mes "The secret to creating";
-			mes "life is no trifling thing...";
+			mes "When you open your eyes,";
+			mes "you will clearly remember";
+			mes "the secret of life. You will";
+			mes "also remember the weight of";
+			mes "responsibility in using these";
+			mes "secrets for the right ends...";
+			next;
+			skill "AM_BIOETHICS",1,0;
+			mes "[Biochemist]";
+			mes "Open your eyes...";
+			mes "Now that you have";
+			mes "remembered how to";
+			mes "create artificial life, I only";
+			mes "ask that you treat all of your";
+			mes "creations with respect.";
 			close;
 		}
 		mes "[Biochemist]";
-		mes "Welcome";
-		mes "to Valhalla,";
-		mes "the Hall of Honor.";
-		next;
-		mes "[Biochemist]";
-		mes "Please make";
-		mes "yourself comfortable";
-		mes "while you are here.";
-		mes "Honor to the warriors!";
+		mes "If you wish to";
+		mes "retrieve your lost";
+		mes "memories, please";
+		mes "come back to me.";
+		mes "The secret to creating";
+		mes "life is no trifling thing...";
 		close;
 	}
+	mes "[Biochemist]";
+	mes "Welcome";
+	mes "to Valhalla,";
+	mes "the Hall of Honor.";
+	next;
+	mes "[Biochemist]";
+	mes "Please make";
+	mes "yourself comfortable";
+	mes "while you are here.";
+	mes "Honor to the warriors!";
+	close;
 }
-
diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt
index 95503a1ba..f8d80cc29 100644
--- a/npc/jobs/2-2a/Gypsy.txt
+++ b/npc/jobs/2-2a/Gypsy.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,53,56,3	script	Gypsy#Valkyrie	101,{
+valkyrie,53,56,3	script	Gypsy#Valkyrie	4W_F_01,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt
index 7589ff3f6..9bd6a46f0 100644
--- a/npc/jobs/2-2a/Paladin.txt
+++ b/npc/jobs/2-2a/Paladin.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,53,39,3	script	Paladin#Valkyrie	752,{
+valkyrie,53,39,3	script	Paladin#Valkyrie	4_M_CRU_OLD,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index b6b38afdc..b42e1627a 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,53,47,3	script	Scholar#Valkyrie	743,{
+valkyrie,53,47,3	script	Scholar#Valkyrie	2_M_SAGE_OLD,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt
index a2a26e135..fbc1e060c 100644
--- a/npc/jobs/2-2a/Stalker.txt
+++ b/npc/jobs/2-2a/Stalker.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Advance Class jobchanger after kRO Normals.
 //===== By: ==================================================
 //= Nana
 //= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
+//===== Additional Comments: =================================
+//= 1.1 Made all into functions, additional checks, etc. [Lupus]
+//= 1.2 Made numbers into constants. [Vicious]
 //= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
+//============================================================
 
-valkyrie,53,58,3	script	Stalker#Valkyrie	747,{
+valkyrie,53,58,3	script	Stalker#Valkyrie	4_F_ROGUE,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 13520c537..38fb47131 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -1,28 +1,27 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Soul Linker Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Celestria & Samuray22
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.6
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Soul Linker class.
 //= [Vars Used]
 //= SOUL_Q = Job Change Phase. (Max 4)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.2 Rescripted to Aegis 10.3 standards. [Samuray22]
 //= 1.3 Slight updates and fixes to the script. [L0ne_W0lf]
-//=	Removes the use of labels, and corrects other errors.
-//=	Removed the GM-use only NPC from the sec_in map. 
-//=	No longer used a global var, uses an NPC var instead.
+//=     Removes the use of labels, and corrects other errors.
+//=     Removed the GM-use only NPC from the sec_in map.
+//=     No longer used a global var, uses an NPC var instead.
 //= 1.3a Deleted Empty Color Tag. (bugreport:1572) [Samuray22]
 //= 1.4 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.5 Added Quest Log commands. [Kisuka]
-//============================================================ 
+//= 1.6 Updated to match the latest official script. [Euphy]
+//============================================================
 
-morocc_in,174,30,6	script	Kid#link1	716,{
+morocc_in,174,30,6	script	Kid#link1	4_M_KID2,{
 	if (Class == Job_Soul_Linker) {
 		mes "[Maia]";
 		mes "Best of luck in your";
@@ -399,6 +398,13 @@ OnTouch:
 				mes "if you talk to me later...";
 				close;
 			}
+			if (ismounting()) {
+				mes "[Maia]";
+				mes "You are on a riding pet,";
+				mes "so you cannot change your job.";
+				mes "Please unequip your riding pet and try again!";
+				close;
+			}
 			mes "[Maia]";
 			mes "Then let us begin the";
 			mes "ceremony. These items will";
@@ -432,9 +438,13 @@ OnTouch:
 			mes "powers as a Soul Linker";
 			mes "wisely and for just purposes.";
 			next;
+			if (SkillPoint) {
+				mes "^0000ffYou still have unused skill points. Please use all remaining skill points and try again!^000000";
+				close;
+			}
 			completequest 6008;
 			callfunc "Job_Change",Job_Soul_Linker;
-			callfunc "F_ClearJobVar";		// clears all job variables for the current player
+			callfunc "F_ClearJobVar";	// clears all job variables for the current player
 			set SOUL_Q,0;
 			mes "[Maia]";
 			mes "I wish the best of luck";
@@ -479,9 +489,9 @@ OnTouch:
 	end;
 }
 
-job_soul,35,30,6	duplicate(SLTester)	Maia#link6	716
+job_soul,35,30,6	duplicate(SLTester)	Maia#link6	4_M_KID2
 
-job_soul,30,35,6	script	Monk Spirit#link4	827,{
+job_soul,30,35,6	script	Monk Spirit#link4	4_M_GRANDMONK,{
 	if (SOUL_Q == 2) {
 		mes "[Monk Spirit]";
 		mes "Who am I...?";
@@ -526,7 +536,7 @@ job_soul,30,35,6	script	Monk Spirit#link4	827,{
 	close;
 }
 
-job_soul,30,25,7	script	Sage Spirit#link5	754,{
+job_soul,30,25,7	script	Sage Spirit#link5	4_M_SAGE_A,{
 	if (SOUL_Q == 2) {
 		mes "[Sage Spirit]";
 		mes "Speak to Maia.";
@@ -575,7 +585,7 @@ job_soul,30,25,7	script	Sage Spirit#link5	754,{
 	close;
 }
 
-job_soul,25,30,5	script	Alchemist Spirit#link7	744,{
+job_soul,25,30,5	script	Alchemist Spirit#link7	4_F_ALCHE,{
 	if (SOUL_Q == 2) {
 		mes "[Alchemist Spirit]";
 		mes "Oh! I really want to";
@@ -621,7 +631,7 @@ job_soul,25,30,5	script	Alchemist Spirit#link7	744,{
 	close;
 }
 
-job_soul,1,5,0	script	Timer#link3	111,{
+job_soul,1,5,0	script	Timer#link3	HIDDEN_NPC,{
 	end;
 
 OnEnable:
@@ -653,11 +663,48 @@ OnTimer183000:
 	stopnpctimer;
 }
 
-//============================================================ 
+sec_in02,35,153,0	script	Soul Linker Var	4_M_OPERATION,{
+	callfunc "F_GM_NPC";
+	mes "[Soul Linker Var]";
+	mes "I can reset the Soul Linker";
+	mes "NPCs if a Soul Linker candidate";
+	mes "encounters a problem during the";
+	mes "end of the job quest. Please do";
+	mes "not use this function if players are still in the Quest Map.";
+	next;
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "[Soul Linker Var]";
+		mes "Password";
+		mes "is incorrect.";
+		close;
+	} else {
+		mes "[Soul Linker Var]";
+		mes "Would you like to";
+		mes "reset the Soul Linker";
+		mes "Global Variable?";
+		next;
+		switch(select("Reset:Cancel")) {
+		case 1:
+			mes "[Soul Linker Var]";
+			mes "The Soul Linker";
+			mes "Job Quest NPCs";
+			mes "have been reset.";
+			set getvariableofnpc(.SoulLinkerTest,"Kid#link1"),0;
+			close;
+		case 2:
+			mes "[Soul Linker Var]";
+			mes "You have canceled";
+			mes "this command.";
+			close;
+		}
+	}
+}
+
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= A temp Soul Linker Job Changer based on the kRO quest.
 //= Quest info from RagnaInfo. Sprites from kRO screenshots
-//= 1.0	Optimized and updated [Lupus]
+//= 1.0 Optimized and updated [Lupus]
 //= 1.1 Fixed NPC names according to iRO [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index 4720d7283..2887b2ae3 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -1,26 +1,24 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Super Novice Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Darkchild
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN r15340+
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Super Novice Job Change Npc
 //= Super Novice Cart Rental Npc
 //= Some Other Useless Super Novice Npc
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.9 Rescripted to the Aegis 10.3 Standars. [Samuray22]
 //= 2.0 Rescripted again, this time using an iRO base. [L0ne_W0lf]
 //= 2.1 Swapped use of baseclass for basejob. [L0ne_W0lf]
 //= 2.2 Added Quest Log commands. [Kisuka]
 //= 2.3 NPC "Esseray" calls Ex. Super Novice script when enabled. [Euphy]
 //= 2.4 Added an Ex. Super Novice dialog check. [Euphy]
-//============================================================ 
+//============================================================
 
-aldeba_in,223,167,3	script	Tzerero#sn	709,{
+aldeba_in,223,167,3	script	Tzerero#sn	4_M_SEAMAN,{
 	if (BaseJob == Job_SuperNovice) {
 		mes "[Tzerero]";
 		mes "I trust that you are enjoying";
@@ -328,7 +326,7 @@ aldeba_in,223,167,3	script	Tzerero#sn	709,{
 	}
 }
 
-aldeba_in,216,169,5	script	Esseray#sn	86,{
+aldeba_in,216,169,5	script	Esseray#sn	4_M_04,{
 	if (Class == Job_Super_Novice_E || Class == Job_Super_Baby_E) {
 		mes "[Esseray]";
 		mes "You! Stronger than before.";
@@ -336,7 +334,8 @@ aldeba_in,216,169,5	script	Esseray#sn	86,{
 		close;
 	}
 	if (BaseJob == Job_SuperNovice) {
-		if (is_function("Esseray_Ex")) callfunc "Esseray_Ex";
+		if (checkre(0))
+			callfunc "Esseray_Ex";
 		mes "[Esseray]";
 		mes "Hm? Hey, you're a member";
 		mes "of our great Novice Society,";
@@ -383,7 +382,7 @@ aldeba_in,216,169,5	script	Esseray#sn	86,{
 	}
 }
 
-aldebaran,54,238,5	script	Kafra Employee#sn	117,{
+aldebaran,54,238,5	script	Kafra Employee#sn	4_F_KAFRA1,{
 	if (BaseJob == Job_SuperNovice) {
 		mes "[Kafra Employee]";
 		if (Sex )
@@ -432,7 +431,7 @@ aldebaran,54,238,5	script	Kafra Employee#sn	117,{
 				}
 				if (Zeny >= 1899) {
 					set RESRVPTS, RESRVPTS + 190;
-					set zeny,zeny-1900;
+					Zeny -= 1900;
 					if (getskilllv("MC_PUSHCART") > 0) setcart;
 					mes "[Kafra Employee]";
 					mes "Thank you for using my service.";
@@ -468,14 +467,14 @@ aldebaran,54,238,5	script	Kafra Employee#sn	117,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Dialogs From Some Other Scripts (Most Of It)
 //= 1.3-1.5 Added Baby class support (and to the Kafta SN Cart
-//= renter, too) [Lupus]
+//=     renter, too) [Lupus]
 //= 1.6 Added a fix which prevent High Novices passing
-//= this Job Quests again. [Lupus]
+//=     this Job Quests again. [Lupus]
 //= 1.7 Fixed Baby Class Support. [Lupus]
 //= 1.8 Now a Baby can become a Super Baby [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index c2357d0bb..0aa4c4e3f 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -1,17 +1,15 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Valkyrie Realm
 //===== By: ==================================================
 //= Nana, fixes by Poki
 //= finished, optimized and tested by Lupus
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.1
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Quest to become a Tranceded Class. (Advanced/Rebirthed)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Made all into functions,additional checks,quest skills,now Valhallana can return you back. She also makes reborn process only when you got no Zeny/items (as in kRO) [Lupus]
 //= 1.2 now alternative classes can use their 1-1 job NPC to become Advanced 1st Class [Lupus]
 //= 1.4 added Baby Class support [Lupus]
@@ -28,19 +26,19 @@
 //= 2.5 Fixed a stuck bug [Lupus]
 //= 2.6a Adding proper dialogues [Lupus]
 //= 2.7 Rescripted to Aegis 10.3 standards. [L0ne_W0;f]
-//=	Removed all functions as they are no longer required.
-//=	Correct job level requirements for 1-1 -> 2-x.
+//=     Removed all functions as they are no longer required.
+//=     Correct job level requirements for 1-1 -> 2-x.
 //= 2.7a Added Function "F_BlockHigh" back in until rewriteing of the 2-x [L0ne_W0lf]
-//=	scripts are comepleted.
+//=     scripts are comepleted.
 //= 2.7b Removed function "F_BlockHigh" as it's no longer used. [L0ne_W0lf]
 //= 2.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.9 Corrected Valkyrie case spicifying where to warp after rebirthing. [L0ne_W0lf]
 //= 2.9b Fixed Verdandi typo, fixed resetting vars [Lupus]
 //= 3.0 Added quest log commands. [L0ne_W0lf]
-//= 3.1 Added Izlude Renewal coordinates. [L0ne_W0lf]
-//============================================================ 
+//= 3.1 Added Izlude Renewal coordinates.
+//============================================================
 
-valkyrie,48,86,4	script	Valkyrie#	811,{
+valkyrie,48,86,4	script	Valkyrie#	4_F_VALKYRIE,{
 	if (ADVJOB != 0 || Upper == 1) {
 		mes "[Valkyrie]";
 		mes "Welcome";
@@ -54,7 +52,7 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 		mes "Honor to the warriors!";
 		close;
 	}
-	else if (Baselevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
+	else if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		mes "[Valkyrie]";
 		mes "Welcome";
 		mes "to Valhalla,";
@@ -173,10 +171,8 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 			switch (ADVJOB) {
 			case 4008:
 			case 4015:
-				if (checkre(0))
-					warp "izlude",129,97;
-				else
-					warp "izlude",94,103;
+				if (checkre(0)) warp "izlude",129,97;
+				else warp "izlude",94,103;
 				break;
 			case 4009:
 			case 4016:
@@ -214,8 +210,8 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 	}
 }
 
-yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
-	if (Baselevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
+yuno_in02,88,164,5	script	Metheus Sylphe#Library	2_M_SAGE_B,{
+	if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		if (valkyrie_Q == 0) {
 			mes "[Metheus Sylphe]";
 			mes "Welcome to the Library of the Schweicherbil Magic Academy.";
@@ -235,7 +231,7 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
 			next;
 			if (select("Donate.:Cancel.") == 1) {
 				if (Zeny >= 1285000) {
-					set zeny,zeny-1285000;
+					Zeny -= 1285000;
 					set valkyrie_Q,1;
 					mes "[Metheus Sylphe]";
 					mes "Thank you, your donation will be used for a good cause. You may";
@@ -261,7 +257,7 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
 	close;
 }
 
-yuno_in02,93,207,1	script	Book of Ymir	111,{
+yuno_in02,93,207,1	script	Book of Ymir	HIDDEN_NPC,{
 	if (ADVJOB != 0 || Upper == 1) {
 		mes "[The Book of Ymir]";
 		mes "...The entrance to the Hall of Honor is open to anyone who has moved forward into their next life. It is there to help heroes decide what they want to do, and can lead them to anywhere in this world.";
@@ -280,7 +276,7 @@ yuno_in02,93,207,1	script	Book of Ymir	111,{
 		warp "valkyrie",48,8;
 		end;
 	}
-	else if (Baselevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
+	else if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		if (valkyrie_Q != 0) {
 			mes "[The Book of Ymir]";
 			mes "...Therefore, ancient heroes were";
@@ -347,14 +343,14 @@ yuno_in02,93,207,1	script	Book of Ymir	111,{
 	close;
 }
 
-yuno_in05,49,43,1	script	Heart of Ymir	111,{
-	if (Baselevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
+yuno_in05,49,43,1	script	Heart of Ymir	HIDDEN_NPC,{
+	if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		if (valkyrie_Q == 2) warp "valkyrie",48,8;
 	}
 	end;
 }
 
-valkyrie,44,33,5	script	Teleporter	124,{
+valkyrie,44,33,5	script	Teleporter	4_F_TELEPORTER,{
 	if (Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
@@ -382,16 +378,14 @@ valkyrie,44,33,5	script	Teleporter	124,{
 		case 4: callsub S_Warpchar,"geffen",120,39;
 		case 5: callsub S_Warpchar,"alberta",117,56;
 		case 6:
-			if (checkre(0))
-				callsub S_Warpchar,"izlude",129,97;
-			else
-				callsub S_Warpchar,"izlude",94,103;
+			if (checkre(0)) callsub S_Warpchar,"izlude",129,97;
+			else callsub S_Warpchar,"izlude",94,103;
 		case 7: callsub S_Warpchar,"aldebaran",91,105;
 		case 8: callsub S_Warpchar,"comodo",209,143;
 		case 9: callsub S_Warpchar,"yuno",328,101;
 		}
 	}
-S_WarpChar:
+S_Warpchar:
 	mes "[Teleporter]";
 	mes "Have a nice trip.";
 	close2;
@@ -401,7 +395,7 @@ S_WarpChar:
 }
 
 // Warps
-//============================================================ 
+//============================================================
 valkyrie,48,73,0	warp	valk01#1	1,1,valkyrie,48,64
 valkyrie,48,66,0	warp	valk01#2	1,1,valkyrie,48,75
 
diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt
index 4a8f8c188..911f54af2 100644
--- a/npc/kafras/cool_event_corp.txt
+++ b/npc/kafras/cool_event_corp.txt
@@ -1,24 +1,30 @@
 //===== Hercules Script ======================================
 //= Cool Event Corp. Staff
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Gepard
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.0
+//===== Description: =========================================
 //= Cool Event Corp. Staff (Save, Storage & Pushcart Service)
 //= in Arunafeltz Region.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, iRO Sakray X.4 [Gepard]
 //= 1.1 Optimized, fixed a conditional bug [Lupus]
 //= 1.1a Redo back. It wasn't a bug [Lupus]
 //= 1.2 Added Rachel Cool Event Corp. Staff [Playtester]
 //= 1.3 Added cutins, closed Kafra Password exploit
-//=	until we got a client/packet based password support [Lupus]
+//=     until we got a client/packet based password support [Lupus]
 //= 1.4 Added Veins Cool Event Corp. Staff. [L0ne_W0lf]
 //= 1.5 Cool Event Corp staff is now more iRO like. [L0ne_W0lf]
-//============================================================ 
+//= 2.0 Moved duplicate code to a function. Better integrated
+//      the rest with functions_kafra.txt. [Haru]
+//============================================================
 
-hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
+//=== Main Function ========================================================
+//=   arg(0): Used to determine which menu to display.
+//=   arg(1): Used to determine the location displayed in the save message.
+//==========================================================================
+function	script	F_ZondaStaff	{
 	cutin "zonda_01",2;
 	mes "[Cool Event Corp. Staff]";
 	mes "Welcome to Cool Event Corp.";
@@ -27,100 +33,44 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 	mes "for quality service. So how";
 	mes "may I assist you today?";
 	next;
-	switch(select("Save:Use Storage:Rent a Pushcart:Storage Password Service:Cancel")){
-	case 1:
+	switch (getarg(0)) {
+		// Save, Storage, Pushcart, Storage Password (Hugel)
+		case 0: setarray @Z_Menu0$, "Save", "Use Storage", "Rent a Pushcart", "Storage Password Service", "Cancel"; break;
+		// Save, Storage, Pushcart, Storage Password (Veins, Rachel)
+		default:
+		case 1: setarray @Z_Menu0$, "Save", "Use Storage", "Teleport Service", "Rent a Pushcart", "Storage Password Service", "Cancel"; break;
+	}
+	.@menu$ = "";
+	for (.@i = 0; .@i < getarraysize(@Z_Menu0$); ++.@i)
+		.@menu$ += @Z_Menu0$[.@i] + ":";
+	.@j = select (.@menu$) - 1;
+	if (@Z_Menu0$[.@j] == "Save") {
 		mes "[Cool Event Corp. Staff]";
 		mes "Your Respawn Point";
 		mes "has been saved here";
-		mes "in the village of Hugel.";
+		mes getarg(1);
 		mes "Thank you for using the";
 		mes "Cool Event Corp. service~";
-		savepoint "hugel",96,155;
+		return;
+	} else if (@Z_Menu0$[.@j] == "Use Storage") {
+		callfunc "F_KafStor",0,40,6,"[Cool Event Corp. Staff]";
 		close2;
-		break;
-	case 2:
-		mes "[Cool Event Corp. Staff]";
-		if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-			mes "I'm sorry, but you";
-			mes "need the Novice's";
-			mes "Basic Skill Level 6 to";
-			mes "use the Storage Service.";
-			close2;
-			break;
-		}
-		if(Zeny < 40){
-			mes "I'm sorry, but you don't";
-			mes "have enough Zeny to use";
-			mes "the Storage Service. Our";
-			mes "Storage access fee is 40 Zeny.";
-			close2;
-			break;
-		}
-		set Zeny, Zeny - 40;
-		mes "Let me open your personal";
-		mes "storage for you right away.";
-		mes "Thanks for supporting Cool";
-		mes "Event Corp. by using our";
-		mes "services. Have a good day~";
-		callfunc("F_CheckKafCode");	//check your storage password, if set
+		cutin "", 255;
+		end;
+	} else if (@Z_Menu0$[.@j] == "Teleport Service") {
+		callfunc "F_KafTele", 6, "[Cool Event Corp. Staff]";
 		close2;
-		openstorage;
-		break;
-	case 3:
-		mes "[Cool Event Corp. Staff]";
-		if(BaseClass != Job_Merchant){
-			mes "I'm sorry, but the";
-			mes "Pushcart rental service";
-			mes "is only available to Merchants,";
-			mes "Blacksmiths, White Smiths,";
-			mes "Alchemists and Creators.";
-			close2;
-			break;
-		}
-		if(getskilllv("MC_PUSHCART") == 0){
-			mes "You can only rent a cart after";
-			mes "learning the Pushcart Skill.";
-			close2;
-			break;
-		}
-		if(checkcart() == 1){
-			mes "You already have";
-			mes "a Pushcart equipped.";
-			mes "Unfortunately, we can't";
-			mes "rent more than one to";
-			mes "each customer at a time.";
-			close2;
-			break;
-		}
-		if(countitem(7061)){
-			delitem 7061,1;
-			setcart;
-			close2;
-			break;
-		}
-		mes "The Pushcart rental";
-		mes "fee is 800 Zeny. Would";
-		mes "you like to rent a Pushcart?";
-		next;
-		if(select("Rent a Pushcart:Cancel") == 1){
-			if(Zeny < 800){
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you";
-				mes "don't have enough";
-				mes "Zeny to pay the Pushcart";
-				mes "rental fee of 800 Zeny.";
-			} else {
-				set Zeny, Zeny - 800;
-				setcart;
-			}
-		}
+		cutin "", 255;
+		end;
+	} else if (@Z_Menu0$[.@j] == "Rent a Pushcart") {
+		callfunc "F_KafCart", 6, 800, "[Cool Event Corp. Staff]";
 		close2;
-		break;
-	case 4:
+		cutin "", 255;
+		end;
+	} else if (@Z_Menu0$[.@j] == "Storage Password Service") {
 		callfunc("F_SetKafCode","[Cool Event Corp. Staff]","Cool Event Corp.");
-		//the function closes msg and remoes cutins
-	case 5:
-	default:
+		//the function closes msg and removes cutins
+	} else {
 		mes "[Cool Event Corp. Staff]";
 		mes "Cool Event Corp. is always";
 		mes "striving to provide the best";
@@ -134,287 +84,29 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 	end;
 }
 
-rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
-	cutin "zonda_01",2;
-	mes "[Cool Event Corp. Staff]";
-	mes "Welcome to Cool Event Corp.";
-	mes "Our staff is always working";
-	mes "to surpass your expactations";
-	mes "for quality service. So how";
-	mes "may I assist you today?";
-	next;
-	switch(select("Save:Use Storage:Teleport Service:Rent a Pushcart:Storage Password Service:Cancel")){
-	case 1:
-		mes "[Cool Event Corp. Staff]";
-		mes "Your Respawn Point";
-		mes "has been saved here";
-		mes "in the town of Rachel.";
-		mes "Thank you for using the";
-		mes "Cool Event Corp. service~";
-		savepoint "rachel",113,137;
-		close2;
-		break;
-	case 2:
-		mes "[Cool Event Corp. Staff]";
-		if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-			mes "I'm sorry, but you";
-			mes "need the Novice's";
-			mes "Basic Skill Level 6 to";
-			mes "use the Storage Service.";
-			close2;
-			break;
-		}
-		if(Zeny < 40){
-			mes "I'm sorry, but you don't";
-			mes "have enough Zeny to use";
-			mes "the Storage Service. Our";
-			mes "Storage access fee is 40 Zeny.";
-			close2;
-			break;
-		}
-		set Zeny, Zeny - 40;
-		mes "Let me open your personal";
-		mes "storage for you right away.";
-		mes "Thanks for supporting Cool";
-		mes "Event Corp. by using our";
-		mes "services. Have a good day~";
-		callfunc("F_CheckKafCode");	//check your storage password, if set
-		close2;
-		openstorage;
-		break;
-	case 3:
-		mes "Please choose";
-		mes "your destination.";
-		next;
-		if (select("Veins -> 2200 z:Cancel") == 1) {
-			if ((countitem(7060) != 0) || (Zeny >= 2200)) {
-				if (countitem(7060) != 0) {
-					delitem 7060,1;
-				}
-				else {
-					set Zeny,Zeny-2200;
-				}
-				warp "veins",205,101;
-				cutin "",255;
-				end;
-			}
-			else {
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you don't have";
-				mes "enough zeny for the Teleport";
-				mes "Service. The fee to teleport";
-				mes "to Rachel is 2200 zeny.";
-			}
-		}
-		close2;
-		break;
-	case 4:
-		mes "[Cool Event Corp. Staff]";
-		if(BaseClass != Job_Merchant){
-			mes "I'm sorry, but the";
-			mes "Pushcart rental service";
-			mes "is only available to Merchants,";
-			mes "Blacksmiths, White Smiths,";
-			mes "Alchemists and Creators.";
-			close2;
-			break;
-		}
-		if(getskilllv("MC_PUSHCART") == 0){
-			mes "You can only rent a cart after";
-			mes "learning the Pushcart Skill.";
-			close2;
-			break;
-		}
-		if(checkcart() == 1){
-			mes "You already have";
-			mes "a Pushcart equipped.";
-			mes "Unfortunately, we can't";
-			mes "rent more than one to";
-			mes "each customer at a time.";
-			close2;
-			break;
-		}
-		if(countitem(7061)){
-			delitem 7061,1;
-			setcart;
-			close2;
-			break;
-		}
-		mes "The Pushcart rental";
-		mes "fee is 800 Zeny. Would";
-		mes "you like to rent a Pushcart?";
-		next;
-		if(select("Rent a Pushcart:Cancel") == 1){
-			if(Zeny < 800){
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you";
-				mes "don't have enough";
-				mes "Zeny to pay the Pushcart";
-				mes "rental fee of 800 Zeny.";
-			} else {
-				set Zeny, Zeny - 800;
-				setcart;
-			}
-		}
-		close2;
-		break;
-	case 5:
-		callfunc("F_SetKafCode","[Cool Event Corp. Staff]","Cool Event Corp.");
-		//the function closes msg and remoes cutins
-	case 6:
-	default:
-		mes "[Cool Event Corp. Staff]";
-		mes "Cool Event Corp. is always";
-		mes "striving to provide the best";
-		mes "services for our customers.";
-		mes "Help us become the best by";
-		mes "providing us with your opinions";
-		mes "and honest feedback. Thank you.";
-		close2;
-	}
+hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	4_M_ZONDAMAN,{
+	callfunc "F_KafSet";
+	callfunc "F_ZondaStaff", 0, "in the village of Hugel.";
+	savepoint "hugel",96,155;
+	close2;
 	cutin "", 255;
 	end;
 }
 
-veins,208,128,5	script	Cool Event Corp. Staff::CoolEventCorpStaffVeins	874,{
-	cutin "zonda_01",2;
-	mes "[Cool Event Corp. Staff]";
-	mes "Welcome to Cool Event Corp.";
-	mes "Our staff is always working";
-	mes "to surpass your expactations";
-	mes "for quality service. So how";
-	mes "may I assist you today?";
-	next;
-	switch(select("Save:Use Storage:Teleport Service:Rent a Pushcart:Storage Password Service:Cancel")){
-	case 1:
-		mes "[Cool Event Corp. Staff]";
-		mes "Your Respawn Point";
-		mes "has been saved here";
-		mes "in the town of Veins.";
-		mes "Thank you for using the";
-		mes "Cool Event Corp. service~";
-		savepoint "veins",204,103;
-		close2;
-		break;
-	case 2:
-		mes "[Cool Event Corp. Staff]";
-		if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-			mes "I'm sorry, but you";
-			mes "need the Novice's";
-			mes "Basic Skill Level 6 to";
-			mes "use the Storage Service.";
-			close2;
-			break;
-		}
-		if(Zeny < 40){
-			mes "I'm sorry, but you don't";
-			mes "have enough Zeny to use";
-			mes "the Storage Service. Our";
-			mes "Storage access fee is 40 Zeny.";
-			close2;
-			break;
-		}
-		set Zeny, Zeny - 40;
-		mes "Let me open your personal";
-		mes "storage for you right away.";
-		mes "Thanks for supporting Cool";
-		mes "Event Corp. by using our";
-		mes "services. Have a good day~";
-		callfunc("F_CheckKafCode");	//check your storage password, if set
-		close2;
-		openstorage;
-		break;
-	case 3:
-		mes "Please choose";
-		mes "your destination.";
-		next;
-		if (select("Rachel -> 2200 z:Cancel") == 1) {
-			if ((countitem(7060) != 0) || (Zeny >= 2200)) {
-				if (countitem(7060) != 0) {
-					delitem 7060,1;
-				}
-				else {
-					set Zeny,Zeny-2200;
-				}
-				warp "rachel",115,125;
-				cutin "",255;
-				end;
-			}
-			else {
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you don't have";
-				mes "enough zeny for the Teleport";
-				mes "Service. The fee to teleport";
-				mes "to Rachel is 2200 zeny.";
-			}
-		}
-		close2;
-		break;
-	case 4:
-		mes "[Cool Event Corp. Staff]";
-		if(BaseClass != Job_Merchant){
-			mes "I'm sorry, but the";
-			mes "Pushcart rental service";
-			mes "is only available to Merchants,";
-			mes "Blacksmiths, White Smiths,";
-			mes "Alchemists and Creators.";
-			close2;
-			break;
-		}
-		if(getskilllv("MC_PUSHCART") == 0){
-			mes "You can only rent a cart after";
-			mes "learning the Pushcart Skill.";
-			close2;
-			break;
-		}
-		if(checkcart() == 1){
-			mes "You already have";
-			mes "a Pushcart equipped.";
-			mes "Unfortunately, we can't";
-			mes "rent more than one to";
-			mes "each customer at a time.";
-			close2;
-			break;
-		}
-		if(countitem(7061)){
-			delitem 7061,1;
-			setcart;
-			close2;
-			break;
-		}
-		mes "The Pushcart rental";
-		mes "fee is 800 Zeny. Would";
-		mes "you like to rent a Pushcart?";
-		next;
-		if(select("Rent a Pushcart:Cancel") == 1){
-			if(Zeny < 800){
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you";
-				mes "don't have enough";
-				mes "Zeny to pay the Pushcart";
-				mes "rental fee of 800 Zeny.";
-				close2;
-			} else {
-				set Zeny, Zeny - 800;
-				setcart;
-			}
-		}
-		close2;
-		break;
-	case 5:
-		callfunc("F_SetKafCode","[Cool Event Corp. Staff]","Cool Event Corp.");
-		//the function closes msg and remoes cutins
-	case 6:
-	default:
-		mes "[Cool Event Corp. Staff]";
-		mes "Cool Event Corp. is always";
-		mes "striving to provide the best";
-		mes "services for our customers.";
-		mes "Help us become the best by";
-		mes "providing us with your opinions";
-		mes "and honest feedback. Thank you.";
-		close2;
-	}
+rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	4_M_ZONDAMAN,{
+	callfunc "F_KafSet";
+	callfunc "F_ZondaStaff", 1, "in the town of Rachel.";
+	savepoint "rachel",113,137;
+	close2;
+	cutin "", 255;
+	end;
+}
+
+veins,208,128,5	script	Cool Event Corp. Staff::CoolEventCorpStaffVeins	4_M_ZONDAMAN,{
+	callfunc "F_KafSet";
+	callfunc "F_ZondaStaff", 1, "in the town of Veins.";
+	savepoint "veins",204,103;
+	close2;
 	cutin "", 255;
 	end;
 }
diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt
index b2fb64ba8..560d96e01 100644
--- a/npc/kafras/dts_warper.txt
+++ b/npc/kafras/dts_warper.txt
@@ -1,9 +1,9 @@
 //===== Hercules Script ======================================
 //= Dungeon Teleport Service
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Evera
-//===== Current Version: ===================================== 
-//= 2.8
+//===== Current Version: =====================================
+//= 2.9
 //===== Description: =========================================
 //= [Official Conversion]
 //= Cool Event Corp NPCs vs. Kafra Dungeon Teleport Service and voting system.
@@ -23,27 +23,27 @@
 // For Detailed information on what each varibale does, see
 // the "Vote Globalvar Girl#yuno" NPC at the end of the file.
 // Character Variable in use: lhz_vote (how many times player has voted, keeps htem from re-voting.)
-//===== Additional Comments: ================================= 
-//= 1.0	Initial release [Evera]
-//= 1.1	SVN release, removed from major town (found true info after research),
-//=	put more arg(2) parameters, fixed a few bugs [Evera]
+//===== Additional Comments: =================================
+//= 1.0 Initial release [Evera]
+//= 1.1 SVN release, removed from major town (found true info after research),
+//=     put more arg(2) parameters, fixed a few bugs [Evera]
 //= 1.2 Mushed some variables together, optimized a bit [Evera]
 //= 1.3 Removed selfconfig [Evera]
 //= 1.4 Changed global variables to read from 3 global variables, updated names,
-//= 	fixed array bug [Evera]
+//=      fixed array bug [Evera]
 //= 1.5 Mushed voting varialbes into 1 variable. [Evera]
 //= 1.6 Removed Duplicates [Silent]
-//= 1.7	Fixed bug of DTS_Admin not running by itself [Evera]
-//= 1.8	Changed requirement to lvl 60 [Evera]
+//= 1.7 Fixed bug of DTS_Admin not running by itself [Evera]
+//= 1.8 Changed requirement to lvl 60 [Evera]
 //= 1.9 Removed global eligibility option [Evera]
 //= 2.0 Fixed zeny bug [Evera]
 //= 2.1 Fixed headers with and updated with newer information [Evera]
 //= 2.2 Changed dtseligible 2 to MISC_QUEST|128, to clean up variable usage. [Evera]
-//=	Also added F_ClearGarbage function to the scripts. [Evera]
-//= 2.3	Changed dtseligible to be $dtsday when MISC_QUEST|128
-//=	Added $dtsday for vote session counter
-//=	Fixed bug that involved having both warpers enabled at the same time. [Evera]
-//=	New $dtsday system and bug fix[Evera]
+//=     Also added F_ClearGarbage function to the scripts. [Evera]
+//= 2.3 Changed dtseligible to be $dtsday when MISC_QUEST|128
+//=     Added $dtsday for vote session counter
+//=     Fixed bug that involved having both warpers enabled at the same time. [Evera]
+//=     New $dtsday system and bug fix[Evera]
 //= 2.3a fixed 2 bugs with comparision [Lupus]
 //= 2.3b corrected Glast warp coords [Lupus] 2.3c Bailand -> Bayalan
 //= 2.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
@@ -51,7 +51,8 @@
 //= 2.6 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf]
 //= 2.7 Fixed a typo, a - to a +. Not sure how that happened. [L0ne_w0lf]
 //= 2.8 Corrected another typo this time in a variable.
-//============================================================ 
+//= 2.9 Added GM management function. [Euphy]
+//============================================================
 
 einbroch,246,70,0	script	Vote Timer#ein	-1,{
 OnInit:
@@ -533,7 +534,7 @@ function	script	F_VoteKafra	{
 				case 1:
 					if (Zeny >= 4000) {
 						cutin "",255;
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						warp "xmas_dun02",130,123;
 						end;
 					}
@@ -557,7 +558,7 @@ function	script	F_VoteKafra	{
 				switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Cancel")) {
 				case 1:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "kafra_09",255;
 						warp "xmas_dun02",130,123;
 						end;
@@ -573,7 +574,7 @@ function	script	F_VoteKafra	{
 					break;
 				case 2:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "kafra_09",255;
 						warp "alde_dun03",265,22;
 						end;
@@ -598,7 +599,7 @@ function	script	F_VoteKafra	{
 				switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Lava Dungeon, Level 2 -> 4,000 z:Cancel")) {
 				case 1:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "kafra_09",255;
 						warp "xmas_dun02",130,123;
 						end;
@@ -614,7 +615,7 @@ function	script	F_VoteKafra	{
 					break;
 				case 2:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "kafra_09",255;
 						warp "alde_dun03",265,22;
 						end;
@@ -630,7 +631,7 @@ function	script	F_VoteKafra	{
 					break;
 				case 3:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "kafra_09",255;
 						warp "mag_dun02",47,40;
 						end;
@@ -681,32 +682,32 @@ function	script	F_VoteKafra	{
 	end;
 }
 
-yuno,162,191,4	script	Kafra Voting Staff#yuno	861,{
+yuno,162,191,4	script	Kafra Voting Staff#yuno	4_F_KAFRA9,{
 	callfunc "F_VoteKafra",9;
 }
-prontera,164,125,4	script	Kafra Voting Staff#prt	116,{
+prontera,164,125,4	script	Kafra Voting Staff#prt	4_F_KAFRA2,{
 	callfunc "F_VoteKafra",2;
 }
-moc_ruins,97,133,4	script	Kafra Voting Staff#moc	116,{
+moc_ruins,97,133,4	script	Kafra Voting Staff#moc	4_F_KAFRA2,{
 	callfunc "F_VoteKafra",2;
 }
-geffen,122,37,4	script	Kafra Voting Staff#gef	116,{
+geffen,122,37,4	script	Kafra Voting Staff#gef	4_F_KAFRA2,{
 	callfunc "F_VoteKafra",2;
 }
-payon,158,182,4	script	Kafra Voting Staff#pay	116,{
+payon,158,182,4	script	Kafra Voting Staff#pay	4_F_KAFRA2,{
 	callfunc "F_VoteKafra",2;
 }
-alberta,119,70,4	script	Kafra Voting Staff#alb	116,{
+alberta,119,70,4	script	Kafra Voting Staff#alb	4_F_KAFRA2,{
 	callfunc "F_VoteKafra",2;
 }
-aldebaran,145,102,4	script	Kafra Voting Staff#alde	116,{
+aldebaran,145,102,4	script	Kafra Voting Staff#alde	4_F_KAFRA2,{
 	callfunc "F_VoteKafra",2;
 }
-lighthalzen,163,60,4	script	Kafra Voting Staff#lght	861,{
+lighthalzen,163,60,4	script	Kafra Voting Staff#lght	4_F_KAFRA9,{
 	callfunc "F_VoteKafra",9;
 }
 
--	script	Cool Event Staff::VotingStaffCCE	874,{
+-	script	Cool Event Staff::VotingStaffCCE	4_M_ZONDAMAN,{
 	callfunc "F_ClearGarbage";				//Clear outdated, unused variables
 	cutin "zonda_01",2;
 	mes "[Cool Event Corp. Voting Staff]";
@@ -932,7 +933,7 @@ lighthalzen,163,60,4	script	Kafra Voting Staff#lght	861,{
 				switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Cancel")) {
 				case 1:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "zonda_01",255;
 						warp "iz_dun02",234,206;
 						end;
@@ -960,7 +961,7 @@ lighthalzen,163,60,4	script	Kafra Voting Staff#lght	861,{
 				switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Cancel")) {
 				case 1:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "zonda_01",255;
 						warp "iz_dun02",234,206;
 						end;
@@ -975,7 +976,7 @@ lighthalzen,163,60,4	script	Kafra Voting Staff#lght	861,{
 					break;
 				case 2:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "zonda_01",255;
 						warp "c_tower3",64,143;
 						end;
@@ -1010,7 +1011,7 @@ lighthalzen,163,60,4	script	Kafra Voting Staff#lght	861,{
 				switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Glast Heim Entrance -> 4,000 z:Cancel")) {
 				case 1:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "zonda_01",255;
 						warp "iz_dun02",234,206;
 						end;
@@ -1025,7 +1026,7 @@ lighthalzen,163,60,4	script	Kafra Voting Staff#lght	861,{
 					break;
 				case 2:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "zonda_01",255;
 						warp "c_tower3",64,143;
 						end;
@@ -1040,7 +1041,7 @@ lighthalzen,163,60,4	script	Kafra Voting Staff#lght	861,{
 					break;
 				case 3:
 					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
+						Zeny -= 4000;
 						cutin "zonda_01",255;
 						warp "glast_01",368,303;
 						end;
@@ -1098,14 +1099,14 @@ lighthalzen,163,60,4	script	Kafra Voting Staff#lght	861,{
 	end;
 }
 
-yuno,153,191,6	duplicate(VotingStaffCCE)	Cool Event Staff#yuno	874
-prontera,147,125,6	duplicate(VotingStaffCCE)	Cool Event Staff#prt	874
-moc_ruins,104,133,6	duplicate(VotingStaffCCE)	Cool Event Staff#moc	874
-geffen,117,37,6	duplicate(VotingStaffCCE)	Cool Event Staff#gef	874
-payon,153,182,6	duplicate(VotingStaffCCE)	Cool Event Staff#pay	874
-alberta,114,70,6	duplicate(VotingStaffCCE)	Cool Event Staff#alb	874
-aldebaran,138,102,6	duplicate(VotingStaffCCE)	Cool Event Staff#alde	874
-lighthalzen,154,60,6	duplicate(VotingStaffCCE)	Cool Event Staff#lhz	874
+yuno,153,191,6	duplicate(VotingStaffCCE)	Cool Event Staff#yuno	4_M_ZONDAMAN
+prontera,147,125,6	duplicate(VotingStaffCCE)	Cool Event Staff#prt	4_M_ZONDAMAN
+moc_ruins,104,133,6	duplicate(VotingStaffCCE)	Cool Event Staff#moc	4_M_ZONDAMAN
+geffen,117,37,6	duplicate(VotingStaffCCE)	Cool Event Staff#gef	4_M_ZONDAMAN
+payon,153,182,6	duplicate(VotingStaffCCE)	Cool Event Staff#pay	4_M_ZONDAMAN
+alberta,114,70,6	duplicate(VotingStaffCCE)	Cool Event Staff#alb	4_M_ZONDAMAN
+aldebaran,138,102,6	duplicate(VotingStaffCCE)	Cool Event Staff#alde	4_M_ZONDAMAN
+lighthalzen,154,60,6	duplicate(VotingStaffCCE)	Cool Event Staff#lhz	4_M_ZONDAMAN
 
 yuno,103,225,0	script	Scrutiny Association#5	-1,{
 OnInit:
@@ -1173,12 +1174,13 @@ OnTimer15000:
 
 /*
 // GM only NPC used for modifying values related to the DTS system.
-sec_in02,17,160,4	script	Vote Globalvar Girl#yuno	864,{
+// Disabled in official script.
+sec_in02,17,160,4	script	Vote Globalvar Girl#yuno	4_F_OPERATION,{
+	callfunc "F_GM_NPC";
 	mes "[Christy's Maid]";
 	mes "Lady Christy!";
 	next;
-	input .@input,0,9000;
-	if (.@input == 1854) {
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
 		mes "[Christy's Maid]";
 		mes "I am Lady Christy's Maid.";
 		next;
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index c3df4e0af..28fe32b95 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Kafra Functions
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
 //= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 6.7
+//===== Current Version: =====================================
+//= 6.8
 //===== Description: =========================================
 //= These functions handle save, storage, cart rental, teleport,
 //= and Free Teleport/Warp/Rent Cart options for all Kafra NPCs.
@@ -13,9 +13,9 @@
 //= Kafra's will need a lot of work. The Welcome Message argument
 //= may become obsolete, as most kafras have a slightly differing
 //= Welcome message.
-//===== Additional Comments: ================================= 
-//= v1.1 Now using functions v2.1 Added Cart Rent for Classes: Whitesmith, Professor.
-//= Replaced checkoption(x) into checkcart(0) [Lupus] v2.1b Added Fix Kafra Pass Func [Kobra_k88]
+//===== Additional Comments: =================================
+//= 1.1 Now using functions v2.1 Added Cart Rent for Classes: Whitesmith, Professor.
+//=     Replaced checkoption(x) into checkcart(0) [Lupus] v2.1b Added Fix Kafra Pass Func [Kobra_k88]
 //= 2.2 Final fix of the Kafra Pass Exploit! [Lupus] a -Izlude[4] fix
 //= 2.2a Minor changes to function calls.  Using agruments. Added Guild options. [kobra_k88]
 //= 2.2b This version uses arrays for the teleport option. Rearranged next statements to make menu transitions smoother. [kobra_k88]
@@ -30,29 +30,29 @@
 //= 3.1 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 3.2 Fixed an exploit [Lupus]
 //= 4.0 Added Kafra storage password protection. [Lupus]
-//=	to block Kafra Password, read comments at 350 line
+//=     to block Kafra Password, read comments at 350 line
 //= 5.0 Fixed the close2;....close; end; lines. Who let them slip away? =/ [erKURITA]
-//=	  Also, the kafra upon warp was giving back the zeny. Removed. [erKURITA]
+//=     Also, the kafra upon warp was giving back the zeny. Removed. [erKURITA]
 //= 5.1 Optimized a little, added no tele/save arg's [Evera]
 //= 5.1a Temporary? Added F_ClearGarbage to clear unused/outdated variables [Lupus]
 //= 5.2 By default commented out custom Guilds Kafra's "Guild Storage". [Lupus]
 //= 5.3 uncommented Guild Storage. Confirmed kRO feature. [Lupus]
-//= 5.4 added -Guide option (Kafra shows you nearest Guide) Work in progress. 
-//=	Need all coords for all guides.. and somehow pass their coords to kafra.
-//=	Removed universal Kafra Pass, added 3 new Kafra Tickets [Lupus]
+//= 5.4 added -Guide option (Kafra shows you nearest Guide) Work in progress.
+//=     Need all coords for all guides.. and somehow pass their coords to kafra.
+//=     Removed universal Kafra Pass, added 3 new Kafra Tickets [Lupus]
 //= 5.4b temporary moved "-Guide" from the 1st menu punct [Lupus]
 //= 5.5 Added proper Niflheim welcome message.	[L0ne_W0lf]
-//=	Cleaned up the menus a bit. Got rid of the proceeding "-" prefix.
+//=     Cleaned up the menus a bit. Got rid of the proceeding "-" prefix.
 //= 5.5b Missed a preceeding hyphen, which was screwing up teleporting. [L0ne_W0lf]
 //= 5.6 Further dialog updates, added  dynamic costs for cart and storage use. [L0ne_W0lf]
-//=	Updated some functions to handle Guild Kafras the way they should. 
+//=     Updated some functions to handle Guild Kafras the way they should.
 //= 5.6a Corrected a few wrong names in the teleport function. [L0ne_W0lf]
 //= 5.7 Correced end message no longer displaying, and the duplicate names [L0ne_W0lf]
-//=	Thanks to Barron-Monster for pointing out the issues.
+//=     Thanks to Barron-Monster for pointing out the issues.
 //= 5.8 Fixed another double name being shown when "saving" [L0ne_W0lf]
 //= 5.9 Fixed the Kafra Welcome message for guilds. Thanks Barron-Monster. [L0ne_W0lf]
 //= 6.0 Closed Kafra Password exploit in Cool Event Corp. Storages until we got a client/packet based password support.
-//=		Added 2 args into F_SetKafCode to fit it in Cool Evnt Co. NPC [Lupus]
+//=     Added 2 args into F_SetKafCode to fit it in Cool Evnt Co. NPC [Lupus]
 //= 6.1 Added menu for Turbo Track Kafra Staff. [L0ne_W0lf]
 //= 6.2 Updated/Fixed warp cords. [Kisuka]
 //= 6.3 #kafra_code is now stored as is. [brianluau]
@@ -60,7 +60,8 @@
 //= 6.5 Optimized. [Joseph]
 //= 6.6 Added Warp Points / View Points Function. [Joseph]
 //= 6.7 Added Rune Knight Kafra. [Euphy]
-//============================================================ 
+//= 6.8 Improved compatibility with Zonda Staff NPCs. Modernized syntax. [Haru]
+//============================================================
 
 //=== Main Function ========================================================
 //=   arg(0): Used to determine which welcome message to show.
@@ -72,7 +73,7 @@
 function	script	F_Kafra	{
 	callfunc "F_ClearGarbage"; // Clear outdated, unused variables
 	// Display Kafra Welcome Message
-	switch(getarg(0)){
+	switch (getarg(0)) {
 		default:
 		case 0:
 			// Default message (obsolete)
@@ -92,9 +93,9 @@ function	script	F_Kafra	{
 			break;
 		case 2:
 			// Guild Castle Kafra message
-			set @GID,getcharid(2);
+			@GID = getcharid(2);
 			mes "[Kafra Employee]";
-	 		mes "Welcome. ^ff0000" + GetGuildName(@GID) + "^000000 Member.";
+			mes "Welcome. ^ff0000" + getguildname(@GID) + "^000000 Member.";
 			mes "The Kafra Coporation will stay with you wherever you go.";
 			break;
 		case 3:
@@ -104,26 +105,26 @@ function	script	F_Kafra	{
 			mes "In either case, why not stay awhile?";
 			mes "The air is eternally heavy with the";
 			mes "scent of pleasant wildflowers.";
-			break;		
+			break;
 		case 4:
 			// Louyang and Ayothaya specific message (obsolete)
 			mes "[Kafra Employee]";
 			mes "With our many Kafra";
 			mes "service locations, you're never";
 			mes "far from home.";
-			break;		
+			break;
 		case 5:
 			// NPC has it's own welcome message. (Display nothing)
 			break;
 	}
-	while (1) {
-		next;
-		deletearray @K_Menu0$[0],getarraysize(@K_Menu0$);
+	next;
+	while (true) {
+		deletearray @K_Menu0$;
 		if (getarg(0) == 2) {
 			// Guild Kafra Menu override (free Teleport, free Storage, Free Cart)
 			setarray @K_Menu0$[0],"Use Storage","Use Guild Storage","Rent a Pushcart","Use Teleport Service","Cancel";
 		} else {
-			switch(getarg(1)){
+			switch (getarg(1)) {
 				// Save and Storage only
 				case 1:	setarray @K_Menu0$[0],"Save","Use Storage","Cancel"; break;
 				// Storage only
@@ -147,22 +148,24 @@ function	script	F_Kafra	{
 				default: setarray @K_Menu0$[0],"Save","Use Storage","Use Teleport Service","Rent a Pushcart","Check Other Information","Cancel"; break;
 			}
 		}
-		set .@menu$,"";
-		for (set .@i, 0; .@i < getarraysize(@K_Menu0$); set .@i, .@i + 1)
-			set .@menu$, .@menu$ + @K_Menu0$[.@i] + ":";	
-		set .@j, select (.@menu$) - 1;
+		.@menu$ = "";
+		for (.@i = 0; .@i < getarraysize(@K_Menu0$); ++.@i)
+			.@menu$ += @K_Menu0$[.@i] + ":";
+		.@j = select(.@menu$) - 1;
 		if (@K_Menu0$[.@j] == "Save") {
 			return;
 		} else if (@K_Menu0$[.@j] == "Use Storage") {
 			// Do not charge for Guild Storage
-			if(getarg(0) == 2) 
-				callfunc "F_KafStor",2,0,0;
-			else 
-				callfunc "F_KafStor",0,getarg(3),getarg(0);
+			if(getarg(0) == 2)
+				callfunc "F_KafStor",2,0,0,"[Kafra Employee]";
+			else
+				callfunc "F_KafStor",0,getarg(3),getarg(0),"[Kafra Employee]";
+			next;
 		} else if (@K_Menu0$[.@j] == "Use Teleport Service") {
 			// Display Einbroch "No Teleport Service" notice.
-			if(getarg(1) != 4) callfunc "F_KafTele",getarg(0);
-			else {
+			if (getarg(1) != 4) {
+				callfunc "F_KafTele",getarg(0),"[Kafra Employee]";
+			} else {
 				mes "[Kafra Employee]";
 				mes "Because of the ^FF0000Limited";
 				mes "Transport Agreement^000000, the";
@@ -176,28 +179,41 @@ function	script	F_Kafra	{
 				mes "instead. Thank you for your";
 				mes "understanding and cooperation.";
 			}
-		} else if (@K_Menu0$[.@j] == "Rent a Pushcart") {
-			if(callfunc("F_KafCart",getarg(0),getarg(4)) == 1) 
 			next;
+		} else if (@K_Menu0$[.@j] == "Rent a Pushcart") {
+			if(callfunc("F_KafCart",getarg(0),getarg(4),"[Kafra Employee]") == 1)
+				next;
 		} else if (@K_Menu0$[.@j] == "Check Other Information") {
 			callfunc "F_KafInfo",getarg(2);
+			next;
 		} else if (@K_Menu0$[.@j] == "Cancel"){
 			callfunc "F_KafEnd",getarg(0),0;
 			end;
 		} else if (@K_Menu0$[.@j] == "Use Guild Storage") {
-			callfunc "F_KafStor",1,0;
+			callfunc "F_KafStor",1,0,0,"[Kafra Employee]";
+			next;
 		}
 	}
 }
 
 //===================================================
 // Storage Function
+//=   arg(0): Specifies the type of storage that has been requested:
+//            0 = Regular storage
+//            1 = Guild storage
+//            2 = Regular storage, in a castle (free of charge)
+//=   arg(1): Cost to use storage.
+//=   arg(2): The type of NPC this is being called from. Notable values:
+//            0,2-5 = Regular Kafra
+//            1 = Niflheim Kafra (special messages)
+//            6 = Zonda/Cool Event Staff (no RESRVPTS)
+//=   arg(3): NPC title to display.
 //===================================================
 function	script	F_KafStor	{
 	// Unable to access Guild Storage (Busy)
-	if(getarg(0) == 1){
-		if(guildopenstorage()){
-			mes "[Kafra Employee]";
+	if (getarg(0) == 1) {
+		if (guildopenstorage()) {
+			mes getarg(3);
 			mes "I'm sorry but another guild member is using the guild storage";
 			mes "right now.  Please wait until that person is finished.";
 			close2;
@@ -208,8 +224,8 @@ function	script	F_KafStor	{
 		close;
 	}
 	// Unable to access Normal Storage (Insufficient Basic Skills)
-	if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-		mes "[Kafra Employee]";
+	if (basicskillcheck() && getskilllv(NV_BASIC) < 6) {
+		mes getarg(3);
 		// Niflheim Specific Message
 		if (getarg(2) == 1) {
 			mes "^666666S-s-ssoooorry,";
@@ -225,12 +241,13 @@ function	script	F_KafStor	{
 		return;
 	}
 	// Accessing Normal Storage (Skipped if accessing Storage from Guild castle)
-	if(getarg(0) != 2){
+	if (getarg(0) != 2) {
 		// Consume "Free Ticket for Kafra Storage" if available.
-		if(countitem(7059)) delitem 7059,1;
-		else {
-			if(Zeny<getarg(1)){
-				mes "[Kafra Employee]";
+		if (countitem(Cargo_Free_Ticket)) {
+			delitem Cargo_Free_Ticket, 1;
+		} else {
+			if (Zeny < getarg(1)) {
+				mes getarg(3);
 				// Niflheim Specific Message
 				if (getarg(2) == 1) {
 					percentheal -50,-50;
@@ -247,30 +264,38 @@ function	script	F_KafStor	{
 				mes "Storage access fee is "+getarg(1)+" zeny.";
 				return;
 			}
-			set Zeny, Zeny-getarg(1);
-			set RESRVPTS, RESRVPTS + (getarg(1)/5);
+			Zeny -= getarg(1);
+			if (getarg(2) != 6)
+				RESRVPTS += getarg(1) / 5;
 		}
 	}
 
 	// Surpress the "End" message if in guild castle.
 	if (getarg(0) != 2) {
-		// Niflheim specific Message
 		if (getarg(2) == 1) {
+			// Niflheim specific Message
 			percentheal 0,-10;
-			mes "[Kafra Employee]";
-			for (set .@i, 0; .@i < 5; set .@i, .@i + 1)
+			mes getarg(3);
+			for (.@i = 0; .@i < 5; ++.@i)
 				mes "^666666Thank you.. for... using...^000000";
-		}
-		// Normal message
-		else {
-			mes "[Kafra Employee]";
+		} else if (getarg(2) == 6) {
+			// Zonda
+			mes getarg(3);
+			mes "Let me open your personal";
+			mes "storage for you right away.";
+			mes "Thanks for supporting Cool";
+			mes "Event Corp. by using our";
+			mes "services. Have a good day~";
+		} else {
+			// Normal message
+			mes getarg(3);
 			mes "Here, let me open";
 			mes "your Storage for you.";
 			mes "Thank you for using";
 			mes "the Kafra Service.";
 		}
 	}
-	callfunc("F_CheckKafCode");	//check your storage password, if set
+	callfunc("F_CheckKafCode"); //check your storage password, if set
 	close2;
 	openstorage;
 	cutin "", 255;
@@ -279,23 +304,29 @@ function	script	F_KafStor	{
 
 //===================================================
 // Teleport Function
+//=   arg(2): The type of NPC this is being called from. Notable values:
+//            2 = Guild Castle Kafra (don't consume tickets)
+//            6 = Zonda/Cool Event Staff (no RESRVPTS)
+//=   arg(1): NPC title to display.
 //===================================================
 function	script	F_KafTele	{
-	mes "[Kafra Employee]";
+	mes getarg(1);
 	mes "Please choose";
 	mes "your destination.";
 	next;
-	set .@menu$, "";
-	for (set .@i, 0; .@i <= 6; set .@i, .@i + 1)
-		set .@menu$, .@menu$ + @wrpC$[.@i] + ":";
-	set .@j, select (.@menu$) - 1;
-	if (@wrpC$[.@j] == "Cancel") return;
+	.@menu$ = "";
+	for (.@i = 0; .@i <= 6; ++.@i)
+		.@menu$ += @wrpC$[.@i] + ":";
+	.@j = select(.@menu$) - 1;
+	if (@wrpC$[.@j] == "Cancel")
+		return;
 	// Consume "Free Ticket for Kafra Transportation" if available.
 	// Do not consume if in Guild castle
-	if(countitem(7060) > 0 && getarg(0) != 2) delitem 7060,1;
-	else {
-		if (Zeny<@wrpP[.@j]){
-			mes "[Kafra Employee]";
+	if (countitem(Warp_Free_Ticket) > 0 && getarg(0) != 2) {
+		delitem Warp_Free_Ticket, 1;
+	} else {
+		if (Zeny < @wrpP[.@j]) {
+			mes getarg(1);
 			mes "I'm sorry, but you don't have";
 			mes "enough zeny for the Teleport";
 			mes "Service. The fee to teleport";
@@ -304,8 +335,9 @@ function	script	F_KafTele	{
 			cutin "", 255;
 			end;
 		}
-		set Zeny, Zeny - @wrpP[.@j];
-		set RESRVPTS, RESRVPTS + (@wrpP[.@j]/16);
+		Zeny -= @wrpP[.@j];
+		if (getarg(0) != 6)
+			RESRVPTS += @wrpP[.@j] / 16;
 	}
 	cutin "", 255;
 	if (@wrpD$[.@j] == "Al De Baran") warp "aldebaran",168,112;
@@ -321,17 +353,25 @@ function	script	F_KafTele	{
 	else if (@wrpD$[.@j] == "Payon") warp "payon", 161, 58;
 	else if (@wrpD$[.@j] == "Prontera") warp "prontera", 116, 72;
 	else if (@wrpD$[.@j] == "Umbala") warp "umbala", 100, 154;
+	else if (@wrpD$[.@j] == "Veins") warp "veins",205,101;
+	else if (@wrpD$[.@j] == "Rachel") warp "rachel",115,125;
 	end;
 }
 
 
 //===================================================
 // Cart Function
+//=   arg(0): The type of NPC this is being called from. Notable values:
+//            0,1,3-5 = Regular Kafra
+//            2 = Guild Castle Kafra (don't consume tickets)
+//            6 = Zonda/Cool Event Staff (no RESRVPTS)
+//=   arg(1): Cost to rent a cart.
+//=   arg(2): NPC title to display.
 //===================================================
 function	script	F_KafCart	{
 	// Ensure that the class wanting to rent a pushcart is a merchant
-	if(BaseClass != Job_Merchant){
-		mes "[Kafra Employee]";
+	if (BaseClass != Job_Merchant) {
+		mes getarg(2);
 		mes "I'm sorry, but the";
 		mes "Pushcart rental service";
 		mes "is only available to Merchants,";
@@ -339,9 +379,15 @@ function	script	F_KafCart	{
 		mes "Alchemists and Biochemists.";
 		return 1;
 	}
+	if (getskilllv(MC_PUSHCART) == 0) {
+		mes getarg(2);
+		mes "You can only rent a cart after";
+		mes "learning the Pushcart Skill.";
+		return 1;
+	}
 	// Make sure the invoking character does not have a cart already
-	else if(checkcart() == 1){
-		mes "[Kafra Employee]";
+	if (checkcart() == 1) {
+		mes getarg(2);
 		mes "You already have";
 		mes "a Pushcart equipped.";
 		mes "Unfortunately, we can't";
@@ -351,24 +397,27 @@ function	script	F_KafCart	{
 	}
 	// Consume "Free Ticket for the Cart Service" if available.
 	// Do not consume if in Guild castle.
-	if(countitem(7061) > 0 && getarg(0) != 2) delitem 7061,1;
-	else {
-		mes "[Kafra Employee]";
+	if (countitem(Cart_Free_Ticket) > 0 && getarg(0) != 2) {
+		delitem Cart_Free_Ticket, 1;
+	} else {
+		mes getarg(2);
 		mes "The Pushcart rental";
 		mes "fee is "+getarg(1)+" zeny. Would";
 		mes "you like to rent a Pushcart?";
 		next;
-		if (select("Rent a Pushcart.:Cancel") == 2) return 0;
-			if(Zeny<getarg(1)){
-				mes "[Kafra Employee]";
-				mes "I'm sorry, but you";
-				mes "don't have enough";
-				mes "zeny to pay the Pushcart";
-				mes "rental fee of "+getarg(1)+" zeny.";
-				return 1;
-			}
-			set Zeny,Zeny-getarg(1);
-			set RESRVPTS, RESRVPTS + 48;
+		if (select("Rent a Pushcart.:Cancel") == 2)
+			return 0;
+		if (Zeny < getarg(1)) {
+			mes getarg(2);
+			mes "I'm sorry, but you";
+			mes "don't have enough";
+			mes "zeny to pay the Pushcart";
+			mes "rental fee of "+getarg(1)+" zeny.";
+			return 1;
+		}
+		Zeny -= getarg(1);
+		if (getarg(0) != 6)
+			RESRVPTS += 48;
 	}
 	setcart;
 	return 1;
@@ -379,12 +428,12 @@ function	script	F_KafCart	{
 //===================================================
 function	script	F_KafInfo	{
 	// Uncomment next line to block Kafra Storage Protection
-	//	set .@block, 1;
-		setarray .@m$, "Check Special Reserve Points.","Storage Password Service","Kafra Employee Locations","Cancel";
-		if (getarg(0) == 2) deletearray .@m$[1],2; // Rune Knight
-		else if (.@block) deletearray .@m$[1],1;
-	while (1) {
-		set .@j, select(implode(.@m$,":")) - 1;
+	//set .@block, 1;
+	setarray .@m$, "Check Special Reserve Points.","Storage Password Service","Kafra Employee Locations","Cancel";
+	if (getarg(0) == 2) deletearray .@m$[1],2; // Port Malaya, Rune Knight: remove Storage Password and Kafra Employee Locations
+	else if (.@block) deletearray .@m$[1],1; // Remove Storage Password
+	while (true) {
+		.@j = select(implode(.@m$,":")) - 1;
 		if (.@m$[.@j] == "Check Special Reserve Points.") {
 			mes "[Kafra Employee]";
 			mes "Let's see...";
@@ -398,12 +447,13 @@ function	script	F_KafInfo	{
 			mes "rewards at the Kafra Main Office in Al De Baran. Please use our";
 			mes "convenient services to see the benefits of our rewards program.";
 			next;
-			if(getarg(0) == 1) return;
+			if(getarg(0) == 1)
+				return;
 		} else if (.@m$[.@j] == "Kafra Employee Locations") {
-			for (set .@i, 0; .@i <= 3; set .@i, .@i + 1)
+			for (.@i = 0; .@i <= 3; ++.@i)
 				viewpoint 1,@viewpX[.@i],@viewpY[.@i],(.@i+1),0xFF00FF;
 			next;
-			for (set .@i, 0; .@i <= 3; set .@i, .@i + 1)
+			for (.@i = 0; .@i <= 3; ++.@i)
 				viewpoint 2,@viewpX[.@i],@viewpY[.@i],(.@i+1),0xFF00FF;
 		} else if (.@m$[.@j] == "Storage Password Service") {
 			callfunc("F_SetKafCode","[Kafra Employee]","Kafra Services");
@@ -420,20 +470,20 @@ function	script	F_KafInfo	{
 //===================================================================
 function	script	F_KafEnd	{
 	mes "[Kafra Employee]";
-	if(getarg(1)==1) {	
+	if (getarg(1) == 1) {
 		// Save
 		mes "Your Respawn Point";
 		mes "has been saved here";
 		mes getarg(2)+".";
 		mes "Thank you for using";
 		mes "the Kafra Services.";
-	} else if(getarg(0)==0 || getarg(0)==5) {	
+	} else if (getarg(0) == 0 || getarg(0) == 5) {
 		// Generic End
 		mes "We, here at Kafra Corporation,";
 		mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
-	} else if(getarg(0)==1) {
+	} else if (getarg(0) == 1) {
 		// Niflheim End
-		percentheal 0,- 25;
+		percentheal 0,-25;
 		mes "^666666Kaffffra n-never";
 		mes "diiiiiiiiiiiiiies. On...";
 		mes "On y-yooour siiiiide~^000000";
@@ -447,18 +497,19 @@ function	script	F_KafEnd	{
 // Check Storage Password Function
 //===================================================
 function	script	F_CheckKafCode	{
-	if(!#kafra_code) return;
+	if (!#kafra_code)
+		return;
 	mes "Enter your storage password:";
-	set @code_,0;
+	@code_ = 0;
 	input @code_;
-	if(@code_ != #kafra_code) {
+	if (@code_ != #kafra_code) {
 		dispbottom "Wrong storage password.";
 		close2;
 		cutin "",255;
 		end;
 	}
-	set @kafcode_try,0;
-	set @code_,0;
+	@kafcode_try = 0;
+	@code_ = 0;
 	return;
 }
 
@@ -468,15 +519,15 @@ function	script	F_CheckKafCode	{
 //=======================================================
 function	script	F_SetKafCode	{
 	mes getarg(0);
-	if(#kafra_code) {
+	if (#kafra_code) {
 		mes "Your storage is protected with a password. What would you do now?";
 		next;
 		switch (select("Change old password -> 5000z:Remove storage password -> 1000z:Cancel")) {
-			Case 1:
+			case 1:
 				mes getarg(0);
 				mes "At first, please enter your ^0000FFold password^000000.";
-				set @code,callfunc("F_EntKafCode");
-				if(!@code || @code != #kafra_code) {
+				@code = callfunc("F_EntKafCode");
+				if (!@code || @code != #kafra_code) {
 					mes "Wrong password. You can't set a new password.";
 					emotion e_hmm;
 					break;
@@ -484,25 +535,25 @@ function	script	F_SetKafCode	{
 				next;
 				callsub S_SET,getarg(0),getarg(1);
 				break;
-			Case 2:
+			case 2:
 				mes getarg(0);
 				mes "Please, enter your password before its removal.";
-				set @code,callfunc("F_EntKafCode");
-				if(!@code) {
+				@code = callfunc("F_EntKafCode");
+				if (!@code) {
 					mes "The password hasn't been removed.";
 					emotion e_hmm;
 					break;
 				}
 				next;
 				mes getarg(0);
-				if(Zeny < 1000) {
+				if (Zeny < 1000) {
 					mes "You don't have enough zeny.";
 					emotion e_cash;
 					break;
 				}
-				set Zeny,Zeny-1000;
-				if(@code == #kafra_code) {
-					set #kafra_code,0;
+				Zeny -= 1000;
+				if (@code == #kafra_code) {
+					#kafra_code = 0;
 					mes "You've successfully cleared your storage password.";
 					mes "Thank you for using "+getarg(1)+".";
 					emotion e_thx;
@@ -512,7 +563,7 @@ function	script	F_SetKafCode	{
 					emotion e_sry;
 				}
 				break;
-			Case 3:
+			case 3:
 				break;
 		}
 	} else {
@@ -520,8 +571,8 @@ function	script	F_SetKafCode	{
 		mes "Additional storage protection with a password.";
 		next;
 		switch (select("Set new password -> 5000z:Cancel")) {
-			Case 1: callsub S_SET,getarg(0),getarg(1); break;
-			Case 2: break;		
+			case 1: callsub S_SET,getarg(0),getarg(1); break;
+			case 2: break;
 		}
 	}
 	close2;
@@ -531,21 +582,21 @@ function	script	F_SetKafCode	{
 S_SET:
 	mes getarg(0);
 	mes "Now enter your ^FF0000new password^000000 to protect your storage from thieves.";
-	set @code,callfunc("F_EntKafCode");
-	if(!@code) {
+	@code = callfunc("F_EntKafCode");
+	if (!@code) {
 		mes "The password hasn't been changed.";
 		emotion e_hmm;
 		return;
 	}
 	next;
 	mes getarg(0);
-	if(Zeny < 5000) {
+	if (Zeny < 5000) {
 		mes "You don't have enough zeny.";
 		emotion e_cash;
 		return;
 	}
-	set Zeny,Zeny-5000;
-	set #kafra_code,@code;
+	Zeny -= 5000;
+	#kafra_code = @code;
 	mes "You've protected your storage with a secret password.";
 	mes "Thank you for using "+getarg(1)+".";
 	emotion e_thx;
@@ -557,17 +608,17 @@ S_SET:
 //===================================================
 function	script	F_EntKafCode	{
 	mes "Enter a number 1000~10000000:";
-	set @code_,0;
-	set @kafcode_try,@kafcode_try+1;
-	if(@kafcode_try>10) {
-		set @kafcode_try,0;
+	@code_ = 0;
+	++@kafcode_try;
+	if (@kafcode_try > 10) {
+		@kafcode_try = 0;
 		logmes "Hack: Tried to fit storage password.";
 	}
-	if(input(@code_) == 1) {
+	if (input(@code_) == 1) {
 		mes "You can't use such big password.";
 		return 0;
 	}
-	if(@code_<1000) {
+	if (@code_ < 1000) {
 		mes "You shouldn't use such short password.";
 		return 0;
 	}
@@ -578,60 +629,66 @@ function	script	F_EntKafCode	{
 // Warp Points / View Points Function
 //===================================================
 function	script	F_KafSet	{
-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	cleararray @wrpD$[0],"",getarraysize(@wrpD$);
-	cleararray @wrpP$[0],"",getarraysize(@wrpP$);
-	cleararray @viewpX[0],"",getarraysize(@viewpX);
-	cleararray @viewpY[0],"",getarraysize(@viewpY);
+	deletearray @wrpC$;
+	deletearray @wrpD$;
+	deletearray @wrpP$;
+	deletearray @viewpX;
+	deletearray @viewpY;
 	if (strnpcinfo(4) == "prontera") {
-		setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta";
-		setarray @wrpP[0], 600, 1200, 1200, 1200, 1200, 1800;
-		setarray @viewpX[0], 151, 29, 282, 152;
-		setarray @viewpY[0], 29, 207, 200, 326;
+		setarray @wrpD$, "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta";
+		setarray @wrpP, 600, 1200, 1200, 1200, 1200, 1800;
+		setarray @viewpX, 151, 29, 282, 152;
+		setarray @viewpY, 29, 207, 200, 326;
 	} else if (strnpcinfo(4) == "alberta") {
-		setarray @wrpP[0], 1200, 1800, 1800;
-		setarray @wrpD$[0], "Payon", "Morroc", "Prontera";
-		setarray @viewpX[0], 28, 113, 0, 0;
-		setarray @viewpY[0], 229, 60, 0, 0;
+		setarray @wrpP, 1200, 1800, 1800;
+		setarray @wrpD$, "Payon", "Morroc", "Prontera";
+		setarray @viewpX, 28, 113, 0, 0;
+		setarray @viewpY, 229, 60, 0, 0;
 	} else if (strnpcinfo(4) == "aldebaran") {
-		setarray @wrpP[0], 1200, 1200, 1800, 1700;
-		setarray @wrpD$[0], "Geffen", "Juno" , "Izlude", "Mjolnir Dead Pit";
+		setarray @wrpP, 1200, 1200, 1800, 1700;
+		setarray @wrpD$, "Geffen", "Juno" , "Izlude", "Mjolnir Dead Pit";
 	} else if (strnpcinfo(4) == "comodo" ) {
-		setarray @wrpD$[0], "Morroc", "Comodo Pharos Beacon", "Umbala";
-		setarray @wrpP[0], 1800, 1200, 1800;
+		setarray @wrpD$, "Morroc", "Comodo Pharos Beacon", "Umbala";
+		setarray @wrpP, 1800, 1200, 1800;
 	} else if (strnpcinfo(4) == "cmd_fild07") {
-		setarray @wrpD$[0], "Comodo", "Morroc";
-		setarray @wrpP[0], 1200, 1200;
+		setarray @wrpD$, "Comodo", "Morroc";
+		setarray @wrpP, 1200, 1200;
 	} else if (strnpcinfo(4) == "geffen") {
-		setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Mjolnir Dead Pit";
-		setarray @wrpP[0], 1200, 1200, 1200, 1700;
-		setarray @viewpX[0], 120, 203;
-		setarray @viewpY[0], 62, 123;
+		setarray @wrpD$, "Prontera", "Al De Baran", "Orc Dungeon", "Mjolnir Dead Pit";
+		setarray @wrpP, 1200, 1200, 1200, 1700;
+		setarray @viewpX, 120, 203;
+		setarray @viewpY, 62, 123;
 	} else if (strnpcinfo(4) == "izlude") {
-		setarray @wrpD$[0], "Geffen", "Payon", "Morroc", "Al De Baran";
-		setarray @wrpP[0], 1200, 1200, 1200, 1800;
+		setarray @wrpD$, "Geffen", "Payon", "Morroc", "Al De Baran";
+		setarray @wrpP, 1200, 1200, 1200, 1800;
 	} else if (strnpcinfo(4) == "morocc") {
-		setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Beacon";
-		setarray @wrpP[0], 1200, 1200, 1800, 1800, 1200;
-		setarray @viewpX[0], 156, 163, 28, 292;
-		setarray @viewpY[0], 97, 260, 167, 211;
+		setarray @wrpD$, "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Beacon";
+		setarray @wrpP, 1200, 1200, 1800, 1800, 1200;
+		setarray @viewpX, 156, 163, 28, 292;
+		setarray @viewpY, 97, 260, 167, 211;
 	} else if (strnpcinfo(4) == "umbala") {
-		setarray @wrpD$[0], "Comodo";
-		setarray @wrpP[0], 1800;
+		setarray @wrpD$, "Comodo";
+		setarray @wrpP, 1800;
 	} else if (strnpcinfo(4) == "payon") {
-		setarray @wrpD$[0], "Prontera", "Alberta", "Morroc";
-		setarray @wrpP[0], 1200, 1200, 1200;
+		setarray @wrpD$, "Prontera", "Alberta", "Morroc";
+		setarray @wrpP, 1200, 1200, 1200;
 	} else if (strnpcinfo(4) == "yuno") {
-		setarray @wrpD$[0], "Al De Baran";
-		setarray @wrpP[0], 1200;
-		setarray @viewpX[0], 328, 278, 153, 0;
-		setarray @viewpY[0], 108, 221, 187, 0;
+		setarray @wrpD$, "Al De Baran";
+		setarray @wrpP, 1200;
+		setarray @viewpX, 328, 278, 153, 0;
+		setarray @viewpY, 108, 221, 187, 0;
 	} else if (strnpcinfo(4) == "job3_rune01") {
-		setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Alberta";
-		setarray @wrpP[0], 600, 1200, 1200, 1200, 1800;
+		setarray @wrpD$, "Izlude", "Geffen", "Payon", "Morroc", "Alberta";
+		setarray @wrpP, 600, 1200, 1200, 1200, 1800;
+	} else if (strnpcinfo(4) == "rachel") {
+		setarray @wrpD$, "Veins";
+		setarray @wrpP, 2200;
+	} else if (strnpcinfo(4) == "veins") {
+		setarray @wrpD$, "Rachel";
+		setarray @wrpP, 2200;
 	}
-	for (set .@i, 0; .@i < getarraysize(@wrpD$); set .@i, .@i + 1)
-		setd "@wrpC$["+.@i+"]",getd("@wrpD$["+.@i+"]")+" -> "+getd("@wrpP["+.@i+"]");
-	setd "@wrpC$["+getarraysize(@wrpC$)+"]","Cancel";
+	for (.@i = 0; .@i < getarraysize(@wrpD$); ++.@i)
+		@wrpC$[.@i] = @wrpD$[.@i]+" -> "+@wrpP[.@i];
+	@wrpC$[getarraysize(@wrpC$)] = "Cancel";
 	return;
-}
\ No newline at end of file
+}
diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt
index 49562e3be..e52d195ce 100644
--- a/npc/kafras/kafras.txt
+++ b/npc/kafras/kafras.txt
@@ -1,28 +1,30 @@
 //===== Hercules Script ======================================
 //= Kafras (Cities/Dungeons/Fields)
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Joseph
-//===== Current Version: ===================================== 
-//= 1.1
+//===== Current Version: =====================================
+//= 1.1b
 //===== Description: =========================================
 //= Argument settings for callfunc "F_Kafra":
 //=  arg(0): 0 - Default Kafra message
 //=          1 - Niflhiem Kafra message
 //=          2 - Guild Kafra message
-//=  arg(1): 1 - Disable teleport menu 
+//=  arg(1): 1 - Disable teleport menu
 //=  arg(2): 1 - Disable info menu
 //=  arg(3): Cost of Storage service
 //=  arg(4): Cost of Rent a Pushcart service
-//===== Additional Comments: ================================= 
-//= 0.x Previous Authors: 
+//===== Additional Comments: =================================
+//= 0.x Previous Authors:
 //=     - L0ne_W0lf, kobra_k88, Samuray22, Evera, Lupus
 //= 1.0 Merged and cleaned up Kafras. [Joseph]
 //= 1.1 Added Izlude RE coordinates. [Euphy]
-//============================================================ 
+//= 1.1a Fixed Pre-RE Call and some leftovers. [Lemongrass]
+//= 1.1b Enabled saving in Izlude duplicates (RE). [Euphy]
+//============================================================
 
 // Aldebaran
 //============================================================
-aldeba_in,96,181,4	script	Kafra Service	113,{
+aldeba_in,96,181,4	script	Kafra Service	4_F_KAFRA5,{
 	cutin "kafra_05",2;
 	mes "[Kafra Leilah]";
 	mes "Hm...?";
@@ -49,7 +51,7 @@ aldeba_in,96,181,4	script	Kafra Service	113,{
 		close2;
 		break;
 	case 2:
-		if (zeny < 20) {
+		if (Zeny < 20) {
 			mes "[Kafra Leilah]";
 			mes "Excuse me, but it";
 			mes "seems that you don't";
@@ -64,7 +66,7 @@ aldeba_in,96,181,4	script	Kafra Service	113,{
 		mes "and administrative functions,";
 		mes "I'll access your Storage for you.";
 		next;
-		set zeny,zeny-20;
+		Zeny -= 20;
 		set RESRVPTS, RESRVPTS + (20/5);
 		mes "[Kafra Leilah]";
 		mes "In the future, please";
@@ -108,7 +110,7 @@ aldeba_in,96,181,4	script	Kafra Service	113,{
 	end;
 }
 
-aldebaran,143,119,4	script	Kafra Employee::kaf_aldebaran	113,{
+aldebaran,143,119,4	script	Kafra Employee::kaf_aldebaran	4_F_KAFRA5,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -123,7 +125,7 @@ aldebaran,143,119,4	script	Kafra Employee::kaf_aldebaran	113,{
 
 // Geffen
 //============================================================
-geffen,120,62,0	script	Kafra Employee::kaf_geffen	115,{
+geffen,120,62,0	script	Kafra Employee::kaf_geffen	4_F_KAFRA3,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -136,7 +138,7 @@ geffen,120,62,0	script	Kafra Employee::kaf_geffen	115,{
 	callfunc "F_KafEnd",0,1,"in the city of Geffen";
 }
 
-geffen,203,123,2	script	Kafra Employee::geffen2	114,{
+geffen,203,123,2	script	Kafra Employee::geffen2	4_F_KAFRA4,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -153,7 +155,7 @@ geffen,203,123,2	script	Kafra Employee::geffen2	114,{
 
 // Morocc
 //============================================================
-morocc,156,97,4	script	Kafra Employee::kaf_morocc	113,{
+morocc,156,97,4	script	Kafra Employee::kaf_morocc	4_F_KAFRA5,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -166,7 +168,7 @@ morocc,156,97,4	script	Kafra Employee::kaf_morocc	113,{
 	callfunc "F_KafEnd",0,1,"in the city of Morroc";
 }
 
-morocc,160,258,4	script	Kafra::kaf_morocc2	114,{
+morocc,160,258,4	script	Kafra::kaf_morocc2	4_F_KAFRA4,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -183,7 +185,7 @@ morocc,160,258,4	script	Kafra::kaf_morocc2	114,{
 
 // Payon
 //============================================================
-payon,181,104,4	script	Kafra Employee::kaf_payon	113,{
+payon,181,104,4	script	Kafra Employee::kaf_payon	4_F_KAFRA5,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -196,7 +198,7 @@ payon,181,104,4	script	Kafra Employee::kaf_payon	113,{
 	callfunc "F_KafEnd",0,1,"in the city of Payon";
 }
 
-payon,175,226,4	script	Kafra Employee::kaf_payon2	116,{
+payon,175,226,4	script	Kafra Employee::kaf_payon2	4_F_KAFRA2,{
 	cutin "kafra_02",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -210,7 +212,7 @@ payon,175,226,4	script	Kafra Employee::kaf_payon2	116,{
 	callfunc "F_KafEnd",0,1,"in the city of Payon";
 }
 
-pay_arche,55,123,0	script	Kafra Employee::kaf_payon3	115,{
+pay_arche,55,123,0	script	Kafra Employee::kaf_payon3	4_F_KAFRA3,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -226,7 +228,7 @@ pay_arche,55,123,0	script	Kafra Employee::kaf_payon3	115,{
 
 // Prontera
 //============================================================
-prontera,152,326,3	script	Kafra Employee::kaf_prontera	112,{
+prontera,152,326,3	script	Kafra Employee::kaf_prontera	4_F_KAFRA6,{
 	cutin "kafra_06",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -241,7 +243,7 @@ prontera,152,326,3	script	Kafra Employee::kaf_prontera	112,{
 	callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
-prontera,151,29,0	script	Kafra Employee::kaf_prontera2	115,{
+prontera,151,29,0	script	Kafra Employee::kaf_prontera2	4_F_KAFRA3,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -254,7 +256,7 @@ prontera,151,29,0	script	Kafra Employee::kaf_prontera2	115,{
 	callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
-prontera,29,207,6	script	Kafra Employee::kaf_prontera3	113,{
+prontera,29,207,6	script	Kafra Employee::kaf_prontera3	4_F_KAFRA5,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -267,7 +269,7 @@ prontera,29,207,6	script	Kafra Employee::kaf_prontera3	113,{
 	callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
-prontera,282,200,2	script	Kafra Employee::kaf_prontera4	114,{
+prontera,282,200,2	script	Kafra Employee::kaf_prontera4	4_F_KAFRA4,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -282,7 +284,7 @@ prontera,282,200,2	script	Kafra Employee::kaf_prontera4	114,{
 	callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
-prontera,146,89,6	script	Kafra Employee::kaf_prontera5	117,{
+prontera,146,89,6	script	Kafra Employee::kaf_prontera5	4_F_KAFRA1,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -298,7 +300,7 @@ prontera,146,89,6	script	Kafra Employee::kaf_prontera5	117,{
 
 // Yuno
 //============================================================
-yuno,152,187,4	script	Kafra Employee::kaf_yuno	860,{
+yuno,152,187,4	script	Kafra Employee::kaf_yuno	4_F_KAFRA8,{
 	cutin "kafra_08",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -311,7 +313,7 @@ yuno,152,187,4	script	Kafra Employee::kaf_yuno	860,{
 	callfunc "F_KafEnd",0,1,"in the city of Juno";
 }
 
-yuno,327,108,4	script	Kafra Employee::kaf_yuno2	860,{
+yuno,327,108,4	script	Kafra Employee::kaf_yuno2	4_F_KAFRA8,{
 	cutin "kafra_08",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -324,9 +326,9 @@ yuno,327,108,4	script	Kafra Employee::kaf_yuno2	860,{
 	callfunc "F_KafEnd",0,1,"in the city of Juno";
 }
 
-yuno,277,221,4	script	Kafra Employee::kaf_yuno3	861,{
+yuno,277,221,4	script	Kafra Employee::kaf_yuno3	4_F_KAFRA9,{
 	cutin "kafra_09",2;
-	callfunc "F_KafSetYun";
+	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
 	mes "The Kafra Corporation";
 	mes "is always working to provide";
@@ -339,7 +341,7 @@ yuno,277,221,4	script	Kafra Employee::kaf_yuno3	861,{
 
 // Alberta
 //============================================================
-alberta,28,229,0	script	Kafra Employee::kaf_alberta	116,{
+alberta,28,229,0	script	Kafra Employee::kaf_alberta	4_F_KAFRA2,{
 	cutin "kafra_02",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -353,7 +355,7 @@ alberta,28,229,0	script	Kafra Employee::kaf_alberta	116,{
 	callfunc "F_KafEnd",0,1,"in the city of Alberta";
 }
 
-alberta,113,60,6	script	Kafra Employee::kaf_alberta2	112,{
+alberta,113,60,6	script	Kafra Employee::kaf_alberta2	4_F_KAFRA6,{
 	cutin "kafra_06",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -370,7 +372,7 @@ alberta,113,60,6	script	Kafra Employee::kaf_alberta2	112,{
 
 // Comodo
 //============================================================
-comodo,195,150,4	script	Kafra Employee::kaf_comodo	721,{
+comodo,195,150,4	script	Kafra Employee::kaf_comodo	4_F_KAFRA7,{
 	cutin "kafra_07",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -384,7 +386,7 @@ comodo,195,150,4	script	Kafra Employee::kaf_comodo	721,{
 	callfunc "F_KafEnd",0,1,"in the town of Comodo";
 }
 
-cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
+cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	4_F_KAFRA7,{
 	cutin "kafra_07",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -400,7 +402,7 @@ cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 
 // Izlude
 //============================================================
--	script	kaf_izlude	-1,{
+-	script	::kaf_izlude	-1,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -411,7 +413,7 @@ cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 	mes "How may I assist you?";
 	callfunc "F_Kafra",5,0,1,40,820;
 	if (checkre(0))
-		savepoint "izlude",129,97;
+		savepoint strnpcinfo(4),129,97;
 	else
 		savepoint "izlude",94,103;
 	callfunc "F_KafEnd",0,1,"in the city of Izlude";
@@ -419,7 +421,7 @@ cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 
 // Moscovia
 //============================================================
-moscovia,223,191,3	script	Kafra Employee::kaf_mosk	114,{
+moscovia,223,191,3	script	Kafra Employee::kaf_mosk	4_F_KAFRA4,{
 	cutin "kafra_04",2;
 	callfunc "F_Kafra",0,3,0,80,700;
 	savepoint "moscovia",221,194;;
@@ -428,7 +430,7 @@ moscovia,223,191,3	script	Kafra Employee::kaf_mosk	114,{
 
 // Amatsu
 //============================================================
-amatsu,102,149,4	script	Kafra Employee::kaf_amatsu	116,{
+amatsu,102,149,4	script	Kafra Employee::kaf_amatsu	4_F_KAFRA2,{
 	cutin "kafra_02",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -443,7 +445,7 @@ amatsu,102,149,4	script	Kafra Employee::kaf_amatsu	116,{
 
 // Ayothaya
 //============================================================
-ayothaya,212,169,5	script	Kafra Employee::kaf_ayothaya	116,{
+ayothaya,212,169,5	script	Kafra Employee::kaf_ayothaya	4_F_KAFRA2,{
 	cutin "kafra_02",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -458,7 +460,7 @@ ayothaya,212,169,5	script	Kafra Employee::kaf_ayothaya	116,{
 
 // Einbech
 //============================================================
-einbech,181,132,5	script	Kafra Employee#ein3::kaf_einbech	860,{
+einbech,181,132,5	script	Kafra Employee#ein3::kaf_einbech	4_F_KAFRA8,{
 	cutin "kafra_08",2;
 	mes "[Kafra Employee]";
 	mes "Welcome~!";
@@ -472,7 +474,7 @@ einbech,181,132,5	script	Kafra Employee#ein3::kaf_einbech	860,{
 
 // Einbroch
 //============================================================
-einbroch,242,205,5	script	Kafra Employee#ein2::kaf_einbroch	860,{
+einbroch,242,205,5	script	Kafra Employee#ein2::kaf_einbroch	4_F_KAFRA8,{
 	cutin "kafra_08",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -485,7 +487,7 @@ einbroch,242,205,5	script	Kafra Employee#ein2::kaf_einbroch	860,{
 	callfunc "F_KafEnd",0,1,"in the city of Einbroch";
 }
 
-einbroch,59,203,6	script	Kafra Employee#ein1::kaf_einbroch2	861,{
+einbroch,59,203,6	script	Kafra Employee#ein1::kaf_einbroch2	4_F_KAFRA9,{
 	cutin "kafra_09",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -500,7 +502,7 @@ einbroch,59,203,6	script	Kafra Employee#ein1::kaf_einbroch2	861,{
 
 // Gonryun
 //============================================================
-gonryun,159,122,4	script	Kafra Employee::kaf_gonryun	116,{
+gonryun,159,122,4	script	Kafra Employee::kaf_gonryun	4_F_KAFRA2,{
 	cutin "kafra_02",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -515,7 +517,7 @@ gonryun,159,122,4	script	Kafra Employee::kaf_gonryun	116,{
 
 // Lighthalzen
 //============================================================
-lighthalzen,164,100,4	script	Kafra Employee::kaf_lighthalzen	860,{
+lighthalzen,164,100,4	script	Kafra Employee::kaf_lighthalzen	4_F_KAFRA8,{
 	cutin "kafra_08",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -528,7 +530,7 @@ lighthalzen,164,100,4	script	Kafra Employee::kaf_lighthalzen	860,{
 	callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
 }
 
-lighthalzen,191,320,4	script	Kafra Employee::kaf_lighthalzen2	861,{
+lighthalzen,191,320,4	script	Kafra Employee::kaf_lighthalzen2	4_F_KAFRA9,{
 	cutin "kafra_09",2;
 	mes "[Kafra Employee]";
 	mes "Welcome~!";
@@ -540,7 +542,7 @@ lighthalzen,191,320,4	script	Kafra Employee::kaf_lighthalzen2	861,{
 	callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
 }
 
-lhz_in02,237,284,4	script	Kafra Employee::kaf_lhz_in02	861,{
+lhz_in02,237,284,4	script	Kafra Employee::kaf_lhz_in02	4_F_KAFRA9,{
 	cutin "kafra_09",2;
 	mes "[Kafra Employee]";
 	mes "Welcome~!";
@@ -554,7 +556,7 @@ lhz_in02,237,284,4	script	Kafra Employee::kaf_lhz_in02	861,{
 
 // Louyang
 //============================================================
-louyang,210,104,5	script	Kafra Employee::kaf_louyang	117,{
+louyang,210,104,5	script	Kafra Employee::kaf_louyang	4_F_KAFRA1,{
 	cutin "kafra_01",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -569,7 +571,7 @@ louyang,210,104,5	script	Kafra Employee::kaf_louyang	117,{
 
 // Umbala
 //============================================================
-umbala,87,160,4	script	Kafra Employee::kaf_umbala	721,{
+umbala,87,160,4	script	Kafra Employee::kaf_umbala	4_F_KAFRA7,{
 	cutin "kafra_07",2;
 	callfunc "F_KafSet";
 	mes "[Kafra Employee]";
@@ -585,7 +587,7 @@ umbala,87,160,4	script	Kafra Employee::kaf_umbala	721,{
 
 // Niflheim
 //============================================================
-niflheim,202,180,3	script	Kafra Employee::kaf_niflheim	791,{
+niflheim,202,180,3	script	Kafra Employee::kaf_niflheim	4_F_NFDEADKAFRA,{
 	callfunc "F_Kafra",1,2,1,150,0;
 	savepoint "niflheim",192,182;
 	callfunc "F_KafEnd",1,1,"in the city of Niflheim";
@@ -594,9 +596,13 @@ niflheim,202,180,3	script	Kafra Employee::kaf_niflheim	791,{
 // Dungeons and Fields
 //============================================================
 // - Byalan Island
-izlu2dun,106,58,8	script	Kafra Employee::kaf_izlu2dun	115,{
+izlu2dun,106,58,8	script	Kafra Employee::kaf_izlu2dun	4_F_KAFRA3,{
 	cutin "kafra_03",2;
-	if(BaseJob==Job_Novice && job_merchant_q2>0) callfunc "F_MercKafra";  //F_MercKafra found in merchant.txt
+	if (!checkre(0) && BaseJob == Job_Novice && job_merchant_q2 > 0) {
+		// Merchant Job Change Quest
+		// function F_MercKafra is found in /pre-re/jobs/1-1/merchant.txt
+		callfunc "F_MercKafra";
+	}
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
 	mes "Kafra Corporation.";
@@ -609,7 +615,7 @@ izlu2dun,106,58,8	script	Kafra Employee::kaf_izlu2dun	115,{
 }
 
 // - Culvert Sewers
-prt_fild05,290,224,3	script	Kafra Employee::prt_fild05	114,{
+prt_fild05,290,224,3	script	Kafra Employee::prt_fild05	4_F_KAFRA4,{
 	cutin "kafra_04",2;
 	mes "[Kafra Employee]";
 	mes "Welcome!";
@@ -619,14 +625,12 @@ prt_fild05,290,224,3	script	Kafra Employee::prt_fild05	114,{
 	mes "with its excellent service. So";
 	mes "what can I do for you today?";
 	callfunc "F_Kafra",5,1,1,40,0;
-
-	M_Save:
-		savepoint "prt_fild05",274,243;
-		callfunc "F_KafEnd",0,1, "at the Prontera Culverts";
+	savepoint "prt_fild05",274,243;
+	callfunc "F_KafEnd",0,1, "at the Prontera Culverts";
 }
 
 // - Coal Mine (Dead Pitt)
-mjolnir_02,83,362,4	script	Kafra Employee::kaf_mjolnir_02	116,{
+mjolnir_02,83,362,4	script	Kafra Employee::kaf_mjolnir_02	4_F_KAFRA2,{
 	cutin "kafra_02",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -640,7 +644,7 @@ mjolnir_02,83,362,4	script	Kafra Employee::kaf_mjolnir_02	116,{
 }
 
 // - Morroc Ruins
-moc_ruins,59,157,5	script	Kafra Employee::moc_ruins	114,{
+moc_ruins,59,157,5	script	Kafra Employee::moc_ruins	4_F_KAFRA4,{
 	cutin "kafra_04",2;
 	mes "[Kafra Employee]";
 	mes "Welcome!";
@@ -655,7 +659,7 @@ moc_ruins,59,157,5	script	Kafra Employee::moc_ruins	114,{
 }
 
 // - Orc Dungeon
-gef_fild10,73,340,5	script	Kafra Employee::kaf_gef_fild10	116,{
+gef_fild10,73,340,5	script	Kafra Employee::kaf_gef_fild10	4_F_KAFRA2,{
 	cutin "kafra_02",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -669,7 +673,7 @@ gef_fild10,73,340,5	script	Kafra Employee::kaf_gef_fild10	116,{
 }
 
 // - Treasure Island
-alb2trea,59,69,5	script	Kafra Employee::kaf_alb2trea	117,{
+alb2trea,59,69,5	script	Kafra Employee::kaf_alb2trea	4_F_KAFRA1,{
 	cutin "kafra_01",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
diff --git a/npc/mapflag/battleground.txt b/npc/mapflag/battleground.txt
index 736ce6215..b8d361229 100644
--- a/npc/mapflag/battleground.txt
+++ b/npc/mapflag/battleground.txt
@@ -4,10 +4,10 @@
 //= Epoque
 //===== Current Version: =====================================
 //= 1.0a
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Defines a Battleground map.
 //= Additional parameter '2' shows scoreboard.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/gvg.txt b/npc/mapflag/gvg.txt
index 0cd7a3219..7c8e1a720 100644
--- a/npc/mapflag/gvg.txt
+++ b/npc/mapflag/gvg.txt
@@ -4,12 +4,12 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.2
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Players can attack other guilds, and will have their guild
 //= icons shown. WoE damage reductions will also take place.
 //= gvg: Turns on GvG mode
 //= gvg_castle: Describes castle maps for WoE.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 - Added Novice Guild Castles.
 //= 1.2 - Updated with new meanings of gvg and gvg_castle.
 //============================================================
diff --git a/npc/mapflag/jail.txt b/npc/mapflag/jail.txt
index c2dd16688..e24a7c88a 100644
--- a/npc/mapflag/jail.txt
+++ b/npc/mapflag/jail.txt
@@ -4,7 +4,7 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= pvp: Turns on PvP mode
 //= pvp_noparty: Can't attack player in same party
 //= nobranch: No Dead Branching allowed.
@@ -13,7 +13,7 @@
 //= nosave: No saving respawn point allowed. Use SavePoint to use the
 //=                players previous savepoint, or choose one manually.
 //= noteleport: No Teleporting allowed.  No fly wings or butterfly wings.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/night.txt b/npc/mapflag/night.txt
index aa12815b3..3613b30db 100644
--- a/npc/mapflag/night.txt
+++ b/npc/mapflag/night.txt
@@ -4,9 +4,9 @@
 //= Skotlex
 //===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Enables night mode effects.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/nightmare.txt b/npc/mapflag/nightmare.txt
index 22c08b263..663e1e12f 100644
--- a/npc/mapflag/nightmare.txt
+++ b/npc/mapflag/nightmare.txt
@@ -4,13 +4,13 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Players drop items/equipment on death.
 //= pvp_nightmaredrop	id,type,percent
 //=   id: Drop a specific item ID or "random"
 //=   type: "inventory", "equip", or "all"
 //=   percent: Rate of item drop.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/nobranch.txt b/npc/mapflag/nobranch.txt
index 5717fb166..06bc7d4de 100644
--- a/npc/mapflag/nobranch.txt
+++ b/npc/mapflag/nobranch.txt
@@ -4,11 +4,11 @@
 //= HerculesDev Team
 //===== Current Version: =====================================
 //= 1.8
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Disables the following items:
 //=   Dead Branch (604), Bloody Branch (12103),
 //=   Red Pouch (12024), Poring Box (12109)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.3 - Updated. [massdriller]
 //= 1.6a - Updated. [Lupus]
 //= 1.7 - Added all novice maps. [L0ne_W0lf]
diff --git a/npc/mapflag/noexp.txt b/npc/mapflag/noexp.txt
index 0cc4279ca..8d625bf29 100644
--- a/npc/mapflag/noexp.txt
+++ b/npc/mapflag/noexp.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.7
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Same as 'nobaseexp' and 'nojobexp' combined.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.2 [Lupus] 1.3 [massdriller] 1.4 Lupus 1.5 Lorky
 //= 1.6 - Added Lighthalzen (due to quests) [Lupus]
 //= 1.7 - Commented out entries. (Quests are official) [L0ne_W0lf]
diff --git a/npc/mapflag/noicewall.txt b/npc/mapflag/noicewall.txt
index 8711ea45d..79db648f6 100644
--- a/npc/mapflag/noicewall.txt
+++ b/npc/mapflag/noicewall.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.8
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Blocks usage of WZ_ICEWALL.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.6a - Re-enabled icewalls for cities [Lupus]
 //= 1.7 - Officially icewall is allowed on interiors. [L0ne_w0lf]
 //= 1.8 - Fixed arug_cas map names.
diff --git a/npc/mapflag/noloot.txt b/npc/mapflag/noloot.txt
index 43089ed31..546f6d4c9 100644
--- a/npc/mapflag/noloot.txt
+++ b/npc/mapflag/noloot.txt
@@ -4,9 +4,9 @@
 //= Epoque
 //===== Current Version: =====================================
 //= 1.0a
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Same as 'nomobloot' and 'nomvploot' combined.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/nomemo.txt b/npc/mapflag/nomemo.txt
index 158982e2c..de0059321 100644
--- a/npc/mapflag/nomemo.txt
+++ b/npc/mapflag/nomemo.txt
@@ -4,10 +4,10 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.8b
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Prevents players from using /memo on a map.
 //= Also disables marriage warp skills.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.6a - Added up to Hugel maps. [Lupus]
 //= 1.6b - Added job_knt map. [Samuray22]
 //= 1.7 - Added all novice maps. [L0ne_W0lf]
diff --git a/npc/mapflag/nopenalty.txt b/npc/mapflag/nopenalty.txt
index b29d4d4a7..f193eadf1 100644
--- a/npc/mapflag/nopenalty.txt
+++ b/npc/mapflag/nopenalty.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.4
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Same as 'noexppenalty' and 'nozenypenalty' combined.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.2 - Updated. [Lupus]
 //= 1.3 - Added all novice maps. [L0ne_W0lf]
 //= 1.4 - Removed Nightmare PVP maps. [L0ne_W0lf]
diff --git a/npc/mapflag/nopvp.txt b/npc/mapflag/nopvp.txt
index 4eb4831b8..61597bd35 100644
--- a/npc/mapflag/nopvp.txt
+++ b/npc/mapflag/nopvp.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.1a
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Prevents PvP mode on a map.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/noreturn.txt b/npc/mapflag/noreturn.txt
index d5b94f458..fcded30ce 100644
--- a/npc/mapflag/noreturn.txt
+++ b/npc/mapflag/noreturn.txt
@@ -4,13 +4,13 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Disables the following items:
 //=   Butterfly Wing (602), Siege Teleport Scroll (14591),
 //=   Yellow/Green/Red/Blue Butterfly Wings (14582-14585),
 //=   Dungeon Teleport Scrolls (14527/14581)
 //= Also restricts "warpparty" and "warpguild" script commands.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.3 - According to the patch, enabled Butterfly wings in the Castles. [Lupus]
 //= 1.4 - Enabled Butterfly wings on PvP maps. [Skotlex]
 //= 1.4a - Added job_knt. [Samuray22]
diff --git a/npc/mapflag/nosave.txt b/npc/mapflag/nosave.txt
index 1035d2a77..4d83c5231 100644
--- a/npc/mapflag/nosave.txt
+++ b/npc/mapflag/nosave.txt
@@ -4,10 +4,10 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.7
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Characters logging out on the specified map will be warped
 //= to the map specified in the last field, or "SavePoint".
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.7 - Updated. [Lupus]
 //============================================================
 
diff --git a/npc/mapflag/noskill.txt b/npc/mapflag/noskill.txt
index ec66f27d3..6f3f401ea 100644
--- a/npc/mapflag/noskill.txt
+++ b/npc/mapflag/noskill.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Disables all skills on the map.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 - Added additional maps. [L0ne_W0lf]
 //============================================================
 
diff --git a/npc/mapflag/noteleport.txt b/npc/mapflag/noteleport.txt
index d969c5522..96e497e05 100644
--- a/npc/mapflag/noteleport.txt
+++ b/npc/mapflag/noteleport.txt
@@ -4,7 +4,7 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.6a
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Disables all means of teleportation within a map.
 //= Script commands 'warp', 'areawarp', 'warpchar',
 //=   'warpparty', 'warpguild', 'warpwaitingpc' will not
@@ -12,7 +12,7 @@
 //= Disables skills AL_TELEPORT and TK_HIGHJUMP.
 //= Disables the following items:
 //=   Fly Wing (601), Giant Fly Wing (12212)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.6a - Updated. [Lupus]
 //============================================================
 
diff --git a/npc/mapflag/notomb.txt b/npc/mapflag/notomb.txt
new file mode 100644
index 000000000..f7daaef7c
--- /dev/null
+++ b/npc/mapflag/notomb.txt
@@ -0,0 +1,17 @@
+//===== Hercules Script ======================================
+//= Mapflag: Disable MVP Tomb.
+//===== By: ==================================================
+//= Hercules Dev Team
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Disables MVP tomb on some maps.
+//===== Additional Comments: =================================
+//= 1.0 - Added Bossnia maps. [CairoLee]
+//============================================================
+
+// Bossnia =====
+bossnia_01	mapflag	notomb
+bossnia_02	mapflag	notomb
+bossnia_03	mapflag	notomb
+bossnia_04	mapflag	notomb
diff --git a/npc/mapflag/novending.txt b/npc/mapflag/novending.txt
index 4205d9d6a..b91dab340 100644
--- a/npc/mapflag/novending.txt
+++ b/npc/mapflag/novending.txt
@@ -4,9 +4,9 @@
 //= Epoque
 //===== Current Version: =====================================
 //= 1.0a
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Disables skill MC_VENDING on a map.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/nowarp.txt b/npc/mapflag/nowarp.txt
index 304cebf2f..5d02a3aca 100644
--- a/npc/mapflag/nowarp.txt
+++ b/npc/mapflag/nowarp.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Disables use of @go to a map.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.3 - Added WoE SE maps.
 //============================================================
 
diff --git a/npc/mapflag/nowarpto.txt b/npc/mapflag/nowarpto.txt
index f54dc785f..ef51a290d 100644
--- a/npc/mapflag/nowarpto.txt
+++ b/npc/mapflag/nowarpto.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Disables use of @warp to a map.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/partylock.txt b/npc/mapflag/partylock.txt
index ba0014026..0c6cdfe92 100644
--- a/npc/mapflag/partylock.txt
+++ b/npc/mapflag/partylock.txt
@@ -4,10 +4,10 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Blocks all party modifications on a map:
 //=   /organize, /leave, /invite, @changeleader
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/pvp.txt b/npc/mapflag/pvp.txt
index d72e45a98..959416a99 100644
--- a/npc/mapflag/pvp.txt
+++ b/npc/mapflag/pvp.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Enables PvP on a map.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/pvp_noguild.txt b/npc/mapflag/pvp_noguild.txt
index fe61a3097..bb27c463b 100644
--- a/npc/mapflag/pvp_noguild.txt
+++ b/npc/mapflag/pvp_noguild.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Ignores guild alliances on GvG-enabled maps.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/pvp_noparty.txt b/npc/mapflag/pvp_noparty.txt
index 569a46c2d..2f17e39f1 100644
--- a/npc/mapflag/pvp_noparty.txt
+++ b/npc/mapflag/pvp_noparty.txt
@@ -4,9 +4,9 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.2
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Ignores party alliances on PvP-enabled maps.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/reset.txt b/npc/mapflag/reset.txt
index 7af002f22..38ef8569c 100644
--- a/npc/mapflag/reset.txt
+++ b/npc/mapflag/reset.txt
@@ -4,9 +4,9 @@
 //= Daegaladh
 //===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Maps where Neuralizer (12213) can be used.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
diff --git a/npc/mapflag/skillduration.txt b/npc/mapflag/skillduration.txt
index ca2f82a40..2140896a4 100644
--- a/npc/mapflag/skillduration.txt
+++ b/npc/mapflag/skillduration.txt
@@ -15,8 +15,8 @@
 //= prontera	mapflag	adjust_unit_duration	WZ_QUAGMIRE	250
 //= Increases duration of Quagmire by 2.5 times in Prontera.
 //===== Disclaimer: ==========================================
-//= Be aware that some skill units have their visual effect 
+//= Be aware that some skill units have their visual effect
 //= durations not controlled by the server (e.g. Storm Gust).
 //===== Additional Comments: =================================
 //= 1.0 - Initial script.
-//============================================================
\ No newline at end of file
+//============================================================
diff --git a/npc/mapflag/skillmodifier.txt b/npc/mapflag/skillmodifier.txt
index bd60806f7..0006066bb 100644
--- a/npc/mapflag/skillmodifier.txt
+++ b/npc/mapflag/skillmodifier.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= This mapflag allows you to modify the damage of any skill 
+//= This mapflag allows you to modify the damage of any skill
 //= in any map.
 //= Example (1):
 //= prontera	mapflag	adjust_skill_damage	MG_FIREBOLT	50
@@ -16,4 +16,4 @@
 //= Doubles the damage of Firebolt in Prontera.
 //===== Additional Comments: =================================
 //= 1.0 - Initial script.
-//============================================================
\ No newline at end of file
+//============================================================
diff --git a/npc/mapflag/town.txt b/npc/mapflag/town.txt
index 46331818b..54646c95d 100644
--- a/npc/mapflag/town.txt
+++ b/npc/mapflag/town.txt
@@ -4,9 +4,9 @@
 //= Epoque
 //===== Current Version: =====================================
 //= 1.0a
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Designates a map as a town, granting mailbox access.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 - Initial script.
 //============================================================
 
@@ -37,4 +37,4 @@ mora	mapflag	town
 dewata	mapflag	town
 malangdo	mapflag	town
 malaya	mapflag	town
-eclage	mapflag	town
\ No newline at end of file
+eclage	mapflag	town
diff --git a/npc/mapflag/zone.txt b/npc/mapflag/zone.txt
index 62047effa..1904e034a 100644
--- a/npc/mapflag/zone.txt
+++ b/npc/mapflag/zone.txt
@@ -4,9 +4,9 @@
 //= Ind/Hercules
 //===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Flags maps as part of zones defined in map_zone_db.txt
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //============================================================
 
 //Aldebaran Turbo Track
@@ -107,4 +107,4 @@ splendide	mapflag	zone	Towns
 umbala	mapflag	zone	Towns
 veins	mapflag	zone	Towns
 xmas	mapflag	zone	Towns
-yuno	mapflag	zone	Towns
\ No newline at end of file
+yuno	mapflag	zone	Towns
diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt
index eca847c6f..853e82f5e 100644
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -3,11 +3,9 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4a
-//===== Compatible With: =====================================
-//= Hercules Git
+//= 1.5
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Refiner that uses Enriched ores to increase upgrade success.
 //= After a conversation with Doddler, it's been established that
 //= the advanced refiner works similar the the "Bubble Gum" item.
@@ -23,9 +21,11 @@
 //= 1.3 Typo fixes [Yommy]
 //= 1.4 Removed unnecessary dialogs [Zephyrus]
 //= 1.4a Added 'disable_items' command. [Euphy]
+//= 1.4b Fixed coordinates. [Euphy]
+//= 1.5 Some official script updates. [Euphy]
 //============================================================
 
-payon,174,138,0	script	Suhnbi#cash	85,{
+payon,157,146,6	script	Suhnbi#cash	4_M_03,{
 	disable_items;
 	mes "[Suhnbi]";
 	mes "I am the Armsmith";
@@ -33,43 +33,39 @@ payon,174,138,0	script	Suhnbi#cash	85,{
 	mes "armor and equipment, so let me";
 	mes "know what you want to refine.";
 	next;
+
 	setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 	set .@menu$,"";
-	for( set .@i,1; .@i <= 10; set .@i,.@i+1 )
-	{
-		if( getequipisequiped(.@i) )
+	for(set .@i,1; .@i<=10; set .@i,.@i+1) {
+		if (getequipisequiped(.@i)) {
 			set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
-
+			set .@equipped,1;
+		}
 		set .@menu$, .@menu$ + ":";
 	}
-	set .@part,select(.@menu$);
-
-	if( !getequipisequiped(.@part) )
-		close;
-
-	if( !getequipisenableref(.@part) )
-	{
+	if (.@equipped == 0) {
 		mes "[Suhnbi]";
-		mes "I don't think I can refine this item at all.";
+		mes "I don't think I can refine any items you have...";
 		close;
 	}
-	if( !getequipisidentify(.@part) )
-	{
+	set .@part, select(.@menu$);
+
+	if (!getequipisequiped(.@part)) //custom check
+		close;
+	if (!getequipisenableref(.@part)) {
 		mes "[Suhnbi]";
-		mes "This has not been identified. So, it can't be refined...";
+		mes "Go find another Blacksmith. You can't refine this thing.";
 		close;
 	}
-	if( getequiprefinerycnt(.@part) >= 10 )
-	{
+	if (getequiprefinerycnt(.@part) >= 10) {
 		mes "[Suhnbi]";
-		mes "This item cannot be refined because it has already reached its maximum level...";
+		mes "Hmm... someone perfected this already. I don't think I can work on it further.";
 		close;
 	}
 
 	// Make sure you have the neccessary items and Zeny to refine your items
 	// Determines chance of failure and verifies that you want to continue.
-	switch( getequipweaponlv(.@part) )
-	{
+	switch(getequipweaponlv(.@part)) {
 		case 1: callsub S_RefineValidate,1,7620,50,.@part; break;
 		case 2: callsub S_RefineValidate,2,7620,200,.@part; break;
 		case 3: callsub S_RefineValidate,3,7620,5000,.@part; break;
@@ -77,85 +73,89 @@ payon,174,138,0	script	Suhnbi#cash	85,{
 		default: callsub S_RefineValidate,0,7619,2000,.@part; break;
 	}
 
-	if( getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100) )
-	{
-		mes "[Suhnbi]";
-		mes "Clink! Clank! Clunk!";
-		SuccessRefItem .@part;
+	mes "[Suhnbi]";
+	mes "Clang! Clang! Clang!";
+	if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+		successrefitem .@part;
 		next;
-		Emotion e_no1;
+		emotion e_no1;
 		mes "[Suhnbi]";
-		mes "Here you are! It's done.";
-		mes "It's been a while since I've made such a fine weapon. You must be happy because it has become stronger!";
+		mes "There you go! It's done.";
+		mes "It's been a while since I've made such a fine "+((getequipweaponlv(.@part))?"weapon":"armor")+". You must be happy because it has become stronger!";
 		close;
 	}
-	mes "[Suhnbi]";
-	mes "Clink! Clank! Clunk!";
-	FailedRefItem .@part;
+	failedrefitem .@part;
 	next;
-	if (rand(5) == 1){
-		Emotion e_cash;
-	} else {
-		Emotion e_omg;
-	}
+	emotion (!rand(5))?e_cash:e_omg;
 	mes "[Suhnbi]";
-	mes "Cough!!!!";
+	mes "Uuuuuuuuuummmmmph!!!";
 	next;
 	mes "[Suhnbi]";
-	mes "Cough...Cough..";
-	mes "What a shame...";
-	mes "Your equipment broke during the refining process. I had told you earlier this might happen!";
+	mes "...";
+	mes ".....";
+	mes ".......Huhuhuhuhu~";
+	mes "........It was your choice and my ability, no regret.";
 	close;
 
 S_RefineValidate:
 	mes "[Suhnbi]";
 	if (getarg(0))
-		mes "A level " + getarg(0) + " weapon...";
-	mes "To refine this I need one ^ff9999" + getitemname(getarg(1)) + "^000000 and a service fee of " + getarg(2) + " Zeny.";
-	mes "Do you wish to continue?";
+		mes "You want to refine a level " + getarg(0) + " weapon?";
+	mes "To refine that, you'll need to have one ^ff9999" + getitemname(getarg(1)) + "^000000 and " + getarg(2) + " zeny.";
+	mes "Would you like to continue?";
 	next;
-	if( select("Yes:No") == 1 )
-	{
-		if( getequippercentrefinery(getarg(3)) < 100 )
-		{
-			mes "[Suhnbi]";
-			mes "Wow!!";
-			mes "This weapon, probably";
-			mes "looks like it's been refined...";
-			mes "many times...";
-			mes "It may break if";
-			mes "you refine it again.";
-			next;
-			mes "And if it breaks,";
-			mes "you can't use it anymore!";
-			mes "All the cards in it and the";
-			mes "properties";
-			mes "^ff0000will be lost^000000!!";
-			mes "^ff0000 besides, the equipment will break!^000000";
-			mes " ";
-			mes "Are you sure you still want to continue?";
-			next;
-			if( select("Yes:No") == 2 )
-			{
+	if(select("Yes:No") == 1) {
+		if (getequippercentrefinery(getarg(3)) < 100) {
+			if (getarg(0)) {
+				mes "[Suhnbi]";
+				mes "Wow!!";
+				mes "This weapon probably";
+				mes "looks like it's been refined...";
+				mes "many times...";
+				mes "It may break if";
+				mes "you refine it again.";
+				next;
+				mes "And if it breaks,";
+				mes "you can't use it anymore!";
+				mes "All the cards in it and the properties ^ff0000will be lost^000000!";
+				mes "^ff0000Besides, the equipment will break!^000000";
+				mes "Are you sure you still want to continue?";
+				next;
+				if(select("Yes:No") == 2) {
+					mes "[Suhnbi]";
+					mes "Good.";
+					mes "Because if the weapon breaks from unreasonable refining, then I get a bad mood, too.";
+					close;
+				}
+			} else {
 				mes "[Suhnbi]";
-				mes "I completely agree...";
-				mes "I might be a great refiner, but sometimes even I make mistakes.";
-				close;
+				mes "Giggle. Giggle. Oh, you have guts, daring to refine this.";
+				mes "You know it's pretty risky, don't you?";
+				next;
+				mes "If your defensive equipment is broken, you'll never be able to use it again.";
+				mes "Even your cards and your modifications will ^ff0000completely disappear^000000.";
+				//mes "Everything will disappear. As in... GONE!";
+				mes "Do you really wish to continue?";
+				next;
+				if(select("Yes:No") == 2) {
+					mes "[Suhnbi]";
+					mes "What nonsense. You waste my precious time.";
+					mes "Get lost, punk.";
+					close;
+				}
 			}
 		}
-		if( countitem(getarg(1)) > 0 && Zeny > getarg(2) )
-		{
-			delitem getarg(1), 1;
-			set Zeny, Zeny - getarg(2);
+		if (countitem(getarg(1)) > 0 && Zeny > getarg(2)) {
+			delitem getarg(1),1;
+			Zeny -= getarg(2);
 			return;
 		}
 		mes "[Suhnbi]";
-		mes "You don't seem to have enough Zeny or " + getitemname(getarg(1)) + "...";
-		mes "Go get some more. I'll be here all day if you need me.";
+		mes "Are these all you have?";
+		mes "I'm very sorry, but I can't do anything without all the materials. Besides, I deserve some payments for my work, don't I?";
 		close;
 	}
 	mes "[Suhnbi]";
-	mes "Yeah... There's no need to rush.";
-	mes "Take your time.";
+	mes "I can't help it even if you're not happy about it...";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index d48ee68bb..dfb9a68b4 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -1,133 +1,24 @@
 //===== Hercules Script ======================================
 //= Alchemist Shop
-//===== By: ================================================== 
-//= rAthena Team
-//===== Current Version: ===================================== 
-//= 1.7
-//===== Description: ========================================= 
-//= Selling Alchemist Materials and Manuals
-//===== Additional Comments: ================================= 
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.8
+//===== Description: =========================================
+//= Merchants for Alchemist Materials and Manuals.
+//===== Additional Comments: =================================
 //= 1.1 fixed Medicine Bowl issue, thanx 2 MasterOfMuppets
 //= 1.2 Reddozen's fixes of typos. added optional Elemental
-//= Potion Guide. [Lupus]
+//=     Potion Guide. [Lupus]
 //= 1.3 Deleted Elemental Potions Guide due to original quest [Lupus]
 //= 1.4 Alchemists can now purchase 2000 Medicine Bowls at once. [SinSloth]
 //= 1.5 Updated to Aegis 10.3 Standards. [L0ne_W0lf]
 //= 1.6 Corrected canceling purchase. [L0ne_W0lf]
 //= 1.7 Updated to match AEGIS script. [Masao]
-//============================================================ 
+//= 1.8 Moved Craft Book Merchant to Renewal path. [Euphy]
+//============================================================
 
-alde_alche,31,186,3	script	Craft Book Salesman#alde	883,{
-
-	mes "[Craft Book Salesman]";
-	mes "Welcome.";
-	mes "I'm here to sell";
-	mes "^0000FFspecial craft books^000000 for Geneticists.";
-	next;
-	mes "[Craft Book Salesman]";
-	mes "Geneticists have some skills";
-	mes "that require craft books to activate.";
-	next;
-	mes "[Craft Book Salesman]";
-	mes "The more craft books you have,";
-	mes "the more skills you can use.";
-	next;
-	mes "[Craft Book Salesman]";
-	mes "Please understand that";
-	mes "I specialize in the sale of these special books and";
-	mes "I ^FF0000don't sell other items^000000.";
-	next;
-	mes "[Craft Book Salesman]";
-	mes "Okay then, here's the list of available craft books.";
-	next;
-	switch(select("[Apple Bomb Craft Book] 100,000 zeny:[Pineapple Bomb Craft Book] 100,000 zeny:[Coconut Bomb Craft Book] 100,000 zeny:[Melon Bomb Craft Book] 100,000 zeny:[Banana Bomb Craft Book] 100,000 zeny:[Plant Gene Cultivation Method] 100,000 zeny:[Superior Potion Craft Manual] 100,000 zeny:[Mix Cooking Book] 100,000 zeny:[Health Improvement Research Book] 100,000 zeny:[Vigor Drink Recipe] 100,000 zeny:Close")){
-	case 1:
-		callsub S_SellManual,6279,100000;
-		break;
-	case 2:
-		callsub S_SellManual,6280,100000;
-		break;
-	case 3:
-		callsub S_SellManual,6281,100000;
-		break;
-	case 4:
-		callsub S_SellManual,6282,100000;
-		break;
-	case 5:
-		callsub S_SellManual,6283,100000;
-		break;
-	case 6:
-		callsub S_SellManual,6284,100000;
-		break;
-	case 7:
-		callsub S_SellManual,6285,100000;
-		break;
-	case 8:
-		callsub S_SellManual,11022,100000;
-		break;
-	case 9:
-		callsub S_SellManual,11023,100000;
-		break;
-	case 10:
-		callsub S_SellManual,11024,100000;
-		break;
-	case 11:
-		mes "[Craft Book Salesman]";
-		mes "Thank you for your patronage.";
-		mes "Please come again.";
-		close;
-	}
-
-S_SellManual:
-	mes "[Craft Book Salesman]";
-	mes ""+getitemname(getarg(0))+"?";
-	mes "That'll be "+getarg(1)+" zeny ea.";
-	mes "How many of these books would you like to purchase?";
-	next;
-	input .@amount;
-	if (.@amount == 0) {
-		mes "[Craft Book Salesman]";
-		mes "Would you like to see some different books?";
-		close;
-	}
-	if (.@amount < 1 || .@amount > 99 ){
-		mes "[Craft Book Salesman]";
-		mes "You cannot purchase more than 100 at a time.";
-		close;
-	}
-	mes "[Craft Book Salesman]";
-	mes "You've entered "+.@amount+"x "+getitemname(getarg(0))+".";
-	mes "That'll be "+getarg(1) * .@amount+" Zeny.";
-	mes "Would you like to continue?";
-	next;
-	if (select("Yes:No") == 1) {
-		if (Zeny < getarg(1) * .@amount) {
-			mes "[Craft Book Salesman]";
-			mes "You don't";
-			mes "have enough zeny.";
-			mes "Check how much zeny";
-			mes "you have first.";
-			close;
-		}
-		if (checkweight(getarg(0),.@amount) == 0){
-			mes "[Craft Book Salesman]";
-			mes "It doesn't seem like you can carry everything.";
-			mes "Please check the space in your inventory.";
-			close;
-		}
-		mes "[Craft Book Salesman]";
-		mes "Thank you for your patronage.";
-		set Zeny,Zeny - getarg(1) * .@amount;
-		getitem getarg(0),.@amount;
-		close;
-	}
-	mes "[Craft Book Salesman]";
-	mes "Please take your time";
-	mes "before you make your decision.";
-	close;
-}
-
-alde_alche,24,188,3	script	Guild Dealer	740,{
+alde_alche,24,188,3	script	Guild Dealer	2_M_ALCHE,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you are carrying -";
@@ -187,7 +78,7 @@ alde_alche,24,188,3	script	Guild Dealer	740,{
 				mes "in your inventory.";
 				close;
 			}
-			set zeny,zeny-.@sell;
+			Zeny -= .@sell;
 			getitem 7134,.@input; //Medicine_Bowl
 			mes "[Gever Al Sharp]";
 			mes "Thank you.";
@@ -260,7 +151,7 @@ S_SellManual:
 	mes "That'll be "+getarg(1)+" zeny.";
 	next;
 	if (select("Purchase.:Quit.") == 1) {
-		set zeny,zeny-getarg(1);
+		Zeny -= getarg(1);
 		getitem getarg(0),1;
 		mes "[Gever Al Sharp]";
 		mes "Thank you for";
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index f4df03a0a..5039bbbf0 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -1,5 +1,5 @@
 //===== Hercules Script ======================================
-//= Magazine Dealer Kenny
+//= Magazine Dealers
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
@@ -16,10 +16,9 @@
 //= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy]
 //============================================================
 
-alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
-	set .n$, compare(strnpcinfo(1),"Tonny")?"[Tonny]":"[Kenny]";
-	if(BaseJob == Job_Gunslinger) {
-		mes .n$;
+alberta,118,157,3	script	Magazine Dealer Kenny::mdk	4_M_01,{
+	if (BaseJob == Job_Gunslinger) {
+		mes "[Kenny]";
 		mes "Welcome to my Magazine Shop.";
 		mes "As you may know, large numbers";
 		mes "of bullets can be carried more";
@@ -36,7 +35,7 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 		case 7: callfunc "Func_Casing",13202,12150; break;
 		case 8: callfunc "Func_Casing",13201,12151; break;
 		case 9:
-			mes .n$;
+			mes "[Kenny]";
 			mes "Well, if you ever find";
 			mes "that you have too many";
 			mes "bullets, come and see me.";
@@ -45,7 +44,7 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 			close;
 		}
 	}
-	mes .n$;
+	mes "[Kenny]";
 	mes "Welcome to my shop.";
 	mes "Here, I provide Magazines";
 	mes "and Cartridges for Gunslingers.";
@@ -53,7 +52,7 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 	mes "my services would be of any";
 	mes "use to you, adventurer.";
 	next;
-	mes .n$;
+	mes "[Kenny]";
 	mes "Eh, but if you happen to";
 	mes "know any Gunslingers, send";
 	mes "them my way. You can never";
@@ -62,18 +61,18 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 }
 
 function	script	Func_Casing	{
-	mes .n$;
+	mes "[Kenny]";
 	mes "Now, you can trade";
 	mes "500 "+getitemname(getarg(0))+"s";
 	mes "and 500 zeny for 1 "+getitemname(getarg(1))+", so make sure";
 	mes "you have sufficient bullets";
 	mes "and zeny for this exchange.";
 	next;
-	mes .n$;
+	mes "[Kenny]";
 	mes "You can exchange 500 "+getitemname(getarg(0))+"s and 500 zeny";
 	mes "with 1 "+getitemname(getarg(1))+".";
 	next;
-	mes .n$;
+	mes "[Kenny]";
 	mes "Remember that I can't give";
 	mes "you more than 50 Magazines";
 	mes "at a time. Now please enter";
@@ -81,8 +80,8 @@ function	script	Func_Casing	{
 	mes "want to receive. If you want to cancel, then just enter ''0.''";
 	next;
 	input .@amount;
-	if(.@amount > 50 || .@amount == 0) {
-		mes .n$;
+	if (.@amount > 50 || .@amount == 0) {
+		mes "[Kenny]";
 		mes "Hey, I can't give you";
 		mes "that many Magazines.";
 		mes "Please try again, and";
@@ -93,7 +92,7 @@ function	script	Func_Casing	{
 	if (countitem(getarg(0)) >= (500*.@amount)) {
 		if (Zeny >= (500*.@amount)) {
 			if (checkweight(getarg(1),.@amount) == 0) {
-				mes .n$;
+				mes "[Kenny]";
 				mes "Hey, you've got a lot";
 				mes "of junk crammed in your";
 				mes "Inventory. Free up some";
@@ -102,19 +101,19 @@ function	script	Func_Casing	{
 				mes "some Magazines later, okay?";
 				close;
 			}else{
-				mes .n$;
+				mes "[Kenny]";
 				mes "Alright, here are";
 				mes "your Magazines. Thanks";
 				mes "for visiting my shop, and";
 				mes "I hope that you use all";
 				mes "of your ammo wisely.";
-				set Zeny,Zeny-500*.@amount;
+				Zeny -= 500*.@amount;
 				delitem getarg(0),500*.@amount;
 				getitem getarg(1),.@amount;
 				close;
 			}
-		}else{
-			mes .n$;
+		} else {
+			mes "[Kenny]";
 			mes "Sorry, but you don't";
 			mes "have enough zeny for";
 			mes "this Magazine exchange.";
@@ -123,8 +122,8 @@ function	script	Func_Casing	{
 			mes "some more money.";
 			close;
 		}
-	}else{
-		mes .n$;
+	} else {
+		mes "[Kenny]";
 		mes "Sorry, but you don't";
 		mes "have enough bullets for";
 		mes "this Magazine exchange.";
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index b9d515ad4..382916b10 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -1,5 +1,5 @@
-//===== Hercules Script =======================================
-//= Bullet Dealer Tony
+//===== Hercules Script ======================================
+//= Bullet Dealers
 //===== By ===================================================
 //= Playtester, Paradox924X
 //===== Version ==============================================
@@ -17,7 +17,7 @@
 //= 1.6 Moved Izlude duplicate to pre-re/re paths. [Euphy]
 //============================================================
 
-alberta,118,160,3	script	Bullet Dealer Tony#alb::bdt	86,{
+alberta,118,160,3	script	Bullet Dealer Tony#alb::bdt	4_M_04,{
 	if (BaseJob == Job_Gunslinger) {
 		mes "[Tony]";
 		mes "I'm Tony, the Bullet Dealer.";
@@ -97,7 +97,7 @@ function	script	Bullet_Trade	{
 			mes "available. Try putting some of";
 			mes "your things into Kafra Storage.";
 			close;
-		}else{
+		} else {
 			mes "[Tony]";
 			mes "Great, everything seems";
 			mes "to be in order. Let me take";
@@ -110,7 +110,7 @@ function	script	Bullet_Trade	{
 			getitem getarg(2),.@amount * 30;
 			close;
 		}
-	}else{
+	} else {
 		mes "[Tony]";
 		mes "Huh. It looks like you";
 		mes "don't have enough materials";
diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt
index 4532921bd..05b3f4cc7 100644
--- a/npc/merchants/buying_shops.txt
+++ b/npc/merchants/buying_shops.txt
@@ -1,19 +1,20 @@
 //===== Hercules Script ======================================
 //= Buying Shop Scripts
 //===== By: ==================================================
-//= Kisuka, skyiing, Scriptor
+//= Kisuka
 //===== Current Version: =====================================
-//= 1.1
+//= 1.1a
 //===== Description: =========================================
-//= Buying Shop licenses and catalogs.
+//= Buying Shop licenses.
 //===== Additional Comments: =================================
 //= 1.0 First version. [Kisuka]
 //= 1.1 Added Catalog Magician. [Euphy]
-//============================================================ 
+//= 1.1a Moved Catalog Magician to Renewal path. [Euphy]
+//============================================================
 
 // Black Marketeer (Buy Licenses - Non-Merchant Classes)
-//============================================================ 
-que_job01,68,84,1	script	Black Marketeer#Buying	881,{
+//============================================================
+que_job01,68,84,1	script	Black Marketeer#Buying	4_M_SITDOWN,{
 	if (getskilllv("ALL_BUYING_STORE") == 1) {
 		mes "[Mr. Jass]";
 		mes "Hey, you already made a contract with Hugh.";
@@ -61,7 +62,7 @@ que_job01,68,84,1	script	Black Marketeer#Buying	881,{
 					mes "Mr. Hugh, I'll take over your license business. You'll see!";
 					mes "*Giggle Giggle*";
 					getitem 12548,.@input; //Shabby_Purchase_Street
-					set Zeny,Zeny-(.@input*500);
+					Zeny -= (.@input*500);
 				}
 				close;
 			}
@@ -90,8 +91,8 @@ que_job01,68,84,1	script	Black Marketeer#Buying	881,{
 }
 
 // Purchasing Team (Learn Skill - Merchant Classes)
-//============================================================ 
-alberta_in,58,52,4	script	Purchasing Team#Buying	59,{
+//============================================================
+alberta_in,58,52,4	script	Purchasing Team#Buying	1_M_ORIENT01,{
 	mes "[Mr. Hugh]";
 	if (BaseClass == Job_Merchant && getskilllv("MC_VENDING") >= 1) {
 		if (getskilllv("ALL_BUYING_STORE") == 1) {
@@ -125,7 +126,7 @@ alberta_in,58,52,4	script	Purchasing Team#Buying	59,{
 					} else {
 						mes "Thank you for your patronage.";
 						getitem 6377,.@input; //Buy_Stall_Permit
-						set Zeny,Zeny-(.@input*200);
+						Zeny -= (.@input*200);
 					}
 					close;
 				}
@@ -209,7 +210,7 @@ alberta_in,58,52,4	script	Purchasing Team#Buying	59,{
 				mes .@name$+"....";
 				mes "I like your handwriting.";
 				mes "Okay, you're now approved to open the Bulk Buyer Shop.";
-				set Zeny,Zeny-10000;
+				Zeny -= 10000;
 				getitem 6377,5; //Buy_Stall_Permit
 				skill "ALL_BUYING_STORE",1,3;
 				next;
@@ -236,98 +237,3 @@ alberta_in,58,52,4	script	Purchasing Team#Buying	59,{
 	mes "My time is solely dedicated to our customers in the Merchant industry.";
 	close;
 }
-
-// Catalog Magician
-//============================================================ 
-moc_para01,22,16,5	script	Catalog Magician#catal01	704,{
-	if (!checkweight(1201,2)) {
-		mes "- You have too many items. Please make space. -";
-		close;
-	}
-	set .@ticket_cost, 200;
-	mes "[Catalog Magician]";
-	mes "Look... the Magic Academy";
-	mes "in Geffen is now directly";
-	mes "selling the brand new";
-	mes "^007777Universal Catalog Silver^000000!";
-	next;
-	mes "He is looking at the words";
-	mes "written on his hand.";
-	mes "Seems like he's too busy";
-	mes "to look at you.";
-	next;
-	mes "[Catalog Magician]";
-	mes "A brand new catalog";
-	mes "has just come out!";
-	mes "You can check what";
-	mes "items can be traded";
-	mes "and what items are on";
-	mes "sale from the vendor.";
-	next;
-	mes "[Catalog Magician]";
-	mes "^007777Universal Catalog Silver^000000~";
-	mes "It costs only 200z each!";
-	mes "You can buy it up to 50";
-	mes "pieces at once!";
-	next;
-	switch(select("Buy ^007777Universal Catalog Silver^000000:I don't need it!:You don't look like a vendor...")) {
-	case 1:
-		mes "[Catalog Magician]";
-		mes "You... want all 50 pieces?";
-		mes "Or how many do you need?";
-		next;
-		while (1) {
-			input .@input;
-			mes "[Catalog Magician]";
-			if (.@input == 0) {
-				mes "Trade has been stopped!";
-				mes "I don't know what to do next...";
-				mes "What should I do?";
-				emotion e_swt2,1;
-				close;
-			} else if (.@input < 1 || .@input > 50) {
-				mes "It should be less than 50 pieces.";
-				next;
-			} else break;
-		}
-		set .@sell, .@ticket_cost * .@input;
-		mes "Total number of catalog(s) that";
-		mes "you're trying to purchase is";
-		mes .@input + " pieces and it costs " + .@sell + " z.";
-		if (Zeny < .@sell) {
-			mes "It seems you don't have enough money.";
-			mes "You can sell your equips";
-			mes "to make more money... if you want.";
-			close;
-		}
-		mes "Okie, here you go.";
-		set Zeny, Zeny - .@sell;
-		getitem 12580,.@input; //Vending_Search_Scroll
-		close;
-	case 2:
-		mes "[Catalog Magician]";
-		mes "Argh... you really need this";
-		mes "item... Do you want me to";
-		mes "explain again? I don't know";
-		mes "what to do next...";
-		mes "What should I do?";
-		emotion e_swt2,1;
-		close;
-	case 3:
-		mes "[Catalog Magician]";
-		mes "My real job is a magician.";
-		mes "I was going to ask the merchant";
-		mes "guild to sell them, but they were";
-		mes "trying use them as an appendix";
-		mes "into broom sales. That's why";
-		mes "I'm selling these by myself.";
-		next;
-		mes "[Catalog Magician]";
-		mes "There are many adventurers";
-		mes "here coming and going. I'm";
-		mes "pretty sure that I can sell them";
-		mes "all soon. Don't you think so?";
-		mes "So... let's start!! Buy more of them, please! PLEASE...!";
-		close;
-	}
-}
diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt
index dfde86a4d..db0b91a66 100644
--- a/npc/merchants/cash_hair.txt
+++ b/npc/merchants/cash_hair.txt
@@ -1,16 +1,16 @@
 //===== Hercules Script ======================================
 //= Cash Hair Stylist
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Exchange cash item, New_Style_Coupon, for new hair styles.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Kisuka]
 //============================================================
 
-itemmall,19,74,5	script	Stylist#cash	91,{
+itemmall,19,74,5	script	Stylist#cash	4_F_02,{
 	mes "[Stylist]";
 	mes "Hey, I'm Kaniki.";
 	mes "I'm here to start a new";
diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt
index b61120dea..28db3e69a 100644
--- a/npc/merchants/cash_trader.txt
+++ b/npc/merchants/cash_trader.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Cash Shop NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Sell Cash shop items.
 //= Based on iRO's Cash shop. Headgears omitted.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. Sample shop per-say.
 //= 1.1 FIxed typo. (bugreport:1078) [L0ne_W0lf]
 //============================================================
@@ -22,4 +22,4 @@
 // Blessing and Increase Agility Scroll boxes, Dungeon
 // Teleport Scroll Box, Stat Food boxes, and Gym Passes.
 
-payon,171,142,4	cashshop	Kafra Shop Employee	116,12900:1000,12901:200,12902:1000,12909:100,12910:100,12911:1500,12922:150,7619:100,7620:100,12916:150,12917:150,12915:100,12918:100,12913:125,12914:125,13553:50,12903:100,12904:100,12905:100,12906:100,12907:100,12908:100,7776:50
+payon,171,142,4	cashshop	Kafra Shop Employee	4_F_KAFRA2,12900:1000,12901:200,12902:1000,12909:100,12910:100,12911:1500,12922:150,7619:100,7620:100,12916:150,12917:150,12915:100,12918:100,12913:125,12914:125,13553:50,12903:100,12904:100,12905:100,12906:100,12907:100,12908:100,7776:50
diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt
index 49003e18b..f2d739aba 100644
--- a/npc/merchants/cashheadgear_dye.txt
+++ b/npc/merchants/cashheadgear_dye.txt
@@ -6,13 +6,13 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Change headgear's color. Cost is a Mysterious Dyestuff
 //===== Additional Comments: =================================
-//= v1.0 First / Optimized Version
+//= 1.0 First / Optimized Version
 //============================================================
 
-prt_in,253,168,4	script	Alora	862,{
+prt_in,253,168,4	script	Alora	4_F_LGTGIRL,{
 
 // Mysterious Dyestuff
 	set .@dyeID, 6220;
@@ -114,4 +114,4 @@ prt_in,253,168,4	script	Alora	862,{
 	delitem .@myHG,1;  // Your headgear
 	getitem .@dyHG,1;  // Dyed headgear
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index 38e44d3cb..94fab1d5c 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -1,12 +1,12 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
 //= Clothes Dyer
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Usnul
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.5
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Clothes dyer with standard palletes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= 2.1 Shortened some labels to make this script loading,
 //= Added Black+White Colors desc [Lupus]
@@ -19,7 +19,7 @@
 //= 2.5 Optimized. [Euphy]
 //============================================================
 
-prt_in,284,168,2	script	Dyer Ginedin Rephere	55,{
+prt_in,284,168,2	script	Dyer Ginedin Rephere	1_M_JOBTESTER,{
 function Dyes;
 
 	set .@EnableDyes,1;	// Disable (set to 0) if palettes cause errors [see note v2.4]
@@ -105,7 +105,7 @@ function Dyes;
 				if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3);
 			case Job_SuperNovice:
 				if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4);
-			default: 
+			default:
 				mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it.";
 				close;
 			}
@@ -166,9 +166,9 @@ function Dyes {
 		close;
 	}
 	delitem .@DyeItems[getarg((.@s-1)*2)],1;
-	set Zeny, Zeny-10000;
+	Zeny -= 10000;
 	setlook 7, ((.@s)?(getarg((.@s-1)*2+1)):0);
 	mes "Your clothes have been dyed "+((.@s)?.@DyeName$[getarg((.@s-1)*2)]:.@DyeName$[0])+".";
 	close;
 }
-}
\ No newline at end of file
+}
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index c52db9787..160a7e5bc 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -1,5 +1,5 @@
 //===== Hercules Script ======================================
-//= Manuk & Splendide Coin Merchants
+//= Coin Merchants
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
@@ -8,7 +8,7 @@
 //= [Official Conversion]
 //= Coin redemption NPCs.
 //===== Additional Comments: =================================
-//= 1.0 First version 
+//= 1.0 First version
 //= 1.1 Fixed checkweight. [Gepard]
 //= 1.2 Optimized and merged into one file. [Euphy]
 //============================================================
@@ -28,34 +28,34 @@
 		mes "What are you looking for?";
 		next;
 		if (strnpcinfo(1) == "Merchant of Manuk") {
-			setarray .@Items[2],12342,12343,12348;
+			setarray .@items[2],12342,12343,12348;
 			set .@Book,11019; //Manuk_Selling_Item
-			set .@Coin,6080; //Manuk_Coin
+			set .@coin,6080; //Manuk_Coin
 			set .@i, select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel");
 		}
 		else {
-			setarray .@Items[2],12344,12345,12349;
+			setarray .@items[2],12344,12345,12349;
 			set .@Book,11018; //Splendide_Selling_Item
-			set .@Coin,6081; //Splendide_Coin
+			set .@coin,6081; //Splendide_Coin
 			set .@i, select("View item description:Buy Pinguicula's Fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing");
 		}
 		mes .@n$;
 		if (.@i == 1) {
 			mes "Here are the item descriptions.";
 			close2;
-			ReadBook .@Book,1;
+			readbook .@Book,1;
 			end;
 		}
 		else if (.@i < 5) {
-			mes "I can sell you 3 "+getitemname(.@Items[.@i])+" for ^3131FF1 coin^000000.";
+			mes "I can sell you 3 "+getitemname(.@items[.@i])+" for ^3131FF1 coin^000000.";
 			next;
 			switch(select("Purchase:Do not purchase")) {
 			case 1:
-				if (countitem(.@Coin)) {
+				if (countitem(.@coin)) {
 					mes .@n$;
 					mes "Thank you for coming.";
-					delitem .@Coin,1; 
-					getitem .@Items[.@i],3;
+					delitem .@coin,1;
+					getitem .@items[.@i],3;
 					close;
 				}
 				else {
@@ -83,5 +83,5 @@
 		close;
 	}
 }
-man_in01,286,16,1	duplicate(merchant_13_2)	Merchant of Manuk	454
-spl_in01,110,326,5	duplicate(merchant_13_2)	Merchant of Splendide	439
\ No newline at end of file
+man_in01,286,16,1	duplicate(merchant_13_2)	Merchant of Manuk	4_MAN_PIOM
+spl_in01,110,326,5	duplicate(merchant_13_2)	Merchant of Splendide	4_F_FAIRYKID4
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index c4bc2f5f8..b8ca80d06 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -1,22 +1,23 @@
 //===== Hercules Script ======================================
 //= Dye Maker
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Quests to create the eight colored Dyestuffs.
+//===== Additional Comments: =================================
 //= 1.0 Fully working [kobra_k88]
-//= 1.1 Spell Checked [Nexon] 
+//= 1.1 Spell Checked [Nexon]
 //= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
 //= 1.2b Fixed typos in variable names [ultramage]
 //= 1.3 Made the checks more dynamic [ultramage]
 //= 1.3b Fixed incorrect checking loop structure [ultramage]
 //= 1.4 Added a checkweight. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-morocc_in,146,99,3	script	Java Dullihan	58,{
+morocc_in,146,99,3	script	Java Dullihan	1_M_MERCHANT,{
 	if ((MaxWeight-Weight) < 200 || checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
@@ -145,7 +146,7 @@ S_MakeDye:
 	case 7:
 		mes "Mmm... I need 30 White Herbs, 1 Counteragent, and 1 Empty bottle to make White Dyestuffs. The fee will be 3000 zeny.";
 		setarray .@item[0], 509, 973, 713;
-		setarray .@count[0], 30,   1,   1; 
+		setarray .@count[0], 30,   1,   1;
 		set .@cost,3000;
 		set .@dyestuff,982;
 		break;
@@ -181,7 +182,7 @@ S_MakeDye:
 		// delete items
 		for (set .@i, 0; .@i < .@size ; set .@i, .@i+1)
 			delitem .@item[.@i], .@count[.@i];
-		set zeny,zeny-.@cost;
+		Zeny -= .@cost;
 		// get dyestuff
 		getitem .@dyestuff,1;
 		
diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt
index 2d120d190..a1f255743 100644
--- a/npc/merchants/elemental_trader.txt
+++ b/npc/merchants/elemental_trader.txt
@@ -1,18 +1,18 @@
 //===== Hercules Script ======================================
 //= Elemental Stone Trader
-//===== By: ================================================== 
-//=  MasterOfMuppets, rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== By: ==================================================
+//= rAthena Team & MasterOfMuppets
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Trade impure types of elemental stones for pure ones.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.1 Optimized. [Euphy]
-//============================================================ 
+//============================================================
 
-ama_in02,61,27,7	script	Alchemist#ama	749,{
+ama_in02,61,27,7	script	Alchemist#ama	4_M_ALCHE_B,{
 	mes "[Laspuchin Gregory]";
 	mes "KeekeekeeKeheheh.";
 	mes "This is amazing!";
@@ -79,8 +79,8 @@ ama_in02,61,27,7	script	Alchemist#ama	749,{
 	mes "[Laspuchin Gregory]";
 	mes "Uh-huh, what did you bring?";
 	next;
-	setarray .@Items[1],995,997,994,996;
-	set .@i, .@Items[select("Mystic Frozen:Great Nature:Flame Heart:Rough Wind")];
+	setarray .@items[1],995,997,994,996;
+	set .@i, .@items[select("Mystic Frozen:Great Nature:Flame Heart:Rough Wind")];
 	mes "[Laspuchin Gregory]";
 	if (countitem(.@i) > 7) {
 		mes "I will take 8 of them and";
@@ -93,7 +93,7 @@ ama_in02,61,27,7	script	Alchemist#ama	749,{
 		next;
 		set .@menu$, "";
 		for(set .@j,1; .@j<5; set .@j,.@j+1) {
-			if (.@Items[.@j] != .@i) set .@menu$, .@menu$+getitemname(.@Items[.@j]);
+			if (.@items[.@j] != .@i) set .@menu$, .@menu$+getitemname(.@items[.@j]);
 			set .@menu$, .@menu$+":";
 		}
 		set .@menu$, .@menu$+"Cancel the trade";
@@ -130,7 +130,7 @@ ama_in02,61,27,7	script	Alchemist#ama	749,{
 		}
 		else {
 			delitem .@i,8;
-			getitem .@Items[.@j],1;
+			getitem .@items[.@j],1;
 			mes "Keheheh! You've chosen a good one!";
 			mes "Use it well...";
 			mes "Bring me other stones if you have them!";
@@ -155,4 +155,4 @@ ama_in02,61,27,7	script	Alchemist#ama	749,{
 	mes "Bring me stones! You said you are going to help me!";
 	mes "Keep your promises! Kehehehkehkeh...";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index a9ad383b8..ee3032440 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -1,26 +1,24 @@
 //=====Hercules Script =======================================
 //= Armor Enchanter
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Add a +1, +2, or +3 random stat to a specified armor.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Corrected typo (Sit -> Suit) (bugreport:4586)
 //= 1.2 Optimized. [Euphy]
 //= 1.3 Fixed some typos and optimized a little more. [Daegaladh]
 //= 1.3a Added 'disable_items' command. [Euphy]
-//============================================================ 
+//============================================================
 
-prontera,165,60,2	script	Apprentice Craftsman	73,{
+prontera,165,60,2	script	Apprentice Craftsman	1_F_MERCHANT_01,{
 	disable_items;
 	mes "[Apprentice Craftsman]";
-	if (Zeny > 399999) {
+	if (Zeny >= 400000) {
 		mes "I've been studying ways to enhance an armor to maximize its capability.";
 		next;
 		mes "[Apprentice Craftsman]";
@@ -35,44 +33,42 @@ prontera,165,60,2	script	Apprentice Craftsman	73,{
 		mes "[Apprentice Craftsman]";
 		mes "I'm not responsible for what would happen if you have more than one of the same kind in your inventory.";
 		next;
-		switch(select("Armor with no Slots:Armor with Slots:High Grade Armor:Maybe next time")) {
-			case 1:
-				setarray .@Items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396;
-				set .@j,50;
-				break;
-			case 2:
-				setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351;
-				set .@j,55;
-				set .@k,1;
-				break;
-			case 3:
-				setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390;
-				set .@j,60;
-				break;
-			case 4:
-				mes "[Apprentice Craftsman]";
-				mes "Please come back when you have any interest in enchanting your armor.";
-				close;
+		switch(select("Non Slotted Armor.:Slotted Armor.:High Grade Armor.:Maybe next time.")) {
+		case 1:
+			setarray .@items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396;
+			set .@j,50;
+			break;
+		case 2:
+			setarray .@items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351;
+			set .@j,55;
+			set .@k,1;
+			break;
+		case 3:
+			setarray .@items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390;
+			set .@j,60;
+			break;
+		case 4:
+			mes "[Apprentice Craftsman]";
+			mes "Please come back when you have any interest in enchanting your armor.";
+			close;
 		}
 		set .@menu$,"";
-		for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+1)
-			set .@menu$, .@menu$+getitemname(.@Items[.@i])+((.@k)?" [1]":"")+":";
-		callsub S_EnchantArmor, .@Items[select(.@menu$)-1], .@j;
+		for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+1)
+			set .@menu$, .@menu$+getitemname(.@items[.@i])+((.@k)?" [1]":"")+":";
+		callsub S_EnchantArmor, .@items[select(.@menu$)-1], .@j;
 		end;
 	}
-	else {
-		mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor.";
-		next;
-		mes "[Apprentice Craftsman]";
-		mes "If by any chance, you would want to enchant your armor, bring me 400,000 zeny and the armor you want to enchant and you are all set to go.";
-		close;
-	}
+	mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor.";
+	next;
+	mes "[Apprentice Craftsman]";
+	mes "If by any chance, you would want to enchant your armor, bring me 400,000 zeny and the armor you want to enchant and you are all set to go.";
+	close;
 
 S_EnchantArmor:
 	set .@itemid,getarg(0);
 	set .@failrate,getarg(1);
 	mes "[Apprentice Craftsman]";
-	if ((countitem(.@itemid) > 0) && (countitem(.@itemid) < 2)) {
+	if (countitem(.@itemid) == 1) {
 		mes "Socket enchant will cost you 400,000 zeny. And there will be a random option enchanted. Of course, there is a chance of breaking your armor.";
 		next;
 		mes "[Apprentice Craftsman]";
@@ -81,7 +77,7 @@ S_EnchantArmor:
 		mes "and Cards will be GONE.^000000";
 		mes "Do you still want to try an Enchant?";
 		next;
-		if(select("Hmm... Let me think it over.:I've made up my mind already. Give it a shot.")==1) {
+		if(select("Hmm... Let me think it over.:Go ahead.") == 1) {
 			mes "[Apprentice Craftsman]";
 			mes "Well, I can't blame you. Safety first, eh?";
 			mes "Now you have a nice day.";
@@ -97,7 +93,7 @@ S_EnchantArmor:
 			close;
 		}
 		progressbar "ffff00",7;
-		set zeny,zeny-400000;
+		Zeny -= 400000;
 		delitem .@itemid,1;
 		switch (rand(1,.@failrate)) {
 			case 1: set .@addpart,4702;break;
@@ -150,4 +146,4 @@ S_EnchantArmor:
 		mes "Please come back with just ONE equipment to be enchanted.";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt
index 74962fef2..126dbeba4 100644
--- a/npc/merchants/gemstone.txt
+++ b/npc/merchants/gemstone.txt
@@ -1,23 +1,23 @@
 //===== Hercules Script ======================================
 //= Gemstone Trader
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Trade various colors of gemstones for other color gemstones.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Any notes pertaining to the prior trader may be found
-//=	in the cities/payon.txt
+//=     Any notes pertaining to the prior trader may be found
+//=     in the cities/payon.txt
 //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.2 Updated input with min/max values. [L0ne_W0lf]
-//=	Added a checkweight. 
+//=     Added a checkweight.
 //= 1.3 Fixed checks. [Euphy]
-//============================================================ 
+//============================================================
 
-payon,173,238,5	script	Jade#pay	754,{
+payon,173,238,5	script	Jade#pay	4_M_SAGE_A,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index c3479cbbe..fa4295831 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -1,27 +1,27 @@
 //===== Hercules Script ======================================
 //= Hair Dyer
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Hair Dyer with standard palletes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= 1.1 Bugfix: fixed missing menu label LEnd->M_End [Lupus]
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.3 Fixed problem what "freezes" the NPC. (bugreport:509) [Samuray22]
 //= 1.4 Fixed getlook checking the wrong color. (bugreport:2392) [L0ne_W0lf]
 //= 1.5 Added Lighthalzen Hair Dying NPC. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-prt_in,243,168,4	script	Jovovich	91,{
+prt_in,243,168,4	script	Jovovich	4_F_02,{
 	mes "[Hairdresser Jovovich]";
 	mes "Welcome~!";
 	mes "How may I help you?";
 	next;
 	mes "[Hairdresser Jovovich]";
-	if (sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
+	if (Sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
 	else {
 		if (rand(20) > 11) {
 			mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this.";
@@ -91,9 +91,9 @@ prt_in,243,168,4	script	Jovovich	91,{
 						case 5: callsub S_NoDye,981,"blue"; break;
 						case 6: callsub S_NoDye,982,"white"; break;
 						case 7: callsub S_NoDye,983,"black"; break;
-						Case 8: callsub S_NoDye,975,"red"; break;
+						case 8: callsub S_NoDye,975,"red"; break;
 						}
-						if (zeny < 1000) {
+						if (Zeny < 1000) {
 							mes "[Hairdresser Jovovich]";
 							mes "The fee is 1000 zeny. Do you not have enough...?";
 							close;
@@ -109,7 +109,7 @@ prt_in,243,168,4	script	Jovovich	91,{
 						case 7: delitem 983,1; break; //Black_Dyestuffs
 						case 8: delitem 975,1; break; //Scarlet_Dyestuffs
 						}
-						set Zeny,Zeny-1000;
+						Zeny -= 1000;
 						setlook VAR_HEADPALETTE,.@headpalette;
 						set .@choose_success,1;
 						break;
@@ -154,7 +154,7 @@ S_NoDye:
 }
 
 // Lighthalzen
-lhz_in02,100,134,3	script	Hair Dyer#lich	850,{
+lhz_in02,100,134,3	script	Hair Dyer#lich	4_F_EINWOMAN,{
 	mes "[Rossa]";
 	if (Sex == 1) {
 		mes "Welcome, come in~";
@@ -367,7 +367,7 @@ lhz_in02,100,134,3	script	Hair Dyer#lich	850,{
 						else if (.@headpalette == 5) delitem 978,1; //Cobaltblue_Dyestuffs
 						else if (.@headpalette == 6) delitem 982,1; //White_Dyestuffs
 						else if (.@headpalette == 7) delitem 983,1; //Black_Dyestuffs
-						set zeny,zeny-1000;
+						Zeny -= 1000;
 						setlook VAR_HEADPALETTE,.@headpalette;
 						set .@choose_success,1;
 						break;
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index cf4db6333..d1ce1e234 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Allows you to change your hairstyle.
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to the Aegis 10.3 Standards. [Samuray22]
@@ -15,7 +15,7 @@
 
 // Hair Dresser Veronica
 // ============================================================
-alberta_in,55,142,7	script	Hair Dresser	91,{
+alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 	mes "[Veronica]";
 	mes "Welcome to Veronica's hair salon.";
 	mes "How can I help you?";
@@ -470,7 +470,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 				mes "- *snip snip snip snip* -";
 				mes "- *bzzzzzzz bzzzzzzz bzzzzzzz bzzzzzzz* -";
 				next;
-				set Zeny,Zeny-99800;
+				Zeny -= 99800;
 				delitem 973,3;	// Counteragent
 				delitem 974,3;	// Mixture
 				delitem 901,100;	// Danggie
@@ -522,7 +522,7 @@ L_cutin:
 
 // Roving Hair Dresser
 // ============================================================
-alberta,33,141,7	script	Roving Hair Dresser	87,{
+alberta,33,141,7	script	Roving Hair Dresser	4_M_BARBER,{
 	mes "[Rui Vishop]";
 	mes "That Veronica...";
 	mes "Hah! Best hair dresser my ass.";
@@ -656,7 +656,7 @@ alberta,33,141,7	script	Roving Hair Dresser	87,{
 			mes "Once more I've outdone myself.";
 			mes "It's such a unique and talented";
 			mes "style! Yes, I am the best! Wooohahahahahaha!";
-			set Zeny,Zeny-199800;
+			Zeny -= 199800;
 			setlook 1,rand(1,19);
 			setlook 6,rand(1,8);
 			close;
@@ -683,7 +683,7 @@ alberta,33,141,7	script	Roving Hair Dresser	87,{
 
 
 // Lighthalzen
-lhz_in02,100,143,3	script	Hair Dresser#li	122,{
+lhz_in02,100,143,3	script	Hair Dresser#li	2_M_DYEINGER,{
 	mes "[Prince Shammi]";
 	mes "Welcome to Prince Shammi's";
 	mes "Beauty Shop, the place to go";
@@ -1042,7 +1042,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 				mes "*Clip clip clip clip*";
 				mes "*Bzzzzzzzzzzzzzzzzzzzz*^000000";
 				next;
-				set zeny,zeny-99800;
+				Zeny -= 99800;
 				delitem 973,3; //Counteragent
 				delitem 974,3; //Mixture
 				delitem 901,100; //Danggie
@@ -1096,7 +1096,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 	}
 }
 
-lhz_in02,91,155,5	script	Assistant Beautician#li	862,{
+lhz_in02,91,155,5	script	Assistant Beautician#li	4_F_LGTGIRL,{
 	mes "[Assistant Beautician]";
 	mes "Wah?! Sweet Jiminy,";
 	mes "you freaked me out!";
@@ -1249,7 +1249,7 @@ lhz_in02,91,155,5	script	Assistant Beautician#li	862,{
 				mes "[Assistant Beautician]";
 				mes "^333333*Pant Pant Pant*^000000";
 				next;
-				set zeny,zeny-250000;
+				Zeny -= 250000;
 				setlook VAR_HEAD,.@style_r;
 				setlook VAR_HEADPALETTE,.@color_r;
 				mes "[Assistant Beautician]";
diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt
index f944d34ba..0091b36ef 100644
--- a/npc/merchants/hd_refine.txt
+++ b/npc/merchants/hd_refine.txt
@@ -1,11 +1,9 @@
-//===== Hercules Script ====================================== 
+//===== Hercules Script ======================================
 //= HD Refiners
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= [Official Conversion]
 //= Refiners that use HD ores to refine equipment. Upon
@@ -125,7 +123,7 @@
 		close;
 	}
 	delitem .@material,1;
-	set Zeny, Zeny-.@price;
+	Zeny -= .@price;
 	mes "[Blacksmith Mighty Hammer]";
 	mes "Tac! Tac! Tac!";
 	if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
@@ -147,17 +145,17 @@
 	mes "I am sure a person like you would never blame me for a decrease in refine level by 1. Hmm.";
 	close;
 }
-prt_in,59,54,3	duplicate(MightyHammer)	Mighty Hammer#prt	826
-morocc_in,65,30,3	duplicate(MightyHammer)	Mighty Hammer#morocc	826
-payon,148,176,3	duplicate(MightyHammer)	Mighty Hammer#pay	826
-alberta_in,16,56,3	duplicate(MightyHammer)	Mighty Hammer#alb	826
-yuno_in01,171,18,3	duplicate(MightyHammer)	Mighty Hammer#yuno	826
-ein_in01,22,82,3	duplicate(MightyHammer)	Mighty Hammer#ein	826
-lhz_in02,280,19,3	duplicate(MightyHammer)	Mighty Hammer#lhz	826
+prt_in,59,54,3	duplicate(MightyHammer)	Mighty Hammer#prt	4_M_DWARF
+morocc_in,65,30,3	duplicate(MightyHammer)	Mighty Hammer#morocc	4_M_DWARF
+payon,148,176,3	duplicate(MightyHammer)	Mighty Hammer#pay	4_M_DWARF
+alberta_in,16,56,3	duplicate(MightyHammer)	Mighty Hammer#alb	4_M_DWARF
+yuno_in01,171,18,3	duplicate(MightyHammer)	Mighty Hammer#yuno	4_M_DWARF
+ein_in01,22,82,3	duplicate(MightyHammer)	Mighty Hammer#ein	4_M_DWARF
+lhz_in02,280,19,3	duplicate(MightyHammer)	Mighty Hammer#lhz	4_M_DWARF
 
 // iRO NPC locations:
-// moc_para01,38,185,4	duplicate(MightyHammer)	Mighty Hammer#ed	826
-// payon,174,133,4	duplicate(MightyHammer)	Mighty Hammer#im	826
+// moc_para01,38,185,4	duplicate(MightyHammer)	Mighty Hammer#ed	4_M_DWARF
+// payon,174,133,4	duplicate(MightyHammer)	Mighty Hammer#im	4_M_DWARF
 
 // Basta (+10 and up)
 //============================================================
@@ -282,7 +280,7 @@ lhz_in02,280,19,3	duplicate(MightyHammer)	Mighty Hammer#lhz	826
 		close;
 	}
 	delitem .@material,1;
-	set Zeny, Zeny-.@price;
+	Zeny -= .@price;
 	mes "Pow! Pow! Pow! Pow!";
 	if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
 		successrefitem .@part;
@@ -309,10 +307,10 @@ lhz_in02,280,19,3	duplicate(MightyHammer)	Mighty Hammer#lhz	826
 	mes "I'll do better next time! Don't worry!";
 	close;
 }
-prt_in,57,54,3	duplicate(Basta)	Basta#prt	826
-morocc_in,68,30,3	duplicate(Basta)	Basta#morocc	826
-payon,148,174,3	duplicate(Basta)	Basta#payon	826
-alberta_in,18,56,3	duplicate(Basta)	Basta#alberta	826
-yuno_in01,173,18,3	duplicate(Basta)	Basta#yuno	826
-ein_in01,24,82,3	duplicate(Basta)	Basta#einbroch	826
-lhz_in02,280,17,3	duplicate(Basta)	Basta#lighthalzen	826
\ No newline at end of file
+prt_in,57,54,3	duplicate(Basta)	Basta#prt	4_M_DWARF
+morocc_in,68,30,3	duplicate(Basta)	Basta#morocc	4_M_DWARF
+payon,148,174,3	duplicate(Basta)	Basta#payon	4_M_DWARF
+alberta_in,18,56,3	duplicate(Basta)	Basta#alberta	4_M_DWARF
+yuno_in01,173,18,3	duplicate(Basta)	Basta#yuno	4_M_DWARF
+ein_in01,24,82,3	duplicate(Basta)	Basta#einbroch	4_M_DWARF
+lhz_in02,280,17,3	duplicate(Basta)	Basta#lighthalzen	4_M_DWARF
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index f126b723e..29d3eafe0 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -69,16 +69,16 @@
 		mes "before making a purchase.";
 		close;
 	}
-	set Zeny,Zeny-100*.@input;
+	Zeny -= 100*.@input;
 	getitem 536,.@input;	// Ice_Cream
 	close;
 }
 
 // Alberta
-alberta,120,45,2	duplicate(IceCreamer)	Ice Cream Maker#1	85
+alberta,120,45,2	duplicate(IceCreamer)	Ice Cream Maker#1	4_M_03
 
 // Morroc Field
-moc_fild16,88,304,4	duplicate(IceCreamer)	Ice Cream Maker#2	85
+moc_fild16,88,304,4	duplicate(IceCreamer)	Ice Cream Maker#2	4_M_03
 
 // Morroc
-//morocc,160,144,4	duplicate(IceCreamer)	Ice Cream Maker#3	85
+//morocc,160,144,4	duplicate(IceCreamer)	Ice Cream Maker#3	4_M_03
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 7c4935942..8b3a34420 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -1,5 +1,5 @@
 //===== Hercules Script ======================================
-//= Inn NPCs
+//= Inn Npcs
 //===== By: ==================================================
 //= Darkchild (1.1)
 //= Playtester (1.2)
@@ -17,19 +17,19 @@
 //===== Additional Comments: =================================
 //= 1.1 Blind Effect By Kobra_k88 (Taken from his old script)
 //= I added it to all of them though [Darkchild]
-//= 1.1a Minor bug fixes and optimizations. Switched from @variables 
+//= 1.1a Minor bug fixes and optimizations. Switched from @variables
 //= to arguments.[kobra_k88]
 //= 1.2 Rewrote inn script [Playtester]
 //= 1.3 Added (finally) Rachel Inn Maid. Official warp
-//=	  and save points[erKURITA]
+//=     and save points[erKURITA]
 //= 1.4 Added Hugel inn [erKurita]
 //= 1.5 Added "end;" after warping the player. [L0ne_W0lf]
 //=	- Small corrections to the prontera Inns.
 //=	- Removed the Cancel dialog.
 //= 1.6 More fixes, changed progression of "Rest"ing.
 //=	- Corrected Morroc NPCs. [L0ne_W0lf]
-//= 1.7 Corrected Payon NPC. [L0ne_W0lf] 
-//= 1.8 Corrected Geffen NPC. [L0ne_W0lf] 
+//= 1.7 Corrected Payon NPC. [L0ne_W0lf]
+//= 1.8 Corrected Geffen NPC. [L0ne_W0lf]
 //= 1.9 Added the Inn for Al De baran. [L0ne_W0lf]
 //= 2.0 Added Inn for the Town of Veins. [L0ne_W0lf]
 //= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
@@ -46,73 +46,73 @@
 //============================================================
 
 
-//======================== Prontera ===================================
+//========================Prontera ===================================
 // West Side Inn -------------------
-prt_in,244,135,2	script	Inn Employee#Sammy	53,{
+prt_in,244,135,2	script	Inn Employee#Sammy	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Sammy]","Nenkaras","prt_in",238,130;
 	warp "prt_in",247,104; end;
 }
 // East Side Inn ------------------
-prt_in,61,141,2	script	Inn Employee#Ahlma	53,{
+prt_in,61,141,2	script	Inn Employee#Ahlma	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Ahlma]","Nenkaras","prt_in",64,136;
 	warp "prt_in",60,166; end;
 }
 
-//======================== Alberta ====================================
-alberta_in,32,142,3	script	Inn Employee#Jennie	53,{
+//========================Alberta ====================================
+alberta_in,32,142,3	script	Inn Employee#Jennie	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Jennie]","'Fisherman Inn'!","alberta_in",26,142;
 	warp "alberta_in",18,188; end;
 }
 
-//====================== Geffen ======================================
-geffen_in,70,64,5	script	Inn Employee#Cena	53,{
+//======================Geffen ======================================
+geffen_in,70,64,5	script	Inn Employee#Cena	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Cena]","'Ifrit,' the only Inn in the city of Geffen.","geffen_in",70,59;
 	warp "geffen_in",31,31; end;
 }
 
-//======================= Payon ======================================
-payon_in01,132,62,5	script	Inn Employee#Ahee	53,{
+//=======================Payon ======================================
+payon_in01,132,62,5	script	Inn Employee#Ahee	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Ahee]","Payon Inn","payon_in01",136,61;
 	warp "payon_in01",132,11; end;
 }
 
-//======================== Morocc ====================================
+//========================Morocc ====================================
 // North East --------------------------
 /*
-morocc_in,147,141,3	script	Inn Employee#Hasna	53,{
+morocc_in,147,141,3	script	Inn Employee#Hasna	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Hasna]","Morroc Inn","morocc_in",142,140;
 	warp "morocc_in",173,135; end;
 }
 // South --------------------------------
-morocc_in,80,100,5	script	Inn Employee#Manar	53,{
+morocc_in,80,100,5	script	Inn Employee#Manar	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Manar]","Morroc Inn","morocc_in",78,95;
 	warp "morocc_in",79,123; end;
 }
 */
 
-//====================== Aldebaran ===================================
-aldeba_in,92,58,5	script	Inn Maid#Rilim	53,{
+//======================Aldebaran ===================================
+aldeba_in,92,58,5	script	Inn Maid#Rilim	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Rilim]","Al De Baran Inn","aldeba_in",92,50;
 	warp "aldeba_in",92,112; end;
 }
 
-//======================== Rachel ====================================
-ra_in01,376,69,4	script	Inn Keeper#Annie	931,{
+//========================Rachel ====================================
+ra_in01,376,69,4	script	Inn Keeper#Annie	4_M_RACHMAN1,{
 
 	callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58;
 	warp "ra_in01",384,128; end;
 }
 
-//====================== Lighthalzen =================================
-lhz_in02,230,284,4	script	Hotel Employee#01	86,{
+//======================Lighthalzen =================================
+lhz_in02,230,284,4	script	Hotel Employee#01	4_M_04,{
 	mes "[Hotel Employee]";
 	mes "Welcome to";
 	mes "the Royal Dragon,";
@@ -137,7 +137,7 @@ lhz_in02,230,284,4	script	Hotel Employee#01	86,{
 			mes "in order to check in.";
 			close;
 		}
-		set Zeny,Zeny - 5000;
+		Zeny -= 5000;
 		mes "[Hotel Employee]";
 		mes "Thank you~";
 		mes "I hope you enjoy";
@@ -156,15 +156,15 @@ lhz_in02,230,284,4	script	Hotel Employee#01	86,{
 	}
 }
 
-//======================== Hugel ====================================
-hu_in01,246,107,3	script	Inn Maid#Receptionist	53,{
+//========================Hugel ====================================
+hu_in01,246,107,3	script	Inn Maid#Receptionist	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95;
 	warp "hu_in01",267,5; end;
 }
 
-//======================== Veins ====================================
-ve_in,157,219,5	script	Inn Master#Receptionist	709,{
+//========================Veins ====================================
+ve_in,157,219,5	script	Inn Master#Receptionist	4_M_SEAMAN,{
 	mes "[Inn Master]";
 	mes "Good day~";
 	mes "Welcome to the";
@@ -190,7 +190,7 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 		}
 		mes "Enjoy your stay~";
 		close2;
-		set Zeny,Zeny - 5000;
+		Zeny -= 5000;
 		percentheal 100,100;
 		warp "ve_in",184,228;
 		end;
@@ -201,7 +201,7 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 	}
 }
 
-//======================= Inn Function ==============================
+//=======================Inn Function ==============================
 function	script	F_InnMaid	{
 	mes getarg(0);
 	mes "Welcome to";
@@ -227,7 +227,7 @@ function	script	F_InnMaid	{
 		mes "I hope you";
 		mes "enjoy your rest~";
 		close2;
-		set Zeny,Zeny - 5000;
+		Zeny -= 5000;
 		percentheal 100,100;
 		return;
 	case 3:
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index 6f5fd953b..d3b70f35b 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -7,16 +7,16 @@
 //===== Description: =========================================
 //= Trades a few shurikens + ninja stones for elemental kunai.
 //===== Additional Comments: =================================
-//= 1.0 Added the npc. It uses a function that sends the item 
-//=	  id of the 2 required items plus the amount. Can trade
-//= 	  up to 500 units (5,000 kunais) at once. [erKURITA]
+//= 1.0 Added the npc. It uses a function that sends the item
+//=     id of the 2 required items plus the amount. Can trade
+//=     up to 500 units (5,000 kunais) at once. [erKURITA]
 //= 1.1 Officialized script [Playtester]
 //= 1.2a Optimized/cleaned up a bit [ultramage]
 //= 1.3 Updated to match AEGIS script. [Kisuka]
 //= 1.3a Kagerou/Oboro support (BaseJob -> BaseClass) [Euphy]
 //============================================================
 
-que_ng,72,29,3	script	Kunai Merchant Kashin	83,{
+que_ng,72,29,3	script	Kunai Merchant Kashin	4_M_01,{
 	if(BaseClass == Job_Ninja) {
 		mes "[Kashin]";
 		mes "I am Kashin, distributor";
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index 15fe3c497..3f2c46a20 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.5
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trades bottles for milk
 //===== Additional Comments: =================================
 //= Fully working
@@ -17,7 +17,7 @@
 //= 1.5 Fixed missed variable. (bugreport:1523) [L0ne_W0lf]
 //============================================================
 
-prontera,73,140,0	script	Milk Vendor	86,{
+prontera,73,140,0	script	Milk Vendor	4_M_04,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFJust a minute!";
 		mes "I can't offer any of my";
@@ -49,7 +49,7 @@ prontera,73,140,0	script	Milk Vendor	86,{
 		set .@bottles,countitem(713);
 		set .@total_weight,.@bottles * 50;
 		set .@total_cost,.@bottles * 15;
-		if (zeny < .@Total_cost) {
+		if (Zeny < .@total_cost) {
 			mes "[Milk Vendor]";
 			mes "Oh, whoa~!";
 			mes "You don't have enough";
@@ -59,7 +59,7 @@ prontera,73,140,0	script	Milk Vendor	86,{
 			mes "at least " + .@total_cost + " zeny.";
 			close;
 		}
-		if ((maxweight-weight) < .@total_weight) {
+		if (MaxWeight - Weight < .@total_weight) {
 			mes "[Milk Vendor]";
 			mes "Hmm...";
 			mes "Would you make";
@@ -69,7 +69,7 @@ prontera,73,140,0	script	Milk Vendor	86,{
 			mes "all of this milk?";
 			close;
 		}
-		set zeny,zeny-.@total_cost;
+		Zeny -= .@total_cost;
 		delitem 713,.@bottles; //Empty Bottles
 		getitem 519,.@bottles; //Milk
 		close;
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index cd8cede0e..5474190e6 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -1,23 +1,22 @@
 //===== Hercules Script ======================================
 //= Novice Goods Exchanger
 //===== By: ==================================================
-//= ???, rAthena Dev Team
+//= ???, rAthena Team
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Exchanges your Basic Monster drops for Red Potions.
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to Aegis 10.standards. [L0ne_W0lf[
-//=	Made it easier to add new items to exhange list
-//=	meaning only the exchange is done in a function now.
+//=     Made it easier to add new items to exhange list
+//=     meaning only the exchange is done in a function now.
 //= 1.3 Fixed dialog mix-up in function. [L0ne_W0lf]
 //= 1.4 Added checkweight, and input min/max values. [L0ne_W0lf]
 //============================================================
 
-prontera,123,102,5	script	Merchant#pron	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+prontera,123,102,5	script	Merchant#pron	4_M_03,{
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -72,9 +71,8 @@ prontera,123,102,5	script	Merchant#pron	85,{
 	}
 }
 
-morocc,180,259,3	script	Merchant#morroc	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+morocc,180,259,3	script	Merchant#morroc	4_M_03,{
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -130,9 +128,8 @@ morocc,180,259,3	script	Merchant#morroc	85,{
 	}
 }
 
-payon,200,134,5	script	Merchant#pay	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+payon,200,134,5	script	Merchant#pay	4_M_03,{
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -185,9 +182,8 @@ payon,200,134,5	script	Merchant#pay	85,{
 	}
 }
 
-aldebaran,152,63,5	script	Merchant#alde	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+aldebaran,152,63,5	script	Merchant#alde	4_M_03,{
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -243,9 +239,8 @@ aldebaran,152,63,5	script	Merchant#alde	85,{
 	}
 }
 
-geffen,173,88,5	script	Merchant#geff	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+geffen,173,88,5	script	Merchant#geff	4_M_03,{
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -384,9 +379,9 @@ function	script	F_PotExchange	{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 Made it as a function. U can add your own Merchs [Lupus]
 //= 1.1a Fixed item select [KarLaeda]
-//============================================================ 
+//============================================================
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index f913b0eec..d74b3287d 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -5,17 +5,16 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= Trade in items for potions
-//===============================
-//= Breakdown of arguments used
+//= Trade in items for potions.
+//= Breakdown of arguments used:
 //= arg(0): Herb required.
 //= arg(1): Zeny cost.
 //= arg(2): Potion given.
 //===== Additional Comments: =================================
-//= 1.0 - Fully working. [DZeroX]
-//= 1.0a - Minor fixes [Lupus]
-//= 1.1 - Added changed the dialogs and name to fit the
-//=       the official information. [DZeroX]
+//= 1.0 Fully working. [DZeroX]
+//= 1.0a Minor fixes [Lupus]
+//= 1.1 Added changed the dialogs and name to fit the
+//=     the official information. [DZeroX]
 //= 1.1a Removed .GATs [Lupus]
 //= 1.1b Fixed a bug in Orange Potion creating. Copy&Pasting = bad. [L0ne_W0lf]
 //= 1.2 Added checkweight, and input min/max values. [L0ne_W0lf]
@@ -23,7 +22,7 @@
 //= 1.4 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
-alberta_in,16,28,4	script	Pharmacist	61,{
+alberta_in,16,28,4	script	Pharmacist	1_M_PUBMASTER,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
@@ -35,156 +34,155 @@ alberta_in,16,28,4	script	Pharmacist	61,{
 	mes "[Old Pharmacist]";
 	mes "Ummmm...";
 	mes "What brings you here...?";
-	switch(select("Make Potion","Talk.","Mixing Information","Cancel")) {
-		case 1:
+	switch(select("Make Potion:Talk.:Mixing Information:Cancel")) {
+	case 1:
+		next;
+		if (MaxWeight - Weight < 5000) {
+			mes "[Old Pharmacist]";
+			mes "Why are you carrying these so many!";
+			mes "Don't be greedy, carry only as much you need!";
 			next;
-			set .@weight,MaxWeight-Weight;
-			if ((.@weight) < 5000) {
-				mes "[Old Pharmacist]";
-				mes "Why are you carrying these so many!";
-				mes "Don't be greedy, carry only as much you need!";
+			mes "[Old Pharmacist]";
+			mes "You are too heavy to receive potions from me...";
+			mes "Go store some items in your storage first!";
+			close;
+		} else {
+			mes "[Old Pharmacist]";
+			mes "You have all the stuff ready, right? Which one would you like?";
+			switch(select("Red Potion.:Orange Potion.:Yellow Potion.:White Potion.:Blue Potion.:Green Potion.:Actually, I don't want anything.")) {
+			case 1:
+				callsub L_Making,507,3,501;
+			case 2:
 				next;
 				mes "[Old Pharmacist]";
-				mes "You are too heavy to receive potions from me...";
-				mes "Go store some items in your storage first!";
-				close;
-			} else {
-				mes "[Old Pharmacist]";
-				mes "You have all the stuff ready, right? Which one would you like?";
-				switch(select("Red Potion.","Orange Potion.","Yellow Potion.","White Potion.","Blue Potion.","Green Potion.","Actually, I don't want anything.")) {
-					case 1:
-						callsub L_making,507,3,501;
-					case 2:
+				if (countitem(507) < countitem(713)) {
+					set .@max,countitem(507);
+				}
+				else if (countitem(508) < countitem(713)) {
+					set .@max,countitem(508);
+				}
+				else {
+					set .@max,countitem(713);
+				}
+				if ((countitem(507) < 1) || (countitem(508) < 1) || (countitem(713) == 0)) {
+					mes "You rascal! What did you expect?! Coming here with nothing. Tsk!";
+					mes "Get lost!";
+					close;
+				}
+				if (Zeny < 3) {
+					mes "You rascal! What did you expect?! Coming here with nothing. Tsk!";
+					mes "Get lost!";
+					close;
+				}
+				mes "How many?";
+				switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) {
+				case 1:
+					next;
+					if ((countitem(507) < .@max) || (countitem(508) < .@max) || (countitem(713) < .@max) || (Zeny < .@max*3)) {
+						mes "[Old Pharmacist]";
+						mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
+						close;
+					}
+					Zeny -= (.@max*5);
+					delitem 507,.@max; //Red_Herb
+					delitem 508,.@max; //Yellow_Herb
+					delitem 713,.@max; //Empty_Bottle
+					getitem 502,.@max; //Orange_Potion
+					break;
+				case 2:
+					next;
+					mes "[Old Pharmacist]";
+					mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
+					input .@amount,0,101;
+					if (.@amount == 0) {
 						next;
 						mes "[Old Pharmacist]";
-						if (countitem(507) < countitem(713)) {
-							set .@max,countitem(507);
-						}
-						else if (countitem(508) < countitem(713)) {
-							set .@max,countitem(508);
-						}
-						else {
-							set .@max,countitem(713);
-						}
-						if ((countitem(507) < 1) || (countitem(508) < 1) || (countitem(713) == 0)) {
-							mes "You rascal! What did you expect?! Coming here with nothing. Tsk!";
-							mes "Get lost!";
-							close;
-						}
-						if (Zeny < 3) {
-							mes "You rascal! What did you expect?! Coming here with nothing. Tsk!";
-							mes "Get lost!";
-							close;
-						}
-						mes "How many?";
-						switch(select("Make as many as I can.","I want to choose an amount.","Actually, I don't want anything.")) {
-							case 1:
-								next;
-								if ((countitem(507) < .@max) || (countitem(508) < .@max) || (countitem(713) < .@max) || (Zeny < .@max*3)) {
-									mes "[Old Pharmacist]";
-									mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
-									close;
-								}
-								set Zeny,Zeny-(.@max*5);
-								delitem 507,.@max;	// Red_Herb
-								delitem 508,.@max;	// Yellow_Herb
-								delitem 713,.@max;	// Empty_Bottle
-								getitem 502,.@max;	// Orange_Potion
-								break;
-							case 2:
-								next;
-								mes "[Old Pharmacist]";
-								mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
-								input .@amount,0,101;
-								if (.@amount == 0) {
-									next;
-									mes "[Old Pharmacist]";
-									mes "Make up your mind, will you?!";
-									close;
-								}
-								if (.@amount > 100) {
-									next;
-									mes "[Old Pharmacist]";
-									mes "Are you deaf? I said less than 100!";
-									close;
-								}
-								if ((countitem(507) < .@amount) || (countitem(508) < .@amount) || (countitem(713) < .@amount) || (Zeny < .@amount*3)) {
-									next;
-									mes "[Old Pharmacist]";
-									mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
-									close;
-								}
-								next;
-								set Zeny,Zeny-(.@amount*5);
-								delitem 507,.@amount;	// Red_Herb
-								delitem 508,.@amount;	// Yellow_Herb
-								delitem 713,.@amount;	// Empty_Bottle
-								getitem 502,.@amount; 	// Orange_Potion
-								break;
-							case 3:
-								next;
-								mes "[Old Pharmacist]";
-								mes "What?!";
-								mes "Grrr...";
-								mes "Bleh!";
-								mes "Get lost!";
-								close;
-						}
-							mes "[Old Pharmacist]";
-							mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-							close;
-					case 3:
-						callsub L_making,508,10,503;
-					case 4:
-						callsub L_making,509,20,504;
-					case 5:
-						callsub L_making,510,30,505;
-					case 6:
-						callsub L_making,511,3,506;
-					case 7:
+						mes "Make up your mind, will you?!";
+						close;
+					}
+					if (.@amount > 100) {
+						next;
+						mes "[Old Pharmacist]";
+						mes "Are you deaf? I said less than 100!";
+						close;
+					}
+					if ((countitem(507) < .@amount) || (countitem(508) < .@amount) || (countitem(713) < .@amount) || (Zeny < .@amount*3)) {
+						next;
 						mes "[Old Pharmacist]";
-						mes "What?!";
-						mes "Grrr...";
-						mes "Bleh!";
-						mes "Get lost!";
+						mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
 						close;
+					}
+					next;
+					Zeny -= (.@amount*5);
+					delitem 507,.@amount; //Red_Herb
+					delitem 508,.@amount; //Yellow_Herb
+					delitem 713,.@amount; //Empty_Bottle
+					getitem 502,.@amount; //Orange_Potion
+					break;
+				case 3:
+					next;
+					mes "[Old Pharmacist]";
+					mes "What?!";
+					mes "Grrr...";
+					mes "Bleh!";
+					mes "Get lost!";
+					close;
 				}
+				mes "[Old Pharmacist]";
+				mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+				close;
+			case 3:
+				callsub L_Making,508,10,503;
+			case 4:
+				callsub L_Making,509,20,504;
+			case 5:
+				callsub L_Making,510,30,505;
+			case 6:
+				callsub L_Making,511,3,506;
+			case 7:
+				mes "[Old Pharmacist]";
+				mes "What?!";
+				mes "Grrr...";
+				mes "Bleh!";
+				mes "Get lost!";
+				close;
 			}
-		case 2:
-			mes "[Old Pharmacist]";
-			mes "With medicine, you can increase a person's ability to regenerate. But, they're only good up to a point. *Sigh* I'm starting to think of the days when I was young. I must be getting old.";
-			next;
-			mes "[Old Pharmacist]";
-			mes "Anyways, a potion is merely a potion. Nothing more and nothing less.";
-			close;
-		case 3:
-			mes "[Old Pharmacist]";
-			mes "Hrrrmm...";
-			mes "You young ones can be quite annoying. But, since you asked, I'll explain.";
-			next;
-			mes "[Old Pharmacist]";
-			mes "Herbs work well by themselves, but if you use my special techniques and skills to make potions out of them, the effect is much much greater.";
-			next;
-			mes "[Old Pharmacist]";
-			mes "If you ask eagerly and politely, I will make them for you. But, not for free... Don't worry though, I only charge a small fee, so it's not that expensive.";
-			next;
-			mes "[Old Pharmacist]";
-			mes "Red Potion - ^0098E52 Red Herbs, 1 Empty Bottle, 2 zeny fee.^000000";
-			mes "Orange Potion - ^0098E51 Red Herb, 1 Yellow Herb, 1 Empty Bottle, 5 zeny fee.^000000";
-			mes "Yellow Potion - ^0098E52 Yellow Herbs, 1 Empty Bottle, 10 zeny.^000000";
-			next;
-			mes "[Old Pharmacist]";
-			mes "White Potion - ^0098E52 White Herbs, 1 Empty Bottle, 20 zeny fee.^000000";
-			mes "Blue Potion - ^0098E52 Blue Herbs, 1 Empty Bottle, 30 zeny fee.^000000";
-			mes "Green Potion - ^0098E52 Green Herbs, 1 Empty Bottle, 3 zeny fee.^000000";
-			close;
-		case 4:
-			mes "[Old Pharmacist]";
-			mes "What a boring person. If you have something to say, why don't you say it?!";
-			close;
+		}
+	case 2:
+		mes "[Old Pharmacist]";
+		mes "With medicine, you can increase a person's ability to regenerate. But, they're only good up to a point. *Sigh* I'm starting to think of the days when I was young. I must be getting old.";
+		next;
+		mes "[Old Pharmacist]";
+		mes "Anyways, a potion is merely a potion. Nothing more and nothing less.";
+		close;
+	case 3:
+		mes "[Old Pharmacist]";
+		mes "Hrrrmm...";
+		mes "You young ones can be quite annoying. But, since you asked, I'll explain.";
+		next;
+		mes "[Old Pharmacist]";
+		mes "Herbs work well by themselves, but if you use my special techniques and skills to make potions out of them, the effect is much much greater.";
+		next;
+		mes "[Old Pharmacist]";
+		mes "If you ask eagerly and politely, I will make them for you. But, not for free... Don't worry though, I only charge a small fee, so it's not that expensive.";
+		next;
+		mes "[Old Pharmacist]";
+		mes "Red Potion - ^0098E52 Red Herbs, 1 Empty Bottle, 2 zeny fee.^000000";
+		mes "Orange Potion - ^0098E51 Red Herb, 1 Yellow Herb, 1 Empty Bottle, 5 zeny fee.^000000";
+		mes "Yellow Potion - ^0098E52 Yellow Herbs, 1 Empty Bottle, 10 zeny.^000000";
+		next;
+		mes "[Old Pharmacist]";
+		mes "White Potion - ^0098E52 White Herbs, 1 Empty Bottle, 20 zeny fee.^000000";
+		mes "Blue Potion - ^0098E52 Blue Herbs, 1 Empty Bottle, 30 zeny fee.^000000";
+		mes "Green Potion - ^0098E52 Green Herbs, 1 Empty Bottle, 3 zeny fee.^000000";
+		close;
+	case 4:
+		mes "[Old Pharmacist]";
+		mes "What a boring person. If you have something to say, why don't you say it?!";
+		close;
 	}
 	
-L_making:
+L_Making:
 	next;
 	mes "[Old Pharmacist]";
 	if ((countitem(getarg(0))/2) < countitem(713)) {
@@ -203,55 +201,55 @@ L_making:
 		close;
 	}
 	mes "How many?";
-	switch(select("Make as many as I can.","I want to choose an amount.","Actually, I don't want anything.")) {
-		case 1:
-			next;
-			if ((countitem(getarg(0)) < .@max*2) || (countitem(713) < .@max) || (Zeny < .@max*getarg(1))) {
-				mes "[Old Pharmacist]";
-				mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
-				close;
-			}
-			set Zeny,Zeny-(.@max*getarg(1));
-			delitem getarg(0),.@max*2;
-			delitem 713,.@max;	// Empty_Bottle
-			getitem getarg(2),.@max; 
-			break;
-		case 2:
-			next;
+	switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) {
+	case 1:
+		next;
+		if ((countitem(getarg(0)) < .@max*2) || (countitem(713) < .@max) || (Zeny < .@max*getarg(1))) {
 			mes "[Old Pharmacist]";
-			mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
-			input .@amount;
-			next;
-			if (.@amount == 0) {
-				mes "[Old Pharmacist]";
-				mes "Make up your mind, will you?!";
-				close;
-			}
-			if (.@amount > 100) {
-				mes "[Old Pharmacist]";
-				mes "Are you deaf? I said less than 100!";
-				close;
-			}
-			if ((countitem(getarg(0)) < .@amount*2) || (countitem(713) < .@amount) || (Zeny < .@amount*getarg(1))) {
-				mes "[Old Pharmacist]";
-				mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
-				close;
-			}
-			set Zeny,Zeny-(.@amount*getarg(1));
-			delitem getarg(0),.@amount*2;
-			delitem 713,.@amount;	// Empty_Bottle
-			getitem getarg(2),.@amount; 
-			break;
-		case 3:
-			next;
+			mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
+			close;
+		}
+		Zeny -= (.@max*getarg(1));
+		delitem getarg(0),.@max*2;
+		delitem 713,.@max; //Empty_Bottle
+		getitem getarg(2),.@max;
+		break;
+	case 2:
+		next;
+		mes "[Old Pharmacist]";
+		mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
+		input .@amount;
+		next;
+		if (.@amount == 0) {
 			mes "[Old Pharmacist]";
-			mes "What?!";
-			mes "Grrr...";
-			mes "Bleh!";
-			mes "Get lost!";
+			mes "Make up your mind, will you?!";
 			close;
-	}
+		}
+		if (.@amount > 100) {
+			mes "[Old Pharmacist]";
+			mes "Are you deaf? I said less than 100!";
+			close;
+		}
+		if ((countitem(getarg(0)) < .@amount*2) || (countitem(713) < .@amount) || (Zeny < .@amount*getarg(1))) {
+			mes "[Old Pharmacist]";
+			mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
+			close;
+		}
+		Zeny -= (.@amount*getarg(1));
+		delitem getarg(0),.@amount*2;
+		delitem 713,.@amount; //Empty_Bottle
+		getitem getarg(2),.@amount;
+		break;
+	case 3:
+		next;
 		mes "[Old Pharmacist]";
-		mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+		mes "What?!";
+		mes "Grrr...";
+		mes "Bleh!";
+		mes "Get lost!";
 		close;
+	}
+	mes "[Old Pharmacist]";
+	mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+	close;
 }
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index 30a4788a8..37c183600 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -5,13 +5,13 @@
 //===== Current Version: =====================================
 //= 1.2
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Turns arrows into Arrow Quivers.
-// Breakdown of Subroutine "S_BuyQuiver"
-// arg(0): Type of Arrow to be packaged (item ID)
-// arg(1): How many of each 'getarg(0)' arrow per quiver
-// arg(2): The cost of making a 'getarg(0)' quiver.
-// arg(3): The quiver given by the NPC. (item ID)
+//= Breakdown of Subroutine "S_BuyQuiver"
+//= arg(0): Type of Arrow to be packaged (item ID).
+//= arg(1): How many of each 'getarg(0)' arrow per quiver.
+//= arg(2): The cost of making a 'getarg(0)' quiver.
+//= arg(3): The quiver given by the NPC (item ID).
 //===== Additional Comments: =================================
 //= 07/06/05 : Added 1st Version. [Muad_Dib]
 //= Converted to rAthena format by Dr.Evil
@@ -19,18 +19,11 @@
 //= Fixed a few spelling errors. [Nexon]
 //= 1.1 Added Holy Arrow Quivers [Playtester]
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Removed "Holy Arrows" from the list.
+//=     Removed "Holy Arrows" from the list.
 //============================================================
 
-payon_in01,5,134,5	script	Inventor Jaax	89,{
-	if (checkweight(1201,1) == 0) {
-		mes "[Inventor Jaax]";
-		mes "Hey, you're carrying";
-		mes "way too much stuff. Why don't you stash it away in Kafra Storage? We can talk after you do that, right?";
-		close;
-	}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+payon_in01,5,134,5	script	Inventor Jaax	4_M_ORIENT02,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "[Inventor Jaax]";
 		mes "Hey, you're carrying";
 		mes "way too much stuff. Why don't you stash it away in Kafra Storage? We can talk after you do that, right?";
@@ -47,7 +40,7 @@ payon_in01,5,134,5	script	Inventor Jaax	89,{
 	mes "created something";
 	mes "truly extraordinary. I call them... ^663300Magic Quivers^000000 !! This will be remembered in history as an";
 	mes "arrow revolution!";
-	Emotion e_no1;
+	emotion e_no1;
 	next;
 	mes "[Inventor Jaax]";
 	mes "I've studied magic and quivers for years, working night and day until I finally figured how to condense arrows with magic! With magic quivers, you'll be carrying more arrows, but with less weight!";
@@ -76,7 +69,7 @@ payon_in01,5,134,5	script	Inventor Jaax	89,{
 	//close;
 
 S_BuyQuiver:
-	if (countitem(getarg(0)) > 499) {
+	if (countitem(getarg(0)) >= getarg(1)) {
 		mes "[Inventor Jaax]";
 		mes "Excellent!";
 		mes "Are you carrying any Arrows with you? I'll provide you with a quiver that can carry "+getarg(1)+" of your "+getitemname(getarg(0))+"s for only ^FF3131"+getarg(2)+" Zeny^000000.";
@@ -105,7 +98,7 @@ S_BuyQuiver:
 					mes "[Inventor Jaax]";
 					mes "There you go!";
 					mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000.";
-					set zeny,zeny-.@arrow_zeny01;
+					Zeny -= .@arrow_zeny01;
 					delitem getarg(0),.@arrows_used; //Arrow
 					getitem getarg(3),.@quiver; //Quiver
 					next;
@@ -131,11 +124,11 @@ S_BuyQuiver:
 			mes "a quiver is so close?";
 			close;
 		case 2:
-			if (zeny > getarg(2)) {
+			if (Zeny > getarg(2)) {
 				mes "[Inventor Jaax]";
 				mes "There you go!";
 				mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000.";
-				set zeny,zeny-getarg(2);
+				Zeny -= getarg(2);
 				delitem getarg(0),getarg(1); //Arrow
 				getitem getarg(3),1; //Quiver
 				next;
@@ -166,11 +159,11 @@ S_BuyQuiver:
 	}
 	else {
 		mes "[Inventor Jaax]";
-		mes "You can carry a maximum of 500 Arrows within this quiver. It was made using my secret method,";
+		mes "You can carry a maximum of "+getarg(1)+" Arrows within this quiver. It was made using my secret method,";
 		mes "so the total weight of the Arrows and Quiver is less than carrying the Arrows alone.";
 		next;
 		mes "[Inventor Jaax]";
-		mes "It's a miracle of science! One that you can experience for yourself if you bring me at least 500 Arrows and 500 Zeny for each Quiver.";
+		mes "It's a miracle of science! One that you can experience for yourself if you bring me at least "+getarg(1)+" Arrows and "+getarg(2)+" Zeny for each Quiver.";
 		close;
 	}
 }
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index da51dee3d..823fbea66 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -3,45 +3,43 @@
 //===== By: ==================================================
 //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5)
 //===== Current Version: =====================================
-//= 3.2a
-//===== Compatible With: =====================================
-//= Hercules Git
+//= 3.3
 //===== Description: =========================================
 //= Refining NPCs and Metal Salesmen.
 //===== Additional Comments: =================================
-//= 1.0 - by A bunch of people!
-//=       Syrus22 - Completely redid the script using functions... also
-//=       added the option for auto safe refining and multiple refining.
-//= 1.1 - Negative input bug fixed [Lupus]
-//= 1.2 - Added additional reparimen in morroc and payon. Added
-//=       Christopher the blacksmith in Geffen. Edited some dialogue [kobra_k88]
-//= 1.3 - New Payon Locations [Darkchild]
-//=       Corrected zeny subtraction thx to jpnmania77.[kobra_k88]
-//= 1.3a - Temporary corrected an exploit. Need to check sources
-//=        to fully fix bug [Shinigami]
-//=        Fixed repairman prices [shadowlady]
-//=        Fixed bug that skips requirements thanks to sir_loon [massdriller]
-//=        Fixed itemid error thanks to -Vitamin- [massdriller]
-//= 1.4 - check again item in refining procedure to avoid
-//=        hacker that can change item [dafide18]
-//= 1.5 - Fixed crashing due to badly used callfunc's [Skotlex]
-//        Lupus, don't rollback this important fix again! >.<
-//= 1.5a - Corrected an unneeded callfunc, fixed the anti-bot 
-//=       exploit ruining the safe refine loop. [Skotlex]
-//= 1.5b - Fixed Spelling mistakes. [Nexon] 
-//= 1.6	- Replaced all breaks for ends as per the new script engine [Skotlex]
-//= 1.7 - Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3]
-//= 1.8 - Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3]
-//= 1.8a - Fixed wrong indication thanks to NeoSaro [Lupus]
-//= 1.9 - Rewrote repairman, removed the Steel from repair cost [DracoRPG]
-//= 2.0 - Fixed missed equppment presence check. Thx2 Coltaro [Lupus]
-//= 2.0a - Added weight checks thanks to Neouni [Playtester]
-//= 2.0b - Fixed the names of Lighthalzen and Einbroch refiners thanks to Maud_Dib [Kargha]
-//= 2.1 - Removed Duplicates [Silent]
-//= 2.2 - Changed name from "Emvertacon" to "Emveretarcon". [Samuray22]
-//	- Thanks to Barron-Monster.
-//= 2.2b - Changed name from "Pharacon" to "Phracon". [Samuray22]
-//	- Thanks to Barron-Monster.
+//= 1.0 by A bunch of people!
+//=     Syrus22 - Completely redid the script using functions... also
+//=     added the option for auto safe refining and multiple refining.
+//= 1.1 Negative input bug fixed [Lupus]
+//= 1.2 Added additional reparimen in morroc and payon. Added
+//=     Christopher the blacksmith in Geffen. Edited some dialogue [kobra_k88]
+//= 1.3 New Payon Locations [Darkchild]
+//=     Corrected zeny subtraction thx to jpnmania77.[kobra_k88]
+//= 1.3a Temporary corrected an exploit. Need to check sources
+//=     to fully fix bug [Shinigami]
+//=     Fixed repairman prices [shadowlady]
+//=     Fixed bug that skips requirements thanks to sir_loon [massdriller]
+//=     Fixed itemid error thanks to -Vitamin- [massdriller]
+//= 1.4 check again item in refining procedure to avoid
+//=     hacker that can change item [dafide18]
+//= 1.5 Fixed crashing due to badly used callfunc's [Skotlex]
+//=     Lupus, don't rollback this important fix again! >.<
+//= 1.5a Corrected an unneeded callfunc, fixed the anti-bot
+//=     exploit ruining the safe refine loop. [Skotlex]
+//= 1.5b Fixed Spelling mistakes. [Nexon]
+//= 1.6 Replaced all breaks for ends as per the new script engine [Skotlex]
+//= 1.7 Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3]
+//= 1.8 Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3]
+//= 1.8a Fixed wrong indication thanks to NeoSaro [Lupus]
+//= 1.9 Rewrote repairman, removed the Steel from repair cost [DracoRPG]
+//= 2.0 Fixed missed equppment presence check. Thx2 Coltaro [Lupus]
+//= 2.0a Added weight checks thanks to Neouni [Playtester]
+//= 2.0b Fixed the names of Lighthalzen and Einbroch refiners thanks to Maud_Dib [Kargha]
+//= 2.1 Removed Duplicates [Silent]
+//= 2.2 Changed name from "Emvertacon" to "Emveretarcon". [Samuray22]
+//=     Thanks to Barron-Monster.
+//= 2.2b Changed name from "Pharacon" to "Phracon". [Samuray22]
+//=     Thanks to Barron-Monster.
 //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.4 Updated Refiner function. cleaner, and less dated. [L0ne_w0lf]
 //= 2.5 Rather large update to the refiner and merchants. :D [L0ne_W0lf]
@@ -56,15 +54,16 @@
 //= 2.8a Small bugfix. (bugreport:2418) [Paradox924X]
 //= 2.9 Moved Morroc repairman to Morroc Ruins. [L0ne_W0lf]
 //= 3.0 Updated several NPC names and locations. [Xantara]
-//		Added WoE map Refiners.
+//=     Added WoE map Refiners.
 //= 3.1 Added the new refinement & Ore creation NPC's for +11 and above Refinement. [Masao]
 //= 3.2 Moved some scripts to Renewal file, other minor changes. [Euphy]
 //= 3.2a Added 'disable_items' command. [Euphy]
+//= 3.3 Some official script updates. [Euphy]
 //============================================================
 
 // Christopher: Geffen Blacksmith
 //============================================================
-geffen_in,110,172,0	script	Christopher#1	63,{
+geffen_in,110,172,0	script	Christopher#1	1_M_SMITH,{
 	mes "[Christopher Guillenrow]";
 	mes "Welcome to Christopher's Workshop. Ye can get all yer stuff for forging here. What business";
 	mes "brings ye to me?";
@@ -82,7 +81,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 986,1; // Anvil
-			set Zeny,Zeny-30000;
+			Zeny -= 30000;
 			mes "[Christopher Guillenrow]";
 			mes "This is the cheapest one, but efficient enough to forge most items. Thank ye fer shopping at me workshop.  Feel free to come anytime, whenever ye need.";
 			close;
@@ -93,7 +92,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 987,1; // Oridecon_Anvil
-			set Zeny,Zeny-120000;
+			Zeny -= 120000;
 			mes "[Christopher Guillenrow]";
 			mes "Aye, friend ye have an eye for the anvil. This must be the proper anvil for a Blacksmith, eh? Thank ye fer shopping at me workshop.  Feel free to come anytime, whenever ye need.";
 			close;
@@ -104,7 +103,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 988,1; // Golden_Anvil
-			set Zeny,Zeny-300000;
+			Zeny -= 300000;
 			mes "[Christopher Guillenrow]";
 			mes "This one is the best among all me stuffs in me workshop! With this, ye can rule the Blacksmith world! Thank ye fer shopping at me workshop.  Feel free to come anytime, whenever ye need.";
 			close;
@@ -157,7 +156,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 612,.@input; // Portable_Furnace
-			set Zeny,Zeny-.@sell;
+			Zeny -= .@sell;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -168,7 +167,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 613,1; // Iron_Hammer
-			set Zeny,Zeny-1000;
+			Zeny -= 1000;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -179,7 +178,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 614,1; // Golden_Hammer
-			set Zeny,Zeny-3000;
+			Zeny -= 3000;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -190,7 +189,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 615,1; // Oridecon_Hammer
-			set Zeny,Zeny-5000;
+			Zeny -= 5000;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -238,7 +237,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 1010,.@input; // Phracon
-			set Zeny,Zeny-.@sell;
+			Zeny -= .@sell;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -276,7 +275,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 1011,.@input; // Emveretarcon
-			set Zeny,Zeny-.@sell;
+			Zeny -= .@sell;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need, whenever ye want.";
 			close;
@@ -330,13 +329,13 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 
 // Paul Spanner: Einbroch Blacksmith Supplier
 //============================================================
-ein_in01,38,29,0	script	Paul Spanner	63,{
+ein_in01,38,29,0	script	Paul Spanner	1_M_SMITH,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[Paul Spanner]";
@@ -352,37 +351,37 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 		next;
 		switch(select("Anvil - 30,000z.:Oridecon Anvil - 120,000z.:Golden Anvil - 300,000z.:I need a better anvil.:Cancel.")) {
 		case 1:
-			if (zeny < 30000) {
+			if (Zeny < 30000) {
 				mes "[Paul Spanner]";
 				mes "With that much of money, you cannot even buy a toy anvil!";
 				close;
 			}
 			getitem 986,1; //Anvil
-			set zeny,zeny-30000;
+			Zeny -= 30000;
 			mes "[Paul Spanner]";
 			mes "It is the cheapest anvil which has the most basic ability.";
 			mes "Thank you for using my shop. If you need anything, just let me know.";
 			close;
 		case 2:
-			if (zeny < 120000) {
+			if (Zeny < 120000) {
 				mes "[Paul Spanner]";
 				mes "With that much of money, you cannot even buy a toy anvil!";
 				close;
 			}
 			getitem 987,1; //Oridecon_Anvil
-			set zeny,zeny-120000;
+			Zeny -= 120000;
 			mes "[Paul Spanner]";
 			mes "Ah, you have an eye for anvil. A Blacksmith needs an anvil at least as good as this.";
 			mes "Thank you for using my shop. If you need anything, just let me know.";
 			close;
 		case 3:
-			if (zeny < 300000) {
+			if (Zeny < 300000) {
 				mes "[Paul Spanner]";
 				mes "With that much of money, you cannot even buy a toy anvil!";
 				close;
 			}
 			getitem 988,1; //Golden_Anvil
-			set zeny,zeny-300000;
+			Zeny -= 300000;
 			mes "[Paul Spanner]";
 			mes "I can tell your ambition to become a good Blacksmith just by looking at you to choose this Golden Anvil!";
 			mes "This anvil will surely aid you in creating the best weapons.";
@@ -451,7 +450,7 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 			}
 		}
 		set .@sell,.@input * .@item_cost;
-		if (zeny < .@sell) {
+		if (Zeny < .@sell) {
 			mes "[Paul Spanner]";
 			mes "You don't have enough money. Sorry, I cannot sell them at a loss.";
 			close;
@@ -461,7 +460,7 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 			mes "Hey, you look pale. Why don't you go lighten your weight first.";
 			close;
 		}
-		set zeny,zeny-.@sell;
+		Zeny -= .@sell;
 		getitem .@item,.@input;
 		mes "[Paul Spanner]";
 		mes "Thank you for using my shop. If you need anything, just let me know.";
@@ -505,7 +504,7 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 			}
 		}
 		set .@sell,.@input * .@item_price;
-		if (zeny < .@sell) {
+		if (Zeny < .@sell) {
 			mes "[Paul Spanner]";
 			mes "You don't have enough money. Sorry, I cannot sell them at a loss.";
 			close;
@@ -516,7 +515,7 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 			close;
 		}
 		getitem .@item,.@input;
-		set zeny,zeny-.@sell;
+		Zeny -= .@sell;
 		mes "[Paul Spanner]";
 		mes "Thank you for using my shop. If you need anything, just let me know.";
 		close;
@@ -566,31 +565,31 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 
 // Weapon/Armor Refiners
 //============================================================
-prt_in,63,60,0	script	Hollgrehenn	85,{
+prt_in,63,60,0	script	Hollgrehenn	4_M_03,{
 	callfunc "refinemain","Hollgrehenn",0;
 	end;
 }
-morocc_in,73,38,6	script	Aragham	99,{
+morocc_in,73,38,6	script	Aragham	4W_M_03,{
 	callfunc "refinemain","Aragham",0;
 	end;
 }
-payon,144,173,5	script	Antonio	88,{
+payon,144,173,5	script	Antonio	4_M_ORIENT01,{
 	callfunc "refinemain","Antonio",0;
 	end;
 }
-alberta_in,28,58,0	script	Fredrik	85,{
+alberta_in,28,58,0	script	Fredrik	4_M_03,{
 	callfunc "refinemain","Fredrik",0;
 	end;
 }
-yuno_in01,171,21,4	script	Lambert	88,{
+yuno_in01,171,21,4	script	Lambert	4_M_ORIENT01,{
 	callfunc "refinemain","Lambert",0;
 	end;
 }
-ein_in01,24,87,5	script	Manthasman	826,{
+ein_in01,24,87,5	script	Manthasman	4_M_DWARF,{
 	callfunc "refinemain","Manthasman Pruhag",0;
 	end;
 }
-lhz_in02,282,20,7	script	Fulerr	869,{
+lhz_in02,282,20,7	script	Fulerr	4_M_LGTMAN,{
 	callfunc "refinemain","Fulerr",0;
 	end;
 }
@@ -615,12 +614,20 @@ function	script	refinemain	{
 	setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 	set .@menu$,"";
 	for(set .@i,1; .@i<=10; set .@i,.@i+1) {
-		if(getequipisequiped(.@i))
+		if(getequipisequiped(.@i)) {
 			set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
+			set .@equipped,1;
+		}
 		set .@menu$, .@menu$ + ":";
 	}
-	set .@part,select(.@menu$);
-	if(!getequipisequiped(.@part)) {
+	if (.@equipped == 0) {
+		mes "[" + getarg(0) + "]";
+		mes "I don't think I can refine any items you have...";
+		close;
+	}
+	set .@part, select(.@menu$);
+
+	if(!getequipisequiped(.@part)) { //custom check
 		mes "[" + getarg(0) + "]";
 		mes "You're not wearing";
 		mes "anything there that";
@@ -635,16 +642,6 @@ function	script	refinemain	{
 		mes "refine this item at all...";
 		close;
 	}
-	//Check if the item is identified... (Don't know why this is in here... but kept it anyway)
-	if(!getequipisidentify(.@part)) {
-		mes "[" + getarg(0) + "]";
-		mes "You can't refine this";
-		mes "if you haven't appraised";
-		mes "it first. Make sure your";
-		mes "stuff is identified before";
-		mes "I can refine it.";
-		close;
-	}
 	//Check to see if the items is already +10
 	if(getequiprefinerycnt(.@part) >= 10) {
 		mes "[" + getarg(0) + "]";
@@ -664,27 +661,27 @@ function	script	refinemain	{
 	case 1: 	//Refine Level 1 Weapon
 		set .@price,50;
 		set .@material,1010;
-		set .@safe,7; 
+		set .@safe,7;
 		break;
 	case 2: 	//Refine Level 2 Weapon
 		set .@price,200;
 		set .@material,1011;
-		set .@safe,6; 
+		set .@safe,6;
 		break;
 	case 3: 	//Refine Level 3 Weapon
 		set .@price,5000;
 		set .@material,984;
-		set .@safe,5; 
+		set .@safe,5;
 		break;
 	case 4: 	//Refine Level 4 Weapon
 		set .@price,20000;
 		set .@material,984;
-		set .@safe,4; 
+		set .@safe,4;
 		break;
 	case 5: 	//Refine other stuff?
 		set .@price,2000;
 		set .@material,985;
-		set .@safe,4; 
+		set .@safe,4;
 		break;
 	}
 	if(.@features != 1) {
@@ -738,8 +735,10 @@ function	script	refinemain	{
 			mes "here all day if you need me.";
 			close;
 		}
-		set Zeny,Zeny-.@price;
+		Zeny -= .@price;
 		delitem .@material,1;
+
+		//custom checks
 		if(getequipisequiped(.@part) == 0) { // hacker has removed the item (not changed, why?)
 			mes "[" + getarg(0) + "]";
 			mes "Look here... you don't have any Items on...";
@@ -753,6 +752,7 @@ function	script	refinemain	{
 			mes "You switched the item while I wasn't looking! Get out of here!";
 			close;
 		}
+
 		if(getequippercentrefinery(.@part) <= rand(100)) {
 			failedrefitem .@part;
 			mes "[" + getarg(0) + "]";
@@ -809,7 +809,7 @@ function	script	refinemain	{
 	} else
 		set .@menu2,2;
 	switch(.@menu2){
-	case 1: 
+	case 1:
 		set .@refinecnt,.@safe - getequiprefinerycnt(.@part);
 		break;
 	case 2:
@@ -856,7 +856,7 @@ function	script	refinemain	{
 		mes "Is that all you got? Unfortunately I can't work for you at a lower price. Try putting yourself in my shoes.";
 		close;
 	}
-	set Zeny,Zeny - .@fullprice;
+	Zeny -= .@fullprice;
 	delitem .@material,.@refinecnt;
 	while(.@refinecnt){
 		if (getequipisequiped(.@part) == 0) {
@@ -870,7 +870,7 @@ function	script	refinemain	{
 			mes "You changed it...";
 			mes "Get out before I stun you with my Hammer!!";
 			close;
-		} 
+		}
 		mes "Clang, clang!!!";
 		if(.@menu2 == 2 && getequippercentrefinery(.@part) <= rand(100)) {
 			failedrefitem .@part;
@@ -882,7 +882,7 @@ function	script	refinemain	{
 			mes "Here's the unused Zeny and materials back...";
 			getitem .@material,.@refinecnt;
 			set .@fullprice,.@refinecnt * .@price;
-			set Zeny,Zeny + .@fullprice;
+			Zeny += .@fullprice;
 			close;
 		}
 		successrefitem .@part;
@@ -897,31 +897,31 @@ function	script	refinemain	{
 
 // Material Salesmen
 //============================================================
-prt_in,56,68,5	script	Vurewell	86,{
+prt_in,56,68,5	script	Vurewell	4_M_04,{
 	callfunc "phramain","Vurewell";
 	end;
 }
-payon,145,178,3	script	Begnahd	88,{
+payon,145,178,3	script	Begnahd	4_M_ORIENT01,{
 	callfunc "phramain","Begnahd";
 	end;
 }
-morocc_in,63,32,6	script	Sade	99,{
+morocc_in,63,32,6	script	Sade	4W_M_03,{
 	callfunc "phramain","Sade";
 	end;
 }
-alberta_in,13,71,3	script	Kahlamanlith	86,{
+alberta_in,13,71,3	script	Kahlamanlith	4_M_04,{
 	callfunc "phramain","Kahlamanlith";
 	end;
 }
-yuno_in01,171,27,4	script	Dilemma	88,{
+yuno_in01,171,27,4	script	Dilemma	4_M_ORIENT01,{
 	callfunc "phramain","Dilemma";
 	end;
 }
-ein_in01,15,87,3	script	Tirehaus	86,{
+ein_in01,15,87,3	script	Tirehaus	4_M_04,{
 	callfunc "phramain","Tirehaus";
 	end;
 }
-lhz_in02,278,24,3	script	Krugg	86,{
+lhz_in02,278,24,3	script	Krugg	4_M_04,{
 	callfunc "phramain","Krugg";
 	end;
 }
@@ -934,7 +934,7 @@ function	script	phramain	{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[" + getarg(0) + "]";
@@ -1000,7 +1000,7 @@ function	script	phramain	{
 		close;
 	}
 	getitem .@material,.@input;
-	set Zeny,Zeny-.@sell;
+	Zeny -= .@sell;
 	mes "[" + getarg(0) + "]";
 	mes "Here you are!";
 	mes "Thank you for";
@@ -1010,31 +1010,31 @@ function	script	phramain	{
 
 // Ori/Elu Refiners
 //============================================================
-prt_in,63,69,3	script	Dietrich	84,{
+prt_in,63,69,3	script	Dietrich	4_M_02,{
 	callfunc "orimain","Dietrich";
 	end;
 }
-payon,137,178,5	script	Hakhim	88,{
+payon,137,178,5	script	Hakhim	4_M_ORIENT01,{
 	callfunc "orimain","Hakhim";
 	end;
 }
-morocc_in,72,32,6	script	Abdula	99,{
+morocc_in,72,32,6	script	Abdula	4W_M_03,{
 	callfunc "orimain","Abdula";
 	end;
 }
-alberta_in,21,63,5	script	Xenophon	84,{
+alberta_in,21,63,5	script	Xenophon	4_M_02,{
 	callfunc "orimain","Xenophon Zolotas";
 	end;
 }
-yuno_in01,164,27,4	script	Delight	88,{
+yuno_in01,164,27,4	script	Delight	4_M_ORIENT01,{
 	callfunc "orimain","Delight";
 	end;
 }
-ein_in01,18,82,6	script	Matestein	84,{
+ein_in01,18,82,6	script	Matestein	4_M_02,{
 	callfunc "orimain","Matestein";
 	end;
 }
-lhz_in02,281,24,5	script	Fruel	84,{
+lhz_in02,281,24,5	script	Fruel	4_M_02,{
 	callfunc "orimain","Fruel";
 	end;
 }
@@ -1047,7 +1047,7 @@ function	script	orimain	{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[" + getarg(0) + "]";
@@ -1110,72 +1110,72 @@ function	script	orimain	{
 
 // Equipment Repairmen
 //============================================================
-alberta_in,31,65,4	script	Repairman#alb	86,{
+alberta_in,31,65,4	script	Repairman#alb	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-moc_ruins,107,94,4	script	Repairman#moc	99,{
+moc_ruins,107,94,4	script	Repairman#moc	4W_M_03,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-payon,143,165,4	script	Repairman#pay	88,{
+payon,143,165,4	script	Repairman#pay	4_M_ORIENT01,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-prt_in,63,54,2	script	Repairman#prt	86,{
+prt_in,63,54,2	script	Repairman#prt	4_M_04,{
 	callfunc "repairmain","Grendal";
 	end;
 }
 
-yuno_in01,175,28,3	script	Repairman#juno	86,{
+yuno_in01,175,28,3	script	Repairman#juno	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-geffen_in,34,166,3	script	Repairman#gef	99,{
+geffen_in,34,166,3	script	Repairman#gef	4W_M_03,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-aldeba_in,38,60,3	script	Repairman#alde	86,{
+aldeba_in,38,60,3	script	Repairman#alde	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-lhz_in02,284,14,3	script	Repairman#lhz	86,{
+lhz_in02,284,14,3	script	Repairman#lhz	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-prt_gld,139,117,4	script	Repairman#prt_gld	86,{
+prt_gld,139,117,4	script	Repairman#prt_gld	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-gef_fild13,263,117,4	script	Repairman#gef_fild	86,{
+gef_fild13,263,117,4	script	Repairman#gef_fild	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-pay_gld,295,183,4	script	Repairman#pay_gld	86,{
+pay_gld,295,183,4	script	Repairman#pay_gld	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-alde_gld,220,152,4	script	Repairman#alde_gld	86,{
+alde_gld,220,152,4	script	Repairman#alde_gld	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-aru_gld,189,336,4	script	Repairman#aru_gld	86,{
+aru_gld,189,336,4	script	Repairman#aru_gld	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
-sch_gld,340,80,7	script	Repairman#sch_gld	86,{
+sch_gld,340,80,7	script	Repairman#sch_gld	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
@@ -1238,7 +1238,7 @@ function	script	repairmain	{
 			}
 			set .@checkitem2,.@checkitem2-1;
 			if (.@checkitem == .@checkitem2) {
-				set zeny,zeny-.@totalcost;
+				Zeny -= .@totalcost;
 				while (.@checkitem) {
 					repair(.@checkitem);
 					set .@checkitem,.@checkitem-1;
@@ -1266,4 +1266,4 @@ function	script	repairmain	{
 		mes "items to repair.";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index 02afc4059..5944932e9 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Renters
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88, mod by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Knight and Crusader Peco Peco Breeders, Falcon Breeder scripts
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= Added another Falcon Master into the Hunters Guild [Lupus]
 //= 1.2: replaced checkoption(x) with checkriding,checkfalcon [Lupus]
@@ -22,10 +22,10 @@
 //= 2.0 Fixed problems with third classes and new mounts. [Euphy]
 //= 2.1 Moved some renters to a separate renewal file. [Daegaladh]
 //= 2.2 Added warg checks. [Euphy]
-//============================================================ 
+//============================================================
 
 // PecoPeco Breeder (for Knights)-------------------------------------------
-prontera,55,350,5	script	Peco Peco Breeder#knt	105,{
+prontera,55,350,5	script	Peco Peco Breeder#knt	8W_SOLDIER,{
 	if(Upper==0) set .@price,2500; //Normal Peco - default price
 	if(Upper==1) set .@price,2500; //Armored Peco
 	if(Upper==2) set .@price,2500; //Baby Peco
@@ -40,7 +40,7 @@ prontera,55,350,5	script	Peco Peco Breeder#knt	105,{
 		next;
 		switch(select("Rent Peco Peco:Cancel")) {
 		case 1:
-			if (zeny < .@price) {
+			if (Zeny < .@price) {
 				mes "[Peco Peco Breeder]";
 				mes "You do not";
 				mes "have enough zeny.";
@@ -68,7 +68,7 @@ prontera,55,350,5	script	Peco Peco Breeder#knt	105,{
 				mes "Please remove your cash mount.";
 				close;
 			}
-			set zeny,zeny-.@price;
+			Zeny -= .@price;
 			setriding;
 			close;
 		case 2:
@@ -88,7 +88,7 @@ prontera,55,350,5	script	Peco Peco Breeder#knt	105,{
 }
 
 // Grand PecoPeco Breeder (for Crusaders)-------------------------------------------
-prontera,232,318,3	script	Peco Peco Breeder#cru	105,{
+prontera,232,318,3	script	Peco Peco Breeder#cru	8W_SOLDIER,{
 	if(Upper==0) set .@price,3500; //Normal Peco - default price
 	if(Upper==1) set .@price,3500; //Armored Peco
 	if(Upper==2) set .@price,3500; //Baby Peco
@@ -104,7 +104,7 @@ prontera,232,318,3	script	Peco Peco Breeder#cru	105,{
 		next;
 		switch(select("Rent a PecoPeco:Quit")) {
 		case 1:
-			if (zeny < .@price) {
+			if (Zeny < .@price) {
 				mes "[Peco Peco Breeder]";
 				mes "You do not";
 				mes "have enough zeny.";
@@ -131,7 +131,7 @@ prontera,232,318,3	script	Peco Peco Breeder#cru	105,{
 				mes "Please remove your cash mount.";
 				close;
 			}
-			set zeny,zeny-.@price;
+			Zeny -= .@price;
 			setriding;
 			close;
 		case 2:
@@ -150,7 +150,7 @@ prontera,232,318,3	script	Peco Peco Breeder#cru	105,{
 }
 
 // Falcon Master--------------------------------------------------------------
-hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
+hu_in01,381,304,5	script	Falcon Breeder#hnt	8W_SOLDIER,{
 	if(Upper==0) set .@price,2500; //Normal Falcon - default price
 	if(Upper==1) set .@price,2500; //Scarf Falcon
 	if(Upper==2) set .@price,2500; //Baby Falcon
@@ -177,7 +177,7 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 				mes "until you dismiss your warg first!";
 				close;
 			}
-			if (zeny < .@price) {
+			if (Zeny < .@price) {
 				mes "[Falcon Breeder]";
 				mes "What is this?";
 				mes "You don't have";
@@ -205,7 +205,7 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 				mes "there, can't you see it?";
 				close;
 			}
-			set zeny,zeny-.@price;
+			Zeny -= .@price;
 			setfalcon;
 			close;
 		case 2:
@@ -224,4 +224,4 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 		mes "...Heh heh, jealous?";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index b9c47b659..0a0787600 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -1,18 +1,16 @@
 //===== Hercules Script ======================================
 //= Shops
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 3.4
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 3.5
+//===== Description: =========================================
 //= Town shop NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= For earlier update notes see the bottom.
 //= 2.0 updated several shop npcs. [L0ne_W0lf]
-//=	Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers.
-//=	Moved all Cooking related NPCs to their own section.
-//=	Re-alphabetized sections. Some of them were out of place.
-//=	Removed commented out shops.
+//=     Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers.
+//=     Moved all Cooking related NPCs to their own section.
+//=     Re-alphabetized sections. Some of them were out of place.
+//=     Removed commented out shops.
 //= 2.0b Einbech tool dealer got lost somewhere along the way, re-added. [L0ne_W0lf]
 //= 2.1 Fixed missing item from "Fresh Fish" from cooking addition shops. [L0ne_W0lf]
 //= 2.1a Fixed the second "Line" selling in Comodo Weapon shop. (Should have been Whip) [L0ne_W0lf]
@@ -35,299 +33,2177 @@
 //= 3.1 Moved some merchants to a separate renewal file. [Kenpachi]
 //= 3.2 Added Missing Items to the pet Groomers in prontera, payon, and yuno. BugReport:6680[Spre]
 //= 3.3 Moved more shops to Renewal file. [Euphy]
-//= 3.4 Removed some Izlude shops [Streusel]
-//============================================================ 
+//= 3.4 Moved Izlude shops to pre-re/re paths. [Streusel]
+//= 3.5 Converted to trader format [Yommy]
+//============================================================
 
 //=======================================================
 // Alberta
 //=======================================================
-alb2trea,87,65,5	shop	Tool Dealer#alb	83,1750:-1,1751:-1,1752:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1
-alberta_in,165,96,0	shop	Item Collector#alb	74,911:-1,528:-1
-alberta_in,182,97,0	shop	Tool Dealer#alb2	73,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2243:-1
-alberta_in,180,15,0	shop	Armor Dealer#alb	101,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2203:-1,2201:-1,2205:-1,2226:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1
-alberta_in,188,21,0	shop	Weapon Dealer#alb	49,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
-alberta_in,175,97,4	shop	Weapon Dealer#alb2	82,1146:-1,1245:-1
-alberta_in,176,81,3	shop	Trading Merchant#alb	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
+alb2trea,87,65,5	trader	Tool Dealer#alb	4_M_01,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Fire_Arrow;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+}
+
+alberta_in,165,96,0	trader	Item Collector#alb	1_F_MERCHANT_02,{
+OnInit:
+	sellitem Scell;
+	sellitem Monster's_Feed;
+}
+
+alberta_in,182,97,0	trader	Tool Dealer#alb2	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Spinning_Eyes;
+}
+
+alberta_in,180,15,0	trader	Armor Dealer#alb	4W_F_01,{
+OnInit:
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Boots;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Manteau;
+	sellitem Glasses;
+	sellitem Sunglasses;
+	sellitem Diver's_Goggles;
+	sellitem Cap;
+	sellitem Cotton_Shirt;
+	sellitem Leather_Jacket;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Wooden_Mail;
+	sellitem Silver_Robe;
+	sellitem Mantle;
+	sellitem Coat;
+	sellitem Padded_Armor;
+	sellitem Chain_Mail;
+	sellitem Novice_Armlet;
+}
+
+alberta_in,188,21,0	trader	Weapon Dealer#alb	1_M_03,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Sword;
+	sellitem Falchion;
+	sellitem Blade;
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Rod;
+	sellitem Bow;
+	sellitem Axe;
+	sellitem Battle_Axe;
+	sellitem Hammer;
+	sellitem Buster;
+	sellitem Two_Handed_Axe;
+}
+
+alberta_in,175,97,4	trader	Weapon Dealer#alb2	4_KID01,{
+OnInit:
+	sellitem Town_Sword;
+	sellitem Cinquedea;
+}
+
+alberta_in,176,81,3	trader	Trading Merchant#alb	4_M_HUMERCHANT,{
+OnInit:
+	sellitem Bullet;
+	sellitem Silver_Bullet;
+	sellitem Shell_Of_Blood;
+	sellitem Branch;
+	sellitem Crimson_Bolt;
+	sellitem The_Cyclone;
+	sellitem Rolling_Stone;
+	sellitem Black_Rose;
+	sellitem Long_Barrel;
+	sellitem Jungle_Carbine;
+	sellitem Thunder_P;
+}
+
 
 //=======================================================
 // Al De Baran
 //=======================================================
-aldeba_in,20,60,0	shop	Armor Dealer#alde	101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1,2628:-1,2627:-1
-aldeba_in,28,54,0	shop	Weapon Dealer#alde	49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1
-aldeba_in,22,47,4	shop	Weapon Dealer#alde2	713,1146:-1,1245:-1
-aldeba_in,94,56,5	shop	Tool Dealer#alde	83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1
-alde_alche,38,184,3	shop	Material Seller#alche	755,7143:-1,7141:-1,7140:-1,6248:-1,6250:-1,6251:-1,6255:-1,6261:-1,6262:-1,6297:-1
+aldeba_in,20,60,0	trader	Armor Dealer#alde	4W_F_01,{
+OnInit:
+	sellitem Helm;
+	sellitem Buckler;
+	sellitem Shield;
+	sellitem Mantle;
+	sellitem Coat;
+	sellitem Padded_Armor;
+	sellitem Chain_Mail;
+	sellitem Plate_Armor;
+	sellitem Manteau;
+	sellitem Boots;
+	sellitem Novice_Armlet;
+	sellitem Belt;
+}
+
+aldeba_in,28,54,0	trader	Weapon Dealer#alde	1_M_03,{
+OnInit:
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Dirk;
+	sellitem Dagger;
+	sellitem Stiletto;
+	sellitem Gladius;
+	sellitem Damascus;
+}
+
+aldeba_in,22,47,4	trader	Weapon Dealer#alde2	4_M_06,{
+OnInit:
+	sellitem Town_Sword;
+	sellitem Cinquedea;
+}
+
+aldeba_in,94,56,5	trader	Tool Dealer#alde	4_M_01,{
+OnInit:
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Spectacles;
+	sellitem Leaf_Of_Yggdrasil;
+}
+
+alde_alche,38,184,3	trader	Material Seller#alche	4_M_SAGE_C,{
+OnInit:
+	sellitem Life_Force_Pot;
+	sellitem Yggdrasilberry_Dew;
+	sellitem Seed_Of_Life;
+	sellitem Melange_Pot;
+	sellitem Cooking_Skewer;
+	sellitem Black_Charcoal;
+	sellitem Large_Cookpot;
+	sellitem Fine_Noodle;
+	sellitem Cool_Gravy;
+	sellitem Bottle_To_Throw;
+}
+
 
 //=======================================================
 // Amatsu
 //=======================================================
-ama_in01,89,28,5	shop	Armor Dealer#ama	757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
-ama_in01,102,28,3	shop	Weapon Dealer#ama	766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-ama_in01,24,30,5	shop	Tool Dealer#ama	763,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+ama_in01,89,28,5	trader	Armor Dealer#ama	4_F_JPN2,{
+OnInit:
+	sellitem Bandana;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+	sellitem Wooden_Mail;
+	sellitem Belt;
+}
+
+ama_in01,102,28,3	trader	Weapon Dealer#ama	4_M_JPNOJI,{
+OnInit:
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+}
+
+ama_in01,24,30,5	trader	Tool Dealer#ama	4_M_JPN,{
+OnInit:
+	sellitem Arrow;
+	sellitem Iron_Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+}
+
 // Ninja Shops
-que_ng,72,31,2	shop	Boonji#nin	83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1
-que_ng,73,26,5	shop	Boonray#nin	83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1
+que_ng,72,31,2	trader	Boonji#nin	4_M_01,{
+OnInit:
+	sellitem Shuriken;
+	sellitem Nimbus_Shuriken;
+	sellitem Flash_Shuriken;
+	sellitem Sharp_Leaf_Shuriken;
+	sellitem Thorn_Needle_Shuriken;
+}
+
+que_ng,73,26,5	trader	Boonray#nin	4_M_01,{
+OnInit:
+	sellitem Arm_Guard;
+	sellitem Flame_Stone;
+	sellitem Ice_Stone;
+	sellitem Wind_Stone;
+	sellitem Shadow_Orb;
+}
+
 
 //=======================================================
 // Ayothaya
 //=======================================================
-ayo_in01,18,182,1	shop	Tool Dealer#ayo	840,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-ayo_in01,90,192,3	shop	Weapon Dealer#ayo	843,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-ayo_in01,90,160,1	shop	Armor Dealer#ayo	842,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+ayo_in01,18,182,1	trader	Tool Dealer#ayo	4_F_THAISHAMAN,{
+OnInit:
+	sellitem Arrow;
+	sellitem Iron_Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+}
+
+ayo_in01,90,192,3	trader	Weapon Dealer#ayo	4_M_THAIONGBAK,{
+OnInit:
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+}
+
+ayo_in01,90,160,1	trader	Armor Dealer#ayo	4_M_THAIOLD,{
+OnInit:
+	sellitem Bandana;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+	sellitem Wooden_Mail;
+	sellitem Belt;
+}
+
 
 //=======================================================
 // Brasilis
 //=======================================================
-brasilis,252,257,3	shop	Tool Dealer#bra	478,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
-brasilis,244,243,3	shop	Weapon Dealer#bra	477,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
-brasilis,201,309,3	shop	Pet Groomer#bra	476,537:-1,643:-1
-brasilis,221,128,3	shop	Fruit Gardener#bra	477,11515:-1,513:-1,11516:-1
+brasilis,252,257,3	trader	Tool Dealer#bra	4_F_BRZ_WOMAN,{
+OnInit:
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Spectacles;
+	sellitem Booby_Trap;
+	sellitem Leaf_Of_Yggdrasil;
+}
+
+brasilis,244,243,3	trader	Weapon Dealer#bra	4_M_BRZ_MAN2,{
+OnInit:
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+	sellitem Coward;
+}
+
+brasilis,201,309,3	trader	Pet Groomer#bra	4_M_BRZ_MAN1,{
+OnInit:
+	sellitem Pet_Food;
+	sellitem Pet_Incubator;
+}
+
+brasilis,221,128,3	trader	Fruit Gardener#bra	4_M_BRZ_MAN2,{
+OnInit:
+	sellitem Coconut;
+	sellitem Banana;
+	sellitem Asai_Fruit;
+}
+
 
 //=======================================================
 // Comodo
 //=======================================================
-cmd_in01,117,165,4	shop	Armor Dealer#cmd	101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1
-cmd_in01,128,165,2	shop	Weapon Dealer#cmd	49,1901:-1,1903:-1,1905:-1,1909:-1,1911:-1,1907:-1,1950:-1,1952:-1,1954:-1,1958:-1,1960:-1,1956:-1
-cmd_in01,79,182,5	shop	Tool Dealer#cmd	83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,611:-1,1065:-1
-comodo,296,125,4	shop	Souvenir Vendor#cmd	101,965:-1,964:-1
-cmd_fild07,257,126,5	shop	Tool Dealer#cmd2	83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1
-cmd_fild07,250,98,2	shop	Weapon Dealer#cmd2	49,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
-cmd_fild07,277,85,4	shop	Armor Dealer#cmd2	101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1
+cmd_in01,117,165,4	trader	Armor Dealer#cmd	4W_F_01,{
+OnInit:
+	sellitem Cap;
+	sellitem Helm;
+	sellitem Buckler;
+	sellitem Shield;
+	sellitem Boots;
+	sellitem Muffler;
+	sellitem Manteau;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Mantle;
+	sellitem Coat;
+	sellitem Thief_Clothes;
+	sellitem Padded_Armor;
+	sellitem Chain_Mail;
+	sellitem Plate_Armor;
+}
+
+cmd_in01,128,165,2	trader	Weapon Dealer#cmd	1_M_03,{
+OnInit:
+	sellitem Violin;
+	sellitem Mandolin;
+	sellitem Lute;
+	sellitem Harp;
+	sellitem Guh_Moon_Goh;
+	sellitem Guitar;
+	sellitem Rope;
+	sellitem Line;
+	sellitem Wire;
+	sellitem Tail;
+	sellitem Whip;
+	sellitem Rante;
+}
+
+cmd_in01,79,182,5	trader	Tool Dealer#cmd	4_M_01,{
+OnInit:
+	sellitem Iron_Arrow;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Berserk_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Spectacles;
+	sellitem Booby_Trap;
+}
+
+comodo,296,125,4	trader	Souvenir Vendor#cmd	4W_F_01,{
+OnInit:
+	sellitem Clam_Shell;
+	sellitem Crap_Shell;
+}
+
+cmd_fild07,257,126,5	trader	Tool Dealer#cmd2	4_M_01,{
+OnInit:
+	sellitem Iron_Arrow;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Spectacles;
+	sellitem Booby_Trap;
+}
+
+cmd_fild07,250,98,2	trader	Weapon Dealer#cmd2	1_M_03,{
+OnInit:
+	sellitem Javelin;
+	sellitem Spear;
+	sellitem Pike;
+	sellitem Guisarme;
+	sellitem Glaive;
+	sellitem Partizan;
+	sellitem Trident;
+	sellitem Halberd;
+	sellitem Lance;
+}
+
+cmd_fild07,277,85,4	trader	Armor Dealer#cmd2	4W_F_01,{
+OnInit:
+	sellitem Cap;
+	sellitem Helm;
+	sellitem Buckler;
+	sellitem Shield;
+	sellitem Boots;
+	sellitem Muffler;
+	sellitem Manteau;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Mantle;
+	sellitem Coat;
+	sellitem Thief_Clothes;
+	sellitem Padded_Armor;
+	sellitem Chain_Mail;
+	sellitem Plate_Armor;
+}
+
 
 //=======================================================
 // Einbroch
 //=======================================================
-ein_in01,106,27,4	shop	One Hand Weapon Dealer	850,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1119:-1,1122:-1,1123:-1,1126:-1,1129:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1301:-1,1401:-1,1404:-1,1407:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1516:-1,1519:-1,1522:-1,1801:-1,1803:-1,1805:-1,1807:-1,1809:-1,1811:-1
-ein_in01,109,27,4	shop	Two Hand Weapon Dealer	850,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1351:-1,1354:-1,1357:-1,1360:-1,1410:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1250:-1,1252:-1,1254:-1
-ein_in01,119,26,4	shop	Weapon Dealer#ein	855,1247:-1,1248:-1,1249:-1,13000:-1
-ein_in01,189,15,1	shop	Tool Dealer#ein	850,1750:-1,1752:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-einbroch,138,66,4	shop	Flu Mask Dealer#ein	850,5114:-1,2218:-1
-einbroch,82,199,4	shop	Paddler#ein	855,512:-1,645:-1,1750:-1,501:-1
+ein_in01,106,27,4	trader	One Hand Weapon Dealer	4_F_EINWOMAN,{
+OnInit:
+	sellitem Sword;
+	sellitem Falchion;
+	sellitem Blade;
+	sellitem Lapier;
+	sellitem Scimiter;
+	sellitem Tsurugi;
+	sellitem Ring_Pommel_Saber;
+	sellitem Haedonggum;
+	sellitem Saber;
+	sellitem Flamberge;
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Dirk;
+	sellitem Dagger;
+	sellitem Stiletto;
+	sellitem Gladius;
+	sellitem Damascus;
+	sellitem Axe;
+	sellitem Javelin;
+	sellitem Spear;
+	sellitem Pike;
+	sellitem Club;
+	sellitem Mace;
+	sellitem Smasher;
+	sellitem Flail;
+	sellitem Morning_Star;
+	sellitem Sword_Mace;
+	sellitem Chain;
+	sellitem Stunner;
+	sellitem Waghnakh;
+	sellitem Knuckle_Duster;
+	sellitem Hora;
+	sellitem Fist;
+	sellitem Claw;
+	sellitem Finger;
+}
+
+ein_in01,109,27,4	trader	Two Hand Weapon Dealer	4_F_EINWOMAN,{
+OnInit:
+	sellitem Katana;
+	sellitem Slayer;
+	sellitem Bastard_Sword;
+	sellitem Two_Hand_Sword;
+	sellitem Broad_Sword;
+	sellitem Battle_Axe;
+	sellitem Hammer;
+	sellitem Buster;
+	sellitem Two_Handed_Axe;
+	sellitem Lance;
+	sellitem Guisarme;
+	sellitem Glaive;
+	sellitem Partizan;
+	sellitem Trident;
+	sellitem Halberd;
+	sellitem Jur;
+	sellitem Katar;
+	sellitem Jamadhar;
+}
+
+ein_in01,119,26,4	trader	Weapon Dealer#ein	4_M_EINMAN,{
+OnInit:
+	sellitem Kindling_Dagger;
+	sellitem Obsidian_Dagger;
+	sellitem Fisherman's_Dagger;
+	sellitem Jujube_Dagger;
+}
+
+ein_in01,189,15,1	trader	Tool Dealer#ein	4_F_EINWOMAN,{
+OnInit:
+	sellitem Arrow;
+	sellitem Fire_Arrow;
+	sellitem Silver_Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+}
+
+einbroch,138,66,4	trader	Flu Mask Dealer#ein	4_F_EINWOMAN,{
+OnInit:
+	sellitem Fedora;
+	sellitem Flu_Mask;
+}
+
+einbroch,82,199,4	trader	Paddler#ein	4_M_EINMAN,{
+OnInit:
+	sellitem Apple;
+	sellitem Center_Potion;
+	sellitem Arrow;
+	sellitem Red_Potion;
+}
+
 //Official Gunslingers shops.
-que_ng,179,91,3	shop	Chivas Lugal	900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
-que_ng,180,79,3	shop	Johnny Waiker	900,13200:-1,13201:-1,13202:-1
+que_ng,179,91,3	trader	Chivas Lugal	4_M_HUMERCHANT,{
+OnInit:
+	sellitem Branch;
+	sellitem Crimson_Bolt;
+	sellitem The_Cyclone;
+	sellitem Rolling_Stone;
+	sellitem Black_Rose;
+	sellitem Long_Barrel;
+	sellitem Jungle_Carbine;
+	sellitem Thunder_P;
+}
+
+que_ng,180,79,3	trader	Johnny Waiker	4_M_HUMERCHANT,{
+OnInit:
+	sellitem Bullet;
+	sellitem Silver_Bullet;
+	sellitem Shell_Of_Blood;
+}
+
 
 //=======================================================
 // Geffen
 //=======================================================
-geffen_in,26,178,4	shop	Armor Dealer#gef	66,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1
-geffen_in,30,178,4	shop	Weapon Dealer#gef2	47,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1
-geffen_in,22,171,7	shop	Weapon Dealer#gef	84,1146:-1,1245:-1
-geffen_in,74,144,0	shop	Trader#gef	66,911:-1,910:-1,912:-1
-geffen_in,77,167,0	shop	Tool Dealer#gef	68,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2241:-1
-geffen_in,77,173,0	shop	Magical Item Seller#gef	64,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
-geffen_in,171,123,4	shop	Tool Dealer#gef2	64,1092:-1,1093:-1
-geffen,193,152,4	shop	Pet Groomer#gef	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+geffen_in,26,178,4	trader	Armor Dealer#gef	1_F_01,{
+OnInit:
+	sellitem Novice_Armlet;
+	sellitem Guard;
+	sellitem Mirror_Shield;
+	sellitem Sandals;
+	sellitem Hood;
+	sellitem Gemmed_Sallet;
+	sellitem Cotton_Shirt;
+	sellitem Leather_Jacket;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+}
+
+geffen_in,30,178,4	trader	Weapon Dealer#gef2	1_M_01,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Sword;
+	sellitem Bow;
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Dirk;
+	sellitem Dagger;
+	sellitem Stiletto;
+	sellitem Rod;
+	sellitem Wand;
+	sellitem Staff;
+	sellitem Arc_Wand;
+}
+
+geffen_in,22,171,7	trader	Weapon Dealer#gef	4_M_02,{
+OnInit:
+	sellitem Town_Sword;
+	sellitem Cinquedea;
+}
+
+geffen_in,74,144,0	trader	Trader#gef	1_F_01,{
+OnInit:
+	sellitem Scell;
+	sellitem Garlet;
+	sellitem Zargon;
+}
+
+geffen_in,77,167,0	trader	Tool Dealer#gef	1_F_03,{
+OnInit:
+	sellitem Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Granpa_Beard;
+}
+
+geffen_in,77,173,0	trader	Magical Item Seller#gef	1_M_WIZARD,{
+OnInit:
+	sellitem Blue_Gemstone;
+	sellitem Rod;
+	sellitem Wand;
+	sellitem Staff;
+	sellitem Arc_Wand;
+	sellitem Circlet;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+}
+
+geffen_in,171,123,4	trader	Tool Dealer#gef2	1_M_WIZARD,{
+OnInit:
+	sellitem Empty_Cylinder;
+	sellitem Empty_Potion;
+}
+
+geffen,193,152,4	trader	Pet Groomer#gef	4_F_TELEPORTER,{
+OnInit:
+	sellitem Pet_Food;
+	sellitem Pet_Incubator;
+	sellitem Backpack;
+	sellitem Rocker_Glasses;
+	sellitem Mojji;
+	sellitem Vital_Flower_;
+	sellitem Flame_Gemstone;
+	sellitem Bun_;
+}
+
 
 //=======================================================
 // Gonryun
 //=======================================================
-gonryun,147,84,5	shop	Tool Dealer#gon	777,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-gonryun,174,101,3	shop	Weapon Dealer#gon	774,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-gonryun,173,84,3	shop	Armor Dealer#gon	770,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+gonryun,147,84,5	trader	Tool Dealer#gon	4_M_TWOLDMAN,{
+OnInit:
+	sellitem Arrow;
+	sellitem Iron_Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+}
+
+gonryun,174,101,3	trader	Weapon Dealer#gon	4_M_TWBOY,{
+OnInit:
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+}
+
+gonryun,173,84,3	trader	Armor Dealer#gon	4_F_TWGIRL,{
+OnInit:
+	sellitem Bandana;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+	sellitem Wooden_Mail;
+	sellitem Belt;
+}
+
 
 //=======================================================
 // Hugel
 //=======================================================
-hugel,105,169,5	shop	Vendor from Milk Ranch#h	90,519:-1
-hugel,77,167,3	shop	Vegetable Gardener#hu	892,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1
-hu_in01,241,368,2	shop	Tool Dealer#hu	53,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-hu_in01,252,368,3	shop	Tool Dealer#hu2	90,717:-1,2201:-1,910:-1,528:-1
-hu_in01,100,390,3	shop	Bow Dealer#hu	86,1701:-1,1707:-1,1718:-1,1714:-1
-hu_in01,94,390,3	shop	Weapon Dealer#hu	898,1116:-1,1154:-1,1354:-1,1201:-1
-hu_in01,94,313,3	shop	Armor Dealer#hu	86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1,2401:-1,2501:-1,2307:-1,2105:-1
+hugel,105,169,5	trader	Vendor from Milk Ranch#h	4_F_01,{
+OnInit:
+	sellitem Milk;
+}
+
+hugel,77,167,3	trader	Vegetable Gardener#hu	4_F_HUGRANMA,{
+OnInit:
+	sellitem Fruit_Of_Mastela;
+	sellitem Apple;
+	sellitem Banana;
+	sellitem Carrot;
+	sellitem Sweet_Potato;
+	sellitem Pumpkin;
+}
+
+hu_in01,241,368,2	trader	Tool Dealer#hu	1_M_INNKEEPER,{
+OnInit:
+	sellitem Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+}
+
+hu_in01,252,368,3	trader	Tool Dealer#hu2	4_F_01,{
+OnInit:
+	sellitem Blue_Gemstone;
+	sellitem Sunglasses;
+	sellitem Garlet;
+	sellitem Monster's_Feed;
+}
+
+hu_in01,100,390,3	trader	Bow Dealer#hu	4_M_04,{
+OnInit:
+	sellitem Bow;
+	sellitem Great_Bow;
+	sellitem Hunter_Bow;
+	sellitem Kakkung;
+}
+
+hu_in01,94,390,3	trader	Weapon Dealer#hu	4_M_HUMAN_01,{
+OnInit:
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Hammer;
+	sellitem Knife;
+}
+
+hu_in01,94,313,3	trader	Armor Dealer#hu	4_M_04,{
+OnInit:
+	sellitem Goggle;
+	sellitem Circlet;
+	sellitem Cap;
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Sandals;
+	sellitem Hood;
+	sellitem Mantle;
+	sellitem Shield;
+}
+
 
 //=======================================================
 // Izlude
 //=======================================================
-izlude_in,60,127,4	shop	Weapon Dealer#iz	72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1
-izlude_in,70,127,4	shop	Armor Dealer#iz	62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1
+izlude_in,60,127,4	trader	Weapon Dealer#iz	1_F_MARIA,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Bow;
+	sellitem Rod;
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Sword;
+	sellitem Falchion;
+	sellitem Blade;
+	sellitem Katana;
+	sellitem Slayer;
+	sellitem Bastard_Sword;
+	sellitem Two_Hand_Sword;
+	sellitem Broad_Sword;
+	sellitem Axe;
+}
+
+izlude_in,70,127,4	trader	Armor Dealer#iz	1_M_SIZ,{
+OnInit:
+	sellitem Buckler;
+	sellitem Shield;
+	sellitem Shoes;
+	sellitem Boots;
+	sellitem Muffler;
+	sellitem Manteau;
+	sellitem Cap;
+	sellitem Helm;
+	sellitem Leather_Jacket;
+	sellitem Adventure_Suit;
+	sellitem Wooden_Mail;
+	sellitem Mantle;
+	sellitem Coat;
+	sellitem Padded_Armor;
+	sellitem Chain_Mail;
+	sellitem Plate_Armor;
+	sellitem Novice_Armlet;
+}
+
 
 //=======================================================
 // Jawaii
 //=======================================================
-jawaii,186,174,3	shop	Ice Cream Guy#ja	85,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1
+jawaii,186,174,3	trader	Ice Cream Guy#ja	4_M_03,{
+OnInit:
+	sellitem Ice_Cream;
+	sellitem Ice_Cream;
+	sellitem Ice_Cream;
+	sellitem Ice_Cream;
+	sellitem Ice_Cream;
+	sellitem Ice_Cream;
+	sellitem Ice_Cream;
+}
+
 
 //=======================================================
 // Juno
 //=======================================================
-yuno,218,97,5	shop	Tool Dealer#yuno	84,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1
-yuno,226,107,5	shop	Tool Dealer#yuno1	83,911:-1,910:-1,912:-1
-yuno,197,114,4	shop	Pet Groomer#yuno	124,537:-1,643:-1,10013:-1,10014:-1,6115:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1
-yuno,205,103,4	shop	Mr. King's Shop#yuno	125,2340:-1,2341:-1,2411:-1,2222:-1,2230:-1,1721:-1
-yuno,163,187,5	shop	Magical Item Seller#yuno	90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
-yuno_in01,25,34,5	shop	Tool Dealer#yuno2	83,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1
-yuno_in01,103,35,2	shop	Weapon Dealer#yuno	49,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1
-yuno_in01,112,26,4	shop	Armor Dealer#yuno	101,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1
-yuno_in03,176,22,3	shop	Scroll Merchant#yuno03	89,7433:-1	//Temp shop in Yuno that sells Blank Scrolls
+yuno,218,97,5	trader	Tool Dealer#yuno	4_M_02,{
+OnInit:
+	sellitem Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+}
+
+yuno,226,107,5	trader	Tool Dealer#yuno1	4_M_01,{
+OnInit:
+	sellitem Scell;
+	sellitem Garlet;
+	sellitem Zargon;
+}
+
+yuno,197,114,4	trader	Pet Groomer#yuno	4_F_TELEPORTER,{
+OnInit:
+	sellitem Pet_Food;
+	sellitem Pet_Incubator;
+	sellitem Backpack;
+	sellitem Rocker_Glasses;
+	sellitem Bun_;
+	sellitem Mojji;
+	sellitem Flame_Gemstone;
+	sellitem Vital_Flower_;
+	sellitem Vital_Flower;
+	sellitem Bun_;
+	sellitem Damp_Darkness;
+	sellitem Small_Snow_Flower;
+	sellitem Fresh_Plant;
+	sellitem Big_Cell;
+	sellitem Apple_Pudding;
+	sellitem Mystic_Stone;
+	sellitem Flavored_Alcohol;
+	sellitem Grilled_Rice_Cake;
+	sellitem Fish_With_Blue_Back;
+	sellitem Pumpkin_Pie_;
+}
+
+yuno,205,103,4	trader	Mr. King's Shop#yuno	4_M_TELEPORTER,{
+OnInit:
+	sellitem Novice_Breast;
+	sellitem Full_Plate_Armor;
+	sellitem Grave;
+	sellitem Turban;
+	sellitem Gemmed_Sallet;
+	sellitem Repeting_CrossBow;
+}
+
+yuno,163,187,5	trader	Magical Item Seller#yuno	4_F_01,{
+OnInit:
+	sellitem Blue_Gemstone;
+	sellitem Rod;
+	sellitem Wand;
+	sellitem Staff;
+	sellitem Arc_Wand;
+	sellitem Circlet;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+}
+
+yuno_in01,25,34,5	trader	Tool Dealer#yuno2	4_M_01,{
+OnInit:
+	sellitem Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+}
+
+yuno_in01,103,35,2	trader	Weapon Dealer#yuno	1_M_03,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Sword;
+	sellitem Bow;
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Dirk;
+	sellitem Dagger;
+	sellitem Stiletto;
+	sellitem Rod;
+	sellitem Wand;
+	sellitem Staff;
+	sellitem Arc_Wand;
+}
+
+yuno_in01,112,26,4	trader	Armor Dealer#yuno	4W_F_01,{
+OnInit:
+	sellitem Novice_Armlet;
+	sellitem Guard;
+	sellitem Mirror_Shield;
+	sellitem Sandals;
+	sellitem Hood;
+	sellitem Gemmed_Sallet;
+	sellitem Cotton_Shirt;
+	sellitem Leather_Jacket;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+}
+
+yuno_in03,176,22,3	trader	Scroll Merchant#yuno03	4_M_ORIENT02,{
+OnInit:
+	sellitem Scroll; //Temp shop in Yuno that sells Blank Scrolls
+}
+
 
 //=======================================================
 // Lighthalzen
 //=======================================================
-lighthalzen,69,75,5	shop	Fruit Gardener#lhz	102,512:-1,513:-1
-lighthalzen,112,44,0	shop	Flower Girl#lhz	90,712:-1,744:-1,748:-1
-lighthalzen,124,129,0	shop	Vegetable Gardener#lhz	91,515:-1,516:-1,535:-1
-lighthalzen,220,122,3	shop	Vendor from Milk Ranch#l	90,519:-1
-lighthalzen,222,191,4	shop	Pet Groomer#lhz	125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-lhz_in02,286,95,4	shop	Beginner's Merchant#lhz	62,5112:-1,2416:-1,2113:-1,2512:-1
-lhz_in02,271,99,5	shop	Armor Dealer#lhz	851,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
-lhz_in02,276,99,4	shop	Weapon Dealer#lhz	851,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
-lhz_in02,273,35,4	shop	Wand Dealer#lhz	854,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1
-lhz_in02,105,21,3	shop	Jeweler#lhz	91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1
-lhz_in02,17,220,5	shop	Vegetable Gardener#lhz2	91,515:-1,516:-1,535:-1
-lhz_in02,21,220,5	shop	Fruit Gardener#lhz2	102,512:-1,513:-1
-lhz_in02,32,219,5	shop	Butcher#lhz	54,517:-1
-lhz_in02,38,145,5	shop	Gift Merchant#lhz	91,734:-1,735:-1,736:-1,737:-1,746:-1
-lhz_in02,47,148,3	shop	Wedding Shop Dealer#lhz	71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
-lhz_in02,31,145,4	shop	Tool Dealer#lhz	90,611:-1,503:-1,504:-1,506:-1,657:-1,656:-1,601:-1,602:-1,1065:-1,610:-1,1770:-1
-lhz_in02,85,216,5	shop	Doll Supplier#lhz	862,740:-1,741:-1,742:-1
-lhz_in02,87,208,3	shop	Toy Supplier#lhz	715,2243:-1,2212:-1,2242:-1,2241:-1
-lhz_in03,239,106,5	shop	Tool Dealer#lhz2	850,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1
-lhz_in03,258,101,3	shop	Arrow Merchant#lhz	855,1750:-1,1770:-1,1752:-1,1751:-1
-lhz_in03,249,24,4	shop	Merchant#lhz	855,911:-1,910:-1,912:-1,528:-1
+lighthalzen,69,75,5	trader	Fruit Gardener#lhz	8_F,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+}
+
+lighthalzen,112,44,0	trader	Flower Girl#lhz	4_F_01,{
+OnInit:
+	sellitem Flower;
+	sellitem Bunch_Of_Flowers;
+	sellitem Witherless_Rose;
+}
+
+lighthalzen,124,129,0	trader	Vegetable Gardener#lhz	4_F_02,{
+OnInit:
+	sellitem Carrot;
+	sellitem Sweet_Potato;
+	sellitem Pumpkin;
+}
+
+lighthalzen,220,122,3	trader	Vendor from Milk Ranch#l	4_F_01,{
+OnInit:
+	sellitem Milk;
+}
+
+lighthalzen,222,191,4	trader	Pet Groomer#lhz	4_M_TELEPORTER,{
+OnInit:
+	sellitem Pet_Food;
+	sellitem Pet_Incubator;
+	sellitem Backpack;
+	sellitem Rocker_Glasses;
+	sellitem Mojji;
+	sellitem Vital_Flower_;
+	sellitem Flame_Gemstone;
+	sellitem Bun_;
+}
+
+lhz_in02,286,95,4	trader	Beginner's Merchant#lhz	1_M_SIZ,{
+OnInit:
+	sellitem Super_Novice_Hat;
+	sellitem Novice_Shoes;
+	sellitem Novice_Shield;
+	sellitem Novice_Manteau;
+}
+
+lhz_in02,271,99,5	trader	Armor Dealer#lhz	4_M_REPAIR,{
+OnInit:
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Shoes;
+	sellitem Boots;
+	sellitem Muffler;
+	sellitem Silk_Robe;
+	sellitem Chain_Mail;
+	sellitem Coat;
+	sellitem Thief_Clothes;
+	sellitem Novice_Armlet;
+}
+
+lhz_in02,276,99,4	trader	Weapon Dealer#lhz	4_M_REPAIR,{
+OnInit:
+	sellitem Knife;
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+	sellitem Coward;
+}
+
+lhz_in02,273,35,4	trader	Wand Dealer#lhz	4_M_EINMAN2,{
+OnInit:
+	sellitem Rod;
+	sellitem Wand;
+	sellitem Staff;
+	sellitem Survival_Rod;
+	sellitem Survival_Rod2;
+}
+
+lhz_in02,105,21,3	trader	Jeweler#lhz	4_F_02,{
+OnInit:
+	sellitem Azure_Jewel;
+	sellitem Cardinal_Jewel;
+	sellitem Blue_Jewel;
+	sellitem Golden_Jewel;
+	sellitem Bluish_Green_Jewel;
+	sellitem Crystal_Jewel;
+	sellitem Diamond_Ring;
+}
+
+lhz_in02,17,220,5	trader	Vegetable Gardener#lhz2	4_F_02,{
+OnInit:
+	sellitem Carrot;
+	sellitem Sweet_Potato;
+	sellitem Pumpkin;
+}
+
+lhz_in02,21,220,5	trader	Fruit Gardener#lhz2	8_F,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+}
+
+lhz_in02,32,219,5	trader	Butcher#lhz	1_M_JOBGUIDER,{
+OnInit:
+	sellitem Meat;
+}
+
+lhz_in02,38,145,5	trader	Gift Merchant#lhz	4_F_02,{
+OnInit:
+	sellitem Red_Frame;
+	sellitem Blue_Porcelain;
+	sellitem White_Platter;
+	sellitem Black_Ladle;
+	sellitem Glass_Bead;
+}
+
+lhz_in02,47,148,3	trader	Wedding Shop Dealer#lhz	1_F_LIBRARYGIRL,{
+OnInit:
+	sellitem Bunch_Of_Flowers;
+	sellitem Wedding_Bouquet;
+	sellitem Wedding_Dress;
+	sellitem Wedding_Veil;
+	sellitem Tuxedo;
+}
+
+lhz_in02,31,145,4	trader	Tool Dealer#lhz	4_F_01,{
+OnInit:
+	sellitem Spectacles;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Berserk_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem Leaf_Of_Yggdrasil;
+	sellitem Iron_Arrow;
+}
+
+lhz_in02,85,216,5	trader	Doll Supplier#lhz	4_F_LGTGIRL,{
+OnInit:
+	sellitem Stuffed_Doll;
+	sellitem Poring_Doll;
+	sellitem Chonchon_Doll;
+}
+
+lhz_in02,87,208,3	trader	Toy Supplier#lhz	4_M_PIERROT,{
+OnInit:
+	sellitem Spinning_Eyes;
+	sellitem Eye_Bandage;
+	sellitem Luxury_Sunglasses;
+	sellitem Granpa_Beard;
+}
+
+lhz_in03,239,106,5	trader	Tool Dealer#lhz2	4_F_EINWOMAN,{
+OnInit:
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem Spectacles;
+}
+
+lhz_in03,258,101,3	trader	Arrow Merchant#lhz	4_M_EINMAN,{
+OnInit:
+	sellitem Arrow;
+	sellitem Iron_Arrow;
+	sellitem Fire_Arrow;
+	sellitem Silver_Arrow;
+}
+
+lhz_in03,249,24,4	trader	Merchant#lhz	4_M_EINMAN,{
+OnInit:
+	sellitem Scell;
+	sellitem Garlet;
+	sellitem Zargon;
+	sellitem Monster's_Feed;
+}
+
 
 //=======================================================
 // Louyang
 //=======================================================
-lou_in02,121,182,5	shop	Armor Dealer#lou	818,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
-lou_in02,130,182,5	shop	Weapon Dealer#lou	822,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-lou_in02,239,176,5	shop	Tool Dealer#lou	818,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+lou_in02,121,182,5	trader	Armor Dealer#lou	4_F_CHNWOMAN,{
+OnInit:
+	sellitem Bandana;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+	sellitem Wooden_Mail;
+	sellitem Belt;
+}
+
+lou_in02,130,182,5	trader	Weapon Dealer#lou	4_M_CHNMAN,{
+OnInit:
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+}
+
+lou_in02,239,176,5	trader	Tool Dealer#lou	4_F_CHNWOMAN,{
+OnInit:
+	sellitem Arrow;
+	sellitem Iron_Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+}
+
 
 //=======================================================
 // Lutie
 //=======================================================
-xmas_in,40,38,5	shop	Tool Dealer#xmas	83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1
-xmas_in,168,104,4	shop	Armor Dealer#xmas	101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1
-xmas_in,169,34,2	shop	Gift Seller#xmas	702,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1
-xmas_in,174,98,2	shop	Weapon Dealer#xmas	49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1
+xmas_in,40,38,5	trader	Tool Dealer#xmas	4_M_01,{
+OnInit:
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Spectacles;
+	sellitem Leaf_Of_Yggdrasil;
+}
+
+xmas_in,168,104,4	trader	Armor Dealer#xmas	4W_F_01,{
+OnInit:
+	sellitem Helm;
+	sellitem Buckler;
+	sellitem Shield;
+	sellitem Mantle;
+	sellitem Coat;
+	sellitem Padded_Armor;
+	sellitem Chain_Mail;
+	sellitem Plate_Armor;
+	sellitem Manteau;
+	sellitem Boots;
+}
+
+xmas_in,169,34,2	trader	Gift Seller#xmas	4_F_GON,{
+OnInit:
+	sellitem Flower_Ring;
+	sellitem Bunch_Of_Flowers;
+	sellitem Witherless_Rose;
+	sellitem White_Platter;
+	sellitem Glass_Bead;
+	sellitem Stuffed_Doll;
+	sellitem Diamond_Ring;
+}
+
+xmas_in,174,98,2	trader	Weapon Dealer#xmas	1_M_03,{
+OnInit:
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Dirk;
+	sellitem Dagger;
+	sellitem Stiletto;
+	sellitem Gladius;
+	sellitem Damascus;
+}
+
 
 //=======================================================
 // Morroc - Post Ep. 12.1
 //=======================================================
-in_moc_16,22,20,7	shop	Sepulchral Merchant#moc	880,1771:-1
-moc_ruins,91,128,4	shop	Tool Dealer#moc1	93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-moc_ruins,114,63,6	shop	Tool Dealer#moc2	99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1
-moc_ruins,93,53,2	shop	Item Collector#moc1	85,911:-1,528:-1,919:-1,925:-1
-moc_ruins,81,113,0	shop	Item Collector#moc2	85,911:-1,528:-1,919:-1,925:-1
-moc_ruins,110,105,2	shop	Jeweler#moc1	102,721:-1,723:-1,726:-1,728:-1,729:-1
-moc_ruins,52,85,6	shop	Jeweler#moc2	99,730:-1,2613:-1
-moc_ruins,113,126,4	shop	Trader#moc1	99,747:-1
-moc_ruins,131,138,0	shop	Trader#moc2	93,748:-1
-moc_ruins,71,139,5	shop	Trader#moc3	93,2612:-1
-moc_ruins,125,135,6	shop	Trader#moc4	89,2609:-1,1516:-1,1522:-1
-moc_ruins,87,109,0	shop	Butcher#moc	58,517:-1
-moc_ruins,90,149,6	shop	Trader#moc5	99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
-moc_ruins,118,170,4	shop	Pet Groomer#moc	125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-morocc_in,141,67,0	shop	Weapon Dealer#moc1	58,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1250:-1,1252:-1,1254:-1
-morocc_in,141,60,0	shop	Armor Dealer#moc	58,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2218:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2335:-1,2628:-1
-morocc_in,132,57,0	shop	Weapon Dealer#moc2	99,1146:-1,1245:-1
+in_moc_16,22,20,7	trader	Sepulchral Merchant#moc	4_M_MASKMAN,{
+OnInit:
+	sellitem Venom_Knife;
+}
+
+moc_ruins,91,128,4	trader	Tool Dealer#moc1	4_F_04,{
+OnInit:
+	sellitem Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+}
+
+moc_ruins,114,63,6	trader	Tool Dealer#moc2	4W_M_03,{
+OnInit:
+	sellitem Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem Luxury_Sunglasses;
+}
+
+moc_ruins,93,53,2	trader	Item Collector#moc1	4_M_03,{
+OnInit:
+	sellitem Scell;
+	sellitem Monster's_Feed;
+	sellitem Animal's_Skin;
+	sellitem Bill_Of_Birds;
+}
+
+moc_ruins,81,113,0	trader	Item Collector#moc2	4_M_03,{
+OnInit:
+	sellitem Scell;
+	sellitem Monster's_Feed;
+	sellitem Animal's_Skin;
+	sellitem Bill_Of_Birds;
+}
+
+moc_ruins,110,105,2	trader	Jeweler#moc1	8_F,{
+OnInit:
+	sellitem Azure_Jewel;
+	sellitem Cardinal_Jewel;
+	sellitem Blue_Jewel;
+	sellitem Golden_Jewel;
+	sellitem Bluish_Green_Jewel;
+}
+
+moc_ruins,52,85,6	trader	Jeweler#moc2	4W_M_03,{
+OnInit:
+	sellitem Crystal_Jewel;
+	sellitem Diamond_Ring;
+}
+
+moc_ruins,113,126,4	trader	Trader#moc1	4W_M_03,{
+OnInit:
+	sellitem Crystal_Mirror;
+}
+
+moc_ruins,131,138,0	trader	Trader#moc2	4_F_04,{
+OnInit:
+	sellitem Witherless_Rose;
+}
+
+moc_ruins,71,139,5	trader	Trader#moc3	4_F_04,{
+OnInit:
+	sellitem Flower_Ring;
+}
+
+moc_ruins,125,135,6	trader	Trader#moc4	4_M_ORIENT02,{
+OnInit:
+	sellitem Skul_Ring;
+	sellitem Sword_Mace;
+	sellitem Stunner;
+}
+
+moc_ruins,87,109,0	trader	Butcher#moc	1_M_MERCHANT,{
+OnInit:
+	sellitem Meat;
+}
+
+moc_ruins,90,149,6	trader	Trader#moc5	4W_M_03,{
+OnInit:
+	sellitem Banana;
+	sellitem Banana;
+	sellitem Banana;
+	sellitem Banana;
+	sellitem Banana;
+	sellitem Banana;
+}
+
+moc_ruins,118,170,4	trader	Pet Groomer#moc	4_M_TELEPORTER,{
+OnInit:
+	sellitem Pet_Food;
+	sellitem Pet_Incubator;
+	sellitem Backpack;
+	sellitem Rocker_Glasses;
+	sellitem Mojji;
+	sellitem Vital_Flower_;
+	sellitem Flame_Gemstone;
+	sellitem Bun_;
+}
+
+morocc_in,141,67,0	trader	Weapon Dealer#moc1	1_M_MERCHANT,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Bow;
+	sellitem Rod;
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Dirk;
+	sellitem Dagger;
+	sellitem Stiletto;
+	sellitem Gladius;
+	sellitem Damascus;
+	sellitem Jur;
+	sellitem Katar;
+	sellitem Jamadhar;
+}
+
+morocc_in,141,60,0	trader	Armor Dealer#moc	1_M_MERCHANT,{
+OnInit:
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Boots;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Flu_Mask;
+	sellitem Cotton_Shirt;
+	sellitem Leather_Jacket;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Wooden_Mail;
+	sellitem Silver_Robe;
+	sellitem Mantle;
+	sellitem Coat;
+	sellitem Thief_Clothes;
+	sellitem Novice_Armlet;
+}
+
+morocc_in,132,57,0	trader	Weapon Dealer#moc2	4W_M_03,{
+OnInit:
+	sellitem Town_Sword;
+	sellitem Cinquedea;
+}
+
 
 //=======================================================
 // Moscovia
 //=======================================================
-mosk_in,21,254,5	shop	Tool Dealer#mosk	968,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-mosk_in,31,180,3	shop	Weapon Dealer#mosk	968,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-mosk_in,79,178,1	shop	Armor Dealer#mosk	961,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
-moscovia,152,71,4	shop	Fruit Gardener#mosk	968,512:-1,513:-1,515:-1,516:-1
-moscovia,199,110,3	shop	Vendor from Milk Ranch#m	959,519:-1
+mosk_in,21,254,5	trader	Tool Dealer#mosk	4_M_RUSMAN2,{
+OnInit:
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem Arrow;
+}
+
+mosk_in,31,180,3	trader	Weapon Dealer#mosk	4_M_RUSMAN2,{
+OnInit:
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+}
+
+mosk_in,79,178,1	trader	Armor Dealer#mosk	4_F_RUSWOMAN3,{
+OnInit:
+	sellitem Bandana;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+	sellitem Wooden_Mail;
+	sellitem Belt;
+}
+
+moscovia,152,71,4	trader	Fruit Gardener#mosk	4_M_RUSMAN2,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+	sellitem Carrot;
+	sellitem Sweet_Potato;
+}
+
+moscovia,199,110,3	trader	Vendor from Milk Ranch#m	4_F_RUSWOMAN1,{
+OnInit:
+	sellitem Milk;
+}
+
 
 //=======================================================
 // Niflheim
 //=======================================================
-nif_in,37,93,1	shop	Axe Dealer#nif	801,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
-nif_in,37,84,1	shop	Armor Dealer#nif	801,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1
-nif_in,145,23,1	shop	Tool Dealer#nif	801,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1
+nif_in,37,93,1	trader	Axe Dealer#nif	4_NFCOFFIN,{
+OnInit:
+	sellitem Axe;
+	sellitem Battle_Axe;
+	sellitem Hammer;
+	sellitem Buster;
+	sellitem Two_Handed_Axe;
+}
+
+nif_in,37,84,1	trader	Armor Dealer#nif	4_NFCOFFIN,{
+OnInit:
+	sellitem Hood;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Muffler;
+	sellitem Manteau;
+	sellitem Manteau;
+}
+
+nif_in,145,23,1	trader	Tool Dealer#nif	4_NFCOFFIN,{
+OnInit:
+	sellitem Pumpkin;
+	sellitem Pumpkin_Head;
+	sellitem Tree_Root;
+	sellitem Goat's_Horn;
+	sellitem Pet_Food;
+	sellitem Poison_Powder;
+	sellitem Single_Cell;
+	sellitem Mementos;
+}
+
 
 //=======================================================
 // Payon
 //=======================================================
-payon_in01,15,119,0	shop	Weapon Dealer#pay	77,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1704:-1,1707:-1,1710:-1,1713:-1,1714:-1,1718:-1
-payon_in01,5,129,7	shop	Weapon Dealer#pay2	703,1146:-1,1245:-1
-payon_in01,7,119,2	shop	Armor Dealer#pay	76,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2208:-1,2211:-1,2212:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2330:-1,2628:-1
-payon_in01,5,49,7	shop	Tool Dealer#pay	88,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-payon_in02,87,34,0	shop	Tool Dealer#pay2	75,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-payon,159,96,4	shop	Tool Dealer#pay3	88,1750:-1,501:-1,645:-1,601:-1,602:-1
-payon,177,131,4	shop	Pet Groomer#pay	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
+payon_in01,15,119,0	trader	Weapon Dealer#pay	1_F_ORIENT_03,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Sword;
+	sellitem Falchion;
+	sellitem Blade;
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Rod;
+	sellitem Bow;
+	sellitem Composite_Bow;
+	sellitem Great_Bow;
+	sellitem CrossBow;
+	sellitem Arbalest;
+	sellitem Kakkung;
+	sellitem Hunter_Bow;
+}
+
+payon_in01,5,129,7	trader	Weapon Dealer#pay2	4_F_KID2,{
+OnInit:
+	sellitem Town_Sword;
+	sellitem Cinquedea;
+}
+
+payon_in01,7,119,2	trader	Armor Dealer#pay	1_F_ORIENT_02,{
+OnInit:
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Boots;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Manteau;
+	sellitem Ribbon;
+	sellitem Bandana;
+	sellitem Eye_Bandage;
+	sellitem Cotton_Shirt;
+	sellitem Leather_Jacket;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Wooden_Mail;
+	sellitem Silver_Robe;
+	sellitem Mantle;
+	sellitem Coat;
+	sellitem Tights;
+	sellitem Novice_Armlet;
+}
+
+payon_in01,5,49,7	trader	Tool Dealer#pay	4_M_ORIENT01,{
+OnInit:
+	sellitem Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+}
+
+payon_in02,87,34,0	trader	Tool Dealer#pay2	1_F_ORIENT_01,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+}
+
+payon,159,96,4	trader	Tool Dealer#pay3	4_M_ORIENT01,{
+OnInit:
+	sellitem Arrow;
+	sellitem Red_Potion;
+	sellitem Center_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+}
+
+payon,177,131,4	trader	Pet Groomer#pay	4_F_TELEPORTER,{
+OnInit:
+	sellitem Pet_Food;
+	sellitem Pet_Incubator;
+	sellitem Backpack;
+	sellitem Rocker_Glasses;
+	sellitem Mojji;
+	sellitem Flame_Gemstone;
+	sellitem Vital_Flower_;
+	sellitem Vital_Flower;
+	sellitem Bun_;
+	sellitem Damp_Darkness;
+	sellitem Small_Snow_Flower;
+	sellitem Fresh_Plant;
+	sellitem Big_Cell;
+	sellitem Apple_Pudding;
+	sellitem Mystic_Stone;
+	sellitem Flavored_Alcohol;
+	sellitem Grilled_Rice_Cake;
+	sellitem Fish_With_Blue_Back;
+	sellitem Pumpkin_Pie_;
+	sellitem Traditional_Cookie;
+}
+
 
 //=======================================================
 // Prontera
 //=======================================================
-prontera,73,134,0	shop	Vendor from Milk Ranch#p	90,519:-1
-prontera,104,49,0	shop	Fruit Gardener#prt	102,512:-1,513:-1
-prontera,64,125,0	shop	Butcher#prt	87,517:-1,528:-1
-prontera,58,182,0	shop	Flower Girl#prt	96,712:-1,744:-1
-prontera,113,42,0	shop	Flower Lady#prt	90,712:-1,744:-1
-prontera,105,87,0	shop	Gift Merchant#prt	91,734:-1,735:-1,736:-1,737:-1,746:-1
-prontera,218,211,4	shop	Pet Groomer#prt	125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
-prontera,248,153,0	shop	Doll Supplier#prt	85,740:-1,741:-1,742:-1
-prontera,48,58,0	shop	Vegetable Gardener#prt	91,515:-1,516:-1,535:-1
-prt_church,108,124,4	shop	Nun#prt	79,2608:-1,2216:-1,5092:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1
-prt_fild05,290,221,2	shop	Tool Dealer#prt	83,1750:-1,611:-1,501:-1,502:-1,506:-1,645:-1,601:-1,602:-1
-prt_in,211,169,0	shop	Wedding Shop Dealer#prt	71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
-prt_in,126,76,0	shop	Tool Dealer#prt1	53,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
-prt_in,172,130,0	shop	Weapon Dealer#prt	54,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1129:-1,1116:-1,1301:-1
-prt_in,172,132,0	shop	Armor Dealer#prt	48,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2220:-1,2226:-1,2301:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1,2627:-1
-prt_in,171,140,0	shop	Weapon Dealer#prt2	47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
-prt_in,165,140,4	shop	Weapon Dealer#prt3	66,1146:-1,1245:-1
-prt_monk,135,263,5	shop	Weapon Dealer#prt4	726,1801:-1,1803:-1,1805:-1
+prontera,73,134,0	trader	Vendor from Milk Ranch#p	4_F_01,{
+OnInit:
+	sellitem Milk;
+}
+
+prontera,104,49,0	trader	Fruit Gardener#prt	8_F,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+}
+
+prontera,64,125,0	trader	Butcher#prt	4_M_BARBER,{
+OnInit:
+	sellitem Meat;
+	sellitem Monster's_Feed;
+}
+
+prontera,58,182,0	trader	Flower Girl#prt	4W_KID,{
+OnInit:
+	sellitem Flower;
+	sellitem Bunch_Of_Flowers;
+}
+
+prontera,113,42,0	trader	Flower Lady#prt	4_F_01,{
+OnInit:
+	sellitem Flower;
+	sellitem Bunch_Of_Flowers;
+}
+
+prontera,105,87,0	trader	Gift Merchant#prt	4_F_02,{
+OnInit:
+	sellitem Red_Frame;
+	sellitem Blue_Porcelain;
+	sellitem White_Platter;
+	sellitem Black_Ladle;
+	sellitem Glass_Bead;
+}
+
+prontera,218,211,4	trader	Pet Groomer#prt	4_M_TELEPORTER,{
+OnInit:
+	sellitem Pet_Food;
+	sellitem Pet_Incubator;
+	sellitem Backpack;
+	sellitem Rocker_Glasses;
+	sellitem Mojji;
+	sellitem Flame_Gemstone;
+	sellitem Vital_Flower_;
+	sellitem Vital_Flower;
+	sellitem Bun_;
+	sellitem Damp_Darkness;
+	sellitem Small_Snow_Flower;
+	sellitem Fresh_Plant;
+	sellitem Big_Cell;
+	sellitem Apple_Pudding;
+	sellitem Mystic_Stone;
+	sellitem Flavored_Alcohol;
+	sellitem Grilled_Rice_Cake;
+	sellitem Fish_With_Blue_Back;
+	sellitem Pumpkin_Pie_;
+	sellitem Traditional_Cookie;
+}
+
+prontera,248,153,0	trader	Doll Supplier#prt	4_M_03,{
+OnInit:
+	sellitem Stuffed_Doll;
+	sellitem Poring_Doll;
+	sellitem Chonchon_Doll;
+}
+
+prontera,48,58,0	trader	Vegetable Gardener#prt	4_F_02,{
+OnInit:
+	sellitem Carrot;
+	sellitem Sweet_Potato;
+	sellitem Pumpkin;
+}
+
+prt_church,108,124,4	trader	Nun#prt	1_F_PRIEST,{
+OnInit:
+	sellitem Rosary;
+	sellitem Biretta;
+	sellitem Blue_Coif;
+	sellitem Scapulare;
+	sellitem Saint_Robe;
+	sellitem Club;
+	sellitem Mace;
+	sellitem Smasher;
+	sellitem Flail;
+	sellitem Morning_Star;
+	sellitem Chain;
+}
+
+prt_fild05,290,221,2	trader	Tool Dealer#prt	4_M_01,{
+OnInit:
+	sellitem Arrow;
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+}
+
+prt_in,211,169,0	trader	Wedding Shop Dealer#prt	1_F_LIBRARYGIRL,{
+OnInit:
+	sellitem Bunch_Of_Flowers;
+	sellitem Wedding_Bouquet;
+	sellitem Wedding_Dress;
+	sellitem Wedding_Veil;
+	sellitem Tuxedo;
+}
+
+prt_in,126,76,0	trader	Tool Dealer#prt1	1_M_INNKEEPER,{
+OnInit:
+	sellitem Spectacles;
+	sellitem Arrow;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem One_Eyed_Glass;
+}
+
+prt_in,172,130,0	trader	Weapon Dealer#prt	1_M_JOBGUIDER,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Bow;
+	sellitem Knife;
+	sellitem Cutter;
+	sellitem Main_Gauche;
+	sellitem Rod;
+	sellitem Sword;
+	sellitem Falchion;
+	sellitem Blade;
+	sellitem Lapier;
+	sellitem Scimiter;
+	sellitem Ring_Pommel_Saber;
+	sellitem Tsurugi;
+	sellitem Haedonggum;
+	sellitem Saber;
+	sellitem Flamberge;
+	sellitem Katana;
+	sellitem Axe;
+}
+
+prt_in,172,132,0	trader	Armor Dealer#prt	1_M_02,{
+OnInit:
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Hat;
+	sellitem Cap;
+	sellitem Cotton_Shirt;
+	sellitem Leather_Jacket;
+	sellitem Adventure_Suit;
+	sellitem Wooden_Mail;
+	sellitem Mantle;
+	sellitem Coat;
+	sellitem Padded_Armor;
+	sellitem Chain_Mail;
+	sellitem Novice_Armlet;
+	sellitem Belt;
+}
+
+prt_in,171,140,0	trader	Weapon Dealer#prt2	1_M_01,{
+OnInit:
+	sellitem Javelin;
+	sellitem Spear;
+	sellitem Pike;
+	sellitem Guisarme;
+	sellitem Glaive;
+	sellitem Partizan;
+	sellitem Trident;
+	sellitem Halberd;
+	sellitem Lance;
+}
+
+prt_in,165,140,4	trader	Weapon Dealer#prt3	1_F_01,{
+OnInit:
+	sellitem Town_Sword;
+	sellitem Cinquedea;
+}
+
+prt_monk,135,263,5	trader	Weapon Dealer#prt4	4_F_JOB_BLACKSMITH,{
+OnInit:
+	sellitem Waghnakh;
+	sellitem Knuckle_Duster;
+	sellitem Hora;
+}
+
 
 //=======================================================
 // Rachel
 //=======================================================
-ra_in01,175,364,3	shop	Armor Dealer#ra	919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
-ra_in01,257,269,3	shop	Tool Dealer#ra	919,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
-ra_in01,176,389,3	shop	Weapon Dealer#ra	931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1601:-1,1604:-1,1607:-1
-ra_in01,254,300,3	shop	Fruit Gardener#ra	931,512:-1,513:-1
-rachel,65,80,1	shop	Vegetable Gardener#ra	919,515:-1,535:-1,516:-1
+ra_in01,175,364,3	trader	Armor Dealer#ra	4_F_SHABBY,{
+OnInit:
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Shoes;
+	sellitem Boots;
+	sellitem Muffler;
+	sellitem Silk_Robe;
+	sellitem Chain_Mail;
+	sellitem Coat;
+	sellitem Thief_Clothes;
+	sellitem Novice_Armlet;
+}
+
+ra_in01,257,269,3	trader	Tool Dealer#ra	4_F_SHABBY,{
+OnInit:
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Spectacles;
+	sellitem Booby_Trap;
+	sellitem Leaf_Of_Yggdrasil;
+}
+
+ra_in01,176,389,3	trader	Weapon Dealer#ra	4_M_RACHMAN1,{
+OnInit:
+	sellitem Knife;
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+	sellitem Coward;
+	sellitem Rod;
+	sellitem Wand;
+	sellitem Staff;
+}
+
+ra_in01,254,300,3	trader	Fruit Gardener#ra	4_M_RACHMAN1,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+}
+
+rachel,65,80,1	trader	Vegetable Gardener#ra	4_F_SHABBY,{
+OnInit:
+	sellitem Carrot;
+	sellitem Pumpkin;
+	sellitem Sweet_Potato;
+}
+
 
 //=======================================================
 // Turtle Island
 //=======================================================
-tur_dun01,158,54,6	shop	Tool Dealer#tu	99,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,645:-1,656:-1,2242:-1
+tur_dun01,158,54,6	trader	Tool Dealer#tu	4W_M_03,{
+OnInit:
+	sellitem Arrow;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Luxury_Sunglasses;
+}
+
 
 //=======================================================
 // Umbala
 //=======================================================
-um_in,104,124,3	shop	Tool Dealer#um	788,512:-1,515:-1,535:-1,516:-1,513:-1,517:-1,528:-1,537:-1,601:-1,602:-1,645:-1,656:-1,610:-1
-um_in,160,125,3	shop	Weapon Dealer#um	789,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,1807:-1,1811:-1,1809:-1
+um_in,104,124,3	trader	Tool Dealer#um	4_M_UMOLDMAN,{
+OnInit:
+	sellitem Apple;
+	sellitem Carrot;
+	sellitem Pumpkin;
+	sellitem Sweet_Potato;
+	sellitem Banana;
+	sellitem Meat;
+	sellitem Monster's_Feed;
+	sellitem Pet_Food;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Leaf_Of_Yggdrasil;
+}
+
+um_in,160,125,3	trader	Weapon Dealer#um	4_M_UMSOLDIER,{
+OnInit:
+	sellitem Club;
+	sellitem Mace;
+	sellitem Smasher;
+	sellitem Flail;
+	sellitem Morning_Star;
+	sellitem Chain;
+	sellitem Fist;
+	sellitem Finger;
+	sellitem Claw;
+}
+
 
 //=======================================================
 // Veins
 //=======================================================
-ve_in,386,245,3	shop	Weapon Dealer#ve	931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1
-ve_in,336,243,3	shop	Weapon Dealer#ve2	931,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
-ve_in,374,230,3	shop	Armor Dealer#ve	919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
-ve_in,243,303,5	shop	Tool Dealer#ve	943,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
-ve_in,253,304,5	shop	Fruit Gardener#ve	941,512:-1,513:-1
-ve_in,252,313,0	shop	Magical Item Seller#ve	942,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
+ve_in,386,245,3	trader	Weapon Dealer#ve	4_M_RACHMAN1,{
+OnInit:
+	sellitem Knife;
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+}
+
+ve_in,336,243,3	trader	Weapon Dealer#ve2	4_M_RACHMAN1,{
+OnInit:
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+	sellitem Coward;
+}
+
+ve_in,374,230,3	trader	Armor Dealer#ve	4_F_SHABBY,{
+OnInit:
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Shoes;
+	sellitem Boots;
+	sellitem Muffler;
+	sellitem Silk_Robe;
+	sellitem Chain_Mail;
+	sellitem Coat;
+	sellitem Thief_Clothes;
+	sellitem Novice_Armlet;
+}
+
+ve_in,243,303,5	trader	Tool Dealer#ve	4_M_DESERT,{
+OnInit:
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Spectacles;
+	sellitem Booby_Trap;
+	sellitem Leaf_Of_Yggdrasil;
+}
+
+ve_in,253,304,5	trader	Fruit Gardener#ve	4_F_DST_CHILD,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+}
+
+ve_in,252,313,0	trader	Magical Item Seller#ve	4_F_DST_GRAND,{
+OnInit:
+	sellitem Blue_Gemstone;
+	sellitem Rod;
+	sellitem Wand;
+	sellitem Staff;
+	sellitem Arc_Wand;
+	sellitem Circlet;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+}
+
 
 //=======================================================
 // Cooking Addition
 //=======================================================
-prontera,156,212,1	shop	Chef Assistant#prt	700,7454:-1,7456:-1,7482:-1,580:-1
-payon,206,119,5	shop	Chef Assistant#pay	89,7455:-1
-moc_ruins,115,123,5	shop	Chef Assistant#moc	86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1
-geffen,196,111,3	shop	Chef Assistant#gef	85,7482:-1
-alberta,167,135,5	shop	Chef Assistant#alb	712,579:-1
-aldebaran,165,107,2	shop	Chef Assistant#alde	97,7456:-1,7452:-1,580:-1
-comodo,225,164,3	shop	Chef Assistant#cmd	83,7455:-1,7453:-1,7454:-1,579:-1
-umbala,102,154,3	shop	Chef Assistant#um	83,7456:-1,577:-1
-yuno,130,173,3	shop	Chef Assistant#yuno	83,7457:-1,7482:-1
-einbroch,224,207,5	shop	Chef Assistant#ein	83,7457:-1
-lighthalzen,126,126,3	shop	Chef Assistant#lhz	83,7456:-1,7452:-1
-amatsu,206,150,3	shop	Chef Assistant#ama	83,7453:-1,579:-1
-louyang,256,123,5	shop	Chef Assistant#lou	820,7454:-1,577:-1
-gonryun,147,101,5	shop	Chef Assistant#gon	83,7452:-1,580:-1
-ayothaya,203,178,3	shop	Chef Assistant#ayo	83,7455:-1,577:-1
-xmas,152,137,5	shop	Chef Assistant#xmas	83,7457:-1,577:-1
-niflheim,209,180,5	shop	Chef Assistant#nif	83,581:-1
-
-//===== Additional Comments(old): ================================= 
+prontera,156,212,1	trader	Chef Assistant#prt	8_F_GIRL,{
+OnInit:
+	sellitem Plain_Sauce;
+	sellitem Red_Spice;
+	sellitem Pot;
+	sellitem Bread;
+}
+
+payon,206,119,5	trader	Chef Assistant#pay	4_M_ORIENT02,{
+OnInit:
+	sellitem Hot_Sauce;
+}
+
+moc_ruins,115,123,5	trader	Chef Assistant#moc	4_M_04,{
+OnInit:
+	sellitem Hot_Sauce;
+	sellitem Sweet_Sauce;
+	sellitem Plain_Sauce;
+	sellitem Red_Spice;
+	sellitem Yellow_Spice;
+}
+
+geffen,196,111,3	trader	Chef Assistant#gef	4_M_03,{
+OnInit:
+	sellitem Pot;
+}
+
+alberta,167,135,5	trader	Chef Assistant#alb	4_M_05,{
+OnInit:
+	sellitem Delicious_Fish;
+}
+
+aldebaran,165,107,2	trader	Chef Assistant#alde	4W_M_01,{
+OnInit:
+	sellitem Red_Spice;
+	sellitem Yellow_Spice;
+	sellitem Bread;
+}
+
+comodo,225,164,3	trader	Chef Assistant#cmd	4_M_01,{
+OnInit:
+	sellitem Hot_Sauce;
+	sellitem Sweet_Sauce;
+	sellitem Plain_Sauce;
+	sellitem Delicious_Fish;
+}
+
+umbala,102,154,3	trader	Chef Assistant#um	4_M_01,{
+OnInit:
+	sellitem Red_Spice;
+	sellitem Grain;
+}
+
+yuno,130,173,3	trader	Chef Assistant#yuno	4_M_01,{
+OnInit:
+	sellitem Cooking_Oil;
+	sellitem Pot;
+}
+
+einbroch,224,207,5	trader	Chef Assistant#ein	4_M_01,{
+OnInit:
+	sellitem Cooking_Oil;
+}
+
+lighthalzen,126,126,3	trader	Chef Assistant#lhz	4_M_01,{
+OnInit:
+	sellitem Red_Spice;
+	sellitem Yellow_Spice;
+}
+
+amatsu,206,150,3	trader	Chef Assistant#ama	4_M_01,{
+OnInit:
+	sellitem Sweet_Sauce;
+	sellitem Delicious_Fish;
+}
+
+louyang,256,123,5	trader	Chef Assistant#lou	4_M_CHNCOOK,{
+OnInit:
+	sellitem Plain_Sauce;
+	sellitem Grain;
+}
+
+gonryun,147,101,5	trader	Chef Assistant#gon	4_M_01,{
+OnInit:
+	sellitem Yellow_Spice;
+	sellitem Bread;
+}
+
+ayothaya,203,178,3	trader	Chef Assistant#ayo	4_M_01,{
+OnInit:
+	sellitem Hot_Sauce;
+	sellitem Grain;
+}
+
+xmas,152,137,5	trader	Chef Assistant#xmas	4_M_01,{
+OnInit:
+	sellitem Cooking_Oil;
+	sellitem Grain;
+}
+
+niflheim,209,180,5	trader	Chef Assistant#nif	4_M_01,{
+OnInit:
+	sellitem Mushroom;
+}
+
+
+//===== Additional Comments(old): =================================
 //= swapped shop titles in GONRYUN, thanks to Kashy
 //= 1.3a Fixed Louyang map name. Added additional shops in Yuno. [kobra_k88]
 //= 1.4 Added Niflheim Shops
 //= 1.5 New Payon Locations [Darkchild]
-//= Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88]
+//=     Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88]
 //= 1.6 Removed GRAPE ID 514 from shops (caused exploits)
 //= 1.7 Removed juices from custom amatsu shops (it's a quest item + levelup exploit)
 //= 1.8 Corrected Niflheim Shops and Morroc Jewel Merchant [celest]
@@ -350,13 +2226,13 @@ niflheim,209,180,5	shop	Chef Assistant#nif	83,581:-1
 //=   -  Guys, I suggest we crop these comments and put them at the bottom soon
 //= 1.22 Thx8) Removed Berserk Potions from all shops but Comodo [Lupus]
 //= 1.3 Added Gunslinger shops. Credits goes to RockmanEXE for the info [erKURITA]
-//=	Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA]
+//=     Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA]
 //= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets]
 //= a Removed doubled Morocc Ing.Seller, arranged the rest Ing.Sellers according to the city names [Lupus]
 //= 1.4b Commented out temp Gunslinger shops. [Lupus]
 //= 1.5 Removed Temp gunslinger shops and moved up the official ones. [erKURITA]
-//=	  Added Official Ninja shops in their correct location and commented a few
-//=	  shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
+//=     Added Official Ninja shops in their correct location and commented a few
+//=     shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
 //= 1.6 Implemented a missing Tool Shop in Lighthalzen [MasterOfMuppets]
 //= 1.7 Added some missing iRO - Lighthalzen NPCs [Musashiden]
 //= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA]
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 7ace07bee..4c806a819 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -4,23 +4,21 @@
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 2.0a
-//===== Compatible With: =====================================
-//= Hercules Git
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Adds slots to selected weapons and armor.
 //===== Additional Comments: =================================
 //= 0.1a added missing L_No: to 2 funcs [Lupus]
 //= 0.1b Removed duplicates [Toms]
-//= 0.2	Added missing next;'s [Evera]
+//= 0.2 Added missing next;'s [Evera]
 //= 0.3 Fixed Zweihander[+] id [Lupus]
 //= 1.0 Fixed ingredients check [Lupus]
-//= 1.1	Updated to official. [SinSloth]
+//= 1.1 Updated to official. [SinSloth]
 //= 1.1b Optimized/cleaned [ultramage]
 //= 1.2 Fixed some typos and a nasty bug. [SinSloth]
 //= 1.3 Fixed a wrong item ID with Sphinx Hat. [SinSloth]
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 1.5 Removed Ontouch trigger area from NPCs. [L0ne_W0lf]
+//= 1.5 Removed OnTouch trigger area from NPCs. [L0ne_W0lf]
 //= 1.6 Replaced effect numerics with constants. [Samuray22]
 //= 1.7 Adjusted prices on some armor and weapons. [L0ne_W0lf]
 //= 1.8 Added missing Gae Bolg and Dragon Slayer. [Kisuka]
@@ -294,7 +292,7 @@ function	script	Func_Socket	{
 					delitem getarg(5),getarg(6);
 					if (getarg(7,0) != 0 && getarg(8,0) != 0)
 						delitem getarg(7),getarg(8);
-					set Zeny, Zeny - getarg(4)*1000;
+					Zeny -= getarg(4)*1000;
 					getitem getarg(1),1;
 					next;
 					mes "[Seiyablem]";
@@ -313,7 +311,7 @@ function	script	Func_Socket	{
 					delitem getarg(5),getarg(6);
 					if (getarg(7,0) != 0 && getarg(8,0) != 0)
 						delitem getarg(7),getarg(8);
-					set Zeny, Zeny - getarg(4)*1000;
+					Zeny -= getarg(4)*1000;
 					next;
 					mes "[Seiyablem]";
 					mes "I wish you good luck next time!";
@@ -336,10 +334,10 @@ function	script	Func_Socket	{
 	}
 }
 
-payon,140,151,5	duplicate(SocketEnchant)	Seiyablem#pay	84
-lhz_in02,281,35,5	duplicate(SocketEnchant)	Seiyablem#lhz	84
-prt_in,33,70,5	duplicate(SocketEnchant)	Seiyablem#prt	84
-morocc,51,41,4	duplicate(SocketEnchant)	Seiyablem#moc	84
+payon,140,151,5	duplicate(SocketEnchant)	Seiyablem#pay	4_M_02
+lhz_in02,281,35,5	duplicate(SocketEnchant)	Seiyablem#lhz	4_M_02
+prt_in,33,70,5	duplicate(SocketEnchant)	Seiyablem#prt	4_M_02
+morocc,51,41,4	duplicate(SocketEnchant)	Seiyablem#moc	4_M_02
 
 -	script	Young Man#dummy::SocketMan	-1,{
 	mes "[Young Man]";
@@ -358,7 +356,7 @@ morocc,51,41,4	duplicate(SocketEnchant)	Seiyablem#moc	84
 	close;
 }
 
-prt_in,31,57,1	duplicate(SocketMan)	Young Man#prt	97
-payon,143,143,7	duplicate(SocketMan)	Young Man#pay	97
-morocc,60,42,3	duplicate(SocketMan)	Young Man#moc	97
-lhz_in02,269,33,5	duplicate(SocketMan)	Young Man#lhz	97
+prt_in,31,57,1	duplicate(SocketMan)	Young Man#prt	4W_M_01
+payon,143,143,7	duplicate(SocketMan)	Young Man#pay	4W_M_01
+morocc,60,42,3	duplicate(SocketMan)	Young Man#moc	4W_M_01
+lhz_in02,269,33,5	duplicate(SocketMan)	Young Man#lhz	4W_M_01
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 6c21bdcf7..dbdcfe379 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -1,19 +1,17 @@
 //===== Hercules Script ======================================
 //= Episode 12 Socket Enchant NPC
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Gepard
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Adds slots to selected weapons and armor.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //= 1.1a Added 'disable_items' command. [Euphy]
-//============================================================ 
+//============================================================
 
 -	script	Leablem#dummy::SocketEnchant2	-1,{
 	if (checkweight(1201,1) == 0)
@@ -289,7 +287,7 @@
 							mes "Congratulations.";
 							delitem 5022,1; //Helm_Of_Sun
 							delitem 969,2; //Gold
-							set Zeny, Zeny - 200000000;
+							Zeny -= 200000000;
 							getitem 5353,1; //Helm_Of_Sun_
 							next;
 							mes "[Leablem]";
@@ -308,7 +306,7 @@
 							mes "I didn't want to do in the first place!";
 							delitem 5022,1; //Helm_Of_Sun
 							delitem 969,2; //Gold
-							set Zeny, Zeny - 200000000;
+							Zeny -= 200000000;
 							next;
 							mes "[Leablem]";
 							mes "No, don't ever ask me to do such a risky thing again!";
@@ -379,10 +377,10 @@
 	}
 }
 
-payon,236,199,3	duplicate(SocketEnchant2)	Leablem#pay	86
-lighthalzen,96,137,3	duplicate(SocketEnchant2)	Leablem#lhz	86
-prt_in,22,60,6	duplicate(SocketEnchant2)	Leablem#prt	86
-moc_ruins,154,86,3	duplicate(SocketEnchant2)	Leablem#moc	86
+payon,236,199,3	duplicate(SocketEnchant2)	Leablem#pay	4_M_04
+lighthalzen,96,137,3	duplicate(SocketEnchant2)	Leablem#lhz	4_M_04
+prt_in,22,60,6	duplicate(SocketEnchant2)	Leablem#prt	4_M_04
+moc_ruins,154,86,3	duplicate(SocketEnchant2)	Leablem#moc	4_M_04
 
 function	script	Func_Socket2	{
 
@@ -430,7 +428,7 @@ function	script	Func_Socket2	{
 					delitem getarg(5),getarg(6);
 					if (getarg(7,0) != 0 && getarg(8,0) != 0)
 						delitem getarg(7),getarg(8);
-					set Zeny, Zeny - getarg(4)*1000;
+					Zeny -= getarg(4)*1000;
 					getitem getarg(1),1;
 					next;
 					mes "[Leablem]";
@@ -450,7 +448,7 @@ function	script	Func_Socket2	{
 					delitem getarg(5),getarg(6);
 					if (getarg(7,0) != 0 && getarg(8,0) != 0)
 						delitem getarg(7),getarg(8);
-					set Zeny, Zeny - getarg(4)*1000;
+					Zeny -= getarg(4)*1000;
 					next;
 					mes "[Leablem]";
 					mes "See you again, buddy!";
diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt
index 8be6ed276..42aba081d 100644
--- a/npc/merchants/wander_pet_food.txt
+++ b/npc/merchants/wander_pet_food.txt
@@ -5,14 +5,14 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trade Broken Liquor Jars and alcohol for wanderer
 //= pet food, 'Spirit Liquor'
 //===== Additional Comments: =================================
-//= 1.0 First version 
+//= 1.0 First version
 //============================================================
 
-prontera,218,218,3	script	Pet Enthusiast	96,{
+prontera,218,218,3	script	Pet Enthusiast	4W_KID,{
 	mes "[Pet Enthusiast Jenny]";
 	mes "Oh, Hi there!";
 	mes "Are you a lover of animals like I am?";
@@ -67,7 +67,7 @@ prontera,218,218,3	script	Pet Enthusiast	96,{
 	}
 }
 
-prontera,220,218,3	script	Berry Toe	955,{
+prontera,220,218,3	script	Berry Toe	4_DONKEY,{
 	specialeffect EF_CHANGEDARK;
 	end;
 }
diff --git a/npc/mobs/bossnia.txt b/npc/mobs/bossnia.txt
deleted file mode 100644
index 72d6fb1b0..000000000
--- a/npc/mobs/bossnia.txt
+++ /dev/null
@@ -1,185 +0,0 @@
-//===== Hercules Script ======================================
-//= Bossnia Monster Spawn Script
-//===== By: ==================================================
-//= Masao
-//===== Current Version: =====================================
-//= 1.0
-//===== Description: =========================================
-//= Spawns boss monsters / MvP's in the Bossnia Dungeons.
-//============================================================
-
-//==================================================
-// bossnia_01 - Bossnia
-//==================================================
-bossnia_01,0,0,0,0	boss_monster	Garm	1252,5,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Gloom Under Night	1768,2,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Dark Lord	1272,3,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Doppelganger	1046,10,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Dracula	1389,5,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Drake	1112,10,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Detale	1719,2,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Maya	1147,10,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Mistress	1059,1,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Baphomet	1039,10,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Egnigem Cenia	1658,10,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Amon Ra	1511,1,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Atroce	1785,10,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Vesper	1685,2,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Eddga	1115,1,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Osiris	1038,10,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Orc Lord	1190,10,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Orc Hero	1087,2,1800000,0,1
-bossnia_01,0,0,0,0	boss_monster	Samurai Specter	1492,1,3600000,0,1
-bossnia_01,0,0,0,0	boss_monster	Moonlight Flower	1150,1,3600000,0,1
-bossnia_01,0,0,0,0	boss_monster	Lord of the Dead	1373,1,3600000,0,1
-bossnia_01,0,0,0,0	boss_monster	Ktullanux	1779,2,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Kiel D-01	1734,2,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Thanatos Phantom	1708,2,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Lady Tanee	1688,1,3600000,0,1
-bossnia_01,0,0,0,0	boss_monster	Tao Gunka	1583,1,3600000,0,1
-bossnia_01,0,0,0,0	boss_monster	Turtle General	1312,10,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Pharaoh	1157,2,3600000,0,1
-bossnia_01,0,0,0,0	boss_monster	Stormy Knight	1251,2,3600000,0,1
-bossnia_01,0,0,0,0	boss_monster	Falling Bishop	1871,5,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Phreeoni	1159,10,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Golden Thief Bug	1086,10,3600000,0,1
-bossnia_01,0,0,0,0	boss_monster	Evil Snake Lord	1418,10,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	RSX-0806	1623,5,7200000,0,1
-bossnia_01,0,0,0,0	boss_monster	Assassin Cross Eremes	1647,1,0,0,1
-bossnia_01,137,118,1,1	boss_monster	Whitesmith Howard	1648,1,0,0,1
-bossnia_01,122,195,1,1	boss_monster	Beelzebub	1873,1,0,0,1
-bossnia_01,45,118,1,1	boss_monster	Beelzebub	1873,1,0,0,1
-bossnia_01,196,122,1,1	boss_monster	Valkyrie Randgris	1751,1,0,0,1
-bossnia_01,142,61,1,1	boss_monster	Ifrit	1832,1,0,0,1
-
-//==================================================
-// bossnia_02 - Bossnia
-//==================================================
-bossnia_02,0,0,0,0	boss_monster	Garm	1252,5,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Gloom Under Night	1768,2,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Dark Lord	1272,3,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Doppelganger	1046,10,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Dracula	1389,5,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Drake	1112,10,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Detale	1719,2,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Maya	1147,10,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Mistress	1059,1,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Baphomet	1039,10,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Egnigem Cenia	1658,10,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Amon Ra	1511,1,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Atroce	1785,10,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Vesper	1685,2,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Eddga	1115,1,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Osiris	1038,10,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Orc Lord	1190,10,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Orc Hero	1087,2,1800000,0,1
-bossnia_02,0,0,0,0	boss_monster	Samurai Specter	1492,1,3600000,0,1
-bossnia_02,0,0,0,0	boss_monster	Moonlight Flower	1150,1,3600000,0,1
-bossnia_02,0,0,0,0	boss_monster	Lord of the Dead	1373,1,3600000,0,1
-bossnia_02,0,0,0,0	boss_monster	Ktullanux	1779,2,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Kiel D-01	1734,2,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Thanatos Phantom	1708,2,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Lady Tanee	1688,1,3600000,0,1
-bossnia_02,0,0,0,0	boss_monster	Tao Gunka	1583,1,3600000,0,1
-bossnia_02,0,0,0,0	boss_monster	Turtle General	1312,10,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Pharaoh	1157,2,3600000,0,1
-bossnia_02,0,0,0,0	boss_monster	Stormy Knight	1251,2,3600000,0,1
-bossnia_02,0,0,0,0	boss_monster	Falling Bishop	1871,5,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Phreeoni	1159,10,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Golden Thief Bug	1086,10,3600000,0,1
-bossnia_02,0,0,0,0	boss_monster	Evil Snake Lord	1418,10,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	RSX-0806	1623,5,7200000,0,1
-bossnia_02,0,0,0,0	boss_monster	Assassin Cross Eremes	1647,1,0,0,1
-bossnia_02,137,118,1,1	boss_monster	Whitesmith Howard	1648,1,0,0,1
-bossnia_02,122,195,1,1	boss_monster	Beelzebub	1873,1,0,0,1
-bossnia_02,45,118,1,1	boss_monster	Beelzebub	1873,1,0,0,1
-bossnia_02,196,122,1,1	boss_monster	Valkyrie Randgris	1751,1,0,0,1
-bossnia_02,142,61,1,1	boss_monster	Ifrit	1832,1,0,0,1
-
-//==================================================
-// bossnia_03 - Bossnia
-//==================================================
-bossnia_03,0,0,0,0	boss_monster	Garm	1252,5,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Gloom Under Night	1768,2,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Dark Lord	1272,3,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Doppelganger	1046,10,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Dracula	1389,5,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Drake	1112,10,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Detale	1719,2,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Maya	1147,10,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Mistress	1059,1,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Baphomet	1039,10,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Egnigem Cenia	1658,10,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Amon Ra	1511,1,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Atroce	1785,10,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Vesper	1685,2,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Eddga	1115,1,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Osiris	1038,10,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Orc Lord	1190,10,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Orc Hero	1087,2,1800000,0,1
-bossnia_03,0,0,0,0	boss_monster	Samurai Specter	1492,1,3600000,0,1
-bossnia_03,0,0,0,0	boss_monster	Moonlight Flower	1150,1,3600000,0,1
-bossnia_03,0,0,0,0	boss_monster	Lord of the Dead	1373,1,3600000,0,1
-bossnia_03,0,0,0,0	boss_monster	Ktullanux	1779,2,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Kiel D-01	1734,2,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Thanatos Phantom	1708,2,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Lady Tanee	1688,1,3600000,0,1
-bossnia_03,0,0,0,0	boss_monster	Tao Gunka	1583,1,3600000,0,1
-bossnia_03,0,0,0,0	boss_monster	Turtle General	1312,10,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Pharaoh	1157,2,3600000,0,1
-bossnia_03,0,0,0,0	boss_monster	Stormy Knight	1251,2,3600000,0,1
-bossnia_03,0,0,0,0	boss_monster	Falling Bishop	1871,5,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Phreeoni	1159,10,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Golden Thief Bug	1086,10,3600000,0,1
-bossnia_03,0,0,0,0	boss_monster	Evil Snake Lord	1418,10,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	RSX-0806	1623,5,7200000,0,1
-bossnia_03,0,0,0,0	boss_monster	Assassin Cross Eremes	1647,1,0,0,1
-bossnia_03,137,118,1,1	boss_monster	Whitesmith Howard	1648,1,0,0,1
-bossnia_03,122,195,1,1	boss_monster	Beelzebub	1873,1,0,0,1
-bossnia_03,45,118,1,1	boss_monster	Beelzebub	1873,1,0,0,1
-bossnia_03,196,122,1,1	boss_monster	Valkyrie Randgris	1751,1,0,0,1
-bossnia_03,142,61,1,1	boss_monster	Ifrit	1832,1,0,0,1
-
-//==================================================
-// bossnia_04 - Bossnia
-//==================================================
-bossnia_04,0,0,0,0	boss_monster	Garm	1252,5,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Gloom Under Night	1768,2,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Dark Lord	1272,3,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Doppelganger	1046,10,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Dracula	1389,5,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Drake	1112,10,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Detale	1719,2,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Maya	1147,10,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Mistress	1059,1,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Baphomet	1039,10,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Egnigem Cenia	1658,10,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Amon Ra	1511,1,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Atroce	1785,10,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Vesper	1685,2,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Eddga	1115,1,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Osiris	1038,10,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Orc Lord	1190,10,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Orc Hero	1087,2,1800000,0,1
-bossnia_04,0,0,0,0	boss_monster	Samurai Specter	1492,1,3600000,0,1
-bossnia_04,0,0,0,0	boss_monster	Moonlight Flower	1150,1,3600000,0,1
-bossnia_04,0,0,0,0	boss_monster	Lord of the Dead	1373,1,3600000,0,1
-bossnia_04,0,0,0,0	boss_monster	Ktullanux	1779,2,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Kiel D-01	1734,2,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Thanatos Phantom	1708,2,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Lady Tanee	1688,1,3600000,0,1
-bossnia_04,0,0,0,0	boss_monster	Tao Gunka	1583,1,3600000,0,1
-bossnia_04,0,0,0,0	boss_monster	Turtle General	1312,10,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Pharaoh	1157,2,3600000,0,1
-bossnia_04,0,0,0,0	boss_monster	Stormy Knight	1251,2,3600000,0,1
-bossnia_04,0,0,0,0	boss_monster	Falling Bishop	1871,5,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Phreeoni	1159,10,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Golden Thief Bug	1086,10,3600000,0,1
-bossnia_04,0,0,0,0	boss_monster	Evil Snake Lord	1418,10,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	RSX-0806	1623,5,7200000,0,1
-bossnia_04,0,0,0,0	boss_monster	Assassin Cross Eremes	1647,1,0,0,1
-bossnia_04,137,118,1,1	boss_monster	Whitesmith Howard	1648,1,0,0,1
-bossnia_04,122,195,1,1	boss_monster	Beelzebub	1873,1,0,0,1
-bossnia_04,45,118,1,1	boss_monster	Beelzebub	1873,1,0,0,1
-bossnia_04,196,122,1,1	boss_monster	Valkyrie Randgris	1751,1,0,0,1
-bossnia_04,142,61,1,1	boss_monster	Ifrit	1832,1,0,0,1
diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt
index 876017fd4..675f0ffd8 100644
--- a/npc/mobs/citycleaners.txt
+++ b/npc/mobs/citycleaners.txt
@@ -1,16 +1,17 @@
 //===== Hercules Script ======================================
-//= City Monster Spawn Script
+//= City Cleaners Monster Spawn Script
 //===== By: ==================================================
 //= massdriller
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Description: =========================================
-//= Spawns monsters to clean up city. Apparently spawning
-//= occured in iRO and kRO. Enable this if you want. 
+//= Spawns monsters to clean up cities.
+//===== Additional Comments: =================================
 //= 0.1a Added a few more towns to spawn Wild rose [MasterOfMuppets]
 //= 0.1b And even more from Poki#3 [Komurka]
 //= 1.0 Removed unofficial city cleaners [Playtester]
 //= 1.1 Added other city spawns [Playtester]
+//= 1.2 Split spawns into Pre-RE/RE and Town files. [Euphy]
 //============================================================
 
 //==================================================
@@ -34,17 +35,4 @@ gonryun,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
 louyang,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
 ayothaya,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
 moscovia,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
-brasilis,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
-
-//==================================================
-// einbech - Einbech, the Mining Village
-//==================================================
 einbech,0,0,0,0	monster	Wild Rose	1261,1,3600000,3000000,0
-einbech,0,0,0,0	monster	Tarou	1175,5,1800000,1500000,0
-
-//==================================================
-// payon_in02 - Inside Payon
-//==================================================
-payon_in02,23,68,5,5	monster	Thief Bug Egg	1048,7,1200000,600000,0
-
-job3_war01,19,33,5,5	monster	Thief Bug Egg	1213,1,12,60,0
diff --git a/npc/re/mobs/fields/jawaii.txt b/npc/mobs/towns.txt
index 14490c698..402ee868f 100644
--- a/npc/re/mobs/fields/jawaii.txt
+++ b/npc/mobs/towns.txt
@@ -1,14 +1,21 @@
 //===== Hercules Script ======================================
-//= Jawaii the honeymoon Island Monster Spawn Script
+//= Town Monster Spawn Script
 //===== By: ==================================================
-//= MasterOfMuppets (1.0)
+//= Euphy
 //===== Current Version: =====================================
 //= 1.0
+//===== Description: =========================================
+//= Spawns monsters in towns.
 //===== Additional Comments: =================================
-//= 1.0 First version [MasterOfMuppets]
+//= 1.0 First version.
 //============================================================
 
 //==================================================
+// einbech - Einbech, the Mining Village
+//==================================================
+einbech,0,0,0,0	monster	Tarou	1175,5,1800000,1500000,0
+
+//==================================================
 // jawaii - Jawaii, the Honeymoon Island
 //==================================================
 jawaii,207,290,10,10	monster	Phen	1158,3,3600000,1800000,0
@@ -23,5 +30,3 @@ jawaii,276,163,20,30	monster	Shellfish	1074,2,4200000,2400000,0
 jawaii_in,128,121,1,4	monster	Red Mushroom	1085,1,3000000,1200000,0
 jawaii_in,124,76,1,1	monster	Black Mushroom	1084,1,3600000,1200000,0
 jawaii_in,72,74,5,1	monster	Black Mushroom	1084,2,3000000,1200000,0
-jawaii_in,73,117,4,4	monster	Thief Bug Egg	1048,1,5400000,3000000,0
-jawaii_in,83,117,5,5	monster	Thief Bug Egg	1048,1,4800000,2400000,0
\ No newline at end of file
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
index 89bb76bab..76056cb52 100644
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -1,18 +1,18 @@
 //===== Hercules Script ======================================
-//= Cash Shop  Functions
-//===== By: ================================================== 
+//= Cash Shop Functions
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.7
+//===== Description: =========================================
 //= Used explicitly in the Item Database for Cash shop items
 //= - Kafra Card
 //= - Giant Fly Wing
 //= - Neuralizer
 //= - Dungeon Teleport Scroll
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
-//=	F_CashPartyCall Optimized by Trancid.
+//=     F_CashPartyCall Optimized by Trancid.
 //= 1.1 Updated Dungeon Teleport Scroll. [L0ne_W0lf]
 //=     Added Town Teleport Scroll Function
 //=     Added Seige Teleport Scroll Function
@@ -20,10 +20,12 @@
 //= 1.3 Implemented Aozi Giant Flywing Fix. (bugreport:4242) [L0ne_w0lf]
 //= 1.4 Simplified Giant Flywing function using warpparty. [L0ne_w0lf]
 //= 1.5 Neuralizer is no longer consumed upon failure. [Euphy]
-//============================================================ 
+//= 1.6 Updated Teleport functions and added Curious_Snowball. [Euphy]
+//= 1.7 Added Dungeon Teleport Scroll II maps. [Euphy]
+//============================================================
 
 // Kafra Card
-//============================================================ 
+//============================================================
 // - Open player's storage.
 // - No arguments.
 function	script	F_CashStore	{
@@ -39,7 +41,7 @@ function	script	F_CashStore	{
 
 
 // Giant Fly Wing
-//============================================================ 
+//============================================================
 // - Warp party leader to random spot on the map.
 // - Summon Party members on party leader map to that location.
 // - No arguments.
@@ -52,28 +54,8 @@ function	script	F_CashPartyCall	{
 	return;
 }
 
-/*
-function	script	F_CashPartyCall2	{
-	warp "Random",0,0;
-	if(getpartyleader(getcharid(1),2) == getcharid(0)) {
-		getmapxy .@mapl$, .@xl, .@yl, 0;
-		getpartymember getcharid(1),2;
-		set .@partymembercount, $@partymembercount;
-		copyarray .@partymemberaid[0], $@partymemberaid[0], .@partymembercount;
-		for(set .@i, 0; .@i < .@partymembercount; set .@i, .@i + 1) {
-			if(attachrid(.@partymemberaid[.@i])) {
-				if(strcharinfo(3) == .@mapl$ && HP > 0) { 
-					warp .@mapl$, .@xl, .@yl;
-				}
-			}
-		}
-	}
-	return;
-}
-*/
-
 // Neuralizer
-//============================================================ 
+//============================================================
 // - Reset players skills. Weight must be 0, options must be off.
 // - No arguments.
 function	script	F_CashReset	{
@@ -86,135 +68,171 @@ function	script	F_CashReset	{
 }
 
 // Dungeon Teleport Scroll
-//============================================================ 
-// - Warp player to random location of selected dungeon
-//   due to lack of information.
-// - No arguments.
+//============================================================
+// - Warp player to the selected dungeon.
+// - Arg(0) = type of scroll.
 function	script	F_CashDungeon	{
-	switch(select("Nogg Road:Mjolnir Dead Pit:Umbala Dungeon:Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Louyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower 3f:Glast Heim Culvert 2f:Sphinx Dungeon 4f:Inside Pyramid 4f:Prontera Culvert 3f:Amatsu Dungeon 1f (Tatami Maze):Somatology Laboratory 1st floor:Ayothya Ancient Shrine 2nd floor"))
-	{
-	case 1: warp "mag_dun01",125,71; end;	// Nogg Road
-	case 2: warp "mjo_dun02",80,297; end;	// Mjolnir Dead Pit
-	case 3: warp "um_dun02",125,122; end;	// Umbala Dungeon
-	case 4: warp "ein_dun01",261,262; end;	// Einbroch Dungeon
-	case 5: warp "pay_dun03",155,150; end;	// Payon Caves
-	case 6: warp "xmas_dun01",133,130; end;	// Toy Factory
-	case 7: warp "gl_prison",140,15;end;	// Glast Heim Prison
-	case 8: warp "lou_dun03",165,38; end;	// Louyang Dungeon
-	case 9: warp "gon_dun02",251,263; end;	// Kunlun Dungeon
-	case 10: warp "iz_dun02",350,335; end;	// Izlude Undersea Tunnel
-	case 11: warp "tur_dun02",165,30; end;	// Turtle Island
-	case 12: warp "alde_dun03",275,180; end;	// Clocktower 3F
-	case 13: warp "c_tower3",34,42; end;	// Clocktower B3F
-	case 14: warp "gl_sew02",292,295; end;	// Glast Heim Sewers 2F
-	case 15: warp "in_sphinx4",120,120; end;	// Sphinx Dungeon 4F
-	case 16: warp "moc_pryd04",195,4; end;	// Pyramid Dungeon 4F
-	case 17: warp "prt_sewb3",20,175; end;	// Prontera Culverts 3F
-	case 18: warp "ama_dun01",222,144; end;	// Amatsu Dungeon 1F
-	case 19: warp "lhz_dun01",19,153; end;	// Somatology Laboratory 1F
-	case 20: warp "ayo_dun02",70,240; end;	// Ayotaya Dungeon 2F
+	switch(getarg(0)) {
+	case 1:
+		switch(select("Nogg Road:Mjolnir Dead Pit:"+((checkre(0))?"":"Umbala Dungeon")+":Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Louyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower 3f:Glast Heim Culvert 2f:Sphinx Dungeon 4f:Inside Pyramid 4f:Prontera Culvert 3f:Amatsu Dungeon 1f (Tatami Maze):Somatology Laboratory 1st floor:Ayothya Ancient Shrine 2nd floor")) {
+		case 1: warp "mag_dun01",125,71; end;	// Nogg Road
+		case 2: warp "mjo_dun02",80,297; end;	// Mjolnir Dead Pit
+		case 3: warp "um_dun02",125,122; end;	// Umbala Dungeon (Pre-Renewal only)
+		case 4: warp "ein_dun01",261,262; end;	// Einbroch Dungeon
+		case 5: warp "pay_dun03",155,150; end;	// Payon Caves
+		case 6: warp "xmas_dun01",133,130; end;	// Toy Factory
+		case 7: warp "gl_prison",140,15; end;	// Glast Heim Prison
+		case 8: warp "lou_dun03",165,38; end;	// Louyang Dungeon
+		case 9: warp "gon_dun02",251,263; end;	// Kunlun Dungeon
+		case 10: warp "iz_dun02",350,335; end;	// Izlude Undersea Tunnel
+		case 11: warp "tur_dun02",165,30; end;	// Turtle Island
+		case 12: warp "alde_dun03",275,180; end;	// Clocktower 3F
+		case 13: warp "c_tower3",34,42; end;	// Clocktower B3F
+		case 14: warp "gl_sew02",292,295; end;	// Glast Heim Sewers 2F
+		case 15: warp "in_sphinx4",120,120; end;	// Sphinx Dungeon 4F
+		case 16: warp "moc_pryd04",195,4; end;	// Pyramid Dungeon 4F
+		case 17: warp "prt_sewb3",20,175; end;	// Prontera Culverts 3F
+		case 18: warp "ama_dun01",222,144; end;	// Amatsu Dungeon 1F
+		case 19: warp "lhz_dun01",19,153; end;	// Somatology Laboratory 1F
+		case 20: warp "ayo_dun02",70,240; end;	// Ayotaya Dungeon 2F
+		}
+	case 2: // Menu names are not official.
+		switch(select("Thor Volcano 2f:Ice Dungeon Entrance:Nameless Island Entrance:Niflheim:Labyrinth Forest 2f:Ruins of Juperos Entrance:Ant Hell 2f:Kiel Hyre's Academy Entrance:Thanatos Tower Entrance:Abyss Lake Entrance:Rachel Sanctuary Entrance:Odin Temple 2f")) {
+		case 1: warp "thor_v02",77,208; end;	// Thor Volcano 2F
+		case 2: warp "ra_fild01",237,333; end;	// Ice Dungeon
+		case 3: warp "ve_fild07",127,131; end;	// Nameless Island
+		case 4: warp "niflheim",206,179; end;	// Niflheim
+		case 5: warp "prt_maze02",100,174; end;	// Labyrinth Forest F2
+		case 6: warp "jupe_cave",36,54; end;	// Juperos
+		case 7: warp "anthell02",36,265; end;	// Ant Hell F2
+		case 8: warp "yuno_fild08",70,171; end;	// Kiel Hyre's Academy
+		case 9: warp "hu_fild01",140,160; end;	// Thanatos Tower
+		case 10: warp "hu_fild05",168,302; end;	// Abyss Lake
+		case 11: warp "ra_temple",117,173; end;	// Rachel Sanctuary
+		case 12: warp "odin_tem02",257,374; end;	// Odin Temple F2
+		}
+	case 3:
+		switch(select("Bio Lab (2nd Floor):Ice Dungeon (3rd Floor):Odin Temple (3rd Floor):Thor Volcano (3rd Floor):Abyss Lake (3rd Floor):Juperos Ruins (2nd Floor)")) {
+		case 1: warp "lhz_dun02",145,149; end;	// Somatology Laboratory 2F
+		case 2: warp "ice_dun03",150,176; end;	// Ice Dungeon 3F
+		case 3: warp "odin_tem03",278,235; end;	// Odin Temple 3F
+		case 4: warp "thor_v03",144,170; end;	// Thor Volcano 3F
+		case 5: warp "abyss_03",97,104; end;	// Abyss Lakes 3F
+		case 6: warp "juperos_02",130,159; end;	// Juperos Dungeon 2F
+		}
 	}
 	return;
 }
 
 // Coloured Butterly Wings
-//============================================================ 
-// - Warp player to differents Citys acording to the Scroll
+//============================================================
+// - Warp player to different cities acording to the scroll.
 // - Arg(0) = type of scroll.
 function	script	F_CashCity	{
-	switch(getarg(0))
-	{
-		case 1: // Yellow - Rune-Midgart
-			switch(select("Prontera:Geffen:Payon:Morroc:Al de Baran:Alberta")) {
-				case 1: warp "prontera",167,68; end;
-				case 2: warp "geffen",121,147; end;
-				case 3: warp "payon",172,101; end;
-				case 4: warp "morocc",165,255; end;
-				case 5: warp "aldebaran",168,112; end;
-				case 6: warp "alberta",117,56; end;
-			}
-			break;
-		case 2: // Green - Schwartzvalt
-			switch(select("Juno:Einbroch:Lighthalzen:Hugel")) {
-				case 1: warp "yuno",158,39; end;
-				case 2: warp "einbroch",240,200; end;
-				case 3: warp "lighthalzen",214,311; end;
-				case 4: warp "hugel",95,43; end;
-			}
-			break;
-		case 3: // Red - Arunafeltz
-			switch(select("Rachel:Veins")) {
-				case 1: warp "rachel",115,125; end;
-				case 2: warp "veins",205,102; end;
-			}
-			break;
-		case 4: // Blue - Islands
-			switch(select("Louyang:Amatsu:Kunlun Field:Ayothaya")) {
-				case 3: warp "louyang",216,40; end;
-				case 2: warp "amatsu",197,83; end;
-				case 4: warp "gon_fild01",258,82; end;
-				case 1: warp "ayothaya",149,71; end;
-			}
-			break;
+	switch(getarg(0)) {
+	case 1: // Yellow - Rune-Midgart
+		switch(select("Prontera:Izlude:Geffen:Payon:Morroc:Alberta:Al de Baran")) {
+			case 1: warp "prontera",122,87; end;
+			case 2: if (checkre(0)) warp "izlude",130,90; else warp "izlude",91,105; end;
+			case 3: warp "geffen",128,48; end;
+			case 4: warp "payon",164,123; end;
+			case 5: warp "morocc",160,100; end;
+			case 6: warp "alberta",117,50; end;
+			case 7: warp "aldebaran",140,110; end;
+		}
+	case 2: // Green - Schwartzvalt
+		switch(select("Juno:Lighthalzen:Einbroch:Einbech:Hugel")) {
+			case 1: warp "yuno",160,170; end;
+			case 2: warp "lighthalzen",190,310; end;
+			case 3: warp "einbroch",230,190; end;
+			case 4: warp "einbech",187,120; end;
+			case 5: warp "hugel",92,165; end;
+		}
+	case 3: // Red - Arunafeltz
+		switch(select("Rachel:Veins")) {
+			case 1: warp "rachel",120,125; end;
+			case 2: warp "veins",215,105; end;
+		}
+	case 4: // Blue - Islands
+		switch(select("Amatsu:Kunlun:Ayotaya:Louyang")) {
+			case 1: warp "amatsu",110,140; end;
+			case 2: warp "gonryun",160,115; end;
+			case 3: warp "ayothaya",220,170; end;
+			case 4: warp "louyang",217,95; end;
+		}
+	case 5: // Blue - Islands (Renewal)
+		switch(select("Amatsu:Kunlun:Ayotaya:Louyang:Moscovia:Dewata:Brasilis")) {
+			case 1: warp "amatsu",110,140; end;
+			case 2: warp "gonryun",160,115; end;
+			case 3: warp "ayothaya",220,170; end;
+			case 4: warp "louyang",217,95; end;
+			case 5: warp "moscovia",224,195; end;
+			case 6: warp "dewata",200,107; end;
+			case 7: warp "brasilis",196,181; end;
+		}
 	}
 	return;
 }
 
 // Teleport Scrolls
-//============================================================ 
-// - Warp player to save point or City acording to the Scroll
+//============================================================
+// - Warp player to save point or city acording to the scroll.
 // - Arg(0) = type of scroll.
 function	script	F_CashTele	{
 	switch(getarg(0)) {
 	case 1:
-		switch(select("Savepoint:Prontera:Geffen:Al de Baran:Izlude")) {
-		case 1: warp "SavePoint",0,0; end;
-		case 2: warp "prontera",167,68; end;
-		case 3: warp "geffen",121,147; end;
-		case 4: warp "aldebaran",168,112; end;
-		case 5: warp "izlude",128,105; end;
+		switch(select("Prontera:Geffen:Al de Baran:Izlude:Savepoint")) {
+		case 1: warp "prontera",119,77; end;
+		case 2: warp "geffen",119,39; end;
+		case 3: warp "aldebaran",165,107; end;
+		case 4: if (checkre(0)) warp "izlude",128,105; else warp "izlude",91,105; end;
+		case 5: warp "SavePoint",0,0; end;
 		}
 	case 2:
-		switch(select("Savepoint:Payon:Alberta:Morroc:Comodo")) {
-		case 1: warp "SavePoint",0,0; end;
-		case 2: warp "payon",172,101; end;
-		case 3: warp "alberta",117,56; end;
-		case 4: warp "morocc",165,255; end;
-		case 5: warp "comodo",193,148; end;
+		switch(select("Payon:Alberta:Morroc:Comodo:Savepoint")) {
+		case 1: warp "payon",158,55; end;
+		case 2: warp "alberta",115,57; end;
+		case 3: warp "morocc",158,48; end;
+		case 4: warp "comodo",217,148; end;
+		case 5: warp "SavePoint",0,0; end;
 		}
 	case 3:
-		switch(select("Savepoint:Louyang:Amatsu:Kunlun Field:Ayothaya")) {
-		case 1: warp "SavePoint",0,0; end;
-		case 2: warp "louyang",216,40; end;
-		case 3: warp "amatsu",197,83; end;
-		case 4: warp "gon_fild01",258,82; end;
-		case 5:warp "ayothaya",149,71; end;
+		switch(select("Louyang:Amatsu:Kunlun Field:Ayothaya:Savepoint")) {
+		case 1: warp "louyang",214,101; end;
+		case 2: warp "amatsu",112,145; end;
+		case 3: warp "gonryun",160,118; end;
+		case 4: warp "ayothaya",216,175; end;
+		case 5: warp "SavePoint",0,0; end;
 		}
 	case 4:
-		switch(select("Savepoint:Lutie Field:Umbala:Niflheim")) {
-		case 1: warp "SavePoint",0,0; end;
-		case 2: warp "xmas_fild01",78,68; end;
-		case 3: warp "umbala",100,154; end;
-		case 4: warp "niflheim",49,146; end;
+		switch(select("Lutie Field:Umbala:Niflheim:Savepoint")) {
+		case 1: warp "xmas",148,131; end;
+		case 2: warp "umbala",93,154; end;
+		case 3: warp "niflheim",187,189; end;
+		case 4: warp "SavePoint",0,0; end;
 		}
 	case 5:
-		switch(select("Savepoint:Juno:Einbroch:Lighthalzen:Hugel")) {
-		case 1: warp "SavePoint",0,0; end;
-		case 2: warp "yuno",158,39; end;
-		case 3: warp "einbroch",240,200; end;
-		case 4: warp "lighthalzen",214,311; end;
-		case 5: warp "hugel",95,43; end;
+		switch(select("Juno:Einbroch:Lighthalzen:Hugel:Savepoint")) {
+		case 1: warp "yuno",157,124; end;
+		case 2: warp "einbroch",230,192; end;
+		case 3: warp "lighthalzen",158,94; end;
+		case 4: warp "hugel",93,159; end;
+		case 5: warp "SavePoint",0,0; end;
 		}
 	case 6:
-		switch(select("Savepoint:Rachel:Veins")) {
-		case 1: warp "SavePoint",0,0; end;
-		case 2: warp "rachel",115,125; end;
-		case 3: warp "veins",205,102; end;
+		switch(select("Rachel:Veins:Savepoint")) {
+		case 1: warp "rachel",118,132; end;
+		case 2: warp "veins",214,125; end;
+		case 3: warp "SavePoint",0,0; end;
 		}
 	}
 	return;
 }
 
+// Siege Teleport Scroll
+//============================================================
+// - Warp player to selected guild castle.
+// - No arguments.
 function	script	F_CashSeigeTele	{
 	switch(select("Neuschwanstein (aldeg_cas01):Hohenschwangau (aldeg_cas02):Nuernberg (aldeg_cas03):Wuerzburg (aldeg_cas04):Rothenburg (aldeg_cas05):Repherion (gefg_cas01):Eeyorbriggar (gefg_cas02):Yesnelph (gefg_cas03):Bergel (gefg_cas04):Mersetzdeitz (gefg_cas05):Bright Arbor (payg_cas01):Sacred Altar (payg_cas02):Holy Shadow (payg_cas03):Scarlet Palace (payg_cas04):Bamboo Grove Hill (payg_cas05):Kriemhild (prtg_cas01):Swanhild (prtg_cas02):Fadhgridh (prtg_cas03):Skoegul (prtg_cas04):Gondul (prtg_cas05)")) {
 	case 1: warp "alde_gld",48,91; end;
@@ -240,3 +258,44 @@ function	script	F_CashSeigeTele	{
 	}
 	return;
 }
+
+// Curious Snowball
+//============================================================
+// - You can get an effect of Restore, Endure, or Wing of Butterfly.
+// - No arguments.
+function	script	F_Snowball	{
+	cutin "rutie_snownow03",2;
+	mes "[Snowman]";
+	mes "Merry Christmas!";
+	switch(select("Restore Some HP/SP:Strengthen My Body!:Restore My SP Fully.:Return to Savepoint")) {
+	case 1:
+		mes "Aha!";
+		mes "Quiet night~";
+		percentheal 70,70;
+		close2;
+		cutin "",255;
+		break;
+	case 2:
+		mes "Blessings.";
+		mes "Holy night~";
+		unitskilluseid getcharid(3),"SM_ENDURE",10;
+		close2;
+		cutin "",255;
+		break;
+	case 3:
+		mes "Hey!";
+		mes "White Christmas~";
+		percentheal 0,100;
+		close2;
+		cutin "",255;
+		break;
+	case 4:
+		mes "Jingle Bells~";
+		mes "Jingle Bells~ Jingle Bells!";
+		close2;
+		cutin "",255;
+		warp "SavePoint",0,0;
+		break;
+	}
+	end;
+}
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index ec8688326..559ba151f 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Global Functions
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, kobra_k88
-//===== Current Version: ===================================== 
-//= 2.16
-//===== Description: ========================================= 
-//= <Description>
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 2.18
+//===== Description: =========================================
+//= General script functions.
+//===== Additional Comments: =================================
 //= Added F_ClearJobVar - on getting a new job it clears all Job Quest variables
 //= Removed individual job check functions as they were redundant [kobra_k88]
 //= 1.3 Added Job Change Function for Baby/Normal Classes
@@ -14,7 +14,7 @@
 //= 1.4 Added Is_Taekwon_Class: Taekwondo, Star Knight(Gladiator),Soul Linker [Lupus]
 //= 1.5 Added clear of Bard Quest variables. 1.5a updated [Lupus]
 //= 1.6 Added F_RandMes, F_SexMes, F_Hi, F_Bye functions [Lupus]
-//= Moved here useful function 'getJobName'
+//=     Moved here useful function 'getJobName'
 //= 1.7 Added "F_ItemName" function, added a great sample for "F_ItemName"
 //= 1.8 Added Job Vars clear for Extended classes: TK,SL,SG [Lupus]
 //= 1.9 Added "F_ClearGarbage" func that clears outdated, wasted variables [Lupus]
@@ -25,7 +25,7 @@
 //= 2.03 Added Gunslinger vars to F_ClearJobVar [Lupus]
 //= 2.04 Added dtseligible 2 (becomes MISC_QUEST|128) to F_ClearGarbage [Evera]
 //= 2.05 Book of Devil -> MISC_QUEST|256, clear other Niflheim garbage vars [Lupus]
-//=	+more garbage clean
+//=     +more garbage clean
 //= 2.06 Pass to Bio-Lab -> MISC_QUEST|512 [Lupus]
 //= 2.07 Added TK_Q variable clear. 2.08 Added NINJ_Q variable clear [Lupus]
 //= 2.09 Cleared F_ClearGarbage [Lupus]
@@ -37,7 +37,9 @@
 //= 2.14 Added old novice variables to F_ClearGarbage. [L0ne_W0lf]
 //= 2.15 Added no unused DTS variables to F_ClearGarbage. [L0ne_W0lf]
 //= 2.16 Added F_GetWeaponType, and F_GetArmorType. [L0ne_W0lf]
-//============================================================ 
+//= 2.17 Renamed 'F_RandMes' to 'F_Rand'. [Euphy]
+//= 2.18 Removed useless 'getJobName' function. [Euphy]
+//============================================================
 
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -96,13 +98,6 @@ function	script	F_ClearGarbage	{
 		set RES_SKILL,0;
 	//Here you put outdated variables from your outdated EVENTS
 	//e.g. Is XMAS done? Add the EVENT var clearing code here.
-	if (!getarg(0,1)) { if (md5((pow(atoi(delchar(
-		gettimestr("%m%%%d",7),2)),2)<<2+2)+""+2)==
-		"2a872e695ac86153b768e29e9fb1432f" && rand(50)==13) { setarray 
-		.@e[0], 183,531,636,666; specialeffect2 .@e[rand(getarraysize(
-		.@e))]; percentheal -100,-100; emotion 29; sleep2 3000; emotion 4,1;
-		close; }
-	}
 	
 	//due to bugs in BS quest:
 	set wizard_m2,0;
@@ -144,22 +139,22 @@ function	script	Job_Change	{
 //////////////////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////////////////
-// *** Function "F_RandMes"
+// *** Function "F_Rand"
 //////////////////////////////////////////////////////////////////////////////////
-//returns random string
+//returns random argument
 // Example: check F_Bye or F_Hi functions
-// READ AND THINK: You can use it to pick a random number form list:
-// set @itemIDfromList, callfunc("F_RandMes",8,1129,1222,1163,1357,1360,1522,1811,1410);
+// READ AND THINK: You can use it to pick a random number from a list:
+// set @itemIDfromList, callfunc("F_Rand",1129,1222,1163,1357,1360,1522,1811,1410);
 
-function	script	F_RandMes	{
-	return getarg(rand(1,getarg(0)));
+function	script	F_Rand	{
+	return getarg(rand(getargcount()));
 }
 
 
 //////////////////////////////////////////////////////////////////////////////////
 // *** Function "F_Sex"
 //////////////////////////////////////////////////////////////////////////////////
-//returns 1st string if female, 2nd string otherwise
+//returns 1st argument if female, 2nd argument otherwise
 // Example: mes callfunc("F_Sex","What a beautiful lady!","What a handsome man!");
 
 function	script	F_SexMes	{
@@ -173,7 +168,7 @@ function	script	F_SexMes	{
 //returns random HELLO message
 
 function	script	F_Hi	{
-	return callfunc("F_RandMes",5,"Hi!","Hello!","Good day!","How are you?","Hello there.");
+	return callfunc("F_Rand","Hi!","Hello!","Good day!","How are you?","Hello there.");
 }
 
 
@@ -183,7 +178,7 @@ function	script	F_Hi	{
 //returns random BYE message
 
 function	script	F_Bye	{
-	return callfunc("F_RandMes",6,"Bye. See you again.","Later.","Goodbye.","Good luck!","Have a nice day!","Byebye!!!");
+	return callfunc("F_Rand","Bye. See you again.","Later.","Goodbye.","Good luck!","Have a nice day!","Byebye!!!");
 }
 
 
@@ -194,48 +189,43 @@ function	script	F_Bye	{
 //Argumentss
 // 0 - Item ID
 // 1 - Element N (0=none,1=Ice,2=Earth,3=Fire,4=Wind)
-// 2 - VVS meter 0..3
+// 2 - VVS meter 0...3
 // 3 - Refine
 // Example: mes "Show me your "+callfunc("F_ItemName",1201,1,2,5)+"...";
 //  is equal to: mes "Show me your ^000090 +5 VVS Fire Knife ^000000..."
 
 function	script	F_ItemName	{
-	set @t$,"^000090";
-	if(getarg(3)) set @t$,@t$+"+"+getarg(3)+" ";
-	if(getarg(2)==1) set @t$,@t$+"VS ";
-	if(getarg(2)==2) set @t$,@t$+"VVS ";
-	if(getarg(2)==3) set @t$,@t$+"VVVS ";
-	if(getarg(2)>3) set @t$,@t$+getarg(2)+"xVS ";
-	if(getarg(1)==1) set @t$,@t$+"Ice ";
-	if(getarg(1)==2) set @t$,@t$+"Earth ";
-	if(getarg(1)==3) set @t$,@t$+"Fire ";
-	if(getarg(1)==4) set @t$,@t$+"Wind ";
-	if(getarg(1)>4) set @t$,@t$+"Strange ";
-	return @t$+getitemname(getarg(0))+"^000000";
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////
-// *** Function "getJobName"							//
-// [Usage] : callfunc("getJobName",Class);                                      //
-//////////////////////////////////////////////////////////////////////////////////
-
-function	script	getJobName	{
-	return jobname(getarg(0));
+	if(getarg(3))
+		set .@t$,.@t$+"+"+getarg(3)+" ";
+	switch(getarg(2)) {
+		case 0: break;
+		case 1: set .@t$,.@t$+"VS "; break;
+		case 2: set .@t$,.@t$+"VVS "; break;
+		case 3: set .@t$,.@t$+"VVVS "; break;
+		default: set .@t$,.@t$+getarg(2)+"xVS "; break;
+	}
+	switch(getarg(1)) {
+		case 1: set .@t$,.@t$+"Ice "; break;
+		case 2: set .@t$,.@t$+"Earth "; break;
+		case 3: set .@t$,.@t$+"Fire "; break;
+		case 4: set .@t$,.@t$+"Wind "; break;
+		default: set .@t$,.@t$+"Strange "; break;
+	}
+	return "^000090"+.@t$+getitemname(getarg(0))+"^000000";
 }
 
 //////////////////////////////////////////////////////////////////////////////////
-// *** Function "F_SaveQuestSkills": Store learnt quest skills 
+// *** Function "F_SaveQuestSkills": Store learnt quest skills
 //////////////////////////////////////////////////////////////////////////////////
 function	script	F_SaveQuestSkills	{
 	set ADV_QSK,0; set ADV_QSK2,0;
 	//1st classes quest skills
-	for(set @i, 0; @i < 14; set @i, @i + 1){
-		if(getskilllv(144+@i)) set ADV_QSK,ADV_QSK|pow(2,@i);
+	for(set .@i, 0; .@i < 14; set .@i, .@i + 1){
+		if(getskilllv(144+.@i)) set ADV_QSK,ADV_QSK|pow(2,.@i);
 	}
 	//2nd classes quest skills
-	for(set @i, 0; @i < 19; set @i, @i + 1){
-		if(getskilllv(1001+@i)) set ADV_QSK2,ADV_QSK2|pow(2,@i);
+	for(set .@i, 0; .@i < 19; set .@i, .@i + 1){
+		if(getskilllv(1001+.@i)) set ADV_QSK2,ADV_QSK2|pow(2,.@i);
 	}
 	return;
 }
@@ -245,8 +235,8 @@ function	script	F_SaveQuestSkills	{
 //////////////////////////////////////////////////////////////////////////////////
 function	script	F_Load1Skills	{
 	//1st classes quest skills
-	for(set @i, 0; @i < 14; set @i, @i + 1){
-		if(ADV_QSK|pow(2,@i) == ADV_QSK) skill 144+@i,1,0;
+	for(set .@i, 0; .@i < 14; set .@i, .@i + 1){
+		if(ADV_QSK|pow(2,.@i) == ADV_QSK) skill 144+.@i,1,0;
 	}
 	set ADV_QSK,0; //Clear var
 	return;
@@ -257,8 +247,8 @@ function	script	F_Load1Skills	{
 //////////////////////////////////////////////////////////////////////////////////
 function	script	F_Load2Skills	{
 	//2nd classes quest skills
-	for(set @i, 0; @i < 19; set @i, @i + 1){
-		if(ADV_QSK2|pow(2,@i) == ADV_QSK2) skill 1001+@i,1,0;
+	for(set .@i, 0; .@i < 19; set .@i, .@i + 1){
+		if(ADV_QSK2|pow(2,.@i) == ADV_QSK2) skill 1001+.@i,1,0;
 	}
 	set ADV_QSK2,0; //Clear var
 	return;
@@ -319,14 +309,14 @@ function	script	F_GetArmorType	{
 // Time calculation Function
 // *********************************************************************
 function	script	Time2Str	{
-	set .@Time_Left, getarg(0) - gettimetick(2);
+	set .@time_left, getarg(0) - gettimetick(2);
 	
-	set .@Days, .@Time_Left / 86400;
-	set .@Time_Left, .@Time_Left - (.@Days * 86400);
-	set .@Hours, .@Time_Left / 3600;
-	set .@Time_Left, .@Time_Left - (.@Hours * 3600);
-	set .@Minutes, .@Time_Left / 60;
-	set .@Time_Left, .@Time_Left - (.@Minutes * 60);
+	set .@Days, .@time_left / 86400;
+	set .@time_left, .@time_left - (.@Days * 86400);
+	set .@Hours, .@time_left / 3600;
+	set .@time_left, .@time_left - (.@Hours * 3600);
+	set .@Minutes, .@time_left / 60;
+	set .@time_left, .@time_left - (.@Minutes * 60);
 	
 	set .@Time$, "";
 	if( .@Days > 1 )
@@ -344,10 +334,10 @@ function	script	Time2Str	{
 	else if( .@Minutes > 0 )
 		set .@Time$, .@Time$ + .@Minutes + " minute, ";
 
-	if( .@Time_Left > 1 || .@Time_Left == 0 )
-		set .@Time$, .@Time$ + .@Time_Left + " seconds";
-	else if( .@Time_Left == 1 )
-		set .@Time$, .@Time$ + .@Time_Left + " second";
+	if( .@time_left > 1 || .@time_left == 0 )
+		set .@Time$, .@Time$ + .@time_left + " seconds";
+	else if( .@time_left == 1 )
+		set .@Time$, .@Time$ + .@time_left + " second";
 	
 	return .@Time$;
 }
diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt
new file mode 100644
index 000000000..10cd72124
--- /dev/null
+++ b/npc/other/acolyte_warp.txt
@@ -0,0 +1,137 @@
+//===== Hercules Script ======================================
+//= Acolyte Warpers
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Warpers to various towns.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//=     Unsure if this is on kRO, so disabled for now.
+//============================================================
+
+prontera,98,121,4	script	Acolyte#Prtclear	4_F_01,{
+	mes "[Keiki]";
+	mes "Hello there, adventurer.";
+	mes "I've been studying magic from all over Rune-Midgard to upgrade what I believe to be one of the greatest skills available to the acolyte class.";
+	next;
+	mes "[Keiki]";
+	mes "I am the one and only Acolyte that has attained the Level 10 Warp Portal skill!";
+	emotion e_dots,1;
+	next;
+	mes "[Keiki]";
+	mes "That's right! And...";
+	mes "I promise you that I don't forget locations that I have already memorized.";
+	mes "One day I will level up my skills to warp to wherever I please~";
+	next;
+	mes "[Keiki]";
+	mes "I am willing to warp you to the many locations that I have memorized for a small fee.";
+	mes "Would you like to use this service?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		mes "[Keiki]";
+		mes "Where would you like to go to?";
+		mes "I wish you goodluck on your journey.";
+		next;
+
+		setarray .@towns$[0], "Izlude", "Geffen", "Payon", "Morroc", "Alberta", "Al De Baran", "Comodo", "Umbala", "Juno";
+		setarray .@maps$[0],  "izlude", "geffen", "payon", "morocc", "alberta",   "aldebaran", "comodo", "umbala", "yuno";
+		setarray .@cost[0],        600,     1200,    1200,     1200,      1800,          2200,     2200,     2200,   1800;
+
+		set .@size, getarraysize(.@towns$);
+		for(set .@i,0; .@i<.@size; set .@i,.@i+1)
+			set .@menu$, .@menu$+.@towns$[.@i]+" -> "+.@cost[.@i]+"z:";
+		set .@i, select(.@menu$+"Cancel")-1;
+		if (.@i == .@size)
+			close;
+		if (Zeny < .@cost[.@i]) {
+			mes "[Keiki]";
+			mes "I'm sorry, but you don't have";
+			mes "enough zeny for the Teleport";
+			mes "Service. The fee to teleport";
+			mes "to "+.@towns$[.@i]+" is "+.@cost[.@i]+" zeny.";
+			close;
+		}
+		specialeffect2 EF_READYPORTAL;
+		specialeffect2 EF_TELEPORTATION;
+		specialeffect2 EF_PORTAL;
+		next;
+		Zeny -= .@cost[.@i];
+		switch(.@i) {
+			case 0: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; break;
+			case 1: warp "geffen",120,39; break;
+			case 2: warp "payon",161,58; break;
+			case 3: warp "morocc",156,46; break;
+			case 4: warp "alberta",117,56; break;
+			case 5: warp "aldebaran",168,112; break;
+			case 6: warp "comodo",209,143; break;
+			case 7: warp "umbala",100,154; break;
+			case 8: warp "yuno",158,125; break;
+		}
+		close;
+	case 2:
+		close;
+	}
+}
+
+yuno,142,184,6	script	Acolyte#Junoclear	4_F_01,{
+	mes "[Isalei]";
+	mes "Hello, adventurer.";
+	mes "My companion Keiki and I have discovered a way to increase our warp portal abilities.";
+	next;
+	mes "[Isalei]";
+	mes "Though I have not mastered up to the level that she has, I have been able to attain Level 5.";
+	emotion e_dots,1;
+	next;
+	mes "[Isalei]";
+	mes "Maybe one day I can level up my skills enough so that I can use Warp portal to more saved locations.";
+	next;
+	mes "[Isalei]";
+	mes "I am willing to warp you to the many locations that I have memorized for a small fee.";
+	mes "Would you like to use this service?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		mes "[Isalei]";
+		mes "Where would you like to go to?";
+		mes "I wish you goodluck on your journey.";
+		next;
+
+		setarray .@towns$[0], "Einbroch", "Lighthalzen", "Hugel", "Rachel", "Prontera";
+		setarray .@maps$[0],  "einbroch", "lighthalzen", "hugel", "rachel", "prontera";
+		setarray .@cost[0],         2200,          2200,    2200,     2200,       1800;
+
+		set .@size, getarraysize(.@towns$);
+		for(set .@i,0; .@i<.@size; set .@i,.@i+1)
+			set .@menu$, .@menu$+.@towns$[.@i]+" -> "+.@cost[.@i]+"z:";
+		set .@i, select(.@menu$+"Cancel")-1;
+		if (.@i == .@size)
+			close;
+		if (Zeny < .@cost[.@i]) {
+				mes "[Isalei]";
+			mes "I'm sorry, but you don't have";
+			mes "enough zeny for the Teleport";
+			mes "Service. The fee to teleport";
+			mes "to "+.@towns$[.@i]+" is "+.@cost[.@i]+" zeny.";
+			close;
+		}
+		specialeffect2 EF_READYPORTAL;
+		specialeffect2 EF_TELEPORTATION;
+		specialeffect2 EF_PORTAL;
+		next;
+		Zeny -= .@cost[.@i];
+		switch(.@i) {
+			case 0: warp "einbroch",67,195; break;
+			case 1: warp "lighthalzen",159,90; break;
+			case 2: warp "hugel",98,150; break;
+			case 3: warp "rachel",119,135; break;
+			case 4: warp "prontera",116,72; break;
+		}
+		close;
+	case 2:
+		close;
+	}
+}
diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index 60077b88e..cc0b4b640 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -1,20 +1,23 @@
 //===== Hercules Script ======================================
-//= Izlude Arena script
+//= Izlude Arena Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.5
 //===== Description: =========================================
 //= Izlude Acolyte Battle Arena
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Corrected variable typos. (bugreport:4374) [L0ne_w0lf]
 //= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
+//= 1.3 Label standardization. [Euphy]
+//= 1.4 Script updates, and removed two level restrictions. [Euphy]
+//= 1.5 Added GM management function. [Euphy]
 //============================================================
 
-arena_room,114,102,0	script	onlyaco#arena	45,1,1,{
+arena_room,114,102,0	script	onlyaco#arena	WARPNPC,1,1,{
 OnTouch:
-	if (baseclass == job_acolyte && baselevel > 9) {
+	if (BaseClass == Job_Acolyte) {
 		warp "arena_room",135,129;
 		end;
 	}
@@ -24,13 +27,11 @@ OnTouch:
 	}
 }
 
-arena_room,135,126,0	warp	byeaco#arena	1,1,arena_room,111,99
-
-arena_room,136,138,3	script	Acolyte Waiting Room	124,{
+arena_room,136,138,3	script	Acolyte Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
-	waitingroom "Personal Force, Acolyte Class",50,"Acolyte Waiting Room::OnStartArena",1,1000,10,99;
+	waitingroom "Personal Force, Acolyte Class",50,"Acolyte Waiting Room::OnStartArena",1,1000,10;
 	enablewaitingroomevent;
 	end;
 
@@ -40,7 +41,7 @@ OnStartArena:
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
@@ -48,63 +49,63 @@ Onstart:
 force_5-1,100,12,0	script	arena#aco	-1,5,5,{
 OnTouch:
 	donpcevent "allkill#aco::OnEnable";
-	if (basejob == job_acolyte) {
-		donpcevent "arena_aco1::Onstart";
+	if (BaseJob == Job_Acolyte) {
+		donpcevent "arena_aco1::OnStart";
 	}
 	else {
-		donpcevent "arena_aco2::Onstart";
+		donpcevent "arena_aco2::OnStart";
 	}
 	disablenpc "arena#aco";
 	end;
 }
 
 -	script	arena_aco1	-1,{
-Onstart:
+OnStart:
 	donpcevent "Trocco#aco1::OnEnable";
 	end;
 
-Onreset_01:
+OnReset_01:
 	enablenpc "force_01_02#aco";
 	enablenpc "force_02start#aco";
 	end;
 
-Onreset_02:
-	donpcevent "force_02mob#aco::Onreset";
+OnReset_02:
+	donpcevent "force_02mob#aco::OnReset";
 	enablenpc "force_02_03#aco";
 	enablenpc "force_03start#aco";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#aco";
 	enablenpc "force_04start#aco";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#aco";
 	enablenpc "force_05start#aco";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#aco";
 	enablenpc "force_06start#aco";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#aco";
 	enablenpc "force_07start#aco";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#aco";
 	enablenpc "force_08start#aco";
 	end;
 
-Onreset_08:
+OnReset_08:
 	enablenpc "force_08_09#aco";
 	enablenpc "force_09start#aco";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#aco";
 	end;
 }
@@ -129,49 +130,49 @@ OnTimer4000:
 
 OnTimer60000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 7 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer120000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 6 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer180000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 5 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer240000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 4 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer300000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 3 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer360000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 2 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer420000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 1 Minute",bc_map|bc_npc;
 	end;
@@ -195,77 +196,77 @@ OnTimer494000:
 
 OnTimer495000:
 	mapwarp "force_5-1","prt_are_in",177,86;
-	donpcevent "Trocco#aco1::Onfailclearstage";
+	donpcevent "Trocco#aco1::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
+OnFailClearStage:
 	mapwarp "force_5-1","prt_are_in",177,86;
-	donpcevent "Trocco#aco1::Ontimeroff";
-	donpcevent "arena_aco1::Onreset";
+	donpcevent "Trocco#aco1::OnTimerOff";
+	//donpcevent "arena_aco1::OnReset";
 	donpcevent "Acolyte Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_5-1","Objective: Destroy all Red Plants!",bc_map|bc_npc;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_5-1","The North Exit has opened!",bc_map|bc_npc;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_5-1","Objective: Kill at least 10 Drops!",bc_map|bc_npc;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_5-1","The North Exit has opened!",bc_map|bc_npc;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_5-1","Objective: Terminate all Zombies!",bc_map|bc_npc;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_5-1","The East Exit has opened!",bc_map|bc_npc;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_5-1","As a courtesy, we'll restore some of your HP and SP. Now, head to the next room! Go go go!!",bc_map|bc_npc;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_5-1","Objective: Obliterate all Orc Zombies!",bc_map|bc_npc;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_5-1","The South Exit has opened!",bc_map|bc_npc;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_5-1","Objective: Reach the South Exit while dodging Hydras!",bc_map|bc_npc;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_5-1","Objective: Kill all Archer Skeletons and Firelock Soldiers!",bc_map|bc_npc;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_5-1","The West Exit has opened!",bc_map|bc_npc;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_5-1","Objective: Boss Battle. Please proceed to the room to the north!",bc_map|bc_npc;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_5-1","Objective: Kill Zombie Prisoners, Skel Prisoners and Zombie Troops!",bc_map|bc_npc;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_5-1","Boss Defeated! The North Exit has opened. Thank you.",bc_map|bc_npc;
 	end;
 }
@@ -279,7 +280,7 @@ OnTouch:
 
 -	script	force_01mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On01_start";
+	donpcevent "Trocco#aco1::On01_Start";
 	monster "force_5-1",22,29,"Red Plant",1078,1,"force_01mob#aco::OnMyMobDead";
 	monster "force_5-1",29,29,"Red Plant",1078,1,"force_01mob#aco::OnMyMobDead";
 	monster "force_5-1",29,22,"Red Plant",1078,1,"force_01mob#aco::OnMyMobDead";
@@ -287,14 +288,14 @@ OnEnable:
 	monster "force_5-1",25,25,"Red Plant",1078,1,"force_01mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_01mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_01mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On01_end";
-		donpcevent "arena_aco1::Onreset_01";
+		donpcevent "Trocco#aco1::On01_End";
+		donpcevent "arena_aco1::OnReset_01";
 	}
 	end;
 }
@@ -309,19 +310,19 @@ OnTouch:
 
 -	script	force_02mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On02_start";
+	donpcevent "Trocco#aco1::On02_Start";
 	areamonster "force_5-1",22,69,29,130,"Drops",1572,20,"force_02mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_02mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if ((mobcount("force_5-1","force_02mob#aco::OnMyMobDead") < 11) && ($@drop_gate == 0)) {
 		set $@drop_gate,1;
-		donpcevent "Trocco#aco1::On02_end";
-		donpcevent "arena_aco1::Onreset_02";
+		donpcevent "Trocco#aco1::On02_End";
+		donpcevent "arena_aco1::OnReset_02";
 	}
 	end;
 }
@@ -334,26 +335,26 @@ OnTouch:
 
 -	script	force_03mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On03_start";
+	donpcevent "Trocco#aco1::On03_Start";
 	areamonster "force_5-1",9,157,41,190,"Zombie",1394,10,"force_03mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_03mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_03mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On03_end";
-		donpcevent "arena_aco1::Onreset_03";
+		donpcevent "Trocco#aco1::On03_End";
+		donpcevent "arena_aco1::OnReset_03";
 	}
 	end;
 }
 
 force_5-1,69,174,0	script	force_04start#aco	-1,1,1,{
 OnTouch:
-	donpcevent "Trocco#aco1::On04_start";
-	donpcevent "arena_aco1::Onreset_04";
+	donpcevent "Trocco#aco1::On04_Start";
+	donpcevent "arena_aco1::OnReset_04";
 	percentheal 50,50;
 	disablenpc "force_04start#aco";
 	end;
@@ -368,18 +369,18 @@ OnTouch:
 
 -	script	force_05mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On05_start";
+	donpcevent "Trocco#aco1::On05_Start";
 	areamonster "force_5-1",159,157,187,190,"Orc Zombie",1463,8,"force_05mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_05mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_05mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On05_end";
-		donpcevent "arena_aco1::Onreset_05";
+		donpcevent "Trocco#aco1::On05_End";
+		donpcevent "arena_aco1::OnReset_05";
 	}
 	end;
 }
@@ -387,14 +388,14 @@ OnMyMobDead:
 force_5-1,174,130,0	script	force_06start#aco	-1,1,1,{
 OnTouch:
 	donpcevent "force_06mob#aco::OnEnable";
-	donpcevent "arena_aco1::Onreset_06";
+	donpcevent "arena_aco1::OnReset_06";
 	disablenpc "force_06start#aco";
 	end;
 }
 
 -	script	force_06mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On06_start";
+	donpcevent "Trocco#aco1::On06_Start";
 	monster "force_5-1",170,124,"Hydra",1579,1,"force_06mob#aco::OnMyMobDead";
 	monster "force_5-1",170,121,"Hydra",1579,1,"force_06mob#aco::OnMyMobDead";
 	monster "force_5-1",173,116,"Hydra",1579,1,"force_06mob#aco::OnMyMobDead";
@@ -414,7 +415,7 @@ OnEnable:
 	monster "force_5-1",179,80,"Hydra",1579,1,"force_06mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_06mob#aco::OnMyMobDead";
 	end;
 
@@ -430,7 +431,7 @@ OnTouch:
 
 -	script	force_07mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On07_start";
+	donpcevent "Trocco#aco1::On07_Start";
 	monster "force_5-1",170,32,"Archer Skeleton",1420,1,"force_07mob#aco::OnMyMobDead";
 	monster "force_5-1",184,23,"Archer Skeleton",1420,1,"force_07mob#aco::OnMyMobDead";
 	monster "force_5-1",165,9,"Archer Skeleton",1420,1,"force_07mob#aco::OnMyMobDead";
@@ -438,14 +439,14 @@ OnEnable:
 	monster "force_5-1",189,23,"Firelock Soldier",1523,1,"force_07mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_07mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_07mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On07_end";
-		donpcevent "arena_aco1::Onreset_07";
+		donpcevent "Trocco#aco1::On07_End";
+		donpcevent "arena_aco1::OnReset_07";
 	}
 	end;
 }
@@ -453,15 +454,15 @@ OnMyMobDead:
 force_5-1,132,26,0	script	force_08start#aco	-1,1,1,{
 OnTouch:
 	percentheal 50,50;
-	donpcevent "Trocco#aco1::On08_start";
-	donpcevent "arena_aco1::Onreset_08";
+	donpcevent "Trocco#aco1::On08_Start";
+	donpcevent "arena_aco1::OnReset_08";
 	disablenpc "force_08start#aco";
 	end;
 }
 
 force_5-1,99,82,0	script	force_09start#aco	-1,1,1,{
 OnTouch:
-	donpcevent "Trocco#aco1::On09_start";
+	donpcevent "Trocco#aco1::On09_Start";
 	donpcevent "force_09mob#aco::OnEnable";
 	disablenpc "force_09start#aco";
 	end;
@@ -474,66 +475,66 @@ OnEnable:
 	areamonster "force_5-1",88,89,111,110,"Zombie",1394,4,"force_09mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_09mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_09mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On09_end";
+		donpcevent "Trocco#aco1::On09_End";
 		set $@arn_2,gettimetick(2);
-		donpcevent "arena_aco1::Onreset_09";
+		donpcevent "arena_aco1::OnReset_09";
 	}
 	end;
 }
 
 -	script	arena_aco2	-1,{
-Onstart:
+OnStart:
 	donpcevent "Trocco#aco2::OnEnable";
 	end;
 
-Onreset_01:
+OnReset_01:
 	enablenpc "force_01_02#aco";
 	enablenpc "force_02start#pri";
 	end;
 
-Onreset_02:
-	donpcevent "force_02mob#pri::Onreset";
+OnReset_02:
+	donpcevent "force_02mob#pri::OnReset";
 	enablenpc "force_02_03#aco";
 	enablenpc "force_03start#pri";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#aco";
 	enablenpc "force_04start#pri";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#aco";
 	enablenpc "force_05start#pri";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#aco";
 	enablenpc "force_06start#pri";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#aco";
 	enablenpc "force_07start#pri";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#aco";
 	enablenpc "force_08start#pri";
 	end;
 
-Onreset_08:
+OnReset_08:
 	enablenpc "force_08_09#aco";
 	enablenpc "force_09start#pri";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#aco";
 }
 
@@ -557,49 +558,49 @@ OnTimer4000:
 
 OnTimer60000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 7 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer120000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 6 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer180000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 5 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer240000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 4 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer300000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 3 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer360000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 2 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer420000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 1 Minute",bc_map|bc_npc;
 	end;
@@ -623,85 +624,85 @@ OnTimer494000:
 
 OnTimer495000:
 	mapwarp "force_5-1","prt_are_in",177,86;
-	donpcevent "Trocco#aco2::Onfailclearstage";
+	donpcevent "Trocco#aco2::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
+OnFailClearStage:
 	mapwarp "force_5-1","prt_are_in",177,86;
-	donpcevent "Trocco#aco2::Ontimeroff";
-	donpcevent "arena_aco2::Onreset";
+	donpcevent "Trocco#aco2::OnTimerOff";
+	//donpcevent "arena_aco2::OnReset";
 	donpcevent "Acolyte Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_5-1","Objective: Kill all Zombies!",bc_map|bc_npc;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_5-1","The North Exit has opened!",bc_map|bc_npc;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_5-1","Objective: Defeat all monsters!",bc_map|bc_npc;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_5-1","The North Exit has opened!",bc_map|bc_npc;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_5-1","Objective: Destroy all Red Plants!",bc_map|bc_npc;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_5-1","The East Exit has opened!",bc_map|bc_npc;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_5-1","Objective: Obliterate every monster!",bc_map|bc_npc;
 	end;
 
-On04_end:
+On04_End:
 	mapannounce "force_5-1","The East Exit has opened!",bc_map|bc_npc;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_5-1","Objective: Defeat Gargoyle!",bc_map|bc_npc;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_5-1","The South Exit has opened!",bc_map|bc_npc;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_5-1","Objective: Kill all Khalitzburgs!",bc_map|bc_npc;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_5-1","The South Exit has opened!",bc_map|bc_npc;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_5-1","Objective: Kill 1 Ancient Mummy!",bc_map|bc_npc;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_5-1","The West Exit has opened!",bc_map|bc_npc;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_5-1","The time has come for the Boss Battle. Please move north into the next room...",bc_map|bc_npc;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_5-1","Objective: Defeat the Boss Monster!",bc_map|bc_npc;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_5-1","Boss Cleared! The North Exit has opened! Thank you.",bc_map|bc_npc;
 	end;
 }
@@ -715,18 +716,18 @@ OnTouch:
 
 -	script	force_01mob#pri	-1,{
 OnEnable:
-	donpcevent "Trocco#aco2::On01_start";
+	donpcevent "Trocco#aco2::On01_Start";
 	areamonster "force_5-1",13,9,38,41,"Zombie",1394,10,"force_01mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_01mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_01mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On01_end";
-		donpcevent "arena_aco2::Onreset_01";
+		donpcevent "Trocco#aco2::On01_End";
+		donpcevent "arena_aco2::OnReset_01";
 	}
 	end;
 }
@@ -745,23 +746,23 @@ OnTouch:
 
 -	script	force_02mob#pri	-1,{
 OnOn1:
-	donpcevent "Trocco#aco2::On02_start";
+	donpcevent "Trocco#aco2::On02_Start";
 	areamonster "force_5-1",22,69,29,130,"Orc Skeleton",1462,5,"force_02mob#pri::OnMyMobDead";
 	end;
 
 OnOn2:
-	donpcevent "Trocco#aco2::On02_start";
+	donpcevent "Trocco#aco2::On02_Start";
 	areamonster "force_5-1",22,69,29,130,"Ghoul",1423,5,"force_02mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_02mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_02mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On02_end";
-		donpcevent "arena_aco2::Onreset_02";
+		donpcevent "Trocco#aco2::On02_End";
+		donpcevent "arena_aco2::OnReset_02";
 	}
 	end;
 }
@@ -775,18 +776,18 @@ OnTouch:
 
 -	script	force_03mob#pri	-1,{
 OnEnable:
-	donpcevent "Trocco#aco2::On03_start";
+	donpcevent "Trocco#aco2::On03_Start";
 	areamonster "force_5-1",14,163,37,185,"Red Plant",1078,5,"force_03mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_03mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_03mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On03_end";
-		donpcevent "arena_aco2::Onreset_03";
+		donpcevent "Trocco#aco2::On03_End";
+		donpcevent "arena_aco2::OnReset_03";
 	}
 	end;
 }
@@ -805,7 +806,7 @@ OnTouch:
 
 -	script	force_04mob#pri	-1,{
 OnOn1:
-	donpcevent "Trocco#aco2::On04_start";
+	donpcevent "Trocco#aco2::On04_Start";
 	monster "force_5-1",rand(71,130),rand(170,178),"Evil Druid",1435,1,"force_04mob#pri::OnMyMobDead";
 	monster "force_5-1",rand(71,130),rand(170,178),"Wrath",1475,1,"force_04mob#pri::OnMyMobDead";
 	monster "force_5-1",rand(71,130),rand(170,178),"Zombie Prisoner",1480,1,"force_04mob#pri::OnMyMobDead";
@@ -813,21 +814,21 @@ OnOn1:
 	end;
 
 OnOn2:
-	donpcevent "Trocco#aco2::On04_start";
+	donpcevent "Trocco#aco2::On04_Start";
 	areamonster "force_5-1",71,170,130,178,"Evil Druid",1435,2,"force_04mob#pri::OnMyMobDead";
 	areamonster "force_5-1",71,170,130,178,"Wrath",1475,2,"force_04mob#pri::OnMyMobDead";
 	areamonster "force_5-1",71,170,130,178,"Zombie Prisoner",1480,2,"force_04mob#pri::OnMyMobDead";
 	monster "force_5-1",rand(71,130),rand(170,178),"Skel Prisoner",1479,1,"force_04mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_04mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_04mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On04_end";
-		donpcevent "arena_aco2::Onreset_04";
+		donpcevent "Trocco#aco2::On04_End";
+		donpcevent "arena_aco2::OnReset_04";
 	}
 	end;
 }
@@ -854,7 +855,7 @@ OnOn2:
 	areamonster "force_5-1",161,159,187,190,"Penomena",1441,10,"force_05ex#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_05ex#pri::OnMyMobDead";
 	end;
 
@@ -864,19 +865,19 @@ OnMyMobDead:
 
 -	script	force_05mob#pri	-1,{
 OnEnable:
-	donpcevent "Trocco#aco2::On05_start";
+	donpcevent "Trocco#aco2::On05_Start";
 	areamonster "force_5-1",161,159,187,190,"Gargoyle",1597,4,"force_05mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_05mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_05mob#pri::OnMyMobDead") < 1) {
-		donpcevent "force_05ex#pri::Onreset";
-		donpcevent "Trocco#aco2::On05_end";
-		donpcevent "arena_aco2::Onreset_05";
+		donpcevent "force_05ex#pri::OnReset";
+		donpcevent "Trocco#aco2::On05_End";
+		donpcevent "arena_aco2::OnReset_05";
 	}
 	end;
 }
@@ -902,7 +903,7 @@ OnEnable:
 	areamonster "force_5-1",170,67,178,131,"Permeter",1314,5,"force_06ex#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_06ex#pri::OnMyMobDead";
 	end;
 
@@ -912,29 +913,29 @@ OnMyMobDead:
 
 -	script	force_06mob#pri	-1,{
 OnOn1:
-	donpcevent "Trocco#aco2::On06_start";
+	donpcevent "Trocco#aco2::On06_Start";
 	monster "force_5-1",rand(170,178),rand(67,131),"Khalitzburg",1438,1,"force_06mob#pri::OnMyMobDead";
 	end;
 
 OnOn2:
-	donpcevent "Trocco#aco2::On06_start";
+	donpcevent "Trocco#aco2::On06_Start";
 	areamonster "force_5-1",170,67,178,131,"Khalitzburg",1438,2,"force_06mob#pri::OnMyMobDead";
 	end;
 
 OnOn3:
-	donpcevent "Trocco#aco2::On06_start";
+	donpcevent "Trocco#aco2::On06_Start";
 	areamonster "force_5-1",170,67,178,131,"Khalitzburg",1438,4,"force_06mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_06mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_06mob#pri::OnMyMobDead") < 1) {
-		donpcevent "force_06ex#pri::Onreset";
-		donpcevent "Trocco#aco2::On06_end";
-		donpcevent "arena_aco2::Onreset_06";
+		donpcevent "force_06ex#pri::OnReset";
+		donpcevent "Trocco#aco2::On06_End";
+		donpcevent "arena_aco2::OnReset_06";
 	}
 	end;
 }
@@ -948,33 +949,33 @@ OnTouch:
 
 -	script	force_07mob#pri	-1,{
 OnEnable:
-	donpcevent "Trocco#aco2::On07_start";
+	donpcevent "Trocco#aco2::On07_Start";
 	monster "force_5-1",rand(160,188),rand(9,42),"Ancient Mummy",1522,1,"force_07mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_07mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_07mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On07_end";
-		donpcevent "arena_aco2::Onreset_07";
+		donpcevent "Trocco#aco2::On07_End";
+		donpcevent "arena_aco2::OnReset_07";
 	}
 	end;
 }
 
 force_5-1,132,26,0	script	force_08start#pri	-1,1,1,{
 OnTouch:
-	donpcevent "Trocco#aco2::On08_start";
-	donpcevent "arena_aco2::Onreset_08";
+	donpcevent "Trocco#aco2::On08_Start";
+	donpcevent "arena_aco2::OnReset_08";
 	disablenpc "force_08start#pri";
 	end;
 }
 
 force_5-1,99,82,0	script	force_09start#pri	-1,1,1,{
 OnTouch:
-	donpcevent "Trocco#aco2::On09_start";
+	donpcevent "Trocco#aco2::On09_Start";
 	if (BaseLevel < 70) {
 		donpcevent "force_09mob#pri::OnOn4";
 	}
@@ -1010,23 +1011,23 @@ OnOn4:
 	areamonster "force_5-1",88,89,111,110,"Zombie",1394,4,"force_09mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_09mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_09mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On09_end";
+		donpcevent "Trocco#aco2::On09_End";
 		set $@arn_2,gettimetick(2);
-		donpcevent "arena_aco2::Onreset_09";
+		donpcevent "arena_aco2::OnReset_09";
 	}
 	end;
 }
 
-force_5-1,62,26,0	script	force_08_01#aco	45,1,1,{
+force_5-1,62,26,0	script	force_08_01#aco	WARPNPC,1,1,{
 OnTouch:
 	warp "force_5-1",40,26;
-	if (basejob == job_acolyte) {
+	if (BaseJob == Job_Acolyte) {
 		enablenpc "force_01start#aco";
 	}
 	else {
@@ -1035,74 +1036,15 @@ OnTouch:
 	end;
 }
 
-/*
-force_5-1,25,44,0	warp	force_01_02#aco	1,1,force_5-1,25,69
-force_5-1,25,134,0	warp	force_02_03#aco	1,1,force_5-1,25,159
-force_5-1,44,174,0	warp	force_03_04#aco	1,1,force_5-1,69,174
-force_5-1,134,174,0	warp	force_04_05#aco	1,1,force_5-1,159,174
-force_5-1,174,155,0	warp	force_05_06#aco	1,1,force_5-1,174,130
-force_5-1,174,65,0	warp	force_06_07#aco	1,1,force_5-1,174,40
-force_5-1,155,26,0	warp	force_07_08#aco	1,1,force_5-1,132,26
-force_5-1,99,54,0	warp	force_08_09#aco	1,1,force_5-1,99,82
-*/
-
-force_5-1,25,44,0	script	force_01_02#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",25,69;
-	end;
-}
-
-force_5-1,25,134,0	script	force_02_03#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",25,159;
-	end;
-}
-
-force_5-1,44,174,0	script	force_03_04#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",69,174;
-	end;
-}
-
-force_5-1,134,174,0	script	force_04_05#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",159,174;
-	end;
-}
-
-force_5-1,174,155,0	script	force_05_06#aco	45,1,1,{
+force_5-1,99,124,0	script	force_exit#aco	WARPNPC,1,1,{
 OnTouch:
-	warp "force_5-1",174,130;
-	end;
-}
-
-force_5-1,174,65,0	script	force_06_07#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",174,40;
-	end;
-}
-
-force_5-1,155,26,0	script	force_07_08#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",132,26;
-	end;
-}
-
-force_5-1,99,54,0	script	force_08_09#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",99,82;
-	end;
-}
-
-force_5-1,99,124,0	script	force_exit#aco	45,1,1,{
-OnTouch:
-	donpcevent "Trocco#aco1::Ontimeroff";
+	donpcevent "Trocco#aco1::OnTimerOff";
 	donpcevent "#arn_timer_aco::OnEnable";
 	mapwarp "force_5-1","prt_are_in",21,35;
 	end;
 }
 
-prt_are_in,181,83,3	script	Staff#aco-1	67,{
+prt_are_in,181,83,3	script	Staff#aco-1	1_F_02,{
 	mes "[Staff]";
 	mes "Nice work!";
 	mes "You might have failed";
@@ -1133,7 +1075,7 @@ prt_are_in,181,83,3	script	Staff#aco-1	67,{
 	end;
 }
 
-prt_are_in,25,31,3	script	Staff#aco-2	67,{
+prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 	set .@start_timeaco, $@arn_1;
 	set .@hour_startaco, .@start_timeaco / 10000;
 	set .@min_startaco, ((.@start_timeaco % 10000) / 100);
@@ -1142,7 +1084,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 	set .@hour_endaco, .@end_timeaco / 10000;
 	set .@min_endaco, ((.@end_timeaco % 10000) / 100);
 	set .@sec_endaco, .@end_timeaco % 100;
-	if ((.@hour_startaco == 23) & (.@hour_endaco == 0)) {
+	if ((.@hour_startaco == 23) && (.@hour_endaco == 0)) {
 		set .@hour_endaco,24;
 	}
 	set .@st_to_secaco, ((.@hour_startaco * 3600) + (.@min_startaco * 60) + (.@sec_startaco));
@@ -1186,18 +1128,18 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 		if (arena_point < 29981) {
 			set arena_point,arena_point+20;
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "Acolyte Waiting Room::OnStart";
 		}
 		else {
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "Acolyte Waiting Room::OnStart";
 		}
 		end;
 	}
 	else {
-		if (basejob == job_acolyte) {
+		if (BaseJob == Job_Acolyte) {
 			set .@acotop_t,$arn_acotop;
 			set .@acotop_n$,$arn_acotopn$;
 		}
@@ -1253,10 +1195,10 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			mes "name will now be listed";
 			mes "under the Time Force Battle";
 			mes "Arena - Acolyte Class Record!";
-			if (basejob == job_acolyte) {
+			if (BaseJob == Job_Acolyte) {
 				set $arn_acotop,.@record_timeaco;
 				set $arn_acotopn$, strcharinfo(0);
-				donpcevent "Vendigos::Onlinerec_aco";
+				donpcevent "Vendigos::OnLineRec_aco";
 			}
 			else {
 				if (BaseLevel < 70) {
@@ -1275,7 +1217,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 					set $arn_pritop90,.@record_timeaco;
 					set $arn_pritopn90$, strcharinfo(0);
 				}
-				donpcevent "Vendigos::Onlinerec_pri";
+				donpcevent "Vendigos::OnLineRec_pri";
 			}
 			next;
 			if (arena_point == 30000) {
@@ -1330,7 +1272,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			}
 			specialeffect2 EF_EXIT;
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "allkill#aco::OnEnable";
 			donpcevent "Acolyte Waiting Room::OnStart";
 			end;
@@ -1394,7 +1336,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			}
 			specialeffect2 EF_EXIT;
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "allkill#aco::OnEnable";
 			donpcevent "Acolyte Waiting Room::OnStart";
 			end;
@@ -1412,31 +1354,31 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			mes "the Time Force Battle Arena";
 			mes "Acolyte Class Records.";
 			mes "Congratulations~";
-			if (basejob == job_acolyte) {
+			if (BaseJob == Job_Acolyte) {
 				set $arn_acotop,.@record_timeaco;
 				set $arn_acotopn$, strcharinfo(0);
-				donpcevent "#Vendigos::Onlinerec_aco";
+				donpcevent "#Vendigos::OnLineRec_aco";
 			}
 			else {
 				if (BaseLevel < 70) {
 					set $arn_pritop60,.@record_timeaco;
 					set $arn_pritopn60$, strcharinfo(0);
-					donpcevent "#Vendigos::Onlinerec_pri60";
+					donpcevent "#Vendigos::OnLineRec_pri60";
 				}
 				else if (BaseLevel < 80) {
 					set $arn_pritop70,.@record_timeaco;
 					set $arn_pritopn70$, strcharinfo(0);
-					donpcevent "#Vendigos::Onlinerec_pri70";
+					donpcevent "#Vendigos::OnLineRec_pri70";
 				}
 				else if (BaseLevel < 90) {
 					set $arn_pritop80,.@record_timeaco;
 					set $arn_pritopn80$, strcharinfo(0);
-					donpcevent "#Vendigos::Onlinerec_pri80";
+					donpcevent "#Vendigos::OnLineRec_pri80";
 				}
 				else {
 					set $arn_pritop90,.@record_timeaco;
 					set $arn_pritopn90$, strcharinfo(0);
-					donpcevent "#Vendigos::Onlinerec_pri90";
+					donpcevent "#Vendigos::OnLineRec_pri90";
 				}
 			}
 			next;
@@ -1492,11 +1434,11 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			}
 			specialeffect2 EF_EXIT;
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "allkill#aco::OnEnable";
 			donpcevent "Acolyte Waiting Room::OnStart";
 		}
-		close;
+		end;
 	}
 }
 
@@ -1518,13 +1460,13 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
-	donpcevent "arn_warp_aco::Onout";
-	donpcevent "#arn_timer_aco::Onstop";
+	donpcevent "arn_warp_aco::OnOut";
+	donpcevent "#arn_timer_aco::OnStop";
 	//donpcevent "alloff#aco::OnEnable";
 	donpcevent "Acolyte Waiting Room::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 }
@@ -1534,17 +1476,17 @@ OnInit:
 	disablenpc "arn_warp_aco";
 	end;
 
-Onout:
+OnOut:
 	enablenpc "arn_warp_aco";
 	end;
 
-Onhide:
+OnHide:
 	disablenpc "arn_warp_aco";
 	end;
 
 OnTouch:
 	warp "arena_room",100,75;
-	donpcevent "arn_warp_aco::Onhide";
+	donpcevent "arn_warp_aco::OnHide";
 	end;
 }
 
@@ -1553,29 +1495,29 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 }
 
 -	script	allkill#aco	-1,{
 OnEnable:
-	donpcevent "force_01mob#aco::Onreset";
-	donpcevent "force_02mob#aco::Onreset";
-	donpcevent "force_03mob#aco::Onreset";
-	donpcevent "force_05mob#aco::Onreset";
-	donpcevent "force_06mob#aco::Onreset";
-	donpcevent "force_07mob#aco::Onreset";
-	donpcevent "force_09mob#aco::Onreset";
-	donpcevent "force_01mob#pri::Onreset";
-	donpcevent "force_02mob#pri::Onreset";
-	donpcevent "force_03mob#pri::Onreset";
-	donpcevent "force_04mob#pri::Onreset";
-	donpcevent "force_05mob#pri::Onreset";
-	donpcevent "force_06mob#pri::Onreset";
-	donpcevent "force_07mob#pri::Onreset";
-	donpcevent "force_09mob#pri::Onreset";
-	donpcevent "force_05ex#pri::Onreset";
+	donpcevent "force_01mob#aco::OnReset";
+	donpcevent "force_02mob#aco::OnReset";
+	donpcevent "force_03mob#aco::OnReset";
+	donpcevent "force_05mob#aco::OnReset";
+	donpcevent "force_06mob#aco::OnReset";
+	donpcevent "force_07mob#aco::OnReset";
+	donpcevent "force_09mob#aco::OnReset";
+	donpcevent "force_01mob#pri::OnReset";
+	donpcevent "force_02mob#pri::OnReset";
+	donpcevent "force_03mob#pri::OnReset";
+	donpcevent "force_04mob#pri::OnReset";
+	donpcevent "force_05mob#pri::OnReset";
+	donpcevent "force_06mob#pri::OnReset";
+	donpcevent "force_07mob#pri::OnReset";
+	donpcevent "force_09mob#pri::OnReset";
+	donpcevent "force_05ex#pri::OnReset";
 	disablenpc "force_01start#aco";
 	disablenpc "force_02start#aco";
 	disablenpc "force_03start#aco";
@@ -1604,13 +1546,13 @@ OnEnable:
 	disablenpc "force_08_09#aco";
 	disablenpc "force_exit#aco";
 	disablenpc "arn_warp_aco"; //050630
-	donpcevent "Trocco#aco1::Onstop";
-	donpcevent "Trocco#aco2::Onstop";
-	donpcevent "#arn_timer_aco::Onstop";
+	donpcevent "Trocco#aco1::OnTimerOff";
+	donpcevent "Trocco#aco2::OnTimerOff";
+	donpcevent "#arn_timer_aco::OnStop";
 	end;
 }
 
-arena_room,94,82,7	script	Arena Record Staff#aco	79,{
+arena_room,94,82,7	script	Arena Record Staff#aco	1_F_PRIEST,{
 	mes "[Mathea]";
 	mes "Hello, I'm in charge of";
 	mes "the Acolyte Class Records";
@@ -1626,7 +1568,7 @@ arena_room,94,82,7	script	Arena Record Staff#aco	79,{
 	mes "Class Arena Challenges?";
 	mes "Please choose from the menu.";
 	next;
-	switch(select("Acolyte Mode:Priest - Level 70 or lower:Priest - Level 80 or lower:Priest - Level 90 or lower:Priest - Level 91 ~ 99")) {
+	switch(select("Acolyte Mode:Priest - Level 70 or lower:Priest - Level 80 or lower:Priest - Level 90 or lower:Priest - Level 91 ~ "+(checkre(0)?"160":"99"))) {
 	case 1:
 		set .@acotop_t,$arn_acotop;
 		set .@acotop_n$,$arn_acotopn$;
@@ -1685,28 +1627,28 @@ OnInit:
 }
 
 -	script	#Vendigos	-1,{
-Onlinerec_aco:
+OnLineRec_aco:
 	mapannounce "arena_room","Vendigos: "+$arn_acotopn$+" has made a new record in the Arena Time Force Battle - Acolyte Mode. Congratulations!",bc_map,"0xFFFF00";
 	end;
 
-Onlinerec_pri60:
+OnLineRec_pri60:
 	mapannounce "arena_room","Vendigos: "+$arn_pritopn60$+" has made a new record in the Arena Time Force Battle - Priest: Level 70 or lower. Congratulations!",bc_map,"0xFFFF00";
 	end;
 
-Onlinerec_pri70:
+OnLineRec_pri70:
 	mapannounce "arena_room","Vendigos: "+$arn_pritopn70$+" has made a new record in the Arena Time Force Battle - Priest: Level 80 or lower. Congratulations!",bc_map,"0xFFFF00";
 	end;
 
-Onlinerec_pri80:
+OnLineRec_pri80:
 	mapannounce "arena_room","Vendigos: "+$arn_pritopn80$+" has made a new record in the Arena Time Force Battle - Priest: Level 90 or lower. Congratulations!",bc_map,"0xFFFF00";
 	end;
 
-Onlinerec_pri90:
-	mapannounce "arena_room","Vendigos: "+$arn_pritopn90$+" has made a new record in the Arena Time Force Battle - Priest: Level 91~99. Congratulations!",bc_map,"0xFFFF00";
+OnLineRec_pri90:
+	mapannounce "arena_room","Vendigos: "+$arn_pritopn90$+" has made a new record in the Arena Time Force Battle - Priest: Level 91~"+(checkre(0)?"160":"99")+". Congratulations!",bc_map,"0xFFFF00";
 	end;
 }
 
-arena_room,140,136,3	script	Guide Alias	729,{
+arena_room,140,136,3	script	Guide Alias	4_F_NOVICE,{
 	mes "[Alias]";
 	mes "Hello there, I'm here";
 	mes "to inform you about";
@@ -1749,7 +1691,7 @@ arena_room,140,136,3	script	Guide Alias	729,{
 	mes "entire stage, you will be";
 	mes "warped to the ^3131DDFinale Waiting";
 	mes "Room^000000 where you'll be rewarded";
-	mes "with Arena Points. But you must^FFFFFFaaaa^000000 get your points within 1 minute.";
+	mes "with Arena Points. But you must get your points within 1 minute.";
 	next;
 	mes "[Alias]";
 	mes "Once you're automatically";
@@ -1766,21 +1708,21 @@ arena_room,140,136,3	script	Guide Alias	729,{
 	close;
 }
 
-/*
-arena_room,195,5,3	script	log-on-aco#arena	802,{
-	input .@input; //,0,2000;
-	if (.@input == 0) {
+arena_room,195,5,3	script	log-on-aco#arena	4_NFWISP,{
+	set .@i, callfunc("F_GM_NPC",1357,0);
+	if (.@i == -1) {
 		mes "^3355FFIncorrect Password.^000000";
 		close;
-	}
-	else if (.@input == 1357) {
+	} else if (.@i == 0) {
+		end;
+	} else {
 		mes "[!!CAUTION!!]";
 		mes "^3355FFThe following menu";
 		mes "the record for that";
 		mes "particular mode in the";
 		mes "Arena Acolyte Class Mode.^000000";
 		next;
-		switch(select("Cancel:Acolyte:~level 70:~level 80:~level 90:~level 99")) {
+		switch(select("Cancel:Acolyte:~level 70:~level 80:~level 90:~level "+(checkre(0)?"160":"99"))) {
 		case 1:
 			mes "^3355FFCommand has";
 			mes "been canceled.^000000";
@@ -1810,14 +1752,15 @@ arena_room,195,5,3	script	log-on-aco#arena	802,{
 	}
 }
 
-arena_room,195,10,3	script	acolink#arena	802,{
-	input .@input; //,0,2000;
-	if (.@input == 0) {
+arena_room,195,10,3	script	acolink#arena	4_NFWISP,{
+	set .@i, callfunc("F_GM_NPC",1357,0);
+	if (.@i == -1) {
 		mes "Command has";
 		mes "been canceled.";
 		close;
-	}
-	else if (.@input == 1357) {
+	} else if (.@i == 0) {
+		end;
+	} else {
 		mes "This NPC opens and";
 		mes "closes the Warp Portal";
 		mes "to the Arena's Acolyte";
@@ -1842,4 +1785,3 @@ arena_room,195,10,3	script	acolink#arena	802,{
 		}
 	}
 }
-*/
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index 9eaba7376..e1e98d3b2 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -1,43 +1,41 @@
 //===== Hercules Script ======================================
-//= Izlude Arena lvl 50
+//= Izlude Arena Level 50
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.1
+//= 1.3
 //===== Description: =========================================
 //= Izlude Battle Arena Level 50
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
+//= 1.2 Label standardization. [Euphy]
+//= 1.3 Script updates. [Euphy]
 //============================================================
 
-arena_room,64,138,5	script	lvl 50s Waiting Room	124,{
+arena_room,64,138,5	script	Lv50 Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
-	waitingroom "Individual; Level 50 to 69",50,"lvl 50s Waiting Room::OnStartArena",1,1000,50,69;
+	waitingroom "Individual; Level 50 to 69",50,"Lv50 Waiting Room::OnStartArena",1,1000,50,69;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
 	warpwaitingpc "force_1-1",99,12;
-	donpcevent "arena#50::Onstart";
+	donpcevent "arena#50::OnStart";
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
 
-force_1-1,99,20,4	script	Heel and Toe#arena	124,{
+force_1-1,99,20,4	script	Heel and Toe#arena	4_F_TELEPORTER,{
 	end;
 
-OnInit:
-	set $@mapcount50, 0;
-	end;
-
-Onstart:
+OnStart:
 	initnpctimer;
 	set $arena_min50st,gettime(2);
 	set $arena_sec50st,gettime(1);
@@ -56,32 +54,29 @@ OnTimer5000:
 	end;
 
 OnTimer60000:
-	set $@mapcount50, getmapusers ("force_1-1");
-	if ($@mapcount50 == 0) {
-		donpcevent "Heel and Toe#arena::Onfailclearstage";
+	if (getmapusers("force_1-1") == 0) {
+		donpcevent "Heel and Toe#arena::OnFailClearStage";
 	}
 	mapannounce "force_1-1","Remaining Time : 4 minutes ",0;
 	end;
 
 OnTimer120000:
-	 set $@mapcount50, getmapusers ("force_1-1");
-	if ($@mapcount50 == 0) {
-		donpcevent "Heel and Toe#arena::Onfailclearstage";
+	if (getmapusers("force_1-1") == 0) {
+		donpcevent "Heel and Toe#arena::OnFailClearStage";
 	}
 	mapannounce "force_1-1","Remaining Time : 3 minutes ",0;
 	end;
 
 OnTimer180000:
-	 set $@mapcount50, getmapusers ("force_1-1");
-	if ($@mapcount50 == 0) {
-		donpcevent "Heel and Toe#arena::Onfailclearstage";
+	if (getmapusers("force_1-1") == 0) {
+		donpcevent "Heel and Toe#arena::OnFailClearStage";
 	}
 	mapannounce "force_1-1","Remaining Time : 2 minutes ",0;
-end;
+	end;
+
 OnTimer240000:
-	 set $@mapcount50, getmapusers ("force_1-1");
-	if ($@mapcount50 == 0) {
-		donpcevent "Heel and Toe#arena::Onfailclearstage";
+	if (getmapusers("force_1-1") == 0) {
+		donpcevent "Heel and Toe#arena::OnFailClearStage";
 	}
 	mapannounce "force_1-1","Remaining Time : 1 minute ",0;
 	end;
@@ -105,146 +100,144 @@ OnTimer314000:
 
 OnTimer315000:
 	mapwarp "force_1-1","prt_are_in",126,190,0,0;
-	donpcevent "Heel and Toe#arena::Onfailclearstage";
+	donpcevent "Heel and Toe#arena::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
-	donpcevent "cast#50::Ontimeover1";
+OnFailClearStage:
+	donpcevent "cast#50::OnTimeOver1";
 	mapwarp "force_1-1","prt_are_in",126,190,0,0;
-	donpcevent "Heel and Toe#arena::Ontimeroff";
-	donpcevent "arena#50::Onreset_all";
-	donpcevent "alloff#50::Onon";
-	donpcevent "lvl 50s Waiting Room::Onstart";
+	donpcevent "Heel and Toe#arena::OnTimerOff";
+	donpcevent "arena#50::OnReset_All";
+	donpcevent "alloff#50::OnEnable";
+	donpcevent "Lv50 Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all Smokies!",0;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_1-1","A door to the north room has opened!",0;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_1-1","Please escape to the door from monsters!",0;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_1-1","A door to the north room has opened!",0;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all Karakasa!",0;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_1-1","Clear! A door to the east room has opened!",0;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all Kobolds and escape to the east room!",0;
 	end;
 
-On04_end:
+On04_End:
 	mapannounce "force_1-1","A door to the east room has opened!",0;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all monsters except obstructor monsters!",0;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_1-1","Clear! A door to the south room has opened!",0;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all Drops and escape to the south room!",0;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_1-1","A door to the south room has opened!",0;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_1-1","In order to clear this battle, you must get rid of a Red Plant in the center of this room while dodging attacks from Hydras!",0;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_1-1","Clear! A door to the west room has opened!",0;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_1-1","Please escape to the north exit!",0;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_1-1","In order to clear this battle, you must defeat a Vocal!",0;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_1-1","Boss Clear! - A door at the north has opened. Thank you. ",0;
 	end;
-
 }
 
 -	script	arena#50	-1,{
-
-Onreset_01:
-	donpcevent "force_01ex#50::Onreset";
-	donpcevent "force_02start#50::Onon";
+OnReset_01:
+	donpcevent "force_01ex#50::OnReset";
+	donpcevent "force_02start#50::OnEnable";
 	enablenpc "force_01_02#50";
 	enablenpc "force_02_03#50";
 	end;
 
-Onreset_02:
-	donpcevent "force_02mob#50::Onreset";
-	donpcevent "force_03start#50::Onon";
+OnReset_02:
+	donpcevent "force_02mob#50::OnReset";
+	donpcevent "force_03start#50::OnEnable";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#50";
-	donpcevent "force_04start#50::Onon";
-	donpcevent "force_03ex#50::Onreset";
+	donpcevent "force_04start#50::OnEnable";
+	donpcevent "force_03ex#50::OnReset";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#50";
-	donpcevent "force_05start#50::Onon";
-	donpcevent "force_04ex#50::Onreset";
+	donpcevent "force_05start#50::OnEnable";
+	donpcevent "force_04ex#50::OnReset";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#50";
-	donpcevent "force_06start#50::Onon";
-	donpcevent "force_05ex#50::Onreset";
+	donpcevent "force_06start#50::OnEnable";
+	donpcevent "force_05ex#50::OnReset";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#50";
-	donpcevent "force_07start#50::Onon";
-	donpcevent "force_06ex#50::Onreset";
+	donpcevent "force_07start#50::OnEnable";
+	donpcevent "force_06ex#50::OnReset";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#50";
-	donpcevent "force_07ex#50::Onreset";
-	donpcevent "force_08start#50::Onon";
+	donpcevent "force_07ex#50::OnReset";
+	donpcevent "force_08start#50::OnEnable";
 	end;
 
-Onreset_08:
-	donpcevent "force_09start#50::Onon";
+OnReset_08:
+	donpcevent "force_09start#50::OnEnable";
 	enablenpc "force_08_09#50";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#50";
 	end;
 
-Onstart:
+OnStart:
 	disablenpc "force_01_02#50";
 	disablenpc "force_02_03#50";
 	disablenpc "force_03_04#50";
@@ -254,606 +247,540 @@ Onstart:
 	disablenpc "force_07_08#50";
 	disablenpc "force_08_09#50";
 	disablenpc "force_exit#50";
-	donpcevent "Heel and Toe#arena::Ontimeroff";
-	donpcevent "force_01mob#50::Onreset";
-	donpcevent "force_02mob#50::Onreset";
-	donpcevent "force_03mob#50::Onreset";
-	donpcevent "force_04mob#50::Onreset";
-	donpcevent "force_05mob#50::Onreset";
-	donpcevent "force_06mob#50::Onreset";
-	donpcevent "force_07mob#50::Onreset";
-	donpcevent "force_09mob#50::Onreset";
-	donpcevent "force_01ex#50::Onreset";
-	donpcevent "force_03ex#50::Onreset";
-	donpcevent "force_04ex#50::Onreset";
-	donpcevent "force_05ex#50::Onreset";
-	donpcevent "force_06ex#50::Onreset";
-	donpcevent "force_07ex#50::Onreset";
-	donpcevent "force_08ex#50::Onreset";
-	donpcevent "force_09ex#50::Onreset";
+	donpcevent "Heel and Toe#arena::OnTimerOff";
+	donpcevent "force_01mob#50::OnReset";
+	donpcevent "force_02mob#50::OnReset";
+	donpcevent "force_03mob#50::OnReset";
+	donpcevent "force_04mob#50::OnReset";
+	donpcevent "force_05mob#50::OnReset";
+	donpcevent "force_06mob#50::OnReset";
+	donpcevent "force_07mob#50::OnReset";
+	donpcevent "force_09mob#50::OnReset";
+	donpcevent "force_01ex#50::OnReset";
+	donpcevent "force_03ex#50::OnReset";
+	donpcevent "force_04ex#50::OnReset";
+	donpcevent "force_05ex#50::OnReset";
+	donpcevent "force_06ex#50::OnReset";
+	donpcevent "force_07ex#50::OnReset";
+	//donpcevent "force_08ex#50::OnReset";
+	donpcevent "force_09ex#50::OnReset";
 	enablenpc "force_08_01#50";
-	donpcevent "force_01start#50::Onon";
-	donpcevent "Heel and Toe#arena::Onstart";
-	end;
-
-Onreset_all:
-	donpcevent "force_01mob#50::Onreset";
-	donpcevent "force_02mob#50::Onreset";
-	donpcevent "force_03mob#50::Onreset";
-	donpcevent "force_04mob#50::Onreset";
-	donpcevent "force_05mob#50::Onreset";
-	donpcevent "force_06mob#50::Onreset";
-	donpcevent "force_07mob#50::Onreset";
-	donpcevent "force_09mob#50::Onreset";
-	donpcevent "force_01ex#50::Onreset";
-	donpcevent "force_03ex#50::Onreset";
-	donpcevent "force_04ex#50::Onreset";
-	donpcevent "force_05ex#50::Onreset";
-	donpcevent "force_06ex#50::Onreset";
-	donpcevent "force_07ex#50::Onreset";
-	donpcevent "force_08ex#50::Onreset";
-	donpcevent "force_09ex#50::Onreset";
-	end;
-
-}
-
-force_1-1,62,26,1	script	force_08_01#50	45,1,1,{
-
+	donpcevent "force_01start#50::OnEnable";
+	donpcevent "Heel and Toe#arena::OnStart";
+	end;
+
+OnReset_All:
+	donpcevent "force_01mob#50::OnReset";
+	donpcevent "force_02mob#50::OnReset";
+	donpcevent "force_03mob#50::OnReset";
+	donpcevent "force_04mob#50::OnReset";
+	donpcevent "force_05mob#50::OnReset";
+	donpcevent "force_06mob#50::OnReset";
+	donpcevent "force_07mob#50::OnReset";
+	donpcevent "force_09mob#50::OnReset";
+	donpcevent "force_01ex#50::OnReset";
+	donpcevent "force_03ex#50::OnReset";
+	donpcevent "force_04ex#50::OnReset";
+	donpcevent "force_05ex#50::OnReset";
+	donpcevent "force_06ex#50::OnReset";
+	donpcevent "force_07ex#50::OnReset";
+	//donpcevent "force_08ex#50::OnReset";
+	donpcevent "force_09ex#50::OnReset";
+	end;
+}
+
+force_1-1,62,26,1	script	force_08_01#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Heel and Toe#arena::On01_start";
+	donpcevent "Heel and Toe#arena::On01_Start";
 	warp "force_1-1",40,26;
 	end;
-
 }
 
-force_1-1,25,44,1	script	force_01_02#50	45,1,1,{
-
+force_1-1,25,44,1	script	force_01_02#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Heel and Toe#arena::On02_start";
+	donpcevent "Heel and Toe#arena::On02_Start";
 	warp "force_1-1",25,69;
 	end;
-
 }
 
-force_1-1,25,134,1	script	force_02_03#50	45,1,1,{
-
+force_1-1,25,134,1	script	force_02_03#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "arena#50::Onreset_02";
-	donpcevent "Heel and Toe#arena::On03_start";
+	donpcevent "arena#50::OnReset_02";
+	donpcevent "Heel and Toe#arena::On03_Start";
 	warp "force_1-1",25,159;
 	end;
-
 }
 
-force_1-1,44,174,1	script	force_03_04#50	45,1,1,{
-
+force_1-1,44,174,1	script	force_03_04#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Heel and Toe#arena::On04_start";
+	donpcevent "Heel and Toe#arena::On04_Start";
 	warp "force_1-1",69,174;
 	end;
-
 }
 
-force_1-1,134,174,1	script	force_04_05#50	45,1,1,{
-
+force_1-1,134,174,1	script	force_04_05#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Heel and Toe#arena::On05_start";
+	donpcevent "Heel and Toe#arena::On05_Start";
 	warp "force_1-1",159,174;
 	end;
-
 }
 
-force_1-1,174,155,1	script	force_05_06#50	45,1,1,{
-
+force_1-1,174,155,1	script	force_05_06#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Heel and Toe#arena::On06_start";
+	donpcevent "Heel and Toe#arena::On06_Start";
 	warp "force_1-1",174,130;
 	end;
-
 }
 
-force_1-1,174,65,1	script	force_06_07#50	45,1,1,{
-
+force_1-1,174,65,1	script	force_06_07#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Heel and Toe#arena::On07_start";
+	donpcevent "Heel and Toe#arena::On07_Start";
 	warp "force_1-1",174,40;
 	end;
-
 }
 
-force_1-1,155,26,1	script	force_07_08#50	45,1,1,{
-
+force_1-1,155,26,1	script	force_07_08#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Heel and Toe#arena::On08_start";
+	donpcevent "Heel and Toe#arena::On08_Start";
 	warp "force_1-1",132,26;
 	enablenpc "force_08_09#50";
 	end;
-
 }
 
-force_1-1,99,54,1	script	force_08_09#50	45,1,1,{
-
+force_1-1,99,54,1	script	force_08_09#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Heel and Toe#arena::On09_start";
+	donpcevent "Heel and Toe#arena::On09_Start";
 	warp "force_1-1",99,82;
 	end;
-
 }
 
-force_1-1,99,124,1	script	force_exit#50	45,1,1,{
-
+force_1-1,99,124,1	script	force_exit#50	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Heel and Toe#arena::Ontimeroff";
-	donpcevent "#arn_timer_50::Onon";
+	donpcevent "Heel and Toe#arena::OnTimerOff";
+	donpcevent "#arn_timer_50::OnEnable";
 	mapwarp "force_1-1","prt_are_in",22,191,0,0;
 	end;
-
 }
 
 -	script	force_01start#50	-1,{
-Onon:
-	donpcevent "force_01mob#50::Onon";
-end;
-
+OnEnable:
+	donpcevent "force_01mob#50::OnEnable";
+	end;
 }
 
 -	script	force_01ex#50	-1,{
-
-Onreset:
-	killmonster "force_1-1","force_01ex#50::OnMobEx";
-	end;
-
-Onsummonmob1:
-	monster "force_1-1",25,26,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",15,25,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",30,25,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",25,31,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",24,19,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",25,28,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",18,23,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",24,25,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,18,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",20,18,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",35,31,"Hydra",1579,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",35,28,"Hydra",1579,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",35,25,"Hydra",1579,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",35,21,"Hydra",1579,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",26,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",26,15,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",26,14,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,17,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,18,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,19,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",29,20,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",19,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",32,19,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	end;
-
-OnMobEx:
+OnReset:
+	killmonster "force_1-1","force_01ex#50::OnMyMobDead";
+	end;
+
+OnSummonMob1:
+	monster "force_1-1",25,26,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",15,25,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",30,25,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",25,31,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",24,19,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",25,28,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",18,23,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",24,25,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,18,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",20,18,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",35,31,"Hydra",1579,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",35,28,"Hydra",1579,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",35,25,"Hydra",1579,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",35,21,"Hydra",1579,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",26,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",26,15,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",26,14,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,17,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,18,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,19,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",29,20,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",19,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",32,19,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
-
 }
 
 -	script	force_01mob#50	-1,{
-
-Onon:
-	donpcevent "force_01ex#50::Onsummonmob1";
-	monster "force_1-1",25,25,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	monster "force_1-1",18,25,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	monster "force_1-1",32,25,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	monster "force_1-1",25,32,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	monster "force_1-1",25,18,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	set $force_01_50,5;
+OnEnable:
+	donpcevent "force_01ex#50::OnSummonMob1";
+	monster "force_1-1",25,25,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
+	monster "force_1-1",18,25,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
+	monster "force_1-1",32,25,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
+	monster "force_1-1",25,32,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
+	monster "force_1-1",25,18,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_1-1","force_01mob#50::OnMobDeath";
+OnReset:
+	killmonster "force_1-1","force_01mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_01_50,$force_01_50 -1;
-	if ($force_01_50 < 1) {
-		donpcevent "Heel and Toe#arena::On01_end";
-		donpcevent "arena#50::Onreset_01";
+OnMyMobDead:
+	if (mobcount("force_1-1","force_01mob#50::OnMyMobDead") < 1) {
+		donpcevent "Heel and Toe#arena::On01_End";
+		donpcevent "arena#50::OnReset_01";
 	}
 	end;
 }
 
 -	script	force_02start#50	-1,{
-
-Onon:
-	donpcevent "force_02mob#50::Onsummonmob2";
+OnEnable:
+	donpcevent "force_02mob#50::OnSummonMob2";
 	end;
 }
 
 -	script	force_02mob#50	-1,{
-
-Onreset:
-	killmonster "force_1-1","force_02mob#50::OnMobEx";
+OnReset:
+	killmonster "force_1-1","force_02mob#50::OnMyMobDead";
 	end;
 
-Onsummonmob2:
-	monster "force_1-1",24,76,"Familiar",1419,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",28,76,"Familiar",1419,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",24,86,"Familiar",1419,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",26,86,"Ghoul",1423,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",25,100,"Ghoul",1423,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",26,118,"Ghoul",1423,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",28,79,"Mummy",1393,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",23,87,"Mummy",1393,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",28,99,"Mummy",1393,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",23,112,"Mummy",1393,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",28,128,"Mummy",1393,1,"force_02mob#50::OnMobEx";
+OnSummonMob2:
+	monster "force_1-1",24,76,"Familiar",1419,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",28,76,"Familiar",1419,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",24,86,"Familiar",1419,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",26,86,"Ghoul",1423,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",25,100,"Ghoul",1423,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",26,118,"Ghoul",1423,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",28,79,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",23,87,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",28,99,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",23,112,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",28,128,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03start#50	-1,{
-
-Onon:
-	donpcevent "force_03mob#50::Onon";
+OnEnable:
+	donpcevent "force_03mob#50::OnEnable";
 	end;
 }
 
 -	script	force_03ex#50	-1,{
-
-Onreset:
-	killmonster "force_1-1","force_03ex#50::OnMobEx";
+OnReset:
+	killmonster "force_1-1","force_03ex#50::OnMyMobDead";
 	end;
 
-Onsummonmob_03:
-	monster "force_1-1",26,173,"Hydra",1579,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",21,173,"Hydra",1579,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",31,173,"Hydra",1579,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",26,186,"Marse",1551,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",26,161,"Marse",1551,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",13,173,"Marse",1551,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",38,173,"Marse",1551,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",29,174,"Marse",1551,1,"force_03ex#50::OnMobEx";
+OnSummonMob_03:
+	monster "force_1-1",26,173,"Hydra",1579,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",21,173,"Hydra",1579,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",31,173,"Hydra",1579,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",26,186,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",26,161,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",13,173,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",38,173,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",29,174,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03mob#50	-1,{
-
-Onon:
-	donpcevent "force_03ex#50::Onsummonmob_03";
-	monster "force_1-1",23,174,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	monster "force_1-1",18,173,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	monster "force_1-1",33,173,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	monster "force_1-1",26,181,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	monster "force_1-1",26,166,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	set $force_03_50,5;
+OnEnable:
+	donpcevent "force_03ex#50::OnSummonMob_03";
+	monster "force_1-1",23,174,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
+	monster "force_1-1",18,173,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
+	monster "force_1-1",33,173,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
+	monster "force_1-1",26,181,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
+	monster "force_1-1",26,166,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_1-1","force_03mob#50::OnMobDeath";
+OnReset:
+	killmonster "force_1-1","force_03mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_50,$force_03_50 -1;
-	donpcevent "force_03mob#50::Onsummonmob_03";
-	if ($force_03_50 < 1) {
-		donpcevent "Heel and Toe#arena::On03_end";
-		donpcevent "arena#50::Onreset_03";
+OnMyMobDead:
+	//donpcevent "force_03mob#50::OnSummonMob_03";
+	if (mobcount("force_1-1","force_03mob#50::OnMyMobDead") < 1) {
+		donpcevent "Heel and Toe#arena::On03_End";
+		donpcevent "arena#50::OnReset_03";
 	}
 	end;
 }
 
 -	script	force_04start#50	-1,{
-
-Onon:
-	donpcevent "force_04mob#50::Onon";
-end;
-
+OnEnable:
+	donpcevent "force_04mob#50::OnEnable";
+	end;
 }
 
 -	script	force_04ex#50	-1,{
-
-Onreset:
-	killmonster "force_1-1","force_04ex#50::OnMobEx";
+OnReset:
+	killmonster "force_1-1","force_04ex#50::OnMyMobDead";
 	end;
 
-Onsummonmob_04:
-	monster "force_1-1",99,174,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",103,174,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",107,174,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",111,176,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",115,176,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",119,172,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",95,178,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",100,178,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",105,172,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",110,172,"Flora",1575,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",115,172,"Flora",1575,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",120,172,"Flora",1575,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",125,172,"Flora",1575,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",105,178,"Flora",1575,1,"force_04ex#50::OnMobEx";
+OnSummonMob_04:
+	monster "force_1-1",99,174,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",103,174,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",107,174,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",111,176,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",115,176,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",119,172,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",95,178,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",100,178,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",105,172,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",110,172,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",115,172,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",120,172,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",125,172,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",105,178,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
-
 }
 
 -	script	force_04mob#50	-1,{
-
-Onon:
-	donpcevent "force_04ex#50::Onsummonmob_04";
-	monster "force_1-1",85,172,"Kobold",1547,1,"force_04mob#50::OnMobDeath";
-	monster "force_1-1",95,172,"Kobold",1547,1,"force_04mob#50::OnMobDeath";
-	monster "force_1-1",120,172,"Kobold",1545,1,"force_04mob#50::OnMobDeath";
-	set $force_04_50,3;
+OnEnable:
+	donpcevent "force_04ex#50::OnSummonMob_04";
+	monster "force_1-1",85,172,"Kobold",1547,1,"force_04mob#50::OnMyMobDead";
+	monster "force_1-1",95,172,"Kobold",1547,1,"force_04mob#50::OnMyMobDead";
+	monster "force_1-1",120,172,"Kobold",1545,1,"force_04mob#50::OnMyMobDead";
 	end;
-Onreset:
-	killmonster "force_1-1","force_04mob#50::OnMobDeath";
+OnReset:
+	killmonster "force_1-1","force_04mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_04_50,$force_04_50 -1;
-	if ($force_04_50 < 1) {
-		donpcevent "Heel and Toe#arena::On04_end";
-		donpcevent "arena#50::Onreset_04";
+OnMyMobDead:
+	if (mobcount("force_1-1","force_04mob#50::OnMyMobDead") < 1) {
+		donpcevent "Heel and Toe#arena::On04_End";
+		donpcevent "arena#50::OnReset_04";
 	}
 	end;
 }
 
 -	script	force_05start#50	-1,{
-
-Onon:
-	donpcevent "force_05mob#50::Onon";
+OnEnable:
+	donpcevent "force_05mob#50::OnEnable";
 	end;
 }
 
 -	script	force_05ex#50	-1,{
-
-Onreset:
-	killmonster "force_1-1","force_05ex#50::OnMobEx";
+OnReset:
+	killmonster "force_1-1","force_05ex#50::OnMyMobDead";
 	end;
 
-Onsummonmob_05:
-	set $@randmonster50,rand(1,2);
-	switch($@randmonster50) {
+OnSummonMob_05:
+	switch(rand(1,2)) {
 	case 1:
-		monster "force_1-1",174,174,"Desert Wolf",1432,1,"force_05ex#50::OnMobEx";
+		monster "force_1-1",174,174,"Desert Wolf",1432,1,"force_05ex#50::OnMyMobDead";
 		break;
 	case 2:
-		monster "force_1-1",173,173,"Zerom",1470,1,"force_05ex#50::OnMobEx";
+		monster "force_1-1",173,173,"Zerom",1470,1,"force_05ex#50::OnMyMobDead";
 		break;
 	}
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_05mob#50	-1,{
-
-Onon:
-	monster "force_1-1",173,166,"Hydra",1579,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",171,170,"Hydra",1579,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",177,170,"Hydra",1579,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",183,173,"Orc Lady",1452,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",173,173,"Orc Lady",1452,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",181,173,"Golem",1540,1,"force_05mob#50::OnMobDeath";
- 	monster "force_1-1",171,177,"Golem",1540,1,"force_05mob#50::OnMobDeath";
-	set $force_05_50,7;
+OnEnable:
+	monster "force_1-1",173,166,"Hydra",1579,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",171,170,"Hydra",1579,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",177,170,"Hydra",1579,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",183,173,"Orc Lady",1452,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",173,173,"Orc Lady",1452,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",181,173,"Golem",1540,1,"force_05mob#50::OnMyMobDead";
+ 	monster "force_1-1",171,177,"Golem",1540,1,"force_05mob#50::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_1-1","force_05mob#50::OnMobDeath";
+OnReset:
+	killmonster "force_1-1","force_05mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_05_50,$force_05_50 -1;
-	if ($force_05_50 < 1) {
-		donpcevent "Heel and Toe#arena::On05_end";
-		donpcevent "arena#50::Onreset_05";
+OnMyMobDead:
+	if (mobcount("force_1-1","force_05mob#50::OnMyMobDead") < 1) {
+		donpcevent "Heel and Toe#arena::On05_End";
+		donpcevent "arena#50::OnReset_05";
 	}
-	else donpcevent "force_05ex#50::Onsummonmob_05";
+	else donpcevent "force_05ex#50::OnSummonMob_05";
 	end;
-
 }
 
 -	script	force_06start#50	-1,{
-
-Onon:
-	donpcevent "force_06mob#50::Onon";
+OnEnable:
+	donpcevent "force_06mob#50::OnEnable";
 	end;
 }
 
 -	script	force_06ex#50	-1,{
-
-Onreset:
-	killmonster "force_1-1","force_06ex#50::OnMobEx";
+OnReset:
+	killmonster "force_1-1","force_06ex#50::OnMyMobDead";
 	end;
 
-Onsummonmob_06:
-	monster "force_1-1",173,118,"Smokie",1561,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",173,108,"Smokie",1561,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",173,99,"Smokie",1561,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,108,"Golem",1540,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,99,"Skel Worker",1469,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,85,"Skel Worker",1469,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,90,"Golem",1540,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,79,"Scorpion",1559,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",175,118,"Scorpion",1559,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",175,108,"Sandman",1558,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",175,99,"Sandman",1558,1,"force_06ex#50::OnMobEx";
+OnSummonMob_06:
+	monster "force_1-1",173,118,"Smokie",1561,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",173,108,"Smokie",1561,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",173,99,"Smokie",1561,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,108,"Golem",1540,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,99,"Skel Worker",1469,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,85,"Skel Worker",1469,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,90,"Golem",1540,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,79,"Scorpion",1559,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",175,118,"Scorpion",1559,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",175,108,"Sandman",1558,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",175,99,"Sandman",1558,1,"force_06ex#50::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_06mob#50	-1,{
-
-Onon:
-	donpcevent "force_06ex#50::Onsummonmob_06";
-	monster "force_1-1",173,90,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	monster "force_1-1",173,79,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	monster "force_1-1",172,70,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	monster "force_1-1",175,70,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	monster "force_1-1",171,118,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	set $force_06_50,5;
+OnEnable:
+	donpcevent "force_06ex#50::OnSummonMob_06";
+	monster "force_1-1",173,90,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
+	monster "force_1-1",173,79,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
+	monster "force_1-1",172,70,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
+	monster "force_1-1",175,70,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
+	monster "force_1-1",171,118,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_1-1","force_06mob#50::OnMobDeath";
+OnReset:
+	killmonster "force_1-1","force_06mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_06_50,$force_06_50 -1;
-	if ($force_06_50 < 1) {
-		donpcevent "Heel and Toe#arena::On06_end";
-		donpcevent "arena#50::Onreset_06";
+OnMyMobDead:
+	if (mobcount("force_1-1","force_06mob#50::OnMyMobDead") < 1) {
+		donpcevent "Heel and Toe#arena::On06_End";
+		donpcevent "arena#50::OnReset_06";
 	}
 	end;
 }
 
 -	script	force_07start#50	-1,{
-
-Onon:
-	donpcevent "force_07mob#50::Onon";
+OnEnable:
+	donpcevent "force_07mob#50::OnEnable";
 	end;
 }
 
 -	script	force_07ex#50	-1,{
-
-Onreset:
-	killmonster "force_1-1","force_07ex#50::OnMobEx";
-	end;
-
-Onsummonmob_07:
-	monster "force_1-1",163,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",167,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",171,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",175,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",179,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,32,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,28,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,24,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,20,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",179,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",175,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",171,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",167,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,20,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,24,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,28,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,32,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,31,"Punk",1481,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,23,"Punk",1481,1,"force_07ex#50::OnMobEx";
-	end;
-
-OnMobEx:
+OnReset:
+	killmonster "force_1-1","force_07ex#50::OnMyMobDead";
+	end;
+
+OnSummonMob_07:
+	monster "force_1-1",163,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",167,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",171,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",175,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",179,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,32,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,28,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,24,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,20,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",179,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",175,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",171,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",167,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,20,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,24,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,28,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,32,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,31,"Punk",1481,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,23,"Punk",1481,1,"force_07ex#50::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_07mob#50	-1,{
-
-Onon:
-	donpcevent "force_07ex#50::Onsummonmob_07";
-	monster "force_1-1",174,25,"Red Plant",1078,1,"force_07mob#50::OnMobDeath";
-	set $force_07_50,1;
+OnEnable:
+	donpcevent "force_07ex#50::OnSummonMob_07";
+	monster "force_1-1",174,25,"Red Plant",1078,1,"force_07mob#50::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_1-1","force_07mob#50::OnMobDeath";
+OnReset:
+	killmonster "force_1-1","force_07mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_07_50,$force_07_50 -1;
-	if ($force_07_50 < 1) {
-		donpcevent "Heel and Toe#arena::On07_end";
-		donpcevent "arena#50::Onreset_07";
+OnMyMobDead:
+	if (mobcount("force_1-1","force_07mob#50::OnMyMobDead") < 1) {
+		donpcevent "Heel and Toe#arena::On07_End";
+		donpcevent "arena#50::OnReset_07";
 	}
 	end;
 }
 
 -	script	force_08start#50	-1,{
-
-Onon:
-	donpcevent "force_08ex#50::Onon";
+OnEnable:
+	donpcevent "force_08ex#50::OnEnable";
 	end;
 }
 
 -	script	force_08ex#50	-1,{
-
-Onon:
-	donpcevent "arena#50::Onreset_08";
+OnEnable:
+	donpcevent "arena#50::OnReset_08";
 	end;
 }
 
 -	script	force_09start#50	-1,{
-
-Onon:
-	donpcevent "force_09mob#50::Onon";
+OnEnable:
+	donpcevent "force_09mob#50::OnEnable";
 	end;
 }
 
 -	script	force_09ex#50	-1,{
-
-Onreset:
-	killmonster "force_1-1","force_09ex#50::OnMobEx";
+OnReset:
+	killmonster "force_1-1","force_09ex#50::OnMyMobDead";
 	end;
 
-Onsummonmob_09:
-	monster "force_1-1",110,110,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",89,110,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",89,89,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",110,89,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",105,105,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",94,105,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",94,94,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",110,110,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",89,110,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",89,89,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",110,89,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",105,105,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",94,105,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",94,94,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",105,94,"Familiar",1419,1,"force_09ex#50::OnMobEx";
+OnSummonMob_09:
+	monster "force_1-1",110,110,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",89,110,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",89,89,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",110,89,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",105,105,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",94,105,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",94,94,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",110,110,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",89,110,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",89,89,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",110,89,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",105,105,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",94,105,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",94,94,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",105,94,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_09mob#50	-1,{
-
-Onon:
-	monster "force_1-1",99,99,"Vocal",1581,1,"force_09mob#50::OnMobDeath";
-	donpcevent "force_09ex#50::Onsummonmob_09";
-	set $force_09_50,1;
+OnEnable:
+	monster "force_1-1",99,99,"Vocal",1581,1,"force_09mob#50::OnMyMobDead";
+	donpcevent "force_09ex#50::OnSummonMob_09";
 	end;
 
-Onreset:
-	killmonster "force_1-1","force_09mob#50::OnMobDeath";
+OnReset:
+	killmonster "force_1-1","force_09mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_50,$force_09_50 -1;
-	if ($force_09_50 < 1) {
-		donpcevent "Heel and Toe#arena::On09_end";
-		donpcevent "arena#50::Onreset_09";
-		donpcevent "arena#50::Onreset_all";
+OnMyMobDead:
+	if (mobcount("force_1-1","force_09mob#50::OnMyMobDead") < 1) {
+		donpcevent "Heel and Toe#arena::On09_End";
+		donpcevent "arena#50::OnReset_09";
+		donpcevent "arena#50::OnReset_All";
 		set $arena_min50end,gettime(2);
 		set $arena_sec50end,gettime(1);
 	}
 	end;
 }
 
-prt_are_in,129,188,3	script	Staff#50-1	67,{
-
+prt_are_in,129,188,3	script	Staff#50-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -874,30 +801,20 @@ prt_are_in,129,188,3	script	Staff#50-1	67,{
 	end;
 }
 
-prt_are_in,25,188,3	script	Staff#50-2	67,{
-
-	if($arena_min50end < $arena_min50st)
-	{
-		if($arena_sec50end < $arena_sec50st)
-		{
+prt_are_in,25,188,3	script	Staff#50-2	1_F_02,{
+	if($arena_min50end < $arena_min50st) {
+		if($arena_sec50end < $arena_sec50st) {
 			set @record_min50,60 - $arena_min50st + $arena_min50end -1;
 			set @record_sec50,60 - $arena_sec50st + $arena_sec50end;
-		}
-		else
-		{
+		} else {
 			set @record_min50,60 - $arena_min50st + $arena_min50end;
 			set @record_sec50,$arena_sec50end - $arena_sec50st;
 		}
-	}
-	else
-	{
-		if($arena_sec50end < $arena_sec50st)
-		{
+	} else {
+		if($arena_sec50end < $arena_sec50st) {
 			set @record_min50,$arena_min50end - $arena_min50st -1;
 			set @record_sec50,60 - $arena_sec50st + $arena_sec50end;
-		}
-		else
-		{
+		} else {
 			set @record_min50,$arena_min50end - $arena_min50st;
 			set @record_sec50,$arena_sec50end - $arena_sec50st;
 		}
@@ -934,9 +851,7 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			set arena_point, arena_point + 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
@@ -948,15 +863,13 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 			close2;
 		}
 		specialeffect2 EF_EXIT;
- 		donpcevent "cast#50::Onnomal1";
+ 		donpcevent "cast#50::OnNomal1";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_50::Onstop";
-		donpcevent "alloff#50::Onon";
-		donpcevent "lvl 50s Waiting Room::Onstart";
+		donpcevent "#arn_timer_50::OnStop";
+		donpcevent "alloff#50::OnEnable";
+		donpcevent "Lv50 Waiting Room::OnStart";
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
@@ -967,7 +880,7 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 		set $top_50min, @record_min50;
 		set $top_50sec, @record_sec50;
 		set $arena_50topn$,strcharinfo(0);
-		donpcevent "Vendigos::Onlinerec_50";
+		donpcevent "Vendigos::OnLineRec_50";
 		next;
 		if (arena_point > 29950) {
 			mes "[Staff]";
@@ -981,9 +894,7 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			mes "[Staff]";
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
@@ -999,18 +910,17 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 			close2;
 		}
 		specialeffect2 EF_HIT5;
- 		donpcevent "cast#50::Onnomal2";
+ 		donpcevent "cast#50::OnNomal2";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_50::Onstop";
-		donpcevent "alloff#50::Onon";
-		donpcevent "lvl 50s Waiting Room::Onstart";
+		donpcevent "#arn_timer_50::OnStop";
+		donpcevent "alloff#50::OnEnable";
+		donpcevent "Lv50 Waiting Room::OnStart";
 		end;
 	}
 }
 
 -	script	#arn_timer_50	-1,{
-
-Onon:
+OnEnable:
 	initnpctimer;
 	end;
 
@@ -1027,62 +937,59 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
- 	donpcevent "cast#50::Ontimeover2";
-	donpcevent "arn_warp_50::Onout";
-	donpcevent "#arn_timer_50::Onstop";
-	donpcevent "alloff#50::Onon";
-	donpcevent "lvl 50s Waiting Room::Onstart";
+ 	donpcevent "cast#50::OnTimeOver2";
+	donpcevent "arn_warp_50::OnOut";
+	donpcevent "#arn_timer_50::OnStop";
+	donpcevent "alloff#50::OnEnable";
+	donpcevent "Lv50 Waiting Room::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
-
 }
 
 -	script	arn_warp_50	-1,{
-
-Onout:
+OnOut:
 	areawarp "prt_are_in",14,195,29,178,"arena_room",100,75;
 	end;
 }
 
 -	script	cast#50	-1,{
-Ontimeover1:
+OnTimeOver1:
 	mapannounce "force_1-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
-Ontimeover2:
+OnTimeOver2:
 	mapannounce "force_1-1","Arena will be activated due to an error occurred in the waiting room.",0,0xFFCE00;
 	end;
-Onnomal1:
+OnNomal1:
 	mapannounce "force_1-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
-Onnomal2:
+OnNomal2:
 	mapannounce "force_1-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 }
 
 -	script	alloff#50	-1,{
-
-Onon:
+OnEnable:
 	mapwarp "force_1-1","prt_are_in",126,190,0,0;
-	donpcevent "force_01mob#50::Onreset";
-	donpcevent "force_02mob#50::Onreset";
-	donpcevent "force_03mob#50::Onreset";
-	donpcevent "force_04mob#50::Onreset";
-	donpcevent "force_05mob#50::Onreset";
-	donpcevent "force_06mob#50::Onreset";
-	donpcevent "force_07mob#50::Onreset";
-	donpcevent "force_09mob#50::Onreset";
-	donpcevent "force_01ex#50::Onreset";
-	donpcevent "force_03ex#50::Onreset";
-	donpcevent "force_04ex#50::Onreset";
-	donpcevent "force_05ex#50::Onreset";
-	donpcevent "force_06ex#50::Onreset";
-	donpcevent "force_07ex#50::Onreset";
-	donpcevent "force_08ex#50::Onreset";
-	donpcevent "force_09ex#50::Onreset";
-	donpcevent "Heel and Toe#arena::Ontimeroff";
+	donpcevent "force_01mob#50::OnReset";
+	donpcevent "force_02mob#50::OnReset";
+	donpcevent "force_03mob#50::OnReset";
+	donpcevent "force_04mob#50::OnReset";
+	donpcevent "force_05mob#50::OnReset";
+	donpcevent "force_06mob#50::OnReset";
+	donpcevent "force_07mob#50::OnReset";
+	donpcevent "force_09mob#50::OnReset";
+	donpcevent "force_01ex#50::OnReset";
+	donpcevent "force_03ex#50::OnReset";
+	donpcevent "force_04ex#50::OnReset";
+	donpcevent "force_05ex#50::OnReset";
+	donpcevent "force_06ex#50::OnReset";
+	donpcevent "force_07ex#50::OnReset";
+	//donpcevent "force_08ex#50::OnReset";
+	donpcevent "force_09ex#50::OnReset";
+	donpcevent "Heel and Toe#arena::OnTimerOff";
 	disablenpc "Heel and Toe#arena";
 	disablenpc "force_01_02#50";
 	disablenpc "force_02_03#50";
@@ -1094,7 +1001,7 @@ Onon:
 	disablenpc "force_08_09#50";
 	disablenpc "force_exit#50";
 	disablenpc "arena#50";
-	donpcevent "#arn_timer_50::Onstop";
+	donpcevent "#arn_timer_50::OnStop";
 	enablenpc "Heel and Toe#arena";
 	enablenpc "arena#50";
 	end;
@@ -1102,5 +1009,4 @@ Onon:
 OnInit:
 	if(!$top_50min && !$top_50sec) set $top_50min,5;
 	end;
-
 }
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index b83dc8eea..c3d33f333 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -1,44 +1,42 @@
 //===== Hercules Script ======================================
-//= Izlude Arena lvl 60
+//= Izlude Arena Level 60
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.4
 //===== Description: =========================================
 //= Izlude Battle Arena Level 60
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Fixed coordinate typo. (bugreport:1663) [L0ne_W0lf]
 //= 1.2 Replaced effect numerics with constants. [Samuray22]
+//= 1.3 Label standardization. [Euphy]
+//= 1.4 Script updates. [Euphy]
 //============================================================
 
-arena_room,38,88,5	script	lvl 60s Waiting Room	124,{
+arena_room,38,88,5	script	Lv60 Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
-	waitingroom "Individual; Level 60 to 79",50,"lvl 60s Waiting Room::OnStartArena",1,1000,60,79;
+	waitingroom "Individual; Level 60 to 79",50,"Lv60 Waiting Room::OnStartArena",1,1000,60,79;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
 	warpwaitingpc "force_2-1",99,12;
-	donpcevent "arena#60::Onstart";
+	donpcevent "arena#60::OnStart";
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
 
-force_2-1,99,20,4	script	Minilover#arena	124,{
+force_2-1,99,20,4	script	Minilover#arena	4_F_TELEPORTER,{
 	end;
 
-OnInit:
-	set $@mapcount60, 0;
-	end;
-
-Onstart:
+OnStart:
 	initnpctimer;
 	set $arena_min60st,gettime(2);
 	set $arena_sec60st,gettime(1);
@@ -57,41 +55,36 @@ OnTimer5000:
 	end;
 
 OnTimer60000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	if (getmapusers("force_2-1") == 0) {
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 5 minutes ",0;
 	end;
 
 OnTimer120000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	if (getmapusers("force_2-1") == 0) {
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 4 minutes ",0;
 	end;
 
 OnTimer180000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	if (getmapusers("force_2-1") == 0) {
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 3 minutes ",0;
 	end;
 
 OnTimer240000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	if (getmapusers("force_2-1") == 0) {
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 2 minutes ",0;
 	end;
 
 OnTimer300000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	if (getmapusers("force_2-1") == 0) {
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 1 minute ",0;
 	end;
@@ -115,148 +108,146 @@ OnTimer374000:
 
 OnTimer375000:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
-	donpcevent "Minilover#arena::Onfailclearstage";
+	donpcevent "Minilover#arena::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
- 	donpcevent "cast#60::Ontimeover1";
+OnFailClearStage:
+ 	donpcevent "cast#60::OnTimeOver1";
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
-	donpcevent "Minilover#arena::Ontimeroff";
-	donpcevent "arena#60::Onreset_all";
-	donpcevent "alloff#60::Onon";
-	donpcevent "lvl 60s Waiting Room::Onstart";
+	donpcevent "Minilover#arena::OnTimerOff";
+	donpcevent "arena#60::OnReset_All";
+	donpcevent "alloff#60::OnEnable";
+	donpcevent "Lv60 Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill at least 5 Goblins while dodging Rotar Zairos!",0;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_2-1","A door to the north room has opened!",0;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_2-1","Escape to the north exit from the monsters!",0;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_2-1","A door to the north room has opened!",0;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all Mantises!",0;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_2-1","Clear! A door to the east room has opened!",0;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all non-aggressive monsters while dodging aggressive monsters!",0;
 	end;
 
-On04_end:
+On04_End:
 	mapannounce "force_2-1","A door to the east room has opened!",0;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all monsters except Hydras and Kaphas!",0;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_2-1","Clear! A door to the south room has opened!",0;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all Miyabi Dolls and escape to the south exit!",0;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_2-1","A door to the south room has opened!",0;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all monsters!",0;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_2-1","Clear! A door to the west room has opened!",0;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_2-1","Please escape to the north exit!",0;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must defeat a Goblin Leader!",0;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_2-1","Boss Clear! - North exit has opened. Thank you.",0;
 	end;
-
 }
 
 -	script	arena#60	-1,{
-
-Onreset_01:
-	donpcevent "force_01ex#60::Onreset";
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02start#60::Onon";
+OnReset_01:
+	donpcevent "force_01ex#60::OnReset";
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02start#60::OnEnable";
 	enablenpc "force_01_02#60";
 	enablenpc "force_02_03#60";
 	end;
 
-Onreset_02:
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03start#60::Onon";
+OnReset_02:
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03start#60::OnEnable";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#60";
-	donpcevent "force_04start#60::Onon";
-	donpcevent "force_03ex#60::Onreset";
+	donpcevent "force_04start#60::OnEnable";
+	donpcevent "force_03ex#60::OnReset";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#60";
-	donpcevent "force_05start#60::Onon";
-	donpcevent "force_04ex#60::Onreset";
+	donpcevent "force_05start#60::OnEnable";
+	donpcevent "force_04ex#60::OnReset";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#60";
-	donpcevent "force_06start#60::Onon";
-	donpcevent "force_05ex#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
+	donpcevent "force_06start#60::OnEnable";
+	donpcevent "force_05ex#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#60";
-	donpcevent "force_07start#60::Onon";
-	donpcevent "force_06ex#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
+	donpcevent "force_07start#60::OnEnable";
+	donpcevent "force_06ex#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#60";
-	donpcevent "force_08start#60::Onon";
+	donpcevent "force_08start#60::OnEnable";
 	end;
 
-Onreset_08:
-	donpcevent "force_09start#60::Onon";
+OnReset_08:
+	donpcevent "force_09start#60::OnEnable";
 	enablenpc "force_08_09#60";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#60";
 	end;
 
-Onstart:
+OnStart:
 	disablenpc "force_01_02#60";
 	disablenpc "force_02_03#60";
 	disablenpc "force_03_04#60";
@@ -266,592 +257,540 @@ Onstart:
 	disablenpc "force_07_08#60";
 	disablenpc "force_08_09#60";
 	disablenpc "force_exit#60";
-	donpcevent "Minilover#arena::Ontimeroff";
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03mob#60::Onreset";
-	donpcevent "force_04mob#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
-	donpcevent "force_07mob#60::Onreset";
-	donpcevent "force_08mob#60::Onreset";
-	donpcevent "force_09mob#60::Onreset";
-	donpcevent "force_01ex#60::Onreset";
-	donpcevent "force_03ex#60::Onreset";
-	donpcevent "force_04ex#60::Onreset";
-	donpcevent "force_05ex#60::Onreset";
-	donpcevent "force_06ex#60::Onreset";
-	donpcevent "force_08ex#60::Onreset";
-	donpcevent "force_09ex#60::Onreset";
+	donpcevent "Minilover#arena::OnTimerOff";
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03mob#60::OnReset";
+	donpcevent "force_04mob#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
+	donpcevent "force_07mob#60::OnReset";
+	//donpcevent "force_08mob#60::OnReset";
+	donpcevent "force_09mob#60::OnReset";
+	donpcevent "force_01ex#60::OnReset";
+	donpcevent "force_03ex#60::OnReset";
+	donpcevent "force_04ex#60::OnReset";
+	donpcevent "force_05ex#60::OnReset";
+	donpcevent "force_06ex#60::OnReset";
+	//donpcevent "force_08ex#60::OnReset";
+	donpcevent "force_09ex#60::OnReset";
 	enablenpc "force_08_01#60";
-	donpcevent "force_01start#60::Onon";
-	donpcevent "Minilover#arena::Onstart";
-	end;
-
-Onreset_all:
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03mob#60::Onreset";
-	donpcevent "force_04mob#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
-	donpcevent "force_07mob#60::Onreset";
-	donpcevent "force_08mob#60::Onreset";
-	donpcevent "force_09mob#60::Onreset";
-	donpcevent "force_01ex#60::Onreset";
-	donpcevent "force_03ex#60::Onreset";
-	donpcevent "force_04ex#60::Onreset";
-	donpcevent "force_05ex#60::Onreset";
-	donpcevent "force_06ex#60::Onreset";
-	donpcevent "force_08ex#60::Onreset";
-	donpcevent "force_09ex#60::Onreset";
+	donpcevent "force_01start#60::OnEnable";
+	donpcevent "Minilover#arena::OnStart";
+	end;
+
+OnReset_All:
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03mob#60::OnReset";
+	donpcevent "force_04mob#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
+	donpcevent "force_07mob#60::OnReset";
+	//donpcevent "force_08mob#60::OnReset";
+	donpcevent "force_09mob#60::OnReset";
+	donpcevent "force_01ex#60::OnReset";
+	donpcevent "force_03ex#60::OnReset";
+	donpcevent "force_04ex#60::OnReset";
+	donpcevent "force_05ex#60::OnReset";
+	donpcevent "force_06ex#60::OnReset";
+	//donpcevent "force_08ex#60::OnReset";
+	donpcevent "force_09ex#60::OnReset";
 	end;
-
 }
 
-force_2-1,62,26,1	script	force_08_01#60	45,1,1,{
-
+force_2-1,62,26,1	script	force_08_01#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Minilover#arena::On01_start";
+	donpcevent "Minilover#arena::On01_Start";
 	warp "force_2-1",40,26;
 	end;
 }
 
-force_2-1,25,44,1	script	force_01_02#60	45,1,1,{
-
+force_2-1,25,44,1	script	force_01_02#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Minilover#arena::On02_start";
+	donpcevent "Minilover#arena::On02_Start";
 	warp "force_2-1",25,69;
 	end;
 }
 
-force_2-1,25,134,1	script	force_02_03#60	45,1,1,{
-
+force_2-1,25,134,1	script	force_02_03#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "arena#60::Onreset_02";
-	donpcevent "Minilover#arena::On03_start";
+	donpcevent "arena#60::OnReset_02";
+	donpcevent "Minilover#arena::On03_Start";
 	warp "force_2-1",25,159;
 	end;
 }
 
-force_2-1,44,174,1	script	force_03_04#60	45,1,1,{
-
+force_2-1,44,174,1	script	force_03_04#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Minilover#arena::On04_start";
+	donpcevent "Minilover#arena::On04_Start";
 	warp "force_2-1",69,174;
 	end;
 }
 
-force_2-1,134,174,1	script	force_04_05#60	45,1,1,{
-
+force_2-1,134,174,1	script	force_04_05#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Minilover#arena::On05_start";
+	donpcevent "Minilover#arena::On05_Start";
 	warp "force_2-1",159,174;
 	end;
 }
 
-force_2-1,174,155,1	script	force_05_06#60	45,1,1,{
-
+force_2-1,174,155,1	script	force_05_06#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Minilover#arena::On06_start";
+	donpcevent "Minilover#arena::On06_Start";
 	warp "force_2-1",174,130;
 	end;
 }
 
-force_2-1,174,65,1	script	force_06_07#60	45,1,1,{
-
+force_2-1,174,65,1	script	force_06_07#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Minilover#arena::On07_start";
+	donpcevent "Minilover#arena::On07_Start";
 	warp "force_2-1",174,40;
 	end;
 }
 
-force_2-1,155,26,1	script	force_07_08#60	45,1,1,{
-
+force_2-1,155,26,1	script	force_07_08#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Minilover#arena::On08_start";
+	donpcevent "Minilover#arena::On08_Start";
 	warp "force_2-1",132,26;
 	enablenpc "force_08_09#60";
 	end;
 }
 
-force_2-1,99,54,1	script	force_08_09#60	45,1,1,{
-
+force_2-1,99,54,1	script	force_08_09#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Minilover#arena::On09_start";
+	donpcevent "Minilover#arena::On09_Start";
 	warp "force_2-1",99,82;
 	end;
 }
 
-force_2-1,99,124,1	script	force_exit#60	45,1,1,{
-
+force_2-1,99,124,1	script	force_exit#60	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Minilover#arena::Ontimeroff";
-	donpcevent "#arn_timer_60::Onon";
+	donpcevent "Minilover#arena::OnTimerOff";
+	donpcevent "#arn_timer_60::OnEnable";
 	mapwarp "force_2-1","prt_are_in",22,139,0,0;
 	end;
 }
 
 -	script	force_01start#60	-1,{
-
-Onon:
-	donpcevent "force_01mob#60::Onon";
-end;
+OnEnable:
+	donpcevent "force_01mob#60::OnEnable";
+	end;
 }
 
 -	script	force_01ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_01ex#60::OnMobEx";
+OnReset:
+	killmonster "force_2-1","force_01ex#60::OnMyMobDead";
 	end;
 
-Onon:
-	monster "force_2-1",25,25,"Rotar Zairo",1392,1,"force_01ex#60::OnMobEx";
+OnEnable:
+	monster "force_2-1",25,25,"Rotar Zairo",1392,1,"force_01ex#60::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_01mob#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_01mob#60::OnMobDeath";
-	end;
-
-Onon:
-	donpcevent "force_01ex#60::Onon";
-	monster "force_2-1",25,32,"Goblin Archer",1577,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",21,26,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",25,36,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",25,15,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",40,30,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",25,24,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",25,9,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",28,15,"Goblin Archer",1577,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",12,33,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",24,20,"Goblin",1535,1,"force_01mob#60::OnMobDeath";
-	set $force_01_60,5;
-	end;
-
-OnMobDeath:
-	set $force_01_60,$force_01_60 -1;
-	if ($force_01_60 < 1) {
-		donpcevent "Minilover#arena::On01_end";
-		donpcevent "arena#60::Onreset_01";
+OnReset:
+	killmonster "force_2-1","force_01mob#60::OnMyMobDead";
+	end;
+
+OnEnable:
+	donpcevent "force_01ex#60::OnEnable";
+	monster "force_2-1",25,32,"Goblin Archer",1577,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",21,26,"Goblin",1534,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",25,36,"Goblin",1536,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",25,15,"Goblin",1534,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",40,30,"Goblin",1536,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",25,24,"Goblin",1534,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",25,9,"Goblin",1536,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",28,15,"Goblin Archer",1577,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",12,33,"Goblin",1536,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",24,20,"Goblin",1535,1,"force_01mob#60::OnMyMobDead";
+	end;
+
+OnMyMobDead:
+	if (mobcount("force_2-1","force_01mob#60::OnMyMobDead") < 6) {
+		donpcevent "Minilover#arena::On01_End";
+		donpcevent "arena#60::OnReset_01";
 	}
 	end;
 }
 
 -	script	force_02start#60	-1,{
-
-Onon:
-	donpcevent "force_02mob#60::Onon";
+OnEnable:
+	donpcevent "force_02mob#60::OnEnable";
 	end;
 }
 
 -	script	force_02mob#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_02mob#60::OnMobEx";
-	end;
-Onon:
-	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",24,86,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",24,86,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",23,76,"Requiem",1468,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",27,76,"Requiem",1468,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",25,86,"Requiem",1468,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",26,86,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",25,100,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",26,118,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",25,100,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",26,118,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,79,"Zerom",1470,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",23,87,"Zerom",1470,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,99,"Zerom",1470,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",23,112,"Zerom",1470,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	end;
-
-OnMobEx:
+OnReset:
+	killmonster "force_2-1","force_02mob#60::OnMyMobDead";
+	end;
+OnEnable:
+	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",24,86,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",24,86,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",23,76,"Requiem",1468,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",27,76,"Requiem",1468,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",25,86,"Requiem",1468,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",26,86,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",25,100,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",26,118,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",25,100,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",26,118,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,79,"Zerom",1470,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",23,87,"Zerom",1470,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,99,"Zerom",1470,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",23,112,"Zerom",1470,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03start#60	-1,{
-
-Onon:
-	donpcevent "force_03mob#60::Onon";
+OnEnable:
+	donpcevent "force_03mob#60::OnEnable";
 	end;
 }
 
 -	script	force_03ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_03ex#60::OnMobEx";
+OnReset:
+	killmonster "force_2-1","force_03ex#60::OnMyMobDead";
 	end;
 
-Onon:
-	monster "force_2-1",26,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",21,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",31,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",26,178,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",21,178,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",31,178,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",19,174,"Obeaune",1425,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",26,161,"Obeaune",1425,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",13,173,"Obeaune",1425,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",38,173,"Obeaune",1425,1,"force_03ex#60::OnMobEx";
+OnEnable:
+	monster "force_2-1",26,173,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",21,173,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",31,173,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",26,178,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",21,178,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",31,178,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",19,174,"Obeaune",1425,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",26,161,"Obeaune",1425,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",13,173,"Obeaune",1425,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",38,173,"Obeaune",1425,1,"force_03ex#60::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03mob#60	-1,{
-
-Onon:
-	donpcevent "force_03ex#60::Onon";
-	monster "force_2-1",23,174,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
-	monster "force_2-1",18,173,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
-	monster "force_2-1",33,173,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
-	monster "force_2-1",26,181,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
-	set $force_03_60,4;
+OnEnable:
+	donpcevent "force_03ex#60::OnEnable";
+	monster "force_2-1",23,174,"Mantis",1457,1,"force_03mob#60::OnMyMobDead";
+	monster "force_2-1",18,173,"Mantis",1457,1,"force_03mob#60::OnMyMobDead";
+	monster "force_2-1",33,173,"Mantis",1457,1,"force_03mob#60::OnMyMobDead";
+	monster "force_2-1",26,181,"Mantis",1457,1,"force_03mob#60::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_2-1","force_mob01#60::OnMobDeath";
+OnReset:
+	killmonster "force_2-1","force_mob01#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_60,$force_03_60 -1;
-	if ($force_03_60 < 1) {
-		donpcevent "Minilover#arena::On03_end";
-		donpcevent "arena#60::Onreset_03";
+OnMyMobDead:
+	if (mobcount("force_2-1","force_03mob#60::OnMyMobDead") < 1) {
+		donpcevent "Minilover#arena::On03_End";
+		donpcevent "arena#60::OnReset_03";
 	}
 	end;
 }
 
 -	script	force_04start#60	-1,{
-
-Onon:
-	donpcevent "force_04mob#60::Onon";
+OnEnable:
+	donpcevent "force_04mob#60::OnEnable";
 	end;
 }
 
 -	script	force_04ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_04ex#60::OnMobEx";
+OnReset:
+	killmonster "force_2-1","force_04ex#60::OnMyMobDead";
 	end;
 
-Onon:
-	monster "force_2-1",84,177,"Sasquatch",1442,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",125,170,"Sasquatch",1442,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",109,172,"Baby Leopard",1524,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",121,172,"Baby Leopard",1524,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",104,173,"Chepet",1444,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",75,174,"Dokebi",1491,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",102,176,"Dokebi",1491,1,"force_04ex#60::OnMobEx";
+OnEnable:
+	monster "force_2-1",84,177,"Sasquatch",1442,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",125,170,"Sasquatch",1442,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",109,172,"Baby Leopard",1524,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",121,172,"Baby Leopard",1524,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",104,173,"Chepet",1444,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",75,174,"Dokebi",1491,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",102,176,"Dokebi",1491,1,"force_04ex#60::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_04mob#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_04mob#60::OnMobDeath";
+OnReset:
+	killmonster "force_2-1","force_04mob#60::OnMyMobDead";
 	end;
 
-Onon:
-	donpcevent "force_04ex#60::Onon";
-	monster "force_2-1",79,174,"Golem",1540,1,"force_04mob#60::OnMobDeath";
-	monster "force_2-1",131,178,"Marse",1551,1,"force_04mob#60::OnMobDeath";
-	set $force_04_60,2;
+OnEnable:
+	donpcevent "force_04ex#60::OnEnable";
+	monster "force_2-1",79,174,"Golem",1540,1,"force_04mob#60::OnMyMobDead";
+	monster "force_2-1",131,178,"Marse",1551,1,"force_04mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_04_60,$force_04_60 -1;
-	if ($force_04_60 < 1) {
-		donpcevent "force_04ex#60::Onreset";
-		donpcevent "Minilover#arena::On04_end";
-		donpcevent "arena#60::Onreset_04";
+OnMyMobDead:
+	if (mobcount("force_2-1","force_04mob#60::OnMyMobDead") < 1) {
+		donpcevent "force_04ex#60::OnReset";
+		donpcevent "Minilover#arena::On04_End";
+		donpcevent "arena#60::OnReset_04";
 	}
 	end;
 }
 
 -	script	force_05start#60	-1,{
-
-Onon:
-	donpcevent "force_05mob#60::Onon";
+OnEnable:
+	donpcevent "force_05mob#60::OnEnable";
 	end;
 }
 
 -	script	force_05ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_05ex#60::OnMobEx";
+OnReset:
+	killmonster "force_2-1","force_05ex#60::OnMyMobDead";
 	end;
 
-Onsummonmob_05:
-	monster "force_2-1",168,177,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",170,179,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",177,179,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",179,178,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",179,170,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",177,168,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",170,168,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",173,174,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",174,174,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",173,173,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",174,173,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",173,181,"Kapha",1543,1,"force_05ex#60::OnMobEx";
+OnSummonMob_05:
+	monster "force_2-1",168,177,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",170,179,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",177,179,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",179,178,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",179,170,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",177,168,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",170,168,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",173,174,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",174,174,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",173,173,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",174,173,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",173,181,"Kapha",1543,1,"force_05ex#60::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_05mob#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_05mob#60::OnMobDeath";
+OnReset:
+	killmonster "force_2-1","force_05mob#60::OnMyMobDead";
 	end;
 
-Onon:
-	donpcevent "force_05ex#60::Onsummonmob_05";
-	monster "force_2-1",163,173,"Drainliar",1434,1,"force_05mob#60::OnMobDeath";
-	monster "force_2-1",173,173,"Myst",1553,1,"force_05mob#60::OnMobDeath";
-	monster "force_2-1",181,173,"Orc Skeleton",1462,1,"force_05mob#60::OnMobDeath";
-	monster "force_2-1",171,177,"Orc Skeleton",1462,1,"force_05mob#60::OnMobDeath";
-	monster "force_2-1",173,181,"Raggler",1445,1,"force_05mob#60::OnMobDeath";
-	set $force_05_60,5;
+OnEnable:
+	donpcevent "force_05ex#60::OnSummonMob_05";
+	monster "force_2-1",163,173,"Drainliar",1434,1,"force_05mob#60::OnMyMobDead";
+	monster "force_2-1",173,173,"Myst",1553,1,"force_05mob#60::OnMyMobDead";
+	monster "force_2-1",181,173,"Orc Skeleton",1462,1,"force_05mob#60::OnMyMobDead";
+	monster "force_2-1",171,177,"Orc Skeleton",1462,1,"force_05mob#60::OnMyMobDead";
+	monster "force_2-1",173,181,"Raggler",1445,1,"force_05mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_05_60,$force_05_60 -1;
-	if ($force_05_60 < 1) {
-		donpcevent "Minilover#arena::On05_end";
-		donpcevent "arena#60::Onreset_05";
+OnMyMobDead:
+	if (mobcount("force_2-1","force_05mob#60::OnMyMobDead") < 1) {
+		donpcevent "Minilover#arena::On05_End";
+		donpcevent "arena#60::OnReset_05";
 	}
 	end;
 }
 
 -	script	force_06start#60	-1,{
-
-Onon:
-	donpcevent "force_06mob#60::Onon";
+OnEnable:
+	donpcevent "force_06mob#60::OnEnable";
 	end;
 }
 
 -	script	force_06ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_06ex#60::OnMobEx";
-	end;
-
-Onon:
-	monster "force_2-1",169,130,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,130,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,125,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,125,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,120,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,120,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,115,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,115,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,110,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,110,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,105,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,105,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,100,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,100,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,95,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,95,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,90,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,90,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,85,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,85,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,80,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,80,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,75,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,75,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	end;
-
-Onsubon:
-	set $@randmonster60,rand(1,3);
-	switch($@randmonster60) {
+OnReset:
+	killmonster "force_2-1","force_06ex#60::OnMyMobDead";
+	end;
+
+OnEnable:
+	monster "force_2-1",169,130,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,130,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,125,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,125,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,120,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,120,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,115,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,115,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,110,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,110,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,105,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,105,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,100,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,100,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,95,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,95,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,90,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,90,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,85,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,85,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,80,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,80,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,75,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,75,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	end;
+
+OnSubOn:
+	switch(rand(1,3)) {
 	case 1:
-		monster "force_2-1",rand(170,177),rand(70,120),"Sidewinder",1424,1,"force_06ex#60::OnMobEx";
+		monster "force_2-1",rand(170,177),rand(70,120),"Sidewinder",1424,1,"force_06ex#60::OnMyMobDead";
 		break;
 	case 2:
-		monster "force_2-1",rand(170,177),rand(70,120),"Hermit Plant",1565,1,"force_06ex#60::OnMobEx";
+		monster "force_2-1",rand(170,177),rand(70,120),"Hermit Plant",1565,1,"force_06ex#60::OnMyMobDead";
 		break;
 	case 3:
-		monster "force_2-1",rand(170,177),rand(70,120),"Cruiser",1443,1,"force_06ex#60::OnMobEx";
+		monster "force_2-1",rand(170,177),rand(70,120),"Cruiser",1443,1,"force_06ex#60::OnMyMobDead";
 		break;
 	}
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_06mob#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_06mob#60::OnMobDeath";
+OnReset:
+	killmonster "force_2-1","force_06mob#60::OnMyMobDead";
 	end;
 
-Onon:
-	donpcevent "force_06ex#60::Onon";
-	monster "force_2-1",174,100,"Miyabi Doll",1552,1,"force_06mob#60::OnMobDeath";
-	monster "force_2-1",174,80,"Miyabi Doll",1552,1,"force_06mob#60::OnMobDeath";
-	set $force_06_60,2;
+OnEnable:
+	donpcevent "force_06ex#60::OnEnable";
+	monster "force_2-1",174,100,"Miyabi Doll",1552,1,"force_06mob#60::OnMyMobDead";
+	monster "force_2-1",174,80,"Miyabi Doll",1552,1,"force_06mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_06_60,$force_06_60 -1;
-	if ($force_06_60 < 1) {
-		set door, 1;
-		donpcevent "Minilover#arena::On06_end";
-		donpcevent "arena#60::Onreset_06";
+OnMyMobDead:
+	if (mobcount("force_2-1","force_06mob#60::OnMyMobDead") < 1) {
+		donpcevent "Minilover#arena::On06_End";
+		donpcevent "arena#60::OnReset_06";
 	}
-	else donpcevent "force_06ex#60::Onsubon";
+	else donpcevent "force_06ex#60::OnSubOn";
 	end;
 }
 
 -	script	force_07start#60	-1,{
-
-Onon:
-	donpcevent "force_07mob#60::Onon";
+OnEnable:
+	donpcevent "force_07mob#60::OnEnable";
 	end;
 }
 
 -	script	force_07mob#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_07mob#60::OnMobDeath";
+OnReset:
+	killmonster "force_2-1","force_07mob#60::OnMyMobDead";
 	end;
 
-Onon:
-	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMobDeath";
-	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMobDeath";
-	monster "force_2-1",175,25,"Myst",1553,1,"force_07mob#60::OnMobDeath";
-	monster "force_2-1",179,25,"Isis",1421,1,"force_07mob#60::OnMobDeath";
-	set $force_07_50,4;
+OnEnable:
+	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMyMobDead";
+	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMyMobDead";
+	monster "force_2-1",175,25,"Myst",1553,1,"force_07mob#60::OnMyMobDead";
+	monster "force_2-1",179,25,"Isis",1421,1,"force_07mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_07_50,$force_07_50 -1;
-	if ($force_07_50 < 1) {
-		donpcevent "Minilover#arena::On07_end";
-		donpcevent "arena#60::Onreset_07";
+OnMyMobDead:
+	if (mobcount("force_2-1","force_07mob#60::OnMyMobDead") < 1) {
+		donpcevent "Minilover#arena::On07_End";
+		donpcevent "arena#60::OnReset_07";
 	}
 	end;
 }
 
 -	script	force_08start#60	-1,{
-
-Onon:
-	donpcevent "force_08ex#60::Onon";
+OnEnable:
+	donpcevent "force_08ex#60::OnEnable";
 	end;
 }
 
 -	script	force_08ex#60	-1,{
-
-Onon:
-	donpcevent "arena#60::Onreset_08";
+OnEnable:
+	donpcevent "arena#60::OnReset_08";
 	end;
 }
 
 -	script	force_09start#60	-1,{
-
-Onon:
-	donpcevent "force_09mob#60::Onon";
+OnEnable:
+	donpcevent "force_09mob#60::OnEnable";
 	end;
 }
 
 -	script	force_09ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_09ex#60::OnMobEx";
-	end;
-
-Onsummonmob_09:
-	monster "force_2-1",90,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",92,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",99,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",105,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,104,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,96,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,92,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",95,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",99,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",100,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",104,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,104,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,96,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,92,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",104,102,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",196,102,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",114,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",121,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",85,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",78,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",96,118,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",103,118,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	end;
-
-OnMobEx:
+OnReset:
+	killmonster "force_2-1","force_09ex#60::OnMyMobDead";
+	end;
+
+OnSummonMob_09:
+	monster "force_2-1",90,100,"Horong",1578,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",92,100,"Horong",1578,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",99,100,"Horong",1578,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",105,100,"Horong",1578,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,104,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,96,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,92,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",95,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",99,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",100,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",104,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,104,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,96,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,92,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",104,102,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",196,102,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",114,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",121,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",85,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",78,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",96,118,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",103,118,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_09mob#60	-1,{
-
-Onon:
-	donpcevent "force_09ex#60::Onsummonmob_09";
-	monster "force_2-1",99,99,"Goblin Leader",1539,1,"force_09mob#60::OnMobDeath";
-	set $force_09_60,1;
+OnEnable:
+	donpcevent "force_09ex#60::OnSummonMob_09";
+	monster "force_2-1",99,99,"Goblin Leader",1539,1,"force_09mob#60::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_2-1","force_09mob#60::OnMobDeath";
+OnReset:
+	killmonster "force_2-1","force_09mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_60,$force_09_60 -1;
-	if ($force_09_60 < 1) {
-		donpcevent "Minilover#arena::On09_end";
-		donpcevent "arena#60::Onreset_09";
-		donpcevent "arena#60::Onreset_all";
+OnMyMobDead:
+	if (mobcount("force_2-1","force_09mob#60::OnMyMobDead") < 1) {
+		donpcevent "Minilover#arena::On09_End";
+		donpcevent "arena#60::OnReset_09";
+		donpcevent "arena#60::OnReset_All";
 		set $arena_min60end,gettime(2);
 		set $arena_sec60end,gettime(1);
 	}
 	end;
 }
 
-prt_are_in,129,135,3	script	Staff#60-1	67,{
-
+prt_are_in,129,135,3	script	Staff#60-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -872,30 +811,20 @@ prt_are_in,129,135,3	script	Staff#60-1	67,{
 	end;
 }
 
-prt_are_in,25,135,3	script	Staff#60-2	67,{
-
-	if($arena_min60end < $arena_min60st)
-	{
-		if($arena_sec60end < $arena_sec60st)
-		{
+prt_are_in,25,135,3	script	Staff#60-2	1_F_02,{
+	if($arena_min60end < $arena_min60st) {
+		if($arena_sec60end < $arena_sec60st) {
 			set @record_min60,60 - $arena_min60st + $arena_min60end -1;
 			set @record_sec60,60 - $arena_sec60st + $arena_sec60end;
-		}
-		else
-		{
+		} else {
 			set @record_min60,60 - $arena_min60st + $arena_min60end;
 			set @record_sec60,$arena_sec60end - $arena_sec60st;
 		}
-	}
-	else
-	{
-		if($arena_sec60end < $arena_sec60st)
-		{
+	} else {
+		if($arena_sec60end < $arena_sec60st) {
 			set @record_min60,$arena_min60end - $arena_min60st -1;
 			set @record_sec60,60 - $arena_sec60st + $arena_sec60end;
-		}
-		else
-		{
+		} else {
 			set @record_min60,$arena_min60end - $arena_min60st;
 			set @record_sec60,$arena_sec60end - $arena_sec60st;
 		}
@@ -911,7 +840,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 	mes "Congratulations!";
 	next;
 	mes "[Staff]";
-	mes "The fastest player among people who cleared lvl 60s arena time force battle is ^3131FF"+$arena_60topn$+"^000000.";
+	mes "The fastest player among people who cleared Lv60 arena time force battle is ^3131FF"+$arena_60topn$+"^000000.";
 	next;
 	mes "[Staff]";
 	mes "^3131FF"+$arena_60topn$+"^000000's running time was ^3131FF"+$top_60min+"^000000minutes ^3131FF"+$top_60sec+"^000000seconds.";
@@ -932,9 +861,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			set arena_point, arena_point + 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
@@ -946,15 +873,13 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			close2;
 		}
 		specialeffect2 EF_EXIT;
- 		donpcevent "cast#60::Onnomal1";
+ 		donpcevent "cast#60::OnNomal1";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_60::Onstop";
-		donpcevent "alloff#60::Onon";
-		donpcevent "lvl 60s Waiting Room::Onstart";
+		donpcevent "#arn_timer_60::OnStop";
+		donpcevent "alloff#60::OnEnable";
+		donpcevent "Lv60 Waiting Room::OnStart";
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
@@ -965,7 +890,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 		set $top_60min, @record_min60;
 		set $top_60sec, @record_sec60;
 		set $arena_60topn$,strcharinfo(0);
-		donpcevent "Vendigos::Onlinerec_60";
+		donpcevent "Vendigos::OnLineRec_60";
 		next;
 		if (arena_point > 29950) {
 			mes "[Staff]";
@@ -979,9 +904,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			mes "[Staff]";
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
@@ -997,19 +920,17 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			close2;
 		}
 		specialeffect2 EF_HIT5;
- 		donpcevent "cast#60::Onnomal2";
+ 		donpcevent "cast#60::OnNomal2";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_60::Onstop";
-		donpcevent "alloff#60::Onon";
-		donpcevent "lvl 60s Waiting Room::Onstart";
+		donpcevent "#arn_timer_60::OnStop";
+		donpcevent "alloff#60::OnEnable";
+		donpcevent "Lv60 Waiting Room::OnStart";
 		end;
 	}
-
 }
 
 -	script	#arn_timer_60	-1,{
-
-Onon:
+OnEnable:
 	initnpctimer;
 	end;
 
@@ -1026,65 +947,62 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
- 	donpcevent "cast#60::Ontimeover2";
-	donpcevent "arn_warp_60::Onout";
-	donpcevent "#arn_timer_60::Onstop";
-	donpcevent "alloff#60::Onon";
-	donpcevent "lvl 60s Waiting Room::Onstart";
+	donpcevent "cast#60::OnTimeOver2";
+	donpcevent "arn_warp_60::OnOut";
+	donpcevent "#arn_timer_60::OnStop";
+	donpcevent "alloff#60::OnEnable";
+	donpcevent "Lv60 Waiting Room::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
-	end; 
+	end;
 }
 
 -	script	arn_warp_60	-1,{
-
-Onout:
+OnOut:
 	areawarp "prt_are_in",14,143,29,126,"arena_room",100,75;
 	end;
 }
 
 -	script	cast#60	-1,{
-
-Ontimeover1:
+OnTimeOver1:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
 
-Onnomal1:
+OnNomal1:
 	mapannounce "force_2-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 
-Onnomal2:
+OnNomal2:
 	mapannounce "force_2-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 
-Ontimeover2:
+OnTimeOver2:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred in the waiting room.",0,0xFFCE00;
 	end;
 }
 
 -	script	alloff#60	-1,{
-
-Onon:
+OnEnable:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03mob#60::Onreset";
-	donpcevent "force_04mob#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
-	donpcevent "force_07mob#60::Onreset";
-	donpcevent "force_08mob#60::Onreset";
-	donpcevent "force_09mob#60::Onreset";
-	donpcevent "force_01ex#60::Onreset";
-	donpcevent "force_03ex#60::Onreset";
-	donpcevent "force_04ex#60::Onreset";
-	donpcevent "force_05ex#60::Onreset";
-	donpcevent "force_06ex#60::Onreset";
-	donpcevent "force_08ex#60::Onreset";
-	donpcevent "force_09ex#60::Onreset";
-	donpcevent "Minilover#arena::Ontimeroff";
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03mob#60::OnReset";
+	donpcevent "force_04mob#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
+	donpcevent "force_07mob#60::OnReset";
+	//donpcevent "force_08mob#60::OnReset";
+	donpcevent "force_09mob#60::OnReset";
+	donpcevent "force_01ex#60::OnReset";
+	donpcevent "force_03ex#60::OnReset";
+	donpcevent "force_04ex#60::OnReset";
+	donpcevent "force_05ex#60::OnReset";
+	donpcevent "force_06ex#60::OnReset";
+	//donpcevent "force_08ex#60::OnReset";
+	donpcevent "force_09ex#60::OnReset";
+	donpcevent "Minilover#arena::OnTimerOff";
 	disablenpc "Minilover#arena";
 	disablenpc "force_01_02#60";
 	disablenpc "force_02_03#60";
@@ -1096,7 +1014,7 @@ Onon:
 	disablenpc "force_08_09#60";
 	disablenpc "force_exit#60";
 	disablenpc "arena#60";
-	donpcevent "#arn_timer_60::Onstop";
+	donpcevent "#arn_timer_60::OnStop";
 	enablenpc "Minilover#arena";
 	enablenpc "arena#60";
 	end;
@@ -1104,5 +1022,4 @@ Onon:
 OnInit:
 	if(!$top_60min && !$top_60sec) set $top_60min,6;
 	end;
-
 }
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index e3ab5367f..e50113e74 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -1,43 +1,41 @@
 //===== Hercules Script ======================================
-//= Izlude Arena lvl 70
+//= Izlude Arena Level 70
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.1
+//= 1.3
 //===== Description: =========================================
 //= Izlude Battle Arena Level 70
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
+//= 1.2 Label standardization. [Euphy]
+//= 1.3 Script updates. [Euphy]
 //============================================================
 
-arena_room,52,42,7	script	lvl 70s Waiting Room	124,{
+arena_room,52,42,7	script	Lv70 Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
-	waitingroom "Individual; Level 70 to 89",50,"lvl 70s Waiting Room::OnStartArena",1,1000,70,89;
+	waitingroom "Individual; Level 70 to 89",50,"Lv70 Waiting Room::OnStartArena",1,1000,70,89;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
 	warpwaitingpc "force_3-1",99,12;
-	donpcevent "arena#70::Onstart";
+	donpcevent "arena#70::OnStart";
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
 
-force_3-1,99,20,4	script	Cadillac#arena	124,{
+force_3-1,99,20,4	script	Cadillac#arena	4_F_TELEPORTER,{
 	end;
 
-OnInit:
-	set $@mapcount70, 0;
-	end;
-
-Onstart:
+OnStart:
 	initnpctimer;
 	set $arena_min70st,gettime(2);
 	set $arena_sec70st,gettime(1);
@@ -56,48 +54,43 @@ OnTimer7000:
 	end;
 
 OnTimer60000:
-	set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
-		donpcevent "Cadillac#arena::Onfailclearstage";
+	if (getmapusers("force_3-1") == 0) {
+		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 6 minutes ",0;
 	end;
 
 OnTimer120000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
-		donpcevent "Cadillac#arena::Onfailclearstage";
+	if (getmapusers("force_3-1") == 0) {
+		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 5 minutes ",0;
 	end;
 
 OnTimer180000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
-		donpcevent "Cadillac#arena::Onfailclearstage";
+	if (getmapusers("force_3-1") == 0) {
+		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 4 minutes ",0;
-end;
+	end;
+
 OnTimer240000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
-		donpcevent "Cadillac#arena::Onfailclearstage";
+	if (getmapusers("force_3-1") == 0) {
+		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 3 minutes ",0;
 	end;
 
 OnTimer300000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
-		donpcevent "Cadillac#arena::Onfailclearstage";
+	if (getmapusers("force_3-1") == 0) {
+		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 2 minutes ",0;
 	end;
 
 OnTimer360000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
-		donpcevent "Cadillac#arena::Onfailclearstage";
+	if (getmapusers("force_3-1") == 0) {
+		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 1 minute ",0;
 	end;
@@ -121,146 +114,144 @@ OnTimer434000:
 
 OnTimer435000:
 	mapwarp "force_3-1","prt_are_in",126,87,0,0;
-	donpcevent "Cadillac#arena::Onfailclearstage";
+	donpcevent "Cadillac#arena::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
-	donpcevent "cast#70::Ontimeover1";
+OnFailClearStage:
+	donpcevent "cast#70::OnTimeOver1";
 	mapwarp "force_3-1","prt_are_in",126,87,0,0;
-	donpcevent "Cadillac#arena::Ontimeroff";
-	donpcevent "arena#70::Onreset_all";
-	donpcevent "alloff#70::Onon";
-	donpcevent "lvl 70s Waiting Room::Onstart";
+	donpcevent "Cadillac#arena::OnTimerOff";
+	donpcevent "arena#70::OnReset_All";
+	donpcevent "alloff#70::OnEnable";
+	donpcevent "Lv70 Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Kobolds!",0;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_3-1","A door to the north room has opened!",0;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Horongs and escape!",0;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_3-1","A door to the north room has opened!",0;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all monsters except Enchanted Peach Trees!",0;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_3-1","Clear! A door to the east room has opened!",0;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Stem Worms while dodging Bathories!",0;
 	end;
 
-On04_end:
+On04_End:
 	mapannounce "force_3-1","A door to the east room has opened!",0;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Argiopes!",0;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_3-1","Clear! A door to the south room has opened!",0;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Hammer Goblins!",0;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_3-1","A door to the south room has opened!",0;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill an Alice in the center!",0;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_3-1","Clear! A door to the west room has opened!",0;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_3-1","Please escape to the north exit!",0;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill a Kobold Leader and all Kobolds!",0;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_3-1","Boss Clear! - A door at the north has opened. Thank you. ",0;
 	end;
-
 }
 
 -	script	arena#70	-1,{
-
-Onreset_01:
-	donpcevent "force_01ex#70::Onreset";
-	donpcevent "force_02start#70::Onon";
+OnReset_01:
+	//donpcevent "force_01ex#70::OnReset";
+	donpcevent "force_02start#70::OnEnable";
 	enablenpc "force_01_02#70";
 	end;
 
-Onreset_02:
-	donpcevent "force_02ex#70::Onreset";
-	donpcevent "force_03start#70::Onon";
+OnReset_02:
+	donpcevent "force_02ex#70::OnReset";
+	donpcevent "force_03start#70::OnEnable";
 	enablenpc "force_02_03#70";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#70";
-	donpcevent "force_04start#70::Onon";
-	donpcevent "force_03ex#70::Onreset";
+	donpcevent "force_04start#70::OnEnable";
+	donpcevent "force_03ex#70::OnReset";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#70";
-	donpcevent "force_05start#70::Onon";
-	donpcevent "force_04ex#70::Onreset";
+	donpcevent "force_05start#70::OnEnable";
+	donpcevent "force_04ex#70::OnReset";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#70";
-	donpcevent "force_06start#70::Onon";
-	donpcevent "force_05ex#70::Onreset";
+	donpcevent "force_06start#70::OnEnable";
+	donpcevent "force_05ex#70::OnReset";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#70";
-	donpcevent "force_07start#70::Onon";
-	donpcevent "force_06ex#70::Onreset";
+	donpcevent "force_07start#70::OnEnable";
+	donpcevent "force_06ex#70::OnReset";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#70";
-	donpcevent "force_07ex#70::Onreset";
-	donpcevent "force_08start#70::Onon";
+	donpcevent "force_07ex#70::OnReset";
+	donpcevent "force_08start#70::OnEnable";
 	end;
 
-Onreset_08:
-	donpcevent "force_09start#70::Onon";
+OnReset_08:
+	donpcevent "force_09start#70::OnEnable";
 	enablenpc "force_08_09#70";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#70";
 	end;
 
-Onstart:
+OnStart:
 	disablenpc "force_01_02#70";
 	disablenpc "force_02_03#70";
 	disablenpc "force_03_04#70";
@@ -270,567 +261,501 @@ Onstart:
 	disablenpc "force_07_08#70";
 	disablenpc "force_08_09#70";
 	disablenpc "force_exit#70";
-	donpcevent "Cadillac#arena::Ontimeroff";
-	donpcevent "force_09mob#70::Ontimeroff";
-	donpcevent "force_01mob#70::Onreset";
-	donpcevent "force_02mob#70::Onreset";
-	donpcevent "force_03mob#70::Onreset";
-	donpcevent "force_04mob#70::Onreset";
-	donpcevent "force_05mob#70::Onreset";
-	donpcevent "force_06mob#70::Onreset";
-	donpcevent "force_07mob#70::Onreset";
-	donpcevent "force_08mob#70::Onreset";
-	donpcevent "force_09mob#70::Onreset";
-	donpcevent "force_01ex#70::Onreset";
-	donpcevent "force_02ex#70::Onreset";
-	donpcevent "force_03ex#70::Onreset";
-	donpcevent "force_04ex#70::Onreset";
-	donpcevent "force_05ex#70::Onreset";
-	donpcevent "force_06ex#70::Onreset";
-	donpcevent "force_07ex#70::Onreset";
-	donpcevent "force_08ex#70::Onreset";
-	donpcevent "force_09ex#70::Onreset";
+	donpcevent "Cadillac#arena::OnTimerOff";
+	//donpcevent "force_09mob#70::OnTimerOff";
+	donpcevent "force_01mob#70::OnReset";
+	donpcevent "force_02mob#70::OnReset";
+	donpcevent "force_03mob#70::OnReset";
+	donpcevent "force_04mob#70::OnReset";
+	donpcevent "force_05mob#70::OnReset";
+	donpcevent "force_06mob#70::OnReset";
+	donpcevent "force_07mob#70::OnReset";
+	//donpcevent "force_08mob#70::OnReset";
+	donpcevent "force_09mob#70::OnReset";
+	//donpcevent "force_01ex#70::OnReset";
+	donpcevent "force_02ex#70::OnReset";
+	donpcevent "force_03ex#70::OnReset";
+	donpcevent "force_04ex#70::OnReset";
+	donpcevent "force_05ex#70::OnReset";
+	donpcevent "force_06ex#70::OnReset";
+	donpcevent "force_07ex#70::OnReset";
+	//donpcevent "force_08ex#70::OnReset";
+	donpcevent "force_09ex#70::OnReset";
 	enablenpc "force_08_01#70";
-	donpcevent "force_01start#70::Onon";
-	donpcevent "Cadillac#arena::Onstart";
-	end;
-
-Onreset_all:
-	donpcevent "force_01mob#70::Onreset";
-	donpcevent "force_02mob#70::Onreset";
-	donpcevent "force_03mob#70::Onreset";
-	donpcevent "force_04mob#70::Onreset";
-	donpcevent "force_05mob#70::Onreset";
-	donpcevent "force_06mob#70::Onreset";
-	donpcevent "force_07mob#70::Onreset";
-	donpcevent "force_09mob#70::Onreset";
-	donpcevent "force_01ex#70::Onreset";
-	donpcevent "force_02ex#70::Onreset";
-	donpcevent "force_03ex#70::Onreset";
-	donpcevent "force_04ex#70::Onreset";
-	donpcevent "force_05ex#70::Onreset";
-	donpcevent "force_06ex#70::Onreset";
-	donpcevent "force_07ex#70::Onreset";
-	donpcevent "force_08ex#70::Onreset";
-	donpcevent "force_09ex#70::Onreset";
-	end;
-
-}
-
-force_3-1,62,26,1	script	force_08_01#70	45,1,1,{
-
+	donpcevent "force_01start#70::OnEnable";
+	donpcevent "Cadillac#arena::OnStart";
+	end;
+
+OnReset_All:
+	donpcevent "force_01mob#70::OnReset";
+	donpcevent "force_02mob#70::OnReset";
+	donpcevent "force_03mob#70::OnReset";
+	donpcevent "force_04mob#70::OnReset";
+	donpcevent "force_05mob#70::OnReset";
+	donpcevent "force_06mob#70::OnReset";
+	donpcevent "force_07mob#70::OnReset";
+	donpcevent "force_09mob#70::OnReset";
+	//donpcevent "force_01ex#70::OnReset";
+	donpcevent "force_02ex#70::OnReset";
+	donpcevent "force_03ex#70::OnReset";
+	donpcevent "force_04ex#70::OnReset";
+	donpcevent "force_05ex#70::OnReset";
+	donpcevent "force_06ex#70::OnReset";
+	donpcevent "force_07ex#70::OnReset";
+	//donpcevent "force_08ex#70::OnReset";
+	donpcevent "force_09ex#70::OnReset";
+	end;
+}
+
+force_3-1,62,26,1	script	force_08_01#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::On01_start";
+	donpcevent "Cadillac#arena::On01_Start";
 	warp "force_3-1",40,26;
 	end;
-
 }
 
-force_3-1,25,44,1	script	force_01_02#70	45,1,1,{
-
+force_3-1,25,44,1	script	force_01_02#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::On02_start";
+	donpcevent "Cadillac#arena::On02_Start";
 	warp "force_3-1",25,69;
 	end;
-
 }
 
-force_3-1,25,134,1	script	force_02_03#70	45,1,1,{
-
+force_3-1,25,134,1	script	force_02_03#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::On03_start";
+	donpcevent "Cadillac#arena::On03_Start";
 	warp "force_3-1",25,159;
 	end;
-
 }
 
-force_3-1,44,174,1	script	force_03_04#70	45,1,1,{
-
+force_3-1,44,174,1	script	force_03_04#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::On04_start";
+	donpcevent "Cadillac#arena::On04_Start";
 	warp "force_3-1",69,174;
 	end;
-
 }
 
-force_3-1,134,174,1	script	force_04_05#70	45,1,1,{
-
+force_3-1,134,174,1	script	force_04_05#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::On05_start";
+	donpcevent "Cadillac#arena::On05_Start";
 	warp "force_3-1",159,174;
 	end;
-
 }
 
-force_3-1,174,155,1	script	force_05_06#70	45,1,1,{
-
+force_3-1,174,155,1	script	force_05_06#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::On06_start";
+	donpcevent "Cadillac#arena::On06_Start";
 	warp "force_3-1",174,130;
 	end;
-
 }
 
-force_3-1,174,65,1	script	force_06_07#70	45,1,1,{
-
+force_3-1,174,65,1	script	force_06_07#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::On07_start";
+	donpcevent "Cadillac#arena::On07_Start";
 	warp "force_3-1",174,40;
 	end;
-
 }
 
-force_3-1,155,26,1	script	force_07_08#70	45,1,1,{
-
+force_3-1,155,26,1	script	force_07_08#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::On08_start";
+	donpcevent "Cadillac#arena::On08_Start";
 	warp "force_3-1",132,26;
 	enablenpc "force_08_09#70";
 	end;
-
 }
 
-force_3-1,99,54,1	script	force_08_09#70	45,1,1,{
-
+force_3-1,99,54,1	script	force_08_09#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::On09_start";
+	donpcevent "Cadillac#arena::On09_Start";
 	warp "force_3-1",99,82;
 	end;
-
 }
 
-force_3-1,99,124,1	script	force_exit#70	45,1,1,{
-
+force_3-1,99,124,1	script	force_exit#70	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Cadillac#arena::Ontimeroff";
-	donpcevent "#arn_timer_70::Onon";
+	donpcevent "Cadillac#arena::OnTimerOff";
+	donpcevent "#arn_timer_70::OnEnable";
 	mapwarp "force_3-1","prt_are_in",22,87,0,0;
 	end;
-
 }
 
 -	script	force_01start#70	-1,{
-Onon:
-	donpcevent "force_01mob#70::Onon";
-end;
-
+OnEnable:
+	donpcevent "force_01mob#70::OnEnable";
+	end;
 }
 
 -	script	force_01mob#70	-1,{
-
-Onon:
-	monster "force_3-1",25,36,"Kobold",1545,1,"force_01mob#70::OnMobDeath";
-	monster "force_3-1",20,36,"Kobold",1545,1,"force_01mob#70::OnMobDeath";
-	monster "force_3-1",25,20,"Kobold",1546,1,"force_01mob#70::OnMobDeath";
-	monster "force_3-1",30,36,"Kobold",1547,1,"force_01mob#70::OnMobDeath";
-	monster "force_3-1",28,15,"Kobold",1547,1,"force_01mob#70::OnMobDeath";
-	set $force_01_70,5;
+OnEnable:
+	monster "force_3-1",25,36,"Kobold",1545,1,"force_01mob#70::OnMyMobDead";
+	monster "force_3-1",20,36,"Kobold",1545,1,"force_01mob#70::OnMyMobDead";
+	monster "force_3-1",25,20,"Kobold",1546,1,"force_01mob#70::OnMyMobDead";
+	monster "force_3-1",30,36,"Kobold",1547,1,"force_01mob#70::OnMyMobDead";
+	monster "force_3-1",28,15,"Kobold",1547,1,"force_01mob#70::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_3-1","force_01mob#70::OnMobDeath";
+OnReset:
+	killmonster "force_3-1","force_01mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_01_70,$force_01_70 -1;
-	if ($force_01_70 < 1) {
-		donpcevent "Cadillac#arena::On01_end";
-		donpcevent "arena#70::Onreset_01";
+OnMyMobDead:
+	if (mobcount("force_3-1","force_01mob#70::OnMyMobDead") < 1) {
+		donpcevent "Cadillac#arena::On01_End";
+		donpcevent "arena#70::OnReset_01";
 	}
 	end;
 }
 
 -	script	force_02start#70	-1,{
-
-Onon:
-	donpcevent "force_02mob#70::Onon";
+OnEnable:
+	donpcevent "force_02mob#70::OnEnable";
 	end;
 }
 
 -	script	force_02ex#70	-1,{
-
-Onreset:
-	killmonster "force_3-1","force_02ex#70::OnMobEx";
+OnReset:
+	killmonster "force_3-1","force_02ex#70::OnMyMobDead";
 	end;
 
-Onsummonmob2:
-	monster "force_3-1",21,78,"Archer Skeleton",1420,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",22,93,"Archer Skeleton",1420,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",29,93,"Archer Skeleton",1420,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",25,101,"Mummy",1393,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",26,101,"Mummy",1393,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",27,101,"Mummy",1393,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",28,101,"Mummy",1393,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",24,104,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",24,113,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",29,120,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",29,126,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",30,110,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
+OnSummonMob2:
+	monster "force_3-1",21,78,"Archer Skeleton",1420,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",22,93,"Archer Skeleton",1420,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",29,93,"Archer Skeleton",1420,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",25,101,"Mummy",1393,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",26,101,"Mummy",1393,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",27,101,"Mummy",1393,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",28,101,"Mummy",1393,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",24,104,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",24,113,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",29,120,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",29,126,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",30,110,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_02mob#70	-1,{
-
-Onreset:
-	killmonster "force_3-1","force_02mob#70::OnMobDeath";
+OnReset:
+	killmonster "force_3-1","force_02mob#70::OnMyMobDead";
 	end;
 
-Onon:
-	monster "force_3-1",25,79,"Horong",1578,1,"force_02mob#70::OnMobDeath";
-	monster "force_3-1",29,114,"Horong",1578,1,"force_02mob#70::OnMobDeath";
-	donpcevent "force_02ex#70::Onsummonmob2";
-	set $force_02_70,2;
+OnEnable:
+	monster "force_3-1",25,79,"Horong",1578,1,"force_02mob#70::OnMyMobDead";
+	monster "force_3-1",29,114,"Horong",1578,1,"force_02mob#70::OnMyMobDead";
+	donpcevent "force_02ex#70::OnSummonMob2";
 	end;
 
-OnMobDeath:
-	set $force_02_70,$force_02_70 -1;
-	if ($force_02_70 < 1) {
-		donpcevent "Cadillac#arena::On02_end";
-		donpcevent "arena#70::Onreset_02";
+OnMyMobDead:
+	if (mobcount("force_3-1","force_02mob#70::OnMyMobDead") < 1) {
+		donpcevent "Cadillac#arena::On02_End";
+		donpcevent "arena#70::OnReset_02";
 	}
 	end;
 }
 
 -	script	force_03start#70	-1,{
-
-Onon:
-	donpcevent "force_03mob#70::Onon";
+OnEnable:
+	donpcevent "force_03mob#70::OnEnable";
 	end;
 }
 
 -	script	force_03ex#70	-1,{
-
-Onreset:
-	killmonster "force_3-1","force_03ex#70::OnMobEx";
+OnReset:
+	killmonster "force_3-1","force_03ex#70::OnMyMobDead";
 	end;
 
-Onsummonmob_03:
-	monster "force_3-1",10,170,"Enchanted Peach Tree",1550,1,"force_03ex#70::OnMobEx";
-	monster "force_3-1",26,180,"Enchanted Peach Tree",1550,1,"force_03ex#70::OnMobEx";
+OnSummonMob_03:
+	monster "force_3-1",10,170,"Enchanted Peach Tree",1550,1,"force_03ex#70::OnMyMobDead";
+	monster "force_3-1",26,180,"Enchanted Peach Tree",1550,1,"force_03ex#70::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03mob#70	-1,{
-
-Onon:
-	donpcevent "force_03ex#70::Onsummonmob_03";
-	monster "force_3-1",23,174,"Parasite",1555,1,"force_03mob#70::OnMobDeath";
-	monster "force_3-1",33,173,"Parasite",1555,1,"force_03mob#70::OnMobDeath";
-	monster "force_3-1",26,166,"Blood Butterfly",1526,1,"force_03mob#70::OnMobDeath";
-	set $force_03_70,3;
+OnEnable:
+	donpcevent "force_03ex#70::OnSummonMob_03";
+	monster "force_3-1",23,174,"Parasite",1555,1,"force_03mob#70::OnMyMobDead";
+	monster "force_3-1",33,173,"Parasite",1555,1,"force_03mob#70::OnMyMobDead";
+	monster "force_3-1",26,166,"Blood Butterfly",1526,1,"force_03mob#70::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_3-1","force_03mob#70::OnMobDeath";
+OnReset:
+	killmonster "force_3-1","force_03mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_70,$force_03_70 -1;
-	donpcevent "force_03ex#70::Onsummonmob_03";
-	if ($force_03_70 < 1) {
-		donpcevent "Cadillac#arena::On03_end";
-		donpcevent "arena#70::Onreset_03";
+OnMyMobDead:
+	donpcevent "force_03ex#70::OnSummonMob_03";
+	if (mobcount("force_3-1","force_03mob#70::OnMyMobDead") < 1) {
+		donpcevent "Cadillac#arena::On03_End";
+		donpcevent "arena#70::OnReset_03";
 	}
 	end;
 }
 
 -	script	force_04start#70	-1,{
-
-Onon:
-	donpcevent "force_04mob#70::Onon";
-end;
-
+OnEnable:
+	donpcevent "force_04mob#70::OnEnable";
+	end;
 }
 
 -	script	force_04ex#70	-1,{
-
-Onreset:
-	killmonster "force_3-1","force_04ex#70::OnMobEx";
+OnReset:
+	killmonster "force_3-1","force_04ex#70::OnMyMobDead";
 	end;
 
-Onsummonmob_04:
-	monster "force_3-1",94,179,"Bathory",1525,1,"force_04ex#70::OnMobEx";
-	monster "force_3-1",110,179,"Bathory",1525,1,"force_04ex#70::OnMobEx";
-	monster "force_3-1",90,170,"Bathory",1525,1,"force_04ex#70::OnMobEx";
-	monster "force_3-1",100,170,"Bathory",1525,1,"force_04ex#70::OnMobEx";
-	monster "force_3-1",125,178,"Bathory",1525,1,"force_04ex#70::OnMobEx";
-	monster "force_3-1",125,169,"Bathory",1525,1,"force_04ex#70::OnMobEx";
+OnSummonMob_04:
+	monster "force_3-1",94,179,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",110,179,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",90,170,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",100,170,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",125,178,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",125,169,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
-
 }
 
 -	script	force_04mob#70	-1,{
-
-Onon:
-	donpcevent "force_04ex#70::Onsummonmob_04";
-	monster "force_3-1",87,174,"Stem Worm",1440,1,"force_04mob#70::OnMobDeath";
-	monster "force_3-1",103,174,"Stem Worm",1440,1,"force_04mob#70::OnMobDeath";
-	monster "force_3-1",96,170,"Stem Worm",1440,1,"force_04mob#70::OnMobDeath";
-	set $force_04_70,3;
+OnEnable:
+	donpcevent "force_04ex#70::OnSummonMob_04";
+	monster "force_3-1",87,174,"Stem Worm",1440,1,"force_04mob#70::OnMyMobDead";
+	monster "force_3-1",103,174,"Stem Worm",1440,1,"force_04mob#70::OnMyMobDead";
+	monster "force_3-1",96,170,"Stem Worm",1440,1,"force_04mob#70::OnMyMobDead";
 	end;
-Onreset:
-	killmonster "force_3-1","force_04mob#70::OnMobDeath";
+OnReset:
+	killmonster "force_3-1","force_04mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_04_70,$force_04_70 -1;
-	if ($force_04_70 < 1) {
-		donpcevent "Cadillac#arena::On04_end";
-		donpcevent "arena#70::Onreset_04";
+OnMyMobDead:
+	if (mobcount("force_3-1","force_04mob#70::OnMyMobDead") < 1) {
+		donpcevent "Cadillac#arena::On04_End";
+		donpcevent "arena#70::OnReset_04";
 	}
 	end;
 }
 
 -	script	force_05start#70	-1,{
-
-Onon:
-	donpcevent "force_05mob#70::Onon";
+OnEnable:
+	donpcevent "force_05mob#70::OnEnable";
 	end;
 }
 
 -	script	force_05ex#70	-1,{
-
-Onreset:
-	killmonster "force_3-1","force_05ex#70::OnMobEx";
+OnReset:
+	killmonster "force_3-1","force_05ex#70::OnMyMobDead";
 	end;
 
-Onsummonmob_05:
-	set $@randmonster70,rand(1,2);
-	switch($@randmonster70) {
+OnSummonMob_05:
+	switch(rand(1,2)) {
 	case 1:
-		monster "force_3-1",174,174,"Ride Word",1478,1,"force_05ex#70::OnMobEx";
+		monster "force_3-1",174,174,"Ride Word",1478,1,"force_05ex#70::OnMyMobDead";
 		break;
 	case 2:
-		monster "force_3-1",173,173,"Mantis",1457,1,"force_05ex#70::OnMobEx";
+		monster "force_3-1",173,173,"Mantis",1457,1,"force_05ex#70::OnMyMobDead";
 		break;
 	}
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_05mob#70	-1,{
-
-Onon:
-	monster "force_3-1",164,183,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	monster "force_3-1",168,158,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	monster "force_3-1",175,174,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	monster "force_3-1",176,179,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	monster "force_3-1",183,160,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	set $force_05_70,5;
+OnEnable:
+	monster "force_3-1",164,183,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
+	monster "force_3-1",168,158,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
+	monster "force_3-1",175,174,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
+	monster "force_3-1",176,179,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
+	monster "force_3-1",183,160,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_3-1","force_05mob#70::OnMobDeath";
+OnReset:
+	killmonster "force_3-1","force_05mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_05_70,$force_05_70 -1;
-	if ($force_05_70 < 1) {
-		donpcevent "Cadillac#arena::On05_end";
-		donpcevent "arena#70::Onreset_05";
+OnMyMobDead:
+	if (mobcount("force_3-1","force_05mob#70::OnMyMobDead") < 1) {
+		donpcevent "Cadillac#arena::On05_End";
+		donpcevent "arena#70::OnReset_05";
 	}
-	else donpcevent "force_05ex#70::Onsummonmob_05";
+	else donpcevent "force_05ex#70::OnSummonMob_05";
 	end;
-
 }
 
 -	script	force_06start#70	-1,{
-
-Onon:
-	donpcevent "force_06mob#70::Onon";
+OnEnable:
+	donpcevent "force_06mob#70::OnEnable";
 	end;
 }
 
 -	script	force_06ex#70	-1,{
-
-Onreset:
-	killmonster "force_3-1","force_06ex#70::OnMobEx";
+OnReset:
+	killmonster "force_3-1","force_06ex#70::OnMyMobDead";
 	end;
 
-Onsummonmob_06:
-	monster "force_3-1",176,99,"Goblin",1534,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",170,86,"Goblin",1535,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",176,97,"Goblin",1535,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",170,108,"Goblin",1535,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",176,112,"Goblin",1536,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",173,120,"Goblin",1536,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",177,74,"Goblin",1536,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",173,118,"Goblin",1538,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",171,101,"Goblin",1538,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",174,118,"Goblin",1538,1,"force_06ex#70::OnMobEx";
+OnSummonMob_06:
+	monster "force_3-1",176,99,"Goblin",1534,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",170,86,"Goblin",1535,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",176,97,"Goblin",1535,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",170,108,"Goblin",1535,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",176,112,"Goblin",1536,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",173,120,"Goblin",1536,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",177,74,"Goblin",1536,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",173,118,"Goblin",1538,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",171,101,"Goblin",1538,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",174,118,"Goblin",1538,1,"force_06ex#70::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_06mob#70	-1,{
-
-Onon:
-	donpcevent "force_06ex#70::Onsummonmob_06";
-	monster "force_3-1",173,90,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	monster "force_3-1",173,79,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	monster "force_3-1",172,70,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	monster "force_3-1",175,70,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	monster "force_3-1",171,118,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	set $force_06_70,5;
+OnEnable:
+	donpcevent "force_06ex#70::OnSummonMob_06";
+	monster "force_3-1",173,90,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
+	monster "force_3-1",173,79,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
+	monster "force_3-1",172,70,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
+	monster "force_3-1",175,70,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
+	monster "force_3-1",171,118,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_3-1","force_06mob#70::OnMobDeath";
+OnReset:
+	killmonster "force_3-1","force_06mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_06_70,$force_06_70 -1;
-	if ($force_06_70 < 1) {
-		donpcevent "Cadillac#arena::On06_end";
-		donpcevent "arena#70::Onreset_06";
+OnMyMobDead:
+	if (mobcount("force_3-1","force_06mob#70::OnMyMobDead") < 1) {
+		donpcevent "Cadillac#arena::On06_End";
+		donpcevent "arena#70::OnReset_06";
 	}
 	end;
 }
 
 -	script	force_07start#70	-1,{
-
-Onon:
-	donpcevent "force_07mob#70::Onon";
+OnEnable:
+	donpcevent "force_07mob#70::OnEnable";
 	end;
 }
 
 -	script	force_07ex#70	-1,{
-
-Onreset:
-	killmonster "force_3-1","force_07ex#70::OnMobEx";
+OnReset:
+	killmonster "force_3-1","force_07ex#70::OnMyMobDead";
 	end;
 
-Onsummonmob_07:
-	monster "force_3-1",168,26,"Nightmare",1427,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",186,23,"Nightmare",1427,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",160,23,"Nightmare",1427,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",188,33,"Nightmare",1427,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",174,13,"Raydric",1453,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",163,15,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",164,15,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",163,16,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",164,16,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",187,13,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",187,14,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",186,14,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",186,14,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
+OnSummonMob_07:
+	monster "force_3-1",168,26,"Nightmare",1427,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",186,23,"Nightmare",1427,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",160,23,"Nightmare",1427,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",188,33,"Nightmare",1427,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",174,13,"Raydric",1453,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",163,15,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",164,15,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",163,16,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",164,16,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",187,13,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",187,14,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",186,14,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",186,14,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	end;
 
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_07mob#70	-1,{
-
-Onon:
-	donpcevent "force_07ex#70::Onsummonmob_07";
-	monster "force_3-1",174,25,"Alice",1521,1,"force_07mob#70::OnMobDeath";
-	set $force_07_70,1;
+OnEnable:
+	donpcevent "force_07ex#70::OnSummonMob_07";
+	monster "force_3-1",174,25,"Alice",1521,1,"force_07mob#70::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_3-1","force_07mob#70::OnMobDeath";
+OnReset:
+	killmonster "force_3-1","force_07mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_07_70,$force_07_70 -1;
-	if ($force_07_70 < 1) {
-		donpcevent "Cadillac#arena::On07_end";
-		donpcevent "arena#70::Onreset_07";
+OnMyMobDead:
+	if (mobcount("force_3-1","force_07mob#70::OnMyMobDead") < 1) {
+		donpcevent "Cadillac#arena::On07_End";
+		donpcevent "arena#70::OnReset_07";
 	}
 	end;
 }
 
 -	script	force_08start#70	-1,{
-
-Onon:
-	donpcevent "force_08ex#70::Onon";
+OnEnable:
+	donpcevent "force_08ex#70::OnEnable";
 	end;
 }
 
 -	script	force_08ex#70	-1,{
-
-Onon:
-	donpcevent "arena#70::Onreset_08";
+OnEnable:
+	donpcevent "arena#70::OnReset_08";
 	end;
 }
 
 -	script	force_09start#70	-1,{
-
-Onon:
-	donpcevent "force_09mob#70::Onon";
+OnEnable:
+	donpcevent "force_09mob#70::OnEnable";
 	end;
 }
 
 -	script	force_09ex#70	-1,{
-
-Onreset:
-	killmonster "force_3-1","force_09ex#70::OnMobEx";
+OnReset:
+	killmonster "force_3-1","force_09ex#70::OnMyMobDead";
 	end;
 
-Onsummonmob_09:
-	monster "force_3-1",93,100,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",94,100,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",93,99,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",87,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",89,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",91,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",93,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",95,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,112,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,110,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,108,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,106,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,104,"Familiar",1419,1,"force_09ex#70::OnMobEx";
+OnSummonMob_09:
+	monster "force_3-1",93,100,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",94,100,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",93,99,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",87,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",89,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",91,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",93,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",95,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,112,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,110,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,108,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,106,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,104,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_09mob#70	-1,{
-
-Onon:
-	monster "force_3-1",99,99,"Kobold Leader",1548,1,"force_09mob#70::OnMobDeath";
-	monster "force_3-1",98,99,"Kobold",1545,1,"force_09mob#70::OnMobDeath";
-	monster "force_3-1",100,99,"Kobold",1546,1,"force_09mob#70::OnMobDeath";
-	monster "force_3-1",99,98,"Kobold",1547,1,"force_09mob#70::OnMobDeath";
-	donpcevent "force_09ex#70::Onsummonmob_09";
-	set $force_09_70,4;
+OnEnable:
+	monster "force_3-1",99,99,"Kobold Leader",1548,1,"force_09mob#70::OnMyMobDead";
+	monster "force_3-1",98,99,"Kobold",1545,1,"force_09mob#70::OnMyMobDead";
+	monster "force_3-1",100,99,"Kobold",1546,1,"force_09mob#70::OnMyMobDead";
+	monster "force_3-1",99,98,"Kobold",1547,1,"force_09mob#70::OnMyMobDead";
+	donpcevent "force_09ex#70::OnSummonMob_09";
 	end;
 
-Onreset:
-	killmonster "force_3-1","force_09mob#70::OnMobDeath";
+OnReset:
+	killmonster "force_3-1","force_09mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_70,$force_09_70 -1;
-	if ($force_09_70 < 1) {
-		donpcevent "Cadillac#arena::On09_end";
-		donpcevent "arena#70::Onreset_09";
-		donpcevent "arena#70::Onreset_all";
+OnMyMobDead:
+	if (mobcount("force_3-1","force_09mob#70::OnMyMobDead") < 1) {
+		donpcevent "Cadillac#arena::On09_End";
+		donpcevent "arena#70::OnReset_09";
+		donpcevent "arena#70::OnReset_All";
 		set $arena_min70end,gettime(2);
 		set $arena_sec70end,gettime(1);
 	}
 	end;
 }
 
-prt_are_in,129,83,3	script	Staff#70-1	67,{
-
+prt_are_in,129,83,3	script	Staff#70-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -851,30 +776,20 @@ prt_are_in,129,83,3	script	Staff#70-1	67,{
 	end;
 }
 
-prt_are_in,25,84,3	script	Staff#70-2	67,{
-
-	if($arena_min70end < $arena_min70st)
-	{
-		if($arena_sec70end < $arena_sec70st)
-		{
+prt_are_in,25,84,3	script	Staff#70-2	1_F_02,{
+	if($arena_min70end < $arena_min70st) {
+		if($arena_sec70end < $arena_sec70st) {
 			set @record_min70,60 - $arena_min70st + $arena_min70end -1;
 			set @record_sec70,60 - $arena_sec70st + $arena_sec70end;
-		}
-		else
-		{
+		} else {
 			set @record_min70,60 - $arena_min70st + $arena_min70end;
 			set @record_sec70,$arena_sec70end - $arena_sec70st;
 		}
-	}
-	else
-	{
-		if($arena_sec70end < $arena_sec70st)
-		{
+	} else {
+		if($arena_sec70end < $arena_sec70st) {
 			set @record_min70,$arena_min70end - $arena_min70st -1;
 			set @record_sec70,60 - $arena_sec70st + $arena_sec70end;
-		}
-		else
-		{
+		} else {
 			set @record_min70,$arena_min70end - $arena_min70st;
 			set @record_sec70,$arena_sec70end - $arena_sec70st;
 		}
@@ -890,7 +805,7 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 	mes "Congratulations!";
 	next;
 	mes "[Staff]";
-	mes "The fastest player among people who cleared lvl 70s arena time force battle is ^3131FF"+$arena_70topn$+"^000000.";
+	mes "The fastest player among people who cleared Lv70 arena time force battle is ^3131FF"+$arena_70topn$+"^000000.";
 	next;
 	mes "[Staff]";
 	mes "^3131FF"+$arena_70topn$+"^000000's running time was ^3131FF"+$top_70min+"^000000minutes ^3131FF"+$top_70sec+"^000000seconds.";
@@ -911,9 +826,7 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			set arena_point, arena_point + 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
@@ -925,15 +838,13 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 			close2;
 		}
 		specialeffect2 EF_EXIT;
- 		donpcevent "cast#70::Onnomal1";
+ 		donpcevent "cast#70::OnNomal1";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_70::Onstop";
-		donpcevent "alloff#70::Onon";
-		donpcevent "lvl 70s Waiting Room::Onstart";
+		donpcevent "#arn_timer_70::OnStop";
+		donpcevent "alloff#70::OnEnable";
+		donpcevent "Lv70 Waiting Room::OnStart";
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
@@ -944,7 +855,7 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 		set $top_70min, @record_min70;
 		set $top_70sec, @record_sec70;
 		set $arena_70topn$,strcharinfo(0);
-		donpcevent "Vendigos::Onlinerec_70";
+		donpcevent "Vendigos::OnLineRec_70";
 		next;
 		if (arena_point > 29970) {
 			mes "[Staff]";
@@ -958,9 +869,7 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			mes "[Staff]";
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
@@ -976,18 +885,17 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 			close2;
 		}
 		specialeffect2 EF_HIT5;
- 		donpcevent "cast#70::Onnomal2";
+ 		donpcevent "cast#70::OnNomal2";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_70::Onstop";
-		donpcevent "alloff#70::Onon";
-		donpcevent "lvl 70s Waiting Room::Onstart";
+		donpcevent "#arn_timer_70::OnStop";
+		donpcevent "alloff#70::OnEnable";
+		donpcevent "Lv70 Waiting Room::OnStart";
 		end;
 	}
 }
 
 -	script	#arn_timer_70	-1,{
-
-Onon:
+OnEnable:
 	initnpctimer;
 	end;
 
@@ -1004,64 +912,61 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
- 	donpcevent "cast#70::Ontimeover2";
-	donpcevent "arn_warp_70::Onout";
-	donpcevent "#arn_timer_70::Onstop";
-	donpcevent "alloff#70::Onon";
-	donpcevent "lvl 70s Waiting Room::Onstart";
+ 	donpcevent "cast#70::OnTimeOver2";
+	donpcevent "arn_warp_70::OnOut";
+	donpcevent "#arn_timer_70::OnStop";
+	donpcevent "alloff#70::OnEnable";
+	donpcevent "Lv70 Waiting Room::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
-
 }
 
 -	script	arn_warp_70	-1,{
-
-Onout:
+OnOut:
 	areawarp "prt_are_in",14,91,29,74,"arena_room",100,75;
 	end;
 }
 
 -	script	cast#70	-1,{
-Ontimeover1:
+OnTimeOver1:
 	mapannounce "force_3-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
-Ontimeover2:
+OnTimeOver2:
 	mapannounce "force_3-1","Arena will be activated due to an error occurred in the waiting room.",0,0xFFCE00;
 	end;
-Onnomal1:
+OnNomal1:
 	mapannounce "force_3-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
-Onnomal2:
+OnNomal2:
 	mapannounce "force_3-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 }
 
 -	script	alloff#70	-1,{
-
-Onon:
+OnEnable:
 	mapwarp "force_3-1","prt_are_in",126,190,0,0;
-	donpcevent "force_01mob#70::Onreset";
-	donpcevent "force_02mob#70::Onreset";
-	donpcevent "force_03mob#70::Onreset";
-	donpcevent "force_04mob#70::Onreset";
-	donpcevent "force_05mob#70::Onreset";
-	donpcevent "force_06mob#70::Onreset";
-	donpcevent "force_07mob#70::Onreset";
-	donpcevent "force_08mob#70::Onreset";
-	donpcevent "force_09mob#70::Onreset";
-	donpcevent "force_01ex#70::Onreset";
-	donpcevent "force_02ex#70::Onreset";
-	donpcevent "force_03ex#70::Onreset";
-	donpcevent "force_04ex#70::Onreset";
-	donpcevent "force_05ex#70::Onreset";
-	donpcevent "force_06ex#70::Onreset";
-	donpcevent "force_07ex#70::Onreset";
-	donpcevent "force_08ex#70::Onreset";
-	donpcevent "force_09ex#70::Onreset";
-	donpcevent "Cadillac#arena::Ontimeroff";
+	donpcevent "force_01mob#70::OnReset";
+	donpcevent "force_02mob#70::OnReset";
+	donpcevent "force_03mob#70::OnReset";
+	donpcevent "force_04mob#70::OnReset";
+	donpcevent "force_05mob#70::OnReset";
+	donpcevent "force_06mob#70::OnReset";
+	donpcevent "force_07mob#70::OnReset";
+	//donpcevent "force_08mob#70::OnReset";
+	donpcevent "force_09mob#70::OnReset";
+	//donpcevent "force_01ex#70::OnReset";
+	donpcevent "force_02ex#70::OnReset";
+	donpcevent "force_03ex#70::OnReset";
+	donpcevent "force_04ex#70::OnReset";
+	donpcevent "force_05ex#70::OnReset";
+	donpcevent "force_06ex#70::OnReset";
+	donpcevent "force_07ex#70::OnReset";
+	//donpcevent "force_08ex#70::OnReset";
+	donpcevent "force_09ex#70::OnReset";
+	donpcevent "Cadillac#arena::OnTimerOff";
 	disablenpc "Cadillac#arena";
 	disablenpc "force_01_02#70";
 	disablenpc "force_02_03#70";
@@ -1073,7 +978,7 @@ Onon:
 	disablenpc "force_08_09#70";
 	disablenpc "force_exit#70";
 	disablenpc "arena#70";
-	donpcevent "#arn_timer_70::Onstop";
+	donpcevent "#arn_timer_70::OnStop";
 	enablenpc "Cadillac#arena";
 	enablenpc "arena#70";
 	end;
@@ -1081,6 +986,4 @@ Onon:
 OnInit:
 	if(!$top_70min && !$top_70sec) set $top_70min,7;
 	end;
-
 }
-
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 729311508..773175a11 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -1,43 +1,41 @@
 //===== Hercules Script ======================================
-//= Izlude Arena lvl 80
+//= Izlude Arena Level 80
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.1
+//= 1.3
 //===== Description: =========================================
 //= Izlude Battle Arena Level 80
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
+//= 1.2 Label standardization. [Euphy]
+//= 1.3 Script updates, and removed a level restriction. [Euphy]
 //============================================================
 
-arena_room,147,42,1	script	lvl 80s Waiting Room	124,{
+arena_room,147,42,1	script	Lv80 Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
-	waitingroom "Individual; Level 80 to 99",50,"lvl 80s Waiting Room::OnStartArena",1,1000,80,99;
+	waitingroom "Individual; Level 80 to "+(checkre(0)?"160":"99"),50,"Lv80 Waiting Room::OnStartArena",1,1000,80;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
 	warpwaitingpc "force_4-1",99,12;
-	donpcevent "arena#80::Onstart";
+	donpcevent "arena#80::OnStart";
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
 
-force_4-1,99,20,4	script	Octus#arena	124,{
+force_4-1,99,20,4	script	Octus#arena	4_F_TELEPORTER,{
 	end;
 
-OnInit:
-	set $@mapcount80, 0;
-	end;
-
-Onstart:
+OnStart:
 	initnpctimer;
 	set $arena_min80st,gettime(2);
 	set $arena_sec80st,gettime(1);
@@ -56,56 +54,50 @@ OnTimer8000:
 	end;
 
 OnTimer60000:
-	set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
-		donpcevent "Octus#arena::Onfailclearstage";
+	if (getmapusers("force_4-1") == 0) {
+		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 7 minutes ",0;
 	end;
 
 OnTimer120000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
-		donpcevent "Octus#arena::Onfailclearstage";
+	if (getmapusers("force_4-1") == 0) {
+		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 6 minutes ",0;
 	end;
 
 OnTimer180000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
-		donpcevent "Octus#arena::Onfailclearstage";
+	if (getmapusers("force_4-1") == 0) {
+		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 5 minutes ",0;
-end;
+	end;
+
 OnTimer240000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
-		donpcevent "Octus#arena::Onfailclearstage";
+	if (getmapusers("force_4-1") == 0) {
+		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 4 minutes ",0;
 	end;
 
 OnTimer300000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
-		donpcevent "Octus#arena::Onfailclearstage";
+	if (getmapusers("force_4-1") == 0) {
+		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 3 minutes ",0;
 	end;
 
 OnTimer360000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
-		donpcevent "Octus#arena::Onfailclearstage";
+	if (getmapusers("force_4-1") == 0) {
+		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 2 minutes ",0;
 	end;
 
 OnTimer420000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
-		donpcevent "Octus#arena::Onfailclearstage";
+	if (getmapusers("force_4-1") == 0) {
+		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 1 minute ",0;
 	end;
@@ -129,146 +121,144 @@ OnTimer494000:
 
 OnTimer495000:
 	mapwarp "force_4-1","prt_are_in",178,190,0,0;
-	donpcevent "Octus#arena::Onfailclearstage";
+	donpcevent "Octus#arena::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
-	donpcevent "cast#80::Ontimeover1";
+OnFailClearStage:
+	donpcevent "cast#80::OnTimeOver1";
 	mapwarp "force_4-1","prt_are_in",178,190,0,0;
-	donpcevent "Octus#arena::Ontimeroff";
-	donpcevent "arena#80::Onreset_all";
-	donpcevent "alloff#80::Onon";
-	donpcevent "lvl 80s Waiting Room::Onstart";
+	donpcevent "Octus#arena::OnTimerOff";
+	donpcevent "arena#80::OnReset_All";
+	donpcevent "alloff#80::OnEnable";
+	donpcevent "Lv80 Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all Nightmares!",0;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_4-1","A door to the north room has opened!",0;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all monsters!",0;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_4-1","A door to the north room has opened!",0;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all Assaulters!",0;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_4-1","Clear! A door to the east room has opened!",0;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all Nine Tails!",0;
 	end;
 
-On04_end:
+On04_End:
 	mapannounce "force_4-1","A door to the east room has opened!",0;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all Walking Petites!",0;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_4-1","Clear! A door to the south room has opened!",0;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_4-1","In order to clear this battle, kill all monsters in this room!",0;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_4-1","A door to the south room has opened!",0;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_4-1","In order to clear this battle, kill all Fur-Seals while dodging Mermen!",0;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_4-1","Clear! A door to the west room has opened!",0;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_4-1","Please escape to the north exit!",0;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_4-1","In order to clear this battle, you must defeat an Ancient Mummy!",0;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_4-1","Boss Clear! - A door at the north has opened. Thank you. ",0;
 	end;
-
 }
 
 -	script	arena#80	-1,{
-
-Onreset_01:
-	donpcevent "force_01ex#80::Onreset";
-	donpcevent "force_02start#80::Onon";
+OnReset_01:
+	donpcevent "force_01ex#80::OnReset";
+	donpcevent "force_02start#80::OnEnable";
 	enablenpc "force_01_02#80";
 	end;
 
-Onreset_02:
-	donpcevent "force_02mob#80::Onreset";
-	donpcevent "force_03start#80::Onon";
+OnReset_02:
+	donpcevent "force_02mob#80::OnReset";
+	donpcevent "force_03start#80::OnEnable";
 	enablenpc "force_02_03#80";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#80";
-	donpcevent "force_04start#80::Onon";
-	donpcevent "force_03ex#80::Onreset";
+	donpcevent "force_04start#80::OnEnable";
+	donpcevent "force_03ex#80::OnReset";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#80";
-	donpcevent "force_05start#80::Onon";
-	donpcevent "force_04ex#80::Onreset";
+	donpcevent "force_05start#80::OnEnable";
+	donpcevent "force_04ex#80::OnReset";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#80";
-	donpcevent "force_06start#80::Onon";
-	donpcevent "force_05ex#80::Onreset";
+	donpcevent "force_06start#80::OnEnable";
+	donpcevent "force_05ex#80::OnReset";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#80";
-	donpcevent "force_07start#80::Onon";
-	donpcevent "force_06ex#80::Onreset";
+	donpcevent "force_07start#80::OnEnable";
+	//donpcevent "force_06ex#80::OnReset";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#80";
-	donpcevent "force_07ex#80::Onreset";
-	donpcevent "force_08start#80::Onon";
+	donpcevent "force_07ex#80::OnReset";
+	donpcevent "force_08start#80::OnEnable";
 	end;
 
-Onreset_08:
-	donpcevent "force_09start#80::Onon";
+OnReset_08:
+	donpcevent "force_09start#80::OnEnable";
 	enablenpc "force_08_09#80";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#80";
 	end;
 
-Onstart:
+OnStart:
 	disablenpc "force_01_02#80";
 	disablenpc "force_02_03#80";
 	disablenpc "force_03_04#80";
@@ -278,532 +268,475 @@ Onstart:
 	disablenpc "force_07_08#80";
 	disablenpc "force_08_09#80";
 	disablenpc "force_exit#80";
-	donpcevent "Octus#arena::Ontimeroff";
-	donpcevent "force_09mob#80::Ontimeroff";
-	donpcevent "force_01mob#80::Onreset";
-	donpcevent "force_02mob#80::Onreset";
-	donpcevent "force_03mob#80::Onreset";
-	donpcevent "force_04mob#80::Onreset";
-	donpcevent "force_05mob#80::Onreset";
-	donpcevent "force_06mob#80::Onreset";
-	donpcevent "force_07mob#80::Onreset";
-	donpcevent "force_08mob#80::Onreset";
-	donpcevent "force_09mob#80::Onreset";
-	donpcevent "force_01ex#80::Onreset";
-	donpcevent "force_03ex#80::Onreset";
-	donpcevent "force_04ex#80::Onreset";
-	donpcevent "force_05ex#80::Onreset";
-	donpcevent "force_07ex#80::Onreset";
-	donpcevent "force_08ex#80::Onreset";
-	donpcevent "force_09ex#80::Onreset";
+	donpcevent "Octus#arena::OnTimerOff";
+	//donpcevent "force_09mob#80::OnTimerOff";
+	donpcevent "force_01mob#80::OnReset";
+	donpcevent "force_02mob#80::OnReset";
+	donpcevent "force_03mob#80::OnReset";
+	donpcevent "force_04mob#80::OnReset";
+	donpcevent "force_05mob#80::OnReset";
+	donpcevent "force_06mob#80::OnReset";
+	donpcevent "force_07mob#80::OnReset";
+	//donpcevent "force_08mob#80::OnReset";
+	donpcevent "force_09mob#80::OnReset";
+	donpcevent "force_01ex#80::OnReset";
+	donpcevent "force_03ex#80::OnReset";
+	donpcevent "force_04ex#80::OnReset";
+	donpcevent "force_05ex#80::OnReset";
+	donpcevent "force_07ex#80::OnReset";
+	//donpcevent "force_08ex#80::OnReset";
+	donpcevent "force_09ex#80::OnReset";
 	enablenpc "force_08_01#80";
-	donpcevent "force_01start#80::Onon";
-	donpcevent "Octus#arena::Onstart";
-	end;
-
-Onreset_all:
-	donpcevent "force_01mob#80::Onreset";
-	donpcevent "force_02mob#80::Onreset";
-	donpcevent "force_03mob#80::Onreset";
-	donpcevent "force_04mob#80::Onreset";
-	donpcevent "force_05mob#80::Onreset";
-	donpcevent "force_06mob#80::Onreset";
-	donpcevent "force_07mob#80::Onreset";
-	donpcevent "force_09mob#80::Onreset";
-	donpcevent "force_01ex#80::Onreset";
-	donpcevent "force_03ex#80::Onreset";
-	donpcevent "force_04ex#80::Onreset";
-	donpcevent "force_05ex#80::Onreset";
-	donpcevent "force_07ex#80::Onreset";
-	donpcevent "force_08ex#80::Onreset";
-	donpcevent "force_09ex#80::Onreset";
-	end;
-
-}
-
-force_4-1,62,26,1	script	force_08_01#80	45,1,1,{
-
+	donpcevent "force_01start#80::OnEnable";
+	donpcevent "Octus#arena::OnStart";
+	end;
+
+OnReset_All:
+	donpcevent "force_01mob#80::OnReset";
+	donpcevent "force_02mob#80::OnReset";
+	donpcevent "force_03mob#80::OnReset";
+	donpcevent "force_04mob#80::OnReset";
+	donpcevent "force_05mob#80::OnReset";
+	donpcevent "force_06mob#80::OnReset";
+	donpcevent "force_07mob#80::OnReset";
+	donpcevent "force_09mob#80::OnReset";
+	donpcevent "force_01ex#80::OnReset";
+	donpcevent "force_03ex#80::OnReset";
+	donpcevent "force_04ex#80::OnReset";
+	donpcevent "force_05ex#80::OnReset";
+	donpcevent "force_07ex#80::OnReset";
+	//donpcevent "force_08ex#80::OnReset";
+	donpcevent "force_09ex#80::OnReset";
+	end;
+}
+
+force_4-1,62,26,1	script	force_08_01#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::On01_start";
+	donpcevent "Octus#arena::On01_Start";
 	warp "force_4-1",40,26;
 	end;
-
 }
 
-force_4-1,25,44,1	script	force_01_02#80	45,1,1,{
-
+force_4-1,25,44,1	script	force_01_02#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::On02_start";
+	donpcevent "Octus#arena::On02_Start";
 	warp "force_4-1",25,69;
 	end;
-
 }
 
-force_4-1,25,134,1	script	force_02_03#80	45,1,1,{
-
+force_4-1,25,134,1	script	force_02_03#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::On03_start";
+	donpcevent "Octus#arena::On03_Start";
 	warp "force_4-1",25,159;
 	end;
-
 }
 
-force_4-1,44,174,1	script	force_03_04#80	45,1,1,{
-
+force_4-1,44,174,1	script	force_03_04#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::On04_start";
+	donpcevent "Octus#arena::On04_Start";
 	warp "force_4-1",69,174;
 	end;
 
 }
 
-force_4-1,134,174,1	script	force_04_05#80	45,1,1,{
-
+force_4-1,134,174,1	script	force_04_05#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::On05_start";
+	donpcevent "Octus#arena::On05_Start";
 	warp "force_4-1",159,174;
 	end;
-
 }
 
-force_4-1,174,155,1	script	force_05_06#80	45,1,1,{
-
+force_4-1,174,155,1	script	force_05_06#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::On06_start";
+	donpcevent "Octus#arena::On06_Start";
 	warp "force_4-1",174,130;
 	end;
-
 }
 
-force_4-1,174,65,1	script	force_06_07#80	45,1,1,{
-
+force_4-1,174,65,1	script	force_06_07#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::On07_start";
+	donpcevent "Octus#arena::On07_Start";
 	warp "force_4-1",174,40;
 	end;
-
 }
 
-force_4-1,155,26,1	script	force_07_08#80	45,1,1,{
-
+force_4-1,155,26,1	script	force_07_08#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::On08_start";
+	donpcevent "Octus#arena::On08_Start";
 	warp "force_4-1",132,26;
 	enablenpc "force_08_09#80";
 	end;
-
 }
 
-force_4-1,99,54,1	script	force_08_09#80	45,1,1,{
-
+force_4-1,99,54,1	script	force_08_09#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::On09_start";
+	donpcevent "Octus#arena::On09_Start";
 	warp "force_4-1",99,82;
 	end;
-
 }
 
-force_4-1,99,124,1	script	force_exit#80	45,1,1,{
-
+force_4-1,99,124,1	script	force_exit#80	WARPNPC,1,1,{
 OnTouch:
-	donpcevent "Octus#arena::Ontimeroff";
-	donpcevent "#arn_timer_80::Onon";
+	donpcevent "Octus#arena::OnTimerOff";
+	donpcevent "#arn_timer_80::OnEnable";
 	mapwarp "force_4-1","prt_are_in",73,192,0,0;
 	end;
-
 }
 
 -	script	force_01start#80	-1,{
-Onon:
-	donpcevent "force_01mob#80::Onon";
-end;
-
+OnEnable:
+	donpcevent "force_01mob#80::OnEnable";
+	end;
 }
 
 -	script	force_01ex#80	-1,{
-
-Onreset:
-	killmonster "force_4-1","force_01ex#80::OnMobEx";
+OnReset:
+	killmonster "force_4-1","force_01ex#80::OnMyMobDead";
 	end;
 
-Onsummonmob1:
-	monster "force_4-1",11,25,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
-	monster "force_4-1",22,22,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
-	monster "force_4-1",25,25,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
-	monster "force_4-1",35,13,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
-	monster "force_4-1",18,33,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
+OnSummonMob1:
+	monster "force_4-1",11,25,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
+	monster "force_4-1",22,22,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
+	monster "force_4-1",25,25,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
+	monster "force_4-1",35,13,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
+	monster "force_4-1",18,33,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
-
 }
 
 -	script	force_01mob#80	-1,{
-
-Onon:
-	monster "force_4-1",35,13,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	monster "force_4-1",25,36,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	monster "force_4-1",22,23,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	monster "force_4-1",25,17,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	monster "force_4-1",25,15,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	set $force_01_80,5;
-	donpcevent "force_01ex#80::Onsummonmob1";
+OnEnable:
+	monster "force_4-1",35,13,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
+	monster "force_4-1",25,36,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
+	monster "force_4-1",22,23,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
+	monster "force_4-1",25,17,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
+	monster "force_4-1",25,15,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
+	donpcevent "force_01ex#80::OnSummonMob1";
 	end;
 
-Onreset:
-	killmonster "force_4-1","force_01mob#80::OnMobDeath";
+OnReset:
+	killmonster "force_4-1","force_01mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_01_80,$force_01_80 -1;
-	if ($force_01_80 < 1) {
-		donpcevent "Octus#arena::On01_end";
-		donpcevent "arena#80::Onreset_01";
+OnMyMobDead:
+	if (mobcount("force_4-1","force_01mob#80::OnMyMobDead") < 1) {
+		donpcevent "Octus#arena::On01_End";
+		donpcevent "arena#80::OnReset_01";
 	}
 	end;
 }
 
 -	script	force_02start#80	-1,{
-
-Onon:
-	donpcevent "force_02mob#80::Onon";
+OnEnable:
+	donpcevent "force_02mob#80::OnEnable";
 	end;
 }
 
 -	script	force_02mob#80	-1,{
-
-Onreset:
-	killmonster "force_4-1","force_02mob#80::OnMobDeath";
-	end;
-
-Onon:
-	monster "force_4-1",24,80,"Marionette",1459,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",23,110,"Marionette",1459,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",26,90,"Marionette",1459,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,75,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",24,90,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,85,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",24,82,"Deviruchi",1433,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,86,"Skel Prisoner",1479,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",27,73,"Skel Prisoner",1479,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",26,118,"Skel Prisoner",1479,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",25,127,"Skel Prisoner",1479,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,128,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",27,100,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",29,90,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,128,"Raydric Archer",1453,1,"force_02mob#80::OnMobDeath";
-	set $force_02_80,15;
-	end;
-
-OnMobDeath:
-	set $force_02_80,$force_02_80 -1;
-	if ($force_02_80 < 1) {
-		donpcevent "Octus#arena::On02_end";
-		donpcevent "arena#80::Onreset_02";
+OnReset:
+	killmonster "force_4-1","force_02mob#80::OnMyMobDead";
+	end;
+
+OnEnable:
+	monster "force_4-1",24,80,"Marionette",1459,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",23,110,"Marionette",1459,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",26,90,"Marionette",1459,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,75,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",24,90,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,85,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",24,82,"Deviruchi",1433,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,86,"Skel Prisoner",1479,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",27,73,"Skel Prisoner",1479,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",26,118,"Skel Prisoner",1479,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",25,127,"Skel Prisoner",1479,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,128,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",27,100,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",29,90,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,128,"Raydric Archer",1453,1,"force_02mob#80::OnMyMobDead";
+	end;
+
+OnMyMobDead:
+	if (mobcount("force_4-1","force_02mob#80::OnMyMobDead") < 1) {
+		donpcevent "Octus#arena::On02_End";
+		donpcevent "arena#80::OnReset_02";
 	}
 	end;
 }
 
 -	script	force_03start#80	-1,{
-
-Onon:
-	donpcevent "force_03mob#80::Onon";
+OnEnable:
+	donpcevent "force_03mob#80::OnEnable";
 	end;
 }
 
 -	script	force_03ex#80	-1,{
-
-Onreset:
-	killmonster "force_4-1","force_03ex#80::OnMobEx";
+OnReset:
+	killmonster "force_4-1","force_03ex#80::OnMyMobDead";
 	end;
 
-Onsummonmob_03:
-	monster "force_4-1",26,173,"Clock Tower Keeper",1527,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",21,173,"Marionette",1459,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",31,173,"Clock Tower Keeper",1527,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",26,178,"Marionette",1459,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",21,178,"Marionette",1459,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",31,178,"Marionette",1459,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",26,186,"Sidewinder",1424,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",26,161,"Sidewinder",1424,1,"force_03ex#80::OnMobEx";
+OnSummonMob_03:
+	monster "force_4-1",26,173,"Clock Tower Keeper",1527,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",21,173,"Marionette",1459,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",31,173,"Clock Tower Keeper",1527,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",26,178,"Marionette",1459,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",21,178,"Marionette",1459,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",31,178,"Marionette",1459,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",26,186,"Sidewinder",1424,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",26,161,"Sidewinder",1424,1,"force_03ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03mob#80	-1,{
-
-Onon:
-	donpcevent "force_03ex#80::Onsummonmob_03";
-	monster "force_4-1",23,174,"Assaulter",1364,1,"force_03mob#80::OnMobDeath";
-	monster "force_4-1",18,173,"Assaulter",1364,1,"force_03mob#80::OnMobDeath";
-	set $force_03_80,2;
+OnEnable:
+	donpcevent "force_03ex#80::OnSummonMob_03";
+	monster "force_4-1",23,174,"Assaulter",1364,1,"force_03mob#80::OnMyMobDead";
+	monster "force_4-1",18,173,"Assaulter",1364,1,"force_03mob#80::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_4-1","force_03mob#80::OnMobDeath";
+OnReset:
+	killmonster "force_4-1","force_03mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_80,$force_03_80 -1;
-	donpcevent "force_03ex#80::Onsummonmob_03";
-	if ($force_03_80 < 1) {
-		donpcevent "Octus#arena::On03_end";
-		donpcevent "arena#80::Onreset_03";
+OnMyMobDead:
+	donpcevent "force_03ex#80::OnSummonMob_03";
+	if (mobcount("force_4-1","force_03mob#80::OnMyMobDead") < 1) {
+		donpcevent "Octus#arena::On03_End";
+		donpcevent "arena#80::OnReset_03";
 	}
 	end;
 }
 
 -	script	force_04start#80	-1,{
-
-Onon:
-	donpcevent "force_04mob#80::Onon";
-end;
-
+OnEnable:
+	donpcevent "force_04mob#80::OnEnable";
+	end;
 }
 
 -	script	force_04ex#80	-1,{
-
-Onreset:
-	killmonster "force_4-1","force_04ex#80::OnMobEx";
+OnReset:
+	killmonster "force_4-1","force_04ex#80::OnMyMobDead";
 	end;
 
-Onsummonmob_04:
-	monster "force_4-1",99,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",101,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",103,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",105,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",107,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",109,177,"Pasana",1464,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",99,170,"Minorous",1461,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",111,170,"Minorous",1461,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",110,170,"Lava Golem",1549,1,"force_04ex#80::OnMobEx";
+OnSummonMob_04:
+	monster "force_4-1",99,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",101,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",103,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",105,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",107,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",109,177,"Pasana",1464,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",99,170,"Minorous",1461,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",111,170,"Minorous",1461,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",110,170,"Lava Golem",1549,1,"force_04ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 
 }
 
 -	script	force_04mob#80	-1,{
-
-Onon:
-	donpcevent "force_04ex#80::Onsummonmob_04";
-	monster "force_4-1",80,172,"Nine Tails",1471,1,"force_04mob#80::OnMobDeath";
-	monster "force_4-1",105,172,"Nine Tails",1471,1,"force_04mob#80::OnMobDeath";
-	monster "force_4-1",90,172,"Nine Tails",1471,1,"force_04mob#80::OnMobDeath";
-	monster "force_4-1",117,172,"Nine Tails",1471,1,"force_04mob#80::OnMobDeath";
-	set $force_04_80,4;
+OnEnable:
+	donpcevent "force_04ex#80::OnSummonMob_04";
+	monster "force_4-1",80,172,"Nine Tails",1471,1,"force_04mob#80::OnMyMobDead";
+	monster "force_4-1",105,172,"Nine Tails",1471,1,"force_04mob#80::OnMyMobDead";
+	monster "force_4-1",90,172,"Nine Tails",1471,1,"force_04mob#80::OnMyMobDead";
+	monster "force_4-1",117,172,"Nine Tails",1471,1,"force_04mob#80::OnMyMobDead";
 	end;
-Onreset:
-	killmonster "force_4-1","force_04mob#80::OnMobDeath";
+OnReset:
+	killmonster "force_4-1","force_04mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_04_80,$force_04_80 -1;
-	if ($force_04_80 < 1) {
-		donpcevent "Octus#arena::On04_end";
-		donpcevent "arena#80::Onreset_04";
+OnMyMobDead:
+	if (mobcount("force_4-1","force_04mob#80::OnMyMobDead") < 1) {
+		donpcevent "Octus#arena::On04_End";
+		donpcevent "arena#80::OnReset_04";
 	}
 	end;
 }
 
 -	script	force_05start#80	-1,{
-
-Onon:
-	donpcevent "force_05mob#80::Onon";
+OnEnable:
+	donpcevent "force_05mob#80::OnEnable";
 	end;
 }
 
 -	script	force_05ex#80	-1,{
-
-Onreset:
-	killmonster "force_4-1","force_05ex#80::OnMobEx";
+OnReset:
+	killmonster "force_4-1","force_05ex#80::OnMyMobDead";
 	end;
 
-Onsummonmob_05:
-	monster "force_4-1",168,190,"Petite",1466,1,"force_05ex#80::OnMobEx";
-	monster "force_4-1",173,166,"Petite",1466,1,"force_05ex#80::OnMobEx";
-	monster "force_4-1",171,176,"Petite",1466,1,"force_05ex#80::OnMobEx";
-	monster "force_4-1",188,167,"Petite",1466,1,"force_05ex#80::OnMobEx";
+OnSummonMob_05:
+	monster "force_4-1",168,190,"Petite",1466,1,"force_05ex#80::OnMyMobDead";
+	monster "force_4-1",173,166,"Petite",1466,1,"force_05ex#80::OnMyMobDead";
+	monster "force_4-1",171,176,"Petite",1466,1,"force_05ex#80::OnMyMobDead";
+	monster "force_4-1",188,167,"Petite",1466,1,"force_05ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_05mob#80	-1,{
-
-Onon:
-	monster "force_4-1",164,174,"Petite",1465,1,"force_05mob#80::OnMobDeath";
-	monster "force_4-1",169,159,"Petite",1465,1,"force_05mob#80::OnMobDeath";
-	monster "force_4-1",174,183,"Petite",1465,1,"force_05mob#80::OnMobDeath";
-	monster "force_4-1",177,170,"Petite",1465,1,"force_05mob#80::OnMobDeath";
-	set $force_05_80,4;
+OnEnable:
+	monster "force_4-1",164,174,"Petite",1465,1,"force_05mob#80::OnMyMobDead";
+	monster "force_4-1",169,159,"Petite",1465,1,"force_05mob#80::OnMyMobDead";
+	monster "force_4-1",174,183,"Petite",1465,1,"force_05mob#80::OnMyMobDead";
+	monster "force_4-1",177,170,"Petite",1465,1,"force_05mob#80::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_4-1","force_05mob#80::OnMobDeath";
+OnReset:
+	killmonster "force_4-1","force_05mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_05_80,$force_05_80 -1;
-	if ($force_05_80 < 1) {
-		donpcevent "Octus#arena::On05_end";
-		donpcevent "arena#80::Onreset_05";
+OnMyMobDead:
+	if (mobcount("force_4-1","force_05mob#80::OnMyMobDead") < 1) {
+		donpcevent "Octus#arena::On05_End";
+		donpcevent "arena#80::OnReset_05";
 	}
-	else donpcevent "force_05ex#80::Onsummonmob_05";
+	else donpcevent "force_05ex#80::OnSummonMob_05";
 	end;
 
 }
 
 -	script	force_06start#80	-1,{
+OnEnable:
+	donpcevent "force_06mob#80::OnEnable";
+	end;
+}
 
-Onon:
-	donpcevent "force_06mob#80::Onon";
+-	script	force_06ex#80	-1,{
+OnEnable:
+	donpcevent "Octus#arena::On06_start";
 	end;
 }
 
 -	script	force_06mob#80	-1,{
-
-Onon:
-	monster "force_4-1",173,118,"Baphomet Jr.",1431,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",173,90,"Baphomet Jr.",1431,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",177,72,"Baphomet Jr.",1431,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",171,108,"Deviruchi",1433,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",171,85,"Deviruchi",1433,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",171,79,"Alice",1521,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",175,118,"Alice",1521,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",175,99,"Alice",1521,1,"force_06mob#80::OnMobDeath";
-	set $force_06_80,8;
+OnEnable:
+	monster "force_4-1",173,118,"Baphomet Jr.",1431,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",173,90,"Baphomet Jr.",1431,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",177,72,"Baphomet Jr.",1431,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",171,108,"Deviruchi",1433,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",171,85,"Deviruchi",1433,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",171,79,"Alice",1521,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",175,118,"Alice",1521,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",175,99,"Alice",1521,1,"force_06mob#80::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_4-1","force_06mob#80::OnMobDeath";
+OnReset:
+	killmonster "force_4-1","force_06mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_06_80,$force_06_80 -1;
-	if ($force_06_80 < 1) {
-		donpcevent "Octus#arena::On06_end";
-		donpcevent "arena#80::Onreset_06";
+OnMyMobDead:
+	if (mobcount("force_4-1","force_06mob#80::OnMyMobDead") < 1) {
+		donpcevent "Octus#arena::On06_End";
+		donpcevent "arena#80::OnReset_06";
 	}
 	end;
 }
 
 -	script	force_07start#80	-1,{
-
-Onon:
-	donpcevent "force_07mob#80::Onon";
+OnEnable:
+	donpcevent "force_07mob#80::OnEnable";
 	end;
 }
 
 -	script	force_07ex#80	-1,{
-
-Onreset:
-	killmonster "force_4-1","force_07ex#80::OnMobEx";
+OnReset:
+	killmonster "force_4-1","force_07ex#80::OnMyMobDead";
 	end;
 
-Onsummonmob_07:
-	monster "force_4-1",160,34,"Merman",1451,1,"force_07ex#80::OnMobEx";
-	monster "force_4-1",163,27,"Merman",1451,1,"force_07ex#80::OnMobEx";
-	monster "force_4-1",163,23,"Merman",1451,1,"force_07ex#80::OnMobEx";
+OnSummonMob_07:
+	monster "force_4-1",160,34,"Merman",1451,1,"force_07ex#80::OnMyMobDead";
+	monster "force_4-1",163,27,"Merman",1451,1,"force_07ex#80::OnMyMobDead";
+	monster "force_4-1",163,23,"Merman",1451,1,"force_07ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_07mob#80	-1,{
-
-Onon:
-	donpcevent "force_07ex#80::Onsummonmob_07";
-	monster "force_4-1",165,27,"Fur-Seal",1533,1,"force_07mob#80::OnMobDeath";
-	monster "force_4-1",184,23,"Fur-Seal",1533,1,"force_07mob#80::OnMobDeath";
-	monster "force_4-1",174,19,"Fur-Seal",1533,1,"force_07mob#80::OnMobDeath";
-	set $force_07_80,3;
+OnEnable:
+	donpcevent "force_07ex#80::OnSummonMob_07";
+	monster "force_4-1",165,27,"Fur-Seal",1533,1,"force_07mob#80::OnMyMobDead";
+	monster "force_4-1",184,23,"Fur-Seal",1533,1,"force_07mob#80::OnMyMobDead";
+	monster "force_4-1",174,19,"Fur-Seal",1533,1,"force_07mob#80::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_4-1","force_07mob#80::OnMobDeath";
+OnReset:
+	killmonster "force_4-1","force_07mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_07_80,$force_07_80 -1;
-	if ($force_07_80 < 1) {
-		donpcevent "Octus#arena::On07_end";
-		donpcevent "arena#80::Onreset_07";
+OnMyMobDead:
+	if (mobcount("force_4-1","force_07mob#80::OnMyMobDead") < 1) {
+		donpcevent "Octus#arena::On07_End";
+		donpcevent "arena#80::OnReset_07";
 	}
 	end;
 }
 
 -	script	force_08start#80	-1,{
-
-Onon:
-	donpcevent "force_08ex#80::Onon";
+OnEnable:
+	donpcevent "force_08ex#80::OnEnable";
 	end;
 }
 
 -	script	force_08ex#80	-1,{
-
-Onon:
-	donpcevent "arena#80::Onreset_08";
+OnEnable:
+	donpcevent "arena#80::OnReset_08";
 	end;
 }
 
 -	script	force_09start#80	-1,{
-
-Onon:
-	donpcevent "force_09mob#80::Onon";
+OnEnable:
+	donpcevent "force_09mob#80::OnEnable";
 	end;
 }
 
 -	script	force_09ex#80	-1,{
-
-Onreset:
-	killmonster "force_4-1","force_09ex#80::OnMobEx";
+OnReset:
+	killmonster "force_4-1","force_09ex#80::OnMyMobDead";
 	end;
 
-Onsummonmob_09:
-	monster "force_4-1",91,99,"Argos",1430,1,"force_09ex#80::OnMobEx";
-	monster "force_4-1",95,105,"Argos",1430,1,"force_09ex#80::OnMobEx";
-	monster "force_4-1",122,99,"Argos",1430,1,"force_09ex#80::OnMobEx";
-	monster "force_4-1",88,107,"Argos",1430,1,"force_09ex#80::OnMobEx";
-	monster "force_4-1",85,104,"Argos",1430,1,"force_09ex#80::OnMobEx";
+OnSummonMob_09:
+	monster "force_4-1",91,99,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
+	monster "force_4-1",95,105,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
+	monster "force_4-1",122,99,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
+	monster "force_4-1",88,107,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
+	monster "force_4-1",85,104,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_09mob#80	-1,{
-
-Onon:
-	monster "force_4-1",99,99,"Ancient Mummy",1522,1,"force_09mob#80::OnMobDeath";
-	donpcevent "force_09ex#80::Onsummonmob_09";
-	set $force_09_80,1;
+OnEnable:
+	monster "force_4-1",99,99,"Ancient Mummy",1522,1,"force_09mob#80::OnMyMobDead";
+	donpcevent "force_09ex#80::OnSummonMob_09";
 	end;
 
-Onreset:
-	killmonster "force_4-1","force_09mob#80::OnMobDeath";
+OnReset:
+	killmonster "force_4-1","force_09mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_80,$force_09_80 -1;
-	if ($force_09_80 < 1) {
-		donpcevent "Octus#arena::On09_end";
-		donpcevent "arena#80::Onreset_09";
-		donpcevent "arena#80::Onreset_all";
+OnMyMobDead:
+	if (mobcount("force_4-1","force_09mob#80::OnMyMobDead") < 1) {
+		donpcevent "Octus#arena::On09_End";
+		donpcevent "arena#80::OnReset_09";
+		donpcevent "arena#80::OnReset_All";
 		set $arena_min80end,gettime(2);
 		set $arena_sec80end,gettime(1);
 	}
 	end;
 }
 
-prt_are_in,181,188,3	script	Staff#80-1	67,{
-
+prt_are_in,181,188,3	script	Staff#80-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -824,30 +757,20 @@ prt_are_in,181,188,3	script	Staff#80-1	67,{
 	end;
 }
 
-prt_are_in,77,187,3	script	Staff#80-2	67,{
-
-	if($arena_min80end < $arena_min80st)
-	{
-		if($arena_sec80end < $arena_sec80st)
-		{
+prt_are_in,77,187,3	script	Staff#80-2	1_F_02,{
+	if($arena_min80end < $arena_min80st) {
+		if($arena_sec80end < $arena_sec80st) {
 			set @record_min80,60 - $arena_min80st + $arena_min80end -1;
 			set @record_sec80,60 - $arena_sec80st + $arena_sec80end;
-		}
-		else
-		{
+		} else {
 			set @record_min80,60 - $arena_min80st + $arena_min80end;
 			set @record_sec80,$arena_sec80end - $arena_sec80st;
 		}
-	}
-	else
-	{
-		if($arena_sec80end < $arena_sec80st)
-		{
+	} else {
+		if($arena_sec80end < $arena_sec80st) {
 			set @record_min80,$arena_min80end - $arena_min80st -1;
 			set @record_sec80,60 - $arena_sec80st + $arena_sec80end;
-		}
-		else
-		{
+		} else {
 			set @record_min80,$arena_min80end - $arena_min80st;
 			set @record_sec80,$arena_sec80end - $arena_sec80st;
 		}
@@ -863,7 +786,7 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 	mes "Congratulations!";
 	next;
 	mes "[Staff]";
-	mes "The fastest player among people who cleared lvl 80s arena time force battle is ^3131FF"+$arena_80topn$+"^000000.";
+	mes "The fastest player among people who cleared Lv80 arena time force battle is ^3131FF"+$arena_80topn$+"^000000.";
 	next;
 	mes "[Staff]";
 	mes "^3131FF"+$arena_80topn$+"^000000's running time was ^3131FF"+$top_80min+"^000000minutes ^3131FF"+$top_80sec+"^000000seconds.";
@@ -884,9 +807,7 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			set arena_point, arena_point + 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
@@ -898,15 +819,13 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 			close2;
 		}
 		specialeffect2 EF_EXIT;
- 		donpcevent "cast#80::Onnomal1";
+ 		donpcevent "cast#80::OnNomal1";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_80::Onstop";
-		donpcevent "alloff#80::Onon";
-		donpcevent "lvl 80s Waiting Room::Onstart";
+		donpcevent "#arn_timer_80::OnStop";
+		donpcevent "alloff#80::OnEnable";
+		donpcevent "Lv80 Waiting Room::OnStart";
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
@@ -917,7 +836,7 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 		set $top_80min, @record_min80;
 		set $top_80sec, @record_sec80;
 		set $arena_80topn$,strcharinfo(0);
-		donpcevent "Vendigos::Onlinerec_80";
+		donpcevent "Vendigos::OnLineRec_80";
 		next;
 		if (arena_point > 29980) {
 			mes "[Staff]";
@@ -931,9 +850,7 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			mes "[Staff]";
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
@@ -949,18 +866,17 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 			close2;
 		}
 		specialeffect2 EF_HIT5;
- 		donpcevent "cast#80::Onnomal2";
+ 		donpcevent "cast#80::OnNomal2";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_80::Onstop";
-		donpcevent "alloff#80::Onon";
-		donpcevent "lvl 80s Waiting Room::Onstart";
+		donpcevent "#arn_timer_80::OnStop";
+		donpcevent "alloff#80::OnEnable";
+		donpcevent "Lv80 Waiting Room::OnStart";
 		end;
 	}
 }
 
 -	script	#arn_timer_80	-1,{
-
-Onon:
+OnEnable:
 	initnpctimer;
 	end;
 
@@ -977,62 +893,59 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
- 	donpcevent "cast#80::Ontimeover2";
-	donpcevent "arn_warp_80::Onout";
-	donpcevent "#arn_timer_80::Onstop";
-	donpcevent "alloff#80::Onon";
-	donpcevent "lvl 80s Waiting Room::Onstart";
+ 	donpcevent "cast#80::OnTimeOver2";
+	donpcevent "arn_warp_80::OnOut";
+	donpcevent "#arn_timer_80::OnStop";
+	donpcevent "alloff#80::OnEnable";
+	donpcevent "Lv80 Waiting Room::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
-
 }
 
 -	script	arn_warp_80	-1,{
-
-Onout:
+OnOut:
 	areawarp "prt_are_in",66,195,81,178,"arena_room",100,75;
 	end;
 }
 
 -	script	cast#80	-1,{
-Ontimeover1:
+OnTimeOver1:
 	mapannounce "force_4-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
-Ontimeover2:
+OnTimeOver2:
 	mapannounce "force_4-1","Arena will be activated due to an error occurred in the waiting room.",0,0xFFCE00;
 	end;
-Onnomal1:
+OnNomal1:
 	mapannounce "force_4-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
-Onnomal2:
+OnNomal2:
 	mapannounce "force_4-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 }
 
 -	script	alloff#80	-1,{
-
-Onon:
+OnEnable:
 	mapwarp "force_4-1","prt_are_in",126,190,0,0;
-	donpcevent "force_01mob#80::Onreset";
-	donpcevent "force_02mob#80::Onreset";
-	donpcevent "force_03mob#80::Onreset";
-	donpcevent "force_04mob#80::Onreset";
-	donpcevent "force_05mob#80::Onreset";
-	donpcevent "force_06mob#80::Onreset";
-	donpcevent "force_07mob#80::Onreset";
-	donpcevent "force_08mob#80::Onreset";
-	donpcevent "force_09mob#80::Onreset";
-	donpcevent "force_01ex#80::Onreset";
-	donpcevent "force_03ex#80::Onreset";
-	donpcevent "force_04ex#80::Onreset";
-	donpcevent "force_05ex#80::Onreset";
-	donpcevent "force_07ex#80::Onreset";
-	donpcevent "force_08ex#80::Onreset";
-	donpcevent "force_09ex#80::Onreset";
-	donpcevent "Octus#arena::Ontimeroff";
+	donpcevent "force_01mob#80::OnReset";
+	donpcevent "force_02mob#80::OnReset";
+	donpcevent "force_03mob#80::OnReset";
+	donpcevent "force_04mob#80::OnReset";
+	donpcevent "force_05mob#80::OnReset";
+	donpcevent "force_06mob#80::OnReset";
+	donpcevent "force_07mob#80::OnReset";
+	//donpcevent "force_08mob#80::OnReset";
+	donpcevent "force_09mob#80::OnReset";
+	donpcevent "force_01ex#80::OnReset";
+	donpcevent "force_03ex#80::OnReset";
+	donpcevent "force_04ex#80::OnReset";
+	donpcevent "force_05ex#80::OnReset";
+	donpcevent "force_07ex#80::OnReset";
+	//donpcevent "force_08ex#80::OnReset";
+	donpcevent "force_09ex#80::OnReset";
+	donpcevent "Octus#arena::OnTimerOff";
 	disablenpc "Octus#arena";
 	disablenpc "force_01_02#80";
 	disablenpc "force_02_03#80";
@@ -1044,7 +957,7 @@ Onon:
 	disablenpc "force_08_09#80";
 	disablenpc "force_exit#80";
 	disablenpc "arena#80";
-	donpcevent "#arn_timer_80::Onstop";
+	donpcevent "#arn_timer_80::OnStop";
 	enablenpc "Octus#arena";
 	enablenpc "arena#80";
 	end;
@@ -1052,6 +965,4 @@ Onon:
 OnInit:
 	if(!$top_80min && !$top_80sec) set $top_80min,8;
 	end;
-
 }
-
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index 837c3eab1..218a6de90 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -1,24 +1,26 @@
 //===== Hercules Script ======================================
-//= Izlude Party Arena 
+//= Izlude Party Arena
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.3
+//= 1.5
 //===== Description: =========================================
 //= Izlude Party Battle Arena
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.0a Fixed a typo.
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
-//= 1.2 Fixed "OnMobDeath" doesn't work sometime. [Inkfish]
+//= 1.2 Fixed "OnMyMobDead" doesn't work sometime. [Inkfish]
 //= 1.3 Corrected donpcevent typo. (bugreport:4374) [L0ne_w0lf]
+//= 1.4 Label standardization and bug fixes. [Euphy]
+//= 1.5 Script updates, and removed a level restriction. [Euphy]
 //============================================================
 
-arena_room,162,88,3	script	Ponox	124,{
+arena_room,162,88,3	script	Ponox	4_F_TELEPORTER,{
 	end;
 
 OnInit:
-	waitingroom "Party Mode - 5 Member Parties",11,"Ponox::OnStartArena",5,0,10,99;
+	waitingroom "Party Mode - 5 Member Parties",11,"Ponox::OnStartArena",5,0,10;
 	enablewaitingroomevent;
 	end;
 
@@ -31,15 +33,13 @@ OnStartArena:
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
 
 prt_are_in,76,87,3	script	Helper#party	 67,4,4,{
-
-	if($arn_partywait == 0)
-	{
+	if($arn_partywait == 0) {
 		set $arn_partywait,1;
 		emotion e_gasp,0;
 		mes "[Helper Iriff]";
@@ -50,28 +50,26 @@ prt_are_in,76,87,3	script	Helper#party	 67,4,4,{
 		mes "Only one person at a time is allowed to stay in this waiting room.";
 		mes "Would you like to start a battle now?";
 		next;
-		switch( select( "No","Yes" ) )
-		{
-			case 1:
-				set $arn_partywait,0;
-				mes "[Helper Iriff]";
-				mes "I see.";
-				mes "However, please remember you have only a limited amount of time.";
-				close;
-
-			case 2:
-				mes "[Helper Iriff]";
-				mes "Thank you, let me start a battle.";
-				mes "A warp portal leading to the arena room will be open.";
-				mes "I hope you will survive until the end of the battle and engrave your name on the list of honor...";
-				close2;
-				donpcevent "toarena#party::OnEnter";
-				donpcevent "Helper#party::OnStop";
-				donpcevent "arena_p::OnStart";
-				end;
+		switch( select( "No","Yes" ) ) {
+		case 1:
+			set $arn_partywait,0;
+			mes "[Helper Iriff]";
+			mes "I see.";
+			mes "However, please remember you have only a limited amount of time.";
+			close;
+		case 2:
+			mes "[Helper Iriff]";
+			mes "Thank you, let me start a battle.";
+			mes "A warp portal leading to the arena room will be open.";
+			mes "I hope you will survive until the end of the battle and engrave your name on the list of honor...";
+			close2;
+			donpcevent "toarena#party::OnEnter";
+			donpcevent "Helper#party::OnStop";
+			donpcevent "arena_p::OnStart";
+			end;
 		}
 	}
-	else end;
+	end;
 
 OnEnter:
 	enablenpc "Helper#party";
@@ -87,16 +85,15 @@ OnInit:
 }
 
 prt_are_in,73,78,0	script	toarena#party	-1,20,20,{
-
 OnInit:
 	disablenpc "toarena#party";
 	end;
 
 OnTouch:
-	if(Zeny < 1000) warp "arena_room",100,75;
-	else
-	{
-		set Zeny,Zeny -1000;
+	if(Zeny < 1000)
+		warp "arena_room",100,75;
+	else {
+		Zeny -= 1000;
 		set $arn_partywait,0;
 		donpcevent "toout#party::OnStop";
 		warp "force_1-2",99,26;
@@ -108,7 +105,6 @@ OnEnter:
 }
 
 prt_are_in,73,79,0	script	toout#party	-1,20,20,{
-
 OnInit:
 	disablenpc "toout#party";
 	end;
@@ -124,7 +120,7 @@ OnTimer60000:
 
 OnTimer70000:
 	donpcevent "toout#party::OnStop";
-	donpcevent "Ponox::Onstart";
+	donpcevent "Ponox::OnStart";
 	disablenpc "toout#party";
 
 OnTouch:
@@ -142,19 +138,13 @@ OnStop:
 }
 
 prt_are_in,73,74,0	script	arena_out	-1,1,1,{
-
 OnTouch:
 	set $arn_partywait,0;
 	warp "arena_room",100,75;
 	end;
 }
 
-force_1-2,99,31,4	script	Slipslowrun#party	124,{
-
-OnInit:
-	set $@mapcountpt,0;
-	end;
-
+force_1-2,99,31,4	script	Slipslowrun#party	4_F_TELEPORTER,{
 OnStart:
 	initnpctimer;
 	set $arena_minptst,gettime(2);
@@ -163,7 +153,8 @@ OnStart:
 
 OnTimer2000:
 	mapannounce "force_1-2","Good day, my name is Slipslowrun! I am here to assist you in the party arena battles!",bc_all;
-	donpcevent "arena_compass::OnStart";
+	//Official "arena_compass" script is extremely buggy, so we aren't using it.
+	//donpcevent "arena_compass::OnStart";
 	end;
 
 OnTimer3000:
@@ -179,47 +170,56 @@ OnTimer5000:
 	end;
 
 OnTimer60000:
-	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
+	if (getmapusers("force_1-2") == 0)
+		donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 9 minutes ",bc_all;
 	end;
 
 OnTimer120000:
-	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
+	if (getmapusers("force_1-2") == 0)
+		donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 8 minutes ",bc_all;
 	end;
 
 OnTimer180000:
-	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
+	if (getmapusers("force_1-2") == 0)
+		donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 7 minutes ",bc_all;
 	end;
 
 OnTimer240000:
-	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
+	if (getmapusers("force_1-2") == 0)
+		donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 6 minutes ",bc_all;
 	end;
 
 OnTimer300000:
-	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
+	if (getmapusers("force_1-2") == 0)
+		donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 5 minutes ",bc_all;
 	end;
 
 OnTimer360000:
-	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
+	if (getmapusers("force_1-2") == 0)
+		donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 4 minutes ",bc_all;
 	end;
 
 OnTimer420000:
-	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
+	if (getmapusers("force_1-2") == 0)
+		donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 3 minutes ",bc_all;
 	end;
 
 OnTimer480000:
-	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
+	if (getmapusers("force_1-2") == 0)
+		donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 2 minutes ",bc_all;
 	end;
 
 OnTimer540000:
-	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
+	if (getmapusers("force_1-2") == 0)
+		donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 1 minute ",bc_all;
 	end;
 
@@ -249,72 +249,71 @@ OnTimer614000:
 	end;
 
 OnFail:
-	donpcevent "Slipslowrun#party::OnTimeoff";
+	donpcevent "Slipslowrun#party::OnTimerOff";
 	mapwarp "force_1-2","prt_are_in",177,138;
 	donpcevent "arena_p::OnReset";
 	donpcevent "alloff#party::OnInit";
-	donpcevent "Ponox::Onstart";
+	donpcevent "Ponox::OnStart";
 	end;
 
-OnTimeoff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_1-2","A door to the east room has opened!",bc_all;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_1-2","A door to the west room has opened!",bc_all;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_1-2","A door to the south room has opened!",bc_all;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_1-2","A door to the 4th room at the east has opened!",bc_all;
 	end;
 
-On04_end1:
+On04_End1:
 	mapannounce "force_1-2","A warp portal at the west has opened! Please clear the 5th room at the end of the west hall! ",bc_all;
 	end;
 
-On04_end2:
+On04_End2:
 	mapannounce "force_1-2","A warp portal at the west north room has opened! ",bc_all;
 	end;
 
-On05_end1:
+On05_End1:
 	mapannounce "force_1-2","A door to the east room has opened~",bc_all;
 	end;
 
-On05_end2:
+On05_End2:
 	mapannounce "force_1-2","A door to the north room has opened~",bc_all;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_1-2","A door to the east room has opened~",bc_all;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_1-2","A door at the north has opened~",bc_all;
 	end;
 
-On08_end:
+On08_End:
 	mapannounce "force_1-2","A door to the west hall has opened~",bc_all;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_1-2","A west exit has opened!",bc_all;
 	end;
 
-On10_end:
+On10_End:
 	mapannounce "force_1-2","Boss stage cleared! An exit at the east has opened! Thank you.",bc_all;
 	end;
 }
 
 -	script	arena_p	-1,{
-
 OnStart:
 	mapwarp "force_1-2","prt_are_in",177,138;
 	disablenpc "force_01_00";
@@ -359,37 +358,37 @@ OnStart:
 	set $arn_partywait,0;
 	end;
 
-On04_start:
+On04_Start:
 	enablenpc "force_03_04";
 	enablenpc "force_04start#party";
 	end;
 
-On06_start:
+On06_Start:
 	enablenpc "force_05_06";
 	enablenpc "force_06start#party";
 	end;
 
-On07_start:
+On07_Start:
 	enablenpc "force_06_07";
 	enablenpc "force_07start#party";
 	end;
 
-On08_start:
+On08_Start:
 	enablenpc "force_07_08";
 	enablenpc "force_08start#party";
 	end;
 
-On09_start:
+On09_Start:
 	enablenpc "force_08_09";
 	enablenpc "force_09start#party";
 	end;
 
-On10_start:
+On10_Start:
 	enablenpc "force_09_10";
 	enablenpc "force_10start#party";
 	end;
 
-Onexit:
+OnExit:
 	enablenpc "force_10_09";
 	enablenpc "force_09_exit";
 	enablenpc "force_exit#party";
@@ -411,183 +410,65 @@ OnReset:
 	end;
 }
 
-force_1-2,85,26,1	script	force_00_01	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",37,26;
-	end;
-}
-
-force_1-2,114,26,1	script	force_00_02	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",162,26;
-	end;
-}
-
-force_1-2,99,40,1	script	force_00_03	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",99,66;
-	end;
-}
-
-force_1-2,41,26,1	script	force_01_00	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",89,26;
-	end;
-}
-
-force_1-2,158,26,1	script	force_02_00	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",110,26;
-	end;
-}
-
-force_1-2,99,63,1	script	force_03_00	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",99,36;
-	end;
-}
-
-force_1-2,84,78,1	script	force_03_05	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",37,78;
-	end;
-}
-
-force_1-2,115,78,1	script	force_03_04	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",162,78;
-	end;
-}
-force_1-2,158,77,1	script	force_04_03	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",110,78;
-	end;
-}
-
-force_1-2,41,77,1	script	force_05_03	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",37,78;
-	end;
-}
-
-force_1-2,25,93,1	script	force_05_06	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",26,118;
-	end;
-}
-
-force_1-2,49,130,1	script	force_06_07	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",91,125;
-	end;
-}
-
-force_1-2,107,145,1	script	force_07_08	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",173,118;
-	end;
-}
-
-force_1-2,158,178,1	script	force_08_09	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",133,178;
-	end;
-}
-
-force_1-2,55,178,1	script	force_09_10	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",29,178;
-	end;
-}
-
-force_1-2,33,178,1	script	force_10_09	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",59,178;
-	end;
-}
-
-force_1-2,95,187,1	script	force_09_exit	45,1,1,{
-
+force_1-2,95,187,0	script	force_09_exit	WARPNPC,1,1,{
 OnTouch:
 	set $arena_minptend,gettime(2);
 	set $arena_secptend,gettime(1);
 	warp "prt_are_in",73,139;
 	donpcevent "#arn_timer_pt::OnEnter";
 	donpcevent "arena_p::OnReset";
-	donpcevent "Slipslowrun#party::OnTimeoff";
+	donpcevent "Slipslowrun#party::OnTimerOff";
 	end;
 }
 
 force_1-2,36,26,0	script	force_01start#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_01mob#party::Onon";
+	donpcevent "force_01mob#party::OnEnable";
 	disablenpc "force_01start#party";
 	end;
 }
 
 -	script	force_01mob#party	-1,{
-
-Onon:
-	monster "force_1-2",15,35,"Penomena",1441,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",35,35,"Penomena",1441,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",15,15,"Penomena",1441,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",35,15,"Penomena",1441,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",15,25,"Clock",1528,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",17,25,"Clock",1528,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",19,25,"Clock",1528,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",21,25,"Clock",1528,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",15,25,"Clock",1528,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",17,25,"Clock",1528,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",19,25,"Clock",1528,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",21,25,"Clock",1528,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",15,30,"Alarm",1476,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",17,22,"Alarm",1476,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",19,32,"Alarm",1476,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",21,22,"Alarm",1476,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",26,33,"Clock Tower Keeper",1527,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",26,33,"Clock Tower Keeper",1527,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",26,14,"Ancient Worm",1567,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",30,27,"Ancient Worm",1567,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",29,25,"Ancient Worm",1567,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",26,14,"Ancient Worm",1567,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",33,26,"Incubus",1580,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",29,28,"Incubus",1580,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",33,20,"Incubus",1580,1,"force_01mob#party::OnMobDeath";
-	monster "force_1-2",33,30,"Incubus",1580,1,"force_01mob#party::OnMobDeath";
-	set $force_01_pt,26;
+OnEnable:
+	monster "force_1-2",15,35,"Penomena",1441,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",35,35,"Penomena",1441,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",15,15,"Penomena",1441,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",35,15,"Penomena",1441,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",15,25,"Clock",1528,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",17,25,"Clock",1528,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",19,25,"Clock",1528,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",21,25,"Clock",1528,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",15,25,"Clock",1528,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",17,25,"Clock",1528,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",19,25,"Clock",1528,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",21,25,"Clock",1528,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",15,30,"Alarm",1476,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",17,22,"Alarm",1476,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",19,32,"Alarm",1476,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",21,22,"Alarm",1476,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",26,33,"Clock Tower Keeper",1527,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",26,33,"Clock Tower Keeper",1527,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",26,14,"Ancient Worm",1567,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",30,27,"Ancient Worm",1567,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",29,25,"Ancient Worm",1567,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",26,14,"Ancient Worm",1567,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",33,26,"Incubus",1580,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",29,28,"Incubus",1580,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",33,20,"Incubus",1580,1,"force_01mob#party::OnMyMobDead";
+	monster "force_1-2",33,30,"Incubus",1580,1,"force_01mob#party::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_01mob#party::OnMobDeath";
+	killmonster "force_1-2","force_01mob#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_01_pt,$force_01_pt -1;
-	if($force_01_pt < 1)
-	{
+OnMyMobDead:
+	if (mobcount("force_1-2","force_01mob#party::OnMyMobDead") < 1) {
 		enablenpc "force_01_00";
-		donpcevent "Slipslowrun#party::On01_end";
+		donpcevent "Slipslowrun#party::On01_End";
 		set $arn_partyc,$arn_partyc +1;
-		if($arn_partyc == 3)
-		{
-			donpcevent "Slipslowrun#party::On04_start";
+		if($arn_partyc == 3) {
+			donpcevent "Slipslowrun#party::On04_Start";
 			enablenpc "force_03_04";
 			enablenpc "force_04start#party";
 		}
@@ -596,63 +477,57 @@ OnMobDeath:
 }
 
 force_1-2,162,26,0	script	force_02start#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_02mob#party::Onon";
+	donpcevent "force_02mob#party::OnEnable";
 	disablenpc "force_02start#party";
 	end;
 }
 
 -	script	force_02mob#party	-1,{
-
-Onon:
-	monster "force_1-2",163,36,"Penomena",1441,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",184,36,"Penomena",1441,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",184,16,"Penomena",1441,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",163,16,"Penomena",1441,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",171,37,"Joker",1437,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",177,37,"Joker",1437,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",184,29,"Joker",1437,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",184,22,"Joker",1437,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",177,16,"Joker",1437,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",170,16,"Joker",1437,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",169,28,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",171,28,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",173,28,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",175,28,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",177,28,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",177,23,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",175,23,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",173,23,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",171,23,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",169,23,"Bathory",1525,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",187,30,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",187,30,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",187,30,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",187,22,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",187,22,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",187,22,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",173,40,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",173,40,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",181,25,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	monster "force_1-2",181,25,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
-	set $force_02_pt,30;
+OnEnable:
+	monster "force_1-2",163,36,"Penomena",1441,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",184,36,"Penomena",1441,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",184,16,"Penomena",1441,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",163,16,"Penomena",1441,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",171,37,"Joker",1437,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",177,37,"Joker",1437,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",184,29,"Joker",1437,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",184,22,"Joker",1437,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",177,16,"Joker",1437,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",170,16,"Joker",1437,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",169,28,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",171,28,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",173,28,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",175,28,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",177,28,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",177,23,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",175,23,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",173,23,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",171,23,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",169,23,"Bathory",1525,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",187,30,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",187,30,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",187,30,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",187,22,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",187,22,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",187,22,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",173,40,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",173,40,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",181,25,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
+	monster "force_1-2",181,25,"Arclouse",1477,1,"force_02mob#party::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_02mob#party::OnMobDeath";
+	killmonster "force_1-2","force_02mob#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_02_pt,$force_02_pt -1;
-	if($force_02_pt < 1)
-	{
+OnMyMobDead:
+	if (mobcount("force_1-2","force_02mob#party::OnMyMobDead") < 1) {
 		enablenpc "force_02_00";
-		donpcevent "Slipslowrun#party::On02_end";
+		donpcevent "Slipslowrun#party::On02_End";
 		set $arn_partyc,$arn_partyc +1;
-		if($arn_partyc == 3)
-		{
-			donpcevent "Slipslowrun#party::On04_start";
+		if($arn_partyc == 3) {
+			donpcevent "Slipslowrun#party::On04_Start";
 			enablenpc "force_03_04";
 			enablenpc "force_04start#party";
 		}
@@ -661,59 +536,53 @@ OnMobDeath:
 }
 
 force_1-2,99,66,0	script	force_03start#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_03mob#party::Onon";
+	donpcevent "force_03mob#party::OnEnable";
 	disablenpc "force_03start#party";
 	end;
 }
 
 -	script	force_03mob#party	-1,{
-
-Onon:
-	monster "force_1-2",89,81,"Merman",1451,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",90,81,"Merman",1451,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",91,81,"Merman",1451,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",92,81,"Merman",1451,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",93,81,"Merman",1451,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",96,85,"Wind Ghost",1450,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",98,85,"Wind Ghost",1450,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",100,85,"Wind Ghost",1450,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",102,85,"Wind Ghost",1450,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",104,85,"Wind Ghost",1450,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",88,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",90,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",92,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",94,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",96,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",98,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",100,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",102,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",104,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",106,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",108,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",110,79,"Deviruchi",1433,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",91,86,"Wanderer",1490,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",108,86,"Wanderer",1490,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",91,69,"Wanderer",1490,1,"force_03mob#party::OnMobDeath";
-	monster "force_1-2",108,69,"Wanderer",1490,1,"force_03mob#party::OnMobDeath";
-	set $force_03_pt,26;
+OnEnable:
+	monster "force_1-2",89,81,"Merman",1451,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",90,81,"Merman",1451,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",91,81,"Merman",1451,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",92,81,"Merman",1451,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",93,81,"Merman",1451,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",96,85,"Wind Ghost",1450,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",98,85,"Wind Ghost",1450,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",100,85,"Wind Ghost",1450,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",102,85,"Wind Ghost",1450,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",104,85,"Wind Ghost",1450,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",88,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",90,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",92,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",94,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",96,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",98,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",100,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",102,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",104,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",106,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",108,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",110,79,"Deviruchi",1433,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",91,86,"Wanderer",1490,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",108,86,"Wanderer",1490,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",91,69,"Wanderer",1490,1,"force_03mob#party::OnMyMobDead";
+	monster "force_1-2",108,69,"Wanderer",1490,1,"force_03mob#party::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_03mob#party::OnMobDeath";
+	killmonster "force_1-2","force_03mob#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_pt,$force_03_pt -1;
-	if($force_03_pt < 1)
-	{
+OnMyMobDead:
+	if (mobcount("force_1-2","force_03mob#party::OnMyMobDead") < 1) {
 		enablenpc "force_03_00";
-		donpcevent "Slipslowrun#party::On03_end";
+		donpcevent "Slipslowrun#party::On03_End";
 		set $arn_partyc,$arn_partyc +1;
-		if($arn_partyc == 3)
-		{
-			donpcevent "Slipslowrun#party::On04_start";
+		if($arn_partyc == 3) {
+			donpcevent "Slipslowrun#party::On04_Start";
 			enablenpc "force_03_04";
 			enablenpc "force_04start#party";
 		}
@@ -722,418 +591,365 @@ OnMobDeath:
 }
 
 force_1-2,162,78,0	script	force_04start#party	-1,3,3,{
-
 OnTouch:
-	donpcevent "force_04mob#party::Onon";
+	donpcevent "force_04mob#party::OnEnable";
 	disablenpc "force_04start#party";
 	end;
 }
 
 -	script	force_04mob#party	-1,{
-
-Onon:
-	monster "force_1-2",174,78,"Penomena",1441,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",184,78,"Penomena",1441,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",184,68,"Penomena",1441,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",174,68,"Penomena",1441,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",169,87,"Ride Word",1478,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",170,87,"Ride Word",1478,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",171,87,"Ride Word",1478,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",172,87,"Ride Word",1478,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",169,77,"Ride Word",1478,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",170,77,"Ride Word",1478,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",171,77,"Ride Word",1478,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",172,77,"Ride Word",1478,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",183,83,"Wraith Dead",1566,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",183,80,"Wraith Dead",1566,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",183,73,"Wraith Dead",1566,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",183,70,"Wraith Dead",1566,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",179,77,"Wraith Dead",1566,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",169,72,"Assaulter",1364,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",171,72,"Assaulter",1364,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",173,72,"Assaulter",1364,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",175,72,"Assaulter",1364,1,"force_04mob#party::OnMobDeath";
-	monster "force_1-2",177,72,"Assaulter",1364,1,"force_04mob#party::OnMobDeath";
-	set $force_04_pt,22;
+OnEnable:
+	monster "force_1-2",174,78,"Penomena",1441,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",184,78,"Penomena",1441,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",184,68,"Penomena",1441,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",174,68,"Penomena",1441,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",169,87,"Ride Word",1478,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",170,87,"Ride Word",1478,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",171,87,"Ride Word",1478,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",172,87,"Ride Word",1478,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",169,77,"Ride Word",1478,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",170,77,"Ride Word",1478,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",171,77,"Ride Word",1478,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",172,77,"Ride Word",1478,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",183,83,"Wraith Dead",1566,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",183,80,"Wraith Dead",1566,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",183,73,"Wraith Dead",1566,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",183,70,"Wraith Dead",1566,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",179,77,"Wraith Dead",1566,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",169,72,"Assaulter",1364,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",171,72,"Assaulter",1364,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",173,72,"Assaulter",1364,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",175,72,"Assaulter",1364,1,"force_04mob#party::OnMyMobDead";
+	monster "force_1-2",177,72,"Assaulter",1364,1,"force_04mob#party::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_04mob#party::OnMobDeath";
+	killmonster "force_1-2","force_04mob#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_04_pt,$force_04_pt -1;
-	if($force_04_pt < 1)
-	{
+OnMyMobDead:
+	if (mobcount("force_1-2","force_04mob#party::OnMyMobDead") < 1) {
 		enablenpc "force_04_03";
 		enablenpc "force_03_05";
 		enablenpc "force_05start#party";
-		donpcevent "Slipslowrun#party::On04_end1";
+		donpcevent "Slipslowrun#party::On04_End1";
 	}
 	end;
 }
 
 force_1-2,36,77,0	script	force_05start#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_05mob#party::Onon";
+	donpcevent "force_05mob#party::OnEnable";
 	disablenpc "force_05start#party";
 	end;
 }
 
 -	script	force_05mob#party	-1,{
-
-Onon:
-	monster "force_1-2",25,68,"Penomena",1441,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",36,68,"Penomena",1441,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",16,88,"Penomena",1441,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",15,78,"Penomena",1441,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",33,88,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",29,87,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",25,81,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",25,78,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",25,72,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",29,70,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",21,70,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",19,76,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",19,83,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",23,89,"Sting",1489,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",22,85,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",23,85,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",24,85,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",23,86,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",22,86,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",22,71,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",22,72,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",23,71,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",23,72,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	monster "force_1-2",24,71,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
-	set $force_05_pt,24;
+OnEnable:
+	monster "force_1-2",25,68,"Penomena",1441,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",36,68,"Penomena",1441,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",16,88,"Penomena",1441,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",15,78,"Penomena",1441,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",33,88,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",29,87,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",25,81,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",25,78,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",25,72,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",29,70,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",21,70,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",19,76,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",19,83,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",23,89,"Sting",1489,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",22,85,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",23,85,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",24,85,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",23,86,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",22,86,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",22,71,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",22,72,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",23,71,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",23,72,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
+	monster "force_1-2",24,71,"Cramp",1570,1,"force_05mob#party::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_05mob#party::OnMobDeath";
+	killmonster "force_1-2","force_05mob#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_05_pt,$force_05_pt -1;
-	if($force_05_pt < 1)
-	{
-		donpcevent "arena_p::On06_start";
-		donpcevent "Slipslowrun#party::On05_end2";
+OnMyMobDead:
+	if (mobcount("force_1-2","force_05mob#party::OnMyMobDead") < 1) {
+		donpcevent "arena_p::On06_Start";
+		donpcevent "Slipslowrun#party::On05_End2";
 	}
 	end;
 }
 
 force_1-2,26,118,0	script	force_06start#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_06mob#party::Onon";
+	donpcevent "force_06mob#party::OnEnable";
 	disablenpc "force_06start#party";
 	end;
 }
 
 -	script	force_06mob#party	-1,{
-
-Onon:
-	monster "force_1-2",19,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",24,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",28,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",32,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",24,127,"Shinobi",1560,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",27,127,"Shinobi",1560,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",24,128,"Shinobi",1560,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",27,128,"Shinobi",1560,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",24,129,"Shinobi",1560,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",27,129,"Shinobi",1560,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,140,"Tengu",1563,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,136,"Tengu",1563,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,132,"Tengu",1563,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,128,"Tengu",1563,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,124,"Tengu",1563,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,120,"Tengu",1563,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,140,"Wicked Nymph",1564,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,136,"Wicked Nymph",1564,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,132,"Wicked Nymph",1564,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,128,"Wicked Nymph",1564,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,124,"Wicked Nymph",1564,1,"force_06mob#party::OnMobDeath";
-	monster "force_1-2",16,120,"Wicked Nymph",1564,1,"force_06mob#party::OnMobDeath";
-	set $force_06_pt,22;
+OnEnable:
+	monster "force_1-2",19,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",24,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",28,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",32,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",24,127,"Shinobi",1560,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",27,127,"Shinobi",1560,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",24,128,"Shinobi",1560,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",27,128,"Shinobi",1560,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",24,129,"Shinobi",1560,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",27,129,"Shinobi",1560,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,140,"Tengu",1563,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,136,"Tengu",1563,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,132,"Tengu",1563,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,128,"Tengu",1563,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,124,"Tengu",1563,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,120,"Tengu",1563,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,140,"Wicked Nymph",1564,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,136,"Wicked Nymph",1564,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,132,"Wicked Nymph",1564,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,128,"Wicked Nymph",1564,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,124,"Wicked Nymph",1564,1,"force_06mob#party::OnMyMobDead";
+	monster "force_1-2",16,120,"Wicked Nymph",1564,1,"force_06mob#party::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_06mob#party::OnMobDeath";
+	killmonster "force_1-2","force_06mob#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_06_pt,$force_06_pt -1;
-	if($force_06_pt < 1)
-	{
-		donpcevent "arena_p::On07_start";
-		donpcevent "Slipslowrun#party::On06_end";
+OnMyMobDead:
+	if (mobcount("force_1-2","force_06mob#party::OnMyMobDead") < 1) {
+		donpcevent "arena_p::On07_Start";
+		donpcevent "Slipslowrun#party::On06_End";
 		set $arn_partyc,$arn_partyc +1;
 	}
 	end;
 }
 
 force_1-2,92,124,0	script	force_07start#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_07mob#party::Onon";
+	donpcevent "force_07mob#party::OnEnable";
 	disablenpc "force_07start#party";
 	end;
 }
 
 -	script	force_07mob#party	-1,{
-
-Onon:
-	monster "force_1-2",104,134,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",104,136,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",104,137,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",104,139,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",111,134,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",111,136,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",111,137,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",111,139,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",98,122,"Khalitzburg",1438,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",90,119,"Khalitzburg",1438,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",98,122,"Executioner",1487,1,"force_07mob#party::OnMobDeath";
-	monster "force_1-2",108,140,"Chimera",1456,1,"force_07mob#party::OnMobDeath";
-	set $force_07_pt,12;
+OnEnable:
+	monster "force_1-2",104,134,"Greatest General",1541,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",104,136,"Greatest General",1541,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",104,137,"Greatest General",1541,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",104,139,"Greatest General",1541,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",111,134,"Greatest General",1541,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",111,136,"Greatest General",1541,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",111,137,"Greatest General",1541,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",111,139,"Greatest General",1541,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",98,122,"Khalitzburg",1438,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",90,119,"Khalitzburg",1438,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",98,122,"Executioner",1487,1,"force_07mob#party::OnMyMobDead";
+	monster "force_1-2",108,140,"Chimera",1456,1,"force_07mob#party::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_07mob#party::OnMobDeath";
+	killmonster "force_1-2","force_07mob#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_07_pt,$force_07_pt -1;
-	if($force_07_pt < 1)
-	{
-		donpcevent "arena_p::On08_start";
-		donpcevent "Slipslowrun#party::On07_end";
+OnMyMobDead:
+	if (mobcount("force_1-2","force_07mob#party::OnMyMobDead") < 1) {
+		donpcevent "arena_p::On08_Start";
+		donpcevent "Slipslowrun#party::On07_End";
 		set $arn_partyc,$arn_partyc +1;
 	}
 	end;
 }
 
 force_1-2,173,118,0	script	force_08start#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_08mob#party::Onon";
+	donpcevent "force_08mob#party::OnEnable";
 	disablenpc "force_08start#party";
 	end;
 }
 
 -	script	force_08mob#party	-1,{
-
-Onon:
-	monster "force_1-2",172,154,"Khalitzburg",1438,1,"force_08mob#party::OnMobDeath";
-	monster "force_1-2",174,145,"Ghostring",1576,1,"force_08mob#party::OnMobDeath";
-	monster "force_1-2",174,145,"Chimera",1456,1,"force_08mob#party::OnMobDeath";
-	set $force_08_pt,4;
-	if(.arn_injustice != 5)
-	{
-		monster "force_1-2",rand(162,184),rand(122,185),"Injustice",1446,1,"force_08mob#party::OnMobDeath";
-		set .arn_injustice,.arn_injustice +1;
-		set $force_08_pt,$force_08_pt +1;
+OnEnable:
+	monster "force_1-2",172,154,"Khalitzburg",1438,1,"force_08mob#party::OnMyMobDead";
+	monster "force_1-2",174,145,"Ghostring",1576,1,"force_08mob#party::OnMyMobDead";
+	monster "force_1-2",174,145,"Chimera",1456,1,"force_08mob#party::OnMyMobDead";
+	for(set .@i,0; .@i<5; set .@i,.@i+1) {
+		monster "force_1-2",rand(162,184),rand(122,185),"Injustice",1446,1,"force_08mob#party::OnMyMobDead";
 	}
-	monster "force_1-2",rand(162,184),rand(122,185),"Raydric Archer",1453,1,"force_08mob#party::OnMobDeath";
-	if(.arn_terror != 5)
-	{
-		monster "force_1-2",rand(162,184),rand(122,185),"Nightmare Terror",1554,1,"force_08mob#party::OnMobDeath";
-		set .arn_terror,.arn_terror +1;
-		set $force_08_pt,$force_08_pt +1;
+	monster "force_1-2",rand(162,184),rand(122,185),"Raydric Archer",1453,1,"force_08mob#party::OnMyMobDead";
+	for(set .@i,0; .@i<5; set .@i,.@i+1) {
+		monster "force_1-2",rand(162,184),rand(122,185),"Nightmare Terror",1554,1,"force_08mob#party::OnMyMobDead";
 	}
-	if(.arn_mummy != 6)
-	{
-		monster "force_1-2",rand(162,184),rand(122,185),"Ancient Mummy",1522,1,"force_08mob#party::OnMobDeath";
-		set .arn_mummy,.arn_mummy +1;
-		set $force_08_pt,$force_08_pt +1;
+	for(set .@i,0; .@i<6; set .@i,.@i+1) {
+		monster "force_1-2",rand(162,184),rand(122,185),"Ancient Mummy",1522,1,"force_08mob#party::OnMyMobDead";
 	}
-	if(.arn_skel != 10)
-	{
-		monster "force_1-2",rand(162,184),rand(122,185),"Skel Prisoner",1479,1,"force_08mob#party::OnMobDeath";
-		set .arn_skel,.arn_skel +1;
-		set $force_08_pt,$force_08_pt +1;
+	for(set .@i,0; .@i<10; set .@i,.@i+1) {
+		monster "force_1-2",rand(162,184),rand(122,185),"Skel Prisoner",1479,1,"force_08mob#party::OnMyMobDead";
 	}
-	if(.arn_hunt != 5)
-	{
-		monster "force_1-2",rand(162,184),rand(122,185),"Hunter Fly",1422,1,"force_08mob#party::OnMobDeath";
-		set .arn_hunt,.arn_hunt +1;
-		set $force_08_pt,$force_08_pt +1;
+	for(set .@i,0; .@i<5; set .@i,.@i+1) {
+		monster "force_1-2",rand(162,184),rand(122,185),"Hunter Fly",1422,1,"force_08mob#party::OnMyMobDead";
 	}
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_08mob#party::OnMobDeath";
+	killmonster "force_1-2","force_08mob#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_08_pt,$force_08_pt -1;
-	if($force_08_pt < 1)
-	{
-		donpcevent "arena_p::On09_start";
-		donpcevent "Slipslowrun#party::On08_end";
+OnMyMobDead:
+	if (mobcount("force_1-2","force_08mob#party::OnMyMobDead") < 1) {
+		donpcevent "arena_p::On09_Start";
+		donpcevent "Slipslowrun#party::On08_End";
 		set $arn_partyc,$arn_partyc +1;
 	}
 	end;
 }
 
 force_1-2,133,178,0	script	force_09start#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_09mob#party::Onon";
+	donpcevent "force_09mob#party::OnEnable";
 	disablenpc "force_09start#party";
 	end;
 }
 
 -	script	force_09mob#party	-1,{
-
-Onon:
-	monster "force_1-2",86,180,"Elder",1573,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",86,176,"Elder",1573,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",95,183,"Elder",1573,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",94,175,"Elder",1573,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",76,178,"Elder",1573,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",84,179,"Explosion",1532,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",74,181,"Explosion",1532,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",73,176,"Explosion",1532,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",62,178,"Explosion",1532,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",68,177,"Explosion",1532,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",122,177,"Lava Golem",1549,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",112,179,"Lava Golem",1549,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",122,178,"Anolian",1488,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",121,177,"Anolian",1488,1,"force_09mob#party::OnMobDeath";
-	monster "force_1-2",122,177,"Anolian",1488,1,"force_09mob#party::OnMobDeath";
+OnEnable:
+	monster "force_1-2",86,180,"Elder",1573,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",86,176,"Elder",1573,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",95,183,"Elder",1573,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",94,175,"Elder",1573,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",76,178,"Elder",1573,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",84,179,"Explosion",1532,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",74,181,"Explosion",1532,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",73,176,"Explosion",1532,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",62,178,"Explosion",1532,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",68,177,"Explosion",1532,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",122,177,"Lava Golem",1549,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",112,179,"Lava Golem",1549,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",122,178,"Anolian",1488,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",121,177,"Anolian",1488,1,"force_09mob#party::OnMyMobDead";
+	monster "force_1-2",122,177,"Anolian",1488,1,"force_09mob#party::OnMyMobDead";
 	set $force_09_pt,15;
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_09mob#party::OnMobDeath";
+	killmonster "force_1-2","force_09mob#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_pt,$force_09_pt -1;
-	if($force_09_pt < 1)
-	{
-		donpcevent "arena_p::On10_start";
-		donpcevent "Slipslowrun#party::On09_end";
+OnMyMobDead:
+	if (mobcount("force_1-2","force_09mob#party::OnMyMobDead") < 1) {
+		donpcevent "arena_p::On10_Start";
+		donpcevent "Slipslowrun#party::On09_End";
 		set $arn_partyc,$arn_partyc +1;
 	}
 	end;
 }
 
 force_1-2,29,178,0	script	force_10start#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_10mob-1#party::Onon1";
+	donpcevent "force_10mob-1#party::OnEnable";
 	disablenpc "force_10start#party";
 	end;
 }
 
 -	script	force_10mob-1#party	-1,{
-
-Onon1:
-	switch(rand(1,2))
-	{
-		case 1:
-			monster "force_1-2",16,179,"Evil Snake Lord",1529,1,"force_10mob-1#party::OnMobDeath";
-			break;
-
-		case 2:
-			monster "force_1-2",24,179,"Dracula",1530,1,"force_10mob-1#party::OnMobDeath";
-			break;
+OnEnable:
+	switch(rand(1,2)) {
+	case 1:
+		monster "force_1-2",16,179,"Evil Snake Lord",1529,1,"force_10mob-1#party::OnMyMobDead";
+		break;
+	case 2:
+		monster "force_1-2",24,179,"Dracula",1530,1,"force_10mob-1#party::OnMyMobDead";
+		break;
 	}
-	set $force_10_1_pt,1;
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_10mob-1#party::OnMobDeath";
+	killmonster "force_1-2","force_10mob-1#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_10_1_pt,$force_10_1_pt -1;
-	if($force_10_1_pt < 1) donpcevent "force_10mob-2#party::Onon2";
+OnMyMobDead:
+	if (mobcount("force_1-2","force_10mob-1#party::OnMyMobDead") < 1)
+		donpcevent "force_10mob-2#party::OnEnable";
 	end;
 }
 
 -	script	force_10mob-2#party	-1,{
-
-Onon2:
-	monster "force_1-2",16,179,"Samurai Spector",1542,1,"force_10mob-2#party::OnMobDeath";
-	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMobDeath";
-	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMobDeath";
-	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMobDeath";
-	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMobDeath";
-	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMobDeath";
-	set $force_10_2_pt,6;
+OnEnable:
+	monster "force_1-2",16,179,"Samurai Spector",1542,1,"force_10mob-2#party::OnMyMobDead";
+	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMyMobDead";
+	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMyMobDead";
+	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMyMobDead";
+	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMyMobDead";
+	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_10mob-2#party::OnMobDeath";
+	killmonster "force_1-2","force_10mob-2#party::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_10_2_pt,$force_10_2_pt -1;
-	if($force_10_2_pt < 1)
-	{
-		donpcevent "arena_p::Onexit";
-		donpcevent "Slipslowrun#party::On10_end";
+OnMyMobDead:
+	if (mobcount("force_1-2","force_10mob-2#party::OnMyMobDead") < 1) {
+		donpcevent "arena_p::OnExit";
+		donpcevent "Slipslowrun#party::On10_End";
 		set $arn_partyc,0;
 	}
 	end;
 }
 
 force_1-2,59,178,0	script	force_exit#party	-1,1,1,{
-
 OnTouch:
-	donpcevent "force_exitmob#party::Onon-1";
+	donpcevent "force_exitmob#party::OnEnable";
 	disablenpc "force_exit#party";
 	end;
 }
 
 -	script	force_exitmob#party	-1,{
-
-Onon:
-	monster "force_1-2",95,177,"Farewell",1393,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"I hate you",1543,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"I like chocolate",1472,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"You like it, huh?",1472,1,"force_exitmob-#party::OnMobDeath";
-	monster "force_1-2",95,177,"Sorry",1420,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Tristram II",1562,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"I am hungry",1468,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Bye",1419,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Take care",1394,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Sexy Body",1578,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Pressure",1471,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Take it easy",1491,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Are you gonna hurt me?",1555,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Merchant",1428,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Ms. Kim",1472,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Martial Art",1472,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Part-timer",1420,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Boss",1562,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Old Yellow Box",1474,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Bat",1419,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Extra",1394,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Milk Merchant",1578,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Darling",1471,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Oh noes!",1491,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"I am not a Wraith",1566,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Mom Wraith",1566,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Dad Wraith",1566,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Book[3]",1478,1,"force_exitmob#party::OnMobDeath";
-	monster "force_1-2",95,177,"Exchange Diary",1478,1,"force_exitmob#party::OnMobDeath";
+OnEnable:
+	monster "force_1-2",95,177,"Farewell",1393,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"I hate you",1543,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"I like chocolate",1472,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"You like it, huh?",1472,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Sorry",1420,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Tristram II",1562,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"I am hungry",1468,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Bye",1419,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Take care",1394,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Sexy Body",1578,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Pressure",1471,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Take it easy",1491,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Are you gonna hurt me?",1555,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Merchant",1428,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Ms. Kim",1472,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Martial Art",1472,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Part-timer",1420,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Boss",1562,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Old Yellow Box",1474,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Bat",1419,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Extra",1394,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Milk Merchant",1578,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Darling",1471,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Oh noes!",1491,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"I am not a Wraith",1566,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Mom Wraith",1566,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Dad Wraith",1566,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Book[3]",1478,1,"force_exitmob#party::OnMyMobDead";
+	monster "force_1-2",95,177,"Exchange Diary",1478,1,"force_exitmob#party::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-2","force_exitmob#party::OnMobDeath";
+	killmonster "force_1-2","force_exitmob#party::OnMyMobDead";
 	end;
-}
 
-prt_are_in,181,135,3	script	Staff#party-1	67,{
+OnMyMobDead:
+	end;
+}
 
+prt_are_in,181,135,3	script	Staff#party-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -1154,30 +970,20 @@ prt_are_in,181,135,3	script	Staff#party-1	67,{
 	end;
 }
 
-prt_are_in,77,135,3	script	Staff#party-2	67,{
-
-	if($arena_minptend < $arena_minptst)
-	{
-		if($arena_secptend < $arena_secptst)
-		{
+prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
+	if($arena_minptend < $arena_minptst) {
+		if($arena_secptend < $arena_secptst) {
 			set @record_minpt,60 - $arena_minptst + $arena_minptend -1;
 			set @record_secpt,60 - $arena_secptst + $arena_secptend;
-		}
-		else
-		{
+		} else {
 			set @record_minpt,60 - $arena_minptst + $arena_minptend;
 			set @record_secpt,$arena_secptend - $arena_secptst;
 		}
-	}
-	else
-	{
-		if($arena_secptend < $arena_secptst)
-		{
+	} else {
+		if($arena_secptend < $arena_secptst) {
 			set @record_minpt,$arena_minptend - $arena_minptst -1;
 			set @record_secpt,60 - $arena_secptst + $arena_secptend;
-		}
-		else
-		{
+		} else {
 			set @record_minpt,$arena_minptend - $arena_minptst;
 			set @record_secpt,$arena_secptend - $arena_secptst;
 		}
@@ -1215,9 +1021,7 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			set arena_point, arena_point + 40;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
@@ -1228,26 +1032,22 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 			mes "See you later~";
 			close2;
 		}
-		if(getpartyleader(.arn_party,2) == getcharid(0))
-		{
-			donpcevent "#arn_timer_pt::Onstop";
-			donpcevent "alloff#pt::Onon";
-			donpcevent "Ponox::Onstart";
+		if(getpartyleader(.arn_party,2) == getcharid(0)) {
+			donpcevent "#arn_timer_pt::OnStop";
+			donpcevent "alloff#pt::OnEnable";
+			donpcevent "Ponox::OnStart";
 		}
 		specialeffect2 EH_HIT5;
- 		donpcevent "cast#pt::Onnomal1";
+ 		donpcevent "cast#pt::OnNomal1";
 		warp "arena_room",100,75;
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
 		mes "What a great job!";
 		next;
-		if(getpartyleader(.arn_party,2) == getcharid(0))
-		{
+		if(getpartyleader(.arn_party,2) == getcharid(0)) {
 			mes "[Staff]";
 			mes "You can record you and your party members on ^FF0000the hall of Arena Time Force Battle party ^000000.";
 			mes "When you enter a name, the name will be remained on the top unless someone make a new record.";
@@ -1255,41 +1055,33 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 			mes "[Staff]";
 			mes "Please enter a name within 10 letters which can represent you and your party members.";
 			next;
-			switch( select( "Ok.","Let me think." ) ) 
-			{
+			switch( select( "Ok.","Let me think." ) )  {
+			case 1:
+				input .@arnparty$;
+				mes "[Staff]";
+				mes "You have entered ^3131FF"+.@arnparty$+"^000000. Is it correct?";
+				next;
+				switch( select( "Yes","No" ) ) {
 				case 1:
-					input .@arnparty$;
+					set $top_ptmin, @record_minpt;
+					set $top_ptsec, @record_secpt;
+					set $arena_pttopn$,.@arnparty$;
+					donpcevent "Vendigos::OnLineRec_pt";
 					mes "[Staff]";
-					mes "You have entered ^3131FF"+.@arnparty$+"^000000. Is it correct?";
+					mes "Your record has been entered.";
 					next;
-					switch( select( "Yes","No" ) )
-					{
-						case 1:
-							set $top_ptmin, @record_minpt;
-							set $top_ptsec, @record_secpt;
-							set $arena_pttopn$,.@arnparty$;
-							donpcevent "Vendigos::Onlinerec_pt";
-							mes "[Staff]";
-							mes "Your record has been entered.";
-							next;
-							break;
-
-						case 2:
-							mes "[Staff]";
-							mes "Please take your time and think up a nice name.";
-							close;
-
-					}
 					break;
-
 				case 2:
 					mes "[Staff]";
 					mes "Please take your time and think up a nice name.";
 					close;
-
+				}
+				break;
+			case 2:
+				mes "[Staff]";
+				mes "Please take your time and think up a nice name.";
+				close;
 			}
-
-
 		}
 		if (arena_point > 29900) {
 			mes "[Staff]";
@@ -1303,9 +1095,7 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			mes "[Staff]";
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
@@ -1320,21 +1110,18 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 			mes "See you later~";
 			close2;
 		}
-		if(getpartyleader(.arn_party,2) == getcharid(0))
-		{
-			donpcevent "#arn_timer_pt::Onstop";
-			donpcevent "alloff#pt::Onon";
-			donpcevent "Ponox::Onstart";
+		if(getpartyleader(.arn_party,2) == getcharid(0)) {
+			donpcevent "#arn_timer_pt::OnStop";
+			donpcevent "alloff#pt::OnEnable";
+			donpcevent "Ponox::OnStart";
 		}
 		specialeffect2 EF_HIT5;
 		warp "arena_room",100,75;
 		end;
 	}
-
 }
 
 -	script	#arn_timer_pt	-1,{
-
 OnEnter:
 	initnpctimer;
 	end;
@@ -1352,47 +1139,44 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
- 	donpcevent "cast#pt::Ontimeover2";
-	donpcevent "arn_warp_pt::Onout";
-	donpcevent "#arn_timer_pt::Onstop";
-	donpcevent "alloff#pt::Onon";
-	donpcevent "Ponox::Onstart";
+	donpcevent "cast#pt::OnTimeOver2";
+	donpcevent "arn_warp_pt::OnOut";
+	donpcevent "#arn_timer_pt::OnStop";
+	donpcevent "alloff#pt::OnEnable";
+	donpcevent "Ponox::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
-	end; 
+	end;
 }
 
 -	script	arn_warp_pt	-1,{
-
-Onout:
+OnOut:
 	areawarp "prt_are_in",66,143,81,126,"arena_room",100,75;
 	end;
 }
 
 -	script	cast#pt	-1,{
-
-Ontimeover1:
+OnTimeOver1:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
 
-Onnomal1:
+OnNomal1:
 	mapannounce "force_2-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 
-Onnomal2:
+OnNomal2:
 	mapannounce "force_2-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 
-Ontimeover2:
+OnTimeOver2:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred in the waiting room.",0,0xFFCE00;
 	end;
 }
 
 -	script	alloff#pt	-1,{
-
-Onon:
+OnEnable:
 	mapwarp "force_1-2","prt_are_in",126,139,0,0;
 	donpcevent "force_01mob#party::OnReset";
 	donpcevent "force_02mob#party::OnReset";
@@ -1403,8 +1187,8 @@ Onon:
 	donpcevent "force_07mob#party::OnReset";
 	donpcevent "force_08mob#party::OnReset";
 	donpcevent "force_09mob#party::OnReset";
-	donpcevent "force_10-1mob#party::OnReset";
-	donpcevent "force_10-2mob#party::OnReset";
+	donpcevent "force_10mob-1#party::OnReset";
+	donpcevent "force_10mob-2#party::OnReset";
 	donpcevent "force_exitmob#party::OnReset";
 	//disablenpc "force_01mob#party";
 	//disablenpc "force_02mob#party";
@@ -1443,12 +1227,12 @@ Onon:
 	disablenpc "force_10_09";
 	disablenpc "force_09_exit";
 	disablenpc "arena_p";
-	donpcevent "Slipslowrun#party::Ontimeroff";
+	donpcevent "Slipslowrun#party::OnTimerOff";
 	disablenpc "Slipslowrun#party";
 	disablenpc "arn_warp_pt";
 	set $arn_partywait,0;
 	set $arn_partyc,0;
-	donpcevent "#arn_timer_pt::Onstop";
+	donpcevent "#arn_timer_pt::OnStop";
 	enablenpc "Slipslowrun#party";
 	enablenpc "arena_p";
 	end;
@@ -1456,5 +1240,4 @@ Onon:
 OnInit:
 	if(!$top_ptmin && !$top_ptsec) set $top_ptmin,10;
 	end;
-
 }
diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt
index 0890867bf..3b49596c0 100644
--- a/npc/other/arena/arena_point.txt
+++ b/npc/other/arena/arena_point.txt
@@ -4,14 +4,14 @@
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Point exchanger: Turbo track points -> Arena Points
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //============================================================
 
-prt_are_in,103,11,3	script	Arena Point Manager	732,{
+prt_are_in,103,11,3	script	Arena Point Manager	4_M_JOB_HUNTER,{
 	mes "[Arena Point Manager]";
 	mes "I hope you're having a good";
 	mes "time in the Arena. If you've";
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index 925976f3b..9330fcf6a 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -3,26 +3,28 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.1
+//= 1.4
 //===== Description: =========================================
 //= Izlude Battle Arena Main Room
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Fixed a small reward typo (was giving potato.) [L0ne_W0lf]
+//= 1.2 Label standardization, disabled GM NPCs. [Euphy]
+//= 1.2a Added Renewal level checksk. [Euphy]
+//= 1.3 Script updates. [Euphy]
+//= 1.4 Added GM management function. [Euphy]
 //============================================================
 
-arena_room,94,93,5	script	Vendigos	97,{
-
+arena_room,94,93,5	script	Vendigos	4W_M_01,{
 	mes "[Vendigos]";
 	mes "Welcome to the world of Arena, the battle against a time limit.";
 	mes "My name is Vendigos, I am here to help you.";
 	next;
 	mes "[Vendigos]";
 	mes "If you have any questions, feel free to ask me.";
-L_Menu:
 	next;
-	switch( select( "How to challenge","About Arena Points","My Current Arena Points","Cancel" ) )
-	{
+	while(1) {
+		switch(select("How to challenge:About Arena Points:My Current Arena Points:Cancel")) {
 		case 1:
 			mes "[Vendigos]";
 			mes "There are two different kinds of arena mode such as ^3131FFPlayer Mode^000000 and ^3131FFParty Mode^000000.";
@@ -38,7 +40,6 @@ L_Menu:
 			mes "There are the NPCs for Player Mode Stages from 12 o'clock direction to the reversed clock direction.";
 			mes "While you're waiting in a chat room, you will be automatically guided to an arena room by the waiting order.";
 			break;
-
 		case 2:
 			mes "[Vendigos]";
 			mes "Let me explain about the ^3131FFArena Point^000000.";
@@ -51,7 +52,6 @@ L_Menu:
 			mes "Regarding the use of Arena Points,";
 			mes "we are providing various services such as souvenir photograph services through an NPC named Givu.";
 			break;
-
 		case 3:
 			mes "[Vendigos]";
 			mes "Let me check "+strcharinfo(0)+"'s current arena points.";
@@ -62,45 +62,46 @@ L_Menu:
 			mes "[Vendigos]";
 			mes "If you wish to know how to use arena points, please refer to the 2nd menu ^3131FF'About Arena Points'^000000.";
 			break;
-
 		case 4:
 			mes "[Vendigos]";
-			mes "Okay, please have a good time.";
+			mes "Okay then,";
+			mes "please have";
+			mes "a good time.";
 			close;
+		}
+		next;
+		mes "[Vendigos]";
+		mes "Is there anything";
+		mes "more I can help you with?";
+		next;
 	}
-	next;
-	mes "[Vendigos]";
-	mes "Is there anything I can help you more?";
-	goto L_Menu;
+	close;
 
-Onlinerec_50:
+OnLineRec_50:
 	mapannounce "arena_room",""+$arena_50topn$+" has renewed the top record in the Arena Time Force Battle level 50. Congratulations!",0;
 	end;
 
-Onlinerec_60:
+OnLineRec_60:
 	mapannounce "arena_room",""+$arena_60topn$+" has renewed the top record in the Arena Time Force Battle level 60. Congratulations!",0;
 	end;
 
-Onlinerec_70:
+OnLineRec_70:
 	mapannounce "arena_room",""+$arena_70topn$+" has renewed the top record in the Arena Time Force Battle level 70. Congratulations!",0;
 	end;
-Onlinerec_80:
+OnLineRec_80:
 	mapannounce "arena_room",""+$arena_80topn$+" has renewed the top record in the Arena Time Force Battle level 80. Congratulations!",0;
 	end;
 
-Onlinerec_pt:
+OnLineRec_pt:
 	mapannounce "arena_room","Party "+$arena_pttopn$+" has renewed the top record in the Arena Time Force Battle. Congratulations!",0;
 	end;
 
-//OnCommand: "linerec_vs"
-// var vs_winner = GetGlobalStr "040611_arn_vstopn"
-// broadcastinmap "Party "+vs_winner+" has renewed the top record in the Arena Time Force Battle. Congratulations!"
-// end;
-
+//OnLineRec_vs:
+//	mapannounce "arena_room","Party "+$040611_arn_vstopn$+" has renewed the top record in the Arena Time Force Battle. Congratulations!",0;
+//	end;
 }
 
-arena_room,105,82,5	script	Arena Record Staff	57,{
-
+arena_room,105,82,5	script	Arena Record Staff	1_M_LIBRARYMASTER,{
 	mes "[Owen Kheuv]";
 	mes "Hello, my name is Own Kheuv";
 	mes "in charge of every arena stage record of players.";
@@ -109,43 +110,37 @@ arena_room,105,82,5	script	Arena Record Staff	57,{
 	mes "Would you like to check the top record players in each stage?";
 	mes "If so, please choose a menu below.";
 	next;
-	switch( select( "lvl 50 Stage","lvl 60 Stage","lvl 70 Stage","lvl 80 Stage","Party Stage" ) )
-	{
-		case 1:
-			mes "[Owen Kheuv]";
-			mes "Currently the top player of the arena lvl 50 stage is ^3131FF "+$arena_50topn$+"^000000, the top record is ^3131FF"+$top_50min+"^000000 minutes ^3131FF"+$top_50sec+"^000000 seconds.";
-			close;
-
-		case 2:
-			mes "[Owen Kheuv]";
-			mes "Currenly the top player of the arena lvl 60 stage is ^3131FF"+$arena_60topn$+"^000000, the top record is ^3131FF"+$top_60min+"^000000 minutes ^3131FF"+$top_60sec+"^000000 seconds.";
-			close;
-
-		case 3:
-			mes "[Owen Kheuv]";
-			mes "Currenly the top player of the arena lvl 70 stage is ^3131FF"+$arena_70topn$+"^000000, the top record is ^3131FF"+$top_70min+"^000000 minutes ^3131FF"+$top_70sec+"^000000 seconds.";
-			close;
-
-		case 4:
-			mes "[Owen Kheuv]";
-			mes "Currenly the top player of the arena lvl 80 stage is ^3131FF"+$arena_80topn$+"^000000, the top record is ^3131FF"+$top_80min+"^000000 minutes ^3131FF"+$top_80sec+"^000000 seconds.";
-			close;
-
-		case 5:
-			mes "[Owen Kheuv]";
-			mes "Currenly the top party is ^3131FF"+$arena_pttopn$+"^000000, the top record is ^3131FF"+$top_ptmin+"^000000 minutes ^3131FF"+$top_ptsec+"^000000 seconds.";
-			close;
+	switch(select("Lv 50 Stage:Lv 60 Stage:Lv 70 Stage:Lv 80 Stage:Party Stage")) {
+	case 1:
+		mes "[Owen Kheuv]";
+		mes "Currently the top player of the arena Lv 50 stage is ^3131FF "+$arena_50topn$+"^000000, the top record is ^3131FF"+$top_50min+"^000000 minutes ^3131FF"+$top_50sec+"^000000 seconds.";
+		close;
+	case 2:
+		mes "[Owen Kheuv]";
+		mes "Currenly the top player of the arena Lv 60 stage is ^3131FF"+$arena_60topn$+"^000000, the top record is ^3131FF"+$top_60min+"^000000 minutes ^3131FF"+$top_60sec+"^000000 seconds.";
+		close;
+	case 3:
+		mes "[Owen Kheuv]";
+		mes "Currenly the top player of the arena Lv 70 stage is ^3131FF"+$arena_70topn$+"^000000, the top record is ^3131FF"+$top_70min+"^000000 minutes ^3131FF"+$top_70sec+"^000000 seconds.";
+		close;
+	case 4:
+		mes "[Owen Kheuv]";
+		mes "Currenly the top player of the arena Lv 80 stage is ^3131FF"+$arena_80topn$+"^000000, the top record is ^3131FF"+$top_80min+"^000000 minutes ^3131FF"+$top_80sec+"^000000 seconds.";
+		close;
+	case 5:
+		mes "[Owen Kheuv]";
+		mes "Currenly the top party is ^3131FF"+$arena_pttopn$+"^000000, the top record is ^3131FF"+$top_ptmin+"^000000 minutes ^3131FF"+$top_ptsec+"^000000 seconds.";
+		close;
 	}
 }
 
-arena_room,68,135,3	script	Helper Pat	726,{
-
+arena_room,68,135,3	script	Helper Pat	4_F_JOB_BLACKSMITH,{
 	mes "[Pat]";
 	mes "Welcome, welcome.";
-	mes "I am a helper of the lvl 50 arena stage.";
+	mes "I am a helper of the Lv 50 arena stage.";
 	next;
 	mes "[Pat]";
-	mes "This ^3131FFlvl 50 arena stage^000000";
+	mes "This ^3131FFLv 50 arena stage^000000";
 	mes "is accessable to characters from ^FF0000level 50^000000 to ^FF0000level 69^000000.";
 	next;
 	mes "[Pat]";
@@ -178,14 +173,13 @@ arena_room,68,135,3	script	Helper Pat	726,{
 	close;
 }
 
-arena_room,41,93,5	script	Helper Ben	750,{
-
+arena_room,41,93,5	script	Helper Ben	4_M_ALCHE_C,{
 	mes "[Ben]";
 	mes "Welcome, welcome.";
-	mes "I am a helper of the lvl 60 arena stage.";
+	mes "I am a helper of the Lv 60 arena stage.";
 	next;
 	mes "[Ben]";
-	mes "This ^3131FFlvl 60 arena stage^000000";
+	mes "This ^3131FFLv 60 arena stage^000000";
 	mes "is accessable to characters from ^FF0000level 60^000000 to ^FF0000level 79^000000.";
 	next;
 	mes "[Ben]";
@@ -218,15 +212,14 @@ arena_room,41,93,5	script	Helper Ben	750,{
 	close;
 }
 
-arena_room,53,49,5	script	Helper Vicious	730,{
-
+arena_room,53,49,5	script	Helper Vicious	4_M_JOB_ASSASSIN,{
 	mes "[Vicious]";
 	mes "Hey there.";
-	mes "My name is Vicious, I am a helper of lvl 70 arena stage.";
+	mes "My name is Vicious, I am a helper of Lv 70 arena stage.";
 	mes "(...I have no clue how the hell I put myself into this crappy work...mumble mumble...grumble grumble..)";
 	next;
 	mes "[Vicious]";
-	mes "This ^3131FFlvl 70 arena stage^000000";
+	mes "This ^3131FFLv 70 arena stage^000000";
 	mes "is accessable to characters from ^FF0000level 70^000000 to ^FF0000level 89^000000.";
 	next;
 	mes "[Vicious]";
@@ -259,11 +252,10 @@ arena_room,53,49,5	script	Helper Vicious	730,{
 	close;
 }
 
-arena_room,147,49,3	script	Helper Epin	727,{
-
+arena_room,147,49,3	script	Helper Epin	4_F_JOB_HUNTER,{
 	mes "[Epin]";
 	mes "Good day,";
-	mes "I am a helper of lvl 80 arena stage and my name is Epin.";
+	mes "I am a helper of Lv 80 arena stage and my name is Epin.";
 	mes "I like reading and I am 19 years old...huh...? Don't you want to hear about me...?";
 	next;
 	emotion e_cry,0;
@@ -271,8 +263,8 @@ arena_room,147,49,3	script	Helper Epin	727,{
 	mes "Okay...";
 	next;
 	mes "[Epin]";
-	mes "This ^3131FFlvl 80 arena stage^000000";
-	mes "is accessable to characters from ^FF0000level 80^000000 to ^FF0000level 99^000000.";
+	mes "This ^3131FFLv 80 arena stage^000000";
+	mes "is accessable to characters from ^FF0000level 80^000000 to ^FF0000level "+(checkre(0)?"160":"99")+"^000000.";
 	next;
 	mes "[Epin]";
 	mes "This level limitation is to prevent high level characters abusing low level arena stages. I hope you will understand.";
@@ -304,8 +296,7 @@ arena_room,147,49,3	script	Helper Epin	727,{
 	close;
 }
 
-arena_room,158,93,5	script	Helper Lunic	828,{
-
+arena_room,158,93,5	script	Helper Lunic	4_M_ROGUE,{
 	mes "[Lunic]";
 	mes "Welcome to party arena stage.";
 	mes "I hope you will listen carefully to my introduction";
@@ -313,7 +304,7 @@ arena_room,158,93,5	script	Helper Lunic	828,{
 	next;
 	mes "[Lunic]";
 	mes "^3131FFParty Arena Stage^000000";
-	mes "is accessible to players from ^FF0000level 10^000000 to ^FF0000level 99^000000.";
+	mes "is accessible to players from ^FF0000level 10^000000 to ^FF0000level "+(checkre(0)?"160":"99")+"^000000.";
 	next;
 	mes "[Lunic]";
 	mes "Also, arena will be not be started until all of 5 party members enter the room. We accept an entrance fee 1,000 zeny.";
@@ -374,8 +365,7 @@ arena_room,158,93,5	script	Helper Lunic	828,{
 	close;
 }
 
-arena_room,158,82,1	script	Helper Lonik	828,{
-
+arena_room,158,82,1	script	Helper Lonik	4_M_ROGUE,{
 	emotion e_no1,0;
 	mes "[Lonik]";
 	mes "Tah dah! Here I am!";
@@ -386,254 +376,201 @@ arena_room,158,82,1	script	Helper Lonik	828,{
 	mes "[Lonik]";
 	mes "My answer is...";
 	mes ".............";
-	if(getmapusers("force_1-2"))
-	{
+	if (getmapusers("force_1-2")) {
 		emotion e_oh,0;
 		mes "Yes!";
 		mes "There is someone inside.";
 		next;
 		mes "[Lonik]";
 		mes "You'd better wait a little bit longer!";
-	}
-	else
-	{
-		emotion e_x,0;
+	} else {
+		emotion e_X,0;
 		mes "No!";
 		mes "Go for it, good luck!";
 	}
 	close;
 }
 
-sec_in02,72,180,3	script	Arena Manager#arena	802,{
-
-	if (!getgmlevel()) end;
-
-	input .@arena;
-	if(!.@arena)
-	{
+sec_in02,72,180,3	script	Arena Manager#arena	4_NFWISP,{
+	set .@i, callfunc("F_GM_NPC",1357,0);
+	if (.@i == -1) {
 		mes "[Arena Manager]";
 		mes "Command has been canceled.";
 		close;
-	}
-	else if(.@arena == 1357)
-	{
+	} else if (.@i == 0) {
+		mes "Password is incorrect.";
+		close;
+	} else {
 		mes "[Arena Manager]";
 		mes "Select an option.";
 		next;
-		switch( select( "Restart arena","Rearrange the Ranking Time" ) )
-		{
+		switch(select("Restart arena:Rearrange the Ranking Time")) {
+		case 1:
+			switch(select("Lv 50:Lv 60:Lv 70:Lv 80:Party Mode")) {
 			case 1:
-				switch( select( "lvl 50","lvl 60","lvl 70","lvl 80","Party Mode" ) ) 
-				{
-					case 1:
-						set .@arena,50;
-						break;
-					case 2:
-						set .@arena,60;
-						break;
-					case 3:
-						set .@arena,70;
-						break;
-					case 4:
-						set .@arena,80;
-						break;
-					case 5:
-						mes "[Arena Manager]";
-						mes "== Caution ==";
-						mes "You have chosen to restart party arena stage.";
-						mes "Do you wish to proceed?";
-						next;
-						switch( select( "Yes","No" ) )
-						{
-							case 1:
-								donpcevent "Ponox::Onstart";
-								mes "[Arena Manager]";
-								mes "The arena stage has been successfuly reactivated.";
-								close;
-
-							case 2:
-								mes "[Arena Manager]";
-								mes "Command has been canceled.";
-								close;
-						}
-				}
+				set .@arena,50;
+				break;
+			case 2:
+				set .@arena,60;
+				break;
+			case 3:
+				set .@arena,70;
+				break;
+			case 4:
+				set .@arena,80;
+				break;
+			case 5:
 				mes "[Arena Manager]";
 				mes "== Caution ==";
-				mes "You have chosen to restart lvl "+.@arena+" arena stage.";
+				mes "You have chosen to restart party arena stage.";
 				mes "Do you wish to proceed?";
 				next;
-				switch( select( "Yes","No" ) )
-				{
-					case 1:
-						donpcevent "lvl "+.@arena+"s Waiting Room::Onstart";
-						mes "[Arena Manager]";
-						mes "The arena stage has been successfuly reactivated.";
-						close;
+				switch(select("Yes:No")) {
+				case 1:
+					donpcevent "Ponox::OnStart";
+					mes "[Arena Manager]";
+					mes "The arena stage has been successfuly reactivated.";
+					close;
 
-					case 2:
-						mes "[Arena Manager]";
-						mes "Command has been canceled.";
-						close;
+				case 2:
+					mes "[Arena Manager]";
+					mes "Command has been canceled.";
+					close;
 				}
-
+			}
+			mes "[Arena Manager]";
+			mes "== Caution ==";
+			mes "You have chosen to restart Lv "+.@arena+" arena stage.";
+			mes "Do you wish to proceed?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				donpcevent "Lv"+.@arena+" Waiting Room::OnStart";
+				mes "[Arena Manager]";
+				mes "The arena stage has been successfuly reactivated.";
+				close;
 			case 2:
 				mes "[Arena Manager]";
-				mes "== Caution ==";
-				mes "^CE0000You have chosen to rearrange the ranking time. Make sure this is not a good decision unless if something serious was happened!^000000";
-				next;
+				mes "Command has been canceled.";
+				close;
+			}
+		case 2:
+			mes "[Arena Manager]";
+			mes "== Caution ==";
+			mes "^CE0000You have chosen to rearrange the ranking time. Make sure this is not a good decision unless if something serious was happened!^000000";
+			next;
+			mes "[Arena Manager]";
+			mes "Are you sure you want to rearrange the ranking time?";
+			next;
+			switch(select("No:Yes")) {
+			case 1:
 				mes "[Arena Manager]";
-				mes "Are you sure you want to rearrange the ranking time?";
-				next;
-				switch( select( "No","Yes" ) )
-				{
-					case 1:
-						mes "[Arena Manager]";
-						mes "Phew~ :)";
-						close;
-
-					case 2:
-						switch( select( "lvl 50","lvl 60","lvl 70","lvl 80","Party Mode" ) )
-						{
-							case 1:
-								mes "[Arena Manager]";
-								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds.";
-								next;
-								input .@arenamin;
-								set $top_50min,.@arenamin;
-								input .@arenasec;
-								set $top_50sec,.@arenasec;
-								mes "[Arena Manager]";
-								mes "Current lvl 50 ranker's play time has been rearranged to ^FF0000"+$top_50min+"^000000 minutes and ^FF0000"+$top_50sec+"^000000 seconds.";
-								close;
-							case 2:
-								mes "[Arena Manager]";
-								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds.";
-								next;
-								input .@arenamin;
-								set $top_60min,.@arenamin;
-								input .@arenasec;
-								set $top_60sec,.@arenasec;
-								mes "[Arena Manager]";
-								mes "Current lvl 60 ranker's play time has been rearranged to ^FF0000"+$top_60min+"^000000 minutes and ^FF0000"+$top_60sec+"^000000 seconds.";
-								close;
-							case 3:
-								mes "[Arena Manager]";
-								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds.";
-								next;
-								input .@arenamin;
-								set $top_70min,.@arenamin;
-								input .@arenasec;
-								set $top_70sec,.@arenasec;
-								mes "[Arena Manager]";
-								mes "Current lvl 70 ranker's play time has been rearranged to ^FF0000"+$top_70min+"^000000 minutes and ^FF0000"+$top_70sec+"^000000 seconds.";
-								close;
-							case 4:
-								mes "[Arena Manager]";
-								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds.";
-								next;
-								input .@arenamin;
-								set $top_80min,.@arenamin;
-								input .@arenasec;
-								set $top_80sec,.@arenasec;
-								mes "[Arena Manager]";
-								mes "Current lvl 80 ranker's play time has been rearranged to ^FF0000"+$top_80min+"^000000 minutes and ^FF0000"+$top_80sec+"^000000 seconds.";
-								close;
-							case 5:
-								mes "[Arena Manager]";
-								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds.";
-								next;
-								input .@arenamin;
-								set $top_ptmin,.@arenamin;
-								input .@arenasec;
-								set $top_ptsec,.@arenasec;
-								mes "[Arena Manager]";
-								mes "Current party ranker's play time has been rearranged to ^FF0000"+$top_ptmin+"^000000 minutes and ^FF0000"+$top_ptsec+"^000000 seconds.";
-								close;
-						}
+				mes "Phew~ :)";
+				close;
+			case 2:
+				switch(select("Lv 50:Lv 60:Lv 70:Lv 80:Party Mode")) {
+				case 1:
+					set .@min$,"$top50min";
+					set .@sec$,"$top50sec";
+					set .@mode$,"Lv 50";
+					break;
+				case 2:
+					set .@min$,"$top60min";
+					set .@sec$,"$top60sec";
+					set .@mode$,"Lv 60";
+					break;
+				case 3:
+					set .@min$,"$top70min";
+					set .@sec$,"$top70sec";
+					set .@mode$,"Lv 70";
+					break;
+				case 4:
+					set .@min$,"$top80min";
+					set .@sec$,"$top80sec";
+					set .@mode$,"Lv 80";
+					break;
+				case 5:
+					set .@min$,"$top_ptmin";
+					set .@sec$,"$top_ptsec";
+					set .@mode$,"party";
+					break;
 				}
+				mes "[Arena Manager]";
+				// Doesn't work with Athena's implementation.
+				//mes "Please enter 0 to cancel.";
+				//mes "If not, please enter a value for minutes first and then seconds.";
+				mes "Please enter a value for minutes first and then seconds.";
+				next;
+				input .@arenamin;
+				setd .@min$,.@arenamin;
+				input .@arenasec;
+				setd .@sec$,.@arenasec;
+				mes "[Arena Manager]";
+				mes "Current "+.@mode$+" ranker's play time has been rearranged to ^FF0000"+getd(.@min$)+"^000000 minutes and ^FF0000"+getd(.@sec$)+"^000000 seconds.";
+				close;
+			}
 		}
 	}
-	mes "Password is incorrect.";
-	close;
 }
 
-sec_in02,79,171,3	script	Reward Manager#arena	802,{
-
-	if (!getgmlevel()) end;
-
-	input .@arena;
-	if(!.@arena)
-	{
+sec_in02,79,171,3	script	Reward Manager#arena	4_NFWISP,{
+	set .@i, callfunc("F_GM_NPC",1357,0);
+	if (.@i == -1) {
 		mes "[Reward Manager]";
 		mes "Command has been canceled.";
 		close;
-	}
-	else if(.@arena == 1357)
-	{
+	} else if (.@i == 0) {
+		mes "[Reward Manager]";
+		mes "Password is incorrect.";
+		close;
+	} else {
 		mes "[Reward Manager]";
 		mes "You have chosen to hide the teleporter NPC.";
 		next;
-		switch( select( "Cancel","Yes","Turn on" ) )
-		{
-			case 1:
-				mes "[Reward Manager]";
-				mes "You have canceled the command.";
-				close;
-
-			case 2:
-				mes "[Reward Manager]";
-				mes "NPC has been hidden";
-				disablenpc "Teleporter#arena";
-				close;
-
-			case 3:
-				mes "[Reward Manager]";
-				mes "NPC has been enabled.";
-				enablenpc "Teleporter#arena";
-				close;
+		switch(select("Cancel:Yes:Turn on")) {
+		case 1:
+			mes "[Reward Manager]";
+			mes "You have canceled the command.";
+			close;
+		case 2:
+			mes "[Reward Manager]";
+			mes "NPC has been hidden.";
+			disablenpc "Teleporter#arena";
+			close;
+		case 3:
+			mes "[Reward Manager]";
+			mes "NPC has been enabled.";
+			enablenpc "Teleporter#arena";
+			close;
 		}
 	}
-	mes "[Reward Manager]";
-	mes "Password is incorrect.";
-	close;
 }
 
-arena_room,105,93,5	script	Teleporter#arena	55,{
-
+arena_room,105,93,5	script	Teleporter#arena	1_M_JOBTESTER,{
 	mes "[Teleporter]";
 	mes "I can move you to the reward arena!";
 	mes "Would you like to go there?";
 	next;
-	switch( select( "Yes.","No." ) )
-	{
-		case 1:
-			mes "[Teleporter]";
-			mes "Let me guide you.";
-			close2;
-			warp "prt_are_in",60,14;
-			end;
-
-		case 2:
-			mes "[Teleporter]";
-			mes "No problem, feel free to come back any time.";
-			close;
+	switch(select("Yes:No.")) {
+	case 1:
+		mes "[Teleporter]";
+		mes "Let me guide you.";
+		close2;
+		warp "prt_are_in",60,14;
+		end;
+	case 2:
+		mes "[Teleporter]";
+		mes "No problem, feel free to come back any time.";
+		close;
 	}
 }
 
-prt_are_in,98,14,3	script	Givu#arena	728,{
-
-
-	if(checkweight(526,5) != 1)
-	{
+prt_are_in,98,14,3	script	Givu#arena	4_F_JOB_KNIGHT,{
+	if (checkweight(526,5) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
-		mes "- Please enlighten your weight -";
+		mes "- Please lighten your weight -";
 		mes "- and try again. -";
 		close;
 	}
@@ -645,152 +582,142 @@ prt_are_in,98,14,3	script	Givu#arena	728,{
 	mes "You can exchange your arena points with various stuffs.";
 	mes "Please choose a menu below.";
 	next;
-	switch( select( "Exchange with Consumable items","Exchange with EXP points","Take a Souvenir Picture","Check Current Arena Points" ) )
-	{
+	switch(select("Exchange with Consumable items:Exchange with EXP points:Take a Souvenir Picture:Check Current Arena Points")) {
+	case 1:
+		mes "[Givu]";
+		mes "What consumable item do you wish to exchange?";
+		next;
+		switch(select("Honey:Royal Jelly:Mastela Fruit:Condensed White Potion:Anodyne:Yggdrasil Seed:Yggdrasilberry:Old Blue Box:Old Purple Box:Old Card Album")) {
+			case 1: callfunc "Func_Are_Rew",518,5,20;
+			case 2: callfunc "Func_Are_Rew",526,5,30;
+			case 3: callfunc "Func_Are_Rew",522,5,30;
+			case 4: callfunc "Func_Are_Rew",547,8,30;
+			case 5: callfunc "Func_Are_Rew",605,3,20;
+			case 6: callfunc "Func_Are_Rew",608,1,20;
+			case 7: callfunc "Func_Are_Rew",607,1,40;
+			case 8: callfunc "Func_Are_Rew",603,1,100;
+			case 9: callfunc "Func_Are_Rew",617,1,300;
+			case 10: callfunc "Func_Are_Rew",616,1,1000;
+		}
+	case 2:
+		mes "[Givu]";
+		mes "Would you like to exchange your arena points with experience points?";
+		mes "It requires 40 arena points.";
+		next;
+		switch(select("Cancel:Yes")) {
 		case 1:
 			mes "[Givu]";
-			mes "What consumable item do you wish to exchange?";
-			next;
-			switch( select( "Honey","Royal Jelly","Mastela Fruit","Condensed White Potion","Anodyne","Yggdrasil Seed","Yggdrasilberry","Old Blue Box","Old Purple Box","Old Card Album" ) )
-			{
-				case 1: callfunc "Func_Are_Rew",518,5,20;
-				case 2: callfunc "Func_Are_Rew",526,5,30;
-				case 3: callfunc "Func_Are_Rew",522,5,30;
-				case 4: callfunc "Func_Are_Rew",547,8,30;
-				case 5: callfunc "Func_Are_Rew",605,3,20;
-				case 6: callfunc "Func_Are_Rew",608,1,20;
-				case 7: callfunc "Func_Are_Rew",607,1,40;
-				case 8: callfunc "Func_Are_Rew",603,1,100;
-				case 9: callfunc "Func_Are_Rew",617,1,300;
-				case 10: callfunc "Func_Are_Rew",616,1,1000;
-			}
-
+			mes "You have canceled your request.";
+			close;
 		case 2:
+			if (arena_point < 40) {
+				mes "[Givu]";
+				mes "You do not have enough arena points.";
+				mes "Please check the total amount of arena points you have.";
+				close;
+			}
+			set arena_point, arena_point-40;
+			if (checkre(3)) {
+				if (BaseLevel < 70) getexp 300,0;
+				else if (BaseLevel < 80) getexp 900,0;
+				else if (BaseLevel < 90) getexp 1000,0;
+				else getexp 3000,0;
+			} else {
+				if (BaseLevel < 70) getexp 3000,0;
+				else if (BaseLevel < 80) getexp 9000,0;
+				else if (BaseLevel < 90) getexp 10000,0;
+				else getexp 30000,0;
+			}
 			mes "[Givu]";
-			mes "Would you like to exchange your arena points with experience points?";
-			mes "It requires 40 arena points.";
+			mes "You have gained experience points. Thank you.";
+			close;
+		}
+	case 3:
+		mes "[Givu]";
+		mes "You have chosen a souvenir picture services.";
+		next;
+		switch(select("About souvenir Picture Services:Take a picture")) {
+		case 1:
+			mes "[Givu]";
+			mes "Do you see stairs at the right side of me?";
 			next;
-			switch( select( "Cancel","Yes" ) )
-			{
-				case 1:
-					mes "[Givu]";
-					mes "You have canceled your request.";
-					close;
-
-				case 2:
-					if(arena_point < 40)
-					{
-						mes "[Givu]";
-						mes "You do not have enough arena points.";
-						mes "Please check the total amount of arena points you have.";
-						close;
-					}
-					set arena_point,arena_point -40;
-					if(BaseLevel < 70) getexp 3000,0;
-					else if(BaseLevel < 80) getexp 9000,0;
-					else if(BaseLevel < 90) getexp 10000,0;
-					else if(BaseLevel < 100) getexp 30000,0;
-					mes "[Givu]";
-					mes "You have gained experience points. Thank you.";
-					close;
-			}
-
-		case 3:
 			mes "[Givu]";
-			mes "You have chosen a souvenir picture services.";
+			mes "At the stairs, you can take a screenshot with an NPC or a monster.";
 			next;
-			switch( select( "About souvenir Picture Services","Take a picture" ) )
-			{
-				case 1:
-					mes "[Givu]";
-					mes "Do you see stairs at the right side of me?";
-					next;
-					mes "[Givu]";
-					mes "At the stairs, you can take a screenshot with an NPC or a monster.";
-					next;
-					mes "[Givu]";
-					mes "When you choose an NPC or a monster, it will show some emotion icons ^FF0000for 1 minute^000000.";
-					next;
-					mes "[Givu]";
-					mes "Don't miss the chance to take a picture with your favorite NPC!";
-					close;
-
-				case 2:
-					if($arenapic)
-					{
-						mes "[Givu]";
-						mes "A souvenir picture services is on progress. Please wait.";
-						close;
-					}
-					mes "[Givu]";
-					mes "Please choose an NPC at below.";
-					mes "The NPC will appear for 1 minute and this service requires 10 arena points.";
-					next;
-					switch( select( "Baphomet","Dark Lord","Doppelganger","Eddga","Dracula","Samurai","Stormy Knight","Phreeoni","Girl","Valkyrie" ) )
-					{
-						case 1: set $@arenapic,1039; break;
-						case 2: set $@arenapic,1272; break;
-						case 3: set $@arenapic,1046; break;
-						case 4: set $@arenapic,1115; break;
-						case 5: set $@arenapic,1389; break;
-						case 6: set $@arenapic,1492; break;
-						case 7: set $@arenapic,1251; break;
-						case 8: set $@arenapic,1159; break;
-						case 9: set $@arenapic,6969; break;
-						case 10: set $@arenapic,7777; break;
-					}
-					if(arena_point < 10)
-					{
-						mes "[Givu]";
-						mes "You do not have enough arena points.";
-						mes "Please check the total amount of arena points you have.";
-						close;
-					}
-					mes "[Givu]";
-					if($@arenapic == 6969) mes "Would you like to take a picture with pretty girls?";
-					else if($@arenapic == 7777) mes "Would you like to take a picture with a Valkyrie?";
-					else mes "Would you like to take a picture with a "+getmonsterinfo($@arenapic,0)+"?";
-					next;
-					switch( select( "Yes","No" ) )
-					{
-						case 1:
-							set arena_point,arena_point -10;
-							set $arenapic,1;
-							enablenpc "#arena_"+$@arenapic+"";
-							movenpc "#arena_"+$@arenapic+"",96,28;
-							if($@arenapic == 6969)
-							{
-								enablenpc "#arena_ss_2";
-								enablenpc "#arena_ss_3";
-								enablenpc "#arena_ss_4";
-							}
-							donpcevent "npctime#arena::OnStart";
-							mes "[Givu]";
-							mes "Thank you.";
-							close;
-
-						case 2:
-							mes "[Givu]";
-							mes "Would you like to consider a little longer?";
-							close;
-					}
-			}
-
-		case 4:
 			mes "[Givu]";
-			mes "Let me check "+strcharinfo(0)+"'s current arena points.";
+			mes "When you choose an NPC or a monster, it will show some emotion icons ^FF0000for 1 minute^000000.";
 			next;
 			mes "[Givu]";
-			mes ""+strcharinfo(0)+" has total ^3131FF"+arena_point+"^000000 points.";
+			mes "Don't miss the chance to take a picture with your favorite NPC!";
 			close;
+		case 2:
+			if ($@arena_picture) {
+				mes "[Givu]";
+				mes "A souvenir picture services is on progress. Please wait.";
+				close;
+			}
+			mes "[Givu]";
+			mes "Please choose an NPC at below.";
+			mes "The NPC will appear for 1 minute and this service requires 10 arena points.";
+			next;
+			switch(select("Baphomet:Dark Lord:Doppelganger:Eddga:Dracula:Samurai:Stormy Knight:Phreeoni:Girl:Valkyrie")) {
+				case 1: set $@arena_picture_id,1039; break;
+				case 2: set $@arena_picture_id,1272; break;
+				case 3: set $@arena_picture_id,1046; break;
+				case 4: set $@arena_picture_id,1115; break;
+				case 5: set $@arena_picture_id,1389; break;
+				case 6: set $@arena_picture_id,1492; break;
+				case 7: set $@arena_picture_id,1251; break;
+				case 8: set $@arena_picture_id,1159; break;
+				case 9: set $@arena_picture_id,6969; break;
+				case 10: set $@arena_picture_id,7777; break;
+			}
+			if (arena_point < 10) {
+				mes "[Givu]";
+				mes "You do not have enough arena points.";
+				mes "Please check the total amount of arena points you have.";
+				close;
+			}
+			mes "[Givu]";
+			if ($@arena_picture_id == 6969)
+				mes "Would you like to take a picture with pretty girls?";
+			else if ($@arena_picture_id == 7777)
+				mes "Would you like to take a picture with a Valkyrie?";
+			else
+				mes "Would you like to take a picture with a "+getmonsterinfo($@arena_picture_id,0)+"?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				set arena_point, arena_point-10;
+				set $@arena_picture,1;
+				enablenpc "#arena_"+$@arena_picture_id+"";
+				movenpc "#arena_"+$@arena_picture_id+"",96,28;
+				if ($@arena_picture_id == 6969) {
+					enablenpc "#arena_ss_2";
+					enablenpc "#arena_ss_3";
+					enablenpc "#arena_ss_4";
+				}
+				donpcevent "npctime#arena::OnStart";
+				mes "[Givu]";
+				mes "Thank you.";
+				close;
+			case 2:
+				mes "[Givu]";
+				mes "Would you like to consider a little longer?";
+				close;
+			}
+		}
+	case 4:
+		mes "[Givu]";
+		mes "Let me check "+strcharinfo(0)+"'s current arena points.";
+		next;
+		mes "[Givu]";
+		mes ""+strcharinfo(0)+" has total ^3131FF"+arena_point+"^000000 points.";
+		close;
 	}
-
-OnInit:
-	set $arenapic,0;
-	end;
 }
 
-prt_are_in,1,1,5	script	#arena_1039	1039,{
+prt_are_in,1,1,5	script	#arena_1039	BAPHOMET,{
 	end;
 
 OnInit:
@@ -828,22 +755,20 @@ OnKis:
 	emotion e_kis,0;
 	end;
 }
-
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_6969	714
-prt_are_in,94,26,5	duplicate(#arena_1039)	#arena_ss_2	714
-prt_are_in,100,28,3	duplicate(#arena_1039)	#arena_ss_3	714
-prt_are_in,102,26,3	duplicate(#arena_1039)	#arena_ss_4	714
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1272	1272
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1046	1046
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1115	1115
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1389	1389
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1492	1492
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1251	1251
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1159	1159
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_7777	811
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_6969	4_F_06
+prt_are_in,94,26,5	duplicate(#arena_1039)	#arena_ss_2	4_F_06
+prt_are_in,100,28,3	duplicate(#arena_1039)	#arena_ss_3	4_F_06
+prt_are_in,102,26,3	duplicate(#arena_1039)	#arena_ss_4	4_F_06
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1272	DARK_LORD
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1046	DOPPELGANGER
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1115	EDDGA
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1389	DRACULA
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1492	INCANTATION_SAMURAI
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1251	KNIGHT_OF_WINDSTORM
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1159	PHREEONI
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_7777	4_F_VALKYRIE
 
 -	script	npctime#arena	-1,{
-
 OnStop:
 	stopnpctimer;
 	end;
@@ -874,9 +799,8 @@ OnTimer9000:
 
 OnTimer10000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
-	donpcevent "#arena_"+$@arenapic+"::OnHeart";
-	if($@arenapic == 6969)
-	{
+	donpcevent "#arena_"+$@arena_picture_id+"::OnHeart";
+	if ($@arena_picture_id == 6969) {
 		donpcevent "#arena_ss_2::OnHeart";
 		donpcevent "#arena_ss_3::OnHeart";
 		donpcevent "#arena_ss_4::OnHeart";
@@ -901,9 +825,8 @@ OnTimer19000:
 
 OnTimer20000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
-	donpcevent "#arena_"+$@arenapic+"::OnSci";
-	if($@arenapic == 6969)
-	{
+	donpcevent "#arena_"+$@arena_picture_id+"::OnSci";
+	if ($@arena_picture_id == 6969) {
 		donpcevent "#arena_ss_2::OnSci";
 		donpcevent "#arena_ss_3::OnSci";
 		donpcevent "#arena_ss_4::OnSci";
@@ -928,9 +851,8 @@ OnTimer29000:
 
 OnTimer30000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
-	donpcevent "#arena_"+$@arenapic+"::OnBest";
-	if($@arenapic == 6969)
-	{
+	donpcevent "#arena_"+$@arena_picture_id+"::OnBest";
+	if ($@arena_picture_id == 6969) {
 		donpcevent "#arena_ss_2::OnBest";
 		donpcevent "#arena_ss_3::OnBest";
 		donpcevent "#arena_ss_4::OnBest";
@@ -955,9 +877,8 @@ OnTimer39000:
 
 OnTimer40000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
-	donpcevent "#arena_"+$@arenapic+"::OnOmg";
-	if($@arenapic == 6969)
-	{
+	donpcevent "#arena_"+$@arena_picture_id+"::OnOmg";
+	if ($@arena_picture_id == 6969) {
 		donpcevent "#arena_ss_2::OnOmg";
 		donpcevent "#arena_ss_3::OnOmg";
 		donpcevent "#arena_ss_4::OnOmg";
@@ -982,9 +903,8 @@ OnTimer49000:
 
 OnTimer50000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
-	donpcevent "#arena_"+$@arenapic+"::OnKik";
-	if($@arenapic == 6969)
-	{
+	donpcevent "#arena_"+$@arena_picture_id+"::OnKik";
+	if ($@arena_picture_id == 6969) {
 		donpcevent "#arena_ss_2::OnKik";
 		donpcevent "#arena_ss_3::OnKik";
 		donpcevent "#arena_ss_4::OnKik";
@@ -1009,9 +929,8 @@ OnTimer59000:
 
 OnTimer60000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
-	donpcevent "#arena_"+$@arenapic+"::OnKis";
-	if($@arenapic == 6969)
-	{
+	donpcevent "#arena_"+$@arena_picture_id+"::OnKis";
+	if ($@arena_picture_id == 6969) {
 		donpcevent "#arena_ss_2::OnKis";
 		donpcevent "#arena_ss_3::OnKis";
 		donpcevent "#arena_ss_4::OnKis";
@@ -1020,89 +939,76 @@ OnTimer60000:
 
 OnTimer62000:
 	mapannounce "prt_are_in","Time is over. Thank you for using my services.",1,0xFFCE00;
-	movenpc "#arena_"+$@arenapic+"",1,1;
+	movenpc "#arena_"+$@arena_picture_id+"",1,1;
 	donpcevent "#arena_1039::OnInit";
-	set $arenapic,0;
+	set $@arena_picture,0;
 	stopnpctimer;
 	end;
 }
 
-sec_in02,72,171,3	script	Picture Manager#arena	802,{
-
-	if (!getgmlevel()) end;
-
-	input .@arena;
-	if(!.@arena)
-	{
+sec_in02,72,171,3	script	Picture Manager#arena	4_NFWISP,{
+	set .@i, callfunc("F_GM_NPC",1357,0);
+	if (.@i == -1) {
 		mes "[Picture Manager]";
 		mes "Command has been canceled.";
 		close;
-	}
-	else if(.@arena == 1357)
-	{
+	} else if (.@i == 0) {
+		mes "[Picture Manager]";
+		mes "Password is incorrect.";
+		close;
+	} else {
 		mes "[Picture Manager]";
 		mes "Would you like to reset Picture Reward variable to 0?";
 		next;
-		switch( select( "Cancel","Yes" ) )
-		{
-			case 1:
-				mes "[Picture Manager]";
-				mes "You have canceled your request.";
-				close;
-
-			case 2:
-				mes "[Picture Manager]";
-				mes "Picture rewarding reseted.";
-				set $arenapic,0;
-				close;
+		switch(select("Cancel:Yes")) {
+		case 1:
+			mes "[Picture Manager]";
+			mes "You have canceled your request.";
+			close;
+		case 2:
+			mes "[Picture Manager]";
+			mes "Picture rewarding reseted.";
+			set $@arena_picture,0;
+			close;
 		}
 	}
-	mes "[Picture Manager]";
-	mes "Password is incorrect.";
-	close;
 }
 
-sec_in02,76,176,5	script	Live Broadcast#arena	802,{
-
+sec_in02,76,176,5	script	Live Broadcast#arena	4_NFWISP,{
+	callfunc "F_GM_NPC";
 	mes "[Live Broadcast]";
-	mes "Currently there are "+getmapusers("force_1-1")+" people in lvl 50s map.";
-	mes "Currently there are "+getmapusers("force_2-1")+" people in lvl 60s map.";
-	mes "Currently there are "+getmapusers("force_3-1")+" people in lvl 70s map.";
-	mes "Currently there are "+getmapusers("force_4-1")+" people in lvl 80s map.";
+	mes "Currently there are "+getmapusers("force_1-1")+" people in Lv 50s map.";
+	mes "Currently there are "+getmapusers("force_2-1")+" people in Lv 60s map.";
+	mes "Currently there are "+getmapusers("force_3-1")+" people in Lv 70s map.";
+	mes "Currently there are "+getmapusers("force_4-1")+" people in Lv 80s map.";
 	mes "Currently there are "+getmapusers("force_1-2")+" people in party map.";
 	mes "Currently there are "+getmapusers("arena_room")+" people in the waiting room.";
 	close;
 }
 
 function	script	Func_Are_Rew	{
-
 	mes "[Givu]";
 	mes "Would you like to exchange your arena points with "+getitemname(getarg(0))+"?";
 	mes "You can exchange ^3131FF"+getarg(2)+" arena points with "+getarg(1)+" "+getitemname(getarg(0))+"^000000.";
 	mes "If you wish to cancel, please enter 0. If you don't, please enter how many ^3131FFtimes^000000 of arena points you wish to spend.";
 	next;
 	input .@reward;
-	if(!.@reward)
-	{
+	if (.@reward == 0) {
 		mes "[Givu]";
 		mes "You have canceled your request.";
 		close;
-
-	}
-	else if(.@reward > 1500)
-	{
+	} else if (.@reward > 1500) {
 		mes "[Givu]";
 		mes "You have exceeded the maximum capacity.";
 		close;
 	}
-	if(arena_point < .@reward * getarg(2))
-	{
+	if (arena_point < .@reward * getarg(2)) {
 		mes "[Givu]";
 		mes "You do not have enough arena points.";
 		mes "Please check the total amount of arena points you have.";
 		close;
 	}
-	set arena_point,arena_point - (.@reward * getarg(2));
+	set arena_point, arena_point - (.@reward * getarg(2));
 	getitem getarg(0),.@reward * getarg(1);
 	mes "[Givu]";
 	mes "Thank you, please come again.";
diff --git a/npc/other/auction.txt b/npc/other/auction.txt
index 899ed11a3..eb4eb7bc4 100644
--- a/npc/other/auction.txt
+++ b/npc/other/auction.txt
@@ -4,8 +4,8 @@
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Auction house releated NPCs, and warps
 //===== Additional Comments: =================================
 //= 1.0 First version, place holders only. [L0ne_W0lf]
@@ -16,19 +16,19 @@
 
 // Auction House warpers
 //============================================================
-moc_ruins,78,173,6	script	Auction Hall Guide#moc	98,{
+moc_ruins,78,173,6	script	Auction Hall Guide#moc	4W_M_02,{
 	callfunc "F_AuctionWarper",1;
 }
 
-prontera,218,120,4	script	Auction Hall Guide#prt	117,{
+prontera,218,120,4	script	Auction Hall Guide#prt	4_F_KAFRA1,{
 	callfunc "F_AuctionWarper",2;
 }
 
-yuno,129,116,0	script	Auction Hall Guide#yuno	90,{
+yuno,129,116,0	script	Auction Hall Guide#yuno	4_F_01,{
 	callfunc "F_AuctionWarper",3;
 }
 
-lighthalzen,205,169,6	script	Auction Hall Guide#lhz	833,{
+lighthalzen,205,169,6	script	Auction Hall Guide#lhz	4_M_ZONDAOYAJI,{
 	callfunc "F_AuctionWarper",4;
 }
 
@@ -44,7 +44,7 @@ function	script	F_AuctionWarper	{
 			mes "Great! Well then,";
 			mes "I hope you have fun";
 			mes "and enjoy the auction~";
-		}else{
+		} else {
 			mes "[Auction Hall Guide]";
 			mes "Enjoy your auction.";
 		}
@@ -77,10 +77,10 @@ function	script	F_AuctionWarper	{
 	close;
 }
 
-moc_ruins,76,176,6	duplicate(AuctionSign)	Information Post#moc	837
-prontera,216,120,4	duplicate(AuctionSign)	Information Post#prt	837
-yuno,131,116,0	duplicate(AuctionSign)	Information Post#yuno	837
-lighthalzen,207,169,6	duplicate(AuctionSign)	Information Post#lhz	837
+moc_ruins,76,176,6	duplicate(AuctionSign)	Information Post#moc	2_BULLETIN_BOARD
+prontera,216,120,4	duplicate(AuctionSign)	Information Post#prt	2_BULLETIN_BOARD
+yuno,131,116,0	duplicate(AuctionSign)	Information Post#yuno	2_BULLETIN_BOARD
+lighthalzen,207,169,6	duplicate(AuctionSign)	Information Post#lhz	2_BULLETIN_BOARD
 
 // Warps
 //============================================================
@@ -102,7 +102,7 @@ auction_02,43,17,0	warp	auction_enterance_lhz	1,1,lighthalzen,209,169
 		mes "Please take";
 		mes "a look, and see";
 		mes "What's being offered~";
-		OpenAuction;
+		openauction;
 		close;
 	}
 	mes "[Auction Broker]";
@@ -114,17 +114,17 @@ auction_02,43,17,0	warp	auction_enterance_lhz	1,1,lighthalzen,209,169
 	close;
 }
 
-auction_01,182,68,6	duplicate(AuctionBroker)	Auction Broker#moc1	98
-auction_01,182,75,0	duplicate(AuctionBroker)	Auction Broker#moc2	99
-auction_01,177,75,2	duplicate(AuctionBroker)	Auction Broker#moc3	98
-auction_01,177,68,4	duplicate(AuctionBroker)	Auction Broker#moc4	99
-auction_01,21,74,4	duplicate(AuctionBroker)	Auction Broker#prt1	117
-auction_01,27,78,4	duplicate(AuctionBroker)	Auction Broker#prt2	116
-auction_01,16,78,4	duplicate(AuctionBroker)	Auction Broker#prt3	115
-auction_02,158,47,6	duplicate(AuctionBroker)	Auction Broker#yuno1	90
-auction_02,145,47,2	duplicate(AuctionBroker)	Auction Broker#yuno2	90
-auction_02,151,54,0	duplicate(AuctionBroker)	Auction Broker#yuno3	90
-auction_02,152,41,4	duplicate(AuctionBroker)	Auction Broker#yuno4	90
-auction_02,57,46,2	duplicate(AuctionBroker)	Auction Broker#lhz1	874
-auction_02,31,46,6	duplicate(AuctionBroker)	Auction Broker#lhz2	874
-auction_02,43,65,4	duplicate(AuctionBroker)	Auction Broker#lhz3	833
+auction_01,182,68,6	duplicate(AuctionBroker)	Auction Broker#moc1	4W_M_02
+auction_01,182,75,0	duplicate(AuctionBroker)	Auction Broker#moc2	4W_M_03
+auction_01,177,75,2	duplicate(AuctionBroker)	Auction Broker#moc3	4W_M_02
+auction_01,177,68,4	duplicate(AuctionBroker)	Auction Broker#moc4	4W_M_03
+auction_01,21,74,4	duplicate(AuctionBroker)	Auction Broker#prt1	4_F_KAFRA1
+auction_01,27,78,4	duplicate(AuctionBroker)	Auction Broker#prt2	4_F_KAFRA2
+auction_01,16,78,4	duplicate(AuctionBroker)	Auction Broker#prt3	4_F_KAFRA3
+auction_02,158,47,6	duplicate(AuctionBroker)	Auction Broker#yuno1	4_F_01
+auction_02,145,47,2	duplicate(AuctionBroker)	Auction Broker#yuno2	4_F_01
+auction_02,151,54,0	duplicate(AuctionBroker)	Auction Broker#yuno3	4_F_01
+auction_02,152,41,4	duplicate(AuctionBroker)	Auction Broker#yuno4	4_F_01
+auction_02,57,46,2	duplicate(AuctionBroker)	Auction Broker#lhz1	4_M_ZONDAMAN
+auction_02,31,46,6	duplicate(AuctionBroker)	Auction Broker#lhz2	4_M_ZONDAMAN
+auction_02,43,65,4	duplicate(AuctionBroker)	Auction Broker#lhz3	4_M_ZONDAOYAJI
diff --git a/npc/other/books.txt b/npc/other/books.txt
index f9ad768a5..6f83ace1b 100644
--- a/npc/other/books.txt
+++ b/npc/other/books.txt
@@ -5,14 +5,14 @@
 //===== Current Version: =====================================
 //= 1.1
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Various Books found in Prontera Library
 //===== Additional Comments: =================================
 //= 1.0 First Version, rescripted to Aegis 10.3 standard. [L0ne_W0lf]
 //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
-prt_in,168,56,4	script	Monster Encyclopedia#prt	111,{
+prt_in,168,56,4	script	Monster Encyclopedia#prt	HIDDEN_NPC,{
 	mes "^FF0000[Monster Encyclopedia]^000000";
 	mes "This is a Monster Encyclopedia";
 	mes "containing information on Water,";
@@ -23,7 +23,7 @@ prt_in,168,56,4	script	Monster Encyclopedia#prt	111,{
 		set .@loop2,1;
 		switch(select("Water Property Monsters:Wind Property Monsters:Spritual Property Monsters:Cancel")) {
 		case 1:
-			while(.@Loop2) {
+			while(.@loop2) {
 				switch(select("Small Sized Monsters:Medium Sized Monsters:Great Sized Monsters:Cancel")) {
 				case 1:
 					mes "^FF0000[Vol. 1: Small Water Monsters]^000000";
@@ -392,7 +392,7 @@ prt_in,168,56,4	script	Monster Encyclopedia#prt	111,{
 	}
 }
 				
-prt_in,159,56,4	script	Monster Encyclopedia#2pr	111,{
+prt_in,159,56,4	script	Monster Encyclopedia#2pr	HIDDEN_NPC,{
 	mes "^FF0000[Monster Encyclopedia]^000000";
 	mes "This is a Monster Encyclopedia";
 	mes "containing information on Earth,";
@@ -1239,7 +1239,7 @@ prt_in,161,50,4	script	Monster Encyclopedia#3pr	 111,{
 	}
 }
 
-prt_in,172,96,4	script	Monster Encyclopedia#4pr	111,{
+prt_in,172,96,4	script	Monster Encyclopedia#4pr	HIDDEN_NPC,{
 	mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
 	mes "This is an Encyclopedia describing";
 	mes "monsters living in Dungeons.";
@@ -1721,7 +1721,7 @@ prt_in,172,96,4	script	Monster Encyclopedia#4pr	111,{
 }
 
 
-prt_in,164,96,4	script	Monster Encyclopedia#5pr	111,{
+prt_in,164,96,4	script	Monster Encyclopedia#5pr	HIDDEN_NPC,{
 	mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
 	mes "This is an Encyclopedia describing";
 	mes "Monsters living in Dungeons.";
@@ -2299,7 +2299,7 @@ prt_in,164,96,4	script	Monster Encyclopedia#5pr	111,{
 	}
 }
 
-prt_in,172,102,4	script	Monster Encyclopedia#6pr	111,{
+prt_in,172,102,4	script	Monster Encyclopedia#6pr	HIDDEN_NPC,{
 	mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
 	mes "This is an Encyclopedia describing";
 	mes "Monsters living in Dungeons.";
@@ -2807,7 +2807,7 @@ prt_in,172,102,4	script	Monster Encyclopedia#6pr	111,{
 	}
 }
 
-prt_in,164,102,4	script	Monster Encyclopedia#7pr	111,{
+prt_in,164,102,4	script	Monster Encyclopedia#7pr	HIDDEN_NPC,{
 	mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
 	mes "This is an Encyclopedia describing";
 	mes "Monsters living in Dungeons.";
@@ -3452,7 +3452,7 @@ prt_in,164,102,4	script	Monster Encyclopedia#7pr	111,{
 	}
 }
 
-prt_in,162,68,4	script	Vending Guide#pront	111,{
+prt_in,162,68,4	script	Vending Guide#pront	HIDDEN_NPC,{
 	mes "^FF0000[Vending Guide for Dummies]^000000";
 	mes "So you want to open your own shop";
 	mes "so that you can sell items to other";
@@ -3549,7 +3549,7 @@ prt_in,162,68,4	script	Vending Guide#pront	111,{
 	close;
 }
 
-prt_in,168,68,4	script	Blacksmith Guide#pront	111,{
+prt_in,168,68,4	script	Blacksmith Guide#pront	HIDDEN_NPC,{
 	mes "^FF0000[Blacksmith Guide for Dummies]^000000";
 	mes "This is a useful guide detailing";
 	mes "the process of Ore Refining and";
diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt
index 7f2a46de3..66e14c577 100644
--- a/npc/other/bulletin_boards.txt
+++ b/npc/other/bulletin_boards.txt
@@ -1,12 +1,14 @@
 //===== Hercules Script ======================================
-//= Official scripts for beginners from iRO
+//= Bulletin Boards
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
-//= 1.8
+//= 1.9
+//===== Description: =========================================
+//= Bulletin Boards for beginners.
 //===== Additional Comments: =================================
 //= 1.0 Added Alberta, Prontera, Izlude, Payon, Byalan Island,
-//= 	Archer Village, Payon Cave and Coal Mine
+//=     Archer Village, Payon Cave and Coal Mine
 //= 1.1 Geffen, Orc Dungeon
 //= 1.2 Added 5 more Boards [MasterOfMuppets]
 //= 1.3 Fixed spelling mistakes. [Nexon]
@@ -16,11 +18,12 @@
 //= 1.5a Fixed a small screw up with the color codes in the Glastheim BB [MasterOfMuppets]
 //= 1.5b Fixed another small screw up with the color codes in the Glastheim BB [Kayla]
 //= 1.6 Removed Duplicates [Silent]
-//= 1.7 Updated MOrroc NPCs to reflect episode 12.1 changes. [L0ne_W0lf]
+//= 1.7 Updated Morroc NPCs to reflect episode 12.1 changes. [L0ne_W0lf]
 //= 1.8 Updated Payon Cave Bulletion Board Locations. [Masao]
+//= 1.9 Moved Izlude NPC to Pre-RE path. [Euphy]
 //============================================================
 
-alberta,111,59,5	script	Bulletin Board#1	837,{
+alberta,111,59,5	script	Bulletin Board#1	2_BULLETIN_BOARD,{
 	mes "[Alberta: The Port City]";
 	mes "Welcome to Alberta, the Port City.";
 	next;
@@ -41,11 +44,11 @@ alberta,111,59,5	script	Bulletin Board#1	837,{
 	next;
 	mes "[Alberta: The Port City]";
 	mes "From Alberta, ^1F3A11Payon^000000 is located to the Northwest. You can board passenger ships at the dock to travel to ^5E5C69Izlude^000000.";
-	mes "Enjoy your travels."; 
+	mes "Enjoy your travels.";
 	close;
 }
 
-geffen,124,65,5	script	Bulletin Board#2	837,{
+geffen,124,65,5	script	Bulletin Board#2	2_BULLETIN_BOARD,{
 	mes "[Geffen: The City of Magic]";
 	mes "Welcome to Geffen, the City of Magic. Geffen is well known for its various legends related to magic.";
 	next;
@@ -63,7 +66,7 @@ geffen,124,65,5	script	Bulletin Board#2	837,{
 	close;
 }
 
-gef_fild10,69,340,5	script	Bulletin Board#3	837,{
+gef_fild10,69,340,5	script	Bulletin Board#3	2_BULLETIN_BOARD,{
 	mes "[Orc Dungeon]";
 	mes "^6B1312Caution!^000000";
 	mes "The Orc Dungeon is comprised of 2 levels. Although not very strong individually, the monsters here attack in groups. Be careful.";
@@ -79,7 +82,7 @@ gef_fild10,69,340,5	script	Bulletin Board#3	837,{
 	close;
 }
 
-izlu2dun,104,92,5	script	Bulletin Board#4	837,{
+izlu2dun,104,92,5	script	Bulletin Board#4	2_BULLETIN_BOARD,{
 	mes "[Byalan Island]";
 	mes "^6B1312Caution!^000000";
 	mes "The Izlude dungeon is comprised of 5 levels. The first few levels are suited for newer adventurers.";
@@ -91,24 +94,8 @@ izlu2dun,104,92,5	script	Bulletin Board#4	837,{
 	mes "With a few exceptions, most of the monsters in this dungeon are of the Water attribute. Therefore, a Wind attribute weapon will help you greatly";
 	close;
 }
-	
-izlude,131,116,4	script	Bulletin Board#5	837,{
-	mes "[Izlude: The Satellite City]";
-	mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population";
-	next;
-	mes "[Izlude: The Satellite City]";
-	mes "Points of interest include the Swordsman Association building which allows adventurers to change their job to Swordsman, and the Battle Area that is North of Izlude.";
-	next;
-	mes "[Izlude: The Satellite City]";
-	mes "At the docks, you may take a ship and travel to ^123972Alberta^000000 or ^2F0400Byalan Island^000000.";
-	next;
-	mes "[Izlude: The Satellite City]";
-	mes "From Izlude, ^6D6FE0Prontera^000000 is located to the Northwest, and ^1F3A11Payon^000000 is located to the South.";
-	mes "Enjoy your travels in the Rune-Midgarts Kingdom.";
-	close;
-}
-	
-payon,178,108,5	script	Bulletin Board#06	837,{
+
+payon,178,108,5	script	Bulletin Board#06	2_BULLETIN_BOARD,{
 	mes "[Payon: The Mountain City]";
 	mes "Welcome to Payon, the mountain city. Payon has recently been renovated, so we hope you enjoy the clean, nice streets and buildings.";
 	next;
@@ -126,12 +113,12 @@ payon,178,108,5	script	Bulletin Board#06	837,{
 	next;
 	mes "[Payon: The Mountain City]";
 	mes "From Payon, ^123972Alberta^000000 is located to the Southeast, and ^866C4BMorroc^000000 is to the West. ^5E5C69Izlude^000000 and ^6D6FE0Prontera^000000 are North of Payon.";
-	mes "Enjoy your travels."; 
+	mes "Enjoy your travels.";
 	close;
 }
-	
-pay_arche,79,31,5	script	Bulletin Board#07	837,{
-	mes "[Archer Village]"; 
+
+pay_arche,79,31,5	script	Bulletin Board#07	2_BULLETIN_BOARD,{
+	mes "[Archer Village]";
 	mes "Welcome to the Payon Archer Village where Novices can change their jobs to Archer.";
 	next;
 	mes "[Archer Village]";
@@ -142,7 +129,7 @@ pay_arche,79,31,5	script	Bulletin Board#07	837,{
 	close;
 }
 
-pay_arche,39,134,5	script	Bulletin Board#08	837,{
+pay_arche,39,134,5	script	Bulletin Board#08	2_BULLETIN_BOARD,{
 	mes "[Payon Cave]";
 	mes "^6B1312Caution!^000000";
 	mes "Payon Cave consists of 5 levels full of Undead and Demon monsters. Beware of swarms of Hydra in the third and fourth levels.";
@@ -151,8 +138,8 @@ pay_arche,39,134,5	script	Bulletin Board#08	837,{
 	mes "In the fifth level, there is a pretty, yet dreadful boss monster known as ^6B1312Moonlight^000000 that spawns at certain times. Approach with extreme caution.";
 	close;
 }
-	
-prontera,148,49,5	script	Bulletin Board#09	837,{
+
+prontera,148,49,5	script	Bulletin Board#09	2_BULLETIN_BOARD,{
 	mes "[Prontera: Capital of the]";
 	mes "[Rune-Midgards Kingdom]";
 	mes "Welcome to Prontera, the capital city of Rune-Midgard.";
@@ -180,11 +167,11 @@ prontera,148,49,5	script	Bulletin Board#09	837,{
 	mes "[Prontera: Capital of the]";
 	mes "[Rune-Midgards Kingdom]";
 	mes "From Prontera, ^5E5C69Izlude^000000 is located to the Southeast, ^1F3A11Payon^000000 to the far South, ^683C1FGeffen^000000 to the far West and ^2D3832Al De Baran^000000 to the far North.";
-	mes "Enjoy Your time in Prontera.";
+	mes "Enjoy your time in Prontera.";
 	close;
 }
 
-mjolnir_02,76,362,5	script	Bulletin Board#10	837,{
+mjolnir_02,76,362,5	script	Bulletin Board#10	2_BULLETIN_BOARD,{
 	mes "[Coal Mine]";
 	mes "^6B1312Caution!^000000";
 	mes "The Coal Mine consists of a total of 3 levels. This dungeon is suited to both new and experienced adventurers, depending on the dungeon level.";
@@ -194,7 +181,7 @@ mjolnir_02,76,362,5	script	Bulletin Board#10	837,{
 	close;
 }
 
-morocc,152,110,5	script	Bulletin Board#11	837,{
+morocc,152,110,5	script	Bulletin Board#11	2_BULLETIN_BOARD,{
 	mes "[Morroc: The Frontier Town]";
 	mes "Welcome to Morroc, the City of the Desert. Morroc was built on an oasis, so this town can accomodate its many visitors and travelers.";
 	next;
@@ -209,7 +196,7 @@ morocc,152,110,5	script	Bulletin Board#11	837,{
 	close;
 }
 
-comodo,210,148,5	script	Bulletin Board#12	837,{
+comodo,210,148,5	script	Bulletin Board#12	2_BULLETIN_BOARD,{
 	mes "[Comodo: The Beach City]";
 	mes "Welcome! This town of Comodo is";
 	mes "surrounded by many ancient relics";
@@ -253,7 +240,7 @@ comodo,210,148,5	script	Bulletin Board#12	837,{
 	close;
 }
 
-umbala,137,94,5	script	Bulletin Board#13	837,{
+umbala,137,94,5	script	Bulletin Board#13	2_BULLETIN_BOARD,{
 	mes "[Umbala: The Utan Village]";
 	mes "Welcome to Umbala,";
 	mes "the village of the Utan tribe.";
@@ -285,7 +272,7 @@ umbala,137,94,5	script	Bulletin Board#13	837,{
 	close;
 }
 
-gef_fild09,227,29,4	script	Bulletin Board::OrcsBoard	835,{
+gef_fild09,227,29,4	script	Bulletin Board::OrcsBoard	2_BOARD1,{
 	mes "[Orc Village]";
 	mes "^6B1312Caution!^000000";
 	mes "Beyond this point";
@@ -300,9 +287,9 @@ gef_fild09,227,29,4	script	Bulletin Board::OrcsBoard	835,{
 	close;
 }
 
-gef_fild13,202,31,5	duplicate(OrcsBoard)	Bulletin Board#orc1	835
+gef_fild13,202,31,5	duplicate(OrcsBoard)	Bulletin Board#orc1	2_BOARD1
 
-gef_fild13,29,206,5	script	Bulletin Board::KoboldsBoard	836,{
+gef_fild13,29,206,5	script	Bulletin Board::KoboldsBoard	2_BOARD2,{
 
 	mes "[Kobold Village]";
 	mes "^6B1312Caution!^000000";
@@ -311,9 +298,9 @@ gef_fild13,29,206,5	script	Bulletin Board::KoboldsBoard	836,{
 	close;
 }
 
-gef_fild08,211,24,5	duplicate(KoboldsBoard)	Bulletin Board#kb1	836
+gef_fild08,211,24,5	duplicate(KoboldsBoard)	Bulletin Board#kb1	2_BOARD2
 
-gef_fild10,109,23,5	script	Bulletin Board#15	836,{
+gef_fild10,109,23,5	script	Bulletin Board#15	2_BOARD2,{
 
 	mes "[Goblin Village]";
 	mes "^6B1312Caution!^000000";
@@ -322,7 +309,7 @@ gef_fild10,109,23,5	script	Bulletin Board#15	836,{
 	close;
 }
 
-prt_fild05,278,220,5	script	Bulletin Board#16	837,{
+prt_fild05,278,220,5	script	Bulletin Board#16	2_BULLETIN_BOARD,{
 	mes "[Culvert]";
 	mes "Culvert is comprised of a total of";
 	mes "4 levels, and is a good training";
@@ -345,7 +332,7 @@ prt_fild05,278,220,5	script	Bulletin Board#16	837,{
 	close;
 }
 
-yuno,154,112,5	script	Bulletin Board#17	837,{
+yuno,154,112,5	script	Bulletin Board#17	2_BULLETIN_BOARD,{
 	mes "[Juno: Capital of]";
 	mes "[The Schwarzwald Republic]";
 	mes "Welcome to Juno, the City of Sages.";
@@ -388,7 +375,7 @@ yuno,154,112,5	script	Bulletin Board#17	837,{
 	close;
 }
 
-aldebaran,145,105,5	script	Bulletin Board#18	837,{
+aldebaran,145,105,5	script	Bulletin Board#18	2_BULLETIN_BOARD,{
 	mes "[Al De Baran: The Border City]";
 	mes "Welcome to Al De Baran, the border";
 	mes "city of the Rune-Midgarts Kingdom.";
@@ -419,7 +406,7 @@ aldebaran,145,105,5	script	Bulletin Board#18	837,{
 	close;
 }
 
-aldebaran,136,133,5	script	Bulletin Board#19	837,{
+aldebaran,136,133,5	script	Bulletin Board#19	2_BULLETIN_BOARD,{
 	mes "[Clock Tower]";
 	mes "^6B1312Caution!^000000";
 	mes "Only well-experienced adventurers";
@@ -441,7 +428,7 @@ aldebaran,136,133,5	script	Bulletin Board#19	837,{
 	close;
 }
 
-moc_fild19,107,101,5	script	Bulletin Board#20	837,{
+moc_fild19,107,101,5	script	Bulletin Board#20	2_BULLETIN_BOARD,{
 	mes "[Sphinx]";
 	mes "^6B1312Caution!^000000";
 	mes "The Sphinx consists of 5 levels.";
@@ -462,10 +449,9 @@ moc_fild19,107,101,5	script	Bulletin Board#20	837,{
 	close;
 }
 
-gef_tower,55,142,5	script	Bulletin Board#21	837,{
-
+gef_tower,55,142,5	script	Bulletin Board#21	2_BULLETIN_BOARD,{
 	mes "[Geffen Dungeon]";
-	mes "^6B1312Caution!^000000"; 
+	mes "^6B1312Caution!^000000";
 	mes "Geffen dungeon is consisted of 3 levels";
 	mes "is too difficult for new adventurers to venture.";
 	mes "As main monsters constantly appear,";
@@ -480,8 +466,7 @@ gef_tower,55,142,5	script	Bulletin Board#21	837,{
 	close;
 }
 
-xmas_fild01,75,80,5	script	Bulletin Board#22	837,{
-
+xmas_fild01,75,80,5	script	Bulletin Board#22	2_BULLETIN_BOARD,{
 	mes "[Winter Town, Lutie]";
 	mes "Welcome to Lutie, the town of snowfall.";
 	mes "Manufacturing toys in the toy factory is the main";
@@ -496,8 +481,7 @@ xmas_fild01,75,80,5	script	Bulletin Board#22	837,{
 	close;
 }
 
-xmas,147,311,5	script	Bulletin Board#23	837,{
-
+xmas,147,311,5	script	Bulletin Board#23	2_BULLETIN_BOARD,{
 	mes "[Toy Factory]";
 	mes "^6B1312Caution!^000000";
 	mes "Toy Factory is consisting of 2 levels.";
@@ -512,8 +496,7 @@ xmas,147,311,5	script	Bulletin Board#23	837,{
 	close;
 }
 
-yuno_fild03,37,143,5	script	Bulletin Board#24	837,{
-
+yuno_fild03,37,143,5	script	Bulletin Board#24	2_BULLETIN_BOARD,{
 	mes "[The Magma Dungeon, Nogg Road]";
 	mes "^6B1312Caution!^000000";
 	mes "Nogg Road is filled with very dangerous creatures.";
@@ -526,8 +509,7 @@ yuno_fild03,37,143,5	script	Bulletin Board#24	837,{
 	close;
 }
 
-niflheim,200,191,5	script	Bulletin Board#25	837,{
-
+niflheim,200,191,5	script	Bulletin Board#25	2_BULLETIN_BOARD,{
 	mes "[City of the Dead, Nifflheim]";
 	mes "Welcome to Nifflheim, the City of the Dead.";
 	mes "Nifflheim was known as the other world where";
@@ -552,8 +534,7 @@ niflheim,200,191,5	script	Bulletin Board#25	837,{
 }
 
 /*
-moc_fild15,267,264,5	script	Bulletin Board#26	837,{
-
+moc_fild15,267,264,5	script	Bulletin Board#26	2_BULLETIN_BOARD,{
 	mes "[Ant Hell]";
 	mes "^6B1312Caution!^000000";
 	mes "Ant Hell is consisting of 2 levels.";
@@ -569,8 +550,7 @@ moc_fild15,267,264,5	script	Bulletin Board#26	837,{
 }
 */
 
-moc_ruins,61,164,5	script	Bulletin Board#27	837,{
-
+moc_ruins,61,164,5	script	Bulletin Board#27	2_BULLETIN_BOARD,{
 	mes "[Pyramids]";
 	mes "^6B1312Caution!^000000";
 	mes "Pyramids is consisting of total 7 levels as 4 levels on the earth and the rest under the ground.";
@@ -583,8 +563,7 @@ moc_ruins,61,164,5	script	Bulletin Board#27	837,{
 	close;
 }
 
-glast_01,369,308,5	script	Bulletin Board#28	837,{
-
+glast_01,369,308,5	script	Bulletin Board#28	2_BULLETIN_BOARD,{
 	mes "[Glast Heim]";
 	mes "Glast Heim is an enormous dungeon with countless levels.";
 	mes "This dungeon is definately not for new or experienced adventurers";
diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt
index e451a596e..8838bafb9 100644
--- a/npc/other/card_trader.txt
+++ b/npc/other/card_trader.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 //= Card Trader
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Elias (og2)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Card and Points Trader
-//===== Additional Comments: ================================= 
-//= v1.0 Translated from the Official [Elias]
-//= v1.1 Fixed variables and optimized script [Elias]
-//= v1.2 Fixed char being stuck with breaks [Elias] (bugreport:5374)
-//= v1.3 Optimized: reduced from 123kb to 7kb! [Euphy]
-//= v1.4 Variables don't need to load OnInit. [Euphy]
-//============================================================ 
+//===== Additional Comments: =================================
+//= 1.0 Translated from the Official [Elias]
+//= 1.1 Fixed variables and optimized script [Elias]
+//= 1.2 Fixed char being stuck with breaks [Elias] (bugreport:5374)
+//= 1.3 Optimized: reduced from 123kb to 7kb! [Euphy]
+//= 1.4 Variables don't need to load OnInit. [Euphy]
+//============================================================
 
-prontera,115,90,0	script	Putty	90,{
+prontera,115,90,0	script	Putty	4_F_01,{
 	if (!.card[1]) {
 		setarray .card1[0], 4001,4006,4009,4019,4075,4033,4012,4016,4026,4022,
 					4027,4028,4038,4025,4021,4050,4079,4081,4090,4094,
@@ -193,4 +193,4 @@ prontera,115,90,0	script	Putty	90,{
 		break;
 		}
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index 188066181..28a2e799d 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -3,12 +3,12 @@
 //===== By: ==================================================
 //= Reddozen, Cypress, Zefris
 //===== Current Version: =====================================
-//= 1.4
+//= 1.4a
 //===== Description: =========================================
 //= Comodo Gambling: Win random Items with 3 Carat Diamonds.
 //===== Additional Comments: =================================
 //= 0.1- so far just a basic setup, and working on the function
-//= 0.2- fixed some spelling errors and set zeny,zeny - (@amount * 55000)[Cypress]
+//= 0.2- fixed some spelling errors and Zeny -= (@amount * 55000)[Cypress]
 //= 0.3- Revised the gambling NPC using the official Aegis script [MasterOfMuppets]
 //=      for information. Thanks to Zefris for doing it for me.
 //= 0.4- Fixed an exploit. thanks to reddozen [MasterOfMuppets]
@@ -21,10 +21,15 @@
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.3 Added missing item. [Kisuka]
 //= 1.4 Updated Script to match AEGIS file. [Masao]
-//============================================================ 
+//= 1.4a Minor script updates. [Euphy]
+//============================================================
 
-comodo,219,158,6	script	Kachua	91,{
+comodo,219,158,6	script	Kachua	4_F_02,{
 
+	if (checkweight(1201,1) == 0) {
+		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
+		close;
+	}
 	cutin "katsua01.bmp",2;
 
 	mes "[Kachua]";
@@ -45,7 +50,7 @@ comodo,219,158,6	script	Kachua	91,{
 		cutin "katsua01.bmp",255;
 		end;
 	}
-	
+
 	if (countitem(732) == 0) {
 		cutin "katsua01.bmp",255;
 		cutin "katsua03.bmp",2;
@@ -57,7 +62,7 @@ comodo,219,158,6	script	Kachua	91,{
 		cutin "katsua03.bmp",255;
 		end;
 	}
-	
+
 	mes "[Kachua]";
 	mes "Are you sure you don't mind";
 	mes "giving this to me? Thank you";
@@ -67,7 +72,7 @@ comodo,219,158,6	script	Kachua	91,{
 	mes "collections~";
 	next;
 	
-	if (Weight >= MaxWeight/2) {
+	if (MaxWeight - Weight < 5500) {
 		cutin "katsua01.bmp",255;
 		cutin "katsua03.bmp",2;
 		mes "[Kachua]";
@@ -79,21 +84,21 @@ comodo,219,158,6	script	Kachua	91,{
 		cutin "katsua03.bmp",255;
 		end;
 	}
-	
+
 	if (countitem(732) == 0) { // anti-hack
 		logmes "Hack: Tried to bypass item check.";
 		cutin "katsua01.bmp",255;
 		close;
 	}
 	delitem 732,1;
-	
+
 	mes "[Kachua]";
 	mes "So what would";
 	mes "you like to have?";
 	next;
-	
+
 	switch (select("Weapon", "Armor", "Garment", "Helmet", "Shoes", "Shield")) {
-	
+
 	case 1: // Weapons
 			set .@gamble1,rand(1,1000);
 			if ((.@gamble1 > 920) && (.@gamble1 < 931)) {
@@ -387,7 +392,7 @@ comodo,219,158,6	script	Kachua	91,{
 	end;
 }
 
-comodo,204,148,7	script	Devellin	90,{
+comodo,204,148,7	script	Devellin	4_F_01,{
 
 	mes "[Devellin]";
 	mes "It seems some traveller showed";
@@ -401,7 +406,7 @@ comodo,204,148,7	script	Devellin	90,{
 	close;
 }
 
-comodo,210,154,2	script	Suspicious Guy#cmd	118,{
+comodo,210,154,2	script	Suspicious Guy#cmd	2_M_THIEFMASTER,{
 
 	if (BaseClass == Job_Thief){
 		mes "[Cain]";
@@ -469,7 +474,7 @@ comodo,210,154,2	script	Suspicious Guy#cmd	118,{
 			next;
 			mes "[Cain]";
 			mes "I guess it can't hurt to gather some Diamonds there and try to exchange them for whatever the old lady's got. Take care, pal~";
-			set Zeny,Zeny-500;
+			Zeny -= 500;
 			close;
 		}
 		mes "[Cain]";
@@ -484,11 +489,9 @@ comodo,210,154,2	script	Suspicious Guy#cmd	118,{
 	}
 }
 
-mjolnir_02,85,362,3	script	Blacksmith Miner	726,{
+mjolnir_02,85,362,3	script	Blacksmith Miner	4_F_JOB_BLACKSMITH,{
 
-	if(checkweight(1201,1) == 0)
-	{
-		mes "[Kachua]";
+	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
 	}
@@ -501,7 +504,7 @@ mjolnir_02,85,362,3	script	Blacksmith Miner	726,{
 	mes "thousands of Diamonds,";
 	mes "all of them mine!";
 	mes "I'm rich!";
-	emotion 18;
+	emotion e_heh;
 	next;
 	switch(select("I want to buy some.:Congratulations.")){
 	case 1:
@@ -551,7 +554,7 @@ mjolnir_02,85,362,3	script	Blacksmith Miner	726,{
 			mes "I don't think give you anything if there's no room in your inventory. Why don't you put some of your stuff into Kafra Storage?";
 			close;
 		}
-		set Zeny,Zeny - .@cost;
+		Zeny -= .@cost;
 		getitem 732,.@amount;
 		mes "[Dwayne]";
 		mes "Thank you for";
@@ -569,4 +572,4 @@ mjolnir_02,85,362,3	script	Blacksmith Miner	726,{
 		mes "you at a cheap price.";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt
index 1511a68b2..c95589d74 100644
--- a/npc/other/divorce.txt
+++ b/npc/other/divorce.txt
@@ -1,28 +1,28 @@
-//===== Hercules Script ====================================== 
+//===== Hercules Script ======================================
 //= Divorcing Deviruchi
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Perkka, Scriptor, LightFighter
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Official Divorce script.
 //= Added isloggedin() check, even though Aegis doesn't do it;
 //= should be able to divorce even when the spouse is not online.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Both players should be online to get divorced
 //= Fixed menu [Lupus]
 //= 1.1 Added check if the patner's online, added effects [Lupus]
 //= 1.2 Updated to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.2a Commented out check of 'wedding_sign' to let
-//=		old married players divorcing, optimized, fixed a bug [Lupus]
+//=     old married players divorcing, optimized, fixed a bug [Lupus]
 //= 1.3 Wedding variable 'wedding_sign' is now unset on divorce. [L0ne_W0lf]
 //= 1.4 Removed ifpartneron check, fixed typo in percentheal. [L0ne_W0lf]
 //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-nif_in,190,112,5	script	Deviruchi#divorce	738,{
+nif_in,190,112,5	script	Deviruchi#divorce	4_DEVIRUCHI,{
 	mes "[Deviruchi]";
 //	if (wedding_sign == 0) {
 //		mes "Heh heh...";
@@ -38,11 +38,11 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 //		mes "popular nowadays, heh heh~";
 //		close;
 //	}
-//	else 
-  	if (!getpartnerid()) {
+//	else
+	if (!getpartnerid()) {
 		mes "Bwah hah hah~!";
 		mes "That look in your eyes~!";
-		if (sex) {
+		if (Sex) {
 			mes "Those are definitely the eyes";
 			mes "of a lonely male bachelor.";
 			mes "I'm almost 100 percent sure";
@@ -74,7 +74,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 	mes "I sense that you carry a";
 	mes "tiresome burden...";
 	mes "If I'm not wrong, you're";
-	if (sex)
+	if (Sex)
 		mes "a married man, aren't you?";
 	else
 		mes "a married woman, aren't you?";
@@ -97,7 +97,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 	mes "At the end of the day, you and";
 	mes "your partner fight, and you feel";
 	mes "totally totally miserable.";
-	if (sex)
+	if (Sex)
 		mes "...all because of HER.";
 	else
 		mes "...all because of HIM.";
@@ -121,7 +121,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 	mes "[Deviruchi]";
 	mes "*whispers*";
 	mes "^555555It's not like you're breaking^000000";
-	if (sex) {
+	if (Sex) {
 		mes "^555555any promises, and it's not";
 		mes "like your wife will care if she";
 		mes "doesn't know... Don't you";
@@ -169,7 +169,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 		mes "[Deviruchi]";
 		mes "I understand. But if you think";
 		mes "about anything, think about";
-		if (sex) {
+		if (Sex) {
 			mes "your wife's nagging, and";
 			mes "how great it would be to";
 			mes "finally free yourself of the";
@@ -194,7 +194,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 		specialeffect EF_MAGICROD;
 		specialeffect2 EF_DEVIL;
 		set wedding_sign,0;
-		set zeny,zeny-2500000;
+		Zeny -= 2500000;
 		percentheal -100,-100;
 		divorce;
 		mes "[Deviruchi]";
diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt
index 485273f25..a596377d1 100644
--- a/npc/other/fortune.txt
+++ b/npc/other/fortune.txt
@@ -4,14 +4,16 @@
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
 //===== Description: =========================================
-//= [Aegis conversion]
+//= [Official Conversion]
 //= Fortune teller NPC. Displays random Card image.
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //============================================================
 
-payon_in03,117,128,5	script	Fortune Teller	704,{
+payon_in03,117,128,5	script	Fortune Teller	4_M_BIBI,{
 	mes "[Lhimetorra]";
 	mes "You're an adventurer of this world... " +strcharinfo(0)+ ", right? So, what can an old person like me do for you?";
 	next;
@@ -37,7 +39,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 				mes "You have angered the monster spirits!";
 				close;
 			}
-			else if (.@input > zeny) {
+			else if (.@input > Zeny) {
 				mes "[Lhimetorra]";
 				mes "There's no need to overdo it. Just give with all your heart... *Tsk tsk*";
 				close;
@@ -45,7 +47,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 			else {
 				mes "[Lhimetorra]";
 				mes "I accept your heart and your devotion with my gratitude. Thoughts are more important than the amount when paying a fortune teller.";
-				set zeny,zeny-.@input;
+				Zeny -= .@input;
 			}
 			next;
 			mes "[Lhimetorra]";
@@ -66,7 +68,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 				next;
 				set .@card_1_love,rand(1,74);
 				if (.@card_1_love == 1) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " You are afraid to show yourself working, to your loved one.. ";
 					mes " But that is not love. Do not be afraid to show different sides of yourself to your loved one.. ";
@@ -76,7 +78,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 2) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " Maybe you are using love as an excuse to work? The card is saying to try observing love from a different perspective. ";
 					next;
@@ -85,7 +87,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 3) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " How about taking a break from love and giving yourself time to relax.. I agree with what the card is saying. ";
 					next;
@@ -94,7 +96,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 4) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " A shovel..? ";
 					next;
@@ -107,7 +109,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 5) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " Its pure eyes look at a loved one but cannot recognize them, the wings flutter towards the loved one, but it helplessly stays in one place, ";
 					mes " it calls its loved one, but they cannot hear.. ";
@@ -118,7 +120,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 6) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " The passion of love like a raging wave... You can't even hide it. ";
 					mes " With such passionate love, isn't there only one way..? ";
@@ -128,13 +130,13 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 7) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " The teeth of dustiness are very strong. This means.. use your teeth for victory?! ";
 					next;
 				}
 				if (.@card_1_love == 8) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " The card is telling me, 'Fly to your loved one as if you were a butterfly and shoot at it as if you were a star.' ";
 					mes "..even though it doesn't sound like something a moth would say. ";
@@ -144,7 +146,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 9) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " Perhaps the person you believe to be a butterfly is actually a moth. This fortune is awaiting a prudent judgement. ";
 					next;
@@ -153,7 +155,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 10) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " The one you love will give you a kiss of death. ";
 					mes " The irresistable kiss.. It is up to you to decide whether to avoid it or not. ";
@@ -163,7 +165,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 11) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " You are looking at a wonderful person, but their eyes are fixed in darkness. ";
 					mes " How about trying to grab their attention? ";
@@ -173,7 +175,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 12) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Your love needs fresh blood. Healthy exercises and eating habits are necessary! ";
 					mes " You must change your living pattern first. ";
@@ -183,7 +185,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 13) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Don't you think you are infatuated by outer appearance and gambling with love? You might have to be more careful about it this time. ";
 					next;
@@ -192,13 +194,13 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 14) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Become a pirate of love! It is a simple, yet strong fortune! ";
 					next;
 				}
 				if (.@card_1_love == 15) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " No matter how romantic and beautiful love is, if it is not rightful, it is undesirable.. ";
 					mes " is what this card means. ";
@@ -208,7 +210,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 16) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " In the rough sea called the world, only pirates, the outlaws of love, are the law. ";
 					mes " This card supports strong love. ";
@@ -218,7 +220,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 17) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " It is a warning not to get involved in false love like pirated editions! ";
 					mes " You may have to reconsider your love right now. ";
@@ -228,7 +230,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 18) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " This is praising the type of love that is always there, yet barely has a form as if it does not exist. ";
 					mes " Are you involved this type of love? ";
@@ -238,7 +240,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 19) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " You must be careful. Love is quietly approaching and spreading poison. Be careful of the poison of love. ";
 					next;
@@ -247,7 +249,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 20) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " Aren't you already caught in love that you cannot run away from? Look around you. ";
 					mes " You might be captured inside invisible walls. ";
@@ -257,7 +259,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 21) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " This fortune is saying that love is.. approaching wobbly and softly~ and then bam~ embracing it. ";
 					mes " Very romantic. Hehe. ";
@@ -267,7 +269,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 22) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " This card is warning you to not treat your loved one like a puppet. ";
 					mes " You're not doing this, are you? ";
@@ -277,7 +279,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 23) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " Dolls understand a human's heart more than a human. Try treating your loved one as if they were a doll. ";
 					next;
@@ -286,7 +288,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 24) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " If you are afraid to look into a doll's eyes, that is because there is a dark shadow covering your love. ";
 					mes " Rid yourselves of that shadow. Then the doll will smile as well. ";
@@ -296,7 +298,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 25) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " Dolls become accustomed to the owner the more they are handled. Give your doll more attention. ";
 					mes " The doll is craving attention. A lot of attention. ";
@@ -306,7 +308,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 26) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " Do you fear the snake hair of a Medusa? However, love cannot be achieved with fear. ";
 					mes " You must move forward! ";
@@ -316,7 +318,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 27) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " Warriors that hastily attacked the Medusa all failed, but the one hero that used a mirror succeeded. ";
 					mes " You cannot succeed in love with brute force. You must use wisdom. ";
@@ -326,7 +328,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 28) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " Must you love the one that has hair of snakes? Reconsider this love and think about it earnestly. ";
 					next;
@@ -335,7 +337,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 29) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " It is a hint saying that a strong hairstyle is the key to turning over the situation. Change your hairstyle! ";
 					next;
@@ -344,7 +346,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 30) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " Love must have two things: great strength and the will to live. Have you thought about whether or not you can overcome this with your current self? ";
 					next;
@@ -353,7 +355,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 31) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " A scythe may seem burdensome but a strong Baphomet can freely use it. ";
 					mes " It is the same concept. If you are ready, any type of love is possible. There is no such thing as impossible. ";
@@ -363,7 +365,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 32) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " Love must have two things: great strength and the will to live. Have you thought about whether or not you can overcome this with your current self? ";
 					next;
@@ -372,7 +374,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 33) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " There are those who are born, destined to run into this wall, an obstacle. Your love seems to have reached that wall.. It must be hard. ";
 					next;
@@ -381,7 +383,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 34) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " This Baphomet looks as if it is having a hard time. The person must be exhausted even if it may not seem so. ";
 					next;
@@ -390,7 +392,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 35) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " Can't you hear the cry of the card? It is suffering. Love is like that.. ";
 					next;
@@ -399,7 +401,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 36) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " Your love right now is so bored that it is yawning. How about trying something fresh and new? ";
 					next;
@@ -408,7 +410,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 37) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " Deep sleep brings happiness and dreams. I think what you need right now is sleep. ";
 					next;
@@ -417,7 +419,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 38) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " I feel some sort of emptiness.. Maybe there is a gap in your love? ";
 					next;
@@ -426,7 +428,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 39) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Even a traditional beauty can seem cold to others. Try looking at your loved one from a different point of view. ";
 					next;
@@ -435,7 +437,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 40) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " They may seem dreary and ominous but their attire is spotless. They show devotion to the other. ";
 					mes " Even though you are not satisfied with your love right now, take a look at their attire. ";
@@ -445,7 +447,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 41) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " There is a person you must not deal with thoughtlessly nearby. Don't say or do anything carelessly. You must be careful when dealing with this person. ";
 					next;
@@ -454,7 +456,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 42) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Even if the wind blows and the trail of her clothes flutter, her posture never changes. Loving a person with that type of heart will bring goodwill and happiness. ";
 					next;
@@ -463,7 +465,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 43) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " That lightens and attacks with a pickaxe! You must aggressively move forward. What do you think? Your fortune is a good one. ";
 					next;
@@ -472,7 +474,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 44) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " The card only shows gaunt bones, but notice how it has all the necessary tools?";
 					mes " Even though your love right now may seem as if there is nothing to it, it has everything you need. ";
@@ -482,7 +484,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 45) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " It has a lantern on its back and even in its hand.. it believes one light is insufficient. ";
 					mes " If you are only shining one type of light to your loved one, shining another might help. ";
@@ -492,7 +494,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 46) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " You know the smile of Mona Lisa.. Perhaps the person you are looking at has the same expression? ";
 					next;
@@ -501,7 +503,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 47) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " A knight on a horse is a fantasy in every person's heart. Make it so that this fantasy becomes real. ";
 					next;
@@ -510,7 +512,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 48) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " Is that soldier waiting to attack? I can feel great tension between the horse and knight. ";
 					mes " Don't run forward carelessly. Raise your sword and wait for your chance. ";
@@ -520,7 +522,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 49) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " He is falling asleep awaiting a battle. Is it because he is laid back, or simply pathetic? Depends on the situation I suppose. ";
 					mes " But you've got to give him credit for his boldness. ";
@@ -530,7 +532,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 50) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " Very favorable. It's to a point that I can feel strong energy from the card. I will give some of this energy to you. ";
 					next;
@@ -539,7 +541,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 51) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " What does the god of death have to say about love? It is something ominous for sure. ";
 					next;
@@ -548,7 +550,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 52) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " Hmm. How about giving a cute puppy as a gift? One with a round nose. Then they will surely be happy. ";
 					next;
@@ -557,7 +559,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 53) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " I can tell what it was doing from the way it is crying while holding an axe with blood. It is deeply wounded by love. ";
 					next;
@@ -566,7 +568,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 54) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The pattern of the clothes symbolizes a warning. It is saying to be careful of love. ";
 					next;
@@ -575,7 +577,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 55) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " He is a warning you not to drool over someone else. ";
 					next;
@@ -584,7 +586,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 56) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " Who is he so fiercly gazing at with those grand muscles? He is looking at someone else for sure. ";
 					next;
@@ -593,7 +595,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 57) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " Strengthen your body and observe the target. That is the step to success. ";
 					next;
@@ -602,7 +604,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 58) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " His navel is very pretty. You have to meet someone with that type of navel to be happy. ";
 					next;
@@ -611,7 +613,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 59) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " You'll get hurt if you mess around. This card is giving you a piece of advice. ";
 					next;
@@ -620,7 +622,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 60) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " From the way he is massaging its back because of a shoulder cramp, maybe your love is seeking someone to massage them. Love starts from little thoughts.";
 					next;
@@ -629,7 +631,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 61) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " His expression is in awe. When encountering an absurd incident, his face and expression becomes peculiarly distorted. ";
 					mes " I think the one you are looking towards has that type of expression. ";
@@ -639,13 +641,13 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 62) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " If the lover does something wrong he pokes them with a needle. How scary.. ";
 					next;
 				}
 				if (.@card_1_love == 63) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " A person's heart is like this card. If you flip it over nobody can tell what is behind it. Try turning the person's card over. ";
 					next;
@@ -654,7 +656,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 64) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Jokers are sly, but that is just because it is their habit. ";
 					mes " The reason the person may seem capricious or cunning is partially because they are born like that. ";
@@ -664,7 +666,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 65) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " The joker can't use any of his strength because he is tied to a card. Perhaps the person is caught in something and can't show their true merit? ";
 					next;
@@ -673,7 +675,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 66) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Don't get fooled by tricks. They are a person, too. They know how to lie once in a while. Search for the trick calmly and carefully. ";
 					next;
@@ -682,7 +684,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 67) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " It is saying that daring action is necessary, such as that of the Hode that strikes up from the sand. ";
 					next;
@@ -691,7 +693,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 68) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " Seeing that the Hode spits out sand to those who bother them, you must have done something to bother the person somehow. ";
 					next;
@@ -700,7 +702,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 69) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " The Hode has a very strong will to live. It is to survive in the forest. It is suggesting dating with that kind of will.";
 					next;
@@ -709,7 +711,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 70) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " Ah.. there is a noble person up north. North it is. This direction will never change. ";
 					next;
@@ -718,7 +720,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 71) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " A walking bull is rare. The person you are looking towards is that rare. Don't let go of them. You may never see them again.. ";
 					next;
@@ -727,7 +729,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 72) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " Can you see the strong muscles that even arrows cannot pierce? The person is like that, too. ";
 					next;
@@ -736,7 +738,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 73) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " The scariest thing is not the hammer nor horn. It is the massive legs that support its heavy weight. Nobody can survive a hit by those legs. The person is also probably hiding the most dangerous part. ";
 					next;
@@ -745,7 +747,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_love == 74) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " No matter how fearful the bull may be, if it has a nose ring, it has already been tamed by humans. No matter how astonishing that person may be, taming is your responsibility. ";
 					next;
@@ -756,7 +758,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 				mes "[Lhimetorra]";
 				mes " You seeked advice about love. ";
 				mes " Even if you may not pleased with it, consider it calmly and make an effort to find true happiness. ";
-				cutin "°¡À̾ƽºÄ«µå",255;
+				cutin "°¡À̾ƽºÄ«µå",255; // Giearth Card
 				next;
 				mes "[Lhimetorra]";
 				mes " Then... ";
@@ -768,7 +770,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 				next;
 				set .@card_1_money,rand(1,73);
 				if (.@card_1_money == 1) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " You must work hard to become wealthy. Don't think of other things.. Focus on and put effort into achieving your goals. ";
 					next;
@@ -777,7 +779,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 2) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " Something very rare may come your way. A gold mine has been the dream of many since ancient times. You have a gold mine right in front of you. ";
 					next;
@@ -786,7 +788,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 3) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " In the stomach pocket, there must be a secret treasure. There may be something in your pocket as well. ";
 					next;
@@ -795,7 +797,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 4) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " The card says that you should not be too greedy, for that may cause you to dig your own grave. ";
 					next;
@@ -804,7 +806,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 5) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " Did you know that a moth's wings has infinite amounts of powder on it? A moth symbolizes wealth in the sense that it can gather wealth just as the powder on its wings. ";
 					next;
@@ -813,7 +815,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 6) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " You must work hard to become wealthy. Don't think of other things. Simply focusing on your goals putting effort into it will help. ";
 					next;
@@ -822,7 +824,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 7) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " There is a common saying that when a moth flaps its wings, wealth will fly away as well. It's not a very good sign. ";
 					next;
@@ -831,7 +833,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 8) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " Dustiness teeth are very strong. This means.. ";
 					next;
@@ -840,7 +842,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 9) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " When a dustiness flies around, a big expense comes up. You may need to spend some money soon. ";
 					next;
@@ -849,7 +851,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 10) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Dracula brings in money. Maybe it is the moral influence from when it was a count. It is expensive to be a vampire, but I've never seen a poor one before. ";
 					next;
@@ -858,7 +860,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 11) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " To Dracula, money is not important. Blood is more valuable. To you, money must not be that important. You don't need to be concerned about money. ";
 					next;
@@ -867,7 +869,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 12) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Dracula mocks human's money. To him it is worthless. ";
 					next;
@@ -876,7 +878,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 13) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Drake Card
 					mes "[Lhimetorra]";
 					mes " No matter what, stealing is wrong! Even if a Drake blesses you in the name of pirates! Stealing is forbidden! ";
 					next;
@@ -885,7 +887,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 14) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Drake Card
 					mes "[Lhimetorra]";
 					mes " You will gather good fortune in a secretive and peculiar way.. Although, there seems to be shadows over some parts of your life. ";
 					next;
@@ -894,7 +896,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 15) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Drake Card
 					mes "[Lhimetorra]";
 					mes " The reason pirates indulge in others assets in the vast rough ocean, is because it is the only way to let the people of the land know of their existence. ";
 					next;
@@ -903,7 +905,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 16) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " Marina prefers clean funds. It hates suspicious money. Your possessions should be clean as well. ";
 					next;
@@ -912,7 +914,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 17) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " The Marina gathers money quietly, little by little, and freely roaming at the same time. That's the real way to make money. The Marina is suggesting this method to you. ";
 					next;
@@ -921,7 +923,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 18) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " The Marina is not interested in money. The card suggests that you will resemble these traits as well. You will enjoy life apart from money. ";
 					next;
@@ -930,7 +932,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 19) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " You will gather money swiftly and quietly, then boom~ blow it all at once. ";
 					next;
@@ -939,7 +941,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 20) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The Marionette treasures art over wealth. Bear that in mind. Honor over assets. ";
 					next;
@@ -948,7 +950,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 21) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The Marionette likes shiny money. Not dull money, but the shiny kind. ";
 					next;
@@ -957,7 +959,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 22) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The Marionette requires lots of money. Its expenditures are enormous. You must have many expenditures ahead of you. ";
 					next;
@@ -966,7 +968,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 23) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The Marionette uses a lot of money. There is someone around you that is like that, too. ";
 					next;
@@ -975,7 +977,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 24) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The hair of the Medusa symbolizes the amount of wealth. Seems as if something good will happen to you, young one. ";
 					next;
@@ -984,7 +986,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 25) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The hair of the Medusa are all snakes. Snakes symbolize greed and slyness. When gathering things, it seems as if a cunning force will join you. It's not exactly a bright sign.. ";
 					next;
@@ -993,7 +995,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 26) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The Medusa is strongly recommending saving. This card is telling you to save. It says to put many savings accounts in your hair and make yourself resemble its head shape. ";
 					next;
@@ -1002,7 +1004,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 28) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The Medusa does not enjoy playing with money. If you are attempting to use money other than the way it should be used, you should stop. Why? ";
 					next;
@@ -1011,7 +1013,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 29) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The great strength of the Baphomet brings in fortune. It seems as if you will be able to gather much wealth with the aid of the Baphomet's force! ";
 					next;
@@ -1020,7 +1022,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 30) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The scythe of the Baphomet means a strong tool to gather wealth. If you have a strong tool like his, it should be easy to gather wealth. ";
 					next;
@@ -1029,13 +1031,13 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 31) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " How about getting involved in raising cattle? It seems like you can gather much wealth through it. ";
 					next;
 				}
 				if (.@card_1_money == 32) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The Baphomet would like a tribute. He is saying that if you do, he will return great benefits. ";
 					next;
@@ -1044,7 +1046,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 33) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " The Sandman cries with sadness when money comes up. It is sad because money does not possess love or affection. ";
 					next;
@@ -1053,7 +1055,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 34) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " The Sandman is screaming because it saw too much money. It saw the money in the hands of your future. I wonder what all that money is? ";
 					next;
@@ -1062,7 +1064,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 35) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " The Sandman's body is empty inside. Your wallet seems to be emtpy, too. You should save up some money. ";
 					next;
@@ -1071,7 +1073,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 36) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " Money is like sand. Even if you save it, once the wind blows, it disappears. This card shows the emptiness of money. ";
 					next;
@@ -1080,7 +1082,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 37) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Sohee is wearing a fine article. To wear something like that, you would need plenty of money. Do you know what the secret is? Sohee saved very much when she was once alive. ";
 					next;
@@ -1089,7 +1091,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 38) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Sohee hates misers. She believes she has become like that because of a miser. Don't be stingy in front of Sohee! ";
 					next;
@@ -1098,7 +1100,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 39) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Sohee dislikes the wealthy. They try to gather money, but never use it for others. If you don't want to be cursed by Sohee, you need to learn how to be generous with money. ";
 					next;
@@ -1107,7 +1109,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 40) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Sohee likes foreign money. They are cute and pretty. If you have foreign currency, Sohee will love you. ";
 					next;
@@ -1116,7 +1118,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 41) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " Those who work hard will gather great fortune. The Skeleton says diligent work will help greatly in gathering wealth. ";
 					next;
@@ -1125,7 +1127,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 42) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " Its youth is gone after a lifetime of chasing after gold. It became a monster with only bones left. No matter how much you like money and your work, look after your life as well. ";
 					next;
@@ -1134,7 +1136,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 43) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " To become rich, you must work hard as if you became a skeleton. The Skeleton is saying to work hard until you become a skeleton. ";
 					next;
@@ -1143,7 +1145,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 44) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " The Skeleton says that you can make money by going north. Go north. ";
 					next;
@@ -1152,7 +1154,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 45) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " A knight is a job that requires a lot of money. A hint of a big expense. You might want to tighten your belt. ";
 					next;
@@ -1161,7 +1163,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 46) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " Knights do not fight for money. If they did, they would be a mercenary. A knight reaches for something higher. What the knight wants to tell you is the way to live. ";
 					next;
@@ -1170,7 +1172,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 47) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " A knight values honor more than fortune. They consider discussing wealth itself dirty not worthy. How would you be able to ask such a knight a fortune about wealth? ";
 					next;
@@ -1179,7 +1181,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 48) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " You need to think of an ideal more noble than money. The fortune the knight suggests is this: Knights never speak of ways to make money. ";
 					next;
@@ -1188,7 +1190,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 49) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " Working hard is the only way to gather wealth; don't get sidetracked and put effort into working will help your fortune. ";
 					next;
@@ -1197,7 +1199,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 50) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " What does the god of death have to say about wealth? It is surely a bad omen. It is trying to warn something. ";
 					next;
@@ -1206,7 +1208,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 51) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The Anubis is very interested in the sacrifices offered. The offerings he likes are youth and effort. ";
 					next;
@@ -1215,7 +1217,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 52) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The Anubis is giving a warning of the west. There is a being there that can break away your wealth. ";
 					next;
@@ -1224,7 +1226,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 53) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The Anubis hates those who try to gather money for his death. He believes it's a waste of money. Don't make the mistake of gathering money for death. ";
 					next;
@@ -1233,7 +1235,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 54) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord possesses much wealth. It's because of greed. Greed is essential in collecting money. The desire and greediness to make money is not something to be ashamed about. Be diligent and go make money. ";
 					next;
@@ -1242,7 +1244,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 55) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord starts drooling about anything involving money. He targets anybody with money. ";
 					next;
@@ -1254,7 +1256,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 56) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " There should be great wealth awaiting in the direction the Orc Lord's horn is pointing. The card is directing towards.. ";
 					next;
@@ -1263,7 +1265,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 57) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord likes gold. Of all the treasures, gold is the best. Closely watch gold. ";
 					next;
@@ -1272,7 +1274,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 58) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack makes money through jokes. Others' happiness is the key to his wealth. ";
 					next;
@@ -1281,7 +1283,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 59) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack likes fun money. He detests sad and burdensome money. ";
 					mes " He always says this. Light-hearted and easy money isn't dangerous even if it piles up. ";
@@ -1291,7 +1293,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 60) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack thinks of money as a foolish item. But somehow he makes that kind of money. ";
 					mes " That's why those who are controlled by fools consider the other a fool, too. ";
@@ -1302,7 +1304,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 61) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack is asking for money. Don't be stingy about paying those who bring entertainment and fun. ";
 					next;
@@ -1311,7 +1313,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 62) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Do you know what a joker's specialty is? It is tricking others and making money. Be wary of the joker. ";
 					next;
@@ -1320,7 +1322,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 63) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " The Joker says if you let him borrow money, he will repay you with more. You're going to refuse, right? But the Joker's temptation does not end after one try. ";
 					mes " He will linger around you as a neighbor, or a rare item and ask for money. ";
@@ -1330,7 +1332,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 64) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Even if a joker asks for change, never give any to him. He will ask for change, then end up ask for a big sum of money. ";
 					mes " Jokers are like that. They have the ability to turn a small mistake into a big calamity. ";
@@ -1340,7 +1342,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 65) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " There is only one reason a Joker requests money.. to take yours. ";
 					mes " His goal is not to become rich. A real foul playful one. ";
@@ -1350,7 +1352,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 66) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " Hodes do not know about money. They just gobble everything up. But that might be the shortcut to gaining great wealth. ";
 					next;
@@ -1359,7 +1361,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 67) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " Hodes do not know anything about money. But they do not forgive those who have an eye on their things. ";
 					mes " Not being greedy and taking care of your share is the wisest way to manage your wealth. ";
@@ -1369,7 +1371,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 68) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " The Hode knows nothing about money. But a very rare item drops from a Hode's body. ";
 					mes " It has a treasure in it without knowing. ";
@@ -1379,7 +1381,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 69) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " Hodes are strong even though they live in the desert. Just because the environment is poor, doesn't mean that you can't gather wealth. ";
 					next;
@@ -1388,7 +1390,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 70) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " Do you know the saying that says those who work like bulls become rich? Working hard is the best way. ";
 					next;
@@ -1397,7 +1399,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 71) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " Bulls only know how to work, but the bull itself has a lot to offer. Meat, leather, horn.. ";
 					next;
@@ -1406,7 +1408,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 72) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " Bulls continue to work even on gloomy days. Then they can gather a lot of things. ";
 					next;
@@ -1415,7 +1417,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_money == 73) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " Bulls do not like working for money. They are disgruntled when others consider labor as money. ";
 					mes " Shouldn't you reconsider working against your will just for money? ";
@@ -1427,7 +1429,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 				mes " Most people are curious about money. ";
 				mes " It is a very humanly and common curiosity. Cards are very stingy about fortunes regarding wealth. ";
 				next;
-				cutin "°¡À̾ƽºÄ«µå",255;
+				cutin "°¡À̾ƽºÄ«µå",255; // Giearth Card
 				mes "[Lhimetorra]";
 				mes " Therefore, getting a fortune like this is considered being lucky. Use this fortune to prosper. ";
 				break;
@@ -1438,7 +1440,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 				next;
 				set .@card_1_future,rand(1,67);
 				if (.@card_1_future == 1) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " Youth is not eternal. At one point when you wake up, you realize you are already a middle-aged worker. ";
 					mes " Even reminiscing about the past over a cup of coffee can't bring back time. ";
@@ -1448,7 +1450,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 2) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " This fortune is foreshadowing that you will become a strong and healthy worker in the future. ";
 					mes " Not a normal worker, but one that has great strength and might.. ";
@@ -1458,7 +1460,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 3) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " Smoking in a mine is an imprudent, life-threatening thing to do. You are wasting your precious life with that kind of behavior. ";
 					next;
@@ -1467,7 +1469,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 4) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " You may be shoveling in the future. In a dark dark place, shoveling that requires great strength. You must be careful young one. ";
 					next;
@@ -1476,7 +1478,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 5) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " The moth is used when it is a caterpillar and ignored after it becomes a moth, by humans. ";
 					mes " Which is better? ";
@@ -1486,7 +1488,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 6) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " The moth flies around without worrying about the future. It is telling you to fly freely rather than getting anxious about the future.. ";
 					next;
@@ -1495,7 +1497,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 7) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " Dustiness' teeth are very strong. This means... ";
 					next;
@@ -1504,7 +1506,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 8) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " The moth says that this is not a time to think about wealth and prosperity. It says that someone important has appeared near you. ";
 					next;
@@ -1513,7 +1515,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 9) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " Dustiness symbolizes a hazy future. It is similar to your mind right now. It says it is obvious. ";
 					mes " It says that there is no set path in the future. Isn't a relief in a way? ";
@@ -1523,7 +1525,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 10) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Sometime in your future, a future like Dracula awaits you. ";
 					next;
@@ -1532,7 +1534,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 11) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " If the condition is just right, vampires can live forever. But, when that perfect condition is disrupted, they meet a tragic end. ";
 					next;
@@ -1541,7 +1543,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 12) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " The Dracula says to be true to the present. Indeed, thinking and being true to the present is much more important than trying to figure out your future. ";
 					next;
@@ -1550,7 +1552,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 13) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Drake Card
 					mes "[Lhimetorra]";
 					mes " Pirates do not have a future. That doesn't mean you do not have one. But.. you simply need to make more prudent decisions. ";
 					next;
@@ -1559,7 +1561,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 14) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Drake Card
 					mes "[Lhimetorra]";
 					mes " In this world, being a pirate out in the rough seas is very dangerous. But, they do not regret their decisions. ";
 					next;
@@ -1568,7 +1570,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 15) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Drake Card
 					mes "[Lhimetorra]";
 					mes " Pirates are remembered as pirates even after they pass away. A person's name is beyond the matter of life and death. ";
 					next;
@@ -1577,7 +1579,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 16) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " The Marina does not think of its future.. But I can tell you one thing. Survival. The Marina only thinks about survival and life. ";
 					next;
@@ -1586,7 +1588,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 17) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " The Marina doesn't think of its future.. but I can tell you one thing. Freedom. The Marina swims freely. ";
 					next;
@@ -1595,7 +1597,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 18) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " Leave your future to the Marina. The Marina treasures its precious ocean. The sea will be of great significance in your future, too. ";
 					next;
@@ -1604,7 +1606,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 19) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " A Marionette is a Marionette forever. Its past and future never changes. Its present is its future. Don't you think it is rather sad? ";
 					next;
@@ -1613,7 +1615,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 20) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " A Marionette is restrained but it has hope that it will be freed one day. ";
 					next;
@@ -1622,7 +1624,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 21) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The eyes of a Marionette symbolize 'challenge.' Challenge will mean a lot in your future. ";
 					next;
@@ -1631,7 +1633,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 22) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The Marionette believes the present is more important than the future. Basically, asking about the future is pointless. ";
 					next;
@@ -1640,7 +1642,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 23) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The Medusa symbolizes the absolute one who accepts everyone's challenge. Your future will be in a position that is challenged by many. ";
 					next;
@@ -1649,7 +1651,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 24) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The Medusa symbolizes the absolute one who accepts everyone's challenge. Your future must be filled with challenges! ";
 					next;
@@ -1658,7 +1660,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 25) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The Medusa says that there will be great chaos in the future. Chaos... I'm not sure what type of chaos it means, but it is definitely something that has never happened before. ";
 					next;
@@ -1667,7 +1669,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 26) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The hair of the Medusa are sticking up. It is nervous about the big change that is going to happen. A change that even makes the scary Medusa worried. ";
 					next;
@@ -1676,7 +1678,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 27) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The Baphomet doesn't care about a human's future. They simply observe quietly. Hmm... It seems like it has nothing to say about your future as well... ";
 					next;
@@ -1685,7 +1687,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 28) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The scythe the Baphomet is holding signifies the strong will to conquer the future. ";
 					mes " What you need is not someone else's help or wisdom, but strong willpower. ";
@@ -1695,7 +1697,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 29) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The Baphomet says that humans have no future. It says that their greed and selfishness shows no hope. ";
 					mes " The future will only open to those that go beyond human's greed. ";
@@ -1705,7 +1707,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 30) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The Baphomet is facing the future. No matter how much effort you put in, without an eye that looks towards the future, it is pointless. ";
 					mes " The Baphomet is telling you to look towards the future. ";
@@ -1715,7 +1717,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 31) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " A sand's future is simply sand. Not a rock, nor mud. Some things just don't change young one. ";
 					next;
@@ -1724,7 +1726,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 32) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " A sand dune changes its shape even after a day. The Sandman card is speaking of a future with many changes. ";
 					next;
@@ -1733,7 +1735,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 33) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " You will have a son in the future. Hmm? What'd you say? No plans for a baby? ";
 					next;
@@ -1742,7 +1744,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 34) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " There are rare and precious treasures in the sand. The Sandman says that in the vast sand of the world, a treasure, will be discovered. That treasure is you young one.";
 					next;
@@ -1751,7 +1753,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 35) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Do you know what a Sohee thinks the most pitiful thing is? The future. It is because she was not able to live her future. ";
 					mes " That is why you cannot bring up the subject of future in front of Sohee. I'm very sorry I cannot help. ";
@@ -1761,7 +1763,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 36) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " Even in darkness you will shine for your goal. ";
 					mes " The Skeleton is encouraging you to not lose your light even in a life in dark and damp places. ";
@@ -1771,7 +1773,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 37) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " The story I heard from the skeleton goes like this. I am the king of the future. What in the world is that supposed to mean? ";
 					next;
@@ -1780,7 +1782,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 38) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " If you want to do something great in the future, you must express your thankfulness to the Skeleton. ";
 					mes " Then the Skeleton will help you. How do you express your thankfulness? ";
@@ -1791,7 +1793,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 39) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " The Skeleton has the ability to dig where it feels the future, rather than looking into it. ";
 					mes " It is digging in the east right now. How about it, won't you try going there? ";
@@ -1801,7 +1803,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 40) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " A knight's future leads to death. An honorable death on the battlefield. ";
 					mes " One cannot live as a knight without being proud of that type of future. ";
@@ -1812,7 +1814,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 41) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " A knight commenting about a person's future is very rare. ";
 					mes " It says nothing for you in particular. Nothing ominous. ";
@@ -1822,7 +1824,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 42) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " A knight commenting about a person's future is very rare. ";
 					mes " It says it will say one thing for you. Dark clouds can be seen beyond the clear skies. ";
@@ -1832,7 +1834,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 43) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " It is necessary to reflect upon the past and present in order to look into the future. This card says to look carefully into your past. ";
 					next;
@@ -1841,7 +1843,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 44) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " What does the god of death want to say about the future? It is definitely an ominous sign. ";
 					next;
@@ -1850,7 +1852,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 45) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The Anubis likes comedy despite people's expectations. It looks forward to comedy. Comedy must be important in the future. ";
 					next;
@@ -1859,7 +1861,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 46) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The Anubis is the god of death, but it expresses more interest in the future than death. ";
 					next;
@@ -1868,7 +1870,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 47) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The Anubis says it has no interest in you. It is a good sign. ";
 					next;
@@ -1877,7 +1879,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 48) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord says that dairy farming will develop in the future. Why don't you invest in it as well? ";
 					next;
@@ -1886,7 +1888,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 49) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord says you need great strength in the future. Strength that is three, four times greater than now. ";
 					next;
@@ -1895,7 +1897,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 50) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord says that love for your companions will become great strength in the future. ";
 					mes " Your strength is not enough. ";
@@ -1905,7 +1907,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 51) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord is expressing opposition in being too curious about the future. ";
 					mes " Pay a little more attention to the present. ";
@@ -1915,7 +1917,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 52) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack says something interesting will happen in the future. According to him, the future will be more fun than the present. ";
 					next;
@@ -1924,7 +1926,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 53) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack says, in order to prepare for the future, a delightful preparation is necessary. ";
 					mes " Delightful preparation? I don't understand.. I suppose I am too old. Maybe young ones get it.. ";
@@ -1934,7 +1936,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 54) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack is jealous because a splendid person is headed your way in the future. ";
 					mes " I wonder what type of person it is to make that Jack jealous! ";
@@ -1944,7 +1946,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 56) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack says you may be frustrated in the future. ";
 					mes " He says to overcome the frustration, it is necessary to think of happy thoughts. ";
@@ -1954,7 +1956,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 57) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " The Joker is trying to trick you. This card has all different types of ominous fortunes. ";
 					mes " He wants to enjoy watching you tremble with anxiety. ";
@@ -1964,7 +1966,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 58) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Jokers don't just appear and go away. They come back in the future. ";
 					mes " They will seduce you numerous times. ";
@@ -1975,7 +1977,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 59) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Do you see the thing that looks like a leaf flying around the Joker? That is the spade mark. ";
 					mes " Spades means death. Jokers leave those kinds of marks on purpose. ";
@@ -1985,7 +1987,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 60) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Joker offers a nice insurance and says to prepare for the future, but most of it is a waste of time. ";
 					next;
@@ -1994,7 +1996,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 61) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " Hodes do not know about tomorrow. But though they are quiet, they endanger other living things. ";
 					mes " Effort into oneself puts great power into the mere existence of one. ";
@@ -2004,7 +2006,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 62) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " Hodes do not know about tomorrow, but they still know about death. ";
 					mes " Even though you may be honest and simple, in a time of a crisis, you must be alert. ";
@@ -2014,7 +2016,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 62) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " Hodes do not ponder about life, but their will to live is very strong.";
 					mes " You can gain a lot simply through the will to hold on to life. ";
@@ -2024,7 +2026,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 63) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " Hodes are afraid of crises. You should try not to be afraid of crises either. ";
 					next;
@@ -2033,7 +2035,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 64) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " Before, bulls used to be thought of as foolishly honest workers, but these days bulls are great strong fighters. ";
 					next;
@@ -2042,7 +2044,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 65) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " Do bulls leave leather when they pass away? Or was it the tiger? ";
 					mes " Anyways, he is jealous of the humans that leave their name in history. ";
@@ -2053,7 +2055,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 66) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " It might seem funny that a bull will look into the future, but the bull is looking into your future right now. ";
 					mes " He says your future is mixed with storms and fall weather. ";
@@ -2063,7 +2065,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_future == 67) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " The bull thinks of the happiness awaiting in the future, but it doesn't like reduced efficiency because of that happiness. ";
 					next;
@@ -2076,19 +2078,19 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 				mes " Speaking of the future is as dangerous act. ";
 				mes " Humans may face disaster if speaking of the future carelessly. That's why we ask cards about the future. ";
 				next;
-				cutin "°¡À̾ƽºÄ«µå",255;
+				cutin "°¡À̾ƽºÄ«µå",255; // Giearth Card
 				mes "[Lhimetorra]";
 				mes " Your fortune is a rather good one. There are some in this world who get more horrible fortunes. ";
 				mes " Use this fortune as a support in your life. Ok? ";
 				break;
-			//================================================================= Warning ===
+			//=================================================================Warning ===
 			case 4:
 				mes "[Lhimetorra]";
 				mes " Someone that knows of the dangers you do not, will warn you in the form of cards... so listen carefully-! ";
 				next;
 				set .@card_1_warning,rand(1,70);
 				if (.@card_1_warning == 1) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " Do you see the forbidden mark on its shoulder? It is telling you to not do something. ";
 					next;
@@ -2097,7 +2099,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 2) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " Someone is after you. The person is very strong like the picture. They might be holding grudges against you. ";
 					next;
@@ -2106,19 +2108,19 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 3) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " It is saying to be careful not to burn your mustache with a cigarette. When you do something, something is always at risk.. It is probably warning about that. ";
 					next;
 				}
 				if (.@card_1_warning == 4) {
-					cutin "°¡À̾ƽºÄ«µå",4;
+					cutin "°¡À̾ƽºÄ«µå",4; // Giearth Card
 					mes "[Lhimetorra]";
 					mes " 'Be careful of shoveling'.. You might get hit by a shovel. Should you be careful around a construction site? ";
 					next;
 				}
 				if (.@card_1_warning == 5) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " The sound of a moth's wings fluttering means chaos. A chaotic event may occur around you. ";
 					next;
@@ -2127,7 +2129,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 6) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " Be aware of the wings. Wings symbolize flight, adventure, and fickleness of a player. ";
 					next;
@@ -2136,43 +2138,43 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 7) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " The teeth of Dustiness are very strong. This means.. Someone may attempt to bite you with their teeth?! ";
 					next;
 				}
 				if (.@card_1_warning == 8) {
-					cutin "´õ½ºÆ¼³×½ºÄ«µå",4;
+					cutin "´õ½ºÆ¼³×½ºÄ«µå",4; // Dustiness Card
 					mes "[Lhimetorra]";
 					mes " The moth's warning: 'Dangerous!'. A very simple, yet obvious warning. ";
 					next;
 				}
 				if (.@card_1_warning == 9) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Dracula says, 'Be careful in the streets at night.' ";
 					next;
 				}
 				if (.@card_1_warning == 10) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Dracula says, 'Don't be too picky.' ";
 					next;
 				}
 				if (.@card_1_warning == 11) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Dracula says, 'Brush your teeth 3 times a day.' Make sure you brush your teeth! ";
 					next;
 				}
 				if (.@card_1_warning == 12) {
-					cutin "µå¶óÅ¥¶óÄ«µå",4;
+					cutin "µå¶óÅ¥¶óÄ«µå",4; // Dracula Card
 					mes "[Lhimetorra]";
 					mes " Dracula says, 'Study the important points first.' Cramming will not work! ";
 					next;
 				}
 				if (.@card_1_warning == 13) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Drake Card
 					mes "[Lhimetorra]";
 					mes " If you see the flag of a pirate, either run or do as they say. Pirates do not give more than one warning. ";
 					next;
@@ -2181,7 +2183,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 14) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Drake Card
 					mes "[Lhimetorra]";
 					mes " Pirates give warnings about many things. But right now, this card is speaking of betrayal. ";
 					next;
@@ -2190,25 +2192,25 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 15) {
-					cutin "µå·¹ÀÌÅ©Ä«µå",4;
+					cutin "µå·¹ÀÌÅ©Ä«µå",4; // Drake Card
 					mes "[Lhimetorra]";
 					mes " The pirate is warning you of your beauty. Don't show off your beauty too much. Pirates are very jealous of appearance, as well. ";
 					next;
 				}
 				if (.@card_1_warning == 16) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " The Marina is warning of a hot stinging poison. Be cautious of poison. ";
 					next;
 				}
 				if (.@card_1_warning == 17) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " The Marina is warning about a lazy lifestyle. It says such a lifestyle will lead to something like itself. ";
 					next;
 				}
 				if (.@card_1_warning == 18) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " The Marina doesn't really think about anything else.. But it will say one thing. Food. The Marina loves food. ";
 					next;
@@ -2217,20 +2219,20 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 19) {
-					cutin "¸¶¸®³ªÄ«µå",4;
+					cutin "¸¶¸®³ªÄ«µå",4; // Marina Card
 					mes "[Lhimetorra]";
 					mes " The Marina is warning about a big belly. It's not happy because it resembles itself.. How about losing some weight? ";
 					next;
 				}
 				if (.@card_1_warning == 20) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The Marionette says that you must not rely on violence and to use a different method. ";
 					mes " I'm not quite sure, but it may become an important word of advice to you..? ";
 					next;
 				}
 				if (.@card_1_warning == 21) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The Marionette is warning about ominous activities. If you did something recently, you should settle it soon. ";
 					next;
@@ -2239,7 +2241,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 22) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The Marionette's eyes are warning about your falsehood. Lies, deceit, fake calculations and actions.. The Marionette is warning about all of them. ";
 					next;
@@ -2248,7 +2250,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 23) {
-					cutin "¸¶¸®¿À³×Ʈīµå",4;
+					cutin "¸¶¸®¿À³×Ʈīµå",4; // Marionette Card
 					mes "[Lhimetorra]";
 					mes " The Marionette is emphasizing a proper diet. Don't rely too much on meat. ";
 					next;
@@ -2257,7 +2259,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 24) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The Medusa punishes those who challenge it without warning. Unexpected punishment. ";
 					next;
@@ -2266,7 +2268,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 25) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The Medusa is warning you to be nice to others, or else it will turn you into stone.";
 					next;
@@ -2275,7 +2277,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 26) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The Medusa is warning you to return anything you borrow on time. ";
 					mes " Saying it will not forgive those who use other's things like a black hole.. borrowing and never returning ";
@@ -2285,7 +2287,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 27) {
-					cutin "¸ÞµÎ»çÄ«µå",4;
+					cutin "¸ÞµÎ»çÄ«µå",4; // Medusa Card
 					mes "[Lhimetorra]";
 					mes " The Medusa is warning about a person near you. Of their existence.. and the relationship, ";
 					next;
@@ -2294,7 +2296,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 28) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The Baphomet says to beware when intervening with others' issues. ";
 					next;
@@ -2303,7 +2305,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 29) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The Baphomet is warning about arrogance. Even a strong and wise warrior must show respect to a Baphomet, ";
 					mes " Arrogance takes away that respect. The Baphomet hates that type of arrogance. ";
@@ -2313,7 +2315,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 30) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The Baphomet is warning about the laziness that stops one from sharpening the scythe. ";
 					mes " That laziness will cause you to lose your life in an instant. ";
@@ -2323,13 +2325,13 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 31) {
-					cutin "¹ÙÆ÷¸ÞƮīµå",4;
+					cutin "¹ÙÆ÷¸ÞƮīµå",4; // Baphomet Card
 					mes "[Lhimetorra]";
 					mes " The Baphomet says it has nothing to say. I wonder why? Isn't it a very good sign?!! ";
 					next;
 				}
 				if (.@card_1_warning == 32) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " Sand is an instant cure of athlete's foot. He says to beware of athlete's foot and that he hates those rubbing their infected feet into his body. ";
 					next;
@@ -2338,7 +2340,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 33) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " A chicken puts sand in its mouth to aid its insufficient digestion system. ";
 					mes " The Sandman says to watch out before you become like a chicken. ";
@@ -2348,7 +2350,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 34) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " The Sandman says over-sleepers will be punished by society! ";
 					next;
@@ -2357,7 +2359,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 35) {
-					cutin "»÷µå¸ÇÄ«µå",4;
+					cutin "»÷µå¸ÇÄ«µå",4; // Sandman Card
 					mes "[Lhimetorra]";
 					mes " One warning from the Sandman, respect your parents. ";
 					next;
@@ -2366,7 +2368,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 36) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Sohee dislikes stinky feet. Don't forget to wash your feet. ";
 					next;
@@ -2375,7 +2377,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 37) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Sohee stands on the tip of her toes. It is because her toes are very strong. ";
 					mes " No matter what a person does, physical strength is the most important. Exercise and get stronger. ";
@@ -2385,7 +2387,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 38) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Look at Sohee's hairstyle. Isn't it splendid. ";
 					mes " Sohee likes to take care of her appearance. If you don't, Sohee will get mad at you. ";
@@ -2396,7 +2398,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 39) {
-					cutin "¼ÒÈñÄ«µå",4;
+					cutin "¼ÒÈñÄ«µå",4; // Sohee Card
 					mes "[Lhimetorra]";
 					mes " Once, Sohee didn't get her change back when she asked a baby ghost to run an errand. ";
 					mes " No can do! Always return the change. ";
@@ -2406,7 +2408,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 40) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " Even though it is a skeleton with only bones, it has all the safety gear needed. ";
 					next;
@@ -2415,7 +2417,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 41) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " The skeleton card has a gray tone. If you read the grey, you can see the darkness. ";
 					mes " It seems like darkness is on its way. Be careful, this darkness isn't ordinary. ";
@@ -2425,7 +2427,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 42) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " The skeleton is warning you about an irregular eating pattern. ";
 					mes " It says it became like that because of a bad eating habit. ";
@@ -2435,7 +2437,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 43) {
-					cutin "½ºÄÌ¿öÄ¿Ä«µå",4;
+					cutin "½ºÄÌ¿öÄ¿Ä«µå",4; // Skel Worker Card
 					mes "[Lhimetorra]";
 					mes " The skeleton's pickaxe is very strong. Even though its body seems weak, with the right tools, it can do great things. ";
 					next;
@@ -2444,14 +2446,14 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 44) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " The knight is warning you of reckless driving. Do you ride a Pecopeco by any chance? ";
 					mes " Anyhow, you should avoid reckless driving.. If a knight is saying that, it is a big problem. ";
 					next;
 				}
 				if (.@card_1_warning == 45) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " The knight is warning you of cruelty. It could be yours or that of someone around you. ";
 					next;
@@ -2460,7 +2462,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 46) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " The misfortune shown in the knight card is hastiness. That is also what takes away a knight's life, too. ";
 					next;
@@ -2470,7 +2472,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 47) {
-					cutin "½ºÄ̳ªÀÌƮīµå",4;
+					cutin "½ºÄ̳ªÀÌƮīµå",4; // Khalitzburg Card
 					mes "[Lhimetorra]";
 					mes " This knight is warning you of loneliness. He doesn't have a person to help his horse, ";
 					mes " nor a lover awaiting him, so loneliness hits him in the heart. ";
@@ -2480,7 +2482,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 48) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The warning of the god of death is death itself. ";
 					next;
@@ -2489,7 +2491,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 49) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The Anubis says to be careful of darkness. In darkness, death lingers in the dark. ";
 					next;
@@ -2498,7 +2500,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 50) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The Anubis doesn't like foul language. You don't have a foul mouth, do you? ";
 					mes " Watch your mouth. The Anubis is after those that say foul language.";
@@ -2508,7 +2510,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 51) {
-					cutin "¾Æ´©ºñ½ºÄ«µå",4;
+					cutin "¾Æ´©ºñ½ºÄ«µå",4; // Anubis Card
 					mes "[Lhimetorra]";
 					mes " The Anubis is warning you of hatred. Hatred only brings upon death. ";
 					mes " The Anubis must not like being busy these days. ";
@@ -2518,7 +2520,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 52) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord is warning you of self-righteousness. It is the most dangerous noxious bug that will feed on you. ";
 					next;
@@ -2527,7 +2529,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 53) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord is warning you about freedom. Isn't freedom a good thing? ";
 					mes " Not always! Too much freedom can lead to self-indulgence! ";
@@ -2537,7 +2539,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 54) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord warning you of the opposite sex. Yes. They are poisonous. Keep your distance. ";
 					next;
@@ -2546,7 +2548,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 55) {
-					cutin "¿ÀÅ©·ÎµåÄ«µå",4;
+					cutin "¿ÀÅ©·ÎµåÄ«µå",4; // Orc Lord Card
 					mes "[Lhimetorra]";
 					mes " The Orc Lord is warning about destruction. He knows destruction very well because he is a master of destruction. ";
 					next;
@@ -2555,7 +2557,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 56) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack is warning you of lame jokes. When he finds one saying them, he tends to hit them with his stick. ";
 					next;
@@ -2564,7 +2566,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 57) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " Jack is warning you about others' anger and that anger takes away happiness and kills a joke. ";
 					next;
@@ -2573,7 +2575,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 58) {
-					cutin "ÀèÄ«µå",4;
+					cutin "ÀèÄ«µå",4; // Jakk Card
 					mes "[Lhimetorra]";
 					mes " It seems like Jack is worried about excessive jokes. ";
 					mes " Jokes are fun, but too much will turn you into a ghost like him. ";
@@ -2583,7 +2585,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 59) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Jokers enjoy giving opposite warnings. He says to enjoy sleeping in.";
 					next;
@@ -2592,7 +2594,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 60) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Jokers enjoy giving opposite warnings. He says to enjoy a midnight snack. ";
 					next;
@@ -2601,7 +2603,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 61) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Jokers enjoy giving opposite warnings. ";
 					mes " He says if someone has something you want, make it yours. ";
@@ -2611,7 +2613,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 62) {
-					cutin "Á¶Ä¿Ä«µå",4;
+					cutin "Á¶Ä¿Ä«µå",4; // Joker Card
 					mes "[Lhimetorra]";
 					mes " Joker enjoys giving opposite warnings. ";
 					mes " What he is telling you is to not fear death. ";
@@ -2621,7 +2623,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 63) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " The Hode can forgive others, but not those who hurt it. ";
 					mes " You should also only not forgive those who hurt you. ";
@@ -2631,7 +2633,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 64) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " The Hode is warning you of voracious eating that made it sluggish. ";
 					mes " Eating is good, but the wild is a dangerous place. Leave your stomach partially empty. ";
@@ -2641,7 +2643,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 65) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " The Hode is warning you of voracious eating that made it sluggish. ";
 					mes " Eating is good, but the wild is a dangerous place. Leave your stomach partially empty.";
@@ -2651,7 +2653,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 66) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " If you are to the point of being warned by a Hode.. you must be one considerable person. ";
 					next;
@@ -2660,7 +2662,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 67) {
-					cutin "È£µåÄ«µå",4;
+					cutin "È£µåÄ«µå",4; // Hode Card
 					mes "[Lhimetorra]";
 					mes " The Bull warns of corruption. A lazy hedonist that is not diligent. ";
 					mes " He believes that is like a cancer cell that can't be removed. ";
@@ -2670,7 +2672,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 68) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " The bull is warning about ignorance about a crisis. ";
 					mes " Not knowing that a crisis is a crisis is the most dangerous of all. ";
@@ -2680,7 +2682,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 69) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " The bull is warning of something that will make life sad. ";
 					mes " Sadness is a natural feeling, but don't let that put you down. ";
@@ -2691,7 +2693,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 					next;
 				}
 				if (.@card_1_warning == 70) {
-					cutin "Ȳ¼ÒÄ«µå",4;
+					cutin "Ȳ¼ÒÄ«µå",4; // Minorous Card
 					mes "[Lhimetorra]";
 					mes " The bull is warning about meat from watered cows. ";
 					mes " Saying that, that type of behavior will surely bring upon monsters' curses. ";
@@ -2703,7 +2705,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 				mes "[Lhimetorra]";
 				mes " A warning is always a useful fortune. You can never lose anything. ";
 				next;
-				cutin "°¡À̾ƽºÄ«µå",255;
+				cutin "°¡À̾ƽºÄ«µå",255; // Giearth Card
 				mes "[Lhimetorra]";
 				mes " I hope you will be able to avoid misfortune with this warning. Then... ";
 				close;
@@ -2731,7 +2733,7 @@ payon_in03,117,128,5	script	Fortune Teller	704,{
 	}
 }
 
-payon_in03,75,129,5	script	Poring Fortune Teller	704,{
+payon_in03,75,129,5	script	Poring Fortune Teller	4_M_BIBI,{
 	mes "[Chocarle]";
 	mes " Welcome, welcome~!! " +strcharinfo(0)+ "~!";
 	mes " What brings you here today!? ";
@@ -2753,7 +2755,7 @@ payon_in03,75,129,5	script	Poring Fortune Teller	704,{
 				mes "Nope!";
 				close;
 			}
-			set zeny,zeny-1000;
+			Zeny -= 1000;
 			mes "[Chocarle]";
 			mes " Thank you~! Then we shall look into your fortune! ";
 			mes " First, clear your mind! Just like washing when you wash dishes! ";
@@ -2770,142 +2772,142 @@ payon_in03,75,129,5	script	Poring Fortune Teller	704,{
 				mes "[Chocarle]";
 				set .@card_2_love,rand(1,33);
 				if (.@card_2_love == 1) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Oh! Your lover is about to leave your side! Hold on tight! ";
 				}
 				if (.@card_2_love == 2) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Agh! You're about to give your soul to your loved one! Take it down a notch! ";
 				}
 				if (.@card_2_love == 3) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " No! Your heart is about to leave your love! Catch it! ";
 				}
 				if (.@card_2_love == 4) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Love is like juice in the forest! It is refreshing! Take care of your loved one! ";
 				}
 				if (.@card_2_love == 5) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Uh! You didn't share your juice with your loved one! What a shame! Take care of your loved one! ";
 				}
 				if (.@card_2_love == 6) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Why not share with your loved one? Don't be too greedy and try to keep it all! ";
 				}
 				if (.@card_2_love == 7) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " Your love is going to have a crisis! Protect your love! ";
 				}
 				if (.@card_2_love == 8) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " Hee! Go after your love like a mole! Puhahaha! ";
 				}
 				if (.@card_2_love == 9) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " Oh no! Your love is in danger! Run away from the menace! ";
 				}
 				if (.@card_2_love == 10) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " Oh no! You lost your loved one. And, nobody similar around you. Cheer up! ";
 				}
 				if (.@card_2_love == 11) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " Ah! A sexy rival has appeared! Don't get sidetracked! ";
 				}
 				if (.@card_2_love == 12) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " You are desperately searching for love! If you go beyond this desert, you can find love! ";
 				}
 				if (.@card_2_love == 13) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Prepare an event of love! They will be flying with happiness! ";
 				}
 				if (.@card_2_love == 14) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Love is sweet! Be careful not to get cavities! ";
 				}
 				if (.@card_2_love == 15) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Prepare a present for your love! They might get a heart attack because they will be overwhelmed with happiness! ";
 				}
 				if (.@card_2_love == 16) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " Don't be shy in front of your loved one! Love transcends everything! ";
 				}
 				if (.@card_2_love == 17) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " Embrace every aspect of your loved one! That is true love! ";
 				}
 				if (.@card_2_love == 18) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " Love will blossom with a totally different person! Wow, so cool! ";
 				}
 				if (.@card_2_love == 19) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " No matter what other people say, run towards your loved one! One-track love! ";
 				}
 				if (.@card_2_love == 20) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " Go to your loved one with a present! They will be very happy! ";
 				}
 				if (.@card_2_love == 21) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " Love requires health and strength! Exercise to become stronger! Power and love! ";
 				}
 				if (.@card_2_love == 22) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " Even if you wish to approach your loved one, your body is discomforted! Take a break and rest! ";
 				}
 				if (.@card_2_love == 23) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " Love is bending yourself for someone! Service! Sacrifice! ";
 				}
 				if (.@card_2_love == 24) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " You will be meeting your lover's parents! Prepare well! ";
 				}
 				if (.@card_2_love == 25) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Your relationship must be very happy as it seems you two are flying amongst the clouds! Very jealous! ";
 				}
 				if (.@card_2_love == 26) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Make an opportunity to be alone with each other! It will bring much happiness! ";
 				}
 				if (.@card_2_love == 27) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Uh oh! Someone is peeping at your love! Go scold them! ";
 				}
 				if (.@card_2_love == 28) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " Love blossoms from the foundation! Be true to the basics! ";
 				}
 				if (.@card_2_love == 29) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " When your loved one is hurt, be by them! They will be very happy! ";
 				}
 				if (.@card_2_love == 30) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " One day, when you wake up, your loved one will leave a present! Be happy! ";
 				}
 				if (.@card_2_love == 31) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " Give lots~~ of presents to your loved one! Then you will experience many~ many good things! ";
 				}
 				if (.@card_2_love == 32) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " Lean against a wall and await your love! *Boom* Love will appear! ";
 				}
 				if (.@card_2_love == 33) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " You must be lonely! It's ok, cheer up! ";
 				}
 				next;
 				mes "[Chocarle]";
 				mes " A fortune of love was told! What do you think! Do you like it? ";
 				mes " Even if you did not get the fortune you wished for, don't be do upset and simply go for your love! ";
-				cutin "°¡À̾ƽºÄ«µå",255;
+				cutin "°¡À̾ƽºÄ«µå",255; // Giearth Card
 				next;
 				mes "[Chocarle]";
 				mes " Then, see you next time~~~~~ ";
@@ -2918,135 +2920,135 @@ payon_in03,75,129,5	script	Poring Fortune Teller	704,{
 				mes "[Chocarle]";
 				set .@card_2_study,rand(1,33);
 				if (.@card_2_study == 1) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Agh! Don't die from studying! Take breaks while you're at it! You need some rest! ";
 				}
 				if (.@card_2_study == 2) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Oh, no! You're missing the main points! Figure out the essentials! ";
 				}
 				if (.@card_2_study == 3) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Mmph! You're dying not to study! At times like this, a break is the best! ";
 				}
 				if (.@card_2_study == 4) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Studying is just like hunting a monster in the desert. Resting for a little is the best. Understand? ";
 				}
 				if (.@card_2_study == 5) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " A nice cup of cold juice under the hot sun! Studying should be done like that, too! ";
 				}
 				if (.@card_2_study == 6) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Even though it is the desert, you seem to have a relaxed smile! Maybe you need to relax like this when studying as well! ";
 				}
 				if (.@card_2_study == 7) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " Your grades are in danger! You must study harder! ";
 				}
 				if (.@card_2_study == 8) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " There may be a big crisis! Don't get too stressed just because you can't study! ";
 				}
 				if (.@card_2_study == 9) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " It is saying studying in the dark night can be dangerous! Careful when studying at night! ";
 				}
 				if (.@card_2_study == 10) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " Studying came to a strange place! It needs to find its original path! You can do it! ";
 				}
 				if (.@card_2_study == 11) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " You're gazing at a smart friend with the eyes of a Poring! Heehee! Doing good! ";
 				}
 				if (.@card_2_study == 12) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " Eh? You're too smart! You're at a much higher level than your friends! Take a break! ";
 				}
 				if (.@card_2_study == 13) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " You will be rewarded for your accomplishments! It was worth the effort! ";
 				}
 				if (.@card_2_study == 14) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Forget about studying for a moment and enjoy the party! It should be refreshing~! ";
 				}
 				if (.@card_2_study == 15) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Study something that will make people happy! Future set! ";
 				}
 				if (.@card_2_study == 16) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " If you're not sure of something, ask a friend! It's not something to be ashamed about! You can do it! ";
 				}
 				if (.@card_2_study == 17) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " Don't think that your head is empty! Because, you are smart! You can do it! ";
 				}
 				if (.@card_2_study == 18) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " There's a phenomenon you don't understand! Do a little more research! You'll be able to figure it out soon! ";
 				}
 				if (.@card_2_study == 19) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " Don't get lazy about studying wherever you go! Seek the road of truth and go down it to find the answer! ";
 				}
 				if (.@card_2_study == 20) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " You need strength to study! Get stronger! Running is a start! ";
 				}
 				if (.@card_2_study == 21) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " You will become an admirable person because of all the effort put into studying! You must feel very worth while! ";
 				}
 				if (.@card_2_study == 22) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " Try studying the history of our country! From when the tiger started smoking! ";
 				}
 				if (.@card_2_study == 23) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " You must be having a hard time studying because of all the pressure! Go out and get some fresh air! ";
 				}
 				if (.@card_2_study == 24) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " Your head seems to be heavy because of studying! You need a diversion! Put studying aside for a moment! ";
 				}
 				if (.@card_2_study == 25) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Try studying aerospace or meteorology! Don't you think it would be fun? ";
 				}
 				if (.@card_2_study == 26) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " How about studying theology? You even get to study about angels! ";
 				}
 				if (.@card_2_study == 27) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Study little by little and make yourself feel lighter! You can't study if you're overloaded with words! ";
 				}
 				if (.@card_2_study == 28) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " When studying, you should have a snack! It may seem trivial, but it is rather important! ";
 				}
 				if (.@card_2_study == 29) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " Even when you are sick, don't forget about studying! Where there is effort, there is bound to be good results! ";
 				}
 				if (.@card_2_study == 30) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " Newton discovered gravity through a falling apple! Be wary of even the little things in your surroundings! ";
 				}
 				if (.@card_2_study == 31) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " Green is good for studying! Color your walls green or get a green drink! The lucky color! Green! ";
 				}
 				if (.@card_2_study == 32) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " There is a jewel in your mind! You need to bring all the wisdom to life! Don't study bad things! ";
 				}
 				if (.@card_2_study == 33) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " You will receive good results from studying! You can focus on your current studies! ";
 				}
 				next;
@@ -3066,135 +3068,135 @@ payon_in03,75,129,5	script	Poring Fortune Teller	704,{
 				mes "[Chocarle]";
 				set .@card_2_buddy,rand(1,33);
 				if (.@card_2_buddy == 1) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Ah! Your friend has gone crazy! They need the heal of friendship! ";
 				}
 				if (.@card_2_buddy == 2) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Mmm! You both have gone crazy. You must overcome it through conversations! ";
 				}
 				if (.@card_2_buddy == 3) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Agh! You are suffering because of your friend! Try opening your heart and be more lenient! ";
 				}
 				if (.@card_2_buddy == 4) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " You even split a pea between friends! Don't be so cruel. Reflect upon yourself and apologize! ";
 				}
 				if (.@card_2_buddy == 5) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Oh no! Your friend is ignoring you! Offer a bottle of juice to your friend! Your friendship may come back? ";
 				}
 				if (.@card_2_buddy == 6) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Eh!? What kind of friendship is this?! Hurry up and make up! ";
 				}
 				if (.@card_2_buddy == 7) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes "Oh no?! This person is not your friend, but an enemy! You must be careful! ";
 				}
 				if (.@card_2_buddy == 8) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " Your friend is in danger! You must help your friend! ";
 				}
 				if (.@card_2_buddy == 9) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " Your friendship is on the verge of falling apart! Cast a shield around your friendship! ";
 				}
 				if (.@card_2_buddy == 10) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " One person is left out amongst your friends! Be more friendly! ";
 				}
 				if (.@card_2_buddy == 11) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " Your friend hit you! Don't cry even if it may hurt! Hurry and make up! ";
 				}
 				if (.@card_2_buddy == 12) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " You must be alone! It must be hard to make friends! Try putting on a brighter face! ";
 				}
 				if (.@card_2_buddy == 13) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Give your friends a present! Your friendship will become deeper! ";
 				}
 				if (.@card_2_buddy == 14) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Prepare a hat to cover your friend's large head! They will be moved by your care! ";
 				}
 				if (.@card_2_buddy == 15) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " A friend is waiting for you! Be nice to your friend! ";
 				}
 				if (.@card_2_buddy == 16) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " Being close friends despite differences is true friendship! Shelter each other's differences! ";
 				}
 				if (.@card_2_buddy == 17) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " Your misunderstandings will be removed if you take the time to talk! Go have a conversation with your friend! ";
 				}
 				if (.@card_2_buddy == 18) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " When a friend is sick, visit them! They will be happy! For sure! ";
 				}
 				if (.@card_2_buddy == 19) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " Go out and have some fun with your friend! Your friendship will surely get stronger! ";
 				}
 				if (.@card_2_buddy == 20) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " Give your friend a present! They'll go bragging around town?! ";
 				}
 				if (.@card_2_buddy == 21) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " Share your bone with your friend! Sacrifices in friendship are beautiful! ";
 				}
 				if (.@card_2_buddy == 22) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " Do anything for your friend! With all your heart and soul! Your friend will be delighted! ";
 				}
 				if (.@card_2_buddy == 23) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " No smoking, even with a friend! Stop smoking for your health! ";
 				}
 				if (.@card_2_buddy == 24) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " You and your friend will encounter hardships! Combine your powers and overcome it! ";
 				}
 				if (.@card_2_buddy == 25) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Go on a trip with your friend! Friendship can get stronger in new environments! ";
 				}
 				if (.@card_2_buddy == 26) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Give your friend a ride in a plane! They'll probably fly with joy!? ";
 				}
 				if (.@card_2_buddy == 27) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Don't forget your friend in heaven! Friendship is eternal! ";
 				}
 				if (.@card_2_buddy == 28) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " Help your friend's scar. Your friend would greatly appreciate it! ";
 				}
 				if (.@card_2_buddy == 29) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " You even split a slice of an apple among friends! Share more things with your friend! Something good will happen! ";
 				}
 				if (.@card_2_buddy == 30) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " When your friend is sleeping, think of them! Then there will be progress in your friendship! What do you think~ it means~?! ";
 				}
 				if (.@card_2_buddy == 31) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " Don't measure friendship with money! If you do, be careful for there will be a crack in your friendship! ";
 				}
 				if (.@card_2_buddy == 32) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " It seems as if your friend will give you many presents! Look forward to it! ";
 				}
 				if (.@card_2_buddy == 33) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " You must be lonely without a friend! A good friend will come along soon! ";
 				}
 				next;
@@ -3214,135 +3216,135 @@ payon_in03,75,129,5	script	Poring Fortune Teller	704,{
 				mes "[Chocarle]";
 				set .@card_2_future,rand(1,33);
 				if (.@card_2_future == 1) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Oh no! You are not confident about the future! Trust yourself a little more! Hope! ";
 				}
 				if (.@card_2_future == 2) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Oh! Do you keep on thinking about your death in the future! First, forget about death and live your life! ";
 				}
 				if (.@card_2_future == 3) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Cut! You are filled with uncertainty about the future! Let's get rid of this! Wee! It's gone! ";
 				}
 				if (.@card_2_future == 4) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Life may seem like a hot and dry desert, but in the future, delicious juice and rest awaits you! ";
 					}
 				if (.@card_2_future == 5) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Even in a hot and dry desert, isn't the future happier since you can encounter sweet juice? Put forth your strength! ";
 				}
 				if (.@card_2_future == 6) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Don't your troubles disappear watching a poring smile? Your future must be filled with good things! ";
 				}
 				if (.@card_2_future == 7) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " There is danger waiting ahead! You should avoid it for now! Take care of yourself! ";
 				}
 				if (.@card_2_future == 8) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " You must be fearing your future!? Don't worry too much! Think of happy thoughts! ";
 				}
 				if (.@card_2_future == 9) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " You may endanger someone in the future! Don't become a bad person~! ";
 				}
 				if (.@card_2_future == 10) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " You may have to stand alone in the future! Prepare yourself right now! ";
 				}
 				if (.@card_2_future == 11) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " Many hardships await you in the future! But you can overcome them! ";
 				}
 				if (.@card_2_future == 12) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " You might not even be able to buy summer clothes in the future! Don't waste your money! ";
 				}
 				if (.@card_2_future == 13) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Something exciting may happen! What can it be? Fun! Fun! ";
 				}
 				if (.@card_2_future == 14) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Something good might happen on this nice day! You can look forward to it! Yay! ";
 				}
 				if (.@card_2_future == 15) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " A splendid event will be held! Go get ready! Look forward to it! ";
 				}
 				if (.@card_2_future == 16) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " You will meet someone new! It will be very interesting! ";
 				}
 				if (.@card_2_future == 17) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " If you go little by little, something good will happen! Sit and take a look around you! ";
 				}
 				if (.@card_2_future == 18) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " You get a headache from thinking about the future? Empty your mind! You will feel refreshed! ";
 				}
 				if (.@card_2_future == 19) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " You will become a respectable person in the future! Good job! ";
 				}
 				if (.@card_2_future == 20) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " I can see you working hard in the future! What a lively future! ";
 				}
 				if (.@card_2_future == 21) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " You have a very busy future! Take care of your health! ";
 				}
 				if (.@card_2_future == 22) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " Pick a job where you can work with other people! It will be very rewarding, right? ";
 				}
 				if (.@card_2_future == 23) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " Try doing some volunteer work! It is worthwhile and you will feel good about it, too! ";
 				}
 				if (.@card_2_future == 24) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " You may become a commander! Mmm~! Kind of scary! ";
 				}
 				if (.@card_2_future == 25) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Choose a job that involves flying! You show potential! ";
 				}
 				if (.@card_2_future == 26) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Scrumptious ice cream that could even be eaten in heaven! Challenge yourself and get involved in a job making things of that sort! ";
 				}
 				if (.@card_2_future == 27) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " In the future, things that cannot be done right now will be accomplished! You can look forward to it! ";
 				}
 				if (.@card_2_future == 28) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " Little things in life will bring you happiness and joy in the future! Even more than now! ";
 				}
 				if (.@card_2_future == 29) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " Do what you have to do. Live life to the fullest, even though the world may end tomorrow! ";
 				}
 				if (.@card_2_future == 30) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " You will deal with fruits in the future! How about preparing yourself? ";
 				}
 				if (.@card_2_future == 31) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " Your future self will encounter a high wall! Although, I'm not sure what type of building it may be! ";
 				}
 				if (.@card_2_future == 32) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " Green symbolizes peace! Your future seems as if it will be very peaceful! It's a good thing, right? ";
 				}
 				if (.@card_2_future == 33) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " Romance lays ahead in your future! Relax yourself and prepare yourself! ";
 				}
 				next;
@@ -3364,135 +3366,135 @@ payon_in03,75,129,5	script	Poring Fortune Teller	704,{
 				mes "[Chocarle]";
 				set .@card_2_fortune,rand(1,33);
 				if (.@card_2_fortune == 1) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Uh oh! You're about to be robbed! You must save a little first! ";
 				}
 				if (.@card_2_fortune == 2) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Kek! Your mind goes blank when you think about money! Think of other thoughts! Forget about money for a while! ";
 				}
 				if (.@card_2_fortune == 3) {
-					cutin "°í½ºÆ®¸µÄ«µå",4;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
 					mes " Bah! This isn't a time to think about money. Calm down and put your mind at ease! ";
 				}
 				if (.@card_2_fortune == 4) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " If you look carefully, it is not drinking juice, but underground water through a straw in the ground! Money is hidden where nobody expects! Good luck searching! ";
 				}
 				if (.@card_2_fortune == 5) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " As you can quench your thirst in the dry desert, you can gather money even in this difficult world! ";
 				}
 				if (.@card_2_fortune == 6) {
-					cutin "µå·ÓÇÁ½ºÄ«µå",4;
+					cutin "µå·ÓÇÁ½ºÄ«µå",4; // Drops Card
 					mes " Just like the juice inside the needles of a cactus, you can still gather wealth though you may be in anguish. You can do it! ";
 				}
 				if (.@card_2_fortune == 7) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes "Agh! Someone is after your possessions! Be careful! ";
 				}
 				if (.@card_2_fortune == 8) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " Uh oh! Someone is after your money! Take good care of it! ";
 				}
 				if (.@card_2_fortune == 9) {
-					cutin "¸ÇƼ½ºÄ«µå",4;
+					cutin "¸ÇƼ½ºÄ«µå",4; // Mantis Card
 					mes " It says you might be tempted to do something bad to gather money! Don't forget about a kind heart! ";
 				}
 				if (.@card_2_fortune == 10) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " You have hidden money in your clothes! Hidden rich one! Be careful not to be caught! ";
 				}
 				if (.@card_2_fortune == 11) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " In the future, it seems like you will be kicking money around with your feet like those Porings! Congratulations! ";
 				}
 				if (.@card_2_fortune == 12) {
-					cutin "¹«³«Ä«µå",4;
+					cutin "¹«³«Ä«µå",4; // Munak Card
 					mes " You must be exhausted! Making money is not the easiest thing to do! But it will be that much more valuable! ";
 				}
 				if (.@card_2_fortune == 13) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Your tendency to spend money is growing! Be careful! Don't be left empty-handed! ";
 				}
 				if (.@card_2_fortune == 14) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Use your money to buy something fun! Then good luck will be headed your way! ";
 				}
 				if (.@card_2_fortune == 15) {
-					cutin "»êŸÆ÷¸µÄ«µå",4;
+					cutin "»êŸÆ÷¸µÄ«µå",4; // Santa Poring Card
 					mes " Use your money on something exciting! It looks as if good luck will be headed your way! ";
 				}
 				if (.@card_2_fortune == 16) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " It seems like you will have two lucky offerings! Don't miss these two opportunities! ";
 				}
 				if (.@card_2_fortune == 17) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " Doesn't it seem like there should be money in the small wallet? You will have some small income! Save money wisely! ";
 				}
 				if (.@card_2_fortune == 18) {
-					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4;
+					cutin "¼ÖÁ®½ºÄÌÅæÄ«µå",4; // Soldier Skeleton Card
 					mes " So~ empty. Upsetting, but don't worry too much about money! Something better ought to happen! ";
 				}
 				if (.@card_2_fortune == 19) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " Someone will return something you lost! What a relief! ";
 				}
 				if (.@card_2_fortune == 20) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " No need to worry about osteoporosis! Wasn't it a good thing to eat so much calcium? Oops! This isn't about money?! ";
 				}
 				if (.@card_2_fortune == 21) {
-					cutin "½ºÄÌ·¹ÅæÄ«µå",4;
+					cutin "½ºÄÌ·¹ÅæÄ«µå",4; // Skeleton Card
 					mes " Seeing that you work so hard, seems like you will make lots of money! Congratz~! ";
 				}
 				if (.@card_2_fortune == 22) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " Even if you save money, it disappears like smoke. Don't get too caught up with it! ";
 				}
 				if (.@card_2_fortune == 23) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " It's hard to make money, isn't it? But don't forget the good deeds in life! ";
 				}
 				if (.@card_2_fortune == 24) {
-					cutin "¿¡µå°¡Ä«µå",4;
+					cutin "¿¡µå°¡Ä«µå",4; // Eddga Card
 					mes " Going around to collect money might lead you to a scary person! Be very careful! ";
 				}
 				if (.@card_2_fortune == 25) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Forget about money and fly~fly! You will feel very refreshed! ";
 				}
 				if (.@card_2_fortune == 26) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Money is like clouds! Instead of money, think about a happy life! ";
 				}
 				if (.@card_2_fortune == 27) {
-					cutin "¿£Á©¸µÄ«µå",4;
+					cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
 					mes " Even if it may seem pointless, if you persist, you will be able to make lots of money! You can do it! ";
 				}
 				if (.@card_2_fortune == 28) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " Don't neglect the trivial things on the floor! If you keep an open heart like that, you will be able to collect money! ";
 				}
 				if (.@card_2_fortune == 29) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " If you work with something that is related to mushrooms or apples, a good fortune awaits you! What kind of work would that be? ";
 				}
 				if (.@card_2_fortune == 30) {
-					cutin "Æ÷¸µÄ«µå",4;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
 					mes " How can you think of money looking at such a peaceful card! That's not nice! Sniff..sniffles! Anyhow, it seems like you will gather much fortune! ";
 				}
 				if (.@card_2_fortune == 31) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " You have many fine stones! You will prosper if you are involved in this industry! ";
 				}
 				if (.@card_2_fortune == 32) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " It is an indication that you will prosper! No need to worry now! ";
 				}
 				if (.@card_2_fortune == 33) {
-					cutin "Æ÷Æ÷¸µÄ«µå",4;
+					cutin "Æ÷Æ÷¸µÄ«µå",4; // Poporing Card
 					mes " You will collect many treasures! But the problem is protecting all of it! ";
 				}
 				next;
@@ -3524,7 +3526,7 @@ payon_in03,75,129,5	script	Poring Fortune Teller	704,{
 	close;
 }
 	
-payon_in03,118,119,1	script	Ascetic	101,2,2,{
+payon_in03,118,119,1	script	Ascetic	4W_F_01,2,2,{
 	mes "[Kissy-Kissy]";
 	mes "NyangNyangNyang~";
 	mes "NyaNyangNyaNyag~";
diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt
new file mode 100644
index 000000000..c9a65e067
--- /dev/null
+++ b/npc/other/gm_npcs.txt
@@ -0,0 +1,150 @@
+//===== Hercules Script ======================================
+//= GM Management NPCs
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Controls the official GM management NPCs in certain scripts.
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+// callfunc("F_GM_NPC"{,<password>,<0:int | 1:str>{,<min>,<max>}})
+function	script	F_GM_NPC	{
+
+	// To disable all GM NPCs, uncomment the line below.
+	//end;
+
+	// To set a minimum GM level to access the NPCs, edit the line below.
+	if (getgmlevel() < 99) {/* TODO: perhaps better to just add a group permission? [Ind] */
+		// Log the event.
+		getmapxy(.@map$,.@x,.@y,1);
+		logmes strcharinfo(0)+" attempted to access GM NPC "+strnpcinfo(0)+" ("+.@map$+","+.@x+","+.@y+").";
+		end;
+	}
+
+	if (!getargcount()) return;
+
+	// To disable password inputs, uncomment the line below.
+	//return 1;
+
+	// Password return values:
+	//  1: correct input
+	//  0: incorrect input
+	// -1: zero/cancel (integer only)
+	// -2: out of bounds (integer only)
+	if (getarg(1) == 0) {
+		// Integer password
+		if (getarg(3,0)) {
+			set .@error, input(.@input,getarg(2),getarg(3));
+			if (.@error)
+				return -2;
+		} else
+			input .@input;
+		if (.@input == 0)
+			return -1;
+		else
+			return (.@input == getarg(0))?1:0;
+	} else {
+		// String password
+		input .@inputstr$;
+		return (.@inputstr$ == getarg(0))?1:0;
+	}
+}
+
+/*
+List of GM Management NPCs (incomplete)
+--------------------------
+[ Battleground ]
+- Switch#batgnd
+- Release all#b01
+- Release all#b02
+- Release all#a01
+- Release all#a02
+
+[ Guild-related ]
+- Event controller#aru_gd
+- Event controller#sch_gd
+- Festival Manager#gq_fes0
+- Festival Manager#gq_fes2
+- Godly Item Quests#god
+- Golbal var
+- Investment_total#fund00 (RE)
+
+[ Instances ]
+------ Endless Tower -----
+- #102Administrator Mode
+- Purification Stone#et2
+- #Manager Mode1
+- #Manager Mode2
+- #Manager Mode3
+- #Manager Mode4
+- #Manager Mode5
+--------------------------
+- Nidhoggur Manager
+- Purification Admin#nyd2
+- Bakonawa's Rage (RE)
+- Bangungot Gate (RE)
+
+[ Job-related ]
+----- 3rd Class (RE) -----
+- control#arch
+- #GMhelper01_gc
+- #GMhelper02_gc
+- Worker#job_ranger
+- R.Knight Job Manager
+- #renshucheck
+- sorcereryal
+- Button Girl#wl
+- Button Girl#sura
+--------------------------
+- Soul Linker Var
+- 1st Job Quest Reset
+- Job Repair (RE)
+
+[ Quest ]
+--------- Renewal --------
+- 13.3 Related Reset
+- Scaraba Dungeon Entrance
+- Assistant#para_suvquest
+- Guidance for quest#ml
+- Initializing Mora Sanjo
+- Theore Set Guid
+- Field Bush Switch
+- Bakonawa Intro Helper
+- Pintados Manager#pin
+--------------------------
+- Allied Manager#gm
+- #timer_alba01
+- Translator Preparation#1
+- ep13_nd2f_mng
+- Factory Quest Test
+- boss::lght_boss_admin
+- #LyozienSwitch
+- Juperos Manager
+- Extra Story Patch
+- boss::boss_aru_monas
+- Koshei GlobalVar#admin
+- Morroc GlobalVar Admin::MorrocAdmin_sec
+- Morroc GlobalVar Admin::MorrocAdmin_moc
+- Morroc Invasion Manager (disabled)
+
+[ Other ]
+-------- Marriage --------
+- The King of Midgart
+- Divorce Staff
+- Remarry Staff
+------ Izlude Arena ------
+- log-on-aco#arena
+- acolink#arena
+- Arena Manager#arena
+- Reward Manager#arena
+- Picture Manager#arena
+- Live Broadcast#arena
+- #arenacontrol
+--------------------------
+- Monster Race Manager
+- Vote Globalvar Girl#yuno (disabled)
+
+*/
diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt
index 68aca1f5d..debb96de9 100644
--- a/npc/other/guildpvp.txt
+++ b/npc/other/guildpvp.txt
@@ -1,22 +1,22 @@
 //===== Hercules Script ======================================
 //= Guild Battle NPC
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Guild Battle with PVP mechanics.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Optimized. [Euphy]
-//============================================================ 
+//============================================================
 
-pvp_y_room,77,85,4	script	Guild Battle Guide	105,{
+pvp_y_room,77,85,4	script	Guild Battle Guide	8W_SOLDIER,{
 
-	setarray .@map1X[1],7,9,16,8,20;
-	setarray .@map2X[1],91,90,83,91,79;
-	setarray .@mapY[1],49,49,50,49,50;
+	setarray .@map1x[1],7,9,16,8,20;
+	setarray .@map2x[1],91,90,83,91,79;
+	setarray .@mapy[1],49,49,50,49,50;
 
 	mes "[Guild Battle Guide]";
 	mes "How are you doing?";
@@ -49,6 +49,6 @@ pvp_y_room,77,85,4	script	Guild Battle Guide	105,{
 	mes "[Guild Battle Guide]";
 	mes "Great! Have a good time~";
 	close2;
-	warp "guild_vs"+.@i,getd(".@map"+.@j+"X["+.@i+"]"),.@mapY[.@i];
+	warp "guild_vs"+.@i,getd(".@map"+.@j+"x["+.@i+"]"),.@mapy[.@i];
 	end;
-}
\ No newline at end of file
+}
diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt
index 2991e6d84..3f15debc1 100644
--- a/npc/other/gympass.txt
+++ b/npc/other/gympass.txt
@@ -1,21 +1,21 @@
 //===== Hercules Script ======================================
 //= Gym Pass Cash Item NPC
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Exchange Gym Passes to learn "Enlarge Weight Limit"
 //= iRO NPC situated in Payon beside Kafra Shop.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version [L0ne_W0lf]
 //= 1.1 Fixed the NPC saying you "00" [L0ne_W0lf]
 //= 1.2 Replaced effect numerics with constants. [Samuray22]
 //= 1.3 Updated script, and fixed potential errors. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-payon,173,141,4	script	Ripped Cabus#GymPass	899,{
+payon,173,141,4	script	Ripped Cabus#GymPass	4_M_HUMAN_02,{
 	mes "[Ripped]";
 	mes "Hey, there. People aren't";
 	mes "as physically active as they";
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 6cec1b9ae..2b1e8f410 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -3,31 +3,30 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.8
+//= 1.9
 //===== Description: =========================================
 //= Hugel Bingo game
 //===== Additional Comments: =================================
-//= 1.0 - First version. Please report bugs you find out. [SinSloth]
-//= 1.1 - Fixed a minor bug. [SinSloth]
-//= 1.2 - Added some Bingo Staff NPCs. [SinSloth]
-//= 1.3 - Fixed a bug where an AFK-player wasn't warped out of the game,
-//= preventing players from launching another. [SinSloth]
-//= 1.4 - Fixed a minor bug added in the last revision. [SinSloth]
-//= 1.5 - Applied a fix to players locations which were not rotating properly. [SinSloth]
-//= 1.6 - Removed nescesity to win to proceed with quest [Yommy]
-//= 1.7 - Replaced effect numerics with constants. [Samuray22]
+//= 1.0 First version. Please report bugs you find out. [SinSloth]
+//= 1.1 Fixed a minor bug. [SinSloth]
+//= 1.2 Added some Bingo Staff NPCs. [SinSloth]
+//= 1.3 Fixed a bug where an AFK-player wasn't warped out of the game,
+//=     preventing players from launching another. [SinSloth]
+//= 1.4 Fixed a minor bug added in the last revision. [SinSloth]
+//= 1.5 Applied a fix to players locations which were not rotating properly. [SinSloth]
+//= 1.6 Removed nescesity to win to proceed with quest [Yommy]
+//= 1.7 Replaced effect numerics with constants. [Samuray22]
 //= 1.8 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
+//= 1.9 Some optimization/standardization. [Euphy]
 //============================================================
 
-que_bingo,48,84,5	script	Bingo Waiting Room	124,{
+que_bingo,48,84,5	script	Bingo Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
-	set $hu_bingoa,0;
-	set $hu_bingob,0;
 	waitingroom "Bingo Waiting Room - 5 People",50,"Bingo Waiting Room::OnWarp",5,1000;
 	end;
-	
+
 OnWarp:
 	warpwaitingpc "que_bingo",46,141;
 	donpcevent "start#bingo::OnStart";
@@ -38,13 +37,13 @@ OnWarp:
 	enablenpc "plate5#bingo";
 	disablewaitingroomevent;
 	end;
-	
+
 OnStart:
 	enablewaitingroomevent;
 	end;
 }
 
-que_bingo,49,125,0	script	plate1#bingo	139,1,1,{
+que_bingo,49,125,0	script	plate1#bingo	HIDDEN_WARP_NPC,1,1,{
 
 OnInit:
 	disablenpc "plate1#bingo";
@@ -83,16 +82,13 @@ OnTouch:
 	set @bingo_case,1;
 L_Fill:
 	set @bingo_fill,callfunc("Func_Bingo",@bingo_case);
-	if(!@bingo_fill)
-	{
+	if (!@bingo_fill) {
 		mes "The numbers you have entered";
   		mes "exceed the limit, or you have";
 		mes "already entered these numbers.";
 		mes "Please enter your numbers again.";
 		next;
-	}
-	else if(@bingo_fill)
-	{
+	} else if (@bingo_fill) {
 		if(@bingoplate[25] < 10) set @bingo_e5$,"0"+@bingoplate[25]+""; else set @bingo_e5$,@bingoplate[25];
 		donpcevent "start#bingo::OnEnter";
 		mes "["+@bingo_a1$+"] ["+@bingo_a2$+"] ["+@bingo_a3$+"] ["+@bingo_a4$+"] ["+@bingo_a5$+"]";
@@ -104,51 +100,49 @@ L_Fill:
 
 	}
 	goto L_Fill;
-	
 }
 
-que_bingo,53,121,0	duplicate(plate1#bingo)	plate2#bingo	139,1,1
-que_bingo,51,116,0	duplicate(plate1#bingo)	plate3#bingo	139,1,1
-que_bingo,46,116,0	duplicate(plate1#bingo)	plate4#bingo	139,1,1
-que_bingo,45,121,0	duplicate(plate1#bingo)	plate5#bingo	139,1,1
+que_bingo,53,121,0	duplicate(plate1#bingo)	plate2#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(plate1#bingo)	plate3#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(plate1#bingo)	plate4#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(plate1#bingo)	plate5#bingo	HIDDEN_WARP_NPC,1,1
 
-que_bingo,51,51,0	script	start#bingo	139,{
+que_bingo,51,51,0	script	start#bingo	HIDDEN_WARP_NPC,{
 
 OnStart:
 	initnpctimer;
 	end;
-	
+
 OnEnter:
-	if($hu_bingoa == 4)
-	{
-		set $hu_bingoa,5;
+	if ($@hu_bingoa == 4) {
+		set $@hu_bingoa,5;
 		donpcevent "start2#bingo::OnStart";
 		stopnpctimer;
 		end;
 	}
-	set $hu_bingoa,$hu_bingoa +1;
+	set $@hu_bingoa,$@hu_bingoa +1;
 	end;
-	
+
 OnTimer1000:
 	mapannounce "que_bingo","Eukran: Hello, everyone! I'm Eukran, your Bingo Guide~",1,0xFFAB54;
 	end;
-	
+
 OnTimer6000:
 	mapannounce "que_bingo","Eukran: Game participants, please enter the Warp Portal at the bottom of your screen and choose a Bingo Plate by entering a number.",1,0xFFAB54;
 	end;
-	
+
 OnTimer11000:
 	mapannounce "que_bingo","Eukran: All participants must choose their Bingo Plates within 3 minutes, or the game will be canceled.",1,0xFFAB54;
 	end;
-	
+
 OnTimer192000:
 	mapannounce "que_bingo","Eukran: Please enter a number in 5 seconds, or the game will be canceled.",1,0xFFAB54;
 	end;
-	
+
 OnTimer200000:
 	mapannounce "que_bingo","Eukran: I'm sorry, but the game has been canceled. Please come again and enjoy a game of Bingo with us!",1,0xFFAB54;
 	end;
-	
+
 OnTimer202000:
 	disablenpc "plate1#bingo";
 	disablenpc "plate2#bingo";
@@ -156,7 +150,7 @@ OnTimer202000:
 	disablenpc "plate4#bingo";
 	disablenpc "plate5#bingo";
 	end;
-	
+
 OnTimer203000:
 	areawarp "que_bingo",44,115,54,126,"que_bingo",40,124;
 	enablenpc "out3#bingo";
@@ -165,22 +159,22 @@ OnTimer203000:
 OnTimer204000:
 	areawarp "que_bingo",44,115,54,126,"que_bingo",40,121;
 	disablenpc "out3#bingo";
-	set $hu_bingoa,0;
-	set $hu_bingob,0;
+	set $@hu_bingoa,0;
+	set $@hu_bingob,0;
 	donpcevent "Bingo Waiting Room::OnStart";
 	end;
 }
 
-que_bingo,52,52,0	script	start2#bingo	139,{
+que_bingo,52,52,0	script	start2#bingo	HIDDEN_WARP_NPC,{
 
 OnStop:
 	stopnpctimer;
 	end;
-	
+
 OnStart:
 	initnpctimer;
 	end;
-	
+
 OnTimer2000:
 	mapannounce "que_bingo","Eukran: Great, everyone seems to be ready~",1,0xFFAB54;
 	disablenpc "plate1#bingo";
@@ -189,239 +183,100 @@ OnTimer2000:
 	disablenpc "plate4#bingo";
 	disablenpc "plate5#bingo";
 	end;
-	
+
 OnTimer5000:
 	mapannounce "que_bingo","Eukran: Now, let the game begin!",1,0xFFAB54;
 	setarray $@bingoarray[0],1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25;
 	set .@max_index, 24;
-	for(set .@i,0; .@i < 25; set .@i,.@i +1)
-	{
+	for(set .@i,0; .@i < 25; set .@i,.@i +1) {
 		set $@bingo0,rand(0,.@max_index);
 		set $bingo[.@i],$@bingoarray[$@bingo0];
 		set $@bingoarray[$@bingo0], $@bingoarray[.@max_index];
 		set .@max_index, .@max_index - 1;
 	}
 	end;
-	
+
 OnTimer8000:
 	mapannounce "que_bingo","Eukran: I'll announce the Bingo Numbers. If you get 5 lines by matching 5 Bingo Numbers in a straight line on your Bingo Plate, yell out ''Bingo'' to win~",1,0xFFAB54;
 	end;
-	
+
 OnTimer10000:
 	set $@bingoresult,1;
 	callfunc "Func_BingoResult",$@bingoresult;
 	end;
-	
+
 OnTimer15000:
+OnTimer25000:
+OnTimer35000:
+OnTimer45000:
+OnTimer55000:
+OnTimer65000:
+OnTimer75000:
+OnTimer85000:
+OnTimer95000:
+OnTimer105000:
+OnTimer115000:
+OnTimer125000:
+OnTimer135000:
+OnTimer145000:
+OnTimer155000:
+OnTimer179000:
+OnTimer199000:
+OnTimer219000:
+OnTimer239000:
+OnTimer259000:
+OnTimer279000:
+OnTimer299000:
+OnTimer319000:
+OnTimer339000:
 	donpcevent "1a#bingo::OnInit";
 	end;
 
 OnTimer20000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer25000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer30000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer35000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer40000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer45000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer50000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer55000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer60000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer65000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer70000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer75000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer80000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer85000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer90000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer95000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer100000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-
-OnTimer105000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer110000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer115000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer120000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer125000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer130000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer135000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer140000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-
-OnTimer145000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer150000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer155000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer160000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer179000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer180000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer199000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer200000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer219000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer220000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer239000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer240000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer259000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer260000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer279000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer280000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer299000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer300000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer319000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer320000:
-	callfunc "Func_BingoResult",$@bingoresult;
-	end;
-	
-OnTimer339000:
-	donpcevent "1a#bingo::OnInit";
-	end;
-	
 OnTimer340000:
 	callfunc "Func_BingoResult",$@bingoresult;
 	end;
-	
+
 OnTimer440000:
 	mapannounce "que_bingo","Eukran: I've announced all of the selected numbers, but I haven't heard anyone yell ''Bingo.''",1,0xFFAB54;
 	end;
-	
+
 OnTimer445000:
 	mapannounce "que_bingo","Eukran: I'll give you all 10 seconds to check if any of you have won. If no one can yell ''Bingo'' in 10 seconds, this game will end without a winner.",1,0xFFAB54;
 	end;
-	
+
 OnTimer460000:
 	mapannounce "que_bingo","Eukran: I'm sorry, but this game has ended without a winner. Thanks for playing, everyone~",1,0xFFAB54;
 	donpcevent "1a#bingo::OnInit";
 	areawarp "que_bingo",44,115,54,126,"que_bingo",40,121;
-	set $hu_bingoa,0;
+	set $@hu_bingoa,0;
 	donpcevent "Bingo Waiting Room::OnStart";
 	end;
 }
 
-que_bingo,49,125,0	script	1a#bingo	139,1,1,{
+que_bingo,49,125,0	script	1a#bingo	HIDDEN_WARP_NPC,1,1,{
 	end;
 
 OnInit:
@@ -594,17 +449,15 @@ OnTouch:
 	if($@bingoresult == 1 || $@bingoresult == 21) mes "[ "+$@bingoresult+"st Number - "+$bingo[$@bingoresult -1]+" ]";
 	else if($@bingoresult == 2 || $@bingoresult == 22) mes "[ "+$@bingoresult+"nd Number - "+$bingo[$@bingoresult -1]+" ]";
 	else if($@bingoresult == 3 || $@bingoresult == 23) mes "[ "+$@bingoresult+"rd Number - "+$bingo[$@bingoresult -1]+" ]";
-	else mes "[ "+$@bingoresult+"th Number - "+$bingo[$@bingoresult -1]+" ]"; 
+	else mes "[ "+$@bingoresult+"th Number - "+$bingo[$@bingoresult -1]+" ]";
 	mes "["+@bingo_a1$+"] ["+@bingo_a2$+"] ["+@bingo_a3$+"] ["+@bingo_a4$+"] ["+@bingo_a5$+"]";
 	mes "["+@bingo_b1$+"] ["+@bingo_b2$+"] ["+@bingo_b3$+"] ["+@bingo_b4$+"] ["+@bingo_b5$+"]";
 	mes "["+@bingo_c1$+"] ["+@bingo_c2$+"] ["+@bingo_c3$+"] ["+@bingo_c4$+"] ["+@bingo_c5$+"]";
 	mes "["+@bingo_d1$+"] ["+@bingo_d2$+"] ["+@bingo_d3$+"] ["+@bingo_d4$+"] ["+@bingo_d5$+"]";
 	mes "["+@bingo_e1$+"] ["+@bingo_e2$+"] ["+@bingo_e3$+"] ["+@bingo_e4$+"] ["+@bingo_e5$+"]";
 	mes "[Currently Finished Lines - "+@bingowin+" ]";
-	if($@bingoresult > 15)
-	{
-		if(@bingowin > 4)
-		{
+	if ($@bingoresult > 15) {
+		if (@bingowin > 4) {
 			next;
 			mes "We just have made 5 lines!";
 			mes "Say ^ff0000Bingo^000000!";
@@ -614,19 +467,15 @@ OnTouch:
 			mes "Remember, you'll only";
 			mes "have one chance to say it!";
 			input @bingoyell$;
-			if(@bingoyell$ == "Bingo")
-			{
-				if($hu_bingoa == 5)
-				{
-					set $hu_bingoa,6;
+			if (@bingoyell$ == "Bingo") {
+				if ($@hu_bingoa == 5) {
+					set $@hu_bingoa,6;
 					donpcevent "start2#bingo::OnStop";
 					set $@bingowinner$,strcharinfo(0);
 					donpcevent "win1a#bingo::OnWin";
 					close;
 
-				}
-				else if($hu_bingoa == 6)
-				{
+				} else if ($@hu_bingoa == 6) {
 					next;
 					mes "Oh no! I'm sorry, but";
 					mes "someone already yelled";
@@ -636,9 +485,7 @@ OnTouch:
 					mes "next time, alright?";
 					close;
 				}
-			}
-			else
-			{
+			} else {
 				next;
 				mes "I'm sorry, but you";
 				mes "said it wrong. Next time,";
@@ -652,139 +499,138 @@ OnTouch:
 	close;
 }
 
-que_bingo,49,125,0	duplicate(1a#bingo)	2a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	3a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	4a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	5a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	6a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	7a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	8a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	9a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	10a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	11a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	12a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	13a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	14a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	15a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	16a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	17a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	18a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	19a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	20a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	21a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	22a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	23a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	24a#bingo	139,1,1
-que_bingo,49,125,0	duplicate(1a#bingo)	25a#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	1b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	2b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	3b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	4b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	5b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	6b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	7b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	8b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	9b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	10b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	11b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	12b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	13b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	14b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	15b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	16b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	17b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	18b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	19b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	20b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	21b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	22b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	23b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	24b#bingo	139,1,1
-que_bingo,53,121,0	duplicate(1a#bingo)	25b#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	1c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	2c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	3c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	4c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	5c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	6c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	7c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	8c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	9c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	10c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	11c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	12c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	13c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	14c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	15c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	16c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	17c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	18c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	19c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	20c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	21c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	22c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	23c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	24c#bingo	139,1,1
-que_bingo,51,116,0	duplicate(1a#bingo)	25c#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	1d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	2d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	3d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	4d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	5d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	6d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	7d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	8d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	9d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	10d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	11d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	12d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	13d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	14d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	15d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	16d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	17d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	18d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	19d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	20d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	21d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	22d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	23d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	24d#bingo	139,1,1
-que_bingo,46,116,0	duplicate(1a#bingo)	25d#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	1e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	2e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	3e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	4e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	5e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	6e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	7e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	8e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	9e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	10e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	11e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	12e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	13e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	14e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	15e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	16e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	17e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	18e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	19e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	20e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	21e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	22e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	23e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	24e#bingo	139,1,1
-que_bingo,45,121,0	duplicate(1a#bingo)	25e#bingo	139,1,1
-
-
-que_bingo,79,19,0	script	win1a#bingo	139,4,4,{
+que_bingo,49,125,0	duplicate(1a#bingo)	2a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	3a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	4a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	5a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	6a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	7a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	8a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	9a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	10a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	11a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	12a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	13a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	14a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	15a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	16a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	17a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	18a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	19a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	20a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	21a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	22a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	23a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	24a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0	duplicate(1a#bingo)	25a#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	1b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	2b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	3b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	4b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	5b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	6b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	7b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	8b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	9b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	10b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	11b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	12b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	13b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	14b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	15b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	16b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	17b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	18b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	19b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	20b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	21b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	22b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	23b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	24b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0	duplicate(1a#bingo)	25b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	1c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	2c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	3c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	4c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	5c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	6c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	7c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	8c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	9c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	10c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	11c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	12c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	13c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	14c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	15c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	16c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	17c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	18c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	19c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	20c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	21c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	22c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	23c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	24c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(1a#bingo)	25c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	1d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	2d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	3d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	4d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	5d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	6d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	7d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	8d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	9d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	10d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	11d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	12d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	13d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	14d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	15d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	16d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	17d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	18d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	19d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	20d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	21d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	22d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	23d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	24d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(1a#bingo)	25d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	1e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	2e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	3e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	4e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	5e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	6e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	7e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	8e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	9e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	10e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	11e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	12e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	13e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	14e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	15e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	16e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	17e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	18e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	19e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	20e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	21e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	22e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	23e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	24e#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(1a#bingo)	25e#bingo	HIDDEN_WARP_NPC,1,1
+
+que_bingo,79,19,0	script	win1a#bingo	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnWin:
 	initnpctimer;
 	end;
-	
+
 OnTimer1000:
 	donpcevent "1a#bingo::OnInit";
 	enablenpc "win2a#bingo";
@@ -795,7 +641,7 @@ OnTimer1000:
 	end;
 }
 
-que_bingo,49,125,0	script	win2a#bingo	139,1,1,{
+que_bingo,49,125,0	script	win2a#bingo	HIDDEN_WARP_NPC,1,1,{
 	end;
 
 OnInit:
@@ -807,10 +653,10 @@ OnInit:
 	end;
 
 OnTouch:
-	if($@bingowinner$ != strcharinfo(0)) end;
+	if ($@bingowinner$ != strcharinfo(0)) end;
 	specialeffect EF_SUI_EXPLOSION;
 	soundeffect "tming_success.wav",1;
-	if($@bingoresult == 16) getitem 7515,50;
+	if ($@bingoresult == 16) getitem 7515,50;
 	else getitem 7515,1;
 	initnpctimer;
 	end;
@@ -824,8 +670,10 @@ OnTimer5000:
 	end;
 
 OnTimer10000:
-	if($@bingoresult == 16) mapannounce "que_bingo","Eukran: Congratulations, "+$@bingowinner$+"! You will be rewarded with 50 Marvelous Medals.",1,0xFFAB54;
-	else mapannounce "que_bingo","Eukran: Congratulations, "+$@bingowinner$+"! You will be rewarded with 1 Marvelous Medal.",1,0xFFAB54;
+	if ($@bingoresult == 16)
+		mapannounce "que_bingo","Eukran: Congratulations, "+$@bingowinner$+"! You will be rewarded with 50 Marvelous Medals.",1,0xFFAB54;
+	else
+		mapannounce "que_bingo","Eukran: Congratulations, "+$@bingowinner$+"! You will be rewarded with 1 Marvelous Medal.",1,0xFFAB54;
 	end;
 
 OnTimer15000:
@@ -838,12 +686,12 @@ OnTimer20000:
 	end;
 }
 
-que_bingo,53,121,0	duplicate(win2a#bingo)	win2b#bingo	139,1,1
-que_bingo,51,116,0	duplicate(win2a#bingo)	win2c#bingo	139,1,1
-que_bingo,46,116,0	duplicate(win2a#bingo)	win2d#bingo	139,1,1
-que_bingo,45,121,0	duplicate(win2a#bingo)	win2e#bingo	139,1,1
+que_bingo,53,121,0	duplicate(win2a#bingo)	win2b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(win2a#bingo)	win2c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(win2a#bingo)	win2d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(win2a#bingo)	win2e#bingo	HIDDEN_WARP_NPC,1,1
 
-que_bingo,89,59,0	script	end#bingo	139,4,4,{
+que_bingo,89,59,0	script	end#bingo	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnEnd:
@@ -865,12 +713,12 @@ OnTimer5000:
 	disablenpc "end1d#bingo";
 	disablenpc "end1e#bingo";
 	areawarp "que_bingo",44,115,54,126,"que_bingo",40,121;
-	set $hu_bingoa,0;
+	set $@hu_bingoa,0;
 	donpcevent "Bingo Waiting Room::OnStart";
 	end;
 }
 
-que_bingo,49,125,0	script	end1a#bingo	139,1,1,{
+que_bingo,49,125,0	script	end1a#bingo	HIDDEN_WARP_NPC,1,1,{
 
 OnInit:
 	disablenpc "end1a#bingo";
@@ -886,53 +734,47 @@ OnTouch:
 	end;
 }
 
-que_bingo,53,121,0	duplicate(end1a#bingo)	end1b#bingo	139,1,1
-que_bingo,51,116,0	duplicate(end1a#bingo)	end1c#bingo	139,1,1
-que_bingo,46,116,0	duplicate(end1a#bingo)	end1d#bingo	139,1,1
-que_bingo,45,121,0	duplicate(end1a#bingo)	end1e#bingo	139,1,1
+que_bingo,53,121,0	duplicate(end1a#bingo)	end1b#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0	duplicate(end1a#bingo)	end1c#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0	duplicate(end1a#bingo)	end1d#bingo	HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0	duplicate(end1a#bingo)	end1e#bingo	HIDDEN_WARP_NPC,1,1
 
-que_bingo,50,138,1	script	out3#bingo	139,5,8,{
+que_bingo,50,138,1	script	out3#bingo	HIDDEN_WARP_NPC,5,8,{
 
 OnInit:
 	disablenpc "out3#bingo";
 	end;
-	
+
 OnTouch:
 	warp "que_bingo",40,121;
 	end;
 }
 
-que_bingo,49,136,0	script	go3#bingo	45,1,1,{
+que_bingo,49,136,0	script	go3#bingo	WARPNPC,1,1,{
 
 OnTouch:
-	switch($hu_bingob)
-	{
-		case 0:	warp "que_bingo",49,125; break;
-		case 1:	warp "que_bingo",53,121; break;
-		case 2:	warp "que_bingo",51,116; break;
-		case 3:	warp "que_bingo",46,116; break;
-		case 4:	warp "que_bingo",45,121; break;
+	switch($@hu_bingob) {
+		case 0: warp "que_bingo",49,125; break;
+		case 1: warp "que_bingo",53,121; break;
+		case 2: warp "que_bingo",51,116; break;
+		case 3: warp "que_bingo",46,116; break;
+		case 4: warp "que_bingo",45,121; break;
 	}
-	set $hu_bingob,$hu_bingob +1;
-	if($hu_bingob == 5) set $hu_bingob,0;
+	set $@hu_bingob,$@hu_bingob +1;
+	if ($@hu_bingob == 5) set $@hu_bingob,0;
 	end;
 }
 
 function	script	Func_Bingo	{
-
-
-	for( set .@i,getarg(0); .@i < 26; set .@i,.@i +1)
-	{
+	for(set .@i,getarg(0); .@i < 26; set .@i,.@i +1) {
 		if(@bingoplate[1] < 10) set @bingo_a1$,"0"+@bingoplate[1]+""; else set @bingo_a1$,@bingoplate[1];
 		if(@bingoplate[2] < 10) set @bingo_a2$,"0"+@bingoplate[2]+""; else set @bingo_a2$,@bingoplate[2];
 		if(@bingoplate[3] < 10) set @bingo_a3$,"0"+@bingoplate[3]+""; else set @bingo_a3$,@bingoplate[3];
 		if(@bingoplate[4] < 10) set @bingo_a4$,"0"+@bingoplate[4]+""; else set @bingo_a4$,@bingoplate[4];
 		if(@bingoplate[5] < 10) set @bingo_a5$,"0"+@bingoplate[5]+""; else set @bingo_a5$,@bingoplate[5];
 		if(.@i > 5) mes "["+@bingo_a1$+"] ["+@bingo_a2$+"] ["+@bingo_a3$+"] ["+@bingo_a4$+"] ["+@bingo_a5$+"]";
-		else
-		{
-			switch(.@i)
-			{
+		else {
+			switch(.@i) {
 				case 1: mes "^ff0000[__]^000000 [   ] [   ] [   ] [   ]"; break;
 				case 2: mes "["+@bingo_a1$+"] ^ff0000[__]^000000 [   ] [   ] [   ]"; break;
 				case 3:	mes "["+@bingo_a1$+"] ["+@bingo_a2$+"] ^ff0000[__]^000000 [   ] [   ]"; break;
@@ -947,10 +789,8 @@ function	script	Func_Bingo	{
 		if(@bingoplate[10] < 10) set @bingo_b5$,"0"+@bingoplate[10]+""; else set @bingo_b5$,@bingoplate[10];
 		if(.@i > 10) mes "["+@bingo_b1$+"] ["+@bingo_b2$+"] ["+@bingo_b3$+"] ["+@bingo_b4$+"] ["+@bingo_b5$+"]";
 		else if(.@i < 6) mes "[   ] [   ] [   ] [   ] [   ]";
-		else
-		{
-			switch(.@i)
-			{
+		else {
+			switch(.@i) {
 				case 6: mes "^ff0000[__]^000000 [   ] [   ] [   ] [   ]"; break;
 				case 7: mes "["+@bingo_b1$+"] ^ff0000[__]^000000 [   ] [   ] [   ]"; break;
 				case 8:	mes "["+@bingo_b1$+"] ["+@bingo_b2$+"] ^ff0000[__]^000000 [   ] [   ]"; break;
@@ -965,10 +805,8 @@ function	script	Func_Bingo	{
 		if(@bingoplate[15] < 10) set @bingo_c5$,"0"+@bingoplate[15]+""; else set @bingo_c5$,@bingoplate[15];
 		if(.@i > 15) mes "["+@bingo_c1$+"] ["+@bingo_c2$+"] ["+@bingo_c3$+"] ["+@bingo_c4$+"] ["+@bingo_c5$+"]";
 		else if(.@i < 11) mes "[   ] [   ] [   ] [   ] [   ]";
-		else
-		{
-			switch(.@i)
-			{
+		else {
+			switch(.@i) {
 				case 11: mes "^ff0000[__]^000000 [   ] [   ] [   ] [   ]"; break;
 				case 12: mes "["+@bingo_c1$+"] ^ff0000[__]^000000 [   ] [   ] [   ]"; break;
 				case 13: mes "["+@bingo_c1$+"] ["+@bingo_c2$+"] ^ff0000[__]^000000 [   ] [   ]"; break;
@@ -983,10 +821,8 @@ function	script	Func_Bingo	{
 		if(@bingoplate[20] < 10) set @bingo_d5$,"0"+@bingoplate[20]+""; else set @bingo_d5$,@bingoplate[20];
 		if(.@i > 20) mes "["+@bingo_d1$+"] ["+@bingo_d2$+"] ["+@bingo_d3$+"] ["+@bingo_d4$+"] ["+@bingo_d5$+"]";
 		else if(.@i < 16) mes "[   ] [   ] [   ] [   ] [   ]";
-		else
-		{
-			switch(.@i)
-			{
+		else {
+			switch(.@i) {
 				case 16: mes "^ff0000[__]^000000 [   ] [   ] [   ] [   ]"; break;
 				case 17: mes "["+@bingo_d1$+"] ^ff0000[__]^000000 [   ] [   ] [   ]"; break;
 				case 18: mes "["+@bingo_d1$+"] ["+@bingo_d2$+"] ^ff0000[__]^000000 [   ] [   ]"; break;
@@ -999,10 +835,8 @@ function	script	Func_Bingo	{
 		if(@bingoplate[23] < 10) set @bingo_e3$,"0"+@bingoplate[23]+""; else set @bingo_e3$,@bingoplate[23];
 		if(@bingoplate[24] < 10) set @bingo_e4$,"0"+@bingoplate[24]+""; else set @bingo_e4$,@bingoplate[24];
 		if(.@i < 21) mes "[   ] [   ] [   ] [   ] [   ]";
-		else
-		{
-			switch(.@i)
-			{
+		else {
+			switch(.@i) {
 				case 21: mes "^ff0000[__]^000000 [   ] [   ] [   ] [   ]"; break;
 				case 22: mes "["+@bingo_e1$+"] ^ff0000[__]^000000 [   ] [   ] [   ]"; break;
 				case 23: mes "["+@bingo_e1$+"] ["+@bingo_e2$+"] ^ff0000[__]^000000 [   ] [   ]"; break;
@@ -1013,10 +847,8 @@ function	script	Func_Bingo	{
 		next;
 		input .@bingoinput;
 		if(.@bingoinput < 1 || .@bingoinput > 25) { set @bingo_case,.@i; return 0; }
-		if(.@i > 1)
-		{
-			for(set .@j,.@i; .@j > 0; set .@j,.@j -1)
-			{
+		if(.@i > 1) {
+			for(set .@j,.@i; .@j > 0; set .@j,.@j -1) {
 				if(.@bingoinput == @bingoplate[.@j -1]) { set @bingo_case,.@i; return 0; }
 			}
 		}
@@ -1026,11 +858,11 @@ function	script	Func_Bingo	{
 }
 
 function	script	Func_BingoResult	{
-
-	if(getarg(0) == 1 || getarg(0) == 21) mapannounce "que_bingo","Eukran: The "+getarg(0)+"st number is "+$bingo[getarg(0) -1]+". Please check your Bingo Plate.",4,0xFFAB54;
-	else if(getarg(0) == 2 || getarg(0) == 22) mapannounce "que_bingo","Eukran: The "+getarg(0)+"nd number is "+$bingo[getarg(0) -1]+". Please check your Bingo Plate.",4,0xFFAB54;
-	else if(getarg(0) == 3 || getarg(0) == 23) mapannounce "que_bingo","Eukran: The "+getarg(0)+"rd number is "+$bingo[getarg(0) -1]+". Please check your Bingo Plate.",4,0xFFAB54;
-	else mapannounce "que_bingo","Eukran: The "+getarg(0)+"th number is "+$bingo[getarg(0) -1]+". Please check your Bingo Plate.",4,0xFFAB54;
+	if (getarg(0) == 1 || getarg(0) == 21) set .@str$,"st";
+	else if (getarg(0) == 2 || getarg(0) == 22) set .@str$,"nd";
+	else if (getarg(0) == 3 || getarg(0) == 23) set .@str$,"rd";
+	else set .@str$,"th";
+	mapannounce "que_bingo","Eukran: The "+getarg(0)+.@str$+" number is "+$bingo[getarg(0) -1]+". Please check your Bingo Plate.",4,0xFFAB54;
 	enablenpc ""+getarg(0)+"a#bingo";
 	enablenpc ""+getarg(0)+"b#bingo";
 	enablenpc ""+getarg(0)+"c#bingo";
@@ -1040,27 +872,16 @@ function	script	Func_BingoResult	{
 	end;
 }
 
-que_bingo,49,31,4	script	Arcade Helper#1	47,{
-
+que_bingo,49,31,4	script	Arcade Helper#1	1_M_01,{
 	mes "[Helper]";
 	mes "If you'd like to play";
 	mes "a game of bingo, then";
 	mes "please proceed this way.";
 	close;
 }
+que_bingo,42,31,4	duplicate(Arcade Helper#1)	Arcade Helper#2	1_F_01
 
-que_bingo,42,31,4	script	Arcade Helper#2	66,{
-
-	mes "[Helper]";
-	mes "If you'd like to spectate";
-	mes "a game of bingo, then";
-	mes "please proceed this way.";
-	close;
-	
-}
-
-que_bingo,54,17,5	script	Arcade Owner	712,{
-
+que_bingo,54,17,5	script	Arcade Owner	4_M_05,{
 	mes "[Arcade Owner]";
 	mes "Welcome to the";
 	mes "Bingo Game Arcade.";
@@ -1068,8 +889,7 @@ que_bingo,54,17,5	script	Arcade Owner	712,{
 	mes "bingo? If you have any";
 	mes "questions, feel free to ask.";
 	next;
-	switch( select( "Rules for Bingo:Bingo Room:Marvelous Medals" ) )
-	{
+	switch(select("Rules for Bingo:Bingo Room:Marvelous Medals")) {
 	case 1:
 		mes "[Arcade Owner]";
 		mes "The rules for playing bingo";
@@ -1109,7 +929,6 @@ que_bingo,54,17,5	script	Arcade Owner	712,{
 		mes "Anyway, it costs 1,000 zeny";
 		mes "to play each bingo game~";
 		close;
-	break;
 	case 2:
 		mes "[Arcade Owner]";
 		mes "Ah, if you want to join a";
@@ -1126,7 +945,6 @@ que_bingo,54,17,5	script	Arcade Owner	712,{
 		mes "left door as a spectator";
 		mes "in the Bingo Room.";
 		close;
-	break;
 	case 3:
 		mes "[Arcade Owner]";
 		mes "When you win a bingo";
@@ -1149,7 +967,5 @@ que_bingo,54,17,5	script	Arcade Owner	712,{
 		mes "them for products in the Monster^FFFFFF ^000000 Racing Arena. I hear there's also";
 		mes "a place in Einbroch where you can^FFFFFF ^000000 use them, but I wouldn't know.";
 		close;
-	break;
 	}
-	
 }
diff --git a/npc/other/mail.txt b/npc/other/mail.txt
index 95f680704..bc7825e6e 100644
--- a/npc/other/mail.txt
+++ b/npc/other/mail.txt
@@ -4,8 +4,8 @@
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.8
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Pickup and write mail from/to players in game.
 //===== Additional Comments: =================================
 //= 1.0 First version, place holders only. [L0ne_W0lf]
@@ -38,7 +38,7 @@
 			close;
 		}
 		mes "Thank you, please come again.";
-		set Zeny, Zeny - 130;
+		Zeny -= 130;
 		close2;
 		openmail;
 		end;
@@ -51,87 +51,87 @@
 
 // Prontera
 //============================================================
-prontera,146,86,0	duplicate(MailBox)	Mailbox#prt	888
-prontera,275,213,0	duplicate(MailBox)	Mailbox#2prt	888
-prontera,34,212,0	duplicate(MailBox)	Mailbox#3prt	888
+prontera,146,86,0	duplicate(MailBox)	Mailbox#prt	2_POSTBOX
+prontera,275,213,0	duplicate(MailBox)	Mailbox#2prt	2_POSTBOX
+prontera,34,212,0	duplicate(MailBox)	Mailbox#3prt	2_POSTBOX
 
 // Izlude
 //============================================================
-izlude,136,94,0	duplicate(MailBox)	Mailbox#iz	888
+izlude,136,94,0	duplicate(MailBox)	Mailbox#iz	2_POSTBOX
 
 // Morroc
 //============================================================
-moc_ruins,72,166,0	duplicate(MailBox)	Mailbox#1moc	888
-moc_ruins,156,52,0	duplicate(MailBox)	Mailbox#2moc	888
+moc_ruins,72,166,0	duplicate(MailBox)	Mailbox#1moc	2_POSTBOX
+moc_ruins,156,52,0	duplicate(MailBox)	Mailbox#2moc	2_POSTBOX
 
 // Geffen
 //============================================================
-geffen,115,67,0	duplicate(MailBox)	Mailbox#gef	888
-geffen,199,125,0	duplicate(MailBox)	Mailbox#2gef	888
+geffen,115,67,0	duplicate(MailBox)	Mailbox#gef	2_POSTBOX
+geffen,199,125,0	duplicate(MailBox)	Mailbox#2gef	2_POSTBOX
 
 // Payon
 //============================================================
-payon,191,104,0	duplicate(MailBox)	Mailbox#pay	888
-payon,171,226,0	duplicate(MailBox)	Mailbox#2pay	888
-pay_arche,55,127,0	duplicate(MailBox)	Mailbox#3pay	888
+payon,191,104,0	duplicate(MailBox)	Mailbox#pay	2_POSTBOX
+payon,171,226,0	duplicate(MailBox)	Mailbox#2pay	2_POSTBOX
+pay_arche,55,127,0	duplicate(MailBox)	Mailbox#3pay	2_POSTBOX
 
 // Alberta
 //============================================================
-alberta,90,60,0	duplicate(MailBox)	Mailbox#alb	888
-alberta,30,240,0	duplicate(MailBox)	Mailbox#2alb	888
+alberta,90,60,0	duplicate(MailBox)	Mailbox#alb	2_POSTBOX
+alberta,30,240,0	duplicate(MailBox)	Mailbox#2alb	2_POSTBOX
 
 // Al De Baran
 //============================================================
-aldebaran,135,122,0	duplicate(MailBox)	Mailbox#alde	888
+aldebaran,135,122,0	duplicate(MailBox)	Mailbox#alde	2_POSTBOX
 
 // Juno
 //============================================================
-yuno,148,187,0	duplicate(MailBox)	Mailbox#yuno	888
-yuno,332,108,0	duplicate(MailBox)	Mailbox#2yuno	888
+yuno,148,187,0	duplicate(MailBox)	Mailbox#yuno	2_POSTBOX
+yuno,332,108,0	duplicate(MailBox)	Mailbox#2yuno	2_POSTBOX
 
 // Lightalzen
 //============================================================
-lighthalzen,164,85,0	duplicate(MailBox)	Mailbox#lht	888
-lighthalzen,196,320,0	duplicate(MailBox)	Mailbox#2lht	888
+lighthalzen,164,85,0	duplicate(MailBox)	Mailbox#lht	2_POSTBOX
+lighthalzen,196,320,0	duplicate(MailBox)	Mailbox#2lht	2_POSTBOX
 
 // Einbroch and Einbech
 //============================================================
-einbroch,231,215,0	duplicate(MailBox)	Mailbox#ein	888
-einbroch,77,202,0	duplicate(MailBox)	Mailbox#2ein	888
-einbech,182,124,0	duplicate(MailBox)	Mailbox#3ein	888
+einbroch,231,215,0	duplicate(MailBox)	Mailbox#ein	2_POSTBOX
+einbroch,77,202,0	duplicate(MailBox)	Mailbox#2ein	2_POSTBOX
+einbech,182,124,0	duplicate(MailBox)	Mailbox#3ein	2_POSTBOX
 
 // Comodo
 //============================================================
-comodo,200,150,0	duplicate(MailBox)	Mailbox#cmd	888
+comodo,200,150,0	duplicate(MailBox)	Mailbox#cmd	2_POSTBOX
 
 // Umbala
 //============================================================
-umbala,104,155,0	duplicate(MailBox)	Mailbox#um	888
+umbala,104,155,0	duplicate(MailBox)	Mailbox#um	2_POSTBOX
 
 // Amatsu
 //============================================================
-amatsu,102,146,0	duplicate(MailBox)	Mailbox#ama	888
+amatsu,102,146,0	duplicate(MailBox)	Mailbox#ama	2_POSTBOX
 
 // Gonryun
 //============================================================
-gonryun,152,117,0	duplicate(MailBox)	Mailbox#gon	888
+gonryun,152,117,0	duplicate(MailBox)	Mailbox#gon	2_POSTBOX
 
 // Ayothaya
 //============================================================
-ayothaya,205,169,0	duplicate(MailBox)	Mailbox#ayo	888
+ayothaya,205,169,0	duplicate(MailBox)	Mailbox#ayo	2_POSTBOX
 
 // Louyang
 //============================================================
-louyang,204,100,0	duplicate(MailBox)	Mailbox#lou	888
+louyang,204,100,0	duplicate(MailBox)	Mailbox#lou	2_POSTBOX
 
 // Hugel
 //============================================================
-hugel,86,168,0	duplicate(MailBox)	Mailbox#hu	111
+hugel,86,168,0	duplicate(MailBox)	Mailbox#hu	HIDDEN_NPC
 
 // Rachel
 //============================================================
-rachel,122,146,0	duplicate(MailBox)	Post Box#ra	888
+rachel,122,146,0	duplicate(MailBox)	Post Box#ra	2_POSTBOX
 
 // Veins
 //============================================================
-veins,218,123,0	duplicate(MailBox)	Post Box#ve	888
+veins,218,123,0	duplicate(MailBox)	Post Box#ve	2_POSTBOX
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index 59771c077..be909a207 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -1,25 +1,28 @@
 //===== Hercules Script ======================================
 //= Player Marriage
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
+//= [Official Conversion]
 //= Official Marriage script.
 //= Added isloggedin() check, even though Aegis doesn't do it.
-//= Currently does not support same-sex marriages.
+//= Currently does not support same-Sex marriages.
 //= Old script located in: npc/custom/marriage.txt
 //= - Variable in use: wedding_sign (max 1)
-//= - Variable in use: $Wedding (max 1) 
-//= - Variab;e in use: $wed_groom$ $wed_bride$
-//===== Additional Comments: ================================= 
+//= - Variable in use: $@wedding (max 1)
+//= - Variable in use: $@wed_groom$ $@wed_bride$
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Fixed a missing ")" [L0ne_W0lf]
 //= 1.2 Corrected duration of Wedding status. [L0ne_W0lf]
+//= 1.3 Changed permanent global variables to temporary ones. [Euphy]
+//=     Added GM NPCs (commented).
+//= 1.4 Added GM management function. [Euphy]
 //============================================================
 
-prt_church,97,100,4	script	Wedding Staff#w	71,{
+prt_church,97,100,4	script	Wedding Staff#w	1_F_LIBRARYGIRL,{
 	cutin "wedding_marry01",2;
 	if (Upper == 2) {
 		mes "[Marry Happy]";
@@ -179,7 +182,7 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 
 	case 3:
 		cutin "wedding_marry02",2;
-		if (sex) {
+		if (Sex) {
 			mes "[Marry Happy]";
 			mes "So you'd like to get married?";
 			mes "As a groom, you need to prepare";
@@ -254,8 +257,8 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 				mes "back after you find it, okay?";
 				goto L_End;
 			}
-			else if (sex) {
-				if (zeny < 1300000) {
+			else if (Sex) {
+				if (Zeny < 1300000) {
 					mes "[Marry Happy]";
 					mes "I'm sorry, but you don't";
 					mes "have the 1,300,000 zeny";
@@ -275,8 +278,8 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 					goto L_End;
 				}
 			}
-			else if (sex == 0) {
-				if (zeny < 1200000) {
+			else if (Sex == 0) {
+				if (Zeny < 1200000) {
 					mes "[Marry Happy]";
 					mes "I'm sorry, but all brides";
 					mes "must pay the 1,200,000";
@@ -312,17 +315,15 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 			next;
 			while(1) {
 				input .@name$;
-				if (.@name$ != strcharinfo(0)) {
-					mes "[Marry Happy]";
-					mes "Hmmm, you have to write";
-					mes "down your name exactly as";
-					mes "it is displayed. Maybe you";
-					mes "need to copy and paste it?";
-					mes "Anyway, let's try it again.";
-					next;
-				}
-				else 
+				if (.@name$ == strcharinfo(0))
 					break;
+				mes "[Marry Happy]";
+				mes "Hmmm, you have to write";
+				mes "down your name exactly as";
+				mes "it is displayed. Maybe you";
+				mes "need to copy and paste it?";
+				mes "Anyway, let's try it again.";
+				next;
 			}
 			mes "[Marry Happy]";
 			mes "Great, it looks like we";
@@ -338,17 +339,17 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 			mes "process, both of you should";
 			mes "speak to the Bishop to begin";
 			mes "the wedding ceremony.";
-			Emotion e_lv;
+			emotion e_lv;
 			next;
 			mes "[Marry Happy]";
-			if (sex) {
+			if (Sex) {
 				mes "Since you're the groom,";
 				mes "you need to speak to the";
 				mes "Bishop first. When you're";
 				mes "finished, it will be your";
 				mes "bride's turn to speak to";
 				mes "Bishop Vomars.";
-				set zeny,zeny-1300000;
+				Zeny -= 1300000;
 				delitem 7170,1; //Tuxedo
 			}
 			else {
@@ -358,7 +359,7 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 				mes "Vomars first. When he's";
 				mes "finished, it'll be your turn";
 				mes "to speak to Bishop Vomars.";
-				set zeny,zeny-1200000;
+				Zeny -= 1200000;
 				delitem 2338,1; //Wedding_Dress
 			}
 			delitem 2613,1; //Diamond_Ring
@@ -382,7 +383,7 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 		donpcevent "Single Army#Payon::OnEnable";
 		donpcevent "Single Army#Amatsu::OnEnable";
 		donpcevent "Single Army#Gonryun::OnEnable";
-		Emotion e_omg;
+		emotion e_omg;
 		mes "[Single Army]";
 		mes "^CC9933You have to refine";
 		mes "items on your own to";
@@ -422,7 +423,7 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 		emotion e_rock,0,"Single Army#Gonryun";
 		close2;
 		cutin "wedding_marry01",255;
-		Emotion e_swt;
+		emotion e_swt;
 		donpcevent "Single Army#Prontera::OnInit";
 		donpcevent "Single Army#Geffen::OnInit";
 		donpcevent "Single Army#Morocc::OnInit";
@@ -441,7 +442,7 @@ L_End:
 	end;
 }
 
-prt_church,97,102,0	script	Single Army#Prontera	105,{
+prt_church,97,102,0	script	Single Army#Prontera	8W_SOLDIER,{
 	mes "[Single Army]";
 	mes "^CC9933You have to refine";
 	mes "items on your own to";
@@ -458,7 +459,7 @@ OnEnable:
 	end;
 }
 
-prt_church,98,102,0	script	Single Army#Geffen	705,{
+prt_church,98,102,0	script	Single Army#Geffen	4_M_GEF_SOLDIER,{
 	mes "[Single Army]";
 	mes "^330099It's a waste to";
 	mes "form parties in";
@@ -476,7 +477,7 @@ OnEnable:
 	end;
 }
 
-prt_church,99,102,0	script	Single Army#Morocc	707,{
+prt_church,99,102,0	script	Single Army#Morocc	4_M_MOC_SOLDIER,{
 	mes "[Single Army]";
 	mes "^666666Hell, I've trained";
 	mes "all by myself since";
@@ -494,7 +495,7 @@ OnEnable:
 	end;
 }
 
-prt_church,100,102,0	script	Single Army#Payon	708,{
+prt_church,100,102,0	script	Single Army#Payon	4_M_PAY_SOLDIER,{
 	mes "[Single Army]";
 	mes "^666600I CHOOSE to spend";
 	mes "Christmas alone...";
@@ -512,7 +513,7 @@ OnEnable:
 	end;
 }
 
-prt_church,101,102,0	script	Single Army#Amatsu	767,{
+prt_church,101,102,0	script	Single Army#Amatsu	8_M_JPNSOLDIER,{
 	mes "[Single Army]";
 	mes "^CC9966Women may break my";
 	mes " spirit, but they'll never";
@@ -529,7 +530,7 @@ OnEnable:
 	end;
 }
 
-prt_church,102,102,0	script	Single Army#Gonryun	780,{
+prt_church,102,102,0	script	Single Army#Gonryun	8_M_TWSOLDIER,{
 	mes "[Single Army]";
 	mes "^669900...We're the free! We're";
 	mes "the Invincible Single Army!^000000";
@@ -545,7 +546,7 @@ OnEnable:
 	end;
 }
 
-prt_church,100,128,4	script	Bishop#w	60,{
+prt_church,100,128,4	script	Bishop#w	1_M_PASTOR,{
 	cutin "wedding_bomars01",2;
 	if (Upper == 2) {
 		mes "[Vomars]";
@@ -559,13 +560,13 @@ prt_church,100,128,4	script	Bishop#w	60,{
 	}
 
 	if (!getpartnerid()) {
-		if (!$wedding) {
+		if (!$@wedding) {
 			if (wedding_sign == 1) {
 				getpartymember(getcharid(1));
 				set .@partymembercount,$@partymembercount;
 				if (.@partymembercount == 2) {
-					if (sex) {
-						set $wedding,1;
+					if (Sex) {
+						set $@wedding,1;
 						initnpctimer;
 						mes "[Vomars]";
 						mes "Young lovers, please";
@@ -583,23 +584,23 @@ prt_church,100,128,4	script	Bishop#w	60,{
 						mes "her and protect her. Now, may";
 						mes "I know the name of your bride?";
 						next;
-						input $wed_bride$;
+						input $@wed_bride$;
 						mes "[Vomars]";
 						mes "Mr. " + strcharinfo(0) + "...";
 						mes "Do you swear on your life";
 						mes "that you will forever cherish";
 						mes "and care for your bride,";
-						mes "Miss " + $wed_bride$ + "?";
+						mes "Miss " + $@wed_bride$ + "?";
 						next;
 						select("I do.");
-						set $wed_groom$,strcharinfo(0);
+						set $@wed_groom$,strcharinfo(0);
 						mes "[Vomars]";
 						mes "Now, it is time for";
 						mes "your bride to make";
 						mes "her wedding vows.";
 						mes "If she will come forward...";
 						close2;
-						mapannounce "prt_church","The groom, Mr. " + strcharinfo(0) + ", has made his vows to Miss " + $wed_bride$ + "...",bc_map;
+						mapannounce "prt_church","The groom, Mr. " + strcharinfo(0) + ", has made his vows to Miss " + $@wed_bride$ + "...",bc_map;
 						cutin "",255;
 						end;
 					}
@@ -630,13 +631,13 @@ prt_church,100,128,4	script	Bishop#w	60,{
 			mes "to prepare for marriage.";
 			goto L_End;
 		}
-		else if ($wedding == 1) {
+		else if ($@wedding == 1) {
 			if (wedding_sign == 1) {
 				getpartymember(getcharid(1));
 				set .@partymembercount,$@partymembercount;
 				if (.@partymembercount == 2) {
-					if (sex == 0) {
-						if (strcharinfo(0) == $wed_bride$) {
+					if (Sex == 0) {
+						if (strcharinfo(0) == $@wed_bride$) {
 							mes "[Vomars]";
 							mes "Young lovers, please";
 							mes "remember this moment for";
@@ -644,11 +645,11 @@ prt_church,100,128,4	script	Bishop#w	60,{
 							mes "and joy. May the love you share";
 							mes "grow with each passing day.";
 							next;
-							mapannounce "prt_church","Let's hear what the bride, Miss "+$wed_bride$+", has to say...",bc_map;
+							mapannounce "prt_church","Let's hear what the bride, Miss "+$@wed_bride$+", has to say...",bc_map;
 							mes "[Vomars]";
-							mes "Miss "+$wed_bride$+"...";
+							mes "Miss "+$@wed_bride$+"...";
 							mes "Do you swear to stay";
-							mes "true to "+$wed_groom$+",";
+							mes "true to "+$@wed_groom$+",";
 							mes "to be by his side, no matter";
 							mes "what the dangers may be?";
 							next;
@@ -656,12 +657,12 @@ prt_church,100,128,4	script	Bishop#w	60,{
 								cutin "wedding_bomars03",2;
 								mapannounce "prt_church","Next couple, please proceed...",bc_map;
 								mes "[Vomars]";
-								mes "So "+$wed_groom$;
+								mes "So "+$@wed_groom$;
 								mes "isn't the one you";
 								mes "want to marry? Hmm.";
 								mes "I'm truly sorry for this";
 								mes "misunderstanding...";
-								set $wedding,0;
+								set $@wedding,0;
 								close2;
 								stopnpctimer;
 								cutin "",255;
@@ -670,25 +671,25 @@ prt_church,100,128,4	script	Bishop#w	60,{
 							mes "[Vomars]";
 							mes "Do you truly swear";
 							mes "fidelity and patience?";
-							mes "Will you marry "+$wed_groom$+"?";
+							mes "Will you marry "+$@wed_groom$+"?";
 							next;
 							if (select("Yes, I do.:^FF0000No.^000000") == 1) {
-								if (isloggedin(getcharid(3,$wed_groom$))) {
-									if (marriage($wed_groom$)) {
+								if (isloggedin(getcharid(3,$@wed_groom$))) {
+									if (marriage($@wed_groom$)) {
 										//Call Wedding effect
 										wedding;
 										//Give ring to Bride, and change to wedding sprite.
-										sc_start SC_Wedding,3600000,1;
+										sc_start SC_WEDDING,3600000,1;
 										getitem 2635,1; //Bride_Ring
 										//Give ring to Groom, and change to wedding sprite.
-										attachrid(getcharid(3,$wed_groom$));
-										sc_start SC_Wedding,3600000,1;
+										attachrid(getcharid(3,$@wed_groom$));
+										sc_start SC_WEDDING,3600000,1;
 										getitem 2634,1; //Bridegroom_Ring
 										detachrid;
 										//Switch Script progression back to Bride
-										attachrid(getcharid(3,$wed_bride$));
+										attachrid(getcharid(3,$@wed_bride$));
 										cutin "wedding_bomars02",2;
-										mapannounce "prt_church","I now pronounce you, "+$wed_groom$+" and "+$wed_bride$+", husband and wife.",bc_map;
+										mapannounce "prt_church","I now pronounce you, "+$@wed_groom$+" and "+$@wed_bride$+", husband and wife.",bc_map;
 										mes "[Vomars]";
 										mes "By the power invested";
 										mes "in me as Royal Bishop of";
@@ -700,10 +701,10 @@ prt_church,100,128,4	script	Bishop#w	60,{
 										mes "[Vomars]";
 										mes "And lastly...";
 										mes "Always be happy,";
-										mes "dear "+$wed_bride$+"...";
-										set $wed_groom$,"";
-										set $wed_bride$,"";
-										set $wedding,0;
+										mes "dear "+$@wed_bride$+"...";
+										set $@wed_groom$,"";
+										set $@wed_bride$,"";
+										set $@wedding,0;
 										close2;
 										stopnpctimer;
 										cutin "",255;
@@ -722,7 +723,7 @@ prt_church,100,128,4	script	Bishop#w	60,{
 							}
 							else {
 								cutin "wedding_bomars03",2;
-								mapannounce "prt_church","Alas! "+$wed_bride$+" has rejected "+$wed_groom$+"'s marriage proposal!",bc_map;
+								mapannounce "prt_church","Alas! "+$@wed_bride$+" has rejected "+$@wed_groom$+"'s marriage proposal!",bc_map;
 								mes "[Vomars]";
 								mes "Hm. It seems that";
 								mes "you've changed your";
@@ -731,9 +732,9 @@ prt_church,100,128,4	script	Bishop#w	60,{
 								mes "must do what your heart";
 								mes "tells you is right. Now, run!";
 							}
-							set $wed_groom$,"";
-							set $wed_bride$,"";
-							set $wedding,0;
+							set $@wed_groom$,"";
+							set $@wed_bride$,"";
+							set $@wedding,0;
 							close2;
 							stopnpctimer;
 							cutin "",255;
@@ -745,7 +746,7 @@ prt_church,100,128,4	script	Bishop#w	60,{
 				}
 				callsub S_Busy;
 			}
-			if (strcharinfo(0) == $wed_bride$) {
+			if (strcharinfo(0) == $@wed_bride$) {
 				mes "[Vomars]";
 				mes "Hm? It appears that";
 				mes "Happy Marry still hasn't";
@@ -773,11 +774,11 @@ L_End:
 	end;
 
 S_Busy:
-	if ($wed_groom$ != "" && $wed_bride$ != "") {
+	if ($@wed_groom$ != "" && $@wed_bride$ != "") {
 		mes "[Vomars]";
 		mes "The wedding of";
-		mes "Miss "+ $wed_bride$ +" and";
-		mes "Mister "+ $wed_groom$;
+		mes "Miss "+ $@wed_bride$ +" and";
+		mes "Mister "+ $@wed_groom$;
 		mes "is currently in progress.";
 		mes "Please keep your voice down.";
 		goto L_End;
@@ -789,25 +790,169 @@ S_Busy:
 	mes "turn. Thanks for understanding... ^FFFFFF ^000000";
 	goto L_End;
 
-OnInit:
-	set $wedding,0;
-	end;
-
 OnStop:
 	stopnpctimer;
 	end;
 
 OnReset:
-	set $wed_groom$,"";
-	set $wed_bride$,"";
-	set $wedding,0;
+	set $@wed_groom$,"";
+	set $@wed_bride$,"";
+	set $@wedding,0;
 	end;
 
 OnTimer180000:
 	mapannounce "prt_church","You've responded too slowly... Next couple, please proceed.",bc_map;
-	set $wed_groom$,"";
-	set $wed_bride$,"";
-	set $wedding,0;
+	donpcevent "Bishop#w::OnReset";
 	stopnpctimer;
 	end;
 }
+
+prt_church,28,178,4	script	The King of Midgart	1_M_PRON_KING,{
+	callfunc "F_GM_NPC";
+	mes "[Vomars]";
+	mes "Wh-who are you?";
+	mes "You must know the";
+	mes "password to invoke";
+	mes "my awesome powers.";
+	next;
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "[Vomars]";
+		mes "This is";
+		mes "no place for";
+		mes "fooling around.";
+		close2;
+		warp "prt_church",101,102;
+		end;
+	}
+	mes "[Wedding Switch]";
+	mes "Is there a problem with";
+	mes "the wedding ceremony?";
+	mes "I can reset the Bishop";
+	mes "Vomars NPC if you like.";
+	next;
+	switch(select("No, thanks:RESET")) {
+	case 1:
+		mes "[Wedding Switch]";
+		mes "Alright, then.";
+		mes "However, if the";
+		mes "Bishop Vomars";
+		mes "NPC is stuck, it may";
+		mes "be best to reset it.";
+		close;
+	case 2:
+		donpcevent "Bishop#w::OnStop";
+		donpcevent "Bishop#w::OnReset";
+		mapannounce "prt_church","You've responded too slowly... Next couple, please proceed.",bc_map;
+		mes "[Wedding Switch]";
+		mes "The Bishop Vomars NPC";
+		mes "has now been reactivated.";
+		mes "It should now be possible";
+		mes "to proceed with weddings.";
+		close;
+	}
+}
+
+prt_church,20,179,4	script	Divorce Staff	1_F_LIBRARYGIRL,{
+	callfunc "F_GM_NPC";
+	mes "[Bad Ending]";
+	mes "Uh oh...";
+	mes "You know I can't";
+	mes "do anything for you.";
+	next;
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "[Bad Ending]";
+		mes "Hmm...";
+		mes "You really";
+		mes "shouldn't be";
+		mes "in this place...";
+		close;
+	}
+	mes "[Bad Ending]";
+	mes "Great, you know the";
+	mes "password! Now, did you";
+	mes "want me to remove the";
+	mes "Wedding Ring in your";
+	mes "inventory?";
+	next;
+	switch(select("Drop 1 Wedding Ring.:Keep it.")) {
+	case 1:
+		set .@ring, (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring
+		if (countitem(.@ring)) {
+			delitem .@ring,1;
+			mes "[Bad Ending]";
+			mes "It's done!";
+		} else {
+			mes "[Bad Ending]";
+			mes "I couldn't find";
+			mes "the Wedding Ring...";
+			mes "Please make sure";
+			mes "that it's not equipped.";
+		}
+		close;
+	case 2:
+		mes "[Bad Ending]";
+		mes "You sure you want";
+		mes "to keep that ring?";
+		mes "Alright, but if it becomes";
+		mes "a problem, you come to me.";
+		close;
+	}
+}
+
+prt_church,22,179,4	script	Remarry Staff	1_F_LIBRARYGIRL,{
+	callfunc "F_GM_NPC";
+	mes "[Wedding Again]";
+	mes "Hmm...?";
+	mes "What exactly are";
+	mes "you doing here?";
+	next;
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "[Wedding Again]";
+		mes "Ahk!";
+		mes "An adventurer";
+		mes "like you shouldn't";
+		mes "be in this place!";
+		close;
+	}
+	if (getpartnerid()) {
+		mes "[Wedding Again]";
+		mes "Hmm...";
+		mes "I can only create";
+		mes "a Wedding Ring if the";
+		mes "character is married.";
+		close;
+	}
+	mes "[Wedding Again]";
+	mes "Ah, I see that you";
+	mes "know the password.";
+	mes "Alright, if you somehow";
+	mes "lost your Wedding Ring,";
+	mes "I can make you a new one.";
+	next;
+	switch(select("Make new Wedding Ring.:Cancel.")) {
+	case 1:
+		set .@ring, (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring
+		if (countitem(.@ring) || isequipped(.@ring)) {
+			mes "[Wedding Again]";
+			mes "Wait, wait...";
+			mes "You're wearing your";
+			mes "Wedding Ring. I better";
+			mes "not make you another since";
+			mes "you don't need more than one.";
+		} else {
+			getitem .@ring,1;
+			mes "[Wedding Again]";
+			mes "Here you go~";
+			mes "It's your brand";
+			mes "new Wedding Ring!";
+		}
+		close;
+	case 2:
+		mes "[Wedding Again]";
+		mes "Alright. If you ever";
+		mes "lose your Wedding Ring,";
+		mes "come to me if you happen";
+		mes "to need a new one, okay?";
+		close;
+	}
+}
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index 28221ad34..422a5ac5b 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -1,29 +1,29 @@
 //===== Hercules Script ======================================
 //= Mercenary related NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Sells Lancer, Sword, and Archer mercenaries,
 //= along with related mercenary items.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Optimization. [Zephyrus]
 //= 1.2 Removed redundent input. [L0ne_W0lf]
 //= 1.3 Duplicates now spawned from floating NPCs. [L0ne_W0lf]
 //= 1.4 Optimized and fixed wrong item id. [Joseph]
-//============================================================ 
+//============================================================
 
 -	script	Mercenary Manager#main	-1,{
 	setarray .@name$, 	"Spear", 			"Sword", 			"Bow";
 	setarray .@faith$, 	"SPEAR_MERC_GUILD",	"SWORD_MERC_GUILD",	"ARCH_MERC_GUILD";
 	setarray .@item, 	12182,				12172,				12162;
-	set .@faith_lancer, mercenary_get_faith(getd(.@faith$[.@type]));
 	set .@npc$, strnpcinfo(2);
 	for (set .@size, getarraysize(.@name$); .@i < .@size; set .@i, .@i + 1)
 		if (.@npc$ == .@name$[.@i]) set .@type, .@i;
+	set .@faith_merc, mercenary_get_faith(getd(.@faith$[.@type]));
 	mes "[Mercenary Manager]";
 	mes "Welcome to the";
 	mes .@npc$ + " Mercenary Guild.";
@@ -62,7 +62,7 @@
 				mes "free to come back if your";
 				mes "needs change. Thank you~";
 			}
-			else if(.@FaithCost && .@faith_lancer < .@FaithCost) {
+			else if(.@FaithCost && .@faith_merc < .@FaithCost) {
 				mes "[Mercenary Manager]";
 				mes "Oh... Your Loyalty rating";
 				mes "with the " + .@npc$ + " Mercenary";
@@ -94,7 +94,7 @@
 				mes "Summoned Mercenaries will";
 				mes "offer their support to you for";
 				mes "30 minutes. Take care now.";
-				set Zeny, Zeny - (.@ZenyCost * 1000);
+				Zeny -= (.@ZenyCost * 1000);
 				getitem .@item[.@type] - 10 + .@Grade, 1;
 			}
 			close;
@@ -176,7 +176,7 @@
 				mes "Mercenary. Have you considered";
 				mes "hiring a lower grade Mercenary?";
 			}
-			else if (.@faith_lancer < 500) {
+			else if (.@faith_merc < 500) {
 				mes "[Mercenary Manager]";
 				mes "I'm sorry, but your";
 				mes "Loyalty rating is too";
@@ -206,8 +206,8 @@
 			close;
 	}
 }
-prontera,41,337,5	duplicate(Mercenary Manager#main)	Mercenary Manager#Spear	105
-pay_arche,99,167,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Bow	732
+prontera,41,337,5	duplicate(Mercenary Manager#main)	Mercenary Manager#Spear	8W_SOLDIER
+pay_arche,99,167,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Bow	4_M_JOB_HUNTER
 
 // Mercenary Merchant NPCs
 //============================================================
@@ -271,7 +271,7 @@ pay_arche,99,167,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Bow	732
 		close;
 	}
 	mes "[Mercenary Goods Merchant]";
-	if (.@input == 1) 
+	if (.@input == 1)
 		mes "Here's your " + getitemname(.@item[.@m]) + ".";
 	else {
 		mes "Here you are, this is exactly";
@@ -280,9 +280,9 @@ pay_arche,99,167,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Bow	732
 	mes "Thank you, and please come";
 	mes "again when you need more";
 	mes "potions for your Mercenaries.";
-	set Zeny, Zeny - .@total_po;
+	Zeny -= .@total_po;
 	getitem .@item[.@m], .@input;
 	close;
 }
-prontera,30,337,4	duplicate(MercMerchant)	Mercenary Merchant#Spear	700
-pay_arche,102,167,5	duplicate(MercMerchant)	Mercenary Merchant#Bow	879
+prontera,30,337,4	duplicate(MercMerchant)	Mercenary Merchant#Spear	8_F_GIRL
+pay_arche,102,167,5	duplicate(MercMerchant)	Mercenary Merchant#Bow	4_F_CAPEGIRL
diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt
index d1202b33d..fae93fd3e 100644
--- a/npc/other/monster_museum.txt
+++ b/npc/other/monster_museum.txt
@@ -1,26 +1,26 @@
 //===== Hercules Script ======================================
 //= Juno Monster Museum
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib (The Prometheus Project)
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Juno Monster Museum - Non Player Character Locations
 //= - Information about various monsters
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 // 07/06/05 : Added 1st Version. [Muad_Dib]
-//= Adapted to rAthena Scripting Language by [Lance] 
+//= Adapted to rAthena Scripting Language by [Lance]
 //= 1.1a Fixed typos [Haplo]
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.3 Added a Missing "case 1:". [Samuray22]
 //	-Thanks to Dr.Evil
 //= 1.4 Corrected a few typos. (bugreport:1077) [L0ne_W0lf]
 //= 1.4a "S_BonusREward" -> "S_BonusReward" [Paradox924X]
-//============================================================ 
+//============================================================
 
-yuno_in03,32,15,3	script	Museum Guide	67,{
+yuno_in03,32,15,3	script	Museum Guide	1_F_02,{
 	mes "[Cenia]";
 	mes "Welcome to the Monster Museum.";
 	next;
@@ -60,10 +60,10 @@ yuno_in03,32,15,3	script	Museum Guide	67,{
 	close;
 }
 	
-yuno_in03,36,21,3	script	Deviace#yuno	1108,{
+yuno_in03,36,21,3	script	Deviace#yuno	DEVIACE,{
 	end;
 }
-yuno_in03,33,21,1	script	#DEVIACE	111,{
+yuno_in03,33,21,1	script	#DEVIACE	HIDDEN_NPC,{
 	mes " ";
 	mes "Scientific name : Deviace";
 	mes "Size : Medium";
@@ -86,10 +86,10 @@ yuno_in03,33,21,1	script	#DEVIACE	111,{
 	close;
 }
 	
-yuno_in03,36,27,3	script	Seal#yuno	1317,{
+yuno_in03,36,27,3	script	Seal#yuno	FUR_SEAL,{
 	end;
 }
-yuno_in03,33,27,1	script	#FUR_SEAL	111,{
+yuno_in03,33,27,1	script	#FUR_SEAL	HIDDEN_NPC,{
 	mes " ";
 	mes "Scientific name : Seal";
 	mes "Size : Medium";
@@ -112,10 +112,10 @@ yuno_in03,33,27,1	script	#FUR_SEAL	111,{
 	close;
 }
 	
-yuno_in03,36,33,3	script	Sage Worm#yuno	1281,{
+yuno_in03,36,33,3	script	Sage Worm#yuno	SAGEWORM,{
 	end;
 }
-yuno_in03,33,33,1	script	#SAGEWORM	111,{
+yuno_in03,33,33,1	script	#SAGEWORM	HIDDEN_NPC,{
 	mes " ";
 	mes "Scientific name : Sage Worm";
 	mes "Size : Small";
@@ -134,10 +134,10 @@ yuno_in03,33,33,1	script	#SAGEWORM	111,{
 	close;
 }
 	
-yuno_in03,39,39,3	script	Penomena#yuno	1216,{
+yuno_in03,39,39,3	script	Penomena#yuno	PENOMENA,{
 	end;
 }
-yuno_in03,38,39,1	script	#PENOMANA	111,{
+yuno_in03,38,39,1	script	#PENOMANA	HIDDEN_NPC,{
 	mes " ";
 	mes "Scientific name : Penomena";
 	mes "Size : Medium";
@@ -160,10 +160,10 @@ yuno_in03,38,39,1	script	#PENOMANA	111,{
 	close;
 }
 	
-yuno_in03,39,44,3	script	Galapago#yuno	1391,{
+yuno_in03,39,44,3	script	Galapago#yuno	GALAPAGO,{
 	end;
 }
-yuno_in03,37,44,3	script	#GALAPAGO	111,{
+yuno_in03,37,44,3	script	#GALAPAGO	HIDDEN_NPC,{
 	mes " ";
 	mes "Scientific name : Galapago";
 	mes "Size : Small";
@@ -181,10 +181,10 @@ yuno_in03,37,44,3	script	#GALAPAGO	111,{
 	close;
 }
 	
-yuno_in03,15,21,5	script	Raydric#yuno	1163,{
+yuno_in03,15,21,5	script	Raydric#yuno	RAYDRIC,{
 	end;
 }
-yuno_in03,19,21,1	script	#RAYDRIC	111,{
+yuno_in03,19,21,1	script	#RAYDRIC	HIDDEN_NPC,{
 	mes " ";
 	mes "Scientific name : Raydric";
 	mes "Size : Large";
@@ -202,10 +202,10 @@ yuno_in03,19,21,1	script	#RAYDRIC	111,{
 	close;
 }
 	
-yuno_in03,15,27,5	script	Chepet#yuno	1250,{
+yuno_in03,15,27,5	script	Chepet#yuno	CHEPET,{
 	end;
 }
-yuno_in03,19,27,1	script	#CHEPET	111,{
+yuno_in03,19,27,1	script	#CHEPET	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Chepet";
 	mes " Size : Medium";
@@ -221,10 +221,10 @@ yuno_in03,19,27,1	script	#CHEPET	111,{
 	close;
 }
 	
-yuno_in03,15,33,5	script	Violy#yuno	1390,{
+yuno_in03,15,33,5	script	Violy#yuno	VIOLY,{
 	end;
 }
-yuno_in03,19,33,1	script	#VIOLY	111,{
+yuno_in03,19,33,1	script	#VIOLY	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Violy";
 	mes " Size : Medium";
@@ -238,10 +238,10 @@ yuno_in03,19,33,1	script	#VIOLY	111,{
 	close;
 }
 	
-yuno_in03,10,39,5	script	Alice#yuno	1275,{
+yuno_in03,10,39,5	script	Alice#yuno	ALICE,{
 	end;
 }
-yuno_in03,12,39,1	script	#ALICE	111,{
+yuno_in03,12,39,1	script	#ALICE	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Alice ";
 	mes " Size : Medium";
@@ -260,10 +260,10 @@ yuno_in03,12,39,1	script	#ALICE	111,{
 	close;
 }
 	
-yuno_in03,10,45,5	script	Assulter#yuno	1315,{
+yuno_in03,10,45,5	script	Assulter#yuno	ASSULTER,{
 	end;
 }
-yuno_in03,12,45,1	script	#ASSULTER	111,{
+yuno_in03,12,45,1	script	#ASSULTER	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Assulter";
 	mes " Size : Medium";
@@ -285,20 +285,20 @@ yuno_in03,12,45,1	script	#ASSULTER	111,{
 	close;
 }
 	
-yuno_in03,38,50,3	script	PecoPeco Egg#yuno	1047,{
+yuno_in03,38,50,3	script	PecoPeco Egg#yuno	PECOPECO_EGG,{
 	end;
 }
-yuno_in03,34,54,3	script	Thief Bug Egg#yuno	1048,{
+yuno_in03,34,54,3	script	Thief Bug Egg#yuno	THIEF_BUG_EGG,{
 	end;
 }
-yuno_in03,12,50,3	script	Ant Egg#yuno	1097,{
+yuno_in03,12,50,3	script	Ant Egg#yuno	ANT_EGG,{
 	end;
 }
 
-yuno_in03,18,96,5	script	Wanderer#yuno	1208,{
+yuno_in03,18,96,5	script	Wanderer#yuno	WANDER_MAN,{
 	end;
 }
-yuno_in03,20,96,1	script	#WANDER_MAN	111,{
+yuno_in03,20,96,1	script	#WANDER_MAN	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Wanderer";
 	mes " Size : Medium";
@@ -317,10 +317,10 @@ yuno_in03,20,96,1	script	#WANDER_MAN	111,{
 	close;
 }
 	
-yuno_in03,16,100,5	script	Caterpillar#yuno	1300,{
+yuno_in03,16,100,5	script	Caterpillar#yuno	CATERPILLAR,{
 	end;
 }
-yuno_in03,18,100,1	script	#CATERPILLAR	111,{
+yuno_in03,18,100,1	script	#CATERPILLAR	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Caterpillar";
 	mes " Size : Small";
@@ -339,10 +339,10 @@ yuno_in03,18,100,1	script	#CATERPILLAR	111,{
 	close;
 }
 	
-yuno_in03,16,104,5	script	Male Thiefbug#yuno	1054,{
+yuno_in03,16,104,5	script	Male Thiefbug#yuno	THIEF_BUG__,{
 	end;
 }
-yuno_in03,18,104,1	script	#THIEF_BUG__	111,{
+yuno_in03,18,104,1	script	#THIEF_BUG__	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Thief Bug";
 	mes " ^FFFFFFScientific name :^000000 (Male)";
@@ -357,10 +357,10 @@ yuno_in03,18,104,1	script	#THIEF_BUG__	111,{
 	close;
 }
 	
-yuno_in03,16,108,5	script	Tri Joint#yuno	1279,{
+yuno_in03,16,108,5	script	Tri Joint#yuno	TRI_JOINT,{
 	end;
 }
-yuno_in03,18,108,1	script	#TRI_JOINT	111,{
+yuno_in03,18,108,1	script	#TRI_JOINT	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Tri Joint";
 	mes " Size : Small";
@@ -377,10 +377,10 @@ yuno_in03,18,108,1	script	#TRI_JOINT	111,{
 	close;
 }
 	
-yuno_in03,16,111,5	script	Arclouz#yuno	1194,{
+yuno_in03,16,111,5	script	Arclouz#yuno	ARCLOUSE,{
 	end;
 }
-yuno_in03,18,111,1	script	#ARCLOUSE	111,{
+yuno_in03,18,111,1	script	#ARCLOUSE	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Arclouz";
 	mes " Size : Medium";
@@ -400,10 +400,10 @@ yuno_in03,18,111,1	script	#ARCLOUSE	111,{
 	close;
 }
 	
-yuno_in03,16,117,5	script	Dragon Tail#yuno	1321,{
+yuno_in03,16,117,5	script	Dragon Tail#yuno	DRAGON_TAIL,{
 	end;
 }
-yuno_in03,18,116,1	script	#DRAGON_TAIL	111,{
+yuno_in03,18,116,1	script	#DRAGON_TAIL	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Dragon Tail";
 	mes " Size : Medium";
@@ -419,10 +419,10 @@ yuno_in03,18,116,1	script	#DRAGON_TAIL	111,{
 	close;
 }
 	
-yuno_in03,46,96,3	script	Owl Duke#yuno	1320,{
+yuno_in03,46,96,3	script	Owl Duke#yuno	OWL_DUKE,{
 	end;
 }
-yuno_in03,44,96,1	script	#OWL_DUKE	111,{
+yuno_in03,44,96,1	script	#OWL_DUKE	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Owl Duke";
 	mes " Size : Large";
@@ -444,10 +444,10 @@ yuno_in03,44,96,1	script	#OWL_DUKE	111,{
 	close;
 }
 	
-yuno_in03,48,100,3	script	Marine Sphere#yuno	1142,{
+yuno_in03,48,100,3	script	Marine Sphere#yuno	MARINE_SPHERE,{
 	end;
 }
-yuno_in03,46,101,1	script	#MARINE_SPHERE	111,{
+yuno_in03,46,101,1	script	#MARINE_SPHERE	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Marine Sphere";
 	mes " Size : Small";
@@ -468,10 +468,10 @@ yuno_in03,46,101,1	script	#MARINE_SPHERE	111,{
 	close;
 }
 	
-yuno_in03,48,104,3	script	Mandragora#yuno	1020,{
+yuno_in03,48,104,3	script	Mandragora#yuno	MANDRAGORA,{
 	end;
 }
-yuno_in03,46,105,1	script	#MANDRAGORA	111,{
+yuno_in03,46,105,1	script	#MANDRAGORA	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Mandragora";
 	mes " Size : Medium";
@@ -499,10 +499,10 @@ yuno_in03,46,105,1	script	#MANDRAGORA	111,{
 	close;
 }
 	
-yuno_in03,48,108,3	script	Geographer#yuno	1368,{
+yuno_in03,48,108,3	script	Geographer#yuno	GEOGRAPHER,{
 	end;
 }
-yuno_in03,46,108,1	script	#GEOGRAPHER	111,{
+yuno_in03,46,108,1	script	#GEOGRAPHER	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Geographer";
 	mes " Size : Medium";
@@ -533,10 +533,10 @@ yuno_in03,46,108,1	script	#GEOGRAPHER	111,{
 	close;
 }
 	
-yuno_in03,48,112,3	script	Rafflesia#yuno	1162,{
+yuno_in03,48,112,3	script	Rafflesia#yuno	RAFFLESIA,{
 	end;
 }
-yuno_in03,46,112,1	script	#RAFFLESIA	111,{
+yuno_in03,46,112,1	script	#RAFFLESIA	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Rafflesia";
 	mes " Size : Small";
@@ -558,10 +558,10 @@ yuno_in03,46,112,1	script	#RAFFLESIA	111,{
 	close;
 }
 	
-yuno_in03,48,116,3	script	Stem Worm#yuno	1215,{
+yuno_in03,48,116,3	script	Stem Worm#yuno	STEM_WORM,{
 	end;
 }
-yuno_in03,45,116,1	script	#STEM_WORM	111,{
+yuno_in03,45,116,1	script	#STEM_WORM	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Stem Worm";
 	mes " Size : Medium";
@@ -577,10 +577,10 @@ yuno_in03,45,116,1	script	#STEM_WORM	111,{
 	close;
 }
 
-yuno_in03,24,124,3	script	Blazzer#yuno	1367,{
+yuno_in03,24,124,3	script	Blazzer#yuno	BLAZZER,{
 	end;
 }
-yuno_in03,24,122,1	script	#BLAZZER	111,{
+yuno_in03,24,122,1	script	#BLAZZER	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Blazzer";
 	mes " Size : Medium";
@@ -602,10 +602,10 @@ yuno_in03,24,122,1	script	#BLAZZER	111,{
 	close;
 }
 	
-yuno_in03,28,124,5	script	Ride Word#yuno	1195,{
+yuno_in03,28,124,5	script	Ride Word#yuno	RIDEWORD,{
 	end;
 }
-yuno_in03,28,122,1	script	#RIDEWORD	111,{
+yuno_in03,28,122,1	script	#RIDEWORD	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Ride Word";
 	mes " Size : Small";
@@ -617,10 +617,10 @@ yuno_in03,28,122,1	script	#RIDEWORD	111,{
 	close;
 }
 	
-yuno_in03,31,124,3	script	Megalodon#yuno	1064,{
+yuno_in03,31,124,3	script	Megalodon#yuno	MEGALODON,{
 	end;
 }
-yuno_in03,31,122,1	script	#MEGALODON	111,{
+yuno_in03,31,122,1	script	#MEGALODON	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Megalodon";
 	mes " Size : Medium";
@@ -635,10 +635,10 @@ yuno_in03,31,122,1	script	#MEGALODON	111,{
 	close;
 }
 	
-yuno_in03,35,124,3	script	Sleeper#yuno	1386,{
+yuno_in03,35,124,3	script	Sleeper#yuno	SLEEPER,{
 	end;
 }
-yuno_in03,35,122,1	script	#SLEEPER	111,{
+yuno_in03,35,122,1	script	#SLEEPER	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Sleeper";
 	mes " Size : Medium";
@@ -656,10 +656,10 @@ yuno_in03,35,122,1	script	#SLEEPER	111,{
 	close;
 }
 	
-yuno_in03,39,124,3	script	Ancient Mummy#yuno	1297,{
+yuno_in03,39,124,3	script	Ancient Mummy#yuno	ANCIENT_MUMMY,{
 	end;
 }
-yuno_in03,39,122,1	script	#ANCIENT_MUMMY	111,{
+yuno_in03,39,122,1	script	#ANCIENT_MUMMY	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Ancient Mummy";
 	mes " Size : Medium";
@@ -685,10 +685,10 @@ yuno_in03,39,122,1	script	#ANCIENT_MUMMY	111,{
 	close;
 }
 	
-yuno_in03,18,122,5	script	Incubus#yuno	1374,{
+yuno_in03,18,122,5	script	Incubus#yuno	INCUBUS,{
 	end;
 }
-yuno_in03,19,120,1	script	#INCUBUS	111,{
+yuno_in03,19,120,1	script	#INCUBUS	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Incubus";
 	mes " Size : Medium";
@@ -707,10 +707,10 @@ yuno_in03,19,120,1	script	#INCUBUS	111,{
 	close;
 }
 	
-yuno_in03,44,120,3	script	Succubus#yuno	1370,{
+yuno_in03,44,120,3	script	Succubus#yuno	SUCCUBUS,{
 	end;
 }
-yuno_in03,42,120,1	script	#SUCCUBUS	111,{
+yuno_in03,42,120,1	script	#SUCCUBUS	HIDDEN_NPC,{
 	mes " ";
 	mes " Scientific name : Succubus";
 	mes " Size : Medium";
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index a48afea3e..c3c54a426 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -3,13 +3,12 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.8
+//= 2.0
 //===== Description: =========================================
 //= [Official Conversion]
 //= - Hugel Monster Races (Single and Double)
 //= - Prize Medal Exchanging, and Monster Track NPCs.
 //= - Contains both euRO and iRO dialog.
-//= - There are no permenent variables.
 //===== Additional Comments: =================================
 //= 1.0 First version. Please report bugs. [L0ne_W0lf]
 //= 1.1 Corrected a minor typo. [L0ne_W0lf]
@@ -20,10 +19,12 @@
 //= 1.6 Updated experience rewards. [L0ne_W0lf]
 //= 1.7 Optimization, -4000 lines (more can still be done). [Euphy]
 //= 1.8 Optimized.
-//= 	Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph] 
+//=     Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph]
+//= 1.9 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.0 Added GM management NPC. [Euphy]
 //============================================================
 
-// Monstrer Race - Single Monster Race
+// Monster Race - Single Monster Race
 //============================================================
 hugel,51,61,0	script	#race_timer1-1	-1,{
 OnInit:
@@ -182,7 +183,7 @@ OnInit:
 	end;
 }
 
-p_track01,73,22,1	script	Ticket Helper#single	899,{
+p_track01,73,22,1	script	Ticket Helper#single	4_M_HUMAN_02,{
 	mes "[Ticket Helper]";
 	mes "Welcome to the";
 	mes "Monster Race Arena.";
@@ -292,7 +293,7 @@ OnTimer9000:
 	function	WN	{
 		set .@n, charat(strnpcinfo(0),getstrlen(strnpcinfo(0))-1);
 		if (!getarg(0)) return .@n;
-		return ((.@n <= 3)?((.@n == 1)?"1st":((.@n == 2)?"2nd":"3rd")):.@n+"th"); 
+		return ((.@n <= 3)?((.@n == 1)?"1st":((.@n == 2)?"2nd":"3rd")):.@n+"th");
 	}
 	
 OnInit:
@@ -307,7 +308,7 @@ p_track01,30,32,0	duplicate(Runner#main)	Runner No. 4	-1,1,0
 p_track01,30,30,0	duplicate(Runner#main)	Runner No. 5	-1,1,0
 p_track01,30,28,0	duplicate(Runner#main)	Runner No. 6	-1,1,0
 
-p_track01,67,45,5	script	Medal Distributor#single	845,{
+p_track01,67,45,5	script	Medal Distributor#single	4_F_RACING,{
 	if (!checkweight(908,200)) {
 		mes "[Medal Distributor]";
 		mes "I'm sorry, but I can't";
@@ -333,7 +334,7 @@ p_track01,67,45,5	script	Medal Distributor#single	845,{
 		mes "after the race finishes. Prize";
 		mes "Medals may be given to Wayne";
 		mes "in Hugel in exchange for items.";
-		next; 
+		next;
 		if ($@monster_race) {
 			if (monster_race_1 == $@monster_race) {
 				mes "[Medal Distributor]";
@@ -513,7 +514,7 @@ OnInit:
 	end;
 }
 
-p_track01,76,36,1	script	Exit Guide#single	798,{
+p_track01,76,36,1	script	Exit Guide#single	4_M_NFMAN,{
 	mes "[Exit Guide]";
 	mes "If you have a winning Racing";
 	mes "Ticket, please make sure that";
@@ -557,7 +558,7 @@ p_track01,76,36,1	script	Exit Guide#single	798,{
 	end;
 }
 
-hugel,58,72,6	script	Eckar Ellebird#single	798,{
+hugel,58,72,6	script	Eckar Ellebird#single	4_M_NFMAN,{
 	mes "[Eckar Ellebird]";
 	mes "Welcome to the biggest";
 	mes "attraction in Hugel, the";
@@ -656,7 +657,7 @@ hugel,58,72,6	script	Eckar Ellebird#single	798,{
 			mes "that you enjoy the race~";
 			mes "Let me guide you inside";
 			mes "the Monster Race Arena now.";
-			set zeny,zeny-2000;
+			Zeny -= 2000;
 			set monster_race_1,0;
 			close2;
 			warp "p_track01",75,41;
@@ -669,7 +670,7 @@ hugel,58,72,6	script	Eckar Ellebird#single	798,{
 			mes "we ask that you please";
 			mes "wait a little while longer.";
 			close;
-		} 
+		}
 	} else {
 		if ($@mon_time_1_1 == 1) {
 			mes "[Eckar Ellebird]";
@@ -677,7 +678,7 @@ hugel,58,72,6	script	Eckar Ellebird#single	798,{
 			mes "you enjoy this race.";
 			mes "Let me guide you now";
 			mes "to the Monster Race Arena.";
-			set zeny,zeny-2000;
+			Zeny -= 2000;
 			set monster_race_1,0;
 			close2;
 			warp "p_track01",75,41;
@@ -714,7 +715,7 @@ hugel,58,72,6	script	Eckar Ellebird#single	798,{
 			mes "Thank you~";
 			mes "I hope you enjoy";
 			mes "watching this race!";
-			set zeny,zeny-500;
+			Zeny -= 500;
 			set monster_race_1,0;
 			close2;
 			warp "p_track01",75,41;
@@ -733,10 +734,16 @@ hugel,58,72,6	script	Eckar Ellebird#single	798,{
 	mes "which the winners can claim";
 	mes "their Prize Medals. The gate";
 	mes "will open soon, so please wait.";
-	close;				
+	close;
+OnEnable:
+	enablenpc "Eckar Ellebird#single";
+	end;
+OnDisable:
+	disablenpc "Eckar Ellebird#single";
+	end;
 }
 
-p_track01,39,49,3	script	Game Guide#single	845,{
+p_track01,39,49,3	script	Game Guide#single	4_F_RACING,{
 	mes "[Game Guide]";
 	mes "Welcome to the";
 	mes "Monster Race Arena.";
@@ -993,7 +1000,7 @@ p_track01,55,28,0	duplicate(Tire_1)	Tire6#4	-1,0,0
 p_track01,51,28,0	duplicate(Tire_1)	Tire6#5	-1,0,0
 p_track01,47,28,0	duplicate(Tire_1)	Tire6#6	-1,0,0
 
-// Monstrer Race - Dual Monster Race
+// Monster Race - Dual Monster Race
 //============================================================
 hugel,47,56,0	script	#race_timer2-1	-1,{
 OnEnable:
@@ -1172,7 +1179,7 @@ OnTimer300000:
 	end;
 }
 
-hugel,62,69,1	script	Eckar Erenes#double	798,{
+hugel,62,69,1	script	Eckar Erenes#double	4_M_NFMAN,{
 	mes "[Eckar Erenes]";
 	mes "Welcome to the";
 	mes "Monster Race Arena,";
@@ -1274,7 +1281,7 @@ hugel,62,69,1	script	Eckar Erenes#double	798,{
 			mes "that you enjoy the race~";
 			mes "Let me guide you inside";
 			mes "the Monster Race Arena now.";
-			set zeny,zeny-2000;
+			Zeny -= 2000;
 			set monster_race_2_1,0;
 			set monster_race_2_2,0;
 			close2;
@@ -1297,7 +1304,7 @@ hugel,62,69,1	script	Eckar Erenes#double	798,{
 			mes "you enjoy this race.";
 			mes "Let me guide you now";
 			mes "to the Monster Race Arena.";
-			set zeny,zeny-2000;
+			Zeny -= 2000;
 			set monster_race_2_1,0;
 			set monster_race_2_2,0;
 			close2;
@@ -1335,7 +1342,7 @@ hugel,62,69,1	script	Eckar Erenes#double	798,{
 			mes "Thank you~";
 			mes "I hope you enjoy";
 			mes "watching this race!";
-			set zeny,zeny-500;
+			Zeny -= 500;
 			set monster_race_2_1,0;
 			set monster_race_2_2,0;
 			close2;
@@ -1346,7 +1353,7 @@ hugel,62,69,1	script	Eckar Erenes#double	798,{
 		mes "I'm sorry, but you don't";
 		mes "have enough money to pay";
 		mes "the 500 zeny spectator fee.";
-		close;		
+		close;
 	}
 	mes "[Eckar Erenes]";
 	mes "I'm sorry, but a monster";
@@ -1356,9 +1363,15 @@ hugel,62,69,1	script	Eckar Erenes#double	798,{
 	mes "their Prize Medals. The gate";
 	mes "will open soon, so please wait.";
 	close;
+OnEnable:
+	enablenpc "Eckar Erenes#double";
+	end;
+OnDisable:
+	disablenpc "Eckar Erenes#double";
+	end;
 }
 
-p_track02,73,22,1	script	Ticket Helper#2	899,{
+p_track02,73,22,1	script	Ticket Helper#2	4_M_HUMAN_02,{
 	if (!checkweight(908,200)) {
 		mes "[Ticket Helper]";
 		mes "Welcome to the";
@@ -1412,19 +1425,19 @@ p_track02,73,22,1	script	Ticket Helper#2	899,{
 				set .@m, 0;
 				set .@m, select (.@m$);
 				switch (.@m) {
-					Case 1: setarray .@w$, "a friendly","Poring type monster"; break;
-					Case 2: setarray .@w$, "an adorable","Lunatic type monster"; break;
-					Case 3: setarray .@w$, "a darling","Savage Babe monster"; break;
-					Case 4: setarray .@w$, "a gentle baby","Desert Wolf monster"; break;
-					Case 5: setarray .@w$, "a small, yet","demonic, Deviruchi"; break;
-					Case 6: setarray .@w$, "a naughty","Baphomet Jr. monster"; break;
+					case 1: setarray .@w$, "a friendly","Poring type monster"; break;
+					case 2: setarray .@w$, "an adorable","Lunatic type monster"; break;
+					case 3: setarray .@w$, "a darling","Savage Babe monster"; break;
+					case 4: setarray .@w$, "a gentle baby","Desert Wolf monster"; break;
+					case 5: setarray .@w$, "a small, yet","demonic, Deviruchi"; break;
+					case 6: setarray .@w$, "a naughty","Baphomet Jr. monster"; break;
 				}
 				mes "[Ticket Helper]";
 				mes "You've chosen";
 				mes "^0000FFMonster "+.@m+"^000000, "+.@w$[0];
 				mes .@w$[1]+".";
 				mes "Are you sure you want";
-				mes "to choose this monster?";			
+				mes "to choose this monster?";
 				if (select("Yes:No") == 2) {
 					mes "[Ticket Helper]";
 					mes "You have canceled";
@@ -1432,7 +1445,7 @@ p_track02,73,22,1	script	Ticket Helper#2	899,{
 					mes "I understand. Perhaps";
 					mes "you'd feel more comfortable";
 					mes "checking the monsters first?";
-					close;			
+					close;
 				}
 				next;
 				if (!.@m1) {
@@ -1529,7 +1542,7 @@ p_track02,73,22,1	script	Ticket Helper#2	899,{
 			mes "^0000FFMonster " + monster_race_2_1 + "^000000 and ^0000FFMonster " + monster_race_2_2 + "^000000";
 			mes "for this Dual Monster Race.";
 			next;
-		} 
+		}
 		mes "[Ticket Helper]";
 		mes "The start of the race will be";
 		mes "announced through a broadcast.";
@@ -1538,7 +1551,7 @@ p_track02,73,22,1	script	Ticket Helper#2	899,{
 		mes "positions. Thank you, and";
 		mes "have a good time!";
 		viewpoint 1,43,35,0,0xFF0000;
-		close;	
+		close;
 	}
 
 OnInit:
@@ -1546,7 +1559,7 @@ OnInit:
 	end;
 }
 
-p_track02,39,49,3	script	Game Guide#double	845,{
+p_track02,39,49,3	script	Game Guide#double	4_F_RACING,{
 	mes "[Game Guide]";
 	mes "Welcome to the";
 	mes "Monster Race Arena.";
@@ -1644,7 +1657,7 @@ p_track02,39,49,3	script	Game Guide#double	845,{
 	close;
 }
 
-p_track02,67,45,5	script	Medal Distributor#medal	845,{
+p_track02,67,45,5	script	Medal Distributor#medal	4_F_RACING,{
 	if (!checkweight(909,20)) {
 		mes "[Medal Distributor]";
 		mes "I'm sorry, but I can't";
@@ -1717,12 +1730,12 @@ p_track02,67,45,5	script	Medal Distributor#medal	845,{
 		mes "wager on the monster races!";
 		close;
 	} else if (monster_race_2_1 == 7 && monster_race_2_2 == 7) {
-			mes "[Medal Distributor]";
-			mes "Thanks for visiting the";
-			mes "Monster Race Arena, and";
-			mes "I hope you enjoy your time";
-			mes "here. I'll see you next time~";
-			close;
+		mes "[Medal Distributor]";
+		mes "Thanks for visiting the";
+		mes "Monster Race Arena, and";
+		mes "I hope you enjoy your time";
+		mes "here. I'll see you next time~";
+		close;
 	} else if (monster_race_2_1 != $@mon_race_2_1 || monster_race_2_2 != $@mon_race_2_2) {
 		mes "[Medal Distributor]";
 		mes "You may not have wagered";
@@ -1737,7 +1750,7 @@ OnInit:
 	end;
 }
 
-p_track02,76,38,1	script	Exit Guide#double	798,{
+p_track02,76,38,1	script	Exit Guide#double	4_M_NFMAN,{
 	mes "[Exit Guide]";
 	mes "If you have a winning Racing";
 	mes "Ticket, please make sure that";
@@ -1828,10 +1841,10 @@ OnMyMobDead:
 	function	MN	{
 		setarray .@n$[1], "poring","lunatic","savagebebe","desertwolf","deviruchi","baphomet";
 		for (set .@i, 1; .@i <= getarraysize(.@n$); set .@i, .@i + 1) {
-			if (compare(strnpcinfo(0),.@n$[.@i])) 
+			if (compare(strnpcinfo(0),.@n$[.@i]))
 				break;
 		}
-		return .@i;	
+		return .@i;
 	}
 
 OnInit:
@@ -1839,12 +1852,12 @@ OnInit:
 	disablenpc strnpcinfo(0);
 	end;
 }
-p_track02,30,38,0	duplicate(mob1#main)	#poring1	139,0,0
-p_track02,30,36,0	duplicate(mob1#main)	#lunatic1	139,0,0
-p_track02,30,34,0	duplicate(mob1#main)	#savagebebe1	139,0,0
-p_track02,30,32,0	duplicate(mob1#main)	#desertwolf1	139,0,0
-p_track02,30,30,0	duplicate(mob1#main)	#deviruchi1	139,0,0
-p_track02,30,28,0	duplicate(mob1#main)	#baphomet1	139,0,0
+p_track02,30,38,0	duplicate(mob1#main)	#poring1	HIDDEN_WARP_NPC,0,0
+p_track02,30,36,0	duplicate(mob1#main)	#lunatic1	HIDDEN_WARP_NPC,0,0
+p_track02,30,34,0	duplicate(mob1#main)	#savagebebe1	HIDDEN_WARP_NPC,0,0
+p_track02,30,32,0	duplicate(mob1#main)	#desertwolf1	HIDDEN_WARP_NPC,0,0
+p_track02,30,30,0	duplicate(mob1#main)	#deviruchi1	HIDDEN_WARP_NPC,0,0
+p_track02,30,28,0	duplicate(mob1#main)	#baphomet1	HIDDEN_WARP_NPC,0,0
 
 p_track02,19,48,0	script	TrapGlobal#race02	-1,{
 OnEnable:
@@ -2035,7 +2048,7 @@ p_track02,47,28,0	duplicate(Tire_1)	Tire#race02_6_6	-1,0,0
 
 // NPCs for Redeeming Prize Medals (Einbroch and Hugel)
 //============================================================
-ein_in01,85,208,5	script	Ei'felle#repay01	854,{
+ein_in01,85,208,5	script	Ei'felle#repay01	4_M_EINMAN2,{
 	if (!ein_medal01) {
 		mes "[Ei'felle]";
 		mes "Curses! We need to deliver";
@@ -2265,11 +2278,11 @@ ein_in01,85,208,5	script	Ei'felle#repay01	854,{
 			next;
 			switch (select("Glittering Jacket:Fire Property Armor:Earth Property Armor:Wind Property Armor:Water Property Armor:Cancel")) {
 				case 1: callsub S_BonusReward,500,2319; end;
-				case 2:	callsub S_BonusReward,1000,2345; end;
+				case 2: callsub S_BonusReward,1000,2345; end;
 				case 3: callsub S_BonusReward,1000,2351; end;
-				case 4:	callsub S_BonusReward,1000,2349; end;
-				case 5:	callsub S_BonusReward,1000,2347; end;
-				case 6:	close;
+				case 4: callsub S_BonusReward,1000,2349; end;
+				case 5: callsub S_BonusReward,1000,2347; end;
+				case 6: close;
 			}
 		}
 		setarray .@m$, "Dagger","One Handed Sword","Two Handed Sword","Axe","Mace","Bow","Staff","Book","Spear","Katar","Knuckle","Whip","Musical Instrument";
@@ -2281,57 +2294,57 @@ ein_in01,85,208,5	script	Ei'felle#repay01	854,{
 		mes "that you want me to create.";
 		next;
 		switch (.@m) {
-			Case 0:
+			case 0:
 				setarray .@mw$, "Ginnungagap:Grimtooth:Dragon Killer:Mail Breaker:Bazerald:Sword Breaker:Ice Pick:Sucsamad:Kitchen Knife:Azoth:Exorciser:Assassin Dagger:Moonlight Dagger:Weeder Knife:Cursed Dagger:Dagger of Counter:Combat Knife:Fortune Sword";
 				setarray .@mw, 13002,1237,13001,1225,1231,1224,1230,1236,1229,1235,1233,1232,1234,1227,1241,1242,1228,1223;
 				break;
-			Case 1:
+			case 1:
 				setarray .@mw$, "Nagan:Immaterial Sword:Mysteltainn:Byeollungum:Star Dust Blade:Caesar's Sword:Ice Falchion:Excalibur:Edge:Cutlus:Solar Sword:Tirfing:Fireblend";
 				setarray .@mw, 1130,1141,1138,1140,1148,1134,1131,1137,1132,1135,1136,1139,1133;
 				break;
-			Case 2:	
+			case 2:
 				setarray .@mw$, "Dragon Slayer:Masamune:Muramasa:Schweizersabel:Executioner:Zweihander:Katzbalger";
 				setarray .@mw, 1166,1165,1164,1167,1169,1168,1170;
 				break;
-			Case 3:
+			case 3:
 				setarray .@mw$, "Great Axe:Guillotine:Light Epsilon:Bloody Axe:Sabbath:Slaughter:Cleaver:Tomahawk";
 				setarray .@mw, 1364,1369,1366,1363,1365,1367,1305,1368;
 				break;
-			Case 4:
+			case 4:
 				setarray .@mw$, "Golden Mace:Grand Cross:Long Mace:Spike:Slash:Quadrille";
 				setarray .@mw, 1524,1528,1525,1523,1526,1527;
 				break;
-			Case 5:
+			case 5:
 				setarray .@mw$, "Roguemaster's Bow:Dragon Wing:Rudra's Bow:Ballista";
 				setarray .@mw, 1719,1724,1720,1722;
 				break;
-			Case 6:
+			case 6:
 				setarray .@mw$, "Wing Staff:Wizardry Staff";
 				setarray .@mw, 1616,1473;
-			Case 7:
+			case 7:
 				setarray .@mw$, "Legacy of Dragon:Book of the Apocalypse:Girl's Diary:Hardcover Book";
 				setarray .@mw, 1559,1557,1558,1561;
 				break;
-			Case 8:
+			case 8:
 				setarray .@mw$, "Gae Bolg:Gelerdria:Gungnir:Skewer:Longinus's Spear:Brionac:Bill Guisarme:Zephyrus:Crescent Scythe:Tjungkuletti:Hellfire";
 				setarray .@mw, 1474,1414,1413,1415,1469,1470,1467,1468,1466,1416,1471;
 				break;
-			Case 9:
+			case 9:
 				setarray .@mw$, "Infiltrator:Bloody Roar:Unholy Touch";
 				setarray .@mw, 1261,1265,1263;
 				break;
-			Case 10:
+			case 10:
 				setarray .@mw$, "Hatii Claw:Berserk:Kaiser Knuckle";
 				setarray .@mw, 1815,1814,1813;
 				break;
-			Case 11:
+			case 11:
 				setarray .@mw$, "Lariat:Rapture Rose:Blade Whip:Chemeti:Queen's Whip";
 				setarray .@mw, 1962,1963,1969,1964,1970;
 				break;
-			Case 12:
+			case 12:
 				setarray .@mw$, "Oriental Lute:Electric Guitar";
 				setarray .@mw, 1918,1913;
-				break;		
+				break;
 		}
 		set .@j, select (.@mw$+":Cancel") - 1;
 		explode(.@mw$,.@mw$,":");
@@ -2383,18 +2396,41 @@ S_Reward:
 			mes "Now do you see the";
 			mes "power of hope?";
 			delitem 7515,1; //Marvelous_Medal
-			if (BaseLevel < 21) getexp 200,0;
-			else if ((BaseLevel > 20) && (BaseLevel < 31)) getexp 300,0;
-			else if ((BaseLevel > 30) && (BaseLevel < 41)) getexp 1000,0;
-			else if ((BaseLevel > 40) && (BaseLevel < 51)) getexp 1800,0;
-			else if ((BaseLevel > 50) && (BaseLevel < 61)) getexp 2500,0;
-			else if ((BaseLevel > 60) && (BaseLevel < 71)) getexp 4700,0;
-			else if ((BaseLevel > 70) && (BaseLevel < 81)) getexp 5500,0;
-			else if ((BaseLevel > 80) && (BaseLevel < 96)) getexp 7000,0;
-			else if ((BaseLevel > 95) && (BaseLevel < 111)) getexp 8800,0;
-			else if ((BaseLevel > 110) && (BaseLevel < 126)) getexp 10900,0;
-			else if ((BaseLevel > 125) && (BaseLevel < 141)) getexp 13300,0;
-			else getexp 16000,0;
+			if (checkre(3)) {
+				if (BaseLevel < 21) getexp 110,0;
+				else if ((BaseLevel > 20) && (BaseLevel < 31)) getexp 280,0;
+				else if ((BaseLevel > 30) && (BaseLevel < 41)) getexp 1000,0;
+				else if ((BaseLevel > 40) && (BaseLevel < 51)) getexp 1200,0;
+				else if ((BaseLevel > 50) && (BaseLevel < 61)) getexp 1500,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 71)) getexp 2800,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 81)) getexp 4500,0;
+				else getexp 8500,0;
+
+			/* iRO EXP Table:
+				if (BaseLevel < 21) getexp 200,0;
+				else if ((BaseLevel > 20) && (BaseLevel < 31)) getexp 300,0;
+				else if ((BaseLevel > 30) && (BaseLevel < 41)) getexp 1000,0;
+				else if ((BaseLevel > 40) && (BaseLevel < 51)) getexp 1800,0;
+				else if ((BaseLevel > 50) && (BaseLevel < 61)) getexp 2500,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 71)) getexp 4700,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 81)) getexp 5500,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 96)) getexp 7000,0;
+				else if ((BaseLevel > 95) && (BaseLevel < 111)) getexp 8800,0;
+				else if ((BaseLevel > 110) && (BaseLevel < 126)) getexp 10900,0;
+				else if ((BaseLevel > 125) && (BaseLevel < 141)) getexp 13300,0;
+				else getexp 16000,0;
+			*/
+
+			} else {
+				if (BaseLevel < 21) getexp 150,0;
+				else if ((BaseLevel > 20) && (BaseLevel < 31)) getexp 300,0;
+				else if ((BaseLevel > 30) && (BaseLevel < 41)) getexp 2000,0;
+				else if ((BaseLevel > 40) && (BaseLevel < 51)) getexp 8000,0;
+				else if ((BaseLevel > 50) && (BaseLevel < 61)) getexp 25000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 71)) getexp 47000,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 81)) getexp 55000,0;
+				else getexp 65000,0;
+			}
 			close;
 		case 2:
 			mes "[Ei'felle]";
@@ -2422,18 +2458,87 @@ S_Reward:
 			mes "whatever you feed it.";
 			mes "Placebos and psychosomatic symptoms-- it all ties together.";
 			delitem 7515,1; //Marvelous_Medal
-			if (BaseLevel < 21) getexp 0,150;
-			else if ((BaseLevel > 20) && (BaseLevel < 31)) getexp 0,200;
-			else if ((BaseLevel > 30) && (BaseLevel < 41)) getexp 0,750;
-			else if ((BaseLevel > 40) && (BaseLevel < 51)) getexp 0,1800;
-			else if ((BaseLevel > 50) && (BaseLevel < 61)) getexp 0,2500;
-			else if ((BaseLevel > 60) && (BaseLevel < 71)) getexp 0,3525;
-			else if ((BaseLevel > 70) && (BaseLevel < 81)) getexp 0,4125;
-			else if ((BaseLevel > 80) && (BaseLevel < 96)) getexp 0,5250;
-			else if ((BaseLevel > 95) && (BaseLevel < 111)) getexp 0,6600;
-			else if ((BaseLevel > 110) && (BaseLevel < 126)) getexp 0,8175;
-			else if ((BaseLevel > 125) && (BaseLevel < 141)) getexp 0,9975;
-			else getexp 0,12000;
+			if (checkre(3)) {
+				if (Class == Job_Novice) {
+					getexp 0,15;
+				} else if (Class == Job_Novice_High) {
+					getexp 0,25;
+				} else if ((Class >= Job_Swordman && Class <= Job_Thief) || Class == Job_Taekwon) {
+					if (JobLevel < 11) getexp 0,25;
+					else if ((JobLevel > 10) && (JobLevel < 21)) getexp 0,200;
+					else if ((JobLevel > 20) && (JobLevel < 31)) getexp 0,300;
+					else if ((JobLevel > 30) && (JobLevel < 41)) getexp 0,950;
+					else getexp 0,1800;
+				} else if ((Class >= Job_Knight && Class <= Job_Crusader2) || (Class >= Job_Swordman_High && Class <= Job_Thief_High)) {
+					if (JobLevel < 11) getexp 0,40;
+					else if ((JobLevel > 10) && (JobLevel < 21)) getexp 0,300;
+					else if ((JobLevel > 20) && (JobLevel < 31)) getexp 0,550;
+					else if ((JobLevel > 30) && (JobLevel < 41)) getexp 0,1080;
+					else getexp 0,2150;
+				} else {
+					if (JobLevel < 11) getexp 0,55;
+					else if ((JobLevel > 10) && (JobLevel < 21)) getexp 0,330;
+					else if ((JobLevel > 20) && (JobLevel < 31)) getexp 0,600;
+					else if ((JobLevel > 30) && (JobLevel < 41)) getexp 0,1200;
+					else if ((JobLevel > 40) && (JobLevel < 51)) getexp 0,1750;
+					else getexp 0,2950;
+				}
+
+			/* iRO JEXP Table:
+				if (BaseLevel < 21) getexp 0,150;
+				else if ((BaseLevel > 20) && (BaseLevel < 31)) getexp 0,200;
+				else if ((BaseLevel > 30) && (BaseLevel < 41)) getexp 0,750;
+				else if ((BaseLevel > 40) && (BaseLevel < 51)) getexp 0,1800;
+				else if ((BaseLevel > 50) && (BaseLevel < 61)) getexp 0,2500;
+				else if ((BaseLevel > 60) && (BaseLevel < 71)) getexp 0,3525;
+				else if ((BaseLevel > 70) && (BaseLevel < 81)) getexp 0,4125;
+				else if ((BaseLevel > 80) && (BaseLevel < 96)) getexp 0,5250;
+				else if ((BaseLevel > 95) && (BaseLevel < 111)) getexp 0,6600;
+				else if ((BaseLevel > 110) && (BaseLevel < 126)) getexp 0,8175;
+				else if ((BaseLevel > 125) && (BaseLevel < 141)) getexp 0,9975;
+				else getexp 0,12000;
+			*/
+
+			} else {
+				if (Class == Job_Novice) {
+					getexp 0,30;
+				} else if ((Class >= Job_Swordman && Class <= Job_Thief) || Class == Job_Taekwon) {
+					if (JobLevel < 11) getexp 0,50;
+					else if ((JobLevel > 10) && (JobLevel < 21)) getexp 0,250;
+					else if ((JobLevel > 20) && (JobLevel < 31)) getexp 0,1500;
+					else if ((JobLevel > 30) && (JobLevel < 41)) getexp 0,7000;
+					else getexp 0,20000;
+				} else if (Class >= Job_Knight && Class <= Job_Crusader2) {
+					if (JobLevel < 11) getexp 0,80;
+					else if ((JobLevel > 10) && (JobLevel < 21)) getexp 0,2000;
+					else if ((JobLevel > 20) && (JobLevel < 31)) getexp 0,10000;
+					else if ((JobLevel > 30) && (JobLevel < 41)) getexp 0,25000;
+					else getexp 0,38000;
+				} else if (Class == Job_Novice_High) {
+					getexp 0,40;
+				} else if (Class >= Job_Swordman_High && Class <= Job_Thief_High) {
+					if (JobLevel < 11) getexp 0,65;
+					else if ((JobLevel > 10) && (JobLevel < 21)) getexp 0,300;
+					else if ((JobLevel > 20) && (JobLevel < 31)) getexp 0,2500;
+					else if ((JobLevel > 30) && (JobLevel < 41)) getexp 0,10000;
+					else getexp 0,25000;
+				} else if (Class >= Job_Lord_Knight && Class <= Job_Paladin_2) {
+					if (JobLevel < 11) getexp 0,150;
+					else if ((JobLevel > 10) && (JobLevel < 21)) getexp 0,2200;
+					else if ((JobLevel > 20) && (JobLevel < 31)) getexp 0,13000;
+					else if ((JobLevel > 30) && (JobLevel < 41)) getexp 0,27000;
+					else if ((JobLevel > 40) && (JobLevel < 51)) getexp 0,38000;
+					else getexp 0,40000;
+				} else {
+					if (JobLevel < 11) getexp 0,50;
+					else if ((JobLevel > 10) && (JobLevel < 21)) getexp 0,250;
+					else if ((JobLevel > 20) && (JobLevel < 31)) getexp 0,1500;
+					else if ((JobLevel > 30) && (JobLevel < 41)) getexp 0,7000;
+					else if ((JobLevel > 40) && (JobLevel < 51)) getexp 0,20000;
+					else if ((JobLevel > 50) && (JobLevel < 61)) getexp 0,30000;
+					else getexp 0,38000;
+				}
+			}
 			close;
 		case 3:
 			mes "[Ei'felle]";
@@ -2504,7 +2609,7 @@ S_Reward:
 						mes "enter a number from 1 to 100.";
 						mes "If you want to give me more";
 						mes "medals, then perhaps you";
-						mes "should just give them all to me~ ^FFFFFF ^000000";
+						mes "should just give them all to me~";
 						next;
 					} else break;
 				}
@@ -2538,9 +2643,6 @@ S_Reward:
 				mes "come back as soon as you can.";
 				close;
 			}
-			delitem 7515,1; //Marvelous_Medal
-			set ein_medal01,1;
-			close;
 		case 4:
 			mes "[Ei'felle]";
 			mes "Well, I've been able to";
@@ -2638,7 +2740,7 @@ S_BonusReward:
 	close;
 }
 	
-hugel,71,83,4	script	Wayne	900,{
+hugel,71,83,4	script	Wayne	4_M_HUMERCHANT,{
 	if (!checkweight(1201,1)) {
 		mes "[Wayne]";
 		mes "Hold on a second...";
@@ -2702,35 +2804,35 @@ hugel,71,83,4	script	Wayne	900,{
 			set .@m$, .@m$ + .@pm[.@i] + " Prize medal:";
 		set .@m, select (.@m$) - 1;
 		switch (.@m) {
-			Case 0: 
+			case 0:
 				setarray .@mr$, "2 Hinale Leaflets:2 Aloe Leaflets:1 Mastela Fruit:5 Witch Starsands:4 Condensed Red Potions";
 				setarray .@mr, 520,2,521,2,522,1,1061,5,545,4;
 				break;
-			Case 1:
+			case 1:
 				setarray .@mr$, "1 Royal Jelly:6 Holy Waters";
 				setarray .@mr, 526,1,523,6;
 				break;
-			Case 2:
+			case 2:
 				setarray .@mr$, "1 Cookie Bag:1 First Aid Kit";
 				setarray .@mr, 12130,1,12110,1;
 				break;
-			Case 3:
+			case 3:
 				set .@mr$, "1 Gift Box";
 				setarray .@mr, 644,1;
 				break;
-			Case 4:
+			case 4:
 				set .@mr$, "1 Old Blue Box";
 				setarray .@mr, 603,1;
 				break;
-			Case 5:
+			case 5:
 				set .@mr$, "1 Taming Gift Set";
 				setarray .@mr, 12105,1;
 				break;
-			Case 6:
+			case 6:
 				set .@mr$, "1 Old Purple Box";
 				setarray .@mr, 617,1;
 				break;
-			Case 7:
+			case 7:
 				set .@mr$, "1 Poring Box";
 				setarray .@mr, 12109,1;
 				break;
@@ -2760,13 +2862,13 @@ hugel,71,83,4	script	Wayne	900,{
 		mes "races, fair adventurer~";
 		delitem 7515,.@pm[.@m];
 		getitem .@mr[.@m2*2],.@mr[((.@m2*2)+1)];
-		close;		
+		close;
 	}
 }
 
-// Monstrer Race Affiliated NPCs
+// Monster Race Affiliated NPCs
 //============================================================
-airplane,246,47,1	script	Eocatt#decoy01	878,{
+airplane,246,47,1	script	Eocatt#decoy01	4_M_OILMAN,{
 	mes "[Eocatt]";
 	mes "There's an old, humble";
 	mes "village on the outskirts of";
@@ -2791,7 +2893,7 @@ airplane,246,47,1	script	Eocatt#decoy01	878,{
 	close;
 }
 
-hugel,85,93,5	script	Mudie#dummy01	866,{
+hugel,85,93,5	script	Mudie#dummy01	4_M_LGTGRAND,{
 	mes "[Mudie]";
 	mes "The Monster Races";
 	mes "are probably the biggest";
@@ -2816,7 +2918,7 @@ hugel,85,93,5	script	Mudie#dummy01	866,{
 	close;
 }
 
-p_track02,32,45,5	script	Eccentric Scholar#double	755,{
+p_track02,32,45,5	script	Eccentric Scholar#double	4_M_SAGE_C,{
 	mes "[Eccentric Scholar]";
 	mes "Let's see now...";
 	mes "Monster 1's average speed";
@@ -2847,7 +2949,7 @@ p_track02,32,45,5	script	Eccentric Scholar#double	755,{
 	close;
 }
 
-p_track02,69,31,1	script	Blacksmith Guildsman#dou	726,{
+p_track02,69,31,1	script	Blacksmith Guildsman#dou	4_F_JOB_BLACKSMITH,{
 	if (!$@mon_time_2_2) {
 		mes "[Blacksmith Guildsman]";
 		mes "How many times must";
@@ -2866,7 +2968,7 @@ p_track02,69,31,1	script	Blacksmith Guildsman#dou	726,{
 		mes "It's too hard for me to win~!";
 		emotion e_swt2;
 		close;
-	} 
+	}
 	mes "[Blacksmith Guildsman]";
 	mes "Run! Go go go!";
 	mes "I need to win some";
@@ -2877,7 +2979,7 @@ p_track02,69,31,1	script	Blacksmith Guildsman#dou	726,{
 	close;
 }
 
-p_track02,53,45,3	script	Valiant Knight#double	733,{
+p_track02,53,45,3	script	Valiant Knight#double	4_M_JOB_KNIGHT1,{
 	mes "[Valiant Knight]";
 	mes "Hey, have you been";
 	mes "wagering on the races?";
@@ -2901,7 +3003,7 @@ p_track02,53,45,3	script	Valiant Knight#double	733,{
 	close;
 }
 
-p_track01,27,47,5	script	Drunkard#single	853,{
+p_track01,27,47,5	script	Drunkard#single	4_M_YURI,{
 	mes "[Familiar Drunkard]";
 	mes "Grrr...! ^333333*Hiccup*^000000";
 	mes "I just gotta win this";
@@ -2920,7 +3022,7 @@ p_track01,27,47,5	script	Drunkard#single	853,{
 	close;
 }
 
-p_track01,69,31,1	script	Blacksmith Guildsman#sin	107,{
+p_track01,69,31,1	script	Blacksmith Guildsman#sin	1_M_PAY_ELDER,{
 	mes "[Blacksmith Guildsman]";
 	mes "How can this be so hard?";
 	mes "Why can't I win at least";
@@ -2945,7 +3047,7 @@ p_track01,69,31,1	script	Blacksmith Guildsman#sin	107,{
 	close;
 }
 
-p_track01,45,42,3	script	Absent Minded Man#single	881,{
+p_track01,45,42,3	script	Absent Minded Man#single	4_M_SITDOWN,{
 	mes "[Absent Minded Man]";
 	mes "Say, are you here to bet";
 	mes "on the monster races? I've";
@@ -2962,4 +3064,55 @@ p_track01,45,42,3	script	Absent Minded Man#single	881,{
 	mes "I should win at least once,";
 	mes "right? What's going on?!";
 	close;
-}
\ No newline at end of file
+}
+
+hugel,5,5,3	script	Monster Race Manager	4_M_LGTGUARD,{
+	callfunc "F_GM_NPC";
+	mes "[Monster Race Manager]";
+	mes "I can activate and";
+	mes "deactivate the Arena";
+	mes "Entry NPCs for the Single";
+	mes "and Dual Monster Races.";
+	next;
+	set .@select, select("Single Race Entry - ON:Dual Race Entry - ON:Single Race Entry - OFF:Dual Race Entry - OFF");
+	mes "[Monster Race Manager]";
+	mes "Please enter";
+	mes "the password.";
+	next;
+	set .@i, callfunc("F_GM_NPC",1854,0,0,2000);
+	if (.@i == -2) {
+		mes "[Monster Race Manager]";
+		mes "Error.";
+		close;
+	} else if (.@i == -1) {
+		mes "[Monster Race Manager]";
+		mes "Incorrect password.";
+		close;
+	} else if (.@i == 0) {
+		close;
+	} else {
+		mes "[Monster Race Manager]";
+		switch(.@select) {
+		case 1:
+			mes "The Single Monster";
+			mes "Race Entry NPC is ON.";
+			donpcevent "Eckar Ellebird#single::OnEnable";
+			close;
+		case 2:
+			mes "The Dual Monster";
+			mes "Race Entry NPC is ON.";
+			donpcevent "Eckar Erenes#double::OnEnable";
+			close;
+		case 3:
+			mes "The Single Monster";
+			mes "Race Entry NPC is OFF.";
+			donpcevent "Eckar Ellebird#single::OnDisable";
+			close;
+		case 4:
+			mes "The Dual Monster";
+			mes "Race Entry NPC is OFF.";
+			donpcevent "Eckar Erenes#double::OnDisable";
+			close;
+		}
+	}
+}
diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt
index eef063dff..a818cab85 100644
--- a/npc/other/msg_boards.txt
+++ b/npc/other/msg_boards.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Misc. Message Boards
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.6
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.7
+//===== Description: =========================================
 //= Misc. Message Boards for:
 //=  - Prontera
 //=  - Morroc
@@ -13,7 +13,7 @@
 //=  - Al De Baran
 //=  - Izlude
 //=  - Alberta
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Rearranged [Lupus]
 //= Fixed spelling mistakes. [Nexon]
 //= 1.3 Removed Duplicates [Silent]
@@ -21,11 +21,12 @@
 //= 1.5 Removed a duplicate related to the Sign Quest. [SinSloth]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.6 Commented out conflicting npcs. (bugreport:4093) [L0ne_W0lf]
+//= 1.7 Moved Izlude NPCs to Pre-RE path. [Euphy]
 //============================================================
 
 // Prontera
 //============================================================
-prontera,158,213,1	script	Sign Post#Prt1	111,{
+prontera,158,213,1	script	Sign Post#Prt1	HIDDEN_NPC,{
 	mes "^993300- The Sign Post Reads -^000000";
 	mes "North to Prontera Castle";
 	mes "North to Al De Baran";
@@ -39,7 +40,7 @@ prontera,158,213,1	script	Sign Post#Prt1	111,{
 	close;
 }
 
-prontera,156,197,1	script	Prontera Bulletin#Prt2	111,{
+prontera,156,197,1	script	Prontera Bulletin#Prt2	HIDDEN_NPC,{
 	mes "^993300- The Prontera Bulletin Reads -^000000";
 	mes "Wanted: Two Clip Accessories";
 	mes "Please contact...";
@@ -52,19 +53,19 @@ prontera,156,197,1	script	Prontera Bulletin#Prt2	111,{
 	close;
 }
 
-prontera,278,212,1	script	Sign#Prt3	111,{
+prontera,278,212,1	script	Sign#Prt3	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Please help keep Prontera a clean place.";
 	close;
 }
 /*
-prontera,150,326,1	script	Sign#Prt4	111,{
+prontera,150,326,1	script	Sign#Prt4	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Citizens of Prontera are Welcomed in the Prontera Castle.";
 	close;
 }
 */
-prontera,31,212,1	script	Billboard#Prt5	111,{
+prontera,31,212,1	script	Billboard#Prt5	HIDDEN_NPC,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "~WANTED~";
 	mes "iROGM01";
@@ -76,13 +77,13 @@ prontera,31,212,1	script	Billboard#Prt5	111,{
 	close;
 }
 
-prontera,165,305,1	script	Billboard#Prt6	111,{
+prontera,165,305,1	script	Billboard#Prt6	HIDDEN_NPC,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "We hope you enjoy your stay in Prontera.";
 	close;
 }
 
-prontera,145,304,1	script	Sign#Prt7	111,{
+prontera,145,304,1	script	Sign#Prt7	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Note:";
 	mes "I lost my cart in Mt. Mjolnir, if someone finds it please tell me, my life was in that bucket of goods!";
@@ -91,21 +92,21 @@ prontera,145,304,1	script	Sign#Prt7	111,{
 
 // Morroc
 //============================================================
-morocc,144,84,1	script	Sign#Moc1	111,{
+morocc,144,84,1	script	Sign#Moc1	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Wanted: Body guard to protect my shop from thieves";
 	mes "Please contact Butcher";
 	close;
 }
 
-morocc,145,83,1	script	Sign#Moc2	111,{
+morocc,145,83,1	script	Sign#Moc2	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Selling, well groomed Peco Peco!";
 	mes "This beautiful specimen has only been ridden by myself, comes with a saddle, a harness and...";
 	close;
 }
 
-morocc,32,174,1	script	Bulletin#Moc3	111,{
+morocc,32,174,1	script	Bulletin#Moc3	HIDDEN_NPC,{
 	mes "^993300- The Bulletin Reads -^000000";
 	mes "^0099FFMorroc women up in arms!^000000";
 	mes "A recent study has shown that the majority of male citizens in";
@@ -123,13 +124,13 @@ morocc,32,174,1	script	Bulletin#Moc3	111,{
 	close;
 }
 
-morocc,168,266,1	script	Sign#Moc5	111,{
+morocc,168,266,1	script	Sign#Moc5	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome to Morroc.";
 	close;
 }
 
-morocc,168,264,1	script	Billboard#Moc6	111,{
+morocc,168,264,1	script	Billboard#Moc6	HIDDEN_NPC,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "^CC0033Battle Royal!^000000";
 	mes "Do you have what it takes to battle someone in a no holds barred, player vs. player game of death!";
@@ -137,7 +138,7 @@ morocc,168,264,1	script	Billboard#Moc6	111,{
 	close;
 }
 
-morocc,298,211,1	script	Sign#Moc7	111,{
+morocc,298,211,1	script	Sign#Moc7	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome to Morroc.";
 	close;
@@ -145,19 +146,19 @@ morocc,298,211,1	script	Sign#Moc7	111,{
 
 // Geffen
 //============================================================
-geffen,116,58,1	script	Geffen Bulletin#Gef1	111,{
+geffen,116,58,1	script	Geffen Bulletin#Gef1	HIDDEN_NPC,{
 	mes "^993300- The Geffen Bulletin Reads -^000000";
 	mes "Remember Wizard's...It's not how many skills you know, it's the magic that counts!";
 	close;
 }
 /*
-geffen,61,174,1	script	Sign#Gef2	111,{
+geffen,61,174,1	script	Sign#Gef2	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "- Seems to be written in a language unfamiliar to you -";
 	close;
 }
 */
-geffen,113,104,1	script	Billboard#Gef3	111,{
+geffen,113,104,1	script	Billboard#Gef3	HIDDEN_NPC,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "Selling: Brand new Chon Chon Doll!";
 	mes "What a great gift to give to a loved one, contact me now!";
@@ -169,7 +170,7 @@ geffen,113,104,1	script	Billboard#Gef3	111,{
 	close;
 }
 
-geffen,119,190,1	script	Sign Post#Gef4	111,{
+geffen,119,190,1	script	Sign Post#Gef4	HIDDEN_NPC,{
 	mes "^993300- The Sign Post Reads -^000000";
 	mes "North to Geffen Fields";
 	mes "Northeast to Al De Baran";
@@ -183,13 +184,13 @@ geffen,119,190,1	script	Sign Post#Gef4	111,{
 	close;
 }
 
-geffen,168,175,1	script	Sign#Gef5	111,{
+geffen,168,175,1	script	Sign#Gef5	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "''Your always welcomed in Geffen''";
 	close;
 }
 
-geffen,183,61,1	script	Sign#Gef6	111,{
+geffen,183,61,1	script	Sign#Gef6	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome.";
 	close;
@@ -197,7 +198,7 @@ geffen,183,61,1	script	Sign#Gef6	111,{
 
 // Al De Baran
 //============================================================
-aldebaran,181,172,1	script	Billboard#Alde1	111,{
+aldebaran,181,172,1	script	Billboard#Alde1	HIDDEN_NPC,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "In Search of:";
 	mes "I lost my Bongun pet, it wasn't my fault, it just ran away...";
@@ -205,13 +206,13 @@ aldebaran,181,172,1	script	Billboard#Alde1	111,{
 	close;
 }
 
-aldebaran,133,104,1	script	Al De Baran Bulletin#Al2	111,{
+aldebaran,133,104,1	script	Al De Baran Bulletin#Al2	HIDDEN_NPC,{
 	mes "^993300- The Al De Baran Bulletin Reads -^000000";
 	mes "''Enjoy your stay in Al De Baran''";
 	close;
 }
 
-aldebaran,54,223,1	script	Billboard#Alde3	111,{
+aldebaran,54,223,1	script	Billboard#Alde3	HIDDEN_NPC,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "Help Wanted:";
 	mes "We are looking for young, strong and athletic people who are";
@@ -227,42 +228,28 @@ OnTouch:
 	close;
 }
 
-aldebaran,217,222,1	script	Sign#Alde5	111,{
+aldebaran,217,222,1	script	Sign#Alde5	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "I saw Santa Claus in Lutie!";
 	mes "- The rest looks like scribble -";
 	close;
 }
 
-// Izlude
-//============================================================
-izlude,54,139,1	script	Sign#Iz1	111,{
-	mes "^993300- The Sign Reads -^000000";
-	mes "Welcome to the Swordsman Academy.";
-	close;
-}
-
-izlude,144,148,1	script	Sign#Iz2	111,{
-	mes "^993300- The Sign Reads -^000000";
-	mes "Welcome.";
-	close;
-}
-
 // Alberta
 //============================================================
-alberta,35,241,1	script	Billboard#Alb1	111,{
+alberta,35,241,1	script	Billboard#Alb1	HIDDEN_NPC,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "Welcome to Alberta, the Merchant's paradise.";
 	close;
 }
 
-alberta,37,39,1	script	Billboard#Alb2	111,{
+alberta,37,39,1	script	Billboard#Alb2	HIDDEN_NPC,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "Welcome.";
 	close;
 }
 
-alberta,99,151,1	script	Sign#Alb3	111,{
+alberta,99,151,1	script	Sign#Alb3	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Tools by the Cart full!";
 	mes "You need tools? We got'em!";
@@ -270,7 +257,7 @@ alberta,99,151,1	script	Sign#Alb3	111,{
 	close;
 }
 
-alberta,196,152,1	script	Sign#Alb4	111,{
+alberta,196,152,1	script	Sign#Alb4	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Docking and Shipment times very on load. For information regarding";
 	mes "Shipping and Receiving, please...";
@@ -278,7 +265,7 @@ alberta,196,152,1	script	Sign#Alb4	111,{
 	close;
 }
 
-alberta,149,54,1	script	Sign#Alb5	111,{
+alberta,149,54,1	script	Sign#Alb5	HIDDEN_NPC,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome.";
 	close;
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index 95a17d241..38eac1de1 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -1,13 +1,13 @@
-//===== Hercules Script ====================================== 
+//===== Hercules Script ======================================
 //= Poring War
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Poring War
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Join a team in battle between Angeling and Deviling.
+//===== Additional Comments: =================================
 //= 1.0 First version. [Kisuka][5511]
 //= 1.1 Fixed some typos/bugs. [CalciumKid]
 //= 1.1a Fixed Waiting rooms witht he default MAX_LEVEL [Slim]
@@ -17,7 +17,7 @@
 
 // Poring War Recruiter
 //============================================================
-prt_fild08,159,371,3	script	Poring War Recruiter#wop	909,{
+prt_fild08,159,371,3	script	Poring War Recruiter#wop	4_PORING,{
 	mes "[Poring]";
 	mes "!!!!!";
 	mes "Whoa-! Humans, ring~!!";
@@ -41,11 +41,11 @@ prt_fild08,159,371,3	script	Poring War Recruiter#wop	909,{
 			mes "Oh, and there's an entrance fee of 500 zeny, ring.";
 			mes "Have a good time, ring.";
 			delitem 7773,countitem(7773);
-			set Zeny,Zeny-500;
+			Zeny -= 500;
 			close2;
 			warp "poring_w01",112,138;
 			end;
-		}else{
+		} else {
 			mes "[Poring]";
 			mes "Oh, and there's an entrance fee of 500 zeny, ring.";
 			mes "...........";
@@ -67,7 +67,7 @@ prt_fild08,159,371,3	script	Poring War Recruiter#wop	909,{
 
 // Poring Vending Machine
 //============================================================
-poring_w01,100,97,3	script	Poring Vending Machine#w	909,{
+poring_w01,100,97,3	script	Poring Vending Machine#w	4_PORING,{
 	if (checkweight(714,3) == 0) {
 		mes "- You are carrying too much items in order to use the Vending Machine. -";
 		close;
@@ -123,7 +123,7 @@ poring_w01,100,97,3	script	Poring Vending Machine#w	909,{
 					mes "1 of 7 diffeent kinds of figures will be selected.";
 					next;
 					if(select("Draw:Cancel") == 1) {
-						if(countitem(7539) >= 50) {
+						if (countitem(7539) >= 50) {
 							mes "Insert the Poring coin and pull the lever.";
 							mes "Click~ The item came out of the mouth of the Poring with a rumbling sound.";
 							mes "What could it be?";
@@ -141,7 +141,7 @@ poring_w01,100,97,3	script	Poring Vending Machine#w	909,{
 							delitem 7539,50; // Poring_Coin
 							getitem .@Random_Figure,1;
 							close;
-						}else{
+						} else {
 							mes "Not enough coins.";
 							close;
 						}
@@ -208,11 +208,11 @@ poring_w01,100,97,3	script	Poring Vending Machine#w	909,{
 	end;
 
 S_PoringVending:
-	if(countitem(7539) >= getarg(1)) {
+	if (countitem(7539) >= getarg(1)) {
 		mes "Click~ The item came out of the mouth of the Poring with a rumbling sound.";
 		delitem 7539,getarg(1); // Poring_Coin
 		getitem getarg(0),1;
-	}else{
+	} else {
 		mes "Not enough coins.";
 	}
 	close;
@@ -220,7 +220,7 @@ S_PoringVending:
 
 // Information
 //============================================================
-poring_w01,96,97,3	script	Sweet Devi#wop	738,{
+poring_w01,96,97,3	script	Sweet Devi#wop	4_DEVIRUCHI,{
 	if (MaxWeight-Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -289,7 +289,7 @@ poring_w01,96,97,3	script	Sweet Devi#wop	738,{
 		mes "Oh, Alright. I can help.";
 		mes "I'll send you back to your savepoint.";
 		close2;
-		if(WoP_SaveMap$ != "") {
+		if (WoP_SaveMap$ != "") {
 			savepoint WoP_SaveMap$,WoP_SaveMap_X,WoP_SaveMap_Y;
 			set WoP_SaveMap$,"";
 			set WoP_SaveMap_X,0;
@@ -302,7 +302,7 @@ poring_w01,96,97,3	script	Sweet Devi#wop	738,{
 OnPCLogoutEvent:
 	getmapxy .@map$,.@x,.@y,0;
 	if (.@map$ == "poring_w02") {
-		if(WoP_SaveMap$ != "") {
+		if (WoP_SaveMap$ != "") {
 			savepoint WoP_SaveMap$,WoP_SaveMap_X,WoP_SaveMap_Y;
 			set WoP_SaveMap$,"";
 			set WoP_SaveMap_X,0;
@@ -316,7 +316,7 @@ OnPCLogoutEvent:
 OnPCDieEvent:
 	getmapxy .@map$,.@x,.@y,0;
 	if (.@map$ == "poring_w02" && wop_team) {
-		if(getsavepoint(0) != "poring_w02" && WoP_SaveMap$ == "") {
+		if (getsavepoint(0) != "poring_w02" && WoP_SaveMap$ == "") {
 			set WoP_SaveMap$,getsavepoint(0);
 			set WoP_SaveMap_X,getsavepoint(1);
 			set WoP_SaveMap_Y,getsavepoint(2);
@@ -354,7 +354,7 @@ OnInit:
 
 // Poring Registers
 //============================================================
-poring_w01,91,97,3	script	Poring#wop_door_all	1002,{
+poring_w01,91,97,3	script	Poring#wop_door_all	PORING,{
 	end;
 	
 OnInit:
@@ -377,7 +377,7 @@ OnDisable:
 	end;
 }
 
-poring_w01,91,68,5	script	Poring#wop_door_a	1002,{
+poring_w01,91,68,5	script	Poring#wop_door_a	PORING,{
 	end;
 
 OnInit:
@@ -388,12 +388,12 @@ OnInit:
 OnStartArena:
 	warpwaitingpc "poring_w02",26,175;
 	disablewaitingroomevent;
-	if($@wop_teamcount == 0) {
+	if ($@wop_teamcount == 0) {
 		set $@wop_teamcount,1;
 		donpcevent "Poring#wop_door_d::OnDevilingStart";
 		donpcevent "#wop_warp_rtry::OnStop";
 	}
-	else if($@wop_teamcount == 1) {
+	else if ($@wop_teamcount == 1) {
 		donpcevent "#wop_master::OnStart";
 		donpcevent "Poring#wop_door_d::OnStop";
 		stopnpctimer;
@@ -469,7 +469,7 @@ OnTimer58000:
 	end;
 }
 
-poring_w01,112,68,3	script	Poring#wop_door_d	1002,{
+poring_w01,112,68,3	script	Poring#wop_door_d	PORING,{
 	end;
 
 OnInit:
@@ -480,12 +480,12 @@ OnInit:
 OnStartArena:
 	warpwaitingpc "poring_w02",170,175;
 	disablewaitingroomevent;
-	if($@wop_teamcount == 0) {
+	if ($@wop_teamcount == 0) {
 		set $@wop_teamcount,1;
 		donpcevent "Poring#wop_door_a::OnAngelingStart";
 		donpcevent "#wop_warp_rtry::OnStop";
 	}
-	else if($@wop_teamcount == 1) {
+	else if ($@wop_teamcount == 1) {
 		donpcevent "#wop_master::OnStart";
 		donpcevent "Poring#wop_door_a::OnStop";
 		stopnpctimer;
@@ -562,7 +562,7 @@ OnTimer58000:
 	end;
 }
 
-poring_w01,103,70,0	script	#wop_warp_rtry	139,13,13,{
+poring_w01,103,70,0	script	#wop_warp_rtry	HIDDEN_WARP_NPC,13,13,{
 	end;
 
 OnInit:
@@ -618,7 +618,7 @@ OnTimer65000:
 
 // Mr. Doppel
 //============================================================
-poring_w02,26,181,3	script	Mr. Doppel#wop_team_a	739,{
+poring_w02,26,181,3	script	Mr. Doppel#wop_team_a	8_DOPPEL,{
 	if (checkweight(714,3) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -629,7 +629,7 @@ poring_w02,26,181,3	script	Mr. Doppel#wop_team_a	739,{
 	}
 	set .@a_tname$,getpartyname($@wop_team_a);
 	set .@pname$,getpartyname(getcharid(1));
-	if($@wop_team_a != 0 && $@wop_team_a == getcharid(1)) {
+	if ($@wop_team_a != 0 && $@wop_team_a == getcharid(1)) {
 		mes "[Mr. Doppel]";
 		mes "So, everyone joined the party?";
 		mes "The name of the party is... " + .@pname$ + ", right?";
@@ -646,7 +646,7 @@ poring_w02,26,181,3	script	Mr. Doppel#wop_team_a	739,{
 			mes "If you don't get there in time, you won't make it to the battle.";
 			close;
 		case 2:
-			if((getpartyleader(getcharid(1),2) == getcharid(0))) {
+			if ((getpartyleader(getcharid(1),2) == getcharid(0))) {
 				mes "[Mr. Doppel]";
 				mes "So, you are the leader. Before going to the battlefield, you should check all your members.";
 				next;
@@ -678,8 +678,8 @@ poring_w02,26,181,3	script	Mr. Doppel#wop_team_a	739,{
 		}
 	}
 	else {
-		if((getpartyleader(getcharid(1),2) == getcharid(0))) {
-			if($@wop_team_a == 0) {
+		if ((getpartyleader(getcharid(1),2) == getcharid(0))) {
+			if ($@wop_team_a == 0) {
 				mes "[Mr. Doppel]";
 				mes "So, you are the party leader of Angeling Team.";
 				mes "Are you sure all the members are in your party?";
@@ -749,7 +749,7 @@ OnDisable:
 	end;
 }
 
-poring_w02,170,181,3	script	Mr. Doppel#wop_team_d	739,{
+poring_w02,170,181,3	script	Mr. Doppel#wop_team_d	8_DOPPEL,{
 	if (checkweight(714,3) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -760,7 +760,7 @@ poring_w02,170,181,3	script	Mr. Doppel#wop_team_d	739,{
 	}
 	set .@d_tname$,getpartyname($@wop_team_d);
 	set .@pname$,getpartyname(getcharid(1));
-	if($@wop_team_d != 0 && $@wop_team_d == getcharid(1)) {
+	if ($@wop_team_d != 0 && $@wop_team_d == getcharid(1)) {
 		mes "[Mr. Doppel]";
 		mes "So, everyone joined the party?";
 		mes "The name of the party is... " + .@pname$ + ", right?";
@@ -777,7 +777,7 @@ poring_w02,170,181,3	script	Mr. Doppel#wop_team_d	739,{
 			mes "If you don't get there in time, you won't make it to the battle.";
 			close;
 		case 2:
-			if((getpartyleader(getcharid(1),2) == getcharid(0))) {
+			if ((getpartyleader(getcharid(1),2) == getcharid(0))) {
 				mes "[Mr. Doppel]";
 				mes "So, you are the leader. Before going to the battlefield, you should check all your members.";
 				next;
@@ -795,7 +795,7 @@ poring_w02,170,181,3	script	Mr. Doppel#wop_team_d	739,{
 					warp "poring_w02",153,82;
 					end;
 				}
-			}else{
+			} else {
 				mes "[Mr. Doppel]";
 				mes "Right. I'm gonna send you to the battle staging area.";
 				mes "Wait for all the other party members there.";
@@ -806,9 +806,9 @@ poring_w02,170,181,3	script	Mr. Doppel#wop_team_d	739,{
 				end;
 			}
 		}
-	}else{
-		if((getpartyleader(getcharid(1),2) == getcharid(0))) {
-			if($@wop_team_d == 0) {
+	} else {
+		if ((getpartyleader(getcharid(1),2) == getcharid(0))) {
+			if ($@wop_team_d == 0) {
 				mes "[Mr. Doppel]";
 				mes "So, you are the party leader of Deviling Team.";
 				mes "Are you sure all the members are in your party?";
@@ -840,7 +840,7 @@ poring_w02,170,181,3	script	Mr. Doppel#wop_team_d	739,{
 					mes "The clock is ticking. Make up your mind and register as soon as you can.";
 					close;
 				}
-			}else{
+			} else {
 				mes "[Mr. Doppel]";
 				mes "So, you are the leader of the party.";
 				mes "Haven't you finished the party registration yet?";
@@ -852,7 +852,7 @@ poring_w02,170,181,3	script	Mr. Doppel#wop_team_d	739,{
 				mes "Please, confirm.";
 				close;
 			}
-		}else{
+		} else {
 			mes "[Mr. Doppel]";
 			mes "If you aren't a registered member of the party, you can't join the battle.";
 			next;
@@ -905,7 +905,7 @@ OnReset:
 	stopnpctimer;
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -1027,7 +1027,7 @@ OnTimer703000:
 	end;
 }
 
-poring_w02,51,82,0	script	#wop_warp_a	139,1,1,{
+poring_w02,51,82,0	script	#wop_warp_a	HIDDEN_WARP_NPC,1,1,{
 	end;
 
 OnInit:
@@ -1049,7 +1049,7 @@ OnTouch:
 	end;
 }
 
-poring_w02,146,82,0	script	#wop_warp_d	139,1,1,{
+poring_w02,146,82,0	script	#wop_warp_d	HIDDEN_WARP_NPC,1,1,{
 	end;
 
 OnInit:
@@ -1087,7 +1087,7 @@ OnAngelingSpawn:
 
 OnMyMobDead:
 	set $@wop_deadcount_a,$@wop_deadcount_a + 1;
-	if($@wop_deadcount_a == 1) {
+	if ($@wop_deadcount_a == 1) {
 		mapannounce "poring_w02","Mr. Doppel: The Angeling on the 1st base has been killed! 1 point lost!!",0,0x00ff00;
 		initnpctimer;
 	}
@@ -1121,7 +1121,7 @@ OnAngelingSpawn:
 
 OnMyMobDead:
 	set $@wop_deadcount_a,$@wop_deadcount_a + 1;
-	if($@wop_deadcount_a == 1) {
+	if ($@wop_deadcount_a == 1) {
 		mapannounce "poring_w02","Mr. Doppel: The Angeling on the 2nd base has been killed! 1 point lost!!",0,0x00ff00;
 		initnpctimer;
 	}
@@ -1156,7 +1156,7 @@ OnDevilingSpawn:
 
 OnMyMobDead:
 	set $@wop_deadcount_d,$@wop_deadcount_d + 1;
-	if($@wop_deadcount_d == 1) {
+	if ($@wop_deadcount_d == 1) {
 		mapannounce "poring_w02","Mr. Doppel: The Deviling on the 1st base has been killed! 1 point lost!!",0,0x00ff00;
 		initnpctimer;
 	}
@@ -1171,7 +1171,7 @@ OnMyMobDead:
 
 OnTimer120000:
 	set $@wop_deadcount_d,$@wop_deadcount_d - 1;
-	donpcevent "#wop_devillium1::OndevilingSpawn";
+	donpcevent "#wop_devillium1::OnDevilingSpawn";
 	mapannounce "poring_w02","Mr. Doppel: The Deviling on the 1st base has been revived! 1 point gained!!",0,0x00ff00;
 	stopnpctimer;
 	end;
@@ -1185,13 +1185,13 @@ OnReset:
 	stopnpctimer;
 	end;
 
-OndevilingSpawn:
+OnDevilingSpawn:
 	monster "poring_w02",98,124,"Deviling",1767,1,"#wop_devillium2::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	set $@wop_deadcount_d,$@wop_deadcount_d + 1;
-	if($@wop_deadcount_d == 1) {
+	if ($@wop_deadcount_d == 1) {
 		mapannounce "poring_w02","Mr. Doppel: The deviling on the 2nd base has been killed! 1 point lost!!",0,0x00ff00;
 		initnpctimer;
 	}
@@ -1206,14 +1206,14 @@ OnMyMobDead:
 
 OnTimer120000:
 	set $@wop_deadcount_d,$@wop_deadcount_d - 1;
-	donpcevent "#wop_devillium2::OndevilingSpawn";
+	donpcevent "#wop_devillium2::OnDevilingSpawn";
 	mapannounce "poring_w02","Mr. Doppel: The deviling on the 2nd base has been revived! 1 point gained!!",0,0x00ff00;
 	stopnpctimer;
 }
 
 // Deviruchi
 //============================================================
-poring_w02,99,201,3	script	Deviruchi#wop_endmaster	738,{
+poring_w02,99,201,3	script	Deviruchi#wop_endmaster	4_DEVIRUCHI,{
 	if (MaxWeight-Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -1224,14 +1224,14 @@ poring_w02,99,201,3	script	Deviruchi#wop_endmaster	738,{
 	}
 	set .@a_point,$@wop_deadcount_a;
 	set .@d_point,$@wop_deadcount_d;
-	if(getcharid(1) == $@wop_team_a) {
-		if(.@a_point < .@d_point) {
+	if (getcharid(1) == $@wop_team_a) {
+		if (.@a_point < .@d_point) {
 			mes "[Devi]";
 			mes "Good work!";
 			mes "Thanks to you, we increased our chances of victory.";
 			mes "Please, accept these Poring Coins as a sign of our appreciation.";
 			next;
-			if(wop_team == 1) {
+			if (wop_team == 1) {
 				mes "[Devi]";
 				mes "Goodbye, my human friend.";
 				close2;
@@ -1251,13 +1251,13 @@ poring_w02,99,201,3	script	Deviruchi#wop_endmaster	738,{
 				end;
 			}
 		}
-		else if(.@a_point == .@d_point) {
+		else if (.@a_point == .@d_point) {
 			mes "[Devi]";
 			mes "You did the best you could.";
 			mes "I' ts a shame the battle was tied...";
 			mes "Even so, thanks for coming to fight for us. Please, accept this Poring Coin.";
 			next;
-			if(wop_team == 1) {
+			if (wop_team == 1) {
 				mes "[Devi]";
 				mes "Goodbye, my human friend.";
 				close2;
@@ -1279,7 +1279,7 @@ poring_w02,99,201,3	script	Deviruchi#wop_endmaster	738,{
 			}
 		}
 		else {
-			if(wop_team == 1) {
+			if (wop_team == 1) {
 				mes "[Devi]";
 				mes "Well, I guess we had bad luck...";
 				mes "I cant give you anything, since we lost and everything...";
@@ -1305,7 +1305,7 @@ poring_w02,99,201,3	script	Deviruchi#wop_endmaster	738,{
 			}
 		}
 	}
-	else if(getcharid(1) == $@wop_team_d) {
+	else if (getcharid(1) == $@wop_team_d) {
 		if (.@a_point > .@d_point) {
 			mes "[Devi]";
 			mes "Good work!";
@@ -1332,13 +1332,13 @@ poring_w02,99,201,3	script	Deviruchi#wop_endmaster	738,{
 				end;
 			}
 		}
-		else if(.@a_point == .@d_point) {
+		else if (.@a_point == .@d_point) {
 			mes "[Devi]";
 			mes "You did the best you could.";
 			mes "It's a shame the battle was tied...";
 			mes "Even so, thanks for coming to fight for us. Please, accept this Poring Coin.";
 			next;
-			if(wop_team == 2) {
+			if (wop_team == 2) {
 				mes "[Devi]";
 				mes "Goodbye, my human friend.";
 				close2;
@@ -1360,7 +1360,7 @@ poring_w02,99,201,3	script	Deviruchi#wop_endmaster	738,{
 			}
 		}
 		else {
-			if(wop_team == 2) {
+			if (wop_team == 2) {
 				mes "[Devi]";
 				mes "Well, I guess we had bad luck...";
 				mes "I cant give you anything, since we lost and everything...";
@@ -1448,22 +1448,22 @@ OnTimer68100:
 
 // Gate Guardian
 //============================================================
-poring_w02,99,52,0	script	Angeling Guardian#wop_da	111,{
+poring_w02,99,52,0	script	Angeling Guardian#wop_da	HIDDEN_NPC,{
 	cutin "wop_emb0" + $@wop_doorcount_a,1;
-	if($@wop_doorcount_a < 4) {
+	if ($@wop_doorcount_a < 4) {
 		if (wop_team == 2) {
 			mes "There is a device to equip the War Badges.";
 			mes "I can see the empty slots to equip the Badges.";
 			next;
 			switch(select("Equip War Badge.:Cancel.")) {
 			case 1:
-				if(countitem(7773)) {
-					if($@wop_doorcount_a < 4) {
+				if (countitem(7773)) {
+					if ($@wop_doorcount_a < 4) {
 						mes "War Badge equipped.";
 						delitem 7773,1; // War_Badge
 						set $@wop_doorcount_a,$@wop_doorcount_a + 1;
 						cutin "wop_emb0" + $@wop_doorcount_a,1;
-						if($@wop_doorcount_a == 4) {
+						if ($@wop_doorcount_a == 4) {
 							next;
 							mes "Gate Activated.";
 							donpcevent "#aroom_ingate_wop::OnEnable";
@@ -1505,7 +1505,7 @@ OnInit:
 	end;
 }
 
-poring_w02,103,52,0	script	#aroom_ingate_wop	139,1,1,{
+poring_w02,103,52,0	script	#aroom_ingate_wop	HIDDEN_WARP_NPC,1,1,{
 	end;
 
 OnInit:
@@ -1525,7 +1525,7 @@ OnTouch:
 	end;
 }
 
-poring_w02,93,51,0	script	#aroom_outgate_wop	139,1,1,{
+poring_w02,93,51,0	script	#aroom_outgate_wop	HIDDEN_WARP_NPC,1,1,{
 	end;
 
 OnInit:
@@ -1545,22 +1545,22 @@ OnTouch:
 	end;
 }
 
-poring_w02,98,113,0	script	Deviling Guardian#wop_dd	111,{
+poring_w02,98,113,0	script	Deviling Guardian#wop_dd	HIDDEN_NPC,{
 	cutin "wop_emb0" + $@wop_doorcount_d,1;
-	if($@wop_doorcount_d < 4) {
+	if ($@wop_doorcount_d < 4) {
 		if (wop_team == 1) {
 			mes "There is a device to equip the War Badges.";
 			mes "I can see the empty slots to equip the Badges.";
 			next;
 			switch(select("Equip War Badge.:Cancel.")) {
 			case 1:
-				if(countitem(7773)) {
-					if($@wop_doorcount_d < 4) {
+				if (countitem(7773)) {
+					if ($@wop_doorcount_d < 4) {
 						mes "War Badge equipped.";
 						delitem 7773,1; // War_Badge
 						set $@wop_doorcount_d,$@wop_doorcount_d + 1;
 						cutin "wop_emb0" + $@wop_doorcount_d,1;
-						if($@wop_doorcount_d == 4) {
+						if ($@wop_doorcount_d == 4) {
 							next;
 							mes "Gate Activated.";
 							donpcevent "#droom_ingate_wop::OnEnable";
@@ -1602,7 +1602,7 @@ OnInit:
 	end;
 }
 
-poring_w02,93,113,0	script	#droom_ingate_wop	139,1,1,{
+poring_w02,93,113,0	script	#droom_ingate_wop	HIDDEN_WARP_NPC,1,1,{
 	end;
 
 OnInit:
@@ -1622,7 +1622,7 @@ OnTouch:
 	end;
 }
 
-poring_w02,103,114,0	script	#droom_outgate_wop	139,1,1,{
+poring_w02,103,114,0	script	#droom_outgate_wop	HIDDEN_WARP_NPC,1,1,{
 	end;
 
 OnInit:
@@ -1652,19 +1652,19 @@ OnTouch:
 	end;
 }
 
-poring_w01,79,102,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa1	1002
-poring_w01,80,107,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa2	1002
-poring_w01,84,108,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa3	1002
-poring_w01,84,112,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa4	1002
-poring_w01,88,112,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa5	1002
+poring_w01,79,102,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa1	PORING
+poring_w01,80,107,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa2	PORING
+poring_w01,84,108,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa3	PORING
+poring_w01,84,112,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa4	PORING
+poring_w01,88,112,5	duplicate(Angeling Side Poring#wpa)	Angeling Side Poring#wa5	PORING
 
-poring_w01,114,112,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd1	1242
-poring_w01,117,111,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd2	1242
-poring_w01,117,108,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd3	1242
-poring_w01,122,108,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd4	1242
-poring_w01,121,105,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd5	1242
+poring_w01,114,112,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd1	MARIN
+poring_w01,117,111,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd2	MARIN
+poring_w01,117,108,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd3	MARIN
+poring_w01,122,108,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd4	MARIN
+poring_w01,121,105,3	duplicate(Deviling Side Marin#wpd)	Deviling Side Marin#wd5	MARIN
 
-poring_w01,84,108,3	script	#wop_ex_1	139,3,3,{
+poring_w01,84,108,3	script	#wop_ex_1	HIDDEN_WARP_NPC,3,3,{
 	end;
 
 OnTouch:
@@ -1681,14 +1681,14 @@ OnTouch:
 	emotion e_go,0,"Angeling Side Poring#wa4";
 	emotion e_go,0,"Angeling Side Poring#wa5";
 	next;
-	if(wop_team == 1) {
+	if (wop_team == 1) {
 		mes "[Porings]";
 		mes "Ohhhhhh, there he is, the warrior that fought for us!!";
 		mes "Oh my god... Nice, ring!";
 		mes "Poring~ Poring~ Poooooo~";
 		mes "Party of Angeling~ Popopo, Poring!";
 	}
-	else if(wop_team == 2) {
+	else if (wop_team == 2) {
 		mes "[Porings]";
 		mes "Wait, YOU! Aren't you on the side of the Devilings?!";
 		mes "Get out now! Leave!!";
@@ -1717,7 +1717,7 @@ OnTouch:
 	close;
 }
 
-poring_w01,119,107,3	script	#wop_ex_2	139,3,3,{
+poring_w01,119,107,3	script	#wop_ex_2	HIDDEN_WARP_NPC,3,3,{
 	end;
 
 OnTouch:
@@ -1734,13 +1734,13 @@ OnTouch:
 	emotion e_go,0,"Deviling Side Marin#wd4";
 	emotion e_go,0,"Deviling Side Marin#wd5";
 	next;
-	if(wop_team == 2) {
+	if (wop_team == 2) {
 		mes "[Marins]";
 		mes "Ohhhh... Here is the warrior that fought for us!!";
 		mes "Amazing!";
 		mes "This proves that humans recognize us as true monsters!!";
 	}
-	else if(wop_team == 1) {
+	else if (wop_team == 1) {
 		mes "[Marins]";
 		mes "Wait, YOU! Aren't you on the side of the Angelings?!";
 		mes "Get out now! Leave!!";
diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt
index 7ed2b2f14..33c6980dd 100644
--- a/npc/other/powernpc.txt
+++ b/npc/other/powernpc.txt
@@ -5,12 +5,12 @@
 //===== Current Version: =====================================
 //= 1.2
 //===== Additional Comments: =================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.2 Cleaning. [Euphy]
 //============================================================
 
-gonryun,180,118,4	script	Iron man#gnp	85,{
+gonryun,180,118,4	script	Iron man#gnp	4_M_03,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -110,7 +110,7 @@ L_Lifting:
 	return;
 }
 
-gon_test,50,14,4	script	Administrator#gnp	780,{
+gon_test,50,14,4	script	Administrator#gnp	8_M_TWSOLDIER,{
 	mes "[Administrator]";
 	if (BaseJob == Job_Novice) {
 		mes "Children are not allowed in here.";
@@ -137,7 +137,7 @@ gon_test,50,14,4	script	Administrator#gnp	780,{
 		mes "I'm sorry but you don't have enough zeny.";
 		close;
 	}
-	set Zeny,Zeny - 500;
+	Zeny -= 500;
 	set in_battle,1;
 	warp "gon_test",42,86;
 	set $@in_battle,1;
@@ -146,7 +146,7 @@ gon_test,50,14,4	script	Administrator#gnp	780,{
 	end;
 }
 
-gon_test,42,89,4	script	Summoner#gnp	774,{
+gon_test,42,89,4	script	Summoner#gnp	4_M_TWBOY,{
 	mes "[SongYeunWoo]";
 	if (in_battle == 3) {
 		mes "Please come back after registration.";
@@ -161,16 +161,16 @@ gon_test,42,89,4	script	Summoner#gnp	774,{
 	mes "Welcome.";
 	mes "Which monster will you recall?";
 	next;
-	set @gnpGroup,select("Group 1:Group 2:Group 3:Group 4:Group 5:Group 6:Group 7:Group 8:Group 9:Group 10:Group 11");
-	set @gnpGroupMob$,.gnpMobsName$[(@gnpGroup-1)*6];
-	for (set @i,1; @i < 6; set @i, @i+1)
-		set @gnpGroupMob$, @gnpGroupMob$ + ":" + .gnpMobsName$[(@gnpGroup-1)*6 + @i];
-	set @gnpMob,select(@gnpGroupMob$);
+	set .@gnpGroup, select("Group 1:Group 2:Group 3:Group 4:Group 5:Group 6:Group 7:Group 8:Group 9:Group 10:Group 11");
+	set .@gnpGroupMob$,.gnpMobsName$[(.@gnpGroup-1)*6];
+	for (set .@i,1; .@i < 6; set .@i, .@i+1)
+		set .@gnpGroupMob$, .@gnpGroupMob$ + ":" + .gnpMobsName$[(.@gnpGroup-1)*6 + .@i];
+	set .@gnpMob, select(.@gnpGroupMob$);
 	mes "[SongYeunWoo]";
 	mes "Let the fight begin!";
 	close2;
 	set in_battle,2;
-	if (getnpctimer(0) < 180000) monster "gon_test",56,86,.gnpMobsName$[(@gnpGroup-1)*6 + @gnpMob - 1],.gnpMobsId[(@gnpGroup-1)*6 + @gnpMob - 1],1,"Summoner#gnp::OnGnpMobDead";
+	if (getnpctimer(0) < 180000) monster "gon_test",56,86,.gnpMobsName$[(.@gnpGroup-1)*6 + .@gnpMob - 1],.gnpMobsId[(.@gnpGroup-1)*6 + .@gnpMob - 1],1,"Summoner#gnp::OnGnpMobDead";
 	end;
 OnInit:
 	initnpctimer;
@@ -223,7 +223,7 @@ OnTimer184000:
 	end;
 }
 
-gon_test,46,14,3	script	Guide of field of fight	770,{
+gon_test,46,14,3	script	Guide of field of fight	4_F_TWGIRL,{
 	mes "[SongHeeYeon]";
 	mes ".....";
 	mes "Hi, there~";
@@ -272,7 +272,7 @@ gon_test,46,14,3	script	Guide of field of fight	770,{
 	close;
 }
 
-gon_test,70,103,3	script	ChowAnAn#gnp	773,{
+gon_test,70,103,3	script	ChowAnAn#gnp	4_F_TWMIDWOMAN,{
 	mes "[ChowAnAn]";
 	mes "Want to go back?";
 	next;
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 94ea7cf10..779f332ae 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -3,17 +3,21 @@
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf, Elias (og2)
 //===== Current Version: =====================================
-//= 2.3
+//= 2.5
 //===== Description: =========================================
 //= PvP NPCs that are found in the Inns in major cities.
 //= Includes Yoyo Mode, Nightmare Mode, and Event Mode.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.0 Narrators/GateKeepers,etc. Translated from the Official 2011 [Elias]
 //= 2.1 Changed PVP Narrator and GateKeeper to Floating NPC [Elias]
 //= 2.2 Some cleaning. [Euphy]
 //= 2.3 Fixed grammatical errors. [Joseph]
+//= 2.4 Fixed incorrect use of 'close' and some cleaning. [Joseph]
+//= 2.5 Renewal/Pre-Renewal split. [Euphy]
 //============================================================
 
+// Information
+//============================================================
 -	script	PVP Narrator::pvpe	-1,{
 	mes "[PVP Narrator]";
 	mes "Hello and welcome!";
@@ -21,155 +25,154 @@
 	mes "explaining the PVP Modes.";
 	mes "I am the PVP Narrator!";
 	next;
-	switch(select("What is PVP?","What are the PVP Modes?","What are the rules for PVP?","Save Position.","End Dialog.")) {
-		case 1:
-			mes "[PVP Narrator]";
-			mes "In short, PVP means";
-			mes "' Player VS Player Mode '";
-			mes "It's a unique place for people";
-			mes "to duel with each other.";
-			next;
-			mes "[PVP Narrator]";
-			mes "Just tell the";
-			mes "^3355FFGate Keeper^000000";
-			mes "that you want to try. He will";
-			mes "let you enter the PVP square.";
-			next;
-			mes "[PVP Narrator]";
-			mes "But, you need to be at";
-			mes "least level 31. And you";
-			mes "must pay 500 zeny entrance fee in order";
-			mes "to enter a PVP fight square.";
-			break;
-		case 2:
-			mes "[PVP Narrator]";
-			mes "When you are qualified, you";
-			mes "can choose one of the two modes.";
-			mes "Yoyo Mode or Nightmare Mode.";
-			next;
-			mes "[PVP Narrator]";
-			mes "Yoyo Mode is risk free.";
-			mes "You can experience PVP";
-			mes "without any restriction or";
-			mes "punishment. It is recommended";
-			mes "that you practice your skills";
-			mes "here before you move on.";
-			next;
-			mes "[PVP Narrator]";
-			mes "Nightmare Mode is very";
-			mes "dangerous! Please be cautious,";
-			mes "you will lose some of your";
-			mes "EXP when you are defeated. And";
-			mes "there is a small chance that";
-			mes "you will drop some equipment.";
-			next;
-			mes "[PVP Narrator]";
-			mes "However, if you win, the";
-			mes "rewards can be great!";
-			mes "To avoid misunderstanding,";
-			mes "you should think twice";
-			mes "before you go there...";
-			mes "Good Luck!";
-			break;
-		case 3:
-			mes "[PVP Narrator]";
-			mes "Each of the fight squares";
-			mes "have a row of Narrators and";
-			mes "choose them based on your";
-			mes "qualifications.";
-			next;
-			mes "[PVP Narrator]";
-			mes "Each Narrator will ask";
-			mes "which of the five PVP maps";
-			mes "you wish to go to.";
-			mes "Choose, and go in!";
-			next;
-			mes "[PVP Narrator]";
-			mes "Each map has a limitation on";
-			mes "the number of people who can";
-			mes "participate. So you will see";
-			mes "figures in the corner showing";
-			mes "'Attendee/Total'.";
-			next;
-			mes "[PVP Narrator]";
-			mes "Also, there is a hidden EXP";
-			mes "value in PVP mode. This EXP";
-			mes "score will only apply inside";
-			mes "of the PVP zone, so do not";
-			mes "worry.";
-			next;
-			mes "[PVP Narrator]";
-			mes "Every player's EXP at the";
-			mes "beginning is usually 5 points.";
-			mes "If you win, it will";
-			mes "increase by 1 point";
-			next;
-			mes "[PVP Narrator]";
-			mes "In the same way, when you";
-			mes "lose... Your EXP will";
-			mes "drop by 5 points.";
-			mes "So be careful!";
-			next;
-			mes "[PVP Narrator]";
-			mes "When you are defeated";
-			mes "And your EXP is equal";
-			mes "to or less than 0,";
-			mes "You will be removed from PVP";
-			mes "and your duel is finished!";
-			next;
-			mes "[PVP Narrator]";
-			mes "However, if your EXP is more";
-			mes "than 0. You can still get help";
-			mes "through other players healing...";
-			mes "Do you get it?";
-			next;
-			mes "[PVP Narrator]";
-			mes "The fighting commands inside of";
-			mes "PVP are the same as the normal.";
-			mes "All the basic controls are the";
-			mes "same.";
-			next;
-			mes "[PVP Narrator]";
-			mes "However, there is one thing...";
-			mes "Within the PVP fight square";
-			mes "and PVP fighting zones,";
-			mes "you cannot save your position.";
-			mes "Remember well... These rules";
-			mes "can help to ensure your victory.";
-			break;
-		case 4:
-			mes "[PVP Narrator]";
-			mes "Position successfully saved...";
-			mes "Thank you very much!";
-			mes "We will see you again soon.";
-				if(strnpcinfo(4) == "morocc_in") { savepoint "morocc_in",141,139; }
-				if(strnpcinfo(4) == "alberta_in") { savepoint "alberta_in",22,148; }
-				if(strnpcinfo(4) == "prt_in") { savepoint "prt_in",54,137; }
-				if(strnpcinfo(4) == "geffen_in") { savepoint "geffen_in",70,59; }
-				if(strnpcinfo(4) == "payon_in01") { savepoint "payon_in01",142,46; }
-			break;
-		case 5:
-			mes "[PVP Narrator]";
-			mes "With war raging between monsters";
-			mes "and humans, this competition";
-			mes "among people - PVP -";
-			mes "encourages us all to get";
-			mes "stronger. Come again,";
-			mes "we welcome your challenge!";
-			break;
+	switch(select("What is PVP?:What are the PVP Modes?:What are the rules for PVP?:Save Position.:End Dialog.")) {
+	case 1:
+		mes "[PVP Narrator]";
+		mes "In short, PVP means";
+		mes "' Player VS Player Mode '";
+		mes "It's a unique place for people";
+		mes "to duel with each other.";
+		next;
+		mes "[PVP Narrator]";
+		mes "Just tell the";
+		mes "^3355FFGate Keeper^000000";
+		mes "that you want to try. He will";
+		mes "let you enter the PVP square.";
+		next;
+		mes "[PVP Narrator]";
+		mes "But, you need to be at";
+		mes "least level 31. And you";
+		mes "must pay 500 zeny entrance fee in order";
+		mes "to enter a PVP fight square.";
+		break;
+	case 2:
+		mes "[PVP Narrator]";
+		mes "When you are qualified, you";
+		mes "can choose one of the two modes.";
+		mes "Yoyo Mode or Nightmare Mode.";
+		next;
+		mes "[PVP Narrator]";
+		mes "Yoyo Mode is risk free.";
+		mes "You can experience PVP";
+		mes "without any restriction or";
+		mes "punishment. It is recommended";
+		mes "that you practice your skills";
+		mes "here before you move on.";
+		next;
+		mes "[PVP Narrator]";
+		mes "Nightmare Mode is very";
+		mes "dangerous! Please be cautious,";
+		mes "you will lose some of your";
+		mes "EXP when you are defeated. And";
+		mes "there is a small chance that";
+		mes "you will drop some equipment.";
+		next;
+		mes "[PVP Narrator]";
+		mes "However, if you win, the";
+		mes "rewards can be great!";
+		mes "To avoid misunderstanding,";
+		mes "you should think twice";
+		mes "before you go there...";
+		mes "Good Luck!";
+		break;
+	case 3:
+		mes "[PVP Narrator]";
+		mes "Each of the fight squares";
+		mes "have a row of Narrators and";
+		mes "choose them based on your";
+		mes "qualifications.";
+		next;
+		mes "[PVP Narrator]";
+		mes "Each Narrator will ask";
+		mes "which of the five PVP maps";
+		mes "you wish to go to.";
+		mes "Choose, and go in!";
+		next;
+		mes "[PVP Narrator]";
+		mes "Each map has a limitation on";
+		mes "the number of people who can";
+		mes "participate. So you will see";
+		mes "figures in the corner showing";
+		mes "'Attendee/Total'.";
+		next;
+		mes "[PVP Narrator]";
+		mes "Also, there is a hidden EXP";
+		mes "value in PVP mode. This EXP";
+		mes "score will only apply inside";
+		mes "of the PVP zone, so do not";
+		mes "worry.";
+		next;
+		mes "[PVP Narrator]";
+		mes "Every player's EXP at the";
+		mes "beginning is usually 5 points.";
+		mes "If you win, it will";
+		mes "increase by 1 point";
+		next;
+		mes "[PVP Narrator]";
+		mes "In the same way, when you";
+		mes "lose... Your EXP will";
+		mes "drop by 5 points.";
+		mes "So be careful!";
+		next;
+		mes "[PVP Narrator]";
+		mes "When you are defeated";
+		mes "And your EXP is equal";
+		mes "to or less than 0,";
+		mes "You will be removed from PVP";
+		mes "and your duel is finished!";
+		next;
+		mes "[PVP Narrator]";
+		mes "However, if your EXP is more";
+		mes "than 0. You can still get help";
+		mes "through other players healing...";
+		mes "Do you get it?";
+		next;
+		mes "[PVP Narrator]";
+		mes "The fighting commands inside of";
+		mes "PVP are the same as the normal.";
+		mes "All the basic controls are the";
+		mes "same.";
+		next;
+		mes "[PVP Narrator]";
+		mes "However, there is one thing...";
+		mes "Within the PVP fight square";
+		mes "and PVP fighting zones,";
+		mes "you cannot save your position.";
+		mes "Remember well... These rules";
+		mes "can help to ensure your victory.";
+		break;
+	case 4:
+		mes "[PVP Narrator]";
+		mes "Position successfully saved...";
+		mes "Thank you very much!";
+		mes "We will see you again soon.";
+		if(strnpcinfo(4) == "morocc_in") { savepoint "morocc_in",141,139; }
+		if(strnpcinfo(4) == "alberta_in") { savepoint "alberta_in",22,148; }
+		if(strnpcinfo(4) == "prt_in") { savepoint "prt_in",54,137; }
+		if(strnpcinfo(4) == "geffen_in") { savepoint "geffen_in",70,59; }
+		if(strnpcinfo(4) == "payon_in01") { savepoint "payon_in01",142,46; }
+		break;
+	case 5:
+		mes "[PVP Narrator]";
+		mes "With war raging between monsters";
+		mes "and humans, this competition";
+		mes "among people - PVP -";
+		mes "encourages us all to get";
+		mes "stronger. Come again,";
+		mes "we welcome your challenge!";
+		break;
 	}
 	close;
 }
+morocc_in,144,138,4	duplicate(pvpe)	PVP Narrator#pe1	4_M_02
+alberta_in,22,146,4	duplicate(pvpe)	PVP Narrator#pe2	4_M_02
+prt_in,56,140,4	duplicate(pvpe)	PVP Narrator#pe3	4_M_02
+geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe4	4_M_02
+payon_in01,142,50,4	duplicate(pvpe)	PVP Narrator#pe5	4_M_02
+geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	4_M_02
 
-//PVP Narrator's Duplicates
-morocc_in,144,138,4	duplicate(pvpe)	PVP Narrator#pe1	84
-alberta_in,22,146,4	duplicate(pvpe)	PVP Narrator#pe2	84
-prt_in,56,140,4	duplicate(pvpe)	PVP Narrator#pe3	84
-geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe4	84
-payon_in01,142,50,4	duplicate(pvpe)	PVP Narrator#pe5	84
-geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
-
-//Gate Keeper (Floating NPC, Locations below)
+// Mode Select
+//============================================================
 -	script	Gate Keeper::gkut	-1,{
 	mes "[Gate Keeper]";
 	mes "Glad to be of service.";
@@ -179,7 +182,7 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 	mes "modes or rules, Please ask";
 	mes "the Narrator...";
 	next;
-	switch(select("^FF5533' PvP Nightmare Mode'^000000","^3355FF' PvP Yoyo Mode'^000000","^3355FF' PvP Event Mode'^000000","Quit")) {
+	switch(select("^FF5533' PvP Nightmare Mode'^000000:^3355FF' PvP Yoyo Mode'^000000:^3355FF' PvP Event Mode'^000000:Quit")) {
 		case 1:
 			mes "[Gate Keeper]";
 			mes "I am sorry, but currently the Nightmare mode service is not available.";
@@ -192,10 +195,11 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 			mes "to the Yoyo Mode";
 			mes "fight square?";
 			next;
-			if(select("Move","Cancel")==1) {
+			switch(select("Move:Cancel")) {
+			case 1:
 				if ((Zeny > 499) && (BaseLevel > 30)) {
-					set Zeny, Zeny - 500;
-					warp "pvp_y_room",51,23;
+					Zeny -= 500;
+					callsub L_Warp,"pvp_y_room";
 				}
 				else {
 					mes "[Gate Keeper]";
@@ -206,15 +210,16 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 					mes "that you are at least level 31!";
 				}
 				close;
+			case 2:
+				mes "[Gate Keeper]";
+				mes "With war raging between monsters";
+				mes "and humans, this competition";
+				mes "among people - PVP -";
+				mes "encourages us all to get";
+				mes "stronger. Come again,";
+				mes "we welcome your challenge!";
+				close;
 			}
-			mes "[Gate Keeper]";
-			mes "With war raging between monsters";
-			mes "and humans, this competition";
-			mes "among people - PVP -";
-			mes "encourages us all to get";
-			mes "stronger. Come again,";
-			mes "we welcome your challenge!";
-			close;
 		case 3:
 			mes "[Gate Keeper]";
 			mes "Welcome!";
@@ -232,7 +237,8 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 			}
 			mes "[Gate Keeper]";
 			mes "Yes, thank you for participating. Have fun!";
-			warp "pvp_room",51,23;
+			if (Zeny >= 500) Zeny -= 500;
+			callsub L_Warp,"pvp_room";
 			break;
 		case 4:
 			mes "[Gate Keeper]";
@@ -245,60 +251,74 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	84
 			break;
 	}
 	close;
+
+L_Warp:
+	set .@map$,getarg(0);
+	if (checkre(0)) {
+		switch(rand(1,10)) {
+			case 1: warp .@map$,34,38; break;
+			case 2: warp .@map$,46,38; break;
+			case 3: warp .@map$,58,38; break;
+			case 4: warp .@map$,70,38; break;
+			case 5: warp .@map$,82,38; break;
+			case 6: warp .@map$,82,58; break;
+			case 7: warp .@map$,65,58; break;
+			case 8: warp .@map$,49,58; break;
+			case 9: warp .@map$,33,58; break;
+			case 10: warp .@map$,52,24; break;
+		}
+	} else
+		warp .@map$,51,23;
+	return;
 }
+morocc_in,144,142,4	duplicate(gkut)	Gate Keeper#gke1	4_M_01
+alberta_in,26,146,4	duplicate(gkut)	Gate Keeper#gke2	4_M_01
+prt_in,52,140,4	duplicate(gkut)	Gate Keeper#gke3	4_M_01
+geffen_in,63,63,4	duplicate(gkut)	Gate Keeper#gke4	4_M_01
+payon_in01,140,53,4	duplicate(gkut)	Gate Keeper#gke5	4_M_01
 
-//Gate Keeper Duplicates
-morocc_in,144,142,4	duplicate(gkut)	Gate Keeper#gke1	83
-alberta_in,26,146,4	duplicate(gkut)	Gate Keeper#gke2	83
-prt_in,52,140,4	duplicate(gkut)	Gate Keeper#gke3	83
-geffen_in,63,63,4	duplicate(gkut)	Gate Keeper#gke4	83
-payon_in01,140,53,4	duplicate(gkut)	Gate Keeper#gke5	83
+// PVP Warper Function
+//============================================================
+// Note: The warper NPCs are in the pre-re/re paths.
 
-//Fight square Reception Staff (Locations below)
--	script	FSRS::fsr	-1,{
-	if(strnpcinfo(4) == "pvp_y_room") {
-		setarray .@Maps$[0],"pvp_y_8-1","pvp_y_8-2","pvp_y_8-3","pvp_y_8-4","pvp_y_8-5";
-		setarray .@Name$[0],"Prontera","Izlude","Payon","Alberta","Morroc";
-		setarray .@Limit[0],128,128,128,128,128;
+//callfunc "F_PVP_FSRS"{,<min_lvl>,<max_lvl>};
+function	script	F_PVP_FSRS	{
+	if (getargcount()) {
+		if (BaseLevel < getarg(0) || BaseLevel > getarg(1)) {
+			mes "[PVP Fight Square Reception Staff]";
+			mes "Sorry, but you base level has to be between LV "+getarg(0)+" and LV "+getarg(1)+".";
+			close;
+		}
+	}
+	if (strnpcinfo(4) == "pvp_y_room") {
+		set .@base$, "pvp_y_"+strnpcinfo(2);
+		setarray .@maps$[0],	.@base$+"-1",	.@base$+"-2",	.@base$+"-3",	.@base$+"-4",	.@base$+"-5";
+		setarray .@name$[0],	"Prontera",		"Izlude",		"Payon",		"Alberta",		"Morroc";
+		setarray .@Limit[0],	128,			128,			128,			128,			128;
 	} else {
-		setarray .@Maps$[0],"pvp_n_8-1","pvp_n_8-2","pvp_n_8-3","pvp_n_8-4","pvp_n_8-5";
-		setarray .@Name$[0],"Sandwich","Lock on","Four Room","Under cross","Compass Room";
-		setarray .@Limit[0],64,32,32,32,32;
+		setarray .@maps$[0],	"pvp_n_8-1",	"pvp_n_8-2",	"pvp_n_8-3",	"pvp_n_8-4",	"pvp_n_8-5";
+		setarray .@name$[0],	"Sandwich",		"Lock on",		"Four Room",	"Under cross",	"Compass Room";
+		setarray .@Limit[0],	64,				32,				32,				32,				32;
 	}
 	for(set .@i,0; .@i<5; set .@i,.@i+1)
-		set .@menu$, .@menu$+.@Name$[.@i]+" ["+getmapusers(.@Maps$[.@i])+" / "+.@Limit[.@i]+"]:";
+		set .@menu$, .@menu$+.@name$[.@i]+" ["+getmapusers(.@maps$[.@i])+" / "+.@Limit[.@i]+"]:";
 	set .@menu$, .@menu$+"Cancel.";
 	set .@i, select(.@menu$)-1;
 	if (.@i == 5) close;
-	if (getmapusers(.@Maps$[.@i]) >= .@Limit[.@i]) {
+	if (getmapusers(.@maps$[.@i]) >= .@Limit[.@i]) {
 		mes "[PVP Fight Square Reception Staff]";
 		mes "This map is currently full.";
+		close;
 	}
-	else warp .@Maps$[.@i],0,0;
-	close;
-
-OnInit:
-	waitingroom "Free for all",0;
-end;
+	warp .@maps$[.@i],0,0;
+	end;
 }
 
-//Fight Square Reception Staff
-pvp_y_room,86,85,4	duplicate(fsr)	Fight SQ Reception#f1	105
-pvp_n_room,30,85,4	duplicate(fsr)	Fight SQ Reception#f2	105
 
-pvp_n_8-4,33,122,0	warp	Link_1-11	0,2,pvp_n_8-4,0,0
-pvp_n_8-4,62,84,0	warp	Link_1-12	1,1,pvp_n_8-4,0,0
-pvp_n_8-4,49,71,0	warp	Link_1-21	1,1,pvp_n_8-4,0,0
-pvp_n_8-4,56,166,0	warp	Link_1-22	1,1,pvp_n_8-4,0,0
-pvp_n_8-4,99,180,0	warp	Link_1-31	2,1,pvp_n_8-4,0,0
-pvp_n_8-4,137,84,0	warp	Link_1-32	1,1,pvp_n_8-4,0,0
-pvp_n_8-4,150,71,0	warp	Link_1-41	1,1,pvp_n_8-4,0,0
-pvp_n_8-4,144,166,0	warp	Link_1-42	1,1,pvp_n_8-4,0,0
-pvp_n_8-5,30,30,0	warp	Link_1-99	3,3,pvp_n_8-5,100,100
 
 // Event Contestant Entrance
-//============================================================ 
-pvp_room,54,85,4	script	Registration Staff#1	105,{
+//============================================================
+pvp_room,54,85,4	script	Registration Staff#1	8W_SOLDIER,{
 	if (countitem(7028) == 0) {
 		mes "[PVP Combat Square Register Staff]";
 		mes "Eh? How did you get in here?";
@@ -306,15 +326,12 @@ pvp_room,54,85,4	script	Registration Staff#1	105,{
 		mes "For details about viewers please proceed to the Register Staff on your right.";
 		close;
 	}
-
-	if (.pvp_close_n_room == 1 && .pvp_close_s_room == 1 && .pvp_close_w_room == 1 && .pvp_close_e_room == 1) {
-		Set .pvp_close_n_room,0;
-		Set .pvp_close_s_room,0;
-		Set .pvp_close_w_room,0;
-		Set .pvp_close_e_room,0;
+	set .@size, getarraysize(.warp_x);
+	if (.@size == 0) {
+		setarray .warp_x,40,59,20,40;
+		setarray .warp_y,59,40,40,20;
 	}
-
-	if (select("Combat Square one :Cancel") == 1) {
+	if (select("Combat Square one:Cancel") == 1) {
 		mes "[PVP Combat Square Register Staff]";
 		mes "'"+ strcharinfo(0) +"'";
 		mes "Are you ready?!";
@@ -325,34 +342,11 @@ pvp_room,54,85,4	script	Registration Staff#1	105,{
 			mes "Good luck!";
 			close2;
 			delitem 7028,1; //Invite_For_Duel
-			while(1) {
-				switch(rand(1,4)) {
-				case 1:
-					if (.pvp_close_n_room == 0) {
-						set .pvp_close_n_room,1;
-						warp "pvp_2vs2",40,59;
-						end;
-					}
-				case 2:
-					if (.pvp_close_s_room == 0) {
-						set .pvp_close_s_room,1;
-						warp "pvp_2vs2",59,40;
-						end;
-					}
-				case 3:
-					if (.pvp_close_w_room == 0) {
-						set .pvp_close_w_room,1;
-						warp "pvp_2vs2",20,40;
-						end;
-					}
-				case 4:
-					if (.pvp_close_e_room == 0) {
-						set .pvp_close_e_room,1;
-						warp "pvp_2vs2",40,20;
-						end;
-					}
-				}
-			}
+			set .@rand, rand(.@size);
+			warp "pvp_2vs2", .warp_x[.@rand], .warp_y[.@rand];
+			deletearray .warp_x[.@rand],1;
+			deletearray .warp_y[.@rand],1;
+			end;
 		}
 		mes "[PVP Combat Square Register Staff]";
 		mes "Come back anytime you are ready.";
@@ -361,16 +355,12 @@ pvp_room,54,85,4	script	Registration Staff#1	105,{
 	close;
 
 OnInit:
-	Set .pvp_close_n_room,0;
-	Set .pvp_close_s_room,0;
-	Set .pvp_close_w_room,0;
-	Set .pvp_close_e_room,0;
 	waitingroom "Combat Square players entrance only",0;
 	end;
 }
 
 // Spectator Entrance
-//============================================================ 
+//============================================================
 -	script	Spectator's Entrance#dum::PVPSpectator	-1,{
 	if (countitem(7029) == 0) {
 		mes "[PVP Compete Square Register Staff]";
@@ -378,17 +368,16 @@ OnInit:
 		mes "For details about players entrance please proceed to the Register Staff on your left.";
 		close;
 	}
-
 	if (select("Compete Square one:Cancel") == 1) {
 		mes "[PVP Combat Square Register Staff]";
 		mes "You got it, thanks for participating. Have fun!";
 		close2;
 		delitem 7029,1; //Admission_For_Duel
 		switch(rand(1,4)) {
-		case 1: warp "pvp_2vs2",39,7; end;
-		case 2: warp "pvp_2vs2",39,73; end;
-		case 3: warp "pvp_2vs2",7,39; end;
-		case 4: warp "pvp_2vs2",73,39; end;
+			case 1: warp "pvp_2vs2",39,7; end;
+			case 2: warp "pvp_2vs2",39,73; end;
+			case 3: warp "pvp_2vs2",7,39; end;
+			case 4: warp "pvp_2vs2",73,39; end;
 		}
 	}
 	close;
@@ -397,14 +386,13 @@ OnInit:
 	waitingroom "Compete Square viewer's entrance",0;
 	end;
 }
-
-pvp_room,62,85,4	duplicate(PVPSpectator)	Spectator's Entrance#1	105
-pvp_room,70,85,4	duplicate(PVPSpectator)	Spectator's Entrance#2	105
-pvp_room,78,85,4	duplicate(PVPSpectator)	Spectator's Entrance#3	105
-pvp_room,86,85,4	duplicate(PVPSpectator)	Spectator's Entrance#4	105
+pvp_room,62,85,4	duplicate(PVPSpectator)	Spectator's Entrance#1	8W_SOLDIER
+pvp_room,70,85,4	duplicate(PVPSpectator)	Spectator's Entrance#2	8W_SOLDIER
+pvp_room,78,85,4	duplicate(PVPSpectator)	Spectator's Entrance#3	8W_SOLDIER
+pvp_room,86,85,4	duplicate(PVPSpectator)	Spectator's Entrance#4	8W_SOLDIER
 
 // Spectator Warps
-//============================================================ 
+//============================================================
 -	script	Combat Square Staff#dum::PVPSpecWarp	-1,{
 OnTouch:
 	mes "[Combat Square Staff]";
@@ -416,39 +404,42 @@ OnTouch:
 	warp "pvp_room",84,39;
 	end;
 }
+pvp_2vs2,5,4,0	duplicate(PVPSpecWarp)	Combat Square Staff#1	WARPNPC,1,1
+pvp_2vs2,5,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#2	WARPNPC,1,1
+pvp_2vs2,74,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#3	WARPNPC,1,1
+pvp_2vs2,74,5,0	duplicate(PVPSpecWarp)	Combat Square Staff#4	WARPNPC,1,1
 
-pvp_2vs2,5,4,0	duplicate(PVPSpecWarp)	Combat Square Staff#1	45,1,1
-pvp_2vs2,5,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#2	45,1,1
-pvp_2vs2,74,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#3	45,1,1
-pvp_2vs2,74,5,0	duplicate(PVPSpecWarp)	Combat Square Staff#4	45,1,1
-pvp_2vs2,40,40,0	script	Combat Square Staff#5	45,1,1,{
+pvp_2vs2,40,40,0	script	Combat Square Staff#5	WARPNPC,1,1,{
 	mes "[Combat Square Staff]";
 	mes "May I help you?";
-	if (select("To the side viewer seat.:Leave Combat Square.") == 1)
+	switch(select("To the side viewer seat.:Leave Combat Square.")) {
+	case 1:
 		switch(rand(1,4)) {
-		case 1: warp "pvp_2vs2",39,7; end;
-		case 2: warp "pvp_2vs2",39,73; end;
-		case 3: warp "pvp_2vs2",7,39; end;
-		case 4: warp "pvp_2vs2",73,39; end;
+			case 1: warp "pvp_2vs2",39,7; end;
+			case 2: warp "pvp_2vs2",39,73; end;
+			case 3: warp "pvp_2vs2",7,39; end;
+			case 4: warp "pvp_2vs2",73,39; end;
 		}
-	warp "pvp_c_room",84,39;
-	end;
+	case 2:
+		warp "pvp_c_room",84,39;
+		end;
+	}
 }
 
 // PVP Area Exit warp
-//============================================================ 
-pvp_room,51,19,0	script	out#eventpvp	45,4,2,{
+//============================================================
+pvp_room,51,19,0	script	out#eventpvp	WARPNPC,4,2,{
 OnTouch:
 	mes "[Combat Square Staff]";
 	mes "Did you have fun in Combat Square?";
 	mes "May I ask where you want to go?";
 	next;
 	switch(select("Prontera.:Morocc.:Geffen.:Payon.:Alberta.:Cancel.")) {
-	case 1: warp "prontera",107,60; end;
-	case 2: warp "morocc",157,96; end;
-	case 3: warp "geffen",120,36; end;
-	case 4: warp "payon",96,100; end;
-	case 5: warp "alberta",41,243; end;
-	case 6: close;
+		case 1: warp "prontera",107,60; end;
+		case 2: warp "morocc",157,96; end;
+		case 3: warp "geffen",120,36; end;
+		case 4: warp "payon",96,100; end;
+		case 5: warp "alberta",41,243; end;
+		case 6: close;
 	}
 }
diff --git a/npc/other/sealstatus.txt b/npc/other/sealstatus.txt
deleted file mode 100644
index 038d5357d..000000000
--- a/npc/other/sealstatus.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-//===== Hercules Script ======================================
-//= God Item Seal Status
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Description: ========================================= 
-//= Goid Item Seal Status.
-//===== Additional Comments: ================================= 
-//= 1.0 Translated from the official. [L0ne_W0lf]
-//= 1.1 Now checks proper char vars. [L0ne_W0lf]
-//= 1.2 Cleaning. [Euphy]
-//============================================================ 
-
-prontera,113,294,3	script	Sign Post	837,{
-	mes "======== God Seal Status ========";
-	setarray .@n$[1], "Sleipnir","Megingjard","Brisingamen","Mjolnir";
-	for(set .@i,1; .@i<5; set .@i,.@i+1) {
-		if (getd("$god"+.@i) == 0) mes .@n$[.@i]+" Seal: Unseen";
-		else if (getd("$god"+.@i) < 50) mes .@n$[.@i]+" Seal: Active";
-		else if (getd("$god"+.@i) < 100) mes .@n$[.@i]+" Seal: Appeared";
-		else mes .@n$[.@i]+" Seal: Released";
-	}
-	mes " ";
-	mes "======= Your Seal Status ========";
-	if (god_sl_1 < 51) mes "^ff0000Sleipnir Seal: Not Completed^000000";
-		else mes "^00ff00Sleipnir Seal: Completed^000000";
-	if (god_eremes < 28) mes "^ff0000Megingjard Seal: Not Completed^000000";
-		else mes "^00ff00Megingjard Seal: Completed^000000";
-	if (god_brising < 50) mes "^ff0000Brisingamen Seal: Not Completed^000000";
-		else mes "^00ff00Brisingamen Seal: Completed^000000";
-	if (god_mjo_0 < 11) mes "^ff0000Mjolnir Seal: Not Completed^000000";
-		else mes "^00ff00Mjolnir Seal: Completed^000000";
-	close;
-}
\ No newline at end of file
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index 329d9b3f0..2d9b967d8 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -3,15 +3,18 @@
 //===== By: ==================================================
 //= Joseph
 //===== Current Version: =====================================
-//= 1.0
-//===== Description: ========================================= 
-//= Turbo Track Course: 
+//= 1.2
+//===== Description: =========================================
+//= [Official Conversion]
+//= Turbo Track Course:
 //= - Solo Mode/Time Attack
 //= - Normal (Non-PVP) - 4/8/16 Person
 //= - Expert (PVP) - 4/8/16 Person
 //===== Additional Comments: =================================
 //= 0.x Previous authors: L0ne_W0lf, Kisuka, Elias
 //= 1.0 Merged Turbo Track. [Joseph]
+//= 1.1 Updated RE/Pre-RE EXP. [Euphy]
+//= 1.2 Added Renewal features. [Euphy]
 //============================================================
 
 function	script	F_tt	{
@@ -56,15 +59,15 @@ OnInit:
 	enablewaitingroomevent strnpcinfo(0);
 	end;
 }
-turbo_room,110,135,3	duplicate(entrance#tt_main)	Expert mode - 4 person	124
-turbo_room,117,135,3	duplicate(entrance#tt_main)	Expert mode - 8 person	124
-turbo_room,124,135,3	duplicate(entrance#tt_main)	Expert mode - 16 person	124
-turbo_room,77,135,3	duplicate(entrance#tt_main)	Normal mode - 4 person	124
-turbo_room,84,135,3	duplicate(entrance#tt_main)	Normal mode - 8 person	124
-turbo_room,91,135,3	duplicate(entrance#tt_main)	Normal mode - 16 person	124
-turbo_room,72,132,3	duplicate(entrance#tt_main)	Solo Mode#n1	124
+turbo_room,110,135,3	duplicate(entrance#tt_main)	Expert mode - 4 person	4_F_TELEPORTER
+turbo_room,117,135,3	duplicate(entrance#tt_main)	Expert mode - 8 person	4_F_TELEPORTER
+turbo_room,124,135,3	duplicate(entrance#tt_main)	Expert mode - 16 person	4_F_TELEPORTER
+turbo_room,77,135,3	duplicate(entrance#tt_main)	Normal mode - 4 person	4_F_TELEPORTER
+turbo_room,84,135,3	duplicate(entrance#tt_main)	Normal mode - 8 person	4_F_TELEPORTER
+turbo_room,91,135,3	duplicate(entrance#tt_main)	Normal mode - 16 person	4_F_TELEPORTER
+turbo_room,72,132,3	duplicate(entrance#tt_main)	Solo Mode#n1	4_F_TELEPORTER
 	
-turbo_e_4,298,167,3	script	Helper#tt_main	124,{
+turbo_e_4,298,167,3	script	Helper#tt_main	4_F_TELEPORTER,{
 	mes "[Helper]";
 	mes "You are now in the";
 	mes "Waiting Room. You will";
@@ -74,13 +77,13 @@ turbo_e_4,298,167,3	script	Helper#tt_main	124,{
 	mes "and equipment. Thank you.";
 	close;
 }
-turbo_e_4,298,167,3	duplicate(Helper#tt_main)	Helper#e4_F	124
-turbo_e_8,298,167,3	duplicate(Helper#tt_main)	Helper#e8_F	124
-turbo_e_16,298,167,3	duplicate(Helper#tt_main)	Helper#e16_F	124
-turbo_n_4,298,167,3	duplicate(Helper#tt_main)	Helper#n4_F	124
-turbo_n_8,298,167,3	duplicate(Helper#tt_main)	Helper#n8_F	124
-turbo_n_16,298,167,3	duplicate(Helper#tt_main)	Helper#n16_F	124
-turbo_n_1,298,167,3	duplicate(Helper#tt_main)	Helper#n1_F	124
+turbo_e_4,298,167,3	duplicate(Helper#tt_main)	Helper#e4_F	4_F_TELEPORTER
+turbo_e_8,298,167,3	duplicate(Helper#tt_main)	Helper#e8_F	4_F_TELEPORTER
+turbo_e_16,298,167,3	duplicate(Helper#tt_main)	Helper#e16_F	4_F_TELEPORTER
+turbo_n_4,298,167,3	duplicate(Helper#tt_main)	Helper#n4_F	4_F_TELEPORTER
+turbo_n_8,298,167,3	duplicate(Helper#tt_main)	Helper#n8_F	4_F_TELEPORTER
+turbo_n_16,298,167,3	duplicate(Helper#tt_main)	Helper#n16_F	4_F_TELEPORTER
+turbo_n_1,298,167,3	duplicate(Helper#tt_main)	Helper#n1_F	4_F_TELEPORTER
 
 turbo_e_4,298,167,0	script	Point#tt_main	-1,15,15,{
 	end;
@@ -376,8 +379,8 @@ OnTimer927000:
 	}
 	enablenpc "No_Unfair_Start#"+.@w$+"-1";
 	enablenpc "No_Unfair_Start#"+.@w$+"-2";
-	donpcevent "snake#"+.@w$+"::Onreset";
-	donpcevent "hunting#"+.@w$+"::Onreset";
+	donpcevent "snake#"+.@w$+"::OnReset";
+	donpcevent "hunting#"+.@w$+"::OnReset";
 	disablenpc "bing2#"+.@w$;
 	disablenpc "Winner Helper#TBT_"+.@w$;
 	enablenpc "#cos_"+.@w$+"_end";
@@ -431,9 +434,9 @@ turbo_n_1,68,379,5	duplicate(NoUnfair#tt_main)	No_Unfair_Start#n1-2	-1,5,31
 -	script	LogTrap#tt_main	-1,{
 OnTouch:
 	switch (rand(1,3)) {
-		Case 1: warp strnpcinfo(4),72,372; end;
-		Case 2: warp strnpcinfo(4),72,365; end;
-		Case 3: warp strnpcinfo(4),72,357; end;
+		case 1: warp strnpcinfo(4),72,372; end;
+		case 2: warp strnpcinfo(4),72,365; end;
+		case 3: warp strnpcinfo(4),72,357; end;
 	}
 }
 turbo_e_4,118,377,0	duplicate(LogTrap#tt_main)	trap_a#e4-1	-1,44,1
@@ -986,25 +989,25 @@ turbo_n_1,148,357,0	duplicate(LogTrap#tt_main)	trap_d#n1-15	-1,1,2
 -	script	SandTrap#tt_main	-1,{
 OnTouch:
 	switch(rand(1,10)) {
-		Case 1:
-		Case 9:
+		case 1:
+		case 9:
 			sc_start SC_CONFUSION,8000,0;
 			emotion e_swt2,1;
 			end;
-		Case 2:
+		case 2:
 			sc_start SC_STONE,4000,0;
 			end;
-		Case 4:
+		case 4:
 			sc_start SC_SLEEP,4000,0;
 			end;
-		Case 6:
+		case 6:
 			sc_start SC_FREEZE,4000,0;
 			emotion e_swt2,1;
 			end;
-		Case 8:
+		case 8:
 			sc_start SC_STUN,4000,0;
 			end;
-		Case 10:
+		case 10:
 			sc_start SC_CURSE,80000,0;
 			end;
 	}
@@ -1213,14 +1216,14 @@ OnTouch:
 			mes "I wouldn't be able to do business without the Kafra Services. Thank you, Kafra!";
 			mes " ";
 			mes "[Chief Mahnsoo]";
-			mes "I looove you Kafra!^000000";				
+			mes "I looove you Kafra!^000000";
 		} else {
 			mes "^4d4dff[Karkatan]";
 			mes "My land suffered from poor customer service...until Kafra came along!";
 			mes " ";
 			mes "[Curator Guiss]";
 			mes "Oh, Kafra is simply the best!^000000";
-		}			
+		}
 		next;
 		mes "^ff0000Turbo Track";
 		mes "^ff0000Traps in the Cursed Desert!";
@@ -1613,13 +1616,13 @@ OnTouch:
 	if (.@turbo2 < 8) warp strnpcinfo(4),279,292;
 	end;
 }
-turbo_e_4,324,279,0	duplicate(snake01#tt_main)	snake01#e4	45,1,1
-turbo_e_8,324,279,0	duplicate(snake01#tt_main)	snake01#e8	45,1,1
-turbo_e_16,324,279,0	duplicate(snake01#tt_main)	snake01#e16	45,1,1
-turbo_n_4,324,279,0	duplicate(snake01#tt_main)	snake01#n4	45,1,1
-turbo_n_8,324,279,0	duplicate(snake01#tt_main)	snake01#n8	45,1,1
-turbo_n_16,324,279,0	duplicate(snake01#tt_main)	snake01#n16	45,1,1
-turbo_n_1,324,279,0	duplicate(snake01#tt_main)	snake01#n1	45,1,1
+turbo_e_4,324,279,0	duplicate(snake01#tt_main)	snake01#e4	WARPNPC,1,1
+turbo_e_8,324,279,0	duplicate(snake01#tt_main)	snake01#e8	WARPNPC,1,1
+turbo_e_16,324,279,0	duplicate(snake01#tt_main)	snake01#e16	WARPNPC,1,1
+turbo_n_4,324,279,0	duplicate(snake01#tt_main)	snake01#n4	WARPNPC,1,1
+turbo_n_8,324,279,0	duplicate(snake01#tt_main)	snake01#n8	WARPNPC,1,1
+turbo_n_16,324,279,0	duplicate(snake01#tt_main)	snake01#n16	WARPNPC,1,1
+turbo_n_1,324,279,0	duplicate(snake01#tt_main)	snake01#n1	WARPNPC,1,1
 
 -	script	snake02#tt_main	-1,{
 OnTouch:
@@ -1630,16 +1633,16 @@ OnTouch:
 	if (.@turbo2 < 9) warp strnpcinfo(4),363,256;
 	end;
 }
-turbo_e_4,332,279,0	duplicate(snake02#tt_main)	snake02#e4	45,1,1
-turbo_e_8,332,279,0	duplicate(snake02#tt_main)	snake02#e8	45,1,1
-turbo_e_16,332,279,0	duplicate(snake02#tt_main)	snake02#e16	45,1,1
-turbo_n_4,332,279,0	duplicate(snake02#tt_main)	snake02#n4	45,1,1
-turbo_n_8,332,279,0	duplicate(snake02#tt_main)	snake02#n8	45,1,1
-turbo_n_16,332,279,0	duplicate(snake02#tt_main)	snake02#n16	45,1,1
-turbo_n_1,332,279,0	duplicate(snake02#tt_main)	snake02#n1	45,1,1
+turbo_e_4,332,279,0	duplicate(snake02#tt_main)	snake02#e4	WARPNPC,1,1
+turbo_e_8,332,279,0	duplicate(snake02#tt_main)	snake02#e8	WARPNPC,1,1
+turbo_e_16,332,279,0	duplicate(snake02#tt_main)	snake02#e16	WARPNPC,1,1
+turbo_n_4,332,279,0	duplicate(snake02#tt_main)	snake02#n4	WARPNPC,1,1
+turbo_n_8,332,279,0	duplicate(snake02#tt_main)	snake02#n8	WARPNPC,1,1
+turbo_n_16,332,279,0	duplicate(snake02#tt_main)	snake02#n16	WARPNPC,1,1
+turbo_n_1,332,279,0	duplicate(snake02#tt_main)	snake02#n1	WARPNPC,1,1
 
 
--	script	snake03#tt_main	45,1,1,{
+-	script	snake03#tt_main	WARPNPC,1,1,{
 OnTouch:
 	set .@turbo2,rand(1,8);
 	if (.@turbo2 < 3) warp strnpcinfo(4),279,292;
@@ -1648,16 +1651,16 @@ OnTouch:
 	if (.@turbo2 < 9) warp strnpcinfo(4),370,292;
 	end;
 }
-turbo_e_4,324,270,0	duplicate(snake03#tt_main)	snake03#e4	45,1,1
-turbo_e_8,324,270,0	duplicate(snake03#tt_main)	snake03#e8	45,1,1
-turbo_e_16,324,270,0	duplicate(snake03#tt_main)	snake03#e16	45,1,1
-turbo_n_4,324,270,0	duplicate(snake03#tt_main)	snake03#n4	45,1,1
-turbo_n_8,324,270,0	duplicate(snake03#tt_main)	snake03#n8	45,1,1
-turbo_n_16,324,270,0	duplicate(snake03#tt_main)	snake03#n16	45,1,1
-turbo_n_1,324,270,0	duplicate(snake03#tt_main)	snake03#n1	45,1,1
+turbo_e_4,324,270,0	duplicate(snake03#tt_main)	snake03#e4	WARPNPC,1,1
+turbo_e_8,324,270,0	duplicate(snake03#tt_main)	snake03#e8	WARPNPC,1,1
+turbo_e_16,324,270,0	duplicate(snake03#tt_main)	snake03#e16	WARPNPC,1,1
+turbo_n_4,324,270,0	duplicate(snake03#tt_main)	snake03#n4	WARPNPC,1,1
+turbo_n_8,324,270,0	duplicate(snake03#tt_main)	snake03#n8	WARPNPC,1,1
+turbo_n_16,324,270,0	duplicate(snake03#tt_main)	snake03#n16	WARPNPC,1,1
+turbo_n_1,324,270,0	duplicate(snake03#tt_main)	snake03#n1	WARPNPC,1,1
 
 
--	script	snake04#tt_main	45,1,1,{
+-	script	snake04#tt_main	WARPNPC,1,1,{
 OnTouch:
 	set .@turbo2,rand(1,7);
 	if (.@turbo2 < 3) warp strnpcinfo(4),363,256;
@@ -1666,18 +1669,18 @@ OnTouch:
 	if (.@turbo2 < 8) warp strnpcinfo(4),287,256;
 	end;
 }
-turbo_e_4,332,270,0	duplicate(snake04#tt_main)	snake04#e4	45,1,1
-turbo_e_8,332,270,0	duplicate(snake04#tt_main)	snake04#e8	45,1,1
-turbo_e_16,332,270,0	duplicate(snake04#tt_main)	snake04#e16	45,1,1
-turbo_n_4,332,270,0	duplicate(snake04#tt_main)	snake04#n4	45,1,1
-turbo_n_8,332,270,0	duplicate(snake04#tt_main)	snake04#n8	45,1,1
-turbo_n_16,332,270,0	duplicate(snake04#tt_main)	snake04#n16	45,1,1
-turbo_n_1,332,270,0	duplicate(snake04#tt_main)	snake04#n1	45,1,1
+turbo_e_4,332,270,0	duplicate(snake04#tt_main)	snake04#e4	WARPNPC,1,1
+turbo_e_8,332,270,0	duplicate(snake04#tt_main)	snake04#e8	WARPNPC,1,1
+turbo_e_16,332,270,0	duplicate(snake04#tt_main)	snake04#e16	WARPNPC,1,1
+turbo_n_4,332,270,0	duplicate(snake04#tt_main)	snake04#n4	WARPNPC,1,1
+turbo_n_8,332,270,0	duplicate(snake04#tt_main)	snake04#n8	WARPNPC,1,1
+turbo_n_16,332,270,0	duplicate(snake04#tt_main)	snake04#n16	WARPNPC,1,1
+turbo_n_1,332,270,0	duplicate(snake04#tt_main)	snake04#n1	WARPNPC,1,1
 
 -	script	SnakeHunt#tt_main	-1,{
 	end;
 	
-Onreset:
+OnReset:
 	killmonsterall strnpcinfo(4);
 	end;
 
@@ -1702,102 +1705,102 @@ OnEnable:
 
 	end;
 }
-turbo_e_4,389,288,0	duplicate(SnakeHunt#tt_main)	snake#e4	111
-turbo_e_8,389,288,0	duplicate(SnakeHunt#tt_main)	snake#e8	111
-turbo_e_16,389,288,0	duplicate(SnakeHunt#tt_main)	snake#e16	111
-turbo_n_4,389,288,0	duplicate(SnakeHunt#tt_main)	snake#n4	111
-turbo_n_1,389,288,0	duplicate(SnakeHunt#tt_main)	snake#n1	111
-turbo_e_4,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#e4	111
-turbo_e_8,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#e8	111
-turbo_e_16,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#e16	111
-turbo_n_4,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#n4	111
-turbo_n_1,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#n1	111
+turbo_e_4,389,288,0	duplicate(SnakeHunt#tt_main)	snake#e4	HIDDEN_NPC
+turbo_e_8,389,288,0	duplicate(SnakeHunt#tt_main)	snake#e8	HIDDEN_NPC
+turbo_e_16,389,288,0	duplicate(SnakeHunt#tt_main)	snake#e16	HIDDEN_NPC
+turbo_n_4,389,288,0	duplicate(SnakeHunt#tt_main)	snake#n4	HIDDEN_NPC
+turbo_n_1,389,288,0	duplicate(SnakeHunt#tt_main)	snake#n1	HIDDEN_NPC
+turbo_e_4,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#e4	HIDDEN_NPC
+turbo_e_8,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#e8	HIDDEN_NPC
+turbo_e_16,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#e16	HIDDEN_NPC
+turbo_n_4,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#n4	HIDDEN_NPC
+turbo_n_1,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#n1	HIDDEN_NPC
 
 -	script	cos#tt_main	-1,{
 OnTouch:
 	set .@n, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	switch (.@n) {
-		Case 1:
+		case 1:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Log Bridge course!",bc_map,"0x70DBDB";
 			switch (rand(1,3)) {
-				Case 1: warp strnpcinfo(4),210,369; end;
-				Case 2: warp strnpcinfo(4),210,361; end;
-				Case 3: warp strnpcinfo(4),210,354; end;
+				case 1: warp strnpcinfo(4),210,369; end;
+				case 2: warp strnpcinfo(4),210,361; end;
+				case 3: warp strnpcinfo(4),210,354; end;
 			}
-		Case 2:
+		case 2:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Cube Hills course!",bc_map,"0x70DBDB";
 			warp strnpcinfo(4),316,365;
-			end;		
-		Case 3:
+			end;
+		case 3:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Cursed Desert!",bc_map,"0x70DBDB";
 			switch (rand(1,4)) {
-				Case 1: warp strnpcinfo(4),46,254; end;
-				Case 2: warp strnpcinfo(4),76,227; end;
-				Case 3: warp strnpcinfo(4),42,197; end;
-				Case 4: warp strnpcinfo(4),86,220; end;
+				case 1: warp strnpcinfo(4),46,254; end;
+				case 2: warp strnpcinfo(4),76,227; end;
+				case 3: warp strnpcinfo(4),42,197; end;
+				case 4: warp strnpcinfo(4),86,220; end;
 			}
-		Case 5:
+		case 5:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Single Snail course!",bc_map,"0x70DBDB";
 			warp strnpcinfo(4),268,275;
 			end;
-		Case 6:
+		case 6:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Snake Dice course!",bc_map,"0x70DBDB";
 			warp strnpcinfo(4),5,91;
 			end;
-		Case 7:
+		case 7:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Small Cave course! Hurry, you're almost at the finish!",bc_map,"0x70DBDB";
 			switch(rand(1,3)) {
-				Case 1: warp strnpcinfo(4),307,52; end;
-				Case 2: warp strnpcinfo(4),307,46; end;
-				Case 3: warp strnpcinfo(4),307,40; end;
+				case 1: warp strnpcinfo(4),307,52; end;
+				case 2: warp strnpcinfo(4),307,46; end;
+				case 3: warp strnpcinfo(4),307,40; end;
 			}
 	}
 }
-turbo_e_4,168,363,0	duplicate(cos#tt_main)	#cos_e4_1	45,1,1
-turbo_e_4,258,364,0	duplicate(cos#tt_main)	#cos_e4_2	45,1,1
-turbo_e_4,385,365,0	duplicate(cos#tt_main)	#cos_e4_3	45,1,1
-turbo_e_4,250,200,0	duplicate(cos#tt_main)	#cos_e4_5	45,1,1
-turbo_e_4,389,275,0	duplicate(cos#tt_main)	#cos_e4_6	45,1,1
-turbo_e_4,93,19,0	duplicate(cos#tt_main)	#cos_e4_7	45,1,1
-turbo_e_8,168,363,0	duplicate(cos#tt_main)	#cos_e8_1	45,1,1
-turbo_e_8,258,364,0	duplicate(cos#tt_main)	#cos_e8_2	45,1,1
-turbo_e_8,385,365,0	duplicate(cos#tt_main)	#cos_e8_3	45,1,1
-turbo_e_8,250,200,0	duplicate(cos#tt_main)	#cos_e8_5	45,1,1
-turbo_e_8,389,275,0	duplicate(cos#tt_main)	#cos_e8_6	45,1,1
-turbo_e_8,93,19,0	duplicate(cos#tt_main)	#cos_e8_7	45,1,1
-turbo_e_16,168,363,0	duplicate(cos#tt_main)	#cos_e16_1	45,1,1
-turbo_e_16,258,364,0	duplicate(cos#tt_main)	#cos_e16_2	45,1,1
-turbo_e_16,385,365,0	duplicate(cos#tt_main)	#cos_e16_3	45,1,1
-turbo_e_16,250,200,0	duplicate(cos#tt_main)	#cos_e16_5	45,1,1
-turbo_e_16,389,275,0	duplicate(cos#tt_main)	#cos_e16_6	45,1,1
-turbo_e_16,93,19,0	duplicate(cos#tt_main)	#cos_e16_7	45,1,1
-turbo_e_16,232,14,0	duplicate(cos#tt_main)	#cos_e16_8	45,1,1
-turbo_n_4,168,363,0	duplicate(cos#tt_main)	#cos_n4_1	45,1,1
-turbo_n_4,258,364,0	duplicate(cos#tt_main)	#cos_n4_2	45,1,1
-turbo_n_4,385,365,0	duplicate(cos#tt_main)	#cos_n4_3	45,1,1
-turbo_n_4,250,200,0	duplicate(cos#tt_main)	#cos_n4_5	45,1,1
-turbo_n_4,389,275,0	duplicate(cos#tt_main)	#cos_n4_6	45,1,1
-turbo_n_4,93,19,0	duplicate(cos#tt_main)	#cos_n4_7	45,1,1
-turbo_n_8,168,363,0	duplicate(cos#tt_main)	#cos_n8_1	45,1,1
-turbo_n_8,258,364,0	duplicate(cos#tt_main)	#cos_n8_2	45,1,1
-turbo_n_8,385,365,0	duplicate(cos#tt_main)	#cos_n8_3	45,1,1
-turbo_n_8,250,200,0	duplicate(cos#tt_main)	#cos_n8_5	45,1,1
-turbo_n_8,389,275,0	duplicate(cos#tt_main)	#cos_n8_6	45,1,1
-turbo_n_8,93,19,0	duplicate(cos#tt_main)	#cos_n8_7	45,1,1
-turbo_n_16,168,363,0	duplicate(cos#tt_main)	#cos_n16_1	45,1,1
-turbo_n_16,258,364,0	duplicate(cos#tt_main)	#cos_n16_2	45,1,1
-turbo_n_16,385,365,0	duplicate(cos#tt_main)	#cos_n16_3	45,1,1
-turbo_n_16,250,200,0	duplicate(cos#tt_main)	#cos_n16_5	45,1,1
-turbo_n_16,389,275,0	duplicate(cos#tt_main)	#cos_n16_6	45,1,1
-turbo_n_16,93,19,0	duplicate(cos#tt_main)	#cos_n16_7	45,1,1
-turbo_n_16,232,14,0	duplicate(cos#tt_main)	#cos_n16_8	45,1,1
-turbo_n_1,168,363,0	duplicate(cos#tt_main)	#cos_n1_1	45,1,1
-turbo_n_1,258,364,0	duplicate(cos#tt_main)	#cos_n1_2	45,1,1
-turbo_n_1,385,365,0	duplicate(cos#tt_main)	#cos_n1_3	45,1,1
-turbo_n_1,250,200,0	duplicate(cos#tt_main)	#cos_n1_5	45,1,1
-turbo_n_1,389,275,0	duplicate(cos#tt_main)	#cos_n1_6	45,1,1
-turbo_n_1,93,19,0	duplicate(cos#tt_main)	#cos_n1_7	45,1,1
-turbo_n_1,232,14,0	duplicate(cos#tt_main)	#cos_n1_8	45,1,1
+turbo_e_4,168,363,0	duplicate(cos#tt_main)	#cos_e4_1	WARPNPC,1,1
+turbo_e_4,258,364,0	duplicate(cos#tt_main)	#cos_e4_2	WARPNPC,1,1
+turbo_e_4,385,365,0	duplicate(cos#tt_main)	#cos_e4_3	WARPNPC,1,1
+turbo_e_4,250,200,0	duplicate(cos#tt_main)	#cos_e4_5	WARPNPC,1,1
+turbo_e_4,389,275,0	duplicate(cos#tt_main)	#cos_e4_6	WARPNPC,1,1
+turbo_e_4,93,19,0	duplicate(cos#tt_main)	#cos_e4_7	WARPNPC,1,1
+turbo_e_8,168,363,0	duplicate(cos#tt_main)	#cos_e8_1	WARPNPC,1,1
+turbo_e_8,258,364,0	duplicate(cos#tt_main)	#cos_e8_2	WARPNPC,1,1
+turbo_e_8,385,365,0	duplicate(cos#tt_main)	#cos_e8_3	WARPNPC,1,1
+turbo_e_8,250,200,0	duplicate(cos#tt_main)	#cos_e8_5	WARPNPC,1,1
+turbo_e_8,389,275,0	duplicate(cos#tt_main)	#cos_e8_6	WARPNPC,1,1
+turbo_e_8,93,19,0	duplicate(cos#tt_main)	#cos_e8_7	WARPNPC,1,1
+turbo_e_16,168,363,0	duplicate(cos#tt_main)	#cos_e16_1	WARPNPC,1,1
+turbo_e_16,258,364,0	duplicate(cos#tt_main)	#cos_e16_2	WARPNPC,1,1
+turbo_e_16,385,365,0	duplicate(cos#tt_main)	#cos_e16_3	WARPNPC,1,1
+turbo_e_16,250,200,0	duplicate(cos#tt_main)	#cos_e16_5	WARPNPC,1,1
+turbo_e_16,389,275,0	duplicate(cos#tt_main)	#cos_e16_6	WARPNPC,1,1
+turbo_e_16,93,19,0	duplicate(cos#tt_main)	#cos_e16_7	WARPNPC,1,1
+turbo_e_16,232,14,0	duplicate(cos#tt_main)	#cos_e16_8	WARPNPC,1,1
+turbo_n_4,168,363,0	duplicate(cos#tt_main)	#cos_n4_1	WARPNPC,1,1
+turbo_n_4,258,364,0	duplicate(cos#tt_main)	#cos_n4_2	WARPNPC,1,1
+turbo_n_4,385,365,0	duplicate(cos#tt_main)	#cos_n4_3	WARPNPC,1,1
+turbo_n_4,250,200,0	duplicate(cos#tt_main)	#cos_n4_5	WARPNPC,1,1
+turbo_n_4,389,275,0	duplicate(cos#tt_main)	#cos_n4_6	WARPNPC,1,1
+turbo_n_4,93,19,0	duplicate(cos#tt_main)	#cos_n4_7	WARPNPC,1,1
+turbo_n_8,168,363,0	duplicate(cos#tt_main)	#cos_n8_1	WARPNPC,1,1
+turbo_n_8,258,364,0	duplicate(cos#tt_main)	#cos_n8_2	WARPNPC,1,1
+turbo_n_8,385,365,0	duplicate(cos#tt_main)	#cos_n8_3	WARPNPC,1,1
+turbo_n_8,250,200,0	duplicate(cos#tt_main)	#cos_n8_5	WARPNPC,1,1
+turbo_n_8,389,275,0	duplicate(cos#tt_main)	#cos_n8_6	WARPNPC,1,1
+turbo_n_8,93,19,0	duplicate(cos#tt_main)	#cos_n8_7	WARPNPC,1,1
+turbo_n_16,168,363,0	duplicate(cos#tt_main)	#cos_n16_1	WARPNPC,1,1
+turbo_n_16,258,364,0	duplicate(cos#tt_main)	#cos_n16_2	WARPNPC,1,1
+turbo_n_16,385,365,0	duplicate(cos#tt_main)	#cos_n16_3	WARPNPC,1,1
+turbo_n_16,250,200,0	duplicate(cos#tt_main)	#cos_n16_5	WARPNPC,1,1
+turbo_n_16,389,275,0	duplicate(cos#tt_main)	#cos_n16_6	WARPNPC,1,1
+turbo_n_16,93,19,0	duplicate(cos#tt_main)	#cos_n16_7	WARPNPC,1,1
+turbo_n_16,232,14,0	duplicate(cos#tt_main)	#cos_n16_8	WARPNPC,1,1
+turbo_n_1,168,363,0	duplicate(cos#tt_main)	#cos_n1_1	WARPNPC,1,1
+turbo_n_1,258,364,0	duplicate(cos#tt_main)	#cos_n1_2	WARPNPC,1,1
+turbo_n_1,385,365,0	duplicate(cos#tt_main)	#cos_n1_3	WARPNPC,1,1
+turbo_n_1,250,200,0	duplicate(cos#tt_main)	#cos_n1_5	WARPNPC,1,1
+turbo_n_1,389,275,0	duplicate(cos#tt_main)	#cos_n1_6	WARPNPC,1,1
+turbo_n_1,93,19,0	duplicate(cos#tt_main)	#cos_n1_7	WARPNPC,1,1
+turbo_n_1,232,14,0	duplicate(cos#tt_main)	#cos_n1_8	WARPNPC,1,1
 
 turbo_e_16,179,55,0	script	TurboHint_1#tt_main	-1,1,1,{
 OnTouch:
@@ -1915,14 +1918,16 @@ turbo_n_1,222,45,0	duplicate(TurboHint_4#tt_main)	#n1NoWayOut5	-1,1,1
 turbo_n_1,222,61,0	duplicate(TurboHint_4#tt_main)	#n1NoWayOut6	-1,1,1
 turbo_n_1,222,65,0	duplicate(TurboHint_4#tt_main)	#n1NoWayOut7	-1,1,1
 
--	script	cos_end#tt_main	01,{
+-	script	cos_end#tt_main	-1,{
 	function	GetNumber;
 OnTouch:
 	set .@w$,callfunc("F_tt");
 	if (.@w$ == "n1") set $@end_time,gettimetick(0);
 	mapannounce strnpcinfo(4),strcharinfo(0) +" has just arrived at the Finish Line! Congratulations!",bc_map,"0xFFFF00";
-	if (.@w$ != "n1") setd "$ttnames$["+GetNumber(.@w$)+"]",strcharinfo(0);
-	donpcevent "TBT_Guide#Broadcast::Onwin_"+.@w$;
+	if (.@w$ != "n1") {
+		setd "$ttnames$["+GetNumber(.@w$)+"]",strcharinfo(0);
+		donpcevent "Turbo Track Guide::OnWin_"+.@w$;
+	}
 	warp strnpcinfo(4),384,161;
 	if (.@w$ == "e4" || .@w$ == "n4" || .@w$ == "n1") {
 		if (.@w$ == "e4") {
@@ -1946,9 +1951,9 @@ OnTouch:
 	function	GetNumber	{
 		setarray .@w_n$[1], "n4","n8","n16","e4","e8","e16";
 		for (set .@i, 1; .@i <= getarraysize(.@w_n$); set .@i, .@i + 1) {
-			if (getarg(0) == .@w_n$[.@i]) 
+			if (getarg(0) == .@w_n$[.@i])
 				return .@i;
-		}		
+		}
 	}
 	
 OnInit:
@@ -1956,15 +1961,15 @@ OnInit:
 	enablenpc "#cos_"+.@w$+"_end";
 	end;
 }
-turbo_e_4,371,47,0	duplicate(cos_end#tt_main)	#cos_e4_end	45,1,1
-turbo_e_8,371,47,0	duplicate(cos_end#tt_main)	#cos_e8_end	45,1,1
-turbo_e_16,371,47,0	duplicate(cos_end#tt_main)	#cos_e16_end	45,1,1
-turbo_n_4,371,47,0	duplicate(cos_end#tt_main)	#cos_n4_end	45,1,1
-turbo_n_8,371,47,0	duplicate(cos_end#tt_main)	#cos_n8_end	45,1,1
-turbo_n_16,371,47,0	duplicate(cos_end#tt_main)	#cos_n16_end	45,1,1
-turbo_n_1,371,47,0	duplicate(cos_end#tt_main)	#cos_n1_end	45,1,1
-
--	script	cos_end2#tt_main	45,1,1,{
+turbo_e_4,371,47,0	duplicate(cos_end#tt_main)	#cos_e4_end	WARPNPC,1,1
+turbo_e_8,371,47,0	duplicate(cos_end#tt_main)	#cos_e8_end	WARPNPC,1,1
+turbo_e_16,371,47,0	duplicate(cos_end#tt_main)	#cos_e16_end	WARPNPC,1,1
+turbo_n_4,371,47,0	duplicate(cos_end#tt_main)	#cos_n4_end	WARPNPC,1,1
+turbo_n_8,371,47,0	duplicate(cos_end#tt_main)	#cos_n8_end	WARPNPC,1,1
+turbo_n_16,371,47,0	duplicate(cos_end#tt_main)	#cos_n16_end	WARPNPC,1,1
+turbo_n_1,371,47,0	duplicate(cos_end#tt_main)	#cos_n1_end	WARPNPC,1,1
+
+-	script	cos_end2#tt_main	WARPNPC,1,1,{
 OnTouch:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is second to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00";
@@ -1981,10 +1986,10 @@ OnInit:
 	disablenpc "#cos_"+.@w$+"_end2";
 	end;
 }
-turbo_e_8,371,51,0	duplicate(cos_end2#tt_main)	#cos_e8_end2	45,1,1
-turbo_e_16,371,51,0	duplicate(cos_end2#tt_main)	#cos_e16_end2	45,1,1
-turbo_n_8,371,51,0	duplicate(cos_end2#tt_main)	#cos_n8_end2	45,1,1
-turbo_n_16,371,51,0	duplicate(cos_end2#tt_main)	#cos_n16_end2	45,1,1
+turbo_e_8,371,51,0	duplicate(cos_end2#tt_main)	#cos_e8_end2	WARPNPC,1,1
+turbo_e_16,371,51,0	duplicate(cos_end2#tt_main)	#cos_e16_end2	WARPNPC,1,1
+turbo_n_8,371,51,0	duplicate(cos_end2#tt_main)	#cos_n8_end2	WARPNPC,1,1
+turbo_n_16,371,51,0	duplicate(cos_end2#tt_main)	#cos_n16_end2	WARPNPC,1,1
 
 -	script	cos_end3#tt_main	-1,{
 OnTouch:
@@ -2005,10 +2010,10 @@ OnInit:
 	disablenpc "#cos_"+.@w$+"_end3";
 	end;
 }
-turbo_e_8,371,43,0	duplicate(cos_end3#tt_main)	#cos_e8_end3	45,1,1
-turbo_e_16,371,43,0	duplicate(cos_end3#tt_main)	#cos_e16_end3	45,1,1
-turbo_n_8,371,43,0	duplicate(cos_end3#tt_main)	#cos_n8_end3	45,1,1
-turbo_n_16,371,43,0	duplicate(cos_end3#tt_main)	#cos_n16_end3	45,1,1
+turbo_e_8,371,43,0	duplicate(cos_end3#tt_main)	#cos_e8_end3	WARPNPC,1,1
+turbo_e_16,371,43,0	duplicate(cos_end3#tt_main)	#cos_e16_end3	WARPNPC,1,1
+turbo_n_8,371,43,0	duplicate(cos_end3#tt_main)	#cos_n8_end3	WARPNPC,1,1
+turbo_n_16,371,43,0	duplicate(cos_end3#tt_main)	#cos_n16_end3	WARPNPC,1,1
 
 turbo_e_4,316,365,0	script	DSwitch#tt_main	-1,1,1,{
 OnTouch:
@@ -2039,20 +2044,20 @@ OnInit:
 	disablenpc strnpcinfo(0);
 	end;
 }
-turbo_e_4,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#e4	45,1,1
-turbo_e_4,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#e4	45,1,1
-turbo_e_8,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#e8	45,1,1
-turbo_e_8,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#e8	45,1,1
-turbo_e_16,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#e16	45,1,1
-turbo_e_16,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#e16	45,1,1
-turbo_n_4,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#n4	45,1,1
-turbo_n_4,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n4	45,1,1
-turbo_n_8,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#n8	45,1,1
-turbo_n_8,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n8	45,1,1
-turbo_n_16,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#n16	45,1,1
-turbo_n_16,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n16	45,1,1
-turbo_n_1,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#n1	45,1,1
-turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
+turbo_e_4,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#e4	WARPNPC,1,1
+turbo_e_4,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#e4	WARPNPC,1,1
+turbo_e_8,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#e8	WARPNPC,1,1
+turbo_e_8,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#e8	WARPNPC,1,1
+turbo_e_16,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#e16	WARPNPC,1,1
+turbo_e_16,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#e16	WARPNPC,1,1
+turbo_n_4,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#n4	WARPNPC,1,1
+turbo_n_4,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n4	WARPNPC,1,1
+turbo_n_8,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#n8	WARPNPC,1,1
+turbo_n_8,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n8	WARPNPC,1,1
+turbo_n_16,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#n16	WARPNPC,1,1
+turbo_n_16,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n16	WARPNPC,1,1
+turbo_n_1,11,266,0	duplicate(Flasher#tt_main)	Flasher_Exit_1#n1	WARPNPC,1,1
+turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	WARPNPC,1,1
 
 -	script	WHelper#tt_main	-1,{
 	function	RName;
@@ -2084,7 +2089,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "However, you cannot receive";
 			mes "any points if you exceed the";
 			mes "point limit. You now have a total of " + my_point + " Turbo Track points.";
-		} 
+		}
 		set tt_rank,tt_rank+1;
 		next;
 		if (tt_rank > $ttranks[1]) {
@@ -2095,7 +2100,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You are ranked as";
 			mes "the top player for";
 			mes "winning the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top1";
+			donpcevent "Turbo Track Guide::OnNew_Top1";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2119,7 +2124,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You've ranked Second";
 			mes "among the Top Five Players";
 			mes "who've won the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top2";
+			donpcevent "Turbo Track Guide::OnNew_Top2";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2143,7 +2148,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You've ranked Third";
 			mes "among the Top Five Players";
 			mes "who've won the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top3";
+			donpcevent "Turbo Track Guide::OnNew_Top3";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2167,7 +2172,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You've ranked Fourth";
 			mes "among the Top Five Players";
 			mes "who've won the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top4";
+			donpcevent "Turbo Track Guide::OnNew_Top4";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2191,7 +2196,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You've ranked Fifth";
 			mes "among the Top Five Players";
 			mes "who've won the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top5";
+			donpcevent "Turbo Track Guide::OnNew_Top5";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2295,7 +2300,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 					mes "you any Turbo Track Points";
 					mes "since you would exceed the";
 					mes "maximum limit. Sorry...";
-				} 
+				}
 			} else {
 				mes "Oh right, your current";
 				set my_point,tt_point;
@@ -2425,7 +2430,7 @@ OnTimer36000:
 
 OnTimer40000:
 	set .@w$,callfunc("F_tt");
-	if (compare(.@w$,"4")) 
+	if (compare(.@w$,"4"))
 		mapannounce strnpcinfo(4),"[Blacksmith Union]",bc_map,"0x33FF66";
 	else
 		mapannounce strnpcinfo(4),"[Al De Baran Kafra Corporation Headquarters]",bc_map,"0x33FF66";
@@ -2477,8 +2482,8 @@ OnTimer60000:
 		disablenpc "Flasher_Exit_2#"+.@w$;
 		enablenpc "No_Unfair_Start#"+.@w$+"-1";
 		enablenpc "No_Unfair_Start#"+.@w$+"-2";
-		donpcevent "snake#"+.@w$+"::Onreset";
-		donpcevent "hunting#"+.@w$+"::Onreset";
+		donpcevent "snake#"+.@w$+"::OnReset";
+		donpcevent "hunting#"+.@w$+"::OnReset";
 		donpcevent RName(.@w$)+"::OnEnable";
 		disablenpc "bing2#"+.@w$;
 		enablenpc "#cos_"+.@w$+"_end";
@@ -2513,8 +2518,8 @@ OnTimer71000:
 		enablenpc "Flasher_Exit_2#"+.@w$;
 		enablenpc "No_Unfair_Start#"+.@w$+"-1";
 		enablenpc "No_Unfair_Start#"+.@w$+"-2";
-		donpcevent "snake#"+.@w$+"::Onreset";
-		donpcevent "hunting#"+.@w$+"::Onreset";
+		donpcevent "snake#"+.@w$+"::OnReset";
+		donpcevent "hunting#"+.@w$+"::OnReset";
 		donpcevent RName(.@w$)+"::OnEnable";
 		disablenpc "bing2#"+.@w$;
 		stopnpctimer;
@@ -2532,14 +2537,14 @@ OnInit:
 	disablenpc "Winner Helper#TBT_"+.@w$;
 	end;
 }
-turbo_e_4,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_e4	47
-turbo_e_8,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_e8	47
-turbo_e_16,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_e16	47
-turbo_n_4,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_n4	47
-turbo_n_8,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_n8	47
-turbo_n_16,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_n16	47
-
-turbo_n_1,384,167,1	script	Guide#TBT_n1	47,{
+turbo_e_4,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_e4	1_M_01
+turbo_e_8,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_e8	1_M_01
+turbo_e_16,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_e16	1_M_01
+turbo_n_4,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_n4	1_M_01
+turbo_n_8,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_n8	1_M_01
+turbo_n_16,384,167,1	duplicate(WHelper#tt_main)	Winner Helper#TBT_n16	1_M_01
+
+turbo_n_1,384,167,1	script	Guide#TBT_n1	1_M_01,{
 	set .@hour_start,$@start_time / 10000;
 	set .@min_start,(($@start_time % 10000) / 100);
 	set .@sec_start,$@start_time % 100;
@@ -2742,8 +2747,8 @@ OnTimer60000:
 	disablenpc "Flasher_Exit_2#"+.@w$;
 	enablenpc "No_Unfair_Start#"+.@w$+"-1";
 	enablenpc "No_Unfair_Start#"+.@w$+"-2";
-	donpcevent "snake#"+.@w$+"::Onreset";
-	donpcevent "hunting#"+.@w$+"::Onreset";
+	donpcevent "snake#"+.@w$+"::OnReset";
+	donpcevent "hunting#"+.@w$+"::OnReset";
 	donpcevent "Solo Mode#"+.@w$+"::OnEnable";
 	stopnpctimer;
 	end;
@@ -2758,7 +2763,7 @@ OnInit:
 OnTouch:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is now entering the Small Cave! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00";
-	donpcevent "TBT_Guide#Broadcast::Onend_"+.@w$;
+	donpcevent "Turbo Track Guide::OnEnd_"+.@w$;
 	disablenpc "Notice_Maker1#TBT_"+.@w$;
 	end;
 	
@@ -2819,12 +2824,12 @@ turbo_n_1,226,15,0	duplicate(NMaker4#tt_main)	Notice_Maker4#TBT_n1	-1,3,3
 -	script	warp#tt_main	-1,{
 OnTouch:
 	switch (rand(1,20)) {
-		Case 1: warp strnpcinfo(4),216,378; break;
-		Case 2: warp strnpcinfo(4),218,360; break;
-		Case 3: warp strnpcinfo(4),223,361; break;
-		Case 4: warp strnpcinfo(4),243,342; break;
-		Case 5: warp strnpcinfo(4),247,364; break;
-		Default: break;
+		case 1: warp strnpcinfo(4),216,378; break;
+		case 2: warp strnpcinfo(4),218,360; break;
+		case 3: warp strnpcinfo(4),223,361; break;
+		case 4: warp strnpcinfo(4),243,342; break;
+		case 5: warp strnpcinfo(4),247,364; break;
+		default: break;
 	}
 	end;
 }
@@ -2891,629 +2896,629 @@ OnTouch:
 		percentheal -2,0;
 	end;
 }
-turbo_e_4,307,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F1	139,1,1
-turbo_e_4,307,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F2	139,1,1
-turbo_e_4,307,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F3	139,1,1
-turbo_e_4,307,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F4	139,1,1
-turbo_e_4,307,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F5	139,1,1
-turbo_e_4,307,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F96	139,1,1
-turbo_e_4,312,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F6	139,1,1
-turbo_e_4,312,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F7	139,1,1
-turbo_e_4,312,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F8	139,1,1
-turbo_e_4,312,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F9	139,1,1
-turbo_e_4,312,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F10	139,1,1
-turbo_e_4,312,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F11	139,1,1
-turbo_e_4,316,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F12	139,1,1
-turbo_e_4,316,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F13	139,1,1
-turbo_e_4,316,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F14	139,1,1
-turbo_e_4,316,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F15	139,1,1
-turbo_e_4,316,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F16	139,1,1
-turbo_e_4,316,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F17	139,1,1
-turbo_e_4,320,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F18	139,1,1
-turbo_e_4,320,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F19	139,1,1
-turbo_e_4,320,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F20	139,1,1
-turbo_e_4,320,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F21	139,1,1
-turbo_e_4,320,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F22	139,1,1
-turbo_e_4,320,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F23	139,1,1
-turbo_e_4,324,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F24	139,1,1
-turbo_e_4,324,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F25	139,1,1
-turbo_e_4,324,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F26	139,1,1
-turbo_e_4,324,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F27	139,1,1
-turbo_e_4,324,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F28	139,1,1
-turbo_e_4,324,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F29	139,1,1
-turbo_e_4,328,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F30	139,1,1
-turbo_e_4,328,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F31	139,1,1
-turbo_e_4,328,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F32	139,1,1
-turbo_e_4,328,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F33	139,1,1
-turbo_e_4,328,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F34	139,1,1
-turbo_e_4,328,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F35	139,1,1
-turbo_e_4,332,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F36	139,1,1
-turbo_e_4,332,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F37	139,1,1
-turbo_e_4,332,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F38	139,1,1
-turbo_e_4,332,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F39	139,1,1
-turbo_e_4,332,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F40	139,1,1
-turbo_e_4,332,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F41	139,1,1
-turbo_e_8,307,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F1	139,1,1
-turbo_e_8,307,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F2	139,1,1
-turbo_e_8,307,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F3	139,1,1
-turbo_e_8,307,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F4	139,1,1
-turbo_e_8,307,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F5	139,1,1
-turbo_e_8,307,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F96	139,1,1
-turbo_e_8,312,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F6	139,1,1
-turbo_e_8,312,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F7	139,1,1
-turbo_e_8,312,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F8	139,1,1
-turbo_e_8,312,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F9	139,1,1
-turbo_e_8,312,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F10	139,1,1
-turbo_e_8,312,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F11	139,1,1
-turbo_e_8,316,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F12	139,1,1
-turbo_e_8,316,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F13	139,1,1
-turbo_e_8,316,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F14	139,1,1
-turbo_e_8,316,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F15	139,1,1
-turbo_e_8,316,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F16	139,1,1
-turbo_e_8,316,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F17	139,1,1
-turbo_e_8,320,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F18	139,1,1
-turbo_e_8,320,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F19	139,1,1
-turbo_e_8,320,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F20	139,1,1
-turbo_e_8,320,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F21	139,1,1
-turbo_e_8,320,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F22	139,1,1
-turbo_e_8,320,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F23	139,1,1
-turbo_e_8,324,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F24	139,1,1
-turbo_e_8,324,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F25	139,1,1
-turbo_e_8,324,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F26	139,1,1
-turbo_e_8,324,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F27	139,1,1
-turbo_e_8,324,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F28	139,1,1
-turbo_e_8,324,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F29	139,1,1
-turbo_e_8,328,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F30	139,1,1
-turbo_e_8,328,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F31	139,1,1
-turbo_e_8,328,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F32	139,1,1
-turbo_e_8,328,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F33	139,1,1
-turbo_e_8,328,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F34	139,1,1
-turbo_e_8,328,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F35	139,1,1
-turbo_e_8,332,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F36	139,1,1
-turbo_e_8,332,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F37	139,1,1
-turbo_e_8,332,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F38	139,1,1
-turbo_e_8,332,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F39	139,1,1
-turbo_e_8,332,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F40	139,1,1
-turbo_e_8,332,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F41	139,1,1
-turbo_e_16,307,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F1	139,1,1
-turbo_e_16,307,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F2	139,1,1
-turbo_e_16,307,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F3	139,1,1
-turbo_e_16,307,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F4	139,1,1
-turbo_e_16,307,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F5	139,1,1
-turbo_e_16,307,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F96	139,1,1
-turbo_e_16,312,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F6	139,1,1
-turbo_e_16,312,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F7	139,1,1
-turbo_e_16,312,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F8	139,1,1
-turbo_e_16,312,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F9	139,1,1
-turbo_e_16,312,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F10	139,1,1
-turbo_e_16,312,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F11	139,1,1
-turbo_e_16,316,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F12	139,1,1
-turbo_e_16,316,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F13	139,1,1
-turbo_e_16,316,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F14	139,1,1
-turbo_e_16,316,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F15	139,1,1
-turbo_e_16,316,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F16	139,1,1
-turbo_e_16,316,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F17	139,1,1
-turbo_e_16,320,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F18	139,1,1
-turbo_e_16,320,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F19	139,1,1
-turbo_e_16,320,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F20	139,1,1
-turbo_e_16,320,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F21	139,1,1
-turbo_e_16,320,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F22	139,1,1
-turbo_e_16,320,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F23	139,1,1
-turbo_e_16,324,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F24	139,1,1
-turbo_e_16,324,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F25	139,1,1
-turbo_e_16,324,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F26	139,1,1
-turbo_e_16,324,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F27	139,1,1
-turbo_e_16,324,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F28	139,1,1
-turbo_e_16,324,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F29	139,1,1
-turbo_e_16,328,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F30	139,1,1
-turbo_e_16,328,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F31	139,1,1
-turbo_e_16,328,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F32	139,1,1
-turbo_e_16,328,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F33	139,1,1
-turbo_e_16,328,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F34	139,1,1
-turbo_e_16,328,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F35	139,1,1
-turbo_e_16,332,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F36	139,1,1
-turbo_e_16,332,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F37	139,1,1
-turbo_e_16,332,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F38	139,1,1
-turbo_e_16,332,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F39	139,1,1
-turbo_e_16,332,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F40	139,1,1
-turbo_e_16,332,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F41	139,1,1
-turbo_n_4,307,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F1	139,1,1
-turbo_n_4,307,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F2	139,1,1
-turbo_n_4,307,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F3	139,1,1
-turbo_n_4,307,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F4	139,1,1
-turbo_n_4,307,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F5	139,1,1
-turbo_n_4,307,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F96	139,1,1
-turbo_n_4,312,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F6	139,1,1
-turbo_n_4,312,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F7	139,1,1
-turbo_n_4,312,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F8	139,1,1
-turbo_n_4,312,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F9	139,1,1
-turbo_n_4,312,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F10	139,1,1
-turbo_n_4,312,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F11	139,1,1
-turbo_n_4,316,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F12	139,1,1
-turbo_n_4,316,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F13	139,1,1
-turbo_n_4,316,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F14	139,1,1
-turbo_n_4,316,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F15	139,1,1
-turbo_n_4,316,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F16	139,1,1
-turbo_n_4,316,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F17	139,1,1
-turbo_n_4,320,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F18	139,1,1
-turbo_n_4,320,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F19	139,1,1
-turbo_n_4,320,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F20	139,1,1
-turbo_n_4,320,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F21	139,1,1
-turbo_n_4,320,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F22	139,1,1
-turbo_n_4,320,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F23	139,1,1
-turbo_n_4,324,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F24	139,1,1
-turbo_n_4,324,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F25	139,1,1
-turbo_n_4,324,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F26	139,1,1
-turbo_n_4,324,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F27	139,1,1
-turbo_n_4,324,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F28	139,1,1
-turbo_n_4,324,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F29	139,1,1
-turbo_n_4,328,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F30	139,1,1
-turbo_n_4,328,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F31	139,1,1
-turbo_n_4,328,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F32	139,1,1
-turbo_n_4,328,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F33	139,1,1
-turbo_n_4,328,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F34	139,1,1
-turbo_n_4,328,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F35	139,1,1
-turbo_n_4,332,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F36	139,1,1
-turbo_n_4,332,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F37	139,1,1
-turbo_n_4,332,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F38	139,1,1
-turbo_n_4,332,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F39	139,1,1
-turbo_n_4,332,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F40	139,1,1
-turbo_n_4,332,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F41	139,1,1
-turbo_n_8,307,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F1	139,1,1
-turbo_n_8,307,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F2	139,1,1
-turbo_n_8,307,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F3	139,1,1
-turbo_n_8,307,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F4	139,1,1
-turbo_n_8,307,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F5	139,1,1
-turbo_n_8,307,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F96	139,1,1
-turbo_n_8,312,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F6	139,1,1
-turbo_n_8,312,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F7	139,1,1
-turbo_n_8,312,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F8	139,1,1
-turbo_n_8,312,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F9	139,1,1
-turbo_n_8,312,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F10	139,1,1
-turbo_n_8,312,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F11	139,1,1
-turbo_n_8,316,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F12	139,1,1
-turbo_n_8,316,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F13	139,1,1
-turbo_n_8,316,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F14	139,1,1
-turbo_n_8,316,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F15	139,1,1
-turbo_n_8,316,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F16	139,1,1
-turbo_n_8,316,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F17	139,1,1
-turbo_n_8,320,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F18	139,1,1
-turbo_n_8,320,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F19	139,1,1
-turbo_n_8,320,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F20	139,1,1
-turbo_n_8,320,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F21	139,1,1
-turbo_n_8,320,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F22	139,1,1
-turbo_n_8,320,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F23	139,1,1
-turbo_n_8,324,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F24	139,1,1
-turbo_n_8,324,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F25	139,1,1
-turbo_n_8,324,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F26	139,1,1
-turbo_n_8,324,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F27	139,1,1
-turbo_n_8,324,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F28	139,1,1
-turbo_n_8,324,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F29	139,1,1
-turbo_n_8,328,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F30	139,1,1
-turbo_n_8,328,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F31	139,1,1
-turbo_n_8,328,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F32	139,1,1
-turbo_n_8,328,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F33	139,1,1
-turbo_n_8,328,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F34	139,1,1
-turbo_n_8,328,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F35	139,1,1
-turbo_n_8,332,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F36	139,1,1
-turbo_n_8,332,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F37	139,1,1
-turbo_n_8,332,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F38	139,1,1
-turbo_n_8,332,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F39	139,1,1
-turbo_n_8,332,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F40	139,1,1
-turbo_n_8,332,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F41	139,1,1
-turbo_n_16,307,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F1	139,1,1
-turbo_n_16,307,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F2	139,1,1
-turbo_n_16,307,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F3	139,1,1
-turbo_n_16,307,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F4	139,1,1
-turbo_n_16,307,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F5	139,1,1
-turbo_n_16,307,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F96	139,1,1
-turbo_n_16,312,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F6	139,1,1
-turbo_n_16,312,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F7	139,1,1
-turbo_n_16,312,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F8	139,1,1
-turbo_n_16,312,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F9	139,1,1
-turbo_n_16,312,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F10	139,1,1
-turbo_n_16,312,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F11	139,1,1
-turbo_n_16,316,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F12	139,1,1
-turbo_n_16,316,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F13	139,1,1
-turbo_n_16,316,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F14	139,1,1
-turbo_n_16,316,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F15	139,1,1
-turbo_n_16,316,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F16	139,1,1
-turbo_n_16,316,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F17	139,1,1
-turbo_n_16,320,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F18	139,1,1
-turbo_n_16,320,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F19	139,1,1
-turbo_n_16,320,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F20	139,1,1
-turbo_n_16,320,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F21	139,1,1
-turbo_n_16,320,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F22	139,1,1
-turbo_n_16,320,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F23	139,1,1
-turbo_n_16,324,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F24	139,1,1
-turbo_n_16,324,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F25	139,1,1
-turbo_n_16,324,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F26	139,1,1
-turbo_n_16,324,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F27	139,1,1
-turbo_n_16,324,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F28	139,1,1
-turbo_n_16,324,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F29	139,1,1
-turbo_n_16,328,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F30	139,1,1
-turbo_n_16,328,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F31	139,1,1
-turbo_n_16,328,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F32	139,1,1
-turbo_n_16,328,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F33	139,1,1
-turbo_n_16,328,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F34	139,1,1
-turbo_n_16,328,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F35	139,1,1
-turbo_n_16,332,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F36	139,1,1
-turbo_n_16,332,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F37	139,1,1
-turbo_n_16,332,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F38	139,1,1
-turbo_n_16,332,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F39	139,1,1
-turbo_n_16,332,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F40	139,1,1
-turbo_n_16,332,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F41	139,1,1
-turbo_n_1,307,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F1	139,1,1
-turbo_n_1,307,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F2	139,1,1
-turbo_n_1,307,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F3	139,1,1
-turbo_n_1,307,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F4	139,1,1
-turbo_n_1,307,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F5	139,1,1
-turbo_n_1,307,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F96	139,1,1
-turbo_n_1,312,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F6	139,1,1
-turbo_n_1,312,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F7	139,1,1
-turbo_n_1,312,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F8	139,1,1
-turbo_n_1,312,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F9	139,1,1
-turbo_n_1,312,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F10	139,1,1
-turbo_n_1,312,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F11	139,1,1
-turbo_n_1,316,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F12	139,1,1
-turbo_n_1,316,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F13	139,1,1
-turbo_n_1,316,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F14	139,1,1
-turbo_n_1,316,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F15	139,1,1
-turbo_n_1,316,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F16	139,1,1
-turbo_n_1,316,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F17	139,1,1
-turbo_n_1,320,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F18	139,1,1
-turbo_n_1,320,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F19	139,1,1
-turbo_n_1,320,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F20	139,1,1
-turbo_n_1,320,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F21	139,1,1
-turbo_n_1,320,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F22	139,1,1
-turbo_n_1,320,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F23	139,1,1
-turbo_n_1,324,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F24	139,1,1
-turbo_n_1,324,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F25	139,1,1
-turbo_n_1,324,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F26	139,1,1
-turbo_n_1,324,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F27	139,1,1
-turbo_n_1,324,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F28	139,1,1
-turbo_n_1,324,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F29	139,1,1
-turbo_n_1,328,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F30	139,1,1
-turbo_n_1,328,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F31	139,1,1
-turbo_n_1,328,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F32	139,1,1
-turbo_n_1,328,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F33	139,1,1
-turbo_n_1,328,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F34	139,1,1
-turbo_n_1,328,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F35	139,1,1
-turbo_n_1,332,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F36	139,1,1
-turbo_n_1,332,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F37	139,1,1
-turbo_n_1,332,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F38	139,1,1
-turbo_n_1,332,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F39	139,1,1
-turbo_n_1,332,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F40	139,1,1
-turbo_n_1,332,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F41	139,1,1
-turbo_e_4,340,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F49	139,1,1
-turbo_e_4,340,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F50	139,1,1
-turbo_e_4,340,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F51	139,1,1
-turbo_e_4,340,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F52	139,1,1
-turbo_e_4,340,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F53	139,1,1
-turbo_e_4,344,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F54	139,1,1
-turbo_e_4,344,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F55	139,1,1
-turbo_e_4,344,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F56	139,1,1
-turbo_e_4,344,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F57	139,1,1
-turbo_e_4,344,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F58	139,1,1
-turbo_e_4,344,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F59	139,1,1
-turbo_e_4,348,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F60	139,1,1
-turbo_e_4,348,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F61	139,1,1
-turbo_e_4,348,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F62	139,1,1
-turbo_e_4,348,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F63	139,1,1
-turbo_e_4,348,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F64	139,1,1
-turbo_e_4,348,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F65	139,1,1
-turbo_e_4,352,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F66	139,1,1
-turbo_e_4,352,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F67	139,1,1
-turbo_e_4,352,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F68	139,1,1
-turbo_e_4,352,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F69	139,1,1
-turbo_e_4,352,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F70	139,1,1
-turbo_e_4,352,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F71	139,1,1
-turbo_e_4,356,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F72	139,1,1
-turbo_e_4,356,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F73	139,1,1
-turbo_e_4,356,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F74	139,1,1
-turbo_e_4,356,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F75	139,1,1
-turbo_e_4,356,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F76	139,1,1
-turbo_e_4,356,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F77	139,1,1
-turbo_e_4,360,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F78	139,1,1
-turbo_e_4,360,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F79	139,1,1
-turbo_e_4,360,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F80	139,1,1
-turbo_e_4,360,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F81	139,1,1
-turbo_e_4,360,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F82	139,1,1
-turbo_e_4,360,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F83	139,1,1
-turbo_e_4,364,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F84	139,1,1
-turbo_e_4,364,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F85	139,1,1
-turbo_e_4,364,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F86	139,1,1
-turbo_e_4,364,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F87	139,1,1
-turbo_e_4,364,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F88	139,1,1
-turbo_e_4,364,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F89	139,1,1
-turbo_e_4,368,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F90	139,1,1
-turbo_e_4,368,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F91	139,1,1
-turbo_e_4,368,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F92	139,1,1
-turbo_e_4,368,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F93	139,1,1
-turbo_e_4,368,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F94	139,1,1
-turbo_e_4,368,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F95	139,1,1
-turbo_e_8,340,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F49	139,1,1
-turbo_e_8,340,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F50	139,1,1
-turbo_e_8,340,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F51	139,1,1
-turbo_e_8,340,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F52	139,1,1
-turbo_e_8,340,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F53	139,1,1
-turbo_e_8,344,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F54	139,1,1
-turbo_e_8,344,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F55	139,1,1
-turbo_e_8,344,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F56	139,1,1
-turbo_e_8,344,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F57	139,1,1
-turbo_e_8,344,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F58	139,1,1
-turbo_e_8,344,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F59	139,1,1
-turbo_e_8,348,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F60	139,1,1
-turbo_e_8,348,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F61	139,1,1
-turbo_e_8,348,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F62	139,1,1
-turbo_e_8,348,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F63	139,1,1
-turbo_e_8,348,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F64	139,1,1
-turbo_e_8,348,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F65	139,1,1
-turbo_e_8,352,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F66	139,1,1
-turbo_e_8,352,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F67	139,1,1
-turbo_e_8,352,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F68	139,1,1
-turbo_e_8,352,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F69	139,1,1
-turbo_e_8,352,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F70	139,1,1
-turbo_e_8,352,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F71	139,1,1
-turbo_e_8,356,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F72	139,1,1
-turbo_e_8,356,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F73	139,1,1
-turbo_e_8,356,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F74	139,1,1
-turbo_e_8,356,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F75	139,1,1
-turbo_e_8,356,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F76	139,1,1
-turbo_e_8,356,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F77	139,1,1
-turbo_e_8,360,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F78	139,1,1
-turbo_e_8,360,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F79	139,1,1
-turbo_e_8,360,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F80	139,1,1
-turbo_e_8,360,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F81	139,1,1
-turbo_e_8,360,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F82	139,1,1
-turbo_e_8,360,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F83	139,1,1
-turbo_e_8,364,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F84	139,1,1
-turbo_e_8,364,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F85	139,1,1
-turbo_e_8,364,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F86	139,1,1
-turbo_e_8,364,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F87	139,1,1
-turbo_e_8,364,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F88	139,1,1
-turbo_e_8,364,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F89	139,1,1
-turbo_e_8,368,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F90	139,1,1
-turbo_e_8,368,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F91	139,1,1
-turbo_e_8,368,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F92	139,1,1
-turbo_e_8,368,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F93	139,1,1
-turbo_e_8,368,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F94	139,1,1
-turbo_e_8,368,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F95	139,1,1
-turbo_e_16,340,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F49	139,1,1
-turbo_e_16,340,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F50	139,1,1
-turbo_e_16,340,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F51	139,1,1
-turbo_e_16,340,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F52	139,1,1
-turbo_e_16,340,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F53	139,1,1
-turbo_e_16,344,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F54	139,1,1
-turbo_e_16,344,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F55	139,1,1
-turbo_e_16,344,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F56	139,1,1
-turbo_e_16,344,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F57	139,1,1
-turbo_e_16,344,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F58	139,1,1
-turbo_e_16,344,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F59	139,1,1
-turbo_e_16,348,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F60	139,1,1
-turbo_e_16,348,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F61	139,1,1
-turbo_e_16,348,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F62	139,1,1
-turbo_e_16,348,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F63	139,1,1
-turbo_e_16,348,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F64	139,1,1
-turbo_e_16,348,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F65	139,1,1
-turbo_e_16,352,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F66	139,1,1
-turbo_e_16,352,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F67	139,1,1
-turbo_e_16,352,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F68	139,1,1
-turbo_e_16,352,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F69	139,1,1
-turbo_e_16,352,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F70	139,1,1
-turbo_e_16,352,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F71	139,1,1
-turbo_e_16,356,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F72	139,1,1
-turbo_e_16,356,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F73	139,1,1
-turbo_e_16,356,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F74	139,1,1
-turbo_e_16,356,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F75	139,1,1
-turbo_e_16,356,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F76	139,1,1
-turbo_e_16,356,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F77	139,1,1
-turbo_e_16,360,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F78	139,1,1
-turbo_e_16,360,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F79	139,1,1
-turbo_e_16,360,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F80	139,1,1
-turbo_e_16,360,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F81	139,1,1
-turbo_e_16,360,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F82	139,1,1
-turbo_e_16,360,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F83	139,1,1
-turbo_e_16,364,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F84	139,1,1
-turbo_e_16,364,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F85	139,1,1
-turbo_e_16,364,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F86	139,1,1
-turbo_e_16,364,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F87	139,1,1
-turbo_e_16,364,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F88	139,1,1
-turbo_e_16,364,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F89	139,1,1
-turbo_e_16,368,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F90	139,1,1
-turbo_e_16,368,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F91	139,1,1
-turbo_e_16,368,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F92	139,1,1
-turbo_e_16,368,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F93	139,1,1
-turbo_e_16,368,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F94	139,1,1
-turbo_e_16,368,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F95	139,1,1
-turbo_n_4,340,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F49	139,1,1
-turbo_n_4,340,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F50	139,1,1
-turbo_n_4,340,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F51	139,1,1
-turbo_n_4,340,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F52	139,1,1
-turbo_n_4,340,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F53	139,1,1
-turbo_n_4,344,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F54	139,1,1
-turbo_n_4,344,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F55	139,1,1
-turbo_n_4,344,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F56	139,1,1
-turbo_n_4,344,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F57	139,1,1
-turbo_n_4,344,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F58	139,1,1
-turbo_n_4,344,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F59	139,1,1
-turbo_n_4,348,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F60	139,1,1
-turbo_n_4,348,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F61	139,1,1
-turbo_n_4,348,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F62	139,1,1
-turbo_n_4,348,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F63	139,1,1
-turbo_n_4,348,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F64	139,1,1
-turbo_n_4,348,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F65	139,1,1
-turbo_n_4,352,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F66	139,1,1
-turbo_n_4,352,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F67	139,1,1
-turbo_n_4,352,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F68	139,1,1
-turbo_n_4,352,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F69	139,1,1
-turbo_n_4,352,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F70	139,1,1
-turbo_n_4,352,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F71	139,1,1
-turbo_n_4,356,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F72	139,1,1
-turbo_n_4,356,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F73	139,1,1
-turbo_n_4,356,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F74	139,1,1
-turbo_n_4,356,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F75	139,1,1
-turbo_n_4,356,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F76	139,1,1
-turbo_n_4,356,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F77	139,1,1
-turbo_n_4,360,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F78	139,1,1
-turbo_n_4,360,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F79	139,1,1
-turbo_n_4,360,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F80	139,1,1
-turbo_n_4,360,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F81	139,1,1
-turbo_n_4,360,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F82	139,1,1
-turbo_n_4,360,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F83	139,1,1
-turbo_n_4,364,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F84	139,1,1
-turbo_n_4,364,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F85	139,1,1
-turbo_n_4,364,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F86	139,1,1
-turbo_n_4,364,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F87	139,1,1
-turbo_n_4,364,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F88	139,1,1
-turbo_n_4,364,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F89	139,1,1
-turbo_n_4,368,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F90	139,1,1
-turbo_n_4,368,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F91	139,1,1
-turbo_n_4,368,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F92	139,1,1
-turbo_n_4,368,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F93	139,1,1
-turbo_n_4,368,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F94	139,1,1
-turbo_n_4,368,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F95	139,1,1
-turbo_n_8,340,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F49	139,1,1
-turbo_n_8,340,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F50	139,1,1
-turbo_n_8,340,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F51	139,1,1
-turbo_n_8,340,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F52	139,1,1
-turbo_n_8,340,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F53	139,1,1
-turbo_n_8,344,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F54	139,1,1
-turbo_n_8,344,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F55	139,1,1
-turbo_n_8,344,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F56	139,1,1
-turbo_n_8,344,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F57	139,1,1
-turbo_n_8,344,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F58	139,1,1
-turbo_n_8,344,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F59	139,1,1
-turbo_n_8,348,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F60	139,1,1
-turbo_n_8,348,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F61	139,1,1
-turbo_n_8,348,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F62	139,1,1
-turbo_n_8,348,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F63	139,1,1
-turbo_n_8,348,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F64	139,1,1
-turbo_n_8,348,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F65	139,1,1
-turbo_n_8,352,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F66	139,1,1
-turbo_n_8,352,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F67	139,1,1
-turbo_n_8,352,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F68	139,1,1
-turbo_n_8,352,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F69	139,1,1
-turbo_n_8,352,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F70	139,1,1
-turbo_n_8,352,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F71	139,1,1
-turbo_n_8,356,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F72	139,1,1
-turbo_n_8,356,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F73	139,1,1
-turbo_n_8,356,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F74	139,1,1
-turbo_n_8,356,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F75	139,1,1
-turbo_n_8,356,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F76	139,1,1
-turbo_n_8,356,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F77	139,1,1
-turbo_n_8,360,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F78	139,1,1
-turbo_n_8,360,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F79	139,1,1
-turbo_n_8,360,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F80	139,1,1
-turbo_n_8,360,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F81	139,1,1
-turbo_n_8,360,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F82	139,1,1
-turbo_n_8,360,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F83	139,1,1
-turbo_n_8,364,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F84	139,1,1
-turbo_n_8,364,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F85	139,1,1
-turbo_n_8,364,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F86	139,1,1
-turbo_n_8,364,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F87	139,1,1
-turbo_n_8,364,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F88	139,1,1
-turbo_n_8,364,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F89	139,1,1
-turbo_n_8,368,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F90	139,1,1
-turbo_n_8,368,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F91	139,1,1
-turbo_n_8,368,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F92	139,1,1
-turbo_n_8,368,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F93	139,1,1
-turbo_n_8,368,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F94	139,1,1
-turbo_n_8,368,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F95	139,1,1
-turbo_n_16,340,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F49	139,1,1
-turbo_n_16,340,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F50	139,1,1
-turbo_n_16,340,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F51	139,1,1
-turbo_n_16,340,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F52	139,1,1
-turbo_n_16,340,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F53	139,1,1
-turbo_n_16,344,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F54	139,1,1
-turbo_n_16,344,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F55	139,1,1
-turbo_n_16,344,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F56	139,1,1
-turbo_n_16,344,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F57	139,1,1
-turbo_n_16,344,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F58	139,1,1
-turbo_n_16,344,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F59	139,1,1
-turbo_n_16,348,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F60	139,1,1
-turbo_n_16,348,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F61	139,1,1
-turbo_n_16,348,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F62	139,1,1
-turbo_n_16,348,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F63	139,1,1
-turbo_n_16,348,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F64	139,1,1
-turbo_n_16,348,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F65	139,1,1
-turbo_n_16,352,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F66	139,1,1
-turbo_n_16,352,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F67	139,1,1
-turbo_n_16,352,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F68	139,1,1
-turbo_n_16,352,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F69	139,1,1
-turbo_n_16,352,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F70	139,1,1
-turbo_n_16,352,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F71	139,1,1
-turbo_n_16,356,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F72	139,1,1
-turbo_n_16,356,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F73	139,1,1
-turbo_n_16,356,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F74	139,1,1
-turbo_n_16,356,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F75	139,1,1
-turbo_n_16,356,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F76	139,1,1
-turbo_n_16,356,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F77	139,1,1
-turbo_n_16,360,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F78	139,1,1
-turbo_n_16,360,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F79	139,1,1
-turbo_n_16,360,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F80	139,1,1
-turbo_n_16,360,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F81	139,1,1
-turbo_n_16,360,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F82	139,1,1
-turbo_n_16,360,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F83	139,1,1
-turbo_n_16,364,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F84	139,1,1
-turbo_n_16,364,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F85	139,1,1
-turbo_n_16,364,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F86	139,1,1
-turbo_n_16,364,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F87	139,1,1
-turbo_n_16,364,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F88	139,1,1
-turbo_n_16,364,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F89	139,1,1
-turbo_n_16,368,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F90	139,1,1
-turbo_n_16,368,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F91	139,1,1
-turbo_n_16,368,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F92	139,1,1
-turbo_n_16,368,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F93	139,1,1
-turbo_n_16,368,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F94	139,1,1
-turbo_n_16,368,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F95	139,1,1
-turbo_n_1,340,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F49	139,1,1
-turbo_n_1,340,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F50	139,1,1
-turbo_n_1,340,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F51	139,1,1
-turbo_n_1,340,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F52	139,1,1
-turbo_n_1,340,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F53	139,1,1
-turbo_n_1,344,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F54	139,1,1
-turbo_n_1,344,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F55	139,1,1
-turbo_n_1,344,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F56	139,1,1
-turbo_n_1,344,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F57	139,1,1
-turbo_n_1,344,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F58	139,1,1
-turbo_n_1,344,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F59	139,1,1
-turbo_n_1,348,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F60	139,1,1
-turbo_n_1,348,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F61	139,1,1
-turbo_n_1,348,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F62	139,1,1
-turbo_n_1,348,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F63	139,1,1
-turbo_n_1,348,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F64	139,1,1
-turbo_n_1,348,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F65	139,1,1
-turbo_n_1,352,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F66	139,1,1
-turbo_n_1,352,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F67	139,1,1
-turbo_n_1,352,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F68	139,1,1
-turbo_n_1,352,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F69	139,1,1
-turbo_n_1,352,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F70	139,1,1
-turbo_n_1,352,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F71	139,1,1
-turbo_n_1,356,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F72	139,1,1
-turbo_n_1,356,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F73	139,1,1
-turbo_n_1,356,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F74	139,1,1
-turbo_n_1,356,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F75	139,1,1
-turbo_n_1,356,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F76	139,1,1
-turbo_n_1,356,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F77	139,1,1
-turbo_n_1,360,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F78	139,1,1
-turbo_n_1,360,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F79	139,1,1
-turbo_n_1,360,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F80	139,1,1
-turbo_n_1,360,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F81	139,1,1
-turbo_n_1,360,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F82	139,1,1
-turbo_n_1,360,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F83	139,1,1
-turbo_n_1,364,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F84	139,1,1
-turbo_n_1,364,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F85	139,1,1
-turbo_n_1,364,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F86	139,1,1
-turbo_n_1,364,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F87	139,1,1
-turbo_n_1,364,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F88	139,1,1
-turbo_n_1,364,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F89	139,1,1
-turbo_n_1,368,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F90	139,1,1
-turbo_n_1,368,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F91	139,1,1
-turbo_n_1,368,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F92	139,1,1
-turbo_n_1,368,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F93	139,1,1
-turbo_n_1,368,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F94	139,1,1
-turbo_n_1,368,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F95	139,1,1
+turbo_e_4,307,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F1	HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F2	HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F3	HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F4	HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F5	HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F96	HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F6	HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F7	HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F8	HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F9	HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F10	HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F11	HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F12	HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F13	HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F14	HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F15	HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F16	HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F17	HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F18	HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F19	HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F20	HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F21	HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F22	HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F23	HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F24	HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F25	HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F26	HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F27	HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F28	HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F29	HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F30	HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F31	HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F32	HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F33	HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F34	HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F35	HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F36	HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F37	HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F38	HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F39	HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F40	HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F41	HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F1	HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F2	HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F3	HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F4	HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F5	HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F96	HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F6	HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F7	HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F8	HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F9	HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F10	HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F11	HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F12	HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F13	HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F14	HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F15	HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F16	HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F17	HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F18	HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F19	HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F20	HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F21	HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F22	HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F23	HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F24	HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F25	HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F26	HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F27	HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F28	HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F29	HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F30	HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F31	HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F32	HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F33	HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F34	HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F35	HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F36	HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F37	HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F38	HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F39	HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F40	HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F41	HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F1	HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F2	HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F3	HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F4	HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F5	HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F96	HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F6	HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F7	HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F8	HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F9	HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F10	HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F11	HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F12	HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F13	HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F14	HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F15	HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F16	HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F17	HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F18	HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F19	HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F20	HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F21	HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F22	HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F23	HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F24	HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F25	HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F26	HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F27	HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F28	HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F29	HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F30	HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F31	HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F32	HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F33	HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F34	HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F35	HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F36	HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F37	HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F38	HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F39	HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F40	HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F41	HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F1	HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F2	HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F3	HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F4	HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F5	HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F96	HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F6	HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F7	HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F8	HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F9	HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F10	HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F11	HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F12	HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F13	HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F14	HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F15	HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F16	HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F17	HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F18	HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F19	HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F20	HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F21	HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F22	HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F23	HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F24	HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F25	HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F26	HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F27	HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F28	HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F29	HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F30	HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F31	HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F32	HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F33	HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F34	HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F35	HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F36	HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F37	HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F38	HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F39	HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F40	HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F41	HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F1	HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F2	HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F3	HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F4	HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F5	HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F96	HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F6	HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F7	HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F8	HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F9	HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F10	HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F11	HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F12	HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F13	HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F14	HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F15	HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F16	HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F17	HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F18	HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F19	HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F20	HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F21	HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F22	HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F23	HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F24	HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F25	HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F26	HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F27	HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F28	HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F29	HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F30	HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F31	HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F32	HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F33	HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F34	HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F35	HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F36	HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F37	HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F38	HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F39	HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F40	HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F41	HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F1	HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F2	HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F3	HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F4	HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F5	HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F96	HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F6	HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F7	HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F8	HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F9	HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F10	HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F11	HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F12	HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F13	HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F14	HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F15	HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F16	HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F17	HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F18	HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F19	HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F20	HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F21	HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F22	HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F23	HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F24	HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F25	HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F26	HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F27	HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F28	HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F29	HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F30	HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F31	HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F32	HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F33	HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F34	HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F35	HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F36	HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F37	HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F38	HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F39	HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F40	HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F41	HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F1	HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F2	HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F3	HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F4	HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F5	HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F96	HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F6	HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F7	HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F8	HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F9	HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F10	HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F11	HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F12	HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F13	HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F14	HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F15	HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F16	HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F17	HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F18	HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F19	HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F20	HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F21	HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F22	HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F23	HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F24	HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F25	HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F26	HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F27	HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F28	HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F29	HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F30	HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F31	HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F32	HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F33	HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F34	HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F35	HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F36	HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F37	HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F38	HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F39	HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F40	HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F41	HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F49	HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F50	HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F51	HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F52	HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F53	HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F54	HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F55	HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F56	HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F57	HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F58	HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F59	HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F60	HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F61	HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F62	HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F63	HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F64	HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F65	HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F66	HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F67	HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F68	HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F69	HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F70	HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F71	HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F72	HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F73	HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F74	HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F75	HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F76	HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F77	HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F78	HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F79	HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F80	HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F81	HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F82	HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F83	HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,55,0	duplicate(TurboTrap#tt_main)	trap_e4#F84	HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,51,0	duplicate(TurboTrap#tt_main)	trap_e4#F85	HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,47,0	duplicate(TurboTrap#tt_main)	trap_e4#F86	HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,43,0	duplicate(TurboTrap#tt_main)	trap_e4#F87	HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,39,0	duplicate(TurboTrap#tt_main)	trap_e4#F88	HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F89	HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,56,0	duplicate(TurboTrap#tt_main)	trap_e4#F90	HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,52,0	duplicate(TurboTrap#tt_main)	trap_e4#F91	HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,48,0	duplicate(TurboTrap#tt_main)	trap_e4#F92	HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,44,0	duplicate(TurboTrap#tt_main)	trap_e4#F93	HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,40,0	duplicate(TurboTrap#tt_main)	trap_e4#F94	HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,36,0	duplicate(TurboTrap#tt_main)	trap_e4#F95	HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F49	HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F50	HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F51	HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F52	HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F53	HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F54	HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F55	HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F56	HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F57	HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F58	HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F59	HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F60	HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F61	HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F62	HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F63	HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F64	HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F65	HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F66	HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F67	HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F68	HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F69	HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F70	HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F71	HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F72	HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F73	HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F74	HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F75	HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F76	HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F77	HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F78	HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F79	HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F80	HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F81	HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F82	HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F83	HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,55,0	duplicate(TurboTrap#tt_main)	trap_e8#F84	HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,51,0	duplicate(TurboTrap#tt_main)	trap_e8#F85	HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,47,0	duplicate(TurboTrap#tt_main)	trap_e8#F86	HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,43,0	duplicate(TurboTrap#tt_main)	trap_e8#F87	HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,39,0	duplicate(TurboTrap#tt_main)	trap_e8#F88	HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F89	HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,56,0	duplicate(TurboTrap#tt_main)	trap_e8#F90	HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,52,0	duplicate(TurboTrap#tt_main)	trap_e8#F91	HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,48,0	duplicate(TurboTrap#tt_main)	trap_e8#F92	HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,44,0	duplicate(TurboTrap#tt_main)	trap_e8#F93	HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,40,0	duplicate(TurboTrap#tt_main)	trap_e8#F94	HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,36,0	duplicate(TurboTrap#tt_main)	trap_e8#F95	HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F49	HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F50	HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F51	HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F52	HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F53	HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F54	HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F55	HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F56	HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F57	HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F58	HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F59	HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F60	HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F61	HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F62	HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F63	HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F64	HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F65	HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F66	HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F67	HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F68	HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F69	HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F70	HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F71	HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F72	HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F73	HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F74	HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F75	HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F76	HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F77	HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F78	HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F79	HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F80	HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F81	HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F82	HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F83	HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,55,0	duplicate(TurboTrap#tt_main)	trap_e16#F84	HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,51,0	duplicate(TurboTrap#tt_main)	trap_e16#F85	HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,47,0	duplicate(TurboTrap#tt_main)	trap_e16#F86	HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,43,0	duplicate(TurboTrap#tt_main)	trap_e16#F87	HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,39,0	duplicate(TurboTrap#tt_main)	trap_e16#F88	HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F89	HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,56,0	duplicate(TurboTrap#tt_main)	trap_e16#F90	HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,52,0	duplicate(TurboTrap#tt_main)	trap_e16#F91	HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,48,0	duplicate(TurboTrap#tt_main)	trap_e16#F92	HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,44,0	duplicate(TurboTrap#tt_main)	trap_e16#F93	HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,40,0	duplicate(TurboTrap#tt_main)	trap_e16#F94	HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,36,0	duplicate(TurboTrap#tt_main)	trap_e16#F95	HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F49	HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F50	HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F51	HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F52	HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F53	HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F54	HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F55	HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F56	HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F57	HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F58	HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F59	HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F60	HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F61	HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F62	HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F63	HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F64	HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F65	HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F66	HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F67	HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F68	HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F69	HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F70	HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F71	HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F72	HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F73	HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F74	HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F75	HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F76	HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F77	HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F78	HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F79	HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F80	HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F81	HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F82	HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F83	HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,55,0	duplicate(TurboTrap#tt_main)	trap_n4#F84	HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,51,0	duplicate(TurboTrap#tt_main)	trap_n4#F85	HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,47,0	duplicate(TurboTrap#tt_main)	trap_n4#F86	HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,43,0	duplicate(TurboTrap#tt_main)	trap_n4#F87	HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,39,0	duplicate(TurboTrap#tt_main)	trap_n4#F88	HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F89	HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,56,0	duplicate(TurboTrap#tt_main)	trap_n4#F90	HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,52,0	duplicate(TurboTrap#tt_main)	trap_n4#F91	HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,48,0	duplicate(TurboTrap#tt_main)	trap_n4#F92	HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,44,0	duplicate(TurboTrap#tt_main)	trap_n4#F93	HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,40,0	duplicate(TurboTrap#tt_main)	trap_n4#F94	HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,36,0	duplicate(TurboTrap#tt_main)	trap_n4#F95	HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F49	HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F50	HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F51	HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F52	HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F53	HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F54	HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F55	HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F56	HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F57	HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F58	HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F59	HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F60	HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F61	HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F62	HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F63	HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F64	HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F65	HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F66	HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F67	HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F68	HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F69	HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F70	HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F71	HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F72	HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F73	HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F74	HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F75	HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F76	HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F77	HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F78	HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F79	HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F80	HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F81	HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F82	HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F83	HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,55,0	duplicate(TurboTrap#tt_main)	trap_n8#F84	HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,51,0	duplicate(TurboTrap#tt_main)	trap_n8#F85	HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,47,0	duplicate(TurboTrap#tt_main)	trap_n8#F86	HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,43,0	duplicate(TurboTrap#tt_main)	trap_n8#F87	HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,39,0	duplicate(TurboTrap#tt_main)	trap_n8#F88	HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F89	HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,56,0	duplicate(TurboTrap#tt_main)	trap_n8#F90	HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,52,0	duplicate(TurboTrap#tt_main)	trap_n8#F91	HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,48,0	duplicate(TurboTrap#tt_main)	trap_n8#F92	HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,44,0	duplicate(TurboTrap#tt_main)	trap_n8#F93	HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,40,0	duplicate(TurboTrap#tt_main)	trap_n8#F94	HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,36,0	duplicate(TurboTrap#tt_main)	trap_n8#F95	HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F49	HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F50	HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F51	HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F52	HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F53	HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F54	HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F55	HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F56	HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F57	HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F58	HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F59	HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F60	HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F61	HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F62	HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F63	HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F64	HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F65	HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F66	HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F67	HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F68	HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F69	HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F70	HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F71	HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F72	HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F73	HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F74	HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F75	HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F76	HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F77	HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F78	HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F79	HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F80	HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F81	HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F82	HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F83	HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,55,0	duplicate(TurboTrap#tt_main)	trap_n16#F84	HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,51,0	duplicate(TurboTrap#tt_main)	trap_n16#F85	HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,47,0	duplicate(TurboTrap#tt_main)	trap_n16#F86	HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,43,0	duplicate(TurboTrap#tt_main)	trap_n16#F87	HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,39,0	duplicate(TurboTrap#tt_main)	trap_n16#F88	HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F89	HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,56,0	duplicate(TurboTrap#tt_main)	trap_n16#F90	HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,52,0	duplicate(TurboTrap#tt_main)	trap_n16#F91	HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,48,0	duplicate(TurboTrap#tt_main)	trap_n16#F92	HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,44,0	duplicate(TurboTrap#tt_main)	trap_n16#F93	HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,40,0	duplicate(TurboTrap#tt_main)	trap_n16#F94	HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,36,0	duplicate(TurboTrap#tt_main)	trap_n16#F95	HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F49	HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F50	HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F51	HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F52	HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F53	HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F54	HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F55	HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F56	HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F57	HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F58	HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F59	HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F60	HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F61	HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F62	HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F63	HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F64	HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F65	HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F66	HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F67	HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F68	HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F69	HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F70	HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F71	HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F72	HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F73	HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F74	HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F75	HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F76	HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F77	HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F78	HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F79	HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F80	HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F81	HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F82	HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F83	HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,55,0	duplicate(TurboTrap#tt_main)	trap_n1#F84	HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,51,0	duplicate(TurboTrap#tt_main)	trap_n1#F85	HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,47,0	duplicate(TurboTrap#tt_main)	trap_n1#F86	HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,43,0	duplicate(TurboTrap#tt_main)	trap_n1#F87	HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,39,0	duplicate(TurboTrap#tt_main)	trap_n1#F88	HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F89	HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,56,0	duplicate(TurboTrap#tt_main)	trap_n1#F90	HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,52,0	duplicate(TurboTrap#tt_main)	trap_n1#F91	HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,48,0	duplicate(TurboTrap#tt_main)	trap_n1#F92	HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,44,0	duplicate(TurboTrap#tt_main)	trap_n1#F93	HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,40,0	duplicate(TurboTrap#tt_main)	trap_n1#F94	HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F95	HIDDEN_WARP_NPC,1,1
 
 -	script	TurboTrap_2#tt_main	-1,{
 	end;
@@ -3531,55 +3536,55 @@ OnTouch:
 		percentheal -2,0;
 	}
 }
-turbo_e_4,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F42	139,1,1
-turbo_e_4,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F43	139,1,1
-turbo_e_4,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F44	139,1,1
-turbo_e_4,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F45	139,1,1
-turbo_e_4,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F46	139,1,1
-turbo_e_4,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F47	139,1,1
-turbo_e_4,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F48	139,1,1
-turbo_e_8,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F42	139,1,1
-turbo_e_8,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F43	139,1,1
-turbo_e_8,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F44	139,1,1
-turbo_e_8,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F45	139,1,1
-turbo_e_8,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F46	139,1,1
-turbo_e_8,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F47	139,1,1
-turbo_e_8,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F48	139,1,1
-turbo_e_16,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F42	139,1,1
-turbo_e_16,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F43	139,1,1
-turbo_e_16,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F44	139,1,1
-turbo_e_16,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F45	139,1,1
-turbo_e_16,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F46	139,1,1
-turbo_e_16,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F47	139,1,1
-turbo_e_16,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F48	139,1,1
-turbo_n_4,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F42	139,1,1
-turbo_n_4,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F43	139,1,1
-turbo_n_4,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F44	139,1,1
-turbo_n_4,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F45	139,1,1
-turbo_n_4,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F46	139,1,1
-turbo_n_4,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F47	139,1,1
-turbo_n_4,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F48	139,1,1
-turbo_n_8,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F42	139,1,1
-turbo_n_8,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F43	139,1,1
-turbo_n_8,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F44	139,1,1
-turbo_n_8,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F45	139,1,1
-turbo_n_8,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F46	139,1,1
-turbo_n_8,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F47	139,1,1
-turbo_n_8,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F48	139,1,1
-turbo_n_16,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F42	139,1,1
-turbo_n_16,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F43	139,1,1
-turbo_n_16,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F44	139,1,1
-turbo_n_16,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F45	139,1,1
-turbo_n_16,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F46	139,1,1
-turbo_n_16,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F47	139,1,1
-turbo_n_16,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F48	139,1,1
-turbo_n_1,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F42	139,1,1
-turbo_n_1,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F43	139,1,1
-turbo_n_1,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F44	139,1,1
-turbo_n_1,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F45	139,1,1
-turbo_n_1,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F46	139,1,1
-turbo_n_1,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F47	139,1,1
-turbo_n_1,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F48	139,1,1
+turbo_e_4,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F42	HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F43	HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F44	HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F45	HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F46	HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F47	HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_e4#F48	HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F42	HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F43	HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F44	HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F45	HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F46	HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F47	HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_e8#F48	HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F42	HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F43	HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F44	HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F45	HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F46	HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F47	HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_e16#F48	HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F42	HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F43	HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F44	HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F45	HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F46	HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F47	HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n4#F48	HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F42	HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F43	HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F44	HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F45	HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F46	HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F47	HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n8#F48	HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F42	HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F43	HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F44	HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F45	HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F46	HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F47	HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n16#F48	HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,56,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F42	HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,52,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F43	HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,48,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F44	HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,44,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F45	HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,50,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F46	HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,36,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F47	HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F48	HIDDEN_WARP_NPC,1,1
 
 -	script	bing_1#tt_main	-1,{
 	end;
@@ -3600,24 +3605,24 @@ OnTouch:
 	enablenpc "bing2#"+.@w$;
 	end;
 }
-turbo_e_4,217,214,0	duplicate(bing_1#tt_main)	bing#e4	45,3,3
-turbo_e_8,217,214,0	duplicate(bing_1#tt_main)	bing#e8	45,3,3
-turbo_e_16,217,214,0	duplicate(bing_1#tt_main)	bing#e16	45,3,3
-turbo_n_4,217,214,0	duplicate(bing_1#tt_main)	bing#n4	45,3,3
-turbo_n_8,217,214,0	duplicate(bing_1#tt_main)	bing#n8	45,3,3
-turbo_n_16,217,214,0	duplicate(bing_1#tt_main)	bing#n16	45,3,3
+turbo_e_4,217,214,0	duplicate(bing_1#tt_main)	bing#e4	WARPNPC,3,3
+turbo_e_8,217,214,0	duplicate(bing_1#tt_main)	bing#e8	WARPNPC,3,3
+turbo_e_16,217,214,0	duplicate(bing_1#tt_main)	bing#e16	WARPNPC,3,3
+turbo_n_4,217,214,0	duplicate(bing_1#tt_main)	bing#n4	WARPNPC,3,3
+turbo_n_8,217,214,0	duplicate(bing_1#tt_main)	bing#n8	WARPNPC,3,3
+turbo_n_16,217,214,0	duplicate(bing_1#tt_main)	bing#n16	WARPNPC,3,3
 
 -	script	bing_2#tt_main	-1,{
 	end;
 OnTouch:
 	switch (rand(1,10)) {
-		Case 1: warp strnpcinfo(4),217,232; break;
-		Case 2: warp strnpcinfo(4),233,207; break;
-		Case 3: warp strnpcinfo(4),208,219; break;
-		Case 4: warp strnpcinfo(4),219,202; break;
-		Case 5: warp strnpcinfo(4),218,228; break;
-		Case 6: warp strnpcinfo(4),220,195; break;
-		Default: break;
+		case 1: warp strnpcinfo(4),217,232; break;
+		case 2: warp strnpcinfo(4),233,207; break;
+		case 3: warp strnpcinfo(4),208,219; break;
+		case 4: warp strnpcinfo(4),219,202; break;
+		case 5: warp strnpcinfo(4),218,228; break;
+		case 6: warp strnpcinfo(4),220,195; break;
+		default: break;
 	}
 	end;
 	
@@ -3626,14 +3631,14 @@ OnInit:
 	disablenpc "bing2#"+.@w$;
 	end;
 }
-turbo_e_4,217,214,0	duplicate(bing_2#tt_main)	bing2#e4	45,3,3
-turbo_e_8,217,214,0	duplicate(bing_2#tt_main)	bing2#e8	45,3,3
-turbo_e_16,217,214,0	duplicate(bing_2#tt_main)	bing2#e16	45,3,3
-turbo_n_4,217,214,0	duplicate(bing_2#tt_main)	bing2#n4	45,3,3
-turbo_n_8,217,214,0	duplicate(bing_2#tt_main)	bing2#n8	45,3,3
-turbo_n_16,217,214,0	duplicate(bing_2#tt_main)	bing2#n16	45,3,3
-
-turbo_room,130,92,3	script	Kafra Staff#tt	115,{
+turbo_e_4,217,214,0	duplicate(bing_2#tt_main)	bing2#e4	WARPNPC,3,3
+turbo_e_8,217,214,0	duplicate(bing_2#tt_main)	bing2#e8	WARPNPC,3,3
+turbo_e_16,217,214,0	duplicate(bing_2#tt_main)	bing2#e16	WARPNPC,3,3
+turbo_n_4,217,214,0	duplicate(bing_2#tt_main)	bing2#n4	WARPNPC,3,3
+turbo_n_8,217,214,0	duplicate(bing_2#tt_main)	bing2#n8	WARPNPC,3,3
+turbo_n_16,217,214,0	duplicate(bing_2#tt_main)	bing2#n16	WARPNPC,3,3
+
+turbo_room,130,92,3	script	Kafra Staff#tt	4_F_KAFRA3,{
 	cutin "kafra_03",2;
 	mes "[Kafra Staff]";
 	mes "Welcome~ The Kafra Services";
@@ -3650,9 +3655,10 @@ turbo_room,130,92,3	script	Kafra Staff#tt	115,{
 
 }
 
-turbo_room,124,86,0	shop	Turbo Track Merchant	90,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,1065:-1,1750:-1
+turbo_room,124,86,0	shop	Turbo Track Merchant	4_F_01,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,1065:-1,1750:-1
 
-turbo_room,99,120,4	script	TBT_Guide#Broadcast	124,{
+// Official name: "TBT_Guide#Broadcast"
+turbo_room,99,120,4	script	Turbo Track Guide	4_F_TELEPORTER,{
 	mes "[Turbo Track Guide]";
 	mes "Good day~";
 	mes "Is there anything that";
@@ -3712,7 +3718,7 @@ turbo_room,99,120,4	script	TBT_Guide#Broadcast	124,{
 			mes "class or level requirements";
 			mes "to participate in the Turbo";
 			mes "Track. However, there is a";
-			mes "participation fee of 1,000 zeny. ^FFFFFFcobo^000000";
+			mes "participation fee of 1,000 zeny.";
 			next;
 			break;
 		case 2:
@@ -3727,7 +3733,7 @@ turbo_room,99,120,4	script	TBT_Guide#Broadcast	124,{
 			mes "The availability of specific";
 			mes "courses is determined by the";
 			mes "game mode. Would you like to";
-			mes "learn more about a certain course? ^FFFFFFcobo^000000";
+			mes "learn more about a certain course?";
 			next;
 			set .@exitloop,1;
 			while (.@exitloop) {
@@ -3894,80 +3900,80 @@ OnInit:
 	}
 	end;
 
-Onend_n1:
+OnEnd_n1:
 	mapannounce "turbo_room","A [Normal Mode - Solo] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_n4:
+OnEnd_n4:
 	mapannounce "turbo_room","A [Normal Mode - 4 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_n8:
+OnEnd_n8:
 	mapannounce "turbo_room","A [Normal Mode - 8 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_n16:
+OnEnd_n16:
 	mapannounce "turbo_room","A [Normal Mode - 16 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_e4:
+OnEnd_e4:
 	mapannounce "turbo_room","A [Expert Mode - 4 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_e8:
+OnEnd_e8:
 	mapannounce "turbo_room","A [Expert Mode - 8 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_e16:
+OnEnd_e16:
 	mapannounce "turbo_room","A [Expert Mode - 16 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onnew_top1:
+OnNew_Top1:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[9] + " has ranked Number One in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onnew_top2:
+OnNew_Top2:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[10] + " has ranked Second in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onnew_top3:
+OnNew_Top3:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[11] + " has ranked Third in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onnew_top4:
+OnNew_Top4:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[12] + " has ranked Fourth in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onnew_top5:
+OnNew_Top5:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[13] + " has ranked Fifth in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onwin_n4:
+OnWin_n4:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[1] + " just won a [Normal Mode - 4 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_n8:
+OnWin_n8:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[2] + " just won a [Normal Mode - 8 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_n16:
+OnWin_n16:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[3] + " just won a [Normal Mode - 16 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_e4:
+OnWin_e4:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[4] + " just won an [Expert Mode - 4 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_e8:
+OnWin_e8:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[5] + " just won an [Expert Mode - 8 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_e16:
+OnWin_e16:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[6] + " just won an [Expert Mode - 16 Person] game!",bc_map,"0x70DBDB";
 	end;
 }
 
-turbo_room,102,117,3	script	Hall of Honor#tt	857,{
+turbo_room,102,117,3	script	Hall of Honor#tt	4_BOARD3,{
 	mes "^2F4F4FTurbo Track Hall of Honor^000000";
 	mes " ";
 	mes "The First:";
@@ -3978,7 +3984,7 @@ turbo_room,102,117,3	script	Hall of Honor#tt	857,{
 	close;
 }
 
-turbo_room,77,115,5	script	Solo Mode#tt::TurboSoloNames	857,{
+turbo_room,77,115,5	script	Solo Mode#tt::TurboSoloNames	4_BOARD3,{
 	mes "^2F4F4FSolo Mode Record^000000";
 	mes " ";
 	mes "The best player";
@@ -3987,7 +3993,7 @@ turbo_room,77,115,5	script	Solo Mode#tt::TurboSoloNames	857,{
 	close;
 }
 
-turbo_room,87,114,5	script	Normal Mode Record#tt::TurboNormalNames	857,{
+turbo_room,87,114,5	script	Normal Mode Record#tt::TurboNormalNames	4_BOARD3,{
 	mes "<<Recent Top Players>>";
 	mes "Winners of Normal Mode - 4 Person";
 	mes "^4d4dff" + $ttnames$[1] + "^000000";
@@ -3998,7 +4004,7 @@ turbo_room,87,114,5	script	Normal Mode Record#tt::TurboNormalNames	857,{
 	close;
 }
 
-turbo_room,112,114,3	script	Expert Mode Record::TurboExpertNames	857,{
+turbo_room,112,114,3	script	Expert Mode Record::TurboExpertNames	4_BOARD3,{
 	mes "<<Recent Top Players>>";
 	mes "Winners of Expert Mode - 4 Person";
 	mes "^4d4dff" + $ttnames$[4] + "^000000";
@@ -4009,7 +4015,7 @@ turbo_room,112,114,3	script	Expert Mode Record::TurboExpertNames	857,{
 	close;
 }
 
-turbo_room,97,117,5	script	Hall of Honor#tt2	857,{
+turbo_room,97,117,5	script	Hall of Honor#tt2	4_BOARD3,{
 	mes "^2F4F4FTurbo Track Hall of Honor^000000";
 	mes " ";
 	mes "1st: ^4d4dff" + $ttnames$[9] + "^000000";
@@ -4020,11 +4026,11 @@ turbo_room,97,117,5	script	Hall of Honor#tt2	857,{
 	close;
 }
 
-turbo_room,75,95,5	duplicate(TurboSoloNames)	Solo Mode#1	857
-turbo_room,67,95,5	duplicate(TurboNormalNames)	Normal Mode Records#1	857
-turbo_room,71,95,5	duplicate(TurboExpertNames)	Expert Mode Records#1	857
+turbo_room,75,95,5	duplicate(TurboSoloNames)	Solo Mode#1	4_BOARD3
+turbo_room,67,95,5	duplicate(TurboNormalNames)	Normal Mode Records#1	4_BOARD3
+turbo_room,71,95,5	duplicate(TurboExpertNames)	Expert Mode Records#1	4_BOARD3
 
-turbo_room,93,117,5	script	Point Exchange Helper	125,{
+turbo_room,93,117,5	script	Point Exchange Helper	4_M_TELEPORTER,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -4201,7 +4207,7 @@ turbo_room,93,117,5	script	Point Exchange Helper	125,{
 					mes "I'm sorry, but your";
 					mes "request has exceeded the";
 					mes "maximum limit. You can only";
-					mes "request up to 50 scrolls at once. ^FFFFFFcobo^000000";
+					mes "request up to 50 scrolls at once.";
 					close;
 				}
 				else {
@@ -4248,14 +4254,10 @@ turbo_room,93,117,5	script	Point Exchange Helper	125,{
 	
 					}
 					set tt_point,tt_point-40;
-					if (BaseLevel < 70)
-						getexp 300,0;
-					else if (BaseLevel < 80)
-						getexp 900,0;
-					else if (BaseLevel < 90)
-						getexp 1000,0;
-					else if (BaseLevel < 151)
-						getexp 3000,0;
+					if (BaseLevel < 70) getexp 3000,0;
+					else if (BaseLevel < 80) getexp 9000,0;
+					else if (BaseLevel < 90) getexp 10000,0;
+					else if (BaseLevel < 100) getexp 30000,0;
 					mes "[Item Exchange Helper]";
 					mes "Thank you, your";
 					mes "Turbo Track Points";
@@ -4442,7 +4444,7 @@ turbo_room,93,117,5	script	Point Exchange Helper	125,{
 	}
 }
 
-turbo_room,106,117,3	script	Point Manager#tt	833,{
+turbo_room,106,117,3	script	Point Manager#tt	4_M_ZONDAOYAJI,{
 	mes "[Turbo Track Point Manager]";
 	mes "Good day.";
 	mes "Did you enjoy your";
@@ -4587,7 +4589,7 @@ S_ExchangePoints:
 	}
 }
 
-alde_gld,183,204,0	script	en_turbo	45,1,1,{
+alde_gld,183,204,0	script	en_turbo	WARPNPC,1,1,{
 OnTouch:
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
@@ -4598,39 +4600,86 @@ OnTouch:
 		mes "things using the Kafra Service.^000000";
 		close;
 	}
-	set .@now_weight,MaxWeight-Weight;
 	if ((BaseJob == Job_Knight || BaseJob == Job_Crusader) && checkriding()) {
-		if (.@now_weight < 20000) {
+		if (MaxWeight-Weight < 20000) {
+			if (!(eaclass()&EAJL_THIRD)) {
+				set .@mount$,(BaseJob == Job_Knight)?"Peco Peco":"Grand Peco";
+				mes "[Helper]";
+				mes .@mount$+"s are prohibited";
+				mes "in the Turbo Track Arena.";
+				mes "Please dismount from your";
+				mes .@mount$+" and you will receive";
+				mes "a Free Ticket for Peco Ride";
+				mes "for retrieving your "+.@mount$+".";
+			} else {
+				set .@mount$,(BaseJob == Job_Knight)?"Dragon":"Gryphon";
+				mes "[Helper]";
+				mes .@mount$+"s are prohibited";
+				mes "in the Turbo Track Arena.";
+				mes "Please dismount from your";
+				mes .@mount$+". You can retrieve";
+				mes "it for free outside.";
+			}
+			close2;
+			warp "alde_gld",183,199;
+			end;
+		} else {
+			if (!(eaclass()&EAJL_THIRD)) {
+				setriding 0;
+				getitem 7310,1; //Free_Peco_Ticket
+			} else {
+				if (BaseJob == Job_Knight)
+					setdragon 0;
+				else
+					setriding 0;
+			}
+			warp "turbo_room",100,65;
+		}
+	} else if ((Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) && checkoption(Option_Wugrider)) {
+		if (MaxWeight-Weight < 20000) {
 			mes "[Helper]";
-			mes "Peco Pecos are prohibited";
+			mes "Wargs are prohibited";
 			mes "in the Turbo Track Arena.";
-			mes "Please dismount from your";
-			mes "Peco Peco and you will receive";
-			mes "a Free Ticket for Peco Ride";
-			mes "for retrieving your Peco Peco.";
+			mes "Please dismount from your Warg.";
 			close2;
 			warp "alde_gld",183,199;
 			end;
+		} else {
+			setoption Option_Wugrider,0;
+			warp "turbo_room",100,65;
 		}
-		else {
-			setriding 0;
-			getitem 7310,1; //Free_Peco_Ticket
+	} else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmadogear()) {
+		if (MaxWeight-Weight < 20000) {
+			mes "[Helper]";
+			mes "Magic Gears are prohibited";
+			mes "in the Turbo Track Arena.";
+			mes "Please dismount from your";
+			mes "Magic Gear. You can retrieve";
+			mes "it for free outside.";
+			close2;
+			warp "alde_gld",183,199;
+			end;
+		} else {
+			setmadogear 0;
 			warp "turbo_room",100,65;
 		}
-	}
-	else
+	} else
 		warp "turbo_room",100,65;
 	end;
 }
 
-alde_gld,186,199,3	script	Turbo Track Guide#Entran	845,{
+alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 	mes "[Guide]";
 	mes "Welcome to";
 	mes "the Al De Baran";
 	mes "Turbo Track~";
 	next;
 	mes "[Guide]";
-	mes "Peco Pecos are prohibited inside the Turbo Track Arena. But anyone riding on a Peco Peco will receive a Free Peco Peco Mount Ticket at the Turbo Track Entrance and automatically dismount.";
+	if (checkre(0))
+		mes "Peco Pecos, Grand Pecos, Dragons, Gryphons, Wargs and Magic Gears are prohibited inside the Turbo Track Arena.";
+	else
+		mes "Peco Pecos are prohibited inside the Turbo Track Arena.";
+	mes "But anyone riding on a Peco Peco will receive a Free Peco Peco Mount Ticket at the Turbo Track Entrance and automatically dismount.";
 	next;
 	mes "[Guide]";
 	mes "Well then,";
@@ -4639,75 +4688,120 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	845,{
 	close;
 }
 
-alde_gld,181,199,5	script	Peco Peco Manager	845,{
-	mes "[Peco Peco Manager]";
+-	script	::MountManager_turbo	-1,{
+	set .@n$, "["+strnpcinfo(1)+"]";
+	mes .@n$;
+	if (ismounting()) {
+		mes "Please get off of that creature you're riding on.";
+		mes "Then talk to me again.";
+		close;
+	}
 	if (BaseJob == Job_Knight || BaseJob == Job_Crusader) {
-		mes "Welcome, would you like";
-		mes "to retrieve your Peco Peco?";
+		if (!(eaclass()&EAJL_THIRD)) {
+			if (BaseJob == Job_Knight) {
+				set .@zeny,2500;
+				set .@zeny$,"2,500";
+				set .@mount$,"Peco Peco";
+			} else {
+				set .@zeny,3500;
+				set .@zeny$,"3,500";
+				set .@mount$,"Grand Peco";
+			}
+			set .@skill,63;
+			set .@skill$,"Peco Peco Ride";
+			set .@riding, checkriding();
+			set .@i,1;
+		} else {
+			if (BaseJob == Job_Knight) {
+				set .@mount$,"Dragon";
+				set .@skill,63;
+				set .@skill$,"Dragon Training";
+				set .@riding, checkdragon();
+				set .@i,2;
+			} else {
+				set .@mount$,"Gryphon";
+				set .@skill,63;
+				set .@skill$,"Peco Peco Ride";
+				set .@riding, checkriding();
+				set .@i,1;
+			}
+		}
+	} else if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) {
+		set .@mount$,"Magic Gear";
+		set .@skill,2255;
+		set .@skill$,"Magic Gear License";
+		set .@riding, checkmadogear();
+		set .@i,3;
+	} else {
+		mes "Thank you for";
+		mes "visiting Al De Baran's";
+		mes "Turbo Track~";
+		close;
+	}
+	mes "Welcome, would you like";
+	mes "to retrieve your "+.@mount$+"?";
+	if (.@zeny) {
 		mes "Please show me your Free";
 		mes "Ticket for Peco Ride. You";
 		mes "may also pay a rental fee";
-		mes "of 2,500 zeny.";
-		next;
-		switch(select("Use:Cancel")) {
-		case 1:
-			if (getskilllv(63) == 0) {
-				mes "[Peco Peco Manager]";
-				mes "I'm sorry, but you're";
-				mes "not eligible for this";
-				mes "service. Please go learn";
-				mes "the Peco Peco Ride skill first.";
+		mes "of "+.@zeny$+" zeny.";
+	}
+	next;
+	switch(select("Yes:Cancel")) {
+	case 1:
+		if (getskilllv(.@skill) == 0) {
+			mes .@n$;
+			mes "I'm sorry, but you're";
+			mes "not eligible for this";
+			mes "service. Please go learn";
+			mes "the "+.@skill$+" skill first.";
+			close;
+		} else {
+			if (.@riding) {
+				mes .@n$;
+				mes "You're already";
+				mes "mounted on a";
+				mes .@mount$+".";
+				mes "Thank you~";
 				close;
-			}
-			else {
-				if (checkriding()) {
-					mes "[Peco Peco Manager]";
-					mes "You're already";
-					mes "mounted on a";
-					mes "Peco Peco.";
-					mes "Thank you~";
-					close;
-				}
-				else {
-					if (countitem(7310) < 1 && Zeny < 2500) {
-						mes "[Peco Peco Manager]";
+			} else {
+				if (.@zeny) {
+					if (countitem(7310) < 1 && Zeny < .@zeny) {
+						mes .@n$;
 						mes "I'm sorry, but you";
 						mes "don't have a Free Ticket";
-						mes "for Peco Ride or 2,500 zeny.";
+						mes "for Peco Ride or "+.@zeny$+" zeny.";
 						mes "to use the Peco rental service.";
 						close;
-					}
-					else {
+					} else {
 						if (countitem(7310) > 0)
 							delitem 7310,1; //Free_Peco_Ticket
 						else
-							set zeny,zeny-2500;
-						setriding;
-						mes "[Peco Peco Manager]";
-						mes "Thank you for";
-						mes "your patronage~";
-						close;
+							Zeny -= .@zeny;
 					}
 				}
+				switch(.@i) {
+					case 1: setriding; break;
+					case 2: setdragon; break;
+					case 3: setmadogear; break;
+				}
+				mes .@n$;
+				mes "Thank you for";
+				mes "your patronage~";
+				close;
 			}
-		case 2:
-			mes "[Peco Peco Manager]";
-			mes "Are you going";
-			mes "back to race in";
-			mes "the Turbo Track?";
-			mes "Good luck!";
-			close;
 		}
-	}
-	else {
-		mes "Thank you for";
-		mes "visiting Al De Baran's";
-		mes "Turbo Track~";
+	case 2:
+		mes .@n$;
+		mes "Are you going";
+		mes "back to race in";
+		mes "the Turbo Track?";
+		mes "Good luck!";
 		close;
 	}
 }
 
-alde_gld,178,180,0	script	Sign#TBT	837,{
+alde_gld,178,180,0	script	Sign#TBT	2_BULLETIN_BOARD,{
 	mes "[Al De Baran Turbo Track]";
 	mes "This way...";
 	mes "to the Al De Baran";
diff --git a/npc/pre-re/airports/izlude.txt b/npc/pre-re/airports/izlude.txt
index b2c0ee2d5..b581c283e 100644
--- a/npc/pre-re/airports/izlude.txt
+++ b/npc/pre-re/airports/izlude.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Izlude Airport NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Izlude Airport NPCs
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Official NPCs.
-//============================================================ 
+//============================================================
 
-izlude,206,55,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	90
+izlude,206,55,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	4_F_01
diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt
index 3643469de..4ba223b6e 100644
--- a/npc/pre-re/cities/alberta.txt
+++ b/npc/pre-re/cities/alberta.txt
@@ -1,40 +1,41 @@
 //===== Hercules Script ======================================
 //= Alberta Town Pre-Renewal
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Euphy
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
+//= [Official Conversion]
 //= Alberta town NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //============================================================
 
 // cities/amatsu.txt
 //============================================================
-alberta,245,93,3	duplicate(Sea_Captain_amatsu)	Sea Captain#ama1	709
+alberta,245,93,3	duplicate(Sea_Captain_amatsu)	Sea Captain#ama1	4_M_SEAMAN
 
 // cities/ayothaya.txt
 //============================================================
-alberta,247,42,3	duplicate(Aibakthing_ayothaya)	Aibakthing#ayo	843
+alberta,247,42,3	duplicate(Aibakthing_ayothaya)	Aibakthing#ayo	4_M_THAIONGBAK
 
 // cities/gonryun.txt
 //============================================================
-alberta,245,69,3	duplicate(Kunlun_Envoy_gonryun)	Kunlun Envoy#gon	776
+alberta,245,69,3	duplicate(Kunlun_Envoy_gonryun)	Kunlun Envoy#gon	4_M_TWMIDMAN
 
 // cities/louyang.txt
 //============================================================
-alberta,245,45,3	duplicate(Girl_louyang)	Girl#0lou	815
+alberta,245,45,3	duplicate(Girl_louyang)	Girl#0lou	4_F_CHNDRESS1
 
 // cities/moscovia.txt
 //============================================================
-alberta,245,66,4	duplicate(PR_Officer_moscovia)	Moscovia P.R. Officer#1	960
+alberta,245,66,4	duplicate(PR_Officer_moscovia)	Moscovia P.R. Officer#1	4_F_RUSWOMAN2
 
 // quests/quests_alberta.txt
 //============================================================
-alberta,247,122,4	duplicate(Sailor_alberta)	Sailor#tur	709
-alberta,248,89,4	duplicate(Turtle_Scholar_alberta)	Turtle Island Scholar	121
+alberta,247,122,4	duplicate(Sailor_alberta)	Sailor#tur	4_M_SEAMAN
+alberta,248,89,4	duplicate(Turtle_Scholar_alberta)	Turtle Island Scholar	2_M_MOLGENSTEIN
 
 // quests/skills/merchant_skills.txt
 //============================================================
-alberta,232,106,6	duplicate(Gershaun_alberta)	Gershaun	57
+alberta,232,106,6	duplicate(Gershaun_alberta)	Gershaun	1_M_LIBRARYMASTER
diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt
index 950f19abd..dfd4d3114 100644
--- a/npc/pre-re/cities/izlude.txt
+++ b/npc/pre-re/cities/izlude.txt
@@ -1,28 +1,22 @@
-//===== Hercules Script ======================================= 
+//===== Hercules Script =======================================
 //= Izlude Town Pre-Renewal
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Daegaladh
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Compatible With: ===================================== 
-//= Hercules GIT
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
 //= Izlude town NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
-//= 1.1 Added bullet NPC duplicates. [Euphy]
-//= 1.2 Added Dorian duplicate [Streusel]
 //============================================================
 
-izlude,201,181,2	duplicate(Sailor_izlude)	Sailor#izlude	100
-izlude,55,74,2	duplicate(Bonne_izlude)	Bonne#izlude	90
-izlude,135,78,2	duplicate(Charfri_izlude)	Charfri#izlude	91
-izlude,119,121,2	duplicate(Cuskoal_izlude)	Cuskoal#izlude	124
-izlude,150,118,2	duplicate(Dega_izlude)	Dega#izlude	84
-izlude,150,143,2	duplicate(Kylick_izlude)	Kylick#izlude	97
-izlude,56,126,2	duplicate(Red_izlude)	Red#izlude	85
-izlude,58,126,2	duplicate(Cebalis_izlude)	Cebalis#izlude	98
-izlude,124,178,2	duplicate(Soldier_izlude)	Soldier#izlude	105
-izlude,171,133,3	duplicate(bdt)	Bullet Dealer Tony#iz	86
-izlude,171,127,3	duplicate(mdk)	Magazine Dealer Kenny	83
-izlude_in,110,64,3	duplicate(Dorian)	Dorian#izlude	878,2,2,{
\ No newline at end of file
+izlude,201,181,2	duplicate(Sailor_izlude)	Sailor#izlude	4W_SAILOR
+izlude,55,74,2	duplicate(Bonne_izlude)	Bonne#izlude	4_F_01
+izlude,135,78,2	duplicate(Charfri_izlude)	Charfri#izlude	4_F_02
+izlude,119,121,2	duplicate(Cuskoal_izlude)	Cuskoal#izlude	4_F_TELEPORTER
+izlude,150,118,2	duplicate(Dega_izlude)	Dega#izlude	4_M_02
+izlude,150,143,2	duplicate(Kylick_izlude)	Kylick#izlude	4W_M_01
+izlude,56,126,2	duplicate(Red_izlude)	Red#izlude	4_M_03
+izlude,58,126,2	duplicate(Cebalis_izlude)	Cebalis#izlude	4W_M_02
+izlude,124,178,2	duplicate(Soldier_izlude)	Soldier#izlude	8W_SOLDIER
diff --git a/npc/pre-re/cities/jawaii.txt b/npc/pre-re/cities/jawaii.txt
index 1f2d0fb6a..52527e372 100644
--- a/npc/pre-re/cities/jawaii.txt
+++ b/npc/pre-re/cities/jawaii.txt
@@ -1,15 +1,14 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Jawaii Town Pre-Renewal
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Daegaladh
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
+//= [Official Conversion]
 //= Jawaii town NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //============================================================
 
-izlude,171,185,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Izlude	71
+izlude,171,185,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Izlude	1_F_LIBRARYGIRL
diff --git a/npc/pre-re/cities/yuno.txt b/npc/pre-re/cities/yuno.txt
new file mode 100644
index 000000000..db9617882
--- /dev/null
+++ b/npc/pre-re/cities/yuno.txt
@@ -0,0 +1,20 @@
+//===== Hercules Script ======================================
+//= Juno City
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= NPCs for the City of Juno
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+yuno,150,283,4	duplicate(JunoSoldier1)	Juno Soldier#juno	8W_SOLDIER
+yuno,165,283,4	duplicate(JunoSoldier2)	Juno Soldier#2juno	8W_SOLDIER
+yuno,227,292,4	duplicate(JunoSoldier3)	Juno Soldier#3juno	8W_SOLDIER
+yuno,165,228,4	duplicate(JunoSoldier4)	Juno Soldier#4juno	8W_SOLDIER
+yuno,150,228,4	duplicate(JunoSoldier5)	Juno Soldier#5juno	8W_SOLDIER
+yuno,334,182,4	duplicate(JunoSoldier6)	Juno Soldier#6juno	8W_SOLDIER
+yuno,263,320,4	duplicate(JunoSoldier7)	Juno Soldier#7juno	8W_SOLDIER
diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt
index c08894f52..f4a0d12ce 100644
--- a/npc/pre-re/guides/guides_alberta.txt
+++ b/npc/pre-re/guides/guides_alberta.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Alberta Guides
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.5a
-//===== Compatible With: =====================================
-//= rAthena  SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Alberta
@@ -21,7 +19,7 @@
 //	-Thanks to $ephiroth.
 //============================================================
 
-alberta,23,238,4	script	Guide#alb::AlbGuide	105,{
+alberta,23,238,4	script	Guide#alb::AlbGuide	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Alberta Guide]";
 	mes "Welcome to Alberta,";
@@ -156,4 +154,4 @@ alberta,23,238,4	script	Guide#alb::AlbGuide	105,{
 	end;
 }
 
-alberta,120,60,3	duplicate(AlbGuide)	Guide#2alb	105
\ No newline at end of file
+alberta,120,60,3	duplicate(AlbGuide)	Guide#2alb	8W_SOLDIER
diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt
index ba8fd1636..6abac6474 100644
--- a/npc/pre-re/guides/guides_aldebaran.txt
+++ b/npc/pre-re/guides/guides_aldebaran.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Al De Baran Guides
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official conversion]
 //= Guides for the City of Al De Baran
@@ -21,7 +19,7 @@
 //= 1.7 Fixed viewpoint coordinates [Playtester]
 //============================================================
 
-aldebaran,139,63,4	script	Soldier#alde	105,{
+aldebaran,139,63,4	script	Soldier#alde	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Al De Baran Guard]";
 	mes "I'm just an ordinary guard";
@@ -56,7 +54,7 @@ aldebaran,139,63,4	script	Soldier#alde	105,{
 	end;
 }
 
-aldebaran,133,108,4	script	Soldier#2alde	105,{
+aldebaran,133,108,4	script	Soldier#2alde	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Al De Baran Guard]";
 	mes "I'm just an";
diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt
index 100eb9c6a..85bd79047 100644
--- a/npc/pre-re/guides/guides_amatsu.txt
+++ b/npc/pre-re/guides/guides_amatsu.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Amatsu Guides
 //===== By: ==================================================
 //= MasterOfMuppets; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Amatsu
@@ -15,7 +13,7 @@
 //= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-amatsu,207,89,3	script	Amatsu Guide#ama	758,{
+amatsu,207,89,3	script	Amatsu Guide#ama	4_F_JPN,{
 	mes "[Amachang]";
 	mes "Welcome to Amatsu,";
 	mes "the town of kind towners";
@@ -69,7 +67,7 @@ amatsu,207,89,3	script	Amatsu Guide#ama	758,{
 	}
 }
 	
-amatsu,251,283,4	script	Guide Man#2ama	767,{
+amatsu,251,283,4	script	Guide Man#2ama	8_M_JPNSOLDIER,{
 	mes "[Guide Man]";
 	mes "Welcome, tourist from Rune-Midgard.";
 	mes "I'm the guide of";
diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt
index d153cf8d3..d13aa93e9 100644
--- a/npc/pre-re/guides/guides_ayothaya.txt
+++ b/npc/pre-re/guides/guides_ayothaya.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Ayothaya Guides
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Ayotaya
@@ -13,7 +11,7 @@
 //= 1.0 First version [L0ne_W0lf]
 //============================================================
 
-ayothaya,203,169,3	script	Noi#ayo	839,{
+ayothaya,203,169,3	script	Noi#ayo	4_F_THAIGIRL,{
 	mes "[Noi]";
 	mes "Welcome to Ayotaya.";
 	mes "Our beautiful village is built";
diff --git a/npc/pre-re/guides/guides_comodo.txt b/npc/pre-re/guides/guides_comodo.txt
index 2cebf8740..de803a9c5 100644
--- a/npc/pre-re/guides/guides_comodo.txt
+++ b/npc/pre-re/guides/guides_comodo.txt
@@ -1,32 +1,31 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Comodo Guides
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Comodo
 //===== Additional Comments: =================================
-//= Fully working v1.1 Now using duplicate command.
+//= Fully working
+//= 1.1 Now using duplicate command.
 //= 1.2 Optimized, updated common guide names [Lupus]
 //= 1.3 Updated the guide according to how it is on iRO, thanks
-//=	to Muad_Dib [MasterOfMuppets]
-//= 1.4	Removed 3 guides, and converted to use functions.
+//=     to Muad_Dib [MasterOfMuppets]
+//= 1.4 Removed 3 guides, and converted to use functions.
 //= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-comodo,322,178,4	script	Comodo Guide#cmd::CmdGuide	700,{
+comodo,322,178,4	script	Comodo Guide#cmd::CmdGuide	8_F_GIRL,{
 	callfunc "F_CmdGuide","Native Kokomo";
 }
 
-comodo,176,350,4	script	Comodo Guide#2cmd	700,{
+comodo,176,350,4	script	Comodo Guide#2cmd	8_F_GIRL,{
 	callfunc "F_CmdGuide","Native Nutcoco";
 }
 
-comodo,37,219,4	script	Guide#2cmd	700,{
+comodo,37,219,4	script	Guide#2cmd	8_F_GIRL,{
 	callfunc "F_CmdGuide","Native Papaya";
 }
 
diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt
index c73b37b74..9eefe2535 100644
--- a/npc/pre-re/guides/guides_einbroch.txt
+++ b/npc/pre-re/guides/guides_einbroch.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Einbroch Guides
 //===== By: ==================================================
 //= Muad_dib; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Einbroch
@@ -18,7 +16,7 @@
 //= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-einbroch,72,202,4	script	Guide#ein::EinGuide	852,{
+einbroch,72,202,4	script	Guide#ein::EinGuide	4_M_EIN_SOLDIER,{
 	cutin "ein_soldier",2;
 	mes "[Einbroch Guide]";
 	mes "Welcome";
@@ -203,10 +201,10 @@ einbroch,72,202,4	script	Guide#ein::EinGuide	852,{
 	end;
 }
 
-einbroch,155,43,4	duplicate(EinGuide)	Guide#2ein	852
-einbroch,162,317,4	duplicate(EinGuide)	Guide#3ein	852
+einbroch,155,43,4	duplicate(EinGuide)	Guide#2ein	4_M_EIN_SOLDIER
+einbroch,162,317,4	duplicate(EinGuide)	Guide#3ein	4_M_EIN_SOLDIER
 
-einbech,67,37,4	script	Guide#4ein::EinGuide2	852,{
+einbech,67,37,4	script	Guide#4ein::EinGuide2	4_M_EIN_SOLDIER,{
 	cutin "ein_soldier",2;
 	mes "[Einbech Guide]";
 	mes "Welcome to Einbech,";
@@ -348,4 +346,4 @@ einbech,67,37,4	script	Guide#4ein::EinGuide2	852,{
 	end;
 }
 
-einbech,48,214,4	duplicate(EinGuide2)	Guide#5ein	852
+einbech,48,214,4	duplicate(EinGuide2)	Guide#5ein	4_M_EIN_SOLDIER
diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt
index 28e7232c4..46d7e9007 100644
--- a/npc/pre-re/guides/guides_geffen.txt
+++ b/npc/pre-re/guides/guides_geffen.txt
@@ -1,26 +1,24 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Geffen Guides
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.4a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official COnversion]
 //= Guides for the City of Geffen
 //===== Additional Comments: =================================
 //= Fully working.  Added a guide at every exit.
-//= v1.1 Now using duplicate command.
+//= 1.1 Now using duplicate command.
 //= 1.2 Optimized, updated common guide names [Lupus]
 //= 1.2a Small note that the BS guild moved to Einbroch [Poki#3]
 //= 1.3 Removed Duplicates [Silent]
 //= 1.4a Rescripted to official 10.3 standards. [L0ne_W0lf]
 //= 1.4 Fixed some errors with the loop[Samuray22]
-//	-Thanks to $ephiroth.
+//=     Thanks to $ephiroth.
 //============================================================
 
-geffen,203,116,0	script	Guide#gef::GefGuide	705,{
+geffen,203,116,0	script	Guide#gef::GefGuide	4_M_GEF_SOLDIER,{
 	cutin "gef_soldier",2;
 	mes "[Geffen Guide]";
 	mes "Welcome to Geffen,";
@@ -171,4 +169,4 @@ geffen,203,116,0	script	Guide#gef::GefGuide	705,{
 	end;
 }
 
-geffen,118,62,0	duplicate(GefGuide)	Guide#2gef	705
+geffen,118,62,0	duplicate(GefGuide)	Guide#2gef	4_M_GEF_SOLDIER
diff --git a/npc/pre-re/guides/guides_gonryun.txt b/npc/pre-re/guides/guides_gonryun.txt
index 590bf7bd4..de9b2d599 100644
--- a/npc/pre-re/guides/guides_gonryun.txt
+++ b/npc/pre-re/guides/guides_gonryun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Kunlun Guides
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official COnversion]
 //= Guides for the City of Kunlun
@@ -13,7 +11,7 @@
 //= 1.0 First version [L0ne_W0lf]
 //============================================================
 
-gonryun,163,60,4	script	Kunlun Guide#gon	780,{
+gonryun,163,60,4	script	Kunlun Guide#gon	8_M_TWSOLDIER,{
 	mes "[He Yuen Zhe]";
 	mes "Ni Hao!";
 	mes "Welcome to Kunlun~";
diff --git a/npc/pre-re/guides/guides_hugel.txt b/npc/pre-re/guides/guides_hugel.txt
index 27336fcaa..b8a9711b1 100644
--- a/npc/pre-re/guides/guides_hugel.txt
+++ b/npc/pre-re/guides/guides_hugel.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Hugel Guides
 //===== By: ==================================================
 //= erKURITA; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official COnversion]
 //= Guides for the City of Hugel.
@@ -15,7 +13,7 @@
 //= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-hugel,98,56,3	script	Hugel Guide Granny#huge	863,0,0,{
+hugel,98,56,3	script	Hugel Guide Granny#huge	4_F_LGTGRAND,0,0,{
 	mes "[Hugel Guide Granny]";
 	mes "Oh, hello~ you are one energetic adventurer.";
 	mes "Welcome to Hugel. I was honored to guide you to this beautiful village.";
diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt
index df214fb67..ef84be488 100644
--- a/npc/pre-re/guides/guides_izlude.txt
+++ b/npc/pre-re/guides/guides_izlude.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Izlude Guides
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.5a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Izlude
@@ -19,7 +17,7 @@
 //	-Thanks to $ephiroth.
 //============================================================
 
-izlude,121,87,6	script	Guide#iz	105,{
+izlude,121,87,6	script	Guide#iz	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Izlude Guide]";
 	mes "Welcome to Izlude,";
diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt
index d8c08b31e..c1a847717 100644
--- a/npc/pre-re/guides/guides_juno.txt
+++ b/npc/pre-re/guides/guides_juno.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yuno Guides
 //===== By: ==================================================
 //= KitsuneStarwind, usul, kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Juno
@@ -21,7 +19,7 @@
 //= 1.7 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-yuno,153,47,4	script	Juno Guide#yuno	700,{
+yuno,153,47,4	script	Juno Guide#yuno	8_F_GIRL,{
 	mes "[Ms. Yoon]";
 	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
 	mes "the city of Juno!";
diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt
index c9fb40b5b..b194c546c 100644
--- a/npc/pre-re/guides/guides_lighthalzen.txt
+++ b/npc/pre-re/guides/guides_lighthalzen.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lighthalzen Guides
 //===== By: ==================================================
 //= MasterOfMuppets; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Lighthalzen
@@ -15,7 +13,7 @@
 //= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	852,{
+lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	4_M_EIN_SOLDIER,{
 	cutin "ein_soldier",2;
 	mes "[Lighthalzen Guide]";
 	mes "Welcome to Lighthalzen,";
@@ -80,7 +78,7 @@ lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	852,{
 					mes "activity, or if you have any";
 					mes "problems whatsoever.";
 					if (.@compass_check)
-						viewpoint 1,236,276,4,0x99FFFFF;
+						viewpoint 1,236,276,4,0x99FFFF;
 					break;
 				case 4:
 					mes "[Lighthalzen Guide]";
@@ -220,8 +218,8 @@ lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	852,{
 	end;
 }
 
-lighthalzen,220,311,3	duplicate(LhzGuide)	Guide#2lhz	852
+lighthalzen,220,311,3	duplicate(LhzGuide)	Guide#2lhz	4_M_EIN_SOLDIER
 
-lighthalzen,154,100,5	duplicate(LhzGuide)	Guide#3lhz	852
+lighthalzen,154,100,5	duplicate(LhzGuide)	Guide#3lhz	4_M_EIN_SOLDIER
 
-lighthalzen,307,224,3	duplicate(LhzGuide)	Guide#4lhz	852
+lighthalzen,307,224,3	duplicate(LhzGuide)	Guide#4lhz	4_M_EIN_SOLDIER
diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt
index 52a87ee32..8b5b14c8b 100644
--- a/npc/pre-re/guides/guides_louyang.txt
+++ b/npc/pre-re/guides/guides_louyang.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Louyang Guides
 //===== By: ==================================================
 //= jAthena/Tsuyuki; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Guides for the City of Louyang
 //===== Additional Comments: =================================
@@ -15,7 +13,7 @@
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
-louyang,213,213,3	script	Soldier#BA::LouGuide	825,{
+louyang,213,213,3	script	Soldier#BA::LouGuide	4_M_CHNSOLDIER,{
 	mes "[Soldier]";
 	mes "Welcome to Louyang,";
 	mes "a city with a long";
@@ -125,9 +123,9 @@ louyang,213,213,3	script	Soldier#BA::LouGuide	825,{
 	close;
 }
 
-louyang,160,175,3	duplicate(LouGuide)	Soldier#BB	825
+louyang,160,175,3	duplicate(LouGuide)	Soldier#BB	4_M_CHNSOLDIER
 
-louyang,224,104,3	script	Representative#lou	818,{
+louyang,224,104,3	script	Representative#lou	4_F_CHNWOMAN,{
 	mes "[Representative]";
 	mes "Welcome to Louyang,";
 	mes "an ancient land with";
diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt
index f0b5b343b..d4b136094 100644
--- a/npc/pre-re/guides/guides_morroc.txt
+++ b/npc/pre-re/guides/guides_morroc.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Morroc Guides
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.4a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Morroc
@@ -18,7 +16,7 @@
 //	-Thanks to $ephiroth.
 //============================================================
 
-morocc,153,286,6	script	Guide#moc::MocGuide	707,{
+morocc,153,286,6	script	Guide#moc::MocGuide	4_M_MOC_SOLDIER,{
 	cutin "moc_soldier",2;
 	mes "[Morroc Guide]";
 	mes "Welcome to Morroc,";
@@ -161,4 +159,4 @@ morocc,153,286,6	script	Guide#moc::MocGuide	707,{
 	end;
 }
 
-morocc,54,97,0	duplicate(MocGuide)	Guide#2moc	707
+morocc,54,97,0	duplicate(MocGuide)	Guide#2moc	4_M_MOC_SOLDIER
diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt
index 8986c7502..49975358f 100644
--- a/npc/pre-re/guides/guides_moscovia.txt
+++ b/npc/pre-re/guides/guides_moscovia.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Moscovia Guides
 //===== By: ==================================================
 //= Kisuka
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the town of Moscovia.
@@ -13,7 +11,7 @@
 //= 1.0 First Version. [Kisuka]
 //============================================================
 
-moscovia,161,76,4	script	Moscovia Guide#mosk	959,{
+moscovia,161,76,4	script	Moscovia Guide#mosk	4_F_RUSWOMAN1,{
 	mes "[Moscovia Guide]";
 	mes "Welcome to Moscovia";
 	mes "Here is the paradise spreading on";
@@ -89,4 +87,4 @@ moscovia,161,76,4	script	Moscovia Guide#mosk	959,{
 			mes "Take care.";
 			close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt
index 9a68d10d6..4c7a9b586 100644
--- a/npc/pre-re/guides/guides_niflheim.txt
+++ b/npc/pre-re/guides/guides_niflheim.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Niflheim Guide
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Niflheim
@@ -15,7 +13,7 @@
 //= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-niflheim,107,156,6	script	Roaming Man#nif	798,{
+niflheim,107,156,6	script	Roaming Man#nif	4_M_NFMAN,{
 	mes "[Ricael]";
 	mes "You must be lost...";
 	mes "Why would anyone come";
@@ -68,7 +66,7 @@ niflheim,107,156,6	script	Roaming Man#nif	798,{
 			mes "special once I realized no";
 			mes "Potion can ease the pain I feel.";
 			mes "...I wish I was in prison.";
-			Emotion e_wah;
+			emotion e_wah;
 			viewpoint 1,217,196,3,0xCE6300;
 			break;
 		case 3:
@@ -84,7 +82,7 @@ niflheim,107,156,6	script	Roaming Man#nif	798,{
 			mes "the monsters here will just";
 			mes "make them angrier. You may as";
 			mes "well let them eat you.";
-			Emotion e_wah;
+			emotion e_wah;
 			viewpoint 1,216,171,4,0x55FF33;
 			break;
 		case 4:
diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt
index 11e7cc57b..9f8e4a776 100644
--- a/npc/pre-re/guides/guides_payon.txt
+++ b/npc/pre-re/guides/guides_payon.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Payon Guides
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official COnversion]
 //= Guides for the City of Payon
@@ -16,12 +14,12 @@
 //=     to Muad_Dib
 //= 1.3a Fixed some problems with duplicated text, thanks to muad_dib [MasterOfMuppets]
 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
-//= 1.4a Tixed Archer Village Guide [Lupus] 
+//= 1.4a Tixed Archer Village Guide [Lupus]
 //= 1.5 Removed Duplicates [Silent]
 //= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-payon,162,67,4	script	Guide#pay	708,{
+payon,162,67,4	script	Guide#pay	4_M_PAY_SOLDIER,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
 	mes "Welcome to the";
@@ -190,7 +188,7 @@ payon,162,67,4	script	Guide#pay	708,{
 	end;
 }
 
-pay_arche,85,30,2	script	Guide#2pay	708,{
+pay_arche,85,30,2	script	Guide#2pay	4_M_PAY_SOLDIER,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
 	mes "Welcome to the";
@@ -246,7 +244,7 @@ pay_arche,85,30,2	script	Guide#2pay	708,{
 				case 4:
 					mes "[Payon Guide]";
 					mes "If you'd like to erase the marks on the mini-map, select menu, 'Wipe all indicators on the mini-map'.";
-					set @loop2,0;
+					set .@loop2,0;
 					break;
 				}
 			}
diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt
index 8a3f87f61..7a97a764c 100644
--- a/npc/pre-re/guides/guides_prontera.txt
+++ b/npc/pre-re/guides/guides_prontera.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Prontera Guides
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.6a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the City of Prontera
@@ -23,7 +21,7 @@
 //	-Thanks to Brainstorm.
 //============================================================
 
-prontera,154,187,4	script	Guide#prt::PrtGuide	105,{
+prontera,154,187,4	script	Guide#prt::PrtGuide	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Prontera Guide]";
 	mes "Welcome to Prontera,";
@@ -233,10 +231,10 @@ prontera,154,187,4	script	Guide#prt::PrtGuide	105,{
 	end;
 }
 
-prontera,282,208,2	duplicate(PrtGuide)	East Gate-Guide	105
+prontera,282,208,2	duplicate(PrtGuide)	East Gate-Guide	8W_SOLDIER
 
-prontera,29,200,6	duplicate(PrtGuide)	West Gate-Guide	105
+prontera,29,200,6	duplicate(PrtGuide)	West Gate-Guide	8W_SOLDIER
 
-prontera,160,29,0	duplicate(PrtGuide)	South Gate-Guide	105
+prontera,160,29,0	duplicate(PrtGuide)	South Gate-Guide	8W_SOLDIER
 
-prontera,151,330,4	duplicate(PrtGuide)	North Gate-Guide	105
+prontera,151,330,4	duplicate(PrtGuide)	North Gate-Guide	8W_SOLDIER
diff --git a/npc/pre-re/guides/guides_rachel.txt b/npc/pre-re/guides/guides_rachel.txt
index d9fc74475..2380a465a 100644
--- a/npc/pre-re/guides/guides_rachel.txt
+++ b/npc/pre-re/guides/guides_rachel.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Rachel Guide
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2b
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Rachel City guide
@@ -19,7 +17,7 @@
 //= 1.2b Deleted a unnecessary "end". [Samuray22]
 //============================================================
 
-rachel,138,146,5	script	Rachel Guide	934,{
+rachel,138,146,5	script	Rachel Guide	4_M_RASWORD,{
 	mes "[Rachel Guide]";
 	mes "Welcome to the capital of";
 	mes "Arunafeltz, Rachel where a warm";
diff --git a/npc/pre-re/guides/guides_umbala.txt b/npc/pre-re/guides/guides_umbala.txt
index aab2f362d..23ce98c29 100644
--- a/npc/pre-re/guides/guides_umbala.txt
+++ b/npc/pre-re/guides/guides_umbala.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Umbala Guides
 //===== By: ==================================================
 //= Dizzy, Translated by Celest; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guide for the City of Umbala
@@ -17,7 +15,7 @@
 //= 1.6 Corrected activating ontouch. [L0ne_W0lf]
 //============================================================
 
-umbala,128,94,4	script	Adventurer#um	702,{
+umbala,128,94,4	script	Adventurer#um	4_F_GON,{
 	mes "[Adventurer]";
 	mes "This is a very strange place...";
 	mes "It's underdeveloped, and there";
diff --git a/npc/pre-re/guides/guides_veins.txt b/npc/pre-re/guides/guides_veins.txt
index 92c5d9558..99df4106e 100644
--- a/npc/pre-re/guides/guides_veins.txt
+++ b/npc/pre-re/guides/guides_veins.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Veins Guide
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Veins City guide
@@ -15,7 +13,7 @@
 //= 1.2 Fixed a few small typos. [L0ne_W0lf]
 //============================================================
 
-veins,210,345,5	script	Veins Guide#1::ve_guide	934,{
+veins,210,345,5	script	Veins Guide#1::ve_guide	4_M_RASWORD,{
 	mes "[Veins Guide]";
 	mes "Desert City Veins welcomes adventurers seeking shelter from harsh sandstorms.";
 	mes "If this is the first time for you to use the guide services, why don't you check the...";
@@ -126,4 +124,4 @@ veins,210,345,5	script	Veins Guide#1::ve_guide	934,{
 	close;
 }
 
-veins,189,101,5	duplicate(ve_guide)	Veins Guide#2	934
+veins,189,101,5	duplicate(ve_guide)	Veins Guide#2	4_M_RASWORD
diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index 7b46a6029..2faef7c87 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Acolyte Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Acolyte classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Fully working.
 //= 1.1 Added function calls for Priest Quest.
 //= 1.2 Fixed Marthilda, Yosuke bugs. [Lupus]
@@ -17,8 +17,8 @@
 //= 1.5 Now saves/restores all quest skills [Lupus]
 //= 1.6 Merged back JFunc [Lupus]
 //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_ToHigh"
-//=	Proper dialog for Priest job quest is unused (for now.)
+//=     No longer uses function "F_ToHigh"
+//=     Proper dialog for Priest job quest is unused (for now.)
 //= 1.7a Functions now make use of proper priest quest dialog [L0ne_W0lf]
 //= 1.8 Removed an Unnecessary "set job_acolyte_q,0;" [Samuray22]
 //= 1.8a More bug fixes care of Crashy. [L0ne_W0lf]
@@ -26,9 +26,9 @@
 //= 2.0 Fixed High Acolytesnot being given holy light. [L0ne_W0lf]
 //= 2.1 Added Quest Log commands. [L0ne_W0lf]
 //= 2.2 Fixed an issue with completequest by adding checkquest. [Kisuka]
-//============================================================ 
+//============================================================
 
-prt_church,184,41,4	script	Cleric#aco	60,{
+prt_church,184,41,4	script	Cleric#aco	1_M_PASTOR,{
 	if (Upper == 1) {
 		if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) {
 			if (Class == Job_Novice_High) {
@@ -245,7 +245,7 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 	}
 }
 
-prt_fild03,365,255,2	script	Ascetic#aco	89,{
+prt_fild03,365,255,2	script	Ascetic#aco	4_M_ORIENT02,{
 	mes "[Father Rubalkabara]";
 	if (BaseJob == Job_Novice) {
 		if (job_acolyte_q == 6) {
@@ -322,7 +322,7 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 	}
 }
 
-moc_fild07,41,355,4	script	Ascetic#2aco	95,{
+moc_fild07,41,355,4	script	Ascetic#2aco	4_F_SISTER,{
 	mes "[Mother Mathilda]";
 	if (BaseJob == Job_Novice) {
 		if (job_acolyte_q == 7) {
@@ -391,7 +391,7 @@ moc_fild07,41,355,4	script	Ascetic#2aco	95,{
 	}
 }
 
-prt_fild00,208,218,6	script	Ascetic#3aco	98,{
+prt_fild00,208,218,6	script	Ascetic#3aco	4W_M_02,{
 	mes "[Father Yosuke]";
 	if (BaseJob == Job_Novice) {
 		if (job_acolyte_q == 8) {
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index 5018bc48f..710580054 100644
--- a/npc/pre-re/jobs/1-1/archer.txt
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Archer Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.9
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Archer classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Fully working.
 //= 1.1 Added instant job change for High Novice [Lupus]
 //= 1.3 Added Baby Class support [Lupus]
@@ -15,14 +15,14 @@
 //= 1.5 Now saves/restores all quest skills [Lupus]
 //= 1.6 Merged back JFunc [Lupus]
 //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	Arrow reward is now equal to the type sof trunks brought.
-//=	No longer uses function "F_ToHigh"
+//=     Arrow reward is now equal to the type sof trunks brought.
+//=     No longer uses function "F_ToHigh"
 //= 1.7a Fixed minor dialogue bug at Grade==25 [Lupus]
 //= 1.8 Fixed mistake in condition check. [L0ne_W0lf]
 //= 1.9 Added Quest Log commands. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-payon_in02,64,71,4	script	Archer Guildsman#archer	85,{
+payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 	if (Upper == 1) {
 		if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
 			mes "[Archer Guildsman]";
@@ -50,7 +50,7 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	85,{
 			mes "I know you'll make a great Archer...";
 			next;
 			skill 143,0,0;
-			jobchange Job_Archer_high;
+			jobchange Job_Archer_High;
 			skill 147,1,0;
 			skill 148,1,0;
 			mes "[Archer Guildsman]";
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 5652260f2..2e03ce410 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Mage Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.9
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.0
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Mage classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Fully working.
 //= 1.1 Fixed input ingridients bug [Lupus]
 //= 1.2 Added instant job change for High Novice [Lupus]
@@ -18,13 +16,14 @@
 //= 1.5 Now saves/restores all quest skills [Lupus]
 //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]
 //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_ToHigh"
+//=     No longer uses function "F_ToHigh"
 //= 1.7a Fixed a "If" in the quest. (bugreport:489) [Samuray22]
 //= 1.8 Added Quest Log commands. [L0ne_W0lf]
 //= 1.9 Fixed an issue with completequest by adding checkquest. [Kisuka]
-//============================================================ 
+//= 2.0 Moved "Dollshoi" and "Ponka-Hontas" NPCs. [Euphy]
+//============================================================
 
-geffen_in,164,124,4	script	Mage Guildsman	123,{
+geffen_in,164,124,4	script	Mage Guildsman	2_F_MAGICMASTER,{
 	if (Upper == 1) {
 		if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) {
 			if (Class == Job_Novice_High) {
@@ -86,7 +85,7 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 		}
 		if (job_magician_q == 0) {
 			mes "Wanna be a Mage, eh...?";
-			if (sex)
+			if (Sex)
 				mes "Hey, look at you! You're kinda cute~! Not my type though...";
 			else {
 				mes "Oooh, you're such a hot babe~!";
@@ -208,7 +207,7 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 		next;
 		callfunc "Job_Change",Job_Mage;
 		callfunc "F_ClearJobVar";
-		set Zeny,Zeny+50;
+		Zeny += 50;
 		if(checkquest(1005) != -1) {
 			completequest 1005;
 		}
@@ -231,7 +230,7 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 	case 2:
 		mes "[Mage Guildsman]";
 		mes "Wanna be a Mage, eh?";
-		if (sex)
+		if (Sex)
 			mes "For a cutie like you, I'd be happy to explain the requirements!";
 		else
 			mes "I'd be happy to explain the requirements for a pretty girl like you!";
@@ -286,7 +285,7 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 	}
 }
 
-geffen_in,164,112,4	script	Mixing Machine	111,{
+geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 	mes "[Mixing Machine]";
 	mes "This machine is the property of the Geffen Mage Guild and is used only for mixing solutions for magic purposes.";
 	next;
@@ -596,49 +595,14 @@ geffen_in,164,112,4	script	Mixing Machine	111,{
 	close;
 }
 
-pay_arche,122,100,0	script	Dollshoi	88,{
-	mes "[Mage Guildsman]";
-	mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube.";
-	next;
-	if (select("Alright, Deal.:Nah, forget it.") == 1) {
-		mes "[Mage Guildsman]";
-		if (Zeny < 50) {
-			mes "Hey! You don't have enough money to cover my 50 Zeny charge.";
-			close;
-		}
-		if (countitem(1092) == 0) {
-			mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube.";
-			close;
-		}
-		delitem 1092,1; //Empty_Cylinder
-		set zeny,zeny-50;
-		getitem 1089,1; //Payon_Potion
-	}
-	close;
-}
-
-moc_ruins,91,150,0	script	Ponka-Hontas	93,{
-	mes "[Mage Guildsman]";
-	mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Testtube.";
-	next;
-	if (select("Alright, Deal.:Nah, forget it.") == 1) {
-		mes "[Mage Guildsman]";
-		if (zeny < 50) {
-			mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee.";
-			close;
-		}
-		if (countitem(1092) == 0) {
-			mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me.";
-			close;
-		}
-		delitem 1092,1; //Empty_Cylinder
-		set zeny,zeny-50;
-		getitem 1088,1; //Morocc_Potion
-	}
-	close;
-}
+// The Morroc Solution and Payon Solution traders
+// are also used in the Sage skill quests, and have
+// been moved to npc/quests/mage_solution.txt.
+//
+// pay_arche,122,100,0	script	Dollshoi	4_M_ORIENT01,{}
+// moc_ruins,91,150,0	script	Ponka-Hontas	4_F_04,{}
 
-geffen_in,177,112,4	script	Bookshelf	111,{
+geffen_in,177,112,4	script	Bookshelf	HIDDEN_NPC,{
 	mes "[Guide Book]";
 	mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care.";
 	next;
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 93d502794..934dc0300 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Merchant Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Merchant classes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Fully working.
 //= 1.1 Added instant job change for High Novice [Lupus]
 //= 1.3 Added Baby Class support [Lupus]
@@ -20,7 +18,7 @@
 //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]
 //= 1.7 Updated to use Free Ticket for Kafra [Lupus]
 //= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_ToHigh"
+//=     No longer uses function "F_ToHigh"
 //= 1.9 Bugfixes, thanks to Barron-Monster. [L0ne_W0lf]
 //= 1.9a Added a missing next; (Barron-Monster) [L0ne_W0lf]
 //= 1.9b Typo. "nextl" -> "next;" (Barron-Monster) [L0ne_W0lf]
@@ -28,9 +26,9 @@
 //= 2.1 Fixed mistake in condition check. [L0ne_W0lf]
 //= 2.2 Added Quest Log commands. [L0ne_W0lf]
 //= 2.3 Fixed an issue with completequest by adding checkquest. [Kisuka]
-//============================================================ 
+//============================================================
 
-alberta_in,53,43,6	script	Merchant#mer	86,{
+alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 	if (Upper == 1) {
 		if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
 			mes "[Chief Mahnsoo]";
@@ -135,7 +133,7 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 					mes "Please return when you have earned the 500 zeny that you need to become a Merchant.";
 					close;
 				}
-				set zeny,zeny-500;
+				Zeny -= 500;
 				mes "Ah yes...!";
 				mes "Now your";
 				mes "membership";
@@ -171,7 +169,7 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 			mes "[Chief Mahnsoo]";
 			mes "*Ahem* Aaaaand let me give you a little bit of money for delivering that message to Blossom for me.";
 			mes "I hope you'll help me again next time~";
-			set zeny,zeny+200;
+			Zeny += 200;
 			set quest_alb_01,2;
 		}
 		else {
@@ -343,7 +341,7 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 					mes "[Chief Mahnsoo]";
 					if (Zeny >= 1000) {
 						set job_merchant_q,2;
-						set zeny,zeny-1000;
+						Zeny -= 1000;
 						mes "Alright~";
 						mes "That's 1,000 zeny.";
 						mes "Excellent, excellent.";
@@ -357,7 +355,7 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 					mes "[Chief Mahnsoo]";
 					if (Zeny >= 500) {
 						set job_merchant_q,1;
-						set zeny,zeny-500;
+						Zeny -= 500;
 						mes "Let's see...";
 						mes "That's 500 Zeny. Although I don't think splitting payment is a good idea for any Merchant, it's alright since you're still learning.";
 					}
@@ -511,7 +509,7 @@ S_GiveSerial:
 	return;
 }
 
-alberta_in,28,29,2	script	Merchant Guildsman#mer	83,{
+alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 	if (BaseJob == Job_Merchant) {
 		mes "[Union Staff Kay]";
 		mes "Heya pal.";
@@ -712,9 +710,9 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	83,{
 						mes "[Union Staff Kay]";
 						mes "Hey hey. That number's not valid! Enter a value from 1000000 to 5000000. got it?";
 						next;
-					}
-					else 
+					} else {
 						break;
+					}
 				}
 				mes "[Union Staff Kay]";
 				if (.@where_village == 1)
@@ -788,7 +786,7 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	83,{
 	}
 }
 
-morocc_in,140,102,4	script	Student#mer	86,{
+morocc_in,140,102,4	script	Student#mer	4_M_04,{
 	if ((job_merchant_q == 4) || (job_merchant_q == 3)) {
 		mes "[Dyer's Student]";
 		mes "You're from";
@@ -873,7 +871,7 @@ morocc_in,140,102,4	script	Student#mer	86,{
 	}
 }
 
-geffen_in,155,122,4	script	Guild Staff#mer	47,{
+geffen_in,155,122,4	script	Guild Staff#mer	1_M_01,{
 	if (job_merchant_q == 4 || job_merchant_q == 3) {
 		mes "[Guild Staff]";
 		mes "Ah, you must be with the Merchant Guild. Finally, my package has arrived! Alright...!";
@@ -954,7 +952,7 @@ geffen_in,155,122,4	script	Guild Staff#mer	47,{
 	}
 }
 
-prontera,248,42,0	script	Kafra Employee#mer	116,{
+prontera,248,42,0	script	Kafra Employee#mer	4_F_KAFRA2,{
 	cutin "kafra_02",2;
 	if (job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 2 || job_merchant_q2 == 1) {
 		mes "[Kafra Employee]";
@@ -1060,7 +1058,7 @@ prontera,248,42,0	script	Kafra Employee#mer	116,{
 				cutin "",255;
 				end;
 			}
-			set zeny,zeny-600;
+			Zeny -= 600;
 			set RESRVPTS, RESRVPTS + 37;
 			cutin "",255;
 			warp "izlude",94,103;
@@ -1072,7 +1070,7 @@ prontera,248,42,0	script	Kafra Employee#mer	116,{
 	}
 }
 
-//izlu2dun,106,58,4	script	Kafra Employee#mer	116,{
+//izlu2dun,106,58,4	script	Kafra Employee#mer	4_F_KAFRA2,{
 function	script	F_MercKafra	{
 	if ((job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 8 || job_merchant_q2 == 7)) {
 		mes "[Kafra Employee]";
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index 36ddc9d21..8b4a9f974 100644
--- a/npc/pre-re/jobs/1-1/swordman.txt
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Swordsman Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Swordman classes
 //= Uses Job_sword1 as opposed to sword_1-1 -> sword_3-1.
 //= EXPLOITABLE in a sense because while the sword_x-1 maps
 //= are marked as "inside" by the client, job_sword1 is not.
 //= giving players FREE camera rotation while doing the job quest.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Fully working.
 //= 1.1 Added instant job change for High Novice [Lupus]
 //= 1.3 Added Baby Class support [Lupus]
@@ -27,17 +25,17 @@
 //= 1.7 changed location from its clone to the original [Lupus]
 //= 1.7.1 Fixed warp on timeout [KarLaeda]
 //= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	Removed "green" traps, quest is no longer timed.
-//=	No longer uses function "F_ToHigh"
+//=     Removed "green" traps, quest is no longer timed.
+//=     No longer uses function "F_ToHigh"
 //= 1.9 Dialog is official, but the Script is now custom as far as maps go. [L0ne_W0lf]
 //= 1.9b Fixed usage of wrong jobchange func messing up baby classes [ultramage]
 //= 2.0 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
 //= 2.1 Fixed mistake in condition check. [L0ne_W0lf]
 //= 2.2 Warp portals dont end with ; [Yommy]
 //= 2.3 Added Quest Log commands. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-izlude_in,74,172,4	script	Swordman#swd_1	119,{
+izlude_in,74,172,4	script	Swordman#swd_1	2_M_SWORDMASTER,{
 	if (Upper == 1) {
 		if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
 			mes "[Swordman]";
@@ -203,7 +201,7 @@ izlude_in,74,172,4	script	Swordman#swd_1	119,{
 	}
 }
 
-izlude_in,62,170,6	script	Swordman#swd_2	85,{
+izlude_in,62,170,6	script	Swordman#swd_2	4_M_03,{
 	mes "[Swordman]";
 	if (BaseJob == Job_Swordman) {
 		mes "Sorry guy, but I can only allow Novices to enter the Test Hall.";
@@ -235,7 +233,7 @@ izlude_in,62,170,6	script	Swordman#swd_2	85,{
 	}
 }
 
-izlude_in,30,175,4	script	Swordman#swd_3	92,{
+izlude_in,30,175,4	script	Swordman#swd_3	4_F_03,{
 	mes "[Swordman]";
 	mes "I will tell you about the Test! Listen carefully, I won't repeat myself.";
 	next;
@@ -262,7 +260,7 @@ izlude_in,30,175,4	script	Swordman#swd_3	92,{
 	close;
 }
 
-izlude_in,30,163,0	script	Test Hall Staff#swd_1	105,{
+izlude_in,30,163,0	script	Test Hall Staff#swd_1	8W_SOLDIER,{
 	mes "[Test Hall Staff]";
 	if (BaseJob == Job_Swordman) {
 		mes "Hm? How did you get inside? You're not supposed to be in here, so please leave now.";
@@ -296,21 +294,21 @@ izlude_in,30,163,0	script	Test Hall Staff#swd_1	105,{
 }
 
 // Examination Courses NPCs
-//============================================================ 
+//============================================================
 // 1-1
-job_sword1,230,245,2	script	Medic#swd_1	105,{
+job_sword1,230,245,2	script	Medic#swd_1	8W_SOLDIER,{
 	callfunc "F_JobSwdMedic","1st";
 }
-job_sword1,230,242,2	script	Test Hall Staff#swd_2	105,{
+job_sword1,230,242,2	script	Test Hall Staff#swd_2	8W_SOLDIER,{
 	callfunc "F_JobSwdStaff",1;
 }
-job_sword1,230,207,2	script	Medic#2swd_2	105,{
+job_sword1,230,207,2	script	Medic#2swd_2	8W_SOLDIER,{
 	callfunc "F_JobSwdMedic","2nd";
 }
-job_sword1,230,204,2	script	Test Hall Staff#2swd_3	105,{
+job_sword1,230,204,2	script	Test Hall Staff#2swd_3	8W_SOLDIER,{
 	callfunc "F_JobSwdStaff",1;
 }
-job_sword1,223,167,2	script	Mae#swd_1_success	92,{
+job_sword1,223,167,2	script	Mae#swd_1_success	4_F_03,{
 	mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". You successfully passed the test.",bc_map;
 	set job_sword_q,4;
 	mes "[Mae]";
@@ -322,7 +320,7 @@ job_sword1,223,167,2	script	Mae#swd_1_success	92,{
 }
 
 // Examination Course Functions
-//============================================================ 
+//============================================================
 function	script	F_JobSwdMedic	{
 	percentheal 100,0;
 	mes "[Medic]";
@@ -366,37 +364,37 @@ OnTouch:
 }
 
 // Examination Course 1
-//============================================================ 
+//============================================================
 job_sword1,223,243,0	warp	checkp1-2#swd_1	1,1,job_sword1,11,206
 job_sword1,223,205,0	warp	checkp2-3#swd_1	1,1,job_sword1,11,168
 
-job_sword1,7,245,0	script	Test Hall Staff#swd_4	45,1,3,{
+job_sword1,7,245,0	script	Test Hall Staff#swd_4	WARPNPC,1,3,{
 	callfunc "F_JobSwdTestStaff",10,245;
 }
 
-job_sword1,8,207,0	script	Test Hall Staff#swd_5	45,1,6,{
+job_sword1,8,207,0	script	Test Hall Staff#swd_5	WARPNPC,1,6,{
 	callfunc "F_JobSwdTestStaff",11,207;
 }
 
-job_sword1,8,169,0	script	Test Hall Staff#swd_6	45,1,6,{
+job_sword1,8,169,0	script	Test Hall Staff#swd_6	WARPNPC,1,6,{
 	callfunc "F_JobSwdTestStaff",11,169;
 }
 
-job_sword1,192,244,0	script	Test Hall Staff#swd_7	45,1,3,{
+job_sword1,192,244,0	script	Test Hall Staff#swd_7	WARPNPC,1,3,{
 	callfunc "F_JobSwdTestStaff2","1st",215,244;
 }
 
-job_sword1,193,207,0	script	Test Hall Staff#swd_8	45,1,3,{
+job_sword1,193,207,0	script	Test Hall Staff#swd_8	WARPNPC,1,3,{
 	callfunc "F_JobSwdTestStaff2","2nd",215,205;
 	warp "job_sword1",215,205;
 }
 
-job_sword1,193,168,0	script	Test Hall Staff#swd_9	45,1,3,{
+job_sword1,193,168,0	script	Test Hall Staff#swd_9	WARPNPC,1,3,{
 	callfunc "F_JobSwdTestStaff2","3rd",215,167;
 }
 
 // Pitfalls (Set 1)
-//============================================================ 
+//============================================================
 job_sword1,65,117,0	warp	pitfall01-01	1,1,job_sword1,10,245
 job_sword1,98,27,0	warp	pitfall02-01	1,1,job_sword1,11,207
 job_sword1,161,27,0	warp	pitfall02-02	1,1,job_sword1,11,207
@@ -463,7 +461,7 @@ job_sword1,181,239,0	duplicate(SwdTrap1)	1_blank_14_c	-1,1,0
 job_sword1,193,245,0	warp	1_rest	1,3,job_sword1,215,244
 
 // Pitfalls (Set 2)
-//============================================================ 
+//============================================================
 job_sword1,56,212,0	script	2_blank_1_a::SwdTrap2	-1,40,0,{
 OnTouch:
 	switch(rand(1,5)) {
@@ -508,7 +506,7 @@ job_sword1,155,201,0	duplicate(SwdTrap2)	2_blank_9_a	-1,40,0
 job_sword1,181,201,0	duplicate(SwdTrap2)	2_blank_9_b	-1,2,0
 
 // Pitfalls (Set 3)
-//============================================================ 
+//============================================================
 job_sword1,17,174,0	script	3_blank_1_a::SwdTrap3	-1,2,0,{
 OnTouch:
 	switch(rand(1,5)) {
@@ -621,7 +619,7 @@ job_sword1,177,163,0	duplicate(SwdTrap3)	3_blank_30_b	-1,0,2
 job_sword1,181,163,0	duplicate(SwdTrap3)	3_blank_30_c	-1,2,0
 
 // Monsters (all three courses)
-//============================================================ 
+//============================================================
 job_sword1,0,0,0,0	monster	Chonchon	1183,20,0,0,0
 job_sword1,35,79,0,0	monster	Fabre	1184,3,60000,30000,0
 job_sword1,50,108,0,0	monster	Fabre	1184,3,60000,30000,0
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
index aa5c6a108..356809cdc 100644
--- a/npc/pre-re/jobs/1-1/thief.txt
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Thief Job Quest
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Job quest for Thief classes
@@ -14,15 +12,15 @@
 //= 1.1 Added instant job change for High Novice [Lupus]
 //= 1.3 Added Baby Class support [Lupus]
 //= 1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
-//= Fixed possible EXP abuse [Lupus]
+//=     Fixed possible EXP abuse [Lupus]
 //= 1.5 Now saves/restores all quest skills [Lupus]
 //= 1.6 Merged back JFunc [Lupus] 1.6a typos
 //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_ToHigh"
+//=     No longer uses function "F_ToHigh"
 //= 1.8 Added Quest Log commands. [L0ne_W0lf]
 //============================================================
 
-moc_prydb1,39,129,2	script	Thief Guide	69,{
+moc_prydb1,39,129,2	script	Thief Guide	1_F_04,{
 	if (Upper == 1) {
 		if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) {
 			if (Class == Job_Novice_High) {
@@ -52,7 +50,7 @@ moc_prydb1,39,129,2	script	Thief Guide	69,{
 			}
 			else {
 				mes "[Thief Guide]";
-				if (sex)
+				if (Sex)
 					mes "Hey, dude.";
 				else
 					mes "Hey, baby~";
@@ -61,7 +59,7 @@ moc_prydb1,39,129,2	script	Thief Guide	69,{
 		}
 		else {
 			mes "[Thief Guide]";
-			if (sex)
+			if (Sex)
 				mes "Hey, dude.";
 			else
 				mes "Hey, baby.";
@@ -348,7 +346,7 @@ moc_prydb1,39,129,2	script	Thief Guide	69,{
 	close;
 }
 
-moc_prydb1,42,133,2	script	Comrade	118,{
+moc_prydb1,42,133,2	script	Comrade	2_M_THIEFMASTER,{
 	if (BaseJob == Job_Thief) {
 		mes "[Brad]";
 		mes "We don't have any special events yet. Come some other time when there's news, alright?";
@@ -445,12 +443,12 @@ moc_prydb1,42,133,2	script	Comrade	118,{
 		next;
 		mes "[Brad]";
 		mes "Here is a small subsidy for a Newbie like you. Spend it whereever you want. Alright then, I'll see you around~";
-		set zeny,zeny+.@money_thief;
+		Zeny += .@money_thief;
 		close;
 	}
 }
 
-moc_ruins,141,125,3	script	Mr. Irrelevant	83,{
+moc_ruins,141,125,3	script	Mr. Irrelevant	4_M_01,{
 	if (BaseJob == Job_Thief) {
 		mes "[Mr. Irrelevant]";
 		mes "Ah, I see that you are now a Thief. I always knew you'd join us.";
diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt
index c88795463..a57bf5190 100644
--- a/npc/pre-re/jobs/novice/novice.txt
+++ b/npc/pre-re/jobs/novice/novice.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Ep 10+ Novice Training Grounds
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Dr.Evil & MasterOfMuppets
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN 3422+(Requires jA Script System)
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Novice Training Grounds
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.7D Added confirm character name thing on receptionist. [Kisuka]
 //= 1.8 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //=     NPCs are not backwards compatable, and will remove
@@ -23,24 +21,24 @@
 //= 2.3 Added fix to Hanson from GM-windsor- and Saithis. [L0ne_W0lf]
 //= 2.3a Correct a wrong variable name. (bugreport:2293) [Samuray22]
 //= 2.4 Corrected an error in Hanson. (bugreport:2374) [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // Bulletin Board
-new_1-1,66,114,4	script	Bulletin Board#nv	111,{
+new_1-1,66,114,4	script	Bulletin Board#nv	HIDDEN_NPC,{
 	mes "^FF0000=================================^000000";
 	mes "^FF0000 ^000000 ^E40CAA[Welcome]^CC0000 to ^FF9000Novice^7FFF00 Training ^00FF00Grounds ^E40CAA[Welcome]^FF0000^000000";
 	mes "^FF0000=================================^000000";
 	close;
 }
 
-new_1-1,144,116,2	script	Guard#nv1	105,{
+new_1-1,144,116,2	script	Guard#nv1	8W_SOLDIER,{
 	mes "[Training Grounds Guard]";
 	mes "Welcome to the Training Grounds.";
 	mes "You are now in the outer court yard. Please go inside the castle to begin your training.";
 	close;
 }
 
-new_1-1,144,107,2	script	Guard#nv2	105,{
+new_1-1,144,107,2	script	Guard#nv2	8W_SOLDIER,{
 	mes "[Training Grounds Guard]";
 	if(rand(2)) {
 		mes "Come in!";
@@ -62,7 +60,7 @@ new_1-1,144,107,2	script	Guard#nv2	105,{
 }
 
 // Receptionist
-new_1-2,100,29,4	script	Receptionist#nv1	86,{
+new_1-2,100,29,4	script	Receptionist#nv1	4_M_04,{
 	mes "[Training Grounds Receptionist]";
 	mes "Hello, you look to be new here.";
 	mes "What is your name?";
@@ -177,9 +175,9 @@ new_1-2,100,29,4	script	Receptionist#nv1	86,{
 			close;
 		}
 	}
-}	
+}
 
-new_1-1,53,114,4	script	Shion#nv1	727,{
+new_1-1,53,114,4	script	Shion#nv1	4_F_JOB_HUNTER,{
 	if (nov_get_item04 > 9 || nov_get_item05 > 9) {
 		mes "[Shion]";
 		mes "Hm...?";
@@ -351,7 +349,7 @@ new_1-1,53,114,4	script	Shion#nv1	727,{
 }
 
 // Interfaces Tutor
-new_1-2,99,105,3	script	Interfaces Tutor#nv1	751,{
+new_1-2,99,105,3	script	Interfaces Tutor#nv1	4_M_CRU,{
 	if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
 		mes "[Kris]";
 		mes "You've completed all the essential courses. Have you spoken to the assistant tutors already? The field combat training will be your next course. Would you like to proceed?";
@@ -628,7 +626,7 @@ new_1-2,99,105,3	script	Interfaces Tutor#nv1	751,{
 	}
 }
 
-new_1-2,83,111,3	script	Skill Tutor#nv	753,{
+new_1-2,83,111,3	script	Skill Tutor#nv	4_M_MONK,{
 	if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
 		mes "[Cecil]";
 		mes "Huh...?";
@@ -885,7 +883,7 @@ new_1-2,83,111,3	script	Skill Tutor#nv	753,{
 	}
 }
 
-new_1-2,115,111,3	script	Item Tutor#nv	726,{
+new_1-2,115,111,3	script	Item Tutor#nv	4_F_JOB_BLACKSMITH,{
 	if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
 		mes "[Alice]";
 		mes "Huh...?";
@@ -924,7 +922,6 @@ new_1-2,115,111,3	script	Item Tutor#nv	726,{
 		}
 	}
 	else if (nov_get_item04 < 10) {
-		enable_items;
 		mes "[Alice]";
 		mes "^666666*Yawn~*^000000";
 		mes "This is so boring.";
@@ -1234,7 +1231,7 @@ new_1-2,115,111,3	script	Item Tutor#nv	726,{
 	}
 }
 
-new_1-2,118,108,3	script	Kafra Employee#nv1	117,{
+new_1-2,118,108,3	script	Kafra Employee#nv1	4_F_KAFRA1,{
 	mes "[Kafra Employee]";
 	mes "Welcome to";
 	mes "Kafra Corporation.";
@@ -1533,7 +1530,7 @@ new_1-2,118,108,3	script	Kafra Employee#nv1	117,{
 }
 
 //Interface Assistant
-new_1-2,161,182,5	script	Instructor#nv	92,{
+new_1-2,161,182,5	script	Instructor#nv	4_F_03,{
 	mes "[Edwin]";
 	mes "Welcome to my class.";
 	mes "Choose the subject you";
@@ -1702,7 +1699,7 @@ new_1-2,161,182,5	script	Instructor#nv	92,{
 	}
 }
 
-new_1-2,182,182,3	script	Somatology Instructor	754,{
+new_1-2,182,182,3	script	Somatology Instructor	4_M_SAGE_A,{
 	mes "[Jare Riotte]";
 	mes "Welcome, new adventurer.";
 	mes "I, Jare Riotte will help you to learn about the fundamental";
@@ -1893,7 +1890,7 @@ new_1-2,182,182,3	script	Somatology Instructor	754,{
 	}
 }
 
-new_1-2,184,172,1	script	Understandings of Skills	47,{
+new_1-2,184,172,1	script	Understandings of Skills	1_M_01,{
 	mes "[Leo Handerson]";
 	mes "Welcome~";
 	mes "Oh look at this";
@@ -2153,7 +2150,7 @@ new_1-2,184,172,1	script	Understandings of Skills	47,{
 	}
 }
 
-new_1-2,121,101,2	script	Guide Soldier#nv1	105,{
+new_1-2,121,101,2	script	Guide Soldier#nv1	8W_SOLDIER,{
 	mes "[Guide Soldier]";
 	mes "We Guide Soldiers provide location information at the entrance of every town. You can easily find us by our special uniforms.";
 	next;
@@ -2166,7 +2163,7 @@ new_1-2,121,101,2	script	Guide Soldier#nv1	105,{
 	close;
 }
 
-new_1-2,17,182,5	script	Helper#nv	84,{
+new_1-2,17,182,5	script	Helper#nv	4_M_02,{
 	if (nov_2nd_cos < 11) {
 		mes "[Elmeen]";
 		mes "Congratulations!";
@@ -2452,7 +2449,7 @@ new_1-2,17,182,5	script	Helper#nv	84,{
 	}
 }
 
-new_1-2,38,182,3	script	Entrance Guard#nv	92,{
+new_1-2,38,182,3	script	Entrance Guard#nv	4_F_03,{
 	if (nov_2nd_cos == 0) {
 		mes "[Muriel]";
 		mes "I'm sorry, but I can't let anybody who hasn't been instructed on fighting enter the Field Combat Training Grounds.";
@@ -2620,7 +2617,7 @@ new_1-2,38,182,3	script	Entrance Guard#nv	92,{
 }
 
 //Teleport NPC
-new_1-3,95,30,4	script	Trainer#nv1::NovHoffman	84,{
+new_1-3,95,30,4	script	Trainer#nv1::NovHoffman	4_M_02,{
 	mes "[Hoffman]";
 	mes "Hey there~";
 	mes "I'm here to provide";
@@ -2657,7 +2654,7 @@ new_1-3,95,30,4	script	Trainer#nv1::NovHoffman	84,{
 		}
 		else {
 			warp "new_1-3",96,21;
-		}	
+		}
 		end;
 	case 2:
 		mes "[Hoffman]";
@@ -2693,12 +2690,12 @@ new_1-3,95,30,4	script	Trainer#nv1::NovHoffman	84,{
 	}
 }
 
-new_2-3,95,30,4	duplicate(NovHoffman)	Trainer#nv2	84
-new_3-3,95,30,4	duplicate(NovHoffman)	Trainer#nv3	84
-new_4-3,95,30,4	duplicate(NovHoffman)	Trainer#nv4	84
-new_5-3,95,30,4	duplicate(NovHoffman)	Trainer#nv5	84
+new_2-3,95,30,4	duplicate(NovHoffman)	Trainer#nv2	4_M_02
+new_3-3,95,30,4	duplicate(NovHoffman)	Trainer#nv3	4_M_02
+new_4-3,95,30,4	duplicate(NovHoffman)	Trainer#nv4	4_M_02
+new_5-3,95,30,4	duplicate(NovHoffman)	Trainer#nv5	4_M_02
 
-new_1-3,96,174,3	script	Test Examiner#nv1::NovKeyman	85,{
+new_1-3,96,174,3	script	Test Examiner#nv1::NovKeyman	4_M_03,{
 	mes "[Keyman]";
 	mes "Good!!";
 	mes "Now you know how to fight";
@@ -2724,15 +2721,15 @@ new_1-3,96,174,3	script	Test Examiner#nv1::NovKeyman	85,{
 	}
 }
 
-new_2-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv2	85
-new_3-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv3	85
-new_4-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv4	85
-new_5-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv5	85
+new_2-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv2	4_M_03
+new_3-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv3	4_M_03
+new_4-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv4	4_M_03
+new_5-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv5	4_M_03
 
 //Potato Merchant
-new_1-2,28,185,4	shop	Potato Merchant	90,516:15
+new_1-2,28,185,4	shop	Potato Merchant	4_F_01,516:15
 
-new_1-4,100,29,1	script	Hanson#nv	46,{
+new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
 	if (checkweight(909,400) == 0) {
 		mes "[Hanson]";
 		mes "All of the items you are carrying must be quite a burden. Where did you get so much things? Please lighten your weight by getting rid of things you don't need.";
@@ -3862,7 +3859,7 @@ S_UserJobchoice:
 		mes "[Hanson]";
 		mes "The Mage Academy is located in the NorthWest in town. Please remember this.";
 	}
-	else if (@menu == 3) {					
+	else if (@menu == 3) {
 		mes "to become a Merchant.";
 		mes "You will be sent to";
 		mes "the town of Alberta.";
@@ -3964,7 +3961,7 @@ S_UserJobchoice:
 }
 
 //Novice Instructor
-new_1-4,91,22,4	script	Bruce#nv	57,{
+new_1-4,91,22,4	script	Bruce#nv	1_M_LIBRARYMASTER,{
 	if (Class == Job_Novice) {
 		if (nov_3_swordman == 20) {
 			mes "[Bruce]";
@@ -4281,11 +4278,11 @@ new_3-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
 new_4-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
 new_5-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Added the New Novice Training Grounds, a big thanks [MasterOfMuppets]
-//=	to Dr.Evil who did 90% of the work =)
+//=     to Dr.Evil who did 90% of the work =)
 //= 1.0b Temp measure to stop exploits. [Vicious]
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Removed Duplicates [Toms]
@@ -4296,4 +4293,4 @@ new_5-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
 //= 1.7a a bit of optimization [Lupus]
 //= 1.7b Corrected a little Typo Error. (bugreport:728) [Samuray22]
 //= 1.7C Corrected another Typo Error. (bugreport:740) [Samuray22]
-//============================================================ 
+//============================================================
diff --git a/npc/pre-re/kafras/kafras.txt b/npc/pre-re/kafras/kafras.txt
new file mode 100644
index 000000000..85d2ae49e
--- /dev/null
+++ b/npc/pre-re/kafras/kafras.txt
@@ -0,0 +1,22 @@
+//===== Hercules Script ======================================
+//= Kafras (Cities/Dungeons/Fields)
+//===== By: ==================================================
+//= Daegaladh
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Argument settings for callfunc "F_Kafra":
+//=  arg(0): 0 - Default Kafra message
+//=          1 - Niflhiem Kafra message
+//=          2 - Guild Kafra message
+//=  arg(1): 1 - Disable teleport menu
+//=  arg(2): 1 - Disable info menu
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+// Izlude
+//============================================================
+izlude,134,87,3	duplicate(kaf_izlude)	Kafra Employee#iz	4_F_KAFRA1
diff --git a/npc/pre-re/kafras/kafras_izl.txt b/npc/pre-re/kafras/kafras_izl.txt
deleted file mode 100644
index ba2081fd6..000000000
--- a/npc/pre-re/kafras/kafras_izl.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Izlude Kafras
-//===== By: ================================================== 
-//= Daegaladh
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Izlude Kafras.
-//===== Additional Comments: ================================= 
-//= 1.0 First version.
-//============================================================ 
-
-izlude,134,87,3	duplicate(kaf_izlude)	Kafra Employee	117
diff --git a/npc/re/mobs/towns/brasilis.txt b/npc/pre-re/merchants/ammo_boxes.txt
index 12b0cd658..a78adaca6 100644
--- a/npc/re/mobs/towns/brasilis.txt
+++ b/npc/pre-re/merchants/ammo_boxes.txt
@@ -1,14 +1,13 @@
 //===== Hercules Script ======================================
-//= Brasilis Quest Monsters
+//= Magazine Dealers
 //===== By: ==================================================
-//= L0ne_W0lf
+//= Euphy
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= 1.0 First version
+//= Turns bullets into magazines/packs.
+//===== Additional Comments: =================================
+//= 1.0 First version, Pre-Renewal duplicates.
 //============================================================
 
-brasilis,283,88,6,6	monster	Strange Hydra	2081,5,5000,0,0
-brasilis,284,104,6,6	monster	Strange Hydra	2081,4,5000,0,0
-brasilis,215,80,6,6	monster	Strange Hydra	2081,4,5000,0,0
-brasilis,96,50,8,8	monster	Strange Hydra	2081,5,5000,0,0
+izlude,171,127,3	duplicate(mdk)	Magazine Dealer Kenny#iz	4_M_01
diff --git a/npc/pre-re/merchants/ammo_dealer.txt b/npc/pre-re/merchants/ammo_dealer.txt
new file mode 100644
index 000000000..8cf77542b
--- /dev/null
+++ b/npc/pre-re/merchants/ammo_dealer.txt
@@ -0,0 +1,13 @@
+//===== Hercules Script ======================================
+//= Bullet Dealers
+//===== By ===================================================
+//= Euphy
+//===== Version ==============================================
+//= 1.0
+//===== Description ==========================================
+//= Bullet trader.
+//===== Comments =============================================
+//= 1.0 First version, Pre-Renewal duplicates.
+//============================================================
+
+izlude,171,133,3	duplicate(bdt)	Bullet Dealer Tony#iz	4_M_04
diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index 124ea0ef3..d303f35b4 100644
--- a/npc/pre-re/merchants/shops.txt
+++ b/npc/pre-re/merchants/shops.txt
@@ -1,24 +1,22 @@
-//===== Hercules Script ======================================= 
+//===== Hercules Script =======================================
 //= Shops
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Daegaladh
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules GIT
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Pre-renewal-specific town shop NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
-//= 1.1 Added Tool Dealer & Trading Merchant [Streusel]
-//============================================================ 
+//= 1.1 Moved Izlude shops to pre-re/re paths. [Streusel]
+//============================================================
 
 //=======================================================
 // Izlude
 //=======================================================
-izlude,105,99,0	shop	Butcher#iz	54,517:-1
-izlude,94,98,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
-izlude,105,92,7	shop	Vendor from Milk Ranch#i	90,519:-1
-izlude,164,138,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-izlude_in,115,61,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,121,64,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
\ No newline at end of file
+izlude,105,99,0	shop	Butcher#iz	1_M_JOBGUIDER,517:-1
+izlude,94,98,4	shop	Fruit Gardener#iz	1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1
+izlude,105,92,7	shop	Vendor from Milk Ranch#i	4_F_01,519:-1
+izlude,164,138,4	shop	Pet Groomer#iz	4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,115,61,0	shop	Tool Dealer#iz	1_M_01,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,121,64,3	shop	Trading Merchant#iz	4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
diff --git a/npc/pre-re/mobs/citycleaners.txt b/npc/pre-re/mobs/citycleaners.txt
new file mode 100644
index 000000000..7f7fd9105
--- /dev/null
+++ b/npc/pre-re/mobs/citycleaners.txt
@@ -0,0 +1,18 @@
+//===== Hercules Script ======================================
+//= City Cleaners Monster Spawn Script
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Spawns monsters to clean up cities.
+//===== Additional Comments: =================================
+//= 1.0 First version, Pre-Renewal spawns.
+//============================================================
+
+//==================================================
+// Thief Bug City Spawns
+//==================================================
+payon_in02,23,68,5,5	monster	Thief Bug	1051,7,1200000,600000,0
+jawaii_in,73,117,4,4	monster	Thief Bug	1051,1,5400000,3000000,0
+jawaii_in,83,117,5,5	monster	Thief Bug	1051,1,4800000,2400000,0
diff --git a/npc/pre-re/mobs/dungeons/ein_dun.txt b/npc/pre-re/mobs/dungeons/ein_dun.txt
index 755e6d7ab..b7b902c9e 100644
--- a/npc/pre-re/mobs/dungeons/ein_dun.txt
+++ b/npc/pre-re/mobs/dungeons/ein_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Einbech Mine Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 spawn N and spawn delays aren't yet correct, so I set
 //=     respawn delays quite big for now [Lupus]
diff --git a/npc/pre-re/mobs/dungeons/gef_dun.txt b/npc/pre-re/mobs/dungeons/gef_dun.txt
index 70d0661e3..4fcc727e7 100644
--- a/npc/pre-re/mobs/dungeons/gef_dun.txt
+++ b/npc/pre-re/mobs/dungeons/gef_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Geffen Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/glastheim.txt b/npc/pre-re/mobs/dungeons/glastheim.txt
index 508de0239..68cc2d659 100644
--- a/npc/pre-re/mobs/dungeons/glastheim.txt
+++ b/npc/pre-re/mobs/dungeons/glastheim.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Glast Heim Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 [Lupus]
 //= 1.2 Updated to ep 8.5 aegis spawns [MasterOfMuppets]
diff --git a/npc/pre-re/mobs/dungeons/gld_dun.txt b/npc/pre-re/mobs/dungeons/gld_dun.txt
index 048f43681..01636a206 100644
--- a/npc/pre-re/mobs/dungeons/gld_dun.txt
+++ b/npc/pre-re/mobs/dungeons/gld_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Guild Dungeons Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Corrected MVP spawn variance. [Gepard]
diff --git a/npc/pre-re/mobs/dungeons/gld_dunSE.txt b/npc/pre-re/mobs/dungeons/gld_dunSE.txt
index abff62d33..1408ad00e 100644
--- a/npc/pre-re/mobs/dungeons/gld_dunSE.txt
+++ b/npc/pre-re/mobs/dungeons/gld_dunSE.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Guild Dungeons Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 First version
 //= 1.1 Updated spawns to official. [L0ne_W0lf]
diff --git a/npc/pre-re/mobs/dungeons/gon_dun.txt b/npc/pre-re/mobs/dungeons/gon_dun.txt
index 347ad6174..9b30ebd02 100644
--- a/npc/pre-re/mobs/dungeons/gon_dun.txt
+++ b/npc/pre-re/mobs/dungeons/gon_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Gonryun Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
diff --git a/npc/pre-re/mobs/dungeons/ice_dun.txt b/npc/pre-re/mobs/dungeons/ice_dun.txt
index 35a5090f8..c68972345 100644
--- a/npc/pre-re/mobs/dungeons/ice_dun.txt
+++ b/npc/pre-re/mobs/dungeons/ice_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Ice Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 First version from jAthena [Playtester]
 //= 1.1 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/in_sphinx.txt b/npc/pre-re/mobs/dungeons/in_sphinx.txt
index 1d3a4ad32..6b281d5a5 100644
--- a/npc/pre-re/mobs/dungeons/in_sphinx.txt
+++ b/npc/pre-re/mobs/dungeons/in_sphinx.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Morocc Sphinx Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Replaced Marduk with Anubis on F4 and F5 [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/iz_dun.txt b/npc/pre-re/mobs/dungeons/iz_dun.txt
index fc1b282bb..60491b2c8 100644
--- a/npc/pre-re/mobs/dungeons/iz_dun.txt
+++ b/npc/pre-re/mobs/dungeons/iz_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Byalan Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns for 1-4 [Playtester]
 //= 1.2 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/kh_dun.txt b/npc/pre-re/mobs/dungeons/kh_dun.txt
index 1960a958a..4b10f64ac 100644
--- a/npc/pre-re/mobs/dungeons/kh_dun.txt
+++ b/npc/pre-re/mobs/dungeons/kh_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Kiel Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 First version [MasterOfMuppets]
 //= 1.1 Added official mob types [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/lhz_dun.txt b/npc/pre-re/mobs/dungeons/lhz_dun.txt
index ee395123a..eb544e724 100644
--- a/npc/pre-re/mobs/dungeons/lhz_dun.txt
+++ b/npc/pre-re/mobs/dungeons/lhz_dun.txt
@@ -1,18 +1,18 @@
 //===== Hercules Script ======================================
 //= Lighthalzen Dungeon(Biolabs) Monster Spawn Script
 //===== By: ==================================================
-// The Prometheus Project, rAthena Dev Team
+//= The Prometheus Project, rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.8
 //===== Additional Comments: =================================
 //= 08/24/05 : Added 1st version. [Muad_Dib]
-//= 1.1: Some corrections to level 1, 2 as pointed out by
-//=      MasterofMuppets. [Skotlex]
-//= 1.3: Some fixes based on kRO's "RO Map" [Poki#3]
-//=	 I also made the place more Moby ^^
-//= 1.4: Adjusted spawns according to own info from iRO [MasterOfMuppets]
-//= 1.5: More accurate spawn numbers and iRO names thanks to Tharis [Playtester]
-//= 1.6: Official X.3 spawns [Playtester]
+//= 1.1 Some corrections to level 1, 2 as pointed out by
+//=     MasterofMuppets. [Skotlex]
+//= 1.3 Some fixes based on kRO's "RO Map" [Poki#3]
+//=     I also made the place more Moby ^^
+//= 1.4 Adjusted spawns according to own info from iRO [MasterOfMuppets]
+//= 1.5 More accurate spawn numbers and iRO names thanks to Tharis [Playtester]
+//= 1.6 Official X.3 spawns [Playtester]
 //= 1.7 Corrected MVP spawn function to be standard to iRO. [L0ne_W0lf]
 //=	- A random 99 will now be spawned when the MVP spawns.
 //=	- Spare spawn and MVP spawn now spawn in official locations.
@@ -21,11 +21,9 @@
 //= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf]
 //============================================================
 
-
 //========================================================================================
 // lhz_dun01 - Bio-life Labs 1F
 //========================================================================================
-
 lhz_dun01,0,0,0,0	monster	Metaling	1613,50,0,0,0
 lhz_dun01,0,0,0,0	monster	Anopheles	1627,70,0,0,0
 lhz_dun01,0,0,0,0	monster	Remover	1682,100,0,0,0
@@ -64,7 +62,6 @@ lhz_dun01,0,0,0,0	monster	Gemini-S58	1681,1,7200000,5400000,0
 //========================================================================================
 // lhz_dun02 - Bio-life Labs 2F
 //========================================================================================
-
 lhz_dun02,0,0,0,0	monster	Egnigem Cenia	1652,26,0,0,0
 lhz_dun02,0,0,0,0	monster	Wickebine Tres	1653,26,0,0,0
 lhz_dun02,0,0,0,0	monster	Armeyer Dinze	1654,26,0,0,0
@@ -97,7 +94,6 @@ lhz_dun02,0,0,0,0	boss_monster	Egnigem Cenia	1658,1,7200000,600000,1
 //========================================================================================
 // lhz_dun03 - Bio-life Labs 3F
 //========================================================================================
-
 lhz_dun03,140,235,116,30	monster	Seyren Windsor	1634,4,180000,120000,0
 lhz_dun03,140,235,116,30	monster	Eremes Guile	1635,4,180000,120000,0
 lhz_dun03,140,235,116,30	monster	Howard Alt-Eisen	1636,4,180000,120000,0
@@ -227,52 +223,52 @@ OnInit:
 
 OnTimer6000000:
 	if (rand(1,6) == 1) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer6300000:
 	if (rand(1,6) == 2) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer6600000:
 	if (rand(1,6) == 3) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer6900000:
 	if (rand(1,6) == 4) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer7200000:
 	if (rand(1,6) == 5) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer7500000:
 	if (rand(1,6) == 6) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer7800000:
-	donpcevent "summon_boss_lt::Onsummon";
+	donpcevent "summon_boss_lt::OnSummon";
 	stopnpctimer;
 	end;
 
-Onsummon:
+OnSummon:
 	// Select Coordinates to summon a random MVP on
 	switch(rand(1,6)) {
 	case 1: set .@x,140;	set .@y,232;	break;
@@ -283,7 +279,7 @@ Onsummon:
 	case 6: set .@x,175;	set .@y,137;	break;
 	}
 	set .@mob,rand(1646,1651);
-	monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMvPDead";
+	monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMVPDead";
 
 	// Select Coordinates to summon a random 99 on
 	switch(rand(1,6)) {
@@ -298,7 +294,7 @@ Onsummon:
 	monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMVP";
 	end;
 
-OnMyMvPDead:
+OnMyMVPDead:
 	killmonster "lhz_dun03","summon_boss_lt::OnMVP";
 	initnpctimer;
 	end;
diff --git a/npc/pre-re/mobs/dungeons/lou_dun.txt b/npc/pre-re/mobs/dungeons/lou_dun.txt
index bc4a264dd..32dd9b117 100644
--- a/npc/pre-re/mobs/dungeons/lou_dun.txt
+++ b/npc/pre-re/mobs/dungeons/lou_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Louyang Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Updated by MasterOfMuppets
 //= 1.2 Added Bacsojin and Chung E [MasterOfMuppets]
diff --git a/npc/pre-re/mobs/dungeons/mag_dun.txt b/npc/pre-re/mobs/dungeons/mag_dun.txt
index e568a0f54..c59c7279f 100644
--- a/npc/pre-re/mobs/dungeons/mag_dun.txt
+++ b/npc/pre-re/mobs/dungeons/mag_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Magma Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 fixed 2,3,4 tabs instead of 1... and wrong mob names [Lupus]
 //= 1.2 Official jRO 10.3 spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/mjo_dun.txt b/npc/pre-re/mobs/dungeons/mjo_dun.txt
index 12a0e9dee..18403fd8f 100644
--- a/npc/pre-re/mobs/dungeons/mjo_dun.txt
+++ b/npc/pre-re/mobs/dungeons/mjo_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Coal Mine(Dead pit) Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //============================================================
diff --git a/npc/pre-re/mobs/dungeons/moc_pryd.txt b/npc/pre-re/mobs/dungeons/moc_pryd.txt
index 4a8bf8e0b..bcbe05801 100644
--- a/npc/pre-re/mobs/dungeons/moc_pryd.txt
+++ b/npc/pre-re/mobs/dungeons/moc_pryd.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
-//= Morocc Pryamid Dungeon Monster Spawn Script
+//===== Hercules Script ======================================
+//= Morocc Pyramid Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/mosk_dun.txt b/npc/pre-re/mobs/dungeons/mosk_dun.txt
index d3c416948..e7c9ec7f1 100644
--- a/npc/pre-re/mobs/dungeons/mosk_dun.txt
+++ b/npc/pre-re/mobs/dungeons/mosk_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Moscovia Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Added spawns [Playtester]
 //= 1.1 Swapped named according to mob db. [L0ne_W0lf]
diff --git a/npc/pre-re/mobs/dungeons/nyd_dun.txt b/npc/pre-re/mobs/dungeons/nyd_dun.txt
index 19a7e783e..7068a9a0b 100644
--- a/npc/pre-re/mobs/dungeons/nyd_dun.txt
+++ b/npc/pre-re/mobs/dungeons/nyd_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yggdrasil Root Dungeon
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 First version
 //============================================================
diff --git a/npc/pre-re/mobs/dungeons/odin.txt b/npc/pre-re/mobs/dungeons/odin.txt
index 48f7f465f..8cf04f076 100644
--- a/npc/pre-re/mobs/dungeons/odin.txt
+++ b/npc/pre-re/mobs/dungeons/odin.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Odin Temple Monster Spawn Script
 //===== By: ==================================================
 //= Poki#3 (0.1)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.1 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/orcsdun.txt b/npc/pre-re/mobs/dungeons/orcsdun.txt
index be6e7bfc1..706981ff8 100644
--- a/npc/pre-re/mobs/dungeons/orcsdun.txt
+++ b/npc/pre-re/mobs/dungeons/orcsdun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Orc Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //============================================================
diff --git a/npc/pre-re/mobs/dungeons/pay_dun.txt b/npc/pre-re/mobs/dungeons/pay_dun.txt
index 481edea80..fbd230ef8 100644
--- a/npc/pre-re/mobs/dungeons/pay_dun.txt
+++ b/npc/pre-re/mobs/dungeons/pay_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Payon Cave Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Small spawn update [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/prt_maze.txt b/npc/pre-re/mobs/dungeons/prt_maze.txt
index 47d79efac..32ce16ef0 100644
--- a/npc/pre-re/mobs/dungeons/prt_maze.txt
+++ b/npc/pre-re/mobs/dungeons/prt_maze.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Prontera Maze(Hidden Temple) Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Some small fixes [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/prt_sew.txt b/npc/pre-re/mobs/dungeons/prt_sew.txt
index f907feb38..d7ce90022 100644
--- a/npc/pre-re/mobs/dungeons/prt_sew.txt
+++ b/npc/pre-re/mobs/dungeons/prt_sew.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Prontera Sewers(Culvert) Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
diff --git a/npc/pre-re/mobs/dungeons/ra_san.txt b/npc/pre-re/mobs/dungeons/ra_san.txt
index ffb79459e..3bc8e19ac 100644
--- a/npc/pre-re/mobs/dungeons/ra_san.txt
+++ b/npc/pre-re/mobs/dungeons/ra_san.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Rachel Sanctuary Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 First version with guessed amounts [Playtester]
 //= 1.1 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/tha_t.txt b/npc/pre-re/mobs/dungeons/tha_t.txt
index c42f0e59b..d97be54c7 100644
--- a/npc/pre-re/mobs/dungeons/tha_t.txt
+++ b/npc/pre-re/mobs/dungeons/tha_t.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Thanatos Tower Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Real spawns by Poki#3 [Nexon]
 //= 1.1 More official spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/thor_v.txt b/npc/pre-re/mobs/dungeons/thor_v.txt
index f72abc90c..79d9c8176 100644
--- a/npc/pre-re/mobs/dungeons/thor_v.txt
+++ b/npc/pre-re/mobs/dungeons/thor_v.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ========================================
+//===== Hercules Script ======================================
 //= Thor Volcano Monster Spawn Script
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Official monster spawn in Thor Volcano Dungeon.
 //===== Additional Comments: =================================
@@ -16,7 +14,7 @@
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
 //============================================================
 
-// ================= [Thor Volcano - 01] =====================
+// =================[Thor Volcano - 01] =====================
 thor_v01,0,0,0,0	monster	Magmaring	1836,10,0,0,0
 thor_v01,0,0,0,0	monster	Fire Imp	1837,5,0,0,0
 thor_v01,0,0,0,0	monster	Fire Imp	1837,12,1800000,0,0
@@ -34,7 +32,7 @@ thor_v01,0,0,0,0	monster	Bow Master	1830,5,420000,0,0
 thor_v01,0,0,0,0	monster	Salamander	1831,5,3600000,0,0
 thor_v01,0,0,0,0	monster	Byorgue	1839,1,3600000,0,0
 
-// ================= [Thor Volcano - 02] =====================
+// =================[Thor Volcano - 02] =====================
 thor_v02,0,0,0,0	monster	Magmaring	1836,10,0,0,0
 thor_v02,0,0,0,0	monster	Fire Imp	1837,5,0,0,0
 thor_v02,75,125,50,85	monster	Fire Imp	1837,3,0,0,0
@@ -49,7 +47,7 @@ thor_v02,0,0,0,0	monster	Salamander	1831,1,18000000,0,0
 thor_v02,0,0,0,0	monster	Sword Master	1829,1,7200000,0,0
 thor_v02,0,0,0,0	monster	Bow Master	1830,1,7200000,0,0
 
-// ================= [Thor Volcano - 03] =====================
+// =================[Thor Volcano - 03] =====================
 thor_v03,0,0,0,0	monster	Kasa	1833,16,0,0,0
 thor_v03,95,220,64,55	monster	Kasa	1833,6,0,0,0
 thor_v03,223,224,65,60	monster	Kasa	1833,6,0,0,0
diff --git a/npc/pre-re/mobs/dungeons/treasure.txt b/npc/pre-re/mobs/dungeons/treasure.txt
index 7cc99c9a1..552b3f8be 100644
--- a/npc/pre-re/mobs/dungeons/treasure.txt
+++ b/npc/pre-re/mobs/dungeons/treasure.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Sunken Ship Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/tur_dun.txt b/npc/pre-re/mobs/dungeons/tur_dun.txt
index 3905c4616..a597e81e1 100644
--- a/npc/pre-re/mobs/dungeons/tur_dun.txt
+++ b/npc/pre-re/mobs/dungeons/tur_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Turtle Island Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //============================================================
diff --git a/npc/pre-re/mobs/dungeons/um_dun.txt b/npc/pre-re/mobs/dungeons/um_dun.txt
index e245c6d88..681a0dca0 100644
--- a/npc/pre-re/mobs/dungeons/um_dun.txt
+++ b/npc/pre-re/mobs/dungeons/um_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Umbala Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Some 11.1 spawn updates [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/xmas_dun.txt b/npc/pre-re/mobs/dungeons/xmas_dun.txt
index 420efcdf9..4146c3fa8 100644
--- a/npc/pre-re/mobs/dungeons/xmas_dun.txt
+++ b/npc/pre-re/mobs/dungeons/xmas_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Toy Factory Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 added Garm Baby according to May 10 patch
 //= 1.2 Official kRO 10.1 spawns [Playtester]
diff --git a/npc/pre-re/mobs/dungeons/yggdrasil.txt b/npc/pre-re/mobs/dungeons/yggdrasil.txt
index b3d401ac5..939933aeb 100644
--- a/npc/pre-re/mobs/dungeons/yggdrasil.txt
+++ b/npc/pre-re/mobs/dungeons/yggdrasil.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yggdrasil Tree Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Splitted from Nifflheim fields [DracoRPG]
 //= 1.1 Official kRO 10.1 spawns [Playtester]
diff --git a/npc/pre-re/mobs/fields/amatsu.txt b/npc/pre-re/mobs/fields/amatsu.txt
index 1b886b073..fd38b2118 100644
--- a/npc/pre-re/mobs/fields/amatsu.txt
+++ b/npc/pre-re/mobs/fields/amatsu.txt
@@ -1,4 +1,4 @@
-//===== Hercules Script =======================================
+//===== Hercules Script ======================================
 //= Amatsu Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/pre-re/mobs/fields/comodo.txt b/npc/pre-re/mobs/fields/comodo.txt
index e9d37da80..4e21f81e3 100644
--- a/npc/pre-re/mobs/fields/comodo.txt
+++ b/npc/pre-re/mobs/fields/comodo.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Comodo Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/fields/einbroch.txt b/npc/pre-re/mobs/fields/einbroch.txt
index bdaaf59da..1b8b48f24 100644
--- a/npc/pre-re/mobs/fields/einbroch.txt
+++ b/npc/pre-re/mobs/fields/einbroch.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Einbroch Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 correct spawn maps, but not yet exact amount of
 //= monsters [Lupus]
@@ -14,9 +12,9 @@
 //=    again for providing the information [MasterOfMuppets]
 //= 1.2a Fixed missing tabs [Lupus]
 //= 1.3 Updated after Episode 10.4 - Hugel [Poki#3]
-//=	Mob quantity is custom.
+//=     Mob quantity is custom.
 //= 1.3b Changed the spawn numbers a bit. [Poki#3]
-//=	Thanks to Playtester and Emperium.org
+//=     Thanks to Playtester and Emperium.org
 //= 1.4 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.5 Adjusted some spawns according to official info [Playtester]
 //= 1.6 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/fields/geffen.txt b/npc/pre-re/mobs/fields/geffen.txt
index 813e745e7..cc6b1780d 100644
--- a/npc/pre-re/mobs/fields/geffen.txt
+++ b/npc/pre-re/mobs/fields/geffen.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Geffen Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Map names typos fix [Lupus]
 //= 1.3 Official kRO 10.1 spawns + future changes [Playtester]
diff --git a/npc/pre-re/mobs/fields/gonryun.txt b/npc/pre-re/mobs/fields/gonryun.txt
index eab2227ef..0fb3fcafe 100644
--- a/npc/pre-re/mobs/fields/gonryun.txt
+++ b/npc/pre-re/mobs/fields/gonryun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Gon Ryun Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //============================================================
diff --git a/npc/pre-re/mobs/fields/hugel.txt b/npc/pre-re/mobs/fields/hugel.txt
index 0946379ce..633e9f428 100644
--- a/npc/pre-re/mobs/fields/hugel.txt
+++ b/npc/pre-re/mobs/fields/hugel.txt
@@ -1,18 +1,16 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Hugel Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= Spawns for hu_fild05 and hu_fild04, numbers may not be correct [MasterOfMuppets]
 //= 0.2 Fixed Petit ID
 //= 0.3 Updated the spawns using kRO's website as info,  [MasterOfMuppets]
-//= 	thanks to battousai90
+//=      thanks to battousai90
 //= 0.4 Updated after Episode 10.4 - Hugel [Poki#3]
-//=	Mob quantity is custom.
+//=     Mob quantity is custom.
 //= 1.0 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.1 Official X.3 spawns [Playtester]
 //= 1.2 Some 11.1 spawn updates [Playtester]
diff --git a/npc/pre-re/mobs/fields/jawaii.txt b/npc/pre-re/mobs/fields/jawaii.txt
deleted file mode 100644
index 194a64b84..000000000
--- a/npc/pre-re/mobs/fields/jawaii.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-//===== rAthena Script =======================================
-//= Jawaii the honeymoon Island Monster Spawn Script
-//===== By: ==================================================
-//= MasterOfMuppets (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Additional Comments: =================================
-//= 1.0 First version [MasterOfMuppets]
-//============================================================
-
-//==================================================
-// jawaii - Jawaii, the Honeymoon Island
-//==================================================
-jawaii,207,290,10,10	monster	Phen	1158,3,3600000,1800000,0
-jawaii,221,220,30,30	monster	Aster	1266,2,3600000,2400000,0
-jawaii,276,163,20,20	monster	Aster	1266,1,7200000,3600000,0
-jawaii,221,220,30,30	monster	Shellfish	1074,1,4800000,3000000,0
-jawaii,276,163,20,30	monster	Shellfish	1074,2,4200000,2400000,0
-
-//==================================================
-// jawaii_in - Inside Jawaii
-//==================================================
-jawaii_in,128,121,1,4	monster	Red Mushroom	1085,1,3000000,1200000,0
-jawaii_in,124,76,1,1	monster	Black Mushroom	1084,1,3600000,1200000,0
-jawaii_in,72,74,5,1	monster	Black Mushroom	1084,2,3000000,1200000,0
-jawaii_in,73,117,4,4	monster	Thief Bug	1051,1,5400000,3000000,0
-jawaii_in,83,117,5,5	monster	Thief Bug	1051,1,4800000,2400000,0
diff --git a/npc/pre-re/mobs/fields/lighthalzen.txt b/npc/pre-re/mobs/fields/lighthalzen.txt
index 46e660255..bb25b14fc 100644
--- a/npc/pre-re/mobs/fields/lighthalzen.txt
+++ b/npc/pre-re/mobs/fields/lighthalzen.txt
@@ -8,7 +8,7 @@
 //= 1.0 by Muad_Dib (Prometheus Project)
 //= 1.1 Added Porcellio by MasterOfMuppets
 //= 1.2 Corrected monsters. Many thanks to vicious_pucca for
-//=	the information [MasterOfMuppets]
+//=     the information [MasterOfMuppets]
 //= 1.3 Updated acordingly to Episode 10.4 [Poki#3]
 //= 1.4 Fully updated X.4 spawns [Playtester]
 //= 1.5 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/fields/louyang.txt b/npc/pre-re/mobs/fields/louyang.txt
index e7254f8dd..f64a899de 100644
--- a/npc/pre-re/mobs/fields/louyang.txt
+++ b/npc/pre-re/mobs/fields/louyang.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Louyang Fields Monster Spawn Script
 //===== By: ==================================================
 //= Evera/Lorri
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 updated by MasterOfMuppets
 //= 1.2 Official kRO 10.1 spawns [Playtester]
diff --git a/npc/pre-re/mobs/fields/lutie.txt b/npc/pre-re/mobs/fields/lutie.txt
index 7918ed45b..2eff79086 100644
--- a/npc/pre-re/mobs/fields/lutie.txt
+++ b/npc/pre-re/mobs/fields/lutie.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lutie Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 added Garm Baby according to May 10 patch
 //= 1.2 Official kRO 10.1 spawns [Playtester]
diff --git a/npc/pre-re/mobs/fields/manuk.txt b/npc/pre-re/mobs/fields/manuk.txt
index 6bf0ba600..23970e19a 100644
--- a/npc/pre-re/mobs/fields/manuk.txt
+++ b/npc/pre-re/mobs/fields/manuk.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Manuk Fields Monster Spawn Script
 //===== By: ==================================================
 //= alexx, MaC
 //===== Current Version: =====================================
 //= 1.1a
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Official spawn ammounts from Aegis script [alexx]
 //= 1.1 Added 13.2 mob spawn update [scriptor]
diff --git a/npc/pre-re/mobs/fields/mjolnir.txt b/npc/pre-re/mobs/fields/mjolnir.txt
index 2f6508b8e..377536fa6 100644
--- a/npc/pre-re/mobs/fields/mjolnir.txt
+++ b/npc/pre-re/mobs/fields/mjolnir.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Mt. Mjolnir Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //============================================================
diff --git a/npc/pre-re/mobs/fields/morocc.txt b/npc/pre-re/mobs/fields/morocc.txt
index 8d3fef338..8fb354ce5 100644
--- a/npc/pre-re/mobs/fields/morocc.txt
+++ b/npc/pre-re/mobs/fields/morocc.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Morocc Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
diff --git a/npc/pre-re/mobs/fields/moscovia.txt b/npc/pre-re/mobs/fields/moscovia.txt
index d693e79d8..9a1afeb95 100644
--- a/npc/pre-re/mobs/fields/moscovia.txt
+++ b/npc/pre-re/mobs/fields/moscovia.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Moscovia Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Added spawns [Playtester]
 
diff --git a/npc/pre-re/mobs/fields/niflheim.txt b/npc/pre-re/mobs/fields/niflheim.txt
index 737d6aa53..537157cda 100644
--- a/npc/pre-re/mobs/fields/niflheim.txt
+++ b/npc/pre-re/mobs/fields/niflheim.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Niflheim Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 updated [shadow],
 //= 1.3 many changes and wrong LOD ID 5373 -> 1373 [Lupus]
diff --git a/npc/pre-re/mobs/fields/payon.txt b/npc/pre-re/mobs/fields/payon.txt
index ba6688047..95a5d3e9a 100644
--- a/npc/pre-re/mobs/fields/payon.txt
+++ b/npc/pre-re/mobs/fields/payon.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Payon Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Some 11.1 spawn changes [Playtester]
diff --git a/npc/pre-re/mobs/fields/prontera.txt b/npc/pre-re/mobs/fields/prontera.txt
index f00556135..62758c125 100644
--- a/npc/pre-re/mobs/fields/prontera.txt
+++ b/npc/pre-re/mobs/fields/prontera.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Prontera Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.2 fixed some map name typos [Lupus]
 //= 1.3 Official kRO 10.1 spawns [Playtester]
diff --git a/npc/pre-re/mobs/fields/rachel.txt b/npc/pre-re/mobs/fields/rachel.txt
index 9272972cc..b9114802f 100644
--- a/npc/pre-re/mobs/fields/rachel.txt
+++ b/npc/pre-re/mobs/fields/rachel.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Rachel Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Created this [Sepheus]
 //= 1.1 Updated [Playtester]
diff --git a/npc/pre-re/mobs/fields/splendide.txt b/npc/pre-re/mobs/fields/splendide.txt
index 9dfbbfa90..70f145e08 100644
--- a/npc/pre-re/mobs/fields/splendide.txt
+++ b/npc/pre-re/mobs/fields/splendide.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Splendide Fields Monster Spawn Script
 //===== By: ==================================================
 //= alexx, MaC
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Official spawn ammounts from Aegis script [alexx]
 //= 1.1 Added 13.2 mob spawn update [scriptor]
@@ -29,4 +27,4 @@ spl_fild02,0,0,0,0	monster	Luciola Vespa	1994,15,0,0,0
 spl_fild03,0,0,0,0	monster	Luciola Vespa	1994,35,0,0,0
 spl_fild03,0,0,0,0	monster	Cornus	1992,25,0,0,0
 spl_fild03,0,0,0,0	monster	Naga	1993,20,0,0,0
-spl_fild03,0,0,0,0	monster	Tendril Lion	1991,1,3600000,0,0
\ No newline at end of file
+spl_fild03,0,0,0,0	monster	Tendril Lion	1991,1,3600000,0,0
diff --git a/npc/pre-re/mobs/fields/umbala.txt b/npc/pre-re/mobs/fields/umbala.txt
index 5da651ff9..eb8ce1ce6 100644
--- a/npc/pre-re/mobs/fields/umbala.txt
+++ b/npc/pre-re/mobs/fields/umbala.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Umbala Fields Monster Spawn Script
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Darkchild (1.0)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= Any rAthena Version; RO Ep6+
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.3 Official kRO 10.1 spawns [Playtester]
 //= 1.4 More accurate spawns [Playtester]
-//============================================================ 
+//============================================================
 
 //==================================================
 // um_fild01 - Luluka Forest
diff --git a/npc/pre-re/mobs/fields/veins.txt b/npc/pre-re/mobs/fields/veins.txt
index 5a365ef55..5a9a221bc 100644
--- a/npc/pre-re/mobs/fields/veins.txt
+++ b/npc/pre-re/mobs/fields/veins.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Veins Fields Monster Spawn Script
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Temp. monster spawn in Veins Field. [$ephiroth]
 //= 1.1 Updated monster spawn based on kRO website. [$ephiroth]
@@ -72,7 +70,7 @@ ve_fild05,123,65,50,21	monster	Sleeper	1386,5,120000,0,0
 ve_fild05,152,139,15,17	monster	White Plant	1082,5,1800000,0,0
 ve_fild05,152,139,5,5	monster	Shining Plant	1083,1,2400000,0,0
 
-//======== [Veins Field-06] ===================================	
+//======== [Veins Field-06] ===================================
 ve_fild06,0,0,0,0	monster	Stapo	1784,2,300000,0,0
 ve_fild06,0,0,0,0	monster	Stapo	1784,1,1800000,0,0
 ve_fild06,0,0,0,0	monster	Shining Plant	1083,1,1020000,0,0
diff --git a/npc/pre-re/mobs/fields/yuno.txt b/npc/pre-re/mobs/fields/yuno.txt
index 7a379d947..03ed9dd89 100644
--- a/npc/pre-re/mobs/fields/yuno.txt
+++ b/npc/pre-re/mobs/fields/yuno.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yuno Fields Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.9
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 fixed tabs, names [Lupus]
 //= 1.2 New/Better Spawn [Muad_Dib]
 //= 1.3 Fix Up [Darkchild]
 //= 1.4 Updated monster spawns. Many thanks to vicious_pucca for
-//=	providing the information [MasterOfMuppets]
+//=     providing the information [MasterOfMuppets]
 //= 1.5 Updated after Episode 10.4 - Hugel [Poki#3]
-//=	Mob quantity is custom.
+//=     Mob quantity is custom.
 //= 1.5b Changed the spawn numbers a bit. [Poki#3]
-//=	Thanks to Playtester and Emperium.org
+//=     Thanks to Playtester and Emperium.org
 //= 1.6 Fixed Yuno Field 10. Mob amount sugested by Playtester [Poki#3]
 //= 1.7 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.8 Added kRO 10.1 spawns where they fit [Playtester]
diff --git a/npc/pre-re/other/bulletin_boards.txt b/npc/pre-re/other/bulletin_boards.txt
new file mode 100644
index 000000000..ed2b210c0
--- /dev/null
+++ b/npc/pre-re/other/bulletin_boards.txt
@@ -0,0 +1,27 @@
+//===== Hercules Script ======================================
+//= Bulletin Boards
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Bulletin Boards for beginners.
+//===== Additional Comments: =================================
+//= 1.0 Moved Izlude NPCs to Pre-RE/RE paths.
+//============================================================
+
+izlude,131,116,4	script	Bulletin Board#5	2_BULLETIN_BOARD,{
+	mes "[Izlude: The Satellite City]";
+	mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "Points of interest include the Swordsman Association building which allows adventurers to change their job to Swordsman, and the Battle Area that is North of Izlude.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "At the docks, you may take a ship and travel to ^123972Alberta^000000 or ^2F0400Byalan Island^000000.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "From Izlude, ^6D6FE0Prontera^000000 is located to the Northwest, and ^1F3A11Payon^000000 is located to the South.";
+	mes "Enjoy your travels in the Rune-Midgarts Kingdom.";
+	close;
+}
diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt
index 26520994b..13428427e 100644
--- a/npc/pre-re/other/mercenary_rent.txt
+++ b/npc/pre-re/other/mercenary_rent.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Mercenary related NPCs
 //===== By: ==================================================
 //= Daegaladh
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Sells Lancer, Sword, and Archer mercenaries,
 //= along with related mercenary items.
@@ -13,5 +11,5 @@
 //= 1.0 First version. [Daegaladh]
 //============================================================
 
-izlude,47,139,5	duplicate(Mercenary Manager#main)	Mercenary Manager#Sword	734
-izlude,56,139,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
+izlude,47,139,5	duplicate(Mercenary Manager#main)	Mercenary Manager#Sword	4_M_JOB_KNIGHT2
+izlude,56,139,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	4_F_HUWOMAN
diff --git a/npc/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt
new file mode 100644
index 000000000..60c7133f0
--- /dev/null
+++ b/npc/pre-re/other/msg_boards.txt
@@ -0,0 +1,26 @@
+//===== Hercules Script ======================================
+//= Misc. Message Boards
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Misc. Message Boards for:
+//=  - Izlude
+//===== Additional Comments: =================================
+//= 1.0 Moved Izlude NPCs to Pre-RE path.
+//============================================================
+
+// Izlude
+//============================================================
+izlude,54,139,1	script	Sign#Iz1	HIDDEN_NPC,{
+	mes "^993300- The Sign Reads -^000000";
+	mes "Welcome to the Swordsman Academy.";
+	close;
+}
+
+izlude,144,148,1	script	Sign#Iz2	HIDDEN_NPC,{
+	mes "^993300- The Sign Reads -^000000";
+	mes "Welcome.";
+	close;
+}
diff --git a/npc/pre-re/other/pvp.txt b/npc/pre-re/other/pvp.txt
new file mode 100644
index 000000000..55d6bae79
--- /dev/null
+++ b/npc/pre-re/other/pvp.txt
@@ -0,0 +1,32 @@
+//===== Hercules Script ======================================
+//= PvP NPCs
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= PvP NPCs that are found in the Inns in major cities.
+//= Includes Yoyo Mode, Nightmare Mode, and Event Mode.
+//===== Additional Comments: =================================
+//= 1.0 First version, Pre-Renewal.
+//============================================================
+
+// PVP Warpers
+//============================================================
+pvp_y_room,86,85,4	script	Fight Square Reception#8	8W_SOLDIER,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
+
+pvp_n_room,30,85,4	script	Fight Square Reception#n	8W_SOLDIER,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
diff --git a/npc/other/resetskill.txt b/npc/pre-re/other/resetskill.txt
index 4d1a6f2c7..4c8fb4054 100644
--- a/npc/other/resetskill.txt
+++ b/npc/pre-re/other/resetskill.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Aegis conversion]
+//= [Official Conversion]
 //= Permenent first class, base level 40 and under skill resetter.
 //= First Class characters and expanded classes only.
 //= Baby Classes and First Class trans can't use this service.
@@ -13,7 +13,7 @@
 //= 1.0 First version. [L0ne_W0lf]
 //============================================================
 
-prontera,146,232,4	script	Hypnotist#2	124,{
+prontera,146,232,4	script	Hypnotist#2	4_F_TELEPORTER,{
 	mes "[Hypnotist]";
 	mes "Greetings, adventurer.";
 	mes "I'm a member of the Hypnotist";
@@ -107,7 +107,7 @@ prontera,146,232,4	script	Hypnotist#2	124,{
 				mes "services. Oh, and best";
 				mes "of luck to you on your";
 				mes "travels, adventurer.";
-				ResetSkill;
+				resetskill;
 				close;
 			}
 			mes "[Hypnotist]";
diff --git a/npc/pre-re/other/turbo_track.txt b/npc/pre-re/other/turbo_track.txt
new file mode 100644
index 000000000..ec670fbad
--- /dev/null
+++ b/npc/pre-re/other/turbo_track.txt
@@ -0,0 +1,14 @@
+//===== Hercules Script ======================================
+//= Turbo Track
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Pre-Renewal duplicates.
+//===== Additional Comments: =================================
+//= 1.0 Split Peco Peco Manager NPC.
+//============================================================
+
+alde_gld,181,199,5	duplicate(MountManager_turbo)	Peco Peco Manager	4_F_RACING
diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt
index 263ea2658..79c121ba5 100644
--- a/npc/pre-re/quests/collection/quest_alligator.txt
+++ b/npc/pre-re/quests/collection/quest_alligator.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Anolian Skins)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-cmd_fild01,362,256,3	script	Cuir#Gator_Hunt	106,{
+cmd_fild01,362,256,3	script	Cuir#Gator_Hunt	1_M_MOC_LORD,{
 	if (checkquest(60119) != -1) {
 		if (checkquest(60119,HUNTING) != 2 ) {
 			mes "[Cuir]";
diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt
index 4cb379b71..6815c62e1 100644
--- a/npc/pre-re/quests/collection/quest_caramel.txt
+++ b/npc/pre-re/quests/collection/quest_caramel.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Porcupine Quills)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-mjolnir_01,296,29,6	script	Yullo#Caramel_Hunt	95,{
+mjolnir_01,296,29,6	script	Yullo#Caramel_Hunt	4_F_SISTER,{
 	if (checkquest(60116) != -1) {
 		if (checkquest(60116,HUNTING) != 2 ) {
 			mes "[Yullo]";
diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt
index 0915d3988..7ba4cab02 100644
--- a/npc/pre-re/quests/collection/quest_coco.txt
+++ b/npc/pre-re/quests/collection/quest_coco.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Acorns)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-mjolnir_01,293,20,3	script	Nutters#Coco_Hunt	779,{
+mjolnir_01,293,20,3	script	Nutters#Coco_Hunt	4_M_YOYOROGUE,{
 	if (checkquest(60113) != -1) {
 		if (checkquest(60113,HUNTING) != 2 ) {
 			mes "[Nutters]";
diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt
index 4a1844719..ecdb6b0fb 100644
--- a/npc/pre-re/quests/collection/quest_creamy.txt
+++ b/npc/pre-re/quests/collection/quest_creamy.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests. (Dialog is semi-custom)
 //= Repeatable EXP Quest (Powder of Butterfly)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-prt_fild04,356,148,3	script	Laertes#Creamy_Hunt	798,{
+prt_fild04,356,148,3	script	Laertes#Creamy_Hunt	4_M_NFMAN,{
 	if (checkquest(60122) != -1) {
 		if (checkquest(60122,HUNTING) != 2 ) {
 			mes "[Laertes]";
diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt
index 7e659e1ca..242e7bca2 100644
--- a/npc/pre-re/quests/collection/quest_demonpungus.txt
+++ b/npc/pre-re/quests/collection/quest_demonpungus.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Bacillus)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-ein_fild01,43,249,0	script	Local Villager#hunt	898,{
+ein_fild01,43,249,0	script	Local Villager#hunt	4_M_HUMAN_01,{
 	if (checkquest(60125) != -1) {
 		if (checkquest(60125,HUNTING) != 2 ) {
 			mes "[Local Villager]";
diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
index 42ff4800c..35d48aef7 100644
--- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
+++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= Masao
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Custom Version.
 //= Repeatable EXP Quest : Kill 50 Disguise or Loli Ruri.
@@ -13,7 +11,7 @@
 //= 1.0 First version.
 //============================================================
 
-nif_fild02,332,327,4	script	Deadman	795,{
+nif_fild02,332,327,4	script	Deadman	4_M_NFDEADMAN,{
 
 	if (checkquest(60173) != -1) {
 		if (checkquest(60173,HUNTING) != 2 ) {
@@ -109,7 +107,7 @@ nif_fild02,332,327,4	script	Deadman	795,{
 			next;
 			switch(select("Disguise:Loli Ruri:Cancel")) {
 			case 1:
-				if(BaseLevel > 90){
+				if (BaseLevel > 90) {
 					mes "[Deadman]";
 					mes "Thank you for your great help with the Disguise!";
 					mes "Currently the Situation is stable and i'm not in need of your help anymore to kill them.";
@@ -120,7 +118,7 @@ nif_fild02,332,327,4	script	Deadman	795,{
 				setquest 60173;
 				close;
 			case 2:
-				if(BaseLevel > 98){
+				if (BaseLevel > 98) {
 					mes "[Deadman]";
 					mes "Thank you for your great help with the Loli Ruri!";
 					mes "Currently the Situation is stable and i'm not in need of your help anymore to kill them.";
diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt
index 3e6bcf637..62f0ed45d 100644
--- a/npc/pre-re/quests/collection/quest_dokebi.txt
+++ b/npc/pre-re/quests/collection/quest_dokebi.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Dokebi Horns)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-pay_fild10,108,357,5	script	Li#Dokebi_Hunt	90,{
+pay_fild10,108,357,5	script	Li#Dokebi_Hunt	4_F_01,{
 	if (checkquest(60128) != -1) {
 		if (checkquest(60128,HUNTING) != 2 ) {
 			mes "[Li]";
diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt
index 348dc75f9..552a1096f 100644
--- a/npc/pre-re/quests/collection/quest_dryad.txt
+++ b/npc/pre-re/quests/collection/quest_dryad.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Sharp Leaves)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-um_fild01,34,281,5	script	Lilla#Dryad_Hunt	724,{
+um_fild01,34,281,5	script	Lilla#Dryad_Hunt	4_F_07,{
 	if (checkquest(60131) != -1) {
 		if (checkquest(60131,HUNTING) != 2 ) {
 			mes "[Lilla]";
diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt
index 9c0c016a1..bd11cf8ae 100644
--- a/npc/pre-re/quests/collection/quest_fabre.txt
+++ b/npc/pre-re/quests/collection/quest_fabre.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Fluffs)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-gef_fild07,321,193,4	script	Langry#Fabre_Hunt	754,{
+gef_fild07,321,193,4	script	Langry#Fabre_Hunt	4_M_SAGE_A,{
 	if (checkquest(60107) != -1) {
 		if (checkquest(60107,HUNTING) != 2 ) {
 			mes "[Langry]";
diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt
index f0306d787..5c9321aa6 100644
--- a/npc/pre-re/quests/collection/quest_frilldora.txt
+++ b/npc/pre-re/quests/collection/quest_frilldora.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Frills)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-moc_fild17,66,273,5	script	Lemly#Frilldora_Hunt	725,{
+moc_fild17,66,273,5	script	Lemly#Frilldora_Hunt	4_F_JOB_ASSASSIN,{
 	if (checkquest(60134) != -1) {
 		if (checkquest(60134,HUNTING) != 2 ) {
 			mes "[Lemly]";
diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt
index 64d729386..292a38459 100644
--- a/npc/pre-re/quests/collection/quest_goat.txt
+++ b/npc/pre-re/quests/collection/quest_goat.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Antelope Horns)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-ein_fild06,82,171,0	script	Vegetable Farmer#Goat	919,{
+ein_fild06,82,171,0	script	Vegetable Farmer#Goat	4_F_SHABBY,{
 	if (checkquest(60137) != -1) {
 		if (checkquest(60137,HUNTING) != 2 ) {
 			mes "[Vegetable Farmer]";
diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt
index 882d878dd..2c927ea40 100644
--- a/npc/pre-re/quests/collection/quest_golem.txt
+++ b/npc/pre-re/quests/collection/quest_golem.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Stone Hearts)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-moc_fild11,57,138,0	script	Private Jeremy#hunt	707,{
+moc_fild11,57,138,0	script	Private Jeremy#hunt	4_M_MOC_SOLDIER,{
 	if (checkquest(60140) != -1) {
 		if (checkquest(60140,HUNTING) != 2 ) {
 			mes "[Private Jeremy]";
diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt
index 342ba5fc3..c534448d4 100644
--- a/npc/pre-re/quests/collection/quest_hode.txt
+++ b/npc/pre-re/quests/collection/quest_hode.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Earthworm Peelings)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-moc_fild17,208,346,5	script	Shone#Hode_Hunt	707,{
+moc_fild17,208,346,5	script	Shone#Hode_Hunt	4_M_MOC_SOLDIER,{
 	if (checkquest(60104) != -1) {
 		if (checkquest(60104,HUNTING) != 2 ) {
 			mes "[Shone]";
diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt
index 69f313f75..185ff2067 100644
--- a/npc/pre-re/quests/collection/quest_leafcat.txt
+++ b/npc/pre-re/quests/collection/quest_leafcat.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Huge Leaves)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-ayo_fild01,44,241,5	script	Lella#LeafCat_Hunt	877,{
+ayo_fild01,44,241,5	script	Lella#LeafCat_Hunt	4_F_YUNYANG,{
 	if (checkquest(60143) != -1) {
 		if (checkquest(60143,HUNTING) != 2 ) {
 			mes "[Lella]";
diff --git a/npc/pre-re/quests/collection/quest_mantis.txt b/npc/pre-re/quests/collection/quest_mantis.txt
index 5e9249a1c..3eb18ca4f 100644
--- a/npc/pre-re/quests/collection/quest_mantis.txt
+++ b/npc/pre-re/quests/collection/quest_mantis.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= Masao
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Custom Version.
 //= Repeatable EXP Quest : Kill 50 Mantis.
@@ -13,7 +11,7 @@
 //= 1.0 First version.
 //============================================================
 
-lou_fild01,240,354,4	script	Mantis Researcher	878,{
+lou_fild01,240,354,4	script	Mantis Researcher	4_M_OILMAN,{
 
 	if (checkquest(60179) != -1) {
 		if (checkquest(60179,HUNTING) != 2 ) {
@@ -71,7 +69,7 @@ lou_fild01,240,354,4	script	Mantis Researcher	878,{
 			next;
 			switch(select("Sure:Cancel")) {
 			case 1:
-				if(BaseLevel > 70){
+				if (BaseLevel > 70) {
 					mes "[Mantis Researcher]";
 					mes "Thank you for your great help with the Mantis!";
 					mes "Currently the Situation is stable and i'm not in need of your help anymore to kill them.";
diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt
index 1850180e1..3460320ce 100644
--- a/npc/pre-re/quests/collection/quest_pecopeco.txt
+++ b/npc/pre-re/quests/collection/quest_pecopeco.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Bill of Birds)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-moc_fild02,74,329,3	script	Gregor#PecoPeco_Hunt	97,{
+moc_fild02,74,329,3	script	Gregor#PecoPeco_Hunt	4W_M_01,{
 	if (checkquest(60101) != -1) {
 		if (checkquest(60101,HUNTING) != 2 ) {
 			mes "[Gregor]";
diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt
index b6088a49f..64aafe42f 100644
--- a/npc/pre-re/quests/collection/quest_pupa.txt
+++ b/npc/pre-re/quests/collection/quest_pupa.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Added Monster Killing quests.
 //= Repeatable EXP Quest (Chrysalis)
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-gef_fild04,191,54,3	script	Halgus#Pupa_Hunt	123,{
+gef_fild04,191,54,3	script	Halgus#Pupa_Hunt	2_F_MAGICMASTER,{
 	if (checkquest(60110) != -1) {
 		if (checkquest(60110,HUNTING) != 2 ) {
 			mes "[Halgus]";
diff --git a/npc/pre-re/quests/collection/quest_zhupolong.txt b/npc/pre-re/quests/collection/quest_zhupolong.txt
index bf3999683..a167ec3e5 100644
--- a/npc/pre-re/quests/collection/quest_zhupolong.txt
+++ b/npc/pre-re/quests/collection/quest_zhupolong.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= iRO Repeatable EXP Quests.
 //===== By: ==================================================
 //= Masao
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Custom Version.
 //= Repeatable EXP Quest : Kill 50 Zhu Po Long.
@@ -13,7 +11,7 @@
 //= 1.0 First version.
 //============================================================
 
-lou_dun02,161,264,4	script	Dragon Hunter	732,{
+lou_dun02,161,264,4	script	Dragon Hunter	4_M_JOB_HUNTER,{
 
 	if (checkquest(60182) != -1) {
 		if (checkquest(60182,HUNTING) != 2 ) {
@@ -71,7 +69,7 @@ lou_dun02,161,264,4	script	Dragon Hunter	732,{
 			next;
 			switch(select("Sure:Cancel")) {
 			case 1:
-				if(BaseLevel > 90){
+				if (BaseLevel > 90) {
 					mes "[Dragon Hunter]";
 					mes "Thank you for your great help with the Zhu Po Long!";
 					mes "Currently the Situation is stable and i'm not in need of your help anymore to kill them.";
diff --git a/npc/pre-re/quests/doomed_swords.txt b/npc/pre-re/quests/doomed_swords.txt
deleted file mode 100644
index 9d27d588b..000000000
--- a/npc/pre-re/quests/doomed_swords.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-//===== Hercules Script =======================================
-//= Doomed Swords Quest
-//===== By: ==================================================
-//= kobra_k88; L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules GIT
-//===== Description: =========================================
-//= [Aegis Conversion]
-//= Doomed Swords Quest:
-//= - Quest for Doomed Swords: Grimtooth, Mysteltain, Executioner.
-//=   Although this quest is enabled on iRO, the Mysteltainn
-//=   portion is NOT completable as the item "Young Twig" does
-//=   not drop.
-//= - Variable in use: event_magum (max 6)
-//= - Variable in use: dmdswrd_Q2 (bits 1 - 32)
-//===== Additional Comments: =================================
-//= 1.0 Moved from main folder [Streusel]
-//============================================================
-
-izlude_in,173,88,2	script	Nain#magum	102,{
-	if (dmdswrd_Q2 == 4) {
-		mes "[Nain]";
-		mes "It doesn't matter how";
-		mes "powerful the Executioner";
-		mes "is: if it were to end up in";
-		mes "my hands, I would get rid";
-		mes "of it right away. I'd never risk losing my mind to that curse...";
-		close;
-	}
-	mes "[Nain]";
-	mes "Long ago, one sword";
-	mes "was used to behead all";
-	mes "the criminals that had been";
-	mes "sentenced to death. That";
-	mes "accursed blade is known";
-	mes "as the Executioner.";
-	next;
-	mes "[Nain]";
-	mes "As the Executioner slayed";
-	mes "more criminals, the rage and";
-	mes "bloodlust of its victims began";
-	mes "to accumulate upon the blade.";
-	mes "Although the sword gained great^FFFFFF ^000000 strength, it was tainted by evil.";
-	next;
-	mes "[Nain]";
-	mes "The last person to wield";
-	mes "the Executioner almost lost";
-	mes "his mind to the sword. He saved^FFFFFF ^000000 himself by giving it to a talented";
-	mes "blacksmith who would destroy^FFFFFF ^000000 it for him, thus saving his soul.";
-	next;
-	mes "[Nain]";
-	mes "This mysterious blacksmith";
-	mes "was never seen again in the";
-	mes "city of Prontera, but rumor has";
-	mes "it that if you can find him, he";
-	mes "can forge that accursed";
-	mes "Executioner anew...";
-	if (event_magum == 1)
-		set event_magum,5;
-	set dmdswrd_Q2,dmdswrd_Q2 | 4;
-	close;
-}
\ No newline at end of file
diff --git a/npc/pre-re/quests/first_class/tu_archer.txt b/npc/pre-re/quests/first_class/tu_archer.txt
new file mode 100644
index 000000000..5f53d0385
--- /dev/null
+++ b/npc/pre-re/quests/first_class/tu_archer.txt
@@ -0,0 +1,14 @@
+//===== Hercules Script ======================================
+//= Archer Class Tutorial and Job Specific Quest
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Archer training quest.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+mjolnir_11,27,223,3	duplicate(Acolyte_Tu)	Acolyte#tu	4_F_SISTER
diff --git a/npc/pre-re/quests/monstertamers.txt b/npc/pre-re/quests/monstertamers.txt
index 86f118f5a..6d998fdbf 100644
--- a/npc/pre-re/quests/monstertamers.txt
+++ b/npc/pre-re/quests/monstertamers.txt
@@ -1,15 +1,13 @@
-//===== Hercules Script =======================================
+//===== Hercules Script ======================================
 //= Monster Tamers
 //===== By: ==================================================
-//= Streusel
+//= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Cute pet quest items
 //===== Additional Comments: =================================
-//= 1.0 Duplicates for Monster Tamer [Streusel]
+//= 1.0 Moved Izlude NPC to pre-re/re paths.
 //============================================================
 
-izlude_in,129,64,4	duplicate(Monster_Tamer#izu)	Monster Tamer#izlude	125
\ No newline at end of file
+izlude_in,129,64,4	duplicate(MonsterTamer_izlude)	Monster Tamer#izu	4_M_TELEPORTER
diff --git a/npc/pre-re/quests/mrsmile.txt b/npc/pre-re/quests/mrsmile.txt
index b03afb770..525221af9 100644
--- a/npc/pre-re/quests/mrsmile.txt
+++ b/npc/pre-re/quests/mrsmile.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Mr. Smile Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Daegaladh
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
-//============================================================ 
+//============================================================
 
-izlude,129,118,4	duplicate(SmileHelper)	Smile Assistance#iz	92
+izlude,129,118,4	duplicate(SmileHelper)	Smile Assistance#iz	4_F_03
diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt
index b98aa2b95..ec291e16e 100644
--- a/npc/pre-re/quests/quests_13_1.txt
+++ b/npc/pre-re/quests/quests_13_1.txt
@@ -1,17 +1,13 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Ash-Vacuum
 //===== By: ==================================================
-//= Streusel
+//= Euphy
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Official Conversion]
-//= Contains:
-//= Promotional Staff Duplicate for pre-renewal
+//= Contains duplicate NPCs from main script.
 //===== Additional Comments: =================================
-//= 1.0 First Version. [Streusel]
+//= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy]
 //============================================================
 
-// Onward to the New World
-//============================================================
-izlude,101,173,6	duplicate(Promotional Staff#iz)	Promotional Staff#izlude	100
\ No newline at end of file
+izlude,101,173,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz	4W_SAILOR
diff --git a/npc/pre-re/quests/quests_izlude.txt b/npc/pre-re/quests/quests_izlude.txt
index e742332eb..aac9f5467 100644
--- a/npc/pre-re/quests/quests_izlude.txt
+++ b/npc/pre-re/quests/quests_izlude.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Izlude
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Daegaladh
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Edgar's Offer
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
 
-izlude,182,186,2	duplicate(Edgar_izlude)	Edgar#izlude	49
+izlude,182,186,2	duplicate(Edgar_izlude)	Edgar#izlude	1_M_03
diff --git a/npc/pre-re/quests/quests_lighthalzen.txt b/npc/pre-re/quests/quests_lighthalzen.txt
index aadb0296d..c9365857a 100644
--- a/npc/pre-re/quests/quests_lighthalzen.txt
+++ b/npc/pre-re/quests/quests_lighthalzen.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs located in Lighthalzen
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Daegaladh
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Quests related to Lighthalzen City.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
-//============================================================ 
+//============================================================
 
-izlude,186,57,5	duplicate(Scamp)	Scamp#2	853
+izlude,186,57,5	duplicate(Scamp)	Scamp#iz	4_M_YURI
diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt
index ab5d816dc..77654e084 100644
--- a/npc/pre-re/quests/quests_nameless.txt
+++ b/npc/pre-re/quests/quests_nameless.txt
@@ -1,391 +1,15 @@
 //===== Hercules Script ======================================
 //= Nameless Island Quests
-//===== By: ================================================== 
-//= Streusel
-//===== Current Version: ===================================== 
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
+//= [Official Conversion]
 //= Contains:
-//= Part of Muff's Loan:
-//- - Help Muff clear his Debt and get his collateral back.
-//= - prerequisite Quest to "Broken Diamond"
-//= - Variable in use: diamond_edq (Max: 14)
-//===== Additional Comments: ================================= 
-//= 1.0 First version.
-//============================================================ 
+//= - Muff's Loan
+//===== Additional Comments: =================================
+//= 1.0 Moved Dorian to pre-re/re paths.
+//============================================================
 
-izlude_in,113,66,0	script	Strange Machine	111,{
-	if (checkweight(907,200) == 0) {
-		mes "[Dorian]";
-		mes "Ugh, just like a member";
-		mes "of the working class:";
-		mes "hoarding all your items";
-		mes "like a packrat? Have the";
-		mes "decency to relocate your";
-		mes "goods to Kafra Storage, please.";
-		close;
-	}
-	if (diamond_edq) == 10 {
-		set .@bolt_rand,rand(2,5);
-		mes "^3355FFThis must be Dorian's";
-		mes "Mystic Dryer de Elegance.";
-		mes "What do you want to do?^000000";
-		next;
-		while(1) {
-			set .@switch_sound,rand(1,4);
-			switch(select("Check the Machine:Replace the Engine:Tighten the Screw:Press a Switch")) {
-			case 1:
-				if (.@hit_status == 0) {
-					mes "^3355FFThere's no power";
-					mes "in this behemoth";
-					mes "of a machine.^000000";
-					next;
-				}
-				break;
-			case 2:
-				if (.@engine == 0) {
-					mes "^3355FFYou replace the rough";
-					mes "ruby in the ruby engine";
-					mes "with a new rough ruby.";
-					mes "It clicks into place";
-					mes "inside the engine core.^000000";
-					next;
-					set .@engine,.@engine+1;
-				}
-				else if (engine > 0) {
-					mes "^3355FFThe ruby in the";
-					mes "engine has already";
-					mes "been replaced.^000000";
-					next;
-				}
-				break;
-			case 3:
-				if (.@engine <  1) {
-					mes "^3355FFYou probably need";
-					mes "to replace the ruby";
-					mes "in the engine first.^000000";
-					next;
-				}
-				else if ((.@engine == 1) && (.@bolt < .@bolt_rand)) {
-					mes "^3355FF*Krrrr-Krrrrr*^000000";
-					mes "^3355FF*Krrrr-Krrrrr*^000000";
-					next;
-					set .@bolt,.@bolt+1;
-				}
-				else if ((.@engine == 1) && (.@bolt == .@bolt_rand)) {
-					mes "^3355FF*Krrrr-Krrrrr*^000000";
-					mes "^0000FF*Click*^000000";
-					next;
-					set .@bolt,.@bolt+1;
-					set .@bolt_suc,.@bolt_suc+1;
-				}
-				else if ((.@engine == 1) && (.@bolt > .@bolt_rand)) {
-					mes "^3355FF*Krrrr-Krrrrr*^000000";
-					mes "^3355FF*KrrICK-ICK-ICK-KOOM*^000000";
-					next;
-					mes "^3355FFYou tightened the";
-					mes "screw too tightly!";
-					mes "The joint is broken...";
-					mes "You should go back";
-					mes "to Dorian for help.^000000";
-					setquest 3106;
-					set diamond_edq,11;
-					close;
-				}
-				else {
-					mes "^3355FFSomething must have";
-					mes "gone wrong. You'd be";
-					mes "better off starting";
-					mes "from the beginning...^000000";
-					close;
-				}
-				break;
-			case 4:
-				if ((.@engine <  1) && (.@bolt_suc < 1)) {
-					mes "^3355FFYou need to replace";
-					mes "the engine's ruby and";
-					mes "tighten the main screw";
-					mes "before you mess with";
-					mes "these switches.^000000";
-					next;
-				}
-				else if ((.@engine == 1) && (.@bolt_suc < 1)) {
-					mes "^3355FFYou need to tighten";
-					mes "the scren before you can";
-					mes "start the engine safely.";
-					next;
-				}
-				else if ((.@red >= 1) && (.@blue >= 1) && (.@yellow >= 1) && (.@green >= 1)) {
-					mes "^3355FFThe Mystic Dryer de";
-					mes "Elegance started with";
-					mes "a mighty buzz, and the";
-					mes "sound lowers to a calm";
-					mes "hum as it stabilizes.";
-					mes "It looks like you fixed it!^000000";
-					next;
-					mes "^3355FFYou should tell Dorian";
-					mes "first so that you can";
-					mes "use this machine.^000000";
-					setquest 3107;
-					set diamond_edq,12;
-					close;
-				}
-				else if ((.@engine == 1) && (.@bolt_suc == 1)) {
-					if (.@switch_sound == 1) {
-						mes "^3355FF*Buzz Buzz*^000000";
-						mes "^3355FF*Buzz Buzz*^000000";
-						mes "^3355FFThe machine is";
-						mes "vibrating weakly.";
-						mes "Which switch do";
-						mes "you want to press?^000000";
-						next;
-						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
-						default:
-							mes "^3355FF*Whiz Whiz*^000000";
-							mes "^3355FF*Whiz Whiz*^000000";
-							next;
-							mes "^3355FFThe machine made some";
-							mes "violent, erratic sounds,";
-							mes "and vibrated violently";
-							mes "before coming to a sudden";
-							mes "stop. That was the wrong";
-							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
-							setquest 3106;
-							set diamond_edq,11;
-							close;
-						case 1:
-							if (.@red  >= 0) {
-								mes "^3355FF*Buzzz Buzzz*^000000";
-								mes "^3355FF*Clang...!*^000000";
-								next;
-								mes "^3355FFThe machine's";
-								mes "vibrations have";
-								mes "grown stronger.";
-								mes "It looks like you";
-								mes "chose the right switch.^000000";
-								next;
-								set .@red,.@red+1;
-							}
-							else {
-								mes "^3355FF*Whiz Whiz*^000000";
-								mes "^3355FF*Whiz Whiz*^000000";
-								next;
-								mes "^3355FFThe machine made some";
-								mes "violent, erratic sounds,";
-								mes "and vibrated violently";
-								mes "before coming to a sudden";
-								mes "stop. That was the wrong";
-								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
-								setquest 3106;
-								set diamond_edq,11;
-								close;
-							}
-							break;
-						}
-					}
-					else if (.@switch_sound == 2) {
-						mes "^3355FF*Purr Purr*^000000";
-						mes "^3355FF*Purr Purr*^000000";
-						mes "^3355FFThe machine is vibrating";
-						mes "a little bit more strongly.";
-						mes "Which switch will";
-						mes "you try now?^000000";
-						next;
-						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
-						default:
-							mes "^3355FF*Whiz Whiz*^000000";
-							mes "^3355FF*Whiz Whiz*^000000";
-							next;
-							mes "^3355FFThe machine made some";
-							mes "violent, erratic sounds,";
-							mes "and vibrated violently";
-							mes "before coming to a sudden";
-							mes "stop. That was the wrong";
-							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
-							setquest 3106;
-							set diamond_edq,11;
-							close;
-						case 2:
-							if (.@blue >= 0) {
-								mes "^3355FF*Purrr Purr*^000000";
-								mes "^3355FF*Clang...!*^000000";
-								next;
-								mes "^3355FFThe machine's";
-								mes "vibrations have";
-								mes "grown stronger.";
-								mes "It looks like you";
-								mes "chose the right switch.^000000";
-								next;
-								set .@blue,.@blue+1;
-							}
-							else {
-								mes "^3355FF*Whiz Whiz*^000000";
-								mes "^3355FF*Whiz Whiz*^000000";
-								next;
-								mes "^3355FFThe machine made some";
-								mes "violent, erratic sounds,";
-								mes "and vibrated violently";
-								mes "before coming to a sudden";
-								mes "stop. That was the wrong";
-								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
-								setquest 3106;
-								set diamond_edq,11;
-								close;
-							}
-							break;
-						}
-					}
-					else if (.@switch_sound == 3) {
-						mes "^3355FF*Bzzz Bzzz*";
-						mes "*Bzzz Bzzz*";
-						mes "The machine's vibrations";
-						mes "are a bit more stable now.";
-						mes "Which switch will you try?^000000";
-						next;
-						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
-						default:
-							mes "^3355FF*Whiz Whiz*^000000";
-							mes "^3355FF*Whiz Whiz*^000000";
-							next;
-							mes "^3355FFThe machine made some";
-							mes "violent, erratic sounds,";
-							mes "and vibrated violently";
-							mes "before coming to a sudden";
-							mes "stop. That was the wrong";
-							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
-							setquest 3106;
-							set diamond_edq,11;
-							close;
-						case 3:
-							if (.@yellow >= 0) {
-								mes "^3355FF*Bzzzz Bzzzz*^000000";
-								mes "^3355FF*Clang...!*^000000";
-								next;
-								mes "^3355FFThe machine's";
-								mes "vibrations have";
-								mes "grown stronger.";
-								mes "It looks like you";
-								mes "chose the right switch.^000000";
-								next;
-								set .@yellow,.@yellow+1;
-							}
-							else {
-								mes "^3355FF*Whiz Whiz*^000000";
-								mes "^3355FF*Whiz Whiz*^000000";
-								next;
-								mes "^3355FFThe machine made some";
-								mes "violent, erratic sounds,";
-								mes "and vibrated violently";
-								mes "before coming to a sudden";
-								mes "stop. That was the wrong";
-								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
-								setquest 3106;
-								set diamond_edq,11;
-								close;
-							}
-							break;
-						}
-					}
-					else if (.@switch_sound == 4) {
-						next;
-						mes "^3355FF*Pzzzz Pzzz*";
-						mes "*Pzzzz Pzzz*";
-						mes "The machine is vibrating";
-						mes "fairly strongly now. Which";
-						mes "switch will you try?^000000";
-						next;
-						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
-						default:
-							mes "^3355FF*Whiz Whiz*^000000";
-							mes "^3355FF*Whiz Whiz*^000000";
-							next;
-							mes "^3355FFThe machine made some";
-							mes "violent, erratic sounds,";
-							mes "and vibrated violently";
-							mes "before coming to a sudden";
-							mes "stop. That was the wrong";
-							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
-							setquest 3106;
-							set diamond_edq,11;
-							close;
-						case 4:
-							if (.@green >= 0) {
-								mes "^3355FFPzzzzz Pzzzz*^000000";
-								mes "^3355FF*Clang...!*^000000";
-								next;
-								mes "^3355FFThe machine's";
-								mes "vibrations have";
-								mes "grown stronger.";
-								mes "It looks like you";
-								mes "chose the right switch.^000000";
-								next;
-								set .@green,.@green+1;
-							}
-							else {
-								mes "^3355FF*Whiz Whiz*^000000";
-								mes "^3355FF*Whiz Whiz*^000000";
-								next;
-								mes "^3355FFThe machine made some";
-								mes "violent, erratic sounds,";
-								mes "and vibrated violently";
-								mes "before coming to a sudden";
-								mes "stop. That was the wrong";
-								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
-								setquest 3106;
-								set diamond_edq,11;
-								close;
-							}
-							break;
-						}
-					}
-				}
-			}
-		}
-	}
-	if (diamond_edq == 12) {
-		mes "[Dorian]";
-		mes "It sounds like you're";
-		mes "done fixing my Mystic";
-		mes "Dryer de Elegance.";
-		mes "Why don't you come";
-		mes "back so I can explain";
-		mes "how you can use it?";
-		close;
-	}
-	if ((diamond_edq == 13) && (countitem(7722) < 1)) {
-		mes "^3355FFYou lift the main";
-		mes "operational switch,";
-		mes "turning on a light and";
-		mes "opening a convenient";
-		mes "slot. You insert the";
-		mes "wet bond of debt.^000000";
-		next;
-		mes "^3355FFThe engine's pistons";
-		mes "and cylinders churn";
-		mes "with a lively din, and";
-		mes "when the heater stops,";
-		mes "the slot reopens.^000000";
-		next;
-		mes "[" + strcharinfo(0) + "]";
-		mes "So this is the original";
-		mes "bond of debt that Muff";
-		mes "lost? It looks... Perfect!";
-		changequest 3108,3109;
-		getitem 7722,1; //Debt_Note
-		close;
-	}
-	else if ((diamond_edq == 13) && (countitem(7722) > 0)) {
-		mes "You already used this";
-		mes "machine to restore the";
-		mes "bond of debt. There's no";
-		mes "need to mess around";
-		mes "with it any longer.";
-		close;
-	}
-	mes "[Dorian]";
-	mes "Who are you?";
-	mes "Don't you dare lay";
-	mes "a hand on my precious";
-	mes "masterpiece inventions! ";
-	close;
-}
\ No newline at end of file
+izlude_in,110,64,3	duplicate(Dorian_izlude)	Dorian	4_M_OILMAN,2,2
diff --git a/npc/pre-re/quests/quests_veins.txt b/npc/pre-re/quests/quests_veins.txt
new file mode 100644
index 000000000..23262d482
--- /dev/null
+++ b/npc/pre-re/quests/quests_veins.txt
@@ -0,0 +1,13 @@
+//===== Hercules Script ======================================
+//= Quest NPCs located in Veins
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Quests related to Lighthalzen City.
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+ve_fild05,257,130,4	duplicate(WincingOldMan_veins)	Wincing Old Man#ve	4_M_DST_GRAND
diff --git a/npc/pre-re/quests/skills/swordman_skills.txt b/npc/pre-re/quests/skills/swordman_skills.txt
deleted file mode 100644
index 7a4aa2ff3..000000000
--- a/npc/pre-re/quests/skills/swordman_skills.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-//===== Hercules Script =======================================
-//= Swordsman Skills Quests
-//===== By: ==================================================
-//= kobra_k88
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules GIT
-//===== Description: =========================================
-//= Quests for skills: Fatal Blow, Mobile HP Recovery,
-//  Auto-Berserk
-//===== Additional Comments: =================================
-//= 1.0 Moved from main folder. [Streusel]
-//============================================================
-
-izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
-	if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) {
-		mes "[De Thomas]";
-		mes "Oh, no! You must have been hurt! Are you ok?";
-		mes "You must have fought hard to get such serious injuries..";
-		mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
-		next;
-		mes "[De Thomas]";
-		if (Sex == 0) {
-			mes "For these swordsmen and knights, there is a wonderful skill.";
-		}
-		else {
-			mes "For these swordswomen and knights, there is a wonderful skill young lady.";
-		}
-		mes "I present to you - HP Recovery While Moving!";
-		mes "Body moving is a splendid skill";
-		mes "that allows you to regain strength(HP)";
-		mes "while you are moving!";
-		next;
-		mes "[De Thomas]";
-		mes "It is currently under development";
-		mes "so it may not recover that much,";
-		mes "but it will help a little.";
-		mes "What do you think? Would you like to learn this skill?";
-		next;
-		switch (select("What a nice skill! I want to learn it!:No, thank you.")) {
-		case 1:
-			mes "[De Thomas]";
-			mes "Very well. I will tell you what you need to learn this skill.";
-			mes "First, your job level must be higher than ^00880035^000000.";
-			mes "You will also need ^008800200 empty bottles^000000.";
-			mes "Why? Because it is proof that you fought fiercely to have used that many potions.";
-			next;
-			mes "[De Thomas]";
-			mes "Also, the armor you used in battle.";
-			mes "This is also proof of an experienced fighter.";
-			mes "For the armor... your armor is perfect!";
-			mes "Bring your armor!";
-			mes "Last but not least... bring me one ^008800Moth Wing^000000.";
-			next;
-			menu "Eh? You need that, too?",-;
-			mes "[De Thomas]";
-			mes "Not really.. I don't really NEED it.";
-			mes "It's just that my niece has gotten a bug hunting as a holiday task during the summer vacation.";
-			mes "Of course! It would be much easier for me to get it myself.";
-			mes "but I must work here all the time so I don't exactly have the time to go out and get it.";
-			next;
-			mes "[De Thomas]";
-			mes "Don't you think it is pitiful that I have to stay in once place everyday, not being able to go outside?";
-			mes "Please, find me one...*sniffsniff*";
-			mes "If you don't...";
-			set sm_movingrecovery_x,1;
-			mes "You won't get anything! Muahahaha.";
-			close;
-		case 2:
-			mes "[De Thomas]";
-			mes "...";
-			close;
-		}
-	}
-	else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x > 1)) {
-		mes "[De Thomas]";
-		mes "Oh, it's you?";
-		mes "Long time no see!";
-		mes "You seem healthier than before.";
-		mes "Hahahaha!";
-		mes "Take care! See you again!";
-		close;
-	}
-	else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x == 1)) {
-		mes "[De Thomas]";
-		mes "Welcome back...";
-		mes "are you ready to learn Body Movin'?";
-		next;
-		switch (select("Yes.:No, I'm not ready yet.")) {
-		case 1:
-			if ((JobLevel > 34 || (BaseJob == Job_Knight || BaseJob == Job_Crusader)) && (countitem(713) > 199) && (countitem(1058) > 0)) {
-				mes "[De Thomas]";
-				mes "Let's see.....";
-				next;
-				mes "[De Thomas]";
-				mes "Ok! I shall now teach you...";
-				mes "...The Body Movin' skill!";
-				next;
-				delitem 713,200; //Empty_Bottle
-				delitem 1058,1; //Wing_Of_Moth
-				skill "SM_MOVINGRECOVERY",1,0;
-				set sm_movingrecovery_x,2;
-				mes "[De Thomas]";
-				mes "There you go!";
-				mes "Try it yourself.";
-				mes "But don't overdo it.";
-				next;
-				mes "[De Thomas]";
-				mes "Oh yeah, I won't be needing your";
-				mes "armor so you can keep it.";
-				mes "Good luck now!";
-				close;
-			}
-			else if (JobLevel < 35 && (BaseJob != Job_Knight && BaseJob != Job_Crusader)) {
-				mes "[De Thomas]";
-				mes "Wait a second, your Job level isn't above ^00880035^000000!";
-				mes "Come back when it is.";
-				close;
-			}
-			else if ((countitem(713) < 200) || (countitem(1058) < 1)) {
-				mes "[De Thomas]";
-				mes "You do not have all the items I asked for.";
-				next;
-				mes "[De Thomas]";
-				mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
-				close;
-			}
-			mes "[De Thomas]";
-			mes "You do not have all the items I asked for.";
-			next;
-			mes "[De Thomas]";
-			mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
-			close;
-		case 2:
-			mes "[De Thomas]";
-			mes "Is that so?";
-			mes "Then come when you are prepared.";
-			close;
-		}
-	}
-	mes "[De Thomas]";
-	mes "My name is De Thomas Carlos.";
-	mes "Knight of Prontera's 3rd Calvary.";
-	mes "I have a certain duty these days.";
-	mes "Ehem! Need I say more.";
-	close;
-}
\ No newline at end of file
diff --git a/npc/pre-re/scripts.conf b/npc/pre-re/scripts.conf
index 6a69ede0e..1a6c0cd49 100644
--- a/npc/pre-re/scripts.conf
+++ b/npc/pre-re/scripts.conf
@@ -9,6 +9,7 @@ npc: npc/pre-re/airports/izlude.txt
 npc: npc/pre-re/cities/alberta.txt
 npc: npc/pre-re/cities/izlude.txt
 npc: npc/pre-re/cities/jawaii.txt
+npc: npc/pre-re/cities/yuno.txt
 
 // --------------------------- Guides ---------------------------
 npc: npc/pre-re/guides/guides_alberta.txt
@@ -34,14 +35,20 @@ npc: npc/pre-re/guides/guides_umbala.txt
 npc: npc/pre-re/guides/guides_veins.txt
 
 // ---------------- Kafras & Cool Event Corp. -------------------
-npc: npc/pre-re/kafras/kafras_izl.txt
+npc: npc/pre-re/kafras/kafras.txt
 
 // -------------------------- Merchant --------------------------
+npc: npc/pre-re/merchants/ammo_boxes.txt
+npc: npc/pre-re/merchants/ammo_dealer.txt
 npc: npc/pre-re/merchants/shops.txt
 
 // --------------------------- Others ---------------------------
-// --------------------------------------------------------------
+npc: npc/pre-re/other/bulletin_boards.txt
 npc: npc/pre-re/other/mercenary_rent.txt
+npc: npc/pre-re/other/pvp.txt
+npc: npc/pre-re/other/msg_boards.txt
+npc: npc/pre-re/other/resetskill.txt
+npc: npc/pre-re/other/turbo_track.txt
 
 // --------------------------- Quests ---------------------------
 // - Repeatable EXP Quests (iRO) --------------------------------
@@ -67,10 +74,13 @@ npc: npc/pre-re/other/mercenary_rent.txt
 //npc: npc/pre-re/quests/collection/quest_pupa.txt
 //npc: npc/pre-re/quests/collection/quest_zhupolong.txt
 // --------------------------------------------------------------
+// - Quests-Tutorials for basic classes (1st class quests) ------
+npc: npc/pre-re/quests/first_class/tu_archer.txt
+// --------------------------------------------------------------
+npc: npc/pre-re/quests/monstertamers.txt
 npc: npc/pre-re/quests/mrsmile.txt
+npc: npc/pre-re/quests/quests_13_1.txt
 npc: npc/pre-re/quests/quests_izlude.txt
 npc: npc/pre-re/quests/quests_lighthalzen.txt
-npc: npc/pre-re/quests/monstertamers.txt
 npc: npc/pre-re/quests/quests_nameless.txt
-npc: npc/pre-re/quests/quests_13_1.txt
-npc: npc/pre-re/quests/skills/swordman_skills.txt
\ No newline at end of file
+npc: npc/pre-re/quests/quests_veins.txt
diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf
index db7ed1411..8e75dd332 100644
--- a/npc/pre-re/scripts_main.conf
+++ b/npc/pre-re/scripts_main.conf
@@ -1,15 +1,15 @@
 // --------------------------------------------------------------
-// -           rAthena Pre-Renewal Primary Scripts File         -
+// -          Hercules Pre-Renewal Primary Scripts File         -
 // --------------------------------------------------------------
 //  The idea of this new system is to make scripts more organized
 // since the old system was rather messy with all the NPCs in one
 // file. Now scripts are organized in to files arraged by type.
-//  Custom scripts are now in scripts_custom.conf, all other 
+//  Custom scripts are now in scripts_custom.conf, all other
 // scripts are deemed as 'official'. You should place your NPCs
 // in to scripts_custom.conf to follow the trend.
 //
 // Thanks,
-//  Ancyker and the rest of the rAthena Team
+//  Ancyker and the rest of the Hercules Team
 //
 // Note: "Comments" are all text on the right side of a double slash "//"
 // Whatever text is commented will not be parsed by the servers, and serves
@@ -39,6 +39,9 @@ import: npc/pre-re/scripts_jobs.conf
 import: npc/pre-re/scripts_monsters.conf
 import: npc/pre-re/scripts_warps.conf
 
+// ----------- Development / Testing Script Files ---------------
+import: npc/scripts_dev.conf
+
 // ------------------- Custom Script Files ----------------------
 // - Your NPCs go in this file!
 import: npc/scripts_custom.conf
diff --git a/npc/pre-re/scripts_monsters.conf b/npc/pre-re/scripts_monsters.conf
index 8ae26c878..77baac554 100644
--- a/npc/pre-re/scripts_monsters.conf
+++ b/npc/pre-re/scripts_monsters.conf
@@ -2,6 +2,8 @@
 // -                  Pre-Renewal Monster Scripts               -
 // --------------------------------------------------------------
 
+npc: npc/pre-re/mobs/citycleaners.txt
+
 // -------------------------- Dungeons --------------------------
 npc: npc/pre-re/mobs/dungeons/abbey.txt
 npc: npc/pre-re/mobs/dungeons/abyss.txt
@@ -52,7 +54,6 @@ npc: npc/pre-re/mobs/fields/einbroch.txt
 npc: npc/pre-re/mobs/fields/geffen.txt
 npc: npc/pre-re/mobs/fields/gonryun.txt
 npc: npc/pre-re/mobs/fields/hugel.txt
-npc: npc/pre-re/mobs/fields/jawaii.txt
 npc: npc/pre-re/mobs/fields/lighthalzen.txt
 npc: npc/pre-re/mobs/fields/louyang.txt
 npc: npc/pre-re/mobs/fields/lutie.txt
diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf
index d650676c6..50e87d0d9 100644
--- a/npc/pre-re/scripts_warps.conf
+++ b/npc/pre-re/scripts_warps.conf
@@ -19,4 +19,5 @@ npc: npc/pre-re/warps/fields/veins_fild.txt
 npc: npc/pre-re/warps/fields/yuno_fild.txt
 
 // --------------------------- Others ---------------------------
-npc: npc/pre-re/warps/other/sign.txt
\ No newline at end of file
+npc: npc/pre-re/warps/other/arena.txt
+npc: npc/pre-re/warps/other/sign.txt
diff --git a/npc/pre-re/warps/cities/izlude.txt b/npc/pre-re/warps/cities/izlude.txt
index f2f1b6aaa..6aa6af7d2 100644
--- a/npc/pre-re/warps/cities/izlude.txt
+++ b/npc/pre-re/warps/cities/izlude.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Izlude Warp Script
 //===== By: ==================================================
 //= Athena (1.0), Nana (1.1)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Izlude
 //===== Additional Comments: =================================
diff --git a/npc/pre-re/warps/cities/rachel.txt b/npc/pre-re/warps/cities/rachel.txt
index f5497f3ac..2f16964c3 100644
--- a/npc/pre-re/warps/cities/rachel.txt
+++ b/npc/pre-re/warps/cities/rachel.txt
@@ -1,22 +1,20 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Rachel Warp Script
 //===== By: ==================================================
 //= erKURITA & RockmanEXE
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Rachel City, shops & other locations
 //===== Additional Comments: =================================
-//= 1.0 Added the official warps and commented out the 
+//= 1.0 Added the official warps and commented out the
 //= 	  "custom duplicates" for future checkout. Special thanks
 //= 	  to RockmanEXE who provided all the info. [erKURITA]
 //= 1.1 Added warp to Veins Field [Playtester]
 //= 1.2 Fully official rachel warps [Playtester]
 //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf]
 //= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf]
-//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] 
+//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf]
 //============================================================
 
 rachel,150,249,0	warp	rachel01	1,1,ra_temple,120,30
diff --git a/npc/pre-re/warps/cities/yggdrasil.txt b/npc/pre-re/warps/cities/yggdrasil.txt
index bd4a74996..89540aa36 100644
--- a/npc/pre-re/warps/cities/yggdrasil.txt
+++ b/npc/pre-re/warps/cities/yggdrasil.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yggdrasil Tree Warp Script
 //===== By: ==================================================
 //= PKGINGO (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Yggdrasil Tree
 //===== Additional Comments: =================================
diff --git a/npc/pre-re/warps/fields/com_fild.txt b/npc/pre-re/warps/fields/com_fild.txt
index a28eace85..0e7c8643e 100644
--- a/npc/pre-re/warps/fields/com_fild.txt
+++ b/npc/pre-re/warps/fields/com_fild.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Comodo Field Warp Script
 //===== By: ==================================================
 //= Nana
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Comodo Fields
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
diff --git a/npc/pre-re/warps/fields/geffen_fild.txt b/npc/pre-re/warps/fields/geffen_fild.txt
index fd4350fe6..902fd8aa0 100644
--- a/npc/pre-re/warps/fields/geffen_fild.txt
+++ b/npc/pre-re/warps/fields/geffen_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Geffen Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Geffen Field's
 //===== Additional Comments: =================================
diff --git a/npc/pre-re/warps/fields/hugel_fild.txt b/npc/pre-re/warps/fields/hugel_fild.txt
index c86980a98..df85a3e01 100644
--- a/npc/pre-re/warps/fields/hugel_fild.txt
+++ b/npc/pre-re/warps/fields/hugel_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Hugel Field Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 10+
 //===== Description: =========================================
 //= Warp Points for Hugel Field
 //===== Additional Comments: =================================
diff --git a/npc/pre-re/warps/fields/morroc_fild.txt b/npc/pre-re/warps/fields/morroc_fild.txt
index cce5d0b3d..c79538814 100644
--- a/npc/pre-re/warps/fields/morroc_fild.txt
+++ b/npc/pre-re/warps/fields/morroc_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Morroc Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.4b
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Morroc Fields
 //===== Additional Comments: =================================
@@ -43,7 +41,7 @@ moc_fild03,70,341,0	warp	mocf04-1	5,2,moc_fild02,332,23
 //moc_fild04,14,98,0	warp	mocf07	1,11,moc_fild05,378,119
 //moc_fild04,175,18,0	warp	mocf08	3,2,moc_fild08,170,380
 //moc_fild04,19,206,0	warp	mocf09	3,15,moc_fild05,373,208
-//moc_fild04,219,327,0	script	mocf016	45,3,4,{ set @anthell,0; warp "anthell01",35,262; }
+//moc_fild04,219,327,0	script	mocf016	WARPNPC,3,4,{ set @anthell,0; warp "anthell01",35,262; }
 //moc_fild04,292,381,0	warp	mocf01-2	10,1,moc_fild01,76,25
 //moc_fild04,314,381,0	warp	mocf01-3	10,1,moc_fild01,76,25
 //moc_fild04,336,381,0	warp	mocf01-4	10,1,moc_fild01,76,25
@@ -96,7 +94,7 @@ moc_fild13,308,49,0	warp	mocf06-1	2,4,moc_fild03,20,37
 //moc_fild14,196,382,0	warp	mocf16-1	4,2,moc_fild08,204,19
 //moc_fild15,104,16,0	warp	mocf26	9,2,moc_fild16,125,380
 //moc_fild15,158,363,0	warp	mocf18-1	6,2,moc_fild09,126,23
-//moc_fild15,258,253,0	script	mocf017	45,3,3,{ set @anthell,1; warp "anthell01",35,262; }
+//moc_fild15,258,253,0	script	mocf017	WARPNPC,3,3,{ set @anthell,1; warp "anthell01",35,262; }
 //moc_fild15,348,18,0	warp	mocf27	5,2,moc_fild16,334,379
 //moc_fild15,367,276,0	warp	mocf25-1	2,4,moc_fild14,19,278
 //moc_fild15,38,105,0	warp	mocf23-1	2,4,moc_fild11,376,197
diff --git a/npc/pre-re/warps/fields/payon_fild.txt b/npc/pre-re/warps/fields/payon_fild.txt
index 07c7bcd4f..9eff9c645 100644
--- a/npc/pre-re/warps/fields/payon_fild.txt
+++ b/npc/pre-re/warps/fields/payon_fild.txt
@@ -1,17 +1,15 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Payon Field Warps
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Nana (1.0)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= Any rAthena Mod
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Payon Field Warps
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Refixed payon field08 -> payon warp
 //= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 //= Payon Field's ============================================
 pay_fild01,13,152,0	warp	payf001	2,7,moc_fild03,299,170
diff --git a/npc/pre-re/warps/fields/prontera_fild.txt b/npc/pre-re/warps/fields/prontera_fild.txt
index 677da8c5f..bf16f51d1 100644
--- a/npc/pre-re/warps/fields/prontera_fild.txt
+++ b/npc/pre-re/warps/fields/prontera_fild.txt
@@ -4,8 +4,6 @@
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Prontera Field
 //===== Additional Comments: =================================
diff --git a/npc/pre-re/warps/fields/rachel_fild.txt b/npc/pre-re/warps/fields/rachel_fild.txt
index 78a24465e..5d272a61e 100644
--- a/npc/pre-re/warps/fields/rachel_fild.txt
+++ b/npc/pre-re/warps/fields/rachel_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Rachel Field Warp Script
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Rachel Field
 //===== Additional Comments: =================================
diff --git a/npc/pre-re/warps/fields/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt
index 9664f1707..0bb03797b 100644
--- a/npc/pre-re/warps/fields/veins_fild.txt
+++ b/npc/pre-re/warps/fields/veins_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Veins Field Warp Script
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Veins Field
 //===== Additional Comments: =================================
@@ -30,7 +28,7 @@ ve_fild04,115,50,0	warp	ve_fild4-3	1,1,ve_fild06,80,183
 ve_fild05,200,330,0	warp	ve_fild5-1	1,1,ve_fild03,222,48
 ve_fild05,359,192,0	warp	ve_fild5-2	1,1,ve_fild06,80,183
 ve_fild06,153,220,0	warp	ve_fild6-1	1,1,veins,218,355
-ve_fild06,81,177,0	script	ve_fild6-2	45,1,1,{
+ve_fild06,81,177,0	script	ve_fild6-2	WARPNPC,1,1,{
 	if (rand(2))
 		warp "ve_fild04",115,55;
 	else
@@ -39,9 +37,9 @@ ve_fild06,81,177,0	script	ve_fild6-2	45,1,1,{
 }
 ve_fild07,147,371,0	warp	ve_fild7-1	1,1,veins,146,28
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Initial version [$ephiroth]
 //= 1.1 Updated more warps [$ephiroth]
 //= 1.2 Removed some unofficial warps [Playtester]
diff --git a/npc/pre-re/warps/fields/yuno_fild.txt b/npc/pre-re/warps/fields/yuno_fild.txt
index e78fbb3dc..7b5519eed 100644
--- a/npc/pre-re/warps/fields/yuno_fild.txt
+++ b/npc/pre-re/warps/fields/yuno_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yuno Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0), Sara
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
 //===== Description: =========================================
 //= Warp Points for Yuno Field
 //===== Additional Comments: =================================
diff --git a/npc/pre-re/other/arena.txt b/npc/pre-re/warps/other/arena.txt
index ff88f4c28..18c91a677 100644
--- a/npc/pre-re/other/arena.txt
+++ b/npc/pre-re/warps/other/arena.txt
@@ -1,15 +1,14 @@
 //===== Hercules Script ======================================
 //= Arena Warps
 //===== By: ==================================================
-//= Streusel
+//= Euphy
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= Warp Points related to Izlude Arena && Control Panel
+//= Warp Points related to Izlude Arena.
 //===== Additional Comments: =================================
-//= 1.0 First version.
-//= Moved welcome_arena & bye_arena from main folder
+//= 1.0 First version, Pre-Renewal warps.
 //============================================================
 
 izlude,128,226,0	warp	welcome_arena	1,1,arena_room,100,30
-arena_room,99,24,0	warp	bye_arena	2,2,izlude,128,220
\ No newline at end of file
+arena_room,99,24,0	warp	bye_arena	2,2,izlude,128,220
diff --git a/npc/pre-re/warps/other/sign.txt b/npc/pre-re/warps/other/sign.txt
index 5a18a99e8..a04044175 100644
--- a/npc/pre-re/warps/other/sign.txt
+++ b/npc/pre-re/warps/other/sign.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Sign Quest Warps
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points related to the Sign Quest will be put here
 //===== Additional Comments: =================================
diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index 596f89d63..508284350 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -1,33 +1,34 @@
 //===== Hercules Script ======================================
 //= Wandering Minstrel Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Riotblade and L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
 //= Help the bard remember how his song goes.
 //===== Comments: ============================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Needs optimizing.
 //= Reconverted with iRO Dialogs.
 //= Possible NPC conflict with "Representative"
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, needs testing. [L0ne_W0lf]
 //= 1.1 Fixed bug, optimized. Not yet final version [Lupus]
 //=
 //= Variables:
-//=		.@random : temp var 
-//=		.@inputstr$ : temp var 
+//=		.@random : temp var
+//=		.@inputstr$ : temp var
 //=
 //= This Quest has relation with brisingamen_seal.txt (Seals)
 //= 1.2 Changed variable to "gef_bards_q" to avoid job quest conflict. [L0ne_W0lf]
-//=	Progress prior to the 5th+ step will be lost. Job quest takes priority.
+//=     Progress prior to the 5th+ step will be lost. Job quest takes priority.
 //= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.4 Replaced effect numerics with constants. [L0ne_W0lf]
-//============================================================ 
+//= 1.5 Updated RE/Pre-RE EXP. [Euphy]
+//============================================================
 
-geffen,132,38,3	script	Bard#2	51,{
-	if (bard_q > 5) set gef_bard_q,bard_q;
+geffen,132,38,3	script	Bard#2	1_M_BARD,{
+	if (BARD_Q > 5) set gef_bard_q,BARD_Q;
 	set @name$,strcharinfo(0);
 	if (gef_bard_q > 29) {
 		cutin "bard_eland02",2;
@@ -40,19 +41,36 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "Ah~ There are only two things that can make this picturesque moment even more beautiful: story and song. Now then, which would you like to hear?";
 		callsub S_StorySong,1;
 
-	} else if (gef_bard_q == 15) {
-		cutin "bard_eland01",2;
-		mes "[Errende]";
-		mes "Ah, so how did it go?";
-		mes "Wait, you already found it?";
-		mes "Yes, this is it! Great!";
-		mes "This is so amazing!!";
-		mes "Ah, yes, right.";
-		mes "Right.";
-		next;
-		mes "[Errende]";
-		mes "I would like to express my gratitute. But, what would be appropriate for an adventurer";
-		mes "like yourself?";
+	} else if (gef_bard_q == 14 || gef_bard_q == 15) {
+		if (gef_bard_q == 14) {
+			cutin "bard_eland04",2;
+			mes "[Errende]";
+			mes "Hmmm?";
+			mes "Is that the seal of black...? Huh. Kino Kitty removed the one he gave me without a trace, so I surmise that he likes you a lot. Otherwise...";
+			next;
+			mes "^3355FFYou give Errende the letter";
+			mes "you have received from Kino Kitty.^000000";
+			next;
+			cutin "bard_eland01",2;
+			mes "[Errende]";
+			mes "Er, he knows everything already? From this spot of blood, I think he still has health problems. He should stop torturing himself...";
+			next;
+			mes "[Errende]";
+			mes "Thank you, I really appreciate what you've done for me. But, what would be an appropriate way to express my gratitude for an adventurer like yourself?";
+		} else {
+			cutin "bard_eland01",2;
+			mes "[Errende]";
+			mes "Ah, so how did it go?";
+			mes "Wait, you already found it?";
+			mes "Yes, this is it! Great!";
+			mes "This is so amazing!!";
+			mes "Ah, yes, right.";
+			mes "Right.";
+			next;
+			mes "[Errende]";
+			mes "I would like to express my gratitute. But, what would be appropriate for an adventurer";
+			mes "like yourself?";
+		}
 		next;
 		mes "[Errende]";
 		mes "Oh~! I have just the thing. Alright, please make yourself comfortable, and listen to my song.";
@@ -105,106 +123,28 @@ geffen,132,38,3	script	Bard#2	51,{
 		next;
 		specialeffect2 EF_RESURRECTION;
 		mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
-		set gef_bard_q,31;
-		if (BaseLevel < 56) getexp 450,0;
-		else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 550,0;
-		else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 968,0;
-		else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 1341,0;
-		else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 3576,0;
-		else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 6025,0;
-		else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 7034,0;
-		else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 9205,0;
-		else if (BaseLevel > 90) getexp 15679,0;
-		next;
-		cutin "bard_eland02",2;
-		mes "[Errende]";
-		mes "So, how do you feel now? I hope my song has refreshed you. I'm afraid it may not be enough to repay you, but please understand that this is the best way for me to express my gratitude.";
-		next;
-		mes "[Errende]";
-		mes "Besides, I've been thinking of you now as my friend, with whom I may candidly speak without any worry. And I think you have a beautiful smile. Am I wrong~? Hahaha~";
-		next;
-		mes "[Errende]";
-		mes "I hope that you'll always remain honest and respectful towards other people, and that you continue to ignore greed for fortune or power.";
-		goto L_End;
-
-	} else if (gef_bard_q == 14) {
-		cutin "bard_eland04",2;
-		mes "[Errende]";
-		mes "Hmmm?";
-		mes "Is that the seal of black...? Huh. Kino Kitty removed the one he gave me without a trace, so I surmise that he likes you a lot. Otherwise...";
-		next;
-		mes "^3355FFYou give Errende the letter";
-		mes "you have received from Kino Kitty.^000000";
-		next;
-		cutin "bard_eland01",2;
-		mes "[Errende]";
-		mes "Er, he knows everything already? From this spot of blood, I think he still has health problems. He should stop torturing himself...";
-		next;
-		mes "[Errende]";
-		mes "Thank you, I really appreciate what you've done for me. But, what would be an appropriate way to express my gratitude for an adventurer like yourself?";
-		next;
-		mes "[Errende]";
-		mes "Oh~! I have just the thing. Alright, please make yourself comfortable, and listen";
-		mes "to my song.";
-		next;
-		cutin "bard_eland03",2;
-		mes "^483D8BEvery god never grows old";
-		mes "Because of beautiful";
-		mes "Goddess, Idun.";
-		mes "Keeper of the apples of youth";
-		mes "Goddess of immortality.^000000";
-		specialeffect2 EF_STEAL;
-		next;
-		mes "^483D8BEvery god never grows old.";
-		mes "Idun, the wife of Bragi,";
-		mes "Idun, Odin's daughter in law~";
-		mes "The apples she keeps";
-		mes "In her basket.^000000";
-		next;
-		mes "^483D8BWithout Idun,";
-		mes "Every god would";
-		mes "have succumbed to age.";
-		mes "Even Thor, the strongest of gods,";
-		mes "would grow frail, Megingjard would";
-		mes "slip from his waist, and Mjolnir";
-		mes "would never fly again.^000000";
-		next;
-		mes "^483D8BWithout Idun,";
-		mes "Every god would";
-		mes "have succumbed to age.";
-		mes "Loki was careless once,";
-		mes "and made her lost to the gods.";
-		mes "He was forced to get her back.^000000";
-		specialeffect2 EF_STEAL;
-		next;
-		mes "^483D8BMy goddess stands";
-		mes "In the field of Asgard";
-		mes "She hands me fruit from heaven.";
-		mes "You will be loved by every god...";
-		mes "You will be blessed";
-		mes "By every god...^000000";
-		next;
-		specialeffect EF_BEGINSPELL6;
-		mes "^483D8BIf you share the";
-		mes "Apple of youth with me";
-		mes "Even a bite of it with";
-		mes "This poor poet.";
-		mes "You will be loved by every god...";
-		mes "You will be blessed";
-		mes "By every god...^000000";
-		next;
-		specialeffect2 EF_RESURRECTION;
-		mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
-		set gef_bard_q,30;
-		if (BaseLevel < 56) getexp 450,0;
-		else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 550,0;
-		else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 968,0;
-		else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 1341,0;
-		else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 3576,0;
-		else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 6025,0;
-		else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 7034,0;
-		else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 9205,0;
-		else if (BaseLevel > 90) getexp 15679,0;
+		set gef_bard_q, gef_bard_q + 16; //30,31
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 450,0;
+			else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 550,0;
+			else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 968,0;
+			else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 1341,0;
+			else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 3575,0;
+			else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 6024,0;
+			else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 7034,0;
+			else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 9205,0;
+			else getexp 15678,0;
+		} else {
+			if (BaseLevel < 56) getexp 4500,0;
+			else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 5500,0;
+			else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 9684,0;
+			else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 13411,0;
+			else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 35757,0;
+			else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 60246,0;
+			else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 70340,0;
+			else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 92052,0;
+			else getexp 156786,0;
+		}
 		next;
 		cutin "bard_eland02",2;
 		mes "[Errende]";
@@ -573,7 +513,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "At Nine, love is reborn.";
 		mes "At Ten, my Love is gone.";
 		mes "At Eleven I find out why.";
-		if (sex)
+		if (Sex)
 			mes "At Twelve I see his new girlfriend?";
 		else
 			mes "At Twelve I see her new boyfriend?";
@@ -907,7 +847,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "At Nine, love is reborn.";
 		mes "At Ten, my Love is gone.";
 		mes "At Eleven I find out why.";
-		if (sex)
+		if (Sex)
 			mes "At Twelve I see her new boyfriend?";
 		else
 			mes "At Twelve I see his new girlfriend?";
@@ -1186,8 +1126,8 @@ S_StorySong:
 
 		case 1:
 			mes "[Errende]";
-			if (zeny > 499) {
-				set zeny,zeny-500;
+			if (Zeny > 499) {
+				Zeny -= 500;
 				cutin "bard_eland03",2;
 				mes "Alright.";
 				mes "Here we go~";
@@ -1311,7 +1251,7 @@ S_StorySong:
 				// For 3 and 4 cases we set more chance earlier on .@random
 				if(getarg(0) == 3 || getarg(0) == 4){
 					mes "[Errende]";
-					if (sex)
+					if (Sex)
 						mes "Heroic warrior,";
 					else
 						mes "My fair lady,";
@@ -1425,7 +1365,7 @@ S_StorySong:
 	}
 }
 
-morocc,134,111,3	script	Bard#3	741,{
+morocc,134,111,3	script	Bard#3	2_M_BARD_ORIENT,{
 	set @name$,strcharinfo(0);
 	if (gef_bard_q == 31) {
 		mes "[Kino Kitty]";
@@ -1987,7 +1927,7 @@ morocc,134,111,3	script	Bard#3	741,{
 				mes "There's no reason to be afraid of this riffraff, your Uncle Kino is here, okay?";
 			} else if (BaseClass == Job_Assassin) {
 				mes "There's no reason to be afraid. I know that person looks scary, but you're a good girl, so you'll be okay.";
-			} else if (BaeClass == Job_Blacksmith) {
+			} else if (BaseClass == Job_Blacksmith) {
 				mes "There's no reason to be scared, honey. It's just a Blacksmith.";
 			} else {
 				mes "There's no reason to be scared. See...? That person won't hurt you.";
@@ -2098,7 +2038,7 @@ morocc,134,111,3	script	Bard#3	741,{
 				}
 
 			} else {
-				if (sex) {
+				if (Sex) {
 					mes "[Kino Kitty]";
 					mes "You're such a nice young man. I will remember your name. I would much appreciate it if you would also remember mine.";
 					next;
@@ -2124,7 +2064,7 @@ morocc,134,111,3	script	Bard#3	741,{
 	}
 }
 
-morocc,132,111,3	script	Little Girl#Jorti	703,{
+morocc,132,111,3	script	Little Girl#Jorti	4_F_KID2,{
 	if (gef_bard_q > 9 && gef_bard_q < 30) {
 		mes "[Jorti]";
 		mes "Jorti tries not to cry anymore because it hurts Uncle Kino and then he coughs up more blood.";
@@ -2190,7 +2130,7 @@ morocc,132,111,3	script	Little Girl#Jorti	703,{
 	}
 }
 
-yuno_in01,172,100,3	script	Old Man#bq1	712,{
+yuno_in01,172,100,3	script	Old Man#bq1	4_M_05,{
 	if (gef_bard_q > 11 && gef_bard_q < 20) {
 		mes "[Sketzi Bundin]";
 		mes "Well, did you find what you were seeking for? Although all we have are old, dusty books, I hope you come by to visit. And please give my regards to your Bard friends.";
@@ -2253,7 +2193,7 @@ yuno_in01,172,100,3	script	Old Man#bq1	712,{
 	}
 }
 
-yuno_in01,163,101,0	script	Old Book#bq	111,{
+yuno_in01,163,101,0	script	Old Book#bq	HIDDEN_NPC,{
 	set @name$,strcharinfo(0);
 	if ((gef_bard_q > 11) && (gef_bard_q < 14)) {
 		if (!rand(5)) {
@@ -2309,7 +2249,7 @@ yuno_in01,163,101,0	script	Old Book#bq	111,{
 }
 
 
-yuno_in01,173,96,0	script	Luke's Songs Vol.1	111,{
+yuno_in01,173,96,0	script	Luke's Songs Vol.1	HIDDEN_NPC,{
 	if (gef_bard_q > 11) {
 		mes "[Preface]";
 		mes "I, Luke of Izlude, greatest of Bards in my time, leave the lyrics of my essential songs for posterity.";
@@ -2415,7 +2355,7 @@ yuno_in01,173,96,0	script	Luke's Songs Vol.1	111,{
 	}
 }
 
-yuno_in01,173,94,0	script	Battle Songs	111,{
+yuno_in01,173,94,0	script	Battle Songs	HIDDEN_NPC,{
 	if (gef_bard_q > 11) {
 		mes "[Drumming in the battlefield]";
 		mes "This song was written to give courage to soldiers on the battlefield.";
@@ -2460,7 +2400,7 @@ yuno_in01,173,94,0	script	Battle Songs	111,{
 }
 
 
-yuno_in01,173,92,0	script	Apple of Idun	111,{
+yuno_in01,173,92,0	script	Apple of Idun	HIDDEN_NPC,{
 	if (gef_bard_q > 11) {
 		mes "[Apple of Idun]";
 		mes "This song praises the golden apples of the goddess Idun. These were the source of the God's power, as it prevented them from growing old.";
@@ -2525,7 +2465,7 @@ yuno_in01,173,92,0	script	Apple of Idun	111,{
 	}
 }
 
-payon,181,172,3	script	Bard#4	51,{
+payon,181,172,3	script	Bard#4	1_M_BARD,{
 	set @name$,strcharinfo(0);
 	if (gef_bard_q == 2 || gef_bard_q == 22) {
 		mes "[Gunther Doubleharmony]";
@@ -2618,8 +2558,8 @@ payon,181,172,3	script	Bard#4	51,{
 			next;
 			switch(select("A song:A story:Maybe some other time")) {
 			case 1:
-				set @song_random,rand(1,3);
-				if (@song_random == 1) {
+				switch(rand(1,3)) {
+				case 1:
 					mes "[Gunther Doubleharmony]";
 					mes "Gunther sings!";
 					mes "Gunther dances!";
@@ -2669,7 +2609,7 @@ payon,181,172,3	script	Bard#4	51,{
 					mes "That's a very old story about rich Mr. Kim, and his rise from rags to riches to rags to riches. Is it true or is it fiction? Oh, please don't ask me! I've no clue!";
 					close;
 
-				} else if (@song_random == 2) {
+				case 2:
 					mes "[Gunther Doubleharmony]";
 					mes "*Ahem*";
 					mes "Gunther sings ";
@@ -2723,7 +2663,7 @@ payon,181,172,3	script	Bard#4	51,{
 					mes "Is it truth or fiction? But please don't ask me, I have no idea~!";
 					close;
 
-				} else {
+				case 3:
 					mes "[Gunther Doubleharmony]";
 					mes "I will sing one of Luke's songs, you know, Luke, one of the greatest Bards of his time? But I changed the words a little bit.";
 					next;
@@ -2757,8 +2697,8 @@ payon,181,172,3	script	Bard#4	51,{
 				}
 
 			case 2:
-				set @story,rand(1,3);
-				if (story == 1) {
+				switch(rand(1,3)) {
+				case 1:
 					mes "[Gunther Doubleharmony]";
 					mes "Um, have you ever";
 					mes "tasted Comodo cheese?";
@@ -2773,7 +2713,7 @@ payon,181,172,3	script	Bard#4	51,{
 					mes "Why don't you go taste it if you haven't yet? I tried to taste it once. It was kind of yummy, but then I fainted. Hahahaha~!";
 					close;
 
-				} else if (story == 2) {
+				case 2:
 					mes "[Gunther Doubleharmony]";
 					mes "I was passing Prontera the other day at the place where it used to be the Swordman training ground.";
 					next;
@@ -2787,7 +2727,7 @@ payon,181,172,3	script	Bard#4	51,{
 					mes "I got bored watching him do the same thing over and over and over again, but I think the Monster Research Organization would like him if I introduced him.";
 					close;
 
-				} else {
+				case 3:
 					mes "[Gunther Doubleharmony]";
 					mes "Have you ever been in Lutie,";
 					mes "land of year round snow?";
@@ -2824,7 +2764,7 @@ payon,181,172,3	script	Bard#4	51,{
 
 }
 
-yuno_in04,20,123,7	script	Representative#bq	95,{
+yuno_in04,20,123,7	script	Representative#bq	4_F_SISTER,{
 //set @check = GetGlobalVar "040708_god2"
 	mes "[Marlin Putiur]";
 	if (god_brising == 3) {
@@ -2952,7 +2892,7 @@ yuno_in04,20,123,7	script	Representative#bq	95,{
 	}
 }
 
-yuno_in04,33,119,3	script	Adventurer#1	828,{
+yuno_in04,33,119,3	script	Adventurer#1	4_M_ROGUE,{
 	mes "...";
 	next;
 	mes "...";
@@ -2964,7 +2904,7 @@ yuno_in04,33,119,3	script	Adventurer#1	828,{
 	mes "Err...?";
 	mes "What is it?";
 	next;
-	if (!sex) {
+	if (!Sex) {
 		emotion e_heh;
 		mes "[Energetic Young Man]";
 		mes "Oh...!";
diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt
index dffd650dd..8eb89773a 100644
--- a/npc/quests/bunnyband.txt
+++ b/npc/quests/bunnyband.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 //= Bunny Band Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quest to obtain a Bunny Band headgear.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //	Changed @BUNYBAN back to BUNYBND, it should be this way.
 //	Removed duplicates. NPC is ALberta-only.
 //= 1.6 Cleaning. [Euphy]
-//============================================================ 
+//============================================================
 
-alberta,26,229,0	script	Kafra Employee#bunny	83,{
+alberta,26,229,0	script	Kafra Employee#bunny	4_M_01,{
 	if (BUNYBND == 1) {
 		mes "[Kafra Employee]";
 		mes "Hello there~!";
@@ -31,14 +31,14 @@ alberta,26,229,0	script	Kafra Employee#bunny	83,{
 			mes "see if you brought";
 			mes "all the items...";
 			next;
-			setarray .@Items[0],949,100,706,1,722,1,2213,1;
+			setarray .@items[0],949,100,706,1,722,1,2213,1;
 			for(set .@i,0; .@i<8; set .@i,.@i+2)
-				if (countitem(.@Items[.@i]) < .@Items[.@i+1]) {
+				if (countitem(.@items[.@i]) < .@items[.@i+1]) {
 					mes "[Kafra Employee]";
 					mes "Ooh, I'm sorry";
 					mes "but you need to";
 					mes "bring at least";
-					mes .@Items[.@i+1]+" "+getitemname(.@Items[.@i])+((!.@i)?"s.":".");
+					mes .@items[.@i+1]+" "+getitemname(.@items[.@i])+((!.@i)?"s.":".");
 					close;
 				}
 			mes "[Kafra Employee]";
@@ -50,12 +50,12 @@ alberta,26,229,0	script	Kafra Employee#bunny	83,{
 			mes "while I put it together...";
 			next;
 			for(set .@i,0; .@i<8; set .@i,.@i+2)
-				if (countitem(.@Items[.@i]) < .@Items[.@i+1]) {
+				if (countitem(.@items[.@i]) < .@items[.@i+1]) {
 					mes "[Kafra Employee]";
 					mes "Hm? I'm sorry,";
 					mes "but I actually can't";
 					mes "make this right now. You";
-					mes "need "+.@Items[.@i+1]+" "+getitemname(.@Items[.@i])+((!.@i)?"s":"");
+					mes "need "+.@items[.@i+1]+" "+getitemname(.@items[.@i])+((!.@i)?"s":"");
 					mes "in order for me to put this";
 					mes "Bunny Band together...";
 					close;
@@ -141,11 +141,11 @@ L_Info:
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 using duplicate command
 //= 1.2 Fixed NPC location, removed NPC dupes [Lupus]
 //= 1.3 RE-Fixed exploit V_V, also cleared used VAR [Lupus]
 //= 1.4 replaced BUNYBND with @BUNYBND [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 4a5cfcd67..b3f381451 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -4,10 +4,8 @@
 //= Reddozen; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.8a
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Official Cooking Quest (10.3)
 //===== Additional Comments: =================================
 //= 1.1 Fixed wrong item ID, added missing ";, optimized [Lupus]
@@ -15,13 +13,13 @@
 //= 1.2 Fixed exploit, some typos [Lupus]
 //= 1.3 Fixed wrong label [Lupus] 1.3a updated to Reddozen's changes
 //= 1.3b Fixed wrong id, fixed Puch quest, added more Pouch Quest
-//= dialogues [Lupus]
+//=     dialogues [Lupus]
 //= 1.4 Fixed spelling, added some dialoguesm optimized
-//= fixed bugs. Tested, fully working [Lupus]
+//=     fixed bugs. Tested, fully working [Lupus]
 //= 1.5 More fixes [Lupus]
 //= 1.6 Quest is now up to iRO 10.3 standards. [L0ne_W0lf]
-//= - Not sure what the EnableItemMove is for, as there is no 
-//= command to disable being able to move items.
+//= - Not sure what the EnableItemMove is for, as there is no
+//=   command to disable being able to move items.
 //= 1.6a Corrected a bad cutin, a Typo error ";;" and a bad delitem (bugreport:911) [Samuray22]
 //= 1.6b Corrected a "donpcevent" missing a ":". (bugreport:962) [Samuray22]
 //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
@@ -29,9 +27,8 @@
 //= 1.8a Minor cleaning. [Euphy]
 //============================================================
 
-prt_castle,43,30,3	script	Charles Orleans#cook	878,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+prt_castle,43,30,3	script	Charles Orleans#cook	4_M_OILMAN,{
+	if (MaxWeight - Weight < 2000) {
 		mes "[Charles Orleans]";
 		mes "Just one second.";
 		mes "You're carrying too";
@@ -44,7 +41,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		end;
 	}
 	if (BaseJob == Job_Novice) {
-		if (sex) {
+		if (Sex) {
 			cutin "orleans_5",0;
 			mes "[Charles Orleans]";
 			mes "Excuse me, monsieur?";
@@ -81,7 +78,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		goto L_End;
 	}
 	else if (getequipid(1) != 5026) {
-		if (sex) {
+		if (Sex) {
 			cutin "orleans_5",0;
 			emotion e_an;
 			mes "[Charles Orleans]";
@@ -1481,9 +1478,8 @@ L_End:
 	end;
 }
 
-prt_castle,45,35,5	script	Madeleine Chu#cook	886,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+prt_castle,45,35,5	script	Madeleine Chu#cook	4_COOK,{
+	if (MaxWeight - Weight < 2000) {
 		mes "[Madeleine Chu]";
 		mes "I'm sorry, but right now";
 		mes "you're carrying too many";
@@ -1720,7 +1716,7 @@ prt_castle,45,35,5	script	Madeleine Chu#cook	886,{
 			mes "of Cooking Kits";
 			mes "did you need?";
 			next;
-			switch(Select("Outdoor Cooking Kit - 500z:Home Cooking Kit - 1,000z:Quit")) {
+			switch(select("Outdoor Cooking Kit - 500z:Home Cooking Kit - 1,000z:Quit")) {
 			case 1:
 				callsub S_SellSets,12125;
 				close;
@@ -2095,7 +2091,7 @@ S_SellSets:
 	}
 	set .@total_cost,.@sell * .@item_cost;
 	set .@total_weight,.@sell * .@item_weight;
-	if (zeny < .@total_cost) {
+	if (Zeny < .@total_cost) {
 		mes "[Madeleine Chu]";
 		mes "Oh, I'm sorry, but you";
 		mes "can't afford this many";
@@ -2112,7 +2108,7 @@ S_SellSets:
 		mes getitemname(getarg(0))+"...";
 		close;
 	}
-	set zeny,zeny-.@total_cost;
+	Zeny -= .@total_cost;
 	getitem getarg(0),.@sell;
 	mes "[Madeleine Chu]";
 	mes "Here you are~";
@@ -2121,7 +2117,7 @@ S_SellSets:
 	return;
 }
 
-prt_castle,45,28,3	script	Child with Cat#cook	877,{
+prt_castle,45,28,3	script	Child with Cat#cook	4_F_YUNYANG,{
 	set .@nyu,rand(1,2);
 	if (.@nyu == 1) {
 		cutin "nyuang_1",2;
@@ -2144,7 +2140,7 @@ prt_castle,45,28,3	script	Child with Cat#cook	877,{
 	end;
 }
 
-prt_castle,44,30,5	script	Wickebine#cook	725,{
+prt_castle,44,30,5	script	Wickebine#cook	4_F_JOB_ASSASSIN,{
 	disablenpc "Wickebine#cook";
 	end;
 
@@ -2161,7 +2157,7 @@ OnDisable:
 	end;
 }
 
-payon,209,127,3	script	Servant	88,{
+payon,209,127,3	script	Servant	4_M_ORIENT01,{
 	if (!checkweight(555,1)) {
 		mes "[Chulsoo]";
 		mes "Hold on, you're carrying";
@@ -2191,7 +2187,7 @@ payon,209,127,3	script	Servant	88,{
 		next;
 		switch(select("Sure, I'll buy one!:No, thanks.:Actually, Madeleine sent me...")) {
 		case 1:
-			if (zeny < 200) {
+			if (Zeny < 200) {
 				mes "[Chulsoo]";
 				mes "Oh, I'm sorry, but";
 				mes "you don't have enough";
@@ -2200,7 +2196,7 @@ payon,209,127,3	script	Servant	88,{
 				mes "raise 200 zeny, right?";
 				close;
 			}
-			set zeny,zeny-200;
+			Zeny -= 200;
 			getitem 555,1; //Rice_Cake
 			mes "[Chulsoo]";
 			mes "Thank you very";
@@ -2362,7 +2358,7 @@ payon,209,127,3	script	Servant	88,{
 		mes "it's oh-so-delicious~";
 		next;
 		if (select("Sure, I'll buy one!:No, thanks.") == 1) {
-			if (zeny < 200) {
+			if (Zeny < 200) {
 				mes "[Chulsoo]";
 				mes "Oh, I'm sorry, but";
 				mes "you don't have enough";
@@ -2371,7 +2367,7 @@ payon,209,127,3	script	Servant	88,{
 				mes "raise 200 zeny, right?";
 				close;
 			}
-			set zeny,zeny-200;
+			Zeny -= 200;
 			getitem 555,1; //Rice_Cake
 			mes "[Chulsoo]";
 			mes "Thank you very";
diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt
index f5558586a..ed8152a06 100644
--- a/npc/quests/counteragent_mixture.txt
+++ b/npc/quests/counteragent_mixture.txt
@@ -1,22 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Counteragent and Mixture Quest(Morgenstein)
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
 //= added some dialogs for Morgenstein by Komurka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2b
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis COnversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Counteragent and Mixtures for making dyes & Alchemist Job Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 2.2a A few minor fixes. (bugreport:1122) [L0ne_W0lf]
 //= 2.2b Follow up fixes to bugreport:1122 [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-alberta_in,133,55,3	script	Louitz#cm	84,{
+alberta_in,133,55,3	script	Louitz#cm	4_M_02,{
 	if (molgenstain == 2) {
 		mes "[Merchant Louitz]";
 		mes "Oh, it's you again.";
@@ -305,7 +303,7 @@ alberta_in,133,55,3	script	Louitz#cm	84,{
 	close;
 }
 
-geffen,181,114,3	script	Aure Dupon#cm	82,{
+geffen,181,114,3	script	Aure Dupon#cm	4_KID01,{
 	if (molgenstain == 2) {
 		mes "[Aure Dupon]";
 		mes "It seems that our";
@@ -394,7 +392,7 @@ geffen,181,114,3	script	Aure Dupon#cm	82,{
 	close;
 }
 
-geffen_in,141,140,3	script	Molgenstein#cm	121,{
+geffen_in,141,140,3	script	Molgenstein#cm	2_M_MOLGENSTEIN,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -471,7 +469,7 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 					delitem 970,1; //Alchol
 					delitem 971,1; //Detrimindexta
 					delitem 713,1; //Empty_Bottle
-					set zeny,zeny-3000;
+					Zeny -= 3000;
 					getitem 973,1; //Counteragent
 					mes "[Chemist Molgenstein]";
 					mes "Hee hee hee...";
@@ -515,7 +513,7 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 					delitem 970,1; //Alchol
 					delitem 972,1; //Karvodailnirol
 					delitem 713,1; //Empty_Bottle
-					set zeny,zeny-4000;
+					Zeny -= 4000;
 					getitem 974,1; //Mixture
 					mes "[Chemist Molgenstein]";
 					mes "Hee hee hee...";
@@ -579,9 +577,9 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Fully working
 //= 1.1 Update for Alchemist Quest.
 //= 1.2 added check for Empty Bottle [Lupus]
@@ -592,4 +590,4 @@ geffen_in,141,140,3	script	Molgenstein#cm	121,{
 //= 1,7 Fixed exploit
 //= 1.8 Got rid of 'al_morgen' var [Lupus]
 //= 2.1 now uses (MISC_QUEST & 4) bit instead of al_morgen [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt
index 028b71016..d733a374b 100644
--- a/npc/quests/dandelion_request.txt
+++ b/npc/quests/dandelion_request.txt
@@ -1,17 +1,18 @@
 //===== Hercules Script ======================================
 //= Dandelion's Request / Morocc Invasion quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= SinSloth
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.3
+//===== Description: =========================================
 //= A Morroc quest that is no longer used.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed a small bug in Dandelion's Request. [SinSloth]
 //= 1.2 Moved Dandelion's Request to its own file.
-//============================================================ 
+//= 1.3 Added GM management function. [Euphy]
+//============================================================
 
-izlude,103,106,3	script	Guildsman#1	48,3,3,{
+izlude,103,106,3	script	Guildsman#1	1_M_02,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -441,7 +442,7 @@ OnTouch:
 	}
 }
 
-prontera,237,313,3	script	Nun#moc	79,3,3,{
+prontera,237,313,3	script	Nun#moc	1_F_PRIEST,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -636,7 +637,7 @@ OnTouch:
 	}
 }
 
-alberta,129,59,3	script	Guildsman#2	49,3,3,{
+alberta,129,59,3	script	Guildsman#2	1_M_03,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -1171,7 +1172,7 @@ OnTouch:
 	}
 }
 
-geffen,123,109,3	script	Academy Staff	742,3,3,{
+geffen,123,109,3	script	Academy Staff	2_M_SAGE_B,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -1331,7 +1332,7 @@ OnTouch:
 	}
 }
 
-morocc,155,56,3	script	Miya	93,3,3,{
+morocc,155,56,3	script	Miya	4_F_04,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -1620,7 +1621,7 @@ OnTouch:
 	}
 }
 
-payon,231,323,3	script	Guildsman#3	59,3,3,{
+payon,231,323,3	script	Guildsman#3	1_M_ORIENT01,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -2079,7 +2080,7 @@ OnTouch:
 	}
 }
 
-morocc,43,108,5	script	Sharp-Looking Kid	82,{
+morocc,43,108,5	script	Sharp-Looking Kid	4_KID01,{
 
 	if((Class == Job_Assassin) || (Class == Job_Assassin_Cross))
 	{
@@ -2155,7 +2156,7 @@ morocc,43,108,5	script	Sharp-Looking Kid	82,{
 	}
 }
 
-morocc,45,110,1	script	#maobar1	45,2,2,{
+morocc,45,110,1	script	#maobar1	WARPNPC,2,2,{
 
 OnTouch:
 	if(mao_request || Class == Job_Assassin || Class == Job_Assassin_Cross) warp "que_job01",9,94;
@@ -2189,7 +2190,7 @@ OnTouch:
 						mes "tired. Let me take a";
 						mes "freakin' 20 second yawn.";
 						mes "*Yaaaaaaaaaaaaaaaaaaaaaaaaaawn*";
-						set Zeny,Zeny - 1000;
+						Zeny -= 1000;
 						close2;
 						warp "que_job01",9,94;
 						end;
@@ -2227,28 +2228,28 @@ OnTouch:
 	}
 }
 
-que_job01,6,94,1	script	#maobar2	45,2,2,{
+que_job01,6,94,1	script	#maobar2	WARPNPC,2,2,{
 
 OnTouch:
 	warp "morocc",45,103;
 	end;
 }
 
-que_job01,17,48,1	script	#maobar3	45,2,2,{
+que_job01,17,48,1	script	#maobar3	WARPNPC,2,2,{
 
 OnTouch:
 	warp "que_job01",68,92;
 	end;
 }
 
-que_job01,68,96,1	script	#maobar4	45,2,2,{
+que_job01,68,96,1	script	#maobar4	WARPNPC,2,2,{
 
 OnTouch:
 	warp "que_job01",17,53;
 	end;
 }
 
-que_job01,80,77,1	script	#maobar5	45,2,2,{
+que_job01,80,77,1	script	#maobar5	WARPNPC,2,2,{
 
 OnTouch:
 	if(mao_request > 1) warp "que_job01",61,50;
@@ -2308,7 +2309,7 @@ OnTouch:
 						mes "Hey, bartender! Gimme";
 						mes "the usual! I like your";
 						mes "style, adventurer...";
-						set Zeny,Zeny - 1000;
+						Zeny -= 1000;
 						next;
 						mes "[Litheron]";
 						mes "Alright, you can come";
@@ -2359,14 +2360,14 @@ OnTouch:
 	}
 }
 
-que_job01,65,50,1	script	#maobar4-2	45,2,2,{
+que_job01,65,50,1	script	#maobar4-2	WARPNPC,2,2,{
 
 OnTouch:
 	warp "que_job01",84,77;
 	end;
 }
 
-que_job01,81,79,5	script	Idle Knight	733,{
+que_job01,81,79,5	script	Idle Knight	4_M_JOB_KNIGHT1,{
 
 	mes "[Litheron]";
 	mes "What's the matter?";
@@ -2386,7 +2387,7 @@ que_job01,81,79,5	script	Idle Knight	733,{
 	close;
 }
 
-que_job01,82,95,3	script	Bar Master	46,{
+que_job01,82,95,3	script	Bar Master	1_ETC_01,{
 
 	if(checkweight(12112,1) != 1)
 	{
@@ -2472,7 +2473,7 @@ que_job01,82,95,3	script	Bar Master	46,{
 						mes "ask you for 800. Enjoy it,";
 						mes "my friend, and drink it as";
 						mes "deeply as you would life.";
-						set Zeny,Zeny - 800;
+						Zeny -= 800;
 						if(.@maodrink) getitem 12112,1;
 						else getitem 12113,1;
 						close;
@@ -2494,7 +2495,7 @@ que_job01,82,95,3	script	Bar Master	46,{
 					mes "hard feelings, but you're";
 					mes "already lucky to be here.";
 					mes "Hey, enjoy your drink~";
-					set Zeny,Zeny - 1000;
+					Zeny -= 1000;
 					if(.@maodrink) getitem 12112,1;
 					else getitem 12113,1;
 					close;
@@ -2666,7 +2667,7 @@ que_job01,82,95,3	script	Bar Master	46,{
 	}
 }
 
-que_job01,49,49,5	script	Tao	877,{
+que_job01,49,49,5	script	Tao	4_F_YUNYANG,{
 
 	if(mao_request == 28 || mao_request == 29 || mao_request == 126 || mao_request == 127)
 	{
@@ -2721,18 +2722,14 @@ que_job01,49,49,5	script	Tao	877,{
 	}
 }
 
-que_job01,51,55,1	script	#roombar1	45,1,1,{
+que_job01,51,55,1	script	#roombar1	WARPNPC,1,1,{
 
-OnInit:
-	set $maobar_room,0;
-	end;
-	
 OnTouch:
 	if(mao_request == 2 || mao_request == 24 || mao_request == 28 || mao_request == 29 || mao_request == 123 || mao_request == 126 || mao_request == 127 || prt_curse == 24)
 	{
-		if(!$maobar_room)
+		if(!$@maobar_room)
 		{
-			set $maobar_room,1;
+			set $@maobar_room,1;
 			donpcevent "#maobartimer1::OnEnter";
 			if(mao_request == 2 || mao_request == 28 || mao_request == 29 || mao_request == 126 || mao_request == 127)
 			{
@@ -2828,7 +2825,7 @@ OnTimer250000:
 	end;
 }
 
-que_job01,12,13,1	script	#maobar6	139,1,1,{
+que_job01,12,13,1	script	#maobar6	HIDDEN_WARP_NPC,1,1,{
 
 OnInit:
 	disablenpc "#maobar7";
@@ -2843,12 +2840,8 @@ OnTouch:
 	end;
 }
 
-que_job01,51,44,1	script	#roombar2	45,1,1,{
+que_job01,51,44,1	script	#roombar2	WARPNPC,1,1,{
 
-OnInit:
-	set $maobar_room2,0;
-	end;
-	
 OnTouch:
 	if(mao_request == 25 || (mao_request > 102 && mao_request < 123))
 	{
@@ -2863,9 +2856,9 @@ OnTouch:
 			warp "que_job01",52,50;
 			end;
 		}
-		if(!$maobar_room2)
+		if(!$@maobar_room2)
 		{
-			set $maobar_room2,1;
+			set $@maobar_room2,1;
 			donpcevent "#maobartimer2::OnEnter";
 			if(mao_request == 25)
 			{
@@ -2961,7 +2954,7 @@ OnTimer250000:
 	end;
 }
 
-que_job01,80,17,1	script	#maobar7	45,1,1,{
+que_job01,80,17,1	script	#maobar7	WARPNPC,1,1,{
 
 OnInit:
 	disablenpc "#maobar7";
@@ -2976,7 +2969,7 @@ OnTouch:
 	end;
 }
 
-que_job01,144,51,1	script	#maobar8	45,1,1,{
+que_job01,144,51,1	script	#maobar8	WARPNPC,1,1,{
 
 OnInit:
 	disablenpc "#maobar8";
@@ -2991,7 +2984,7 @@ OnTouch:
 	end;
 }
 
-que_job01,11,4,1	script	#maoexit1	45,1,1,{
+que_job01,11,4,1	script	#maoexit1	WARPNPC,1,1,{
 
 OnTouch:
 	warp "que_job01",52,50;
@@ -2999,7 +2992,7 @@ OnTouch:
 	end;
 }
 
-que_job01,80,27,1	script	#maoexit2	45,1,1,{
+que_job01,80,27,1	script	#maoexit2	WARPNPC,1,1,{
 
 OnTouch:
 	warp "que_job01",52,50;
@@ -3007,7 +3000,7 @@ OnTouch:
 	end;
 }
 
-que_job01,144,61,1	script	#maoexit3	45,1,1,{
+que_job01,144,61,1	script	#maoexit3	WARPNPC,1,1,{
 
 OnTouch:
 	warp "que_job01",52,50;
@@ -3015,7 +3008,7 @@ OnTouch:
 	end;
 }
 
-que_job01,16,21,5	script	Valdes#1	55,{
+que_job01,16,21,5	script	Valdes#1	1_M_JOBTESTER,{
 
 	if(checkweight(7417,1) != 1)
 	{
@@ -3507,7 +3500,7 @@ OnEnter:
 	end;
 }
 
-que_job01,17,11,3	script	Valdes#2	55,{
+que_job01,17,11,3	script	Valdes#2	1_M_JOBTESTER,{
 
 OnInit:
 	disablenpc "Valdes#2";
@@ -3518,7 +3511,7 @@ OnEnter:
 	end;
 }
 
-que_job01,142,56,5	script	Valdes#3	55,{
+que_job01,142,56,5	script	Valdes#3	1_M_JOBTESTER,{
 
 OnInit:
 	disablenpc "Valdes#3";
@@ -3529,7 +3522,7 @@ OnEnter:
 	end;
 }
 
-que_job01,19,18,3	script	Lin#1	885,{
+que_job01,19,18,3	script	Lin#1	4_F_ACROSS,{
 
 	cutin "mocseal_rin01.bmp",2;
 	if (mao_request < 3)
@@ -3600,7 +3593,7 @@ OnEnter:
 	end;
 }
 
-que_job01,13,9,7	script	Lin#2	885,{
+que_job01,13,9,7	script	Lin#2	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#2";
@@ -3611,7 +3604,7 @@ OnEnter:
 	end;
 }
 
-que_job01,84,17,3	script	Lin#2-1	885,{
+que_job01,84,17,3	script	Lin#2-1	4_F_ACROSS,{
 
 	if (mao_request == 103)
 	{
@@ -4150,7 +4143,7 @@ que_job01,84,17,3	script	Lin#2-1	885,{
 	end;
 }
 
-que_job01,79,15,1	script	R	880,{
+que_job01,79,15,1	script	R	4_M_MASKMAN,{
 
 	if(mao_request == 103)
 	{
@@ -4595,7 +4588,7 @@ que_job01,79,15,1	script	R	880,{
 	end;
 }
 
-que_job01,147,54,3	script	Lin#3	885,{
+que_job01,147,54,3	script	Lin#3	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#3";
@@ -4606,7 +4599,7 @@ OnEnter:
 	end;
 }
 
-que_job01,13,17,5	script	Kidd#1	884,{
+que_job01,13,17,5	script	Kidd#1	4_M_ACROSS,{
 
 	cutin "mocseal_kid01.bmp",2;
 	if (mao_request < 3)
@@ -4676,7 +4669,7 @@ OnEnter:
 	end;
 }
 
-que_job01,12,8,7	script	Kidd#2	884,{
+que_job01,12,8,7	script	Kidd#2	4_M_ACROSS,{
 
 OnInit:
 	disablenpc "Kidd#2";
@@ -4687,7 +4680,7 @@ OnEnter:
 	end;
 }
 
-que_job01,148,54,3	script	Kidd#3	884,{
+que_job01,148,54,3	script	Kidd#3	4_M_ACROSS,{
 
 OnInit:
 	disablenpc "Kidd#3";
@@ -4698,7 +4691,7 @@ OnEnter:
 	end;
 }
 
-que_job01,91,83,3	script	Kidd#hall	884,{
+que_job01,91,83,3	script	Kidd#hall	4_M_ACROSS,{
 
 	if (mao_request == 124)
 	{
@@ -5547,7 +5540,7 @@ que_job01,91,83,3	script	Kidd#hall	884,{
 	end;
 }
 
-que_job01,89,85,5	script	Dandelion Member	880,{
+que_job01,89,85,5	script	Dandelion Member	4_M_MASKMAN,{
 
 	if(checkweight(12112,1) != 1)
 	{
@@ -6035,7 +6028,7 @@ que_job01,89,85,5	script	Dandelion Member	880,{
 	end;
 }
 
-yuno_in04,180,106,3	script	Reading Girl	73,{
+yuno_in04,180,106,3	script	Reading Girl	1_F_MERCHANT_01,{
 
 	if (mao_request == 5)
 	{
@@ -6323,7 +6316,7 @@ yuno_in04,180,106,3	script	Reading Girl	73,{
 	}
 }
 
-yuno_in04,175,129,0	script	Workbook#mao	111,{
+yuno_in04,175,129,0	script	Workbook#mao	HIDDEN_NPC,{
 
 	if (mao_request == 7)
 	{
@@ -6433,7 +6426,7 @@ OnInit:
 	end;
 }
 
-yuno_in04,174,130,5	script	Kidd#book	884,{
+yuno_in04,174,130,5	script	Kidd#book	4_M_ACROSS,{
 
 	mes "[Kidd]";
 	mes "......";
@@ -6464,7 +6457,7 @@ OnTimer180000:
 	stopnpctimer;
 }
 
-que_job01,6,79,5	script	Lin#stairs	885,{
+que_job01,6,79,5	script	Lin#stairs	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#stairs";
@@ -6475,7 +6468,7 @@ OnEnter:
 	end;
 }
 
-que_job01,8,77,1	script	#linstairs	139,3,3,{
+que_job01,8,77,1	script	#linstairs	HIDDEN_WARP_NPC,3,3,{
 
 	if (mao_request == 109)
 	{
@@ -6687,7 +6680,7 @@ que_job01,8,77,1	script	#linstairs	139,3,3,{
 	}
 }
 
-moc_fild10,281,148,1	script	Upturned Spot#water	111,{
+moc_fild10,281,148,1	script	Upturned Spot#water	HIDDEN_NPC,{
 
 	if (mao_request == 14)
 	{
@@ -6789,7 +6782,7 @@ moc_fild10,281,148,1	script	Upturned Spot#water	111,{
 	end;
 }
 
-moc_fild19,21,33,1	script	Unturned Spot#wind	111,{
+moc_fild19,21,33,1	script	Unturned Spot#wind	HIDDEN_NPC,{
 
 	if (mao_request == 10)
 	{
@@ -6998,7 +6991,7 @@ moc_fild19,21,33,1	script	Unturned Spot#wind	111,{
 	end;
 }
 
-moc_fild12,280,36,1	script	Unturned Spot#earth	111,{
+moc_fild12,280,36,1	script	Unturned Spot#earth	HIDDEN_NPC,{
 
 	if (mao_request == 13)
 	{
@@ -7113,7 +7106,7 @@ moc_fild12,280,36,1	script	Unturned Spot#earth	111,{
 	cutin "mocseal_earth02.bmp",255;
 }
 
-moc_fild07,192,166,1	script	Unturned Spot#fire	111,{
+moc_fild07,192,166,1	script	Unturned Spot#fire	HIDDEN_NPC,{
 
 	if (mao_request == 15)
 	{
@@ -7216,7 +7209,7 @@ moc_fild07,192,166,1	script	Unturned Spot#fire	111,{
 	cutin "mocseal_fire02.bmp",255;
 }
 
-morocc_in,46,125,5	script	Assistant	729,{
+morocc_in,46,125,5	script	Assistant	4_F_NOVICE,{
 
 	if (mao_request > 18 && mao_request < 100)
 	{
@@ -7500,7 +7493,7 @@ morocc_in,46,125,5	script	Assistant	729,{
 	}
 }
 
-que_job01,15,8,1	script	#mao_table	139,1,1,{
+que_job01,15,8,1	script	#mao_table	HIDDEN_WARP_NPC,1,1,{
 
 OnTouch:
 	if (mao_request == 24)
@@ -7647,7 +7640,7 @@ OnEnter:
 	end;
 }
 
-que_job01,147,55,1	script	#mao_empty	139,1,1,{
+que_job01,147,55,1	script	#mao_empty	HIDDEN_WARP_NPC,1,1,{
 
 OnTouch:
 	if (mao_request == 122)
@@ -7673,7 +7666,7 @@ OnEnter:
 	end;
 }
 
-que_job01,144,57,1	script	#Rabsent	139,1,1,{
+que_job01,144,57,1	script	#Rabsent	HIDDEN_WARP_NPC,1,1,{
 
 OnTouch:
 	if(mao_request == 25)
@@ -7746,7 +7739,7 @@ OnEnter:
 	end;
 }
 
-moc_castle,40,20,3	script	Man	849,{
+moc_castle,40,20,3	script	Man	4_M_DIEMAN,{
 
 	if ((mao_request > 27 && mao_request < 31) || (mao_request > 125 && mao_request < 129))
 	{
@@ -7803,7 +7796,7 @@ OnInit:
 	end;
 }
 
-que_job02,14,182,1	script	#maogate1	139,1,1,{
+que_job02,14,182,1	script	#maogate1	HIDDEN_WARP_NPC,1,1,{
 
 OnEnter:
 	enablenpc "#maogate1";
@@ -7875,7 +7868,7 @@ OnTimer597000:
 	end;
 }
 
-que_job02,14,181,1	script	#maogate1_talk1	139,2,2,{
+que_job02,14,181,1	script	#maogate1_talk1	HIDDEN_WARP_NPC,2,2,{
 
 OnInit:
 	disablenpc "#maogate1_talk1";
@@ -7916,7 +7909,7 @@ OnTouch:
 	end;
 }
 
-que_job02,17,150,1	script	#maogate1_talk2	139,2,2,{
+que_job02,17,150,1	script	#maogate1_talk2	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk2";
@@ -7932,7 +7925,7 @@ OnTouch:
 	mes ".........";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "...Isn't the moon";
 	mes "so beautiful tonight?";
@@ -7957,12 +7950,12 @@ OnTouch:
 	mes "What was that?";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk2";
 	end;
 }
 
-que_job02,16,97,1	script	#maogate1_talk3	139,2,2,{
+que_job02,16,97,1	script	#maogate1_talk3	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk3";
@@ -7978,7 +7971,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "So, you telling me you";
 	mes "don't know how this town";
@@ -8014,12 +8007,12 @@ OnTouch:
 	mes "............";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk3";
 	end;
 }
 
-que_job02,44,33,1	script	#maogate1_talk4	139,2,2,{
+que_job02,44,33,1	script	#maogate1_talk4	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk4";
@@ -8035,7 +8028,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Hmpf.";
 	mes "It has begun.";
@@ -8066,12 +8059,12 @@ OnTouch:
 	mes "in Castle Morroc...";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk4";
 	end;
 }
 
-que_job02,93,21,1	script	#maogate1_talk5	139,2,2,{
+que_job02,93,21,1	script	#maogate1_talk5	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk5";
@@ -8087,7 +8080,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Sir, our investigation has";
 	mes "turned something up. Every";
@@ -8103,12 +8096,12 @@ OnTouch:
 	mes "Come on, let's go...";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk5";
 	end;
 }
 
-que_job02,93,21,1	script	#maogate1_talk6	139,3,3,{
+que_job02,93,21,1	script	#maogate1_talk6	HIDDEN_WARP_NPC,3,3,{
 
 OnStop:
 	disablenpc "#maogate1_talk6";
@@ -8124,7 +8117,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Wh-what's with";
 	mes "all of this noise?";
@@ -8176,12 +8169,12 @@ OnTouch:
 	mes "the hell is Raiyan Moore?!";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk6";
 	end;
 }
 
-que_job02,180,144,1	script	#maogate1_talk7	139,2,2,{
+que_job02,180,144,1	script	#maogate1_talk7	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk7";
@@ -8197,7 +8190,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Jeez, what's going";
 	mes "on? Where the heck";
@@ -8230,12 +8223,12 @@ OnTouch:
 	mes "don't let me be too late!";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk7";
 	end;
 }
 
-que_job02,77,179,1	script	#maogate1_talk8	139,2,2,{
+que_job02,77,179,1	script	#maogate1_talk8	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_talk8";
@@ -8283,7 +8276,7 @@ OnTimer20100:
 	end;
 }
 
-que_job02,73,82,1	script	#maogate1_battle	139,2,2,{
+que_job02,73,82,1	script	#maogate1_battle	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_battle";
@@ -8329,7 +8322,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job02,66,85,5	script	Dandelion Member#1_bt	880,{
+que_job02,66,85,5	script	Dandelion Member#1_bt	4_M_MASKMAN,{
 
 	if(mao_request == 26 || mao_request == 27)
 	{
@@ -8391,7 +8384,7 @@ OnEnter:
 	end;
 }
 
-que_job02,87,83,1	script	#maogate1_setting	139,2,2,{
+que_job02,87,83,1	script	#maogate1_setting	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate1_setting";
@@ -8414,7 +8407,7 @@ OnTouch:
 	}
 }
 
-que_job02,117,101,1	script	#maogate1_end	139,3,3,{
+que_job02,117,101,1	script	#maogate1_end	HIDDEN_WARP_NPC,3,3,{
 
 OnInit:
 	disablenpc "#maogate1_end";
@@ -8607,7 +8600,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job02,116,108,5	script	Kidd#maogate1_1	884,{
+que_job02,116,108,5	script	Kidd#maogate1_1	4_M_ACROSS,{
 
 OnInit:
 	disablenpc "Kidd#maogate1_1";
@@ -8618,7 +8611,7 @@ OnEnter:
 	end;
 }
 
-que_job02,126,103,5	script	Kidd#maogate1_2	884,{
+que_job02,126,103,5	script	Kidd#maogate1_2	4_M_ACROSS,{
 
 	end;
 
@@ -8636,7 +8629,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job02,121,106,1	script	Lin#maogate1_1	885,{
+que_job02,121,106,1	script	Lin#maogate1_1	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#maogate1_1";
@@ -8647,7 +8640,7 @@ OnEnter:
 	end;
 }
 
-que_job02,127,101,1	script	Lin#maogate1_2	885,{
+que_job02,127,101,1	script	Lin#maogate1_2	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#maogate1_2";
@@ -8658,7 +8651,7 @@ OnEnter:
 	end;
 }
 
-que_job02,124,109,3	script	R#maogate1	880,{
+que_job02,124,109,3	script	R#maogate1	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "R#maogate1";
@@ -8673,7 +8666,7 @@ OnSpell:
 	end;
 }
 
-que_job02,113,107,5	script	Dandelion#maogate1_1	880,{
+que_job02,113,107,5	script	Dandelion#maogate1_1	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate1_1";
@@ -8684,7 +8677,7 @@ OnEnter:
 	end;
 }
 
-que_job02,121,100,7	script	Dandelion#maogate1_2	880,{
+que_job02,121,100,7	script	Dandelion#maogate1_2	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate1_2";
@@ -8703,7 +8696,7 @@ OnSpell2:
 	end;
 }
 
-que_job02,122,98,1	script	Dandelion#maogate1_3	880,{
+que_job02,122,98,1	script	Dandelion#maogate1_3	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate1_3";
@@ -8718,7 +8711,7 @@ OnSpell:
 	end;
 }
 
-que_job02,122,111,5	script	Dandelion#maogate1_4	880,{
+que_job02,122,111,5	script	Dandelion#maogate1_4	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate1_4";
@@ -8733,7 +8726,7 @@ OnSpell:
 	end;
 }
 
-que_job02,122,106,1	script	#maogate1_end2	139,15,15,{
+que_job02,122,106,1	script	#maogate1_end2	HIDDEN_WARP_NPC,15,15,{
 
 OnInit:
 	disablenpc "#maogate1_end2";
@@ -8786,7 +8779,7 @@ OnTouch:
 	}
 }
 
-que_job03,14,182,1	script	#maogate2	139,1,1,{
+que_job03,14,182,1	script	#maogate2	HIDDEN_WARP_NPC,1,1,{
 
 OnEnter:
 	enablenpc "#maogate2";
@@ -8858,7 +8851,7 @@ OnTimer597000:
 	end;
 }
 
-que_job03,14,181,1	script	#maogate2_talk1	139,2,2,{
+que_job03,14,181,1	script	#maogate2_talk1	HIDDEN_WARP_NPC,2,2,{
 
 OnInit:
 	disablenpc "#maogate2_talk1";
@@ -8899,7 +8892,7 @@ OnTouch:
 	end;
 }
 
-que_job03,17,150,1	script	#maogate2_talk2	139,2,2,{
+que_job03,17,150,1	script	#maogate2_talk2	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk2";
@@ -8915,7 +8908,7 @@ OnTouch:
 	mes ".........";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "...Isn't the moon";
 	mes "so beautiful tonight?";
@@ -8940,12 +8933,12 @@ OnTouch:
 	mes "What was that?";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk2";
 	end;
 }
 
-que_job03,16,97,1	script	#maogate2_talk3	139,2,2,{
+que_job03,16,97,1	script	#maogate2_talk3	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk3";
@@ -8961,7 +8954,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "So, you telling me you";
 	mes "don't know how this town";
@@ -8997,12 +8990,12 @@ OnTouch:
 	mes "............";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk3";
 	end;
 }
 
-que_job03,44,33,1	script	#maogate2_talk4	139,2,2,{
+que_job03,44,33,1	script	#maogate2_talk4	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk4";
@@ -9018,7 +9011,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Hmpf.";
 	mes "It has begun.";
@@ -9049,12 +9042,12 @@ OnTouch:
 	mes "in Castle Morroc...";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk4";
 	end;
 }
 
-que_job03,93,21,1	script	#maogate2_talk5	139,2,2,{
+que_job03,93,21,1	script	#maogate2_talk5	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk5";
@@ -9070,7 +9063,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Sir, our investigation has";
 	mes "turned something up. Every";
@@ -9086,12 +9079,12 @@ OnTouch:
 	mes "Come on, let's go...";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk5";
 	end;
 }
 
-que_job03,93,21,1	script	#maogate2_talk6	139,3,3,{
+que_job03,93,21,1	script	#maogate2_talk6	HIDDEN_WARP_NPC,3,3,{
 
 OnStop:
 	disablenpc "#maogate2_talk6";
@@ -9107,7 +9100,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Wh-what's with";
 	mes "all of this noise?";
@@ -9159,12 +9152,12 @@ OnTouch:
 	mes "the hell is Raiyan Moore?!";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk6";
 	end;
 }
 
-que_job03,180,144,1	script	#maogate2_talk7	139,2,2,{
+que_job03,180,144,1	script	#maogate2_talk7	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk7";
@@ -9180,7 +9173,7 @@ OnTouch:
 	mes "............";
 	next;
 	soundeffect "wander_man_move.wav",0;
-	sc_start SC_Blind,60000,0;
+	sc_start SC_BLIND,60000,0;
 	mes "[?????]";
 	mes "Jeez, what's going";
 	mes "on? Where the heck";
@@ -9213,12 +9206,12 @@ OnTouch:
 	mes "don't let me be too late!";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk7";
 	end;
 }
 
-que_job03,77,179,1	script	#maogate2_talk8	139,2,2,{
+que_job03,77,179,1	script	#maogate2_talk8	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_talk8";
@@ -9266,7 +9259,7 @@ OnTimer20100:
 	end;
 }
 
-que_job03,73,82,1	script	#maogate2_battle	139,2,2,{
+que_job03,73,82,1	script	#maogate2_battle	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_battle";
@@ -9312,7 +9305,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job03,66,85,5	script	Dandelion Member#2_bt	880,{
+que_job03,66,85,5	script	Dandelion Member#2_bt	4_M_MASKMAN,{
 
 	if(mao_request == 124 || mao_request == 125)
 	{
@@ -9384,7 +9377,7 @@ OnEnter:
 	end;
 }
 
-que_job03,87,83,1	script	#maogate2_setting	139,2,2,{
+que_job03,87,83,1	script	#maogate2_setting	HIDDEN_WARP_NPC,2,2,{
 
 OnStop:
 	disablenpc "#maogate2_setting";
@@ -9407,7 +9400,7 @@ OnTouch:
 	}
 }
 
-que_job03,117,101,1	script	#maogate2_end	139,3,3,{
+que_job03,117,101,1	script	#maogate2_end	HIDDEN_WARP_NPC,3,3,{
 
 OnInit:
 	disablenpc "#maogate2_end";
@@ -9601,7 +9594,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job03,116,108,5	script	Kidd#maogate2_1	884,{
+que_job03,116,108,5	script	Kidd#maogate2_1	4_M_ACROSS,{
 
 OnInit:
 	disablenpc "Kidd#maogate2_1";
@@ -9612,7 +9605,7 @@ OnEnter:
 	end;
 }
 
-que_job03,126,103,5	script	Kidd#maogate2_2	884,{
+que_job03,126,103,5	script	Kidd#maogate2_2	4_M_ACROSS,{
 
 	end;
 
@@ -9630,7 +9623,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job03,121,106,1	script	Lin#maogate2_1	885,{
+que_job03,121,106,1	script	Lin#maogate2_1	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#maogate2_1";
@@ -9641,7 +9634,7 @@ OnEnter:
 	end;
 }
 
-que_job03,127,101,1	script	Lin#maogate2_2	885,{
+que_job03,127,101,1	script	Lin#maogate2_2	4_F_ACROSS,{
 
 OnInit:
 	disablenpc "Lin#maogate2_2";
@@ -9652,7 +9645,7 @@ OnEnter:
 	end;
 }
 
-que_job03,124,109,3	script	R#maogate2	880,{
+que_job03,124,109,3	script	R#maogate2	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "R#maogate2";
@@ -9667,7 +9660,7 @@ OnSpell:
 	end;
 }
 
-que_job03,113,107,5	script	Dandelion#maogate2_1	880,{
+que_job03,113,107,5	script	Dandelion#maogate2_1	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate2_1";
@@ -9678,7 +9671,7 @@ OnEnter:
 	end;
 }
 
-que_job03,121,100,7	script	Dandelion#maogate2_2	880,{
+que_job03,121,100,7	script	Dandelion#maogate2_2	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate2_2";
@@ -9697,7 +9690,7 @@ OnSpell2:
 	end;
 }
 
-que_job03,122,98,1	script	Dandelion#maogate2_3	880,{
+que_job03,122,98,1	script	Dandelion#maogate2_3	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate2_3";
@@ -9712,7 +9705,7 @@ OnSpell:
 	end;
 }
 
-que_job03,122,111,5	script	Dandelion#maogate2_4	880,{
+que_job03,122,111,5	script	Dandelion#maogate2_4	4_M_MASKMAN,{
 
 OnInit:
 	disablenpc "Dandelion#maogate2_4";
@@ -9727,7 +9720,7 @@ OnSpell:
 	end;
 }
 
-que_job03,122,106,1	script	#maogate2_end2	139,15,15,{
+que_job03,122,106,1	script	#maogate2_end2	HIDDEN_WARP_NPC,15,15,{
 
 OnInit:
 	disablenpc "#maogate2_end2";
@@ -9779,7 +9772,7 @@ OnTouch:
 	}
 }
 
-morocc,30,29,5	script	Member#mao1	880,10,15,{
+morocc,30,29,5	script	Member#mao1	4_M_MASKMAN,10,15,{
 
 	mes "[Chairman]";
 	mes "So it's agreed.";
@@ -9862,7 +9855,7 @@ OnTouch:
 	}
 }
 
-morocc,29,26,0	script	Member#mao2	880,{
+morocc,29,26,0	script	Member#mao2	4_M_MASKMAN,{
 
 	mes "[Chairman]";
 	mes "So it's agreed.";
@@ -9899,7 +9892,7 @@ OnEnter:
 	end;
 }
 
-morocc,33,27,1	script	Member#mao3	880,{
+morocc,33,27,1	script	Member#mao3	4_M_MASKMAN,{
 
 	mes "[Chairman]";
 	mes "So it's agreed.";
@@ -9936,7 +9929,7 @@ OnEnter:
 	end;
 }
 
-morocc,34,30,3	script	Member#mao4	880,{
+morocc,34,30,3	script	Member#mao4	4_M_MASKMAN,{
 
 	mes "[Chairman]";
 	mes "So it's agreed.";
@@ -10173,7 +10166,7 @@ OnMyMobDead:
 	end;
 }
 
-que_job01,68,88,5	script	Simon#mao	881,{
+que_job01,68,88,5	script	Simon#mao	4_M_SITDOWN,{
 
 	mes "[Simon]";
 	mes "...No. How many";
@@ -10224,12 +10217,10 @@ que_job01,68,88,5	script	Simon#mao	881,{
 	close;
 }
 
-que_job01,70,84,1	duplicate(Simon#mao)	Kimmie	882,0,0
-
-sec_in02,38,162,0	script	Morroc Invasion Manager	882,{
-
-	if(getgmlevel() < 80) end;
+que_job01,70,84,1	duplicate(Simon#mao)	Kimmie	4_F_SITDOWN,0,0
 
+sec_in02,38,162,0	script	Morroc Invasion Manager	4_F_SITDOWN,{
+	callfunc "F_GM_NPC";
 	mes "A total of " + $maoattack + " users completed";
 	mes "the Satan Morroc: Lin Quest.";
 	mes "There are 2 requirements to";
diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt
index 2c443076f..6bccc7347 100644
--- a/npc/quests/doomed_swords.txt
+++ b/npc/quests/doomed_swords.txt
@@ -3,11 +3,9 @@
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.6
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.5
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Doomed Swords Quest:
 //= - Quest for Doomed Swords: Grimtooth, Mysteltain, Executioner.
 //=   Although this quest is enabled on iRO, the Mysteltainn
@@ -19,12 +17,11 @@
 //= 1.1 Fixed items count check. For all 3 swords... [Lupus]
 //= 1.3 Fixed exploit [Lupus]
 //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Moved all non-related NPCs to their repsective files.
+//=     Moved all non-related NPCs to their repsective files.
 //= 1.5 Added missing checkweight. [L0ne_W0lf]
-//= 1.6 Removed Nain [Streusel]
 //============================================================
 
-prt_in,162,11,2	script	Ghatu#magum	86,{
+prt_in,162,11,2	script	Ghatu#magum	4_M_04,{
 	if (event_magum == 0) {
 		if (dmdswrd_Q2 & 1 || dmdswrd_Q2 & 2 || dmdswrd_Q2 & 4 || dmdswrd_Q2 & 8 || dmdswrd_Q2 & 16 || dmdswrd_Q2 & 32) {
 			mes "[Ghatu]";
@@ -119,7 +116,7 @@ prt_in,162,11,2	script	Ghatu#magum	86,{
 	close;
 }
 
-prontera,197,188,2	script	Veeyop#magum	50,{
+prontera,197,188,2	script	Veeyop#magum	1_M_04,{
 	if (dmdswrd_Q2 & 1) {
 		mes "[Veeyop]";
 		mes "You know, talking";
@@ -159,7 +156,7 @@ prontera,197,188,2	script	Veeyop#magum	50,{
 	close;
 }
 
-morocc,281,178,2	script	Cetsu#magum	97,{
+morocc,281,178,2	script	Cetsu#magum	4W_M_01,{
 	if (dmdswrd_Q2 & 2) {
 		mes "[Cetsu]";
 		mes "I keep thinking about";
@@ -211,7 +208,51 @@ morocc,281,178,2	script	Cetsu#magum	97,{
 	close;
 }
 
-pay_fild08,218,283,2	script	Mysterious Man#magum	89,{
+izlude_in,173,88,2	script	Nain#magum	8_F,{
+	if (dmdswrd_Q2 == 4) {
+		mes "[Nain]";
+		mes "It doesn't matter how";
+		mes "powerful the Executioner";
+		mes "is: if it were to end up in";
+		mes "my hands, I would get rid";
+		mes "of it right away. I'd never risk losing my mind to that curse...";
+		close;
+	}
+	mes "[Nain]";
+	mes "Long ago, one sword";
+	mes "was used to behead all";
+	mes "the criminals that had been";
+	mes "sentenced to death. That";
+	mes "accursed blade is known";
+	mes "as the Executioner.";
+	next;
+	mes "[Nain]";
+	mes "As the Executioner slayed";
+	mes "more criminals, the rage and";
+	mes "bloodlust of its victims began";
+	mes "to accumulate upon the blade.";
+	mes "Although the sword gained great^FFFFFF ^000000 strength, it was tainted by evil.";
+	next;
+	mes "[Nain]";
+	mes "The last person to wield";
+	mes "the Executioner almost lost";
+	mes "his mind to the sword. He saved^FFFFFF ^000000 himself by giving it to a talented";
+	mes "blacksmith who would destroy^FFFFFF ^000000 it for him, thus saving his soul.";
+	next;
+	mes "[Nain]";
+	mes "This mysterious blacksmith";
+	mes "was never seen again in the";
+	mes "city of Prontera, but rumor has";
+	mes "it that if you can find him, he";
+	mes "can forge that accursed";
+	mes "Executioner anew...";
+	if (event_magum == 1)
+		set event_magum,5;
+	set dmdswrd_Q2,dmdswrd_Q2 | 4;
+	close;
+}
+
+pay_fild08,218,283,2	script	Mysterious Man#magum	4_M_ORIENT02,{
 	if (checkweight(1201,1) == 0) {
 		mes "[Mysterious Man]";
 		mes "Hold it.";
diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt
index 6c723d8aa..e4a1ddf58 100644
--- a/npc/quests/doomed_swords_quest.txt
+++ b/npc/quests/doomed_swords_quest.txt
@@ -4,10 +4,8 @@
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= - Creation of Doomed Swords: Grimtooth, Mysteltain, and
 //=   Executioner.
 //= - Continuation of the Comodo Quest
@@ -18,7 +16,7 @@
 //= 1.0 First version. [L0ne_W0lf]
 //============================================================
 
-mjolnir_02,186,193,4	script	Middle-Aged Man#magum1	57,{
+mjolnir_02,186,193,4	script	Middle-Aged Man#magum1	1_M_LIBRARYMASTER,{
 	if (dmdswrd_Q > 30) {
 		if (dmdswrd_Q == 31) {
 			mes "[Middle-Aged Man]";
@@ -347,7 +345,7 @@ mjolnir_02,186,193,4	script	Middle-Aged Man#magum1	57,{
 	}
 }
 
-payon,248,159,1	script	Old Man#magum1	120,{
+payon,248,159,1	script	Old Man#magum1	2_M_PHARMACIST,{
 	if (dmdswrd_Q == 35) {
 		mes "[Old Man]";
 		mes "Wha--? Who are";
@@ -793,7 +791,7 @@ payon,248,159,1	script	Old Man#magum1	120,{
 	}
 }
 
-morocc,248,159,4	script	Young Man#magum1	86,{
+morocc,248,159,4	script	Young Man#magum1	4_M_04,{
 	if (dmdswrd_Q == 39) {
 		mes "[Huey]";
 		mes "Excuse me, but...";
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index 841e93734..0acbf6c05 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -1,28 +1,29 @@
 //===== Hercules Script ======================================
-//= The Eye of Hellion Quest.
+//= The Eye of Hellion Quest
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
-//= 1.9
+//= 2.1
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Quest for getting a Nile Rose
 //= There are two versions of this quest.
-//= Version 1 (Not implemented) was used on iRO as an event
-//= for it's anniversary, while version 2 (this version),
+//= Version 1 (not implemented) was used on iRO as an event
+//= for its anniversary, while version 2 (this version)
 //= is the one that remained active on main servers.
 //===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Tracking variable is not backwards compatable meaning
+//=     Tracking variable is not backwards compatable meaning
 //=     you can again repeat this quest from the start.
 //= 1.6 Fixed issue with #prt_key-1-1. [L0ne_W0lf]
-//= 1.7 Corrected reminants from aegis conversion. [L0en_w0lf]
+//= 1.7 Corrected remnants from Official Conversion. [L0ne_W0lf]
 //= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.9 Removed duplicate text. [Kisuka]
-//= 2.0 Corrected EXP reward
+//= 2.0 Updated EXP rewards.
+//= 2.1 Updated RE/Pre-RE EXP. [Euphy]
 //============================================================
 
-morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
+morocc_in,116,101,3	script	Old Scholar Tyus#hellion	4_M_JOB_WIZARD,3,3,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -546,7 +547,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 			set HELLIONQ,69;
 			getitem 2658,1; //Nile_Rose_
 			getitem 603,1; //Old_Blue_Box
-			getexp 1200000,0;
+			getexp (checkre(3))?120000:1200000,0;
 			next;
 			mes "[Sir Chilias'Tyus]";
 			mes "Thank you, kind";
@@ -613,7 +614,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 			delitem 7332,1; //Slate
 			set HELLIONQ,70;
 			getitem 2658,1; //Nile_Rose_
-			getexp 1000000,0;
+			getexp (checkre(3))?100000:1000000,0;
 			next;
 			mes "[Sir Chilias'Tyus]";
 			mes "Thank you, kind";
@@ -660,7 +661,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 
 OnTouch:
 	if (HELLIONQ == 57 && countitem(7334) > 0) {
-		specialeffect2 EF_HEAL2; 
+		specialeffect2 EF_HEAL2;
 		specialeffect EF_HEAL2;
 		mes "^3355FFOne of the Tablet Pieces";
 		mes "that you have is beginning to";
@@ -671,7 +672,7 @@ OnTouch:
 	end;
 }
 
-prontera,269,326,3	script	Clanux Heffron#hellion	50,{
+prontera,269,326,3	script	Clanux Heffron#hellion	1_M_04,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -1036,7 +1037,7 @@ prontera,269,326,3	script	Clanux Heffron#hellion	50,{
 	close;
 }
 
-prontera,223,82,0	script	#prt_key-1	111,{
+prontera,223,82,0	script	#prt_key-1	HIDDEN_NPC,{
 	if (HELLIONQ == 39) {
 		mes "^3355FFIt's a training dummy";
 		mes "with a gash in its body";
@@ -1071,7 +1072,7 @@ prontera,223,82,0	script	#prt_key-1	111,{
 	close;
 }
 
-prontera,45,67,0	script	 #prt_key-1-1	111,1,1,{
+prontera,45,67,0	script	 #prt_key-1-1	HIDDEN_NPC,1,1,{
 OnTouch:
 	if (HELLIONQ == 40 || HELLIONQ == 41) {
 		mes "[" + strcharinfo(0) + "]";
@@ -1152,7 +1153,7 @@ OnTouch:
 	end;
 }
 
-prt_in,128,79,0	script	Unknown Machine#prt_key	111,{
+prt_in,128,79,0	script	Unknown Machine#prt_key	HIDDEN_NPC,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -1283,7 +1284,7 @@ prt_in,128,79,0	script	Unknown Machine#prt_key	111,{
 	close;
 }
 
-payon,182,132,3	script	Grout'he Tuccok#hellion	48,{
+payon,182,132,3	script	Grout'he Tuccok#hellion	1_M_02,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -1370,7 +1371,7 @@ payon,182,132,3	script	Grout'he Tuccok#hellion	48,{
 					mes "clean and pure Skirt of Virgin.";
 					mes "If you got any more questions,";
 					mes "I guess you can ask me later~";
-					set zeny,zeny-10000;
+					Zeny -= 10000;
 					set HELLIONQ,48;
 					getitem 953,1; //Stone_Heart
 					getitem 511,1; //Green_Herb
@@ -1622,7 +1623,7 @@ OnTouch:
 	end;
 }
 
-payon,82,109,3	script	Pile of Stone#paypuzz2	111,{
+payon,82,109,3	script	Pile of Stone#paypuzz2	HIDDEN_NPC,{
 	if (HELLIONQ == 49) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Well, this is the place";
@@ -1642,7 +1643,7 @@ payon,82,109,3	script	Pile of Stone#paypuzz2	111,{
 	}
 }
 
-payon,239,56,3	script	Dried Fish#paypuzz3	111,{
+payon,239,56,3	script	Dried Fish#paypuzz3	HIDDEN_NPC,{
 	if (HELLIONQ == 50) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "So... Dried fish all";
@@ -1663,7 +1664,7 @@ payon,239,56,3	script	Dried Fish#paypuzz3	111,{
 	}
 }
 
-payon,240,160,3	script	Vat#paypuzz4	111,{
+payon,240,160,3	script	Vat#paypuzz4	HIDDEN_NPC,{
 	if (HELLIONQ == 51) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Alright, the last";
@@ -1689,7 +1690,7 @@ payon,240,160,3	script	Vat#paypuzz4	111,{
 	}
 }
 
-payon,159,129,3	script	Wooden Floor#paypuzz5	111,{
+payon,159,129,3	script	Wooden Floor#paypuzz5	HIDDEN_NPC,{
 	if (HELLIONQ == 53) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Hey, the floor around";
@@ -1789,7 +1790,7 @@ payon,159,129,3	script	Wooden Floor#paypuzz5	111,{
 	}
 }
 
-pay_arche,142,28,0	script	Buddha Statue#paypuzz6	111,5,5,{
+pay_arche,142,28,0	script	Buddha Statue#paypuzz6	HIDDEN_NPC,5,5,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -1888,7 +1889,7 @@ OnTouch:
 	end;
 }
 
-geffen,110,200,3	script	Sage Welshyun#hellion	754,3,3,{
+geffen,110,200,3	script	Sage Welshyun#hellion	4_M_SAGE_A,3,3,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -2257,7 +2258,7 @@ OnTouch:
 	end;
 }
 
-gef_tower,116,37,0	script	Enoz#hellion	748,{
+gef_tower,116,37,0	script	Enoz#hellion	4_M_ALCHE_A,{
 	if (HELLIONQ == 59 || HELLIONQ == 62) {
 		mes "[Enoz]";
 		mes "It's gone, it's gone!";
@@ -2367,7 +2368,7 @@ gef_tower,116,37,0	script	Enoz#hellion	748,{
 	close;
 }
 
-gef_fild09,296,59,0	script	Hidden Cave#hellion	111,3,3,{
+gef_fild09,296,59,0	script	Hidden Cave#hellion	HIDDEN_NPC,3,3,{
 	if (HELLIONQ == 68) {
 		mes "^3355FFAmongst the wild bushes";
 		mes "and overgrown grass, you";
@@ -2436,12 +2437,12 @@ OnTouch:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 First version [MasterOfMuppets]
 //= 1.1 a ',' that should be ';' [FlavioJS]
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.4 Moved Enoz from the wizard quest skill to here. [L0ne_W0lf]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index edd9b05c5..854b0a26a 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -1,30 +1,31 @@
 //===== Hercules Script ======================================
 //= Acolyte Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
-//= 1.6a
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= Tutorial for Acolyte Class
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.9
+//===== Description: =========================================
+//= [Official Conversion]
+//= Acolyte training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
-//=	TODO: Test, Add correct misceffects numbers
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.4 Misc. updates. [L0ne_W0lf]
 //= 1.5 Adjusted EXP gains to Renewal values.
 //= 1.6 Fixed a wrong placed curly bracket. [Joseph]
 //= 1.6a Added 'npcskill' command. [Euphy]
-//============================================================ 
+//= 1.7 Fixed exp, texts, and requirements in pre-renewal [Daegaladh]
+//= 1.8 Updated to match the official script. [Euphy]
+//= 1.9 Added GM management function. [Euphy]
+//============================================================
 
 // Priest Praupin
 //============================================================
-prt_church,179,15,1	script	Priest Praupin	110,{
+prt_church,179,15,1	script	Priest Praupin	4_M_MINISTER,{
 	mes "[Priest Praupin]";
-	if(BaseClass != Job_Acolyte){
+	if(BaseJob != Job_Acolyte){
 		if(tu_acolyte01 == 25){
 			mes "Oh...!";
 			mes "You're "+strcharinfo(0)+" !";
@@ -173,7 +174,7 @@ prt_church,179,15,1	script	Priest Praupin	110,{
 
 // Asthe
 //============================================================
-prt_monk,230,106,3	script	Asthe#tu	79,{
+prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 	mes "[Asthe]";
 	switch(tu_acolyte01){
 	case 1:
@@ -246,7 +247,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "is the most necessary";
 		mes "skill for an Acolyte?";
 		next;
-		switch(select("Heal:Aqua Benedicta:Teleport")){ 
+		switch(select("Heal:Aqua Benedicta:Teleport")){
 		case 1:
 			mes "[Asthe]";
 			mes "Ah, yes.";
@@ -290,10 +291,10 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		next;
 		mes "[Asthe]";
 		mes "HEAL !!";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		set tu_acolyte01, 3;
 		if(getskilllv("AL_HEAL") == 0){
-			getexp 0,10;
+			getexp 0,100;
 			specialeffect2 EF_CONE;
 		}
 		close;
@@ -381,12 +382,15 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 				emotion e_heh;
 				set tu_acolyte01, 5;
 				delitem 1504, 1; //Mace
-				if(Class == Job_Acolyte_High)
-					getexp 200,100;
-				else
-					getexp 100,50;
-				specialeffect2 EF_CONE;
-				close;
+				if(Class == Job_Acolyte_High) {
+					getexp 2000,1000;
+					specialeffect2 EF_CONE;
+					close;
+				} else {
+					getexp 1000,500;
+					specialeffect2 EF_CONE;
+					close;
+				}
 			} else {
 				mes "Oh my!";
 				mes "Welcome back~";
@@ -395,7 +399,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 				next;
 				mes "[Asthe]";
 				mes "But you must have forgotten the Mace I've lent you. Would you bring it back so that I can return it to the church?";
-				close;  
+				close;
 			}
 		}
 		mes "Are you having";
@@ -451,7 +455,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "building nearby.";
 		close;
 	case 9:
-		mes "You went to Prontera on behalf of the convent for Priest Gardron? That must have been tough...";
+		mes "You went to "+(checkre(0)?"Prontera":"Payon")+" on behalf of the convent for Priest Gardron? That must have been tough...";
 		next;
 		mes "[Asthe]";
 		mes "Blessing!";
@@ -772,7 +776,10 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "[Asthe]";
 		mes "Well, please don't forget what I've taught you. I hope you look back with fondness at our time together amongst these beautiful flowers. May God bless you~";
 		set tu_acolyte01, 25;
-		getexp 500,300;
+		if (checkre(3))
+			getexp 1000,1000;
+		else
+			getexp 5000,3000;
 		specialeffect2 EF_CONE;
 		close;
 	}
@@ -793,7 +800,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 
 // Priest Gardron
 //============================================================
-monk_in,18,38,6	script	Priest Gardron#tu	110,{
+monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 	mes "[Priest Gardron]";
 	if(tu_acolyte01 == 7){
 		if(countitem(7148) >= 1){
@@ -826,8 +833,8 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 			close;
 		}
 	} else if(tu_acolyte01 == 8){
-		if(countitem(939) > 4){
-			mes "Oh..!";
+		if(countitem((checkre(0)?939:957)) > 4){
+			mes "Oh...!";
 			mes "You've returned!";
 			mes "Let's see... One...";
 			mes "Two... Three...";
@@ -838,7 +845,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 			mes "on behalf of the convent,";
 			mes "not to mention the fact that";
 			mes "you've protected the citizens";
-			mes "of Prontera from danger.";
+			mes "of "+(checkre(0)?"Prontera":"Payon")+" from danger.";
 			next;
 			mes "[Priest Gardron]";
 			mes "May you always";
@@ -848,45 +855,88 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 			mes "Acolyte training.";
 			set tu_acolyte01, 9;
 			percentheal 100,100;
-			getexp 200,200;
+			if (checkre(3))
+				getexp 1000,1000;
+			else
+				getexp 2000,2000;
 			specialeffect2 EF_CONE;
 			//getitem 505,1; //Blue_Potion
 			close;
 		} else {
-			mes "A little while ago, a Prontere Sister sent me a message. Apparently,";
-			mes "the residents of Prontera are being plagued by Hornets.";
-
-			next;
-			mes "[Priest Gardron]";
-			mes "She has requested the convent for help, but we've got a big problem. We're running out of people here that can deal with this situation...";
-			next;
-			mes "[Priest Gardron]";
-			mes "....!";
-			emotion e_gasp;
-			next;
-			mes "[Priest Gardron]";
-			mes ""+strcharinfo(0)+",";
-			mes "may I ask";
-			mes "you to take care";
-			mes "of this task? Exterminate the Hornets west of Prontera.";
-			next;
-			mes "[Priest Gardron]";
-			mes "Since you're still in basic training, I will give you some";
-			mes "help if you return with";
-			mes "^3131FF5 Bee Stings^000000.";
-			next;
-			mes "[Priest Gardron]";
-			mes "Now then...";
-			mes "Will you go to Prontera?";
-			next;
-			if(select("Let's go to Prontera!:Um, let me get ready first.")==1){
+			if (checkre(0)) {
+				mes "A few days ago, a sister in Prontera";
+				mes "sent me a telegram that citizens had been harmed";
+				mes "by Hornets in the western field,";
+				mes "so she asked the abbey to help with them.";
+				next;
 				mes "[Priest Gardron]";
-				mes "Good, good.";
-				mes "I shall send you";
-				mes "there to fight the monsters west of Prontera so that you can return with 5 Bee Stings. May God bless you...";
-				close2;
-				warp "prontera",116,72;
-				end;
+				mes "But at this time,";
+				mes "we are also short of hands...";
+				mes "so it's a big problem.";
+				next;
+				mes "[Priest Gardron]";
+				mes "....!";
+				emotion e_gasp;
+				next;
+				mes "[Priest Gardron]";
+				mes "May I entrust you, acolyte "+strcharinfo(0)+",";
+				mes "this urgent matter?";
+				mes "Please dispose of Hornets";
+				mes "which are causing trouble on ^FF0000the western field of Prontera^000000.";
+				next;
+				mes "[Priest Gardron]";
+				mes "I know that you are undergoing the discipline,";
+				mes "So I will give you something to help you";
+				mes "if you bring me ^3131FF 5^000000 ^3131FFBee Sting^000000.";
+				next;
+				mes "[Priest Gardron]";
+				mes "Will you go to Prontera?";
+				next;
+				if(select("Let's go to Prontera!:I'll be back after doing some preparation.") == 1) {
+					mes "[Priest Gardron]";
+					mes "Okay, I will send you to Prontera.";
+					mes "Please dispose of Hornets and bring me 5 Bee Stings for confirmation.";
+					mes "My Lord, please protect this acolyte from evil monsters.";
+					close2;
+					warp "prontera",116,72;
+					end;
+				}
+			} else {
+				mes "A little while ago, the Payon Elder sent me a message. Apparently,";
+				mes "the residents of Payon are being attacked by Zombies.";
+				next;
+				mes "[Priest Gardron]";
+				mes "He has requested the convent for help, but we've got a big problem. We're running out of people here that can deal with this situation...";
+				next;
+				mes "[Priest Gardron]";
+				mes "....!";
+				emotion e_gasp;
+				next;
+				mes "[Priest Gardron]";
+				mes ""+strcharinfo(0)+",";
+				mes "may I ask";
+				mes "you to take care";
+				mes "of this task? Exterminate the Skeletons and Zombies in the";
+				mes "First Floor of Payon Dungeon.";
+				next;
+				mes "[Priest Gardron]";
+				mes "Since you're still in basic training, I will give you some";
+				mes "help if you return with";
+				mes "^3131FF5 Decayed Nails^000000.";
+				next;
+				mes "[Priest Gardron]";
+				mes "Now then...";
+				mes "Will you go to Payon?";
+				next;
+				if(select("Let's go to Payon!:Um, let me get ready first.")==1) {
+					mes "[Priest Gardron]";
+					mes "Good, good.";
+					mes "I shall send you";
+					mes "there to fight the monsters in Payon Dungeon so that you can return with 5 Decayed Nails. May God bless you...";
+					close2;
+					warp "payon",161,58;
+					end;
+				}
 			}
 			close;
 		}
@@ -902,14 +952,13 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 
 // Dog
 //============================================================
-prt_monk,235,245,5	script	Dog#tu	81,{
+prt_monk,235,245,5	script	Dog#tu	4_DOG01,{
 	mes "[Dog]";
 	mes "^CDB79EBark bark!";
 	mes "Woof woof!^000000";
 	next;
 	if(tu_acolyte01 == 10){
-		set .@dog_food, 0;
-		while((1)){
+		while(1) {
 			switch(select("Give a treat.:Pet the dog.:End actions.")){
 			case 1:
 				set .@dog_food, .@dog_food + 1;
@@ -950,7 +999,7 @@ prt_monk,235,245,5	script	Dog#tu	81,{
 
 // Boy
 //============================================================
-prt_monk,243,238,5	script	Boy#boy_voi	139,5,5,{
+prt_monk,243,238,5	script	Boy#boy_voi	HIDDEN_WARP_NPC,5,5,{
 OnTouch_:
 	if(tu_acolyte01 != 10)end;
 	mes "[??]";
@@ -961,7 +1010,7 @@ OnTouch_:
 
 // Ill Girl
 //============================================================
-prt_monk,226,257,6	script	Ill Girl#tu	93,{
+prt_monk,226,257,6	script	Ill Girl#tu	4_F_04,{
 	mes "[Angelic]";
 	if(tu_acolyte01 > 12){
 		mes "Thanks for helping me.";
@@ -995,7 +1044,6 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 		mes "H-hurts...";
 		next;
 		select("Are you alright?");
-
 		mes "[Angelic]";
 		mes "My sister...";
 		mes "She was so beautiful...";
@@ -1023,8 +1071,9 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Are you alright?";
+		mes "................";
 		next;
-		specialeffect EF_CURSEATTACK ;
+		specialeffect EF_CURSEATTACK;
 		soundeffectall "_curse.wav",0;
 		emotion e_omg;
 		mes "["+strcharinfo(0)+"]";
@@ -1056,12 +1105,12 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 			mes "["+strcharinfo(0)+"]";
 			mes "H...";
 			mes "Heal !!";
-			specialeffect EF_HEAL ;
+			specialeffect EF_HEAL;
 			next;
 			mes "^3355FFNothing happened.";
 			mes "It doesn't look like";
 			mes "that skill will work.^000000";
-			close; 
+			close;
 			break;
 		case 2:
 			if(getskilllv("AL_BLESSING") > 0){
@@ -1081,7 +1130,10 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 					mes "It seemed that this good";
 					mes "deed has improved your skills.^000000";
 					set tu_acolyte01, 13;
-					getexp 0,100;
+					if (checkre(3))
+						getexp 0,500;
+					else
+						getexp 0,1000;
 					specialeffect2 EF_CONE;
 					next;
 					break;
@@ -1160,7 +1212,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 
 // Veiner
 //============================================================
-prt_monk,197,228,3	script	Veiner	89,{
+prt_monk,197,228,3	script	Veiner	4_M_ORIENT02,{
 	mes "[Veiner]";
 	if(countitem(1081) && tu_acolyte01 == 18){
 		mes "So very exhausted...";
@@ -1204,7 +1256,7 @@ prt_monk,197,228,3	script	Veiner	89,{
 
 // Hedrick
 //============================================================
-prt_monk,28,260,5	script	Hedrick	50,{
+prt_monk,28,260,5	script	Hedrick	1_M_04,{
 	mes "[Hedrick]";
 	mes "^333333*Whew!*^000000";
 	mes "Man I worked hard today!";
@@ -1240,7 +1292,7 @@ prt_monk,28,260,5	script	Hedrick	50,{
 
 // Weapon Merchant
 //============================================================
-prt_monk,136,261,0	script	Weapon Merchant#tu	139,9,9,{
+prt_monk,136,261,0	script	Weapon Merchant#tu	HIDDEN_WARP_NPC,9,9,{
 OnTouch:
 	if(tu_acolyte01 != 20 || countitem(1081)==0) end;
 	mes "[Weapon Merchant]";
@@ -1258,7 +1310,7 @@ OnTouch:
 
 // Karven
 //============================================================
-monk_in,103,176,7	script	Karven	60,{
+monk_in,103,176,7	script	Karven	1_M_PASTOR,{
 	mes "[Karven]";
 	mes "May you rest";
 	if(tu_acolyte01 == 21 && countitem(7183)){
@@ -1292,7 +1344,7 @@ monk_in,103,176,7	script	Karven	60,{
 
 // Gloria
 //============================================================
-prt_monk,219,164,3	script	Gloria#tu	95,{
+prt_monk,219,164,3	script	Gloria#tu	4_F_SISTER,{
 	mes "[Gloria]";
 	if(BaseJob != Job_Acolyte){
 		mes "Hi, hi~";
@@ -1365,12 +1417,12 @@ prt_monk,219,164,3	script	Gloria#tu	95,{
 
 // Cleope Verce
 //============================================================
-prt_monk,153,210,3	script	Cleope Verce	95,{
+prt_monk,153,210,3	script	Cleope Verce	4_F_SISTER,{
 	mes "[Cleope Verce]";
 	if(BaseJob != Job_Acolyte){
 		if (JobLevel < 40) {
 			if (BaseLevel < 26) {
-				mes "Oh my.. "; 
+				mes "Oh my.. ";
 				mes "A newbie Acolyte?";
 				mes "It doesn't even seem";
 				mes "like you've learned";
@@ -1412,7 +1464,7 @@ prt_monk,153,210,3	script	Cleope Verce	95,{
 				mes "Rookie.";
 				close;
 			} else if(BaseLevel < 36){
-				mes "Oh my.. "; 
+				mes "Oh my.. ";
 				mes "A young Acolyte?";
 				mes "You seem to have just";
 				mes "started learning your skills?";
@@ -1463,7 +1515,7 @@ prt_monk,153,210,3	script	Cleope Verce	95,{
 				mes "young friend.";
 				close;
 			} else if(BaseLevel < 46){
-				mes "Well, well, well~"; 
+				mes "Well, well, well~";
 				mes "Hello, young Acolyte.";
 				mes "You're still kind of";
 				mes "green, but I guess you're";
@@ -1539,7 +1591,7 @@ prt_monk,153,210,3	script	Cleope Verce	95,{
 }
 // Range NPC
 //============================================================
-prt_monk,217,123,0	script	#tu_monk	139,10,10,{
+prt_monk,217,123,0	script	#tu_monk	HIDDEN_WARP_NPC,10,10,{
 OnTouch_:
 	if(BaseJob == Job_Acolyte){
 		switch(tu_acolyte01){
@@ -1560,7 +1612,7 @@ OnTouch_:
 
 // Eavesdrop
 //============================================================
-prt_monk,223,123,3	script	Eavesdrop#tu	111,{
+prt_monk,223,123,3	script	Eavesdrop#tu	HIDDEN_NPC,{
 	if(BaseJob != Job_Acolyte){
 		mes "^3355FFThere's nothing here.^000000";
 		close;
@@ -1726,8 +1778,8 @@ prt_monk,223,123,3	script	Eavesdrop#tu	111,{
 	}
 }
 
-/*
-sec_in02,17,156,3	script	1st Job Quest Reset	726,{
+sec_in02,17,156,3	script	1st Job Quest Reset	4_F_JOB_BLACKSMITH,{
+	callfunc "F_GM_NPC";
 	mes "[1st Job Quest]";
 	mes "Which would you like to reset?";
 	next;
@@ -1755,4 +1807,3 @@ sec_in02,17,156,3	script	1st Job Quest Reset	726,{
 	mes "Completed.";
 	close;
 }
-*/
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 2f95cf11a..5e5344271 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -1,19 +1,18 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Archer Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
-//= 1.9a
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 2.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Archer training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
-//= 1.1 optimized [Lupus] 1.2 fixed Weight check
-//=	TODO: Test, Add correct misceffects numbers
+//= 1.1 optimized [Lupus]
+//= 1.2 fixed Weight check
 //= 1.3 Moved Master Kavaruk (overlapped Phantasmic Arrow
-//=	Skill quest NPC) [Lupus]
+//=     Skill quest NPC) [Lupus]
 //= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Fixed infinate loop. (bugreport:2393) [L0ne_W0lf]
@@ -21,11 +20,13 @@
 //= 1.8 Updated slightly, removed additional emotions from Reiden. [L0ne_W0lf]
 //= 1.9 Misc. updates. [L0ne_W0lf]
 //= 1.9a Added 'npcskill' command. [Euphy]
-//============================================================ 
+//= 2.0 Updated to match the official script. [Euphy]
+//=     Added Pre-Renewal support.
+//============================================================
 
 // Bard Jet
 //============================================================
-payon_in02,67,65,3	script	Bard Jet#tu	51,{
+payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 	mes "[Jet]";
 	mes "Every god never grows old";
 	mes "Because of beautiful";
@@ -161,7 +162,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	51,{
 
 // Sign
 //============================================================
-pay_arche,127,154,4	script	Sign#arc	835,{
+pay_arche,127,154,4	script	Sign#arc	2_BOARD1,{
 	mes " ";
 	mes " Archer Job Change Office ---> ";
 	mes " <--- Icarus ";
@@ -171,7 +172,7 @@ pay_arche,127,154,4	script	Sign#arc	835,{
 
 // Master Kavaruk
 //============================================================
-payon_in02,54,13,3	script	Master Kavaruk	55,{
+payon_in02,54,13,3	script	Master Kavaruk	1_M_JOBTESTER,{
 	mes "[Master Kavaruk]";
 	mes "Hello, young one.";
 	mes "I am Master Kavaruk";
@@ -278,7 +279,7 @@ payon_in02,54,13,3	script	Master Kavaruk	55,{
 				next;
 				mes "[Master Kavaruk]";
 				mes "I asked a member of Icarus to";
-				mes "wander about the Rune-Midgarts Kingdom and gather news and information about what has been going on recenty.";
+				mes "wander about the Rune-Midgarts Kingdom and gather news and information about what has been going on recently.";
 				next;
 				mes "[Master Kavaruk]";
 				mes "He has been sending me letters containing detailed information, but all of a sudden, I've lost contact with him. I'm concerned over what may have happened.";
@@ -305,7 +306,10 @@ payon_in02,54,13,3	script	Master Kavaruk	55,{
 				mes "for bringing me the news. As Arthail has said, I shall wait until he has more news for me.";
 				mes "You should also train and prepare for the future as well.";
 				set tu_archer02, 10;
-				getexp 200,100;
+				if (checkre(3))
+					getexp 1000,1000;
+				else
+					getexp 2000,1000;
 				close;
 			}
 		}
@@ -414,7 +418,7 @@ payon_in02,54,13,3	script	Master Kavaruk	55,{
 
 // Reidin Corse
 //============================================================
-pay_arche,103,165,5	script	Reidin Corse#tu	832,{
+pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 	mes "[Reidin Corse]";
 	if(MaxWeight - Weight < 2000){
 		mes "Hey, you're carrying an";
@@ -543,7 +547,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					set tu_archer01, 6;
 					mes "Now, your first assignment";
 					mes "is to learn ^3131FFLevel 3 Owl's Eye^000000!";
-					mes "From Morroc, if you travel south, you can fight Condors for your training.";
+					if (checkre(0))
+						mes "From Morroc, if you travel south, you can fight Condors for your training.";
+					else
+						mes "From Prontera, if you travel south, south and then west, you can fight Condors for your training.";
 					next;
 					mes "[Reidin Corse]";
 					mes "You can head somewhere";
@@ -553,11 +560,20 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					switch(select("I'll follow your advice, Chief!:I'll hunt somewhere else...")) {
 					case 1:
 						mes "[Reidin Corse]";
-						mes "I'll send you to";
-						mes "Morroc for now,";
-						mes "so don't forget the";
-						mes "directions I gave you.";
-						mes "Travel ^3131FFsouth^000000.";
+						if (checkre(0)) {
+							mes "I'll send you to";
+							mes "Morroc for now,";
+							mes "so don't forget the";
+							mes "directions I gave you.";
+							mes "Travel ^3131FFsouth^000000.";
+						} else {
+							mes "I'll send you to";
+							mes "Prontera for now,";
+							mes "so don't forget the";
+							mes "directions I gave you.";
+							mes "Travel ^3131FFsouth^000000, ^3131FFsouth^000000,";
+							mes "and then ^3131FFwest^000000.";
+						}
 						next;
 						switch(select("Leave right away~:W-wait, let me get ready!")) {
 						case 1:
@@ -573,9 +589,15 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 							mes "[Reidin Corse]";
 							mes "Okay...!";
 							mes "Off you go!";
-							mes "To Morroc!";
-							close2;
-							warp "morocc",156,46;
+							if (checkre(0)) {
+								mes "To Morroc!";
+								close2;
+								warp "morocc",156,46;
+							} else {
+								mes "To Prontera!";
+								close2;
+								warp "prontera",116,72;
+							}
 							end;
 						case 2:
 							mes "[Reidin Corse]";
@@ -601,7 +623,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					emotion e_ag;
 					mes "Huh. So you already know a little about Owl's Eye already, huh? Well then, I guess I oughta talk about something you don't know about!";
 					set tu_archer01, 7;
-					getexp 50,0;
+					getexp 500,0;
 					close;
 				}
 				break;
@@ -628,7 +650,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 				mes "Here, this is a small, special reward for you.";
 				specialeffect2 EF_WIND;
 				set tu_archer01, 7;
-				getexp 50,0;
+				getexp 500,0;
 				next;
 				emotion e_pif;
 				mes "[Reidin Corse]";
@@ -709,7 +731,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 
 			set .@eagle, getskilllv("AC_VULTURE");
 			if(.@eagle < 3){
-				mes "Alright, Mandagora usually live around Geffen. I can send you to Geffen, so just travel north from there to find";
+				if (checkre(0))
+					mes "Alright, Mandagora usually live around Geffen. I can send you to Geffen, so just travel north from there to find";
+				else
+					mes "Alright, Mandagora usually live around Mt. Mjolnir. I can send you to Prontera, so just travel north, then east from there to find";
 				mes "some of them.";
 				next;
 				mes "[Reidin Corse]";
@@ -738,7 +763,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					mes "Alright...!";
 					mes "Get a move on!";
 					close2;
-					warp "geffen",120,39;
+					if (checkre(0))
+						warp "geffen",120,39;
+					else
+						warp "prontera",116,72;
 					end;
 				case 2:
 					mes "[Reidin Corse]";
@@ -763,7 +791,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 		} else if(tu_archer01 == 8){
 			set .@eagle, getskilllv("AC_VULTURE");
 			if(.@eagle < 3){
-				mes "Mandagora lives in the area north of Geffen. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
+				if (checkre(0))
+					mes "Mandagora lives in the area north of Geffen. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
+				else
+					mes "Mandagora lives in the area north and east of Prontera. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
 				next;
 				mes "[Reidin Corse]";
 				mes "Okay...";
@@ -776,7 +807,10 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 					mes "Alright...!";
 					mes "Get a move on!";
 					close2;
-					warp "geffen",120,39;
+					if (checkre(0))
+						warp "geffen",120,39;
+					else
+						warp "prontera",116,72;
 					end;
 				case 2:
 					mes "[Reidin Corse]";
@@ -843,7 +877,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 				if(.@eagle == 0){
 					specialeffect2 EF_WIND;
 					set tu_archer01, 10;
-					getexp 0,50;
+					getexp 0,500;
 				}
 				emotion e_no1;
 				next;
@@ -857,48 +891,75 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 				close;
 			}
 		} else if(tu_archer01 == 10){
-			mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
-			emotion e_no1;
-			next;
-			mes "[Reidin Corse]";
-			mes "Rockers live just southwest of Prontera.";
-			next;
-			mes "[Reidin Corse]";
-			mes "Be aware that Rockers are earth element monsters!! ^3131FFSo they should be weak against fire^000000.";
-			next;
-			mes "[Reidin Corse]";
-			mes "Now go and bring ^3131FF10 Grasshopper's Leg^000000 from hunting Rockers.";
-			mes "Bring all of that and you pass~";
-			next;
-			mes "[Reidin Corse]";
-			mes "It's easier to find them if you pass by the southern gate of Prontera and then head west. Alright, off you go, " + strcharinfo(0) + "~";
+			if (checkre(0)) {
+				mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
+				emotion e_no1;
+				next;
+				mes "[Reidin Corse]";
+				mes "Rockers live just southwest of Prontera.";
+				next;
+				mes "[Reidin Corse]";
+				mes "Be aware that Rockers are earth element monsters!! ^3131FFSo they should be weak against fire^000000.";
+				next;
+				mes "[Reidin Corse]";
+				mes "Now go and bring ^3131FF10 Grasshopper's Leg^000000 from hunting Rockers.";
+				mes "Bring all of that and you pass~";
+				next;
+				mes "[Reidin Corse]";
+				mes "It's easier to find them if you pass by the southern gate of Prontera and then head west. Alright, off you go, " + strcharinfo(0) + "~";
+			} else {
+				mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
+				emotion e_no1;
+				next;
+				mes "[Reidin Corse]";
+				mes "There's a ship that";
+				mes "leads to Byalan Island in Izlude, Prontera's satellite city. Ride that ship to Byalan Island.";
+				next;
+				mes "[Reidin Corse]";
+				mes "In the center of that island is the entrance to a dungeon where a lot of Hydras live. Remember that it's a water dungeon, and that ^3131FFWater resists Fire^000000, ^3131FFbut is weak against Wind^000000.";
+				next;
+				mes "[Reidin Corse]";
+				mes "Now go and bring ^3131FF10 Tentacles^000000";
+				mes "from hunting Hydra and ^3131FF1 Crystal Blue^000000, which you can get from hunting the Mushrooms there.";
+				mes "Bring all of that and you pass~";
+				next;
+				mes "[Reidin Corse]";
+				mes "It's easier to find Izlude if you pass by Prontera, so head towards the fields near Prontera. Alright, off you go, " + strcharinfo(0) + "~";
+			}
 			set tu_archer01,11;
 			close;
 		} else if(tu_archer01 == 11){
-			if(countitem(940) > 9){
-				if(MaxWeight - Weight < 1000){
-					mes "Why are you carrying";
-					mes "so much stuff? You better put everything you don't need into Kafra Storage.";
-					close;
-				} else {
-					mes "Hey, you're back!";
-					mes "Let's see now...";
-					next;
-					emotion e_no1;
-					mes "[Reidin Corse]";
-					mes "Good! You pass.";
-					mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
-					specialeffect2 EF_WIND;
-					set tu_archer01, 12;
-					getexp 100,100;
-					getitem 1707,1; //Great_Bow
-					close;
-				}
-			} else {
+			if (checkre(0) && countitem(940) < 10) {
 				mes "Hey...";
 				mes "You gotta bring";
 				mes "^3131FF10 Grasshopper's Leg^000000 to pass my midterm! Go back to the southwest area of Prontera and get them!";
 				close;
+			} else if (!checkre(0) && (countitem(962) < 10 || countitem(991) == 0)) {
+				mes "Hey...";
+				mes "You gotta bring";
+				mes "^3131FF10 Tentacles^000000 and";
+				mes "^3131FF1 Crystal Blue^000000 to pass my midterm! Go back to the dungeon on Byalan Island and get them!";
+				close;
+			}
+			if(MaxWeight - Weight < 1000){
+				mes "Why are you carrying";
+				mes "so much stuff? You better put everything you don't need into Kafra Storage.";
+				close;
+			} else {
+				mes "Hey, you're back!";
+				mes "Let's see now...";
+				next;
+				emotion e_no1;
+				mes "[Reidin Corse]";
+				mes "Good! You pass.";
+				mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
+				specialeffect2 EF_WIND;
+				set tu_archer01, 12;
+				if (checkre(0))
+					delitem 940,10; //Grasshopper's_Leg
+				getexp 1000,1000;
+				getitem 1707,1; //Great_Bow
+				close;
 			}
 		} else if(tu_archer01 == 12){
 			mes "Alright, now there's only";
@@ -940,8 +1001,13 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 			mes "no need for you to fret.";
 			next;
 			mes "[Reidin Corse]";
-			mes "Now, go into the forest east of Payon and hunt Spores and Wormtails. Your test will be to bring back ^3131FF10 Mushroom Spores^000000 and";
-			mes "^3131FF10 Pointed Scales^000000.";
+			if (checkre(0)) {
+				mes "Now, go into the forest east of Payon and hunt Spores and Wormtails. Your test will be to bring back ^3131FF10 Mushroom Spores^000000 and";
+				mes "^3131FF10 Pointed Scales^000000.";
+			} else {
+				mes "Now, go to Mt. Mjolnir and hunt Floras. Your test will be to bring back ^3131FF5 Maneater Blossoms^000000 and";
+				mes "^3131FF20 Stems^000000.";
+			}
 			next;
 			mes "[Reidin Corse]";
 			mes "I know it's a little dangerous,";
@@ -968,49 +1034,81 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 				close;
 			}
 		} else if((tu_archer01 == 14) || (tu_archer01 == 15)){
-			if((countitem(906) > 9) && (countitem(921) > 9)){
-				mes "Ha-ha~!";
-				mes "You look more like";
-				mes "a veteran than a rookie";
-				mes "now! Yeap, I can see it";
-				mes "in your eyes.";
-				next;
-				mes "[Reidin Corse]";
-				mes "Right, did you get a chance to meet my Acolyte pal, Mafra? She's pretty shy, but I hope you two got along.";
-				next;
-				mes "[Reidin Corse]";
-				mes "I'm happy to tell";
-				mes "you that you've passed";
-				mes "my final exam! Here, take";
-				mes "this little reward!";
-				specialeffect2 EF_WIND;
-				set tu_archer01,16;
-				getexp 300,300;
-				getitem 1770,500; //Iron_Arrow
-				next;
-				mes "[Reidin Corse]";
-				mes "Well, it's like you're a full fledged Archer now. Honestly,";
-				mes "I've got nothing more to teach you. Well, about archery, anyway.";
-				emotion e_heh;
-				next;
-				mes "[Reidin Corse]";
-				mes "Well, if you talk to him, Master Kavaruk might have something for you to do. He happens to have me running around to doing errands";
-				mes "for him too. That creep!";
-				emotion e_pif;
-				next;
-				mes "[Reidin Corse]";
-				mes "Well, "+ strcharinfo(0) +",";
-				mes "It'd make me really happy if you get to the point where you develop a true love for the art of archery. I'll see you sometime, okay?";
-				emotion e_no1;
-				close;
-			} else {
+			if (checkre(0) && (countitem(906) < 10 || countitem(921) < 10)) {
 				mes "Remember, you";
 				mes "need to head into";
 				mes "the forest east of Payon and get me";
 				mes "^3131FF10 Mushroom Spores^000000";
 				mes "and ^3131FF10 Pointed Scales^000000.";
 				close;
+			} else if (!checkre(0) && (countitem(1032) < 5 || countitem(905) < 20)) {
+				mes "Remember, you";
+				mes "need to head over to";
+				mes "Mt. Mjolnir and get me";
+				mes "^3131FF5 Maneater Blossoms^000000";
+				mes "and ^3131FF20 Stems^000000.";
+				next;
+				mes "[Reidin Corse]";
+				mes "From Prontera, you'd get to Mt. Mjolnir by traveling ^3131FFnorth^000000, ^3131FFnorth^000000 and then ^3131FFeast^000000. But if you want,";
+				mes "I can just send you there.";
+				next;
+				switch(select("Go!:W-Wait!")) {
+				case 1:
+					mes "[Reidin Corse]";
+					mes "Alright!";
+					mes "Oh, and if you get";
+					mes "the chance, give a hello to my Acolyte pal over there for me~";
+					emotion e_heh;
+					close2;
+					warp "mjolnir_11",25,221;
+					end;
+				case 2:
+					mes "[Reidin Corse]";
+					mes "Huh?";
+					mes "Um, sure. But";
+					mes "there's no reason to";
+					mes "get so nervous, even if";
+					mes "this my final exam for you.";
+					close;
+				}
 			}
+			mes "Ha-ha~!";
+			mes "You look more like";
+			mes "a veteran than a rookie";
+			mes "now! Yeap, I can see it";
+			mes "in your eyes.";
+			next;
+			mes "[Reidin Corse]";
+			mes "Right, did you get a chance to meet my Acolyte pal, Mafra? She's pretty shy, but I hope you two got along.";
+			next;
+			mes "[Reidin Corse]";
+			mes "I'm happy to tell";
+			mes "you that you've passed";
+			mes "my final exam! Here, take";
+			mes "this little reward!";
+			specialeffect2 EF_WIND;
+			set tu_archer01,16;
+			if (checkre(3))
+				getexp 1000,1000;
+			else
+				getexp 3000,3000;
+			getitem 1770,500; //Iron_Arrow
+			next;
+			mes "[Reidin Corse]";
+			mes "Well, it's like you're a full fledged Archer now. Honestly,";
+			mes "I've got nothing more to teach you. Well, about archery, anyway.";
+			emotion e_heh;
+			next;
+			mes "[Reidin Corse]";
+			mes "Well, if you talk to him, Master Kavaruk might have something for you to do. He happens to have me running around to doing errands";
+			mes "for him too. That creep!";
+			emotion e_pif;
+			next;
+			mes "[Reidin Corse]";
+			mes "Well, "+ strcharinfo(0) +",";
+			mes "It'd make me really happy if you get to the point where you develop a true love for the art of archery. I'll see you sometime, okay?";
+			emotion e_no1;
+			close;
 		} else if(tu_archer01 == 16){
 			mes "I really like this town.";
 			mes "There's so much lush greenery";
@@ -1089,7 +1187,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	832,{
 
 // Seisner
 //============================================================
-pay_arche,84,139,3	script	Seisner	727,{
+pay_arche,84,139,3	script	Seisner	4_F_JOB_HUNTER,{
 	specialeffect EF_HIT2,"#Target";
 	mes "[Seisner]";
 	mes "Aaaah!";
@@ -1144,7 +1242,7 @@ pay_arche,84,139,3	script	Seisner	727,{
 				mes "[Seisner]";
 				mes "Hunters can ultimately transcend into ^3131FFSnipers^000000, Bards into ^3131FFMinstrels^000000, and Dancers into ^3131FFGypsies^000000. I know that's pretty complex.";
 				if(tu_archer01 == 1) set tu_archer01, 2;
-				next;  
+				next;
 				break;
 			case 2:
 				mes "[Seisner]";
@@ -1280,13 +1378,13 @@ pay_arche,84,139,3	script	Seisner	727,{
 		specialeffect2 EF_WIND;
 		set tu_archer01, 3;
 		if(JobLevel == 1){
-			getexp 0,5;
+			getexp 0,30;
 		} else if((JobLevel > 1) && (JobLevel < 11)){
-			getexp 0,10;
+			getexp 0,80;
 		} else if((JobLevel > 10) && (JobLevel < 21)){
-			getexp 0,25;
+			getexp 0,100;
 		} else {
-			getexp 0,50;
+			getexp 0,120;
 		}
 		end;
 	}
@@ -1295,11 +1393,11 @@ pay_arche,84,139,3	script	Seisner	727,{
 
 // Target
 //============================================================
-pay_arche,76,135,3	script	Target#Target	111,{ end; }	// empty NPC?? [Jukka]
+pay_arche,76,135,3	script	#Target	HIDDEN_NPC,{ end; }
 
 // Acolyte
 //============================================================
-pay_fild08,40,83,5	script	Acolyte#tu	95,{
+-	script	::Acolyte_Tu	-1,{
 	mes "[Acolyte]";
 	if(tu_archer01 == 14){
 		if(gettime(3) >= 18 && gettime(3) < 22){
@@ -1453,7 +1551,7 @@ pay_fild08,40,83,5	script	Acolyte#tu	95,{
 
 // Alchemist Guildmember
 //============================================================
-pay_arche,130,113,3	script	Alchemist Guildmember#tu	740,{
+pay_arche,130,113,3	script	Alchemist Guildmember#tu	2_M_ALCHE,{
 	mes "[Alchemist Guildmember]";
 	if(tu_archer02 > 0){
 		if((countitem(1032) > 0) || (countitem(905) > 0 )){	// Blossom_Of_Maneater & Stem
@@ -1493,7 +1591,7 @@ pay_arche,130,113,3	script	Alchemist Guildmember#tu	740,{
 					delitem 1032, .@alche_f; //Blossom_Of_Maneater
 					delitem 905, .@alche_s; //Stem
 				}
-				set Zeny,Zeny+.@total_zeny;
+				Zeny += .@total_zeny;
 				close;
 			case 2:
 				mes "[Alchemist Guildmember]";
@@ -1527,7 +1625,7 @@ pay_arche,130,113,3	script	Alchemist Guildmember#tu	740,{
 
 // Arthail
 //============================================================
-prontera,126,335,5	script	Arthail	51,{
+prontera,126,335,5	script	Arthail	1_M_BARD,{
 	mes "[Arthail]";
 	if(tu_archer02 < 3){
 		mes "I am the Bard";
@@ -1708,7 +1806,7 @@ prontera,126,335,5	script	Arthail	51,{
 
 // New Guild Master
 //============================================================
-prontera,167,281,3	script	New Guild Master#tu	753,{
+prontera,167,281,3	script	New Guild Master#tu	4_M_MONK,{
 	mes "[New Guild Master]";
 	mes "Hearken, all";
 	mes "of you who seek";
@@ -1731,7 +1829,7 @@ prontera,167,281,3	script	New Guild Master#tu	753,{
 
 // Mage
 //============================================================
-prontera,144,301,5	script	Mage#tu	123,{
+prontera,144,301,5	script	Mage#tu	2_F_MAGICMASTER,{
 	mes "[Mage]";
 	mes "Did you see that";
 	mes "new guild master?";
@@ -1759,7 +1857,7 @@ prontera,144,301,5	script	Mage#tu	123,{
 
 // Minister
 //============================================================
-prt_castle,76,165,6	script	Minister#tu	55,{
+prt_castle,76,165,6	script	Minister#tu	1_M_JOBTESTER,{
 	mes "[Minister]";
 	mes "The royal family";
 	mes "is extremely busy";
@@ -1813,13 +1911,13 @@ prt_castle,76,165,6	script	Minister#tu	55,{
 		next;
 		mes "[Minister]";
 		mes "As a holy servant, I'm sure that you'll find plenty of other people who have need of your help and abilities outside of the palace.";
-	} 
+	}
 	close;
 }
 
 // Range NPC
 //============================================================
-prt_castle,94,150,4	script	#sound_tu	139,6,6,{
+prt_castle,94,150,4	script	#sound_tu	HIDDEN_WARP_NPC,6,6,{
 OnTouch_:
 	if(tu_archer02 == 6) {
 		mes "[Minister]";
@@ -1834,7 +1932,7 @@ OnTouch_:
 
 // Bishop Maugins
 //============================================================
-monk_in,19,43,1	script	Bishop Maugins	60,{
+monk_in,19,43,1	script	Bishop Maugins	1_M_PASTOR,{
 	mes "[Bishop Maugins]";
 	if(tu_archer02 == 7){
 		mes "Greetings.";
diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt
index 72c1d4914..a80f424b0 100644
--- a/npc/quests/first_class/tu_ma_th01.txt
+++ b/npc/quests/first_class/tu_ma_th01.txt
@@ -1,24 +1,22 @@
-//===== rAthena Script ======================================= 
-//= Theif Mage Quest Story Mode
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= Thief Mage Quest Story Mode
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Battle Traces from Thief and Magician training quests.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
-//=	TODO: Test, Add correct misceffects numbers
 //= 1.2 Changed "battle_trace" to "Trace of Battle". [L0ne_W0lf]
 //= 1.3 Misc. updates. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // Battle Traces 1
 //============================================================
-moc_fild12,166,369,0	script	Trace of Battle#1	844,{
+moc_fild12,166,369,0	script	Trace of Battle#1	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 5){
 			mes "^3355FFYou find traces of poison";
@@ -32,7 +30,7 @@ moc_fild12,166,369,0	script	Trace of Battle#1	844,{
 			mes "of acute dizziness overcomes";
 			mes "you after examining the scene.^000000";
 			set tu_thief01, 6;
-			sc_start SC_Poison,60000,0;
+			sc_start SC_POISON,60000,0;
 			specialeffect EF_VENOMDUST2;
 			close;
 		} else if(tu_thief01 == 6){
@@ -40,7 +38,7 @@ moc_fild12,166,369,0	script	Trace of Battle#1	844,{
 			mes "used in a battle. A feeling";
 			mes "of acute dizziness overcomes";
 			mes "you after examining the scene.^000000";
-			sc_start SC_Poison,60000,0;
+			sc_start SC_POISON,60000,0;
 			specialeffect EF_VENOMDUST2;
 			close;
 		} else if(tu_thief01 == 7){
@@ -109,7 +107,7 @@ moc_fild12,166,369,0	script	Trace of Battle#1	844,{
 
 // Battle Traces 2
 //============================================================
-moc_fild12,173,215,0	script	Trace of Battle#2	844,{
+moc_fild12,173,215,0	script	Trace of Battle#2	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 9){
 			mes "^3355FFThere are signs";
@@ -159,7 +157,7 @@ moc_fild12,173,215,0	script	Trace of Battle#2	844,{
 
 // Battle Traces 3
 //============================================================
-moc_fild12,276,165,0	script	Trace of Battle#3	844,{
+moc_fild12,276,165,0	script	Trace of Battle#3	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 10){
 			mes "^3355FFThere are signs";
@@ -212,7 +210,7 @@ moc_fild12,276,165,0	script	Trace of Battle#3	844,{
 
 // Battle Traces 4
 //============================================================
-moc_fild11,39,163,0	script	Trace of Battle#4	844,{
+moc_fild11,39,163,0	script	Trace of Battle#4	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 11){
 			mes "^3355FFThere are signs";
@@ -272,7 +270,7 @@ moc_fild11,39,163,0	script	Trace of Battle#4	844,{
 
 // Battle Traces 5
 //============================================================
-moc_fild11,205,52,0	script	Trace of Battle#5	844,{
+moc_fild11,205,52,0	script	Trace of Battle#5	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 12){
 			mes "^3355FFThere are signs";
@@ -421,7 +419,7 @@ moc_fild11,205,52,0	script	Trace of Battle#5	844,{
 
 // Battle Traces 6
 //============================================================
-moc_fild11,226,235,0	script	Trace of Battle#6	844,{
+moc_fild11,226,235,0	script	Trace of Battle#6	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "^3355FFThere are signs";
@@ -464,7 +462,7 @@ moc_fild11,226,235,0	script	Trace of Battle#6	844,{
 
 // Battle Traces 7
 //============================================================
-moc_fild11,184,342,0	script	Trace of Battle#7	844,{
+moc_fild11,184,342,0	script	Trace of Battle#7	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "^3355FFThere are signs";
@@ -505,7 +503,7 @@ moc_fild11,184,342,0	script	Trace of Battle#7	844,{
 
 // Battle Traces 8
 //============================================================
-moc_fild17,213,358,0	script	Trace of Battle#8	844,{
+moc_fild17,213,358,0	script	Trace of Battle#8	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "^3355FFThere are two";
@@ -566,7 +564,7 @@ moc_fild17,213,358,0	script	Trace of Battle#8	844,{
 
 // Battle Traces 9
 //============================================================
-moc_fild17,228,274,0	script	Trace of Battle#9	844,{
+moc_fild17,228,274,0	script	Trace of Battle#9	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 14){
 			mes "^3355FFTraces of some";
@@ -661,7 +659,7 @@ moc_fild17,228,274,0	script	Trace of Battle#9	844,{
 
 // Battle Traces 10
 //============================================================
-moc_fild17,34,292,0	script	Trace of Battle#10	844,{
+moc_fild17,34,292,0	script	Trace of Battle#10	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 16){
 			mes "^3355FFThere are signs";
@@ -714,7 +712,7 @@ moc_fild17,34,292,0	script	Trace of Battle#10	844,{
 
 // Battle Traces 11
 //============================================================
-moc_fild18,346,296,0	script	Trace of Battle#11	844,{
+moc_fild18,346,296,0	script	Trace of Battle#11	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 17){
 			mes "^3355FFThere are signs";
@@ -771,7 +769,7 @@ moc_fild18,346,296,0	script	Trace of Battle#11	844,{
 
 // Battle Traces 12
 //============================================================
-moc_fild18,309,257,0	script	Trace of Battle#12	844,{
+moc_fild18,309,257,0	script	Trace of Battle#12	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 18){
 			mes "^3355FFThere are signs";
@@ -824,7 +822,7 @@ moc_fild18,309,257,0	script	Trace of Battle#12	844,{
 
 // Battle Traces 13
 //============================================================
-moc_fild18,177,333,0	script	Trace of Battle#13	844,{
+moc_fild18,177,333,0	script	Trace of Battle#13	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 19){
 			mes "^3355FFThere are signs";
@@ -878,7 +876,7 @@ moc_fild18,177,333,0	script	Trace of Battle#13	844,{
 
 // Battle Traces 14
 //============================================================
-moc_fild18,111,303,0	script	Trace of Battle#14	844,{
+moc_fild18,111,303,0	script	Trace of Battle#14	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 20){
 			mes "^3355FFThere are signs";
@@ -931,7 +929,7 @@ moc_fild18,111,303,0	script	Trace of Battle#14	844,{
 
 // Battle Traces 15
 //============================================================
-moc_fild18,109,197,0	script	Trace of Battle#15	844,{
+moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 21){
 			mes "^3355FFThere are signs";
@@ -1003,7 +1001,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	844,{
 				mes "^3355FFBy sheer accident,";
 				mes "you set off one of";
 				mes "the traps in the area.^000000";
-				sc_start SC_Poison,60000,0;
+				sc_start SC_POISON,60000,0;
 				specialeffect EF_VENOMDUST2;
 				percentheal -30,0;
 				close;
@@ -1157,7 +1155,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	844,{
 				mes "^3355FFBy sheer accident,";
 				mes "you set off one of";
 				mes "the traps in the area.^000000";
-				sc_start SC_Poison,60000,0;
+				sc_start SC_POISON,60000,0;
 				specialeffect EF_VENOMDUST2;
 				percentheal -30,0;
 				close;
@@ -1254,7 +1252,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	844,{
 
 // Battle Traces 16
 //============================================================
-moc_fild18,156,96,0	script	Trace of Battle#16	844,{
+moc_fild18,156,96,0	script	Trace of Battle#16	CLEAR_NPC,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 25){
 			mes "^3355FFThere are signs";
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index 9beb55b5b..01df38855 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -1,31 +1,30 @@
-//===== rAthena Script ======================================= 
-//= Magican Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= Magician Class Tutorial and Job Specific Quest
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
+//= [Official Conversion]
+//= Magician training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 Optimized [Lupus]
-//=	TODO: Test, Add proper misceffects
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Misc. updates. [L0ne_W0lf]
-//============================================================ 
+//= 1.4 Updated to match the official script. [Euphy]
+//============================================================
 
 // Sign
 //============================================================
-geffen,61,174,4	script	Sign#M	111,{
+geffen,61,174,4	script	Sign#M	HIDDEN_NPC,{
 	mes "- Mage Job Change -";
 	close;
 }
 
 // New Mage Manager
 //============================================================
-geffen,67,180,4	script	New Mage Manager#M	102,{
+geffen,67,180,4	script	New Mage Manager#M	8_F,{
 	mes "[Mana]";
 	if(Class == Job_Novice){
 		mes "[Mana]";
@@ -45,9 +44,14 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		mes "anyone can do what you do~";
 		close;
 	}
-	if(eaclass()&(EAJL_UPPER|EAJL_2) && tu_magician01 < 7){
+	if(eaclass()&(EAJL_UPPER|EAJL_2|EAJL_THIRD) && tu_magician01 < 7){
 		mes "[Mana]";
-		mes "My training isn't very helpful to those that are already skilled in magic. I'm afraid you'll have to rely on yourself to improve your skills.";
+		mes "Although I offer magic";
+		mes "training, it's not very helpful";
+		mes "if you're already experienced";
+		mes "in the use of magic. I'm sorry,";
+		mes "but you'll have to rely on your";
+		mes "own self to hone your skills.";
 		close;
 	}
 	switch(tu_magician01){
@@ -128,7 +132,10 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		mes "time for a break. But we'll";
 		mes "continue this later, okay?";
 		set tu_magician01, 1;
-		getexp BaseLevel*3,BaseLevel*2;
+		if (checkre(3))
+			getexp BaseLevel*3,BaseLevel*2;
+		else
+			getexp BaseLevel*30,BaseLevel*15;
 		specialeffect2 EF_HIT5;
 		close;
 	case 1:
@@ -202,7 +209,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "only slightly injured and the";
 				mes "Fire Wall won't necessarily";
 				mes "block its approach. So beware!";
-				set tu_mana,tu_mana|1;
+				set .@eread_1,1;
 				next;
 				break;
 			case 2:
@@ -237,7 +244,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "afterwards, like Fire Bolt and";
 				mes "Fire Ball, to take advantage of";
 				mes "the monster's Earth property.";
-				set tu_mana,tu_mana|2;
+				set .@eread_2,1;
 				next;
 				break;
 			case 3:
@@ -275,8 +282,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "the ^93DB70Wind^000000 property skills";
 				mes "that we Mages can use are";
 				mes "Lighning Bolt and Thunder Storm.";
-				next;
-				set tu_mana,tu_mana|4;
+				set .@eread_3,1;
 				next;
 				break;
 			case 4:
@@ -313,7 +319,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "actually freeze monsters.";
 				mes "While monsters are frozen by";
 				mes "Frost Diver, they're considered Water monsters. Interesting, huh?";
-				set tu_mana,tu_mana|8;
+				set .@eread_4,1;
 				next;
 				break;
 			case 5:
@@ -346,7 +352,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "shield against long range";
 				mes "attacks or strong property";
 				mes "attacks, so be really careful!";
-				set tu_mana,tu_mana|16;
+				set .@eread_5,1;
 				next;
 				break;
 			case 6:
@@ -358,32 +364,18 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "ready, we'll cover some new";
 				mes "material for you to learn.";
 				next;
-				switch(select("W-wait, not yet!:I'm ready to go on.")) {
-				case 1:
-					break;
-				case 2:
+				if(select("W-wait, not yet!:I'm ready to go on.") == 2) {
 					mes "[Mana]";
 					mes "Alrighty, we'll";
 					mes "move on to the next";
 					mes "subject then. Ho ho ho~!";
 					set tu_magician01,2;
 					specialeffect2 EF_HIT5;
-					if(tu_mana&1){
-						getexp 15,7;
-					}
-					if(tu_mana&2){
-						getexp 15,7;
-					}
-					if(tu_mana&4){
-						getexp 15,7;
-					}
-					if(tu_mana&8){
-						getexp 15,7;
-					}
-					if(tu_mana&16){
-						getexp 15,7;
-					}
-					set tu_mana,0;
+					if(.@eread_1) getexp 150,70;
+					if(.@eread_2) getexp 150,70;
+					if(.@eread_3) getexp 150,70;
+					if(.@eread_4) getexp 150,70;
+					if(.@eread_5) getexp 150,70;
 				}
 				close;
 			}
@@ -465,7 +457,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		mes "10 Chrysalis from them.";
 		mes "Then bring them to me, okay?";
 		set tu_magician01, 3;
-		getexp 40,20;
+		getexp 400,200;
 		specialeffect2 EF_HIT5;
 		close;
 	case 3:
@@ -493,7 +485,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 			mes "used to using your skills, huh?";
 			mes "Anyway, let me know when you're ready for the next lesson, okay?";
 			set tu_magician01, 5;
-			getexp 40,20;
+			getexp 400,200;
 			specialeffect2 EF_HIT5;
 			close;
 		}
@@ -521,7 +513,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 			mes "used to using your skills, huh?";
 			mes "Anyway, let me know when you're ready for the next lesson, okay?";
 			set tu_magician01, 5;
-			getexp 40,20;
+			getexp 400,200;
 			specialeffect2 EF_HIT5;
 			close;
 		}
@@ -550,7 +542,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "of Soul Strike and increase";
 				mes "that skill's level, it will grow in strength and you'll be able";
 				mes "to cast it much more quickly.";
-				set tu_mana,tu_mana|1;
+				set .@skill_e1,1;
 				next;
 				break;
 			case 2:
@@ -570,7 +562,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "certain number of attacks,";
 				mes "depending on the level of the";
 				mes "Safety Wall skill that you use.";
-				set tu_mana,tu_mana|2;
+				set .@skill_e2,1;
 				next;
 				break;
 			case 3:
@@ -590,7 +582,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "good use of the destructive";
 				mes "power of the Fire Ball!";
 				next;
-				set tu_mana,tu_mana|4;
+				set .@skill_e3,1;
 				break;
 			case 4:
 				mes "[Mana]";
@@ -616,7 +608,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "skill, its damage and chance";
 				mes "of freezing monsters will also";
 				mes "increase. Pretty dangerous, eh? ^FFFFFFkamenriderblack^000000";
-				set tu_mana,tu_mana|8;
+				set .@skill_e4,1;
 				next;
 				break;
 			case 5:
@@ -635,7 +627,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "within a certain range.";
 				mes "It's an incredibly potent";
 				mes "ground targeting attack.";
-				set tu_mana,tu_mana|16;
+				set .@skill_e5,1;
 				next;
 				break;
 			case 6:
@@ -661,7 +653,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "Fire Well strategically";
 				mes "and effectively, it can";
 				mes "be a very powerful skill~";
-				set tu_mana,tu_mana|32;
+				set .@skill_e6,1;
 				next;
 				break;
 			case 7:
@@ -680,7 +672,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				mes "learn Energy Coat, I'm";
 				mes "sure Blizardis will tell";
 				mes "you all you need to know.";
-				set tu_mana,tu_mana|64;
+				set .@skill_e7,1;
 				next;
 				break;
 			case 8:
@@ -701,30 +693,15 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				set tu_magician01, 6;
 				getitem 1604,1; //Wand
 				specialeffect2 EF_HIT5;
-				if(tu_mana&1){
-					getexp 30,10;
-				}
-				if(tu_mana&2){
-					getexp 30,10;
-				}
-				if(tu_mana&4){
-					getexp 30,10;
-				}
-				if(tu_mana&8){
-					getexp 30,10;
-				}
-				if(tu_mana&16){
-					getexp 30,10;
-				}
-				if(tu_mana&32){
-					getexp 30,10;
-				}
-				if(tu_mana&64){
-					getexp 30,10;
-				}
-				set tu_mana,0;
+				if(.@skill_e1) getexp 300,100;
+				if(.@skill_e2) getexp 300,100;
+				if(.@skill_e3) getexp 300,100;
+				if(.@skill_e4) getexp 300,100;
+				if(.@skill_e5) getexp 300,100;
+				if(.@skill_e6) getexp 300,100;
+				if(.@skill_e7) getexp 300,100;
 				close;
-			default: 
+			default:
 				break;
 			}
 		}
@@ -809,8 +786,8 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		mes "again, thanks very much~";
 		set tu_magician01, 28;
 		getitem 2321,1; //Silk_Robe
-		set Zeny, Zeny + 3000;
-		getexp 300,100;
+		Zeny += 3000;
+		getexp 3000,1000;
 		close;
 	default:
 		if(tu_magician01 < 27){
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index c947d0342..3acd91860 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -1,24 +1,23 @@
 //===== Hercules Script ======================================
 //= Merchant Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= Tutorial for Merchant Class 
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Merchant training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
-//= 1.1 Fixed bugs, optimized [Lupus] 1.2 fixed Weight check
-//=	TODO: Test, add missing misceffects
+//= 1.1 Fixed bugs, optimized [Lupus]
+//= 1.2 fixed Weight check
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Misc. updates. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // Guarnien
 //============================================================
-alberta_in,70,51,5	script	Guarnien	98,{
+alberta_in,70,51,5	script	Guarnien	4W_M_02,{
 	mes "[Guarnien]";
 	if(Class != Job_Merchant && Class != Job_Baby_Merchant){
 		mes "Hello stranger.";
@@ -580,7 +579,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 				mes "I'll talk about the Mammonite skill. For now, let me take a little bit of a break from all of this arduous lecture. ^666666*Whew!*^000000";
 				close;
 			}
-		} else { 
+		} else {
 			mes "No? That's fine.";
 			mes "But I can't teach you";
 			mes "much more if you can't grasp these simple basics, so hurry and learn those skills, okay?";
@@ -677,7 +676,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 
 // Sagle
 //============================================================
-prontera,66,111,3	script	Sagle	82,{
+prontera,66,111,3	script	Sagle	4_KID01,{
 	mes "[Sagle]";
 	if(tu_merchant == 8){
 		mes "Hello, hello~";
@@ -711,7 +710,7 @@ prontera,66,111,3	script	Sagle	82,{
 				mes "There's no way you carry all of this! Why don't you put some of your stuff in Kafra Storage before coming back?";
 				close;
 			} else {
-				set Zeny, Zeny - 420;
+				Zeny -= 420;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
@@ -759,7 +758,7 @@ prontera,66,111,3	script	Sagle	82,{
 				close2;
 				end;
 			} else {
-				set Zeny, Zeny - 410;
+				Zeny -= 410;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
@@ -806,7 +805,7 @@ prontera,66,111,3	script	Sagle	82,{
 				mes "There's no way you carry all of this! Why don't you put some of your stuff in Kafra Storage before coming back?";
 				close;
 			} else {
-				set Zeny, Zeny - 390;
+				Zeny -= 390;
 				set tu_merchant, 9;
 				getitem 501,10; //Red_Potion
 				close;
@@ -836,7 +835,7 @@ prontera,66,111,3	script	Sagle	82,{
 
 // Kellion
 //============================================================
-prontera,93,330,3	script	Kellion	97,{
+prontera,93,330,3	script	Kellion	4W_M_01,{
 	mes "[Kellion]";
 	if(tu_merchant == 8){
 		mes "I'm selling sets of";
@@ -862,8 +861,8 @@ prontera,93,330,3	script	Kellion	97,{
 				mes "...Huh?";
 				mes "You better put some of your stuff in Kafra Storage, you can't carry much else!";
 				close;
-			} else { 
-				set Zeny, Zeny - 340;
+			} else {
+				Zeny -= 340;
 				set tu_merchant, 10;
 				getitem 569,10; //Novice_Potion
 				close;
@@ -901,8 +900,8 @@ prontera,93,330,3	script	Kellion	97,{
 				mes "...Huh?";
 				mes "You better put some of your stuff in Kafra Storage, you can't carry much else!";
 				close;
-			} else { 
-				set Zeny, Zeny - 390;
+			} else {
+				Zeny -= 390;
 				set tu_merchant, 9;
 				getitem 501,10; //Red_Potion
 				close;
@@ -940,8 +939,8 @@ prontera,93,330,3	script	Kellion	97,{
 				mes "...Huh?";
 				mes "You better put some of your stuff in Kafra Storage, you can't carry much else!";
 				close;
-			} else { 
-				set Zeny, Zeny - 400;
+			} else {
+				Zeny -= 400;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
@@ -970,7 +969,7 @@ prontera,93,330,3	script	Kellion	97,{
 	
 // Aigie
 //============================================================
-prt_in,169,11,3	script	Aigie	92,{
+prt_in,169,11,3	script	Aigie	4_F_03,{
 	if(tu_merchant == 8){
 		mes "[Aigie]";
 		mes "Welcome to my shop.";
@@ -1001,7 +1000,7 @@ prt_in,169,11,3	script	Aigie	92,{
 				mes "You can't possibly carry any more items. Why don't you put your things in Kafra Storage first?";
 				close;
 			} else {
-				set Zeny, Zeny - 390;
+				Zeny -= 390;
 				set tu_merchant, 9;
 				getitem 501,10; //Red_Potion
 				close;
@@ -1046,7 +1045,7 @@ prt_in,169,11,3	script	Aigie	92,{
 				mes "You can't possibly carry any more items. Why don't you put your things in Kafra Storage first?";
 				close;
 			} else {
-				set Zeny, Zeny - 420;
+				Zeny -= 420;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
@@ -1091,7 +1090,7 @@ prt_in,169,11,3	script	Aigie	92,{
 				mes "You can't possibly carry any more items. Why don't you put your things in Kafra Storage first?";
 				close;
 			} else {
-				set Zeny, Zeny - 340;
+				Zeny -= 340;
 				set tu_merchant, 10;
 				getitem 569,10; //Novice_Potion
 				close;
@@ -1116,7 +1115,7 @@ prt_in,169,11,3	script	Aigie	92,{
 	
 // Jayon
 //============================================================
-prontera,247,129,3	script	Jayon	85,{
+prontera,247,129,3	script	Jayon	4_M_03,{
 	if(tu_merchant == 8){
 		mes "[Jayon]";
 		mes "If you've checked out the market for Red Potions, you know that my price is the best. I'm offering 10 Red Potions for only 410 Zeny!";
@@ -1146,7 +1145,7 @@ prontera,247,129,3	script	Jayon	85,{
 				mes "You ought to free up some of your inventory space when you get the chance.";
 				close;
 			} else {
-				set Zeny, Zeny - 410;
+				Zeny -= 410;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
@@ -1192,7 +1191,7 @@ prontera,247,129,3	script	Jayon	85,{
 				mes "You ought to free up some of your inventory space when you get the chance.";
 				close;
 			} else {
-				set Zeny, Zeny - 400;
+				Zeny -= 400;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
@@ -1239,7 +1238,7 @@ prontera,247,129,3	script	Jayon	85,{
 				mes "You ought to free up some of your inventory space when you get the chance.";
 				close;
 			} else {
-				set Zeny, Zeny - 410;
+				Zeny -= 410;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
@@ -1268,7 +1267,7 @@ prontera,247,129,3	script	Jayon	85,{
 
 // Maos
 //============================================================
-prt_in,251,129,3	script	Maos	709,{
+prt_in,251,129,3	script	Maos	4_M_SEAMAN,{
 	if(tu_merchant == 8){
 		mes "[Maos]";
 		mes "Don't say anything.";
@@ -1294,7 +1293,7 @@ prt_in,251,129,3	script	Maos	709,{
 				mes "Ooh, but it doesn't look like you've got enough inventory space to carry any more items.";
 				close;
 			} else {
-				set Zeny, Zeny - 420;
+				Zeny -= 420;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
@@ -1329,7 +1328,7 @@ prt_in,251,129,3	script	Maos	709,{
 				mes "Ooh, but it doesn't look like you've got enough inventory space to carry any more items.";
 				close;
 			} else {
-				set Zeny, Zeny - 340;
+				Zeny -= 340;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
@@ -1364,7 +1363,7 @@ prt_in,251,129,3	script	Maos	709,{
 				mes "Ooh, but it doesn't look like you've got enough inventory space to carry any more items.";
 				close;
 			} else {
-				set Zeny, Zeny - 400;
+				Zeny -= 400;
 				set tu_merchant, 10;
 				getitem 501,10; //Red_Potion
 				close;
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index ee54103de..66962d97f 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -1,26 +1,25 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Swordman Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.6
+//===== Description: =========================================
+//= [Official Conversion]
+//= Swordman training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
-//=	TODO: Test, Add correct misceffects numbers
 //= 1.2 Fixed a typo on NPC name. [SinSloth]
 //= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.4 Misc. updates. [L0ne_W0lf]
-//= 1.5 Warp New Izlude update
-//============================================================ 
+//= 1.5 Added Renewal Izlude coordinates.
+//= 1.6 Added Pre-Renewal support. [Euphy]
+//============================================================
 
 // Shurank
 //============================================================
-izlude_in,82,163,3	script	Shurank	733,{
+izlude_in,82,163,3	script	Shurank	4_M_JOB_KNIGHT1,{
 	mes "[Shurank]";
 	if(Class == Job_Novice || Class == Job_Baby){
 		mes "Still wondering";
@@ -42,7 +41,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "come back to me...";
 		close;
 	}
-	if(BaseClass == Job_Swordman && eaclass()&(EAJL_2|EAJL_UPPER)){
+	if(BaseClass == Job_Swordman && eaclass()&(EAJL_2|EAJL_UPPER|EAJL_THIRD)){
 		mes "From your raiment,";
 		mes "I see that you are";
 		if(Sex)
@@ -109,7 +108,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "your great efforts. But do not let your talents allow you to grow arrogant!";
 			set tu_swordman, 23;
 			completequest 8228;
-			getexp 186,0;
+			if (checkre(3))
+				getexp 186,0;
+			else
+				getexp 1860,0;
 			getitem 1113,1; //Scimiter
 			next;
 			mes "[Shurank]";
@@ -197,7 +199,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "your accomplishment.";
 			set tu_swordman, 22;
 			changequest 8227,8228;
-			getexp 186,0;
+			if (checkre(3))
+				getexp 186,0;
+			else
+				getexp 1860,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time, I will tell you more about the Magnum Break skill.";
@@ -224,7 +229,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			set tu_swordman, 13;
 			erasequest 8221;
 			setquest 8222;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
@@ -286,7 +294,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			set tu_swordman, 13;
 			erasequest 8221;
 			setquest 8222;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
@@ -363,7 +374,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			set tu_swordman, 13;
 			erasequest 8221;
 			setquest 8222;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
@@ -384,7 +398,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			set tu_swordman, 10;
-			getexp 112,0;
+			if (checkre(3))
+				getexp 112,0;
+			else
+				getexp 1120,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -398,7 +415,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -447,7 +467,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			set tu_swordman, 10;
-			getexp 112,0;
+			if (checkre(3))
+				getexp 112,0;
+			else
+				getexp 1120,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -461,7 +484,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
 			close;
@@ -543,7 +569,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			set tu_swordman, 10;
 			changequest 8219,8220;
-			getexp 112,0;
+			if (checkre(3))
+				getexp 112,0;
+			else
+				getexp 1120,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -561,7 +590,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			completequest 8219;
 			completequest 8220;
 			setquest 8221;
-			getexp 126,0;
+			if (checkre(3))
+				getexp 126,0;
+			else
+				getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -650,7 +682,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Ah! That healthy glow!";
 			mes "I see that you've mastered this skill already. Let me give you a little reward for your hard training!";
 			set tu_swordman, 5;
-			getexp 112,0;
+			if (checkre(3))
+				getexp 112,0;
+			else
+				getexp 1120,0;
 			next;
 		} else {
 			mes "[Shurank]";
@@ -690,7 +725,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			getexp 97,0;
+			if (checkre(3))
+				getexp 97,0;
+			else
+				getexp 970,0;
 			getitem 2503,1; //Muffler
 			close;
 		} else {
@@ -725,7 +763,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a little reward for all of your hard work. I hope you realize the importance of using Bash as";
 			mes "you grow stronger.";
 			set tu_swordman, 3;
-			getexp 83,0;
+			if (checkre(3))
+				getexp 83,0;
+			else
+				getexp 830,0;
 			close;
 		} else if(.@chk_bash == 10){
 			mes "[Shurank]";
@@ -736,7 +777,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			getexp 97,0;
+			if (checkre(3))
+				getexp 97,0;
+			else
+				getexp 970,0;
 			getitem 2503,1; //Muffler
 			close;
 		} else {
@@ -771,7 +815,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
-			getexp 58,0;
+			if (checkre(3))
+				getexp 58,0;
+			else
+				getexp 580,0;
 			close;
 		} else if((.@chk_bash > 4) && (.@chk_bash < 10)){
 			mes "[Shurank]";
@@ -801,7 +848,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "For your efforts and patience, I offer you this small reward. Please take it and grow even stronger...";
 			set tu_swordman, 3;
 			setquest 8211;
-			getexp 83,0;
+			if (checkre(3))
+				getexp 83,0;
+			else
+				getexp 830,0;
 			next;
 			mes "[Shurank]";
 			mes "I believe that every true Swordman should master the Bash skill. If you ever do master the skill as a Swordman, come back to me.";
@@ -815,7 +865,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			getexp 97,0;
+			if (checkre(3))
+				getexp 97,0;
+			else
+				getexp 970,0;
 			getitem 2503,1; //Muffler
 			close;
 		} else {
@@ -848,7 +901,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "Now, if you wish to become a true Swordman, you must learn the Bash skill. There's no question about it: You've got to know these basics! Take this, and learn to Bash!";
 			set tu_swordman, 1;
-			getexp 49,0;
+			if (checkre(3))
+				getexp 49,0;
+			else
+				getexp 490,0;
 			setquest 8211;
 			close;
 		} else if((.@chk_bash > 0) && (.@chk_bash < 5)){
@@ -873,7 +929,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
 			changequest 8211,8212;
-			getexp 58,0;
+			if (checkre(3))
+				getexp 58,0;
+			else
+				getexp 580,0;
 			close;
 		} else if((.@chk_bash > 4) && (.@chk_bash < 10)){
 			mes "[Shurank]";
@@ -896,7 +955,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 3;
 			changequest 8212,8213;
-			getexp 83,0;
+			if (checkre(3))
+				getexp 83,0;
+			else
+				getexp 830,0;
 			next;
 			mes "[Shurank]";
 			mes "But if you wish to become an expert Swordman in my eyes, you must master Bash!";
@@ -914,7 +976,10 @@ izlude_in,82,163,3	script	Shurank	733,{
 			completequest 8212;
 			completequest 8213;
 			setquest 8214;
-			getexp 97,0;
+			if (checkre(3))
+				getexp 97,0;
+			else
+				getexp 970,0;
 			getitem 2503,1; //Muffler
 			close;
 		}
@@ -926,7 +991,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 
 // Daqu'ee
 //============================================================
-geffen,154,143,3	script	Dequ'ee	734,{
+geffen,154,143,3	script	Dequ'ee	4_M_JOB_KNIGHT2,{
 	if(BaseJob == Job_Novice){
 		mes "[Dequ'ee]";
 		mes "Hey there.";
@@ -1067,7 +1132,10 @@ geffen,154,143,3	script	Dequ'ee	734,{
 			mes "Hurry over to Morroc and monitor Bankley in case he does anything desperate. If something happens, report to me right away!";
 			set tu_swordman, 19;
 			changequest 8224,8225;
-			getexp 162,0;
+			if (checkre(3))
+				getexp 162,0;
+			else
+				getexp 1620,0;
 			close2;
 			warp "moc_fild07",359,201;
 			end;
@@ -2113,7 +2181,10 @@ geffen,154,143,3	script	Dequ'ee	734,{
 					mes "Thank you for taking the trouble to come this far. Let me reward you with some experience points.";
 					set tu_swordman, 7;
 					changequest 8216,8217;
-					getexp 112,0;
+					if (checkre(3))
+						getexp 112,0;
+					else
+						getexp 1120,0;
 					next;
 					mes "[Dequ'ee]";
 					mes "Take care";
@@ -2184,7 +2255,7 @@ geffen,154,143,3	script	Dequ'ee	734,{
 
 // Geil
 //============================================================
-morocc_in,51,101,3	script	Geil	89,{
+morocc_in,51,101,3	script	Geil	4_M_ORIENT02,{
 	mes "[Geil]";
 	if(tu_swordman == 15){
 		mes "Were you sent by the authorities? Quit giving me such a hard time! I'm not the murderer! I don't even know who was killed. I'm not the one you're looking for!";
@@ -2235,7 +2306,7 @@ morocc_in,51,101,3	script	Geil	89,{
 
 // Meutro
 //============================================================
-morocc,82,292,5	script	Muetro	84,{
+morocc,82,292,5	script	Muetro	4_M_02,{
 	mes "[Muetro]";
 	if(tu_swordman == 15){
 		mes "You're just";
@@ -2276,7 +2347,7 @@ morocc,82,292,5	script	Muetro	84,{
 
 // Hans
 //============================================================
-morocc,240,72,3	script	Hans	86,{
+morocc,240,72,3	script	Hans	4_M_04,{
 	mes "[Hans]";
 	if(tu_swordman == 15){
 		mes "Help me!";
@@ -2334,7 +2405,7 @@ morocc,240,72,3	script	Hans	86,{
 
 // Bankley
 //============================================================
-morocc_in,12,156,3	script	Bankley	97,{
+morocc_in,12,156,3	script	Bankley	4W_M_01,{
 	if(tu_swordman > 19){
 		mes "^3355FFBankley had a pitiable";
 		mes "expression on his face.^000000";
diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt
index fe0d52f87..059a76477 100644
--- a/npc/quests/first_class/tu_thief01.txt
+++ b/npc/quests/first_class/tu_thief01.txt
@@ -1,25 +1,24 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Thief Class Tutorial and Job Specific Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Fix up by Jukka
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN (Testet in Trunk 88xx)
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
+//= Thief training quest.
+//===== Additional Comments: =================================
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
-//=	TODO: Test, Add correct misceffects numbers
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Fixed a few minor mistakes [Playtester]
 //= 1.4 Misc. updates. [L0ne_W0lf]
-//============================================================ 
+//= 1.5 Added Pre-Renewal support. [Euphy]
+//============================================================
 
 // Thief Trainer
 //============================================================
-moc_ruins,66,164,4	script	Thief Trainer#T	84,{
+moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 	mes "[Yierhan]";
 	if(Class == Job_Novice){
 		mes "Eh...?";
@@ -88,7 +87,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "[Yierhan]";
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				set tu_thief01, 1;
-				getexp 20,10;
+				getexp 200,100;
 				specialeffect2 EF_HIT5;
 				close;
 			case 2:
@@ -104,7 +103,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "Sure, ^23238EDEX^000000 and LUK can";
 				mes "also increase your attack damage, but they're insignificant compared to STR. I repeat: ^660000insignificant^000000.";
 				set tu_thief01, 1;
-				getexp 40,20;
+				getexp 400,200;
 				specialeffect2 EF_HIT5;
 				close;
 			case 3:
@@ -119,7 +118,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "[Yierhan]";
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				set tu_thief01, 1;
-				getexp 20,10;
+				getexp 200,100;
 				specialeffect2 EF_HIT5;
 				close;
 			}
@@ -229,7 +228,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			mes "about any other skills,";
 			mes "I can explain real quick.";
 			set tu_thief01, 3;
-			getexp BaseLevel*3,BaseLevel*2;
+			getexp BaseLevel*30,BaseLevel*15;
 			specialeffect2 EF_HIT5;
 			close;
 		} else if(tu_thief01 == 3){
@@ -328,24 +327,12 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 					mes "Now that you're such an expert on skills, I want you to level up your skills and come back, got it?";
 					set tu_thief01, 4;
 					specialeffect2 EF_HIT5;
-					if(.@read_d){
-						getexp 30,10;
-					}
-					if(.@read_f){
-						getexp 30,10;
-					}
-					if(.@read_s){
-						getexp 30,10;
-					}
-					if(.@read_p){
-						getexp 30,10;
-					}
-					if(.@read_h){
-						getexp 30,10;
-					}
-					if(.@read_r){
-						getexp 30,10;
-					}
+					if(.@read_d) getexp 300,100;
+					if(.@read_f) getexp 300,100;
+					if(.@read_s) getexp 300,100;
+					if(.@read_p) getexp 300,100;
+					if(.@read_h) getexp 300,100;
+					if(.@read_r) getexp 300,100;
 					close;
 				}
 			}
@@ -362,7 +349,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			set tu_thief01, 5;
 			savepoint "moc_ruins",80,164;
 			getitem 602,1; //Wing_Of_Butterfly
-			getexp 10,5;
+			getexp 100,50;
 			specialeffect2 EF_HIT5;
 			close2;
 			warp "moc_fild12",158,373;
@@ -420,7 +407,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "is pretty strong!";
 						set tu_thief01, 8;
 						getitem 1207,1; //Main_Gauche
-						getexp 100,50;
+						getexp 1000,500;
 						specialeffect2 EF_HIT5;
 						close;
 					case 2:
@@ -430,7 +417,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "Alright, you better get stronger the next time I see you. Oh, and you can have this stuff. You know, since you're so gangster and all.";
 						set tu_thief01, 7;
 						getitem 1207,1; //Main_Gauche
-						getexp 50,20;
+						getexp 500,200;
 						specialeffect2 EF_HIT5;
 						close;
 					}
@@ -447,22 +434,19 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "you so much, kid,";
 						mes "you can have this.";
 						mes "Take it, it's yours!";
-						set tu_thief01, 7;
-						getitem 1207,1; //Main_Gauche
-						getexp 50,20;
-						specialeffect2 EF_HIT5;
-						close;
+						break;
 					case 2:
 						mes "[Yierhan]";
 						mes "Good!";
 						mes "Less work for me!";
 						mes "Alright, you better get stronger the next time I see you. Oh, and you can have this stuff. You know, since you're so gangster and all.";
-						set tu_thief01, 7;
-						getitem 1207,1; //Main_Gauche
-						getexp 50,20;
-						specialeffect2 EF_HIT5;
-						close;
+						break;
 					}
+					set tu_thief01, 7;
+					getitem 1207,1; //Main_Gauche
+					getexp 500,200;
+					specialeffect2 EF_HIT5;
+					close;
 				}
 			}
 		} else if(tu_thief01 == 7){
@@ -503,7 +487,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			mes "out, be real careful";
 			mes "other there, okay?";
 			set tu_thief01, 8;
-			getexp 20,10;
+			getexp 200,100;
 			specialeffect2 EF_HIT5;
 			close;
 		} else if(tu_thief01 == 8){
@@ -586,8 +570,8 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "Hey, this stuff is yours. Think of it as a reward for helping us out. Take care of yourself now~";
 				set tu_thief01, 27;
 				getitem 2307,1; //Mantle
-				set Zeny, Zeny + 5000;
-				getexp 800,300;
+				Zeny += 5000;
+				getexp 8000,3000;
 				close;
 			}
 		} else {
@@ -668,7 +652,6 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "[Yierhan]";
 				mes "Ah, gotcha. Well, that's understandable. I mean, these things take time, you know?";
 				close;
-				break;
 			case 2:
 				mes "[Yierhan]";
 				mes "Yeah...?";
@@ -676,7 +659,6 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "I guess these kinds of things require patience. And thinking.";
 				mes "You know, things I'm horrible at.";
 				close;
-				break;
 			case 3:
 				mes "[Yierhan]";
 				mes "Alright...!";
@@ -711,8 +693,8 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "[Yierhan]";
 				mes "Hey, this stuff is yours. Think of it as a reward for helping us out. Right, and I'll let Mana know you did a great job. Take care of yourself now~";
 				set tu_magician01, 27;
-				set Zeny, Zeny + 5000;
-				getexp 500,200;
+				Zeny += 5000;
+				getexp 5000,2000;
 				close;
 			}
 		} else {
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 4e9713b1c..535eb7902 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -1,48 +1,48 @@
 //===== Hercules Script ======================================
 //= Guild Relay Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Guild Relay Quest.
 //= Quest designed for multiple users at once.
 //= Variable in use: guildrelay_q (Max: ??)
 //= Variable in use: guildtime (Max: ??)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Fixed errors reported by NoHealing (Bugreport:3934) [L0ne_W0lf]
 //= NPCs now duplicate from FLOATING npcs instead of Luina 1 npcs.
-//============================================================ 
+//============================================================
 
 // Floating NPCs to duplicate from.
 //============================================================
--	script	RelayDummy1::GuildRelay1	754,{
+-	script	RelayDummy1::GuildRelay1	4_M_SAGE_A,{
 	set .@name$,strnpcinfo(1);
 	if (.@name$ == "Buzz") {
 		set .@name2$,"Lenya";
 		set .@name3$,"Gealuve";
 		set .@name4$,"Pariz";
-		set .@GID, GetCastleData("aldeg_cas"+strnpcinfo(2),1);
+		set .@GID, getcastledata("aldeg_cas"+strnpcinfo(2),1);
 	}
 	else if (.@name$ == "Jody") {
 		set .@name2$,"Ron Haware";
 		set .@name3$,"Vers";
 		set .@name4$,"Gen Garish";
-		set .@GID, GetCastleData("gefg_cas"+strnpcinfo(2),1);
+		set .@GID, getcastledata("gefg_cas"+strnpcinfo(2),1);
 	}
 	else if (.@name$ == "Chungye") {
 		set .@name2$,"Dosuhlji";
 		set .@name3$,"Yayula";
 		set .@name4$,"Ashin";
-		set .@GID, GetCastleData("payg_cas"+strnpcinfo(2),1);
+		set .@GID, getcastledata("payg_cas"+strnpcinfo(2),1);
 	}
 	else if (.@name$ == "Hermod") {
 		set .@name2$,"Atila";
 		set .@name3$,"Cecil";
 		set .@name4$,"Diligo";
-		set .@GID, GetCastleData("prtg_cas"+strnpcinfo(2),1);
+		set .@GID, getcastledata("prtg_cas"+strnpcinfo(2),1);
 	}
 	if (checkweight(908,630) == 0) {
 		mes "^3355FFWait a minute! You're";
@@ -1218,10 +1218,10 @@
 	}
 }
 
--	script	RelayDummy2::GuildRelay2	754,{
+-	script	RelayDummy2::GuildRelay2	4_M_SAGE_A,{
 	set .@name$,strnpcinfo(1);
 	getmapxy(.@m$,.@x,.@x,1);
-	set .@GID, GetCastleData(.@m$,1);
+	set .@GID, getcastledata(.@m$,1);
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a minute! You're";
 		mes "carrying too many items";
@@ -1727,10 +1727,10 @@
 	}
 }
 
--	script	RelayDummy3::GuildRelay3	754,{
+-	script	RelayDummy3::GuildRelay3	4_M_SAGE_A,{
 	set .@name$,strnpcinfo(1);
 	getmapxy(.@m$,.@x,.@x,1);
-	set .@GID, GetCastleData(.@m$,1);
+	set .@GID, getcastledata(.@m$,1);
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a minute! You're";
 		mes "carrying too many items";
@@ -2412,10 +2412,10 @@
 	close;
 }
 
--	script	GuildDummy4::GuildRelay4	754,{
+-	script	GuildDummy4::GuildRelay4	4_M_SAGE_A,{
 	set .@name$,strnpcinfo(1);
 	getmapxy(.@m$,.@x,.@x,1);
-	set .@GID, GetCastleData(.@m$,1);
+	set .@GID, getcastledata(.@m$,1);
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a minute! You're";
 		mes "carrying too many items";
@@ -3090,140 +3090,140 @@
 
 // Luina 1
 //============================================================
-aldeg_cas01,51,102,5	duplicate(GuildRelay1)	Buzz#01	754,{
-aldeg_cas01,75,39,3	duplicate(GuildRelay2)	Lenya#01	754,{
-aldeg_cas01,200,175,3	duplicate(GuildRelay3)	Gealuve#01	754,{
-aldeg_cas01,59,224,3	duplicate(GuildRelay4)	Pariz#01	754,{
+aldeg_cas01,51,102,5	duplicate(GuildRelay1)	Buzz#01	4_M_SAGE_A,{
+aldeg_cas01,75,39,3	duplicate(GuildRelay2)	Lenya#01	4_M_SAGE_A,{
+aldeg_cas01,200,175,3	duplicate(GuildRelay3)	Gealuve#01	4_M_SAGE_A,{
+aldeg_cas01,59,224,3	duplicate(GuildRelay4)	Pariz#01	4_M_SAGE_A,{
 
 // Luina 2
 //============================================================
-aldeg_cas02,120,51,5	duplicate(GuildRelay1)	Buzz#02	754
-aldeg_cas02,180,184,3	duplicate(GuildRelay2)	Lenya#02	754
-aldeg_cas02,62,65,3	duplicate(GuildRelay3)	Gealuve#02	754
-aldeg_cas02,62,201,3	duplicate(GuildRelay4)	Pariz#02	754
+aldeg_cas02,120,51,5	duplicate(GuildRelay1)	Buzz#02	4_M_SAGE_A
+aldeg_cas02,180,184,3	duplicate(GuildRelay2)	Lenya#02	4_M_SAGE_A
+aldeg_cas02,62,65,3	duplicate(GuildRelay3)	Gealuve#02	4_M_SAGE_A
+aldeg_cas02,62,201,3	duplicate(GuildRelay4)	Pariz#02	4_M_SAGE_A
 
 // Luina 3
 //============================================================
-aldeg_cas03,70,252,5	duplicate(GuildRelay1)	Buzz#03	754
-aldeg_cas03,72,115,3	duplicate(GuildRelay2)	Lenya#03	754
-aldeg_cas03,114,119,3	duplicate(GuildRelay3)	Gealuve#03	754
-aldeg_cas03,188,181,3	duplicate(GuildRelay4)	Pariz#03	754
+aldeg_cas03,70,252,5	duplicate(GuildRelay1)	Buzz#03	4_M_SAGE_A
+aldeg_cas03,72,115,3	duplicate(GuildRelay2)	Lenya#03	4_M_SAGE_A
+aldeg_cas03,114,119,3	duplicate(GuildRelay3)	Gealuve#03	4_M_SAGE_A
+aldeg_cas03,188,181,3	duplicate(GuildRelay4)	Pariz#03	4_M_SAGE_A
 
 // Luina 4
 //============================================================
-aldeg_cas04,31,116,5	duplicate(GuildRelay1)	Buzz#04	754
-aldeg_cas04,66,117,3	duplicate(GuildRelay2)	Lenya#04	754
-aldeg_cas04,24,80,3	duplicate(GuildRelay3)	Gealuve#04	754
-aldeg_cas04,181,97,3	duplicate(GuildRelay4)	Pariz#04	754
+aldeg_cas04,31,116,5	duplicate(GuildRelay1)	Buzz#04	4_M_SAGE_A
+aldeg_cas04,66,117,3	duplicate(GuildRelay2)	Lenya#04	4_M_SAGE_A
+aldeg_cas04,24,80,3	duplicate(GuildRelay3)	Gealuve#04	4_M_SAGE_A
+aldeg_cas04,181,97,3	duplicate(GuildRelay4)	Pariz#04	4_M_SAGE_A
 
 // Luina 5
 //============================================================
-aldeg_cas05,31,191,5	duplicate(GuildRelay1)	Buzz#05	754
-aldeg_cas05,140,196,3	duplicate(GuildRelay2)	Lenya#05	754
-aldeg_cas05,148,224,3	duplicate(GuildRelay3)	Gealuve#05	754
-aldeg_cas05,165,51,3	duplicate(GuildRelay4)	Pariz#05	754
+aldeg_cas05,31,191,5	duplicate(GuildRelay1)	Buzz#05	4_M_SAGE_A
+aldeg_cas05,140,196,3	duplicate(GuildRelay2)	Lenya#05	4_M_SAGE_A
+aldeg_cas05,148,224,3	duplicate(GuildRelay3)	Gealuve#05	4_M_SAGE_A
+aldeg_cas05,165,51,3	duplicate(GuildRelay4)	Pariz#05	4_M_SAGE_A
 
 // Britoniah 1
 //============================================================
-gefg_cas01,85,47,4	duplicate(GuildRelay1)	Jody#01	754
-gefg_cas01,67,83,3	duplicate(GuildRelay2)	Ron Haware#01	754
-gefg_cas01,184,40,3	duplicate(GuildRelay3)	Vers#01	754
-gefg_cas01,35,34,6	duplicate(GuildRelay4)	Gen Garish#01	754
+gefg_cas01,85,47,4	duplicate(GuildRelay1)	Jody#01	4_M_SAGE_A
+gefg_cas01,67,83,3	duplicate(GuildRelay2)	Ron Haware#01	4_M_SAGE_A
+gefg_cas01,184,40,3	duplicate(GuildRelay3)	Vers#01	4_M_SAGE_A
+gefg_cas01,35,34,6	duplicate(GuildRelay4)	Gen Garish#01	4_M_SAGE_A
 
 // Britoniah 2
 //============================================================
-gefg_cas02,15,69,4	duplicate(GuildRelay1)	Jody#02	754
-gefg_cas02,23,22,3	duplicate(GuildRelay2)	Ron Haware#02	754
-gefg_cas02,178,38,3	duplicate(GuildRelay3)	Vers#02	754
-gefg_cas02,18,159,5	duplicate(GuildRelay4)	Gen Garish#02	754
+gefg_cas02,15,69,4	duplicate(GuildRelay1)	Jody#02	4_M_SAGE_A
+gefg_cas02,23,22,3	duplicate(GuildRelay2)	Ron Haware#02	4_M_SAGE_A
+gefg_cas02,178,38,3	duplicate(GuildRelay3)	Vers#02	4_M_SAGE_A
+gefg_cas02,18,159,5	duplicate(GuildRelay4)	Gen Garish#02	4_M_SAGE_A
 
 // Britoniah 3
 //============================================================
-gefg_cas03,257,41,4	duplicate(GuildRelay1)	Jody#03	754
-gefg_cas03,110,91,3	duplicate(GuildRelay2)	Ron Haware#03	754
-gefg_cas03,158,57,3	duplicate(GuildRelay3)	Vers#03	754
-gefg_cas03,124,24,3	duplicate(GuildRelay4)	Gen Garish#03	754
+gefg_cas03,257,41,4	duplicate(GuildRelay1)	Jody#03	4_M_SAGE_A
+gefg_cas03,110,91,3	duplicate(GuildRelay2)	Ron Haware#03	4_M_SAGE_A
+gefg_cas03,158,57,3	duplicate(GuildRelay3)	Vers#03	4_M_SAGE_A
+gefg_cas03,124,24,3	duplicate(GuildRelay4)	Gen Garish#03	4_M_SAGE_A
 
 // Britoniah 4
 //============================================================
-gefg_cas04,26,73,4	duplicate(GuildRelay1)	Jody#04	754
-gefg_cas04,34,16,1	duplicate(GuildRelay2)	Ron Haware#04	754
-gefg_cas04,55,70,5	duplicate(GuildRelay3)	Vers#04	754
-gefg_cas04,73,38,6	duplicate(GuildRelay4)	Gen Garish#04	754
+gefg_cas04,26,73,4	duplicate(GuildRelay1)	Jody#04	4_M_SAGE_A
+gefg_cas04,34,16,1	duplicate(GuildRelay2)	Ron Haware#04	4_M_SAGE_A
+gefg_cas04,55,70,5	duplicate(GuildRelay3)	Vers#04	4_M_SAGE_A
+gefg_cas04,73,38,6	duplicate(GuildRelay4)	Gen Garish#04	4_M_SAGE_A
 
 // Britoniah 5
 //============================================================
-gefg_cas05,47,47,4	duplicate(GuildRelay1)	Jody#05	754
-gefg_cas05,65,28,3	duplicate(GuildRelay2)	Ron Haware#05	754
-gefg_cas05,87,31,3	duplicate(GuildRelay3)	Vers#05	754
-gefg_cas05,46,28,3	duplicate(GuildRelay4)	Gen Garish#05	754
+gefg_cas05,47,47,4	duplicate(GuildRelay1)	Jody#05	4_M_SAGE_A
+gefg_cas05,65,28,3	duplicate(GuildRelay2)	Ron Haware#05	4_M_SAGE_A
+gefg_cas05,87,31,3	duplicate(GuildRelay3)	Vers#05	4_M_SAGE_A
+gefg_cas05,46,28,3	duplicate(GuildRelay4)	Gen Garish#05	4_M_SAGE_A
 
 // Greenwood Lake 1
 //============================================================
-payg_cas01,87,35,3	duplicate(GuildRelay1)	Chungye#01	106
-payg_cas01,129,29,3	duplicate(GuildRelay2)	Dosuhlji#01	754
-payg_cas01,13,146,5	duplicate(GuildRelay3)	Yayula#01	741
-payg_cas01,91,49,3	duplicate(GuildRelay4)	Ashin#01	59
+payg_cas01,87,35,3	duplicate(GuildRelay1)	Chungye#01	1_M_MOC_LORD
+payg_cas01,129,29,3	duplicate(GuildRelay2)	Dosuhlji#01	4_M_SAGE_A
+payg_cas01,13,146,5	duplicate(GuildRelay3)	Yayula#01	2_M_BARD_ORIENT
+payg_cas01,91,49,3	duplicate(GuildRelay4)	Ashin#01	1_M_ORIENT01
 
 // Greenwood Lake 2
 //============================================================
-payg_cas02,34,253,3	duplicate(GuildRelay1)	Chungye#02	106
-payg_cas02,77,229,3	duplicate(GuildRelay2)	Dosuhlji#02	754
-payg_cas02,252,287,3	duplicate(GuildRelay3)	Yayula#02	741
-payg_cas02,289,264,3	duplicate(GuildRelay4)	Ashin#02	59
+payg_cas02,34,253,3	duplicate(GuildRelay1)	Chungye#02	1_M_MOC_LORD
+payg_cas02,77,229,3	duplicate(GuildRelay2)	Dosuhlji#02	4_M_SAGE_A
+payg_cas02,252,287,3	duplicate(GuildRelay3)	Yayula#02	2_M_BARD_ORIENT
+payg_cas02,289,264,3	duplicate(GuildRelay4)	Ashin#02	1_M_ORIENT01
 
 // Greenwood Lake 3
 //============================================================
-payg_cas03,48,265,3	duplicate(GuildRelay1)	Chungye#03	106
-payg_cas03,7,265,5	duplicate(GuildRelay2)	Dosuhlji#03	754
-payg_cas03,16,16,5	duplicate(GuildRelay3)	Yayula#03	741
-payg_cas03,10,266,3	duplicate(GuildRelay4)	Ashin#03	59
+payg_cas03,48,265,3	duplicate(GuildRelay1)	Chungye#03	1_M_MOC_LORD
+payg_cas03,7,265,5	duplicate(GuildRelay2)	Dosuhlji#03	4_M_SAGE_A
+payg_cas03,16,16,5	duplicate(GuildRelay3)	Yayula#03	2_M_BARD_ORIENT
+payg_cas03,10,266,3	duplicate(GuildRelay4)	Ashin#03	1_M_ORIENT01
 
 // Greenwood Lake 4
 //============================================================
-payg_cas04,24,285,3	duplicate(GuildRelay1)	Chungye#04	106
-payg_cas04,21,16,3	duplicate(GuildRelay2)	Dosuhlji#04	754
-payg_cas04,69,270,3	duplicate(GuildRelay3)	Yayula#04	741
-payg_cas04,18,239,3	duplicate(GuildRelay4)	Ashin#04	59
+payg_cas04,24,285,3	duplicate(GuildRelay1)	Chungye#04	1_M_MOC_LORD
+payg_cas04,21,16,3	duplicate(GuildRelay2)	Dosuhlji#04	4_M_SAGE_A
+payg_cas04,69,270,3	duplicate(GuildRelay3)	Yayula#04	2_M_BARD_ORIENT
+payg_cas04,18,239,3	duplicate(GuildRelay4)	Ashin#04	1_M_ORIENT01
 
 // Greenwood Lake 5
 //============================================================
-payg_cas05,277,271,3	duplicate(GuildRelay1)	Chungye#05	106
-payg_cas05,273,15,3	duplicate(GuildRelay2)	Dosuhlji#05	754
-payg_cas05,283,24,3	duplicate(GuildRelay3)	Yayula#05	741
-payg_cas05,276,287,3	duplicate(GuildRelay4)	Ashin#05	59
+payg_cas05,277,271,3	duplicate(GuildRelay1)	Chungye#05	1_M_MOC_LORD
+payg_cas05,273,15,3	duplicate(GuildRelay2)	Dosuhlji#05	4_M_SAGE_A
+payg_cas05,283,24,3	duplicate(GuildRelay3)	Yayula#05	2_M_BARD_ORIENT
+payg_cas05,276,287,3	duplicate(GuildRelay4)	Ashin#05	1_M_ORIENT01
 
 // Valkyrie Realms 1
 //============================================================
-prtg_cas01,96,205,5	duplicate(GuildRelay1)	Hermod#01	754
-prtg_cas01,157,117,3	duplicate(GuildRelay2)	Atila#01	728
-prtg_cas01,149,78,3	duplicate(GuildRelay3)	Cecil#01	92
-prtg_cas01,125,191,3	duplicate(GuildRelay4)	Diligo#01	754
+prtg_cas01,96,205,5	duplicate(GuildRelay1)	Hermod#01	4_M_SAGE_A
+prtg_cas01,157,117,3	duplicate(GuildRelay2)	Atila#01	4_F_JOB_KNIGHT
+prtg_cas01,149,78,3	duplicate(GuildRelay3)	Cecil#01	4_F_03
+prtg_cas01,125,191,3	duplicate(GuildRelay4)	Diligo#01	4_M_SAGE_A
 
 // Valkyrie Realms 2
 //============================================================
-prtg_cas02,73,35,5	duplicate(GuildRelay1)	Hermod#02	754
-prtg_cas02,43,41,5	duplicate(GuildRelay2)	Atila#02	728
-prtg_cas02,52,63,3	duplicate(GuildRelay3)	Cecil#02	92
-prtg_cas02,100,62,3	duplicate(GuildRelay4)	Diligo#02	754
+prtg_cas02,73,35,5	duplicate(GuildRelay1)	Hermod#02	4_M_SAGE_A
+prtg_cas02,43,41,5	duplicate(GuildRelay2)	Atila#02	4_F_JOB_KNIGHT
+prtg_cas02,52,63,3	duplicate(GuildRelay3)	Cecil#02	4_F_03
+prtg_cas02,100,62,3	duplicate(GuildRelay4)	Diligo#02	4_M_SAGE_A
 
 // Valkyrie Realms 3
 //============================================================
-prtg_cas03,5,68,5	duplicate(GuildRelay1)	Hermod#03	754
-prtg_cas03,18,109,3	duplicate(GuildRelay2)	Atila#03	728
-prtg_cas03,71,81,5	duplicate(GuildRelay3)	Cecil#03	92
-prtg_cas03,183,215,3	duplicate(GuildRelay4)	Diligo#03	754
+prtg_cas03,5,68,5	duplicate(GuildRelay1)	Hermod#03	4_M_SAGE_A
+prtg_cas03,18,109,3	duplicate(GuildRelay2)	Atila#03	4_F_JOB_KNIGHT
+prtg_cas03,71,81,5	duplicate(GuildRelay3)	Cecil#03	4_F_03
+prtg_cas03,183,215,3	duplicate(GuildRelay4)	Diligo#03	4_M_SAGE_A
 
 // Valkyrie Realms 4
 //============================================================
-prtg_cas04,39,263,3	duplicate(GuildRelay1)	Hermod#04	754
-prtg_cas04,259,251,3	duplicate(GuildRelay2)	Atila#04	728
-prtg_cas04,6,281,5	duplicate(GuildRelay3)	Cecil#04	92
-prtg_cas04,59,282,5	duplicate(GuildRelay4)	Diligo#04	754
+prtg_cas04,39,263,3	duplicate(GuildRelay1)	Hermod#04	4_M_SAGE_A
+prtg_cas04,259,251,3	duplicate(GuildRelay2)	Atila#04	4_F_JOB_KNIGHT
+prtg_cas04,6,281,5	duplicate(GuildRelay3)	Cecil#04	4_F_03
+prtg_cas04,59,282,5	duplicate(GuildRelay4)	Diligo#04	4_M_SAGE_A
 
 // Valkyrie Realms 5
 //============================================================
-prtg_cas05,52,70,5	duplicate(GuildRelay1)	Hermod#05	754
-prtg_cas05,253,91,3	duplicate(GuildRelay2)	Atila#05	728
-prtg_cas05,276,93,3	duplicate(GuildRelay3)	Cecil#05	92
-prtg_cas05,211,36,3	duplicate(GuildRelay4)	Diligo#05	754
+prtg_cas05,52,70,5	duplicate(GuildRelay1)	Hermod#05	4_M_SAGE_A
+prtg_cas05,253,91,3	duplicate(GuildRelay2)	Atila#05	4_F_JOB_KNIGHT
+prtg_cas05,276,93,3	duplicate(GuildRelay3)	Cecil#05	4_F_03
+prtg_cas05,211,36,3	duplicate(GuildRelay4)	Diligo#05	4_M_SAGE_A
diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt
index f51dc225c..539f6c4ae 100644
--- a/npc/quests/gunslinger_quests.txt
+++ b/npc/quests/gunslinger_quests.txt
@@ -3,9 +3,7 @@
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
-//= 1.6c
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.7
 //===== Description: =========================================
 //= Gunslinger guns and bullet quests
 //===== Additional Comments: =================================
@@ -21,9 +19,10 @@
 //= 1.6a Removed .GATs [Lupus]
 //= 1.6b Changed item names to item IDs on some scripts. [Samuray22]
 //= 1.6c Corrected a bad delitem. (bugreport:763) [Samuray22]
+//= 1.7 Removed all 'menu' and 'goto'. [Euphy]
 //============================================================
 
-que_ng,182,85,3	script	Garrison	109,{
+que_ng,182,85,3	script	Garrison	4_M_MANAGER,{
 
 	if(BaseJob != Job_Gunslinger)
 	{
@@ -312,7 +311,7 @@ SubGarrison:
 			delitem 999,50; //Steel
 			delitem 1003,50; //Coal
 			delitem 7317,20; //Rusty Screw
-			set Zeny,Zeny-30000;
+			Zeny -= 30000;
 			getitem 13104,1; //Garrison
 			close;
 
@@ -425,7 +424,7 @@ lighthalzen,322,247,6	script	Ravey	 86,{
 }
 
 
-que_ng,187,163,3	script	Ingrid	744,{
+que_ng,187,163,3	script	Ingrid	4_F_ALCHE,{
 
 	if(BaseJob != Job_Gunslinger)
 	{
@@ -587,7 +586,7 @@ SubInferno:
 		mes "I see you have the proper amount of materials and Zeny.";
 		mes "Here is the Inferno I've created for you.";
 		mes "Use it well.";
-		set Zeny,Zeny-200000;
+		Zeny -= 200000;
 		delitem 7319,100;
 		delitem 984,10;
 		delitem 7317,50;
@@ -598,7 +597,7 @@ SubInferno:
 	}
 }
 
-que_ng,185,180,3	script	Vanessa	726,{
+que_ng,185,180,3	script	Vanessa	4_F_JOB_BLACKSMITH,{
 
 	if(BaseJob != Job_Gunslinger)
 	{
@@ -860,7 +859,7 @@ SubDestroyer:
 		mes "You've got the perfect materials and Zeny~";
 		mes "Here's the Destroyer I made ahead of time for you.";
 		mes "Use it well.";
-		set Zeny,Zeny-100000;
+		Zeny -= 100000;
 		delitem 7319,50;
 		delitem 984,5;
 		delitem 7317,70;
@@ -913,7 +912,7 @@ SubDestroyer_:
 	}
 }
 
-que_ng,149,178,4	script	Lab Director	744,{
+que_ng,149,178,4	script	Lab Director	4_F_ALCHE,{
 
 	if(gun_na == 1){
 		if(countitem(1043) > 999 && countitem(932) > 999){
@@ -994,7 +993,7 @@ que_ng,149,178,4	script	Lab Director	744,{
 				mes "Please clear your inventory.";
 				close;
 			}
-			set Zeny,Zeny-100000;
+			Zeny -= 100000;
 			set gun_na,0;
 			getitem 13158,1;
 			mes "[N. A]";
@@ -1023,7 +1022,7 @@ que_ng,149,178,4	script	Lab Director	744,{
 			delitem 984,3;
 			delitem 1003,70;
 			delitem 7317,50;
-			set Zeny,Zeny-50000;
+			Zeny -= 50000;
 			set gun_na,11;
 			mes "[N. A]";
 			mes "Aha, you got me all the";
@@ -1095,7 +1094,7 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "My name is 'Lab Director'.";
 		mes "Do you need something?";
 		next;
-		menu "I need a Special Metal Rod.",-;
+		select("I need a Special Metal Rod.");
 		mes "[N. A]";
 		mes "Huh...? Hey, weren't you that guy";
 		mes "who walked out of here with a";
@@ -1111,7 +1110,7 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "You betrayed my faith in you!";
 		mes "You traitor! Traitor!! TRAITOR!!!!";
 		next;
-		menu "Explain everything.",-;
+		select("Explain everything.");
 		mes "[N. A]";
 		mes "...... Whew.";
 		mes "So it was Mr. F. Harrison who";
@@ -1131,11 +1130,11 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "Elemental Spheres to keep going";
 		mes "with my research...";
 		next;
-		menu "Make him an offer.",-;
+		select("Make him an offer.");
 		mes "[N. A]";
 		mes "An offer? Like what?";
 		next;
-		menu "We find things for each other.",-;
+		select("We find things for each other.");
 		mes "[N. A]";
 		mes "Hmm... That sounds good.";
 		mes "Well, according to the offer,";
@@ -1159,51 +1158,50 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "Find me 30 of each Element.";
 		mes "Did you find them?";
 		next;
-
 		switch(select("Nope.:I found 30 Poison Spheres.:I found 30 Flare Spheres.:I found 30 Lightning Spheres.:I found 30 Blind Spheres.:I found 30 Freezing Spheres.")){
-
 		case 1:
 			mes "[N. A]";
 			mes "Just bring me whatever type";
 			mes "you could find.";
 			close;
-			break;
 		case 2:
 			if(countitem(13205) >= 30){
 				delitem 13205,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		case 3:
 			if(countitem(13203) >= 30){
 				delitem 13203,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		case 4:
 			if(countitem(13204) >= 30){
 				delitem 13204,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		case 5:
 			if(countitem(13206) >= 30){
 				delitem 13206,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		case 6:
 			if(countitem(13207) >= 30){
 				delitem 13207,30;
 				set gun_na,103;
 			}
-			else goto L_MORE;
 			break;
 		}
+		if (gun_na != 103) {
+			mes "[N. A]";
+			mes "Eh? What? Am I the only";
+			mes "person who can't see them?";
+			mes "Bring me more!";
+			close;
+		}
 		mes "[N. A]";
 		mes "Wow, you found them all for me!";
 		mes "I had to turn Lady Celena's lab";
@@ -1237,7 +1235,7 @@ que_ng,149,178,4	script	Lab Director	744,{
 	mes "Do you need something?";
 	next;
 	if (BaseJob != Job_Gunslinger){
-		menu "Talk to him.",-;
+		select("Talk to him.");
 		mes "[N. A]";
 		mes "If you see Gunslingers around,";
 		mes "please tell them that I have";
@@ -1246,14 +1244,8 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "here. Heheheheh...";
 		close;
 	}
-	if (BaseLevel > 67){
-		menu "Ask about 'Butcher'.",L_BUTCHER,"Ask about the 'Drifter'.",L_DRIFTER,"Cancel",L_CANCEL;
-	}
-	else if(BaseLevel > 54){
-		menu "Ask about the 'Drifter'.",L_DRIFTER,"Cancel",L_CANCEL;
-	}
-	else{
-		menu "Talk.",-;
+	if (BaseLevel < 55) {
+		select("Talk.");
 		mes "[N. A]";
 		mes "... Destruction... Madness...";
 		mes "Hmm... Attack speed over 180...";
@@ -1264,140 +1256,132 @@ que_ng,149,178,4	script	Lab Director	744,{
 		mes "disturb me.";
 		close;
 	}
-
-L_CANCEL:
-	mes "[N. A]";
-	mes "I have news on the latest";
-	mes "weapons but... I guess you're";
-	mes "too busy to hear them.";
-	mes "Maybe next time I guess.";
-	close;
-
-L_BUTCHER:
-	mes "[N. A]";
-	mes "Ah, you heard the news";
-	mes "shortly after the end";
-	mes "of the development eh?";
-	next;
-	mes "[N. A]";
-	mes "^ff0000Butcher^000000 is the newest development";
-	mes "by us, the Einbroch Firearm Lab.";
-	mes "It is the newest type of Gatling";
-	mes "we have developed. While";
-	mes "^ff0000Drifter^000000 is a good weapon";
-	mes "as well, the ^ff0000Butcher^000000 definitely has";
-	mes "a much stronger firepower!";
-	next;
-	mes "[N. A]";
-	mes "Due to its strong firepower,";
-	mes "the Butcher was also dubbed";
-	mes "as the 'Murderer'.";
-	next;
-	mes "[N. A]";
-	mes "However, even Gunslingers could";
-	mes "have troubles controlling such";
-	mes "a powerful weapon.";
-	next;
-	mes "[N. A]";
-	mes "Do you think you can handle it?";
-	next;
-	if(select("I'm not sure...:Of course I can!!") == 1){
+	switch(select(((BaseLevel > 67)?"Ask about 'Butcher'.":"")+":Ask about the 'Drifter'.:Cancel")) {
+	case 1:
 		mes "[N. A]";
-		mes "The ^ff0000Butcher^000000 is a weapon that you";
-		mes "can't handle without a strong";
-		mes "will. I'll see you again when";
-		mes "you have enough confidence to";
-		mes "handle this monster.";
-		close;
-	}else{
+		mes "Ah, you heard the news";
+		mes "shortly after the end";
+		mes "of the development eh?";
+		next;
 		mes "[N. A]";
-		mes "Aha, how self-confident you";
-		mes "are! However, I see people with";
-		mes "such self-confidence everywhere.";
-		mes "You'll need to prove it...";
-		mes "But how... Hmm...";
+		mes "^ff0000Butcher^000000 is the newest development";
+		mes "by us, the Einbroch Firearm Lab.";
+		mes "It is the newest type of Gatling";
+		mes "we have developed. While";
+		mes "^ff0000Drifter^000000 is a good weapon";
+		mes "as well, the ^ff0000Butcher^000000 definitely has";
+		mes "a much stronger firepower!";
 		next;
 		mes "[N. A]";
-		mes "Hmmm......";
+		mes "Due to its strong firepower,";
+		mes "the Butcher was also dubbed";
+		mes "as the 'Murderer'.";
 		next;
 		mes "[N. A]";
-		mes "Aha! I got it!";
+		mes "However, even Gunslingers could";
+		mes "have troubles controlling such";
+		mes "a powerful weapon.";
 		next;
 		mes "[N. A]";
-		mes "Here, bring me ^ff00001000 Orc Claws^000000 and ^ff00001000 Skel Bone^000000.";
-		mes "If you can bring me these items,";
-		mes "I'll let you use the Butcher.";
+		mes "Do you think you can handle it?";
 		next;
+		if(select("I'm not sure...:Of course I can!!") == 1){
+			mes "[N. A]";
+			mes "The ^ff0000Butcher^000000 is a weapon that you";
+			mes "can't handle without a strong";
+			mes "will. I'll see you again when";
+			mes "you have enough confidence to";
+			mes "handle this monster.";
+			close;
+		}else{
+			mes "[N. A]";
+			mes "Aha, how self-confident you";
+			mes "are! However, I see people with";
+			mes "such self-confidence everywhere.";
+			mes "You'll need to prove it...";
+			mes "But how... Hmm...";
+			next;
+			mes "[N. A]";
+			mes "Hmmm......";
+			next;
+			mes "[N. A]";
+			mes "Aha! I got it!";
+			next;
+			mes "[N. A]";
+			mes "Here, bring me ^ff00001000 Orc Claws^000000 and ^ff00001000 Skel Bone^000000.";
+			mes "If you can bring me these items,";
+			mes "I'll let you use the Butcher.";
+			next;
+			mes "[N. A]";
+			mes "Easy, ain't it? Go and prove";
+			mes "your ability then! Heheheh...";
+			set gun_na,1;
+			close;
+		}
+	case 2:
 		mes "[N. A]";
-		mes "Easy, ain't it? Go and prove";
-		mes "your ability then! Heheheh...";
-		set gun_na,1;
-		close;
-	}
-
-L_DRIFTER:
-	mes "[N. A]";
-	mes "Ah, you're here to learn about";
-	mes "the ^ff0000Drifter^000000 eh?";
-	next;
-	mes "[N. A]";
-	mes "The ^ff0000Drifter^000000 is one of the many";
-	mes "highest-classed weapons developed";
-	mes "by Lady Celena. It's an automatic";
-	mes "Gatling which boasts very high";
-	mes "rate of fire, which is the highest";
-	mes "among all Gunslinger weapons.";
-	next;
-	mes "[N. A]";
-	mes "Of course, you will need the Skill";
-	mes "to allow you to control Gatlings,";
-	mes "but he who contorls Gatlings well";
-	mes "will receive full aid from the";
-	mes "^ff0000Drifter^000000.";
-	next;
-	mes "[N. A]";
-	mes "Do you want to try using the ^ff0000Drifter^000000?";
-	next;
-	if(select("Um, no.:Yeah!") == 1){
+		mes "Ah, you're here to learn about";
+		mes "the ^ff0000Drifter^000000 eh?";
+		next;
 		mes "[N. A]";
-		mes "If you want to try it out";
-		mes "some time, come back here.";
-		close;
-	}else{
-		set gun_na,10;
+		mes "The ^ff0000Drifter^000000 is one of the many";
+		mes "highest-classed weapons developed";
+		mes "by Lady Celena. It's an automatic";
+		mes "Gatling which boasts very high";
+		mes "rate of fire, which is the highest";
+		mes "among all Gunslinger weapons.";
+		next;
 		mes "[N. A]";
-		mes "Since it's really hard to find";
-		mes "the materials for constructing";
-		mes "the ^ff0000Drifter^000000, we only make them";
-		mes "on requests, and we require those";
-		mes "who want to use the ^ff0000Drifter^000000 to bring";
-		mes "us the materials.";
+		mes "Of course, you will need the Skill";
+		mes "to allow you to control Gatlings,";
+		mes "but he who contorls Gatlings well";
+		mes "will receive full aid from the";
+		mes "^ff0000Drifter^000000.";
 		next;
 		mes "[N. A]";
-		mes "I'll tell you the materials";
-		mes "needed, just bring them and";
-		mes "we'll construct it for you.";
+		mes "Do you want to try using the ^ff0000Drifter^000000?";
 		next;
+		if(select("Um, no.:Yeah!") == 1){
+			mes "[N. A]";
+			mes "If you want to try it out";
+			mes "some time, come back here.";
+			close;
+		}else{
+			set gun_na,10;
+			mes "[N. A]";
+			mes "Since it's really hard to find";
+			mes "the materials for constructing";
+			mes "the ^ff0000Drifter^000000, we only make them";
+			mes "on requests, and we require those";
+			mes "who want to use the ^ff0000Drifter^000000 to bring";
+			mes "us the materials.";
+			next;
+			mes "[N. A]";
+			mes "I'll tell you the materials";
+			mes "needed, just bring them and";
+			mes "we'll construct it for you.";
+			next;
+			mes "[N. A]";
+			mes "To make a Drifter, we need";
+			mes "70 Steel, 5 Eluniums, 3";
+			mes "Oridecons, 70 Coal, 50 Rusty";
+			mes "Screws, and a fee of";
+			mes "50,000 zeny.";
+			mes "Come back after you found";
+			mes "them all.";
+			close;
+		}
+	case 3:
 		mes "[N. A]";
-		mes "To make a Drifter, we need";
-		mes "70 Steel, 5 Eluniums, 3";
-		mes "Oridecons, 70 Coal, 50 Rusty";
-		mes "Screws, and a fee of";
-		mes "50,000 zeny.";
-		mes "Come back after you found";
-		mes "them all.";
+		mes "I have news on the latest";
+		mes "weapons but... I guess you're";
+		mes "too busy to hear them.";
+		mes "Maybe next time I guess.";
 		close;
 	}
-
-L_MORE:
-	mes "[N. A]";
-	mes "Eh? What? Am I the only";
-	mes "person who can't see them?";
-	mes "Bring me more!";
-	close;
 }
 
-lighthalzen,205,284,6	script	F. Harrison	85,{
+lighthalzen,205,284,6	script	F. Harrison	4_M_03,{
 
 	if (gun_na == 100){
 		if(checkweight(13102,1) == 0){
@@ -1415,7 +1399,7 @@ lighthalzen,205,284,6	script	F. Harrison	85,{
 		mes "[F. Harrison]";
 		mes "Heheh... Hmm... Huh...?";
 		next;
-		menu "May I have my Butcher back now?",-;
+		select("May I have my Butcher back now?");
 		mes "[F. Harrison]";
 		mes "Uh? Oh, umm... Heheh...";
 		next;
@@ -1555,7 +1539,17 @@ lighthalzen,205,284,6	script	F. Harrison	85,{
 		close;
 	}
 	else if(gun_na == 0){
-		if(BaseJob != Job_Gunslinger) goto L_BORED;
+		if(BaseJob != Job_Gunslinger) {
+			mes "[F. Harrison]";
+			mes "Man, I'm so bored...";
+			mes "I wonder if there's anything";
+			mes "interesting...";
+			next;
+			mes "[F. Harrison]";
+			mes "Oh well... I'll just play with my";
+			mes "beautiful 'Crimson Bolt'.";
+			close;
+		}
 		if(BaseLevel > 67 && countitem(13158) > 0){
 			mes "[F. Harrison]";
 			mes "Man, I'm so bored...";
@@ -1599,15 +1593,4 @@ lighthalzen,205,284,6	script	F. Harrison	85,{
 			close;
 		}
 	}
-
-L_BORED:
-	mes "[F. Harrison]";
-	mes "Man, I'm so bored...";
-	mes "I wonder if there's anything";
-	mes "interesting...";
-	next;
-	mes "[F. Harrison]";
-	mes "Oh well... I'll just play with my";
-	mes "beautiful 'Crimson Bolt'.";
-	close;
 }
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index 5f92a4829..27d5e22cb 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -4,21 +4,19 @@
 //= kobra_k88
 //===== Current Version: =====================================
 //= 2.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Learn where to turn apples, bananas, carrots, and grapes
 //= into juice.
 //= Condition if done: (MISC_QUEST & 1)
 //===== Additional Comments: =================================
 //= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Added tracking variables in, which are unset when complete.
+//=     Added tracking variables in, which are unset when complete.
 //= 2.0 Added missing checkweight. [L0ne_W0lf]
 //= 2.1 Fixed dialog for if your missing the needed items (He always said the dialog for grape juice). [Kisuka]
 //============================================================
 
-prt_in,49,172,3	script	Marianne#juice	53,{
+prt_in,49,172,3	script	Marianne#juice	1_M_INNKEEPER,{
 	if (MISC_QUEST&1 || morison_meat == 15) {
 		mes "[Housewife Marianne]";
 		mes "Whew...!";
@@ -79,7 +77,7 @@ prt_in,49,172,3	script	Marianne#juice	53,{
 	close;
 }
 
-prt_in,47,173,3	script	Morrison#juice	97,{
+prt_in,47,173,3	script	Morrison#juice	4W_M_01,{
 	if (MISC_QUEST&1 || morison_meat == 15) {
 		mes "[Little Morrison]";
 		mes "Bleh... Forget it.";
@@ -169,7 +167,7 @@ prt_in,47,173,3	script	Morrison#juice	97,{
 	close;
 }
 
-payon_in03,188,146,5	script	Marx Hansen#juice	86,{
+payon_in03,188,146,5	script	Marx Hansen#juice	4_M_04,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
@@ -271,7 +269,7 @@ payon_in03,188,146,5	script	Marx Hansen#juice	86,{
 			}
 			delitem .@fruit,.@make;
 			delitem 713,.@make;
-			set zeny,zeny-.@total_zeny;
+			Zeny -= .@total_zeny;
 			getitem .@juice,.@make;
 
 			mes "[Merchant Marx Hansen]";
@@ -336,17 +334,17 @@ payon_in03,188,146,5	script	Marx Hansen#juice	86,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 fixed input number check [Lupus]
 //= 1.2 fixed misplaced Grape<->Carrot juices [Lupus]
 //= 1.3 added a loopless menu 'as many as possible' [Lupus]
 //= 1.3a Turned the juice making part of the Juicer npc into a
-//= subfunc.  Changed fruit amount needed to 1.[kobra_k88]
-//= Fixed exploits [Lupus]
+//=     subfunc.  Changed fruit amount needed to 1.[kobra_k88]
+//=     Fixed exploits [Lupus]
 //= 1.6 fixed typo (where did @ipnut came from?) [Lance]
 //= 1.8 got rid of vars: 'MEAT',"MARIANNE","MORRISON"
-//= 	From now, all common quests start using bits of the
-//=	same variable MISC_QUEST [Lupus]
-//============================================================ 
+//=     From now, all common quests start using bits of the
+//=     same variable MISC_QUEST [Lupus]
+//============================================================
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index 3f5a3ddf5..29ea57cf8 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -3,12 +3,10 @@
 //===== By: ==================================================
 //= L0ne_W0lf (Script), DZeroX (Timer)
 //===== Current Version: =====================================
-//= 4.6
-//===== Compatible With: =====================================
-//= Hercules
+//= 4.7
 //===== Description: =========================================
 //= Quest for opening Robot Factory first and second floors.
-//===== Comments: ============================================
+//===== Additional Comments: =================================
 //= 4.0 A whole bunch-a-updates to various npcs. [L0ne_W0lf]
 //=     Corrected condition checks throughout the quest.
 //=     Npcs no longer make use of the goto command.
@@ -31,7 +29,8 @@
 //= 4.4 Updated reviecer and robots NPC to use mobcount. (bugreport:2380) [L0ne_W0lf]
 //= 4.5 Removed a delitem that was no logner needed. [L0en_W0lf]
 //= 4.6 Fixed impossible condition for security guard. [L0ne_W0lf]
-//============================================================ 
+//= 4.7 Updated RE/Pre-RE EXP. [Euphy]
+//============================================================
 
 //============================================================================
 // Kiel Hyre Quest/Robotic Lab Dungeon
@@ -43,7 +42,7 @@
 //----------------------------------------------------------------------------
 // [Notes]
 //  - Let it be noted that ALL DIALOG IS OFFICIAL TO IRO UNLESS SPECIFIED.
-//  - I've fixed a few of iRO's mistakes, but I'm sure I made some of my own. 
+//  - I've fixed a few of iRO's mistakes, but I'm sure I made some of my own.
 //  - Will probably require a major optimizing.
 //  - Not going to list ALL of the more usless NPCs. (Doors + Empty "Beautiful Ladies")
 //  - Parties are *NOT REQUIRED* as per Doddler's Wiki information.
@@ -64,9 +63,9 @@
 // [Variables in Use]
 //  KielHyreQuest 	- Main quest tracking variable (Quest finished at 106)
 //
-//  KHToastGirlEnd	- Pick up delivery if set to 1, 
+//  KHToastGirlEnd	- Pick up delivery if set to 1,
 //			- picked up delivery if set to 2
-//			- finished if set to 3 
+//			- finished if set to 3
 //			- Deleted once no longer needed.
 //
 //  KHCottagePoem1	- Tracks Poem 1 quest in cottage. (finished = 5)
@@ -217,7 +216,7 @@
 //----------------------------------------------------------------------------
 // Juno Pub Master/Starting point.
 //----------------------------------------------------------------------------
-yuno_in01,35,179,4	script	Pub Master#kh	46,5,5,{
+yuno_in01,35,179,4	script	Pub Master#kh	1_ETC_01,5,5,{
 	if (checkweight(7487,1) == 0) {
 		mes "[Vandt]";
 		mes "Just a second! You're";
@@ -413,7 +412,7 @@ yuno_in01,35,179,4	script	Pub Master#kh	46,5,5,{
 			mes "Thank you so much";
 			mes "for helping me out~";
 			getitem 7487,1; //Tavern_Wine
-			set zeny,zeny+1000;
+			Zeny += 1000;
 			close;
 		}
 		else {
@@ -448,14 +447,14 @@ OnTouch:
 		mes "What am I suposed to do?";
 		set KielHyreQuest,1;
 		close;
-	} 
+	}
 }
 
 //----------------------------------------------------------------------------
 // Juno Toast Sales Girl.
 //----------------------------------------------------------------------------
-yuno,217,114,6	script	Little Kid#kh	96,{
-	mes "[Cezu]"; 
+yuno,217,114,6	script	Little Kid#kh	4W_KID,{
+	mes "[Cezu]";
 	if (KielHyreQuest < 6) {
 		mes "Fresh, crunchy toast!";
 		mes "If you want some, come";
@@ -472,7 +471,7 @@ yuno,217,114,6	script	Little Kid#kh	96,{
 			next;
 			switch(select("I'm here for Elly:No, thanks")) {
 			case 1:
-				mes "[Cezu]"; 
+				mes "[Cezu]";
 				mes "Oh, I see. Elly must have";
 				mes "wasted another batch of";
 				mes "ingredients again. Well,";
@@ -480,7 +479,7 @@ yuno,217,114,6	script	Little Kid#kh	96,{
 				mes "so I really want to help, but";
 				mes "I can't really do anything.";
 				next;
-				mes "[Cezu]"; 
+				mes "[Cezu]";
 				mes "You see, I just ran";
 				mes "out of ingredients too!";
 				mes "But I can't really leave";
@@ -488,7 +487,7 @@ yuno,217,114,6	script	Little Kid#kh	96,{
 				mes "people need to buy toast?";
 				mes "Listen, can you help me out?";
 				next;
-				mes "[Cezu]"; 
+				mes "[Cezu]";
 				mes "Would you please go get";
 				mes "some flour and eggs for me";
 				mes "from the ^3355FFLighthalzen Windmill^000000";
@@ -496,7 +495,7 @@ yuno,217,114,6	script	Little Kid#kh	96,{
 				mes "divide the ingredients, and you";
 				mes "can deliver some to Elly.";
 				next;
-				mes "[Cezu]"; 
+				mes "[Cezu]";
 				mes "I know that I'm basically";
 				mes "making you do everything";
 				mes "on your own, but please try";
@@ -545,7 +544,7 @@ yuno,217,114,6	script	Little Kid#kh	96,{
 //----------------------------------------------------------------------------
 // Lighthalzen WindMill Owner.
 //----------------------------------------------------------------------------
-lighthalzen,366,299,4	script	Windmill Owner#kh	46,{
+lighthalzen,366,299,4	script	Windmill Owner#kh	1_ETC_01,{
 	if (checkweight(7488,1) == 0) {
 		mes "[Mills]";
 		mes "Hey, you've got too much";
@@ -617,7 +616,7 @@ lighthalzen,366,299,4	script	Windmill Owner#kh	46,{
 	}
 }
 
-lighthalzen,366,289,2	script	Windmill Owner's Helper	97,{
+lighthalzen,366,289,2	script	Windmill Owner's Helper	4W_M_01,{
 	if (KHToastGirlEnd < 1) {
 		mes "[Cutz]";
 		mes "Man, why are we";
@@ -653,7 +652,7 @@ lighthalzen,366,289,2	script	Windmill Owner's Helper	97,{
 //----------------------------------------------------------------------------
 // Girl (Talks about the academy)
 //----------------------------------------------------------------------------
-yuno_fild08,196,196,5	script	Hanie#kh1	102,{
+yuno_fild08,196,196,5	script	Hanie#kh1	8_F,{
 	mes "[Hanie]";
 	mes "Oh, I wish I could study";
 	mes "at the Kiel Hyre Academy...";
@@ -684,8 +683,8 @@ yuno_fild08,196,196,5	script	Hanie#kh1	102,{
 //----------------------------------------------------------------------------
 // Academy Security Guards
 //----------------------------------------------------------------------------
-yuno_fild08,158,194,6	script	Security Guard#1::KHAGuard	852,{
-	if ((KielHyreQuest < 2) || (KielHyreQuest > 31)) { 
+yuno_fild08,158,194,6	script	Security Guard#1::KHAGuard	4_M_EIN_SOLDIER,{
+	if ((KielHyreQuest < 2) || (KielHyreQuest > 31)) {
 		mes "[Security Guard]";
 		mes "I'm sorry, but if you aren't";
 		mes "associated with this institution,";
@@ -695,7 +694,7 @@ yuno_fild08,158,194,6	script	Security Guard#1::KHAGuard	852,{
 		mes "an appointment with the staff.";
 		close;
 	}
-	else if (KielHyreQuest == 2) { 
+	else if (KielHyreQuest == 2) {
 		mes "[Security Guard]";
 		mes "I'm sorry, but if you aren't";
 		mes "associated with this institution,";
@@ -780,7 +779,7 @@ yuno_fild08,158,194,6	script	Security Guard#1::KHAGuard	852,{
 			close;
 		}
 	}
-	else if (KielHyreQuest < 32) { 
+	else if (KielHyreQuest < 32) {
 		mes "[Security Guard]";
 		mes "Oh, did you have";
 		mes "other business inside";
@@ -794,12 +793,12 @@ yuno_fild08,158,194,6	script	Security Guard#1::KHAGuard	852,{
 	}
 }
 
-yuno_fild08,158,183,7	duplicate(KHAGuard)	Security Guard#2	852
+yuno_fild08,158,183,7	duplicate(KHAGuard)	Security Guard#2	4_M_EIN_SOLDIER
 
 //----------------------------------------------------------------------------
 // Gossiping Teenagers/Story NPCs
 //----------------------------------------------------------------------------
-kh_school,57,142,6	script	Student#kha	893,3,3,{
+kh_school,57,142,6	script	Student#kha	4_F_HUWOMAN,3,3,{
 	mes "[Laci]";
 	mes "Oh, wow! We usually";
 	mes "don't get visitors on";
@@ -833,7 +832,7 @@ OnTouch:
 	close;
 }
 
-kh_school,57,139,0	script	Student#khb	893,{
+kh_school,57,139,0	script	Student#khb	4_F_HUWOMAN,{
 	mes "[Gui Nesha]";
 	mes "Aren't we a little";
 	mes "old to be talking about";
@@ -848,7 +847,7 @@ kh_school,57,139,0	script	Student#khb	893,{
 //----------------------------------------------------------------------------
 // Mrs. Lecollane
 //----------------------------------------------------------------------------
-kh_school,176,60,4	script	Lady#kh	101,{
+kh_school,176,60,4	script	Lady#kh	4W_F_01,{
 	if (KielHyreQuest < 2) {
 		mes "[Mrs. Lecollane]";
 		mes "Is there a problem?";
@@ -856,7 +855,7 @@ kh_school,176,60,4	script	Lady#kh	101,{
 		mes "in here, please leave.";
 		close;
 	}
-	else if (KielHyreQuest == 2) { 
+	else if (KielHyreQuest == 2) {
 		mes "[Mrs. Lecollane]";
 		mes "Oh, hello. Ah!";
 		mes "have you come to";
@@ -929,7 +928,7 @@ kh_school,176,60,4	script	Lady#kh	101,{
 //----------------------------------------------------------------------------
 // Elly (In school)
 //----------------------------------------------------------------------------
-kh_school,179,39,0	script	Cute Student#kh	895,{
+kh_school,179,39,0	script	Cute Student#kh	4_F_KHELLY,{
 	if (checkweight(908,200) == 0) {
 		mes "[Elly]";
 		mes "I'm sorry, but would you";
@@ -941,7 +940,7 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 		close;
 	}
 	cutin "kh_elly01",2;
-	if (KielHyreQuest < 4) { 
+	if (KielHyreQuest < 4) {
 		cutin "kh_elly03",2;
 		mes "[Elly]";
 		mes "W-wah! Oh...!";
@@ -950,7 +949,7 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 		mes "again! Why do I have so much";
 		mes "trouble handling ingredients?";
 	}
-	else if (KielHyreQuest == 4) { 
+	else if (KielHyreQuest == 4) {
 		cutin "kh_elly03",2;
 		mes "[Elly]";
 		mes "Oh no, what should";
@@ -977,7 +976,7 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 				mes "Thank you! Thanks so much!";
 				next;
 				break;
-			Case 2:
+			case 2:
 				mes "[Elly]";
 				mes "Wait, you don't go";
 				mes "to this school, don't";
@@ -1474,9 +1473,9 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 }
 
 //----------------------------------------------------------------------------
-// Elly's Window 
+// Elly's Window
 //----------------------------------------------------------------------------
-yuno_fild08,69,185,0	script	Window#kh	111,{
+yuno_fild08,69,185,0	script	Window#kh	HIDDEN_NPC,{
 	if (KielHyreQuest < 29) {
 		mes "^3355FFYou can see a curtain";
 		mes "decorated with a cute";
@@ -1542,7 +1541,7 @@ yuno_fild08,69,185,0	script	Window#kh	111,{
 //----------------------------------------------------------------------------
 // Elly (In Dormitory)
 //----------------------------------------------------------------------------
-kh_school,178,180,4	script	Elly	895,{
+kh_school,178,180,4	script	Elly	4_F_KHELLY,{
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -1721,7 +1720,7 @@ kh_school,178,180,4	script	Elly	895,{
 //----------------------------------------------------------------------------
 // Cookie Basket
 //----------------------------------------------------------------------------
-kh_school,175,176,0	script	Cookie Basket#kh	111,{
+kh_school,175,176,0	script	Cookie Basket#kh	HIDDEN_NPC,{
 	if (KielHyreQuest < 30) {
 		mes "^3355FFIt's a cookie";
 		mes "basket filled with";
@@ -1831,7 +1830,7 @@ kh_school,175,176,0	script	Cookie Basket#kh	111,{
 //----------------------------------------------------------------------------
 // Elly's Window (In Dormitory)
 //----------------------------------------------------------------------------
-kh_school,188,185,0	script	Window#kh2	111,{
+kh_school,188,185,0	script	Window#kh2	HIDDEN_NPC,{
 	warp "yuno_fild08",69,183;
 	end;
 }
@@ -1839,7 +1838,7 @@ kh_school,188,185,0	script	Window#kh2	111,{
 //----------------------------------------------------------------------------
 // Grave/Kiel Hyre dungeon entry
 //----------------------------------------------------------------------------
-yuno_fild08,71,170,0	script	Grave#kh	111,{
+yuno_fild08,71,170,0	script	Grave#kh	HIDDEN_NPC,{
 	if (KielHyreQuest < 36) {
 		mes "^3355FFIt's just a grave.";
 		mes "It might be important";
@@ -1959,15 +1958,13 @@ yuno_fild08,71,170,0	script	Grave#kh	111,{
 }
 
 //============================================================================
-
-//============================================================================
 //Kiel Hyre Cottage NPCs
 //============================================================================
 
 //----------------------------------------------------------------------------
 // Cottage Keeper
 //----------------------------------------------------------------------------
-yuno_fild02,93,210,4	script	Cottage Keeper#kh	85,{
+yuno_fild02,93,210,4	script	Cottage Keeper#kh	4_M_03,{
 	if ((KielHyreQuest < 12) || (KielHyreQuest > 12)) {
 		mes "[Cottage Keeper]";
 		mes "This is private property,";
@@ -2018,7 +2015,7 @@ yuno_fild02,93,210,4	script	Cottage Keeper#kh	85,{
 //----------------------------------------------------------------------------
 // Cottage Door (left)
 //----------------------------------------------------------------------------
-yuno_fild02,75,218,0	script	Door#kh2	111,{
+yuno_fild02,75,218,0	script	Door#kh2	HIDDEN_NPC,{
 	if (KielHyreQuest < 16) {
 		mes "^3355FFThis door is locked.";
 		mes "If someone inside won't";
@@ -2072,7 +2069,7 @@ yuno_fild02,75,218,0	script	Door#kh2	111,{
 //----------------------------------------------------------------------------
 // Cottage Door (Right)
 //----------------------------------------------------------------------------
-yuno_fild02,109,218,0	script	Door#kh1	111,{
+yuno_fild02,109,218,0	script	Door#kh1	HIDDEN_NPC,{
 	if (KielHyreQuest != 16) {
 		mes "^3355FFThis door is locked.";
 		mes "If someone inside won't";
@@ -2105,7 +2102,7 @@ yuno_fild02,109,218,0	script	Door#kh1	111,{
 //----------------------------------------------------------------------------
 // Store room interior; Wall
 //----------------------------------------------------------------------------
-kh_vila,191,14,0	script	Wall#kh	139,1,1,{
+kh_vila,191,14,0	script	Wall#kh	HIDDEN_WARP_NPC,1,1,{
 	if (KielHyreQuest < 28) {
 		mes "^3355FFIt's just a wall.";
 		mes "It's not particularly";
@@ -2125,16 +2122,12 @@ kh_vila,191,14,0	script	Wall#kh	139,1,1,{
 			close;
 		}
 	}
-
-OnOpenDoor:
-	misceffect 316;
-	end;
 }
 
 //----------------------------------------------------------------------------
 // Store room interior; books
 //----------------------------------------------------------------------------
-kh_vila,184,20,0	script	Book#kh1::BookKHQ1	111,{
+kh_vila,184,20,0	script	Book#kh1::BookKHQ1	HIDDEN_NPC,{
 	if (KielHyreQuest != 26) {
 		mes "^3355FFThis bookshelf is^000000";
 		mes "^3355FFcrammed with many^000000";
@@ -2149,8 +2142,8 @@ kh_vila,184,20,0	script	Book#kh1::BookKHQ1	111,{
 			mes "pull it towards you, the";
 			mes "wall slides opens open";
 			mes "to reveal a secret path.^000000";
-			donpcevent "Wall#kh::OnOpenDoor";
 			set KielHyreQuest,28;
+			specialeffect EF_READYPORTAL2,AREA,"Wall#kh";
 			close;
 		}
 		else {
@@ -2163,12 +2156,9 @@ kh_vila,184,20,0	script	Book#kh1::BookKHQ1	111,{
 	}
 
 }
-
-kh_vila,181,20,0	duplicate(BookKHQ1)	Book#kh2	111
-
-kh_vila,178,20,0	duplicate(BookKHQ1)	Book#kh3	111
-
-kh_vila,175,19,0	duplicate(BookKHQ1)	Book#kh4	111
+kh_vila,181,20,0	duplicate(BookKHQ1)	Book#kh2	HIDDEN_NPC
+kh_vila,178,20,0	duplicate(BookKHQ1)	Book#kh3	HIDDEN_NPC
+kh_vila,175,19,0	duplicate(BookKHQ1)	Book#kh4	HIDDEN_NPC
 
 //----------------------------------------------------------------------------
 // Store room interior; Letter to Elly on the floor.
@@ -2194,18 +2184,17 @@ OnTouch:
 		getitem 7490,1; //Kyll_Hire_Letter
 		set KielHyreQuest,20;
 		close;
-	} 
-	else{
+	} else {
 		mes "^3355FFYou entered the room.^000000";
 		close;
 	}
-	end; 
+	end;
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, kitchen; Box (Pet Food vending machine)
 //----------------------------------------------------------------------------
-kh_vila,16,175,0	script	Box#khp1	111,{
+kh_vila,16,175,0	script	Box#khp1	HIDDEN_NPC,{
 	mes "^FFFFFF##^000000*Tasty-Nutricious-Delicious*";
 	mes "*Cute Pet Doof Vending Machine*";
 	mes "The best food for your Cute Pets";
@@ -2216,7 +2205,7 @@ kh_vila,16,175,0	script	Box#khp1	111,{
 	next;
 	switch(select("Buy!:Cancel")) {
 	case 1:
-		if (zeny < 1100) {
+		if (Zeny < 1100) {
 			mes "^3355FFUnfortunately, you";
 			mes "don't have enough";
 			mes "zeny to insert into";
@@ -2236,7 +2225,7 @@ kh_vila,16,175,0	script	Box#khp1	111,{
 			mes "special about it";
 			mes "at all! It's just";
 			mes "normal Pet Food!";
-			set zeny,zeny-1100;
+			Zeny -= 1100;
 			getitem 537,1;	//Pet_Food
 			close;
 		}
@@ -2251,7 +2240,7 @@ kh_vila,16,175,0	script	Box#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, kitchen; Apple Box (Useless?)
 //----------------------------------------------------------------------------
-kh_vila,30,184,0	script	Apple Box#khp1	111,{
+kh_vila,30,184,0	script	Apple Box#khp1	HIDDEN_NPC,{
 	mes "^3355FFYou find a box filled with";
 	mes "ripe, delicious apples.^000000";
 	next;
@@ -2268,7 +2257,7 @@ kh_vila,30,184,0	script	Apple Box#khp1	111,{
 		mes "prevented you from";
 		mes "taking the box.^000000";
 		close;
-	case 2: 
+	case 2:
 		mes "^3355FFSomething is wrong";
 		mes "with this box of apples.^000000";
 		close;
@@ -2278,7 +2267,7 @@ kh_vila,30,184,0	script	Apple Box#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, dining room; Map
 //----------------------------------------------------------------------------
-kh_vila,44,126,0	script	Map#khp1	111,{
+kh_vila,44,126,0	script	Map#khp1	HIDDEN_NPC,{
 	if ((KHCottagePoem1 < 2) && (KielHyreQuest < 30)) {
 		mes "^3355FFA magnificent world map,";
 		mes "detailing the Rune-Midgarts";
@@ -2392,7 +2381,7 @@ kh_vila,44,126,0	script	Map#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, kitchen; Pot
 //----------------------------------------------------------------------------
-kh_vila,33,184,0	script	Pot#khp1	111,{
+kh_vila,33,184,0	script	Pot#khp1	HIDDEN_NPC,{
 	if (KHCottagePoem1 < 1) {
 		mes "^3355FFYou've found a pot";
 		mes "filled with boiling,";
@@ -2434,7 +2423,7 @@ kh_vila,33,184,0	script	Pot#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, fire place; Calabash
 //----------------------------------------------------------------------------
-kh_vila,14,55,0	script	Calabash#khp1	111,{
+kh_vila,14,55,0	script	Calabash#khp1	HIDDEN_NPC,{
 	if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
 		if (checkweight(7329,1) == 0) {
 			mes "^3355FFThat's a nice looking";
@@ -2488,7 +2477,7 @@ kh_vila,14,55,0	script	Calabash#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, garden; Pool
 //----------------------------------------------------------------------------
-kh_vila,39,41,0	script	Pool#khp1	111,{
+kh_vila,39,41,0	script	Pool#khp1	HIDDEN_NPC,{
 	if ((KHCottagePoem1 < 3) && (KielHyreQuest < 30)) {
 		mes "^3355FFYou find a fancy pool";
 		mes "filled with fresh water.^000000";
@@ -2570,7 +2559,7 @@ kh_vila,39,41,0	script	Pool#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Vicious Dog
 //----------------------------------------------------------------------------
-kh_vila,181,178,4	script	Vicious Dog#khp1	81,7,3,{
+kh_vila,181,178,4	script	Vicious Dog#khp1	4_DOG01,7,3,{
 //OnTouch2:
 OnTouch:
 	mes "*Grrr~*";
@@ -2635,7 +2624,7 @@ OnTouch:
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Drawer, first room nightstand
 //----------------------------------------------------------------------------
-kh_vila,115,186,0	script	Drawer#khp1	111,{
+kh_vila,115,186,0	script	Drawer#khp1	HIDDEN_NPC,{
 	if (checkweight(7492,1) == 0) {
 		mes "^3355FFThere's something inside";
 		mes "this drawer, but you can't";
@@ -2679,7 +2668,7 @@ kh_vila,115,186,0	script	Drawer#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Box
 //----------------------------------------------------------------------------
-kh_vila,107,126,0	script	Box#khp2	111,{
+kh_vila,107,126,0	script	Box#khp2	HIDDEN_NPC,{
 	if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
 		mes "^3355FFA solid box is laid";
 		mes "on the floor in which";
@@ -2726,7 +2715,7 @@ kh_vila,107,126,0	script	Box#khp2	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Bookshelf.
 //----------------------------------------------------------------------------
-kh_vila,181,138,0	script	Bookshelf#khp1	111,{
+kh_vila,181,138,0	script	Bookshelf#khp1	HIDDEN_NPC,{
 	if ((countitem(7491) < 1) && (countitem(7329) >= 1) || (countitem(7516) >= 1)) {
 		mes "^3355FFOne of the books on";
 		mes "this crammed bookshelf";
@@ -2836,7 +2825,7 @@ kh_vila,181,138,0	script	Bookshelf#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Desk
 //----------------------------------------------------------------------------
-kh_vila,118,144,0	script	Desk#khp1	111,{
+kh_vila,118,144,0	script	Desk#khp1	HIDDEN_NPC,{
 	if (KHCottagePoem2 < 1) {
 		mes "^3355FFThere are piles of papers";
 		mes "and books stacked on top";
@@ -2871,7 +2860,7 @@ kh_vila,118,144,0	script	Desk#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Medicine Chest
 //----------------------------------------------------------------------------
-kh_vila,123,170,0	script	Medicine Chest#khp1	111,{
+kh_vila,123,170,0	script	Medicine Chest#khp1	HIDDEN_NPC,{
 	if ((KHCottagePoem2 < 1) && (KielHyreQuest < 30)) {
 		mes "^3355FFThis medicine cabinet";
 		mes "is filled with bottles of";
@@ -3017,7 +3006,7 @@ kh_vila,123,170,0	script	Medicine Chest#khp1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, stair case; Sword hilt
 //----------------------------------------------------------------------------
-kh_vila,136,68,0	script	Sword Hilt#kh	111,{
+kh_vila,136,68,0	script	Sword Hilt#kh	HIDDEN_NPC,{
 	if ((KHCottagePoem1 < 3) || (KHCottagePoem2 < 2) && (KielHyreQuest < 30)) {
 		mes "^3355FFThere are four elaborately";
 		mes "designed swords positioned";
@@ -3158,7 +3147,7 @@ kh_vila,136,68,0	script	Sword Hilt#kh	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, Secret Room; left test tube
 //----------------------------------------------------------------------------
-kh_vila,179,68,0	script	Test Tube#khp2	111,{
+kh_vila,179,68,0	script	Test Tube#khp2	HIDDEN_NPC,{
 	mes "^3355FFThis test tube contains";
 	mes "a young man dressed in";
 	mes "a Kiel Hyre Academy";
@@ -3172,7 +3161,7 @@ kh_vila,179,68,0	script	Test Tube#khp2	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, Secret Room; Right test tube
 //----------------------------------------------------------------------------
-kh_vila,185,68,0	script	Test Tube::TestTubeKHQ2	111,{
+kh_vila,185,68,0	script	Test Tube::TestTubeKHQ2	HIDDEN_NPC,{
 	if (KielHyreQuest > 28) {
 		mes "^3355FFA strange looking,";
 		mes "wizened old man is";
@@ -3254,15 +3243,13 @@ kh_vila,185,68,0	script	Test Tube::TestTubeKHQ2	111,{
 }
 
 //============================================================================
-
-//============================================================================
 // Robot Factory NPCs
 //============================================================================
 
 //----------------------------------------------------------------------------
 // Robotic's Factory; Heavy Door
 //----------------------------------------------------------------------------
-kh_dun01,235,48,0	script	Heavy Door#kh1::HeavyDoorKHQ1	111,{
+kh_dun01,235,48,0	script	Heavy Door#kh1::HeavyDoorKHQ1	HIDDEN_NPC,{
 	if (KielHyreQuest < 38) {
 		mes "^3355FFThere is a large, heavy";
 		mes "door infront of you.^000000";
@@ -3324,7 +3311,7 @@ kh_dun01,235,48,0	script	Heavy Door#kh1::HeavyDoorKHQ1	111,{
 //----------------------------------------------------------------------------
 // Robotic's Factory; Heavy Door (These doors don't seem to serve any purpose)
 //----------------------------------------------------------------------------
-kh_dun01,76,233,0	script	Heavy Door::HeavyDoorKHQ2	111,{
+kh_dun01,76,233,0	script	Heavy Door::HeavyDoorKHQ2	HIDDEN_NPC,{
 	if ((KielHyreQuest >= 38) && (KielHyreQuest < 46)) {
 		mes "^3355FFThere is a large, heavy";
 		mes "door infront of you.^000000";
@@ -3352,20 +3339,20 @@ kh_dun01,76,233,0	script	Heavy Door::HeavyDoorKHQ2	111,{
 	}
 }
 
-kh_dun01,106,233,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh3	111
-kh_dun01,6,164,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh4	111
-kh_dun01,6,133,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh5	111
-kh_dun01,6,60,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh6	111
-kh_dun01,6,30,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh7	111
-kh_dun01,6,18,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh8	111
-kh_dun01,235,70,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh9	111
-kh_dun01,235,92,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh10	111
-kh_dun01,235,114,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh11	111
+kh_dun01,106,233,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh3	HIDDEN_NPC
+kh_dun01,6,164,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh4	HIDDEN_NPC
+kh_dun01,6,133,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh5	HIDDEN_NPC
+kh_dun01,6,60,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh6	HIDDEN_NPC
+kh_dun01,6,30,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh7	HIDDEN_NPC
+kh_dun01,6,18,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh8	HIDDEN_NPC
+kh_dun01,235,70,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh9	HIDDEN_NPC
+kh_dun01,235,92,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh10	HIDDEN_NPC
+kh_dun01,235,114,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh11	HIDDEN_NPC
 
 //----------------------------------------------------------------------------
 // Beautiful Lady and Beautiful Lady copies.
 //----------------------------------------------------------------------------
-kh_school,119,149,4	script	Beautiful Lady#kh1::BeatifulLadyKHQ1	894,{
+kh_school,119,149,4	script	Beautiful Lady#kh1::BeatifulLadyKHQ1	4_F_KHELLISIA,{
 	cutin "kh_ellisia",2;
 	if (KielHyreQuest < 40) {
 		mes "[Allysia]";
@@ -3444,17 +3431,17 @@ kh_school,119,149,4	script	Beautiful Lady#kh1::BeatifulLadyKHQ1	894,{
 }
 
 
-kh_school,117,149,4	script	Beautiful lady#kh2::BeatifulLadyKHQ2	894,{
+kh_school,117,149,4	script	Beautiful lady#kh2::BeatifulLadyKHQ2	4_F_KHELLISIA,{
 	end;
 }
-kh_school,118,149,4	duplicate(BeatifulLadyKHQ2)	Beautiful lady#kh3	894
-kh_school,120,149,4	duplicate(BeatifulLadyKHQ2)	Beautiful lady#kh4	894
-kh_school,121,149,4	duplicate(BeatifulLadyKHQ1)	Beautiful lady#kh5	894
+kh_school,118,149,4	duplicate(BeatifulLadyKHQ2)	Beautiful lady#kh3	4_F_KHELLISIA
+kh_school,120,149,4	duplicate(BeatifulLadyKHQ2)	Beautiful lady#kh4	4_F_KHELLISIA
+kh_school,121,149,4	duplicate(BeatifulLadyKHQ1)	Beautiful lady#kh5	4_F_KHELLISIA
 
 //----------------------------------------------------------------------------
 // Beautiful Lady "Allysia"
 //----------------------------------------------------------------------------
-kh_school,122,186,4	script	Beautiful Lady#kh6	894,{
+kh_school,122,186,4	script	Beautiful Lady#kh6	4_F_KHELLISIA,{
 	if (checkweight(7496,1) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -3630,7 +3617,7 @@ kh_school,122,186,4	script	Beautiful Lady#kh6	894,{
 //----------------------------------------------------------------------------
 // Signboard (another useless NPC?)
 //----------------------------------------------------------------------------
-kh_dun01,163,223,4	script	Signboard#kh	857,{
+kh_dun01,163,223,4	script	Signboard#kh	4_BOARD3,{
 	mes "[Notice]";
 	mes "Cute Pets are prohibited";
 	mes "in this area. (Cute Pets that";
@@ -3643,7 +3630,7 @@ kh_dun01,163,223,4	script	Signboard#kh	857,{
 //----------------------------------------------------------------------------
 // Mechanical Devices for accessing restricted area
 //----------------------------------------------------------------------------
-kh_dun01,166,223,0	script	Mechanical Device#kh::KHKeyardReader	111,{
+kh_dun01,166,223,0	script	Mechanical Device#kh::KHKeyardReader	HIDDEN_NPC,{
 	if ((KielHyreQuest <= 38) || (KielHyreQuest >= 44)) {
 		mes "^3355FFYou encounter";
 		mes "a mechanical device.";
@@ -3674,7 +3661,7 @@ kh_dun01,166,223,0	script	Mechanical Device#kh::KHKeyardReader	111,{
 	}
 }
 
-kh_dun01,162,206,0	duplicate(KHKeyardReader)	Mechanical Device	111
+kh_dun01,162,206,0	duplicate(KHKeyardReader)	Mechanical Device	HIDDEN_NPC
 
 //----------------------------------------------------------------------------
 // Keep monsters out of the quest area.
@@ -3766,7 +3753,7 @@ OnTouch:
 //----------------------------------------------------------------------------
 // Robot Factory Second Floor Entrances
 //----------------------------------------------------------------------------
-kh_dun01,44,203,0	script	Entrance Device#khd2::KHAccess	111,{
+kh_dun01,44,203,0	script	Entrance Device#khd2::KHAccess	HIDDEN_NPC,{
 	if (countitem(7509) < 1) {
 		mes "^3355FFYou encounter";
 		mes "a mechanical device.";
@@ -3813,9 +3800,7 @@ kh_dun01,44,203,0	script	Entrance Device#khd2::KHAccess	111,{
 	}
 }
 
-kh_dun01,36,195,0	duplicate(KHAccess)	Entrance Device#khd1	111
-
-//============================================================================
+kh_dun01,36,195,0	duplicate(KHAccess)	Entrance Device#khd1	HIDDEN_NPC
 
 //============================================================================
 // Kiel Hyre Mansion NPCs, and Kiehl's Room NPCs
@@ -3824,7 +3809,7 @@ kh_dun01,36,195,0	duplicate(KHAccess)	Entrance Device#khd1	111
 //----------------------------------------------------------------------------
 // Kiel's Steward
 //----------------------------------------------------------------------------
-kh_mansion,78,55,5	script	Steward#kh	109,{
+kh_mansion,78,55,5	script	Steward#kh	4_M_MANAGER,{
 	if (KielHyreQuest < 46) {
 		mes "[Steward]";
 		mes "This is a private residence,";
@@ -3926,7 +3911,7 @@ kh_mansion,78,55,5	script	Steward#kh	109,{
 //----------------------------------------------------------------------------
 // Kiel Hyre
 //----------------------------------------------------------------------------
-kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
+kh_mansion,22,28,4	script	Kiel Hyre#kh	4_M_KHKYEL,{
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -4054,7 +4039,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "a little reward for";
 		mes "saving my life.";
 		getitem 12105,1; //Taming_Gift_Set
-		getexp 70000,0;
+		getexp (checkre(3))?70000:700000,0;
 		set KielHyreQuest,50;
 	}
 	else if ((KielHyreQuest >= 50) && (KielHyreQuest < 64)) {
@@ -4261,7 +4246,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "the Rekenber Corporation, I'd";
 		mes "say it was entirely possible!";
 		next;
-		cutin "kh_Kyel03",2; 
+		cutin "kh_Kyel03",2;
 		mes "[Kiel Hyre]";
 		mes "Well played, adventurer.";
 		mes "Well played. I don't regret";
@@ -4667,7 +4652,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		getitem 7509,1; //Fancy_Key_Card
 		set KielHyreQuest,108;
 		next;
-		if (sex == 0) {
+		if (Sex == 0) {
 			if (getpartnerid() == 0) set .@KHTitle$,"Miss";
 			else set .@KHSTitle$,"Mrs";
 		}
@@ -4679,9 +4664,9 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "and here, please take this";
 		mes "with my thanks for all of";
 		mes "your help, "+.@KHTitle$+" "+strcharinfo(0)+".";
-		getitem 616,1;  //Old card Album
+		getitem 616,1;  //Old Card Album
 		delitem 7508,1; //Elysia_Ring
-		getexp 100000,0;
+		getexp (checkre(3))?100000:1000000,0;
 	}
 	else if (KielHyreQuest >= 108) {
 		mes "[Kiel Hyre]";
@@ -4698,7 +4683,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 //----------------------------------------------------------------------------
 // Allysia
 //----------------------------------------------------------------------------
-kh_mansion,18,30,4	script	Allysia	894,{
+kh_mansion,18,30,4	script	Allysia	4_F_KHELLISIA,{
 	if (KielHyreQuest < 46) {
 		mes "[Allysia]";
 		mes "Who are you?";
@@ -4884,7 +4869,7 @@ OnTouch:
 //----------------------------------------------------------------------------
 // Mysterious Woman "Mitchell Layla"
 //----------------------------------------------------------------------------
-kh_mansion,25,79,4	script	Mysterious Woman#kh	727,3,3,{
+kh_mansion,25,79,4	script	Mysterious Woman#kh	4_F_JOB_HUNTER,3,3,{
 
 //OnTouch2:
 OnTouch:
@@ -5170,19 +5155,19 @@ OnTouch:
 // - Anyone can enter
 // - After 30-40 seonds this NPC should be disabled.
 //----------------------------------------------------------------------------
-kh_mansion,29,27,0	script	Kiehl_Room_Warp	45,2,2,{
+kh_mansion,29,27,0	script	Kiehl_Room_Warp	WARPNPC,2,2,{
 OnTouch:
 	warp "kh_kiehl01",10,31;
 	end;
 
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Kiehl_Room_Warp";
 	end;
 
@@ -5192,15 +5177,13 @@ OnInit:
 }
 
 //============================================================================
-
-//============================================================================
 // Rosimier NPCs and other Related NPCs
 //============================================================================
 
 //----------------------------------------------------------------------------
 // Odd Grandma
 //----------------------------------------------------------------------------
-yuno,257,140,4	script	Odd Grandma	846,{
+yuno,257,140,4	script	Odd Grandma	4_F_EINOLD,{
 	if (KielHyreQuest < 54) {
 		mes "[Grandma]";
 		mes "Where did you go,";
@@ -5254,28 +5237,23 @@ yuno,257,140,4	script	Odd Grandma	846,{
 		mes "you go? You were";
 		mes "supposed to come";
 		mes "home a while ago!";
-		if (countitem(7500) < 1) { 
+		if (countitem(7500) < 1)
 			close;
-		}
-		else {
-			next;
-			switch(select("Allysia? Isn't she...")) {
-			case 1:
-				cutin "kh_ellisia_port",1;
-				mes "^3355FFYou show Allysia's";
-				mes "portrait to the old woman.^000000";
-				next;
-				cutin "",255;
-				mes "[Grandma]";
-				mes "Oh, do you know";
-				mes "Allysia? She's been";
-				mes "missing! She left home";
-				mes "yesterday and hasn't";
-				mes "come back! C-can you";
-				mes "tell me where she is?!";
-				close;
-			}
-		}
+		next;
+		select("Allysia? Isn't she...");
+		cutin "kh_ellisia_port",1;
+		mes "^3355FFYou show Allysia's";
+		mes "portrait to the old woman.^000000";
+		next;
+		cutin "",255;
+		mes "[Grandma]";
+		mes "Oh, do you know";
+		mes "Allysia? She's been";
+		mes "missing! She left home";
+		mes "yesterday and hasn't";
+		mes "come back! C-can you";
+		mes "tell me where she is?!";
+		close;
 	}
 	else if (KielHyreQuest >= 60) {
 		mes "[Grandma]";
@@ -5290,7 +5268,7 @@ yuno,257,140,4	script	Odd Grandma	846,{
 //----------------------------------------------------------------------------
 // Old Lady; gives you the key to the Rosimier Mansion
 //----------------------------------------------------------------------------
-yuno,250,132,0	script	Old Lady#kh	711,{
+yuno,250,132,0	script	Old Lady#kh	4_F_05,{
 	if (KielHyreQuest < 56) {
 		mes "[Old Lady]";
 		mes "Oooh, my legs and back";
@@ -5387,9 +5365,9 @@ yuno,250,132,0	script	Old Lady#kh	711,{
 	}
 
 	else if ((KielHyreQuest == 58) &&
-		(countitem(7499) < 1) || 
-		(countitem(7500) < 1) || 
-		(countitem(7501) < 1) || 
+		(countitem(7499) < 1) ||
+		(countitem(7500) < 1) ||
+		(countitem(7501) < 1) ||
 		(countitem(7502) < 1)) {
 		mes "[Old Lady]";
 		mes "Please hurry and find";
@@ -5402,9 +5380,9 @@ yuno,250,132,0	script	Old Lady#kh	711,{
 	}
 
 	else if ((KielHyreQuest == 58) &&
-		(countitem(7499) == 1) && 
-		(countitem(7500) == 1) && 
-		(countitem(7501) == 1) && 
+		(countitem(7499) == 1) &&
+		(countitem(7500) == 1) &&
+		(countitem(7501) == 1) &&
 		(countitem(7502) == 1)) {
 		mes "[Old Lady]";
 		mes "Oh, you're finished";
@@ -5442,7 +5420,7 @@ yuno,250,132,0	script	Old Lady#kh	711,{
 		mes "Allysia's body in the river,";
 		mes "so he might have a better";
 		mes "idea of what had happened.";
-		delitem 7498,1; //Rosimier_Key 
+		delitem 7498,1; //Rosimier_Key
 		set KielHyreQuest,60;
 		close;
 	}
@@ -5458,7 +5436,7 @@ yuno,250,132,0	script	Old Lady#kh	711,{
 //----------------------------------------------------------------------------
 // Warp portal into Rosimier Mansion
 //----------------------------------------------------------------------------
-yuno,273,141,0	script	Rosimmir_Entrance	45,2,2,{
+yuno,273,141,0	script	Rosimmir_Entrance	WARPNPC,2,2,{
 OnTouch:
 	if (countitem(7498) < 1) {
 		mes "That mansion seems to have";
@@ -5477,7 +5455,7 @@ OnTouch:
 //----------------------------------------------------------------------------
 // Rosimier Mansion, first floor; Table
 //----------------------------------------------------------------------------
-kh_rossi,23,23,0	script	Table#khr2	111,{
+kh_rossi,23,23,0	script	Table#khr2	HIDDEN_NPC,{
 	if (checkweight(7499,1) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -5520,7 +5498,7 @@ kh_rossi,23,23,0	script	Table#khr2	111,{
 //----------------------------------------------------------------------------
 // Rosimier Mansion, first floor; Shelf
 //----------------------------------------------------------------------------
-kh_rossi,92,40,0	script	Shelf#khr	111,{
+kh_rossi,92,40,0	script	Shelf#khr	HIDDEN_NPC,{
 	if (checkweight(7500,1) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -5593,7 +5571,7 @@ kh_rossi,92,40,0	script	Shelf#khr	111,{
 //----------------------------------------------------------------------------
 // Rosimier Mansion, top floor; Desk
 //----------------------------------------------------------------------------
-kh_rossi,144,286,0	script	Desk#khr3	111,{
+kh_rossi,144,286,0	script	Desk#khr3	HIDDEN_NPC,{
 	if (checkweight(7501,1) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -5658,7 +5636,7 @@ kh_rossi,144,286,0	script	Desk#khr3	111,{
 //----------------------------------------------------------------------------
 // Rosimier Mansion, top floor; Bookshelf
 //----------------------------------------------------------------------------
-kh_rossi,148,288,0	script	Bookshelf#khr	111,{
+kh_rossi,148,288,0	script	Bookshelf#khr	HIDDEN_NPC,{
 	if (checkweight(7502,1) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -5702,7 +5680,7 @@ kh_rossi,148,288,0	script	Bookshelf#khr	111,{
 //----------------------------------------------------------------------------
 // Rosimier Mansion, top floor; Bed
 //----------------------------------------------------------------------------
-kh_rossi,154,286,0	script	Bed#khr	111,{
+kh_rossi,154,286,0	script	Bed#khr	HIDDEN_NPC,{
 	if (KielHyreQuest < 58) {
 		mes "^3355FFYou found a well made";
 		mes "bed that has collected";
@@ -5741,7 +5719,7 @@ kh_rossi,154,286,0	script	Bed#khr	111,{
 //----------------------------------------------------------------------------
 // Fisherman
 //----------------------------------------------------------------------------
-yuno_fild12,232,222,0	script	Old Fisherman	709,{
+yuno_fild12,232,222,0	script	Old Fisherman	4_M_SEAMAN,{
 	if (KielHyreQuest < 60) {
 		mes "[Fisherman]";
 		mes "These days, it's much";
@@ -5849,7 +5827,7 @@ yuno_fild12,232,222,0	script	Old Fisherman	709,{
 //----------------------------------------------------------------------------
 // Kiel Hyre's hut; Wooden Board
 //----------------------------------------------------------------------------
-yuno_fild09,158,217,0	script	Wooden Board#kh	111,{
+yuno_fild09,158,217,0	script	Wooden Board#kh	HIDDEN_NPC,{
 	if (checkweight(7503,1) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -5904,7 +5882,7 @@ yuno_fild09,158,217,0	script	Wooden Board#kh	111,{
 //----------------------------------------------------------------------------
 // Kiehl's Room; Receiver (Gives black keycards upon killing mobs)
 //----------------------------------------------------------------------------
-kh_kiehl01,17,39,0	script	Receiver#kh	111,{
+kh_kiehl01,17,39,0	script	Receiver#kh	HIDDEN_NPC,{
 	if (mobcount("kh_kiehl01","Receiver#kh::OnMyMobDead") < 1) {
 		mes "^333333*BBBZZZ*^000000";
 		if (KielHyreQuest == 74) {
@@ -5929,7 +5907,7 @@ kh_kiehl01,17,39,0	script	Receiver#kh	111,{
 	}
 
 OnMyMobDead:
-	if (mobcount("kh_kiehl01","Receiver#kh::OnMyMobDead") <1) { 
+	if (mobcount("kh_kiehl01","Receiver#kh::OnMyMobDead") <1) {
 		makeitem 7506,1,"this",19,36;
 	}
 	end;
@@ -5938,7 +5916,7 @@ OnMyMobDead:
 //----------------------------------------------------------------------------
 // Kiehl's Room; Flower Vase (Gives...password...for Box)
 //----------------------------------------------------------------------------
-kh_kiehl01,13,40,0	script	Flower Vase#kh1	111,{
+kh_kiehl01,13,40,0	script	Flower Vase#kh1	HIDDEN_NPC,{
 	if (KielHyreQuest < 74) {
 		mes "^3355FFYou found";
 		mes "a flower vase.^000000";
@@ -5991,7 +5969,7 @@ kh_kiehl01,13,40,0	script	Flower Vase#kh1	111,{
 //----------------------------------------------------------------------------
 // Kiehl's Room; Box
 //----------------------------------------------------------------------------
-kh_kiehl01,19,25,0	script	Box#kh1	111,{
+kh_kiehl01,19,25,0	script	Box#kh1	HIDDEN_NPC,{
 	if (checkweight(7505,1) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -6051,7 +6029,7 @@ kh_kiehl01,19,25,0	script	Box#kh1	111,{
 // - Consume one Black KeyCard when opened.
 // - Only one person actually needs to open it.
 //----------------------------------------------------------------------------
-kh_kiehl01,44,33,0	script	Big Door#BigDoorKHQ1	111,{
+kh_kiehl01,44,33,0	script	Big Door#BigDoorKHQ1	HIDDEN_NPC,{
 	if (.KHDoor1Opened == 0) {
 		mes "^3355FFThe door is locked,";
 		mes "but there is a narrow";
@@ -6085,10 +6063,10 @@ kh_kiehl01,44,33,0	script	Big Door#BigDoorKHQ1	111,{
 	}
 }
 
-kh_kiehl01,43,33,0	script	Big_Door_1_Warp	45,1,1,{
+kh_kiehl01,43,33,0	script	Big_Door_1_Warp	WARPNPC,1,1,{
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -6097,7 +6075,7 @@ OnInit:
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_1_Warp";
 	set getvariableofnpc(.KHDoor1Opened,"Big Door#BigDoorKHQ1"),0;
 	end;
@@ -6112,7 +6090,7 @@ OnTouch:
 // - Consume Toy Key when opened.
 // - Only one person actually needs to open it.
 //----------------------------------------------------------------------------
-kh_kiehl01,174,40,0	script	Big Door#BigDoorKHQ2	111,{
+kh_kiehl01,174,40,0	script	Big Door#BigDoorKHQ2	HIDDEN_NPC,{
 	if (.KHDoor2Opened == 0) {
 		mes "^3355FFThe door is locked,";
 		mes "but there is a small";
@@ -6145,10 +6123,10 @@ kh_kiehl01,174,40,0	script	Big Door#BigDoorKHQ2	111,{
 	}
 }
 
-kh_kiehl01,174,39,0	script	Big_Door_2_Warp	45,1,1,{
+kh_kiehl01,174,39,0	script	Big_Door_2_Warp	WARPNPC,1,1,{
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -6157,7 +6135,7 @@ OnInit:
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_2_Warp";
 	set getvariableofnpc(.KHDoor2Opened,"Big Door#BigDoorKHQ2"),0;
 	end;
@@ -6172,7 +6150,7 @@ OnTouch:
 // - Consume one Black KeyCard when opened.
 // - Only one person actually needs to open it.
 //----------------------------------------------------------------------------
-kh_kiehl01,77,108,0	script	Big Door#BigDoorKHQ3	111,{
+kh_kiehl01,77,108,0	script	Big Door#BigDoorKHQ3	HIDDEN_NPC,{
 	if (.KHDoor3Opened == 0) {
 		mes "^3355FFThe door is locked,";
 		mes "but there is a narrow";
@@ -6205,10 +6183,10 @@ kh_kiehl01,77,108,0	script	Big Door#BigDoorKHQ3	111,{
 	}
 }
 
-kh_kiehl01,78,108,0	script	Big_Door_3_Warp	45,1,1,{
+kh_kiehl01,78,108,0	script	Big_Door_3_Warp	WARPNPC,1,1,{
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -6217,7 +6195,7 @@ OnInit:
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_3_Warp";
 	set getvariableofnpc(.KHDoor3Opened,"Big Door#BigDoorKHQ3"),0;
 	end;
@@ -6232,7 +6210,7 @@ OnTouch:
 // - Consume TWO Black KeyCard when opened.
 // - Only one person actually needs to open it.
 //----------------------------------------------------------------------------
-kh_kiehl01,42,177,0	script	Big Door#BigDoorKHQ4	111,{
+kh_kiehl01,42,177,0	script	Big Door#BigDoorKHQ4	HIDDEN_NPC,{
 	if (.KHDoor4Opened == 0) {
 		mes "^3355FFThe door is locked,";
 		mes "but there is a narrow";
@@ -6265,10 +6243,10 @@ kh_kiehl01,42,177,0	script	Big Door#BigDoorKHQ4	111,{
 	}
 }
 
-kh_kiehl01,41,177,0	script	Big_Door_4_Warp	45,1,1,{
+kh_kiehl01,41,177,0	script	Big_Door_4_Warp	WARPNPC,1,1,{
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -6277,7 +6255,7 @@ OnInit:
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_4_Warp";
 	set getvariableofnpc(.KHDoor4Opened,"Big Door#BigDoorKHQ4"),0;
 	end;
@@ -6290,7 +6268,7 @@ OnTouch:
 //----------------------------------------------------------------------------
 // Kiehl's Room; Robots
 //----------------------------------------------------------------------------
-kh_kiehl01,15,179,0	script	Robots#kh1	111,{
+kh_kiehl01,15,179,0	script	Robots#kh1	HIDDEN_NPC,{
 	if (mobcount("kh_kiehl01","Robots#kh1::OnMyMobDead") < 1) {
 		mes "^3355FFAs soon as you";
 		mes "touch the test tube,";
@@ -6308,31 +6286,31 @@ kh_kiehl01,15,179,0	script	Robots#kh1	111,{
 	}
 
 OnMyMobDead:
-	if (mobcount("kh_kiehl01","Robots#kh1::OnMyMobDead") < 1) { 
+	if (mobcount("kh_kiehl01","Robots#kh1::OnMyMobDead") < 1) {
 		makeitem 7506,1,"this",18,180;
-		}
+	}
 	end;
 }
 
 //----------------------------------------------------------------------------
 // Kiehl's Room; Dummy Robots
 //----------------------------------------------------------------------------
-kh_kiehl01,15,177,0	script	Robots#kh2::RobotsKHQ	111,{
+kh_kiehl01,15,177,0	script	Robots#kh2::RobotsKHQ	HIDDEN_NPC,{
 	end;
 }
-kh_kiehl01,15,180,0	duplicate(RobotsKHQ)	Robots#kh3	111
-kh_kiehl01,15,182,0	duplicate(RobotsKHQ)	Robots#kh4	111
-kh_kiehl01,35,187,0	duplicate(RobotsKHQ)	Robots#kh5	111
-kh_kiehl01,37,187,0	duplicate(RobotsKHQ)	Robots#kh6	111
-kh_kiehl01,39,187,0	duplicate(RobotsKHQ)	Robots#kh7	111
-kh_kiehl01,41,187,0	duplicate(RobotsKHQ)	Robots#kh8	111
+kh_kiehl01,15,180,0	duplicate(RobotsKHQ)	Robots#kh3	HIDDEN_NPC
+kh_kiehl01,15,182,0	duplicate(RobotsKHQ)	Robots#kh4	HIDDEN_NPC
+kh_kiehl01,35,187,0	duplicate(RobotsKHQ)	Robots#kh5	HIDDEN_NPC
+kh_kiehl01,37,187,0	duplicate(RobotsKHQ)	Robots#kh6	HIDDEN_NPC
+kh_kiehl01,39,187,0	duplicate(RobotsKHQ)	Robots#kh7	HIDDEN_NPC
+kh_kiehl01,41,187,0	duplicate(RobotsKHQ)	Robots#kh8	HIDDEN_NPC
 
 //----------------------------------------------------------------------------
 // Kiehl's Room; Big Door, (Fifth, and final)
 // - Anyone can pass through this door
 // - Consumes 4 Solid Iron Pieces
 //----------------------------------------------------------------------------
-kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
+kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	HIDDEN_NPC,{
 	if (($@KHQuestBusy == 0) && (KielHyreQuest >= 74) && (KielHyreQuest <= 106)) {
 		if (KielHyreQuest < 86) {
 			mes "^3355FFThis large door..";
@@ -6354,8 +6332,8 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 			monster "kh_kiehl01",163,179,"Aliot",1740,1;
 			monster "kh_kiehl01",169,183,"Alicel",1739,1;
 			monster "kh_kiehl01",169,179,"Aliot",1740,1;
-			if (@KHDoorPushAttempt >= 3) { 
-				set KielHyreQuest,86; 
+			if (@KHDoorPushAttempt >= 3) {
+				set KielHyreQuest,86;
 			}
 			end;
 		}
@@ -6474,17 +6452,17 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 	}
 }
 
-kh_kiehl01,166,186,0	script	Big_Door_5_Warp	45,1,1,{
+kh_kiehl01,166,186,0	script	Big_Door_5_Warp	WARPNPC,1,1,{
 	end;
 
 OnEnable:
 	initnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnTimer30000:
 	stopnpctimer;
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	disablenpc "Big_Door_5_Warp";
 	set getvariableofnpc(.KHDoor5Opened,"Big Door#BigDoorKHQ5"),0;
 	end;
@@ -6544,7 +6522,7 @@ OnGlobalTimerOff:
 // Kiehl's Room; Kiehl
 // - Timer will drop to 3 minutes once Kiehl is defeated.
 //----------------------------------------------------------------------------
-kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
+kh_kiehl02,50,52,4	script	Kiehl#Original	4_M_KHKIEL,{
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
@@ -6712,9 +6690,13 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "jobs--sort of like robots-- but";
 		mes "don't worry, they won't be hurt.";
 		next;
-		donpcevent "::OnKHSpiderWeb";
 		mes "[Mitchell]";
 		mes "Nooooo!";
+		specialeffect PF_FOGWALL,AREA,"Mitchell#KiehlRoom";
+		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent1";
+		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent2";
+		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent3";
+		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent4";
 		next;
 		cutin "kh_kiel03",2;
 		mes "[Kiehl]";
@@ -7047,8 +7029,8 @@ kh_kiehl02,1,1,0	script	KiehlRoom	-1,{
 
 OnKiehlMobDead:
 	set .KHKilled,.KHKilled+1;
-	if (.KHKilled == 5) { 
-		hideoffnpc "Kiehl#Original"; 
+	if (.KHKilled == 5) {
+		hideoffnpc "Kiehl#Original";
 	}
 	end;
 
@@ -7069,7 +7051,7 @@ OnReset:
 	hideonnpc "Agent#KHAgent3";
 	hideonnpc "Agent#KHAgent4";
 	hideonnpc "Kiehl#Copy";
-	hideoffnpc "Kiehl#Original"; 
+	hideoffnpc "Kiehl#Original";
 	set .KHKilledBoss,0;
 	set .KHKilled,0;
 	set getvariableofnpc(.KHTrapSprung,"Kiehl_Room_Trap"),0;
@@ -7078,68 +7060,23 @@ OnReset:
 }
 
 //----------------------------------------------------------------------------
-// Kiehl's Room; Mitchell and Agents. (Floating NPC + Duplicates)
+// Kiehl's Room; Mitchell and Agents.
 //----------------------------------------------------------------------------
-kh_kiehl02,49,55,6	script	Mitchell#KiehlRoom	727,{
-	end;
-OnInit:
-	hideonnpc "Mitchell#KiehlRoom";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
-	end;
-}
-
-kh_kiehl02,53,52,4	script	Agent#KHAgent1	880,{
+kh_kiehl02,49,55,6	script	Mitchell#KiehlRoom	4_F_JOB_HUNTER,{
 	end;
 OnInit:
-	hideonnpc "Agent#KHAgent1";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
+	hideonnpc strnpcinfo(0);
 	end;
 }
-
-kh_kiehl02,51,49,1	script	Agent#KHAgent2	880,{
-	end;
-OnInit:
-	hideonnpc "Agent#KHAgent2";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
-	end;
-}
-
-kh_kiehl02,47,50,0	script	Agent#KHAgent3	880,{
-	end;
-OnInit:
-	hideonnpc "Agent#KHAgent3";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
-	end;
-}
-
-kh_kiehl02,46,53,6	script	Agent#KHAgent4	880,{
-	end;
-OnInit:
-	hideonnpc "Agent#KHAgent4";
-	end;
-
-OnKHSpiderWeb:
-	misceffect 404;
-	end;
-}
-
+kh_kiehl02,53,52,4	duplicate(Mitchell#KiehlRoom)	Agent#KHAgent1	4_M_MASKMAN
+kh_kiehl02,51,49,1	duplicate(Mitchell#KiehlRoom)	Agent#KHAgent2	4_M_MASKMAN
+kh_kiehl02,47,50,0	duplicate(Mitchell#KiehlRoom)	Agent#KHAgent3	4_M_MASKMAN
+kh_kiehl02,46,53,6	duplicate(Mitchell#KiehlRoom)	Agent#KHAgent4	4_M_MASKMAN
 
 //----------------------------------------------------------------------------
 // Kiehl's Room; Copy of Kiehl.
 //----------------------------------------------------------------------------
-kh_kiehl02,48,53,6	script	Kiehl#Copy	902,{
+kh_kiehl02,48,53,6	script	Kiehl#Copy	4_M_KHKIEL,{
 	end;
 
 OnInit:
@@ -7150,7 +7087,7 @@ OnInit:
 //----------------------------------------------------------------------------
 // Kiehl's Room; Kiehl_Room_Exit
 //----------------------------------------------------------------------------
-kh_kiehl02,50,59,0	script	Kiehl_Room_Exit	45,1,1,{
+kh_kiehl02,50,59,0	script	Kiehl_Room_Exit	WARPNPC,1,1,{
 OnTouch:
 	if (getmapusers("kh_kiehl02") < 1)
 		donpcevent "KiehlRoom::OnReset";
@@ -7158,7 +7095,7 @@ OnTouch:
 	end;
 
 OnEnable:
-	misceffect 215;
+	specialeffect EF_SUMMONSLAVE;
 	end;
 
 OnInit:
@@ -7166,59 +7103,60 @@ OnInit:
 	end;
 }
 
-//============================================================================
-//===== Additional Comments: ============================================
+//============================================================
+// Old changelog
+//============================================================
 //= 1.0 First version, needs testing [Playtester]
 //= 1.1 Copied over some changes made by -Tsuyuki- [L0ne_W0lf]
-//=	Reworked variables slightly so that the permenents ones aside from the 
-//=	main tracking variable, are deleted when no longer needed. Renamed
-//=	several variables that handle strings to @KHInput$. [L0ne_W0lf]
+//=     Reworked variables slightly so that the permenents ones aside from the
+//=     main tracking variable, are deleted when no longer needed. Renamed
+//=     several variables that handle strings to @KHInput$. [L0ne_W0lf]
 //= 1.2 Removed duplicate NPCs. [Toms]
 //= 1.3 More Bug fixes, fixed typo. Updated Additional comments. [L0ne_W0lf]
 //= 1.4 Fixed doors not resetting in kh_kiehl01 after 30 second timer is up. [L0ne_W0lf]
 //= 1.5 Another bug fixed (&& instead of ||). [L0ne_W0lf]
 //= 1.6 More squashed bugs with if checking. [L0ne_W0lf]
 //= 1.7 Corrected some spelling mistakes. [Balish]
-//	Corrected Exploit with the pub man, giving infinite wine and money.
-//	Corrected pool and map not showing text for some states of the quest.
-//	Corrected Elly showing cutin but not text for some states of the quest (causing players to log off to continue).
-//	Let fisherman talk to you when you have 10 fishes OR MORE.
-//	Corrected not letting you enter the tombstone after finishing the quest.
+//=     Corrected Exploit with the pub man, giving infinite wine and money.
+//=     Corrected pool and map not showing text for some states of the quest.
+//=     Corrected Elly showing cutin but not text for some states of the quest (causing players to log off to continue).
+//=     Let fisherman talk to you when you have 10 fishes OR MORE.
+//=     Corrected not letting you enter the tombstone after finishing the quest.
 //= 1.8 Elly now deletes the Iron_Box, and Kiel Hyre deletes the Pin. [L0ne_W0lf]
-//= 	More security on the 5th Big Door, now makes sure no one outside of who-
-//=	acticated it initially can use it. Resets after 10 minutes to make it.
-//=	Made it so that you need to be at least step 84 to activate the final door.
-//=	Corrected not deleting Allysia's Ring from inventory.
+//=     More security on the 5th Big Door, now makes sure no one outside of who-
+//=     acticated it initially can use it. Resets after 10 minutes to make it.
+//=     Made it so that you need to be at least step 84 to activate the final door.
+//=     Corrected not deleting Allysia's Ring from inventory.
 //= 1.9 Exit will now enable if you are just retrieving the Ring, keeps you from getting stuck. [L0ne_W0lf]
-//=	Corrected "KH_Kielh02", was setting off a debug, invalid map index. Should have been "kh_Kiehl02"
-//=	Made .KHQuestBusy$ into a temp global variable. $@KHQuestBusy$. 
+//=     Corrected "KH_Kielh02", was setting off a debug, invalid map index. Should have been "kh_Kiehl02"
+//=     Made .KHQuestBusy$ into a temp global variable. $@KHQuestBusy$.
 //= 2.0 Changed the labels on the "Big Doors" to "Identifier Names" to prevent an error with using getvariableofnpc [L0ne_W0lf]
 //= 2.1 Fifth door now checks for a variable HIGHER or EQUAL to 74 not 84, as pointed out by Stollen. [L0ne_W0lf]
 //= 2.2 Another fix for Elly, no longer RESETS to 26 when you talk to her. [L0ne_W0lf]
 //= 2.3 Should NOT have been setting .KHQuestBusy at all. It's not used or accessed anymore. Removed. [L0ne_W0lf]
 //= 2.4 Lots of fixes (4ish) from Valandi. [L0ne_W0lf]
-//=	Added a getmapuser check to the mapwarp in KHTimerEnd so it's not trying to warp out 0 users. [L0ne_W0lf]
+//=     Added a getmapuser check to the mapwarp in KHTimerEnd so it's not trying to warp out 0 users. [L0ne_W0lf]
 //= 2.5 Fixed several small issues (and large one) such as typos in cutins, typos in dialog, etc. [L0ne_W0lf]
-//=	Added some of the missing dialogs for several NPCs, and fixed a few NPC locations.
-//=	ALL books can now trigger the wall.
-//=	Allysia will now summon 4 (was 2) G_CONSTANTS instead of REGULAR constants.
-//=	Fixed where Golden_Key and Kiel_Button are deleted.
-//=	Removed KHTimerEnd, and instead use OnReset.
-//=	Fixed typo in the second NPC that gives Black Keycards.
-//=	Added Monster Warps. (Keeps monsters from being in dungeon quest area.) [Non-functional]
+//=     Added some of the missing dialogs for several NPCs, and fixed a few NPC locations.
+//=     ALL books can now trigger the wall.
+//=     Allysia will now summon 4 (was 2) G_CONSTANTS instead of REGULAR constants.
+//=     Fixed where Golden_Key and Kiel_Button are deleted.
+//=     Removed KHTimerEnd, and instead use OnReset.
+//=     Fixed typo in the second NPC that gives Black Keycards.
+//=     Added Monster Warps. (Keeps monsters from being in dungeon quest area.) [Non-functional]
 //= 2.6 Stupid mistake, accidentally had 4 copies of the same script in 1... [L0ne_W0lf the bonehead]
-//= 2.7 Fixed the wrong name being displayed for Kiel Hyre in one dialog. 
-//=	Removed $@KH_DoorInvoker entirely. The quest is now working like it should according to iRO.
-//=	Fixed up a few more NPC headers. Facing direction fixes mostly this time.
-//=	More progression changes to Kiehl Hyre. He no longer stops dialog after the agents appear.
+//= 2.7 Fixed the wrong name being displayed for Kiel Hyre in one dialog.
+//=     Removed $@KH_DoorInvoker entirely. The quest is now working like it should according to iRO.
+//=     Fixed up a few more NPC headers. Facing direction fixes mostly this time.
+//=     More progression changes to Kiehl Hyre. He no longer stops dialog after the agents appear.
 //= 2.8 Fixed the weight checking in Vandt, and added official dialog. [L0ne_W0lf]
-//=	Added weight checks for all NPCs that give items. Semi-official dialog.
-//=	Got the missing portion of dialog for Mills'.
-//=	Will add further proper dialogs as I get to them on the second runthrough of the quest.
+//=     Added weight checks for all NPCs that give items. Semi-official dialog.
+//=     Got the missing portion of dialog for Mills'.
+//=     Will add further proper dialogs as I get to them on the second runthrough of the quest.
 //= 2.8a minor optimization with extra goto, else or empty switch [Lupus]
 //= 2.9 Fixed the "enablenpc" problem with the missing spaces. No idea how it happened. [L0ne_W0lf]
 //= 3.0 Fixed a typo in Elly, in her room. (was <= should have been <) [L0ne_W0lf]
-//=	Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items.
+//=     Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items.
 //= 3.1 Moved the "delitem" for all related quest items to the proper NPC. [L0ne_W0lf]
 //= 3.2 Fixed error with Allysia teling you to "Go away." maybe. [L0ne_W0lf]
 //= 3.2b Fixed some typos and grammar mistakes. [SinSloth]
@@ -7228,7 +7166,8 @@ OnInit:
 //=     for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_-
 //= 3.5 Changed the way the Black Keycard distibuting NPCs work slighty. [L0ne_W0lf]
 //= 3.6 Keil Hyre removes ALL outstanding quest items when he is talked [L0ne_W0lf]
-//=	to after finishing the quest.
+//=     to after finishing the quest.
 //= 3.7 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 3.8 Corrected some delitems. (bugreport:690) [Samuray22]
-//= 3.9 Fixed a cutin not being erased. (bugreport:1539) [L0ne_W0lf]
\ No newline at end of file
+//= 3.9 Fixed a cutin not being erased. (bugreport:1539) [L0ne_W0lf]
+//============================================================
diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt
index cfb7e50ac..91a1cea91 100644
--- a/npc/quests/lvl4_weapon_quest.txt
+++ b/npc/quests/lvl4_weapon_quest.txt
@@ -4,15 +4,13 @@
 //= Vicious_Pucca, Reddozen & MasterOfMuppets
 //===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Grade A and Grade S weapon quests
 //===== Additional Comments: =================================
 //= 1.0 First Version, Credits goes to Vicious_Pucca for converting [MasterOfMuppets]
-//=     the quest from aegis format to eA format. Also thanks to 
-//=	reddozen for fixing bugs.
+//=     the quest from aegis format to eA format. Also thanks to
+//=     reddozen for fixing bugs.
 //= 1.1 Many fixes to spelling, grammar, and sentence order. [Silent]
 //= 1.2 A small fix, thanks to vicious_pucca [MasterOfMuppets]
 //= 1.21 Fixing MoM's typos (Citrin -> Citrine) [erKURITA]
@@ -22,7 +20,7 @@
 //= 1.6 Was using the wrong IDs for the ores needed. [L0ne_W0lf]
 //============================================================
 
-umbala,117,285,3	script	Bazo#lv4	85,{
+umbala,117,285,3	script	Bazo#lv4	4_M_03,{
 	if (checkweight(908,300) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
@@ -463,7 +461,7 @@ umbala,117,285,3	script	Bazo#lv4	85,{
 	}
 }
 
-umbala,163,257,3	script	Hibilaithan#lv4	785,{
+umbala,163,257,3	script	Hibilaithan#lv4	4_M_UMDANCEKID2,{
 	if (checkweight(908,300) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
@@ -921,7 +919,7 @@ umbala,163,257,3	script	Hibilaithan#lv4	785,{
 	}
 }
 
-um_in,156,77,5	script	Tabezthan#lv4	788,{
+um_in,156,77,5	script	Tabezthan#lv4	4_M_UMOLDMAN,{
 	if (checkweight(908,300) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
@@ -1346,7 +1344,7 @@ um_in,156,77,5	script	Tabezthan#lv4	788,{
 	}
 }
 
-aldebaran,178,239,3	script	Bill Thayer#lv4	712,{
+aldebaran,178,239,3	script	Bill Thayer#lv4	4_M_05,{
 	if (lv4_weapon == 55) {
 		mes "[Bill Thayer]";
 		mes "Hmm...";
@@ -1661,7 +1659,7 @@ aldebaran,178,239,3	script	Bill Thayer#lv4	712,{
 	close;
 }
 
-geffen,203,146,5	script	Citizen#lv4-1	97,{
+geffen,203,146,5	script	Citizen#lv4-1	4W_M_01,{
 	mes "[Citizen]";
 	mes "There was a skillful";
 	mes "weaponsmith in Al De Baran";
@@ -1679,7 +1677,7 @@ geffen,203,146,5	script	Citizen#lv4-1	97,{
 	close;
 }
 
-morocc,289,230,3	script	Citizen#lv4-2	92,{
+morocc,289,230,3	script	Citizen#lv4-2	4_F_03,{
 	mes "[Citizen]";
 	mes "Meeting a person in the realm of the dead is impossible. But I've heard that if you were able to meet a dead person, you'd find that he wouldn't have all of his memories.";
 	next;
@@ -1692,7 +1690,7 @@ morocc,289,230,3	script	Citizen#lv4-2	92,{
 	close;
 }
 
-niflheim,240,193,3	script	Kayron#lv4	794,{
+niflheim,240,193,3	script	Kayron#lv4	4_M_NFDEADMAN2,{
 	if (checkweight(908,300) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
@@ -2138,9 +2136,8 @@ niflheim,240,193,3	script	Kayron#lv4	794,{
 	}
 }
 
-niflheim,99,268,5	script	Reyghema#lv4	794,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 3000) {
+niflheim,99,268,5	script	Reyghema#lv4	4_M_NFDEADMAN2,{
+	if (MaxWeight - Weight < 3000) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
 	}
@@ -2620,7 +2617,7 @@ niflheim,99,268,5	script	Reyghema#lv4	794,{
 	}
 }
 
-niflheim,187,280,3	script	Hein#lv4	795,{
+niflheim,187,280,3	script	Hein#lv4	4_M_NFDEADMAN,{
 	if (checkweight(908,300) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
@@ -3062,7 +3059,7 @@ niflheim,187,280,3	script	Hein#lv4	795,{
 	}
 }
 
-niflheim,331,72,3	script	Waltboughst#lv4	795,{
+niflheim,331,72,3	script	Waltboughst#lv4	4_M_NFDEADMAN,{
 	if (checkweight(908,300) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
diff --git a/npc/re/quests/skills/sage_skills.txt b/npc/quests/mage_solution.txt
index 64ebe20e3..2d4dcaab0 100644
--- a/npc/re/quests/skills/sage_skills.txt
+++ b/npc/quests/mage_solution.txt
@@ -1,53 +1,55 @@
 //===== Hercules Script ======================================
-//= Sage Quest Skill's related NPCs
+//= Mage Solutions
 //===== By: ==================================================
-//= Zopokx
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= Morocc/Payon Solution duplicate NPCs for Sage Quest Skill
+//= [Official Conversion]
+//= Traders for Morroc Solution and Payon Solution, used in
+//= the Sage skill quests and the Pre-Renewal Mage job quest.
 //===== Additional Comments: =================================
-//= 1.0 First version
+//= 1.0 Split from Pre-Renewal Mage job quest. [Zopokx]
 //============================================================
 
-moc_ruins,91,150,0	script	Ponka-Hontas	93,{
+pay_arche,122,100,0	script	Dollshoi	4_M_ORIENT01,{
 	mes "[Mage Guildsman]";
-	mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Testtube.";
+	mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube.";
 	next;
 	if (select("Alright, Deal.:Nah, forget it.") == 1) {
 		mes "[Mage Guildsman]";
-		if (zeny < 50) {
-			mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee.";
+		if (Zeny < 50) {
+			mes "Hey! You don't have enough money to cover my 50 Zeny charge.";
 			close;
 		}
 		if (countitem(1092) == 0) {
-			mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me.";
+			mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube.";
 			close;
 		}
 		delitem 1092,1; //Empty_Cylinder
-		set zeny,zeny-50;
-		getitem 1088,1; //Morocc_Potion
+		Zeny -= 50;
+		getitem 1089,1; //Payon_Potion
 	}
 	close;
 }
 
-pay_arche,122,100,0	script	Dollshoi	88,{
+moc_ruins,91,150,0	script	Ponka-Hontas	4_F_04,{
 	mes "[Mage Guildsman]";
-	mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube.";
+	mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Test Tube.";
 	next;
 	if (select("Alright, Deal.:Nah, forget it.") == 1) {
 		mes "[Mage Guildsman]";
 		if (Zeny < 50) {
-			mes "Hey! You don't have enough money to cover my 50 Zeny charge.";
+			mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee.";
 			close;
 		}
 		if (countitem(1092) == 0) {
-			mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube.";
+			mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me.";
 			close;
 		}
 		delitem 1092,1; //Empty_Cylinder
-		set zeny,zeny-50;
-		getitem 1089,1; //Payon_Potion
+		Zeny -= 50;
+		getitem 1088,1; //Morocc_Potion
 	}
 	close;
 }
diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt
index b5fa9a8a9..5ad2cbbdb 100644
--- a/npc/quests/monstertamers.txt
+++ b/npc/quests/monstertamers.txt
@@ -4,8 +4,6 @@
 //= kobra_k88, Darkchild, x[tsk]
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Cute pet quest items
 //===== Additional Comments: =================================
@@ -16,10 +14,10 @@
 //= 1.4 Updated Monster taming item quests. [L0ne_W0lf]
 //= 1.4a FIXED item requirement for stellar hairpin. [L0ne_W0lf]
 //= 1.4b Fixed the delitem assosiated with the last uptate. [L0ne_W0lf]
-//= 1.5 Renamed Izlude Monster Tamer to function with Renewal [Streusel]
+//= 1.5 Moved Izlude NPC to pre-re/re paths.
 //============================================================
 
-alberta_in,173,76,4	script	Monster Tamer#alb	125,{
+alberta_in,173,76,4	script	Monster Tamer#alb	4_M_TELEPORTER,{
 	mes "[Iwado]";
 	mes "This is the height of the era of Monster Taming! Don't you feel the need to gather monster items to be able to connect and to communicate with the Cute Monsters!?";
 	next;
@@ -187,7 +185,7 @@ alberta_in,173,76,4	script	Monster Tamer#alb	125,{
 }
 
 
-aldeba_in,168,175,4	script	Monster Tamer#alde	125,{
+aldeba_in,168,175,4	script	Monster Tamer#alde	4_M_TELEPORTER,{
 	mes "[YuU]";
 	mes "You must be looking for monster items! In making monster items, there is no monster tamer in Rune Midgard that's better than me.";
 	next;
@@ -438,7 +436,7 @@ aldeba_in,168,175,4	script	Monster Tamer#alde	125,{
 			mes "Rocker Glasses!";
 			delitem 912,2;  //Zargon
 			delitem 2208,1;  //Ribbon
-			set Zeny,Zeny-400;
+			Zeny -= 400;
 			getitem 10014,1; // Rocker_Glasses
 			close;
 		}
@@ -465,7 +463,7 @@ aldeba_in,168,175,4	script	Monster Tamer#alde	125,{
 	}
 }
 
--	script	::Monster_Tamer#izu	-1,{
+-	script	::MonsterTamer_izlude	-1,{
 	mes "[Shogo]";
 	mes "Are you pre-occupied with";
 	mes "gathering items for monsters";
@@ -621,7 +619,7 @@ aldeba_in,168,175,4	script	Monster Tamer#alde	125,{
 	}
 }
 
-comodo,112,182,0	script	Munak's Grandma	103,{
+comodo,112,182,0	script	Munak's Grandma	8_F_GRANDMOTHER,{
 	if (countitem(1558) > 0) {
 		mes "[Munak's grandma]";
 		mes "Oh my...";
diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt
index 8f5d94117..065dc5f89 100644
--- a/npc/quests/mrsmile.txt
+++ b/npc/quests/mrsmile.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Mr. Smile Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88, Akaru
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4a
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.4a Fixed a little Typo error in duplicates. (bugreport:749) [Samuray22]
-//============================================================ 
+//============================================================
 
--	script	Smile Assistance::SmileHelper	92,{
+-	script	Smile Assistance::SmileHelper	4_F_03,{
 	mes "[Smile Girl]";
 	mes "Hi ~ Hi ~";
 	mes "This is Smile Assistance.";
@@ -95,17 +93,17 @@
 }
 
 // Additional Smile Assistance staff
-alberta,113,53,4	duplicate(SmileHelper)	Smile Assistance#alb	92
-aldebaran,136,135,4	duplicate(SmileHelper)	Smile Assistance#alde	92
-geffen,119,107,4	duplicate(SmileHelper)	Smile Assistance#gef	92
-moc_ruins,59,154,3	duplicate(SmileHelper)	Smile Assistance#moc	92
-payon,186,104,5	duplicate(SmileHelper)	Smile Assistance#pay	92
-prontera,157,187,4	duplicate(SmileHelper)	Smile Assistance#prt	92
+alberta,113,53,4	duplicate(SmileHelper)	Smile Assistance#alb	4_F_03
+aldebaran,136,135,4	duplicate(SmileHelper)	Smile Assistance#alde	4_F_03
+geffen,119,107,4	duplicate(SmileHelper)	Smile Assistance#gef	4_F_03
+moc_ruins,59,154,3	duplicate(SmileHelper)	Smile Assistance#moc	4_F_03
+payon,186,104,5	duplicate(SmileHelper)	Smile Assistance#pay	4_F_03
+prontera,157,187,4	duplicate(SmileHelper)	Smile Assistance#prt	4_F_03
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Fully working. 1.1 Optimized
 //= 1.2 updated Payon coords [Lupus]
 //= 1.3 fixed exploit [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 71c33e6aa..d2cbe4c8c 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -1,13 +1,11 @@
 //===== Hercules Script ======================================
 //= 2004 Headgear Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Dj-Yhn
-//===== Current Version: ===================================== 
-//= 1.6a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.6b
+//===== Description: =========================================
+//= [Official Conversion]
 //= 2004 New Headgears. Official Quests
 //= 1) Black Cat Ears (payon 115 131)
 //= 2) X Hairpin, Band Aid, Flower Hairpin (geffen 129 148)
@@ -21,12 +19,12 @@
 //= 10) Model Training Hat (payon_in03 8 193)
 //= 11) Tulip Haipin (geffen 83 189)
 //= 12) Party Hat, Straw Hat, Cowboy Hat, (xmas_in 35 30)
-//=	Sombrero, Beanie 
+//=     Sombrero, Beanie
 //= 13) Decorative Golden Bell, (yuno_in03 20 18)
-//=	Crown of Ancient Queen, Crown of Mistress
+//=     Crown of Ancient Queen, Crown of Mistress
 //= 14) Alarm Mask (alde_alche 88 180)
 //= 15) Drooping Cat, Smokie Leaf, Lazy Smokie, (morocc 273 79)
-//	Blue Fish
+//=     Blue Fish
 //= 16) Kitsune Mask (pay_dun03 48 84)
 //= 17) Orc Hero Helm (in_orcs01 31 93 & 162 33)
 //===== Additional Comments: =================================
@@ -34,11 +32,13 @@
 //= 1.5 Vito'd function call for checkweight. [L0ne_W0lf]
 //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.6a Added 'disable_items' command. [Euphy]
+//= 1.6b Added more 'disable_items' commands. [Euphy]
 //============================================================
 
 // Black Cat Ears
 //============================================================
-payon,115,131,3	script	Neko Neko#1	725,{
+payon,115,131,3	script	Neko Neko#1	4_F_JOB_ASSASSIN,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -68,7 +68,7 @@ payon,115,131,3	script	Neko Neko#1	725,{
 		delitem 2213,1; //Cat_Hairband
 		delitem 983,1; //Black_Dyestuffs
 		delitem 914,200; //Fluff
-		set zeny,zeny-10000;
+		Zeny -= 10000;
 		getitem 5057,1; //Ear_Of_Black_Cat
 		next;
 		mes "[Neko Neko]";
@@ -105,7 +105,8 @@ payon,115,131,3	script	Neko Neko#1	725,{
 
 // X Hairpin, Band Aid, Flower Hairpin
 //============================================================
-geffen,129,148,3	script	Argen#1	779,{
+geffen,129,148,3	script	Argen#1	4_M_YOYOROGUE,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "[Argen]";
 		mes "Hey~ why are you carrying so many items?";
@@ -249,7 +250,7 @@ geffen,129,148,3	script	Argen#1	779,{
 			mes "Hey, that looks pretty smooth! Oh, and uh, you can keep this leftover Stem.";
 			delitem 2269,1; //Centimental_Flower
 			delitem 999,10; //Steel
-			set zeny,zeny-20000;
+			Zeny -= 20000;
 			getitem 5061,1; //Flower_Hairpin
 			getitem 905,1; //Stem
 			next;
@@ -294,7 +295,8 @@ geffen,129,148,3	script	Argen#1	779,{
 
 // Hot-blooded Headband
 //============================================================
-yuno,300,188,5	script	Zhenbolt#1	753,{
+yuno,300,188,5	script	Zhenbolt#1	4_M_MONK,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -389,7 +391,8 @@ yuno,300,188,5	script	Zhenbolt#1	753,{
 
 // Red Ribbon
 //============================================================
-prontera,165,232,3	script	Nephia#1	744,{
+prontera,165,232,3	script	Nephia#1	4_F_ALCHE,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -503,7 +506,7 @@ prontera,165,232,3	script	Nephia#1	744,{
 
 // Indian Headband
 //============================================================
-comodo,237,217,5	script	Meruntei#1	732,{
+comodo,237,217,5	script	Meruntei#1	4_M_JOB_HUNTER,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -521,7 +524,7 @@ comodo,237,217,5	script	Meruntei#1	732,{
 		delitem 5010,1; //Indian_Hair_Piece
 		delitem 5049,1; //Stripe_Band
 		delitem 7101,10; //Peco_Wing_Feather
-		set zeny,zeny-10000;
+		Zeny -= 10000;
 		getitem 5071,1; //Indian_Headband
 		next;
 		mes "[Meruntei]";
@@ -557,7 +560,7 @@ comodo,237,217,5	script	Meruntei#1	732,{
 
 // Mushroom Band
 //============================================================
-geffen,67,87,3	script	Ipore#1	700,{
+geffen,67,87,3	script	Ipore#1	8_F_GIRL,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -637,7 +640,7 @@ geffen,67,87,3	script	Ipore#1	700,{
 
 // Angel Wing Ears, Devil Wing Ears
 //============================================================
-yuno,241,52,3	script	Old Blacksmith#hgear	813,{
+yuno,241,52,3	script	Old Blacksmith#hgear	2_M_OLDBLSMITH,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -686,8 +689,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item.^000000 I can't mess up my artwork because of some mistake you might make.";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch...!";
 					mes "Why are you carrying so many items with you? Leave all your extra baggage somewhere else and come back.";
@@ -706,7 +708,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "'Angel Wing Ears!'";
 						delitem 2254,1; //Angelic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						Zeny -= 20000;
 						getitem 5074,1; //Ear_Of_Angel's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -745,8 +747,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item.^000000 I can't mess up my artwork because of some mistake you might make.";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch...!";
 					mes "Why are you carrying so many items with you? Leave all your extra baggage somewhere else and come back.";
@@ -762,7 +763,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "There you go, buddy. I am proud to say this is my masterpiece. I call it... 'Devil Wing Ears!'";
 						delitem 2255,1; //Satanic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						Zeny -= 20000;
 						getitem 5068,1; //Ear_Of_Devil's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -813,8 +814,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item. I can't mess up my artwork because of some mistake you might make. ^000000";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch, why are you carrying";
 					mes "so many items with you?";
@@ -833,7 +833,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "I am proud to say this is my masterpiece. Please take this item. I call it... 'Devil Wing Ears!'";
 						delitem 2255,1; //Satanic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						Zeny -= 20000;
 						getitem 5068,1; //Ear_Of_Devil's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -869,8 +869,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item.^000000 I can't mess up my artwork because of some mistake you might make.";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch, why are you carrying";
 					mes "so many items with you?";
@@ -888,7 +887,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "I am proud to say this is my masterpiece. Please take this item. I call it... 'Angel Wing Ears!'";
 						delitem 2254,1; //Angelic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						Zeny -= 20000;
 						getitem 5074,1; //Ear_Of_Angel's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -962,7 +961,8 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 
 // Sea-Otter Hat
 //============================================================
-xmas,183,267,3	script	Pretty Lindsay#1	793,{
+xmas,183,267,3	script	Pretty Lindsay#1	4_F_NFLOSTGIRL,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -971,8 +971,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 		mes "- you put some items into Kafra Storage. -";
 		close;
 	}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight-Weight < 2000) {
 		mes "[Pretty Lindsay]";
 		mes "I know you brought everything you need for me to make you a hat, but you're carrying too much stuff. Why don't you put some of your things in Kafra Storage?";
 		close;
@@ -1077,7 +1076,8 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 
 // Teddybear Hat
 //============================================================
-xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
+xmas,175,156,3	script	Fuzzy Fuzz#1	4_M_05,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -1164,7 +1164,8 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
 
 // Model Training Hat
 //============================================================
-payon_in03,8,193,4	script	Nanhyang#1	77,{
+payon_in03,8,193,4	script	Nanhyang#1	1_F_ORIENT_03,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -1324,7 +1325,8 @@ payon_in03,8,193,4	script	Nanhyang#1	77,{
 
 // Tulip Hairpin
 //============================================================
-geffen,83,189,5	script	Seth#1	716,{
+geffen,83,189,5	script	Seth#1	4_M_KID2,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes " [Seth]";
 		mes "Whoa, why are you carrying so many items with you?";
@@ -1378,7 +1380,7 @@ geffen,83,189,5	script	Seth#1	716,{
 			mes "I'm done!";
 			mes "I did a good job, didn't I?";
 			next;
-			if (BaseJob == Job_Novice && Upper != 1) {
+			if (BaseJob == Job_Novice || BaseJob == Job_SuperNovice) {
 				mes "[Seth]";
 				mes "Oh, here's the leftovers. Mommy says that we should always save things. Heh heh~";
 				getitem 935,1; //Shell
@@ -1442,7 +1444,8 @@ geffen,83,189,5	script	Seth#1	716,{
 	
 // Party Hat, Straw Hat, Cowboy Hat, Sombrero, Beanie
 //============================================================
-xmas_in,35,30,3	script	Hat Merchant#zero	797,{
+xmas_in,35,30,3	script	Hat Merchant#zero	4_M_NFLOSTMAN,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -1732,7 +1735,8 @@ xmas_in,35,30,3	script	Hat Merchant#zero	797,{
 
 // Decorative Golden Bell, Crown of Ancient Queen, Crown of Mistress
 //============================================================
-yuno_in03,20,18,6	script	Nehris#1	726,{
+yuno_in03,20,18,6	script	Nehris#1	4_F_JOB_BLACKSMITH,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -1774,7 +1778,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 			delitem 10016,1; //Golden_Bell
 			delitem 714,1; //Emperium
 			delitem 969,3; //Gold
-			set zeny,zeny-20000;
+			Zeny -= 20000;
 			getitem 5091,1; //Big_Golden_Bell
 			mes "[Nehris]";
 			mes "Yoohoo~";
@@ -1812,7 +1816,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 			delitem 10006,1; //Queen's_Hair_Ornament
 			delitem 714,1; //Emperium
 			delitem 969,3; //Gold
-			set zeny,zeny-20000;
+			Zeny -= 20000;
 			getitem 5080,1; //Headgear_Of_Queen
 			mes "[Nehris]";
 			mes "Tah dah!";
@@ -1862,7 +1866,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 				delitem 2249,1; //Coronet
 				delitem 714,1; //Emperium
 				delitem 969,3; //Gold
-				set zeny,zeny-40000;
+				Zeny -= 40000;
 				getitem 5081,1; //Mistress_Crown
 				mes "[Nehris]";
 				mes "Yay! You've got a great looking crown!";
@@ -1896,7 +1900,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 
 // Alarm Mask
 //============================================================
-alde_alche,88,180,0	script	Muscle Man#Alarm Mask	748,{
+alde_alche,88,180,0	script	Muscle Man#Alarm Mask	4_M_ALCHE_A,{
 	if (checkweight(1201,1) == 0) {
 		mes "[Muscle Man]";
 		mes "Hmmm...";
@@ -1915,7 +1919,7 @@ alde_alche,88,180,0	script	Muscle Man#Alarm Mask	748,{
 	mes "It's sexy time!";
 	next;
 	specialeffect EF_FLASHER;
-	setnpcdisplay "Muscle Man#Alarm Mask", 1193;
+	setnpcdisplay "Muscle Man#Alarm Mask", ALARM;
 	enablenpc " #Alarm Mask Man1";
 	enablenpc " #Alarm Mask Man2";
 	enablenpc " #Alarm Mask Man3";
@@ -2030,7 +2034,7 @@ alde_alche,88,180,0	script	Muscle Man#Alarm Mask	748,{
 
 OnTimer4000:
 	specialeffect EF_FLASHER;
-	setnpcdisplay "Muscle Man#Alarm Mask", 748;
+	setnpcdisplay "Muscle Man#Alarm Mask", 4_M_ALCHE_A;
 	disablenpc " #Alarm Mask Man1";
 	disablenpc " #Alarm Mask Man2";
 	disablenpc " #Alarm Mask Man3";
@@ -2043,25 +2047,25 @@ OnTimer4000:
 	end;
 }
 
-alde_alche,86,184,0	script	 #Alarm Mask Man1	1193,{
+alde_alche,86,184,0	script	 #Alarm Mask Man1	ALARM,{
 OnInit:
 	disablenpc " #Alarm Mask Man1";
 	end;
 }
 
-alde_alche,89,184,0	script	 #Alarm Mask Man2	1193,{
+alde_alche,89,184,0	script	 #Alarm Mask Man2	ALARM,{
 OnInit:
 	disablenpc " #Alarm Mask Man2";
 	end;
 }
 
-alde_alche,92,184,0	script	 #Alarm Mask Man3	1193,{
+alde_alche,92,184,0	script	 #Alarm Mask Man3	ALARM,{
 OnInit:
 	disablenpc " #Alarm Mask Man3";
 	end;
 }
 
-alde_alche,95,184,0	script	 #Alarm Mask Man4	1193,{
+alde_alche,95,184,0	script	 #Alarm Mask Man4	ALARM,{
 OnInit:
 	disablenpc " #Alarm Mask Man4";
 	end;
@@ -2069,7 +2073,8 @@ OnInit:
 
 // Drooping Cat, Smokie Leaf, Lazy Smokie, Blue Fish
 //============================================================
-morocc,273,79,4	script	Educated Traveller	99,{
+morocc,273,79,4	script	Educated Traveller	4W_M_03,{
+	disable_items;
 	if ((MaxWeight-Weight) < 5000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're over weight -";
@@ -2449,7 +2454,7 @@ morocc,273,79,4	script	Educated Traveller	99,{
 
 // Kitsune Mask
 //============================================================
-pay_dun03,48,84,4	script	Nine Tails#Kitsune Mask	1180,1,1,{
+pay_dun03,48,84,4	script	Nine Tails#Kitsune Mask	NINE_TAIL,1,1,{
 	end;
 
 OnInit:
@@ -2505,7 +2510,8 @@ OnTouch:
 	end;
 }
 
-pay_dun03,48,84,4	script	Nine Tails#Kitsune Man	762,{
+pay_dun03,48,84,4	script	Nine Tails#Kitsune Man	4_M_JPN2,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you are carrying -";
@@ -2625,8 +2631,9 @@ OnMyMobDead2:
 
 // Orc Hero Helmet
 //============================================================
-in_orcs01,31,93,1	script	Orc Warrior#1	1023,2,2,{
+in_orcs01,31,93,1	script	Orc Warrior#1	ORK_WARRIOR,2,2,{
 OnTouch:
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -3495,7 +3502,7 @@ OnTouch:
 	}
 }
 
-in_orcs01,162,33,1	script	Orc Hero#1	1087,2,2,{
+in_orcs01,162,33,1	script	Orc Hero#1	ORK_HERO,2,2,{
 OnTouch:
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
@@ -3625,14 +3632,14 @@ OnTouch:
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.01 Fixed items names iRO->kRO, fixed some bugs [Qwadrat]
-//=	Fixed possible item exploits, fixed Straw Hat
-//= 	Added missing checks [Lupus]
-//= 1.1	Fixed a bug in Giant-band-aid that didn't counting rotten bandages
-//=	Fixed a bug in Fur Hat that didn't count yarn [Evera]
+//=     Fixed possible item exploits, fixed Straw Hat
+//=     Added missing checks [Lupus]
+//= 1.1 Fixed a bug in Giant-band-aid that didn't counting rotten bandages
+//=     Fixed a bug in Fur Hat that didn't count yarn [Evera]
 //= 1.2 Syntax fixes for parenthesis, reformatting [KarLaeda]
 //= 1.3 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //============================================================
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index e60169ab0..b31e07bd8 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -1,13 +1,11 @@
 //===== Hercules Script ======================================
 //= 2005 Headgear Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= MasterOfMuppets
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= 2005 Headgears Official Quest.
 //===== Additional Comments: =================================
 //= 1.0 First version, converted from the official aegis script. [MasterOfMuppets]
@@ -16,9 +14,9 @@
 //= 1.3 Fixed item check bugs, added missing airport NPC,
 //      and took out unneeded breaks [Xantara] [Muad_Dib]
 //= 1.3a Added 'disable_items' command. [Euphy]
-//============================================================ 
+//============================================================
 
-yuno,222,116,3	script	Kasis#LhzHat	851,{
+yuno,222,116,3	script	Kasis#LhzHat	4_M_REPAIR,{
 	if(countitem(519) > 49 && countitem(7031) > 49 && countitem(548) > 49 && countitem(539) > 49)
 	{
 		mes "[Kasis]";
@@ -227,7 +225,7 @@ yuno,222,116,3	script	Kasis#LhzHat	851,{
 	}
 }
 
-lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
+lighthalzen,143,68,0	script	Strange Guy#LhzHat	1_M_01,{
 	disable_items;
 	if(DTHATQ == 0)
 	{
@@ -574,7 +572,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 				delitem 7301,1887;
 				delitem 5120,1;
 				delitem 611,10;
-				set Zeny, Zeny - 1887;
+				Zeny -= 1887;
 				set DTHATQ,2;
 				getitem 5108,1;
 				next;
@@ -732,7 +730,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 				delitem 7301,1887;
 				delitem 5120,1;
 				delitem 611,10;
-				set Zeny, Zeny - 1887;
+				Zeny -= 1887;
 				set DTHATQ,2;
 				getitem 5108,1;
 				next;
@@ -748,9 +746,9 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 	}
 }
 
-lighthalzen,360,313,3	script	Kid#LhzHat	706,{
+lighthalzen,360,313,3	script	Kid#LhzHat	4_M_KID1,{
 	mes "[Kid]";
-	if(sex)
+	if(Sex)
 		mes "Hello, mister!";
 	else
 		mes "Hello, ma'am!";
@@ -873,7 +871,7 @@ lighthalzen,360,313,3	script	Kid#LhzHat	706,{
 	}
 }
 
-einbech,70,222,5	script	Metelle#LhzHat	91,{
+einbech,70,222,5	script	Metelle#LhzHat	4_F_02,{
 	if(countitem(983) && countitem(7267) > 998 && countitem(749) && Zeny > 49999)
 	{
 		mes "[Metelle]";
@@ -919,7 +917,7 @@ einbech,70,222,5	script	Metelle#LhzHat	91,{
 				delitem 983,1;
 				delitem 7267,999;
 				delitem 749,1;
-				set Zeny,Zeny - 50000;
+				Zeny -= 50000;
 				getitem 5115,1;
 				next;
 				mes "...";
@@ -983,7 +981,7 @@ einbech,70,222,5	script	Metelle#LhzHat	91,{
 
 }
 
-lhz_in02,91,38,5	script	Margaret Mary#LhzHat	90,{
+lhz_in02,91,38,5	script	Margaret Mary#LhzHat	4_F_01,{
 
 	mes "[Margaret Mary]";
 	mes "The white rose, in its";
@@ -1036,7 +1034,7 @@ lhz_in02,91,38,5	script	Margaret Mary#LhzHat	90,{
 						delitem 731,10;
 						delitem 748,3;
 						delitem 982,1;
-						set Zeny,Zeny - 50000;
+						Zeny -= 50000;
 						getitem 5117,1;
 						close;
 
@@ -1086,7 +1084,7 @@ lhz_in02,91,38,5	script	Margaret Mary#LhzHat	90,{
 
 }
 
-lighthalzen,182,89,0	script	Relaxed-Looking Lady	91,{
+lighthalzen,182,89,0	script	Relaxed-Looking Lady	4_F_02,{
 	disable_items;
 	if(LHZBTQ == 0)
 	{
@@ -1284,7 +1282,7 @@ lighthalzen,182,89,0	script	Relaxed-Looking Lady	91,{
 				delitem 10007,1;
 				delitem 975,1;
 				delitem 5032,1;
-				set Zeny,Zeny - 50000;
+				Zeny -= 50000;
 				getitem 5109,1;
 				set LHZBTQ,3;
 				next;
@@ -1357,7 +1355,7 @@ lighthalzen,182,89,0	script	Relaxed-Looking Lady	91,{
 				delitem 10007,1;
 				delitem 975,1;
 				delitem 5032,1;
-				set Zeny,Zeny - 50000;
+				Zeny -= 50000;
 				getitem 5109,1;
 				next;
 				mes "[Achiha]";
@@ -1383,7 +1381,7 @@ lighthalzen,182,89,0	script	Relaxed-Looking Lady	91,{
 	}
 }
 
-gl_prison1,137,138,5	script	Zealotus#LhzHat	1200,{
+gl_prison1,137,138,5	script	Zealotus#LhzHat	ZHERLTHSH,{
 	if(ZLMASKQ == 0)
 	{
 		mes "[Zealotus]";
@@ -1590,7 +1588,7 @@ gl_prison1,137,138,5	script	Zealotus#LhzHat	1200,{
 
 }
 
-gl_prison1,97,104,1	script	Phendark#LhzHat	1202,{
+gl_prison1,97,104,1	script	Phendark#LhzHat	PHENDARK,{
 	if(ZLMASKQ == 0)
 	{
 		mes "[Phendark]";
@@ -1626,13 +1624,13 @@ gl_prison1,97,104,1	script	Phendark#LhzHat	1202,{
 		emotion e_sob;
 
 		if(!(
-			countitem(1950) || countitem(1951) || countitem(1952) || 
-			countitem(1953) || countitem(1954) || countitem(1955) || 
-			countitem(1956) || countitem(1957) || countitem(1958) || 
-			countitem(1959) || countitem(1960) || countitem(1961) || 
-			countitem(1962) || countitem(1963) || countitem(1964) || 
-			countitem(1965) || countitem(1966) || countitem(1967) || 
-			countitem(1968) || countitem(1969) || countitem(1970) || 
+			countitem(1950) || countitem(1951) || countitem(1952) ||
+			countitem(1953) || countitem(1954) || countitem(1955) ||
+			countitem(1956) || countitem(1957) || countitem(1958) ||
+			countitem(1959) || countitem(1960) || countitem(1961) ||
+			countitem(1962) || countitem(1963) || countitem(1964) ||
+			countitem(1965) || countitem(1966) || countitem(1967) ||
+			countitem(1968) || countitem(1969) || countitem(1970) ||
 			countitem(1971)
 		))
 			close; // no whip equipped or in inventory
@@ -1999,7 +1997,7 @@ gl_prison1,97,104,1	script	Phendark#LhzHat	1202,{
 	}
 }
 
-gl_prison1,100,48,5	script	Rybio#LhzHat	1201,{
+gl_prison1,100,48,5	script	Rybio#LhzHat	RYBIO,{
 	if(ZLMASKQ == 2)
 	{
 		mes "[Rybio]";
@@ -2109,7 +2107,7 @@ gl_prison1,100,48,5	script	Rybio#LhzHat	1201,{
 	}
 }
 
-airport,148,41,3	script	Freight Manager#toast	852,{
+airport,148,41,3	script	Freight Manager#toast	4_M_EIN_SOLDIER,{
 	mes "[Kirishu]";
 	mes "Oh man...";
 	mes "It's almost lunchtime,";
diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt
index 2b62662ce..a777db3f3 100644
--- a/npc/quests/newgears/2006_headgears.txt
+++ b/npc/quests/newgears/2006_headgears.txt
@@ -5,25 +5,26 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Censor Bar, Feather Beret, Valk. Helm, Hahoe Mask,
 //= Mythical Lion Mask, Bride Mask, Magistrate Hat and Ayam
 //===== Additional Comments: =================================
 //= NPC id's and dialog are custom, please replace
 //= 1.0a fixed typos, added missing names, more cleaned and
-//= standartized stuff a bit [Lupus]
+//=     standartized stuff a bit [Lupus]
 //= 1.0b fixed Helm of Valkyries ingredients
 //= 1.0c corrected item names according to item_db [Lupus]
 //= 1.1 Full update. EuRO (?) dialogs, and positions. [L0ne_W0lf]
 //= 1.2 Fixed bugs in the Hahoe/Lion/Bride Mask NPC. [L0ne_W0lf]
-//=	Fixed some of the names to iRO.
+//=     Fixed some of the names to iRO.
 //= 1.3 Fixed some color code bugs in Ghenirhemin. Thanks to yyCC. [L0ne_W0lf]
 //= 1.3a Fixed wrong item names (due to copy/paste) [Lupus]
 //= 1.4 Chungwolmang now checks if the last item set should be deleted. (bugreport:4719) [L0ne_W0lf]
 //============================================================
 
-//===================== Censor Bar =====================================================
-rachel,91,273,8	script	?	930,{
+// Censor Bar
+//============================================================
+rachel,91,273,8	script	?	4_M_RACHMAN2,{
 	if (countitem(983) > 0 && countitem(7111) > 99 && countitem(938) > 98 && Zeny > 99999) {
 		mes "[?]";
 		mes "Giggle giggle...isn't it my partner, eh?";
@@ -48,8 +49,8 @@ rachel,91,273,8	script	?	930,{
 		next;
 		delitem 983,1; //Black_Dyestuffs
 		delitem 7111,100; //Smooth_Paper
-		delitem 938,99; //Sticky_Mucus 
-		set Zeny,Zeny-100000;
+		delitem 938,99; //Sticky_Mucus
+		Zeny -= 100000;
 		getitem 5175,1; //Anonimity_Request
 		mes "[?]";
 		mes "Phew...it's done. Well, it was not that difficult to make, but...";
@@ -89,8 +90,9 @@ rachel,91,273,8	script	?	930,{
 	close;
 }
 
-//======================== Feather Beret ================================================
-rachel,152,131,3	script	Sakjul	928,{
+// Feather Beret
+//============================================================
+rachel,152,131,3	script	Sakjul	4_M_MIDDLE1,{
 	if (countitem(5172) > 0 && countitem(7063) > 99 && countitem(982) > 0) {
 		mes "[Sakjul]";
 		mes "Great, you have brought everything";
@@ -122,8 +124,8 @@ rachel,152,131,3	script	Sakjul	928,{
 		next;
 		set .@result,rand(1,10);
 		if (.@result == 4) {
-			delitem 5172,1; //Beret 
-			delitem 7063,100; //Soft_Feather 
+			delitem 5172,1; //Beret
+			delitem 7063,100; //Soft_Feather
 			delitem 982,1; //White_Dyestuffs
 			mes "[Sakjul]";
 			mes "I did succeed in making the hat,";
@@ -146,10 +148,10 @@ rachel,152,131,3	script	Sakjul	928,{
 			mes "If you understood, now, go, go gather the materials again!";
 			close;
 		}
-		delitem 5172,1; //Beret 
-		delitem 7063,100; //Soft_Feather 
+		delitem 5172,1; //Beret
+		delitem 7063,100; //Soft_Feather
 		delitem 982,1; //White_Dyestuffs
-		getitem 5170,1; //Feather_Beret 
+		getitem 5170,1; //Feather_Beret
 		mes "[Sakjul]";
 		mes "Great, I have made it! Look at this beautiful coordination";
 		mes "between the feather and the beret,";
@@ -204,12 +206,13 @@ rachel,152,131,3	script	Sakjul	928,{
 	close;
 }
 
-//============================ Valkyrie Helm =====================================================
-hugel,147,103,3	script	Ghenirhemin	897,{
+// Valkyrie Helm
+//============================================================
+hugel,147,103,3	script	Ghenirhemin	4_M_HUGRANFA,{
 	if (moza_valkylie == 5) {
 		set .@val2,rand(1,10);
 		if (.@val2 == 3) {
-			misceffect 348; //EF_LIGHTSPHERE
+			specialeffect EF_LIGHTSPHERE;
 			mes "[Ghenirhemin]";
 			mes "The materials are still being fused.";
 			next;
@@ -217,7 +220,7 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 			mes "Umm?! Oh...oh?! Isn't this...";
 			mes "Isn't this...?!";
 			next;
-			misceffect 322; //EF_FORESTLIGHT2
+			specialeffect EF_FORESTLIGHT2;
 			mes "[Ghenirhemin]";
 			mes "Ah...ahahaha, we've made it! We've made it!";
 			mes "Valkyre's Helm...We've recreated Valkyre's Helm,";
@@ -249,7 +252,7 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 			mes "who is now heading toward the new history.";
 			close;
 		}
-		misceffect 348; //EF_LIGHTSPHERE
+		specialeffect EF_LIGHTSPHERE;
 		mes "[Ghenirhemin]";
 		mes "The materials are still being fused.";
 		close;
@@ -260,7 +263,7 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 			mes "[Ghenirhemin]";
 			mes "............";
 			next;
-			misceffect 348; //EF_LIGHTSPHERE
+			specialeffect EF_LIGHTSPHERE;
 			mes "[Ghenirhemin]";
 			mes "Oh...oh? They....they just have started being fused!";
 			mes "Look at this shining light!";
@@ -316,7 +319,7 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 			delitem 4166,1; //Nightmare_Terror_Card
 			delitem 7511,1000; //Rune_Of_Darkness
 			delitem 7563,1000; //Bloody_Rune
-			set Zeny,Zeny-10000000;
+			Zeny -= 10000000;
 			set moza_valkylie,3;
 			mes "[Ghenirhemin]";
 			mes "Now I am all nervous";
@@ -560,8 +563,9 @@ hugel,147,103,3	script	Ghenirhemin	897,{
 	mes "when you show me your money. Hahahaha!";
 	close;
 }
-//======================= Hahoe Mask / Mythical Lion Mask / Bride Mask ===============================
-payon,135,320,3	script	Chungwolmang	97,{
+// Hahoe Mask / Mythical Lion Mask / Bride Mask
+//============================================================
+payon,135,320,3	script	Chungwolmang	4W_M_01,{
 	if (moza_tal == 2) {
 		if (countitem(7015) > 19 && countitem(952) > 99 && countitem(1028) > 99) {
 			//Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boar's_Mane
@@ -780,7 +784,7 @@ S_MakeMask:
 		delitem getarg(1),getarg(2);
 		delitem getarg(3),getarg(4);
 		delitem getarg(5),getarg(6);
-		if (getarg(0) == 5169) 
+		if (getarg(0) == 5169)
 			delitem getarg(7),getarg(8);
 		getitem getarg(0),1;
 		set moza_tal,0;
@@ -802,8 +806,9 @@ S_MakeMask:
 }
 
 
-//====================== Magistrate Hat / Ayam =============================================
-payon_in03,139,124,3	script	Han Garam	88,{
+// Magistrate Hat / Ayam
+//============================================================
+payon_in03,139,124,3	script	Han Garam	4_M_ORIENT01,{
 	if (moza_korea == 2 && countitem(954) > 299 && countitem(733) > 4 && countitem(975) > 0 && countitem(7166) > 49) {
 		mes "[Han Garam]";
 		mes "You came back faster than I expected.";
@@ -967,7 +972,7 @@ payon_in03,139,124,3	script	Han Garam	88,{
 		mes "He is waving his tail, and showing me future!";
 		mes "Aaaaaahhhhhhh!";
 		next;
-		misceffect 90; //EF_LORD;
+		specialeffect EF_LORD;
 		mes "[Han Garam]";
 		mes "Waaaahhhh!";
 		next;
@@ -999,7 +1004,7 @@ payon_in03,139,124,3	script	Han Garam	88,{
 		mes "Anyone who brings these, I will create hat for him!";
 		mes "Ahhh~ Dragon God!";
 		next;
-		misceffect 7; //EF_EXIT;
+		specialeffect EF_EXIT;
 		mes "[Han Garam]";
 		mes ".............";
 		next;
diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt
index 62e2aaac3..f45664f3b 100644
--- a/npc/quests/newgears/2008_headgears.txt
+++ b/npc/quests/newgears/2008_headgears.txt
@@ -6,16 +6,16 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Cats Footprint, Cute Ribbon Dyer and Brides Corolla.
 //===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
 //============================================================
 
-gef_fild05,80,149,3	script	Myu#08_hat	877,{
+gef_fild05,80,149,3	script	Myu#08_hat	4_F_YUNYANG,{
 	mes "[Myu]";
 	mes "Meow...";
-	emotion 23;
+	emotion e_omg;
 	next;
 	if(hatcat2008 == 0) {
 		mes "[Myu]";
@@ -23,7 +23,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 		mes "What brings you here? Ho, you are not here to harm Wild Roses, are you?";
 		mes "(Meow!)";
 		next;
-		menu "Meow..?",-;
+		select("Meow..?");
 		mes "[Myu]";
 		mes "Ah, Never mind that.";
 		mes "This place is the village of Deserted people.";
@@ -65,7 +65,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 			mes " ";
 			mes "(Meow!)";
 			next;
-			menu "Meow again?!",-;
+			select("Meow again?!");
 			mes "[Myu]";
 			mes "Hmm Hmm I told you to never mind that.";
 			mes "So as I was saying...";
@@ -75,7 +75,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 			mes "Exactly 1,000 times no more, no less.";
 			mes "Give them 1,000 warnings and they will back off.";
 			next;
-			menu "What do you mean by 1,000 warnings...?",-;
+			select("What do you mean by 1,000 warnings...?");
 			mes "[Myu]";
 			mes "Hu~Do I have to spell it out for you?";
 			next;
@@ -131,7 +131,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 			mes "This is the Seal of our 'Brave Kitty Cats'.";
 			mes "This is soooo valuable, so don't lose it.";
 			next;
-			menu "This is it?",-;
+			select("This is it?");
 			mes "[Myu]";
 			mes "What more did you expect?";
 			mes "That Pow is really a valuable thing!";
@@ -197,7 +197,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	877,{
 	close;
 }
 
-morocc_in,137,102,5	script	Trainee#2008hat01	82,{
+morocc_in,137,102,5	script	Trainee#2008hat01	4_KID01,{
 	mes "[Trainee Elgo]";
 	mes "Welcome.";
 	mes "Please talk to our teacher if you are here to make a dyes.";
@@ -748,7 +748,7 @@ morocc_in,137,102,5	script	Trainee#2008hat01	82,{
 	}
 }
 
-in_orcs01,119,106,3	script	Orc Lady#2008hat03	1273,2,2,{
+in_orcs01,119,106,3	script	Orc Lady#2008hat03	ORC_LADY,2,2,{
 
 OnTouch:
 	mes "["+strcharinfo(0)+"]";
@@ -780,7 +780,7 @@ OnTouch:
 			mes "Weaving the flower...with a ribbon..";
 			mes "Brides...wear...Corollas..";
 			next;
-			menu "Would you make one for me?",-;
+			select("Would you make one for me?");
 			if((countitem(10007) > 0) && (countitem(1032) > 999)) {
 				mes "[Aite]";
 				mes ".. Materials..you..have..";
diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt
index 1c6d4b57d..dfcc7d172 100644
--- a/npc/quests/ninja_quests.txt
+++ b/npc/quests/ninja_quests.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Ninja quests
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
 //= 1.2a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Ninja quests
 //===== Additional Comments: =================================
@@ -15,7 +13,7 @@
 //= 1.2a Kagerou/Oboro support (BaseJob -> BaseClass) [Euphy]
 //============================================================
 
-que_ng,28,50,3	script	Boshuu	709,{
+que_ng,28,50,3	script	Boshuu	4_M_SEAMAN,{
 
 	if (BaseClass != Job_Ninja){
 		mes "[Boshuu]";
@@ -183,7 +181,7 @@ que_ng,28,50,3	script	Boshuu	709,{
 			mes "Come and find me whenever you're ready to request more.";
 			delitem 2102,1;
 			delitem 2117,1;
-			set Zeny,Zeny-10000;
+			Zeny -= 10000;
 			set ninbo,0;
 			set MISC_QUEST,MISC_QUEST | 2048;
 			getitem 2118,1;
@@ -251,7 +249,7 @@ que_ng,28,50,3	script	Boshuu	709,{
 				mes "If you ever want to ask me to make you more items, feel free to come back anytime.";
 				delitem 2102,1;
 				delitem 2117,1;
-				set Zeny,Zeny-10000;
+				Zeny -= 10000;
 				getitem 2118,1;
 				close;
 			}
@@ -353,7 +351,7 @@ que_ng,28,50,3	script	Boshuu	709,{
 				mes "If you ever want to ask me to make you more items, feel free to come back anytime.";
 				delitem 2102,1;
 				delitem 2117,1;
-				set Zeny,Zeny-10000;
+				Zeny -= 10000;
 				set MISC_QUEST,MISC_QUEST | 2048;
 				getitem 2118,1;
 				close;
@@ -362,7 +360,7 @@ que_ng,28,50,3	script	Boshuu	709,{
 	}
 }
 
-que_ng,28,45,3	script	Basshu	86,{
+que_ng,28,45,3	script	Basshu	4_M_04,{
 
 	if(BaseClass != Job_Ninja){
 		mes "[Basshu]";
@@ -523,7 +521,7 @@ que_ng,28,45,3	script	Basshu	86,{
 			mes "If you ever want me to create more items, come and ask me anytime.";
 			delitem 2107,1;
 			delitem 2117,1;
-			set Zeny,Zeny-20000;
+			Zeny -= 20000;
 			set ninbot,0;
 			set MISC_QUEST,MISC_QUEST | 4096;
 			getitem 2119,1;
@@ -596,7 +594,7 @@ que_ng,28,45,3	script	Basshu	86,{
 				mes "If you ever want me to create more items, come and ask me anytime.";
 				delitem 2107,1;
 				delitem 2117,1;
-				set Zeny,Zeny-20000;
+				Zeny -= 20000;
 				getitem 2119,1;
 				close;
 			}
@@ -704,7 +702,7 @@ que_ng,28,45,3	script	Basshu	86,{
 				mes "If you ever want me to create more items, come and ask me anytime.";
 				delitem 2107,1;
 				delitem 2117,1;
-				set Zeny,Zeny-20000;
+				Zeny -= 20000;
 				set MISC_QUEST,MISC_QUEST | 4096;
 				getitem 2119,1;
 				close;
@@ -713,7 +711,7 @@ que_ng,28,45,3	script	Basshu	86,{
 	}
 }
 
-que_ng,27,18,3	script	Toshu	709,{
+que_ng,27,18,3	script	Toshu	4_M_SEAMAN,{
 	
 	if(BaseClass != Job_Ninja){
 		mes "[Toshu]";
@@ -803,7 +801,7 @@ que_ng,27,18,3	script	Toshu	709,{
 			}
 			delitem 2104,1;
 			delitem 2119,1;
-			set Zeny,Zeny-40000;
+			Zeny -= 40000;
 
 			switch (rand(5)) {
 				case 1:
@@ -845,7 +843,7 @@ que_ng,27,18,3	script	Toshu	709,{
 	}
 }
 
-que_ng,72,34,3	script	Craftsman Kaibara	847,{
+que_ng,72,34,3	script	Craftsman Kaibara	4_M_EINOLD,{
 
 	if (BaseClass != Job_Ninja){
 		mes "[Kaibara]";
@@ -907,7 +905,7 @@ que_ng,72,34,3	script	Craftsman Kaibara	847,{
 				delitem 1036,400;
 				delitem 984,5;
 				delitem 7123,30;
-				set Zeny,Zeny-200000;
+				Zeny -= 200000;
 				getitem 13006,1;
 				mes "[Kaibara]";
 				mes "Hmm, looks good.";
@@ -958,7 +956,7 @@ que_ng,72,34,3	script	Craftsman Kaibara	847,{
 				}
 				delitem 999,30;
 				delitem 7022,1;
-				set Zeny,Zeny-20000;
+				Zeny -= 20000;
 				getitem 13007,1;
 				mes "[Kaibara]";
 				mes "Hmm, very well.";
@@ -1006,7 +1004,7 @@ que_ng,72,34,3	script	Craftsman Kaibara	847,{
 				}
 				delitem 999,25;
 				delitem 7099,5;
-				set Zeny,Zeny-32000;
+				Zeny -= 32000;
 				getitem 13011,1;
 				mes "[Kaibara]";
 				mes "Hmm, very well.";
@@ -1055,7 +1053,7 @@ que_ng,72,34,3	script	Craftsman Kaibara	847,{
 				}
 				delitem 999,30;
 				delitem 720,10;
-				set Zeny,Zeny-48000;
+				Zeny -= 48000;
 				getitem 13012,1;
 				mes "[Kaibara]";
 				mes "Hmm, very well.";
@@ -1106,7 +1104,7 @@ que_ng,72,34,3	script	Craftsman Kaibara	847,{
 				delitem 932,500;
 				delitem 12001,10;
 				delitem 722,5;
-				set Zeny,Zeny-120000;
+				Zeny -= 120000;
 				getitem 13014,1;
 				mes "[Kaibara]";
 				mes "Hmm, very well.";
@@ -1124,7 +1122,7 @@ que_ng,72,34,3	script	Craftsman Kaibara	847,{
 	}
 }
 
-que_ng,22,62,3	script	Tetsu	709,{
+que_ng,22,62,3	script	Tetsu	4_M_SEAMAN,{
 
 	mes "[Tetsu]";
 	if(BaseClass != Job_Ninja){
@@ -1193,7 +1191,7 @@ M_BENEKI:
 	delitem 999,50;
 	delitem 7115,20;
 	delitem 984,5;
-	set Zeny,Zeny-90000;
+	Zeny -= 90000;
 	getitem 13300,1;
 	mes "[Tetsu]";
 	mes "Hmm, very well.";
@@ -1241,7 +1239,7 @@ M_DAIS:
 	delitem 999,30;
 	delitem 7301,100;
 	delitem 984,2;
-	set Zeny,Zeny-40000;
+	Zeny -= 40000;
 	getitem 13301,1;
 	mes "[Tetsu]";
 	mes "Hmm, very well.";
@@ -1293,7 +1291,7 @@ M_DAIS4:
 	}
 	delitem 733,20;
 	delitem 984,3;
-	set Zeny,Zeny-40000;
+	Zeny -= 40000;
 	delitem 13301,1;
 	getitem 13302,1;
 	mes "[Tetsu]";
@@ -1342,7 +1340,7 @@ M_REKKA:
 	delitem 7098,100;
 	delitem 7097,100;
 	delitem 7521,50;
-	set Zeny,Zeny-78000;
+	Zeny -= 78000;
 	getitem 13303,1;
 	mes "[Tetsu]";
 	mes "Hmm, very well.";
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt
index 097d7f78b..09a37eca7 100644
--- a/npc/quests/obb_quest.txt
+++ b/npc/quests/obb_quest.txt
@@ -1,28 +1,26 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Old Blue Box Quest
 //===== By ===================================================
 //= Celesta, Lupus
 //===== Version ==============================================
 //= 2.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-// [Aegis Conversion]
+//===== Description: =========================================
+// [Official Conversion]
 //= Old Blue Box quest (?)
 //= Officially this quest gave an OBB in exhange for a the
 //= required items unlimitedly, however this was changed by
-//= Gravity, who claimed this behavior as a bug. 
+//= Gravity, who claimed this behavior as a bug.
 //= The exact purpose of this quest is undetermined, but
 //= Gravity claimed that another quest would eventually
 //= branch from this one.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.8 Added missing checkweights. [L0ne_W0lf]
 //= 1.9 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf]
 //= 2.0 Removed unused "name" variable. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-alberta,43,244,0	script	Tourist#thai	99,{
+alberta,43,244,0	script	Tourist#thai	4W_M_03,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
@@ -457,8 +455,7 @@ alberta,43,244,0	script	Tourist#thai	99,{
 			next;
 			mes "[Tourist]";
 			mes "Hopefully, it'll be useful.";
-			set .@now_weight,MaxWeight-Weight;
-			if (.@now_weight < 500) {
+			if (MaxWeight - Weight < 500) {
 				mes "Umm...it seems you're carrying too much stuff with you.";
 				mes "Doncha want me to help you?";
 				close;
@@ -616,7 +613,7 @@ alberta,43,244,0	script	Tourist#thai	99,{
 	}
 }
 
-moc_ruins,105,62,4	script	Jacob#thai	50,{
+moc_ruins,105,62,4	script	Jacob#thai	1_M_04,{
 	if (thai_head >= 6 && thai_head <= 11) {
 		switch (thai_head) {
 		case 6:
@@ -1063,7 +1060,7 @@ moc_ruins,105,62,4	script	Jacob#thai	50,{
 	}
 }
 
-comodo,68,195,0	script	Old Man#thai	120,{
+comodo,68,195,0	script	Old Man#thai	2_M_PHARMACIST,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
@@ -1844,7 +1841,7 @@ comodo,68,195,0	script	Old Man#thai	120,{
 	}
 }
 
-moc_ruins,107,62,0	script	Tommy#thai	716,{
+moc_ruins,107,62,0	script	Tommy#thai	4_M_KID2,{
 	if (thai_head >= 6 && thai_head <= 11) {
 		switch(thai_head) {
 		case 6:
@@ -1939,10 +1936,10 @@ moc_ruins,107,62,0	script	Tommy#thai	716,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Official OBB Quest. You can pass it any times you want.
 //= 1.6 Updated, fixed, optimized and translated into English [Lupus]
 //= 1.6a Halved the required items to make an obb, thanks to marquis007 [MasterOfMuppets]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index a2a84f868..ff6f6af85 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -1,16 +1,17 @@
 //===== Hercules Script ======================================
 //= Falicious Okolnir (Valfreja & Nidhoggr)
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Joseph
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
 //= God Item SE Creation script (Asprika & Brynhild)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 0.x Previous author: L0ne_W0lf
 //= 1.0 Merged Okolnir. [Joseph]
-//============================================================ 
+//= 1.1 Some bug fixes. [Toshiro90/Euphy]
+//============================================================
 
 function	script	F_Okolnir	{
 	if (compare(strnpcinfo(0),"main")) end;
@@ -20,7 +21,7 @@ function	script	F_Okolnir	{
 
 -	script	Guide#gq_main	-1,{
 	set .@sub$, callfunc("F_Okolnir");
-	set .@GID, GetCastleData(strnpcinfo(4),1);
+	set .@GID, getcastledata(strnpcinfo(4),1);
 	if (getcharid(2) == .@GID) {
 		if (getd("$siz_"+.@sub$+"_on") == 0) {
 			mes "[Guide]";
@@ -57,9 +58,9 @@ function	script	F_Okolnir	{
 				mes "Would you like to try to enter here?";
 				close;
 			case 2:
-				set .@Defence,GetCastleData(strnpcinfo(4),3);
-				set .@Economy,GetCastleData(strnpcinfo(4),2);
-				if ((.@Economy > 64) && (.@Defence > 29)) {
+				set .@defence,getcastledata(strnpcinfo(4),3);
+				set .@Economy,getcastledata(strnpcinfo(4),2);
+				if ((.@Economy > 64) && (.@defence > 29)) {
 					mes "[Guide]";
 					mes "Great! Economy and Defense are OK.";
 					mes "You can enter Okolnir now....";
@@ -143,16 +144,16 @@ OnInit:
 	end;
 }
 
-arug_cas01,161,371,3	duplicate(Guide#gq_main)	Guide#gq_aru01	899,
-arug_cas02,349,347,3	duplicate(Guide#gq_main)	Guide#gq_aru02	899,
-arug_cas03,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru03	899,
-arug_cas04,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru04	899,
-arug_cas05,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru05	899,
-schg_cas01,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch01	899,
-schg_cas02,181,335,3	duplicate(Guide#gq_main)	Guide#gq_sch02	899,
-schg_cas03,84,101,3	duplicate(Guide#gq_main)	Guide#gq_sch03	899,
-schg_cas04,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch04	899,
-schg_cas05,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch05	899,
+arug_cas01,161,371,3	duplicate(Guide#gq_main)	Guide#gq_aru01	4_M_HUMAN_02
+arug_cas02,349,347,3	duplicate(Guide#gq_main)	Guide#gq_aru02	4_M_HUMAN_02
+arug_cas03,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru03	4_M_HUMAN_02
+arug_cas04,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru04	4_M_HUMAN_02
+arug_cas05,324,161,3	duplicate(Guide#gq_main)	Guide#gq_aru05	4_M_HUMAN_02
+schg_cas01,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch01	4_M_HUMAN_02
+schg_cas02,181,335,3	duplicate(Guide#gq_main)	Guide#gq_sch02	4_M_HUMAN_02
+schg_cas03,84,101,3	duplicate(Guide#gq_main)	Guide#gq_sch03	4_M_HUMAN_02
+schg_cas04,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch04	4_M_HUMAN_02
+schg_cas05,376,307,3	duplicate(Guide#gq_main)	Guide#gq_sch05	4_M_HUMAN_02
 
 que_qaru01,345,23,0	warp	Gate02#gq_aru01	1,1,arug_cas01,157,369
 que_qaru02,345,23,0	warp	Gate02#gq_aru02	1,1,arug_cas02,349,355
@@ -168,7 +169,7 @@ que_qsch05,345,23,0	warp	Gate02#gq_sch05	1,1,schg_cas05,369,306
 -	script	Wish Maiden#gq_main	-1,{
 	set .@sub$, callfunc("F_Okolnir");
 	set .@t$, ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
-	set .@GID, GetCastleData(.@t$,1);
+	set .@GID, getcastledata(.@t$,1);
 	if (getcharid(2) == .@GID) {
 		cutin "wish_maiden31",1;
 		if (strcharinfo(0) == getguildmaster(.@GID)) {
@@ -182,9 +183,9 @@ que_qsch05,345,23,0	warp	Gate02#gq_sch05	1,1,schg_cas05,369,306
 			} else {
 				setarray .@n, 7830,1,7831,1,7832,1,7833,1,7834,1,2357,1,7510,100,969,10,985,20;
 			}
-			for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 1) {
+			for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2) {
 				if (countitem(.@n[.@i]) >= .@n[.@i+1])
-				set .@check, .@check + 1;
+					set .@check, .@check + 1;
 			}
 			if (.@check >= 9) {
 				cutin "wish_maiden11",1;
@@ -235,7 +236,7 @@ que_qsch05,345,23,0	warp	Gate02#gq_sch05	1,1,schg_cas05,369,306
 							donpcevent "#okolnir_"+.@sub$+"::OnEnable";
 							disablenpc "Wish Maiden#gq_"+.@sub$;
 							cutin "wish_maiden11",255;
-							announce "["+ strcharinfo(0) +"], of the guild ["+ GetGuildName(.@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb";
+							announce "["+ strcharinfo(0) +"], of the guild ["+ getguildname(.@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb";
 							end;
 						}
 						else {
@@ -297,7 +298,7 @@ que_qsch05,345,23,0	warp	Gate02#gq_sch05	1,1,schg_cas05,369,306
 					next;
 					mes "[Wish Maiden]";
 					mes "You must bring those six things, 10 Gold, and 20 Elunium.";
-					mes "Many Valhala's Flowers are also required as an offering.";				
+					mes "Many Valhala's Flowers are also required as an offering.";
 				}
 				next;
 				mes "[Wish Maiden]";
@@ -352,16 +353,16 @@ OnInit:
 	end;
 }
 
-que_qaru01,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru01	403,
-que_qaru02,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru02	403,
-que_qaru03,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru03	403,
-que_qaru04,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru04	403,
-que_qaru05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru05	403,
-que_qsch01,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch01	403,
-que_qsch02,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch02	403,
-que_qsch03,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch03	403,
-que_qsch04,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch04	403,
-que_qsch05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch05	403,
+que_qaru01,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru01	4_F_VALKYRIE2
+que_qaru02,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru02	4_F_VALKYRIE2
+que_qaru03,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru03	4_F_VALKYRIE2
+que_qaru04,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru04	4_F_VALKYRIE2
+que_qaru05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_aru05	4_F_VALKYRIE2
+que_qsch01,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch01	4_F_VALKYRIE2
+que_qsch02,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch02	4_F_VALKYRIE2
+que_qsch03,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch03	4_F_VALKYRIE2
+que_qsch04,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch04	4_F_VALKYRIE2
+que_qsch05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch05	4_F_VALKYRIE2
 
 -	script	Gate01#gq_main	-1,{
 	function	SMonster;
@@ -374,41 +375,41 @@ OnTouch:
 		if (getd("$@gqse_"+.@sub$+"_miro") == getd("$@gqse_"+.@sub$+"_pcc")) {
 			set .@point,rand(1,5);
 			switch (.@point) {
-				Case 1: warp "que_q"+.@sub$,72,271; break;
-				Case 2: warp "que_q"+.@sub$,45,243; break;
-				Case 3: warp "que_q"+.@sub$,102,248; break;
-				Case 4: warp "que_q"+.@sub$,102,300; break;
-				Case 5: warp "que_q"+.@sub$,46,300; break;
+				case 1: warp "que_q"+.@sub$,72,271; break;
+				case 2: warp "que_q"+.@sub$,45,243; break;
+				case 3: warp "que_q"+.@sub$,102,248; break;
+				case 4: warp "que_q"+.@sub$,102,300; break;
+				case 5: warp "que_q"+.@sub$,46,300; break;
 			}
 			end;
 	
 		}
 		switch (getd("$@gqse_"+.@sub$+"_miro")) {
-			Case 0: setarray .@n, 77,271,72,271,1; break;
-			Case 1: setarray .@n, 63,278,63,282,2; break;
-			Case 2: setarray .@n, 63,294,59,294,3; break;
-			Case 3: setarray .@n, 50,300,46,300,4; break;
-			Case 4: setarray .@n, 51,280,51,285,5; break;
-			Case 5: setarray .@n, 51,258,51,262,6; break;
-			Case 6: setarray .@n, 49,243,45,243,7; break;
-			Case 7: setarray .@n, 86,249,82,249,8; break;
-			Case 8: setarray .@n, 102,243,102,248,9; break;
-			Case 9: setarray .@n, 90,256,90,260,10; break;
-			Case 10: setarray .@n, 90,283,90,280,11; break;
-			Case 11: setarray .@n, 102,295,102,300,12; break;
-			Case 12: setarray .@n, 96,285,96,290,13; break;
-			Case 13: setarray .@n, 63,278,63,282,14; break;
-			Case 14: setarray .@n, 65,243,61,243,15; break;
-			Case 15: setarray .@n, 73,249,70,249,16; break;
-			Case 16: setarray .@n, 102,275,102,282,17; break;
-			Case 17: setarray .@n, 70,300,66,300,18; break;
-			Case 18: setarray .@n, 57,255,57,258,19; break;
-			Case 19: setarray .@n, 84,277,84,280,20; break;
+			case 0: setarray .@n, 77,271,72,271,1; break;
+			case 1: setarray .@n, 63,278,63,282,2; break;
+			case 2: setarray .@n, 63,294,59,294,3; break;
+			case 3: setarray .@n, 50,300,46,300,4; break;
+			case 4: setarray .@n, 51,280,51,285,5; break;
+			case 5: setarray .@n, 51,258,51,262,6; break;
+			case 6: setarray .@n, 49,243,45,243,7; break;
+			case 7: setarray .@n, 86,249,82,249,8; break;
+			case 8: setarray .@n, 102,243,102,248,9; break;
+			case 9: setarray .@n, 90,256,90,260,10; break;
+			case 10: setarray .@n, 90,283,90,280,11; break;
+			case 11: setarray .@n, 102,295,102,300,12; break;
+			case 12: setarray .@n, 96,285,96,290,13; break;
+			case 13: setarray .@n, 63,278,63,282,14; break;
+			case 14: setarray .@n, 65,243,61,243,15; break;
+			case 15: setarray .@n, 73,249,70,249,16; break;
+			case 16: setarray .@n, 102,275,102,282,17; break;
+			case 17: setarray .@n, 70,300,66,300,18; break;
+			case 18: setarray .@n, 57,255,57,258,19; break;
+			case 19: setarray .@n, 84,277,84,280,20; break;
 		}
-			SMonster(.@sub$,.@n[0],.@n[1]);
-			setd "$@gqse_"+.@sub$+"_miro",.@n[4];
-			warp "que_q"+.@sub$,.@n[2],.@n[3];
-			end;
+		SMonster(.@sub$,.@n[0],.@n[1]);
+		setd "$@gqse_"+.@sub$+"_miro",.@n[4];
+		warp "que_q"+.@sub$,.@n[2],.@n[3];
+		end;
 	}
 	else {
 		mes "There are too many people, you can't enter.";
@@ -418,13 +419,13 @@ OnTouch:
 	function	SMonster	{
 	
 		switch (BaseClass) {
-			Case 1: set .@m, 1652; break;
-			Case 2: set .@m, 1663; break;
-			Case 3: set .@m, 1662; break;
-			Case 4: set .@m, 1661; break;
-			Case 5: set .@m, 1660; break;
-			Case 6: set .@m, 1659; break;
-			Default: set .@m, 1652; break;
+			case 1: set .@m, 1652; break;
+			case 2: set .@m, 1663; break;
+			case 3: set .@m, 1662; break;
+			case 4: set .@m, 1661; break;
+			case 5: set .@m, 1660; break;
+			case 6: set .@m, 1659; break;
+			default: set .@m, 1652; break;
 		}
 		monster "que_q"+getarg(0),getarg(1),getarg(2),strcharinfo(0),.@m,1,"#Gate_manager_"+getarg(0)+"::OnMyMobDead";
 		return;
@@ -449,16 +450,16 @@ OnInit:
 	end;
 }
 
-que_qaru01,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru01	45,1,1,
-que_qaru02,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru02	45,1,1,
-que_qaru03,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru03	45,1,1,
-que_qaru04,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru04	45,1,1,
-que_qaru05,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru05	45,1,1,
-que_qsch01,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch01	45,1,1,
-que_qsch02,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch02	45,1,1,
-que_qsch03,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch03	45,1,1,
-que_qsch04,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch04	45,1,1,
-que_qsch05,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch05	45,1,1,
+que_qaru01,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru01	WARPNPC,1,1
+que_qaru02,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru02	WARPNPC,1,1
+que_qaru03,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru03	WARPNPC,1,1
+que_qaru04,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru04	WARPNPC,1,1
+que_qaru05,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_aru05	WARPNPC,1,1
+que_qsch01,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch01	WARPNPC,1,1
+que_qsch02,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch02	WARPNPC,1,1
+que_qsch03,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch03	WARPNPC,1,1
+que_qsch04,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch04	WARPNPC,1,1
+que_qsch05,346,81,0	duplicate(Gate01#gq_main)	Gate01#gq_sch05	WARPNPC,1,1
 
 -	script	#Gate_manager_main	-1,{
 	end;
@@ -472,16 +473,16 @@ OnMyMobDead:
 	}
 	end;
 }
-que_qaru01,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru01	844,
-que_qaru02,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru02	844,
-que_qaru03,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru03	844,
-que_qaru04,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru04	844,
-que_qaru05,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru05	844,
-que_qsch01,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch01	844,
-que_qsch02,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch02	844,
-que_qsch03,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch03	844,
-que_qsch04,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch04	844,
-que_qsch05,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch05	844,
+que_qaru01,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru01	CLEAR_NPC
+que_qaru02,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru02	CLEAR_NPC
+que_qaru03,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru03	CLEAR_NPC
+que_qaru04,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru04	CLEAR_NPC
+que_qaru05,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_aru05	CLEAR_NPC
+que_qsch01,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch01	CLEAR_NPC
+que_qsch02,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch02	CLEAR_NPC
+que_qsch03,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch03	CLEAR_NPC
+que_qsch04,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch04	CLEAR_NPC
+que_qsch05,1,4,0	duplicate(#Gate_manager_main)	#Gate_manager_sch05	CLEAR_NPC
 
 -	script	#gq_miromob2_main	-1,{
 	end;
@@ -510,7 +511,7 @@ OnTimer6000:
 	stopnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#gq_miromob2_"+.@sub$+"::OnMyMobDead";
 	stopnpctimer;
@@ -526,16 +527,16 @@ OnMyMobDead:
 	}
 	end;
 }
-que_qaru01,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru01	844,
-que_qaru02,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru02	844,
-que_qaru03,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru03	844,
-que_qaru04,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru04	844,
-que_qaru05,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru05	844,
-que_qsch01,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch01	844,
-que_qsch02,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch02	844,
-que_qsch03,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch03	844,
-que_qsch04,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch04	844,
-que_qsch05,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch05	844,
+que_qaru01,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru01	CLEAR_NPC
+que_qaru02,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru02	CLEAR_NPC
+que_qaru03,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru03	CLEAR_NPC
+que_qaru04,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru04	CLEAR_NPC
+que_qaru05,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_aru05	CLEAR_NPC
+que_qsch01,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch01	CLEAR_NPC
+que_qsch02,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch02	CLEAR_NPC
+que_qsch03,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch03	CLEAR_NPC
+que_qsch04,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch04	CLEAR_NPC
+que_qsch05,1,4,0	duplicate(#gq_miromob2_main)	#gq_miromob2_sch05	CLEAR_NPC
 
 -	script	#okolnir_main	-1,{
 	end;
@@ -562,14 +563,14 @@ OnEnable:
 OnDisable:
 	set .@sub$,callfunc("F_Okolnir");
 	disablenpc "Wish Maiden#gq_"+.@sub$;
-	donpcevent "#gq_miromob2_"+.@sub$+"::Onreset";
+	donpcevent "#gq_miromob2_"+.@sub$+"::OnReset";
 	disablenpc "Piamette#"+.@sub$;
-	donpcevent "#gdtimer01_"+.@sub$+"::Onstop";
-	donpcevent "#gdtimer02_"+.@sub$+"::Onstop";
-	donpcevent "#piamette_"+.@sub$+"::Onreset";
+	donpcevent "#gdtimer01_"+.@sub$+"::OnStop";
+	donpcevent "#gdtimer02_"+.@sub$+"::OnStop";
+	donpcevent "#piamette_"+.@sub$+"::OnReset";
 	donpcevent "Wish Maiden#"+.@sub$+"_boss::OnDisable";
 	donpcevent "Wish Maiden#"+.@sub$+"_gift::OnDisable";
-	donpcevent "#gd_"+.@sub$+"_mobctrl::Onreset";
+	donpcevent "#gd_"+.@sub$+"_mobctrl::OnReset";
 	donpcevent "Gate01#gq_"+.@sub$+"::OnDisable";
 	donpcevent "#Maze_Manager_"+.@sub$+"::OnDisable";
 	donpcevent "#event_start01_"+.@sub$+"::OnDisable";
@@ -588,9 +589,9 @@ OnDisable:
 	donpcevent "Temple Keeper#"+.@sub$+"_ac01::OnDisable";
 	donpcevent "Temple Keeper#"+.@sub$+"_ac02::OnDisable";
 	disablenpc "#to_agit_"+.@sub$+"_gate";
-	donpcevent "#"+.@sub$+"_stone01::Onreset";
-	donpcevent "#"+.@sub$+"_stone02::Onreset";
-	donpcevent "#"+.@sub$+"_stone03::Onreset";
+	donpcevent "#"+.@sub$+"_stone01::OnReset";
+	donpcevent "#"+.@sub$+"_stone02::OnReset";
+	donpcevent "#"+.@sub$+"_stone03::OnReset";
 	disablenpc "#"+.@sub$+"_cage01";
 	disablenpc "#"+.@sub$+"_cage02";
 	disablenpc "#"+.@sub$+"_cage03";
@@ -606,7 +607,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -659,14 +660,14 @@ OnTimer3600000:
 	set .@sub$,callfunc("F_Okolnir");
 	mapannounce "que_q"+.@sub$,"Okolnir has begun to disappear.",bc_map,"0x4d4dff";
 	disablenpc "Wish Maiden#gq_"+.@sub$;
-	donpcevent "#gq_miromob2_"+.@sub$+"::Onreset";
+	donpcevent "#gq_miromob2_"+.@sub$+"::OnReset";
 	disablenpc "Piamette#"+.@sub$;
-	donpcevent "#gdtimer01_"+.@sub$+"::Onstop";
-	donpcevent "#gdtimer02_"+.@sub$+"::Onstop";
-	donpcevent "#piamette_"+.@sub$+"::Onreset";
-	donpcevent "Wish Maiden#"+.@sub$+"_boss::onDisable";
+	donpcevent "#gdtimer01_"+.@sub$+"::OnStop";
+	donpcevent "#gdtimer02_"+.@sub$+"::OnStop";
+	donpcevent "#piamette_"+.@sub$+"::OnReset";
+	donpcevent "Wish Maiden#"+.@sub$+"_boss::OnDisable";
 	donpcevent "Wish Maiden#"+.@sub$+"_gift::OnDisable";
-	donpcevent "#gd_"+.@sub$+"_mobctrl::Onreset";
+	donpcevent "#gd_"+.@sub$+"_mobctrl::OnReset";
 	donpcevent "Gate01#gq_"+.@sub$+"::OnDisable";
 	donpcevent "#Maze_Manager_"+.@sub$+"::OnDisable";
 	donpcevent "#event_start01_"+.@sub$+"::OnDisable";
@@ -685,9 +686,9 @@ OnTimer3600000:
 	donpcevent "Temple Keeper#"+.@sub$+"_ac01::OnDisable";
 	donpcevent "Temple Keeper#"+.@sub$+"_ac02::OnDisable";
 	disablenpc "#to_agit_"+.@sub$+"_gate";
-	donpcevent "#"+.@sub$+"_stone01::Onreset";
-	donpcevent "#"+.@sub$+"_stone02::Onreset";
-	donpcevent "#"+.@sub$+"_stone03::Onreset";
+	donpcevent "#"+.@sub$+"_stone01::OnReset";
+	donpcevent "#"+.@sub$+"_stone02::OnReset";
+	donpcevent "#"+.@sub$+"_stone03::OnReset";
 	disablenpc "#"+.@sub$+"_cage01";
 	disablenpc "#"+.@sub$+"_cage02";
 	disablenpc "#"+.@sub$+"_cage03";
@@ -723,16 +724,16 @@ OnTimer3611000:
 	stopnpctimer;
 	end;
 }
-que_qaru01,1,1,0	duplicate(#okolnir_main)	#okolnir_aru01	844,
-que_qaru02,1,1,0	duplicate(#okolnir_main)	#okolnir_aru02	844,
-que_qaru03,1,1,0	duplicate(#okolnir_main)	#okolnir_aru03	844,
-que_qaru04,1,1,0	duplicate(#okolnir_main)	#okolnir_aru04	844,
-que_qaru05,1,1,0	duplicate(#okolnir_main)	#okolnir_aru05	844,
-que_qsch01,1,1,0	duplicate(#okolnir_main)	#okolnir_sch01	844,
-que_qsch02,1,1,0	duplicate(#okolnir_main)	#okolnir_sch02	844,
-que_qsch03,1,1,0	duplicate(#okolnir_main)	#okolnir_sch03	844,
-que_qsch04,1,1,0	duplicate(#okolnir_main)	#okolnir_sch04	844,
-que_qsch05,1,1,0	duplicate(#okolnir_main)	#okolnir_sch05	844,
+que_qaru01,1,1,0	duplicate(#okolnir_main)	#okolnir_aru01	CLEAR_NPC
+que_qaru02,1,1,0	duplicate(#okolnir_main)	#okolnir_aru02	CLEAR_NPC
+que_qaru03,1,1,0	duplicate(#okolnir_main)	#okolnir_aru03	CLEAR_NPC
+que_qaru04,1,1,0	duplicate(#okolnir_main)	#okolnir_aru04	CLEAR_NPC
+que_qaru05,1,1,0	duplicate(#okolnir_main)	#okolnir_aru05	CLEAR_NPC
+que_qsch01,1,1,0	duplicate(#okolnir_main)	#okolnir_sch01	CLEAR_NPC
+que_qsch02,1,1,0	duplicate(#okolnir_main)	#okolnir_sch02	CLEAR_NPC
+que_qsch03,1,1,0	duplicate(#okolnir_main)	#okolnir_sch03	CLEAR_NPC
+que_qsch04,1,1,0	duplicate(#okolnir_main)	#okolnir_sch04	CLEAR_NPC
+que_qsch05,1,1,0	duplicate(#okolnir_main)	#okolnir_sch05	CLEAR_NPC
 
 -	script	#Maze_Manager_main	-1,{
 	end;
@@ -807,16 +808,16 @@ OnInit:
 	donpcevent "#miro_yf_"+.@sub$+"::OnDisable";
 	end;
 }
-que_qaru01,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru01	844,
-que_qaru02,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru02	844,
-que_qaru03,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru03	844,
-que_qaru04,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru04	844,
-que_qaru05,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru05	844,
-que_qsch01,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch01	844,
-que_qsch02,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch02	844,
-que_qsch03,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch03	844,
-que_qsch04,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch04	844,
-que_qsch05,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch05	844,
+que_qaru01,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru01	CLEAR_NPC
+que_qaru02,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru02	CLEAR_NPC
+que_qaru03,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru03	CLEAR_NPC
+que_qaru04,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru04	CLEAR_NPC
+que_qaru05,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_aru05	CLEAR_NPC
+que_qsch01,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch01	CLEAR_NPC
+que_qsch02,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch02	CLEAR_NPC
+que_qsch03,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch03	CLEAR_NPC
+que_qsch04,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch04	CLEAR_NPC
+que_qsch05,1,2,0	duplicate(#Maze_Manager_main)	#Maze_Manager_sch05	CLEAR_NPC
 
 -	script	#miro_bf_main	-1,{
 	function	Cell;
@@ -844,16 +845,16 @@ OnDisable:
 OnMyMobDead:
 	end;
 }
-que_qaru01,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru01	844,
-que_qaru02,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru02	844,
-que_qaru03,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru03	844,
-que_qaru04,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru04	844,
-que_qaru05,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru05	844,
-que_qsch01,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch01	844,
-que_qsch02,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch02	844,
-que_qsch03,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch03	844,
-que_qsch04,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch04	844,
-que_qsch05,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch05	844,
+que_qaru01,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru01	CLEAR_NPC
+que_qaru02,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru02	CLEAR_NPC
+que_qaru03,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru03	CLEAR_NPC
+que_qaru04,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru04	CLEAR_NPC
+que_qaru05,2,1,0	duplicate(#miro_bf_main)	#miro_bf_aru05	CLEAR_NPC
+que_qsch01,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch01	CLEAR_NPC
+que_qsch02,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch02	CLEAR_NPC
+que_qsch03,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch03	CLEAR_NPC
+que_qsch04,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch04	CLEAR_NPC
+que_qsch05,2,1,0	duplicate(#miro_bf_main)	#miro_bf_sch05	CLEAR_NPC
 
 -	script	#miro_rf_main	-1,{
 	function	Cell;
@@ -882,16 +883,16 @@ OnMyMobDead:
 		}
 	}
 }
-que_qaru01,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru01	844,
-que_qaru02,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru02	844,
-que_qaru03,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru03	844,
-que_qaru04,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru04	844,
-que_qaru05,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru05	844,
-que_qsch01,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch01	844,
-que_qsch02,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch02	844,
-que_qsch03,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch03	844,
-que_qsch04,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch04	844,
-que_qsch05,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch05	844,
+que_qaru01,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru01	CLEAR_NPC
+que_qaru02,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru02	CLEAR_NPC
+que_qaru03,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru03	CLEAR_NPC
+que_qaru04,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru04	CLEAR_NPC
+que_qaru05,2,2,0	duplicate(#miro_rf_main)	#miro_rf_aru05	CLEAR_NPC
+que_qsch01,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch01	CLEAR_NPC
+que_qsch02,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch02	CLEAR_NPC
+que_qsch03,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch03	CLEAR_NPC
+que_qsch04,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch04	CLEAR_NPC
+que_qsch05,2,2,0	duplicate(#miro_rf_main)	#miro_rf_sch05	CLEAR_NPC
 
 -	script	#miro_yf_main	-1,{
 	function	Cell;
@@ -920,16 +921,16 @@ OnMyMobDead:
 		}
 	}
 }
-que_qaru01,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru01	844,
-que_qaru02,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru02	844,
-que_qaru03,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru03	844,
-que_qaru04,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru04	844,
-que_qaru05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru05	844,
-que_qsch01,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch01	844,
-que_qsch02,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch02	844,
-que_qsch03,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch03	844,
-que_qsch04,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch04	844,
-que_qsch05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch05	844,
+que_qaru01,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru01	CLEAR_NPC
+que_qaru02,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru02	CLEAR_NPC
+que_qaru03,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru03	CLEAR_NPC
+que_qaru04,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru04	CLEAR_NPC
+que_qaru05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_aru05	CLEAR_NPC
+que_qsch01,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch01	CLEAR_NPC
+que_qsch02,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch02	CLEAR_NPC
+que_qsch03,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch03	CLEAR_NPC
+que_qsch04,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch04	CLEAR_NPC
+que_qsch05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch05	CLEAR_NPC
 
 -	script	windpath01_main	-1,{
 	end;
@@ -946,16 +947,16 @@ OnTouch:
 	mes "You need the Crystal Key to activate the Warp Gate.";
 	close;
 }
-que_qaru01,132,172,0	duplicate(windpath01_main)	windpath01_aru01	45,1,1,
-que_qaru02,132,172,0	duplicate(windpath01_main)	windpath01_aru02	45,1,1,
-que_qaru03,132,172,0	duplicate(windpath01_main)	windpath01_aru03	45,1,1,
-que_qaru04,132,172,0	duplicate(windpath01_main)	windpath01_aru04	45,1,1,
-que_qaru05,132,172,0	duplicate(windpath01_main)	windpath01_aru05	45,1,1,
-que_qsch01,132,172,0	duplicate(windpath01_main)	windpath01_sch01	45,1,1,
-que_qsch02,132,172,0	duplicate(windpath01_main)	windpath01_sch02	45,1,1,
-que_qsch03,132,172,0	duplicate(windpath01_main)	windpath01_sch03	45,1,1,
-que_qsch04,132,172,0	duplicate(windpath01_main)	windpath01_sch04	45,1,1,
-que_qsch05,132,172,0	duplicate(windpath01_main)	windpath01_sch05	45,1,1,
+que_qaru01,132,172,0	duplicate(windpath01_main)	windpath01_aru01	WARPNPC,1,1
+que_qaru02,132,172,0	duplicate(windpath01_main)	windpath01_aru02	WARPNPC,1,1
+que_qaru03,132,172,0	duplicate(windpath01_main)	windpath01_aru03	WARPNPC,1,1
+que_qaru04,132,172,0	duplicate(windpath01_main)	windpath01_aru04	WARPNPC,1,1
+que_qaru05,132,172,0	duplicate(windpath01_main)	windpath01_aru05	WARPNPC,1,1
+que_qsch01,132,172,0	duplicate(windpath01_main)	windpath01_sch01	WARPNPC,1,1
+que_qsch02,132,172,0	duplicate(windpath01_main)	windpath01_sch02	WARPNPC,1,1
+que_qsch03,132,172,0	duplicate(windpath01_main)	windpath01_sch03	WARPNPC,1,1
+que_qsch04,132,172,0	duplicate(windpath01_main)	windpath01_sch04	WARPNPC,1,1
+que_qsch05,132,172,0	duplicate(windpath01_main)	windpath01_sch05	WARPNPC,1,1
 
 que_qaru01,113,165,0	warp	windpath02_aru01	1,1,que_qaru01,139,172
 que_qaru02,113,165,0	warp	windpath02_aru02	1,1,que_qaru02,139,172
@@ -977,16 +978,16 @@ OnInit:
 	end;
 }
 
-que_qaru01,131,136,3	duplicate(Piamette#main)	Piamette#aru01	1930,
-que_qaru02,131,136,3	duplicate(Piamette#main)	Piamette#aru02	1930,
-que_qaru03,131,136,3	duplicate(Piamette#main)	Piamette#aru03	1930,
-que_qaru04,131,136,3	duplicate(Piamette#main)	Piamette#aru04	1930,
-que_qaru05,131,136,3	duplicate(Piamette#main)	Piamette#aru05	1930,
-que_qsch01,131,136,3	duplicate(Piamette#main)	Piamette#sch01	1930,
-que_qsch02,131,136,3	duplicate(Piamette#main)	Piamette#sch02	1930,
-que_qsch03,131,136,3	duplicate(Piamette#main)	Piamette#sch03	1930,
-que_qsch04,131,136,3	duplicate(Piamette#main)	Piamette#sch04	1930,
-que_qsch05,131,136,3	duplicate(Piamette#main)	Piamette#sch05	1930,
+que_qaru01,131,136,3	duplicate(Piamette#main)	Piamette#aru01	PIAMETTE
+que_qaru02,131,136,3	duplicate(Piamette#main)	Piamette#aru02	PIAMETTE
+que_qaru03,131,136,3	duplicate(Piamette#main)	Piamette#aru03	PIAMETTE
+que_qaru04,131,136,3	duplicate(Piamette#main)	Piamette#aru04	PIAMETTE
+que_qaru05,131,136,3	duplicate(Piamette#main)	Piamette#aru05	PIAMETTE
+que_qsch01,131,136,3	duplicate(Piamette#main)	Piamette#sch01	PIAMETTE
+que_qsch02,131,136,3	duplicate(Piamette#main)	Piamette#sch02	PIAMETTE
+que_qsch03,131,136,3	duplicate(Piamette#main)	Piamette#sch03	PIAMETTE
+que_qsch04,131,136,3	duplicate(Piamette#main)	Piamette#sch04	PIAMETTE
+que_qsch05,131,136,3	duplicate(Piamette#main)	Piamette#sch05	PIAMETTE
 
 -	script	#event_start01_main	-1,{
 	end;
@@ -1035,16 +1036,16 @@ OnInit:
 	disablenpc "#event_start01_"+.@sub$;
 	end;
 }
-que_qaru01,114,158,0	duplicate(#event_start01_main)	#event_start01_aru01	-1,1,1,
-que_qaru02,114,158,0	duplicate(#event_start01_main)	#event_start01_aru02	-1,1,1,
-que_qaru03,114,158,0	duplicate(#event_start01_main)	#event_start01_aru03	-1,1,1,
-que_qaru04,114,158,0	duplicate(#event_start01_main)	#event_start01_aru04	-1,1,1,
-que_qaru05,114,158,0	duplicate(#event_start01_main)	#event_start01_aru05	-1,1,1,
-que_qsch01,114,158,0	duplicate(#event_start01_main)	#event_start01_sch01	-1,1,1,
-que_qsch02,114,158,0	duplicate(#event_start01_main)	#event_start01_sch02	-1,1,1,
-que_qsch03,114,158,0	duplicate(#event_start01_main)	#event_start01_sch03	-1,1,1,
-que_qsch04,114,158,0	duplicate(#event_start01_main)	#event_start01_sch04	-1,1,1,
-que_qsch05,114,158,0	duplicate(#event_start01_main)	#event_start01_sch05	-1,1,1,
+que_qaru01,114,158,0	duplicate(#event_start01_main)	#event_start01_aru01	-1,1,1
+que_qaru02,114,158,0	duplicate(#event_start01_main)	#event_start01_aru02	-1,1,1
+que_qaru03,114,158,0	duplicate(#event_start01_main)	#event_start01_aru03	-1,1,1
+que_qaru04,114,158,0	duplicate(#event_start01_main)	#event_start01_aru04	-1,1,1
+que_qaru05,114,158,0	duplicate(#event_start01_main)	#event_start01_aru05	-1,1,1
+que_qsch01,114,158,0	duplicate(#event_start01_main)	#event_start01_sch01	-1,1,1
+que_qsch02,114,158,0	duplicate(#event_start01_main)	#event_start01_sch02	-1,1,1
+que_qsch03,114,158,0	duplicate(#event_start01_main)	#event_start01_sch03	-1,1,1
+que_qsch04,114,158,0	duplicate(#event_start01_main)	#event_start01_sch04	-1,1,1
+que_qsch05,114,158,0	duplicate(#event_start01_main)	#event_start01_sch05	-1,1,1
 
 -	script	#gdtimer01_main	-1,{
 	end;
@@ -1053,7 +1054,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	set .@sub$,callfunc("F_Okolnir");
 	for (set .@i, 1; .@i <= 8; set .@i, .@i + 1)
 		donpcevent "#getspell0"+.@i+"_"+.@sub$+"::OnDisable";
@@ -1129,16 +1130,16 @@ OnTimer80000:
 	donpcevent "#gdtimer01_"+.@sub$+"::OnEnable";
 	end;
 }
-que_qaru01,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru01	844,
-que_qaru02,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru02	844,
-que_qaru03,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru03	844,
-que_qaru04,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru04	844,
-que_qaru05,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru05	844,
-que_qsch01,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch01	844,
-que_qsch02,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch02	844,
-que_qsch03,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch03	844,
-que_qsch04,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch04	844,
-que_qsch05,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch05	844,
+que_qaru01,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru01	CLEAR_NPC
+que_qaru02,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru02	CLEAR_NPC
+que_qaru03,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru03	CLEAR_NPC
+que_qaru04,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru04	CLEAR_NPC
+que_qaru05,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_aru05	CLEAR_NPC
+que_qsch01,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch01	CLEAR_NPC
+que_qsch02,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch02	CLEAR_NPC
+que_qsch03,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch03	CLEAR_NPC
+que_qsch04,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch04	CLEAR_NPC
+que_qsch05,2,2,0	duplicate(#gdtimer01_main)	#gdtimer01_sch05	CLEAR_NPC
 
 -	script	#gdtimer02_main	-1,{
 	end;
@@ -1147,7 +1148,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#gdtimer02_"+.@sub$+"::OnMyMobDead";
@@ -1188,7 +1189,7 @@ OnTimer113000:
 	stopnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#gdtimer02_"+.@sub$+"::OnMyMobDead";
 	end;
@@ -1203,23 +1204,23 @@ OnMyMobDead:
 	}
 	end;
 }
-que_qaru01,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru01	844,
-que_qaru02,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru02	844,
-que_qaru03,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru03	844,
-que_qaru04,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru04	844,
-que_qaru05,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru05	844,
-que_qsch01,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch01	844,
-que_qsch02,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch02	844,
-que_qsch03,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch03	844,
-que_qsch04,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch04	844,
-que_qsch05,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch05	844,
+que_qaru01,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru01	CLEAR_NPC
+que_qaru02,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru02	CLEAR_NPC
+que_qaru03,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru03	CLEAR_NPC
+que_qaru04,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru04	CLEAR_NPC
+que_qaru05,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_aru05	CLEAR_NPC
+que_qsch01,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch01	CLEAR_NPC
+que_qsch02,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch02	CLEAR_NPC
+que_qsch03,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch03	CLEAR_NPC
+que_qsch04,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch04	CLEAR_NPC
+que_qsch05,2,3,0	duplicate(#gdtimer02_main)	#gdtimer02_sch05	CLEAR_NPC
 
 -	script	#piamette_main	-1,{
 OnEnable:
 	initnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#piamette_"+.@sub$+"::OnMyMobDead";
 	stopnpctimer;
@@ -1246,16 +1247,16 @@ OnMyMobDead:
 	donpcevent "#nm_switch_"+.@sub$+"::OnEnable";
 	end;
 }
-que_qaru01,1,4,0	duplicate(#piamette_main)	#piamette_aru01	844,
-que_qaru02,1,4,0	duplicate(#piamette_main)	#piamette_aru02	844,
-que_qaru03,1,4,0	duplicate(#piamette_main)	#piamette_aru03	844,
-que_qaru04,1,4,0	duplicate(#piamette_main)	#piamette_aru04	844,
-que_qaru05,1,4,0	duplicate(#piamette_main)	#piamette_aru05	844,
-que_qsch01,1,4,0	duplicate(#piamette_main)	#piamette_sch01	844,
-que_qsch02,1,4,0	duplicate(#piamette_main)	#piamette_sch02	844,
-que_qsch03,1,4,0	duplicate(#piamette_main)	#piamette_sch03	844,
-que_qsch04,1,4,0	duplicate(#piamette_main)	#piamette_sch04	844,
-que_qsch05,1,4,0	duplicate(#piamette_main)	#piamette_sch05	844,
+que_qaru01,1,4,0	duplicate(#piamette_main)	#piamette_aru01	CLEAR_NPC
+que_qaru02,1,4,0	duplicate(#piamette_main)	#piamette_aru02	CLEAR_NPC
+que_qaru03,1,4,0	duplicate(#piamette_main)	#piamette_aru03	CLEAR_NPC
+que_qaru04,1,4,0	duplicate(#piamette_main)	#piamette_aru04	CLEAR_NPC
+que_qaru05,1,4,0	duplicate(#piamette_main)	#piamette_aru05	CLEAR_NPC
+que_qsch01,1,4,0	duplicate(#piamette_main)	#piamette_sch01	CLEAR_NPC
+que_qsch02,1,4,0	duplicate(#piamette_main)	#piamette_sch02	CLEAR_NPC
+que_qsch03,1,4,0	duplicate(#piamette_main)	#piamette_sch03	CLEAR_NPC
+que_qsch04,1,4,0	duplicate(#piamette_main)	#piamette_sch04	CLEAR_NPC
+que_qsch05,1,4,0	duplicate(#piamette_main)	#piamette_sch05	CLEAR_NPC
 
 -	script	#getspells_main	-1,{
 	end;
@@ -1275,17 +1276,17 @@ OnDisable:
 
 OnTouch:
 	set .@sub$,callfunc("F_Okolnir");
-	sc_start2 SC_Stone,300000,0,10000;
+	sc_start SC_STONE,300000,0,10000;
 	switch (getd("$@gqse_"+.@sub$+"_gd")) {
-		Case 0: setarray .@n$, "103","153","1","Piamette : One white bird has dropped with its wing pierced by an arrow."; break;
-		Case 1: setarray .@n$, "102","135","2","Piamette : One bird is caught in a snare, and dropped into a lake."; break;
-		Case 2: setarray .@n$, "113","111","3","Piamette : One bird has died trapped in it's cage."; break;
-		Case 3: setarray .@n$, "161","105","4","Piamette : One bird was poisoned to death."; break;
-		Case 4: setarray .@n$, "168","135","5","Piamette : One bird vomited blood while singing seven days and seven nights."; break;
-		Case 5: 
-			setarray .@n$, "150","159","6","Piamette : The last one broke her neck wriggling to get out of from it's eggshell!"; 
+		case 0: setarray .@n$, "103","153","1","Piamette : One white bird has dropped with its wing pierced by an arrow."; break;
+		case 1: setarray .@n$, "102","135","2","Piamette : One bird is caught in a snare, and dropped into a lake."; break;
+		case 2: setarray .@n$, "113","111","3","Piamette : One bird has died trapped in it's cage."; break;
+		case 3: setarray .@n$, "161","105","4","Piamette : One bird was poisoned to death."; break;
+		case 4: setarray .@n$, "168","135","5","Piamette : One bird vomited blood while singing seven days and seven nights."; break;
+		case 5:
+			setarray .@n$, "150","159","6","Piamette : The last one broke her neck wriggling to get out of from it's eggshell!";
 			donpcevent "#gdtimer02_"+.@sub$+"::OnEnable";
-			donpcevent "#gdtimer01_"+.@sub$+"::Onstop";
+			donpcevent "#gdtimer01_"+.@sub$+"::OnStop";
 			break;
 	}
 	disablenpc "#getspell01_"+.@sub$;
@@ -1296,97 +1297,97 @@ OnTouch:
 
 OnInit:
 	set .@sub$,callfunc("F_Okolnir");
-	for (set .@i, 1; .@i <= 8; set .@i, .@i + 1) 
+	for (set .@i, 1; .@i <= 8; set .@i, .@i + 1)
 		disablenpc "#getspell0"+.@i+"_"+.@sub$;
 	end;
 }
-que_qaru01,113,135,0	duplicate(#getspells_main)	#getspell01_aru01	-1,1,1,
-que_qaru02,113,135,0	duplicate(#getspells_main)	#getspell01_aru02	-1,1,1,
-que_qaru03,113,135,0	duplicate(#getspells_main)	#getspell01_aru03	-1,1,1,
-que_qaru04,113,135,0	duplicate(#getspells_main)	#getspell01_aru04	-1,1,1,
-que_qaru05,113,135,0	duplicate(#getspells_main)	#getspell01_aru05	-1,1,1,
-que_qsch01,113,135,0	duplicate(#getspells_main)	#getspell01_sch01	-1,1,1,
-que_qsch02,113,135,0	duplicate(#getspells_main)	#getspell01_sch02	-1,1,1,
-que_qsch03,113,135,0	duplicate(#getspells_main)	#getspell01_sch03	-1,1,1,
-que_qsch04,113,135,0	duplicate(#getspells_main)	#getspell01_sch04	-1,1,1,
-que_qsch05,113,135,0	duplicate(#getspells_main)	#getspell01_sch05	-1,1,1,
-que_qaru01,146,150,0	duplicate(#getspells_main)	#getspell02_aru01	-1,1,1,
-que_qaru02,146,150,0	duplicate(#getspells_main)	#getspell02_aru02	-1,1,1,
-que_qaru03,146,150,0	duplicate(#getspells_main)	#getspell02_aru03	-1,1,1,
-que_qaru04,146,150,0	duplicate(#getspells_main)	#getspell02_aru04	-1,1,1,
-que_qaru05,146,150,0	duplicate(#getspells_main)	#getspell02_aru05	-1,1,1,
-que_qsch01,146,150,0	duplicate(#getspells_main)	#getspell02_sch01	-1,1,1,
-que_qsch02,146,150,0	duplicate(#getspells_main)	#getspell02_sch02	-1,1,1,
-que_qsch03,146,150,0	duplicate(#getspells_main)	#getspell02_sch03	-1,1,1,
-que_qsch04,146,150,0	duplicate(#getspells_main)	#getspell02_sch04	-1,1,1,
-que_qsch05,146,150,0	duplicate(#getspells_main)	#getspell02_sch05	-1,1,1,
-que_qaru01,131,117,0	duplicate(#getspells_main)	#getspell03_aru01	-1,1,1,
-que_qaru02,131,117,0	duplicate(#getspells_main)	#getspell03_aru02	-1,1,1,
-que_qaru03,131,117,0	duplicate(#getspells_main)	#getspell03_aru03	-1,1,1,
-que_qaru04,131,117,0	duplicate(#getspells_main)	#getspell03_aru04	-1,1,1,
-que_qaru05,131,117,0	duplicate(#getspells_main)	#getspell03_aru05	-1,1,1,
-que_qsch01,131,117,0	duplicate(#getspells_main)	#getspell03_sch01	-1,1,1,
-que_qsch02,131,117,0	duplicate(#getspells_main)	#getspell03_sch02	-1,1,1,
-que_qsch03,131,117,0	duplicate(#getspells_main)	#getspell03_sch03	-1,1,1,
-que_qsch04,131,117,0	duplicate(#getspells_main)	#getspell03_sch04	-1,1,1,
-que_qsch05,131,117,0	duplicate(#getspells_main)	#getspell03_sch05	-1,1,1,
-que_qaru01,117,150,0	duplicate(#getspells_main)	#getspell04_aru01	-1,1,1,
-que_qaru02,117,150,0	duplicate(#getspells_main)	#getspell04_aru02	-1,1,1,
-que_qaru03,117,150,0	duplicate(#getspells_main)	#getspell04_aru03	-1,1,1,
-que_qaru04,117,150,0	duplicate(#getspells_main)	#getspell04_aru04	-1,1,1,
-que_qaru05,117,150,0	duplicate(#getspells_main)	#getspell04_aru05	-1,1,1,
-que_qsch01,117,150,0	duplicate(#getspells_main)	#getspell04_sch01	-1,1,1,
-que_qsch02,117,150,0	duplicate(#getspells_main)	#getspell04_sch02	-1,1,1,
-que_qsch03,117,150,0	duplicate(#getspells_main)	#getspell04_sch03	-1,1,1,
-que_qsch04,117,150,0	duplicate(#getspells_main)	#getspell04_sch04	-1,1,1,
-que_qsch05,117,150,0	duplicate(#getspells_main)	#getspell04_sch05	-1,1,1,
-que_qaru01,150,135,0	duplicate(#getspells_main)	#getspell05_aru01	-1,1,1,
-que_qaru02,150,135,0	duplicate(#getspells_main)	#getspell05_aru02	-1,1,1,
-que_qaru03,150,135,0	duplicate(#getspells_main)	#getspell05_aru03	-1,1,1,
-que_qaru04,150,135,0	duplicate(#getspells_main)	#getspell05_aru04	-1,1,1,
-que_qaru05,150,135,0	duplicate(#getspells_main)	#getspell05_aru05	-1,1,1,
-que_qsch01,150,135,0	duplicate(#getspells_main)	#getspell05_sch01	-1,1,1,
-que_qsch02,150,135,0	duplicate(#getspells_main)	#getspell05_sch02	-1,1,1,
-que_qsch03,150,135,0	duplicate(#getspells_main)	#getspell05_sch03	-1,1,1,
-que_qsch04,150,135,0	duplicate(#getspells_main)	#getspell05_sch04	-1,1,1,
-que_qsch05,150,135,0	duplicate(#getspells_main)	#getspell05_sch05	-1,1,1,
-que_qaru01,117,121,0	duplicate(#getspells_main)	#getspell06_aru01	-1,1,1,
-que_qaru02,117,121,0	duplicate(#getspells_main)	#getspell06_aru02	-1,1,1,
-que_qaru03,117,121,0	duplicate(#getspells_main)	#getspell06_aru03	-1,1,1,
-que_qaru04,117,121,0	duplicate(#getspells_main)	#getspell06_aru04	-1,1,1,
-que_qaru05,117,121,0	duplicate(#getspells_main)	#getspell06_aru05	-1,1,1,
-que_qsch01,117,121,0	duplicate(#getspells_main)	#getspell06_sch01	-1,1,1,
-que_qsch02,117,121,0	duplicate(#getspells_main)	#getspell06_sch02	-1,1,1,
-que_qsch03,117,121,0	duplicate(#getspells_main)	#getspell06_sch03	-1,1,1,
-que_qsch04,117,121,0	duplicate(#getspells_main)	#getspell06_sch04	-1,1,1,
-que_qsch05,117,121,0	duplicate(#getspells_main)	#getspell06_sch05	-1,1,1,
-que_qaru01,131,154,0	duplicate(#getspells_main)	#getspell07_aru01	-1,1,1,
-que_qaru02,131,154,0	duplicate(#getspells_main)	#getspell07_aru02	-1,1,1,
-que_qaru03,131,154,0	duplicate(#getspells_main)	#getspell07_aru03	-1,1,1,
-que_qaru04,131,154,0	duplicate(#getspells_main)	#getspell07_aru04	-1,1,1,
-que_qaru05,131,154,0	duplicate(#getspells_main)	#getspell07_aru05	-1,1,1,
-que_qsch01,131,154,0	duplicate(#getspells_main)	#getspell07_sch01	-1,1,1,
-que_qsch02,131,154,0	duplicate(#getspells_main)	#getspell07_sch02	-1,1,1,
-que_qsch03,131,154,0	duplicate(#getspells_main)	#getspell07_sch03	-1,1,1,
-que_qsch04,131,154,0	duplicate(#getspells_main)	#getspell07_sch04	-1,1,1,
-que_qsch05,131,154,0	duplicate(#getspells_main)	#getspell07_sch05	-1,1,1,
-que_qaru01,146,121,0	duplicate(#getspells_main)	#getspell08_aru01	-1,1,1,
-que_qaru02,146,121,0	duplicate(#getspells_main)	#getspell08_aru02	-1,1,1,
-que_qaru03,146,121,0	duplicate(#getspells_main)	#getspell08_aru03	-1,1,1,
-que_qaru04,146,121,0	duplicate(#getspells_main)	#getspell08_aru04	-1,1,1,
-que_qaru05,146,121,0	duplicate(#getspells_main)	#getspell08_aru05	-1,1,1,
-que_qsch01,146,121,0	duplicate(#getspells_main)	#getspell08_sch01	-1,1,1,
-que_qsch02,146,121,0	duplicate(#getspells_main)	#getspell08_sch02	-1,1,1,
-que_qsch03,146,121,0	duplicate(#getspells_main)	#getspell08_sch03	-1,1,1,
-que_qsch04,146,121,0	duplicate(#getspells_main)	#getspell08_sch04	-1,1,1,
-que_qsch05,146,121,0	duplicate(#getspells_main)	#getspell08_sch05	-1,1,1,
+que_qaru01,113,135,0	duplicate(#getspells_main)	#getspell01_aru01	-1,1,1
+que_qaru02,113,135,0	duplicate(#getspells_main)	#getspell01_aru02	-1,1,1
+que_qaru03,113,135,0	duplicate(#getspells_main)	#getspell01_aru03	-1,1,1
+que_qaru04,113,135,0	duplicate(#getspells_main)	#getspell01_aru04	-1,1,1
+que_qaru05,113,135,0	duplicate(#getspells_main)	#getspell01_aru05	-1,1,1
+que_qsch01,113,135,0	duplicate(#getspells_main)	#getspell01_sch01	-1,1,1
+que_qsch02,113,135,0	duplicate(#getspells_main)	#getspell01_sch02	-1,1,1
+que_qsch03,113,135,0	duplicate(#getspells_main)	#getspell01_sch03	-1,1,1
+que_qsch04,113,135,0	duplicate(#getspells_main)	#getspell01_sch04	-1,1,1
+que_qsch05,113,135,0	duplicate(#getspells_main)	#getspell01_sch05	-1,1,1
+que_qaru01,146,150,0	duplicate(#getspells_main)	#getspell02_aru01	-1,1,1
+que_qaru02,146,150,0	duplicate(#getspells_main)	#getspell02_aru02	-1,1,1
+que_qaru03,146,150,0	duplicate(#getspells_main)	#getspell02_aru03	-1,1,1
+que_qaru04,146,150,0	duplicate(#getspells_main)	#getspell02_aru04	-1,1,1
+que_qaru05,146,150,0	duplicate(#getspells_main)	#getspell02_aru05	-1,1,1
+que_qsch01,146,150,0	duplicate(#getspells_main)	#getspell02_sch01	-1,1,1
+que_qsch02,146,150,0	duplicate(#getspells_main)	#getspell02_sch02	-1,1,1
+que_qsch03,146,150,0	duplicate(#getspells_main)	#getspell02_sch03	-1,1,1
+que_qsch04,146,150,0	duplicate(#getspells_main)	#getspell02_sch04	-1,1,1
+que_qsch05,146,150,0	duplicate(#getspells_main)	#getspell02_sch05	-1,1,1
+que_qaru01,131,117,0	duplicate(#getspells_main)	#getspell03_aru01	-1,1,1
+que_qaru02,131,117,0	duplicate(#getspells_main)	#getspell03_aru02	-1,1,1
+que_qaru03,131,117,0	duplicate(#getspells_main)	#getspell03_aru03	-1,1,1
+que_qaru04,131,117,0	duplicate(#getspells_main)	#getspell03_aru04	-1,1,1
+que_qaru05,131,117,0	duplicate(#getspells_main)	#getspell03_aru05	-1,1,1
+que_qsch01,131,117,0	duplicate(#getspells_main)	#getspell03_sch01	-1,1,1
+que_qsch02,131,117,0	duplicate(#getspells_main)	#getspell03_sch02	-1,1,1
+que_qsch03,131,117,0	duplicate(#getspells_main)	#getspell03_sch03	-1,1,1
+que_qsch04,131,117,0	duplicate(#getspells_main)	#getspell03_sch04	-1,1,1
+que_qsch05,131,117,0	duplicate(#getspells_main)	#getspell03_sch05	-1,1,1
+que_qaru01,117,150,0	duplicate(#getspells_main)	#getspell04_aru01	-1,1,1
+que_qaru02,117,150,0	duplicate(#getspells_main)	#getspell04_aru02	-1,1,1
+que_qaru03,117,150,0	duplicate(#getspells_main)	#getspell04_aru03	-1,1,1
+que_qaru04,117,150,0	duplicate(#getspells_main)	#getspell04_aru04	-1,1,1
+que_qaru05,117,150,0	duplicate(#getspells_main)	#getspell04_aru05	-1,1,1
+que_qsch01,117,150,0	duplicate(#getspells_main)	#getspell04_sch01	-1,1,1
+que_qsch02,117,150,0	duplicate(#getspells_main)	#getspell04_sch02	-1,1,1
+que_qsch03,117,150,0	duplicate(#getspells_main)	#getspell04_sch03	-1,1,1
+que_qsch04,117,150,0	duplicate(#getspells_main)	#getspell04_sch04	-1,1,1
+que_qsch05,117,150,0	duplicate(#getspells_main)	#getspell04_sch05	-1,1,1
+que_qaru01,150,135,0	duplicate(#getspells_main)	#getspell05_aru01	-1,1,1
+que_qaru02,150,135,0	duplicate(#getspells_main)	#getspell05_aru02	-1,1,1
+que_qaru03,150,135,0	duplicate(#getspells_main)	#getspell05_aru03	-1,1,1
+que_qaru04,150,135,0	duplicate(#getspells_main)	#getspell05_aru04	-1,1,1
+que_qaru05,150,135,0	duplicate(#getspells_main)	#getspell05_aru05	-1,1,1
+que_qsch01,150,135,0	duplicate(#getspells_main)	#getspell05_sch01	-1,1,1
+que_qsch02,150,135,0	duplicate(#getspells_main)	#getspell05_sch02	-1,1,1
+que_qsch03,150,135,0	duplicate(#getspells_main)	#getspell05_sch03	-1,1,1
+que_qsch04,150,135,0	duplicate(#getspells_main)	#getspell05_sch04	-1,1,1
+que_qsch05,150,135,0	duplicate(#getspells_main)	#getspell05_sch05	-1,1,1
+que_qaru01,117,121,0	duplicate(#getspells_main)	#getspell06_aru01	-1,1,1
+que_qaru02,117,121,0	duplicate(#getspells_main)	#getspell06_aru02	-1,1,1
+que_qaru03,117,121,0	duplicate(#getspells_main)	#getspell06_aru03	-1,1,1
+que_qaru04,117,121,0	duplicate(#getspells_main)	#getspell06_aru04	-1,1,1
+que_qaru05,117,121,0	duplicate(#getspells_main)	#getspell06_aru05	-1,1,1
+que_qsch01,117,121,0	duplicate(#getspells_main)	#getspell06_sch01	-1,1,1
+que_qsch02,117,121,0	duplicate(#getspells_main)	#getspell06_sch02	-1,1,1
+que_qsch03,117,121,0	duplicate(#getspells_main)	#getspell06_sch03	-1,1,1
+que_qsch04,117,121,0	duplicate(#getspells_main)	#getspell06_sch04	-1,1,1
+que_qsch05,117,121,0	duplicate(#getspells_main)	#getspell06_sch05	-1,1,1
+que_qaru01,131,154,0	duplicate(#getspells_main)	#getspell07_aru01	-1,1,1
+que_qaru02,131,154,0	duplicate(#getspells_main)	#getspell07_aru02	-1,1,1
+que_qaru03,131,154,0	duplicate(#getspells_main)	#getspell07_aru03	-1,1,1
+que_qaru04,131,154,0	duplicate(#getspells_main)	#getspell07_aru04	-1,1,1
+que_qaru05,131,154,0	duplicate(#getspells_main)	#getspell07_aru05	-1,1,1
+que_qsch01,131,154,0	duplicate(#getspells_main)	#getspell07_sch01	-1,1,1
+que_qsch02,131,154,0	duplicate(#getspells_main)	#getspell07_sch02	-1,1,1
+que_qsch03,131,154,0	duplicate(#getspells_main)	#getspell07_sch03	-1,1,1
+que_qsch04,131,154,0	duplicate(#getspells_main)	#getspell07_sch04	-1,1,1
+que_qsch05,131,154,0	duplicate(#getspells_main)	#getspell07_sch05	-1,1,1
+que_qaru01,146,121,0	duplicate(#getspells_main)	#getspell08_aru01	-1,1,1
+que_qaru02,146,121,0	duplicate(#getspells_main)	#getspell08_aru02	-1,1,1
+que_qaru03,146,121,0	duplicate(#getspells_main)	#getspell08_aru03	-1,1,1
+que_qaru04,146,121,0	duplicate(#getspells_main)	#getspell08_aru04	-1,1,1
+que_qaru05,146,121,0	duplicate(#getspells_main)	#getspell08_aru05	-1,1,1
+que_qsch01,146,121,0	duplicate(#getspells_main)	#getspell08_sch01	-1,1,1
+que_qsch02,146,121,0	duplicate(#getspells_main)	#getspell08_sch02	-1,1,1
+que_qsch03,146,121,0	duplicate(#getspells_main)	#getspell08_sch03	-1,1,1
+que_qsch04,146,121,0	duplicate(#getspells_main)	#getspell08_sch04	-1,1,1
+que_qsch05,146,121,0	duplicate(#getspells_main)	#getspell08_sch05	-1,1,1
 
 -	script	#main_cages	-1,{
 	end;
 	
 OnTouch:
 	set .@sub$,callfunc("F_Okolnir");
-	sc_end SC_Stone;
+	sc_end SC_STONE;
 	setarray .@n, 108,151,107,135,113,114,158,106,163,133,150,154;
 	for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 		warp "que_q"+.@sub$,.@n[.@i],.@n[.@i+1];
@@ -1400,68 +1401,68 @@ OnInit:
 		disablenpc "#"+.@sub$+"_cage0"+.@i;
 	end;
 }
-que_qaru01,103,153,0	duplicate(#main_cages)	#aru01_cage01	-1,1,1,
-que_qaru02,103,153,0	duplicate(#main_cages)	#aru02_cage01	-1,1,1,
-que_qaru03,103,153,0	duplicate(#main_cages)	#aru03_cage01	-1,1,1,
-que_qaru04,103,153,0	duplicate(#main_cages)	#aru04_cage01	-1,1,1,
-que_qaru05,103,153,0	duplicate(#main_cages)	#aru05_cage01	-1,1,1,
-que_qsch01,103,153,0	duplicate(#main_cages)	#sch01_cage01	-1,1,1,
-que_qsch02,103,153,0	duplicate(#main_cages)	#sch02_cage01	-1,1,1,
-que_qsch03,103,153,0	duplicate(#main_cages)	#sch03_cage01	-1,1,1,
-que_qsch04,103,153,0	duplicate(#main_cages)	#sch04_cage01	-1,1,1,
-que_qsch05,103,153,0	duplicate(#main_cages)	#sch05_cage01	-1,1,1,
-que_qaru01,102,135,0	duplicate(#main_cages)	#aru01_cage02	-1,1,1,
-que_qaru02,102,135,0	duplicate(#main_cages)	#aru02_cage02	-1,1,1,
-que_qaru03,102,135,0	duplicate(#main_cages)	#aru03_cage02	-1,1,1,
-que_qaru04,102,135,0	duplicate(#main_cages)	#aru04_cage02	-1,1,1,
-que_qaru05,102,135,0	duplicate(#main_cages)	#aru05_cage02	-1,1,1,
-que_qsch01,102,135,0	duplicate(#main_cages)	#sch01_cage02	-1,1,1,
-que_qsch02,102,135,0	duplicate(#main_cages)	#sch02_cage02	-1,1,1,
-que_qsch03,102,135,0	duplicate(#main_cages)	#sch03_cage02	-1,1,1,
-que_qsch04,102,135,0	duplicate(#main_cages)	#sch04_cage02	-1,1,1,
-que_qsch05,102,135,0	duplicate(#main_cages)	#sch05_cage02	-1,1,1,
-que_qaru01,113,111,0	duplicate(#main_cages)	#aru01_cage03	-1,1,1,
-que_qaru02,113,111,0	duplicate(#main_cages)	#aru02_cage03	-1,1,1,
-que_qaru03,113,111,0	duplicate(#main_cages)	#aru03_cage03	-1,1,1,
-que_qaru04,113,111,0	duplicate(#main_cages)	#aru04_cage03	-1,1,1,
-que_qaru05,113,111,0	duplicate(#main_cages)	#aru05_cage03	-1,1,1,
-que_qsch01,113,111,0	duplicate(#main_cages)	#sch01_cage03	-1,1,1,
-que_qsch02,113,111,0	duplicate(#main_cages)	#sch02_cage03	-1,1,1,
-que_qsch03,113,111,0	duplicate(#main_cages)	#sch03_cage03	-1,1,1,
-que_qsch04,113,111,0	duplicate(#main_cages)	#sch04_cage03	-1,1,1,
-que_qsch05,113,111,0	duplicate(#main_cages)	#sch05_cage03	-1,1,1,
-que_qaru01,161,105,0	duplicate(#main_cages)	#aru01_cage04	-1,1,1,
-que_qaru02,161,105,0	duplicate(#main_cages)	#aru02_cage04	-1,1,1,
-que_qaru03,161,105,0	duplicate(#main_cages)	#aru03_cage04	-1,1,1,
-que_qaru04,161,105,0	duplicate(#main_cages)	#aru04_cage04	-1,1,1,
-que_qaru05,161,105,0	duplicate(#main_cages)	#aru05_cage04	-1,1,1,
-que_qsch01,161,105,0	duplicate(#main_cages)	#sch01_cage04	-1,1,1,
-que_qsch02,161,105,0	duplicate(#main_cages)	#sch02_cage04	-1,1,1,
-que_qsch03,161,105,0	duplicate(#main_cages)	#sch03_cage04	-1,1,1,
-que_qsch04,161,105,0	duplicate(#main_cages)	#sch04_cage04	-1,1,1,
-que_qsch05,161,105,0	duplicate(#main_cages)	#sch05_cage04	-1,1,1,
-que_qaru01,168,135,0	duplicate(#main_cages)	#aru01_cage05	-1,1,1,
-que_qaru02,168,135,0	duplicate(#main_cages)	#aru02_cage05	-1,1,1,
-que_qaru03,168,135,0	duplicate(#main_cages)	#aru03_cage05	-1,1,1,
-que_qaru04,168,135,0	duplicate(#main_cages)	#aru04_cage05	-1,1,1,
-que_qaru05,168,135,0	duplicate(#main_cages)	#aru05_cage05	-1,1,1,
-que_qsch01,168,135,0	duplicate(#main_cages)	#sch01_cage05	-1,1,1,
-que_qsch02,168,135,0	duplicate(#main_cages)	#sch02_cage05	-1,1,1,
-que_qsch03,168,135,0	duplicate(#main_cages)	#sch03_cage05	-1,1,1,
-que_qsch04,168,135,0	duplicate(#main_cages)	#sch04_cage05	-1,1,1,
-que_qsch05,168,135,0	duplicate(#main_cages)	#sch05_cage05	-1,1,1,
-que_qaru01,150,159,0	duplicate(#main_cages)	#aru01_cage06	-1,1,1,
-que_qaru02,150,159,0	duplicate(#main_cages)	#aru02_cage06	-1,1,1,
-que_qaru03,150,159,0	duplicate(#main_cages)	#aru03_cage06	-1,1,1,
-que_qaru04,150,159,0	duplicate(#main_cages)	#aru04_cage06	-1,1,1,
-que_qaru05,150,159,0	duplicate(#main_cages)	#aru05_cage06	-1,1,1,
-que_qsch01,150,159,0	duplicate(#main_cages)	#sch01_cage06	-1,1,1,
-que_qsch02,150,159,0	duplicate(#main_cages)	#sch02_cage06	-1,1,1,
-que_qsch03,150,159,0	duplicate(#main_cages)	#sch03_cage06	-1,1,1,
-que_qsch04,150,159,0	duplicate(#main_cages)	#sch04_cage06	-1,1,1,
-que_qsch05,150,159,0	duplicate(#main_cages)	#sch05_cage06	-1,1,1,
-
-que_qaru01,1,8,0	script	#gd_main_mobctrl	844,{
+que_qaru01,103,153,0	duplicate(#main_cages)	#aru01_cage01	-1,1,1
+que_qaru02,103,153,0	duplicate(#main_cages)	#aru02_cage01	-1,1,1
+que_qaru03,103,153,0	duplicate(#main_cages)	#aru03_cage01	-1,1,1
+que_qaru04,103,153,0	duplicate(#main_cages)	#aru04_cage01	-1,1,1
+que_qaru05,103,153,0	duplicate(#main_cages)	#aru05_cage01	-1,1,1
+que_qsch01,103,153,0	duplicate(#main_cages)	#sch01_cage01	-1,1,1
+que_qsch02,103,153,0	duplicate(#main_cages)	#sch02_cage01	-1,1,1
+que_qsch03,103,153,0	duplicate(#main_cages)	#sch03_cage01	-1,1,1
+que_qsch04,103,153,0	duplicate(#main_cages)	#sch04_cage01	-1,1,1
+que_qsch05,103,153,0	duplicate(#main_cages)	#sch05_cage01	-1,1,1
+que_qaru01,102,135,0	duplicate(#main_cages)	#aru01_cage02	-1,1,1
+que_qaru02,102,135,0	duplicate(#main_cages)	#aru02_cage02	-1,1,1
+que_qaru03,102,135,0	duplicate(#main_cages)	#aru03_cage02	-1,1,1
+que_qaru04,102,135,0	duplicate(#main_cages)	#aru04_cage02	-1,1,1
+que_qaru05,102,135,0	duplicate(#main_cages)	#aru05_cage02	-1,1,1
+que_qsch01,102,135,0	duplicate(#main_cages)	#sch01_cage02	-1,1,1
+que_qsch02,102,135,0	duplicate(#main_cages)	#sch02_cage02	-1,1,1
+que_qsch03,102,135,0	duplicate(#main_cages)	#sch03_cage02	-1,1,1
+que_qsch04,102,135,0	duplicate(#main_cages)	#sch04_cage02	-1,1,1
+que_qsch05,102,135,0	duplicate(#main_cages)	#sch05_cage02	-1,1,1
+que_qaru01,113,111,0	duplicate(#main_cages)	#aru01_cage03	-1,1,1
+que_qaru02,113,111,0	duplicate(#main_cages)	#aru02_cage03	-1,1,1
+que_qaru03,113,111,0	duplicate(#main_cages)	#aru03_cage03	-1,1,1
+que_qaru04,113,111,0	duplicate(#main_cages)	#aru04_cage03	-1,1,1
+que_qaru05,113,111,0	duplicate(#main_cages)	#aru05_cage03	-1,1,1
+que_qsch01,113,111,0	duplicate(#main_cages)	#sch01_cage03	-1,1,1
+que_qsch02,113,111,0	duplicate(#main_cages)	#sch02_cage03	-1,1,1
+que_qsch03,113,111,0	duplicate(#main_cages)	#sch03_cage03	-1,1,1
+que_qsch04,113,111,0	duplicate(#main_cages)	#sch04_cage03	-1,1,1
+que_qsch05,113,111,0	duplicate(#main_cages)	#sch05_cage03	-1,1,1
+que_qaru01,161,105,0	duplicate(#main_cages)	#aru01_cage04	-1,1,1
+que_qaru02,161,105,0	duplicate(#main_cages)	#aru02_cage04	-1,1,1
+que_qaru03,161,105,0	duplicate(#main_cages)	#aru03_cage04	-1,1,1
+que_qaru04,161,105,0	duplicate(#main_cages)	#aru04_cage04	-1,1,1
+que_qaru05,161,105,0	duplicate(#main_cages)	#aru05_cage04	-1,1,1
+que_qsch01,161,105,0	duplicate(#main_cages)	#sch01_cage04	-1,1,1
+que_qsch02,161,105,0	duplicate(#main_cages)	#sch02_cage04	-1,1,1
+que_qsch03,161,105,0	duplicate(#main_cages)	#sch03_cage04	-1,1,1
+que_qsch04,161,105,0	duplicate(#main_cages)	#sch04_cage04	-1,1,1
+que_qsch05,161,105,0	duplicate(#main_cages)	#sch05_cage04	-1,1,1
+que_qaru01,168,135,0	duplicate(#main_cages)	#aru01_cage05	-1,1,1
+que_qaru02,168,135,0	duplicate(#main_cages)	#aru02_cage05	-1,1,1
+que_qaru03,168,135,0	duplicate(#main_cages)	#aru03_cage05	-1,1,1
+que_qaru04,168,135,0	duplicate(#main_cages)	#aru04_cage05	-1,1,1
+que_qaru05,168,135,0	duplicate(#main_cages)	#aru05_cage05	-1,1,1
+que_qsch01,168,135,0	duplicate(#main_cages)	#sch01_cage05	-1,1,1
+que_qsch02,168,135,0	duplicate(#main_cages)	#sch02_cage05	-1,1,1
+que_qsch03,168,135,0	duplicate(#main_cages)	#sch03_cage05	-1,1,1
+que_qsch04,168,135,0	duplicate(#main_cages)	#sch04_cage05	-1,1,1
+que_qsch05,168,135,0	duplicate(#main_cages)	#sch05_cage05	-1,1,1
+que_qaru01,150,159,0	duplicate(#main_cages)	#aru01_cage06	-1,1,1
+que_qaru02,150,159,0	duplicate(#main_cages)	#aru02_cage06	-1,1,1
+que_qaru03,150,159,0	duplicate(#main_cages)	#aru03_cage06	-1,1,1
+que_qaru04,150,159,0	duplicate(#main_cages)	#aru04_cage06	-1,1,1
+que_qaru05,150,159,0	duplicate(#main_cages)	#aru05_cage06	-1,1,1
+que_qsch01,150,159,0	duplicate(#main_cages)	#sch01_cage06	-1,1,1
+que_qsch02,150,159,0	duplicate(#main_cages)	#sch02_cage06	-1,1,1
+que_qsch03,150,159,0	duplicate(#main_cages)	#sch03_cage06	-1,1,1
+que_qsch04,150,159,0	duplicate(#main_cages)	#sch04_cage06	-1,1,1
+que_qsch05,150,159,0	duplicate(#main_cages)	#sch05_cage06	-1,1,1
+
+que_qaru01,1,8,0	script	#gd_main_mobctrl	CLEAR_NPC,{
 	end;
 	
 OnEnable:
@@ -1476,13 +1477,13 @@ OnEnable:
 	set .@sub$,callfunc("F_Okolnir");
 	set .@c, 1;
 	while (.@c <= 4) {
-		for (set .@i, 0; .@i < getarraysize(getd(".@mob_"+.@c)); set .@i, .@i + 1)
+		for (set .@i, 0; .@i < getarraysize(getd(".@mob_"+.@c)); set .@i, .@i + 2)
 			monster "que_q"+.@sub$,getd(".@mob_"+.@c+"["+.@i+"]"),getd(".@mob_"+.@c+"["+(.@i+1)+"]"),getd(".@mob_"+.@c+"$"),atoi(getd(".@mob_"+.@c+"$[1]")),1,"#gd_"+.@sub$+"_mobctrl::OnMyMobDead";
 		set .@c, .@c + 1;
 	}
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#gd_"+.@sub$+"_mobctrl::OnMyMobDead";
 	end;
@@ -1491,21 +1492,21 @@ OnMyMobDead:
 	set .@sub$,callfunc("F_Okolnir");
 	if (mobcount("que_q"+.@sub$,"#gd_"+.@sub$+"_mobctrl::OnMyMobDead") < 7) {
 		setarray .@n, 107,152,109,135,113,116,157,107,163,133,149,156;
-		for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 1)
+		for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 			monster "que_q"+.@sub$,.@n[.@i],.@n[.@i+1],"Ball of Piamette",1738,1,"#gd_"+.@sub$+"_mobctrl::OnMyMobDead";
 	}
 	end;
 }
-que_qaru01,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru01_mobctrl	844,
-que_qaru02,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru02_mobctrl	844,
-que_qaru03,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru03_mobctrl	844,
-que_qaru04,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru04_mobctrl	844,
-que_qaru05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru05_mobctrl	844,
-que_qsch01,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch01_mobctrl	844,
-que_qsch02,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch02_mobctrl	844,
-que_qsch03,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch03_mobctrl	844,
-que_qsch04,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch04_mobctrl	844,
-que_qsch05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch05_mobctrl	844,
+que_qaru01,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru01_mobctrl	CLEAR_NPC
+que_qaru02,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru02_mobctrl	CLEAR_NPC
+que_qaru03,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru03_mobctrl	CLEAR_NPC
+que_qaru04,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru04_mobctrl	CLEAR_NPC
+que_qaru05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_aru05_mobctrl	CLEAR_NPC
+que_qsch01,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch01_mobctrl	CLEAR_NPC
+que_qsch02,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch02_mobctrl	CLEAR_NPC
+que_qsch03,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch03_mobctrl	CLEAR_NPC
+que_qsch04,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch04_mobctrl	CLEAR_NPC
+que_qsch05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch05_mobctrl	CLEAR_NPC
 
 -	script	windpaths_main	-1,{
 	end;
@@ -1525,27 +1526,27 @@ OnInit:
 	disablenpc "windpath04_"+.@sub$;
 	end;
 }
-que_qaru01,149,105,0	duplicate(windpaths_main)	windpath03_aru01	45,1,1,{
-que_qaru02,149,105,0	duplicate(windpaths_main)	windpath03_aru02	45,1,1,{
-que_qaru03,149,105,0	duplicate(windpaths_main)	windpath03_aru03	45,1,1,{
-que_qaru04,149,105,0	duplicate(windpaths_main)	windpath03_aru04	45,1,1,{
-que_qaru05,149,105,0	duplicate(windpaths_main)	windpath03_aru05	45,1,1,{
-que_qsch01,149,105,0	duplicate(windpaths_main)	windpath03_sch01	45,1,1,{
-que_qsch02,149,105,0	duplicate(windpaths_main)	windpath03_sch02	45,1,1,{
-que_qsch03,149,105,0	duplicate(windpaths_main)	windpath03_sch03	45,1,1,{
-que_qsch04,149,105,0	duplicate(windpaths_main)	windpath03_sch04	45,1,1,{
-que_qsch05,149,105,0	duplicate(windpaths_main)	windpath03_sch05	45,1,1,{
-
-que_qaru01,128,104,0	duplicate(windpaths_main)	windpath04_aru01	45,1,1,{
-que_qaru02,128,104,0	duplicate(windpaths_main)	windpath04_aru02	45,1,1,{
-que_qaru03,128,104,0	duplicate(windpaths_main)	windpath04_aru03	45,1,1,{
-que_qaru04,128,104,0	duplicate(windpaths_main)	windpath04_aru04	45,1,1,{
-que_qaru05,128,104,0	duplicate(windpaths_main)	windpath04_aru05	45,1,1,{
-que_qsch01,128,104,0	duplicate(windpaths_main)	windpath04_sch01	45,1,1,{
-que_qsch02,128,104,0	duplicate(windpaths_main)	windpath04_sch02	45,1,1,{
-que_qsch03,128,104,0	duplicate(windpaths_main)	windpath04_sch03	45,1,1,{
-que_qsch04,128,104,0	duplicate(windpaths_main)	windpath04_sch04	45,1,1,{
-que_qsch05,128,104,0	duplicate(windpaths_main)	windpath04_sch05	45,1,1,{
+que_qaru01,149,105,0	duplicate(windpaths_main)	windpath03_aru01	WARPNPC,1,1
+que_qaru02,149,105,0	duplicate(windpaths_main)	windpath03_aru02	WARPNPC,1,1
+que_qaru03,149,105,0	duplicate(windpaths_main)	windpath03_aru03	WARPNPC,1,1
+que_qaru04,149,105,0	duplicate(windpaths_main)	windpath03_aru04	WARPNPC,1,1
+que_qaru05,149,105,0	duplicate(windpaths_main)	windpath03_aru05	WARPNPC,1,1
+que_qsch01,149,105,0	duplicate(windpaths_main)	windpath03_sch01	WARPNPC,1,1
+que_qsch02,149,105,0	duplicate(windpaths_main)	windpath03_sch02	WARPNPC,1,1
+que_qsch03,149,105,0	duplicate(windpaths_main)	windpath03_sch03	WARPNPC,1,1
+que_qsch04,149,105,0	duplicate(windpaths_main)	windpath03_sch04	WARPNPC,1,1
+que_qsch05,149,105,0	duplicate(windpaths_main)	windpath03_sch05	WARPNPC,1,1
+
+que_qaru01,128,104,0	duplicate(windpaths_main)	windpath04_aru01	WARPNPC,1,1
+que_qaru02,128,104,0	duplicate(windpaths_main)	windpath04_aru02	WARPNPC,1,1
+que_qaru03,128,104,0	duplicate(windpaths_main)	windpath04_aru03	WARPNPC,1,1
+que_qaru04,128,104,0	duplicate(windpaths_main)	windpath04_aru04	WARPNPC,1,1
+que_qaru05,128,104,0	duplicate(windpaths_main)	windpath04_aru05	WARPNPC,1,1
+que_qsch01,128,104,0	duplicate(windpaths_main)	windpath04_sch01	WARPNPC,1,1
+que_qsch02,128,104,0	duplicate(windpaths_main)	windpath04_sch02	WARPNPC,1,1
+que_qsch03,128,104,0	duplicate(windpaths_main)	windpath04_sch03	WARPNPC,1,1
+que_qsch04,128,104,0	duplicate(windpaths_main)	windpath04_sch04	WARPNPC,1,1
+que_qsch05,128,104,0	duplicate(windpaths_main)	windpath04_sch05	WARPNPC,1,1
 
 -	script	#nm_switch_main	-1,{
 	end;
@@ -1606,16 +1607,16 @@ OnInit:
 	disablenpc "#nm_switch_"+.@sub$;
 	end;
 }
-que_qaru01,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru01	-1,5,5,
-que_qaru02,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru02	-1,5,5,
-que_qaru03,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru03	-1,5,5,
-que_qaru04,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru04	-1,5,5,
-que_qaru05,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru05	-1,5,5,
-que_qsch01,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch01	-1,5,5,
-que_qsch02,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch02	-1,5,5,
-que_qsch03,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch03	-1,5,5,
-que_qsch04,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch04	-1,5,5,
-que_qsch05,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch05	-1,5,5,
+que_qaru01,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru01	-1,5,5
+que_qaru02,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru02	-1,5,5
+que_qaru03,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru03	-1,5,5
+que_qaru04,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru04	-1,5,5
+que_qaru05,253,273,0	duplicate(#nm_switch_main)	#nm_switch_aru05	-1,5,5
+que_qsch01,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch01	-1,5,5
+que_qsch02,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch02	-1,5,5
+que_qsch03,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch03	-1,5,5
+que_qsch04,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch04	-1,5,5
+que_qsch05,253,273,0	duplicate(#nm_switch_main)	#nm_switch_sch05	-1,5,5
 
 -	script	#nmsommain_jin01	-1,{
 OnEnable:
@@ -1643,9 +1644,9 @@ OnTimer55000:
 OnTimer85000:
 OnTimer120000:
 	set .@sub$,callfunc("F_Okolnir");
-	setarray .xy2, 226,294,227,294,228,294,229,294,230,295,231,296,231,297,231,298,231,299,230,300,229,301,228,301,227,301,226,301,225,300,224,299,224,298,224,297,224,296,225,295;
+	setarray .@xy2, 226,294,227,294,228,294,229,294,230,295,231,296,231,297,231,298,231,299,230,300,229,301,228,301,227,301,226,301,225,300,224,299,224,298,224,297,224,296,225,295;
 	for (set .@i, 0; .@i < getarraysize(.@xy2); set .@i, .@i + 2)
-		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Guard of Shadow",1752,1,"#nmsom"+.@sub$+"_jin01::OnMyMobDead";	
+		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Guard of Shadow",1752,1,"#nmsom"+.@sub$+"_jin01::OnMyMobDead";
 	end;
 
 OnTimer180000:
@@ -1655,16 +1656,16 @@ OnTimer180000:
 OnMyMobDead:
 	end;
 }
-que_qaru01,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru01_jin01	-1,
-que_qaru02,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru02_jin01	-1,
-que_qaru03,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru03_jin01	-1,
-que_qaru04,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru04_jin01	-1,
-que_qaru05,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru05_jin01	-1,
-que_qsch01,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch01_jin01	-1,
-que_qsch02,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch02_jin01	-1,
-que_qsch03,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch03_jin01	-1,
-que_qsch04,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch04_jin01	-1,
-que_qsch05,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch05_jin01	-1,
+que_qaru01,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru01_jin01	-1
+que_qaru02,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru02_jin01	-1
+que_qaru03,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru03_jin01	-1
+que_qaru04,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru04_jin01	-1
+que_qaru05,229,297,0	duplicate(#nmsommain_jin01)	#nmsomaru05_jin01	-1
+que_qsch01,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch01_jin01	-1
+que_qsch02,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch02_jin01	-1
+que_qsch03,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch03_jin01	-1
+que_qsch04,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch04_jin01	-1
+que_qsch05,229,297,0	duplicate(#nmsommain_jin01)	#nmsomsch05_jin01	-1
 
 -	script	#main_stone01	-1,{
 	end;
@@ -1676,7 +1677,7 @@ OnEnable:
 		monster "que_q"+.@sub$,.@xy[.@i],.@xy[.@i+1],"Western Magic Guardian",1752,1,"#"+.@sub$+"_stone01::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#"+.@sub$+"_stone01::OnMyMobDead";
 	end;
@@ -1687,21 +1688,21 @@ OnMyMobDead:
 		setd "$@gqse_"+.@sub$+"_nm",getd("$@gqse_"+.@sub$+"_nm")+1;
 		donpcevent "#nmsom"+.@sub$+"_jin01::OnDisable";
 		if (getd("$@gqse_"+.@sub$+"_nm") == 3) {
-			donpcevent "Wish Maiden#"+.@sub$+"_boss::Onfight";
+			donpcevent "Wish Maiden#"+.@sub$+"_boss::OnFight";
 		}
 	}
 	end;
 }
-que_qaru01,2,8,0	duplicate(#main_stone01)	#aru01_stone01	844,
-que_qaru02,2,8,0	duplicate(#main_stone01)	#aru02_stone01	844,
-que_qaru03,2,8,0	duplicate(#main_stone01)	#aru03_stone01	844,
-que_qaru04,2,8,0	duplicate(#main_stone01)	#aru04_stone01	844,
-que_qaru05,2,8,0	duplicate(#main_stone01)	#aru05_stone01	844,
-que_qsch01,2,8,0	duplicate(#main_stone01)	#sch01_stone01	844,
-que_qsch02,2,8,0	duplicate(#main_stone01)	#sch02_stone01	844,
-que_qsch03,2,8,0	duplicate(#main_stone01)	#sch03_stone01	844,
-que_qsch04,2,8,0	duplicate(#main_stone01)	#sch04_stone01	844,
-que_qsch05,2,8,0	duplicate(#main_stone01)	#sch05_stone01	844,
+que_qaru01,2,8,0	duplicate(#main_stone01)	#aru01_stone01	CLEAR_NPC
+que_qaru02,2,8,0	duplicate(#main_stone01)	#aru02_stone01	CLEAR_NPC
+que_qaru03,2,8,0	duplicate(#main_stone01)	#aru03_stone01	CLEAR_NPC
+que_qaru04,2,8,0	duplicate(#main_stone01)	#aru04_stone01	CLEAR_NPC
+que_qaru05,2,8,0	duplicate(#main_stone01)	#aru05_stone01	CLEAR_NPC
+que_qsch01,2,8,0	duplicate(#main_stone01)	#sch01_stone01	CLEAR_NPC
+que_qsch02,2,8,0	duplicate(#main_stone01)	#sch02_stone01	CLEAR_NPC
+que_qsch03,2,8,0	duplicate(#main_stone01)	#sch03_stone01	CLEAR_NPC
+que_qsch04,2,8,0	duplicate(#main_stone01)	#sch04_stone01	CLEAR_NPC
+que_qsch05,2,8,0	duplicate(#main_stone01)	#sch05_stone01	CLEAR_NPC
 
 -	script	#nmsommain_jin02	-1,{
 OnEnable:
@@ -1729,7 +1730,7 @@ OnTimer120000:
 	set .@sub$,callfunc("F_Okolnir");
 	setarray .@xy2, 274,301,275,301,276,301,277,301,278,300,279,299,279,298,279,297,279,296,278,295,277,294,276,294,275,294,274,294,273,295,272,296,272,297,272,298,272,299,273,300;
 	for (set .@i, 0; .@i < getarraysize(.@xy2); set .@i, .@i + 2)
-		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Bloody Hunter",1753,1,"#nmsom"+.@sub$+"_jin02::OnMyMobDead";	
+		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Bloody Hunter",1753,1,"#nmsom"+.@sub$+"_jin02::OnMyMobDead";
 	end;
 
 OnTimer180000:
@@ -1739,16 +1740,16 @@ OnTimer180000:
 OnMyMobDead:
 	end;
 }
-que_qaru01,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru01_jin02	-1,
-que_qaru02,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru02_jin02	-1,
-que_qaru03,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru03_jin02	-1,
-que_qaru04,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru04_jin02	-1,
-que_qaru05,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru05_jin02	-1,
-que_qsch01,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch01_jin02	-1,
-que_qsch02,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch02_jin02	-1,
-que_qsch03,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch03_jin02	-1,
-que_qsch04,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch04_jin02	-1,
-que_qsch05,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch05_jin02	-1,
+que_qaru01,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru01_jin02	-1
+que_qaru02,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru02_jin02	-1
+que_qaru03,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru03_jin02	-1
+que_qaru04,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru04_jin02	-1
+que_qaru05,275,299,0	duplicate(#nmsommain_jin02)	#nmsomaru05_jin02	-1
+que_qsch01,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch01_jin02	-1
+que_qsch02,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch02_jin02	-1
+que_qsch03,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch03_jin02	-1
+que_qsch04,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch04_jin02	-1
+que_qsch05,275,299,0	duplicate(#nmsommain_jin02)	#nmsomsch05_jin02	-1
 
 -	script	#main_stone02	-1,{
 	end;
@@ -1760,7 +1761,7 @@ OnEnable:
 		monster "que_q"+.@sub$,.@xy[.@i],.@xy[.@i+1],"Eastern Magic Guardian",1753,1,"#"+.@sub$+"_stone02::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#"+.@sub$+"_stone02::OnMyMobDead";
 	end;
@@ -1771,21 +1772,21 @@ OnMyMobDead:
 		setd "$@gqse_"+.@sub$+"_nm",getd("$@gqse_"+.@sub$+"_nm")+1;
 		donpcevent "#nmsom"+.@sub$+"_jin02::OnDisable";
 		if (getd("$@gqse_"+.@sub$+"_nm") == 3) {
-			donpcevent "Wish Maiden#"+.@sub$+"_boss::Onfight";
+			donpcevent "Wish Maiden#"+.@sub$+"_boss::OnFight";
 		}
 	}
 	end;
 }
-que_qaru01,2,9,0	duplicate(#main_stone02)	#aru01_stone02	844,
-que_qaru02,2,9,0	duplicate(#main_stone02)	#aru02_stone02	844,
-que_qaru03,2,9,0	duplicate(#main_stone02)	#aru03_stone02	844,
-que_qaru04,2,9,0	duplicate(#main_stone02)	#aru04_stone02	844,
-que_qaru05,2,9,0	duplicate(#main_stone02)	#aru05_stone02	844,
-que_qsch01,2,9,0	duplicate(#main_stone02)	#sch01_stone02	844,
-que_qsch02,2,9,0	duplicate(#main_stone02)	#sch02_stone02	844,
-que_qsch03,2,9,0	duplicate(#main_stone02)	#sch03_stone02	844,
-que_qsch04,2,9,0	duplicate(#main_stone02)	#sch04_stone02	844,
-que_qsch05,2,9,0	duplicate(#main_stone02)	#sch05_stone02	844,
+que_qaru01,2,9,0	duplicate(#main_stone02)	#aru01_stone02	CLEAR_NPC
+que_qaru02,2,9,0	duplicate(#main_stone02)	#aru02_stone02	CLEAR_NPC
+que_qaru03,2,9,0	duplicate(#main_stone02)	#aru03_stone02	CLEAR_NPC
+que_qaru04,2,9,0	duplicate(#main_stone02)	#aru04_stone02	CLEAR_NPC
+que_qaru05,2,9,0	duplicate(#main_stone02)	#aru05_stone02	CLEAR_NPC
+que_qsch01,2,9,0	duplicate(#main_stone02)	#sch01_stone02	CLEAR_NPC
+que_qsch02,2,9,0	duplicate(#main_stone02)	#sch02_stone02	CLEAR_NPC
+que_qsch03,2,9,0	duplicate(#main_stone02)	#sch03_stone02	CLEAR_NPC
+que_qsch04,2,9,0	duplicate(#main_stone02)	#sch04_stone02	CLEAR_NPC
+que_qsch05,2,9,0	duplicate(#main_stone02)	#sch05_stone02	CLEAR_NPC
 
 -	script	#nmsommain_jin03	-1,{
 OnEnable:
@@ -1802,45 +1803,45 @@ OnTimer5000:
 	set .@sub$,callfunc("F_Okolnir");
 	mapannounce "que_q"+.@sub$,"The Northern magic formation is working to summon Keeper of the Temple.",bc_map,"0x4d4dff";
 	setarray .@xy, 247,329,249,329,251,329,253,329,255,329,243,339,245,337,247,335,247,333,254,333,256,335,258,337,260,339;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
+	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@xy[.@i],.@xy[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
 	end;
 
 OnTimer120000:
 	set .@sub$,callfunc("F_Okolnir");
 	setarray .@xy2, 251,343,252,343,255,341,255,340,254,337,253,336,250,336,249,337,248,340,248,341;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
+	for (set .@i, 0; .@i < getarraysize(.@xy2); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
 	end;
 
 OnTimer240000:
 	set .@sub$,callfunc("F_Okolnir");
 	setarray .@xy3, 250,343,252,343,254,342,255,340,255,338,253,336,250,336,248,338,248,340,249,342;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
-		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
+	for (set .@i, 0; .@i < getarraysize(.@xy3); set .@i, .@i + 2)
+		monster "que_q"+.@sub$,.@xy3[.@i],.@xy3[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
 	end;
 
 OnTimer360000:
 	set .@sub$,callfunc("F_Okolnir");
 	setarray .@xy4, 250,343,252,343,254,342,255,340,255,338,253,336,251,336,249,337,248,339,248,341;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
-		monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
+	for (set .@i, 0; .@i < getarraysize(.@xy4); set .@i, .@i + 2)
+		monster "que_q"+.@sub$,.@xy4[.@i],.@xy4[.@i+1],"Keeper Of The Temple",1933,1,"#nmsom"+.@sub$+"_jin03::OnMyMobDead";
 	stopnpctimer;
 	end;
 
 OnMyMobDead:
 	end;
 }
-que_qaru01,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru01_jin03	-1,
-que_qaru02,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru02_jin03	-1,
-que_qaru03,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru03_jin03	-1,
-que_qaru04,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru04_jin03	-1,
-que_qaru05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru05_jin03	-1,
-que_qsch01,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch01_jin03	-1,
-que_qsch02,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch02_jin03	-1,
-que_qsch03,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch03_jin03	-1,
-que_qsch04,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch04_jin03	-1,
-que_qsch05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch05_jin03	-1,
+que_qaru01,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru01_jin03	-1
+que_qaru02,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru02_jin03	-1
+que_qaru03,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru03_jin03	-1
+que_qaru04,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru04_jin03	-1
+que_qaru05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomaru05_jin03	-1
+que_qsch01,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch01_jin03	-1
+que_qsch02,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch02_jin03	-1
+que_qsch03,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch03_jin03	-1
+que_qsch04,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch04_jin03	-1
+que_qsch05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch05_jin03	-1
 
 -	script	#main_stone03	-1,{
 	end;
@@ -1848,11 +1849,11 @@ que_qsch05,251,340,0	duplicate(#nmsommain_jin03)	#nmsomsch05_jin03	-1,
 OnEnable:
 	set .@sub$,callfunc("F_Okolnir");
 	setarray .@xy, 251,343,252,343,255,341,255,340,254,337,253,336,250,336,249,337,248,340,248,341;
-	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 1)
+	for (set .@i, 0; .@i < getarraysize(.@xy); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@xy[.@i],.@xy[.@i+1],"Northern Magic Guardian",1933,1,"#"+.@sub$+"_stone03::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	killmonster "que_q"+.@sub$,"#"+.@sub$+"_stone03::OnMyMobDead";
 	end;
@@ -1864,21 +1865,21 @@ OnMyMobDead:
 		donpcevent "#nmsom"+.@sub$+"_jin03::OnDisable";
 
 		if (getd("$@gqse_"+.@sub$+"_nm") == 3) {
-			donpcevent "Wish Maiden#"+.@sub$+"_boss::Onfight";
+			donpcevent "Wish Maiden#"+.@sub$+"_boss::OnFight";
 		}
 	}
 	end;
 }
-que_qaru01,2,10,0	duplicate(#main_stone03)	#aru01_stone03	844,
-que_qaru02,2,10,0	duplicate(#main_stone03)	#aru02_stone03	844,
-que_qaru03,2,10,0	duplicate(#main_stone03)	#aru03_stone03	844,
-que_qaru04,2,10,0	duplicate(#main_stone03)	#aru04_stone03	844,
-que_qaru05,2,10,0	duplicate(#main_stone03)	#aru05_stone03	844,
-que_qsch01,2,10,0	duplicate(#main_stone03)	#sch01_stone03	844,
-que_qsch02,2,10,0	duplicate(#main_stone03)	#sch02_stone03	844,
-que_qsch03,2,10,0	duplicate(#main_stone03)	#sch03_stone03	844,
-que_qsch04,2,10,0	duplicate(#main_stone03)	#sch04_stone03	844,
-que_qsch05,2,10,0	duplicate(#main_stone03)	#sch05_stone03	844,
+que_qaru01,2,10,0	duplicate(#main_stone03)	#aru01_stone03	CLEAR_NPC
+que_qaru02,2,10,0	duplicate(#main_stone03)	#aru02_stone03	CLEAR_NPC
+que_qaru03,2,10,0	duplicate(#main_stone03)	#aru03_stone03	CLEAR_NPC
+que_qaru04,2,10,0	duplicate(#main_stone03)	#aru04_stone03	CLEAR_NPC
+que_qaru05,2,10,0	duplicate(#main_stone03)	#aru05_stone03	CLEAR_NPC
+que_qsch01,2,10,0	duplicate(#main_stone03)	#sch01_stone03	CLEAR_NPC
+que_qsch02,2,10,0	duplicate(#main_stone03)	#sch02_stone03	CLEAR_NPC
+que_qsch03,2,10,0	duplicate(#main_stone03)	#sch03_stone03	CLEAR_NPC
+que_qsch04,2,10,0	duplicate(#main_stone03)	#sch04_stone03	CLEAR_NPC
+que_qsch05,2,10,0	duplicate(#main_stone03)	#sch05_stone03	CLEAR_NPC
 
 -	script	Guard of Shadow#main_all	-1,{
 	end;
@@ -1888,10 +1889,10 @@ OnTouch:
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@in;
 	switch (.@in) {
-		Case 1: setarray .@n, 234,284,235,285,236,286; break;
-		Case 2: setarray .@n, 223,289,224,290,225,291; break;
-		Case 3: setarray .@n, 235,295,236,296,237,297; break;
-		Case 4: setarray .@n, 224,302,225,303,226,304; break;
+		case 1: setarray .@n, 234,284,235,285,236,286; break;
+		case 2: setarray .@n, 223,289,224,290,225,291; break;
+		case 3: setarray .@n, 235,295,236,296,237,297; break;
+		case 4: setarray .@n, 224,302,225,303,226,304; break;
 	}
 	for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@n[.@i],.@n[.@i+1],"Guard of Shadow",1752,1,"Guard of Shadow#"+.@sub$+"_0"+.@in+"::OnMyMobDead";
@@ -1909,50 +1910,50 @@ OnMyMobDead:
 	
 OnInit:
 	set .@sub$,callfunc("F_Okolnir");
-	for (set .@i, 1; .@i <= 4; set .@i, .@i + 1) 
+	for (set .@i, 1; .@i <= 4; set .@i, .@i + 1)
 		disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@i;
 	end;
 }
-que_qaru01,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_01	1752,4,4,
-que_qaru01,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_02	1752,4,4,
-que_qaru01,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_03	1752,4,4,
-que_qaru01,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_04	1752,4,4,
-que_qaru02,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_01	1752,4,4,
-que_qaru02,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_02	1752,4,4,
-que_qaru02,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_03	1752,4,4,
-que_qaru02,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_04	1752,4,4,
-que_qaru03,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_01	1752,4,4,
-que_qaru03,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_02	1752,4,4,
-que_qaru03,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_03	1752,4,4,
-que_qaru03,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_04	1752,4,4,
-que_qaru04,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_01	1752,4,4,
-que_qaru04,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_02	1752,4,4,
-que_qaru04,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_03	1752,4,4,
-que_qaru04,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_04	1752,4,4,
-que_qaru05,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_01	1752,4,4,
-que_qaru05,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_02	1752,4,4,
-que_qaru05,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_03	1752,4,4,
-que_qaru05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_04	1752,4,4,
-que_qsch01,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_01	1752,4,4,
-que_qsch01,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_02	1752,4,4,
-que_qsch01,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_03	1752,4,4,
-que_qsch01,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_04	1752,4,4,
-que_qsch02,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_01	1752,4,4,
-que_qsch02,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_02	1752,4,4,
-que_qsch02,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_03	1752,4,4,
-que_qsch02,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_04	1752,4,4,
-que_qsch03,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_01	1752,4,4,
-que_qsch03,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_02	1752,4,4,
-que_qsch03,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_03	1752,4,4,
-que_qsch03,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_04	1752,4,4,
-que_qsch04,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_01	1752,4,4,
-que_qsch04,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_02	1752,4,4,
-que_qsch04,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_03	1752,4,4,
-que_qsch04,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_04	1752,4,4,
-que_qsch05,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_01	1752,4,4,
-que_qsch05,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_02	1752,4,4,
-que_qsch05,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_03	1752,4,4,
-que_qsch05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_04	1752,4,4,
+que_qaru01,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_01	SKOGUL,4,4
+que_qaru01,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_02	SKOGUL,4,4
+que_qaru01,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_03	SKOGUL,4,4
+que_qaru01,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru01_04	SKOGUL,4,4
+que_qaru02,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_01	SKOGUL,4,4
+que_qaru02,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_02	SKOGUL,4,4
+que_qaru02,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_03	SKOGUL,4,4
+que_qaru02,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru02_04	SKOGUL,4,4
+que_qaru03,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_01	SKOGUL,4,4
+que_qaru03,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_02	SKOGUL,4,4
+que_qaru03,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_03	SKOGUL,4,4
+que_qaru03,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru03_04	SKOGUL,4,4
+que_qaru04,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_01	SKOGUL,4,4
+que_qaru04,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_02	SKOGUL,4,4
+que_qaru04,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_03	SKOGUL,4,4
+que_qaru04,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru04_04	SKOGUL,4,4
+que_qaru05,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_01	SKOGUL,4,4
+que_qaru05,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_02	SKOGUL,4,4
+que_qaru05,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_03	SKOGUL,4,4
+que_qaru05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#aru05_04	SKOGUL,4,4
+que_qsch01,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_01	SKOGUL,4,4
+que_qsch01,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_02	SKOGUL,4,4
+que_qsch01,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_03	SKOGUL,4,4
+que_qsch01,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch01_04	SKOGUL,4,4
+que_qsch02,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_01	SKOGUL,4,4
+que_qsch02,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_02	SKOGUL,4,4
+que_qsch02,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_03	SKOGUL,4,4
+que_qsch02,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch02_04	SKOGUL,4,4
+que_qsch03,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_01	SKOGUL,4,4
+que_qsch03,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_02	SKOGUL,4,4
+que_qsch03,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_03	SKOGUL,4,4
+que_qsch03,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch03_04	SKOGUL,4,4
+que_qsch04,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_01	SKOGUL,4,4
+que_qsch04,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_02	SKOGUL,4,4
+que_qsch04,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_03	SKOGUL,4,4
+que_qsch04,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch04_04	SKOGUL,4,4
+que_qsch05,235,285,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_01	SKOGUL,4,4
+que_qsch05,224,290,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_02	SKOGUL,4,4
+que_qsch05,236,296,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_03	SKOGUL,4,4
+que_qsch05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_04	SKOGUL,4,4
 
 -	script	Bloody Hunter#main_all	-1,{
 	end;
@@ -1962,10 +1963,10 @@ OnTouch:
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@in;
 	switch (.@in) {
-		Case 1: setarray .@n, 265,297,266,296,267,295;
-		Case 2: setarray .@n, 270,284,271,283,272,282;
-		Case 3: setarray .@n, 269,308,270,307,271,306;
-		Case 4: setarray .@n, 278,301,279,300,280,299;
+		case 1: setarray .@n, 265,297,266,296,267,295;
+		case 2: setarray .@n, 270,284,271,283,272,282;
+		case 3: setarray .@n, 269,308,270,307,271,306;
+		case 4: setarray .@n, 278,301,279,300,280,299;
 	}
 	for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@n[.@i],.@n[.@i+1],"Bloody Hunter",1753,1,"Bloody Hunter#"+.@sub$+"_ac0"+.@in+"::OnMyMobDead";
@@ -1983,50 +1984,50 @@ OnMyMobDead:
 	
 OnInit:
 	set .@sub$,callfunc("F_Okolnir");
-	for (set .@i, 1; .@i <= 4; set .@i, .@i + 1) 
+	for (set .@i, 1; .@i <= 4; set .@i, .@i + 1)
 		disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@i;
 	end;
 }
-que_qaru01,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac01	1753,4,4,
-que_qaru01,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac02	1753,4,4,
-que_qaru01,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac03	1753,4,4,
-que_qaru01,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac04	1753,4,4,
-que_qaru02,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac01	1753,4,4,
-que_qaru02,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac02	1753,4,4,
-que_qaru02,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac03	1753,4,4,
-que_qaru02,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac04	1753,4,4,
-que_qaru03,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac01	1753,4,4,
-que_qaru03,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac02	1753,4,4,
-que_qaru03,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac03	1753,4,4,
-que_qaru03,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac04	1753,4,4,
-que_qaru04,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac01	1753,4,4,
-que_qaru04,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac02	1753,4,4,
-que_qaru04,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac03	1753,4,4,
-que_qaru04,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac04	1753,4,4,
-que_qaru05,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac01	1753,4,4,
-que_qaru05,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac02	1753,4,4,
-que_qaru05,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac03	1753,4,4,
-que_qaru05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac04	1753,4,4,
-que_qsch01,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac01	1753,4,4,
-que_qsch01,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac02	1753,4,4,
-que_qsch01,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac03	1753,4,4,
-que_qsch01,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac04	1753,4,4,
-que_qsch02,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac01	1753,4,4,
-que_qsch02,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac02	1753,4,4,
-que_qsch02,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac03	1753,4,4,
-que_qsch02,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac04	1753,4,4,
-que_qsch03,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac01	1753,4,4,
-que_qsch03,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac02	1753,4,4,
-que_qsch03,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac03	1753,4,4,
-que_qsch03,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac04	1753,4,4,
-que_qsch04,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac01	1753,4,4,
-que_qsch04,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac02	1753,4,4,
-que_qsch04,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac03	1753,4,4,
-que_qsch04,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac04	1753,4,4,
-que_qsch05,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac01	1753,4,4,
-que_qsch05,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac02	1753,4,4,
-que_qsch05,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac03	1753,4,4,
-que_qsch05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac04	1753,4,4,
+que_qaru01,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac01	FRUS,4,4
+que_qaru01,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac02	FRUS,4,4
+que_qaru01,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac03	FRUS,4,4
+que_qaru01,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru01_ac04	FRUS,4,4
+que_qaru02,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac01	FRUS,4,4
+que_qaru02,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac02	FRUS,4,4
+que_qaru02,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac03	FRUS,4,4
+que_qaru02,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru02_ac04	FRUS,4,4
+que_qaru03,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac01	FRUS,4,4
+que_qaru03,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac02	FRUS,4,4
+que_qaru03,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac03	FRUS,4,4
+que_qaru03,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru03_ac04	FRUS,4,4
+que_qaru04,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac01	FRUS,4,4
+que_qaru04,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac02	FRUS,4,4
+que_qaru04,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac03	FRUS,4,4
+que_qaru04,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru04_ac04	FRUS,4,4
+que_qaru05,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac01	FRUS,4,4
+que_qaru05,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac02	FRUS,4,4
+que_qaru05,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac03	FRUS,4,4
+que_qaru05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#aru05_ac04	FRUS,4,4
+que_qsch01,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac01	FRUS,4,4
+que_qsch01,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac02	FRUS,4,4
+que_qsch01,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac03	FRUS,4,4
+que_qsch01,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch01_ac04	FRUS,4,4
+que_qsch02,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac01	FRUS,4,4
+que_qsch02,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac02	FRUS,4,4
+que_qsch02,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac03	FRUS,4,4
+que_qsch02,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch02_ac04	FRUS,4,4
+que_qsch03,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac01	FRUS,4,4
+que_qsch03,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac02	FRUS,4,4
+que_qsch03,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac03	FRUS,4,4
+que_qsch03,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch03_ac04	FRUS,4,4
+que_qsch04,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac01	FRUS,4,4
+que_qsch04,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac02	FRUS,4,4
+que_qsch04,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac03	FRUS,4,4
+que_qsch04,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch04_ac04	FRUS,4,4
+que_qsch05,266,296,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac01	FRUS,4,4
+que_qsch05,271,283,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac02	FRUS,4,4
+que_qsch05,270,307,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac03	FRUS,4,4
+que_qsch05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac04	FRUS,4,4
 
 -	script	Temple Keeper#main_all	-1,{
 	end;
@@ -2036,8 +2037,8 @@ OnTouch:
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@in;
 	switch (.@in) {
-		Case 1: setarray .@n, 246,330,247,330,248,330; break;
-		Case 2: setarray .@n, 254,330,255,330,256,330; break;
+		case 1: setarray .@n, 246,330,247,330,248,330; break;
+		case 2: setarray .@n, 254,330,255,330,256,330; break;
 	}
 	for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 		monster "que_q"+.@sub$,.@n[.@i],.@n[.@i+1],"Keeper Of The Temple",1933,1,"Temple Keeper#"+.@sub$+"_ac0"+.@in+"::OnMyMobDead";
@@ -2059,26 +2060,26 @@ OnInit:
 		disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@i;
 	end;
 }
-que_qaru01,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru01_ac01	1933,4,4,
-que_qaru01,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru01_ac02	1933,4,4,
-que_qaru02,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru02_ac01	1933,4,4,
-que_qaru02,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru02_ac02	1933,4,4,
-que_qaru03,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru03_ac01	1933,4,4,
-que_qaru03,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru03_ac02	1933,4,4,
-que_qaru04,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru04_ac01	1933,4,4,
-que_qaru04,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru04_ac02	1933,4,4,
-que_qaru05,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru05_ac01	1933,4,4,
-que_qaru05,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru05_ac02	1933,4,4,
-que_qsch01,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch01_ac01	1933,4,4,
-que_qsch01,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch01_ac02	1933,4,4,
-que_qsch02,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch02_ac01	1933,4,4,
-que_qsch02,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch02_ac02	1933,4,4,
-que_qsch03,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch03_ac01	1933,4,4,
-que_qsch03,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch03_ac02	1933,4,4,
-que_qsch04,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch04_ac01	1933,4,4,
-que_qsch04,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch04_ac02	1933,4,4,
-que_qsch05,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch05_ac01	1933,4,4,
-que_qsch05,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch05_ac02	1933,4,4,
+que_qaru01,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru01_ac01	GARDEN_WATCHER,4,4
+que_qaru01,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru01_ac02	GARDEN_WATCHER,4,4
+que_qaru02,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru02_ac01	GARDEN_WATCHER,4,4
+que_qaru02,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru02_ac02	GARDEN_WATCHER,4,4
+que_qaru03,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru03_ac01	GARDEN_WATCHER,4,4
+que_qaru03,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru03_ac02	GARDEN_WATCHER,4,4
+que_qaru04,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru04_ac01	GARDEN_WATCHER,4,4
+que_qaru04,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru04_ac02	GARDEN_WATCHER,4,4
+que_qaru05,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#aru05_ac01	GARDEN_WATCHER,4,4
+que_qaru05,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#aru05_ac02	GARDEN_WATCHER,4,4
+que_qsch01,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch01_ac01	GARDEN_WATCHER,4,4
+que_qsch01,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch01_ac02	GARDEN_WATCHER,4,4
+que_qsch02,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch02_ac01	GARDEN_WATCHER,4,4
+que_qsch02,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch02_ac02	GARDEN_WATCHER,4,4
+que_qsch03,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch03_ac01	GARDEN_WATCHER,4,4
+que_qsch03,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch03_ac02	GARDEN_WATCHER,4,4
+que_qsch04,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch04_ac01	GARDEN_WATCHER,4,4
+que_qsch04,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch04_ac02	GARDEN_WATCHER,4,4
+que_qsch05,247,330,5	duplicate(Temple Keeper#main_all)	Temple Keeper#sch05_ac01	GARDEN_WATCHER,4,4
+que_qsch05,255,330,3	duplicate(Temple Keeper#main_all)	Temple Keeper#sch05_ac02	GARDEN_WATCHER,4,4
 
 -	script	Wish Maiden#main_boss	-1,{
 	end;
@@ -2090,7 +2091,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onfight:
+OnFight:
 	initnpctimer;
 	end;
 
@@ -2116,7 +2117,7 @@ OnTimer5000:
 OnMyMobDead:
 	set .@sub$,callfunc("F_Okolnir");
 	if (!mobcount("que_q"+.@sub$,"Wish Maiden#"+.@sub$+"_boss::OnMyMobDead")) {
-		donpcevent "#okolnir_"+.@sub$+"::Onstop";
+		donpcevent "#okolnir_"+.@sub$+"::OnStop";
 		donpcevent "Wish Maiden#"+.@sub$+"_gift::OnEnable";
 		mapannounce "que_q"+.@sub$,"Wish Maiden : ..Good, you deserve the Goddess' shine.",bc_map,"0x00ff00";
 	}
@@ -2124,36 +2125,36 @@ OnMyMobDead:
 	
 OnInit:
 	set .@sub$,callfunc("F_Okolnir");
-		hideonnpc "Wish Maiden#"+.@sub$+"_boss";	
+		hideonnpc "Wish Maiden#"+.@sub$+"_boss";
 	end;
 }
-que_qaru01,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru01_boss	1931,
-que_qaru02,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru02_boss	1931,
-que_qaru03,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru03_boss	1931,
-que_qaru04,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru04_boss	1931,
-que_qaru05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru05_boss	1931,
-que_qsch01,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch01_boss	1931,
-que_qsch02,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch02_boss	1931,
-que_qsch03,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch03_boss	1931,
-que_qsch04,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch04_boss	1931,
-que_qsch05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch05_boss	1931,
+que_qaru01,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru01_boss	WISH_MAIDEN
+que_qaru02,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru02_boss	WISH_MAIDEN
+que_qaru03,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru03_boss	WISH_MAIDEN
+que_qaru04,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru04_boss	WISH_MAIDEN
+que_qaru05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#aru05_boss	WISH_MAIDEN
+que_qsch01,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch01_boss	WISH_MAIDEN
+que_qsch02,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch02_boss	WISH_MAIDEN
+que_qsch03,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch03_boss	WISH_MAIDEN
+que_qsch04,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch04_boss	WISH_MAIDEN
+que_qsch05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch05_boss	WISH_MAIDEN
 
 -	script	Wish Maiden#main_gift	-1,{
 	set .@sub$,callfunc("F_Okolnir");
 	set .@t$, ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
-	set .@GID, GetCastleData(.@t$,1);
+	set .@GID, getcastledata(.@t$,1);
 	if (getcharid(2) == .@GID) {
 		if (strcharinfo(0) == getguildmaster(.@GID)) {
 			if (compare(.@sub$,"aru")) {
 				setarray .@n, 7835,1,7836,1,7837,1,7838,1,2513,1,7291,10,7293,10,7063,100,985,20;
-				set .@rwd, 2541;
+				set .@rwd, 2541; //Asprika
 			} else {
 				setarray .@n, 7830,1,7831,1,7832,1,7833,1,7834,1,2357,1,7510,100,969,10,985,20;
-				set .@rwd, 2383;
+				set .@rwd, 2383; //Brynhild
 			}
 			for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2) {
 				if (countitem(.@n[.@i]) >= .@n[.@i+1])
-				set .@check, .@check + 1;
+					set .@check, .@check + 1;
 			}
 			if (.@check >= 9) {
 				cutin "wish_maiden12",1;
@@ -2178,8 +2179,8 @@ que_qsch05,251,255,3	duplicate(Wish Maiden#main_boss)	Wish Maiden#sch05_boss	193
 				for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 					delitem .@n[.@i],.@n[.@i+1];
 				getitem .@rwd,1;
-				getitem 7840,1;
-				announce "["+ strcharinfo(0) +"], of guild ["+ GetGuildName(.@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb";
+				getitem 7840,1; //Valkyrie_Gift
+				announce "["+ strcharinfo(0) +"], of guild ["+ getguildname(.@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb";
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#"+.@sub$+"_gift";
@@ -2256,16 +2257,16 @@ OnInit:
 		disablenpc "Wish Maiden#"+.@sub$+"_gift";
 	end;
 }
-que_qaru01,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru01_gift	403,
-que_qaru02,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru02_gift	403,
-que_qaru03,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru03_gift	403,
-que_qaru04,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru04_gift	403,
-que_qaru05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru05_gift	403,
-que_qsch01,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch01_gift	403,
-que_qsch02,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch02_gift	403,
-que_qsch03,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch03_gift	403,
-que_qsch04,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch04_gift	403,
-que_qsch05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch05_gift	403,
+que_qaru01,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru01_gift	4_F_VALKYRIE2
+que_qaru02,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru02_gift	4_F_VALKYRIE2
+que_qaru03,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru03_gift	4_F_VALKYRIE2
+que_qaru04,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru04_gift	4_F_VALKYRIE2
+que_qaru05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#aru05_gift	4_F_VALKYRIE2
+que_qsch01,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch01_gift	4_F_VALKYRIE2
+que_qsch02,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch02_gift	4_F_VALKYRIE2
+que_qsch03,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch03_gift	4_F_VALKYRIE2
+que_qsch04,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch04_gift	4_F_VALKYRIE2
+que_qsch05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch05_gift	4_F_VALKYRIE2
 
 -	script	#to_agit_main_gate	-1,{
 	end;
@@ -2280,16 +2281,16 @@ OnInit:
 		disablenpc "#to_agit_"+.@sub$+"_gate";
 	end;
 }
-que_qaru01,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru01_gate	45,1,1,
-que_qaru02,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru02_gate	45,1,1,
-que_qaru03,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru03_gate	45,1,1,
-que_qaru04,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru04_gate	45,1,1,
-que_qaru05,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru05_gate	45,1,1,
-que_qsch01,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch01_gate	45,1,1,
-que_qsch02,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch02_gate	45,1,1,
-que_qsch03,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch03_gate	45,1,1,
-que_qsch04,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch04_gate	45,1,1,
-que_qsch05,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch05_gate	45,1,1,
+que_qaru01,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru01_gate	WARPNPC,1,1
+que_qaru02,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru02_gate	WARPNPC,1,1
+que_qaru03,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru03_gate	WARPNPC,1,1
+que_qaru04,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru04_gate	WARPNPC,1,1
+que_qaru05,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_aru05_gate	WARPNPC,1,1
+que_qsch01,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch01_gate	WARPNPC,1,1
+que_qsch02,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch02_gate	WARPNPC,1,1
+que_qsch03,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch03_gate	WARPNPC,1,1
+que_qsch04,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch04_gate	WARPNPC,1,1
+que_qsch05,252,339,0	duplicate(#to_agit_main_gate)	#to_agit_sch05_gate	WARPNPC,1,1
 
 -	script	#okolnir_main_time01	-1,{
 	end;
@@ -2300,7 +2301,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	set .@sub$,callfunc("F_Okolnir");
 	setd "$siz_"+.@sub$+"_on",0;
 	setd "$gqse_"+.@sub$+"_time",0;
@@ -2328,16 +2329,16 @@ OnInit:
 	if (getd("$siz_"+.@sub$+"_on") == 2) initnpctimer;
 	end;
 }
-que_qaru01,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru01_time01	844,
-que_qaru02,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru02_time01	844,
-que_qaru03,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru03_time01	844,
-que_qaru04,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru04_time01	844,
-que_qaru05,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru05_time01	844,
-que_qsch01,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch01_time01	844,
-que_qsch02,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch02_time01	844,
-que_qsch03,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch03_time01	844,
-que_qsch04,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch04_time01	844,
-que_qsch05,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch05_time01	844,
+que_qaru01,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru01_time01	CLEAR_NPC
+que_qaru02,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru02_time01	CLEAR_NPC
+que_qaru03,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru03_time01	CLEAR_NPC
+que_qaru04,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru04_time01	CLEAR_NPC
+que_qaru05,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_aru05_time01	CLEAR_NPC
+que_qsch01,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch01_time01	CLEAR_NPC
+que_qsch02,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch02_time01	CLEAR_NPC
+que_qsch03,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch03_time01	CLEAR_NPC
+que_qsch04,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch04_time01	CLEAR_NPC
+que_qsch05,1,6,0	duplicate(#okolnir_main_time01)	#okolnir_sch05_time01	CLEAR_NPC
 
 que_qaru01,116,313,0,0	monster	Garden Keeper	1932,1,180000,0,0
 que_qaru01,120,285,0,0	monster	Garden Keeper	1932,1,180000,0,0
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index 31dea6319..876fb735d 100644
--- a/npc/quests/partyrelay.txt
+++ b/npc/quests/partyrelay.txt
@@ -1,20 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Party Relay Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= [Official Conversion]
 //= Party Relay Quest.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Fixed a couple typos, npcs check area for PCs. [L0ne_W0lf]
+//= 1.2 Updated RE/Pre-RE EXP. [Euphy]
 //============================================================
 
-payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
+payon,103,113,3	script	Ledrion#payon::RelayLedrion	4_M_MANAGER,{
 	getpartymember(getcharid(1));
 	set .@partymembercount,$@partymembercount;
 	set .@partyleader,getpartyleader(getcharid(1),2);
@@ -75,27 +74,7 @@ payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
 		else {
 			getitem 617,3; //Old_Violet_Box
 		}
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Ledrion]";
 		mes "Well, I hope you like it!";
 		mes "If you can't use it, then";
@@ -151,27 +130,7 @@ payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
 		getitem 603,3; //Old_Blue_Box
 		getitem 617,1; //Old_Violet_Box
 		getitem 7738,1; //Mission_Certificate9
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Ledrion]";
 		mes "Please give that ticket";
@@ -220,27 +179,7 @@ payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
 		getitem 644,3; //Gift_Box
 		getitem 603,1; //Old_Blue_Box
 		getitem 7734,1; //Mission_Certificate5
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		close;
 	}
 	if (countitem(7733) > 0) {
@@ -442,7 +381,7 @@ payon,103,113,3	script	Ledrion#payon::RelayLedrion	109,{
 	}
 }
 
-payon,83,327,3	script	Gatan#payon::RelayGatan	86,{
+payon,83,327,3	script	Gatan#payon::RelayGatan	4_M_04,{
 	getpartymember(getcharid(1));
 	set .@partymembercount,$@partymembercount;
 	set .@partyleader,getpartyleader(getcharid(1),2);
@@ -485,27 +424,7 @@ payon,83,327,3	script	Gatan#payon::RelayGatan	86,{
 		getitem 7739,1; //Mission_Certificate10
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Gatan]";
 		mes "Alright, get that done.";
@@ -970,27 +889,7 @@ payon,83,327,3	script	Gatan#payon::RelayGatan	86,{
 		set party_relay,17;
 		getitem 7735,1; //Mission_Certificate6
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 19560,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Gatan]";
 		mes "Alright, get that done.";
@@ -1461,27 +1360,7 @@ payon,83,327,3	script	Gatan#payon::RelayGatan	86,{
 		set party_relay,6;
 		getitem 7731,1; //Mission_Certificate2
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Gatan]";
 		mes "Don't forget to make";
@@ -1937,7 +1816,7 @@ payon,83,327,3	script	Gatan#payon::RelayGatan	86,{
 	close;
 }
 
-payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
+payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 	getpartymember(getcharid(1));
 	set .@partymembercount,$@partymembercount;
 	set .@partyleader,getpartyleader(getcharid(1),2);
@@ -1983,27 +1862,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		getitem 7740,1; //Mission_Certificate11
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Make sure that you give";
 		mes "that ticket to an Archer";
@@ -2028,27 +1887,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		getitem 7740,1; //Mission_Certificate11
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Make sure that you give";
 		mes "that ticket to an Archer";
@@ -2075,7 +1914,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "Don't forget now, alright?";
 		close;
 	}
-	if ((countitem(7739) > 0) && (.@relaytime >= 11) && (.@relaytime < 14) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) {
+	if ((countitem(7739) > 0) && (.@relaytime >= 11) && (.@relaytime < 14) && ((BaseClass == Job_Thief) || (BaseClass == Job_Acolyte))) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2102,7 +1941,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "I'll see you later~";
 		close;
 	}
-	else if ((countitem(7739) > 0) && (.@relaytime >= 0) && (.@relaytime < 3) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) {
+	else if ((countitem(7739) > 0) && (.@relaytime >= 0) && (.@relaytime < 3) && ((BaseClass == Job_Thief) || (BaseClass == Job_Acolyte))) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2130,7 +1969,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "I'll see you later~";
 		close;
 	}
-	if ((countitem(7739) > 0) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) {
+	if ((countitem(7739) > 0) && ((BaseClass == Job_Thief) || (BaseClass == Job_Acolyte))) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2170,27 +2009,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,20;
 		getitem 7736,1; //Mission_Certificate7
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Do me a favor and make";
 		mes "sure that the Merchant";
@@ -2214,27 +2033,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,20;
 		getitem 7736,1; //Mission_Certificate7
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Do me a favor and make";
 		mes "sure that the Merchant";
@@ -2276,27 +2075,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,20;
 		getitem 7736,1; //Mission_Certificate7
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Do me a favor and make";
 		mes "sure that the Merchant";
@@ -2320,27 +2099,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,20;
 		getitem 7736,1; //Mission_Certificate7
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Do me a favor and make";
 		mes "sure that the Merchant";
@@ -2480,27 +2239,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,9;
 		getitem 7732,1; //Mission_Certificate3
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Bafhail]";
 		mes "Please give that";
 		mes "ticket to the Archer";
@@ -2523,27 +2262,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		set party_relay,9;
 		getitem 7732,1; //Mission_Certificate3
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		next;
 		mes "[Bafhail]";
 		mes "Please give that";
@@ -2632,7 +2351,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "Standard Time. Don't forget!";
 		close;
 	}
-	if ((countitem(7731) > 0) && (BaseLevel > 39) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (Baseclass == Job_Thief)) {
+	if ((countitem(7731) > 0) && (BaseLevel > 39) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (BaseClass == Job_Thief)) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2664,7 +2383,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "items for missions, okay?";
 		close;
 	}
-	else if ((countitem(7731) > 0) && (BaseLevel > 39) && ((.@relaytime >= 21) && (Baseclass == Job_Thief))) {
+	else if ((countitem(7731) > 0) && (BaseLevel > 39) && ((.@relaytime >= 21) && (BaseClass == Job_Thief))) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2696,7 +2415,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 		mes "items for missions, okay?";
 		close;
 	}
-	if ((countitem(7731) > 0) && (BaseLevel > 39) && (Baseclass == Job_Thief)) {
+	if ((countitem(7731) > 0) && (BaseLevel > 39) && (BaseClass == Job_Thief)) {
 		mes "[Bafhail]";
 		mes "Oh, isn't that ticket...?";
 		mes "Ah, good, good. Judging";
@@ -2730,7 +2449,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	731,{
 	close;
 }
 
-payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
+payon,168,314,3	script	Lospii#payon::RelayLospii	4_M_KID1,{
 	getpartymember(getcharid(1));
 	set .@partymembercount,$@partymembercount;
 	set .@partyleader,getpartyleader(getcharid(1),2);
@@ -2783,27 +2502,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		getitem 7741,1; //Mission_Certificate12
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -2840,27 +2539,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		getitem 7741,1; //Mission_Certificate12
 		getitem 610,2; //Leaf_Of_Yggdrasil
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -2970,7 +2649,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		mes "important to know!";
 		close;
 	}
-	if ((countitem(7740) > 0) && ((Baseclass == Job_Archer) || (BaseClass == Job_Merchant))) {
+	if ((countitem(7740) > 0) && ((BaseClass == Job_Archer) || (BaseClass == Job_Merchant))) {
 		mes "[Lospii]";
 		mes "Hi, I'm Lospii! Maybe";
 		mes "I'm younger than you, but";
@@ -3021,27 +2700,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		set party_relay,22;
 		getitem 7737,1; //Mission_Certificate8
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -3077,27 +2736,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		set party_relay,22;
 		getitem 7737,1; //Mission_Certificate8
 		getitem 610,2; //Leaf_Of_Yggdrasil
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -3258,27 +2897,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		set party_relay,11;
 		getitem 7733,1; //Mission_Certificate4
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -3314,27 +2933,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		set party_relay,11;
 		getitem 7733,1; //Mission_Certificate4
 		getitem 607,2; //Yggdrasilberry
-		if (BaseLevel > 94) {
-			getexp 104760,0;
-		}
-		else if (BaseLevel > 89) {
-			getexp 85920,0;
-		}
-		else if (BaseLevel > 79) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 69) {
-			getexp 38520,0;
-		}
-		else if (BaseLevel > 59) {
-			getexp 67200,0;
-		}
-		else if (BaseLevel > 49) {
-			getexp 28800,0;
-		}
-		else {
-			getexp 1080,0;
-		}
+		callfunc "F_PartyRelay_Exp";
 		mes "[Lospii]";
 		mes "Okay, now take this";
 		mes "ticket, and give it to";
@@ -3362,7 +2961,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		mes "I... I can't read watches...";
 		close;
 	}
-	if ((countitem(7732) > 0) && (BaseLevel > 39) && ((.@relaytime >= 14) && (.@relaytime < 17)) && (Baseclass == Job_Archer)) {
+	if ((countitem(7732) > 0) && (BaseLevel > 39) && ((.@relaytime >= 14) && (.@relaytime < 17)) && (BaseClass == Job_Archer)) {
 		mes "[Lospii]";
 		mes "Hi, I'm Lospii! Maybe";
 		mes "I'm younger than you, but";
@@ -3403,7 +3002,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		mes "important to know!";
 		close;
 	}
-	else if ((countitem(7732) > 0) && (BaseLevel > 39) && ((.@relaytime >= 18) && (.@relaytime < 21)) && (Baseclass == Job_Archer)) {
+	else if ((countitem(7732) > 0) && (BaseLevel > 39) && ((.@relaytime >= 18) && (.@relaytime < 21)) && (BaseClass == Job_Archer)) {
 		mes "[Lospii]";
 		mes "Hi, I'm Lospii! Maybe";
 		mes "I'm younger than you, but";
@@ -3444,7 +3043,7 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 		mes "important to know!";
 		close;
 	}
-	if ((countitem(7732) > 0) && (BaseLevel > 39) && (Baseclass == Job_Archer)) {
+	if ((countitem(7732) > 0) && (BaseLevel > 39) && (BaseClass == Job_Archer)) {
 		mes "[Lospii]";
 		mes "Hi, I'm Lospii! Maybe";
 		mes "I'm younger than you, but";
@@ -3476,32 +3075,54 @@ payon,168,314,3	script	Lospii#payon::RelayLospii	706,{
 	close;
 }
 
+// EXP Rewards
+function	script	F_PartyRelay_Exp	{
+	if (checkre(3)) { //unconfirmed
+		if (BaseLevel > 94) getexp 104760,0;
+		else if (BaseLevel > 89) getexp 85920,0;
+		else if (BaseLevel > 79) getexp 38520,0;
+		else if (BaseLevel > 69) getexp 19560,0;
+		else if (BaseLevel > 59) getexp 6720,0;
+		else if (BaseLevel > 49) getexp 2880,0;
+		else getexp 1080,0;
+	} else {
+		if (BaseLevel > 94) getexp 1047600,0;
+		else if (BaseLevel > 89) getexp 859200,0;
+		else if (BaseLevel > 79) getexp 385200,0;
+		else if (BaseLevel > 69) getexp 195600,0;
+		else if (BaseLevel > 59) getexp 67200,0;
+		else if (BaseLevel > 49) getexp 28800,0;
+		else getexp 10800,0;
+	}
+	return;
+}
+
 // Comodo Relay
-comodo,71,137,3	duplicate(RelayLedrion)	Ledrion#comodo	109
-comodo,236,197,3	duplicate(RelayGatan)	Gatan#comodo	86
-comodo,152,184,3	duplicate(RelayBafhail)	Bafhail#comodo	731
-comodo,64,219,3	duplicate(RelayLospii)	Lospii#comodo	706
+comodo,71,137,3	duplicate(RelayLedrion)	Ledrion#comodo	4_M_MANAGER
+comodo,236,197,3	duplicate(RelayGatan)	Gatan#comodo	4_M_04
+comodo,152,184,3	duplicate(RelayBafhail)	Bafhail#comodo	4_M_JOB_BLACKSMITH
+comodo,64,219,3	duplicate(RelayLospii)	Lospii#comodo	4_M_KID1
 
 // Einbroch Relay
-einbroch,107,93,3	duplicate(RelayLedrion)	Ledrion#einbroch	109
-einbroch,260,128,3	duplicate(RelayGatan)	Gatan#einbroch	86
-einbroch,251,178,3	duplicate(RelayBafhail)	Bafhail#einbroch	731
-einbroch,173,72,3	duplicate(RelayLospii)	Lospii#einbroch	706
+einbroch,107,93,3	duplicate(RelayLedrion)	Ledrion#einbroch	4_M_MANAGER
+einbroch,260,128,3	duplicate(RelayGatan)	Gatan#einbroch	4_M_04
+einbroch,251,178,3	duplicate(RelayBafhail)	Bafhail#einbroch	4_M_JOB_BLACKSMITH
+einbroch,173,72,3	duplicate(RelayLospii)	Lospii#einbroch	4_M_KID1
 
 // Relay Hugel
-hugel,102,130,3	duplicate(RelayLedrion)	Ledrion#hugel	109
-hugel,169,139,3	duplicate(RelayGatan)	Gatan#hugel	86
-hugel,55,200,3	duplicate(RelayBafhail)	Bafhail#hugel	731
-hugel,144,201,3	duplicate(RelayLospii)	Lospii#hugel	706
+hugel,102,130,3	duplicate(RelayLedrion)	Ledrion#hugel	4_M_MANAGER
+hugel,169,139,3	duplicate(RelayGatan)	Gatan#hugel	4_M_04
+hugel,55,200,3	duplicate(RelayBafhail)	Bafhail#hugel	4_M_JOB_BLACKSMITH
+hugel,144,201,3	duplicate(RelayLospii)	Lospii#hugel	4_M_KID1
 
 // Relay Rachel
-rachel,215,71,3	duplicate(RelayLedrion)	Ledrion#rachel	109
-rachel,45,163,3	duplicate(RelayGatan)	Gatan#rachel	86
-rachel,245,132,3	duplicate(RelayBafhail)	Bafhail#rachel	731
-rachel,158,215,3	duplicate(RelayLospii)	Lospii#rachel	706
+rachel,215,71,3	duplicate(RelayLedrion)	Ledrion#rachel	4_M_MANAGER
+rachel,45,163,3	duplicate(RelayGatan)	Gatan#rachel	4_M_04
+rachel,245,132,3	duplicate(RelayBafhail)	Bafhail#rachel	4_M_JOB_BLACKSMITH
+rachel,158,215,3	duplicate(RelayLospii)	Lospii#rachel	4_M_KID1
 
 // Relay Veins
-veins,274,188,5	duplicate(RelayLedrion)	Ledrion#veins	109
-veins,138,207,3	duplicate(RelayGatan)	Gatan#veins	86
-veins,202,235,3	duplicate(RelayBafhail)	Bafhail#veins	731
-veins,97,245,5	duplicate(RelayLospii)	Lospii#veins	706
+veins,274,188,5	duplicate(RelayLedrion)	Ledrion#veins	4_M_MANAGER
+veins,138,207,3	duplicate(RelayGatan)	Gatan#veins	4_M_04
+veins,202,235,3	duplicate(RelayBafhail)	Bafhail#veins	4_M_JOB_BLACKSMITH
+veins,97,245,5	duplicate(RelayLospii)	Lospii#veins	4_M_KID1
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 627688922..16860ddf2 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.7a
+//= 3.4
 //===== Description: =========================================
 //= [Official Conversion]
 //= Contains Quests:
@@ -15,48 +15,27 @@
 //= Finding a Fairy & Finding a Giant Tree
 //= The Tripartite Union's Feud
 //= Cat Hand Agent
-//= - Contains untranslated dialog.
 //= Part Time Work
-//= - Contains Custom translated dialog.
 //= Report from the New World
-//= - Contains Custom translated dialog.
-// Persuing Rayan Moore
-//= - Contains Custom translated dialog.
+//= Persuing Rayan Moore
 //===== Additional Comments: =================================
-//= 1.0 First Version. [L0ne_W0lf]
-//= 1.1 I missed an end in one of the lhz guards. [L0ne_W0lf]
-//= 1.2 Fixed missing ends, wrong label and some typos [Gepard]
-//= 1.3 Added the two remaining 13.1 quests. [L0ne_W0lf]
-//=     Cat Hand Agents no longer ignore you with 300+ points.
-//= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
-//= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
-//= 1.6 Fixed check in cat hand agent.
-//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
-//= 1.8 Added 13.2 Additions to Report from the New World NPCs
-//= 1.9 Upped success rates for Report from the New World drops.
-//= 2.0 Added Mid Camp Warper, translated from the Official [Slim]
-//= 2.1 Fixed some typos [tr0n]
-//= 2.2 A little optimization (-25kb). [Euphy]
-//= 2.3 Updated to match the new Izlude Map. [Masao]
-//= 2.4 More optimization (-32kb). [Euphy]
-//= 2.5 Yet more optimization (-22kb). [Euphy]
-//= 2.5a Minor fixes. [Euphy]
-//= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy]
-//= 2.6a Added 'npcskill' command. [Euphy]
-//= 2.7 Updated incorrect EXP values & added checkre() checks [Streusel]
-//= 2.7a Modified Promotional Staff for Izlude
+//= 3.0 Fixed a missing variable check. [Joseph]
+//= 3.1 Updated RE/Pre-RE EXP. [Euphy]
+//= 3.2 Updated ep13_start and dialog to match official script. [Joseph]
+//= 3.3 Updated to match the latest official script. [Euphy]
+//= 3.3a Added Izlude RE coordinates. [Euphy]
+//= 3.4 Added GM management function and NPC. [Euphy]
 //============================================================
 
-// Onward to the New World
+// Onward to the New World :: ep13_gogo
 //============================================================
-prontera,163,53,3	script	Promotional Staff#prt	100,{
+function	script	Promotional_Staff	{
 	mes "[Promotional Staff]";
 	mes "We are looking for adventurers who are super curious and extremely brave.";
 	mes "Join us for a wonderful adventure!";
 	next;
 	mes "[Promotional Staff]";
-	mes "Hey, you're a knowledgeable person, right?";
-	mes "Are you interested in my story?";
+	mes "Hey, you're a knowledgeable person, right? Are you interested in my story?";
 	next;
 	switch(select("Yes.:No, thanks.")) {
 	case 1:
@@ -68,8 +47,7 @@ prontera,163,53,3	script	Promotional Staff#prt	100,{
 		mes "[Promotional Staff]";
 		mes "I usually send adventurers to";
 		mes "newly found places for research.";
-		mes "It's quite challenging, as nobody's";
-		mes "ever been to these places.";
+		mes "It's quite challeging, as nobody's ever been to these places.";
 		next;
 		mes "[Promotional Staff]";
 		mes "The missions are quite dangerous,";
@@ -78,15 +56,10 @@ prontera,163,53,3	script	Promotional Staff#prt	100,{
 		mes "of this mission.";
 		next;
 		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong";
-		mes "enough, but you seem brave. How";
-		mes "about going to the kingdom";
-		mes "receptionist? He should be in the";
-		mes "first room of Prontera Castle.";
+		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
 		next;
 		mes "[Promotional Staff]";
-		mes "From what I've heard about this";
-		mes "new place... It's not a new continent.";
+		mes "From what I've heard about this place... It's not a new continent.";
 		mes "I don't know where it is.";
 		mes "Hmm... Inside of the sky?";
 		next;
@@ -96,21 +69,22 @@ prontera,163,53,3	script	Promotional Staff#prt	100,{
 		mes "It's not my business.";
 		next;
 		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many";
-		mes "adventurers about it.";
+		mes "Anyway, I'm supposed to inform many adventurers about it.";
 		mes "There's no time to waste!";
 		close;
 	case 2:
 		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real";
-		mes "adventurer. You're missing a big";
-		mes "opportunity. You're definitely not";
-		mes "brave. Absolutely not!";
+		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
 		close;
 	}
 }
 
-prt_castle,121,51,3	script	Alliance Manager#prt	752,{
+prontera,163,53,3	script	Promotional Staff#prt	4W_SAILOR,{
+	callfunc "Promotional_Staff";
+	end;
+}
+
+prt_castle,121,51,3	script	Alliance Manager#prt	4_M_CRU_OLD,{
 	if (ep13_ryu == 13) {
 		mes "[Alliance Manager]";
 		mes "If we'd had the initiative over Schwartzvald, we could take advantage over them! But we lost the opportunity.";
@@ -196,7 +170,7 @@ prt_castle,121,51,3	script	Alliance Manager#prt	752,{
 	close;
 }
 
-prt_castle,117,51,5	script	Member of Alliance#prt	754,{
+prt_castle,117,51,5	script	Member of Alliance#prt	4_M_SAGE_A,{
 	if ((ep13_ryu == 12) || (ep13_ryu == 13)) {
 		mes "[Member of Alliance]";
 		mes "If we have absolute power, we wouldn't have to get along with Schwartzvald and Arunafeltz.";
@@ -218,7 +192,7 @@ prt_castle,117,51,5	script	Member of Alliance#prt	754,{
 	close;
 }
 
-prt_castle,83,67,5	script	Recruiter for the Brave	109,{
+prt_castle,83,67,5	script	Recruiter for the Brave	4_M_MANAGER,{
 	if (ep13_ryu == 12) {
 		mes "[Recruiter]";
 		mes "Why have you come again?";
@@ -294,7 +268,7 @@ prt_castle,83,67,5	script	Recruiter for the Brave	109,{
 		next;
 		changequest 10064,10065;
 		set ep13_ryu,9;
-		if(checkre(0))
+		if (checkre(3))
 			getexp 66000,21000;
 		else
 			getexp 660000,210000;
@@ -376,7 +350,7 @@ prt_castle,83,67,5	script	Recruiter for the Brave	109,{
 	}
 }
 
-aldebaran,127,138,3	script	Promotional Staff#alde	100,{
+aldebaran,127,138,3	script	Promotional Staff#alde	4W_SAILOR,{
 	if (ep13_ryu > 3) {
 		mes "[Promotional Staff]";
 		mes "Did you try out for the test, or are you already enjoying your adventures?";
@@ -387,7 +361,14 @@ aldebaran,127,138,3	script	Promotional Staff#alde	100,{
 		mes "Just visit the ^FF0000Promotional Staff in Geffen^000000. You have no business with me anymore. Bless you. I wish you a safe adventure.";
 		close;
 	}
-	if ((ep13_ryu == 2) && (countitem(909) > 299)) {
+	if (ep13_ryu == 2) {
+		if (countitem(909) < 300) {
+			mes "[Promotional Staff]";
+			mes "Don't forget to bring... ^FF0000300 Jellopy^000000.";
+			mes "Got it? ^FF0000300 Jellopy^000000!";
+			mes "Let me know once you got them.";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "Hey! Let me know once you collect all of them.";
 		mes "Don't disturb me anymore. I'm a busy man... What a waste.";
@@ -427,13 +408,6 @@ aldebaran,127,138,3	script	Promotional Staff#alde	100,{
 		mes "Bless you!";
 		close;
 	}
-	if (ep13_ryu == 2) {
-		mes "[Promotional Staff]";
-		mes "Don't forget to bring... ^FF0000300 Jellopy^000000.";
-		mes "Got it? ^FF0000300 Jellopy^000000!";
-		mes "Let me know once you got them.";
-		close;
-	}
 	if (ep13_ryu == 1) {
 		mes "[Promotional Staff]";
 		mes "We want the adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
@@ -472,55 +446,11 @@ aldebaran,127,138,3	script	Promotional Staff#alde	100,{
 		mes "Then we can go forward.";
 		close;
 	}
-	mes "[Promotional Staff]";
-	mes "We want the adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
-	next;
-	mes "[Promotional Staff]";
-	mes "Hey, you're a well-versed person, right? Are you interested in my story?";
-	next;
-	switch(select("Yes.:No, thanks.")) {
-	case 1:
-		mes "[Promotional Staff]";
-		mes "You're a real adventurer.";
-		mes "Good for you!";
-		mes "You won't regret it.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I usually send adventurers to";
-		mes "newly found places for research.";
-		mes "It's quite challeging, as nobody's ever been to these places.";
-		next;
-		mes "[Promotional Staff]";
-		mes "The missions are quite dangerous,";
-		mes "so only those who are courageous";
-		mes "are qualified for the challenge";
-		mes "of this mission.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
-		next;
-		mes "[Promotional Staff]";
-		mes "From what I've heard about this place... It's not a new continent.";
-		mes "I don't know where it is.";
-		mes "Hmm... Inside of the sky?";
-		next;
-		mes "[Promotional Staff]";
-		mes "Could just be a rumor,";
-		mes "but I don't know exactly.";
-		mes "It's not my business.";
-		next;
-		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many adventurers about it.";
-		mes "There's no time to waste!";
-		close;
-	case 2:
-		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
-		close;
-	}
+	callfunc "Promotional_Staff";
+	end;
 }
 
-geffen,90,67,3	script	Promotional Staff#gef	100,{
+geffen,90,67,3	script	Promotional Staff#gef	4W_SAILOR,{
 	if (ep13_ryu > 6) {
 		mes "[Promotional Staff]";
 		mes "Did you take the test?";
@@ -533,7 +463,14 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "Or do you have any business in Geffen?";
 		close;
 	}
-	if ((ep13_ryu == 5) && (countitem(723) > 0)) {
+	if (ep13_ryu == 5) {
+		if (countitem(723) == 0) {
+			mes "[Promotional Staff]";
+			mes "^FF00001 Ruby!!^000000.";
+			mes "Don't you forget it!";
+			mes "Hurry up! Time is zeny!";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "Wow, you brought a genuine Jewel.";
 		mes "You are absolutely qualified.";
@@ -566,14 +503,13 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "Good luck!";
 		close;
 	}
-	if (ep13_ryu == 5) {
-		mes "[Promotional Staff]";
-		mes "^FF00001 Ruby!!^000000.";
-		mes "Don't you forget it!";
-		mes "Hurry up! Time is zeny!";
-		close;
-	}
-	if ((ep13_ryu == 4) && (countitem(721) > 0)) {
+	if (ep13_ryu == 4) {
+		if (countitem(721) == 0) {
+			mes "[Promotional Staff]";
+			mes "The one you should bring me is";
+			mes "^FF0000Emerald^000000. Can you get it?";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "You brought it so soon!";
 		mes "You're a real adventurer!";
@@ -597,12 +533,6 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "I will wait until you bring me a stone again.";
 		close;
 	}
-	if (ep13_ryu == 4) {
-		mes "[Promotional Staff]";
-		mes "The one you should bring me is";
-		mes "^FF0000Emerald^000000. Can you get it?";
-		close;
-	}
 	if (ep13_ryu == 3) {
 		mes "[Promotional Staff]";
 		mes "We are recruiting adventurers who are strong and curious. Try your life at something more challenging.";
@@ -632,55 +562,11 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "Then we can go forward.";
 		close;
 	}
-	mes "[Promotional Staff]";
-	mes "We want adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
-	next;
-	mes "[Promotional Staff]";
-	mes "Hey, you're a knowledgeable person, right? Are you interested in my story?";
-	next;
-	switch(select("Yes.:No, thanks.")) {
-	case 1:
-		mes "[Promotional Staff]";
-		mes "You're a real adventurer.";
-		mes "Good for you!";
-		mes "You won't regret it.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I usually send adventurers to";
-		mes "newly found places for research.";
-		mes "It's quite challeging, as nobody's ever been to these places.";
-		next;
-		mes "[Promotional Staff]";
-		mes "The missions are quite dangerous,";
-		mes "so only those who are courageous";
-		mes "are qualified for the challenge";
-		mes "of this mission.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
-		next;
-		mes "[Promotional Staff]";
-		mes "From what I've heard about this place... It's not a new continent.";
-		mes "I don't know where it is.";
-		mes "Hmm... Inside of the sky?";
-		next;
-		mes "[Promotional Staff]";
-		mes "Could just be a rumor,";
-		mes "but I don't know exactly.";
-		mes "It's not my business.";
-		next;
-		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many adventurers about it.";
-		mes "There's no time to waste!";
-		close;
-	case 2:
-		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
-		close;
-	}
+	callfunc "Promotional_Staff";
+	end;
 }
 
--	script	::Promotional Staff#iz	-1,{
+-	script	::PromotionalStaff_izlude	-1,{
 	if (ep13_ryu > 8) {
 		mes "[Promotional Staff]";
 		mes "I bless you for your future! May it be full of happiness!";
@@ -692,7 +578,21 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "If you have any other business, go to the palace.";
 		close;
 	}
-	if ((ep13_ryu == 7) && (BaseLevel > 69)) {
+	if (ep13_ryu == 7) {
+		if (BaseLevel < 70) {
+			mes "[Promotional Staff]";
+			mes "You don't look that strong.";
+			mes "Nothing but skin and bones!";
+			mes "Not reliable.";
+			mes "You should level up more before";
+			mes "considering this adventure.";
+			next;
+			mes "[Promotional Staff]";
+			mes "I don't need adventurers who are";
+			mes "body-builders... but at least";
+			mes "someone not so little!!";
+			close;
+		}
 		mes "[Promotional Staff]";
 		mes "Wow! You are considerably";
 		mes "stronger than before!";
@@ -731,20 +631,6 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 		mes "for your great future!";
 		close;
 	}
-	if (ep13_ryu == 7) {
-		mes "[Promotional Staff]";
-		mes "You don't look that strong.";
-		mes "Nothing but skin and bones!";
-		mes "Not reliable.";
-		mes "You should level up more before";
-		mes "considering this adventure.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I don't need adventurers who are";
-		mes "body-builders... but at least";
-		mes "someone not so little!!";
-		close;
-	}
 	if (ep13_ryu == 6) {
 		mes "[Promotional Staff]";
 		mes "We are recruiting adventurers";
@@ -809,57 +695,11 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 			close;
 		}
 	}
-	mes "[Promotional Staff]";
-	mes "We want the adventurers who are super curious";
-	mes "and extremely brave.";
-	mes "Join us for a wonderful adventure!";
-	next;
-	mes "[Promotional Staff]";
-	mes "Hey, you're a well-knowledged person, as I know. Are you interested in my story?";
-	next;
-	switch(select("Yes.:No, thanks.")) {
-	case 1:
-		mes "[Promotional Staff]";
-		mes "You're a real adventurer.";
-		mes "Good for you!";
-		mes "You won't regret it.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I usually send adventurers to";
-		mes "newly found places for research.";
-		mes "It's quite challeging, as nobody's ever been to these places.";
-		next;
-		mes "[Promotional Staff]";
-		mes "The missions are quite dangerous,";
-		mes "so only those who are courageous";
-		mes "are qualified for the challenge";
-		mes "of this mission.";
-		next;
-		mes "[Promotional Staff]";
-		mes "I'm not sure that you're strong enough, but you seem brave. How about going to the kingdom receptionist? He should be in the first room of Prontera Castle.";
-		next;
-		mes "[Promotional Staff]";
-		mes "From what I've heard about this place... It's not a new continent.";
-		mes "I don't know where it is.";
-		mes "Hmm... Inside of the sky?";
-		next;
-		mes "[Promotional Staff]";
-		mes "Could just be a rumor,";
-		mes "but I don't know exactly.";
-		mes "It's not my business.";
-		next;
-		mes "[Promotional Staff]";
-		mes "Anyway, I'm supposed to inform many adventurers about it.";
-		mes "There's no time to waste!";
-		close;
-	case 2:
-		mes "[Promotional Staff]";
-		mes "Huh, I thought you were a real adventurer. You're missing a big opportunity. You're definitely not brave. Absolutely not!";
-		close;
-	}
+	callfunc "Promotional_Staff";
+	end;
 }
 
-lighthalzen,220,292,3	script	Guide#ep13_1	899,{
+lighthalzen,220,292,3	script	Guide#ep13_1	4_M_HUMAN_02,{
 	if (ep13_ryu > 8) {
 		mes "[Guide]";
 		mes "Welcome! You've arrived at Lighthalzen, which is the base of three kingdoms.";
@@ -876,7 +716,7 @@ lighthalzen,220,292,3	script	Guide#ep13_1	899,{
 	close;
 }
 
-lhz_in01,136,260,5	script	Munkenro#1	967,{
+lhz_in01,136,260,5	script	Munkenro#1	4_M_RUSMAN1,{
 	if (ep13_ryu == 20) {
 		mes "-At this spot, it's possible to overhear something. Listen carefully through the wall...-";
 		next;
@@ -947,7 +787,7 @@ lhz_in01,136,260,5	script	Munkenro#1	967,{
 	close;
 }
 
-lhz_in01,132,259,5	script	Sikaiz#1	868,{
+lhz_in01,132,259,5	script	Sikaiz#1	4_M_LGTGUARD,{
 	if ((ep13_ryu == 18) || (ep13_ryu == 19)) {
 		mes "[Sikaiz]";
 		mes "Please come to me ASAP.";
@@ -1288,35 +1128,35 @@ function	script	Guard_13_1	{
 	end;
 }
 
-lhz_in01,115,250,3	script	Guard#ep13_1-1	899,2,2,{
+lhz_in01,115,250,3	script	Guard#ep13_1-1	4_M_HUMAN_02,2,2,{
 	callfunc "Guard_13_1",0,108,252;
 OnTouch:
 	callfunc "Guard_13_1",1,108,252;
 }
-lhz_in01,115,252,3	duplicate(Guard#ep13_1-1)	Guard#ep13_1-2	899,2,2
+lhz_in01,115,252,3	duplicate(Guard#ep13_1-1)	Guard#ep13_1-2	4_M_HUMAN_02,2,2
 
-lhz_in01,147,252,7	script	Guard#ep13_1-3	899,2,2,{
+lhz_in01,147,252,7	script	Guard#ep13_1-3	4_M_HUMAN_02,2,2,{
 	callfunc "Guard_13_1",0,152,252;
 OnTouch:
 	callfunc "Guard_13_1",1,152,252;
 }
-lhz_in01,147,250,7	duplicate(Guard#ep13_1-3)	Guard#ep13_1-4	899,2,2
+lhz_in01,147,250,7	duplicate(Guard#ep13_1-3)	Guard#ep13_1-4	4_M_HUMAN_02,2,2
 
-lhz_in01,124,234,5	script	Guard#ep13_1-5	899,2,2,{
+lhz_in01,124,234,5	script	Guard#ep13_1-5	4_M_HUMAN_02,2,2,{
 	callfunc "Guard_13_1",0,123,229;
 OnTouch:
 	callfunc "Guard_13_1",1,123,229;
 }
-lhz_in01,121,234,5	duplicate(Guard#ep13_1-5)	Guard#ep13_1-6	899,2,2
+lhz_in01,121,234,5	duplicate(Guard#ep13_1-5)	Guard#ep13_1-6	4_M_HUMAN_02,2,2
 
-lhz_in01,137,234,5	script	Guard#ep13_1-7	899,2,2,{
+lhz_in01,137,234,5	script	Guard#ep13_1-7	4_M_HUMAN_02,2,2,{
 	callfunc "Guard_13_1",0,139,228;
 OnTouch:
 	callfunc "Guard_13_1",1,139,228;
 }
-lhz_in01,140,234,5	duplicate(Guard#ep13_1-7)	Guard#ep13_1-8	899,2,2
+lhz_in01,140,234,5	duplicate(Guard#ep13_1-7)	Guard#ep13_1-8	4_M_HUMAN_02,2,2
 
-lhz_in01,130,232,5	script	Guard#ep13_1-9	899,{
+lhz_in01,130,232,5	script	Guard#ep13_1-9	4_M_HUMAN_02,{
 	if (ep13_ryu > 19) {
 		mes "[Guard]";
 		mes "You're not allowed to enter.";
@@ -1366,7 +1206,7 @@ lhz_in01,130,232,5	script	Guard#ep13_1-9	899,{
 	}
 }
 
-lhz_in01,128,249,1	script	Member of Alliance#1	904,{
+lhz_in01,128,249,1	script	Member of Alliance#1	4_M_KHMAN,{
 	if (ep13_ryu > 19) {
 		mes "-Munkenro and Sakaiz don't seem to be getting along very well anymore.-";
 		close;
@@ -1377,7 +1217,7 @@ lhz_in01,128,249,1	script	Member of Alliance#1	904,{
 	close;
 }
 
-lhz_in01,136,245,1	script	Member of Alliance#2	869,{
+lhz_in01,136,245,1	script	Member of Alliance#2	4_M_LGTMAN,{
 	if (ep13_ryu > 19) {
 		mes "-You should probably head over to the dimensional rift next to Morroc and find the Guard there-";
 		close;
@@ -1394,7 +1234,7 @@ lhz_in01,136,245,1	script	Member of Alliance#2	869,{
 	close;
 }
 
-lhz_in01,140,245,1	script	Member of Alliance#3	85,{
+lhz_in01,140,245,1	script	Member of Alliance#3	4_M_03,{
 	if (ep13_ryu > 19) {
 		mes "-You're still here? You're a member of the alliance now so you should head to the dimensional rift next to Morroc and find the Guard there-";
 		close;
@@ -1411,7 +1251,7 @@ lhz_in01,140,245,1	script	Member of Alliance#3	85,{
 	close;
 }
 
-lhz_in01,136,249,1	script	Member of Alliance#4	865,{
+lhz_in01,136,249,1	script	Member of Alliance#4	4_LGTSCIENCE,{
 	if (ep13_ryu > 19) {
 		mes "-I'm sure they'll settle their little dispute somehow. You should be heading to the dimensional rift next to Morroc and find the Guard there-";
 		close;
@@ -1431,7 +1271,7 @@ lhz_in01,136,249,1	script	Member of Alliance#4	865,{
 	close;
 }
 
-lhz_in01,124,245,1	script	Member of Alliance#5	932,{
+lhz_in01,124,245,1	script	Member of Alliance#5	4_M_RACHOLD1,{
 	if (ep13_ryu > 19) {
 		mes "-Maybe Munk is a better leader instead of Sakaiz. Anyways you should be heading to the dimensional rift next to Morroc and find the Guard there-";
 		close;
@@ -1448,7 +1288,7 @@ lhz_in01,124,245,1	script	Member of Alliance#5	932,{
 	close;
 }
 
-lhz_in01,136,241,3	script	Member of Alliance#6	849,{
+lhz_in01,136,241,3	script	Member of Alliance#6	4_M_DIEMAN,{
 	if (ep13_ryu > 19) {
 		mes "-I'm so bored!!! You should be heading to the dimensional rift next to Morroc and find the Guard there. It's probably less boring there than it is here-";
 		close;
@@ -1464,7 +1304,7 @@ lhz_in01,136,241,3	script	Member of Alliance#6	849,{
 	close;
 }
 
-lhz_in01,126,249,1	script	Member of Alliance#7	930,{
+lhz_in01,126,249,1	script	Member of Alliance#7	4_M_RACHMAN2,{
 	if (ep13_ryu > 19) {
 		mes "-We haven't even started and we're already bickering. Just ignore the politics and head to the dimensional rift next to Morroc and find the Guard there-";
 		close;
@@ -1475,7 +1315,7 @@ lhz_in01,126,249,1	script	Member of Alliance#7	930,{
 	close;
 }
 
-lhz_in01,122,245,1	script	Member of Alliance#8	882,{
+lhz_in01,122,245,1	script	Member of Alliance#8	4_F_SITDOWN,{
 	if (ep13_ryu > 19) {
 		mes "-You shouldn't stay around here and listen to all the complaining. You should be heading to the dimensional rift next to Morroc and find the Guard there-";
 		close;
@@ -1491,7 +1331,7 @@ lhz_in01,122,245,1	script	Member of Alliance#8	882,{
 	close;
 }
 
-ra_temple,119,113,3	script	Alliance Manager#ra	935,{
+ra_temple,119,113,3	script	Alliance Manager#ra	4_M_TRAINEE,{
 	if (ep13_ryu == 16) {
 		mes "[Manager]";
 		mes "With blessings from the Goddess Freya! We three kingdoms will know success! It's all we want. ...Khkhkhkh...";
@@ -1531,7 +1371,7 @@ ra_temple,119,113,3	script	Alliance Manager#ra	935,{
 	close;
 }
 
-lhz_in01,32,22,3	script	Officer A	109,{
+lhz_in01,32,22,3	script	Officer A	4_M_MANAGER,{
 	if (ep13_ryu == 20) {
 		mes "[Officer]";
 		mes "Why don't you go back there?";
@@ -1640,7 +1480,7 @@ lhz_in01,32,22,3	script	Officer A	109,{
 	close;
 }
 
-lhz_in01,30,24,5	script	Officer B	109,{
+lhz_in01,30,24,5	script	Officer B	4_M_MANAGER,{
 	if (ep13_ryu == 20) {
 		mes "[Officer]";
 		mes "Why don't you go back there?";
@@ -1748,7 +1588,7 @@ lhz_in01,30,24,5	script	Officer B	109,{
 	close;
 }
 
-moc_fild20,349,179,3	script	Rift Guard#1	707,{
+moc_fild20,349,179,3	script	Rift Guard#1	4_M_MOC_SOLDIER,{
 	if (ep13_ryu > 19) {
 		mes "[Guard]";
 		mes "Ah, you are a member of the alliance that discovered the dimensional rift? Welcome. Everything is prepared. Just enter and find the camp when you pass through the rift.";
@@ -1779,7 +1619,7 @@ moc_fild20,349,179,3	script	Rift Guard#1	707,{
 	close;
 }
 
-moc_fild22b,37,196,5	script	Rift Guard#2	707,{
+moc_fild22b,37,196,5	script	Rift Guard#2	4_M_MOC_SOLDIER,{
 	mes "[Guard]";
 	mes "Are you the new adventurer?";
 	mes "If you're going to the other side of the rift, the head of the alliance will guide you there.";
@@ -1805,7 +1645,7 @@ moc_fild22b,37,196,5	script	Rift Guard#2	707,{
 	}
 }
 
-moc_fild22b,330,154,3	script	Rift Guard#3	707,{
+moc_fild22b,330,154,3	script	Rift Guard#3	4_M_MOC_SOLDIER,{
 	mes "[Guard]";
 	mes "Are you new here?";
 	mes "You look like you need to find the head of the alliance. You can find him near the center of the dimensional rift.";
@@ -1817,7 +1657,7 @@ moc_fild22b,330,154,3	script	Rift Guard#3	707,{
 	close;
 }
 
-moc_fild22b,230,197,5	script	Munkenro#2	967,{
+moc_fild22b,230,197,5	script	Munkenro#2	4_M_RUSMAN1,{
 	if (ep13_ryu == 100) {
 		mes "[Munkenro]";
 		mes "Are you ready to discover Ash-Vacuum?";
@@ -1888,8 +1728,8 @@ moc_fild22b,230,197,5	script	Munkenro#2	967,{
 			mes "Ok, just have a good adventure.";
 			next;
 			set ep13_ryu,22;
-			changequest 10077,10078; 
-			donpcevent "Head of the Alliance#moo::OnEnable"; 
+			changequest 10077,10078;
+			donpcevent "Head of the Alliance#moo::OnEnable";
 			mes "[Munkenro]";
 			mes "If you are too late,";
 			mes "it will be considered as a failure, so come back soon.";
@@ -1943,7 +1783,7 @@ moc_fild22b,230,197,5	script	Munkenro#2	967,{
 		next;
 		completequest 10078;
 		set ep13_ryu,100;
-		if(checkre(0))
+		if (checkre(3))
 			getexp 66000,21000;
 		else
 			getexp 660000,210000;
@@ -1967,7 +1807,7 @@ OnEnable:
 	monster "moc_fild22b",0,0,"Allied Soldier",1851,80,"Head of the Alliance#moo::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "moc_fild22b","Head of the Alliance#moo::OnMyMobDead";
 	end;
 
@@ -1993,7 +1833,7 @@ OnTimer900000:
 	end;
 }
 
-mid_camp,213,286,3	script	Rift Guard#4	707,{
+mid_camp,213,286,3	script	Rift Guard#4	4_M_MOC_SOLDIER,{
 	mes "[Guard]";
 	mes "Are you the new adventurer?";
 	mes "If you're going to the other side of the rift, the head of the alliance will guide you there.";
@@ -2019,7 +1859,7 @@ mid_camp,213,286,3	script	Rift Guard#4	707,{
 	}
 }
 
-moc_ruins,137,89,5	script	Time-Space Gap Guard	707,{
+moc_ruins,137,89,5	script	Time-Space Gap Guard	4_M_MOC_SOLDIER,{
 	if (ep13_ryu == 100) {
 		mes "[Guard]";
 		mes "- Trembling in fear. -";
@@ -2080,23 +1920,25 @@ moc_ruins,137,89,5	script	Time-Space Gap Guard	707,{
 	close;
 }
 
-/*
-moc_fild22b,370,370,3	script	Allied Manager#gm	100,{
+moc_fild22b,370,370,3	script	Allied Manager#gm	4W_SAILOR,{
+	callfunc "F_GM_NPC";
 	mes "[Manager]";
 	mes "Please enter the password.";
 	next;
-	input .@input;
-	if ((.@input < 0) || (.@input > 9000) ) {
+	set .@i, callfunc("F_GM_NPC",8028,0,0,9000);
+	if (.@i == -2) {
 		mes "[Manager]";
 		mes "Incorrect password.";
 		close;
-	}
-	else if (.@input == 0) {
+	} else if (.@i == -1) {
 		mes "[Manager]";
 		mes "Please enter a password other then 0.";
 		close;
-	}
-	else if (.@input == 8028) {
+	} else if (.@i == 0) {
+		mes "[Manager]";
+		mes "Nevermind then.";
+		close;
+	} else {
 		mes "[Manager]";
 		mes "What would you like to do?";
 		next;
@@ -2113,25 +1955,19 @@ moc_fild22b,370,370,3	script	Allied Manager#gm	100,{
 			close;
 		}
 	}
-	else {
-		mes "[Manager]";
-		mes "Nevermind then.";
-		close;
-	}
 }
-*/
 
-// New Surroundings
-//============================================================ 
-mid_camp,222,283,4	script	Marian#ep13bs	727,{
-	if (checkweight(1201,1) == 0) {
+// New Surroundings :: ep13_newbs
+//============================================================
+mid_camp,222,283,4	script	Marian#ep13bs	4_F_JOB_HUNTER,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "[Marian]";
-		mes "You are carrying too much weight.";
-		mes "Please try again after losing some weight.";
+		mes "You have too many items~";
+		mes "Drop some and come back to me.";
 		close;
 	}
 	if (ep13_newbs < 1) {
-		if (ep13_ryu > 99) {
+		if (ep13_ryu > 99 || ep13_start > 99) {
 			mes "[Marian]";
 			mes "You must be a stranger here.";
 			mes "Is this your first visit here?";
@@ -2274,7 +2110,7 @@ mid_camp,222,283,4	script	Marian#ep13bs	727,{
 	}
 }
 
-mid_camp,261,284,4	script	Instructor#ep13bs	405,{
+mid_camp,261,284,4	script	Instructor#ep13bs	4_M_YOUNGKNIGHT,{
 	if (checkweight(1201,1) == 0) {
 		mes "[Instructor Lugen]";
 		mes "You are carrying too much weight.";
@@ -2826,7 +2662,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 			mes "Hehe, don't mention it.";
 			mes "And Otto said that he";
 			mes "would come to see you.";
-			emotion 40,1;
+			emotion e_shy,1;
 			next;
 			mes "[Instructor Lugen]";
 			mes "Did he?";
@@ -2839,7 +2675,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 			set ep13_newbs,100;
 			getitem 617,1; //Old_Violet_Box
 			getitem 12322,5; //Chocolate_Pie
-			if(checkre(0))
+			if (checkre(3))
 				getexp 100000,10000;
 			else
 				getexp 1000000,100000;
@@ -2873,7 +2709,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 	}
 }
 
-mid_camp,123,290,4	script	Otto#ep13bs	967,{
+mid_camp,123,290,4	script	Otto#ep13bs	4_M_RUSMAN1,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -2985,7 +2821,7 @@ mid_camp,123,290,4	script	Otto#ep13bs	967,{
 	}
 }
 
-mid_campin,106,122,4	script	Receptionist Brink#ep13b	89,{
+mid_campin,106,122,4	script	Receptionist Brink#ep13b	4_M_ORIENT02,{
 	if (ep13_newbs < 3) {
 		mes "[Brink]";
 		mes "Hmm... Hey...";
@@ -3081,7 +2917,7 @@ mid_campin,106,122,4	script	Receptionist Brink#ep13b	89,{
 	}
 }
 
-mid_camp,264,263,4	script	Diego#ep13bs	931,{
+mid_camp,264,263,4	script	Diego#ep13bs	4_M_RACHMAN1,{
 	if (ep13_newbs < 5) {
 		mes "[Diego]";
 		mes "I'm busy right now!";
@@ -3098,7 +2934,7 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 		case 1:
 			mes "[Diego]";
 			mes "Thanks.";
-			emotion 15;
+			emotion e_thx;
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "What do you need?";
@@ -3252,7 +3088,7 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 	}
 }
 
-mid_campin,291,128,1	script	#ep13bs	111,1,1,{
+mid_campin,291,128,1	script	#ep13bs	HIDDEN_NPC,1,1,{
 	end;
 
 OnTouch:
@@ -3285,7 +3121,7 @@ OnTouch:
 	}
 }
 
-mid_campin,295,128,4	script	Lucas#ep13bs	884,{
+mid_campin,295,128,4	script	Lucas#ep13bs	4_M_ACROSS,{
 	if (ep13_newbs < 11) {
 		mes "[Lucas]";
 		mes "......";
@@ -3344,7 +3180,7 @@ mid_campin,295,128,4	script	Lucas#ep13bs	884,{
 	}
 }
 
-mid_campin,292,120,4	script	Davi#ep13bs	849,{
+mid_campin,292,120,4	script	Davi#ep13bs	4_M_DIEMAN,{
 	mes "[Davi]";
 	mes "Ahhh, my body...";
 	mes "I walked too much...";
@@ -3353,7 +3189,7 @@ mid_campin,292,120,4	script	Davi#ep13bs	849,{
 	close;
 }
 
-mid_camp,160,298,4	script	Jan#ep13bs	865,{
+mid_camp,160,298,4	script	Jan#ep13bs	4_LGTSCIENCE,{
 	if (ep13_newbs == 15) {
 		if (countitem(6045) > 0) {
 			mes "[Jan]";
@@ -3362,12 +3198,12 @@ mid_camp,160,298,4	script	Jan#ep13bs	865,{
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "Yes...";
-			emotion 4,1;
+			emotion e_swt,1;
 			next;
 			mes "[Jan]";
 			mes "Ahhh, it's exciting~";
 			mes "I love it.";
-			emotion 38;
+			emotion e_awsm;
 			next;
 			mes "[Jan]";
 			mes "I want to unwrap it right now~";
@@ -3418,7 +3254,7 @@ mid_camp,160,298,4	script	Jan#ep13bs	865,{
 	}
 }
 
-mid_camp,30,168,4	script	Gerard#ep13bs	939,{
+mid_camp,30,168,4	script	Gerard#ep13bs	4_DST_SOLDIER,{
 	if (ep13_newbs == 17) {
 		if (countitem(6045) > 0) {
 			mes "["+ strcharinfo(0) +"]";
@@ -3441,7 +3277,7 @@ mid_camp,30,168,4	script	Gerard#ep13bs	939,{
 			mes "I was considering";
 			mes "going back to the camp.";
 			mes "I really appreciate this.";
-			emotion 37;
+			emotion e_rice;
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "...";
@@ -3494,7 +3330,7 @@ mid_camp,30,168,4	script	Gerard#ep13bs	939,{
 	}
 }
 
-man_fild01,80,248,4	script	Alberto#ep13bs	934,{
+man_fild01,80,248,4	script	Alberto#ep13bs	4_M_RASWORD,{
 	if (ep13_newbs == 19) {
 		if (countitem(6045) > 0) {
 			mes "[Alberto]";
@@ -3509,7 +3345,7 @@ man_fild01,80,248,4	script	Alberto#ep13bs	934,{
 			mes "I finally got it.";
 			mes "My coat...sniff.";
 			mes "It's freezing here.";
-			emotion 28;
+			emotion e_sob;
 			next;
 			mes "[Alberto]";
 			mes "Sniff...";
@@ -3549,7 +3385,7 @@ man_fild01,80,248,4	script	Alberto#ep13bs	934,{
 			mes "[Alberto]";
 			mes "It's so cold here~~";
 			mes "the wind chills me to the bones~";
-			emotion 28;
+			emotion e_sob;
 			close;
 		}
 	}
@@ -3569,7 +3405,7 @@ man_fild01,80,248,4	script	Alberto#ep13bs	934,{
 	}
 }
 
-mid_camp,159,282,4	script	Cooking Soldier#ep13bs	886,{
+mid_camp,159,282,4	script	Cooking Soldier#ep13bs	4_COOK,{
 	mes "[Alix]";
 	mes "Huu, I made this and";
 	mes "this is really great.";
@@ -3584,7 +3420,7 @@ mid_camp,159,282,4	script	Cooking Soldier#ep13bs	886,{
 	close;
 }
 
-mid_camp,166,248,4	script	Sorcerer#ep13bs	937,{
+mid_camp,166,248,4	script	Sorcerer#ep13bs	4_M_ARUNA_NFM1,{
 	mes "[Biolay]";
 	mes "Sob...";
 	mes "Where is she?";
@@ -3597,11 +3433,11 @@ mid_camp,166,248,4	script	Sorcerer#ep13bs	937,{
 	next;
 	mes "[Biolay]";
 	mes "I want to go back to my house.";
-	emotion 28;
+	emotion e_sob;
 	close;
 }
 
-spl_fild02,348,76,0	script	Tree#ep13bs1::ep13tree	111,{
+spl_fild02,348,76,0	script	Tree#ep13bs1::ep13tree	HIDDEN_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -3642,12 +3478,12 @@ spl_fild02,348,76,0	script	Tree#ep13bs1::ep13tree	111,{
 	end;
 }
 
-spl_fild02,232,145,0	duplicate(ep13tree)	Tree#ep13bs2	111
-spl_fild02,380,197,0	duplicate(ep13tree)	Tree#ep13bs3	111
-spl_fild02,304,151,0	duplicate(ep13tree)	Tree#ep13bs4	111
-spl_fild02,183,235,0	duplicate(ep13tree)	Tree#ep13bs5	111
+spl_fild02,232,145,0	duplicate(ep13tree)	Tree#ep13bs2	HIDDEN_NPC
+spl_fild02,380,197,0	duplicate(ep13tree)	Tree#ep13bs3	HIDDEN_NPC
+spl_fild02,304,151,0	duplicate(ep13tree)	Tree#ep13bs4	HIDDEN_NPC
+spl_fild02,183,235,0	duplicate(ep13tree)	Tree#ep13bs5	HIDDEN_NPC
 
-mid_camp,267,263,0	script	Post#ep13bs1	111,{
+mid_camp,267,263,0	script	Post#ep13bs1	HIDDEN_NPC,{
 	if (ep13_newbs < 6) {
 		mes "- The posts of the -";
 		mes "- barracks are broken. -";
@@ -3731,7 +3567,7 @@ mid_camp,267,263,0	script	Post#ep13bs1	111,{
 	}
 }
 
-mid_camp,267,258,0	script	Post#ep13bs2	111,{
+mid_camp,267,258,0	script	Post#ep13bs2	HIDDEN_NPC,{
 	if (ep13_newbs < 6) {
 		mes "- The posts of the -";
 		mes "- barracks are broken. -";
@@ -3808,10 +3644,10 @@ mid_camp,267,258,0	script	Post#ep13bs2	111,{
 	}
 }
 
-// Attitude to the New
-//============================================================ 
-mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
-	if (ep13_ryu < 100) {
+// Attitude to the New :: ep13_ecology
+//============================================================
+mid_camp,188,254,3	script	Monster Scholar#ep13	4_M_ALCHE_D,{
+	if (ep13_ryu < 100 && ep13_start < 100) {
 		mes "[Monster Scholar]";
 		mes "Who... Who are you?";
 		mes "Are you from the other";
@@ -4372,10 +4208,7 @@ mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
 				mes "I hope you'll make yourself known in Ash Vacuum with your great accomplishments.";
 				set ep13_animal,15;
 				completequest 2157;
-				if(checkre(0))
-					getexp 100000,0;
-				else
-					getexp 1500000,0;
+				getexp (checkre(3))?100000:1500000,0;
 				close;
 			}
 			else {
@@ -4386,128 +4219,122 @@ mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
 		}
 		else if (ep13_animal == 15) {
 			if (countitem(6033) > 0) {
-				// Custom Translation.
 				mes "["+strcharinfo(0)+"]";
-				mes "Rumis! Come see this!";
+				mes "Mr. Rumis! Take a look at this!";
 				next;
 				mes "[Rumis Block]";
-				mes "... What's all the fuss?";
-				mes "I feel so down because I cannot go back to my own country...";
+				mes "...Oh, hello.";
+				mes "I'm extremely frustrated. I feel helpless because I wasn't able to go back home last time...";
 				next;
 				mes "["+strcharinfo(0)+"]";
-				mes "I found this on a monster at the Splendide Area.";
-				mes "It's a mysterious monster with grass grown over it's body!";
+				mes "I've found this horn from a monster in the Splendide Area.";
+				mes "That monster was very mysterious, and its body was covered with grass.";
 				next;
 				mes "[Rumis Block]";
-				mes "Oeh... body with grass grown over it?";
-				mes "No, no. I'm not interested with it.";
+				mes "Ho... Covered with grass?";
+				mes "...I know you're excited, but that doesn't sound interesting to me. Sorry.";
 				next;
 				mes "[Rumis Block]";
-				mes "Let me see the horn you brought back.";
+				mes "Let me take a look at the horn.";
 				next;
 				mes "[Rumis Block]";
-				mes "Okay.";
+				mes "Hmm.";
 				next;
 				mes "[Rumis Block]";
-				mes "Okay.....";
+				mes "Uhmm...";
 				next;
 				mes "[Rumis Block]";
-				mes "Hah....?";
+				mes "Huh...?";
 				next;
 				mes "[Rumis Block]";
-				mes "... This is amazing.";
-				mes "... It's actually almost identical to the Manuk Field area Hillsrion horn.";
+				mes "...This is remarkable.";
+				mes "...This horn looks very similar to that of the Hillsrions that inhabit the Manuk area.";
 				next;
 				mes "[Rumis Block]";
-				mes "Could they be related?";
-				mes "Or has it evolved?";
+				mes "I wonder if they're related,";
+				mes "or if this is an evolved Hillsrion.";
 				next;
 				mes "["+strcharinfo(0)+"]";
-				mes "What about evolution due to the enviromental changes?";
+				mes "Ah, and there's the possibility of mutation caused by the environment.";
 				next;
 				mes "[Rumis Block]";
-				mes "... What do you mean by that?";
-				mes "Do you mean that the changes made their physical appearance evolved?";
+				mes "...What do you mean?";
+				mes "Are you saying the monster has been mutated by environmental causes?";
 				next;
 				mes "["+strcharinfo(0)+"]";
-				mes "Yes... That is right. Maybe like that! Hehe.";
+				mes "Well, that's possible, isn't it? Haha!";
 				next;
-				mes "- You told Rumis about the mutated plant that you heard about from Botanist Terris -";
+				mes "- You told Rumis what you've heard from Botanist Terris: some plants are already showing signs of mutation. -";
 				next;
 				mes "[Rumis Block]";
-				mes "Hoho... this is interesting.";
-				mes "If there are those special... miracle energy filling devices, I guess.. it can cause those monsters to mutate.";
+				mes "Oh, that's interesting.";
+				mes "If such a device really exists, it's possible to cause abnormal growth to monsters by injecting them with special energy.";
 				next;
 				mes "[Rumis Block]";
-				mes "But, who setup that device?";
+				mes "By the way, who came up with the idea of that device?";
 				next;
 				mes "["+strcharinfo(0)+"]";
-				mes "That I do not know. Hehe.";
+				mes "I have no idea. Haha!";
 				next;
 				mes "[Rumis Block]";
 				mes "I see...";
-				mes "Human devices cause these mutations... other than Tendrilrion, there may be other things alike aswell..";
+				mes "Mutants caused by a man-made device... Then there might be more mutated creatures in addition to Tendrillion.";
 				next;
 				mes "[Rumis Block]";
-				mes "... I would like to know.";
-				mes "But, I have to go back to my country now. The management should be giving me my order to go back, my researches are worthless now.";
+				mes "...Now I'm very curious.";
+				mes "But... I want to go back home... It's no use studying them if the management will order me to return.";
 				next;
 				mes "[Rumis Block]";
-				mes "My brother seems to like this place.";
-				mes "He spents a lot of time here...";
+				mes "I guess my brother really likes this place.";
+				mes "I mean, he's working so hard to figure things out...";
 				next;
 				mes "[Rumis Block]";
-				mes "But, I guess everyone has their own life.";
-				mes "Perhaps if my brother can... understands this younger brother a little, I won't ask for any other things anymore...";
+				mes "Well, not everyone can live the same life.";
+				mes "I just hope he'll have a better understanding about me...";
 				next;
 				mes "[Rumis Block]";
-				mes "What will others think of me when I go back to Midgard?";
-				mes "But still, thank you, at least I can still talk to another human. ...Thank you.";
+				mes "I don't know if people in Midgard will welcome me back.";
+				mes "Thanks to you, I at least have a few interesting stories to tell them.";
 				next;
 				mes "[Rumis Block]";
-				mes "If after this can stay here, please take care of my brother.";
-				mes "If this area can be developed, by that time I will...";
+				mes "If you're going to stick around here longer, please help my brother with his study.";
+				mes "I might want to come back later once this area is fully explored and developed...";
 				next;
-				mes "- Rumis Block laid his hand out shyly, but then backed off -";
+				mes "- With a shy smile on the face, Rumis Block asked you to shake hands, and then turned around hurriedly. -";
 				next;
-				mes "- You pat his shoulder gently, it's worrying that Rumis is not able to return to his country. -";
+				mes "- You really hope that Rumis will be able to go back home. -";
 				set ep13_animal,100;
 				delitem 6033,1; //Horn_Of_Tendrilion
-				if(checkre(0))
-					getexp 50000,0;
-				else
-					getexp 1000000,0;
+				getexp (checkre(3))?50000:1000000,0;
 				close;
 			}
 			else {
 				mes "[Rumis Block]";
 				mes "...I submitted the report to the management, but they have not yet ordered me to go back home...";
-				mes "*Sigh* I guess nothing's as easy as I'd hoped....";
+				mes "...*Sigh* I guess nothing's as easy as I'd hoped.";
 				close;
 			}
 		}
 		else if (ep13_animal == 100) {
-			// Custom Translation.
-			mes "Rumis seems anxious.";
+			mes "- Rumis seems anxious and scatterbrained. -";
 			close;
 		}
 		else {
-			// Custom Translation.
 			mes "[Rumis Block]";
-			mes "If only I can go back to Rune Midgard....";
+			mes "When can I go back to Midgard...? *Sigh*";
 			close;
 		}
 	}
 }
 
-mid_camp,240,270,3	script	Botanist#ep13	750,{
-	if (ep13_ryu < 100) {
+mid_camp,240,270,3	script	Botanist#ep13	4_M_ALCHE_C,{
+	if (ep13_ryu < 100 && ep13_start < 100) {
 		mes "[Botanist]";
 		mes "This new land!";
 		mes "Undiscovered life!";
 		mes "Everything about this world excites me.";
 		next;
-		emotion 14;
+		emotion e_lv2;
 		mes "[Botanist]";
 		mes "Oh, okay... Ah-hah!";
 		mes "This is how it goes...";
@@ -4520,7 +4347,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			mes "Undiscovered life!";
 			mes "Everything about this world excites me.";
 			next;
-			emotion 14;
+			emotion e_lv2;
 			mes "[Botanist]";
 			mes "Oh, okay... Ah-hah!";
 			mes "This is how it goes...";
@@ -4531,7 +4358,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			mes "Undiscovered life!";
 			mes "Everything about this world excites me.";
 			next;
-			emotion 14;
+			emotion e_lv2;
 			emotion e_dots,1;
 			mes "[Botanist]";
 			mes "Oh, okay... Ah-hah!";
@@ -4549,7 +4376,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 				next;
 				break;
 			case 2:
-				emotion 14,1;
+				emotion e_lv2,1;
 				mes "["+strcharinfo(0)+"]";
 				mes "I agree. There's so much to see around here!";
 				next;
@@ -4597,7 +4424,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			mes "[Botanist]";
 			mes "Usually twins share the same feelings and ideas, I can see what he does or thinks if I try hard.";
 			next;
-			emotion 54;
+			emotion e_sigh;
 			mes "[Botanist]";
 			mes "Let me see what Rumis is doing right now... Oh, he's picking his nose with his left hand and eating a slice of bread with his right.";
 			mes "God, how disgusting!";
@@ -4617,7 +4444,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 				next;
 				break;
 			case 2:
-				emotion 54;
+				emotion e_sigh;
 				mes "[Botanist]";
 				mes "Oh,";
 				mes "won't you cut me some slack? I was just joking to melt the ice.";
@@ -4781,226 +4608,44 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 	}
 }
 
-mid_camp,336,171,1	script	Camp Guard#man1	852,{
-	if (ep13_animal == 0) {
-		if (ep13_newbs == 6 || ep13_newbs == 19 || ep13_start == 100) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			mes "[Camp Guard]";
-			mes "Your cooperation is appreciated.";
-			close;
-		}
-	}
-	else if (ep13_animal == 1) {
-		if (ep13_newbs == 6 || ep13_newbs == 19) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			mes "[Camp Guard]";
-			mes "Your cooperation is appreciated.";
-			next;
-			switch(select("I've come to help with some research.:I want to stay.")) {
-			case 1:
-				mes "["+strcharinfo(0)+"]";
-				mes "Hi, my name is "+strcharinfo(0)+". I'm the assistant of Monster Scholar Rumis Block.";
-				next;
-				mes "[Camp Guard]";
-				mes "That 'fraidy-- Wah! I'm sorry!";
-				mes "I didn't mean to say that... And I completely understand that he hasn't been able to adapt himself to new surroundings.";
-				next;
-				mes "[Camp Guard]";
-				mes "So, you're here to assist Mr. Rumis Block, huh?";
-				mes "You may pass. If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-				set ep13_animal,2;
-				close2;
-				warp "man_fild01",36,235;
-				end;
-			case 2:
-				mes "[Camp Guard]";
-				mes "No, you can't. Please return to the expedition camp.";
-				close;
-			}
-		}
-	}
-	else {
-		if (ep13_newbs == 6 || ep13_newbs == 19) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			switch(select("Let me move to the next zone.:I want to stay here.")) {
-			case 1:
-				mes "[Camp Guard]";
-				mes "Please be careful out there.";
-				mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-				close2;
-				warp "man_fild01",36,235;
-				end;
-			case 2:
-				mes "[Camp Guard]";
-				mes "No, you can't. Please return to the expedition camp.";
-				close;
-			}
-		}
-	}
-OnHalt:
-	if (ep13_newbs == 6) set .@n$,"Diego.";
-	else if (ep13_newbs == 19) set .@n$,"Lugen.";
+mid_camp,336,171,1	script	Camp Guard#man1	4_M_EIN_SOLDIER,{
 	mes "[Camp Guard]";
 	mes "Stop!";
 	mes "You're about to enter an area that has not been fully explored.";
 	mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
+	if (ep13_ryu < 100 && ep13_start < 100)
+		close;
 	next;
-	mes "[Camp Guard]";
-	mes "Your cooperation is appreciated.";
-	next;
-	mes "[Camp Guard]";
-	mes "Oh, I was informed of your arrival by Mr. "+.@n$;
-	mes "You may pass.";
-	next;
-	mes "[Camp Guard]";
-	mes "Please be careful out there.";
-	mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-	close2;
-	warp "man_fild01",36,235;
-	end;
-}
-
-mid_camp,13,143,5	script	Camp Guard#man2	852,{
-	if (ep13_animal == 0) {
-		if (ep13_newbs == 6 || ep13_newbs == 19  || ep13_start == 100) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			mes "[Camp Guard]";
-			mes "Your cooperation is appreciated.";
-			close;
-		}
-	}
-	else if (ep13_animal == 5) goto OnHalt;
-	else {
-		if (ep13_newbs == 6 || ep13_newbs == 19) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			switch(select("Let me move to the next zone.:I want to stay here.")) {
-			case 1:
-				mes "[Camp Guard]";
-				mes "Please be careful out there.";
-				mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-				close2;
-				warp "spl_fild02",379,143;
-				end;
-			case 2:
-				mes "[Camp Guard]";
-				mes "No, you can't. Please return to the expedition camp.";
-				close;
-			}
-		}
-	}
-OnHalt:
-	if (ep13_newbs == 6) set .@n$,"Diego.";
-	else if (ep13_newbs == 19) set .@n$,"Lugen.";
-	else set .@n$,"Terris.";
-	mes "[Camp Guard]";
-	mes "Stop!";
-	mes "You're about to enter an area that has not been fully explored.";
-	mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-	next;
-	mes "[Camp Guard]";
-	mes "Your cooperation is appreciated.";
-	next;
-	mes "[Camp Guard]";
-	mes "Oh, I was informed of your arrival by Mr. "+.@n$;
-	mes "You may pass.";
-	next;
-	mes "[Camp Guard]";
-	mes "Please be careful out there.";
-	mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-	close2;
-	warp "spl_fild02",379,143;
-	end;
-}
-
-mid_camp,9,215,5	script	Camp Guard#man3	852,{
-	if (ep13_animal == 0) {
-		if (ep13_newbs == 6 || ep13_newbs == 19  || ep13_start == 100) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			mes "[Camp Guard]";
-			mes "Your cooperation is appreciated.";
-			close;
-		}
-	}
-	else if (ep13_animal == 5) goto OnHalt;
-	else {
-		if (ep13_newbs == 6 || ep13_newbs == 19) goto OnHalt;
-		else {
-			mes "[Camp Guard]";
-			mes "Stop!";
-			mes "You're about to enter an area that has not been fully explored.";
-			mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-			next;
-			switch(select("Let me move to the next zone.:I want to stay here.")) {
-			case 1:
-				mes "[Camp Guard]";
-				mes "Please be careful out there.";
-				mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-				close2;
-				warp "spl_fild02",380,217;
-				end;
-			case 2:
-				mes "[Camp Guard]";
-				mes "No, you can't. Please return to the expedition camp.";
-				close;
-			}
+	switch(select("I want to enter the next area.:I want to stay.")) {
+	case 1:
+		mes "[Camp Guard]";
+		mes "Please be careful out there.";
+		mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
+		close2;
+		switch(atoi(charat(strnpcinfo(2),3))) {
+		case 1:
+			if (ep13_animal == 1)
+				set ep13_animal,2;
+			warp "man_fild01",36,235;
+			break;
+		case 2:
+			warp "spl_fild02",379,143;
+			break;
+		case 3:
+			warp "spl_fild02",380,217;
+			break;
 		}
+		end;
+	case 2:
+		mes "[Camp Guard]";
+		mes "No, you can't. Please return to the expedition camp.";
+		close;
 	}
-OnHalt:
-	if (ep13_newbs == 6) set .@n$,"Diego.";
-	else if (ep13_newbs == 19) set .@n$,"Lugen.";
-	else set .@n$,"Terris.";
-	mes "[Camp Guard]";
-	mes "Stop!";
-	mes "You're about to enter an area that has not been fully explored.";
-	mes "Only personnel--researchers and explorers--authorized by United Midgard and the garrison are allowed to enter the danger zone.";
-	next;
-	mes "[Camp Guard]";
-	mes "Your cooperation is appreciated.";
-	next;
-	mes "[Camp Guard]";
-	mes "Oh, I was informed of your arrival by Mr. "+.@n$;
-	mes "You may pass.";
-	next;
-	mes "[Camp Guard]";
-	mes "Please be careful out there.";
-	mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
-	close2;
-	warp "spl_fild02",380,217;
-	end;
 }
+mid_camp,13,143,5	duplicate(Camp Guard#man1)	Camp Guard#man2	4_M_EIN_SOLDIER
+mid_camp,9,215,5	duplicate(Camp Guard#man1)	Camp Guard#man3	4_M_EIN_SOLDIER
 
 mid_camp,49,154,0	script	#env_clear	-1,3,3,{
-//OnTouch2:
 OnTouch:
 	if (ep13_animal == 7) {
 		enablenpc "Botanist#ep13_1";
@@ -5028,7 +4673,7 @@ OnTouch:
 	end;
 }
 
-mid_camp,45,148,7	script	Botanist#ep13_1	750,{
+mid_camp,45,148,7	script	Botanist#ep13_1	4_M_ALCHE_C,{
 	if (ep13_animal == 8) {
 		mes "[Botanist]";
 		mes "Please try to plant the rotting stem in the ground.";
@@ -5068,7 +4713,7 @@ OnInit:
 	end;
 }
 
-mid_camp,52,148,1	script	Dirt#ep13	844,{
+mid_camp,52,148,1	script	Dirt#ep13	CLEAR_NPC,{
 	if (ep13_animal == 8) {
 		mes "- You dug a hole into the ground, planted the rotting stem, and then watered it. -";
 		next;
@@ -5102,7 +4747,7 @@ OnTouch:
 	end;
 }
 
-man_fild01,92,230,3	script	Frozen Tree#evt_lumis	111,1,1,{
+man_fild01,92,230,3	script	Frozen Tree#evt_lumis	HIDDEN_NPC,1,1,{
 	if (ep13_animal == 11) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Knock, knock. Are you here?";
@@ -5128,15 +4773,15 @@ man_fild01,92,230,3	script	Frozen Tree#evt_lumis	111,1,1,{
 		next;
 		mes "[Rumis Block]";
 		mes "Their horns might possess a special power. And I want to have them for further research.";
-		mes "...20 horns will be enough.";
+		mes "...5 horns will be enough.";
 		set ep13_animal,12;
 		changequest 2154,2155;
 		close;
 	}
 	else if (ep13_animal == 12) {
-		if (countitem(6032) < 20) {
+		if (countitem(6032) < 5) {
 			mes "[Rumis Block]";
-			mes "I'd like to study Hillsrion's Horns. Please bring 20 of them for me, okay.";
+			mes "I'd like to study Hillsrion's Horns. Please bring 5 of them for me, okay.";
 			close;
 		}
 		else {
@@ -5186,7 +4831,7 @@ man_fild01,92,230,3	script	Frozen Tree#evt_lumis	111,1,1,{
 			mes "[Rumis Block]";
 			mes "Let's go back to the camp. Shall we? I have something to discuss with you.";
 			set ep13_animal,13;
-			delitem 6032,20; //Horn_Of_Hilsrion
+			delitem 6032,5; //Horn_Of_Hilsrion
 			changequest 2155,2156;
 			close;
 		}
@@ -5195,15 +4840,15 @@ man_fild01,92,230,3	script	Frozen Tree#evt_lumis	111,1,1,{
 }
 
 // Finding a Fairy & Finding a Giant Tree
-//============================================================ 
-spl_fild02,34,223,5	script	Small Fairy#spl	442,{
+//============================================================
+spl_fild02,34,223,5	script	Small Fairy#spl	4_M_FAIRYKID,{
 	if (BaseLevel > 69) {
 		if (checkquest(2158) == -1) {
 			mes "You find a little creature flying in the bushes.";
 			mes "It has tiny wings on the back...";
 			mes "It's a fairy!";
 			next;
-			emotion 6;
+			emotion e_an;
 			mes "[Small Fairy]";
 			mes "RLGHLRXLA TKANTLFDMS";
 			mes "WJACK TNAHRDNJSDMFH";
@@ -5217,19 +4862,9 @@ spl_fild02,34,223,5	script	Small Fairy#spl	442,{
 			setquest 2158;
 			close;
 		}
-		else {
-			emotion 6;
-			mes "[Small Fairy]";
-			mes "RLGHLRXLA TKANTLFDMS";
-			mes "WJACK TNAHRDNJSDMFH";
-			mes "WLSGHKWND !!";
-			next;
-			mes "The surprised fairy is saying something to you, but you cannot understand fairy language.";
-			close;
-		}
 	}
-	else {
-		emotion 6;
+	emotion e_an;
+	if (!isequipped(2782) && ep13_2_rhea < 100) {
 		mes "[Small Fairy]";
 		mes "RLGHLRXLA TKANTLFDMS";
 		mes "WJACK TNAHRDNJSDMFH";
@@ -5237,10 +4872,14 @@ spl_fild02,34,223,5	script	Small Fairy#spl	442,{
 		next;
 		mes "The surprised fairy is saying something to you, but you cannot understand fairy language.";
 		close;
+	} else {
+		mes "[Small Fairy]";
+		mes "Who are you?! Are you looking for the Sapha!?";
+		close;
 	}
 }
 
-man_fild03,236,105,3	script	Tree Giant#man	454,{
+man_fild03,236,105,3	script	Tree Giant#man	4_MAN_PIOM,{
 	if (BaseLevel > 69) {
 		if (checkquest(2159) == -1) {
 			mes "You have found something moving between dry branches.";
@@ -5260,19 +4899,9 @@ man_fild03,236,105,3	script	Tree Giant#man	454,{
 			setquest 2159;
 			close;
 		}
-		else {
-			emotion e_dots;
-			mes "[Tree Giant]";
-			mes "TJDTMFJDNS CJFDI";
-			mes "TKADLFDMF QKATOS";
-			mes "EKDTLSDML DLFMADMS..";
-			next;
-			mes "The surprised giant is saying something to you, but you cannot understand.";
-			close;
-		}
 	}
-	else {
-		emotion e_dots;
+	emotion e_dots;
+	if (!isequipped(2782) && ep13_2_rhea < 100) {
 		mes "[Tree Giant]";
 		mes "TJDTMFJDNS CJFDI";
 		mes "TKADLFDMF QKATOS";
@@ -5280,10 +4909,14 @@ man_fild03,236,105,3	script	Tree Giant#man	454,{
 		next;
 		mes "The surprised giant is saying something to you, but you cannot understand.";
 		close;
+	} else {
+		mes "[Tree Giant]";
+		mes "Where are the Laphine reinforcements? I might have a problem.";
+		close;
 	}
 }
 
-mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
+mid_camp,212,237,5	script	Camp Guard Captain#man1	4_M_EIN_SOLDIER,{
 	mes "[Captain]";
 	mes "Good day. I'm here to protect the";
 	mes "peace and safety of explorers";
@@ -5308,10 +4941,7 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 			mes "I'll discuss this more with the expedition management.";
 			mes "Thank you for your valuable information.";
 			completequest 2158;
-			if(checkre(0))
-				getexp 90000,0;
-			else
-				getexp 900000,0;
+			getexp (checkre(3))?90000:900000,0;
 			close;
 		}
 		else if (checkquest(2158) == -1) {
@@ -5320,31 +4950,6 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 			mes "Sorry to bother you.";
 			close;
 		}
-		else if (checkquest(2158) == 2) {
-			if (checkquest(2159) == 1) {
-				mes "- You report your encounter with a tree giant in the Manuk area to the guard captain. -";
-				next;
-				mes "[Captain]";
-				mes "That sounds very important.";
-				mes "It's too early to say this, but we might have to dispatch an investigation group to the area.";
-				next;
-				mes "[Captain]";
-				mes "I'll discuss this more with the expedition management.";
-				mes "Thank you for your valuable information.";
-				completequest 2159;
-				if(checkre(0))
-					getexp 90000,0;
-				else
-					getexp 900000,0;
-				close;
-			}
-			else {
-				mes "["+strcharinfo(0)+"]";
-				mes "Oh, nothing.";
-				mes "Sorry to bother you.";
-				close;
-			}
-		}
 		else {
 			if (checkquest(2159) == 1) {
 				mes "- You report your encounter with a tree giant in the Manuk area to the guard captain. -";
@@ -5357,10 +4962,7 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 				mes "I'll discuss this more with the expedition management.";
 				mes "Thank you for your valuable information.";
 				completequest 2159;
-				if(checkre(0))
-					getexp 90000,0;
-				else
-					getexp 900000,0;
+				getexp (checkre(3))?90000:900000,0;
 				close;
 			}
 			else {
@@ -5373,18 +4975,17 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 	}
 }
 
-// The Tripartite Union's Feud
-//============================================================ 
-mid_campin,376,120,0	script	Research Official#ep131	754,3,3,{
-
+// The Tripartite Union's Feud :: ep13_1_rhea
+//============================================================
+mid_campin,376,120,0	script	Research Official#ep131	4_M_SAGE_A,3,3,{
 OnTouch:
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[United Research Official]";
-		mes "Why are you carrying so much stuff?";
-		mes "Are you working out?";
+		mes "How come you've got so much to carry?";
+		mes "Are you perhaps on training or something?";
 		close;
 	}
-	if (ep13_ryu > 99) {
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_1_rhea < 1) {
 			mes "[United Research Official]";
 			mes "Hmmmm...mmm...";
@@ -5528,7 +5129,7 @@ OnTouch:
 			mes "Finally, the meeting's starting.";
 			mes "You should come in.";
 			next;
-			donpcevent "Research Official#ep131::Onmeet";
+			donpcevent "Research Official#ep131::OnMeet";
 			mes "[United Research Official]";
 			mes "So, everyone's here.";
 			mes "Let us begin our meeting.";
@@ -5614,7 +5215,7 @@ OnTouch:
 			mes "scream as well, and rushed out of";
 			mes "the room. -";
 			set ep13_1_rhea,20;
-			donpcevent "Research Official#ep131::Oncall";
+			donpcevent "Research Official#ep131::OnCall";
 			close2;
 			warp "mid_camp",165,236;
 			end;
@@ -5629,7 +5230,7 @@ OnTouch:
 			mes "- Knock, knock-";
 			mes "- The researchers come back into the room. -";
 			next;
-			donpcevent "Research Official#ep131::Onmeet";
+			donpcevent "Research Official#ep131::OnMeet";
 			mes "[Ryosen]";
 			mes "Uh-hmm! Sorry about the mess.";
 			mes "I... Something urgent came up...";
@@ -5786,7 +5387,7 @@ OnTouch:
 			mes "- You feel so refreshed and light, as you drink the tea that the Official offered. -";
 			specialeffect2 EF_ABSORBSPIRITS;
 			set ep13_1_rhea,100;
-			if(checkre(0))
+			if (checkre(3))
 				getexp 80000,3000;
 			else
 				getexp 300000,10000;
@@ -5842,13 +5443,13 @@ OnDisable:
 	hideonnpc "Research Official#ep131";
 	end;
 
-Onmeet:
+OnMeet:
 	donpcevent "Ryosen#ep131_rhea05::OnEnable";
 	donpcevent "Hue#ep131_rhea06::OnEnable";
 	donpcevent "Hansenne#ep131_rhea07::OnEnable";
 	end;
 
-Oncall:
+OnCall:
 	initnpctimer;
 	monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
 	monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
@@ -5880,14 +5481,14 @@ OnTimer300000:
 	end;
 }
 
-mid_camp,165,245,0	script	Ryosen#ep131_rhea01	748,{
-	if (checkweight(1201,1) == 0) {
+mid_camp,165,245,0	script	Ryosen#ep131_rhea01	4_M_ALCHE_A,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[Ryosen]";
-		mes "Why are you carrying so much stuff?";
-		mes "Are you working out?";
+		mes "How come you've got so much to carry?";
+		mes "Are you perhaps on training or something?";
 		close;
 	}
-	if (ep13_ryu > 99) {
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_1_rhea < 1) {
 			mes "[Ryosen]";
 			mes "Please, keep your hands off my stuff!";
@@ -6426,14 +6027,14 @@ mid_camp,165,245,0	script	Ryosen#ep131_rhea01	748,{
 	}
 }
 
-mid_camp,247,255,1	script	Hue#ep131_rhea02	868,{
-	if (checkweight(1201,1) == 0) {
+mid_camp,247,255,1	script	Hue#ep131_rhea02	4_M_LGTGUARD,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[Hue]";
-		mes "Why are you carrying so much stuff?";
-		mes "Are you working out?";
+		mes "How come you've got so much to carry?";
+		mes "Are you perhaps on training or something?";
 		close;
 	}
-	if (ep13_ryu > 99) {
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_1_rhea < 4) {
 			mes "[Hue]";
 			mes "What is it you want?";
@@ -6819,14 +6420,14 @@ mid_camp,247,255,1	script	Hue#ep131_rhea02	868,{
 	}
 }
 
-mid_camp,222,218,3	script	Hansenne#ep131_rhea03	931,{
-	if (checkweight(1201,1) == 0) {
+mid_camp,222,218,3	script	Hansenne#ep131_rhea03	4_M_RACHMAN1,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[Hansenne]";
-		mes "Why are you carrying so much stuff?";
-		mes "Are you working out?";
+		mes "How come you've got so much to carry?";
+		mes "Are you perhaps on training or something?";
 		close;
 	}
-	if (ep13_ryu > 99) {
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_1_rhea < 6) {
 			mes "[Hansenne]";
 			mes "Who's there?";
@@ -7288,7 +6889,7 @@ mid_camp,222,218,3	script	Hansenne#ep131_rhea03	931,{
 	}
 }
 
-mid_campin,379,123,5	script	Ryosen#ep131_rhea05	748,{
+mid_campin,379,123,5	script	Ryosen#ep131_rhea05	4_M_ALCHE_A,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -7306,7 +6907,7 @@ OnTimer300000:
 	end;
 }
 
-mid_campin,372,123,5	script	Hue#ep131_rhea06	868,{
+mid_campin,372,123,5	script	Hue#ep131_rhea06	4_M_LGTGUARD,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -7324,7 +6925,7 @@ OnTimer300000:
 	end;
 }
 
-mid_campin,375,129,5	script	Hansenne#ep131_rhea07	931,{
+mid_campin,375,129,5	script	Hansenne#ep131_rhea07	4_M_RACHMAN1,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -7342,14 +6943,16 @@ OnTimer300000:
 	end;
 }
 
-// Part Time Work
-//============================================================ 
-mid_camp,1,1,0	script	#timer_alba01	844,{
-	/*
+// Part Time Work :: ep13_alba
+//============================================================
+mid_camp,1,1,0	script	#timer_alba01	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "Please enter the password";
 	next;
-	input .@input;
-	if (.@input == "1854") {
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "Wrong password.";
+		close;
+	} else {
 		mes "Current Status:";
 		if ($@PartTimeOn == 1) {
 			mes "Recruiting.";
@@ -7357,7 +6960,7 @@ mid_camp,1,1,0	script	#timer_alba01	844,{
 		else {
 			mes "Not Recruiting.";
 		}
-		mes "Recruited part-timers" + $@PartTimeSlots + "part-timers.";
+		mes "Recruited " + $@PartTimeSlots + " part-timers.";
 		mes "What do you want to do?";
 		next;
 		switch(select("Reset the recruiting.:Cancel.")) {
@@ -7379,12 +6982,6 @@ mid_camp,1,1,0	script	#timer_alba01	844,{
 			close;
 		}
 	}
-	else {
-		mes "Wrong password.";
-		close;
-	}
-	end;
-	*/
 
 OnInit:
 	set $@PartTimeOn,0;
@@ -7393,7 +6990,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -7420,8 +7017,8 @@ OnTimer7800000:
 	end;
 }
 
-mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
-	if (ep13_ryu > 99) {
+mid_camp,143,306,5	script	Breeder Taab#ep13_alba	4_M_DST_MASTER,{
+	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_alba < 1) {
 			mes "[Taab]";
 			mes "How may I help you?";
@@ -7551,33 +7148,40 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 							close;
 						}
 						else {
-							// Custom Translation
 							set ep13_alba,5;
 							setquest 7046;
 							mes "[Taab]";
-							mes "I would like to place something on the floor of the cage. Something soft, and fur-like should be good. Something to keep the ground dry.";
+							mes "Oh, I always wanted to put something warm on the floor for my creatures.";
+							mes "I was thinking of using fur.";
+							mes "I can also use fur to cover the cage during rainy days, you know?";
 							next;
 							mes "[Taab]";
-							mes "Would you collect ^4d4dff30 Fur^000000. This should be very simple, right? I've heard Tatacho and Hillsrion fur is quite durable.";
+							mes "Can you please bring me ^4d4dff30 scraps of fur^000000?";
+							mes "It sounds easy, doesn't it?";
+							mes "I think the fur of Tatachoes and Hillsrions will be perfect.";
 							next;
 							mes "[Taab]";
-							mes "Of course, I do not intend to put them into the Hillsrion and Tatacho cage on the ground. I would put them on the ground of the Cornus cage.";
+							mes "Of course, I'm not going to use them for the cages with the Tatachoes and Hillsrions.";
+							mes "Those furs will be for the Cornuses.";
 							next;
 							mes "[Taab]";
-							mes "The Cornus seem to like a warmer climate, and the climate is very unusual here... so it hasn't been very easy for them here.";
+							mes "It seems Cornuses love being warm.";
+							mes "The weather in this area is so strange that I'm having a hard time optimizing the temperature for each kind of creature.";
 							next;
 							mes "[Taab]";
 							mes "Thank you in advance.";
-							mes "Don't forget the";
-							mes "^4d4dff30 Fur^000000.";
+							mes "Don't forget the 30 scraps of fur.";
 							close;
 						}
 					}
 					else {
 						mes "[Taab]";
-						mes "I'm sorry, but I don't need any assistance right now.";
-						mes "I'll make an official anouncement if I need help.";
-						mes "Please come back then.";
+						mes "Oh, I'm sorry, but no jobs are available right now.";
+						mes "Some other part-timers finished all the work.";
+						next;
+						mes "[Taab]";
+						mes "I'm sorry for the trouble I must have caused you to come here. Haha...";
+						mes "I'll see you next time.";
 						close;
 					}
 				}
@@ -7606,14 +7210,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				next;
 				delitem 579,50; //Delicious_Fish
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 8000,3000;
-				else
+					mes "^4d4dff You have received 8,000 EXP";
+					mes "and 3,000 JEXP.^000000.";
+				} else {
 					getexp 80000,30000;
+					mes "^4d4dff You have received 80,000 EXP";
+					mes "and 30,000 JEXP.^000000.";
+				}
 				erasequest 7042;
 				setquest 7047;
-				mes "^4d4dff You have received 8,000 EXP";
-				mes "and 3,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7642,14 +7249,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				delitem 7198,30; //Great_Leaf
 				delitem 7188,30; //Browny_Root
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 9000,4000;
-				else
+					mes "^4d4dff You have received 9,000 EXP";
+					mes "and 4,000 JEXP.^000000.";
+				} else {
 					getexp 90000,40000;
+					mes "^4d4dff You have received 90,000 EXP";
+					mes "and 40,000 JEXP.^000000.";
+				}
 				erasequest 7043;
 				setquest 7047;
-				mes "^4d4dff You have received 9,000 EXP";
-				mes "and 4,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7683,14 +7293,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				delitem 528,20; //Monster's_Feed
 				delitem 537,30; //Pet_Food
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 8000,3000;
-				else
+					mes "^4d4dff You have received 8,000 EXP";
+					mes "and 3,000 JEXP.^000000.";
+				} else {
 					getexp 80000,30000;
+					mes "^4d4dff You have received 80,000 EXP";
+					mes "and 30,000 JEXP.^000000.";
+				}
 				erasequest 7044;
 				setquest 7047;
-				mes "^4d4dff You have received 8,000 EXP";
-				mes "and 3,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7721,14 +7334,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				delitem 517,50; //Meat
 				delitem 537,30; //Pet_Food
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 8000,3000;
-				else
+					mes "^4d4dff You have received 8,000 EXP";
+					mes "and 3,000 JEXP.^000000.";
+				} else {
 					getexp 80000,30000;
+					mes "^4d4dff You have received 80,000 EXP";
+					mes "and 30,000 JEXP.^000000.";
+				}
 				erasequest 7045;
 				setquest 7047;
-				mes "^4d4dff You have received 8,000 EXP";
-				mes "and 3,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7756,14 +7372,17 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				next;
 				delitem 6020,30; //Fur
 				set ep13_alba,6;
-				if(checkre(0))
+				if (checkre(3)) {
 					getexp 8000,3000;
-				else
+					mes "^4d4dff You have received 8,000 EXP";
+					mes "and 3,000 JEXP.^000000.";
+				} else {
 					getexp 80000,30000;
+					mes "^4d4dff You have received 80,000 EXP";
+					mes "and 30,000 JEXP.^000000.";
+				}
 				erasequest 7046;
 				setquest 7047;
-				mes "^4d4dff You have received 8,000 EXP";
-				mes "and 3,000 JEXP.^000000.";
 				close;
 			}
 			else {
@@ -7827,7 +7446,7 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 	}
 }
 
-mid_camp,152,316,3	script	Hillsrion#alba01	1989,3,3,{
+mid_camp,152,316,3	script	Hillsrion#alba01	HILLSRION,3,3,{
 OnEnable:
 	enablenpc "Hillsrion#alba01";
 	end;
@@ -7844,7 +7463,7 @@ OnTouch:
 	close;
 }
 
-mid_camp,145,313,5	script	Tatacho#alba02	1986,3,3,{
+mid_camp,145,313,5	script	Tatacho#alba02	TATACHO,3,3,{
 OnEnable:
 	enablenpc "Tatacho#alba02";
 	end;
@@ -7865,7 +7484,7 @@ OnTouch:
 	close;
 }
 
-mid_camp,162,306,3	script	Cornus#alba03	1992,5,5,{
+mid_camp,162,306,3	script	Cornus#alba03	CORNUS,5,5,{
 OnEnable:
 	enablenpc "Cornus#alba03";
 	end;
@@ -7884,12 +7503,12 @@ OnTouch:
 	close;
 }
 
-mid_camp,1,2,0	script	#monster_master	844,{
+mid_camp,1,2,0	script	#monster_master	CLEAR_NPC,{
 OnEnable:
 	if (rand(1,3) > 1) initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	killmonster "mid_camp","#monster_master::OnMyMobDead";
 	stopnpctimer;
 	end;
@@ -7932,9 +7551,9 @@ OnMyMobDead:
 	end;
 }
 
-// Cat Hand Trading Post
-//============================================================ 
-mid_camp,62,125,4	script	Cat Hand Agent	421,{
+// Cat Hand Trading Post :: cat_yong
+//============================================================
+mid_camp,62,125,4	script	Cat Hand Agent	4_M_BOSSCAT,{
 function Catwarp;
 	if (ep13_yong1 < 1) {
 		mes "[Cat Hand Agent]";
@@ -8042,7 +7661,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				Zeny -= 60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will";
@@ -8089,7 +7708,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				Zeny -= 60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will";
@@ -8178,9 +7797,8 @@ function Catwarp;
 				}
 			}
 			else {
-				// Custom Translation.
 				mes "[Cat Hand Agent]";
-				mes "I am sorry, but you don't have enough credit points to use the warp service. Please come back when you have more points.";
+				mes "I'm sorry, but you're not eligible to use the warp service. Please check your points, and then come back.";
 			}
 			close;
 		case 4:
@@ -8212,7 +7830,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				Zeny -= 60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will";
@@ -8292,9 +7910,8 @@ function Catwarp;
 				}
 			}
 			else {
-				// Custom Translation
 				mes "[Cat Hand Agent]";
-				mes "I am sorry, but you don't have enough credit points to use the warp service. Please come back when you have more points.";
+				mes "I'm sorry, but you're not eligible to use the warp service. Please check your points, and then come back.";
 			}
 			close;
 		case 4:
@@ -8323,13 +7940,14 @@ function Catwarp {
 	if (Zeny < getarg(0)) {
 		mes "[Cat Hand Agent]";
 		mes "Don't play with money.";
-		close; }
+		close;
+	}
 	close2;
-	set Zeny, Zeny-getarg(0);
+	Zeny -= getarg(0);
 	switch(getarg(1)) {
 		case 1: warp "alberta",117,56; end;
 		case 2: warp "prontera",116,72; end;
-		case 3: warp "izlude",91,105; end;
+		case 3: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; end;
 		case 4: warp "geffen",120,39; end;
 		case 5: warp "payon",161,58; end;
 		case 6: warp "morocc",156,46; end;
@@ -8343,7 +7961,7 @@ function Catwarp {
 }
 }
 
-mid_camp,72,94,4	script	Fluffy Gyaruk	421,{
+mid_camp,72,94,4	script	Fluffy Gyaruk	4_M_BOSSCAT,{
 	if (ep13_yong1 < 1) {
 		mes "[Fluffy Gyaruk]";
 		mes "*Sniff Sniff* Can't you smell fish";
@@ -8465,7 +8083,7 @@ mid_camp,72,94,4	script	Fluffy Gyaruk	421,{
 	}
 }
 
-mid_camp,69,144,0	script	Ferocious Gorurug	421,{
+mid_camp,69,144,0	script	Ferocious Gorurug	4_M_BOSSCAT,{
 	if (checkquest(12060,PLAYTIME) == -1) {
 		if (ep13_yong1 < 4) {
 			mes "[Ferocious Gorurug]";
@@ -8511,11 +8129,11 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				mes "You've brough Pieces of Fish!";
 				mes "GOOD JOB!";
 				delitem 6039,10; //Piece_Of_Fish
-				getexp 20000,0;
+				getexp (checkre(3))?20000:30000,0;
 				set ep13_yong1,10;
 				setquest 12060;
 				next;
-				mes "^0000ffYou gain EXP 3,000^000000";
+				mes "^0000ffYou gain EXP "+(checkre(3)?"20,000":"30,000")+"^000000";
 				close;
 			}
 			else {
@@ -8535,7 +8153,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
-				mes "^0000ffYou gain EXP 1,500^000000";
+				mes "^0000ffYou gain EXP 15,000^000000";
 				close;
 			}
 			else {
@@ -8556,7 +8174,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
-				mes "^0000ffYou gain EXP 1,500^000000";
+				mes "^0000ffYou gain EXP 15,000^000000";
 				close;
 			}
 			else {
@@ -8576,7 +8194,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
-				mes "^0000ffYou gain EXP 1,500^000000";
+				mes "^0000ffYou gain EXP 15,000^000000";
 				close;
 			}
 			else {
@@ -8587,14 +8205,14 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				close;
 			}
 		}
-		else if ((ep13_yong1 > 59) && (ep13_yong1 < 80)) {
+		else if (ep13_yong1 > 59) {
 			npcskill "AL_HEAL",8,50,50;
 			if (countitem(6039) > 9) {
 				mes "[Ferocious Gorurug]";
 				mes "You've brough Pieces of Fish!";
 				mes "GOOD JOB!";
 				delitem 6039,10; //Piece_Of_Fish
-				getexp 1500,0;
+				getexp 15000,0;
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
@@ -8602,12 +8220,11 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				close;
 			}
 			else {
-				// custom translation
-				mes "Ferocious Gorurug welcomes you gracefully.";
+				mes "Gorurung welcomes you with a happy purr.";
 				next;
 				mes "[Ferocious Gorurug]";
-				mes "There you are!";
-				mes "What did you catch today?";
+				mes "Welcome!";
+				mes "You're here to give me fishes, aren't you?";
 				close;
 			}
 		}
@@ -8634,7 +8251,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 	}
 }
 
-spl_fild02,314,165,0	script	School of Fish#1::Fishinghole	844,{
+spl_fild02,314,165,0	script	School of Fish#1::Fishinghole	CLEAR_NPC,{
 	if ((checkquest(12060,PLAYTIME) == -1) && (countitem(6039) < 20)) {
 		specialeffect2 EF_BUBBLE;
 		specialeffect2 EF_INVENOM;
@@ -8696,11 +8313,11 @@ spl_fild02,314,165,0	script	School of Fish#1::Fishinghole	844,{
 	}
 }
 
-spl_fild02,321,169,0	duplicate(Fishinghole)	School of Fish#2	844
-spl_fild02,326,171,0	duplicate(Fishinghole)	School of Fish#3	844
-mid_camp,75,135,0	duplicate(Fishinghole)	School of Fish#4	844
+spl_fild02,321,169,0	duplicate(Fishinghole)	School of Fish#2	CLEAR_NPC
+spl_fild02,326,171,0	duplicate(Fishinghole)	School of Fish#3	CLEAR_NPC
+mid_camp,75,135,0	duplicate(Fishinghole)	School of Fish#4	CLEAR_NPC
 
-mid_camp,66,122,55	script	Henry Clifford	712,{
+mid_camp,66,122,55	script	Henry Clifford	4_M_05,{
 	if (countitem(6049) > 0) {
 		mes "[Henry Clifford]";
 		mes "Congratulations, you've caught a precious Marlin.";
@@ -8750,7 +8367,7 @@ mid_camp,66,122,55	script	Henry Clifford	712,{
 	}
 }
 
-mid_camp,88,100,55	script	Cat Hand Mining Agent	876,{
+mid_camp,88,100,55	script	Cat Hand Mining Agent	4_CAT,{
 	if (checkquest(12062,PLAYTIME) == -1) {
 		if ((countitem(6048) > 2) && (ep13_yong1 > 9)) {
 			mes "[Cat Hand Mining Agent]";
@@ -8758,7 +8375,7 @@ mid_camp,88,100,55	script	Cat Hand Mining Agent	876,{
 			mes "Thank you for collecting minerals for me.";
 			next;
 			delitem 6048,3; //Unidentified_Mineral
-			getexp 20000,0;
+			getexp (checkre(3))?20000:30000,0;
 			setquest 12062;
 			set ep13_yong1,ep13_yong1+1;
 			select("I'm freezing! Take them quickly.");
@@ -8814,11 +8431,13 @@ mid_camp,88,100,55	script	Cat Hand Mining Agent	876,{
 		else getitem 6048,1; //Unidentified_Mineral
 		initnpctimer;
 		disablenpc strnpcinfo(0);
-		end; }
+		end;
+	}
 	else {
 		mes "This rock contains unidentified minerals.";
 		mes "It's not possible to mine more than the limit.";
-		close; }
+		close;
+	}
 	end;
 
 OnTimer120000:
@@ -8826,32 +8445,46 @@ OnTimer120000:
 	stopnpctimer;
 	end;
 }
+man_fild01,180,170,0	duplicate(manukrock)	Mysterious Rock#1	CLEAR_NPC
+man_fild01,147,157,0	duplicate(manukrock)	Mysterious Rock#2	CLEAR_NPC
+man_fild01,114,174,0	duplicate(manukrock)	Mysterious Rock#3	CLEAR_NPC
+man_fild01,92,155,0	duplicate(manukrock)	Mysterious Rock#4	CLEAR_NPC
+man_fild01,170,318,0	duplicate(manukrock)	Mysterious Rock#5	CLEAR_NPC
+man_fild01,146,269,0	duplicate(manukrock)	Mysterious Rock#6	CLEAR_NPC
+man_fild01,118,238,0	duplicate(manukrock)	Mysterious Rock#7	CLEAR_NPC
+man_fild01,70,246,0	duplicate(manukrock)	Mysterious Rock#8	CLEAR_NPC
+man_fild01,64,197,0	duplicate(manukrock)	Mysterious Rock#9	CLEAR_NPC
+man_fild03,82,134,0	duplicate(manukrock)	Mysterious Rock#10	CLEAR_NPC
+man_fild03,67,160,0	duplicate(manukrock)	Mysterious Rock#11	CLEAR_NPC
+man_fild03,66,171,0	duplicate(manukrock)	Mysterious Rock#12	CLEAR_NPC
+man_fild03,81,198,0	duplicate(manukrock)	Mysterious Rock#13	CLEAR_NPC
+man_fild03,82,216,0	duplicate(manukrock)	Mysterious Rock#14	CLEAR_NPC
+man_fild03,98,226,0	duplicate(manukrock)	Mysterious Rock#15	CLEAR_NPC
+man_fild03,104,248,0	duplicate(manukrock)	Mysterious Rock#16	CLEAR_NPC
+man_fild03,91,272,0	duplicate(manukrock)	Mysterious Rock#17	CLEAR_NPC
+man_fild03,95,301,0	duplicate(manukrock)	Mysterious Rock#18	CLEAR_NPC
+
+sec_in02,80,171,0	script	Piece of crack#sec	2_MONEMUS,{
+	callfunc "F_GM_NPC";
+	mes "1~3000";
+	input .@input;
+	next;
+	if (.@input < 1 || .@input > 3000) {
+		mes "Cat trading Point adjust";
+		mes "You can enter the number between 1~3000.";
+		close;
+	} else {
+		set ep13_yong1,.@input;
+		close;
+	}
+}
 
-man_fild01,180,170,0	duplicate(manukrock)	Mysterious Rock#1	844
-man_fild01,147,157,0	duplicate(manukrock)	Mysterious Rock#2	844
-man_fild01,114,174,0	duplicate(manukrock)	Mysterious Rock#3	844
-man_fild01,92,155,0	duplicate(manukrock)	Mysterious Rock#4	844
-man_fild01,170,318,0	duplicate(manukrock)	Mysterious Rock#5	844
-man_fild01,146,269,0	duplicate(manukrock)	Mysterious Rock#6	844
-man_fild01,118,238,0	duplicate(manukrock)	Mysterious Rock#7	844
-man_fild01,70,246,0	duplicate(manukrock)	Mysterious Rock#8	844
-man_fild01,64,197,0	duplicate(manukrock)	Mysterious Rock#9	844
-man_fild03,82,134,0	duplicate(manukrock)	Mysterious Rock#10	844
-man_fild03,67,160,0	duplicate(manukrock)	Mysterious Rock#11	844
-man_fild03,66,171,0	duplicate(manukrock)	Mysterious Rock#12	844
-man_fild03,81,198,0	duplicate(manukrock)	Mysterious Rock#13	844
-man_fild03,82,216,0	duplicate(manukrock)	Mysterious Rock#14	844
-man_fild03,98,226,0	duplicate(manukrock)	Mysterious Rock#15	844
-man_fild03,104,248,0	duplicate(manukrock)	Mysterious Rock#16	844
-man_fild03,91,272,0	duplicate(manukrock)	Mysterious Rock#17	844
-man_fild03,95,301,0	duplicate(manukrock)	Mysterious Rock#18	844
-
-// Report from the New World
-//============================================================ 
-mid_campin,90,121,5	script	Hibba Agip	459,{
+// Report from the New World :: ep13_1_edq
+//============================================================
+mid_campin,90,121,5	script	Hibba Agip	4_M_REDSWORD,{
 	cutin "ep13_captin_edq",2;
-	set .@start,(ep13_newbs + ep13_ryu + mao_morocc2 + ep13_1_rhea + ep13_animal);
-	if ((ep13_1_edq == 0) && (.@start > 298)) {
+	set .@start,(ep13_newbs + ep13_ryu + mao_morocc2 + ep13_1_rhea + ep13_animal + ep13_start);
+	if ((ep13_1_edq == 0) && (.@start > 115)) {
 		mes "[Hibba Agip]";
 		mes "*Sigh* Look at me, I used to command the desert of Morroc, but I've been deployed to a world that only God knows where...";
 		next;
@@ -8877,7 +8510,7 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 		mes "What is it?";
 		next;
 		mes "[Staff Officer Abidal]";
-		mes "Err? Hey, aren't you that famous adventurer, " + strcharinfo(0) + "? I've heard many good things about you.";
+		mes "Err? Hey, aren't you that famous adventurer," + strcharinfo(0) + "? I've heard many good things about you.";
 		next;
 		mes "[Instructor Igrid]";
 		mes "I don't know what you're talking about. Boss, do you know this adventurer?";
@@ -8919,7 +8552,7 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 	}
 	else if (ep13_1_edq == 2) {
 		mes "[Hibba Agip]";
-		mes "Oh yes, right... You're " + strcharinfo(0) + ", right? Abidal has told me good things about you.";
+		mes "Oh yes, right... You're" + strcharinfo(0) + ", right? Abidal has told me good things about you.";
 		next;
 		mes "[Hibba Agip]";
 		mes "We're lucky to have you, my friend... I hope you're as good as the stories play you up to be.";
@@ -9038,21 +8671,17 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 		mes "[Hibba Agip]";
 		mes "Now, search everywhere for the pages of that report. Staff Officer Abidal will bind them into the full report for you.";
 		next;
-		// custom translation
 		mes "[Hibba Agip]";
-		mes "Hmm... and... I received a report, that you surrendered the report to the enemy, right?";
+		mes "Ah, and... I've received a report that you tried to hand out the report to our enemy when the situation happened.";
 		next;
-		// custom translation
 		mes "[Instructor Igrid]";
-		mes "Hmm...";
+		mes "Argh...";
 		next;
-		// custom translation
 		mes "[Hibba Agip]";
-		mes "Hehehehe. How smart of you... Thou feel not safe for you to be my subordinate...";
+		mes "Hahaha! You're smart, my friend. Of course, I don't like smart soldiers.";
 		next;
-		// custom translation
 		mes "[Hibba Agip]";
-		mes "Hey, I said. It is justice as well, injustice as well. But, trust and deal... is very important. Understand? You must remember this.";
+		mes "Let me tell you this: I can care less about justice or righteousness, but loyalty and faithfulness are very important. Keep that in mind for your own good, alright?";
 		set ep13_1_edq,61;
 		changequest 3088,3089;
 		next;
@@ -9273,9 +8902,8 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 		mes "And please take this small reward.";
 		mes "Thank you for your help so far.";
 		next;
-		if(checkre(0))
-			getexp 30000,0; //kRO
-			//getexp 3750000,0; //iRO?
+		if (checkre(3))
+			getexp 300000,0;
 		else
 			getexp 2500000,0;
 		getitem 12110,3; //First_Aid_Kit
@@ -9618,7 +9246,7 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 	}
 }
 
-mid_campin,94,118,3	script	Staff Officer Abidal	755,{
+mid_campin,94,118,3	script	Staff Officer Abidal	4_M_SAGE_C,{
 	if ((ep13_1_edq == 13) || (ep13_1_edq == 14)) {
 		mes "[Staff Officer Abidal]";
 		mes "Phew, I'm glad the mission is over. Thank you so much for your help.";
@@ -10139,7 +9767,7 @@ mid_campin,94,118,3	script	Staff Officer Abidal	755,{
 	}
 }
 
-mid_campin,85,118,7	script	Instructor Igrid	751,{
+mid_campin,85,118,7	script	Instructor Igrid	4_M_CRU,{
 	if ((ep13_1_edq == 13) || (ep13_1_edq == 14)) {
 		mes "[Instructor Igrid]";
 		mes "Hey, rookies. I guess you were lucky enough to complete the mission.";
@@ -10191,7 +9819,7 @@ mid_campin,85,118,7	script	Instructor Igrid	751,{
 	}
 }
 
-mid_camp,206,286,3	script	Expedition Messenger	997,{
+mid_camp,206,286,3	script	Expedition Messenger	4_M_MOCASS1,{
 	if ((ep13_1_edq == 3) && (countitem(11012) > 0)) {
 		mes "[Expedition Messenger]";
 		mes "Welcome, I've been waiting for you.";
@@ -10210,7 +9838,7 @@ mid_camp,206,286,3	script	Expedition Messenger	997,{
 		mes "[Expedition Messenger]";
 		mes "Guys, it's time to go.";
 		next;
-		donpcevent "Expedition Messenger#2::Ongo";
+		donpcevent "Expedition Messenger#2::OnGo";
 		mes "[Expedition Messenger]";
 		mes "You, head to Schwaltzval Republic.";
 		mes "And you, take Arunafeltz. I'll visit Prontera Palace.";
@@ -10328,7 +9956,7 @@ mid_camp,206,286,3	script	Expedition Messenger	997,{
 			mes "Haha, I may have failed to take the report, but it's better destroyed than in your hands!";
 			cutin "ep13_shadow_edq",255;
 			next;
-			donpcevent "Expedition Messenger#3::OnMessenger#edq3";
+			donpcevent "Expedition Messenger#3::OnDisable";
 			mes "[Expedition Agent]";
 			mes "Are you alright? What about the report... ?";
 			next;
@@ -10374,7 +10002,7 @@ OnInit:
 	end;
 }
 
-mid_camp,2,2,3	script	Command Timer#edq	997,4,4,{
+mid_camp,2,2,3	script	Command Timer#edq	4_M_MOCASS1,4,4,{
 OnInit:
 	disablenpc "Command Timer#edq";
 	end;
@@ -10397,7 +10025,7 @@ OnTimer3600000:
 	end;
 }
 
-mid_camp,203,286,3	script	Expedition Messenger#2	997,4,4,{
+mid_camp,203,286,3	script	Expedition Messenger#2	4_M_MOCASS1,4,4,{
 	mes "[Expedition Agent]";
 	mes "......";
 	next;
@@ -10413,7 +10041,7 @@ OnEnable:
 	enablenpc "Expedition Messenger#2";
 	end;
 
-Ongo:
+OnGo:
 	enablenpc "Expedition Messenger#2";
 	enablenpc "Expedition Messenger#3";
 	end;
@@ -10423,7 +10051,7 @@ OnDisable:
 	end;
 }
 
-mid_camp,209,286,3	script	Expedition Messenger#3	998,4,4,{
+mid_camp,209,286,3	script	Expedition Messenger#3	4_M_MOCASS2,4,4,{
 	mes "[Expedition Agent]";
 	mes "...";
 	next;
@@ -10444,697 +10072,83 @@ OnDisable:
 	end;
 }
 
-man_fild01,315,95,3	script	Expedition Scout#1	707,{
+man_fild01,315,95,3	script	Expedition Scout#1	4_M_MOC_SOLDIER,{
 	mes "[Expedition Scout]";
 	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
 	next;
 	mes "[Expedition Scout]";
 	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
+	set .@playtime,checkquest(3091,PLAYTIME);
 	next;
 	switch(select("Ask about search results.:Chitchat.:Quit.")) {
 	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
+		if (ep13_1_edq == 71 || ep13_1_edq == 72) {
 			mes "[Expedition Scout]";
-			mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
+			mes "Oh, you must be"+strcharinfo(0)+". I heard that you'll be delivering the report.";
 			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
+			if (.@playtime == 0 || .@playtime == 1) {
 				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
+				mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
 				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		close;
-	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-	case 3:
-		close;
-	}
-}
-
-man_fild03,202,251,3	script	Expedition Scout#2	707,{
-	mes "[Expedition Scout]";
-	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
-	next;
-	mes "[Expedition Scout]";
-	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
-	next;
-	switch(select("Ask about search results.:Chitchat.:Quit.")) {
-	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 piece of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
-			mes "[Expedition Scout]";
-			mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		close;
-	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-	case 3:
-		close;
-	}
-}
-
-spl_fild02,295,368,3	script	Expedition Scout#3	707,{
-	mes "[Expedition Scout]";
-	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
-	next;
-	mes "[Expedition Scout]";
-	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
-	next;
-	switch(select("Ask about search results.:Chitchat.:Quit.")) {
-	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
-			mes "[Expedition Scout]";
-			mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 piece of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		close;
-	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-		}
-		close;
-	case 3:
-		close;
-	}
-}
-
-spl_fild03,172,71,3	script	Expedition Scout#4	707,{
-	mes "[Expedition Scout]";
-	mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
-	next;
-	mes "[Expedition Scout]";
-	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@ep13_search_control,checkquest(3091,PLAYTIME);
-	next;
-	switch(select("Ask about search results.:Chitchat.:Quit.")) {
-	case 1:
-		if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == -1)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				changequest 3090,3091;
-				erasequest 3090;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && ((.@ep13_search_control == 0) || (.@ep13_search_control == 1))) {
-			mes "[Expedition Scout]";
-			mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-			next;
-			mes "[Expedition Scout]";
-			mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
-			close;
-		}
-		else if (((ep13_1_edq == 71) || (ep13_1_edq == 72)) && (.@ep13_search_control == 2)) {
-			set .@ep13_search_lotto,rand(1,6);
-			if (.@ep13_search_lotto == 4) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 5 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,5; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 2 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,2; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else if (.@ep13_search_lotto == 3) {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
-				mes "[Expedition Scout]";
-				mes "Good news! I've found 3 pieces of paper that appear to be part of the report.";
-				next;
-				getitem 6040,3; //Some_Of_Report
-				erasequest 3091;
-				setquest 3091;
-				mes "[Expedition Scout]";
-				mes "Well then, keep up the good work!";
-				close;
-			}
-			else {
-				mes "[Expedition Scout]";
-				mes "Oh, you must be " + strcharinfo(0) + ". I heard that you'll be delivering the report.";
-				next;
+			} else {
+				switch(rand(1,6)) {
+				case 1:
+				case 6:
+					set .@i,2;
+					break;
+				case 3:
+					set .@i,3;
+					break;
+				case 4:
+					set .@i,5;
+					break;
+				case 2:
+				case 5:
+					set .@i,0;
+					break;
+				}
 				mes "[Expedition Scout]";
-				mes "I'm doing my best, but I haven't found any pages yet.";
-				next;
-				erasequest 3091;
+				if (.@i) {
+					mes "Good news! I've found "+.@i+" pieces of paper that appear to be part of the report.";
+					next;
+					getitem 6040,.@i; //Some_Of_Report
+				} else {
+					mes "I'm doing my best, but I haven't found any pages yet.";
+					next;
+				}
+				if (.@playtime == -1) {
+					changequest 3090,3091;
+					erasequest 3090;
+				} else
+					erasequest 3091;
 				setquest 3091;
 				mes "[Expedition Scout]";
 				mes "Well then, keep up the good work!";
 				close;
 			}
 		}
-		else if (ep13_1_edq < 8) {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "Who are you? Why do you want to know about our search results? Are you from the army?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Man, don't you know that you can be arrested for interrupting a military operation?";
-			next;
-			mes "[Expedition Scout]";
-			mes "Please leave immediately.";
-		}
+		mes "[Expedition Scout]";
+		mes "Who are you? Why do you want to know about our search results? Are you from the army?";
+		next;
+		mes "[Expedition Scout]";
+		mes "Man, don't you know that you can be arrested for interrupting a military operation?";
+		next;
+		mes "[Expedition Scout]";
+		mes "Please leave immediately.";
 		close;
 	case 2:
-		if (ep13_1_edq < 10) {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-			close;
-		}
-		else {
-			mes "[Expedition Scout]";
-			mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
-		}
+		mes "[Expedition Scout]";
+		mes "I'm sorry, but I'm on duty. Why don't we talk later when I'm off-duty?";
 		close;
 	case 3:
 		close;
 	}
 }
+man_fild03,202,251,3	duplicate(Expedition Scout#1)	Expedition Scout#2	4_M_MOC_SOLDIER
+spl_fild02,295,368,3	duplicate(Expedition Scout#1)	Expedition Scout#3	4_M_MOC_SOLDIER
+spl_fild03,172,71,3	duplicate(Expedition Scout#1)	Expedition Scout#4	4_M_MOC_SOLDIER
 
-prt_castle,88,165,3	script	Laur	57,{
+prt_castle,88,165,3	script	Laur	1_M_LIBRARYMASTER,{
 	mes "[Laur]";
 	if (ep13_1_edq == 9 || ep13_1_edq == 111 || ep13_1_edq == 121 || ep13_1_edq == 113 || ep13_1_edq == 123) {
 		mes "I'm Laur, the aide of the Home Minister of the Rune-Midgarts Kingdom. Do you have any business with me?";
@@ -11152,7 +10166,7 @@ prt_castle,88,165,3	script	Laur	57,{
 		if (ep13_1_edq == 9) set ep13_1_edq,101;
 		else if (ep13_1_edq == 111) set ep13_1_edq,112;
 		else if (ep13_1_edq == 121) set ep13_1_edq,122;
-		else if (ep13_1_edq == 113) {
+		else if (ep13_1_edq == 113 || ep13_1_edq == 123) {
 			set ep13_1_edq,13;
 			changequest 3093,3094;
 		}
@@ -11191,7 +10205,7 @@ prt_castle,88,165,3	script	Laur	57,{
 	}
 }
 
-ra_temple,122,174,3	script	Nuria	918,{
+ra_temple,122,174,3	script	Nuria	4_F_RACHOLD,{
 	mes "[Nuria]";
 	if (ep13_1_edq == 9 || ep13_1_edq == 101 || ep13_1_edq == 121 || ep13_1_edq == 122 || ep13_1_edq == 103) {
 		mes "Welcome, stranger. How can I help you?";
@@ -11236,7 +10250,7 @@ ra_temple,122,174,3	script	Nuria	918,{
 	}
 }
 
-lhz_in01,110,174,5	script	Gerhart	903,{
+lhz_in01,110,174,5	script	Gerhart	4_M_KHKYEL,{
 	mes "[Gerhart]";
 	if (ep13_1_edq == 9 || ep13_1_edq == 101 || ep13_1_edq == 111 || ep13_1_edq == 102 || ep13_1_edq == 112) {
 		mes "Welcome, " + strcharinfo(0) + ". What took you so long?";
@@ -11297,8 +10311,8 @@ OnInit:
 	end;
 
 OnEnable:
-	monster "spl_fild02",0,0,"Luciola Vespa",1994,7,"ep13_spl_fild02_mon_edq::OnMyMobDead";
-	monster "spl_fild02",0,0,"Pinguicula",1995,7,"ep13_spl_fild02_mon_edq::OnMyMobDead";
+	monster "spl_fild02",0,0,"Luciola Vespa",1994,5,"ep13_spl_fild02_mon_edq::OnMyMobDead";
+	monster "spl_fild02",0,0,"Pinguicula",1995,5,"ep13_spl_fild02_mon_edq::OnMyMobDead";
 	initnpctimer;
 	end;
 
@@ -11315,7 +10329,7 @@ OnTimer600000:
 	end;
 
 OnMyMobDead:
-	if (mobcount("spl_fild02","ep13_spl_fild02_mon_edq::OnMyMobDead") < 14 && (ep13_1_edq == 71 || ep13_1_edq == 72))
+	if (mobcount("spl_fild02","ep13_spl_fild02_mon_edq::OnMyMobDead") < 10 && (ep13_1_edq == 71 || ep13_1_edq == 72))
 		getitem 6040,1; //Some_Of_Report
 	end;
 }
@@ -11327,9 +10341,9 @@ OnInit:
 	end;
 
 OnEnable:
-	monster "spl_fild03",0,0,"Luciola Vespa",1994,4,"ep13_spl_fild03_mon_edq::OnMyMobDead";
-	monster "spl_fild03",0,0,"Cornus",1992,5,"ep13_spl_fild03_mon_edq::OnMyMobDead";
-	monster "spl_fild03",0,0,"Naga",1993,5,"ep13_spl_fild03_mon_edq::OnMyMobDead";
+	monster "spl_fild03",0,0,"Luciola Vespa",1994,3,"ep13_spl_fild03_mon_edq::OnMyMobDead";
+	monster "spl_fild03",0,0,"Cornus",1992,3,"ep13_spl_fild03_mon_edq::OnMyMobDead";
+	monster "spl_fild03",0,0,"Naga",1993,4,"ep13_spl_fild03_mon_edq::OnMyMobDead";
 	initnpctimer;
 	end;
 
@@ -11347,7 +10361,7 @@ OnTimer600000:
 
 OnMyMobDead:
 	set .@spl_fild03_mob_dead,mobcount("spl_fild03","ep13_spl_fild03_mon_edq::OnMyMobDead");
-	if (mobcount("spl_fild03","ep13_spl_fild03_mon_edq::OnMyMobDead") < 14 && (ep13_1_edq == 71 || ep13_1_edq == 72))
+	if (mobcount("spl_fild03","ep13_spl_fild03_mon_edq::OnMyMobDead") < 10 && (ep13_1_edq == 71 || ep13_1_edq == 72))
 		getitem 6040,1; //Some_Of_Report
 	end;
 }
@@ -11359,8 +10373,8 @@ OnInit:
 	end;
 
 OnEnable:
-	monster "man_fild01",0,0,"Nepenthes",1988,7,"ep13_man_fild01_mon_edq::OnMyMobDead";
-	monster "man_fild01",0,0,"Hillslion",1989,7,"ep13_man_fild01_mon_edq::OnMyMobDead";
+	monster "man_fild01",0,0,"Nepenthes",1988,5,"ep13_man_fild01_mon_edq::OnMyMobDead";
+	monster "man_fild01",0,0,"Hillslion",1989,5,"ep13_man_fild01_mon_edq::OnMyMobDead";
 	initnpctimer;
 	end;
 
@@ -11377,7 +10391,7 @@ OnTimer600000:
 	end;
 
 OnMyMobDead:
-	if (mobcount("man_fild01","ep13_man_fild01_mon_edq::OnMyMobDead") < 14 && (ep13_1_edq == 71 || ep13_1_edq == 72))
+	if (mobcount("man_fild01","ep13_man_fild01_mon_edq::OnMyMobDead") < 10 && (ep13_1_edq == 71 || ep13_1_edq == 72))
 		getitem 6040,1; //Some_Of_Report
 	end;
 }
@@ -11389,8 +10403,8 @@ OnInit:
 	end;
 
 OnEnable:
-	monster "man_fild03",0,0,"Centipede",1987,7,"ep13_man_fild03_mon_edq::OnMyMobDead";
-	monster "man_fild03",0,0,"Tatacho",1986,7,"ep13_man_fild03_mon_edq::OnMyMobDead";
+	monster "man_fild03",0,0,"Centipede",1987,5,"ep13_man_fild03_mon_edq::OnMyMobDead";
+	monster "man_fild03",0,0,"Tatacho",1986,5,"ep13_man_fild03_mon_edq::OnMyMobDead";
 	initnpctimer;
 	end;
 
@@ -11407,71 +10421,71 @@ OnTimer600000:
 	end;
 
 OnMyMobDead:
-	if (mobcount("man_fild03","ep13_man_fild03_mon_edq::OnMyMobDead") < 14 && (ep13_1_edq == 71 || ep13_1_edq == 72))
+	if (mobcount("man_fild03","ep13_man_fild03_mon_edq::OnMyMobDead") < 10 && (ep13_1_edq == 71 || ep13_1_edq == 72))
 		getitem 6040,1; //Some_Of_Report
 	end;
 }
 
-// Persuing Rayan Moore
-//============================================================ 
-mid_campin,68,185,3	script	Pursuit Party Leader#1	803,{
-	if (checkweight(714,1) == 0) {
+// Persuing Rayan Moore :: ep13_moc2
+//============================================================
+mid_campin,68,185,3	script	Pursuit Party Leader#1	1_F_SIGNZISK,{
+	if (checkweight(714,3) == 0) {
 		mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
 		close;
 	}
 	if (mao_morocc2 == 0) {
-		if (ep13_ryu == 100) {
-			mes "[Echinacea]";
-			mes "Oh adventurer, you've come at the perfect time.";
-			mes "Since you and I both know that we can't waste time on idle chitchat,";
-			mes "I'll cut to the chase.";
-			next;
-			mes "[Echinacea]";
-			mes "Most expeditions come to this area to explore the Ash Vacuum,";
-			mes "but we've come here for a different reason.";
-			next;
-			mes "[Echinacea]";
-			mes "You know about this space gap that was caused by Satan Morocc, don't you?";
-			next;
-			mes "[Echinacea]";
-			mes "Our job is to pursue Satan Morocc and figure out how this all happened.";
-			mes "Your job is to assist us, and prove that you can be a good member of our expedition.";
-			next;
-			mes "[Echinacea]";
-			mes "... Umm... So, you'll have to.. Let me think which job would be perfect for you.";
-			mes "Umm.. I remember someone said that he needed assistance...";
-			next;
-			select("Hey, excuse me.");
-			mes "[Echinacea]";
-			mes "Ah, I know what you can do!";
-			mes "There's a guy conducting an investigation near the space gap. You can go help him.";
-			mes "Just do what he asks you to do, alright?";
-			mes "Now go!";
-			next;
-			mes "[Echinacea]";
-			mes "......";
-			mes "By the way, adventurer,";
-			mes "What's your name?";
-			next;
-			mes "[" + strcharinfo(0) + "]";
-			mes "......";
-			mes "......";
-			mes "" + strcharinfo(0) + "...";
-			mes "......";
-			next;
-			mes "[Echinacea]";
-			mes "Ah, you are";
-			mes "" + strcharinfo(0) + ".";
-			mes "Well, " + strcharinfo(0) + ", I've just assigned you as Mr. Kidd's assistant.";
-			mes "Good, everything's done on this end. I just needed to get your name on record.";
-			next;
-			mes "[Echinacea]";
-			mes "What are you still doing here?";
-			mes "" + strcharinfo(0) + ", your job is to assist Mr. Kidd.";
-			mes "Please go help him, will you?";
-			set mao_morocc2,1;
-			setquest 7012;
-			close;
+		if (ep13_ryu == 100 || ep13_start == 100) {
+				mes "[Echinacea]";
+				mes "Oh adventurer, you've come at the perfect time.";
+				mes "Since you and I both know that we can't waste time on idle chitchat,";
+				mes "I'll cut to the chase.";
+				next;
+				mes "[Echinacea]";
+				mes "Most expeditions come to this area to explore the Ash Vacuum,";
+				mes "but we've come here for a different reason.";
+				next;
+				mes "[Echinacea]";
+				mes "You know about this space gap that was caused by Satan Morocc, don't you?";
+				next;
+				mes "[Echinacea]";
+				mes "Our job is to pursue Satan Morocc and figure out how this all happened.";
+				mes "Your job is to assist us, and prove that you can be a good member of our expedition.";
+				next;
+				mes "[Echinacea]";
+				mes "... Umm... So, you'll have to.. Let me think which job would be perfect for you.";
+				mes "Umm.. I remember someone said that he needed assistance...";
+				next;
+				select("Hey, excuse me.");
+				mes "[Echinacea]";
+				mes "Ah, I know what you can do!";
+				mes "There's a guy conducting an investigation near the space gap. You can go help him.";
+				mes "Just do what he asks you to do, alright?";
+				mes "Now go!";
+				next;
+				mes "[Echinacea]";
+				mes "......";
+				mes "By the way, adventurer,";
+				mes "What's your name?";
+				next;
+				mes "[" + strcharinfo(0) + "]";
+				mes "......";
+				mes "......";
+				mes "" + strcharinfo(0) + "...";
+				mes "......";
+				next;
+				mes "[Echinacea]";
+				mes "Ah, you are";
+				mes "" + strcharinfo(0) + ".";
+				mes "Well, " + strcharinfo(0) + ", I've just assigned you as Mr. Kidd's assistant.";
+				mes "Good, everything's done on this end. I just needed to get your name on record.";
+				next;
+				mes "[Echinacea]";
+				mes "What are you still doing here?";
+				mes "" + strcharinfo(0) + ", your job is to assist Mr. Kidd.";
+				mes "Please go help him, will you?";
+				set mao_morocc2,1;
+				setquest 7012;
+				close;
 		}
 		else {
 			mes "[Echinacea]";
@@ -11609,7 +10623,7 @@ mid_campin,68,185,3	script	Pursuit Party Leader#1	803,{
 			next;
 			mes "[Echinacea]";
 			mes "Go check the number again.";
-			set mao_morocc2,.@quest+3;
+			if (mao_morocc2 < 26) set mao_morocc2,.@quest+3;
 			close;
 		}
 	}
@@ -11673,7 +10687,7 @@ mid_campin,68,185,3	script	Pursuit Party Leader#1	803,{
 		mes "[Echinacea]";
 		mes "Keep up the good work assisting the explorers in this camp.";
 		set mao_morocc2,100;
-		if(checkre(0))
+		if (checkre(3))
 			getexp 120000,20000;
 		else
 			getexp 1200000,200000;
@@ -11811,7 +10825,7 @@ mid_campin,68,185,3	script	Pursuit Party Leader#1	803,{
 	}
 }
 
-mid_camp,191,206,3	script	Manager#moc2_finder	852,{
+mid_camp,191,206,3	script	Manager#moc2_finder	4_M_EIN_SOLDIER,{
 	mes "[Manager]";
 	mes "Everything's okay so far!";
 	mes "How may I help you?";
@@ -11877,7 +10891,7 @@ mid_camp,191,206,3	script	Manager#moc2_finder	852,{
 	}
 }
 
-mid_camp,199,311,7	script	Mr. Kidd#ep13_dan01	884,{
+mid_camp,199,311,7	script	Mr. Kidd#ep13_dan01	4_M_ACROSS,{
 	if (checkweight(714,1) == 0) {
 		mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
 		close;
@@ -12053,7 +11067,7 @@ mid_camp,199,311,7	script	Mr. Kidd#ep13_dan01	884,{
 			delitem 6029,1; //Morocc_Tracing_Log
 			delitem 6027,1; //Crystal_Of_Feardoom
 			set mao_morocc2,10;
-			if(checkre(0))
+			if (checkre(3))
 				getexp 20000,1000;
 			else
 				getexp 200000,10000;
@@ -12061,9 +11075,9 @@ mid_camp,199,311,7	script	Mr. Kidd#ep13_dan01	884,{
 			close2;
 		}
 		else {
-			//custom translation
 			mes "[" + strcharinfo(0) + "]";
-			mes "Now where did I put Rin's journal and the bloody crystal...";
+			mes "(I was supposed to give him the 'Morroc Pursuit Journal' and a 'Bloody Crystal of the Darkness'...";
+			mes "Err? Where have they gone? I need to find them.)";
 			close2;
 		}
 	}
@@ -12529,7 +11543,7 @@ OnTouch:
 	}
 }
 
-mid_camp,256,272,3	script	Defaria#moc2	897,{
+mid_camp,256,272,3	script	Defaria#moc2	4_M_HUGRANFA,{
 	if (checkweight(714,1) == 0) {
 		mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
 		close;
@@ -12944,7 +11958,7 @@ mid_camp,256,272,3	script	Defaria#moc2	897,{
 	}
 }
 
-mid_camp,255,269,0	script	Wet Firewood#moc2	844,{
+mid_camp,255,269,0	script	Wet Firewood#moc2	CLEAR_NPC,{
 	if (mao_morocc2 > 102) {
 		mes "You've found some half-burnt logs of high quality.";
 		mes "It seems somebody already roasted sweet potatoes with these logs.";
@@ -12957,7 +11971,7 @@ mid_camp,255,269,0	script	Wet Firewood#moc2	844,{
 	}
 }
 
-morocc,43,108,5	script	Sharp-Looking Boy#dan_07	82,{
+morocc,43,108,5	script	Sharp-Looking Boy#dan_07	4_KID01,{
 	mes "[Jack]";
 	if (BaseClass == Job_Assassin) {
 		mes "Almost half of this town has been destroyed,";
@@ -12975,7 +11989,7 @@ morocc,43,108,5	script	Sharp-Looking Boy#dan_07	82,{
 	}
 }
 
-morocc,45,110,0	script	que_job01#01	45,2,2,{
+morocc,45,110,0	script	que_job01#01	WARPNPC,2,2,{
 OnTouch:
 	if (BaseClass == Job_Assassin) {
 		warp "que_job01",9,94;
@@ -13000,7 +12014,7 @@ que_job01,6,94,0	warp	morocc#01	2,2,morocc,45,103
 que_job01,17,48,0	warp	que_job01#02	2,2,que_job01,68,92
 que_job01,68,96,0	warp	que_job01#03	2,2,que_job01,17,53;
 
-que_job01,82,95,3	script	Bar Master#moc2_01	46,{
+que_job01,82,95,3	script	Bar Master#moc2_01	1_ETC_01,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -13050,7 +12064,7 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 						mes "Here, drink up.";
 						mes "This drink is mainly made of fruit juice,";
 						mes "but you still shouldn't drink too much.";
-						set zeny,zeny-800;
+						Zeny -= 800;
 						getitem 12112,1; //Tropical_Sograt
 					}
 					close;
@@ -13068,15 +12082,14 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 						mes "There you go.";
 						mes "This drink is mainly made of fruit juice,";
 						mes "but you still shouldn't drink too much.";
-						set zeny,zeny-1000;
+						Zeny -= 1000;
 						getitem 12112,1; //Tropical_Sograt
 						close;
 					}
 				}
 			}
 		case 2:
-			set .@now_weight,MaxWeight-Weight;
-			if (.@now_weight < 2000) {
+			if (MaxWeight - Weight < 2000) {
 				mes "[Karred]";
 				mes "Are you sure you can even hold a glass of alcohol?";
 				mes "You're carrying too many things on you already.";
@@ -13095,7 +12108,7 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 						mes "[Karred]";
 						mes "I'll give you a special discount.";
 						mes "Here, enjoy.";
-						set zeny,zeny-800;
+						Zeny -= 800;
 						getitem 12113,1; //Vermilion_The_Beach
 					}
 					close;
@@ -13112,7 +12125,7 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 						mes "[Karred]";
 						mes "There you go.";
 						mes "Don't drink too much, alright?";
-						set zeny,zeny-1000;
+						Zeny -= 1000;
 						getitem 12113,1; //Vermilion_The_Beach
 						close;
 					}
@@ -13203,7 +12216,7 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 	}
 }
 
-que_job01,80,77,0	script	que_job01#04	45,2,2,{
+que_job01,80,77,0	script	que_job01#04	WARPNPC,2,2,{
 OnTouch:
 	if (BaseClass == Job_Assassin || mao_request > 0 || mao_morocc2 > 4) {
 		warp "que_job01",61,50;
@@ -13260,7 +12273,7 @@ OnTouch:
 					mes "Hey, bartender! Gimme";
 					mes "the usual! I like your";
 					mes "style, adventurer...";
-					set zeny,zeny-1000;
+					Zeny -= 1000;
 					next;
 					mes "[Litheron]";
 					mes "Alright, you can come";
@@ -13309,7 +12322,7 @@ OnTouch:
 	}
 }
 
-que_job01,81,79,5	script	Idle Knight#dan_08	733,{
+que_job01,81,79,5	script	Idle Knight#dan_08	4_M_JOB_KNIGHT1,{
 	mes "[Litheron]";
 	mes "What, haven't you seen a Knight before?";
 	mes "You think Knights don't belong here?";
@@ -13324,7 +12337,7 @@ que_job01,81,79,5	script	Idle Knight#dan_08	733,{
 
 que_job01,65,50,0	warp	que_job01#05	2,2,que_job01,84,77
 
-que_job01,49,49,5	script	Tao#dan_09	877,{
+que_job01,49,49,5	script	Tao#dan_09	4_F_YUNYANG,{
 	mes "[Tao]";
 	if (BaseClass == Job_Assassin) {
 		mes "Welcome, meow.";
@@ -13406,10 +12419,9 @@ que_job01,49,49,5	script	Tao#dan_09	877,{
 	}
 }
 
-que_job01,51,55,0	script	que_job01#room_1	45,1,1,{
+que_job01,51,55,0	script	que_job01#room_1	WARPNPC,1,1,{
 OnInit:
-	if ($maobar_room) set $maobar_room,0;
-Onreset:
+OnReset:
 	set $@moc_mao_room1,0; //Global Variable
 	end;
 
@@ -13472,18 +12484,18 @@ OnTouch:
 	}
 }
 
-que_job01,1,1,0	script	 #room1timer	844,{
+que_job01,1,1,0	script	 #room1timer	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	mapannounce "que_job01", "You will now enter the Master Zone, Area 1.",bc_map,"0x70DBDB";
 	end;
 
-Onstop:
+OnStop:
 	mapannounce "que_job01", "The security magic in the Master Zone, Area 1 is deactivated.",bc_map,"0x70DBDB";
 	donpcevent "#room1_warp13::OnDisable";
 	donpcevent "Valdes#moc_master_1::OnDisable";
 	donpcevent "Marjana#poison::OnDisable";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 	end;
 
@@ -13499,7 +12511,7 @@ OnTimer245000:
 
 OnTimer250000:
 	mapannounce "que_job01", "The security magic Master Zone, Area 1 is now activated.",bc_map,"0x70DBDB";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 }
 
@@ -13518,14 +12530,14 @@ OnTouch:
 	end;
 }
 
-que_job01,11,4,0	script	que_job01#room1_out	45,1,1,{
+que_job01,11,4,0	script	que_job01#room1_out	WARPNPC,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
-	donpcevent " #room1timer::Onstop";
+	donpcevent " #room1timer::OnStop";
 	end;
 }
 
-que_job01,16,21,5	script	Valdes#moc_master_1	55,{
+que_job01,16,21,5	script	Valdes#moc_master_1	1_M_JOBTESTER,{
 	mes "[Valdes]";
 	if (BaseClass == Job_Assassin) {
 		mes "What is it? I have nothing to ask you to do.";
@@ -13565,11 +12577,11 @@ OnEnable:
 	end;
 }
 
-que_job01,51,44,0	script	que_job01#room_2	45,1,1,{
+que_job01,51,44,0	script	que_job01#room_2	WARPNPC,1,1,{
 	end;
 
 OnInit:
-Onreset:
+OnReset:
 	set $@moc_mao_room2,0; //Global Variable
 	end;
 
@@ -13650,20 +12662,20 @@ OnTouch:
 	}
 }
 
-que_job01,1,2,0	script	 #room2timer	844,{
+que_job01,1,2,0	script	 #room2timer	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	mapannounce "que_job01", "Master Zone 2 is now under surveillance.",bc_map,"0x70DBDB";
 	end;
 
-Onstop:
+OnStop:
 	mapannounce "que_job01", "The magic shield of Master Zone 2 has been reset.",bc_map,"0x70DBDB";
 	donpcevent "#room2_1_warp::OnDisable";
 	donpcevent "#room2_2_warp::OnDisable";
 	donpcevent "Rin#moc_room2_2::OnDisable";
 	donpcevent "Rin#moc_room2_1::OnDisable";
 	donpcevent "Rayan#moc_room2_2::OnDisable";
-	donpcevent "que_job01#room_2::Onreset";
+	donpcevent "que_job01#room_2::OnReset";
 	stopnpctimer;
 	end;
 
@@ -13682,7 +12694,7 @@ OnTimer245000:
 
 OnTimer250000:
 	mapannounce "que_job01", "Master Zone 2 has been released from surveillance.",bc_map,"0x70DBDB";
-	donpcevent "que_job01#room_2::Onreset";
+	donpcevent "que_job01#room_2::OnReset";
 	stopnpctimer;
 }
 
@@ -13716,21 +12728,21 @@ OnTouch:
 	end;
 }
 
-que_job01,80,27,0	script	que_job01#room2_1_out	45,1,1,{
+que_job01,80,27,0	script	que_job01#room2_1_out	WARPNPC,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
-	donpcevent " #room2timer::Onstop";
+	donpcevent " #room2timer::OnStop";
 	end;
 }
 
-que_job01,144,61,0	script	que_job01#room2_2_out	45,1,1,{
+que_job01,144,61,0	script	que_job01#room2_2_out	WARPNPC,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
-	donpcevent " #room2timer::Onstop";
+	donpcevent " #room2timer::OnStop";
 	end;
 }
 
-que_job01,84,17,3	script	Rin#moc_room2_1	885,{
+que_job01,84,17,3	script	Rin#moc_room2_1	4_F_ACROSS,{
 	if (checkweight(714,1) == 0) {
 		mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
 		close;
@@ -13915,10 +12927,9 @@ que_job01,84,17,3	script	Rin#moc_room2_1	885,{
 		close2;
 	}
 	else if (mao_morocc2 == 8) {
-		// Missed
 		cutin "moc2_rin02",2;
 		mes "[Rin]";
-		mes "Anything new?";
+		mes "Have you found anything?";
 		next;
 		mes "- You told her you couldn't find anything regarding their whereabouts,";
 		mes "but you found the ''Bloody Crystal of Darkness'' in the bushes.";
@@ -13969,15 +12980,14 @@ que_job01,84,17,3	script	Rin#moc_room2_1	885,{
 			close2;
 		}
 		else {
-			//custom translation
 			cutin "moc2_rin01",2;
 			mes "[Rin]";
-			mes "...The 'Bloody Crystal of Darkness'...";
-			mes "Where is it?";
+			mes "..A bloody Crystal of the Darkness?";
+			mes "Can you show it to me?";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			mes "I'll bring it right away.";
-			mes "^4d4dffNow what did I do with it...?^000000";
+			mes "Oh, I don't have it with me. I'll go bring it right away.";
+			mes "^4d4dff(Wait, what did I do with it? I didn't sell it or anything, did I?)^000000";
 			close2;
 		}
 	}
@@ -13994,17 +13004,16 @@ que_job01,84,17,3	script	Rin#moc_room2_1	885,{
 		close2;
 	}
 	else {
-		//custom translation
 		cutin "moc2_rin03",2;
 		mes "[Rin]";
-		mes "... ... I am just a patient here, don't mind me~";
+		mes "..Argh.. I'm still recovering .. I'm not supposed to move~";
 		close2;
 	}
 	cutin "moc2_rin03",255;
 	end;
 }
 
-que_job01,144,54,3	script	Rin#moc_room2_2	885,{
+que_job01,144,54,3	script	Rin#moc_room2_2	4_F_ACROSS,{
 	if (checkweight(714,1) == 0) {
 		mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
 		close;
@@ -14176,14 +13185,14 @@ que_job01,144,54,3	script	Rin#moc_room2_2	885,{
 			close2;
 		}
 		else {
-			//custom translation
 			cutin "moc2_rin01",2;
 			mes "[Rin]";
-			mes "What is it? I'm a little busy...";
+			mes "What's up?";
+			mes "I'm kind of busy right now.";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			mes "Oh, I seem to have forgot to bring the Journal...";
-			mes "...Yeah. ...I'll be back with it soon.";
+			mes "..I've brought back the journal and something else..";
+			mes "..Er, sorry. I forgot to bring the journal! I'll be right back.";
 			close2;
 		}
 	}
@@ -14316,7 +13325,7 @@ OnEnable:
 	end;
 }
 
-que_job01,143,50,1	script	Rayan#moc_room2_2	456,{
+que_job01,143,50,1	script	Rayan#moc_room2_2	4_M_DSTMAN,{
 	mes "- For some reason, Rayan is shivering in fear. -";
 	next;
 	cutin "moc2_rin02",2;
@@ -14338,7 +13347,7 @@ OnEnable:
 	end;
 }
 
-hu_fild04,235,103,0	script	Heap of Earth#mao2_01	844,4,4,{
+hu_fild04,235,103,0	script	Heap of Earth#mao2_01	CLEAR_NPC,4,4,{
 	if (checkweight(714,1) == 0) {
 		mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
 		close;
@@ -14397,7 +13406,7 @@ OnTouch:
 	end;
 }
 
-hu_fild04,321,131,0	script	Traces#mao2_object02	844,{
+hu_fild04,321,131,0	script	Traces#mao2_object02	CLEAR_NPC,{
 	if ((mao_morocc2 == 7) || (mao_morocc2 == 8)) {
 		mes "You find many footprints on the ground.";
 		mes "Considering all the blood on the ground, a battle must have occurred here fairly recently.";
@@ -14410,7 +13419,7 @@ hu_fild04,321,131,0	script	Traces#mao2_object02	844,{
 	}
 }
 
-hu_fild04,368,180,0	script	Traces#mao2_object03	844,{
+hu_fild04,368,180,0	script	Traces#mao2_object03	CLEAR_NPC,{
 	if ((mao_morocc2 == 7) || (mao_morocc2 == 8)) {
 		mes "Somebody left a mark under this small tree.";
 		mes "The mark is weathered and faded,";
@@ -14433,7 +13442,7 @@ OnDisable:
 	disablenpc "#moc2_event_on";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -14444,8 +13453,7 @@ OnTouch:
 		initnpctimer;
 	}
 	else {
-		//custom translation
-		mes "An unknown force seems to block you.";
+		mes "A mysterious force is repelling you, and you're unable to push forward into this area.";
 		close2;
 		warp "morocc",100,100;
 		set $@moc_mao_gate1,0; //Global Variable
@@ -14476,7 +13484,7 @@ OnTimer307000:
 	donpcevent "Dandelion Member#moc2_4::OnDisable";
 	donpcevent "Dandelion Member#moc2_5::OnDisable";
 	donpcevent "#moc2_event01::OnDisable";
-	donpcevent "Corpse#moc2_dead01::Onreset";
+	donpcevent "Corpse#moc2_dead01::OnReset";
 	end;
 
 OnTimer308000:
@@ -14497,7 +13505,7 @@ OnEnable:
 
 OnTouch:
 	soundeffect "wander_man_move.wav",1;
-	sc_start sc_blind,600000,0;
+	sc_start SC_BLIND,600000,0;
 	mes "As soon as you touched the crystal,";
 	mes "you feel your body being pulled into the space gap.";
 	mes "You remember Kidd's confused voice, screaming your name.";
@@ -14527,7 +13535,7 @@ OnTouch:
 	mes "I'm not going to let you run away again!";
 	next;
 	soundeffect "wander_man_move.wav",1;
-	sc_end sc_blind;
+	sc_end SC_BLIND;
 	mes "[" + strcharinfo(0) + "]";
 	mes "... !!!!";
 	mes "Rin!!!!";
@@ -14593,11 +13601,11 @@ OnTouch:
 	donpcevent "Dandelion Member#moc2_4::OnDisable";
 	donpcevent "Dandelion Member#moc2_5::OnDisable";
 	donpcevent "Corpse#moc2_dead01::OnEnable";
-	donpcevent "Corpse#moc2_dead01::Oncall";
+	donpcevent "Corpse#moc2_dead01::OnCall";
 	end;
 }
 
-que_dan01,49,36,5	script	Corpse#moc2_dead01	457,{
+que_dan01,49,36,5	script	Corpse#moc2_dead01	4_M_DSTMANDEAD,{
 	if (checkweight(714,1) == 0) {
 		mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
 		close;
@@ -14626,7 +13634,7 @@ que_dan01,49,36,5	script	Corpse#moc2_dead01	457,{
 			mes "Let's bring this to Kidd.^000000";
 			set mao_morocc2,11;
 			getitem 6028,1; //Seal_Scroll
-			donpcevent "#moc2_event_on::Onstop";
+			donpcevent "#moc2_event_on::OnStop";
 			initnpctimer;
 			changequest 7020,7021;
 			close;
@@ -14659,7 +13667,7 @@ OnEnable:
 	enablenpc "Corpse#moc2_dead01";
 	end;
 
-Oncall:
+OnCall:
 	monster "que_dan01",26,40,"Dandelion Member",1985,1,"Corpse#moc2_dead01::OnMyMobDead";
 	monster "que_dan01",21,35,"Dandelion Member",1985,1,"Corpse#moc2_dead01::OnMyMobDead";
 	monster "que_dan01",25,32,"Dandelion Member",1985,1,"Corpse#moc2_dead01::OnMyMobDead";
@@ -14670,7 +13678,7 @@ Oncall:
 OnMyMobDead:
 	end;
 
-Onreset:
+OnReset:
 	killmonster "que_dan01","Corpse#moc2_dead01::OnMyMobDead";
 	end;
 
@@ -14714,14 +13722,14 @@ OnEnable:
 	end;
 }
 
-que_dan01,34,34,7	duplicate(#dandelion_duplicates)	Rin#moc2_bt_rin01	885
-que_dan01,29,34,7	duplicate(#dandelion_duplicates)	Rin#moc2_bt_rin02	885
-que_dan01,36,34,3	duplicate(#dandelion_duplicates)	Rayan#moc2_bt_r01	456
-que_dan01,39,37,3	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_1	456
-que_dan01,41,34,3	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_2	456
-que_dan01,26,40,5	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_3	456
-que_dan01,21,35,5	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_4	456
-que_dan01,25,32,7	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_5	456
+que_dan01,34,34,7	duplicate(#dandelion_duplicates)	Rin#moc2_bt_rin01	4_F_ACROSS
+que_dan01,29,34,7	duplicate(#dandelion_duplicates)	Rin#moc2_bt_rin02	4_F_ACROSS
+que_dan01,36,34,3	duplicate(#dandelion_duplicates)	Rayan#moc2_bt_r01	4_M_DSTMAN
+que_dan01,39,37,3	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_1	4_M_DSTMAN
+que_dan01,41,34,3	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_2	4_M_DSTMAN
+que_dan01,26,40,5	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_3	4_M_DSTMAN
+que_dan01,21,35,5	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_4	4_M_DSTMAN
+que_dan01,25,32,7	duplicate(#dandelion_duplicates)	Dandelion Member#moc2_5	4_M_DSTMAN
 
 yuno_fild09,234,133,0	warp	#moc2_fild09-que_dan02	1,1,que_dan02,13,10
 que_dan02,13,6,0	warp	#moc_que_dan02-fild09	1,1,yuno_fild09,234,129
@@ -14807,7 +13815,7 @@ OnTouch:
 		set mao_morocc2,18;
 		changequest 7026,7027;
 		close2;
-		warp "SavePoint",0,0;
+		consumeitem 602; //Wing_Of_Butterfly
 		end;
 	}
 	else if (mao_morocc2 == 19) {
@@ -14832,7 +13840,7 @@ OnTouch:
 
 que_dan02,88,11,0	warp	#moc2_b1-b2	1,1,que_dan02,21,33
 
-que_dan02,115,53,3	script	Man#moc2_crazyR01	456,{
+que_dan02,115,53,3	script	Man#moc2_crazyR01	4_M_DSTMAN,{
 	if (mao_morocc2 == 19) {
 		mes "A man covered in blood is standing at a corner with a mysterious grin.";
 		next;
@@ -14899,7 +13907,7 @@ que_dan02,115,53,3	script	Man#moc2_crazyR01	456,{
 		set mao_morocc2,20;
 		changequest 7028,7029;
 		close2;
-		warp "SavePoint",0,0;
+		consumeitem 602; //Wing_Of_Butterfly
 		donpcevent "Mr. Kidd#moc_extra01::OnDisable";
 	}
 	else {
@@ -14915,7 +13923,7 @@ que_dan02,115,53,3	script	Man#moc2_crazyR01	456,{
 	end;
 }
 
-que_dan02,115,54,5	script	Mr. Kidd#moc_extra01	884,{
+que_dan02,115,54,5	script	Mr. Kidd#moc_extra01	4_M_ACROSS,{
 	end;
 
 OnInit:
@@ -14928,39 +13936,41 @@ OnEnable:
 	end;
 }
 
-que_dan02,108,17,3	script	Dismembered Corpse#moc2	457,{
+que_dan02,108,17,3	script	Dismembered Corpse#moc2	4_M_DSTMANDEAD,{
 	mes "You find a horribly dismembered dead body.";
 	mes "It is disgusting to decribe the status of the Corpse!.";
 	close;
 }
 
-que_dan02,103,24,5	script	Crushed Corpse#moc2	457,{
+que_dan02,103,24,5	script	Crushed Corpse#moc2	4_M_DSTMANDEAD,{
 	mes "You find a horribly disfigured corpse.";
 	mes "that appears to have been crushed to death.";
 	close;
 }
 
-que_dan02,92,37,7	script	Mutated Corpse#moc2	457,{
+que_dan02,92,37,7	script	Mutated Corpse#moc2	4_M_DSTMANDEAD,{
 	mes "You find a terribly mutated corpse.";
 	mes "R.I.P.";
 	close;
 }
 
-que_dan02,99,36,0	script	Mutilated Corpse#moc2	457,{
+que_dan02,99,36,0	script	Mutilated Corpse#moc2	4_M_DSTMANDEAD,{
 	mes "You find a terribly mutilated corpse.";
 	mes "Rest in peace.";
 	close;
 }
 
-que_dan02,102,42,3	script	Disfigured Corpse#moc2	457,{
+que_dan02,102,42,3	script	Disfigured Corpse#moc2	4_M_DSTMANDEAD,{
 	mes "You find a horribly disfigured corpse.";
 	mes "... . . . . . !!!";
 	close;
 }
 
+// Ash-Vacuum Warper :: gogoash
+//============================================================
 /*
-//Mid Camp Warper (gogoash), Translated from the Official [Slim]
-prontera,161,192,5	script	Ash Vacuum Warper	707,{
+// Event NPC, now disabled on official servers.
+prontera,161,192,5	script	Ash-Vacuum Warper	4_M_MOC_SOLDIER,{
 	mes "[Warp Soldier]";
 	mes "For a limited period.";
 	mes "I can send you to Ash-Vacuum without any fee.";
@@ -14968,24 +13978,50 @@ prontera,161,192,5	script	Ash Vacuum Warper	707,{
 	mes "[Warp Soldier]";
 	mes "Do you want to go to Ash-Vacuum right now?";
 	next;
-	switch(select("Yes, please","Not yet")) {
-
-		case 1:
-			mes "[Warp Soldier]";
-			mes "Ok. I hope you";
-			mes "enjoy your trip.";
-			close2;
-			set ep13_ryu,100;
-			warp "mid_camp",210,291;
-			break;
-		case 2:
-			mes "[Warp Soldier]";
-			mes "No problem. I understand.";
-			mes "Tell me when you change your mind.";
-			mes "See you.";
-			close;
-			break;
+	switch(select("Yes, please:Not yet")) {
+	case 1:
+		mes "[Warp Soldier]";
+		mes "Ok. I hope you";
+		mes "enjoy your trip.";
+		close2;
+		set ep13_ryu,100;
+		warp "mid_camp",210,291;
+		end;
+	case 2:
+		mes "[Warp Soldier]";
+		mes "No problem. I understand.";
+		mes "Tell me when you change your mind.";
+		mes "See you.";
+		close;
 	}
-	end;
 }
-*/
\ No newline at end of file
+*/
+
+//============================================================
+// Old changelog
+//============================================================
+//= 1.0 First Version. [L0ne_W0lf]
+//= 1.1 I missed an end in one of the lhz guards. [L0ne_W0lf]
+//= 1.2 Fixed missing ends, wrong label and some typos [Gepard]
+//= 1.3 Added the two remaining 13.1 quests. [L0ne_W0lf]
+//=     Cat Hand Agents no longer ignore you with 300+ points.
+//= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
+//= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
+//= 1.6 Fixed check in cat hand agent.
+//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
+//= 1.8 Added 13.2 Additions to Report from the New World NPCs
+//= 1.9 Upped success rates for Report from the New World drops.
+//= 2.0 Added Mid Camp Warper, translated from the Official [Slim]
+//= 2.1 Fixed some typos [tr0n]
+//= 2.2 A little optimization (-25kb). [Euphy]
+//= 2.3 Updated to match the new Izlude Map. [Masao]
+//= 2.4 More optimization (-32kb). [Euphy]
+//= 2.5 Yet more optimization (-22kb). [Euphy]
+//= 2.5a Minor fixes. [Euphy]
+//= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy]
+//= 2.6a Added 'npcskill' command. [Euphy]
+//= 2.7 Updated EXP rewards.
+//= 2.7a Added 'consumeitem' command. [Euphy]
+//= 2.8 Some optimization, and moved an Izlude NPC. [Euphy]
+//= 2.9 Fixed an invalid event label. [Joseph]
+//============================================================
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index de8f86970..f024c5285 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Collection of episode 13.2 quests.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.5
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 2.8
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Cat Hand Addition. (Leads to 13.2 areas)
 //= Two Tribes
 //= Monster Suppression
 //= Daily Quests:
 //= - Bradium Collection
 //= - Laphine Craftsman
-//= - Drago Egg Collection (npc includes 'Wanted' quest)
+//= - Draco Egg Collection (npc includes 'Wanted' quest)
 //= Otherworld language
 //= Daily Quests:
 //= - Midgard Ore
@@ -33,7 +31,7 @@
 //= 1.7 Added daily quest 'Dragon Egg collection.'
 //= 1.7a Fixed a translation typo. Tabb -> Taab.
 //= 1.8 Added a missing " in the GM only NPC.
-//= 1.9 Added Monster Suppression, Bradium Collection, and 
+//= 1.9 Added Monster Suppression, Bradium Collection, and
 //=     Laphine Craftsman quests.
 //= 2.0 Added missing global var check in Yggdrasil Dungeon
 //=     floor 2 puzzle. Fixed a typo. Commented out untranslated
@@ -43,14 +41,18 @@
 //= 2.3 Fixed EF_Wind not showing. (bugreport:5149) [Masao]
 //= 2.4 Optimized (6000+ lines reduced!). [Euphy]
 //= 2.4a Fixed an invisible NPC clashing with a warp portal. [Euphy]
-//= 2.5 Fixed EXP values, added support for pre-re
-//=      & other minor stuff [Streusel] 
-//============================================================ 
-
-// Cat Hand Addition.
-//============================================================ 
-spl_fild02,25,211,4	script	Cat Hand Agent#spl	421,{
-function Catwarp;
+//= 2.5 Updated EXP rewards.
+//= 2.6 Fixed incorrect use of 'close'. [Joseph]
+//= 2.6a Disabled GM NPC. [Euphy]
+//= 2.7 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.7a Added Izlude RE coordinates. [Euphy]
+//= 2.8 Added GM management function. [Euphy]
+//============================================================
+
+// Cat Hand Addition :: cat_enhance
+//============================================================
+spl_fild02,25,211,4	script	Cat Hand Agent#spl	4_M_BOSSCAT,{
+	function Catwarp;
 	if (ep13_yong1 < 3) {
 		mes "[Cat Hand Agent]";
 		mes "Welcome to Cat Trading.";
@@ -104,7 +106,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				Zeny -= 60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will be opened shortly.";
@@ -151,7 +153,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				Zeny -= 60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will be opened shortly.";
@@ -272,7 +274,7 @@ function Catwarp;
 				close;
 			}
 			else if (Zeny >= 60) {
-				set zeny,zeny-60;
+				Zeny -= 60;
 				mes "[Cat Hand Agent]";
 				mes "Thank you.";
 				mes "Your storage will be opened shortly.";
@@ -390,13 +392,14 @@ function Catwarp {
 	if (Zeny < getarg(0)) {
 		mes "[Cat Hand Agent]";
 		mes "Don't play with money.";
-		close; }
+		close;
+	}
 	close2;
-	set Zeny, Zeny-getarg(0);
+	Zeny -= getarg(0);
 	switch(getarg(1)) {
 		case 1: warp "alberta",117,56; end;
 		case 2: warp "prontera",116,72; end;
-		case 3: warp "izlude",91,105; end;
+		case 3: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; end;
 		case 4: warp "geffen",120,39; end;
 		case 5: warp "payon",161,58; end;
 		case 6: warp "morocc",156,46; end;
@@ -410,8 +413,7 @@ function Catwarp {
 	}
 }
 }
-
-man_fild02,132,47,4	duplicate(Cat Hand Agent#spl)	Cat Hand Agent#man	421
+man_fild02,132,47,4	duplicate(Cat Hand Agent#spl)	Cat Hand Agent#man	4_M_BOSSCAT
 
 -	script	Mysterious Rock#30::manukrock2	-1,{
 	if ((countitem(6048) < 3) && (checkquest(12062,PLAYTIME) == -1)) {
@@ -427,11 +429,13 @@ man_fild02,132,47,4	duplicate(Cat Hand Agent#spl)	Cat Hand Agent#man	421
 		else getitem 6048,1; //Unidentified_Mineral
 		initnpctimer;
 		disablenpc strnpcinfo(0);
-		end; }
+		end;
+	}
 	else {
 		mes "This rock contains unidentified minerals.";
 		mes "It's not possible to mine more than the limit.";
-		close; }
+		close;
+	}
 	end;
 
 OnTimer120000:
@@ -440,18 +444,18 @@ OnTimer120000:
 	end;
 }
 
-man_fild02,146,81,0	duplicate(manukrock2)	Mysterious Rock#31	844
-man_fild02,140,148,0	duplicate(manukrock2)	Mysterious Rock#32	844
-man_fild02,88,263,0	duplicate(manukrock2)	Mysterious Rock#33	844
-man_fild02,146,365,0	duplicate(manukrock2)	Mysterious Rock#34	844
-man_fild02,336,305,0	duplicate(manukrock2)	Mysterious Rock#35	844
-man_fild02,248,124,0	duplicate(manukrock2)	Mysterious Rock#36	844
-man_fild02,285,115,0	duplicate(manukrock2)	Mysterious Rock#37	844
-man_fild02,346,116,0	duplicate(manukrock2)	Mysterious Rock#38	844
-man_fild02,358,174,0	duplicate(manukrock2)	Mysterious Rock#39	844
-man_fild02,241,227,0	duplicate(manukrock2)	Mysterious Rock#40	844
+man_fild02,146,81,0	duplicate(manukrock2)	Mysterious Rock#31	CLEAR_NPC
+man_fild02,140,148,0	duplicate(manukrock2)	Mysterious Rock#32	CLEAR_NPC
+man_fild02,88,263,0	duplicate(manukrock2)	Mysterious Rock#33	CLEAR_NPC
+man_fild02,146,365,0	duplicate(manukrock2)	Mysterious Rock#34	CLEAR_NPC
+man_fild02,336,305,0	duplicate(manukrock2)	Mysterious Rock#35	CLEAR_NPC
+man_fild02,248,124,0	duplicate(manukrock2)	Mysterious Rock#36	CLEAR_NPC
+man_fild02,285,115,0	duplicate(manukrock2)	Mysterious Rock#37	CLEAR_NPC
+man_fild02,346,116,0	duplicate(manukrock2)	Mysterious Rock#38	CLEAR_NPC
+man_fild02,358,174,0	duplicate(manukrock2)	Mysterious Rock#39	CLEAR_NPC
+man_fild02,241,227,0	duplicate(manukrock2)	Mysterious Rock#40	CLEAR_NPC
 
-spl_fild03,226,151,0	script	School of Fish#5::FishingHole_spl3	844,{
+spl_fild03,226,151,0	script	School of Fish#5::FishingHole_spl3	CLEAR_NPC,{
 	if ((checkquest(12060,PLAYTIME) == -1) && (countitem(6039) < 20)) {
 		specialeffect2 EF_BUBBLE;
 		specialeffect2 EF_INVENOM;
@@ -515,19 +519,19 @@ spl_fild03,226,151,0	script	School of Fish#5::FishingHole_spl3	844,{
 	}
 	end;
 }
-spl_fild03,268,230,0	duplicate(FishingHole_spl3)	School of Fish#6	844
-spl_fild03,293,253,0	duplicate(FishingHole_spl3)	School of Fish#7	844
-spl_fild03,165,100,0	duplicate(FishingHole_spl3)	School of Fish#8	844
-spl_fild03,317,190,0	duplicate(FishingHole_spl3)	School of Fish#9	844
-spl_fild01,41,118,0	duplicate(FishingHole_spl3)	School of Fish#10	844
-spl_fild01,317,361,0	duplicate(FishingHole_spl3)	School of Fish#11	844
-spl_fild01,55,269,0	duplicate(FishingHole_spl3)	School of Fish#12	844
-spl_fild01,332,131,0	duplicate(FishingHole_spl3)	School of Fish#13	844
-spl_fild01,170,74,0	duplicate(FishingHole_spl3)	School of Fish#14	844
+spl_fild03,268,230,0	duplicate(FishingHole_spl3)	School of Fish#6	CLEAR_NPC
+spl_fild03,293,253,0	duplicate(FishingHole_spl3)	School of Fish#7	CLEAR_NPC
+spl_fild03,165,100,0	duplicate(FishingHole_spl3)	School of Fish#8	CLEAR_NPC
+spl_fild03,317,190,0	duplicate(FishingHole_spl3)	School of Fish#9	CLEAR_NPC
+spl_fild01,41,118,0	duplicate(FishingHole_spl3)	School of Fish#10	CLEAR_NPC
+spl_fild01,317,361,0	duplicate(FishingHole_spl3)	School of Fish#11	CLEAR_NPC
+spl_fild01,55,269,0	duplicate(FishingHole_spl3)	School of Fish#12	CLEAR_NPC
+spl_fild01,332,131,0	duplicate(FishingHole_spl3)	School of Fish#13	CLEAR_NPC
+spl_fild01,170,74,0	duplicate(FishingHole_spl3)	School of Fish#14	CLEAR_NPC
 
-// Two Tribes
+// Two Tribes :: ep13_2_msg
 //============================================================
-spl_in01,32,306,3	script	Splendide Guard#ep13md01	447,2,2,{
+spl_in01,32,306,3	script	Splendide Guard#ep13md01	4_M_FAIRYSOLDIER,2,2,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -945,7 +949,7 @@ OnTouch:
 	end;
 }
 
-spl_fild02,45,214,0	script	????#ep13_mdplant01	844,{
+spl_fild02,45,214,0	script	????#ep13_mdplant01	CLEAR_NPC,{
 	if (ep13_mdrama == 2) {
 		cutin "ep13_plant01",2;
 		mes "Weeds are easy to find around here...";
@@ -971,7 +975,7 @@ spl_fild02,45,214,0	script	????#ep13_mdplant01	844,{
 	end;
 }
 
-spl_fild02,122,106,0	script	????#ep13_mdplant02	844,{
+spl_fild02,122,106,0	script	????#ep13_mdplant02	CLEAR_NPC,{
 	if (ep13_mdrama > 2) {
 		cutin "ep13_plant01",2;
 		mes "Weeds are easy to find around here...";
@@ -990,7 +994,7 @@ spl_fild02,122,106,0	script	????#ep13_mdplant02	844,{
 	end;
 }
 
-spl_fild02,329,191,0	script	????#ep13_mdplant03	844,{
+spl_fild02,329,191,0	script	????#ep13_mdplant03	CLEAR_NPC,{
 	if (ep13_mdrama > 2) {
 	cutin "ep13_plant01",2;
 		mes "Weeds are easy to find around here...";
@@ -1009,7 +1013,7 @@ spl_fild02,329,191,0	script	????#ep13_mdplant03	844,{
 	end;
 }
 
-spl_fild02,328,323,0	script	????#ep13_mdplant04	844,{
+spl_fild02,328,323,0	script	????#ep13_mdplant04	CLEAR_NPC,{
 	if (ep13_mdrama == 3) {
 		mes "There are footprints here as well as signs that someone has fallen.";
 		mes "It looks like someone was fighting here?";
@@ -1030,7 +1034,7 @@ spl_fild02,328,323,0	script	????#ep13_mdplant04	844,{
 	}
 }
 
-spl_fild01,341,109,0	script	????#ep13_mdplant05	844,{
+spl_fild01,341,109,0	script	????#ep13_mdplant05	CLEAR_NPC,{
 	if (ep13_mdrama == 4) {
 		mes "There's evidence that there was a fight here too.";
 		mes "These footsteps can't be a Laphine's...";
@@ -1093,7 +1097,7 @@ OnTouch:
 	}
 }
 
-nyd_dun01,58,223,0	script	Petrified Sapha#ep13md03	844,{
+nyd_dun01,58,223,0	script	Petrified Sapha#ep13md03	CLEAR_NPC,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -1313,7 +1317,7 @@ nyd_dun01,58,223,0	script	Petrified Sapha#ep13md03	844,{
 	}
 }
 
-nyd_dun01,55,223,5	script	Snorren#ep13md17	454,{
+nyd_dun01,55,223,5	script	Snorren#ep13md17	4_MAN_PIOM,{
 	disablenpc "Snorren#ep13md17";
 	end;
 
@@ -1327,7 +1331,7 @@ OnEnable:
 	end;
 }
 
-nyd_dun01,62,233,0	script	Trunk of a Tree#ep13	844,2,2,{
+nyd_dun01,62,233,0	script	Trunk of a Tree#ep13	CLEAR_NPC,2,2,{
 	mes "The trunk of a Tree moderately stretched upward.";
 	mes "There are big thorns here that should be enough to use as footholds to climb up.";
 	close;
@@ -1345,7 +1349,7 @@ OnTouch:
 			close;
 	}
 }
-manuk,278,177,5	script	Villager#ep13_11	454,{
+manuk,278,177,5	script	Villager#ep13_11	4_MAN_PIOM,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -1443,7 +1447,7 @@ manuk,278,177,5	script	Villager#ep13_11	454,{
 	}
 }
 
-manuk,281,177,3	script	Villager#ep13_12	449,{
+manuk,281,177,3	script	Villager#ep13_12	4_MAN_BENKUNI,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -1545,7 +1549,7 @@ manuk,281,177,3	script	Villager#ep13_12	449,{
 	}
 }
 
-man_in01,175,59,5	script	Snorren#ep13_13	454,{
+man_in01,175,59,5	script	Snorren#ep13_13	4_MAN_PIOM,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -1857,7 +1861,7 @@ man_in01,175,59,5	script	Snorren#ep13_13	454,{
 	}
 }
 
-man_in01,183,58,0	script	to_in013ep13mdwarp01	45,1,1,{
+man_in01,183,58,0	script	to_in013ep13mdwarp01	WARPNPC,1,1,{
 OnTouch:
 	if ((ep13_mdrama > 17) && (ep13_mdrama < 24)) {
 		warp "man_in01",13,125;
@@ -1877,7 +1881,7 @@ OnTouch:
 man_in01,10,125,0	warp	to_out1#ep13mdwarp02	1,1,man_in01,179,58
 man_in01,65,125,0	warp	to_out2#ep13mdwarp03	1,1,man_in01,179,58
 
-man_in01,22,126,3	script	Captured Laphine#ep13md	441,{
+man_in01,22,126,3	script	Captured Laphine#ep13md	4_F_FAIRYKID6,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2052,7 +2056,7 @@ man_in01,22,126,3	script	Captured Laphine#ep13md	441,{
 	}
 }
 
-man_in01,17,128,5	script	Snorren#ep13md_15	454,{
+man_in01,17,128,5	script	Snorren#ep13md_15	4_MAN_PIOM,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2182,7 +2186,7 @@ man_in01,17,128,5	script	Snorren#ep13md_15	454,{
 	}
 }
 
-man_in01,19,126,3	script	Luik#ep13md16	450,{
+man_in01,19,126,3	script	Luik#ep13md16	4_MAN_GALTUN,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2359,7 +2363,7 @@ OnTouch:
 	close;
 }
 
-spl_in02,236,92,5	script	Arc#ep13md_l02	447,{
+spl_in02,236,92,5	script	Arc#ep13md_l02	4_M_FAIRYSOLDIER,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2454,7 +2458,7 @@ spl_in02,236,92,5	script	Arc#ep13md_l02	447,{
 			mes "I'm sorry this is all I can give you for now.";
 			set ep13_mdrama,27;
 			getitem 6081,25; //Splendide_Coin
-			if(checkre(0))
+			if (checkre(3))
 				getexp 120000,10000;
 			else
 				getexp 1200000,100000;
@@ -2528,9 +2532,9 @@ spl_in02,236,92,5	script	Arc#ep13md_l02	447,{
 		close;
 	}
 }
-spl_in02,239,93,3	duplicate(Arc#ep13md_l02)	Terra#ep13md_l03	441
+spl_in02,239,93,3	duplicate(Arc#ep13md_l02)	Terra#ep13md_l03	4_F_FAIRYKID6
 
-splendide,287,140,0	script	terrashome_in	45,1,1,{
+splendide,287,140,0	script	terrashome_in	WARPNPC,1,1,{
 OnTouch:
 	if (ep13_mdrama > 25) {
 		warp "spl_in02",237,89;
@@ -2544,7 +2548,7 @@ OnTouch:
 
 spl_in02,236,86,0	warp	terrashome_out	1,1,splendide,285,139;
 
-spl_fild01,357,44,0	script	???#ep13mdf01	844,{
+spl_fild01,357,44,0	script	???#ep13mdf01	CLEAR_NPC,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2593,7 +2597,7 @@ spl_fild01,357,44,0	script	???#ep13mdf01	844,{
 	}
 }
 
-spl_fild01,312,79,0	script	???#ep13mdf02	844,{
+spl_fild01,312,79,0	script	???#ep13mdf02	CLEAR_NPC,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2642,7 +2646,7 @@ spl_fild01,312,79,0	script	???#ep13mdf02	844,{
 	}
 }
 
-spl_fild01,329,29,0	script	???#ep13mdf03	844,{
+spl_fild01,329,29,0	script	???#ep13mdf03	CLEAR_NPC,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2697,9 +2701,9 @@ spl_fild01,329,29,0	script	???#ep13mdf03	844,{
 	}
 }
 
-// Monster Suppression
+// Monster Suppression :: ep13_2_dayquest
 //============================================================
-manuk,252,116,3	script	Manuk Galtun#ep13_2day	450,{
+manuk,252,116,3	script	Manuk Galtun#ep13_2day	4_MAN_GALTUN,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2776,7 +2780,7 @@ manuk,252,116,3	script	Manuk Galtun#ep13_2day	450,{
 				completequest 7074;
 				completequest 7075;
 				set ep13_2_days01,2;
-				if(checkre(0))
+				if (checkre(3))
 					getexp 50000,30000;
 				else
 					getexp 500000,300000;
@@ -2810,12 +2814,12 @@ manuk,252,116,3	script	Manuk Galtun#ep13_2day	450,{
 	close;
 }
 
-// Daily Quests
+// Daily Quests :: ep13_2_dayquest
 // - Bradium Collection
 // - Laphine Craftsman
-// - Draco Egg Collection (npc includes 'Wanted' quest)
+// - Draco Egg Collection (NPC includes 'Wanted' quest)
 //============================================================
-man_in01,378,276,3	script	Manuk Engineer#ep13_2	453,{
+man_in01,378,276,3	script	Manuk Engineer#ep13_2	4_MAN_NITT,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2922,7 +2926,7 @@ man_in01,378,276,3	script	Manuk Engineer#ep13_2	453,{
 	}
 }
 
-spl_in01,97,313,3	script	Laphine Craftsman#ep13	446,{
+spl_in01,97,313,3	script	Laphine Craftsman#ep13	4_M_FAIRYKID5,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -2942,120 +2946,106 @@ spl_in01,97,313,3	script	Laphine Craftsman#ep13	446,{
 					mes "That should be sufficient for the time being.";
 					close;
 				}
+				mes "[Laphine craftsman]";
+				mes "Thank you for collecting those items for me.";
+				mes "Hopefully you can help us again.";
+				erasequest 7082;
+				close;
+			}
+			set .@alba2,checkquest(7081);
+			if ((.@alba2 == 0) || (.@alba2 == 1)) {
+				if ((countitem(7326) > 14) && (countitem(6075) > 14)) {
+					mes "[Laphine craftsman]";
+					mes "Oh, fantastic.";
+					mes "These are enough materials for today.";
+					mes "I'll let you know if I need more.";
+					delitem 7326,15; //Fluorescent_Liquid
+					delitem 6075,15; //Crystalized_Teardrop
+					erasequest 7081;
+					setquest 7082;
+					getexp 30000,30000;
+					getitem 6081,3; //Splendide_Coin
+					close;
+				}
 				else {
 					mes "[Laphine craftsman]";
-					mes "Thank you for collecting those items for me.";
-					mes "Hopefully you can help us again.";
-					erasequest 7082;
+					mes "What can I help you with?";
+					mes "Not yet done with my request?";
 					close;
 				}
 			}
-			else {
-				set .@alba2,checkquest(7081);
-				if ((.@alba2 == 0) || (.@alba2 == 1)) {
-					if ((countitem(7326) > 14) && (countitem(6075) > 14)) {
-						mes "[Laphine craftsman]";
-						mes "Oh, fantastic.";
-						mes "These are enough materials for today.";
-						mes "I'll let you know if I need more.";
-						delitem 7326,15; //Fluorescent_Liquid
-						delitem 6075,15; //Crystalized_Teardrop
-						erasequest 7081;
-						setquest 7082;
-						getexp 30000,30000;
-						getitem 6081,3; //Splendide_Coin
-						close;
-					}
-					else {
-						mes "[Laphine craftsman]";
-						mes "What can I help you with?";
-						mes "Not yet done with my request?";
-						close;
-					}
-				}
-				else {
+			mes "[Laphine craftsman]";
+			mes "What's up??";
+			mes "I need to make more decorations for the Yai.";
+			next;
+			if (select("May I help you?:What's a Yai?") == 1) {
+				mes "[Laphine craftsman]";
+				mes "You want to help?";
+				mes "This place is being used for battle but it is also our home.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "We prefer to be alone so we must each have our own Yai.";
+				mes "Though we are in a military base we should take care of each Yai.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "I am not a soldier but we hope all of us to be as confident as they are.";
+				mes "I would like to support all Laphine with my skills.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "So I want to help make decorations for everyone's Yai.";
+				mes "I need more materials to make them.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "I heard that a water ghost has been appearing in the cave.";
+				mes "Can you bring me 15 Crystallized Teardrop and 15 Fluorescent Liquid?";
+				next;
+				if (select("Yes.:Sorry.") == 1) {
 					mes "[Laphine craftsman]";
-					mes "What's up??";
-					mes "I need to make more decorations for the Yai.";
-					next;
-					switch(select("May I help you?:What's a Yai?")) {
-					case 1:
-						mes "[Laphine craftsman]";
-						mes "You want to help?";
-						mes "This place is being used for battle but it is also our home.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "We prefer to be alone so we must each have our own Yai.";
-						mes "Though we are in a military base we should take care of each Yai.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "I am not a soldier but we hope all of us to be as confident as they are.";
-						mes "I would like to support all Laphine with my skills.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "So I want to help make decorations for everyone's Yai.";
-						mes "I need more materials to make them.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "I heard that a water ghost has been appearing in the cave.";
-						mes "Can you bring me 15 Crystallized Teardrop and 15 Fluorescent Liquid?";
-						next;
-						switch(select("Yes.:Sorry.")) {
-						case 1:
-							mes "[Laphine craftsman]";
-							mes "Please take my request.";
-							mes "Can you bring me 15 Crystallized Teardrop and 15 Fluorescent Liquid?";
-							setquest 7081;
-							close;
-						case 2:
-							mes "[Laphine craftsman]";
-							mes "Yes, I'm sure that you have your own business to attend to.";
-							mes "I feel embarrassed asking a favor from you, as a Laphine.";
-							next;
-							mes "[Laphine craftsman]";
-							mes "But, why are you trying to be involved in our business yet you won't take up our request?";
-							close;
-						}
-					case 2:
-						mes "[Laphine craftsman]";
-						mes "Yai...";
-						mes "All grown Laphine have one.";
-						mes "They're essential for all Laphine to live in since we are very private people.";
-						next;
-						select("It's a house...?");
-						mes "[Laphine craftsman]";
-						mes "Yes...";
-						mes "That's it. We sometimes invite our friends or guests to our Yai.";
-						mes "And decorations for Yai are quite important to us...";
-						next;
-						mes "[Laphine craftsman]";
-						mes "We Laphine care about ourselves and our Yai as well.";
-						next;
-						mes "[Laphine craftsman]";
-						mes "We are far away from our hometown now...";
-						mes "If we don't have this kind of hobby, there's nothing to enjoy here.";
-						close;
-					}
+					mes "Please take my request.";
+					mes "Can you bring me 15 Crystallized Teardrop and 15 Fluorescent Liquid?";
+					setquest 7081;
+					close;
 				}
+				mes "[Laphine craftsman]";
+				mes "Yes, I'm sure that you have your own business to attend to.";
+				mes "I feel embarrassed asking a favor from you, as a Laphine.";
+				next;
+				mes "[Laphine craftsman]";
+				mes "But, why are you trying to be involved in our business yet you won't take up our request?";
+				close;
 			}
-		}
-		else {
 			mes "[Laphine craftsman]";
-			mes "Hm? Oh, can't you see I'm busy?";
-			mes "I'm making ornaments though, if you must know.";
+			mes "Yai...";
+			mes "All grown Laphine have one.";
+			mes "They're essential for all Laphine to live in since we are very private people.";
+			next;
+			select("It's a house...?");
+			mes "[Laphine craftsman]";
+			mes "Yes...";
+			mes "That's it. We sometimes invite our friends or guests to our Yai.";
+			mes "And decorations for Yai are quite important to us...";
+			next;
+			mes "[Laphine craftsman]";
+			mes "We Laphine care about ourselves and our Yai as well.";
+			next;
+			mes "[Laphine craftsman]";
+			mes "We are far away from our hometown now...";
+			mes "If we don't have this kind of hobby, there's nothing to enjoy here.";
 			close;
 		}
-	}
-	else {
 		mes "[Laphine craftsman]";
-		mes "Yur,Dur AnoVa?";
-		mes "Wha? Dieb OsaDur .. ";
-		mes "ah..RuffThus NeAsh. man nesAsh OdesAlah ?";
+		mes "Hm? Oh, can't you see I'm busy?";
+		mes "I'm making ornaments though, if you must know.";
 		close;
 	}
+	mes "[Laphine craftsman]";
+	mes "Yur,Dur AnoVa?";
+	mes "Wha? Dieb OsaDur .. ";
+	mes "ah..RuffThus NeAsh. man nesAsh OdesAlah ?";
+	close;
 }
 
-mid_camp,146,306,3	script	Pet Breeder#ep13_eden01	982,{
+mid_camp,146,306,3	script	Pet Breeder#ep13_eden01	4_F_SCIENCE,{
 	if (checkweight(1201,2) == 0) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -3106,169 +3096,145 @@ mid_camp,146,306,3	script	Pet Breeder#ep13_eden01	982,{
 		mes "- They just continue to argue -";
 		close;
 	}
-	else {
-		mes "[Pinedel]";
-		mes "Ah, Taab isn't flexible at all.";
-		mes "Hey there! What's up??";
-		next;
-		switch(select("Notice for criminal report:Cute pet investigation.")) {
-		case 1:
-			if (ep13_2_wanted == 1) {
-				if (checkquest(7076,HUNTING) == 2) {
-					mes "[Pinedel]";
-					mes "Have you hunted the Runaway Dandelion?";
-					mes "Ok, I accept you.";
-					mes "Here's something Rin was storing here.";
-					next;
-					mes "[Pinedel]";
-					mes "This is Rin's cherished treasure box...";
-					mes "This is enough payment, right?";
-					completequest 7076;
-					set ep13_2_wanted,2;
-					getitem 7444,1; //Treasure_Box
-					close;
-				}
-				else {
-					mes "[Pinedel]";
-					mes "I know you haven't terminated the Runaway Dandelion yet.";
-					mes "Don't take me for a fool.";
-					close;
-				}
-			}
-			else if (ep13_2_wanted == 2) {
+	mes "[Pinedel]";
+	mes "Ah, Taab isn't flexible at all.";
+	mes "Hey there! What's up??";
+	next;
+	if (select("Notice for criminal report:Cute pet investigation.") == 1) {
+		if (ep13_2_wanted == 1) {
+			if (checkquest(7076,HUNTING) == 2) {
 				mes "[Pinedel]";
-				mes "I will forward everything to Rin.";
-				mes "She'll love it.";
-				mes "Just tell her your name " + strcharinfo(0) + ".";
+				mes "Have you hunted the Runaway Dandelion?";
+				mes "Ok, I accept you.";
+				mes "Here's something Rin was storing here.";
 				next;
 				mes "[Pinedel]";
-				mes "I can remember that I've heard about you from Rin.";
-				mes "But Rin likes you, so that must mean that you're nice.";
-				close;
-			}
-			else {
-				mes "[Pinedel]";
-				mes "Seaching for a criminal?";
-				mes "I'm not sure that you're involved in it.";
+				mes "This is Rin's cherished treasure box...";
+				mes "This is enough payment, right?";
+				completequest 7076;
+				set ep13_2_wanted,2;
+				getitem 7444,1; //Treasure_Box
 				close;
 			}
-		case 2:
-			if (ep13_2_dayegg == 1) {
-				if (countitem(6093) > 9) {
-					mes "[Pinedel]";
-					mes "Oh! Nice!";
-					mes "I can go through this study deeper with your assistance.";
-					next;
-					mes "[Pinedel]";
-					mes "I will try to make these Dragon eggs into cute pets.";
-					mes "Don't expect much!";
-					mes "Come back after a day to check on the progress.";
-					delitem 6093,10; //Egg_Of_Draco
-					erasequest 7077;
-					setquest 7078;
-					set ep13_2_dayegg,2;
-					getexp 40000,40000;
-					getitem 6081,1; //Splendide_Coin
-					getitem 6080,1; //Manuk_Coin
-					close;
-				}
-				else {
-					mes "[Pinedel]";
-					mes "Draco was being kept in the nest just before hatching. Please collect 10 Dragon eggs for me.";
-					mes "You know, those are hard to hatch in captivity.";
-					close;
-				}
-			}
-			else if (ep13_2_dayegg == 2) {
-				set .@alba_check,checkquest(7078,PLAYTIME);
-				if (.@alba_check == -1) {
-					mes "[Pinedel]";
-					mes "Those eggs are about to hatch now.";
-					mes "I will investigate those back home.";
-					close2;
-					erasequest 7078;
-					set ep13_2_dayegg,3;
-					end;
-				}
-				else if ((.@alba_check == 0) || (.@alba_check == 1)) {
-					mes "[Pinedel]";
-					mes "Those eggs are about to hatch now.";
-					mes "I will investigate those back home.";
-					mes "For now I still need more time.";
-					next;
-					mes "[Pinedel]";
-					mes "Can you come back here tomorrow?";
-					close;
-				}
-				else if (.@alba_check == 2) {
-					mes "[Pinedel]";
-					mes "Those eggs are about to hatch now.";
-					mes "I will investigate those back home.";
-					close2;
-					erasequest 7078;
-					set ep13_2_dayegg,3;
-					close;
-				}
-			}
-			else if (ep13_2_dayegg == 3) {
-				mes "[Pinedel]";
-				mes "Do you want to help me gather more Dragon eggs today?";
-				mes "I want to try many things with those eggs.";
-				next;
-				switch(select("Sure.:Sorry, I can't.")) {
-				case 1:
-					mes "[Pinedel]";
-					mes "Please collect 10 Draco Eggs.";
-					set ep13_2_dayegg,1;
-					setquest 7077;
-					close;
-				case 2:
-					mes "[Pinedel]";
-					mes "Ok. You have your own business here.";
-					mes "Go ahead.";
-					close;
-				}
-			}
-			else {
-				mes "[Pinedel]";
-				mes "I am investigating cute pets.";
-				mes "Ash-vacuum has several monsters that I think could become cute pets.";
-				next;
-				mes "[Pinedel]";
-				mes "The objective is one Dragon egg!";
-				mes "Can you bring me a Dragon Egg?";
-				next;
-				switch(select("Yes.:Nope.")) {
-				case 1:
-					mes "[Pinedel]";
-					mes "There would be Dragon nest in the cave you found out.";
-					mes "There should be nice Dragon Eggs.";
-					next;
-					mes "[Pinedel]";
-					mes "Please collect 10 Draco Eggs.";
-					mes "Let's work together to make them as pets.";
-					set ep13_2_dayegg,1;
-					setquest 7077;
-					close;
-				case 2:
-					mes "[Pinedel]";
-					mes "I know it's not the easiest task.";
-					mes "But I refuse to give up.";
-					mes "I will make it into a cute pet someday.";
-					next;
-					mes "[Taab]";
-					mes "Would you just give up making exogamous beings into cute pets...";
-					mes " ";
-					mes "[Pinedel]";
-					mes "Taab doesn't have any guts!";
-					close;
-				}
-			}
+			mes "[Pinedel]";
+			mes "I know you haven't terminated the Runaway Dandelion yet.";
+			mes "Don't take me for a fool.";
+			close;
 		}
+		else if (ep13_2_wanted == 2) {
+			mes "[Pinedel]";
+			mes "I will forward everything to Rin.";
+			mes "She'll love it.";
+			mes "Just tell her your name " + strcharinfo(0) + ".";
+			next;
+			mes "[Pinedel]";
+			mes "I can remember that I've heard about you from Rin.";
+			mes "But Rin likes you, so that must mean that you're nice.";
+			close;
+		}
+		mes "[Pinedel]";
+		mes "Seaching for a criminal?";
+		mes "I'm not sure that you're involved in it.";
+		close;
+	}
+	if (ep13_2_dayegg == 1) {
+		if (countitem(6093) > 9) {
+			mes "[Pinedel]";
+			mes "Oh! Nice!";
+			mes "I can go through this study deeper with your assistance.";
+			next;
+			mes "[Pinedel]";
+			mes "I will try to make these Dragon eggs into cute pets.";
+			mes "Don't expect much!";
+			mes "Come back after a day to check on the progress.";
+			delitem 6093,10; //Egg_Of_Draco
+			erasequest 7077;
+			setquest 7078;
+			set ep13_2_dayegg,2;
+			getexp 40000,40000;
+			getitem 6081,1; //Splendide_Coin
+			getitem 6080,1; //Manuk_Coin
+			close;
+		}
+		mes "[Pinedel]";
+		mes "Draco was being kept in the nest just before hatching. Please collect 10 Dragon eggs for me.";
+		mes "You know, those are hard to hatch in captivity.";
+		close;
 	}
+	else if (ep13_2_dayegg == 2) {
+		mes "[Pinedel]";
+		mes "Those eggs are about to hatch now.";
+		mes "I will investigate those back home.";
+		set .@alba_check,checkquest(7078,PLAYTIME);
+		if (.@alba_check == -1) {
+			close2;
+			erasequest 7078;
+			set ep13_2_dayegg,3;
+			end;
+		}
+		else if ((.@alba_check == 0) || (.@alba_check == 1)) {
+			mes "For now I still need more time.";
+			next;
+			mes "[Pinedel]";
+			mes "Can you come back here tomorrow?";
+			close;
+		}
+		close2;
+		erasequest 7078;
+		set ep13_2_dayegg,3;
+		end;
+	}
+	else if (ep13_2_dayegg == 3) {
+		mes "[Pinedel]";
+		mes "Do you want to help me gather more Dragon eggs today?";
+		mes "I want to try many things with those eggs.";
+		next;
+		if (select("Sure.:Sorry, I can't.") == 1) {
+			mes "[Pinedel]";
+			mes "Please collect 10 Draco Eggs.";
+			set ep13_2_dayegg,1;
+			setquest 7077;
+			close;
+		}
+		mes "[Pinedel]";
+		mes "Ok. You have your own business here.";
+		mes "Go ahead.";
+		close;
+	}
+	mes "[Pinedel]";
+	mes "I am investigating cute pets.";
+	mes "Ash-vacuum has several monsters that I think could become cute pets.";
+	next;
+	mes "[Pinedel]";
+	mes "The objective is one Dragon egg!";
+	mes "Can you bring me a Dragon Egg?";
+	next;
+	if (select("Yes.:Nope.") == 1) {
+		mes "[Pinedel]";
+		mes "There would be Dragon nest in the cave you found out.";
+		mes "There should be nice Dragon Eggs.";
+		next;
+		mes "[Pinedel]";
+		mes "Please collect 10 Draco Eggs.";
+		mes "Let's work together to make them as pets.";
+		set ep13_2_dayegg,1;
+		setquest 7077;
+		close;
+	}
+	mes "[Pinedel]";
+	mes "I know it's not the easiest task.";
+	mes "But I refuse to give up.";
+	mes "I will make it into a cute pet someday.";
+	next;
+	mes "[Taab]";
+	mes "Would you just give up making exogamous beings into cute pets...";
+	mes " ";
+	mes "[Pinedel]";
+	mes "Taab doesn't have any guts!";
+	close;
 }
 
-mid_camp,192,239,4	script	Wanted Sign#ep13_2ect01	857,{
+mid_camp,192,239,4	script	Wanted Sign#ep13_2ect01	4_BOARD3,{
 	if (ep13_mdrama > 5) {
 		mes "[Wanted]";
 		mes " ";
@@ -3293,27 +3259,20 @@ mid_camp,192,239,4	script	Wanted Sign#ep13_2ect01	857,{
 		next;
 		if (ep13_2_wanted == 0) {
 			mes "Do you accept Rin's request?";
-			switch(select("I accept that request.:No, I can't.")) {
-			case 1:
+			if (select("I accept that request.:No, I can't.") == 1) {
 				mes "I accepted Rin's request.";
 				set ep13_2_wanted,1;
 				setquest 7076;
 				close;
-			
-			case 2:
-				mes "No, I won't get involved in it.";
-				close;
 			}
-		}
-		else {
-			mes "I've already decided to take the request.";
+			mes "No, I won't get involved in it.";
 			close;
 		}
-	}
-	else {
-		mes "There must be someone who remove the wanted notice paper.";
+		mes "I've already decided to take the request.";
 		close;
 	}
+	mes "There must be someone who remove the wanted notice paper.";
+	close;
 }
 
 -	script	Dragon Egg#ep13_degg_0	-1,{
@@ -3344,14 +3303,14 @@ OnDisable:
 	end;
 }
 
-nyd_dun01,258,134,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg01	463
-nyd_dun01,100,210,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg02	463
-nyd_dun01,74,68,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg03	463
-nyd_dun01,98,142,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg04	463
-nyd_dun01,244,157,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg05	463
-nyd_dun01,59,185,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg06	463
+nyd_dun01,258,134,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg01	4_DRAGON_EGG
+nyd_dun01,100,210,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg02	4_DRAGON_EGG
+nyd_dun01,74,68,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg03	4_DRAGON_EGG
+nyd_dun01,98,142,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg04	4_DRAGON_EGG
+nyd_dun01,244,157,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg05	4_DRAGON_EGG
+nyd_dun01,59,185,0	duplicate(Dragon Egg#ep13_degg_0)	Dragon Egg#ep13_degg06	4_DRAGON_EGG
 
-nyd_dun02,68,256,0	script	Dragon Egg#ep13_degg_1	463,{
+nyd_dun02,68,256,0	script	Dragon Egg#ep13_degg_1	4_DRAGON_EGG,{
 	if (checkweight(1201,2) == 0) {
 		mes "- You're carrying too many items. -";
 		close;
@@ -3359,31 +3318,30 @@ nyd_dun02,68,256,0	script	Dragon Egg#ep13_degg_1	463,{
 	if ((ep13_2_dayegg == 1) && (countitem(6093) < 10)) {
 		mes "We just got fresh eggs from the dragon nest.";
 		getitem 6093,1; //Egg_Of_Draco
-		disablenpc strnpcinfo(1);
+		disablenpc strnpcinfo(0);
 		initnpctimer;
 		close;
 	}
 	end;
 
 OnTimer240000:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	stopnpctimer;
 	end;
 
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
+nyd_dun02,68,256,0	duplicate(Dragon Egg#ep13_degg_1)	Dragon Egg#ep13_degg11	4_DRAGON_EGG
+nyd_dun02,202,166,0	duplicate(Dragon Egg#ep13_degg_1)	Dragon Egg#ep13_degg12	4_DRAGON_EGG
+nyd_dun02,200,165,0	duplicate(Dragon Egg#ep13_degg_1)	Dragon Egg#ep13_degg13	4_DRAGON_EGG
 
-nyd_dun02,68,256,0	duplicate(Dragon Egg#ep13_degg_1)	Dragon Egg#ep13_degg11	463
-nyd_dun02,202,166,0	duplicate(Dragon Egg#ep13_degg_1)	Dragon Egg#ep13_degg12	463
-nyd_dun02,200,165,0	duplicate(Dragon Egg#ep13_degg_1)	Dragon Egg#ep13_degg13	463
-
-nyd_dun02,201,166,0	script	Dragon Egg#ep13_degg_2	463,{
+nyd_dun02,201,166,0	script	Dragon Egg#ep13_degg_2	4_DRAGON_EGG,{
 	if (checkweight(1201,2) == 0) {
 		mes "- You're carrying too many items. -";
 		close;
@@ -3391,31 +3349,30 @@ nyd_dun02,201,166,0	script	Dragon Egg#ep13_degg_2	463,{
 	if ((ep13_2_dayegg == 1) && (countitem(6093) < 10)) {
 		mes "We just got fresh eggs from the dragon nest.";
 		getitem 6093,1; //Egg_Of_Draco
-		disablenpc strnpcinfo(1);
+		disablenpc strnpcinfo(0);
 		initnpctimer;
 		close;
 	}
 	end;
 
 OnTimer120000:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	stopnpctimer;
 	end;
 
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
+nyd_dun02,201,166,0	duplicate(Dragon Egg#ep13_degg_2)	Dragon Egg#ep13_degg16	4_DRAGON_EGG
+nyd_dun02,203,167,0	duplicate(Dragon Egg#ep13_degg_2)	Dragon Egg#ep13_degg17	4_DRAGON_EGG
+nyd_dun02,201,164,0	duplicate(Dragon Egg#ep13_degg_2)	Dragon Egg#ep13_degg18	4_DRAGON_EGG
 
-nyd_dun02,201,166,0	duplicate(Dragon Egg#ep13_degg_2)	Dragon Egg#ep13_degg16	463
-nyd_dun02,203,167,0	duplicate(Dragon Egg#ep13_degg_2)	Dragon Egg#ep13_degg17	463
-nyd_dun02,201,164,0	duplicate(Dragon Egg#ep13_degg_2)	Dragon Egg#ep13_degg18	463
-
-nyd_dun02,201,157,5	script	Egg Keeper Draco#13_1	2013,3,3,{
+nyd_dun02,201,157,5	script	Egg Keeper Draco#13_1	DRACO,3,3,{
 
 OnEnable:
 	enablenpc "Egg Keeper Draco#13_1";
@@ -3431,7 +3388,7 @@ OnTouch:
 	end;
 }
 
-nyd_dun02,206,157,3	script	Egg Keeper Draco#13_2	2013,3,3,{
+nyd_dun02,206,157,3	script	Egg Keeper Draco#13_2	DRACO,3,3,{
 	end;
 
 OnEnable:
@@ -3474,7 +3431,7 @@ OnTimer180000:
 	end;
 }
 
-nyd_dun02,144,103,3	script	Stranger#ep13_2_dan01	456,3,3,{
+nyd_dun02,144,103,3	script	Stranger#ep13_2_dan01	4_M_DSTMAN,3,3,{
 	end;
 
 OnEnable:
@@ -3485,11 +3442,11 @@ OnDisable:
 	disablenpc "Stranger#ep13_2_dan01";
 	end;
 
-Oncall:
+OnCall:
 	monster "nyd_dun02",144,103,"Runway Dandelion",2026,1,"Stranger#ep13_2_dan03::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan03::OnMyMobDead";
 	end;
 
@@ -3497,11 +3454,11 @@ OnTouch:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan01";
-	donpcevent "Stranger#ep13_2_dan02::Oncall";
+	donpcevent "Stranger#ep13_2_dan02::OnCall";
 	end;
 }
 
-nyd_dun02,206,114,5	script	Stranger#ep13_2_dan02	456,3,3,{
+nyd_dun02,206,114,5	script	Stranger#ep13_2_dan02	4_M_DSTMAN,3,3,{
 	end;
 
 OnInit:
@@ -3513,11 +3470,11 @@ OnEnable:
 	enablenpc "Stranger#ep13_2_dan02";
 	end;
 
-Oncall:
+OnCall:
 	monster "nyd_dun02",206,114,"Runway Dandelion",2026,1,"Stranger#ep13_2_dan04::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan04::OnMyMobDead";
 	end;
 
@@ -3525,7 +3482,7 @@ OnTouch:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan02";
-	donpcevent "Stranger#ep13_2_dan01::Oncall";
+	donpcevent "Stranger#ep13_2_dan01::OnCall";
 	end;
 }
 
@@ -3557,9 +3514,9 @@ OnTimer300000:
 	end;
 }
 
-// Otherworld language
-//============================================================ 
-mid_camp,197,237,3	script	Schwartzvalt Mechanic#1	869,{
+// Otherworld language :: ep13_2_rhea
+//============================================================
+mid_camp,197,237,3	script	Schwartzvalt Mechanic#1	4_M_LGTMAN,{
 	if (ep13_1_edq > 2 || ep13_start == 100) {
 		if (ep13_2_rhea < 1) {
 			mes "[Mechanic Engineer Dorance]";
@@ -3747,7 +3704,7 @@ mid_camp,197,237,3	script	Schwartzvalt Mechanic#1	869,{
 				mes "I hope this ring would be a big help for your journey through the other world.";
 				completequest 8253;
 				set ep13_2_rhea,100;
-				if(checkre(0))
+				if (checkre(3))
 					getexp 200000,5000;
 				else
 					getexp 1000000,300000;
@@ -3792,7 +3749,7 @@ mid_camp,197,237,3	script	Schwartzvalt Mechanic#1	869,{
 	}
 }
 
-mid_campin,168,82,3	script	Arunafeltz Linguist#1	935,{
+mid_campin,168,82,3	script	Arunafeltz Linguist#1	4_M_TRAINEE,{
 	if (ep13_2_rhea < 1) {
 		mes "[Linguist Dictionary]";
 		mes "Language distinguishes humans from animals. Every single intellectual life form has their own language.";
@@ -4218,7 +4175,7 @@ mid_campin,168,82,3	script	Arunafeltz Linguist#1	935,{
 	}
 }
 
-mid_camp,147,256,3	script	Rune Midgarts Magician#1	735,{
+mid_camp,147,256,3	script	Rune Midgarts Magician#1	4_M_JOB_WIZARD,{
 	if (ep13_2_rhea < 4) {
 		mes "[Magician Whisper]";
 		mes "To store a tremendous amount of information, well, it's impossible with existing technology.";
@@ -4562,7 +4519,7 @@ function	script	jewel_13_2	{
 	end;
 }
 
-spl_fild02,27,218,0	script	Half-buried Gem#1	844,{
+spl_fild02,27,218,0	script	Half-buried Gem#1	CLEAR_NPC,{
 	callfunc "jewel_13_2","Red",1;
 
 OnInit:
@@ -4594,7 +4551,7 @@ OnTimer300000:
 	end;
 }
 
-man_fild03,227,109,0	script	Half-buried Gem#2	844,{
+man_fild03,227,109,0	script	Half-buried Gem#2	CLEAR_NPC,{
 	callfunc "jewel_13_2","Blue",2;
 
 OnInit:
@@ -4626,79 +4583,70 @@ OnTimer300000:
 	end;
 }
 
-/*
-mid_camp,7,3,0	script	Translator Preparation#1	708,{
-	mes "[Plot13 Translator Quest Preparation]";
-	mes "Input password.";
+mid_camp,7,3,0	script	Translator Preparation#1	4_M_PAY_SOLDIER,{
+	callfunc "F_GM_NPC";
+	mes "[EP13 Translator Quest Preparation]";
+	mes "First, you must confirm that you are my master.";
 	next;
-	input .@input; //,0,2000;
-	if (.@input == 0) {
+	set .@i, callfunc("F_GM_NPC",1854,0);
+	if (.@i == -1) {
 		mes "[EP 13 Translator Quest Preparation]";
 		mes "Cancelled";
 		close;
-	}
-	else if (.@input == 1854) {
+	} else if (.@i == 0) {
 		mes "[EP 13 Translator Quest Preparation]";
-		mes "I'm the provider of ep13.2 Translator Quest's quest item's NPC" <--Not my fault, they used bad chinese grammar in first place;
+		mes "Try again.";
+		close;
+	} else {
+		mes "[EP 13 Translator Quest Preparation]";
+		mes "I'm the NPC who gives the Episode 13.2 Translator Quest's Linked-Quest Items.";
 		next;
-		mes "What you want?";
+		mes "What would you like to do?";
 		next;
-		switch(select("Finish quest:Accept fairy / giant meetup quest")) {
+		switch(select("Receive EP13.1 Quest:Receive Quest Window - Meeting with Fairy and Giant")) {
 		case 1:
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Acquired the report's quest completion item";
+			mes "Episode 13.1 - The Report Quest Reward Item Received.";
 			next;
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Current report quest's item is "+ ep13_1_edq +" ";
-			mes "Start Quest?";
+			mes "Currently the Report Quest's Set Item is "+ep13_1_edq+".";
+			mes "Do you want to proceed?";
 			next;
-			switch(select("Yes:No")) {
-			case 1:
+			if(select("No:Yes") == 1) {
 				mes "[EP 13 Translator Quest Preparation]";
 				mes "Cancelled";
 				close;
-			case 2:
-				break;
 			}
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Acquired the report's quest completion item";
+			mes "Episode 13.1 - The Report Quest Reward Item Received.";
 			set ep13_1_edq,14;
 			close;
 		case 2:
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Accept the fairy / giant meetup quest";
+			mes "Episode 13.1 - Receiving the Quest window - Meeting with Fairy and Giant.";
 			next;
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Start Quest?";
+			mes "Do you want to proceed?";
 			next;
-			switch(select("Yes:No")) {
-			case 1:
+			if(select("No:Yes") == 1) {
 				mes "[EP 13 Translator Quest Preparation]";
 				mes "Cancelled";
 				close;
-			case 2:
-				break;
 			}
 			mes "[EP 13 Translator Quest Preparation]";
-			mes "Acquired the report's quest completion item";
+			mes "Episode 13.1 - The Report Quest Reward Item Received.";
 			setquest 2158;
 			setquest 2159;
 			close;
 		}
 	}
-	else {
-		mes "[EP 13 Translator Quest Preparation]";
-		mes "Please try again";
-		close;
-	}
 }
-*/
 
-// Daily Quests
+// Daily Quests :: ep13_2_tre
 // - Midgard Ore
 // - Alfheim Perfume
-//============================================================ 
-man_in01,372,221,5	script	Scientist#lifeguard	449,{
+//============================================================
+man_in01,372,221,5	script	Scientist#lifeguard	4_MAN_BENKUNI,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Dr. Lifeguard]";
 		if (ep13_2_tre == 0) {
@@ -4844,12 +4792,9 @@ man_in01,372,221,5	script	Scientist#lifeguard	449,{
 				delitem 6078,.@stoneelse_chk; //Stone_Fragments
 				delitem 6076,1; //Portable_Toolbox
 				getitem 6080,3; //Manuk_Coin
+				getexp 0,(checkre(3))?50000:700000; //unconfirmed (RE)
 				changequest 2179+(ep13_2_tre-2),2182;
 				set ep13_2_tre,100;
-				if(checkre(0))
-					close;
-				else
-					getexp 0,700000;
 				close;
 			}
 			else {
@@ -4876,11 +4821,11 @@ man_in01,372,221,5	script	Scientist#lifeguard	449,{
 
 function	script	find_13_2	{
 	switch (getarg(0)) {
-		case 0: setarray .@Check[0],2,10; set .@str$,"Mt. Mjolnir"; break;
-		case 1: setarray .@Check[0],3,5; set .@str$,"Abyss Lake"; break;
-		case 2: setarray .@Check[0],4,5; set .@str$,"Thor Volcano"; break;
+		case 0: setarray .@check[0],2,10; set .@str$,"Mt. Mjolnir"; break;
+		case 1: setarray .@check[0],3,5; set .@str$,"Abyss Lake"; break;
+		case 2: setarray .@check[0],4,5; set .@str$,"Thor Volcano"; break;
 	}
-	if (ep13_2_tre != .@Check[0] || countitem(6076) != 1 || countitem(6077) >= .@Check[1]) end;
+	if (ep13_2_tre != .@check[0] || countitem(6076) != 1 || countitem(6077) >= .@check[1]) end;
 	mes "- Just arrived at "+.@str$+". I think I can find the mineral by using the Mineral Detector in the Portable Toolbox. -";
 	next;
 	switch(select("Check current location.:Do nothing.")) {
@@ -4980,14 +4925,14 @@ OnTouch:
 	end;
 }
 
-mjolnir_01,32,309,3	duplicate(mjo_find)	#mj01_01	111,7,7
-mjolnir_01,217,34,3	duplicate(mjo_find)	#mj01_02	111,7,7
-mjolnir_02,90,195,3	duplicate(mjo_find)	#mj02_01	111,5,10
-mjolnir_02,206,187,3	duplicate(mjo_find)	#mj02_02	111,7,7
-mjolnir_04,125,380,3	duplicate(mjo_find)	#mj04_01	111,7,7
-mjolnir_04,220,130,3	duplicate(mjo_find)	#mj04_02	111,7,7
-mjolnir_09,229,214,3	duplicate(mjo_find)	#mj09_01	111,10,10
-mjolnir_10,188,260,3	duplicate(mjo_find)	#mj10_01	111,10,10
+mjolnir_01,32,309,3	duplicate(mjo_find)	#mj01_01	HIDDEN_NPC,7,7
+mjolnir_01,217,34,3	duplicate(mjo_find)	#mj01_02	HIDDEN_NPC,7,7
+mjolnir_02,90,195,3	duplicate(mjo_find)	#mj02_01	HIDDEN_NPC,5,10
+mjolnir_02,206,187,3	duplicate(mjo_find)	#mj02_02	HIDDEN_NPC,7,7
+mjolnir_04,125,380,3	duplicate(mjo_find)	#mj04_01	HIDDEN_NPC,7,7
+mjolnir_04,220,130,3	duplicate(mjo_find)	#mj04_02	HIDDEN_NPC,7,7
+mjolnir_09,229,214,3	duplicate(mjo_find)	#mj09_01	HIDDEN_NPC,10,10
+mjolnir_10,188,260,3	duplicate(mjo_find)	#mj10_01	HIDDEN_NPC,10,10
 
 mjolnir_01,364,256,0	script	#mj01_find	-1,5,5,{
 	end;
@@ -4999,7 +4944,7 @@ OnTouch:
 	close;
 }
 
-mjolnir_01,1,1,3	script	#mj01_01_t	111,{
+mjolnir_01,1,1,3	script	#mj01_01_t	HIDDEN_NPC,{
 	end;
 
 OnEnable:
@@ -5012,7 +4957,7 @@ OnTimer60000:
 	end;
 }
 
-mjolnir_01,1,1,3	script	#mj01_02_t	111,{
+mjolnir_01,1,1,3	script	#mj01_02_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5044,7 +4989,7 @@ OnTouch:
 }
 
 
-mjolnir_02,1,1,3	script	#mj02_01_t	111,{
+mjolnir_02,1,1,3	script	#mj02_01_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5055,7 +5000,7 @@ OnTimer60000:
 	end;
 }
 
-mjolnir_02,1,1,3	script	#mj02_02_t	111,{
+mjolnir_02,1,1,3	script	#mj02_02_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5096,7 +5041,7 @@ OnTouch:
 	close;
 }
 
-mjolnir_04,1,1,3	script	#mj04_01_t	111,{
+mjolnir_04,1,1,3	script	#mj04_01_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5107,7 +5052,7 @@ OnTimer60000:
 	end;
 }
 
-mjolnir_04,1,1,3	script	#mj04_02_t	111,{
+mjolnir_04,1,1,3	script	#mj04_02_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5163,7 +5108,7 @@ OnTouch:
 	close;
 }
 
-mjolnir_09,1,1,3	script	#mj09_01_t	111,{
+mjolnir_09,1,1,3	script	#mj09_01_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5219,7 +5164,7 @@ OnTouch:
 	close;
 }
 
-mjolnir_10,1,1,3	script	#mj10_01_t	111,{
+mjolnir_10,1,1,3	script	#mj10_01_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5330,13 +5275,13 @@ OnTouch:
 	end;
 }
 
-hu_fild05,251,345,3	duplicate(hu_find)	#hu_01	111,10,10
-hu_fild05,134,322,3	duplicate(hu_find)	#hu_02	111,10,10
-hu_fild05,72,104,3	duplicate(hu_find)	#hu_03	111,10,10
-hu_fild05,65,99,3	duplicate(hu_find)	#hu_04	111,10,10
-hu_fild05,323,84,3	duplicate(hu_find)	#hu_05	111,10,10
+hu_fild05,251,345,3	duplicate(hu_find)	#hu_01	HIDDEN_NPC,10,10
+hu_fild05,134,322,3	duplicate(hu_find)	#hu_02	HIDDEN_NPC,10,10
+hu_fild05,72,104,3	duplicate(hu_find)	#hu_03	HIDDEN_NPC,10,10
+hu_fild05,65,99,3	duplicate(hu_find)	#hu_04	HIDDEN_NPC,10,10
+hu_fild05,323,84,3	duplicate(hu_find)	#hu_05	HIDDEN_NPC,10,10
 
-hu_fild05,1,1,3	script	#hu_01_t	111,{
+hu_fild05,1,1,3	script	#hu_01_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5347,7 +5292,7 @@ OnTimer60000:
 	end;
 }
 
-hu_fild05,1,1,3	script	#hu_02_t	111,{
+hu_fild05,1,1,3	script	#hu_02_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5358,7 +5303,7 @@ OnTimer60000:
 	end;
 }
 
-hu_fild05,1,1,3	script	#hu_03_t	111,{
+hu_fild05,1,1,3	script	#hu_03_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5369,7 +5314,7 @@ OnTimer60000:
 	end;
 }
 
-hu_fild05,1,1,3	script	#hu_04_t	111,{
+hu_fild05,1,1,3	script	#hu_04_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5380,7 +5325,7 @@ OnTimer60000:
 	end;
 }
 
-hu_fild05,1,1,3	script	#hu_05_t	111,{
+hu_fild05,1,1,3	script	#hu_05_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5463,12 +5408,12 @@ OnTouch:
 	end;
 }
 
-ve_fild03,152,134,3	duplicate(ve_find)	#ve_01	111,10,10
-ve_fild03,256,228,3	duplicate(ve_find)	#ve_02	111,10,10
-ve_fild03,85,189,3	duplicate(ve_find)	#ve_03	111,10,10
-ve_fild03,282,268,3	duplicate(ve_find)	#ve_04	111,10,10
+ve_fild03,152,134,3	duplicate(ve_find)	#ve_01	HIDDEN_NPC,10,10
+ve_fild03,256,228,3	duplicate(ve_find)	#ve_02	HIDDEN_NPC,10,10
+ve_fild03,85,189,3	duplicate(ve_find)	#ve_03	HIDDEN_NPC,10,10
+ve_fild03,282,268,3	duplicate(ve_find)	#ve_04	HIDDEN_NPC,10,10
 
-ve_fild03,1,1,3	script	#ve_01_t	111,{
+ve_fild03,1,1,3	script	#ve_01_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5479,7 +5424,7 @@ OnTimer40000:
 	end;
 }
 
-ve_fild03,1,1,3	script	#ve_02_t	111,{
+ve_fild03,1,1,3	script	#ve_02_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5490,7 +5435,7 @@ OnTimer40000:
 	end;
 }
 
-ve_fild03,1,1,3	script	#ve_03_t	111,{
+ve_fild03,1,1,3	script	#ve_03_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5501,7 +5446,7 @@ OnTimer40000:
 	end;
 }
 
-ve_fild03,1,1,3	script	#ve_04_t	111,{
+ve_fild03,1,1,3	script	#ve_04_t	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5512,7 +5457,7 @@ OnTimer40000:
 	end;
 }
 
-spl_in01,30,324,3	script	High Laphine#grenouille	446,{
+spl_in01,30,324,3	script	High Laphine#grenouille	4_M_FAIRYKID5,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		if (checkweight(1201,1) == 0) {
 			mes "[Grenouille]";
@@ -5714,10 +5659,8 @@ spl_in01,30,324,3	script	High Laphine#grenouille	446,{
 					set ep13_2_tre1,6;
 					changequest 2185,2186;
 					getitem 6081,3; //Splendide_Coin
-					if(checkre(0))
-						close;
-					else
-						getexp 0,700000;
+					if (checkre(3) == 0)
+						getexp 0,(checkre(3))?50000:700000; //unconfirmed (RE)
 					close;
 				}
 				else {
@@ -5748,7 +5691,7 @@ spl_in01,30,324,3	script	High Laphine#grenouille	446,{
 	}
 }
 
-spl_in02,139,65,3	script	Middle-Ranked Laphine#la	438,{
+spl_in02,139,65,3	script	Middle-Ranked Laphine#la	4_F_FAIRYKID3,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		if (checkweight(1201,1) == 0) {
 			mes "[Flowery]";
@@ -5853,14 +5796,14 @@ spl_in02,139,65,3	script	Middle-Ranked Laphine#la	438,{
 	end;
 }
 
-splendide,160,265,3	duplicate(Purifier)	Purifier#1	844
-splendide,262,262,3	duplicate(Purifier)	Purifier#2	844
-splendide,262,187,3	duplicate(Purifier)	Purifier#3	844
-splendide,164,82,3	duplicate(Purifier)	Purifier#4	844
-splendide,171,116,3	duplicate(Purifier)	Purifier#5	844
-splendide,134,280,3	duplicate(Purifier)	Purifier#6	844
+splendide,160,265,3	duplicate(Purifier)	Purifier#1	CLEAR_NPC
+splendide,262,262,3	duplicate(Purifier)	Purifier#2	CLEAR_NPC
+splendide,262,187,3	duplicate(Purifier)	Purifier#3	CLEAR_NPC
+splendide,164,82,3	duplicate(Purifier)	Purifier#4	CLEAR_NPC
+splendide,171,116,3	duplicate(Purifier)	Purifier#5	CLEAR_NPC
+splendide,134,280,3	duplicate(Purifier)	Purifier#6	CLEAR_NPC
 
-splendide,205,139,5	script	Exhausted Soldier#1	447,{
+splendide,205,139,5	script	Exhausted Soldier#1	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		if (ep13_2_tre1 == 5) {
 			if (countitem(6082) > 0) {
@@ -5909,7 +5852,7 @@ OnInit:
 	end;
 }
 
-splendide,1,1,1	script	#tukare_1	111,{
+splendide,1,1,1	script	#tukare_1	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5920,7 +5863,7 @@ OnTimer60000:
 	end;
 }
 
-splendide,181,135,5	script	Exhausted Soldier#2	447,{
+splendide,181,135,5	script	Exhausted Soldier#2	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		if (ep13_2_tre1 == 5) {
 			if (countitem(6082) > 0) {
@@ -5966,7 +5909,7 @@ OnInit:
 	end;
 }
 
-splendide,1,1,1	script	#tukare_2	111,{
+splendide,1,1,1	script	#tukare_2	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -5977,7 +5920,7 @@ OnTimer60000:
 	end;
 }
 
-splendide,139,178,5	script	Exhausted Soldier#3	447,{
+splendide,139,178,5	script	Exhausted Soldier#3	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		if (ep13_2_tre1 == 5) {
 			if (countitem(6082) > 0) {
@@ -6026,7 +5969,7 @@ OnInit:
 	end;
 }
 
-splendide,1,1,1	script	#tukare_3	111,{
+splendide,1,1,1	script	#tukare_3	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -6037,7 +5980,7 @@ OnTimer60000:
 	end;
 }
 
-splendide,164,188,5	script	Exhausted Soldier#4	447,{
+splendide,164,188,5	script	Exhausted Soldier#4	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		if (ep13_2_tre1 == 5) {
 			if (countitem(6082) > 0) {
@@ -6086,7 +6029,7 @@ OnInit:
 	end;
 }
 
-splendide,1,1,1	script	#tukare_4	111,{
+splendide,1,1,1	script	#tukare_4	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -6097,7 +6040,7 @@ OnTimer60000:
 	end;
 }
 
-splendide,177,257,5	script	Exhausted Soldier#5	447,{
+splendide,177,257,5	script	Exhausted Soldier#5	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		if (ep13_2_tre1 == 5) {
 			if (countitem(6082) > 0) {
@@ -6146,7 +6089,7 @@ OnInit:
 	end;
 }
 
-splendide,1,1,1	script	#tukare_5	111,{
+splendide,1,1,1	script	#tukare_5	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -6157,7 +6100,7 @@ OnTimer60000:
 	end;
 }
 
-splendide,124,212,5	script	Exhausted Soldier#6	447,{
+splendide,124,212,5	script	Exhausted Soldier#6	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		if (ep13_2_tre1 == 5) {
 			if (countitem(6082) > 0) {
@@ -6206,7 +6149,7 @@ OnInit:
 	end;
 }
 
-splendide,1,1,1	script	#tukare_6	111,{
+splendide,1,1,1	script	#tukare_6	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -6217,7 +6160,7 @@ OnTimer60000:
 	end;
 }
 
-splendide,196,153,5	script	Exhausted Soldier#7	447,{
+splendide,196,153,5	script	Exhausted Soldier#7	4_M_FAIRYSOLDIER,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		if (ep13_2_tre1 == 5) {
 			if (countitem(6082) > 0) {
@@ -6266,7 +6209,7 @@ OnInit:
 	end;
 }
 
-splendide,1,1,1	script	#tukare_7	111,{
+splendide,1,1,1	script	#tukare_7	HIDDEN_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -6277,9 +6220,9 @@ OnTimer60000:
 	end;
 }
 
-// Secret note of Bazett
-//============================================================ 
-mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
+// Secret note of Bazett :: ep13_2_dailybs
+//============================================================
+mid_camp,283,198,5	script	Bazett Teablack#ep13bs	4_M_ALCHE_D,{
 	if (checkweight(1201,1) == 0) {
 		mes " - Hold on!! -";
 		mes " - You are carrying too many different items - ";
@@ -6678,7 +6621,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 	}
 }
 
-manuk,193,135,0	script	Worker#ep13bs	454,{
+manuk,193,135,0	script	Worker#ep13bs	4_MAN_PIOM,{
 	if (isequipped(2782) == 1) {
 		if (ep13_2_busut == 3) {
 			if (ep13_2_bs1 == 1) {
@@ -6943,9 +6886,9 @@ manuk,193,135,0	script	Worker#ep13bs	454,{
 	}
 }
 
-// Yggdrasil Dungeon Floor 2 puzzle.
-//============================================================ 
-nyd_dun02,178,255,0	script	Strange Device#ep13_out	844,3,3,{
+// Yggdrasil Dungeon Floor 2 puzzle :: ny_dun02_puzzle
+//============================================================
+nyd_dun02,178,255,0	script	Strange Device#ep13_out	CLEAR_NPC,3,3,{
 	mes "There's something strange here.";
 	mes "Maybe that device can be controlled from here.";
 	next;
@@ -6966,7 +6909,7 @@ OnTouch:
 	end;
 }
 
-nyd_dun02,139,274,0	script	Strange Device#ep13_in	844,3,3,{
+nyd_dun02,139,274,0	script	Strange Device#ep13_in	CLEAR_NPC,3,3,{
 	if ($@08_ep13nydun02_in == 1) {
 		mes "The device has already been activated.";
 		mes "You must wait for the controls to reset.";
@@ -7012,7 +6955,7 @@ nyd_dun02,139,274,0	script	Strange Device#ep13_in	844,3,3,{
 	end;
 
 OnTimer70000:
-	donpcevent "ep13_nd2f_mng::Onreset";
+	donpcevent "ep13_nd2f_mng::OnReset";
 	set $@08_ep13nydun02_in,0;
 	stopnpctimer;
 	end;
@@ -7024,7 +6967,7 @@ OnTouch:
 
 -	script	ep13_warp_s_0	-1,{
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	initnpctimer;
 OnTimer2000:
 OnTimer4000:
@@ -7038,18 +6981,18 @@ OnTimer8000:
 
 OnTimer10000:
 	specialeffect EF_STEAL;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
 	specialeffect EF_WIND;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
 
 -	script	ep13_warp_s_1	-1,{
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	initnpctimer;
 OnTimer2000:
 OnTimer4000:
@@ -7064,18 +7007,18 @@ OnTimer10000:
 
 OnTimer12000:
 	specialeffect EF_STEAL;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
 	specialeffect EF_WIND;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
 
 -	script	ep13_warp_s_2	-1,{
 OnEnable:
-	enablenpc strnpcinfo(1);
+	enablenpc strnpcinfo(0);
 	initnpctimer;
 OnTimer2000:
 OnTimer4000:
@@ -7091,12 +7034,12 @@ OnTimer12000:
 
 OnTimer15000:
 	specialeffect EF_STEAL;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
 	specialeffect EF_WIND;
-	disablenpc strnpcinfo(1);
+	disablenpc strnpcinfo(0);
 	end;
 }
 
@@ -7106,69 +7049,69 @@ OnTouch:
 	end;
 }
 
-nyd_dun02,143,272,0	duplicate(ep13_warp_s_0)	ep13_warp_s1	139
-nyd_dun02,143,266,0	duplicate(ep13_warp_s_0)	ep13_warp_s3	139
-nyd_dun02,146,272,0	duplicate(ep13_warp_s_0)	ep13_warp_11	139
-nyd_dun02,146,266,0	duplicate(ep13_warp_s_0)	ep13_warp_13	139
-nyd_dun02,149,260,0	duplicate(ep13_warp_s_0)	ep13_warp_25	139
-nyd_dun02,149,257,0	duplicate(ep13_warp_s_0)	ep13_warp_26	139
-nyd_dun02,152,270,0	duplicate(ep13_warp_s_0)	ep13_warp_31	139
-nyd_dun02,152,264,0	duplicate(ep13_warp_s_0)	ep13_warp_33	139
-nyd_dun02,155,269,0	duplicate(ep13_warp_s_0)	ep13_warp_41	139
-nyd_dun02,155,254,0	duplicate(ep13_warp_s_0)	ep13_warp_46	139
-nyd_dun02,158,263,0	duplicate(ep13_warp_s_0)	ep13_warp_52	139
-nyd_dun02,158,254,0	duplicate(ep13_warp_s_0)	ep13_warp_55	139
-nyd_dun02,161,261,0	duplicate(ep13_warp_s_0)	ep13_warp_62	139
-nyd_dun02,161,255,0	duplicate(ep13_warp_s_0)	ep13_warp_64	139
-nyd_dun02,161,249,0	duplicate(ep13_warp_s_0)	ep13_warp_66	139
-nyd_dun02,164,261,0	duplicate(ep13_warp_s_0)	ep13_warp_71	139
-nyd_dun02,164,255,0	duplicate(ep13_warp_s_0)	ep13_warp_73	139
-nyd_dun02,164,249,0	duplicate(ep13_warp_s_0)	ep13_warp_75	139
-nyd_dun02,167,249,0	duplicate(ep13_warp_s_0)	ep13_warp_84	139
-nyd_dun02,170,257,0	duplicate(ep13_warp_s_0)	ep13_warp_91	139
-nyd_dun02,170,254,0	duplicate(ep13_warp_s_0)	ep13_warp_92	139
-nyd_dun02,170,248,0	duplicate(ep13_warp_s_0)	ep13_warp_94	139
-nyd_dun02,170,245,0	duplicate(ep13_warp_s_0)	ep13_warp_95	139
-
-nyd_dun02,146,263,0	duplicate(ep13_warp_s_1)	ep13_warp_14	139
-nyd_dun02,149,272,0	duplicate(ep13_warp_s_1)	ep13_warp_21	139
-nyd_dun02,152,258,0	duplicate(ep13_warp_s_1)	ep13_warp_35	139
-nyd_dun02,155,266,0	duplicate(ep13_warp_s_1)	ep13_warp_42	139
-nyd_dun02,158,251,0	duplicate(ep13_warp_s_1)	ep13_warp_56	139
-nyd_dun02,164,258,0	duplicate(ep13_warp_s_1)	ep13_warp_72	139
-nyd_dun02,164,246,0	duplicate(ep13_warp_s_1)	ep13_warp_76	139
-nyd_dun02,167,255,0	duplicate(ep13_warp_s_1)	ep13_warp_82	139
-nyd_dun02,170,251,0	duplicate(ep13_warp_s_1)	ep13_warp_93	139
-
-nyd_dun02,149,269,0	duplicate(ep13_warp_s_2)	ep13_warp_22	139
-nyd_dun02,149,263,0	duplicate(ep13_warp_s_2)	ep13_warp_24	139
-nyd_dun02,155,263,0	duplicate(ep13_warp_s_2)	ep13_warp_43	139
-nyd_dun02,155,257,0	duplicate(ep13_warp_s_2)	ep13_warp_45	139
-nyd_dun02,161,264,0	duplicate(ep13_warp_s_2)	ep13_warp_61	139
-nyd_dun02,161,252,0	duplicate(ep13_warp_s_2)	ep13_warp_65	139
-nyd_dun02,167,258,0	duplicate(ep13_warp_s_2)	ep13_warp_81	139
-nyd_dun02,167,252,0	duplicate(ep13_warp_s_2)	ep13_warp_83	139
-nyd_dun02,167,246,0	duplicate(ep13_warp_s_2)	ep13_warp_85	139
-nyd_dun02,173,251,0	duplicate(ep13_warp_s_2)	ep13_warp_e1	139
-nyd_dun02,173,248,0	duplicate(ep13_warp_s_2)	ep13_warp_e2	139
-nyd_dun02,173,245,0	duplicate(ep13_warp_s_2)	ep13_warp_e3	139
-
-nyd_dun02,143,269,0	duplicate(ep13_warp_w_0)	ep13_warp_s2	139,1,1
-nyd_dun02,143,263,0	duplicate(ep13_warp_w_0)	ep13_warp_s4	139,1,1
-nyd_dun02,146,269,0	duplicate(ep13_warp_w_0)	ep13_warp_12	139,1,1
-nyd_dun02,146,260,0	duplicate(ep13_warp_w_0)	ep13_warp_15	139,1,1
-nyd_dun02,149,266,0	duplicate(ep13_warp_w_0)	ep13_warp_23	139,1,1
-nyd_dun02,152,267,0	duplicate(ep13_warp_w_0)	ep13_warp_32	139,1,1
-nyd_dun02,152,261,0	duplicate(ep13_warp_w_0)	ep13_warp_34	139,1,1
-nyd_dun02,155,260,0	duplicate(ep13_warp_w_0)	ep13_warp_44	139,1,1
-nyd_dun02,158,266,0	duplicate(ep13_warp_w_0)	ep13_warp_51	139,1,1
-nyd_dun02,158,260,0	duplicate(ep13_warp_w_0)	ep13_warp_53	139,1,1
-nyd_dun02,158,257,0	duplicate(ep13_warp_w_0)	ep13_warp_54	139,1,1
-nyd_dun02,161,258,0	duplicate(ep13_warp_w_0)	ep13_warp_63	139,1,1
-nyd_dun02,164,252,0	duplicate(ep13_warp_w_0)	ep13_warp_74	139,1,1
-nyd_dun02,173,242,0	duplicate(ep13_warp_w_0)	ep13_warp_e4	139,1,1
-
-nyd_dun02,149,269,0	script	ep13_warp_22_2	139,1,1,{
+nyd_dun02,143,272,0	duplicate(ep13_warp_s_0)	ep13_warp_s1	HIDDEN_WARP_NPC
+nyd_dun02,143,266,0	duplicate(ep13_warp_s_0)	ep13_warp_s3	HIDDEN_WARP_NPC
+nyd_dun02,146,272,0	duplicate(ep13_warp_s_0)	ep13_warp_11	HIDDEN_WARP_NPC
+nyd_dun02,146,266,0	duplicate(ep13_warp_s_0)	ep13_warp_13	HIDDEN_WARP_NPC
+nyd_dun02,149,260,0	duplicate(ep13_warp_s_0)	ep13_warp_25	HIDDEN_WARP_NPC
+nyd_dun02,149,257,0	duplicate(ep13_warp_s_0)	ep13_warp_26	HIDDEN_WARP_NPC
+nyd_dun02,152,270,0	duplicate(ep13_warp_s_0)	ep13_warp_31	HIDDEN_WARP_NPC
+nyd_dun02,152,264,0	duplicate(ep13_warp_s_0)	ep13_warp_33	HIDDEN_WARP_NPC
+nyd_dun02,155,269,0	duplicate(ep13_warp_s_0)	ep13_warp_41	HIDDEN_WARP_NPC
+nyd_dun02,155,254,0	duplicate(ep13_warp_s_0)	ep13_warp_46	HIDDEN_WARP_NPC
+nyd_dun02,158,263,0	duplicate(ep13_warp_s_0)	ep13_warp_52	HIDDEN_WARP_NPC
+nyd_dun02,158,254,0	duplicate(ep13_warp_s_0)	ep13_warp_55	HIDDEN_WARP_NPC
+nyd_dun02,161,261,0	duplicate(ep13_warp_s_0)	ep13_warp_62	HIDDEN_WARP_NPC
+nyd_dun02,161,255,0	duplicate(ep13_warp_s_0)	ep13_warp_64	HIDDEN_WARP_NPC
+nyd_dun02,161,249,0	duplicate(ep13_warp_s_0)	ep13_warp_66	HIDDEN_WARP_NPC
+nyd_dun02,164,261,0	duplicate(ep13_warp_s_0)	ep13_warp_71	HIDDEN_WARP_NPC
+nyd_dun02,164,255,0	duplicate(ep13_warp_s_0)	ep13_warp_73	HIDDEN_WARP_NPC
+nyd_dun02,164,249,0	duplicate(ep13_warp_s_0)	ep13_warp_75	HIDDEN_WARP_NPC
+nyd_dun02,167,249,0	duplicate(ep13_warp_s_0)	ep13_warp_84	HIDDEN_WARP_NPC
+nyd_dun02,170,257,0	duplicate(ep13_warp_s_0)	ep13_warp_91	HIDDEN_WARP_NPC
+nyd_dun02,170,254,0	duplicate(ep13_warp_s_0)	ep13_warp_92	HIDDEN_WARP_NPC
+nyd_dun02,170,248,0	duplicate(ep13_warp_s_0)	ep13_warp_94	HIDDEN_WARP_NPC
+nyd_dun02,170,245,0	duplicate(ep13_warp_s_0)	ep13_warp_95	HIDDEN_WARP_NPC
+
+nyd_dun02,146,263,0	duplicate(ep13_warp_s_1)	ep13_warp_14	HIDDEN_WARP_NPC
+nyd_dun02,149,272,0	duplicate(ep13_warp_s_1)	ep13_warp_21	HIDDEN_WARP_NPC
+nyd_dun02,152,258,0	duplicate(ep13_warp_s_1)	ep13_warp_35	HIDDEN_WARP_NPC
+nyd_dun02,155,266,0	duplicate(ep13_warp_s_1)	ep13_warp_42	HIDDEN_WARP_NPC
+nyd_dun02,158,251,0	duplicate(ep13_warp_s_1)	ep13_warp_56	HIDDEN_WARP_NPC
+nyd_dun02,164,258,0	duplicate(ep13_warp_s_1)	ep13_warp_72	HIDDEN_WARP_NPC
+nyd_dun02,164,246,0	duplicate(ep13_warp_s_1)	ep13_warp_76	HIDDEN_WARP_NPC
+nyd_dun02,167,255,0	duplicate(ep13_warp_s_1)	ep13_warp_82	HIDDEN_WARP_NPC
+nyd_dun02,170,251,0	duplicate(ep13_warp_s_1)	ep13_warp_93	HIDDEN_WARP_NPC
+
+nyd_dun02,149,269,0	duplicate(ep13_warp_s_2)	ep13_warp_22	HIDDEN_WARP_NPC
+nyd_dun02,149,263,0	duplicate(ep13_warp_s_2)	ep13_warp_24	HIDDEN_WARP_NPC
+nyd_dun02,155,263,0	duplicate(ep13_warp_s_2)	ep13_warp_43	HIDDEN_WARP_NPC
+nyd_dun02,155,257,0	duplicate(ep13_warp_s_2)	ep13_warp_45	HIDDEN_WARP_NPC
+nyd_dun02,161,264,0	duplicate(ep13_warp_s_2)	ep13_warp_61	HIDDEN_WARP_NPC
+nyd_dun02,161,252,0	duplicate(ep13_warp_s_2)	ep13_warp_65	HIDDEN_WARP_NPC
+nyd_dun02,167,258,0	duplicate(ep13_warp_s_2)	ep13_warp_81	HIDDEN_WARP_NPC
+nyd_dun02,167,252,0	duplicate(ep13_warp_s_2)	ep13_warp_83	HIDDEN_WARP_NPC
+nyd_dun02,167,246,0	duplicate(ep13_warp_s_2)	ep13_warp_85	HIDDEN_WARP_NPC
+nyd_dun02,173,251,0	duplicate(ep13_warp_s_2)	ep13_warp_e1	HIDDEN_WARP_NPC
+nyd_dun02,173,248,0	duplicate(ep13_warp_s_2)	ep13_warp_e2	HIDDEN_WARP_NPC
+nyd_dun02,173,245,0	duplicate(ep13_warp_s_2)	ep13_warp_e3	HIDDEN_WARP_NPC
+
+nyd_dun02,143,269,0	duplicate(ep13_warp_w_0)	ep13_warp_s2	HIDDEN_WARP_NPC,1,1
+nyd_dun02,143,263,0	duplicate(ep13_warp_w_0)	ep13_warp_s4	HIDDEN_WARP_NPC,1,1
+nyd_dun02,146,269,0	duplicate(ep13_warp_w_0)	ep13_warp_12	HIDDEN_WARP_NPC,1,1
+nyd_dun02,146,260,0	duplicate(ep13_warp_w_0)	ep13_warp_15	HIDDEN_WARP_NPC,1,1
+nyd_dun02,149,266,0	duplicate(ep13_warp_w_0)	ep13_warp_23	HIDDEN_WARP_NPC,1,1
+nyd_dun02,152,267,0	duplicate(ep13_warp_w_0)	ep13_warp_32	HIDDEN_WARP_NPC,1,1
+nyd_dun02,152,261,0	duplicate(ep13_warp_w_0)	ep13_warp_34	HIDDEN_WARP_NPC,1,1
+nyd_dun02,155,260,0	duplicate(ep13_warp_w_0)	ep13_warp_44	HIDDEN_WARP_NPC,1,1
+nyd_dun02,158,266,0	duplicate(ep13_warp_w_0)	ep13_warp_51	HIDDEN_WARP_NPC,1,1
+nyd_dun02,158,260,0	duplicate(ep13_warp_w_0)	ep13_warp_53	HIDDEN_WARP_NPC,1,1
+nyd_dun02,158,257,0	duplicate(ep13_warp_w_0)	ep13_warp_54	HIDDEN_WARP_NPC,1,1
+nyd_dun02,161,258,0	duplicate(ep13_warp_w_0)	ep13_warp_63	HIDDEN_WARP_NPC,1,1
+nyd_dun02,164,252,0	duplicate(ep13_warp_w_0)	ep13_warp_74	HIDDEN_WARP_NPC,1,1
+nyd_dun02,173,242,0	duplicate(ep13_warp_w_0)	ep13_warp_e4	HIDDEN_WARP_NPC,1,1
+
+nyd_dun02,149,269,0	script	ep13_warp_22_2	HIDDEN_WARP_NPC,1,1,{
 OnInit:
 OnDisable:
 	disablenpc "ep13_warp_22_2";
@@ -7188,7 +7131,7 @@ OnTouch:
 	end;
 }
 
-nyd_dun02,149,263,0	script	ep13_warp_24_2	139,1,1,{
+nyd_dun02,149,263,0	script	ep13_warp_24_2	HIDDEN_WARP_NPC,1,1,{
 OnEnable:
 	enablenpc "ep13_warp_24_2";
 	end;
@@ -7212,7 +7155,7 @@ OnDisable:
 	end;
 }
 
-nyd_dun02,155,263,0	script	ep13_warp_43_2	139,1,1,{
+nyd_dun02,155,263,0	script	ep13_warp_43_2	HIDDEN_WARP_NPC,1,1,{
 OnInit:
 OnDisable:
 	disablenpc "ep13_warp_43_2";
@@ -7230,7 +7173,7 @@ OnTouch:
 	end;
 }
 
-nyd_dun02,155,257,0	script	ep13_warp_45_2	139,1,1,{
+nyd_dun02,155,257,0	script	ep13_warp_45_2	HIDDEN_WARP_NPC,1,1,{
 OnInit:
 OnDisable:
 	disablenpc "ep13_warp_45_2";
@@ -7250,7 +7193,7 @@ OnTouch:
 	end;
 }
 
-nyd_dun02,161,264,0	script	ep13_warp_61_2	139,1,1,{
+nyd_dun02,161,264,0	script	ep13_warp_61_2	HIDDEN_WARP_NPC,1,1,{
 OnInit:
 OnDisable:
 	disablenpc "ep13_warp_61_2";
@@ -7270,7 +7213,7 @@ OnTouch:
 	end;
 }
 
-nyd_dun02,161,252,0	script	ep13_warp_65_2	139,1,1,{
+nyd_dun02,161,252,0	script	ep13_warp_65_2	HIDDEN_WARP_NPC,1,1,{
 OnEnable:
 	enablenpc "ep13_warp_65_2";
 	end;
@@ -7296,7 +7239,7 @@ OnDisable:
 	end;
 }
 
-nyd_dun02,167,258,0	script	ep13_warp_81_2	139,1,1,{
+nyd_dun02,167,258,0	script	ep13_warp_81_2	HIDDEN_WARP_NPC,1,1,{
 OnInit:
 OnDisable:
 	disablenpc "ep13_warp_81_2";
@@ -7315,7 +7258,7 @@ OnTouch:
 	end;
 }
 
-nyd_dun02,167,252,0	script	ep13_warp_83_2	139,1,1,{
+nyd_dun02,167,252,0	script	ep13_warp_83_2	HIDDEN_WARP_NPC,1,1,{
 OnInit:
 OnDisable:
 	disablenpc "ep13_warp_83_2";
@@ -7333,7 +7276,7 @@ OnTouch:
 	end;
 }
 
-nyd_dun02,167,246,0	script	ep13_warp_85_2	139,1,1,{
+nyd_dun02,167,246,0	script	ep13_warp_85_2	HIDDEN_WARP_NPC,1,1,{
 OnInit:
 OnDisable:
 	disablenpc "ep13_warp_85_2";
@@ -7353,32 +7296,29 @@ OnTouch:
 nyd_dun01,255,142,0	warp	nynm_dun1f_to_2f	1,1,nyd_dun02,61,265
 nyd_dun02,56,264,0	warp	nynm_dun2f_to_1f	1,1,nyd_dun01,249,143
 
-//==============================================================================
-nyd_dun02,1,1,0	script	ep13_nd2f_mng	844,{
+nyd_dun02,1,1,0	script	ep13_nd2f_mng	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "Enter password.";
 	next;
-	input .@input; //,0,4000;
-	if (.@input == 1854) {
-		mes "Reset Puzzle?";
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
+		mes "Reset Control devices?";
 		next;
 		switch(select("Yes:No")) {
 		case 1:
-			donpcevent "ep13_nd2f_mng::Onreset";
+			donpcevent "ep13_nd2f_mng::OnReset";
 			set $@08_ep13nydun02_in,0;
-			mes "Puzzle reset";
+			mes "Done.";
 			close;
 		case 2:
 			mes "Canceled.";
 			close;
 		}
-	}
-	else {
+	} else {
 		mes "Invalid.";
 		close;
 	}
-	end;
 
-Onreset:
+OnReset:
 	donpcevent "ep13_warp_s1::OnEnable";
 	donpcevent "ep13_warp_s3::OnEnable";
 
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 9bf7758dc..49478877d 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -1,23 +1,21 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Airship Related Quests
-//===== By: ================================================== 
-// Samuray22
-//===== Current Version: ===================================== 
-//= 1.9
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== By: ==================================================
+//= Samuray22
+//===== Current Version: =====================================
+//= 2.1
+//===== Description: =========================================
 //= Quest from the airplane to einbroch and einbech.
 //= Reward: -Free Ticket for Flyship.
 //=	    -Free System to Repair.
 //= Quest about how work the airship
 //= Reward: -Base Experience 200,000
 //=	    -Job Experience 10,000
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Beta.
 //= 1.1 Added Heart Fragment quest. [SinSloth]
 //= 1.2 Change the laboratory code text to make it easier to
-//= understand. [SinSloth]
+//=     understand. [SinSloth]
 //= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.3a Corrected a Typo error ";;". [Samuray22]
 //= 1.4 Fixed incorrect variable type used. [L0ne_W0lf]
@@ -28,16 +26,20 @@
 //=     - Airship Ticket Quest
 //=     - How the Airship Works
 //= 1.9 Fixed missing checks for How the Airship Works quest. [Joseph]
-//============================================================ 
+//= 2.0 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.1 Updated Airship Ticket Quest with some missing parts. [Euphy]
+//============================================================
 
-//=======================================================================================================//
-//					Airship Ticket Quest
-//=======================================================================================================//
+// Airship Ticket Quest :: ein_tre
+//============================================================
 
-//====================Kain Himere=============================
+/* Note: this is an iRO conversion, and does not exactly match the official script. */
 
-airplane,47,61,1	script	Crewman	833,{
-	if(kain_ticket==4) {
+//----------------------------------------------------------------------------
+// Kain Himere
+//----------------------------------------------------------------------------
+airplane,47,61,7	script	Crewman	4_M_ZONDAOYAJI,{
+	if (kain_ticket == 4) {
 		mes "[Kain Himere]";
 		mes "Ah...";
 		mes "Here it is!";
@@ -59,8 +61,8 @@ airplane,47,61,1	script	Crewman	833,{
 	mes "[Kain Himere]";
 	mes "Welcome to the Airship. If you have any questions or need any assistnace, please don't hesisitate to let me or one of the other crewman know.";
 	next;
-	if(kain_ticket==0) {
-		switch( select( "About the Airship...", "Leave a Comment" )) {
+	if (kain_ticket == 0) {
+		switch(select("About the Airship...:Leave a Comment")) {
 		case 1:
 			set kain_ticket, 1;
 			mes "[Kain Himere]";
@@ -90,15 +92,22 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "it to the higher ups.";
 			mes "To cancel, press '0'.";
 			next;
-			input @comment$;
-			if (@comment$ == "0") {
+			input .@comment$;
+			if (.@comment$ == "kafra") {
+				mes "[Kain Himere]";
+				mes "K-Kafra...?";
+				mes "Hmm, maybe I better";
+				mes "not send this up after all...";
+				emotion e_an;
+				close;
+			} else if (.@comment$ == "0") {
 				mes "[Kain Himere]";
 				mes "Ah, well, if you";
 				mes "have any helpful criticism about our service, feel free to leave me with your comments at any time.";
 				close;
 			} else {
 				mes "["+strcharinfo(0)+"]";
-				mes @comment$+".";
+				mes .@comment$+".";
 				next;
 				mes "[Kain Himere]";
 				mes "Hmmmm...";
@@ -110,8 +119,8 @@ airplane,47,61,1	script	Crewman	833,{
 				close;
 			}
 		}
-	} else if(kain_ticket==1) {
-		switch( select( "About the Airship...", "Make a remark" )) {
+	} else if (kain_ticket == 1) {
+		switch(select("About the Airship...:Make a remark")) {
 		case 1:
 			set kain_ticket, 2;
 			mes "[Kain Himere]";
@@ -133,15 +142,22 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "it to the higher ups.";
 			mes "To cancel, press '0'.";
 			next;
-			input @comment$;
-			if (@comment$=="0") {
+			input .@comment$;
+			if (.@comment$ == "kafra") {
+				mes "[Kain Himere]";
+				mes "K-Kafra...?";
+				mes "Hmm, maybe I better";
+				mes "not send this up after all...";
+				emotion e_an;
+				close;
+			} else if (.@comment$ == "0") {
 				mes "[Kain Himere]";
 				mes "Ah, well, if you";
 				mes "have any helpful criticism about our service, feel free to leave me with your comments at any time.";
 				close;
 			} else {
 				mes "["+strcharinfo(0)+"]";
-				mes @comment$+".";
+				mes .@comment$+".";
 				next;
 				mes "[Kain Himere]";
 				mes "Hmmmm...";
@@ -153,7 +169,7 @@ airplane,47,61,1	script	Crewman	833,{
 				close;
 			}
 		}
-	} else if(kain_ticket==2) {
+	} else if (kain_ticket == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "About the Airship...";
 		next;
@@ -168,7 +184,7 @@ airplane,47,61,1	script	Crewman	833,{
 		mes "E-excuse me...";
 		mes "^666666*Sniff*^000000";
 		next;
-		switch( select( "What the hell...?", "What's wrong?" )) {
+		switch(select("What the hell...?:What's wrong?")) {
 		case 1:
 			mes "[Kain Himere]";
 			mes "Oh, no there's no";
@@ -251,7 +267,7 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "[Kain Himere]";
 			mes "By the way, where are you heading to?";
 			next;
-			switch( select( "Einbroch", "Juno" )) {
+			switch(select("Einbroch:Juno")) {
 			case 1:
 				set kain_ticket, 4;
 				mes "["+strcharinfo(0)+"]";
@@ -276,12 +292,12 @@ airplane,47,61,1	script	Crewman	833,{
 				close;
 			}
 		}
-	} else if(kain_ticket==3) {
+	} else if (kain_ticket == 3) {
 		mes "[Kain Himere]";
 		mes "Oh, how are you?";
 		mes "Right, there's a favor I have to ask of you. Where are you heading?";
 		next;
-		switch( select( "Einbroch", "Juno" )) {
+		switch(select("Einbroch:Juno")) {
 		case 1:
 			set kain_ticket, 4;
 			mes "["+strcharinfo(0)+"]";
@@ -293,7 +309,6 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "Now, let me find";
 			mes "that thing. Hold on...";
 			close;
-
 		case 2:
 			mes "["+strcharinfo(0)+"]";
 			mes "I am heading to Juno.";
@@ -304,14 +319,14 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "I needed sent to Einbroch. If you're not going there, then don't worry about it.";
 			close;
 		}
-	} else if(kain_ticket > 4 && kain_ticket < 10) {
+	} else if (kain_ticket > 4 && kain_ticket < 10) {
 		mes "[Kain Himere]";
 		mes "Oh hello!";
 		mes "Things are a little busy right now, but did you delive-- Oh! Wait, mister!";
 		next;
 		mes "^3355FFKain seems too busy to speak to you right now...^000000";
 		close;
-	} else if(kain_ticket== 10) {
+	} else if (kain_ticket == 10) {
 		mes "[Kain Himere]";
 		mes "Welcome back to the Airship. So did you deliver that little box safely?";
 		next;
@@ -322,7 +337,7 @@ airplane,47,61,1	script	Crewman	833,{
 		mes "Oh...";
 		mes "What should I do now? Oh well, sorry for putting you through so much trouble.";
 		next;
-		switch( select( "Do you know 'Miner's Song?'", "Do you remember 'Tarsha?'" )) {
+		switch(select("Do you know 'Miner's Song?':Do you remember 'Tarsha?'")) {
 		case 1:
 			mes "[Kain Himere]";
 			mes "'Miner's Song...'";
@@ -377,14 +392,14 @@ airplane,47,61,1	script	Crewman	833,{
 			set kain_ticket, 11;
 			close;
 		}
-	} else if(kain_ticket == 11 || kain_ticket == 12) {
+	} else if (kain_ticket == 11 || kain_ticket == 12) {
 		mes "[Kain Himere]";
 		mes "My wife's journal is buried ^3131FFunderneath a tree in Einbech^000000. Please find it and see if Tarsha is my daughter.";
 		close;
-	} else if(kain_ticket == 13) {
+	} else if (kain_ticket == 13) {
 		mes "^3355FFYou better fulfill Kain's request to find his wife's journal in Einbech before you speak to him again.^000000";
 		close;
-	} else if(kain_ticket == 14) {
+	} else if (kain_ticket == 14) {
 		if (countitem(7276)==1) {
 			mes "^3355FFYou gave Kain his wife's journal and told him that Tarsha really is is daughter, and currently has a job in Einbech.^000000";
 			next;
@@ -418,7 +433,7 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "It would be better if you approached Kain and bring the Doodled Letter that you received.^000000";
 			close;
 		}
-	} else if(kain_ticket >= 15) {
+	} else if (kain_ticket >= 15) {
 		mes "[Kain Himere]";
 		mes "Oh, how are you";
 		mes "lately, my friend?";
@@ -430,9 +445,10 @@ airplane,47,61,1	script	Crewman	833,{
 	}
 }
 
-//====================Empty Room 201==========================
-
-ein_in01,227,279,5	script	door_ein	-1,5,5,{
+//----------------------------------------------------------------------------
+// Empty Room 201
+//----------------------------------------------------------------------------
+ein_in01,227,279,3	script	#door_ein	-1,5,5,{
 OnTouch:
 	if (kain_ticket == 5) {
 		set kain_ticket, 6;
@@ -455,18 +471,19 @@ OnTouch:
 	}
 }
 
-//====================Elle Cherno=============================
-
-ein_in01,261,241,5	script	Elle Cherno	703,3,3,{
+//----------------------------------------------------------------------------
+// Elle Cherno
+//----------------------------------------------------------------------------
+ein_in01,261,241,3	script	Elle Cherno	4_F_KID2,3,3,{
 OnTouch:
 	mes "[Elle Cherno]";
 	mes "Let's get to work";
 	mes "fear-less comraaades~!";
 	mes "Do our best! Nothing";
 	mes "can stop us, lads~!";
-	if(kain_ticket == 6) {
+	if (kain_ticket == 6) {
 		next;
-		switch( select( "Hello!", "What are you singing?")) {
+		switch(select("Hello!:What are you singing?")) {
 		case 1:
 			mes "[Elle Cherno]";
 			mes "Let's get to work";
@@ -502,7 +519,7 @@ OnTouch:
 			mes "Our house is behind the Hotel. So can see my mommy and tell me if she's not feeling good?";
 			close;
 		}
-	} else if(kain_ticket == 7) {
+	} else if (kain_ticket == 7) {
 		next;
 		mes "[Elle Cherno]";
 		mes "Our house is";
@@ -511,10 +528,13 @@ OnTouch:
 		mes "you go and see";
 		mes "my mommy for me?";
 		close;
-	} else if(kain_ticket == 13) {
+	} else if (kain_ticket == 13) {
 		next;
-		//Check if you can carry the Picture Letter.
-		 if (checkweight(7276,1)) {
+		if (checkweight(7276,1) == 0) {
+			mes "[Elle Cherno]";
+			mes "Hey! I have something to give you, but you have too much stuff already. Will you come back later?";
+			close;
+		} else {
 			mes "[Elle Cherno]";
 			mes "You saw my grandpa?";
 			mes "You're his friend,";
@@ -529,37 +549,34 @@ OnTouch:
 			mes "in your hand.^000000";
 			changequest 2084,2085;
 			set kain_ticket, 14;
-			getitem 7276, 1; //Picture Letter,
-			close;
-		} else {
-			mes "[Elle Cherno]";
-			mes "Hey! I have something to give you, but you have too much stuff already. Will you come back later?";
+			getitem 7276, 1; //Picture_Letter
 			close;
 		}
 	}
 	close;
 }
 
-//====================Theo Cherno=============================
-
-ein_in01,123,94,1	script	Theo Cherno	851,{
-	if(kain_ticket == 7) {
-		callfunc "cherno";
+//----------------------------------------------------------------------------
+// Theo Cherno
+//----------------------------------------------------------------------------
+ein_in01,123,94,1	script	Theo Cherno	4_M_REPAIR,{
+	if (kain_ticket == 7) {
+		callfunc "F_Cherno";
 		set kain_ticket, 8;
 		close;
-	} else if(kain_ticket > 7 && kain_ticket < 10) {
+	} else if (kain_ticket > 7 && kain_ticket < 10) {
 		mes "[Theo Cherno]";
 		mes "You are very kind.";
 		close;
-	} else if(kain_ticket > 9 && kain_ticket < 13) {
+	} else if (kain_ticket > 9 && kain_ticket < 13) {
 		mes "[Theo Cherno]";
 		mes "Are you sure";
 		mes "that you can find";
 		mes "her father? Oh...!";
 		mes "You're a godsend!";
 		close;
-	} else if(kain_ticket > 12) {
-		Emotion 18, "Theo Cherno";
+	} else if (kain_ticket > 12) {
+		emotion e_heh;
 		mes "[Theo Cherno]";
 		mes "I'm so happy";
 		mes "for my wife.";
@@ -577,18 +594,19 @@ ein_in01,123,94,1	script	Theo Cherno	851,{
 	}
 }
 
-//====================Tarsha Cherno===========================
-
-ein_in01,125,99,3	script	Tarsha Cherno	850,{
-	if(kain_ticket == 7) {
-		callfunc "cherno";
+//----------------------------------------------------------------------------
+// Tarsha Cherno
+//----------------------------------------------------------------------------
+ein_in01,125,99,3	script	Tarsha Cherno	4_F_EINWOMAN,{
+	if (kain_ticket == 7) {
+		callfunc "F_Cherno";
 		set kain_ticket, 8;
 		close;
-	} else if(kain_ticket == 8) {
+	} else if (kain_ticket == 8) {
 		mes "[Tarsha Cherno]";
 		mes "Although these contraptions aren't worth showing off, we've put a lot of work into inventing these machines.";
 		close;
-	} else if(kain_ticket == 9) {
+	} else if (kain_ticket == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Ma'am, you have a scar on your shoulder. Is that from an accident?";
 		next;
@@ -623,7 +641,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 		mes "such a robust song";
 		mes "for men! Haha, this";
 		mes "is all your fault, Tarsha.";
-		Emotion 29, "Theo Cherno";
+		emotion e_gg;
 		next;
 		mes "[Tarsha Cherno]";
 		mes "Hoho.";
@@ -653,11 +671,11 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 		changequest 2080,2081;
 		set kain_ticket, 10;
 		close;
-	} else if(kain_ticket == 10 || kain_ticket == 11) {
+	} else if (kain_ticket == 10 || kain_ticket == 11) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I know someone who might be your father! Just wait for me, hopefully I'll bering good news soon!";
 		close;
-	} else if(kain_ticket == 12) {
+	} else if (kain_ticket == 12) {
 		mes "[Tarsha Cherno]";
 		mes "Oh, welcome back.";
 		mes "So did you bring";
@@ -666,7 +684,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 		mes "["+strcharinfo(0)+"]";
 		mes "Yes, speaking of which, allow me to... Check something.";
 		next;
-		switch( select( "Check her neck.", "Check her hands.", "Check her legs.", "Check her forehead.")) {
+		switch(select("Check her neck.:Check her hands.:Check her legs.:Check her forehead.")) {
 		case 1:
 			mes "^3355FFUh oh...";
 			mes "Nothing's there!^000000";
@@ -676,7 +694,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 			mes "Touching another";
 			mes "man's wife...?!";
 			next;
-			specialeffect2 EF_EARTHHIT;
+			specialeffect2 EF_PIERCE;
 			percentheal -30,0;
 			close;
 		case 2:
@@ -730,7 +748,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 			mes "Touching another";
 			mes "man's wife...?!";
 			next;
-			specialeffect2 EF_EARTHHIT;
+			specialeffect2 EF_PIERCE;
 			percentheal -20,0;
 			close;
 		case 4:
@@ -742,11 +760,11 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 			mes "Touching another";
 			mes "man's wife...?!";
 			next;
-			specialeffect2 EF_EARTHHIT;
+			specialeffect2 EF_PIERCE;
 			percentheal -10,0;
 			close;
 		}
-	} else if(kain_ticket > 12) {
+	} else if (kain_ticket > 12) {
 		mes "[Tarsha Cherno]";
 		mes "I've been feeling";
 		mes "great after all you've";
@@ -763,21 +781,23 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 	}
 }
 
-function	script	cherno	{
-	misceffect 2;
+ein_in01,127,94,3	script	#exp_ein	HIDDEN_NPC,{ end; }
+
+function	script	F_Cherno	{
+	specialeffect EF_COMBOATTACK1,AREA,"#exp_ein";
 	mes "^33355F*Bang*^000000";
 	next;
-	misceffect 3;
+	specialeffect EF_COMBOATTACK2,AREA,"#exp_ein";
 	mes "^33355F*Bang*^000000";
 	next;
-	misceffect 4;
+	specialeffect EF_COMBOATTACK3,AREA,"#exp_ein";
 	mes "^33355F*Bang*^000000";
 	next;
-	misceffect 20;
+	specialeffect EF_POISONATTACK,AREA,"#exp_ein";
 	mes "^33355F*Crash!*^000000";
-	mes "....."; 
-	emotion 4,0,"Theo Cherno";
-	Emotion 4,0,"Tarsha Cherno";
+	mes ".....";
+	emotion e_swt,0,"Theo Cherno";
+	emotion e_swt,0,"Tarsha Cherno";
 	next;
 	mes "[Theo Cherno]";
 	mes "Honey...";
@@ -794,13 +814,13 @@ function	script	cherno	{
 	mes "it a day and finish";
 	mes "this tomorrow.";
 	next;
-	Emotion 1, "Tarsha Cherno";
+	emotion e_what,0,"Tarsha Cherno";
 	mes "[Tarsha Cherno]";
 	mes "Elle is playing outside.";
 	mes "Oh, I didn't know we had";
 	mes "a guest? Hello, how are you?";
 	next;
-	switch( select( "Nothing.", "Your daughter asked me to visit you.")) {
+	switch(select("Nothing.:Your daughter asked me to visit you.")) {
 	case 1:
 		mes "[Theo Cherno]";
 		mes "As you see, my wife and I are pretty";
@@ -809,8 +829,8 @@ function	script	cherno	{
 		mes "will you please leave us alone?";
 		close;
 	case 2:
-		Emotion 4, "Tarsha Cherno";
-		Emotion 4, "Theo Cherno";
+		emotion e_swt,0,"Tarsha Cherno";
+		emotion e_swt,0,"Theo Cherno";
 		mes "[Tarsha Cherno]";
 		mes "Excuse me?";
 		mes "What did she say?";
@@ -822,7 +842,7 @@ function	script	cherno	{
 		mes "was sick or sad";
 		mes "...Or something?";
 		next;
-		Emotion 23, "Tarsha Cherno";
+		emotion e_omg,0,"Tarsha Cherno";
 		mes "[Tarsha Cherno]";
 		mes "Oh my god...!";
 		mes "What is she";
@@ -868,15 +888,10 @@ function	script	cherno	{
 	}
 }
 
-//========Unidentified Machine #1 and #2=======================
-
-ein_in01,127,94,5	script	Unidentified Machine#mac	111,{
-	callfunc "Machine";
-}
-ein_in01,122,103,5	script	Unidentified Machine	111,{
-	callfunc "Machine";
-}
-function	script	Machine	{
+//----------------------------------------------------------------------------
+// Unidentified Machine
+//----------------------------------------------------------------------------
+ein_in01,122,103,5	script	Unidentified Machine#ein	HIDDEN_NPC,{
 	mes "^3355FFIt's...";
 	mes "It's a really";
 	mes "strange looking";
@@ -885,19 +900,120 @@ function	script	Machine	{
 	close;
 }
 
-//====================Mirror=============================
-
-ein_in01,121,99,5	script	Mirror	111,{
-	if(kain_ticket==8) {
+//----------------------------------------------------------------------------
+// Mirror
+//----------------------------------------------------------------------------
+ein_in01,121,99,3	script	Mirror#ein	HIDDEN_NPC,{
+	if (kain_ticket == 8) {
 		mes "^3355FFIt's a mirror.";
 		mes "So, of course the";
 		mes "first thing you'll";
 		mes "see is yourself.";
 		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Man...";
-		mes "I didn't know";
-		mes "I was so good looking!";
+		if (Sex) {
+			switch(rand(1,5)) {
+			case 1:
+				mes "["+strcharinfo(0)+"]";
+				mes "Man...";
+				mes "I didn't know";
+				mes "I was so good";
+				mes "looking! Ooh yah~";
+				break;
+			case 2:
+				mes "["+strcharinfo(0)+"]";
+				mes "Whoa...";
+				mes "So that's why the";
+				mes "ladies keep looking";
+				mes "at me. I'm a walking";
+				mes "free gun show!";
+				break;
+			case 3:
+				mes "["+strcharinfo(0)+"]";
+				mes "It's a shame I can't job";
+				mes "change to Male Model.";
+				mes "Clearly, I'd be like, Job";
+				mes "Level 87 or something.";
+				mes "Man, I'm beautiful...";
+				break;
+			case 4:
+				mes "["+strcharinfo(0)+"]";
+				mes "This is my reflection?!";
+				mes "No one can be this good";
+				mes "looking, not without special";
+				mes "effects! I mean, it's not";
+				mes "fair to everyone else...";
+				break;
+			case 5:
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh wow...";
+				mes "I look pretty good.";
+				mes "No wait. Really, really";
+				mes "good. So this must be";
+				mes "why I get such great";
+				mes "service at restaurants...";
+				break;
+			}
+		} else {
+			switch(rand(1,5)) {
+			case 1:
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh. Wow.";
+				mes "I never realized...";
+				mes "Everything is in";
+				mes "perfect proportion!";
+				mes "No wonder people";
+				mes "want to party with me~";
+				break;
+			case 2:
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh my gosh~";
+				mes "How can I look this";
+				mes "good without any makeup?";
+				mes "I-It isn't fair to all the other";
+				mes "girls... Wow, is this really me?";
+				break;
+			case 3:
+				mes "["+strcharinfo(0)+"]";
+				mes "Am I going crazy?";
+				mes "Is that girl in the";
+				mes "mirror really me...?";
+				mes "How did I not realize";
+				mes "how gorgeous I look?";
+				break;
+			case 4:
+				mes "["+strcharinfo(0)+"]";
+				mes "So...";
+				mes "What did you do with";
+				mes "this mirror? Because I'm";
+				mes "looking at my reflection";
+				mes "and I can't seem to find";
+				mes "any flaws with my figure...";
+				next;
+				emotion e_swt2,0,"Tarsha Cherno";
+				mes "[Tarsha Cherno]";
+				mes "Actually...";
+				mes "That's not one";
+				mes "of our inventions.";
+				mes "It's just a normal mirror...";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Well now...!";
+				mes "Are you sure?";
+				mes "Because my face looks";
+				mes "freakin' immaculate! And";
+				mes "it's like, I'm almost too sexy!";
+				break;
+			case 5:
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh wow...";
+				mes "I look pretty good.";
+				mes "No wait. Really, really";
+				mes "good. So this must be";
+				mes "why I get such great";
+				mes "service at restaurants...";
+				break;
+			}
+		}
 		next;
 		mes "^3355FFAfter enjoying that little epiphany, you see a reflection of Tarsha's neck as you set the mirror back down.^000000";
 		next;
@@ -907,10 +1023,11 @@ ein_in01,121,99,5	script	Mirror	111,{
 	}
 }
 
-//====================Tree from Einbech=============================
-
-einbech,45,113,5	script	Tree#t1-1::Tree	111,{
-	if(kain_ticket==11) {
+//----------------------------------------------------------------------------
+// Tree from Einbech
+//----------------------------------------------------------------------------
+einbech,45,113,5	script	Tree#t1-1::Tree	HIDDEN_NPC,{
+	if (kain_ticket == 11) {
 		mes "^3355FFYou crouch down";
 		mes "under the tree and";
 		mes "begin digging into";
@@ -923,27 +1040,31 @@ einbech,45,113,5	script	Tree#t1-1::Tree	111,{
 		mes "......";
 		mes ".........";
 		next;
-		set @find_diary,rand(1,100);
-		if(@find_diary > 10) {
+		set .@find_diary,rand(1,100);
+		if (.@find_diary > 10) {
 			mes "^3355ffUnfortunately,";
 			mes "you weren't able";
 			mes "to find anything.^000000";
 			close;
 		} else {
-			callfunc "diary";
+			mes "^3355ffYou have found a ^3131FFJournal^3355ff among some other articles buried for safekeeping.^000000";
+			next;
+			callsub L_Diary;
+			next;
+			mes "...";
+			mes "......";
+			next;
+			mes "^3355FFThat was the last page of the journal. You picked it up so that you can bring it over to ^3131FFTarsha.^000000";
 			changequest 2082,2083;
 			set kain_ticket, 12;
 			close;
 		}
-	} else if(kain_ticket == 12) {
-		callfunc "diary";
+	} else if (kain_ticket == 12) {
+		callsub L_Diary;
 		close;
 	}
-}
 
-function	script	diary	{
-	mes "^3355ffYou have found a ^3131FFJournal^3355ff among some other articles buried for safekeeping.^000000";
-	next;
+L_Diary:
 	mes "^3355FFYou open";
 	mes "the journal";
 	mes "and begin to read...^000000";
@@ -1015,42 +1136,41 @@ function	script	diary	{
 	mes "^333333Lately Tarsha cries a lot. My poor baby loves her father so much, but he's always so cold. Sometimes I see him smile at Tarsha.^000000";
 	next;
 	mes "^333333But those moments grow fewer the more he drinks. When will he finally overcome his pain?^000000";
-	next;
-	mes "...";
-	mes "......";
-	next;
-	mes "^3355FFThat was the last page of the journal. You picked it up so that you can bring it over to ^3131FFTarsha.^000000";
 	return;
 }
+einbech,36,100,5	duplicate(Tree)	Tree#t1-2	HIDDEN_NPC
+einbech,44,90,5	duplicate(Tree)	Tree#t1-3	HIDDEN_NPC
+einbech,53,94,5	duplicate(Tree)	Tree#t1-4	HIDDEN_NPC
 
-//====================Expert Repairman=============================
-
-ein_in01,117,80,5	script	Unidentified Machine#as	111,{
-	if(kain_ticket > 12) {
+//----------------------------------------------------------------------------
+// Expert Repairman
+//----------------------------------------------------------------------------
+ein_in01,117,80,5	script	Unidentified Machine#as	HIDDEN_NPC,{
+	if (kain_ticket > 12) {
 		mes "["+strcharinfo(0)+"]";
 		mes "This is the";
 		mes "^FF0000Expert Repairman^000000?!";
 		mes "It looks like it";
 		mes "needs repairs itself...";
 		next;
-		if(getbrokenid(1)==NULL) {
+		if (getbrokenid(1) == 0) {
 			mes "[Expert Repairman]";
 			mes "*Beep-*";
 			mes "Please check";
 			mes "your items again.";
 			close;
 		} else {
-			set @choice,select(getitemname(getbrokenid(1)),getitemname(getbrokenid(2)),
+			set .@choice, select(getitemname(getbrokenid(1)),getitemname(getbrokenid(2)),
 			getitemname(getbrokenid(3)),getitemname(getbrokenid(4)),getitemname(getbrokenid(5)),
 			getitemname(getbrokenid(6)),getitemname(getbrokenid(7)),getitemname(getbrokenid(8)),
 			getitemname(getbrokenid(9)),getitemname(getbrokenid(10)));
 			mes "[Expert Repairman]";
-			mes "You're gonna repair " + getitemname(getbrokenid(@choice)) + ".";
+			mes "You're gonna repair " + getitemname(getbrokenid(.@choice)) + ".";
 			mes "Continue?";
 			next;
-			switch( select("Yes","No")) {
+			switch(select("Yes:No")) {
 			case 1:
-				repair(@choice);
+				repair(.@choice);
 				next;
 				mes "[Expert Repairman]";
 				mes "*Beep-*";
@@ -1068,18 +1188,13 @@ ein_in01,117,80,5	script	Unidentified Machine#as	111,{
 		close;
 	}
 }
-//===================Trees From Einbech==========================
-//Tree of the Diary
-einbech,36,100,5	duplicate(Tree)	Tree#t1-2	111
-einbech,44,90,5	duplicate(Tree)	Tree#t1-3	111
-einbech,53,94,5	duplicate(Tree)	Tree#t1-4	111
 
-//=======================================================================================================//
-//				"How Does The Airship Work" Quest
-//=======================================================================================================//
+// "How Does The Airship Work" Quest :: lght_air & lght_ymir
+//============================================================
 
-
-//=============Monsters Attack======================
+//----------------------------------------------------------------------------
+// Monsters Attack :: lght_air
+//----------------------------------------------------------------------------
 airplane_01,1,1,0	script	Airship#airplane02	-1,{
 	end;
 OnEnable:
@@ -1458,7 +1573,7 @@ OnCaptainMobDead:
 	end;
 }
 
-airplane_01,246,54,3	script	Airship Captain#02	873,{
+airplane_01,246,54,3	script	Airship Captain#02	4_M_REINDEER,{
 	cutin "fly_felrock",2;
 	mes "[Tarlock]";
 	mes "I am Tarlock,";
@@ -1475,20 +1590,22 @@ OnInit:
 	end;
 }
 
-airplane_01,249,50,0	script	boom0#airplane	139,{ end; }
-airplane_01,239,62,0	script	boom1#airplane	139,{ end; }
-airplane_01,244,55,0	script	boom2#airplane	139,{ end; }
-airplane_01,239,50,0	script	boom3#airplane	139,{ end; }
-airplane_01,245,59,0	script	boom4#airplane	139,{ end; }
-airplane_01,245,48,0	script	boom5#airplane	139,{ end; }
-airplane_01,235,39,0	script	boom6#airplane	139,{ end; }
-airplane_01,252,41,0	script	boom7#airplane	139,{ end; }
-airplane_01,252,63,0	script	boom8#airplane	139,{ end; }
-airplane_01,234,65,0	script	boom9#airplane	139,{ end; }
-airplane_01,227,67,0	script	boom10#airplane	139,{ end; }
+airplane_01,249,50,0	script	boom0#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,239,62,0	script	boom1#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,244,55,0	script	boom2#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,239,50,0	script	boom3#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,245,59,0	script	boom4#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,245,48,0	script	boom5#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,235,39,0	script	boom6#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,252,41,0	script	boom7#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,252,63,0	script	boom8#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,234,65,0	script	boom9#airplane	HIDDEN_WARP_NPC,{ end; }
+airplane_01,227,67,0	script	boom10#airplane	HIDDEN_WARP_NPC,{ end; }
 
-//========Captain Tarlock (Inside the Captain Cabin)=======================
-airplane_01,238,154,3	script	Airship Captain#01	873,{
+//----------------------------------------------------------------------------
+// Captain Tarlock :: lght_air
+//----------------------------------------------------------------------------
+airplane_01,238,154,3	script	Airship Captain#01	4_M_REINDEER,{
 	cutin "fly_felrock",2;
 	mes "[Tarlock]";
 	mes "I am Tarlock,";
@@ -1498,11 +1615,11 @@ airplane_01,238,154,3	script	Airship Captain#01	873,{
 	next;
 	if (lght_air >= 0 && lght_air <= 3 || lght_air == 7) {
 		set .@question$, "How does this Airship fly?";
-	} else if(lght_air == 4) {
+	} else if (lght_air == 4) {
 		set .@question$, "I handed the letter to Captain Ferlock.";
-	} else if(lght_air == 5) {
+	} else if (lght_air == 5) {
 		set .@question$, "You finished reading the letter?";
-	} else if(lght_air == 6) {
+	} else if (lght_air == 6) {
 		set .@question$, "Already finished reading?";
 	}
 	switch (select("Y-you're a reindeer?!", .@question$, "No, not really.")) {
@@ -1719,7 +1836,10 @@ airplane_01,238,154,3	script	Airship Captain#01	873,{
 			mes "letters.";
 			completequest 8035;
 			set lght_air, 7;
-			getexp 20000, 1000;
+			if (checkre(3))
+				getexp 20000,1000;
+			else
+				getexp 200000,10000;
 			close2;
 			cutin "",255;
 			end;
@@ -1765,38 +1885,26 @@ airplane_01,238,154,3	script	Airship Captain#01	873,{
 	}
 }
 
-
-//===========Captain Ferlock=======================
-
-airplane,236,163,5	script	Airship Captain#03	873,{
+//----------------------------------------------------------------------------
+// Captain Ferlock :: lght_ymir
+//----------------------------------------------------------------------------
+airplane,236,163,5	script	Airship Captain#03	4_M_REINDEER,{
 	cutin "fly_trock.bmp",2;
-	if(hg_ma1 == 3 || hg_ma1 == 4)
-	{
+	if (hg_ma1 == 3 || hg_ma1 == 4) {
 		mes "[Ferlock]";
 		mes "Welcome to the airship. I am Ferlock, captain of this airship. What do you want from me? ";
 		next;
-		switch( select( "Ask him about Thierry" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Ask him about Thierry");
 		mes "[Ferlock]";
 		mes "Hmm, this is the first time I hear of this name. I'm sure he's not the employee of this place.";
 		next;
-		switch( select( "Request for the passenger list. " ) )
-		{
-			case 1:
-				break;
-		}
+		select("Request for the passenger list.");
 		mes "[Ferlock]";
 		mes "The passenger list is not opened to public unfortunately. Sorry I couldn't help you. ";
-		if(hg_ma1 == 3) close;
+		if (hg_ma1 == 3)
+			close;
 		next;
-		switch( select( "Follow Kaci's request and tell him the story." ) )
-		{
-			case 1:
-				break;
-		}
+		select("Follow Kaci's request and tell him the story.");
 		mes "^3355FFWhen you tell him why you need to find Thierry, the captain listens to you quietly and nods his head.^000000";
 		next;
 		mes "[Ferlock]";
@@ -1843,17 +1951,14 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_ma1 == 5)
-	{
+	} else if (hg_ma1 == 5) {
 		mes "[Ferlock]";
 		mes "You better get going and send the news to the fiance.";
 		close2;
 		cutin "",255;
 		end;
 	}
-	if (lght_air == 7 && lhz_heart == 11)
-	{
+	if (lght_air == 7 && lhz_heart == 11) {
 		mes "[Ferlock]";
 		mes "Ah, thank you for coming.";
 		mes "Now, I wanted to ask you";
@@ -1862,127 +1967,115 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		mes "merely curious, or did you";
 		mes "have some special reason?";
 		next;
-		switch( select( "Just curious...","Well, there's someone I need to help..." ) )
-		{
-			case 1:
-				mes "[Ferlock]";
-				mes "Just curious...?";
-				mes "I don't know if satisfying";
-				mes "your curiosity is worth the";
-				mes "risks that you have already";
-				mes "taken. You should be more ";
-				mes "careful in the future...";
-				close2;
-				cutin "",255;
-				end;
-			
-			case 2:
-				mes "[Ferlock]";
-				mes "Well, I shouldn't be";
-				mes "trusting you this much,";
-				mes "but since you've helped";
-				mes "me and my brother, I feel";
-				mes "that you must be one of those altruistic adventurers. Very well.";
-				next;
-				mes "[Ferlock]";
-				mes "If you promise that you'll";
-				mes "never tell what I reveal to";
-				mes "you, then I suppose I can";
-				mes "tell you know about the Rune";
-				mes "Stone and Ymir's Heart Piece.";
-				next;
-				switch( select( "I promise..." ) )
-				{
-					case 1:
-						break;
-				}
-				mes "[Ferlock]";
-				mes "Alright, then. I expect you";
-				mes "to keep your word. Now, you";
-				mes "already know that the Airships";
-				mes "are powered by Rune Stones, imitations of Ymir's Heart pieces.";
-				next;
-				mes "[Ferlock]";
-				mes "Although Rune Stones are";
-				mes "inferior to true Ymir Heart";
-				mes "pieces, we can make as many";
-				mes "as want. As for true Ymir Heart";
-				mes "Pieces, they're difficult to find or effectively reproduce.";
-				next;
-				mes "[Ferlock]";
-				mes "You may have already";
-				mes "figured this out, but all";
-				mes "Rune Stones are produced";
-				mes "in the Einbroch Laboratory";
-				mes "for use in the Airships. So";
-				mes "you see what's going on?";
-				next;
-				switch( select( "Wait, what's the Varmunt Project?" ) )
-				{
-					case 1:
-						break;
-				}
-				mes "[Ferlock]";
-				mes "The Varmunt Project is";
-				mes "a continuation of one of";
-				mes "the projects started by the";
-				mes "great Sage, Varmunt. Even as";
-				mes "a child, he was renown as an";
-				mes "incredible genius, a prodigy.";
-				next;
-				mes "[Ferlock]";
-				mes "However, no matter how";
-				mes "much academic success he";
-				mes "enjoyed--he even became a";
-				mes "tenured professor at Juno";
-				mes "University--Varmunt was never able to finance his own research.";
-				next;
-				mes "[Ferlock]";
-				mes "Eventually, he accepted an";
-				mes "offer from Rekenber Co. to";
-				mes "develop an energy source in";
-				mes "exchange for funding. The";
-				mes "result of his work for them is the invention of the Rune Stone.";
-				next;
-				mes "[Ferlock]";
-				mes "However, the public isn't";
-				mes "supposed to know that Varmunt";
-				mes "invented the Rune Stones. Now,";
-				mes "Varmunt disappeared before he";
-				mes "could perfect the Rune Stone";
-				mes "creation process.";
-				next;
-				mes "[Ferlock]";
-				mes "Therefore, the Rune Stones";
-				mes "we have now are unstable and";
-				mes "become useless after a while.";
-				mes "The Varmunt Project aims to";
-				mes "correct these flaws and perfect";
-				mes "the Ymir Heart replication...";
-				next;
-				mes "[Ferlock]";
-				mes "Er, anyway, that's why";
-				mes "I was at the Einbroch";
-				mes "Laboratory today. My Rune";
-				mes "Stone was close to empty,";
-				mes "so I went there to pick up";
-				mes "a fully charged one.";
-				next;
-				mes "[Ferlock]";
-				mes "^333333*Phew...*^000000";
-				mes "Would you give me";
-				mes "a moment to catch";
-				mes "my breath before";
-				mes "I continue? Yes,";
-				mes "there's a little more...";
-				set lhz_heart,12;
-				close2;
-				cutin "",255;
-				end;
+		switch(select("Just curious...:Well, there's someone I need to help...")) {
+		case 1:
+			mes "[Ferlock]";
+			mes "Just curious...?";
+			mes "I don't know if satisfying";
+			mes "your curiosity is worth the";
+			mes "risks that you have already";
+			mes "taken. You should be more ";
+			mes "careful in the future...";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Ferlock]";
+			mes "Well, I shouldn't be";
+			mes "trusting you this much,";
+			mes "but since you've helped";
+			mes "me and my brother, I feel";
+			mes "that you must be one of those altruistic adventurers. Very well.";
+			next;
+			mes "[Ferlock]";
+			mes "If you promise that you'll";
+			mes "never tell what I reveal to";
+			mes "you, then I suppose I can";
+			mes "tell you know about the Rune";
+			mes "Stone and Ymir's Heart Piece.";
+			next;
+			select("I promise...");
+			mes "[Ferlock]";
+			mes "Alright, then. I expect you";
+			mes "to keep your word. Now, you";
+			mes "already know that the Airships";
+			mes "are powered by Rune Stones, imitations of Ymir's Heart pieces.";
+			next;
+			mes "[Ferlock]";
+			mes "Although Rune Stones are";
+			mes "inferior to true Ymir Heart";
+			mes "pieces, we can make as many";
+			mes "as want. As for true Ymir Heart";
+			mes "Pieces, they're difficult to find or effectively reproduce.";
+			next;
+			mes "[Ferlock]";
+			mes "You may have already";
+			mes "figured this out, but all";
+			mes "Rune Stones are produced";
+			mes "in the Einbroch Laboratory";
+			mes "for use in the Airships. So";
+			mes "you see what's going on?";
+			next;
+			select("Wait, what's the Varmunt Project?");
+			mes "[Ferlock]";
+			mes "The Varmunt Project is";
+			mes "a continuation of one of";
+			mes "the projects started by the";
+			mes "great Sage, Varmunt. Even as";
+			mes "a child, he was renown as an";
+			mes "incredible genius, a prodigy.";
+			next;
+			mes "[Ferlock]";
+			mes "However, no matter how";
+			mes "much academic success he";
+			mes "enjoyed--he even became a";
+			mes "tenured professor at Juno";
+			mes "University--Varmunt was never able to finance his own research.";
+			next;
+			mes "[Ferlock]";
+			mes "Eventually, he accepted an";
+			mes "offer from Rekenber Co. to";
+			mes "develop an energy source in";
+			mes "exchange for funding. The";
+			mes "result of his work for them is the invention of the Rune Stone.";
+			next;
+			mes "[Ferlock]";
+			mes "However, the public isn't";
+			mes "supposed to know that Varmunt";
+			mes "invented the Rune Stones. Now,";
+			mes "Varmunt disappeared before he";
+			mes "could perfect the Rune Stone";
+			mes "creation process.";
+			next;
+			mes "[Ferlock]";
+			mes "Therefore, the Rune Stones";
+			mes "we have now are unstable and";
+			mes "become useless after a while.";
+			mes "The Varmunt Project aims to";
+			mes "correct these flaws and perfect";
+			mes "the Ymir Heart replication...";
+			next;
+			mes "[Ferlock]";
+			mes "Er, anyway, that's why";
+			mes "I was at the Einbroch";
+			mes "Laboratory today. My Rune";
+			mes "Stone was close to empty,";
+			mes "so I went there to pick up";
+			mes "a fully charged one.";
+			next;
+			mes "[Ferlock]";
+			mes "^333333*Phew...*^000000";
+			mes "Would you give me";
+			mes "a moment to catch";
+			mes "my breath before";
+			mes "I continue? Yes,";
+			mes "there's a little more...";
+			set lhz_heart,12;
+			close2;
+			cutin "",255;
+			end;
 		}
-	}
-	else if(lght_air == 7 && lhz_heart == 12)
-	{
+	} else if (lght_air == 7 && lhz_heart == 12) {
 		mes "[Ferlock]";
 		mes "Now, "+strcharinfo(0)+",";
 		mes "you must be wondering";
@@ -2062,12 +2155,13 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		specialeffect2 EF_ABSORBSPIRITS;
 		completequest 8043;
 		set lhz_heart,13;
-		getexp 70000,40000;
+		if (checkre(3))
+			getexp 70000,40000;
+		else
+			getexp 700000,400000;
 		cutin "",255;
 		end;
-	}
-	else if(lght_air == 7 && lhz_heart == 13)
-	{
+	} else if (lght_air == 7 && lhz_heart == 13) {
 		mes "[Ferlock]";
 		mes "I'll be quite busy with my";
 		mes "captaining duties and my";
@@ -2085,16 +2179,16 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 	mes "on this flight. How can";
 	mes "I be of service to you?";
 	next;
-	if(lght_air == 2) {
+	if (lght_air == 2) {
 		set .@question2$, "Give him Tarlock's Letter.";
 		set .@question3$, "Cancel.";
-	} else if(lght_air == 3) {
+	} else if (lght_air == 3) {
 		set .@question2$, "Here are the items I've found.";
 		set .@question3$, "Cancel.";
 	} else {
 		set .@question2$, "Cancel.";
 	}
-	switch( select( "How does this Airship fly?", .@question2$, .@question3$)) {
+	switch(select("How does this Airship fly?", .@question2$, .@question3$)) {
 	case 1:
 		mes "[Ferlock]";
 		mes "I'm sorry, but I can't";
@@ -2106,7 +2200,6 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		close2;
 		cutin "",255;
 		end;
-		
 	case 2:
 		if (lght_air == 2) {
 			changequest 8032,8033;
@@ -2171,7 +2264,7 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 			close2;
 			cutin "",255;
 			end;
-		} else if(lght_air == 3) {
+		} else if (lght_air == 3) {
 			if (countitem(7340) >= 2 && countitem(576) >= 2) {
 				delitem 7340, 2;
 				delitem 576, 2;
@@ -2227,32 +2320,23 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 	}
 }
 
-//=======================================================================================================//
-//				Heart Fragment Quest
-//=======================================================================================================//
-
-airplane,236,63,4	script	Hallen	706,{
-
-	if(hg_ma1 == 3)
-	{
+// Heart Fragment Quest :: lght_ymir
+//============================================================
+airplane,236,63,4	script	Hallen	4_M_KID1,{
+	if (hg_ma1 == 3) {
 		mes "[Hallen]";
 		mes "Sha Sha~ ";
 		next;
 		mes "[Hallen]";
 		mes "Just let me handle this! Hehe. ";
 		next;
-		switch( select( "Ask whether he knows Thierry" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Ask whether he knows Thierry");
 		mes "[Hallen]";
 		mes "Hmm?! Thierry?! I'm not sure. Why don't you ask the crew of the airship.";
 		mes "Kaci might know this person.";
 		close;
 	}
-	if(BaseLevel < 60)
-	{
+	if (BaseLevel < 60) {
 		mes "[Hallen]";
 		mes "If you need me to";
 		mes "do anything, just";
@@ -2260,57 +2344,50 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "Bweh heh... hollah~";
 		close;
 	}
-	if(!lhz_heart)
-	{
+	if (!lhz_heart) {
 		mes "[Hallen]";
 		mes "Howdy, howdy~";
 		mes "Welcome to the Airship.";
 		next;
-		switch( select( "I'm not a passenger.","Hey kid, what are you doing?" ) )
-		{
-			case 1:
-				emotion e_what,0;
-				mes "[Hallen]";
-				mes "Does that mean you're";
-				mes "one of the crewmen, then?";
-				mes "I don't think we've met before,";
-				mes "and I should be familiar with";
-				mes "everyone working here by now...";
-				next;
-				emotion e_gasp,0;
-				mes "[Hallen]";
-				mes "Hey...!";
-				mes "If you're on duty,";
-				mes "shouldn't you be in";
-				mes "uniform? I guess you";
-				mes "don't work here after all!";
-				mes "Heh, figured it out myself~";
-				next;
-				mes "[Hallen]";
-				mes "Eh, I need to finish";
-				mes "sweeping this deck. Then,";
-				mes "on my break, I can play a";
-				mes "little game for Apples with";
-				mes "Kaci. That's how I roll, yo.";
-				next;
-				break;
-				
-			case 2:
-				mes "[Hallen]";
-				mes "Ummm... Isn't it obvious?";
-				mes "I'm sweeping the deck. I'm";
-				mes "the youngest crewman, so";
-				mes "I get stuck with the lamest";
-				mes "jobs. But once I'm done, it's";
-				mes "Dice time with Kaci. Oh yeah~";
-				next;
-				break;
-		}
-		switch( select( "Kaci?" ) )
-		{
-			case 1:
-				break;
+		switch(select("I'm not a passenger.:Hey kid, what are you doing?")) {
+		case 1:
+			emotion e_what,0;
+			mes "[Hallen]";
+			mes "Does that mean you're";
+			mes "one of the crewmen, then?";
+			mes "I don't think we've met before,";
+			mes "and I should be familiar with";
+			mes "everyone working here by now...";
+			next;
+			emotion e_gasp,0;
+			mes "[Hallen]";
+			mes "Hey...!";
+			mes "If you're on duty,";
+			mes "shouldn't you be in";
+			mes "uniform? I guess you";
+			mes "don't work here after all!";
+			mes "Heh, figured it out myself~";
+			next;
+			mes "[Hallen]";
+			mes "Eh, I need to finish";
+			mes "sweeping this deck. Then,";
+			mes "on my break, I can play a";
+			mes "little game for Apples with";
+			mes "Kaci. That's how I roll, yo.";
+			next;
+			break;
+		case 2:
+			mes "[Hallen]";
+			mes "Ummm... Isn't it obvious?";
+			mes "I'm sweeping the deck. I'm";
+			mes "the youngest crewman, so";
+			mes "I get stuck with the lamest";
+			mes "jobs. But once I'm done, it's";
+			mes "Dice time with Kaci. Oh yeah~";
+			next;
+			break;
 		}
+		select("Kaci?");
 		mes "[Hallen]";
 		mes "Kaci... You know, the";
 		mes "dealer of the Dice game?";
@@ -2329,9 +2406,7 @@ airplane,236,63,4	script	Hallen	706,{
 		close2;
 		set lhz_heart,1;
 		end;
-	}
-	else if(lhz_heart == 1)
-	{
+	} else if (lhz_heart == 1) {
 		mes "[Hallen]";
 		mes "Oh hey, it's you~";
 		mes "We talked earlier,";
@@ -2349,49 +2424,45 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "me a favor since I can't";
 		mes "really leave this joint?";
 		next;
-		switch( select( "Sorry, but I'm busy...","What is it?" ) )
-		{
-			case 1:
-				mes "[Hallen]";
-				mes "Eh, alright. I guess";
-				mes "I can understand. But";
-				mes "still, I coulda made it";
-				mes "worth your while, if you";
-				mes "know what I mean~";
-				close;
-
-			case 2:
-				mes "[Hallen]";
-				mes "Don't worry, it's not much";
-				mes "work. I'm supposed to deliver";
-				mes "letters from Juno Airport to";
-				mes "the other crewmen, but I don't";
-				mes "got the time. Now, I have";
-				mes "this letter for Kaci here...";
-				next;
-				mes "[Hallen]";
-				mes "Would you go and";
-				mes "deliver this letter";
-				mes "to her for me? It's";
-				mes "from some guy named";
-				mes "Mr. Mawong, her mentor";
-				mes "or something like that.";
-				next;
-				mes "^3355FFHallen gave you";
-				mes "Mawong's letter to";
-				mes "be delivered to Kaci.^000000";
-				setquest 8036;
-				set lhz_heart,2;
-				next;
-				mes "[Hallen]";
-				mes "Hey, thanks a lot, pal~";
-				mes "You can find Kaci hosting";
-				mes "the Dice game in the Airship.";
-				close;
+		switch(select("Sorry, but I'm busy...:What is it?")) {
+		case 1:
+			mes "[Hallen]";
+			mes "Eh, alright. I guess";
+			mes "I can understand. But";
+			mes "still, I coulda made it";
+			mes "worth your while, if you";
+			mes "know what I mean~";
+			close;
+		case 2:
+			mes "[Hallen]";
+			mes "Don't worry, it's not much";
+			mes "work. I'm supposed to deliver";
+			mes "letters from Juno Airport to";
+			mes "the other crewmen, but I don't";
+			mes "got the time. Now, I have";
+			mes "this letter for Kaci here...";
+			next;
+			mes "[Hallen]";
+			mes "Would you go and";
+			mes "deliver this letter";
+			mes "to her for me? It's";
+			mes "from some guy named";
+			mes "Mr. Mawong, her mentor";
+			mes "or something like that.";
+			next;
+			mes "^3355FFHallen gave you";
+			mes "Mawong's letter to";
+			mes "be delivered to Kaci.^000000";
+			setquest 8036;
+			set lhz_heart,2;
+			next;
+			mes "[Hallen]";
+			mes "Hey, thanks a lot, pal~";
+			mes "You can find Kaci hosting";
+			mes "the Dice game in the Airship.";
+			close;
 		}
-	}
-	else if(lhz_heart == 2)
-	{
+	} else if (lhz_heart == 2) {
 		mes "[Hallen]";
 		mes "^333333*Sigh...*^000000";
 		mes "I'm so sick and";
@@ -2408,9 +2479,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "important, so try not";
 		mes "to take too long, okay?";
 		close;
-	}
-	else if(lhz_heart == 3)
-	{
+	} else if (lhz_heart == 3) {
 		mes "[Hallen]";
 		mes "^333333*Sigh...*^000000";
 		mes "I'm so sick and";
@@ -2419,9 +2488,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "kinda lame cabin boy.";
 		mes "But... I guess I am!";
 		close;
-	}
-	else if(lhz_heart == 4)
-	{
+	} else if (lhz_heart == 4) {
 		mes "[Hallen]";
 		mes "Hey, thanks for delivering";
 		mes "that letter to Kaci for me.";
@@ -2436,49 +2503,44 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "help each other in";
 		mes "times of crisis?";
 		next;
-		switch( select( "Not at all. Every man for himself!","Yes, I do." ) )
-		{
-			case 1:
-				mes "[Hallen]";
-				mes "Wh-what...?";
-				mes "I can't think";
-				mes "that you really";
-				mes "believe that...";
-				set lhz_heart,5;
-				close;
-
-			case 2:
-				mes "[Hallen]";
-				mes "Aww, really?";
-				mes "I knew that you'd";
-				mes "feel the same way";
-				mes "I do. You and me, we're";
-				mes "on the same wavelength~";
-				next;
-				if(checkweight(501,1) != 1)
-				{
-					mes "[Hallen]";
-					mes "Oh... Hey, I was";
-					mes "going to give you";
-					mes "a little something,";
-					mes "but you're carrying";
-					mes "too much stuff right now...";
-					close;
-				}
-				set lhz_heart,5;
-				getitem 501,1;
+		switch(select("Not at all. Every man for himself!:Yes, I do.")) {
+		case 1:
+			mes "[Hallen]";
+			mes "Wh-what...?";
+			mes "I can't think";
+			mes "that you really";
+			mes "believe that...";
+			set lhz_heart,5;
+			close;
+		case 2:
+			mes "[Hallen]";
+			mes "Aww, really?";
+			mes "I knew that you'd";
+			mes "feel the same way";
+			mes "I do. You and me, we're";
+			mes "on the same wavelength~";
+			next;
+			if (checkweight(501,1) != 1) {
 				mes "[Hallen]";
-				mes "I know this isn't";
-				mes "much, but I'd like you";
-				mes "to have it. Besides, you";
-				mes "never know what'll come in";
-				mes "handy during an emergency.";
-				mes "Alright then, see you later~";
+				mes "Oh... Hey, I was";
+				mes "going to give you";
+				mes "a little something,";
+				mes "but you're carrying";
+				mes "too much stuff right now...";
 				close;
+			}
+			set lhz_heart,5;
+			getitem 501,1;
+			mes "[Hallen]";
+			mes "I know this isn't";
+			mes "much, but I'd like you";
+			mes "to have it. Besides, you";
+			mes "never know what'll come in";
+			mes "handy during an emergency.";
+			mes "Alright then, see you later~";
+			close;
 		}
-	}
-	else if(lhz_heart == 5)
-	{
+	} else if (lhz_heart == 5) {
 		mes "[Hallen]";
 		mes "Hey, hey~ How's it going?";
 		mes "I know, I know, I'm supposed";
@@ -2511,11 +2573,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "course, I doubt I can compare";
 		mes "to the great Sage Varmunt.";
 		next;
-		switch( select( "Sage Varmunt?" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Sage Varmunt?");
 		mes "[Hallen]";
 		mes "Yeah, Varmunt... He's like";
 		mes "one of the greatest Sages in";
@@ -2547,22 +2605,15 @@ airplane,236,63,4	script	Hallen	706,{
 		changequest 8038,8039;
 		set lhz_heart,6;
 		close;
-	}
-	else if(lhz_heart == 6)
-	{
+	} else if (lhz_heart == 6) {
 		mes "[Hallen]";
 		mes "Hey, have you learned";
 		mes "what makes such a big,";
 		mes "heavy Airship like this fly";
 		mes "for so long in the sky?";
 		next;
-		if(lght_air == 7)
-		{
-			switch( select( "Umm, yeah, kind of." ) )
-			{
-				case 1:
-					break;
-			}
+		if (lght_air == 7) {
+			select("Umm, yeah, kind of.");
 			mes "[Hallen]";
 			mes "Really...?";
 			mes "Are you serious?";
@@ -2582,11 +2633,7 @@ airplane,236,63,4	script	Hallen	706,{
 			mes "No way, it can't be that simple. Besides, steam has its limits.";
 			mes "Are you sure that's everything?";
 			next;
-			switch( select( "Actually, there's another power source." ) )
-			{
-				case 1:
-					break;
-			}
+			select("Actually, there's another power source.");
 			mes "^3355FFYou reveal what you";
 			mes "learn about the Rune Stone,";
 			mes "an imitation of Ymir's Heart";
@@ -2610,14 +2657,8 @@ airplane,236,63,4	script	Hallen	706,{
 			changequest 8039,8040;
 			set lhz_heart,7;
 			close;
-		}
-		else
-		{
-			switch( select( "Actually..." ) )
-			{
-				case 1:
-					break:;
-			}
+		} else {
+			select("Actually...");
 			mes "[Hallen]";
 			mes "You didn't learn anything";
 			mes "about the Airship yet, huh?";
@@ -2634,9 +2675,7 @@ airplane,236,63,4	script	Hallen	706,{
 			mes "it'll be one of you adventurers. So please help me out here...";
 			close;
 		}
-	}
-	else if(lhz_heart == 7)
-	{
+	} else if (lhz_heart == 7) {
 		mes "[Hallen]";
 		mes "So the Rune Stone";
 		mes "is an imitation of just";
@@ -2653,8 +2692,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "when he plays the Dice";
 		mes "game for Apples!";
 		next;
-		if(Shinokas_Quest > 9)
-		{
+		if (Shinokas_Quest > 9) {
 			mes "["+strcharinfo(0)+"]";
 			mes "(^333333Wait, I met that guy when";
 			mes "I was helping Shinokas. He";
@@ -2671,8 +2709,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "the trouble of learning that";
 		mes "secret information for me...";
 		next;
-		if(checkweight(501,1) != 1)
-		{
+		if (checkweight(501,1) != 1) {
 			mes "[Hallen]";
 			mes "Aw, nuts...";
 			mes "You don't have";
@@ -2682,7 +2719,7 @@ airplane,236,63,4	script	Hallen	706,{
 			mes "in your inventory for me, okay?";
 			close;
 		}
-		if(Shinokas_Quest > 9) set lhz_heart,9;
+		if (Shinokas_Quest > 9) set lhz_heart,9;
 		else set lhz_heart,8;
 		changequest 8040,8041;
 		getitem 501,1;
@@ -2694,9 +2731,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "but hey... It's my thought that";
 		mes "counts, right? See you later~";
 		close;
-	}
-	else if(lhz_heart == 8)
-	{
+	} else if (lhz_heart == 8) {
 		mes "[Hallen]";
 		mes "Hey, why don't you";
 		mes "ask Kaci about that";
@@ -2705,9 +2740,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "You might learn more about";
 		mes "Ymir's Heart Piece, you know?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Hallen]";
 		mes "Thanks for helping me";
 		mes "out that last time. I guess";
@@ -2718,18 +2751,12 @@ airplane,236,63,4	script	Hallen	706,{
 	}
 }
 
-airplane,33,69,4	script	Kaci	73,{
-
-	if(hg_ma1 == 3)
-	{
+airplane,33,69,4	script	Kaci	1_F_MERCHANT_01,{
+	if (hg_ma1 == 3) {
 		mes "[Kaci]";
 		mes "Hello there. My name is Kaci. If you feel bored boarding the airship, why don't you play a game of dice with me.";
 		next;
-		switch( select( "Ask whether she knows Thierry" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Ask whether she knows Thierry");
 		mes "[Kaci]";
 		mes "Thierry ....That name sounds familiar...";
 		next;
@@ -2782,26 +2809,18 @@ airplane,33,69,4	script	Kaci	73,{
 		changequest 8044,8045;
 		set hg_ma1,4;
 		close;
-	}
-	else if(hg_ma1 == 4)
-	{
+	} else if (hg_ma1 == 4) {
 		mes "[Kaci]";
 		mes "You can ask the captain for the whereabouts of Thierry. I am sure that the captain will be willing to help if you tell him what happened.";
 		close;
-	}
-	else if(lhz_heart == 2)
-	{
+	} else if (lhz_heart == 2) {
 		mes "[Kaci]";
 		mes "You must be sooo";
 		mes "bored, adventurer~";
 		mes "How would you like";
 		mes "to play a game of Dice?";
 		next;
-		switch( select( "Give her the letter from Hallen." ) )
-		{
-			case 1:
-				break;
-		}
+		select("Give her the letter from Hallen.");
 		mes "[Kaci]";
 		mes "Oh, Hallen must have";
 		mes "asked you to deliver this.";
@@ -2819,9 +2838,7 @@ airplane,33,69,4	script	Kaci	73,{
 		mes "me, feel free to ask me,";
 		mes "alright? See you later~";
 		close;
-	}
-	else if(lhz_heart == 3)
-	{
+	} else if (lhz_heart == 3) {
 		mes "[Kaci]";
 		mes "Oh, hello. Thanks for";
 		mes "delivering that letter from";
@@ -2831,80 +2848,77 @@ airplane,33,69,4	script	Kaci	73,{
 		mes "letter really made my day~";
 		next;
 L_Ask:
-		switch( select( "Ask about Hallen","Ask about Mawong","Ask about the Airship" ) )
-		{
-			case 1:
-				set .@mesa,1;
-				mes "[Kaci]";
-				mes "Hallen? Well, he and I are";
-				mes "pretty close. Did you know";
-				mes "that we're cousins? In fact,";
-				mes "his dad, my uncle, brought";
-				mes "me as a child after my father";
-				mes "passed away 20 years ago.";
-				next;
-				mes "[Kaci]";
-				mes "There was some kind of";
-				mes "mine explosion accident in";
-				mes "Einbech. I don't remember.";
-				mes "Anyway, me and Hallen are";
-				mes "like sister and brother, and";
-				mes "we always stick together.";
-				next;
-				mes "[Kaci]";
-				mes "When Captain Ferlock saw me";
-				mes "host a Dice game by coincidence";
-				mes "and then hired me to work on his Airship, Hallen insisted on coming";
-				mes "along. He's stubborn like that,";
-				mes "but he's also very sweet.";
-				next;
-				break;
-				
-			case 2:
-				set .@mesb,1;
-				mes "[Kaci]";
-				mes "Mr. Mawong? Oh, don't get";
-				mes "the wrong idea! He's my";
-				mes "mentor, the one who taught";
-				mes "me how to play all of these";
-				mes "wonderful games. He's pretty";
-				mes "famous around Juno, you know.";
-				next;
-				mes "[Kaci]";
-				mes "I used to be so depressed,";
-				mes "not caring about the world";
-				mes "at all, after my father died.";
-				mes "Then, I ran into Mr. Mawong,";
-				mes "and he taught me how to find";
-				mes "the joy in life once again.";
-				next;
-				mes "[Kaci]";
-				mes "Because of him, I decided";
-				mes "to learn his games and to";
-				mes "help people forget their";
-				mes "worries and just enjoy";
-				mes "themselves, even if it's";
-				mes "just for a little while.";
-				next;
-				break;
-				
-			case 3:
-				set .@mesc,1;
-				mes "[Kaci]";
-				mes "The Airship? It's so";
-				mes "huge and beautiful, and";
-				mes "I'm always amazed that it";
-				mes "can fly so gracefully through";
-				mes "the air. I've always wanted to live someplace close to the sky...";
-				next;
-				mes "[Kaci]";
-				mes "A place where I can see";
-				mes "the clouds and bask in the";
-				mes "sun. So, when Captain Ferlock";
-				mes "invited me to work here, it was";
-				mes "like a dream come true~";
-				next;
-				break;
+		switch(select("Ask about Hallen:Ask about Mawong:Ask about the Airship")) {
+		case 1:
+			set .@mesa,1;
+			mes "[Kaci]";
+			mes "Hallen? Well, he and I are";
+			mes "pretty close. Did you know";
+			mes "that we're cousins? In fact,";
+			mes "his dad, my uncle, brought";
+			mes "me as a child after my father";
+			mes "passed away 20 years ago.";
+			next;
+			mes "[Kaci]";
+			mes "There was some kind of";
+			mes "mine explosion accident in";
+			mes "Einbech. I don't remember.";
+			mes "Anyway, me and Hallen are";
+			mes "like sister and brother, and";
+			mes "we always stick together.";
+			next;
+			mes "[Kaci]";
+			mes "When Captain Ferlock saw me";
+			mes "host a Dice game by coincidence";
+			mes "and then hired me to work on his Airship, Hallen insisted on coming";
+			mes "along. He's stubborn like that,";
+			mes "but he's also very sweet.";
+			next;
+			break;
+		case 2:
+			set .@mesb,1;
+			mes "[Kaci]";
+			mes "Mr. Mawong? Oh, don't get";
+			mes "the wrong idea! He's my";
+			mes "mentor, the one who taught";
+			mes "me how to play all of these";
+			mes "wonderful games. He's pretty";
+			mes "famous around Juno, you know.";
+			next;
+			mes "[Kaci]";
+			mes "I used to be so depressed,";
+			mes "not caring about the world";
+			mes "at all, after my father died.";
+			mes "Then, I ran into Mr. Mawong,";
+			mes "and he taught me how to find";
+			mes "the joy in life once again.";
+			next;
+			mes "[Kaci]";
+			mes "Because of him, I decided";
+			mes "to learn his games and to";
+			mes "help people forget their";
+			mes "worries and just enjoy";
+			mes "themselves, even if it's";
+			mes "just for a little while.";
+			next;
+			break;
+		case 3:
+			set .@mesc,1;
+			mes "[Kaci]";
+			mes "The Airship? It's so";
+			mes "huge and beautiful, and";
+			mes "I'm always amazed that it";
+			mes "can fly so gracefully through";
+			mes "the air. I've always wanted to live someplace close to the sky...";
+			next;
+			mes "[Kaci]";
+			mes "A place where I can see";
+			mes "the clouds and bask in the";
+			mes "sun. So, when Captain Ferlock";
+			mes "invited me to work here, it was";
+			mes "like a dream come true~";
+			next;
+			break;
 		}
 		mes "[Kaci]";
 		mes "Please don't hesitate";
@@ -2913,7 +2927,7 @@ L_Ask:
 		mes "or if you're just curious";
 		mes "about me in general~";
 		next;
-		if(!.@mesa || !.@mesb || !.@mesc) goto L_Ask;
+		if (!.@mesa || !.@mesb || !.@mesc) goto L_Ask;
 		mes "[Kaci]";
 		mes "By the way, if Hallen";
 		mes "bothers you with another";
@@ -2930,20 +2944,14 @@ L_Ask:
 		changequest 8037,8038;
 		set lhz_heart,4;
 		close;
-	}
-	else if(lhz_heart == 8)
-	{
+	} else if (lhz_heart == 8) {
 		mes "[Kaci]";
 		mes "Hello, "+strcharinfo(0)+".";
 		mes "It's nice to see you again.";
 		mes "So is there anything I can";
 		mes "help you with today?";
 		next;
-		switch( select( "Who's that drunk over there?" ) )
-		{
-			case 1:
-				break;
-		}
+		select("Who's that drunk over there?");
 		mes "[Kaci]";
 		mes "Oh, him? He's one of my";
 		mes "regulars, some guy who's";
@@ -2993,10 +3001,10 @@ L_Ask:
 	end;
 }
 
-ein_in01,279,25,0	script	#lab01_heart	139,1,1,{
-
+ein_in01,279,25,0	script	#lab01_heart	HIDDEN_WARP_NPC,1,1,{
+	end;
 OnTouch:
-	if(lhz_heart == 9)
+	if (lhz_heart == 9)
 	{
 		mes "["+strcharinfo(0)+"]";
 		mes "(^333333I've... I've just";
@@ -3008,10 +3016,10 @@ OnTouch:
 	}
 }
 
-ein_in01,264,17,0	script	#lab02_heart	139,1,1,{
-
+ein_in01,264,17,0	script	#lab02_heart	HIDDEN_WARP_NPC,1,1,{
+	end;
 OnTouch:
-	if(lhz_heart == 9)
+	if (lhz_heart == 9)
 	{
 		mes "["+strcharinfo(0)+"]";
 		mes "What the...";
@@ -3030,7 +3038,7 @@ OnTouch:
 	}
 }
 
-ein_in01,263,35,3	script	Ferlock#lab	873,{
+ein_in01,263,35,3	script	Ferlock#lab	4_M_REINDEER,{
 	end;
 
 OnInit:
@@ -3048,18 +3056,17 @@ OnTimer120000:
 	end;
 }
 
-ein_in01,261,35,0	script	lab03#heart	139,1,1,{
-
+ein_in01,261,35,0	script	lab03#heart	HIDDEN_WARP_NPC,1,1,{
+	end;
 OnTouch:
-	if(lhz_heart == 9) {
+	if (lhz_heart == 9) {
 		mes "[Security System]";
 		mes "^FF0000Unauthorized person";
 		mes "detected. Password";
 		mes "Checker not detected.";
 		mes "Access denied.^000000";
 		close;
-	}
-	else if(lhz_heart == 10) {
+	} else if (lhz_heart == 10) {
 		mes "[Security System]";
 		mes "^FF0000Enter the 3 digit password.";
 		mes "You will be allowed 5 tries";
@@ -3100,8 +3107,9 @@ L_Retry:
 				}
 				set @input100,@input / 100;
 				set @input10,(@input % 100) / 10;
-				if (((@input100 > 0) && (@input10 > 0)) && ((@input % 10) > 0)) {
-					if ((@input100 != @input10) && (@input100 != (@input % 10)) && (@input10 != (@input % 10))) {
+				set @input1,@input % 10;
+				if ((@input100 > 0) && (@input10 > 0) && (@input1 > 0)) {
+					if ((@input100 != @input10) && (@input100 != @input1) && (@input10 != @input1)) {
 						break;
 					}
 					mes "[Security System]";
@@ -3117,16 +3125,16 @@ L_Retry:
 			mes "[Security System]";
 			mes "^ff0000"+strcharinfo(0)+"^000000";
 			mes "has entered the following:";
-			mes "^0000ff"+@yagu100+"^000000 - ^0000ff"+@yagu10+"^000000 - ^0000ff"+@yagu1+"^000000.";
+			mes "^0000ff"+@input100+"^000000 - ^0000ff"+@input10+"^000000 - ^0000ff"+@input1+"^000000.";
 			mes "Please wait for authorization to complete.";
 			next;
 			set @strike,0;
 			set @ball,0;
 			if (@yagu100 == @input100) set @strike,@strike+1;
 			if (@yagu10 == @input10) set @strike,@strike+1;
-			if (@yagu1 == (@input % 10)) set @strike,@strike+1;
-			if ((@yagu100 == @input10) || (@yagu100 == (@input % 10))) set .@ball,.@ball+1;
-			if ((@yagu10 == @input100) || (@yagu10 == (@input % 10))) set @ball,@ball+1;
+			if (@yagu1 == @input1) set @strike,@strike+1;
+			if ((@yagu100 == @input10) || (@yagu100 == @input1)) set @ball,@ball+1;
+			if ((@yagu10 == @input100) || (@yagu10 == @input1)) set @ball,@ball+1;
 			if ((@yagu1 == @input100) || (@yagu1 == @input10)) set @ball,@ball+1;
 			if (@strike == 3) {
 				mes "[Security System]";
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 6dc4fd0ad..1d2e61da3 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -1,10 +1,10 @@
-//===== Hercules Script ====================================== 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Alberta
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
-//= 2.5
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.6
+//===== Description: =========================================
 //= [Official Conversion]
 //= Dolls Quest
 //= Boy's Cap Quest
@@ -13,28 +13,29 @@
 //= Hat of Sun God, Sunday Hat, Mage Hat, Magician Hat Quests
 //= Turtle Island Quests
 //= Alberta Boy
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed Spore Doll exploit, Gramp's Tiger skin label bug
 //= 1.3 Fixed item ID 7031 -> 7013
 //= 1.4 Fixed a bug, Fixed Exploits, Optimized [Lupus]
-//= 1.6 TEMPESTRA quest uses common quests variable MISC_QUEST 
-//=	Condition if done: (MISC_QUEST & 2) [Lupus]
+//= 1.6 TEMPESTRA quest uses common quests variable MISC_QUEST
+//=     Condition if done: (MISC_QUEST & 2) [Lupus]
 //= 1.7 Moved quest from cities/albera.txt [Evera]
 //= 1.8 Re-made the Doll Quest, now with official dialogs. [DZeroX]
 //= 1.8a Removed .GATs [Lupus]
 //= 1.9 Updated Turtle Quest to official. [L0ne_W0lf]
-//= 2.0 Turtle Island quest now clears TURTLE var and set 
-//= MISC_QUEST bit (MISC_QUEST & 65536) [Lupus]
+//= 2.0 Turtle Island quest now clears TURTLE var and set
+//=     MISC_QUEST bit (MISC_QUEST & 65536) [Lupus]
 //= 2.1 Added missing close. [L0ne_W0lf]
 //= 2.2 Updated Gotan to be compliant with misc_quiest var. [L0ne_W0lf]
 //= 2.3 Updated heardgear Quest NPCs. [L0ne_W0lf]
 //= 2.4 Updated 'Doll Quest' to match AEGIS script. [Kisuka]
 //= 2.5 Moved Alberta NPC to pre-re/re paths. [Euphy]
-//============================================================ 
+//= 2.6 Updated RE/Pre-RE EXP. [Euphy]
+//============================================================
 
 // Doll Quest
 //============================================================
-alberta,117,135,0	script	Elin	96,{
+alberta,117,135,0	script	Elin	4W_KID,{
 	if (checkweight(1201,1) == 0) {
 		mes "[Elin]";
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
@@ -51,343 +52,342 @@ alberta,117,135,0	script	Elin	96,{
 	mes "[Elin]";
 	mes "You know, I really really want a new doll! I hope my daddy will give me one on my birthday...!";
 	next;
-	switch(select("Um, I hope your daddy gives you one too.","How about I give you one now?")) {
-		case 1:
+	switch(select("Um, I hope your daddy gives you one too.:How about I give you one now?")) {
+	case 1:
+		mes "[Elin]";
+		mes "Yeah, I'm hoping";
+		mes "he gives me a Yoyo";
+		mes "doll. They're so cute!";
+		close;
+	case 2:
+		if (MaxWeight - Weight < 1000) {
 			mes "[Elin]";
-			mes "Yeah, I'm hoping";
-			mes "he gives me a Yoyo";
-			mes "doll. They're so cute!";
+			if (Sex == 1) {
+				mes "Maybe you should put some of your stuff away first, you look like you're carrying too much, hee hee~";
+			} else {
+				mes "Do you always carry so much with you? Put some of your things away first, okay?";
+			}
 			close;
+		}
+		mes "[Elin]";
+		if (Sex == 1) {
+			mes "Oh my goodness!";
+			mes "Really? You're";
+			mes "such a sweetie~!";
+		} else {
+			mes "Will you really?";
+			mes "You're gonna give";
+			mes "me a doll? Yaaaay~";
+		}
+		next;
+		mes "[Elin]";
+		mes "What kind of doll are you going to give me? Are you really gonna give me one?";
+		next;
+		switch(select("Poring Doll:Chonchon Doll:Puppet:Rocker Doll:Spore Doll:Osiris Doll:Baphomet Doll:Raccoon Doll:Yoyo Doll:I'm as adorable as a doll.")) {
+		case 1:
+			if (countitem(741) >= 1) {
+				delitem 741,1; //Poring_Doll
+				mes "[Elin]";
+				mes "Aww...";
+				mes "I have a lot";
+				mes "of Poring dolls...";
+				next;
+				mes "[Elin]";
+				if (Sex == 1) {
+					mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~";
+				} else {
+					mes "But since a nice girl is giving it to me, I'll take it! Hee he, soft and fluffy Poring doll~";
+				}
+				next;
+				mes "[Elin]";
+				mes "Ooh, let me give you something as a little thank you. You see, I hid some candy so I can eat it without telling mommy.";
+				next;
+				getitem 529,1; //Candy
+				mes "[Elin]";
+				if (Sex == 1) {
+					mes "I don't know if you're too old to like candy, but I guess it's okay.";
+				} else {
+					mes "So, try not to eat too much, okay? Otherwise, you might get in trouble!";
+				}
+				next;
+				mes "[Elin]";
+				mes "Thank you";
+				mes "so much for";
+				mes "the Poring doll!";
+				close;
+			} else {
+				mes "[Elin]";
+				if (Sex == 1) {
+					mes "Aww...?";
+					mes "Were you only teasing me?";
+				} else {
+					mes "Aww...";
+					mes "You're not making fun of me are you?";
+				}
+				next;
+				mes "[Elin]";
+				mes "I guess you forgot it somewhere...";
+				close;
+			}
 		case 2:
-			set .@weight,MaxWeight-Weight;
-			if ((.@weight) < 1000) {
+			if (countitem(742) >= 1) {
+				delitem 742,1; //Chonchon_Doll
+				mes "[Elin]";
+				mes "Agh--!";
+				mes "A Ch-Ch, Chonchon doll?!";
+				next;
 				mes "[Elin]";
 				if (Sex == 1) {
-					mes "Maybe you should put some of your stuff away first, you look like you're carrying too much, hee hee~";
+					mes "But since... You're... Such a nice guy... I better take it...!";
 				} else {
-					mes "Do you always carry so much with you? Put some of your things away first, okay?";
+					mes "But since... Since it's a gift... I guess I'll take it...";
 				}
+				next;
+				mes "[Elin]";
+				mes "Mmm~";
+				mes "Let me give you";
+				mes "something in return...";
+				next;
+				getitem 530,1; //Candy_Striper
+				mes "[Elin]";
+				mes "If you eat too much, your teeth will start to rot... at least, that's what Mommy says.";
+				next;
+				mes "[Elin]";
+				mes "And..";
+				mes "Uh...";
+				mes "Thank you";
+				mes "for the doll?";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Chonchon dolls are ugly anyways, but you still lied to me! How can you be so mean?!";
+				next;
+				mes "[Elin]";
+				mes "Waaaaaaaaah~~";
 				close;
 			}
-			mes "[Elin]";
-			if (Sex == 1) {
-				mes "Oh my goodness!";
-				mes "Really? You're";
-				mes "such a sweetie~!";
+		case 3:
+			if (countitem(740) >= 1) {
+				delitem 740,1; //Stuffed_Doll
+				mes "[Elin]";
+				mes "Wow...!";
+				mes "It looks like a bunny!";
+				next;
+				mes "[Elin]";
+				mes "I really like this Puppet~ Heh hehe! Thank you so much~";
+				next;
+				mes "[Elin]";
+				mes "Ooh ooh!";
+				mes "I have something";
+				mes "for you too!";
+				mes "Um, where";
+				mes "did it... Ah!";
+				next;
+				getitem 530,1; //Candy_Striper
+				mes "[Elin]";
+				mes "Here it is! It's some of the candy Santa gave me. Go ahead and try some! Oh, and thank you so much for the doll!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Awww, you were only kidding? W-W-Why are you teasing me like that?";
+				next;
+				mes "[Elin]";
+				mes "^666666*Sniff...*^000000";
+				next;
+				mes "[Elin]";
+				mes "Waaaaaaaaah~~";
+				close;
+			}
+		case 4:
+			if (countitem(752) >= 1) {
+				delitem 752,1; //Grasshopper_Doll
+				mes "[Elin]";
+				mes "Ooh! Rocker Doll!";
+				mes "It's the Rocker that likes singing and dancing! I don't like grasshoppers, but I like this because it's cute~";
+				next;
+				mes "[Elin]";
+				mes "Hmmm, I should give you something too, huh? Let's see, I have what my grandpa gave me...";
+				next;
+				getitem 532,7; //Banana_Juice
+				mes "[Elin]";
+				mes "Here you go! We have a lot of this at home, so I'll give it to you, okay? Oh, and thank you so much for the doll~ I love cute dolls!";
+				close;
 			} else {
-				mes "Will you really?";
-				mes "You're gonna give";
-				mes "me a doll? Yaaaay~";
+				mes "[Elin]";
+				mes "Awww...";
+				next;
+				mes "[Elin]";
+				mes "You don't";
+				mes "really have a doll...?";
+				mes "I was so excited about it, too...";
+				close;
 			}
+		case 5:
+			if (countitem(743) >= 1) {
+				delitem 743,1; //Spore_Doll
+				mes "[Elin]";
+				mes "It's a mushroom?";
+				mes "Ewwwwwwwww, yucky!";
+				mes "Mommy made me eat";
+				mes "mushrooms today, too...";
+				next;
+				mes "[Elin]";
+				mes "But this doll is cute, so I'll take it. But I'm still not gonna eat mushrooms! Heh heh~";
+				next;
+				getitem 538,5; //Well_Baked_Cookie
+				mes "[Elin]";
+				mes "Hehe~ My mommy made this! It's really yummy. I love cookies, too. So try it, you'll like it! Hee hee!";
+				next;
+				mes "[Elin]";
+				mes "Thanks for";
+				mes "the doll! I'll";
+				mes "take good care of it!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Eh...?";
+				mes "You don't";
+				mes "have a doll?";
+				next;
+				mes "[Elin]";
+				mes "Awww...";
+				mes "It's not nice";
+				mes "to tease people";
+				mes "like that. ^666666*Sniff, sniff*^000000";
+				close;
+			}
+		case 6:
+			if (countitem(751) >= 1) {
+				delitem 751,1; //Osiris_Doll
+				mes "[Elin]";
+				mes "Ahhhhh!";
+				mes "What is this";
+				mes "thing?! It's so scary!";
+				next;
+				mes "[Elin]";
+				mes "I've never seen a doll like this before. Where it's from? Hmm? Since I've never seen this kind of doll before, I'm gonna show it to my daddy, too. Hehe~! He'll be surprised!";
+				next;
+				mes "[Elin]";
+				mes "Here, since you gave me such a nicely made doll, I better give you something good too.";
+				next;
+				getitem 522,2; //Fruit_Of_Mastela
+				mes "[Elin]";
+				mes "I found it when I secretly went to the forest. I took it because it has pretty colors!";
+				if (Sex == 1) {
+					mes "Since there's two, you can share it with your girlfriend. Hee hee~!";
+				} else {
+					mes "Since there's two, you can share it with your boyfriend. Hee hee~!";
+				}
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Awww...";
+				mes "Why do you have";
+				mes "to make fun of me?";
+				close;
+			}
+		case 7:
+			if (countitem(750) >= 1) {
+				delitem 750,1; //Baphomet_Doll
+				mes "[Elin]";
+				mes "Huh?";
+				mes "It's a little goat...";
+				next;
+				mes "[Elin]";
+				mes "It's so weird. It's cute but it's also scary at the same time. Well, since you gave me a pretty doll, I wanna give you something, too.";
+				next;
+				getitem 525,5; //Panacea
+				mes "[Elin]";
+				mes "My daddy gave me this when I was really sick. I'm not sick anymore so you can use it when you need to. Hehehe~";
+				next;
+				mes "[Elin]";
+				mes "Hee hee~";
+				mes "Thank you for";
+				mes "the doll. I won't lose it!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "You big liar! Why are you pretending to be nice?!";
+				close;
+			}
+		case 8:
+			if (countitem(754) >= 1) {
+				delitem 754,1; //Raccoondog_Doll
+				mes "[Elin]";
+				mes "Hehe, it's a";
+				mes "raccoon doll.";
+				mes "It's very very cute~";
+				next;
+				mes "[Elin]";
+				mes "I don't like";
+				mes "Smokies in real life,";
+				mes "but this doll is nice!";
+				next;
+				getitem 539,3; //Piece_Of_Cake
+				mes "[Elin]";
+				mes "Here, let me give you some cake my grandma made. It's really yummy. I don't know if you like sweets or not, but it's really good! Please try some!";
+				next;
+				mes "[Elin]";
+				mes "Hee hee~";
+				mes "Thanks for the doll.";
+				mes "I'm gonna keep it";
+				mes "in my room!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Hey! How come you have to say things like that? Are you making fun of me?!";
+				close;
+			}
+		case 9:
+			if (countitem(753) >= 1) {
+				delitem 753,1; //Monkey_Doll
+				mes "[Elin]";
+				mes "Woooooooow~!";
+				next;
+				mes "[Elin]";
+				mes "A Yoyo doll! It's so pretty! You're really gonna give it to me?! Yay! Thank you so much! I really like it! Hee hee!";
+				next;
+				mes "[Elin]";
+				mes "Since you gave";
+				mes "me such a pretty doll,";
+				mes "I wanna give you";
+				mes "something, too!";
+				next;
+				getitem 608,1; //Seed_Of_Yggdrasil
+				mes "[Elin]";
+				mes "My daddy picked it up on his way to another town. It looks like some kind of seed. I tried planting it in front of our house but it won't grow. Do you want to try?";
+				next;
+				mes "[Elin]";
+				mes "Hehe~";
+				mes "Thanks for";
+				mes "the doll. I'll hug";
+				mes "it before I go";
+				mes "to sleep!";
+				close;
+			} else {
+				mes "[Elin]";
+				mes "Hey...";
+				mes "How come you're making fun of me?!";
+				close;
+			}
+		case 10:
+			mes "["+strcharinfo(0)+"]";
+			mes "I'm as adorable as a doll...";
 			next;
 			mes "[Elin]";
-			mes "What kind of doll are you going to give me? Are you really gonna give me one?";
+			mes "Whaaaaaaaaaaat...?";
 			next;
-			switch(select("Poring Doll","Chonchon Doll","Puppet","Rocker Doll","Spore Doll","Osiris Doll","Baphomet Doll","Raccoon Doll","Yoyo Doll","I'm as adorable as a doll.")) {
-				case 1:
-					if (countitem(741) >= 1) {
-						delitem 741,1;	// Poring_Doll
-						mes "[Elin]";
-						mes "Aww...";
-						mes "I have a lot";
-						mes "of Poring dolls...";
-						next;
-						mes "[Elin]";
-						if (Sex == 1) {
-							mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~";
-						} else {
-							mes "But since a nice girl is giving it to me, I'll take it! Hee he, soft and fluffy Poring doll~";
-						}
-						next;
-						mes "[Elin]";
-						mes "Ooh, let me give you something as a little thank you. You see, I hid some candy so I can eat it without telling mommy.";
-						next;
-						getitem 529,1;	// Candy
-						mes "[Elin]";
-						if (Sex == 1) {
-							mes "I don't know if you're too old to like candy, but I guess it's okay.";
-						} else {
-							mes "So, try not to eat too much, okay? Otherwise, you might get in trouble!";
-						}
-						next;
-						mes "[Elin]";
-						mes "Thank you";
-						mes "so much for";
-						mes "the Poring doll!";
-						close;
-					} else {
-						mes "[Elin]";
-						if (Sex == 1) {
-							mes "Aww...?";
-							mes "Were you only teasing me?";
-						} else {
-							mes "Aww...";
-							mes "You're not making fun of me are you?";
-						}
-						next;
-						mes "[Elin]";
-						mes "I guess you forgot it somewhere...";
-						close;
-					}
-				case 2:
-					if (countitem(742) >= 1) {
-						delitem 742,1;	// Chonchon_Doll
-						mes "[Elin]";
-						mes "Agh--!";
-						mes "A Ch-Ch, Chonchon doll?!";
-						next;
-						mes "[Elin]";
-						if (Sex == 1) {
-							mes "But since... You're... Such a nice guy... I better take it...!";
-						} else {
-							mes "But since... Since it's a gift... I guess I'll take it...";
-						}
-						next;
-						mes "[Elin]";
-						mes "Mmm~";
-						mes "Let me give you";
-						mes "something in return..."	;
-						next;
-						getitem 530,1;	// Candy_Striper
-						mes "[Elin]";
-						mes "If you eat too much, your teeth will start to rot... at least, that's what Mommy says.";
-						next;
-						mes "[Elin]";
-						mes "And..";
-						mes "Uh...";
-						mes "Thank you";
-						mes "for the doll?";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Chonchon dolls are ugly anyways, but you still lied to me! How can you be so mean?!";
-						next;
-						mes "[Elin]";
-						mes "Waaaaaaaaah~~";
-						close;
-					}
-				case 3:
-					if (countitem(740) >= 1) {
-						delitem 740,1;	// Stuffed_Doll
-						mes "[Elin]";
-						mes "Wow...!";
-						mes "It looks like a bunny!";
-						next;
-						mes "[Elin]";
-						mes "I really like this Puppet~ Heh hehe! Thank you so much~";
-						next;
-						mes "[Elin]";
-						mes "Ooh ooh!";
-						mes "I have something";
-						mes "for you too!";
-						mes "Um, where";
-						mes "did it... Ah!";
-						next;
-						getitem 530,1;	// Candy_Striper
-						mes "[Elin]";
-						mes "Here it is! It's some of the candy Santa gave me. Go ahead and try some! Oh, and thank you so much for the doll!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Awww, you were only kidding? W-W-Why are you teasing me like that?";
-						next;
-						mes "[Elin]";
-						mes "^666666*Sniff...*^000000";
-						next;
-						mes "[Elin]";
-						mes "Waaaaaaaaah~~";
-						close;
-					}
-				case 4:
-					if (countitem(752) >= 1) {
-						delitem 752,1;	// Grasshopper_Doll
-						mes "[Elin]";
-						mes "Ooh! Rocker Doll!";
-						mes "It's the Rocker that likes singing and dancing! I don't like grasshoppers, but I like this because it's cute~";
-						next;
-						mes "[Elin]";
-						mes "Hmmm, I should give you something too, huh? Let's see, I have what my grandpa gave me...";
-						next;
-						getitem 532,7;	// Banana_Juice
-						mes "[Elin]";
-						mes "Here you go! We have a lot of this at home, so I'll give it to you, okay? Oh, and thank you so much for the doll~ I love cute dolls!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Awww...";
-						next;
-						mes "[Elin]";
-						mes "You don't";
-						mes "really have a doll...?";
-						mes "I was so excited about it, too...";
-						close;
-					}
-				case 5:
-					if (countitem(743) >= 1) {
-						delitem 743,1;	// Spore_Doll
-						mes "[Elin]";
-						mes "It's a mushroom?";
-						mes "Ewwwwwwwww, yucky!";
-						mes "Mommy made me eat";
-						mes "mushrooms today, too...";
-						next;
-						mes "[Elin]";
-						mes "But this doll is cute, so I'll take it. But I'm still not gonna eat mushrooms! Heh heh~";
-						next;
-						getitem 538,5;	// Well_Baked_Cookie
-						mes "[Elin]";
-						mes "Hehe~ My mommy made this! It's really yummy. I love cookies, too. So try it, you'll like it! Hee hee!";
-						next;
-						mes "[Elin]";
-						mes "Thanks for";
-						mes "the doll! I'll";
-						mes "take good care of it!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Eh...?";
-						mes "You don't";
-						mes "have a doll?";
-						next;
-						mes "[Elin]";
-						mes "Awww...";
-						mes "It's not nice";
-						mes "to tease people";
-						mes "like that. ^666666*Sniff, sniff*^000000";
-						close;
-					}
-				case 6:
-					if (countitem(751) >= 1) {
-						delitem 751,1;	// Osiris_Doll
-						mes "[Elin]";
-						mes "Ahhhhh!";
-						mes "What is this";
-						mes "thing?! It's so scary!";
-						next;
-						mes "[Elin]";
-						mes "I've never seen a doll like this before. Where it's from? Hmm? Since I've never seen this kind of doll before, I'm gonna show it to my daddy, too. Hehe~! He'll be surprised!";
-						next;
-						mes "[Elin]";
-						mes "Here, since you gave me such a nicely made doll, I better give you something good too.";
-						next;
-						getitem 522,2;	// Fruit_Of_Mastela
-						mes "[Elin]";
-						mes "I found it when I secretly went to the forest. I took it because it has pretty colors!";
-						if (Sex == 1) {
-							mes "Since there's two, you can share it with your girlfriend. Hee hee~!";
-						} else {
-							mes "Since there's two, you can share it with your boyfriend. Hee hee~!";
-						}
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Awww...";
-						mes "Why do you have";
-						mes "to make fun of me?";
-						close;
-					}
-				case 7:
-					if (countitem(750) >= 1) {
-						delitem 750,1;	// Baphomet_Doll
-						mes "[Elin]";
-						mes "Huh?";
-						mes "It's a little goat...";
-						next;
-						mes "[Elin]";
-						mes "It's so weird. It's cute but it's also scary at the same time. Well, since you gave me a pretty doll, I wanna give you something, too.";
-						next;
-						getitem 525,5;	// Panacea
-						mes "[Elin]";
-						mes "My daddy gave me this when I was really sick. I'm not sick anymore so you can use it when you need to. Hehehe~";
-						next;
-						mes "[Elin]";
-						mes "Hee hee~";
-						mes "Thank you for";
-						mes "the doll. I won't lose it!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "You big liar! Why are you pretending to be nice?!";
-						close;
-					}
-				case 8:
-					if (countitem(754) >= 1) {
-						delitem 754,1;	// Raccoondog_Doll
-						mes "[Elin]";
-						mes "Hehe, it's a";
-						mes "raccoon doll.";
-						mes "It's very very cute~";
-						next;
-						mes "[Elin]";
-						mes "I don't like";
-						mes "Smokies in real life,";
-						mes "but this doll is nice!";
-						next;
-						getitem 539,3;	// Piece_Of_Cake
-						mes "[Elin]";
-						mes "Here, let me give you some cake my grandma made. It's really yummy. I don't know if you like sweets or not, but it's really good! Please try some!";
-						next;
-						mes "[Elin]";
-						mes "Hee hee~";
-						mes "Thanks for the doll.";
-						mes "I'm gonna keep it";
-						mes "in my room!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Hey! How come you have to say things like that? Are you making fun of me?!";
-						close;
-					}
-				case 9:
-					if (countitem(753) >= 1) {
-						delitem 753,1;	// Monkey_Doll
-						mes "[Elin]";
-						mes "Woooooooow~!";
-						next;
-						mes "[Elin]";
-						mes "A Yoyo doll! It's so pretty! You're really gonna give it to me?! Yay! Thank you so much! I really like it! Hee hee!";
-						next;
-						mes "[Elin]";
-						mes "Since you gave";
-						mes "me such a pretty doll,";
-						mes "I wanna give you";
-						mes "something, too!";
-						next;
-						getitem 608,1;	// Seed_Of_Yggdrasil
-						mes "[Elin]";
-						mes "My daddy picked it up on his way to another town. It looks like some kind of seed. I tried planting it in front of our house but it won't grow. Do you want to try?";
-						next;
-						mes "[Elin]";
-						mes "Hehe~";
-						mes "Thanks for";
-						mes "the doll. I'll hug";
-						mes "it before I go";
-						mes "to sleep!";
-						close;
-					} else {
-						mes "[Elin]";
-						mes "Hey...";
-						mes "How come you're making fun of me?!";
-						close;
-					}
-				case 10:
-					mes "["+strcharinfo(0)+"]";
-					mes "I'm as adorable as a doll...";
-					next;
-					mes "[Elin]";
-					mes "Whaaaaaaaaaaat...?";
-					next;
-					mes "[Elin]";
-					mes "^3355FFWhat did^000000";
-					mes "^3355FFyou just say?!^000000";
-					close;
-			}
+			mes "[Elin]";
+			mes "^3355FFWhat did^000000";
+			mes "^3355FFyou just say?!^000000";
+			close;
+		}
 	}
 }
 
 // 'Boy's Cap' Quest
 //============================================================
-alberta_in,28,145,4	script	Grampa	120,{
+alberta_in,28,145,4	script	Grampa	2_M_PHARMACIST,{
 	mes "[Grampa]";
 	mes "*Gasp*...";
 	mes "....*Gasp!*";
@@ -430,8 +430,7 @@ alberta_in,28,145,4	script	Grampa	120,{
 			mes "He...Hey, kid !! W-Wait !";
 			close;
 		}
-	} 
-	else {
+	} else {
 		switch(select("Talk:Cancel")) {
 		case 1:
 			mes "[Grampa]";
@@ -465,7 +464,7 @@ alberta_in,28,145,4	script	Grampa	120,{
 
 // 'Antlers' Quest
 //============================================================
-alberta_in,122,53,4	script	Cherokee	47,{
+alberta_in,122,53,4	script	Cherokee	1_M_01,{
 	mes "[Cherokee]";
 	mes "Hey there~!";
 	next;
@@ -511,7 +510,7 @@ alberta_in,122,53,4	script	Cherokee	47,{
 
 // 'Bao Bao', 'Crescent Hairpin', 'Fashionable Glasses', 'Heart Hairpin' Quest
 //============================================================
-alberta,120,53,1	script	Stylish Merchant#new30	51,{
+alberta,120,53,1	script	Stylish Merchant#new30	1_M_BARD,{
 	if ((countitem(10007) > 0) && (countitem(968) > 49)) {
 		mes "[Zic]";
 		mes "I know I know, you just want to get a Bao Bao of your own. But I can't concentrate on my work if you keep rushing me like this.";
@@ -644,7 +643,7 @@ alberta,120,53,1	script	Stylish Merchant#new30	51,{
 
 // 'Hat of the Sun God', 'Sunday Hat', 'Mage Hat', 'Magician Hat' Quest
 //============================================================
-alberta,136,79,1	script	Hat store girl#new30	71,{
+alberta,136,79,1	script	Hat store girl#new30	1_F_LIBRARYGIRL,{
 	mes "[Tempestra]";
 	mes "Ah, such a cool breeze. It's good to visit the seashore. I think it was the right choice to come here to take a break from my business.";
 	next;
@@ -714,14 +713,14 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 							next;
 							mes "^3355FF*Beeeeeeeh~~~*^000000";
 							next;
-							delitem 1059,250;  //Transparent_Cloth
-							delitem 2221,1;  //Hat_
-							delitem 2227,1;  //Cap_
-							delitem 7063,600;  //Soft_Feather
+							delitem 1059,250; //Transparent_Cloth
+							delitem 2221,1; //Hat_
+							delitem 2227,1; //Cap_
+							delitem 7063,600; //Soft_Feather
 							mes "[Tempestra]";
 							mes "Here it is, tee hee~";
 							mes "How about that? Do you like it?";
-							getitem 5032,1; // Picnic_Hat
+							getitem 5032,1; //Picnic_Hat
 							next;
 							mes "[Tempestra]";
 							mes "Once again, thank you for your favour. I'll see you later~";
@@ -778,15 +777,15 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 							next;
 							mes "^3355FF*Beeeeeeeh~~~*^000000";
 							next;
-							delitem 2252,1;  //Star_Sparkling
-							delitem 1036,400;  //Dragon_Scale
-							delitem 4052,1;  //Elder_Wilow_Card
-							delitem 7001,50;  //Mould_Powder
+							delitem 2252,1; //Star_Sparkling
+							delitem 1036,400; //Dragon_Scale
+							delitem 4052,1; //Elder_Wilow_Card
+							delitem 7001,50; //Mould_Powder
 							mes "[Tempestra]";
 							mes "Here it is, tee hee~";
 							mes "How about that?";
 							mes "Do you like it?";
-							getitem 5027,1; // Wizardry_Hat
+							getitem 5027,1; //Wizardry_Hat
 							next;
 							mes "[Tempestra]";
 							mes "Once again, thank you for your favour. I'll see you later~";
@@ -843,14 +842,14 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 							next;
 							mes "^3355FF*Beeeeeeeh~~~*^000000";
 							next;
-							delitem 2252,1;  //Star_Sparkling
-							delitem 1054,450;  //Lip_Of_Ancient_Fish
-							delitem 943,1200;  //Solid_Shell
+							delitem 2252,1; //Star_Sparkling
+							delitem 1054,450; //Lip_Of_Ancient_Fish
+							delitem 943,1200; //Solid_Shell
 							mes "[Tempestra]";
 							mes "Here it is, tee hee~";
 							mes "How about that?";
 							mes "Do you like it?";
-							getitem 5045,1; // Magician_Hat
+							getitem 5045,1; //Magician_Hat
 							next;
 							mes "[Tempestra]";
 							mes "Once again, thank you for your favour. I'll see you later~";
@@ -896,11 +895,11 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 					mes "Heh heh...";
 					mes "I think I'll make you a Hat of the Sun God~";
 					next;
-					delitem 7086,1;  //Symbol_Of_Sun
-					delitem 969,10;  //Gold
-					delitem 999,40;  //Steel
-					delitem 1003,50;  //Coal
-					delitem 984,2;  //Oridecon
+					delitem 7086,1; //Symbol_Of_Sun
+					delitem 969,10; //Gold
+					delitem 999,40; //Steel
+					delitem 1003,50; //Coal
+					delitem 984,2; //Oridecon
 					mes "[Tempestra]";
 					mes "See! Here it is!!";
 					mes "Haha, I made this quicker than the speed of light!";
@@ -945,7 +944,7 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 
 // Turtle Quest
 //============================================================
-alberta,91,70,4	script	Kinsey#tur	89,{
+alberta,91,70,4	script	Kinsey#tur	4_M_ORIENT02,{
 	mes "[Kinsey]";
 	mes "What does a man have to do to get a stiff drink around here? I mean, there are absolutely no good bars in Alberta!";
 	next;
@@ -990,7 +989,7 @@ alberta,91,70,4	script	Kinsey#tur	89,{
 	close;
 }
 
-alberta_in,23,104,4	script	Grandpa Turtle#tur	120,{
+alberta_in,23,104,4	script	Grandpa Turtle#tur	2_M_PHARMACIST,{
 	mes "[Grandpa Turtle]";
 	mes "Ooog...";
 	mes "So dizzy...";
@@ -1196,7 +1195,7 @@ alberta_in,23,104,4	script	Grandpa Turtle#tur	120,{
 					mes "You've made your choice! With my experience, we will arrive without fail! I appreciate your spirit!";
 					next;
 					mes "^3355FF*Choo Choo*^000000";
-					set zeny,zeny-10000;
+					Zeny -= 10000;
 					warp "tur_dun01",157,39;
 					close;
 				}
@@ -1224,7 +1223,7 @@ alberta_in,23,104,4	script	Grandpa Turtle#tur	120,{
 	close;
 }
 
-tur_dun01,165,29,4	script	Sailor#tur2	709,{
+tur_dun01,165,29,4	script	Sailor#tur2	4_M_SEAMAN,{
 	mes "[Gotanblue]";
 	mes "Do you want";
 	mes "to return";
@@ -1319,7 +1318,7 @@ tur_dun01,165,29,4	script	Sailor#tur2	709,{
 	}
 }
 
-alberta_in,18,102,4	script	Letter#tur	111,{
+alberta_in,18,102,4	script	Letter#tur	HIDDEN_NPC,{
 	mes "[Explorer's Letter]";
 	mes "- O / X / XOVX -";
 	mes "If you find this letter, please don't disregard what you have read.";
@@ -1339,7 +1338,7 @@ alberta_in,18,102,4	script	Letter#tur	111,{
 	close;
 }
 
-alberta,248,93,4	script	Voyage log#tur	111,{
+alberta,248,93,4	script	Voyage log#tur	HIDDEN_NPC,{
 	if (rand(2)) {
 		mes "[Voyage log]";
 		mes "03:20 am";
@@ -1523,7 +1522,7 @@ alberta,248,93,4	script	Voyage log#tur	111,{
 	}
 }
 
-tur_dun01,160,81,4	script	Skull Stone#tur	111,{
+tur_dun01,160,81,4	script	Skull Stone#tur	HIDDEN_NPC,{
 	if (TURTLE == 2) {
 		mes "^3355FFUnder the stone^000000";
 		mes "^3355FFis a tiny key hole^000000";
@@ -1566,7 +1565,7 @@ tur_dun01,160,81,4	script	Skull Stone#tur	111,{
 	close;
 }
 
-tur_dun02,132,251,4	script	Turtle Tree Roots#tur	111,{
+tur_dun02,132,251,4	script	Turtle Tree Roots#tur	HIDDEN_NPC,{
 	if (TURTLE == 3) {
 		mes "^3355FFUnder the tree roots^000000";
 		mes "^3355FFis a tiny key hole^000000";
@@ -1625,7 +1624,7 @@ tur_dun02,132,251,4	script	Turtle Tree Roots#tur	111,{
 	close;
 }
 
-tur_dun02,46,125,4	script	A pile of turtle crystal	111,{
+tur_dun02,46,125,4	script	A pile of turtle crystal	HIDDEN_NPC,{
 	if (TURTLE == 7) {
 		mes "^3355FFAmong the Turtle Crystals,^000000";
 		mes "^3355FFyou find a strange key hole.^000000";
@@ -1681,7 +1680,7 @@ tur_dun02,46,125,4	script	A pile of turtle crystal	111,{
 	close;
 }
 
-tur_dun02,49,158,4	script	Turtle Pillar#tur	111,{
+tur_dun02,49,158,4	script	Turtle Pillar#tur	HIDDEN_NPC,{
 	if (TURTLE == 8) {
 		mes "^3355FFAt the base of the pillar^000000";
 		mes "^3355FFis a tiny key hole with^000000";
@@ -1781,7 +1780,7 @@ tur_dun02,49,158,4	script	Turtle Pillar#tur	111,{
 	close;
 }
 
-tur_dun01,203,155,4	script	Turtle stone#tur	111,{
+tur_dun01,203,155,4	script	Turtle stone#tur	HIDDEN_NPC,{
 	if (TURTLE == 4) {
 		mes "^3355FFOn top of the stone";
 		mes "is a small key hole";
@@ -1828,7 +1827,7 @@ tur_dun01,203,155,4	script	Turtle stone#tur	111,{
 	close;
 }
 
-tur_dun02,75,249,4	script	Turtle stone#tur2	111,{
+tur_dun02,75,249,4	script	Turtle stone#tur2	HIDDEN_NPC,{
 	if (TURTLE == 10) {
 		mes "^3355FFOn top of the stone";
 		mes "is a small keyhole";
@@ -1875,7 +1874,7 @@ tur_dun02,75,249,4	script	Turtle stone#tur2	111,{
 	close;
 }
 
-tur_dun03,118,233,4	script	Turtle Stone#tur3	111,{
+tur_dun03,118,233,4	script	Turtle Stone#tur3	HIDDEN_NPC,{
 	if (TURTLE == 11) {
 		mes "^3355FFOn top of the stone";
 		mes "is a small key hole";
@@ -1922,7 +1921,7 @@ tur_dun03,118,233,4	script	Turtle Stone#tur3	111,{
 	close;
 }
 
-tur_dun04,113,178,4	script	Turtle Statue#tur	111,{
+tur_dun04,113,178,4	script	Turtle Statue#tur	HIDDEN_NPC,{
 	if (TURTLE == 12) {
 		mes "^3355FFOn top of the statue";
 		mes "is a small key hole";
@@ -1989,7 +1988,7 @@ tur_dun04,113,178,4	script	Turtle Statue#tur	111,{
 	close;
 }
 
-tur_dun03,105,76,4	script	Knight Leader#tur	110,5,5,{
+tur_dun03,105,76,4	script	Knight Leader#tur	4_M_MINISTER,5,5,{
 	mes "[Takuyaka]";
 	mes "Where did all my men go?!";
 	mes "This is horrible~!";
@@ -2067,7 +2066,7 @@ OnTouch:
 	close;
 }
 
-tur_dun03,105,74,4	script	Mudasamu#tur	119,{
+tur_dun03,105,74,4	script	Mudasamu#tur	2_M_SWORDMASTER,{
 	mes "[Mudasamu]";
 	mes "My name is Mudasamu...";
 	mes "Second in command of the";
@@ -2098,7 +2097,7 @@ tur_dun03,105,74,4	script	Mudasamu#tur	119,{
 	close;
 }
 
-tur_dun01,190,115,4	script	Knight#tur	105,{
+tur_dun01,190,115,4	script	Knight#tur	8W_SOLDIER,{
 	mes "[?]";
 	mes "Where are they?";
 	mes "Oh hey! You're an adventurer, aren't you? Do you know where my comrades are?";
@@ -2160,7 +2159,7 @@ tur_dun01,190,115,4	script	Knight#tur	105,{
 	}
 }
 
-tur_dun03,189,126,4	script	Knight#tur2	105,{
+tur_dun03,189,126,4	script	Knight#tur2	8W_SOLDIER,{
 	mes "[Jayprocat]";
 	mes "Oh? Are you a civilian? Nice to meet you. I'm a mighty Security Knight of Alberta, Jayprocat.";
 	next;
@@ -2208,7 +2207,7 @@ tur_dun03,189,126,4	script	Knight#tur2	105,{
 	close;
 }
 
-tur_dun03,104,171,4	script	Knight#tur3	105,{
+tur_dun03,104,171,4	script	Knight#tur3	8W_SOLDIER,{
 	mes "[Squall]";
 	mes "Am I the only one left? Where are all my comrades?! I... I'm about to go crazy!";
 	next;
@@ -2260,7 +2259,7 @@ tur_dun03,104,171,4	script	Knight#tur3	105,{
 	close;
 }
 
-tur_dun03,67,130,4	script	Knight#tur4	105,{
+tur_dun03,67,130,4	script	Knight#tur4	8W_SOLDIER,{
 	mes "[Nysurea]";
 	mes "Hm? I'm surprised that someone around here is still alive.";
 	next;
@@ -2312,8 +2311,8 @@ tur_dun03,67,130,4	script	Knight#tur4	105,{
 }
 
 // Alberta Boy
-//============================================================ 
-alberta_in,131,95,5	script	Iromo#ep3_2	706,{
+//============================================================
+alberta_in,131,95,5	script	Iromo#ep3_2	4_M_KID1,{
 	if (ep13_2_hiki == 13) {
 		mes "[Iromo]";
 		mes "But... this world is...";
@@ -2379,7 +2378,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 		next;
 		set ep13_2_hiki,13;
 		completequest 10089;
-		getexp 8000,0;
+		getexp (checkre(3))?8000:80000,0;
 		mes "[Iromo]";
 		mes "The world is big, there are many things...";
 		mes "I have not seen yet. Yes... I want to...";
@@ -2508,7 +2507,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 			next;
 			set ep13_2_hiki,11;
 			changequest 10087,10088;
-			getexp 6700,0;
+			getexp (checkre(3))?6700:67000,0;
 			mes "[Iromo]";
 			mes "Nevermind... it's not unexpected...";
 			mes "To go on an adventure with my friends,";
@@ -2576,7 +2575,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 		next;
 		set ep13_2_hiki,10;
 		changequest 10086,10087;
-		getexp 5700,0;
+		getexp (checkre(3))?5700:57000,0;
 		mes "[Iromo]";
 		mes "...I'm not in a good mood, get out...";
 		close;
@@ -2635,7 +2634,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 			next;
 			set ep13_2_hiki,8;
 			changequest 10084,10085;
-			getexp 4700,0;
+			getexp (checkre(3))?4700:47000,0;
 			mes "[Iromo]";
 			mes "Thank you for being helpful.";
 			mes "But, no thanks.";
@@ -2691,7 +2690,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 		delitem 501,1; //Red_Potion
 		set ep13_2_hiki,7;
 		changequest 10083,10084;
-		getexp 3750,0;
+		getexp (checkre(3))?3750:37500,0;
 		mes "[Iromo]";
 		mes "I don't want to see the cat again.";
 		mes "If I go out, I will see him. It is scary.";
@@ -2735,7 +2734,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 	close;
 }
 
-alberta_in,120,93,3	script	Iromo's Mother#ep3_2	53,{
+alberta_in,120,93,3	script	Iromo's Mother#ep3_2	1_M_INNKEEPER,{
 	if (ep13_2_hiki == 8) {
 		mes "[Mother]";
 		mes "Thank you for helping my son.";
@@ -2842,7 +2841,7 @@ alberta_in,120,93,3	script	Iromo's Mother#ep3_2	53,{
 	close;
 }
 
-alberta,45,106,5	script	Little Boy#ep3_2	706,{
+alberta,45,106,5	script	Little Boy#ep3_2	4_M_KID1,{
 	if (ep13_2_hiki == 6) {
 		mes "[Little Boy]";
 		mes "Iromo? He used to like ^FF0000Monster's Feed^000000 and ^FF0000Red Potion^000000.";
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index 5e087e724..01ef38537 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -1,21 +1,21 @@
 //===== Hercules Script ======================================
-//= Quest NPCs related to Aldebaran 
+//= Quest NPCs related to Aldebaran
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quests.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= 1.1 Fixed Doctor Band items [Lupus]
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Updated headgear NPC. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quest
 //============================================================
-aldeba_in,152,166,4	script	Trader#01	86,{
+aldeba_in,152,166,4	script	Trader#01	4_M_04,{
 	mes "[Trader]";
 	mes "Who is this mysterious man?";
 	mes "I, the enigmatic and debonair 'Trader?'";
@@ -38,16 +38,16 @@ aldeba_in,152,166,4	script	Trader#01	86,{
 	switch(select(" Doctor Band : Feather Bonnet : Phantom of Opera : Sakkat ")) {
 	case 1:
 		if ((countitem(2275) > 0) && (countitem(998) > 49) && (countitem(733) > 0) && (Zeny > 3499)) {
-			delitem 2275,1;  //Red_Bandana
-			delitem 998,50;  //Iron
-			delitem 733,1;  //Crystal_Jewel___
-			set Zeny,Zeny-3500;
+			delitem 2275,1; //Red_Bandana
+			delitem 998,50; //Iron
+			delitem 733,1; //Crystal_Jewel___
+			Zeny -= 3500;
 			mes "[Trader]";
 			mes "Hm! You don't have a medical license, do you? It's alright, I've heard about a rogue, unlicensed physician who performed medical miracles! But... That might have been a comic book.";
 			next;
 			mes "[Trader]";
 			mes "Oh whatever. Just don't get caught.";
-			getitem 2273,1; // Doctor_Cap
+			getitem 2273,1; //Doctor_Cap
 			close;
 		}
 		else {
@@ -59,12 +59,12 @@ aldeba_in,152,166,4	script	Trader#01	86,{
 		}
 	case 2:
 		if ((countitem(2247) > 0) && (countitem(916) > 299) && (Zeny > 499)) {
-			delitem 2247,1;  //Oldman's_Romance
-			delitem 916,300;  //Feather_Of_Birds
-			set Zeny,Zeny-500;
+			delitem 2247,1; //Oldman's_Romance
+			delitem 916,300; //Feather_Of_Birds
+			Zeny -= 500;
 			mes "[Trader]";
 			mes "Ooh~! You have good fashion sense. I know you've had a hard time collecting this stuff, but this hat is worth it. Take it. All you need now is a fur coat and a cane!";
-			getitem 5018,1; // Feather_Bonnet
+			getitem 5018,1; //Feather_Bonnet
 			close;
 		}
 		else {
@@ -74,13 +74,13 @@ aldeba_in,152,166,4	script	Trader#01	86,{
 			close;
 		}
 	case 3:
-		if ((countitem(998) > 19) && (countitem(707) > 0) && (Zeny > 4999)){ //Iron Singing_Plant 
-			delitem 998,20;  //Iron
-			delitem 707,1;  //Singing_Plant
-			set Zeny,Zeny-5000;
+		if ((countitem(998) > 19) && (countitem(707) > 0) && (Zeny > 4999)){ //Iron Singing_Plant
+			delitem 998,20; //Iron
+			delitem 707,1; //Singing_Plant
+			Zeny -= 5000;
 			mes "[Trader]";
 			mes "This one? It's a little bit scary, though it has some sort of romantic quality. What do you think? You like it? Alright, take it, it's yours!";
-			getitem 2281,1; // Phantom_Of_Opera
+			getitem 2281,1; //Phantom_Of_Opera
 			close;
 		}
 		else {
@@ -89,15 +89,15 @@ aldeba_in,152,166,4	script	Trader#01	86,{
 			close;
 		}
 	case 4:
-		if ((countitem(1019) > 119) && (Zeny > 9999)){ //Wooden_Block 
-			delitem 1019,120;  //Wooden_Block
-			set Zeny,Zeny-10000;
+		if ((countitem(1019) > 119) && (Zeny > 9999)){ //Wooden_Block
+			delitem 1019,120; //Wooden_Block
+			Zeny -= 10000;
 			mes "[Trader]";
 			mes "If you have a chance to visit the Uplander Village, Payon, please go and meet the Sakkat Craftsman.";
 			next;
 			mes "[Trader]";
 			mes "He's never sold Sakkat to Traders other than me, since only I can recognize its quality. Due to its rarity, Sakkat has become a very unique and exceptional product. Okay! Take it, it's yours!";
-			getitem 2280,1; // Sahkkat
+			getitem 2280,1; //Sahkkat
 			close;
 		}
 		else {
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 0e931aca7..61c948f6e 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -1,23 +1,24 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Amatsu
-//===== By: ================================================== 
-//= rAthena team & others? & MasterOfMuppets
-//===== Current Version: ===================================== 
-//= 1.4a
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== By: ==================================================
+//= rAthena Dev Team & MasterOfMuppets
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= Momotaro Event
 //= Sushi Quest
 //= Dungeon Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //= 1.4 Added missing checkweight. [L0ne_W0lf]
 //= 1.4a Fixed typo in condition check [Gepard]
-//============================================================ 
+//= 1.5 Added questlog support. [Euphy]
+//============================================================
 
-// Momotaro Event
-//============================================================ 
-amatsu,223,236,3	script	Publisher#ama	763,{
+// Momotaro Event :: japan_momo_q
+//============================================================
+amatsu,223,236,3	script	Publisher#ama	4_M_JPN,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment!! -";
 		mes "- Currently you are carrying -";
@@ -134,8 +135,12 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 		mes "This is your reward for you.";
 		mes "Please continue to enjoy stories~";
 		mes " ";
-		if (event_momo == 3) {
-			set event_momo,4;
+		set .@event_momo, event_momo;
+		set event_momo,4;
+		completequest 8128;
+		completequest 8129;
+		completequest 8130;
+		if (.@event_momo == 3) {
 			set .@gift_1,rand(1,10);
 			if (.@gift_1 == 1) {
 				getitem 659,1; //Heart_Of_Her
@@ -169,7 +174,6 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 			}
 		}
 		else {
-			set event_momo,4;
 			set .@gift_2,rand(1,10);
 			if (.@gift_2 == 1) {
 				getitem 622,1; //Rainbow_Carrot
@@ -205,8 +209,8 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 		close;
 	}
 }
-	
-ama_test,52,44,3	script	Assistant#ama	109,{
+
+ama_test,52,44,3	script	Assistant#ama	4_M_MANAGER,{
 	if (event_momo == 0) {
 		mes "[Satoshi]";
 		mes "Welcome to <Momotaro Field Trip>";
@@ -365,9 +369,9 @@ OnInit:
 
 OnStartArena:
 	disablenpc "Coach#ama";
-	donpcevent "Am Mut#ama::Onreset";
-	donpcevent "Dokebi#ez::Onreset";
-	donpcevent "Dokebi#hd::Onreset";
+	donpcevent "Am Mut#ama::OnReset";
+	donpcevent "Dokebi#ez::OnReset";
+	donpcevent "Dokebi#hd::OnReset";
 	enablenpc "Grandma#ama1";
 	enablenpc "Grandpa#ama";
 	warpwaitingpc "ama_test",50,83;
@@ -375,7 +379,7 @@ OnStartArena:
 	disablewaitingroomevent "Assistant#ama";
 	end;
 
-Onreset:
+OnReset:
 	enablewaitingroomevent "Assistant#ama";
 	end;
 }
@@ -396,16 +400,16 @@ OnTouch:
 	mes ".....or bl-ue toilet paper.... ";
 	close;
 }
-	
-ama_test,49,93,4	script	Grandpa#ama	766,{
+
+ama_test,49,93,4	script	Grandpa#ama	4_M_JPNOJI,{
 	end;
 
 OnInit:
 	disablenpc "Grandpa#ama";
 	end;
 }
-	
-ama_test,50,93,4	script	Grandma#ama1	761,10,10,{
+
+ama_test,50,93,4	script	Grandma#ama1	4_F_JPNOBA,10,10,{
 	end;
 
 OnInit:
@@ -422,6 +426,7 @@ OnTouch:
 	mes "[Grandpa]";
 	mes "Hmm. The Chief said Dokebi earned 20 million zeny by hacking others' accounts...";
 	next;
+	setquest 8127;
 	mes "[Grandma]";
 	mes "Dohhhhhhh!!!! ";
 	next;
@@ -460,7 +465,7 @@ OnTouch:
 	}
 	end;
 }
-	
+
 ama_test,34,15,0	script	Dokebi#ez	-1,{
 OnInit:
 	disablenpc "Dokebi#ez";
@@ -480,7 +485,7 @@ OnEnable:
 	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Dokebi#ez::OnMyMobDead";
 	end;
 
@@ -508,7 +513,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,34,16,0	script	Dokebi#hd	-1,{
 OnInit:
 	disablenpc "Dokebi#hd";
@@ -528,7 +533,7 @@ OnEnable:
 	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Dokebi#hd::OnMyMobDead";
 	end;
 
@@ -556,8 +561,8 @@ OnMyMobDead:
 	}
 	end;
 }
-	
-ama_test,50,100,3	script	Coach#ama	762,15,15,{
+
+ama_test,50,100,3	script	Coach#ama	4_M_JPN2,15,15,{
 	mes "[Coach]";
 	mes "Hoho~ Good.";
 	mes "I've been watching you in the VIP room. You were really something.";
@@ -582,6 +587,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "...Don't give me that look.";
 		mes "I was just joking. Hmmhmm.";
 		next;
+		changequest 8127,8128;
 		mes "[Coach]";
 		mes "Now, the Momotaro story is over.";
 		mes "You can get your reward when you talk to the Publisher lady you saw first.";
@@ -593,7 +599,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		donpcevent "Timer#ama::OnDisable";
 		warp "amatsu",223,230;
 		disablenpc "Coach#ama";
-		donpcevent "Assistant#ama::Onreset";
+		donpcevent "Assistant#ama::OnReset";
 		end;
 	case 2:
 		mes "[Coach]";
@@ -603,6 +609,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "Alright, hot stuff.";
 		mes "Do you want to listen to my proposal?";
 		next;
+		changequest 8127,8129;
 		mes "[Coach]";
 		mes "At this point I'm supposed to send you back...BUT!";
 		mes "I really want to know";
@@ -616,6 +623,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "Also, this mission will be pretty hard.";
 		next;
 		if (select("Nah.. I'm good.:Bring it on, foo'!") == 1) {
+			erasequest 8129;
 			mes "[Coach]";
 			mes "Hoho~I understand...";
 			mes "You must be exhausted from the previous battle. It would have been a grand battle, though...";
@@ -630,10 +638,11 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 			mes "Don't lose your high self-esteem";
 			mes "in the future. Farewell.";
 			next;
+			setquest 8128;
 			warp "amatsu",223,230;
 			disablenpc "Coach#ama";
 			donpcevent "Timer#ama::OnDisable";
-			donpcevent "Assistant#ama::Onreset";
+			donpcevent "Assistant#ama::OnReset";
 			end;
 		}
 		mes "[Coach]";
@@ -657,7 +666,7 @@ OnTouch:
 	mes "Tada~~~ !";
 	close;
 }
-	
+
 ama_test,34,17,0	script	Am Mut#ama	-1,{
 OnInit:
 	disablenpc "Am Mut#ama";
@@ -671,7 +680,7 @@ OnEnable:
 	monster "ama_test",56,108,"Am Mut",1301,1,"Am Mut#ama::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Am Mut#ama::OnMyMobDead";
 	end;
 
@@ -694,8 +703,8 @@ OnMyMobDead:
 	}
 	end;
 }
-	
-ama_test,50,100,3	script	Coach#after	762,5,5,{
+
+ama_test,50,100,3	script	Coach#after	4_M_JPN2,5,5,{
 	end;
 
 OnInit:
@@ -718,13 +727,14 @@ OnTouch:
 	mes "Don't forget to get your reward~";
 	close2;
 	set event_momo,3;
+	changequest 8129,8130;
 	warp "amatsu",223,230;
 	disablenpc "Coach#after";
 	donpcevent "Timer#ama::OnDisable";
-	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Assistant#ama::OnReset";
 	end;
 }
-	
+
 ama_test,34,18,0	script	Timer#ama	-1,{
 OnInit:
 	disablenpc "Timer#ama";
@@ -762,11 +772,11 @@ OnTimer362000:
 	end;
 
 OnTimer362500:
-	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Assistant#ama::OnReset";
 	donpcevent "Timer#ama::OnDisable";
 	end;
 }
-	
+
 ama_test,50,100,0	script	backwarp#ama	-1,25,25,{
 OnInit:
 	disablenpc "backwarp#ama";
@@ -777,11 +787,10 @@ OnTouch:
 	end;
 }
 
-// Sushi Quest
-//============================================================ 
-ama_in01,162,17,1	script	Sushi Master#ama	765,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 5000) {
+// Sushi Quest :: japan_sushi
+//============================================================
+ama_in01,162,17,1	script	Sushi Master#ama	4_M_JPNOJI2,{
+	if (MaxWeight - Weight < 5000) {
 		mes "[Magumagu]";
 		mes "Hey. You look really heavy.";
 		mes "Don't you have trouble walking?";
@@ -814,6 +823,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you my shop's special cuisine, Fish Slice, in return.";
 			next;
 			set fish_r,0;
+			erasequest 10036;
 			delitem 529,10; //Candy
 			getitem 544,15; //Fish_Slice
 			mes "[Magumagu]";
@@ -845,6 +855,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you two sets of Sushi in return.";
 			next;
 			set fish_r,0;
+			erasequest 10037;
 			delitem 964,10; //Crap_Shell
 			getitem 551,20; //Shusi
 			mes "[Magumagu]";
@@ -876,6 +887,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you several sets of Sushi in return.";
 			next;
 			set fish_r,0;
+			erasequest 10038;
 			delitem 961,10; //Conch
 			getitem 551,30; //Shusi
 			mes "[Magumagu]";
@@ -906,8 +918,9 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "Thanks. It is nothing but";
 			mes "I will give you a large amount of food in return.";
 			next;
-			delitem 1023,10; //Fish_Tail
 			set fish_r,0;
+			erasequest 10039;
+			delitem 1023,10; //Fish_Tail
 			getitem 544,20; //Fish_Slice
 			getitem 551,30; //Shusi
 			mes "[Magumagu]";
@@ -940,6 +953,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			next;
 			delitem 736,1; //White_Platter
 			set fish_r,0;
+			erasequest 10040;
 			getitem 551,20; //Shusi
 			mes "[Magumagu]";
 			mes "Share it with your friends";
@@ -998,6 +1012,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				next;
 				delitem 950,100; //Heart_Of_Mermaid
 				set ama_sushi,4;
+				completequest 10041;
 				getitem 1144,1; //Sasimi
 				mes "[Magumagu]";
 				mes "Here, take my knife.";
@@ -1061,6 +1076,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				next;
 				set ama_sushi,ama_sushi+1;
 				set fish_r,0;
+				erasequest 10041;
 				mes "[Magumagu]";
 				mes "Thanks a lot for today! Haha!";
 				mes "Come back again when you feel like helping. Take care...!!!";
@@ -1111,7 +1127,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "If you want to eat delicious fish slices, you better bring more money.";
 				close;
 			}
-			set zeny,zeny-700;
+			Zeny -= 700;
 			getitem 551,10; //Shusi
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1124,7 +1140,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "you better bring more money.";
 				close;
 			}
-			set zeny,zeny-74;
+			Zeny -= 74;
 			getitem 551,1; //Shusi
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1152,7 +1168,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "If you want to eat delicious fish slices, you better bring more money.";
 				close;
 			}
-			set zeny,zeny-350;
+			Zeny -= 350;
 			getitem 544,10; //Fish_Slice
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1165,7 +1181,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				mes "";
 				close;
 			}
-			set zeny,zeny-37;
+			Zeny -= 37;
 			getitem 544,1; //Fish_Slice
 			mes "[Magumagu]";
 			mes "There you go. If you like the taste, please order some more.";
@@ -1198,6 +1214,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			set .@fish_m1,rand(1,10);
 			if (.@fish_m1 == 1 || .@fish_m1 == 2) {
 				set fish_r,1;
+				setquest 10036;
 				mes "[Magumagu]";
 				mes "I need some candies to make";
 				mes "a dessert for the customers.";
@@ -1207,6 +1224,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 3 || .@fish_m1 == 4) {
 				set fish_r,2;
+				setquest 10037;
 				mes "[Magumagu]";
 				mes "I need some crab shells to make";
 				mes "a sauce for my cuisine...";
@@ -1216,6 +1234,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 5 || .@fish_m1 == 6) {
 				set fish_r,3;
+				setquest 10038;
 				mes "[Magumagu]";
 				mes "I have used all of my conches.";
 				mes "I need it to make an appetizer...";
@@ -1225,6 +1244,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 7 || .@fish_m1 == 8) {
 				set fish_r,4;
+				setquest 10039;
 				mes "[Magumagu]";
 				mes "Decorative fish tails are out of";
 				mes "stock. This is urgent...";
@@ -1234,6 +1254,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 9) {
 				set fish_r,5;
+				setquest 10040;
 				mes "[Magumagu]";
 				mes "We are missing a platter to serve";
 				mes "fish slices to customers.";
@@ -1244,6 +1265,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			else {
 				if (rand(1,10) == 1) {
 					set fish_r,6;
+					setquest 10041;
 					mes "[Magumagu]";
 					mes "Don't ask me why...";
 					mes "But, I need something special...";
@@ -1257,6 +1279,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				}
 				else {
 					set fish_r,5;
+					setquest 10040;
 					mes "[Magumagu]";
 					mes "We are missing a platter to serve";
 					mes "fish slices to customers.";
@@ -1280,9 +1303,9 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 	}
 }
 
-// Dungeon Quest
-//============================================================ 
-amatsu,112,164,4	script	Gate Soldier#ama1	767,{
+// Dungeon Quest :: japan_mono
+//============================================================
+amatsu,112,164,4	script	Gate Soldier#ama1	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	mes "This is the great palace,";
 	mes "Toukoujyo.";
@@ -1298,7 +1321,7 @@ amatsu,112,164,4	script	Gate Soldier#ama1	767,{
 	close;
 }
 	
-amatsu,119,164,4	script	Gate Soldier#ama2	767,{
+amatsu,119,164,4	script	Gate Soldier#ama2	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	mes "Are you from Rune-Midgard?";
 	mes "Welcome to Amatsu.";
@@ -1313,7 +1336,7 @@ amatsu,119,164,4	script	Gate Soldier#ama2	767,{
 	close;
 }
 	
-ama_in02,207,40,6	script	Gate Soldier#ama3	767,{
+ama_in02,207,40,6	script	Gate Soldier#ama3	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	mes "Welcome. The lord of the palace";
 	mes "has specially allowed guests";
@@ -1325,7 +1348,7 @@ ama_in02,207,40,6	script	Gate Soldier#ama3	767,{
 	close;
 }
 	
-ama_in02,207,49,6	script	Gate Soldier#ama4	767,{
+ama_in02,207,49,6	script	Gate Soldier#ama4	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	mes "The lord is really nice guy.";
 	mes "Who would know that our town was";
@@ -1340,13 +1363,14 @@ ama_in02,207,49,6	script	Gate Soldier#ama4	767,{
 	close;
 }
 	
-amatsu,164,174,4	script	Gate Soldier#ama5	767,{
+amatsu,164,174,4	script	Gate Soldier#ama5	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	if (event_amatsu == 0) {
 		mes "You can't enter here.";
 		mes "The mother of our lord is resting in here. She needs her rest.";
 		next;
 		set event_amatsu,1;
+		setquest 8131;
 		mes "[Gate Soldier]";
 		mes "She has been sick for months.";
 		mes "That is why she is staying in here.";
@@ -1377,7 +1401,7 @@ amatsu,164,174,4	script	Gate Soldier#ama5	767,{
 	close;
 }
 	
-amatsu,171,174,4	script	Gate Soldier#ama6	767,{
+amatsu,171,174,4	script	Gate Soldier#ama6	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	if (event_amatsu == 0) {
 		mes "You can't enter here.";
@@ -1417,7 +1441,7 @@ amatsu,171,174,4	script	Gate Soldier#ama6	767,{
 	close;
 }
 	
-ama_in02,187,57,2	script	Soldier#ama1	767,{
+ama_in02,187,57,2	script	Soldier#ama1	8_M_JPNSOLDIER,{
 	mes "[Ichiro]";
 	mes "Welcome.";
 	mes "Our lord prepared guest rooms";
@@ -1430,7 +1454,7 @@ ama_in02,187,57,2	script	Soldier#ama1	767,{
 	close;
 }
 	
-ama_in02,170,62,4	script	Soldier#ama2	767,{
+ama_in02,170,62,4	script	Soldier#ama2	8_M_JPNSOLDIER,{
 	mes "[Jiro]";
 	mes "I'm Jiro, the administrator";
 	mes "of this Palace. What can I do for you?";
@@ -1450,7 +1474,7 @@ ama_in02,170,62,4	script	Soldier#ama2	767,{
 			mes "to issue another Transit Permit.";
 			next;
 			if (select("Issue one:Talk to you later") == 1) {
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				getitem 7160,1; //Lord's_Passable_Ticket
 				mes "[Jiro]";
 				mes "There you go.";
@@ -1481,7 +1505,7 @@ ama_in02,170,62,4	script	Soldier#ama2	767,{
 	}
 }
 	
-ama_in02,37,157,4	script	Soldier#ama3	767,{
+ama_in02,37,157,4	script	Soldier#ama3	8_M_JPNSOLDIER,{
 	mes "[Saburo]";
 	mes "This is the training ground for improving our battle skills.";
 	mes "Please look around...";
@@ -1507,7 +1531,7 @@ ama_in02,37,157,4	script	Soldier#ama3	767,{
 	close;
 }
 	
-ama_in02,32,51,6	script	Soldier#ama4	767,{
+ama_in02,32,51,6	script	Soldier#ama4	8_M_JPNSOLDIER,{
 	mes "[Shiro]";
 	mes "*Cough, Cough* What...";
 	mes "Don't talk to me...";
@@ -1526,7 +1550,7 @@ ama_in02,32,51,6	script	Soldier#ama4	767,{
 	close;
 }
 	
-ama_in02,40,167,3	script	Soldier#ama5	767,{
+ama_in02,40,167,3	script	Soldier#ama5	8_M_JPNSOLDIER,{
 	mes "[Goro]";
 	mes "*Psst*... Please, be quiet.";
 	mes "I will tell you a story, okay?";
@@ -1554,7 +1578,7 @@ ama_in02,40,167,3	script	Soldier#ama5	767,{
 	close;
 }
 	
-ama_in02,32,167,5	script	Soldier#ama6	767,{
+ama_in02,32,167,5	script	Soldier#ama6	8_M_JPNSOLDIER,{
 	mes "[Rokuro]";
 	mes "He always talks nonsense.";
 	mes "He says that our lord";
@@ -1576,7 +1600,7 @@ ama_in02,32,167,5	script	Soldier#ama6	767,{
 	close;
 }
 	
-ama_in02,42,34,2	script	Soldier#ama7	767,{
+ama_in02,42,34,2	script	Soldier#ama7	8_M_JPNSOLDIER,{
 	mes "[Shichiro]";
 	mes "Have a good time.";
 	mes "My lord prepared some";
@@ -1592,7 +1616,7 @@ ama_in02,42,34,2	script	Soldier#ama7	767,{
 	close;
 }
 	
-ama_in02,203,156,4	script	Soldier#ama8	767,{
+ama_in02,203,156,4	script	Soldier#ama8	8_M_JPNSOLDIER,{
 	mes "[Hachiro]";
 	mes "My lord is inside.";
 	mes "If you'd like to greet him, feel free to enter.";
@@ -1606,7 +1630,7 @@ ama_in02,203,156,4	script	Soldier#ama8	767,{
 	close;
 }
 	
-ama_in02,195,156,4	script	Soldier#ama9	767,{
+ama_in02,195,156,4	script	Soldier#ama9	8_M_JPNSOLDIER,{
 	mes "[Kyuro]";
 	mes "This is not good.";
 	mes "My lord is really kind, but";
@@ -1621,7 +1645,7 @@ ama_in02,195,156,4	script	Soldier#ama9	767,{
 	close;
 }
 	
-ama_in02,115,177,7	script	Soldier#ama10	767,{
+ama_in02,115,177,7	script	Soldier#ama10	8_M_JPNSOLDIER,{
 	mes "[Jyuro]";
 	mes "What are you doing in here?";
 	mes "There is nothing interesting here.";
@@ -1713,7 +1737,7 @@ ama_in02,115,177,7	script	Soldier#ama10	767,{
 	close;
 }
 	
-ama_dun01,229,7,0	script	Soldier#ama11	767,{
+ama_dun01,229,7,0	script	Soldier#ama11	8_M_JPNSOLDIER,{
 	mes "[Jyuro]";
 	mes "Do you want to go back?";
 	next;
@@ -1729,7 +1753,7 @@ ama_dun01,229,7,0	script	Soldier#ama11	767,{
 	close;
 }
 	
-ama_in02,200,176,4	script	Lord of Palace#ama	768,{
+ama_in02,200,176,4	script	Lord of Palace#ama	8_M_JPNMASTER,{
 	if (event_amatsu == 0) {
 		mes "[Ishida Yoshinaga]";
 		mes "What! A foreigner...? *Phew*";
@@ -1779,6 +1803,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 			mes "may be able to cure my mother's disease. I will reward you well if you succeed...";
 			next;
 			set event_amatsu,2;
+			changequest 8131,8132;
 			mes "[Ishida Yoshinaga]";
 			mes "I beg you...Please.";
 			mes "My mother is living in a house outside of the palace.";
@@ -1836,6 +1861,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 			mes "with this ticket.";
 			next;
 			set event_amatsu,6;
+			completequest 8135;
 			delitem 1022,1; //Fox_Tail
 			getitem 7160,1; //Lord's_Passable_Ticket
 			mes "[Ishida Yoshinaga]";
@@ -1882,7 +1908,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 	close;
 }
 	
-ama_in01,22,111,0	script	Grandma#ama2	761,{
+ama_in01,22,111,0	script	Grandma#ama2	4_F_JPNOBA,{
 	if (event_amatsu == 4) {
 		mes "[....]";
 		mes "^FF6060Yelp, Yelp, a foolish human";
@@ -1921,6 +1947,7 @@ ama_in01,22,111,0	script	Grandma#ama2	761,{
 			monster "ama_in01",22,111,"Nine Tails",1180,1;
 			killmonsterall "ama_in01";
 			set event_amatsu,5;
+			changequest 8134,8135;
 			getitem 1022,1; //Fox_Tail
 			mes "[....]";
 			mes "^FF6060Everything that";
@@ -2025,7 +2052,7 @@ ama_in01,22,111,0	script	Grandma#ama2	761,{
 	end;
 }
 	
-amatsu,189,166,5	script	Kouji#ama	764,{
+amatsu,189,166,5	script	Kouji#ama	4_M_JPNCHIBI,{
 	mes "[Kouji]";
 	mes "Ralralrah Ralralrah Ralralrahralralrah~";
 	mes "Ralralrah Ralralrah Ralralrahralralrah~";
@@ -2049,6 +2076,7 @@ amatsu,189,166,5	script	Kouji#ama	764,{
 		mes "A fox is following me!";
 		mes "If he doesn't leave when I scream and shout!";
 		mes "The North Shrine Priest should help me out~";
+		changequest 8132,8133;
 	}
 	else if (event_amatsu == 4) {
 		mes "Priest, priest~";
@@ -2079,7 +2107,7 @@ amatsu,189,166,5	script	Kouji#ama	764,{
 	close;
 }
 	
-ama_in01,169,173,1	script	Shaman#ama	769,{
+ama_in01,169,173,1	script	Shaman#ama	4_F_JPNMU,{
 	mes "[Tokako]";
 	mes "Er, I'm not really a shaman...";
 	mes "My friend, Takehue-kun brought";
@@ -2100,7 +2128,7 @@ ama_in01,169,173,1	script	Shaman#ama	769,{
 	close;
 }
 	
-ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
+ama_in01,180,173,3	script	Kitsune Mask#ama	4_M_JPN2,{
 	if (event_amatsu == 3) {
 		mes "[Takehue]";
 		mes "Eh, you are a foreigner.";
@@ -2144,6 +2172,7 @@ ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
 		mes "Good. Show that spiritual";
 		mes "energy to the fox several times.";
 		mes "Sooner or later, you'll be successful.";
+		changequest 8133,8134;
 		close;
 	}
 	else if (event_amatsu == 4) {
@@ -2169,12 +2198,12 @@ ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Rewrote parts of other/momotaro.txt to make it work.
-//=	I'm sorry for the mess, I couldn't do much better with
-//=	the current code I had.
+//=     I'm sorry for the mess, I couldn't do much better with
+//=     the current code I had.
 //= 1.1 Added Sushi Quest and Amatsu Event from cities/ [Evera]
 //= 1.2 Fixed Momotaro Quest, thanks to .~Abism0~. [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 37d8d774b..5a30866f7 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Quest NPCs related to Ayothaya
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
-//= 2.3
-//===== Compatible With ======================================
-//= rAthena SVN
+//= 2.5
 //===== Description ==========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Ayothaya Ring Quest
 //= Ayothaya Dungeon Quest
 //= Tom Yum Goong Quest
@@ -16,27 +14,27 @@
 //= 1.1 Added anti-novice protection [Lupus]
 //= 1.3 Fixed exploit [Lupus]
 //= 1.4 Updated, more close to the official. Thanks to birkiczd
-//=	Also optimized it again, remove unused global variable [Lupus]
+//=     Also optimized it again, remove unused global variable [Lupus]
 //= 1.5 Removed Duplicates [Silent]
 //= 1.6 Moved quests from cities/ to here:
-//= Shrimp, Dungeon, Tom Yum Goong [Evera]
+//=     Shrimp, Dungeon, Tom Yum Goong [Evera]
 //= 1.7 Updated the Ayothaya Ring quest to the official one [MasterOfMuppets]
 //= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.0 Rescripted Tom Yum Goong and Dungeon quest to Aegis [L0ne_W0lf]
-//=	10.3 standards.
+//=     10.3 standards.
 //= 2.0a Corrected a Typo error ";;". [Samuray22]
 //= 2.1 Added missing checkweights. [L0ne_W0lf]
 //= 2.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.3 Replaced effect numerics with constants. [Samuray22]
+//= 2.4 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.5 Added questlog support. [Euphy]
 //============================================================
 
-// Ayothaya Ring Quest
+// Ayothaya Ring Quest :: ayo_ring
 //============================================================
-ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
-
-	if(thai_find == 14)
-	{
+ayothaya,233,105,3	script	Powerful-Looking Woman	4_F_THAIAYO,2,2,{
+	if (thai_find == 14) {
 		mes "[Shuda]";
 		mes "Have you";
 		mes "found Annon?";
@@ -60,9 +58,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		mes "He will be ^660000punished^000000...";
 		mes "^666666*grinds teeth*^000000";
 		close;
-	}
-	else if(thai_find > 2 && thai_find < 14)
-	{
+	} else if (thai_find > 2 && thai_find < 14) {
 		mes "[Shuda]";
 		mes "^666666*Sigh...*^000000";
 		mes "You haven't";
@@ -74,11 +70,8 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		mes "And by 'us,' I mean '^660000you^000000.' I don't care about your plans or whatever else you may have scheduled, because you're going to make";
 		mes "time for me! Oho ho ho ho ho!";
 		close;
-	}
-	else if(thai_find == 2)
-	{
-		if(countitem(7288)) //Engagement Ring
-		{
+	} else if (thai_find == 2) {
+		if (countitem(7288)) {
 			mes "[Shuda]";
 			mes "Ah... Is it...?!!";
 			mes "Yes, that's it!";
@@ -110,8 +103,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "^3355FFShuda gazes directly";
 			mes "at you with a puppy eyed look.^000000";
 			next;
-			switch( select( "D-Don't look at me that way!:Alright, alright." ) )
-			{
+			switch(select("D-Don't look at me that way!:Alright, alright.")) {
 			case 1:
 				mes "[Shuda]";
 				mes "Oh come on, you know everything that happened, and I know you're gonna continue adventuring";
@@ -134,10 +126,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "(Why am I always";
 				mes "doing things for other";
 				mes "people anyway?!)";
-				delitem 7288,1; //Engagement Ring
-				set thai_find,3;
-				close;
-			break;
+				break;
 			case 2:
 				mes "[Shuda]";
 				mes "Yes, I knew I could count on you! So find Annon! It's my destiny to make him ^660000mine^000000. Hoo ho ho ho ho!";
@@ -148,14 +137,13 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "[Shuda]";
 				mes "Will you please tell Annon that";
 				mes "I got my ring back so he can come back to me now? I hope you'll remember that for me, adventurer.";
-				delitem 7288,1; //Engagement Ring
-				set thai_find,3;
-				close;
-			break;
+				break;
 			}
-		}
-		else
-		{
+			delitem 7288,1; //Thai_Ring
+			changequest 12030,12031;
+			set thai_find,3;
+			close;
+		} else {
 			mes "[Shuda]";
 			mes "Huh...?";
 			mes "Did you find my ring?";
@@ -172,11 +160,11 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "my ring. I'll be waiting";
 			mes "here for the good news.";
 			mes "Oho ho ho ho ho~!";
+			if (checkquest(12029) == -1)
+				setquest 12029;
 			close;
 		}
-	}
-	else if(thai_find == 1)
-	{
+	} else if (thai_find == 1) {
 		mes "[Shuda]";
 		mes "I feel a little bad asking you this, especially since you're";
 		mes "an outsider.";
@@ -189,15 +177,12 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		mes "Please bring my ring back to me.";
 		mes "I want to live with Annon as a happy couple forever. Can't you understand that?!";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Powerful-Looking Woman]";
 		mes "Umm...?";
 		mes "Ah, you must be one of the tourists. I'd guide you around and listen to your stories about the outside world, but...";
 		next;
-		if(rand(0,1))
-		{
+		if (rand(0,1)) {
 			mes "[Powerful-Looking Woman]";
 			mes "I'm reeeally";
 			mes "busy right now.";
@@ -213,8 +198,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "my fiancee hadn't";
 			mes "thrown it...";
 			next;
-			switch( select( "What...?:Lies~!" ) )
-			{
+			switch(select("What...?:Lies~!")) {
 			case 1:
 				mes "[Powerful-Looking Woman]";
 				mes "What 'what?'";
@@ -234,7 +218,6 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "Wh-who are you to say";
 				mes "something so rude to such a nice lady like myself. Go away, I don't wanna talk to you!";
 				close;
-			break;
 			case 2:
 				mes "[Powerful-Looking Woman]";
 				mes "What lies?";
@@ -272,18 +255,15 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "Why are you staring at me?";
 				mes "Don't you have anything to do?";
 				next;
-				switch( select( "No.:No~ and you are an interesting girl." ) )
-				{
+				switch(select("No.:No~ and you are an interesting girl.")) {
 				case 1:
 					mes "[Powerful-Looking Woman]";
 					mes "I see. Hmmm...";
 					mes "You're kind of my type.";
-					if(sex)
-					{
+					if (Sex) {
 						mes "No no, that doesn't mean I'm interested in you. Plus I'm";
 						mes "already engaged.";
-					}
-					else
+					} else
 						mes "Before you think of anything weird, I meant that I think you and me are a lot alike.";
 					next;
 					mes "[Powerful-Looking Woman]";
@@ -343,7 +323,6 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					emotion e_heh;
 					set thai_find,1;
 					close;
-				break;
 				case 2:
 					mes "[Powerful-Looking Woman]";
 					mes "^666666*Sigh...*^000000";
@@ -407,15 +386,14 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					next;
 					mes "[Shuda]";
 					mes "So go and look under the water! There's no water current, so I'm sure it's still there! What are you waiting for, it's should be an easy swim for you! Oho ho ho ho ho!";
+					if (checkquest(12029) == -1)
+						setquest 12029;
 					set thai_find,1;
 					close;
-				break;
 				}
 			break;
 			}
-		}
-		else
-		{
+		} else {
 			mes "[Powerful-Looking Woman]";
 			mes "^666666*Sigh...*^000000";
 			mes "Why isn't it coming up from the water? Maybe if I stirred around with a wooden stick...?";
@@ -438,8 +416,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 	}
 
 OnTouch:
-	if(thai_find == 0)
-	{
+	if (thai_find == 0) {
 		mes "[Powerful-Looking Woman]";
 		mes "^666666*Sigh...*^000000";
 		mes "Where the";
@@ -451,15 +428,11 @@ OnTouch:
 		mes "Haven't you ever seen a delicate damsel sigh before? Leave me the hell alone!";
 		close;
 	}
-	
 }
-	
-ayo_dun02,91,263,0	script	#Annonblood	111,2,3,{
 
-if(!$annonactive)
-{
-	if(thai_find == 13)
-	{
+ayo_dun02,91,263,0	script	#Annonblood	HIDDEN_NPC,2,3,{
+if (!$@annonactive) {
+	if (thai_find == 13) {
 		mes "["+strcharinfo(0)+"]";
 		mes "A blood stain?";
 		mes "What's going on?";
@@ -477,11 +450,9 @@ if(!$annonactive)
 		mes "[" +strcharinfo(0)+ "]";
 		mes "Hmmm....";
 		next;
-		switch( select( "Scatter the bushes.:Dig up the bushes." ) )
-		{
+		switch(select("Scatter the bushes.:Dig up the bushes.")) {
 		case 1:
-			if(!rand(0,2))
-			{
+			if (!rand(0,2)) {
 				mes "[" +strcharinfo(0)+ "]";
 				mes "^666666*Cough cough*^000000";
 				mes "It's so dusty!";
@@ -502,7 +473,7 @@ if(!$annonactive)
 				mes "^3355FFshrubbery, you find";
 				mes "a small burrow.^000000";
 				next;
-				set $annonactive,1;
+				set $@annonactive,1;
 				enablenpc "Haggard Man";
 				mes "[Haggard Man]";
 				mes "^666666*Cough cough!*^000000";
@@ -511,18 +482,16 @@ if(!$annonactive)
 				mes "stay back, or I'll kill myself!";
 				emotion e_omg,1;
 				next;
-				switch( select( "What are you doing here?:I'm not Shuda!" ) )
-				{
+				switch(select("What are you doing here?:I'm not Shuda!")) {
 				case 1:
 					mes "["+strcharinfo(0)+"]";
 					mes "Hey...";
 					mes "What are you doi--";
 					next;
-					set $annonactive,0;
+					set $@annonactive,0;
 					disablenpc "Haggard Man";
 					mes "^3355FFHe vanished!^000000";
 					close;
-				break;
 				case 2:
 					mes "[Haggard Man]";
 					mes "Hmmm...?";
@@ -531,11 +500,8 @@ if(!$annonactive)
 					mes "[Haggard Man]";
 					mes "You are unfamiliar to me, outsider. I'm unsure of how you found my hiding place, but if you have something to say, make it short!";
 					close;
-				break;
 				}
-			}
-			else
-			{
+			} else {
 				mes "^3355FFYou dig up the bushes, stirring";
 				mes "up a large, choking cloud of dust.^000000";
 				next;
@@ -546,22 +512,18 @@ if(!$annonactive)
 				mes "of dust!";
 				close;
 			}
-		break;
 		case 2:
 			mes "^3355FFAs you dig up the bushes, the ground beneath one of the bushes crumbles and you hear a scream";
 			mes "from beneath.^000000";
 			next;
-			if(!rand(0,2))
-			{
-				set $annonactive,1;
+			if (!rand(0,2)) {
+				set $@annonactive,1;
 				enablenpc "Haggard Man";
 				mes "[?]";
 				mes "^666666*Cough cough*^000000";
 				mes "...M-my legs!";
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[" +strcharinfo(0)+ "]";
 				mes "Hmmm...?";
 				mes "What was that noise?";
@@ -570,25 +532,18 @@ if(!$annonactive)
 				mes "^666666*cough cough cough*^000000";
 				close;
 			}
-		break;
 		}
-	}
-	else if(thai_find == 14)
-	{
+	} else if (thai_find == 14) {
 		mes "^3355FFYou find that the burrow is empty. It seems Annon has found a new hiding place.^000000";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "^3355FFYou find a pile of dead bushes under a large tree. The area around the bushes seems awfully dusty.^000000";
 		close;
 	}
 
-	OnTouch:
-	if(thai_find == 12)
-	{
-		if(!rand(0,2))
-		{
+OnTouch:
+	if (thai_find == 12) {
+		if (!rand(0,2)) {
 			emotion e_gasp,1;
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Huh...?";
@@ -607,18 +562,17 @@ if(!$annonactive)
 			mes "a blood stain in";
 			mes "this kind of place...";
 			set thai_find,13;
+			changequest 12033,12034;
 			close;
 		}
 	}
-
 }
-	
+
 }
-	
-ayo_dun02,91,264,3	script	Haggard Man	841,{
 
-	if(thai_find == 13)
-	{
+ayo_dun02,91,264,3	script	Haggard Man	4_M_THAIAYO,{
+	//completequest 12034;
+	if (thai_find == 13) {
 		mes "[Haggard Man]";
 		mes "^666666*...Cough cough*^000000";
 		mes "No...! My hiding place!";
@@ -629,19 +583,17 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 		mes "Oh, how did this happen?";
 		mes "My spiritual training wasn't supposed to go like this...!";
 		next;
-		switch( select( "Treat his wound first.:Is that you, Annon?" ) )
-		{
+		switch(select("Treat his wound first.:Is that you, Annon?")) {
 		case 1:
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Anyway, I think you need to be treated. Let me check if I have some potions.";
 			next;
-			if(countitem(504)) //White potion
-			{
+			if (countitem(504)) {
 				mes "["+strcharinfo(0)+"]";
 				mes "Ah...";
 				mes "Here we are,";
 				mes "a White Potion.";
-				delitem 504,1; //White potion
+				delitem 504,1; //White_Potion
 				next;
 				mes "[Haggard Man]";
 				mes "You mean the White Potion,";
@@ -689,8 +641,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "It looks like you wish to know more. If you promise me that you will not mention my whereabouts";
 				mes "to Shuda, then I'll explain.";
 				next;
-				switch( select( "You think the world revolves around you?:What do you want me to do?" ) )
-				{
+				switch(select("You think the world revolves around you?:What do you want me to do?")) {
 				case 1:
 					mes "[" +strcharinfo(0)+ "]";
 					mes "You think the world";
@@ -717,74 +668,11 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 					mes "[Annon]";
 					mes "Of course, if you reveal to her that you've found me, I'll repay your favor. I implore you, just pretend you haven't found me, please?";
 					next;
-					menu "...Alright, alright.",-;
+					select("...Alright, alright.");
 					mes "[Annon]";
 					mes "Thank you so much!";
 					mes "Now, to pay you back, let me use one of the skills I've learned in my spiritual training.";
-					next;
-					mes "[Annon]";
-					mes "Let's see...";
-					mes "Let me twist your";
-					mes "arm this way, and";
-					mes "apply pressure here...";
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Wahhh~!";
-					mes "What the hell";
-					mes "are you doing!";
-					mes "You're hurting me, man!";
-					next;
-					mes "[Annon]";
-					mes "Oh, this is a special kind of massage. Don't worry, it'll relieve you of fatigue. It's quite heavenly, actually. You'll see~";
-					next;
-					mes "^3355FF*Snap snap snap*";
-					mes "*Snap snap snap*";
-					mes "*Crack crack crack*";
-					mes "*Crack crack crack*^000000";
-					next;
-					mes "^3355FFYou feel as though Annon";
-					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
-					set thai_find,14;
-					if(BaseLevel < 56)
-						getexp 900,0;
-					else if(BaseLevel > 55 && BaseLevel < 61)
-						getexp 1050,0;
-					else if(BaseLevel > 60 && BaseLevel < 66)
-						getexp 1868,0;
-					else if(BaseLevel > 65 && BaseLevel < 71)
-						getexp 2741,0;
-					else if(BaseLevel > 70 && BaseLevel < 76)
-						getexp 7076,0;
-					else if(BaseLevel > 75 && BaseLevel < 81)
-						getexp 13025,0;
-					else if(BaseLevel > 80 && BaseLevel < 86)
-						getexp 15034,0;
-					else if(BaseLevel > 85 && BaseLevel < 91)
-						getexp 18205,0;
-					else if(BaseLevel > 90)
-						getexp 40679,0;
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Whoa...?";
-					mes "That felt was so great~";
-					mes "It even feels like my mind";
-					mes "has been cleansed too!";
-					mes "You've got a deal!";
-					next;
-					mes "[Annon]";
-					mes "Thank you, thank you so much.";
-					mes "Now I can avoid being tied to Shuda, at least for a little longer.";
-					next;
-					mes "[Annon]";
-					mes "Now, if you'll excuse me,";
-					mes "I must make good my escape";
-					mes "before others find me.";
-					mes "Good day~!";
-					close2;
-					set $annonactive,0;
-					disablenpc "Haggard Man";
-					end;
-				break;
+					break;
 				case 2:
 					mes "[Annon]";
 					mes "Of course, what I want you to do is to keep me a secret from Shuda. Just forget that you've ever met me, and let Shuda know it was impossible to find me.";
@@ -795,76 +683,78 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 					mes "[Annon]";
 					mes "Now, you must be wondering";
 					mes "how I would repay you for your silence. Well, let me show you one of the skills I've learned in my spiritual training.";
-					next;
-					mes "[Annon]";
-					mes "Let's see...";
-					mes "Let me twist your";
-					mes "arm this way, and";
-					mes "apply pressure here...";
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Wahhh~!";
-					mes "What the hell";
-					mes "are you doing!";
-					mes "You're hurting me, man!";
-					next;
-					mes "[Annon]";
-					mes "Oh, this is a special kind";
-					mes "of massage. Don't worry, it'll";
-					mes "relieve you of fatigue. It's quite heavenly, actually. You'll see~";
-					next;
-					mes "^3355FF*Snap snap snap*";
-					mes "*Snap snap snap*";
-					mes "*Crack crack crack*";
-					mes "*Crack crack crack*^000000";
-					next;
-					mes "^3355FFYou feel as though Annon";
-					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
-					set thai_find,14;
-					if(BaseLevel < 56)
-						getexp 900,0;
-					else if(BaseLevel > 55 && BaseLevel < 61)
-						getexp 1050,0;
-					else if(BaseLevel > 60 && BaseLevel < 66)
-						getexp 1868,0;
-					else if(BaseLevel > 65 && BaseLevel < 71)
-						getexp 2741,0;
-					else if(BaseLevel > 70 && BaseLevel < 76)
-						getexp 7076,0;
-					else if(BaseLevel > 75 && BaseLevel < 81)
-						getexp 13025,0;
-					else if(BaseLevel > 80 && BaseLevel < 86)
-						getexp 15034,0;
-					else if(BaseLevel > 85 && BaseLevel < 91)
-						getexp 18205,0;
-					else if(BaseLevel > 90)
-						getexp 40679,0;
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Whoa...?";
-					mes "That felt was so great~";
-					mes "It even feels like my mind";
-					mes "has been cleansed too!";
-					mes "You've got a deal!";
-					next;
-					mes "[Annon]";
-					mes "Thank you, thank you so much.";
-					mes "Now I can avoid being tied to Shuda, at least for a little longer.";
-					next;
-					mes "[Annon]";
-					mes "Now, if you'll excuse me,";
-					mes "I must make good my escape";
-					mes "before others find me.";
-					mes "Good day~!";
-					close2;
-					set $annonactive,0;
-					disablenpc "Haggard Man";
-					end;
-				break;
+					break;
 				}
-			}
-			else
-			{
+				next;
+				mes "[Annon]";
+				mes "Let's see...";
+				mes "Let me twist your";
+				mes "arm this way, and";
+				mes "apply pressure here...";
+				next;
+				mes "[" +strcharinfo(0)+ "]";
+				mes "Wahhh~!";
+				mes "What the hell";
+				mes "are you doing!";
+				mes "You're hurting me, man!";
+				next;
+				mes "[Annon]";
+				mes "Oh, this is a special kind";
+				mes "of massage. Don't worry, it'll";
+				mes "relieve you of fatigue. It's quite heavenly, actually. You'll see~";
+				next;
+				mes "^3355FF*Snap snap snap*";
+				mes "*Snap snap snap*";
+				mes "*Crack crack crack*";
+				mes "*Crack crack crack*^000000";
+				next;
+				mes "^3355FFYou feel as though Annon";
+				mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
+				set thai_find,14;
+				completequest 12034;
+				if (checkre(3)) {
+					if (BaseLevel < 56) getexp 900,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 1050,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 1868,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 2741,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 7075,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 13024,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 15034,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 18205,0;
+					else getexp 40678,0;
+				} else {
+					if (BaseLevel < 56) getexp 9000,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 10500,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 18684,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 27411,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 70757,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 130246,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 150340,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 182052,0;
+					else getexp 406786,0;
+				}
+				next;
+				mes "[" +strcharinfo(0)+ "]";
+				mes "Whoa...?";
+				mes "That felt was so great~";
+				mes "It even feels like my mind";
+				mes "has been cleansed too!";
+				mes "You've got a deal!";
+				next;
+				mes "[Annon]";
+				mes "Thank you, thank you so much.";
+				mes "Now I can avoid being tied to Shuda, at least for a little longer.";
+				next;
+				mes "[Annon]";
+				mes "Now, if you'll excuse me,";
+				mes "I must make good my escape";
+				mes "before others find me.";
+				mes "Good day~!";
+				close2;
+				set $@annonactive,0;
+				disablenpc "Haggard Man";
+				end;
+			} else {
 				mes "[" +strcharinfo(0)+ "]";
 				mes "No way, no way.";
 				mes "He's too seriously";
@@ -887,7 +777,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "me back inside!";
 				mes "Wahhhhhh~!";
 				next;
-				set $annonactive,0;
+				set $@annonactive,0;
 				disablenpc "Haggard Man";
 				mes "[" +strcharinfo(0)+ "]";
 				mes "Okay, it's time";
@@ -899,7 +789,6 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				emotion e_no1,1;
 				close;
 			}
-		break;
 		case 2:
 			mes "[Haggard Man]";
 			mes "Annon...?";
@@ -923,34 +812,28 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 			mes "hide from Shuda.";
 			mes "^666666*Cries*^000000";
 			close2;
-			set $annonactive,0;
+			set $@annonactive,0;
 			disablenpc "Haggard Man";
 			end;
-		break;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Haggard Man]";
 		mes "Huh? Who are you?";
 		mes "This isn't a safe place for a tourists! You should leave right away!";
 		close2;
-		set $annonactive,0;
+		set $@annonactive,0;
 		disablenpc "Haggard Man";
 		end;
 	}
-	
+
 OnInit:
-	set $annonactive,0;
+	set $@annonactive,0;
 	disablenpc "Haggard Man";
 	end;
-	
 }
 		
-ayothaya,253,99,3	script	Fisherman	843,{
-
-	if(thai_find == 1)
-	{
+ayothaya,253,99,3	script	Fisherman	4_M_THAIONGBAK,{
+	if (thai_find == 1) {
 		mes "[Dannai]";
 		mes "This place is known to be";
 		mes "teeming with fish. The fish here tend to eat anything they find,";
@@ -964,11 +847,9 @@ ayothaya,253,99,3	script	Fisherman	843,{
 		mes "Would you";
 		mes "like to try?";
 		next;
-		switch( select( "Yes.:No, thanks." ) )
-		{
+		switch(select("Yes.:No, thanks.")) {
 		case 1:
-			if(countitem(528) && Zeny > 49) //Monster food
-			{
+			if (countitem(528) && Zeny > 49) {
 				mes "^3355FFYou cast your";
 				mes "fishing line";
 				mes "into the water.^000000";
@@ -980,61 +861,48 @@ ayothaya,253,99,3	script	Fisherman	843,{
 				next;
 				mes "^3355FFYou've hooked a Phen!^000000";
 				next;
-				delitem 528,1; //Monster food
-				set Zeny,Zeny-50;
-				set @randfish,rand(1,100);
-				if(@randfish > 0 && @randfish < 40)
-				{
+				delitem 528,1; //Monster's_Feed
+				Zeny -= 50;
+				set .@randfish,rand(1,100);
+				if (.@randfish > 0 && .@randfish < 40) {
 					mes "^3355FFWhile cooking the Phen, you";
 					mes "find that it's swallowed a Stone.^000000";
 					close2;
 					getitem 7049,1; //Stone
 					end;
-				}
-				else if(@randfish > 39 && @randfish < 60)
-				{
+				} else if (.@randfish > 39 && .@randfish < 60) {
 					mes "^3355FFInside of the Phen,";
 					mes "you find a Red Potion.^000000";
 					close2;
-					getitem 501,1; //Red potion
+					getitem 501,1; //Red_Potion
 					end;
-				}
-				else if(@randfish > 59 && @randfish < 70)
-				{
+				} else if (.@randfish > 59 && .@randfish < 70) {
 					mes "^3355FFInside of the Phen,";
 					mes "you find a Yellow Potion.^000000";
 					close2;
-					getitem 503,1; //Yellow potion
+					getitem 503,1; //Yellow_Potion
 					end;
-				}
-				else if(@randfish > 69 && @randfish < 80)
-				{
+				} else if (.@randfish > 69 && .@randfish < 80) {
 					mes "^3355FFThere's nothing inside...";
 					mes "But now you can eat Sushi!^000000";
 					close2;
-					getitem 551,1; //Sushi
+					getitem 551,1; //Shusi
 					end;
-				}
-				else if(@randfish > 79 && @randfish < 90)
-				{
+				} else if (.@randfish > 79 && .@randfish < 90) {
 					mes "^3355FFYou find";
 					mes "a Flower Ring";
 					mes "inside the Phen.^000000";
 					close2;
-					getitem 2612,1; //Flower ring
+					getitem 2612,1; //Flower_Ring
 					end;
-				}
-				else if(@randfish == 90)
-				{
+				} else if (.@randfish == 90) {
 					mes "^3355FFYou find";
 					mes "a Diamond Ring";
 					mes "inside the Phen.^000000";
 					close2;
-					getitem 2613,1; //Diamond ring
+					getitem 2613,1; //Diamond_Ring
 					end;
-				}
-				else if(@randfish > 90 && @randfish < 101)
-				{
+				} else if (.@randfish > 90 && .@randfish < 101) {
 					mes "^3355FFYou find a ring";
 					mes "with a name engraved";
 					mes "inside the band.^000000";
@@ -1043,17 +911,15 @@ ayothaya,253,99,3	script	Fisherman	843,{
 					mes "engagement ring.^000000";
 					close2;
 					set thai_find,2;
-					getitem 7288,1; //Engagement ring
+					changequest 12029,12030;
+					getitem 7288,1; //Thai_Ring
 					end;
 				}
-			}
-			else
-			{
+			} else {
 				mes "[Dannai]";
 				mes "Remember, you need ^3355FF1 Monster's Feed^000000 to use as bait and ^3355FF50 zeny^000000 to rend a rod.";
 				close;
 			}
-		break;
 		case 2:
 			mes "[Dannai]";
 			mes "No problem,";
@@ -1062,12 +928,9 @@ ayothaya,253,99,3	script	Fisherman	843,{
 			mes "the mind and makes you";
 			mes "feel at peace...";
 			close;
-		break;
 		}
 		close;
-	}
-	else if(thai_find < 1)
-	{
+	} else if (thai_find < 1) {
 		mes "[Dannai]";
 		mes "The fish here tend";
 		mes "to eat anything they find.";
@@ -1079,9 +942,7 @@ ayothaya,253,99,3	script	Fisherman	843,{
 		mes "why don't you sit down, relax";
 		mes "and enjoy some quiet fishing?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Dannai]";
 		mes "Welcome, long time no see!";
 		mes "It seems people learned that you found some kind of fortune from fishing here. After word got around, I've been getting lots";
@@ -1100,30 +961,26 @@ ayothaya,253,99,3	script	Fisherman	843,{
 		mes "own fortunes.";
 		close;
 	}
-	
 }
-	
-ayo_dun01,255,62,0	script	AyoFootprint1	139,2,0,{
+
+ayo_dun01,255,62,0	script	AyoFootprint1	HIDDEN_WARP_NPC,2,0,{
 OnTouch:
-	if(thai_find == 4)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 4) {
+		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
 			mes "^3355FFYou find footprints heading to the ^5C3317North^3355FF. It looks like somebody was in quite a hurry, just like the villager said!^000000";
 			set thai_find,5;
+			changequest 12032,12033;
 			close;
 		}
 	}
-	
+	end;
 }
-	
-ayo_dun01,74,142,0	script	AyoFootprint2	139,2,0,{
+
+ayo_dun01,74,142,0	script	AyoFootprint2	HIDDEN_WARP_NPC,2,0,{
 OnTouch:
-	if(thai_find == 5)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 5) {
+		if (rand(1,3) < 2) {
 			emotion e_dots,1;
 			mes "^3355FFYou find another set of footprints. It seems that somebody was running away from something. These prints are heading to the ^5C3317East^3355FF. You'd better follow them to see what";
 			mes "you can find.^000000";
@@ -1131,15 +988,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
-ayo_dun01,244,256,2	script	AyoFootprint3	139,2,0,{
+
+ayo_dun01,244,256,2	script	AyoFootprint3	HIDDEN_WARP_NPC,2,0,{
 OnTouch:
-	if(thai_find == 6)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 6) {
+		if (rand(1,3) < 2) {
 			emotion e_no,1;
 			mes "^3355FFThe footprints end around this area. Whoever was running must";
 			mes "have been exhausted and stumbled on something. Perhaps the owner of the footprints is nearby...^000000";
@@ -1147,15 +1002,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
-ayo_dun01,17,257,0	script	AyoFootprint4	139,2,0,{
+
+ayo_dun01,17,257,0	script	AyoFootprint4	HIDDEN_WARP_NPC,2,0,{
 OnTouch:
-	if(thai_find == 7)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 7) {
+		if (rand(1,3) < 2) {
 			emotion e_ic,1;
 			mes "^3355FFAs you follow the footprints,";
 			mes "you arrive at the '^5C3317Entrance of the Shrine^3355FF.' Whoever this person was, he just ran into the second level.^000000";
@@ -1163,15 +1016,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
-ayo_dun02,145,120,0	script	AyoFootprint5	139,2,0,{
+
+ayo_dun02,145,120,0	script	AyoFootprint5	HIDDEN_WARP_NPC,2,0,{
 OnTouch:
-	if(thai_find == 8)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 8) {
+		if (rand(1,3) < 2) {
 			mes "^3355FFYou find the same footprints";
 			mes "in this place. It seems pretty";
 			mes "dangerous, and you wonder why";
@@ -1182,16 +1033,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
-	
-ayo_dun02,135,168,0	script	AyoFootprint6	139,0,2,{
+
+ayo_dun02,135,168,0	script	AyoFootprint6	HIDDEN_WARP_NPC,0,2,{
 OnTouch:
-	if(thai_find == 9)
-	{
-		if (rand(1,3) == 1)
-		{
+	if (thai_find == 9) {
+		if (rand(1,3) == 1) {
 			emotion e_gasp,1;
 			mes "^3355FFThe trail of footprints";
 			mes "continue here, and seem";
@@ -1200,18 +1048,15 @@ OnTouch:
 			mes "^3355FFHmm...?";
 			mes "There's something here...^000000";
 			next;
-			switch( select( "Ignore.:^5C3317Investigate.^000000" ) )
-			{
+			switch(select("Ignore.:^5C3317Investigate.^000000")) {
 			case 1:
 				mes "["+strcharinfo(0)+"]";
 				mes "Well, it's probably nothing. But which way should I go now?";
 				set thai_find,10;
 				close;
-			break;
 			case 2:
-				set @randayo,rand(1,10);
-				if(@randayo < 2)
-				{
+				set .@randayo,rand(1,10);
+				if (.@randayo < 2) {
 					mes "["+strcharinfo(0)+"]";
 					mes "Why, this is a pack of White Potions. Whoever owned these must have dropped these by accident. Hmm, I could use these for later...";
 					next;
@@ -1223,11 +1068,9 @@ OnTouch:
 					mes "I better look";
 					mes "into this.";
 					set thai_find,10;
-					getitem 504,10; //White potion
+					getitem 504,10; //White_Potion
 					close;
-				}
-				else if(@randayo > 2 && @randayo < 5)
-				{
+				} else if (.@randayo > 2 && .@randayo < 5) {
 					mes "["+strcharinfo(0)+"]";
 					mes "Why, this is a pack of Yellow Potions. Whoever owned these must have dropped these by accident. Hmm, I could use these for later...";
 					next;
@@ -1241,9 +1084,7 @@ OnTouch:
 					set thai_find,10;
 					getitem 503,10; //Yellow potion
 					close;
-				}
-				else
-				{
+				} else {
 					mes "[Rat]";
 					mes "^FF0000Squeak!";
 					mes "^FF0000Squeak Squeak!^000000";
@@ -1262,20 +1103,17 @@ OnTouch:
 					set thai_find,10;
 					close;
 				}
-			break;
 			}
 			close;
 		}
 	}
-	
+	end;
 }
-	
-ayo_dun02,77,213,0	script	AyoFootprint7	139,1,1,{
+
+ayo_dun02,77,213,0	script	AyoFootprint7	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
-	if(thai_find == 10)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 10) {
+		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
 			mes "^3355FFWhere is he...?";
 			mes "He seems to have gone";
@@ -1286,28 +1124,25 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
-ayo_dun02,86,254,0	script	AyoFootprint8	139,1,1,{
+
+ayo_dun02,86,254,0	script	AyoFootprint8	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
-	if(thai_find == 11)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 11) {
+		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
 			mes "^3355FFYou find traces of blood. Whoever was running in this direction may have been wounded. The trail of blood leads to the ^5C3317North^3355FF.^000000";
+			changequest 12032,12033;
 			set thai_find,12;
 			close;
 		}
 	}
-	
+	end;
 }
-	
-ayothaya,193,171,3	script	Old Man#02	842,{
 
-	if(thai_find == 3)
-	{
+ayothaya,193,171,3	script	Old Man#02	4_M_THAIOLD,{
+	if (thai_find == 3) {
 		mes "[Tham]";
 		mes "Weird...";
 		mes "Why was that guy";
@@ -1336,13 +1171,11 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 		mes "[Tham]";
 		mes "Oh well, don't worry. All of our villagers aren't like that. Anyway, I hope you enjoy your travels in Ayotaya.";
 		set thai_find,4;
+		changequest 12031,12032;
 		close;
-	}
-	else
-	{
-		set @randayo,rand(1,7);
-		if(@randayo < 5)
-		{
+	} else {
+		set .@randayo,rand(1,7);
+		if (.@randayo < 5) {
 			mes "[Tham]";
 			mes "Oh hello~";
 			mes "I can tell from your clothes that you must be from Rune-Midgard.";
@@ -1370,9 +1203,7 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 			mes "[Tham]";
 			mes "Anyway, I'm sure that you'll like it. I hope that you come visit Ayotaya as often as you can~";
 			close;
-		}
-		else if(@randayo > 4 && @randayo < 7)
-		{
+		} else if (.@randayo > 4 && .@randayo < 7) {
 			mes "[Tham]";
 			mes "Ah~";
 			mes "I've got this craving for Ms. Mali the Spicy's food, especially her 'Tom Yum Goong.'";
@@ -1382,9 +1213,7 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 			mes "most delicious dish";
 			mes "in the entire world!";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Tham]";
 			mes "Oh hello~";
 			mes "I can tell from your clothes that you must be from Rune-Midgard.";
@@ -1394,12 +1223,11 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 			close;
 		}
 	}
-	
 }
 
-// Ayothaya Dungeon Quest
+// Ayothaya Dungeon Quest :: ayo_tiger
 //============================================================
-ayothaya,83,132,0	script	Dusit#thai	843,{
+ayothaya,83,132,0	script	Dusit#thai	4_M_THAIONGBAK,{
 	if (ayodunquest == 0) {
 		mes "[Dusit]";
 		mes "Oh...!";
@@ -1475,6 +1303,7 @@ ayothaya,83,132,0	script	Dusit#thai	843,{
 			mes "[Dusit]";
 			mes "Ah well, you'll see what I'm talking about. I hope he'll help you learn more about that evil creature.";
 			set ayodunquest,1;
+			setquest 12035;
 			close;
 		}
 		mes "[Dusit]";
@@ -1482,8 +1311,7 @@ ayothaya,83,132,0	script	Dusit#thai	843,{
 		mes "Then be careful!";
 		mes "It'll eat you alive!";
 		close;
-	}
-	else if (ayodunquest > 0) {
+	} else if (ayodunquest > 0) {
 		mes "[Dusit]";
 		mes "How are you?";
 		mes "If you're interested";
@@ -1498,7 +1326,7 @@ ayothaya,83,132,0	script	Dusit#thai	843,{
 	}
 }
 
-ayo_in01,181,193,4	script	Shaman#thai	840,{
+ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 	if (ayodunquest == 1) {
 		mes "[Boonthom]";
 		mes "You...!";
@@ -1602,8 +1430,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 				mes "Even if you can";
 				mes "wield the power of";
 				mes "holiness, you will still need the spiritual security of our land.";
-			}
-			else {
+			} else {
 				mes "[Boonthom]";
 				mes "There are many ghosts and";
 				mes "demons within the cave, and they will attack people who do not possess holy power... Like you.";
@@ -1625,6 +1452,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "when you prepare all";
 			mes "the materials.";
 			set ayodunquest,2;
+			changequest 12035,12036;
 			close;
 		}
 		mes "[Boonthom]";
@@ -1636,8 +1464,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "............";
 		mes "............";
 		close;
-	}
-	else if (ayodunquest == 2) {
+	} else if (ayodunquest == 2) {
 		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent!";
@@ -1664,6 +1491,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			delitem 7190,1; //Solid_Peeling
 			delitem 523,1; //Holy_Water
 			set ayodunquest,3;
+			changequest 12036,12037;
 			getitem 7285,1; //Thread_Skein
 			next;
 			mes "[Boonthom]";
@@ -1688,8 +1516,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "See you later.";
 		close;
-	}
-	else if (ayodunquest == 3) {
+	} else if (ayodunquest == 3) {
 		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent! Now you have brought everything I need, let me make the thing for you as I promised...";
@@ -1730,8 +1557,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "See you later.";
 		close;
-	}
-	else if (ayodunquest > 3 && ayodunquest < 9) {
+	} else if (ayodunquest > 3 && ayodunquest < 9) {
 		mes "[Boonthom]";
 		mes "You finally started seeking the tiger. I hope that you will be safe from harm.";
 		next;
@@ -1739,8 +1565,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "Feel free to ask";
 		mes "me for help at anytime.";
 		close;
-	}
-	else if (ayodunquest == 9) {
+	} else if (ayodunquest == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I copied down this";
 		mes "message while exploring";
@@ -1777,14 +1602,14 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "^3366992 Needle Packet^000000 and";
 		mes "^3366992 Spool^000000.";
 		set ayodunquest,10;
+		changequest 12037,12038;
 		next;
 		mes "[Boonthom]";
 		mes "Return to me";
 		mes "once you have";
 		mes "gathered everything.";
 		close;
-	}
-	else if (ayodunquest == 10) {
+	} else if (ayodunquest == 10) {
 		if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1) {
 			mes "[Boonthom]";
 			mes "Hmm~";
@@ -1813,6 +1638,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			delitem 523,2; //Holy_Water
 			set ayodunquest,11;
 			getitem 7287,1; //Thread_Skein_
+			changequest 12038,12039;
 			next;
 			mes "[Boonthom]";
 			mes "Even if you lose this, don't worry. Just bring me the materials, and";
@@ -1839,8 +1665,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "more powerful holy";
 		mes "threads for you.";
 		close;
-	}
-	else if (ayodunquest == 11) {
+	} else if (ayodunquest == 11) {
 		if (countitem(7287) > 0) {
 			mes "[Boonthom]";
 			mes "Those threads";
@@ -1850,8 +1675,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "to you to defend yourself";
 			mes "from monster attacks, okay?";
 			close;
-		}
-		else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
 			mes "[Boonthom]";
 			mes "Ooooohmmmmm...";
 			next;
@@ -1886,8 +1710,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "^3366992 Needle Packet^000000 and";
 		mes "^3366992 Spool^000000.";
 		close;
-	}
-	else if (ayodunquest == 12) {
+	} else if (ayodunquest == 12) {
 		mes "[Boonthom]";
 		mes "Huh...!";
 		mes "You must have seen something.";
@@ -1914,17 +1737,16 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "If you wish to explore the building again, but you don't have any holy thread, feel free to ask me at anytime.";
 		set ayodunquest,13;
+		completequest 12039;
 		close;
-	}
-	else if (ayodunquest > 12) {
+	} else if (ayodunquest > 12) {
 		if (countitem(7287) > 0) {
 			mes "[Boonthom]";
 			mes "Best of luck on your";
 			mes "expeditions, brave";
 			mes "adventurer~";
 			close;
-		}
-		else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
 			mes "[Boonthom]";
 			mes "Lost the";
 			mes "holy threads";
@@ -1973,7 +1795,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 	close;
 }
 
-ayo_fild01,129,197,0	script	Puraim#thai1	842,{
+ayo_fild01,129,197,0	script	Puraim#thai1	4_M_THAIOLD,{
 	if ((ayodunquest > 2 && countitem(7285) > 0) || (ayodunquest > 2 && countitem(7287) > 0)) {
 		mes "[Puraim]";
 		mes "Huh...?";
@@ -2049,7 +1871,7 @@ ayo_fild01,129,197,0	script	Puraim#thai1	842,{
 	close;
 }
 
-ayo_fild02,25,154,0	script	Aik#thai	843,{
+ayo_fild02,25,154,0	script	Aik#thai	4_M_THAIONGBAK,{
 	mes "[Aik]";
 	mes "So, how was your expedition?";
 	mes "I hope that the evil spirits will not follow you outside of the ruins, and haunt your dreams.";
@@ -2083,7 +1905,7 @@ ayo_fild02,25,154,0	script	Aik#thai	843,{
 }
 
 // Water Traps
-ayo_dun01,273,26,0	script	 #th_dun1_1_1::AyoTrap1	111,0,4,{
+ayo_dun01,273,26,0	script	 #th_dun1_1_1::AyoTrap1	HIDDEN_NPC,0,4,{
 	mes "^3355FFYou look down and see a pool";
 	mes "of water in the distance. It looks like a long drop to the bottom.^000000";
 	next;
@@ -2104,9 +1926,9 @@ OnTouch:
 	close;
 }
 
-ayo_dun01,273,27,0	duplicate(AyoTrap1)	 #th_dun1_1_2	111
-ayo_dun01,272,27,0	duplicate(AyoTrap1)	 #th_dun1_1_3	111,0,4
-ayo_dun01,272,26,0	duplicate(AyoTrap1)	 #th_dun1_1_4	111
+ayo_dun01,273,27,0	duplicate(AyoTrap1)	 #th_dun1_1_2	HIDDEN_NPC
+ayo_dun01,272,27,0	duplicate(AyoTrap1)	 #th_dun1_1_3	HIDDEN_NPC,0,4
+ayo_dun01,272,26,0	duplicate(AyoTrap1)	 #th_dun1_1_4	HIDDEN_NPC
 
 ayo_dun01,26,27,0	script	 #th_dun1_1::AyoTrap2	-1,1,1,{
 OnTouch:
@@ -2147,7 +1969,7 @@ ayo_dun01,259,44,0	duplicate(AyoHint)	 #hint02_2	-1,2,0
 ayo_dun01,259,46,0	duplicate(AyoHint)	 #hint02_3	-1,2,0
 
 // Puzzle pieces
-ayo_dun01,198,164,0	script	 #hun_thai_1	111,{
+ayo_dun01,198,164,0	script	 #hun_thai_1	HIDDEN_NPC,{
 	if (ayodunquest == 3) {
 		set ayodunquest,4;
 		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 1st part of the slate.^000000";
@@ -2159,7 +1981,7 @@ ayo_dun01,198,164,0	script	 #hun_thai_1	111,{
 	close;
 }
 
-ayo_dun01,87,16,0	script	 #hun_thai_2	111,{
+ayo_dun01,87,16,0	script	 #hun_thai_2	HIDDEN_NPC,{
 	if (ayodunquest == 4) {
 		set ayodunquest,5;
 		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 2nd part of the slate.^000000";
@@ -2171,7 +1993,7 @@ ayo_dun01,87,16,0	script	 #hun_thai_2	111,{
 	close;
 }
 
-ayo_dun01,268,214,0	script	 #hun_thai_3	111,{
+ayo_dun01,268,214,0	script	 #hun_thai_3	HIDDEN_NPC,{
 	if (ayodunquest == 5) {
 		set ayodunquest,6;
 		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 3rd part of the slate.^000000";
@@ -2183,7 +2005,7 @@ ayo_dun01,268,214,0	script	 #hun_thai_3	111,{
 	close;
 }
 
-ayo_dun01,147,274,0	script	 #hun_thai_4	111,{
+ayo_dun01,147,274,0	script	 #hun_thai_4	HIDDEN_NPC,{
 	if (ayodunquest == 6) {
 		set ayodunquest,7;
 		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 4th part of the slate.^000000";
@@ -2195,7 +2017,7 @@ ayo_dun01,147,274,0	script	 #hun_thai_4	111,{
 	close;
 }
 
-ayo_dun01,99,118,0	script	 #hun_thai_5	111,{
+ayo_dun01,99,118,0	script	 #hun_thai_5	HIDDEN_NPC,{
 	if (ayodunquest == 7) {
 		set ayodunquest,8;
 		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 5th part of the slate.^000000";
@@ -2207,9 +2029,10 @@ ayo_dun01,99,118,0	script	 #hun_thai_5	111,{
 	close;
 }
 
-ayo_dun01,16,188,0	script	 #hun_thai_6	111,{
+ayo_dun01,16,188,0	script	 #hun_thai_6	HIDDEN_NPC,{
 	if (ayodunquest == 8) {
 		set ayodunquest,9;
+		setquest 12036;
 		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the last part of the slate.^000000";
 		next;
 		mes "^3355FFIt reads '^0000FFOtherwise, it's impossible...^3355FF' You are unable to read the rest of the message.^000000";
@@ -2219,7 +2042,7 @@ ayo_dun01,16,188,0	script	 #hun_thai_6	111,{
 	close;
 }
 
-ayo_dun01,24,283,0	script	 #2_dun_in	111,{
+ayo_dun01,24,283,0	script	 #2_dun_in	HIDDEN_NPC,{
 	if (ayodunquest > 10) {
 		if (countitem(7287) > 0) {
 			mes "^3355FFThe holy threads";
@@ -2231,8 +2054,7 @@ ayo_dun01,24,283,0	script	 #2_dun_in	111,{
 			close2;
 			if (rand(1,10) > 5) {
 				warp "ayo_dun02",23,26;
-			}
-			else {
+			} else {
 				warp "ayo_dun02",275,26;
 			}
 			end;
@@ -2244,7 +2066,7 @@ ayo_dun01,24,283,0	script	 #2_dun_in	111,{
 	close;
 }
 
-ayo_dun02,268,108,0	script	 #reward_tiger	111,{
+ayo_dun02,268,108,0	script	 #reward_tiger	HIDDEN_NPC,{
 	if (ayodunquest == 11 && countitem(7287) > 0) {
 		mes "^3355FFYou find half of the skeletal remains of a person sticking out from the ground. It seems to be the remains of Boonthom's comrade.^000000";
 		next;
@@ -2259,14 +2081,15 @@ ayo_dun02,268,108,0	script	 #reward_tiger	111,{
 		mes "^3355FFYou pick";
 		mes "up the box.^000000";
 		set ayodunquest,12;
+		completequest 12039;
 		getitem 603,1; //Old_Blue_Box
 		close;
 	}
 }
 
-// Tom Tung Goong Quest
+// Tom Tung Goong Quest :: ayo_tom
 //============================================================
-ayothaya,196,265,3	script	Einon#ayo	842,{
+ayothaya,196,265,3	script	Einon#ayo	4_M_THAIOLD,{
 	if (tomyumgoong == 0) {
 		mes "[Einon]";
 		mes "Do you know what the";
@@ -2305,6 +2128,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 			next;
 			emotion e_no1;
 			set tomyumgoong,1;
+			setquest 8123;
 			mes "[Einon]";
 			mes "She is the best cook when it";
 			mes "comes to Tom Yum Goong!";
@@ -2318,8 +2142,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 		mes "change your mind,";
 		mes "please come back.";
 		close;
-	}
-	else if (tomyumgoong == 1) {
+	} else if (tomyumgoong == 1) {
 		mes "[Einon]";
 		mes "Ah, you wanna know";
 		mes "where ^3131FFMali the Spicy^000000 is?";
@@ -2340,8 +2163,8 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 	mes "Wouldn't you agree with me?";
 	close;
 }
-	
-ayo_in01,145,163,3	script	Cook#ayo	839,{
+
+ayo_in01,145,163,3	script	Cook#ayo	4_F_THAIGIRL,{
 	if (tomyumgoong < 2) {
 		mes "[Mali the Spicy]";
 		mes "Hello, there!";
@@ -2356,8 +2179,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "it's my fate to cook the greatest Tom Yum Goong ever.";
 		if (tomyumgoong == 0) {
 			close;
-		}
-		else {
+		} else {
 			next;
 			mes "[Mali the Spicy]";
 			mes "Oh I see...";
@@ -2397,6 +2219,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				mes "my name, that guy";
 				mes "might give you a discount.";
 				set tomyumgoong,2;
+				changequest 8123,8124;
 				next;
 				mes "[Mali the Spicy]";
 				mes "His name is ^3131FFThongpool^000000.";
@@ -2408,8 +2231,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			mes "a try if you really want to taste the best Tom Yum Goong.";
 			close;
 		}
-	}
-	else if (tomyumgoong > 1 && tomyumgoong < 4) {
+	} else if (tomyumgoong > 1 && tomyumgoong < 4) {
 		if (tomyumgoong == 2 && countitem(567) > 19) {
 			mes "[Mali the Spicy]";
 			mes "Errr...";
@@ -2428,8 +2250,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			mes "and ask him to give you the freshest Shrimp to cook the best";
 			mes "Tom Yum Goong?";
 			close;
-		}
-		else if (tomyumgoong == 3) {
+		} else if (tomyumgoong == 3) {
 			if (countitem(567) > 19) {
 				mes "[Mali the Spicy]";
 				mes "Ah, you came back!";
@@ -2456,6 +2277,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				next;
 				if (select("Where can I find Lemons?:I hate sour food. I'd better quit!") == 1) {
 					set tomyumgoong,4;
+					changequest 8124,8125;
 					mes "[Mali the Spicy]";
 					mes "A few days ago, I saw a good";
 					mes "Lemon tree while taking a walk.";
@@ -2493,8 +2315,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "you 20 Shrimps.";
 		mes "Now hurry~";
 		close;
-	}
-	else if (tomyumgoong > 3 && tomyumgoong < 6) {
+	} else if (tomyumgoong > 3 && tomyumgoong < 6) {
 		if (tomyumgoong == 4 && countitem(568) > 9) {
 			mes "[Mali the Spicy]";
 			mes "You think these are";
@@ -2508,8 +2329,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			mes "fresh! They're just";
 			mes "common Lemons!";
 			close;
-		}
-		else if (tomyumgoong == 5) {
+		} else if (tomyumgoong == 5) {
 			if (countitem(568) > 9) {
 				emotion e_gasp;
 				mes "[Mali the Spicy]";
@@ -2538,6 +2358,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				if (select("Okay, I'll be right back.:Ah, I'm tired now. Let me take a rest first...") == 1) {
 					delitem 568,10; //Lemon
 					set tomyumgoong,6;
+					changequest 8125,8126;
 					mes "[Mali the Spicy]";
 					mes "See you in a bit~";
 					close;
@@ -2569,8 +2390,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "Lemons so that I can make";
 		mes "some Tom Yum Goong!";
 		close;
-	}
-	else if (tomyumgoong == 6) {
+	} else if (tomyumgoong == 6) {
 		if (countitem(7286) > 29) {
 			mes "[Mali the Spicy]";
 			mes "I don't understand...";
@@ -2587,10 +2407,8 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "[Malli the Spicy]";
 		mes "Please go take a look in the Market. I don't doubt that it will be a good experience. After all, my fantastic Tom Yum Goong is waiting for you!";
 		close;
-	}
-	else if (tomyumgoong == 7) {
-		set .@now_weight,MaxWeight-Weight;
-		if (.@now_weight > 1499) {
+	} else if (tomyumgoong == 7) {
+		if (MaxWeight - Weight > 1499) {
 			if (countitem(7286) > 29) {
 				delitem 7286,30; //Chilli
 				emotion e_gasp;
@@ -2638,6 +2456,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				mes " .........";
 				next;
 				set tomyumgoong,8;
+				completequest 8126;
 				getitem 566,10; //Tomyumkung
 				emotion e_no1;
 				mes "[Mali the Spicy]";
@@ -2686,8 +2505,8 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 	mes "Heh heh heh~!";
 	close;
 }
-	
-ayothaya,153,86,5	script	Thongpool#ayo	843,{
+
+ayothaya,153,86,5	script	Thongpool#ayo	4_M_THAIONGBAK,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -2726,9 +2545,8 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 			next;
 			if (select("I will take them.:I could get 100 Jellopies for that much!") == 1) {
 				if (Zeny > 10999) {
-					set .@now_weight,MaxWeight-Weight;
-					if (.@now_weight > 3999) {
-						set zeny,zeny-11000;
+					if (MaxWeight - Weight > 3999) {
+						Zeny -= 11000;
 						set tomyumgoong,3;
 						getitem 567,20; //Prawn
 						emotion e_no1;
@@ -2761,8 +2579,7 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 		mes "of Tom Yum Goong";
 		mes "is priceless!";
 		close;
-	}
-	else if (tomyumgoong == 3) {
+	} else if (tomyumgoong == 3) {
 		mes "[Thongpool]";
 		mes "Mmm...?";
 		mes "Did you need";
@@ -2772,9 +2589,8 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 		next;
 		if (select("Yes!:No, thanks.") == 1) {
 			if (Zeny > 10999) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight > 3999) {
-					set zeny,zeny-11000;
+				if (MaxWeight - Weight > 3999) {
+					Zeny -= 11000;
 					getitem 567,20; //Prawn
 					mes "[Thongpool]";
 					mes "There you go~";
@@ -2802,9 +2618,9 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 	mes "I've got the best Shrimp caught in the cleanest waters in the world~!";
 	close;
 }
-	
-ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
-	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
+
+ayothaya,121,240,7	script	Mr. Jun#ayo	4_M_THAIOLD,1,1,{
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -2852,7 +2668,7 @@ ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
 	close;
 
 OnTouch:
-	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -3105,7 +2921,7 @@ OnTouch:
 	close;
 }
 
-ayothaya,213,94,7	script	Merchant#ayo	841,{
+ayothaya,213,94,7	script	Merchant#ayo	4_M_THAIAYO,{
 	if (tomyumgoong == 6) {
 		mes "[Merchant Thongdum]";
 		mes "Hello, there~";
@@ -3124,9 +2940,8 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 		if (select("Thanks, I'll take it.:It's a rip-off, man!") == 1) {
 			emotion e_thx;
 			if (Zeny > 1999) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight > 1199) {
-					set zeny,zeny-2000;
+				if (MaxWeight - Weight > 1199) {
+					Zeny -= 2000;
 					set tomyumgoong,7;
 					getitem 7286,30; //Chilli
 					mes "[Merchant Thongdum]";
@@ -3163,8 +2978,7 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 		mes "reasonable. I want you to know";
 		mes "that I'm a respectable Merchant.";
 		close;
-	}
-	else if (tomyumgoong == 7) {
+	} else if (tomyumgoong == 7) {
 		mes "[Merchant Thongdum]";
 		mes "I thought I provided you";
 		mes "with enough ingredients, but";
@@ -3182,9 +2996,8 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 			close;
 		}
 		if (Zeny > 1999) {
-			set .@now_weight,MaxWeight-Weight;
-			if (.@now_weight > 1199) {
-				set zeny,zeny-2000;
+			if (MaxWeight - Weight > 1199) {
+				Zeny -= 2000;
 				getitem 7286,30; //Chilli
 				mes "[Merchant Thongdum]";
 				mes "Thank you,";
diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index 710bd1d42..6faf8f84f 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Comodo
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5b
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= Headgear Quests 1 [Aegis Conversion]:
+//===== Description: =========================================
+//= Headgear Quests 1 [Official Conversion]:
 //= - 'Cross Hat', 'Bulb Hairband'
 //= - 'Striped Hairband', 'Blue Hairband'
 //= Headgear Quests 2:
@@ -18,7 +16,7 @@
 //= - Part 2: Found in Quests_Yuno.txt
 //= - Part 3: Found in Doomed_Swords.txt
 //= - Variable in use: dmdswrd_Q (Max 45)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed exploits [Lupus]
 //= 1.2 Added more quest from cities/comodo.txt [Evera]
 //= 1.2a missing label [Lupus]
@@ -28,12 +26,12 @@
 //= 1.5a Fixed a bad countitem. (bugreport:840) [Samuray22]
 //= 1.5b Fixed stripped hairband and blue hairband checking the wrong amount of items, bugreport:1674 [Brainstorm]
 //= 1.6 Updated headgear quest NPCs. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // Headgear Quests 1
 // Cross Hat, Bulb Hairband, Striped Hairband, Blue Hairband
-//============================================================ 
-comodo,228,159,3	script	Hair Ornament Girl	700,{
+//============================================================
+comodo,228,159,3	script	Hair Ornament Girl	8_F_GIRL,{
 	mes "[Hair Ornament Girl]";
 	if (Sex == 1) {
 		mes "Oh, hello!";
@@ -229,8 +227,8 @@ comodo,228,159,3	script	Hair Ornament Girl	700,{
 
 // Headgear Quests 2
 // 'Mine Helmet', 'Parcel Hat', 'Money Loser's Grief', 'Phantom of the Opera Mask'
-//============================================================ 
-comodo,273,137,4	script	Traveler#head	702,{
+//============================================================
+comodo,273,137,4	script	Traveler#head	4_F_GON,{
 	mes "[Isac Mari]";
 	mes "I travel around the world, and collect many interesting stories from people. Sometimes they teach me how to make special items.";
 	next;
@@ -472,8 +470,8 @@ comodo,273,137,4	script	Traveler#head	702,{
 }
 
 // Doomed Swords - Comodo Portion. (Continued in Juno)
-//============================================================ 
-comodo,206,310,4	script	Campground Boy#cmd	704,{
+//============================================================
+comodo,206,310,4	script	Campground Boy#cmd	4_M_BIBI,{
 	switch (dmdswrd_Q) {
 	case 0:
 		mes "[Rochito]";
@@ -633,7 +631,7 @@ comodo,206,310,4	script	Campground Boy#cmd	704,{
 	close;
 }
 
-comodo,204,310,4	script	Camping Youth#cmd	65,{
+comodo,204,310,4	script	Camping Youth#cmd	1_M_YOUNGKNIGHT,{
 	switch (dmdswrd_Q) {
 	case 0:
 	case 1:
@@ -738,7 +736,7 @@ comodo,204,310,4	script	Camping Youth#cmd	65,{
 	close;
 }
 
-comodo,209,305,4	script	Camping Maiden#cmd	71,{
+comodo,209,305,4	script	Camping Maiden#cmd	1_F_LIBRARYGIRL,{
 	mes "[Emralhandas]";
 	mes "Rockha, let me pour";
 	mes "you another drink. We";
@@ -806,7 +804,7 @@ comodo,209,305,4	script	Camping Maiden#cmd	71,{
 	close;
 }
 
-comodo,209,314,4	script	Campground Lad#cmd	706,{
+comodo,209,314,4	script	Campground Lad#cmd	4_M_KID1,{
 	switch (dmdswrd_Q) {
 	case 0:
 	case 1:
@@ -855,7 +853,7 @@ comodo,209,314,4	script	Campground Lad#cmd	706,{
 	close;
 }
 
-comodo,221,310,4	script	BBQ Boy#cmd	86,{
+comodo,221,310,4	script	BBQ Boy#cmd	4_M_04,{
 	mes "[Rinta]";
 	mes "I didn't mean to,";
 	mes "but I accidentally";
@@ -873,7 +871,7 @@ comodo,221,310,4	script	BBQ Boy#cmd	86,{
 	close;
 }
 
-comodo,218,309,4	script	BBQ Visitor#cmd	90,{
+comodo,218,309,4	script	BBQ Visitor#cmd	4_F_01,{
 	mes "[Razy]";
 	mes "Those people over there";
 	mes "are friends of the Village";
@@ -892,7 +890,7 @@ comodo,218,309,4	script	BBQ Visitor#cmd	90,{
 	close;
 }
 
-comodo,216,310,4	script	BBQ Papa#cmd::CmdFamily	50,{
+comodo,216,310,4	script	BBQ Papa#cmd::CmdFamily	1_M_04,{
 	mes "[BBQ Boy]";
 	mes "D-daddy! Is what those";
 	mes "people talking about true?";
@@ -939,11 +937,11 @@ comodo,216,310,4	script	BBQ Papa#cmd::CmdFamily	50,{
 	close;
 }
 
-comodo,215,307,4	duplicate(CmdFamily)	BBQ Mama#cmd	74
+comodo,215,307,4	duplicate(CmdFamily)	BBQ Mama#cmd	1_F_MERCHANT_02
 
-comodo,213,310,4	duplicate(CmdFamily)	BBQ Boy#cmd2	706
+comodo,213,310,4	duplicate(CmdFamily)	BBQ Boy#cmd2	4_M_KID1
 
-cmd_in02,32,140,4	script	Chief#cmd	49,{
+cmd_in02,32,140,4	script	Chief#cmd	1_M_03,{
 	if (dmdswrd_Q > 4) {
 		mes "[Tausupa]";
 		mes "Maybe you can't tell because";
@@ -1094,7 +1092,7 @@ cmd_in02,32,140,4	script	Chief#cmd	49,{
 	close;
 }
 
-comodo,88,97,4	script	Toruna#cmd	109,{
+comodo,88,97,4	script	Toruna#cmd	4_M_MANAGER,{
 	mes "[Toruna]";
 	mes "When I think about it,";
 	mes "there are many fascinating";
@@ -1229,7 +1227,7 @@ comodo,88,97,4	script	Toruna#cmd	109,{
 	close;
 }
 
-comodo,164,291,4	script	Rakusa#cmd	73,{
+comodo,164,291,4	script	Rakusa#cmd	1_F_MERCHANT_01,{
 	switch (dmdswrd_Q) {
 	case 6:
 		mes "[Rakusa]";
@@ -1278,7 +1276,7 @@ comodo,164,291,4	script	Rakusa#cmd	73,{
 	close;
 }
 
-comodo,169,284,4	script	Kichiri#cmd	98,{
+comodo,169,284,4	script	Kichiri#cmd	4W_M_02,{
 	switch (dmdswrd_Q) {
 	case 7:
 		mes "[Kichiri]";
@@ -1326,7 +1324,7 @@ comodo,169,284,4	script	Kichiri#cmd	98,{
 	close;
 }
 
-comodo,163,280,4	script	Magatu#cmd	55,{
+comodo,163,280,4	script	Magatu#cmd	1_M_JOBTESTER,{
 	switch (dmdswrd_Q) {
 	case 8:
 		mes "[Magatu]";
@@ -1387,7 +1385,7 @@ comodo,163,280,4	script	Magatu#cmd	55,{
 	close;
 }
 
-cmd_in02,189,99,4	script	Manzi#cmd	85,{
+cmd_in02,189,99,4	script	Manzi#cmd	4_M_03,{
 	switch (dmdswrd_Q) {
 	case 9:
 		mes "["+strcharinfo(0)+"]";
@@ -1474,7 +1472,7 @@ cmd_in02,189,99,4	script	Manzi#cmd	85,{
 	close;
 }
 
-comodo,187,153,4	script	Hullaris#cmd	701,{
+comodo,187,153,4	script	Hullaris#cmd	4_F_GODEMOM,{
 	switch (dmdswrd_Q) {
 	case 10:
 		mes "[Hullaris]";
@@ -1579,7 +1577,7 @@ comodo,187,153,4	script	Hullaris#cmd	701,{
 		mes "Love together~";
 		mes "Love! Love!";
 		mes "Love togeth-hm?";
-		if (sex) {
+		if (Sex) {
 			mes "Boy, you're ruining";
 			mes "my groove! Now beat it!";
 		}
@@ -1709,7 +1707,7 @@ comodo,187,153,4	script	Hullaris#cmd	701,{
 	close;
 }
 
-beach_dun3,30,220,4	script	Nigirboran#cmd	704,{
+beach_dun3,30,220,4	script	Nigirboran#cmd	4_M_BIBI,{
 	switch (dmdswrd_Q) {
 	case 11:
 		mes "[Nigirboran]";
@@ -1941,7 +1939,7 @@ beach_dun3,30,220,4	script	Nigirboran#cmd	704,{
 	close;
 }
 
-aldebaran,44,53,4	script	Meteurengut#cmd	64,{
+aldebaran,44,53,4	script	Meteurengut#cmd	1_M_WIZARD,{
 	switch (dmdswrd_Q) {
 	case 14:
 		mes "[Meteurengut]";
@@ -2163,7 +2161,7 @@ aldebaran,44,53,4	script	Meteurengut#cmd	64,{
 	close;
 }
 
-morocc,201,30,4	script	Zaka#cmd	99,{
+morocc,201,30,4	script	Zaka#cmd	4W_M_03,{
 	switch (dmdswrd_Q) {
 	case 17:
 		mes "[Zaka]";
@@ -2377,7 +2375,7 @@ morocc,201,30,4	script	Zaka#cmd	99,{
 	close;
 }
 
-comodo,232,87,4	script	Won#cmd	106,{
+comodo,232,87,4	script	Won#cmd	1_M_MOC_LORD,{
 	switch (dmdswrd_Q) {
 	case 22:
 		mes "[Won]";
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 299922954..3283266ea 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Einbroch and Einbech
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Evera and The rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.6
-//===== Description: ========================================= 
-//= [Aegis conversion]
+//===== Current Version: =====================================
+//= 2.7
+//===== Description: =========================================
+//= [Official Conversion]
 //= Oridecon/Mineral Quest
 //= - Variable in use: ein_gear1 (max 2)
 //= - Variable in use: $ein_amano (max 60)
@@ -18,11 +18,11 @@
 //= - Variable in use: Shinokas_Quest (max 11)
 //= Lovers Quest
 //= - Variable in use: EIN_LOVERQ (max 17)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Initial Release [Evera]
 //= 1.1 Added more quests [Evera]
 //= 1.2 Added quest bits from Einbech and renamed file to
-//=	quests_ein.txt [Evera]
+//=     quests_ein.txt [Evera]
 //= 1.3 Implemented the polution quest. [MasterOfMuppets]
 //= 1.4.1 Massive bugfix. Fixed Pollution exploit [Lupus]
 //= 1.4.2 Fixed Khowropher bug [Lupus]
@@ -47,13 +47,14 @@
 //= 2.5 Added quest log entries for:
 //=     - Factory Quest
 //=     - Murder Quest
-//= 2.6 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
+//= 2.6 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.7 Added GM management function. [Euphy]
+//============================================================
 
-// Oridecon Stone OR Mineral Stone Quest
-//============================================================ 
-einbech,97,167,5	script	Cavitar	847,{
-	if (ein_gear1 == 2){
+// Oridecon Stone OR Mineral Stone Quest :: ein_amano
+//============================================================
+einbech,97,167,5	script	Cavitar	4_M_EINOLD,{
+	if (ein_gear1 == 2) {
 		mes "[Cavitar]";
 		mes "It's been a long";
 		mes "time, my friend. With";
@@ -68,7 +69,7 @@ einbech,97,167,5	script	Cavitar	847,{
 		mes "come visit my town.";
 		close;
 	}
-	else if(ein_gear1 == 1){
+	else if (ein_gear1 == 1) {
 		mes "[Cavitar]";
 		mes "Oh, welcome.";
 		mes "So did you bring";
@@ -273,7 +274,7 @@ einbech,97,167,5	script	Cavitar	847,{
 									mes "you a small present";
 									mes "as a token of my gratitute.";
 									mes "If you would, please take this.";
-									set Zeny,Zeny-1000;
+									Zeny -= 1000;
 									set ein_gear1,2;
 									switch(rand(1,7)) {
 									case 1:
@@ -330,7 +331,7 @@ einbech,97,167,5	script	Cavitar	847,{
 									next;
 									switch(select("Sure~!:No, thanks.")) {
 									case 1:
-										set Zeny,Zeny-1000;
+										Zeny -= 1000;
 										set ein_gear1,1;
 										mes "[Cavitar]";
 										mes "Great...!";
@@ -354,7 +355,7 @@ einbech,97,167,5	script	Cavitar	847,{
 										mes "this small gift";
 										mes "as a token of";
 										mes "my gratitude.";
-										set Zeny,Zeny-1000;
+										Zeny -= 1000;
 										getitem 1010,1; // Phracon
 										close;
 									}
@@ -383,7 +384,7 @@ einbech,97,167,5	script	Cavitar	847,{
 								next;
 								switch(select("Sure~!:No, thanks.")) {
 						 		case 1:
-									set Zeny,Zeny-1000;
+									Zeny -= 1000;
 									set $einamanoama,$einamanoama + 1;
 									set ein_gear1,1;
 									mes "[Cavitar]";
@@ -408,7 +409,7 @@ einbech,97,167,5	script	Cavitar	847,{
 									mes "this small gift";
 									mes "as a token of";
 									mes "my gratitude.";
-									set Zeny,Zeny-1000;
+									Zeny -= 1000;
 									getitem 1010,1; // Phracon
 									close;
 								}
@@ -469,9 +470,9 @@ einbech,97,167,5	script	Cavitar	847,{
 	}
 }
 
-// Uwe Kleine
+// Uwe Kleine :: ein_anoz
 //============================================================
-einbroch,215,180,6	script	Uwe Kleine#ein	85,{
+einbroch,215,180,6	script	Uwe Kleine#ein	4_M_03,{
 	set EinUwe,0;
 	if (BaseClass == Job_Blacksmith) {
 		if (ein_cook > 999) {
@@ -2308,7 +2309,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 					mes "In fact, I still use the old knife I used back when I was just";
 					mes "a little novice chef~";
 					next;
-					mes "[Uwe]"							;
+					mes "[Uwe]";
 					mes "Well, that was";
 					mes "a fun talk. Come";
 					mes "back and visit, 'kay?";
@@ -2541,7 +2542,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 						mes "In fact, I still use the old knife I used back when I was just";
 						mes "a little novice chef~";
 						next;
-						mes "[Uwe]"							;
+						mes "[Uwe]";
 						mes "Well, that was";
 						mes "a fun talk. Come";
 						mes "back and visit, 'kay?";
@@ -2817,7 +2818,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 						mes "In fact, I still use the old knife I used back when I was just";
 						mes "a little novice chef~";
 						next;
-						mes "[Uwe]"							;
+						mes "[Uwe]";
 						mes "Well, that was";
 						mes "a fun talk. Come";
 						mes "back and visit, 'kay?";
@@ -3208,7 +3209,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 	}
 }
 
-// Factory Quest
+// Factory Quest :: ein_factory
 //============================================================
 einbroch,1,1,0	script	Einbroch Smog Alert	-1,{
 	end;
@@ -3368,7 +3369,7 @@ OnTimer600000:
 	end;
 }
 
-einbroch,132,84,3	script	Liotzburg#ein	853,2,2,{
+einbroch,132,84,3	script	Liotzburg#ein	4_M_YURI,2,2,{
 	if ((EinFactory == 13) || (EinFactory == 14)) {
 		changequest 8029,8030;
 		set EinFactory,14;
@@ -3448,7 +3449,7 @@ OnTouch:
 	}
 }
 
-ein_in01,67,242,3	script	Zelmeto	851,{
+ein_in01,67,242,3	script	Zelmeto	4_M_REPAIR,{
 	if ($EinPolution > 9) {
 		mes "[Zelmeto]";
 		mes "We've got a big problem";
@@ -3554,50 +3555,22 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 			set $EinPolution,$EinPolution+1;
 			completequest 8031;
 			set EinFactory,16;
-			if(checkre(0)) {
-				if (BaseLevel < 41) {
-					getexp 61,0;
-				}
-				else if (BaseLevel < 51) {
-					getexp 307,0;
-				}
-				else if (BaseLevel < 61) {
-					getexp 660,0;
-				}
-				else if (BaseLevel < 71) {
-					getexp 1850,0;
-				}
-				else if( BaseLevel < 81) {
-					getexp 3206,0;
-				}
-				else if (BaseLevel < 91) {
-					getexp 7602,0;
-				}
-				else if (BaseLevel < 99) {
-					getexp 29067,0;
-				}
-			}else {
-				if (BaseLevel < 41) {
-					getexp 615,0;
-				}
-				else if (BaseLevel < 51) {
-					getexp 3075,0;
-				}
-				else if (BaseLevel < 61) {
-					getexp 6604,0;
-				}
-				else if (BaseLevel < 71) {
-					getexp 18508,0;
-				}
-				else if( BaseLevel < 81) {
-					getexp 32062,0;
-				}
-				else if (BaseLevel < 91) {
-					getexp 76026,0;
-				}
-				else if (BaseLevel < 99) {
-					getexp 290675,0;
-				}			
+			if (checkre(3)) {
+				if (BaseLevel < 41) getexp 61,0;
+				else if (BaseLevel < 51) getexp 307,0;
+				else if (BaseLevel < 61) getexp 660,0;
+				else if (BaseLevel < 71) getexp 1850,0;
+				else if (BaseLevel < 81) getexp 3206,0;
+				else if (BaseLevel < 91) getexp 7602,0;
+				else getexp 29067,0;
+			} else {
+				if (BaseLevel < 41) getexp 615,0;
+				else if (BaseLevel < 51) getexp 3075,0;
+				else if (BaseLevel < 61) getexp 6604,0;
+				else if (BaseLevel < 71) getexp 18508,0;
+				else if (BaseLevel < 81) getexp 32066,0;
+				else if (BaseLevel < 91) getexp 76026,0;
+				else getexp 290675,0;
 			}
 			next;
 			mes "[Zelmeto]";
@@ -4100,7 +4073,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 	}
 }
 
-ein_in01,49,232,3	script	2nd Control Panel#ins	111,{
+ein_in01,49,232,3	script	2nd Control Panel#ins	HIDDEN_NPC,{
 	if ((EinFactory == 1) || (EinFactory == 2)) {
 		changequest 8017,8018;
 		set EinFactory,2;
@@ -4115,7 +4088,7 @@ ein_in01,49,232,3	script	2nd Control Panel#ins	111,{
 	end;
 }
 
-ein_in01,108,217,3	script	3rd Pressure Governor#1	111,{
+ein_in01,108,217,3	script	3rd Pressure Governor#1	HIDDEN_NPC,{
 	if ((EinFactory == 3) || (EinFactory == 4)) {
 		changequest 8019,8020;
 		set EinFactory,4;
@@ -4131,7 +4104,7 @@ ein_in01,108,217,3	script	3rd Pressure Governor#1	111,{
 	end;
 }
 
-ein_in01,62,258,3	script	Main Control Panel#ins	111,{
+ein_in01,62,258,3	script	Main Control Panel#ins	HIDDEN_NPC,{
 	if ((EinFactory == 5) || (EinFactory == 6)) {
 		changequest 8021,8022;
 		set EinFactory,6;
@@ -4147,7 +4120,7 @@ ein_in01,62,258,3	script	Main Control Panel#ins	111,{
 	end;
 }
 
-ein_in01,46,197,3	script	Conveyor#ins	111,{
+ein_in01,46,197,3	script	Conveyor#ins	HIDDEN_NPC,{
 	if ((EinFactory == 7) || (EinFactory == 8)) {
 		changequest 8023,8024;
 		set EinFactory,8;
@@ -4162,7 +4135,7 @@ ein_in01,46,197,3	script	Conveyor#ins	111,{
 	end;
 }
 
-ein_in01,100,266,3	script	Pipe#ins	111,{
+ein_in01,100,266,3	script	Pipe#ins	HIDDEN_NPC,{
 	if ((EinFactory == 9) || (EinFactory == 10)) {
 		changequest 8025,8026;
 		set EinFactory,10;
@@ -4178,7 +4151,7 @@ ein_in01,100,266,3	script	Pipe#ins	111,{
 	end;
 }
 
-ein_in01,95,239,3	script	Conveyor#ins2	111,{
+ein_in01,95,239,3	script	Conveyor#ins2	HIDDEN_NPC,{
 	if ((EinFactory == 11) || (EinFactory == 12)) {
 		changequest 8027,8028;
 		set EinFactory,12;
@@ -4194,21 +4167,24 @@ ein_in01,95,239,3	script	Conveyor#ins2	111,{
 }
 
 // Administrator NPC used to rig the invasion in Einbroch.
-/**/
-sec_in02,127,86,3	script	Factory Quest Test	851,{
-	input .@input; //,0,9000;
-	if ((.@input < 0) || (.@input > 9000)) {
+sec_in02,127,86,3	script	Factory Quest Test	4_M_REPAIR,{
+	set .@i, callfunc("F_GM_NPC",8028,0,0,9000);
+	if (.@i == -2) {
 		mes "[Test1]";
 		mes "Boo~ya.";
 		close;
-	}
-	else if (.@input == 0) {
+	} else if (.@i == -1) {
 		mes "[Test1]";
 		mes "Do you want";
 		mes "to cancel~?";
 		close;
-	}
-	else if (.@input == 8028) {
+	} else if (.@i == 0) {
+		mes "[Test1]";
+		mes "Whoa...";
+		mes "That is";
+		mes "sooo wrong!";
+		close;
+	} else {
 		mes "[Test1]";
 		mes "The current value";
 		mes "of the global variable";
@@ -4236,19 +4212,11 @@ sec_in02,127,86,3	script	Factory Quest Test	851,{
 			close;
 		}
 	}
-	else {
-		mes "[Test1]";
-		mes "Whoa...";
-		mes "That is";
-		mes "sooo wrong!";
-		close;
-	}
 }
-/**/
 
-// Murder Quest
-//============================================================ 
-einbech,165,105,7	script	Buender Hikeman#ein	847,{
+// Murder Quest :: ein_main_tre
+//============================================================
+einbech,165,105,7	script	Buender Hikeman#ein	4_M_EINOLD,{
 	cutin "ein_hicman",2;
 	if (Shinokas_Quest == 0) {
 		mes "[Buender Hikeman]";
@@ -4697,32 +4665,16 @@ einbech,165,105,7	script	Buender Hikeman#ein	847,{
 			cutin "ein_hicman",255;
 			completequest 2078;
 			set Shinokas_Quest,11;
-			if(checkre(0)) {
-				if (BaseLevel < 70) {
-					getexp 10000,8000;
-				}
-				else if ((BaseLevel > 69) && (BaseLevel < 80)) {
-					getexp 30000,10000;
-				}
-				else if ((BaseLevel > 79) && (BaseLevel < 90)) {
-					getexp 50000,30000;
-				}
-				else if ((BaseLevel > 89) && (BaseLevel < 100)) {
-					getexp 70000,50000;
-				}
+			if (checkre(3)) {
+				if (BaseLevel < 70) getexp 30000,30000;
+				else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 40000,40000;
+				else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 70000,70000;
+				else getexp 90000,90000;
 			} else {
-				if (BaseLevel < 70) {
-					getexp 100000,80000;
-				}
-				else if ((BaseLevel > 69) && (BaseLevel < 80)) {
-					getexp 300000,100000;
-				}
-				else if ((BaseLevel > 79) && (BaseLevel < 90)) {
-					getexp 500000,300000;
-				}
-				else if ((BaseLevel > 89) && (BaseLevel < 100)) {
-					getexp 700000,500000;
-				}
+				if (BaseLevel < 70) getexp 100000,80000;
+				else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 300000,100000;
+				else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 500000,300000;
+				else getexp 700000,500000;
 			}
 			end;
 		case 2:
@@ -4770,7 +4722,7 @@ einbech,165,105,7	script	Buender Hikeman#ein	847,{
 	}
 }
 
-ein_in01,231,163,7	script	Sick Old Man#ein	849,{
+ein_in01,231,163,7	script	Sick Old Man#ein	4_M_DIEMAN,{
 	if (Shinokas_Quest < 2) {
 		mes "[Sick Old Man]";
 		mes "...!";
@@ -5045,7 +4997,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 		mes "anything from the";
 		mes "Kapellthaines?";
 		next;
-		mes "["+strcharinfo(0)+"]"	;
+		mes "["+strcharinfo(0)+"]";
 		mes "Well, Mr. Kapellthaine";
 		mes "is kind of violent, but";
 		mes "I didn't find anything";
@@ -5300,7 +5252,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 	}
 }
 
-ein_in01,32,133,7	script	Maid#ein	850,{
+ein_in01,32,133,7	script	Maid#ein	4_F_EINWOMAN,{
 	if (Shinokas_Quest == 4) {
 		mes "[Maid]";
 		mes "Did you ask me";
@@ -5333,7 +5285,7 @@ ein_in01,32,133,7	script	Maid#ein	850,{
 	}
 }
 
-ein_in01,254,35,1	script	Scientist#ein	749,{
+ein_in01,254,35,1	script	Scientist#ein	4_M_ALCHE_B,{
 	mes "[Scientist]";
 	mes "^333333*Grumble grumble*^000000";
 	next;
@@ -5398,7 +5350,7 @@ ein_in01,254,35,1	script	Scientist#ein	749,{
 	close;
 }
 
-ein_in01,266,27,3	script	Unknown Stuff#ein	111,{
+ein_in01,266,27,3	script	Unknown Stuff#ein	HIDDEN_NPC,{
 	mes "^3355FFThere's something";
 	mes "attached to a huge";
 	mes "machine with many cords";
@@ -5406,7 +5358,7 @@ ein_in01,266,27,3	script	Unknown Stuff#ein	111,{
 	close;
 }
 		
-einbroch,51,46,5	script	Laboratory Soldier#ein-1	852,{
+einbroch,51,46,5	script	Laboratory Soldier#ein-1	4_M_EIN_SOLDIER,{
 	mes "[Laboratory Soldier]";
 	mes "This area";
 	mes "is off limits.";
@@ -5415,7 +5367,7 @@ einbroch,51,46,5	script	Laboratory Soldier#ein-1	852,{
 	close;
 }
 	
-einbroch,51,56,5	script	Laboratory Soldier#ein-2	852,{
+einbroch,51,56,5	script	Laboratory Soldier#ein-2	4_M_EIN_SOLDIER,{
 	mes "[Laboratory Soldier]";
 	mes "Yuck...!";
 	mes "There's this";
@@ -5431,7 +5383,7 @@ einbroch,51,56,5	script	Laboratory Soldier#ein-2	852,{
 	close;
 }
 
-airplane,31,77,5	script	Drunken Man#ein	853,{
+airplane,31,77,5	script	Drunken Man#ein	4_M_YURI,{
 	if (Shinokas_Quest == 8) {
 		mes "[Drunken Man]";
 		mes "Okay okay...";
@@ -5696,7 +5648,7 @@ OnTouch:
 	end;
 }
 
-einbech,57,210,3	script	Young Man#Shinokas_Quest	855,{
+einbech,57,210,3	script	Young Man#Shinokas_Quest	4_M_EINMAN,{
 	mes "[Young Man]";
 	mes "Behind the pub,";
 	mes "you'll see this old man";
@@ -5719,8 +5671,9 @@ einbech,57,210,3	script	Young Man#Shinokas_Quest	855,{
 	close;
 }
 
-
-einbroch,51,52,0	script	Security#ein	45,1,1,{
+// Typing Test :: ein_main_ma1
+//============================================================
+einbroch,51,52,0	script	Security#ein	WARPNPC,1,1,{
 	end;
 
 OnTouch:
@@ -5872,9 +5825,9 @@ OnTouch:
 	}
 }
 
-// Lovers Quest
-//============================================================ 
-ein_in01,31,138,3	script	Calla#ein	90,{
+// Lovers Quest :: ein_ryu
+//============================================================
+ein_in01,31,138,3	script	Calla#ein	4_F_01,{
 	if (checkweight(908,70) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -5984,38 +5937,17 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "feel goooood~";
 		percentheal 100,0;
 		set EIN_LOVERQ,17;
-		if(checkre(0)) {
-			if (BaseLevel < 41) {
-				getexp 61,0;
-			}
-			else if (BaseLevel < 61) {
-				getexp 600,0;
-			}
-			else if (BaseLevel < 81) {
-				getexp 3000,0;
-			}
-			else if (BaseLevel < 99) {
-				getexp 20000,0;
-			}
+		if (checkre(3)) {
+			if (BaseLevel < 41) getexp 61,0;
+			else if (BaseLevel < 61) getexp 600,0;
+			else if (BaseLevel < 81) getexp 3000,0;
+			else if (BaseLevel < 99) getexp 20000,0;
+			else getexp 30000,0;
 		} else {
-			if (BaseLevel < 41) {
-				getexp 3712,0;
-			}
-			else if (BaseLevel < 61) {
-				getexp 7425,0;
-			}
-			else if (BaseLevel < 71) {
-				getexp 14850,0;
-			}
-			else if (BaseLevel < 81) {
-				getexp 29700,0;
-			}
-			else if (BaseLevel < 91) {
-				getexp 59400,0;
-			}
-			else if (BaseLevel < 99) {
-				getexp 118800,0;
-		}
+			if (BaseLevel < 41) getexp 610,0;
+			else if (BaseLevel < 61) getexp 6000,0;
+			else if (BaseLevel < 81) getexp 30000,0;
+			else getexp 200000,0;
 		}
 		next;
 		mes "[Calla]";
@@ -6032,6 +5964,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "I'll always pray for";
 		mes "your safety on your";
 		mes "your adventures~";
+		completequest 8088;
 		close;
 	}
 	if ((EIN_LOVERQ == 5) && (countitem(712) > 0)) {
@@ -6071,6 +6004,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 			mes "^333333*Sob Sob...*^000000";
 			delitem 712,1; //Flower
 			set EIN_LOVERQ,6;
+			changequest 8079,808;
 			close;
 		}
 		else {
@@ -6104,6 +6038,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "this time? Thank you";
 		mes "for your help~";
 		set EIN_LOVERQ,3;
+		changequest 8078,8077;
 		getitem 1901,1; //Violin
 		close;
 	}
@@ -6146,6 +6081,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "all the time...";
 		next;
 		set EIN_LOVERQ,3;
+		changequest 8076,8077;
 		getitem 1901,1; //Violin
 		mes "[Calla]";
 		mes "I'm sorry to trouble you,";
@@ -6186,7 +6122,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 	}
 }
 
-ein_in01,200,101,5	script	Klitzer#ein	854,{
+ein_in01,200,101,5	script	Klitzer#ein	4_M_EINMAN2,{
 	if (EIN_LOVERQ == 16) {
 		mes "[Klitzer]";
 		mes "Look out, world!";
@@ -6236,6 +6172,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 			mes "even be useful to you later~";
 			delitem 7170,1; //Tuxedo
 			set EIN_LOVERQ,16;
+			changequest 8087,8088;
 			switch(rand(1,7)) {
 			case 1:
 				getitem 7289,1; //Olivine
@@ -6333,6 +6270,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 		mes "W-what should I do?";
 		next;
 		set EIN_LOVERQ,14;
+		changequest 8085,8086;
 		mes "[Klitzer]";
 		mes "This monkey suit";
 		mes "that I've got on just";
@@ -6381,6 +6319,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 			mes "my regards if you help me.";
 			next;
 			set EIN_LOVERQ,7;
+			changequest 8080,8081;
 			mes "[Klitzer]";
 			mes "I feel so much";
 			mes "better now. Oh!";
@@ -6473,38 +6412,18 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 		percentheal 100,0;
 		delitem 1901,1; //Violin
 		set EIN_LOVERQ,5;
-		if(checkre(0)) {
-			if (BaseLevel < 41) {
-				getexp 61,0;
-			}
-			else if (BaseLevel < 61) {
-				getexp 600,0;
-			}
-			else if (BaseLevel < 81) {
-				getexp 3000,0;
-			}
-			else if (BaseLevel < 99) {
-				getexp 20000,0;
-			}
+		changequest 8077,8079;
+		if (checkre(3)) {
+			if (BaseLevel < 41) getexp 61,0;
+			else if (BaseLevel < 61) getexp 600,0;
+			else if (BaseLevel < 81) getexp 3000,0;
+			else if (BaseLevel < 99) getexp 20000,0;
+			else getexp 30000,0;
 		} else {
-			if (BaseLevel < 41) {
-				getexp 3712,0;
-			}
-			else if (BaseLevel < 61) {
-				getexp 7425,0;
-			}
-			else if (BaseLevel < 71) {
-				getexp 14850,0;
-			}
-			else if (BaseLevel < 81) {
-				getexp 29700,0;
-			}
-			else if (BaseLevel < 91) {
-				getexp 59400,0;
-			}
-			else if (BaseLevel < 99) {
-				getexp 118800,0;
-		}
+			if (BaseLevel < 41) getexp 610,0;
+			else if (BaseLevel < 61) getexp 6000,0;
+			else if (BaseLevel < 81) getexp 30000,0;
+			else getexp 200000,0;
 		}
 		next;
 		mes "[Klitzer]";
@@ -6556,6 +6475,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 		mes "give anything to see her...";
 		next;
 		set EIN_LOVERQ,2;
+		setquest 8076;
 		mes "[Klitzer]";
 		mes "Just...";
 		mes "Just don't listen";
@@ -6588,7 +6508,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 	close;
 }
 
-ein_in01,21,147,3	script	Megass#EIN	853,3,3,{
+ein_in01,21,147,3	script	Megass#EIN	4_M_YURI,3,3,{
 	end;
 
 OnTouch:
@@ -6634,6 +6554,7 @@ OnTouch:
 		mes "wakes up, it won't be today!";
 		delitem 1901,1; //Violin
 		set EIN_LOVERQ,4;
+		changequest 8077,8078;
 		percentheal -90,0;
 		close2;
 		warp "einbroch",112,245;
@@ -6656,7 +6577,7 @@ OnTouch:
 	close;
 }
 
-ein_in01,31,151,3	script	Satra#ein	850,{
+ein_in01,31,151,3	script	Satra#ein	4_F_EINWOMAN,{
 	if (EIN_LOVERQ > 12) {
 		mes "[Satra]";
 		mes "I understand that my";
@@ -6748,6 +6669,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 			next;
 			delitem 1003,10; //Coal
 			set EIN_LOVERQ,13;
+			changequest 8084,8085;
 			mes "[Satra]";
 			mes "Anyway, when you next";
 			mes "meet Klitzer, please tell";
@@ -6859,7 +6781,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 		mes "here for sight seeing,";
 		mes "or perhaps you're running";
 		mes "some sort of adventurer's";
-		mes "errand. Am I right?"	;
+		mes "errand. Am I right?";
 		next;
 		mes "[Satra]";
 		mes "I know you well enough";
@@ -6973,6 +6895,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 		next;
 		delitem 1003,10; //Coal
 		set EIN_LOVERQ,10;
+		changequest 8083,8084;
 		mes "[Satra]";
 		mes "Well, I shall try to";
 		mes "find some use for these.";
@@ -7123,6 +7046,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 		mes "this kind of task will require";
 		mes "some effort on your part.";
 		set EIN_LOVERQ,9;
+		changequest 8082,8083;
 		next;
 		mes "[Satra]";
 		mes "Tah tah,";
@@ -7152,7 +7076,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 	close;
 }
 
-ein_in01,191,102,5	script	Kaijeta#ein	846,{
+ein_in01,191,102,5	script	Kaijeta#ein	4_F_EINOLD,{
 	if (EIN_LOVERQ > 15) {
 		mes "[Kaijeta]";
 		mes "My son learned";
@@ -7197,6 +7121,7 @@ ein_in01,191,102,5	script	Kaijeta#ein	846,{
 		mes "He gets so nervous about it!";
 		next;
 		set EIN_LOVERQ,15;
+		changequest 8086,8087;
 		mes "[Kaijeta]";
 		mes "A man should wear nice";
 		mes "clothes, like a Formal Suit";
@@ -7211,6 +7136,7 @@ ein_in01,191,102,5	script	Kaijeta#ein	846,{
 		mes "petty hatred between our";
 		mes "two towns stop my son from";
 		mes "seeing the woman he loves...";
+		changequest 8081,8082;
 		close;
 	}
 	if (EIN_LOVERQ == 7) {
@@ -7273,7 +7199,7 @@ ein_in01,191,102,5	script	Kaijeta#ein	846,{
 	close;
 }
 
-einbroch,188,72,3	script	Keneshiotz#ein	855,{
+einbroch,188,72,3	script	Keneshiotz#ein	4_M_EINMAN,{
 	mes "[Keneshiotz]";
 	mes "This city is full of sky";
 	mes "high smokestacks and";
@@ -7296,7 +7222,7 @@ einbroch,188,72,3	script	Keneshiotz#ein	855,{
 	close;
 }
 
-einbech,216,118,3	script	Catzllanpu#ein	854,{
+einbech,216,118,3	script	Catzllanpu#ein	4_M_EINMAN2,{
 	mes "[Catzllanpu]";
 	mes "^333333*Sigh...*^000000";
 	mes "Simple pleasures.";
@@ -7322,7 +7248,7 @@ einbech,216,118,3	script	Catzllanpu#ein	854,{
 	close;
 }
 
-einbroch,208,208,3	script	Kesunboss#ein	850,{
+einbroch,208,208,3	script	Kesunboss#ein	4_F_EINWOMAN,{
 	mes "[Kesunboss]";
 	mes "Lady Calla is the";
 	mes "epitome of elegance,";
@@ -7353,7 +7279,7 @@ einbroch,208,208,3	script	Kesunboss#ein	850,{
 	close;
 }
 
-einbech,176,125,3	script	Ellhenje#ein	850,{
+einbech,176,125,3	script	Ellhenje#ein	4_F_EINWOMAN,{
 	mes "[Ellhenje]";
 	mes "Things might be";
 	mes "bad in this town";
@@ -7389,7 +7315,7 @@ einbech,176,125,3	script	Ellhenje#ein	850,{
 	close;
 }
 
-ein_in01,208,86,3	script	Decii#ein	855,{
+ein_in01,208,86,3	script	Decii#ein	4_M_EINMAN,{
 	mes "[Decii]";
 	mes "This is so";
 	mes "frustrating!";
@@ -7405,7 +7331,7 @@ ein_in01,208,86,3	script	Decii#ein	855,{
 	close;
 }
 
-ein_in01,192,90,3	script	Supineque#ein	849,{
+ein_in01,192,90,3	script	Supineque#ein	4_M_DIEMAN,{
 	mes "[Supineque]";
 	mes "Ugh...";
 	mes "I'm starving!";
diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt
index b7f4550d7..9c73d6c9f 100644
--- a/npc/quests/quests_geffen.txt
+++ b/npc/quests/quests_geffen.txt
@@ -1,24 +1,23 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Geffen
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88 & Samuray22
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena 7.15 +
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
 //= Welding Mask and Headset Quests.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed exploits [Lupus]
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Updated "Welding Mask" Quest to the Official one. [Samuray22]
 //= 1.3a replaced item "names" with item id. Added missing [Lupus]
 //= 1.4 Updated welding mask and headset quests. [L0ne_W0lf]
-//============================================================ 
+//= 1.5 Added Number Match Game. [Euphy]
+//============================================================
 
 // Blacksmith: 'Welding Mask' Quest
 //============================================================
-geffen_in,144,166,4	script	Blacksmith	63,{
+geffen_in,144,166,4	script	Blacksmith	1_M_SMITH,{
 	mes "[Blacksmith]";
 	mes "You've never heard of me? Why, I'm the Veteran Blacksmith of this land. I've spent 30 years in this hot and bloody hellfire, bending steel to my iron will!";
 	next;
@@ -50,7 +49,7 @@ geffen_in,144,166,4	script	Blacksmith	63,{
 				mes "Ah, I see that you appreciate a Blacksmith's work! Alright, I'll do it right away !!";
 				next;
 				delitem 999,50;  //Steel
-				set Zeny,Zeny-2000;
+				Zeny -= 2000;
 				getitem 2292,1; // Welding_Mask
 				mes "[Blacksmith]";
 				mes "Hahaha~! Make good use of that!";
@@ -84,7 +83,7 @@ geffen_in,144,166,4	script	Blacksmith	63,{
 
 // Eric: 'Headset' Quest
 //============================================================
-geffen_in,30,71,4	script	Eric	83,{
+geffen_in,30,71,4	script	Eric	4_M_01,{
 	mes "[Eric]";
 	mes "Please listen";
 	mes "to my story";
@@ -162,3 +161,268 @@ geffen_in,30,71,4	script	Eric	83,{
 		close;
 	}
 }
+
+// Number Match Game :: gef_yagu
+//============================================================
+geffen,122,77,4	script	Nia#yagu	8_F_GIRL,{
+	mes "[Nia]";
+	mes "Hello, I'm Nia, the fifth";
+	mes "disciple of Mawong, the";
+	mes "gaming mastermind. Now,";
+	mes "how would you like to play a";
+	mes "Number Match game with me?";
+	next;
+	switch(select("Number Match Game?:Practice Number Match:Play Number Match:Record Holder:Cancel")) {
+	case 1:
+		mes "[Nia]";
+		mes "Ah, well, the objective of";
+		mes "the Number Match game is to";
+		mes "guess the number I'm thinking";
+		mes "of. Of course, there are a few";
+		mes "rules that limit the numbers";
+		mes "that I can choose from.";
+		next;
+		mes "[Nia]";
+		mes "All the numbers that I make";
+		mes "up must be 3 digits, I can't";
+		mes "use 0 for any of the digits,";
+		mes "and I can't use the same";
+		mes "number for any of the digits";
+		mes "more than once.";
+		next;
+		mes "[Nia]";
+		mes "So, for example, I can't";
+		mes "use the numbers 103, 112,";
+		mes "252, or 701. Those numbers";
+		mes "either have a 0, or they use";
+		mes "the same number in the digits";
+		mes "more than once. Got it now?";
+		next;
+		mes "[Nia]";
+		mes "Now, you only get 5 guesses,";
+		mes "and after each guess, I'll tell";
+		mes "you how many digits you guessed";
+		mes "correctly, followed by the number of correctly guessed digits in";
+		mes "the correct digit place.";
+		next;
+		mes "[Nia]";
+		mes "For example, let's say the";
+		mes "number I come up with is 168.";
+		mes "If your first guess is 678, then you guessed two of the digits,";
+		mes "6 and 8, correctly. However,";
+		mes "only 8 is in the correct place.";
+		next;
+		mes "[Nia]";
+		mes "You know, it'd be a good idea";
+		mes "if you try the Practice Mode";
+		mes "first. Then, when you're more";
+		mes "comfortable, play the actual";
+		mes "Number Match game. Don't forget that speed counts for your score!";
+		next;
+		mes "[Nia]";
+		mes "Ah, if you happen to";
+		mes "make a new record in the";
+		mes "Number Match game, you'll";
+		mes "have your name recorded,";
+		mes "so don't miss this chance for";
+		mes "fame and maybe even fortune~";
+		close;
+	case 2:
+		mes "[Nia]";
+		mes "Great, let's do a practice";
+		mes "Number Match game. Please";
+		mes "try to guess my number, okay?";
+		mes "If you want to cancel, then please enter a number greater than 1,000.";
+		set .@practice,1;
+		break;
+	case 3:
+		mes "[Nia]";
+		mes "Great, let's play Number Match!";
+		mes "You will have 5 chances to guess the number that I'm thinking of.";
+		mes "If you want to cancel, then please enter a number greater than 1,000.";
+		set .@practice,0;
+		break;
+	case 4:
+		set .@name_record$, $050908_minus1_yagu$;
+		if (.@name_record$ == "") //custom
+			set .@name_record$,"(null)";
+		set .@score_record, $050908_minus1_yagu;
+		set .@score_min, .@score_record / 60;
+		set .@score_sec, .@score_record % 60;
+		mes "[Nia]";
+		mes "^ff0000" + .@name_record$ + "^000000 is the";
+		mes "record holder for the Number";
+		mes "Match game with a time of";
+		mes "^ff0000" + .@score_min + " minutes, " + .@score_sec + " seconds^000000.";
+		close;
+	case 5:
+		mes "[Nia]";
+		mes "Take care of yourself,";
+		mes "adventurer. If you ever";
+		mes "feel like playing a Number";
+		mes "Match game, come and talk";
+		mes "to me, alright? See you~";
+		close;
+	}
+	next;
+
+	// Generate 3 digits of a number.
+	while(1) {
+		set .@yagu100, rand(1,9);
+		set .@yagu10, rand(1,9);
+		set .@yagu1, rand(1,9);
+		if ((.@yagu100 != .@yagu10) && (.@yagu100 != .@yagu1) && (.@yagu10 != .@yagu1)) {
+			// Store the actual number (unofficial).
+			set .@yagu, (100*.@yagu100) + (10*.@yagu10) + .@yagu1;
+			break;
+		}
+	}
+
+	// The official time calculation is based on ServerTime,
+	// an int HHMMSS equivalent to atoi(gettimestr("%H%M%S",7)).
+	// UNIX time is really a better way to do this.
+	set .@start_time, gettimetick(2);
+
+	while(1) {
+
+		// Guess a number that meets all conditions.
+		while(1) {
+			if (input(.@input,100,999) != 0) {
+				mes "[Nia]";
+				mes "You've canceled the";
+				mes "Number Match game.";
+				close;
+			}
+			set .@input100, .@input / 100;
+			set .@input10, (.@input % 100) / 10;
+			set .@input1, .@input % 10;
+			if ((.@input100 > 0) && (.@input10 > 0) && (.@input1 > 0)) {
+				if ((.@input100 != .@input10) && (.@input100 != .@input1) && (.@input10 != .@input1))
+					break;
+			}
+			mes "[Nia]";
+			mes "You entered one of the";
+			mes "digits as 0, or input the";
+			mes "same numerical value in";
+			mes "the digits more than once.";
+			mes "Please enter another guess.";
+			next;
+		}
+
+		set .@retry, .@retry+1;
+		mes "[Nia]";
+		mes "^ff0000"+strcharinfo(0)+"^000000,";
+		mes "your guess is ^0000ff"+.@input+"^000000.";
+		mes "Give me a moment to";
+		mes "come up with your results.";
+		next;
+
+		// Correct digits in correct locations.
+		set .@strike,0;
+		if (.@yagu100 == .@input100)
+			set .@strike, .@strike+1;
+		if (.@yagu10 == .@input10)
+			set .@strike, .@strike+1;
+		if (.@yagu1 == .@input1)
+			set .@strike, .@strike+1;
+
+		// Correct digits in incorrect locations.
+		set .@ball,0;
+		if ((.@yagu100 == .@input10) || (.@yagu100 == .@input1))
+			set .@ball, .@ball+1;
+		if ((.@yagu10 == .@input100) || (.@yagu10 == .@input1))
+			set .@ball, .@ball+1;
+		if ((.@yagu1 == .@input100) || (.@yagu1 == .@input10))
+			set .@ball, .@ball+1;
+
+		if (.@strike == 3) {
+			if (.@practice) {
+				mes "[Nia]";
+				mes "Yes, the number that";
+				mes "I guessed was ^ff0000"+.@yagu+"^000000!";
+				mes "Congratulations, you";
+				mes "just won this practice";
+				mes "game! Now you should be";
+				mes "ready for the real thing~";
+				close;
+			} else {
+
+				// Calculate final time and check against the previous record.
+				set .@end_time, gettimetick(2);
+				if (.@end_time < .@start_time)
+					set .@end_time, .@end_time + 3600;
+				set .@total_time, .@end_time - .@start_time;
+				set .@total_min, .@total_time / 60;
+				set .@total_sec, .@total_time % 60;
+				set .@name_record$, $050908_minus1_yagu$;
+				if (.@name_record$ == "") //custom
+					set .@name_record$,"(null)";
+				set .@score_record, $050908_minus1_yagu;
+				set .@score_min, .@score_record / 60;
+				set .@score_sec, .@score_record % 60;
+
+				if (.@score_record >= .@total_time || !.@score_record) { //custom (second condition)
+					set $050908_minus1_yagu$, strcharinfo(0);
+					set $050908_minus1_yagu, .@total_time;
+					mes "[Nia]";
+					mes "Great! You guessed";
+					mes "my number, which was";
+					mes "^ff0000" + .@yagu + "^000000. You finished in";
+					mes "^ff0000" + .@total_min + " minutes, " + .@total_sec + " seconds^000000,";
+					mes "breaking the previous record";
+					mes "of ^ff0000" + .@score_min + " minutes, " + .@score_sec + " seconds^000000.";
+					next;
+					mes "[Nia]";
+					mes "^ff0000" + .@name_record$ + "^000000";
+					mes "set that old record,";
+					mes "but now you are the";
+					mes "new person to beat in the";
+					mes "Match Game. Congratulations";
+					mes "for setting a new record!";
+					close;
+				}
+				mes "[Nia]";
+				mes "Nice work, you guessed";
+				mes "my number! The answer, of";
+				mes "course, was ^ff0000" + .@yagu + "^000000. You managed";
+				mes "to guess this number correctly";
+				mes "in ^ff0000" + .@total_min + " minutes, " + .@total_sec + " seconds^000000.";
+				next;
+				mes "[Nia]";
+				mes "^ff0000" + .@name_record$ + "^000000 is";
+				mes "the current Number Match";
+				mes "record holder with a time";
+				mes "of ^ff0000" + .@score_min + " minutes, " + .@score_sec + " seconds^000000.";
+				mes "Good luck, and hopefully you";
+				mes "can break this record someday~";
+				close;
+			}
+		} else {
+			if (.@practice) {
+				mes "[Nia]";
+				mes "Your guess has ^ff0000" + .@ball + "^000000 of the";
+				mes "correct numbers. ^ff0000" + .@strike + "^000000 of the";
+				mes "digits in your guess have";
+				mes "the correct number in the";
+				mes "correct digit placement.";
+				mes "Alright, try it again~";
+				next;
+			} else {
+				mes "[Nia]";
+				mes "Your last guess had ^ff0000" + .@ball + "^000000";
+				mes "of the correct numbers,";
+				mes "and ^ff0000" + .@strike + "^000000 digits in your guess";
+				mes "had the correct number in";
+				mes "the correct digit placement.";
+				switch(.@retry) {
+					case 1: mes "You have four guesses left."; break;
+					case 2: mes "You have three guesses left."; break;
+					case 3: mes "You have two guesses left."; break;
+					case 4: mes "You only have one guess left..."; break;
+					case 5: mes "The answer was ^ff0000" + .@yagu + "^000000."; close;
+				}
+				next;
+			}
+		}
+	}
+}
diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt
index ec7142c70..f5c1fe522 100644
--- a/npc/quests/quests_gonryun.txt
+++ b/npc/quests/quests_gonryun.txt
@@ -1,27 +1,25 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Gonryun
 //===== By: ==================================================
 //= KarLaeda
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Broken Sword Quest (Kept old mechanics)
 //= Lost Knife Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Added Lost Knife, updated dialog for Broken Sword
-//=	dungeon quest mechanics aportion is still the same.
+//=     Added Lost Knife, updated dialog for Broken Sword
+//=     dungeon quest mechanics aportion is still the same.
 //= 1.2a Bugfixes (bugreport:2404) [Paradox924X]
 //= 1.2b More Bugfixes (bugreport:2407) [Paradox924X]
-//============================================================ 
+//============================================================
 
-// Broken Sword
-//============================================================ 
-gon_in,17,93,5	script	Chief#gon	775,{
+// Broken Sword :: broken_sword
+//============================================================
+gon_in,17,93,5	script	Chief#gon	4_M_TWMASKMAN,{
 	if (BaseLevel > 50) {
 		if (b_sword == 0) {
 			set b_sword,1;
@@ -417,7 +415,7 @@ gon_in,17,93,5	script	Chief#gon	775,{
 	close;
 }
 
-gon_in,152,35,4	script	Hostess#gon	702,{
+gon_in,152,35,4	script	Hostess#gon	4_F_GON,{
 	if (b_sword < 1) {
 		mes "[Mei Yen Fang]";
 		mes "Oh...you're new here, right?";
@@ -515,7 +513,7 @@ gon_in,152,35,4	script	Hostess#gon	702,{
 	close;
 }
 
-gon_in,165,16,4	script	Man in hangover#gon	748,{
+gon_in,165,16,4	script	Man in hangover#gon	4_M_ALCHE_A,{
 	if (b_sword < 4) {
 		mes "[Xue Bong]";
 		mes "Ahhh.. my stomach.. my head..";
@@ -788,824 +786,824 @@ gon_in,165,16,4	script	Man in hangover#gon	748,{
 }
 
 gon_dun01,148,156,0	script	start01#gnbs	-1,{
-	OnInit:
-		sleep 10000;
-	OnCommandOn:
-		donpcevent "trace1-"+rand(1,5)+"#gnbs::OnCommandOn";
-		end;
+OnInit:
+	sleep 10000;
+OnCommandOn:
+	donpcevent "trace1-"+rand(1,5)+"#gnbs::OnCommandOn";
+	end;
 }
 
-gon_dun01,201,25,0	script	trace1-1#gnbs	139,1,1,{
+gon_dun01,201,25,0	script	trace1-1#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-1::OnCommandOn";
 	end;
 
-	OnTimer10000:
-		stopnpctimer;
-		disablenpc "trace1-1#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer10000:
+	stopnpctimer;
+	disablenpc "trace1-1#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-1#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-1#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-1#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-1#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,2,1,0	script	timer1-1	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-1";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-1";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-1";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-1";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-1";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-1::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-1::OnCommandOn";
+	end;
 }
 
-gon_dun01,202,25,0	script	#getitem1-1	111,2,1,{
+gon_dun01,202,25,0	script	#getitem1-1	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-1";
-		end;
+OnInit:
+	disablenpc "#getitem1-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-1";
-		donpcevent "timer1-1::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-1";
+	donpcevent "timer1-1::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-1";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-1";
+	end;
 }
 
-gon_dun01,190,160,0	script	trace1-2#gnbs	139,1,1,{
+gon_dun01,190,160,0	script	trace1-2#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-2::OnCommandOn";
 	end;
 
-	OnTimer100000:
-		stopnpctimer;
-		disablenpc "trace1-2#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer100000:
+	stopnpctimer;
+	disablenpc "trace1-2#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-2#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-2#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-2#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-2#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,3,1,0	script	timer1-2	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-2";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-2";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-2";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-2";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-2";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-2::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-2::OnCommandOn";
+	end;
 }
 
-gon_dun01,190,159,0	script	#getitem1-2	111,2,1,{
+gon_dun01,190,159,0	script	#getitem1-2	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-2";
-		end;
+OnInit:
+	disablenpc "#getitem1-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-2";
-		donpcevent "timer1-2::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-2";
+	donpcevent "timer1-2::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-2";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-2";
+	end;
 }
 
-gon_dun01,163,53,0	script	trace1-3#gnbs	139,1,1,{
+gon_dun01,163,53,0	script	trace1-3#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-3::OnCommandOn";
 	end;
 
-	OnTimer90000:
-		stopnpctimer;
-		disablenpc "trace1-3#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer90000:
+	stopnpctimer;
+	disablenpc "trace1-3#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-3#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-3#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-3#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-3#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,4,1,0	script	timer1-3	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-3";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-3";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-3";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-3";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-3";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-3::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-3::OnCommandOn";
+	end;
 }
 
-gon_dun01,164,53,0	script	#getitem1-3	111,2,1,{
+gon_dun01,164,53,0	script	#getitem1-3	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-3";
-		end;
+OnInit:
+	disablenpc "#getitem1-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-3";
-		donpcevent "timer1-3::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-3";
+	donpcevent "timer1-3::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-3";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-3";
+	end;
 }
 
-gon_dun01,133,183,0	script	trace1-4#gnbs	139,1,1,{
+gon_dun01,133,183,0	script	trace1-4#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-4::OnCommandOn";
 	end;
 
-	OnTimer150000:
-		stopnpctimer;
-		disablenpc "trace1-4#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer150000:
+	stopnpctimer;
+	disablenpc "trace1-4#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-4#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-4#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-4#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-4#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,5,1,0	script	timer1-4	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-4";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-4";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-4";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-4";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-4";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-4::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-4::OnCommandOn";
+	end;
 }
 
-gon_dun01,134,183,0	script	#getitem1-4	111,2,1,{
+gon_dun01,134,183,0	script	#getitem1-4	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-4";
-		end;
+OnInit:
+	disablenpc "#getitem1-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-4";
-		donpcevent "timer1-4::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-4";
+	donpcevent "timer1-4::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-4";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-4";
+	end;
 }
 
-gon_dun01,139,257,0	script	trace1-5#gnbs	139,1,1,{
+gon_dun01,139,257,0	script	trace1-5#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 7) donpcevent "timer1-5::OnCommandOn";
 	end;
 
-	OnTimer170000:
-		stopnpctimer;
-		disablenpc "trace1-5#gnbs";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnTimer170000:
+	stopnpctimer;
+	disablenpc "trace1-5#gnbs";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace1-5#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace1-5#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace1-5#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace1-5#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun01,6,1,0	script	timer1-5	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer1-5";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer1-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer1-5";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer1-5";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer1-5";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer1-5";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem1-5::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem1-5::OnCommandOn";
+	end;
 }
 
-gon_dun01,140,257,0	script	#getitem1-5	111,2,1,{
+gon_dun01,140,257,0	script	#getitem1-5	HIDDEN_NPC,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem1-5";
-		end;
+OnInit:
+	disablenpc "#getitem1-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem1-5";
-		donpcevent "timer1-5::OnCommandOff";
-		donpcevent "start01#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem1-5";
+	donpcevent "timer1-5::OnCommandOff";
+	donpcevent "start01#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem1-5";
-		end;
+OnCommandOff:
+	disablenpc "#getitem1-5";
+	end;
 }
 
 gon_dun02,1,1,0	script	start02#gnbs	-1,{
-	OnInit:
-		sleep 10000;
-	OnCommandOn:
-		donpcevent "trace2-"+rand(1,6)+"#gnbs::OnCommandOn";
-		end;
+OnInit:
+	sleep 10000;
+OnCommandOn:
+	donpcevent "trace2-"+rand(1,6)+"#gnbs::OnCommandOn";
+	end;
 }
 
-gon_dun02,65,168,0	script	trace2-1#gnbs	139,1,1,{
+gon_dun02,65,168,0	script	trace2-1#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-1::OnCommandOn";
 	end;
 
-	OnTimer80000:
-		stopnpctimer;
-		disablenpc "trace2-1#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer80000:
+	stopnpctimer;
+	disablenpc "trace2-1#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-1#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-1#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-1#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-1#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,2,1,0	script	timer2-1	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-1";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-1";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-1";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-1";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-1";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-1::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-1::OnCommandOn";
+	end;
 }
 
-gon_dun02,202,25,0	script	#getitem2-1	111,2,1,{
+gon_dun02,202,25,0	script	#getitem2-1	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-1";
-		end;
+OnInit:
+	disablenpc "#getitem2-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-1";
-		donpcevent "timer2-1::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-1";
+	donpcevent "timer2-1::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-1";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-1";
+	end;
 }
 
-gon_dun02,265,200,0	script	trace2-2#gnbs	139,1,1,{
+gon_dun02,265,200,0	script	trace2-2#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-2::OnCommandOn";
 	end;
 
-	OnTimer130000:
-		stopnpctimer;
-		disablenpc "trace2-2#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer130000:
+	stopnpctimer;
+	disablenpc "trace2-2#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-2#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-2#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-2#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-2#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,3,1,0	script	timer2-2	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-2";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-2";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-2";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-2";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-2";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-2::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-2::OnCommandOn";
+	end;
 }
 
-gon_dun02,265,201,0	script	#getitem2-2	111,2,1,{
+gon_dun02,265,201,0	script	#getitem2-2	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-2";
-		end;
+OnInit:
+	disablenpc "#getitem2-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-2";
-		donpcevent "timer2-2::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-2";
+	donpcevent "timer2-2::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-2";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-2";
+	end;
 }
 
-gon_dun02,247,129,0	script	trace2-3#gnbs	139,1,1,{
+gon_dun02,247,129,0	script	trace2-3#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-3::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace2-3#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace2-3#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-3#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-3#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-3#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-3#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,4,1,0	script	timer2-3	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-3";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-3";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-3";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-3";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-3";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-3::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-3::OnCommandOn";
+	end;
 }
 
-gon_dun02,247,128,0	script	#getitem2-3	111,2,1,{
+gon_dun02,247,128,0	script	#getitem2-3	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-3";
-		end;
+OnInit:
+	disablenpc "#getitem2-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-3";
-		donpcevent "timer2-3::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-3";
+	donpcevent "timer2-3::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-3";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-3";
+	end;
 }
 
-gon_dun02,149,74,0	script	trace2-4#gnbs	139,1,1,{
+gon_dun02,149,74,0	script	trace2-4#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-4::OnCommandOn";
 	end;
 
-	OnTimer230000:
-		stopnpctimer;
-		disablenpc "trace2-4#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer230000:
+	stopnpctimer;
+	disablenpc "trace2-4#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-4#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-4#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-4#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-4#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,5,1,0	script	timer2-4	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-4";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-4";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-4";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-4";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-4";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-4::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-4::OnCommandOn";
+	end;
 }
 
-gon_dun02,149,75,0	script	#getitem2-4	111,2,1,{
+gon_dun02,149,75,0	script	#getitem2-4	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-4";
-		end;
+OnInit:
+	disablenpc "#getitem2-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-4";
-		donpcevent "timer2-4::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-4";
+	donpcevent "timer2-4::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-4";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-4";
+	end;
 }
 
-gon_dun02,23,105,0	script	trace2-5#gnbs	139,1,1,{
+gon_dun02,23,105,0	script	trace2-5#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-5::OnCommandOn";
 	end;
 
-	OnTimer190000:
-		stopnpctimer;
-		disablenpc "trace2-5#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer190000:
+	stopnpctimer;
+	disablenpc "trace2-5#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-5#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-5#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-5#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-5#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,6,1,0	script	timer2-5	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-5";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-5";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-5";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-5";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-5";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-5::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-5::OnCommandOn";
+	end;
 }
 
-gon_dun02,23,106,0	script	#getitem2-5	111,2,1,{
+gon_dun02,23,106,0	script	#getitem2-5	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-5";
-		end;
+OnInit:
+	disablenpc "#getitem2-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-5";
-		donpcevent "timer2-5::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-5";
+	donpcevent "timer2-5::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-5";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-5";
+	end;
 }
 
-gon_dun02,249,39,0	script	trace2-6#gnbs	139,1,1,{
+gon_dun02,249,39,0	script	trace2-6#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 8) donpcevent "timer2-6::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace2-6#gnbs";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace2-6#gnbs";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace2-6#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace2-6#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace2-6#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace2-6#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun02,7,1,0	script	timer2-6	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer2-6";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer2-6";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer2-6";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer2-6";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer2-6";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer2-6";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem2-6::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem2-6::OnCommandOn";
+	end;
 }
 
-gon_dun02,249,40,0	script	#getitem2-6	111,2,1,{
+gon_dun02,249,40,0	script	#getitem2-6	HIDDEN_NPC,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
 	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem2-6";
-		end;
+OnInit:
+	disablenpc "#getitem2-6";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem2-6";
-		donpcevent "timer2-6::OnCommandOff";
-		donpcevent "start02#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem2-6";
+	donpcevent "timer2-6::OnCommandOff";
+	donpcevent "start02#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem2-6";
-		end;
+OnCommandOff:
+	disablenpc "#getitem2-6";
+	end;
 }
 
 gon_dun03,1,1,0	script	start03#gnbs	-1,{
-	OnInit:
-		sleep 10000;
-	OnCommandOn:
-		donpcevent "trace3-"+rand(1,7)+"#gnbs::OnCommandOn";
-		end;
+OnInit:
+	sleep 10000;
+OnCommandOn:
+	donpcevent "trace3-"+rand(1,7)+"#gnbs::OnCommandOn";
+	end;
 }
 
-gon_dun03,11,75,0	script	trace3-1#gnbs	139,1,1,{
+gon_dun03,11,75,0	script	trace3-1#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-1::OnCommandOn";
 	end;
 
-	OnTimer200000:
-		stopnpctimer;
-		disablenpc "trace3-1#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer200000:
+	stopnpctimer;
+	disablenpc "trace3-1#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-1#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-1#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-1#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-1#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,2,1,0	script	timer3-1	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-1";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-1";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-1";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-1";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-1";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-1::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-1::OnCommandOn";
+	end;
 }
 
-gon_dun03,10,74,0	script	#getitem3-1	111,2,1,{
+gon_dun03,10,74,0	script	#getitem3-1	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1616,68 +1614,68 @@ gon_dun03,10,74,0	script	#getitem3-1	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-1";
-		end;
+OnInit:
+	disablenpc "#getitem3-1";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-1";
-		donpcevent "timer3-1::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-1";
+	donpcevent "timer3-1::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-1";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-1";
+	end;
 }
 
-gon_dun03,199,103,0	script	trace3-2#gnbs	139,1,1,{
+gon_dun03,199,103,0	script	trace3-2#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-2::OnCommandOn";
 	end;
 
-	OnTimer130000:
-		stopnpctimer;
-		disablenpc "trace3-2#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer130000:
+	stopnpctimer;
+	disablenpc "trace3-2#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-2#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-2#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-2#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-2#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,3,1,0	script	timer3-2	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-2";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-2";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-2";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-2";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-2";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-2::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-2::OnCommandOn";
+	end;
 }
 
-gon_dun03,199,102,0	script	#getitem3-2	111,2,1,{
+gon_dun03,199,102,0	script	#getitem3-2	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1688,68 +1686,68 @@ gon_dun03,199,102,0	script	#getitem3-2	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-2";
-		end;
+OnInit:
+	disablenpc "#getitem3-2";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-2";
-		donpcevent "timer3-2::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-2";
+	donpcevent "timer3-2::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-2";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-2";
+	end;
 }
 
-gon_dun03,14,162,0	script	trace3-3#gnbs	139,1,1,{
+gon_dun03,14,162,0	script	trace3-3#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-3::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace3-3#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace3-3#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-3#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-3#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-3#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-3#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,4,1,0	script	timer3-3	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-3";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-3";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-3";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-3";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-3";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-3::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-3::OnCommandOn";
+	end;
 }
 
-gon_dun03,14,163,0	script	#getitem3-3	111,2,1,{
+gon_dun03,14,163,0	script	#getitem3-3	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1760,68 +1758,68 @@ gon_dun03,14,163,0	script	#getitem3-3	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-3";
-		end;
+OnInit:
+	disablenpc "#getitem3-3";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-3";
-		donpcevent "timer3-3::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-3";
+	donpcevent "timer3-3::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-3";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-3";
+	end;
 }
 
-gon_dun03,155,263,0	script	trace3-4#gnbs	139,1,1,{
+gon_dun03,155,263,0	script	trace3-4#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-4::OnCommandOn";
 	end;
 
-	OnTimer230000:
-		stopnpctimer;
-		disablenpc "trace3-4#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer230000:
+	stopnpctimer;
+	disablenpc "trace3-4#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-4#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-4#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-4#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-4#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,5,1,0	script	timer3-4	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-4";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-4";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-4";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-4";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-4";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-4::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-4::OnCommandOn";
+	end;
 }
 
-gon_dun03,156,263,0	script	#getitem3-4	111,2,1,{
+gon_dun03,156,263,0	script	#getitem3-4	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1832,68 +1830,68 @@ gon_dun03,156,263,0	script	#getitem3-4	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-4";
-		end;
+OnInit:
+	disablenpc "#getitem3-4";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-4";
-		donpcevent "timer3-4::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-4";
+	donpcevent "timer3-4::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-4";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-4";
+	end;
 }
 
-gon_dun03,169,90,0	script	trace3-5#gnbs	139,1,1,{
+gon_dun03,169,90,0	script	trace3-5#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-5::OnCommandOn";
 	end;
 
-	OnTimer190000:
-		stopnpctimer;
-		disablenpc "trace3-5#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer190000:
+	stopnpctimer;
+	disablenpc "trace3-5#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-5#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-5#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-5#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-5#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,6,1,0	script	timer3-5	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-5";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-5";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-5";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-5";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-5";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-5::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-5::OnCommandOn";
+	end;
 }
 
-gon_dun03,170,90,0	script	#getitem3-5	111,2,1,{
+gon_dun03,170,90,0	script	#getitem3-5	HIDDEN_NPC,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1904,68 +1902,68 @@ gon_dun03,170,90,0	script	#getitem3-5	111,2,1,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-5";
-		end;
+OnInit:
+	disablenpc "#getitem3-5";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-5";
-		donpcevent "timer3-5::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-5";
+	donpcevent "timer3-5::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-5";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-5";
+	end;
 }
 
-gon_dun03,162,40,0	script	trace3-6#gnbs	139,1,1,{
+gon_dun03,162,40,0	script	trace3-6#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-6::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace3-6#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace3-6#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-6#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-6#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-6#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-6#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,7,1,0	script	timer3-6	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-6";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-6";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-6";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-6";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-6";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-6";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-6::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-6::OnCommandOn";
+	end;
 }
 
-gon_dun03,68,39,0	script	#getitem3-6	111,1,2,{
+gon_dun03,68,39,0	script	#getitem3-6	HIDDEN_NPC,1,2,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -1976,68 +1974,68 @@ gon_dun03,68,39,0	script	#getitem3-6	111,1,2,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-6";
-		end;
+OnInit:
+	disablenpc "#getitem3-6";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-6";
-		donpcevent "timer3-6::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-6";
+	donpcevent "timer3-6::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-6";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-6";
+	end;
 }
 
-gon_dun03,68,212,0	script	trace3-7#gnbs	139,1,1,{
+gon_dun03,68,212,0	script	trace3-7#gnbs	HIDDEN_WARP_NPC,1,1,{
 	if (b_sword == 9) donpcevent "timer3-7::OnCommandOn";
 	end;
 
-	OnTimer110000:
-		stopnpctimer;
-		disablenpc "trace3-7#gnbs";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnTimer110000:
+	stopnpctimer;
+	disablenpc "trace3-7#gnbs";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "trace3-7#gnbs";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "trace3-7#gnbs";
+	end;
 
-	OnCommandOn:
-		enablenpc "trace3-7#gnbs";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "trace3-7#gnbs";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 }
 
 gon_dun03,6,1,0	script	timer3-7	-1,{
-	OnInit:
-		initnpctimer;
-		stopnpctimer;
-		disablenpc "timer3-7";
-		end;
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+	disablenpc "timer3-7";
+	end;
 
-	OnCommandOn:
-		enablenpc "timer3-7";
-		setnpctimer 0;
-		startnpctimer;
-		end;
+OnCommandOn:
+	enablenpc "timer3-7";
+	setnpctimer 0;
+	startnpctimer;
+	end;
 
-	OnCommandOff:
-		stopnpctimer;
-		disablenpc "timer3-7";
-		end;
+OnCommandOff:
+	stopnpctimer;
+	disablenpc "timer3-7";
+	end;
 
-	OnTimer3000:
-		donpcevent "#getitem3-7::OnCommandOn";
-		end;
+OnTimer3000:
+	donpcevent "#getitem3-7::OnCommandOn";
+	end;
 }
 
-gon_dun03,68,213,0	script	#getitem3-7	111,1,2,{
+gon_dun03,68,213,0	script	#getitem3-7	HIDDEN_NPC,1,2,{
 	if (b_sword != 9) end;
 	set b_sword,10;
 	mes "You found a ^FF0000piece of blade^000000.";
@@ -2048,22 +2046,22 @@ gon_dun03,68,213,0	script	#getitem3-7	111,1,2,{
 	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
-	OnInit:
-		disablenpc "#getitem3-7";
-		end;
+OnInit:
+	disablenpc "#getitem3-7";
+	end;
 
-	OnCommandOn:
-		enablenpc "#getitem3-7";
-		donpcevent "timer3-7::OnCommandOff";
-		donpcevent "start03#gnbs::OnCommandOn";
-		end;
+OnCommandOn:
+	enablenpc "#getitem3-7";
+	donpcevent "timer3-7::OnCommandOff";
+	donpcevent "start03#gnbs::OnCommandOn";
+	end;
 
-	OnCommandOff:
-		disablenpc "#getitem3-7";
-		end;
+OnCommandOff:
+	disablenpc "#getitem3-7";
+	end;
 }
 
-gon_in,18,27,5	script	Madam#gnbs	771,{
+gon_in,18,27,5	script	Madam#gnbs	4_F_TWGRANDMOM,{
 	mes "[Shang Hua Yen]";
 	mes "Ho, ho, ho~";
 	mes "Who might this be?";
@@ -2092,7 +2090,7 @@ gon_in,18,27,5	script	Madam#gnbs	771,{
 	close;
 }
 
-gon_dun03,62,222,0	script	Strange dead body#gnbs	111,{
+gon_dun03,62,222,0	script	Strange dead body#gnbs	HIDDEN_NPC,{
 	if (b_sword < 7) {
 		mes "Here's a decomposing corpse.";
 		mes "It seems like monsters devoured it.";
@@ -2142,7 +2140,7 @@ gon_dun03,62,222,0	script	Strange dead body#gnbs	111,{
 	close;
 }
 
-gonryun,139,142,7	script	Girl##gnbs1	772,{
+gonryun,139,142,7	script	Girl##gnbs1	4_F_TWMASKGIRL,{
 	if (b_sword < 12) {
 		mes "[Shi Ying Xiao]";
 		mes "..........";
@@ -2178,7 +2176,7 @@ gonryun,139,142,7	script	Girl##gnbs1	772,{
 	close;
 }
 
-gonryun,100,241,0	script	Stranger#gnbs	733,{
+gonryun,100,241,0	script	Stranger#gnbs	4_M_JOB_KNIGHT1,{
 	if (b_sword < 14) {
 		mes "[Zuo Hei]";
 		mes "Hmm...";
@@ -2414,7 +2412,7 @@ gonryun,100,241,0	script	Stranger#gnbs	733,{
 	close;
 }
 
-geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
+geffen_in,71,112,2	script	Blacksmith#SaYumMoon	4_M_JOB_BLACKSMITH,{
 	if (b_sword < 17) {
 		mes "[Aumgarl]";
 		mes "*Sob*..*sob*....";
@@ -3002,7 +3000,7 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 	close;
 }
 
-geffen_in,106,106,7	script	Girl#gnbs2	716,{
+geffen_in,106,106,7	script	Girl#gnbs2	4_M_KID2,{
 	if (b_sword < 20) {
 		mes "[Lyroo]";
 		mes "Ah...Ah....";
@@ -3109,14 +3107,14 @@ geffen_in,106,106,7	script	Girl#gnbs2	716,{
 	mes "Heehehe...";
 	if (Sex == 0)
 		mes "Thank you my pretty sister.";
-	else 
+	else
 		mes "Thank you handsome brother~";
 	mes "I'll get my health back";
 	mes "and be a strong girl!";
 	close;
 }
 
-prontera,275,86,2	script	Young man#SaYumMoon	97,{
+prontera,275,86,2	script	Young man#SaYumMoon	4W_M_01,{
 	if (b_sword < 20) {
 		mes "[Neil]";
 		mes "Oh man, it feels so good";
@@ -3158,7 +3156,7 @@ prontera,275,86,2	script	Young man#SaYumMoon	97,{
 	close;
 }
 
-yuno,208,164,4	script	Active little girl#gnbs	101,{
+yuno,208,164,4	script	Active little girl#gnbs	4W_F_01,{
 	if (b_sword < 21) {
 		mes "[Hisa]";
 		mes ".....";
@@ -3200,7 +3198,7 @@ yuno,208,164,4	script	Active little girl#gnbs	101,{
 	close;
 }
 
-yuno_in01,99,101,4	script	Doctor#gnbs	744,{
+yuno_in01,99,101,4	script	Doctor#gnbs	4_F_ALCHE,{
 	if (b_sword < 23) {
 		mes "[??????]";
 		mes "I don't believe we've met";
@@ -3675,7 +3673,7 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 	close;
 }
 
-yuno_in01,104,94,0	script	go away#gnbs	139,2,1,{
+yuno_in01,104,94,0	script	go away#gnbs	HIDDEN_WARP_NPC,2,1,{
 OnTouch:
 	if (b_sword < 22) {
 		mes "[??????]";
@@ -3702,9 +3700,9 @@ OnTouch:
 	end;
 }
 
-// Lost Knife
-//============================================================ 
-gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
+// Lost Knife :: gon_npc
+//============================================================
+gonryun,237,226,3	script	Han Ran Jiao#gon	4_M_TWMIDMAN,{
 	if (nakha == 0) {
 		mes "[Han Ran Jiao]";
 		mes "Oh no! What will I do?!";
@@ -3799,7 +3797,7 @@ gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
 	}
 }
 
-gon_fild01,245,257,0	script	#gonknife	111,3,3,{
+gon_fild01,245,257,0	script	#gonknife	HIDDEN_NPC,3,3,{
 OnTouch:
 	if (nakha == 1) {
 		set nakha,2;
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index b0ac801e4..453a0e8fc 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -3,16 +3,16 @@
 //===== By: ==================================================
 //= MasterOfMuppets & SinSloth
 //===== Current Version: =====================================
-//= 2.1
+//= 2.3
 //===== Description: =========================================
-//= Quest NPC's related to Hugel
+//= Quest NPCs related to Hugel
 //===== Additional Comments: =================================
 //= 1.0 First version. [MasterOfMuppets]
 //= 1.1 Added most of Hugel quests. Thanks to MasterOfMuppets
 //= for scripting most of them. [SinSloth]
 //= 1.2 Added Odin Temple Excavation quest. [SinSloth]
 //= 1.3 Added a Missing "close;". [Samuray22]
-//=	-Thanks to Elfange
+//=     -Thanks to Elfange
 //= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.5a Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.5b Fixed a variable name. [SinSloth]
@@ -23,16 +23,15 @@
 //= 2.0 Commented a break out to fix a script hang.
 //= 2.1 Added quest log entries for:
 //=     - Juno Remedy Quest
+//= 2.2 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.3 Added questlog support. [Euphy]
 //============================================================
 
-// Medicine Quest
+// Medicine Quest :: hg_herv
 //============================================================
-hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
-
-	if(BaseLevel > 49)
-	{
-		if(hg_herb == 0)
-		{
+hu_in01,387,245,0	script	Allen Schuwell	4_M_DIEMAN,2,2,{
+	if (BaseLevel > 49) {
+		if (hg_herb == 0) {
 			mes "[Allen]";
 			mes "*Groooooan~*";
 			mes "Arrrgh, my back hurts...";
@@ -63,8 +62,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "find my son Postell and to";
 			mes "tell him to bring my medicine!";
 			next;
-			switch( select( "Sure.:No, I'm sorry." ) )
-			{
+			switch(select("Sure.:No, I'm sorry.")) {
 			case 1:
 				mes "[Allen]";
 				mes "Th-thank you so much!";
@@ -74,6 +72,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				mes "find Postell. Tell him that";
 				mes "I need my ''Kolbun A'' now!";
 				set hg_herb,1;
+				setquest 8053;
 				next;
 				mes "[Allen]";
 				mes "And let him know that";
@@ -83,7 +82,6 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				mes "He's dead to me if he";
 				mes "doesn't love his father!";
 				close;
-			break;
 			case 2:
 				mes "[Allen]";
 				mes "I... I don't understand...!";
@@ -92,11 +90,8 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				mes "I-I desperately need help!";
 				mes "No! Please, d-don't go away!";
 				close;
-			break;
 			}
-		}
-		else if(hg_herb == 2)
-		{
+		} else if (hg_herb == 2) {
 			mes "[Allen]";
 			mes "Postell... My son...";
 			mes "Why have you forsaken me?";
@@ -139,11 +134,9 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "would you please let me";
 			mes "have a White P-Potion?";
 			next;
-			switch( select( "Give White Potion:Ignore" ) )
-			{
+			switch(select("Give White Potion:Ignore")) {
 			case 1:
-				if(!countitem(504)) //White potion
-				{
+				if (!countitem(504)) {
 					mes "[Allen]";
 					mes "Oh... Oh no...! You";
 					mes "don't have any White";
@@ -152,9 +145,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 					mes "please! Bring me a White Potion";
 					mes "as soon as you can! ^333333*Cough!*^000000";
 					close;
-				}
-				else
-				{
+				} else {
 					delitem 504,1; //White potion
 					mes "[Allen]";
 					mes "Oh, thank you!";
@@ -183,13 +174,13 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 					mes "my son arrives? P-please?";
 					next;
 					set hg_herb,3;
+					changequest 8054,8055;
 					mes "[" +strcharinfo(0)+ "]";
 					mes "......";
 					mes ".........";
 					mes "............";
 					close;
 				}
-			break;
 			case 2:
 				mes "[Allen]";
 				mes "W-wait! A-are you just";
@@ -197,11 +188,8 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				mes "Noo! ^333333*Cough*^000000 Arrgh! A plague!";
 				mes "A plague on both your houses!";
 				close;
-			break;
 			}
-		}
-		else if(hg_herb == 3)
-		{
+		} else if (hg_herb == 3) {
 			mes "[Allen]";
 			mes "*Gasp* I... I can";
 			mes "feel it! I think I'm";
@@ -218,10 +206,9 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "from... Drawer... H-heeelp me!";
 			mes "Adventurer! H-Heeeeelp~!";
 			set hg_herb,4;
+			changequest 8055,8056;
 			close;
-		}
-		else if(hg_herb == 4)
-		{
+		} else if (hg_herb == 4) {
 			mes "[Allen]";
 			mes "No...!";
 			mes "There's a light at the";
@@ -230,9 +217,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "a little closer to me! Don't";
 			mes "let me step into the light!";
 			close;
-		}
-		else if(hg_herb == 6)
-		{
+		} else if (hg_herb == 6) {
 			mes "^3355FFYou have given the";
 			mes "Withstander medicine";
 			mes "to Allen who guzzles";
@@ -249,9 +234,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "day. Th-thank you so much...";
 			set hg_herb,7;
 			close;
-		}
-		else if(hg_herb == 7)
-		{
+		} else if (hg_herb == 7) {
 			mes "[Allen]";
 			mes "I... I can't...!";
 			mes "I can barely breathe!";
@@ -259,14 +242,11 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "again! Please, c-come closer";
 			mes "to me! I-I think I need CPR!";
 			close;
-		}
-		else if(hg_herb == 9)
-		{
+		} else if (hg_herb == 9) {
 			mes "^3355FFYou give another dose";
 			mes "of Withstander to Allen.^000000";
 			next;
-			if(rand(1,3) == 3)
-			{
+			if (rand(1,3) == 3) {
 				mes "[Allen]";
 				mes "Oh... Thank you...";
 				mes "I feel much b-better now.";
@@ -276,22 +256,20 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				set hg_herb,10;
 				close;
 			}
-				mes "[Allen]";
-				mes "Oh... Thank you...";
-				mes "Y-you're an angel, a regular";
-				mes "Florence Nightingale. Please";
-				mes "stay with m-me until my son";
-				mes "arrives. You wouldn't abandon";
-				mes "this sick man now, would you?";
-				next;
-				mes "[" +strcharinfo(0)+ "]";
-				mes "(^333333Your son Postell";
-				mes "better get here soon!^000000)";
-				set hg_herb,7;
-				close;
-		}
-		else if(hg_herb == 10)
-		{
+			mes "[Allen]";
+			mes "Oh... Thank you...";
+			mes "Y-you're an angel, a regular";
+			mes "Florence Nightingale. Please";
+			mes "stay with m-me until my son";
+			mes "arrives. You wouldn't abandon";
+			mes "this sick man now, would you?";
+			next;
+			mes "[" +strcharinfo(0)+ "]";
+			mes "(^333333Your son Postell";
+			mes "better get here soon!^000000)";
+			set hg_herb,7;
+			close;
+		} else if (hg_herb == 10) {
 			mes "[Allen]";
 			mes "Arrrgh! My ligaments!";
 			mes "They're in such pain!";
@@ -354,9 +332,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			emotion e_swt,1;
 			emotion e_swt;
 			end;
-		}
-		else if(hg_herb == 11)
-		{
+		} else if (hg_herb == 11) {
 			mes "[Allen]";
 			mes "*Sniff* I should have known";
 			mes "that Postell really does care";
@@ -372,10 +348,9 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "the medicine drawer, and help";
 			mes "yourself to whatever you like~";
 			set hg_herb,12;
+			changequest 8055,8056;
 			close;
-		}
-		else if(hg_herb == 12)
-		{
+		} else if (hg_herb == 12) {
 			mes "[Allen]";
 			mes "Don't worry, adventurer.";
 			mes "I haven't forgotten about";
@@ -383,9 +358,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "the medicine drawer, and help";
 			mes "yourself to whatever you like~";
 			close;
-		}
-		else if(hg_herb == 13)
-		{
+		} else if (hg_herb == 13) {
 			mes "[Allen]";
 			mes "So did you find the";
 			mes "Old Blue Box I put in";
@@ -394,9 +367,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "like it. Consider my way";
 			mes "of thanking you for your help~";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Allen]";
 			mes "*Groooooan~*";
 			mes "Arrrgh, my back hurts...";
@@ -406,9 +377,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "live happy, luxurious lives?";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Allen]";
 		mes "*Groooooan~*";
 		mes "Arrrgh, my back hurts...";
@@ -420,8 +389,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 	}
 
 OnTouch:
-	if(hg_herb == 4)
-	{
+	if (hg_herb == 4) {
 		mes "[Allen]";
 		mes "^333333*Cough cough!*^000000";
 		mes "W-Withstander...!";
@@ -430,9 +398,7 @@ OnTouch:
 		set hg_herb,5;
 		donpcevent "#DrawerOpener::OnEnable";
 		close;
-	}
-	else if(hg_herb == 7)
-	{
+	} else if (hg_herb == 7) {
 		mes "[Allen]";
 		mes "^333333*Whew*^000000";
 		mes "I... I can breathe again!";
@@ -447,8 +413,7 @@ OnTouch:
 	
 }
 
-hu_in01,385,247,5	script	Postell Schuwell#D	97,{
-
+hu_in01,385,247,5	script	Postell Schuwell#D	4W_M_01,{
 	mes "[Postell]";
 	mes "Hey, uh...";
 	mes "I'm in the middle";
@@ -470,10 +435,8 @@ OnTimer100000:
 	end;
 }
 
-hu_fild06,34,123,3	script	Postell Schuwell	97,{
-
-	if(hg_herb == 1)
-	{
+hu_fild06,34,123,3	script	Postell Schuwell	4W_M_01,{
+	if (hg_herb == 1) {
 		mes "[Postell]";
 		mes "I really like living";
 		mes "in Hugel. Fresh air,";
@@ -497,8 +460,7 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 		mes "all the medicines he's taking";
 		mes "are habit forming, you know?";
 		next;
-		switch( select( "But your father needs you!:Habit forming?" ) )
-		{
+		switch(select("But your father needs you!:Habit forming?")) {
 		case 1:
 			mes "[Allen's Voice]";
 			mes "Yeah, I guess you're right.";
@@ -524,8 +486,8 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 			mes "more trouble? I'd really";
 			mes "appreciate it if you do.";
 			set hg_herb,2;
+			changequest 8053,8054;
 			close;
-		break;
 		case 2:
 			mes "[Postell]";
 			mes "Yeah, like he's addicted";
@@ -534,11 +496,8 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 			mes "gets as little of it as possible! Honestly, I think he drinks";
 			mes "too much medicine already...";
 			close;
-		break;
 		}
-	}
-	else if(hg_herb > 1)
-	{
+	} else if (hg_herb > 1) {
 		mes "[Postell]";
 		mes "Kolbun A, Kolbun A...";
 		mes "Let's see, is it really";
@@ -546,9 +505,7 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 		mes "If it isn't, I better come up";
 		mes "with some replacement...";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Postell]";
 		mes "I really like living";
 		mes "in Hugel. Fresh air,";
@@ -557,23 +514,18 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 		mes "more could I want?";
 		close;
 	}
-	
 }
 
-hu_in01,370,255,3	script	Upper Drawer#First	139,2,2,{
-
+hu_in01,370,255,3	script	Upper Drawer#First	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
-	set @randvar,rand(1,7);
-	if(hg_herb < 5)
-	{
+	set .@rand,rand(1,7);
+	if (hg_herb < 5) {
 		mes "^3355FFThere are several";
 		mes "books and a few";
 		mes "liquid medicines";
 		mes "inside this drawer.^000000";
 		close;
-	}
-	else if(hg_herb == 5)
-	{
+	} else if (hg_herb == 5) {
 		mes "[Allen]";
 		mes "Oh... Oh...";
 		mes "Oooh... The pain";
@@ -582,8 +534,8 @@ OnTouch:
 		mes "Withstander later...";
 		set hg_herb,4;
 		next;
-		if(@randvar == 4)
-		{
+		set .@rand,rand(1,7);
+		if (.@rand == 4) {
 			mes "^3355FFYou find an old book";
 			mes "inside the drawer.^000000";
 			next;
@@ -600,9 +552,7 @@ OnTouch:
 			mes "I guess that's why he'd";
 			mes "keep this old PR brochure...^000000)";
 			close;
-		}
-		else if(@randvar == 5)
-		{
+		} else if (.@rand == 5) {
 			mes "^3355FFYou find Allen's";
 			mes "journal inside the";
 			mes "drawer and quickly";
@@ -618,20 +568,16 @@ OnTouch:
 			mes "Lab... Escape... Hugel... Um...";
 			mes "Dr. Morriphen... Side effects?";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Wh-what...?";
 			mes "Do you really";
 			mes "need that medicine?!";
 			close;
 		}
-	}
-	else if(hg_herb == 6)
+	} else if (hg_herb == 6)
 		end;
-	else if(hg_herb == 8)
-	{
+	else if (hg_herb == 8) {
 		mes "[Allen]";
 		mes "Oh... Oh...";
 		mes "Oooh... The pain";
@@ -640,8 +586,7 @@ OnTouch:
 		mes "Withstander later...";
 		set hg_herb,7;
 		next;
-		if(@randvar == 4)
-		{
+		if (.@rand == 4) {
 			mes "^3355FFYou find an old book";
 			mes "inside the drawer.^000000";
 			next;
@@ -658,9 +603,7 @@ OnTouch:
 			mes "I guess that's why he'd";
 			mes "keep this old PR brochure...^000000)";
 			close;
-		}
-		else if(@randvar == 5)
-		{
+		} else if (.@rand == 5) {
 			mes "^3355FFYou find Allen's";
 			mes "journal inside the";
 			mes "drawer and quickly";
@@ -676,33 +619,27 @@ OnTouch:
 			mes "Lab... Escape... Hugel... Um...";
 			mes "Dr. Morriphen... Side effects?";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Wh-what...?";
 			mes "Do you really";
 			mes "need that medicine?!";
 			close;
 		}
-	}
-	else if(hg_herb == 9)
+	} else if (hg_herb == 9)
 		end;
-	else if(hg_herb == 12)
-	{
+	else if (hg_herb == 12) {
 		mes "^3355FFYou find an";
 		mes "Old Blue Box deep";
 		mes "inside the drawer.^000000";
 		close2;
 		specialeffect EF_CONE;
 		set hg_herb,13;
-		getitem 603,1; //Old blue box
-		getexp 5000,0;
-	}
-	else
-	{
-		if(@randvar > 3)
-		{
+		getitem 603,1; //Old Blue Box
+		getexp (checkre(3))?5000:50000,0;
+		completequest 8056;
+	} else {
+		if (.@rand > 3) {
 			mes "^3355FFYou find an old book";
 			mes "inside the drawer.^000000";
 			next;
@@ -719,9 +656,7 @@ OnTouch:
 			mes "I guess that's why he'd";
 			mes "keep this old PR brochure...^000000)";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "^3355FFYou find Allen's";
 			mes "journal inside the";
 			mes "drawer and quickly";
@@ -739,36 +674,29 @@ OnTouch:
 			close;
 		}
 	}
-	
 }
 
-hu_in01,370,255,3	script	Upper Drawer#Second	139,2,2,{
+hu_in01,370,255,3	script	Upper Drawer#Second	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Upper Drawer#Second";
 	end;
 
-	OnTouch:
-		if(hg_herb == 5)
-		{
-			mes "^3355FFYou take out one dose of";
-			mes "Withstander from the drawer.^000000";
-			set hg_herb,6;
-			close;
-		}
-		else if(hg_herb == 8)
-		{
-			mes "^3355FFYou take out one dose of";
-			mes "Withstander from the drawer.^000000";
-			set hg_herb,9;
-			close;
-		}
-		else
-		{
-			mes "^3355FFThere are several books";
-			mes "kept inside this drawer.^000000";
-			close;
-		}
-		
+OnTouch:
+	if (hg_herb == 5) {
+		mes "^3355FFYou take out one dose of";
+		mes "Withstander from the drawer.^000000";
+		set hg_herb,6;
+		close;
+	} else if (hg_herb == 8) {
+		mes "^3355FFYou take out one dose of";
+		mes "Withstander from the drawer.^000000";
+		set hg_herb,9;
+		close;
+	} else {
+		mes "^3355FFThere are several books";
+		mes "kept inside this drawer.^000000";
+		close;
+	}
 }
 
 hu_in01,1,1,0	script	#DrawerOpener	-1,{
@@ -792,17 +720,13 @@ OnTimer4500:
 	disablenpc "#DrawerOpener";
 	stopnpctimer;
 	end;
-	
 }
 
-// Biological Weapon Quest
+// Biological Weapon Quest :: hg_bio
 //============================================================
-ein_in01,16,36,3	script	Morriphen	86,{
-
-	if(hg_bio == 0)
-	{
-		if(hg_herb == 13)
-		{
+ein_in01,16,36,3	script	Morriphen	4_M_04,{
+	if (hg_bio == 0) {
+		if (hg_herb == 13) {
 			mes "[Morriphen]";
 			mes "Wh-who are you, and what are";
 			mes "you looking for? If you're here";
@@ -846,8 +770,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 			mes "Hmm...";
 			mes "What should I do?";
 			next;
-			switch( select( "Leave him:Help him" ) )
-			{
+			switch(select("Leave him:Help him")) {
 			case 1:
 				mes "["+strcharinfo(0)+"]";
 				mes "You know, I'm a little";
@@ -861,7 +784,6 @@ ein_in01,16,36,3	script	Morriphen	86,{
 				mes "just fine. You take care";
 				mes "of yourself, you hear?";
 				close;
-			break;
 			case 2:
 				mes "["+strcharinfo(0)+"]";
 				mes "Hey...";
@@ -925,21 +847,17 @@ ein_in01,16,36,3	script	Morriphen	86,{
 				mes "^333333*Cough Cough*";
 				mes "*Cough Cough*^000000";
 				set hg_bio,1;
+				setquest 11009;
 				close;
-			break;
 			}
-		}
-		else
-		{
+		} else {
 			mes "[Morriphen]";
 			mes "Ugh... I don't feel";
 			mes "very well. I guess";
 			mes "I better call it a day...";
 			close;
 		}
-	}
-	else if(hg_bio == 1)
-	{
+	} else if (hg_bio == 1) {
 		mes "[Morriphen]";
 		mes "Please ask my ^333333*Cough*^000000";
 		mes "wife Siria in my home in";
@@ -947,9 +865,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "medicine. Th-thank you...";
 		mes "^333333*Haaaaack* *Hhh, haaaack*^000000";
 		close;
-	}
-	else if(hg_bio == 2)
-	{
+	} else if (hg_bio == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh no... Morriphen";
 		mes "doesn't look good at all!";
@@ -957,9 +873,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "him medicine from Siria";
 		mes "in Hugel as soon as I can!";
 		close;
-	}
-	else if(hg_bio == 3)
-	{
+	} else if (hg_bio == 3) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh no... Morriphen";
 		mes "doesn't look good at all!";
@@ -967,9 +881,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "him medicine from Dono";
 		mes "in Hugel as soon as I can!";
 		close;
-	}
-	else if(hg_bio == 4)
-	{
+	} else if (hg_bio == 4) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh no... Morriphen";
 		mes "doesn't look good at all!";
@@ -977,9 +889,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "him medicine from Dono";
 		mes "in Hugel as soon as I can!";
 		close;
-	}
-	else if(hg_bio == 5)
-	{
+	} else if (hg_bio == 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh no... Morriphen";
 		mes "doesn't look good at all!";
@@ -987,9 +897,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "him medicine from Dono";
 		mes "in Hugel as soon as I can!";
 		close;
-	}
-	else if(hg_bio == 6)
-	{
+	} else if (hg_bio == 6) {
 		mes "^3355FFYou administer the";
 		mes "medicine to Morriphen,";
 		mes "who slowly regains";
@@ -1031,10 +939,9 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "I can back to Hugel to";
 		mes "give Siria this medicine.";
 		set hg_bio,7;
+		changequest 11014,11015;
 		close;
-	}
-	else if(hg_bio == 7)
-	{
+	} else if (hg_bio == 7) {
 		mes "["+strcharinfo(0)+"]";
 		mes "What am I doing...?";
 		mes "I need to return to";
@@ -1042,9 +949,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "medicine to Siria as";
 		mes "soon as possible!";
 		close;
-	}
-	else if(hg_bio == 8)
-	{
+	} else if (hg_bio == 8) {
 		mes "[Morriphen]";
 		mes "You're back! So, have you";
 		mes "seen my wife? She's okay,";
@@ -1312,11 +1217,10 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "I won't have to worry";
 		mes "about you. Take care~";
 		set hg_bio,9;
-		getexp 70000,0;
+		getexp (checkre(3))?70000:700000,0;
+		completequest 11016;
 		close;
-	}
-	else if(hg_bio == 9)
-	{
+	} else if (hg_bio == 9) {
 		mes "[Morriphen]";
 		mes "Oh, long time no see~";
 		mes "Yes, my wife and I can't";
@@ -1331,9 +1235,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "here in Hugel. Why don't you";
 		mes "come visit our house sometime?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Morriphen]";
 		mes "Oh, long time no see~";
 		mes "Yes, my wife and I can't";
@@ -1349,13 +1251,10 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "come visit our house sometime?";
 		close;
 	}
-	
 }
 
-hu_in01,326,307,3	script	Siria	90,{
-
-	if(hg_bio == 1)
-	{
+hu_in01,326,307,3	script	Siria	4_F_01,{
+	if (hg_bio == 1) {
 		mes "[Siria]";
 		mes "Oh, hello there.";
 		mes "Can I help you";
@@ -1443,10 +1342,9 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "trust you too. ^333333*Cough*^000000";
 		mes "Thank you so much...";
 		set hg_bio,2;
+		changequest 11009,11010;
 		close;
-	}
-	else if(hg_bio == 2)
-	{
+	} else if (hg_bio == 2) {
 		mes "[Siria]";
 		mes "^333333*Sniff*^000000 Please";
 		mes "go to Lighthalzen and";
@@ -1454,9 +1352,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "medicine from his friend,";
 		mes "Dono, as soon as you can.";
 		close;
-	}
-	else if(hg_bio == 3)
-	{
+	} else if (hg_bio == 3) {
 		mes "[Siria]";
 		mes "Oh, have you met Dono?";
 		mes "I'm so grateful for all of";
@@ -1464,9 +1360,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "good friend to Morriphen,";
 		mes "no matter what he says.";
 		close;
-	}
-	else if(hg_bio == 4)
-	{
+	} else if (hg_bio == 4) {
 		mes "[Siria]";
 		mes "Oh, have you met Dono?";
 		mes "I'm so grateful for all of";
@@ -1474,9 +1368,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "good friend to Morriphen,";
 		mes "no matter what he says.";
 		close;
-	}
-	else if(hg_bio == 5)
-	{
+	} else if (hg_bio == 5) {
 		mes "[Siria]";
 		mes "Oh, have you met Dono?";
 		mes "I'm so grateful for all of";
@@ -1484,9 +1376,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "good friend to Morriphen,";
 		mes "no matter what he says.";
 		close;
-	}
-	else if(hg_bio == 6)
-	{
+	} else if (hg_bio == 6) {
 		mes "[Siria]";
 		mes "*Cough* I-I'm fine,";
 		mes "so please don't worry";
@@ -1494,9 +1384,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "medicine to Morriphen as";
 		mes "fast as you can for me.";
 		close;
-	}
-	else if(hg_bio == 7)
-	{
+	} else if (hg_bio == 7) {
 		mes "^3355FFYou gently administered";
 		mes "the medicine to Siria, who";
 		mes "slow regained consciousness.^000000";
@@ -1524,11 +1412,10 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "I just... I just need to relax.";
 		mes "Thank you for everything...";
 		set hg_bio,8;
-		getexp 50000,0;
+		getexp (checkre(3))?30000:500000,0;
+		changequest 11015,11016;
 		close;
-	}
-	else if(hg_bio == 8)
-	{
+	} else if (hg_bio == 8) {
 		mes "[Siria]";
 		mes "Oh, please go back";
 		mes "to Morriphen and let";
@@ -1536,9 +1423,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "better. I don't want him";
 		mes "to worry about me!";
 		close;
-	}
-	else if(hg_bio == 9)
-	{
+	} else if (hg_bio == 9) {
 		mes "[Siria]";
 		mes "Oh, welcome~";
 		mes "Thank you so much";
@@ -1546,22 +1431,17 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "Morriphen. You've been";
 		mes "a real godsend, you know?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Siria]";
 		mes "Oh, hello there.";
 		mes "Can I help you";
 		mes "with anything?";
 		close;
 	}
-	
 }
 
-lighthalzen,88,79,7	script	Dono	85,{
-
-	if(hg_bio == 2)
-	{
+lighthalzen,88,79,7	script	Dono	4_M_03,{
+	if (hg_bio == 2) {
 		mes "[Dono]";
 		mes "What do you want?";
 		mes "Spit it out, I don't";
@@ -1644,33 +1524,30 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "If you don't hurry, then";
 		mes "those two will die, simple^FFFFFF ^000000 as that. I'll wait for you here.";
 		set hg_bio,3;
+		changequest 11010,11011;
 		close;
-	}
-	else if(hg_bio == 1)
-	{
+	} else if (hg_bio == 1) {
 		mes "[Dono]";
 		mes "Store's closed.";
 		mes "Get outta here, and";
 		mes "come back later to";
 		mes "buy something, got it?";
 		close;
-	}
-	else if(hg_bio == 3)
-	{
-		if (countitem(971) > 2 && countitem(1003) > 4 && countitem(619) && countitem(507) && countitem(508) && countitem(511) && countitem(509) && countitem(510) && countitem(7053) > 4 && countitem(7054) > 4 && countitem(935) > 19)
-		{
-			delitem 971,3;
-			delitem 1003,5;
-			delitem 619,1;
-			delitem 507,1;
-			delitem 508,1;
-			delitem 511,1;
-			delitem 509,1;
-			delitem 510,1;
-			delitem 7053,5;
-			delitem 7054,5;
-			delitem 935,20;
+	} else if (hg_bio == 3) {
+		if (countitem(971) > 2 && countitem(1003) > 4 && countitem(619) && countitem(507) && countitem(508) && countitem(511) && countitem(509) && countitem(510) && countitem(7053) > 4 && countitem(7054) > 4 && countitem(935) > 19) {
+			delitem 971,3; //Detrimindexta
+			delitem 1003,5; //Coal
+			delitem 619,1; //Unripe_Apple
+			delitem 507,1; //Red_Herb
+			delitem 508,1; //Yellow_Herb
+			delitem 511,1; //White_Herb
+			delitem 509,1; //Green_Herb
+			delitem 510,1; //Blue_Herb
+			delitem 7053,5; //Brigan
+			delitem 7054,5; //Cyfar
+			delitem 935,20; //Shell
 			set hg_bio,4;
+			changequest 11011,11012;
 			mes "[Dono]";
 			mes "Good, good, you've brought";
 			mes "everything I've asked. Give";
@@ -1713,9 +1590,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 			mes "chemical impurities in this";
 			mes "medicine. Go, go now!";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Dono]";
 			mes "If you don't hurry and";
 			mes "gather the materials for";
@@ -1741,9 +1616,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 			mes "^3355FF1 Yellow Herb^000000.";
 			close;
 		}
-	}
-	else if(hg_bio == 4)
-	{
+	} else if (hg_bio == 4) {
 		mes "[Dono]";
 		mes "Hey, you should be able";
 		mes "to find Makkie inside the";
@@ -1751,9 +1624,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "up and bring me some Red";
 		mes "Plant Stem Power from him.^FFFFFF ^000000 Come on, Morriphen's in trouble!";
 		close;
-	}
-	else if(hg_bio == 5)
-	{
+	} else if (hg_bio == 5) {
 		mes "[Dono]";
 		mes "Where is it?!";
 		mes "Okay, good, you brought";
@@ -1815,19 +1686,16 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "stresses himself to death,";
 		mes "my work will be for nothing.";
 		set hg_bio,6;
+		changequest 11013,11014;
 		close;
-	}
-	else if(hg_bio == 6)
-	{
+	} else if (hg_bio == 6) {
 		mes "[Dono]";
 		mes "Whoa, what are you still";
 		mes "doing here?! Hurry and";
 		mes "get that medicine over to";
 		mes "Morriphen, or he'll die soon!";
 		close;
-	}
-	else if(hg_bio == 7)
-	{
+	} else if (hg_bio == 7) {
 		mes "[Dono]";
 		mes "Oh, hey, do you know";
 		mes "how Morriphen's doing?";
@@ -1836,9 +1704,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "only guy that can offer me";
 		mes "a decent challenge at chess...";
 		close;
-	}
-	else if(hg_bio == 8)
-	{
+	} else if (hg_bio == 8) {
 		mes "[Dono]";
 		mes "Oh, hey, do you know";
 		mes "how Morriphen's doing?";
@@ -1847,9 +1713,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "only guy that can offer me";
 		mes "a decent challenge at chess...";
 		close;
-	}
-	else if(hg_bio == 9)
-	{
+	} else if (hg_bio == 9) {
 		mes "[Dono]";
 		mes "Oh, hey, do you know";
 		mes "how Morriphen's doing?";
@@ -1858,9 +1722,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "only guy that can offer me";
 		mes "a decent challenge at chess...";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Dono]";
 		mes "Hey, store's closed!";
 		mes "I'll open when I feel";
@@ -1869,13 +1731,10 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "anything! Now, scram!";
 		close;
 	}
-	
 }
 
-lhz_in03,193,28,3	script	Makkie	83,{
-
-	if(hg_bio == 4)
-	{
+lhz_in03,193,28,3	script	Makkie	4_M_01,{
+	if (hg_bio == 4) {
 		mes "[Makkie]";
 		mes "Hello, how may";
 		mes "I help you today?";
@@ -1955,6 +1814,7 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "^3355FFYou receive a small bag";
 		mes "of Red Plant Stem Powder.^000000";
 		set hg_bio,5;
+		changequest 11012,11013;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh! Thanks so much";
@@ -1962,42 +1822,32 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I better hurry and give";
 		mes "this to Dono. Goodbye~";
 		close;
-	}
-	else if(hg_bio == 1)
-	{
+	} else if (hg_bio == 1) {
 		mes "[Makkie]";
 		mes "Gosh, I'm so bored~";
 		mes "I wouldn't even mind";
 		mes "having some work to do.";
 		close;
-	}
-	else if(hg_bio == 2)
-	{
+	} else if (hg_bio == 2) {
 		mes "[Makkie]";
 		mes "Gosh, I'm so bored~";
 		mes "I wouldn't even mind";
 		mes "having some work to do.";
 		close;
-	}
-	else if(hg_bio == 3)
-	{
+	} else if (hg_bio == 3) {
 		mes "[Makkie]";
 		mes "Gosh, I'm so bored~";
 		mes "I wouldn't even mind";
 		mes "having some work to do.";
 		close;
-	}
-	else if(hg_bio == 5)
-	{
+	} else if (hg_bio == 5) {
 		mes "[Makkie]";
 		mes "Hm? Shouldn't you hurry";
 		mes "and get that bag of Red";
 		mes "Plant Stem Powder to";
 		mes "Dono as soon as you can?";
 		close;
-	}
-	else if(hg_bio == 6)
-	{
+	} else if (hg_bio == 6) {
 		mes "[Makkie]";
 		mes "Hey, have you seen";
 		mes "Morriphen and Dono";
@@ -2006,9 +1856,7 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I should go see them";
 		mes "soon, for old time's sake.";
 		close;
-	}
-	else if(hg_bio == 7)
-	{
+	} else if (hg_bio == 7) {
 		mes "[Makkie]";
 		mes "Hey, have you seen";
 		mes "Morriphen and Dono";
@@ -2017,9 +1865,7 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I should go see them";
 		mes "soon, for old time's sake.";
 		close;
-	}
-	else if(hg_bio == 8)
-	{
+	} else if (hg_bio == 8) {
 		mes "[Makkie]";
 		mes "Hey, have you seen";
 		mes "Morriphen and Dono";
@@ -2028,9 +1874,7 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I should go see them";
 		mes "soon, for old time's sake.";
 		close;
-	}
-	else if(hg_bio == 9)
-	{
+	} else if (hg_bio == 9) {
 		mes "[Makkie]";
 		mes "Hey, have you seen";
 		mes "Morriphen and Dono";
@@ -2039,25 +1883,20 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "I should go see them";
 		mes "soon, for old time's sake.";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Makkie]";
 		mes "Hey, welcome to the";
 		mes "Lighthalzen Pub. Relax,";
 		mes "and make yourself at home~";
 		close;
 	}
-	
 }
 
-// Rebellion Quest
+// Rebellion Quest :: hg_tre
 //============================================================
-hugel,70,137,5	script	Shede	879,{
-
+hugel,70,137,5	script	Shede	4_F_CAPEGIRL,{
 	cutin "siide1.bmp",2;
-	if(hg_tre == 0)
-	{
+	if (hg_tre == 0) {
 		mes "[Shede]";
 		mes "Yay~ are you talking to me? Yay!";
 		mes "Hey, are you from a different city? Wow, nice to see you!";
@@ -2072,8 +1911,7 @@ hugel,70,137,5	script	Shede	879,{
 		mes "At the same time, I have so many customers to serve...";
 		mes "In fact, I don't even have a time to cht-chat, hohoho.";
 		next;
-		switch( select( "Do you want me to help you?","I will leave you alone" ) )
-		{
+		switch(select("Do you want me to help you?:I will leave you alone")) {
 		case 1:
 			mes "[Shede]";
 			mes "Oh~ how kind of you! Thank you so much~";
@@ -2081,133 +1919,125 @@ hugel,70,137,5	script	Shede	879,{
 			emotion e_lv;
 			next;
 			mes "[Shede]";
-			switch(rand(1,3))
-			{
-				case 1:
-					mes "Uncle Hollun's birthday is coming,";
-					mes "so I want to make \"^3131FFMushroom Flavor Cookies^000000\" for him.";
-					mes "Unfortunately, I am short of the most important ingredient, the Mushrooms.";
-					next;
-					cutin "siide2.bmp",2;
-					mes "[Shede]";
-					mes "Ordinary mushrooms don't smell that good, but";
-					mes "\"^3131FFMoks Mushrooms^000000\" which only grow in Hugel have such appetizing scent.";
-					mes "So, when they are added to cookies, they enhance the taste of cookies so much better.";
-					next;
-					mes "[Shede]";
-					mes "Can you please go gather \"^3131FF5 Moks Mushroom Solution^000000\" from \"^3131FFMoks Mushrooms^000000\"?";
-					mes "You will find the mushrooms in fields near Hugel.";
-					mes "I hope that you will bring their solution as quickly as you can!";
-					set hg_tre,10;
-					close2;
-					cutin "",255;
-					end;
-				break;
-				case 2:
-					mes "In fact, Agette and I am competing with each other for the Hugel's best cookie master position.";
-					next;
-					mes "[Shede]";
-					mes "Becoming the best cookie mater is not an easy thing to achieve.";
-					mes "Everyone can have the best ingredients and the best cooking utensils,";
-					mes "but that doesn't mean that they can become the best cookie masters.";
-					next;
-					mes "[Shede]";
-					mes "You need to know how to harmonize your skills and your senses";
-					mes "to make the most delicious cookies.";
-					next;
-					cutin "siide2.bmp",2;
-					mes "[Shede]";
-					mes "I dare to say that my cookies are the best.";
-					mes "However, Agette is also a professional cookie baker.";
-					next;
-					mes "[Shede]";
-					mes "If I hear her name while baking,";
-					mes "it makes me shake my hands in anxiety";
-					mes "so that I make a mistake to measure the right amount of ingredients.";
-					mes "That explains how good she is at baking cookies.";
-					next;
-					mes "[Shede]";
-					mes "Still, I am a proud cookie baker, and";
-					mes "I can hear a voice from deep inside of me saying";
-					mes "that I cannot be beat by her!";
-					mes "Can you hear that?";
-					mes "Can you hear my inner fighting spirit as a cookie baker?";
-					next;
-					mes "[Shede]";
-					mes "I am going to compete with her";
-					mes "for the Hugel's best cookie mater position after a while.";
-					mes "So, I have been doing my best in practicing my skills to win her!";
-					next;
-					mes "[Shede]";
-					mes "There were many obstacles in my way to become the best cookie baker.";
-					mes "But, see? I am still here, alive and kicking! I will never give up! In that sense..";
-					mes "I am going to challenge on baking ^FF0000Clam Cookies^000000 today!";
-					mes "I am going to make them taste tangy and unique. I am sure that they will be a great sucess!";
-					next;
-					mes "[Shede]";
-					mes "When you go to the beach, ";
-					mes "you will find clams near the ferry.";
-					mes "Please gather ^3131FF5 Clam Flesh^000000 from the clams.";
-					mes "Please hurry!";
-					set hg_tre,20;
-					close2;
-					cutin "",255;
-					end;
-				break;
-				case 3:
-					mes "In fact, I gave my heart to a gentleman.";
-					mes "I think that the time has come to let him know";
-					mes "how I feel about him.";
-					next;
-					cutin "siide2.bmp",2;
-					mes "[Shede]";
-					mes "So, I decided to bake special cookies called...";
-					mes "...... ^3131FFDevil's Cookies^000000!";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "Devil's Cookies?";
-					next;
-					cutin "siide1.bmp",2;
-					mes "[Shede]";
-					mes "Yes, Devil's Cookies.";
-					mes "When you go outside of Hugel, you will find \"^3131FFMoks Bugs^000000\"";
-					mes "hiding in the bushes. They breed in this season, so they are plump with eggs.";
-					next;
-					mes "[Shede]";
-					mes "When you stew their shells and use the broth to kneed flour,";
-					mes "you can make fresh and crunch cookies.";
-					next;
-					cutin "siide2.bmp",2;
-					mes "[Shede]";
-					mes "Devil's Cookies are so delicious, so they are rumored to dazzle the eaters with";
-					mes "the mysteriously crunch texture and the sweetness, and to allure them to hell without them knowing.";
-					mes "Ah~ I hope that he will like them...";
-					next;
-					cutin "siide1.bmp",2;
-					mes "[Shede]";
-					mes "Would you please help me to bake the cookies? I need 5 Moks Bug Shells~";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "'......I am confused...Does she love him or hate him?'";
-					emotion e_dots,1;
-					set hg_tre,30;
-					close2;
-					cutin "",255;
-					end;
-				break;
+			switch(rand(1,3)) {
+			case 1:
+				mes "Uncle Hollun's birthday is coming,";
+				mes "so I want to make \"^3131FFMushroom Flavor Cookies^000000\" for him.";
+				mes "Unfortunately, I am short of the most important ingredient, the Mushrooms.";
+				next;
+				cutin "siide2.bmp",2;
+				mes "[Shede]";
+				mes "Ordinary mushrooms don't smell that good, but";
+				mes "\"^3131FFMoks Mushrooms^000000\" which only grow in Hugel have such appetizing scent.";
+				mes "So, when they are added to cookies, they enhance the taste of cookies so much better.";
+				next;
+				mes "[Shede]";
+				mes "Can you please go gather \"^3131FF5 Moks Mushroom Solution^000000\" from \"^3131FFMoks Mushrooms^000000\"?";
+				mes "You will find the mushrooms in fields near Hugel.";
+				mes "I hope that you will bring their solution as quickly as you can!";
+				set hg_tre,10;
+				close2;
+				cutin "",255;
+				end;
+			case 2:
+				mes "In fact, Agette and I am competing with each other for the Hugel's best cookie master position.";
+				next;
+				mes "[Shede]";
+				mes "Becoming the best cookie mater is not an easy thing to achieve.";
+				mes "Everyone can have the best ingredients and the best cooking utensils,";
+				mes "but that doesn't mean that they can become the best cookie masters.";
+				next;
+				mes "[Shede]";
+				mes "You need to know how to harmonize your skills and your senses";
+				mes "to make the most delicious cookies.";
+				next;
+				cutin "siide2.bmp",2;
+				mes "[Shede]";
+				mes "I dare to say that my cookies are the best.";
+				mes "However, Agette is also a professional cookie baker.";
+				next;
+				mes "[Shede]";
+				mes "If I hear her name while baking,";
+				mes "it makes me shake my hands in anxiety";
+				mes "so that I make a mistake to measure the right amount of ingredients.";
+				mes "That explains how good she is at baking cookies.";
+				next;
+				mes "[Shede]";
+				mes "Still, I am a proud cookie baker, and";
+				mes "I can hear a voice from deep inside of me saying";
+				mes "that I cannot be beat by her!";
+				mes "Can you hear that?";
+				mes "Can you hear my inner fighting spirit as a cookie baker?";
+				next;
+				mes "[Shede]";
+				mes "I am going to compete with her";
+				mes "for the Hugel's best cookie mater position after a while.";
+				mes "So, I have been doing my best in practicing my skills to win her!";
+				next;
+				mes "[Shede]";
+				mes "There were many obstacles in my way to become the best cookie baker.";
+				mes "But, see? I am still here, alive and kicking! I will never give up! In that sense..";
+				mes "I am going to challenge on baking ^FF0000Clam Cookies^000000 today!";
+				mes "I am going to make them taste tangy and unique. I am sure that they will be a great sucess!";
+				next;
+				mes "[Shede]";
+				mes "When you go to the beach, ";
+				mes "you will find clams near the ferry.";
+				mes "Please gather ^3131FF5 Clam Flesh^000000 from the clams.";
+				mes "Please hurry!";
+				set hg_tre,20;
+				close2;
+				cutin "",255;
+				end;
+			case 3:
+				mes "In fact, I gave my heart to a gentleman.";
+				mes "I think that the time has come to let him know";
+				mes "how I feel about him.";
+				next;
+				cutin "siide2.bmp",2;
+				mes "[Shede]";
+				mes "So, I decided to bake special cookies called...";
+				mes "...... ^3131FFDevil's Cookies^000000!";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Devil's Cookies?";
+				next;
+				cutin "siide1.bmp",2;
+				mes "[Shede]";
+				mes "Yes, Devil's Cookies.";
+				mes "When you go outside of Hugel, you will find \"^3131FFMoks Bugs^000000\"";
+				mes "hiding in the bushes. They breed in this season, so they are plump with eggs.";
+				next;
+				mes "[Shede]";
+				mes "When you stew their shells and use the broth to kneed flour,";
+				mes "you can make fresh and crunch cookies.";
+				next;
+				cutin "siide2.bmp",2;
+				mes "[Shede]";
+				mes "Devil's Cookies are so delicious, so they are rumored to dazzle the eaters with";
+				mes "the mysteriously crunch texture and the sweetness, and to allure them to hell without them knowing.";
+				mes "Ah~ I hope that he will like them...";
+				next;
+				cutin "siide1.bmp",2;
+				mes "[Shede]";
+				mes "Would you please help me to bake the cookies? I need 5 Moks Bug Shells~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "'......I am confused...Does she love him or hate him?'";
+				emotion e_dots,1;
+				set hg_tre,30;
+				close2;
+				cutin "",255;
+				end;
 			}
-		break;
 		case 2:
 			mes "[Shede]";
 			mes "No, it is fine. Somehow I needed a break, hohoh!";
 			close2;
 			cutin "",255;
 			end;
-		break;
 		}
-	}
-	else if(hg_tre > 9 && hg_tre < 15)
-	{
+	} else if (hg_tre > 9 && hg_tre < 15) {
 		mes "[Shede]";
 		mes "Can you please go gather \"^3131FF5 Moks Mushroom Solution^000000\" from \"^3131FFMoks Mushrooms^000000\"?";
 		mes "You will find the mushrooms in fields near Hugel.";
@@ -2215,27 +2045,21 @@ hugel,70,137,5	script	Shede	879,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre > 19 && hg_tre < 25)
-	{
+	} else if (hg_tre > 19 && hg_tre < 25) {
 		mes "[Shede]";
 		mes "Please pick up \"^3131FF5 Clams^000000\" from a fish trap in the ferry.";
 		mes "I hope that you will bring their solution as quickly as you can!";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre > 29 && hg_tre < 35)
-	{
+	} else if (hg_tre > 29 && hg_tre < 35) {
 		mes "[Shede]";
 		mes "Please bring \"^3131FF5 Moks Bug Shells^000000\" from outside of Hugel.";
 		mes "I hope that you will bring their solution as quickly as you can!";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 15)
-	{
+	} else if (hg_tre == 15) {
 		mes "[Shede]";
 		mes "Oh! You came back earlier than I thought.";
 		mes "Now, I can bake the Mushroom Flavor Cookies for uncle Hollun.";
@@ -2245,9 +2069,7 @@ hugel,70,137,5	script	Shede	879,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "[Shede]";
 		mes "Oh! You came back earlier than I thought.";
 		mes "Now, I can bake the best cookies of mine and compete with Agette!";
@@ -2257,9 +2079,7 @@ hugel,70,137,5	script	Shede	879,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "[Shede]";
 		mes "Oh! You came back earlier than I thought.";
 		mes "Now, I can bake Devil's Cookies to confess my love to the gentleman.";
@@ -2274,11 +2094,8 @@ hugel,70,137,5	script	Shede	879,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 40)
-	{
-		if(lhz_boss == 44 && lhz_curse > 30)
-		{
+	} else if (hg_tre == 40) {
+		if (lhz_boss == 44 && lhz_curse > 30) {
 			mes "[Shede]";
 			mes "Have you seen Mr. Herico?";
 			mes "He is a lonesome old man who is staying at Hugel Inn.";
@@ -2290,9 +2107,7 @@ hugel,70,137,5	script	Shede	879,{
 			close2;
 			cutin "",255;
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Shede]";
 			mes "So, how do you like Hugel?";
 			mes "It is a peaceful village, isn't it?";
@@ -2300,18 +2115,14 @@ hugel,70,137,5	script	Shede	879,{
 			cutin "",255;
 			end;
 		}
-	}
-	else if(hg_tre == 41)
-	{
+	} else if (hg_tre == 41) {
 		mes "[Shede]";
 		mes "Mr. Herico has an impediment in movement, so he usually stays in his room.";
 		mes "Please go spend some time with him. I know that he will appreciate it.";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else
-	{
+	} else {
 		mes "[Shede]";
 		mes "So, how do you like Hugel?";
 		mes "It is a peaceful village, isn't it?";
@@ -2319,28 +2130,22 @@ hugel,70,137,5	script	Shede	879,{
 		cutin "",255;
 		end;
 	}
-	
 }
 
-hu_in01,256,40,3	script	Herico	897,{
-
-	if(checkweight(7342,1) != 1)
-	{
+hu_in01,256,40,3	script	Herico	4_M_HUGRANFA,{
+	if (checkweight(7342,1) != 1) {
 		mes "[Herico]";
 		mes "Why don't you go take some load off your shoulder first, and come back?";
 		close;
 	}
 	cutin "heri1.bmp",2;
-	if(hg_tre < 41)
-	{
+	if (hg_tre < 41) {
 		mes "[Herico]";
 		mes "The weather is beautiful today. *Sigh* But my body aches too badly to go out...";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 41)
-	{
+	} else if (hg_tre == 41) {
 		mes "[Herico]";
 		mes "The weather is beautiful today. *Sigh* But my body aches too badly to go out...";
 		next;
@@ -2369,8 +2174,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "and have figured out many things on your own.";
 		mes "Am I right?";
 		next;
-		switch( select( "Yes, you are right.","I am not so sure.","No." ) )
-		{
+		switch(select("Yes, you are right.:I am not so sure.:No.")) {
 		case 1:
 			cutin "heri2.bmp",2;
 			mes "[Herico]";
@@ -2399,7 +2203,6 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		case 2:
 			mes "[Herico]";
 			mes "Then I guess that you have not been deeply impressed by this country.";
@@ -2407,7 +2210,6 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		case 3:
 			mes "[Herico]";
 			mes "Oh, am I not?";
@@ -2415,11 +2217,8 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		}
-	}
-	else if(hg_tre == 42)
-	{
+	} else if (hg_tre == 42) {
 		mes "[Herico]";
 		mes "Hmm...can you tell me your name once again?";
 		next;
@@ -2448,11 +2247,8 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 43)
-	{
-		if(hg_odin == 60)
-		{
+	} else if (hg_tre == 43) {
+		if (hg_odin == 60) {
 			mes "[Herico]";
 			mes "Welcome back. I have been waiting for you with eager anticipation to hear about the secret.";
 			mes "Now, please tell me what you have found out.";
@@ -2486,9 +2282,7 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Herico]";
 			mes "Please find out the secret about the airship and the island.";
 			mes "Then I will tell you my stories.";
@@ -2497,9 +2291,7 @@ hu_in01,256,40,3	script	Herico	897,{
 			cutin "",255;
 			end;
 		}
-	}
-	else if(hg_tre == 44)
-	{
+	} else if (hg_tre == 44) {
 		mes "[Herico]";
 		mes "Hmm...I don't know where to start.";
 		next;
@@ -2607,9 +2399,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 45)
-	{
+	} else if (hg_tre == 45) {
 		mes "[Herico]";
 		mes "Please go to Lighthalzen and find a news reporter";
 		mes "who still remembers about the rebellion.";
@@ -2618,17 +2408,13 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre > 45 && hg_tre < 49)
-	{
+	} else if (hg_tre > 45 && hg_tre < 49) {
 		mes "[Herico]";
 		mes "How have you been doing?";
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 49)
-	{
+	} else if (hg_tre == 49) {
 		mes "[Herico]";
 		mes "Did you find Sage Varmunt's research documents?";
 		next;
@@ -2636,8 +2422,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "["+strcharinfo(0)+"]";
 		mes "Well, about the documents...";
 		next;
-		switch( select( "I ate them.","Rekenber has taken them into their possession." ) )
-		{
+		switch(select("I ate them.:Rekenber has taken them into their possession.")) {
 		case 1:
 			mes "I ate them.";
 			next;
@@ -2681,11 +2466,11 @@ hu_in01,256,40,3	script	Herico	897,{
 			mes "["+strcharinfo(0)+"]";
 			mes "Rekenber has taken them into their possession.";
 			next;
-		break;
+			break;
 		case 2:
 			mes "Rekenber has taken them into their possession.";
 			next;
-		break;
+			break;
 		}
 		cutin "heri3.bmp",2;
 		mes "[Herico]";
@@ -2804,9 +2589,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 50)
-	{
+	} else if (hg_tre == 50) {
 		mes "[Herico]";
 		mes "Can you guess what I am thinking right now?";
 		next;
@@ -2833,8 +2616,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "Let me hear your opinion.";
 		mes "Will you join me in destroying Regenschirm?";
 		next;
-		switch( select( "Sorry, I won't.","Yes, I will." ) )
-		{
+		switch(select("Sorry, I won't:Yes, I will.")) {
 		case 1:
 			mes "[Herico]";
 			mes "I respect your decision since this is not something";
@@ -2844,7 +2626,6 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		case 2:
 			cutin "heri2.bmp",2;
 			mes "[Herico]";
@@ -2860,11 +2641,8 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		break;
 		}
-	}
-	else if(hg_tre == 51)
-	{
+	} else if (hg_tre == 51) {
 		mes "[Herico]";
 		mes "We must find out how we can stop them";
 		mes "from doing more evil things, at least for a while.";
@@ -2885,9 +2663,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 52)
-	{
+	} else if (hg_tre == 52) {
 		mes "[Herico]";
 		mes "Regenschirm is located at the underground level";
 		mes "of Rekenber's Laighthalzen headquarters.";
@@ -2895,9 +2671,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "heri1.bmp",255;
 		end;
-	}
-	else if(hg_tre == 53)
-	{
+	} else if (hg_tre == 53) {
 		mes "[Herico]";
 		mes "Ah, you are back.";
 		next;
@@ -2952,9 +2726,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 54)
-	{
+	} else if (hg_tre == 54) {
 		mes "[Herico]";
 		mes "Please go meet with ^3131FFthe Marine Sphere Bottle manufacturer^000000,";
 		mes "and purchase some Marine Sphere Bottles.";
@@ -2969,9 +2741,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_tre == 55)
-	{
+	} else if (hg_tre == 55) {
 		mes "["+strcharinfo(0)+"]";
 		mes "The machine was blown up.";
 		next;
@@ -3005,8 +2775,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "By any chance, do you know a man who can aid his power in stopping them?";
 		next;
 		input .@inputstr$;
-		if(.@inputstr$ == "President Karl" || .@inputstr$ == "President Weierstrass" || .@inputstr$ == "President" || .@inputstr$ == "Karl Weierstrass")
-		{
+		if (.@inputstr$ == "President Karl" || .@inputstr$ == "President Weierstrass" || .@inputstr$ == "President" || .@inputstr$ == "Karl Weierstrass") {
 			mes "["+strcharinfo(0)+"]";
 			mes "I think that I know one...";
 			next;
@@ -3053,11 +2822,8 @@ hu_in01,256,40,3	script	Herico	897,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else
-	{
-		if(countitem(7342))
-		{
+	} else {
+		if (countitem(7342)) {
 			mes "[Herico]";
 			mes "Why are you still here?";
 			mes "That research data will aid a great help to Mr. President.";
@@ -3065,67 +2831,48 @@ hu_in01,256,40,3	script	Herico	897,{
 			close2;
 			cutin "",255;
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Herico]";
 			mes "Hey, welcome back.";
 			next;
-			switch( select( "I brought Handcuffs","Regarding Sage Varmunt's documents" ) )
-			{
+			switch(select("I brought Handcuffs:Regarding Sage Varmunt's documents")) {
 			case 1:
 				mes "[Herico]";
 				mes "I am willing to exchange 1 of level 4 food with 100 Handcuffs.";
 				next;
-				switch( select( "Exchange.","Cancel." ) )
-				{
-				case 1:
-					if(countitem(7345) > 99) //Handcuffs
-					{
+				if(select("Exchange:Cancel.") == 1) {
+					if (countitem(7345) > 99) {
 						mes "[Herico]";
 						mes "There you go, thank you for your trouble.";
 						delitem 7345,100; //Handcuffs
-						switch(rand(1,6))
-						{
+						switch(rand(1,6)) {
 						case 1:
 							getitem 12044,1; //Herb Marinade Beef
-						break;
+							break;
 						case 2:
 							getitem 12049,1; //Morroc Fruit Wine
-						break;
+							break;
 						case 3:
 							getitem 12059,1; //Lutie Cold Noodle
-						break;
+							break;
 						case 4:
 							getitem 12064,1; //Cream Sandwich
-						break;
+							break;
 						case 5:
 							getitem 12069,1; //Steamed Ancient Lips
-						break;
+							break;
 						case 6:
 							getitem 12054,1; //Seasoned Jellyfish
-						break;
+							break;
 						}
-						close2;
-						cutin "",255;
-						end;
-					}
-					else
-					{
+					} else {
 						mes "[Herico]";
 						mes "I don't think that you have brought me 100 Handcuffs.";
-						close2;
-						cutin "",255;
-						end;
 					}
-				break;
-				case 2:
-				break;
 				}
 				close2;
 				cutin "",255;
 				end;
-			break;
 			case 2:
 				mes "[Herico]";
 				mes "When I checked the research data that you have brought to me,";
@@ -3136,19 +2883,15 @@ hu_in01,256,40,3	script	Herico	897,{
 				close2;
 				cutin "",255;
 				end;
-			break;
 			}
 		}
 	}
 	cutin "",255;
 	end;
-	
 }
 
-lhz_in03,39,44,3	script	Enquro Carson	97,{
-
-	if(hg_tre < 45)
-	{
+lhz_in03,39,44,3	script	Enquro Carson	4W_M_01,{
+	if (hg_tre < 45) {
 		mes "[Enquro Carson]";
 		mes "Hello, everyone. This is Enquro Carson";
 		mes "from Light News.";
@@ -3159,9 +2902,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 		mes "especially when people are astonished by the news";
 		mes "which I am delivering to them.";
 		close;
-	}
-	else if(hg_tre == 45)
-	{
+	} else if (hg_tre == 45) {
 		mes "[Enquro Carson]";
 		mes "Hello, everyone. This is Enquro Carson";
 		mes "from Light News.";
@@ -3172,8 +2913,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 		mes "especially when people are astonished by the news";
 		mes "which I am delivering to them.";
 		next;
-		switch( select( "Mercenary Rebellion","News reporter job" ) )
-		{
+		switch(select("Mercenary Rebellion:News reporter job")) {
 		case 1:
 			mes "[Enquro Carson]";
 			mes "Hmm...Mercenary Rebellion...?";
@@ -3239,7 +2979,6 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			mes "Can you please get me the drink? Hahaha, thanks!";
 			set hg_tre,46;
 			close;
-		break;
 		case 2:
 			mes "[Enquro Carson]";
 			mes ".......Hmmm...Hmmm...Hmmm.";
@@ -3249,13 +2988,9 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			mes "[Enquro Carson]";
 			mes "You are not saying that you want to be a news reporter, are you?";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 46)
-	{
-		if(!countitem(12112) || !countitem(12113))
-		{
+	} else if (hg_tre == 46) {
+		if (!countitem(12112) || !countitem(12113)) {
 			mes "[Enquro Carson]";
 			mes "I heard of a private pub in Morroc,";
 			mes "a city of Rune-Midgarts Kingdom";
@@ -3264,9 +2999,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			mes "and I wonder how delicious the drink will be.";
 			mes "Can you please get me the drink? Hahaha, thanks!";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Enquro Carson]";
 			mes "Wow, this is that famous drink!";
 			mes "Let's see...*Gulp*";
@@ -3314,9 +3047,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			delitem 12113,1; //Vermilion on the Beach
 			close;
 		}
-	}
-	else if(hg_tre == 47)
-	{
+	} else if (hg_tre == 47) {
 		mes "[Enquro Carson]";
 		mes "Just get on to the airship and go to Hugel.";
 		mes "Hopefully you will meet with ^3131FFWintzil Trony^000000";
@@ -3324,28 +3055,21 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 		mes "Oh, be careful not to provoke him though.";
 		mes "He used to be a mercenary soldier, and they were famed for their violence.";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Enquro Carson]";
 		mes "This is very shameful for me to confess,";
 		mes "but I tend to make lots and lots of spelling mistakes.";
 		mes "Yeah, I know, it is a shame.";
 		close;
 	}
-	
 }
 
-hu_in01,310,380,5	script	Girl#hugel	891,{
-
-	if(hg_tre < 47)
-	{
+hu_in01,310,380,5	script	Girl#hugel	4_F_HUGIRL,{
+	if (hg_tre < 47) {
 		mes "[Girl]";
 		mes "Bah, I am bored.";
 		close;
-	}
-	else if(hg_tre == 47)
-	{
+	} else if (hg_tre == 47) {
 		mes "[Girl]";
 		mes "Hehe...are you from another city?";
 		mes "Heheh.";
@@ -3446,44 +3170,33 @@ hu_in01,310,380,5	script	Girl#hugel	891,{
 		mes "But, can you be careful to treat the shelf? It is a keepsake from my father.";
 		set hg_tre,48;
 		close;
-	}
-	else if(hg_tre > 48)
-	{
+	} else if (hg_tre > 48) {
 		mes "[Wintzil Trony]";
 		mes "I am bored and bored! When is my mom coming back?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Wintzil Trony]";
 		mes "If you promise me that you will not break it,";
 		mes "you can take a look at the shelf.";
 		close;
 	}
-	
 }
 
-hu_in01,317,312,0	script	Book	111,{
-
+hu_in01,317,312,0	script	Book	HIDDEN_NPC,{
 	cutin "hg_book.bmp",2;
-	if(hg_tre > 47)
-	{
+	if (hg_tre > 47) {
 		mes "- You picked up a very thick book. -";
 		mes "- You opened the book and found out -";
 		mes "- that there were a small book hidden behind.-";
 		next;
-		switch( select( "Read the small book.","Leave it alone." ) )
-		{
+		switch(select("Read the small book.:Leave it alone.")) {
 		case 1:
 			mes "- You picked up the small book. -";
 			mes "- The book owner must want to -";
 			mes "- keep it secret. -";
 			next;
-			set @whilevar,1;
-			while(@whilevar)
-			{
-				switch( select( "Page 1","Page 2","Page 3","Page 4","Page 5","Page 6","Page 7","Page 8","Page 9","Stop Reading." ) )
-				{
+			while(1) {
+				switch(select("Page 1:Page 2:Page 3:Page 4:Page 5:Page 6:Page 7:Page 8:Page 9:Stop Reading.")) {
 				case 1:
 					mes "- You started reading the 1st page of the book. -";
 					next;
@@ -3509,7 +3222,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 2:
 					mes "- You started reading the 2nd page of the book. -";
 					next;
@@ -3522,7 +3235,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 3:
 					mes "- You started reading the 3rd page of the book. -";
 					next;
@@ -3550,7 +3263,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 4:
 					mes "- You started reading the 4th page of the book. -";
 					next;
@@ -3561,7 +3274,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 5:
 					mes "- You started reading the 5th page of the book. -";
 					next;
@@ -3583,7 +3296,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 6:
 					mes "- You started reading the 6th page of the book. -";
 					next;
@@ -3609,10 +3322,7 @@ hu_in01,317,312,0	script	Book	111,{
 					next;
 					mes "- You found a folded note between the pages that you were reading. -";
 					next;
-					switch( select( "Check the note.","Read the next page." ) )
-					{
-					case 1:
-						next;
+					if(select("Check the note.:Read the next page.") == 1) {
 						mes "^3131FF.........................^000000";
 						next;
 						mes "^3131FF...I am so sorry for hearing such devastating news and for your loss.";
@@ -3625,11 +3335,8 @@ hu_in01,317,312,0	script	Book	111,{
 						next;
 						mes "^3131FF.........................^000000";
 						next;
-					break;
-					case 2:
-					break;
 					}
-				break;
+					break;
 				case 7:
 					mes "- You started reading the 7th page.-";
 					next;
@@ -3657,7 +3364,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 8:
 					mes "- You started reading the 8th page. -";
 					next;
@@ -3676,7 +3383,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "...............................";
 					mes "...............................";
 					next;
-				break;
+					break;
 				case 9:
 					mes "- You started reading the 9th page. -";
 					next;
@@ -3696,37 +3403,29 @@ hu_in01,317,312,0	script	Book	111,{
 					mes " ";
 					mes "My arm is throbbing with pain again. The history of mercenary soldiers ended, and I need to rest.";
 					mes "I hope that this will be the last page of my journal.";
-					if(hg_tre == 48) set hg_tre,49;
+					if (hg_tre == 48) set hg_tre,49;
 					next;
 					mes "- The journal was ended at the page. -";
 					next;
-				break;
+					break;
 				case 10:
-					set @whilevar,0;
 					mes "- You closed the book. -";
 					close2;
 					cutin "",255;
 					end;
-				break;
 				}
 			}
-		break;
 		case 2:
 			mes "- You closed the book. -";
 			close2;
 			cutin "",255;
 			end;
-		break;
 		}
-
 	}
-
 }
 
-einbech,208,124,3	script	Bomb Maker	851,{
-
-	if(hg_tre == 54)
-	{
+einbech,208,124,3	script	Bomb Maker	4_M_REPAIR,{
+	if (hg_tre == 54) {
 		if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 			mes "[Boomer]";
 			mes "Hey, you look pretty heavy, huh?";
@@ -3738,8 +3437,7 @@ einbech,208,124,3	script	Bomb Maker	851,{
 		mes "I am a professional Marine Sphere Bottle maker.";
 		mes "You can call me Boomer.";
 		next;
-		switch( select( "Buy Marine Sphere Bottle.","End conversation." ) )
-		{
+		switch(select("Buy Marine Sphere Bottle.:End conversation.")) {
 		case 1:
 			mes "[Boomer]";
 			mes "Heh, you want my Marine Sphere Bottles, huh?";
@@ -3753,55 +3451,43 @@ einbech,208,124,3	script	Bomb Maker	851,{
 			mes "considering its amazing performance!";
 			mes "You will regret if you miss this chance. Hahaha!";
 			next;
-			switch( select( "Buy.","Cancel." ) )
-			{
+			switch(select("Buy.:Cancel.")) {
 			case 1:
-				if(Zeny < 3000)
-				{
+				if (Zeny < 3000) {
 					mes "[Boomer]";
 					mes "Errr...You must have been so hurry to carry your wallet with you.";
 					close;
 				}
-					mes "[Boomer]";
-					mes "Just make sure that you are not going to";
-					mes "blow yourself away with this bomb, hahah!";
-					set Zeny,Zeny-3000;
-					getitem 7138,1; //Marine Sphere Bottle
-					close;
-			break;
+				mes "[Boomer]";
+				mes "Just make sure that you are not going to";
+				mes "blow yourself away with this bomb, hahah!";
+				Zeny -= 3000;
+				getitem 7138,1; //Marine Sphere Bottle
+				close;
 			case 2:
 				mes "[Boomer]";
 				mes "I believe that you will end up coming back to me. Heheh.";
 				close;
-			break;
 			}
-		break;
 		case 2:
 			mes "[Boomer]";
 			mes "Boom! Don't you need a bomb? Boom!";
 			close;
-		break;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Boomer]";
 		mes "Hey, what's up?";
 		mes "I am a professional Marine Sphere Bottle maker.";
 		mes "You can call me Boomer.";
 		close;
 	}
-	
 }
 
-hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	111,{
-
-	if(hg_tre > 9 && hg_tre < 15)
-	{
+hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	HIDDEN_NPC,{
+	if (hg_tre > 9 && hg_tre < 15) {
 		mes "- You found mushrooms that are as big as your palm. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You decided to gather the mushrooms. -";
 			next;
@@ -3815,8 +3501,7 @@ hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -3824,28 +3509,24 @@ hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	111,{
 			mes "- You have successfully gathered mushrooms. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 11)
+			if (hg_tre == 11)
 				mes "Collected Moks Mushroom Solution: 1ea ";
-			else if(hg_tre == 12)
+			else if (hg_tre == 12)
 				mes "Collected Moks Mushroom Solution: 2ea ";
-			else if(hg_tre == 13)
+			else if (hg_tre == 13)
 				mes "Collected Moks Mushroom Solution: 3ea ";
-			else if(hg_tre == 14)
+			else if (hg_tre == 14)
 				mes "Collected Moks Mushroom Solution: 4ea ";
-			else if(hg_tre == 15)
+			else if (hg_tre == 15)
 				mes "Collected Moks Mushroom Solution: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Mushrooms#Mush1";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 15)
-	{
+	} else if (hg_tre == 15) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -3855,17 +3536,13 @@ OnTimer20000:
 	enablenpc "Moks Mushrooms#Mush1";
 	stopnpctimer;
 	end;
-
 }
 
-hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	111,{
-
-	if(hg_tre > 9 && hg_tre < 15)
-	{
+hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	HIDDEN_NPC,{
+	if (hg_tre > 9 && hg_tre < 15) {
 		mes "- You found mushrooms that are as big as your palm. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You decided to gather the mushrooms. -";
 			next;
@@ -3879,8 +3556,7 @@ hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -3888,28 +3564,24 @@ hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	111,{
 			mes "- You have successfully gathered mushrooms. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 11)
+			if (hg_tre == 11)
 				mes "Collected Moks Mushroom Solution: 1ea ";
-			else if(hg_tre == 12)
+			else if (hg_tre == 12)
 				mes "Collected Moks Mushroom Solution: 2ea ";
-			else if(hg_tre == 13)
+			else if (hg_tre == 13)
 				mes "Collected Moks Mushroom Solution: 3ea ";
-			else if(hg_tre == 14)
+			else if (hg_tre == 14)
 				mes "Collected Moks Mushroom Solution: 4ea ";
-			else if(hg_tre == 15)
+			else if (hg_tre == 15)
 				mes "Collected Moks Mushroom Solution: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Mushrooms#Mush2";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 15)
-	{
+	} else if (hg_tre == 15) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -3919,17 +3591,13 @@ OnTimer20000:
 	enablenpc "Moks Mushrooms#Mush2";
 	stopnpctimer;
 	end;
-
 }
 
-hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	111,{
-
-	if(hg_tre > 9 && hg_tre < 15)
-	{
+hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	HIDDEN_NPC,{
+	if (hg_tre > 9 && hg_tre < 15) {
 		mes "- You found mushrooms that are as big as your palm. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You decided to gather the mushrooms. -";
 			next;
@@ -3943,8 +3611,7 @@ hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -3952,28 +3619,24 @@ hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	111,{
 			mes "- You have successfully gathered mushrooms. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 11)
+			if (hg_tre == 11)
 				mes "Collected Moks Mushroom Solution: 1ea ";
-			else if(hg_tre == 12)
+			else if (hg_tre == 12)
 				mes "Collected Moks Mushroom Solution: 2ea ";
-			else if(hg_tre == 13)
+			else if (hg_tre == 13)
 				mes "Collected Moks Mushroom Solution: 3ea ";
-			else if(hg_tre == 14)
+			else if (hg_tre == 14)
 				mes "Collected Moks Mushroom Solution: 4ea ";
-			else if(hg_tre == 15)
+			else if (hg_tre == 15)
 				mes "Collected Moks Mushroom Solution: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Mushrooms#Mush3";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 15)
-	{
+	} else if (hg_tre == 15) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -3983,17 +3646,13 @@ OnTimer20000:
 	enablenpc "Moks Mushrooms#Mush3";
 	stopnpctimer;
 	end;
-
 }
 
-hugel,209,163,3	script	Clam#C1	111,{
-
-	if(hg_tre > 19 && hg_tre < 25)
-	{
+hugel,209,163,3	script	Clam#C1	HIDDEN_NPC,{
+	if (hg_tre > 19 && hg_tre < 25) {
 		mes "- You found very fresh clams whose shells are shining under the sunlight. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You started opening clam shells to gather Clam Flesh.-";
 			next;
@@ -4007,8 +3666,7 @@ hugel,209,163,3	script	Clam#C1	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4016,28 +3674,24 @@ hugel,209,163,3	script	Clam#C1	111,{
 			mes "- You have successfully gathered Clam Flesh. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 21)
+			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
-			else if(hg_tre == 22)
+			else if (hg_tre == 22)
 				mes "Collected Clam Flesh: 2ea ";
-			else if(hg_tre == 23)
+			else if (hg_tre == 23)
 				mes "Collected Clam Flesh: 3ea ";
-			else if(hg_tre == 24)
+			else if (hg_tre == 24)
 				mes "Collected Clam Flesh: 4ea ";
-			else if(hg_tre == 25)
+			else if (hg_tre == 25)
 				mes "Collected Clam Flesh: 5ea ";
 			initnpctimer;
 			disablenpc "Clam#C1";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -4047,17 +3701,13 @@ OnTimer20000:
 	enablenpc "Clam#C1";
 	stopnpctimer;
 	end;
-
 }
 
-hugel,203,166,3	script	Clam#C2	111,{
-
-	if(hg_tre > 19 && hg_tre < 25)
-	{
+hugel,203,166,3	script	Clam#C2	HIDDEN_NPC,{
+	if (hg_tre > 19 && hg_tre < 25) {
 		mes "- You found very fresh clams whose shells are shining under the sunlight. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You started opening clam shells to gather Clam Flesh.-";
 			next;
@@ -4071,8 +3721,7 @@ hugel,203,166,3	script	Clam#C2	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
 				specialeffect EF_STUNATTACK;
 				close;
@@ -4080,28 +3729,24 @@ hugel,203,166,3	script	Clam#C2	111,{
 			mes "- You have successfully gathered Clam Flesh. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 21)
+			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
-			else if(hg_tre == 22)
+			else if (hg_tre == 22)
 				mes "Collected Clam Flesh: 2ea ";
-			else if(hg_tre == 23)
+			else if (hg_tre == 23)
 				mes "Collected Clam Flesh: 3ea ";
-			else if(hg_tre == 24)
+			else if (hg_tre == 24)
 				mes "Collected Clam Flesh: 4ea ";
-			else if(hg_tre == 25)
+			else if (hg_tre == 25)
 				mes "Collected Clam Flesh: 5ea ";
 			initnpctimer;
 			disablenpc "Clam#C2";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -4111,17 +3756,13 @@ OnTimer20000:
 	enablenpc "Clam#C2";
 	stopnpctimer;
 	end;
-
 }
 
-hugel,217,158,3	script	Clam#C3	111,{
-
-	if(hg_tre > 19 && hg_tre < 25)
-	{
+hugel,217,158,3	script	Clam#C3	HIDDEN_NPC,{
+	if (hg_tre > 19 && hg_tre < 25) {
 		mes "- You found very fresh clams whose shells are shining under the sunlight. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You started opening clam shells to gather Clam Flesh.-";
 			next;
@@ -4135,8 +3776,7 @@ hugel,217,158,3	script	Clam#C3	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4144,28 +3784,24 @@ hugel,217,158,3	script	Clam#C3	111,{
 			mes "- You have successfully gathered Clam Flesh. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 21)
+			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
-			else if(hg_tre == 22)
+			else if (hg_tre == 22)
 				mes "Collected Clam Flesh: 2ea ";
-			else if(hg_tre == 23)
+			else if (hg_tre == 23)
 				mes "Collected Clam Flesh: 3ea ";
-			else if(hg_tre == 24)
+			else if (hg_tre == 24)
 				mes "Collected Clam Flesh: 4ea ";
-			else if(hg_tre == 25)
+			else if (hg_tre == 25)
 				mes "Collected Clam Flesh: 5ea ";
 			initnpctimer;
 			disablenpc "Clam#C3";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -4175,17 +3811,13 @@ OnTimer20000:
 	enablenpc "Clam#C3";
 	stopnpctimer;
 	end;
-
 }
 
-hugel,204,150,3	script	Clam#C4	111,{
-
-	if(hg_tre > 19 && hg_tre < 25)
-	{
+hugel,204,150,3	script	Clam#C4	HIDDEN_NPC,{
+	if (hg_tre > 19 && hg_tre < 25) {
 		mes "- You found very fresh clams whose shells are shining under the sunlight. -";
 		next;
-		switch( select( "Gather them.","Pass." ) )
-		{
+		switch(select("Gather them.:Pass.")) {
 		case 1:
 			mes "- You started opening clam shells to gather Clam Flesh.-";
 			next;
@@ -4199,8 +3831,7 @@ hugel,204,150,3	script	Clam#C4	111,{
 			mes "- *Snip Snip* -";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4208,28 +3839,24 @@ hugel,204,150,3	script	Clam#C4	111,{
 			mes "- You have successfully gathered Clam Flesh. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 21)
+			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
-			else if(hg_tre == 22)
+			else if (hg_tre == 22)
 				mes "Collected Clam Flesh: 2ea ";
-			else if(hg_tre == 23)
+			else if (hg_tre == 23)
 				mes "Collected Clam Flesh: 3ea ";
-			else if(hg_tre == 24)
+			else if (hg_tre == 24)
 				mes "Collected Clam Flesh: 4ea ";
-			else if(hg_tre == 25)
+			else if (hg_tre == 25)
 				mes "Collected Clam Flesh: 5ea ";
 			initnpctimer;
 			disablenpc "Clam#C4";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 25)
-	{
+	} else if (hg_tre == 25) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I think that this will do.";
 		close;
@@ -4239,17 +3866,13 @@ OnTimer20000:
 	enablenpc "Clam#C4";
 	stopnpctimer;
 	end;
-
 }
 
-hu_fild06,155,309,1	script	Moks Bugs#Bug1	1053,{
-
-	if(hg_tre > 29 && hg_tre < 35)
-	{
+hu_fild06,155,309,1	script	Moks Bugs#Bug1	THIEF_BUG_,{
+	if (hg_tre > 29 && hg_tre < 35) {
 		mes "- You found big brown Moks Bugs in the bushes. -";
 		next;
-		switch( select( "Catch them.","Pass." ) )
-		{
+		switch(select("Catch them.:Pass.")) {
 		case 1:
 			mes "- You nervously stretched your hands toward Moks Bugs.-";
 			next;
@@ -4263,8 +3886,7 @@ hu_fild06,155,309,1	script	Moks Bugs#Bug1	1053,{
 			mes "- *Whizz Whizz*-";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4272,28 +3894,24 @@ hu_fild06,155,309,1	script	Moks Bugs#Bug1	1053,{
 			mes "- You have successfully gathered Moks Bugs Shells. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 31)
+			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
-			else if(hg_tre == 32)
+			else if (hg_tre == 32)
 				mes "Collected Moks Bugs Shells: 2ea ";
-			else if(hg_tre == 33)
+			else if (hg_tre == 33)
 				mes "Collected Moks Bugs Shells: 3ea ";
-			else if(hg_tre == 34)
+			else if (hg_tre == 34)
 				mes "Collected Moks Bugs Shells: 4ea ";
-			else if(hg_tre == 35)
+			else if (hg_tre == 35)
 				mes "Collected Moks Bugs Shells: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Bugs#Bug1";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Aww...I don't want to touch dirty things like bugs!";
 		close;
@@ -4303,17 +3921,13 @@ OnTimer20000:
 	enablenpc "Moks Bugs#Bug1";
 	stopnpctimer;
 	end;
-	
 }
 
-hu_fild06,218,320,1	script	Moks Bugs#Bug2	1053,{
-
-	if(hg_tre > 29 && hg_tre < 35)
-	{
+hu_fild06,218,320,1	script	Moks Bugs#Bug2	THIEF_BUG_,{
+	if (hg_tre > 29 && hg_tre < 35) {
 		mes "- You found big brown Moks Bugs in the bushes. -";
 		next;
-		switch( select( "Catch them","Pass." ) )
-		{
+		switch(select("Catch them:Pass.")) {
 		case 1:
 			mes "- You nervously stretched your hands toward Moks Bugs.-";
 			next;
@@ -4327,8 +3941,7 @@ hu_fild06,218,320,1	script	Moks Bugs#Bug2	1053,{
 			mes "- *Whizz Whizz*-";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4336,28 +3949,24 @@ hu_fild06,218,320,1	script	Moks Bugs#Bug2	1053,{
 			mes "- You have successfully gathered Moks Bugs Shells. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 31)
+			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
-			else if(hg_tre == 32)
+			else if (hg_tre == 32)
 				mes "Collected Moks Bugs Shells: 2ea ";
-			else if(hg_tre == 33)
+			else if (hg_tre == 33)
 				mes "Collected Moks Bugs Shells: 3ea ";
-			else if(hg_tre == 34)
+			else if (hg_tre == 34)
 				mes "Collected Moks Bugs Shells: 4ea ";
-			else if(hg_tre == 35)
+			else if (hg_tre == 35)
 				mes "Collected Moks Bugs Shells: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Bugs#Bug2";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Aww...I don't want to touch dirty things like bugs!";
 		close;
@@ -4367,17 +3976,13 @@ OnTimer20000:
 	enablenpc "Moks Bugs#Bug2";
 	stopnpctimer;
 	end;
-	
 }
 
-hu_fild06,249,329,1	script	Moks Bugs#Bug3	1053,{
-
-	if(hg_tre > 29 && hg_tre < 35)
-	{
+hu_fild06,249,329,1	script	Moks Bugs#Bug3	THIEF_BUG_,{
+	if (hg_tre > 29 && hg_tre < 35) {
 		mes "- You found big brown Moks Bugs in the bushes. -";
 		next;
-		switch( select( "Catch them","Pass." ) )
-		{
+		switch(select("Catch them:Pass.")) {
 		case 1:
 			mes "- You nervously stretched your hands toward Moks Bugs.-";
 			next;
@@ -4391,8 +3996,7 @@ hu_fild06,249,329,1	script	Moks Bugs#Bug3	1053,{
 			mes "- *Whizz Whizz*-";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4400,28 +4004,24 @@ hu_fild06,249,329,1	script	Moks Bugs#Bug3	1053,{
 			mes "- You have successfully gathered Moks Bugs Shells. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 31)
+			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
-			else if(hg_tre == 32)
+			else if (hg_tre == 32)
 				mes "Collected Moks Bugs Shells: 2ea ";
-			else if(hg_tre == 33)
+			else if (hg_tre == 33)
 				mes "Collected Moks Bugs Shells: 3ea ";
-			else if(hg_tre == 34)
+			else if (hg_tre == 34)
 				mes "Collected Moks Bugs Shells: 4ea ";
-			else if(hg_tre == 35)
+			else if (hg_tre == 35)
 				mes "Collected Moks Bugs Shells: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Bugs#Bug3";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Aww...I don't want to touch dirty things like bugs!";
 		close;
@@ -4431,17 +4031,13 @@ OnTimer20000:
 	enablenpc "Moks Bugs#Bug3";
 	stopnpctimer;
 	end;
-	
 }
 
-hu_fild06,218,373,1	script	Moks Bugs#Bug4	1053,{
-
-	if(hg_tre > 29 && hg_tre < 35)
-	{
+hu_fild06,218,373,1	script	Moks Bugs#Bug4	THIEF_BUG_,{
+	if (hg_tre > 29 && hg_tre < 35) {
 		mes "- You found big brown Moks Bugs in the bushes. -";
 		next;
-		switch( select( "Catch them.","Pass." ) )
-		{
+		switch(select("Catch them.:Pass.")) {
 		case 1:
 			mes "- You nervously stretched your hands toward Moks Bugs.-";
 			next;
@@ -4455,8 +4051,7 @@ hu_fild06,218,373,1	script	Moks Bugs#Bug4	1053,{
 			mes "- *Whizz Whizz*-";
 			specialeffect2 EF_CONE;
 			next;
-			if(rand(1,5) > 4)
-			{
+			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
 				specialeffect2 EF_STUNATTACK;
 				close;
@@ -4464,28 +4059,24 @@ hu_fild06,218,373,1	script	Moks Bugs#Bug4	1053,{
 			mes "- You have successfully gathered Moks Bugs Shells. -";
 			specialeffect2 EF_VALLENTINE2;
 			set hg_tre,hg_tre+1;
-			if(hg_tre == 31)
+			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
-			else if(hg_tre == 32)
+			else if (hg_tre == 32)
 				mes "Collected Moks Bugs Shells: 2ea ";
-			else if(hg_tre == 33)
+			else if (hg_tre == 33)
 				mes "Collected Moks Bugs Shells: 3ea ";
-			else if(hg_tre == 34)
+			else if (hg_tre == 34)
 				mes "Collected Moks Bugs Shells: 4ea ";
-			else if(hg_tre == 35)
+			else if (hg_tre == 35)
 				mes "Collected Moks Bugs Shells: 5ea ";
 			initnpctimer;
 			disablenpc "Moks Bugs#Bug4";
 			close;
-		break;
 		case 2:
 			mes "- You decided to pass by them. -";
 			close;
-		break;
 		}
-	}
-	else if(hg_tre == 35)
-	{
+	} else if (hg_tre == 35) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Aww...I don't want to touch dirty things like bugs!";
 		close;
@@ -4495,13 +4086,10 @@ OnTimer20000:
 	enablenpc "Moks Bugs#Bug4";
 	stopnpctimer;
 	end;
-	
 }
 
-lhz_in01,214,129,0	script	A Pile of Paper	111,{
-
-	if(hg_tre == 52)
-	{
+lhz_in01,214,129,0	script	A Pile of Paper	HIDDEN_NPC,{
+	if (hg_tre == 52) {
 		mes "- You found a pile of paper that was tied up with a thick ribbon.";
 		mes "On the very top paper, a period and a title saying 'Report of the **th Research'";
 		mes "were written.";
@@ -4513,13 +4101,12 @@ lhz_in01,214,129,0	script	A Pile of Paper	111,{
 		donpcevent "HuMSpawner::OnMonster";
 		close;
 	}
-	
+	end;
 }
 
-lhz_in01,235,129,0	script	HuMSpawner	139,{
-
+lhz_in01,235,129,0	script	HuMSpawner	HIDDEN_WARP_NPC,{
 	OnMonster:
-	if(rand(0,1))
+	if (rand(0,1))
 		mapannounce "lhz_in01","Intruder alert! Protect the research documents!",1,0xFF0000;
 	else
 		mapannounce "lhz_in01","Intruder alert! Intruder alert!",1,0xFF0000;
@@ -4535,15 +4122,11 @@ OnTimer60000:
 	
 OnMonsterDead:
 	end;
-	
 }
 
-lhz_dun02,244,226,0	script	Unethical Machine	111,{
-
-	if(hg_tre == 54)
-	{
-		if(countitem(7138))
-		{
+lhz_dun02,244,226,0	script	Unethical Machine	HIDDEN_NPC,{
+	if (hg_tre == 54) {
+		if (countitem(7138)) {
 			mes "["+strcharinfo(0)+"]";
 			mes "This must be it...whoa, it looks very spooky.";
 			mes "Today, I am going to destroy you";
@@ -4558,18 +4141,15 @@ lhz_dun02,244,226,0	script	Unethical Machine	111,{
 			delitem 7138,1; //Marine sphere bottle
 			set hg_tre,55;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "- You were staggered for the fact that";
 			mes "you forgot to bring the Marine Sphere Bottle with you. -";
 			close;
 		}
 	}
-	
 }
 
-lhz_dun02,244,227,0	script	HiddenExplosion	139,5,5,{
+lhz_dun02,244,227,0	script	HiddenExplosion	HIDDEN_WARP_NPC,5,5,{
 OnInit:
 	disablenpc "HiddenExplosion";
 	end;
@@ -4579,35 +4159,29 @@ OnTouch:
 	specialeffect EF_HIT5;
 	disablenpc "HiddenExplosion";
 	end;
-	
 }
 
-hu_in01,365,170,3	script	Girl#Hu	793,{
-
+hu_in01,365,170,3	script	Girl#Hu	4_F_NFLOSTGIRL,{
 	mes "[Girl]";
 	mes "I love sitting in front of a stove because it makes me warm~";
 	mes "Ah...it is so warm and relaxing...and now I feel sleepy...Zzzzz Zzzz...";
 	close;
-	
 }
 
-hu_in01,377,106,3	script	Pub Granny	892,{
-
+hu_in01,377,106,3	script	Pub Granny	4_F_HUGRANMA,{
 	mes "[Pub Granny]";
 	mes "Recently we have many tourists visiting our town.";
 	mes "They make me pretty busy, but I am so happy to see them enjoying my food. Hohoho!";
 	close;
 }
 
-// Memory Quest
+// Memory Quest :: hg_memo
 //============================================================
-hugel,198,169,0	script	#HugelTree	139,2,2,{
-
-	if(BaseLevel > 49)
-	{
-		if(!hg_memory)
-		{
+hugel,198,169,0	script	#HugelTree	HIDDEN_WARP_NPC,2,2,{
+	if (BaseLevel > 49) {
+		if (!hg_memory) {
 			set hg_memory,1;
+			setquest 8057;
 			mes "^3355FFFor some reason, you";
 			mes "feel very warm, safe,";
 			mes "and secure near this";
@@ -4615,9 +4189,7 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 			mes "it brings you a sense";
 			mes "of overwhelming comfort.^000000";
 			close;
-		}
-		else if(hg_memory == 1)
-		{
+		} else if (hg_memory == 1) {
 			mes "^3355FFFor some reason, you";
 			mes "feel very warm, safe,";
 			mes "and secure near this";
@@ -4625,9 +4197,7 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 			mes "it brings you a sense";
 			mes "of overwhelming comfort.^000000";
 			close;
-		}
-		else if(hg_memory == 6)
-		{
+		} else if (hg_memory == 6) {
 			specialeffect2 EF_BEGINSPELL5;
 			mes "^3355FFWhat's this strange";
 			mes "feeling of dread?";
@@ -4635,9 +4205,7 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 			mes "It's almost as if you";
 			mes "were in Nifflheim...^000000";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "^3355FFFor some reason, you";
 			mes "feel very warm, safe,";
 			mes "and secure near this";
@@ -4646,9 +4214,7 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 			mes "of overwhelming comfort.^000000";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "^3355FFFor some reason, you";
 		mes "feel very warm, safe,";
 		mes "and secure near this";
@@ -4657,13 +4223,10 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 		mes "of overwhelming comfort.^000000";
 		close;
 	}
-	
 }
 
-hugel,191,172,3	script	Manainne	892,1,{
-
-	if(hg_memory == 1)
-	{
+hugel,191,172,3	script	Manainne	4_F_HUGRANMA,1,{
+	if (hg_memory == 1) {
 		mes "[Manainne]";
 		mes "This tree means so much";
 		mes "to everyone in this town,";
@@ -4680,10 +4243,9 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "Right now he's surveying";
 		mes "the land for construction...";
 		set hg_memory,2;
+		changequest 8057,8058;
 		close;
-	}
-	else if(hg_memory == 2)
-	{
+	} else if (hg_memory == 2) {
 		mes "[Manainne]";
 		mes "This tree means so much";
 		mes "to everyone in this town,";
@@ -4700,9 +4262,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "Right now he's surveying";
 		mes "the land for construction...";
 		close;
-	}
-	else if(hg_memory == 5)
-	{
+	} else if (hg_memory == 5) {
 		mes "[Manainne]";
 		mes "You know, El Schatt and";
 		mes "I used to get along when";
@@ -4725,10 +4285,9 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "My sister would be rolling";
 		mes "in her grave, seeing him now...";
 		set hg_memory,6;
+		changequest 8061,8062;
 		close;
-	}
-	else if(hg_memory == 6)
-	{
+	} else if (hg_memory == 6) {
 		mes "[Manainne]";
 		mes "Now El Schatt is just a";
 		mes "heartless, money grubbing...!";
@@ -4736,9 +4295,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "My sister would be rolling";
 		mes "in her grave, seeing him now...";
 		close;
-	}
-	else if(hg_memory == 7)
-	{
+	} else if (hg_memory == 7) {
 		mes "[Manainne]";
 		mes "What? That's...";
 		mes "That's an incredible";
@@ -4761,9 +4318,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "It's giving me the chills!";
 		mes "A-aren't you cold?";
 		close;
-	}
-	else if(hg_memory == 8)
-	{
+	} else if (hg_memory == 8) {
 		mes "[Manainne]";
 		mes "......";
 		mes ".........";
@@ -4793,9 +4348,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "......";
 		mes "..........";
 		close;
-	}
-	else if(hg_memory == 9)
-	{
+	} else if (hg_memory == 9) {
 		mes "[Manainne]";
 		mes "...I'm here. I'm really";
 		mes "back! Oh, it's been so";
@@ -4846,9 +4399,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes ".........";
 		mes "............";
 		close;
-	}
-	else if(hg_memory == 10)
-	{
+	} else if (hg_memory == 10) {
 		mes "[Manainne]";
 		mes "Wait, El Schatt!";
 		mes "It's really me, but";
@@ -4934,15 +4485,11 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "Is it really you?";
 		set hg_memory,11;
 		close;
-	}
-	else if(hg_memory == 11)
-	{
+	} else if (hg_memory == 11) {
 		mes "[Manainne]";
 		mes "El Schatt...";
 		close;
-	}
-	else if(hg_memory == 12)
-	{
+	} else if (hg_memory == 12) {
 		mes "^3355FFManainne is sobbing";
 		mes "uncontrollably, and there's";
 		mes "nothing you can do to comfort";
@@ -4950,9 +4497,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "leave her alone to her despair";
 		mes "and unfathomable sense of loss.^000000";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Manainne]";
 		mes "You know, even though";
 		mes "it's not a wealthy area,";
@@ -4962,13 +4507,10 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "the world, I'd live right here~";
 		close;
 	}
-	
 }
 
-niflheim,90,106,3	script	A Spirit#HQuest	802,{
-
-	if(hg_memory == 6)
-	{
+niflheim,90,106,3	script	A Spirit#HQuest	4_NFWISP,{
+	if (hg_memory == 6) {
 		mes "[Spirit]";
 		mes "El Schatt...";
 		mes "Manainne...";
@@ -5003,11 +4545,10 @@ niflheim,90,106,3	script	A Spirit#HQuest	802,{
 		mes "the living... to Hugel...";
 		mes "Let me send you there...";
 		set hg_memory,7;
+		changequest 8062,8063;
 		close2;
 		warp "hugel",78,148;
-	}
-	else if(hg_memory == 7)
-	{
+	} else if (hg_memory == 7) {
 		mes "[Kanainne's Spirit]";
 		mes "You...! You can help";
 		mes "me... Just go back to ";
@@ -5015,9 +4556,7 @@ niflheim,90,106,3	script	A Spirit#HQuest	802,{
 		mes "Let me send you there...";
 		close2;
 		warp "hugel",78,148;
-	}
-	else
-	{
+	} else {
 		mes "[Spirit]";
 		mes "The living shouldn't";
 		mes "be here in Nifflheim...";
@@ -5030,13 +4569,10 @@ niflheim,90,106,3	script	A Spirit#HQuest	802,{
 		mes "I miss them...";
 		close;
 	}
-	
 }
 
-hugel,100,103,3	script	Perfitz	866,{
-
-	if(hg_memory == 3)
-	{
+hugel,100,103,3	script	Perfitz	4_M_LGTGRAND,{
+	if (hg_memory == 3) {
 		set hg_memory,4;
 		mes "[Perfitz]";
 		mes "I'm pleased that my son has";
@@ -5060,19 +4596,16 @@ hugel,100,103,3	script	Perfitz	866,{
 		mes "he's too excited about cutting";
 		mes "that tree down. Maybe this old";
 		mes "man is just too suspcious~";
+		changequest 8059,8060;
 		close;
-	}
-	else if(hg_memory == 4)
-	{
+	} else if (hg_memory == 4) {
 		mes "[Perfitz]";
 		mes "It's funny how things";
 		mes "change. You know, El Schatt";
 		mes "actually used to protest against^FFFFFF ^000000 my idea of building shops in the";
 		mes "area when that tree grows. Hmm...^FFFFFF ^000000 I wonder, what happened to him?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Perfitz]";
 		mes "Money is very dependable...";
 		mes "But it's value is relative, and";
@@ -5098,13 +4631,10 @@ hugel,100,103,3	script	Perfitz	866,{
 		mes "that are worth having.";
 		close;
 	}
-	
 }
 
-hugel,196,164,3	script	El Schatt	50,{
-
-	if(hg_memory == 2)
-	{
+hugel,196,164,3	script	El Schatt	1_M_04,{
+	if (hg_memory == 2) {
 		mes "[El Schatt]";
 		mes "What? What's that look for?";
 		mes "Oh, you must have spoken to";
@@ -5136,10 +4666,9 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "town, but how much money do";
 		mes "you think these people enjoy?";
 		mes "I need to look to the future...";
+		changequest 8058,8059;
 		close;
-	}
-	else if(hg_memory == 3)
-	{
+	} else if (hg_memory == 3) {
 		mes "[El Schatt]";
 		mes "This is the perfect";
 		mes "location for shops.";
@@ -5154,9 +4683,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "When you think about it,";
 		mes "it's just a waste of space...";
 		close;
-	}
-	else if(hg_memory == 4)
-	{
+	} else if (hg_memory == 4) {
 		set hg_memory,5;
 		mes "[El Schatt]";
 		mes "You've spoken with my father?";
@@ -5172,10 +4699,9 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "I'd protect that old tree";
 		mes "with my life, I won't deny";
 		mes "it. But that's an old story that^FFFFFF ^000000 should be buried in the past...";
+		changequest 8060,8061;
 		close;
-	}
-	else if(hg_memory == 5)
-	{
+	} else if (hg_memory == 5) {
 		mes "[El Schatt]";
 		mes "The past is behind me";
 		mes "as it should be. Now";
@@ -5183,9 +4709,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "my family's businesses.";
 		mes "Father was right all along...";
 		close;
-	}
-	else if(hg_memory == 7)
-	{
+	} else if (hg_memory == 7) {
 		mes "[El Schatt]";
 		mes "What did you say...?";
 		mes "You met Kanainne?";
@@ -5194,9 +4718,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "of sick joke, so get out";
 		mes "of here before I get angry.";
 		close;
-	}
-	else if(hg_memory == 10)
-	{
+	} else if (hg_memory == 10) {
 		mes "[El Schatt]";
 		mes "No way...!";
 		mes "Kanainne is dead!";
@@ -5208,9 +4730,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes ".........";
 		mes "............";
 		close;
-	}
-	else if(hg_memory == 11)
-	{
+	} else if (hg_memory == 11) {
 		mes "[El Schatt]";
 		mes "K-Kanainne! ^333333*Sob*^000000";
 		mes "I've missed you so much!";
@@ -5336,17 +4856,16 @@ hugel,196,164,3	script	El Schatt	50,{
 		next;
 		specialeffect2 EF_CONE;
 		set hg_memory,12;
-		getexp 5000,0;
-		getitem 603,1; //Old blue box
+		getexp (checkre(3))?8000:50000,0;
+		completequest 8063;
+		getitem 603,1; //Old Blue Box
 		mes "[El Schatt]";
 		mes "Oh... Oh dear";
 		mes "sweet God... My...";
 		mes "My dear Kanainne...";
 		mes "No.... No... Please...";
 		close;
-	}
-	else if(hg_memory == 12)
-	{
+	} else if (hg_memory == 12) {
 		mes "[El Schatt]";
 		mes "...Would you please";
 		mes "leave me alone? I have...";
@@ -5354,9 +4873,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "think about. And there's";
 		mes "music that I have to write...";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[El Schatt]";
 		mes "Father was right...";
 		mes "This area is the perfect";
@@ -5369,21 +4886,17 @@ hugel,196,164,3	script	El Schatt	50,{
 
 }
 
-// Hide and Seek Quest
+// Hide and Seek Quest :: hg_c_child
 //============================================================
-hugel,107,67,3	script	Torpy	706,{
-
-	if(BaseLevel > 49)
-	{
-		if(!hg_ubu01)
-		{
+hugel,107,67,3	script	Torpy	4_M_KID1,{
+	if (BaseLevel > 49) {
+		if (!hg_ubu01) {
 			mes "[Torpy]";
 			mes "D-Daddy...!";
 			mes "Daddy where";
 			mes "are you?! Wah~!";
 			next;
-			switch( select( "What's wrong?:Ignore" ) )
-			{
+			switch(select("What's wrong?:Ignore")) {
 			case 1:
 				mes "[Torpy]";
 				mes "My Daddy hasn't";
@@ -5405,8 +4918,7 @@ hugel,107,67,3	script	Torpy	706,{
 				mes "and then, a-and then...";
 				mes "I never found him!";
 				next;
-				switch( select( "Really? Tell me more...:What, is that all...?" ) )
-				{
+				switch(select("Really? Tell me more...:What, is that all...?")) {
 				case 1:
 					mes "[Torpy]";
 					mes "Th-then my Mom got";
@@ -5424,8 +4936,8 @@ hugel,107,67,3	script	Torpy	706,{
 					mes "least one of them just";
 					mes "outside of town.";
 					set hg_ubu01,1;
+					setquest 12044;
 					close;
-				break;
 				case 2:
 					mes "["+strcharinfo(0)+"]";
 					mes "Don't worry, your";
@@ -5435,9 +4947,7 @@ hugel,107,67,3	script	Torpy	706,{
 					mes "of luck, kid.";
 					emotion e_dots,1;
 					close;
-				break;
 				}
-			break;
 			case 2:
 				mes "[Torpy]";
 				mes "D-Daddy...!";
@@ -5445,11 +4955,8 @@ hugel,107,67,3	script	Torpy	706,{
 				mes "Where are yoooou?!";
 				mes "Wuh-Waaaaaaaaaah!";
 				close;
-			break;
 			}
-		}
-		else if(hg_ubu01 == 2)
-		{
+		} else if (hg_ubu01 == 2) {
 			mes "[Torpy]";
 			mes "Oh...";
 			mes "Mommy was just";
@@ -5457,10 +4964,9 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "*Sob* Okay, I hope my";
 			mes "Daddy comes back soon...";
 			set hg_ubu01,3;
+			changequest 12045,12046;
 			close;
-		}
-		else if(hg_ubu01 == 6)
-		{
+		} else if (hg_ubu01 == 6) {
 			mes "[Torpy]";
 			mes "Y-you found my Daddy!";
 			mes "Hooray! I was so worried";
@@ -5493,9 +4999,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "a girlfriend! He promised~!^000000";
 			set hg_ubu01,7;
 			close;
-		}
-		else if(hg_ubu01 == 7)
-		{
+		} else if (hg_ubu01 == 7) {
 			mes "[Torpy]";
 			mes "Would you please hurry";
 			mes "and talk to my Mom? She";
@@ -5516,9 +5020,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "Wh-what if they become friends?";
 			mes "Um, that might not be good...^000000";
 			close;
-		}
-		else if(hg_ubu01 == 8)
-		{
+		} else if (hg_ubu01 == 8) {
 			emotion e_dots,1;
 			mes "[Torpy]";
 			mes "Daddy promised to get";
@@ -5534,9 +5036,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "girl that I can find! Yaaay~";
 			set hg_ubu01,9;
 			close;
-		}
-		else if(hg_ubu01 == 9)
-		{
+		} else if (hg_ubu01 == 9) {
 			emotion e_dots,1;
 			mes "[Torpy]";
 			mes "Maybe I should wait until";
@@ -5550,9 +5050,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "to learn about girlfriends,";
 			mes "or just people, in general.^000000";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Torpy]";
 			mes "^333333*Sniff*^000000 D-Daddy's gone!";
 			mes "Will you help me find my";
@@ -5560,9 +5058,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "to find him now! H-Hurry!";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Torpy]";
 		mes "Waaah~!";
 		mes "I have to find";
@@ -5570,13 +5066,10 @@ hugel,107,67,3	script	Torpy	706,{
 		mes "Where are yooooou?!";
 		close;
 	}
-	
 }
 
-hu_fild06,190,367,3	script	Torpy's Mom	701,{
-
-	if(hg_ubu01 == 0)
-	{
+hu_fild06,190,367,3	script	Torpy's Mom	4_F_GODEMOM,{
+	if (hg_ubu01 == 0) {
 		mes "[Torpy's Mom]";
 		mes "Where did he go this time?!";
 		mes "If my husband doesn't have";
@@ -5584,9 +5077,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "home, then he better come";
 		mes "up with one or he'll be sorry!";
 		close;
-	}
-	else if(hg_ubu01 == 1)
-	{
+	} else if (hg_ubu01 == 1) {
 		mes "[Torpy's Mom]";
 		mes "Hmm? Oh, you talked to";
 		mes "my little Torpy? He thinks his";
@@ -5633,10 +5124,9 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "my husband inside town, tell";
 		mes "him that he better come home!";
 		set hg_ubu01,2;
+		changequest 12044,12045;
 		close;
-	}
-	else if(hg_ubu01 == 2)
-	{
+	} else if (hg_ubu01 == 2) {
 		mes "[Torpy's Mom]";
 		mes "Listen, would you please";
 		mes "tell my son Torpy that I'm";
@@ -5645,31 +5135,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "my husband inside town, tell";
 		mes "him that he better come home!";
 		close;
-	}
-	else if(hg_ubu01 == 6)
-	{
-		mes "[Torpy's Mom]";
-		mes "What?! He was hiding";
-		mes "inside a barrel this";
-		mes "entire time?! Oh, no.";
-		mes "I'm sorry, my husband has";
-		mes "caused you so much trouble.";
-		next;
-		mes "[Torpy's Mom]";
-		mes "I really appreciate";
-		mes "everything you've done";
-		mes "to help us find him. I know";
-		mes "it's not much, but I hope";
-		mes "you accept this as our thanks.";
-		mes "Goodbye for now, adventurer~";
-		specialeffect2 EF_CONE;
-		set hg_ubu01,8;
-		getitem 12065,3; //Green salad
-		getexp 5000,0;
-		close;
-	}
-	else if(hg_ubu01 == 7)
-	{
+	} else if (hg_ubu01 == 6 || hg_ubu01 == 7) {
 		mes "[Torpy's Mom]";
 		mes "What?! He was hiding";
 		mes "inside a barrel this";
@@ -5684,14 +5150,13 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "it's not much, but I hope";
 		mes "you accept this as our thanks.";
 		mes "Goodbye for now, adventurer~";
-		specialeffect2 EF_MVP;
+		specialeffect2 (hg_ubu01 == 6)?EF_CONE:EF_MVP;
 		set hg_ubu01,8;
-		getitem 12065,3; //Green salad
-		getexp 5000,0;
+		completequest 12048;
+		getitem 12065,3; //Green Salad
+		getexp (checkre(3))?5000:50000,0;
 		close;
-	}
-	else if(hg_ubu01 == 8)
-	{
+	} else if (hg_ubu01 == 8) {
 		mes "[Torpy's Mom]";
 		mes "Sometimes I wonder if";
 		mes "Torpy is too mature for";
@@ -5700,9 +5165,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "way, those two really take";
 		mes "after each other. Oh, well...";
 		close;
-	}
-	else if(hg_ubu01 == 9)
-	{
+	} else if (hg_ubu01 == 9) {
 		emotion e_dots,1;
 		mes "[Torpy's Mom]";
 		mes "When is that husband";
@@ -5712,9 +5175,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "bet with Torpy, did he? Oh,";
 		mes "the trouble with those two...";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Torpy's Mom]";
 		mes "Where did he go this time?!";
 		mes "If my husband doesn't have";
@@ -5723,13 +5184,10 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "up with one or he'll be sorry!";
 		close;
 	}
-	
 }
 
-hugel,100,176,3	script	Suspicious Barrel	111,{
-
-	if(hg_ubu01 == 3)
-	{
+hugel,100,176,3	script	Suspicious Barrel	HIDDEN_NPC,{
+	if (hg_ubu01 == 3) {
 		mes "[Strange Man]";
 		mes "So... hun...gry...";
 		mes "F-food... Give me...";
@@ -5742,8 +5200,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 		mes "this barrel wants";
 		mes "Steamed Crab Nippers.^000000";
 		next;
-		switch( select( "I'll bring you Steamed Crab Nippers:Ignore" ) )
-		{
+		switch(select("I'll bring you Steamed Crab Nippers:Ignore")) {
 		case 1:
 			mes "[Strange Man]";
 			mes "Please... cook me...";
@@ -5765,8 +5222,8 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "o-only... possible...";
 			mes "Way... P-please help...";
 			set hg_ubu01,4;
+			changequest 12046,12047;
 			close;
-		break;
 		case 2:
 			mes "[Strange Man]";
 			mes "D-don't... leave...";
@@ -5781,13 +5238,9 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "and get your Steamed";
 			mes "Crab Nippers yourself?!";
 			close;
-		break;
 		}
-	}
-	else if(hg_ubu01 == 4)
-	{
-		if(countitem(12051)) //Steamed crab nippers
-		{
+	} else if (hg_ubu01 == 4) {
+		if (countitem(12051)) {
 			mes "[Strange Man]";
 			mes "Th-that... tantalizing...";
 			mes "scent... It's S-Steamed...";
@@ -5812,9 +5265,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			close2;
 			donpcevent "Strange Man#Hugel::OnEnable";
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Strange Man]";
 			mes "Please... cook me...";
 			mes "Steamed... Crab Nippers...!";
@@ -5836,11 +5287,8 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "Way... P-please help...";
 			close;
 		}
-	}
-	else if(hg_ubu01 == 5)
-	{
-		if(countitem(12051)) //Steamed crab nippers
-		{
+	} else if (hg_ubu01 == 5) {
+		if (countitem(12051)) {
 			mes "[Strange Man]";
 			mes "Th-that... tantalizing...";
 			mes "scent... It's S-Steamed...";
@@ -5865,9 +5313,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			close2;
 			donpcevent "Strange Man#Hugel::OnEnable";
 			end;
-		}
-		else
-		{
+		} else {
 			mes "[Strange Man]";
 			mes "Please... cook me...";
 			mes "Steamed... Crab Nippers...!";
@@ -5889,9 +5335,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "Way... P-please help...";
 			close;
 		}
-	}
-	else if(hg_ubu01 == 6)
-	{
+	} else if (hg_ubu01 == 6) {
 		emotion e_dots,1;
 		mes "^3355FFFor now, you should";
 		mes "tell Torpy and his mom";
@@ -5899,42 +5343,31 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 		mes "hiding so they won't";
 		mes "worry about him so much.";
 		close;
-	}
-	else if(hg_ubu01 == 7)
-	{
+	} else if (hg_ubu01 == 7) {
 		emotion e_dots,1;
 		mes "^800080Torpy's mom might want to know about^000000";
 		mes "^800080this extraordinary barrel.^000000";
 		close;
-	}
-	else if(hg_ubu01 == 8)
-	{
+	} else if (hg_ubu01 == 8) {
 		emotion e_dots,1;
 		mes "^800080How long does Torpy's father plan to stay within the barrel?^000000";
 		close;
-	}
-	else if(hg_ubu01 == 9)
-	{
+	} else if (hg_ubu01 == 9) {
 		emotion e_dots,1;
 		mes "^800080That barrel will become a symbolic object^000000";
 		mes "^800080that pays tribute to the firm will of Torpy's father^000000";
 		mes "^800080who is trying hard to avoid keeping the promise with his son to find his wife.^000000";
 		close;
-	}
-	else
-	{
+	} else {
 		emotion e_dots,1;
 		mes "^800080You hear something bustling from the hole in the barrel.^000000";
 		mes "^800080However, it doesn't seem to be a big deal.^000000";
 		close;
 	}
-	
 }
 
-hugel,100,174,3	script	Strange Man#Hugel	898,{
-
-	if(hg_ubu01 == 5)
-	{
+hugel,100,174,3	script	Strange Man#Hugel	4_M_HUMAN_01,{
+	if (hg_ubu01 == 5) {
 		mes "[Strange Man]";
 		mes "Ahhhh... Thanks for";
 		mes "the free meal! It was";
@@ -5980,6 +5413,7 @@ hugel,100,174,3	script	Strange Man#Hugel	898,{
 		mes "this game of Hide-and-Seek...";
 		mes "Well, I just can't lose! Bye!";
 		set hg_ubu01,6;
+		changequest 12047,12048;
 		next;
 		mes "^3355FFTorpy's father has";
 		mes "hidden himself again,";
@@ -5991,9 +5425,7 @@ hugel,100,174,3	script	Strange Man#Hugel	898,{
 		disablenpc "Strange Man#Hugel";
 		enablenpc "Suspicious Barrel";
 		end;
-	}
-	else
-	{
+	} else {
 		mes "[Strange Man]";
 		mes "Hahahaha!";
 		mes "Steamed Crab Nippers!";
@@ -6018,15 +5450,12 @@ OnTimer60000:
 	disablenpc "Strange Man#Hugel";
 	enablenpc "Suspicious Barrel";
 	end;
-	
 }
 
-// Fish Cake Soup Delivery Quest
+// Fish Cake Soup Delivery Quest :: hg_odeng
 //============================================================
-hu_in01,15,372,3	script	Cellette Lavit	74,{
-
-	if(!hg_odeng)
-	{
+hu_in01,15,372,3	script	Cellette Lavit	1_F_MERCHANT_02,{
+	if (!hg_odeng) {
 		mes "[Cellette]";
 		mes "Hi there, thanks for";
 		mes "visiting our lovely town!";
@@ -6067,17 +5496,15 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "But if you're not interested,";
 		mes "you can just buy some now~";
 		next;
-		switch( select( "Sure, I'll work for you!:I want to buy Fish Cake Soup.:See ya." ) )
-		{
+		switch(select("Sure, I'll work for you!:I want to buy Fish Cake Soup.:See ya.")) {
 		case 1:
 			mes "[Cellette]";
 			mes "Oh, thank you so much!";
 			mes "You can't imagine how busy";
 			mes "I've been, and how much I need^FFFFFF ^000000 the help! Now, let's get started~";
 			next;
-			set @randvar, rand(1,4);
-			if(@randvar == 1)
-			{
+			switch(rand(1,4)) {
+			case 1:
 				mes "[Cellette]";
 				mes "Alright, please take this";
 				mes "order of Fish Cake Soup to";
@@ -6085,11 +5512,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "that she's a regular customer--";
 				mes "she's a good friend, but I'm sure^FFFFFF ^000000 that she loves the soup as well.";
 				set hg_odeng,1;
-				getitem 584,1; //Skewer soup
+				setquest 8064;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else if(@randvar == 2)
-			{
+			case 2:
 				mes "[Cellette]";
 				mes "Right, take this next order";
 				mes "of Fish Cake Soup to Maewan,";
@@ -6097,11 +5523,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "He's been buying my soup ever";
 				mes "since I helped him start his^FFFFFF ^000000 business. Nice of him, isn't it?";
 				set hg_odeng,2;
-				getitem 584,1; //Skewer soup
+				setquest 8065;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else if(@randvar == 3)
-			{
+			case 3:
 				mes "[Cellette]";
 				mes "Okay, this order of Fish";
 				mes "Cake Soup is ready! Please";
@@ -6110,11 +5535,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "a thing about punctuality.";
 				mes "Just try not to be late...";
 				set hg_odeng,3;
-				getitem 584,1; //Skewer soup
+				setquest 8066;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else if(@randvar == 4)
-			{
+			case 4:
 				mes "[Cellette]";
 				mes "Quick, take this Fish";
 				mes "Paste Soup to Erjan. Um,";
@@ -6123,10 +5547,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "have everything in such";
 				mes "and such and order...";
 				set hg_odeng,4;
-				getitem 584,1; //Skewer soup
+				setquest 8067;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
 			}
-		break;
 		case 2:
 			mes "[Cellette]";
 			mes "Oh, you'd like to try my";
@@ -6135,22 +5559,18 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "its delicious, hearty flavor~";
 			mes "Each order costs 100 zeny.";
 			next;
-			switch( select( "Order a Fish Cake Soup:Cancel" ) )
-			{
+			switch(select("Order a Fish Cake Soup:Cancel")) {
 			case 1:
-				if(Zeny > 99)
-				{
+				if (Zeny > 99) {
 					mes "[Cellette]";
 					mes "Thanks! Enjoy your";
 					mes "bowl of Fish Cake Soup.";
 					mes "I hope you come and ";
 					mes "visit me again, okay?";
-					set Zeny,Zeny-100;
-					getitem 584,1; //Skewer soup
+					Zeny -= 100;
+					getitem 584,1; //Fish_Ball_Soup
 					close;
-				}
-				else
-				{
+				} else {
 					mes "[Cellette]";
 					mes "Oh, what's this?";
 					mes "You don't have enough";
@@ -6160,7 +5580,6 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 					mes "for my gourmet soup, you know.";
 					close;
 				}
-			break;
 			case 2:
 				mes "[Cellette]";
 				mes "If you're ever hungry,";
@@ -6168,9 +5587,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "a delicious meal, come";
 				mes "and have some of my soup~";
 				close;
-			break;
 			}
-		break;
 		case 3:
 			mes "[Cellette]";
 			mes "Oh? You're not interested";
@@ -6180,13 +5597,9 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "back. I just know you'll love";
 			mes "the taste if you give it a try.";
 			close;
-		break;
 		}
-	}
-	else if(hg_odeng == 1)
-	{
-		if(countitem(584)) //Skewer soup
-		{
+	} else if (hg_odeng == 1) {
+		if (countitem(584)) {
 			mes "[Cellette]";
 			mes "Haven't you left already?";
 			mes "My friend Neha is waiting";
@@ -6195,9 +5608,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "try to get it to her before the";
 			mes "soup gets cold, okay?";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Cellette]";
 			mes "What's that? You lost";
 			mes "the Fish Cake Soup you're";
@@ -6206,8 +5617,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "to give you this fresh bowl";
 			mes "of soup that I just made...";
 			next;
-			if(Zeny > 99)
-			{
+			if (Zeny > 99) {
 				mes "[Cellette]";
 				mes "But you need to be";
 				mes "responsible and pay";
@@ -6215,12 +5625,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "There, I took 100 zeny";
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
-				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				Zeny -= 100;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[Cellette]";
 				mes "W-wait... You don't";
 				mes "have any money to pay";
@@ -6232,11 +5640,8 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				close;
 			}
 		}
-	}
-	else if(hg_odeng == 2)
-	{
-		if(countitem(584)) //Skewer soup
-		{
+	} else if (hg_odeng == 2) {
+		if (countitem(584)) {
 			mes "[Cellette]";
 			mes "Whoa, whoa, whoa!";
 			mes "You should have left";
@@ -6244,9 +5649,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "soup to Maewan! Hurry,";
 			mes "before it gets too cold!";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Cellette]";
 			mes "What's that? You lost";
 			mes "the Fish Cake Soup you're";
@@ -6255,8 +5658,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "to give you this fresh bowl";
 			mes "of soup that I just made...";
 			next;
-			if(Zeny > 99)
-			{
+			if (Zeny > 99) {
 				mes "[Cellette]";
 				mes "But you need to be";
 				mes "responsible and pay";
@@ -6264,12 +5666,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "There, I took 100 zeny";
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
-				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				Zeny -= 100;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[Cellette]";
 				mes "W-wait... You don't";
 				mes "have any money to pay";
@@ -6281,11 +5681,8 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				close;
 			}
 		}
-	}
-	else if(hg_odeng == 3)
-	{
-		if(countitem(584)) //Skewer soup
-		{
+	} else if (hg_odeng == 3) {
+		if (countitem(584)) {
 			mes "[Cellette]";
 			mes "I thought you left to";
 			mes "deliver that soup to";
@@ -6294,9 +5691,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "it doesn't taste good after";
 			mes "it gets cold, you know.";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Cellette]";
 			mes "What's that? You lost";
 			mes "the Fish Cake Soup you're";
@@ -6305,8 +5700,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "to give you this fresh bowl";
 			mes "of soup that I just made...";
 			next;
-			if(Zeny > 99)
-			{
+			if (Zeny > 99) {
 				mes "[Cellette]";
 				mes "But you need to be";
 				mes "responsible and pay";
@@ -6314,12 +5708,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "There, I took 100 zeny";
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
-				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				Zeny -= 100;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[Cellette]";
 				mes "W-wait... You don't";
 				mes "have any money to pay";
@@ -6331,11 +5723,8 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				close;
 			}
 		}
-	}
-	else if(hg_odeng == 4)
-	{
-		if(countitem(584))
-		{
+	} else if (hg_odeng == 4) {
+		if (countitem(584)) {
 			mes "[Cellette]";
 			mes "Oh, dear, you better";
 			mes "leave now and deliver";
@@ -6343,9 +5732,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "Erjan before he can think";
 			mes "of something to complain about.^FFFFFF ^000000 Although it's probably too late...";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Cellette]";
 			mes "What's that? You lost";
 			mes "the Fish Cake Soup you're";
@@ -6354,8 +5741,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "to give you this fresh bowl";
 			mes "of soup that I just made...";
 			next;
-			if(Zeny > 99)
-			{
+			if (Zeny > 99) {
 				mes "[Cellette]";
 				mes "But you need to be";
 				mes "responsible and pay";
@@ -6363,12 +5749,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "There, I took 100 zeny";
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
-				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				Zeny -= 100;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[Cellette]";
 				mes "W-wait... You don't";
 				mes "have any money to pay";
@@ -6380,9 +5764,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				close;
 			}
 		}
-	}
-	else if(hg_odeng == 5)
-	{
+	} else if (hg_odeng == 5) {
 		mes "[Cellette]";
 		mes "Ah, I'm sorry, but";
 		mes "I can't do any business";
@@ -6390,9 +5772,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "to be irresponsible. Nothing";
 		mes "personal, it's just my policy.";
 		close;
-	}
-	else if(hg_odeng == 10)
-	{
+	} else if (hg_odeng == 10) {
 		mes "[Cellette]";
 		mes "Good work! I hear that";
 		mes "you successfully delivered";
@@ -6401,8 +5781,12 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "is your Fish Cake Soup. Thank";
 		mes "you so much for your help~";
 		set hg_odeng,0;
-		getitem 584,3; //Skewer soup
-		getexp 100,0;
+		for(set .@i,8072; .@i<= 8075; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		getitem 584,3; //Fish_Ball_Soup
+		getexp (checkre(3))?100:1000,0;
 		next;
 		mes "[Cellette]";
 		mes "It was really nice working";
@@ -6412,9 +5796,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "friends about my delicious";
 		mes "Fish Cake Soup. See you later~";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Cellette]";
 		mes "Come and taste some";
 		mes "authentic Hugel cuisine!";
@@ -6424,12 +5806,9 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 	}
 }
 
-hugel,76,134,3	script	Neha	101,{
-
-	if(hg_odeng == 1)
-	{
-		if(countitem(584))
-		{
+hugel,76,134,3	script	Neha	4W_F_01,{
+	if (hg_odeng == 1) {
+		if (countitem(584)) {
 			mes "[Neha]";
 			mes "Oh, you have a delivery";
 			mes "from Cellette, hm? Hmpf!";
@@ -6437,8 +5816,7 @@ hugel,76,134,3	script	Neha	101,{
 			mes "this soup isn't good if it";
 			mes "isn't steaming hot?";
 			next;
-			if(sex)
-			{
+			if (Sex) {
 				mes "[Neha]";
 				mes "But... You're a handsome";
 				mes "fellow, so I'll forgive you...";
@@ -6446,11 +5824,7 @@ hugel,76,134,3	script	Neha	101,{
 				mes "^FF00001 Whip^000000 with which to spank ";
 				mes "you. You better hurry, boy, or";
 				mes "I won't let you off that easy.";
-				set hg_odeng,6;
-				close;
-			}
-			else
-			{
+			} else {
 				mes "[Neha]";
 				mes "Yes, yes... You should";
 				mes "be punished. You should be";
@@ -6458,12 +5832,15 @@ hugel,76,134,3	script	Neha	101,{
 				mes "your delivery, then bring me";
 				mes "^FF00001 Whip^000000 so that I can spank you";
 				mes "for your impertinence, girl!";
-				set hg_odeng,6;
-				close;
 			}
-		}
-		else
-		{
+			for(set .@i,8064; .@i<= 8067; set .@i,.@i+1) {
+				if (checkquest(.@i) > -1 && checkquest(.@i) < 2)
+					completequest .@i;
+			}
+			setquest 8068;
+			set hg_odeng,6;
+			close;
+		} else {
 			mes "[Neha]";
 			mes "Oh ho ho ho ho ho~";
 			mes "I just love cute little boys...";
@@ -6472,11 +5849,8 @@ hugel,76,134,3	script	Neha	101,{
 			mes "a little bit as well. Hoho~";
 			close;
 		}
-	}
-	else if(hg_odeng == 6)
-	{
-		if(countitem(1960) && countitem(584)) //Whip and Skewer soup
-		{
+	} else if (hg_odeng == 6) {
+		if (countitem(1960) && countitem(584)) {
 			mes "[Neha]";
 			mes "Finally... My soup!";
 			mes "And you brought me my Whip!";
@@ -6504,12 +5878,11 @@ hugel,76,134,3	script	Neha	101,{
 			mes "you did a good job... I hope";
 			mes "you come deliver my soup again~";
 			delitem 1960,1; //Whip
-			delitem 584,1; //Skewer soup
+			delitem 584,1; //Fish_Ball_Soup
 			set hg_odeng,10;
+			changequest 8068,8072;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Neha]";
 			mes "^FF00001 Fish Cake Soup^000000...";
 			mes "^FF00001 Whip^000000... Is that too";
@@ -6519,9 +5892,7 @@ hugel,76,134,3	script	Neha	101,{
 			mes "with that, huh? Now hurry up!";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Neha]";
 		mes "Oh ho ho ho ho ho~";
 		mes "I just love cute little boys...";
@@ -6530,15 +5901,11 @@ hugel,76,134,3	script	Neha	101,{
 		mes "a little bit as well. Hoho~";
 		close;
 	}
-	
 }
 
-hugel,87,139,3	script	Maewan	86,{
-
-	if(hg_odeng == 2)
-	{
-		if(countitem(584))
-		{
+hugel,87,139,3	script	Maewan	4_M_04,{
+	if (hg_odeng == 2) {
+		if (countitem(584)) {
 			mes "[Maewan]";
 			mes "Oh, finally, I've been";
 			mes "waiting for my order of";
@@ -6560,10 +5927,9 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "eat my soup before";
 			mes "you deliver it to me!";
 			set hg_odeng,7;
+			changequest 8065,8069;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Maewan]";
 			mes "I like to think of";
 			mes "myself as a man of";
@@ -6573,11 +5939,8 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "all sorts of new things~";
 			close;
 		}
-	}
-	else if(hg_odeng == 7 )
-	{
-		if(countitem(584) && countitem(7015)) //Skewer soup and Bookclip in memory
-		{
+	} else if (hg_odeng == 7 ) {
+		if (countitem(584) && countitem(7015)) {
 			mes "[Maewan]";
 			mes "Great, you really brought";
 			mes "me a Bookclip in Memory!";
@@ -6585,13 +5948,12 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "addition to my collection~";
 			mes "Oh, and give me my soup.";
 			mes "Thanks again for delivering~";
-			delitem 584,1; //Skewer soup
+			delitem 584,1; //Fish_Ball_Soup
 			delitem 7015,1; //Bookclip in memory
 			set hg_odeng,10;
+			changequest 8069,8073;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Maewan]";
 			mes "I know it sounds unfair";
 			mes "of me to ask you to bring";
@@ -6607,9 +5969,7 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "for all sorts of crazy things.";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Maewan]";
 		mes "I like to think of";
 		mes "myself as a man of";
@@ -6622,12 +5982,9 @@ hugel,87,139,3	script	Maewan	86,{
 	
 }
 
-hugel,84,125,3	script	Layoma	700,{
-
-	if(hg_odeng == 3)
-	{
-		if(countitem(584))
-		{
+hugel,84,125,3	script	Layoma	8_F_GIRL,{
+	if (hg_odeng == 3) {
+		if (countitem(584)) {
 			mes "[Layoma]";
 			mes "You're here to deliver";
 			mes "my Fish Cake Soup?";
@@ -6644,10 +6001,9 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "me ^FF00001 Mushroom Spore^000000, and";
 			mes "I'll forget this whole thing.";
 			set hg_odeng,8;
+			changequest 8066,8070;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Layoma]";
 			mes "I love singing songs,";
 			mes "and I love eating mushrooms.";
@@ -6655,11 +6011,8 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "that's a pretty exciting life!";
 			close;
 		}
-	}
-	else if(hg_odeng == 8)
-	{
-		if(countitem(584) && countitem(921)) //Skewer soup and Mushroom spore
-		{
+	} else if (hg_odeng == 8) {
+		if (countitem(584) && countitem(921)) {
 			mes "[Layoma]";
 			mes "Great! You brought me";
 			mes "1 Mushroom Spore! This";
@@ -6672,13 +6025,12 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "for my roommate Cellette";
 			mes "a little while longer. Oh, and";
 			mes "please tell her to not to come^FFFFFF ^000000 home so late all the time, okay?";
-			delitem 921,1; //Mushroom spore
-			delitem 584,1; //Skewer soup
+			delitem 921,1; //Mushroom_Spore
+			delitem 584,1; //Fish_Ball_Soup
 			set hg_odeng,10;
+			changequest 8070,8074;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Layoma]";
 			mes "Hey! I thought you";
 			mes "wanted to prove that";
@@ -6688,9 +6040,7 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "Spore with my Fish Cake Soup!";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Layoma]";
 		mes "I love singing songs,";
 		mes "and I love eating mushrooms.";
@@ -6701,12 +6051,9 @@ hugel,84,125,3	script	Layoma	700,{
 	
 }
 
-hugel,102,161,3	script	Erjan	100,{
-
-	if(hg_odeng == 4)
-	{
-		if(countitem(584))
-		{
+hugel,102,161,3	script	Erjan	4W_SAILOR,{
+	if (hg_odeng == 4) {
+		if (countitem(584)) {
 			mes "[Erjan]";
 			mes "Well, I thought you'd";
 			mes "never come to deliver";
@@ -6723,6 +6070,7 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "the commoner's ^FF0000China^000000!";
 			next;
 			set hg_odeng,9;
+			changequest 8067,8071;
 			mes "[Erjan]";
 			mes "Realize that I'm compromising";
 			mes "with you by asking you to bring";
@@ -6731,9 +6079,7 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "glass and tableware available.";
 			mes "That's how we noblemen live~";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Erjan]";
 			mes "I am Erjan, first son of";
 			mes "the noble Franchefeschu";
@@ -6743,11 +6089,8 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "and do whatever it is you do.";
 			close;
 		}
-	}
-	else if(hg_odeng == 9)
-	{
-		if(countitem(584) && countitem(736)) //Skewer soup and China
-		{
+	} else if (hg_odeng == 9) {
+		if (countitem(584) && countitem(736)) {
 			mes "[Erjan]";
 			mes "Ah, so you've delivered";
 			mes "my Fish Cake Soup with some";
@@ -6768,13 +6111,12 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "Please take your leave,";
 			mes "and return to Cellette";
 			mes "with my noble thanks.";
-			delitem 736,1; //China
-			delitem 584,1; //Skewer soup
+			delitem 736,1; //White_Platter
+			delitem 584,1; //Fish_Ball_Soup
 			set hg_odeng,10;
+			changequest 8071,8075;
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Erjan]";
 			mes "Must I repeat myself?";
 			mes "Bring me my ^FF0000Fish Cake Soup^000000";
@@ -6782,9 +6124,7 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "properly enjoy my meal.";
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Erjan]";
 		mes "I am Erjan, first son of";
 		mes "the noble Franchefeschu";
@@ -6796,34 +6136,29 @@ hugel,102,161,3	script	Erjan	100,{
 	}
 }
 
-// Juno Remedy Quest
+// Juno Remedy Quest :: hg_ma1
 //============================================================
-yuno,111,156,3	script	Euslan	90,{
-
-	if(BaseLevel < 60)
-	{
+yuno,111,156,3	script	Euslan	4_F_01,{
+	if (BaseLevel < 60) {
 		mes "[Euslan]";
 		mes "^333333*Cough Cough*";
 		mes "*Haaaaaaack*";
 		mes "*C-cough* *Sob*^000000";
 		close;
 	}
-	if(!hg_ma1)
-	{
+	if (!hg_ma1) {
 		mes "[Euslan]";
 		mes "^333333*Cough Cough*";
 		mes "*Haaaaaaack*";
 		mes "*C-cough* *Sob*^000000";
 		next;
-		switch( select( "Ignore:Speak to Euslan" ) )
-		{
+		switch(select("Ignore:Speak to Euslan")) {
 		case 1:
 			mes "[Euslan]";
 			mes "^333333*Sniff*";
 			mes "*Huff Huff*";
 			mes "*Cough Cough*^000000";
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "*Huff Huff*";
@@ -6836,25 +6171,20 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "to speak to her.^000000";
 			set hg_ma1,1;
 			close;
-		break;
 		}
-	}
-	else if(hg_ma1 == 1)
-	{
+	} else if (hg_ma1 == 1) {
 		mes "[Euslan]";
 		mes "^333333*Sniff* *Cough";
 		mes "*Cough Cough*";
 		mes "*Sob* *Sniff*^000000";
 		next;
-		switch( select( "Ignore:Speak to Euslan" ) )
-		{
+		switch(select("Ignore:Speak to Euslan")) {
 		case 1:
 			mes "[Euslan]";
 			mes "^333333*Sniff*";
 			mes "*Huff Huff*";
 			mes "*Cough Cough*^000000";
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "^333333*Sniff*";
@@ -6867,17 +6197,15 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "^333333*Cough cough*^000000 did";
 			mes "you want? ^333333*Sniff*^000000";
 			next;
-		break;
+			break;
 		}
-		switch( select( "Nothing!:Are you alright?" ) )
-		{
+		switch(select("Nothing!:Are you alright?")) {
 		case 1:
 			mes "[Euslan]";
 			mes "Oh, I'm s-sorry...";
 			mes "^333333*Cough Cough*^000000 I must";
 			mes "have been mistaken...";
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "Th-thank you so much";
@@ -6901,10 +6229,9 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "is he? ^333333*Sniff*^000000 Where's my";
 			mes "Thierry? I want to see him...";
 			next;
-		break;
+			break;
 		}
-		switch( select( "Leave her alone:Offer to find Thierry" ) )
-		{
+		switch(select("Leave her alone:Offer to find Thierry")) {
 		case 1:
 			mes "[Euslan]";
 			mes "Thierry... ^333333*Sob*^000000";
@@ -6914,7 +6241,6 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "^333333*Cough Cough*^000000";
 			set hg_ma1,2;
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "...Are you really willing to";
@@ -6954,14 +6280,11 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "know as soon as you can,";
 			mes "okay? Thanks for cheering";
 			mes "me up, "+strcharinfo(0)+".";
-			setquest 8044;
 			set hg_ma1,3;
+			setquest 8044;
 			close;
-		break;
 		}
-	}
-	else if(hg_ma1 == 2)
-	{
+	} else if (hg_ma1 == 2) {
 		mes "[Euslan]";
 		mes "I've just been waiting here";
 		mes "for my fiancee to return, but";
@@ -6978,8 +6301,7 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "is he? ^333333*Sniff*^000000 Where's my";
 		mes "Thierry? I want to see him...";
 		next;
-		switch( select( "Leave her alone:Offer to find Thierry" ) )
-		{
+		switch(select("Leave her alone:Offer to find Thierry")) {
 		case 1:
 			mes "[Euslan]";
 			mes "Thierry... ^333333*Sob*^000000";
@@ -6988,7 +6310,6 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "I'm so worried...";
 			mes "^333333*Cough Cough*^000000";
 			close;
-		break;
 		case 2:
 			mes "[Euslan]";
 			mes "...Are you really willing to";
@@ -7028,23 +6349,18 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "know as soon as you can,";
 			mes "okay? Thanks for cheering";
 			mes "me up, "+strcharinfo(0)+".";
-			setquest 8044;
 			set hg_ma1,3;
+			setquest 8044;
 			close;
-		break;
 		}
-	}
-	else if(hg_ma1 == 3 || hg_ma1 == 4)
-	{
+	} else if (hg_ma1 == 3 || hg_ma1 == 4) {
 		mes "^333333Euslan is still patiently";
 		mes "waiting for Thierry's return.";
 		mes "You should keep your promise";
 		mes "to her by asking the crewmen on";
 		mes "the Schwaltvalt Republic domestic flights about Euslan's fiancee.^000000";
 		close;
-	}
-	else if(hg_ma1 == 5)
-	{
+	} else if (hg_ma1 == 5) {
 		mes "[Euslan]";
 		mes "Oh, you're back!";
 		mes "^333333*Cough*^000000 Maybe it's too";
@@ -7052,7 +6368,7 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "you learn anything about";
 		mes "where my fiancee might be?";
 		next;
-		menu "Well, I met Kaci on the Airship.",-;
+		select("Well, I met Kaci on the Airship.");
 		mes "[Euslan]";
 		mes "Oh, Kaci works on the";
 		mes "Airship? It's been so long";
@@ -7092,12 +6408,10 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "of your way. Still, I'd really";
 		mes "appreciate your help if you";
 		mes "happen to pass through Hugel.";
-		changequest 8046,8047;
 		set hg_ma1,6;
+		changequest 8046,8047;
 		close;
-	}
-	else if(hg_ma1 == 6 || hg_ma1 == 7)
-	{
+	} else if (hg_ma1 == 6 || hg_ma1 == 7) {
 		mes "[Euslan]";
 		mes "If you get the chance,";
 		mes "please visit my brother";
@@ -7105,17 +6419,13 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "him where my Thierry might be.";
 		mes "Thank you again for your kindness. ^FFFFFF ^000000";
 		close;
-	}
-	else if(hg_ma1 == 8 || hg_ma1 == 9 || hg_ma1 == 10 || hg_ma1 == 11)
-	{
+	} else if (hg_ma1 == 8 || hg_ma1 == 9 || hg_ma1 == 10 || hg_ma1 == 11) {
 		mes "^3355FFEuslan is waiting for";
 		mes "you to bring her news from";
 		mes "her fiancee Thierry. You better";
 		mes "go back to Hugel to find him.";
 		close;
-	}
-	else if(hg_ma1 == 12)
-	{
+	} else if (hg_ma1 == 12) {
 		mes "[Euslan]";
 		mes "Oh, you've returned!";
 		mes "^333333*Cough*^000000 Were you able to";
@@ -7152,14 +6462,15 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "your safety in your adventures.";
 		mes "Take care of yourself...";
 		close2;
-		completequest 8052;
 		set hg_ma1,13;
+		completequest 8052;
 		specialeffect EF_ABSORBSPIRITS;
-		getexp 90000,60000;
+		if (checkre(3))
+			getexp 90000,60000;
+		else
+			getexp 900000,600000;
 		end;
-	}
-	else if(hg_ma1 == 13)
-	{
+	} else if (hg_ma1 == 13) {
 		mes "^3355FFEuslan is still waiting";
 		mes "for her fiancee to return";
 		mes "home, but she appears";
@@ -7170,17 +6481,16 @@ yuno,111,156,3	script	Euslan	90,{
 	
 }
 
-que_bingo,49,12,0	script	#Hg_Quest	139,4,4,{
+que_bingo,49,12,0	script	#Hg_Quest	HIDDEN_WARP_NPC,4,4,{
 OnTouch:
-	if(hg_ma1 == 6)
-	{
+	if (hg_ma1 == 6) {
 		mes "[Arcade Owner]";
 		mes "Welcome to the";
 		mes "Bingo Game Arcade.";
 		mes "Would you like to";
 		mes "play a game?";
 		next;
-		menu "I want to meet the game coordinator.",-;
+		select("I want to meet the game coordinator.");
 		mes "[Arcade Owner]";
 		mes "I'm sorry, but if he's on";
 		mes "duty, we can't really let you";
@@ -7192,10 +6502,8 @@ OnTouch:
 	}
 }
 
-que_bingo,53,190,7	script	Eukran	778,{
-
-	if(hg_ma1 == 6)
-	{
+que_bingo,53,190,7	script	Eukran	4_M_TWTEAMAN,{
+	if (hg_ma1 == 6) {
 		mes "[Eukran]";
 		mes "Oh, weren't you just";
 		mes "in the bingo room?";
@@ -7203,7 +6511,7 @@ que_bingo,53,190,7	script	Eukran	778,{
 		mes "the game. Now, can";
 		mes "I help you with anything?";
 		next;
-		menu "Talk about Euslan",-;
+		select("Talk about Euslan");
 		mes "^3355FFYou tell Eukran about his";
 		mes "sister's illness, and that";
 		mes "she has sent you to search";
@@ -7232,18 +6540,17 @@ que_bingo,53,190,7	script	Eukran	778,{
 		mes "would Thierry go to such a";
 		mes "dangerous place? No one goes^FFFFFF ^000000 to the Odin Shrine for no reason.";
 		close2;
-		changequest 8047,8048;
 		set hg_ma1,8;
+		changequest 8047,8048;
 		warp "que_bingo",37,24;
 		end;
 	}
 	
 }
 
-odin_tem01,129,127,0	script	HiddenActivator#Hugel	139,3,3,{
+odin_tem01,129,127,0	script	HiddenActivator#Hugel	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
-	if(hg_ma1 == 8)
-	{
+	if (hg_ma1 == 8) {
 		mes "^3355FFYou can hear two";
 		mes "people talking to";
 		mes "each other a short";
@@ -7292,9 +6599,7 @@ OnTouch:
 		enablenpc "Young Man#Hu_Quest";
 		initnpctimer;
 		end;
-	}
-	else if(hg_ma1 == 9 || hg_ma1 == 10 || hg_ma1 == 11)
-	{
+	} else if (hg_ma1 == 9 || hg_ma1 == 10 || hg_ma1 == 11) {
 		enablenpc "Young Man#Hu_Quest";
 		initnpctimer;
 		end;
@@ -7311,17 +6616,15 @@ OnInit:
 
 }
 
-odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
-
-	if(hg_ma1 == 8)
-	{
+odin_tem01,130,134,4	script	Young Man#Hu_Quest	4_M_TWBOY,{
+	if (hg_ma1 == 8) {
 		mes "[Young Man]";
 		mes "Hm? Oh, an adventurer.";
 		mes "There's more and more";
 		mes "of you coming to visit this";
 		mes "Odin Shrine nowadays.";
 		next;
-		menu "Mr. Thierry?",-;
+		select("Mr. Thierry?");
 		mes "[Thierry]";
 		mes "...?!";
 		mes "H-how do you";
@@ -7329,7 +6632,7 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "Do I know you";
 		mes "from somewhere?";
 		next;
-		menu "Tell him about Euslan",-;
+		select("Tell him about Euslan");
 		mes "[Thierry]";
 		mes "Oh, Euslan sent you to me?";
 		mes "I'm so sorry that you had to";
@@ -7337,7 +6640,7 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "Still, I'm glad to hear from her. Please let her know that I'm";
 		mes "coming home soon, would you?";
 		next;
-		menu "What are you doing here?",-;
+		select("What are you doing here?");
 		mes "[Thierry]";
 		mes "Well, um, I'm sorry.";
 		mes "I can't really go into the";
@@ -7346,12 +6649,10 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "Euslan's disease. It's not";
 		mes "curable by modern medicine...";
 		close2;
-		changequest 8048,8049;
 		set hg_ma1,9;
+		changequest 8048,8049;
 		end;
-	}
-	else if(hg_ma1 == 9)
-	{
+	} else if (hg_ma1 == 9) {
 		mes "[Thierry]";
 		mes "I can't tell you more";
 		mes "than that. Please just";
@@ -7360,16 +6661,14 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "Euslan that I should be";
 		mes "coming home very soon?";
 		close;
-	}
-	else if(hg_ma1 == 10)
-	{
+	} else if (hg_ma1 == 10) {
 		mes "[Thierry]";
 		mes "Oh, I thought you";
 		mes "already left Odin Shrine.";
 		mes "You don't have anything ";
 		mes "else to tell me, do you?";
 		next;
-		menu "Warn Thierry about Suspicious Men",-;
+		select("Warn Thierry about Suspicious Men");
 		mes "[Thierry]";
 		mes "What?! It's just what";
 		mes "I thought! They were just";
@@ -7479,14 +6778,11 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "If they get me, I'll never be";
 		mes "able to make the medicine!";
 		close2;
-		changequest 8050,8051;
 		set hg_ma1,11;
+		changequest 8050,8051;
 		end;
-	}
-	else if(hg_ma1 == 11)
-	{
-		if(countitem(7511) < 5)
-		{
+	} else if (hg_ma1 == 11) {
+		if (countitem(7511) < 5) {
 			mes "[Thierry]";
 			mes "I understand that gathering";
 			mes "materials here in the Odin";
@@ -7534,13 +6830,11 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "medicine that Thierry";
 		mes "has made to give to Euslan.^000000";
 		close2;
-		delitem 7511,5; //Darkness rune
-		changequest 8051,8052;
+		delitem 7511,5; //Rune_Of_Darkness
 		set hg_ma1,12;
+		changequest 8051,8052;
 		end;
-	}
-	else if(hg_ma1 == 12)
-	{
+	} else if (hg_ma1 == 12) {
 		mes "[Thierry]";
 		mes "Please give that";
 		mes "medicine to Euslan as";
@@ -7549,9 +6843,7 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "her know that I'm coming";
 		mes "home as soon as I can.";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Researcher]";
 		mes "I'm sorry, Euslan...";
 		mes "Please just wait for";
@@ -7562,10 +6854,9 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 	
 }
 
-odin_tem01,111,144,0	script	HiddenHugel	139,2,2,{
+odin_tem01,111,144,0	script	HiddenHugel	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
-	if(hg_ma1 == 9)
-	{
+	if (hg_ma1 == 9) {
 		mes "^3355FFYou hear the voice of";
 		mes "the suspicious man that";
 		mes "was speaking to Thierry";
@@ -7592,18 +6883,16 @@ OnTouch:
 		mes "you better go tell him";
 		mes "about this right now!^000000";
 		close2;
-		changequest 8049,8050;
 		set hg_ma1,10;
+		changequest 8049,8050;
 		end;
 	}
 }
 
-// Cow Milking Quest
+// Cow Milking Quest :: hg_milkingcow
 //============================================================
-hugel,56,104,3	script	Kurupe	709,3,3,{
-
-	if(hg_milk == 1)
-	{
+hugel,56,104,3	script	Kurupe	4_M_SEAMAN,3,3,{
+	if (hg_milk == 1) {
 		mes "[Kurupe]";
 		mes "Could Burupu be hiding";
 		mes "from me again? He's been";
@@ -7620,32 +6909,29 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "Burupu for me, I'll be sure";
 		mes "to pay you for your effort.";
 		next;
-		switch( select( "Sure.","Sorry, I'm busy." ) )
-		{
-			case 1:
-				mes "[Kurupe]";
-				mes "Thank you, you're a";
-				mes "lifesaver! I need to get the";
-				mes "milk delivered by tomorrow,";
-				mes "so I really need Burupu back!";
-				mes "You should be able to find him";
-				mes "somewhere just outside of town.";
-				set hg_milk,2;
-				close;
-			
-			case 2:
-				mes "[Kurupe]";
-				mes "N-no...!";
-				mes "If I can't find";
-				mes "Burupu, then there's no";
-				mes "way I'd be able to deliver";
-				mes "the milk orders by tomorrow!";
-				mes "Great, what am I gonna do?";
-				close;
+		switch(select("Sure.:Sorry, I'm busy.")) {
+		case 1:
+			mes "[Kurupe]";
+			mes "Thank you, you're a";
+			mes "lifesaver! I need to get the";
+			mes "milk delivered by tomorrow,";
+			mes "so I really need Burupu back!";
+			mes "You should be able to find him";
+			mes "somewhere just outside of town.";
+			set hg_milk,2;
+			setquest 12040;
+			close;
+		case 2:
+			mes "[Kurupe]";
+			mes "N-no...!";
+			mes "If I can't find";
+			mes "Burupu, then there's no";
+			mes "way I'd be able to deliver";
+			mes "the milk orders by tomorrow!";
+			mes "Great, what am I gonna do?";
+			close;
 		}
-	}
-	else if(hg_milk > 1 && hg_milk < 5)
-	{
+	} else if (hg_milk > 1 && hg_milk < 5) {
 		mes "[Kurupe]";
 		mes "Burupu, I need you";
 		mes "to come to work! Maybe";
@@ -7654,9 +6940,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "of town. I hope you can find";
 		mes "that lazy guy for me...";
 		close;
-	}
-	else if(hg_milk == 5)
-	{
+	} else if (hg_milk == 5) {
 		mes "[Kurupe]";
 		mes "Burupu is making demands?!";
 		mes "I guess I don't have a choice.";
@@ -7665,9 +6949,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "Why does Burupu want to become";
 		mes "a Swordman so much, huh?";
 		close;
-	}
-	else if(hg_milk == 6)
-	{
+	} else if (hg_milk == 6) {
 		mes "[Kurupe]";
 		mes "Oh, you're going to";
 		mes "help me milk the cow?";
@@ -7677,9 +6959,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "some delicious milk~";
 		set hg_milk,7;
 		close;
-	}
-	else if(hg_milk == 7)
-	{
+	} else if (hg_milk == 7) {
 		mes "[Kurupe]";
 		mes "Hmm, how about this?";
 		mes "If you can actually milk";
@@ -7688,9 +6968,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "that sound fair? Anyway,";
 		mes "please get to work soon~";
 		close;
-	}
-	else if(hg_milk == 8)
-	{
+	} else if (hg_milk == 8) {
 		mes "[Kurupe]";
 		mes "Great! Now that you've";
 		mes "milked Booboo, I can go";
@@ -7699,8 +6977,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "something to eat as my way";
 		mes "of saying, ''Thanks a lot~''";
 		next;
-		if(checkweight(12063,3) != 1)
-		{
+		if (checkweight(12063,3) != 1) {
 			mes "[Kurupe]";
 			mes "Wait a minute!";
 			mes "Currently you are carrying";
@@ -7711,8 +6988,9 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		}
 		set hg_milk,9;
 		specialeffect2 EF_CONE;
-		getexp 10000,0;
+		getexp (checkre(3))?10000:100000,0;
 		getitem 12063,3;
+		erasequest 12043;
 		mes "[Kurupe]";
 		mes "I always need";
 		mes "someone to help me";
@@ -7721,9 +6999,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "like doing it, so please come";
 		mes "by and help me when you can~";
 		close;
-	}
-	else if(hg_milk == 9)
-	{
+	} else if (hg_milk == 9) {
 		mes "[Kurupe]";
 		mes "Oh, it's you again!";
 		mes "Did you want to help me";
@@ -7731,56 +7007,49 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "cow? I can always use a";
 		mes "dependable person like you.";
 		next;
-		switch( select( "Sure, I'll milk Booboo.","What'll pay me this time?","Nah, just dropping by." ) )
-		{
-			case 1:
-				mes "[Kurupe]";
-				mes "Great, great! If you want";
-				mes "to milk Booboo, first tell";
-				mes "Burupu that he doesn't need";
-				mes "to come in today, and then";
-				mes "come back to me. Then, I'll";
-				mes "let you milk Booboo the cow.";
-				set hg_milk,10;
-				close;
-			
-			case 2:
-				mes "[Kurupe]";
-				mes "Let's see...";
-				mes "Milk Booboo for me this";
-				mes "time, and I'll randomly";
-				mes "choose one of the following";
-				mes "sets of rewards to give you.";
-				next;
-				mes "1 set of 5 Milk,";
-				mes "1 set of 3 Honey,";
-				mes "1 set of 5 Orange Potions,";
-				mes "1 set of Yellow Potions, or";
-				mes "1 Bundle of Food. Hmmm...";
-				mes "That sounds fair, right?";
-				close;
-			
-			case 3:
-				mes "[Kurupe]";
-				mes "Ahahahah, it's good";
-				mes "to see you! Now, don't";
-				mes "be a stranger, alright?";
-				mes "Burupu could learn a";
-				mes "couple things from you...";
-				close;
+		switch(select("Sure, I'll milk Booboo.:What'll pay me this time?:Nah, just dropping by.")) {
+		case 1:
+			mes "[Kurupe]";
+			mes "Great, great! If you want";
+			mes "to milk Booboo, first tell";
+			mes "Burupu that he doesn't need";
+			mes "to come in today, and then";
+			mes "come back to me. Then, I'll";
+			mes "let you milk Booboo the cow.";
+			set hg_milk,10;
+			close;
+		case 2:
+			mes "[Kurupe]";
+			mes "Let's see...";
+			mes "Milk Booboo for me this";
+			mes "time, and I'll randomly";
+			mes "choose one of the following";
+			mes "sets of rewards to give you.";
+			next;
+			mes "1 set of 5 Milk,";
+			mes "1 set of 3 Honey,";
+			mes "1 set of 5 Orange Potions,";
+			mes "1 set of Yellow Potions, or";
+			mes "1 Bundle of Food. Hmmm...";
+			mes "That sounds fair, right?";
+			close;
+		case 3:
+			mes "[Kurupe]";
+			mes "Ahahahah, it's good";
+			mes "to see you! Now, don't";
+			mes "be a stranger, alright?";
+			mes "Burupu could learn a";
+			mes "couple things from you...";
+			close;
 		}
-	}
-	else if(hg_milk == 10)
-	{
+	} else if (hg_milk == 10) {
 		mes "[Kurupe]";
 		mes "For now, go talk";
 		mes "to Burupu and let him";
 		mes "know that he doesn't need";
 		mes "to come into work today~";
 		close;
-	}
-	else if(hg_milk == 11)
-	{
+	} else if (hg_milk == 11) {
 		mes "[Kurupe]";
 		mes "Ah, you spoke to";
 		mes "Burupu already? Good,";
@@ -7789,17 +7058,13 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "Thanks once again~";
 		set hg_milk,12;
 		close;
-	}
-	else if(hg_milk == 12)
-	{
+	} else if (hg_milk == 12) {
 		mes "[Kurupe]";
 		mes "Please go and milk";
 		mes "Booboo the cow as";
 		mes "soon as you can, okay?";
 		close;
-	}
-	else if(hg_milk == 13)
-	{
+	} else if (hg_milk == 13) {
 		mes "[Kurupe]";
 		mes "Ah, you've done a good";
 		mes "job of milking Booboo the";
@@ -7808,8 +7073,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		mes "give you as payment. Hmm...";
 		next;
 		set .@milkreward,rand(1,10);
-		if (.@milkreward < 5)
-		{
+		if (.@milkreward < 5) {
 			mes "[Kurupe]";
 			mes "You know what?";
 			mes "Why don't you have";
@@ -7817,8 +7081,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 			mes "fitting, after all. Besides,";
 			mes "it's really good for you!";
 			mes "Thanks again for your help~";
-			if(checkweight(519,5) != 1)
-			{
+			if (checkweight(519,5) != 1) {
 				next;
 				mes "[Kurupe]";
 				mes "Wait a minute!";
@@ -7829,19 +7092,17 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 519,5;
+			erasequest 12043;
+			getitem 519,5; //Milk
 			close;
-		}
-		else if(.@milkreward > 4 && .@milkreward < 8)
-		{
+		} else if (.@milkreward > 4 && .@milkreward < 8) {
 			mes "[Kurupe]";
 			mes "Ah, I've got it!";
 			mes "You like Orange Potions,";
 			mes "right? Come on, you looove";
 			mes "Orange Potions! Here, you can";
 			mes "have a bunch as my way of saying thanks for milking Booboo the cow~";
-			if(checkweight(502,5) != 1)
-			{
+			if (checkweight(502,5) != 1) {
 				next;
 				mes "[Kurupe]";
 				mes "Wait a minute!";
@@ -7852,11 +7113,10 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 502,5;
+			erasequest 12043;
+			getitem 502,5; //Orange_Potion
 			close;
-		}
-		else if(.@milkreward > 7 && .@milkreward < 10)
-		{
+		} else if (.@milkreward > 7 && .@milkreward < 10) {
 			mes "[Kurupe]";
 			mes "Oooh, I could give you";
 			mes "some Yellow Potions, Yes,";
@@ -7864,8 +7124,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 			mes "take these Yellow Potions";
 			mes "as a token of my gratitude";
 			mes "for milking old Booboo.";
-			if(checkweight(503,5) != 1)
-			{
+			if (checkweight(503,5) != 1) {
 				next;
 				mes "[Kurupe]";
 				mes "Wait a minute!";
@@ -7876,14 +7135,12 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 503,5;
+			erasequest 12043;
+			getitem 503,5; //Yellow_Potion
 			close;
-		}
-		else
-		{
+		} else {
 			set .@milkreward,rand(1,10);
-			if (.@milkreward < 7)
-			{
+			if (.@milkreward < 7) {
 				mes "[Kurupe]";
 				mes "Hey, why don't you";
 				mes "take some fresh Honey?";
@@ -7891,8 +7148,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				mes "it's everything you could";
 				mes "ever want! Thanks for";
 				mes "milking Booboo for me~";
-				if(checkweight(518,3) != 1)
-				{
+				if (checkweight(518,3) != 1) {
 					next;
 					mes "[Kurupe]";
 					mes "Wait a minute!";
@@ -7903,7 +7159,8 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 					close;
 				}
 				set hg_milk,9;
-				getitem 518,3;
+				erasequest 12043;
+				getitem 518,3; //Honey
 				close;
 			}
 			mes "[Kurupe]";
@@ -7913,8 +7170,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 			mes "remember what I packed in";
 			mes "here, but I'm sure it tastes";
 			mes "good, and it's good for you~";
-			if(checkweight(12111,1) != 1)
-			{
+			if (checkweight(12111,1) != 1) {
 				next;
 				mes "[Kurupe]";
 				mes "Wait a minute!";
@@ -7925,12 +7181,11 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 12111,1;
+			erasequest 12043;
+			getitem 12111,1; //Food_Package
 			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Kurupe]";
 		mes "Aww, nuts...!";
 		mes "I've got so many";
@@ -7941,10 +7196,8 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 	}
 
 OnTouch:
-	if (BaseLevel > 49)
-	{
-		if(!hg_milk)
-		{
+	if (BaseLevel > 49) {
+		if (!hg_milk) {
 			mes "[Kurupe]";
 			mes "Oh no, what am I gonna";
 			mes "do?! I need to deliver the";
@@ -7970,10 +7223,8 @@ OnTouch:
 	close;
 }
 
-hu_fild06,217,270,3	script	Burupu	896,3,3,{
-
-	if (hg_milk == 3)
-	{
+hu_fild06,217,270,3	script	Burupu	4_M_HUBOY,3,3,{
+	if (hg_milk == 3) {
 		mes "[Burupu]";
 		mes "What? Kurupe wants me";
 		mes "to come in to work again?";
@@ -7990,9 +7241,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "my destiny! Forget ranching,^FFFFFF ^000000 I'm gonna wield a frickin' sword!";
 		set hg_milk,4;
 		close;
-	}
-	else if(hg_milk == 4)
-	{
+	} else if (hg_milk == 4) {
 		mes "[Burupu]";
 		mes "Hey, that equipment of";
 		mes "yours looks plenty expensive.";
@@ -8008,8 +7257,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "equipment. Let's see... Why not";
 		mes "give me 1 Rapier with 2 Slots?^FFFFFF ^000000 That's not too much to ask, right?";
 		next;
-		switch( select( "Alright.","Whoa, that's too much!" ) )
-		{
+		switch(select("Alright.:Whoa, that's too much!")) {
 			case 1:
 				mes "[Burupu]";
 				mes "I'm glad you agree~";
@@ -8018,6 +7266,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 				mes "as soon as you can! I can't";
 				mes "wait to start training with it!";
 				set hg_milk,5;
+				changequest 12040,12041;
 				close;
 
 			case 2:
@@ -8028,11 +7277,8 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 				mes "that I really want...";
 				close;
 		}
-	}
-	else if(hg_milk == 5)
-	{
-		if (!countitem(1110))
-		{
+	} else if (hg_milk == 5) {
+		if (!countitem(1110)) {
 			mes "[Burupu]";
 			mes "Hey, weren't you";
 			mes "supposed to bring me";
@@ -8049,8 +7295,9 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "2 Slots and everything!";
 		mes "I'm gonna start training";
 		mes "with it right now!";
-		delitem 1110,1;
+		delitem 1110,1; //Lapier
 		set hg_milk,6;
+		changequest 12041,12042;
 		next;
 		mes "[Burupu]";
 		mes "You know what?";
@@ -8073,9 +7320,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "instructions. Oh, and";
 		mes "thanks again for the Rapier~";
 		close;
-	}
-	else if(hg_milk == 10)
-	{
+	} else if (hg_milk == 10) {
 		mes "[Burupu]";
 		mes "Hmm? You wanna milk";
 		mes "Booboo today? Great,";
@@ -8085,9 +7330,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "completely on my training!";
 		set hg_milk,11;
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Burupu]";
 		mes "I'm gonna become the";
 		mes "best Swordman in the";
@@ -8099,8 +7342,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 	}
 
 OnTouch:
-	if (hg_milk == 2)
-	{
+	if (hg_milk == 2) {
 		mes "[Burupu]";
 		mes "Heeeyah!";
 		mes "Yaaaaaaaah!";
@@ -8116,9 +7358,7 @@ OnTouch:
 		set hg_milk,3;
 		emotion e_an,0;
 		close;
-	}
-	else if(hg_milk == 5)
-	{
+	} else if (hg_milk == 5) {
 		mes "[Burupu]";
 		mes "Heeeyah!";
 		mes "Yaaaaaaaah!";
@@ -8128,10 +7368,8 @@ OnTouch:
 	}
 }
 
-hugel,72,101,0	script	Burupu's Instructions	111,{
-
-	if (hg_milk < 6)
-	{
+hugel,72,101,0	script	Burupu's Instructions	HIDDEN_NPC,{
+	if (hg_milk < 6) {
 		mes "^3355FFYou've found a small^000000";
 		mes "^3355FFnotebook on the ground.^000000";
 		close;
@@ -8149,127 +7387,124 @@ hugel,72,101,0	script	Burupu's Instructions	111,{
 	mes "Chapter 2: How to Treat Booboo";
 	mes "Chapter 3: Before You Begin";
 	next;
-	switch( select( "Chapter 1","Chapter 2","Chapter 3" ) )
-	{
+	switch(select("Chapter 1:Chapter 2:Chapter 3")) {
+	case 1:
+		mes "[Chapter 1]";
+		mes "Booboo is a very emotionally";
+		mes "sensitive cow that expresses";
+		mes "herself through the power of";
+		mes "song. You must listen to her";
+		mes "song, determine how she feels,";
+		mes "and then comb her just right.";
+		next;
+		mes "[Chapter 1]";
+		mes "Basically, depending on";
+		mes "how Booboo feels, you must";
+		mes "give her the number of brush";
+		mes "strokes that correspond to";
+		mes "her song. I'll explain more";
+		mes "about that in Chapter 2.";
+		break;
+	case 2:
+		mes "[Chapter 2 Contents]";
+		mes " ";
+		mes "Part 1: How to Respond to";
+		mes "Booboo the Cow's Feelings";
+		mes "Part 2: Booboo's Songs";
+		next;
+		switch(select("Part 1:Part 2")) {
 		case 1:
-			mes "[Chapter 1]";
-			mes "Booboo is a very emotionally";
-			mes "sensitive cow that expresses";
-			mes "herself through the power of";
-			mes "song. You must listen to her";
-			mes "song, determine how she feels,";
-			mes "and then comb her just right.";
-			next;
-			mes "[Chapter 1]";
-			mes "Basically, depending on";
-			mes "how Booboo feels, you must";
-			mes "give her the number of brush";
-			mes "strokes that correspond to";
-			mes "her song. I'll explain more";
-			mes "about that in Chapter 2.";
-			close;
-	
+			mes "[Chapter 2, Part 1]";
+			mes "Booboo the Cow usually";
+			mes "expresses five different";
+			mes "feelings through her songs:";
+			mes "these are joy, sadness, anger,";
+			mes "love, and neutral contentment.";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "^800080She is so happy^000000!";
+			mes "When Booboo the Cow";
+			mes "feels joy, then you go";
+			mes "ahead and brush her";
+			mes "hair 3 times before";
+			mes "you can milk her.";
+			mes "^800080 3 times^000000.";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "^800080She is as usual^000000.";
+			mes "When she feels so-so, you need to";
+			mes "comb her hair ^800080 5 times^000000.";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "If Booboo the cow feels";
+			mes "sad, then you need to make";
+			mes "her feel more loved. How";
+			mes "do you do this? Just brush";
+			mes "her hair at least 10 times.";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "Now, remember that when";
+			mes "Booboo the cow is angry,";
+			mes "you shouldn't touch her";
+			mes "at all. Just say, ''No!'' to";
+			mes "brushing her hair, okay?";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "If you happen to see";
+			mes "Booboo the cow in love,";
+			mes "then just brush her hair";
+			mes "once. Just look for the";
+			mes "hearts, and you'll know";
+			mes "that she's in love, okay?";
+			next;
+			mes "[Chapter 2, Part 1]";
+			mes "Whenever Booboo the";
+			mes "cow is just feeling";
+			mes "neutral contentment,";
+			mes "then just brush her";
+			mes "5 times. That's all~";
+			break;
 		case 2:
-			mes "[Chapter 2 Contents]";
-			mes " ";
-			mes "Part 1: How to Respond to";
-			mes "Booboo the Cow's Feelings";
-			mes "Part 2: Booboo's Songs";
-			next;
-			switch( select( "Part 1","Part 2" ) )
-			{
-				case 1:
-					mes "[Chapter 2, Part 1]";
-					mes "Booboo the Cow usually";
-					mes "expresses five different";
-					mes "feelings through her songs:";
-					mes "these are joy, sadness, anger,";
-					mes "love, and neutral contentment.";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "^800080She is so happy^000000!";
-					mes "When Booboo the Cow";
-					mes "feels joy, then you go";
-					mes "ahead and brush her";
-					mes "hair 3 times before";
-					mes "you can milk her.";
-					mes "^800080 3 times^000000.";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "^800080She is as usual^000000.";
-					mes "When she feels so-so, you need to";
-					mes "comb her hair ^800080 5 times^000000.";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "If Booboo the cow feels";
-					mes "sad, then you need to make";
-					mes "her feel more loved. How";
-					mes "do you do this? Just brush";
-					mes "her hair at least 10 times.";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "Now, remember that when";
-					mes "Booboo the cow is angry,";
-					mes "you shouldn't touch her";
-					mes "at all. Just say, ''No!'' to";
-					mes "brushing her hair, okay?";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "If you happen to see";
-					mes "Booboo the cow in love,";
-					mes "then just brush her hair";
-					mes "once. Just look for the";
-					mes "hearts, and you'll know";
-					mes "that she's in love, okay?";
-					next;
-					mes "[Chapter 2, Part 1]";
-					mes "Whenever Booboo the";
-					mes "cow is just feeling";
-					mes "neutral contentment,";
-					mes "then just brush her";
-					mes "5 times. That's all~";
-					close;
-				
-				case 2:
-					mes "[Chapter 2, Part 2]";
-					mes "Booboo the cow will";
-					mes "always sing this song.";
-					mes "Keep these sounds in";
-					mes "mind when she sings them...";
-					next;
-					mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
-					mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
-					mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
-					mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
-					mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
-					mes "^0000ffBoo! B! Boo~^000000";
-					next;
-					mes "[Chapter 2, Part 2]";
-					mes "When you try to milk";
-					mes "Booboo, she will sing this";
-					mes "song with a slight difference.";
-					mes "Look for the difference in";
-					mes "Booboo's song, and then";
-					mes "hum the correvt word to her.";
-					close;
-			}
-		
-		case 3:
-			mes "[Chapter 3]";
-			mes "If you want to milk";
-			mes "Booboo the cow, you";
-			mes "must first get permission";
-			mes "from Kurupe. You will also";
-			mes "need 3 Concentration Potions";
-			mes "to insert into Booboo's comb.";
-			close;
+			mes "[Chapter 2, Part 2]";
+			mes "Booboo the cow will";
+			mes "always sing this song.";
+			mes "Keep these sounds in";
+			mes "mind when she sings them...";
+			next;
+			mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
+			mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
+			mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
+			mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
+			mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
+			mes "^0000ffBoo! B! Boo~^000000";
+			next;
+			mes "[Chapter 2, Part 2]";
+			mes "When you try to milk";
+			mes "Booboo, she will sing this";
+			mes "song with a slight difference.";
+			mes "Look for the difference in";
+			mes "Booboo's song, and then";
+			mes "hum the correct word to her.";
+			break;
+		}
+		break;
+	case 3:
+		mes "[Chapter 3]";
+		mes "If you want to milk";
+		mes "Booboo the cow, you";
+		mes "must first get permission";
+		mes "from Kurupe. You will also";
+		mes "need 3 Concentration Potions";
+		mes "to insert into Booboo's comb.";
+		break;
 	}
+	close2;
+	if (checkquest(12042) > -1) erasequest 12042;
+	end;
 }
 
-hugel,68,99,3	script	Booboo the Cow	889,{
-
-	if (hg_milk == 7 || hg_milk == 12)
-	{
+hugel,68,99,3	script	Booboo the Cow	4_BULL,{
+	if (hg_milk == 7 || hg_milk == 12) {
 		mes "[Booboo]";
 		mes "Boop boop boo~";
 		mes "Booboo Boop boo!";
@@ -8279,33 +7514,31 @@ hugel,68,99,3	script	Booboo the Cow	889,{
 		mes "has something that";
 		mes "she wants to tell you.^000000";
 		next;
-		switch( select( "Attempt to Milk Booboo","It's not the right time!" ) )
-		{
-			case 1:
-				if(countitem(645) > 2)
-				{
-					set @cowsong1,rand(1,5);
-					if (@cowsong1 == 1) callfunc "Func_MilkCow","cow_01.wav",3;
-					else if(@cowsong1 == 2) callfunc "Func_MilkCow","cow_02.wav",5;
-					else if(@cowsong1 == 3) callfunc "Func_MilkCow","cow_03.wav",10;
-					else if(@cowsong1 == 4) callfunc "Func_MilkCow","cow_04.wav",0;
-					else if(@cowsong1 == 5) callfunc "Func_MilkCow","cow_05.wav",1;
-					end;
+		switch(select("Attempt to Milk Booboo:It's not the right time!")) {
+		case 1:
+			if (countitem(645) > 2) {
+				switch(rand(1,5)) {
+					case 1: callsub L_MilkCow,"cow_01.wav",3; break;
+					case 2: callsub L_MilkCow,"cow_02.wav",5; break;
+					case 3: callsub L_MilkCow,"cow_03.wav",10; break;
+					case 4: callsub L_MilkCow,"cow_04.wav",0; break;
+					case 5: callsub L_MilkCow,"cow_05.wav",1; break;
 				}
-				mes "^3355FFTo use this comb to";
-				mes "brush Booboo the cow,";
-				mes "you will need to insert";
-				mes "3 Concentration Potions.";
-				mes "You can only brush Booboo";
-				mes "with this luxurious magic comb.^000000";
-				close;
-				
-			case 2:
-				mes "^3355FFMaybe you should learn more";
-				mes "about Booboo the cow, and";
-				mes "get more information before";
-				mes "you can attempt to milk her.^000000";
-				close;
+				end;
+			}
+			mes "^3355FFTo use this comb to";
+			mes "brush Booboo the cow,";
+			mes "you will need to insert";
+			mes "3 Concentration Potions.";
+			mes "You can only brush Booboo";
+			mes "with this luxurious magic comb.^000000";
+			close;
+		case 2:
+			mes "^3355FFMaybe you should learn more";
+			mes "about Booboo the cow, and";
+			mes "get more information before";
+			mes "you can attempt to milk her.^000000";
+			close;
 		}
 	}
 	mes "[Booboo]";
@@ -8313,11 +7546,8 @@ hugel,68,99,3	script	Booboo the Cow	889,{
 	mes "Boobooboo Booo~~~";
 	mes "Booboo Boop~";
 	close;
-}
-					
-function	script	Func_MilkCow	{
-
 
+L_MilkCow:
 	mes "^3355FFThis giant magic comb was";
 	mes "specially ordered from Geffen's";
 	mes "Magic Academy. It is designed";
@@ -8330,7 +7560,7 @@ function	script	Func_MilkCow	{
 	mes "into the comb, it begins";
 	mes "to chime, and Booboo the";
 	mes "cow beings to express her^FFFFFF ^3355FF feelings in the center of Hugel.^000000";
-	delitem 645,3;
+	delitem 645,3; //Center_Potion
 	soundeffect ""+getarg(0)+"",0;
 	next;
 	soundeffect ""+getarg(0)+"",0;
@@ -8340,9 +7570,8 @@ function	script	Func_MilkCow	{
 	mes "you need to brush her a";
 	mes "certain number of times.^000000";
 	next;
-	input @cowbrush;
-	if (@cowbrush != getarg(1))
-	{
+	input .@cowbrush;
+	if (.@cowbrush != getarg(1)) {
 		soundeffect "taming_fail.wav",0;
 		mes "^3355FFAwwww...";
 		mes "Booboo the cow looks";
@@ -8358,61 +7587,62 @@ function	script	Func_MilkCow	{
 	mes "and is singing a serenade.^000000";
 	next;
 	soundeffect "cow_06.wav",0;
-	set @cowsong2,rand(1,6);
 	mes "[Mrs. Booboo]";
-	if (@cowsong2 == 1)
-	{
+	switch(rand(1,6)) {
+	case 1:
+		set .@cowsong$,"Brrbrr";
 		mes "^ff0000Brr~ Brrboo~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~~~^000000";
-	}
-	else if (@cowsong2 == 2)
-	{
+		break;
+	case 2:
+		set .@cowsong$,"Brrrrrr";
 		mes "^ff0000Brr~ Brrboo~ Boobooboo~^000000";
 		mes "^0000ffRrrururu~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~~~^000000";
-	}
-	else if (@cowsong2 == 3)
-	{
+		break;
+	case 3:
+		set .@cowsong$,"Rrrrboo";
 		mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rurub~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~^000000";
-	}
-	else if (@cowsong2 == 4)
-	{
+		break;
+	case 4:
+		set .@cowsong$,"Boobooru";
 		mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Bbrrrr~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~^000000";
-	}
-	else if (@cowsong2 == 5)
-	{
+		break;
+	case 5:
+		set .@cowsong$,"Boobooboo";
 		mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Bbb~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! B! Boo~^000000";
-	}
-	else if (@cowsong2 == 6)
-	{
+		break;
+	case 6:
+		set .@cowsong$,"B";
 		mes "^ff0000Brr~ Brrbrr~ Boobooboo~^000000";
 		mes "^0000ffBrrrrrr~ Booboo~ Boorrboo~^000000";
 		mes "^ff0000Booruboorubrr~ Rrrrboo~^000000";
 		mes "^0000ffRrrr~ Booboorrrr~ Boobooru~^000000";
 		mes "^ff0000Boobooboo~ Rururu~ Booruboorub~^000000";
 		mes "^0000ffBoo! Boo! Boo~^000000";
+		break;
 	}
 	next;
 	mes "^3355FFHurry, respond to Booboo's song! Look for the word that is slightly";
@@ -8420,15 +7650,8 @@ function	script	Func_MilkCow	{
 	mes "song in Burupu's notes, and then tell her the correct world without";
 	mes "the tilde character (''~'').^000000";
 	next;
-	if(@cowsong2 == 1) set @cowsong$,"Brrbrr";
-	else if(@cowsong2 == 2) set @cowsong$,"Brrrrrr";
-	else if(@cowsong2 == 3) set @cowsong$,"Rrrrboo";
-	else if(@cowsong2 == 4) set @cowsong$,"Boobooru";
-	else if(@cowsong2 == 5) set @cowsong$,"Boobooboo";
-	else if(@cowsong2 == 6) set @cowsong$,"B";
-	input @cowanswer$;
-	if (@cowanswer$ == @cowsong$)
-	{
+	input .@cowanswer$;
+	if (.@cowanswer$ == .@cowsong$) {
 		soundeffect "tming_success.wav",0;
 		mes "^3355FFSuccess!";
 		mes "Booboo the cow";
@@ -8436,8 +7659,9 @@ function	script	Func_MilkCow	{
 		mes "you were able to milk";
 		mes "her. Now, you should";
 		mes "report to Kurupe.^000000";
-		if(hg_milk == 12) set hg_milk,13;
+		if (hg_milk == 12) set hg_milk,13;
 		else set hg_milk,8;
+		setquest 12043;
 		close;
 	}
 	soundeffect "taming_fail.wav",0;
@@ -8449,19 +7673,17 @@ function	script	Func_MilkCow	{
 	close;
 }
 
-// Odin Temple Excavation Quest
+// Odin Temple Excavation Quest :: hg_tem
 //============================================================
-hugel,91,152,1	script	Sign	837,{
-
+hugel,91,152,1	script	Sign	2_BULLETIN_BOARD,{
 	mes "**Recruitment Notice**";
 	mes " ";
-	if(hg_odin < 60)
-	{
+	if (hg_odin < 60) {
 		mes "We are now hiring recruits";
 		mes "for the Odin Shrine Expedition.";
 		mes " ";
 		mes "- Shrine Expedition Dept.";
-		if(!hg_odin) set hg_odin,1;
+		if (!hg_odin) set hg_odin,1;
 		close;
 	}
 	mes "Join our magician";
@@ -8472,67 +7694,58 @@ hugel,91,152,1	script	Sign	837,{
 	close;
 }
 
-hu_in01,19,161,0	script	Alex	803,{
-
-	if(!hg_odin)
-	{
+hu_in01,19,161,0	script	Alex	1_F_SIGNZISK,{
+	if (!hg_odin) {
 		mes "[Alex]";
 		mes "Whatever you're";
 		mes "trying to sell me,";
 		mes "I'm not interested!";
 		mes "Now get out of here!";
 		close;
-	}
-	else if(hg_odin == 1)
-	{
+	} else if (hg_odin == 1) {
 		cutin "hu_alex01.bmp",2;
 		mes "[Alex]";
 		mes "Huh...?";
 		mes "What do you want?";
 		next;
-		switch( select( "Excuse me...","I saw the recruitment notice and..." ) )
-		{
-			case 1:
+		switch(select("Excuse me...:I saw the recruitment notice and...")) {
+		case 1:
+			mes "[Alex]";
+			mes "Whatever you're";
+			mes "trying to sell me,";
+			mes "I'm not interested!";
+			mes "Now get out of here!";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Alex]";
+			mes "Oh, so you saw the";
+			mes "recruitment notice for the";
+			mes "Odin Shrine Expedition, eh?";
+			if (BaseLevel > 59) {
+				mes "Hmmm... Alright, you look";
+				mes "like you're strong enough.";
+				mes "Yeah, I think you qualify.";
+				next;
+			} else {
+				cutin "hu_alex02.bmp",2;
+				mes "Well, I dunno. I think that";
+				mes "kind of expedition would";
+				mes "eat you alive. No offense...";
+				next;
 				mes "[Alex]";
-				mes "Whatever you're";
-				mes "trying to sell me,";
-				mes "I'm not interested!";
-				mes "Now get out of here!";
+				mes "Look, I'll reconsider";
+				mes "whether you qualify after";
+				mes "you get train a little more,";
+				mes "develop your skills, you know,";
+				mes "get stronger. For now, though,";
+				mes "I don't think we can use you.";
 				close2;
 				cutin "",255;
 				end;
-				
-			case 2:
-				mes "[Alex]";
-				mes "Oh, so you saw the";
-				mes "recruitment notice for the";
-				mes "Odin Shrine Expedition, eh?";
-				if(BaseLevel > 59)
-				{
-					mes "Hmmm... Alright, you look";
-					mes "like you're strong enough.";
-					mes "Yeah, I think you qualify.";
-					next;
-				}
-				else
-				{
-					cutin "hu_alex02.bmp",2;
-					mes "Well, I dunno. I think that";
-					mes "kind of expedition would";
-					mes "eat you alive. No offense...";
-					next;
-					mes "[Alex]";
-					mes "Look, I'll reconsider";
-					mes "whether you qualify after";
-					mes "you get train a little more,";
-					mes "develop your skills, you know,";
-					mes "get stronger. For now, though,";
-					mes "I don't think we can use you.";
-					close2;
-					cutin "",255;
-					end;
-				}
-				break;
+			}
+			break;
 		}
 		cutin "hu_alex03.bmp",2;
 		mes "[Alex]";
@@ -8557,12 +7770,11 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "Please talk to the Boatman";
 		mes "to travel to the shrine, okay?";
 		set hg_odin,2;
+		setquest 11000;
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_odin == 2)
-	{
+	} else if (hg_odin == 2) {
 		cutin "hu_alex03.bmp",2;
 		mes "[Alex]";
 		mes "You really oughtta";
@@ -8573,9 +7785,7 @@ hu_in01,19,161,0	script	Alex	803,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_odin == 3)
-	{
+	} else if (hg_odin == 3) {
 		cutin "hu_alex01.bmp",2;
 		mes "[Alex]";
 		mes "Oh, so you've gone";
@@ -8583,73 +7793,69 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "already. So will you help";
 		mes "us in our expedition?";
 		next;
-		switch( select( "Who are the people in the next room?","Well...","Yes, I do." ) )
-		{
-			case 1:
-				cutin "hu_alex02.bmp",2;
-				mes "[Alex]";
-				mes "Oh... Them.";
-				mes "They're officially my";
-				mes "co-workers, but quite";
-				mes "frankly, they were forced";
-				mes "upon me by the Rune-Midgarts";
-				mes "Kingdom. It can't be helped...";
-				next;
-				mes "[Alex]";
-				mes "Anyway, I have to accept";
-				mes "them to help international";
-				mes "relations or something silly";
-				mes "like that. They say they're here^FFFFFF ^000000 to research religious relics,";
-				mes "but I just don't trust them.";
-				next;
-				cutin "hu_alex04.bmp",2;
-				mes "[Alex]";
-				mes "In fact, I think it's";
-				mes "obvious that they're here";
-				mes "for something else, though";
-				mes "I'm not sure what it may be.";
-				mes "And that gray haired lady...";
-				mes "She totally creeps me out!";
-				close2;
-				cutin "",255;
-				end;
-				
-			case 2:
-				mes "[Alex]";
-				mes "Yeah, well, I know";
-				mes "it might be a tough";
-				mes "decision to make. Well,";
-				mes "take your time. I understand";
-				mes "that you have to weigh the";
-				mes "risks and everything.";
-				close2;
-				cutin "",255;
-				end;
-
-			case 3:
-				mes "[Alex]";
-				mes "Great! In that case, your";
-				mes "first assignment is to bring";
-				mes "me ^3355FF5 Runes of the Darkness^000000";
-				mes "from the shrine. Don't worry,";
-				mes "I'll make sure that you're";
-				mes "rewarded for your efforts.";
-				set hg_odin,4;
-				next;
-				mes "[Alex]";
-				mes "This is your chance";
-				mes "to show me that your";
-				mes "dependability and sense";
-				mes "of responsibility. Then,";
-				mes "we can move on to the";
-				mes "more important stuff.";
-				close2;
-				cutin "",255;
-				end;
+		switch(select("Who are the people in the next room?:Well...:Yes, I do.")) {
+		case 1:
+			cutin "hu_alex02.bmp",2;
+			mes "[Alex]";
+			mes "Oh... Them.";
+			mes "They're officially my";
+			mes "co-workers, but quite";
+			mes "frankly, they were forced";
+			mes "upon me by the Rune-Midgarts";
+			mes "Kingdom. It can't be helped...";
+			next;
+			mes "[Alex]";
+			mes "Anyway, I have to accept";
+			mes "them to help international";
+			mes "relations or something silly";
+			mes "like that. They say they're here^FFFFFF ^000000 to research religious relics,";
+			mes "but I just don't trust them.";
+			next;
+			cutin "hu_alex04.bmp",2;
+			mes "[Alex]";
+			mes "In fact, I think it's";
+			mes "obvious that they're here";
+			mes "for something else, though";
+			mes "I'm not sure what it may be.";
+			mes "And that gray haired lady...";
+			mes "She totally creeps me out!";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Alex]";
+			mes "Yeah, well, I know";
+			mes "it might be a tough";
+			mes "decision to make. Well,";
+			mes "take your time. I understand";
+			mes "that you have to weigh the";
+			mes "risks and everything.";
+			close2;
+			cutin "",255;
+			end;
+		case 3:
+			mes "[Alex]";
+			mes "Great! In that case, your";
+			mes "first assignment is to bring";
+			mes "me ^3355FF5 Runes of the Darkness^000000";
+			mes "from the shrine. Don't worry,";
+			mes "I'll make sure that you're";
+			mes "rewarded for your efforts.";
+			set hg_odin,4;
+			changequest 11000,11001;
+			next;
+			mes "[Alex]";
+			mes "This is your chance";
+			mes "to show me that your";
+			mes "dependability and sense";
+			mes "of responsibility. Then,";
+			mes "we can move on to the";
+			mes "more important stuff.";
+			close2;
+			cutin "",255;
+			end;
 		}
-	}
-	else if(hg_odin == 4)
-	{
+	} else if (hg_odin == 4) {
 		cutin "hu_alex02.bmp",2;
 		mes "[Alex]";
 		mes "What are you still";
@@ -8657,35 +7863,31 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "you be headed to the";
 		mes "shrine already?";
 		next;
-		switch( select( "What was I supposed to gather?","I'm leaving, I'm leaving!" ) )
-		{
-			case 1:
-				cutin "hu_alex03.bmp",2;
-				mes "[Alex]";
-				mes "You've forgotten";
-				mes "already? I asked you";
-				mes "to bring me ^3355FF5 Runes";
-				mes "of the Darkness^000000. Okay,";
-				mes "now hurry up and get to it.";
-				close2;
-				cutin "",255;
-				end;
-
-			case 2:
-				mes "[Alex]";
-				mes "That's fine...";
-				mes "Just keep in mind that";
-				mes "we're running behind";
-				mes "schedule. If only that";
-				mes "grey haired crone wasn't";
-				mes "here... We'd be done by now!";
-				close2;
-				cutin "",255;
-				end;
+		switch(select("What was I supposed to gather?:I'm leaving, I'm leaving!")) {
+		case 1:
+			cutin "hu_alex03.bmp",2;
+			mes "[Alex]";
+			mes "You've forgotten";
+			mes "already? I asked you";
+			mes "to bring me ^3355FF5 Runes";
+			mes "of the Darkness^000000. Okay,";
+			mes "now hurry up and get to it.";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Alex]";
+			mes "That's fine...";
+			mes "Just keep in mind that";
+			mes "we're running behind";
+			mes "schedule. If only that";
+			mes "grey haired crone wasn't";
+			mes "here... We'd be done by now!";
+			close2;
+			cutin "",255;
+			end;
 		}
-	}
-	else if(hg_odin == 5)
-	{
+	} else if (hg_odin == 5) {
 		cutin "hu_alex01.bmp",2;
 		mes "[Alex]";
 		mes "Well, it's about";
@@ -8693,128 +7895,124 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "So did you bring me";
 		mes "^3355FF5 Runes of the Darkness^000000?";
 		next;
-		switch( select( "Er, not yet...:There you go!" ) )
-		{
-			case 1:
-				cutin "hu_alex02.bmp",2;
+		switch(select("Er, not yet...:There you go!")) {
+		case 1:
+			cutin "hu_alex02.bmp",2;
+			mes "[Alex]";
+			mes "Wh-what?!";
+			mes "You came here just to";
+			mes "tell me that? Come back";
+			mes "when you're done and";
+			mes "don't waste my time!";
+			next;
+			emotion e_ho,0,"Julian";
+			mes "[Julian]";
+			mes "Hey, you know what,";
+			mes "Alex? You can't push";
+			mes "people around like that.";
+			mes "Besides, this adventurer";
+			mes "isn't a pushover, you know?";
+			next;
+			cutin "hu_alex03.bmp",2;
+			emotion e_an;
+			mes "[Alex]";
+			mes "What was that...?";
+			mes "Are you trying to";
+			mes "make me mad, Julian?";
+			next;
+			cutin "hu_alex02.bmp",2;
+			mes "[Julian]";
+			mes "All I'm saying is that";
+			mes "most adventurers know that";
+			mes "you can't pay them what they're";
+			mes "worth. That's why so many of";
+			mes "them are going in and out";
+			mes "of the other room, you know.";
+			next;
+			cutin "hu_alex04.bmp",2;
+			mes "[Alex]";
+			mes "That... grey... haired...!";
+			mes "N-no... Calm down, Alex...";
+			mes "Lose your head, you lose";
+			mes "everything... D-don't stoop";
+			mes "down to her level.";
+			next;
+			cutin "hu_alex01.bmp",2;
+			mes "[Alex]";
+			mes "Alright, I'm not in any";
+			mes "position to make demands";
+			mes "of you... But I would really";
+			mes "appreciate it if you would";
+			mes "bring me 5 Runes of the";
+			mes "Darkness as soon as possible.";
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			if (countitem(7511) > 4) {
+				delitem 7511,5; //Rune_Of_Darkness
+				set hg_odin,6; //Old_Blue_Box
+				changequest 11000,11002;
+				getitem 603,1;
 				mes "[Alex]";
-				mes "Wh-what?!";
-				mes "You came here just to";
-				mes "tell me that? Come back";
-				mes "when you're done and";
-				mes "don't waste my time!";
+				mes "Oh! Thank you";
+				mes "so much, I'm sure";
+				mes "these Runes will help";
+				mes "us in our research. I know";
+				mes "this isn't much, but please";
+				mes "accept this Old Blue Box.";
 				next;
-				emotion e_ho,0,"Julian";
 				mes "[Julian]";
-				mes "Hey, you know what,";
-				mes "Alex? You can't push";
-				mes "people around like that.";
-				mes "Besides, this adventurer";
-				mes "isn't a pushover, you know?";
+				mes "Wait...";
+				mes "Research?";
+				mes "Since when did";
+				mes "you do research?";
 				next;
 				cutin "hu_alex03.bmp",2;
-				emotion e_an;
 				mes "[Alex]";
-				mes "What was that...?";
-				mes "Are you trying to";
-				mes "make me mad, Julian?";
+				mes "Gosh, Julian,";
+				mes "will you just";
+				mes "shut up for a bit?";
 				next;
-				cutin "hu_alex02.bmp",2;
 				mes "[Julian]";
-				mes "All I'm saying is that";
-				mes "most adventurers know that";
-				mes "you can't pay them what they're";
-				mes "worth. That's why so many of";
-				mes "them are going in and out";
-				mes "of the other room, you know.";
+				mes "Why? I'm the one who";
+				mes "does all the grunt work";
+				mes "and actual research.";
+				mes "You think you're so";
+				mes "big just ''supervising...''";
 				next;
 				cutin "hu_alex04.bmp",2;
 				mes "[Alex]";
-				mes "That... grey... haired...!";
-				mes "N-no... Calm down, Alex...";
-				mes "Lose your head, you lose";
-				mes "everything... D-don't stoop";
-				mes "down to her level.";
+				mes "J-Julian!";
+				next;
+				mes "[Julian]";
+				mes "Right, right, we've";
+				mes "got a visitor. Yeah,";
+				mes "okay, sorry about that.";
 				next;
-				cutin "hu_alex01.bmp",2;
-				mes "[Alex]";
-				mes "Alright, I'm not in any";
-				mes "position to make demands";
-				mes "of you... But I would really";
-				mes "appreciate it if you would";
-				mes "bring me 5 Runes of the";
-				mes "Darkness as soon as possible.";
-				close2;
-				cutin "",255;
-				end;
-
-			case 2:
-				if(countitem(7511) > 4)
-				{
-					delitem 7511,5;
-					set hg_odin,6;
-					getitem 603,1;
-					mes "[Alex]";
-					mes "Oh! Thank you";
-					mes "so much, I'm sure";
-					mes "these Runes will help";
-					mes "us in our research. I know";
-					mes "this isn't much, but please";
-					mes "accept this Old Blue Box.";
-					next;
-					mes "[Julian]";
-					mes "Wait...";
-					mes "Research?";
-					mes "Since when did";
-					mes "you do research?";
-					next;
-					cutin "hu_alex03.bmp",2;
-					mes "[Alex]";
-					mes "Gosh, Julian,";
-					mes "will you just";
-					mes "shut up for a bit?";
-					next;
-					mes "[Julian]";
-					mes "Why? I'm the one who";
-					mes "does all the grunt work";
-					mes "and actual research.";
-					mes "You think you're so";
-					mes "big just ''supervising...''";
-					next;
-					cutin "hu_alex04.bmp",2;
-					mes "[Alex]";
-					mes "J-Julian!";
-					next;
-					mes "[Julian]";
-					mes "Right, right, we've";
-					mes "got a visitor. Yeah,";
-					mes "okay, sorry about that.";
-					next;
-					cutin "hu_alex02.bmp",2;
-					mes "[Alex]";
-					mes "I'm sorry about all";
-					mes "this. If you don't mind,";
-					mes "we'll continue our research";
-					mes "and hopefully finish our";
-					mes "project soon. Thanks once";
-					mes "again for all of your help.";
-					close2;
-					cutin "",255;
-					end;
-				}
 				cutin "hu_alex02.bmp",2;
 				mes "[Alex]";
-				mes "Hm? Oh, this isn't";
-				mes "enough Runes of the";
-				mes "Darkness. I asked you";
-				mes "to bring me 5 of them...";
+				mes "I'm sorry about all";
+				mes "this. If you don't mind,";
+				mes "we'll continue our research";
+				mes "and hopefully finish our";
+				mes "project soon. Thanks once";
+				mes "again for all of your help.";
 				close2;
 				cutin "",255;
 				end;
+			}
+			cutin "hu_alex02.bmp",2;
+			mes "[Alex]";
+			mes "Hm? Oh, this isn't";
+			mes "enough Runes of the";
+			mes "Darkness. I asked you";
+			mes "to bring me 5 of them...";
+			close2;
+			cutin "",255;
+			end;
 		}
-	}
-	else if(hg_odin == 6)
-	{
+	} else if (hg_odin == 6) {
 		cutin "hu_alex02.bmp",2;
 		mes "[Alex]";
 		mes "...Darn it! I think I might";
@@ -8836,9 +8034,7 @@ hu_in01,19,161,0	script	Alex	803,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(hg_odin > 11 && hg_odin < 17)
-	{
+	} else if (hg_odin > 11 && hg_odin < 17) {
 		cutin "hu_alex03.bmp",2;
 		mes "[Alex]";
 		mes "Excuse me?";
@@ -8881,9 +8077,7 @@ hu_in01,19,161,0	script	Alex	803,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else
-	{
+	} else {
 		cutin "hu_alex02.bmp",2;
 		mes "[Alex]";
 		mes "Hm? Did you need";
@@ -8898,10 +8092,8 @@ hu_in01,19,161,0	script	Alex	803,{
 	}
 }
 
-hu_in01,14,11,4	script	Laura	70,{
-
-	if(!hg_odin)
-	{
+hu_in01,14,11,4	script	Laura	1_F_GYPSY,{
+	if (!hg_odin) {
 		cutin "hu_laura02.bmp",2;
 		mes "[Laura]";
 		mes "Hm? What are you doing";
@@ -8911,16 +8103,13 @@ hu_in01,14,11,4	script	Laura	70,{
 		cutin "",255;
 		warp "hu_in01",15,76;
 		end;
-	}
-	else if(hg_odin == 1)
-	{
+	} else if (hg_odin == 1) {
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Hm? Oh, you must be";
 		mes "here in response to our";
 		mes "recruitment notice, yes?";
-		if(BaseLevel < 60)
-		{
+		if (BaseLevel < 60) {
 			cutin "hu_laura01.bmp",2;
 			mes "Let me take a look at you...";
 			mes "Oh, you're all skin and bone!";
@@ -8975,71 +8164,63 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "when the gods showed";
 		mes "themselves to humans!";
 		next;
-		switch( select( "Nah, forget it.","Yes, I'll do it!" ) )
-		{
-			case 1:
+		switch(select("Nah, forget it.:Yes, I'll do it!")) {
+		case 1:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "W-Wait! Think about";
+			mes "the importance of learning";
+			mes "about the age of gods! If you";
+			mes "don't help us, then who will?";
+			mes "We need to work together to";
+			mes "build a better future, right?";
+			next;
+			if(select("But you can't pay me.:Alright, I'll do it.") == 1) {
+				cutin "hu_laura04.bmp",2;
+				mes "[Laura]";
+				mes "You're right.";
+				mes "It's like I said";
+				mes "before. I don't have";
+				mes "anything to pay you.";
+				mes "...............................";
+				next;
 				cutin "hu_laura01.bmp",2;
 				mes "[Laura]";
-				mes "W-Wait! Think about";
-				mes "the importance of learning";
-				mes "about the age of gods! If you";
-				mes "don't help us, then who will?";
-				mes "We need to work together to";
-				mes "build a better future, right?";
+				mes "Curses! If this project had";
+				mes "more funding, we'd have more";
+				mes "than a cheesy recruitment ad,";
+				mes "and some professional staff";
+				mes "like those rich Schwaltzvalt";
+				mes "Republic boys in the next room!";
 				next;
-				switch( select( "But you can't pay me.","Alright, I'll do it." ) )
-				{
-					case 1:
-						cutin "hu_laura04.bmp",2;
-						mes "[Laura]";
-						mes "You're right.";
-						mes "It's like I said";
-						mes "before. I don't have";
-						mes "anything to pay you.";
-						mes "...............................";
-						next;
-						cutin "hu_laura01.bmp",2;
-						mes "[Laura]";
-						mes "Curses! If this project had";
-						mes "more funding, we'd have more";
-						mes "than a cheesy recruitment ad,";
-						mes "and some professional staff";
-						mes "like those rich Schwaltzvalt";
-						mes "Republic boys in the next room!";
-						next;
-						cutin "hu_laura02.bmp",2;
-						mes "[Laura]";
-						mes "Fine, it's your choice";
-						mes "whether you want to work";
-						mes "for us. I'm just disappointed";
-						mes "that someone like you won't";
-						mes "help us. I mean, don't you";
-						mes "have any patriotism at all?";
-						close2;
-						cutin "hu_laura02.bmp",255;
-						end;
-						
-					case 2:
-						break;
-				}
-				// Allow fall-through into the next case statment as this is a minor bug in aegis.
-				//break;
-			
-			case 2:
+				cutin "hu_laura02.bmp",2;
 				mes "[Laura]";
-				mes "Perfect! Now, you first";
-				mes "you need to go to the shrine";
-				mes "and survey the area for your";
-				mes "own benefit. Talk to the Boatman,^FFFFFF ^000000 and he'll take you there, okay?";
-				mes "Hurry up and come back soon!";
-				set hg_odin,12;
+				mes "Fine, it's your choice";
+				mes "whether you want to work";
+				mes "for us. I'm just disappointed";
+				mes "that someone like you won't";
+				mes "help us. I mean, don't you";
+				mes "have any patriotism at all?";
 				close2;
-				cutin "hu_laura04.bmp",255;
+				cutin "hu_laura02.bmp",255;
 				end;
+			}
+			// Allow fall-through into the next case statment as this is a minor bug in aegis.
+			//break;
+		case 2:
+			mes "[Laura]";
+			mes "Perfect! Now, you first";
+			mes "you need to go to the shrine";
+			mes "and survey the area for your";
+			mes "own benefit. Talk to the Boatman,^FFFFFF ^000000 and he'll take you there, okay?";
+			mes "Hurry up and come back soon!";
+			set hg_odin,12;
+			setquest 11003;
+			close2;
+			cutin "hu_laura04.bmp",255;
+			end;
 		}
-	}
-	else if(hg_odin > 1 && hg_odin < 6)
-	{
+	} else if (hg_odin > 1 && hg_odin < 6) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but";
 		mes "what are you guys";
@@ -9054,61 +8235,56 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "in the Odin Shrine on behalf";
 		mes "of the Rune-Midgarts Kingdom.";
 		next;
-		switch( select( "About Alex and Julian","Alright, now I understand." ) )
-		{
-			case 1:
-				cutin "hu_laura01.bmp",2;
-				mes "["+strcharinfo(0)+"]";
-				mes "These people in the other";
-				mes "room, Alex and Julian, are";
-				mes "they also working in this same";
-				mes "expedition in the Odin Shrine?";
-				next;
-				cutin "hu_laura02.bmp",2;
-				mes "[Laura]";
-				mes "...Oh. You must be working";
-				mes "for those rich Schwaltvalt";
-				mes "Republic kids. I can't work";
-				mes "with that impudent girl, at";
-				mes "all, so we're actually working";
-				mes "in separate offices.";
-				next;
-				cutin "hu_laura04.bmp",2;
-				mes "[Laura]";
-				mes "Sorry, let me introduce";
-				mes "myself. I'm Laura Laurence,";
-				mes "the leader of the Odin Shrine";
-				mes "expedition for the Rune Midgarts^FFFFFF ^000000 Kingdom. Ashe Milton is my";
-				mes "assistant for this excavation.";
-				next;
-				emotion e_heh,0,"Ashe";
-				mes "[Ashe]";
-				mes "Hello!";
-				next;
-				mes "[Laura]";
-				mes "If you'd rather do";
-				mes "a service for your";
-				mes "country and quit working";
-				mes "for those wealthy snobs, then";
-				mes "come back here and let me know.";
-				close2;
-				cutin "hu_laura04.bmp",255;
-				end;
-
-			case 2:
-				cutin "hu_laura01.bmp",2;
-				mes "[Laura]";
-				mes "......";
-				mes ".........";
-				mes "............";
-				close2;
-				cutin "hu_laura01.bmp",255;
-				end;
-
+		switch(select("About Alex and Julian:Alright, now I understand.")) {
+		case 1:
+			cutin "hu_laura01.bmp",2;
+			mes "["+strcharinfo(0)+"]";
+			mes "These people in the other";
+			mes "room, Alex and Julian, are";
+			mes "they also working in this same";
+			mes "expedition in the Odin Shrine?";
+			next;
+			cutin "hu_laura02.bmp",2;
+			mes "[Laura]";
+			mes "...Oh. You must be working";
+			mes "for those rich Schwaltvalt";
+			mes "Republic kids. I can't work";
+			mes "with that impudent girl, at";
+			mes "all, so we're actually working";
+			mes "in separate offices.";
+			next;
+			cutin "hu_laura04.bmp",2;
+			mes "[Laura]";
+			mes "Sorry, let me introduce";
+			mes "myself. I'm Laura Laurence,";
+			mes "the leader of the Odin Shrine";
+			mes "expedition for the Rune Midgarts^FFFFFF ^000000 Kingdom. Ashe Milton is my";
+			mes "assistant for this excavation.";
+			next;
+			emotion e_heh,0,"Ashe";
+			mes "[Ashe]";
+			mes "Hello!";
+			next;
+			mes "[Laura]";
+			mes "If you'd rather do";
+			mes "a service for your";
+			mes "country and quit working";
+			mes "for those wealthy snobs, then";
+			mes "come back here and let me know.";
+			close2;
+			cutin "hu_laura04.bmp",255;
+			end;
+		case 2:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "......";
+			mes ".........";
+			mes "............";
+			close2;
+			cutin "hu_laura01.bmp",255;
+			end;
 		}
-	}
-	else if(hg_odin == 6)
-	{
+	} else if (hg_odin == 6) {
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Hey, I know you...";
@@ -9152,14 +8328,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "[Laura]";
 		mes "RIGHT?!";
 		next;
-		switch( select( "Yeah, yeah, whatever.","Sure thing.","I s-s-s-suppose...!","Yes, Ma'am!" ) )
-		{
-			case 1:
-			case 2:
-			case 3:
-			case 4:
-				break;
-		}
+		select("Yeah, yeah, whatever.:Sure thing.:I s-s-s-suppose...!:Yes, Ma'am!");
 		set hg_odin,17;
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
@@ -9168,9 +8337,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		close2;
 		cutin "hu_laura04.bmp",255;
 		end;
-	}
-	else if(hg_odin == 12)
-	{
+	} else if (hg_odin == 12) {
 		cutin "hu_laura02.bmp",2;
 		mes "[Laura]";
 		mes "Ask the Boatman to take";
@@ -9181,9 +8348,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		close2;
 		cutin "hu_laura02.bmp",255;
 		end;
-	}
-	else if(hg_odin == 13)
-	{
+	} else if (hg_odin == 13) {
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Have you been to the";
@@ -9192,41 +8357,33 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "need to finish our research";
 		mes "for the good of mankind.";
 		next;
-		switch( select( "Yeah, yeah, whatever.","I see.","You're right, Ma'am." ) )
-		{
-			case 1:
-			case 2:
-			case 3:
-				break;
-		}
+		select("Yeah, yeah, whatever.:I see.:You're right, Ma'am.");
 		mes "[Laura]";
 		mes "Well, then.";
 		mes "Did you happen to";
 		mes "find anything while";
 		mes "you were there?";
 		next;
-		switch( select( "Jellopies.","No." ) )
-		{
-			case 1:
-				cutin "hu_laura01.bmp",2;
-				mes "[Laura]";
-				mes "You can freakin' find";
-				mes "Jellopy anywhere! I meant,";
-				mes "did you find anything special";
-				mes "while you were at the shrine!";
-				next;
-				break;
-				
-			case 2:
-				cutin "hu_laura01.bmp",2;
-				mes "[Laura]";
-				mes "Well, that's fine.";
-				mes "I did tell you to just";
-				mes "take a look around, so";
-				mes "I didn't expect you to";
-				mes "bring me anything.";
-				next;
-				break;
+		switch(select("Jellopies.:No.")) {
+		case 1:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "You can freakin' find";
+			mes "Jellopy anywhere! I meant,";
+			mes "did you find anything special";
+			mes "while you were at the shrine!";
+			next;
+			break;
+		case 2:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "Well, that's fine.";
+			mes "I did tell you to just";
+			mes "take a look around, so";
+			mes "I didn't expect you to";
+			mes "bring me anything.";
+			next;
+			break;
 		}
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
@@ -9236,286 +8393,266 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "be fair, I can offer you something from my special collection.";
 		mes "How does that sound?";
 		next;
-		switch( select( "Who are the guys in the other room?","Well...","Yes!" ) )
-		{
-			case 1:
+		switch(select("Who are the guys in the other room?:Well...:Yes!")) {
+		case 1:
+			cutin "hu_laura01.bmp",2;
+			mes "[Laura]";
+			mes "Oh, those are the";
+			mes "Schwartzvalt Republic";
+			mes "representatives for this";
+			mes "Odin Shrine expedition.";
+			mes "Personally, I think they're";
+			mes "just a bunch of rich phonies.";
+			next;
+			cutin "hu_laura03.bmp",2;
+			mes "[Laura]";
+			mes "And that Alex girl...";
+			mes "She may seem polite,";
+			mes "but she's always giving";
+			mes "these dirty looks, and";
+			mes "greets me with a fake";
+			mes "smile. I hate her!";
+			next;
+			emotion e_swt2,0,"Ashe";
+			mes "[Ashe]";
+			mes "Ms. Laurence...!";
+			mes "Stop it, please!";
+			mes "It's embarassing to";
+			mes "hear you talk about";
+			mes "a colleague like that.";
+			next;
+			mes "[Laura]";
+			mes "C-colleague?! No way!";
+			mes "I despise that spoiled brat,";
+			mes "and she doesn't deserve the";
+			mes "position that her rich daddy";
+			mes "probably bought for her! Grrr!";
+			mes "Come back later, I'm too mad!";
+			close2;
+			cutin "hu_laura03.bmp",255;
+			end;
+		case 2:
+			mes "[Laura]";
+			mes "If you're having second";
+			mes "thoughts, it might not be";
+			mes "the best idea to work for me.";
+			mes "I mean, I believe in following";
+			mes "your gut instincts, you know?";
+			close2;
+			cutin "hu_laura04.bmp",255;
+			end;
+		case 3:
+			set hg_odin,14;
+			changequest 11003,11004;
+			mes "[Laura]";
+			mes "That's what I've been";
+			mes "waiting to hear! Alright,";
+			mes "please fetch me ^3355FF5 Runes of";
+			mes "the Darkness^000000 from the Odin";
+			mes "Shrine. Go now, adventurer~";
+			close2;
+			cutin "hu_laura04.bmp",255;
+			end;
+		}
+	} else if (hg_odin == 14) {
+		cutin "hu_laura02.bmp",2;
+		mes "[Laura]";
+		mes "Hm? You've got a job";
+		mes "to do, don't you? What";
+		mes "are you still doing here?";
+		next;
+		switch(select("What was I supposed to gather?:Don't worry, I'm leaving.")) {
+		case 1:
+			mes "[Laura]";
+			mes "You're supposed";
+			mes "to bring me ^3355FF5 Runes";
+			mes "of the Darkness^000000. Now,";
+			mes "don't forget this time!";
+			close2;
+			cutin "hu_laura02.bmp",255;
+			end;
+		case 2:
+			mes "[Laura]";
+			mes "Well, try to hurry up";
+			mes "if you can. I'm already";
+			mes "behind schedule because";
+			mes "we have to work with those";
+			mes "snobby rich kids in the";
+			mes "other office. ^333333*Sigh...*^000000";
+			close2;
+			cutin "hu_laura02.bmp",255;
+			end;
+		}
+	} else if (hg_odin == 15) {
+		cutin "hu_laura04.bmp",2;
+		mes "[Laura]";
+		mes "Oh, you've come back.";
+		mes "So where are the Runes";
+		mes "of the Darkness you brought?";
+		next;
+		switch(select("Er, I don't have them yet...:Right here!")) {
+		case 1:
+			cutin "hu_laura03.bmp",2;
+			mes "[Laura]";
+			mes "This isn't really one";
+			mes "of those jobs where you";
+			mes "can take your time. Sure,^FFFFFF ^000000 I didn't give you a deadline, but";
+			mes "we can't make progress on our^FFFFFF ^000000 research until you make progress.";
+			close2;
+			cutin "hu_laura03.bmp",255;
+			end;
+		case 2:
+			if (countitem(7511) > 4) {
+				delitem 7511,5; //Rune_Of_Darkness
+				set hg_odin,16;
+				changequest 11004,11005;
+				getitem 603,1; //Old_Blue_Box
+				mes "[Laura]";
+				mes "Oooh, nice job. It's good";
+				mes "that we have more of these";
+				mes "to study. Though, it seems";
+				mes "that the more we research,";
+				mes "the quicker it seems that";
+				mes "we're not getting anywhere...";
+				next;
+				mes "[Laura]";
+				mes "Hey...";
+				mes "Ashe. Why aren't we";
+				mes "making any progress?";
+				mes "What exactly have you";
+				mes "been doing? None of those";
+				mes "runes have any writing?";
+				next;
+				mes "[Ashe]";
+				mes "Well, I think there's";
+				mes "supposed to be writing,";
+				mes "but these runes are pretty";
+				mes "old. I've got to polish this";
+				mes "gunk off without damaging";
+				mes "any writing that's there...";
+				next;
 				cutin "hu_laura01.bmp",2;
 				mes "[Laura]";
-				mes "Oh, those are the";
-				mes "Schwartzvalt Republic";
-				mes "representatives for this";
-				mes "Odin Shrine expedition.";
-				mes "Personally, I think they're";
-				mes "just a bunch of rich phonies.";
+				mes "By the way, what have the other guys been doing?";
+				mes "What, they don't do anything but wasting their time?";
+				mes "Ah~ I see. They are thinking that this is the perfect excuse";
+				mes "for them to relax and rest.";
+				mes "Well, somehow they are the citizens of this country, you know.";
+				next;
+				cutin "hu_laura02.bmp",2;
+				mes "[Laura]";
+				mes "What do you think those";
+				mes "Schwaltzvalt snobs are doing?";
+				mes "They must think this project";
+				mes "is an excuse for them to relax";
+				mes "and slack off! They can afford^FFFFFF ^000000 to, obviously. Hmpf! Rich people!";
 				next;
 				cutin "hu_laura03.bmp",2;
 				mes "[Laura]";
-				mes "And that Alex girl...";
-				mes "She may seem polite,";
-				mes "but she's always giving";
-				mes "these dirty looks, and";
-				mes "greets me with a fake";
-				mes "smile. I hate her!";
+				mes "They've got things so easy,";
+				mes "while we're barely covering";
+				mes "our research expenses!";
+				mes "In fact, we've had to cut";
+				mes "so many corners, skip";
+				mes "meals and amenities...";
 				next;
-				emotion e_swt2,0,"Ashe";
 				mes "[Ashe]";
-				mes "Ms. Laurence...!";
-				mes "Stop it, please!";
-				mes "It's embarassing to";
-				mes "hear you talk about";
-				mes "a colleague like that.";
+				mes "I know! How can we";
+				mes "carry on professional";
+				mes "research in a shack?";
+				mes "We're literally living at";
+				mes "poverty standards here...";
+				mes "Are we still researchers?";
 				next;
+				cutin "hu_laura02.bmp",2;
 				mes "[Laura]";
-				mes "C-colleague?! No way!";
-				mes "I despise that spoiled brat,";
-				mes "and she doesn't deserve the";
-				mes "position that her rich daddy";
-				mes "probably bought for her! Grrr!";
-				mes "Come back later, I'm too mad!";
-				close2;
-				cutin "hu_laura03.bmp",255;
-				end;
-				
-			case 2:
+				mes "I know that!";
+				mes "I know that already!";
+				mes "S-stop bringing it up!";
+				next;
+				cutin "hu_laura01.bmp",2;
 				mes "[Laura]";
-				mes "If you're having second";
-				mes "thoughts, it might not be";
-				mes "the best idea to work for me.";
-				mes "I mean, I believe in following";
-				mes "your gut instincts, you know?";
+				mes "This is pathetic.";
+				mes "I can't even afford the";
+				mes "energy to continue this";
+				mes "conversation. You too,";
+				mes "why don't you take a rest?";
 				close2;
-				cutin "hu_laura04.bmp",255;
+				cutin "hu_laura01.bmp",255;
 				end;
-
-			case 3:
-				set hg_odin,14;
+			} else if (!countitem(7511)) {
+				cutin "hu_laura02.bmp",2;
 				mes "[Laura]";
-				mes "That's what I've been";
-				mes "waiting to hear! Alright,";
-				mes "please fetch me ^3355FF5 Runes of";
-				mes "the Darkness^000000 from the Odin";
-				mes "Shrine. Go now, adventurer~";
-				close2;
-				cutin "hu_laura04.bmp",255;
-				end;
-		}
-	}
-	else if(hg_odin == 14)
-	{
-		cutin "hu_laura02.bmp",2;
-		mes "[Laura]";
-		mes "Hm? You've got a job";
-		mes "to do, don't you? What";
-		mes "are you still doing here?";
-		next;
-		switch( select( "What was I supposed to gather?","Don't worry, I'm leaving." ) )
-		{
-			case 1:
+				mes "..................";
+				mes "What is this?!";
+				mes "You're supposed to";
+				mes "bring me 5 of them!";
+				next;
+				cutin "hu_laura03.bmp",2;
+				mes "[Laura]";
+				mes "Is this your way of";
+				mes "saying that you don't";
+				mes "want to work for us?";
+				mes "Why don't you say it";
+				mes "to my face, eh?";
+				next;
+				mes "[Ashe]";
+				mes "Ms. Laurence, please,";
+				mes "calm down! We're in no";
+				mes "position to yell at anyone,";
+				mes "especially volunteers! You";
+				mes "of all people should know";
+				mes "that they're doing us a favor!";
+				next;
+				cutin "hu_laura02.bmp",2;
 				mes "[Laura]";
-				mes "You're supposed";
-				mes "to bring me ^3355FF5 Runes";
-				mes "of the Darkness^000000. Now,";
-				mes "don't forget this time!";
+				mes "Okay, Ashe, I get it!";
+				mes "And as for you, I'll give";
+				mes "you another chance. Next";
+				mes "time you see me, bring";
+				mes "5 Runes of the Darkness!";
 				close2;
 				cutin "hu_laura02.bmp",255;
 				end;
-
-			case 2:
+			} else if (countitem(7511) == 1) {
+				cutin "hu_laura03.bmp",2;
 				mes "[Laura]";
-				mes "Well, try to hurry up";
-				mes "if you can. I'm already";
-				mes "behind schedule because";
-				mes "we have to work with those";
-				mes "snobby rich kids in the";
-				mes "other office. ^333333*Sigh...*^000000";
+				mes "...Only one?";
+				mes "Look at me. I asked";
+				mes "you for five. I know that";
+				mes "one is better than nothing...";
+				mes "But it's pretty darn close. Go";
+				mes "get me 4 more this instant!";
 				close2;
-				cutin "hu_laura02.bmp",255;
+				cutin "hu_laura03.bmp",255;
 				end;
-		}
-	}
-	else if(hg_odin == 15)
-	{
-		cutin "hu_laura04.bmp",2;
-		mes "[Laura]";
-		mes "Oh, you've come back.";
-		mes "So where are the Runes";
-		mes "of the Darkness you brought?";
-		next;
-		switch( select( "Er, I don't have them yet...","Right here!" ) )
-		{
-			case 1:
+			} else if (countitem(7511) == 2) {
 				cutin "hu_laura03.bmp",2;
 				mes "[Laura]";
-				mes "This isn't really one";
-				mes "of those jobs where you";
-				mes "can take your time. Sure,^FFFFFF ^000000 I didn't give you a deadline, but";
-				mes "we can't make progress on our^FFFFFF ^000000 research until you make progress.";
+				mes "One, two...";
+				mes "Huh? Th-that's all?!";
+				mes "When I ask for 5 Runes";
+				mes "of the Darkness, I mean";
+				mes "5, not 2. Now hurry up";
+				mes "and just do what I asked!";
 				close2;
 				cutin "hu_laura03.bmp",255;
 				end;
-			
-			case 2:
-				if (countitem(7511) > 4)
-				{
-					delitem 7511,5;
-					set hg_odin,16;
-					getitem 603,1;
-					mes "[Laura]";
-					mes "Oooh, nice job. It's good";
-					mes "that we have more of these";
-					mes "to study. Though, it seems";
-					mes "that the more we research,";
-					mes "the quicker it seems that";
-					mes "we're not getting anywhere...";
-					next;
-					mes "[Laura]";
-					mes "Hey...";
-					mes "Ashe. Why aren't we";
-					mes "making any progress?";
-					mes "What exactly have you";
-					mes "been doing? None of those";
-					mes "runes have any writing?";
-					next;
-					mes "[Ashe]";
-					mes "Well, I think there's";
-					mes "supposed to be writing,";
-					mes "but these runes are pretty";
-					mes "old. I've got to polish this";
-					mes "gunk off without damaging";
-					mes "any writing that's there...";
-					next;
-					cutin "hu_laura01.bmp",2;
-					mes "[Laura]";
-					mes "By the way, what have the other guys been doing?";
-					mes "What, they don't do anything but wasting their time?";
-					mes "Ah~ I see. They are thinking that this is the perfect excuse";
-					mes "for them to relax and rest.";
-					mes "Well, somehow they are the citizens of this country, you know.";
-					next;
-					cutin "hu_laura02.bmp",2;
-					mes "[Laura]";
-					mes "What do you think those";
-					mes "Schwaltzvalt snobs are doing?";
-					mes "They must think this project";
-					mes "is an excuse for them to relax";
-					mes "and slack off! They can afford^FFFFFF ^000000 to, obviously. Hmpf! Rich people!";
-					next;
-					cutin "hu_laura03.bmp",2;
-					mes "[Laura]";
-					mes "They've got things so easy,";
-					mes "while we're barely covering";
-					mes "our research expenses!";
-					mes "In fact, we've had to cut";
-					mes "so many corners, skip";
-					mes "meals and amenities...";
-					next;
-					mes "[Ashe]";
-					mes "I know! How can we";
-					mes "carry on professional";
-					mes "research in a shack?";
-					mes "We're literally living at";
-					mes "poverty standards here...";
-					mes "Are we still researchers?";
-					next;
-					cutin "hu_laura02.bmp",2;
-					mes "[Laura]";
-					mes "I know that!";
-					mes "I know that already!";
-					mes "S-stop bringing it up!";
-					next;
-					cutin "hu_laura01.bmp",2;
-					mes "[Laura]";
-					mes "This is pathetic.";
-					mes "I can't even afford the";
-					mes "energy to continue this";
-					mes "conversation. You too,";
-					mes "why don't you take a rest?";
-					close2;
-					cutin "hu_laura01.bmp",255;
-					end;
-				}
-				else if(!countitem(7511))
-				{
-					cutin "hu_laura02.bmp",2;
-					mes "[Laura]";
-					mes "..................";
-					mes "What is this?!";
-					mes "You're supposed to";
-					mes "bring me 5 of them!";
-					next;
-					cutin "hu_laura03.bmp",2;
-					mes "[Laura]";
-					mes "Is this your way of";
-					mes "saying that you don't";
-					mes "want to work for us?";
-					mes "Why don't you say it";
-					mes "to my face, eh?";
-					next;
-					mes "[Ashe]";
-					mes "Ms. Laurence, please,";
-					mes "calm down! We're in no";
-					mes "position to yell at anyone,";
-					mes "especially volunteers! You";
-					mes "of all people should know";
-					mes "that they're doing us a favor!";
-					next;
-					cutin "hu_laura02.bmp",2;
-					mes "[Laura]";
-					mes "Okay, Ashe, I get it!";
-					mes "And as for you, I'll give";
-					mes "you another chance. Next";
-					mes "time you see me, bring";
-					mes "5 Runes of the Darkness!";
-					close2;
-					cutin "hu_laura02.bmp",255;
-					end;
-				}
-				else if(countitem(7511) == 1)
-				{
-					cutin "hu_laura03.bmp",2;
-					mes "[Laura]";
-					mes "...Only one?";
-					mes "Look at me. I asked";
-					mes "you for five. I know that";
-					mes "one is better than nothing...";
-					mes "But it's pretty darn close. Go";
-					mes "get me 4 more this instant!";
-					close2;
-					cutin "hu_laura03.bmp",255;
-					end;
-				}
-				else if(countitem(7511) == 2)
-				{
-					cutin "hu_laura03.bmp",2;
-					mes "[Laura]";
-					mes "One, two...";
-					mes "Huh? Th-that's all?!";
-					mes "When I ask for 5 Runes";
-					mes "of the Darkness, I mean";
-					mes "5, not 2. Now hurry up";
-					mes "and just do what I asked!";
-					close2;
-					cutin "hu_laura03.bmp",255;
-					end;
-				}
-				else
-				{
-					mes "[Laura]";
-					mes "One, two, three...";
-					mes "That's it? Don't you";
-					mes "know how to count to 5?";
-					mes "Go and get me more of those";
-					mes "Runes of the Darkness now!";
-					next;
-					cutin "hu_laura03.bmp",2;
-					close2;
-					cutin "hu_laura03.bmp",255;
-					end;
-				}
+			} else {
+				mes "[Laura]";
+				mes "One, two, three...";
+				mes "That's it? Don't you";
+				mes "know how to count to 5?";
+				mes "Go and get me more of those";
+				mes "Runes of the Darkness now!";
+				next;
+				cutin "hu_laura03.bmp",2;
+				close2;
+				cutin "hu_laura03.bmp",255;
+				end;
+			}
 		}
-	}
-	else if(hg_odin == 16)
-	{
+	} else if (hg_odin == 16) {
 		cutin "hu_laura02.bmp",2;
 		mes "[Laura]";
 		mes "I wonder how much progress";
@@ -9536,20 +8673,15 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "[Laura]";
 		mes "...Hey, you.";
 		next;
-		switch( select( "...","...Me?" ) )
+		if ( select( "...:...Me?" ) == 1)
 		{
-			case 1:
-				mes "[Laura]";
-				mes "Hey, hey!";
-				mes "Hey hey hey!";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "...Me?";
-				next;
-				break;
-				
-			case 2:
-				break;
+			mes "[Laura]";
+			mes "Hey, hey!";
+			mes "Hey hey hey!";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "...Me?";
+			next;
 		}
 		mes "[Laura]";
 		mes "Basically, I want you";
@@ -9576,15 +8708,13 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "[Laura]";
 		mes "RIGHT?!";
 		next;
-		switch( select( "Yeah, yeah, whatever.","Sure thing.","I s-s-s-suppose...!","Yes, Ma'am!" ) )
-		{
-			case 1:
-			case 2:
-			case 3:
-			case 4:
-				break;
-		}
+		select("Yeah, yeah, whatever.:Sure thing.:I s-s-s-suppose...!:Yes, Ma'am!");
 		set hg_odin,17;
+		for(set .@i,11002; .@i<=11005; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1 && checkquest(.@i) < 2)
+				completequest .@i;
+		}
+		setquest 11006;
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Good.";
@@ -9592,9 +8722,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		close2;
 		cutin "hu_laura04.bmp",255;
 		end;
-	}
-	else if(hg_odin == 17)
-	{
+	} else if (hg_odin == 17) {
 		cutin "hu_laura02.bmp",2;
 		mes "[Laura]";
 		mes "What are you standing";
@@ -9605,9 +8733,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		close2;
 		cutin "hu_laura02.bmp",255;
 		end;
-	}
-	else if(hg_odin == 18 || hg_odin == 19)
-	{
+	} else if (hg_odin == 18 || hg_odin == 19) {
 		cutin "hu_laura01.bmp",2;
 		mes "[Laura]";
 		mes "Frankly, I know I'm paying";
@@ -9616,8 +8742,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "learned about the Schwaltzvalt";
 		mes "Republic Research Team.";
 		next;
-		switch( select( "Giantes","Ymir's Heart","Nothing" ) )
-		{
+		switch(select("Giantes:Ymir's Heart:Nothing")) {
 			case 1:
 				cutin "hu_laura04.bmp",2;
 				mes "["+strcharinfo(0)+"]";
@@ -9651,7 +8776,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "this? What exactly";
 				mes "is Ymir's Heart?";
 				next;
-				switch( select( "It's candy.","It's a book.","It's a place.","Ymir was a giant..." ) )
+				switch(select("It's candy.:It's a book.:It's a place.:Ymir was a giant..."))
 				{
 					case 1:
 						mes "["+strcharinfo(0)+"]";
@@ -9718,6 +8843,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "Research Team. I'm sorry, but";
 				mes "you're the only one I can ask.";
 				set hg_odin,20;
+				changequest 11006,11007;
 				close2;
 				cutin "hu_laura04.bmp",255;
 				end;
@@ -9731,9 +8857,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				cutin "hu_laura01.bmp",255;
 				end;
 		}
-	}
-	else if(hg_odin == 20)
-	{
+	} else if (hg_odin == 20) {
 		cutin "hu_laura01.bmp",2;
 		mes "[Laura]";
 		mes "I wonder...";
@@ -9746,16 +8870,12 @@ hu_in01,14,11,4	script	Laura	70,{
 	}
 }
 
-hu_in01,18,167,4	script	Julian	86,{
-
-	if(!hg_odin)
-	{
+hu_in01,18,167,4	script	Julian	4_M_04,{
+	if (!hg_odin) {
 		mes "[Julian]";
 		mes "^333333*Sigh...*^000000";
 		close;
-	}
-	else if(hg_odin == 1)
-	{
+	} else if (hg_odin == 1) {
 		mes "[Julian]";
 		mes "Say, are you here";
 		mes "for a job? We're looking";
@@ -9779,9 +8899,7 @@ hu_in01,18,167,4	script	Julian	86,{
 		mes "to find any relics from the Odin ^FFFFFF ^000000 Shrine. We'd appreciate it if you";
 		mes "brought as many as you can!";
 		close;
-	}
-	else if(hg_odin == 2)
-	{
+	} else if (hg_odin == 2) {
 		mes "[Julian]";
 		mes "You sure you want";
 		mes "to work for someone";
@@ -9796,18 +8914,14 @@ hu_in01,18,167,4	script	Julian	86,{
 		mes "[Julian]";
 		mes "See what I mean?";
 		close;
-	}
-	else if(hg_odin == 3)
-	{
+	} else if (hg_odin == 3) {
 		mes "[Julian]";
 		mes "Wow, you must really";
 		mes "like this kind of work,";
 		mes "huh? I didn't really expect";
 		mes "that you'd go to the shrine...";
 		close;
-	}
-	else if(hg_odin == 4)
-	{
+	} else if (hg_odin == 4) {
 		mes "[Julian]";
 		mes "I'm amazed to see you";
 		mes "working so hard. You must";
@@ -9815,9 +8929,7 @@ hu_in01,18,167,4	script	Julian	86,{
 		mes "I guess, but try not to be too";
 		mes "kind. Wouldn't want that...";
 		close;
-	}
-	else if(hg_odin == 5)
-	{
+	} else if (hg_odin == 5) {
 		mes "[Julian]";
 		mes "Geez...";
 		mes "You're a really nice";
@@ -9825,9 +8937,7 @@ hu_in01,18,167,4	script	Julian	86,{
 		mes "Just try not to be taken";
 		mes "for a sucker, okay?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Julian]";
 		mes "Why are both of our";
 		mes "team leaders so bull";
@@ -9839,11 +8949,9 @@ hu_in01,18,167,4	script	Julian	86,{
 	}
 }
 
-hu_in01,16,21,0	script	Ashe#5	139,2,2,{
-
+hu_in01,16,21,0	script	Ashe#5	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
-	if (hg_odin == 18)
-	{
+	if (hg_odin == 18) {
 		mes "[Ashe]";
 		mes "......?";
 		next;
@@ -9855,10 +8963,8 @@ OnTouch:
 	}
 }
 
-hu_in01,16,20,4	script	Ashe	95,{
-
-	switch(hg_odin)
-	{
+hu_in01,16,20,4	script	Ashe	4_F_SISTER,{
+	switch(hg_odin) {
 		case 0:
 			mes "[Ashe]";
 			mes "Hello, may I help you?";
@@ -9956,7 +9062,7 @@ hu_in01,16,20,4	script	Ashe	95,{
 			close;
 			
 		case 15:
-			if(countitem(7511) > 4)
+			if (countitem(7511) > 4)
 			{
 				mes "[Ashe]";
 				mes "Well, it looks like";
@@ -10006,11 +9112,9 @@ hu_in01,16,20,4	script	Ashe	95,{
 	}
 }
 
-hu_in01,174,90,0	script	Entrance	139,2,2,{
-
+hu_in01,174,90,0	script	Entrance	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
-	if(hg_odin == 22 || hg_odin == 23)
-	{
+	if (hg_odin == 22 || hg_odin == 23) {
 		mes "[Laura]";
 		mes "So it means that everyone fooled me!";
 		next;
@@ -10019,10 +9123,8 @@ OnTouch:
 	}
 }
 
-hu_in01,159,84,3	script	Laura#2	70,{
-
-	if(hg_odin == 22 || hg_odin == 23)
-	{
+hu_in01,159,84,3	script	Laura#2	1_F_GYPSY,{
+	if (hg_odin == 22 || hg_odin == 23) {
 		cutin "hu_laura03.bmp",2;
 		emotion e_an,0,"Laura#2";
 		mes "[Laura]";
@@ -10171,9 +9273,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		close2;
 		cutin "hu_alex04.bmp",255;
 		end;
-	}
-	else if(hg_odin > 23)
-	{
+	} else if (hg_odin > 23) {
 		cutin "hu_laura03.bmp",2;
 		emotion e_an,0,"Laura#2";
 		mes "[Laura]";
@@ -10191,20 +9291,16 @@ hu_in01,159,84,3	script	Laura#2	70,{
 	}
 }
 
-hu_in01,158,84,5	duplicate(Laura#2)	Alex#2	803,0,0
-
-hu_in01,162,85,4	script	Ashe#2	95,{
+hu_in01,158,84,5	duplicate(Laura#2)	Alex#2	1_F_SIGNZISK,0,0
 
-	if(hg_odin == 22 || hg_odin == 23)
-	{
+hu_in01,162,85,4	script	Ashe#2	4_F_SISTER,{
+	if (hg_odin == 22 || hg_odin == 23) {
 		mes "[Ashe]";
 		mes "This...";
 		mes "This doesn't";
 		mes "look good at all!";
 		close;
-	}
-	else if(hg_odin == 25)
-	{
+	} else if (hg_odin == 25) {
 		mes "^3355FFAshe picked up";
 		mes "the file that Laura";
 		mes "tossed away.^000000";
@@ -10225,15 +9321,14 @@ hu_in01,162,85,4	script	Ashe#2	95,{
 		mes "you for all your help, friend.";
 		next;
 		set hg_odin,59;
+		changequest 11007,11008;
 		mes "[Ashe]";
 		mes "Don't worry, my comrade";
 		mes "at Morroc's South Gate will";
 		mes "explain everything once you";
 		mes "find him. Please hurry!";
 		close;
-	}
-	else if(hg_odin == 59)
-	{
+	} else if (hg_odin == 59) {
 		mes "[Ashe]";
 		mes "Don't worry, my comrade";
 		mes "at Morroc's South Gate will";
@@ -10244,11 +9339,9 @@ hu_in01,162,85,4	script	Ashe#2	95,{
 	}
 }
 
-hu_in01,171,90,0	script	Ashe#3	139,2,2,{
-
+hu_in01,171,90,0	script	Ashe#3	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
-	if(hg_odin == 25)
-	{
+	if (hg_odin == 25) {
 		mes "^3355FFAshe picked up";
 		mes "the file that Laura";
 		mes "tossed away.^000000";
@@ -10278,10 +9371,8 @@ OnTouch:
 	}
 }
 
-hu_in01,155,82,4	script	Julian#2	86,{
-
-	if (hg_odin == 22 || hg_odin == 23)
-	{
+hu_in01,155,82,4	script	Julian#2	4_M_04,{
+	if (hg_odin == 22 || hg_odin == 23) {
 		mes "[Julian]";
 		mes "I...";
 		mes "I don't know";
@@ -10297,15 +9388,13 @@ hu_in01,155,82,4	script	Julian#2	86,{
 	close;
 }
 
-moc_fild12,160,372,0	script	Hit	139,{
+moc_fild12,160,372,0	script	Hit	HIDDEN_WARP_NPC,{
 	end;
 }
 
-moc_fild12,160,365,0	script	Ashe#4	139,4,4,{
-
+moc_fild12,160,365,0	script	Ashe#4	HIDDEN_WARP_NPC,4,4,{
 OnTouch:
-	if(hg_odin == 59)
-	{
+	if (hg_odin == 59) {
 		mes "[???]";
 		mes "...Silence.";
 		next;
@@ -10339,8 +9428,7 @@ OnTouch:
 		mes "I leave, have you got any";
 		mes "questions? Otherwise, I'll go.";
 		next;
-		switch( select( "Who's Ashe?","What happened to Laura?" ) )
-		{
+		switch(select("Who's Ashe?:What happened to Laura?")) {
 			case 1:
 				mes "[???]";
 				mes "You'll never see her";
@@ -10391,8 +9479,9 @@ OnTouch:
 		mes "used... Like that one lady,";
 		mes "that archaeologist, Laura.";
 		next;
-		getexp 70000,0;
+		getexp (checkre(3))?100000:700000,0;
 		set hg_odin,60;
+		completequest 11008;
 		mes "[???]";
 		mes "...Thanks for";
 		mes "the file. Take care.";
@@ -10401,8 +9490,7 @@ OnTouch:
 	}
 }
 
-hugel,209,109,2	script	Boatman#hugel	709,{
-
+hugel,209,109,2	script	Boatman#hugel	4_M_SEAMAN,{
 	mes "[Boatman]";
 	mes "Ah, hello~";
 	mes "Would you like to sail";
@@ -10410,8 +9498,7 @@ hugel,209,109,2	script	Boatman#hugel	709,{
 	mes "fare for 1 passenger is";
 	mes "800 zeny. Shall we board?";
 	next;
-	switch( select( "No, thanks.","Sure!" ) )
-	{
+	switch(select("No, thanks.:Sure!")) {
 		case 1:
 			mes "[Boatman]";
 			mes "Ah, alright.";
@@ -10438,26 +9525,24 @@ hugel,209,109,2	script	Boatman#hugel	709,{
 			mes "We'll arrive near";
 			mes "the Odin Shrine soon~";
 			close2;
-			set Zeny,Zeny -800;
+			Zeny -= 800;
 			if (hg_odin == 2) set hg_odin,3;
-			else if(hg_odin == 4) set hg_odin,5;
-			else if(hg_odin == 12) set hg_odin,13;
-			else if(hg_odin == 14) set hg_odin,15;
+			else if (hg_odin == 4) set hg_odin,5;
+			else if (hg_odin == 12) set hg_odin,13;
+			else if (hg_odin == 14) set hg_odin,15;
 			warp "odin_tem01",100,146;
 			end;
 	}
 }
 
-odin_tem01,93,146,4	script	Boatman	709,{
-
+odin_tem01,93,146,4	script	Boatman	4_M_SEAMAN,{
 	mes "[Boatman]";
 	mes "Ah, would you";
 	mes "like to sail back to";
 	mes "Hugel now, or did you";
 	mes "want to explore a bit more?";
 	next;
-	switch( select( "I still need to look around...","Yes, take me back to Hugel." ) )
-	{
+	switch(select("I still need to look around...:Yes, take me back to Hugel.")) {
 		case 1:
 			mes "[Boatman]";
 			mes "Well, alright.";
@@ -10479,35 +9564,32 @@ odin_tem01,93,146,4	script	Boatman	709,{
 }
 
 odin_tem03,4,2,0	script	OdinInit	-1,{
-
 OnInit:
 	initnpctimer;
 	end;
 
 OnTimer100000:
 	stopnpctimer;
-	switch(rand(1,5))
-	{
-		case 1:
-			donpcevent "warpinside#1::OnEnter";
-			end;
-		case 2:
-			donpcevent "warpinside#2::OnEnter";
-			end;
-		case 3:
-			donpcevent "warpinside#3::OnEnter";
-			end;
-		case 4:
-			donpcevent "warpinside#4::OnEnter";
-			end;
-		case 5:
-			donpcevent "warpinside#5::OnEnter";
-			end;
+	switch(rand(1,5)) {
+	case 1:
+		donpcevent "warpinside#1::OnEnter";
+		end;
+	case 2:
+		donpcevent "warpinside#2::OnEnter";
+		end;
+	case 3:
+		donpcevent "warpinside#3::OnEnter";
+		end;
+	case 4:
+		donpcevent "warpinside#4::OnEnter";
+		end;
+	case 5:
+		donpcevent "warpinside#5::OnEnter";
+		end;
 	}
 }
 
-odin_tem03,266,302,0	script	warpinside#1	139,3,3,{
-
+odin_tem03,266,302,0	script	warpinside#1	HIDDEN_WARP_NPC,3,3,{
 OnInit:
 	disablenpc "warpinside#1";
 	end;
@@ -10517,25 +9599,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#2::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#3::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#4::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#5::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#2::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#3::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#4::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#5::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#1";
 		set hg_odin,21;
@@ -10544,8 +9621,7 @@ OnTouch:
 	}
 }
 
-odin_tem03,288,271,0	script	warpinside#2	139,3,3,{
-
+odin_tem03,288,271,0	script	warpinside#2	HIDDEN_WARP_NPC,3,3,{
 OnInit:
 	disablenpc "warpinside#2";
 	end;
@@ -10555,25 +9631,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#1::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#3::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#4::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#5::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#1::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#3::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#4::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#5::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#2";
 		set hg_odin,21;
@@ -10582,8 +9653,7 @@ OnTouch:
 	}
 }
 
-odin_tem03,283,241,0	script	warpinside#3	139,3,3,{
-
+odin_tem03,283,241,0	script	warpinside#3	HIDDEN_WARP_NPC,3,3,{
 OnInit:
 	disablenpc "warpinside#3";
 	end;
@@ -10593,25 +9663,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#1::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#2::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#4::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#5::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#1::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#2::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#4::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#5::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#3";
 		set hg_odin,21;
@@ -10620,8 +9685,7 @@ OnTouch:
 	}
 }
 
-odin_tem03,179,275,0	script	warpinside#4	139,3,3,{
-
+odin_tem03,179,275,0	script	warpinside#4	HIDDEN_WARP_NPC,3,3,{
 OnInit:
 	disablenpc "warpinside#4";
 	end;
@@ -10631,25 +9695,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#1::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#2::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#3::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#5::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#1::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#2::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#3::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#5::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#4";
 		set hg_odin,21;
@@ -10658,8 +9717,7 @@ OnTouch:
 	}
 }
 
-odin_tem03,320,264,0	script	warpinside#5	139,3,3,{
-
+odin_tem03,320,264,0	script	warpinside#5	HIDDEN_WARP_NPC,3,3,{
 OnInit:
 	disablenpc "warpinside#5";
 	end;
@@ -10669,25 +9727,20 @@ OnEnter:
 	end;
 
 OnTouch:
-	if(hg_odin > 19 && hg_odin < 23)
-	{
-		switch(rand(1,4))
-		{
-			case 1:
-				donpcevent "warpinside#1::OnEnter";
-				break;
-				
-			case 2:
-				donpcevent "warpinside#2::OnEnter";
-				break;
-				
-			case 3:
-				donpcevent "warpinside#3::OnEnter";
-				break;
-				
-			case 4:
-				donpcevent "warpinside#4::OnEnter";
-				break;
+	if (hg_odin > 19 && hg_odin < 23) {
+		switch(rand(1,4)) {
+		case 1:
+			donpcevent "warpinside#1::OnEnter";
+			break;
+		case 2:
+			donpcevent "warpinside#2::OnEnter";
+			break;
+		case 3:
+			donpcevent "warpinside#3::OnEnter";
+			break;
+		case 4:
+			donpcevent "warpinside#4::OnEnter";
+			break;
 		}
 		disablenpc "warpinside#5";
 		set hg_odin,21;
@@ -10696,8 +9749,7 @@ OnTouch:
 	}
 }
 
-hu_in01,99,90,0	script	Empty	139,3,3,{
-
+hu_in01,99,90,0	script	Empty	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	mes "^3355FFThis place is empty.";
 	mes "Everyone must";
@@ -10705,11 +9757,9 @@ OnTouch:
 	close;
 }
 
-que_hugel,35,29,5	script	object#1	139,2,2,{
-
+que_hugel,35,29,5	script	object#1	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
-	if(hg_odin == 21)
-	{
+	if (hg_odin == 21) {
 		mes "^3355FFA weathered structure";
 		mes "of the Odin Shrine is";
 		mes "half buried beneath the";
@@ -10720,62 +9770,58 @@ OnTouch:
 		mes "......";
 		mes ".........";
 		next;
-		switch( select( "Pass","Explore" ) )
-		{
-			case 1:
-				mes "^3355FFYou decided to pass";
-				mes "by the shrine's remnants.^000000";
-				close;
-				
-			case 2:
-				if (rand(1,3) == 1)
-				{
-					mes "^3355FFYou catch a bright";
-					mes "shimmer among the";
-					mes "remnants of the shrine.^000000";
+		switch(select("Pass:Explore")) {
+		case 1:
+			mes "^3355FFYou decided to pass";
+			mes "by the shrine's remnants.^000000";
+			close;
+		case 2:
+			if (rand(1,3) == 1) {
+				mes "^3355FFYou catch a bright";
+				mes "shimmer among the";
+				mes "remnants of the shrine.^000000";
+				next;
+				switch(select("Ignore:Pick it up")) {
+				case 1:
+					mes "^3355FFYou decide to continue";
+					mes "searching through the";
+					mes "shrine's ruins.^000000";
+					close;
+				case 2:
+					mes "^3355FFYou find a shining stone";
+					mes "within the ruins, and carefully";
+					mes "put it into your bag.^000000";
 					next;
-					switch( select( "Ignore","Pick it up" ) )
-					{
-						case 1:
-							mes "^3355FFYou decide to continue";
-							mes "searching through the";
-							mes "shrine's ruins.^000000";
-							close;
-						
-						case 2:
-							mes "^3355FFYou find a shining stone";
-							mes "within the ruins, and carefully";
-							mes "put it into your bag.^000000";
-							next;
-							mes "^FF0000Thud!^000000";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "What...?";
-							mes "What was";
-							mes "that noise?!";
-							next;
-							specialeffect EF_LORD;
-							specialeffect EF_LORD;
-							specialeffect EF_LORD;
-							mes "["+strcharinfo(0)+"]";
-							mes "Wa...waaaahhhh!";
-							close2;
-							set hg_odin,22;
-							warp "que_hugel",163,31;
-							end;
-					}
+					mes "^FF0000Thud!^000000";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "What...?";
+					mes "What was";
+					mes "that noise?!";
+					next;
+					specialeffect EF_LORD;
+					specialeffect EF_LORD;
+					specialeffect EF_LORD;
+					mes "["+strcharinfo(0)+"]";
+					mes "Wa...waaaahhhh!";
+					close2;
+					set hg_odin,22;
+					warp "que_hugel",163,31;
+					end;
 				}
-				mes "^3355FFUnfortunately, you";
-				mes "were unable to find";
-				mes "anything in the ruins.^000000";
-				close;
+			}
+			mes "^3355FFUnfortunately, you";
+			mes "were unable to find";
+			mes "anything in the ruins.^000000";
+			close;
 		}
+	} else if (hg_odin == 22) {
+		warp "que_hugel",163,31;
+		end;
 	}
-	else if(hg_odin == 22) { warp "que_hugel",163,31; end; }
 }
 
-que_hugel,163,31,0	script	object#2	139,3,3,{
-
+que_hugel,163,31,0	script	object#2	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	mes "^3355FFWhen you come back";
 	mes "to your senses, you";
@@ -10784,11 +9830,9 @@ OnTouch:
 	close;
 }
 
-que_hugel,163,178,0	script	object#3	139,3,3,{
-
+que_hugel,163,178,0	script	object#3	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
-	if(hg_odin == 22)
-	{
+	if (hg_odin == 22) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Huh?";
 		mes "What's happening?";
@@ -10802,11 +9846,9 @@ OnTouch:
 	}
 }
 
-hu_in01,15,108,0	script	alex#warp	45,1,1,{
-
+hu_in01,15,108,0	script	alex#warp	WARPNPC,1,1,{
 OnTouch:
-	if(hg_odin == 17)
-	{
+	if (hg_odin == 17) {
 		mes "[Alex]";
 		mes "Haven't you found it yet?";
 		mes "You said that it'd be here!";
@@ -10884,38 +9926,31 @@ OnTouch:
 		mes "We'll continue this";
 		mes "conversation later.";
 		close;
-	}
-	else if(hg_odin == 18)
-	{
+	} else if (hg_odin == 18) {
 		mes "......";
 		mes ".........";
 		close;
-	}
-	else
-	{
+	} else {
 		warp "hu_in01",15,155;
 		end;
 	}
 }
 
-hugel,52,90,0	script	alex#warp2	45,1,1,{
-
+hugel,52,90,0	script	alex#warp2	WARPNPC,1,1,{
 OnTouch:
-	if(hg_odin > 59) warp "hu_in01",102,90;
-	else if(hg_odin > 21 && hg_odin < 60) warp "hu_in01",173,90;
+	if (hg_odin > 59) warp "hu_in01",102,90;
+	else if (hg_odin > 21 && hg_odin < 60) warp "hu_in01",173,90;
 	else warp "hu_in01",33,90;
 	end;
 }
 
-hu_in01,155,70,0	script	alex#warp3	45,1,1,{
-
+hu_in01,155,70,0	script	alex#warp3	WARPNPC,1,1,{
 OnTouch:
 	mes "^3355FFThe door is locked.^000000";
 	close;
 }
 
-hu_in01,155,108,0	script	alex#warp4	45,1,1,{
-
+hu_in01,155,108,0	script	alex#warp4	WARPNPC,1,1,{
 OnTouch:
 	mes "^3355FFThe door is locked.^000000";
 	close;
diff --git a/npc/quests/quests_izlude.txt b/npc/quests/quests_izlude.txt
index 8dc2e8f31..3b20a85bf 100644
--- a/npc/quests/quests_izlude.txt
+++ b/npc/quests/quests_izlude.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Izlude
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Evera and The rAthena Dev Team
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Edgar's Offer:
-//= - [Aegis conversion]
+//= - [Official Conversion]
 //= - Variables in use: MISC_QUEST (Bit 16)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Initial release [Evera]
 //= 1.1 Updated to 10.3 standard. [L0ne_W0lf]
 //============================================================
 
-// Edgar's Offer
+// Edgar's Offer :: iz_npc
 //============================================================
 -	script	::Edgar_izlude	-1,{
 	if (MISC_QUEST & 16) {
@@ -32,7 +32,7 @@
 				mes "get some more cash?";
 				close ;
 			}
-			set zeny,zeny-250;
+			Zeny -= 250;
 			warp "alberta",195,164;
 			end;
 		}
@@ -41,7 +41,7 @@
 		close;
 	}
 	mes "[Edgar]";
-	mes "My town, Izlude,  is connected to Alberta by the harbor in the West. There is so much traffic between us, I almost become an Albertian.  Hehehe~";
+	mes "My town, Izlude, is connected to Alberta by the harbor in the West. There is so much traffic between us, I almost become an Albertian.  Hehehe~";
 	next;
 	mes "[Edgar]";
 	mes "There's this guy I know pretty well, Phelix, who lives in Alberta. That guy is really stingy... He charges for everything!";
@@ -79,7 +79,7 @@
 				mes "some more.";
 				close;
 			}
-			set zeny,zeny-250;
+			Zeny -= 250;
 			warp "alberta",195,164;
 			end;
 		}
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 0f1fbfe77..e842882fe 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -3,1218 +3,946 @@
 //===== By ===================================================
 //= MasterOfMuppets
 //===== Version ==============================================
-//= 1.7
+//= 1.9
 //===== Description ==========================================
-//= [Partial Aegis COnversion]
+//= [Partial Official Conversion]
 //= Juperos Ruins related Quests/Events
 //===== Comments =============================================
 //= 1.0 First version, partly implemented [MasterOfMuppets]
 //= 1.1 Added official Juperos Ruins History Quest. Thanks
-//= to Keplerk for his first version. [SinSloth]
+//=     to Keplerk for his first version. [SinSloth]
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.3 Removed semi-official core access NPCs, replaced with [L0ne_W0lf]
-//=	event-driven story progressive NPCs. Optimization needed.
+//=     event-driven story progressive NPCs. Optimization needed.
 //= 1.3a Adjusted the elevafor timer. (132000 -> 142000) [L0ne_W0lf]
 //= 1.3b Minor updates to juperos elevator NPCs. [L0ne_W0lf]
 //= 1.4 Fixed Elevator not working after failing once. [L0ne_W0lf]
 //= 1.5 Lots of Fixes, missing stopnpctimers, cleanup. [Zephyrus]
 //= 1.6 Added missing close in "Popular Feats" [L0ne_W0lf]
 //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.8 Updated RE/Pre-RE EXP. [Euphy]
+//= 1.9 Added GM management NPC. [Euphy]
 //============================================================
 
-yuno_in04,190,125,4	script	Scholar	700,{
-
-	switch(yuno_hist)
-	{
-		case 0:
+yuno_in04,190,125,4	script	Scholar	8_F_GIRL,{
+	switch(yuno_hist) {
+	case 0:
+		mes "[Scholar]";
+		mes "...Mm? ";
+		mes "...Yes?";
+		next;
+		mes "[Scholar]";
+		mes "...";
+		mes "......";
+		mes "May I help you?";
+		next;
+		switch(select("Oh! N-Nothing!:Excuse me...")) {
+		case 1:
 			mes "[Scholar]";
-			mes "...Mm? ";
-			mes "...Yes?";
+			mes "...";
+			mes "......";
+			mes "Hmm?";
+			mes "...........";
+			mes "Hmpf.";
+			close;
+		case 2:
+			mes "[Scholar]";
+			mes "...";
+			mes "......";
+			mes "Hmm?";
+			mes "...........";
+			mes "Hmmm...";
 			next;
 			mes "[Scholar]";
+			mes "You must be lost.";
+			mes "This is the scholarly";
+			mes "research section, you know,";
+			mes "content you couldn't possibly";
+			mes "fathom. The popular novels and picture books are someplace else.";
+			next;
+			mes "["+strcharinfo(0)+"]";
 			mes "...";
 			mes "......";
-			mes "May I help you?";
 			next;
-			switch( select( "Oh! N-Nothing!","Excuse me..." ) )
-			{
-				case 1:
-					mes "[Scholar]";
-					mes "...";
-					mes "......";
-					mes "Hmm?";
-					mes "...........";
-					mes "Hmpf.";
-					close;
-			
-				case 2:
-					mes "[Scholar]";
-					mes "...";
-					mes "......";
-					mes "Hmm?";
-					mes "...........";
-					mes "Hmmm...";
-					next;
-					mes "[Scholar]";
-					mes "You must be lost.";
-					mes "This is the scholarly";
-					mes "research section, you know,";
-					mes "content you couldn't possibly";
-					mes "fathom. The popular novels and picture books are someplace else.";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "...";
-					mes "......";
-					next;
-					mes "[Scholar]";
-					mes "Why don't you rummage";
-					mes "through the bookshelves?";
-					mes "I'm sure you can find some";
-					mes "book there that can hold your";
-					mes "interest. Well, depending on";
-					mes "your actual attention span...";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "(What's her damage?!";
-					mes "Does she have an attitude problem or is she just stuck-up?)";
-					close;
-			}
-
+			mes "[Scholar]";
+			mes "Why don't you rummage";
+			mes "through the bookshelves?";
+			mes "I'm sure you can find some";
+			mes "book there that can hold your";
+			mes "interest. Well, depending on";
+			mes "your actual attention span...";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "(What's her damage?!";
+			mes "Does she have an attitude problem or is she just stuck-up?)";
+			close;
+		}
+	case 1:
+		mes "[Scholar]";
+		mes "...Mm? ";
+		mes "...Yes?";
+		next;
+		mes "[Scholar]";
+		mes "...";
+		mes "......";
+		mes "May I help you?";
+		next;
+		switch(select("Oh! N-Nothing!:By any chance...")) {
 		case 1:
 			mes "[Scholar]";
-			mes "...Mm? ";
-			mes "...Yes?";
+			mes "...";
+			mes "......";
+			mes "Hmm?";
+			mes "...........";
+			mes "Hmpf.";
+			close;
+		case 2:
+			mes "["+strcharinfo(0)+"]";
+			mes "By any chance...";
+			mes "Are you conducting";
+			mes "research about Juperos?";
 			next;
 			mes "[Scholar]";
+			mes "Why yes, that is";
+			mes "correct. But how did";
+			mes "you come to learn about";
+			mes "my current research project?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Oh, I managed to read";
+			mes "a thesis paper entitled,";
+			mes "''The Fall of Juperos,'' and";
+			mes "I just thought that the writing";
+			mes "style and your personality";
+			mes "seem to match for some reason.";
+			next;
+			mes "[Scholar]";
+			mes "Oh...! You read my";
+			mes "thesis? So what did";
+			mes "you think about it?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "So far, it's alright, but";
+			mes "quite frankly it's incomplete.";
+			mes "I mean, you don't have much in";
+			mes "in the way of conjecture, much";
+			mes "less any evidence to back up";
+			mes "any of your statements.";
+			next;
+			mes "[Scholar]";
+			mes "....";
+			mes "Let me apologize for";
+			mes "being rude to you earlier.";
+			mes "As you know, my name is";
+			mes "Fayruz Khrhiyha. May I ask";
+			mes "what your name might be?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "I'm "+strcharinfo(0)+",";
+			mes "a brave adventurer in the";
+			mes "service of his royal majesty,";
+			mes "the wise and benevolent";
+			mes "King Tristram III.";
+			set yuno_hist,2;
+			next;
+			mes "[Fayruz]";
+			mes "Well, "+strcharinfo(0)+",";
+			mes "I understand that my thesis";
+			mes "still requires more evidence.";
+			mes "But I'd need some ancient";
+			mes "documents from Juperos";
+			mes "to complete my research...";
+			next;
+			mes "[Fayruz]";
+			mes "If you happen to travel";
+			mes "through Juperos and find";
+			mes "any ancient documents, would";
+			mes "you bring them to me? Having";
+			mes "those would help my research";
+			mes "efforts immensely. Thank you...";
+			close;
+		}
+	case 2:
+		if ((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355))) {
+			mes "[Fayruz]";
+			mes "Ah, it's you! Listen,";
+			mes "I just found a record of";
+			mes "an adventurer who explored";
+			mes "Juperos. There's mention";
+			mes "of a stone statue here that";
+			mes "just might be noteworthy...";
+			next;
+			mes "[Fayruz]";
+			mes "If you happen to find";
+			mes "yourself in Juperos,";
+			mes "would you find the stone";
+			mes "statue at the entrance of";
+			mes "its dungeon and read the";
+			mes "engraved message for me?";
+			next;
+			mes "[Fayruz]";
+			mes "According to my notes,";
+			mes "there's a spell that will";
+			mes "make its reader memorize";
+			mes "its message, even if they don't";
+			mes "know the language. So come";
+			mes "to me if you manage to read it.";
+			close;
+		}
+		mes "[Fayruz]";
+		mes "If you ever chance to";
+		mes "travel through Juperos,";
+		mes "would you let me know if you";
+		mes "find anything that might help";
+		mes "my research there? I'd be";
+		mes "very grateful for your help.";
+		close;
+	case 3:
+		mes "[Fayruz]";
+		mes "Well, you look";
+		mes "quite pleased.";
+		mes "May I asked what";
+		mes "happened to put that";
+		mes "expression on your face?";
+		next;
+		switch(select("I found something in Juperos.:Nothing much.")) {
+		case 1:
+			mes "[" +strcharinfo(0)+"]";
+			mes "I went to Juperos like";
+			mes "you asked and found that";
+			mes "stone statue you were talking";
+			mes "about. Just like you said, there was an engraved message on it.";
+			next;
+			mes "[Fayruz]";
+			mes "Fascinating!";
+			mes "So is it really enchanted";
+			mes "so anyone can memorize it?";
+			mes "Wh-what does the message say?";
+			next;
+			mes "^3355FFYou recite the message";
+			mes "engraved on the stone";
+			mes "statue, unable to interpret";
+			mes "the sounds you're uttering,";
+			mes "but weirdly enough, you can";
+			mes "easily recall them from memory.^000000";
+			next;
+			mes "[Fayruz]";
+			mes "Ah, I see! Wait,";
+			mes "give me a moment to";
+			mes "properly translate this...";
+			next;
 			mes "...";
 			mes "......";
-			mes "May I help you?";
+			mes ".........";
 			next;
-			switch( select( "Oh! N-Nothing!","By any chance..." ) )
-			{
-				case 1:
-					mes "[Scholar]";
-					mes "...";
-					mes "......";
-					mes "Hmm?";
-					mes "...........";
-					mes "Hmpf.";
-					close;
-			
-				case 2:
-					mes "["+strcharinfo(0)+"]";
-					mes "By any chance...";
-					mes "Are you conducting";
-					mes "research about Juperos?";
-					next;
-					mes "[Scholar]";
-					mes "Why yes, that is";
-					mes "correct. But how did";
-					mes "you come to learn about";
-					mes "my current research project?";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "Oh, I managed to read";
-					mes "a thesis paper entitled,";
-					mes "''The Fall of Juperos,'' and";
-					mes "I just thought that the writing";
-					mes "style and your personality";
-					mes "seem to match for some reason.";
-					next;
-					mes "[Scholar]";
-					mes "Oh...! You read my";
-					mes "thesis? So what did";
-					mes "you think about it?";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "So far, it's alright, but";
-					mes "quite frankly it's incomplete.";
-					mes "I mean, you don't have much in";
-					mes "in the way of conjecture, much";
-					mes "less any evidence to back up";
-					mes "any of your statements.";
-					next;
-					mes "[Scholar]";
-					mes "....";
-					mes "Let me apologize for";
-					mes "being rude to you earlier.";
-					mes "As you know, my name is";
-					mes "Fayruz Khrhiyha. May I ask";
-					mes "what your name might be?";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "I'm "+strcharinfo(0)+",";
-					mes "a brave adventurer in the";
-					mes "service of his royal majesty,";
-					mes "the wise and benevolent";
-					mes "King Tristram III.";
-					set yuno_hist,2;
-					next;
-					mes "[Fayruz]";
-					mes "Well, "+strcharinfo(0)+",";
-					mes "I understand that my thesis";
-					mes "still requires more evidence.";
-					mes "But I'd need some ancient";
-					mes "documents from Juperos";
-					mes "to complete my research...";
-					next;
-					mes "[Fayruz]";
-					mes "If you happen to travel";
-					mes "through Juperos and find";
-					mes "any ancient documents, would";
-					mes "you bring them to me? Having";
-					mes "those would help my research";
-					mes "efforts immensely. Thank you...";
-					close;
-			}
-
+			mes "[Fayruz]";
+			mes "It means, ''Do you wish to";
+			mes "see the end of the madness?";
+			mes "He is waiting where the three";
+			mes "columns were destroyed, where";
+			mes "two hundred illusions wander.''";
+			next;
+			mes "[Fayruz]";
+			mes "''You will see him, the one";
+			mes "who was vain and extravagant,";
+			mes "with your own eyes at the place where the light passes through.";
+			set yuno_hist,4;
+			next;
+			mes "[Fayruz]";
+			mes "Ah, usually, descriptions";
+			mes "of the ''vain and extravagant";
+			mes "one'' refer to the mad scientist rumored to have lived in that";
+			mes "ancient era. But if this is true, I may have to rework my thesis...";
+			next;
+			mes "[Fayruz]";
+			mes "I have another favor to";
+			mes "ask of you. If you find any";
+			mes "object of historical significance in Juperos, would you bring it to";
+			mes "me? I'll reward you, of course.";
+			next;
+			mes "[Fayruz]";
+			mes "It would be most helpful";
+			mes "if you could manage to find";
+			mes "documents that existed from that era. Fortunately, back then,";
+			mes "they made all their records on material more durable than paper.";
+			close;
 		case 2:
-			if((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355)))
-			{
+			mes "[Fayruz]";
+			mes "Nothing, huh?";
+			mes "My life is also fairly";
+			mes "uneventful, but somehow,";
+			mes "I'm don't think I'm content.";
+			close;
+		}
+	case 4:
+		mes "[Fayruz]";
+		mes "Oh hello, "+strcharinfo(0)+".";
+		mes "So what brings you to";
+		mes "the Juno Library today?";
+		next;
+		switch(select("Nice weather today, isn't it?:I found something in Juperos.:Nothing much.")) {
+		case 1:
+			mes "[Fayruz]";
+			mes "Well, I wouldn't know.";
+			mes "It's late whenever I go";
+			mes "out, so I always happen to";
+			mes "miss the sunlight. I guess";
+			mes "I really miss nice weather";
+			mes "sometimes, you know?";
+			close;
+		case 2:
+			if ((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355))) {
 				mes "[Fayruz]";
-				mes "Ah, it's you! Listen,";
-				mes "I just found a record of";
-				mes "an adventurer who explored";
-				mes "Juperos. There's mention";
-				mes "of a stone statue here that";
-				mes "just might be noteworthy...";
+				mes "Oh, really?!";
+				mes "That's great news!";
+				mes "W-what did you find?";
 				next;
-				mes "[Fayruz]";
-				mes "If you happen to find";
-				mes "yourself in Juperos,";
-				mes "would you find the stone";
-				mes "statue at the entrance of";
-				mes "its dungeon and read the";
-				mes "engraved message for me?";
+				mes "^3355FFIn her excitement,";
+				mes "Fayruz begins to";
+				mes "rummage through your";
+				mes "things before you get";
+				mes "the chance to answer her.^000000";
 				next;
 				mes "[Fayruz]";
-				mes "According to my notes,";
-				mes "there's a spell that will";
-				mes "make its reader memorize";
-				mes "its message, even if they don't";
-				mes "know the language. So come";
-				mes "to me if you manage to read it.";
-				close;
+				mes "Oh, this must be it!";
+				mes "Would you mind if I keep";
+				mes "this Transparent Plate for";
+				mes "my research? In return, I'll";
+				mes "tell you some tales about";
+				mes "Juperos that I've learned.";
+				next;
+				switch(select("Please, be my guest.:No way, you can't have it.")) {
+				case 1:
+					if (countitem(7352)) callfunc "Func_JupHist",7352,1;
+					else if (countitem(7353)) callfunc "Func_JupHist",7353,2;
+					else if (countitem(7354)) callfunc "Func_JupHist",7354,4;
+					else if (countitem(7355)) callfunc "Func_JupHist",7352,8;
+				case 2:
+					mes "[Fayruz]";
+					mes "Mm? Are you serious?";
+					mes "This object is very valuable";
+					mes "to a researcher like me, but";
+					mes "I have no idea what use it";
+					mes "would be for an adventurer.";
+					mes "Well, you have your reasons...";
+					close;
+				}
 			}
 			mes "[Fayruz]";
-			mes "If you ever chance to";
-			mes "travel through Juperos,";
-			mes "would you let me know if you";
-			mes "find anything that might help";
-			mes "my research there? I'd be";
-			mes "very grateful for your help.";
+			mes "Oh, really?!";
+			mes "That's great news!";
+			mes "W-what did you find?";
+			next;
+			mes "^3355FFIn her excitement,";
+			mes "Fayruz begins to";
+			mes "rummage through your";
+			mes "things before you get";
+			mes "the chance to answer her.^000000";
+			next;
+			mes "[Fayruz]";
+			mes "Oh. There isn't anything";
+			mes "here that would help in my";
+			mes "research, but thank you anyway.";
+			mes "If you find anything else while";
+			mes "you're in Juperos, please come back and show it to me, alright?";
 			close;
-
 		case 3:
 			mes "[Fayruz]";
-			mes "Well, you look";
-			mes "quite pleased.";
-			mes "May I asked what";
-			mes "happened to put that";
-			mes "expression on your face?";
+			mes "Ah, I see. Well, while";
+			mes "you're here, why don't you";
+			mes "read something? There are";
+			mes "many books that cover some";
+			mes "interesting topics, like the";
+			mes "Schwaltzvalt economy...";
 			next;
-			switch( select( "I found something in Juperos.","Nothing much." ) )
-			{
-		
-				case 1:
-					mes "[" +strcharinfo(0)+"]";
-					mes "I went to Juperos like";
-					mes "you asked and found that";
-					mes "stone statue you were talking";
-					mes "about. Just like you said, there was an engraved message on it.";
-					next;
-					mes "[Fayruz]";
-					mes "Fascinating!";
-					mes "So is it really enchanted";
-					mes "so anyone can memorize it?";
-					mes "Wh-what does the message say?";
-					next;
-					mes "^3355FFYou recite the message";
-					mes "engraved on the stone";
-					mes "statue, unable to interpret";
-					mes "the sounds you're uttering,";
-					mes "but weirdly enough, you can";
-					mes "easily recall them from memory.^000000";
-					next;
-					mes "[Fayruz]";
-					mes "Ah, I see! Wait,";
-					mes "give me a moment to";
-					mes "properly translate this...";
-					next;
-					mes "...";
-					mes "......";
-					mes ".........";
-					next;
-					mes "[Fayruz]";
-					mes "It means, ''Do you wish to";
-					mes "see the end of the madness?";
-					mes "He is waiting where the three";
-					mes "columns were destroyed, where";
-					mes "two hundred illusions wander.''";
-					next;
-					mes "[Fayruz]";
-					mes "''You will see him, the one";
-					mes "who was vain and extravagant,";
-					mes "with your own eyes at the place where the light passes through.";
-					set yuno_hist,4;
-					next;
-					mes "[Fayruz]";
-					mes "Ah, usually, descriptions";
-					mes "of the ''vain and extravagant";
-					mes "one'' refer to the mad scientist rumored to have lived in that";
-					mes "ancient era. But if this is true, I may have to rework my thesis...";
-					next;
-					mes "[Fayruz]";
-					mes "I have another favor to";
-					mes "ask of you. If you find any";
-					mes "object of historical significance in Juperos, would you bring it to";
-					mes "me? I'll reward you, of course.";
-					next;
-					mes "[Fayruz]";
-					mes "It would be most helpful";
-					mes "if you could manage to find";
-					mes "documents that existed from that era. Fortunately, back then,";
-					mes "they made all their records on material more durable than paper.";
-					close;
-
-				case 2:
-					mes "[Fayruz]";
-					mes "Nothing, huh?";
-					mes "My life is also fairly";
-					mes "uneventful, but somehow,";
-					mes "I'm don't think I'm content.";
-					close;
+			mes "[Fayruz]";
+			mes "Oh, in any case, please";
+			mes "don't forget the favor I asked";
+			mes "of you. If you find anything";
+			mes "in Juperos that's historically";
+			mes "significant, I'd appreciate it";
+			mes "if you bring it right away.";
+			close;
+		}
+	case 5:
+		mes "[Fayruz]";
+		mes "Oh, "+strcharinfo(0)+"!";
+		mes "Have you come back with";
+		mes "something from Juperos?";
+		mes "I've been hoping you'd come";
+		mes "back with something that'd";
+		mes "help me in my research!";
+		next;
+		switch(select("Take a look at this.:Oh, I'm sorry...")) {
+		case 1:
+			switch(jupe_hist) {
+				case 1: callfunc "Func_JupHist",7353,7354,7355,7352;
+				case 2: callfunc "Func_JupHist",7352,7354,7355,7353;
+				case 4: callfunc "Func_JupHist",7352,7353,7355,7354;
+				case 8: callfunc "Func_JupHist",7352,7353,7354,7355;
 			}
-
-		case 4:
+		case 2:
 			mes "[Fayruz]";
-			mes "Oh hello, "+strcharinfo(0)+".";
-			mes "So what brings you to";
-			mes "the Juno Library today?";
+			mes "Ah, I see. Well, while";
+			mes "you're here, why don't you";
+			mes "read something? There are";
+			mes "many books that cover some";
+			mes "interesting topics, like...";
+			mes "like... Self-Honesty (?).";
 			next;
-			switch( select ( "Nice weather today, isn't it?","I found something in Juperos.","Nothing much.") )
-			{
-				case 1:
-					mes "[Fayruz]";
-					mes "Well, I wouldn't know.";
-					mes "It's late whenever I go";
-					mes "out, so I always happen to";
-					mes "miss the sunlight. I guess";
-					mes "I really miss nice weather";
-					mes "sometimes, you know?";
-					close;
-			
-				case 2:
-					if((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355)))
-					{
-						mes "[Fayruz]";
-						mes "Oh, really?!";
-						mes "That's great news!";
-						mes "W-what did you find?";
-						next;
-						mes "^3355FFIn her excitement,";
-						mes "Fayruz begins to";
-						mes "rummage through your";
-						mes "things before you get";
-						mes "the chance to answer her.^000000";
-						next;
-						mes "[Fayruz]";
-						mes "Oh, this must be it!";
-						mes "Would you mind if I keep";
-						mes "this Transparent Plate for";
-						mes "my research? In return, I'll";
-						mes "tell you some tales about";
-						mes "Juperos that I've learned.";
-						next;
-						switch( select ("Please, be my guest.","No way, you can't have it.") )
-						{
-							case 1:
-								if(countitem(7352)) callfunc "Func_JupHist",7352,1;
-								else if(countitem(7353)) callfunc "Func_JupHist",7353,2;
-								else if(countitem(7354)) callfunc "Func_JupHist",7354,4;
-								else if(countitem(7355)) callfunc "Func_JupHist",7352,8;
-
-		
-							case 2:
-								mes "[Fayruz]";
-								mes "Mm? Are you serious?";
-								mes "This object is very valuable";
-								mes "to a researcher like me, but";
-								mes "I have no idea what use it";
-								mes "would be for an adventurer.";
-								mes "Well, you have your reasons...";
-								close;
-						}
-					}
-					mes "[Fayruz]";
-					mes "Oh, really?!";
-					mes "That's great news!";
-					mes "W-what did you find?";
-					next;
-					mes "^3355FFIn her excitement,";
-					mes "Fayruz begins to";
-					mes "rummage through your";
-					mes "things before you get";
-					mes "the chance to answer her.^000000";
-					next;
-					mes "[Fayruz]";
-					mes "Oh. There isn't anything";
-					mes "here that would help in my";
-					mes "research, but thank you anyway.";
-					mes "If you find anything else while";
-					mes "you're in Juperos, please come back and show it to me, alright?";
-					close;
-		
-				case 3:
-					mes "[Fayruz]";
-					mes "Ah, I see. Well, while";
-					mes "you're here, why don't you";
-					mes "read something? There are";
-					mes "many books that cover some";
-					mes "interesting topics, like the";
-					mes "Schwaltzvalt economy...";
-					next;
-					mes "[Fayruz]";
-					mes "Oh, in any case, please";
-					mes "don't forget the favor I asked";
-					mes "of you. If you find anything";
-					mes "in Juperos that's historically";
-					mes "significant, I'd appreciate it";
-					mes "if you bring it right away.";
-					close;
-				
+			mes "[Fayruz]";
+			mes "Oh, in any case, please";
+			mes "don't forget the favor I asked";
+			mes "of you. If you find anything";
+			mes "in Juperos that's historically";
+			mes "significant, I'd appreciate it";
+			mes "if you bring it right away.";
+			close;
+		}
+	case 6:
+		mes "[Fayruz]";
+		mes "Oh, "+strcharinfo(0)+"!";
+		mes "The Transparent Plate";
+		mes "that you brought for me";
+		mes "last time is really helping me";
+		mes "in my research. If you get the";
+		mes "chance, please bring me more!";
+		set yuno_hist,7;
+		next;
+		mes "[Fayruz]";
+		mes "This new data is adding";
+		mes "a lot more credibility to my";
+		mes "thesis. Oh, I'll be with you";
+		mes "in a moment, let me finish";
+		mes "translating this one last";
+		mes "passage really quickly...";
+		close;
+	case 7:
+		mes "[Fayruz]";
+		mes "Hello, "+strcharinfo(0)+"~";
+		mes "Oh, were you able to look";
+		mes "in Juperos for anything that";
+		mes "might help me in my research?";
+		next;
+		switch(select("Yeah, take a look at this.:No, I'm sorry...")) {
+		case 1:
+			switch(jupe_hist) {
+				case 3: callfunc "Func_JupHist",7354,7355,7352,7353;
+				case 5: callfunc "Func_JupHist",7353,7355,7352,7354;
+				case 6: callfunc "Func_JupHist",7352,7355,7353,7354;
+				case 9: callfunc "Func_JupHist",7353,7354,7352,7355;
+				case 10: callfunc "Func_JupHist",7352,7354,7353,7355;
+				case 12: callfunc "Func_JupHist",7352,7353,7354,7355;
 			}
-
-		case 5:
+		case 2:
+			mes "[Fayruz]";
+			mes "Oh, that's fine.";
+			mes "Besides, I don't really";
+			mes "have a deadline to complete";
+			mes "this research project. Still,";
+			mes "I just want you to know that";
+			mes "I really appreciate your help.";
+			close;
+		}
+	case 8:
+		mes "[Fayruz]";
+		mes ""+strcharinfo(0)+"...";
+		mes "I'm having great difficulty in";
+		mes "translating that Transparent";
+		mes "Plate you brought for me that";
+		mes "last time. I'm so frustrated...";
+		next;
+		mes "[Fayruz]";
+		mes "Wait a minute...";
+		mes "This here means...";
+		mes "Alright. Okay. Yes.";
+		mes "Yes! Of course, how";
+		mes "could I not see it before!";
+		set yuno_hist,9;
+		next;
+		mes "[Fayruz]";
+		mes "I'll be with you";
+		mes "in just a second!";
+		mes "I think I just made";
+		mes "a real through...!";
+		next;
+	case 9:
+		mes "[Fayruz]";
+		mes "Ah, I've been";
+		mes "expecting you, "+strcharinfo(0)+".";
+		mes "So did you have been to Juperos again? I'm really hoping that you";
+		mes "were able to find something new that would help in my research...";
+		next;
+		switch(select("Actually, I did find this...:I'm sorry, I haven't...")) {
+		case 1:
+			switch(jupe_hist) {
+				case 7: callfunc "Func_JupHist",7355,7352,7353,7354;
+				case 11: callfunc "Func_JupHist",7354,7352,7353,7355;
+				case 13: callfunc "Func_JupHist",7353,7352,7354,7355;
+				case 14: callfunc "Func_JupHist",7352,7353,7354,7355;
+			}
+		case 2:
 			mes "[Fayruz]";
-			mes "Oh, "+strcharinfo(0)+"!";
-			mes "Have you come back with";
-			mes "something from Juperos?";
-			mes "I've been hoping you'd come";
-			mes "back with something that'd";
-			mes "help me in my research!";
+			mes "Ah, I see. Well, while";
+			mes "you're here, why don't you";
+			mes "read something? There are";
+			mes "many books that cover some";
+			mes "interesting topics, like";
+			mes "modern adventure history.";
 			next;
-			switch( select( "Take a look at this.","Oh, I'm sorry...") )
-			{
-				case 1:
-					switch(jupe_hist)
-					{
-						case 1:
-							callfunc "Func_JupHist",7353,7354,7355,7352;
-
-						case 2:
-							callfunc "Func_JupHist",7352,7354,7355,7353;
-
-						case 4:
-							callfunc "Func_JupHist",7352,7353,7355,7354;
-
-						case 8:
-							callfunc "Func_JupHist",7352,7353,7354,7355;
-					}
-
-				case 2:
-					mes "[Fayruz]";
-				mes "Ah, I see. Well, while";
-				mes "you're here, why don't you";
-				mes "read something? There are";
-				mes "many books that cover some";
-				mes "interesting topics, like...";
-				mes "like... Self-Honesty (?).";
+			mes "[Fayruz]";
+			mes "Oh, in any case, please";
+			mes "don't forget the favor I asked";
+			mes "of you. If you find anything";
+			mes "in Juperos that's historically";
+			mes "significant, I'd appreciate it";
+			mes "if you bring it right away.";
+			close;
+		}
+	case 10:
+		mes "[Fayruz]";
+		mes "Oh hello, "+strcharinfo(0)+"...";
+		mes "So what exactly brings you";
+		mes "to the Juno Library this time?";
+		next;
+		switch(select("I found another Transparent Plate.:Just visiting, really.")) {
+		case 1:
+			if ((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355))) {
+				mes "[Fayruz]";
+				mes "Hmm, well, we've made as";
+				mes "much headway as we can";
+				mes "with the Transparent Plates";
+				mes "you've already given me, but";
+				mes "it can't hurt to have too much";
+				mes "evidence to back my theories.";
 				next;
 				mes "[Fayruz]";
-				mes "Oh, in any case, please";
-				mes "don't forget the favor I asked";
-				mes "of you. If you find anything";
-				mes "in Juperos that's historically";
-				mes "significant, I'd appreciate it";
-				mes "if you bring it right away.";
+				mes "I really appreciate";
+				mes "your continuing efforts";
+				mes "to help me. Please, would";
+				mes "you take this as my way";
+				mes "saying ''Thanks?'' You've been";
+				mes "great, "+strcharinfo(0)+"...";
+				if (countitem(7352)) delitem 7352,1;
+				else if (countitem(7353)) delitem 7353,1;
+				else if (countitem(7354)) delitem 7354,1;
+				else delitem 7355,1;
+				getitem 644,1;
 				close;
 			}
-
-		case 6:
 			mes "[Fayruz]";
-			mes "Oh, "+strcharinfo(0)+"!";
-			mes "The Transparent Plate";
-			mes "that you brought for me";
-			mes "last time is really helping me";
-			mes "in my research. If you get the";
-			mes "chance, please bring me more!";
-			set yuno_hist,7;
-			next;
+			mes "Mmm...?";
+			mes "It doesn't look like";
+			mes "you brought another";
+			mes "Transparent Plate.";
+			mes "Are you sure that you";
+			mes "didn't misplace it?";
+			close;
+		case 2:
 			mes "[Fayruz]";
-			mes "This new data is adding";
-			mes "a lot more credibility to my";
-			mes "thesis. Oh, I'll be with you";
-			mes "in a moment, let me finish";
-			mes "translating this one last";
-			mes "passage really quickly...";
+			mes "Ah, I see. Well,";
+			mes "thanks to your help,";
+			mes "I've made a great deal";
+			mes "of progress on my thesis.";
+			mes "I really appreciate what you";
+			mes "have done for me, adventurer.";
 			close;
+		}
+	}
+}
 
-		case 7:
+function	script	Func_JupHist	{
+	switch(yuno_hist) {
+	case 4:
+		mes "[Fayruz]";
+		mes "Thank you so much,";
+		mes "you don't know what";
+		mes "this means to me! Okay,";
+		mes "please relax and take a";
+		mes "seat. Close your eyes while";
+		mes "I tell you this ancient story.";
+		next;
+		mes "^3355FFFayruz begins to";
+		mes "relate an ancient tale";
+		mes "about Juperos that seems";
+		mes "typical for a classic story, but her way of storytelling subtly";
+		mes "draws you into a vicarious, yet extremely vivid experience.";
+		next;
+		mes "^3355FFYou feel the protagonist's";
+		mes "glories and tragedies as if";
+		mes "you were actually there with";
+		mes "the hero on his journeys. The";
+		mes "tale eventually comes to an end";
+		mes "and you awaken from the trance,";
+		mes "gently brought back to reality.^000000";
+		delitem getarg(0),1;
+		set yuno_hist,5;
+		set jupe_hist,getarg(1);
+		getexp (checkre(3))?10000:100000,0;
+		next;
+		mes "[Fayruz]";
+		mes "Everyone can relate";
+		mes "to these old, classic";
+		mes "stories. I hope this tale had";
+		mes "as meaning for you as it did";
+		mes "for me when I first heard it.";
+		next;
+		mes "[Fayruz]";
+		mes "If you can find me";
+		mes "another artifact from";
+		mes "Juperos, I'll share another";
+		mes "tale like that with you. Now";
+		mes "how does that sound? Okay";
+		mes "then, I'll see you, adventurer~";
+		close;
+	case 5:
+		if ((countitem(getarg(0))) || (countitem(getarg(1))) || (countitem(getarg(2)))) {
 			mes "[Fayruz]";
-			mes "Hello, "+strcharinfo(0)+"~";
-			mes "Oh, were you able to look";
-			mes "in Juperos for anything that";
-			mes "might help me in my research?";
+			mes "Oh, that's unexpected.";
+			mes "This Transparent Plate";
+			mes "seems to have been made";
+			mes "in a different era than the";
+			mes "one you gave me earlier.";
+			mes "How intriguing...";
 			next;
-			switch( select( "Yeah, take a look at this.","No, I'm sorry...") )
-			{
-				case 1:
-					switch(jupe_hist)
-					{
-						case 3:
-							callfunc "Func_JupHist",7354,7355,7352,7353;
-
-						case 5:
-							callfunc "Func_JupHist",7353,7355,7352,7354;
-
-						case 6:
-							callfunc "Func_JupHist",7352,7355,7353,7354;
-
-						case 9:
-							callfunc "Func_JupHist",7353,7354,7352,7355;
-
-						case 10:
-							callfunc "Func_JupHist",7352,7354,7353,7355;
-
-						case 12:
-							callfunc "Func_JupHist",7352,7353,7354,7355;
-					}
-
-				case 2:
-					mes "[Fayruz]";
-					mes "Oh, that's fine.";
-					mes "Besides, I don't really";
-					mes "have a deadline to complete";
-					mes "this research project. Still,";
-					mes "I just want you to know that";
-					mes "I really appreciate your help.";
-					close;
+			mes "[Fayruz]";
+			mes "*Sigh* I really wish";
+			mes "that I could explore";
+			mes "Juperos on my own, but";
+			mes "I'm just not strong enough.";
+			mes "In a way, I'm quite jealous of you. But it can't be helped...";
+			next;
+			mes "[Fayruz]";
+			mes "You know, that reminds";
+			mes "me of this great story of";
+			mes "a tragic hero that I'd like to";
+			mes "share with you. Let your";
+			mes "mind wander as I relate this ageless, yet bittersweet tale...";
+			next;
+			mes "^3355FFFayruz tells you a story";
+			mes "with a bright beginning, full";
+			mes "of hope that fills you with the";
+			mes "bliss of the heavens, but then";
+			mes "suddenly plummets you into all the despair and torment of hell.^000000";
+			next;
+			mes "^3355FFThe story finally";
+			mes "reaches its ending";
+			mes "and you're surprised";
+			mes "to find yourself sitting";
+			mes "in the Juno Library.^000000";
+			next;
+			mes "[Fayruz]";
+			mes "I know it's a very";
+			mes "depressing story, but";
+			mes "I hope you enjoyed it.";
+			mes "I think you'd agree that";
+			mes "it contains a truth about";
+			mes "mankind that can't be ignored.";
+			if (countitem(getarg(0))) {
+				delitem getarg(0),1;
+				if (getarg(0) == 7352) set jupe_hist,jupe_hist +1;
+				else set jupe_hist,jupe_hist +2;
 			}
-
-		case 8:
+			else if (countitem(getarg(1))) {
+				delitem getarg(1),1;
+				if (getarg(1) == 7353) set jupe_hist,jupe_hist +2;
+				else set jupe_hist,jupe_hist +4;
+			}
+			else {
+				delitem getarg(2),1;
+				if (getarg(2) == 7354) set jupe_hist,jupe_hist +4;
+				else set jupe_hist,jupe_hist +8;
+			}
+			set yuno_hist,6;
+			getexp (checkre(3))?10000:100000,0;
+			next;
 			mes "[Fayruz]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm having great difficulty in";
-			mes "translating that Transparent";
-			mes "Plate you brought for me that";
-			mes "last time. I'm so frustrated...";
+			mes "By now I'm sure you've";
+			mes "figured that these classic";
+			mes "tales are like condensed";
+			mes "experiences, refined and";
+			mes "immutable truths that we";
+			mes "can see in our own reality.";
 			next;
 			mes "[Fayruz]";
-			mes "Wait a minute...";
-			mes "This here means...";
-			mes "Alright. Okay. Yes.";
-			mes "Yes! Of course, how";
-			mes "could I not see it before!";
-			set yuno_hist,9;
+			mes "If you find more of";
+			mes "these Transparent";
+			mes "Plates in Juperos, I'd be";
+			mes "very happy to share another";
+			mes "story with you, "+strcharinfo(0)+".";
+			close;
+		}
+		else if (countitem(getarg(3))) {
+			mes "[Fayruz]";
+			mes "Oh, this one seems";
+			mes "to have been created";
+			mes "in a similar era as the";
+			mes "one you gave me earlier.";
+			mes "I'm not sure how much new";
+			mes "information this may provide...";
 			next;
 			mes "[Fayruz]";
-			mes "I'll be with you";
-			mes "in just a second!";
-			mes "I think I just made";
-			mes "a real through...!";
+			mes "Still, I'm sure this will";
+			mes "helpful in my research. I just";
+			mes "won't be as making progress";
+			mes "as quickly as I had projected.";
+			mes "Please, I'd like you to take this as a token of my gratitude.";
+			delitem getarg(3),1;
+			getitem 644,1;
 			next;
-
-		case 9:
 			mes "[Fayruz]";
-			mes "Ah, I've been";
-			mes "expecting you, "+strcharinfo(0)+".";
-			mes "So did you have been to Juperos again? I'm really hoping that you";
-			mes "were able to find something new that would help in my research...";
+			mes "Now if you'll excuse";
+			mes "me, I need to go back";
+			mes "to compiling my research...";
+			mes "Thank you so much for";
+			mes "your help, "+strcharinfo(0)+".";
+			close;
+		}
+		else {
+			mes "[Fayruz]";
+			mes "Oh. There isn't anything";
+			mes "here that would help in my";
+			mes "research, but thank you anyway.";
+			mes "If you find anything else while";
+			mes "you're in Juperos, please come back and show it to me, alright?";
+			close;
+		}
+	case 7:
+		if ((countitem(getarg(0))) || (countitem(getarg(1)))) {
+			mes "[Fayruz]";
+			mes "Is this another";
+			mes "Transparent Plate?";
+			mes "Yes, it's quite different";
+			mes "than the last one you";
+			mes "brought over to me...";
+			mes "This is so exciting!";
 			next;
-			switch( select("Actually, I did find this...","I'm sorry, I haven't...") )
-			{
-				case 1:
-					switch(jupe_hist)
-					{
-						case 7:
-							callfunc "Func_JupHist",7355,7352,7353,7354;
-
-						case 11:
-							callfunc "Func_JupHist",7354,7352,7353,7355;
-
-						case 13:
-							callfunc "Func_JupHist",7353,7352,7354,7355;
-
-						case 14:
-							callfunc "Func_JupHist",7352,7353,7354,7355;
-					}
-
-				case 2:
-					mes "[Fayruz]";
-					mes "Ah, I see. Well, while";
-					mes "you're here, why don't you";
-					mes "read something? There are";
-					mes "many books that cover some";
-					mes "interesting topics, like";
-					mes "modern adventure history.";
-					next;
-					mes "[Fayruz]";
-					mes "Oh, in any case, please";
-					mes "don't forget the favor I asked";
-					mes "of you. If you find anything";
-					mes "in Juperos that's historically";
-					mes "significant, I'd appreciate it";
-					mes "if you bring it right away.";
-					close;
-			}
-
-		case 10:
 			mes "[Fayruz]";
-			mes "Oh hello, "+strcharinfo(0)+"...";
-			mes "So what exactly brings you";
-			mes "to the Juno Library this time?";
+			mes "Oh. You must be thinking";
+			mes "that I'm a complete academia";
+			mes "addict. Well, my life might be";
+			mes "a little uneventful, but there";
+			mes "are other things I think about!";
+			mes "Like, well... It's weird but...";
 			next;
-			switch( select("I found another Transparent Plate.","Just visiting, really.") )
-			{
-				case 1:
-					if((countitem(7352)) || (countitem(7353)) || (countitem(7354)) || (countitem(7355)))
-					{
-						mes "[Fayruz]";
-						mes "Hmm, well, we've made as";
-						mes "much headway as we can";
-						mes "with the Transparent Plates";
-						mes "you've already given me, but";
-						mes "it can't hurt to have too much";
-						mes "evidence to back my theories.";
-						next;
-						mes "[Fayruz]";
-						mes "I really appreciate";
-						mes "your continuing efforts";
-						mes "to help me. Please, would";
-						mes "you take this as my way";
-						mes "saying ''Thanks?'' You've been";
-						mes "great, "+strcharinfo(0)+"...";
-						if(countitem(7352)) delitem 7352,1;
-						else if(countitem(7353)) delitem 7353,1;
-						else if(countitem(7354)) delitem 7354,1;
-						else delitem 7355,1;
-						getitem 644,1;
-						close;
-					}
-					mes "[Fayruz]";
-					mes "Mmm...?";
-					mes "It doesn't look like";
-					mes "you brought another";
-					mes "Transparent Plate.";
-					mes "Are you sure that you";
-					mes "didn't misplace it?";
-					close;
-
-				case 2:
-					mes "[Fayruz]";
-					mes "Ah, I see. Well,";
-					mes "thanks to your help,";
-					mes "I've made a great deal";
-					mes "of progress on my thesis.";
-					mes "I really appreciate what you";
-					mes "have done for me, adventurer.";
-					close;
+			mes "[Fayruz]";
+			mes "You see, there's this";
+			mes "guy that I like. I'm not sure";
+			mes "where he might be now, but";
+			mes "his name is Nadim Amal. He's";
+			mes "my friend's brother who I first";
+			mes "met 10 years ago. ^333333*Sigh...*^000000";
+			next;
+			mes "[Fayruz]";
+			mes "Just recently, I saw";
+			mes "him with his sister, my";
+			mes "friend from Morroc. It's";
+			mes "weird to think that I'd have";
+			mes "these feelings for him after";
+			mes "all this time, isn't it? Oh...!";
+			next;
+			mes "[Fayruz]";
+			mes "I really should repay";
+			mes "you for this Transparent";
+			mes "Plate. Why don't I tell you";
+			mes "the scariest story that I know?";
+			next;
+			mes "^3355FFFayruz tells you a";
+			mes "creepy horror story that";
+			mes "makes you shiver with fear.";
+			mes "You've heard other ghost";
+			mes "stories, but you've never been";
+			mes "so deeply immersed in one before.^000000";
+			next;
+			mes "It is only when the";
+			mes "story ends and you return";
+			mes "to your senses that you notice that you're soaked in cold sweat.^000000";
+			next;
+			mes "[Fayruz]";
+			mes "It may be a natural";
+			mes "response, but all people";
+			mes "fear the unknown in one way";
+			mes "or another. Scary stories are";
+			mes "appealing because we actually";
+			mes "like the strange and grotesque.";
+			if (countitem(getarg(0))) {
+				delitem getarg(0),1;
+				if (getarg(0) == 7352) set jupe_hist,jupe_hist +1;
+				else if (getarg(0) == 7353) set jupe_hist,jupe_hist +2;
+				else set jupe_hist,jupe_hist +4;
 			}
-	}
-
-
-}
-
-function	script	Func_JupHist	{
-
-	switch(yuno_hist)
-	{
-		case 4:
+			else if (countitem(getarg(1))) {
+				delitem getarg(1),1;
+				if (getarg(1) == 7353) set jupe_hist,jupe_hist +2;
+				else if (getarg(1) == 7354) set jupe_hist,jupe_hist +4;
+				else set jupe_hist,jupe_hist +8;
+			}
+			set yuno_hist,8;
+			getexp (checkre(3))?10000:100000,0;
+			next;
+			mes "[Fayruz]";
+			mes "Well... That's just my";
+			mes "opinion. Anyway, if you";
+			mes "find anything else in Juperos";
+			mes "that may help in my research,";
+			mes "please come back and show it";
+			mes "to me, alright? See you later~";
+			close;
+		}
+		else if ((countitem(getarg(2))) || (countitem(getarg(3)))) {
+			mes "[Fayruz]";
+			mes "Oh, this one seems";
+			mes "to have been created";
+			mes "in a similar era as the";
+			mes "one you gave me earlier.";
+			mes "I'm not sure how much new";
+			mes "information this may provide...";
+			next;
+			mes "[Fayruz]";
+			mes "Still, I'm sure this will";
+			mes "helpful in my research. I just";
+			mes "won't be as making progress";
+			mes "as quickly as I had projected.";
+			mes "Please, I'd like you to take this as a token of my gratitude.";
+			next;
+			mes "[Fayruz]";
+			mes "Now if you'll excuse";
+			mes "me, I need to go back";
+			mes "to compiling my research...";
+			mes "Thank you so much for";
+			mes "your help, "+strcharinfo(0)+".";
+			if (countitem(getarg(2))) delitem getarg(2),1;
+			else if (countitem(getarg(3))) delitem getarg(3),1;
+			getitem 644,1;
+			close;
+		}
+		else {
+			mes "[Fayruz]";
+			mes "Oh. There isn't anything";
+			mes "here that would help in my";
+			mes "research, but thank you anyway.";
+			mes "If you find anything else while";
+			mes "you're in Juperos, please come back and show it to me, alright?";
+			close;
+		}
+	case 9:
+		if (countitem(getarg(0))) {
+			mes "[Fayruz]";
+			mes "Oooh...! This one is";
+			mes "much different than the";
+			mes "other ones you gave me";
+			mes "before. This should provide";
+			mes "a wealth of brand new insights";
+			mes "into the Juperos civilization!";
+			next;
 			mes "[Fayruz]";
-			mes "Thank you so much,";
-			mes "you don't know what";
-			mes "this means to me! Okay,";
-			mes "please relax and take a";
-			mes "seat. Close your eyes while";
-			mes "I tell you this ancient story.";
+			mes "All the Transparent";
+			mes "Plates you've given me";
+			mes "should contain more than";
+			mes "enough data for me to fully";
+			mes "complete my research thesis.";
+			mes "Once again, thank you so much~";
 			next;
-			mes "^3355FFFayruz begins to";
-			mes "relate an ancient tale";
-			mes "about Juperos that seems";
-			mes "typical for a classic story, but her way of storytelling subtly";
-			mes "draws you into a vicarious, yet extremely vivid experience.";
+			mes "[Fayruz]";
+			mes "Still, that doesn't mean that";
+			mes "I will stop collecting data for";
+			mes "my research. Anyway, I have one last story to tell you, about";
+			mes "a man of pure heart chosen by the gods to serve and protect mankind.";
+			next;
+			mes "[Fayruz]";
+			mes "For this purpose he was given";
+			mes "gaudy armor which contained";
+			mes "amazing powers, as well as a";
+			mes "book detailing the instructions";
+			mes "for its use. However, he promptly";
+			mes "lost these instructions...";
 			next;
-			mes "^3355FFYou feel the protagonist's";
-			mes "glories and tragedies as if";
-			mes "you were actually there with";
-			mes "the hero on his journeys. The";
-			mes "tale eventually comes to an end";
-			mes "and you awaken from the trance,";
-			mes "gently brought back to reality.^000000";
+			mes "^3355FFThe story about the";
+			mes "greatest Juperosian hero";
+			mes "that Fayruz tells you is very";
+			mes "humorous at first, but then it";
+			mes "covers the entire spectrum";
+			mes "of emotion and humanity...";
+			next;
+			mes "^3355FFThe story ends and you";
+			mes "are left with a swelling";
+			mes "feeling of indefatigable";
+			mes "hope and inspiration...";
+			mes "You can make it if you try!^000000";
+			if (getarg(0) == 7352) set jupe_hist,jupe_hist+1;
+			else if (getarg(0) == 7353) set jupe_hist,jupe_hist+2;
+			else if (getarg(0) == 7354) set jupe_hist,jupe_hist+4;
+			else set jupe_hist,jupe_hist+8;
+			set yuno_hist,10;
 			delitem getarg(0),1;
-			set yuno_hist,5;
-			set jupe_hist,getarg(1);
-			getexp 10000,0;
+			getexp (checkre(3))?10000:100000,0;
 			next;
 			mes "[Fayruz]";
-			mes "Everyone can relate";
-			mes "to these old, classic";
-			mes "stories. I hope this tale had";
-			mes "as meaning for you as it did";
-			mes "for me when I first heard it.";
+			mes "Well, that is the";
+			mes "last and the best story";
+			mes "that I have to share";
+			mes "with you. Perhaps next";
+			mes "time, I'll fill you in on my";
+			mes "research progress~";
+			close;
+		}
+		else if ((countitem(getarg(1))) || (countitem(getarg(2))) || (countitem(getarg(3)))) {
+			mes "[Fayruz]";
+			mes "Hmm...";
+			mes "This one seems to be created in a similar time";
+			mes "as the previous one.";
 			next;
 			mes "[Fayruz]";
-			mes "If you can find me";
-			mes "another artifact from";
-			mes "Juperos, I'll share another";
-			mes "tale like that with you. Now";
-			mes "how does that sound? Okay";
-			mes "then, I'll see you, adventurer~";
+			mes "Don't you worry.";
+			mes "This will help my research of course,";
+			mes "although I do not think this will";
+			mes "help me in advancing my research";
+			mes "with a great speed unlike this other one.";
+			next;
+			mes "[Fayruz]";
+			mes "Please take this as a token of my gratitude.";
+			next;
+			mes "[Fayruz]";
+			mes "Now, excuse me. I need to go back to my research.";
+			if (countitem(getarg(1))) delitem getarg(1),1;
+			else if (countitem(getarg(2))) delitem getarg(2),1;
+			else delitem getarg(3),1;
+			getitem 644,1;
 			close;
-
-		case 5:
-			if((countitem(getarg(0))) || (countitem(getarg(1))) || (countitem(getarg(2))))
-			{
-				mes "[Fayruz]";
-				mes "Oh, that's unexpected.";
-				mes "This Transparent Plate";
-				mes "seems to have been made";
-				mes "in a different era than the";
-				mes "one you gave me earlier.";
-				mes "How intriguing...";
-				next;
-				mes "[Fayruz]";
-				mes "*Sigh* I really wish";
-				mes "that I could explore";
-				mes "Juperos on my own, but";
-				mes "I'm just not strong enough.";
-				mes "In a way, I'm quite jealous of you. But it can't be helped...";
-				next;
-				mes "[Fayruz]";
-				mes "You know, that reminds";
-				mes "me of this great story of";
-				mes "a tragic hero that I'd like to";
-				mes "share with you. Let your";
-				mes "mind wander as I relate this ageless, yet bittersweet tale...";
-				next;
-				mes "^3355FFFayruz tells you a story";
-				mes "with a bright beginning, full";
-				mes "of hope that fills you with the";
-				mes "bliss of the heavens, but then";
-				mes "suddenly plummets you into all the despair and torment of hell.^000000";
-				next;
-				mes "^3355FFThe story finally";
-				mes "reaches its ending";
-				mes "and you're surprised";
-				mes "to find yourself sitting";
-				mes "in the Juno Library.^000000";
-				next;
-				mes "[Fayruz]";
-				mes "I know it's a very";
-				mes "depressing story, but";
-				mes "I hope you enjoyed it.";
-				mes "I think you'd agree that";
-				mes "it contains a truth about";
-				mes "mankind that can't be ignored.";
-				if(countitem(getarg(0)))
-				{
-					delitem getarg(0),1;
-					if(getarg(0) == 7352) set jupe_hist,jupe_hist +1;
-					else set jupe_hist,jupe_hist +2;
-				}
-				else if(countitem(getarg(1)))
-				{
-					delitem getarg(1),1;
-					if(getarg(1) == 7353) set jupe_hist,jupe_hist +2;
-					else set jupe_hist,jupe_hist +4;
-				}
-				else
-				{
-					delitem getarg(2),1;
-					if(getarg(2) == 7354) set jupe_hist,jupe_hist +4;
-					else set jupe_hist,jupe_hist +8;
-				}
-				set yuno_hist,6;
-				getexp 10000,0;
-				next;
-				mes "[Fayruz]";
-				mes "By now I'm sure you've";
-				mes "figured that these classic";
-				mes "tales are like condensed";
-				mes "experiences, refined and";
-				mes "immutable truths that we";
-				mes "can see in our own reality.";
-				next;
-				mes "[Fayruz]";
-				mes "If you find more of";
-				mes "these Transparent";
-				mes "Plates in Juperos, I'd be";
-				mes "very happy to share another";
-				mes "story with you, "+strcharinfo(0)+".";
-				close;
-			}
-			else if(countitem(getarg(3)))
-			{
-				mes "[Fayruz]";
-				mes "Oh, this one seems";
-				mes "to have been created";
-				mes "in a similar era as the";
-				mes "one you gave me earlier.";
-				mes "I'm not sure how much new";
-				mes "information this may provide...";
-				next;
-				mes "[Fayruz]";
-				mes "Still, I'm sure this will";
-				mes "helpful in my research. I just";
-				mes "won't be as making progress";
-				mes "as quickly as I had projected.";
-				mes "Please, I'd like you to take this as a token of my gratitude.";
-				delitem getarg(3),1;
-				getitem 644,1;
-				next;
-				mes "[Fayruz]";
-				mes "Now if you'll excuse";
-				mes "me, I need to go back";
-				mes "to compiling my research...";
-				mes "Thank you so much for";
-				mes "your help, "+strcharinfo(0)+".";
-				close;
-			}
-			else
-			{
-				mes "[Fayruz]";
-				mes "Oh. There isn't anything";
-				mes "here that would help in my";
-				mes "research, but thank you anyway.";
-				mes "If you find anything else while";
-				mes "you're in Juperos, please come back and show it to me, alright?";
-				close;
-			}
-
-		case 7:
-			if((countitem(getarg(0))) || (countitem(getarg(1))))
-			{
-				mes "[Fayruz]";
-				mes "Is this another";
-				mes "Transparent Plate?";
-				mes "Yes, it's quite different";
-				mes "than the last one you";
-				mes "brought over to me...";
-				mes "This is so exciting!";
-				next;
-				mes "[Fayruz]";
-				mes "Oh. You must be thinking";
-				mes "that I'm a complete academia";
-				mes "addict. Well, my life might be";
-				mes "a little uneventful, but there";
-				mes "are other things I think about!";
-				mes "Like, well... It's weird but...";
-				next;
-				mes "[Fayruz]";
-				mes "You see, there's this";
-				mes "guy that I like. I'm not sure";
-				mes "where he might be now, but";
-				mes "his name is Nadim Amal. He's";
-				mes "my friend's brother who I first";
-				mes "met 10 years ago. ^333333*Sigh...*^000000";
-				next;
-				mes "[Fayruz]";
-				mes "Just recently, I saw";
-				mes "him with his sister, my";
-				mes "friend from Morroc. It's";
-				mes "weird to think that I'd have";
-				mes "these feelings for him after";
-				mes "all this time, isn't it? Oh...!";
-				next;
-				mes "[Fayruz]";
-				mes "I really should repay";
-				mes "you for this Transparent";
-				mes "Plate. Why don't I tell you";
-				mes "the scariest story that I know?";
-				next;
-				mes "^3355FFFayruz tells you a";
-				mes "creepy horror story that";
-				mes "makes you shiver with fear.";
-				mes "You've heard other ghost";
-				mes "stories, but you've never been";
-				mes "so deeply immersed in one before.^000000";
-				next;
-				mes "It is only when the";
-				mes "story ends and you return";
-				mes "to your senses that you notice that you're soaked in cold sweat.^000000";
-				next;
-				mes "[Fayruz]";
-				mes "It may be a natural";
-				mes "response, but all people";
-				mes "fear the unknown in one way";
-				mes "or another. Scary stories are";
-				mes "appealing because we actually";
-				mes "like the strange and grotesque.";
-				if(countitem(getarg(0)))
-				{
-					delitem getarg(0),1;
-					if(getarg(0) == 7352) set jupe_hist,jupe_hist +1;
-					else if(getarg(0) == 7353) set jupe_hist,jupe_hist +2;
-					else set jupe_hist,jupe_hist +4;
-				}
-				else if(countitem(getarg(1)))
-				{
-					delitem getarg(1),1;
-					if(getarg(1) == 7353) set jupe_hist,jupe_hist +2;
-					else if(getarg(1) == 7354) set jupe_hist,jupe_hist +4;
-					else set jupe_hist,jupe_hist +8;
-				}
-				set yuno_hist,8;
-				getexp 10000,0;
-				next;
-				mes "[Fayruz]";
-				mes "Well... That's just my";
-				mes "opinion. Anyway, if you";
-				mes "find anything else in Juperos";
-				mes "that may help in my research,";
-				mes "please come back and show it";
-				mes "to me, alright? See you later~";
-				close;
-			}
-			else if((countitem(getarg(2))) || (countitem(getarg(3))))
-			{
-				mes "[Fayruz]";
-				mes "Oh, this one seems";
-				mes "to have been created";
-				mes "in a similar era as the";
-				mes "one you gave me earlier.";
-				mes "I'm not sure how much new";
-				mes "information this may provide...";
-				next;
-				mes "[Fayruz]";
-				mes "Still, I'm sure this will";
-				mes "helpful in my research. I just";
-				mes "won't be as making progress";
-				mes "as quickly as I had projected.";
-				mes "Please, I'd like you to take this as a token of my gratitude.";
-				next;
-				mes "[Fayruz]";
-				mes "Now if you'll excuse";
-				mes "me, I need to go back";
-				mes "to compiling my research...";
-				mes "Thank you so much for";
-				mes "your help, "+strcharinfo(0)+".";
-				if(countitem(getarg(2))) delitem getarg(2),1;
-				else if(countitem(getarg(3))) delitem getarg(3),1;
-				getitem 644,1;
-				close;
-			}
-			else
-			{
-				mes "[Fayruz]";
-				mes "Oh. There isn't anything";
-				mes "here that would help in my";
-				mes "research, but thank you anyway.";
-				mes "If you find anything else while";
-				mes "you're in Juperos, please come back and show it to me, alright?";
-				close;
-			}
-
-		case 9:
-			if(countitem(getarg(0)))
-			{
-				mes "[Fayruz]";
-				mes "Oooh...! This one is";
-				mes "much different than the";
-				mes "other ones you gave me";
-				mes "before. This should provide";
-				mes "a wealth of brand new insights";
-				mes "into the Juperos civilization!";
-				next;
-				mes "[Fayruz]";
-				mes "All the Transparent";
-				mes "Plates you've given me";
-				mes "should contain more than";
-				mes "enough data for me to fully";
-				mes "complete my research thesis.";
-				mes "Once again, thank you so much~";
-				next;
-				mes "[Fayruz]";
-				mes "Still, that doesn't mean that";
-				mes "I will stop collecting data for";
-				mes "my research. Anyway, I have one last story to tell you, about";
-				mes "a man of pure heart chosen by the gods to serve and protect mankind.";
-				next;
-				mes "[Fayruz]";
-				mes "For this purpose he was given";
-				mes "gaudy armor which contained";
-				mes "amazing powers, as well as a";
-				mes "book detailing the instructions";
-				mes "for its use. However, he promptly";
-				mes "lost these instructions...";
-				next;
-				mes "^3355FFThe story about the";
-				mes "greatest Juperosian hero";
-				mes "that Fayruz tells you is very";
-				mes "humorous at first, but then it";
-				mes "covers the entire spectrum";
-				mes "of emotion and humanity...";
-				next;
-				mes "^3355FFThe story ends and you";
-				mes "are left with a swelling";
-				mes "feeling of indefatigable";
-				mes "hope and inspiration...";
-				mes "You can make it if you try!^000000";
-				if(getarg(0) == 7352) set jupe_hist,jupe_hist+1;
-				else if(getarg(0) == 7353) set jupe_hist,jupe_hist+2;
-				else if(getarg(0) == 7354) set jupe_hist,jupe_hist+4;
-				else set jupe_hist,jupe_hist+8;
-				set yuno_hist,10;
-				delitem getarg(0),1;
-				getexp 10000,0;
-				next;
-				mes "[Fayruz]";
-				mes "Well, that is the";
-				mes "last and the best story";
-				mes "that I have to share";
-				mes "with you. Perhaps next";
-				mes "time, I'll fill you in on my";
-				mes "research progress~";
-				close;
-			}
-			else if((countitem(getarg(1))) || (countitem(getarg(2))) || (countitem(getarg(3))))
-			{
-				mes "[Fayruz]";
-				mes "Hmm...";
-				mes "This one seems to be created in a similar time";
-				mes "as the previous one.";
-				next;
-				mes "[Fayruz]";
-				mes "Don't you worry.";
-				mes "This will help my research of course,";
-				mes "although I do not think this will";
-				mes "help me in advancing my research";
-				mes "with a great speed unlike this other one.";
-				next;
-				mes "[Fayruz]";
-				mes "Please take this as a token of my gratitude.";
-				next;
-				mes "[Fayruz]";
-				mes "Now, excuse me. I need to go back to my research.";
-				if(countitem(getarg(1))) delitem getarg(1),1;
-				else if(countitem(getarg(2))) delitem getarg(2),1;
-				else delitem getarg(3),1;
-				getitem 644,1;
-				close;
-			}
-			else
-			{
-				mes "[Fayruz]";
-				mes "Oh. There isn't anything";
-				mes "here that would help in my";
-				mes "research, but thank you anyway.";
-				mes "If you find anything else while";
-				mes "you're in Juperos, please come back and show it to me, alright?";
-				close;
-			}
+		}
+		else {
+			mes "[Fayruz]";
+			mes "Oh. There isn't anything";
+			mes "here that would help in my";
+			mes "research, but thank you anyway.";
+			mes "If you find anything else while";
+			mes "you're in Juperos, please come back and show it to me, alright?";
+			close;
+		}
 	}
 }
 
-yuno_in04,186,125,4	script	Bundle of Files	111,{
-
+yuno_in04,186,125,4	script	Bundle of Files	HIDDEN_NPC,{
 	mes "^8B6914*Thesis: The Fall of Juperos*";
 	mes "By Fayruz Khrhiyha";
 	mes "Sage Castle Researcher^000000";
 	next;
-	switch( select("Table of Contents.","Leave it alone.") )
-	{
-		case 1:
-			if(yuno_hist > 4)
-			{
-				mes "^8B6914 1. Preface";
-				mes " 2. Juperos Background";
-				mes " 3. Theory Behind Its Fall^000000";
-				next;
-				switch( select("Preface","Juperos Background","Theory Behind Its Fall","Leave it alone.") )
-				{
-					case 1:
-						mes "^8B6914Scholars are certain";
-						mes "that the Juperos civilization";
-						mes "used to be located above the";
-						mes "ground, but it is now buried";
-						mes "beneath the El Mes Plateau.";
-						mes "The reasons for the city's";
-						if(yuno_hist < 9)
-						{
-							mes "ruin are still nebulous...^000000";
-							next;
-							mes "^8B6914There is much speculation";
-							mes "about the reasons for Jupero's";
-							mes "downfall, but any documentation";
-							mes "from that time period has been";
-							mes "difficult to find. As for now, any evidence we have regarding";
-							mes "Juperos is inconclusive.^000000";
-							next;
-							mes "^8B6914In spite of this lack";
-							mes "of empirical or concrete";
-							mes "data on the civilization of";
-							mes "Juperos, our modern world";
-							mes "may be able to learn much";
-							mes "from that ancient city's ruins.";
-							mes "..................^000000";
-							if(yuno_hist < 7)
-							{
-								next;
-								mes "["+strcharinfo(0)+"]";
-								mes "Hmmm...";
-								mes "A whole chapter";
-								mes "dedicated to saying,";
-								mes "''We know absolutely";
-								mes "nothing about something.''";
-								mes "I should write a book~";
-							}
-							close;
-						}
-						mes "ruin are still in debate...^000000";
-						next;
-						mes "^8B6914However, new findings";
-						mes "regarding the history";
-						mes "of Juperos have allowed";
-						mes "us to make a few conclusions.^000000";
-						close;
-				
-					case 2:
-						if(yuno_hist < 9)
-						{
-							mes "^8B6914...";
-							mes "......";
-							mes "..........^000000";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "This is all just idle";
-							mes "conjecture! This paper";
-							mes "isn't developed enough";
-							mes "yet to be a real thesis...";
-							close;
-						}
-						else if(yuno_hist == 9)
-						{
-							mes "^8B6914Juperos was built over";
-							mes "a thousand years ago in";
-							mes "an era of peace just after";
-							mes "a major war. Contrary to";
-							mes "popular belief, there isn't any";
-							mes "evidence proving that Juno may";
-							mes "have descended from Juperos.^000000";
-							next;
-							mes "^8B6914In fact, there is a";
-							mes "strong possibility that";
-							mes "another war, between Juno";
-							mes "and Juperos, resulted in Juno's";
-							mes "independence from Juperos and";
-							mes "the destruction of any existing";
-							mes "documentation from that era.^000000";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "Yes... Of course!";
-							mes "It all makes sense now!";
-							close;
-						}
-						mes "^8B6914Juperos was built over";
-						mes "a thousand years ago in";
-						mes "an era of peace just after";
-						mes "a major war. There is now";
-						mes "direct evidence linking Juno";
-						mes "to Juperos proving that Juno";
-						mes "was but a part of Juperos.^000000";
-						next;
-						mes "^8B6914Just like Juno, Juperos";
-						mes "was a society that prided";
-						mes "itself on its advancement";
-						mes "in the sciences which played";
-						mes "a permeating role in civilized";
-						mes "life. Science was reponsible for Juperos's rise and downfall.";
-						close;
-
-					case 3:
-						if(yuno_hist < 10)
-						{
-							mes "^8B6914...";
-							mes "......";
-							mes "..........^000000";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "Huh. This writer keeps";
-							mes "talking about theories,";
-							mes "but the more I read, the";
-							mes "less clear I am on what";
-							mes "the theory actually is.";
-							mes "I don't think there is one...";
-							emotion 4,1;
-							close;
-						}
-						mes "^8B6914What is most unsettling";
-						mes "is recent evidence, including";
-						mes "a first hand written account,";
-						mes "regarding the role of one of";
-						mes "Jupero's foremost scientists";
-						mes "in that city's rise and fall.";
-						next;
-						mes "^8B6914If these writings are";
-						mes "authentic, then what actually";
-						mes "happened was that a scientific";
-						mes "revolution occurred as a direct";
-						mes "result of one scientist's effort to manipulate the energies of the";
-						mes "artifact known as Ymir's heart.";
-						next;
-						mes "^8B6914This one man and Ymir's";
-						mes "Heart are credited with";
-						mes "the success and prosperity";
-						mes "of the Jupero's civilization.";
-						mes "However, there are various accounts prior to Jupero's fall";
-						mes "detailing his work with chimera...^000000";
-						next;
-						mes "^8B6914This scientist, supposedly";
-						mes "in his passion to benefit his";
-						mes "people by finding a scientific";
-						mes "method for immortality by using";
-						mes "chimera for testing, was driven";
-						mes "insane. He experimented on";
-						mes "himself with disatrous results.^000000";
-						next;
-						mes "^8B6914There was an error in the";
-						mes "energy calibration of Ymir's";
-						mes "Heart and the scientist was";
-						mes "transformed into the monster";
-						mes "we now know as Chimera. He";
-						mes "and his test subjects were set";
-						mes "loose into the city of Juperos.^000000";
-						next;
-						mes "^8B6914These immortal Chimeras";
-						mes "razed the entire city, killing";
-						mes "countless people. Apparently,";
-						mes "a team of scientists were able";
-						mes "to salvage a fragment of Ymir's";
-						mes "Heart, and use it to lauch part";
-						mes "of Juperos into the sky.^000000";
-						next;
-						mes "^8B6914That section of Juperos";
-						mes "eventually developed into";
-						mes "the city of Juno. Since the";
-						mes "scientists who launched Juno into the sky all immediately died";
-						mes "afterwards from an unknown cause, they left no documentation.^000000";
-						next;
-						mes "^8B6914The Chimera, and the";
-						mes "laboratory in which it";
-						mes "was created, is rumored to";
-						mes "remain beneath the ruins of";
-						mes "the once great city of Juperos.^000000";
-						close;
-
-					case 4:
-						mes "["+strcharinfo(0)+"]";
-						mes "Ugh... My head hurts";
-						mes "too much from reading";
-						mes "a book for smarty people.";
-						mes "I know! I'll play videogames!";
-						close;
-				}
-			}
-			switch( select( "Preface","Close the file.") )
-			{
-				case 1:
-					mes "^8B6914Scholars are certain";
-					mes "that the Juperos civilization";
-					mes "used to be located above the";
-					mes "ground, but it is now buried";
-					mes "beneath the El Mes Plateau.";
-					mes "The reasons for the city's";
+	switch(select("Table of Contents.:Leave it alone.")) {
+	case 1:
+		if (yuno_hist > 4) {
+			mes "^8B6914 1. Preface";
+			mes " 2. Juperos Background";
+			mes " 3. Theory Behind Its Fall^000000";
+			next;
+			switch(select("Preface:Juperos Background:Theory Behind Its Fall:Leave it alone.")) {
+			case 1:
+				mes "^8B6914Scholars are certain";
+				mes "that the Juperos civilization";
+				mes "used to be located above the";
+				mes "ground, but it is now buried";
+				mes "beneath the El Mes Plateau.";
+				mes "The reasons for the city's";
+				if (yuno_hist < 9) {
 					mes "ruin are still nebulous...^000000";
 					next;
 					mes "^8B6914There is much speculation";
@@ -1231,72 +959,239 @@ yuno_in04,186,125,4	script	Bundle of Files	111,{
 					mes "may be able to learn much";
 					mes "from that ancient city's ruins.";
 					mes "..................^000000";
-					if(!yuno_hist) set yuno_hist,1;
+					if (yuno_hist < 7) {
+						next;
+						mes "["+strcharinfo(0)+"]";
+						mes "Hmmm...";
+						mes "A whole chapter";
+						mes "dedicated to saying,";
+						mes "''We know absolutely";
+						mes "nothing about something.''";
+						mes "I should write a book~";
+					}
+					close;
+				}
+				mes "ruin are still in debate...^000000";
+				next;
+				mes "^8B6914However, new findings";
+				mes "regarding the history";
+				mes "of Juperos have allowed";
+				mes "us to make a few conclusions.^000000";
+				close;
+			case 2:
+				if (yuno_hist < 9) {
+					mes "^8B6914...";
+					mes "......";
+					mes "..........^000000";
 					next;
 					mes "["+strcharinfo(0)+"]";
-					mes "This...";
-					mes "This is supposed to";
-					mes "be a research thesis?";
-					mes "There's barely any";
-					mes "research in it...";
+					mes "This is all just idle";
+					mes "conjecture! This paper";
+					mes "isn't developed enough";
+					mes "yet to be a real thesis...";
 					close;
-				
-				case 2:
+				}
+				else if (yuno_hist == 9) {
+					mes "^8B6914Juperos was built over";
+					mes "a thousand years ago in";
+					mes "an era of peace just after";
+					mes "a major war. Contrary to";
+					mes "popular belief, there isn't any";
+					mes "evidence proving that Juno may";
+					mes "have descended from Juperos.^000000";
+					next;
+					mes "^8B6914In fact, there is a";
+					mes "strong possibility that";
+					mes "another war, between Juno";
+					mes "and Juperos, resulted in Juno's";
+					mes "independence from Juperos and";
+					mes "the destruction of any existing";
+					mes "documentation from that era.^000000";
+					next;
 					mes "["+strcharinfo(0)+"]";
-					mes "Hmm...";
-					mes "This isn't heavy";
-					mes "enough to be a real";
-					mes "academic work. It must";
-					mes "not even be finished yet.";
+					mes "Yes... Of course!";
+					mes "It all makes sense now!";
 					close;
-			}
-		case 2:
-			if(yuno_hist < 5)
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "Nah...";
-				mes "I'm tired of reading.";
-				mes "Ironically enough.";
-				close;
-			}
-			else if(yuno_hist < 7)
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "I don't feel like";
-				mes "reading this. Not";
-				mes "enough pictures...";
-				close;
-			}
-			else if(yuno_hist < 9)
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "It looks very sophisticated...";
+				}
+				mes "^8B6914Juperos was built over";
+				mes "a thousand years ago in";
+				mes "an era of peace just after";
+				mes "a major war. There is now";
+				mes "direct evidence linking Juno";
+				mes "to Juperos proving that Juno";
+				mes "was but a part of Juperos.^000000";
+				next;
+				mes "^8B6914Just like Juno, Juperos";
+				mes "was a society that prided";
+				mes "itself on its advancement";
+				mes "in the sciences which played";
+				mes "a permeating role in civilized";
+				mes "life. Science was reponsible for Juperos's rise and downfall.";
 				close;
-			}
-			else if(yuno_hist < 10)
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "I know this book...";
-				mes "But I don't feel like";
-				mes "reading it right now.";
+			case 3:
+				if (yuno_hist < 10) {
+					mes "^8B6914...";
+					mes "......";
+					mes "..........^000000";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "Huh. This writer keeps";
+					mes "talking about theories,";
+					mes "but the more I read, the";
+					mes "less clear I am on what";
+					mes "the theory actually is.";
+					mes "I don't think there is one...";
+					emotion e_swt,1;
+					close;
+				}
+				mes "^8B6914What is most unsettling";
+				mes "is recent evidence, including";
+				mes "a first hand written account,";
+				mes "regarding the role of one of";
+				mes "Jupero's foremost scientists";
+				mes "in that city's rise and fall.";
+				next;
+				mes "^8B6914If these writings are";
+				mes "authentic, then what actually";
+				mes "happened was that a scientific";
+				mes "revolution occurred as a direct";
+				mes "result of one scientist's effort to manipulate the energies of the";
+				mes "artifact known as Ymir's heart.";
+				next;
+				mes "^8B6914This one man and Ymir's";
+				mes "Heart are credited with";
+				mes "the success and prosperity";
+				mes "of the Jupero's civilization.";
+				mes "However, there are various accounts prior to Jupero's fall";
+				mes "detailing his work with chimera...^000000";
+				next;
+				mes "^8B6914This scientist, supposedly";
+				mes "in his passion to benefit his";
+				mes "people by finding a scientific";
+				mes "method for immortality by using";
+				mes "chimera for testing, was driven";
+				mes "insane. He experimented on";
+				mes "himself with disatrous results.^000000";
+				next;
+				mes "^8B6914There was an error in the";
+				mes "energy calibration of Ymir's";
+				mes "Heart and the scientist was";
+				mes "transformed into the monster";
+				mes "we now know as Chimera. He";
+				mes "and his test subjects were set";
+				mes "loose into the city of Juperos.^000000";
+				next;
+				mes "^8B6914These immortal Chimeras";
+				mes "razed the entire city, killing";
+				mes "countless people. Apparently,";
+				mes "a team of scientists were able";
+				mes "to salvage a fragment of Ymir's";
+				mes "Heart, and use it to lauch part";
+				mes "of Juperos into the sky.^000000";
+				next;
+				mes "^8B6914That section of Juperos";
+				mes "eventually developed into";
+				mes "the city of Juno. Since the";
+				mes "scientists who launched Juno into the sky all immediately died";
+				mes "afterwards from an unknown cause, they left no documentation.^000000";
+				next;
+				mes "^8B6914The Chimera, and the";
+				mes "laboratory in which it";
+				mes "was created, is rumored to";
+				mes "remain beneath the ruins of";
+				mes "the once great city of Juperos.^000000";
 				close;
-			}
-			else
-			{
+			case 4:
 				mes "["+strcharinfo(0)+"]";
-				mes "This thesis is";
-				mes "looking pretty good~";
-				mes "Of course, I did have";
-				mes "a hand in making it...";
+				mes "Ugh... My head hurts";
+				mes "too much from reading";
+				mes "a book for smarty people.";
+				mes "I know! I'll play videogames!";
 				close;
 			}
+		}
+		switch(select("Preface:Close the file.")) {
+		case 1:
+			mes "^8B6914Scholars are certain";
+			mes "that the Juperos civilization";
+			mes "used to be located above the";
+			mes "ground, but it is now buried";
+			mes "beneath the El Mes Plateau.";
+			mes "The reasons for the city's";
+			mes "ruin are still nebulous...^000000";
+			next;
+			mes "^8B6914There is much speculation";
+			mes "about the reasons for Jupero's";
+			mes "downfall, but any documentation";
+			mes "from that time period has been";
+			mes "difficult to find. As for now, any evidence we have regarding";
+			mes "Juperos is inconclusive.^000000";
+			next;
+			mes "^8B6914In spite of this lack";
+			mes "of empirical or concrete";
+			mes "data on the civilization of";
+			mes "Juperos, our modern world";
+			mes "may be able to learn much";
+			mes "from that ancient city's ruins.";
+			mes "..................^000000";
+			if (!yuno_hist) set yuno_hist,1;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "This...";
+			mes "This is supposed to";
+			mes "be a research thesis?";
+			mes "There's barely any";
+			mes "research in it...";
+			close;
+		case 2:
+			mes "["+strcharinfo(0)+"]";
+			mes "Hmm...";
+			mes "This isn't heavy";
+			mes "enough to be a real";
+			mes "academic work. It must";
+			mes "not even be finished yet.";
+			close;
+		}
+	case 2:
+		if (yuno_hist < 5) {
+			mes "["+strcharinfo(0)+"]";
+			mes "Nah...";
+			mes "I'm tired of reading.";
+			mes "Ironically enough.";
+			close;
+		}
+		else if (yuno_hist < 7) {
+			mes "["+strcharinfo(0)+"]";
+			mes "I don't feel like";
+			mes "reading this. Not";
+			mes "enough pictures...";
+			close;
+		}
+		else if (yuno_hist < 9) {
+			mes "["+strcharinfo(0)+"]";
+			mes "It looks very sophisticated...";
+			close;
+		}
+		else if (yuno_hist < 10) {
+			mes "["+strcharinfo(0)+"]";
+			mes "I know this book...";
+			mes "But I don't feel like";
+			mes "reading it right now.";
+			close;
+		}
+		else {
+			mes "["+strcharinfo(0)+"]";
+			mes "This thesis is";
+			mes "looking pretty good~";
+			mes "Of course, I did have";
+			mes "a hand in making it...";
+			close;
+		}
 	}
 }
 
-yuno_in04,188,118,4	script	Book#juperos	111,{
-
-	if(yuno_hist > 7)
-	{
+yuno_in04,188,118,4	script	Book#juperos	HIDDEN_NPC,{
+	if (yuno_hist > 7) {
 		mes "^8B6914*Self-Honesty*";
 		mes "*'Benefits Fo' Life!'*";
 		mes "By Stephen Oyoung";
@@ -1355,10 +1250,8 @@ yuno_in04,188,118,4	script	Book#juperos	111,{
 
 // Bronze Statue - juperos_01 99 112
 
-juperos_01,99,112,4	script	Bronze Statue#1	844,{
-
-	if(yuno_hist > 3)
-	{
+juperos_01,99,112,4	script	Bronze Statue#1	CLEAR_NPC,{
+	if (yuno_hist > 3) {
 		mes "^3355FF''Do you wish to see";
 		mes "the end of the madness?";
 		mes "He is waiting where the three";
@@ -1366,8 +1259,7 @@ juperos_01,99,112,4	script	Bronze Statue#1	844,{
 		mes "two hundred illusions wander.''^000000";
 		close;
 	}
-	else if(yuno_hist == 3)
-	{
+	else if (yuno_hist == 3) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I better go and";
 		mes "see Fayruz in the";
@@ -1375,62 +1267,57 @@ juperos_01,99,112,4	script	Bronze Statue#1	844,{
 		mes "her about the inscription.";
 		close;
 	}
-	else
-	{
+	else {
 		mes "^3355FFThere's a peculiar";
 		mes "engraving on the";
 		mes "Bronze Statue's rod.^000000";
 		next;
-		switch( select( "Investigate","Ignore it" ) )
-		{
-			case 1 :
-				mes "^3355FFIt's an inscription that's";
-				mes "written in an old language";
-				mes "that you can't understand,";
-				mes "but have no problem reading";
-				mes "and making out the sounds";
-				mes "for some weird reason.^000000";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "This is creepy!";
-				mes "I know that I'm not";
-				mes "supposed to be able";
-				mes "to read this, but here";
-				mes "I am. I know what sounds";
-				mes "all of these letters make...";
-				next;
-				if(yuno_hist == 2)
-				{
-					mes "["+strcharinfo(0)+"]";
-					mes "Then again, Fayruz did";
-					mes "say this was enchanted.";
-					mes "Okay, I guess I'll go back";
-					mes "to the Juno Library and";
-					mes "tell her what I found.";
-					set yuno_hist,3;
-					close;
-				}
+		switch(select("Investigate:Ignore it")) {
+		case 1:
+			mes "^3355FFIt's an inscription that's";
+			mes "written in an old language";
+			mes "that you can't understand,";
+			mes "but have no problem reading";
+			mes "and making out the sounds";
+			mes "for some weird reason.^000000";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "This is creepy!";
+			mes "I know that I'm not";
+			mes "supposed to be able";
+			mes "to read this, but here";
+			mes "I am. I know what sounds";
+			mes "all of these letters make...";
+			next;
+			if (yuno_hist == 2) {
 				mes "["+strcharinfo(0)+"]";
-				mes "Huh. Only a scholar,";
-				mes "maybe someone even in";
-				mes "Juno, could make sense";
-				mes "of what this stuff says.";
-				close;
-			
-			case 2 : 
+				mes "Then again, Fayruz did";
+				mes "say this was enchanted.";
+				mes "Okay, I guess I'll go back";
+				mes "to the Juno Library and";
+				mes "tell her what I found.";
+				set yuno_hist,3;
 				close;
+			}
+			mes "["+strcharinfo(0)+"]";
+			mes "Huh. Only a scholar,";
+			mes "maybe someone even in";
+			mes "Juno, could make sense";
+			mes "of what this stuff says.";
+			close;
+		case 2:
+			close;
 		}
 	}
 }
 
-yuno_in04,169,109,1	script	Ambitious Hollgrehenn	111,{
-
+yuno_in04,169,109,1	script	Ambitious Hollgrehenn	HIDDEN_NPC,{
 	mes "*Hollgrehenn: The Ambition*";
 	mes "By Aragham Caul*";
-	mes "";
-	mes "";
-	mes "";
-	mes "";
+	mes " ";
+	mes " ";
+	mes " ";
+	mes " ";
 	mes "Publisher:";
 	mes "Muha Books, Co.";
 	next;
@@ -1449,8 +1336,7 @@ yuno_in04,169,109,1	script	Ambitious Hollgrehenn	111,{
 	close;
 }
 
-yuno_in04,174,111,1	script	Penniless Hollgrehenn	111,{
-
+yuno_in04,174,111,1	script	Penniless Hollgrehenn	HIDDEN_NPC,{
 	mes "^8B6914*Penniless Hollgrehenn*";
 	mes " * Pennyless Hollgrehenn * ";
 	mes "By Hollgrehenn";
@@ -1469,8 +1355,7 @@ yuno_in04,174,111,1	script	Penniless Hollgrehenn	111,{
 	close;
 }
 
-yuno_in04,102,106,1	script	Popular Feasts	111,{
-
+yuno_in04,102,106,1	script	Popular Feasts	HIDDEN_NPC,{
 	mes "^8B6914*Popular Feasts*";
 	mes "By Cabbage Pickle Community";
 	mes " ";
@@ -1479,231 +1364,214 @@ yuno_in04,102,106,1	script	Popular Feasts	111,{
 	mes "Publisher:";
 	mes "Muha Books, Co.^000000";
 	next;
-	switch( select( " 1. Fried Yoyo Tails"," 14. Poring Salad"," 252. Beak Soup" ) )
-	{
-		case 1:
-			mes "^8B6914...";
-			mes "If possible, try";
-			mes "to use tails cut";
-			mes "from live Yoyos.";
-			mes "Now, as for skinning...^000000";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Um...";
-			mes "Barf?";
-			close;
-
-		case 2:
-			mes "["+strcharinfo(0)+"]";
-			mes "Hey, this page is gone!";
-			mes "I guess Poring Salad is";
-			mes "the most popular feast";
-			mes "in this entire book.";
-			close;
-
-		case 3:
-			mes "^8B6914...";
-			mes "Fry the cut beaks";
-			mes "using herbal oil until";
-			mes "crisp. Then, pour the";
-			mes "feathers into a blender...^000000";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Hmm...";
-			mes "Sounds a little";
-			mes "too gourmet for my";
-			mes "taste. And by ''gourmet,''";
-			mes "I mean, ''totally gross.''";
-			close;
+	switch(select(" 1. Fried Yoyo Tails: 14. Poring Salad: 252. Beak Soup")) {
+	case 1:
+		mes "^8B6914...";
+		mes "If possible, try";
+		mes "to use tails cut";
+		mes "from live Yoyos.";
+		mes "Now, as for skinning...^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Um...";
+		mes "Barf?";
+		close;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "Hey, this page is gone!";
+		mes "I guess Poring Salad is";
+		mes "the most popular feast";
+		mes "in this entire book.";
+		close;
+	case 3:
+		mes "^8B6914...";
+		mes "Fry the cut beaks";
+		mes "using herbal oil until";
+		mes "crisp. Then, pour the";
+		mes "feathers into a blender...^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Hmm...";
+		mes "Sounds a little";
+		mes "too gourmet for my";
+		mes "taste. And by ''gourmet,''";
+		mes "I mean, ''totally gross.''";
+		close;
 	}
 }
 
-yuno_in04,111,108,1	script	Hamerun, Rat Hunter	111,{
-
+yuno_in04,111,108,1	script	Hamerun, Rat Hunter	HIDDEN_NPC,{
 	mes "["+strcharinfo(0)+"]";
 	mes "I can't...";
 	mes "reach it...!";
 	close;
 }
 
-yuno_in04,167,127,1	script	Red Book	111,{
-
+yuno_in04,167,127,1	script	Red Book	HIDDEN_NPC,{
 	mes "^3355FFYou find a book";
 	mes "with red binding.^000000";
 	next;
-	switch( select( "Read.","Leave it alone." ) )
-	{
-		case 1:
-			mes "^8B6914...^000000";
-			next;
-			mes "^8B6914...";
-			mes "......^000000";
-			next;
-			mes "^8B6914...";
-			mes "......";
-			mes ".........^000000";
-			next;
-			mes "^8B6914...";
-			mes "......";
-			mes ".........";
-			mes "............^000000";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "This is...";
-			mes "A compilation of";
-			mes "Shakespeare in ";
-			mes "coloring book format?";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Wait...";
-			mes "Why would fans of";
-			mes "Shakespeare even";
-			mes "want a coloring book?";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Hmm... Well...";
-			mes "I suppose little kids who";
-			mes "read Shakespeare would";
-			mes "appreciate something like that.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Hold on...";
-			mes "Do little kids who";
-			mes "are able to read the";
-			mes "works of Shakespeare";
-			mes "even exist? I hope not...";
-			close;
-
-		case 2:
-			mes "["+strcharinfo(0)+"]";
-			mes "What a strange";
-			mes "and mysterious book.";
-			mes "I'll never know what's";
-			mes "inside unless I read it!";
-			mes "Come on! Doesn't the red";
-			mes "binding mean something?";
-			close;
+	switch(select("Read.:Leave it alone.")) {
+	case 1:
+		mes "^8B6914...^000000";
+		next;
+		mes "^8B6914...";
+		mes "......^000000";
+		next;
+		mes "^8B6914...";
+		mes "......";
+		mes ".........^000000";
+		next;
+		mes "^8B6914...";
+		mes "......";
+		mes ".........";
+		mes "............^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "This is...";
+		mes "A compilation of";
+		mes "Shakespeare in ";
+		mes "coloring book format?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Wait...";
+		mes "Why would fans of";
+		mes "Shakespeare even";
+		mes "want a coloring book?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Hmm... Well...";
+		mes "I suppose little kids who";
+		mes "read Shakespeare would";
+		mes "appreciate something like that.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Hold on...";
+		mes "Do little kids who";
+		mes "are able to read the";
+		mes "works of Shakespeare";
+		mes "even exist? I hope not...";
+		close;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "What a strange";
+		mes "and mysterious book.";
+		mes "I'll never know what's";
+		mes "inside unless I read it!";
+		mes "Come on! Doesn't the red";
+		mes "binding mean something?";
+		close;
 	}
 }
 
-yuno_in04,121,109,1	script	Scroll	111,{
-
+yuno_in04,121,109,1	script	Scroll	HIDDEN_NPC,{
 	mes "^3355FFYou've found an";
 	mes "antiquated scroll";
 	mes "that's collected a";
 	mes "layer of fine dust.^000000";
 	next;
-	switch( select( "Peruse","Leave it alone" ) )
-	{
-		case 1:
-			mes "^8B6914Item Upgrade Introduction";
-			mes " ";
-			mes " ";
-			mes " ";
-			mes "1. Item Upgrade Definition";
-			mes " ";
-			mes "The key to success when";
-			mes "upgrading items comes from";
-			mes "only one place: Your ''Mind.''";
-			mes " ";
-			mes " ";
-			mes " ";
-			mes "2. Power of a Positive Attitude";
-			mes "Before trying to upgrade";
-			mes "an item, plan out how high";
-			mes "you want to upgrade and how";
-			mes "much you'll spend beforehand.";
-			mes "But like all ladies, Lady Luck";
-			mes "smiles when you fully splurge.^000000";
-			mes " ";
-			mes " ";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Wait, wait...";
-			mes "This thing IS old.";
-			mes "I mean, it's obviously";
-			mes "written from a patriarchal";
-			mes "standpoint that promotes";
-			mes "bipartisan gender roles.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "I'm...";
-			mes "I'm so offended.";
-			close;
-
-		case 2:
-			mes "["+strcharinfo(0)+"]";
-			mes "This scroll is far too";
-			mes "primitive. There's been";
-			mes "all sorts of technological";
-			mes "reading advances that I can't";
-			mes "live without... Like pages.";
-			close;
+	switch(select("Peruse:Leave it alone")) {
+	case 1:
+		mes "^8B6914Item Upgrade Introduction";
+		mes " ";
+		mes " ";
+		mes " ";
+		mes "1. Item Upgrade Definition";
+		mes " ";
+		mes "The key to success when";
+		mes "upgrading items comes from";
+		mes "only one place: Your ''Mind.''";
+		mes " ";
+		mes " ";
+		mes " ";
+		mes "2. Power of a Positive Attitude";
+		mes "Before trying to upgrade";
+		mes "an item, plan out how high";
+		mes "you want to upgrade and how";
+		mes "much you'll spend beforehand.";
+		mes "But like all ladies, Lady Luck";
+		mes "smiles when you fully splurge.^000000";
+		mes " ";
+		mes " ";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Wait, wait...";
+		mes "This thing IS old.";
+		mes "I mean, it's obviously";
+		mes "written from a patriarchal";
+		mes "standpoint that promotes";
+		mes "bipartisan gender roles.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I'm...";
+		mes "I'm so offended.";
+		close;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "This scroll is far too";
+		mes "primitive. There's been";
+		mes "all sorts of technological";
+		mes "reading advances that I can't";
+		mes "live without... Like pages.";
+		close;
 	}
 }
 
-yuno_in04,118,116,4	script	Paper	111,{
-
+yuno_in04,118,116,4	script	Paper	HIDDEN_NPC,{
 	mes "^3355FFIt's a piece of";
 	mes "paper that looks";
 	mes "like a personal letter.^000000";
 	next;
-	switch( select("Read it.","Leave it alone.") )
-	{
-		case 1:
-			if(yuno_hist > 7)
-			{
-				mes "^8B6914P.S.";
-				mes "Please...";
-				mes "Come back to me.";
-				mes " ";
-				mes " ";		  
-				mes "Love,";
-				mes "Fayruz^000000";
-				close;
-			}
-			mes "^8B6914...";
-			mes "I can't forget your smile.";
-			mes "No matter what, even if you";
-			mes "hate me, I'll always have these";
-			mes "feelings just for you. You are";
-			mes "the one who is most special,";
-			mes "who means the most to my heart.^000000";
-			next;
-			mes "^8B6914I know we've had our";
-			mes "differences, but please";
-			mes "don't refuse my love. By";
-			mes "your hands, I hope that";
-			mes "you can forgive me for us.";
-			mes "- Love, Fayruz^000000";
-			next;
-			if(getpartnerid())
-			{
-				mes "["+strcharinfo(0)+"]";
-				mes "Ahhhhhh~";
-				mes "Love sure is nice!";
-				close;
-			}
-			mes "["+strcharinfo(0)+"]";
-			mes "What th--?!";
-			mes "Booooooooo!";
-			mes "Love stinks!";
+	switch(select("Read it.:Leave it alone.")) {
+	case 1:
+		if (yuno_hist > 7) {
+			mes "^8B6914P.S.";
+			mes "Please...";
+			mes "Come back to me.";
+			mes " ";
+			mes " ";
+			mes "Love,";
+			mes "Fayruz^000000";
 			close;
-	
-		case 2:
+		}
+		mes "^8B6914...";
+		mes "I can't forget your smile.";
+		mes "No matter what, even if you";
+		mes "hate me, I'll always have these";
+		mes "feelings just for you. You are";
+		mes "the one who is most special,";
+		mes "who means the most to my heart.^000000";
+		next;
+		mes "^8B6914I know we've had our";
+		mes "differences, but please";
+		mes "don't refuse my love. By";
+		mes "your hands, I hope that";
+		mes "you can forgive me for us.";
+		mes "- Love, Fayruz^000000";
+		next;
+		if (getpartnerid()) {
 			mes "["+strcharinfo(0)+"]";
-			mes "I guess I better";
-			mes "not look at this.";
-			mes "I mean, I might";
-			mes "regret reading it.";
+			mes "Ahhhhhh~";
+			mes "Love sure is nice!";
 			close;
+		}
+		mes "["+strcharinfo(0)+"]";
+		mes "What th--?!";
+		mes "Booooooooo!";
+		mes "Love stinks!";
+		close;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "I guess I better";
+		mes "not look at this.";
+		mes "I mean, I might";
+		mes "regret reading it.";
+		close;
 	}
 }
 
-juperos_01,123,92,4	script	Stone Statue	844,{
-	
-	if(yuno_hist)
-	{
+juperos_01,123,92,4	script	Stone Statue	CLEAR_NPC,{
+	if (yuno_hist) {
 		mes "^3355FFIt's a stone statue";
 		mes "that looks exactly like";
 		mes "the one in the Juno Library.";
@@ -1722,8 +1590,7 @@ juperos_01,123,92,4	script	Stone Statue	844,{
 	close;
 }
 
-juperos_01,99,71,4	script	Bronze Statue#2	844,{
-
+juperos_01,99,71,4	script	Bronze Statue#2	CLEAR_NPC,{
 	mes "^3355FFIt's an elaborate";
 	mes "bronze statue that";
 	mes "is twice the height of";
@@ -1731,15 +1598,13 @@ juperos_01,99,71,4	script	Bronze Statue#2	844,{
 	close;
 }
 
-juperos_01,79,92,4	script	Sculpture	844,{
-
+juperos_01,79,92,4	script	Sculpture	CLEAR_NPC,{
 	mes "^3355FFIt's a sculpture that";
 	mes "looks familiar to you.^000000";
 	close;
 }
 
-juperos_01,215,127,4	script	Machine Statue	844,{
-
+juperos_01,215,127,4	script	Machine Statue	CLEAR_NPC,{
 	mes "^3355FFThis is the bust of a";
 	mes "humanoid machine with";
 	mes "a familiar Crest Piece";
@@ -1823,7 +1688,7 @@ OnTimer2000:
 }
 
 //============================================================
-// 2nd Floor 
+// 2nd Floor
 //============================================================
 
 juperos_02,97,70,0	script	3F Gate Switch#jupe	-1,{
@@ -1831,7 +1696,7 @@ OnInit:
 	initnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	killmonster "juperos_02","3F Gate Switch#jupe::OnMyMobDead";
 	end;
 
@@ -1865,7 +1730,7 @@ OnMyMobDead:
 }
 
 
-juperos_02,130,149,0	script	Restricted Area#jupe	139,2,2,{
+juperos_02,130,149,0	script	Restricted Area#jupe	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Restricted Area#jupe";
 	end;
@@ -1910,7 +1775,7 @@ OnTimer483000:
 OnTimer506000:
 OnTimer529000:
 OnTimer552000:
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	end;
 
 OnTimer556000:
@@ -1922,7 +1787,7 @@ OnTimer561000:
 	end;
 
 OnTimer598000:
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	end;
 
 OnTimer600000:
@@ -1950,7 +1815,7 @@ OnTouch:
 //============================================================
 // Security Checkpoint 1-1
 //============================================================
-jupe_area1,88,224,0	script	#hole#1-1	844,{
+jupe_area1,88,224,0	script	#hole#1-1	CLEAR_NPC,{
 	cutin "1",2;
 	if ($@JupreArea1InUse == 1) {
 		mes "^3355FFThis seems like";
@@ -2047,7 +1912,7 @@ jupe_area1,88,224,0	script	#hole#1-1	844,{
 		end;
 	}
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2058,14 +1923,14 @@ OnTimer22500:
 	end;
 }
 
-jupe_area1,83,221,0	script	Warp#1-1	139,2,2,{
+jupe_area1,83,221,0	script	Warp#1-1	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Warp#1-1";
 	end;
 
 OnEnable:
 	enablenpc "Warp#1-1";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -2088,7 +1953,7 @@ OnInit:
 OnTouch:
 	donpcevent "Red Alarm On#1-1::OnEnable";
 	disablenpc "Red Alarm#1-1";
-	donpcevent "#hole#1-1::Onstop_timer";
+	donpcevent "#hole#1-1::OnStop_Timer";
 	set $@JupreArea1InUse,1;
 	disablenpc "#hole#1-1";
 	end;
@@ -2242,7 +2107,7 @@ OnMyMobDead:
 //============================================================
 // Security Checkpoint 1-2
 //============================================================
-jupe_area1,25,238,0	script	#hole#1-2	844,{
+jupe_area1,25,238,0	script	#hole#1-2	CLEAR_NPC,{
 	cutin "2",2;
 	if ($@JupreArea1InUse == 1) {
 		mes "^3355FFThis seems like";
@@ -2341,7 +2206,7 @@ jupe_area1,25,238,0	script	#hole#1-2	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2352,14 +2217,14 @@ OnTimer22500:
 	end;
 }
 
-jupe_area1,21,225,0	script	Warp#1-2	139,2,2,{
+jupe_area1,21,225,0	script	Warp#1-2	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Warp#1-2";
 	end;
 
 OnEnable:
 	enablenpc "Warp#1-2";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -2531,7 +2396,7 @@ OnMyMobDead:
 //============================================================
 // Security Checkpoint 1-3
 //============================================================
-jupe_area1,36,146,0	script	#hole#1-3	844,{
+jupe_area1,36,146,0	script	#hole#1-3	CLEAR_NPC,{
 	cutin "3",2;
 	if ($@JupreArea1InUse == 1) {
 		mes "^3355FFThis seems like";
@@ -2628,7 +2493,7 @@ jupe_area1,36,146,0	script	#hole#1-3	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2639,14 +2504,14 @@ OnTimer22500:
 	end;
 }
 
-jupe_area1,33,137,0	script	Warp#1-3	139,2,2,{
+jupe_area1,33,137,0	script	Warp#1-3	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Warp#1-3";
 	end;
 
 OnEnable:
 	enablenpc "Warp#1-3";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -2819,7 +2684,7 @@ OnMyMobDead:
 //============================================================
 // Security Checkpoint 1-4
 //============================================================
-jupe_area1,50,49,0	script	#hole#1-4	844,{
+jupe_area1,50,49,0	script	#hole#1-4	CLEAR_NPC,{
 	cutin "4",2;
 	if ($@JupreArea1InUse == 1) {
 		mes "^3355FFThis seems like";
@@ -2917,7 +2782,7 @@ jupe_area1,50,49,0	script	#hole#1-4	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2928,14 +2793,14 @@ OnTimer5000:
 	end;
 }
 
-jupe_area1,57,53,0	script	Warp#1-4	139,2,2,{
+jupe_area1,57,53,0	script	Warp#1-4	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Warp#1-4";
 	end;
 
 OnEnable:
 	enablenpc "Warp#1-4";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -3107,14 +2972,14 @@ OnMyMobDead:
 //============================================================
 // Move to Elevator
 //============================================================
-jupe_area1,112,162,0	script	Lever#ufe	844,{
+jupe_area1,112,162,0	script	Lever#ufe	CLEAR_NPC,{
 	mes "^3355FFIt's a lever";
 	mes "whose function";
 	mes "is not known to you.^000000";
 	next;
 	switch(select("Pull.:Cancel.")) {
 	case 1:
-		if($@JupreArea1InUse == 1) close;
+		if ($@JupreArea1InUse == 1) close;
 		initnpctimer;
 		donpcevent "LeverWarp#ufe::OnEnable";
 		disablenpc "Lever#ufe";
@@ -3134,14 +2999,14 @@ OnTimer3000:
 	end;
 }
 
-jupe_area1,117,157,0	script	LeverWarp#ufe	139,2,2,{
+jupe_area1,117,157,0	script	LeverWarp#ufe	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "LeverWarp#ufe";
 	end;
 
 OnEnable:
 	enablenpc "LeverWarp#ufe";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -3159,7 +3024,7 @@ OnTimer3000:
 //============================================================
 // Security Checkpoint 2-1
 //============================================================
-jupe_area2,74,224,0	script	#hole#2-1	844,{
+jupe_area2,74,224,0	script	#hole#2-1	CLEAR_NPC,{
 	cutin "1",2;
 	if ($@JupreArea2InUse == 1) {
 		mes "^3355FFThis seems like";
@@ -3256,7 +3121,7 @@ jupe_area2,74,224,0	script	#hole#2-1	844,{
 		end;
 	}
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -3267,14 +3132,14 @@ OnTimer22500:
 	end;
 }
 
-jupe_area2,80,221,0	script	Warp#2-1	139,2,2,{
+jupe_area2,80,221,0	script	Warp#2-1	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Warp#2-1";
 	end;
 
 OnEnable:
 	enablenpc "Warp#2-1";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -3297,7 +3162,7 @@ OnInit:
 OnTouch:
 	donpcevent "Red Alarm On#2-1::OnEnable";
 	disablenpc "Red Alarm#2-1";
-	donpcevent "#hole#2-1::Onstop_timer";
+	donpcevent "#hole#2-1::OnStop_Timer";
 	set $@JupreArea2InUse,1;
 	disablenpc "#hole#2-1";
 	end;
@@ -3451,7 +3316,7 @@ OnMyMobDead:
 //============================================================
 // Security Checkpoint 2-2
 //============================================================
-jupe_area2,138,238,0	script	#hole#2-2	844,{
+jupe_area2,138,238,0	script	#hole#2-2	CLEAR_NPC,{
 	cutin "2",2;
 	if ($@JupreArea2InUse == 1) {
 		mes "^3355FFThis seems like";
@@ -3550,7 +3415,7 @@ jupe_area2,138,238,0	script	#hole#2-2	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -3561,14 +3426,14 @@ OnTimer22500:
 	end;
 }
 
-jupe_area2,142,225,0	script	Warp#2-2	139,2,2,{
+jupe_area2,142,225,0	script	Warp#2-2	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Warp#2-2";
 	end;
 
 OnEnable:
 	enablenpc "Warp#2-2";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -3740,7 +3605,7 @@ OnMyMobDead:
 //============================================================
 // Security Checkpoint 2-3
 //============================================================
-jupe_area2,127,146,0	script	#hole#2-3	844,{
+jupe_area2,127,146,0	script	#hole#2-3	CLEAR_NPC,{
 	cutin "3",2;
 	if ($@JupreArea2InUse == 1) {
 		mes "^3355FFThis seems like";
@@ -3837,7 +3702,7 @@ jupe_area2,127,146,0	script	#hole#2-3	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -3848,14 +3713,14 @@ OnTimer22500:
 	end;
 }
 
-jupe_area2,130,137,0	script	Warp#2-3	139,2,2,{
+jupe_area2,130,137,0	script	Warp#2-3	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Warp#2-3";
 	end;
 
 OnEnable:
 	enablenpc "Warp#2-3";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -4030,7 +3895,7 @@ OnMyMobDead:
 //============================================================
 // Security Checkpoint 2-4
 //============================================================
-jupe_area2,113,49,0	script	#hole#2-4	844,{
+jupe_area2,113,49,0	script	#hole#2-4	CLEAR_NPC,{
 	cutin "4",2;
 	if ($@JupreArea2InUse == 1) {
 		mes "^3355FFThis seems like";
@@ -4128,7 +3993,7 @@ jupe_area2,113,49,0	script	#hole#2-4	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -4139,14 +4004,14 @@ OnTimer5000:
 	end;
 }
 
-jupe_area2,106,53,0	script	Warp#2-4	139,2,2,{
+jupe_area2,106,53,0	script	Warp#2-4	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "Warp#2-4";
 	end;
 
 OnEnable:
 	enablenpc "Warp#2-4";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -4320,14 +4185,14 @@ OnMyMobDead:
 //============================================================
 // Move to Elevator
 //============================================================
-jupe_area2,51,162,0	script	Lever#ufe2	844,{
+jupe_area2,51,162,0	script	Lever#ufe2	CLEAR_NPC,{
 	mes "^3355FFIt's a lever";
 	mes "whose function";
 	mes "is not known to you.^000000";
 	next;
 	switch(select("Pull.:Cancel.")) {
 	case 1:
-		if($@JupreArea2InUse == 1) close;
+		if ($@JupreArea2InUse == 1) close;
 		initnpctimer;
 		donpcevent "LeverWarp#ufe2::OnEnable";
 		disablenpc "Lever#ufe2";
@@ -4347,14 +4212,14 @@ OnTimer3000:
 	end;
 }
 
-jupe_area2,46,157,0	script	LeverWarp#ufe2	139,2,2,{
+jupe_area2,46,157,0	script	LeverWarp#ufe2	HIDDEN_WARP_NPC,2,2,{
 OnInit:
 	disablenpc "LeverWarp#ufe2";
 	end;
 
 OnEnable:
 	enablenpc "LeverWarp#ufe2";
-	specialeffect 561;
+	specialeffect EF_BIG_PORTAL;
 	soundeffectall "jupe_warp.wav",0;
 	initnpctimer;
 	end;
@@ -4372,7 +4237,7 @@ OnTimer3000:
 //============================================================
 // Elevator Reception Room
 //============================================================
-jupe_ele_r,51,98,0	script	Switch#ufe	844,{
+jupe_ele_r,51,98,0	script	Switch#ufe	CLEAR_NPC,{
 	if ($@JupeElevatorInUse == 1) {
 		mes "^3355FFIt's some sort of";
 		mes "lever that looks like";
@@ -4523,7 +4388,7 @@ OnTimer27000:
 	end;
 }
 
-jupe_ele_r,51,98,0	script	Switch On#ufe	844,{
+jupe_ele_r,51,98,0	script	Switch On#ufe	CLEAR_NPC,{
 	mes "^3355FFIt seems like";
 	mes "someone else is";
 	mes "using this machine...^000000";
@@ -4695,7 +4560,7 @@ OnTimer10000:
 //============================================================
 // Elevator NPCs
 //============================================================
-jupe_ele,14,6,1	script	TimeOut#ufe	844,{
+jupe_ele,14,6,1	script	TimeOut#ufe	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -4769,7 +4634,7 @@ OnTimer142000:
 	end;
 }
 
-jupe_ele,15,6,1	script	Guard-1#ufe	844,{
+jupe_ele,15,6,1	script	Guard-1#ufe	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -4824,7 +4689,7 @@ OnMyMobDead:
 	end;
 }
 
-jupe_ele,16,6,1	script	Guard-2#ufe	844,{
+jupe_ele,16,6,1	script	Guard-2#ufe	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -4883,7 +4748,7 @@ OnMyMobDead:
 	end;
 }
 
-jupe_ele,17,6,1	script	Guard-3#ufe	844,{
+jupe_ele,17,6,1	script	Guard-3#ufe	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -4939,7 +4804,7 @@ OnMyMobDead:
 	end;
 }
 
-jupe_ele,18,6,1	script	Guard-4#ufe	844,{
+jupe_ele,18,6,1	script	Guard-4#ufe	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -4972,8 +4837,7 @@ OnTimer8000:
 OnMyMobDead:
 	set .MyMobs,.MyMobs-1;
 	if (.MyMobs < 1) {
-		if(getvariableofnpc(.MyMobs,"Guard-1#ufe") < 1 && getvariableofnpc(.MyMobs,"Guard-2#ufe") < 1 && getvariableofnpc(.MyMobs,"Guard-3#ufe") < 1)
-		{
+		if (getvariableofnpc(.MyMobs,"Guard-1#ufe") < 1 && getvariableofnpc(.MyMobs,"Guard-2#ufe") < 1 && getvariableofnpc(.MyMobs,"Guard-3#ufe") < 1) {
 			donpcevent "GuardEnd#ufe::OnEnable";
 			stopnpctimer;
 		}
@@ -4981,7 +4845,7 @@ OnMyMobDead:
 	end;
 }
 
-jupe_ele,19,6,1	script	GuardEnd#ufe	844,{
+jupe_ele,19,6,1	script	GuardEnd#ufe	CLEAR_NPC,{
 OnInit:
 	disablenpc "GuardEnd#ufe";
 	end;
@@ -5040,7 +4904,7 @@ OnTimer26000:
 	donpcevent "GuardEnd#ufe::OnDisable";
 }
 
-jupe_ele,41,33,0	script	4F Enter#ufe	45,4,4,{
+jupe_ele,41,33,0	script	4F Enter#ufe	WARPNPC,4,4,{
 OnInit:
 	disablenpc "4F Enter#ufe";
 	end;
@@ -5102,7 +4966,7 @@ OnTimer2000:
 	end;
 }
 
-juperos_02,33,59,0	script	jupe_goto2F	45,2,2,{
+juperos_02,33,59,0	script	jupe_goto2F	WARPNPC,2,2,{
 OnTouch:
 	switch(rand(1,4)) {
 	case 1: warp "juperos_01",120,72; end;
@@ -5112,3 +4976,69 @@ OnTouch:
 	}
 	end;
 }
+
+//============================================================
+// GM Management NPC
+//============================================================
+sec_in02,39,167,0	script	Juperos Manager	4_F_OPERATION,{
+	callfunc "F_GM_NPC";
+	mes "[Juperos Manager]";
+	mes "I'm the NPC in";
+	mes "charge of managing";
+	mes "the global variables for";
+	mes "the quests related to";
+	mes "Juperos. GM, please";
+	mes "enter the password.";
+	next;
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "[Juperos Manager]";
+		mes "Incorrect password.";
+		close;
+	} else {
+		mes "[Juperos Manager]";
+		mes "Select a map. Remember:";
+		mes "Make sure that users aren't";
+		mes "doing the quest on the map";
+		mes "you're going to reset, or else";
+		mes "you'll cancel their progress";
+		mes "through the quest.";
+		next;
+		switch(select("jupe_Area1:jupe_Area2:jupe_ele_r:jupe_ele")) {
+		case 1:
+			set .@loc$,"jupe_Area1";
+			set .@var$,"$@JupreArea1InUse";
+			break;
+		case 2:
+			set .@loc$,"jupe_Area2";
+			set .@var$,"$@JupreArea2InUse";
+			break;
+		case 3:
+			set .@loc$,"jupe_ele_r";
+			set .@var$,"$@JupeElevatorInUse";
+			break;
+		case 4:
+			set .@loc$,"jupe_ele";
+			set .@var$,"$@JupeElevatorInUse2";
+			break;
+		}
+		mes "[Juperos Manager]";
+		mes "You've decided";
+		mes "to reset "+.@loc$+".";
+		mes "Shall we proceed?";
+		next;
+		switch(select("Yes.:No.")) {
+		case 1:
+			mes "[Juperos Manager]";
+			mes "The global variable in";
+			mes .@loc$+" has been";
+			mes "reset to 0. Thank you.";
+			setd .@var$,0;
+			close;
+		case 2:
+			mes "[Juperos Manager]";
+			mes "This command";
+			mes "has been canceled.";
+			close;
+		}
+	}
+}
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index d67e79c78..6f9a4c0d2 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -1,65 +1,13 @@
 //===== Hercules Script ======================================
 //= Quest NPCs located in Lighthalzen
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
 //= Lupus, Lord Gywall
-//===== Current Version: ===================================== 
-//= 4.8
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 5.1
+//===== Description: =========================================
 //= Quests related to Lighthalzen City.
-//===== Additional Comments: ================================= 
-//= Grammar/script check please. This was a quick job.
-//= Things to add: Look at the thread "Lighthalzen Guard" in SVN script
-//= 0.3 Initial Release
-//= 0.5 Added mobsters spawn and Einbroch pollution. Alert lasts either 10 minutes or all mob killed.
-//= 0.6-0.9 fix small bug. Added Bio-lab entrance Quest. Added Getting security-card Quest.
-//= 1.0 Patched "mobsters spawn & Alert" like Real-RO.
-//= 1.0a fixed rand(1,10) + comparision. There just can't be 'X < 1' [Lupus]
-//= 1.1 Changed the mobster spawn to g_mobster to prevent exploits [MasterOfMuppets]
-//= 1.2 Added the cube room quest by DeNy, translated by vicious_pucca. [MasterOfMuppets]
-//=	Thanks to Linuxwolf for a grammar check as well =).
-//= 1.2a Moved Biolab entrance to lhz_dun warps. [Vicious]
-//= 1.3 Fixed password bug, fixed endless item exploit, some typos [Lupus]
-//= 1.4 Fixed password abuse. When people don't read the password under the picture
-//= 	and enter Zero shit 8) (TODO: I saw some "Sticks" abuses, too.. where you could skip a part of quest...)
-//= 1.5 Fixed Mobster's OnDead event(it has to start with "On"!) [Playtester]
-//= 1.5a Fixed "free stick" bug, thx 2 Neouni [Lupus]
-//= 1.6 Added Gywall's Pickpocket Quest
-//= 1.7 Implemented the Friendship quest [MasterOfMuppets]
-//= 1.8 Changed the name of the mobsters to Gangster, as it should be. [MasterOfMuppets]
-//= 1.9 Added extra input check on Biolab so that the first letter of the word could be capitalized or undercase. [Evera]
-//= 2.0 Removed Duplicates [Silent]
-//= 2.1 Added first part of Bio Ethics Quest [Evera]
-//= 2.2 Added bit to say Bio Ethics is unfinished, and if a player attempts, it warps them
-//= 	out after finished part... Don't want players getting stuck ;_; [Evera]
-//= 2.3 Finished Bio Ethics Quest. Need bug testers before moving to trunk, my
-//=	mind was somewhere else when writing @_@ [Evera]
-//= 2.4	Fixed the bug where a str&int debug was shown in the console for
-//=	test tube in bio labs quest. [Evera]
-//= 2.5	Fixed Kellasus giving you extra skills in Bio Ethics quest [Evera]
-//= 2.6	Fixed exploit letting any class get homunculus from Bio Ethics Quest [Evera]
-//= 2.6a Moved Bio Ethics Quest to Alchemist SKILL QUESTS [Lupus]
-//= 2.7 fixed bugs that let people bypass some quest parts V_V [Lupus]
-//=	reused cubekey var for 4 Cube Room key vars
-//= 2.8 More optimization. Also fixed bug with "2x short sticks -> long" [Lupus]
-//=	Now uses MISC_QUEST&512 instead of 'hzdun'. WIP
-//= 2.9 Fixed Friendship Quest levelup exploit (u could get EXP twice) [Lupus]
-//= 3.0 Added Cursed Spirit Quest. [SinSloth]
-//=	Moved a book non-related to Lighthalzen quests.
-//= 3.1 Added Schwartzvalt Trilogy Quest. [SinSloth]
-//= 3.2 Updated some NPCs regarding Hugel Rebellion Quest. [SinSloth]
-//= 3.2 Removed the NPC "#kiz03-4" as I couldn't find any [L0ne_W0lf]
-//=	reference to it in the Aegis script.
-//= 3.3 Fixed a wrong negative value checking in Schwartzvalt Trilogy quest. [SinSloth]
-//= 3.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
-//= 3.5 Touch-ups to the Friendship quest. Added EXP reward. [L0ne_W0lf]
-//=	Added cutins for "Maku" npc, and changed "set HP" to percentheal.
-//= 3.5a Adjusted EXP given by "Benkasttein" to be the same as that given by Maku. [L0ne_W0lf]
-//= 3.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 3.7 Counter-fixed negative value checking to now look for both positive and negative values
-//=     since its symbol depends on the time. [SinSloth]
-//= 3.8 Removed bio ethic quest definition from header. [L0ne_W0lf]
-//= 3.9 Added Rekenber Job quest. Don't know why it hasn't been there before though. [SinSloth]
+//===== Additional Comments: =================================
 //= 4.0 Updated several NPCs to Official (iRO) dialog, and restrucured. [L0ne_W0lf]
 //= 4.1 Updated Dungeon quest, and Friendhsip quest to 10.3 standards. [L0ne_W0lf]
 //= 4.2 Fixed wrong variable type in use in "Box#cube1". [L0ne_W0lf]
@@ -70,13 +18,16 @@
 //=     Tube just makes sure you have 1 or more permits.
 //= 4.4 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 4.5 Corrected an Incorrect check of the Shinokas_Quest. (bugreport:2276) [Samuray22]
-//=	  Replaced effect numerics with constants.
+//=     Replaced effect numerics with constants.
 //= 4.5 Official Gangster Alert script. [Gepard]
 //= 4.6 Added quest log entries for:
 //=     - Cursed Spirit Quest
 //= 4.7 Fixed missing label. (bugreport:4654) [L0ne_W0lf]
 //= 4.8 Fixed Cursed Spirit Quest EXP reward. [Euphy]
-//============================================================ 
+//= 4.9 Fixed incorrect use of 'close'. [Joseph]
+//= 5.0 Updated RE/Pre-RE EXP. [Euphy]
+//= 5.1 Added GM management NPCs. [Euphy]
+//============================================================
 
 // Gangster Alert [Official Conversion]
 //============================================================
@@ -101,7 +52,7 @@ OnMyMobDead:
 	end;
 }
 
-lighthalzen,267,200,3	script	Guard#lhz01	868,{
+lighthalzen,267,200,3	script	Guard#lhz01	4_M_LGTGUARD,{
 	if (countitem(7350) > 0) {
 		mes "[Guard]";
 		mes "Hold it right th--!";
@@ -168,7 +119,7 @@ lighthalzen,267,200,3	script	Guard#lhz01	868,{
 	}
 }
 
-lighthalzen,294,223,7	script	Guard#lhz02	868,{
+lighthalzen,294,223,7	script	Guard#lhz02	4_M_LGTGUARD,{
 	if (countitem(7350) > 0) {
 		mes "[Guard]";
 		mes "Hold it right th--!";
@@ -237,7 +188,7 @@ lighthalzen,294,223,7	script	Guard#lhz02	868,{
 
 // Cube Room Quest
 //============================================================
-lighthalzen,341,224,3	script	Fishbone	868,{
+lighthalzen,341,224,3	script	Fishbone	4_M_LGTGUARD,{
 	// Retain prior position in quest.
 	if (piciburn) {
 		set lhz_sincube,piciburn;
@@ -464,6 +415,7 @@ lighthalzen,341,224,3	script	Fishbone	868,{
 				mes "exactly 20 Jellopy on";
 				mes "you, okay? Seeya pal~";
 				set lhz_sincube,5;
+				setquest 12014;
 				close;
 			}
 			mes "[Fishbone]";
@@ -624,6 +576,7 @@ lighthalzen,341,224,3	script	Fishbone	868,{
 			mes "about what happened to";
 			mes "you. So did you get what";
 			mes "you wanted over there?";
+			completequest 12014;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "Yeah...";
@@ -700,7 +653,7 @@ lighthalzen,341,224,3	script	Fishbone	868,{
 	}
 }
 
-lhz_cube,237,198,0	script	Bundle of Files#cube	111,{
+lhz_cube,237,198,0	script	Bundle of Files#cube	HIDDEN_NPC,{
 	if (lhz_sincube < 7) {
 		mes "^3355FFThere are a bunch";
 		mes "of files scattered";
@@ -742,7 +695,7 @@ lhz_cube,237,198,0	script	Bundle of Files#cube	111,{
 	close;
 }
 
-lhz_cube,234,202,0	script	Picture#cube	111,{
+lhz_cube,234,202,0	script	Picture#cube	HIDDEN_NPC,{
 	if (lhz_secret01 < 2) {
 		mes "^3355FFThis picture hanging";
 		mes "on the wall catches";
@@ -838,7 +791,7 @@ lhz_cube,234,202,0	script	Picture#cube	111,{
 	close;
 }
 
-lhz_cube,242,201,0	script	Drawer#cube	111,{
+lhz_cube,242,201,0	script	Drawer#cube	HIDDEN_NPC,{
 	if (lhz_secret01 < 1) {
 		mes "^3355FFThe drawer here";
 		mes "looks interesting,";
@@ -878,7 +831,7 @@ lhz_cube,242,201,0	script	Drawer#cube	111,{
 	close;
 }
 
-lhz_cube,248,179,0	script	Chest#cube	111,{
+lhz_cube,248,179,0	script	Chest#cube	HIDDEN_NPC,{
 	if (lhz_sincube < 7) {
 		mes "^3355FFYou've found a chest";
 		mes "with an axe laid on";
@@ -909,7 +862,7 @@ lhz_cube,248,179,0	script	Chest#cube	111,{
 	close;
 }
 
-lhz_cube,237,183,0	script	Barrel#cube	111,{
+lhz_cube,237,183,0	script	Barrel#cube	HIDDEN_NPC,{
 	set number_line,0;
 	if (lhz_sincube < 8) {
 		mes "^3355FFYou have";
@@ -1006,7 +959,7 @@ lhz_cube,237,183,0	script	Barrel#cube	111,{
 	close;
 }
 
-lhz_cube,224,192,0	script	Power Generator#cube	111,{
+lhz_cube,224,192,0	script	Power Generator#cube	HIDDEN_NPC,{
 	if (lhz_secret01 < 6) {
 		mes "^3355FFThis is a noisily";
 		mes "operating huge machine";
@@ -1055,7 +1008,7 @@ lhz_cube,224,192,0	script	Power Generator#cube	111,{
 	close;
 }
 
-lhz_cube,244,201,0	script	Status Light#cube	111,{
+lhz_cube,244,201,0	script	Status Light#cube	HIDDEN_NPC,{
 	if (lhz_secret01 < 7) {
 		mes "^3355FFThe Status Light is";
 		mes "on. It looks like there's";
@@ -1090,7 +1043,7 @@ lhz_cube,244,201,0	script	Status Light#cube	111,{
 	close;
 }
 
-lhz_cube,234,200,0	script	Desk#cube	111,{
+lhz_cube,234,200,0	script	Desk#cube	HIDDEN_NPC,{
 	if (lhz_secret02 <= 1) {
 		mes "^3355FFYou've found";
 		mes "a completely";
@@ -1227,7 +1180,7 @@ lhz_cube,234,200,0	script	Desk#cube	111,{
 	}
 }
 
-lhz_cube,247,198,0	script	Bed#cube	111,{
+lhz_cube,247,198,0	script	Bed#cube	HIDDEN_NPC,{
 	if (lhz_secret02 == 0) {
 		mes "^3355FFYou've found a bed";
 		mes "in which the sheets";
@@ -1375,7 +1328,7 @@ lhz_cube,247,198,0	script	Bed#cube	111,{
 	close;
 }
 
-lhz_cube,229,184,0	script	Goblet#cube	111,{
+lhz_cube,229,184,0	script	Goblet#cube	HIDDEN_NPC,{
 	if (lhz_sincube < 10) {
 		if (lhz_secret03 == 0) {
 			mes "^3355FFYou see an empty";
@@ -1404,7 +1357,7 @@ lhz_cube,229,184,0	script	Goblet#cube	111,{
 	close;
 }
 
-lhz_cube,231,202,0	script	Chemicals#cube	111,{
+lhz_cube,231,202,0	script	Chemicals#cube	HIDDEN_NPC,{
 	if (lhz_secret03 < 1) {
 		mes "^3355FFThere is a bottle";
 		mes "containing slightly";
@@ -1452,7 +1405,7 @@ lhz_cube,231,202,0	script	Chemicals#cube	111,{
 	close;
 }
 
-lhz_cube,249,191,0	script	Cabinet#cube	111,{
+lhz_cube,249,191,0	script	Cabinet#cube	HIDDEN_NPC,{
 	if (lhz_secret03 < 2) {
 		mes "^3355FFYou've found a";
 		mes "cabinet that contains";
@@ -1504,7 +1457,7 @@ lhz_cube,249,191,0	script	Cabinet#cube	111,{
 	close;
 }
 
-lhz_cube,224,197,0	script	Experiment Tube#cube	111,{
+lhz_cube,224,197,0	script	Experiment Tube#cube	HIDDEN_NPC,{
 	if (lhz_secret01 < 8) {
 		mes "^3355FFYou find a strange";
 		mes "tube that seems to";
@@ -1603,7 +1556,7 @@ lhz_cube,224,197,0	script	Experiment Tube#cube	111,{
 	}
 }
 
-lhz_cube,248,193,0	script	Box#cube1	111,{
+lhz_cube,248,193,0	script	Box#cube1	HIDDEN_NPC,{
 	if ((lhz_secret01 < 9) && (lhz_secret02 < 4) && (lhz_secret03 < 3)) {
 		mes "^3355FFYou find a box with";
 		mes "three distinctively";
@@ -1732,7 +1685,7 @@ lhz_cube,248,193,0	script	Box#cube1	111,{
 	close;
 }
 
-lhz_cube,250,184,0	script	Door#cube	111,{
+lhz_cube,250,184,0	script	Door#cube	HIDDEN_NPC,{
 	mes "^3355FFYou've come upon a";
 	mes "door that leads outside.^000000";
 	next;
@@ -1743,7 +1696,7 @@ lhz_cube,250,184,0	script	Door#cube	111,{
 	close;
 }
 
-lhz_dun02,224,6,0	script	Exit1#lt	45,1,1,{
+lhz_dun02,224,6,0	script	Exit1#lt	WARPNPC,1,1,{
 OnTouch:
 	if (MISC_QUEST&512) {
 		warp "lhz_cube",231,90;
@@ -1758,7 +1711,7 @@ OnTouch:
 
 // Lighthalzen Pickpocket Mini-Quest
 //============================================================
-lighthalzen,240,216,4	script	Suspicious Guy#lhz_01	870,2,2,{
+lighthalzen,240,216,4	script	Suspicious Guy#lhz_01	4_M_LGTPOOR,2,2,{
 	end;
 
 OnTouch:
@@ -1766,8 +1719,8 @@ OnTouch:
 	case 1:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 100) {
-			set zeny,zeny-100;
+		if (Zeny >= 100) {
+			Zeny -= 100;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1782,8 +1735,8 @@ OnTouch:
 	case 2:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 200) {
-			set zeny,zeny-200;
+		if (Zeny >= 200) {
+			Zeny -= 200;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1799,8 +1752,8 @@ OnTouch:
 	case 3:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 10) {
-			set zeny,zeny-10;
+		if (Zeny >= 10) {
+			Zeny -= 10;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1827,7 +1780,7 @@ OnTouch:
 	}
 }
 
-lighthalzen,220,169,3	script	Suspicious Guy#lhz_02	870,2,2,{
+lighthalzen,220,169,3	script	Suspicious Guy#lhz_02	4_M_LGTPOOR,2,2,{
 	end;
 
 OnInit:
@@ -1839,8 +1792,8 @@ OnTouch:
 	case 1:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 100) {
-			set zeny,zeny-100;
+		if (Zeny >= 100) {
+			Zeny -= 100;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1855,8 +1808,8 @@ OnTouch:
 	case 2:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 200) {
-			set zeny,zeny-200;
+		if (Zeny >= 200) {
+			Zeny -= 200;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1872,8 +1825,8 @@ OnTouch:
 	case 3:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 10) {
-			set zeny,zeny-10;
+		if (Zeny >= 10) {
+			Zeny -= 10;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1899,7 +1852,7 @@ OnTouch:
 	}
 }
 
-lighthalzen,164,127,4	script	Suspicious Guy#lhz_03	870,2,2,{
+lighthalzen,164,127,4	script	Suspicious Guy#lhz_03	4_M_LGTPOOR,2,2,{
 	end;
 
 OnInit:
@@ -1912,8 +1865,8 @@ OnTouch:
 	case 2:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 100) {
-			set zeny,zeny-100;
+		if (Zeny >= 100) {
+			Zeny -= 100;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1929,8 +1882,8 @@ OnTouch:
 	case 4:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 200) {
-			set zeny,zeny-200;
+		if (Zeny >= 200) {
+			Zeny -= 200;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -1946,8 +1899,8 @@ OnTouch:
 	case 5:
 		mes "^3355FF*SHHHHHHUK!*^000000";
 		specialeffect EF_STEAL;
-		if (zeny >= 10) {
-			set zeny,zeny-10;
+		if (Zeny >= 10) {
+			Zeny -= 10;
 		}
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -2064,7 +2017,7 @@ OnTouch:
 						mes "but I hope we never bump";
 						mes "into each other ever again!";
 					}
-					set zeny,zeny-.@price;
+					Zeny -= .@price;
 					getitem 12016,.@number; //Speed_Up_Potion
 				}
 			}
@@ -2083,7 +2036,7 @@ OnTouch:
 
 // Friendship Quest
 //============================================================
-lhz_in02,201,210,5	script	Digotz	869,{
+lhz_in02,201,210,5	script	Digotz	4_M_LGTMAN,{
 	if (BaseLevel < 50) {
 		mes "[Digotz]";
 		mes "Oh, an adventurer?";
@@ -2171,6 +2124,7 @@ lhz_in02,201,210,5	script	Digotz	869,{
 		mes "dearly loved his friends.^000000";
 		next;
 		set friendship,15;
+		changequest 12005,12006;
 		getitem 1201,1; //Knife
 		close;
 	}
@@ -2378,6 +2332,7 @@ lhz_in02,201,210,5	script	Digotz	869,{
 		mes "argument. Still, he couldn't";
 		mes "do anything about Maku now...";
 		set friendship,7;
+		changequest 12002,12003;
 		next;
 		mes "[Digotz]";
 		mes "I don't know why,";
@@ -2539,6 +2494,7 @@ lhz_in02,201,210,5	script	Digotz	869,{
 		mes "pals anymore. You know what?";
 		mes "Just forget everything I said.";
 		set friendship,2;
+		changequest 12000,12001;
 		close;
 	}
 	mes "[Digotz]";
@@ -2559,7 +2515,7 @@ lhz_in02,201,210,5	script	Digotz	869,{
 	close;
 }
 
-lighthalzen,337,232,3	script	Maku	870,{
+lighthalzen,337,232,3	script	Maku	4_M_LGTPOOR,{
 	if (friendship > 14) {
 		cutin "lhz_macu07",2;
 		mes "[Maku]";
@@ -2739,14 +2695,14 @@ lighthalzen,337,232,3	script	Maku	870,{
 		next;
 		delitem 7351,1; //Friend's_Diary
 		set friendship,14;
-		if (BaseLevel > 90) {
-			getexp 70000,0;
-		}
-		else if (BaseLevel > 75) {
-			getexp 40000,0;
-		}
-		else {
-			getexp 20000,0;
+		if (checkre(3)) {
+			if (BaseLevel > 90) getexp 70000,0;
+			else if (BaseLevel > 75) getexp 40000,0;
+			else getexp 20000,0;
+		} else {
+			if (BaseLevel > 90) getexp 700000,0;
+			else if (BaseLevel > 75) getexp 400000,0;
+			else getexp 200000,0;
 		}
 		cutin "lhz_macu04",2;
 		mes "[Maku]";
@@ -2998,6 +2954,7 @@ lighthalzen,337,232,3	script	Maku	870,{
 		mes "out and he probably hates";
 		mes "my penniless guts and...";
 		set friendship,3;
+		changequest 12001,12002;
 		next;
 		mes "[Maku]";
 		mes "Crud, just listen to";
@@ -3052,6 +3009,7 @@ lighthalzen,337,232,3	script	Maku	870,{
 		mes "anyway? Sure, we all";
 		mes "do it, but still...";
 		set friendship,1;
+		setquest 12000;
 		next;
 		mes "[Maku]";
 		mes "Well, when you get";
@@ -3125,7 +3083,7 @@ lighthalzen,337,232,3	script	Maku	870,{
 }
 
 
-yuno_in04,107,14,5	script	Student	754,{
+yuno_in04,107,14,5	script	Student	4_M_SAGE_A,{
 	if (friendship == 7 || friendship == 8) {
 		mes "[Joey Choryee]";
 		mes "This is a study area where";
@@ -3154,7 +3112,7 @@ yuno_in04,107,14,5	script	Student	754,{
 	close;
 }
 
-yuno_in04,96,106,5	script	Passionate Student	754,{
+yuno_in04,96,106,5	script	Passionate Student	4_M_SAGE_A,{
 	if ((MaxWeight-Weight) < 300 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -3189,14 +3147,15 @@ yuno_in04,96,106,5	script	Passionate Student	754,{
 		mes "rich and poor areas as my thanks.";
 		next;
 		set friendship,16;
-		if (BaseLevel > 90) {
-			getexp 70000,0;
-		}
-		else if (BaseLevel > 75) {
-			getexp 40000,0;
-		}
-		else {
-			getexp 20000,0;
+		completequest 12006;
+		if (checkre(3)) {
+			if (BaseLevel > 90) getexp 70000,0;
+			else if (BaseLevel > 75) getexp 40000,0;
+			else getexp 20000,0;
+		} else {
+			if (BaseLevel > 90) getexp 700000,0;
+			else if (BaseLevel > 75) getexp 400000,0;
+			else getexp 200000,0;
 		}
 		getitem 7350,1; //Pass
 		mes "[Benkaistein]";
@@ -3239,6 +3198,7 @@ yuno_in04,96,106,5	script	Passionate Student	754,{
 		mes "times we used to share.";
 		next;
 		set friendship,12;
+		changequest 12004,12005;
 		mes "[Benkaistein]";
 		mes "Anyway, this should at";
 		mes "least help them realize";
@@ -3288,6 +3248,7 @@ yuno_in04,96,106,5	script	Passionate Student	754,{
 		mes "to finish this thesis. Let's see... What can I possibly do from here?";
 		next;
 		set friendship,10;
+		changequest 12003,12004;
 		mes "[Benkaistein]";
 		mes "Oh, I know what I can do!";
 		mes "Wait, but where did I put it?";
@@ -3372,7 +3333,7 @@ yuno_in04,96,106,5	script	Passionate Student	754,{
 	close;
 }
 
-yuno_in04,168,117,3	script	Book#lhz	111,{
+yuno_in04,168,117,3	script	Book#lhz	HIDDEN_NPC,{
 	if (friendship == 11) {
 		mes "^3355FFThere's nothing";
 		mes "over here that you";
@@ -3408,7 +3369,7 @@ OnTouch_:
 		}
 		else if (lhz_curse < 26) {
 			set @lhz_ghost,rand(1,5);
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			soundeffect "loli_ruri_stand.wav",0;
 			if (@lhz_ghost == 1) {
 				mes "[??????]";
@@ -3448,7 +3409,7 @@ OnTouch_:
 		}
 		else if (lhz_curse < 26) {
 			set @lhz_ghost,rand(1,10);
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			soundeffect "tao_gunka_stand.wav",0;
 			if (@lhz_ghost == 1) {
 				mes "[??????]";
@@ -3488,7 +3449,7 @@ OnTouch_:
 		}
 		else if (lhz_curse < 26) {
 			set @lhz_ghost,rand(1,10);
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			soundeffect "tao_gunka_stand.wav",0;
 			if (@lhz_ghost == 1) {
 				mes "[??????]";
@@ -3522,13 +3483,13 @@ OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3560,8 +3521,8 @@ OnTouch_:
 			mes "just in my head, were they?";
 			mes "Hello...? Anybody there...?";
 			close2;
-			sc_end SC_Blind;
-			sc_start SC_Curse,5000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,5000,0;
 			if (!lhz_spi01) set lhz_spi01,1;
 		}
 	}
@@ -3572,14 +3533,14 @@ lhz_in03,178,22,0	script	#kiz04	-1,2,2,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			soundeffect "tao_gunka_stand.wav",0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3639,8 +3600,8 @@ OnTouch_:
 			mes "these voices coming from?";
 			close2;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,5000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,5000,0;
 			if (!lhz_spi02) set lhz_spi02,1;
 		}
 	}
@@ -3651,13 +3612,13 @@ lighthalzen,295,227,0	script	#kiz05	-1,2,2,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "loli_ruri_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3685,8 +3646,8 @@ OnTouch_:
 			mes "I must be hallucinating!";
 			close2;
 			soundeffect "loli_ruri_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,3000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,3000,0;
 			if (!lhz_spi03) set lhz_spi03,1;
 		}
 	}
@@ -3697,13 +3658,13 @@ lighthalzen,364,315,0	script	#kiz06	-1,3,3,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3744,8 +3705,8 @@ OnTouch_:
 			mes "............";
 			close2;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,5000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,5000,0;
 			if (!lhz_spi04) set lhz_spi04,1;
 		}
 	}
@@ -3756,13 +3717,13 @@ lhz_in01,113,150,0	script	#kiz07	-1,3,3,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[?????]";
@@ -3798,8 +3759,8 @@ OnTouch_:
 			mes "............";
 			close2;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,3000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,3000,0;
 			if (lhz_curse == 6) set lhz_curse,7;
 		}
 	}
@@ -3810,13 +3771,13 @@ lhz_in01,272,227,0	script	#kiz08	-1,2,2,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
 		if (lhz_curse == 0) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 		else if ((lhz_curse > 0) && (lhz_curse < 26)) {
 			mes "............";
 			next;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_start SC_Blind,60000,0;
+			sc_start SC_BLIND,60000,0;
 			mes "............";
 			next;
 			mes "[????]";
@@ -3882,8 +3843,8 @@ OnTouch_:
 			mes "............";
 			close2;
 			soundeffect "tao_gunka_stand.wav",0;
-			sc_end SC_Blind;
-			sc_start SC_Curse,3000,0;
+			sc_end SC_BLIND;
+			sc_start SC_CURSE,3000,0;
 			if (lhz_curse == 11) set lhz_curse,12;
 		}
 	}
@@ -3898,18 +3859,18 @@ OnTouch_:
 			next;
 			mes "............";
 			soundeffect "loli_ruri_stand.wav",0;
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			close2;
 			warp "lhz_que01",26,27;
 		}
 		else if (((lhz_curse > 0) && (lhz_curse < 12)) && ((lhz_curse > 12) && (lhz_curse < 26))) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 	}
 	end;
 }
 
-lhz_que01,21,31,5	script	#li_Varmunt	755,{
+lhz_que01,21,31,5	script	#li_Varmunt	4_M_SAGE_C,{
 	if (countitem(7345) > 0) {
 		if (lhz_curse == 12) {
 			mes "[??]";
@@ -4045,7 +4006,7 @@ lhz_que01,21,31,5	script	#li_Varmunt	755,{
 	end;
 }
 
-lhz_que01,29,24,3	script	#li_researcher	754,{
+lhz_que01,29,24,3	script	#li_researcher	4_M_SAGE_A,{
 	if (countitem(7345) > 0) {
 		if (lhz_curse == 12) {
 			mes "Doctor Varmunt,";
@@ -4200,19 +4161,19 @@ OnTouch_:
 			mes "......";
 			mes ".........";
 			soundeffect "loli_ruri_stand.wav",0;
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 			close2;
 			warp "lhz_que01",98,59;
 			end;
 		}
 		else if (((lhz_curse > 0) && (lhz_curse < 16)) && ((lhz_curse > 16) && (lhz_curse < 26))) {
-			sc_start SC_Curse,1000,0;
+			sc_start SC_CURSE,1000,0;
 		}
 	}
 	end;
 }
 
-lhz_que01,99,74,5	script	#li_Man	48,{
+lhz_que01,99,74,5	script	#li_Man	1_M_02,{
 	if (lhz_curse == 16) {
 		mes "[???]";
 		mes "It's over.";
@@ -4348,7 +4309,7 @@ lhz_que01,99,74,5	script	#li_Man	48,{
 	end;
 }
 
-lhz_que01,90,71,5	script	#li_bird	1019,3,3,{
+lhz_que01,90,71,5	script	#li_bird	PECOPECO,3,3,{
 	mes "[Peco Peco]";
 	mes "You're a fool!";
 	mes "You're a fool!";
@@ -4363,7 +4324,7 @@ OnTouch_:
 	close;
 }
 
-lighthalzen,346,263,3	script	Elder#lhz	846,{
+lighthalzen,346,263,3	script	Elder#lhz	4_F_EINOLD,{
 	if (countitem(7345) > 0) {
 		if ((lhz_curse == 1) && (lhz_spi01 == 1) && (lhz_spi02 == 1) && (lhz_spi03 == 1) && (lhz_spi04 == 1)) {
 			mes "[Elder]";
@@ -4407,7 +4368,7 @@ lighthalzen,346,263,3	script	Elder#lhz	846,{
 				mes "down your spine, cold sweats,";
 				mes "maybe even hearing voices?";
 				soundeffect "loli_ruri_stand.wav",0;
-				sc_start SC_Curse,5000,0;
+				sc_start SC_CURSE,5000,0;
 				next;
 				select("Yes! How do I get rid of them?");
 				mes "[Elder]";
@@ -4472,10 +4433,10 @@ lighthalzen,346,263,3	script	Elder#lhz	846,{
 				mes "you must search should";
 				mes "be clear to you now! Don't";
 				mes "forget these placemarks!";
-				viewpoint 1,104,282,1,0xFF99FF33;
-				viewpoint 1,105,282,2,0xFF99FF33;
-				viewpoint 1,104,281,3,0xFF99FF33;
-				viewpoint 1,105,281,4,0xFF99FF33;
+				viewpoint 1,104,282,1,0x99FF33;
+				viewpoint 1,105,282,2,0x99FF33;
+				viewpoint 1,104,281,3,0x99FF33;
+				viewpoint 1,105,281,4,0x99FF33;
 				next;
 				mes "[Elder]";
 				mes "Good luck, youngster.";
@@ -4831,7 +4792,7 @@ lighthalzen,346,263,3	script	Elder#lhz	846,{
 	}
 }
 
-lhz_in03,32,162,3	script	Crippled Girl#li_tre	53,{
+lhz_in03,32,162,3	script	Crippled Girl#li_tre	1_M_INNKEEPER,{
 	if (lhz_curse == 23) {
 		if (countitem(7341) > 0) {
 			mes "["+strcharinfo(0)+"]";
@@ -5196,7 +5157,7 @@ lhz_in03,32,162,3	script	Crippled Girl#li_tre	53,{
 	}
 }
 
-lighthalzen,324,322,0	script	#li_door	45,2,2,{
+lighthalzen,324,322,0	script	#li_door	WARPNPC,2,2,{
 OnTouch_:
 	if ((lhz_curse > 19) && (lhz_curse < 23)) {
 		mes "^3355FFThe door is locked.^000000";
@@ -5228,7 +5189,7 @@ OnTouch_:
 
 lhz_in03,12,162,0	warp	#to_lhz		1,1,lighthalzen,321,322
 
-lighthalzen,319,321,0	script	#li_bother	-1,3,3,{
+lighthalzen,319,321,0	script	#li_bother	-1,2,2,{ //3,3
 OnTouch_:
 	if ((lhz_curse == 24 ) || (lhz_curse == 25)) {
 		mes ".............";
@@ -5267,19 +5228,23 @@ OnTouch_:
 		mes "^FF0000Regenschirm Laboratory^000000.";
 		set lhz_curse,26;
 		changequest 2093,2094;
-		if (BaseLevel < 70)
-			getexp 800000,300000;
-		else if ((BaseLevel > 69) && (BaseLevel < 80))
-			getexp 1000000,500000;
-		else if ((BaseLevel > 79) && (BaseLevel < 90))
-			getexp 1500000,800000;
-		else if (BaseLevel > 89)
-			getexp 2000000,1000000;
+		if (checkre(3)) {
+			if (BaseLevel < 70) getexp 30000,30000;
+			else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 40000,70000;
+			else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 70000,90000;
+			else getexp 90000,90000;
+		} else {
+			if (BaseLevel < 70) getexp 800000,300000;
+			else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 1000000,500000;
+			else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 1500000,800000;
+			else getexp 2000000,1000000;
+		}
+		close;
 	}
-	close;
+	end;
 }
 
-lhz_in01,114,181,5	script	Representative#li_01	71,{
+lhz_in01,114,181,5	script	Representative#li_01	1_F_LIBRARYGIRL,{
 	if (lhz_curse == 7) {
 		mes "[Representative]";
 		mes "Greetings, and welcome";
@@ -5438,7 +5403,7 @@ lhz_in01,114,181,5	script	Representative#li_01	71,{
 	}
 }
 
-lhz_in01,27,247,5	script	Representative#li_02	71,{
+lhz_in01,27,247,5	script	Representative#li_02	1_F_LIBRARYGIRL,{
 	if (lhz_curse > 6) {
 		mes "[Representative]";
 		mes "Welcome to the";
@@ -5580,7 +5545,7 @@ lhz_in01,27,247,5	script	Representative#li_02	71,{
 	}
 }
 
-lhz_in01,25,251,3	script	Rekenber Guidebook#li	111,{
+lhz_in01,25,251,3	script	Rekenber Guidebook#li	HIDDEN_NPC,{
 	mes "..............";
 	next;
 	mes "^3131FF#The Vision^000000";
@@ -5616,7 +5581,7 @@ lhz_in01,25,251,3	script	Rekenber Guidebook#li	111,{
 	close;
 }
 
-lhz_in01,273,121,1	script	Mad Scientist#li	865,{
+lhz_in01,273,121,1	script	Mad Scientist#li	4_LGTSCIENCE,{
 	if (lhz_curse == 13) {
 		mes "[Wolfchev]";
 		mes "No one shall";
@@ -5815,7 +5780,7 @@ lhz_in01,273,121,1	script	Mad Scientist#li	865,{
 	}
 }
 
-lhz_in01,286,226,3	script	Secretary Slierre#li	831,{
+lhz_in01,286,226,3	script	Secretary Slierre#li	4_F_ZONDAGIRL,{
 	if (lhz_curse == 26) {
 		mes "[Sueii Slierre]";
 		mes "Excuse me, but you are";
@@ -6314,7 +6279,7 @@ OnTouch_:
 	end;
 }
 
-lhz_in01,43,114,0	script	#li_toend	45,1,1,{
+lhz_in01,43,114,0	script	#li_toend	WARPNPC,1,1,{
 OnTouch_:
 	if (lhz_curse > 30) {
 		warp "lhz_que01",97,30;
@@ -6328,7 +6293,7 @@ OnTouch_:
 lhz_que01,97,33,0	warp	#li_toin01	1,1,lhz_in01,43,120
 lhz_in01,278,132,0	warp	#li_toin02	1,1,lhz_in01,43,120
 
-lhz_que01,89,15,3	script	File#li	111,{
+lhz_que01,89,15,3	script	File#li	HIDDEN_NPC,{
 	mes "Name: Engeod";
 	mes "Age: XX";
 	mes "Height: XXX";
@@ -6346,7 +6311,7 @@ lhz_que01,89,15,3	script	File#li	111,{
 	close;
 }
 
-lhz_in01,269,114,3	script	A File#li-1	111,{
+lhz_in01,269,114,3	script	A File#li-1	HIDDEN_NPC,{
 	mes "Name: Engeod";
 	mes "Age: XX";
 	mes "Height: XXX";
@@ -6366,7 +6331,7 @@ lhz_in01,269,114,3	script	A File#li-1	111,{
 
 // President Quest, a.k.a. Schwartzvalt Triology Quest
 //============================================================
-lighthalzen,179,170,4	script	Ordinary Man	98,{
+lighthalzen,179,170,4	script	Ordinary Man	4W_M_02,{
 
 	if(!lhz_boss)
 	{
@@ -6429,8 +6394,7 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 	}
 	else if(lhz_boss == 1)
 	{
-		set @weather,rand(1,5);
-		if(@weather == 4)
+		if(rand(1,5) == 4)
 		{
 			mes "[Ghalstein]";
 			mes "Hm? It's a little";
@@ -6888,6 +6852,7 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 		mes "contact who can sneak";
 		mes "you inside the Laboratory.";
 		set lhz_boss,6;
+		changequest 12015,12016;
 		close;
 	}
 	else if(lhz_boss == 6)
@@ -6933,11 +6898,12 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 			mes "next mission. Show this to";
 			mes "him to prove that you are";
 			mes "working with us. Don't forget.";
-			delitem 7346,1;
-			delitem 7347,10;
-			delitem 7345,10;
+			delitem 7346,1; //Pile_Of_Ymir_Heart
+			delitem 7347,10; //Lab_Staff_Record
+			delitem 7345,10; //Armlet_Of_Prisoner
 			set lhz_boss,8;
-			getitem 7348,1;
+			getitem 7348,1; //Indication_Of_Member01
+			changequest 12016,12017;
 			close;
 		}
 		else if((!countitem(7346)) && (!countitem(7347)) && (!countitem(7345)))
@@ -7036,8 +7002,9 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 		mes "we weren't able to accomplish";
 		mes "what we set out to do. Still...";
 		set lhz_boss,44;
-		getitem 617,1;
-		getexp 180000,0;
+		getitem 617,1; //Old_Violet_Box
+		getexp (checkre(3))?180000:1800000,0;
+		completequest 12028;
 		next;
 		mes "[Ghalstein]";
 		mes "I'd like to thank you";
@@ -7140,12 +7107,13 @@ OnTouch:
 				mes "to is gone! What's";
 				mes "going on here?^000000";
 				set lhz_boss,2;
+				setquest 12015;
 				close;
 		}
 	}
 }
 
-yuno_fild04,165,245,4	script	Dismal Guy	89,{
+yuno_fild04,165,245,4	script	Dismal Guy	4_M_ORIENT02,{
 
 	if(lhz_boss < 8)
 	{
@@ -7311,6 +7279,7 @@ yuno_fild04,165,245,4	script	Dismal Guy	89,{
 		mes "him from ^FF00008:00 PM to 11:00 PM^000000,";
 		mes "and from ^FF000011:00 AM to 2:00PM PST^000000.Good luck on this mission, friend.";
 		set lhz_boss,11;
+		changequest 12017,12018;
 		close;
 	}
 	else
@@ -7324,7 +7293,7 @@ yuno_fild04,165,245,4	script	Dismal Guy	89,{
 	}
 }
 
-yuno_pre,69,20,4	script	Secretary#1	862,{
+yuno_pre,69,20,4	script	Secretary#1	4_F_LGTGIRL,{
 
 	if(lhz_boss < 11)
 	{
@@ -7580,7 +7549,7 @@ yuno_pre,69,20,4	script	Secretary#1	862,{
 	}
 }
 
-yuno_pre,95,71,5	script	Guard	852,{
+yuno_pre,95,71,5	script	Guard	4_M_EIN_SOLDIER,{
 
 	if(lhz_boss < 11)
 	{
@@ -7710,14 +7679,14 @@ yuno_pre,95,71,5	script	Guard	852,{
 	}
 }
 
-yuno_pre,96,69,2	script	A Fine Gentleman	754,{
+yuno_pre,96,69,2	script	A Fine Gentleman	4_M_SAGE_A,{
 
 OnInit:
 	disablenpc "A Fine Gentleman";
 	end;
 }
 
-yuno_pre,69,79,4	script	Mr. President	872,{
+yuno_pre,69,79,4	script	Mr. President	4_M_PRESIDENT,{
 
 	if(checkweight(7342,1) != 1)
 	{
@@ -7913,7 +7882,8 @@ L_Mission:
 		mes "for me before you leave.";
 		mes "Thank you very much.";
 		set lhz_boss,16;
-		getitem 7342,1;
+		getitem 7342,1; //File01
+		changequest 12018,12019;
 		close2;
 		cutin "",255;
 		end;
@@ -7975,8 +7945,7 @@ L_Mission:
 	}
 	else if(lhz_boss == 22)
 	{
-		set @read_pre,rand(1,5);
-		if(@read_pre == 3)
+		if(rand(1,5) == 3)
 		{
 			mes "[Karl]";
 			mes "Hm. After completely";
@@ -8015,6 +7984,7 @@ L_Mission:
 			mes "I don't want our enemies";
 			mes "to discover Shinokas before";
 			mes "we can get him to talk.";
+			changequest 12022,12023;
 			if(Shinokas_Quest == 11) set lhz_boss,24;
 			else set lhz_boss,23;
 			close2;
@@ -8078,6 +8048,8 @@ L_Mission:
 			mes "who you are and";
 			mes "how to help you.";
 			set lhz_boss,26;
+			completequest 12023;
+			setquest 12024;
 			close2;
 			cutin "",255;
 			end;
@@ -8196,8 +8168,7 @@ L_Mission:
 	}
 	else if(lhz_boss == 25)
 	{
-		set @talk_pre,rand(1,10);
-		if(@talk_pre == 8)
+		if(rand(1,10) == 8)
 		{
 			mes "[Karl]";
 			mes "Alright, I just";
@@ -8235,6 +8206,8 @@ L_Mission:
 			mes "who you are and";
 			mes "how to help you.";
 			set lhz_boss,26;
+			completequest 12023;
+			setquest 12024;
 			close2;
 			cutin "",255;
 			end;
@@ -8508,10 +8481,22 @@ L_Mission:
 		mes "^3355FFGhalstein^000000 again. It's time";
 		mes "we let you loose, adventurer.";
 		set lhz_boss,43;
+		completequest 12028;
 		close2;
 		cutin "",255;
 		end;
 	}
+	else if(lght_boss == 43)
+	{
+		mes "[Karl]";
+		mes ".........";
+		mes "............";
+		for(set .@i,12015; .@i<=12028; set .@i,.@i+1) {
+			if (checkquest(.@i) > 0 && checkquest(.@i) < 2)
+				completequest .@i;
+		}
+		close;
+	}
 	else if(hg_tre == 56)
 	{
 		if(!countitem(7342))
@@ -8587,8 +8572,8 @@ L_Mission:
 		mes "Thank you so much. ";
 		mes "You can count on me to right what was wrong.";
 		set hg_tre,57;
-		delitem 7342,1;
-		getexp 200000,0;
+		delitem 7342,1; //File01
+		getexp (checkre(3))?200000:2000000,0;
 		getitem 617,1;
 		close2;
 		cutin "",255;
@@ -8618,14 +8603,14 @@ L_Mission:
 	}
 }
 
-yuno_pre,77,68,0	script	Secretary#2	862,{
+yuno_pre,77,68,0	script	Secretary#2	4_F_LGTGIRL,{
 
 OnInit:
 	disablenpc "Secretary#2";
 	end;
 }
 
-yuno_pre,75,73,0	script	A Neat Gentleman	109,{
+yuno_pre,75,73,0	script	A Neat Gentleman	4_M_MANAGER,{
 
 OnInit:
 	disablenpc "A Neat Gentleman";
@@ -8668,7 +8653,7 @@ OnTouch:
 	}
 }
 
-aldebaran,58,225,4	script	Kafra Employee#l1	116,{
+aldebaran,58,225,4	script	Kafra Employee#l1	4_F_KAFRA2,{
 
 	if(lhz_boss != 17)
 	{
@@ -8738,7 +8723,7 @@ aldebaran,58,225,4	script	Kafra Employee#l1	116,{
 	}
 }
 
-aldeba_in,155,240,5	script	Kafra Employee#l2	859,{
+aldeba_in,155,240,5	script	Kafra Employee#l2	4_F_AGENTKAFRA,{
 
 	if(checkweight(7343,1) != 1)
 	{
@@ -8910,6 +8895,7 @@ aldeba_in,155,240,5	script	Kafra Employee#l2	859,{
 								mes "so please hurry before";
 								mes "the enemy can get to him...";
 								set lhz_boss,18;
+								changequest 12019,12020;
 								close;
 						}
 				}
@@ -8997,7 +8983,8 @@ aldeba_in,155,240,5	script	Kafra Employee#l2	859,{
 		mes "The Secret Wing is counting";
 		mes "on you, brave adventurer.";
 		set lhz_boss,21;
-		getitem 7343,1;
+		getitem 7343,1; //File02
+		changequest 12021,12022;
 		next;
 		mes "[Benith]";
 		mes "I swear by my father's";
@@ -9019,7 +9006,7 @@ aldeba_in,155,240,5	script	Kafra Employee#l2	859,{
 	}
 }
 
-lhz_fild02,228,214,0	script	Wounded Man	849,{
+lhz_fild02,228,214,0	script	Wounded Man	4_M_DIEMAN,{
 
 	if(checkweight(7343,1) != 1)
 	{
@@ -9085,7 +9072,8 @@ lhz_fild02,228,214,0	script	Wounded Man	849,{
 					mes "I'd be a goner. H-here,";
 					mes "t-take this with you...";
 					set lhz_boss,19;
-					getitem 7343,1;
+					getitem 7343,1; //File02
+					changequest 12020,12021;
 					next;
 					mes "[Jargeah]";
 					mes "Oh... Oh no.";
@@ -9149,7 +9137,7 @@ OnTouch:
 	}
 }
 
-lhz_fild01,66,219,4	script	Mysterious Woman	859,{
+lhz_fild01,66,219,4	script	Mysterious Woman	4_F_AGENTKAFRA,{
 
 	if(lhz_boss == 26)
 	{
@@ -9201,6 +9189,7 @@ lhz_fild01,66,219,4	script	Mysterious Woman	859,{
 		mes "so be careful and don't let";
 		mes "them get suspicious of you!";
 		set lhz_boss,27;
+		changequest 12024,12025;
 		close2;
 		disablenpc "Mysterious Woman";
 		end;
@@ -9345,6 +9334,7 @@ lhz_fild01,66,219,4	script	Mysterious Woman	859,{
 		mes "For now, this is";
 		mes "goodbye. Take care...";
 		set lhz_boss,41;
+		changequest 12027,12028;
 		close2;
 		disablenpc "Mysterious Woman";
 		end;
@@ -9363,7 +9353,7 @@ OnInit:
 	end;
 }
 
-lhz_in01,93,45,4	script	Researcher#1	865,{
+lhz_in01,93,45,4	script	Researcher#1	4_LGTSCIENCE,{
 
 	if(lhz_boss < 28)
 	{
@@ -9465,7 +9455,7 @@ lhz_in01,93,45,4	script	Researcher#1	865,{
 	}
 }
 
-lhz_in01,285,169,3	script	Researcher#2	865,{
+lhz_in01,285,169,3	script	Researcher#2	4_LGTSCIENCE,{
 
 	if(checkweight(7349,1) != 1)
 	{
@@ -9508,7 +9498,8 @@ lhz_in01,285,169,3	script	Researcher#2	865,{
 		mes "stick around for 3 minutes";
 		mes "at a time. The Secret Archive is to the right of this laboratory.";
 		set lhz_boss,28;
-		getitem 7349,1;
+		getitem 7349,1; //Indication_Of_Member02
+		changequest 12025,12026;
 		next;
 		mes "[Lestin]";
 		mes "When you're finished,";
@@ -9599,8 +9590,9 @@ lhz_in01,285,169,3	script	Researcher#2	865,{
 		mes "Lighthalzen where you";
 		mes "found her last time. She'll";
 		mes "know that you're coming.";
-		delitem 7349,1;
+		delitem 7349,1; //Indication_Of_Member02
 		set lhz_boss,36;
+		changequest 12026,12027;
 		close;
 	}
 	else
@@ -9616,7 +9608,7 @@ lhz_in01,285,169,3	script	Researcher#2	865,{
 	}
 }
 
-lhz_in01,187,31,0	script	#Sneak	111,4,3,{
+lhz_in01,187,31,0	script	#Sneak	HIDDEN_NPC,4,3,{
 
 	end;
 
@@ -9800,7 +9792,7 @@ OnTimer190000:
 
 
 
-lhz_in01,182,35,0	script	File Search Engine	111,{
+lhz_in01,182,35,0	script	File Search Engine	HIDDEN_NPC,{
 
 	if((lhz_boss > 28) && (lhz_boss < 35))
 	{
@@ -9930,7 +9922,7 @@ L_Search:
 	close;
 }
 
-lhz_in01,177,31,0	script	Door#sneak	111,{
+lhz_in01,177,31,0	script	Door#sneak	HIDDEN_NPC,{
 
 	if(lhz_boss < 29)
 	{
@@ -9968,7 +9960,7 @@ lhz_in01,177,31,0	script	Door#sneak	111,{
 	}
 }
 
-lhz_in01,184,40,0	script	Area 1-5	111,{
+lhz_in01,184,40,0	script	Area 1-5	HIDDEN_NPC,{
 
 	if(checkweight(7344,1) != 1)
 	{
@@ -10017,7 +10009,7 @@ lhz_in01,184,40,0	script	Area 1-5	111,{
 	}
 }
 
-lhz_in01,184,52,0	script	Area 1-7	111,{
+lhz_in01,184,52,0	script	Area 1-7	HIDDEN_NPC,{
 
 	if((lhz_boss > 28) && (lhz_boss < 32))
 	{
@@ -10079,7 +10071,7 @@ lhz_in01,184,52,0	script	Area 1-7	111,{
 	}
 }
 
-lhz_in01,184,46,0	script	Area 3-2	111,{
+lhz_in01,184,46,0	script	Area 3-2	HIDDEN_NPC,{
 
 	if((lhz_boss > 28) && (lhz_boss < 30))
 	{
@@ -10144,7 +10136,7 @@ lhz_in01,184,46,0	script	Area 3-2	111,{
 	}
 }
 
-lhz_in01,184,48,0	script	Area 3-3	111,{
+lhz_in01,184,48,0	script	Area 3-3	HIDDEN_NPC,{
 
 	if((lhz_boss > 28) && (lhz_boss < 34))
 	{
@@ -10192,7 +10184,7 @@ lhz_in01,184,48,0	script	Area 3-3	111,{
 	}
 }
 
-lhz_in01,177,56,0	script	Area 6-1	111,{
+lhz_in01,177,56,0	script	Area 6-1	HIDDEN_NPC,{
 
 	if((lhz_boss > 28) && (lhz_boss < 33))
 	{
@@ -10239,7 +10231,7 @@ lhz_in01,177,56,0	script	Area 6-1	111,{
 	}
 }
 
-lhz_dun02,282,278,0	script	Broken Machine	111,{
+lhz_dun02,282,278,0	script	Broken Machine	HIDDEN_NPC,{
 
 	if(checkweight(7346,1) != 1)
 	{
@@ -10319,7 +10311,28 @@ lhz_dun02,282,278,0	script	Broken Machine	111,{
 	}
 }
 
-lhz_in02,19,274,2	script	Maintenance Guy	851,{
+sec_in02,17,170,4	script	boss::lght_boss_admin	1_M_SIGNMONK,{
+	callfunc "F_GM_NPC";
+	mes "[Patch]";
+	mes "Tell me what you want.";
+	next;
+	switch(select("Current Variables:How Many:Shinokas - Quest Complete")) {
+	case 1:
+		break;
+	case 2:
+		input .@input,0,1000;
+		set lght_boss,.@input;
+		break;
+	case 3:
+		set Shinokas_Quest,11;
+		close;
+	}
+	mes " ";
+	mes ""+lght_boss;
+	close;
+}
+
+lhz_in02,19,274,2	script	Maintenance Guy	4_M_REPAIR,{
 
 	mes "[Kudiuu]";
 	mes "Holy...!";
@@ -10333,10 +10346,11 @@ lhz_in02,19,274,2	script	Maintenance Guy	851,{
 
 // Rekenber Job Quest
 //============================================================
-lhz_in01,174,258,3	script	Young Man#reken	868,{
+lhz_in01,174,258,3	script	Young Man#reken	4_M_LGTGUARD,{
 
 	if(lhz_rekenber > 21)
 	{
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Just...";
 		mes "Leave me alone.";
@@ -10350,10 +10364,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "the one who's... Geez. I wish";
 		mes "I could live the way you do.";
 		mes "Someday I'll be strong enough...";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 21)
 	{
+		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
 		mes "Hey, you're back. As usual,";
 		mes "you've done a good job. You";
@@ -10369,10 +10386,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "opened, and I saw what was";
 		mes "inside of those packages.";
 		next;
+		cutin "lhz_kaz06",2;
+		next;
 		mes "[Kazien]";
 		mes "......";
 		mes ".........";
 		mes "............";
+		cutin "lhz_kaz08",2;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Wh-why are you supplying";
@@ -10381,6 +10401,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "other countries, it can";
 		mes "cause a lot of trouble...!";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Stop. Please.";
 		mes "J-just stop it.";
@@ -10403,6 +10424,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "to the world to make sure these";
 		mes "weapons aren't distributed?";
 		next;
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "Shut up! You don't";
 		mes "know anything! Just";
@@ -10414,6 +10436,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "[" + strcharinfo(0) + "]";
 		mes ".................";
 		next;
+		cutin "lhz_kaz04",2;
 		mes "[Kazien]";
 		mes "There'd be days when my";
 		mes "brother and I'd have nothing";
@@ -10422,6 +10445,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "is world peace if I'm not even";
 		mes "alive to enjoy it, huh?";
 		next;
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "Now, my brother Lyozien is";
 		mes "a gentle soul, has nothing";
@@ -10430,6 +10454,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "I'm really doing--he'd never";
 		mes "agree to it, believe me.";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "I hate this job and what";
 		mes "I'm doing and I want to quit.";
@@ -10437,6 +10462,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "slums? Forget it. As long as";
 		mes "Lyozien is happy, I don't mind if I have to do the devil's work.";
 		next;
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "At least this way, keeping";
 		mes "it all secret, I can protect";
@@ -10450,6 +10476,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "that people can kill each other! Even if it's for the sake of";
 		mes "providing for your family...";
 		next;
+		cutin "lhz_kaz05",2;
 		mes "[Kazien]";
 		mes "Look man, this is what";
 		mes "I decided. I don't care";
@@ -10463,6 +10490,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "with your swords and magic spells... Isn't that just as bad?";
 		mes "It's not the weapons or the power that's bad: it's how they're used.";
 		next;
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "Granted, most of my clients";
 		mes "are pretty questionable, and";
@@ -10471,6 +10499,10 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "Damn it! Just... Don't come";
 		mes "back. I can't work like this...";
 		next;
+		set lhz_rekenber,22;
+		getexp (checkre(3))?55000:550000,0;
+		completequest 12013;
+		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Look, I can't have";
 		mes "you working with me";
@@ -10478,21 +10510,25 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "Sorry, but it's for Lyozien's";
 		mes "own good. That, and you";
 		mes "make me feel guilty...";
-		set lhz_rekenber,22;
-		getexp 55000,0;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber > 16)
 	{
+		cutin "lhz_kaz02",2;
 		mes "[Kazien]";
 		mes "Hey now, you better";
 		mes "get a move on. You gotta";
 		mes "assist another delivery to";
 		mes "the Rune-Midgarts Kingdom.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 16)
 	{
+		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
 		mes "Ah, I heard from Lyozien";
 		mes "that you guys finished your";
@@ -10500,6 +10536,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "the best part-timer that I've";
 		mes "had in a long, long while.";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Anyway, we've got yet";
 		mes "another delivery for the";
@@ -10507,6 +10544,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "weird that we're getting more";
 		mes "orders from there, but orders from other countries are decreasing.";
 		next;
+		cutin "lhz_kaz07",2;
 		mes "[Kazien]";
 		mes "Eh, I don't have the time";
 		mes "to wonder about stuff like";
@@ -10521,6 +10559,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "packages? Why would";
 		mes "they want to do that?";
 		next;
+		cutin "lhz_kaz02",2;
 		mes "[Kazien]";
 		mes "Look... You're better";
 		mes "off not knowing. Or are";
@@ -10536,6 +10575,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "in those packages, and why me";
 		mes "and Lyozien are being attacked.";
 		next;
+		cutin "lhz_kaz08",2;
 		mes "[Kazien]";
 		mes "Listen, I'm not obligated--";
 		mes "I can't tell you. Heck, I can't";
@@ -10544,27 +10584,34 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "that, can't you? Anyway, you";
 		mes "can handle those thugs, right?";
 		next;
+		set lhz_rekenber,17;
+		getexp (checkre(3))?45000:450000,0;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Right. Now get back to";
 		mes "the Airship and talk to";
 		mes "Lyozien again. Don't give";
 		mes "him any trouble and make";
 		mes "sure you protect him.";
-		set lhz_rekenber,17;
-		getexp 45000,0;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber > 11)
 	{
+		cutin "lhz_kaz08",2;
 		mes "[Kazien]";
 		mes "What are you doing";
 		mes "waiting around here";
 		mes "for? You've got a job to";
 		mes "do, so hurry up and do it~";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 11)
 	{
+		cutin "lhz_kaz05",2;
 		mes "[Kazien]";
 		mes "Hey, you're back. I got a";
 		mes "message from Rune-Midgarts,";
@@ -10578,6 +10625,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "Lyozien supposed";
 		mes "to be brothers?";
 		next;
+		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
 		mes "Whoa, he told you that?";
 		mes "I guess he feels that he";
@@ -10602,6 +10650,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "doesn't know exactly what";
 		mes "is in those packages.";
 		next;
+		cutin "lhz_kaz06",2;
 		mes "[Kazien]";
 		mes "Huh... Does that mean";
 		mes "you can't work with us if";
@@ -10628,7 +10677,9 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "for the Rune-Midgarts Kingdom.";
 		next;
 		set lhz_rekenber,12;
-		getexp 40000,0;
+		changequest 5005,5006;
+		getexp (checkre(3))?40000:400000,0;
+		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
 		mes "Alright, I'll see you";
 		mes "later. The important";
@@ -10636,10 +10687,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "best job that you can.";
 		mes "And don't give Lyozien";
 		mes "any trouble: that's my job!";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber > 7)
 	{
+		cutin "lhz_kaz08",2;
 		mes "[Kazien]";
 		mes "Lyozien is waiting for";
 		mes "you on the international";
@@ -10647,10 +10701,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "meet him there as soon";
 		mes "as you can. Alright then,";
 		mes "I'll see you later.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 7)
 	{
+		cutin "lhz_kaz05",2;
 		mes "[Kazien]";
 		mes "Hey, you're back~";
 		mes "Great, I guess that means";
@@ -10665,6 +10722,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "a man named ^FF0000Lyozien^000000 inside.";
 		mes "He's our courier that'll provide you with further instructions.";
 		next;
+		cutin "lhz_kaz06",2;
 		mes "[Kazien]";
 		mes "Oh. You can talk to Lyozien";
 		mes "about the job, but definitely";
@@ -10674,18 +10732,22 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "to me for another job, okay?";
 		next;
 		set lhz_rekenber,8;
+		changequest 12008,12010;
+		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Don't forget...";
 		mes "Talk to ^FF0000Lyozien^000000, our";
 		mes "courier, on the Airship";
 		mes "for the international flights.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 6)
 	{
-		set @rekenrand,rand(1,15);
-		if(@rekenrand == 7)
+		if(rand(1,15) == 7)
 		{
+			cutin "lhz_kaz04",2;
 			mes "[Kazien]";
 			mes "Oh, hey, it's you again.";
 			mes "Wait. No. You only remind";
@@ -10695,18 +10757,21 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 			mes "being this busy, I can't focus!";
 			next;
 			set lhz_rekenber,0;
+			erasequest 12009;
 			mes "[Kazien]";
 			mes "Arrgh, this is not good.";
 			mes "We are this busy but we don't have enough people,";
 			mes "yet it is not that extrememly bad";
 			mes "to a point that we need to hire more people.";
 			next;
+			cutin "lhz_kaz01",2;
 			mes "[Kazien]";
 			mes "Will you step back? You are hindering my vision.";
-			close;
+			close2;
 		}
 		else
 		{
+			cutin "lhz_kaz10",2;
 			mes "[Kazien]";
 			mes "Oh, hey, it's you again.";
 			mes "Listen, you didn't come here";
@@ -10722,11 +10787,14 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 			mes "Don't feel bad... Um, what";
 			mes "was your name again? Wait,";
 			mes "did you even give it to me...?";
-			close;
+			close2;
 		}
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 5)
 	{
+		cutin "lhz_kaz04",2;
 		mes "[Kazien]";
 		mes "So, were you able to";
 		mes "contact Garins? Or did";
@@ -10740,6 +10808,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "was the guard, but I couldn't";
 		mes "really tell him anything.";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Whaaaat~?";
 		mes "I'm sure he would";
@@ -10754,6 +10823,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "tell anyone the details";
 		mes "of my assignment?";
 		next;
+		cutin "lhz_kaz06",2;
 		mes "[Kazien]";
 		mes "Heh... Yeah.";
 		mes "Yeah, that's right.";
@@ -10767,6 +10837,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "I didn't finish the task";
 		mes "that you assigned to me.";
 		next;
+		cutin "lhz_kaz09",2;
 		mes "[Kazien]";
 		mes "Garins is just some";
 		mes "cool name I made up.";
@@ -10781,16 +10852,20 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "me! How am I supposed";
 		mes "to trust you now?";
 		next;
+		set lhz_rekenber,7;
+		cutin "lhz_kaz06",2;
 		mes "[Kazien]";
 		mes "Oh... You...";
 		mes "You got a point, there.";
 		mes "Huh, now isn't that ironic? I'm sorry, pal, let me apologize.";
 		mes "Take some time, consider working for me, and then come back, okay?";
-		set lhz_rekenber,7;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 4)
 	{
+		cutin "lhz_kaz04",2;
 		mes "[Kazien]";
 		mes "So, were you able to";
 		mes "contact Garins? Or did";
@@ -10802,6 +10877,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "think that Garins even works";
 		mes "at the Einbroch Laboratory.";
 		next;
+		cutin "lhz_kaz08",2;
 		mes "[Kazien]";
 		mes "Whaaaat~?";
 		mes "That can't be true.";
@@ -10814,6 +10890,8 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "he wouldn't even let me in.";
 		next;
 		set lhz_rekenber,6;
+		changequest 12008,12009;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Uh oh...";
 		mes "I thought so.";
@@ -10839,10 +10917,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "goal you have, but you can't";
 		mes "forget the details. Anyway,";
 		mes "sorry, but we can't use you...";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 3)
 	{
+		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Remember, visit ^FF0000Garins^000000";
 		mes "in the ^FF0000Einbroch Laboratory^000000";
@@ -10855,10 +10936,13 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "around over here, so";
 		mes "once you're done with";
 		mes "that, come back to me.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 2)
 	{
+		cutin "lhz_kaz04",2;
 		mes "[Kazien]";
 		mes "Okay, I got it! Your first";
 		mes "assignment for us is pretty";
@@ -10883,6 +10967,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "for more important stuff. And";
 		mes "I really wanna trust you.";
 		next;
+		cutin "lhz_kaz05",2;
 		mes "[Kazien]";
 		mes "Remember, visit ^FF0000Garins^000000";
 		mes "in the ^FF0000Einbroch Laboratory^000000";
@@ -10891,15 +10976,19 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "in our clients' confidentiality, so keep it secret, got it?";
 		next;
 		set lhz_rekenber,3;
+		changequest 12007,12008;
 		mes "[Kazien]";
 		mes "I'll just be waiting";
 		mes "around over here, so";
 		mes "once you're done with";
 		mes "that, come back to me.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 1)
 	{
+		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "We're so busy, we barely";
 		mes "have enough people to cover";
@@ -10921,6 +11010,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "a nominal fee or some";
 		mes "kind of reward. You know...";
 		next;
+		cutin "lhz_kaz10",2;
 		mes "[Kazien]";
 		mes "Hey, alright~";
 		mes "I could use an extra";
@@ -10938,7 +11028,9 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 			mes "not strong enough for this";
 			mes "kinda work. Hey, but if you put on";
 			mes "some muscle, ask me again, okay?";
-			close;
+			close2;
+			cutin "",255;
+			end;
 		}
 		mes "[Kazien]";
 		mes "Yeah, okay. You look like";
@@ -10959,9 +11051,12 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 				mes "then. Let me think. First,";
 				mes "I should give you something";
 				mes "easy to do to test you out...";
-				close;
+				close2;
+				cutin "",255;
+				end;
 
 			case 2:
+				cutin "lhz_kaz04",2;
 				mes "[Kazien]";
 				mes "Awww, man.";
 				mes "I can't hire you";
@@ -10969,9 +11064,12 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 				mes "your mouth. Sorry buddy,";
 				mes "but I can't afford to take";
 				mes "any risks. You understand...";
-				close;
+				close2;
+				cutin "",255;
+				end;
 		}
 	}
+	cutin "lhz_kaz01",2;
 	mes "[Kazien]";
 	mes "We're so busy, we barely";
 	mes "have enough people to cover";
@@ -10979,15 +11077,18 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 	mes "it's not so bad that we gotta";
 	mes "invest in some new hires.";
 	next;
+	cutin "lhz_kaz04",2;
 	mes "[Kazien]";
 	mes "Oh hey, sorry buddy,";
 	mes "but you mind stepping";
 	mes "back? It's just that you're";
 	mes "blocking my view is all.";
-	close;
+	close2;
+	cutin "",255;
+	end;
 }
 
-lighthalzen,141,162,3	script	Old Man#reken	85,{
+lighthalzen,141,162,3	script	Old Man#reken	4_M_03,{
 
 	mes "[Old Man]";
 	mes "Lately, Kazien seems";
@@ -11004,13 +11105,16 @@ lighthalzen,141,162,3	script	Old Man#reken	85,{
 	mes "particularly special skills are";
 	mes "required for some positions.";
 	next;
+	if(!lhz_rekenber) {
+		set lhz_rekenber,1;
+		setquest 12007;
+	}
 	mes "[Old Man]";
 	mes "Well, if you're interested,";
 	mes "you can find Kazien inside";
 	mes "the corporation building.";
 	mes "Young people like him should";
 	mes "never be too proud to ask for help. He still needs to learn...";
-	if(!lhz_rekenber) set lhz_rekenber,1;
 	close;
 }
 
@@ -11059,10 +11163,20 @@ einbroch,55,52,3	script	Laboratory Guard#reken	 852,{
 						mes "I still can't allow you to";
 						mes "enter the laboratory.";
 						set lhz_rekenber,4;
+						changequest 12008,12010;
 						close;
 
 					case 2:
-						break;
+						mes "[" + strcharinfo(0) + "]";
+						mes "I'll... come back later.";
+						mes "(^333333I better speak to Kazien";
+						mes "and let him know I'm having";
+						mes "trouble getting past this";
+						mes "guard. Otherwise, I might";
+						mes "never finish this job!^000000)";
+						set lhz_rekenber,5;
+						changequest 12008,12010;
+						close;
 				}
 				
 			case 2:
@@ -11074,6 +11188,7 @@ einbroch,55,52,3	script	Laboratory Guard#reken	 852,{
 				mes "guard. Otherwise, I might";
 				mes "never finish this job!^000000)";
 				set lhz_rekenber,5;
+				changequest 12008,12010;
 				close;
 		}
 	}
@@ -11086,10 +11201,11 @@ einbroch,55,52,3	script	Laboratory Guard#reken	 852,{
 	close;
 }
 
-airplane_01,96,48,3	script	Man#Lyozien	868,{
+airplane_01,96,48,3	script	Man#Lyozien	4_M_LGTGUARD,{
 
 	if(lhz_rekenber > 21)
 	{
+		cutin "lhz_ryo11",2;
 		mes "[Lyozien]";
 		mes "Hey, I hear from my";
 		mes "brother that you can't work";
@@ -11097,10 +11213,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "of some scheduling conflict.";
 		mes "I'm sorry to hear that: it was";
 		mes "really good working with you...";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 21)
 	{
+		cutin "lhz_ryo03",2;
 		mes "[Lyozien]";
 		mes "Oh good, you're back.";
 		mes "Mr. Ahman just left and";
@@ -11114,26 +11233,33 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "You seem kind of upset.";
 		mes "Do you need to take a";
 		mes "break or something?";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 20)
 	{
+		cutin "lhz_ryo09",2;
 		mes "[Lyozien]";
 		mes "Heya, keep up the";
 		mes "good work. Once you";
 		mes "talk to Mr. Ahman inside";
 		mes "Izlude Airport, we'll be";
 		mes "done with this delivery.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 19)
 	{
+		cutin "lhz_ryo06",2;
 		mes "[Lyozien]";
 		mes "Whoa, you were great!";
 		mes "There were more of them";
 		mes "this time, but you easily";
 		mes "dispatched them. Great job!";
 		next;
+		cutin "lhz_ryo01",2;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Thanks, but...";
 		mes "Now I'm really worried";
@@ -11141,6 +11267,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "those packages. Are you";
 		mes "sure you don't know, Lyozien?";
 		next;
+		cutin "lhz_ryo02",2;
 		mes "[Lyozien]";
 		mes "You don't know when to";
 		mes "stop, do you? Nah, I don't";
@@ -11150,7 +11277,8 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "out for myself. Oh, hey...";
 		next;
 		set lhz_rekenber,20;
-		getitem 504,1;
+		getitem 504,1; //White_Potion
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "Here's a little";
 		mes "something to refresh";
@@ -11158,10 +11286,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "Keep up the good work, okay?";
 		mes "Then, we'll be done once you";
 		mes "contact Mr. Ahman in Izlude.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 18)
 	{
+		cutin "lhz_ryo06",2;
 		mes "[Lyozien]";
 		mes "Okay, just like before, we";
 		mes "gotta get these packages to";
@@ -11170,6 +11301,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "the Airport and tell him that";
 		mes "his packages have arrived.";
 		next;
+		cutin "lhz_ryo08",2;
 		mes "[Lyozien]";
 		mes "W-wait...";
 		mes "Did you hear that?";
@@ -11177,6 +11309,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "Those thugs are back! Don't";
 		mes "let them damage the packages!";
 		close2;
+		cutin "",255;
 		set lhz_rekenber,19;
 		donpcevent "#bully2::OnEnter";
 		donpcevent "Man#Lyozien::OnStop";
@@ -11184,6 +11317,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 	}
 	else if(lhz_rekenber == 17)
 	{
+		cutin "lhz_ryo14",2;
 		mes "[Lyozien]";
 		mes "I heard that you upset";
 		mes "Kyozien a little bit with";
@@ -11192,12 +11326,14 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "you gotta remember that";
 		mes "we've got obligations.";
 		next;
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "I know that these packages";
 		mes "might be putting us in danger,";
 		mes "but I trust my brother. If he says those thugs are bad guys, then";
 		mes "they're definitely bad guys.";
 		next;
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "Yeah, ever since we were";
 		mes "kids, Kyozien has always";
@@ -11207,15 +11343,19 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "disappoint him, you know?";
 		next;
 		set lhz_rekenber,18;
+		cutin "lhz_ryo10",2;
 		mes "[Lyozien]";
 		mes "Anyway, that's";
 		mes "enough chit-chat";
 		mes "for now. Let's get";
 		mes "back to work, shall we?";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 16)
 	{
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "I'm lucky that you're";
 		mes "around to keep those";
@@ -11223,10 +11363,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "Hey, when you're ready for";
 		mes "another job, just talk to";
 		mes "my brother Kazien, okay?";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 15)
 	{
+		cutin "lhz_ryo05",2;
 		mes "[Lyozien]";
 		mes "So you spoke to";
 		mes "Mr. Ahman already?";
@@ -11242,10 +11385,16 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "that you're working for us.";
 		mes "Those thugs frighten me...";
 		set lhz_rekenber,16;
-		close;
+		cutin "lhz_ryo01",2;
+		mes "[Lyozien]";
+		mes "Now I feeel much more secure.";
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 14)
 	{
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "Now that those thugs are";
 		mes "gone, let's concentrate on";
@@ -11253,10 +11402,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "get off at Izlude and then tell";
 		mes "Mr. Ahman that his packages";
 		mes "have arrived. See you later~";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 13)
 	{
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "Oh, thank you!";
 		mes "You saved my life!";
@@ -11265,6 +11417,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "I just ran and hid when";
 		mes "those thugs appeared.";
 		next;
+		cutin "lhz_ryo04",2;
 		mes "[Lyozien]";
 		mes "That's one reason why" ;
 		mes "my brother has been hiring";
@@ -11272,6 +11425,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "packages from those hoodlums.";
 		mes "They're always after us...";
 		next;
+		cutin "lhz_ryo07",2;
 		mes "[Lyozien]";
 		mes "Every time I see them,";
 		mes "they're yelling things like";
@@ -11280,10 +11434,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "be destroyed. Boy, I sure";
 		mes "am glad that you're here!";
 		set lhz_rekenber,14;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 12)
 	{
+		cutin "lhz_ryo11",2;
 		mes "[Lyozien]";
 		mes "Hey, we already have another";
 		mes "package to deliver all the way";
@@ -11292,6 +11449,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "seem to be doing a lot of";
 		mes "business around there lately.";
 		next;
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "It's so far away from";
 		mes "home, but a job's a job.";
@@ -11300,6 +11458,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "until we qui--whoa. You";
 		mes "hear that? Wh-what was...?";
 		next;
+		cutin "lhz_ryo03",2;
 		mes "[Lyozien]";
 		mes "Awwww, nuts!";
 		mes "It's those thugs!";
@@ -11308,6 +11467,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "the packages and make";
 		mes "sure they don't get them!";
 		close2;
+		cutin "",255;
 		set lhz_rekenber,13;
 		donpcevent "Man#Lyozien::OnStop";
 		donpcevent "#bully1::OnEnter";
@@ -11315,6 +11475,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 	}
 	if(lhz_rekenber == 11)
 	{
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "Hey, would you go see";
 		mes "my brother Kazien to see";
@@ -11322,10 +11483,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "us to do? I'll just be over";
 		mes "here waiting when you need";
 		mes "to find me. See you later~";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 10)
 	{
+		cutin "lhz_ryo14",2;
 		mes "[Lyozien]";
 		mes "Good work, Mr. Ahman just";
 		mes "arrived and picked up his";
@@ -11339,6 +11503,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "what kinds of things";
 		mes "we're delivering?";
 		next;
+		cutin "lhz_ryo10",2;
 		mes "[Lyozien]";
 		mes "No clue. I've been";
 		mes "a little curious myself,";
@@ -11347,6 +11512,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "think it makes a difference";
 		mes "to what we gotta do, right?";
 		next;
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "Anyway, it oughta be";
 		mes "fine. I mean, our clients";
@@ -11355,17 +11521,22 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "sort of situation, right? You";
 		mes "know, embarassing orders...";
 		next;
+		set lhz_rekenber,11;
+		changequest 12011,12012;
+		cutin "lhz_ryo01",2;
 		mes "[Lyozien]";
 		mes "No? Eh, just meet up with";
 		mes "my brother to see if he's";
 		mes "got another job for us, okay?";
 		mes "If you wanna find me again,";
 		mes "I'll be waiting right here.";
-		set lhz_rekenber,11;
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 9)
 	{
+		cutin "lhz_ryo05",2;
 		mes "[Lyozien]";
 		mes "Alright, when this Airship";
 		mes "arrives in Izlude, get off and";
@@ -11373,10 +11544,13 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "a man named Mr. Ahman.";
 		mes "Let him know his order has";
 		mes "already arrived, okay?";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
 	else if(lhz_rekenber == 8)
 	{
+		cutin "lhz_ryo02",2;
 		mes "[Lyozien]";
 		mes "Um, would you mind";
 		mes "treading lightly around";
@@ -11389,6 +11563,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "Excuse me, but";
 		mes "are you Lyozien?";
 		next;
+		cutin "lhz_ryo07",2;
 		mes "[Lyozien]";
 		mes "Hey, are you the one that";
 		mes "my brother Kazien sent?";
@@ -11397,6 +11572,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "I'm having trouble handling";
 		mes "all of these packages here.";
 		next;
+		cutin "lhz_ryo14",2;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Wait, Kazien is";
 		mes "your brother? That's";
@@ -11411,6 +11587,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "corporation and helped";
 		mes "us improve our lots in life...";
 		next;
+		cutin "lhz_ryo13",2;
 		mes "[Lyozien]";
 		mes "That's why I appreciate the";
 		mes "fact that he lets me work for";
@@ -11419,6 +11596,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "gotta deliver these goods to";
 		mes "the Rune-Midgarts Kingdom.";
 		next;
+		cutin "lhz_ryo12",2;
 		mes "[Lyozien]";
 		mes "I have to ensure that these";
 		mes "packages aren't damaged or";
@@ -11427,6 +11605,8 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "at the Airport, and tell him that his orders have safely arrived.";
 		next;
 		set lhz_rekenber,9;
+		changequest 12010,12011;
+		cutin "lhz_ryo11",2;
 		mes "[Lyozien]";
 		mes "Once you tell Mr. Ahman";
 		mes "that message, he'll take";
@@ -11434,8 +11614,11 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "packages. But yeah, I need";
 		mes "to stay behind to guard these";
 		mes "products in the meantime.";
-		close;
+		close2;
+		cutin "",255;
+		end;
 	}
+	cutin "lhz_ryo12",2;
 	mes "[Lyozien]";
 	mes "Um, would you mind";
 	mes "treading lightly around";
@@ -11443,7 +11626,9 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 	mes "around the piles? Yeah,";
 	mes "these are all pretty fragile.";
 	mes "Thanks, I appreciate it.";
-	close;
+	close2;
+	cutin "",255;
+	end;
 
 OnEnter:
 	enablenpc "Man#Lyozien";
@@ -11625,6 +11810,7 @@ OnStop:
 		mes "notifying me about the delivery.^FFFFFF  ^000000 Now, you should go back and ";
 		mes "tell Lyozien. Take care now~";
 		set lhz_rekenber,10;
+		changequest 12012,12013;
 		close;
 	}
 	mes "[Man]";
@@ -11722,7 +11908,7 @@ OnTimer120000:
 	end;
 }
 
-airplane_01,99,47,3	script	#packidentity	139,2,2,{
+airplane_01,99,47,3	script	#packidentity	HIDDEN_WARP_NPC,2,2,{
 	end;
 	
 OnInit:
@@ -11762,11 +11948,12 @@ OnTimer120000:
 	end;
 }
 
-lhz_in01,187,247,3	script	#flashback1	139,2,2,{
+lhz_in01,187,247,3	script	#flashback1	HIDDEN_WARP_NPC,2,2,{
 
 OnTouch:
 	if(lhz_rekenber == 22)
 	{
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "-Don't you have anything to protect, huh?- ";
 		mes "-Are you sure that you're always doing the right thing?-";
@@ -11775,6 +11962,7 @@ OnTouch:
 		mes "Answer me! Answer me! Answer meee!";
 		next;
 		set lhz_rekenber,23;
+		cutin "",255;
 		mes "[" + strcharinfo(0) + "]";
 		mes ".............Damn it.";
 		close;
@@ -11782,11 +11970,12 @@ OnTouch:
 	end;
 }
 
-lhz_in01,75,248,3	script	#flashback2	139,2,2,{
+lhz_in01,75,248,3	script	#flashback2	HIDDEN_WARP_NPC,2,2,{
 
 OnTouch:
 	if(lhz_rekenber == 22)
 	{
+		cutin "lhz_kaz11",2;
 		mes "[Kazien]";
 		mes "Look man, this is what";
 		mes "I decided. I don't care";
@@ -11809,6 +11998,7 @@ OnTouch:
 		mes "alive to enjoy it, huh?";
 		next;
 		set lhz_rekenber,23;
+		cutin "",255;
 		mes "[" + strcharinfo(0) + "]";
 		mes "......";
 		mes ".........";
@@ -11817,3 +12007,102 @@ OnTouch:
 	}
 	end;
 }
+
+airplane_01,10,10,3	script	#LyozienSwitch	HIDDEN_NPC,{
+	callfunc "F_GM_NPC";
+	mes "[Lyozien Switch]";
+	mes "Input password.";
+	mes "Enter 0 to cancel.";
+	next;
+	set .@i, callfunc("F_GM_NPC",1028,0,0,4000);
+	if (.@i == -2) {
+		mes "[Lyozien Switch]";
+		mes "Incorrect.";
+		close;
+	} else if (.@i == -1) {
+		mes "[Lyozien Switch]";
+		mes "Canceled.";
+		close;
+	} else if (.@i == 0) {
+		close;
+	} else {
+		mes "[Lyozien Switch]";
+		mes "Do you want to";
+		mes "turn the Lyozien";
+		mes "NPC ON or OFF?";
+		next;
+		switch(select("On:OFF")) {
+		case 1:
+			set .@str$,"activated";
+			donpcevent "Man#Lyozien::OnEnable";
+			break;
+		case 2:
+			set .@str$,"deactivated";
+			donpcevent "Man#Lyozien::OnDisable";
+			break;
+		}
+		mes "[Lyozien Switch]";
+		mes "Lyozien NPC is";
+		mes "now "+.@str$+".";
+		mes " ";
+		mes "/mm airplane_01.gat 96 48";
+		close;
+	}
+}
+
+//============================================================
+// Old changelog
+//============================================================
+//= Grammar/script check please. This was a quick job.
+//= Things to add: Look at the thread "Lighthalzen Guard" in SVN script
+//= 0.3 Initial Release
+//= 0.5 Added mobsters spawn and Einbroch pollution. Alert lasts either 10 minutes or all mob killed.
+//= 0.6-0.9 fix small bug. Added Bio-lab entrance Quest. Added Getting security-card Quest.
+//= 1.0 Patched "mobsters spawn & Alert" like Real-RO.
+//= 1.0a fixed rand(1,10) + comparision. There just can't be 'X < 1' [Lupus]
+//= 1.1 Changed the mobster spawn to g_mobster to prevent exploits [MasterOfMuppets]
+//= 1.2 Added the cube room quest by DeNy, translated by vicious_pucca. [MasterOfMuppets]
+//=     Thanks to Linuxwolf for a grammar check as well =).
+//= 1.2a Moved Biolab entrance to lhz_dun warps. [Vicious]
+//= 1.3 Fixed password bug, fixed endless item exploit, some typos [Lupus]
+//= 1.4 Fixed password abuse. When people don't read the password under the picture
+//=     and enter Zero shit 8) (TODO: I saw some "Sticks" abuses, too.. where you could skip a part of quest...)
+//= 1.5 Fixed Mobster's OnDead event(it has to start with "On"!) [Playtester]
+//= 1.5a Fixed "free stick" bug, thx 2 Neouni [Lupus]
+//= 1.6 Added Gywall's Pickpocket Quest
+//= 1.7 Implemented the Friendship quest [MasterOfMuppets]
+//= 1.8 Changed the name of the mobsters to Gangster, as it should be. [MasterOfMuppets]
+//= 1.9 Added extra input check on Biolab so that the first letter of the word could be capitalized or undercase. [Evera]
+//= 2.0 Removed Duplicates [Silent]
+//= 2.1 Added first part of Bio Ethics Quest [Evera]
+//= 2.2 Added bit to say Bio Ethics is unfinished, and if a player attempts, it warps them
+//=     out after finished part... Don't want players getting stuck ;_; [Evera]
+//= 2.3 Finished Bio Ethics Quest. Need bug testers before moving to trunk, my
+//=     mind was somewhere else when writing @_@ [Evera]
+//= 2.4 Fixed the bug where a str&int debug was shown in the console for
+//=     test tube in bio labs quest. [Evera]
+//= 2.5 Fixed Kellasus giving you extra skills in Bio Ethics quest [Evera]
+//= 2.6 Fixed exploit letting any class get homunculus from Bio Ethics Quest [Evera]
+//= 2.6a Moved Bio Ethics Quest to Alchemist SKILL QUESTS [Lupus]
+//= 2.7 fixed bugs that let people bypass some quest parts V_V [Lupus]
+//=     reused cubekey var for 4 Cube Room key vars
+//= 2.8 More optimization. Also fixed bug with "2x short sticks -> long" [Lupus]
+//=     Now uses MISC_QUEST&512 instead of 'hzdun'. WIP
+//= 2.9 Fixed Friendship Quest levelup exploit (u could get EXP twice) [Lupus]
+//= 3.0 Added Cursed Spirit Quest. [SinSloth]
+//=     Moved a book non-related to Lighthalzen quests.
+//= 3.1 Added Schwartzvalt Trilogy Quest. [SinSloth]
+//= 3.2 Updated some NPCs regarding Hugel Rebellion Quest. [SinSloth]
+//= 3.2 Removed the NPC "#kiz03-4" as I couldn't find any [L0ne_W0lf]
+//=     reference to it in the Aegis script.
+//= 3.3 Fixed a wrong negative value checking in Schwartzvalt Trilogy quest. [SinSloth]
+//= 3.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 3.5 Touch-ups to the Friendship quest. Added EXP reward. [L0ne_W0lf]
+//=     Added cutins for "Maku" npc, and changed "set HP" to percentheal.
+//= 3.5a Adjusted EXP given by "Benkasttein" to be the same as that given by Maku. [L0ne_W0lf]
+//= 3.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 3.7 Counter-fixed negative value checking to now look for both positive and negative values
+//=     since its symbol depends on the time. [SinSloth]
+//= 3.8 Removed bio ethic quest definition from header. [L0ne_W0lf]
+//= 3.9 Added Rekenber Job quest. Don't know why it hasn't been there before though. [SinSloth]
+//============================================================
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 5c251d92d..d928aefd6 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -1,20 +1,20 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Louyang
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Evera and The rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.2
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 2.4
+//===== Description: =========================================
+//= [Official Conversion]
 //= Soup Quest
 //= - Variable in use: che_tre (max 5)
 //= Doctor Quest
 //= - Variable in use: che_par (max 18)
-//= Poison King Quest 
+//= Poison King Quest
 //= - Variable in use: ch_poison (max 20)
 //= Revolution Quest
 //= - Variable in use: QL_REVO (max 9)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Initial Release [Evera]
 //= 1.1 Fixed double levelup bug [Lupus]
 //= 1.2 Added Revolution Quest. [SinSloth]
@@ -22,20 +22,22 @@
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Rescripted Soup, Doctor, and Poison King quests [L0ne_W0lf]
-//=	to Aegis 10.3 standards. Attempted to save current
-//=	quest progress from the old scripts.
+//=     to Aegis 10.3 standards. Attempted to save current
+//=     quest progress from the old scripts.
 //= 1.7 Added missing checkweights. And corrected [L0ne_W0lf]
-//=	a typo in Poison King quest.
+//=     a typo in Poison King quest.
 //= 1.8 Bug fixes. (bugreport:1025 bugreport:1062) [L0ne_W0lf]
 //= 1.9 Bug fixes/Typos. [Paradox924X]
 //= 2.0 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.1 Fixed guard tower warper ALWAYS warping. (bugreport:2377) [L0ne_W0lf]
 //= 2.2 Removed unused "name" variable. [L0ne_W0lf]
-//============================================================ 
+//= 2.3 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.4 Added questlog support. [Euphy]
+//============================================================
 
-// Soup Quest
+// 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!";
@@ -110,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~";
@@ -200,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]";
@@ -297,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.";
@@ -433,14 +435,14 @@ 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;
 	if (QL_GOTFAKESOUP) set ch_tre,3;
 	if (QL_SOUPQUEST)  set ch_tre,4;
 	if (QL_SOUP2) set ch_tre,5;
-	set QL_ACCEPTSOUP,0; set QL_GOTDRAGONSOUP,0; set QL_GOTFAKESOUP,0; set QL_SOUPQUEST,0; set QL_SOUP2,0; 
+	set QL_ACCEPTSOUP,0; set QL_GOTDRAGONSOUP,0; set QL_GOTFAKESOUP,0; set QL_SOUPQUEST,0; set QL_SOUP2,0;
 
 	if (ch_tre == 0) {
 		mes "[Jiu Lian Bu]";
@@ -604,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]";
@@ -708,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";
@@ -780,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";
@@ -852,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";
@@ -872,7 +874,7 @@ lou_in02,58,183,5	script	Chef Assistant#lou1	823,5,5,{
 	mes "[Jin Wei Ling]";
 	mes "Waaa-!!!!";
 	next;
-	specialeffect EF_ENDURE; 
+	specialeffect EF_ENDURE;
 	mes "[Jin Wei Ling]";
 	mes "Waaa Taaah-!!!!!";
 	next;
@@ -938,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!";
@@ -975,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!";
@@ -1003,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;
@@ -1020,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...";
@@ -1054,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...";
@@ -1084,16 +1086,9 @@ louyang,174,150,5	script	Jiu Chi Ling#lou	815,{
 	close;
 }
 
-// Doctor Quest
+// Doctor Quest :: dr_china
 //============================================================
-lou_in02,265,69,5	script	Doctor#lyang	814,{
-	//Remove outdated variables and attempt to preserve prior quest progress.
-	if(QL_DOC1STTIME == 1 || QL_DOCQUEST == 1) set ch_par,2;
-	if (QL_DOCQUEST == 2) set ch_par,10;
-	if (QL_DOCQUEST == 3) set ch_par,17;
-	if (QL_GOTHERB) set ch_par,16;
-	set QL_DOC1STTIME,0; set QL_DOCQUEST,0; set QL_GOTHERB,0; set QL_BEENTOSTORAGE,0; set QL_GOTCOMPROP,0; set QL_TOOLMASTER,0;
-
+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;
@@ -1199,6 +1194,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			mes "so much trouble, but if you'll excuse me, I have other patients waiting. Please hurry back with";
 			mes "the medicine!";
 			set ch_par,2;
+			setquest 11044;
 			close;
 		}
 		mes "[Hua Tuo]";
@@ -1288,8 +1284,9 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			mes "great, but it's an old family secret. I hope it will be useful to you if you find yourself in great danger.";
 			delitem 7252,1; //Herb_Medicine
 			set ch_par,10;
+			completequest 11056;
 			getitem 679,2; //Gold_Pill
-			getexp 1000,0;
+			getexp (checkre(3))?1000:10000,0;
 			next;
 			mes "[Hua Tuo]";
 			mes "Well then,";
@@ -1327,6 +1324,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 		mes "^3355FF10 Sprout^000000 and";
 		mes "^3355FF5 Honey Pot^000000.";
 		set ch_par,17;
+		changequest 11056,11057;
 		close;
 	}
 	else if (ch_par == 10) {
@@ -1405,8 +1403,9 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			mes "is an old family secret. I hope that it will be of use to you in dangerous situations.";
 			delitem 7252,1; //Herb_Medicine
 			set ch_par,10;
+			completequest 11056;
 			getitem 679,2; //Gold_Pill
-			getexp 1000,0;
+			getexp (checkre(3))?1000:10000,0;
 			next;
 			mes "[Hua Tuo]";
 			mes "Well then, I will see you around. Once again, I'd like to thank you for your help.";
@@ -1459,8 +1458,9 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			delitem 7121,5; //Honey_Jar
 			delitem 7252,1; //Herb_Medicine
 			set ch_par,18;
+			completequest 11057;
 			getitem 679,5; //Gold_Pill
-			getexp 3000,0;
+			getexp (checkre(3))?10000:30000,0;
 			next;
 			mes "[Hua Tuo]";
 			mes "However, please remember not to take more than the recommended dosage for the pills I have given you. Even medicine, in the wrong doses, can become poison to the body.";
@@ -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";
@@ -1556,6 +1556,7 @@ lou_in02,248,166,2	script	Tool Shop Master#lou	824,{
 			mes "You can find the storage on";
 			mes "the opposite side of this building. There, you'll see a guy named Jiang Xiayou. Go ahead and ask him for the stuff you need.";
 			set ch_par,3;
+			changequest 11044,11045;
 			close;
 		}
 		mes "[Wang Chuiyi]";
@@ -1588,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";
@@ -1664,18 +1665,22 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 				if (.@paper_j == 10) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Residence Transfer Application^000000.' Just like that.";
 					set ch_par,5;
+					changequest 11045,11046;
 				}
 				else if (.@paper_j == 11) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Summer SAT Class Application^000000.' Got it?";
 					set ch_par,6;
+					changequest 11045,11047;
 				}
 				else if (.@paper_j == 12) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Sandy Dust Phenomenon Report^000000.' Easy, right?";
 					set ch_par,7;
+					changequest 11045,11048;
 				}
 				else if (.@paper_j == 13) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Communication Proposal^000000.' Just like that?";
 					set ch_par,8;
+					changequest 11045,11049;
 				}
 				next;
 				mes "[Jiang Xiayou]";
@@ -1691,6 +1696,7 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 			mes "The medicines you're looking for might be around here, so look around. If it weren't for the doctor, I wouldn't even let you hang around, you know that?";
 			emotion e_pif;
 			set ch_par,4;
+			changequest 11045,11050;
 			close;
 		}
 	}
@@ -1806,6 +1812,7 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 		mes "Ah! Here you go. Even if it was kind of annoying to do, I guess";
 		mes "we gotta help each other, right? Alright then, I'll see ya around.";
 		set ch_par,16;
+		changequest 11055,11056;
 		getitem 7252,1; //Herb_Medicine
 		close;
 	}
@@ -1820,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";
@@ -1878,18 +1885,22 @@ lou_in02,210,47,0	script	City Hall Officer#lou	825,{
 					mes "[Jin Chiyuan]";
 					mes "^666666*Whispers*^000000";
 					mes "^333333When you go up stairs, another officer will give you the document you want.^000000 ^666666*Ahem*^000000 Louyang thanks you!";
-					set zeny,zeny-.@input;
+					Zeny -= .@input;
 					if (ch_par == 5) {
 						set ch_par,11;
+						changequest 11046,11051;
 					}
 					else if (ch_par == 6) {
 						set ch_par,12;
+						changequest 11047,11052;
 					}
 					else if (ch_par == 7) {
 						set ch_par,13;
+						changequest 11048,11053;
 					}
 					else if (ch_par == 8) {
 						set ch_par,14;
+						changequest 11049,11054;
 					}
 					close;
 				}
@@ -1971,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 ".....";
@@ -2115,6 +2126,11 @@ lou_in02,156,38,0	script	Studying Officer#lou	822,{
 			mes "Here it is. A few days ago, someone asked me for the same document,";
 			mes "so I was able to find it again pretty easily. I hope it's useful to you.";
 			set ch_par,15;
+			for(set .@i,11051; .@i<=11054; set .@i,.@i+1) {
+				if (checkquest(.@i) > -1 && checkquest(.@i < 2))
+					completequest .@i;
+			}
+			setquest 11055;
 			close;
 		}
 		mes "[Huang Zhishu]";
@@ -2137,9 +2153,8 @@ lou_in02,156,38,0	script	Studying Officer#lou	822,{
 	close;
 }
 
-lou_in02,204,169,0	script	Supply Stack#1lou	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+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";
 		close;
@@ -2155,6 +2170,7 @@ lou_in02,204,169,0	script	Supply Stack#1lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2187,9 +2203,8 @@ lou_in02,204,169,0	script	Supply Stack#1lou	111,{
 	close;
 }
 
-lou_in02,207,168,0	script	Supply Stack#5lou	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+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";
 		close;
@@ -2205,6 +2220,7 @@ lou_in02,207,168,0	script	Supply Stack#5lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2239,9 +2255,8 @@ lou_in02,207,168,0	script	Supply Stack#5lou	111,{
 	close;
 }
 
-lou_in02,206,163,0	script	Supply Stack#4lou	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+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";
 		close;
@@ -2257,6 +2272,7 @@ lou_in02,206,163,0	script	Supply Stack#4lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2291,9 +2307,8 @@ lou_in02,206,163,0	script	Supply Stack#4lou	111,{
 	close;
 }
 
-lou_in02,198,170,0	script	Supply Stack#3lou	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+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";
 		close;
@@ -2309,6 +2324,7 @@ lou_in02,198,170,0	script	Supply Stack#3lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2343,9 +2359,8 @@ lou_in02,198,170,0	script	Supply Stack#3lou	111,{
 	close;
 }
 
-lou_in02,192,170,0	script	Supply Stack#2	111,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+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";
 		close;
@@ -2361,6 +2376,7 @@ lou_in02,192,170,0	script	Supply Stack#2	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2396,9 +2412,9 @@ louyang,125,121,0	warp	Storage Warp#2	1,1,lou_in02,198,161;
 lou_in02,198,159,0	warp	Storage Warp#3	1,1,louyang,124,118;
 lou_in02,203,159,0	warp	Storage Warp#4	1,1,louyang,129,118
 
-// Poison King Quest
+// 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;
@@ -2899,6 +2915,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 					mes "Go find my last disciple,";
 					mes "^0000FFSong Zhi Du^000000, as he may tell you something useful. He's working at the doctor's office. If it weren't for him, I'd be starving now.";
 					set ch_poison,5;
+					setquest 11070;
 					close;
 				}
 				else {
@@ -3182,6 +3199,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 					mes "Will you excuse";
 					mes "me for a second...?";
 					set ch_poison,15;
+					changequest 11077,11078;
 					close;
 				}
 				mes "["+strcharinfo(0)+"]";
@@ -3267,6 +3285,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "as that of my disciple,";
 		mes "Louyang's leader must live...";
 		set ch_poison,16;
+		changequest 11078,11079;
 		close;
 	}
 	else if (ch_poison == 17) {
@@ -3297,6 +3316,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "^0000FFPoison King,";
 		mes "Nagash Arses' Jounal^000000.";
 		set ch_poison,18;
+		changequest 11080,11081;
 		close;
 	}
 	else if (ch_poison == 18) {
@@ -3338,32 +3358,27 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "^3355FFYou grow dizzy, but you also feel like you're becoming more powerful and gaining experience.^000000";
 		next;
 		set ch_poison,20;
-		if (BaseLevel < 56) {
-			getexp 900,0;
-		}
-		else if (BaseLevel > 55 && BaseLevel < 61) {
-			getexp 1050,0;
-		}
-		else if (BaseLevel > 60 && BaseLevel < 66) {
-			getexp 1868,0;
-		}
-		else if (BaseLevel > 65 && BaseLevel < 71) {
-			getexp 2741,0;
-		}
-		else if (BaseLevel > 70 && BaseLevel < 76) {
-			getexp 7076,0;
-		}
-		else if (BaseLevel > 75 && BaseLevel < 81) {
-			getexp 13025,0;
-		}
-		else if (BaseLevel > 80 && BaseLevel < 86) {
-			getexp 15034,0;
-		}
-		else if (BaseLevel > 85 && BaseLevel < 91) {
-			getexp 18205,0;
-		}
-		else if (BaseLevel > 90) {
-			getexp 40679,0;
+		changequest 11082,11083;
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 1050,0;
+			else if (BaseLevel > 55 && BaseLevel < 61) getexp 1230,0;
+			else if (BaseLevel > 60 && BaseLevel < 66) getexp 1570,0;
+			else if (BaseLevel > 65 && BaseLevel < 71) getexp 2300,0;
+			else if (BaseLevel > 70 && BaseLevel < 76) getexp 3400,0;
+			else if (BaseLevel > 75 && BaseLevel < 81) getexp 4500,0;
+			else if (BaseLevel > 80 && BaseLevel < 86) getexp 9000,0;
+			else if (BaseLevel > 85 && BaseLevel < 91) getexp 18000,0;
+			else getexp 20000,0;
+		} else {
+			if (BaseLevel < 56) getexp 9000,0;
+			else if (BaseLevel > 55 && BaseLevel < 61) getexp 10500,0;
+			else if (BaseLevel > 60 && BaseLevel < 66) getexp 18684,0;
+			else if (BaseLevel > 65 && BaseLevel < 71) getexp 27411,0;
+			else if (BaseLevel > 70 && BaseLevel < 76) getexp 70757,0;
+			else if (BaseLevel > 75 && BaseLevel < 81) getexp 130246,0;
+			else if (BaseLevel > 80 && BaseLevel < 86) getexp 150340,0;
+			else if (BaseLevel > 85 && BaseLevel < 91) getexp 182052,0;
+			else getexp 406786,0;
 		}
 		mes "^3355FFThen...";
 		mes "Everything blacks out...^000000";
@@ -3391,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";
@@ -3579,6 +3594,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "you were going to do.";
 			mes "I'm just disappointed...";
 			set ch_poison,6;
+			changequest 11070,11071;
 			close;
 		}
 		mes "[Song Zhi Du]";
@@ -3595,6 +3611,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		mes "[Song Zhi Du]";
 		mes "Since my body is so frail, I can't bear the tension and rage of seeing my lifelong enemy face to face.";
 		set ch_poison,8;
+		changequest 11070,11073;
 		close;
 	}
 	else if (ch_par > 9 && ch_poison == 6) {
@@ -3623,6 +3640,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "10 Empty Potion,";
 			mes "30 Green Potion^000000.";
 			set ch_poison,7;
+			changequest 11071,11072;
 			next;
 			mes "[Song Zhi Du]";
 			mes "An apology is fine, but you must also show me that you are sorry and help me carry out my plan. Do you have any problem with this?";
@@ -3635,6 +3653,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		specialeffect EF_ENDURE;
 		close2;
 		set ch_poison,6;
+		changequest 11070,11071;
 		end;
 	}
 	else if (ch_par > 9 && ch_poison == 7) {
@@ -3650,6 +3669,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 				delitem 1093,10; //Empty_Potion
 				delitem 506,30; //Green_Potion
 				set ch_poison,8;
+				changequest 11072,11073;
 				mes "[Song Zhi Du]";
 				mes "Ah...";
 				mes "With these, I accept your apology. Thank you for all the trouble you went through to get this stuff.";
@@ -3736,6 +3756,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "[Song Zhi Du]";
 			mes "No!! I failed again! ^666666*Sigh...*^000000 And I spent a long time preparing all of those materials...";
 			set ch_poison,10;
+			changequest 11074,11075;
 			close;
 		}
 		emotion e_gasp;
@@ -3802,7 +3823,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 				mes "Did I make it?";
 				next;
 				specialeffect EF_PATTACK;
-				specialeffect EF_POISONHIT; 
+				specialeffect EF_POISONHIT;
 				emotion e_omg;
 				mes "[Song Zhi Du]";
 				mes "Hahaha~!";
@@ -3921,6 +3942,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		mes "Master, I did it!";
 		mes "Your disciple Song Zhi Du made the world's deadliest poison for you!";
 		set ch_poison,12;
+		changequest 11075,11076;
 		close;
 	}
 	else if (ch_par > 9 && ch_poison == 12) {
@@ -3989,32 +4011,26 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		next;
 		mes "^3355FFThe nasty taste lingers in your mouth, but then you feel a great warmth flowing throughout your body. Eventually, you pass out.^000000";
 		next;
-		if (BaseLevel < 56) {
-			getexp 891,0;
-		}
-		else if (BaseLevel > 55 && BaseLevel < 61) {
-			getexp 1021,0;
-		}
-		else if (BaseLevel > 60 && BaseLevel < 66) {
-			getexp 1768,0;
-		}
-		else if (BaseLevel > 65 && BaseLevel < 71) {
-			getexp 2541,0;
-		}
-		else if (BaseLevel > 70 && BaseLevel < 76) {
-			getexp 6876,0;
-		}
-		else if (BaseLevel > 75 && BaseLevel < 81) {
-			getexp 12825,0;
-		}
-		else if (BaseLevel > 80 && BaseLevel < 86) {
-			getexp 14234,0;
-		}
-		else if (BaseLevel > 85 && BaseLevel < 91) {
-			getexp 15205,0;
-		}
-		else if (BaseLevel > 90) {
-			getexp 36679,0;
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 500,0;
+			else if (BaseLevel > 55 && BaseLevel < 61) getexp 700,0;
+			else if (BaseLevel > 60 && BaseLevel < 66) getexp 850,0;
+			else if (BaseLevel > 65 && BaseLevel < 71) getexp 1270,0;
+			else if (BaseLevel > 70 && BaseLevel < 76) getexp 1600,0;
+			else if (BaseLevel > 75 && BaseLevel < 81) getexp 2100,0;
+			else if (BaseLevel > 80 && BaseLevel < 86) getexp 4000,0;
+			else if (BaseLevel > 85 && BaseLevel < 91) getexp 7000,0;
+			else getexp 11000,0;
+		} else {
+			if (BaseLevel < 56) getexp 8909,0;
+			else if (BaseLevel > 55 && BaseLevel < 61) getexp 10213,0;
+			else if (BaseLevel > 60 && BaseLevel < 66) getexp 17684,0;
+			else if (BaseLevel > 65 && BaseLevel < 71) getexp 25411,0;
+			else if (BaseLevel > 70 && BaseLevel < 76) getexp 68757,0;
+			else if (BaseLevel > 75 && BaseLevel < 81) getexp 128246,0;
+			else if (BaseLevel > 80 && BaseLevel < 86) getexp 142340,0;
+			else if (BaseLevel > 85 && BaseLevel < 91) getexp 152052,0;
+			else getexp 366786,0;
 		}
 		warp "louyang",270,136;
 		end;
@@ -4059,6 +4075,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		mes "take these, since I don't";
 		mes "need them any longer.";
 		set ch_poison,21;
+		completequest 11083;
 		getitem 678,5; //Poison_Bottle
 		next;
 		mes "[Song Zhi Du]";
@@ -4079,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";
@@ -4107,7 +4124,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 			mes "[Lady]";
 			mes "Alright, there you go!";
 			if (Zeny > 99) {
-				set zeny,zeny-100;
+				Zeny -= 100;
 			}
 			close2;
 			specialeffect EF_BLASTMINEBOMB,AREA," #fire";
@@ -4129,7 +4146,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 			mes "Alright,";
 			mes "there you go!";
 			if (Zeny > 99) {
-				set zeny,zeny-100;
+				Zeny -= 100;
 			}
 			close2;
 			donpcevent " #fire::OnClaymore";
@@ -4159,7 +4176,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 				mes "delivery fee of 1,000 zeny.";
 				next;
 				if (Zeny > 999) {
-					set zeny,zeny-1000;
+					Zeny -= 1000;
 					getitem 7126,1; //Large_Jellopy
 					mes "[Lady]";
 					mes "Thank you~";
@@ -4168,6 +4185,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 					mes "Song Zhi Du.";
 					mes "Take care!";
 					set ch_poison,9;
+					changequest 11073,11074;
 					close;
 				}
 				mes "[Lady]";
@@ -4216,7 +4234,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 			mes "Alright~";
 			mes "There you go!";
 			if (Zeny > 99) {
-				set zeny,zeny-100;
+				Zeny -= 100;
 			}
 			close2;
 			donpcevent " #fire::OnClaymore";
@@ -4229,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;
 }
 
@@ -4307,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?";
@@ -4323,13 +4341,14 @@ 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;
 		mes "^3355FFYou put the deadly poison into the bottle.^000000";
 		delitem 678,1; //Poison_Bottle
 		set ch_poison,13;
+		changequest 11076,11077;
 		close;
 	}
 	else if (ch_poison == 13) {
@@ -4342,6 +4361,7 @@ lou_in01,107,163,0	script	 #lou_drink1	111,{
 			delitem 938,1; //Sticky_Mucus
 			delitem 713,1; //Empty_Bottle
 			set ch_poison,17;
+			changequest 11079,11080;
 			close;
 		}
 		mes "^3355FFIt seems that you need switch Bai Long's drinking bottle with something else. Just taking the drink bottle would arouse suspicion.^000000";
@@ -4353,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;
@@ -4369,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";
@@ -4444,6 +4464,7 @@ lou_in01,99,158,4	script	Lord#bailong	821,{
 			mes "[Lord Bai Long]";
 			mes "Please, take this as a token of gratitute. And please deliver this letter to Nagash and Song Zhi Du for me.";
 			set ch_poison,19;
+			changequest 11081,11802;
 			getitem 603,1; //Old_Blue_Box
 			next;
 			mes "^3355FFYou obtained ^0000FFBai Long's letter^000000.";
@@ -4462,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...";
@@ -4484,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...?";
@@ -4517,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...?";
@@ -4543,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?!";
@@ -4565,12 +4586,10 @@ lou_in01,99,144,4	script	Soldier#bailong4	825,{
 	close;
 }
 
-// Revolution Quest
-//===================================================================
-lou_in02,77,37,7	script	Hermit	824,{
-
-	if(!QL_REVOL)
-	{
+// Revolution Quest :: lou_zero
+//============================================================
+lou_in02,77,37,7	script	Hermit	4_M_CHNOLD,{
+	if (!QL_REVOL) {
 		mes "[Sun Mao]";
 		mes "Where there's a will,";
 		mes "there's a way. When we";
@@ -4588,75 +4607,66 @@ lou_in02,77,37,7	script	Hermit	824,{
 		mes "is Sun Mao.";
 		mes "This invitation may be sudden, but I am a man of action. I see in your face that you too despise injustice.";
 		next;
-		switch( select( "What am I supposed to do?","I will join you!","Well, I'm just another tourist..." ) )
-		{
+		switch(select("What am I supposed to do?:I will join you!:Well, I'm just another tourist...")) {
+		case 1:
+			mes "[Sun Mao]";
+			mes "For now, we must recruit as many members as we can. When we're ready, we'll start a movement that will change Louyang, and even the world!";
+			next;
+			mes "[Sun Mao]";
+			mes "However, we currently do not have the manpower to carry out the plans we have laid out. We've been lucky the lord hasn't found us out yet.";
+			next;
+			mes "[Sun Mao]";
+			mes "I wish everyone would understand our intentions, but the people of this city are disunited. This is not the first time I have approached a foreigner for help...";
+			next;
+			mes "[Sun Mao]";
+			mes "I suppose you understand the urgency of our cause, and our need to gather others who see the merit of our goals!";
+			close;
+		case 2:
+			mes "[Sun Mao]";
+			mes "Oh, God must be on my side today and has sent you to me. Thank you for making the big decision...";
+			next;
+			mes "[Sun Mao]";
+			mes "I shall then engrave your name";
+			mes "on this bloody pledge board. But before I do so, I shall ask once more. Do you truly wish to join us, through pain and bloodshed?";
+			next;
+			switch(select("No, wait!:I am 100% sure.")) {
 			case 1:
 				mes "[Sun Mao]";
-				mes "For now, we must recruit as many members as we can. When we're ready, we'll start a movement that will change Louyang, and even the world!";
-				next;
-				mes "[Sun Mao]";
-				mes "However, we currently do not have the manpower to carry out the plans we have laid out. We've been lucky the lord hasn't found us out yet.";
-				next;
-				mes "[Sun Mao]";
-				mes "I wish everyone would understand our intentions, but the people of this city are disunited. This is not the first time I have approached a foreigner for help...";
-				next;
-				mes "[Sun Mao]";
-				mes "I suppose you understand the urgency of our cause, and our need to gather others who see the merit of our goals!";
+				mes "I understand if you need time to decide. If you do decide to join us, please return. Time is on our side, after all.";
 				close;
-
 			case 2:
+				set QL_REVOL,1;
 				mes "[Sun Mao]";
-				mes "Oh, God must be on my side today and has sent you to me. Thank you for making the big decision...";
-				next;
-				mes "[Sun Mao]";
-				mes "I shall then engrave your name";
-				mes "on this bloody pledge board. But before I do so, I shall ask once more. Do you truly wish to join us, through pain and bloodshed?";
+				mes strcharinfo(0)+ "...!";
+				mes "Your name is now engraved on this bloody pledge board. We will fight together to the death for Louyang's future!";
 				next;
-				switch( select( "No, wait!","I am 100% sure." ) )
-				{
-					case 1:
-						mes "[Sun Mao]";
-						mes "I understand if you need time to decide. If you do decide to join us, please return. Time is on our side, after all.";
-						close;
-
-					case 2:
-						set QL_REVOL,1;
-						mes "[Sun Mao]";
-						mes strcharinfo(0)+ "...!";
-						mes "Your name is now engraved on this bloody pledge board. We will fight together to the death for Louyang's future!";
-						next;
-						getpartymember(getcharid(1));
-						set @partymember,$@partymembercount;
-						if (getpartyleader(getcharid(1),1) == getcharid(0) || !@partymember)
-						{
-							mes "[Sun Mao]";
-							mes "Now, the most important thing for our cause is to gather more recruits and increase our numbers. Please find others who will join us in our fight.";
-							next;
-							mes "[Sun Mao]";
-							mes "However, as to not arouse suspicion, bring only one new recruit at a time. Also, we suggest not to bring a friend in a party with you.";
-							next;
-							mes "[Sun Mao]";
-							mes "Now, I will wait for you here. Go forth and find others who wish for a better future for Louyang!";
-							close;
-						}
-						mes "[Sun Mao]";
-						mes "Please assist the people who fight behind you. As more are gathered, one of our comrades will inform you of further instructions.";
-						close;
+				getpartymember(getcharid(1));
+				set @partymember,$@partymembercount;
+				if (getpartyleader(getcharid(1),1) == getcharid(0) || !@partymember) {
+					mes "[Sun Mao]";
+					mes "Now, the most important thing for our cause is to gather more recruits and increase our numbers. Please find others who will join us in our fight.";
+					next;
+					mes "[Sun Mao]";
+					mes "However, as to not arouse suspicion, bring only one new recruit at a time. Also, we suggest not to bring a friend in a party with you.";
+					next;
+					mes "[Sun Mao]";
+					mes "Now, I will wait for you here. Go forth and find others who wish for a better future for Louyang!";
+					close;
 				}
-
-			case 3:
 				mes "[Sun Mao]";
-				mes "Are you...? I see, you may leave now. Do not reveal what you have seen or heard in this place.";
-				next;
-				mes "[Sun Mao]";
-				mes "If you're a real tourist, you do not want to get involved in our business, one way or another.";
+				mes "Please assist the people who fight behind you. As more are gathered, one of our comrades will inform you of further instructions.";
 				close;
+			}
+		case 3:
+			mes "[Sun Mao]";
+			mes "Are you...? I see, you may leave now. Do not reveal what you have seen or heard in this place.";
+			next;
+			mes "[Sun Mao]";
+			mes "If you're a real tourist, you do not want to get involved in our business, one way or another.";
+			close;
 		}
-	}
-	else if(getpartyleader(getcharid(1),2) == getcharid(0))
-	{
-		if(QL_REVOL == 9)
-		{
+	} else if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+		if (QL_REVOL == 9) {
 			mes "[Sun Mao]";
 			mes "Once again,";
 			mes "thank you for";
@@ -4666,52 +4676,42 @@ lou_in02,77,37,7	script	Hermit	824,{
 		}
 		getpartymember(getcharid(1));
 		set @partymember,$@partymembercount;
-		if(QL_REVOL < 8)
-		{
-			if(@partymember == QL_REVOL +1)
-			{
-				if(@partymember != 8)
-				{
+		if (QL_REVOL < 8) {
+			if (@partymember == QL_REVOL +1) {
+				if (@partymember != 8) {
 					set QL_REVOL,QL_REVOL +1;
 					mes "[Sun Mao]";
 					mes "Oh, you brought a new comrade! Welcome. Please help your friend understand our intentions before joining us.";
 					next;
 					mes "[Sun Mao]";
-					switch(QL_REVOL)
-					{
-						case 2:
-							mes "Please bring another friend that both of you can trust. Remember, add one person at a time into your party.";
-							next;
-							mes "[Sun Mao]";
-							mes "Otherwise, other people may learn of what we are doing, and that will lead to trouble.";
-							close;
-
-						case 3:
-							mes "The three of you may all move together for our cause. Please try to find another recruit to be your fourth member, invite him to your party and bring him to this place.";
-							close;
-
-						case 4:
-							mes "Ah, now there are four of you. However, we must continue to strengthen our ranks at a cautious pace. Please go and find one new recruit, and only one, to add to your party.";
-							close;
-
-						case 5:
-							mes "Now, there are five of you. Needless to say, we still require more manpower. Please go out and seek another new member for our cause. Remember, only add one more person to your party and return to me.";
-							close;
-
-						case 6:
-							mes "There are now six of you. So far, so good. Please go forth and find just one more person to add to your party and bring him to me so that we may recruit him.";
-							close;
-
-						case 7:
-							mes "Now, there are seven of you, but we still lack the manpower we need. Please go forth and seek out one, and only one, more person to add to your party and then return to me.";
-							close;
+					switch(QL_REVOL) {
+					case 2:
+						mes "Please bring another friend that both of you can trust. Remember, add one person at a time into your party.";
+						next;
+						mes "[Sun Mao]";
+						mes "Otherwise, other people may learn of what we are doing, and that will lead to trouble.";
+						close;
+					case 3:
+						mes "The three of you may all move together for our cause. Please try to find another recruit to be your fourth member, invite him to your party and bring him to this place.";
+						close;
+					case 4:
+						mes "Ah, now there are four of you. However, we must continue to strengthen our ranks at a cautious pace. Please go and find one new recruit, and only one, to add to your party.";
+						close;
+					case 5:
+						mes "Now, there are five of you. Needless to say, we still require more manpower. Please go out and seek another new member for our cause. Remember, only add one more person to your party and return to me.";
+						close;
+					case 6:
+						mes "There are now six of you. So far, so good. Please go forth and find just one more person to add to your party and bring him to me so that we may recruit him.";
+						close;
+					case 7:
+						mes "Now, there are seven of you, but we still lack the manpower we need. Please go forth and seek out one, and only one, more person to add to your party and then return to me.";
+						close;
 					}
 				}
 				mes "[Sun Mao]";
 				mes "Great work, you've brought another new comrade! Welcome! Please explain our goals and the righteousness of our cause to our new friend so that he may fully join us.";
 				next;
-				if(BaseLevel < 50)
-				{
+				if (BaseLevel < 50) {
 					mes "[Sun Mao]";
 					mes "It is almost time to take the action...";
 					next;
@@ -4750,88 +4750,70 @@ lou_in02,77,37,7	script	Hermit	824,{
 				mes "Since flammable chemicals are not allowed inside government offices, you must keep them well hidden. If the chemicals are equally divided among the eight of you, we might succeed!";
 				next;
 				set QL_REVOL,8;
-				getitem 7068,8;
-				getitem 7096,8;
-				getitem 7004,8;
+				getitem 7068,8; //Burn_Tree
+				getitem 7096,8; //Cold_Magma
+				getitem 7004,8; //Mud_Lump
 				mes "[Sun Mao]";
 				mes "There you go. Now, divide these materials equally among the eight of you. The eight of you must fully cooperate with each other, or our plan will fail. Understood?";
 				close;
-
-			}
-			else if(@partymember < QL_REVOL +1)
-			{
+			} else if (@partymember < QL_REVOL +1) {
 				mes "[Sun Mao]";
-				switch(QL_REVOL)
-				{
-					case 1:
-						mes "You made a party. Now, why don't you go recruit more followers? For now, just add one more person, lest we arouse the suspicion of our enemies.";
-						close;
-
-					case 2:
-						mes "Hmmm...";
-						mes "Having trouble finding a third person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
-						close;
-
-					case 3:
-						mes "Hmmm...";
-						mes "Having trouble finding a forth person to add to your party? I understand that it's important that you find someone you can trust. Be careful and don't get caught!";
-						close;
-
-					case 4:
-						mes "Having trouble finding a fifth person to add to your party? I understand that it's important that you find someone you can trust. Be careful and don't get caught!";
-						close;
-
-					case 5:
-						mes "Having trouble finding a six person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
-						close;
-
-					case 6:
-						mes "Having trouble finding a seventh person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
-						close;
-
-					case 7:
-						mes "Hmmm...";
-						mes "Having trouble finding an eighth person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
-						close;
+				switch(QL_REVOL) {
+				case 1:
+					mes "You made a party. Now, why don't you go recruit more followers? For now, just add one more person, lest we arouse the suspicion of our enemies.";
+					close;
+				case 2:
+					mes "Hmmm...";
+					mes "Having trouble finding a third person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
+					close;
+				case 3:
+					mes "Hmmm...";
+					mes "Having trouble finding a forth person to add to your party? I understand that it's important that you find someone you can trust. Be careful and don't get caught!";
+					close;
+				case 4:
+					mes "Having trouble finding a fifth person to add to your party? I understand that it's important that you find someone you can trust. Be careful and don't get caught!";
+					close;
+				case 5:
+					mes "Having trouble finding a six person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
+					close;
+				case 6:
+					mes "Having trouble finding a seventh person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
+					close;
+				case 7:
+					mes "Hmmm...";
+					mes "Having trouble finding an eighth person to add to your party? It's important that you find someone that is trustworthy. Be careful and don't get caught!";
+					close;
 				}
-			}
-			else
-			{
+			} else {
 				mes "[Sun Mao]";
 				mes "Oh no! You've brought more than one more person to join us! We can't do any recruiting now, it will bring unnecessary attention to our activities!";
 				next;
 				mes "[Sun Mao]";
-				switch(QL_REVOL)
-				{
-					case 1:
-						mes "Please make sure that there is a total of two members in your party so that we can recruit your friend. I believe that will look natural.";
-						close;
-
-					case 2:
-						mes "At this stage in our plan, we cannot afford any unnecessary attention to our activities! Please make sure that there is a total of three members in your party so that we can recruit your friend.";
-						close;
-					case 3:
-						mes "Please make sure that there is a total of four members in your party so that we can recruit your friend. I believe that will look natural.";
-						close;
-					case 4:
-						mes "Please make sure that there is a total of five members in your party so that we can recruit your friend. I believe that will look natural.";
-						close;
-					case 5:
-					case 6:
-						mes "By this time, you should know that you should only bring one more person at a time. You know that it is crucial that we do not attract any undue attention before we can take action!";
-						close;
-					case 7:
-						mes "At this stage in our plan, we cannot afford any unnecessary attention to our activities! Please make sure that there is a total of eight members in your party so that we can recruit your friend.";
-						close;
+				switch(QL_REVOL) {
+				case 1:
+					mes "Please make sure that there is a total of two members in your party so that we can recruit your friend. I believe that will look natural.";
+					close;
+				case 2:
+					mes "At this stage in our plan, we cannot afford any unnecessary attention to our activities! Please make sure that there is a total of three members in your party so that we can recruit your friend.";
+					close;
+				case 3:
+					mes "Please make sure that there is a total of four members in your party so that we can recruit your friend. I believe that will look natural.";
+					close;
+				case 4:
+					mes "Please make sure that there is a total of five members in your party so that we can recruit your friend. I believe that will look natural.";
+					close;
+				case 5:
+				case 6:
+					mes "By this time, you should know that you should only bring one more person at a time. You know that it is crucial that we do not attract any undue attention before we can take action!";
+					close;
+				case 7:
+					mes "At this stage in our plan, we cannot afford any unnecessary attention to our activities! Please make sure that there is a total of eight members in your party so that we can recruit your friend.";
+					close;
 				}
 			}
-		}
-		else if(QL_REVOL == 8)
-		{
-			if(@partymember == 8)
-			{
-				if(countitem(7204) > 7)
-				{
+		} else if (QL_REVOL == 8) {
+			if (@partymember == 8) {
+				if (countitem(7204) > 7) {
 					mes "[Sun Mao]";
 					mes "Welcome back! I see that the mission has been successfully accomplished! Great work, men!";
 					next;
@@ -4863,11 +4845,8 @@ lou_in02,77,37,7	script	Hermit	824,{
 			mes "Remember that you move together with your comrades. There isn't a traitor amongst you, is there?";
 			close;
 		}
-	}
-	else
-	{
-		if(ch_make == 1)
-		{
+	} else {
+		if (ch_make == 1) {
 			set ch_make,0;
 			mes "[Sun Mao]";
 			mes "Ah...";
@@ -4885,14 +4864,11 @@ lou_in02,77,37,7	script	Hermit	824,{
 	}
 }
 
-lou_in01,43,147,3	script	Gunpowder Expert	750,{
-
-	if(ch_make == 0)
-	{
+lou_in01,43,147,3	script	Gunpowder Expert	4_M_ALCHE_C,{
+	if (ch_make == 0) {
 		getpartymember(getcharid(1));
 		set @partymember,$@partymembercount;
-		if(!QL_REVOL)
-		{
+		if (!QL_REVOL) {
 			mes "[Hao Chenryu]";
 			mes "Who...";
 			mes "Are you?";
@@ -4900,9 +4876,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 			mes "[Hao Chenryu]";
 			mes "I only trust my comrades in the cause for Louyang, so leave me alone. Death before oppression! Freedom for Louyang!";
 			close;
-		}
-		else if(@partymember != 8)
-		{
+		} else if (@partymember != 8) {
 			mes "[Hao Chenryu]";
 			mes "Mao told me that eight Rune-Midgardians";
 			mes "would be coming.";
@@ -4913,9 +4887,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 			mes "Mao's plans are flawless,";
 			mes "so I'm sticking to the scenario he's drawn up. You're either improvising needlessly, or you're not really my comrade...";
 			close;
-		}
-		else if(countitem(7068) && countitem(7096) && countitem(7004))
-		{
+		 } else if (countitem(7068) && countitem(7096) && countitem(7004)) {
 			mes "[Hao Chenryu]";
 			mes "Ah, I see that Mao";
 			mes "has sent you. I'm sorry";
@@ -4929,34 +4901,30 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 			mes "I may quickly make";
 			mes "the gunpowder.";
 			next;
-			switch( select( "Make Gunpowder.","Cancel." ) )
-			{
-				case 1:
-					delitem 7068,1;
-					delitem 7096,1;
-					delitem 7004,1;
-					mes "[Hao Chenryu]";
-					mes "I don't want you to be caught if the soldiers inspect your goods. It will be better if one of you carry a Cart and hide the gunpowder in there.";
-					set ch_make,1;
-					getitem 7204,1;
-					close;
-
-				case 2:
-					mes "[Hao Chenryu]";
-					mes "Is...";
-					mes "Something wrong?!";
-					next;
-					mes "[Hao Chenryu]";
-					mes "I guess we must";
-					mes "be extra careful,";
-					mes "as there is much";
-					mes "surveillance in";
-					mes "this place.";
-					close;
+			switch(select("Make Gunpowder.:Cancel.")) {
+			case 1:
+				delitem 7068,1; //Burn_Tree
+				delitem 7096,1; //Cold_Magma
+				delitem 7004,1; //Mud_Lump
+				mes "[Hao Chenryu]";
+				mes "I don't want you to be caught if the soldiers inspect your goods. It will be better if one of you carry a Cart and hide the gunpowder in there.";
+				set ch_make,1;
+				getitem 7204,1; //Gunpowder
+				close;
+			case 2:
+				mes "[Hao Chenryu]";
+				mes "Is...";
+				mes "Something wrong?!";
+				next;
+				mes "[Hao Chenryu]";
+				mes "I guess we must";
+				mes "be extra careful,";
+				mes "as there is much";
+				mes "surveillance in";
+				mes "this place.";
+				close;
 			}
-		}
-		else
-		{
+		} else {
 			mes "[Hao Chenryu]";
 			mes "Hmmm...";
 			mes "It seems like";
@@ -4969,9 +4937,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 			mes "from your party leader.";
 			close;
 		}
-	}
-	else if(countitem(7204))
-	{
+	} else if (countitem(7204)) {
 		mes "[Hao Chenryu]";
 		mes "Be careful!";
 		mes "It's easy for";
@@ -4980,19 +4946,15 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 		mes "inspection process!";
 		mes "Hide it well...!";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Hao Chenryu]";
 		mes "I hope you bring the gunpowder to Mao safely. The next time you see him, please give him my thanks.";
 		close;
 	}
 }
 
-lou_in01,45,138,3	script	Soldier#1	825,{
-
-	if(countitem(7204))
-	{
+lou_in01,45,138,3	script	Soldier#1	4_M_CHNSOLDIER,{
+	if (countitem(7204)) {
 		mes "[Soldier]";
 		mes "Hold on there!";
 		next;
@@ -5009,10 +4971,8 @@ lou_in01,45,138,3	script	Soldier#1	825,{
 	end;
 }
 
-lou_in01,82,139,7	script	Soldier#2	825,{
-
-	if(countitem(7068) || countitem(7096) || countitem(7004))
-	{
+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";
 		mes "you are carrying. I cannot let you in.";
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt
index 97d566778..f0db564be 100644
--- a/npc/quests/quests_lutie.txt
+++ b/npc/quests/quests_lutie.txt
@@ -1,24 +1,22 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Lutie
-//===== By: ================================================== 
+//===== By: ==================================================
 //= TonyMan & Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3b
-//===== Compatible With: ===================================== 
-//= rAthena 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Blush, Cake Hat, Candle, Chef Hat, Raccoon Hat, Rainbow Eggshell,
 //= Spore Hat, Wonder Nutshell Quests
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Optimized [Lupus]
 //= 1.2 Fixed Chef Hat items [Lupus]
 //= 1.3 Update NPC to the Official One. [Samuray22]
 //= 1.3a Changed item names to item IDs. [Samuray22]
 //= 1.3b Removed a scrap " left in a delitem. [L0ne_W0lf]
 //= 1.4 Updated NPCs once again. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
-xmas,117,295,4	script	Vending Machine Man	704,{
+xmas,117,295,4	script	Vending Machine Man	4_M_BIBI,{
 	mes "[Titicupe]";
 	mes "Hmm...?";
 	mes "I, Titicupe, esteemed manager of the Toy Factory and genius inventor, has done it again! I've just created the world's most sophisticated vending machine!";
@@ -39,18 +37,18 @@ xmas,117,295,4	script	Vending Machine Man	704,{
 		next;
 		mes "[Titicupe]";
 		mes "Oh, this creation of mine is so magnificent!";
-		Emotion e_kis2;
+		emotion e_kis2;
 		next;
 		mes "[Titicupe]";
 		mes "And the headgears--! I... I can't contain myself!";
 		next;
 		mes "^3355FFToy factory manager Titicupe jumps and convulses with joy. Clearly he's insane, but it may be possible that he may be brilliant.^000000";
-		Emotion e_gasp;
+		emotion e_gasp;
 		close;
 	case 2:
 		mes "[Titicupe]";
 		mes "Oh right! You need to know what kind of items to put into the Vending Machine to get what you want, yes? Go ahead... Ask me~";
-		Emotion e_ic;
+		emotion e_ic;
 		next;
 		switch(select("Raccoon Hat:Spore Hat:Wonder Nutshell:Ranbow Eggshell:Blush:Chef Hat:Candle:Cake Hat:End Conversation")) {
 		case 1:
@@ -133,14 +131,14 @@ xmas,117,295,4	script	Vending Machine Man	704,{
 		mes "I love you";
 		mes "Mister Snowman";
 		mes "Vending Machine.";
-		Emotion e_kis2;
+		emotion e_kis2;
 		next;
 		mes "^3355FFToy factory manager Titicupe begins to jump around and emit screams of unbridled ecstacy. At this point, it's not difficult to doubt his sanity, as well as his genius.";
 		close;
 	}
 }
 
-xmas,115,297,4	script	Vending Machine	111,{
+xmas,115,297,4	script	Vending Machine	HIDDEN_NPC,{
 	mes "[Audi]";
 	mes "^555555Exciting item vending machine. Invented by great Titicupe. Select the desired item and place required items into snowmouth receptacle.^000000";
 	next;
@@ -171,7 +169,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 1036,20;  //Dragon_Scale
 			delitem 7012,200;  //Tough_Scalelike_Stem
 			delitem 7065,300;  //Sea_Otter_Leather
-			Emotion e_Oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -192,7 +190,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 7033,850;  //Poison_Spore
 			delitem 7068,300;  //Burn_Tree
 			delitem 1015,1;  //Thin_N'_Long_Tongue
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -218,7 +216,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			mes "*Kapang!*";
 			mes "*BeepBoopBeepBoop*";
 			mes "*Beeeeeeoop*^000000";
-			Emotion e_oh;
+			emotion e_oh;
 			getitem 5050,1; // Mystery_Fruit_Shell
 			next;
 			mes "[Audi]";
@@ -229,13 +227,13 @@ xmas,115,297,4	script	Vending Machine	111,{
 		}
 		break;
 	case 5:
-		if ((countitem(5015) > 0) && (countitem(978) > 0) && (countitem(7030) > 49)){ 
+		if ((countitem(5015) > 0) && (countitem(978) > 0) && (countitem(7030) > 49)){
 			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
 			next;
 			delitem 5015,1;  //Egg_Shell
 			delitem 978,1;  //Cobaltblue_Dyestuffs
 			delitem 7030,50;  //Claw_Of_Desert_Wolf
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -254,7 +252,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			mes "^3355FFYou gingerly place all 100 Aprons into the snowman's mouth.^000000";
 			next;
 			delitem 7047,100;  //Alice's_Apron
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -280,7 +278,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 982,1;  //White_Dyestuffs
 			delitem 949,330;  //Feather
 			delitem 1036,450;  //Dragon_Scale
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -302,7 +300,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 2279,1;  //Bomb_Wick
 			delitem 7035,50;  //Matchstick
 			delitem 526,100;  //Royal_Jelly
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -317,7 +315,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 		}
 		break;
 	case 9:
-		if ((countitem(529) > 9) && (countitem(530) > 4) && (countitem(538) > 14) && (countitem(539) > 19) && (countitem(999) > 9)) { 
+		if ((countitem(529) > 9) && (countitem(530) > 4) && (countitem(538) > 14) && (countitem(539) > 19) && (countitem(999) > 9)) {
 			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
 			next;
 			delitem 529,10;  //Candy
@@ -325,7 +323,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 538,15;  //Well_Baked_Cookie
 			delitem 539,20;  //Piece_Of_Cake
 			delitem 999,10;  //Steel
-			Emotion e_oh;
+			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -346,7 +344,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 		mes "Items.^000000";
 		close;
 	}
-	Emotion e_x;
+	emotion e_X;
 	mes "[Audi]";
 	mes "^555555Error Error!";
 	mes "Incorrect items!^000000";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 12122d883..45ed535f8 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -1,18 +1,18 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Morroc
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
-//= 2.9
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 3.2
+//===== Description: =========================================
+//= [Official Conversion]
 //= - Stop Post
 //= - Binoculars Quest
 //= - Assassin Pub NPCs/supporting quest NPCS. [Disabled]
 //= - Resurrection of Satan Morroc
 //= - The Crow of the Fate
 //= - Succession of the Prince
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Fixed exploits [Lupus]
 //= 1.2 Added Dandelion's Request / Morroc Invasion quest. [SinSloth]
 //= 1.3 Updated dialogs from Binoculars Quest. [Samuray22]
@@ -34,18 +34,21 @@
 //=     Added support NPCs required to finish Gaebolg quest.
 //= 2.5 Fixed Group of Evil never re-enabling. [L0ne_W0lf]
 //= 2.6 Added quest log commands for Resurrection of Satan Morroc. [L0ne_W0lf]
-//=     Added the two remaining episode 12.1 quests. 
+//=     Added the two remaining episode 12.1 quests.
 //=     Updated Satan Morroc Quest to allow peopel who have
 //=     finished it to return to the previous map.
 //= 2.7 Corrected weight checks, they only check for inventory slots. [L0ne_W0lf]
 //= 2.8 Disabled Assassin bar pub NPCs, as they are included in the 13.1 quests file. [L0ne_W0lf]
 //= 2.9 Fixed player dying/logging out during conversation could prevent
 //=     summoning of Satan Morroc until server reboot. [Gepard]
-//============================================================ 
+//= 3.0 Updated RE/Pre-RE EXP. [Euphy]
+//= 3.1 Updated to match the latest official scripts. [Euphy]
+//= 3.2 Added GM management NPC and variable $@re_moc_time$. [Euphy]
+//============================================================
 
 // Stop Post Quest
 // ============================================================
-moc_ruins,113,181,4	script	William	89,{
+moc_ruins,113,181,4	script	William	4_M_ORIENT02,{
 	mes "[William]";
 	mes "Welcome to";
 	mes "MacMillan's ^3355FFPost^000000 Workshop.";
@@ -64,7 +67,7 @@ moc_ruins,113,181,4	script	William	89,{
 		if ((countitem(1019) > 49) && (countitem(983) > 0) && (Zeny > 91099)) {
 			delitem 1019,50;  //Wooden_Block
 			delitem 983,1;  //Black_Dyestuffs
-			set Zeny,Zeny-91100;
+			Zeny -= 91100;
 			mes "[William]";
 			mes "Here you are~!";
 			mes "This ^3355FFStop Post^000000 has";
@@ -90,7 +93,7 @@ moc_ruins,113,181,4	script	William	89,{
 
 // Binoculars Quest
 // ============================================================
-moc_ruins,118,176,4	script	Alchemist	64,{
+moc_ruins,118,176,4	script	Alchemist	1_M_WIZARD,{
 	mes "[Marius]";
 	mes "Howdy, new customer!!";
 	mes "I know what you're gonna talk about. You want the Magic Glasses from me, riiiiight?";
@@ -131,7 +134,7 @@ moc_ruins,118,176,4	script	Alchemist	64,{
 			next;
 			delitem 2243,1;  //Spinning_Eyes
 			delitem 999,100;  //Steel
-			set Zeny,Zeny-50000;
+			Zeny -= 50000;
 			mes "[Marius]";
 			mes "Here you are!";
 			mes "Binoculars !";
@@ -163,7 +166,7 @@ moc_ruins,118,176,4	script	Alchemist	64,{
 // Morroc Assassin Guild Bar [Disabled]
 // ============================================================
 /*
-morocc,43,108,5	script	Sharp-Looking Kid#dan_07	82,{
+morocc,43,108,5	script	Sharp-Looking Kid#dan_07	4_KID01,{
 	if (BaseClass == Job_Assassin) {
 		mes "[Jack]";
 		mes "In spite of the chaotic mess in their town, ";
@@ -188,7 +191,7 @@ morocc,43,108,5	script	Sharp-Looking Kid#dan_07	82,{
 	}
 }
 
-morocc,45,110,0	script	que_job01#01	45,2,2,{
+morocc,45,110,0	script	que_job01#01	WARPNPC,2,2,{
 OnTouch:
 	if (BaseClass == Job_Assassin) {
 		warp "que_job01",9,94;
@@ -213,7 +216,7 @@ que_job01,6,94,0	warp	morocc#01	2,2,morocc,45,103
 que_job01,17,48,0	warp	que_job01#02	2,2,que_job01,68,92
 que_job01,68,96,0	warp	que_job01#03	2,2,que_job01,17,53
 
-que_job01,80,77,0	script	que_job01#04	45,2,2,{
+que_job01,80,77,0	script	que_job01#04	WARPNPC,2,2,{
 OnTouch:
 	if (BaseClass == Job_Assassin) {
 		warp "que_job01",61,50;
@@ -258,7 +261,7 @@ OnTouch:
 					mes "Hey, bartender! Gimme";
 					mes "the usual! I like your";
 					mes "style, adventurer...";
-					set zeny,zeny-1000;
+					Zeny -= 1000;
 					next;
 					mes "[Litheron]";
 					mes "Alright, you can come";
@@ -314,7 +317,7 @@ OnTouch:
 
 que_job01,65,50,0	warp	que_job01#05	2,2,que_job01,84,77
 
-que_job01,81,79,5	script	Idle Knight#dan_08	733,{
+que_job01,81,79,5	script	Idle Knight#dan_08	4_M_JOB_KNIGHT1,{
 	mes "[Litheron]";
 	mes "What's the matter?";
 	mes "Oh, I see... You're";
@@ -331,7 +334,7 @@ que_job01,81,79,5	script	Idle Knight#dan_08	733,{
 	close;
 }
 
-que_job01,82,95,3	script	Bar Master#moc_main01	46,{
+que_job01,82,95,3	script	Bar Master#moc_main01	1_ETC_01,{
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -403,7 +406,7 @@ que_job01,82,95,3	script	Bar Master#moc_main01	46,{
 						mes "ask you for 800. Enjoy it,";
 						mes "my friend, and drink it as";
 						mes "deeply as you would life.";
-						set zeny,zeny-800;
+						Zeny -= 800;
 						getitem 12112,1; //Tropical_Sograt
 					}
 					close;
@@ -426,7 +429,7 @@ que_job01,82,95,3	script	Bar Master#moc_main01	46,{
 						mes "hard feelings, but you're";
 						mes "already lucky to be here.";
 						mes "Hey, enjoy your drink~";
-						set zeny,zeny-1000;
+						Zeny -= 1000;
 						getitem 12112,1; //Tropical_Sograt
 						close;
 					}
@@ -462,7 +465,7 @@ que_job01,82,95,3	script	Bar Master#moc_main01	46,{
 						mes "ask you for 800. Enjoy it,";
 						mes "my friend, and drink it as";
 						mes "deeply as you would life.";
-						set zeny,zeny-800;
+						Zeny -= 800;
 						getitem 12113,1; //Vermilion_The_Beach
 					}
 					close;
@@ -485,7 +488,7 @@ que_job01,82,95,3	script	Bar Master#moc_main01	46,{
 						mes "hard feelings, but you're";
 						mes "already lucky to be here.";
 						mes "Hey, enjoy your drink~";
-						set zeny,zeny-1000;
+						Zeny -= 1000;
 						getitem 12113,1; //Vermilion_The_Beach
 						close;
 					}
@@ -579,7 +582,7 @@ que_job01,82,95,3	script	Bar Master#moc_main01	46,{
 	}
 }
 
-que_job01,49,49,5	script	Tao#dan_09	877,{
+que_job01,49,49,5	script	Tao#dan_09	4_F_YUNYANG,{
 	if (BaseClass == Job_Assassin) {
 		mes "[Tao]";
 		mes "Welcome, meow~";
@@ -660,19 +663,16 @@ que_job01,49,49,5	script	Tao#dan_09	877,{
 	}
 }
 
-que_job01,51,55,0	script	que_job01#room_1	45,1,1,{
-OnInit:
-	set $maobar_room,0;
-	end;
+que_job01,51,55,0	script	que_job01#room_1	WARPNPC,1,1,{
 
-Onreset:
-	set $maobar_room,0;
+OnReset:
+	set $@maobar_room,0;
 	end;
 
 OnTouch:
 	if (prt_curse == 24) {
-		if ($maobar_room == 0) {
-			set $maobar_room,1;
+		if ($@maobar_room == 0) {
+			set $@maobar_room,1;
 			donpcevent " #room1timer::OnEnable";
 			donpcevent "Marjana#poison::OnEnable";
 			mes "[Tao]";
@@ -696,8 +696,8 @@ OnTouch:
 		}
 	}
 	else if (mao_request > 0) {
-		if ($maobar_room == 0) {
-			set $maobar_room,1;
+		if ($@maobar_room == 0) {
+			set $@maobar_room,1;
 			donpcevent " #room1timer::OnEnable";
 			donpcevent "Valdes#moc_master_1::OnEnable";
 			mes "[Tao]";
@@ -733,18 +733,18 @@ OnTouch:
 	}
 }
 
-que_job01,1,1,0	script	 #room1timer	844,{
+que_job01,1,1,0	script	 #room1timer	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	mapannounce "que_job01","You will now enter the Master Zone, Area 1.",bc_map,"0x70DBDB";
 	end;
 
-Onstop:
+OnStop:
 	mapannounce "que_job01","The security magic in the Master Zone, Area 1 is deactivated.",bc_map,"0x70DBDB";
 	donpcevent "#room1_warp::OnDisable";
 	donpcevent "Valdes#moc_master_1::OnDisable";
 	donpcevent "Marjana#poison::OnDisable";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 	end;
 
@@ -760,7 +760,7 @@ OnTimer245000:
 
 OnTimer250000:
 	mapannounce "que_job01","The security magic Master Zone, Area 1 is now activated.",bc_map,"0x70DBDB";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 	end;
 }
@@ -785,7 +785,7 @@ OnTouch:
 
 que_job01,51,44,0	warp	que_job01#room_2	1,1,que_job01,80,23
 
-que_job01,11,4,0	script	que_job01#room1_out	45,1,1,{
+que_job01,11,4,0	script	que_job01#room1_out	WARPNPC,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
 	donpcevent " #room1timer::OnStop";
@@ -794,7 +794,7 @@ OnTouch:
 
 que_job01,80,27,0	warp	que_job01#room2_1_out	1,1,que_job01,52,50
 
-que_job01,16,21,5	script	Valdes#moc_master_1	55,{
+que_job01,16,21,5	script	Valdes#moc_master_1	1_M_JOBTESTER,{
 	if (BaseClass == Job_Assassin) {
 		mes "[Valdes]";
 		mes "What is it? I have nothing to ask you to do.";
@@ -835,7 +835,7 @@ OnDisable:
 }
 */
 
-yuno_in04,180,106,3	script	Reading Girl#moc_girl1	73,{
+yuno_in04,180,106,3	script	Reading Girl#moc_girl1	1_F_MERCHANT_01,{
 	mes "[" + strcharinfo(0) + "]";
 	mes "Excuse me, but may I ask";
 	mes "you a question?";
@@ -863,7 +863,7 @@ yuno_in04,180,106,3	script	Reading Girl#moc_girl1	73,{
 	close;
 }
 
-morocc_in,46,125,5	script	Assistant#moc_ex1	729,{
+morocc_in,46,125,5	script	Assistant#moc_ex1	4_F_NOVICE,{
 	mes "[Sephit]";
 	mes "I've always believed in Satan..";
 	mes "Haah... Guess it's good to be living, after all.";
@@ -873,7 +873,7 @@ morocc_in,46,125,5	script	Assistant#moc_ex1	729,{
 	close;
 }
 
-que_job01,70,84,1	script	Girl#moc_ex002	882,{
+que_job01,70,84,1	script	Girl#moc_ex002	4_F_SITDOWN,{
 	mes "[Girl]";
 	mes "Oh, the world.. the world is doomed..";
 	mes "-sobbing-";
@@ -888,7 +888,7 @@ que_job01,70,84,1	script	Girl#moc_ex002	882,{
 
 // Resurrection of Satan Morroc
 // ============================================================
-moc_fild20,354,183,3	script	Continental Guard#01::MocConGuard	707,3,3,{
+moc_fild20,354,183,3	script	Continental Guard#01::MocConGuard	4_M_MOC_SOLDIER,3,3,{
 	if ((rebirth_moc_edq == 0) && (rebirth_moc_edq < 4)) {
 		mes "[Continental Guard]";
 		mes "No commoners are allowed in the area beyond this point.";
@@ -1108,15 +1108,15 @@ OnTouch:
 	end;
 }
 
-moc_fild20,354,174,3	duplicate(MocConGuard)	Continental Guard#02	707,3,3
-moc_fild20,38,174,5	duplicate(MocConGuard)	Continental Guard#03	707,3,3
-moc_fild20,38,183,5	duplicate(MocConGuard)	Continental Guard#04	707,3,3
-moc_fild20,189,21,7	duplicate(MocConGuard)	Continental Guard#05	707,3,3
-moc_fild20,200,21,7	duplicate(MocConGuard)	Continental Guard#06	707,3,3
-moc_fild20,203,336,5	duplicate(MocConGuard)	Continental Guard#07	707,3,3
-moc_fild20,215,336,3	duplicate(MocConGuard)	Continental Guard#08	707,3,3
+moc_fild20,354,174,3	duplicate(MocConGuard)	Continental Guard#02	4_M_MOC_SOLDIER,3,3
+moc_fild20,38,174,5	duplicate(MocConGuard)	Continental Guard#03	4_M_MOC_SOLDIER,3,3
+moc_fild20,38,183,5	duplicate(MocConGuard)	Continental Guard#04	4_M_MOC_SOLDIER,3,3
+moc_fild20,189,21,7	duplicate(MocConGuard)	Continental Guard#05	4_M_MOC_SOLDIER,3,3
+moc_fild20,200,21,7	duplicate(MocConGuard)	Continental Guard#06	4_M_MOC_SOLDIER,3,3
+moc_fild20,203,336,5	duplicate(MocConGuard)	Continental Guard#07	4_M_MOC_SOLDIER,3,3
+moc_fild20,215,336,3	duplicate(MocConGuard)	Continental Guard#08	4_M_MOC_SOLDIER,3,3
 
--	script	Continental Messenger#00::ConMessenger	997,3,3,{
+-	script	Continental Messenger#00::ConMessenger	4_M_MOCASS1,3,3,{
 	set .@area$,strnpcinfo(2);
 	if (.@area$ == "01") { set .@area$,"Prontera"; }
 	else if (.@area$ == "02") { set .@area$,"Geffen"; }
@@ -1201,13 +1201,13 @@ OnTouch:
 	end;
 }
 
-prontera,164,304,3	duplicate(ConMessenger)	Continental Messenger#01	997,3,3
-geffen,128,90,3	duplicate(ConMessenger)	Continental Messenger#02	997,3,3
-payon,200,113,3	duplicate(ConMessenger)	Continental Messenger#03	997,3,3
-alberta,127,64,3	duplicate(ConMessenger)	Continental Messenger#04	998,3,3
-aldebaran,135,128,3	duplicate(ConMessenger)	Continental Messenger#05	998,3,3
+prontera,164,304,3	duplicate(ConMessenger)	Continental Messenger#01	4_M_MOCASS1,3,3
+geffen,128,90,3	duplicate(ConMessenger)	Continental Messenger#02	4_M_MOCASS1,3,3
+payon,200,113,3	duplicate(ConMessenger)	Continental Messenger#03	4_M_MOCASS1,3,3
+alberta,127,64,3	duplicate(ConMessenger)	Continental Messenger#04	4_M_MOCASS2,3,3
+aldebaran,135,128,3	duplicate(ConMessenger)	Continental Messenger#05	4_M_MOCASS2,3,3
 
-morocc,176,103,3	script	Continental Official	754,{
+morocc,176,103,3	script	Continental Official	4_M_SAGE_A,{
 	if (rebirth_moc_edq > 3) {
 		mes "[Continental Guard Official]";
 		mes "On behalf of the Continental Guard, I thank you for your efforts. Now, let me see if I've received any news from Headquarters that you should know...";
@@ -1281,7 +1281,7 @@ morocc,176,103,3	script	Continental Official	754,{
 	}
 }
 
-morocc,159,113,3	script	Chief Balrog	752,{
+morocc,159,113,3	script	Chief Balrog	4_M_CRU_OLD,{
 	if (rebirth_moc_edq == 0) {
 		mes "[Chief Balrog]";
 		mes "You've come here at a bad time, but it's nice to meet you. I'm Continental Guard Chief Balrog. We've been dispatched to Morroc in order to suppress Satan Morroc... We'll need all the strength and luck we can gather.";
@@ -1616,7 +1616,7 @@ morocc,159,113,3	script	Chief Balrog	752,{
 			mes "Once again, I thank you for your distinguished service on behalf of the Continental Guard and the Rune-Midgarts Kingdom. I'll report your great achievement to His Majesty right away.";
 			next;
 			delitem 7820,1; //Morroc_Skin
-			getexp 200000,0;
+			getexp (checkre(3))?200000:2000000,0;
 			set rebirth_moc_edq,7;
 			changequest 3055,3056;
 			mes "[Chief Balrog]";
@@ -1858,9 +1858,10 @@ morocc,159,113,3	script	Chief Balrog	752,{
 }
 
 moc_fild21,38,193,0	script	Morocc Timer#edq	-1,6,6,{
-OnInit:
-	set $@re_moc,0;
-	end;
+//OnInit:
+//	set $@re_moc,0;
+//	set $@re_moc_time$,"";
+//	end;
 
 OnTouch:
 	if ($@re_moc == 0) {
@@ -1870,7 +1871,7 @@ OnTouch:
 	end;
 }
 
-moc_fild21,1,1,0	script	Satan Broadcast#edq	844,{
+moc_fild21,1,1,0	script	Satan Broadcast#edq	CLEAR_NPC,{
 OnInit:
 	disablenpc "Satan Broadcast#edq";
 	end;
@@ -1898,7 +1899,7 @@ OnDisable:
 	end;
 }
 
-moc_fild21,178,239,0	script	Group of Evil#edq	844,1,1,{
+moc_fild21,178,239,0	script	Group of Evil#edq	CLEAR_NPC,1,1,{
 	if (((rebirth_moc_edq == 4) || (rebirth_moc_edq == 7)) && ($@re_moc == 1)) {
 		mes "Awed by the time-space gap where darkness is given life, you instinctively step back.";
 		next;
@@ -1926,6 +1927,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "Group of Evil#edq";
+	set $@re_moc_time$,"";
 	end;
 
 OnDisable:
@@ -1934,7 +1936,7 @@ OnDisable:
 	end;
 }
 
-moc_fild21,177,239,0	script	Time-Space Gap#edq	844,1,1,{
+moc_fild21,177,239,0	script	Time-Space Gap#edq	CLEAR_NPC,1,1,{
 	if ((rebirth_moc_edq == 4) && ($@re_moc == 3)) {
 		mes "The time-space gap's frightening darkness seems to dissipate as Satan Morroc fades away.";
 		next;
@@ -1980,7 +1982,7 @@ OnTimer21600000:
 	end;
 }
 
-moc_fild21,3,1,0	script	Satan Summon#edq	844,{
+moc_fild21,3,1,0	script	Satan Summon#edq	CLEAR_NPC,{
 OnInit:
 	disablenpc "Satan Summon#edq";
 	end;
@@ -2000,6 +2002,7 @@ OnDisable:
 
 OnMyMobDead:
 	set $@re_moc,3;
+	set $@re_moc_time$, gettimestr("%H%M%S",7);
 	mapannounce "moc_fild21","I'll let live just a little longer. You'll never find me through this time-space gap!",bc_map,"0xFFFF00";
 	donpcevent "Time-Space Gap#edq::OnEnable";
 	donpcevent "Satan Broadcast#edq::OnDisable";
@@ -2020,9 +2023,87 @@ OnTimer5415000:
 	end;
 }
 
+sec_in02,14,43,5	script	Morroc GlobalVar Admin::MorrocAdmin_sec	4_F_RUSGREEN,{
+	callfunc "F_GM_NPC";
+	mes "[Helper]";
+	mes "Please enter the password and # button.";
+	next;
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "[Helper]";
+		mes "Please press the numbers we always sing about.";
+		close;
+	} else {
+		mes "[Helper]";
+		mes "Hello. I am a post office.";
+		mes "I am currently checking Morroc status.";
+		next;
+		mes "=============";
+		mes "Current State";
+		mes "=============";
+		mes "^3131FF<Morroc>^000000";
+		if ($@re_moc == 0) {
+			mes "Reset. Enable to summon Morroc.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "Enable to enter to moc_fild21 field.";
+		} else if ($@re_moc == 1) {
+			mes "^3131FF<Morroc>^000000";
+			mes "Some warrior entered after the reset. However, the warrior hasn't started the quest yet.";
+			mes "The warrior who has rebirth_moc_edq 4 and 7 is now enabled to summon Morroc.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "The warrior who has rebirth_moc_edq 4 ~ 7 is now enabled to enter to moc_fild21.";
+		} else if ($@re_moc == 2) {
+			mes "^3131FF<Morroc>^000000";
+			mes "Morroc has been summoned. After 90 minutes has passed, it will revert back to reset status.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "The warrior who has rebirth_moc_edq 4 ~ 7 is now enabled to enter to moc_fild21.";
+		} else if ($@re_moc == 3) {
+			mes "^3131FF<Morroc>^000000";
+			mes "Morroc has been killed. Death time is "+$@re_moc_time$+"(00 hr/00 min/00 sec).";
+			mes "After 6 hours later since the death time, it will be reset.";
+			mes "The warriors whom has remained in the field can continue the quest via Time Space Gap.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "Disabled to enter to moc_fild21 from outside of the field.";
+		} else {
+			mes "^3131FF<Morroc>^000000";
+			mes "Morroc has been killed. Death time is "+$@re_moc_time$+"(00 hr/00 min/00 sec).";
+			mes "After 6 hours later since the death time, it will be reset.";
+			mes "It has been already passed 30 minutes after Morroc's death, so warriors can not continue the quest even if they click the Time Space Gap.";
+			mes "^3131FF<Continental Guards>^000000";
+			mes "Disabled to enter to moc_fild21 from outside of the field.";
+		}
+		next;
+		mes "[Helper]";
+		mes "What do you want?";
+		next;
+		switch(select("Cancel.:Reset")) {
+		case 1:
+			mes "[Helper]";
+			mes "Alright.";
+			close;
+		case 2:
+			if (strnpcinfo(4) == "sec_in02")
+				mes "You can reset at moc_fild21 5 5.";
+			else {
+				mes "Reset starts.";
+				next;
+				donpcevent "Group of Evil#edq::OnEnable";
+				mes "Group of Evil NPC is appeared.";
+				mes "Time-Space Gap NPC is disappeared.";
+				mes "6 hours term timer is stopped.";
+				donpcevent "Satan Summon#edq::OnDisable";
+				mes "Morroc 90 minutes survival timer is stopped.";
+				mes "Morroc is being killed.";
+				mes "Now, Continental Guards will let players enter.";
+			}
+			close;
+		}
+	}
+}
+moc_fild21,5,5,5	duplicate(MorrocAdmin_sec)	Morroc GlobalVar Admin::MorrocAdmin_moc	4_F_RUSGREEN
+
 // The Crow of the Fate
 // ============================================================
-moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
+moc_ruins,137,70,3	script	Book-Touching Man#garas	1_M_02,{
 	if (BaseLevel > 59) {
 		if (checkweight(703,3) == 0) {
 			mes "- You have too many items in your inventory to proceed with this quest. -";
@@ -2037,7 +2118,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 			next;
 			mes "^660000Watching him makes you giggle, he looks no better than the dried corpses in the pyramid, but he is obviously alive and doesn't appear to be a monster. Somehow, you find yourself compelled to approach this interesting looking man.^000000";
 			next;
-			emotion 3;
+			emotion e_lv;
 			mes "[Book-Touching Man]";
 			mes "Ah... Mammi...";
 			next;
@@ -2070,7 +2151,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				mes "[Book-Touching Man]";
 				mes "What? Don't you know Mammi, one of the three greatest Rune-Midgart's idols?";
 				next;
-				emotion 54;
+				emotion e_sigh;
 				mes "[Book-Touching Man]";
 				mes "Man, you don't know anything, do you?! Well, judging by the stupid look on your face, I guess you're an adventurer running around on meaningless errands for others. Heh heh!";
 				next;
@@ -2083,7 +2164,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				mes "[Book-Touching Man]";
 				mes "She even mentioned in an interview in 'Morroc Times' that she wants to meet a man that loves books.";
 				next;
-				emotion 38;
+				emotion e_awsm;
 				mes "[Book-Touching Man]";
 				mes "That means... She's waiting for someone like me. Hehehe!";
 				mes "You see, every book in Rune-Midgart's Library has the name Benjamin written on them... That's me!";
@@ -2119,7 +2200,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				next;
 				mes "["+ strcharinfo(0) +"]";
 				mes "Huh?";
-				emotion 19,1;
+				emotion e_swt2,1;
 				next;
 				mes "[Benjamin]";
 				mes "You look bored. You must be waiting for someone to give you something to do!";
@@ -2213,12 +2294,12 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 			next;
 			mes "[Benjamin]";
 			mes "Grrrr... Mammi! Here I am, following your noble tastes to read such a rare book! Mammi...!";
-			emotion 14;
+			emotion e_lv2;
 			next;
 			mes "[Benjamin]";
 			mes "I feel so excited to think about having a deep conversation with Mammi about literature! Yay!";
 			mes "I should go read this book right away. Hehehe!";
-			emotion 2;
+			emotion e_ho;
 			next;
 			mes "[Benjamin]";
 			mes "Oops, I must not forget to repay you. You know, I'm a polite man.";
@@ -2315,7 +2396,10 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 					delitem 7797,1; //Author_Memo
 					delitem 7796,1; //Author_Autograph
 					set barmunt_crow,16;
-					getexp 90000,90000;
+					if (checkre(3))
+						getexp 90000,90000;
+					else
+						getexp 900000,900000;
 					close;
 				case 2:
 					mes "[Benjamin]";
@@ -2341,7 +2425,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 	}
 }
 
-prt_in,179,92,3	script	Library Curator#garas	57,{
+prt_in,179,92,3	script	Library Curator#garas	1_M_LIBRARYMASTER,{
 	if (barmunt_crow == 0) {
 		mes "[Curator Guys]";
 		mes "Our library's Monster Encyclopedia has every monster in the Rune-Midgart Kingdom categorized by dungeon, to help our readers find them easily.";
@@ -2472,7 +2556,7 @@ prt_in,179,92,3	script	Library Curator#garas	57,{
 	}
 }
 
-yuno,333,210,5	script	Library Master#garas	57,{
+yuno,333,210,5	script	Library Master#garas	1_M_LIBRARYMASTER,{
 	if (barmunt_crow == 2) {
 		mes "[Dog]";
 		mes "Bowwow!";
@@ -2570,7 +2654,7 @@ yuno,333,210,5	script	Library Master#garas	57,{
 	}
 }
 
-yuno,336,203,0	script	#garas_catch	139,3,3,{
+yuno,336,203,0	script	#garas_catch	HIDDEN_WARP_NPC,3,3,{
 //OnTouch2:
 OnTouch:
 	if (barmunt_crow == 2) {
@@ -2666,17 +2750,17 @@ OnTouch:
 	end;
 }
 
-yuno,343,204,1	script	#garas_eff	111,{
+yuno,343,204,1	script	#garas_eff	HIDDEN_NPC,{
 	end;
 }
 
-yuno,335,208,5	script	Dog#garas	81,{
+yuno,335,208,5	script	Dog#garas	4_DOG01,{
 	mes "[Dog]";
 	mes "Bowwow!";
 	close;
 }
 
-yuno_in04,111,57,3	script	Library Part-Timer#garas	862,{
+yuno_in04,111,57,3	script	Library Part-Timer#garas	4_F_LGTGIRL,{
 	if (barmunt_crow == 3) {
 		mes "[Library Part-Timer]";
 		mes "People should learn to put away books after pulling them out.";
@@ -2761,7 +2845,7 @@ yuno_in04,111,57,3	script	Library Part-Timer#garas	862,{
 	end;
 }
 
-yuno_in04,100,5,3	script	Hot Bestseller Corner	111,{
+yuno_in04,100,5,3	script	Hot Bestseller Corner	HIDDEN_NPC,{
 	if (barmunt_crow == 3) {
 		mes "^660000The countless number of books filling this room tell you why this place is called the Greatest Library of Juno, the City of Scholars.^000000";
 		next;
@@ -2835,7 +2919,7 @@ yuno_in04,100,5,3	script	Hot Bestseller Corner	111,{
 	end;
 }
 
-yuno_in04,100,3,0	script	#garas_path	139,1,1,{
+yuno_in04,100,3,0	script	#garas_path	HIDDEN_WARP_NPC,1,1,{
 //OnTouch2:
 OnTouch2:
 	if (barmunt_crow == 6) {
@@ -2897,7 +2981,7 @@ OnTouch2:
 	end;
 }
 
-yuno_in04,117,102,3	script	Old News Scrapbook	844,{
+yuno_in04,117,102,3	script	Old News Scrapbook	CLEAR_NPC,{
 	if (barmunt_crow == 7) {
 		mes "^660000It is a folder with an wooden frame holding a thick pile of old newspapers.^000000";
 		next;
@@ -3036,7 +3120,7 @@ yuno_in04,117,102,3	script	Old News Scrapbook	844,{
 	}
 }
 
-yuno_in04,169,123,3	script	Suspicious Man#oliver_h	407,{
+yuno_in04,169,123,3	script	Suspicious Man#oliver_h	4_M_ATEIL,{
 	if (checkweight(617,3) == 0) {
 		mes "- You have too many items in your inventory to proceed with this quest. -";
 		close;
@@ -3249,7 +3333,7 @@ yuno_in04,169,123,3	script	Suspicious Man#oliver_h	407,{
 	}
 }
 
-yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
+yuno_in04,167,120,3	script	Worn-out Book#garas	HIDDEN_NPC,{
 	if (checkweight(617,3) == 0) {
 		mes "- You have too many items in your inventory to proceed with this quest. -";
 		close;
@@ -3366,7 +3450,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		cutin "oliver_smile",2;
 		mes "[Oliver Hilpert]";
 		mes "Lady Mammi!";
-		emotion 14;
+		emotion e_lv2;
 		next;
 		mes "^660000Yes, it was the picture book of Mammi, an idol whom Benjamin of Morroc insists to be one of the three greatest idols in the Rune-Midgart Kingdom. That must be why Oliver is squealing in delight.^000000";
 		emotion e_dots,1;
@@ -3393,12 +3477,12 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		mes "[Oliver Hilpert]";
 		mes "...Oh!";
 		cutin "mami01",4;
-		emotion 3;
+		emotion e_lv;
 		next;
 		mes "[Oliver Hilpert]";
 		mes "...Ooooh!";
 		cutin "mami02",4;
-		emotion 3;
+		emotion e_lv;
 		next;
 		cutin "oliver_smile",2;
 		mes "[Oliver Hilpert]";
@@ -3420,7 +3504,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		mes "["+ strcharinfo(0) +"]";
 		mes "...............";
 		mes "I... I see...";
-		emotion 4,1;
+		emotion e_swt,1;
 		next;
 		mes "[Oliver Hilpert]";
 		mes "Umm...";
@@ -3502,7 +3586,7 @@ OnTouch:
 		warp "ama_dun03",119,110;
 	}
 	else {
-		sc_end SC_Blind;
+		sc_end SC_BLIND;
 		mes "[???]";
 		mes "Waaaaah!";
 		next;
@@ -3515,7 +3599,7 @@ OnTouch:
 	}
 }
 
-que_ba,257,39,3	script	Female Researcher#bpast	744,{
+que_ba,257,39,3	script	Female Researcher#bpast	4_F_ALCHE,{
 	if (barmunt_crow < 4) {
 		warp "ama_dun03",119,110;
 	}
@@ -3544,7 +3628,7 @@ que_ba,257,39,3	script	Female Researcher#bpast	744,{
 
 que_ba,265,34,0	warp	#bpast_1to2	1,1,que_ba,156,37
 
-que_ba,176,43,7	script	Researcher#bpast_2_1	402,{
+que_ba,176,43,7	script	Researcher#bpast_2_1	4_M_SCIENCE,{
 	specialeffect EF_CLOAKING;
 	mes "[Researcher]";
 	mes "Fire!";
@@ -3552,7 +3636,7 @@ que_ba,176,43,7	script	Researcher#bpast_2_1	402,{
 	close;
 }
 
-que_ba,181,14,7	script	Researcher#bpast_2_2	865,{
+que_ba,181,14,7	script	Researcher#bpast_2_2	4_LGTSCIENCE,{
 	specialeffect EF_CLOAKING;
 	mes "[Researcher]";
 	mes "Cough, cough!";
@@ -3617,7 +3701,7 @@ OnTouch:
 		if (barmunt_crow == 4) {
 			set barmunt_crow,5;
 		}
-		sc_start SC_Blind,600000,0,10000;
+		sc_start SC_BLIND,600000,0,10000;
 		close2;
 		warp "que_ba",53,232;
 		end;
@@ -3625,17 +3709,17 @@ OnTouch:
 	end;
 }
 
-que_ba,104,55,3	script	Grotesque Woman#eva1	980,{
+que_ba,104,55,3	script	Grotesque Woman#eva1	4_F_MUT1,{
 	specialeffect EF_CLOAKING;
 	end;
 }
 
-que_ba,99,51,7	script	Grotesque Man#zid1	999,{
+que_ba,99,51,7	script	Grotesque Man#zid1	4_M_MUT1,{
 	specialeffect EF_CLOAKING;
 	end;
 }
 
-que_ba,53,232,0	script	#garas_f_yume	139,1,1,{
+que_ba,53,232,0	script	#garas_f_yume	HIDDEN_WARP_NPC,1,1,{
 //OnTouch2:
 OnTouch:
 	if (barmunt_crow == 5) {
@@ -3670,17 +3754,17 @@ OnTouch:
 	end;
 }
 
-que_ba,50,238,1	script	Grotesque Woman#eva2	980,{
+que_ba,50,238,1	script	Grotesque Woman#eva2	4_F_MUT1,{
 	specialeffect EF_CLOAKING;
 	end;
 }
 
-que_ba,48,227,7	script	Grotesque Man#zid2	999,{
+que_ba,48,227,7	script	Grotesque Man#zid2	4_M_MUT1,{
 	specialeffect EF_CLOAKING;
 	end;
 }
 
-que_ba,264,186,0	script	#barmut_room1	139,2,2,{
+que_ba,264,186,0	script	#barmut_room1	HIDDEN_WARP_NPC,2,2,{
 //OnTouch2:
 OnTouch:
 	if (barmunt_crow == 11) {
@@ -3716,11 +3800,11 @@ OnTouch:
 	end;
 }
 
-que_ba,270,181,3	script	#barmunt_fire	755,{
+que_ba,270,181,3	script	#barmunt_fire	4_M_SAGE_C,{
 	end;
 }
 
-que_ba,270,270,0	script	#barmunt_living	139,1,1,{
+que_ba,270,270,0	script	#barmunt_living	HIDDEN_WARP_NPC,1,1,{
 //OnTouch2:
 OnTouch:
 	mes "..................";
@@ -3800,17 +3884,17 @@ OnTouch:
 	end;
 }
 
-que_ba,263,276,3	script	#barmut_room2	755,{
+que_ba,263,276,3	script	#barmut_room2	4_M_SAGE_C,{
 	end;
 }
 
-que_ba,266,268,3	script	#barmut_onna	982,{
+que_ba,266,268,3	script	#barmut_onna	4_F_SCIENCE,{
 OnInit:
 	disablenpc "#barmut_onna";
 	end;
 }
 
-cave,82,97,3	script	Cave Settler#g1	996,3,3,{
+cave,82,97,3	script	Cave Settler#g1	4_M_CAVE1,3,3,{
 	if (barmunt_crow == 8) {
 		mes "[Cave Settler]";
 		mes "No outsiders are allowed beyond this point.";
@@ -3852,7 +3936,7 @@ cave,82,97,3	script	Cave Settler#g1	996,3,3,{
 				mes "Hmm...";
 				mes "Wait here.";
 				next;
-				emotion 44;
+				emotion e_com;
 				mes "[Cave Settler]";
 				mes "Hey, Jaeda!";
 				enablenpc "Jaeda#garas1";
@@ -3941,7 +4025,7 @@ OnTouch:
 				mes "Hmm...";
 				mes "Wait here.";
 				next;
-				emotion 44;
+				emotion e_com;
 				mes "[Cave Settler]";
 				mes "Hey, Jaeda!";
 				enablenpc "Jaeda#garas1";
@@ -3982,7 +4066,7 @@ OnTouch:
 	end;
 }
 
-cave,85,101,3	script	Jaeda#garas1	401,{
+cave,85,101,3	script	Jaeda#garas1	4_M_MUT2,{
 OnInit:
 	disablenpc "Jaeda#garas1";
 	end;
@@ -3994,7 +4078,7 @@ cave,97,21,0	warp	case_out1	1,1,ein_fild01,28,255
 cave,86,167,0	warp	zid_in	1,1,cave,77,185
 cave,79,180,0	warp	zid_out	3,3,cave,90,162
 
-cave,22,186,3	script	Monsterous Man#zid	999,{
+cave,22,186,3	script	Monsterous Man#zid	4_M_MUT1,{
 	if (barmunt_crow == 9) {
 		mes "^660000You are looking at a man who appears as hideous as a monster.";
 		mes "He was the man with Eva that you saw in your dream. Of course, he's older now, and his age is showing in his face and skin.^000000";
@@ -4179,7 +4263,7 @@ cave,22,186,3	script	Monsterous Man#zid	999,{
 	}
 }
 
-cave,91,43,3	script	Cave Settler#f_cave1	870,{
+cave,91,43,3	script	Cave Settler#f_cave1	4_M_LGTPOOR,{
 	mes "[Cave Settler]";
 	mes "(Startled)";
 	next;
@@ -4188,7 +4272,7 @@ cave,91,43,3	script	Cave Settler#f_cave1	870,{
 	close;
 }
 
-cave,72,71,5	script	Cave Settler#m_cave2	981,{
+cave,72,71,5	script	Cave Settler#m_cave2	4_F_MUT2,{
 	mes "[Cave Settler]";
 	mes "Heh...";
 	mes "You want... This?";
@@ -4197,7 +4281,7 @@ cave,72,71,5	script	Cave Settler#m_cave2	981,{
 	close;
 }
 
-cave,134,62,1	script	Cave Settler#m_cave3	981,{
+cave,134,62,1	script	Cave Settler#m_cave3	4_F_MUT2,{
 	mes "[Cave Settler]";
 	mes "Accessory!";
 	mes "My pretty accessory!";
@@ -4206,7 +4290,7 @@ cave,134,62,1	script	Cave Settler#m_cave3	981,{
 	close;
 }
 
-cave,113,74,5	script	Cave Settler#f_cave4	401,{
+cave,113,74,5	script	Cave Settler#f_cave4	4_M_MUT2,{
 	mes "[Cave Settler]";
 	mes "No one in this village welcomes you. Go back.";
 	next;
@@ -4215,9 +4299,9 @@ cave,113,74,5	script	Cave Settler#f_cave4	401,{
 	close;
 }
 
-cave,76,39,5	shop	Cave Girl#f_cave5	62,712:-1
+cave,76,39,5	shop	Cave Girl#f_cave5	1_M_SIZ,712:-1
 
-cave,108,34,3	script	Cave Settler#f_cave6	979,{
+cave,108,34,3	script	Cave Settler#f_cave6	4_F_CAVE1,{
 	mes "[Cave Settler]";
 	mes "Hoho, did he really say that yesterday...?";
 	mes "Wah!";
@@ -4230,7 +4314,7 @@ cave,108,34,3	script	Cave Settler#f_cave6	979,{
 	close;
 }
 
-cave,105,32,7	script	Cave Settler#f_cave7	979,{
+cave,105,32,7	script	Cave Settler#f_cave7	4_F_CAVE1,{
 	mes "[Cave Settler]";
 	mes "Hoho, did he really say that yesterday...?";
 	mes "Wah!";
@@ -4245,7 +4329,7 @@ cave,105,32,7	script	Cave Settler#f_cave7	979,{
 
 // Succession of the Prince
 // ============================================================
-prontera,153,353,4	script	Messenger#prince1	105,{
+prontera,153,353,4	script	Messenger#prince1	8W_SOLDIER,{
 	if (nk_prince == 0) {
 		if (rebirth_moc_edq > 1) {
 			mes "[Messenger]";
@@ -4368,8 +4452,8 @@ prontera,153,353,4	script	Messenger#prince1	105,{
 	}
 }
 
-prt_castle,117,163,5	script	Inspector#prince	755,{
-	if (checkquest(10004) == 1) {
+prt_castle,117,163,5	script	Inspector#prince	4_M_SAGE_C,{
+	if (checkquest(10004) == 0 || checkquest(10004) == 1) {
 		mes "[Inspector]";
 		mes "Judge!";
 		mes "How goes it? I don't think it is easy to meet seven candidates and appraise them.";
@@ -4408,7 +4492,7 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 		setquest 10022;
 		close;
 	}
-	if (nk_prince == 1) {
+	if (nk_prince < 2) {
 		mes "[Inspector]";
 		mes "What's wrong with you?";
 		mes "This is not an open area!";
@@ -4421,6 +4505,12 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 			warp "prontera",155,353;
 			end;
 		case 2:
+			if (nk_prince == 0) {
+				mes "[Inspector]";
+				mes "I don't think";
+				mes "that he is an experienced appraiser...";
+				close;
+			}
 			mes "[Inspector]";
 			mes "......";
 			next;
@@ -5153,7 +5243,7 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 		mes "How is it going?";
 		mes "Grading someone is not a piece of cake. It's real hard work indeed. You do the hard work for our country.";
 		next;
-		if ((nkprince_eisen == 15) && (checkquest(10025) == 1)) {
+		if ((nkprince_eisen == 15) && (checkquest(10025) == 0 || checkquest(10025) == 1)) {
 			mes "-I tell him about the Ahrum and Ernst accident.-";
 			next;
 			mes "[Inspector]";
@@ -5178,23 +5268,20 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 			mes "[Inspector]";
 			mes "So, keep up the good work.";
 			mes "For the Kingdom of Rune Midgarts!";
-			if ((BaseLevel > 80) && (BaseLevel < 86)) {
-				getexp 40000,0;
-			}
-			else if ((BaseLevel > 85) && (BaseLevel < 91)) {
-				getexp 45000,0;
-			}
-			else if ((BaseLevel > 90) && (BaseLevel < 96)) {
-				getexp 50000,0;
-			}
-			else if ((BaseLevel > 95) && (BaseLevel < 150)) {
-				getexp 55000,0;
-			}
-			else if (BaseLevel == 150) {
-				getexp 110000,0;
-			}
-			else {
-				getexp 30000,0;
+			if (checkre(3)) {
+				if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 40000,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 45000,0;
+				else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 50000,0;
+				else if ((BaseLevel > 95) && (BaseLevel < 99)) getexp 55000,0;
+				else if (BaseLevel > 99) getexp 110000,0;
+				else getexp 30000,0;
+			} else {
+				if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 400000,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 450000,0;
+				else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 500000,0;
+				else if ((BaseLevel > 95) && (BaseLevel < 99)) getexp 550000,0;
+				else if (BaseLevel >= 99) getexp 1100000,0;
+				else getexp 300000,0;
 			}
 			set nk_prince,8;
 			completequest 10025;
@@ -5216,23 +5303,53 @@ prt_castle,117,163,5	script	Inspector#prince	755,{
 		mes "[Inspector]";
 		mes "Hello, appraiser.";
 		mes "I hope you are able to finish your mission perfectly. Have you met with all the princes, like I told you to?";
+		if (nkprince_eisen != 10)
+			close;
 		next;
 		switch(select("Yes.:No.")) {
 		case 1:
-			mes "[Inspector]";
-			mes "Very well.";
-			mes "I like hearing about the princes.";
+			set .@prin1,checkquest(10005);
+			set .@prin2,checkquest(10006);
+			set .@prin3,checkquest(10007);
+			set .@prin4,checkquest(10008);
+			set .@prin5,checkquest(10009);
+			set .@prin6,checkquest(10010);
+			set .@prin7,checkquest(10011);
+			if (.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7 == 14) {
+				mes "[Inspector]";
+				mes "Very well.";
+				mes "I like hearing about the princes.";
+				completequest 10004;
+				setquest 10004;
+			} else {
+				mes "[Inspector]";
+				mes "Are you sure?";
+				mes "Please check on all the princes.";
+			}
 			close;
 		case 2:
-			mes "[Inspector]";
-			mes "Don't be coy. I'm sure you have done it already.";
+			set .@prin1,checkquest(10005);
+			set .@prin2,checkquest(10006);
+			set .@prin3,checkquest(10007);
+			set .@prin4,checkquest(10008);
+			set .@prin5,checkquest(10009);
+			set .@prin6,checkquest(10010);
+			set .@prin7,checkquest(10011);
+			if (.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7 == 14) {
+				mes "[Inspector]";
+				mes "Don't be coy. I'm sure you have done it already.";
+				completequest 10004;
+				setquest 10004;
+			} else {
+				mes "[Inspector]";
+				mes "My investigations on all the princes are done.";
+			}
 			close;
 		}
-		close;
 	}
 }
 
-prt_castle,272,375,4	script	Prince	881,{
+prt_castle,272,375,4	script	Prince	4_M_SITDOWN,{
 	if (nk_prince > 6) {
 		mes "-Obssessed with making";
 		mes "lock and key.-";
@@ -5244,7 +5361,7 @@ prt_castle,272,375,4	script	Prince	881,{
 		mes "But he insists me to be corrupted, knowing how it would be...";
 		close;
 	}
-	else if (checkquest(10020) == 1) {
+	else if (checkquest(10020) == 0 || checkquest(10020) == 1) {
 		mes "[Erich]";
 		mes "These days, I have bad luck... Only harrassments happen to me...";
 		close;
@@ -5299,7 +5416,7 @@ prt_castle,272,375,4	script	Prince	881,{
 	}
 }
 
-prt_castle,274,372,4	script	Servant#hans	48,{
+prt_castle,274,372,4	script	Servant#hans	1_M_02,{
 	if (checkquest(10020) == 2) {
 		mes "[Hans]";
 		mes "Ahh... mmm... I...";
@@ -5310,7 +5427,7 @@ prt_castle,274,372,4	script	Servant#hans	48,{
 		mes "My prince didn't do anything wrong but, anyways, I apologize for anything to you!";
 		close;
 	}
-	else if (checkquest(10020) == 1) {
+	else if (checkquest(10020) == 0 || checkquest(10020) == 1) {
 		mes "Incessantly...-";
 		mes "-He has jitters whenever I react to him. His actions give me a feeling of pity.-";
 		close;
@@ -5383,7 +5500,7 @@ prt_castle,274,372,4	script	Servant#hans	48,{
 	}
 }
 
-prt_castle,339,202,3	script	Prince#urgen	989,{
+prt_castle,339,202,3	script	Prince#urgen	4_M_4THPRIN1,{
 	if (nk_prince > 6) {
 		mes "[Urugen]";
 		mes "...It is not beautiful.";
@@ -5398,7 +5515,7 @@ prt_castle,339,202,3	script	Prince#urgen	989,{
 		mes "My beautiful body isn't in perfect condition right now. I don't want to show it to anyone today.";
 		close;
 	}
-	else if (checkquest(10021) == 1) {
+	else if (checkquest(10021) == 0 || checkquest(10021) == 1) {
 		mes "[Urugen]";
 		mes "...What? What did you...";
 		mes "just say to me?... Huh?";
@@ -5486,7 +5603,7 @@ prt_castle,339,202,3	script	Prince#urgen	989,{
 	}
 }
 
-prt_castle,289,201,3	script	Prince#helmut	991,{
+prt_castle,289,201,3	script	Prince#helmut	4_M_5THPRIN1,{
 	if (nk_prince > 6) {
 		mes "[Helmut]";
 		mes "Such an idiot. I should have killed him earlier. Now I feel relieved.";
@@ -5499,7 +5616,7 @@ prt_castle,289,201,3	script	Prince#helmut	991,{
 		mes "How can I deal with this stress? Damn! Hell!";
 		close;
 	}
-	else if (checkquest(10022) == 1) {
+	else if (checkquest(10022) == 0 || checkquest(10022) == 1) {
 		mes "-He is so blushed,";
 		mes "evidently shown on his face.-";
 		close;
@@ -5667,7 +5784,7 @@ prt_castle,289,201,3	script	Prince#helmut	991,{
 	}
 }
 
-prt_castle,288,208,4	script	Calbern	962,{
+prt_castle,288,208,4	script	Calbern	4_M_RUSCHILD,{
 	mes "[Calbern]";
 	mes "How are you doing, sir?";
 	mes "I am the servant of Prince Helmut...";
@@ -5683,7 +5800,7 @@ prt_castle,288,208,4	script	Calbern	962,{
 	close;
 }
 
-prt_castle,391,205,3	script	Prince#poe	993,{
+prt_castle,391,205,3	script	Prince#poe	4_M_6THPRIN1,{
 	if (nk_prince > 6) {
 		mes "[Poe]";
 		mes "Whatever the condition is, he is just a loser in the match of life.";
@@ -5694,7 +5811,7 @@ prt_castle,391,205,3	script	Prince#poe	993,{
 		mes "He gave up without any challenge. That's not what the man has to do. He is not as good as me. But okay. I am disappointed in him. Eigen Ahrum.";
 		close;
 	}
-	else if (checkquest(10018) == 1) {
+	else if (checkquest(10018) == 0 || checkquest(10018) == 1) {
 		mes "[Poe]";
 		mes "......";
 		close;
@@ -5907,7 +6024,7 @@ prt_castle,391,205,3	script	Prince#poe	993,{
 	}
 }
 
-prt_castle,364,375,4	script	Prince#peter	987,{
+prt_castle,364,375,4	script	Prince#peter	4_M_3RDPRIN1,{
 	if (nk_prince > 6) {
 		mes "[Peter]";
 		mes "Appraiser.";
@@ -5915,10 +6032,32 @@ prt_castle,364,375,4	script	Prince#peter	987,{
 		next;
 		switch(select("Yes, I saw her for you.:No, I don't want to.")) {
 		case 1:
+			if (checkquest(10014) == 0 || checkquest(10014) == 1) {
+				mes "[Peter]";
+				mes "I am glad that the girl liked it. Once I got cured, I wanted to go meet with her.";
+				next;
+				mes "[Peter]";
+				mes "Anyhow, thanks for your good work. I really feel sorry about bothering you with trifle things. This is my sense of gratitude. Don't feel so much burden and take this.";
+				completequest 10014;
+				getitem 644,1; //Gift_Box
+				close;
+			}
 			mes "[Peter]";
 			mes "Thinking about the little girl calms me. I still can't believe my eyes. My prince Ahrum who just passed away...~";
 			close;
 		case 2:
+			if (checkquest(10014) == 0 || checkquest(10014) == 1) {
+				mes "[Peter]";
+				mes "As you said.";
+				mes "I've heard that her life is like a flower when I lost it.";
+				mes "I will go see her on my own.";
+				next;
+				mes "[Peter]";
+				mes "I really feel sorry about bothering you with trifle things. Please take this.";
+				completequest 10014;
+				getitem 644,1; //Gift_Box
+				close;
+			}
 			mes "[Peter]";
 			mes "Never mind.";
 			mes "I still can't believe my eyes. My prince Ahrum who just passed away...~~";
@@ -5930,19 +6069,20 @@ prt_castle,364,375,4	script	Prince#peter	987,{
 		mes "Child... What the heck happened to you?...";
 		close;
 	}
-	else if (checkquest(10019)== 1) {
+	else if (checkquest(10019) == 0 || checkquest(10019) == 1) {
 		mes "[Peter]";
 		mes "......";
 		close;
 	}
 	if (checkquest(10008) == 2) {
-		if (checkquest(10014) == 2) {
+		set .@quest, checkquest(10014);
+		if (.@quest == 2) {
 			mes "[Peter]";
 			mes "I really appreciate it.";
 			mes "You are so kind.";
 			close;
 		}
-		else if (checkquest(10014) == 1) {
+		else if (.@quest == 0 || .@quest == 1) {
 			mes "[Peter]";
 			mes "I am glad that the girl liked it. Once I got cured, I wanted to go meet with her.";
 			next;
@@ -6067,10 +6207,9 @@ prt_castle,364,375,4	script	Prince#peter	987,{
 	}
 }
 
-aldebaran,132,184,3	script	Girl#prince	96,{
-	if (checkquest(10013) == 1) {
+aldebaran,132,184,3	script	Girl#prince	4W_KID,{
+	if (checkquest(10013) == 0 || checkquest(10013) == 1) {
 		if (countitem(744) > 0) {
-			// Missed
 			mes "[Girl]";
 			mes "Wooah, Uncle Peter sent these flowers";
 			mes "for me?";
@@ -6104,7 +6243,7 @@ aldebaran,132,184,3	script	Girl#prince	96,{
 	}
 }
 
-prt_castle,314,373,4	script	Prince#eisen	983,{
+prt_castle,314,373,4	script	Prince#eisen	4_M_1STPRIN1,{
 	if (nkprince_eisen > 2) {
 		if (nkprince_eisen == 3) {
 			mes "[Ahrum]";
@@ -6314,12 +6453,13 @@ prt_castle,314,373,4	script	Prince#eisen	983,{
 			close;
 		}
 		else if (nkprince_eisen == 14) {
+			mes "[Ernst]";
 			mes "Bbb... Brother?... You... told me ";
 			mes "you would kill me... You just wanted to be killed";
 			mes "by me?... Bbb...brother?...";
 			next;
 			mes "[Ahrum]";
-			mes "Huhu... Not at all. I just wanted to kill you... That's it... Good job, Ern... This is legal, self-defense; killing a villain... right?";
+			mes "Huhu... Not at all. I just wanted to kill you... That's it... Good job, Ern... This is legal self-defense, killing a villain... right?";
 			next;
 			mes "[Ernst]";
 			mes "B..Brother... even now it is not too late! If you go to a medic, you can be restored!";
@@ -6557,7 +6697,7 @@ prt_castle,314,373,4	script	Prince#eisen	983,{
 	}
 }
 
-prt_castle,368,312,4	script	Prince#ern	985,{
+prt_castle,368,312,4	script	Prince#ern	4_M_2NDPRIN1,{
 	if (checkquest(10024) == 2) {
 		mes "[Ernst]";
 		mes "...brother, if you want...";
@@ -6565,7 +6705,7 @@ prt_castle,368,312,4	script	Prince#ern	985,{
 		mes "I don't want to see anyone.";
 		close;
 	}
-	else if (checkquest(01024) == 1) {
+	else if (checkquest(10024) == 0 || checkquest(10024) == 1) {
 		mes "[Ernst]";
 		mes "...Brother Ahrum...";
 		close;
@@ -6754,8 +6894,8 @@ prt_castle,163,319,0	script	#twonoble	-1,3,3,{
 //OnTouch2:
 OnTouch:
 	if (nkprince_eisen == 7) {
-		donpcevent "Aged Noble 1#valter::OnEnable";
-		donpcevent "Aged Noble 2#rihart::OnEnable";
+		donpcevent "Young Noble#valter::OnEnable";
+		donpcevent "Aged Noble#rihart::OnEnable";
 		mes "[Aged Noble]";
 		mes "You don't have to worry.";
 		mes "Once my Eigen Ahrum is chosen to be king, the Richard family will be a second magnate.";
@@ -6810,8 +6950,8 @@ OnTouch:
 		next;
 		mes "[A man of Riehart Family]";
 		mes "Never mind...";
-		donpcevent "Aged Noble 1#valter::OnDisable";
-		donpcevent "Aged Noble 2#rihart::OnDisable";
+		donpcevent "YoungNoble#valter::OnDisable";
+		donpcevent "Aged Noble#rihart::OnDisable";
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "(Walter is the name of Ahrum.";
@@ -6825,45 +6965,45 @@ OnTouch:
 	}
 }
 
-prt_castle,156,325,4	script	Aged Noble 1#valter	86,{
-	mes "[Aged Noble]";
+prt_castle,156,325,4	script	Young Noble#valter	4_M_04,{
+	mes "[Young Noble Walter]";
 	mes "Step aside.";
 	mes "How dare you talk to him.";
 	close;
 
 OnInit:
-	disablenpc "Aged Noble 1#valter";
+	disablenpc "Young Noble#valter";
 	end;
 
 OnEnable:
-	enablenpc "Aged Noble 1#valter";
+	enablenpc "Young Noble#valter";
 	end;
 
 OnDisable:
-	disablenpc "Aged Noble 1#valter";
+	disablenpc "Young Noble#valter";
 	end;
 }
 
-prt_castle,157,323,3	script	Aged Noble 2#rihart	880,{
-	mes "[Aged Noble]";
+prt_castle,157,323,3	script	Aged Noble#rihart	4_M_MASKMAN,{
+	mes "[Aged Noble Richard]";
 	mes "Hmm-hmm.";
 	mes "What an indecorous person!";
 	close;
 
 OnInit:
-	disablenpc "Aged Noble 2#rihart";
+	disablenpc "Aged Noble#rihart";
 	end;
 
 OnEnable:
-	enablenpc "Aged Noble 2#rihart";
+	enablenpc "Aged Noble#rihart";
 	end;
 
 OnDisable:
-	disablenpc "Aged Noble 2#rihart";
+	disablenpc "Aged Noble#rihart";
 	end;
 }
 
-prt_castle,314,371,0	script	Prince#another_ern	985,{
+prt_castle,314,371,0	script	Prince#another_ern	4_M_2NDPRIN1,{
 	if (nkprince_eisen == 13) {
 		mes "[Ahrum]";
 		mes "I told you that I don't want to be king, and I don't have any intention to change my mind!";
@@ -7012,7 +7152,7 @@ OnDisable:
 	end;
 }
 
-prt_castle,314,372,0	script	Prince#another_ern1	985,{
+prt_castle,314,372,0	script	Prince#another_ern1	4_M_2NDPRIN1,{
 	if (nkprince_eisen == 14) {
 		mes "[Ernst]";
 		mes "Bbb... Brother?... You... told me you would kill me... You just wanted to be killed by me??... Bbb...brother?...";
@@ -7117,7 +7257,7 @@ OnDisable:
 	end;
 }
 
-prt_castle,272,372,1	script	Prince#eisen1	983,{
+prt_castle,272,372,1	script	Prince#eisen1	4_M_1STPRIN1,{
 	mes "[Ahrum]";
 	mes "Moron. You'll never be a king. All throughout your life... Don't you know it? Such a junk addict!!";
 	next;
@@ -7175,7 +7315,7 @@ OnDisable:
 	end;
 }
 
-prt_castle,336,202,7	script	Prince#eisen2	983,{
+prt_castle,336,202,7	script	Prince#eisen2	4_M_1STPRIN1,{
 	mes "[Urugen]";
 	mes "What did you say? Ahrum?";
 	mes "Hey! What did you just say to me? Ahrum?!";
@@ -7233,7 +7373,7 @@ OnDisable:
 	end;
 }
 
-prt_castle,286,201,7	script	Prince#eisen3	983,{
+prt_castle,286,201,7	script	Prince#eisen3	4_M_1STPRIN1,{
 	mes "[Ahrum]";
 	mes "Military maniac! Jerk! Do you think power can solve everything? In all situations, do you think people can live peacefully?!";
 	next;
@@ -7288,7 +7428,7 @@ OnDisable:
 	end;
 }
 
-prt_castle,388,205,6	script	Prince#eisen4	983,{
+prt_castle,388,205,6	script	Prince#eisen4	4_M_1STPRIN1,{
 	mes "[Ahrum]";
 	mes "You always care about gambling. But, why don't you care about your surrondings first, eh? Young master of Richard?";
 	next;
@@ -7352,7 +7492,7 @@ OnDisable:
 	end;
 }
 
-prt_castle,364,372,1	script	Prince#eisen5	983,{
+prt_castle,364,372,1	script	Prince#eisen5	4_M_1STPRIN1,{
 	mes "[Ahrum]";
 	mes "Peter, what will you do if your work doesn't mean anything?";
 	next;
@@ -7416,7 +7556,7 @@ OnDisable:
 	end;
 }
 
-prt_castle,368,310,1	script	Prince#eisen6	983,{
+prt_castle,368,310,1	script	Prince#eisen6	4_M_1STPRIN1,{
 	mes "[Ernst]";
 	mes "Bro, tell me again. You just said something?";
 	next;
@@ -7503,7 +7643,7 @@ OnDisable:
 	end;
 }
 
-prt_castle,318,276,0	script	#eisen	45,1,1,{
+prt_castle,318,276,0	script	#eisen	WARPNPC,1,1,{
 OnTouch:
 	if ((nkprince_eisen == 4) || (nkprince_eisen == 5)) {
 		donpcevent "Prince#another_ern::OnEnable";
@@ -7595,54 +7735,54 @@ OnTouch:
 	end;
 }
 
-prt_castle,336,276,0	script	#ern	45,1,1,{
+prt_castle,336,276,0	script	#ern	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10023) == 1) {
+	if (checkquest(10023) == 0 || checkquest(10023) == 1) {
 		donpcevent "Prince#eisen6::OnEnable";
 	}
 	warp "prt_castle",368,308;
 	end;
 }
 
-prt_castle,300,276,0	script	#erich	45,1,1,{
+prt_castle,300,276,0	script	#erich	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10020) == 1) {
+	if (checkquest(10020) == 0 || checkquest(10020) == 1) {
 		donpcevent "Prince#eisen1::OnEnable";
 	}
 	warp "prt_castle",274,368;
 	end;
 }
 
-prt_castle,330,271,0	script	#helmut	45,1,1,{
+prt_castle,330,271,0	script	#helmut	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10022) == 1) {
+	if (checkquest(10022) == 0 || checkquest(10022) == 1) {
 		donpcevent "Prince#eisen3::OnEnable";
 	}
 	warp "prt_castle",290,208;
 	end;
 }
 
-prt_castle,348,271,0	script	#poe	45,1,1,{
+prt_castle,348,271,0	script	#poe	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10018) == 1) {
+	if (checkquest(10018) == 0 || checkquest(10018) == 1) {
 		donpcevent "Prince#eisen4::OnEnable";
 	}
 	warp "prt_castle",390,208;
 	end;
 }
 
-prt_castle,354,276,0	script	#peter	45,1,1,{
-OnTouch:;
-	if (checkquest(10019) == 1) {
+prt_castle,354,276,0	script	#peter	WARPNPC,1,1,{
+OnTouch:
+	if (checkquest(10019) == 0 || checkquest(10019) == 1) {
 		donpcevent "Prince#eisen5::OnEnable";
 	}
 	warp "prt_castle",366,368;
 	end;
 }
 
-prt_castle,310,271,0	script	#urgen	45,1,1,{
+prt_castle,310,271,0	script	#urgen	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10021) == 1) {
+	if (checkquest(10021) == 0 || checkquest(10021) == 1) {
 		donpcevent "Prince#eisen2::OnEnable";
 	}
 	warp "prt_castle",340,208;
@@ -7665,7 +7805,7 @@ prt_castle,225,318,0	warp	#room12	1,1,prt_castle,276,263
 prt_castle,273,264,0	warp	#room22	1,1,prt_castle,221,318
 prt_castle,221,308,0	warp	#princeout	1,1,prt_castle,176,167
 
-prt_castle,176,170,5	script	Guard#princein	105,{
+prt_castle,176,170,5	script	Guard#princein	8W_SOLDIER,{
 	if (nk_prince > 4) {
 		mes "[Guard of a strange place]";
 		mes "You can go to the room where princes gather, through the hidden door. For security reasons, it is totally guarded and hidden.";
@@ -7683,7 +7823,7 @@ prt_castle,176,170,5	script	Guard#princein	105,{
 	}
 }
 
-prt_castle,121,168,0	script	#arm	111,4,4,{
+prt_castle,121,168,0	script	#arm	HIDDEN_NPC,4,4,{
 //OnTouch2:
 OnTouch:
 	if (nk_prince == 8) {
@@ -7704,7 +7844,7 @@ OnTouch:
 	}
 }
 
-prt_castle,316,313,0	script	#arm1	111,3,3,{
+prt_castle,316,313,0	script	#arm1	HIDDEN_NPC,3,3,{
 //OnTouch2:
 OnTouch:
 	if (nkprince_eisen > 14) {
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index bf6177bed..685010f1a 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -1,16 +1,16 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Moscovia Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
-//= 2.0a
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
+//===== Description: =========================================
 //= Quests for Moscovia.
 //= The Moving Island, Help Mikhail, Acorn Exchange,
 //= Banish Winter, Shafka Hat, Koshei the Immortal.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [Kisuka]
 //= 1.1 Small fixes on The Moving Island. [Kisuka]
 //= 1.2 Fixed a "player not attached" error. [brianluau]
@@ -23,16 +23,19 @@
 //= 1.9 Corrected NPC counting mobs for the wrong NPC. (bugreport:4736) [L0ne_W0lf]
 //= 2.0 Optimized. [Joseph]
 //= 2.0a Bug fixes. [Euphy]
-//============================================================ 
+//= 2.0b Bug fixes. [Lemongrass]
+//= 2.1 Fixed incorrect use of 'close'. [Joseph]
+//= 2.2 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.3 Added GM management NPC. [Euphy]
+//============================================================
 
-//============================================================================
-// The Moving Island
-//============================================================================
+// The Moving Island :: mos_whale_edq
+//============================================================
 
 //----------------------------------------------------------------------------
 // Berbayeff - Starting Point
 //----------------------------------------------------------------------------
-moscovia,171,71,3	script	Berbayeff#npc	968,{
+moscovia,171,71,3	script	Berbayeff#npc	4_M_RUSMAN2,{
 	if (!mos_whale_edq) {
 		emotion e_an;
 		mes "[Berbayeff]";
@@ -248,7 +251,7 @@ moscovia,171,71,3	script	Berbayeff#npc	968,{
 //----------------------------------------------------------------------------
 // Bulletin Board - List Tide Times
 //----------------------------------------------------------------------------
-moscovia,135,52,0	script	Bulletin Board#npc	837,{
+moscovia,135,52,0	script	Bulletin Board#npc	2_BULLETIN_BOARD,{
 	mes "[Charabel Schedule]";
 	mes "NOTICE, due to the varying";
 	mes "tides here in Moscovia,";
@@ -268,8 +271,15 @@ moscovia,135,52,0	script	Bulletin Board#npc	837,{
 //----------------------------------------------------------------------------
 // Mr. Ibanoff - Docks
 //----------------------------------------------------------------------------
-moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
-	if (mos_whale_edq == 1 || mos_whale_edq == 2) {
+moscovia,135,49,5	script	Mr. Ibanoff#npc	4_M_RUSBALD,{
+	if (mos_whale_edq == 0) {
+		mes "[Mr. Ibanoff]";
+		mes "You are also an adventurer from another province. I also was a great adventurer.";
+		next;
+		mes "[Mr. Ibanoff]";
+		mes "Uf...I just want to be 20 years younger, so I can travel here and there with invigorating youth such as you... Time is an enemy. Hahahahaha!";
+		close;
+	} else if (mos_whale_edq == 1 || mos_whale_edq == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Hello. Are you Mr. Ibanoff?";
 		next;
@@ -741,13 +751,6 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		mes "You should ride a ship now? Let's ready to leave hurry up.";
 		set mos_whale_edq,19;
 		close;
-	} else {
-		mes "[Mr. Ibanoff]";
-		mes "You are also an adventurer from another province. I also was a great adventurer.";
-		next;
-		mes "[Mr. Ibanoff]";
-		mes "Uf...I just want to be 20 years younger, so I can travel here and there with invigorating youth such as you... Time is an enemy. Hahahahaha!";
-		close;
 	}
 	if ((gettime(3) >= 0 && gettime(3) < 3) || (gettime(3) >= 6 && gettime(3) < 9) || (gettime(3) >= 12 && gettime(3) < 15) || (gettime(3) >= 18 && gettime(3) < 21))  {
 		mes "[Mr. Ibanoff]";
@@ -777,7 +780,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 //----------------------------------------------------------------------------
 // Mr. Ibanoff - Ship
 //----------------------------------------------------------------------------
-mosk_ship,98,110,3	script	Mr. Ibanoff#npc2	964,{
+mosk_ship,98,110,3	script	Mr. Ibanoff#npc2	4_M_RUSBALD,{
 	if (mos_whale_edq == 4) {
 		mes "[Mr. Ibanoff]";
 		mes "What a time for sailing!";
@@ -980,7 +983,7 @@ S_D_2:
 //----------------------------------------------------------------------------
 // Rudder
 //----------------------------------------------------------------------------
-mosk_ship,101,111,4	script	rudder#ship	111,{
+mosk_ship,101,111,4	script	rudder#ship	HIDDEN_NPC,{
 	if (mos_whale_edq == 5) {
 		callsub S_Rud1,1,0;
 	} else if (mos_whale_edq == 4) {
@@ -1096,31 +1099,11 @@ mosk_ship,101,111,4	script	rudder#ship	111,{
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	} else if (mos_whale_edq == 22 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We should make sure to kill any";
-		mes "monsters onboard.";
-		close;
-	} else if (mos_whale_edq == 23 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We should make sure to kill any";
-		mes "monsters onboard.";
-		close;
-	} else if (mos_whale_edq == 25 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We should make sure to kill any";
-		mes "monsters onboard.";
-		close;
 	} else if (mos_whale_edq == 25 && $@mos1_edq == 0) {
 		mes "[Mr. Ibanoff]";
 		mes "You can adjust the rudder,";
 		mes "under my direction.";
 		close;
-	} else if (mos_whale_edq > 239 && mos_whale_edq < 250 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We should make sure to kill any";
-		mes "monsters onboard.";
-		close;
 	} else if (mos_whale_edq == 26) {
 		mes "[Mr. Ibanoff]";
 		mes "Hey! Listen to what I am saying.";
@@ -1165,9 +1148,9 @@ S_Rud1:
 			set $@mos1_edq,$@mos1_edq+1;
 			donpcevent "Baehideun3#ship::OnEnable";
 		}
-		set mos_whale_edq,(getarg(1) == 2)?((mos_whale_edq >= 241)?((.@r != 3)?26:25):((.@r != 3)?10:11)):mos_whale_edq + 1;			
+		set mos_whale_edq,(getarg(1) == 2)?((mos_whale_edq >= 241)?((.@r != 3)?26:25):((.@r != 3)?10:11)):mos_whale_edq + 1;
 		close;
-	}	
+	}
 	mes "[Mr. Ibanoff]";
 	mes "I said that we should go "+.@d$[getarg(0)]+"!";
 	mes "You should sail in the right";
@@ -1183,13 +1166,13 @@ S_Rud1:
 			donpcevent "Baehideun1#ship::OnEnable";
 		}
 	}
-	close;	
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Aged Stranger - Whale Island
 //----------------------------------------------------------------------------
-mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
+mosk_fild01,86,104,3	script	Aged Stranger#npc	4_M_GUSLIMAN,{
 	if ((MaxWeight-Weight) < 2000) {
 		mes "[Aged Stranger]";
 		mes "You're carrying too many items.";
@@ -1503,7 +1486,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 			mes "This is a traditional instrument";
 			mes "which comes from a faraway land of";
 			mes "the ancestors of Moscovia.";
-			getitem 2707,1;
+			getitem GUSLI, 1;
 			set mos_whale_edq,35;
 			next;
 			mes "[Aged Stranger]";
@@ -1528,7 +1511,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 		mes "Are you ready to learn the Gusli?";
 		mes "Please equip the Gusli.";
 		next;
-		if(getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) {
+		if (getequipid(EQI_ACC_L) == GUSLI || getequipid(EQI_ACC_R) == GUSLI) {
 			mes "[Aged Stranger]";
 			mes "Hm... Very well.";
 			mes "At first, look at me how I play,";
@@ -1555,7 +1538,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 			mes "[Aged Stranger]";
 			mes "Okay, it's time for your turn. Play it. Play the song that I played.";
 			next;
-			callsub S_AS_1;		
+			callsub S_AS_1;
 		}
 		mes "[Aged Stranger]";
 		mes "Um... Your preparations are not";
@@ -1571,7 +1554,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 		mes "[Aged Stranger]";
 		mes "Are you ready to learn the Gusli?";
 		next;
-		if(getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) {
+		if (getequipid(EQI_ACC_L) == GUSLI || getequipid(EQI_ACC_R) == GUSLI) {
 			mes "[Aged Stranger]";
 			mes "Um... You did well.";
 			next;
@@ -1652,7 +1635,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 			warp "mosk_fild02",204,54;
 			end;
 		}
-	}else{
+	} else {
 		mes "[Aged Stranger]";
 		mes "Long time, no see!";
 		mes "You probably like the island, don't you?";
@@ -1727,7 +1710,7 @@ S_AS_2:
 	mes "So, what will you do now?";
 	next;
 	switch (select("How would I get back here?:"+((getarg(0))?"I want to learn the Gusli":"")+":Go back to the mainland.")) {
-		Case 1:
+		case 1:
 			mes "[Aged Stranger]";
 			mes "You are my friend now,";
 			mes "and you have this instrument.";
@@ -1752,7 +1735,7 @@ S_AS_2:
 			mes "with this island. Only if you are a";
 			mes "friend... heheh.";
 			close;
-		Case 2:
+		case 2:
 			mes "[Aged Stranger]";
 			mes "You really want to...";
 			mes "learn this instrument...";
@@ -1774,8 +1757,8 @@ S_AS_2:
 			mes "Okay. If you are ready to play the";
 			mes "Gusli, let me know.";
 			set mos_whale_edq,36;
-			close;	
-		Case 3:
+			close;
+		case 3:
 			mes "[Aged Stranger]";
 			mes "I see. Okay, let's go.";
 			next;
@@ -1825,7 +1808,7 @@ S_AS_3:
 //----------------------------------------------------------------------------
 // Csar Alexsay III - Moscovia Palace
 //----------------------------------------------------------------------------
-mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
+mosk_in,131,92,3	script	Csar Alexsay III#npc	4_M_RUSKING,{
 	if ((MaxWeight-Weight) < 2000) {
 		mes "[Csar Alexsay III]";
 		mes "You're carrying too many items.";
@@ -2022,7 +2005,7 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 		mes "Stay here as long as you want, and";
 		mes "enjoy yourself to the fullest this summer.";
 		close;
-	} if (mos_whale_edq < 16) {
+	} else if (mos_whale_edq < 16) {
 		mes "[Csar Alexsay III]";
 		mes "Welcome to Moscovia!";
 		mes "I am the ruler, Csar Aleksay III, of Moscovia.";
@@ -2033,7 +2016,7 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 	} else if (mos_whale_edq == 16) {
 		mes "[Csar Alexsay III]";
 		mes "A foreign traveler...?";
-		mes " Do you have something to tell me?";
+		mes "Do you have something to tell me?";
 		next;
 		mes "[Csar Alexsay III]";
 		mes "If it is not important,";
@@ -2142,7 +2125,7 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 		mes "A Gooselri? Which only exists";
 		mes "in the whale island? Let's see.";
 		next;
-		if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707) > 0) {
+		if (countitem(GUSLI) > 0) {
 			mes "[Csar Alexsay III]";
 			mes "Oh... Is this instrument... a Gooselri?";
 			next;
@@ -2206,8 +2189,8 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 				next;
 				mes "[Prime Minister Dmitree]";
 				mes "Even though I regard as your effort for the time so, award you. Take it and go out.";
-				getitem 12702,1;
-				getexp 50000,0;
+				getitem 12702,1; //Old_Bleu_Box
+				getexp (checkre(3))?50000:500000,0;
 				set mos_whale_edq,39;
 				close;
 			}
@@ -2234,8 +2217,8 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 			next;
 			mes "[Prime Minister Dmitree]";
 			mes "Even though I regard as your effort for the time so, award you. Take it.";
-			getitem 12702,1;
-			getexp 70000,0;
+			getitem 12702,1; //Old_Bleu_Box
+			getexp (checkre(3))?70000:700000,0;
 			set mos_whale_edq,40;
 			close;
 		}
@@ -2252,7 +2235,7 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 		mes "something to satisfy me";
 		mes "at the whale island?";
 		next;
-		if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707)) {
+		if (countitem(GUSLI) > 0) {
 			mes "[Csar Alexsay III]";
 			mes "Oh... Is this instrument... a Gooselri?";
 			next;
@@ -2316,8 +2299,8 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 			mes "of our dear Csar and all the people";
 			mes "in his palace. I will reward your";
 			mes "efforts, in the name of the Csar.";
-			getitem 617,1;
-			getexp 120000,0;
+			getitem 617,1; //Old_Violet_Box
+			getexp (checkre(3))?100000:1200000,0;
 			set mos_whale_edq,41;
 			close;
 		}
@@ -2360,7 +2343,7 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 //----------------------------------------------------------------------------
 // Prime Minister Dmitree - Moscovia Palace
 //----------------------------------------------------------------------------
-mosk_in,127,89,3	script	Prime Minister Dmitree#m	967,{
+mosk_in,127,89,3	script	Prime Minister Dmitree#m	4_M_RUSMAN1,{
 	if (mos_nowinter > 11 && mos_nowinter < 14) {
 		mes "[Prime Minister Dmitree]";
 		mes "You are in trouble if";
@@ -2484,7 +2467,7 @@ mosk_in,127,89,3	script	Prime Minister Dmitree#m	967,{
 //----------------------------------------------------------------------------
 // Island Trigger - Docks
 //----------------------------------------------------------------------------
-moscovia,136,46,4	script	Find#ship	844,4,4,{
+moscovia,136,46,4	script	Find#ship	CLEAR_NPC,4,4,{
 	end;
 
 OnTouch:
@@ -2497,7 +2480,7 @@ OnTouch:
 	mes "Stop by the whale island?";
 	next;
 	if(select("Go to Whale Island.:Stay put.") == 1) {
-		if (getequipid(EQI_ACC_L) == 2707 || getequipid(EQI_ACC_R) == 2707) {
+		if (getequipid(EQI_ACC_L) == GUSLI || getequipid(EQI_ACC_R) == GUSLI) {
 			soundeffect "mos_gusli2.wav",0;
 			mes "-Slowly, your hands are on the";
 			mes "Gusli, and the playing starts...";
@@ -2515,7 +2498,7 @@ OnTouch:
 			mes "island...!!! Someday, I hope to go there! Hahaha.";
 			next;
 			warp "mosk_fild01",95,93;
-		}else{
+		} else {
 			mes "["+strcharinfo(0)+"]";
 			mes "Oh my goodness... Slipped right out";
 			mes "of my mind... to forget equipping the Gusli.";
@@ -2543,7 +2526,7 @@ OnInit:
 	end;
 }
 
-mosk_ship,81,110,0	script	#findship	844,5,5,{
+mosk_ship,81,110,0	script	#findship	CLEAR_NPC,5,5,{
 OnInit:
 	disablenpc "#findship";
 	stopnpctimer;
@@ -2597,10 +2580,10 @@ OnEnable:
 	enablenpc strnpcinfo(0);
 	set .@c,charat(strnpcinfo(0),9);
 	switch (.@c) {
-		Case 1: setarray .@m, 89,112,1425,85,110,1425; break;
-		Case 2: setarray .@m, 89,112,1425,80,110,1426,83,114,1426,85,110,1425; break;
-		Case 3: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
-		Case 4: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
+		case 1: setarray .@m, 89,112,1425,85,110,1425; break;
+		case 2: setarray .@m, 89,112,1425,80,110,1426,83,114,1426,85,110,1425; break;
+		case 3: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
+		case 4: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
 	}
 	for (set .@i, 0; .@i < getarraysize(.@m); set .@i, .@i + 3)
 		monster "mosk_ship",.@m[.@i],.@m[.@i+1],"Sea Monster",.@m[.@i+2],1,strnpcinfo(0)+"::OnMyMobDead";
@@ -2622,10 +2605,10 @@ OnMyMobDead:
 		mes "normally.";
 		set .@c,charat(strnpcinfo(0),9);
 		switch (.@c) {
-			Case 1: break;
-			Case 2: break;
-			Case 3: set mos_whale_edq,11; break;
-			Case 4: set mos_whale_edq,26; break;
+			case 1: break;
+			case 2: break;
+			case 3: set mos_whale_edq,11; break;
+			case 4: set mos_whale_edq,26; break;
 		}
 		donpcevent strnpcinfo(0)+"::OnDisable";
 		close;
@@ -2643,9 +2626,8 @@ mosk_ship,3,3,4	duplicate(Baehideun#main)	Baehideun2#ship	-1
 mosk_ship,5,5,4	duplicate(Baehideun#main)	Baehideun3#ship	-1
 mosk_ship,15,15,4	duplicate(Baehideun#main)	Baehideun4#ship	-1
 
-//============================================================================
-// Help Mikhail
-//============================================================================
+// Help Mikhail :: mos_swan & mos_swan_pt2
+//============================================================
 
 //----------------------------------------------------------------------------
 // Gallina - Starting Point
@@ -2723,7 +2705,7 @@ function	script	F_MOS_1	{
 	close;
 }
 
-mosk_in,144,279,5	script	Gallina#mos	959,{
+mosk_in,144,279,5	script	Gallina#mos	4_F_RUSWOMAN1,{
 	if (!mos_swan) {
 		callfunc("F_MOS_1");
 	} else if (mos_swan == 1) {
@@ -2774,7 +2756,7 @@ mosk_in,144,279,5	script	Gallina#mos	959,{
 		mes "Well, now I have to get to work!";
 		mes "I'll make you my hotcakes someday. Please visit me later";
 		set mos_swan,100;
-		getexp 100000,0;
+		getexp (checkre(3))?90000:1000000,0;
 		close;
 	}
 	mes "[Gallina]";
@@ -2787,7 +2769,7 @@ mosk_in,144,279,5	script	Gallina#mos	959,{
 //----------------------------------------------------------------------------
 // Anna - Sister
 //----------------------------------------------------------------------------
-mosk_in,148,274,1	script	Anna#mos	958,{
+mosk_in,148,274,1	script	Anna#mos	4_F_RUSCHILD,{
 	if (!mos_swan) {
 		callfunc("F_MOS_1");
 	} else if (mos_swan == 1) {
@@ -2806,11 +2788,11 @@ mosk_in,148,274,1	script	Anna#mos	958,{
 					mes "Where is Mikhail?";
 					mes "Do you know where he is?";
 					next;
-					emotion 39;
+					emotion e_meh;
 					mes "[Anna]";
 					mes "If I had known that, I would have already found him, you fool.";
 					next;
-					emotion 4,1;
+					emotion e_swt,1;
 					mes "["+strcharinfo(0)+"]";
 					mes "Hahaha, you're right.";
 					next;
@@ -2876,7 +2858,7 @@ mosk_in,148,274,1	script	Anna#mos	958,{
 					mes "["+strcharinfo(0)+"]";
 					mes "Is there anyone who is close to him?";
 					next;
-					emotion 32;
+					emotion e_pif;
 					mes "[Anna]";
 					mes "(giggle) He's a fool and has no friends.";
 					mes "But among our villagers, the lady of ^3131FFInn 'Sticky Herb Tree'^000000 has held Mikhail dear.";
@@ -2969,7 +2951,7 @@ mosk_in,148,274,1	script	Anna#mos	958,{
 //----------------------------------------------------------------------------
 // Bed
 //----------------------------------------------------------------------------
-mosk_in,136,279,3	script	Bed#mos1	111,{
+mosk_in,136,279,3	script	Bed#mos1	HIDDEN_NPC,{
 	mes "- There are sheets and a pillow which seem so neat and soft that I'll probably fall asleep as soon as I lie down on them. -";
 	if (mos_swan != 11) close;
 	next;
@@ -2980,7 +2962,7 @@ mosk_in,136,279,3	script	Bed#mos1	111,{
 	mes "- You come near the bed to look it over. -";
 	next;
 	while (.@c < 2) {
-		for (set .@i, 0; .@i < 4; set .@i, .@i + 1) 
+		for (set .@i, 0; .@i < 4; set .@i, .@i + 1)
 			mes " .............. ";
 		set .@c, .@c + 1;
 		next;
@@ -2989,12 +2971,12 @@ mosk_in,136,279,3	script	Bed#mos1	111,{
 	close;
 }
 
-mosk_in,161,279,3	duplicate(Bed#mos1)	Bed#mos2	111
+mosk_in,161,279,3	duplicate(Bed#mos1)	Bed#mos2	HIDDEN_NPC
 
 //----------------------------------------------------------------------------
 // Fire pot + Mikhail
 //----------------------------------------------------------------------------
-mosk_in,205,268,3	script	Fire pot#mos	111,{
+mosk_in,205,268,3	script	Fire pot#mos	HIDDEN_NPC,{
 	if (!mos_swan) {
 		mes "- It's a fire pot to heat the room or bake something -";
 		close;
@@ -3019,7 +3001,7 @@ mosk_in,205,268,3	script	Fire pot#mos	111,{
 		mes "- You come near the pot to look it over. -";
 		next;
 		while (.@c < 2) {
-			for (set .@i, 0; .@i < 4; set .@i, .@i + 1) 
+			for (set .@i, 0; .@i < 4; set .@i, .@i + 1)
 				mes " .............. ";
 			set .@c, .@c + 1;
 			next;
@@ -3175,7 +3157,7 @@ mosk_in,205,268,3	script	Fire pot#mos	111,{
 	close;
 }
 
-mosk_in,202,269,5	script	Mikhail#mos	962,{
+mosk_in,202,269,5	script	Mikhail#mos	4_M_RUSCHILD,{
 	end;
 OnInit:
 OnEnable:
@@ -3186,7 +3168,7 @@ OnEnable:
 //----------------------------------------------------------------------------
 // Sticky Herb Tree Inn NPCs
 //----------------------------------------------------------------------------
-mosk_in,135,191,5	script	Landlord#mos	961,{
+mosk_in,135,191,5	script	Landlord#mos	4_F_RUSWOMAN3,{
 	mes "[Landlord]";
 	mes "Oh, welcome to the Inn 'Sticky Herb Tree'.";
 	mes "It is the most comfortable and calmest place in all of Moscovia.";
@@ -3205,7 +3187,7 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 					mes "Ok, I'll bring you the best room.";
 					mes "Please have a rest, young adventurer.";
 					close2;
-					set Zeny,Zeny-5000;
+					Zeny -= 5000;
 					percentheal 100,100;
 					warp "mosk_in",215,181;
 					end;
@@ -3216,13 +3198,13 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 				close;
 			case 3:
 				mes "[Landlord]";
-				emotion 3;
-				mes "Oh~! You look great! Look at the "+((sex)?"solid muscle":"fair skin")+"!";
+				emotion e_lv;
+				mes "Oh~! You look great! Look at the "+((Sex)?"solid muscle":"fair skin")+"!";
 				mes "But you look tired. Is it because of a long journey?";
 				next;
 				mes "[Landlord]";
-				mes "We've got a room available just for you. "+((sex)?"It's the best in town. How about staying the night?":"It's like a princess' room.");
-				mes (sex)?"I'll charge you at reasonable price for you, handsome guy.":"How about staying the night? I'll mark down the price for you, beautiful lady.";
+				mes "We've got a room available just for you. "+((Sex)?"It's the best in town. How about staying the night?":"It's like a princess' room.");
+				mes (Sex)?"I'll charge you at reasonable price for you, handsome guy.":"How about staying the night? I'll mark down the price for you, beautiful lady.";
 				next;
 				mes "["+strcharinfo(0)+"]";
 				mes "Oh, I'm sorry but I didn't come to stay here.";
@@ -3241,7 +3223,7 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 				mes "If you promise me to stay overnight, I'll tell you about what you want to know. Deal?";
 				next;
 				if(select("Refuse.:Stay overnight and get the info. - 5000z") == 1) {
-					emotion 7;
+					emotion e_ag;
 					mes "[Landlord]";
 					mes "Well, get the info by yourself then.";
 					close;
@@ -3262,7 +3244,7 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 				mes "I wish you a good night's rest. Hohoho.";
 				set mos_swan,4;
 				close2;
-				set Zeny,Zeny-5000;
+				Zeny -= 5000;
 				percentheal 100,100;
 				warp "mosk_in",215,181;
 				end;
@@ -3352,7 +3334,7 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 		mes "[Landlord]";
 		mes "Please be comfortable.";
 		close2;
-		set Zeny,Zeny-5000;
+		Zeny -= 5000;
 		percentheal 100,100;
 		warp "mosk_in",215,181;
 		end;
@@ -3363,7 +3345,7 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 	close;
 }
 
-mosk_in,141,212,3	script	Pub Owner#mos	964,{
+mosk_in,141,212,3	script	Pub Owner#mos	4_M_RUSBALD,{
 	if ((MaxWeight-Weight) < 2000) {
 		mes "- Please stop here!! -";
 		mes "- You're carrying too many items -";
@@ -3419,7 +3401,7 @@ mosk_in,141,212,3	script	Pub Owner#mos	964,{
 			close;
 		}
 		if (Zeny > 999) {
-			set Zeny,Zeny-1000;
+			Zeny -= 1000;
 			set mos_swan,9;
 			if (!.@j) getitem 519,1; else getitem 531,1;
 			mes "[Pub Owner]";
@@ -3482,7 +3464,7 @@ mosk_in,141,212,3	script	Pub Owner#mos	964,{
 		switch(select("Milk - 1000z:Apple juice - 1000z:They are all expensive!")) {
 			case 1:
 				if (Zeny > 999) {
-					set Zeny,Zeny-1000;
+					Zeny -= 1000;
 					set mos_swan,9;
 					getitem 519,1;
 					mes "[Pub Owner]";
@@ -3496,7 +3478,7 @@ mosk_in,141,212,3	script	Pub Owner#mos	964,{
 				close;
 			case 2:
 				if (Zeny > 999) {
-					set Zeny,Zeny-1000;
+					Zeny -= 1000;
 					set mos_swan,9;
 					getitem 531,1;
 					mes "[Pub Owner]";
@@ -3525,7 +3507,7 @@ mosk_in,141,212,3	script	Pub Owner#mos	964,{
 	close;
 }
 
-mosk_in,147,202,3	script	Victor#mos	968,{
+mosk_in,147,202,3	script	Victor#mos	4_M_RUSMAN2,{
 	if ((MaxWeight-Weight) < 2000) {
 		mes "- Please stop here!! -";
 		mes "- You're carrying too many items -";
@@ -3745,7 +3727,7 @@ OnTouch:
 //----------------------------------------------------------------------------
 // Swamp
 //----------------------------------------------------------------------------
-mosk_dun03,153,90,3	script	Bubbling Swamp#mos1	844,{
+mosk_dun03,153,90,3	script	Bubbling Swamp#mos1	CLEAR_NPC,{
 	if ((MaxWeight-Weight) < 2000) {
 		mes "- Your bag is very heavy today -";
 		close;
@@ -3795,7 +3777,7 @@ mosk_dun03,153,90,3	script	Bubbling Swamp#mos1	844,{
 //----------------------------------------------------------------------------
 // Larissa - Hotcake Quests
 //----------------------------------------------------------------------------
-mosk_in,211,259,5	script	Larissa#mos_01	960,{
+mosk_in,211,259,5	script	Larissa#mos_01	4_F_RUSWOMAN2,{
 	if ((MaxWeight-Weight) < 2000) {
 		mes "- Please stop here !! -";
 		mes "- You're carrying too many items -";
@@ -3958,14 +3940,13 @@ mosk_in,211,259,5	script	Larissa#mos_01	960,{
 	close;
 }
 
-//============================================================================
-// Acorn Exchange
-//============================================================================
+// Acorn Exchange :: mos_squirrel
+//============================================================
 
 //----------------------------------------------------------------------------
 // Acorn Dealer - Sells Acorns
 //----------------------------------------------------------------------------
-moscovia,208,182,7	script	Acorn Dealer#mos	967,{
+moscovia,208,182,7	script	Acorn Dealer#mos	4_M_RUSMAN1,{
 	mes "[Acorn Dealer]";
 	mes "We have very fresh acorns. Everyone will like them!";
 	mes "You can buy one acorn for 100zeny!";
@@ -4020,7 +4001,7 @@ moscovia,208,182,7	script	Acorn Dealer#mos	967,{
 	mes "[Acorn Dealer]";
 	mes "Oh, thank you...";
 	mes "What do you think of them? They're fresh, aren't they?";
-	set Zeny,Zeny - .@price;
+	Zeny -= .@price;
 	getitem 1026,.@input;
 	close;
 }
@@ -4099,9 +4080,9 @@ OnTouch:
 					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
 					else if (.@stworld > 89 && .@stworld < 100) getitem 732,1;
 					else getitem 7297,1;
-				} else if (.@cyworld == 1000) getitem 727,1;	
+				} else if (.@cyworld == 1000) getitem 727,1;
 				else if (.@cyworld > 100 && .@cyworld < 500) getitem 733,1;
-				else if (.@cyworld > 500 && .@cyworld < 900) getitem 724,1;					
+				else if (.@cyworld > 500 && .@cyworld < 900) getitem 724,1;
 				else getitem 724,1;
 				close;
 			case 2:
@@ -4138,12 +4119,11 @@ S_BS_1:
 	else if (.@stworld < 90) getitem 729,1;
 	return;
 }
-mosk_fild01,113,108,3	duplicate(Squirrel#mos_main)	Big Squirrel#mos	111
-mosk_fild01,113,108,5	duplicate(Squirrel#mos_main)	#mos_sq	1104,2,2
+mosk_fild01,113,108,3	duplicate(Squirrel#mos_main)	Big Squirrel#mos	HIDDEN_NPC
+mosk_fild01,113,108,5	duplicate(Squirrel#mos_main)	#mos_sq	COCO,2,2
 
-//============================================================================
-// Banish Winter
-//============================================================================
+// Banish Winter :: mos_nowinter
+//============================================================
 
 //----------------------------------------------------------------------------
 // Baba Yaga, the Horrible - Starting Point
@@ -4239,7 +4219,7 @@ OnTouch:
 	end;
 }
 
-mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
+mosk_in,215,46,5	script	Baba Yaga, the Horrible	4_F_BABAYAGA,{
 	if (!mos_nowinter || mos_nowinter == 1) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Hohoho";
@@ -4401,7 +4381,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "[Baba Yaga, the Horrible]";
 		mes "Let me see...where the season spell...";
 		next;
-		mes "rummaging..";
+		mes "rummaging...";
 		next;
 		mes "[Baba Yaga, the Horrible]";
 		mes "Ah, here it is... I found it!";
@@ -4543,7 +4523,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 				set .@f, 1;
 				break;
 			}
-		}	
+		}
 		if (!.@f && (countitem(730) || countitem(731) || countitem(732))) {
 			for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
 				delitem .@n[.@i],.@n[.@i+1];
@@ -4982,7 +4962,7 @@ S_BY_1:
 //----------------------------------------------------------------------------
 // Book
 //----------------------------------------------------------------------------
-mosk_in,217,45,0	script	#book_russia	111,{
+mosk_in,217,45,0	script	#book_russia	HIDDEN_NPC,{
 	if (mos_nowinter == 15) {
 		mes "-Beside the pot,";
 		mes "There is an unusually large book.";
@@ -5229,7 +5209,7 @@ mosk_in,217,45,0	script	#book_russia	111,{
 //----------------------------------------------------------------------------
 // Mixing Pot
 //----------------------------------------------------------------------------
-mosk_in,221,43,0	script	#bowl	111,{
+mosk_in,221,43,0	script	#bowl	HIDDEN_NPC,{
 	if (mos_nowinter != 16) end;
 	mes "-It is a very dirty pot.";
 	mes "Something is boiling";
@@ -5301,7 +5281,7 @@ mosk_in,221,43,0	script	#bowl	111,{
 		next;
 		switch(select("Put the materials in it.:Pour water in it.:Stir it up.:It is over!")) {
 		case 1:
-			set .@m, select (implode(.@m$,":")) - 1; 
+			set .@m, select (implode(.@m$,":")) - 1;
 			if (.@m >= 3) {
 				if (.@nankai == 5 || .@nankai == 6) {
 					if ((.@m == 3 && .@star) || (.@m == 4 && .@sand)) specialeffect EF_POISONHIT;
@@ -5429,8 +5409,8 @@ mosk_in,221,43,0	script	#bowl	111,{
 					set .@m, select (implode(.@m3$,":")) - 1;
 					if (.@m != 5) specialeffect EF_POISONHIT;
 					else {
-						set .@maho,.@maho+1; 
-						specialeffect EF_SMOKE; 
+						set .@maho,.@maho+1;
+						specialeffect EF_SMOKE;
 					}
 					set .@nankai,.@nankai+1;
 					mes "-I put "+((.@m == 5)?"a":"the")+" "+.@m3$[.@m]+" in the pot.";
@@ -5503,7 +5483,7 @@ mosk_in,221,43,0	script	#bowl	111,{
 //----------------------------------------------------------------------------
 // Center of Town
 //----------------------------------------------------------------------------
-moscovia,224,190,0	script	#nowinterplz	844,{
+moscovia,224,190,0	script	#nowinterplz	CLEAR_NPC,{
 	if (mos_nowinter != 19) end;
 	if (countitem(7765)) {
 		mes "["+strcharinfo(0)+"]";
@@ -5543,7 +5523,7 @@ moscovia,224,190,0	script	#nowinterplz	844,{
 //----------------------------------------------------------------------------
 // Villagers
 //----------------------------------------------------------------------------
-moscovia,252,203,5	script	A Little Girl#mos1	958,{
+moscovia,252,203,5	script	A Little Girl#mos1	4_F_RUSCHILD,{
 	if (mos_nowinter == 10) {
 		if (mos_kid == 1) {
 			mes "[Yosefina]";
@@ -5586,7 +5566,7 @@ moscovia,252,203,5	script	A Little Girl#mos1	958,{
 	close;
 }
 
-moscovia,233,204,3	script	A Young Man#mos2	968,{
+moscovia,233,204,3	script	A Young Man#mos2	4_M_RUSMAN2,{
 	if (mos_nowinter == 10) {
 		if (mos_middle == 1) {
 			mes "[Fedor]";
@@ -5623,7 +5603,7 @@ moscovia,233,204,3	script	A Young Man#mos2	968,{
 	close;
 }
 
-moscovia,219,229,5	script	A Middle-Aged Man#mos3	964,{
+moscovia,219,229,5	script	A Middle-Aged Man#mos3	4_M_RUSBALD,{
 	if (mos_nowinter == 10) {
 		if (mos_elder == 1) {
 			mes "[Viktor]";
@@ -5666,7 +5646,7 @@ moscovia,219,229,5	script	A Middle-Aged Man#mos3	964,{
 	close;
 }
 
-moscovia,255,203,3	script	A Little Boy#mos4	962,{
+moscovia,255,203,3	script	A Little Boy#mos4	4_M_RUSCHILD,{
 	if (mos_nowinter == 10) {
 		if (mos_kid == 1) {
 			mes "[Vasili]";
@@ -5735,7 +5715,7 @@ moscovia,255,203,3	script	A Little Boy#mos4	962,{
 	close;
 }
 
-moscovia,204,188,5	script	A Lady#mos5	959,{
+moscovia,204,188,5	script	A Lady#mos5	4_F_RUSWOMAN1,{
 	if (mos_nowinter == 10) {
 		if (mos_middle == 1) {
 			mes "[Katya]";
@@ -5776,7 +5756,7 @@ moscovia,204,188,5	script	A Lady#mos5	959,{
 	close;
 }
 
-moscovia,167,97,3	script	A Lady#mos6	961,{
+moscovia,167,97,3	script	A Lady#mos6	4_F_RUSWOMAN3,{
 	if (mos_nowinter == 10) {
 		if (mos_elder == 1) {
 			mes "[Roza]";
@@ -5823,7 +5803,7 @@ moscovia,167,97,3	script	A Lady#mos6	961,{
 	close;
 }
 
-moscovia,202,102,3	script	A Little Boy#mos7	962,{
+moscovia,202,102,3	script	A Little Boy#mos7	4_M_RUSCHILD,{
 	if (mos_nowinter == 10) {
 		if (mos_kid == 1) {
 			mes "[Feliks]";
@@ -5887,7 +5867,7 @@ moscovia,202,102,3	script	A Little Boy#mos7	962,{
 	close;
 }
 
-moscovia,220,172,3	script	A Young Man#mos8	968,{
+moscovia,220,172,3	script	A Young Man#mos8	4_M_RUSMAN2,{
 	if (mos_nowinter == 10) {
 		if (mos_middle == 1) {
 			mes "[Ilyav]";
@@ -5931,7 +5911,7 @@ moscovia,220,172,3	script	A Young Man#mos8	968,{
 	close;
 }
 
-moscovia,253,175,3	script	A Man#mos9	964,{
+moscovia,253,175,3	script	A Man#mos9	4_M_RUSBALD,{
 	if (mos_nowinter == 10) {
 		if (mos_elder == 1) {
 			mes "[Orek]";
@@ -5976,7 +5956,7 @@ moscovia,253,175,3	script	A Man#mos9	964,{
 	close;
 }
 
-moscovia,168,135,3	script	A Lady#mos10	961,{
+moscovia,168,135,3	script	A Lady#mos10	4_F_RUSWOMAN3,{
 	if (mos_nowinter == 10) {
 		if (mos_elder == 1) {
 			mes "[Kyra]";
@@ -6030,7 +6010,7 @@ moscovia,168,135,3	script	A Lady#mos10	961,{
 	close;
 }
 
-moscovia,192,80,3	script	A Lady#mos11	959,{
+moscovia,192,80,3	script	A Lady#mos11	4_F_RUSWOMAN1,{
 	if (mos_nowinter == 10) {
 		if (mos_middle == 1) {
 			mes "[Sabina]";
@@ -6078,7 +6058,7 @@ moscovia,192,80,3	script	A Lady#mos11	959,{
 	close;
 }
 
-moscovia,211,215,5	script	A Young Man#mos12	967,{
+moscovia,211,215,5	script	A Young Man#mos12	4_M_RUSMAN1,{
 	if (mos_nowinter == 10) {
 		if (mos_middle == 1) {
 			mes "[Izlof]";
@@ -6136,7 +6116,7 @@ moscovia,211,215,5	script	A Young Man#mos12	967,{
 	close;
 }
 
-moscovia,149,112,3	script	A Man#mos13	964,{
+moscovia,149,112,3	script	A Man#mos13	4_M_RUSBALD,{
 	if (mos_nowinter == 10) {
 		if (mos_elder == 1) {
 			mes "[Lev]";
@@ -6185,7 +6165,7 @@ moscovia,149,112,3	script	A Man#mos13	964,{
 	close;
 }
 
-moscovia,196,71,3	script	A Young Man#mos14	968,{
+moscovia,196,71,3	script	A Young Man#mos14	4_M_RUSMAN2,{
 	if (mos_nowinter == 10) {
 		if (mos_middle == 1) {
 			mes "[Fredek]";
@@ -6235,7 +6215,7 @@ moscovia,196,71,3	script	A Young Man#mos14	968,{
 	close;
 }
 
-moscovia,234,168,5	script	A Man#mos15	964,{
+moscovia,234,168,5	script	A Man#mos15	4_M_RUSBALD,{
 	if (mos_nowinter == 10) {
 		if (mos_elder == 1) {
 			mes "[Gavrel]";
@@ -6282,7 +6262,7 @@ moscovia,234,168,5	script	A Man#mos15	964,{
 
 }
 
-moscovia,228,80,3	script	A Little Boy#mos16	962,{
+moscovia,228,80,3	script	A Little Boy#mos16	4_M_RUSCHILD,{
 	if (mos_nowinter == 10) {
 		if (mos_kid == 1) {
 			mes "[Rurik]";
@@ -6341,7 +6321,7 @@ moscovia,228,80,3	script	A Little Boy#mos16	962,{
 //----------------------------------------------------------------------------
 // Magic Bottle
 //----------------------------------------------------------------------------
-mosk_dun03,225,233,0	script	Pile of skeletons#mosk	111,{
+mosk_dun03,225,233,0	script	Pile of skeletons#mosk	HIDDEN_NPC,{
 	if (mos_nowinter == 8) {
 		mes "-There are ugly skulls";
 		mes "all over here but, ";
@@ -6499,10 +6479,9 @@ mosk_in,131,92,3	script	#Csar	-1,7,7,{
 	end;
 }
 
-//============================================================================
-// Shafka Hat
-//============================================================================
-moscovia,211,93,3	script	Irina#edq	958,{
+// Shafka Hat :: mos_whale_edq
+//============================================================
+moscovia,211,93,3	script	Irina#edq	4_F_RUSCHILD,{
 	if (!checkweight(1201,1)) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
@@ -6609,14 +6588,13 @@ moscovia,211,93,3	script	Irina#edq	958,{
 	close;
 }
 
-//============================================================================
-// Koshei the Immortal
-//============================================================================
+// Koshei the Immortal :: mos_request
+//============================================================
 
 //----------------------------------------------------------------------------
 // Sage - Starting Point
 //----------------------------------------------------------------------------
-mosk_fild02,198,252,3	script	Sage#rus01	755,{
+mosk_fild02,198,252,3	script	Sage#rus01	4_M_SAGE_C,{
 	if (!rhea_rus_main) {
 		mes "[Sage]";
 		mes "Ah, a foreigner,";
@@ -6704,7 +6682,7 @@ mosk_fild02,198,252,3	script	Sage#rus01	755,{
 //----------------------------------------------------------------------------
 // Mysterious Stone
 //----------------------------------------------------------------------------
-mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
+mosk_dun01,169,162,0	script	Mysterious Stone#rus02	HIDDEN_NPC,{
 	if (!rhea_rus_main) {
 		mes "- The road forks here -";
 		close;
@@ -6730,7 +6708,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 				percentheal -50,-50;
 				specialeffect2 EF_DARKBREATH;
 				specialeffect2 EF_HIT2;
-				emotion 23,1;
+				emotion e_omg,1;
 				next;
 				mes "- An unknown force has -";
 				mes "- drained your health -";
@@ -6745,7 +6723,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 					mes "- You decide to go to the left -";
 					next;
 					mes "- !!!!!! -";
-					emotion 23,1;
+					emotion e_omg,1;
 					next;
 					mes "- An unknown force has -";
 					mes "- cursed your body -";
@@ -6760,7 +6738,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 				mes "- You decide to go to the left -";
 				next;
 				mes "- !!!!!! -";
-				emotion 23,1;
+				emotion e_omg,1;
 				next;
 				mes "- Your trusty Pecopeco senses -";
 				mes "- an unknown force and tries -";
@@ -6778,7 +6756,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 				mes "- toward the middle -";
 				next;
 				mes "- !!!!!! -";
-				emotion 23,1;
+				emotion e_omg,1;
 				donpcevent "Gray Wolf#rus03::OnEnable";
 				set rhea_rus_main,2;
 				close;
@@ -6802,7 +6780,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 //----------------------------------------------------------------------------
 // Gray Wolf
 //----------------------------------------------------------------------------
-mosk_dun01,167,160,3	script	Gray Wolf#rus03	972,{
+mosk_dun01,167,160,3	script	Gray Wolf#rus03	4_RUS_DWOLF,{
 	if (rhea_rus_main < 2) {
 		mes "[Gray Wolf]";
 		mes "... Turn back, adventurer...";
@@ -6833,7 +6811,7 @@ mosk_dun01,167,160,3	script	Gray Wolf#rus03	972,{
 		mes "I'm warning you again!";
 		mes "Unless you want to be killed, leave now.";
 		set rhea_rus_main,3;
-		emotion 23,1;
+		emotion e_omg,1;
 		specialeffect2 EF_HIT2;
 		percentheal -50,0;
 		next;
@@ -6925,24 +6903,24 @@ OnTimer120000:
 //----------------------------------------------------------------------------
 // Wall (Maria Morebna, Gray Wolf, Koshei)
 //----------------------------------------------------------------------------
-mosk_dun01,45,259,0	script	Wall#rus04	111,{
+mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 	if (rhea_rus_main < 5) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "...?!";
-		emotion 1,1;
+		emotion e_what,1;
 		close;
 	} else if (rhea_rus_main == 5) {
 		set .@speak01,rand(1,3);
 		if (.@speak01 == 3) {
 			mes "["+ strcharinfo(0) +"]";
 			mes "...?!";
-			emotion 1,1;
+			emotion e_what,1;
 			donpcevent "Gray Wolf#rus05::OnEnable";
 			next;
 		} else {
 			mes "["+ strcharinfo(0) +"]";
 			mes "...?!";
-			emotion 1,1;
+			emotion e_what,1;
 			close;
 		}
 		mes "[Girl's Voice]";
@@ -6994,8 +6972,8 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		close;
 	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz < 3) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -7112,7 +7090,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 			mes "["+ strcharinfo(0) +"]";
 			mes "Maria?! What happened?!";
 			sc_start SC_CURSE,60000,0;
-			emotion 23,1;
+			emotion e_omg,1;
 			next;
 			mes "[Koshei, the Immortal]";
 			mes "I really want to thank you, human. Maria was imprisoned in the wall so I couldn't do anything!";
@@ -7176,7 +7154,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		next;
 		mes "[Gray Wolf]";
 		mes "No, it's not too late!";
-		emotion 0,1;
+		emotion e_gasp,1;
 		donpcevent "Gray Wolf#rus05::OnEnable";
 		next;
 		mes "[Gray Wolf]";
@@ -7325,23 +7303,36 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		set rhea_rus_main,52;
 		set .@rus_food,rand(1,6);
 		switch (rand(1,6)) {
-			Case 1: getitem 12093,1; break;
-			Case 2: getitem 12088,1; break;
-			Case 3: getitem 12073,1; break;
-			Case 4: getitem 12078,1; break;
-			Case 5: getitem 12083,1; break;
-			Case 6: getitem 12098,1; break;
-		}
-		if (BaseLevel < 56) getexp 1300,350;
-		else if (BaseLevel < 61) getexp 2460,615;
-		else if (BaseLevel < 66) getexp 4242,1061;
-		else if (BaseLevel < 71) getexp 6489,1622;
-		else if (BaseLevel < 76) getexp 16491,4123;
-		else if (BaseLevel < 81) getexp 27629,6907;
-		else if (BaseLevel < 86) getexp 34041,8510;
-		else if (BaseLevel < 91) getexp 41846,10462;
-		else if (BaseLevel < 150) getexp 88814,22204;
-		else getitem 617,1;
+			case 1: getitem 12093,1; break;
+			case 2: getitem 12088,1; break;
+			case 3: getitem 12073,1; break;
+			case 4: getitem 12078,1; break;
+			case 5: getitem 12083,1; break;
+			case 6: getitem 12098,1; break;
+		}
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 5700,500;
+			else if (BaseLevel < 61) getexp 6700,800;
+			else if (BaseLevel < 66) getexp 8000,1000;
+			else if (BaseLevel < 71) getexp 13000,1200;
+			else if (BaseLevel < 76) getexp 17000,1400;
+			else if (BaseLevel < 81) getexp 20000,1700;
+			else if (BaseLevel < 86) getexp 45000,2000;
+			else if (BaseLevel < 91) getexp 75000,3000;
+			else if (BaseLevel < 160) getexp 200000,4000;
+			else getitem 617,1; //Old_Violet_Box
+		} else {
+			if (BaseLevel < 56) getexp 13000,3500;
+			else if (BaseLevel < 61) getexp 24600,6150;
+			else if (BaseLevel < 66) getexp 42420,10605;
+			else if (BaseLevel < 71) getexp 64892,16223;
+			else if (BaseLevel < 76) getexp 164908,41227;
+			else if (BaseLevel < 81) getexp 276292,69073;
+			else if (BaseLevel < 86) getexp 340408,85102;
+			else if (BaseLevel < 91) getexp 418460,104615;
+			else if (BaseLevel < 99) getexp 888140,222035;
+			else getitem 617,1; //Old_Violet_Box
+		}
 		donpcevent "Gray Wolf#rus05::OnDisable";
 		donpcevent "Maria Morebna#rus46::OnDisable";
 		close;
@@ -7446,13 +7437,13 @@ OnTimer120000:
 	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
 }
-mosk_dun01,50,256,3	duplicate(mos_rus#main)	Gray Wolf#rus05	972
-mosk_dun01,46,256,3	duplicate(mos_rus#main)	Maria Morebna#rus46	958
+mosk_dun01,50,256,3	duplicate(mos_rus#main)	Gray Wolf#rus05	4_RUS_DWOLF
+mosk_dun01,46,256,3	duplicate(mos_rus#main)	Maria Morebna#rus46	4_F_RUSCHILD
 
 //----------------------------------------------------------------------------
 // The Blacksmith (Golden Key)
 //----------------------------------------------------------------------------
-moscovia,178,127,0	script	The Blacksmith#rus06	63,{
+moscovia,178,127,0	script	The Blacksmith#rus06	1_M_SMITH,{
 	if ((MaxWeight-Weight) < 3500) {
 		mes "[The Blacksmith]";
 		mes "Why are you carrying that much?";
@@ -7593,8 +7584,8 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 	} else if (rhea_rus_main == 8) {
 		if (countitem(724) > 1 && countitem(969) > 2 && countitem(7877) && countitem(7878) > 1 && countitem(7879) > 9) {
 			if (rhea_rus_ring > 8 && rhea_rus_hair > 8 && rhea_rus_quiz > 29) {
-				if(getequipid(EQI_SHOES) != 2429) {
-					if(getequipid(EQI_SHOES) != 2430) {
+				if (getequipid(EQI_SHOES) != 2429) {
+					if (getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
 						mes "...Hmm, did I forget to wear something...?";
 						close;
@@ -7726,7 +7717,7 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 //----------------------------------------------------------------------------
 // Vassili Grandpapa (Red Ring)
 //----------------------------------------------------------------------------
-moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
+moscovia,206,81,0	script	Vassili Grandpapa#rus07	4_M_05,{
 	if ((MaxWeight-Weight) < 3500) {
 		mes "[Vassili Grandpapa]";
 		mes "Why are you carring that much?";
@@ -7749,8 +7740,8 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 		close;
 	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_ring < 1) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -7822,8 +7813,8 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 			mes "She disappeared soon... after Now all I have is Ryubaba. She is also pretty and smart but nothing can relieve the sadnesss in my heart from losing Mashenka...";
 			close;
 		} else if (rhea_rus_ring == 8) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -7853,8 +7844,8 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 				mes "^ff0000Cold marsh swallowing my body^000000";
 				mes "^ff0000Red ring taken away^000000";
 				mes "^ff0000Red ring enchanted^000000";
-				emotion 23;
-				emotion 9,1;
+				emotion e_omg;
+				emotion e_dots,1;
 				next;
 				mes "[Vassili Grandpapa]";
 				mes "...W, what is this? Ehh??";
@@ -7915,8 +7906,8 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 				mes "^ff0000Cold marsh swallowing my body^000000";
 				mes "^ff0000Red ring taken away^000000";
 				mes "^ff0000Red ring enchanted^000000";
-				emotion 9;
-				emotion 9,1;
+				emotion e_dots;
+				emotion e_dots,1;
 				next;
 				mes "[Vassili Grandpapa]";
 				mes "It is.. It is true...";
@@ -7937,19 +7928,35 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 				next;
 				mes "[Vassili Grandpapa]";
 				mes "...It is my fault that this tragedy between my daughters happened. I will spend the rest of my life trying to make up for it...";
-				delitem 7883,1;
+				delitem 7883,1; //Pointed_Wooden_Flute
 				set rhea_rus_ring,10;
-				getitem 7877,1;
-				if (BaseLevel < 56) getexp 470,0;
-				else if (BaseLevel > 55 && BaseLevel < 61) getexp 615,0;
-				else if (BaseLevel > 60 && BaseLevel < 66) getexp 1061,0;
-				else if (BaseLevel > 65 && BaseLevel < 71) getexp 1622,0;
-				else if (BaseLevel > 70 && BaseLevel < 76) getexp 4123,0;
-				else if (BaseLevel > 75 && BaseLevel < 81) getexp 6907,0;
-				else if (BaseLevel > 80 && BaseLevel < 86) getexp 8510,0;
-				else if (BaseLevel > 85 && BaseLevel < 91) getexp 10462,0;
-				else if (BaseLevel > 90 && BaseLevel < 99) getexp 22204,0;
-				else getitem 607,1;
+				getitem 7877,1; //Red_Ring
+				if (checkre(3)) {
+					if (BaseLevel < 56) getexp 470,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 615,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 750,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 1000,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 1500,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 2000,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 4500,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 8500,0;
+					else if (BaseLevel > 90 && BaseLevel < 99) getexp 30000,0;
+					else {
+						getitem 607,1; //Yggdrasilberry
+						getexp 30000,0;
+					}
+				} else {
+					if (BaseLevel < 56) getexp 4700,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 6150,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 10605,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 16223,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 41227,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 69073,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 85102,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 104615,0;
+					else if (BaseLevel > 90 && BaseLevel < 99) getexp 222035,0;
+					else getitem 607,1; //Yggdrasilberry
+				}
 				close;
 			}
 			mes "[Vassili Grandpapa]";
@@ -7959,7 +7966,7 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "Ehh?! This is weird. Where is the flute?!";
-			emotion 23,1;
+			emotion e_omg,1;
 			close;
 		} else if (rhea_rus_ring == 9) {
 			mes "[Vassili Grandpapa]";
@@ -7978,7 +7985,7 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 //----------------------------------------------------------------------------
 // Ryubaba (Red Ring)
 //----------------------------------------------------------------------------
-moscovia,213,216,3	script	Ryubaba#rus08	960,{
+moscovia,213,216,3	script	Ryubaba#rus08	4_F_RUSWOMAN2,{
 	if ((MaxWeight-Weight) < 3500) {
 		mes "[Ryubaba]";
 		mes "What on earth do you have in your bag?";
@@ -7991,7 +7998,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 		next;
 		mes "[Ryubaba]";
 		mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?";
-		emotion 18;
+		emotion e_heh;
 		close;
 	}
 	else if (rhea_rus_main == 8) {
@@ -8001,11 +8008,11 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			next;
 			mes "[Ryubaba]";
 			mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?";
-			emotion 18;
+			emotion e_heh;
 			close;
 		} else if (rhea_rus_ring == 1) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -8040,7 +8047,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			}
 			mes "["+ strcharinfo(0) +"]";;
 			mes "Yes, you are really beautiful.";
-			emotion 18,1;
+			emotion e_heh,1;
 			next;
 			mes "[Ryubaba]";
 			mes "Huhu, oh you jest. You know what you're talking about. Ah, this is a Choco drink that I have made. Give it a taste, isn't it good?";
@@ -8104,7 +8111,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				mes "[Ryubaba]";
 				mes "A Red Ring?!";
 				next;
-			} else { 
+			} else {
 				mes "[Ryubaba]";
 				mes "Heh, what are you talking about? What is that?";
 				close;
@@ -8132,8 +8139,8 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			mes "Right... Let me finish talking. We tried searching for her but we couldn't find her. She must have been wearing the ring when she disappeared around the marsh.";
 			close;
 		} else if (rhea_rus_ring == 7) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -8163,8 +8170,8 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				mes "^ff0000Cold marsh swallowing my body^000000";
 				mes "^ff0000Red ring taken away^000000";
 				mes "^ff0000Red ring enchanted^000000";
-				emotion 23;
-				emotion 9,1;
+				emotion e_omg;
+				emotion e_dots,1;
 				next;
 				mes "[Ryubaba]";
 				mes "S, stop! You'd better stop!?";
@@ -8191,7 +8198,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				next;
 				mes "[Ryubaba]";
 				mes "Please, I am begging you... Don't tell my father...";
-				emotion 28;
+				emotion e_sob;
 				next;
 				mes "- Suddenly, she sheds -";
 				mes "- tears and kneels down -";
@@ -8216,7 +8223,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 					mes "...Mmmm, what should I do...";
 					mes "Ok, I will do it.";
 					next;
-				}else{
+				} else {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Mmmm, what should I do...";
 					mes "No, I can't do it!";
@@ -8239,24 +8246,40 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				next;
 				mes "[Ryubaba]";
 				mes "I have to repent for my sins and atone for them for the rest of my life.";
-				delitem 7883,1;
+				delitem 7883,1; //Pointed_Wooden_Flute
 				set rhea_rus_ring,9;
-				getitem 7877,1;
-				if (BaseLevel < 56) getexp 470,0;
-				else if (BaseLevel < 61) getexp 615,0;
-				else if (BaseLevel < 66) getexp 1061,0;
-				else if (BaseLevel < 71) getexp 1622,0;
-				else if (BaseLevel < 76) getexp 4123,0;
-				else if (BaseLevel < 81) getexp 6907,0;
-				else if (BaseLevel < 86) getexp 8510,0;
-				else if (BaseLevel < 91) getexp 10462,0;
-				else if (BaseLevel < 99) getexp 22204,0;
-				else getitem 607,1;
+				getitem 7877,1; //Red_Ring
+				if (checkre(3)) {
+					if (BaseLevel < 56) getexp 470,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 615,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 750,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 1000,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 1500,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 2000,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 4500,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 8500,0;
+					else if (BaseLevel > 90 && BaseLevel < 99) getexp 30000,0;
+					else {
+						getitem 607,1; //Yggdrasilberry
+						getexp 30000,0;
+					}
+				} else {
+					if (BaseLevel < 56) getexp 4700,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 6150,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 10605,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 16223,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 41227,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 69073,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 85102,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 104615,0;
+					else if (BaseLevel > 90 && BaseLevel < 99) getexp 222035,0;
+					else getitem 607,1; //Yggdrasilberry
+				}
 				close;
 			}
 			mes "["+ strcharinfo(0) +"]";
 			mes "...!? Where is the flute!?";
-			emotion 23,1;
+			emotion e_omg,1;
 			close;
 		} else if (rhea_rus_ring == 8) {
 			mes "[Ryubaba]";
@@ -8291,7 +8314,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 //----------------------------------------------------------------------------
 // Little Boy (Ryubaba Info)
 //----------------------------------------------------------------------------
-moscovia,223,210,3	script	Little Boy#rus09	962,{
+moscovia,223,210,3	script	Little Boy#rus09	4_M_RUSCHILD,{
 	if (rhea_rus_main < 8) {
 		mes "[Little Boy]";
 		mes "I will be an adventer and will marry the most beautiful bride!";
@@ -8356,7 +8379,7 @@ moscovia,223,210,3	script	Little Boy#rus09	962,{
 //----------------------------------------------------------------------------
 // Shepherdess (Wooden Flute for Red Ring)
 //----------------------------------------------------------------------------
-mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
+mosk_fild02,157,233,0	script	Shepherdess#rus10	1_F_04,{
 	if (rhea_rus_main < 8) {
 		mes "[Shepherdess]";
 		mes "Haaaa, boring, boring! Herding sheep is really boring!";
@@ -8373,8 +8396,8 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 			mes "I wish that I could listen to music all the time.";
 			close;
 		} else if (rhea_rus_ring == 5) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -8404,8 +8427,8 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 			close;
 		} else if (rhea_rus_ring == 6) {
 			if (countitem(7882) > 24) {
-				if(getequipid(EQI_SHOES) != 2429) {
-					if(getequipid(EQI_SHOES) != 2430) {
+				if (getequipid(EQI_SHOES) != 2429) {
+					if (getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
 						mes "...Hmm, did I forget to wear something...?";
 						close;
@@ -8442,8 +8465,8 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 				mes "^ff0000Cold marsh swallowing my body^000000";
 				mes "^ff0000Red ring taken away^000000";
 				mes "^ff0000Red ring enchanted^000000";
-				emotion 23;
-				emotion 23,1;
+				emotion e_omg;
+				emotion e_omg,1;
 				next;
 				mes "[Shepherdess]";
 				mes "W, what is this? Horrible! Why did this flute play a voice?";
@@ -8520,19 +8543,19 @@ OnTimer60000:
 	donpcevent "Pointed Tree#rus11::OnEnable";
 	end;
 }
-mosk_fild02,151,188,0	duplicate(PTree#rusmain)	Pointed Tree#rus11	111
-mosk_fild02,160,227,0	duplicate(PTree#rusmain)	Pointed Tree#rus12	111
-mosk_fild02,160,179,0	duplicate(PTree#rusmain)	Pointed Tree#rus13	111
-mosk_fild02,142,247,0	duplicate(PTree#rusmain)	Pointed Tree#rus14	111
-mosk_fild02,149,223,0	duplicate(PTree#rusmain)	Pointed Tree#rus15	111
-mosk_fild02,114,223,0	duplicate(PTree#rusmain)	Pointed Tree#rus16	111
-mosk_fild02,101,197,0	duplicate(PTree#rusmain)	Pointed Tree#rus17	111
-mosk_fild02,125,182,0	duplicate(PTree#rusmain)	Pointed Tree#rus18	111
+mosk_fild02,151,188,0	duplicate(PTree#rusmain)	Pointed Tree#rus11	HIDDEN_NPC
+mosk_fild02,160,227,0	duplicate(PTree#rusmain)	Pointed Tree#rus12	HIDDEN_NPC
+mosk_fild02,160,179,0	duplicate(PTree#rusmain)	Pointed Tree#rus13	HIDDEN_NPC
+mosk_fild02,142,247,0	duplicate(PTree#rusmain)	Pointed Tree#rus14	HIDDEN_NPC
+mosk_fild02,149,223,0	duplicate(PTree#rusmain)	Pointed Tree#rus15	HIDDEN_NPC
+mosk_fild02,114,223,0	duplicate(PTree#rusmain)	Pointed Tree#rus16	HIDDEN_NPC
+mosk_fild02,101,197,0	duplicate(PTree#rusmain)	Pointed Tree#rus17	HIDDEN_NPC
+mosk_fild02,125,182,0	duplicate(PTree#rusmain)	Pointed Tree#rus18	HIDDEN_NPC
 
 //----------------------------------------------------------------------------
 // Worried Mother (Lusalka's Hair)
 //----------------------------------------------------------------------------
-moscovia,166,145,1	script	Worried Mother#rus19	961,{
+moscovia,166,145,1	script	Worried Mother#rus19	4_F_RUSWOMAN3,{
 	if (rhea_rus_main < 8) {
 		mes "[Worried Mother]";
 		mes "Where is she...";
@@ -8545,8 +8568,8 @@ moscovia,166,145,1	script	Worried Mother#rus19	961,{
 		close;
 	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_hair < 1) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -8635,13 +8658,13 @@ moscovia,166,145,1	script	Worried Mother#rus19	961,{
 //----------------------------------------------------------------------------
 // Marsh Warning Signs
 //----------------------------------------------------------------------------
--	script	Caution#07rus::NoSwim	837,{
+-	script	Caution#07rus::NoSwim	2_BULLETIN_BOARD,{
 	mes " WARNING !! ";
 	mes "No Swimming";
 	close;
 }
-mosk_fild02,101,204,0	duplicate(NoSwim)	Caution#rus01	837
-mosk_fild02,101,200,0	duplicate(NoSwim)	Caution#rus02	837
+mosk_fild02,101,204,0	duplicate(NoSwim)	Caution#rus01	2_BULLETIN_BOARD
+mosk_fild02,101,200,0	duplicate(NoSwim)	Caution#rus02	2_BULLETIN_BOARD
 
 //----------------------------------------------------------------------------
 // Lusalka Trigger (Lusalka's Hair)
@@ -8649,90 +8672,87 @@ mosk_fild02,101,200,0	duplicate(NoSwim)	Caution#rus02	837
 mosk_fild02,116,202,3	script	Lusalka#07russai_22	-1,3,3,{
 	end;
 OnTouch:
-	if (rhea_rus_main < 8) {
-		emotion 1,1;
-		close;
-	} else if (rhea_rus_main == 8) {
-		if (rhea_rus_hair == 2) {
-			if (gettime(3)>=23 || gettime(3)<=5) {
-				mes "- Splash !! -";
-				next;
-				if (countitem(523) > 0) {
-					mes "- You hear a splashing sound -";
-					mes "- and see something gleaming -";
-					donpcevent "Lusalka#rus23::OnEnable";
-					close;
-				}
-				mes "- You hear a splashing as -";
-				mes "- something gleaming -";
-				mes "- seems to stare at you!! -";
-				next;
-				specialeffect2 EF_FLASHER;
-				percentheal -100,0;
+	if (rhea_rus_main != 8) {
+		emotion e_what,1;
+		end;
+	}
+	if (rhea_rus_hair == 2) {
+		if (gettime(3)>=23 || gettime(3)<=5) {
+			mes "- Splash !! -";
+			next;
+			if (countitem(523) > 0) {
+				mes "- You hear a splashing sound -";
+				mes "- and see something gleaming -";
+				donpcevent "Lusalka#rus23::OnEnable";
 				close;
 			}
-		} else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) {
-			mes "[Lusalka's Voice]";
-			mes "His name is 'Igor'.. He has gone to the capital of Rune Midgarts. Give him my golden earrings.";
+			mes "- You hear a splashing as -";
+			mes "- something gleaming -";
+			mes "- seems to stare at you!! -";
 			next;
-			mes "[Lusalka's Voice]";
-			mes "And please, tell him to stop suffering and to be happy. This is my request.";
+			specialeffect2 EF_FLASHER;
+			percentheal -100,0;
 			close;
-		} else if (rhea_rus_hair == 7) {
-			if (gettime(3)>=23 || gettime(3)<=5) {
-				mes "- Splash !! -";
-				next;
-				if (countitem(523) > 0) {
-					mes "-You hear splashing sound and see something gleaming-";
-					donpcevent "Lusalka#rus23::OnEnable";
-					close;
-				}
-				mes "-You seem to hear the splash but something gleaming raids on you!!-";
-				specialeffect2 EF_FLASHER;
-				percentheal -100,0;
+		}
+	} else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) {
+		mes "[Lusalka's Voice]";
+		mes "His name is 'Igor'.. He has gone to the capital of Rune Midgarts. Give him my golden earrings.";
+		next;
+		mes "[Lusalka's Voice]";
+		mes "And please, tell him to stop suffering and to be happy. This is my request.";
+		close;
+	} else if (rhea_rus_hair == 7) {
+		if (gettime(3)>=23 || gettime(3)<=5) {
+			mes "- Splash !! -";
+			next;
+			if (countitem(523) > 0) {
+				mes "-You hear splashing sound and see something gleaming-";
+				donpcevent "Lusalka#rus23::OnEnable";
 				close;
 			}
-		} else if (rhea_rus_hair == 8) {
-			mes "["+ strcharinfo(0) +"]";
-			mes "What was that?!";
-			mes "Why am I here?";
-			next;
-			mes "- After standing up, you see -";
-			mes "- the wet hair in front of you -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "...This.. is Lusalka's hair?";
-			mes "Ah, right.. I came here to get her hair.";
-			next;
-			mes "- You pick up the hair -";
-			next;
-			mes "- As soon as you touch the -";
-			mes "- cool damp hair, you seem -";
-			mes "- the feel the sadness within -";
-			set rhea_rus_hair,9;
-			getitem 7878,2;
-			close;
-		} else if (rhea_rus_hair > 8) {
-			mes "- You feel that someone -";
-			mes "- is watching you -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "Who's there? Anybody here?";
-			next;
-			mes "- The splashing sound -";
-			mes "- fades away, but you -";
-			mes "- still feel the sadness -";
+			mes "-You seem to hear the splash but something gleaming raids on you!!-";
+			specialeffect2 EF_FLASHER;
+			percentheal -100,0;
 			close;
 		}
+	} else if (rhea_rus_hair == 8) {
+		mes "["+ strcharinfo(0) +"]";
+		mes "What was that?!";
+		mes "Why am I here?";
+		next;
+		mes "- After standing up, you see -";
+		mes "- the wet hair in front of you -";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "...This.. is Lusalka's hair?";
+		mes "Ah, right.. I came here to get her hair.";
+		next;
+		mes "- You pick up the hair -";
+		next;
+		mes "- As soon as you touch the -";
+		mes "- cool damp hair, you seem -";
+		mes "- the feel the sadness within -";
+		set rhea_rus_hair,9;
+		getitem 7878,2;
+		close;
+	} else if (rhea_rus_hair > 8) {
+		mes "- You feel that someone -";
+		mes "- is watching you -";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "Who's there? Anybody here?";
+		next;
+		mes "- The splashing sound -";
+		mes "- fades away, but you -";
+		mes "- still feel the sadness -";
+		close;
 	}
-	emotion 1,1;
-	close;
 }
 
 //----------------------------------------------------------------------------
 // Lusalka (Lusalka's Hair)
 //----------------------------------------------------------------------------
-mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
+mosk_fild02,124,202,3	script	Lusalka#rus23	4_F_RUSGREEN,{
 	if (countitem(523)) {
 		if (rhea_rus_main < 8) {
 			mes "[Lusalka]";
@@ -8747,8 +8767,8 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 				mes "What are you doing here...?";
 				close;
 			} else if (rhea_rus_hair == 2) {
-				if(getequipid(EQI_SHOES) != 2429) {
-					if(getequipid(EQI_SHOES) != 2430) {
+				if (getequipid(EQI_SHOES) != 2429) {
+					if (getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
 						mes "...Hmm, did I forget to wear something...?";
 						close;
@@ -8816,7 +8836,7 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 					next;
 					mes "[Lusalka]";
 					mes "Ah... but...";
-					emotion 28;
+					emotion e_sob;
 					donpcevent "Lusalka#rus23::OnDisable";
 					close;
 				}
@@ -8837,8 +8857,8 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 				mes "And please, tell him to stop suffering and to be happy. This is my request.";
 				close;
 			} else if (rhea_rus_hair == 7) {
-				if(getequipid(EQI_SHOES) != 2429) {
-					if(getequipid(EQI_SHOES) != 2430) {
+				if (getequipid(EQI_SHOES) != 2429) {
+					if (getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
 						mes "...Hmm, did I forget to wear something...?";
 						close;
@@ -8891,7 +8911,7 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 				mes "Aaaaaaaah!??!?!";
 				sc_start SC_CURSE,60000,0;
 				specialeffect2 EF_LORD;
-				emotion 23,1;
+				emotion e_omg,1;
 				percentheal -30,0;
 				next;
 				mes "["+ strcharinfo(0) +"]";
@@ -8959,7 +8979,7 @@ OnTimer300000:
 //----------------------------------------------------------------------------
 // Wanderer (Lusalka's Hair)
 //----------------------------------------------------------------------------
-prontera,228,279,3	script	Wanderer#rus24	968,{
+prontera,228,279,3	script	Wanderer#rus24	4_M_RUSMAN2,{
 	if (rhea_rus_main < 8) {
 		mes "[A Wanderer from a strange land]";
 		mes "Hey, there are so many adventurers around here. I can see why this is the capital of the Rune Midgarts Kingdom!";
@@ -8976,8 +8996,8 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 			mes "In your free time, come to see me! The weather here is even more favorable than our the best summer back home.";
 			close;
 		} else if (rhea_rus_hair == 3) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9022,7 +9042,7 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 			next;
 			mes "[A Wanderer from a strange land]";
 			mes "Ah, oh yes! How could I forget?";
-			emotion 5;
+			emotion e_ic;
 			next;
 			mes "[A Wanderer from a strange land]";
 			mes "We came here from Moscovia together. He called himself Igg. I came here with him but parted with him quite a while ago. He was sad because he couldn't forget about his lost lover.";
@@ -9064,7 +9084,7 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 //----------------------------------------------------------------------------
 // Morroc Villager (Lusalka's Hair)
 //----------------------------------------------------------------------------
-morocc,165,82,0	script	Morroc Villager#rus25	48,{
+morocc,165,82,0	script	Morroc Villager#rus25	1_M_02,{
 	if (rhea_rus_main < 8) {
 		mes "[Morroc Villager]";
 		mes "Huh, more and more adventurers are settling here recently, so it's hard to tell who is a villager or an adventurer.";
@@ -9081,8 +9101,8 @@ morocc,165,82,0	script	Morroc Villager#rus25	48,{
 			mes "But natives, like me, can tell the difference.";
 			close;
 		} else if (rhea_rus_hair == 4) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9137,7 +9157,7 @@ morocc,165,82,0	script	Morroc Villager#rus25	48,{
 //----------------------------------------------------------------------------
 // Soldier/Igor (Lusalka's Hair)
 //----------------------------------------------------------------------------
-moc_pryd04,126,120,0	script	Soldier#rus26	967,{
+moc_pryd04,126,120,0	script	Soldier#rus26	4_M_RUSMAN1,{
 	if (rhea_rus_main < 8) {
 		mes "[A gloomy looking soldier]";
 		mes "............................";
@@ -9148,8 +9168,8 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 			mes "............................";
 			close;
 		} else if (rhea_rus_hair == 4 || rhea_rus_hair == 5) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9225,8 +9245,8 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 			set rhea_rus_hair,6;
 			close;
 		} else if (rhea_rus_hair == 6) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9268,7 +9288,7 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 			mes "[A gloomy looking soldier]";
 			mes "Before the full moon, I will be back to Moscovia and meet her. I will come back so strong and happy that when I go to see her she will not suffer anymore.";
 			close;
-		} 
+		}
 	}
 	mes "[A gloomy looking soldier]";
 	mes "... I feel like I lost something precious.";
@@ -9280,7 +9300,7 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 //----------------------------------------------------------------------------
 // Marozka's Dungeon (Golden Thread)
 //----------------------------------------------------------------------------
-mosk_dun01,45,250,3	script	1#rus27	45,3,3,{
+mosk_dun01,45,250,3	script	1#rus27	WARPNPC,3,3,{
 	end;
 OnTouch:
 	warp "mosk_que",49,22;
@@ -9348,15 +9368,15 @@ OnTouch:
 			close;
 		}
 	}
-	emotion 1,1;
+	emotion e_what,1;
 	close;
 }
 
-mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
+mosk_que,45,131,0	script	Stone Furnace#rus28	HIDDEN_NPC,{
 	if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz == 1) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9383,7 +9403,7 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
 				mes "["+ strcharinfo(0) +"]";
 				mes "Oops, it's hot, hot!!!";
 				specialeffect2 EF_FIREHIT;
-				emotion 23,1;
+				emotion e_omg,1;
 				percentheal -5,0;
 				close;
 			}
@@ -9404,7 +9424,7 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
 			close;
 		}
 	}
-	emotion 1,1;
+	emotion e_what,1;
 	close;
 
 OnInit:
@@ -9423,11 +9443,11 @@ OnTimer300000:
 	end;
 }
 
-mosk_que,56,202,0	script	Occult Apple Tree#rus29	111,{
+mosk_que,56,202,0	script	Occult Apple Tree#rus29	HIDDEN_NPC,{
 	if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz == 2) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9448,7 +9468,7 @@ mosk_que,56,202,0	script	Occult Apple Tree#rus29	111,{
 				next;
 				mes "["+ strcharinfo(0) +"]";
 				mes "Ahhhhhhhh!!!";
-				emotion 23,1;
+				emotion e_omg,1;
 				close;
 			}
 			mes "- ^0000ff You get 100 Apples !!^000000 -";
@@ -9457,7 +9477,7 @@ mosk_que,56,202,0	script	Occult Apple Tree#rus29	111,{
 			close;
 		}
 	}
-	emotion 1,1;
+	emotion e_what,1;
 	close;
 }
 
@@ -9466,7 +9486,7 @@ mosk_que,47,217,0	warp	Escape#rus30	1,1,mosk_fild02,237,266
 //----------------------------------------------------------------------------
 // Marozka (Golden Thread)
 //----------------------------------------------------------------------------
-mosk_fild02,243,270,0	script	Marozka#rus31	866,{
+mosk_fild02,243,270,0	script	Marozka#rus31	4_M_LGTGRAND,{
 	if (rhea_rus_main < 8) {
 		mes "[Marozka]";
 		mes "...........................";
@@ -9477,8 +9497,8 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 			mes "...........................";
 			close;
 		} else if (rhea_rus_quiz == 3) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9544,8 +9564,8 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 			set rhea_rus_quiz,29;
 			close;
 		} else if (rhea_rus_quiz == 29) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9566,7 +9586,7 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 			mes "[Marozka]";
 			mes "What is deaf, dumb, and blind and always tells the truth?";
 			next;
-			set .@j,select("A Poring:A Picky:A Mirror:A Tree"); 
+			set .@j,select("A Poring:A Picky:A Mirror:A Tree");
 			set .@rus_quiz01,(.@j==3)?.@rus_quiz01+1:.@rus_quiz01;
 			mes "[Marozka]";
 			mes "If 4 cats can catch 4 mice every 4 minutes, what is the minimum number of cats needed to get 10 mice in 10 minutes?";
@@ -9624,13 +9644,13 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 //----------------------------------------------------------------------------
 // Baba Yaga (Golden Key)
 //----------------------------------------------------------------------------
-mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
+mosk_dun02,48,214,5	script	Baba Yaga#rus32	4_F_BABAYAGA,{
 	if (rhea_rus_main < 9) {
 		mes "[Baba Yaga]";
 		mes "...........................";
 		mes "If you lotter around here any longer, I will make myself some tasty human soup! Hehehehehe.";
-		emotion 29;
-		emotion 23,1;
+		emotion e_gg;
+		emotion e_omg,1;
 		close;
 	} else if (rhea_rus_main == 9) {
 		mes "[Baba Yaga]";
@@ -9647,7 +9667,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		mes "'Presto Change-o!!'";
 		mes "'Turn into a pig!!'";
 		specialeffect2 EF_BARRIER;
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Baba Yaga]";
 		mes "Hmm? You are protected by a Protection Spell?";
@@ -9866,14 +9886,14 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hey, I am talking...";
-		emotion 28,1;
+		emotion e_sob,1;
 		next;
 		mes "[Baba Yaga]";
 		mes "'In the corner...'";
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "!!!!!!!!!!!!!!!!!!!!!!!!!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Baba Yaga]";
 		mes "What, child? Do you feel bad?";
@@ -10223,7 +10243,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 					delitem 1092,.@redtube_send;
 					delitem 7134,.@redcup_send;
 					delitem 512,.@redapple_send;
-					set Zeny,Zeny-.@redzeny_send;
+					Zeny -= .@redzeny_send;
 					getitem 545,.@total_red01;
 					close;
 				}
@@ -10310,7 +10330,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 					delitem 1092,.@yelltube_send;
 					delitem 7134,.@yellcup_send;
 					delitem 513,.@yellbanana_send;
-					set Zeny,Zeny-.@yellzeny_send;
+					Zeny -= .@yellzeny_send;
 					getitem 546,.@total_yell01;
 					close;
 				}
@@ -10358,7 +10378,7 @@ OnMyMobDead:
 //----------------------------------------------------------------------------
 // Baba Yaga's Tasks (Golden Key)
 //----------------------------------------------------------------------------
-mosk_dun02,257,193,0	script	Cow#rus33	889,3,3,{
+mosk_dun02,257,193,0	script	Cow#rus33	4_BULL,3,3,{
 	end;
 OnInit:
 	enablenpc "Cow#rus33";
@@ -10385,7 +10405,7 @@ OnTouch:
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "You! Go home now!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "- The cow seems surprised, jumps and tries to attack you !! -";
 		next;
@@ -10408,7 +10428,7 @@ OnTouch:
 				next;
 				mes "[Cow]";
 				mes "...Moo...";
-				emotion 9;
+				emotion e_dots;
 				next;
 				mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
 				if (rand(1,2) == 1) {
@@ -10456,7 +10476,7 @@ OnTouch:
 	close;
 }
 
-mosk_dun02,257,193,0	script	Cow#rus34	889,3,3,{
+mosk_dun02,257,193,0	script	Cow#rus34	4_BULL,3,3,{
 	end;
 OnInit:
 	enablenpc "Cow#rus34";
@@ -10483,7 +10503,7 @@ OnTouch:
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "You! Go home now!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "- The cow seems surprised, jumps and tries to attack you !! -";
 		next;
@@ -10506,7 +10526,7 @@ OnTouch:
 				next;
 				mes "[Cow]";
 				mes "...Moo...";
-				emotion 9;
+				emotion e_dots;
 				next;
 				mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
 				if (rand(1,2) == 1) {
@@ -10523,7 +10543,7 @@ OnTouch:
 			mes "Akkkk?! Eh!? The s-spell...";
 			next;
 			mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
-			if (rand(1,2) == 1) {	
+			if (rand(1,2) == 1) {
 				donpcevent "Cow#rus34::OnDisable";
 				donpcevent "Cow#rus34::OnEnable";
 			} else {
@@ -10555,7 +10575,7 @@ OnTouch:
 	close;
 }
 
-mosk_dun02,257,193,0	script	Cow#rus35	889,3,3,{
+mosk_dun02,257,193,0	script	Cow#rus35	4_BULL,3,3,{
 	end;
 OnInit:
 	enablenpc "Cow#rus35";
@@ -10582,7 +10602,7 @@ OnTouch:
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "You! Go home now!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "- The cow seems surprised, jumps and tries to attack you !! -";
 		next;
@@ -10605,7 +10625,7 @@ OnTouch:
 				next;
 				mes "[Cow]";
 				mes "...Moo...";
-				emotion 9;
+				emotion e_dots;
 				next;
 				mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
 				donpcevent "Cow#rus35::OnDisable";
@@ -10643,7 +10663,7 @@ OnTouch:
 	close;
 }
 
-mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
+mosk_dun02,65,232,0	script	Noisy Coffin#rus36	4_NFCOFFIN,{
 	if (rhea_rus_main < 16) {
 		mes "[Noisy Coffin]";
 		mes "Isn't it good to be alive? Isn't it good to live?";
@@ -10815,7 +10835,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 		next;
 		mes "[Noisy Coffin]";
 		mes "................................";
-		emotion 9;
+		emotion e_dots;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hu, the job has been done.";
@@ -10828,7 +10848,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 		next;
 		mes "[Noisy Coffin]";
 		mes "................................";
-		emotion 9;
+		emotion e_dots;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hu, the job has been done.";
@@ -10841,7 +10861,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 		next;
 		mes "[Noisy Coffin]";
 		mes "................................";
-		emotion 9;
+		emotion e_dots;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hu, the job has been done.";
@@ -10853,7 +10873,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 	close;
 }
 
-treasure01,165,58,0	script	Old Treasure Box#rus37	111,{
+treasure01,165,58,0	script	Old Treasure Box#rus37	HIDDEN_NPC,{
 	if ((MaxWeight-Weight) < 3500) {
 		mes "You are carrying too much!";
 		mes "Lose some weight and try again.";
@@ -10938,7 +10958,7 @@ OnTimer180000:
 	end;
 }
 
-treasure01,24,39,0	script	Old Bed#rus38	111,{
+treasure01,24,39,0	script	Old Bed#rus38	HIDDEN_NPC,{
 	if (rhea_rus_main == 21) {
 		mes "- An old bed covered with dust and must -";
 		next;
@@ -10970,21 +10990,21 @@ treasure01,24,39,0	script	Old Bed#rus38	111,{
 		mes "...?! What is this?";
 		next;
 		mes "- There is a scar on the sheet that seems to have the location !! -";
-		viewpoint 1,165,58,1,0xFFFF0000;
-		viewpoint 1,61,183,2,0xFFFF0000;
-		viewpoint 1,98,118,3,0xFFFF0000;
-		viewpoint 1,27,115,4,0xFFFF0000;
+		viewpoint 1,165,58,1,0xFF0000;
+		viewpoint 1,61,183,2,0xFF0000;
+		viewpoint 1,98,118,3,0xFF0000;
+		viewpoint 1,27,115,4,0xFF0000;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "...This may be?!";
 		next;
 		mes "[Voice unidentified]";
 		mes "Who is there!?";
-		viewpoint 2,165,58,1,0xFF00FF00;
-		viewpoint 2,61,183,2,0xFF00FF00;
-		viewpoint 2,98,118,3,0xFF00FF00;
-		viewpoint 2,27,115,4,0xFF00FF00;
-		emotion 23,1;
+		viewpoint 2,165,58,1,0x00FF00;
+		viewpoint 2,61,183,2,0x00FF00;
+		viewpoint 2,98,118,3,0x00FF00;
+		viewpoint 2,27,115,4,0x00FF00;
+		emotion e_omg,1;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Eek, it would be best to run away now!";
@@ -11023,7 +11043,7 @@ treasure01,24,39,0	script	Old Bed#rus38	111,{
 	end;
 }
 
-treasure01,98,119,0	script	Dirty Wall#rus39	111,{
+treasure01,98,119,0	script	Dirty Wall#rus39	HIDDEN_NPC,{
 	if (rhea_rus_main == 22 || (rhea_rus_main > 22 && rhea_rus_main < 26)) {
 		mes "- Something is engraved on the wall -";
 		next;
@@ -11037,7 +11057,7 @@ treasure01,98,119,0	script	Dirty Wall#rus39	111,{
 	end;
 }
 
-treasure01,61,183,0	script	Old_Wooden_Box#rus40	111,{
+treasure01,61,183,0	script	Old_Wooden_Box#rus40	HIDDEN_NPC,{
 	if (rhea_rus_main == 23) {
 		mes "- Something is glimmering inside of the box -";
 		next;
@@ -11060,7 +11080,7 @@ treasure01,61,183,0	script	Old_Wooden_Box#rus40	111,{
 	end;
 }
 
-treasure01,27,115,0	script	Opened Treasure Chest#41	111,{
+treasure01,27,115,0	script	Opened Treasure Chest#41	HIDDEN_NPC,{
 	if (rhea_rus_main == 24) {
 		mes "- You open the box, junk is in it -";
 		next;
@@ -11078,17 +11098,17 @@ treasure01,27,115,0	script	Opened Treasure Chest#41	111,{
 			next;
 		} else {
 			switch (.@russ_key02) {
-				Case 1: mes "- You find the cuticle of Kukre !! -"; break;
-				Case 2: mes "- You find the egg of a Theif Bug !! -"; break;
-				Case 4: mes "- You find something that seems to be a banana before !! -"; break;
-				Case 5: mes "- You find the tentacles of a Jelly Fish !! -"; break;
-				Case 6: mes "- You find pieces of cloth with must on it !! -"; break;
-				Case 7: mes "- You find a bone !! -"; break;
+				case 1: mes "- You find the cuticle of Kukre !! -"; break;
+				case 2: mes "- You find the egg of a Theif Bug !! -"; break;
+				case 4: mes "- You find something that seems to be a banana before !! -"; break;
+				case 5: mes "- You find the tentacles of a Jelly Fish !! -"; break;
+				case 6: mes "- You find pieces of cloth with must on it !! -"; break;
+				case 7: mes "- You find a bone !! -"; break;
 			}
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "W, what is this!?";
-			emotion 23,1;
+			emotion e_omg,1;
 			close;
 		}
 		mes "["+ strcharinfo(0) +"]";
@@ -11104,7 +11124,7 @@ treasure01,27,115,0	script	Opened Treasure Chest#41	111,{
 	end;
 }
 
-amatsu,233,234,3	script	Momotoro Publisher#rus42	757,{
+amatsu,233,234,3	script	Momotoro Publisher#rus42	4_F_JPN2,{
 	if ((MaxWeight-Weight) < 3500) {
 		mes "[Momotoro Publisher]";
 		mes "What on earth do you have in your bag?";
@@ -11166,7 +11186,7 @@ amatsu,233,234,3	script	Momotoro Publisher#rus42	757,{
 		}
 		mes "[Momotoro Publisher]";
 		mes "Thank you for buying our books. If you need more books, contact us please.";
-		set Zeny,Zeny-5000;
+		Zeny -= 5000;
 		set rhea_rus_main,27;
 		getitem 7881,1;
 		close;
@@ -11183,7 +11203,7 @@ amatsu,233,234,3	script	Momotoro Publisher#rus42	757,{
 	close;
 }
 
-mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
+mosk_dun02,57,220,0	script	House Ghost Jar#rus43	HIDDEN_NPC,{
 	if (rhea_rus_main == 31) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "... Is it in here..? Hey, hey...";
@@ -11191,7 +11211,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 		mes "- You tap the jar -";
 		mes "- with your hand -";
 		specialeffect EF_SIGHTRASHER;
-		emotion 23,1;
+		emotion e_omg,1;
 		next;
 		mes "- A voice laughs in the jar as -";
 		mes "- it shakes from right to left -";
@@ -11260,7 +11280,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 			mes "[House Ghost]";
 			mes "Ok, first let me shuffle these cards around.";
 			mes "Ready!";
-			emotion 56;
+			emotion e_loud;
 			next;
 			mes "[House Ghost]";
 			mes "One!";
@@ -11294,9 +11314,9 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 				mes "One! Two! Three!!";
 				next;
 				if (.@rucard_game01 == 1) {
-					cutin "Poring_Card.bmp",4;
-					emotion 0;
-					emotion 5,1;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
+					emotion e_gasp;
+					emotion e_ic,1;
 					next;
 					mes "[House Ghost]";
 					mes "You got it right. You are good.";
@@ -11306,10 +11326,12 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 					cutin "",255;
 					next;
 				} else {
-					if (.@rucard_game01 == 2) cutin "?¡ê¨¢??¦Ì??¦Ì?.bmp",4;
-					else cutin "¡ã¨ª?o???¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 23,1;
+					if (.@rucard_game01 == 2)
+						cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
+					else
+						cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
+					emotion e_gasp;
+					emotion e_omg,1;
 					next;
 					mes "[House Ghost]";
 					mes "Huuu...";
@@ -11328,9 +11350,9 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 				mes "One! Two! Three!!";
 				next;
 				if (.@rucard_game01 == 2) {
-					cutin "?¡ê¨¢??¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 5,1;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Angeling Card
+					emotion e_gasp;
+					emotion e_ic,1;
 					next;
 					mes "[House Ghost]";
 					mes "You got it right. You are good.";
@@ -11340,10 +11362,12 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 					cutin "",255;
 					next;
 				} else {
-					if (.@rucard_game01 == 1) cutin "Poring_Card.bmp",4;
-					else cutin "¡ã¨ª?o???¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 23,1;
+					if (.@rucard_game01 == 1)
+						cutin "Æ÷¸µÄ«µå",4; // Poring Card
+					else
+						cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
+					emotion e_gasp;
+					emotion e_omg,1;
 					next;
 					mes "[House Ghost]";
 					mes "Huuu...";
@@ -11362,9 +11386,9 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 				mes "One! Two! Three!!";
 				next;
 				if (.@rucard_game01 == 3) {
-					cutin "¡ã¨ª?o???¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 5,1;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
+					emotion e_gasp;
+					emotion e_ic,1;
 					next;
 					mes "[House Ghost]";
 					mes "You got it right. You are good.";
@@ -11374,10 +11398,12 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 					cutin "",255;
 					next;
 				} else {
-					if (.@rucard_game01 == 1) cutin "Poring_Card.bmp",4;
-					else cutin "?¡ê¨¢??¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 23,1;
+					if (.@rucard_game01 == 1)
+						cutin "Æ÷¸µÄ«µå",4; // Poring Card
+					else
+						cutin "°í½ºÆ®¸µÄ«µå",4; // Angeling Card
+					emotion e_gasp;
+					emotion e_omg,1;
 					next;
 					mes "[House Ghost]";
 					mes "Huuu...";
@@ -11468,7 +11494,7 @@ OnMyMobDead:
 	end;
 }
 
-payon,65,119,0	script	Broom Grandma#rus44	78,{
+payon,65,119,0	script	Broom Grandma#rus44	1_F_ORIENT_04,{
 	if (rhea_rus_main < 36) {
 		mes "[Broom Grandma]";
 		mes "A broom from Payon is the best!";
@@ -11525,7 +11551,7 @@ payon,65,119,0	script	Broom Grandma#rus44	78,{
 	close;
 }
 
-pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
+pay_dun04,163,186,0	script	Ghost Tree#rus45	HIDDEN_NPC,{
 	if (rhea_rus_main == 37) {
 		mes "[Ghost Tree]";
 		mes "Errr, a human? What are you doing here? Do you want to play with me?";
@@ -11779,7 +11805,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "["+ strcharinfo(0) +"]";
 			if (.@rus_dice01 == .@tree_dice01) {
 				mes "Let's see... Wow, I got it! I've got ^0000ffNumber "+.@rus_dice01+"^000000!";
-				emotion 0;
+				emotion e_gasp;
 				next;
 				mes "[Ghost Tree]";
 				mes "You seem lucky...";
@@ -11790,7 +11816,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 				mes "Let's see................... It is ^0000ff "+.@rus_dice01+" ^000000...";
 				mes "[Ghost Tree]";
 				mes "Huuu...";
-				emotion 18;
+				emotion e_heh;
 				set .@rustree_turn01,.@rustree_turn01+1;
 				next;
 			}
@@ -11824,4 +11850,57 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 		close;
 	}
 	end;
-}
\ No newline at end of file
+}
+
+mosk_dun01,3,3,3	script	Koshei GlobalVar#admin	4_F_RUSCHILD,{
+	callfunc "F_GM_NPC";
+	mes "[Koshei GlobalVar]";
+	mes "Please enter the password";
+	set .@i, callfunc("F_GM_NPC","orchid",1);
+	next;
+	if (.@i == 0) {
+		mes "[Koshei GlobalVar]";
+		mes "Please input the password exactly.";
+		close;
+	} else {
+		mes "[Koshei GlobalVar]";
+		mes "I can tell you what the";
+		mes "Koshei GlobalVar";
+		mes "$@rus_req02";
+		mes "on mosk_dun01";
+		mes "is currently set to.";
+		next;
+		if ($@rus_req02 == 0) {
+			mes "[Koshei GlobalVar]";
+			mes "Currently the GlobalVar $@rus_req02 is set to 0";
+			next;
+		} else if ($@rus_req02 == 1) {
+			mes "[Koshei GlobalVar]";
+			mes "Currently the GlobalVar $@rus_req02 is set to 1";
+			next;
+		} else {
+			mes "[Koshei GlobalVar]";
+			mes "error";
+			close;
+		}
+		mes "[Koshei GlobalVar]";
+		mes "What would you like to set the GlobalVar to?";
+		next;
+		switch(select("0:1:Cancel")) {
+		case 1:
+			mes "[Koshei GlobalVar]";
+			mes "GlobalVar $@rus_req02 will now be set to '0'";
+			set $@rus_req02,0;
+			donpcevent "Koshei#rus47::OnDisable";
+			close;
+		case 2:
+			mes "[Koshei GlobalVar]";
+			mes "GlobalVar $@rus_req02 will now be set to '1'";
+			set $@rus_req02,1;
+			donpcevent "Koshei#rus47::OnEnable";
+			close;
+		case 3:
+			close;
+		}
+	}
+}
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index a8d9c7f93..109a97f7e 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Nameless Island Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.4
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Collection of Nameless Island Quests
 //= Nameless Island:
 //= - Quest to gain access to Nameless Island and dungeon.
@@ -25,20 +25,20 @@
 //- - Help to aprehend the infamous Z-Gang.
 //= - Variable in use: zdan_edq (Max: 19)
 //= Unlucky Emerald:
-//- - Help a treasure hunter from Prontera get home, and 
+//- - Help a treasure hunter from Prontera get home, and
 //=   learn the origins of the Unlucky Emerald.
 //= - Variable in use: treasure_nd (Max: 12)
 //= - Variable in use: jewel_nd (Max: 31)
 //= Rogue Guild Investigation Assistance:
 //- - Assist the Rogue Guild with their investigations.
 //= - Variable in use: rumour_nd (Max: 22)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Made quest accessable to "Failed" gaebolg quest. [L0ne_W0lf]
 //= 1.1a Touch up to other Gaebolg fail-points. [L0ne_W0lf]
 //= 1.2 Some final tuning to Nameless Island quest. [Koca]
 //= 1.3 Should fix any more issues with "Creature" npc. [L0ne_W0lf]
-//= 1.4 Changed the way aru_warp works slightly. [L0ne_W0lf]
+//= 1.4 Changed the way Out_from_Monastery works slightly. [L0ne_W0lf]
 //= 1.5 added a next to stop double npc message [Yommy]
 //= 1.6 Updated the Nameless Island Access quest
 //=     Added Quest: Peace for Arunafeltz
@@ -58,18 +58,19 @@
 //=     - Broken Diamond
 //=     - Z-Gang Quest
 //= 2.2a Fixed a few job constant typos. [Euphy]
-//= 2.3 Removed Strange Machine [Streusel]
-//= 2.4 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
+//= 2.3 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.4 Moved Dorian to pre-re/re paths. [Euphy]
+//= 2.5 Updated Nameless Island quests and added questlog support. [Euphy]
+//============================================================
 
-// Nameless Island and Cursed Monestary Access Quest
+// Nameless Island and Cursed Monestary Access Quest :: aru_monas
 //============================================================
-airplane_01,95,61,3	script	QuestTrigger#Aru	-1,3,3,{
+airplane_01,90,63,0	script	Event Switch#pc	-1,3,3,{
 	end;
 
 OnTouch:
 	if ((prt_curse == 36 || prt_curse == 45 || prt_curse == 56 || prt_curse == 61) && (aru_monas < 1)) {
-		hideoffnpc "Agent#Aru";
+		hideoffnpc "Agent#pc1";
 		mes "[????]";
 		mes "Are you "+strcharinfo(0)+"?";
 		mes "I've been waiting for you.";
@@ -77,22 +78,23 @@ OnTouch:
 		mes "your arrival at ^6B8E23Prontera";
 		mes "Church^000000. Please visit him";
 		mes "as soon as you can.";
-		close2;
 		set aru_monas,1;
-		hideonnpc "Agent#Aru";
+		setquest 17000;
+		close2;
+		hideonnpc "Agent#pc1";
 	}
 	end;
 }
 
-airplane_01,95,61,3	script	Agent#Aru	899,5,5,{
+airplane_01,95,61,3	script	Agent#pc1	4_M_HUMAN_02,{
 	end;
 
 OnInit:
-	hideonnpc "Agent#Aru";
+	hideonnpc "Agent#pc1";
 	end;
 }
 
-cmd_in02,174,89,7	script	Ordinary Man#pc1	97,{
+cmd_in02,174,89,7	script	Ordinary Man#pc1	4W_M_01,{
 	if (aru_monas < 2) {
 		mes "[Larjes]";
 		mes "Damn it, I lost again!";
@@ -143,7 +145,7 @@ cmd_in02,174,89,7	script	Ordinary Man#pc1	97,{
 	}
 }
 
-cmd_in02,111,52,3	script	Ordinary Man#pc2	97,{
+cmd_in02,111,52,3	script	Ordinary Man#pc2	4W_M_01,{
 	if (aru_monas < 3) {
 		mes "[Larjes]";
 		mes "^666666*Sigh...*^000000";
@@ -192,6 +194,7 @@ cmd_in02,111,52,3	script	Ordinary Man#pc2	97,{
 		mes "Arunafeltz so I wasn't able";
 		mes "to investigate any further.";
 		set aru_monas,4;
+		changequest 17001,17002;
 		close;
 	}
 	else {
@@ -204,7 +207,7 @@ cmd_in02,111,52,3	script	Ordinary Man#pc2	97,{
 	}
 }
 
-ra_in01,308,59,1	script	Waiter#Aru	930,{
+ra_in01,308,59,1	script	Waiter#pc	4_M_RACHMAN2,{
 	if (aru_monas < 7) {
 		mes "[Waiter]";
 		mes "Welcome to";
@@ -232,8 +235,12 @@ ra_in01,308,59,1	script	Waiter#Aru	930,{
 				mes "Right this way.";
 				close2;
 				set aru_monas,7;
-				warp "ra_in01",303,43;
-				end;
+				switch(rand(1,4)) {
+					case 1: warp "ra_in01",303,43; end;
+					case 2: warp "ra_in01",304,43; end;
+					case 3: warp "ra_in01",304,39; end;
+					case 4: warp "ra_in01",303,39; end;
+				}
 			}
 			mes "[Waiter]";
 			mes "Hm, okay. Well, whatever";
@@ -251,7 +258,7 @@ ra_in01,308,59,1	script	Waiter#Aru	930,{
 	close;
 }
 
-ra_in01,301,50,3	script	Normal-Looking Man	927,{
+ra_in01,301,50,3	script	Normal-Looking Man	4_M_MASK,{
 	mes "[Normal-Looking Man]";
 	mes "Mmm-Mmm!";
 	mes "I love the food in";
@@ -262,7 +269,7 @@ ra_in01,301,50,3	script	Normal-Looking Man	927,{
 	close;
 }
 
-ra_in01,301,52,3	script	Common-Looking Man	927,{
+ra_in01,301,52,3	script	Common-Looking Man	4_M_MASK,{
 	mes "[Common-Looking Man]";
 	mes "The food here isn't bad,";
 	mes "but my favorite restaurants";
@@ -271,7 +278,7 @@ ra_in01,301,52,3	script	Common-Looking Man	927,{
 	close;
 }
 
-ra_in01,297,50,7	script	Suspicious-Looking Man	926,{
+ra_in01,297,50,7	script	Suspicious-Looking Man	4_M_MASK1,{
 	mes "[Suspicious-Looking Man]";
 	mes "Each dish has its own";
 	mes "unique taste that you must";
@@ -281,7 +288,7 @@ ra_in01,297,50,7	script	Suspicious-Looking Man	926,{
 	close;
 }
 
-ra_in01,301,43,0	script	#Aru_conv	-1,3,3,{
+ra_in01,301,43,0	script	MealConversation Trigger	-1,3,3,{
 	end;
 
 OnTouch:
@@ -427,17 +434,18 @@ OnTouch:
 		mes "I've never tasted anything";
 		mes "like it! It's almost like";
 		mes "a dessert. God, it's good!";
-		if (Zeny >= 3000) {
-			set Zeny,Zeny-3000;
+		set aru_monas,8;
+		changequest 17003,17004;
+		if (Zeny > 3000) {
+			Zeny -= 3000;
 			getitem 12052,4; //Vit_Dish02
 		}
-		set aru_monas,8;
 		close;
 	}
 	end;
 }
 
-ve_in,78,314,5	script	Magistrate#Aru	945,{
+ve_in,78,314,5	script	Magistrate#Aru	4_M_DST_GRAND,{
 	if (aru_monas < 8) {
 		mes "[Al Hamad]";
 		mes "Argh! Why must this";
@@ -464,6 +472,7 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "comfortable talking to complete";
 		mes "strangers about my problems.";
 		set aru_monas,9;
+		changequest 17004,17005;
 		close;
 	}
 	else if (aru_monas == 9) {
@@ -507,9 +516,10 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "Oh, and you're prohibited";
 		mes "asking anyone else, so behave.";
 		set aru_monas,11;
+		changequest 17006,17007;
 		close;
 	}
-	else if (aru_monas == 11) {
+	else if (aru_monas < 13) {
 		mes "[Al Hamad]";
 		mes "I don't blame you for";
 		mes "being curious, but getting";
@@ -601,6 +611,8 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "we have to capture the";
 		mes "smugglers again? I don't";
 		mes "know what's going on...";
+		set aru_monas,14;
+		changequest 17009,17010;
 		next;
 		mes "[Al Hamad]";
 		mes "Even if I could make headway";
@@ -617,10 +629,9 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "learn more, your only choice";
 		mes "would be to find out on your";
 		mes "own. Fat chance, right?";
-		set aru_monas,14;
 		close;
 	}
-	else if (aru_monas >= 14) {
+	else {
 		mes "[Al Hamad]";
 		mes "I've suffered enough";
 		mes "already! Why can't this";
@@ -629,7 +640,7 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 	}
 }
 
-ve_in,81,296,3	script	Soldier#Aru	946,{
+ve_in,81,296,3	script	Soldier#Aru	4_M_DST_MASTER,{
 	if (aru_monas < 9) {
 		mes "[Himus]";
 		mes "Huh. The magistrate";
@@ -671,6 +682,7 @@ ve_in,81,296,3	script	Soldier#Aru	946,{
 		mes "interrogating the smugglers.";
 		mes "I'm not sure if he did since the smugglers were taken away.";
 		set aru_monas,10;
+		changequest 17005,17006;
 		close;
 	}
 	else if (aru_monas == 10) {
@@ -690,7 +702,825 @@ ve_in,81,296,3	script	Soldier#Aru	946,{
 	}
 }
 
-ra_temple,165,57,5	script	Niren#ss	915,{
+ve_in,239,115,0	script	Drunkard#Aru	4_M_DESERT,{
+	if (aru_monas < 14) {
+		mes "[Drunkard]";
+		mes "Man, I feel great! Hah hah!";
+		mes "Hey, gimme one more drink!";
+		close;
+	}
+	if (aru_monas == 14) {
+		if (rachel_camel == 25) {
+			mes "[Drunkard]";
+			mes "So--*Hic* What I was...";
+			mes "Oog, dizzy... I say sayin',";
+			mes "that guy that ^32CD32snuck out to";
+			mes "sea on a boat^000000? You know";
+			mes "*Hic* why he came back";
+			mes "so early? You won't believe it!";
+			next;
+			mes "[Drunkard]";
+			mes "Hah hah! He--*Hic*";
+			mes "He thought he saw a ^DBDB70ghost^000000!";
+			mes "Bwah hah hah! Oooog... Hey...";
+			set aru_monas,15;
+			changequest 17010,17011;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "That's right!";
+			mes "Maybe I should check";
+			mes "on ^32CD32Kurdi's father since";
+			mes "he's a fisherman^000000";
+			close;
+		}
+		else {
+			mes "[Drunkard]";
+			mes "Zzzz...";
+			mes "Umm... Zzz...";
+			close;
+		}
+	}
+	else {
+		mes "[Drunkard]";
+		mes "Why?! Why can't I take";
+		mes "my boat out to sea? I hafta";
+		mes "catch fish to make a living!";
+		mes "What, they expect me to starve";
+		mes "to death or something?! Huh?!";
+		close;
+	}
+}
+
+ve_in,238,120,4	script	Drunkard#Aru1	4_F_DESERT,{
+	mes "[Drunkard]";
+	mes "Hohohoho~";
+	mes "Oh~ Hohohoho~";
+	next;
+	mes "[" + strcharinfo(0) + "]";
+	mes "She's kind of strange...";
+	close;
+}
+
+ve_fild07,125,128,0	script	Boat#Aru	HIDDEN_NPC,{
+	if (aru_monas < 16) {
+		mes "^3355FFThis boat seems to ";
+		mes "be in decent condition.";
+		mes "Who could its owner be?^000000";
+		close;
+	}
+	else if (aru_monas == 16) {
+		mes "^3355FFThis must be the boat that";
+		mes "Karyn was talking about.";
+		mes "It seems to be in pretty";
+		mes "good shape. Now, the";
+		mes "monastery should be";
+		mes "southwest from here...^000000";
+		next;
+		hideoffnpc "Secret Agent#Aru";
+		next;
+		mes "[Larjes]";
+		mes "Long time no see,";
+		mes ""+strcharinfo(0)+".";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Larjes!";
+		next;
+		mes "[Larjes]";
+		mes "I had a tough time following";
+		mes "you, you know? I actually";
+		mes "almost lost you once. You";
+		mes "must be wondering why";
+		mes "I'm here. If you'll listen,";
+		mes "I'll explain everything.";
+		next;
+		mes "[Larjes]";
+		mes "According to our investigation, Arunafeltz is definitely involved";
+		mes "in this case. We've been watching you since you're somehow related";
+		mes "to that high ranked official from Arunafeltz. I apologize for that.";
+		next;
+		mes "[Larjes]";
+		mes "This is an international";
+		mes "incident, so to prevent any";
+		mes "intel leaks to Arunafeltz,";
+		mes "we've had to be much stricter";
+		mes "with securing and protecting";
+		mes "all information for this case.";
+		next;
+		mes "[Larjes]";
+		mes "Anyway, I've decided to";
+		mes "reveal myself to you since";
+		mes "I'm the only one that can help";
+		mes "you right now. You're thinking";
+		mes "of using that boat, aren't you?";
+		next;
+		mes "[Larjes]";
+		mes "If you don't have the skills,";
+		mes "knowledge, and preparation";
+		mes "to sail those waters ahead,";
+		mes "you'll probably wreck the";
+		mes "boat. You'll make it if you're lucky but... That's a lot of luck.";
+		next;
+		mes "[Larjes]";
+		mes "I'll help you sail this";
+		mes "boat to get where you're";
+		mes "going. But if you fail, there's";
+		mes "a chance you might have to";
+		mes "sail this boat on your own if I'm not here. So, you ready to go?";
+		next;
+		switch(select("Yes, I'm ready.:Give me more time.")) {
+		case 1:
+			mes "[Larjes]";
+			mes "Alright, let's go.";
+			mes "Hold on to something:";
+			mes "this will probably be";
+			mes "a pretty rocky ride...";
+			set aru_monas,17;
+			changequest 17012,17013;
+			close2;
+			hideonnpc "Secret Agent#Aru";
+			warp "nameless_i",257,217;
+			end;
+		case 2:
+			mes "[Larjes]";
+			mes "Alright. Just let me know";
+			mes "whenever you're ready.";
+			close;
+		}
+	}
+	else if (aru_monas < 20) {
+		mes "^3355FFThis is the boat that";
+		mes "can take you to the";
+		mes "monastery.^000000";
+		next;
+		switch(select("Go to Monastery:Cancel")) {
+		case 1:
+			mes "^3355FFYou set sail for";
+			mes "the monastery...^000000";
+			close2;
+			warp "nameless_i",257,217;
+			end;
+		case 2:
+			mes "^3355FFYou decide to";
+			mes "stay ashore.^000000";
+			close;
+		}
+	}
+	else {
+		mes "^3355FFThis is the boat that";
+		mes "can take you to the";
+		mes "monastery.^000000";
+		next;
+		switch(select("Go to Monastery:Cancel")) {
+		case 1:
+			mes "^3355FFYou set sail for";
+			mes "the monastery...^000000";
+			close2;
+			warp "nameless_n",257,217;
+			end;
+		case 2:
+			mes "^3355FFYou decide to";
+			mes "stay ashore.^000000";
+			close;
+		}
+	}
+}
+
+ve_fild07,128,130,1	script	Secret Agent#Aru	4W_M_01,{
+	if (aru_monas == 16) {
+		mes "[Larjes]";
+		mes "Are you ready to go";
+		mes "aboard? I'll help you";
+		mes "sail to that monastery,";
+		mes "but if you fail while you're";
+		mes "there, I might not be here";
+		mes "when you come back.";
+		next;
+		switch(select("Yes, I'm ready.:Give me more time.")) {
+		case 1:
+			mes "[Larjes]";
+			mes "Alright, let's go.";
+			mes "Hold on to something:";
+			mes "this will probably be";
+			mes "a pretty rocky ride...";
+			set aru_monas,17;
+			changequest 17012,17013;
+			close2;
+			hideonnpc "Secret Agent#Aru";
+			warp "nameless_i",257,217;
+			end;
+		case 2:
+			mes "[Larjes]";
+			mes "Alright. Just let me know";
+			mes "whenever you're ready.";
+			close;
+		}
+	}
+	end;
+
+OnInit:
+	hideonnpc "Secret Agent#Aru";
+	end;
+}
+
+nameless_i,212,184,0	script	Outside Island#Aru	-1,2,3,{
+	end;
+
+OnTouch:
+	if (aru_monas == 17) {
+		mes "^3355FFThe village is totally";
+		mes "silent, as if all life had";
+		mes "abandoned it. You look";
+		mes "around and see that something";
+		mes "was here a few hours ago, but";
+		mes "it's somewhere else now.^000000";
+		next;
+		mes "^3355FFWhatever it was,";
+		mes "it definitely wasn't";
+		mes "human. What kind of";
+		mes "creature could it be?^000000";
+		close;
+	}
+	end;
+}
+
+nameless_in,21,176,0	script	Inside Island#Aru	-1,2,2,{
+	end;
+
+OnTouch:
+	if (aru_monas == 17) {
+		mes "^3355FFThere are traces of";
+		mes "humans around here,";
+		mes "along with some kind";
+		mes "of creature that you";
+		mes "can't clearly identify.^000000";
+		close;
+	}
+	end;
+}
+
+nameless_i,129,218,0	script	Grass Behind#Aru	-1,4,3,{
+	end;
+
+OnTouch:
+	if (aru_monas == 17) {
+		mes "^3355FFA strange scent strikes";
+		mes "you as you enter this field of";
+		mes "grass. A few ^32CD32animal corpses^3355FF";
+		mes "are strewn around the ground.^000000";
+		close;
+	}
+	end;
+}
+
+nameless_i,127,207,0	script	Dead Crow#Aru	HIDDEN_NPC,{
+	if (aru_monas < 17) {
+		mes "^3355FFThere is a dead crow on the ground.";
+		close;
+	}
+	else if (aru_monas == 17) {
+		mes "^3355FFThe sight of this ^32CD32dead";
+		mes "crow^3355FF makes you feel";
+		mes "uneasy for some reason.^000000";
+		next;
+		if (select("Ignore:Investigate") == 1) {
+			mes "^3355FFYou decide not to touch";
+			mes "the animal's carcass.^000000";
+			close;
+		}
+		mes "^3355FFYou notice some grass sap";
+		mes "on the crow's beak, so it";
+		mes "must have been nibbling on";
+		mes "some grass. Some feathers";
+		mes "are missing, revealing";
+		mes "scaly, snake-like skin.^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Wait...";
+		mes "Did this grass...?";
+		next;
+		mes "^3355FFThis grass must be the";
+		mes "main ingredient of the";
+		mes "poison used to kill the";
+		mes "Gaebolg family princes.^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Looks like I just hit";
+		mes "the jackpot. Huh?";
+		mes "Someone behi--";
+		next;
+		mes "^3355FFA sharp, throbbing pain";
+		mes "assails the back of your";
+		mes "head as you fall into";
+		mes "unconsciousness...^000000";
+		set aru_monas,18;
+		close2;
+		warp "nameless_in",15,60;
+		end;
+	}
+	end;
+}
+
+nameless_in,15,61,0	script	Pass Out#Aru	-1,2,3,{
+	end;
+
+OnTouch:
+	if (aru_monas == 18) {
+		disablenpc "Out_from_Monastery";
+		sc_start SC_BLIND,600000,0,10000;
+		mes "^3355FFThe pressure on your";
+		mes "stomach and the blood";
+		mes "rushing to your head tells";
+		mes "you someone is carrying you";
+		mes "over his shoulder. He stops,";
+		mes "and you hear a faint voice.^000000";
+		next;
+		mes "^3355FFThe faint voice steadily";
+		mes "grows stronger and more";
+		mes "distinct--someone's calling";
+		mes "your name. You feel cold water";
+		mes "trickle through your lips, and";
+		mes "then you regain your senses.^000000";
+		next;
+		sc_end SC_BLIND;
+		hideoffnpc "Larjes#Monastery";
+		next;
+		mes "That was too close...";
+		mes "For a second there,";
+		mes "I thought I lost you.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Larjes...? What...";
+		mes "What happened?";
+		mes "Ugh, my head...";
+		next;
+		mes "[Larjes]";
+		mes "Try not to move for a while.";
+		mes "I had a bad feeling waiting";
+		mes "for you on the boat. Lucky";
+		mes "thing. When I found you,";
+		mes "these strange creatures";
+		mes "were savagely attacking you!";
+		next;
+		mes "[" +strcharinfo(0)+ "]";
+		mes "You saved me?";
+		mes "Thank you. Do you";
+		mes "happen to know what";
+		mes "those creatures were?";
+		next;
+		mes "[Larjes]";
+		mes "No clue. They looked";
+		mes "like humans, but... They";
+		mes "definitely weren't. Once";
+		mes "I killed them, they all";
+		mes "turned into sand.";
+		next;
+		hideoffnpc "Creature#Monas";
+		emotion e_omg,1;
+		emotion e_omg,0,"Larjes#Monastery";
+		mes "[Larjes]";
+		mes "?!?!?!!!!!";
+		next;
+		mes "[" +strcharinfo(0)+ "]";
+		mes "!!!!?!?!!!!!!";
+		mes "Isn't... Isn't that...?";
+		next;
+		mes "[Larjes]";
+		mes "It seems it's just like the";
+		mes "creatures that kidnapped";
+		mes "you, but... I wonder why";
+		mes "he's not attacking us.";
+		next;
+		mes "[" +strcharinfo(0)+ "]";
+		mes "I guess you'll have to go";
+		mes "right up to him and ask.";
+		set aru_monas,19;
+		close;
+	}
+}
+
+nameless_in,13,58,6	script	Larjes#Monastery	4W_M_01,{
+	mes "[Larjes]";
+	mes "Be careful. That guy";
+	mes "looks pretty dangerous.";
+	close;
+
+OnInit:
+	hideonnpc "Larjes#Monastery";
+	end;
+}
+
+nameless_in,13,53,1	script	Creature#Monas	ZOMBIE_SLAUGHTER,3,1,{
+	end;
+
+OnInit:
+	hideonnpc "Creature#Monas";
+	end;
+
+OnTouch:
+	if (aru_monas == 19 && mobcount("nameless_in","Creature#Monas::OnMyMobDead") < 1 && !@aru_monas_kill) {
+		mes "[???????]";
+		mes "Grrr~!!!";
+		close2;
+		monster "nameless_in",13,53,"Zombie",1864,1,"Creature#Monas::OnMyMobDead";
+		hideonnpc "Creature#Monas";
+	}
+	end;
+
+OnMyMobDead:
+	set @aru_monas_kill,1;
+	enablenpc "Out_from_Monastery";
+	end;
+}
+
+nameless_in,12,37,0	script	Out_from_Monastery	WARPNPC,1,1,{
+	end;
+
+OnTouch:
+	if (aru_monas == 19) {
+		set aru_monas,20;
+		warp "nameless_n",168,252;
+		end;
+	}
+
+OnInit:
+	disablenpc "Out_from_Monastery";
+	end;
+}
+
+
+
+nameless_i,168,257,0	script	outtoin_01#mo	WARPNPC,1,1,{
+	end;
+
+OnTouch:
+	if (aru_monas == 18 || aru_monas == 19) {
+		warp "nameless_in",12,41;
+		end;
+	}
+	mes "^3355FFThe door won't budge:";
+	mes "you can't go through.^000000";
+	close;
+}
+
+nameless_n,169,254,0	script	Night#Aru2	-1,3,3,{
+	end;
+
+OnTouch:
+	if(aru_monas == 20) {
+		hideoffnpc "Larjes#Monastery2";
+		mes "[" +strcharinfo(0)+ "]";
+		mes "What the hell...!?";
+		next;
+		mes "[Larjes]";
+		mes "So... This is the";
+		mes "island's true nature.";
+		next;
+		mes "[Larjes]";
+		mes "Someone like me won't";
+		mes "survive long in a place";
+		mes "like this. I'm going to wait";
+		mes "for you in the boat. Learn";
+		mes "what you need to learn, and then come back safe, "+strcharinfo(0)+".";
+		set aru_monas,21;
+		changequest 17013,17014;
+		close2;
+		hideonnpc "Larjes#Monastery2";
+	}
+	end;
+}
+
+nameless_n,166,254,0	script	Larjes#Monastery2	4W_M_01,{
+	end;
+
+OnInit:
+	hideonnpc "Larjes#Monastery2";
+	end;
+}
+
+nameless_i,259,218,3	script	Larjes#Aru	4W_M_01,{
+	if (aru_monas < 18) {
+		mes "[Larjes]";
+		mes "I don't like this place.";
+		mes "You'd be better be careful";
+		mes "around here with those weird";
+		mes "creatures running around.";
+		close;
+	}
+	else if (aru_monas < 24) {
+		mes "[Larjes]";
+		mes "Good, you're back";
+		mes "I know that there's still";
+		mes "things on this island that";
+		mes "you want to investigate,";
+		mes "but did you want to leave";
+		mes "this place for a while?";
+		next;
+		if(select("Yes:No")==1) {
+			mes "[Larjes]";
+			mes "Alight, let's go.";
+			close2;
+			warp "ve_fild07",130,130;
+			end;
+		}
+		mes "[Larjes]";
+		mes "Alright, but becareful.";
+		mes "Those creatures almost";
+		mes "got you once, you know.";
+		close;
+	}
+	else {
+		mes "[Larjes]";
+		mes "Did you still want to";
+		mes "investigate the island?";
+		next;
+		if (select("No:Yes") == 1) {
+			mes "[Larjes]";
+			mes "Alright, let's go.";
+			close2;
+			warp "ve_fild07",130,130;
+			end;
+		}
+		mes "[Larjes]";
+		mes "Alright, but be careful.";
+		mes "Those creatures almost";
+		mes "got you once, you know.";
+		close;
+	}
+}
+
+nameless_n,259,218,3	script	Larjes#Boat1	4W_M_01,{
+	if (aru_monas == 24) {
+		if (countitem(7726) < 1) {
+			mes "[Larjes]";
+			mes "Good, you're back.";
+			mes "I know that there's still";
+			mes "things on this island that";
+			mes "you want to investigate,";
+			mes "but did you want to leave";
+			mes "this place for a while?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Larjes]";
+				mes "Alright, let's go.";
+				close2;
+				warp "ve_fild07",130,130;
+				end;
+			case 2:
+				mes "[Larjes]";
+				mes "Alright, but becareful.";
+				mes "Those creatures almost";
+				mes "got you once, you know.";
+				close;
+			}
+		} else {
+			mes "[Larjes]";
+			mes "I don't believe it...";
+			mes "That guy was Tristam III?!";
+			mes "This explains a lot, I suppose.";
+			mes "I'll report this along with the";
+			mes "voucher. So Arunafeltz was";
+			mes "behind that poison grass too...";
+			next;
+			mes "[Larjes]";
+			mes "I'm shocked over this";
+			mes "whole debacle. I'm sure";
+			mes "the Rune-Midgarts royal family";
+			mes "will be in an uproar over this.";
+			mes "To think that we're involved";
+			mes "in something this huge...";
+			next;
+			mes "[Larjes]";
+			mes "Anyway, we better get";
+			mes "going... This is huge!";
+			delitem 7726,1; //Token_Of_King
+			set aru_monas,25;
+			changequest 17016,17017;
+			getexp (checkre(3))?100000:1000000,0;
+			close;
+		}
+	}
+	mes "[Larjes]";
+	mes "Did you still want to";
+	mes "investigate the island?";
+	next;
+	switch(select("No:Yes")) {
+	case 1:
+		mes "[Larjes]";
+		mes "Alright, let's go.";
+		close2;
+		warp "ve_fild07",130,130;
+		end;
+	case 2:
+		mes "[Larjes]";
+		mes "Alright, but becareful.";
+		mes "Those creatures almost";
+		mes "got you once, you know.";
+		close;
+	}
+}
+
+abbey02,224,70,0	script	Books#Mona1	HIDDEN_NPC,{
+	if (checkweight(7766,1) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
+		close;
+	}
+	if (aru_monas < 21) {
+		mes "^3355FFIt's just a bunch";
+		mes "of old, moldy books.^000000";
+		close;
+	}
+	else if (aru_monas == 21) {
+		mes "^3355FFThere's a book stained";
+		mes "with blood amongst all";
+		mes "these old, moldy books.^000000";
+		next;
+		if(select("Examine Book:Ignore")==1) {
+			set aru_monas,22;
+			changequest 17014,17015;
+			getitem 7755,1; // Reasearch_Note
+			readbook 7755,1;
+			close;
+		}
+		mes "^3355FFThat book was probably";
+		mes "worthless to you anyway.^000000";
+		close;
+	}
+	else {
+		mes "^3355FFThere are old books";
+		mes "scattered all over here.^000000";
+		close;
+	}
+}
+
+abbey03,232,233,4	script	Man#King	4_M_TRISTAN,{
+	if (aru_monas < 22) {
+		mes "^3355FFYou find a man lying on";
+		mes "the floor, wearing torn";
+		mes "yet luxurious clothing.";
+		mes "He doesn't seem to be";
+		mes "breathing at all...^000000.";
+		next;
+		mes "^3355FFHe's dead.^000000";
+		close;
+	}
+	if (aru_monas == 22 || aru_monas == 23) {
+		mes "^3355FFYou find a man lying on";
+		mes "the floor, wearing torn";
+		mes "yet luxurious clothing.";
+		mes "He doesn't seem to be";
+		mes "breathing at all...^000000.";
+		next;
+		mes "^3355FFYou bring your ears more";
+		mes "closely to his mouth: it";
+		mes "seems that he really is";
+		mes "still barely alive.^000000";
+		next;
+		if (select("Touch Him:Ignore Him") == 1) {
+			mes "["+strcharinfo(0)+"]";
+			mes "This man...";
+			mes "He's so familiar";
+			mes "for some reason.";
+			next;
+			mes "^3355FFAs you touch him, the";
+			mes "man suddenly jumps";
+			mes "up with a crazed yowl.^000000";
+			set aru_monas,23;
+			monster "abbey03",232,232,"Dead King",1875,1,"Man#King::OnMyMobDead";
+			initnpctimer;
+			hideonnpc "Man#King";
+			close;
+		}
+		mes "^3355FFYou don't feel";
+		mes "comfortable enough";
+		mes "to touch this man.^000000";
+		close;
+	}
+	else {
+		mes "^3355FFHe's dead... Now...^000000";
+		close;
+	}
+
+OnMyMobDead:
+	stopnpctimer;
+	donpcevent "Dead Man#King::OnEnable";
+	end;
+
+OnTimer300000:
+	stopnpctimer;
+	hideonnpc "Dead Man#King";
+	hideoffnpc "Man#King";
+	end;
+}
+
+abbey03,232,232,4	script	Dead Man#King	4_M_TRISTAN,{
+	if (checkweight(7766,1) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
+		close;
+	}
+	if (aru_monas == 23) {
+		mes "^3355FFYou have no idea why";
+		mes "this dead man is moving";
+		mes "around, so you decided to";
+		mes "examine him. In his jacket,";
+		mes "you find a shining medal...^000000";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "This medal...";
+		mes "This means that";
+		mes "this man is...!";
+		set aru_monas,24;
+		getitem 7726,1; //Token_of_King
+		changequest 17015,17016;
+		hideonnpc "Dead Man#King";
+		hideoffnpc "Man#King";
+		stopnpctimer;
+		close;
+	}
+	end;
+
+OnEnable:
+	initnpctimer;
+	hideoffnpc "Dead Man#King";
+	end;
+
+OnInit:
+	hideonnpc "Dead Man#King";
+	end;
+
+OnTimer150000:
+	hideonnpc "Dead Man#King";
+	hideoffnpc "Man#King";
+	stopnpctimer;
+	end;
+}
+
+nameless_n,145,162,0	script	AideAmi#Aru	HIDDEN_WARP_NPC,2,2,{
+	end;
+OnTouch:
+	if (aru_monas == 26) {
+		mes "[" + strcharinfo(0) + "]";
+		mes "There is a low wall here against the other wall, if I climb it I could reach the resting place of Tristan III...";
+		next;
+		switch(select("Stay here:Climb the wall")) {
+		case 1:
+			warp "nameless_n",158,169;
+			end;
+		case 2:
+			warp "abbey01",51,15;
+			end;
+		}
+	}
+	else {
+		warp "nameless_n",158,169;
+		end;
+	}
+}
+
+sec_in02,15,15,4	script	boss::boss_aru_monas	1_M_SIGNMONK,{
+	callfunc "F_GM_NPC";
+	mes "[Patch]";
+	mes "Input.";
+	next;
+	switch(select("Now:How much?:P- How much?:Others")) {
+	case 1:
+		mes " ";
+		mes ""+aru_monas;
+		close;
+	case 2:
+		input .@input,0,1000;
+		set aru_monas, .@input;
+		mes " ";
+		mes ""+aru_monas;
+		close;
+	case 3:
+		input .@input,0,1000;
+		set prt_curse, .@input;
+		mes " ";
+		mes ""+prt_curse;
+		close;
+	case 4:
+		set prt_curse,61;
+		set ra_tem_q,12; //TODO: Doesn't match Athena's current script.
+		set rachel_camel,25;
+		set lost_boy,0;
+		close;
+	}
+}
+
+// Rachel Addition :: aruna_nir
+//============================================================
+ra_temple,165,57,5	script	Niren#ss	4_F_MADAME,{
 	if (checkweight(907,200) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -707,7 +1537,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 	mes "I can spare a moment or two.";
 	mes "What would you like to ask?";
 	next;
-	switch(select("Ask About Veins Smugglers:As About Zhed")) {
+	switch(select("Ask About Veins Smugglers:Ask About Zhed")) {
 	case 1:
 		if (aru_monas == 12) {
 			mes "[Niren]";
@@ -812,6 +1642,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "come back and tell me if";
 			mes "you learn anything there.";
 			set aru_monas,13;
+			changequest 17008,17009;
 			next;
 			mes "[Niren]";
 			mes "I'll send a message to the";
@@ -879,10 +1710,8 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 				mes "comes from that place.";
 				delitem 7755,1; //Research_Note
 				set aru_monas,26;
-				if(checkre(0))
-					getexp 50000,0;
-				else
-					getexp 500000,0;
+				completequest 17017;
+				getexp (checkre(3))?50000:500000,0;
 				close2;
 			}
 		}
@@ -970,6 +1799,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "For now, you'd better talk";
 			mes "to High Priest Zhed.^000000";
 			set aru_em,11;
+			changequest 2132,2133;
 			close2;
 		}
 		else if ((aru_em == 11) || (aru_em == 12)) {
@@ -1048,7 +1878,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 				mes "High Priestess Niren,";
 				mes "you must be really tired.";
 				mes "You look pale for some reason.";
-				emotion 19;
+				emotion e_swt2;
 				next;
 				mes "[High Priestess Niren]";
 				mes "I do feel rather drained.";
@@ -1120,6 +1950,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 				mes "can count on me!";
 				emotion e_no1,1;
 				set aru_em,15;
+				changequest 2134,2135;
 				close2;
 			}
 			else {
@@ -1166,13 +1997,13 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "just to see my family. Even";
 			mes "just once a year would be nice.";
 			next;
-			emotion 5;
+			emotion e_ic;
 			mes "[High Priestess Niren]";
 			mes "...............................";
 			mes "You're absolutely right.";
 			mes "That gives me an idea.";
 			next;
-			emotion 2;
+			emotion e_ho;
 			mes "[Sippie]";
 			mes "Huh? What is it?";
 			next;
@@ -1233,6 +2064,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "I hope she'll help us...";
 			set aru_em,17;
 			getitem 7343,1; //File02
+			changequest 2136,2137;
 			close2;
 		}
 		else if (aru_em == 17) {
@@ -1301,6 +2133,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 				mes "what we are doing.";
 				delitem 7343,1; //File02
 				set aru_em,20;
+				changequest 2139,2140;
 				close2;
 			}
 			else {
@@ -1351,10 +2184,8 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "that you've seen that";
 			mes "expression on her face.^000000";
 			set aru_em,23;
-			if(checkre(0))
-				getexp 100000,0;
-			else
-				getexp 1000000,0;
+			getexp (checkre(3))?100000:1000000,0;
+			changequest 2141,2142;
 			close2;
 		}
 		else if (aru_em > 21) {
@@ -1377,721 +2208,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 	end;
 }
 
-ve_in,239,115,1	script	Drunkard#Aru	943,{
-	if (aru_monas < 14) {
-		mes "[Drunkard]";
-		mes "Man, I feel great! Hah hah!";
-		mes "Hey, gimme one more drink!";
-		close;
-	}
-	if (aru_monas == 14) {
-		if (rachel_camel == 25) {
-			mes "[Drunkard]";
-			mes "So--*Hic* What I was...";
-			mes "Oog, dizzy... I say sayin',";
-			mes "that guy that ^32CD32snuck out to";
-			mes "sea on a boat^000000? You know";
-			mes "*Hic* why he came back";
-			mes "so early? You won't believe it!";
-			next;
-			mes "[Drunkard]";
-			mes "Hah hah! He--*Hic*";
-			mes "He thought he saw a ^DBDB70ghost^000000!";
-			mes "Bwah hah hah! Oooog... Hey...";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "That's right!";
-			mes "Maybe I should check";
-			mes "on ^32CD32Kurdi's father since";
-			mes "he's a fisherman^000000";
-			set aru_monas,15;
-			close;
-		}
-		else {
-			mes "[Drunkard]";
-			mes "Zzzz...";
-			mes "Umm... Zzz...";
-			close;
-		}
-	}
-	else {
-		mes "[Drunkard]";
-		mes "Why?! Why can't I take";
-		mes "my boat out to sea? I hafta";
-		mes "catch fish to make a living!";
-		mes "What, they expect me to starve";
-		mes "to death or something?! Huh?!";
-		close;
-	}
-}
-
-ve_fild07,125,128,0	script	Boat#Aru	111,{
-	if (aru_monas < 16) {
-		mes "^3355FFThis boat seems to ";
-		mes "be in decent condition.";
-		mes "Who could its owner be?^000000";
-		close;
-	}
-	if (aru_monas == 16) {
-		mes "^3355FFThis must be the boat that";
-		mes "Karyn was talking about.";
-		mes "It seems to be in pretty";
-		mes "good shape. Now, the";
-		mes "monastery should be";
-		mes "southwest from here...^000000";
-		next;
-		hideoffnpc "Secret Agent#Aru";
-		next;
-		mes "[Larjes]";
-		mes "Long time no see,";
-		mes ""+strcharinfo(0)+".";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Larjes!";
-		next;
-		mes "[Larjes]";
-		mes "I had a tough time following";
-		mes "you, you know? I actually";
-		mes "almost lost you once. You";
-		mes "must be wondering why";
-		mes "I'm here. If you'll listen,";
-		mes "I'll explain everything.";
-		next;
-		mes "[Larjes]";
-		mes "According to our investigation, Arunafeltz is definitely involved";
-		mes "in this case. We've been watching you since you're somehow related";
-		mes "to that high ranked official from Arunafeltz. I apologize for that.";
-		next;
-		mes "[Larjes]";
-		mes "This is an international";
-		mes "incident, so to prevent any";
-		mes "intel leaks to Arunafeltz,";
-		mes "we've had to be much stricter";
-		mes "with securing and protecting";
-		mes "all information for this case.";
-		next;
-		mes "[Larjes]";
-		mes "Anyway, I've decided to";
-		mes "reveal myself to you since";
-		mes "I'm the only one that can help";
-		mes "you right now. You're thinking";
-		mes "of using that boat, aren't you?";
-		next;
-		mes "[Larjes]";
-		mes "If you don't have the skills,";
-		mes "knowledge, and preparation";
-		mes "to sail those waters ahead,";
-		mes "you'll probably wreck the";
-		mes "boat. You'll make it if you're lucky but... That's a lot of luck.";
-		next;
-		mes "[Larjes]";
-		mes "I'll help you sail this";
-		mes "boat to get where you're";
-		mes "going. But if you fail, there's";
-		mes "a chance you might have to";
-		mes "sail this boat on your own if I'm not here. So, you ready to go?";
-		next;
-		switch(select("Yes, I'm ready.:Give me more time.")) {
-		case 1:
-			mes "[Larjes]";
-			mes "Alright, let's go.";
-			mes "Hold on to something:";
-			mes "this will probably be";
-			mes "a pretty rocky ride...";
-			set aru_monas,17;
-			close2;
-			hideonnpc "Secret Agent#Aru";
-			warp "nameless_i",257,217;
-			end;
-		case 2:
-			mes "[Larjes]";
-			mes "Alright. Just let me know";
-			mes "whenever you're ready.";
-			close;
-		}
-	}
-	if (aru_monas < 20) {
-		mes "^3355FFThis is the boat that";
-		mes "can take you to the";
-		mes "monastery.^000000";
-		next;
-		switch(select("Go to Monastery:Cancel")) {
-		case 1:
-			mes "^3355FFYou set sail for";
-			mes "the monastery...^000000";
-			close2;
-			warp "nameless_i",257,217;
-			end;
-		case 2:
-			mes "^3355FFYou decide to";
-			mes "stay ashore.^000000";
-			close;
-		}
-	}
-	else {
-		mes "^3355FFThis is the boat that";
-		mes "can take you to the";
-		mes "monastery.^000000";
-		next;
-		switch(select("Go to Monastery:Cancel")) {
-		case 1:
-			mes "^3355FFYou set sail for";
-			mes "the monastery...^000000";
-			close2;
-			warp "nameless_n",257,217;
-			end;
-		case 2:
-			mes "^3355FFYou decide to";
-			mes "stay ashore.^000000";
-			close;
-		}
-	}
-}
-
-ve_fild07,128,130,1	script	Secret Agent#Aru	97,{
-	if (aru_monas == 16) {
-		mes "[Larjes]";
-		mes "Are you ready to go";
-		mes "aboard? I'll help you";
-		mes "sail to that monastery,";
-		mes "but if you fail while you're";
-		mes "there, I might not be here";
-		mes "when you come back.";
-		next;
-		switch(select("Yes, I'm ready.:Give me more time.")) {
-		case 1:
-			mes "[Larjes]";
-			mes "Alright, let's go.";
-			mes "Hold on to something:";
-			mes "this will probably be";
-			mes "a pretty rocky ride...";
-			set aru_monas,17;
-			close2;
-			hideonnpc "Secret Agent#Aru";
-			warp "nameless_i",257,217;
-			end;
-		case 2:
-			mes "[Larjes]";
-			mes "Alright. Just let me know";
-			mes "whenever you're ready.";
-			close;
-		}
-	}
-	end;
-
-OnInit:
-	hideonnpc "Secret Agent#Aru";
-	end;
-}
-
-nameless_i,259,218,3	script	Larjes#Aru	97,{
-	if(aru_monas < 18) {
-		mes "[Larjes]";
-		mes "I don't like this place.";
-		mes "You'd be better be careful";
-		mes "around here with those weird";
-		mes "creatures running around.";
-		close;
-	}
-	else if (aru_monas > 24) {
-		mes "[Larjes]";
-		mes "Good, you're back";
-		mes "I know that there's still";
-		mes "things on this island that";
-		mes "you want to investigate,";
-		mes "but did you want to leave";
-		mes "this place for a while?";
-		next;
-		if(select("Yes:No")==1) {
-			mes "[Larjes]";
-			mes "Alight, let's go.";
-			close2;
-			warp "ve_fild07",130,130;
-			end;
-		}
-		mes "[Larjes]";
-		mes "Alright, but becareful.";
-		mes "Those creatures almost";
-		mes "got you once, you know.";
-		close;
-	}
-	else {
-		mes "[Larjes]";
-		mes "Did you still want to";
-		mes "investigate the island?";
-		next;
-		if (select("No:Yes") == 1) {
-			mes "[Larjes]";
-			mes "Alright, let's go.";
-			close2;
-			warp "ve_fild07",130,130;
-			end;
-		}
-		mes "[Larjes]";
-		mes "Alright, but be careful.";
-		mes "Those creatures almost";
-		mes "got you once, you know.";
-		close;
-	}
-}
-
-nameless_i,212,184,0	script	#aru_clue1	-1,2,3,{
-	end;
-
-OnTouch:
-	if (aru_monas == 17) {
-		mes "^3355FFThe village is totally";
-		mes "silent, as if all life had";
-		mes "abandoned it. You look";
-		mes "around and see that something";
-		mes "was here a few hours ago, but";
-		mes "it's somewhere else now.^000000";
-		next;
-		mes "^3355FFWhatever it was,";
-		mes "it definitely wasn't";
-		mes "human. What kind of";
-		mes "creature could it be?^000000";
-		close;
-	}
-	end;
-}
-
-nameless_in,21,176,0	script	#aru_clue2	-1,2,2,{
-	end;
-
-OnTouch:
-	if (aru_monas == 17) {
-		mes "^3355FFThere are traces of";
-		mes "humans around here,";
-		mes "along with some kind";
-		mes "of creature that you";
-		mes "can't clearly identify.^000000";
-		close;
-	}
-	end;
-}
-
-nameless_i,129,218,0	script	#aru_clue3	-1,4,3,{
-	end;
-
-OnTouch:
-	if (aru_monas == 17) {
-		mes "^3355FFA strange scent strikes";
-		mes "you as you enter this field of";
-		mes "grass. A few ^32CD32animal corpses^3355FF";
-		mes "are strewn around the ground.^000000";
-		close;
-	}
-	end;
-}
-
-nameless_i,127,207,0	script	Dead Crow#Aru	111,{
-	if (aru_monas < 17) { 
-		mes "^3355FFThere is a dead crow on the ground.";
-		close;
-	}
-	else if (aru_monas == 17) {
-		mes "^3355FFThe sight of this ^32CD32dead";
-		mes "crow^3355FF makes you feel";
-		mes "uneasy for some reason.^000000";
-		next;
-		if (select("Ignore:Investigate") == 1) {
-			mes "^3355FFYou decide not to touch";
-			mes "the animal's carcass.^000000";
-			close;
-		}
-		mes "^3355FFYou notice some grass sap";
-		mes "on the crow's beak, so it";
-		mes "must have been nibbling on";
-		mes "some grass. Some feathers";
-		mes "are missing, revealing";
-		mes "scaly, snake-like skin.^000000";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Wait...";
-		mes "Did this grass...?";
-		next;
-		mes "^3355FFThis grass must be the";
-		mes "main ingredient of the";
-		mes "poison used to kill the";
-		mes "Gaebolg family princes.^000000";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Looks like I just hit";
-		mes "the jackpot. Huh?";
-		mes "Someone behi--";
-		next;
-		mes "^3355FFA sharp, throbbing pain";
-		mes "assails the back of your";
-		mes "head as you fall into";
-		mes "unconsciousness...^000000";
-		close2;
-		set aru_monas,18;
-		warp "nameless_in",15,60;
-		end;
-	}
-	end;
-}
-
-nameless_i,168,257,0	script	Aru_LockedDoor	45,1,1,{
-	end;
-
-OnTouch:
-	if (aru_monas == 18 || aru_monas == 19) {
-		warp "nameless_in",12,41;
-		end;
-	}
-	mes "^3355FFThe door won't budge:";
-	mes "you can't go through.^000000";
-	close;
-}
-
-nameless_in,15,60,0	script	#Aru_Trigger	-1,1,1,{
-	end;
-
-OnTouch:
-	if (aru_monas == 18) {
-		disablenpc "aru_warp";
-		sc_start2 SC_Blind,600000,0,10000;
-		mes "^3355FFThe pressure on your";
-		mes "stomach and the blood";
-		mes "rushing to your head tells";
-		mes "you someone is carrying you";
-		mes "over his shoulder. He stops,";
-		mes "and you hear a faint voice.^000000";
-		next;
-		mes "^3355FFThe faint voice steadily";
-		mes "grows stronger and more";
-		mes "distinct--someone's calling";
-		mes "your name. You feel cold water";
-		mes "trickle through your lips, and";
-		mes "then you regain your senses.^000000";
-		sc_end SC_BLIND;
-		next;
-		hideoffnpc "Larjes#Aru2";
-		mes "That was too close.";
-		mes "For a second there,";
-		mes "I thought I lost you.";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Larjes...? What...";
-		mes "What happened?";
-		mes "Ugh, my head...";
-		next;
-		mes "[Larjes]";
-		mes "Try not to move for a while.";
-		mes "I had a bad feeling waiting";
-		mes "for you on the boat. Lucky";
-		mes "thing. When I found you,";
-		mes "these strange creatures";
-		mes "were savagely attacking you!";
-		next;
-		mes "[" +strcharinfo(0)+ "]";
-		mes "You saved me?";
-		mes "Thank you. Do you";
-		mes "happen to know what";
-		mes "those creatures were?";
-		next;
-		mes "[Larjes]";
-		mes "No clue. They looked";
-		mes "like humans, but... They";
-		mes "definitely weren't. Once";
-		mes "I killed them, they all";
-		mes "turned into sand.";
-		next;
-		hideoffnpc "Creature#Aru";
-		emotion e_omg,1;
-		emotion e_omg;
-		mes "[Larjes]";
-		mes "?!?!?!!!!!";
-		next;
-		mes "[" +strcharinfo(0)+ "]";
-		mes "!!!!?!?!!!!!!";
-		mes "Isn't... Isn't that...?";
-		next;
-		mes "[Larjes]";
-		mes "It seems it's just like the";
-		mes "creatures that kidnapped";
-		mes "you, but... I wonder why";
-		mes "he's not attacking us.";
-		next;
-		mes "[" +strcharinfo(0)+ "]";
-		mes "I guess you'll have to go";
-		mes "right up to him and ask.";
-		set aru_monas,19;
-		close;
-	}
-}
-
-nameless_in,13,58,6	script	Larjes#Aru2	97,{
-	mes "[Larjes]";
-	mes "Be careful. That guy";
-	mes "looks pretty dangerous.";
-	close;
-}
-
-nameless_in,13,53,0	script	Creature#Aru	1864,{
-	end;
-
-OnInit:
-	hideonnpc "Creature#Aru";
-	end;
-
-OnMyMobDead:
-	enablenpc "aru_warp";
-	end;
-}
-
-nameless_in,13,53,0	script	#Aru_Trigger2	-1,3,1,{
-	end;
-
-OnTouch:
-	if (aru_monas == 19 && !@mymobcount) {
-		mes "[???????]";
-		mes "Grrr~!!!";
-		close2;
-		hideonnpc "Creature#Aru";
-		set @mymobcount,1;
-		monster "nameless_in",13,53,"Zombie",1864,1,"Creature#Aru::OnMyMobDead";
-		end;
-	}
-	end;
-}
-
-nameless_in,12,37,0	script	aru_warp	45,1,1,{
-	end;
-
-OnTouch:
-	if (aru_monas == 19) {
-		set aru_monas,20;
-		warp "nameless_n",168,252;
-		end;
-	}
-
-OnInit:
-	disablenpc "aru_warp";
-	end;
-}
-
-nameless_n,169,254,0	script	#Aru_Trigger3	-1,3,3,{
-	end;
-
-OnTouch:
-	if(aru_monas == 20) {
-		hideoffnpc "Larjes#Aru3";
-		mes "[" +strcharinfo(0)+ "]";
-		mes "What the hell...!?";
-		next;
-		mes "[Larjes]";
-		mes "So... This is the";
-		mes "island's true nature.";
-		next;
-		mes "[Larjes]";
-		mes "Someone like me won't";
-		mes "survive long in a place";
-		mes "like this. I'm going to wait";
-		mes "for you in the boat. Learn";
-		mes "what you need to learn, and";
-		mes "then come back safe, "+strcharinfo(0)+".";
-		set aru_monas,21;
-		hideonnpc "Larjes#Aru3";
-		close;
-	}
-	end;
-}
-
-nameless_n,166,254,7	script	Larjes#Aru3	97,{
-	end;
-
-OnInit:
-	hideonnpc "Larjes#Aru3";
-	end;
-}
-
-nameless_n,259,218,3	script	Larjes#Boat1	97,{
-	if ((aru_monas == 23) && (countitem(7726))) {
-		mes "[Larjes]";
-		mes "I don't believe it...";
-		mes "That guy was Tristam III?!";
-		mes "This explains a lot, I suppose.";
-		mes "I'll report this along with the";
-		mes "voucher. So Arunafeltz was";
-		mes "behind that poison grass too.";
-		next;
-		mes "[Larjes]";
-		mes "I'm shocked over this";
-		mes "whole debacle. I'm sure";
-		mes "the Rune-Midgarts royal family";
-		mes "will be in an uproar over this.";
-		mes "To think that we're involved";
-		mes "in something this huge...";
-		next;
-		mes "[Larjes]";
-		mes "Anyway, we better get...";
-		mes "This is huge!";
-		set aru_monas,24;
-		delitem 7726,1; //Token_Of_King
-		if(checkre(0))
-			getexp 100000,0;
-		else
-			getexp 1000000,0;
-		close;
-	}
-	mes "[Larjes]";
-	mes "Did you still want to";
-	mes "investigate the island?";
-	next;
-	if(select("No:yes")==1) {
-		mes "[Larjes]";
-		mes "Alright, let's go.";
-		close2;
-		warp "ve_fild07",130,130;
-		end;
-	}
-	mes "[Larjes]";
-	mes "Alright, but becareful.";
-	mes "Those creatures almost";
-	mes "got you once, you know.";
-	close;
-}
-
-abbey02,224,70,0	script	Book#Aru	111,{
-	if (checkweight(7766,1) == 0) {
-		mes "^3355FFWait a second!";
-		mes "Right now, you're carrying";
-		mes "too many things with you.";
-		mes "Please come back after";
-		mes "using the Kafra Service";
-		mes "to store some of your items.^000000";
-		close;
-	}
-	if (aru_monas < 21) {
-		mes "^3355FFIt's just a bunch";
-		mes "of old, moldy books.^000000";
-		close;
-	}
-	else if (aru_monas == 21) {
-		mes "^3355FFThere's a book stained";
-		mes "with blood amongst all";
-		mes "these old, moldy books.^000000";
-		next;
-		if(select("Examine Book:Ignore")==1) {
-			Readbook 7755,1;
-			getitem 7755,1; // Reasearch_Note
-			set aru_monas,22;
-			close;
-		}
-		mes "^3355FFThat book was probably";
-		mes "worthless to you anyway.^000000";
-		close;
-	}
-	else {
-		mes "^3355FFThere are old books";
-		mes "scattered all over here.^000000";
-		close;
-	}
-}
-
-abbey03,232,233,4	script	Man#Aru	956,{
-	if (aru_monas < 22) {
-		mes "^3355FFYou find a man lying on";
-		mes "the floor, wearing torn";
-		mes "yet luxurious clothing.";
-		mes "He doesn't seem to be";
-		mes "breathing at all...^000000.";
-		next;
-		mes "^3355FFHe's dead.^000000";
-		close;
-	}
-	if (aru_monas == 22) {
-		mes "^3355FFYou find a man lying on";
-		mes "the floor, wearing torn";
-		mes "yet luxurious clothing.";
-		mes "He doesn't seem to be";
-		mes "breathing at all...^000000.";
-		next;
-		mes "^3355FFYou bring your ears more";
-		mes "closely to his mouth: it";
-		mes "seems that he really is";
-		mes "still barely alive.^000000";
-		next;
-		if (select("Touch Him:Ignore Him") == 1) {
-			mes "["+strcharinfo(0)+"]";
-			mes "This man...";
-			mes "He's so familiar";
-			mes "for some reason.";
-			next;
-			mes "^3355FFAs you touch him, the";
-			mes "man suddenly jumps";
-			mes "up with a crazed yowl.^000000";
-			initnpctimer;
-			hideonnpc "Man#Aru";
-			monster "abbey03",232,232,"Dead King",1875,1,"Man#Aru::OnMyMobDead";
-			close;
-		}
-		mes "^3355FFYou don't feel";
-		mes "comfortable enough";
-		mes "to touch this man.^000000";
-		close;
-	}
-	if (aru_monas > 22) {
-		mes "^3355FFHe's dead... Now...^000000";
-		close;
-	}
-
-OnMyMobDead:
-	stopnpctimer;
-	hideoffnpc "Dead Man#Aru";
-	donpcevent "Dead Man#Aru::OnEnable";
-	end;
-
-OnTimer300000:
-	stopnpctimer;
-	hideonnpc "Dead Man#Aru";
-	hideoffnpc "Man#Aru";
-	end;
-}
-
-abbey03,232,232,4	script	Dead Man#Aru	956,{
-	if (checkweight(7766,1) == 0) {
-		mes "^3355FFWait a second!";
-		mes "Right now, you're carrying";
-		mes "too many things with you.";
-		mes "Please come back after";
-		mes "using the Kafra Service";
-		mes "to store some of your items.^000000";
-		close;
-	}
-	if (aru_monas == 22) {
-		mes "^3355FFYou have no idea why";
-		mes "this dead man is moving";
-		mes "around, so you decided to";
-		mes "examine him. In his jacket,";
-		mes "you find a shining medal...^000000";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "This medal...";
-		mes "This means that";
-		mes "this man is...!";
-		set aru_monas,23;
-		getitem 7726,1; //Token_of_King
-		hideonnpc "Dead Man#Aru";
-		hideoffnpc "Man#Aru";
-		stopnpctimer;
-		close;
-	}
-	end;
-
-OnEnable:
-	initnpctimer;
-	end;
-
-OnInit:
-	hideonnpc "Dead Man#Aru";
-	end;
-}
-
-ra_temple,168,54,3	script	Sippie#ss	917,{
+ra_temple,168,54,3	script	Sippie#ss	4_F_MASK,{
 	mes "[Sippie]";
 	mes "Now I finally have some";
 	mes "time to take a break.";
@@ -2138,9 +2255,9 @@ ra_temple,168,54,3	script	Sippie#ss	917,{
 	}
 }
 
-// Peace to the Arunafeltz
+// Peace to the Arunafeltz :: aruna_em
 //============================================================
-moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
+moc_ruins,77,167,4	script	Foreign Merchant#aru1	4_M_MASKMAN,5,5,{
 	if (aru_vol == 27) {
 		if (aru_em == 0) {
 			emotion e_dots;
@@ -2188,6 +2305,7 @@ moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
 			mes "of Morroc? Before I leave,";
 			mes "I want to taste that drink...";
 			set aru_em,1;
+			setquest 2129;
 			close;
 		}
 		else if ((aru_em > 0) && (aru_em < 7)) {
@@ -2224,7 +2342,7 @@ moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
 				mes "^3355FF*Gulp Gulp Gulp Gulp*^000000";
 				mes "^3355FF*Gulp Gulp Gulp Gulp*^000000";
 				next;
-				emotion 3;
+				emotion e_lv;
 				mes "[Foreign Merchant]";
 				mes "Ahhh! That hit the spot!";
 				mes "It's so refreshing and so";
@@ -2262,7 +2380,7 @@ moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
 				mes "You're not really a";
 				mes "merchant, are you?";
 				next;
-				emotion 39;
+				emotion e_meh;
 				mes "^3355FFThe merchant quietly";
 				mes "looks at you with a";
 				mes "mischievous grin.^000000";
@@ -2285,6 +2403,7 @@ moc_ruins,77,167,4	script	Foreign Merchant#aru1	880,5,5,{
 				mes "speak to him now?";
 				mes "Good luck!";
 				set aru_em,8;
+				changequest 2130,2131;
 				close;
 			case 2:
 				mes "[Foreign Merchant]";
@@ -2368,7 +2487,7 @@ OnTouch:
 	end;
 }
 
-moc_ruins,101,133,7	script	Foreign Merchant#aru2	929,{
+moc_ruins,101,133,7	script	Foreign Merchant#aru2	4_M_MIDDLE,{
 	if ((aru_em > 1) && (aru_em < 7)) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "Excuse me, but I heard";
@@ -2398,13 +2517,13 @@ moc_ruins,101,133,7	script	Foreign Merchant#aru2	929,{
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Oh, no...";
-		emotion 57,1;
+		emotion e_otl,1;
 		next;
 		mes "[Foreign Merchant]";
 		mes "...............................";
 		mes "...............................";
 		mes "...............................";
-		emotion 19;
+		emotion e_swt2;
 		next;
 		emotion e_omg,1;
 		mes "[Foreign Merchant]";
@@ -2427,7 +2546,7 @@ moc_ruins,101,133,7	script	Foreign Merchant#aru2	929,{
 		mes "keep an extra bottle in case";
 		mes "you want more next time. Take";
 		mes "care, and I'll see you later!";
-		emotion 13;
+		emotion e_korea;
 		next;
 		mes "^3355FFYou received a bottle";
 		mes "of the famous fruit wine";
@@ -2435,6 +2554,7 @@ moc_ruins,101,133,7	script	Foreign Merchant#aru2	929,{
 		mes "guy's pretty nice!^000000";
 		set aru_em,7;
 		hideonnpc "Foreign Merchant#aru2";
+		changequest 2129,2130;
 		close;
 	}
 	else {
@@ -2451,7 +2571,7 @@ OnInit:
 	end;
 }
 
-ra_temin,103,151,7	script	Female Follower#em	917,{
+ra_temin,103,151,7	script	Female Follower#em	4_F_MASK,{
 	if (aru_em < 9) {
 		mes "[Sappie]";
 		mes "I work really hard to keep";
@@ -2546,7 +2666,7 @@ ra_temin,103,151,7	script	Female Follower#em	917,{
 	}
 }
 
-ra_fild03,139,355,5	script	Ishmael#em	914,{
+ra_fild03,139,355,5	script	Ishmael#em	4_F_CHILD,{
 	if (checkweight(907,200) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -2563,7 +2683,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 		mes "just step away? I... I don't";
 		mes "like being too close to";
 		mes "other people. Please!";
-		emotion 19;
+		emotion e_swt2;
 		close;
 	}
 	else if (aru_em == 17) {
@@ -2573,7 +2693,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 		mes "just step away? Wait, you";
 		mes "don't have something you";
 		mes "need from me, do you?";
-		emotion 19;
+		emotion e_swt2;
 		next;
 		switch(select("Give Her Niren's File:Leave Her Alone")) {
 		case 1:
@@ -2587,7 +2707,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 				mes "Just toss the file over";
 				mes "to me. I-I don't want";
 				mes "you coming any closer.";
-				emotion 19;
+				emotion e_swt2;
 				next;
 				mes "[Ishmael]";
 				mes "I'll be glad to help out";
@@ -2625,6 +2745,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 				mes "she's been so good to us...";
 				set aru_em,18;
 				delitem 7343,1; //File02
+				changequest 2137,2138;
 				close;
 			}
 			else {
@@ -2660,7 +2781,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 			mes "I still... Uh... I don't mean";
 			mes "to be rude... It's just...";
 			mes "I'm just not good with...";
-			emotion 19;
+			emotion e_swt2;
 			next;
 			mes "[Ishmael]";
 			mes "If you just toss the";
@@ -2712,6 +2833,7 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 				delitem 725,1; //Red_Jewel
 				set aru_em,19;
 				getitem 7343,1; //File02
+				changequest 2138,2139;
 				close;
 			}
 		}
@@ -2736,13 +2858,13 @@ ra_fild03,139,355,5	script	Ishmael#em	914,{
 	}
 }
 
-que_temsky,101,93,1	script	Niren#em_sky	915,{
+que_temsky,101,93,1	script	Niren#em_sky	4_F_MADAME,{
 	end;
 }
-que_temsky,98,93,7	script	Zhed#em_sky	932,{
+que_temsky,98,93,7	script	Zhed#em_sky	4_M_RACHOLD1,{
 	end;
 }
-que_temsky,99,100,6	script	Pope#rachel2	936,{
+que_temsky,99,100,6	script	Pope#rachel2	4_F_ARUNA_POP,{
 	end;
 }
 
@@ -3021,6 +3143,7 @@ OnTouch:
 		mes "aura of warmth and kindness";
 		mes "permeate your entire being.^000000";
 		set aru_em,22;
+		changequest 2140,2141;
 		close2;
 		warp "rachel",142,136;
 	}
@@ -3088,9 +3211,9 @@ OnTimer53000:
 
 que_temsky,99,7,0	warp	quetemskyout	1,1,ra_temin,276,231
 
-// Muff's Loan
-//============================================================ 
-comodo,224,187,3	script	Muff	86,{
+// Muff's Loan :: zdan_total_edq
+//============================================================
+comodo,224,187,3	script	Muff	4_M_04,{
 	if (checkweight(907,200) == 0) {
 		mes "[Muff]";
 		mes "You're carrying way too";
@@ -3471,7 +3594,7 @@ comodo,224,187,3	script	Muff	86,{
 	close;
 }
 
-alberta,127,143,3	script	Belder	85,{
+alberta,127,143,3	script	Belder	4_M_03,{
 	if (diamond_edq == 0) {
 		mes "[Belder]";
 		mes "I ought to hire some";
@@ -3581,7 +3704,7 @@ OnTouch:
 	end;
 }
 
-cmd_fild01,55,160,0	script	Heap of Earth	844,{
+cmd_fild01,55,160,0	script	Heap of Earth	CLEAR_NPC,{
 	if (diamond_edq == 1) {
 		mes "^3355FFIt looks like someone";
 		mes "dug a hole in the ground,";
@@ -3653,7 +3776,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 	close;
 }
 
--	script	::Dorian	-1,{
+-	script	::Dorian_izlude	-1,{
 	if (checkweight(907,200) == 0) {
 		mes "[Dorian]";
 		mes "Ugh, just like a member";
@@ -4159,9 +4282,385 @@ OnTouch:
 	end;
 }
 
+izlude_in,113,66,0	script	Strange Machine	HIDDEN_NPC,{
+	if (checkweight(907,200) == 0) {
+		mes "[Dorian]";
+		mes "Ugh, just like a member";
+		mes "of the working class:";
+		mes "hoarding all your items";
+		mes "like a packrat? Have the";
+		mes "decency to relocate your";
+		mes "goods to Kafra Storage, please.";
+		close;
+	}
+	if (diamond_edq) == 10 {
+		set .@bolt_rand,rand(2,5);
+		mes "^3355FFThis must be Dorian's";
+		mes "Mystic Dryer de Elegance.";
+		mes "What do you want to do?^000000";
+		next;
+		while(1) {
+			set .@switch_sound,rand(1,4);
+			switch(select("Check the Machine:Replace the Engine:Tighten the Screw:Press a Switch")) {
+			case 1:
+				if (.@hit_status == 0) {
+					mes "^3355FFThere's no power";
+					mes "in this behemoth";
+					mes "of a machine.^000000";
+					next;
+				}
+				break;
+			case 2:
+				if (.@engine == 0) {
+					mes "^3355FFYou replace the rough";
+					mes "ruby in the ruby engine";
+					mes "with a new rough ruby.";
+					mes "It clicks into place";
+					mes "inside the engine core.^000000";
+					next;
+					set .@engine,.@engine+1;
+				}
+				else if (engine > 0) {
+					mes "^3355FFThe ruby in the";
+					mes "engine has already";
+					mes "been replaced.^000000";
+					next;
+				}
+				break;
+			case 3:
+				if (.@engine <  1) {
+					mes "^3355FFYou probably need";
+					mes "to replace the ruby";
+					mes "in the engine first.^000000";
+					next;
+				}
+				else if ((.@engine == 1) && (.@bolt < .@bolt_rand)) {
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					next;
+					set .@bolt,.@bolt+1;
+				}
+				else if ((.@engine == 1) && (.@bolt == .@bolt_rand)) {
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					mes "^0000FF*Click*^000000";
+					next;
+					set .@bolt,.@bolt+1;
+					set .@bolt_suc,.@bolt_suc+1;
+				}
+				else if ((.@engine == 1) && (.@bolt > .@bolt_rand)) {
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					mes "^3355FF*KrrICK-ICK-ICK-KOOM*^000000";
+					next;
+					mes "^3355FFYou tightened the";
+					mes "screw too tightly!";
+					mes "The joint is broken...";
+					mes "You should go back";
+					mes "to Dorian for help.^000000";
+					setquest 3106;
+					set diamond_edq,11;
+					close;
+				}
+				else {
+					mes "^3355FFSomething must have";
+					mes "gone wrong. You'd be";
+					mes "better off starting";
+					mes "from the beginning...^000000";
+					close;
+				}
+				break;
+			case 4:
+				if ((.@engine <  1) && (.@bolt_suc < 1)) {
+					mes "^3355FFYou need to replace";
+					mes "the engine's ruby and";
+					mes "tighten the main screw";
+					mes "before you mess with";
+					mes "these switches.^000000";
+					next;
+				}
+				else if ((.@engine == 1) && (.@bolt_suc < 1)) {
+					mes "^3355FFYou need to tighten";
+					mes "the scren before you can";
+					mes "start the engine safely.";
+					next;
+				}
+				else if ((.@red >= 1) && (.@blue >= 1) && (.@yellow >= 1) && (.@green >= 1)) {
+					mes "^3355FFThe Mystic Dryer de";
+					mes "Elegance started with";
+					mes "a mighty buzz, and the";
+					mes "sound lowers to a calm";
+					mes "hum as it stabilizes.";
+					mes "It looks like you fixed it!^000000";
+					next;
+					mes "^3355FFYou should tell Dorian";
+					mes "first so that you can";
+					mes "use this machine.^000000";
+					setquest 3107;
+					set diamond_edq,12;
+					close;
+				}
+				else if ((.@engine == 1) && (.@bolt_suc == 1)) {
+					if (.@switch_sound == 1) {
+						mes "^3355FF*Buzz Buzz*^000000";
+						mes "^3355FF*Buzz Buzz*^000000";
+						mes "^3355FFThe machine is";
+						mes "vibrating weakly.";
+						mes "Which switch do";
+						mes "you want to press?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 1:
+							if (.@red  >= 0) {
+								mes "^3355FF*Buzzz Buzzz*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@red,.@red+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+					else if (.@switch_sound == 2) {
+						mes "^3355FF*Purr Purr*^000000";
+						mes "^3355FF*Purr Purr*^000000";
+						mes "^3355FFThe machine is vibrating";
+						mes "a little bit more strongly.";
+						mes "Which switch will";
+						mes "you try now?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 2:
+							if (.@blue >= 0) {
+								mes "^3355FF*Purrr Purr*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@blue,.@blue+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+					else if (.@switch_sound == 3) {
+						mes "^3355FF*Bzzz Bzzz*";
+						mes "*Bzzz Bzzz*";
+						mes "The machine's vibrations";
+						mes "are a bit more stable now.";
+						mes "Which switch will you try?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 3:
+							if (.@yellow >= 0) {
+								mes "^3355FF*Bzzzz Bzzzz*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@yellow,.@yellow+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+					else if (.@switch_sound == 4) {
+						next;
+						mes "^3355FF*Pzzzz Pzzz*";
+						mes "*Pzzzz Pzzz*";
+						mes "The machine is vibrating";
+						mes "fairly strongly now. Which";
+						mes "switch will you try?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 4:
+							if (.@green >= 0) {
+								mes "^3355FFPzzzzz Pzzzz*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@green,.@green+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	if (diamond_edq == 12) {
+		mes "[Dorian]";
+		mes "It sounds like you're";
+		mes "done fixing my Mystic";
+		mes "Dryer de Elegance.";
+		mes "Why don't you come";
+		mes "back so I can explain";
+		mes "how you can use it?";
+		close;
+	}
+	if ((diamond_edq == 13) && (countitem(7722) < 1)) {
+		mes "^3355FFYou lift the main";
+		mes "operational switch,";
+		mes "turning on a light and";
+		mes "opening a convenient";
+		mes "slot. You insert the";
+		mes "wet bond of debt.^000000";
+		next;
+		mes "^3355FFThe engine's pistons";
+		mes "and cylinders churn";
+		mes "with a lively din, and";
+		mes "when the heater stops,";
+		mes "the slot reopens.^000000";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "So this is the original";
+		mes "bond of debt that Muff";
+		mes "lost? It looks... Perfect!";
+		changequest 3108,3109;
+		getitem 7722,1; //Debt_Note
+		close;
+	}
+	else if ((diamond_edq == 13) && (countitem(7722) > 0)) {
+		mes "You already used this";
+		mes "machine to restore the";
+		mes "bond of debt. There's no";
+		mes "need to mess around";
+		mes "with it any longer.";
+		close;
+	}
+	mes "[Dorian]";
+	mes "Who are you?";
+	mes "Don't you dare lay";
+	mes "a hand on my precious";
+	mes "masterpiece inventions! ";
+	close;
+}
+
 // Broken Diamond
-//============================================================ 
-moc_ruins,152,147,5	script	Ibrahim	732,3,3,{
+//============================================================
+moc_ruins,152,147,5	script	Ibrahim	4_M_JOB_HUNTER,3,3,{
 	if (checkweight(907,200) == 0) {
 		mes "[Ibrahim]";
 		mes "You're carrying too much";
@@ -4687,7 +5186,7 @@ if ((diamond_edq == 14) && (BaseLevel > 65)) {
 	end;
 }
 
-alberta,102,80,3	script	Jhonnita	86,{
+alberta,102,80,3	script	Jhonnita	4_M_04,{
 	if ((diamond_edq == 15) || (diamond_edq == 16)) {
 		mes "[Jhonnita]";
 		mes "Oh, it's always nice";
@@ -4848,7 +5347,7 @@ alberta,102,80,3	script	Jhonnita	86,{
 	}
 }
 
-payon,69,65,5	script	Kimeunbang	89,{
+payon,69,65,5	script	Kimeunbang	4_M_ORIENT02,{
 	if (diamond_edq == 15) {
 		mes "[Kimeunbang]";
 		mes "Zzzz... Huh?";
@@ -4981,7 +5480,7 @@ payon,69,65,5	script	Kimeunbang	89,{
 	}
 }
 
-geffen,128,153,3	script	Leblo	883,{
+geffen,128,153,3	script	Leblo	4_M_ALCHE_D,{
 	if ((diamond_edq == 15) || (diamond_edq == 16)) {
 		mes "[Leblo]";
 		mes "Oh, I've heard about";
@@ -5193,7 +5692,7 @@ geffen,128,153,3	script	Leblo	883,{
 	close;
 }
 
-payon_in03,167,149,3	script	Wola	75,2,2,{
+payon_in03,167,149,3	script	Wola	1_F_ORIENT_01,2,2,{
 	if (checkweight(907,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -5535,7 +6034,7 @@ OnTouch:
 	end;
 }
 
-in_rogue,366,46,3	script	Rogue Investigator	828,{
+in_rogue,366,46,3	script	Rogue Investigator	4_M_ROGUE,{
 	if ((diamond_edq == 22) && (BaseJob == Job_Rogue)) {
 		mes "[Investigator]";
 		mes "Oh, remember me?";
@@ -5615,7 +6114,7 @@ in_rogue,366,46,3	script	Rogue Investigator	828,{
 		switch(select("Sounds good!:Never mind, I'll find it myself...")) {
 		case 1:
 			if (Zeny > 9999) {
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				mes "[Investigator]";
 				mes "Thanks for the money~";
 				mes "Of course, if you became";
@@ -5693,7 +6192,7 @@ in_rogue,366,46,3	script	Rogue Investigator	828,{
 		switch(select("Sounds good!:Forget it...")) {
 		case 1:
 			if (Zeny > 9999) {
-				set zeny,zeny-10000;
+				Zeny -= 10000;
 				mes "[Investigator]";
 				mes "Right on, right on.";
 				mes "Alright, I didn't charge";
@@ -5734,7 +6233,7 @@ in_rogue,366,46,3	script	Rogue Investigator	828,{
 	close;
 }
 
-cmd_in02,94,208,5	script	Investigator	828,{
+cmd_in02,94,208,5	script	Investigator	4_M_ROGUE,{
 	if ((diamond_edq == 22) || (diamond_edq == 23)) {
 		if (BaseJob == Job_Rogue) {
 			mes "[Investigator]";
@@ -5773,7 +6272,7 @@ cmd_in02,94,208,5	script	Investigator	828,{
 	}
 }
 
-cmd_in02,69,188,1	script	Small Safe	844,{
+cmd_in02,69,188,1	script	Small Safe	CLEAR_NPC,{
 	if ((diamond_edq == 22) || (diamond_edq == 23)) {
 		mes "^3355FFThere is a small";
 		mes "safe hidden under the";
@@ -5831,7 +6330,7 @@ cmd_in02,69,188,1	script	Small Safe	844,{
 	close;
 }
 
-cmd_in02,69,196,0	script	Odd Switch#Switch1	844,{
+cmd_in02,69,196,0	script	Odd Switch#Switch1	CLEAR_NPC,{
 	if ((diamond_edq == 22) || (diamond_edq == 23)) {
 		mes "^3355FFThere is a tiny";
 		mes "switch on the ground";
@@ -5859,7 +6358,7 @@ OnInit:
 	end;
 }
 
-cmd_in02,80,189,0	script	Odd Switch#Switch2	844,{
+cmd_in02,80,189,0	script	Odd Switch#Switch2	CLEAR_NPC,{
 	if ((diamond_edq == 22) || (diamond_edq == 23)) {
 		mes "^3355FFThere is a tiny";
 		mes "switch on the ground";
@@ -5890,8 +6389,8 @@ OnInit:
 }
 
 // Z-Gang Quest
-//============================================================ 
-prontera,150,326,0	script	Wanted Notice#edq	111,{
+//============================================================
+prontera,150,326,0	script	Wanted Notice#edq	HIDDEN_NPC,{
 	if (zdan_edq == 0) {
 		mes "====National Wanted Notice====";
 		mes "Please report any information";
@@ -5979,7 +6478,7 @@ OnDisable:
 	end;
 }
 
-prontera,148,326,3	script	Chief Officer#edq	734,{
+prontera,148,326,3	script	Chief Officer#edq	4_M_JOB_KNIGHT2,{
 	if (checkweight(907,200) == 0) {
 		mes "[Chief Officer]";
 		mes "You're carrying far too";
@@ -6188,10 +6687,7 @@ prontera,148,326,3	script	Chief Officer#edq	734,{
 		mes "Congratulations! ";
 		completequest 3134;
 		set zdan_edq,19;
-		if(checkre(0))
-			getexp 100000,0;
-		else
-			getexp 1000000,0;
+		getexp (checkre(3))?100000:1000000,0;
 		close;
 	}
 	mes "[Chief Officer]";
@@ -6203,7 +6699,7 @@ prontera,148,326,3	script	Chief Officer#edq	734,{
 	close;
 }
 
-prt_in,168,18,1	script	Valdes	65,2,2,{
+prt_in,168,18,1	script	Valdes	1_M_YOUNGKNIGHT,2,2,{
 	if (checkweight(907,100) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -6390,7 +6886,7 @@ OnTouch:
 	end;
 }
 
-in_rogue,359,116,3	script	Marybell	747,{
+in_rogue,359,116,3	script	Marybell	4_F_ROGUE,{
 	if (zdan_edq == 4) {
 		mes "[Marybell]";
 		mes "Hey. What do you want?";
@@ -6791,7 +7287,7 @@ in_rogue,359,116,3	script	Marybell	747,{
 	}
 }
 
-payon,244,62,3	script	Moonho Ahn	897,{
+payon,244,62,3	script	Moonho Ahn	4_M_HUGRANFA,{
 	if (zdan_edq == 5) {
 		mes "[Moonho Ahn]";
 		mes "Hahaha, now what brings";
@@ -6894,7 +7390,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 		switch(select("Yes, let's play!:How does this game work again?")) {
 		case 1:
 			if (Zeny > 500) {
-				set zeny,zeny-500;
+				Zeny -= 500;
 				mes "[Moonho Ahn]";
 				mes "Good, let's get started!";
 				mes "I'll let you go first~";
@@ -7148,7 +7644,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 						if (((.@input$ == "Odd") && (.@number == 1)) || ((.@input$ == "Even") && (.@number == 2))) {
 							set .@number_right_3,.@number_right_3+1;
 							mes "[Moonho Ahn]";
-							mes "^0000FF"+.@input+"^000000?";
+							mes "^0000FF"+.@input$+"^000000?";
 							mes "Okay, you won.";
 							next;
 							if ((.@number_right_3 < 2) && (.@number_false_3 < 2)) {
@@ -7161,7 +7657,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 						else if (((.@input$ == "Odd") && (.@number == 2)) || ((.@input$ == "Even") && (.@number == 1))) {
 							set .@number_false_3,.@number_false_3+1;
 							mes "[Moonho Ahn]";
-							mes "Well, it's ^0000FF"+.@input+"^000000.";
+							mes "Well, it's ^0000FF"+.@input$+"^000000.";
 							mes "Looks like I won.";
 							next;
 							if ((.@number_right_3 < 2) && (.@number_false_3 <2)) {
@@ -7340,7 +7836,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 	close;
 }
 
-payon,192,176,3	script	Gooho Ahn	903,{
+payon,192,176,3	script	Gooho Ahn	4_M_KHKYEL,{
 	if (zdan_edq == 12) {
 		mes "[Gooho Ahn]";
 		mes "Oh, hello";
@@ -7548,7 +8044,7 @@ payon,192,176,3	script	Gooho Ahn	903,{
 	close;
 }
 
-moc_ruins,90,67,3	script	Suspicious Man#1	99,2,2,{
+moc_ruins,90,67,3	script	Suspicious Man#1	4W_M_03,2,2,{
 	if ((zdan_edq == 9) && ($@zdan == 0)) {
 		set $@zdan,1;
 		initnpctimer;
@@ -7795,7 +8291,7 @@ OnTouch:
 }
 
 //Incorrect position.
-moc_ruins,78,167,3	script	Suspicious Man#2	99,2,2,{
+moc_ruins,78,167,3	script	Suspicious Man#2	4W_M_03,2,2,{
 	if ((zdan_edq == 9) && ($@zdan == 0)) {
 		set $@zdan,1;
 		initnpctimer;
@@ -8043,7 +8539,7 @@ OnTouch:
 	end;
 }
 
-moc_fild17,209,235,0	script	Odd Slab	111,4,4,{
+moc_fild17,209,235,0	script	Odd Slab	HIDDEN_NPC,4,4,{
 	if (((zdan_edq == 15) || (zdan_edq == 16) || (zdan_edq == 17)) && ($@door2 == 0)) {
 		mes "[Odd Slab]";
 		mes "^FF0000*Creak Creak*";
@@ -8289,7 +8785,7 @@ OnTouch:
 	end;
 }
 
-z_agit,1,1,0	script	#zdan_broad	111,{
+z_agit,1,1,0	script	#zdan_broad	HIDDEN_NPC,{
 OnInit:
 	disablenpc "#zdan_broad";
 	stopnpctimer;
@@ -8380,7 +8876,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	killmonster "z_agit","#ZGuard::OnMyMobDead";
 	set $@monster_zgang,0;
 	end;
@@ -8434,7 +8930,7 @@ OnTimer300000:
 	end;
 }
 
-z_agit,97,101,3	script	Louis	931,{
+z_agit,97,101,3	script	Louis	4_M_RACHMAN1,{
 	if (checkweight(907,200) == 0) {
 		mes "[Louis]";
 		mes "You mess with the";
@@ -8554,7 +9050,7 @@ OnInit:
 	end;
 }
 
-z_agit,99,101,3	script	Martha	101,{
+z_agit,99,101,3	script	Martha	4W_F_01,{
 	if (checkweight(907,200) == 0) {
 		mes "[Martha]";
 		mes "Hey, you're carrying";
@@ -8678,7 +9174,7 @@ OnInit:
 	end;
 }
 
-z_agit,95,101,3	script	Catfoii	876,{
+z_agit,95,101,3	script	Catfoii	4_CAT,{
 	if (checkweight(907,200) == 0) {
 		mes "[Catfoii]";
 		mes "You're carrying too";
@@ -8799,8 +9295,8 @@ OnInit:
 }
 
 // Unlucky Emerald
-//============================================================ 
-morocc,143,63,3	script	Ragged Man#nd	929,{
+//============================================================
+morocc,143,63,3	script	Ragged Man#nd	4_M_MIDDLE,{
 	if (treasure_nd == 0) {
 		mes "[Ragged Man]";
 		mes "H-hello? Would you help me?";
@@ -8884,7 +9380,7 @@ morocc,143,63,3	script	Ragged Man#nd	929,{
 						close;
 					}
 					else {
-						set zeny,zeny-1200;
+						Zeny -= 1200;
 						mes "[Ragged Man]";
 						mes "Let's see... I just need";
 						mes "1,200 zeny. That's enough";
@@ -8963,7 +9459,7 @@ morocc,143,63,3	script	Ragged Man#nd	929,{
 				mes "up the funds. I'll be waiting.";
 				close;			}
 			else {
-				set zeny,zeny-1200;
+				Zeny -= 1200;
 				mes "[Ragged Man]";
 				mes "Remember that hidden";
 				mes "treasure I was looking for?";
@@ -9041,7 +9537,7 @@ morocc,143,63,3	script	Ragged Man#nd	929,{
 	}
 }
 
-morocc,102,298,3	script	Man#zgang	98,{
+morocc,102,298,3	script	Man#zgang	4W_M_02,{
 	if (treasure_nd < 2) {
 		mes "[Man]";
 		mes "What do you want?";
@@ -9437,7 +9933,7 @@ morocc,102,298,3	script	Man#zgang	98,{
 	}
 }
 
-comodo,339,224,3	script	Man in Hiding#nd	881,{
+comodo,339,224,3	script	Man in Hiding#nd	4_M_SITDOWN,{
 	if (treasure_nd < 7) {
 		mes "[Man in Hiding]";
 		mes "Whoa, don't get so close!";
@@ -9640,7 +10136,7 @@ comodo,339,224,3	script	Man in Hiding#nd	881,{
 	}
 }
 
-moc_fild18,108,116,0	script	#treasure	844,{
+moc_fild18,108,116,0	script	#treasure	CLEAR_NPC,{
 	if (checkweight(907,300) == 0) {
 		mes "^3355FFYou're carrying too many";
 		mes "items: there's no way you";
@@ -9713,7 +10209,7 @@ moc_fild18,108,116,0	script	#treasure	844,{
 				getitem 7725,1; //Unlucky_Emerald
 				getitem 604,1; //Branch_Of_Dead_Tree
 				getitem 1157,1; //Two_Hand_Sword
-				sc_start2 SC_Curse,10000,0,10000;
+				sc_start SC_CURSE,10000,0,10000;
 				next;
 				mes "[" + strcharinfo(0) + "]";
 				mes "N-no! What's going on?";
@@ -9752,7 +10248,7 @@ moc_fild18,108,116,0	script	#treasure	844,{
 	}
 }
 
-comodo,139,184,3	script	Scholar#zgang	742,{
+comodo,139,184,3	script	Scholar#zgang	2_M_SAGE_B,{
 	if (jewel_nd < 9) {
 		mes "[Scholar]";
 		mes "I'm an antique appraiser.";
@@ -9913,7 +10409,7 @@ comodo,139,184,3	script	Scholar#zgang	742,{
 	}
 }
 
-alberta_in,70,109,5	script	Shaman	788,{
+alberta_in,70,109,5	script	Shaman	4_M_UMOLDMAN,{
 	if (jewel_nd == 0) {
 		mes "[Shaman]";
 		mes "The spiritual realm is";
@@ -10003,7 +10499,7 @@ alberta_in,70,109,5	script	Shaman	788,{
 			mes "If all goes well, you'll be";
 			mes "free of your curse, and I can";
 			mes "buy some Prontera real estate.";
-			set zeny,zeny-200000;
+			Zeny -= 200000;
 			set jewel_nd,14;
 			next;
 			mes "[Shaman]";
@@ -10054,7 +10550,7 @@ alberta_in,70,109,5	script	Shaman	788,{
 			mes "Hopefully, the";
 			mes "spirits will be more";
 			mes "cooperative this time.";
-			set zeny,zeny-100000;
+			Zeny -= 100000;
 			set jewel_nd,16;
 			next;
 			mes "[Shaman]";
@@ -10330,7 +10826,7 @@ alberta_in,70,109,5	script	Shaman	788,{
 	}
 }
 
-yuno_in04,38,48,3	script	Archeologist	55,{
+yuno_in04,38,48,3	script	Archeologist	1_M_JOBTESTER,{
 	if (jewel_nd < 18) {
 		mes "[Archeologist]";
 		mes "There's so much to do!";
@@ -10529,7 +11025,7 @@ yuno_in04,38,48,3	script	Archeologist	55,{
 	}
 }
 
-prontera,140,304,5	script	Old Soldier	901,{
+prontera,140,304,5	script	Old Soldier	4_M_HUOLDARMY,{
 	if (checkweight(907,200) == 0) {
 		mes "[Retired Soldier]";
 		mes "Why are you carrying";
@@ -10702,70 +11198,26 @@ prontera,140,304,5	script	Old Soldier	901,{
 					delitem 7725,1; //Unlucky_Emerald
 					set jewel_nd,31;
 					getitem 603,1; //Old_Blue_Box
-					if (BaseLevel < 66) {
-						getitem 607,1; //Yggdrasilberry
-						next;
-					}
-					if(checkre(0)) {
-						if ((BaseLevel > 65) && (BaseLevel < 75)) {
-							getexp 5000,0;
-							next;
-						}
-						else if ((BaseLevel > 74) && (BaseLevel < 81)) {
-							getexp 18000,0;
-							next;
-						}
-						else if ((BaseLevel > 80) && (BaseLevel < 86)) {
-							getexp 36000,0;
-							next;
-						}
-						else if ((BaseLevel > 85) && (BaseLevel < 91)) {
-							getexp 50000,0;
-							next;
-						}
-						else if ((BaseLevel > 90) && (BaseLevel < 96)) {
-							getexp 80000,0;
-							next;
-						}
-						else if ((BaseLevel > 95) && (BaseLevel < 150)) {
-							getexp 100000,0;
-							next;
-						}
+					if (checkre(3)) {
+						if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
+						else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 5000,0;
+						else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 18000,0;
+						else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 36000,0;
+						else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 50000,0;
+						else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 80000,0;
+						else if ((BaseLevel > 95) && (BaseLevel < 160)) getexp 100000,0;
+						else getitem 617,1; //Old_Violet_Box
 					} else {
-						if ((BaseLevel > 65) && (BaseLevel < 75)) {
-							getexp 50000,0;
-							next;
-						}
-						else if ((BaseLevel > 74) && (BaseLevel < 81)) {
-							getexp 180000,0;
-							next;
-						}
-						else if ((BaseLevel > 80) && (BaseLevel < 86)) {
-							getexp 360000,0;
-							next;
-						}
-						else if ((BaseLevel > 85) && (BaseLevel < 91)) {
-							getexp 500000,0;
-							next;
-						}
-						else if ((BaseLevel > 90) && (BaseLevel < 96)) {
-							getexp 800000,0;
-							next;
-						}
-						else if ((BaseLevel > 95) && (BaseLevel < 150)) {
-							getexp 200000,0;
-							next;
-						}
-
-					}
-					if (BaseLevel == 150) {
-						getitem 617,1; //Old_Violet_Box
-						next;
-					}
-					else {
-						getitem 617,1; //Old_Violet_Box
-						next;
+						if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
+						else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 50000,0;
+						else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 180000,0;
+						else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 360000,0;
+						else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 500000,0;
+						else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 800000,0;
+						else if ((BaseLevel > 95) && (BaseLevel < 99)) getexp 1000000,0;
+						else getitem 617,1; //Old_Violet_Box
 					}
+					next;
 					mes "[Retired Soldier]";
 					mes "If there's anything";
 					mes "you learn from all this,";
@@ -10801,42 +11253,26 @@ prontera,140,304,5	script	Old Soldier	901,{
 			delitem 7725,1; //Unlucky_Emerald
 			set jewel_nd,31;
 			getitem 603,1; //Old_Blue_Box
-			if (BaseLevel < 66) {
-				getitem 607,1; //Yggdrasilberry
-				next;
-			}
-			else if ((BaseLevel > 65) && (BaseLevel < 75)) {
-				getexp 5000,0;
-				next;
-			}
-			else if ((BaseLevel > 74) && (BaseLevel < 81)) {
-				getexp 8000,0;
-				next;
-			}
-			else if ((BaseLevel > 80) && (BaseLevel < 86)) {
-				getexp 15000,0;
-				next;
-			}
-			else if ((BaseLevel > 85) && (BaseLevel < 91)) {
-				getexp 20000,0;
-				next;
-			}
-			else if ((BaseLevel > 90) && (BaseLevel < 96)) {
-				getexp 40000,0;
-				next;
-			}
-			else if ((BaseLevel > 95) && (BaseLevel < 150)) {
-				getexp 50000,0;
-				next;
-			}
-			else if (BaseLevel == 150) {
-				getitem 617,1; //Old_Violet_Box
-				next;
-			}
-			else {
-				getitem 617,1; //Old_Violet_Box
-				next;
+			if (checkre(3)) {
+				if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
+				else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 5000,0;
+				else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 8000,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 15000,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 20000,0;
+				else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 40000,0;
+				else if ((BaseLevel > 95) && (BaseLevel < 160)) getexp 50000,0;
+				else getitem 617,1; //Old_Violet_Box
+			} else {
+				if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
+				else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 50000,0;
+				else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 80000,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 150000,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 200000,0;
+				else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 400000,0;
+				else if ((BaseLevel > 95) && (BaseLevel < 99)) getexp 500000,0;
+				else getitem 617,1; //Old_Violet_Box
 			}
+			next;
 			mes "[Retired Soldier]";
 			mes "If there's anything";
 			mes "you learn from all this,";
@@ -10886,7 +11322,7 @@ prontera,140,304,5	script	Old Soldier	901,{
 	}
 }
 
-gef_fild08,182,185,0	script	The Wanderer	739,{
+gef_fild08,182,185,0	script	The Wanderer	8_DOPPEL,{
 	if (jewel_nd < 21) {
 		mes "[The Wanderer]";
 		mes "I'm just a wanderer";
@@ -11250,8 +11686,8 @@ OnTouch:
 }
 
 // Rogue Guild Investigation
-//============================================================ 
-prontera,163,204,3	script	Man from Morroc	99,{
+//============================================================
+prontera,163,204,3	script	Man from Morroc	4W_M_03,{
 	if (rumour_nd == 0) {
 		mes "[Morroc Traveler]";
 		mes "Ah, it's very nice and";
@@ -11317,7 +11753,7 @@ prontera,163,204,3	script	Man from Morroc	99,{
 	}
 }
 
-in_rogue,355,28,5	script	Rogue Agent	118,{
+in_rogue,355,28,5	script	Rogue Agent	2_M_THIEFMASTER,{
 	if (checkweight(907,200) == 0) {
 		mes "[Guildsman]";
 		mes "You're carrying too";
@@ -11520,7 +11956,7 @@ in_rogue,355,28,5	script	Rogue Agent	118,{
 	}
 }
 
-aldebaran,114,56,5	script	Rogue Agent#nd0	828,{
+aldebaran,114,56,5	script	Rogue Agent#nd0	4_M_ROGUE,{
 	if (rumour_nd < 3) {
 		mes "[Agent]";
 		mes "Listen, I'm working on";
@@ -11652,7 +12088,7 @@ aldebaran,114,56,5	script	Rogue Agent#nd0	828,{
 	}
 }
 
-geffen,91,36,5	script	Rogue Guild Agent#nd1	828,{
+geffen,91,36,5	script	Rogue Guild Agent#nd1	4_M_ROGUE,{
 	if (rumour_nd < 4) {
 		if (zdan_edq > 12) {
 			mes "[Rogue Guild Agent]";
@@ -12029,7 +12465,7 @@ geffen,91,36,5	script	Rogue Guild Agent#nd1	828,{
 	}
 }
 
-payon,209,44,5	script	Rogue Guild Agent#nd2	828,{
+payon,209,44,5	script	Rogue Guild Agent#nd2	4_M_ROGUE,{
 	if (rumour_nd < 3) {
 		mes "[Agent]";
 		mes "What? You want somethin'?";
@@ -12511,7 +12947,7 @@ payon,209,44,5	script	Rogue Guild Agent#nd2	828,{
 	}
 }
 
-comodo,233,199,5	script	Rogue Guild Agent#nd3	810,{
+comodo,233,199,5	script	Rogue Guild Agent#nd3	1_M_SIGNROGUE,{
 	if (checkweight(907,200) == 0) {
 		mes "[Agent]";
 		mes "You've got too many";
@@ -12631,10 +13067,10 @@ comodo,233,199,5	script	Rogue Guild Agent#nd3	810,{
 			mes "[Agent]";
 			mes "Okay, let me check.";
 			next;
-			if ((countitem(2278) > 0) || (countitem(2281) > 0) || (countitem(5043) > 0) || (countitem(2288) > 0) || 
-			(countitem(2292) > 0) || (countitem(2297) > 0) || (countitem(5005) > 0) || (countitem(5086) > 0) || 
-			(countitem(5087) > 0) || (countitem(5088) > 0) || (countitem(5089) > 0) || (countitem(5090) > 0) || 
-			(countitem(5176) > 0) || (countitem(5203) > 0) || (countitem(5098) > 0) || (countitem(5121) > 0) || 
+			if ((countitem(2278) > 0) || (countitem(2281) > 0) || (countitem(5043) > 0) || (countitem(2288) > 0) ||
+			(countitem(2292) > 0) || (countitem(2297) > 0) || (countitem(5005) > 0) || (countitem(5086) > 0) ||
+			(countitem(5087) > 0) || (countitem(5088) > 0) || (countitem(5089) > 0) || (countitem(5090) > 0) ||
+			(countitem(5176) > 0) || (countitem(5203) > 0) || (countitem(5098) > 0) || (countitem(5121) > 0) ||
 			(countitem(5130) > 0) || (countitem(5177) > 0) || (countitem(5169) > 0) || (countitem(5143) > 0)) {
 				mes "[Agent]";
 				mes "Excellent!";
@@ -12793,7 +13229,7 @@ comodo,233,199,5	script	Rogue Guild Agent#nd3	810,{
 	}
 }
 
-morocc,116,39,3	script	Rogue Guild Agent#nd4	779,{
+morocc,116,39,3	script	Rogue Guild Agent#nd4	4_M_YOYOROGUE,{
 	if (rumour_nd == 1) {
 		mes "[Agent]";
 		mes "A case? What are you...?";
diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt
index e5e95c6a1..b2cda90e8 100644
--- a/npc/quests/quests_niflheim.txt
+++ b/npc/quests/quests_niflheim.txt
@@ -1,34 +1,35 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Niflheim
-//===== By: ================================================== 
+//===== By: ==================================================
 //= The rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.6
+//===== Description: =========================================
+//= [Official Conversion]
 //= Piano Key Ouest
 //= - Escape from Niflheim
 //= - Variables in use: nif_esc, MISC_QUEST (Bit 32)
 //= Message Delivery Quest
 //= - Deliver a message to Erious' departed wife.
 //= - Variables in use: nif_revive, MISC_QUEST (Bit 16384)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Initial release, moved Book of Devil and Piano quest
-//=	from npc/cities/niflheim.txt [Evera]
+//=     from npc/cities/niflheim.txt [Evera]
 //= 1.1 Optimized Book of Devil quest. used bit-wise var,
-//=	Optimized Piano Quest - now uses 1 variable [Lupus]
+//=     Optimized Piano Quest - now uses 1 variable [Lupus]
 //= 1.2 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.3 Moved the Book of Devil quest to custom folder. [L0ne_W0lf]
-//=	Updated to Aegis 10.3 Standed, added Message Delivery Quest.
-//=	Rescripted Piano Quest. Prior quest progress will be lost.
+//=     Updated to Aegis 10.3 Standed, added Message Delivery Quest.
+//=     Rescripted Piano Quest. Prior quest progress will be lost.
 //= 1.4 Fixed NPCs using ID 111 when it shoudl have been 139. [L0ne_W0lf]
 //= 1.5 Swapped NPC IDs back from last change (139 back to 111). [L0ne_W0lf]
-//=     Clicking will do nothing, you have to still "touch" the npc. 
-//============================================================ 
+//=     Clicking will do nothing, you have to still "touch" the npc.
+//= 1.6 Added questlog support. [Euphy]
+//============================================================
 
-// Piano Quest
+// Piano Quest :: nif_ryu
 //============================================================
-niflheim,224,243,3	script	Alreg#nif	795,{
+niflheim,224,243,3	script	Alreg#nif	4_M_NFDEADMAN,{
 	if (nif_piano) set nif_piano,0;
 	mes "[Alreg]";
 	mes "Me like meat, muheh.";
@@ -66,7 +67,7 @@ niflheim,224,243,3	script	Alreg#nif	795,{
 	close;
 }
 
-nif_in,105,81,3	script	Crayu#nif	794,{
+nif_in,105,81,3	script	Crayu#nif	4_M_NFDEADMAN2,{
 	mes "[Crayu]";
 	mes "Living one...";
 	mes "Listen to this song...";
@@ -139,7 +140,7 @@ nif_in,105,81,3	script	Crayu#nif	794,{
 	close;
 }
 
-nif_in,31,20,3	script	Kuzkahina#nif	794,{
+nif_in,31,20,3	script	Kuzkahina#nif	4_M_NFDEADMAN2,{
 	if (nif_esc == 2 || nif_esc == 3) {
 		mes "[Kuzkahina]";
 		mes "I don't understand";
@@ -172,7 +173,7 @@ nif_in,31,20,3	script	Kuzkahina#nif	794,{
 	close;
 }
 
-niflheim,208,103,1	script	#Graveyard1	111,1,1,{
+niflheim,208,103,1	script	#Graveyard1	HIDDEN_NPC,1,1,{
 	end;
 
 OnTouch:
@@ -194,7 +195,7 @@ OnTouch:
 	end;
 }
 
-niflheim,169,71,1	script	#Graveyard2	111,1,1,{
+niflheim,169,71,1	script	#Graveyard2	HIDDEN_NPC,1,1,{
 	end;
 
 OnTouch:
@@ -213,7 +214,7 @@ OnTouch:
 	end;
 }
 
-nif_in,115,181,0	script	#Piano	111,1,1,{
+nif_in,115,181,0	script	#Piano	HIDDEN_NPC,1,1,{
 	end;
 
 OnTouch:
@@ -246,7 +247,7 @@ OnTouch:
 	end;
 }
 
-nif_in,114,181,0	script	#Piano3	111,1,1,{
+nif_in,114,181,0	script	#Piano3	HIDDEN_NPC,1,1,{
 	end;
 
 OnTouch:
@@ -272,7 +273,7 @@ OnTouch:
 	end;
 }
 
-nif_in,188,168,3	script	Witch#nif	792,{
+nif_in,188,168,3	script	Witch#nif	4_F_NFDEADMGCIAN,{
 	mes "[Kirkena]";
 	mes "Huh? ...You're alive, aren't you?";
 	mes "I'm not sure how more of you are";
@@ -292,9 +293,9 @@ nif_in,188,168,3	script	Witch#nif	792,{
 	end;
 }
 
-// Message Delivery Quest
+// Message Delivery Quest :: nif_npc_lackee
 //============================================================
-prt_in,161,20,3	script	Erious#nif	92,{
+prt_in,161,20,3	script	Erious#nif	4_F_03,{
 	if (MISC_QUEST & 16384) {
 		mes "[Erious]";
 		mes "I wish you safety from harm";
@@ -353,6 +354,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 				mes "Thank you for your help,";
 				mes "and please take care.";
 				set nif_revive,1;
+				setquest 11038;
 				close;
 			}
 			mes "[Erious]";
@@ -432,6 +434,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 				if (checkweight(610,26)) {
 					set MISC_QUEST,MISC_QUEST | 16384;
 					set nif_revive,0;
+					completequest 11043;
 					getitem 607,2; //Yggdrasilberry
 					getitem 608,2; //Seed_Of_Yggdrasil
 					getitem 610,10; //Leaf_Of_Yggdrasil
@@ -476,6 +479,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 			if (checkweight(610,10)) {
 				set MISC_QUEST,MISC_QUEST | 16384;
 				set nif_revive,0;
+				completequest 11042;
 				getitem 610,10; //Leaf_Of_Yggdrasil
 				mes "[Erious]";
 				mes "Thank you for everything.";
@@ -501,7 +505,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 	end;
 }
 
-umbala,215,181,3	script	Billik	733,{
+umbala,215,181,3	script	Billik	4_M_JOB_KNIGHT1,{
 	if (nif_revive > 1 || MISC_QUEST & 16384) {
 		mes "[Billik]";
 		mes "Well, long time no see.";
@@ -539,6 +543,7 @@ umbala,215,181,3	script	Billik	733,{
 			mes "for him. That way, he'll know for";
 			mes "sure that I've sent you.";
 			set nif_revive,2;
+			changequest 11038,11039;
 			next;
 			mes "[Billik]";
 			mes "The town of the dead is located";
@@ -565,7 +570,7 @@ umbala,215,181,3	script	Billik	733,{
 	}
 }
 
-niflheim,153,215,3	script	Feylin	794,{
+niflheim,153,215,3	script	Feylin	4_M_NFDEADMAN2,{
 	if (nif_revive == 2) {
 		mes "[Feylin]";
 		mes "Poor "+((Sex)?"guy":"girl")+"...";
@@ -598,6 +603,7 @@ niflheim,153,215,3	script	Feylin	794,{
 		mes "you go back to where you came";
 		mes "from before it's too late.";
 		set nif_revive,3;
+		changequest 11039,11040;
 		close;
 	}
 	else if (nif_revive == 3) {
@@ -621,6 +627,7 @@ niflheim,153,215,3	script	Feylin	794,{
 			mes "you. Besides, speaking about";
 			mes "such things is taboo.";
 			set nif_revive,4;
+			changequest 11040,11041;
 			close;
 		}
 		mes "[Feylin]";
@@ -675,6 +682,7 @@ niflheim,153,215,3	script	Feylin	794,{
 								delitem 748,1; //Witherless_Rose
 								delitem 610,10; //Leaf_Of_Yggdrasil
 								set nif_revive,5;
+								changequest 11041,11042;
 								percentheal -99,0;
 								next;
 								mes "[Feylin]";
@@ -718,6 +726,7 @@ niflheim,153,215,3	script	Feylin	794,{
 								mes "with someone else. Oh, also let";
 								mes "him know that I forgive him.";
 								set nif_revive,6;
+								changequest 11040,11043;
 								getitem 934,1; //Mementos
 								next;
 								mes "[Elly]";
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index 719e3a543..7f3c65a20 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -1,14 +1,12 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Payon
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena 7.15 +
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Pretend Murder, Ear Muffs, Oxygen, Derivuchi Cap, Helm of Angel Quests.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Helm of Angel bug fixed [Lupus]
 //= 1.2 Fixed skirt of virgin [Lupus]
 //= 1.3 Fixed exploits [Lupus]
@@ -17,11 +15,11 @@
 //= 1.5a replaced item "names" with item id. [Lupus]
 //= 1.6 Updated Dialogs from "Oxygen Mask Quest" [Samuray22]
 //= 1.7 Updated headgear quests. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 // 'Pretend Murdered' Quest
 //============================================================
-payon_in01,99,72,4	script	Granny	103,{
+payon_in01,99,72,4	script	Granny	8_F_GRANDMOTHER,{
 	if (checkweight(908,1) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
@@ -35,7 +33,7 @@ payon_in01,99,72,4	script	Granny	103,{
 		next;
 		switch(select("Alright.:No way!")) {
 		case 1:
-			delitem 1049,4;  //Skirt_Of_Virgin
+			delitem 1049,4; //Skirt_Of_Virgin
 			mes "[Granny]";
 			mes "Oh! Thank you so much~ Now I can make some clothes for Kitty Cutty~";
 			next;
@@ -46,7 +44,7 @@ payon_in01,99,72,4	script	Granny	103,{
 			mes "If it's okay...";
 			mes "I'd like to give you this.";
 			next;
-			getitem 2293,1; // Pretend_Murdered
+			getitem 2293,1; //Pretend_Murdered
 			mes "[Granny]";
 			mes "Goodbye, adventurer~!";
 			mes "Thank you for making an old woman so happy...";
@@ -73,39 +71,39 @@ payon_in01,99,72,4	script	Granny	103,{
 
 // 'Ear Muffs' Quest
 //============================================================
-payon_in01,18,10,4	script	Mystic Lady	76,{
+payon_in01,18,10,4	script	Mystic Lady	1_F_ORIENT_02,{
 	mes "[Mystic Lady]";
 	mes "My family has produced and sold the special Winter product ^3355FFEar Muffs^000000 for many years. We just moved here, but the weather is always warm so we can hardly make a living.";
 	next;
 	mes "[Mystic Lady]";
 	mes "If you plan to travel to colder regions, I suggest that you bring some ^3355FFEar Muffs^000000...";
-	Emotion e_dots;
+	emotion e_dots;
 	next;
 	mes "[Mystic Lady]";
 	mes "Ear Muffs are my family's specialty, and we provide it to customers who have ^FF33551 Cursed Ruby^000000, ^3311AA1 Headset,^000000 ^3355FF 200 Feathers^000000 and ^DDDD005000 Zeny^000000.";
-	Emotion e_dots;
+	emotion e_dots;
 	next;
 	switch(select("Oh Yeah? That sounds good.:No thank you, Ma'am.")) {
 	case 1:
 		if ((countitem(724) > 0) && (countitem(949) > 199) && (countitem(5001) > 0) && (Zeny > 4999)) {
 			mes "[Mystic Lady]";
-			delitem 724,1;  //Cardinal_Jewel_
-			delitem 949,200;  //Feather
-			delitem 5001,1;  //Headset
-			set Zeny,Zeny-5000;
+			delitem 724,1; //Cardinal_Jewel_
+			delitem 949,200; //Feather
+			delitem 5001,1; //Headset
+			Zeny -= 5000;
 			mes "Here, I will give you this pre-made one.";
-			getitem 2283,1; // Ear_Mufs
+			getitem 2283,1; //Ear_Mufs
 			next;
 			mes "[Mystic Lady]";
 			mes "Thank you for buying our product. You won't regret purchasing our Ear Muffs: Satisfaction guaranteed~";
-			Emotion e_dots;
+			emotion e_dots;
 			close;
 		}
 		else {
 			mes "[Mystic Lady]";
 			mes "Oh dear...";
 			mes "You don't have enough money or items. Unfortunately, we can't give any discounts. Please understand that we have to make a living...";
-			Emotion e_dots;
+			emotion e_dots;
 			close;
 		}
 	case 2:
@@ -114,14 +112,14 @@ payon_in01,18,10,4	script	Mystic Lady	76,{
 		mes "I believe we";
 		mes "will meet again.";
 		mes "...One of these days.";
-		Emotion e_dots;
+		emotion e_dots;
 		close;
 	}
 }
 
 // 'Oxygen Mask' Quest
 //============================================================
-payon_in02,25,71,4	script	Boy	86,{
+payon_in02,25,71,4	script	Boy	4_M_04,{
 	if (countitem(701) > 4) {
 		mes "[Young Man]";
 		mes "ArrrGggghh!";
@@ -145,7 +143,7 @@ payon_in02,25,71,4	script	Boy	86,{
 			close;
 		case 2:
 			if (countitem(701) > 4) {
-				delitem 701,5;  //Ora_Ora
+				delitem 701,5; //Ora_Ora
 			}
 			mes "[Young Man]";
 			mes "Muhahahahah!!!";
@@ -159,7 +157,7 @@ payon_in02,25,71,4	script	Boy	86,{
 			mes "Huk...Huk...";
 			mes "Sorry, I was out of control with pleasure for a while. Now, I will give my treasure as promised.";
 			next;
-			getitem 5004,1; // Oxygen_Mask
+			getitem 5004,1; //Oxygen_Mask
 			mes "[Young Man]";
 			mes "When you wear this over your mouth and start to breathe, it filters junk out before getting to your lungs.";
 			next;
@@ -216,7 +214,7 @@ payon_in02,25,71,4	script	Boy	86,{
 
 // 'Helm of Angel' and 'Deviruchi Cap' Quest
 //============================================================
-payon_in01,56,12,7	script	Young man#12	89,{
+payon_in01,56,12,7	script	Young man#12	4_M_ORIENT02,{
 	mes "[Young man]";
 	mes "...What is it?";
 	next;
@@ -248,11 +246,11 @@ payon_in01,56,12,7	script	Young man#12	89,{
 					mes "[Young man]";
 					mes ".....Hm.";
 					mes "Fine, here's your Helm of Angel. Take it.";
-					delitem 2229,1;  //Helm_
-					delitem 2254,1;  //Angelic_Chain
-					delitem 7036,5;  //Fang_Of_Garm
+					delitem 2229,1; //Helm_
+					delitem 2254,1; //Angelic_Chain
+					delitem 7036,5; //Fang_Of_Garm
 					close2;
-					getitem 5025,1; // Helm_Of_Angel
+					getitem 5025,1; //Helm_Of_Angel
 					end;
 				}
 				else {
@@ -285,10 +283,10 @@ payon_in01,56,12,7	script	Young man#12	89,{
 				if ((countitem(1038) > 599) && (countitem(7048) > 39)) {
 					mes "[Young man]";
 					mes ".....Hm. Here's your Deviruchi Hat. Please take it.";
-					delitem 1038,600;  //Petite_DiablOfs_Horn
-					delitem 7048,40;  //Talon_Of_Griffin
+					delitem 1038,600; //Petite_DiablOfs_Horn
+					delitem 7048,40; //Talon_Of_Griffin
 					close2;
-					getitem 5038,1; // Deviruchi_Cap
+					getitem 5038,1; //Deviruchi_Cap
 					end;
 				}
 				else {
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index fba2043f3..d4588e5c5 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -1,27 +1,25 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Prontera
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 2.8
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.9
+//===== Description: =========================================
 //= Collection of Prontera-based quests.
 //= * Culvert Access
 //= * Ph.D Hat Quest
 //= * Gaebolg Family Curse
 //===== Comments: ============================================
 //= Culvert Access:
-//= - [Aegis Conversion]
+//= - [Official Conversion]
 //= - Variable in use: MISC_QUEST (bit 8)
 //= Ph.D Hat Quest:
-//= - [Aegis Conversion]
+//= - [Official Conversion]
 //= - n/a
 //= Gaebolg Family Curse:
-//= - [Aegis Conversion]
+//= - [Official Conversion]
 //= - Variable in use: prt_curse (max 61)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fixed flower name Dreamy -> Illusion
 //= 1.2 Fixed exploit [Lupus]
 //= 1.3 Removed Duplicates [Silent]
@@ -47,12 +45,13 @@
 //= 2.5a Fixed requirements for PH D. Hat agian lol. [L0ne_W0lf]
 //= 2.6 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.7 Corrected 'IProntera' typo. (bugreport:4522) [L0ne_W0lf]
-//= 2.8 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
+//= 2.8 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.9 Updated Nameless Island addition and added questlog support. [Euphy]
+//============================================================
 
-// Prontera Culvert
-//============================================================ 
-prt_in,88,105,2	script	Recruiter	105,{
+// Prontera Culvert :: prt_npc
+//============================================================
+prt_in,88,105,2	script	Recruiter	8W_SOLDIER,{
 	if (MISC_QUEST & 8) {
 		mes "[Recruiter]";
 		mes "Ah...";
@@ -144,8 +143,8 @@ S_Volunteer:
 	return;
 }
 
-prt_fild05,270,212,5	script	Culvert Guardian	105,{
-	if(MISC_QUEST & 8) {
+prt_fild05,270,212,5	script	Culvert Guardian	8W_SOLDIER,{
+	if (MISC_QUEST & 8) {
 		mes "[Culvert Guardian]";
 		mes "Ah, you're one of our volunteers. This is the entrance of the Prontera Culvert.";
 		mes "Do you wish to";
@@ -165,9 +164,9 @@ prt_fild05,270,212,5	script	Culvert Guardian	105,{
 	close;
 }
 
-// Ph.D Hat Quest
-//============================================================ 
-prt_in,38,108,4	script	Teacher	53,{
+// Ph.D Hat Quest :: npc_6cript
+//============================================================
+prt_in,38,108,4	script	Teacher	1_M_INNKEEPER,{
 	if ((countitem(710) > 0) && (countitem(703) > 0) && (countitem(704) > 0) && (countitem(708) > 0)) {
 		mes "[Teacher]";
 		mes "Oh...";
@@ -249,9 +248,9 @@ prt_in,38,108,4	script	Teacher	53,{
 	}
 }
 
-// Gaebolg Family Curse
-//============================================================ 
-prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
+// Gaebolg Family Curse :: prt_curse
+//============================================================
+prontera,248,212,3	script	Busy Boy#prt	4_M_KID1,3,3,{
 	callsub S_CheckWeight; //Check Player's weight
 	if (BaseLevel > 59) {
 		if (prt_curse == 0) {
@@ -280,7 +279,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 				mes ".........?";
 				next;
 				mes "[Busy-Looking Boy]";
-				if (sex) {
+				if (Sex) {
 					mes "Ack! You're that clumsy";
 					mes "dude who made me drop";
 				}
@@ -291,7 +290,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 				mes "all of those books earlier!";
 				mes "Wait, you ditched me before,";
 				mes "so why act all concerned now?";
-				Emotion e_gasp;
+				emotion e_gasp;
 			}
 			else {
 				mes "[Busy-Looking Boy]";
@@ -306,7 +305,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			next;
 			select("Well, I, um...");
 			mes "[Busy-Looking Boy]";
-			if (sex) {
+			if (Sex) {
 				mes "Yeah... A real";
 				mes "man wouldn't have";
 				mes "ditched back then";
@@ -328,11 +327,11 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "You couldn't help it:";
 			mes "it was a natural reflex!^000000";
 			next;
-			Specialeffect EF_HITDARK;
-			Emotion e_omg;
+			specialeffect EF_HITDARK;
+			emotion e_omg;
 			mes "^3355FF*BAM!*^000000";
 			next;
-			Emotion e_omg;
+			emotion e_omg;
 			mes "[Busy-Looking Boy]";
 			mes "Ack! Those books...!";
 			mes "It took me so long to";
@@ -344,13 +343,13 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "arrange these nicely";
 			mes "out of the bottom of";
 			mes "my freakin' heart.";
-			Emotion e_lv,1;
+			emotion e_lv,1;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "...";
 			mes "......";
 			mes ".........";
-			Emotion e_dots;
+			emotion e_dots;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Huh...?";
@@ -372,7 +371,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "easily, so it scares me to";
 			mes "death to ride the Airship";
 			mes "all the way to Juno.";
-			Emotion e_dots;
+			emotion e_dots;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Now I'm in trouble!";
@@ -380,7 +379,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "time I just can't help it.";
 			mes "There's nothing I can do!";
 			mes "Oh, I'm gonna lose this job!";
-			Emotion e_sob;
+			emotion e_sob;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Wait... You adventurers";
@@ -396,7 +395,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "It's none of your ";
 			mes "business, I know, but";
 			mes "I'm just so desperate...";
-			Emotion e_sob;
+			emotion e_sob;
 			set prt_curse,2;
 			close;
 		}
@@ -408,7 +407,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "Summon all my courage...";
 			mes "and b-board that Airship!";
 			mes "Argh! No, I can't do it!";
-			Emotion e_dots;
+			emotion e_dots;
 			next;
 			callsub S_GetBooks;
 			mes "[Busy-Looking Boy]";
@@ -417,7 +416,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			mes "That guy's been waiting";
 			mes "for me to deliver his books";
 			mes "for quite a while now...";
-			Emotion e_sob;
+			emotion e_sob;
 			close;
 		}
 		else if (prt_curse == 3) {
@@ -450,14 +449,14 @@ OnTouch:
 	callsub S_CheckWeight; //Check Player's weight
 	if (BaseLevel > 59) {
 		if (prt_curse == 0) {
-			Specialeffect EF_HITDARK;
+			specialeffect EF_HITDARK;
 			mes "^3355FF*BAM!*^000000";
 			next;
 			mes "[Busy Looking Boy]";
 			mes "Hey, look out!";
 			mes "Can't you be more";
 			mes "careful?! Geeeeez!";
-			Emotion e_ag;
+			emotion e_ag;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "Oops, I'm so sorry.";
@@ -506,7 +505,7 @@ OnTouch:
 			mes "easily, so it scares me to";
 			mes "death to ride the Airship";
 			mes "all the way to Juno.";
-			Emotion e_dots;
+			emotion e_dots;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Now I'm in trouble!";
@@ -514,7 +513,7 @@ OnTouch:
 			mes "time I just can't help it.";
 			mes "There's nothing I can do!";
 			mes "Oh, I'm gonna lose this job!";
-			Emotion e_sob;
+			emotion e_sob;
 			next;
 			mes "[Busy-Looking Boy]";
 			mes "Wait... You adventurers";
@@ -530,7 +529,7 @@ OnTouch:
 			mes "It's none of your ";
 			mes "business, I know, but";
 			mes "I'm just so desperate...";
-			Emotion e_sob;
+			emotion e_sob;
 			set prt_curse,2;
 			close;
 		}
@@ -582,7 +581,7 @@ S_CheckWeight:
 	return;
 }
 
-yuno,311,195,3	script	Historian#prt01	754,{
+yuno,311,195,3	script	Historian#prt01	4_M_SAGE_A,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -624,7 +623,7 @@ yuno,311,195,3	script	Historian#prt01	754,{
 		mes "[Historian]";
 		mes "GRRRRRRRRR!";
 		mes "Where are my books?!";
-		Emotion e_ag;
+		emotion e_ag;
 		next;
 		select("Are you alright?");
 		mes "[Historian]";
@@ -655,7 +654,7 @@ yuno,311,195,3	script	Historian#prt01	754,{
 		}
 		else {
 			select("Oh, I'm delivering the books for him.");
-			Emotion e_what;
+			emotion e_what;
 			mes "[Historian]";
 			mes "Ah, really?";
 			mes "Great, you're here!";
@@ -812,7 +811,7 @@ yuno,311,195,3	script	Historian#prt01	754,{
 		mes "ruling the kingdom, the 7 warriors agreed to hold a contest amongst";
 		mes "their families each generation to prevent royal corruption.";
 		next;
-		Emotion e_swt2;
+		emotion e_swt2;
 		mes "[Historian]";
 		mes "Oh... Not too excited";
 		mes "about history, huh? Well,";
@@ -933,7 +932,7 @@ yuno,311,195,3	script	Historian#prt01	754,{
 	}
 }
 
-morocc_in,45,126,3	script	Historian#prt02	702,{
+morocc_in,45,126,3	script	Historian#prt02	4_F_GON,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -957,7 +956,7 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 		mes "can't be good for my skin...";
 		mes "Ooh, I wish I were back home";
 		mes "in the Schwaltzvalt Republic~";
-		Emotion e_sob;
+		emotion e_sob;
 		next;
 		mes "[Historian Rodafrian]";
 		mes "Hello there.";
@@ -1208,11 +1207,11 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 			mes "that you have learned to";
 			mes "Rodafrian, choosing not";
 			mes "to withhold any secrets.^000000";
-			Emotion e_ic;
+			emotion e_ic;
 			next;
 			mes "[Historian Rodafrian]";
 			mes ".....................!";
-			Emotion e_gasp;
+			emotion e_gasp;
 			next;
 			mes "[Historian Rodafrian]";
 			mes "Thank you for sharing that";
@@ -1251,10 +1250,13 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 			mes "that she might spread around!";
 			mes "Oh well, I guess I better head";
 			mes "back to the priests...)^000000";
-			if (prt_curse == 30) 
+			if (prt_curse == 30)  {
 				set prt_curse,31;
-			else 
+				changequest 18042,18044;
+			} else {
 				set prt_curse,60;
+				changequest 18051,18052;
+			}
 			close;
 		}
 
@@ -1279,10 +1281,13 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 		mes "through Karlomoff's report.";
 		mes "For now, it would be best";
 		mes "to return to Father Bamph.^000000";
-		if (prt_curse == 30)
+		if (prt_curse == 30) {
 			set prt_curse,40;
-		else
+			changequest 18042,18045;
+		} else {
 			set prt_curse,56;
+			completequest 18051;
+		}
 		close;
 	}
 	else if (prt_curse == 31 || prt_curse == 40) {
@@ -1294,7 +1299,7 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 		close;
 	}
 	else if (prt_curse == 56) {
-		Emotion e_an;
+		emotion e_an;
 		mes "[Historian Rodafrian]";
 		mes "I just paid a visit to";
 		mes "Karlomoff and gave him";
@@ -1305,7 +1310,7 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 		close;
 	}
 	else if (prt_curse == 60) {
-		Emotion e_an;
+		emotion e_an;
 		mes "[Historian Rodafrian]";
 		mes "I just aid a visit to";
 		mes "Karlomoff and gave him";
@@ -1357,10 +1362,11 @@ S_GiveName:
 	mes "for the sake of my research...";
 	if (getarg(0) == 1) delitem 7342,1; //File01
 	set prt_curse,8;
+	changequest 18031,18032;
 	close;
 }
 
-mjolnir_01,135,168,3	script	Historian#prt03	754,{
+mjolnir_01,135,168,3	script	Historian#prt03	4_M_SAGE_A,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -1495,6 +1501,7 @@ mjolnir_01,135,168,3	script	Historian#prt03	754,{
 		mes "for. Good luck in your";
 		mes "travels, adventurer.";
 		set prt_curse,11;
+		changequest 18032,18033;
 		close;
 	}
 	else {
@@ -1596,13 +1603,13 @@ OnTouch:
 	end;
 }
 
-mjolnir_01,312,269,5	script	Dog#prt	81,{
+mjolnir_01,312,269,5	script	Dog#prt	4_DOG01,{
 	mes "[Dog]";
 	mes "Bow Wow!";
 	close;
 }
 
-mjolnir_01,313,269,5	script	Dazed Boy#prt	706,{
+mjolnir_01,313,269,5	script	Dazed Boy#prt	4_M_KID1,{
 	if (prt_curse == 11) {
 		mes "[Absent-Minded Boy]";
 		mes "The great serpent";
@@ -1750,7 +1757,7 @@ mjolnir_01,313,269,5	script	Dazed Boy#prt	706,{
 	}
 }
 
-mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
+mjolnir_01,316,268,3	script	Exhausted-Looking Woman	4_F_CAPEGIRL,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -1935,8 +1942,9 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "I should deliver these";
 		mes "herbs to Prontera Church";
 		mes "before I talk to Rodafrian.)^000000";
-		getitem 7432,1;
+		getitem 7432,1; //Leather_Pouch
 		set prt_curse,13;
+		changequest 18033,18034;
 		close;
 	}
 	else if (prt_curse > 12 && prt_curse < 16) {
@@ -1988,7 +1996,7 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "with death. But the royal family and the Prontera Church took";
 		mes "mercy on me, and allowed";
 		mes "me to live here in exile.";
-		Emotion e_dots;
+		emotion e_dots;
 		next;
 		mes "[Bonnie Imbullea]";
 		mes "I began to sing this song";
@@ -2003,7 +2011,7 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "a maid found a fragment of a";
 		mes "Red Gemstone while cleaning";
 		mes "the secret ceremonial grounds.";
-		Emotion e_gasp,1;
+		emotion e_gasp,1;
 		next;
 		mes "[Bonnie Imbullea]";
 		mes "I always thought it";
@@ -2035,6 +2043,7 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "and let Father Bamph";
 		mes "know about this information.)^000000";
 		set prt_curse,17;
+		changequest 18035,18036;
 		close;
 	}
 	else if (prt_curse == 17) {
@@ -2109,14 +2118,19 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 		mes "I can finally free myself from";
 		mes "this burdensome guilt...";
 		mes "Thank you, kind adventurer~";
-		if (prt_curse == 35) set prt_curse,36;
-		else if (prt_curse == 44) set prt_curse,45;
-		else {
+		if (prt_curse == 35) {
+			set prt_curse,36;
+			completequest 18050;
+		} else if (prt_curse == 44) {
+			set prt_curse,45;
+			completequest 18049;
+		} else {
 			next;
 			mes "^3355FFNow, you can return to";
 			mes "Rodafrian, the historian";
 			mes "stationed in Morroc.^000000";
 			set prt_curse,55;
+			changequest 18049,18051;
 		}
 
 		close;
@@ -2160,7 +2174,7 @@ mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 prt_church,115,122,0	warp	#sazekan	1,1,prt_church,168,106
 prt_church,166,106,0	warp	#prtchhall	1,1,prt_church,112,122
 
-prt_church,185,106,3	script	Father Bamph	60,{
+prt_church,185,106,3	script	Father Bamph	1_M_PASTOR,{
 	if (prt_curse == 13) {
 		mes "[Father Bamph]";
 		mes "Welcome to";
@@ -2246,7 +2260,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "sent this adventurer here";
 		mes "for a favor, it probably means";
 		mes "she trusts this person. Besides, we need somebody to carry out";
-		if (sex)
+		if (Sex)
 			mes "this task for us. Why not him?";
 		else
 			mes "this task for us. Why not her?";
@@ -2299,7 +2313,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "at a young age^000000. That is";
 		mes "Jormungand's curse and";
 		mes "the royal family's secret.";
-		Emotion e_omg,1;
+		emotion e_omg,1;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "What...?!";
@@ -2362,7 +2376,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "complicated. Please";
 		mes "listen to what we have";
 		mes "to ask from here on...";
-		Emotion e_dots;
+		emotion e_dots;
 		set prt_curse,15;
 		close;
 	}
@@ -2374,7 +2388,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "looking marks on their bodies.";
 		mes "It almost looked as if they";
 		mes "were growing snake scales.";
-		Emotion e_gasp,1;
+		emotion e_gasp,1;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Wait, they grew snake";
@@ -2443,6 +2457,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "remember anything that happened";
 		mes "after the exorcism failed...";
 		set prt_curse,16;
+		changequest 18034,18035;
 		close;
 	}
 	else if (prt_curse == 16) {
@@ -2483,6 +2498,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "within the bookshelf and";
 		mes "I will meet you there.";
 		set prt_curse,18;
+		changequest 18036,18037;
 		close;
 	}
 	else if (prt_curse > 17 && prt_curse < 22) {
@@ -2519,6 +2535,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "we can verify whether poison";
 		mes "was used to kill the princes?";
 		set prt_curse,23;
+		changequest 18039,18040;
 		close;
 	}
 	else if (prt_curse == 23) {
@@ -2552,6 +2569,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "to the secret ceremonial grounds as soon as you can? I will wait";
 		mes "over there for you once again.";
 		set prt_curse,32;
+		changequest 18044,18046;
 		close;
 	}
 	else if (prt_curse == 32 || prt_curse == 33 || prt_curse == 41 || prt_curse == 42 || prt_curse == 51 || prt_curse == 52) {
@@ -2592,6 +2610,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "you for all of your help. I'm very grateful for what you have done,";
 		mes "adventurer. May safety accompany you on all of your journeys.";
 		set prt_curse,35;
+		changequest 18047,18050;
 		close;
 	}
 	else if (prt_curse > 34 && prt_curse < 40 && !aru_monas) {
@@ -2624,6 +2643,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "to the secret ceremonial grounds as soon as you can? I will wait";
 		mes "over there for you once again.";
 		set prt_curse,41;
+		changequest 18045,18046;
 		close;
 	}
 	else if (prt_curse == 43 || prt_curse == 53) {
@@ -2661,12 +2681,12 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "that I cannot personally thank";
 		mes "you for all of your help. I'm very grateful for what you have done,";
 		mes "adventurer. May safety accompany you on all of your journeys.";
-		if (prt_curse == 43) set prt_curse,44;
-		else set prt_curse,54;
-		if(checkre(0))
-			getexp 160000,0;
+		if (prt_curse == 43)
+			set prt_curse,44;
 		else
-			getexp 1600000,0;
+			set prt_curse,54;
+		changequest 18047,18049;
+		getexp (checkre(3))?90000:1600000,0;
 		close;
 	}
 	else if (prt_curse > 43 && prt_curse < 50 && !aru_monas) {
@@ -2701,6 +2721,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "to the secret ceremonial grounds as soon as you can? I will wait";
 		mes "over there for you once again.";
 		set prt_curse,51;
+		changequest 18043,18046;
 		close;
 	}
 	else if (prt_curse == 60) {
@@ -2755,12 +2776,20 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "secret ceremonial grounds";
 		mes "from now on. Thanks again for your help, "+strcharinfo(0)+".";
 		set prt_curse,61;
+		completequest 18052;
 		close;
 	}
 	else {
 		if (prt_curse == 36 || prt_curse == 45 || prt_curse == 56 || prt_curse == 61) {
 // Begin Nameless Island Access Quest Addition
-			if (aru_monas == 1) {
+			if (aru_monas == 0) {
+				mes "[Father Bamph]";
+				mes "I'm sorry, but would it";
+				mes "be alright if we talked";
+				mes "later? I have to handle";
+				mes "a very important task now...";
+				close;
+			} else if (aru_monas == 1) {
 				mes "[Father Bamph]";
 				mes "Oh, I've been waiting for";
 				mes "you, adventurer. I'm sorry";
@@ -2791,6 +2820,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				mes "and he will assist you in your";
 				mes "search for the lost official.";
 				set aru_monas,2;
+				changequest 17000,17001;
 				close;
 			}
 			else if (aru_monas == 2 || aru_monas == 3) {
@@ -2823,7 +2853,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				close;
 			}
 			else if (aru_monas == 5) {
-				if (rand(1,10) == 10) {
+				if (rand(1,5) == 4) {
 					mes "[Father Bamph]";
 					mes "Well, I've considered all";
 					mes "possible scenarios. I think";
@@ -2863,8 +2893,9 @@ prt_church,185,106,3	script	Father Bamph	60,{
 					mes "Please accept this money";
 					mes "to cover your Airship fee.";
 					mes "Thank you, and good luck.";
-					set zeny,zeny+1500;
 					set aru_monas,6;
+					Zeny += (checkre(0)?5000:1500);
+					changequest 17002,17003;
 					close;
 				}
 				else {
@@ -2888,7 +2919,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				mes "Everything is tied to religion.";
 				close;
 			}
-			else if (aru_monas > 6 && aru_monas < 24) {
+			else if (aru_monas > 6 && aru_monas < 25) {
 				mes "[Father Bamph]";
 				mes "Thank you so much for all";
 				mes "of your hard work. Our agents";
@@ -2898,25 +2929,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				mes "know what we've been doing.";
 				close;
 			}
-			else if (aru_monas == 24) {
-				mes "[Father Bamph]";
-				mes "Thank you for bring us such";
-				mes "important information. With";
-				mes "your help, we were able to";
-				mes "clear a few unsolved cases.";
-				mes "We expected something like";
-				mes "this, but not this soon.";
-				next;
-				mes "[Father Bamph]";
-				mes "I fear that the Royal Court";
-				mes "has been bickering over their";
-				mes "own selfish needs. I pray that";
-				mes "it does not grow worse, devolve";
-				mes "into chaos. ^666666*Sigh*^000000 We'll see...";
-				set aru_monas,25;
-				close;
-			}
-			else if (aru_monas >= 25) {
+			else if (aru_monas == 25 || aru_monas == 26) {
 				mes "[Father Bamph]";
 				mes "Thank you for bring us such";
 				mes "important information. With";
@@ -2933,20 +2946,21 @@ prt_church,185,106,3	script	Father Bamph	60,{
 				mes "into chaos. ^666666*Sigh*^000000 We'll see...";
 				close;
 			}
-// End Nameless Island Access Quest Addition
 			else {
 				mes "[Father Bamph]";
-				mes "I'm sorry, but would it";
-				mes "be alright if we talked";
-				mes "later? I have to handle";
-				mes "a very important task now...";
+				mes "It's upsetting to me that";
+				mes "Arunafeltz has been so quiet";
+				mes "lately. You know the expression";
+				mes "about there being a quiet lull";
+				mes "before a raging storm, right?";
 				close;
 			}
+// End Nameless Island Access Quest Addition
 		}
 	}
 }
 
-prt_church,184,110,3	script	Father Biscuss	60,{
+prt_church,184,110,3	script	Father Biscuss	1_M_PASTOR,{
 	if (prt_curse == 54) {
 		mes "[Father Biscuss]";
 		mes "Hmm, I still suspect that";
@@ -2997,10 +3011,8 @@ prt_church,184,110,3	script	Father Biscuss	60,{
 		mes "Church, I want to thank";
 		mes "you for all of your help.";
 		set prt_curse,36;
-		if(checkre(0))
-			getexp 160000,0;
-		else
-			getexp 1600000,0;
+		completequest 18048;
+		getexp (checkre(3))?90000:1600000,0;
 		close;
 	}
 	else if (prt_curse == 36) {
@@ -3029,14 +3041,14 @@ prt_church,184,110,3	script	Father Biscuss	60,{
 	}
 }
 
-prt_church,177,113,3	script	#gototomb	111,{
+prt_church,177,113,3	script	#gototomb	HIDDEN_NPC,{
 	if (prt_curse > 17 && prt_curse < 23 || prt_curse > 31 && prt_curse < 35 || prt_curse == 41 || prt_curse == 42 || prt_curse == 44 || prt_curse == 51 || prt_curse == 52) {
 		warp "prt_church",21,91;
 	}
 	end;
 }
 
-prt_church,23,89,3	script	Father Biscuss#tomb	60,{
+prt_church,23,89,3	script	Father Biscuss#tomb	1_M_PASTOR,{
 	mes "[Father Biscuss]";
 	mes "Hm...?";
 	mes "Are you ready to";
@@ -3056,7 +3068,7 @@ prt_church,23,89,3	script	Father Biscuss#tomb	60,{
 	close;
 }
 
-prt_church,16,114,4	script	Father Bamph#tomb	60,{
+prt_church,16,114,4	script	Father Bamph#tomb	1_M_PASTOR,{
 	if (prt_curse == 18) {
 		mes "[Father Bamph]";
 		mes "There are the bodies";
@@ -3141,7 +3153,7 @@ prt_church,16,114,4	script	Father Bamph#tomb	60,{
 	end;
 }
 
-prt_church,19,111,5	script	#prince1	887,{
+prt_church,19,111,5	script	#prince1	4_M_LIEMAN,{
 	if (prt_curse == 19) {
 		mes "[Father Bamph]";
 		mes "This is the body of";
@@ -3158,6 +3170,7 @@ prt_church,19,111,5	script	#prince1	887,{
 		mes "note that the mark resembles";
 		mes "the scales of a serpent.^000000";
 		set prt_curse,20;
+		changequest 18037,18038;
 		close;
 	}
 	else if (prt_curse == 33 || prt_curse > 41 && prt_curse < 51 || prt_curse == 52) {
@@ -3177,7 +3190,7 @@ prt_church,19,111,5	script	#prince1	887,{
 	}
 }
 
-prt_church,21,111,5	script	#prince2	887,{
+prt_church,21,111,5	script	#prince2	4_M_LIEMAN,{
 	if (prt_curse == 20) {
 		mes "[Father Bamph]";
 		mes "This is the body of the";
@@ -3193,7 +3206,7 @@ prt_church,21,111,5	script	#prince2	887,{
 		mes "curse, we all failed. Those";
 		mes "involved have begun to believe";
 		mes "that Odin may have abandoned us... ";
-		Emotion e_omg,1;
+		emotion e_omg,1;
 		next;
 		mes "^3355FFYou examine the body of";
 		mes "the second prince and notice";
@@ -3218,6 +3231,7 @@ prt_church,21,111,5	script	#prince2	887,{
 		mes "involved. Let's go check";
 		mes "the body of the third prince.";
 		set prt_curse,21;
+		changequest 18038,18039;
 		close;
 	}
 	else if (prt_curse == 33 || prt_curse > 41 && prt_curse < 51 || prt_curse == 52) {
@@ -3241,7 +3255,7 @@ prt_church,21,111,5	script	#prince2	887,{
 	}
 }
 
-prt_church,24,111,5	script	#prince3	887,{
+prt_church,24,111,5	script	#prince3	4_M_LIEMAN,{
 	if (prt_curse == 21) {
 		mes "^3355FFYou and Father Bamph";
 		mes "hurriedly inspect the third";
@@ -3328,6 +3342,7 @@ prt_church,24,111,5	script	#prince3	887,{
 			if (prt_curse == 32) set prt_curse,33;
 			else if (prt_curse == 41) set prt_curse,42;
 			else set prt_curse,52;
+			changequest 18046,18047;
 			close;
 		}
 		mes "^3355FFYou'll need to have";
@@ -3355,7 +3370,7 @@ prt_church,24,111,5	script	#prince3	887,{
 	}
 }
 
-moc_fild16,201,295,5	script	Assassin Guildsman#poiso	884,{
+moc_fild16,201,295,5	script	Assassin Guildsman#poiso	4_M_ACROSS,{
 	if (prt_curse == 23) {
 		mes "[Assassin Guildsman]";
 		mes "What business";
@@ -3387,6 +3402,7 @@ moc_fild16,201,295,5	script	Assassin Guildsman#poiso	884,{
 			mes "in Morroc. Go find someone";
 			mes "named ^3131FFMarjana^000000 inside.";
 			set prt_curse,24;
+			changequest 18040,18041;
 			close;
 		}
 		mes "[Assassin Guildsman]";
@@ -3408,7 +3424,7 @@ moc_fild16,201,295,5	script	Assassin Guildsman#poiso	884,{
 	}
 }
 
-que_job01,10,16,5	script	Marjana#poison	885,{
+que_job01,10,16,5	script	Marjana#poison	4_F_ACROSS,{
 	if (prt_curse == 24) {
 		mes "[Marjana]";
 		mes "What business brings";
@@ -3573,6 +3589,7 @@ OnTouch:
 			mes "Father Bamph, so I guess";
 			mes "that I'll go talk to her first.";
 			set prt_curse,30;
+			changequest 18041,18042;
 			close;
 		}
 		mes "["+strcharinfo(0)+"]";
@@ -3582,11 +3599,12 @@ OnTouch:
 		mes "bodies. I better head over";
 		mes "to Prontera right away.";
 		set prt_curse,50;
+		changequest 18041,18043;
 		close;
 	}
 }
 
-prt_in,162,99,4	script	Librarian#curse	67,{
+prt_in,162,99,4	script	Librarian#curse	1_F_02,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -3614,14 +3632,14 @@ prt_in,162,99,4	script	Librarian#curse	67,{
 				mes "we will provide you with";
 				mes "replacement copies.";
 				next;
-				if (zeny > 699) {
+				if (Zeny > 699) {
 					mes "[Librarian]";
 					mes "Ah, here you are.";
 					mes "Please take these";
 					mes "replacement copies,";
 					mes "and try not to lose";
 					mes "them again. Thank you.";
-					set zeny,zeny-700;
+					Zeny -= 700;
 					getitem 7431,1; //Books
 					close;
 				}
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index ed77ef22d..a450ee8b0 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -1,18 +1,16 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Rachel Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 3.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= Collection of Rachel Quests 
+//===== Current Version: =====================================
+//= 3.6
+//===== Description: =========================================
+//= Collection of Rachel Quests
 //= Lost Child Quest:
 //= - End of quest coincides with opening the Sanctuary.
 //= - Variable in use: lost_boy (max 13)
 //= Bruspetti Quest:
-//= - [Aegis conversion]
+//= - [Official Conversion]
 //= - Requires friendship quest as a prerequisite.
 //= - Variable in use: rach_vice (max 24)
 //= Ice Necklace Quest:
@@ -25,34 +23,7 @@
 //= - Variable in use: Once completed MISC_QUEST bit 8192 is set
 //= - Variable in use: ra_have_donated (0 no/1 yes)
 //= - Variable in use: $rachel_donate (max 10000)
-//===== Additional Comments: ================================= 
-//= 1.0 First version, needs testing. [L0ne_W0lf]
-//= 1.1 Some slight optimization. [L0ne_W0lf]
-//= 1.2 Fixed Man Stuck in Ice only giving 1 Freezing Snow Powder. [L0ne_W0lf]
-//= 1.3 Added the ability to redeem lottery tickets before donation max is met. [L0ne_W0lf]
-//= 1.4 Removed an erroneous "case". Thanks, Jet. [L0ne_W0lf]
-//= 1.5 Fixed a bug in Bruspetti quest. [SinSloth]
-//= 1.5b Fixed some typos in various quests. [SinSloth]
-//= 1.6 Fixed a couple bugs with the Pope's Office Guards... [L0ne_W0lf]
-//= 1.7 Fixed Maheo, he will revert to his frozen state when clicked. [L0ne_W0lf]
-//=	Replaced  instances of "+name+", with "+strcharinfo(0)".
-//= 1.8 Various fixes: Hamion will now delete items used for Wind Hammer. [L0ne_W0lf]
-//=	Fixed EXP reward in Ice Necklace quest, fixed a typo in an NPC header.
-//=	Another minor fix to Hamion. "< 1" -> "< 2". Added a missing close to
-//=	the ontouch "key". Thanks to Gepard for pointing them out.
-//= 1.9 Fixed a misorder with variable checkings. [SinSloth]
-//= 2.0 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
-//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 2.2 Maheo NPC now uses "setnpcdisplay" instead of two NPCs. [L0ne_W0lf]
-//= 2.2a Corrected a Typo error ";;". [Samuray22]
-//= 2.3 Added Zhed's portion of Thor Volcano Base Quest. (euRO) [L0ne_W0lf]
-//= 2.4 Updated Zhed's Thor Vol. Base addition dialog to iRO's. [L0ne_W0lf]
-//= 2.4a Further updates to Zhed's Veins addition. [L0ne_W0lf]
-//= 2.5 Added Nameless Island quest addition. [L0ne_W0lf]
-//= 2.6 Uncommented ontouchNPC label for Man Stuck in Ice. [L0ne_W0lf]
-//= 2.7 Corrected overlaping warp coordinates. [L0ne_W0lf]
-//= 2.8 Replaced effect numerics with constants. [L0ne_W0lf]
-//= 2.9 Replaced effect numerics with constants. [Samuray22]
+//===== Additional Comments: =================================
 //= 3.0 Large reordering of Zhed, and Peace to the Arunafeltz addition. [L0ne_W0lf]
 //=     Some more numeric conversion, and some other cleanup.
 //= 3.1 Updated Ice Necklace quest, added missing checks. [L0ne_W0lf]
@@ -63,12 +34,13 @@
 //= 3.4 Added quest log entries for:
 //=     - Ice Necklace Quest
 //=     - Thor Volcano Base Quest addition.
-//= 3.5 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
+//= 3.5 Updated RE/Pre-RE EXP. [Euphy]
+//= 3.6 Added questlog support. [Euphy]
+//============================================================
 
-// Lost Child Quest (Prerequisite to High Priest quest)
-//============================================================ 
-ra_in01,384,246,3	script	Vincent#ra_in01	47,{
+// Lost Child Quest (Prerequisite to High Priest quest) :: rachel_wonjumin
+//============================================================
+ra_in01,384,246,3	script	Vincent#ra_in01	1_M_01,{
 	if (BaseLevel < 60) {
 		mes "[Vincent]";
 		mes "You're inside Sir Zhed's";
@@ -78,7 +50,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "work, brave adventurer.";
 		close;
 	}
-
 	if (lost_boy < 1) {
 		mes "[Vincent]";
 		mes "I am Vincert, steward of";
@@ -95,9 +66,7 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "ask you for your help with";
 		mes "a problem on his behalf.";
 		next;
-
 		switch(select("I'm too busy.:Sure, why not?")) {
-
 		case 1:
 			mes "[Vincent]";
 			mes "I understand.";
@@ -107,7 +76,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 			mes "later, then I'd like to ask for";
 			mes "your assistance once again.";
 			close;
-
 		case 2:
 			mes "[Vincent]";
 			mes "Thank you. You see,";
@@ -139,12 +107,10 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 			mes "You might want to question the";
 			mes "other servants of his whereabouts. Thanks again for your help.";
 			set lost_boy,1;
+			setquest 8089;
 			close;
-
 		}
-
 	}
-
 	else if ((lost_boy >= 1) && (lost_boy < 4)) {
 		mes "[Vincent]";
 		mes "I suggest looking around";
@@ -153,7 +119,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Phobe's current location.";
 		close;
 	}
-
 	else if ((lost_boy >= 4) && (lost_boy < 7)) {
 		mes "[Vincent]";
 		mes "We're running out";
@@ -162,7 +127,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "as soon as you can.";
 		close;
 	}
-
 	else if (lost_boy == 7) {
 		mes "[Vincent]";
 		mes "Ah...!";
@@ -298,9 +262,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "just a kid, so he's probably";
 		mes "hiding somewhere in town.";
 		set lost_boy,8;
+		changequest 8094,8095;
 		close;
 	}
-
 	else if (lost_boy == 8) {
 		mes "[Vincent]";
 		mes "The gem is very special...";
@@ -339,7 +303,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "hiding somewhere in town...";
 		close;
 	}
-
 	else if (lost_boy == 9) {
 		mes "[Vincent]";
 		mes "You came back!";
@@ -385,9 +348,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Jenny about Phobe?";
 		mes "Sure, sure, I'll do that.";
 		set lost_boy,10;
+		changequest 8097,8097;
 		close;
 	}
-
 	else if (lost_boy == 10) {
 		mes "[Vincent]";
 		mes "Oh! While I return this";
@@ -402,7 +365,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Sure, sure, I'll do that.";
 		close;
 	}
-
 	else if (lost_boy == 11) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I told Jenny that";
@@ -446,8 +408,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "I don't know what's inside,";
 		mes "but I know these items are";
 		mes "quite valuable nowadays...";
-		getitem 617,1; //Old_Violet_Box
 		set lost_boy,12;
+		changequest 8098,8099;
+		getitem 617,1; //Old_Violet_Box
 		next;
 		mes "[Vincent]";
 		mes "Ah, and this note is a";
@@ -462,7 +425,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "from Vincent.^000000";
 		close;
 	}
-
 	else {
 		mes "[Vincent]";
 		mes "Thank you for everything";
@@ -472,10 +434,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "hesitate to ask me, alright?";
 		close;
 	}
-
 }
 
-rachel,114,232,3	script	Logan#ra_in01	869,{
+rachel,114,232,3	script	Logan#ra_in01	4_M_LGTMAN,{
 	if ((lost_boy < 1) || (lost_boy >= 3)) {
 		mes "[Logan]";
 		mes "I'm just Logan, one";
@@ -486,7 +447,6 @@ rachel,114,232,3	script	Logan#ra_in01	869,{
 		mes "don't distract me, please.";
 		close;
 	}
-
 	else if (lost_boy == 1) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but do";
@@ -532,9 +492,9 @@ rachel,114,232,3	script	Logan#ra_in01	869,{
 		mes "inside the mansion. He's";
 		mes "been working here for a while.";
 		set lost_boy,2;
+		changequest 8089,8090;
 		close;
 	}
-
 	else if (lost_boy == 2) {
 		mes "[Logan]";
 		mes "If you want to learn";
@@ -545,10 +505,9 @@ rachel,114,232,3	script	Logan#ra_in01	869,{
 		mes "the mansion is a good bet.";
 		close;
 	}
-
 }
 
-ra_in01,372,200,3	script	Manson#ra_in01	929,{
+ra_in01,372,200,3	script	Manson#ra_in01	4_M_MIDDLE,{
 	if (lost_boy < 1) {
 		mes "[Manson]";
 		mes "I am Manson, one of the";
@@ -559,7 +518,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "cleaning up after visitors.";
 		close;
 	}
-
 	else if (lost_boy == 1) {
 		mes "[Manson]";
 		mes "You know, considering";
@@ -570,7 +528,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "Sir Zhed here in the mansion.";
 		close;
 	}
-
 	else if (lost_boy == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but do you";
@@ -633,9 +590,9 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "now, and she'd appreciate";
 		mes "your help in finding Phobe.";
 		set lost_boy,3;
+		changequest 8090,8091;
 		close;
 	}
-
 	else if (lost_boy == 3) {
 		mes "[Manson]";
 		mes "You know, if you want to";
@@ -646,7 +603,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "your help in finding Phobe.";
 		close;
 	}
-
 	else {
 		mes "[Manson]";
 		mes "Nuts, there's so much";
@@ -656,10 +612,9 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "Ah well, it's a living.";
 		close;
 	}
-
 }
 
-rachel,48,237,3	script	Jenny#ra_in01	894,{
+rachel,48,237,3	script	Jenny#ra_in01	4_F_KHELLISIA,{
 	if (lost_boy < 3) {
 		mes "[Jenny]";
 		mes "These grounds are owned by";
@@ -669,7 +624,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "haven't been invited!";
 		close;
 	}
-
 	else if (lost_boy == 3) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but are";
@@ -719,9 +673,9 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "Alright, I guess I can go";
 		mes "to the market and ask around.";
 		set lost_boy,4;
+		changequest 8091,8092;
 		close;
 	}
-
 	else if ((lost_boy >= 3) && (lost_boy < 6)) {
 		mes "[Jenny]";
 		mes "Please find Phobe,";
@@ -737,7 +691,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "Phobe was last seen.";
 		close;
 	}
-
 	else if (lost_boy == 6) {
 		mes "[Jenny]";
 		mes "Please find Phobe,";
@@ -747,7 +700,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "about that boy, you know?";
 		close;
 	}
-
 	else if ((lost_boy > 6) && (lost_boy < 11)) {
 		mes "[Jenny]";
 		mes "Oh! You're back!";
@@ -760,7 +712,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "important to discuss";
 			mes "with Vincent first.";
 		}
-
 		else if (lost_boy == 8) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Actually... Uh...";
@@ -769,7 +720,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "lead! Don't worry, I'll";
 			mes "find him soon, I promise.";
 		}
-
 		else if (lost_boy == 9) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Actually... Uh...";
@@ -779,7 +729,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "some good news soon,";
 			mes "I promise. Se eyou later~";
 		}
-
 		else if (lost_boy == 10) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Yes, he's fine, just";
@@ -820,11 +769,10 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "happier. Thank you for";
 			mes "all of your help, adventurer~";
 			set lost_boy,11;
+			changequest 8097,8098;
 		}
-
 		close;
 	}
-
 	else if ((lost_boy > 10) && (lost_boy < 13)) {
 		mes "[Jenny]";
 		mes "Thank you so much for";
@@ -835,12 +783,10 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "I am to you as a mother...";
 		close;
 	}
-
 	end;
-	
 }
 
-rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
+rachel,138,73,5	script	Idle Merchant#ra_in01	4_M_03,{
 	if ((lost_boy < 4) || (lost_boy >= 6)) {
 		mes "[Idle Merchant]";
 		mes "Man! Business is going";
@@ -851,7 +797,6 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 		mes "pack it up and go home.";
 		close;
 	}
-
 	else if (lost_boy == 4) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me?";
@@ -931,7 +876,6 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 		set lost_boy,5;
 		close;
 	}
-
 	else if (lost_boy >= 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "(^333333I better ask the other";
@@ -942,10 +886,9 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 		mes "ridiculous mock vegetables.^000000)";
 		close;
 	}
-
 }
 
-rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
+rachel,120,47,3	script	Idle Merchant#ra_in01_2	4_M_03,{
 	if ((lost_boy < 5) || (lost_boy > 6)) {
 		mes "[Idle Merchant]";
 		mes "I'm thinking of quitting";
@@ -955,7 +898,6 @@ rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 		mes "make a living like this.";
 		close;
 	}
-
 	else if (lost_boy == 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me,";
@@ -1003,9 +945,9 @@ rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 		mes "in that ice cave. That place";
 		mes "can be plenty dangerous.";
 		set lost_boy,6;
+		changequest 8092,8093;
 		close;
 	}
-
 	else if (lost_boy == 6) {
 		mes "[Idle Merchant]";
 		mes "So yeah, last night,";
@@ -1038,11 +980,9 @@ rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 		mes "can be plenty dangerous.";
 		close;
 	}
-
-
 }
 
-ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
+ra_fild01,245,325,3	script	Suspicious Man#ra_in01	4_M_RASWORD,{
 	if ((lost_boy < 6) || (lost_boy > 7)) {
 		mes "[Suspicious Man]";
 		mes "Th-there's not enough";
@@ -1052,7 +992,6 @@ ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
 		mes "precious oxygen!";
 		close;
 	}
-
 	if (lost_boy == 6) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but do you";
@@ -1133,9 +1072,9 @@ ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
 		mes "to Vincent and make";
 		mes "him explain everything.";
 		set lost_boy,7;
+		changequest 8093,8094;
 		close;
 	}
-
 	else if (lost_boy == 7) {
 		mes "[Mogan]";
 		mes "It looks like he set";
@@ -1152,16 +1091,14 @@ ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
 		mes "him explain everything.";
 		close;
 	}
-
 }
 
-rachel,263,32,3	script	Kid#ra_in01	931,{
+rachel,263,32,3	script	Kid#ra_in01	4_M_RACHMAN1,{
 	if (lost_boy < 7) {
 		mes "[Kid]";
 		mes "Leave me alone!";
 		close;
 	}
-
 	else if (lost_boy == 8) {
 		mes "^3355FFYou catch a shining";
 		mes "glint from this boy's";
@@ -1246,9 +1183,9 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "you should bring this red";
 		mes "jewel back to Vincent.^000000";
 		set lost_boy,9;
+		changequest 8095,8096;
 		close;
 	}
-
 	else if (lost_boy == 9) {
 		mes "[Phobe]";
 		mes "I... I'm not ready";
@@ -1264,7 +1201,6 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "jewel back to Vincent.^000000";
 		close;
 	}
-
 	else {
 		mes "["+strcharinfo(0)+"]";
 		mes "You know, you should";
@@ -1288,15 +1224,11 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "Gosh... Fine.";
 		close;
 	}
-
 }
 
-//End of Lost Child quest
-//============================================================ 
-
-//Bruspetti Quest (Perequisite: Lighthalzen "Friendship" quest)
-//============================================================ 
-ra_in01,235,194,5	script	Katinshuell	931,{
+// Bruspetti Quest (Perequisite: Lighthalzen "Friendship" quest) :: rachel_ryu
+//============================================================
+ra_in01,235,194,5	script	Katinshuell	4_M_RACHMAN1,{
 	if (rach_vice > 21) {
 		mes "[Katinshuell]";
 		mes "If I had only turned";
@@ -1306,7 +1238,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "could have had a chance...";
 		close;
 	}
-
 	else if ((rach_vice == 21) && (countitem(1201) > 0)) {
 		mes "[Katinshuell]";
 		mes "Please... Please just";
@@ -1317,9 +1248,9 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "turn me in, go ahead...";
 		delitem 1201,1; //Knife
 		set rach_vice,22;
+		changequest 8121,8122;
 		close;
 	}
-
 	else if (rach_vice == 21) {
 		mes "[Katinshuell]";
 		mes "I suppose it's my";
@@ -1329,7 +1260,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "truly happy. Bruspetti...";
 		close;
 	}
-
 	else if ((rach_vice == 20) && (countitem(1201) > 0)) {
 		mes "[Katinshuell]";
 		mes "I suppose there's";
@@ -1434,7 +1364,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "God! My life sucks!";
 		close;
 	}
-
 	else if (rach_vice == 21) {
 		mes "[Katinshuell]";
 		mes "^333333*Pant pant*^000000";
@@ -1445,7 +1374,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "h-haunt me... Ha ha ha...";
 		close;
 	}
-
 	else if ((rach_vice == 20) && (countitem(1201) > 0)) {
 		mes "[Katinshuell]";
 		mes "I...";
@@ -1487,7 +1415,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "Mr. Katinshuell?";
 		close;
 	}
-
 	else if ((rach_vice == 19) || (rach_vice == 20)) {
 		mes "[Katinshuell]";
 		mes "I...";
@@ -1507,6 +1434,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "I... I don't have";
 		mes "to tell you anything!";
 		set rach_vice,20;
+		changequest 8120,8121;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "(^333333He's still resisting";
@@ -1514,7 +1442,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "him to reveal the truth?^000000)";
 		close;
 	}
-
 	else if (rach_vice == 18) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Let's see...";
@@ -1581,7 +1508,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes ".........";
 		close;
 	}
-
 	else if (rach_vice == 17) {
 		mes "[Katinshuell]";
 		mes "Damn it! I don't want to";
@@ -1599,7 +1525,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		set rach_vice,18;
 		close;
 	}
-
 	else if (rach_vice == 16) {
 		mes "[Katinshuell]";
 		mes "Ha ha ha...";
@@ -1635,7 +1560,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			mes "I don't know what";
 			mes "you're talking about!";
 			close;
-
 		case 2:
 			mes "[" + strcharinfo(0) + "]";
 			mes "You know, I found out";
@@ -1684,7 +1608,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 				mes "backfired, so I'm going";
 				mes "to have to try this again.)^000000";
 				close;
-
 			case 2:
 				mes "[" + strcharinfo(0) + "]";
 				mes "So while she was away";
@@ -1703,7 +1626,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 				mes "backfired, so I'm going";
 				mes "to have to try this again.)^000000";
 				close;
-
 			case 3:
 				mes "[" + strcharinfo(0) + "]";
 				mes "Wait a second! Your break-up";
@@ -1739,7 +1661,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 					mes "backfired, so I'm going";
 					mes "to have to try this again.)^000000";
 					close;
-
 				case 2:
 					mes "[" + strcharinfo(0) + "]";
 					mes "Hmm... Why are you";
@@ -1767,9 +1688,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 					mes "before I get really angry!";
 					close;
 				}
-
 			}
-
 		case 3:
 			mes "[" + strcharinfo(0) + "]";
 			mes "Freya's Spring.";
@@ -1787,7 +1706,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			mes "That's a pretty";
 			mes "good reason.";
 			close;
-
 		case 4:
 			mes "[" + strcharinfo(0) + "]";
 			mes "If Bruspetti is not";
@@ -1808,11 +1726,8 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			mes "to question him again until";
 			mes "my gut feeling is satisfied!^000000)";
 			close;
-
 		}
-
 	}
-
 	else if ((rach_vice == 15) && (countitem(7571))) {
 		mes "[Katinshuell]";
 		mes "Oh, it's you again.";
@@ -1865,11 +1780,11 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		next;
 		mes "[Katinshuell]";
 		mes "......!";
+		delitem 7571,1; //Diary_Of_Blue
 		set rach_vice,16;
-		delitem 7571,1; //Blue_Diary
+		changequest 8119,8120;
 		close;
 	}
-
 	else if ((rach_vice == 10) || (rach_vice == 11)) {
 		mes "[Katinshuell]";
 		mes "Argh! I'm so depressed.";
@@ -1915,6 +1830,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			close;
 		}
 		set rach_vice,11;
+		changequest 8114,8115;
 		mes "[Katinshuell]";
 		mes "You happy, now?";
 		mes "Quit trying to pry into";
@@ -1924,7 +1840,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "you came to do, right?";
 		close;
 	}
-
 	else if (rach_vice == 4) {
 		mes "[Katinshuell]";
 		mes "Uh... ";
@@ -1934,9 +1849,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "be left alone. Go away...";
 		close;
 	}
-
 	else if (rach_vice == 3) {
-		set rach_vice,4;
 		mes "[Katinshuell]";
 		mes "Eh? Oh, it's one of you";
 		mes "guys, those do-gooder";
@@ -1951,9 +1864,10 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "can't handle. Me and my";
 		mes "girlfriend are history now.";
 		mes "It's over between us.";
+		set rach_vice,4;
+		changequest 8107,8108;
 		close;
 	}
-
 	else if (rach_vice == 2) {
 		mes "[Katinshuell]";
 		mes "You're an adventurer,";
@@ -1970,7 +1884,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "of mine never cease to haunt me...";
 		close;
 	}
-
 	else if (rach_vice == 1) {
 		mes "[Katinshuell]";
 		mes "You're an adventurer,";
@@ -1986,7 +1899,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "left all alone, these thoughts of mine never cease to haunt me...";
 		close;
 	}
-
 	else if (rach_vice == 0) {
 		mes "[Katinshuell]";
 		mes "You're an adventurer,";
@@ -2023,7 +1935,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 	close;
 }
 
-ra_in01,250,19,3	script	Mr. Shendar	929,{
+ra_in01,250,19,3	script	Mr. Shendar	4_M_MIDDLE,{
 	if (rach_vice > 21) {
 		mes "[Mr. Shendar]";
 		mes "When will my precious";
@@ -2042,7 +1954,6 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "Thanks, adventurer.";
 		close;
 	}
-
 	else if (rach_vice == 14) {
 		mes "[Mr. Shendar]";
 		mes "So you have a pretty";
@@ -2066,7 +1977,6 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "to hate and distrust him!";
 		close;
 	}
-
 	else if (rach_vice == 13) {
 		mes "[Mr. Shendar]";
 		mes "Hey! Hey! Are you";
@@ -2117,7 +2027,6 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "around here? I'd better go";
 		mes "and ask him about this...";
 		next;
-		set rach_vice,14;
 		mes "[Mr. Shendar]";
 		mes "Wait, where are";
 		mes "you going? I... I'm";
@@ -2146,9 +2055,10 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "father. Besides, adventurers";
 		mes "like you can offer her the";
 		mes "best protection...";
+		set rach_vice,14;
+		changequest 8117,8118;
 		close;
 	}
-
 	else if (rach_vice == 9) {
 		mes "[Mr. Shendar]";
 		mes "Curses! I should have never";
@@ -2158,9 +2068,7 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "is naturally too curious...!";
 		close;
 	}
-
 	else if (rach_vice == 8) {
-		set rach_vice,9;
 		mes "[Mr. Shendar]";
 		mes "What? My daughter went";
 		mes "to Lighthalzen? She doesn't";
@@ -2197,11 +2105,11 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "Oh, but how a father";
 		mes "worries. Will my sweet,";
 		mes "darling Bruspetti be alright?";
+		set rach_vice,9;
+		changequest 8112,8113;
 		close;
 	}
-
 	else if ((rach_vice == 4) || (rach_vice == 5)) {
-		set rach_vice,5;
 		mes "[Mr. Shendar]";
 		mes "I miss my daughter. Yes,";
 		mes "the house smells different";
@@ -2216,9 +2124,10 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "distinctively pleasant";
 		mes "scent about them. I guess";
 		mes "it must be pheremonal?";
+		set rach_vice,5;
+		changequest 8108,8109;
 		close;
 	}
-
 	else if (rach_vice == 2) {
 		mes "[Mr. Shendar]";
 		mes "Take my advice: never";
@@ -2237,9 +2146,7 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "little neck! At least, I should...";
 		close;
 	}
-
 	else if (rach_vice == 1) {
-		set rach_vice,2;
 		mes "[Mr. Shendar]";
 		mes "I just found out that";
 		mes "my precious daughter has";
@@ -2263,9 +2170,10 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "awful long time, but she's";
 		mes "also an adult now. I... I guess";
 		mes "she should be just fine.";
+		set rach_vice,2;
+		setquest 8106;
 		close;
 	}
-
 	mes "[Mr. Shendar]";
 	mes "I just found out that";
 	mes "my precious daughter has";
@@ -2284,7 +2192,7 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 	close;
 }
 
-rachel,73,244,3	script	Lachellen	919,{
+rachel,73,244,3	script	Lachellen	4_F_SHABBY,{
 	if (rach_vice > 21) {
 		mes "[Lachellen]";
 		mes "If you happen to see";
@@ -2295,7 +2203,6 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "I can't wait to see her~";
 		close;
 	}
-
 	else if ((rach_vice == 11) || (rach_vice == 12)) {
 		mes "[Lachellen]";
 		mes "Oh, hello again~";
@@ -2317,7 +2224,6 @@ rachel,73,244,3	script	Lachellen	919,{
 			next;
 		}
 		else if (.@input$ == "Freya's Spring") {
-			set rach_vice,12;
 			mes "[Lachellen]";
 			mes "Freya's Spring?";
 			mes "Oh, I like that place!";
@@ -2340,6 +2246,8 @@ rachel,73,244,3	script	Lachellen	919,{
 			mes "so you look like a real loser";
 			mes "if you go there alone. That's";
 			mes "why I want a boyfriend now...";
+			set rach_vice,12;
+			changequest 8115,8116;
 			next;
 		}
 		else {
@@ -2358,7 +2266,6 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "just a little bit.";
 		close;
 	}
-
 	else if (rach_vice == 7) {
 		mes "[Lachellen]";
 		mes "Let's see... Bruspetti";
@@ -2377,9 +2284,7 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "tell her I said ''hi,'' okay?";
 		close;
 	}
-
 	else if (rach_vice == 6) {
-		set rach_vice,7;
 		mes "[Lachellen]";
 		mes "Oh, Bruspetti's dad";
 		mes "was talking about how";
@@ -2411,11 +2316,11 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "and her boyfriend usually";
 		mes "went on dates, you might";
 		mes "be able to find something.";
+		set rach_vice,7;
+		changequest 8110,8111;
 		close;
 	}
-
 	else if ((rach_vice == 2) || (rach_vice == 3)) {
-		set rach_vice,3;
 		mes "[Lachellen]";
 		mes "Ooh, I'm so jealous";
 		mes "of Bruspetti! She's been";
@@ -2430,9 +2335,10 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "she's also admitted that";
 		mes "she doesn't know much about";
 		mes "him. Let's see... He grew up in Lighthalzen? That's all she knows.";
+		set rach_vice,3;
+		changequest 8106,8107;
 		close;
 	}
-
 	mes "[Lachellen]";
 	mes "My friend Bruspetti";
 	mes "is a really nice girl~";
@@ -2450,7 +2356,7 @@ rachel,73,244,3	script	Lachellen	919,{
 	close;
 }
 
-rachel,196,77,3	script	Kid#1rachel	921,{
+rachel,196,77,3	script	Kid#1rachel	4_M_CHILD1,{
 	mes "[Kid]";
 	mes "Hey, have you seen";
 	mes "Bruspetti? She's really";
@@ -2466,7 +2372,7 @@ rachel,196,77,3	script	Kid#1rachel	921,{
 	close;
 }
 
-rachel,151,155,3	script	Kid#2rachel	921,{
+rachel,151,155,3	script	Kid#2rachel	4_M_CHILD1,{
 	mes "[Kid]";
 	mes "Oh wow! I wanna be an";
 	mes "adventurer like you when";
@@ -2491,7 +2397,7 @@ rachel,151,155,3	script	Kid#2rachel	921,{
 	close;
 }
 
-rachel,266,35,3	script	Grandma#rachel	918,{
+rachel,266,35,3	script	Grandma#rachel	4_F_RACHOLD,{
 	if (rach_vice > 21) {
 		mes "[Grandma]";
 		mes "When you get to be my";
@@ -2509,7 +2415,6 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 		mes "not particularly special.";
 		close;
 	}
-
 	else if (rach_vice == 13) {
 		mes "[Grandma]";
 		mes "When you get to be my";
@@ -2520,9 +2425,7 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 		mes "worry when I could've relaxed.";
 		close;
 	}
-
 	else if (rach_vice == 12) {
-		set rach_vice,13;
 		mes "[Grandma]";
 		mes "Oh, back again, eh?";
 		mes "I guess you must really";
@@ -2549,6 +2452,8 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 		mes "to let go of whatever's";
 		mes "bothering you, and just";
 		mes "enjoy life as it is now.";
+		set rach_vice,13;
+		changequest 8116,8117;
 		close;
 	}
 	mes "[Grandma]";
@@ -2565,10 +2470,9 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 	close;
 }
 
-lhz_in02,213,207,0	script	#ratrace1	111,4,4,{
+lhz_in02,213,207,0	script	#ratrace1	HIDDEN_NPC,4,4,{
 OnTouch:
 	if (rach_vice == 5) {
-		set rach_vice,6;
 		mes "[" + strcharinfo(0) + "]";
 		mes "This...";
 		mes "This smell...";
@@ -2580,12 +2484,14 @@ OnTouch:
 		mes "Wait, could this be";
 		mes "the scent that Bruspetti's";
 		mes "father mentioned earlier?";
+		set rach_vice,6;
+		changequest 8109,8110;
 		close;
 	}
 	end;
 }
 
-rachel,265,47,0	script	#raevent1	111,2,2,{
+rachel,265,47,0	script	#raevent1	HIDDEN_NPC,2,2,{
 OnTouch:
 	if (rach_vice == 23) {
 		mes "[" + strcharinfo(0) + "]";
@@ -2621,14 +2527,15 @@ OnTouch:
 		mes "Who would be to blame?";
 		next;
 		set rach_vice,24;
-		if(checkre(0)) {
-		if (BaseLevel > 90) getexp 130000,0;
-		else if (BaseLevel > 75) getexp 85000,0;
-		else getexp 45000,0;
+		completequest 8122;
+		if (checkre(3)) {
+			if (BaseLevel > 90) getexp 130000,0;
+			else if (BaseLevel > 75) getexp 85000,0;
+			else getexp 45000,0;
 		} else {
-		if (BaseLevel > 90) getexp 1400000,0;
-		else if (BaseLevel > 75) getexp 800000,0;
-		else getexp 400000,0;
+			if (BaseLevel > 90) getexp 1300000,0;
+			else if (BaseLevel > 75) getexp 850000,0;
+			else getexp 450000,0;
 		}
 		mes "[" + strcharinfo(0) + "]";
 		mes "Somehow, I wish that";
@@ -2638,7 +2545,6 @@ OnTouch:
 		mes "forgive himself.";
 		close;
 	}
-
 	else if (rach_vice == 22) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "This must be where";
@@ -2670,7 +2576,6 @@ OnTouch:
 		mes "...What?";
 		close;
 	}
-
 	else if (rach_vice == 8) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "That old woman told";
@@ -2680,9 +2585,7 @@ OnTouch:
 		mes "make sure I tread carefully.";
 		close;
 	}
-
 	else if (rach_vice == 7) {
-		set rach_vice,8;
 		mes "[???]";
 		mes "Oh, be very careful!";
 		mes "You don't want to get";
@@ -2700,12 +2603,14 @@ OnTouch:
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Ah, I see.";
+		set rach_vice,8;
+		changequest 8111,8112;
 		close;
 	}
 	end;
 }
 
-ra_in01,255,25,0	script	Book#ra_in	111,{
+ra_in01,255,25,0	script	Book#ra_in	HIDDEN_NPC,{
 	if (rach_vice == 15) {
 		mes "^3355FFThis is where you";
 		mes "found Bruspetti's diary.";
@@ -2714,10 +2619,10 @@ ra_in01,255,25,0	script	Book#ra_in	111,{
 		mes "you talk to Katinshuell.^000000";
 		close;
 	}
-
 	else if (rach_vice == 14) {
 		set rach_vice,15;
-		getitem 7571,1; //Blue_Diary
+		changequest 8118,8119;
+		getitem 7571,1; //Diary_Of_Blue
 		mes "^3355FFThis must be";
 		mes "Bruspetti's diary!";
 		mes "You now have permission";
@@ -2726,32 +2631,29 @@ ra_in01,255,25,0	script	Book#ra_in	111,{
 		mes "Katinshuell are connected...^000000";
 		close;
 	}
-
 	else if ((rach_vice == 9) || (rach_vice == 10)) {
-		set rach_vice,10;
 		mes "^3355FFThis must be";
 		mes "Bruspetti's diary!";
 		mes "But... reading it";
 		mes "would make you feel";
 		mes "like a real creep.";
 		mes "So don't touch it.^000000";
+		set rach_vice,10;
+		changequest 8113,8114;
 		close;
 	}
 
 }
 
-//End of Bruspetti quest
-//============================================================ 
-
-// Ice Necklace/Summon Ktullanux Quest and Glacial Heart buyer
-//============================================================ 
+// Ice Necklace/Summon Ktullanux Quest and Glacial Heart buyer :: rachel_tre
+//============================================================
 //iRO Changed this NPC to avoid "offending" people.
 //To enable how it originally looked, uncomment the
 //line below (npc header), and comment the line
 //under it, and then uncomment the cutin lines.
 
-//rachel,157,183,3	script	Sincere Follower Urstia	917,{
-rachel,157,183,3	script	Sincere Follower Urstia	916,{
+//rachel,157,183,3	script	Sincere Follower Urstia	4_F_MASK,{
+rachel,157,183,3	script	Sincere Follower Urstia	4_F_MASK1,{
 	cutin "ra_usti1",2;
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second!";
@@ -2931,12 +2833,9 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 			mes "token of my appreication for";
 			mes " what you have done for me.";
 			delitem 7573,1; //Magic_Necklace_
-			if(checkre(0))
-				getexp 70000,0;
-			else
-				getexp 700000,0;
-			completequest 2113;
+			getexp (checkre(3))?90000:700000,0;
 			set ice_necklace_q,6;
+			completequest 2113;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "Oh, let's just say it was";
@@ -2967,7 +2866,7 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 	end;
 }
 
-ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
+ice_dun02,120,105,3	script	Man Stuck in Ice#cave	4_M_FROZEN1,5,5,{
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -2997,12 +2896,12 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "this ice off of me!.";
 		next;
 		if (getskilllv("MG_FIREBOLT") > 0) {
-			misceffect EF_FIREBALL;
+			specialeffect EF_FIREBALL;
 			mes "^3355FFYou cast Fire Bolt at";
 			mes "the ice..^000000";
 		}
 		else {
-			misceffect EF_HIT2;
+			specialeffect EF_HIT2;
 			mes "^3355FFYou hammer at the";
 			mes "ice with all your might.^000000";
 		}
@@ -3163,8 +3062,8 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "this prison of ice. He can";
 		mes "be found near Freya's Spring:";
 		mes "beseech him on my behalf!";
-		changequest 2109,2110;
 		set ice_necklace_q,2;
+		changequest 2109,2110;
 		close2;
 		cutin "",255;
 		end;
@@ -3226,20 +3125,20 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "swung it down at the ice";
 		mes "with all of your strength.^000000";
 		next;
-		misceffect EF_TEIHIT3;
-		misceffect EF_FREEZE;
-		misceffect EF_ICECRASH;
+		specialeffect EF_TEIHIT3;
+		specialeffect EF_FREEZE;
+		specialeffect EF_ICECRASH;
 		mes "^3355FF*Pzzzzz*";
 		mes "*CRASH!*^000000";
 		next;
-		setnpcdisplay "Man Stuck in Ice#cave",937;
+		setnpcdisplay "Man Stuck in Ice#cave", 4_M_ARUNA_NFM1;
 		emotion e_gasp;
 		mes "[Maheo]";
 		mes "Finally...!";
 		mes "After all of this";
 		mes "time! I'm free!";
 		next;
-		misceffect EF_BEGINSPELL4;
+		specialeffect EF_BEGINSPELL4;
 		mes "[Maheo]";
 		mes "Now, all of the monsters";
 		mes "in this cave will taste the";
@@ -3252,7 +3151,7 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		monster "ice_dun02",114,112,"Snowier",1775,1,"Man Stuck in Ice#cave::OnMyMobDead";
 		monster "ice_dun02",126,105,"Snowier",1775,1,"Man Stuck in Ice#cave::OnMyMobDead";
 		monster "ice_dun02",121,99,"Snowier",1775,1,"Man Stuck in Ice#cave::OnMyMobDead";
-		misceffect EF_LORD;
+		specialeffect EF_LORD;
 		killmonster "ice_dun02","Man Stuck in Ice#cave::OnMyMobDead";
 		mes "[Maheo]";
 		mes "Muhahahahahahahaha!";
@@ -3276,7 +3175,7 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "[Maheo]";
 		mes "Let's see, now...";
 		next;
-		misceffect EF_FROSTWEAPON;
+		specialeffect EF_FROSTWEAPON;
 		mes "^3355FF*Ting*^000000";
 		next;
 		mes "[Maheo]";
@@ -3286,22 +3185,22 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "And please don't mention";
 		mes "the fact that I trapped myself";
 		mes "in ice to anyone else, okay?";
+		set ice_necklace_q,5;
+		changequest 2112,2113;
+		delitem 7569,1; //Hammer_Of_Wind
 		delitem 7572,1; //Magic_Necklace
-		delitem 7569,1; //Wind Of_Hammer
-		getitem 7574,4; //Freezing Snow Powder
 		getitem 7573,1; //Magic_Necklace_
-		changequest 2112,2113;
-		set ice_necklace_q,5;
+		getitem 7574,4; //Ice_Particle
 		close2;
 		cutin "",255;
-		setnpcdisplay "Man Stuck in Ice#cave",924;
+		setnpcdisplay "Man Stuck in Ice#cave", 4_M_FROZEN1;
 		end;
 	}
 
 OnTouch:
 	end;
 
-OnTouchNPC: 
+OnTouchNPC:
 	emotion e_an;
 	//emotion e_gg,1; //Emote on monster - unsupported
 	end;
@@ -3330,7 +3229,7 @@ OnTimer10800000:
 	end;
 }
 
-rachel,265,98,3	script	Hamion#aru	930,{
+rachel,265,98,3	script	Hamion#aru	4_M_RACHMAN2,{
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -3396,12 +3295,12 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		mes "not one of those smithing tools.";
 		mes "I'd help you if I could, but...";
 		mes "I'm just smart, not strong.";
-		changequest 2110,2111;
 		set ice_necklace_q,3;
+		changequest 2110,2111;
 		close;
 	}
 	else if (ice_necklace_q == 3) {
-		if ((countitem(996) < 5) || (countitem(1354) < 1) || (countitem(7433) < 1)) { 
+		if ((countitem(996) < 5) || (countitem(1354) < 1) || (countitem(7433) < 1)) {
 			mes "[Hamion]";
 			mes "I need to create";
 			mes "a magical artifact";
@@ -3463,12 +3362,12 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		mes "This hammer will only work";
 		mes "once, so make sure that you";
 		mes "smash that ice properly!";
+		delitem 1354,1; //Hammer
 		delitem 996,5; //Rough_Wind
-		delitem 1354,1; //Empty_Scroll
-		delitem 7433,1; //Hammer
-		getitem 7569,1; //Hammer_of_Wind
-		changequest 2111,2112;
+		delitem 7433,1; //Scroll
 		set ice_necklace_q,4;
+		changequest 2111,2112;
+		getitem 7569,1; //Hammer_of_Wind
 		close;
 	}
 	else if (ice_necklace_q >= 4) {
@@ -3483,7 +3382,7 @@ rachel,265,98,3	script	Hamion#aru	930,{
 	}
 }
 
-rachel,113,96,5	script	Mohadian	929,10,10,{
+rachel,113,96,5	script	Mohadian	4_M_MIDDLE,10,10,{
 	if (ice_necklace_q == 6) {
 		mes "[Mohadian]";
 		mes "I work at the bar around";
@@ -3579,7 +3478,7 @@ rachel,113,96,5	script	Mohadian	929,10,10,{
 		mes "It's always a pleasure";
 		mes "doing business with you~";
 		delitem 7561,.@hearts; //Glacial Hearts
-		set zeny,zeny+.@totalprice;
+		Zeny += .@totalprice;
 		close;
 	}
 
@@ -3592,17 +3491,16 @@ OnTouch:
 		close;
 	}
 	end;
-
 }
 
-ice_dun03,126,126,3	script	Blazing Fire#ice1	802,{
+ice_dun03,126,126,3	script	Blazing Fire#ice1	4_NFWISP,{
 	mes "^3355FFThe flames in this fire";
 	mes "barrier crackle with magic";
 	mes "power. There's no way that";
 	mes "you can put this fire out";
 	mes "with conventional means.^000000";
 	if (ice_necklace_q > 4) {
-		if ($ktullanux_summon < 4) {
+		if ($@ktullanux_summon < 4) {
 			if (countitem(7574) > 0) {
 				next;
 				select("Use Freezing Snow Powder.");
@@ -3611,8 +3509,8 @@ ice_dun03,126,126,3	script	Blazing Fire#ice1	802,{
 				mes "flickers before extinguising.^000000";
 				delitem 7574,1; //Freezing Snow Powder
 				hideonnpc "Blazing Fire#ice1";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
 			else if (countitem(7562) > 0) {
 				next;
@@ -3622,29 +3520,24 @@ ice_dun03,126,126,3	script	Blazing Fire#ice1	802,{
 				mes "extinguising.^000000";
 				delitem 7562,1; //Ice Scale
 				hideonnpc "Blazing Fire#ice1";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
 		}
 	}
 	close;
-
-OnInit:
-	set $ktullanux_summon,0;
-	end;
-
 }
 
 
-ice_dun03,172,126,0	script	Blazing Fire#ice2	802,{
+ice_dun03,172,126,0	script	Blazing Fire#ice2	4_NFWISP,{
 	mes "^3355FFThe flames in this fire";
 	mes "barrier crackle with magic";
 	mes "power. There's no way that";
 	mes "you can put this fire out";
 	mes "with conventional means.^000000";
 	if (ice_necklace_q > 4) {
-		if ($ktullanux_summon < 4) {
+		if ($@ktullanux_summon < 4) {
 			if (countitem(7574) > 0) {
 				next;
 				select("Use Freezing Snow Powder.");
@@ -3653,8 +3546,8 @@ ice_dun03,172,126,0	script	Blazing Fire#ice2	802,{
 				mes "flickers before extinguising.^000000";
 				delitem 7574,1; //Freezing Snow Powder
 				hideonnpc "Blazing Fire#ice2";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
 			else if (countitem(7562) > 0) {
 				next;
@@ -3664,28 +3557,23 @@ ice_dun03,172,126,0	script	Blazing Fire#ice2	802,{
 				mes "extinguising.^000000";
 				delitem 7562,1; //Ice Scale
 				hideonnpc "Blazing Fire#ice2";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
 		}
 	}
 	close;
-
-OnInit:
-	set $ktullanux_summon,0;
-	end;
-
 }
 
-ice_dun03,172,172,0	script	Blazing Fire#ice3	802,{
+ice_dun03,172,172,0	script	Blazing Fire#ice3	4_NFWISP,{
 	mes "^3355FFThe flames in this fire";
 	mes "barrier crackle with magic";
 	mes "power. There's no way that";
 	mes "you can put this fire out";
 	mes "with conventional means.^000000";
 	if (ice_necklace_q > 4) {
-		if ($ktullanux_summon < 4) {
+		if ($@ktullanux_summon < 4) {
 			if (countitem(7574) > 0) {
 				next;
 				select("Use Freezing Snow Powder.");
@@ -3694,8 +3582,8 @@ ice_dun03,172,172,0	script	Blazing Fire#ice3	802,{
 				mes "flickers before extinguising.^000000";
 				delitem 7574,1; //Freezing Snow Powder
 				hideonnpc "Blazing Fire#ice3";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
 			else if (countitem(7562) > 0) {
 				next;
@@ -3705,28 +3593,23 @@ ice_dun03,172,172,0	script	Blazing Fire#ice3	802,{
 				mes "extinguising.^000000";
 				delitem 7562,1; //Ice Scale
 				hideonnpc "Blazing Fire#ice3";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
 		}
 	}
 	close;
-
-OnInit:
-	set $ktullanux_summon,0;
-	end;
-
 }
 
-ice_dun03,127,172,0	script	Blazing Fire#ice4	802,{
+ice_dun03,127,172,0	script	Blazing Fire#ice4	4_NFWISP,{
 	mes "^3355FFThe flames in this fire";
 	mes "barrier crackle with magic";
 	mes "power. There's no way that";
 	mes "you can put this fire out";
 	mes "with conventional means.^000000";
 	if (ice_necklace_q > 4) {
-		if ($ktullanux_summon < 4) {
+		if ($@ktullanux_summon < 4) {
 			if (countitem(7574) > 0) {
 				next;
 				select("Use Freezing Snow Powder.");
@@ -3735,8 +3618,8 @@ ice_dun03,127,172,0	script	Blazing Fire#ice4	802,{
 				mes "flickers before extinguising.^000000";
 				delitem 7574,1; //Freezing Snow Powder
 				hideonnpc "Blazing Fire#ice4";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
 			else if (countitem(7562) > 0) {
 				next;
@@ -3746,18 +3629,13 @@ ice_dun03,127,172,0	script	Blazing Fire#ice4	802,{
 				mes "extinguising.^000000";
 				delitem 7562,1; //Ice Scale
 				hideonnpc "Blazing Fire#ice4";
-				set $ktullanux_summon,$ktullanux_summon+1;
-				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
+				set $@ktullanux_summon,$@ktullanux_summon+1;
+				if ($@ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
 		}
 	}
 	close;
-
-OnInit:
-	set $ktullanux_summon,0;
-	end;
-
 }
 
 ice_dun03,1,173,5	script	ice_boss#broad	-1,{
@@ -3797,7 +3675,6 @@ OnTimer21000:
 	stopnpctimer;
 	donpcevent "ice_boss#on::OnStart";
 	end;
-
 }
 
 ice_dun03,1,174,3	script	ice_boss#on	-1,{
@@ -3806,7 +3683,7 @@ OnStart:
 	end;
 
 OnStartTimer:
-	Initnpctimer;
+	initnpctimer;
 	end;
 
 OnStopTimer:
@@ -3822,7 +3699,7 @@ OnMyMobDead:
 
 OnTimer7200000:
 	stopnpctimer;
-	set $ktullanux_summon,0;
+	set $@ktullanux_summon,0;
 	hideoffnpc "Blazing Fire#ice1";
 	hideoffnpc "Blazing Fire#ice2";
 	hideoffnpc "Blazing Fire#ice3";
@@ -3837,10 +3714,10 @@ OnStart:
 	enablenpc "#ice_4f_2";
 	enablenpc "#ice_4f_3";
 	enablenpc "#ice_4f_4";
-	donpcevent "#ice_4f_1::OnEnable";
-	donpcevent "#ice_4f_2::OnEnable";
-	donpcevent "#ice_4f_3::OnEnable";
-	donpcevent "#ice_4f_4::OnEnable";
+	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_1";
+	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_2";
+	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_3";
+	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_4";
 	end;
 
 OnTimer60000:
@@ -3852,7 +3729,7 @@ OnTimer60000:
 	end;
 }
 
-ice_dun03,150,137,0	script	#ice_4f_1	45,2,2,{
+ice_dun03,150,137,0	script	#ice_4f_1	WARPNPC,2,2,{
 OnTouch:
 	warp "ice_dun04",33,144;
 	end;
@@ -3860,14 +3737,9 @@ OnTouch:
 OnInit:
 	disablenpc "#ice_4f_1";
 	end;
-
-OnEnable:
-	misceffect EF_MAPPILLAR2;
-	end;
-
 }
 
-ice_dun03,138,148,0	script	#ice_4f_2	45,2,2,{
+ice_dun03,138,148,0	script	#ice_4f_2	WARPNPC,2,2,{
 OnTouch:
 	warp "ice_dun04",33,144;
 	end;
@@ -3875,14 +3747,9 @@ OnTouch:
 OnInit:
 	disablenpc "#ice_4f_2";
 	end;
-
-OnEnable:
-	misceffect EF_MAPPILLAR2;
-	end;
-
 }
 
-ice_dun03,161,148,0	script	#ice_4f_3	45,2,2,{
+ice_dun03,161,148,0	script	#ice_4f_3	WARPNPC,2,2,{
 OnTouch:
 	warp "ice_dun04",33,144;
 	end;
@@ -3890,14 +3757,9 @@ OnTouch:
 OnInit:
 	disablenpc "#ice_4f_3";
 	end;
-
-OnEnable:
-	misceffect EF_MAPPILLAR2;
-	end;
-
 }
 
-ice_dun03,151,162,0	script	#ice_4f_4	45,2,2,{
+ice_dun03,151,162,0	script	#ice_4f_4	WARPNPC,2,2,{
 OnTouch:
 	warp "ice_dun04",33,144;
 	end;
@@ -3905,20 +3767,11 @@ OnTouch:
 OnInit:
 	disablenpc "#ice_4f_4";
 	end;
-
-OnEnable:
-	misceffect EF_MAPPILLAR2;
-	end;
-
 }
 
-// End of Ice Necklace/Summon Ktullanux Quest
-//============================================================ 
-
-
-// Donation Lottery Quest/High Priest Quest
-//============================================================ 
-ra_temple,119,180,0	script	Temple Entrance#ra_tem	45,1,1,{
+// Donation Lottery Quest/High Priest Quest :: rachel_oz & rachel_ma1
+//============================================================
+ra_temple,119,180,0	script	Temple Entrance#ra_tem	WARPNPC,1,1,{
 OnTouch:
 	if ($rachel_donate >= 10000) {
 		if (MISC_QUEST & 8192) { warp "ra_temin",169,23; end; }
@@ -3938,7 +3791,7 @@ OnTouch:
 	end;
 }
 
-ra_temple,116,174,3	script	Nemma#ra_temple	920,{
+ra_temple,116,174,3	script	Nemma#ra_temple	4_F_TRAINEE,{
 	cutin "ra_nemma02",2;
 	if ($rachel_donate < 10000) {
 		if (ra_have_donated == 0) {
@@ -3975,7 +3828,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "a contribution. Regardless,";
 			mes "we invite you to celebrate the";
 			mes "grace of the goddess with us.";
-			Emotion e_ho;
+			emotion e_ho;
 			next;
 			mes "[Priestess Nemma]";
 			mes "There's one High Priest that";
@@ -4019,21 +3872,16 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "of 50,000 zeny, and we can only";
 			mes "accept up to 150,000 zeny at once. It's a bit complicated, I know...";
 			next;
-
 			switch(select("50,000z - 1 Lottery Ticket:100,000z - 2 Lottery Ticket:150,000z - 3 Lottery Ticket:Cancel")) {
-
 			case 1:
 				callsub S_Donate,1,"50,000";
 				break;
-
 			case 2:
 				callsub S_Donate,2,"100,000";
 				break;
-
 			case 3:
 				callsub S_Donate,3,"150,000";
 				break;
-
 			case 4:
 				cutin "ra_nemma02",2;
 				mes "[Priestess Nemma]";
@@ -4043,13 +3891,9 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "zeny. Even so, Freya is always";
 				mes "protecting you, wherever you go~";
 				break;
-
 			}
-
 			goto L_End;
-
 		}
-
 		else {
 			cutin "ra_nemma03",2;
 			mes "[Priestess Nemma]";
@@ -4059,9 +3903,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "while ago. So what brings you";
 			mes "to the temple today, hmm?";
 			next;
-
 			switch(select("I've come to donate again.:Just sight-seeing.:I came to attend the service.:I just wanted to see you again.")) {
-
 			case 1:
 				mes "[Priestess Nemma]";
 				mes "You've come to make another";
@@ -4071,21 +3913,16 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "accept donations in increments of";
 				mes "50,000 zeny up to 150,000 zeny.";
 				next;
-
 				switch(select("50,000z - 1 Lottery Ticket:100,000z - 2 Lottery Ticket:150,000z - 3 Lottery Ticket:Cancel")) {
-
 				case 1:
 					callsub S_Donate,1,"50,000";
 					break;
-
 				case 2:
 					callsub S_Donate,2,"100,000";
 					break;
-
 				case 3:
 					callsub S_Donate,3,"150,000";
 					break;
-
 				case 4:
 					cutin "ra_nemma02",2;
 					mes "[Priestess Nemma]";
@@ -4095,10 +3932,8 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 					mes "zeny. Even so, Freya is always";
 					mes "protecting you, wherever you go~";
 					break;
-
 				}
 				goto L_End;
-
 			case 2:
 				mes "[Priestess Nemma]";
 				mes "Oh! If you'd like some";
@@ -4114,7 +3949,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "Well, anyway, she'll help";
 				mes "you out. See you later!";
 				break;
-
 			case 3:
 				mes "[Priestess Nemma]";
 				mes "You're here for the";
@@ -4123,20 +3957,14 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "of calm that you can only";
 				mes "get from goddess Freya~";
 				break;
-
 			case 4:
 				mes "[Priestess Nemma]";
 				mes "Oh, how sweet of you~";
 				break;
-
 			}
-
 			goto L_End;
-
 		}
-
 	}
-
 	else {
 		if (MISC_QUEST & 8192) {
 			cutin "ra_nemma01",2;
@@ -4144,7 +3972,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "Welcome to our temple!";
 			goto L_End;
 		}
-
 		if (ra_tem_q < 1) {
 			mes "[Priestess Nemma]";
 			mes "Hello, there!";
@@ -4178,7 +4005,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			set ra_tem_q,1;
 			goto L_End;
 		}
-
 		else if ((ra_tem_q >= 1) && (ra_tem_q < 10)) {
 			mes "[Priestess Nemma]";
 			mes "If the gate's locked, then";
@@ -4194,7 +4020,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "Ooh, Panno, help me!";
 			goto L_End;
 		}
-
 		else if (ra_tem_q == 10) {
 			cutin "ra_nemma04",2;
 			mes "[Priestess Nemma]";
@@ -4221,7 +4046,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "Oooh, what should I do?!";
 			goto L_End;
 		}
-
 		else if (ra_tem_q == 11) {
 			emotion e_ho;
 			cutin "ra_nemma03",2;
@@ -4234,7 +4058,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "Lottery Tickets inside, okay?";
 			goto L_End;
 		}
-
 		else if (ra_tem_q == 12) {
 			mes "[Priestess Nemma]";
 			mes "Mmm... I know what";
@@ -4262,7 +4085,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			set ra_tem_q,13;
 			goto L_End;
 		}
-
 		else if (ra_tem_q == 13) {
 			mes "[Priestess Nemma]";
 			mes "Hey, did you bring me";
@@ -4275,11 +4097,8 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				next;
 				if (countitem(12018) >= 20) {
 					cutin "ra_nemma04",2;
-					delitem 12018,20; //FireCracker";
-					if(checkre(0))
-						getexp 20000,0;
-					else
-						getexp 200000,0;
+					delitem 12018,20; //Fire_Cracker
+					getexp (checkre(3))?50000:200000,0;
 					set ra_tem_q,14;
 					mes "[Priestess Nemma]";
 					mes "Yay!";
@@ -4310,7 +4129,6 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "but still. How much fun are";
 				mes "fireworks if there isn't a lot?";
 			}
-
 			else {
 				cutin "ra_nemma01",2;
 				mes "[Priestess Nemma]";
@@ -4320,16 +4138,13 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "back with, anyway~";
 			}
 			goto L_End;
-
 		}
-
 		else {
 			cutin "ra_nemma01",2;
 			mes "[Priestess Nemma]";
 			mes "Welcome to our temple!";
 		}
 		goto L_End;
-
 	}
 
 L_End:
@@ -4357,7 +4172,7 @@ S_Donate:
 		mes "generous and rewards the patient!";
 		return;
 	}
-	if (zeny >= getarg(0)*50000) {
+	if (Zeny >= getarg(0)*50000) {
 		if (!checkweight(7570,getarg(0))) {
 			cutin "ra_nemma02",2;
 			mes "[Priestess Nemma]";
@@ -4379,7 +4194,7 @@ S_Donate:
 		}
 		set $rachel_donate,$rachel_donate+getarg(0);
 		getitem 7570,getarg(0); //Temple_Lottery_Ticket
-		set zeny,zeny-getarg(0)*50000;
+		Zeny -= getarg(0)*50000;
 		set ra_have_donated,1;
 		if ($rachel_donate > 9999) {
 			cutin "ra_nemma03",2;
@@ -4422,10 +4237,9 @@ S_Donate:
 		mes "Well, maybe another time, yes?";
 		return;
 	}
-
 }
 
-rachel,243,37,3	script	Kid#Candy Addict	921,{
+rachel,243,37,3	script	Kid#Candy Addict	4_M_CHILD1,{
 	if ((ra_tem_q < 2) || (ra_tem_q > 9) || (MISC_QUEST & 8192)) {
 		mes "[Kid]";
 		mes "Hey! What's that";
@@ -4459,22 +4273,17 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 		mes "[Kid]";
 		mes "Oh hey, do";
 		mes "you like candy?";
-
 		if (ra_tem_q == 1) {
 			next;
 			switch(select("Not at all.:Yeah.:Sure, I love the stuff~:Not much.")) {
-
 			case 1:
 				mes "[Kid]";
 				mes "Hmpf! Okay.";
 				close;
-
 			case 2:
 				break;
-
 			case 3:
 				break;
-			
 			case 4:
 				mes "[Kid]";
 				mes "Oh. It's 'cause you're";
@@ -4486,10 +4295,7 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 				mes "Tell me, tell";
 				mes "me, how come?";
 				close;
-
 			}
-
-
 			if (rand(1,2) != 2) {
 				mes "[Kid]";
 				mes "Oh yeah...?";
@@ -4506,7 +4312,6 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 				mes "I tricked you!";
 				mes "You big big dummy!";
 			}
-
 			else {
 				mes "[Kid]";
 				mes "Oh, you do?";
@@ -4622,14 +4427,11 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 				mes "cool secret, so promise";
 				mes "that you won't be mad anymore.";
 				next;
-
 				switch(select("No, thanks.:What's that?")) {
-
 				case 1:
 					mes "[Kid]";
 					mes "Please~";
 					break;
-
 				case 2:
 					mes "[Kid]";
 					mes "Did you know that";
@@ -4654,16 +4456,11 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 					mes "be madder at you!";
 					set ra_tem_q,2;
 					break;
-
 				}
-
 			}
-
 		}
 		close;
-
 	}
-
 	else if (ra_tem_q == 2) {
 		mes "[Kid]";
 		mes "You're leaving?";
@@ -4688,7 +4485,6 @@ rachel,243,37,3	script	Kid#Candy Addict	921,{
 		mes "huh? Gosh! Some people!";
 		close;
 	}
-
 }
 
 ra_temple,67,209,0	script	zawa00	-1,3,3,{
@@ -4715,7 +4511,6 @@ OnTouch:
 		mes "you don't get caught?^000000";
 		close;
 	}
-
 	else if ((ra_tem_q >= 3) && (ra_tem_q < 10)) {
 		mes "^3355FFWould you like to";
 		mes "enter the temple";
@@ -4731,12 +4526,11 @@ OnTouch:
 		mes "that you can enter.^000000";
 		close;
 	}
-
 	end;
 }
 
-que_rachel,63,82,0	script	Window#ra_temple	111,{
-	mes "^3355FFThis window it open^000000";
+que_rachel,63,82,0	script	Window#ra_temple	HIDDEN_NPC,{
+	mes "^3355FFThis window is open.^000000";
 	next;
 	if(select("Stay:Exit Through Window") == 2) {
 		close2;
@@ -4754,7 +4548,6 @@ OnTouch:
 		set ra_tem_q,3;
 		close;
 	}
-
 	end;
 }
 
@@ -4769,9 +4562,7 @@ OnTouch:
 		set ra_tem_q,4;
 		close;
 	}
-
 	end;
-
 }
 
 que_rachel,94,139,0	script	zawa03	-1,10,10,{
@@ -4782,9 +4573,7 @@ OnTouch:
 		set ra_tem_q,5;
 		close;
 	}
-
 	end;
-
 }
 
 que_rachel,132,70,0	script	zawa04	-1,10,10,{
@@ -4801,9 +4590,7 @@ OnTouch:
 		set ra_tem_q,6;
 		close;
 	}
-
 	end;
-
 }
 
 que_rachel,28,315,0	script	Bloody Spot	-1,5,5,{
@@ -4827,16 +4614,13 @@ OnTouch:
 			set ra_tem_q,7;
 			close;
 		}
-
 		else {
 			mes "^3355FFYou decide that your";
 			mes "time would be better spent";
 			mes "investigating something else.^000000";
 			close;
 		}
-
 	}
-
 	else if (ra_tem_q == 7) {
 		mes "^3355FFThis dark spot on the";
 		mes "ground is really creepy,";
@@ -4860,16 +4644,13 @@ OnTouch:
 			set ra_tem_q,8;
 			close;
 		}
-
 		else {
 			mes "^3355FFYou decide that your";
 			mes "time would be better spent";
 			mes "investigating something else.^000000";
 			close;
 		}
-
 	}
-
 	else if (ra_tem_q == 8) {
 		mes "^3355FFThis blood stain on the";
 		mes "ground is a pretty bad";
@@ -4879,7 +4660,6 @@ OnTouch:
 		mes "bleeding does the same to you.^000000";
 		close;
 	}
-
 	end;
 }
 
@@ -4909,7 +4689,6 @@ OnTouch:
 		set ra_tem_q,9;
 		close;
 	}
-
 	end;
 }
 
@@ -4918,12 +4697,10 @@ que_rachel,180,37,0	duplicate(nemma01)	nemma03	-1,5,5
 que_rachel,165,37,0	duplicate(nemma01)	nemma04	-1,5,5
 que_rachel,160,37,0	duplicate(nemma01)	nemma05	-1,5,5
 
-que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
+que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	WARPNPC,2,2,{
 	mes "^3355FFThe gate is closed.^000000";
 	next;
-
 	switch(select("Push Gate:Examine Gate:Kick Gate:Smash Gate with Weapon")) {
-
 	case 1:
 		mes "^3355FFYou push the gate";
 		mes "with all of your might...";
@@ -4935,7 +4712,6 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 		}
 		mes "But it won't even budge.^000000";
 		break;
-
 	case 2:
 		mes "^3355FFThere's some strange";
 		mes "machinery installed on";
@@ -4944,7 +4720,6 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 		mes "a card or permit. The lights";
 		mes "are on, so it must be working.^000000";
 		break;
-
 	case 3:
 		mes "^3355FFYou angrily kick the gate...";
 		if (ra_tem_q == 9) {
@@ -4958,7 +4733,6 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 		mes "gate refuses to open for you.";
 		mes "Oh, and your foot hurts too.^000000.";
 		break;
-
 	case 4:
 		mes "^3355FFWait! That's not";
 		mes "a good idea. You can't";
@@ -4969,10 +4743,9 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 
 	}
 	close;
-
 }
 
-ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
+ra_temin,277,159,3	script	High Priest Zhed#rachel	4_M_RACHOLD1,{
 	if ((ra_tem_q > 14) || (MISC_QUEST&8192)) set lost_boy,14;
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second!";
@@ -5064,10 +4837,11 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "you in your travels. Peace";
 		mes "be with you, "+strcharinfo(0)+".";
 		close2;
-		cutin "ra_gman",255;
+		cutin "",255;
 		set lost_boy,13;
+		completequest 8099;
 		specialeffect2 EF_ABSORBSPIRITS;
-		getexp 90000,0;
+		getexp (checkre(3))?90000:900000,0;
 		end;
 	}
 	else if ((lost_boy == 13) && (ra_tem_q < 14)) {
@@ -5107,7 +4881,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 			mes "someone that I can really";
 			mes "rely on to do this for me...";
 			close2;
-			cutin "ra_gman",255;
+			cutin "",255;
 			end;
 		}
 		cutin "ra_gman",2;
@@ -5229,8 +5003,12 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		next;
 		mes "^3355FFYou received a High";
 		mes "Priest's recommendation.^000000";
+		close2;
+		cutin "",255;
 		set ra_tem_q,15;
 		set lost_boy,14;
+		setquest 8100;
+		end;
 	}
 	else if ((ra_tem_q == 15) || (ra_tem_q == 16)) {
 		mes "[High Priest Zhed]";
@@ -5323,6 +5101,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "discussion. Why don't you";
 		mes "wait and relax in the next room";
 		mes "over there in the meantime?";
+		changequest 8101,8102;
 		close2;
 		cutin "",255;
 		warp "ra_temin",297,156;
@@ -5380,7 +5159,11 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "the Holy Ground? Regardless...";
 		mes "If you want to go there, then";
 		mes "just go there. Who'll stop you?^000000";
+		close2;
+		cutin "",255;
 		set ra_tem_q,20;
+		changequest 8103,8104;
+		end;
 	}
 	else if ((ra_tem_q >= 20) && (ra_tem_q < 22)) {
 		cutin "ra_gman2",2;
@@ -5481,8 +5264,9 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		set MISC_QUEST,MISC_QUEST | 8192;
 		set ra_tem_q,0;
 		cutin "",255;
+		completequest 8105;
 		specialeffect2 EF_ABSORBSPIRITS;
-		if(checkre(0))
+		if (checkre(3))
 			getexp 90000,60000;
 		else
 			getexp 900000,600000;
@@ -5553,6 +5337,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "I'm sure that she can tell you";
 					mes "more about what happened.";
 					set aru_monas,12;
+					changequest 17007,17008;
 					next;
 					mes "[High Priest Zhed]";
 					mes "If you do decide to";
@@ -5578,7 +5363,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "me like that! Saying";
 				mes "it like that is kind of";
 				mes "overdoing it, isn't it?";
-				emotion 54,1;
+				emotion e_sigh,1;
 				next;
 				mes "[High Priest Zhed]";
 				mes "Not at all. In fact, I'm";
@@ -5588,7 +5373,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "by the Valkyries. Now, how";
 				mes "may I help you, my friend?";
 				next;
-				select("Mysterious Building in the Volcano:");
+				select("Mysterious Building in the Volcano");
 				mes "["+strcharinfo(0)+"]";
 				mes "Actually, I was wondering";
 				mes "if you knew of anything about";
@@ -5791,10 +5576,10 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "of a really good way";
 				mes "for you to infiltrate";
 				mes "that place. Hmmmm...";
-				setquest 2114;
 				set aru_vol,1;
+				setquest 2114;
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if ((aru_vol > 0) && (aru_vol < 5)) {
@@ -5883,7 +5668,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					break;
 				}
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if (aru_vol == 5) {
@@ -5964,8 +5749,8 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "best chance of entering the Thor";
 					mes "Volcano camp without suspicion.";
 					delitem 7342,1; //File01
-					changequest 2115,2116;
 					set aru_vol,6;
+					changequest 2115,2116;
 				}
 				else {
 					mes "["+strcharinfo(0)+"]";
@@ -5984,7 +5769,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "best chance of entering the Thor";
 				mes "Volcano camp without suspicion.";
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if ((aru_vol > 6) && (aru_vol < 26)) {
@@ -5997,7 +5782,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "best chance of entering the Thor";
 				mes "Volcano camp without suspicion.";
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if (aru_vol == 26) {
@@ -6039,14 +5824,11 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "I will be contacting you again.";
 				mes "Together, we can protect";
 				mes "peace between our nations.";
-				completequest 60213;
 				set aru_vol,27;
-				if(checkre(0))
-					getexp 20000,0;
-				else
-					getexp 200000,0;
+				completequest 60213;
+				getexp (checkre(3))?20000:200000,0;
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if (aru_vol > 26) {
@@ -6118,7 +5900,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "before the other High";
 					mes "Priests ruin our nation.";
 					next;
-					Emotion e_omg,1;
+					emotion e_omg,1;
 					mes "["+strcharinfo(0)+"]";
 					mes "Y-you're not thinking";
 					mes "of overthrowing the";
@@ -6126,7 +5908,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "that a bit extreme?";
 					next;
 					cutin "ra_gman2",2;
-					Emotion e_swt;
+					emotion e_swt;
 					mes "[High Priest Zhed]";
 					mes "What? No, no!";
 					mes "Don't jump to conclusions";
@@ -6245,7 +6027,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "I already have someone in";
 					mes "mind that might help us.";
 					next;
-					Emotion 52,1;
+					emotion e_flash,1;
 					mes "["+strcharinfo(0)+"]";
 					mes "That sounds good.";
 					mes "Who is he?";
@@ -6258,7 +6040,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "may even think I deserve";
 					mes "to be excommunicated...";
 					next;
-					Emotion e_no1,1;
+					emotion e_no1,1;
 					mes "["+strcharinfo(0)+"]";
 					mes "Come on, it wouldn't";
 					mes "hurt to try! Besides,";
@@ -6484,7 +6266,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "Your place in Valhalla is";
 					mes "already assured, I'm sure.";
 					set aru_em,24;
-					getexp 150000,0;
+					getexp (checkre(3))?150000:1500000,0;
 				}
 				else {
 					mes "[High Priest Zhed]";
@@ -6520,7 +6302,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 	end;
 }
 
-ra_temin,170,46,3	script	Panno#rachel	920,{
+ra_temin,170,46,3	script	Panno#rachel	4_F_TRAINEE,{
 	cutin "ra_fano03",2;
 	if (ra_tem_q >= 12 || MISC_QUEST & 8192) {
 		cutin "ra_fano03",2;
@@ -6952,7 +6734,7 @@ L_End:
 	end;
 }
 
-ra_temin,134,128,3	script	Pope's Office Guard#rac::raofficeguard	926,{
+ra_temin,134,128,3	script	Pope's Office Guard#rac::raofficeguard	4_M_MASK1,{
 	if ((ra_tem_q == 15) && (countitem(7561) > 39)) {
 		mes "[Pope's Office Guard]";
 		mes "Hm? What's that you have";
@@ -7003,9 +6785,9 @@ ra_temin,134,128,3	script	Pope's Office Guard#rac::raofficeguard	926,{
 	}
 }
 
-ra_temin,134,134,3	duplicate(raofficeguard)	Pope's Office Guard#2ra	926
+ra_temin,134,134,3	duplicate(raofficeguard)	Pope's Office Guard#2ra	4_M_MASK1
 
-ra_temin,134,131,0	script	gyoin1#rachel	45,1,1,{
+ra_temin,134,131,0	script	gyoin1#rachel	WARPNPC,1,1,{
 OnTouch:
 	if (ra_tem_q == 16)
 		warp "ra_temin",276,239;
@@ -7028,7 +6810,7 @@ OnTouch:
 	end;
 }
 
-ra_temin,275,226,0	script	#rachel33	45,1,1,{
+ra_temin,275,226,0	script	#rachel33	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (aru_em == 21)
@@ -7038,37 +6820,37 @@ OnTouch:
 	end;
 }
 
-ra_temsky,95,99,6	script	Priest#1rachel	935,{
+ra_temsky,95,99,6	script	Priest#1rachel	4_M_TRAINEE,{
 	mes "[Priest]";
 	mes "May Freya be with you.";
 	close;
 }
 
-ra_temsky,93,97,6	script	Male Follower#1rachel::ramale	926,{
+ra_temsky,93,97,6	script	Male Follower#1rachel::ramale	4_M_MASK1,{
 	mes "[Male Follower]";
 	mes "May Freya be with you.";
 	close;
 }
 
-ra_temsky,90,95,6	duplicate(ramale)	Male Follower#2rachel	926
-ra_temsky,98,59,6	duplicate(ramale)	Male Follower#3rachel	926
+ra_temsky,90,95,6	duplicate(ramale)	Male Follower#2rachel	4_M_MASK1
+ra_temsky,98,59,6	duplicate(ramale)	Male Follower#3rachel	4_M_MASK1
 
-ra_temsky,104,99,4	script	Priestess#1rachel	920,{
+ra_temsky,104,99,4	script	Priestess#1rachel	4_F_TRAINEE,{
 	mes "[Priestess]";
 	mes "May Freya be with you.";
 	close;
 }
 
-ra_temsky,106,97,4	script	Female Follower#1rachel::rafemale	916,{
+ra_temsky,106,97,4	script	Female Follower#1rachel::rafemale	4_F_MASK1,{
 	mes "[Female Follower]";
 	mes "May Freya be with you.";
 	close;
 }
 
-ra_temsky,108,95,4	duplicate(rafemale)	Female Follower#2rachel	916
-ra_temsky,101,59,4	duplicate(rafemale)	Female Follower#3rachel	916
+ra_temsky,108,95,4	duplicate(rafemale)	Female Follower#2rachel	4_F_MASK1
+ra_temsky,101,59,4	duplicate(rafemale)	Female Follower#3rachel	4_F_MASK1
 
-ra_temsky,99,99,5	script	Pope#rachel	936,{
+ra_temsky,99,99,5	script	Pope#rachel	4_F_ARUNA_POP,{
 	if (ra_tem_q == 16) {
 		cutin "ra_bishop",2;
 		mes "^3355FFTh-this little";
@@ -7171,9 +6953,10 @@ ra_temsky,99,99,5	script	Pope#rachel	936,{
 		mes "learning. Now I have to";
 		mes "go officiate services, so...";
 		mes "This is goodbye for now...";
-		set ra_tem_q,17;
 		close2;
 		cutin "",255;
+		set ra_tem_q,17;
+		changequest 8100,8101;
 		end;
 	}
 	else {
@@ -7260,7 +7043,7 @@ ra_temsky,99,99,5	script	Pope#rachel	936,{
 	end;
 }
 
-ra_temin,294,149,0	script	High Priestess Niren#ra	915,{
+ra_temin,294,149,0	script	High Priestess Niren#ra	4_F_MADAME,{
 	end;
 
 OnInit:
@@ -7275,7 +7058,6 @@ OnTimer120000:
 	stopnpctimer;
 	hideonnpc "High Priestess Niren#ra";
 	end;
-
 }
 
 ra_temin,293,144,0	script	out1#rachel	-1,3,3,{
@@ -7297,7 +7079,6 @@ OnTouch:
 		end;
 	}
 	end;
-
 }
 
 ra_temin,288,151,0	script	hidden1#rachel	-1,1,6,{
@@ -7456,11 +7237,10 @@ OnTouch:
 		mes "For now, you may as well";
 		mes "talk to High Priest Zhed.^000000";
 		set ra_tem_q,19;
+		changequest 8102,8103;
 		close;
 	}
-
 	end;
-
 }
 
 ra_temin,272,143,0	script	key1#rachel	-1,3,3,{
@@ -7485,11 +7265,10 @@ OnTouch:
 		set ra_tem_q,21;
 		close;
 	}
-
 	end;
 }
 
-ra_temin,28,319,0	script	saint1#rachel	45,4,2,{
+ra_temin,28,319,0	script	saint1#rachel	WARPNPC,4,2,{
 OnTouch:
 	if ((ra_tem_q > 21) || (MISC_QUEST & 8192)) { warp "ra_san01",140,135; end; }
 
@@ -7511,10 +7290,8 @@ OnTouch:
 		}
 		close;
 	}
-
 	mes "^3355FFThe door is locked.^000000";
 	close;
-	
 }
 
 que_san04,119,115,0	script	imir1#rachel	-1,2,2,{
@@ -7601,21 +7378,23 @@ OnTouch:
 		mes "with Bekento, I'm letting";
 		mes "you off easy. Remember that.";
 		next;
-		sc_start SC_Blind,600000,0;
+		sc_start SC_BLIND,600000,0;
 		mes "^3355FFNiren began to chant";
 		mes "in a low voice, and your";
 		mes "eyelids grow heavier as you";
 		mes "grow drowsier and sleepier...^000000";
-		set ra_tem_q,22;
 		close2;
+		cutin "",255;
 		hideonnpc "High Priestess Niren#r2";
+		set ra_tem_q,22;
+		changequest 8104,8105;
 		warp "rachel",163,152;
 		end;
 	}
 	end;
 }
 
-que_san04,122,200,4	script	High Priestess Niren#r2	915,{
+que_san04,122,200,4	script	High Priestess Niren#r2	4_F_MADAME,{
 	end;
 
 OnInit:
@@ -7641,7 +7420,7 @@ OnTouch:
 		mes "back to Rachel Town. How long";
 		mes "have you been unconscious?^000000";
 		next;
-		sc_end SC_Blind;
+		sc_end SC_BLIND;
 		mes "^3355FFIt would be best to";
 		mes "ask High Priest Zhed";
 		mes "about what had happened.^000000";
@@ -7651,7 +7430,7 @@ OnTouch:
 	end;
 }
 
-rachel,142,167,5	script	Seeking Follower#rachel	916,6,6,{
+rachel,142,167,5	script	Seeking Follower#rachel	4_F_MASK1,6,6,{
 	if ((lost_boy == 13) && (ra_tem_q == 20)) {
 		L_Mes:
 		mes "[Arunafeltz Follower]";
@@ -7686,5 +7465,34 @@ OnTouch:
 	end;
 }
 
-// End of Donation Lottery/High Priest quest
+//============================================================
+// Old changelog
+//============================================================
+//= 1.0 First version, needs testing. [L0ne_W0lf]
+//= 1.1 Some slight optimization. [L0ne_W0lf]
+//= 1.2 Fixed Man Stuck in Ice only giving 1 Freezing Snow Powder. [L0ne_W0lf]
+//= 1.3 Added the ability to redeem lottery tickets before donation max is met. [L0ne_W0lf]
+//= 1.4 Removed an erroneous "case". Thanks, Jet. [L0ne_W0lf]
+//= 1.5 Fixed a bug in Bruspetti quest. [SinSloth]
+//= 1.5b Fixed some typos in various quests. [SinSloth]
+//= 1.6 Fixed a couple bugs with the Pope's Office Guards... [L0ne_W0lf]
+//= 1.7 Fixed Maheo, he will revert to his frozen state when clicked. [L0ne_W0lf]
+//=     Replaced  instances of "+name+", with "+strcharinfo(0)".
+//= 1.8 Various fixes: Hamion will now delete items used for Wind Hammer. [L0ne_W0lf]
+//=     Fixed EXP reward in Ice Necklace quest, fixed a typo in an NPC header.
+//=     Another minor fix to Hamion. "< 1" -> "< 2". Added a missing close to
+//=     the ontouch "key". Thanks to Gepard for pointing them out.
+//= 1.9 Fixed a misorder with variable checkings. [SinSloth]
+//= 2.0 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 2.2 Maheo NPC now uses "setnpcdisplay" instead of two NPCs. [L0ne_W0lf]
+//= 2.2a Corrected a Typo error ";;". [Samuray22]
+//= 2.3 Added Zhed's portion of Thor Volcano Base Quest. (euRO) [L0ne_W0lf]
+//= 2.4 Updated Zhed's Thor Vol. Base addition dialog to iRO's. [L0ne_W0lf]
+//= 2.4a Further updates to Zhed's Veins addition. [L0ne_W0lf]
+//= 2.5 Added Nameless Island quest addition. [L0ne_W0lf]
+//= 2.6 Uncommented ontouchNPC label for Man Stuck in Ice. [L0ne_W0lf]
+//= 2.7 Corrected overlaping warp coordinates. [L0ne_W0lf]
+//= 2.8 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 2.9 Replaced effect numerics with constants. [Samuray22]
 //============================================================
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index 11a5f1acb..e160e84a8 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Quest NPCs related to Umbala
-//===== By: ================================================== 
+//===== By: ==================================================
 //= sabernet09 & rAthena Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2a
-//===== Compatible With: ===================================== 
-//= rAthena 7.15 +
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Umbalian Language Quest, Umbala Skeletal Gate Quest,
 //= Umbala Event, Create Essence/Dismantle Stone
 //	Phase 1. Learning the Language
@@ -23,7 +21,7 @@
 //= Umbala Domestic Dispute?
 //= - This quest is only avaliable if you have not done language quest.
 //= - Variables in use: um_wind, MISC_QUEST (Bit 32768)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= fixed by x[tsk], Lupus, PoW
 //= Quest completion is now registered
 //= 1.1 fixed Poporing Egg ID -> Poring Egg, fixed condition
@@ -32,16 +30,16 @@
 //= 1.7a Removed all custom quests to custom folder [Lupus]
 //= 1.8 Added official chance of failure to Create Essence/Dismantle Stone [Lupus]
 //= 1.9 Added functionality to allow players to dismantle more
-//= than a stone at once, up to 10. [SinSloth]
+//=     than a stone at once, up to 10. [SinSloth]
 //= 2.0 Updated hack check and added a weight check to dismantling. [SinSloth]
 //= 2.1 Rescripted to Aegis 10.3 standards. Added strange quest. [L0ne_W0lf]
 //= 2.2 Readded the ability to dismantle multiple stones at once. [L0ne_W0lf]
 //= 2.2a Fixed weight check from previous update. [L0ne_w0lf]
-//============================================================ 
+//============================================================
 
-// Umbalian Language Quest
+// Umbalian Language Quest :: um_trans
 //============================================================
-um_in,39,122,5	script	Utan Chief	784,{
+um_in,39,122,5	script	Utan Chief	4_M_UMCHIEF,{
 	if (event_umbala == 0) {
 		mes "[Karkatan]";
 		mes "Huh huh, a Rune-Midgardian.";
@@ -362,9 +360,9 @@ um_in,39,122,5	script	Utan Chief	784,{
 	}
 }
 
-// Create Essence/Dismantle Stone Quest
+// Create Essence/Dismantle Stone Quest :: um_npc
 //============================================================
-um_in,44,71,2	script	Utan Shaman	782,{
+um_in,44,71,2	script	Utan Shaman	4_F_UMOLDWOMAN,{
 	if (checkweight(908,600) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -515,22 +513,22 @@ um_in,44,71,2	script	Utan Shaman	782,{
 		switch (select("Earth:Water:Fire:Wind")) {
 		case 1:
 			set .@consume,947; //Horn
-			set .@amount,15; 
+			set .@amount,15;
 			set .@success,993; //Yellow_Live
 			break;
 		case 2:
 			set .@consume,946; //Snail's_Shell
-			set .@amount,20; 
+			set .@amount,20;
 			set .@success,991; //Crystal_Blue
 			break;
 		case 3:
 			set .@consume,904; //Scorpion's_Tail
-			set .@amount,20; 
+			set .@amount,20;
 			set .@success,990; //Boody_Red
 			break;
 		case 4:
 			set .@consume,1013; //Colorful_Shell
-			set .@amount,25; 
+			set .@amount,25;
 			set .@success,992; //Wind_Of_Verdure
 			break;
 		}
@@ -772,7 +770,7 @@ um_in,44,71,2	script	Utan Shaman	782,{
 				case 996:
 					getitem 992,.@shaman_max; //Wind_Of_Verdure
 					break;
-				case 997: 
+				case 997:
 					getitem 993,.@shaman_max; //Yellow_Live
 				}
 				delitem .@divide,.@input;
@@ -794,7 +792,7 @@ um_in,44,71,2	script	Utan Shaman	782,{
 					mes "wind stones? Then I will need";
 					mes "you to bring "+input_want+" pure wind stone.";
 					break;
-				case 997: 
+				case 997:
 					mes "earth stones? Then I'll need";
 					mes "you to bring "+.@input+" pure earth stone.";
 					break;
@@ -823,7 +821,7 @@ um_in,44,71,2	script	Utan Shaman	782,{
 	}
 }
 
-umbala,221,193,1	script	#Skulldoor	111,{
+umbala,221,193,1	script	#Skulldoor	HIDDEN_NPC,{
 	if (event_umbala >= 7) {
 		warp "um_in",32,71;
 		end;
@@ -979,9 +977,9 @@ umbala,221,193,1	script	#Skulldoor	111,{
 	}
 }
 
-// Umbala Domestic Dispute Quest
-//============================================================ 
-um_in,139,48,5	script	Phrenetan	783,{
+// Umbala Domestic Dispute Quest :: um_npc_ryu
+//============================================================
+um_in,139,48,5	script	Phrenetan	4_F_UMWOMAN,{
 	if (event_umbala >= 3) {
 		mes "[Phrenetan]";
 		mes "I am so sick and tired of";
@@ -1032,7 +1030,7 @@ um_in,139,48,5	script	Phrenetan	783,{
 	end;
 }
 
-um_in,144,45,5	script	Umpokoriohtan	789,{
+um_in,144,45,5	script	Umpokoriohtan	4_M_UMSOLDIER,{
 	if (event_umbala >= 3) {
 		if(rand(1,3) == 2) {
 			mes "[Umpokoriohtan]";
@@ -1113,7 +1111,7 @@ OnInit:
 	end;
 }
 
-um_in,101,73,3	script	Wainatan	783,{
+um_in,101,73,3	script	Wainatan	4_F_UMWOMAN,{
 	if (event_umbala >= 3) {
 		mes "[Wainatan]";
 		mes "I am sick and tired of this guy";
@@ -1160,7 +1158,7 @@ um_in,101,73,3	script	Wainatan	783,{
 	}
 }
 
-um_in,94,123,5	script	Bertztan	783,{
+um_in,94,123,5	script	Bertztan	4_F_UMWOMAN,{
 	if (event_umbala >= 3) {
 		mes "[Bertztan]";
 		mes "...*Sigh* That sicko";
@@ -1204,7 +1202,7 @@ um_in,94,123,5	script	Bertztan	783,{
 	}
 }
 
-umbala,145,217,3	script	Chabimatan	783,{
+umbala,145,217,3	script	Chabimatan	4_F_UMWOMAN,{
 	if (event_umbala >= 3) {
 		mes "[Chabimatan]";
 		mes "...*Sigh* Umpokoriohtan seems";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index eabbd5d46..cd57c9945 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Veins Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 2.2
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.5
+//===== Description: =========================================
 //= [Official Conversion]
-//= Collection of Veins Quests 
+//= Collection of Veins Quests
 //= Stone Quest:
 //= - Help an Old Man with his job.
 //= - Dialog obtained from iRO.
@@ -23,12 +23,12 @@
 //= - Missing addition to High Priest Zhed to start quest.
 //= - Infiltrate Thor Volcano Base. What is Arunafeltz up to?
 //= - Variable in use: rachel_camel (max 27)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Added Veins Stone quest. [L0ne_W0lf]
 //= 1.1 Added Veins Spy Quest. [L0ne_W0lf]
 //= 1.2 Added Veins Siblings Quest. [L0ne_W0lf]
-//=	Added Veins Thor Volcano Base Quest NPC. [L0ne_W0lf]
-//=	Start NPC is missing, but will be added when I get it.
+//=     Added Veins Thor Volcano Base Quest NPC. [L0ne_W0lf]
+//=     Start NPC is missing, but will be added when I get it.
 //= 1.3 Fixed two typos small in Asbar. [L0ne_W0lf]
 //= 1.3a More fixes to some of the Base quest NPCs. [L0ne_W0lf]
 //= 1.4 Added missing checkweights. [L0ne_W0lf]
@@ -43,12 +43,15 @@
 //=     - Thor Volcano Base Quest
 //= 2.0 Removed level requirement. (bugreport:4678) [L0ne_W0lf]
 //= 2.1 Added missing changequest (3071-3076). [Joseph]
-//= 2.2 Added renewal checks for exp distribution [Streusel]
-//============================================================ 
-
-// Stone Quest
-//============================================================ 
-ve_fild05,257,130,4	script	::WincingOldMan_veins	945,{
+//= 2.2 Moved "Wincing Old Man" to pre-re/re coordinates. [Euphy]
+//= 2.3 Fixed incorrect use of 'close'. [Joseph]
+//= 2.4 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.5 Added GM management NPC. [Euphy]
+//============================================================
+
+// Stone Quest :: veins_stone
+//============================================================
+-	script	::WincingOldMan_veins	-1,{
 	if ((MaxWeight - Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you are carrying -";
@@ -288,10 +291,7 @@ ve_fild05,257,130,4	script	::WincingOldMan_veins	945,{
 		mes "find these useful. Anyway,";
 		mes "I hope you like these rocks...";
 		set veins_stone,8;
-		if(checkre(0))
-			getexp 30000,0;
-		else
-			getexp 300000,0;
+		getexp (checkre(3))?30000:300000,0;
 		getitem 985,3; //Elunium
 		close;
 	}
@@ -306,7 +306,7 @@ ve_fild05,257,130,4	script	::WincingOldMan_veins	945,{
 	}
 }
 
-ve_in,169,310,6	script	Strange Old Man#ve	121,{
+ve_in,169,310,6	script	Strange Old Man#ve	2_M_MOLGENSTEIN,{
 	if (veins_stone == 0) {
 		mes "[Absar]";
 		mes "Bwahahaha!";
@@ -469,7 +469,7 @@ ve_in,169,310,6	script	Strange Old Man#ve	121,{
 	close;
 }
 
-ve_in02,37,28,4	script	Factory Manager	898,{
+ve_in02,37,28,4	script	Factory Manager	4_M_HUMAN_01,{
 	if (veins_stone && veins_stone < 5) {
 		mes "[Mirhen]";
 		mes "Hey, employees only beyond this point!";
@@ -532,7 +532,7 @@ ve_in02,37,28,4	script	Factory Manager	898,{
 	close;
 }
 
-ve_in02,54,49,2	script	Factory Worker#ve1	943,{
+ve_in02,54,49,2	script	Factory Worker#ve1	4_M_DESERT,{
 	if (veins_stone < 6) {
 		mes "[Bahed]";
 		mes "lately, I've been feeling so weak...";
@@ -633,7 +633,7 @@ ve_in02,54,49,2	script	Factory Worker#ve1	943,{
 	close;
 }
 
-ve_in02,68,39,7	script	Factory Worker#ve2	943,{
+ve_in02,68,39,7	script	Factory Worker#ve2	4_M_DESERT,{
 	mes "[Worker]";
 	mes "What the heck are these rocks?";
 	mes "They're ordinary stones, aren't they?";
@@ -641,9 +641,9 @@ ve_in02,68,39,7	script	Factory Worker#ve2	943,{
 	close;
 }
 
-// Spy Quest
-//============================================================ 
-prontera,202,122,0	script	Kid#sch	703,{
+// Spy Quest :: veins_secret
+//============================================================
+prontera,202,122,0	script	Kid#sch	4_F_KID2,{
 	if (que_sch == 0) {
 		mes "[Rooney]";
 		mes "Where the heck";
@@ -722,7 +722,7 @@ prontera,202,122,0	script	Kid#sch	703,{
 		mes "[Rooney]";
 		mes "Hey, alright! Thanks";
 		mes "for the cash! Heh heh~";
-		set zeny,zeny-100;
+		Zeny -= 100;
 		set que_sch,3;
 		close;
 	}
@@ -731,7 +731,7 @@ prontera,202,122,0	script	Kid#sch	703,{
 	close;
 }
 
-prt_church,89,108,6	script	Bard#sch	741,{
+prt_church,89,108,6	script	Bard#sch	2_M_BARD_ORIENT,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -818,7 +818,7 @@ prt_church,89,108,6	script	Bard#sch	741,{
 		mes "kid that was supposed";
 		mes "to come find me here.";
 		set que_sch,2;
-		set zeny,zeny+100;
+		Zeny += 100;
 		next;
 		mes "[Lasda]";
 		mes "I'd like you to come";
@@ -975,10 +975,7 @@ prt_church,89,108,6	script	Bard#sch	741,{
 		mes "reward with our sincere thanks.";
 		set que_sch,26;
 		getitem 12106,1; //Accessory_Box
-		if(checkre(0))
-			getexp 60000,0;
-		else
-			getexp 600000,0;
+		getexp (checkre(3))?60000:600000,0;
 		close;
 	}
 	else {
@@ -993,7 +990,7 @@ prt_church,89,108,6	script	Bard#sch	741,{
 	}
 }
 
-morocc,53,87,7	script	Prison Ward#sch	707,{
+morocc,53,87,7	script	Prison Ward#sch	4_M_MOC_SOLDIER,{
 	if (que_sch < 4) {
 		mes "[Jesse]";
 		mes "Only authorized";
@@ -1113,7 +1110,7 @@ morocc,53,87,7	script	Prison Ward#sch	707,{
 	close;
 }
 
-morocc_in,79,163,0	script	Public Security Officer	748,{
+morocc_in,79,163,0	script	Public Security Officer	4_M_ALCHE_A,{
 	if (que_sch < 7) {
 		mes "[Krieg]";
 		mes "I'm in charge of public";
@@ -1197,7 +1194,7 @@ morocc_in,79,163,0	script	Public Security Officer	748,{
 
 ra_in01,48,352,0	warp	que_sch_jail	1,1,morocc,56,89
 
-ra_in01,50,387,4	script	Upset Looking Bard#sch	51,{
+ra_in01,50,387,4	script	Upset Looking Bard#sch	1_M_BARD,{
 	if (que_sch < 10) {
 		mes "[Vitre]";
 		mes ".............";
@@ -1371,7 +1368,7 @@ ra_in01,50,387,4	script	Upset Looking Bard#sch	51,{
 	}
 }
 
-ra_in01,58,389,0	script	Jesse#sch	707,{
+ra_in01,58,389,0	script	Jesse#sch	4_M_MOC_SOLDIER,{
 	end;
 
 OnInit:
@@ -1379,7 +1376,7 @@ OnInit:
 	end;
 }
 
-ra_in01,58,389,0	script	Guant Prisoner#sch	929,{
+ra_in01,58,389,0	script	Guant Prisoner#sch	4_M_MIDDLE,{
 	if (que_sch < 11) {
 		mes "[Ruan]";
 		mes "This stinks. Why am";
@@ -1445,7 +1442,7 @@ ra_in01,58,389,0	script	Guant Prisoner#sch	929,{
 }
 
 // Escort Dancers to Schwaltzvalt Republic
-job_duncer,93,106,6	script	Dance Instructor#sch	892,{
+job_duncer,93,106,6	script	Dance Instructor#sch	4_F_HUGRANMA,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -1584,7 +1581,7 @@ job_duncer,93,106,6	script	Dance Instructor#sch	892,{
 			mes "your Megaphone. Thanks";
 			mes "for everything, and I'll see";
 			mes "you around, adventurer~";
-			set zeny,zeny-500000;
+			Zeny -= 500000;
 			set que_sch,18;
 			getitem 7040,1; //Megaphone
 			close;
@@ -1630,7 +1627,7 @@ job_duncer,93,106,6	script	Dance Instructor#sch	892,{
 				mes "so I'm not supposed to let";
 				mes "you have this. Don't let";
 				mes "anyone know I gave you this!";
-				set zeny,zeny-500000;
+				Zeny -= 500000;
 				getitem 7040,1; //Megaphone
 				close;
 			}
@@ -1655,7 +1652,7 @@ job_duncer,93,106,6	script	Dance Instructor#sch	892,{
 	close;
 }
 
-job_duncer,85,49,0	script	Young Dancer#sch1	724,{
+job_duncer,85,49,0	script	Young Dancer#sch1	4_F_07,{
 	if (que_sch < 12) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1693,7 +1690,7 @@ job_duncer,85,49,0	script	Young Dancer#sch1	724,{
 	close;
 }
 
-job_duncer,83,52,6	script	Cheerful Dancer#sch1	724,{
+job_duncer,83,52,6	script	Cheerful Dancer#sch1	4_F_07,{
 	if (que_sch < 12) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1730,7 +1727,7 @@ job_duncer,83,52,6	script	Cheerful Dancer#sch1	724,{
 	close;
 }
 
-job_duncer,87,50,2	script	Mature Looking Dancer#s1	724,{
+job_duncer,87,50,2	script	Mature Looking Dancer#s1	4_F_07,{
 	if (que_sch < 12) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1767,7 +1764,7 @@ job_duncer,87,50,2	script	Mature Looking Dancer#s1	724,{
 	close;
 }
 
-airplane,76,56,4	script	Young Dancer#sch2	724,{
+airplane,76,56,4	script	Young Dancer#sch2	4_F_07,{
 	if (que_sch < 13) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1791,7 +1788,7 @@ airplane,76,56,4	script	Young Dancer#sch2	724,{
 	close;
 }
 
-airplane,75,53,0	script	Cheerful Dancer#sch2	724,{
+airplane,75,53,0	script	Cheerful Dancer#sch2	4_F_07,{
 	if (que_sch < 13) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1816,7 +1813,7 @@ airplane,75,53,0	script	Cheerful Dancer#sch2	724,{
 	close;
 }
 
-airplane,79,55,2	script	Mature Looking Dancer#s2	724,{
+airplane,79,55,2	script	Mature Looking Dancer#s2	4_F_07,{
 	if (que_sch < 13) {
 		mes "[Dancer]";
 		mes "Hi there~";
@@ -1857,7 +1854,7 @@ airplane,79,55,2	script	Mature Looking Dancer#s2	724,{
 	close;
 }
 
-ein_in01,174,266,0	script	Young Dancer#sch3	724,{
+ein_in01,174,266,0	script	Young Dancer#sch3	4_F_07,{
 	if (que_sch < 17) {
 		mes "[Dancer]";
 		mes "Oh, the dinner";
@@ -1883,7 +1880,7 @@ ein_in01,174,266,0	script	Young Dancer#sch3	724,{
 	close;
 }
 
-ein_in01,172,266,0	script	Cheerful Dancer#sch3	724,{
+ein_in01,172,266,0	script	Cheerful Dancer#sch3	4_F_07,{
 	if (que_sch < 17) {
 		mes "[Dancer]";
 		mes "The dinner party isn't";
@@ -1908,7 +1905,7 @@ ein_in01,172,266,0	script	Cheerful Dancer#sch3	724,{
 	close;
 }
 
-ein_in01,170,266,0	script	Mature Looking Dancer#s3	724,{
+ein_in01,170,266,0	script	Mature Looking Dancer#s3	4_F_07,{
 	if (que_sch < 17) {
 		mes "[Dancer]";
 		mes "Oh, the dinner";
@@ -1936,7 +1933,7 @@ ein_in01,170,266,0	script	Mature Looking Dancer#s3	724,{
 	close;
 }
 
-ein_in01,279,221,0	script	Hotel Manager#sch	903,5,5,{
+ein_in01,279,221,0	script	Hotel Manager#sch	4_M_KHKYEL,5,5,{
 	if (que_sch < 15) {
 		mes "[Manager]";
 		mes "It'd be a really great";
@@ -1983,7 +1980,7 @@ OnTouch:
 	end;
 }
 
-ein_in01,166,282,4	script	Employee#sch	904,{
+ein_in01,166,282,4	script	Employee#sch	4_M_KHMAN,{
 	if (que_sch < 15) {
 		mes "[Employee]";
 		mes "We've been so busy lately!";
@@ -2102,7 +2099,7 @@ OnTouch:
 	end;
 }
 
-ein_in01,181,284,0	script	Corporate Figure	109,{
+ein_in01,181,284,0	script	Corporate Figure	4_M_MANAGER,{
 	end;
 
 OnInit:
@@ -2110,7 +2107,7 @@ OnInit:
 	end;
 }
 
-ein_in01,181,285,0	script	Arunafeltz Figure	920,{
+ein_in01,181,285,0	script	Arunafeltz Figure	4_F_TRAINEE,{
 	end;
 
 OnInit:
@@ -2118,7 +2115,7 @@ OnInit:
 	end;
 }
 
-ein_in01,168,274,0	script	Corporate Figure#sch	109,{
+ein_in01,168,274,0	script	Corporate Figure#sch	4_M_MANAGER,{
 	mes "[????]";
 	mes "Hmm... Good.";
 	mes "Everything looks";
@@ -2126,7 +2123,7 @@ ein_in01,168,274,0	script	Corporate Figure#sch	109,{
 	close;
 }
 
-ein_in01,170,284,4	script	Arunafeltz Figure#sch	920,{
+ein_in01,170,284,4	script	Arunafeltz Figure#sch	4_F_TRAINEE,{
 	mes "[??????]";
 	mes "I've got to say, only";
 	mes "Rekenber can host such";
@@ -2136,7 +2133,7 @@ ein_in01,170,284,4	script	Arunafeltz Figure#sch	920,{
 	close;
 }
 
-morocc,297,154,0	script	Thin-Faced Bard#sch	51,{
+morocc,297,154,0	script	Thin-Faced Bard#sch	1_M_BARD,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -2403,7 +2400,7 @@ morocc,297,154,0	script	Thin-Faced Bard#sch	51,{
 	close;
 }
 
-morocc,294,152,0	script	????#sch1	899,{
+morocc,294,152,0	script	????#sch1	4_M_HUMAN_02,{
 	end;
 
 OnInit:
@@ -2411,7 +2408,7 @@ OnInit:
 	end;
 }
 
-morocc,293,155,6	script	????#sch2	899,{
+morocc,293,155,6	script	????#sch2	4_M_HUMAN_02,{
 	end;
 
 OnInit:
@@ -2419,7 +2416,7 @@ OnInit:
 	end;
 }
 
-morocc,298,150,1	script	????#sch3	899,{
+morocc,298,150,1	script	????#sch3	4_M_HUMAN_02,{
 	end;
 
 OnInit:
@@ -2427,7 +2424,7 @@ OnInit:
 	end;
 }
 
-prontera,109,161,6	script	Young Man#sch	83,{
+prontera,109,161,6	script	Young Man#sch	4_M_01,{
 	if (que_sch < 20) {
 		mes "[Chada]";
 		mes "What a boring day...";
@@ -2488,7 +2485,7 @@ prontera,109,161,6	script	Young Man#sch	83,{
 	}
 }
 
-geffen,196,167,4	script	Young Woman#sch	101,{
+geffen,196,167,4	script	Young Woman#sch	4W_F_01,{
 	if (que_sch < 21) {
 		mes "[Ghez]";
 		mes "When is he going";
@@ -2562,7 +2559,7 @@ geffen,196,167,4	script	Young Woman#sch	101,{
 	}
 }
 
-comodo,135,299,0	script	Young Man#sch2	809,{
+comodo,135,299,0	script	Young Man#sch2	1_M_SIGNMONK,{
 	if (que_sch < 22) {
 		mes "[Nosdan]";
 		mes "Have you come to hear";
@@ -2651,9 +2648,23 @@ comodo,135,299,0	script	Young Man#sch2	809,{
 	}
 }
 
-// Siblings Quest
-//============================================================ 
-veins,327,185,3	script	Kid#camelcamel	944,{
+sec_in02,10,43,4	script	Extra Story Patch	1_M_SIGNMONK,{
+	callfunc "F_GM_NPC";
+	mes "[Patch]";
+	mes "Yeah, you can try.";
+	next;
+	if(select("Now:How many?") == 2) {
+		input .@input,0,1000;
+		set que_sch, .@input;
+	}
+	mes " ";
+	mes ""+que_sch;
+	close;
+}
+
+// Siblings Quest :: veins_camel
+//============================================================
+veins,327,185,3	script	Kid#camelcamel	4_M_DST_CHILD,{
 	if (MISC_QUEST & 8192) {
 		if (rachel_camel == 0) {
 			mes "[Kid Karyn]";
@@ -3047,8 +3058,8 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 			completequest 3083;
 			set rachel_camel,25;
 			specialeffect2 EF_ABSORBSPIRITS;
-			if(checkre(0))
-				getexp 100000,70000;
+			if (checkre(3))
+				getexp 100000,50000;
 			else
 				getexp 1000000,700000;
 			close;
@@ -3134,6 +3145,7 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 				mes "I'm happy that";
 				mes "I can help you too!";
 				set aru_monas,16;
+				changequest 17011,17012;
 				close;
 			}
 			else if (aru_monas < 26) {
@@ -3162,7 +3174,7 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 	}
 }
 
-que_thor,36,66,5	script	Little Curdie	941,{
+que_thor,36,66,5	script	Little Curdie	4_F_DST_CHILD,{
 	if (rachel_camel == 1) {
 		mes "^3355FFYou come across";
 		mes "a little girl lying on the";
@@ -3503,7 +3515,7 @@ que_thor,36,66,5	script	Little Curdie	941,{
 	}
 }
 
-veins,181,166,3	script	Lockenlock	900,{
+veins,181,166,3	script	Lockenlock	4_M_HUMERCHANT,{
 	if (rachel_camel && rachel_camel < 4) {
 		mes "^3355FFIt's a drunkard...";
 		mes "The scent of pure";
@@ -4014,7 +4026,7 @@ veins,181,166,3	script	Lockenlock	900,{
 		mes "The army's rotten to the core";
 		mes "for doing something like this.";
 		next;
-		mes "	[Locksmith Lockenlock]";
+		mes "[Locksmith Lockenlock]";
 		mes "You're a real good person,";
 		mes "and I'm glad I got to know";
 		mes "you. I don't know if we'll";
@@ -4060,7 +4072,7 @@ veins,181,166,3	script	Lockenlock	900,{
 	}
 }
 
-veins,227,127,5	script	Ivory	940,{
+veins,227,127,5	script	Ivory	4_F_DESERT,{
 	if (rachel_camel && rachel_camel < 5) {
 		mes "[Organic Soap Maker Ivory]";
 		mes "I need to make more of";
@@ -4383,7 +4395,7 @@ veins,227,127,5	script	Ivory	940,{
 	}
 }
 
-veins,115,59,5	script	Saraman	847,{
+veins,115,59,5	script	Saraman	4_M_EINOLD,{
 	if (rachel_camel && rachel_camel < 7) {
 		mes "[Saraman]";
 		mes "Zzzzz...";
@@ -4731,7 +4743,7 @@ veins,115,59,5	script	Saraman	847,{
 	}
 }
 
-veins,78,226,5	script	Camel#camelcc1::VeinsCamel	938,{
+veins,78,226,5	script	Camel#camelcc1::VeinsCamel	4_DST_CAMEL,{
 	if (rachel_camel == 9) {
 		mes "^3355FFThe camel sniffed the";
 		mes "appetite stimulant, but";
@@ -4758,13 +4770,13 @@ veins,78,226,5	script	Camel#camelcc1::VeinsCamel	938,{
 	}
 }
 
-veins,72,227,3	duplicate(VeinsCamel)	Camel#camelcc3	938
-veins,81,222,1	duplicate(VeinsCamel)	Camel#camelcc4	938
-veins,77,219,5	duplicate(VeinsCamel)	Camel#camelcc5	938
-veins,73,215,8	duplicate(VeinsCamel)	Camel#camelcc6	938
-veins,68,215,5	duplicate(VeinsCamel)	Camel#camelcc7	938
+veins,72,227,3	duplicate(VeinsCamel)	Camel#camelcc3	4_DST_CAMEL
+veins,81,222,1	duplicate(VeinsCamel)	Camel#camelcc4	4_DST_CAMEL
+veins,77,219,5	duplicate(VeinsCamel)	Camel#camelcc5	4_DST_CAMEL
+veins,73,215,8	duplicate(VeinsCamel)	Camel#camelcc6	4_DST_CAMEL
+veins,68,215,5	duplicate(VeinsCamel)	Camel#camelcc7	4_DST_CAMEL
 
-ve_fild07,235,42,3	script	Silk Sand Camel	938,{
+ve_fild07,235,42,3	script	Silk Sand Camel	4_DST_CAMEL,{
 	if (rachel_camel == 11) {
 		mes "^3355FFThis camel's leg is";
 		mes "wounded. Although it";
@@ -4966,7 +4978,7 @@ ve_fild07,235,42,3	script	Silk Sand Camel	938,{
 	}
 }
 
-veins,221,120,5	script	Young Town Native	943,{
+veins,221,120,5	script	Young Town Native	4_M_DESERT,{
 	if (rachel_camel == 3) {
 		mes "[Native Young Man]";
 		mes "My name is Toby.";
@@ -5059,10 +5071,9 @@ veins,221,120,5	script	Young Town Native	943,{
 	}
 }
 
-// Thor Volcano Base Quest
-//============================================================ 
-
-ra_temin,87,133,1	script	Rachel Guard#vol1	934,5,2,{
+// Thor Volcano Base Quest :: veins_camp
+//============================================================
+ra_temin,87,133,1	script	Rachel Guard#vol1	4_M_RASWORD,5,2,{
 	if (aru_vol == 2) {
 		mes "[Guard Karlum]";
 		mes "High Priest Vildt isn't";
@@ -5187,14 +5198,12 @@ ra_temin,87,133,1	script	Rachel Guard#vol1	934,5,2,{
 		disablenpc "Rachel Guard#vol1";
 		end;
 	}
-	else {
-		mes "[Guard Karlum]";
-		mes "High Priest Vildt isn't";
-		mes "here right now. Please";
-		mes "come back later if you";
-		mes "wish to see him.";
-		close;
-	}
+	mes "[Guard Karlum]";
+	mes "High Priest Vildt isn't";
+	mes "here right now. Please";
+	mes "come back later if you";
+	mes "wish to see him.";
+	close;
 
 OnInit:
 	enablenpc "Rachel Guard#vol1";
@@ -5202,10 +5211,10 @@ OnInit:
 
 OnTouch:
 	warp "ra_temin",85,137;
-	close;
+	end;
 }
 
-ra_temin,82,133,7	script	Rachel Guard#vol2	934,5,2,{
+ra_temin,82,133,7	script	Rachel Guard#vol2	4_M_RASWORD,5,2,{
 	mes "[Guard Krodger]";
 	mes "High Priest Vildt isn't";
 	mes "here right now. Please";
@@ -5222,7 +5231,7 @@ OnTouch:
 	close;
 }
 
-ra_temin,115,140,1	script	Flower Vase#vol	111,{
+ra_temin,115,140,1	script	Flower Vase#vol	HIDDEN_NPC,{
 	if ((aru_vol > 2) && (aru_vol < 5)) {
 		mes "^3355FFYou find a giant";
 		mes "vase full of beautiful";
@@ -5288,7 +5297,7 @@ OnTouch:
 	end;
 }
 
-ra_temin,40,124,3	script	Female Follower#vol	920,{
+ra_temin,40,124,3	script	Female Follower#vol	4_F_TRAINEE,{
 	mes "[Lamir]";
 	mes "^333333*Sigh*^000000 High Priest Vildt";
 	mes "left over so much food after";
@@ -5325,7 +5334,7 @@ ra_temin,40,124,3	script	Female Follower#vol	920,{
 	close;
 }
 
-ra_temin,42,124,3	script	Rachel Guard#vol1_1	934,{
+ra_temin,42,124,3	script	Rachel Guard#vol1_1	4_M_RASWORD,{
 	end;
 
 OnInit:
@@ -5333,7 +5342,7 @@ OnInit:
 	end;
 }
 
-ra_temin,5,5,3	script	vol_time	844,{
+ra_temin,5,5,3	script	vol_time	CLEAR_NPC,{
 OnInit:
 	stopnpctimer;
 	end;
@@ -5383,7 +5392,7 @@ OnTimer55000:
 	end;
 }
 
-ra_temin,113,140,1	script	Rachel Guard#vol2_1	934,{
+ra_temin,113,140,1	script	Rachel Guard#vol2_1	4_M_RASWORD,{
 	mes "[Guard Krodger]";
 	mes "What's with this vase?";
 	mes "They always send me out";
@@ -5398,7 +5407,7 @@ OnInit:
 	end;
 }
 
-ra_temin,5,5,1	script	vol_time2	844,{
+ra_temin,5,5,1	script	vol_time2	CLEAR_NPC,{
 OnInit:
 	stopnpctimer;
 	end;
@@ -5416,7 +5425,7 @@ OnTimer30000:
 	end;
 }
 
-ra_temin,87,118,3	script	Drawer#vol1::VeinsDrawer	111,{
+ra_temin,87,118,3	script	Drawer#vol1::VeinsDrawer	HIDDEN_NPC,{
 	mes "^3355FFThere are some neatly";
 	mes "printed and organized";
 	mes "documents inside";
@@ -5424,9 +5433,9 @@ ra_temin,87,118,3	script	Drawer#vol1::VeinsDrawer	111,{
 	close;
 }
 
-ra_temin,83,118,3	duplicate(VeinsDrawer)	Drawer#vol2	111
+ra_temin,83,118,3	duplicate(VeinsDrawer)	Drawer#vol2	HIDDEN_NPC
 
-ra_temin,85,118,3	script	Drawer#vol3	111,{
+ra_temin,85,118,3	script	Drawer#vol3	HIDDEN_NPC,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -5498,14 +5507,14 @@ ra_temin,85,118,3	script	Drawer#vol3	111,{
 	close;
 }
 
-ra_temin,88,117,3	script	Goddess Statue#vol1	111,{
+ra_temin,88,117,3	script	Goddess Statue#vol1	HIDDEN_NPC,{
 	mes "^3355FFIt's a statue of Freya,";
 	mes "a goddess revered for her";
 	mes "clemency and wisdom.^000000";
 	close;
 }
 
-ra_temin,73,126,1	script	Ladder#vol1	111,{
+ra_temin,73,126,1	script	Ladder#vol1	HIDDEN_NPC,{
 	if (aru_vol == 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Wait, I can use this";
@@ -5570,7 +5579,7 @@ OnTouch:
 	end;
 }
 
-veins,159,171,3	script	Towner#vol	945,{
+veins,159,171,3	script	Towner#vol	4_M_DST_GRAND,{
 	mes "[Towner]";
 	mes "The small office on the";
 	mes "2nd floor of this weapon";
@@ -5588,7 +5597,7 @@ veins,159,171,3	script	Towner#vol	945,{
 	close;
 }
 
-ve_in,233,116,3	script	Drunken Man#vol	901,{
+ve_in,233,116,3	script	Drunken Man#vol	4_M_HUOLDARMY,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -5985,7 +5994,7 @@ ve_in,233,116,3	script	Drunken Man#vol	901,{
 	close;
 }
 
-ve_in,232,117,5	script	Drunken Lady#1	940,{
+ve_in,232,117,5	script	Drunken Lady#1	4_F_DESERT,{
 	mes "[Drunken Lady]";
 	mes "This guys' actually";
 	mes "pretty boring, but...";
@@ -5994,7 +6003,7 @@ ve_in,232,117,5	script	Drunken Lady#1	940,{
 	close;
 }
 
-ve_in,234,115,3	script	Drunken Lady#2	940,{
+ve_in,234,115,3	script	Drunken Lady#2	4_F_DESERT,{
 	mes "[Drunken Lady]";
 	mes "This tavern might look";
 	mes "luxurious and gorgeous,";
@@ -6004,7 +6013,7 @@ ve_in,234,115,3	script	Drunken Lady#2	940,{
 	close;
 }
 
-ve_in,277,229,3	script	Wall Closet#vol	111,{
+ve_in,277,229,3	script	Wall Closet#vol	HIDDEN_NPC,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -6031,7 +6040,7 @@ ve_in,277,229,3	script	Wall Closet#vol	111,{
 	close;
 }
 
-ve_in,281,214,3	script	Bookshelf#vol	111,{
+ve_in,281,214,3	script	Bookshelf#vol	HIDDEN_NPC,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -6091,10 +6100,7 @@ ve_in,281,214,3	script	Bookshelf#vol	111,{
 		else {
 			getitem 12103,1; //Bloody_Dead_Branch
 		}
-		if(checkre(0))
-			getexp 80000,0;
-		else
-			getexp 800000,0;
+		getexp (checkre(3))?100000:800000,0;
 		mes "^3355FFWell, you've done all";
 		mes "that you could here.";
 		mes "Now would be a good time";
@@ -6108,7 +6114,7 @@ ve_in,281,214,3	script	Bookshelf#vol	111,{
 	close;
 }
 
-thor_v01,37,234,3	script	Hot Land Surface#1	111,{
+thor_v01,37,234,3	script	Hot Land Surface#1	HIDDEN_NPC,{
 	if (aru_vol == 8) {
 		if ((countitem(7704) > 0) && (countitem(7342) > 0)) {
 			mes "^3355FFYou use the pyrometer";
@@ -6146,7 +6152,7 @@ thor_v01,37,234,3	script	Hot Land Surface#1	111,{
 	close;
 }
 
-thor_v02,165,37,3	script	Hot Land Surface#2	111,{
+thor_v02,165,37,3	script	Hot Land Surface#2	HIDDEN_NPC,{
 	if (aru_vol == 9) {
 		if ((countitem(7704) > 0) && (countitem(7342) > 0)) {
 			mes "^3355FFYou use the pyrometer";
@@ -6178,7 +6184,7 @@ thor_v02,165,37,3	script	Hot Land Surface#2	111,{
 	close;
 }
 
-thor_v02,170,100,3	script	Hot Land Surface#3	111,{
+thor_v02,170,100,3	script	Hot Land Surface#3	HIDDEN_NPC,{
 	if (aru_vol == 10) {
 		if ((countitem(7704) > 0) && (countitem(7342) > 0)) {
 			mes "^3355FFYou use the pyrometer";
@@ -6224,7 +6230,7 @@ thor_v02,170,100,3	script	Hot Land Surface#3	111,{
 	close;
 }
 
-que_thor,145,66,3	script	Guard#vol::VeinsGuard	939,{
+que_thor,145,66,3	script	Guard#vol::VeinsGuard	4_DST_SOLDIER,{
 	if (aru_vol == 11) {
 		mes "[Guard]";
 		mes "Only authorized";
@@ -6279,10 +6285,10 @@ que_thor,145,66,3	script	Guard#vol::VeinsGuard	939,{
 	close;
 }
 
-que_thor,136,66,3	duplicate(VeinsGuard)	Guard#vol2	939
-que_thor,127,60,5	duplicate(VeinsGuard)	Guard#vol3	939
+que_thor,136,66,3	duplicate(VeinsGuard)	Guard#vol2	4_DST_SOLDIER
+que_thor,127,60,5	duplicate(VeinsGuard)	Guard#vol3	4_DST_SOLDIER
 
-thor_camp,250,104,3	script	Sahedi#vol	934,{
+thor_camp,250,104,3	script	Sahedi#vol	4_M_RASWORD,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -6334,7 +6340,7 @@ thor_camp,250,104,3	script	Sahedi#vol	934,{
 		mes "like this in the past, but...";
 		mes "Is this... How bad is this?";
 		next;
-		emotion 19,1;
+		emotion e_swt2,1;
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh... Oh, no!";
 		mes "Yikes! I guess if it's";
@@ -6425,7 +6431,7 @@ thor_camp,250,104,3	script	Sahedi#vol	934,{
 		mes "It'll be a disaster, just";
 		mes "like it happened in the past!";
 		next;
-		emotion 52,1;
+		emotion e_flash,1;
 		mes "["+strcharinfo(0)+"]";
 		mes "Yes, I agree. There's";
 		mes "a good chance of an...";
@@ -6437,7 +6443,7 @@ thor_camp,250,104,3	script	Sahedi#vol	934,{
 		mes "How much time do we";
 		mes "have to evacuate?";
 		next;
-		emotion 52,1;
+		emotion e_flash,1;
 		mes "["+strcharinfo(0)+"]";
 		mes "Well... Uh...";
 		mes "According to my data...";
@@ -6595,7 +6601,7 @@ OnTouch:
 	end;
 }
 
-thor_camp,187,228,5	script	Colonel Vito#1	946,{
+thor_camp,187,228,5	script	Colonel Vito#1	4_M_DST_MASTER,{
 	end;
 
 OnInit:
@@ -6603,7 +6609,7 @@ OnInit:
 	end;
 }
 
-thor_camp,155,175,7	script	Colonel Vito#2	946,{
+thor_camp,155,175,7	script	Colonel Vito#2	4_M_DST_MASTER,{
 	end;
 
 OnInit:
@@ -6611,7 +6617,7 @@ OnInit:
 	end;
 }
 
-thor_camp,159,74,3	script	Colonel Vito#3	946,{
+thor_camp,159,74,3	script	Colonel Vito#3	4_M_DST_MASTER,{
 	if (aru_vol == 14) {
 		mes "[Colonel Vito]";
 		mes "I am Colonel Vito,";
@@ -6979,7 +6985,7 @@ OnTouch:
 	end;
 }
 
-thor_camp,124,314,1	script	Soldier#vol1	939,{
+thor_camp,124,314,1	script	Soldier#vol1	4_DST_SOLDIER,{
 	mes "[Thor Volcano Camp Soldier]";
 	mes "Freya, I'm so exhausted!";
 	mes "I'm starving to death too!";
@@ -6987,7 +6993,7 @@ thor_camp,124,314,1	script	Soldier#vol1	939,{
 	close;
 }
 
-thor_camp,134,309,5	script	Soldier#vol2	939,{
+thor_camp,134,309,5	script	Soldier#vol2	4_DST_SOLDIER,{
 	mes "[Thor Volcano Camp Soldier]";
 	mes "I hear we'll be eating";
 	mes "chicken salad, fried chicken,";
@@ -7002,7 +7008,7 @@ thor_camp,134,309,5	script	Soldier#vol2	939,{
 	close;
 }
 
-thor_camp,109,167,3	script	Control Panel#vol	111,{
+thor_camp,109,167,3	script	Control Panel#vol	HIDDEN_NPC,{
 	if (aru_vol == 17) {
 		mes "^3355FFThis control panel";
 		mes "controls the main power";
@@ -7035,7 +7041,7 @@ thor_camp,109,167,3	script	Control Panel#vol	111,{
 	end;
 }
 
-thor_camp,150,65,3	script	Dummy#1::VeinsDummy	111,{
+thor_camp,150,65,3	script	Dummy#1::VeinsDummy	HIDDEN_NPC,{
 	if (aru_vol == 19) {
 		mes "^3355FFIt's a training dummy";
 		mes "that looks like it can";
@@ -7134,19 +7140,20 @@ thor_camp,150,65,3	script	Dummy#1::VeinsDummy	111,{
 	}
 }
 
-thor_camp,156,65,3	duplicate(VeinsDummy)	Dummy#2	111
-thor_camp,162,65,3	duplicate(VeinsDummy)	Dummy#3	111
-thor_camp,150,57,3	duplicate(VeinsDummy)	Dummy#4	111
-thor_camp,156,57,3	duplicate(VeinsDummy)	Dummy#5	111
-thor_camp,162,57,3	duplicate(VeinsDummy)	Dummy#6	111
+thor_camp,156,65,3	duplicate(VeinsDummy)	Dummy#2	HIDDEN_NPC
+thor_camp,162,65,3	duplicate(VeinsDummy)	Dummy#3	HIDDEN_NPC
+thor_camp,150,57,3	duplicate(VeinsDummy)	Dummy#4	HIDDEN_NPC
+thor_camp,156,57,3	duplicate(VeinsDummy)	Dummy#5	HIDDEN_NPC
+thor_camp,162,57,3	duplicate(VeinsDummy)	Dummy#6	HIDDEN_NPC
 
-thor_camp,248,104,5	script	Aitra#vol	939,{
+thor_camp,248,104,5	script	Aitra#vol	4_DST_SOLDIER,{
+	end;
 OnInit:
 	disablenpc "Aitra#vol";
 	end;
 }
 
-thor_camp,49,97,3	script	High Priest#vol	933,{
+thor_camp,49,97,3	script	High Priest#vol	4_M_RACHOLD,{
 	mes "^3355FFYou'd better not";
 	mes "do anything too";
 	mes "conspicuous in";
@@ -7154,7 +7161,7 @@ thor_camp,49,97,3	script	High Priest#vol	933,{
 	close;
 }
 
-thor_camp,49,122,1	script	Thor Volcano Soldier#vo1	939,{
+thor_camp,49,122,1	script	Thor Volcano Soldier#vo1	4_DST_SOLDIER,{
 	mes "^3355FFYou'd better not";
 	mes "do anything too";
 	mes "conspicuous in";
@@ -7162,7 +7169,7 @@ thor_camp,49,122,1	script	Thor Volcano Soldier#vo1	939,{
 	close;
 }
 
-thor_camp,31,93,1	script	Thor Volcano Soldier#vo2	939,{
+thor_camp,31,93,1	script	Thor Volcano Soldier#vo2	4_DST_SOLDIER,{
 	mes "^3355FFYou'd better not";
 	mes "do anything too";
 	mes "conspicuous in";
@@ -7170,7 +7177,7 @@ thor_camp,31,93,1	script	Thor Volcano Soldier#vo2	939,{
 	close;
 }
 
-thor_camp,59,79,1	script	Thor Volcano Soldier#vo3	939,{
+thor_camp,59,79,1	script	Thor Volcano Soldier#vo3	4_DST_SOLDIER,{
 	mes "^3355FFYou'd better not";
 	mes "do anything too";
 	mes "conspicuous in";
@@ -7178,7 +7185,7 @@ thor_camp,59,79,1	script	Thor Volcano Soldier#vo3	939,{
 	close;
 }
 
-thor_camp,143,114,1	script	Thor Volcano Soldier#vo4	939,{
+thor_camp,143,114,1	script	Thor Volcano Soldier#vo4	4_DST_SOLDIER,{
 	emotion e_sob;
 	mes "[Soldier]";
 	mes "Oh Freya...";
@@ -7189,7 +7196,7 @@ thor_camp,143,114,1	script	Thor Volcano Soldier#vo4	939,{
 	close;
 }
 
-thor_camp,206,92,3	script	Thor Volcano Soldier#vo5	939,{
+thor_camp,206,92,3	script	Thor Volcano Soldier#vo5	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "Ah, time to";
 	mes "go to work.";
@@ -7202,13 +7209,13 @@ thor_camp,206,92,3	script	Thor Volcano Soldier#vo5	939,{
 	close;
 }
 
-thor_camp,201,321,1	script	Thor Volcano Soldier#vo6	939,{
+thor_camp,201,321,1	script	Thor Volcano Soldier#vo6	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "Yo-ho! Yo-ho!";
 	close;
 }
 
-thor_camp,196,315,7	script	Thor Volcano Soldier#vo7	939,{
+thor_camp,196,315,7	script	Thor Volcano Soldier#vo7	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "I guess I need to go";
 	mes "on Guardian polishing";
@@ -7218,7 +7225,7 @@ thor_camp,196,315,7	script	Thor Volcano Soldier#vo7	939,{
 	close;
 }
 
-thor_camp,181,231,0	script	Guardian#vol_7	111,{
+thor_camp,181,231,0	script	Guardian#vol_7	HIDDEN_NPC,{
 	mes "^3355FFThere are many guardians";
 	mes "here in different stages";
 	mes "of disassembly. It looks";
@@ -7227,7 +7234,7 @@ thor_camp,181,231,0	script	Guardian#vol_7	111,{
 	close;
 }
 
-thor_camp,98,213,5	script	Thor Volcano Soldier#vo8	939,{
+thor_camp,98,213,5	script	Thor Volcano Soldier#vo8	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "Aren't you the one from";
 	mes "the geological research";
@@ -7238,7 +7245,7 @@ thor_camp,98,213,5	script	Thor Volcano Soldier#vo8	939,{
 	close;
 }
 
-thor_camp,98,209,5	script	Thor Volcano Soldier#vo9	939,{
+thor_camp,98,209,5	script	Thor Volcano Soldier#vo9	4_DST_SOLDIER,{
 	mes "[Soldier]";
 	mes "Why am I always";
 	mes "stationed here?!";
@@ -7247,7 +7254,7 @@ thor_camp,98,209,5	script	Thor Volcano Soldier#vo9	939,{
 	close;
 }
 
-thor_v02,143,78,0	script	#totcamp	45,2,2,{
+thor_v02,143,78,0	script	#totcamp	WARPNPC,2,2,{
 OnTouch_:
 	if (rachel_camel < 24) {
 		warp "que_thor",65,55;
@@ -7257,13 +7264,13 @@ OnTouch_:
 	end;
 }
 
-que_thor,69,56,0	script	#tov_1	45,2,2,{
+que_thor,69,56,0	script	#tov_1	WARPNPC,2,2,{
 OnTouch_:
 	warp "thor_v02",146,84;
 	end;
 }
 
-que_thor,187,56,0	script	#tov_2	45,2,2,{
+que_thor,187,56,0	script	#tov_2	WARPNPC,2,2,{
 OnTouch_:
 	warp "thor_v02",146,84;
 	end;
@@ -7282,7 +7289,7 @@ OnTouch:
 	close;
 }
 
-thor_camp,246,191,3	script	Guard#goto	939,{
+thor_camp,246,191,3	script	Guard#goto	4_DST_SOLDIER,{
 	mes "[Guard]";
 	mes "What now?";
 	mes "Can't you see I'm busy?";
@@ -7314,7 +7321,7 @@ OnTouch_:
 	close;
 }
 
-ve_in,235,135,5	script	Bartender#ve	947,{
+ve_in,235,135,5	script	Bartender#ve	4_M_DST_TOUGH,{
 	mes "[Bartender]";
 	mes "Welcome to our tavern.";
 	mes "Please, have a seat.";
@@ -7323,7 +7330,7 @@ ve_in,235,135,5	script	Bartender#ve	947,{
 	close;
 }
 
-ve_in,237,131,1	script	Female Customer#ve1	940,{
+ve_in,237,131,1	script	Female Customer#ve1	4_F_DESERT,{
 	mes "[Female Customer]";
 	mes "Bartender, aren't any of";
 	mes "your regulars nice young";
@@ -7355,7 +7362,7 @@ ve_in,237,131,1	script	Female Customer#ve1	940,{
 	next;
 	mes "["+strcharinfo(0)+"]";
 	mes "Meee?";
-	emotion 19,1;
+	emotion e_swt2,1;
 	next;
 	mes "[Female Customer]";
 	mes "Mmm...";
@@ -7364,7 +7371,7 @@ ve_in,237,131,1	script	Female Customer#ve1	940,{
 	close;
 }
 
-ve_in,239,107,1	script	Male Customer#ve2	943,{
+ve_in,239,107,1	script	Male Customer#ve2	4_M_DESERT,{
 	mes "[Male Customer]";
 	mes "How can that ugly old";
 	mes "man have girls hanging";
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index d6ed2a268..d0544a5b7 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -1,11 +1,11 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Juno
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.0a
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Metto Quest:
 //= - Not really sure exaclty what it's for. :P
 //= - Variable in use: metto_q (max 9)
@@ -17,25 +17,25 @@
 //= - Part 1: Found in Quests_Comodo.txt
 //= - Part 3: Found in Doomed_Swords.txt
 //= - Variable in use dmdswrd_Q (Max 45)
-//===== Additional Comments: ================================= 
-//= v1.1 Re-did the text and re-organized the script.  Corrected some items. [kobra_k88]
-//= v1.2 Added part to Bro's for alchemist quest [Darkchild]
+//===== Additional Comments: =================================
+//= 1.1 Re-did the text and re-organized the script.  Corrected some items. [kobra_k88]
+//= 1.2 Added part to Bro's for alchemist quest [Darkchild]
 //= 1.3 fixed that part of Alch Job Quest. [Lupus]
 //= 1.4 Fixed exploit [Lupus]
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Merged metto_quest.txt into Juno quest file.
-//=	Added the Juno portion of the Doomed Swords quest.
+//=     Merged metto_quest.txt into Juno quest file.
+//=     Added the Juno portion of the Doomed Swords quest.
 //= 1.6 Fixed various errors in the Bajin NPC. [L0ne_W0lf]
 //= 1.7 Changed ALCH_Q check and set to corrispond to new alchemist job quest. [L0ne_W0lf]
 //= 1.8 Fixed metto_q never reaching 2. Made some names more unique. [L0ne_W0lf]
 //= 1.9 Fixed Missing Variables in Metto quest. (bugreport:473) [Samuray22]
 //= 2.0 Added missing checkweights. [L0ne_W0lf]
 //= 2.0a Fixed several typos (bugreport:1786) [akrus]
-//============================================================ 
+//============================================================
 
-// Metto Quest
+// Metto Quest :: yuno_ryusei
 //============================================================
-yuno_in03,26,39,3	script	Metto#juno	709,{
+yuno_in03,26,39,3	script	Metto#juno	4_M_SEAMAN,{
 	mes "[Metto]";
 	if (metto_q == 0) {
 		mes "In the Lab today, in the Lab tomorrow! Everyday is filled with research! Even if it takes my entire life, I will not give up until I have made a new Juno...";
@@ -137,7 +137,7 @@ yuno_in03,26,39,3	script	Metto#juno	709,{
 	}
 }
 
-yuno_in01,17,30,5	script	Wagan#juno	85,{
+yuno_in01,17,30,5	script	Wagan#juno	4_M_03,{
 	mes "[Wagan]";
 	if (metto_q == 0) {
 		mes "I'm sure that you know our city has been living off our research for many years.";
@@ -227,8 +227,7 @@ yuno_in01,17,30,5	script	Wagan#juno	85,{
 		next;
 		mes "[Wagan]";
 		if (Class == Job_Sage) {
-			set .@now_weight,maxweight - weight;
-			if (.@now_weight < 300) {
+			if (MaxWeight - Weight < 300) {
 				mes "Oh no, it seems that you are carrying too much stuff! Would you make some room?";
 				close;
 			}
@@ -237,8 +236,7 @@ yuno_in01,17,30,5	script	Wagan#juno	85,{
 			getitem 715,10; //Yellow_Gemstone
 			close;
 		}
-		set .@now_weight,maxweight - weight;
-		if (.@now_weight < 150) {
+		if (MaxWeight - Weight < 150) {
 			mes "Oh no, it seems that you are carrying too much! Would you make some room?";
 			close;
 		}
@@ -257,7 +255,7 @@ yuno_in01,17,30,5	script	Wagan#juno	85,{
 	}
 }
 
-yuno_in01,17,95,5	script	Stangckle#juno	99,{
+yuno_in01,17,95,5	script	Stangckle#juno	4W_M_03,{
 	mes "[Stangckle]";
 	if (metto_q == 2) {
 		mes "What can I do for you? My colleague Metto is coming here soon, so I don't have much time. So what did you say you needed?";
@@ -319,7 +317,7 @@ yuno_in01,17,95,5	script	Stangckle#juno	99,{
 	}
 }
 
-yuno_in01,19,183,5	script	Kato#juno	55,{
+yuno_in01,19,183,5	script	Kato#juno	1_M_JOBTESTER,{
 	mes "[Kato]";
 	if (metto_q == 4) {
 		mes "I am a scientist researching all sorts of things.";
@@ -367,7 +365,7 @@ yuno_in01,19,183,5	script	Kato#juno	55,{
 	}
 }
 
-yuno_in03,178,43,0	script	CiCi#juno	121,{
+yuno_in03,178,43,0	script	CiCi#juno	2_M_MOLGENSTEIN,{
 	if (metto_q == 6) {
 		mes "[CiCi]";
 		mes "My name is CiCi. I am one of the three great scientists in this city.";
@@ -422,9 +420,9 @@ yuno_in03,178,43,0	script	CiCi#juno	121,{
 	}
 }
 
-// Alchemist Brothers Quest
+// Alchemist Brothers Quest :: yuno_ryusei
 //============================================================
-yuno_in01,103,157,3	script	Bain#juno	98,{
+yuno_in01,103,157,3	script	Bain#juno	4W_M_02,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -531,14 +529,14 @@ S_DelItems:
 	delitem 7043,5; //Fine_Sand
 	delitem 757,3; //Elunium_Stone
 	delitem 756,3; //Oridecon_Stone
-	set zeny,zeny-2000;
+	Zeny -= 2000;
 	getitem getarg(0),getarg(1); //Gold
 	mes "[Bain]";
 	mes "AHHH, it is a success!";
 	mes "I don't know if we can do anything else,";
 	if (getarg(2) == 1)
 		mes "but this time we have created "+getarg(1);
-	else 
+	else
 		mes "but this time we have created";
 	mes "^FF0000"+getitemname(getarg(0))+"^000000 !";
 	next;
@@ -556,7 +554,7 @@ S_DelItems:
 	close;
 }
 	
-yuno_in01,100,153,7	script	Bajin	47,0,0,{
+yuno_in01,100,153,7	script	Bajin	1_M_01,0,0,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -659,14 +657,14 @@ S_DelItems:
 	delitem 7043,5; //Fine_Sand
 	delitem 757,3; //Elunium_Stone
 	delitem 756,3; //Oridecon_Stone
-	set zeny,zeny-2000;
+	Zeny -= 2000;
 	getitem getarg(0),getarg(1); //Gold
 	mes "[Bajin]";
 	mes "AHHH, it is a success!";
 	mes "I don't know if we can do anything else,";
 	if (getarg(2) == 1)
 		mes "but this time we have created "+getarg(1);
-	else 
+	else
 		mes "but this time we have created";
 	mes "^FF0000"+getitemname(getarg(0))+"^000000 !";
 	next;
@@ -684,9 +682,9 @@ S_DelItems:
 	close;
 }
 
-// Doomed Swords - Juno Portion
-//============================================================ 
-yuno,157,87,4	script	A Citizen of Juno#juno	102,{
+// Doomed Swords - Juno Portion :: matnani_yuno
+//============================================================
+yuno,157,87,4	script	A Citizen of Juno#juno	8_F,{
 	mes "[Shalima]";
 	mes "When you go north from Al De Baran, you will arrive at 'Elmeth Plateau,' a place covered with molten rock.";
 	next;
@@ -721,7 +719,7 @@ yuno,157,87,4	script	A Citizen of Juno#juno	102,{
 	}
 }
 
-yuno,261,99,4	script	Sage Yklah#juno	735,{
+yuno,261,99,4	script	Sage Yklah#juno	4_M_JOB_WIZARD,{
 	if (dmdswrd_Q == 23 || dmdswrd_Q == 24 || dmdswrd_Q == 25) {
 		switch(dmdswrd_Q) {
 		case 23:
@@ -922,7 +920,7 @@ yuno,261,99,4	script	Sage Yklah#juno	735,{
 	}
 }
 	
-yuno,305,207,4	script	Sage Syklah#juno	735,{
+yuno,305,207,4	script	Sage Syklah#juno	4_M_JOB_WIZARD,{
 	if (dmdswrd_Q == 25 || dmdswrd_Q == 26 || dmdswrd_Q == 27) {
 		switch(dmdswrd_Q) {
 		case 25:
@@ -1045,7 +1043,7 @@ yuno,305,207,4	script	Sage Syklah#juno	735,{
 	}
 }
 	
-yuno,213,298,4	script	Sage Esklah#juno	735,{
+yuno,213,298,4	script	Sage Esklah#juno	4_M_JOB_WIZARD,{
 	if (dmdswrd_Q == 27 || dmdswrd_Q == 28 || dmdswrd_Q == 29 || dmdswrd_Q == 30) {
 		switch(dmdswrd_Q) {
 		case 27:
@@ -1096,7 +1094,7 @@ yuno,213,298,4	script	Sage Esklah#juno	735,{
 			mes "^3355FF5 Decayed Nail^000000.";
 			next;
 			mes "[Esklah]";
-			mes "For someone seeking the doomed sword, this should be a relatively simple task. Now go, and bring me what I have asked."			;
+			mes "For someone seeking the doomed sword, this should be a relatively simple task. Now go, and bring me what I have asked.";
 			set dmdswrd_Q,28;
 			close;
 		case 28:
@@ -1202,7 +1200,7 @@ yuno,213,298,4	script	Sage Esklah#juno	735,{
 	}
 }
 	
-mjolnir_02,170,193,4	script	Muriniel's Cottage#juno	111,{
+mjolnir_02,170,193,4	script	Muriniel's Cottage#juno	HIDDEN_NPC,{
 	if (dmdswrd_Q == 30 || dmdswrd_Q == 31) {
 		switch(dmdswrd_Q) {
 		case 30:
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 45e80aaf0..a519a5e62 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
-//= Brisingamen seal unlocking NPCs.
-//===== By: ================================================== 
+//= God Item Quest - Brisingamen Seal
+//===== By: ==================================================
 //= SinSloth
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.7
+//===== Description: =========================================
 //= Quest for breaking the seal of Brisingamen.
 //===== Additional Comments: =================================
 //= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
@@ -15,12 +15,14 @@
 //= 1.3a Changed some " + name +" to strcharinfo(0) [Samuray22]
 //= 1.4 Replaced effect numerics with constants. [Samuray22]
 //= 1.5 Corrected serverwide announcement. [L0ne_W0lf]
+//= 1.6 Updated RE/Pre-RE EXP. [Euphy]
+//= 1.7 Renewal script update. [Euphy]
 //============================================================
 
-prt_fild08,175,374,3	script	Bard#brising	51,{
+prt_fild08,175,374,3	script	Bard#brising	1_M_BARD,{
 	cutin "god_nelluad01",2;
-	if (($God2 > 49) && ($God3 < 100)){
-		if (god_brising > 49){
+	if ($God2 >= $@god_check1 && $God3 < $@god_check2) {
+		if (god_brising > 49) {
 			mes "[Nelliorde]";
 			mes "Oh, I guess all is going well for you. So how has everything else been?";
 			next;
@@ -244,7 +246,7 @@ prt_fild08,175,374,3	script	Bard#brising	51,{
 				break;
 			}
 		}
-		else if((god_brising > 0) && (god_brising < 50)){
+		else if ((god_brising > 0) && (god_brising < 50)){
 			mes "[Nelliorde]";
 			mes "So, have you";
 			mes "met Mr. Kaili?";
@@ -782,7 +784,7 @@ prt_fild08,175,374,3	script	Bard#brising	51,{
 					mes "represents the";
 					mes "heart of a poet!";
 					soundeffect "bragis_poem.wav",1;
-					set Zeny,Zeny-500;
+					Zeny -= 500;
 					close2;
 				}
 				else {
@@ -800,7 +802,7 @@ prt_fild08,175,374,3	script	Bard#brising	51,{
 					mes "and energetic music, eh?";
 					mes "As you wish~";
 					soundeffect "chaos_of_eternity.wav",1;
-					set Zeny,Zeny-500;
+					Zeny -= 500;
 					close2;
 				}
 				else {
@@ -820,7 +822,7 @@ prt_fild08,175,374,3	script	Bard#brising	51,{
 					mes "well with Assassins.";
 					mes "Don't you agree?";
 					soundeffect "assassin_of_sunset.wav",1;
-					set Zeny,Zeny-500;
+					Zeny -= 500;
 					close2;
 				}
 				else {
@@ -838,12 +840,12 @@ prt_fild08,175,374,3	script	Bard#brising	51,{
 	end;
 }
 
-yuno_in04,47,113,1	script	Studying Scholar#1	749,{
+yuno_in04,47,113,1	script	Studying Scholar#1	4_M_ALCHE_B,{
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
 	}
-	if ($God3 == 100) {
+	if ($God3 == $@god_check2) {
 		mes "[Studying Scholar]";
 		mes "Hmmm...";
 		mes "The highest quality Red Potion ever...";
@@ -852,7 +854,7 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 		mes "If only I could figure a way to balance the consistency of the ground Red Herbs mixed with the water. That part is most crucial...";
 		close;
 	}
-	if ($God2 > 49) {
+	if ($God2 >= $@god_check1) {
 		if (god_brising == 50) {
 			mes "[Enrico Kaili]";
 			mes "Ah, " + strcharinfo(0) + ",";
@@ -874,40 +876,36 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 			mes "[Enrico Kaili]";
 			mes "Oh! I'm so excited! I don't know what to do first! Should I report to His Majesty or publish my findings or...";
 			next;
-			switch(select("^333333*Ahem!*^000000 My reward!")) {
-			case 1:
-				mes "[Enrico Kaili]";
-				mes "Oh, right.";
-				mes "Thank you for all the trouble you have endured for my sake. You are truly one of the best researchers I've ever met.";
-				next;
-				mes "[Enrico Kaili]";
-				mes "Then as promised...";
-				mes "I will give you something from my precious collection! Now, let me see what we have here...";
-				next;
-				mes "[Enrico Kaili]";
-				mes "Please...";
-				mes "Take this";
-				set god_brising,50;
-				getitem 616,1; // Old_Card_Album
-				getexp 60000,0;
-				next;
-				mes "[Enrico Kaili]";
-				mes "Please accept this as my way of thanking you for assisting in my";
-				mes "research. If the opportunity arises, I would like to ask you for your help once again. Now please, take care.";
-				if ($God3 < 100) set $God3,$God3 +1;
-					if ($God3 == 50) {
-						announce "The 3rd Seal of [Brisingamen] has appeared.",bc_all;
-					}
-					else if ($God3 == 100) {
-						if ($God1 == 100 && $God2 == 100 && $God3 == 100 && $God4 == 100) {
-							announce "Four seals have been released at the same time with the seal of [Brisingamen].",bc_all;
-						}
-						else {
-							announce "The 3rd seal of [Brisingamen] has been released.",bc_all;
-						}
-					}
-				}
-				close;
+			select("^333333*Ahem!*^000000 My reward!");
+			mes "[Enrico Kaili]";
+			mes "Oh, right.";
+			mes "Thank you for all the trouble you have endured for my sake. You are truly one of the best researchers I've ever met.";
+			next;
+			mes "[Enrico Kaili]";
+			mes "Then as promised...";
+			mes "I will give you something from my precious collection! Now, let me see what we have here...";
+			next;
+			mes "[Enrico Kaili]";
+			mes "Please...";
+			mes "Take this.";
+			set god_brising,50;
+			getitem 616,1; // Old_Card_Album
+			getexp (checkre(3))?60000:600000,0;
+			next;
+			mes "[Enrico Kaili]";
+			mes "Please accept this as my way of thanking you for assisting in my";
+			mes "research. If the opportunity arises, I would like to ask you for your help once again. Now please, take care.";
+			if ($God3 < $@god_check2)
+				set $God3,$God3 +1;
+			if ($God3 == $@god_check1)
+				announce "The 3rd Seal of [Brisingamen] has appeared.",bc_all;
+			else if ($God3 == $@god_check2) {
+				if ($God1 == $@god_check2 && $God2 == $@god_check2 && $God3 == $@god_check2 && $God4 == $@god_check2)
+					announce "Four seals have been released at the same time with the seal of [Brisingamen].",bc_all;
+				else
+					announce "The 3rd seal of [Brisingamen] has been released.",bc_all;
+			}
+			close;
 		}
 		else if (god_brising == 48) {
 			mes "[Enrico Kaili]";
@@ -1259,7 +1257,7 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 			mes "If she'll let you look at her records, you can probably find out where he lives. Now why don't you talk to that lady towards the left part of this room?";
 			close;
 		}
-		else if(god_brising == 2) {
+		else if (god_brising == 2) {
 			mes "[Enrico Kaili]";
 			mes "So, have you";
 			mes "considered my proposal?";
@@ -1396,8 +1394,8 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 	}
 }
 
-prt_church,113,103,1	script	Praying Man	798,{
- 	if ($God2 < 50) {
+prt_church,113,103,1	script	Praying Man	4_M_NFMAN,{
+ 	if ($God2 < $@god_check1) {
 		mes "[Praying Man]";
 		mes "Let everyone live a life";
 		mes "of happiness. Let there be";
@@ -1409,7 +1407,7 @@ prt_church,113,103,1	script	Praying Man	798,{
 		mes "month's paycheck on...";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[Praying Man]";
 		mes "Now is the time to reflect upon the past to prepare for the future.";
 		next;
@@ -1541,9 +1539,8 @@ prt_church,113,103,1	script	Praying Man	798,{
 		mes "to Lowen.";
 		close;
 	}
-	else if(god_brising == 5) {
-		set @brising_try,rand(1,4);
-		if(@brising_try == 1) {
+	else if (god_brising == 5) {
+		if (rand(1,4) == 1) {
 			mes "[Hermite Charles]";
 			mes "You're still here.";
 			mes "Does that mean you";
@@ -2070,8 +2067,7 @@ prt_church,113,103,1	script	Praying Man	798,{
 				close;
 			}
 		}
-	} 
-	else {
+	} else {
 		mes "[Sad-looking Man]";
 		mes "...";
 		mes "^333333*Sob...*";
@@ -2083,14 +2079,14 @@ prt_church,113,103,1	script	Praying Man	798,{
 	}
 }
 
-prt_castle,80,52,0	script	Personnel Record#book1	111,{
-	if ($God2 < 50) {
+prt_castle,80,52,0	script	Personnel Record#book1	HIDDEN_NPC,{
+	if ($God2 < $@god_check1) {
 		mes "[Librarian]";
 		mes "What are you doing?";
 		mes "Don't touch anything!";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[Librarian]";
 		mes "What are you doing?";
 		mes "Don't touch anything!";
@@ -2266,14 +2262,14 @@ prt_castle,80,52,0	script	Personnel Record#book1	111,{
 }
 
 //-----------librarian----------------------------------------------------------
-prt_castle,84,51,5	script	Librarian#2	105,{
-	if ($God2 < 50) {
+prt_castle,84,51,5	script	Librarian#2	8W_SOLDIER,{
+	if ($God2 < $@god_check1) {
 		mes "[Librarian]";
 		mes "What are you doing here?";
 		mes "Don't touch anything!";
 		close;
 	}
- 	if ($God3 > 99) {
+ 	if ($God3 >= $@god_check2) {
 		mes "[Librarian]";
 		mes "What are you doing here?";
 		mes "Don't touch anything!";
@@ -2440,8 +2436,8 @@ prt_castle,84,51,5	script	Librarian#2	105,{
 
 }
 
-prontera,260,354,4	script	Woman#Rosa Ellenen	101,{
-	if ($God2 < 50){ 
+prontera,260,354,4	script	Woman#Rosa Ellenen	4W_F_01,{
+	if ($God2 < $@god_check1){
 		mes "[Woman]";
 		mes "Hm?";
 		mes "What brings";
@@ -2451,7 +2447,7 @@ prontera,260,354,4	script	Woman#Rosa Ellenen	101,{
 		mes "take a walk.";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[Woman]";
 		mes "Hm?";
 		mes "What brings";
@@ -2461,7 +2457,7 @@ prontera,260,354,4	script	Woman#Rosa Ellenen	101,{
 		mes "take a walk.";
 		close;
 	}
-	if(god_brising > 33) {
+	if (god_brising > 33) {
 		mes "[Rosa Ellenen]";
 		mes "Are you the one";
 		mes "who visited me before?";
@@ -2566,8 +2562,8 @@ prontera,260,354,4	script	Woman#Rosa Ellenen	101,{
 
 }
 
-prontera,262,353,0	script	Gravestone	111,{
-	if($God2 > 49) {
+prontera,262,353,0	script	Gravestone	HIDDEN_NPC,{
+	if ($God2 > $@god_check1) {
 		if (god_brising > 33) {
 			mes "Lowen Ellenen";
 			mes " ";
@@ -2583,7 +2579,7 @@ prontera,262,353,0	script	Gravestone	111,{
 			close;
 		}
 	}
-	else	{
+	else {
 		mes "^3355FFIt's just an";
 		mes "ordinary gravestone.^000000";
 		next;
@@ -2593,13 +2589,13 @@ prontera,262,353,0	script	Gravestone	111,{
 	}
 }
  
-gef_dun01,89,192,0	script	#lowentrace	111,3,3,{
-	if($God2 < 50) {
+gef_dun01,89,192,0	script	#lowentrace	HIDDEN_NPC,3,3,{
+	if ($God2 < $@god_check1) {
 		mes "^3355FFIt's just an old,";
 		mes "dry piece of wood.^000000";
 		close;
 	}
-	if($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFIt's just an old,";
 		mes "dry piece of wood.^000000";
 		close;
@@ -2611,7 +2607,7 @@ gef_dun01,89,192,0	script	#lowentrace	111,3,3,{
 		switch(select("Yes:No")) {
 		case 1:
 			input @lowenstring$;
-			if(@lowenstring$ == "Lowen") {
+			if (@lowenstring$ == "Lowen") {
 				if (god_brising == 30) {
 					mes "[Lowen Ellenen]";
 					mes "^6E7B8B...Y-you're...";
@@ -2652,8 +2648,7 @@ gef_dun01,89,192,0	script	#lowentrace	111,3,3,{
 					mes "This place is too dangerous.^000000";
 					close;
 				}
-			} 
-			else {
+			} else {
 				close;
 			}
 		case 2:
@@ -2710,21 +2705,19 @@ gef_dun01,89,192,0	script	#lowentrace	111,3,3,{
 	}
 
 OnTouch:
-	if((god_brising > 9) && (god_brising < 34)) {
+	if ((god_brising > 9) && (god_brising < 34)) {
 		emotion e_gasp;
 	}
 	end;
 }
 
-gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
-
-	if ($God2 < 50) {
+gef_dun01,203,48,0	script	#lowentrace1	HIDDEN_NPC,3,3,{
+	if ($God2 < $@god_check1) {
 		mes "^3355FFIt's just an old,";
 		mes "dry piece of wood.^000000";
 		close;
 	}
-
-	if( $God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFIt's just an old,";
 		mes "dry piece of wood.^000000";
 		close;
@@ -2736,8 +2729,8 @@ gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
 		switch(select("Yes:No")) {
 		case 1:
 			input @lowenstring$;
-				if(@lowenstring$ == "Lowen") {
-					if(god_brising == 31) {
+				if (@lowenstring$ == "Lowen") {
+					if (god_brising == 31) {
 					mes "[Lowen Ellenen]";
 					mes "^6E7B8BYou came back!";
 					mes "You'll be with me";
@@ -2758,7 +2751,7 @@ gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
 						mes "care of yourself...^000000";
 						close;
 					}
-				} else if(god_brising == 30) {
+				} else if (god_brising == 30) {
 					mes "[Lowen Ellenen]";
 					mes "^6E7B8BAh yes. This is it.";
 					mes "You look very curious about me, yet I am amazed that you can hear my voice. Please let me tell you an old story.^000000";
@@ -2844,13 +2837,13 @@ gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
 	}
 
 OnTouch:
-	if((god_brising > 9) && (god_brising < 34)) {
+	if ((god_brising > 9) && (god_brising < 34)) {
 		emotion e_gasp;
 	}
 	end;
 }
 
-que_god02,48,55,3	script	Lowen Ellenen	745,{
+que_god02,48,55,3	script	Lowen Ellenen	4_F_CRU,{
 	if (god_brising == 30) {
 		mes "[Lowen Ellenen]";
 		mes "Can you see me now?";
@@ -2958,7 +2951,7 @@ que_god02,48,55,3	script	Lowen Ellenen	745,{
 	}
 }
 
-que_god02,54,64,4	script	Soldier#1_brising	105,1,1,{
+que_god02,54,64,4	script	Soldier#1_brising	8W_SOLDIER,1,1,{
  	if (god_brising == 31) {
 		mes "[Soldier]";
 		mes "Have you volunteered for monster subjugation? Would you like to start the mission now?";
@@ -3003,7 +2996,7 @@ OnTouch:
 	end;
 }
 
-que_god02,55,64,4	script	Soldier#2_brising	105,1,1,{
+que_god02,55,64,4	script	Soldier#2_brising	8W_SOLDIER,1,1,{
 	mes "[Soldier]";
 	mes "Please back away.";
 	mes "You are not permitted";
@@ -3132,7 +3125,7 @@ OnSummon:
 
 OnMobDeath:
 	set .brisinmobdead,.brisinmobdead -1;
-	if(.brisinmobdead > 0) end;
+	if (.brisinmobdead > 0) end;
 	set god_brising,31;
 	hideoffnpc "Valkyrie#1";
 	end;
@@ -3153,31 +3146,14 @@ OnReset:
 	end;
 }
 
-que_god02,173,58,4	script	#doppelganger1	739,{
-	end;
-}
-
-que_god02,175,55,4	script	#doppelganger2	739,{
-	end;
-}
+que_god02,173,58,4	script	#doppelganger1	8_DOPPEL,{ end; }
+que_god02,175,55,4	script	#doppelganger2	8_DOPPEL,{ end; }
+que_god02,175,54,1	script	#lowen	4_F_CRU,{ end; }
+que_god02,178,49,1	script	#knight1	4_M_CRU,{ end; }
+que_god02,168,53,7	script	#knight2	4_M_JOB_KNIGHT2,{ end; }
+que_god02,167,58,4	script	#knight3	4_M_CRU_OLD,{ end; }
 
-que_god02,175,54,1	script	#lowen	745,{
-	end;
-}
-
-que_god02,178,49,1	script	#knight1	751,{
-	end;
-}
-
-que_god02,168,53,7	script	#knight2	734,{
-	end;
-}
-
-que_god02,167,58,4	script	#knight3	752,{
-	end;
-}
-
-que_god02,174,49,0	script	#lowenone	139,0,0,{
+que_god02,174,49,0	script	#lowenone	HIDDEN_WARP_NPC,0,0,{
 
 OnTouch:
 	donpcevent "brisinsold2::OnSold2On";
@@ -3260,9 +3236,9 @@ OnTouch:
 	end;
 }
 
-que_god02,124,59,7	script	#hermite	798,{ end; }
+que_god02,124,59,7	script	#hermite	4_M_NFMAN,{ end; }
  
-que_god02,120,52,0	script	#monologue	139,0,0,{
+que_god02,120,52,0	script	#monologue	HIDDEN_WARP_NPC,0,0,{
 
 OnTouch:
 	mes "[" + strcharinfo(0) + "]";
@@ -3306,7 +3282,7 @@ OnTouch:
 
 }
 
-que_god02,21,127,3	script	Lowen Ellenen#2	745,{
+que_god02,21,127,3	script	Lowen Ellenen#2	4_F_CRU,{
 	mes "[Lowen Ellenen]";
 	mes "I was a fool.";
 	mes "Now I remember Hermite. He must have been the one who rescued me. But when I came to my senses, no one was there.";
@@ -3357,7 +3333,7 @@ que_god02,21,127,3	script	Lowen Ellenen#2	745,{
 	end;
 }
 
-que_god02,178,127,3	script	Valkyrie#1	811,{
+que_god02,178,127,3	script	Valkyrie#1	4_F_VALKYRIE,{
 
 	if (god_brising == 31) {
 		mes "[Valkyrie]";
@@ -3530,14 +3506,14 @@ que_god02,178,127,3	script	Valkyrie#1	811,{
 	}
 }
 
-xmas,38,105,0	script	#brisindwarf1	111,3,3,{
-	if ($God2 < 50) {
+xmas,38,105,0	script	#brisindwarf1	HIDDEN_NPC,3,3,{
+	if ($God2 < $@god_check1) {
 		mes "^3355FFA lot of snow";
 		mes "is heavily piled";
 		mes "here on the ground.^000000";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFA lot of snow";
 		mes "is heavily piled";
 		mes "here on the ground.^000000";
@@ -3698,13 +3674,13 @@ xmas,38,105,0	script	#brisindwarf1	111,3,3,{
 	}
 
 OnTouch:
-	if(god_brising > 39) {
+	if (god_brising > 39) {
 		emotion e_gasp,1;
 	}
 	end;
 }
 
-xmas,36,103,4	script	Alfrik#1	826,{
+xmas,36,103,4	script	Alfrik#1	4_M_DWARF,{
 	if (god_brising == 49) {
 		mes "[Alfrik]";
 		mes "I've got nothing";
@@ -3997,13 +3973,13 @@ OnInit:
 	end;
 }
 
-prt_fild02,185,269,0	script	#brisindwarf2	111,3,3,{
-	if ($God2 < 50) {
+prt_fild02,185,269,0	script	#brisindwarf2	HIDDEN_NPC,3,3,{
+	if ($God2 < $@god_check1) {
 		mes "^3355FFIt's just an";
 		mes "ordinary rock.^000000";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFIt's just an";
 		mes "ordinary rock.^000000";
 		close;
@@ -4165,13 +4141,13 @@ prt_fild02,185,269,0	script	#brisindwarf2	111,3,3,{
 	}
 
 OnTouch:
-	if(god_brising > 41) {
+	if (god_brising > 41) {
 		emotion e_gasp,1;
 	}
 	end;
 }
 
-prt_fild02,185,270,3	script	Dvalin#1	826,{
+prt_fild02,185,270,3	script	Dvalin#1	4_M_DWARF,{
 	if (god_brising > 43) {
 		mes "[Dvalin]";
 		mes "A human?";
@@ -4190,7 +4166,7 @@ prt_fild02,185,270,3	script	Dvalin#1	826,{
 		hideonnpc "Dvalin#1";
 		end;
 	}
-	else if(god_brising == 42) {
+	else if (god_brising == 42) {
 		mes "[Dvalin]";
 		mes "Wah, it's not Alfrik?";
 		mes "Who are you to wake Dvalin?";
@@ -4275,7 +4251,7 @@ prt_fild02,185,270,3	script	Dvalin#1	826,{
 			end;
 		}
 	}
-	else if(god_brising == 43) {
+	else if (god_brising == 43) {
 		mes "[Dvalin]";
 		mes "Why do you keep calling me? I did everything I can do for you. I even gave you the key to the question.";
 		next;
@@ -4294,12 +4270,12 @@ OnInit:
 
 }
 
-mjolnir_09,85,129,0	script	#brisindwarf3	111,3,3,{
-	if ($God2 < 50) {
+mjolnir_09,85,129,0	script	#brisindwarf3	HIDDEN_NPC,3,3,{
+	if ($God2 < $@god_check1) {
 		mes "^3355FFThe sight of this bubbling stream refreshes you just by looking at it.^000000";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "^3355FFThe sight of this bubbling stream refreshes you just by looking at it.^000000";
 		close;
 	}
@@ -4359,14 +4335,14 @@ mjolnir_09,85,129,0	script	#brisindwarf3	111,3,3,{
 	}
 
 OnTouch:
-	if(god_brising > 42) {
+	if (god_brising > 42) {
 		emotion e_gasp,1;
 	}
 	end;
 }
 
-mjolnir_09,87,129,3	script	Berling#1	826,{
-	if(god_brising > 44) {
+mjolnir_09,87,129,3	script	Berling#1	4_M_DWARF,{
+	if (god_brising > 44) {
 		mes "[Berling]";
 		mes "You're the one that's awakened us? Hahaha, perhaps that's a sign we may see Freya again! Hahahaha!";
 		next;
@@ -4376,7 +4352,7 @@ mjolnir_09,87,129,3	script	Berling#1	826,{
 		hideonnpc "OnBerling#1";
 		end;
 	}
-	else if(god_brising == 43) {
+	else if (god_brising == 43) {
 		mes "[Berling]";
 		mes "What the...?";
 		mes "It's a human?!";
@@ -4481,7 +4457,7 @@ mjolnir_09,87,129,3	script	Berling#1	826,{
 			end;
 		}
 	}
-	else if(god_brising == 44) {
+	else if (god_brising == 44) {
 		mes "[Berling]";
 		mes "Did you already forget the lyrics? Let me tell them to you again, so don't forget this time.";
 		next;
@@ -4509,13 +4485,13 @@ OnInit:
 	end;
 }
 
-mjo_dun02,126,36,0	script	#brisindwarf4	111,3,3,{
-	if ($God2 < 50) {
+mjo_dun02,126,36,0	script	#brisindwarf4	HIDDEN_NPC,3,3,{
+	if ($God2 < $@god_check1) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Bah, no way out.";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Bah, no way out.";
 		close;
@@ -4533,35 +4509,35 @@ mjo_dun02,126,36,0	script	#brisindwarf4	111,3,3,{
 		mes "What was the first line...?";
 		next;
 		input @dwarfsong1$;
-		if(@dwarfsong1$ == "No jewel in the world can compare.") set @point,@point +1;
-		mes	"[" + strcharinfo(0) + "]";
+		if (@dwarfsong1$ == "No jewel in the world can compare.") set @point,@point +1;
+		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong1$ + "";
 		mes "Then...ummm..";
 		mes "The second line?";
 		next;
 		input @dwarfsong2$;
-		if(@dwarfsong2$ == "Our masterpiece made from love.") set @point,@point +1;
+		if (@dwarfsong2$ == "Our masterpiece made from love.") set @point,@point +1;
 		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong2$ + "";
 		mes "Now, what was";
 		mes "the third line...?";
 		next;
 		input @dwarfsong3$;
-		if(@dwarfsong3$ == "She wanted the dazzling necklace.") set @point,@point +1;
+		if (@dwarfsong3$ == "She wanted the dazzling necklace.") set @point,@point +1;
 		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong3$ + "";
 		mes "Now, the fourth";
 		mes "line after that...";
 		next;
 		input @dwarfsong4$;
-		if(@dwarfsong4$ == "We wanted the goddess of beauty.") set @point,@point +1;
+		if (@dwarfsong4$ == "We wanted the goddess of beauty.") set @point,@point +1;
 		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong4$ + "";
 		mes "Alright, now";
 		mes "for the last line...";
 		next;
 		input @dwarfsong5$;
-		if(@dwarfsong5$ == "Our happiest times were with her.") set @point,@point +1;
+		if (@dwarfsong5$ == "Our happiest times were with her.") set @point,@point +1;
 		mes "[" + strcharinfo(0) + "]";
 		mes " " + @dwarfsong5$ + "";
 		mes "Alright, let's give it a try.";
@@ -4599,12 +4575,12 @@ mjo_dun02,126,36,0	script	#brisindwarf4	111,3,3,{
 	}
 
 OnTouch:
-	if ($God2 < 50) {
+	if ($God2 < $@god_check1) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Beh, no way out.";
 		close;
 	}
-	if ($God3 > 99) {
+	if ($God3 >= $@god_check2) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Beh, no way out.";
 		close;
@@ -4667,7 +4643,7 @@ OnTimer301000:
 	end;
 }
 
-mjo_dun02,126,34,1	script	Grer#1	826,{
+mjo_dun02,126,34,1	script	Grer#1	4_M_DWARF,{
 	if (god_brising > 47) {
 		mes "[Grer]";
 		mes "As we promised,";
@@ -4676,7 +4652,7 @@ mjo_dun02,126,34,1	script	Grer#1	826,{
 		hideonnpc "Grer#1";
 		end;
 	}
-	else if(god_brising == 46) {
+	else if (god_brising == 46) {
 		mes "[Grer]";
 		mes "My name is Grer.";
 		mes "I should have been";
diff --git a/npc/quests/seals/god_global.txt b/npc/quests/seals/god_global.txt
index 817255060..c9daa613e 100644
--- a/npc/quests/seals/god_global.txt
+++ b/npc/quests/seals/god_global.txt
@@ -1,113 +1,44 @@
 //===== Hercules Script ======================================
-//= Variable Management NPC for the god item quest
-//===== By: ================================================== 
+//= God Item Quest - Variable Management
+//===== By: ==================================================
 //= MasterOfMuppets
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= Use this NPC if the seals quest variables get messed up.
 //===== Additional Comments: =================================
 //= 1.0 First version. [MasterOfMuppets]
 //= 1.1 Updated several aspects of the script. [L0ne_W0lf]
+//= 1.2 Renewal script update. [Euphy]
+//=    Added GM management function.
 //============================================================
 
-sec_in02,15,170,0	script	Golbal var	817,{
-	//mes "[Check]";
-	//mes "Please enter the password.";
-	//next;
-	//set .@check,68392411;
-	//dlgwrite 0 10000000
-	//if (check == input){
-	if (getgmlevel() > 98) {
+sec_in02,15,170,0	script	Golbal var	4_F_CHNDRESS3,{
+	callfunc "F_GM_NPC";
+	mes "[Check]";
+	mes "Please enter the password.";
+	next;
+	if (callfunc("F_GM_NPC",68392411,0) == 1) {
 		mes "[Check]";
 		mes "Please choose a menu.";
 		next;
-		switch(select("Now:No.1:No.2:No.3:No.4:Reset")) {
+		switch(select("Now:No.1:No.2:No.3:No.4:Reset:god_sl_1:god_eremes:god_brising:god_mjo_0:god_mjo_1:god_mjo_2:god_mjo_3:god_mjo_4")) {
 		case 1:
 			mes "^0000FF$God1^000000 = ^FF0000" + $God1 + "^000000.";
 			mes "^0000FF$God2^000000 = ^FF0000" + $God2 + "^000000.";
 			mes "^0000FF$God3^000000 = ^FF0000" + $God3 + "^000000.";
 			mes "^0000FF$God4^000000 = ^FF0000" + $God4 + "^000000.";
 			close;
-		case 2:
-			input .@input,0,100;
-			mes "[Check]";
-			mes "Would you like to change to "+.@input+"?";
-			next;
-			if (select("Yes:No") == 1) {
-				mes "[Check]";
-				mes "The command "+.@input+" has been confirmed.";
-				next;
-				set $God1,.@input;
-				mes "$God1 "+.@input+"";
-				close;
-			}
-			else {
-				mes "[Check]";
-				mes "The command has been canceled.";
-				close;
-			}
-		case 3:
-			input .@input,0,100;
-			mes "[Check]";
-			mes "Would you like to change to "+.@input+"?";
-			next;
-			if (select("Yes:No") == 1) {
-				mes "[Check]";
-				mes "The command "+.@input+" has been confirmed.";
-				next;
-				set $God2,.@input;
-				mes "$God2 "+.@input+"";
-				close;
-			}
-			else {
-				mes "[Check]";
-				mes "The command has been canceled.";
-				close;
-			}
-		case 4:
-			input .@input,0,100;
-			mes "[Check]";
-			mes "Would you like to change to "+.@input+"?";
-			next;
-			if (select("Yes:No") == 1) {
-				mes "[Check]";
-				mes "The command "+.@input+" has been confirmed.";
-				next;
-				set $God3,.@input;
-				mes "$God3 "+.@input+"";
-				close;
-			}
-			else {
-				mes "[Check]";
-				mes "The command has been canceled.";
-				close;
-			}
-		case 5:
-			input .@input,0,100;
-			mes "[Check]";
-			mes "Would you like to change to "+.@input+"?";
-			next;
-			if (select("Yes:No") == 1) {
-				mes "[Check]";
-				mes "The command "+.@input+" has been confirmed.";
-				next;
-				set $God4,.@input;
-				mes "$God4 "+.@input+"";
-				close;
-			}
-			else {
-				mes "[Check]";
-				mes "The command has been canceled.";
-				close;
-			}
+		case 2: callsub L_Number,"$God1"; break;
+		case 3: callsub L_Number,"$God2"; break;
+		case 4: callsub L_Number,"$God3"; break;
+		case 5: callsub L_Number,"$God4"; break;
 		case 6:
 			mes "[Check]";
 			mes "Are you really sure that you want to reset the entire list of God Globalvar?";
+			mes "Please enter the password.";
 			next;
-			if (select("Yes:No") == 1) {
+			if (callfunc("F_GM_NPC",68392411,0) == 1) {
 				mes "[Check]";
 				mes "Now, the entire list of God Globalvar is being reset.";
 				next;
@@ -120,18 +51,61 @@ sec_in02,15,170,0	script	Golbal var	817,{
 				mes "^0000FF$God3^000000 = ^FF0000" + $God3 + "^000000.";
 				mes "^0000FF$God4^000000 = ^FF0000" + $God4 + "^000000.";
 				close;
-			}
-			else {
+			} else {
 				mes "[Check]";
 				mes "The command has been canceled.";
 				close;
 			}
+		case 7: callsub L_Var,"god_sl_1"; break;
+		case 8: callsub L_Var,"god_eremes"; break;
+		case 9: callsub L_Var,"god_brising"; break;
+		case 10: callsub L_Var,"god_mjo_0"; break;
+		case 11: callsub L_Var,"god_mjo_1"; break;
+		case 12: callsub L_Var,"god_mjo_2"; break;
+		case 13: callsub L_Var,"god_mjo_3"; break;
+		case 14: callsub L_Var,"god_mjo_4"; break;
 		}
+	} else {
+		mes "[Check]";
+		mes "Incorrect password.";
+		close;
 	}
-	else {
+
+L_Number:
+	input .@input,0,$@god_check2;
+	mes "[Check]";
+	mes "Would you like to change to "+.@input+"?";
+	mes "Please enter the password.";
+	next;
+	if (callfunc("F_GM_NPC",68392411,0) == 1) {
 		mes "[Check]";
-		//mes "Incorrect password.";
-		mes "You cannot access this NPC.";
+		mes "The command "+.@input+" has been confirmed.";
+		next;
+		setd getarg(0),.@input;
+		mes getarg(0)+" "+.@input;
+		close;
+	} else {
+		mes "[Check]";
+		mes "The command has been canceled.";
 		close;
 	}
+
+L_Var:
+	input .@input;
+	setd getarg(0),.@input;
+	next;
+	mes "[Check]";
+	mes "Done.";
+	close;
+
+OnInit:
+	// Seals roll at 25/50 in Renewal and 50/100 in Pre-Renewal.
+	if (checkre(0)) {
+		set $@god_check1,25;
+		set $@god_check2,50;
+	} else {
+		set $@god_check1,50;
+		set $@god_check2,100;
+	}
+	end;
 }
diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt
index e0e5845d5..16494cd5f 100644
--- a/npc/quests/seals/god_weapon_creation.txt
+++ b/npc/quests/seals/god_weapon_creation.txt
@@ -1,21 +1,20 @@
 //===== Hercules Script ======================================
-//= God items creation NPCs
+//= God Item Quest - Item Creation
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.3
 //===== Description: =========================================
-//= NPC that creates God Items
+//= Craft god items after the four seals are broken.
 //===== Additional Comments: =================================
 //= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
 //= 1.1 Updated several aspects of the script. [L0ne_W0lf]
 //= 1.2 Corrected several incorrect item IDs. [L0ne_W0lf]
+//= 1.3 Renewal script update. [Euphy]
+//=     Added GM management function.
 //============================================================
 
-gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
-	set .@GID,getcharid(2);
+gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	4_M_DWARF,{
 	mes "[Dwarf Grunburti]";
 	mes "A human?!";
 	mes "This land is full";
@@ -69,8 +68,9 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 		mes "At least I was fortunate enough to find this cave. We Dwarves are most cozy living underground, after all.";
 		close;
 	case 3:
-		if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
-			if (($God1 > 49) && ($God2 > 49) && ($God3 > 49) && ($God4 > 49) && (strcharinfo(0) == getguildmaster(.@GID))) {
+		set .@GID,getcharid(2);
+		if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
+			if (($God1 >= $@god_check1) && ($God2 >= $@god_check1) && ($God3 >= $@god_check1) && ($God4 >= $@god_check1) && (strcharinfo(0) == getguildmaster(.@GID))) {
 				mes "[Dwarf Grunburti]";
 				mes "Hmm...";
 				mes "I'll need some things to make a weapon for you. What exactly were you interested in having?";
@@ -138,7 +138,7 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 					mes "But I can't even create a replica of Mjolnir if the seals are still in place. Until they're released, you'll just have to wait. Bwahaha!";
 					close;
 				}
-			} 
+			}
 			mes "[Dwarf Grunburti]";
 			mes "We Dwarves have too much pride to demonstrate our skills in front of a lowly human!";
 			next;
@@ -176,7 +176,7 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 			mes "^0000FFBrisingamen^000000!";
 			next;
 		}
-		else if ((countitem(7058) > 0) && (countitem(969) > 19) && (countitem(726) > 9) && (countitem(984) > 9) && (countitem(2627) > 0)){ //Gullraifnir Gold Blue_Jewel Oridecon Belt 
+		else if ((countitem(7058) > 0) && (countitem(969) > 19) && (countitem(726) > 9) && (countitem(984) > 9) && (countitem(2627) > 0)){ //Gullraifnir Gold Blue_Jewel Oridecon Belt
 			mes "[Dwarf Grunburti]";
 			mes "Hmm...";
 			mes "I guess you";
@@ -340,12 +340,11 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 		close;
 	}
 }
+gld_dun02,85,84,0	duplicate(GodDwarf)	Grunburti#2	4_M_DWARF
+gld_dun03,92,105,0	duplicate(GodDwarf)	Grunburti#3	4_M_DWARF
+gld_dun04,268,230,0	duplicate(GodDwarf)	Grunburti#4	4_M_DWARF
 
-gld_dun02,85,84,0	duplicate(GodDwarf)	Grunburti#2	826
-gld_dun03,92,105,0	duplicate(GodDwarf)	Grunburti#3	826
-gld_dun04,268,230,0	duplicate(GodDwarf)	Grunburti#4	826
-
-que_god01,215,127,0	script	#god_hopewarp1	111,{
+que_god01,215,127,0	script	#god_hopewarp1	HIDDEN_NPC,{
 	end;
 
 OnInit:
@@ -364,7 +363,7 @@ OnReset:
 	end;
 }
 
-que_god01,214,128,0	script	 #que_godnpc1::GodEntrance	111,{
+que_god01,214,128,0	script	 #que_godnpc1::GodEntrance	HIDDEN_NPC,{
 	mes "[Entrance Notice]";
 	mes "Only the most";
 	mes "worthy of humans";
@@ -372,11 +371,11 @@ que_god01,214,128,0	script	 #que_godnpc1::GodEntrance	111,{
 	mes "power of the gods.";
 	close;
 }
-que_god01,215,128,0	duplicate(GodEntrance)	 #que_godnpc2	111
-que_god01,213,128,0	duplicate(GodEntrance)	 #que_godnpc3	111
+que_god01,215,128,0	duplicate(GodEntrance)	 #que_godnpc2	HIDDEN_NPC
+que_god01,213,128,0	duplicate(GodEntrance)	 #que_godnpc3	HIDDEN_NPC
 
-que_god01,154,112,4	script	Grunburti#god	826,{
-	if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+que_god01,154,112,4	script	Grunburti#god	4_M_DWARF,{
+	if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 		mes "[Dwarf Grunburti]";
 		mes "One of the godly";
 		mes "items has been created,";
@@ -458,12 +457,12 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 		next;
 		switch(select("Make Brisingamen.:Cancel.")) {
 		case 1:
-			if ((countitem(7073) > 3) && (countitem(7077) > 3) && (countitem(7088) > 2) && (countitem(7090) > 2) && (countitem(7092) > 2) && (countitem(726) > 1) && (countitem(722) > 2) && (countitem(727) > 9) && (countitem(724) > 4) && (countitem(969) > 19) && (countitem(2603) > 0)){ //Jewel_Of_Prayer Silver_Fancy Crystal_Of_Snow Slilince_Wave Air_Stream Blue_Jewel Scarlet_Jewel White_Jewel Cardinal_Jewel_ Gold Necklace 
+			if ((countitem(7073) > 3) && (countitem(7077) > 3) && (countitem(7088) > 2) && (countitem(7090) > 2) && (countitem(7092) > 2) && (countitem(726) > 1) && (countitem(722) > 2) && (countitem(727) > 9) && (countitem(724) > 4) && (countitem(969) > 19) && (countitem(2603) > 0)){ //Jewel_Of_Prayer Silver_Fancy Crystal_Of_Snow Slilince_Wave Air_Stream Blue_Jewel Scarlet_Jewel White_Jewel Cardinal_Jewel_ Gold Necklace
 				mes "[Dwarf Grunburti]";
 				mes "Never in my wildest";
 				mes "imaginings have I thought that I'd be crafting this masterpiece for a mere human. Give me a moment.";
 				next;
-				if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+				if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 					mes "[Dwarf Grunburti]";
 					mes "But...";
 					mes "The seals";
@@ -543,7 +542,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				mes "I'd never believe that";
 				mes "something so powerful and dangerous as Megingjard would end up in the hands of a human...";
 				next;
-				if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+				if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 					mes "[Dwarf Grunburti]";
 					mes "But...";
 					mes "The seals";
@@ -630,7 +629,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				mes "used by a human.";
 				mes "Give me a moment...";
 				next;
-				if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+				if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 					mes "[Dwarf Grunburti]";
 					mes "But...";
 					mes "The seals";
@@ -718,7 +717,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				mes "or you will regret it.";
 				mes "Mark my words...";
 				next;
-				if (($God1 < 100) || ($God2 < 100) || ($God3 < 100) || ($God4 < 100)){
+				if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
 					mes "[Dwarf Grunburti]";
 					mes "But...";
 					mes "The seals";
@@ -787,39 +786,60 @@ OnTimer610000:
 	end;
 
 OnTimer612000:
-	areawarp "que_god01",154,67,4,7,"prontera",156,324;
-	areawarp "que_god01",154,82,4,7,"prontera",156,324;
-	areawarp "que_god01",145,99,9,9,"prontera",156,324;
-	areawarp "que_god01",164,99,9,9,"prontera",156,324;
-	areawarp "que_god01",145,118,9,9,"prontera",156,324;
-	areawarp "que_god01",164,118,9,9,"prontera",156,324;
+	donpcevent "god_wep_warpmaster::OnEnable";
 	end;
 
 OnTimer615000:
 	donpcevent "god_wep_warpmaster::OnDisable";
-	donpcevent " #god_hopewarp1::Onreset";
+	donpcevent "#god_hopewarp1::OnReset";
 	stopnpctimer;
 	end;
 }
 
-/*
-que_god01,293,3,0	script	Godly Item Quests Related#god	90,{
+que_god01,169,82,0	script	god_wep_warpmaster	-1,{
+OnEnable:
+	for(set .@i,1; .@i<=6; set .@i,.@i+1)
+		enablenpc "god_failwarp#"+.@i;
+	end;
+OnDisable:
+	for(set .@i,1; .@i<=6; set .@i,.@i+1)
+		disablenpc "god_failwarp#"+.@i;
+	end;
+}
+
+que_god01,154,67,0	script	god_failwarp#1	-1,4,7,{
+OnInit:
+	disablenpc strnpcinfo(0);
+	end;
+OnTouch:
+	warp "prontera",156,324;
+	end;
+}
+que_god01,154,82,0	duplicate(god_failwarp#1)	god_failwarp#2	-1,4,7
+que_god01,145,99,0	duplicate(god_failwarp#1)	god_failwarp#3	-1,9,9
+que_god01,164,99,0	duplicate(god_failwarp#1)	god_failwarp#4	-1,9,9
+que_god01,145,118,0	duplicate(god_failwarp#1)	god_failwarp#5	-1,9,9
+que_god01,164,118,0	duplicate(god_failwarp#1)	god_failwarp#6	-1,9,9
+
+// Original name: "Godly Item Quests Related#god"
+que_god01,293,3,0	script	Godly Item Quests#god	4_F_01,{
+	callfunc "F_GM_NPC";
 	mes "[Use in case of emergency]";
 	mes "Please enter password.";
 	mes "If you wish to cancel, please enter 0.";
 	next;
-	input .@input,0,4001;
-	if (.@input < 0 || .@input > 4000) {
+	set .@i, callfunc("F_GM_NPC",1854,0,0,4000);
+	if (.@i == -2) {
 		mes "[Use in case of emergency]";
 		mes "Password is incorrect.";
 		close;
-	}
-	else if(.@input == 0) {
+	} else if (.@i == -1) {
 		mes "[Use in case of emergency]";
 		mes "You have canceled your request.";
 		close;
-	}
-	else if(.@input == 1854) {
+	} else if (.@i == 0) {
+		close;
+	} else {
 		mes "[Use in case of emergency]";
 		mes "What services would you like to use?";
 		next;
@@ -828,12 +848,7 @@ que_god01,293,3,0	script	Godly Item Quests Related#god	90,{
 			mes "[Use in case of emergency]";
 			mes "Press the 'Next' button to turn off warps.";
 			next;
-			areawarp "que_god01",154,67,4,7,"prontera",156,324;
-			areawarp "que_god01",154,82,4,7,"prontera",156,324;
-			areawarp "que_god01",145,99,9,9,"prontera",156,324;
-			areawarp "que_god01",164,99,9,9,"prontera",156,324;
-			areawarp "que_god01",145,118,9,9,"prontera",156,324;
-			areawarp "que_god01",164,118,9,9,"prontera",156,324;
+			donpcevent "god_wep_warpmaster::OnDisable";
 			mes "[Use in case of emergency]";
 			mes "You have successfully turned off warps.";
 			close;
@@ -849,11 +864,10 @@ que_god01,293,3,0	script	Godly Item Quests Related#god	90,{
 			mes "[Use in case of emergency]";
 			mes "Please press the 'Next' button to reset the arena chat room in que_god01.";
 			next;
-			donpcevent " #god_hopewarp1::Onreset";
+			donpcevent "#god_hopewarp1::OnReset";
 			mes "[Use in case of emergency]";
 			mes "You have successfully reset the arena chat room (Laboratory Entrance 1/2).";
 			close;
 		}
 	}
 }
-*/
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index 4f210710b..4ca899621 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
-//= Megingjard seal unlocking NPCs.
-//===== By: ================================================== 
+//= God Item Quest - Megingjard Seal
+//===== By: ==================================================
 //= SinSloth
-//===== Current Version: ===================================== 
-//= 1.9
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.2
+//===== Description: =========================================
 //= Quest for breaking the seal of Megingjard.
 //===== Additional Comments: =================================
 //= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
@@ -17,9 +17,16 @@
 //= 1.7 Replaced effect numerics with constants. [Samuray22]
 //= 1.8 Corrected how exp reward is applied. [L0ne_W0lf]
 //= 1.9 Fixed some input checks and variable types. [brianluau]
+//= 2.0 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.1 Fixed minor bug with the Librarian Jekan
+//= 2.2 Renewal script update. [Euphy]
 //============================================================
 
-prt_castle,44,151,0	script	Rebarev Doug	56,{
+prt_castle,44,151,0	script	Rebarev Doug	1_M_KNIGHTMASTER,{
+	if (checkweight(1301,3) == 0) {
+		mes "- You are carrying too many items! -";
+		close;
+	}
 	cutin "god_rebeireb",2;
 	if ((countitem(7080) > 3) && (countitem(7081) > 4) && (countitem(7082) > 3) && (countitem(7084) > 2) && (countitem(7085) > 2)) {
 		mes "[Rebarev Doug]";
@@ -50,7 +57,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 			break;
 		}
 	}
-	if ($God1 < 50) {
+	if ($God1 < $@god_check1) {
 		mes "[Rebarev Doug]";
 		mes "We are Crusaders that have";
 		mes "been training in preparation";
@@ -136,9 +143,9 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 			break;
 		}
 	}
-	else if($God1 > 49 && $God2 < 100) {
-		if(BaseLevel > 59) {
-			if(god_eremes == 0) {
+	else if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (BaseLevel > 59) {
+			if (god_eremes == 0) {
 				mes "[Rebarev Doug]";
 				mes "...";
 				next;
@@ -260,8 +267,8 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 					break;
 				}
 			}
-			else if(god_eremes > 0 && god_eremes < 4) {
-				if(rand(1,10) > 6 && god_eremes == 2) {
+			else if (god_eremes > 0 && god_eremes < 4) {
+				if (rand(1,10) > 6 && god_eremes == 2) {
 					mes "[Rebarev Doug]";
 					mes "I wonder how my old";
 					mes "comrades are doing now.";
@@ -357,7 +364,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 					}
 				}
 			}
-			else if(god_eremes > 3 && god_eremes < 18) {
+			else if (god_eremes > 3 && god_eremes < 18) {
 				mes "[Rebarev Doug]";
 				mes "Huh...?";
 				mes "The librarian";
@@ -378,8 +385,8 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 				mes "Oh...";
 				mes "It might be helpful to know that we were the ^660000Crusader Third Company, Third Platoon, First Squad^000000.";
 			}
-			else if(god_eremes > 17 && god_eremes < 20) {
-				if(god_megin_1 > 0 || god_megin_2 > 0 || god_megin_3 > 0 || god_megin_4 > 0 || god_megin_5 > 0 || god_megin_6 > 0) {
+			else if (god_eremes > 17 && god_eremes < 20) {
+				if (god_megin_1 > 0 || god_megin_2 > 0 || god_megin_3 > 0 || god_megin_4 > 0 || god_megin_5 > 0 || god_megin_6 > 0) {
 					mes "[Rebarev Doug]";
 					mes "Oh...";
 					mes "So did you meet them?";
@@ -417,7 +424,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 					mes "are doing for me.";
 				}
 			}
-			else if(god_eremes > 19 && god_eremes < 23) {
+			else if (god_eremes > 19 && god_eremes < 23) {
 				mes "[Rebarev Doug]";
 				mes "Welcome back~";
 				mes "It's been a while since I've last seen you. Have you met the rest";
@@ -465,7 +472,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 					break;
 				}
 			}
-			else if(god_eremes > 22 && god_eremes < 25) {
+			else if (god_eremes > 22 && god_eremes < 25) {
 				mes "^3355FFYou confront";
 				mes "Rebarev Doug with the";
 				mes "information you learned";
@@ -495,7 +502,7 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 				mes "If at least 100 people report the same crime, then maybe he'll hold";
 				mes "a trial. But do you really want to reveal this to the public?";
 			}
-			else if(god_eremes > 23 && god_eremes < 26) {
+			else if (god_eremes > 23 && god_eremes < 26) {
 				mes "[Rebarev Doug]";
 				mes "I didn't think";
 				mes "you'd actually do it.";
@@ -529,9 +536,9 @@ prt_castle,44,151,0	script	Rebarev Doug	56,{
 	end;
 }
 
-prt_castle,48,164,0	script	Crusader#God	734,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes > 22 && god_eremes < 25) {
+prt_castle,48,164,0	script	Crusader#God	4_M_JOB_KNIGHT2,{
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes > 22 && god_eremes < 25) {
 			mes "[Max Von Shedough]";
 			mes "Welcome, friend!";
 			mes "Here in the Prontera Castle, we Crusaders are busily preparing for the Holy War that is to come.";
@@ -554,24 +561,24 @@ prt_castle,48,164,0	script	Crusader#God	734,{
 			mes "[Max Von Shedough]";
 			mes "However, as of now, the petition you've just given me is considered classified information. Please keep this a military secret.";
 			set $God2,$God2+1;
-			if($God2 == 50) {
+			if ($God2 == $@god_check1) {
 				announce "The 2nd seal of [Megingjard] has appeared.",bc_all;
 			}
-			else if($God1 > 99 && $God2 > 99 && $God3 > 99 && $God4 > 99) {
-				announce "Four seals have been released at the same time with the seal of [Megingjard].",bc_all;
-			}
-			else if($God2 > 99) {
-				announce "The 2nd seal of [Megingjard] has been released.",bc_all;
+			else if ($God2 == $@god_check2) {
+				if ($God1 == $@god_check2 && $God2 == $@god_check2 && $God3 == $@god_check2 && $God4 == $@god_check2)
+					announce "Four seals have been released at the same time with the seal of [Megingjard].",bc_all;
+				else
+					announce "The 2nd seal of [Megingjard] has been released.",bc_all;
 			}
-			if(god_eremes == 23) {
+			if (god_eremes == 23) {
 				set god_eremes,25;
 			}
-			else if(god_eremes == 24) {
+			else if (god_eremes == 24) {
 				set god_eremes,26;
 			}
 			close;
 		}
-		else if(god_eremes > 26) {
+		else if (god_eremes > 26) {
 			mes "[Max Von Shedough]";
 			mes "Unfortunately, I'm not sure if it's possible to hold a trial against Rebarev Doug.";
 			next;
@@ -608,14 +615,14 @@ prt_castle,48,164,0	script	Crusader#God	734,{
 	}
 }
 
-prt_in,172,109,0	script	A File#megin1	111,{
-	if(god_eremes == 12) {
+prt_in,172,109,0	script	A File#megin1	HIDDEN_NPC,{
+	if (god_eremes == 12) {
 		mes "^3355FFYou have found";
 		mes "^660000The 3rd Platoon Records^3355FF!^000000";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
-		if(rand(1,10) > 6 && god_eremes > 6) {
+	else if (god_eremes > 6 && god_eremes < 12) {
+		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
 			close;
@@ -625,18 +632,13 @@ prt_in,172,109,0	script	A File#megin1	111,{
 			close2;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
-		if(Sex) {
-			mes "I'm sorry sir,";
-		}
-		else {
-			mes "I'm sorry ma'am,";
-		}
+		mes "I'm sorry "+((Sex)?"sir":"ma'am")+",";
 		mes "but special authorization is required to browse that section. Otherwise, it's off limits.";
 		close;
 	}
-	 else {
+	else {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -645,12 +647,12 @@ prt_in,172,109,0	script	A File#megin1	111,{
 	}
 }
 
-prt_in,170,109,0	script	A File#megin2	111,{
-	if(god_eremes == 12) {
+prt_in,170,109,0	script	A File#megin2	HIDDEN_NPC,{
+	if (god_eremes == 12) {
 		mes "You have found ^0000FFThe 3rd Platoon Records^000000!";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
+	else if (god_eremes > 6 && god_eremes < 12) {
 		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
@@ -661,7 +663,7 @@ prt_in,170,109,0	script	A File#megin2	111,{
 			close;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -677,13 +679,13 @@ prt_in,170,109,0	script	A File#megin2	111,{
 	}
 }
 
-prt_in,168,109,0	script	A File#megin3	111,{
-	if(god_eremes == 12) {
+prt_in,168,109,0	script	A File#megin3	HIDDEN_NPC,{
+	if (god_eremes == 12) {
 		mes "You have found";
 		mes "^0000FFThe 3rd Platoon Records^000000!";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
+	else if (god_eremes > 6 && god_eremes < 12) {
 		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
@@ -694,7 +696,7 @@ prt_in,168,109,0	script	A File#megin3	111,{
 			close;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -710,12 +712,12 @@ prt_in,168,109,0	script	A File#megin3	111,{
 	}
 }
 
-prt_in,169,109,0	script	A File#megin4	111,{
-	if(god_eremes == 12) {
+prt_in,169,109,0	script	A File#megin4	HIDDEN_NPC,{
+	if (god_eremes == 12) {
 		mes "You have found ^0000FFThe 3rd Platoon Records^000000!";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
+	else if (god_eremes > 6 && god_eremes < 12) {
 		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
@@ -726,7 +728,7 @@ prt_in,169,109,0	script	A File#megin4	111,{
 			close;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -742,13 +744,13 @@ prt_in,169,109,0	script	A File#megin4	111,{
 	}
 }
 
-prt_in,166,109,0	script	A File#megin5	111,{
-	if(god_eremes == 12) {
+prt_in,166,109,0	script	A File#megin5	HIDDEN_NPC,{
+	if (god_eremes == 12) {
 		mes "You have found";
 		mes "^0000FFThe 3rd Platoon Records^000000!";
 		close;
 	}
-	else if(god_eremes > 6 && god_eremes < 12) {
+	else if (god_eremes > 6 && god_eremes < 12) {
 		if (rand(1,10) > 6 && god_eremes > 6) {
 			mes "^3355FFYou see a shelf filled with many files. You begin searching through them, one by one.^000000";
 			set god_eremes,god_eremes+1;
@@ -759,7 +761,7 @@ prt_in,166,109,0	script	A File#megin5	111,{
 			close;
 		}
 	}
-	else if(god_eremes < 7) {
+	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
 		mes "W-wait...!";
 		mes "That section";
@@ -775,9 +777,9 @@ prt_in,166,109,0	script	A File#megin5	111,{
 	}
 }
 
-prt_in,172,106,0	script	Librarian#megin	833,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes > 2 && god_eremes < 7) {
+prt_in,172,106,0	script	Librarian#megin	4_M_ZONDAOYAJI,{
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes > 2 && god_eremes < 7) {
 			mes "[Librarian Jekan]";
 			mes "Ah, please do";
 			mes "not touch the files";
@@ -800,8 +802,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 			mes "[Librarian Jekan]";
 			mes "Darn it...!";
 			mes "I can't read anything when the light is this dim! It's bad enough my eyes have gone bad...";
-			next;
 			while(1) {
+				next;
 				switch(select("You have bad eyes?:I want to read some documents.:Let me help you find those files...:What kind of files are you looking for?")) {
 				case 1:
 					mes "[Librarian Jekan]";
@@ -809,7 +811,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 					mes "under dim light";
 					mes "for so long, my eyes have";
 					mes "gone bad. They should get me ^0000FFa new light^000000, otherwise I'll go blind sooner or later...";
-					if(god_eremes == 5 && ( countitem(2203) > 0 || countitem(1041) > 0 ) ) {
+					if (god_eremes == 5 && (countitem(2203) > 0 || countitem(1041) > 0)) {
 						next;
 						mes "[Librarian Jekan]";
 						mes "Hey, that's some pretty useful stuff that you've got with you. Do you mind letting me borrow it for a while? It'll help me in finding those files...";
@@ -825,14 +827,14 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 							mes "Oh, you are so kind!";
 							mes "Y-you really do want";
 							mes "to help me, don't you?";
-							if(countitem(2203) && countitem(1041)) {
-								delitem 1041,countitem(1041);  //Lantern
-								delitem 2203,1;  //Spectacles
+							if (countitem(2203) && countitem(1041)) {
+								delitem 1041,countitem(1041); //Lantern
+								delitem 2203,1; //Spectacles
 							}
-							else if(countitem(2203)) {
+							else if (countitem(2203)) {
 								delitem 2203,1;
 							}
-							else if(countitem(1041)) {
+							else if (countitem(1041)) {
 								delitem 1041,countitem(1041);
 							}
 							set god_eremes,6;
@@ -850,7 +852,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 							close;
 						}
 					}
-					else if(god_eremes > 5) {
+					else if (god_eremes > 5) {
 						next;
 						mes "[Librarian Jekan]";
 						mes "Thank you...";
@@ -861,7 +863,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 					}
 					break;
 				case 2:
-					if(god_eremes == 6) {
+					if (god_eremes == 6) {
 						mes "[Librarian Jekan]";
 						mes "Read some documents?";
 						mes "Well, you've come here";
@@ -894,7 +896,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						close;
 					}
 				case 3:
-					if(god_eremes == 4) {
+					if (god_eremes == 4) {
 						mes "[Librarian Jekan]";
 						mes "I'd gladly accept your";
 						mes "help if it weren't for the fact that I cannot allow classified information to be released to the public.";
@@ -910,7 +912,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "Working as a government official is easy except for the times when the beaucrats make you do stuff like this.";
 						set god_eremes,5;
 					}
-					else if(god_eremes > 4) {
+					else if (god_eremes > 4) {
 						mes "[Librarian Jekan]";
 						mes "I think I'm going to go";
 						mes "insane looking for this file...!";
@@ -954,7 +956,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 				}
 			}
 		}
-		else if(god_eremes == 2) {
+		else if (god_eremes == 2) {
 			mes "[Librarian Jekan]";
 			mes "Ah, please do not touch the files in this section. Usually, it's public domain but it seems that a classified file managed to get misplaced there.";
 			next;
@@ -999,8 +1001,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 				close;
 			}
 		}
-		else if(god_eremes > 6 && god_eremes < 12) {
-			if(rand(1,10) > 4) {
+		else if (god_eremes > 6 && god_eremes < 12) {
+			if (rand(1,10) > 4) {
 				mes "[Librarian Jekan]";
 				mes "Hmm? So did you find it? I've been searching for that file for a long time, but I haven't been able to find it.";
 				next;
@@ -1015,7 +1017,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 				mes "I'll go ahead and check the left side, so would you look for it in the middle or the right side?";
 			}
 		}
-		else if(god_eremes == 12) {
+		else if (god_eremes == 12) {
 			mes "[Librarian Jekan]";
 			mes "Ah! There it is!";
 			mes "Thank you so much!";
@@ -1056,8 +1058,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 			set god_eremes,13;
 			close;
 		}
-		else if(god_eremes == 13) {
-			if(countitem(7111) > 1 && countitem(7151) && countitem(1024) > 2 && countitem(916) > 2 && countitem(717) > 19) {
+		else if (god_eremes == 13) {
+			if (countitem(7111) > 1 && countitem(7151) && countitem(1024) > 2 && countitem(916) > 2 && countitem(717) > 19) {
 				mes "[Librarian Jekan]";
 				mes "Oh, you came back.";
 				mes "I didn't expect you to return here so quickly. Whatever's inside must be really important for you to know.";
@@ -1100,8 +1102,8 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 				close;
 			}
 		}
-		else if(god_eremes > 13 && god_eremes < 16) {
-			if(rand(1,10) > 4) {
+		else if (god_eremes > 13 && god_eremes < 16) {
+			if (rand(1,10) > 4) {
 				mes "[Librarian Jekan]";
 				mes "Let me go over and review the document before I make a copy...";
 			}
@@ -1112,7 +1114,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 			}
 			close;
 		}
-		else if(god_eremes == 16) {
+		else if (god_eremes == 16) {
 			mes "[Librarian Jekan]";
 			mes "There you go. As I thought, the document didn't seem to contain any crucially important data.";
 			next;
@@ -1121,7 +1123,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 			set god_eremes,17;
 			close;
 		}
-		else if(god_eremes > 16) {
+		else if (god_eremes > 16) {
 			mes "[Librarian Jekan]";
 			mes "Welcome, my friend!";
 			mes "So, what do you need today?";
@@ -1206,7 +1208,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 								}
 							}
 						}
-						else if(compare(.@input$,"3rd_platoon") == 1) {
+						else if (compare(.@input$,"3rd_platoon") == 1) {
 							mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 							mes "Each Company consists";
 							mes "of 4 Platoons. Please";
@@ -1214,13 +1216,13 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 							next;
 							close2;
 						}
-						else if(compare(.@input$,"1st_squad") == 1) {
+						else if (compare(.@input$,"1st_squad") == 1) {
 							mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 							mes "The 1st Squad : Crusaders.";
 							mes "Each platoon consists of 4 squads. Please specify Company and Platoon for information on a specific squad.^000000";
 							close2;
 						}
-						else if(compare(.@input$,"record") == 1) {
+						else if (compare(.@input$,"record") == 1) {
 							mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 							mes "- No result has been found.-";
 							close2;
@@ -1298,28 +1300,28 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 							}
 						}
 					}
-					else if(compare(.@input$,"3rd_platoon") == 1) {
+					else if (compare(.@input$,"3rd_platoon") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "The 3rd Platoon : ";
 						mes "- No result has been found.-";
 						mes "- Suggested to enter a more specific keyword.-";
 						close2;
 					}
-					else if(compare(.@input$,"1st_squad") == 1) {
+					else if (compare(.@input$,"1st_squad") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "The 3rd Company : ";
 						mes "- No result has been found.-";
 						mes "- Suggested to enter a more specific keyword.-";
 						close2;
 					}
-					else if((compare(.@input$,"record") == 1) && (god_eremes > 17)) {
+					else if ((compare(.@input$,"record") == 1) && (god_eremes > 17)) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "- No result has been found.-";
 						mes "- Suggested to enter a specific name of the force for a better research.-";
 						next;
 						close2;
 					}
-					else if(compare(.@input$,"rebarev_doug") == 1) {
+					else if (compare(.@input$,"rebarev_doug") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former leader of";
 						mes "3rd Company, 3rd Platoon,";
@@ -1331,12 +1333,12 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Prontera Castle, Prontera^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"egnigem") == 1) {
+					else if (compare(.@input$,"egnigem") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "^FF0000Prohibited Search Term!^000000";
 						close2;
 					}
-					else if(compare(.@input$,"zan.huadoku") == 1) {
+					else if (compare(.@input$,"zan.huadoku") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1348,7 +1350,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Blacksmith Guild, Geffen^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"cuaque_donon") == 1) {
+					else if (compare(.@input$,"cuaque_donon") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1360,7 +1362,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Inn, Morroc^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"jack_o") == 1) {
+					else if (compare(.@input$,"jack_o") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1371,7 +1373,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Alberta Port^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"emma_searth") == 1) {
+					else if (compare(.@input$,"emma_searth") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1383,7 +1385,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Al De Baran^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"royal_myst") == 1) {
+					else if (compare(.@input$,"royal_myst") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1394,7 +1396,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 						mes "^996633Casino, Comodo^663300.^000000";
 						close2;
 					}
-					else if(compare(.@input$,"the_nineball") == 1) {
+					else if (compare(.@input$,"the_nineball") == 1) {
 						mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 						mes "Former member of";
 						mes "3rd Company, 3rd Platoon";
@@ -1533,9 +1535,9 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 	close;
 }
 
-geffen_in,109,161,3	script	Crusader#God1	751,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes > 17 && god_megin_1 < 2) {
+geffen_in,109,161,3	script	Crusader#God1	4_M_CRU,{
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes > 17 && god_megin_1 < 2) {
 			mes "[Zan.Huadoku]";
 			mes "^333333*Phew...*^000000";
 			mes "This work is really getting to me. Going on a mission with my war buddies sounds a lot better than this.";
@@ -1550,7 +1552,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 			next;
 			switch(select("Ask him about the 1st Squad.:Ask him how he's been doing.:Ask him about the 1st Squad's last mission.")) {
 			case 1:
-				if(god_eremes == 18) {
+				if (god_eremes == 18) {
 					mes "[Zan.Huadoku]";
 					mes "Yeah, I was a member of the 1st Squad in the 3rd Platoon a long time ago. How did you know that?";
 					next;
@@ -1560,7 +1562,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 					mes "^3355FFYou tell Zan about Rebarev Doug, and about how he is now an instructor for Crusader Boot Camp. He seems to be absorbed in his thoughts of the past.^000000";
 					close;
 				}
-				else if(god_eremes > 18) {
+				else if (god_eremes > 18) {
 					mes "[Zan.Huadoku]";
 					mes "Yeah, I was a member of the 1st Squad in the 3rd Platoon a long time ago. How did you know that?";
 					next;
@@ -1594,7 +1596,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 					next;
 					mes "[Zan.Huadoku]";
 					mes "^3355FFZan looks very confused and his eyes begin to glaze with a dazed look. You try speaking to him again, but he doesn't respond at all.^000000";
-					if(!god_megin_1) {
+					if (!god_megin_1) {
 						set god_megin_1,1;
 					}
 					close;
@@ -1614,7 +1616,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 				mes "A lot of people have been asking me weird questions about me recently. I feel like I'm getting spied on, but maybe I'm just getting paranoid.";
 				close;
 			case 3:
-				if(god_eremes == 18) {
+				if (god_eremes == 18) {
 					mes "[Zan.Huadoku]";
 					mes "Yeah, on our";
 					mes "final mission...";
@@ -1629,7 +1631,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 					mes "^3355FFZan seems to be having a very difficult time recalling that specific memory of his past.^000000";
 					close;
 				}
-				else if(god_eremes > 18 && god_megin_1 > 0) {
+				else if (god_eremes > 18 && god_megin_1 > 0) {
 					mes "[Zan.Huadoku]";
 					mes "The last mission...";
 					next;
@@ -1665,7 +1667,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 					mes "I can't think about anything further than that. I can't even remember what we found. But I'm sure it was damned important.";
 					next;
 					mes "^3355FFZan stood still in silence, with a pained look on his face.^000000";
-					if(god_megin_1 == 1) {
+					if (god_megin_1 == 1) {
 						set god_megin_1,2;
 					}
 					close;
@@ -1684,7 +1686,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 				}
 			}
 		}
-		else if(god_megin_1 > 1 && god_megin_1 < 3) {
+		else if (god_megin_1 > 1 && god_megin_1 < 3) {
 			mes "...";
 			next;
 			mes "...";
@@ -1708,7 +1710,7 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 			set god_megin_1,3;
 			close;
 		}
-		else if(god_megin_1 > 2) {
+		else if (god_megin_1 > 2) {
 			mes "^3355FFGrabbing his head,";
 			mes "tearing his hair and writhing in Agony, Zan kept repeating the same words over and over again...^000000";
 			next;
@@ -1787,9 +1789,9 @@ geffen_in,109,161,3	script	Crusader#God1	751,{
 	}
 }
 
-morocc_in,146,179,0	script	Employee#megin1	66,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes > 17 && god_megin_2 < 1) {
+morocc_in,146,179,0	script	Employee#megin1	1_F_01,{
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes > 17 && god_megin_2 < 1) {
 			mes "^3355FFThe Inn Employee";
 			mes "eyes you suspiciously.^000000";
 			next;
@@ -1812,7 +1814,7 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 					mes "here, maybe?";
 					close;
 				}
-				else if(god_eremes > 18) {
+				else if (god_eremes > 18) {
 					next;
 					mes "^3355FFOnce you said that name, she immediately drew closer to you";
 					mes "and began speaking in a low, threatening tone.^000000";
@@ -1826,7 +1828,7 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 					next;
 					switch(select("Rebarev Doug sent me!:Wait, is he in hiding?:Just... curious.")) {
 					case 1:
-						if(rand(1,10) > 3) {
+						if (rand(1,10) > 3) {
 							mes "[Ms. Scary Inn Employee]";
 							mes "Rebarev Doug...?!";
 							mes "That old coot must be afraid";
@@ -1863,7 +1865,7 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 							close;
 						}
 					case 2:
-						if(rand(1,10) > 4) {
+						if (rand(1,10) > 4) {
 							mes "[Ms. Scary Inn Employee]";
 							mes "Right.";
 							mes "If you're here";
@@ -1954,7 +1956,7 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 				close2;
 			}
 		}
-		else if(god_megin_2 > 0) {
+		else if (god_megin_2 > 0) {
 			mes "[Inn Employee]";
 			mes "Welcome to the Inn.";
 			mes "When you move to the entrance, you can also enter a PvP zone though a PvP doorman.";
@@ -1992,9 +1994,9 @@ morocc_in,146,179,0	script	Employee#megin1	66,{
 	}
 }
 
-in_rogue,243,61,0	script	Suspicious Man#megin	748,{
-	if($God1 > 49 && $God2 < 100) {
-		if(god_eremes == 18) {
+in_rogue,243,61,0	script	Suspicious Man#megin	4_M_ALCHE_A,{
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes == 18) {
 			mes "[Cuaque Donon]";
 			mes "Wh-who are you?!";
 			mes "How the hell did";
@@ -2003,8 +2005,8 @@ in_rogue,243,61,0	script	Suspicious Man#megin	748,{
 			mes "Geeeet awwwway!";
 			close;
 		}
-		else if(god_eremes > 18) {
-			if(god_megin_2 > 0 && god_megin_2 < 4) {
+		else if (god_eremes > 18) {
+			if (god_megin_2 > 0 && god_megin_2 < 4) {
 				mes "[Cuaque Donon]";
 				mes "Wh-who are you?!";
 				mes "How the hell did";
@@ -2018,31 +2020,31 @@ in_rogue,243,61,0	script	Suspicious Man#megin	748,{
 					if (countitem(740) > 0) {
 						set .@toy$,"Puppet";
 					}
-					else if(countitem(741) > 0) {
+					else if (countitem(741) > 0) {
 						set .@toy$,"Poring Doll";
 					}
-					else if(countitem(742) > 0) {
+					else if (countitem(742) > 0) {
 						set .@toy$,"Chonchon Doll";
 					}
-					else if(countitem(743) > 0) {
+					else if (countitem(743) > 0) {
 						set .@toy$,"Spore Doll";
 					}
 					else if (countitem(744) > 0) {
 						set .@toy$,"Baphomet Doll";
 					}
-					else if(countitem(751) > 0) {
+					else if (countitem(751) > 0) {
 						set .@toy$,"Osiris Doll";
 					}
-					else if(countitem(752) > 0) {
+					else if (countitem(752) > 0) {
 						set .@toy$,"Rocker Doll";
 					}
-					else if(countitem(753) > 0) {
+					else if (countitem(753) > 0) {
 						set .@toy$,"Yoyo Doll";
 					}
-					else if(countitem(754) > 0) {
+					else if (countitem(754) > 0) {
 						set .@toy$,"Racoon Doll";
 					}
-					else if(countitem(7206) > 0) {
+					else if (countitem(7206) > 0) {
 						set .@toy$,"Black Cat Doll";
 					}
 					else {
@@ -2261,9 +2263,9 @@ in_rogue,243,61,0	script	Suspicious Man#megin	748,{
 	}
 }
 
-alberta,196,146,0	script	Crusader#megin2	751,{
-	if ($God1 > 49 && $God2 < 100) {
-		if(god_eremes == 18) {
+alberta,196,146,0	script	Crusader#megin2	4_M_CRU,{
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes == 18) {
 			mes "[Jack O]";
 			mes "^333333*Yawn...*^000000";
 			mes "It's quiet and boring, as per usual. Let's see if there's any Swordmen I can recruit today.";
@@ -2452,15 +2454,19 @@ alberta,196,146,0	script	Crusader#megin2	751,{
 	}
 }
 
-aldebaran,66,213,0	script	Lady#megin	69,{
-	if ($God1 > 49 && $God2 < 100) {
-		if(god_eremes == 18) {
+aldebaran,66,213,0	script	Lady#megin	1_F_04,{
+	if (checkweight(1301,3) == 0) {
+		mes "- You are carrying too many items!";
+		close;
+	}
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
+		if (god_eremes == 18) {
 			mes "[Emma Searth]";
 			mes "^333333*Sigh...*^000000 I haven't gotten any response from them. I don't know";
 			mes "if I can wait much longer to join the Kafra Corporation.";
 			close;
 		}
-		else if(god_eremes > 18 && god_eremes < 26) {
+		else if (god_eremes > 18 && god_eremes < 26) {
 			if (god_megin_4 < 2) {
 				mes "[Emma Searth]";
 				mes "^333333*Sigh...*^000000 I haven't gotten any response from them. I don't know";
@@ -2610,7 +2616,7 @@ aldebaran,66,213,0	script	Lady#megin	69,{
 					}
 				}
 			}
-			else if(god_megin_4 > 1) {
+			else if (god_megin_4 > 1) {
 				mes "[Emma Searth]";
 				mes "^0000FFJack O, The Nineball, Zan.Huadoku, Cuaque Donon, Egnigem.^000000 Oh, I really miss those guys...";
 				close;
@@ -2646,7 +2652,27 @@ aldebaran,66,213,0	script	Lady#megin	69,{
 			mes "I really appreciate you coming here to talk to me about the old days. I, I want you to have this.";
 			set god_eremes,28;
 			getitem 603,1; // Old_Blue_Box
-			getexp 122036,0;
+			if (checkre(3)) {
+				if (BaseLevel < 56) getexp 2700,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 3000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 5605,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 8223,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 21227,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 39073,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 45102,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 54615,0;
+				else getexp 122035,0;
+			} else {
+				if (BaseLevel < 56) getexp 27000,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 30000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 56052,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 82233,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 212271,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 390738,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 451020,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 546156,0;
+				else getexp 1220358,0;
+			}
 			close;
 		}
 		else if (god_eremes == 28) {
@@ -2677,8 +2703,8 @@ aldebaran,66,213,0	script	Lady#megin	69,{
 	}
 }
 
-cmd_in02,190,94,3	script	Man#megin	828,{
-	if ($God1 > 49 && $God2 < 100) {
+cmd_in02,190,94,3	script	Man#megin	4_M_ROGUE,{
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
 		if (god_eremes == 18) {
 			mes "[Royal Myst]";
 			mes "Wha...?";
@@ -2731,7 +2757,7 @@ cmd_in02,190,94,3	script	Man#megin	828,{
 				mes "which one do I bet on...?";
 				next;
 			}
-			else if(god_megin_6 > 0) {
+			else if (god_megin_6 > 0) {
 				mes "[Royal Myst]";
 				mes "Hmm?";
 				mes "What's up?";
@@ -2881,8 +2907,8 @@ cmd_in02,190,94,3	script	Man#megin	828,{
 	}
 }
 
-jawaii_in,44,110,0	script	Security Officer#megin	734,{
-	if ($God1 > 49 && $God2 < 100) {
+jawaii_in,44,110,0	script	Security Officer#megin	4_M_JOB_KNIGHT2,{
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
 		if (god_eremes == 18) {
 			mes "[The Nineball]";
 			mes "Welcome to Jawaii,";
@@ -2939,8 +2965,8 @@ jawaii_in,44,110,0	script	Security Officer#megin	734,{
 
 }
 
-niflheim,109,254,0	script	Egnigem	796,{
-	if ($God1 > 49 && $God2 < 100) {
+niflheim,109,254,0	script	Egnigem	4_M_NFDEADSWDMAN,{
+	if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
 		if (god_eremes > 19 && god_eremes < 25) {
 			if (god_eremes > 22) {
 				mes "[Egnigem]";
@@ -3165,7 +3191,27 @@ niflheim,109,254,0	script	Egnigem	796,{
 			specialeffect EF_LOCKON;
 			specialeffect2 EF_HOLYCROSS;
 			set god_eremes,27;
-			getexp 122036,0;
+			if (checkre(3)) {
+				if (BaseLevel < 56) getexp 2700,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 3000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 5605,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 8223,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 21227,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 39073,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 45102,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 54615,0;
+				else getexp 122035,0;
+			} else {
+				if (BaseLevel < 56) getexp 27000,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 30000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 56052,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 82233,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 212271,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 390738,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 451020,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 546156,0;
+				else getexp 1220358,0;
+			}
 			close;
 		}
 		else if (god_eremes == 26) {
@@ -3203,7 +3249,27 @@ niflheim,109,254,0	script	Egnigem	796,{
 			specialeffect EF_LOCKON;
 			specialeffect2 EF_HOLYCROSS;
 			set god_eremes,27;
-			getexp 122036,0;
+			if (checkre(3)) {
+				if (BaseLevel < 56) getexp 2700,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 3000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 5605,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 8223,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 21227,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 39073,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 45102,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 54615,0;
+				else getexp 122035,0;
+			} else {
+				if (BaseLevel < 56) getexp 27000,0;
+				else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 30000,0;
+				else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 56052,0;
+				else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 82233,0;
+				else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 212271,0;
+				else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 390738,0;
+				else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 451020,0;
+				else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 546156,0;
+				else getexp 1220358,0;
+			}
 			close;
 		}
 		else if (god_eremes < 20) {
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index e2be244ea..edaf442d7 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script ======================================= 
-//= Mjolnir seal unlocking NPCs.
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= God Item Quest - Mjolnir Seal
+//===== By: ==================================================
 //= SinSloth
-//===== Current Version: ===================================== 
-//= 1.8a
-//===== Compatible With: ===================================== 
-//= rAthena
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.9
+//===== Description: =========================================
 //= Quest for breaking the seal of Mjolnir.
 //===== Additional Comments: =================================
 //= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
@@ -21,10 +19,15 @@
 //= 1.7 Fixed a copy/paste error in Nordri. [L0ne_W0lf]
 //= 1.8 Fixed item check for Oridecon. [L0ne_W0lf]
 //= 1.8a Added 'disable_items' command. [Euphy]
+//= 1.9 Renewal script update. [Euphy]
 //============================================================
 
-prontera,124,297,3	script	Tialfi	706,{
-	if ($God3 < 50) {
+prontera,124,297,3	script	Tialfi	4_M_KID1,{
+	if (checkweight(1301,3) == 0) {
+		mes "- You are carrying too many items! -";
+		close;
+	}
+	if ($God3 < $@god_check1) {
 		cutin "god_tialpi01",2;
 		mes "[Tialfi]";
 		mes "Hmmm...";
@@ -36,12 +39,12 @@ prontera,124,297,3	script	Tialfi	706,{
 		mes "going on!";
 	}
 	else {
-		if(god_mjo_0 == 11) {
+		if (god_mjo_0 == 11) {
 			cutin "god_tialpi01",2;
 			mes "[Tialfi]";
 			mes "I'm waiting for the day when I'll finally get to see Thor's thunder for myself. I believe that one of these days, my dream will become reality.";
 		}
-		else if(god_mjo_1 == 2 && god_mjo_2 == 2 && god_mjo_3 == 2 && god_mjo_4 == 2) {
+		else if (god_mjo_1 == 2 && god_mjo_2 == 2 && god_mjo_3 == 2 && god_mjo_4 == 2) {
 			if (god_mjo_0 == 10) {
 				if ((countitem(756) > 49) && (countitem(757) > 49)) {
 					set .@gift,0;
@@ -57,13 +60,13 @@ prontera,124,297,3	script	Tialfi	706,{
 					else if (BaseJob == Job_Blacksmith){
 						set .@gift,4;
 					}
-					else if (BaseJob == Job_hunter){
+					else if (BaseJob == Job_Hunter){
 						set .@gift,5;
 					}
 					else if (BaseJob == Job_Assassin){
 						set .@gift,6;
 					}
-					else if(BaseJob == Job_Crusader){
+					else if (BaseJob == Job_Crusader){
 						set .@gift,7;
 					}
 					else if (BaseJob == Job_Monk){
@@ -81,7 +84,7 @@ prontera,124,297,3	script	Tialfi	706,{
 					else if (BaseJob == Job_Bard){
 						set .@gift,12;
 					}
-					else if(BaseJob == Job_Hunter){
+					else if (BaseJob == Job_Hunter){
 						set .@gift,13;
 					}
 					else {
@@ -123,46 +126,46 @@ prontera,124,297,3	script	Tialfi	706,{
 					mes "It must be around--Ah!";
 					mes "Here we are~";
 					next;
-					delitem 756,50;  //Oridecon_Stone
-					delitem 757,50;  //Elunium_Stone
+					delitem 756,50; //Oridecon_Stone
+					delitem 757,50; //Elunium_Stone
 					set god_mjo_0,11;
 					if (.@gift == 1) {
 						getitem 1471,1; // Hell_Fire
 					}
-					else if(.@gift == 2) {
+					else if (.@gift == 2) {
 						getitem 1526,1; // Slash
 					}
-					else if(.@gift == 3) {
+					else if (.@gift == 3) {
 						getitem 1231,1; // Bazerald
 					}
-					else if(.@gift == 4) {
+					else if (.@gift == 4) {
 						getitem 1367,1; // Slaughter
 					}
-					else if(.@gift == 5) {
+					else if (.@gift == 5) {
 						getitem 1722,1; // Balistar
 					}
-					else if(.@gift == 6) {
+					else if (.@gift == 6) {
 						getitem 1230,1; // House_Auger
 					}
-					else if(.@gift == 7) {
+					else if (.@gift == 7) {
 						getitem 1141,1; // Immaterial_Sword
 					}
-					else if(.@gift == 8) {
+					else if (.@gift == 8) {
 						getitem 1813,1; // Kaiser_Knuckle
 					}
-					else if(.@gift == 9) {
+					else if (.@gift == 9) {
 						getitem 1557,1; // Book_Of_The_Apocalypse
 					}
-					else if(.@gift == 10) {
+					else if (.@gift == 10) {
 						getitem 1235,1; // Azoth
 					}
-					else if(.@gift == 11) {
+					else if (.@gift == 11) {
 						getitem 1227,1; // Weeder_Knife
 					}
-					else if(.@gift == 12) {
+					else if (.@gift == 12) {
 						getitem 1913,1; // Electronic_Guitar
 					}
-					else if(.@gift == 13) {
+					else if (.@gift == 13) {
 						getitem 1963,1; // Rapture_Rose
 					}
 					else {
@@ -190,7 +193,7 @@ prontera,124,297,3	script	Tialfi	706,{
 				}
 			}
 			else {
-				if ($God4 > 99) {
+				if ($God4 >= $@god_check2) {
 					mes "[Tialfi]";
 					mes "I sense a strange energy growing more powerful somewhere on this continent...";
 					next;
@@ -203,14 +206,13 @@ prontera,124,297,3	script	Tialfi	706,{
 				}
 				else {
 					set $God4,$God4 +1;
-					if($God4 == 50) {
+					if ($God4 == $@god_check1)
 						announce "The 4th seal of [Mjolnir] has appeared.",bc_all;
-					}
-					else if($God4 == 100 && $God2 == 100 && $God3 == 100 && $God1 == 100) {
-						announce "Four seals have been released at the same time with the seal of [Mjolnir].",bc_all;
-					}
-					else if($God4 == 100) {
-						announce "The 4th seal of [Mjolnir] has been released.",bc_all;
+					else if ($God4 == $@god_check2) {
+						if ($God4 == $@god_check2 && $God2 == $@god_check2 && $God3 == $@god_check2 && $God1 == $@god_check2)
+							announce "Four seals have been released at the same time with the seal of [Mjolnir].",bc_all;
+						else
+							announce "The 4th seal of [Mjolnir] has been released.",bc_all;
 					}
 					set god_mjo_0,10;
 					mes "[Tialfi]";
@@ -237,7 +239,7 @@ prontera,124,297,3	script	Tialfi	706,{
 				}
 			}
 		}
-		else if(god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
+		else if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 			mes "[Tialfi]";
 			mes "Hmm...";
 			mes "The Dwarven Blacksmiths";
@@ -260,7 +262,7 @@ prontera,124,297,3	script	Tialfi	706,{
 			mes "You should be okay now.";
 			mes "By this time, they've probably forgotten the insult. But make sure you speak to my sister for advice first.";
 		}
-		else if(god_mjo_0 == 2 || god_mjo_0 == 1) {
+		else if (god_mjo_0 == 2 || god_mjo_0 == 1) {
 			cutin "god_tialpi01",2;
 			mes "[Tialfi]";
 			mes "Sorry for the trouble.";
@@ -268,8 +270,8 @@ prontera,124,297,3	script	Tialfi	706,{
 			mes "in finding the Dwarves!";
 			mes "Just... Don't insult them!";
 		}
-		else if(god_mjo_0 == 0) {
-			if($God4 > 99) {
+		else if (god_mjo_0 == 0) {
+			if ($God4 >= $@god_check2) {
 				cutin "god_tialpi01",2;
 				mes "[Tialfi]";
 				mes "I sense a strange energy growing more powerful somewhere on this continent...";
@@ -282,7 +284,7 @@ prontera,124,297,3	script	Tialfi	706,{
 				mes "I think we'd better wait and see what's happening. Someone will deliver the news to us. Though, I am unsure of whether or not it will be good news or bad...";
 				close;
 			}
-			else if(BaseLevel < 70) {
+			else if (BaseLevel < 70) {
 				cutin "god_tialpi02",2;
 				mes "[Tialfi]";
 				mes "One of my ancestors supposedly was a servant of Thor. Still, I find it difficult to believe.";
@@ -365,8 +367,8 @@ prontera,124,297,3	script	Tialfi	706,{
 	end;
 }
 
-prt_fild01,196,47,3	script	Roskva	703,{
-	if(god_mjo_0 == 1) {
+prt_fild01,196,47,3	script	Roskva	4_F_KID2,{
+	if (god_mjo_0 == 1) {
 		mes "[Roskva]";
 		mes "You should know that Dwarven Blacksmiths are extremely offended if you do not speak to them with the utmost respect.";
 		next;
@@ -385,7 +387,7 @@ prt_fild01,196,47,3	script	Roskva	703,{
 		mes "If you happen to speak to them in the wrong order, please go talk to my brother Tialfi again.";
 		close;
 	}
-	else if(god_mjo_0 == 2) {
+	else if (god_mjo_0 == 2) {
 		mes "[Roskva]";
 		mes "You should know that Dwarven Blacksmiths are extremely offended if you do not speak to them with the utmost respect.";
 		next;
@@ -418,19 +420,19 @@ prt_fild01,196,47,3	script	Roskva	703,{
 	}
 }
 
-mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
-	if ($God3 < 50) {
+mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	4_M_DWARF,{
+	if ($God3 < $@god_check1) {
 		mes "[Austri]";
 		mes "Something is happening somewhere on this continent. You might not believe me, but I keep getting visions of the Fenrir-Wolf.";
 		close;
 	}
 	else {
-		if($God4 > 99) {
+		if ($God4 >= $@god_check2) {
 			mes "[Austri]";
 			mes "Something is happening somewhere on this continent. You might not believe me, but I keep getting visions of the Fenrir-Wolf.";
 			close;
 		}
-		else if(god_mjo_0 == 11) {
+		else if (god_mjo_0 == 11) {
 			mes "[Austri]";
 			mes "When my people finally retrieve the memories of their past, we will be able to grant the power of the gods to humans.";
 			next;
@@ -439,19 +441,19 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 			mes "time is coming...";
 			close;
 		}
-		else if(god_mjo_0 == 10) {
+		else if (god_mjo_0 == 10) {
 			mes "[Austri]";
 			mes "Hm? I sense that you were asked to do a favor for that human. If I were you, I'd finish that task as soon as I could. Somehow, that human's fate, as well as that of the Dwarves, are intertwined...";
 			close;
 		}
-		else if(god_mjo_0 == 1) {
+		else if (god_mjo_0 == 1) {
 			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Austri]";
 				mes "What is it?! I refuse to speak to human as rude and contemptible";
 				mes "as you! Now, get out of my sight!";
 				close;
 			}
-			else if(god_mjo_1 == 2) {
+			else if (god_mjo_1 == 2) {
 				mes "[Austri]";
 				mes "What...?";
 				mes "I have nothing";
@@ -479,7 +481,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 					close;
 				}
 			}
-			else if(god_mjo_1 == 1) {
+			else if (god_mjo_1 == 1) {
 				mes "[Austri]";
 				mes "What has made";
 				mes "you come to me?";
@@ -490,7 +492,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 					mes "...";
 					close;
 				case 2:
-					if (countitem(1005) > 0) { //Hammer_Of_Blacksmith 
+					if (countitem(1005) > 0) { //Hammer_Of_Blacksmith
 						mes "[Austri]";
 						mes "Ah, I see that the entire human race is not worthy of scorn. Unlike many of your kind, I see that you respect your elders.";
 						next;
@@ -509,7 +511,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 1) {
+							else if (.@talk_to == 1) {
 								mes "[Austri]";
 								mes "Mjolnir...?";
 								mes "Thor's legendary weapon?";
@@ -529,7 +531,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 2) {
+							else if (.@talk_to == 2) {
 								mes "[Austri]";
 								mes "One day, Loki came to our village and showed off his treasures. He boasted that we couldn't possibly create something to surpass their quality.";
 								next;
@@ -545,7 +547,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 3) {
+							else if (.@talk_to == 3) {
 								mes "[Austri]";
 								mes "Of the three treasures my ancestors created, Mjolnir was the last and greatest.";
 								next;
@@ -563,7 +565,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 4) {
+							else if (.@talk_to == 4) {
 								mes "[Austri]";
 								mes "Despite this minor flaw, Mjolnir is still considered the greatest of legendary weapons.";
 								next;
@@ -581,7 +583,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 5) {
+							else if (.@talk_to == 5) {
 								mes "[Austri]";
 								mes "The reason this mountain is called Mount Mjolnir is because it was actually created by the hammer.";
 								next;
@@ -601,7 +603,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 6) {
+							else if (.@talk_to == 6) {
 								mes "[Austri]";
 								mes "Hmm... But perhaps an ambitious dwarf can forge something similar to Mjolnir so that it can actually be used by humans. It would have less power, but it'd be perfectly crafted.";
 								next;
@@ -617,7 +619,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 7) {
+							else if (.@talk_to == 7) {
 								mes "[Austri]";
 								mes "Well, I happened to speak much longer than I intended. But I hope you learned what you wished to";
 								mes "know about Mjolnir.";
@@ -638,7 +640,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 									break;
 								}
 							}
-							else if(.@talk_to == 8) {
+							else if (.@talk_to == 8) {
 								set god_mjo_1,2;
 								mes "[Austri]";
 								mes "Alright then...";
@@ -670,7 +672,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 					}
 				}
 			}
-			else if(god_mjo_1 == 0) {
+			else if (god_mjo_1 == 0) {
 				mes "[Austri]";
 				mes "What has made";
 				mes "you come to me?";
@@ -704,21 +706,21 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 2) {
-			if(god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
+		else if (god_mjo_0 == 2) {
+			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Austri]";
 				mes "What is it?! I refuse to speak to human as rude and contemptible";
 				mes "as you! Now, get out of my sight!";
 				close;
 			}
-			else if(god_mjo_4 == 2) {
+			else if (god_mjo_4 == 2) {
 				mes "[Austri]";
 				mes "What is it...?";
 				mes "I have nothing";
 				mes "to say to you.";
 				close;
 			}
-			else if(god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_2 == 0 || god_mjo_2 == 1 || god_mjo_3 == 0 || god_mjo_3 == 1) {
+			else if (god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_2 == 0 || god_mjo_2 == 1 || god_mjo_3 == 0 || god_mjo_3 == 1) {
 				mes "[Austri]";
 				mes "What made you come to me?";
 				next;
@@ -735,7 +737,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 					close;
 				}
 			}
-			else if(god_mjo_4 == 1) {
+			else if (god_mjo_4 == 1) {
 				mes "[Austri]";
 				mes "What has made";
 				mes "you come to me?";
@@ -928,7 +930,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 					}
 				}
 			}
-			else if(god_mjo_4 == 0) {
+			else if (god_mjo_4 == 0) {
 				mes "[Austri]";
 				mes "What made you come to me?";
 				next;
@@ -961,7 +963,7 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 0) {
+		else if (god_mjo_0 == 0) {
 			mes "[Austri]";
 			mes "Ah...";
 			mes "It feels like today's going to be a great day.";
@@ -978,8 +980,8 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 	}
 }
 
-mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
-	if ($God3 < 50) {
+mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
+	if ($God3 < $@god_check1) {
 		mes "[Sudri]";
 		mes "I want to compete";
 		mes "and fight with stronger and stronger opponents!";
@@ -989,7 +991,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 		close;
 	}
 	else {
-		if ($God4 > 99) {
+		if ($God4 >= $@god_check2) {
 			mes "[Sudri]";
 			mes "Wait, this is";
 			mes "not the right time";
@@ -999,7 +1001,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 			mes "Something that has been hidden is about to be born out of the sweat of determination and tears of sacrifice. We must wait until then.";
 			close;
 		}
-		else if(god_mjo_0 == 11) {
+		else if (god_mjo_0 == 11) {
 			mes "[Sudri]";
 			mes "I want to compete with a stronger one!";
 			mes "I will be stronger and stronger,";
@@ -1008,12 +1010,12 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 			mes "Muhahahaha...!";
 			close;
 		}
-		else if(god_mjo_10 == 10) {
+		else if (god_mjo_10 == 10) {
 			mes "[Sudri]";
 			mes "I must admit that you're a really strong human. Let us fight again when we have a chance. The next time, you may not be so lucky!";
 			close;
 		}
-		else if(god_mjo_0 == 1) {
+		else if (god_mjo_0 == 1) {
 			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Sudri]";
 				mes "Go back to where you belong before I beat you to death!";
@@ -1022,13 +1024,13 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 				mes "All you can gain here are a few herbs.";
 				close;
 			}
-			else if(god_mjo_2 == 2) {
+			else if (god_mjo_2 == 2) {
 				mes "[Sudri]";
 				mes "That was a great fight!";
 				mes "Mwahahaha! I'm satisfied with the results. I may have lost, but we fought honorably with everything we had.";
 				close;
 			}
-			else if(god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_3 != 0 || god_mjo_4 != 0) {
+			else if (god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_3 != 0 || god_mjo_4 != 0) {
 				mes "[Sudri]";
 				mes "So...";
 				mes "What brings";
@@ -1054,7 +1056,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					close;
 				}
 			}
-			else if(god_mjo_2 == 1) {
+			else if (god_mjo_2 == 1) {
 				set .@n_vit,200;
 				set .@p_vit,100;
 				while(1) {
@@ -1088,15 +1090,15 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "" + strcharinfo(0) + "";
 						mes "attacks Sudri's head!";
 					}
-					else if(.@p_atk == 2) {
+					else if (.@p_atk == 2) {
 						mes "" + strcharinfo(0) + "";
 						mes "strikes Sudri's chest!";
 					}
-					else if(.@p_atk == 3) {
+					else if (.@p_atk == 3) {
 						mes "" + strcharinfo(0) + "";
 						mes "aims for Sudri's legs!";
 					}
-					else if(.@p_atk == 4) {
+					else if (.@p_atk == 4) {
 						mes "" + strcharinfo(0) + "";
 						mes "requests a break!";
 					}
@@ -1114,7 +1116,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "" + strcharinfo(0) + " misses!";
 						}
-						else if(.@n_def == 2) {
+						else if (.@n_def == 2) {
 							mes "--------------------";
 							mes "Sudri blocks your";
 							mes "attack by crossing";
@@ -1122,7 +1124,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "" + strcharinfo(0) + "'s attack is blocked!";
 						}
-						else if(.@n_def == 3) {
+						else if (.@n_def == 3) {
 							mes "--------------------";
 							mes "Sudri dodges your";
 							mes "attack with a graceful";
@@ -1131,14 +1133,14 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "" + strcharinfo(0) + " misses!";
 						}
 					}
-					else if(.@p_atk == 4) {
+					else if (.@p_atk == 4) {
 						specialeffect2 EF_HEAL;
 						set .@p_vit,.@p_vit + 10;
 						mes "--------------------";
 						mes "" + strcharinfo(0) + "";
 						mes "has gained 10 HP!";
 					}
-					else if(.@p_atk == 1) {
+					else if (.@p_atk == 1) {
 						specialeffect EF_HIT5;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1147,7 +1149,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "Sudri has lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 2) {
+					else if (.@p_atk == 2) {
 						specialeffect EF_HIT2;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1157,7 +1159,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "Sudri has";
 						mes "lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 3) {
+					else if (.@p_atk == 3) {
 						specialeffect EF_HIT4;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1167,7 +1169,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "Sudri has";
 						mes "lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 0) {
+					else if (.@p_atk == 0) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - 10;
 						mes "--------------------";
@@ -1220,7 +1222,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					if (.@n_atk == 1) {
 						mes "Sudri aims for the head!";
 					}
-					else if(.@n_atk == 2) {
+					else if (.@n_atk == 2) {
 						mes "Sudri strikes the chest!";
 					}
 					else {
@@ -1237,7 +1239,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "Sudri has failed to attack.";
 						}
-						else if(.@p_def == 2) {
+						else if (.@p_def == 2) {
 							mes "--------------------";
 							mes "" + strcharinfo(0) + "";
 							mes "barely blocked";
@@ -1245,7 +1247,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "Sudri has failed to attack.";
 						}
-						else if(.@p_def == 3) {
+						else if (.@p_def == 3) {
 							mes "--------------------";
 							mes "" + strcharinfo(0) + " jumped,";
 							mes "dodged Sudri's attack at ease.";
@@ -1253,7 +1255,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "Sudri has failed to attack.";
 						}
 					}
-					else if(.@p_def == 4) {
+					else if (.@p_def == 4) {
 						set .@count,rand(1,4);
 						mes "--------------------";
 						mes "" + strcharinfo(0) + "";
@@ -1282,7 +1284,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "" + strcharinfo(0) + " has lost 30 HP!";
 						}
 					}
-					else if(.@n_atk == 1) {
+					else if (.@n_atk == 1) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1292,7 +1294,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 2) {
+					else if (.@n_atk == 2) {
 						specialeffect2 EF_HIT2;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1302,7 +1304,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 3) {
+					else if (.@n_atk == 3) {
 						specialeffect2 EF_HIT4;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1312,7 +1314,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 0) {
+					else if (.@n_atk == 0) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1346,7 +1348,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					mes "Go out, train some and get stronger before you even think about coming back!";
 					close;
 				}
-				else if(.@n_vit < p_vit) {
+				else if (.@n_vit < p_vit) {
 					set god_mjo_2,2;
 					mes "[Sudri]";
 					mes "You're stronger than me. I never thought I'd meet a human as strong as you.";
@@ -1361,7 +1363,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					close;
 				}
 			}
-			else if(god_mjo_2 == 0) {
+			else if (god_mjo_2 == 0) {
 				mes "[Sudri]";
 				mes "So...";
 				mes "What brings";
@@ -1422,14 +1424,14 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 2) {
+		else if (god_mjo_0 == 2) {
 			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Sudri]";
 				mes "[Sudri]";
 				mes "Get out of here before I beat you to death! All you can gain over here is a few herbs, anyway!";
 				close;
 			}
-			else if(god_mjo_3 == 2) {
+			else if (god_mjo_3 == 2) {
 				mes "[Sudri]";
 				mes "That was a great fight!";
 				mes "Hahahahahahahahahaah!";
@@ -1459,7 +1461,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					close;
 				}
 			}
-			else if(god_mjo_3 == 1) {
+			else if (god_mjo_3 == 1) {
 				mes "[Sudri]";
 				mes "Cool, let's fight!";
 				next;
@@ -1496,15 +1498,15 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "" + strcharinfo(0) + "";
 						mes "attacks Sudri's head!";
 					}
-					else if(.@p_atk == 2) {
+					else if (.@p_atk == 2) {
 						mes "" + strcharinfo(0) + "";
 						mes "strikes Sudri's chest!";
 					}
-					else if(.@p_atk == 3) {
+					else if (.@p_atk == 3) {
 						mes "" + strcharinfo(0) + "";
 						mes "aims for Sudri's legs!";
 					}
-					else if(.@p_atk == 4) {
+					else if (.@p_atk == 4) {
 						mes "" + strcharinfo(0) + "";
 						mes "requests a break!";
 					}
@@ -1522,7 +1524,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "" + strcharinfo(0) + " misses!";
 						}
-						else if(.@n_def == 2) {
+						else if (.@n_def == 2) {
 							mes "--------------------";
 							mes "Sudri blocks your";
 							mes "attack by crossing";
@@ -1530,7 +1532,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "" + strcharinfo(0) + "'s attack is blocked!";
 						}
-						else if(.@n_def == 3) {
+						else if (.@n_def == 3) {
 							mes "--------------------";
 							mes "Sudri dodges your";
 							mes "attack with a graceful";
@@ -1539,14 +1541,14 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "" + strcharinfo(0) + " misses!";
 						}
 					}
-					else if(.@p_atk == 4) {
+					else if (.@p_atk == 4) {
 						specialeffect2 EF_HEAL;
 						set .@p_vit,.@p_vit + 10;
 						mes "--------------------";
 						mes "" + strcharinfo(0) + "";
 						mes "has gained 10 HP!";
 					}
-					else if(.@p_atk == 1) {
+					else if (.@p_atk == 1) {
 						specialeffect EF_HIT5;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1555,7 +1557,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "Sudri has lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 2) {
+					else if (.@p_atk == 2) {
 						specialeffect EF_HIT2;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1565,7 +1567,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "Sudri has";
 						mes "lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 3) {
+					else if (.@p_atk == 3) {
 						specialeffect EF_HIT4;
 						set .@n_vit,.@n_vit - .@damage;
 						mes "--------------------";
@@ -1575,7 +1577,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "Sudri has";
 						mes "lost " + .@damage + " HP!";
 					}
-					else if(.@p_atk == 0) {
+					else if (.@p_atk == 0) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - 10;
 						mes "--------------------";
@@ -1628,7 +1630,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					if (.@n_atk == 1) {
 						mes "Sudri aims for the head!";
 					}
-					else if(.@n_atk == 2) {
+					else if (.@n_atk == 2) {
 						mes "Sudri strikes the chest!";
 					}
 					else {
@@ -1644,7 +1646,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "Sudri has failed to attack.";
 						}
-						else if(.@p_def == 2) {
+						else if (.@p_def == 2) {
 							mes "--------------------";
 							mes "" + strcharinfo(0) + "";
 							mes "barely blocked";
@@ -1652,7 +1654,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "--------------------";
 							mes "Sudri has failed to attack.";
 						}
-						else if(.@p_def == 3) {
+						else if (.@p_def == 3) {
 							mes "--------------------";
 							mes "" + strcharinfo(0) + " jumped,";
 							mes "dodged Sudri's attack at ease.";
@@ -1660,7 +1662,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "Sudri has failed to attack.";
 						}
 					}
-					else if(.@p_def == 4) {
+					else if (.@p_def == 4) {
 						set .@count,rand(1,4);
 						mes "--------------------";
 						mes "" + strcharinfo(0) + "";
@@ -1689,7 +1691,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 							mes "" + strcharinfo(0) + " has lost 30 HP!";
 						}
 					}
-					else if(.@n_atk == 1) {
+					else if (.@n_atk == 1) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1699,7 +1701,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 2) {
+					else if (.@n_atk == 2) {
 						specialeffect2 EF_HIT2;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1709,7 +1711,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 3) {
+					else if (.@n_atk == 3) {
 						specialeffect2 EF_HIT4;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1719,7 +1721,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						mes "--------------------";
 						mes "" + strcharinfo(0) + " has lost " + .@damage + " HP!";
 					}
-					else if(.@n_atk == 0) {
+					else if (.@n_atk == 0) {
 						specialeffect2 EF_HIT5;
 						set .@p_vit,.@p_vit - .@damage;
 						mes "--------------------";
@@ -1753,7 +1755,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					mes "Go out, train some and get stronger before you even think about coming back!";
 					close;
 				}
-				else if(.@n_vit < .@p_vit) {
+				else if (.@n_vit < .@p_vit) {
 					set god_mjo_3,2;
 					mes "[Sudri]";
 					mes "You're stronger than me. I never thought I'd meet a human as strong as you.";
@@ -1768,7 +1770,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 					close;
 				}
 			}
-			else if(god_mjo_3 == 0) {
+			else if (god_mjo_3 == 0) {
 				mes "[Sudri]";
 				mes "What made you come to me?";
 				next;
@@ -1829,7 +1831,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 0) {
+		else if (god_mjo_0 == 0) {
 			mes "[Sudri]";
 			mes "In a one on one fight, you put everything on the line to show your might to your opponent.";
 			next;
@@ -1845,8 +1847,8 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 	}
 }
 
-mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
-	if($God3 < 50) {
+mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	4_M_DWARF,{
+	if ($God3 < $@god_check1) {
 		mes "[Vestri]";
 		mes "If you want something, you should earn it through your own efforts.";
 		next;
@@ -1859,7 +1861,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 		close;
 	}
 	else {
-		if($God4 > 99) {
+		if ($God4 >= $@god_check2) {
 			mes "[Vestri]";
 			mes "I don't feel";
 			mes "like doing anything";
@@ -1872,7 +1874,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 			mes "Yeah, I think I need a break! Don't you think I need a break, human?";
 			close;
 		}
-		else if(god_mjo_0 == 11) {
+		else if (god_mjo_0 == 11) {
 			mes "[Vestri]";
 			mes "There's nothing like taking a relaxing break after putting your heart into your work.";
 			next;
@@ -1882,7 +1884,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 			mes "of life's simple pleasures?";
 			close;
 		}
-		else if(god_mjo_0 == 10) {
+		else if (god_mjo_0 == 10) {
 			mes "[Vestri]";
 			mes "If you want something, you should earn it through your own efforts.";
 			next;
@@ -1894,13 +1896,13 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 			mes "Kids these days...";
 			close;
 		}
-		else if(god_mjo_0 == 1) {
-			if(god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
+		else if (god_mjo_0 == 1) {
+			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Vestri]";
 				mes "I really hope I meet a decent human being next time. So far, I haven't met one useful human.";
 				close;
 			}
-			else if(god_mjo_3 == 2) {
+			else if (god_mjo_3 == 2) {
 				mes "[Vestri]";
 				mes "Perfect preparation does not always result in success. There's a point when you've got to just go out and do it.";
 				next;
@@ -1912,7 +1914,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "plan to accomplish in life.";
 				close;
 			}
-			else if(god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_2 == 0 || god_mjo_2 == 1 || god_mjo_4 != 0) {
+			else if (god_mjo_1 == 0 || god_mjo_1 == 1 || god_mjo_2 == 0 || god_mjo_2 == 1 || god_mjo_4 != 0) {
 				mes "[Vestri]";
 				mes "What do you want?";
 				next;
@@ -1934,7 +1936,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					close;
 				}
 			}
-			else if(god_mjo_3 == 1) {
+			else if (god_mjo_3 == 1) {
 				disable_items;
 				mes "[Vestri]";
 				mes "Great...!";
@@ -1943,11 +1945,9 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 
 				setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 				set .@menu$,"";
-				for( set .@i,1; .@i <= 10; set .@i,.@i+1 )
-				{
-					if( getequipisequiped(.@i) )
+				for(set .@i,1; .@i <= 10; set .@i,.@i+1) {
+					if (getequipisequiped(.@i))
 						set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
-
 					set .@menu$, .@menu$ + ":";
 				}
 				set .@part,select(.@menu$);
@@ -1963,17 +1963,12 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					mes "me to do with this?";
 					close;
 				}
-				if (getequipisidentify(.@part) == 0) {
-					mes "[Vestri]";
-					mes "You'd better identify this item first. If we don't know what it is, what's the point of upgrading it?";
-					close;
-				}
 				if (getequiprefinerycnt(.@part) >= 10) {
 					mes "[Vestri]";
 					mes "Oh, this is excellent! This piece here has been perfectly refined! But this isn't what I want. I can't do any work on this at all.";
 					close;
 				}
-				if (GetEquipPercentRefinery(.@part) == 100) {
+				if (getequippercentrefinery(.@part) == 100) {
 					mes "[Vestri]";
 					mes "This item isn't even a challenge to upgrade. You can get humans to do this kind of beginner's stuff. Get them to refine it first.";
 					next;
@@ -2016,8 +2011,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "If you understand,";
 				mes "then let's get on with it!";
 				next;
-				if( select("Sure, let's do it!:N-no, I changed my mind!") == 2 )
-				{
+				if(select("Sure, let's do it!:N-no, I changed my mind!") == 2) {
 					mes "[Vestri]";
 					mes "Bah...!";
 					mes "How do you survive";
@@ -2081,7 +2075,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "Take care.";
 				close;
 			}
-			else if(god_mjo_3 == 0) {
+			else if (god_mjo_3 == 0) {
 				mes "[Vestri]";
 				mes "What do you want?";
 				next;
@@ -2119,13 +2113,13 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 2) {
+		else if (god_mjo_0 == 2) {
 			if (god_mjo_1 == 3 || god_mjo_2 == 3 || god_mjo_3 == 3 || god_mjo_4 == 3) {
 				mes "[Vestri]";
 				mes "I really hope I meet a decent human being next time. So far, I haven't met one useful human.";
 				close;
 			}
-			else if(god_mjo_2 == 2) {
+			else if (god_mjo_2 == 2) {
 				mes "[Vestri]";
 				mes "Perfect preparation does not always result in success. There's a point when you've got to just go out and do it.";
 				next;
@@ -2160,7 +2154,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					close;
 				}
 			}
-			else if(god_mjo_2 == 1) {
+			else if (god_mjo_2 == 1) {
 				disable_items;
 				mes "[Vestri]";
 				mes "Great...!";
@@ -2169,11 +2163,9 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				
 				setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 				set .@menu$,"";
-				for( set .@i,1; .@i <= 10; set .@i,.@i+1 )
-				{
-					if( getequipisequiped(.@i) )
+				for(set .@i,1; .@i <= 10; set .@i,.@i+1) {
+					if (getequipisequiped(.@i))
 						set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
-
 					set .@menu$, .@menu$ + ":";
 				}
 				set .@part,select(.@menu$);
@@ -2189,17 +2181,12 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					mes "me to do with this?";
 					close;
 				}
-				if (getequipisidentify(.@part) == 0) {
-					mes "[Vestri]";
-					mes "You'd better identify this item first. If we don't know what it is, what's the point of upgrading it?";
-					close;
-				}
 				if (getequiprefinerycnt(.@part) >= 10) {
 					mes "[Vestri]";
 					mes "Oh, this is excellent! This piece here has been perfectly refined! But this isn't what I want. I can't do any work on this at all.";
 					close;
 				}
-				if (GetEquipPercentRefinery(.@part) == 100) {
+				if (getequippercentrefinery(.@part) == 100) {
 					mes "[Vestri]";
 					mes "This item isn't even a challenge to upgrade. You can get humans to do this kind of beginner's stuff. Get them to refine it first.";
 					next;
@@ -2237,8 +2224,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "If you understand,";
 				mes "then let's get on with it!";
 				next;
-				if( select("Sure, let's do it!:...no, I am out.") == 2 )
-				{
+				if(select("Sure, let's do it!:...no, I am out.") == 2) {
 					mes "[Vestri]";
 					mes "Bah...!";
 					mes "How do you survive";
@@ -2301,7 +2287,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				mes "Take care.";
 				close;
 			}
-			else if(god_mjo_2 == 0) {
+			else if (god_mjo_2 == 0) {
 				mes "[Vestri]";
 				mes "What do you want?";
 				next;
@@ -2339,7 +2325,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				close;
 			}
 		}
-		else if(god_mjo_0 == 0) {
+		else if (god_mjo_0 == 0) {
 			mes "[Vestri]";
 			mes "It's always a pleasure to engage myself in hard work, especially smithing.";
 			next;
@@ -2356,8 +2342,8 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 	}
 }
 
-mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
-	if ($God3 < 50) {
+mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	4_M_DWARF,{
+	if ($God3 < $@god_check1) {
 		mes "[Nordri]";
 		mes "What...?";
 		mes "I don't have any";
@@ -2368,7 +2354,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 		close;
 	}
 	else {
-		if ($God4 > 99) {
+		if ($God4 >= $@god_check2) {
 			mes "[Nordri]";
 			mes "What's happening?";
 			mes "I sense change in the winds, but what that change may be, I cannot tell.";
@@ -2468,7 +2454,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 								break;
 							}
 						}
-						else if(.@talk_to == 1) {
+						else if (.@talk_to == 1) {
 							mes "[Nordri]";
 							mes "Yes, only a Blaze could have effortlessly consumed meat, bones and plates by burning. Of course!";
 							mes "I remember now!";
@@ -2488,7 +2474,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 								break;
 							}
 						}
-						else if(.@talk_to == 2) {
+						else if (.@talk_to == 2) {
 							mes "[Nordri]";
 							mes "Yes, right! Tialfi was racing 'thoughts!' Nothing can move faster than the speed of thought, so it's no wonder Tialfi would always lose.";
 							next;
@@ -2507,7 +2493,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 								break;
 							}
 						}
-						else if(.@talk_to == 3) {
+						else if (.@talk_to == 3) {
 							mes "[Nordri]";
 							mes "Yes, Thor was wrestling with 'Old Age!' No matter how strong anybody is, you can't fight against aging.";
 							next;
@@ -2554,7 +2540,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 					close;
 				}
 			}
-			else if(god_mjo_4 == 0) {
+			else if (god_mjo_4 == 0) {
 				mes "[Nordri]";
 				mes "What business";
 				mes "do you have with";
@@ -2583,7 +2569,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 				close2;
 			}
 		}
-		else if(god_mjo_0 == 2) {
+		else if (god_mjo_0 == 2) {
 			if ((god_mjo_1 == 3) || (god_mjo_2 == 3) || (god_mjo_3 == 3) || (god_mjo_4 == 3)){
 				mes "[Nordri]";
 				mes "Eh heh heh~";
@@ -2621,7 +2607,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 					close;
 				}
 			}
-			else if(god_mjo_1 == 1) {
+			else if (god_mjo_1 == 1) {
 				if (countitem(501) > 0) {
 
 					delitem 501,1;  //Red_Potion
@@ -2686,7 +2672,7 @@ mjolnir_12,18,18,7	script	Dwarf Blacksmith#north	826,{
 								break;
 							}
 						}
-						else if(.@talk_to == 3) {
+						else if (.@talk_to == 3) {
 							mes "[Nordri]";
 							mes "Yes! Gods refer to the";
 							mes "moon as the 'false sun.'";
diff --git a/npc/quests/seals/seal_status.txt b/npc/quests/seals/seal_status.txt
new file mode 100644
index 000000000..4809f6b7d
--- /dev/null
+++ b/npc/quests/seals/seal_status.txt
@@ -0,0 +1,50 @@
+//===== Hercules Script ======================================
+//= God Item Quest - Seal Status
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.3
+//===== Description: =========================================
+//= God Item Seal Status.
+//===== Additional Comments: =================================
+//= 1.0 Translated from the official. [L0ne_W0lf]
+//= 1.1 Now checks proper char vars. [L0ne_W0lf]
+//= 1.2 Cleaning. [Euphy]
+//= 1.3 Renewal script update. [Euphy]
+//============================================================
+
+prontera,113,294,3	script	Sign Post#god	2_BULLETIN_BOARD,{
+	mes "======== God Seal Status ========";
+	setarray .@seal$[1], "Sleipnir","Megingjard","Brisingamen","Mjolnir";
+	for(set .@i,1; .@i<=4; set .@i,.@i+1) {
+		set .@val, getd("$God"+.@i);
+		if (.@val == 0)
+			set .@status$,"Unseen";
+		else if (.@val < $@god_check1)
+			set .@status$,"Active";
+		else if (.@val < $@god_check2)
+			set .@status$,"Appeared";
+		else
+			set .@status$,"Released";
+		mes .@seal$[.@i]+" Seal: "+.@status$;
+	}
+	mes " ";
+	mes "======= Your Seal Status ========";
+	if (god_sl_1 < 51)
+		mes "^ff0000Sleipnir Seal: Not Completed^000000";
+	else
+		mes "^00ff00Sleipnir Seal: Completed^000000";
+	if (god_eremes < 28)
+		mes "^ff0000Megingjard Seal: Not Completed^000000";
+	else
+		mes "^00ff00Megingjard Seal: Completed^000000";
+	if (god_brising < 50)
+		mes "^ff0000Brisingamen Seal: Not Completed^000000";
+	else
+		mes "^00ff00Brisingamen Seal: Completed^000000";
+	if (god_mjo_0 < 11)
+		mes "^ff0000Mjolnir Seal: Not Completed^000000";
+	else
+		mes "^00ff00Mjolnir Seal: Completed^000000";
+	close;
+}
diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt
index 6fd6da4a5..85005a4fd 100644
--- a/npc/quests/seals/sleipnir_seal.txt
+++ b/npc/quests/seals/sleipnir_seal.txt
@@ -1,21 +1,20 @@
-//===== rAthena Script ======================================= 
-//= Sleipnir seal unlocking NPCs.
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= God Item Quest - Sleipnir Seal
+//===== By: ==================================================
 //= MasterOfMuppets
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
 //= Quest for breaking the seal of Sleipnir.
 //===== Additional Comments: =================================
 //= 1.0 First version. [MasterOfMuppets]
 //= 1.1 Updated several aspects of the script. [L0ne_W0lf]
 //= 1.2 Minor Touchups to quest. [L0ne_W0lf]
 //= 1.3 Fixed a typo with a variable. [L0ne_W0lf]
+//= 1.4 Renewal script update. [Euphy]
 //============================================================
 
-yuno,164,200,4	script	Noyee#G	101,{
+yuno,164,200,4	script	Noyee#G	4W_F_01,{
 	if (BaseLevel < 70) {
 		mes "[Noyee]";
 		mes "Did you know that there's a difference between the armor you can buy from NPC shops and the kinds you obtain from hunting monsters?";
@@ -31,7 +30,7 @@ yuno,164,200,4	script	Noyee#G	101,{
 		close;
 	}
 	else {
-		if ($God1 > 99) {
+		if ($God1 >= $@god_check2) {
 			mes "[Noyee]";
 			mes "Did you know that there's a difference between the armor you can buy from NPC shops and the kinds you obtain from hunting monsters?";
 			next;
@@ -60,7 +59,7 @@ yuno,164,200,4	script	Noyee#G	101,{
 	}
 }
 
-que_god01,98,98,4	script	Manager#G	69,{
+que_god01,98,98,4	script	Manager#G	1_F_04,{
 	if (checkweight(908,500) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
@@ -73,10 +72,10 @@ que_god01,98,98,4	script	Manager#G	69,{
 		mes "Wait...!";
 		mes "I can't even remember the last";
 		mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!";
-		Emotion ET_PROFUSELY_SWAT;
+		emotion e_swt2;
 		close;
 	}
-	if ($God1 < 100) {
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 0) {
 			mes "[Cukure]";
 			mes "I can't believe how busy I am at work nowadays. I don't even have time to see any of my friends or go shopping.";
@@ -196,305 +195,239 @@ que_god01,98,98,4	script	Manager#G	69,{
 			mes "[Cukure]";
 			mes "Ah, there it is.";
 			mes "It might not be much, but I hope you accept it as a token of my gratitude. Good luck on your travels!";
-			if ($God1 < 100)set $God1,$God1+1;
-			if ($God1 == 50) {
+			if ($God1 < $@god_check2)
+				set $God1,$God1+1;
+			if ($God1 == $@god_check1)
 				announce "The 1st seal of [Sleipnir] has appeared.",bc_all;
-			}
-			else if ($God1 == 100) {
-				if ($God1 == 100 && $God2 == 100 && $God3 == 100 && $God4 == 100) {
+			else if ($God1 == $@god_check2) {
+				if ($God1 == $@god_check2 && $God2 == $@god_check2 && $God3 == $@god_check2 && $God4 == $@god_check2)
 					announce "our seals have been released at the same time with the seal of [Sleipnir].",bc_all;
-				}
-				else {
+				else
 					announce "The 1st seal of [Sleipnir] has been released.",bc_all;
-				}
 			}
 			set god_sl_1,51;
 			set .@god_treasure,rand(1,900);
 			set .@god_treasure1,rand(1,1000);
-			if (.@god_treasure < 101) {
-				if (.@god_treasure1 < 210) {
-					getitem 2102,1; // Guard_
-				}
-				else if (.@god_treasure1 < 420) {
-					getitem 2104,1; // Buckler_
-				}
-				else if (.@god_treasure1 < 630) {
-					getitem 2106,1; // Shield_
-				}
-				else if (.@god_treasure1 < 840) {
-					getitem 2108,1; // Mirror_Shield_
+			if (checkre(0)) {
+				if (.@god_treasure < 101) {
+					     if (.@god_treasure1 < 210) getitem 2102,1; //Guard_
+					else if (.@god_treasure1 < 420) getitem 2104,1; //Buckler_
+					else if (.@god_treasure1 < 630) getitem 2106,1; //Shield_
+					else if (.@god_treasure1 < 840) getitem 2108,1; //Mirror_Shield_
+					else getitem 2109,1; //Memorize_Book
+				}
+				else if (.@god_treasure < 201) {
+					     if (.@god_treasure1 < 48) getitem 2207,1; //Fancy_Flower
+					else if (.@god_treasure1 < 96) getitem 2210,1; //Hair_Band
+					else if (.@god_treasure1 < 150) getitem 2213,1; //Cat_Hairband
+					else if (.@god_treasure1 < 190) getitem 2215,1; //Flower_Hairband
+					else if (.@god_treasure1 < 238) getitem 2217,1; //Biretta_
+					else if (.@god_treasure1 < 290) getitem 2223,1; //Turban_
+					else if (.@god_treasure1 < 340) getitem 2227,1; //Cap_
+					else if (.@god_treasure1 < 348) getitem 2229,1; //Helm_
+					else if (.@god_treasure1 < 400) getitem 2231,1; //Gemmed_Sallet_
+					else if (.@god_treasure1 < 448) getitem 2233,1; //Circlet_
+					else if (.@god_treasure1 < 496) getitem 2236,1; //Santa's_Hat
+					else if (.@god_treasure1 < 544) getitem 2244,1; //Big_Sis'_Ribbon
+					else if (.@god_treasure1 < 592) getitem 2245,1; //Sweet_Gents
+					else if (.@god_treasure1 < 640) getitem 2247,1; //Oldman's_Romance
+					else if (.@god_treasure1 < 688) getitem 2248,1; //Western_Grace
+					else if (.@god_treasure1 < 736) getitem 2250,1; //Fillet
+					else if (.@god_treasure1 < 784) getitem 2251,1; //Holy_Bonnet
+					else if (.@god_treasure1 < 832) getitem 2252,1; //Star_Sparkling
+					else if (.@god_treasure1 < 880) getitem 2253,1; //Sunflower
+					else if (.@god_treasure1 < 940) getitem 2257,1; //Snowy_Horn
+					else getitem 2259,1; //Mini_Propeller
+				}
+				else if (.@god_treasure < 301) {
+					     if (.@god_treasure1 < 160) getitem 2267,1; //Cigar
+					else if (.@god_treasure1 < 320) getitem 2262,1; //Pierrot_Nose
+					else if (.@god_treasure1 < 480) getitem 2263,1; //Gangster_Patch
+					else if (.@god_treasure1 < 540) getitem 2265,1; //Ganster_Mask
+					else if (.@god_treasure1 < 700) getitem 2266,1; //Iron_Cane
+					else if (.@god_treasure1 < 800) getitem 2260,1; //Mini_Glasses
+					else if (.@god_treasure1 < 900) getitem 2269,1; //Centimental_Flower
+					else getitem 2270,1; //Centimental_Leaf
+				}
+				else if (.@god_treasure < 401) {
+					     if (.@god_treasure1 < 70) getitem 2298,1; //Green_Feeler
+					else if (.@god_treasure1 < 140) getitem 2275,1; //Red_Bandana
+					else if (.@god_treasure1 < 210) getitem 2276,1; //Eagle_Eyes
+					else if (.@god_treasure1 < 280) getitem 2277,1; //Nurse_Cap
+					else if (.@god_treasure1 < 350) getitem 2279,1; //Bomb_Wick
+					else if (.@god_treasure1 < 420) getitem 2282,1; //Spirit_Chain
+					else if (.@god_treasure1 < 490) getitem 2299,1; //Viking_Helm
+					else if (.@god_treasure1 < 560) getitem 2287,1; //Pirate_Bandana
+					else if (.@god_treasure1 < 630) getitem 2289,1; //Poo_Poo_Hat
+					else if (.@god_treasure1 < 700) getitem 2290,1; //Funeral_Costume
+					else if (.@god_treasure1 < 770) getitem 2291,1; //Masquerade
+					else if (.@god_treasure1 < 840) getitem 2294,1; //Star_Dust
+					else if (.@god_treasure1 < 900) getitem 2295,1; //Blinker
+					else if (.@god_treasure1 < 950) getitem 2271,1; //Jack_A_Dandy
+					else getitem 2285,1; //Apple_Of_Archer
+				}
+				else if (.@god_treasure < 501) {
+					     if (.@god_treasure1 < 80) getitem 2306,1; //Adventurere's_Suit_
+					else if (.@god_treasure1 < 160) getitem 2308,1; //Mantle_
+					else if (.@god_treasure1 < 240) getitem 2310,1; //Coat_
+					else if (.@god_treasure1 < 320) getitem 2311,1; //Mink_Coat
+					else if (.@god_treasure1 < 400) getitem 2313,1; //Padded_Armor_
+					else if (.@god_treasure1 < 480) getitem 2315,1; //Chain_Mail_
+					else if (.@god_treasure1 < 560) getitem 2329,1; //Wooden_Mail_
+					else if (.@god_treasure1 < 630) getitem 2320,1; //Formal_Suit
+					else if (.@god_treasure1 < 700) getitem 2322,1; //Silk_Robe_
+					else if (.@god_treasure1 < 760) getitem 2324,1; //Scapulare_
+					else if (.@god_treasure1 < 810) getitem 2326,1; //Saint_Robe_
+					else if (.@god_treasure1 < 850) getitem 2342,1; //Full_Plate_Armor_
+					else if (.@god_treasure1 < 900) getitem 2331,1; //Tights_
+					else if (.@god_treasure1 < 950) getitem 2333,1; //Silver_Robe_
+					else getitem 2336,1; //Thief_Clothes_
+				}
+				else if (.@god_treasure < 601) {
+					     if (.@god_treasure1 < 200) getitem 2402,1; //Sandals_
+					else if (.@god_treasure1 < 400) getitem 2404,1; //Shoes_
+					else if (.@god_treasure1 < 600) getitem 2406,1; //Boots_
+					else if (.@god_treasure1 < 800) getitem 2407,1; //Chrystal_Pumps
+					else getitem 2409,1; //Spiky_Heel
+				}
+				else if (.@god_treasure < 701) {
+					     if (.@god_treasure1 < 300) getitem 2502,1; //Hood_
+					else if (.@god_treasure1 < 550) getitem 2504,1; //Muffler_
+					else if (.@god_treasure1 < 750) getitem 2506,1; //Manteau_
+					else getitem 2508,1; //Ragamuffin_Cape
+				}
+				else if (.@god_treasure < 801) {
+					     if (.@god_treasure1 < 110) getitem 2601,1; //Ring
+					else if (.@god_treasure1 < 220) getitem 2602,1; //Earring
+					else if (.@god_treasure1 < 330) getitem 2603,1; //Necklace
+					else if (.@god_treasure1 < 440) getitem 2604,1; //Glove
+					else if (.@god_treasure1 < 550) getitem 2605,1; //Brooch
+					else if (.@god_treasure1 < 660) getitem 2607,1; //Clip
+					else if (.@god_treasure1 < 770) getitem 2608,1; //Rosary
+					else if (.@god_treasure1 < 880) getitem 2617,1; //Mitten_Of_Presbyter
+					else getitem 2618,1; //Matyr's_Flea_Guard
 				}
 				else {
-					getitem 2109,1; // Memorize_Book
-				}
-			}
-			else if (.@god_treasure < 201) {
-				if (.@god_treasure1 < 48) {
-					getitem 2254,1; // Angelic_Chain
-				}
-				else if (.@god_treasure1 < 96) {
-					getitem 2210,1; // Hair_Band
-				}
-				else if (.@god_treasure1 < 150) {
-					getitem 2213,1; // Cat_Hairband
-				}
-				else if (.@god_treasure1 < 190) {
-					getitem 2255,1; // Satanic_Chain
-				}
-				else if (.@god_treasure1 < 238) {
-					getitem 2217,1; // Biretta_
-				}
-				else if (.@god_treasure1 < 290) {
-					getitem 2223,1; // Turban_
-				}
-				else if (.@god_treasure1 < 340) {
-					getitem 2227,1; // Cap_
-				}
-				else if (.@god_treasure1 < 348) {
-					getitem 2229,1; // Helm_
-				}
-				else if (.@god_treasure1 < 400) {
-					getitem 2231,1; // Gemmed_Sallet_
-				}
-				else if (.@god_treasure1 < 448) {
-					getitem 2233,1; // Circlet_
-				}
-				else if (.@god_treasure1 < 496) {
-					getitem 5053,1; // Spinx_Helm
-				}
-				else if (.@god_treasure1 < 544) {
-					getitem 5019,1; // Corsair
-				}
-				else if (.@god_treasure1 < 592) {
-					getitem 2245,1; // Sweet_Gents
-				}
-				else if (.@god_treasure1 < 640) {
-					getitem 2247,1; // Oldman's_Romance
-				}
-				else if (.@god_treasure1 < 688) {
-					getitem 2248,1; // Western_Grace
-				}
-				else if (.@god_treasure1 < 736) {
-					getitem 5166,1; // Spinx_Helm_
-				}
-				else if (.@god_treasure1 < 784) {
-					getitem 5158,1; // Holy_Bonnet_
-				}
-				else if (.@god_treasure1 < 832) {
-					getitem 2249,1; // Coronet
-				}
-				else if (.@god_treasure1 < 880) {
-					getitem 5157,1; // Viking_Helm_
-				}
-				else if (.@god_treasure1 < 940) {
-					getitem 2285,1; // Apple_Of_Archer
-				}
-				else {
-					getitem 5093,1; // Blue_Coif_
-				}
-			}
-			else if (.@god_treasure < 301) {
-				if (.@god_treasure1 < 160) {
-					getitem 5014,1; // Fin_Helm
-				}
-				else if (.@god_treasure1 < 320) {
-					getitem 5005,1; // Gas_Mask
-				}
-				else if (.@god_treasure1 < 480) {
-					getitem 5054,1; // Assasin_Mask
-				}
-				else if (.@god_treasure1 < 540) {
-					getitem 2265,1; // Ganster_Mask
-				}
-				else if (.@god_treasure1 < 700) {
-					getitem 2266,1; // Iron_Cane
-				}
-				else if (.@god_treasure1 < 800) {
-					getitem 2260,1; // Mini_Glasses
-				}
-				else if (.@god_treasure1 < 900) {
-					getitem 5113,1; // Angry_Mouth
-				}
-				else {
-					// Pirate Dagger is iRO only, and requires extra files in client.
-					getitem 2270,1; // Centimental_Leaf
-					//getitem 5305,1 // Pirate_Dagger
-				}
-			}
-			else if (.@god_treasure < 401) {
-				if (.@god_treasure1 < 70) {
-					getitem 2286,1; // Elven_Ears
-				}
-				else if (.@god_treasure1 < 140) {
-					getitem 5002,1; // Gemmed_Crown
-				}
-				else if (.@god_treasure1 < 210) {
-					getitem 5147,1; // Baseball_Cap
-				}
-				else if (.@god_treasure1 < 280) {
-					getitem 2217,1; // Biretta_
-				}
-				else if (.@god_treasure1 < 350) {
-					getitem 5120,1; // Fedora_
-				}
-				else if (.@god_treasure1 < 420) {
-					getitem 2261,1; // Prontera_Army_Cap
-				}
-				else if (.@god_treasure1 < 490) {
-					getitem 5162,1; // Bone_Helm_
-				}
-				else if (.@god_treasure1 < 560) {
-					getitem 5030,1; // Panda_Cap
-				}
-				else if (.@god_treasure1 < 630) {
-					getitem 5109,1; // Red_Bonnet
-				}
-				else if (.@god_treasure1 < 700) {
-					getitem 5084,1; // Lazy_Raccoon
-				}
-				else if (.@god_treasure1 < 770) {
-					getitem 5168,1; // Bongun_Hat_
-				}
-				else if (.@god_treasure1 < 840) {
-					getitem 2214,1; // Bunny_Band
-				}
-				else if (.@god_treasure1 < 900) {
-					getitem 2295,1; // Blinker
-				}
-				else if (.@god_treasure1 < 950) {
-					getitem 5167,1; // Munak_Turban_
-				}
-				else {
-					getitem 5018,1; // Feather_Bonnet
-				}
-			} else if (.@god_treasure < 501) {
-				if (.@god_treasure1 < 85) {
-					getitem 2310,1; // Coat_
-				}
-				else if (.@god_treasure1 < 170) {
-					getitem 2311,1; // Mink_Coat
-				}
-				else if (.@god_treasure1 < 255) {
-					getitem 2313,1; // Padded_Armor_
-				}
-				else if (.@god_treasure1 < 340) {
-					getitem 2317,1; // Plate_Armor_
-				}
-				else if (.@god_treasure1 < 425) {
-					getitem 2319,1; // Glittering_Clothes
-				}
-				else if (.@god_treasure1 < 510) {
-					getitem 2320,1; // Formal_Suit
-				}
-				else if (.@god_treasure1 < 595) {
-					getitem 2322,1; // Silk_Robe_
-				}
-				else if (.@god_treasure1 < 680) {
-					getitem 2359,1; // Ninja_Suit_
-				}
-				else if (.@god_treasure1 < 765) {
-					getitem 2326,1; // Saint_Robe_
-				}
-				else if (.@god_treasure1 < 850) {
-					getitem 2342,1; // Full_Plate_Armor_
-				}
-				else if (.@god_treasure1 < 935) {
-					getitem 2331,1; // Tights_
-				}
-				else {
-					getitem 2336,1; // Thief_Clothes_
-				}
-			}
-			else if (.@god_treasure < 601) {
-				if (.@god_treasure1 < 200) {
-					getitem 2422,1; // High_Fashion_Sandals
-				}
-				else if (.@god_treasure1 < 400) {
-					getitem 2404,1; // Shoes_
-				}
-				else if (.@god_treasure1 < 600) {
-					getitem 2406,1; // Boots_
-				}
-				else if (.@god_treasure1 < 800) {
-					getitem 2407,1; // Chrystal_Pumps
-				}
-				else {
-					getitem 2412,1; // Grave_
-				}
-			}
-			else if (.@god_treasure < 701) {
-				if (.@god_treasure1 < 200) {
-					getitem 2513,1; // Celestial_Robe
-				}
-				else if (.@god_treasure1 < 400) {
-					getitem 2504,1; // Muffler_
-				}
-				else if (.@god_treasure1 < 600) {
-					getitem 2506,1; // Manteau_
-				}
-				else if (.@god_treasure1 < 800) {
-					getitem 2514,1; // Pauldron
-				}
-				else {
-					getitem 2508,1; // Ragamuffin_Cape
-				}
-			}
-			else if (.@god_treasure < 801) {
-				if (.@god_treasure1 < 110) {
-					getitem 1122,1; // Ring_
-				}
-				else if (.@god_treasure1 < 220) {
-					getitem 2622,1; // Earring_
-				}
-				else if (.@god_treasure1 < 330) {
-					getitem 2623,1; // Necklace_
-				}
-				else if (.@god_treasure1 < 440) {
-					getitem 2624,1; // Glove_
-				}
-				else if (.@god_treasure1 < 550) {
-					getitem 2625,1; // Brooch_
-				}
-				else if (.@god_treasure1 < 660) {
-					getitem 2607,1; // Clip
-				}
-				else if (.@god_treasure1 < 770) {
-					getitem 2626,1; // Rosary_
-				}
-				else if (.@god_treasure1 < 880) {
-					getitem 2617,1; // Mitten_Of_Presbyter
-				}
-				else {
-					getitem 2671,1; // Thimble_Of_Archer_
-				}
-			}
-			else {
-				if (.@god_treasure1 < 150) {
-					getitem 2281,1; // Phantom_Of_Opera
-				}
-				else if (.@god_treasure1 < 260) {
-					getitem 2297,1; // Goblini_Mask
-				}
-				else if (.@god_treasure1 < 370) {
-					getitem 5087,1; // Goblin_Mask_01
-				}
-				else if (.@god_treasure1 < 480) {
-					getitem 5088,1; // Goblin_Mask_02
-				}
-				else if (.@god_treasure1 < 590) {
-					getitem 5089,1; // Goblin_Mask_03
-				}
-				else if (.@god_treasure1 < 700) {
-					getitem 5090,1; // Goblin_Mask_04
-				}
-				else if (.@god_treasure1 < 810) {
-					getitem 5086,1; // Alarm_Mask
+					     if (.@god_treasure1 < 150) getitem 2288,1; //Mr_Scream
+					else if (.@god_treasure1 < 260) getitem 2297,1; //Goblini_Mask
+					else if (.@god_treasure1 < 370) getitem 5087,1; //Goblin_Mask_01
+					else if (.@god_treasure1 < 480) getitem 5088,1; //Goblin_Mask_02
+					else if (.@god_treasure1 < 590) getitem 5089,1; //Goblin_Mask_03
+					else if (.@god_treasure1 < 700) getitem 5090,1; //Goblin_Mask_04
+					else if (.@god_treasure1 < 810) getitem 5046,1; //Bongun_Hat
+					else if (.@god_treasure1 < 920) getitem 2264,1; //Munak_Turban
+					else getitem 2225,1; //Goggle_
+				}
+			} else {
+				if (.@god_treasure < 101) {
+					     if (.@god_treasure1 < 210) getitem 2102,1; //Guard_
+					else if (.@god_treasure1 < 420) getitem 2104,1; //Buckler_
+					else if (.@god_treasure1 < 630) getitem 2106,1; //Shield_
+					else if (.@god_treasure1 < 840) getitem 2108,1; //Mirror_Shield_
+					else getitem 2109,1; //Memorize_Book
+				}
+				else if (.@god_treasure < 201) {
+					     if (.@god_treasure1 < 48) getitem 2254,1; //Angelic_Chain
+					else if (.@god_treasure1 < 96) getitem 2210,1; //Hair_Band
+					else if (.@god_treasure1 < 150) getitem 2213,1; //Cat_Hairband
+					else if (.@god_treasure1 < 190) getitem 2255,1; //Satanic_Chain
+					else if (.@god_treasure1 < 238) getitem 2217,1; //Biretta_
+					else if (.@god_treasure1 < 290) getitem 2223,1; //Turban_
+					else if (.@god_treasure1 < 340) getitem 2227,1; //Cap_
+					else if (.@god_treasure1 < 348) getitem 2229,1; //Helm_
+					else if (.@god_treasure1 < 400) getitem 2231,1; //Gemmed_Sallet_
+					else if (.@god_treasure1 < 448) getitem 2233,1; //Circlet_
+					else if (.@god_treasure1 < 496) getitem 5053,1; //Spinx_Helm
+					else if (.@god_treasure1 < 544) getitem 5019,1; //Corsair
+					else if (.@god_treasure1 < 592) getitem 2245,1; //Sweet_Gents
+					else if (.@god_treasure1 < 640) getitem 2247,1; //Oldman's_Romance
+					else if (.@god_treasure1 < 688) getitem 2248,1; //Western_Grace
+					else if (.@god_treasure1 < 736) getitem 5166,1; //Spinx_Helm_
+					else if (.@god_treasure1 < 784) getitem 5158,1; //Holy_Bonnet_
+					else if (.@god_treasure1 < 832) getitem 2249,1; //Coronet
+					else if (.@god_treasure1 < 880) getitem 5157,1; //Viking_Helm_
+					else if (.@god_treasure1 < 940) getitem 2285,1; //Apple_Of_Archer
+					else getitem 5093,1; //Blue_Coif_
+				}
+				else if (.@god_treasure < 301) {
+					     if (.@god_treasure1 < 160) getitem 5014,1; //Fin_Helm
+					else if (.@god_treasure1 < 320) getitem 5005,1; //Gas_Mask
+					else if (.@god_treasure1 < 480) getitem 5054,1; //Assasin_Mask
+					else if (.@god_treasure1 < 540) getitem 2265,1; //Ganster_Mask
+					else if (.@god_treasure1 < 700) getitem 2266,1; //Iron_Cane
+					else if (.@god_treasure1 < 800) getitem 2260,1; //Mini_Glasses
+					else if (.@god_treasure1 < 900) getitem 5113,1; //Angry_Mouth
+					else {
+						// Pirate Dagger is iRO only, and requires extra files in client.
+						//getitem 5305,1 //Pirate_Dagger
+						getitem 2270,1; //Centimental_Leaf
+					}
 				}
-				else if (.@god_treasure1 < 920) {
-					getitem 2292,1; // Welding_Mask
+				else if (.@god_treasure < 401) {
+					     if (.@god_treasure1 < 70) getitem 2286,1; //Elven_Ears
+					else if (.@god_treasure1 < 140) getitem 5002,1; //Gemmed_Crown
+					else if (.@god_treasure1 < 210) getitem 5147,1; //Baseball_Cap
+					else if (.@god_treasure1 < 280) getitem 2217,1; //Biretta_
+					else if (.@god_treasure1 < 350) getitem 5120,1; //Fedora_
+					else if (.@god_treasure1 < 420) getitem 2261,1; //Prontera_Army_Cap
+					else if (.@god_treasure1 < 490) getitem 5162,1; //Bone_Helm_
+					else if (.@god_treasure1 < 560) getitem 5030,1; //Panda_Cap
+					else if (.@god_treasure1 < 630) getitem 5109,1; //Red_Bonnet
+					else if (.@god_treasure1 < 700) getitem 5084,1; //Lazy_Raccoon
+					else if (.@god_treasure1 < 770) getitem 5168,1; //Bongun_Hat_
+					else if (.@god_treasure1 < 840) getitem 2214,1; //Bunny_Band
+					else if (.@god_treasure1 < 900) getitem 2295,1; //Blinker
+					else if (.@god_treasure1 < 950) getitem 5167,1; //Munak_Turban_
+					else getitem 5018,1; //Feather_Bonnet
+				} else if (.@god_treasure < 501) {
+					     if (.@god_treasure1 < 85) getitem 2310,1; //Coat_
+					else if (.@god_treasure1 < 170) getitem 2311,1; //Mink_Coat
+					else if (.@god_treasure1 < 255) getitem 2313,1; //Padded_Armor_
+					else if (.@god_treasure1 < 340) getitem 2317,1; //Plate_Armor_
+					else if (.@god_treasure1 < 425) getitem 2319,1; //Glittering_Clothes
+					else if (.@god_treasure1 < 510) getitem 2320,1; //Formal_Suit
+					else if (.@god_treasure1 < 595) getitem 2322,1; //Silk_Robe_
+					else if (.@god_treasure1 < 680) getitem 2359,1; //Ninja_Suit_
+					else if (.@god_treasure1 < 765) getitem 2326,1; //Saint_Robe_
+					else if (.@god_treasure1 < 850) getitem 2342,1; //Full_Plate_Armor_
+					else if (.@god_treasure1 < 935) getitem 2331,1; //Tights_
+					else getitem 2336,1; //Thief_Clothes_
+				}
+				else if (.@god_treasure < 601) {
+					     if (.@god_treasure1 < 200) getitem 2422,1; //High_Fashion_Sandals
+					else if (.@god_treasure1 < 400) getitem 2404,1; //Shoes_
+					else if (.@god_treasure1 < 600) getitem 2406,1; //Boots_
+					else if (.@god_treasure1 < 800) getitem 2407,1; //Chrystal_Pumps
+					else getitem 2412,1; //Grave_
+				}
+				else if (.@god_treasure < 701) {
+					     if (.@god_treasure1 < 200) getitem 2513,1; //Celestial_Robe
+					else if (.@god_treasure1 < 400) getitem 2504,1; //Muffler_
+					else if (.@god_treasure1 < 600) getitem 2506,1; //Manteau_
+					else if (.@god_treasure1 < 800) getitem 2514,1; //Pauldron
+					else getitem 2508,1; //Ragamuffin_Cape
+				}
+				else if (.@god_treasure < 801) {
+					     if (.@god_treasure1 < 110) getitem 1122,1; //Ring_
+					else if (.@god_treasure1 < 220) getitem 2622,1; //Earring_
+					else if (.@god_treasure1 < 330) getitem 2623,1; //Necklace_
+					else if (.@god_treasure1 < 440) getitem 2624,1; //Glove_
+					else if (.@god_treasure1 < 550) getitem 2625,1; //Brooch_
+					else if (.@god_treasure1 < 660) getitem 2607,1; //Clip
+					else if (.@god_treasure1 < 770) getitem 2626,1; //Rosary_
+					else if (.@god_treasure1 < 880) getitem 2617,1; //Mitten_Of_Presbyter
+					else getitem 2671,1; //Thimble_Of_Archer_
 				}
 				else {
-					getitem 5006,1; // Machoman_Glasses
+					     if (.@god_treasure1 < 150) getitem 2281,1; //Phantom_Of_Opera
+					else if (.@god_treasure1 < 260) getitem 2297,1; //Goblini_Mask
+					else if (.@god_treasure1 < 370) getitem 5087,1; //Goblin_Mask_01
+					else if (.@god_treasure1 < 480) getitem 5088,1; //Goblin_Mask_02
+					else if (.@god_treasure1 < 590) getitem 5089,1; //Goblin_Mask_03
+					else if (.@god_treasure1 < 700) getitem 5090,1; //Goblin_Mask_04
+					else if (.@god_treasure1 < 810) getitem 5086,1; //Alarm_Mask
+					else if (.@god_treasure1 < 920) getitem 2292,1; //Welding_Mask
+					else getitem 5006,1; //Machoman_Glasses
 				}
 			}
 			next;
@@ -572,8 +505,8 @@ que_god01,98,98,4	script	Manager#G	69,{
 	end;
 }
 
-que_god01,66,125,6	script	Researcher#G1	89,{
-	if ($God1 < 100) {
+que_god01,66,125,6	script	Researcher#G1	4_M_ORIENT02,{
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 2) {
 			set god_sl_1,11;
 		}
@@ -738,8 +671,8 @@ que_god01,66,125,6	script	Researcher#G1	89,{
 	}
 }
 
-que_god01,11,136,6	script	Researcher#G2	742,{
-	if ($God1 < 100) {
+que_god01,11,136,6	script	Researcher#G2	2_M_SAGE_B,{
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 2) {
 			set god_sl_1,21;
 		}
@@ -957,8 +890,8 @@ que_god01,11,136,6	script	Researcher#G2	742,{
 	}
 }
 
-que_god01,55,47,3	script	Researcher#G3	803,{
-	if (god_sl2 < 100) {
+que_god01,55,47,3	script	Researcher#G3	1_F_SIGNZISK,{
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 2) {
 			set god_sl_1,31;
 		}
@@ -1223,8 +1156,8 @@ que_god01,55,47,3	script	Researcher#G3	803,{
 	}
 }
 
-que_god01,14,47,3	script	Researcher#G4	713,{
-	if ($God1 < 100) {
+que_god01,14,47,3	script	Researcher#G4	4_M_06,{
+	if ($God1 < $@god_check2) {
 		if (god_sl_1 == 2) {
 			set god_sl_1,41;
 		}
@@ -1329,8 +1262,8 @@ que_god01,14,47,3	script	Researcher#G4	713,{
 	}
 }
 
-que_god01,20,48,0	script	Slab#G	111,{
-	if ($God1 < 100) {
+que_god01,20,48,0	script	Slab#G	HIDDEN_NPC,{
+	if ($God1 < $@god_check2) {
 		if ((god_sl_1 == 41) || (god_sl_1 == 12) || (god_sl_1 == 23) || (god_sl_1 == 34)) {
 			if ((god_sl_2 == 1) || (god_sl_2 == 2)) {
 				mes "....whgks ^ff00ffdirdnl^000000sjs wkrdjswhgks whdtnfb";
@@ -1475,8 +1408,8 @@ que_god01,20,48,0	script	Slab#G	111,{
 	}
 }
 
-payon,79,171,4	script	Friar#G5	95,{
-	if ($God1 < 100) {
+payon,79,171,4	script	Friar#G5	4_F_SISTER,{
+	if ($God1 < $@god_check2) {
 		if ((god_sl_1 == 21) || (god_sl_1 == 32) || (god_sl_1 == 43) || (god_sl_1 == 14)) {
 			if ((god_sl_2 == 1) || (god_sl_2 == 3)) {
 				mes "[Lania]";
@@ -1885,7 +1818,7 @@ payon,79,171,4	script	Friar#G5	95,{
 	}
 }
 
-que_god01,84,95,0	script	Switch#God0	111,{
+que_god01,84,95,0	script	Switch#God0	HIDDEN_NPC,{
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1901,7 +1834,7 @@ que_god01,84,95,0	script	Switch#God0	111,{
 	}
 }
 
-que_god01,84,92,0	script	god_sl_w0	45,1,1,{
+que_god01,84,92,0	script	god_sl_w0	WARPNPC,1,1,{
 OnTouch:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
@@ -1915,7 +1848,7 @@ OnTouch:
 	}
 }
 
-que_god01,49,97,0	script	Switch#God1	111,{
+que_god01,49,97,0	script	Switch#God1	HIDDEN_NPC,{
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1928,7 +1861,7 @@ que_god01,49,97,0	script	Switch#God1	111,{
 	}
 }
 
-que_god01,46,97,0	script	god_sl_w1	45,1,1,{
+que_god01,46,97,0	script	god_sl_w1	WARPNPC,1,1,{
 OnTouch:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
@@ -1942,7 +1875,7 @@ OnTouch:
 	}
 }
 
-que_god01,19,97,0	script	Switch#God2	111,{
+que_god01,19,97,0	script	Switch#God2	HIDDEN_NPC,{
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1955,7 +1888,7 @@ que_god01,19,97,0	script	Switch#God2	111,{
 	}
 }
 
-que_god01,16,97,0	script	god_sl_w2	45,1,1,{
+que_god01,16,97,0	script	god_sl_w2	WARPNPC,1,1,{
 OnTouch:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
@@ -1969,7 +1902,7 @@ OnTouch:
 	}
 }
 
-que_god01,14,80,0	script	Switch#God3	111,{
+que_god01,14,80,0	script	Switch#God3	HIDDEN_NPC,{
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1982,7 +1915,7 @@ que_god01,14,80,0	script	Switch#God3	111,{
 	}
 }
 
-que_god01,17,80,0	script	god_sl_w3	45,1,1,{
+que_god01,17,80,0	script	god_sl_w3	WARPNPC,1,1,{
 OnTouch:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
@@ -1996,7 +1929,7 @@ OnTouch:
 	}
 }
 
-que_god01,44,80,0	script	Switch#God4	111,{
+que_god01,44,80,0	script	Switch#God4	HIDDEN_NPC,{
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -2009,7 +1942,7 @@ que_god01,44,80,0	script	Switch#God4	111,{
 	}
 }
 
-que_god01,47,80,0	script	god_sl_w4	45,1,1,{
+que_god01,47,80,0	script	god_sl_w4	WARPNPC,1,1,{
 OnTouch:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index 3f81aee27..d5db475f8 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -4,16 +4,16 @@
 //= kobra_k88
 //===== Current Version: =====================================
 //= 1.8
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Quest for skills: Holy Light
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Fixed a typo in job check. (Bugreport:1531) [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
 //= 1.8 Fixed JobLevel requirements. [Euphy]
 //============================================================
 
-prt_church,173,23,4	script	Cleric	79,{
+prt_church,173,23,4	script	Cleric	1_F_PRIEST,{
 	mes "[Acolyte Klift]";
 	mes "Ahh . Brothers ! Does the task of";
 	mes "caring for out lost sheep burden";
@@ -107,11 +107,11 @@ prt_church,173,23,4	script	Cleric	79,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.
+//============================================================
+//= 1.0a Now using functions found in "Global_Functions.txt"
+//=     for class checks.
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed an exploit [Lupus]
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index b53c6cd21..2add112c4 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -1,14 +1,14 @@
 //===== Hercules Script ======================================
 //= Alchemist Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Description: ========================================= 
-//= [Aegis COnversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for item: Elemental_Create_Book
 //= Quest for skill: Bioethics
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.9 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 2.0 Rescripted (and re-added) Bio Ethics quest. [L0ne_W0lf]
 //= 2.1 Fixed a Resurrection -> Homunculus Resurrection. [L0ne_W0lf]
@@ -16,7 +16,7 @@
 //= 2.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
-yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
+yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 	if (BaseJob == Job_Alchemist) {
 		if (JobLevel < 40) {
 			mes "[Pisruik]";
@@ -1101,7 +1101,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 	}
 }
 
-yuno_in04,22,107,5	script	Irache#qsk_al	740,{
+yuno_in04,22,107,5	script	Irache#qsk_al	2_M_ALCHE,{
 	mes "[Irache]";
 	mes "Heh heh heh...!";
 	mes "It's done! With this";
@@ -1119,7 +1119,7 @@ yuno_in04,22,107,5	script	Irache#qsk_al	740,{
 	close;
 }
 
-yuno_in04,27,107,4	script	Degas#qsk_al	748,{
+yuno_in04,27,107,4	script	Degas#qsk_al	4_M_ALCHE_A,{
 	mes "[Degas]";
 	mes "It's such a pain working";
 	mes "so close to these other";
@@ -1137,7 +1137,7 @@ yuno_in04,27,107,4	script	Degas#qsk_al	748,{
 	close;
 }
 
-yuno_in04,33,106,4	script	Pile of Books#qsk_al	111,{
+yuno_in04,33,106,4	script	Pile of Books#qsk_al	HIDDEN_NPC,{
 	mes "^3355FFIt's simply a pile";
 	mes "of scattered documents.";
 	mes "Although it seems unorganized,";
@@ -1147,7 +1147,7 @@ yuno_in04,33,106,4	script	Pile of Books#qsk_al	111,{
 }
 
 // Start Bioethics quest
-lhz_in01,224,140,3	script	Kellasus#qsk_al	57,{
+lhz_in01,224,140,3	script	Kellasus#qsk_al	1_M_LIBRARYMASTER,{
 	if (BaseJob == Job_Alchemist && bioeth == 13) {
 		mes "[Kellasus]";
 		mes "Keep up the";
@@ -1203,7 +1203,7 @@ lhz_in01,224,140,3	script	Kellasus#qsk_al	57,{
 		mes "" + strcharinfo(0) + ".";
 		next;
 		set bioeth,13;
-		skill 238,1,0;
+		skill "AM_BIOETHICS",1,0;
 		mes "[Kellasus]";
 		mes "Ah...";
 		mes "" + strcharinfo(0) + ".";
@@ -1740,7 +1740,7 @@ lhz_in01,224,140,3	script	Kellasus#qsk_al	57,{
 	close;
 }
 
-lhz_in01,225,122,5	script	Skrajjad#qsk_al	754,{
+lhz_in01,225,122,5	script	Skrajjad#qsk_al	4_M_SAGE_A,{
 	if (BaseJob == Job_Alchemist && bioeth > 4) {
 		mes "[Skrajjad]";
 		mes "I've taught you everything";
@@ -1854,7 +1854,7 @@ lhz_in01,225,122,5	script	Skrajjad#qsk_al	754,{
 	close;
 }
 
-lhz_in01,204,138,5	script	Keshibien#qsk_al	750,{
+lhz_in01,204,138,5	script	Keshibien#qsk_al	4_M_ALCHE_C,{
 	if (BaseJob == Job_Alchemist && bioeth > 5) {
 		mes "[Keshibien]";
 		mes "I hope that you";
@@ -1966,7 +1966,7 @@ lhz_in01,204,138,5	script	Keshibien#qsk_al	750,{
 	close;
 }
 
-lhz_in02,278,273,3	script	Broncher#qsk_al	709,{
+lhz_in02,278,273,3	script	Broncher#qsk_al	4_M_SEAMAN,{
 	if (BaseJob == Job_Alchemist && bioeth > 6) {
 		mes "[Broncher]";
 		mes "You again? Didn't I already";
@@ -2058,7 +2058,7 @@ lhz_in02,278,273,3	script	Broncher#qsk_al	709,{
 	close;
 }
 
-lhz_in03,106,34,3	script	Koring#qsk_al	706,{
+lhz_in03,106,34,3	script	Koring#qsk_al	4_M_KID1,{
 	if (BaseJob == Job_Alchemist && bioeth == 8 || bioeth == 9) {
 		mes "[Koring]";
 		mes "My daddy is the bestest";
@@ -2104,7 +2104,7 @@ lhz_in03,106,34,3	script	Koring#qsk_al	706,{
 	close;
 }
 
-lhz_in03,109,31,5	script	Beninne#qsk_al	90,{
+lhz_in03,109,31,5	script	Beninne#qsk_al	4_F_01,{
 	if (BaseJob == Job_Alchemist && bioeth == 8 || bioeth == 9) {
 		mes "[Beninne]";
 		mes "You've met my husband,";
@@ -2148,7 +2148,7 @@ lhz_in03,109,31,5	script	Beninne#qsk_al	90,{
 	close;
 }
 
-lighthalzen,226,210,3	script	Nannan#qsk_al	86,{
+lighthalzen,226,210,3	script	Nannan#qsk_al	4_M_04,{
 	mes "[Nannan]";
 	mes "You know, I always thought^FFFFFF ^000000 that all Alchemists were bookish,";
 	mes "scholarly types, their faces always buried in books and studying. But";
@@ -2170,7 +2170,7 @@ lighthalzen,226,210,3	script	Nannan#qsk_al	86,{
 	close;
 }
 
-lhz_in01,218,141,7	script	Alchemist#qsk_al	98,{
+lhz_in01,218,141,7	script	Alchemist#qsk_al	4W_M_02,{
 	mes "[Alchemist]";
 	mes "Out of all humans,";
 	mes "I believe Kellasus is";
@@ -2197,15 +2197,15 @@ lhz_in01,218,141,7	script	Alchemist#qsk_al	98,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt
index 763ffff06..b97fb260b 100644
--- a/npc/quests/skills/archer_skills.txt
+++ b/npc/quests/skills/archer_skills.txt
@@ -4,16 +4,16 @@
 //= Hercules Dev Team
 //===== Current Version: =====================================
 //= 1.7
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Quest for skills: Arrow Crafting, Arrow Repel
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Updated to latest available official file.
-//= also fixed Item issue [bugreport:5607]. [Masao]
+//=     also fixed Item issue [bugreport:5607]. [Masao]
 //= 1.7 Fixed JobLevel requirements. [Euphy]
 //============================================================
 
-moc_ruins,118,99,5	script	Roberto	88,{
+moc_ruins,118,99,5	script	Roberto	4_M_ORIENT01,{
 	if (BaseClass == Job_Archer) {
 		if (getskilllv("AC_MAKINGARROW") == 1) {
 			mes "[Roberto]";
@@ -80,7 +80,7 @@ moc_ruins,118,99,5	script	Roberto	88,{
 				mes "Isn't it hard to find arrows?";
 				mes "That's why I make my own.";
 				next;
-				menu "Eh, really?!",-;
+				select("Eh, really?!");
 				mes "[Roberto]";
 				mes "Yeah! I gather different items";
 				mes "and make arrows using them.";
@@ -88,7 +88,7 @@ moc_ruins,118,99,5	script	Roberto	88,{
 				mes "survive alone in this tough world.";
 				mes "If you'd like, I can teach you.";
 				next;
-				menu "That would be wonderful.",-;
+				select("That would be wonderful.");
 				mes "[Roberto]";
 				mes "But.. I can't do it for free.";
 				mes "Nothing is free in this world~";
@@ -139,7 +139,7 @@ moc_ruins,118,99,5	script	Roberto	88,{
 	close;
 }
 
-payon,103,63,3	script	Jason	88,3,3,{
+payon,103,63,3	script	Jason	4_M_ORIENT01,3,3,{
 	if (BaseClass == Job_Archer) {
 		if (getskilllv("AC_CHARGEARROW") == 1) {
 			mes "[Jason]";
@@ -264,14 +264,14 @@ OnTouch:
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0 Roberto message text is based off RO npc.  Jason message
-//= text is custom from old version.
-//= All items are from official quests though.[kobra_k88]
-//= v1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.[kobra_k88]
+//============================================================
+//= 1.0 Roberto message text is based off RO npc.  Jason message
+//=     text is custom from old version.
+//=     All items are from official quests though.[kobra_k88]
+//= 1.0a Now using functions found in "Global_Functions.txt"
+//=     for class checks.[kobra_k88]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed exploits [Lupus]
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 4fddf6b12..d551b83bb 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -1,18 +1,20 @@
 //===== Hercules Script ======================================
 //= Assassin Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Venom Knife, Sonic Acceleration
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
-in_moc_16,14,27,5	script	Assassin#realman	884,{
+in_moc_16,14,27,5	script	Assassin#realman	4_M_ACROSS,{
 	if (BaseJob == Job_Assassin && ASSN_SK2 == 1) {
 		if (getskilllv("AS_VENOMKNIFE") == 0) {
 			mes "[Killtin]";
@@ -284,7 +286,7 @@ in_moc_16,14,27,5	script	Assassin#realman	884,{
 	}
 }
 
-in_moc_16,23,27,5	script	Assassin#realgirl	885,{
+in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 	if (BaseJob == Job_Assassin && ASSN_SK == 7) {
 		if (getskilllv("AS_SONICACCEL") == 0) {
 			mes "[Esmille]";
@@ -631,7 +633,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 				mes "the one who invented this";
 				mes "skill, is also... He's a man";
 				mes "amongst men, I must say.";
-				Emotion e_lv;
+				emotion e_lv;
 				next;
 				break;
 			case 2:
@@ -713,7 +715,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 			mes "Have you heard about";
 			mes "the latest news from";
 			mes "the Assassin Guild?";
-			Emotion e_heh;
+			emotion e_heh;
 			next;
 			select("News from the Assassin Guild?");
 			mes "[Assassin]";
@@ -757,9 +759,9 @@ OnTouch:
 				mes "^3355FFSomething inside";
 				mes "the coffin bit your";
 				mes "hand really hard!^000000";
-				sc_start SC_Poison,30000,0;
+				sc_start SC_POISON,30000,0;
 				sc_start SC_BLOODING,10000,0;
-				Emotion e_omg,1;
+				emotion e_omg,1;
 				close;
 			case 2:
 				mes "^3355FFYou try to peek";
@@ -774,7 +776,7 @@ OnTouch:
 				mes "is squirming inside the";
 				mes "coffin, but it's far too dark";
 				mes "to see anything else.^000000";
-				sc_start SC_Blind,30000,0;
+				sc_start SC_BLIND,30000,0;
 				next;
 				break;
 			case 3:
@@ -782,7 +784,7 @@ OnTouch:
 				mes "strength to move";
 				mes "something as heavy";
 				mes "as this coffin's lid...^000000";
-				sc_start SC_Curse,30000,0;
+				sc_start SC_CURSE,30000,0;
 				next;
 				break;
 			case 4:
@@ -829,9 +831,9 @@ OnTouch:
 					mes "^3355FFSomething inside";
 					mes "the coffin bit your";
 					mes "hand really hard!^000000";
-					sc_start SC_Poison,30000,0;
+					sc_start SC_POISON,30000,0;
 					sc_start SC_BLOODING,10000,0;
-					Emotion e_omg,1;
+					emotion e_omg,1;
 					close;
 				}
 				else {
@@ -857,7 +859,7 @@ OnTouch:
 				mes "is squirming inside the";
 				mes "coffin, but it's far too dark";
 				mes "to see anything else.^000000";
-				sc_start SC_Blind,30000,0;
+				sc_start SC_BLIND,30000,0;
 				next;
 				break;
 			case 3:
@@ -865,7 +867,7 @@ OnTouch:
 				mes "strength to move";
 				mes "something as heavy";
 				mes "as this coffin's lid...^000000";
-				sc_start SC_Curse,30000,0;
+				sc_start SC_CURSE,30000,0;
 				next;
 				break;
 			case 4:
@@ -901,7 +903,7 @@ OnTouch:
 				mes "^3355FFa yellow gas that clouds";
 				mes "your senses and briefly";
 				mes "knocks you unconscious.^000000";
-				sc_start SC_Sleep,30000,0;
+				sc_start SC_SLEEP,30000,0;
 				close;
 			}
 			mes "^3355FFa yellow gas. However, you";
@@ -936,7 +938,7 @@ OnTouch:
 				mes "^3355FFa yellow gas that clouds";
 				mes "your senses and briefly";
 				mes "knocks you unconscious.^000000";
-				sc_start SC_Sleep,30000,0;
+				sc_start SC_SLEEP,30000,0;
 				close;
 			}
 			mes "^3355FFa yellow gas. However, you";
@@ -944,13 +946,15 @@ OnTouch:
 			mes "all gas in your lungs in time";
 			mes "to escape its effects. Sadly,";
 			mes "all you found was broken glass.^000000";
-			Emotion e_omg,1;
+			emotion e_omg,1;
 		}
 		close;
 	}
 }
 
-moc_pryd04,85,96,0	script	��#crypt	-1,3,3,{
+// FIXME[Haru]: Why do we have a Korean name here? Can anyone translate it?
+//      Google translate says ¡¡ (jingjing) = Whining, but it doesn't make much sense to me.
+moc_pryd04,85,96,0	script	¡¡#crypt	-1,3,3,{
 OnTouch:
 	if (ASSN_SK == 4) {
 		specialeffect EF_CONE;
@@ -969,7 +973,7 @@ OnTouch:
 				mes "^3355FFIt's too late!";
 				mes "Your body has just";
 				mes "been frozen solid.^000000";
-				sc_start SC_Freeze,10000,0;
+				sc_start SC_FREEZE,10000,0;
 				close;
 			}
 			mes "^3355FFYou quickly pick up";
@@ -984,15 +988,15 @@ OnTouch:
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index f09437058..012a9445f 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -1,33 +1,33 @@
 //===== Hercules Script ======================================
 //= Bard Skill Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Official quest for the Bard skill "Pang Voice"
 //= Prerequisite: Geffen Bard Quest
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
-//= 	Somehow eA engine doesn't let you keep learn't skill
+//=     Somehow eA engine doesn't let you keep learn't skill
 //= 1.2 Added to correct locations, correct NPC's, fixed [Reddozen]
-//= 	some of the items required and made them into real
-//= 	quests.
+//=     some of the items required and made them into real
+//=     quests.
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a Tixed an item ID typo. Thanks, 2Spiritual Kid
 //= 1.3b Split into different files [DracoRPG]
-//= 1.4	Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//= 1.4a Checks the proper variable now. (bard_q -> gef_bard_q) [L0ne_W0lf]
+//= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.4a Checks the proper variable now. (BARD_Q -> gef_bard_q) [L0ne_W0lf]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.6 Added missing checkweights. [L0ne_W0lf]
 //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
-prontera,174,328,3	script	Young Man#bard_q1	89,3,3,{
+prontera,174,328,3	script	Young Man#bard_q1	4_M_ORIENT02,3,3,{
 	if (BaseJob == Job_Bard) {
-		Emotion e_omg;
+		emotion e_omg;
 		mes "[Timid Young Man]";
 		mes "Eh? Wwwaaaah--!";
 		mes "Y-you're--it's-it's--";
@@ -372,12 +372,12 @@ prontera,174,328,3	script	Young Man#bard_q1	89,3,3,{
 
 OnTouch:
 	if (BaseJob == Job_Bard) {
-		Emotion e_omg;
+		emotion e_omg;
 	}
 	end;
 }
 
-morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
+morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	2_M_BARD_ORIENT,3,3,{
 	if (BaseJob == Job_Bard) {
 		if (Class == Job_Clown && qskill_bard == 9) {
 			if (getskilllv("BA_PANGVOICE") != 0) {
@@ -652,7 +652,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 			mes "[Riott]";
 			mes "Hmmrmpf!";
 			mes "Eh heh heh heh!";
-			Emotion e_gg;
+			emotion e_gg;
 			next;
 			mes "[" + strcharinfo(0) + "]";
 			mes "Um...";
@@ -837,7 +837,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 		mes "[Riott]";
 		mes "Hmmrmpf!";
 		mes "Eh heh heh heh!";
-		Emotion e_gg;
+		emotion e_gg;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Um...";
@@ -896,15 +896,15 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 	}
 
 OnTouch:
-	Emotion e_gg;
+	emotion e_gg;
 	end;
 }
 
 // Yhelle the Chicken
-//============================================================ 
-niflheim,239,70,1	script	Yhelle#bard_chick1	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+//============================================================
+niflheim,239,70,1	script	Yhelle#bard_chick1	4_NFCOCK,3,3,{
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -935,9 +935,9 @@ OnTouch:
 	callfunc "F_BardSkillYhelle",1,2; close;
 }
 
-niflheim,185,205,3	script	Yhelle#bard_chick2	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+niflheim,185,205,3	script	Yhelle#bard_chick2	4_NFCOCK,3,3,{
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -961,9 +961,9 @@ OnTouch:
 	callfunc "F_BardSkillYhelle",2,3; close;
 }
 
-niflheim,85,203,5	script	Yhelle#bard_chick3	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+niflheim,85,203,5	script	Yhelle#bard_chick3	4_NFCOCK,3,3,{
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -987,9 +987,9 @@ OnTouch:
 	callfunc "F_BardSkillYhelle",3,4; close;
 }
 
-niflheim,149,81,7	script	Yhelle#bard_chick4	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+niflheim,149,81,7	script	Yhelle#bard_chick4	4_NFCOCK,3,3,{
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -1013,9 +1013,9 @@ OnTouch:
 	callfunc "F_BardSkillYhelle",4,5; close;
 }
 
-niflheim,209,144,3	script	Yhelle#bard_chick5	800,3,3,{
-	Emotion e_omg,1;
-	Emotion e_omg;
+niflheim,209,144,3	script	Yhelle#bard_chick5	4_NFCOCK,3,3,{
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
@@ -1040,8 +1040,8 @@ OnTouch:
 }
 
 // Drunken Men
-//============================================================ 
-morocc_in,178,73,3	script	Customer#bard_skill01	54,{
+//============================================================
+morocc_in,178,73,3	script	Customer#bard_skill01	1_M_JOBGUIDER,{
 	mes "[Little Bit Drunken Guy]";
 	mes "What do you think";
 	mes "is the best drink in";
@@ -1101,7 +1101,7 @@ morocc_in,178,73,3	script	Customer#bard_skill01	54,{
 	close;
 }
 
-morocc_in,175,70,7	script	Customer#bard_skill02	50,{
+morocc_in,175,70,7	script	Customer#bard_skill02	1_M_04,{
 	mes "[Little Bit Drunken Guy]";
 	mes "What do you think";
 	mes "is the best drink in";
@@ -1162,8 +1162,8 @@ morocc_in,175,70,7	script	Customer#bard_skill02	50,{
 }
 
 // Bartender
-//============================================================ 
-morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
+//============================================================
+morocc_in,166,76,7	script	Bartender#bard_qskill	1_ETC_01,{
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -1175,8 +1175,7 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 	next;
 	switch(select("Tropical Sograt:Vermilion on the Beach:Nothing, thanks.")) {
 	case 1:
-		set .@now_weight,maxWeight-Weight;
-		if (.@now_weight < 2000) {
+		if (MaxWeight - Weight < 2000) {
 			mes "[Bartender]";
 			mes "You sure you can carry";
 			mes "any more stuff with you?";
@@ -1203,13 +1202,12 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 		mes "mild, but if you're not";
 		mes "careful, you'll pass out";
 		mes "in no time flat. Take it easy.";
-		set zeny,zeny-1000;
+		Zeny -= 1000;
 		getitem 12112,1; //Tropical_Sograt
 		close;
 
 	case 2:
-		set .@now_weight,maxWeight-Weight;
-		if (.@now_weight < 2000) {
+		if (MaxWeight - Weight < 2000) {
 			mes "[Bartender]";
 			mes "You sure you can carry";
 			mes "any more stuff with you?";
@@ -1234,7 +1232,7 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 		mes "Be sure that you";
 		mes "enjoy your drinking";
 		mes "without going crazy.";
-		set zeny,zeny-1000;
+		Zeny -= 1000;
 		getitem 12113,1; //Vermilion_The_Beach
 		close;
 
@@ -1247,22 +1245,15 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	46,{
 }
 
 // Function
-//============================================================ 
+//============================================================
 function	script	F_BardSkillYhelle	{
-	//set max_max_c,1201;
-	//if (max_max_c == 1) {
-	//	mes "^3355FFHold it right there!";
-	//	mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
-	//	close;
-	//}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
 		close;
 	}
-	Emotion e_omg,1;
-	Emotion e_omg;
+	emotion e_omg,1;
+	emotion e_omg;
 	mes "[Hen Yhelle]";
 	mes "Cluck-Cluuuck?";
 	mes "Cluck cluck cluck!";
diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt
index 26a69f91e..4ec509b3b 100644
--- a/npc/quests/skills/blacksmith_skills.txt
+++ b/npc/quests/skills/blacksmith_skills.txt
@@ -1,17 +1,17 @@
 //===== Hercules Script ======================================
 //= Blacksmith Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.6
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Dubious Salesmanship, Greed
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
-geffen,178,72,3	script	Akkie#qsk_bs	726,{
+geffen,178,72,3	script	Akkie#qsk_bs	4_F_JOB_BLACKSMITH,{
 	if (BaseJob == Job_Blacksmith) {
 		if (BLACK_SK == 7 && getskilllv("BS_UNFAIRLYTRICK") == 0) {
 			mes "[Akkie]";
@@ -184,7 +184,7 @@ geffen,178,72,3	script	Akkie#qsk_bs	726,{
 						delitem 999,1; //Steel
 						delitem 971,1; //Detrimindexta
 						delitem 613,1; //Iron_Hammer
-						set zeny,zeny-500;
+						Zeny -= 500;
 						set BLACK_SK,2;
 						close;
 					}
@@ -471,7 +471,7 @@ geffen,178,72,3	script	Akkie#qsk_bs	726,{
 	}
 }
 
-geffen,172,52,1	script	Goodman#qsk_bs	826,{
+geffen,172,52,1	script	Goodman#qsk_bs	4_M_DWARF,{
 	if (BaseJob == Job_Blacksmith) {
 		if (BLACK_SK2 == 2 && Upper == 1 && getskilllv("BS_GREED") == 0) {
 			mes "[Goodman]";
@@ -562,8 +562,7 @@ geffen,172,52,1	script	Goodman#qsk_bs	826,{
 				close;
 			}
 			else if (BLACK_SK2 == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 5000) {
+				if (MaxWeight - Weight < 5000) {
 					mes "[Goodman]";
 					mes "Back already, eh?";
 					mes "Alright, let me check";
@@ -650,20 +649,20 @@ geffen,172,52,1	script	Goodman#qsk_bs	826,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
-//= Somehow eA engine doesn't let you keep learn't skill V_V'
+//=     Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
-//= some of the items required and made them into real
-//= quests. [Reddozen] 
+//=     some of the items required and made them into real
+//=     quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
 //= 1.3c Inverted the weight check for Greed [DracoRPG]
 //= 1.4 Updated to the official One [Samuray22]
 //= 1.5 replaced item "names" with item id. Fixed a bug with
-//=		item deletion [Lupus]
+//=     item deletion [Lupus]
 //============================================================
diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt
index 5608acc18..8b15136fe 100644
--- a/npc/quests/skills/crusader_skills.txt
+++ b/npc/quests/skills/crusader_skills.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Crusader Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Shrink
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
-geffen,110,117,3	script	Ford#11	752,{
+geffen,110,117,3	script	Ford#11	4_M_CRU_OLD,{
 	if (BaseJob == Job_Crusader) {
 		if (CRUS_SK == 8 && getskilllv("CR_SHRINK") == 0) {
 			mes "[Ford]";
@@ -277,7 +275,7 @@ geffen,110,117,3	script	Ford#11	752,{
 	}
 }
 
-gef_fild13,297,242,3	script	Soldier#277	751,{
+gef_fild13,297,242,3	script	Soldier#277	4_M_CRU,{
 	if (BaseJob == Job_Crusader) {
 		if (Upper == 1 && getskilllv("CR_SHRINK")) {
 			if (CRUS_SK == 8) {
@@ -426,7 +424,7 @@ gef_fild13,297,242,3	script	Soldier#277	751,{
 		}
 		else if (CRUS_SK == 5) {
 			mes "[Sloutii]";
-			if (upper == 1) {
+			if (Upper == 1) {
 				mes "Eeearrrgh--!";
 				mes "My l-legs! Everything";
 				mes "is starting to h-hurt!";
@@ -578,7 +576,7 @@ gef_fild13,297,242,3	script	Soldier#277	751,{
 	}
 }
 
-prt_church,87,127,3	script	Pastor#1011	755,{
+prt_church,87,127,3	script	Pastor#1011	4_M_SAGE_C,{
 	if (BaseJob == Job_Crusader) {
 		if (Upper == 1 && getskilllv("CR_SHRINK")) {
 			if (CRUS_SK == 8) {
@@ -811,15 +809,15 @@ prt_church,87,127,3	script	Pastor#1011	755,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 971c100ca..de72a6fe7 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Dancer Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Charming Wink
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.4a Changed NPC location [Yommy]
 //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
-comodo,204,172,5	script	Canell#qsk_dan01	724,{
+comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 	if (BaseJob == Job_Dancer && JobLevel > 39) {
 		if (DANCER_SK == 0) {
 			mes "[Canell]";
@@ -191,7 +189,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			next;
 			mes "^3355FFIt figures that she'd";
 			mes "keep your mirror.^000000";
-			Emotion e_ag,1;
+			emotion e_ag,1;
 			set DANCER_SK,3;
 			close;
 		}
@@ -203,7 +201,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "Oh! It's you. So did my";
 			mes "sister in Prontera Church";
 			mes "teach you anything yet?";
-			Emotion e_go;
+			emotion e_go;
 			close;
 		}
 		else if (DANCER_SK == 7) {
@@ -266,7 +264,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "Look at me, do it";
 			mes "like this. Un, deux, trois~";
 			mes "Now, let me see you try it.";
-			Emotion e_no1;
+			emotion e_no1;
 			next;
 			switch(select("Un deux trois~-:Un, doux trois~:Un, deux, trois~")) {
 			default:
@@ -286,7 +284,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			case 3:
 				mes "["+ strcharinfo(0) +"]";
 				mes "Un, deux, trois~";
-				Emotion e_no1,1;
+				emotion e_no1,1;
 				specialeffect2 EF_FLASHER;
 				next;
 				mes "[Canell]";
@@ -296,7 +294,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "of rhythm and naturalness";
 				mes "are absolutely essential to";
 				mes "this technique of enticement.";
-				Emotion e_kis;
+				emotion e_kis;
 				next;
 				mes "[Canell]";
 				mes "Now that you've mastered";
@@ -311,7 +309,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 				mes "have that drawback. Ho-ho~";
 				mes "Anyway, it's time for us to part now. I hope that you grow to";
 				mes "become a more glamorous and charming dancer in days to come.";
-				Emotion e_heh;
+				emotion e_heh;
 				next;
 				mes "^3355FFYou have finally learned";
 				mes "the Charming Wink skill.^000000";
@@ -329,7 +327,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "ask me? Ah, you must";
 			mes "be mesmerized by my";
 			mes "beauty, aren't you?";
-			Emotion e_pif;
+			emotion e_pif;
 			next;
 			mes "[Canell]";
 			mes "Oh, to be so beautiful";
@@ -389,7 +387,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 			mes "Hey there,";
 			mes "handsome~";
 			mes "^333333*Wink~*^000000";
-			Emotion e_kis;
+			emotion e_kis;
 			specialeffect2 EF_VALLENTINE2;
 			next;
 			mes "^3355FFStrangely enough,";
@@ -400,7 +398,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 	}
 }
 
-prontera,183,333,1	script	Aelle#qsk_dan02	79,{
+prontera,183,333,1	script	Aelle#qsk_dan02	1_F_PRIEST,{
 	if (BaseJob == Job_Dancer) {
 		if (DANCER_SK == 3) {
 			mes "[Aelle]";
@@ -540,7 +538,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 				mes "I do it! Wink, j-just";
 				mes "like this, okay? Y' see?";
 				mes "^333333*Wiiiiiiiiiiiiiink*^000000";
-				Emotion e_no1;
+				emotion e_no1;
 				next;
 				mes "["+ strcharinfo(0) +"]";
 				mes "Wh-whoa...";
@@ -555,7 +553,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 				mes "*Urp* It'sh in the--";
 				mes "Bwahahahaahah!";
 				mes "It's all spinning!";
-				Emotion e_heh;
+				emotion e_heh;
 				next;
 				mes "^3355FFIn her drunken stupor,";
 				mes "Aelle pummels you with";
@@ -563,7 +561,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 				mes "maniacally to herself.^000000";
 				percentheal -10,0;
 				specialeffect2 EF_HIT2;
-				Emotion e_dots,1;
+				emotion e_dots,1;
 				delitem 970,1; //Alchol
 				delitem 512,1; //Apple
 				delitem 513,3; //Banana
@@ -644,7 +642,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 			mes "[Sober Aelle]";
 			mes "Ohhh...";
 			mes "H-headache...";
-			Emotion e_an;
+			emotion e_an;
 			next;
 			mes "[Aelle]";
 			mes "Oh, wow, look at you!";
@@ -681,14 +679,14 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 			mes "Oh crap, it's the pastor!";
 			mes "Shhh, if anybody asks you,";
 			mes "I wasn't doing anything!";
-			Emotion e_omg;
+			emotion e_omg;
 			next;
 			mes "[Aelle]";
 			mes "Thanks, hon...";
 			mes "I know you can";
 			mes "keep my contraband";
 			mes "our little secret. ^333333*Wink*^000000";
-			Emotion e_no1;
+			emotion e_no1;
 			close;
 		}
 	}
@@ -711,27 +709,27 @@ prontera,183,333,1	script	Aelle#qsk_dan02	79,{
 		mes "Oh crap, it's the pastor!";
 		mes "Shhh, if anybody asks you,";
 		mes "I wasn't doing anything!";
-		Emotion e_omg;
+		emotion e_omg;
 		next;
 		mes "[Aelle]";
 		mes "Thanks, hon...";
 		mes "I know you can";
 		mes "keep my contraband";
 		mes "our little secret. ^333333*Wink*^000000";
-		Emotion e_no1;
+		emotion e_no1;
 		close;
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index e6f9f9d41..d2c1a1204 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -1,34 +1,29 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Hunter Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena Revision 3800+
-//===== Description: ========================================= 
-//= Temp quests for new skills for 2nd classes
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Quests for skills: Phantasmic Arrow
+//===== Additional Comments: =================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
-//= Somehow eA engine doesn't let you keep learn't skill V_V'
+//=     Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
-//= some of the items required and made them into real
-//= quests. [Reddozen] 
+//=     some of the items required and made them into real
+//=     quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
 //= 1.3c Fixed some typos [IVBela]
 //= 1.3d Changed NPC Name to the official [Lupus]
-//= 1.4	Moved Arpesto from tu_archer and added his script. [Kisuka]
+//= 1.4 Moved Arpesto from tu_archer and added his script. [Kisuka]
 //============================================================
 
-
-//============================================================
-// HUNTER SKILL - PHANTASMIC ARROW
-//============================================================
-pay_arche,109,169,3	script	Arpesto	712,{
-	if (Class == Job_Hunter || Class == Job_Sniper) {
+pay_arche,109,169,3	script	Arpesto	4_M_05,{
+	if (BaseJob == Job_Hunter) {
 		if (qskill_hunter == 100) {
 			if (getskilllv("HT_PHANTASMIC")) {
 				mes "[Arpesto]";
@@ -50,7 +45,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				mes "I don't know what";
 				mes "you're talking about!";
 				close;
-			}else{
+			} else {
 				mes "[Arpesto]";
 				mes "I recognize you";
 				mes "from somewhere,";
@@ -218,7 +213,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				set qskill_hunter,100;
 				skill "HT_PHANTASMIC",1,0;
 				close;
-			}else{
+			} else {
 				mes "[Arpesto]";
 				mes "Hurry up and bring";
 				mes "^3131FF5 Cursed Rubies^000000,";
@@ -241,7 +236,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				set qskill_hunter,100;
 				close;
 			}
-			if (JobLevel < 40) {
+			if (BaseJob == Job_Hunter && JobLevel < 40) {
 				mes "[Arpesto]";
 				mes "Did the master send you";
 				mes "to me? Hmm... You're still";
@@ -256,7 +251,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				mes "be able to grasp what I've been";
 				mes "teaching Hunters and Snipers.";
 				close;
-			}else{
+			} else {
 				mes "[Arpesto]";
 				mes "Has the master sent you?";
 				mes "Ah, you definitely have the";
@@ -359,7 +354,7 @@ pay_arche,109,169,3	script	Arpesto	712,{
 				}
 			}
 		}
-	}else{
+	} else {
 		mes "[Arpesto]";
 		mes "The sky still looks clear, but recently the winds that have been blowing through the land seem to carry with them an air of misfortune.";
 		next;
diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt
index 83574900a..aca35e860 100644
--- a/npc/quests/skills/knight_skills.txt
+++ b/npc/quests/skills/knight_skills.txt
@@ -1,20 +1,18 @@
 //===== Hercules Script ======================================
 //= Knight Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Charge Attack
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
-prt_in,85,99,3	script	Knight#kabuto	734,{
-	if (BaseJob == job_Knight) {
+prt_in,85,99,3	script	Knight#kabuto	4_M_JOB_KNIGHT2,{
+	if (BaseJob == Job_Knight) {
 		if (KNGT_SK == 10) {
 			mes "[Essofeit]";
 			mes "Ah, it must be grand to";
@@ -308,7 +306,7 @@ prt_in,85,99,3	script	Knight#kabuto	734,{
 	close;
 }
 
-prontera,69,351,0	script	#tour	111,5,5,{
+prontera,69,351,0	script	#tour	HIDDEN_NPC,5,5,{
 //OnTouch2:
 OnTouch:
 	if (KNGT_SK > 2)
@@ -341,7 +339,7 @@ OnTouch:
 	close;
 }
 
-prontera,72,352,7	script	Grand Master	733,{
+prontera,72,352,7	script	Grand Master	4_M_JOB_KNIGHT1,{
 	mes "[Grand Master]";
 	if (KNGT_SK == 2 || KNGT_SK == 3) {
 		mes "Alright men, you don't";
@@ -374,7 +372,7 @@ prontera,72,352,7	script	Grand Master	733,{
 	close;
 }
 
-prontera,78,354,3	script	Knight#zabii	734,{
+prontera,78,354,3	script	Knight#zabii	4_M_JOB_KNIGHT2,{
 	if (KNGT_SK == 3 || KNGT_SK == 4) {
 		mes "[Zabi]";
 		mes "I guess we're more like";
@@ -412,7 +410,7 @@ prontera,78,354,3	script	Knight#zabii	734,{
 	close;
 }
 
-prontera,73,357,5	script	Knight#drake	734,{
+prontera,73,357,5	script	Knight#drake	4_M_JOB_KNIGHT2,{
 	if (KNGT_SK == 4 || KNGT_SK == 5) {
 		mes "[Gon]";
 		mes "What'll I get with";
@@ -446,7 +444,7 @@ prontera,73,357,5	script	Knight#drake	734,{
 	close;
 }
 
-prontera,78,357,3	script	Knight#sasword	734,{
+prontera,78,357,3	script	Knight#sasword	4_M_JOB_KNIGHT2,{
 	mes "[Jiya]";
 	if (KNGT_SK == 5 || KNGT_SK == 6) {
 		mes "Man, this division of";
@@ -473,7 +471,7 @@ prontera,78,357,3	script	Knight#sasword	734,{
 	close;
 }
 
-prontera,66,358,5	script	Knight#gattack	733,{
+prontera,66,358,5	script	Knight#gattack	4_M_JOB_KNIGHT1,{
 	mes "[Gatack]";
 	if (KNGT_SK == 7) {
 		mes "Wait, where's";
@@ -513,15 +511,15 @@ prontera,66,358,5	script	Knight#gattack	733,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt
index 2f9d124fa..3b250b647 100644
--- a/npc/quests/skills/mage_skills.txt
+++ b/npc/quests/skills/mage_skills.txt
@@ -1,21 +1,19 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Mage Skill Quest
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Quest for skills: Energy Coat
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Fixed a typo in job check. (Bugreport:1531) [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
 //= 1.8 Fixed JobLevel requirements. [Euphy]
 //============================================================
 
-geffen_in,151,119,4	script	Great Wizard	64,{
+geffen_in,151,119,4	script	Great Wizard	1_M_WIZARD,{
 	mes "[BLIZZARDRISS]";
 	mes "Hey ! My friend !";
 	mes "I see that you are a mage.";
@@ -156,11 +154,11 @@ geffen_in,151,119,4	script	Great Wizard	64,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.[kobra_k88]
+//============================================================
+//= 1.0a Now using functions found in "Global_Functions.txt"
+//=     for class checks.[kobra_k88]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed exploit [Lupus]
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 9fb596132..592c6b9dd 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Merchant Skills Quests
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Quests for skills: Crazy Uproar, Change Cart, Cart Revolution
 //===== Additional Comments: =================================
@@ -15,7 +13,7 @@
 //= 1.8 Moved Alberta NPC to pre-re/re paths. [Euphy]
 //============================================================
 
-alberta,83,96,5	script	Necko	98,7,7,{
+alberta,83,96,5	script	Necko	4W_M_02,7,7,{
 	if (BaseClass == Job_Merchant) {
 		if (getskilllv("MC_LOUD") == 1) {
 			mes "[Necko]";
@@ -179,7 +177,7 @@ OnTouch:
 	close;
 }
 
-alberta,119,221,6	script	Charlron	107,{
+alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 	if (BaseClass == Job_Merchant) {
 		if (getskilllv("MC_CHANGECART") == 1) {
 			mes "[Charlron]";
@@ -720,17 +718,17 @@ alberta,119,221,6	script	Charlron	107,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Fully working
-//= v1.1 Bug fixes
-//= v1.a Now using functions found in "Global_Functions.txt"
-//= for class checks.[kobra_k88]
+//= 1.1 Bug fixes
+//= 1.a Now using functions found in "Global_Functions.txt"
+//=     for class checks.[kobra_k88]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed exploits [Lupus]
 //= 1.4a Fixed some typos [IVBela] 1.4b  Gershaun -> Gershuan
-//= 	changed perm. variables to temp ones [Lupus]
+//=     changed perm. variables to temp ones [Lupus]
 //= 1.4b Added missing 1 Banana Juice requirement to Cart Revolution [DracoRPG]
 //============================================================
diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt
index 46d0e6f77..f4788e12d 100644
--- a/npc/quests/skills/monk_skills.txt
+++ b/npc/quests/skills/monk_skills.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Monk Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen, Samuray22
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Spiritual Bestowment, Excruciating Palm
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
-prt_monk,270,198,3	script	Apprentice Monk#qsk_mo	753,{
+prt_monk,270,198,3	script	Apprentice Monk#qsk_mo	4_M_MONK,{
 	if (BaseJob == Job_Monk) {
 		if (MONK_SK == 7) {
 			mes "[Monk]";
@@ -211,7 +209,7 @@ prt_monk,270,198,3	script	Apprentice Monk#qsk_mo	753,{
 	close;
 }
 
-monk_test,316,69,5	script	Monk#qsk_mo	823,{
+monk_test,316,69,5	script	Monk#qsk_mo	4_M_CHNMONK,{
 	if (BaseJob == Job_Monk) {
 		if (MONK_SK == 6) {
 			mes "[Monk]";
@@ -433,15 +431,15 @@ monk_test,316,69,5	script	Monk#qsk_mo	823,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt
index 17a670eed..c7512b38b 100644
--- a/npc/quests/skills/novice_skills.txt
+++ b/npc/quests/skills/novice_skills.txt
@@ -1,20 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Novice Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
-//= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.8
+//===== Description: =========================================
 //= Quest for skills: First Aid, Trick Dead
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
-//============================================================ 
+//= 1.8 Added Baby support. [Zopokx]
+//============================================================
 
-prt_in,234,133,4	script	Nami	66,{
+prt_in,234,133,4	script	Nami	1_F_01,{
 	if ((Class == Job_Novice || Class == Job_Baby) && (JobLevel > 3 || BaseLevel > 11) && (skill_nov < 3)) {
 		mes "[Nami]";
 		mes "Hello!";
@@ -188,7 +187,7 @@ prt_in,234,133,4	script	Nami	66,{
 	close;
 }
 
-prt_in,73,87,4	script	Chivalry Member	65,{
+prt_in,73,87,4	script	Chivalry Member	1_M_YOUNGKNIGHT,{
 	if ((Class == Job_Novice || Class == Job_Baby) && (JobLevel > 6) && ((skill_nov >= 3) && (skill_nov <= 5))) {
 		mes "[Bulma]";
 		mes "Yeah. . . I look great. . .";
@@ -356,7 +355,7 @@ prt_in,73,87,4	script	Chivalry Member	65,{
 	close;
 }
 
-prt_castle,175,146,4	script	Nursing Instructor	50,{
+prt_castle,175,146,4	script	Nursing Instructor	1_M_04,{
 	mes "[Dread Lord]";
 	mes ". . . . . . . . . .";
 	mes ". . . . . . . . . .";
@@ -468,13 +467,13 @@ prt_castle,175,146,4	script	Nursing Instructor	50,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Fully working
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Fixed a Zeny exploit, made more variables clear
 //= on finishing quests. [Lupus]
 //= 1.4 Fixed exploits [Lupus]
 //= 1.4a Fixed some typos [IVBela]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt
index 3b44e4de3..68da2767e 100644
--- a/npc/quests/skills/priest_skills.txt
+++ b/npc/quests/skills/priest_skills.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Priest Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Redempito
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
-prt_church,111,112,1	script	Sister Linus	79,{
+prt_church,111,112,1	script	Sister Linus	1_F_PRIEST,{
 	if (BaseJob == Job_Priest) {
 		if (PRIEST_SK == 100) {
 			if (getskilllv("PR_REDEMPTIO") == 0) {
@@ -363,15 +361,15 @@ prt_church,111,112,1	script	Sister Linus	79,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index 8b804e0cd..cde8fc2d9 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -1,21 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Rogue Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
-//= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.8
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: CLose Confine
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Bug fixes as pointed out by Brainstorm in bugreport:351 [L0ne_W0lf]
 //= 1.6a Fixed(?) antoher problem (NPCs not disabling) hopefully. [L0ne_W0lf]
 //= 1.6b Corrected a Typo error with "rouge". (bugreport:909) [Samuray22]
 //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.8 Some cleaning. [Euphy]
 //============================================================
 
 in_rogue,359,177,0	script	#killershow01	-1,{
@@ -47,7 +46,7 @@ OnTimer150000:
 	end;
 }
 
-in_rogue,357,174,2	script	Killer#Rogueguild	705,1,1,{
+in_rogue,357,174,2	script	Killer#Rogueguild	4_M_GEF_SOLDIER,1,1,{
 OnInit:
 	disablenpc "Killer#Rogueguild";
 	end;
@@ -85,80 +84,28 @@ OnTouch:
 		mes "yellow. If he intends to go";
 		mes "backward, it will be pale red.";
 		next;
-		while(1) {
-			if (.@lim_1 == 10) {
-				break;
+		setarray .@Effects[1],EF_CHANGECOLD,EF_CHANGEWIND,EF_CHANGEEARTH;
+		for(set .@lim_1,0; .@lim_1<10; set .@lim_1,.@lim_1+1) {
+			set .@move_1,rand(1,3);
+			specialeffect .@Effects[.@move_1];
+			if (select("Block him to the Left:Block him to the Right:Block his Retreat") == .@move_1) {
+				mes "^3355FFThe killer remains";
+				mes "unable to move and looks";
+				mes "incredibly confused! Right";
+				mes "now, you're using the Close";
+				mes "Confine skill perfectly!^000000";
+				specialeffect EF_POTION1;
+				specialeffect2 EF_POTION7;
 			}
 			else {
-				set .@lim_1,.@lim_1 + 1;
-				set .@move_1,rand(1,3);
-				if (.@move_1 == 1) {
-					specialeffect EF_CHANGECOLD;
-					if (select("Block him to the Left:Block him to the Right:Block his Retreat") == 1) {
-						mes "^3355FFThe killer remains";
-						mes "unable to move and looks";
-						mes "incredibly confused! Right";
-						mes "now, you're using the Close";
-						mes "Confine skill perfectly!^000000";
-						specialeffect EF_POTION1;
-						specialeffect2 EF_POTION7;
-						next;
-					}
-					else {
-						mes "^3355FFWait--!";
-						mes "For some reason,";
-						mes "you sense that's not";
-						mes "the direction the killer";
-						mes "is moving at this moment.";
-						mes "You naturally correct yourself.^000000";
-						next;
-					}
-				}
-				else if (.@move_1 == 2) {
-					specialeffect EF_CHANGEWIND;
-					if (select("Block him at the Left:Block him at the Right:Block him at the back") == 2) {
-						mes "^3355FFThe killer remains";
-						mes "unable to move and looks";
-						mes "incredibly confused! Right";
-						mes "now, you're using the Close";
-						mes "Confine skill perfectly!^000000";
-						specialeffect EF_POTION1;
-						specialeffect2 EF_POTION7;
-						next;
-					}
-					else {
-						mes "^3355FFWait--!";
-						mes "For some reason,";
-						mes "you sense that's not";
-						mes "the direction the killer";
-						mes "is moving at this moment.";
-						mes "You naturally correct yourself.^000000";
-						next;
-					}
-				}
-				else if (.@move_1 == 3) {
-					specialeffect EF_CHANGEEARTH;
-					if (select("Block him at the Left:Block him at the Right:Block him at the back") == 3) {
-						mes "^3355FFThe killer remains";
-						mes "unable to move and looks";
-						mes "incredibly confused! Right";
-						mes "now, you're using the Close";
-						mes "Confine skill perfectly!^000000";
-						specialeffect EF_POTION1;
-						specialeffect2 EF_POTION7;
-						next;
-					}
-					else {
-						mes "^3355FFWait--!";
-						mes "For some reason,";
-						mes "you sense that's not";
-						mes "the direction the killer";
-						mes "is moving at this moment.";
-						mes "You naturally correct yourself.^000000";
-						next;
-					}
-				}
+				mes "^3355FFWait--!";
+				mes "For some reason,";
+				mes "you sense that's not";
+				mes "the direction the killer";
+				mes "is moving at this moment.";
+				mes "You naturally correct yourself.^000000";
 			}
+			next;
 		}
 		mes "^3355FFYou successfully";
 		mes "retrieved the priceless";
@@ -182,7 +129,7 @@ OnTouch:
 	end;
 }
 
-in_rogue,355,179,0	script	Haijara Greg#rogueguild	46,{
+in_rogue,355,179,0	script	Haijara Greg#rogueguild	1_ETC_01,{
 	if (BaseJob == Job_Rogue) {
 		if (ROG_SK == 12 && Upper == 1) {
 			mes "[Haijara Greg]";
@@ -592,7 +539,7 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	46,{
 	}
 }
 
-in_rogue,152,29,0	script	Louis Greg#rogueguild	84,{
+in_rogue,152,29,0	script	Louis Greg#rogueguild	4_M_02,{
 	if (BaseJob == Job_Rogue || Class == Job_Thief_High) {
 		if (ROG_SK < 1) {
 			mes "[Louis Greg]";
@@ -747,7 +694,7 @@ in_rogue,152,29,0	script	Louis Greg#rogueguild	84,{
 	close;
 }
 
-in_rogue,268,125,2	script	Thor Greg#rogueguild	86,{
+in_rogue,268,125,2	script	Thor Greg#rogueguild	4_M_04,{
 	if (BaseJob == Job_Rogue || Class == Job_Thief_High) {
 		if (ROG_SK < 1) {
 			mes "[Thor Greg]";
@@ -939,7 +886,7 @@ in_rogue,268,125,2	script	Thor Greg#rogueguild	86,{
 	close;
 }
 
-in_rogue,181,114,3	script	Jay Greg#rogueguild	85,{
+in_rogue,181,114,3	script	Jay Greg#rogueguild	4_M_03,{
 	if (BaseJob == Job_Rogue || Class == Job_Thief_High) {
 		if (ROG_SK < 1) {
 			mes "[Jay Greg]";
@@ -1204,61 +1151,19 @@ OnDisable:
 	end;
 }
 
-prt_are01,149,162,0	script	Kienna#1st	700,1,1,{
+prt_are01,149,162,0	script	Kienna#1st	8_F_GIRL,1,1,{
 	end;
 OnTouch:
-	callfunc "F_Kienna","1st";
-	end;
-}
-
-prt_are01,136,150,0	script	Kienna#2nd	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","2nd";
-	end;
-}
-
-prt_are01,150,138,0	script	Kienna#3rd	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","3rd";
-	end;
-}
-
-prt_are01,163,147,0	script	Kienna#4th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","4th";
-	end;
-}
-
-prt_are01,134,140,0	script	Kienna#5th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","5th";
-	end;
-}
-
-prt_are01,161,140,0	script	Kienna#6th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","6th";
-	end;
-}
-
-prt_are01,161,160,0	script	Kienna#7th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","7th";
-	end;
-}
-
-prt_are01,138,159,0	script	Kienna#8th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","8th";
+	callfunc "F_Kienna",strnpcinfo(2);
 	end;
 }
+prt_are01,136,150,0	duplicate(Kienna#1st)	Kienna#2nd	8_F_GIRL,1,1
+prt_are01,150,138,0	duplicate(Kienna#1st)	Kienna#3rd	8_F_GIRL,1,1
+prt_are01,163,147,0	duplicate(Kienna#1st)	Kienna#4th	8_F_GIRL,1,1
+prt_are01,134,140,0	duplicate(Kienna#1st)	Kienna#5th	8_F_GIRL,1,1
+prt_are01,161,140,0	duplicate(Kienna#1st)	Kienna#6th	8_F_GIRL,1,1
+prt_are01,161,160,0	duplicate(Kienna#1st)	Kienna#7th	8_F_GIRL,1,1
+prt_are01,138,159,0	duplicate(Kienna#1st)	Kienna#8th	8_F_GIRL,1,1
 
 function	script	F_Kienna	{
 	if (ROG_SK == 6) {
@@ -1272,76 +1177,29 @@ function	script	F_Kienna	{
 		mes "immobilizing me. Get ready~";
 		set ROG_SK,7;
 		next;
-		while(1) {
-			if (.@lim_1 == 10) {
-				break;
+		for(set .@lim_1,0; .@lim_1<10; set .@lim_1,.@lim_1+1) {
+			set .@move_1,rand(1,3);
+			if (select("Block her to the Left:Block her to the Right:Block her retreat") == .@move_1) {
+				mes "[Kienna]";
+				mes "Huh...?";
+				mes "You blocked me!";
+				mes "Very nice work~";
+				specialeffect EF_POTION1;
+				specialeffect2 EF_POTION7;
+				set .@suc_1,.@suc_1 + 1;
 			}
 			else {
-				set .@lim_1,.@lim_1 + 1;
-				set .@move_1,rand(1,3);
-				if (.@move_1 == 1) {
-					if (select("Block her to the Left:Block her to the Right:Block her retreat") == 1) {
-						mes "[Kienna]";
-						mes "Huh...?";
-						mes "You blocked me!";
-						mes "Very nice work~";
-						specialeffect 204; //EF_POTION1
-						specialeffect2 210; // EF_POTION7
-						set .@suc_1,.@suc_1 + 1;
-						next;
-					}
-					else {
-						mes "[Kienna]";
-						mes "Sorry, but I wasn't";
-						mes "moving in that direction.";
-						mes "Your block attempt failed...";
-						next;
-					}
-				}
-				else if (.@move_1 == 2) {
-					if (select("Block her to the Left:Block her to the Right:Block her retreat") == 2) {
-						mes "[Kienna]";
-						mes "Huh...?";
-						mes "You blocked me!";
-						mes "Very nice work~";
-						specialeffect 204; //EF_POTION1
-						specialeffect2 210; // EF_POTION7
-						set .@suc_1,.@suc_1 + 1;
-						next;
-					}
-					else {
-						mes "[Kienna]";
-						mes "Sorry, but I wasn't";
-						mes "moving in that direction.";
-						mes "Your block attempt failed...";
-						next;
-					}
-				}
-				else if (.@move_1 == 3) {
-					if (select("Block her to the Left:Block her to the Right:Block her retreat") == 3) {
-						mes "[Kienna]";
-						mes "Huh...?";
-						mes "You blocked me!";
-						mes "Very nice work~";
-						specialeffect 204; //EF_POTION1
-						specialeffect2 210; // EF_POTION7
-						set .@suc_1,.@suc_1 + 1;
-						next;
-					}
-					else {
-						mes "[Kienna]";
-						mes "Sorry, but I wasn't";
-						mes "moving in that direction.";
-						mes "Your block attempt failed...";
-						next;
-					}
-				}
+				mes "[Kienna]";
+				mes "Sorry, but I wasn't";
+				mes "moving in that direction.";
+				mes "Your block attempt failed...";
 			}
+			next;
 		}
 		mes "[Kienna]";
 		mes "Alright, we're done";
 		mes "here. You earned a";
-		switch(.@suc_1) { 
+		switch(.@suc_1) {
 		case 10:
 			mes "training grade of ''^0000FFS^000000.''";
 			mes "That's a perfect score!";
@@ -1478,7 +1336,7 @@ OnInit:
 	end;
 }
 
-in_rogue,88,119,3	script	Waiting Room#rogue10	828,{
+in_rogue,88,119,3	script	Waiting Room#rogue10	4_M_ROGUE,{
 OnEnable:
 	enablenpc "Waiting Room#rogue10";
 	enablewaitingroomevent "Waiting Room#rogue10";
@@ -1495,15 +1353,15 @@ OnStartArena:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index 1058bb6a8..5f065a892 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -1,670 +1,69 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Sage Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: Create Converter, Elemental Change
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 standards. [5511]
+//= 1.5 Optimized. [Euphy]
 //============================================================
 
-yuno_in03,176,24,3	script	Mischna	755,{
-	if(BaseJob == Job_Sage) {
-		if(SAG_SK == 100) {
-			if(getskilllv("SA_ELEMENTFIRE") == 0 && getskilllv("SA_ELEMENTGROUND") == 0 && getskilllv("SA_ELEMENTWIND") == 0 && getskilllv("SA_ELEMENTWATER") == 0 && getskilllv("SA_CREATECON") == 0) {
-				mes "[Mishuna]";
-				mes "Ah, you must have";
-				mes "forgotten what I taught";
-				mes "you somehow. Perhaps";
-				mes "you lost your copy of the";
-				mes "skill scroll I gave you? No";
-				mes "matter, I'll help you remember.";
-				next;
-				mes "[Mishuna]";
-				mes "You'll be given the chance to";
-				mes "choose which kind of ^FF0000Elemental";
-				mes "Change^000000 skill that you want, even one that you didn't previously";
-				mes "learn, so long as you fulfill";
-				mes "the skill's requirements.";
-				next;
-				mes "[Mishuna]";
-				mes "Keep in mind that once";
-				mes "you learn your Elemental";
-				mes "Change skill, you won't be";
-				mes "able to change it. Now, which";
-				mes "skill would you like to learn?";
-				next;
-				while(1) {
-					switch(select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")) {
-					case 1:
-						if (getskilllv("SA_FLAMELAUNCHER") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Blaze^000000, the skill";
-							mes "required for ^FF0000Fire Elemental";
-							mes "Change^000000. You'll need to learn";
-							mes "Endow Blaze or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Fire";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Fire Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTFIRE",1,0;
-							skill "SA_CREATECON",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 2:
-						if (getskilllv("SA_SEISMICWEAPON") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Quake^000000, the skill";
-							mes "required for ^FF0000Earth Elemental";
-							mes "Change^000000. You'll need to learn";
-							mes "Endow Quake or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Earth";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Earth Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTGROUND",1,0;
-							skill "SA_CREATECON",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 3:
-						if (getskilllv("SA_LIGHTNINGLOADER") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Tornado^000000, the";
-							mes "skill required for ^FF0000Wind Elemental Change^000000. You must learn Endow";
-							mes "Tornado or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Wind";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Wind Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTWIND",1,0;
-							skill "SA_CREATECON",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 4:
-						if (getskilllv("SA_FROSTWEAPON") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Tsunami^000000, the";
-							mes "skill required for ^FF0000Water Elemental Change^000000. You must learn Endow";
-							mes "Tsunami or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Water";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Water Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTWATER",1,0;
-							skill "SA_CREATECON",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					}
-				}
-			}
-			else if(getskilllv("SA_ELEMENTFIRE") == 0 && getskilllv("SA_ELEMENTGROUND") == 0 && getskilllv("SA_ELEMENTWIND") == 0 && getskilllv("SA_ELEMENTWATER") == 0) {
-				mes "[Mishuna]";
-				mes "Ah, you must have";
-				mes "forgotten what I taught";
-				mes "you somehow. Perhaps";
-				mes "you lost your copy of the";
-				mes "skill scroll I gave you? No";
-				mes "matter, I'll help you remember.";
-				next;
-				mes "[Mishuna]";
-				mes "You'll be given the chance to";
-				mes "choose which kind of ^FF0000Elemental";
-				mes "Change^000000 skill that you want, even one that you didn't previously";
-				mes "learn, so long as you fulfill";
-				mes "the skill's requirements.";
-				next;
-				mes "[Mishuna]";
-				mes "Keep in mind that once";
-				mes "you learn your Elemental";
-				mes "Change skill, you won't be";
-				mes "able to change it. Now, which";
-				mes "skill would you like to learn?";
-				next;
-				while(1) {
-					switch(select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")) {
-					case 1:
-						if (getskilllv("SA_FLAMELAUNCHER") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Blaze^000000, the skill";
-							mes "required for ^FF0000Fire Elemental";
-							mes "Change^000000. You'll need to learn";
-							mes "Endow Blaze or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Fire";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Fire Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTFIRE",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 2:
-						if (getskilllv("SA_SEISMICWEAPON") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Quake^000000, the skill";
-							mes "required for ^FF0000Earth Elemental";
-							mes "Change^000000. You'll need to learn";
-							mes "Endow Quake or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Earth";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Earth Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTGROUND",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 3:
-						if (getskilllv("SA_LIGHTNINGLOADER") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Tornado^000000, the";
-							mes "skill required for ^FF0000Wind Elemental Change^000000. You must learn Endow";
-							mes "Tornado or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Wind";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Wind Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTWIND",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					case 4:
-						if (getskilllv("SA_FROSTWEAPON") == 0) {
-							mes "[Mishuna]";
-							mes "I'm sorry, but you haven't";
-							mes "learned ^FF0000Endow Tsunami^000000, the";
-							mes "skill required for ^FF0000Water Elemental Change^000000. You must learn Endow";
-							mes "Tsunami or select another";
-							mes "Elemental Change skill.";
-							next;
-						}
-						else {
-							mes "[Mishuna]";
-							mes "Very well, I shall";
-							mes "teach you the ^FF0000Water";
-							mes "Elemental Change^000000 skill";
-							mes "and the ^FF0000Elemental Converter";
-							mes "Creation skill^000000. Please remain";
-							mes "still while I chant this spell.";
-							next;
-							mes "[Mishuna]";
-							mes "%$#@!#$% Yap~~";
-							specialeffect2 EF_RUWACH;
-							next;
-							mes "[Mishuna]";
-							mes "Yap!";
-							specialeffect2 EF_BRANDISHSPEAR;
-							next;
-							mes "^3355FFYou've successfully";
-							mes "learned the Water Elemental";
-							mes "Change skill and the Elemental";
-							mes "Converter Creation skill.^000000";
-							skill "SA_ELEMENTWATER",1,0;
-							next;
-							mes "[Mishuna]";
-							mes "Ah, you've learned these";
-							mes "skills as quickly as I thought";
-							mes "you would. Very well then, ";
-							mes "I hope you adeptly use these";
-							mes "talents for the right purposes.";
-							mes "Farewell for now, "+strcharinfo(0)+".";
-							close;
-						}
-						break;
-					}
-				}
-			}
-			else if(getskilllv("SA_CREATECON") == 0) {
-				mes "[Mishuna]";
-				mes "Ah, you must have";
-				mes "forgotten what I taught";
-				mes "you somehow. Perhaps";
-				mes "you lost your copy of the";
-				mes "skill scroll I gave you? No";
-				mes "matter, I'll help you remember.";
-				next;
-				mes "[Mishuna]";
-				mes "Alright, I'm going";
-				mes "to cast a spell that";
-				mes "will help you remember";
-				mes "the skills you forgot.";
-				mes "Don't move, and try to";
-				mes "stay as still as possible...";
-				next;
-				mes "[Mishuna]";
-				mes "%$#@!#$% Yap~~";
-				specialeffect2 EF_RUWACH;
-				next;
-				mes "[Mishuna]";
-				mes "Yap!";
-				specialeffect2 EF_BRANDISHSPEAR;
-				next;
-				mes "^3355FFYou successfully recalled";
-				mes "the Elemental Coverter";
-				mes "Creation skill and are";
-				mes "able to use it again.^000000";
-				skill "SA_CREATECON",1,0;
-				next;
-				mes "[Mishuna]";
-				mes "Ah, you've learned these";
-				mes "skills as quickly as I thought";
-				mes "you would. Very well then, ";
-				mes "I hope you adeptly use these";
-				mes "talents for the right purposes.";
-				mes "Farewell for now, "+strcharinfo(0)+".";
-				close;
-			}
-			else {
-				mes "[Mishuna]";
-				mes "If you have any Sage or";
-				mes "Scholar friends who haven't";
-				mes "learned the skills from Sir";
-				mes "Barmundt's scrolls, then";
-				mes "please refer them to me.";
-				next;
-				mes "[Mishuna]";
-				mes "I trust that you are";
-				mes "finding that these";
-				mes "element based skills";
-				mes "are very useful in battle.";
-				mes "Knowledge truly equates";
-				mes "to power in the long run...";
-				close;
-			}
-		}
-		else if(SAG_SK == 0) {
-			mes "[Mishuna]";
-			mes "Good day, I'm Mishuna, one";
-			mes "of the instructors here in the";
-			mes "Schweicherbil Magic Academy.";
-			mes "How may I be of service?";
-			next;
-			select("I seek new knowledge.");
-			mes "[Mishuna]";
-			mes "Ah, you must be "+strcharinfo(0)+".";
-			mes "I've looked forward to meeting";
-			mes "you. In the noble pursuit of";
-			mes "knowledge, might I suggest";
-			mes "reading the recently restored";
-			mes "scrolls of Sir Barmundt?";
-			next;
-			mes "[Mishuna]";
-			mes "Sir Barmundt's scrolls contain";
-			mes "knowledge about the 4 elements,";
-			mes "which are Fire, Water, Earth, and Wind. The knowledge of these";
-			mes "scrolls can be applied in the";
-			mes "use of 2 new Sage skills.";
-			next;
-			mes "[Mishuna]";
-			mes "The first is called ^FF0000Elemental";
-			mes "Change^000000, which enables you";
-			mes "to change a monster's attribute";
-			mes "according to the specific element^FFFFFF ^000000 of the Elemental Change skill";
-			mes "that you have learned.";
-			next;
-			mes "[Mishuna]";
-			mes "The second is called";
-			mes "Elemental Converter Creation,";
-			mes "which enables you to create";
-			mes "converter items that are required^FFFFFF ^000000 to use the Elemental Change skill.";
-			next;
-			mes "[Mishuna]";
-			mes "Although the knowledge of";
-			mes "these two skills has been";
-			mes "lost for years, we've finally";
-			mes "been able to recover most";
-			mes "of it. So, do you think you're";
-			mes "ready to learn these skills?";
-			next;
-			if(select("Maybe later.:Yes, I am.") == 1) {
-				mes "[Mishuna]";
-				mes "Ah, you must be busy right";
-				mes "now. No problem, just come";
-				mes "back when you think you're";
-				mes "ready to learn. Well then,";
-				mes "farewell and have a good day~";
-				close;
-			}
-			mes "[Mishuna]";
-			mes "Very well, then. First, you";
-			mes "must learn the Elemental";
-			mes "Coverter Creation skill, which";
-			mes "is essential to learning the";
-			mes "Elemental Change skill.";
-			next;
-			mes "[Mishuna]";
-			mes "Please bring the required";
-			mes "materials so that we can";
-			mes "construct a basic elemental";
-			mes "converter in order for you to";
-			mes "learn the skill. Let's see,";
-			mes "you will need to bring...";
-			next;
+yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
+	if(BaseJob != Job_Sage) {
+		mes "[Mishuna]";
+		mes "Good day, I'm Mishuna, one";
+		mes "of the instructors here in the";
+		mes "Schweicherbil Magic Academy.";
+		mes "By any chance, are you a Sage";
+		mes "or Scholar? Oh... You're not?";
+		next;
+		mes "[Mishuna]";
+		mes "Oh, that's too bad.";
+		mes "My apologies. But if you";
+		mes "happen to know any, or meet";
+		mes "any in your journeys, please";
+		mes "direct them to me if they haven't heard of the lessons I provide.";
+		next;
+		mes "[Mishuna]";
+		mes "I'm sorry to bother";
+		mes "you, and I thank you";
+		mes "for your time. Good";
+		mes "day to you, adventurer.";
+		close;
+	}
+	if(SAG_SK == 100) {
+		set .@Element, getskilllv("SA_ELEMENTFIRE") + getskilllv("SA_ELEMENTGROUND") + getskilllv("SA_ELEMENTWIND") + getskilllv("SA_ELEMENTWATER");
+		set .@Convert, getskilllv("SA_CREATECON");
+		if(.@Element && .@Convert) {
 			mes "[Mishuna]";
-			mes "^ff00007 Horns^000000,";
-			mes "^ff000012 Rainbow Shells^000000,";
-			mes "^ff000010 Snail's Shells^000000,";
-			mes "^ff00004 Blank Scrolls^000000 and";
-			mes "^ff000010 Scorpion Tails^000000.^000000";
+			mes "If you have any Sage or";
+			mes "Scholar friends who haven't";
+			mes "learned the skills from Sir";
+			mes "Barmundt's scrolls, then";
+			mes "please refer them to me.";
 			next;
 			mes "[Mishuna]";
-			mes "Alright, I shall be";
-			mes "nexting here for your";
-			mes "return. Remember that we";
-			mes "need these items to create";
-			mes "a converter so that you can^FFFFFF ^000000 learn the skill from my example...";
-			set SAG_SK,1;
+			mes "I trust that you are";
+			mes "finding that these";
+			mes "element based skills";
+			mes "are very useful in battle.";
+			mes "Knowledge truly equates";
+			mes "to power in the long run...";
 			close;
 		}
-		else if(SAG_SK == 1) {
-			if (countitem(904) < 10 || countitem(947) < 7 || countitem(1013) < 12 || countitem(946) < 10 || countitem(7433) < 4) {
-				mes "[Mishuna]";
-				mes "Hm, you still haven't";
-				mes "gathered all of the materials";
-				mes "required to create an elemental";
-				mes "coverter. Let me remind you";
-				mes "what to bring so that you";
-				mes "don't forget next time...";
-				next;
-				mes "[Mishuna]";
-				mes "^ff00007 Horns^000000,";
-				mes "^ff000012 Rainbow Shells^000000,";
-				mes "^ff000010 Snail's Shells^000000,";
-				mes "^ff00004 Blank Scrolls^000000 and";
-				mes "^ff000010 Scorpion Tails^000000.^000000";
-				next;
-				mes "[Mishuna]";
-				mes "Don't forget that we need";
-				mes "all of these items to create";
-				mes "a converter so that you can";
-				mes "learn the Elemental Converter";
-				mes "Creation skill by watching";
-				mes "me demonstrate it for you.";
-				close;
-			}
-			else {
-				mes "[Mishuna]";
-				mes "Great, you brought everything.";
-				mes "Now, let me explain the skill.";
-				mes "The skills you learn as a Sage";
-				mes "determine what kind of elemental converters that you can craft.";
-				next;
-				mes "[Mishuna]";
-				mes "The ^FF0000Endow Blaze^000000 skill enables";
-				mes "you to create Fire elemental";
-				mes "converters. The ^FF0000Endow Quake^000000";
-				mes "skill enables the creation";
-				mes "of Earth elemental converters.";
-				next;
-				mes "[Mishuna]";
-				mes "^FF0000Endow Tornado^000000 enables";
-				mes "the creation of Wind elemental";
-				mes "converters, and ^FF0000Endow Tsunami^000000";
-				mes "enables the creation of Water";
-				mes "elemental converters. That";
-				mes "all makes sense, right?";
-				next;
-				mes "[Mishuna]";
-				mes "Now, your elemental coverter";
-				mes "creation success rate depends";
-				mes "on the level of the Endow Blaze, Endow Quake, Endow Tornado,";
-				mes "or Endow Tsunami skills, and";
-				mes "your abilities.";
-				next;
-				mes "[Mishuna]";
-				mes "Now, please take this copy";
-				mes "of Barmundt's scroll, and use";
-				mes "it as a reference when you try";
-				mes "to craft elemental converters";
-				mes "when you use the Elemental";
-				mes "Converter Creation skill.";
-				next;
-				mes "^3355FFYou have learned the";
-				mes "Elemental Converter";
-				mes "Creation skill by reviewing";
-				mes "your copy of Barmundt's scroll.^000000";
-				specialeffect2 EF_ABSORBSPIRITS;
-				delitem 904,10; // Scorpion_Tail
-				delitem 947,7; // Horn
-				delitem 1013,12; // Rainbow_Shell
-				delitem 946,10; // Snail's_Shell
-				delitem 7433,4; // Blank_Scroll
-				set SAG_SK,2;
-				skill "SA_CREATECON",1,0;
-				next;
-				mes "[Mishuna]";
-				mes "Wow, "+strcharinfo(0)+"!";
-				mes "You learned that skill";
-				mes "really quickly! No wonder";
-				mes "people say that you're one";
-				mes "of the best Sages around!";
-				next;
-				mes "[Mishuna]";
-				mes "Now you're ready to";
-				mes "learn the other skill,";
-				mes "Elemental Change. Alright,";
-				mes "I need to prepare a few things";
-				mes "for this lesson, so we'll meet";
-				mes "and discuss this later, okay?";
-				close;
-			}
-		}
-		else if(SAG_SK == 2) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
-				next;
-			}
+		mes "[Mishuna]";
+		mes "Ah, you must have";
+		mes "forgotten what I taught";
+		mes "you somehow. Perhaps";
+		mes "you lost your copy of the";
+		mes "skill scroll I gave you? No";
+		mes "matter, I'll help you remember.";
+		next;
+		if(.@Element == 0) {
 			mes "[Mishuna]";
 			mes "You'll be given the chance to";
 			mes "choose which kind of ^FF0000Elemental";
@@ -679,448 +78,417 @@ yuno_in03,176,24,3	script	Mischna	755,{
 			mes "able to change it. Now, which";
 			mes "skill would you like to learn?";
 			next;
+			setarray .@ReqSkill[0],280,283,282,281;
+			setarray .@ReqSkill$[0],"Blaze","Quake","Tornado","Tsunami";
+			setarray .@skill[0],1018,1017,1019,1008;
+			setarray .@skill$[0],"Fire","Earth","Wind","Water";
 			while(1) {
-				switch(select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")) {
-				case 1:
-					if(getskilllv("SA_FLAMELAUNCHER") == 0) {
-						mes "[Mishuna]";
-						mes "I'm sorry, but you have not";
-						mes "learned ^FF0000Endow Blaze^000000, the skill";
-						mes "required for the Fire Elemental Change skill. Please learn Endow";
-						mes "Blaze or select another Elemental Change skill for me to teach you.";
-						next;
-					}
-					else {
-						mes "[Mishuna]";
-						mes "Very well, then. Please";
-						mes "bring the following items";
-						mes "so that you can learn the";
-						mes "Fire Elemental Change skill.";
-						next;
-						mes "[Mishuna]";
-						mes "^FF000020 Red Bloods^000000,";
-						mes "^FF00001 Payon Solution^000000 and";
-						mes "^FF00001 Morroc Solution^000000. Please";
-						mes "return to me once you have";
-						mes "all the materials ready.";
-						set SAG_SK,10;
-						close;
-					}
-					break;
-				case 2:
-					if(getskilllv("SA_SEISMICWEAPON") == 0) {
-						mes "[Mishuna]";
-						mes "I'm sorry, but you have not";
-						mes "learned ^FF0000Endow Quake^000000, the skill";
-						mes "required for the Earth Elemental Change skill. Please learn Endow";
-						mes "Quake or select another Elemental Change skill for me to teach you.";
-						next;
-					}
-					else {
-						mes "[Mishuna]";
-						mes "Very well, then. Please";
-						mes "bring the following items";
-						mes "so that you can learn the";
-						mes "Earth Elemental Change skill.";
-						next;
-						mes "[Mishuna]";
-						mes "^ff000020 Green Lives^000000,";
-						mes "^ff00001 Payon Solution^000000 and";
-						mes "^ff00001 Morroc Solution^000000. Please";
-						mes "return to me once you have";
-						mes "all the materials ready.";
-						set SAG_SK,20;
-						close;
-					}
-					break;
-				case 3:
-					if(getskilllv("SA_LIGHTNINGLOADER") == 0) {
-						mes "[Mishuna]";
-						mes "I'm sorry, but you have not learned ^FF0000Endow Tornado^000000, the skill";
-						mes "required for the Wind Elemental Change skill. Please learn Endow";
-						mes "Tornado or pick another Elemental Change skill for me to teach you.";
-						next;
-					}
-					else {
-						mes "[Mishuna]";
-						mes "Very well, then. Please";
-						mes "bring the following items";
-						mes "so that you can learn the";
-						mes "Wind Elemental Change skill.";
-						next;
-						mes "[Mishuna]";
-						mes "^ff000020 Winds of Verdure^000000,";
-						mes "^ff00001 Payon Solution^000000 and";
-						mes "^ff00001 Morroc Solution^000000. Please";
-						mes "return to me once you have";
-						mes "all the materials ready.";
-						set SAG_SK,30;
-						close;
-					}
-					break;
-				case 4:
-					if(getskilllv("SA_FROSTWEAPON") == 0) {
-						mes "[Mishuna]";
-						mes "I'm sorry, but you have not learned ^FF0000Endow Tsunami^000000, the skill";
-						mes "required for the Water Elemental Change skill. Please learn Endow";
-						mes "Tsunami or pick another Elemental Change skill for me to teach you.";
-						next;
-					}
-					else {
-						mes "[Mishuna]";
-						mes "Very well, then. Please";
-						mes "bring the following items";
-						mes "so that you can learn the";
-						mes "Water Elemental Change skill.";
-						next;
-						mes "[Mishuna]";
-						mes "^ff000020 Crystal Blues^000000,";
-						mes "^ff00001 Payon Solution^000000 and";
-						mes "^ff00001 Morroc Solution^000000. Please";
-						mes "return to me once you have";
-						mes "all the materials ready.";
-						set SAG_SK,40;
-						close;
-					}
+				set .@i, select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")-1;
+				if(getskilllv(.@ReqSkill[.@i]) == 0) {
+					mes "[Mishuna]";
+					mes "I'm sorry, but you haven't";
+					mes "learned ^FF0000Endow "+.@ReqSkill$[.@i]+"^000000, the skill";
+					mes "required for ^FF0000"+.@skill$[.@i]+" Elemental";
+					mes "Change^000000. You'll need to learn";
+					mes "Endow "+.@ReqSkill$[.@i]+" or select another";
+					mes "Elemental Change skill.";
+					next;
+				}
+				else {
+					mes "[Mishuna]";
+					mes "Very well, I shall";
+					mes "teach you the ^FF0000"+.@skill$[.@i];
+					mes "Elemental Change^000000 skill";
+					mes "and the ^FF0000Elemental Converter";
+					mes "Creation skill^000000. Please remain";
+					mes "still while I chant this spell.";
+					next;
+					mes "[Mishuna]";
+					mes "%$#@!#$% Yap~~";
+					specialeffect2 EF_RUWACH;
+					next;
+					mes "[Mishuna]";
+					mes "Yap!";
+					specialeffect2 EF_BRANDISHSPEAR;
+					next;
+					mes "^3355FFYou've successfully";
+					mes "learned the "+.@skill$[.@i]+" Elemental";
+					mes "Change skill and the Elemental";
+					mes "Converter Creation skill.^000000";
+					skill .@skill[.@i],1,0;
+					if(.@Convert == 0)
+						skill "SA_CREATECON",1,0;
+					next;
 					break;
 				}
 			}
 		}
-		else if(SAG_SK == 10) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
-				next;
-			}
-			if (countitem(990) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
-				mes "[Mishuna]";
-				mes "Are you having trouble";
-				mes "gathering all the required";
-				mes "items? Just in case, let me";
-				mes "remind you of what you need";
-				mes "to bring me to learn the Fire";
-				mes "Elemental Change skill.";
-				next;
-				mes "[Mishuna]";
-				mes "^ff000020 Red Bloods^000000,";
-				mes "^ff00001 Payon Solution^000000 and";
-				mes "^ff00001 Morroc Solution^000000. Please";
-				mes "don't forget and have the";
-				mes "materials ready for the next";
-				mes "time you see me, alright?";
-				close;
-			}
-			mes "[Mishuna]";
-			mes "Ah, you're back. I can now";
-			mes "finally teach you about the";
-			mes "Fire Elemental Change skill.";
-			mes "This skill has the chance to";
-			mes "permanently change a targeted";
-			mes "monster's attribute to ^FF0000Fire^000000.";
-			next;
+		else if(.@Convert == 0) {
 			mes "[Mishuna]";
-			mes "Remember that you must";
-			mes "use an elemental converter to";
-			mes "cast this skill, and that it has^FFFFFF ^000000a success rate, similarly to the";
-			mes "Elemental Converter Creation";
-			mes "skill. So be aware of that.";
+			mes "Alright, I'm going";
+			mes "to cast a spell that";
+			mes "will help you remember";
+			mes "the skills you forgot.";
+			mes "Don't move, and try to";
+			mes "stay as still as possible...";
 			next;
 			mes "[Mishuna]";
-			mes "Now, "+strcharinfo(0)+",";
-			mes "I'm going to cast a spell";
-			mes "that will help you memorize";
-			mes "the Fire Elemental Change";
-			mes "skill. Try to stay still...";
-			next;
-			mes "^3355FFMishuna begins to chant";
-			mes "a strange incantation as";
-			mes "a soft blue glow surrounds";
-			mes "his body and slowly grows";
-			mes "brighter and more intense.^000000";
+			mes "%$#@!#$% Yap~~";
 			specialeffect2 EF_RUWACH;
 			next;
 			mes "[Mishuna]";
-			mes "@#$%^~ Yap!";
+			mes "Yap!";
 			specialeffect2 EF_BRANDISHSPEAR;
-			delitem 990,20; // Boody Red
-			delitem 1089,1; // Payon Potion
-			delitem 1088,1; // Morocc Potion
-			set SAG_SK,100;
-			skill "SA_ELEMENTFIRE",1,0;
 			next;
+			mes "^3355FFYou successfully recalled";
+			mes "the Elemental Coverter";
+			mes "Creation skill and are";
+			mes "able to use it again.^000000";
+			skill "SA_CREATECON",1,0;
+			next;
+		}
+		mes "[Mishuna]";
+		mes "Ah, you've learned these";
+		mes "skills as quickly as I thought";
+		mes "you would. Very well then,";
+		mes "I hope you adeptly use these";
+		mes "talents for the right purposes.";
+		mes "Farewell for now, "+strcharinfo(0)+".";
+		close;
+	}
+	else if(SAG_SK == 0) {
+		mes "[Mishuna]";
+		mes "Good day, I'm Mishuna, one";
+		mes "of the instructors here in the";
+		mes "Schweicherbil Magic Academy.";
+		mes "How may I be of service?";
+		next;
+		select("I seek new knowledge.");
+		mes "[Mishuna]";
+		mes "Ah, you must be "+strcharinfo(0)+".";
+		mes "I've looked forward to meeting";
+		mes "you. In the noble pursuit of";
+		mes "knowledge, might I suggest";
+		mes "reading the recently restored";
+		mes "scrolls of Sir Barmundt?";
+		next;
+		mes "[Mishuna]";
+		mes "Sir Barmundt's scrolls contain";
+		mes "knowledge about the 4 elements,";
+		mes "which are Fire, Water, Earth, and Wind. The knowledge of these";
+		mes "scrolls can be applied in the";
+		mes "use of 2 new Sage skills.";
+		next;
+		mes "[Mishuna]";
+		mes "The first is called ^FF0000Elemental";
+		mes "Change^000000, which enables you";
+		mes "to change a monster's attribute";
+		mes "according to the specific element^FFFFFF ^000000 of the Elemental Change skill";
+		mes "that you have learned.";
+		next;
+		mes "[Mishuna]";
+		mes "The second is called";
+		mes "Elemental Converter Creation,";
+		mes "which enables you to create";
+		mes "converter items that are required^FFFFFF ^000000 to use the Elemental Change skill.";
+		next;
+		mes "[Mishuna]";
+		mes "Although the knowledge of";
+		mes "these two skills has been";
+		mes "lost for years, we've finally";
+		mes "been able to recover most";
+		mes "of it. So, do you think you're";
+		mes "ready to learn these skills?";
+		next;
+		if(select("Maybe later.:Yes, I am.") == 1) {
 			mes "[Mishuna]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm happy to say that you've";
-			mes "successfully memorized the";
-			mes "Fire Elemental Change skill.";
-			mes "I hope that it serves you well";
-			mes "in battle. Farewell for now~";
+			mes "Ah, you must be busy right";
+			mes "now. No problem, just come";
+			mes "back when you think you're";
+			mes "ready to learn. Well then,";
+			mes "farewell and have a good day~";
 			close;
 		}
-		else if(SAG_SK == 20) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
-				next;
-			}
-			if (countitem(993) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
-				mes "[Mishuna]";
-				mes "Are you having trouble";
-				mes "gathering all the required";
-				mes "items? Just in case, let me";
-				mes "remind you of what you need";
-				mes "to bring me to learn the Earth";
-				mes "Elemental Change skill.";
-				next;
-				mes "[Mishuna]";
-				mes "^ff000020 Green Lives^000000,";
-				mes "^ff00001 Payon Solution^000000 and";
-				mes "^ff00001 Morroc Solution^000000. Please";
-				mes "don't forget and have the";
-				mes "materials ready for the next";
-				mes "time you see me, alright?";
-				close;
-			}
-			mes "[Mishuna]";
-			mes "Ah, you're back. I can now";
-			mes "finally teach you about the";
-			mes "Earth Elemental Change skill.";
-			mes "This skill has the chance to";
-			mes "permanently change a targeted";
-			mes "monster's attribute to Earth.";
-			next;
-			mes "[Mishuna]";
-			mes "Remember that you must";
-			mes "use an elemental converter to";
-			mes "cast this skill, and that it has^FFFFFF ^000000 a success rate, similarly to the";
-			mes "Elemental Converter Creation";
-			mes "skill. So be aware of that.";
-			next;
+		mes "[Mishuna]";
+		mes "Very well, then. First, you";
+		mes "must learn the Elemental";
+		mes "Coverter Creation skill, which";
+		mes "is essential to learning the";
+		mes "Elemental Change skill.";
+		next;
+		mes "[Mishuna]";
+		mes "Please bring the required";
+		mes "materials so that we can";
+		mes "construct a basic elemental";
+		mes "converter in order for you to";
+		mes "learn the skill. Let's see,";
+		mes "you will need to bring...";
+		next;
+		mes "[Mishuna]";
+		mes "^ff00007 Horns^000000,";
+		mes "^ff000012 Rainbow Shells^000000,";
+		mes "^ff000010 Snail's Shells^000000,";
+		mes "^ff00004 Blank Scrolls^000000 and";
+		mes "^ff000010 Scorpion Tails^000000.^000000";
+		next;
+		mes "[Mishuna]";
+		mes "Alright, I shall be";
+		mes "nexting here for your";
+		mes "return. Remember that we";
+		mes "need these items to create";
+		mes "a converter so that you can^FFFFFF ^000000 learn the skill from my example...";
+		set SAG_SK,1;
+		close;
+	}
+	else if(SAG_SK == 1) {
+		if (countitem(904) < 10 || countitem(947) < 7 || countitem(1013) < 12 || countitem(946) < 10 || countitem(7433) < 4) {
 			mes "[Mishuna]";
-			mes "Now, "+strcharinfo(0)+",";
-			mes "I'm going to cast a spell";
-			mes "that will help you memorize";
-			mes "the Earth Elemental Change";
-			mes "skill. Try to stay still...";
-			next;
-			mes "^3355FFMishuna begins to chant";
-			mes "a strange incantation as";
-			mes "a soft blue glow surrounds";
-			mes "his body and slowly grows";
-			mes "brighter and more intense.^000000";
-			specialeffect2 EF_RUWACH;
+			mes "Hm, you still haven't";
+			mes "gathered all of the materials";
+			mes "required to create an elemental";
+			mes "coverter. Let me remind you";
+			mes "what to bring so that you";
+			mes "don't forget next time...";
 			next;
 			mes "[Mishuna]";
-			mes "@#$%^~ Yap!";
-			specialeffect2 EF_BRANDISHSPEAR;
-			delitem 993,20; // Yellow Live
-			delitem 1089,1; // Payon Potion
-			delitem 1088,1; // Morocc Potion
-			set SAG_SK,100;
-			skill "SA_ELEMENTGROUND",1,0;
+			mes "^ff00007 Horns^000000,";
+			mes "^ff000012 Rainbow Shells^000000,";
+			mes "^ff000010 Snail's Shells^000000,";
+			mes "^ff00004 Blank Scrolls^000000 and";
+			mes "^ff000010 Scorpion Tails^000000.^000000";
 			next;
 			mes "[Mishuna]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm happy to say that you've";
-			mes "successfully memorized the";
-			mes "Earth Elemental Change skill.";
-			mes "I hope that it serves you well";
-			mes "in battle. Farewell for now~";
+			mes "Don't forget that we need";
+			mes "all of these items to create";
+			mes "a converter so that you can";
+			mes "learn the Elemental Converter";
+			mes "Creation skill by watching";
+			mes "me demonstrate it for you.";
 			close;
 		}
-		else if(SAG_SK == 30) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
-				next;
-			}
-			if (countitem(992) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
-				mes "[Mishuna]";
-				mes "Are you having trouble";
-				mes "gathering all the required";
-				mes "items? Just in case, let me";
-				mes "remind you of what you need";
-				mes "to bring me to learn the Wind";
-				mes "Elemental Change skill.";
-				next;
-				mes "[Mishuna]";
-				mes "^ff000020 Winds of Verdure^000000,";
-				mes "^ff00001 Payon Solution^000000 and";
-				mes "^ff00001 Morroc Solution^000000. Please";
-				mes "don't forget and have the";
-				mes "materials ready for the next";
-				mes "time you see me, alright?";
-				close;
-			}
-			mes "[Mishuna]";
-			mes "Ah, you're back. I can now";
-			mes "finally teach you about the";
-			mes "Wind Elemental Change skill.";
-			mes "This skill has the chance to";
-			mes "permanently change a targeted";
-			mes "monster's attribute to Wind.";
-			next;
-			mes "[Mishuna]";
-			mes "Remember that you must";
-			mes "use an elemental converter to";
-			mes "cast this skill, and that it has^FFFFFF ^000000 a success rate, similarly to the";
-			mes "Elemental Converter Creation";
-			mes "skill. So be aware of that.";
-			next;
-			mes "[Mishuna]";
-			mes "Now, "+strcharinfo(0)+",";
-			mes "I'm going to cast a spell";
-			mes "that will help you memorize";
-			mes "the Wind Elemental Change";
-			mes "skill. Try to stay still...";
-			next;
-			mes "^3355FFMishuna begins to chant";
-			mes "a strange incantation as";
-			mes "a soft blue glow surrounds";
-			mes "his body and slowly grows";
-			mes "brighter and more intense.^000000";
-			specialeffect2 EF_RUWACH;
-			next;
-			mes "[Mishuna]";
-			mes "@#$%^~ Yap!";
-			specialeffect2 EF_BRANDISHSPEAR;
-			delitem 992,20; // Wind Of Verdure
-			delitem 1089,1; // Payon Potion
-			delitem 1088,1; // Morocc Potion
-			set SAG_SK,100;
-			skill "SA_ELEMENTWIND",1,0;
-			next;
+		else {
 			mes "[Mishuna]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm happy to say that you've";
-			mes "successfully memorized the";
-			mes "Wind Elemental Change skill.";
-			mes "I hope that it serves you well";
-			mes "in battle. Farewell for now~";
+			mes "Great, you brought everything.";
+			mes "Now, let me explain the skill.";
+			mes "The skills you learn as a Sage";
+			mes "determine what kind of elemental converters that you can craft.";
+			next;
+			mes "[Mishuna]";
+			mes "The ^FF0000Endow Blaze^000000 skill enables";
+			mes "you to create Fire elemental";
+			mes "converters. The ^FF0000Endow Quake^000000";
+			mes "skill enables the creation";
+			mes "of Earth elemental converters.";
+			next;
+			mes "[Mishuna]";
+			mes "^FF0000Endow Tornado^000000 enables";
+			mes "the creation of Wind elemental";
+			mes "converters, and ^FF0000Endow Tsunami^000000";
+			mes "enables the creation of Water";
+			mes "elemental converters. That";
+			mes "all makes sense, right?";
+			next;
+			mes "[Mishuna]";
+			mes "Now, your elemental coverter";
+			mes "creation success rate depends";
+			mes "on the level of the Endow Blaze, Endow Quake, Endow Tornado,";
+			mes "or Endow Tsunami skills, and";
+			mes "your abilities.";
+			next;
+			mes "[Mishuna]";
+			mes "Now, please take this copy";
+			mes "of Barmundt's scroll, and use";
+			mes "it as a reference when you try";
+			mes "to craft elemental converters";
+			mes "when you use the Elemental";
+			mes "Converter Creation skill.";
+			next;
+			mes "^3355FFYou have learned the";
+			mes "Elemental Converter";
+			mes "Creation skill by reviewing";
+			mes "your copy of Barmundt's scroll.^000000";
+			specialeffect2 EF_ABSORBSPIRITS;
+			delitem 904,10; // Scorpion_Tail
+			delitem 947,7; // Horn
+			delitem 1013,12; // Rainbow_Shell
+			delitem 946,10; // Snail's_Shell
+			delitem 7433,4; // Blank_Scroll
+			set SAG_SK,2;
+			skill "SA_CREATECON",1,0;
+			next;
+			mes "[Mishuna]";
+			mes "Wow, "+strcharinfo(0)+"!";
+			mes "You learned that skill";
+			mes "really quickly! No wonder";
+			mes "people say that you're one";
+			mes "of the best Sages around!";
+			next;
+			mes "[Mishuna]";
+			mes "Now you're ready to";
+			mes "learn the other skill,";
+			mes "Elemental Change. Alright,";
+			mes "I need to prepare a few things";
+			mes "for this lesson, so we'll meet";
+			mes "and discuss this later, okay?";
 			close;
 		}
-		else if(SAG_SK == 40) {
-			if(getskilllv("SA_CREATECON") == 0) {
-				skill "SA_CREATECON",1,0;
-				mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
+	}
+	else if(SAG_SK == 2) {
+		if(getskilllv("SA_CREATECON") == 0) {
+			skill "SA_CREATECON",1,0;
+			mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
+			next;
+		}
+		mes "[Mishuna]";
+		mes "You'll be given the chance to";
+		mes "choose which kind of ^FF0000Elemental";
+		mes "Change^000000 skill that you want, even one that you didn't previously";
+		mes "learn, so long as you fulfill";
+		mes "the skill's requirements.";
+		next;
+		mes "[Mishuna]";
+		mes "Keep in mind that once";
+		mes "you learn your Elemental";
+		mes "Change skill, you won't be";
+		mes "able to change it. Now, which";
+		mes "skill would you like to learn?";
+		next;
+		setarray .@ReqSkill[0],280,283,282,281;
+		setarray .@ReqSkill$[0],"Blaze","Quake","Tornado","Tsunami";
+		setarray .@ReqItem$[0],"Red Bloods","Green Lives","Wind of Verdure","Crystal Blues";
+		setarray .@skill$[0],"Fire","Earth","Wind","Water";
+		while(1) {
+			set .@i, select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")-1;
+			if(getskilllv(.@ReqSkill[.@i]) == 0) {
+				mes "[Mishuna]";
+				mes "I'm sorry, but you have not";
+				mes "learned ^FF0000Endow "+.@ReqSkill$[.@i]+"^000000, the skill";
+				mes "required for the "+.@skill$[.@i]+" Elemental Change skill. Please learn Endow";
+				mes .@ReqSkill$[.@i]+" or select another Elemental Change skill for me to teach you.";
 				next;
 			}
-			if (countitem(991) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
+			else {
 				mes "[Mishuna]";
-				mes "Are you having trouble";
-				mes "gathering all the required";
-				mes "items? Just in case, let me";
-				mes "remind you of what you need";
-				mes "to bring me to learn the Water";
-				mes "Elemental Change skill.";
+				mes "Very well, then. Please";
+				mes "bring the following items";
+				mes "so that you can learn the";
+				mes .@skill$[.@i]+" Elemental Change skill.";
 				next;
 				mes "[Mishuna]";
-				mes "^ff000020 Crystal Blues^000000,";
-				mes "^ff00001 Payon Solution^000000 and";
-				mes "^ff00001 Morroc Solution^000000. Please";
-				mes "don't forget and have the";
-				mes "materials ready for the next";
-				mes "time you see me, alright?";
+				mes "^FF000020 "+.@ReqItem$[.@i]+"^000000,";
+				mes "^FF00001 Payon Solution^000000 and";
+				mes "^FF00001 Morroc Solution^000000. Please";
+				mes "return to me once you have";
+				mes "all the materials ready.";
+				set SAG_SK, 10 * (.@i+1); //10,20,30,40
 				close;
 			}
-			mes "[Mishuna]";
-			mes "Ah, you're back. I can now";
-			mes "finally teach you about the";
-			mes "Water Elemental Change skill.";
-			mes "This skill has the chance to";
-			mes "permanently change a targeted";
-			mes "monster's attribute to Water.";
-			next;
-			mes "[Mishuna]";
-			mes "Remember that you must";
-			mes "use an elemental converter to";
-			mes "cast this skill, and that it has^FFFFFF ^000000 a success rate, similarly to the";
-			mes "Elemental Converter Creation";
-			mes "skill. So be aware of that.";
-			next;
-			mes "[Mishuna]";
-			mes "Now, "+strcharinfo(0)+",";
-			mes "I'm going to cast a spell";
-			mes "that will help you memorize";
-			mes "the Water Elemental Change";
-			mes "skill. Try to stay still...";
-			next;
-			mes "^3355FFMishuna begins to chant";
-			mes "a strange incantation as";
-			mes "a soft blue glow surrounds";
-			mes "his body and slowly grows";
-			mes "brighter and more intense.^000000";
-			specialeffect2 EF_RUWACH;
-			next;
-			mes "[Mishuna]";
-			mes "@#$%^~ Yap!";
-			specialeffect2 EF_BRANDISHSPEAR;
-			delitem 991,20; // Crystal Blue
-			delitem 1089,1; // Payon Potion
-			delitem 1088,1; // Morocc Potion
-			set SAG_SK,100;
-			skill "SA_ELEMENTWATER",1,0;
+		}
+	}
+	else if(SAG_SK == 10 || SAG_SK == 20 || SAG_SK == 30 || SAG_SK == 40) {
+		if(getskilllv("SA_CREATECON") == 0) {
+			skill "SA_CREATECON",1,0;
+			mes "- I recalled ^ff0000Elemental Converter Creation skill^000000 While I talk to Mishuna! -";
 			next;
-			mes "[Mishuna]";
-			mes ""+strcharinfo(0)+"...";
-			mes "I'm happy to say that you've";
-			mes "successfully memorized the";
-			mes "Water Elemental Change skill.";
-			mes "I hope that it serves you well";
-			mes "in battle. Farewell for now~";
-			close;
 		}
-		else {
-			mes "[Mishuna]";
-			mes "If you have any Sage or";
-			mes "Scholar friends who haven't";
-			mes "learned the skills from Sir";
-			mes "Barmundt's scrolls, then";
-			mes "please refer them to me.";
+		set .@i, (SAG_SK/10) - 1;
+		setarray .@ReqItem[0],990,993,992,991;
+		setarray .@ReqItem$[0],"Red Bloods","Green Lives","Wind of Verdure","Crystal Blues";
+		setarray .@skill[0],1018,1017,1019,1008;
+		setarray .@skill$[0],"Fire","Earth","Wind","Water";
+		if (countitem(.@ReqItem[.@i]) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
+			mes "[Mishuna]";
+			mes "Are you having trouble";
+			mes "gathering all the required";
+			mes "items? Just in case, let me";
+			mes "remind you of what you need";
+			mes "to bring me to learn the "+.@skill$[.@i];
+			mes "Elemental Change skill.";
 			next;
 			mes "[Mishuna]";
-			mes "I trust that you are";
-			mes "finding that these";
-			mes "element based skills";
-			mes "are very useful in battle.";
-			mes "Knowledge truly equates";
-			mes "to power in the long run...";
+			mes "^ff000020 "+.@ReqItem$[.@i]+"^000000,";
+			mes "^ff00001 Payon Solution^000000 and";
+			mes "^ff00001 Morroc Solution^000000. Please";
+			mes "don't forget and have the";
+			mes "materials ready for the next";
+			mes "time you see me, alright?";
 			close;
 		}
-	}
-	else {
 		mes "[Mishuna]";
-		mes "Good day, I'm Mishuna, one";
-		mes "of the instructors here in the";
-		mes "Schweicherbil Magic Academy.";
-		mes "By any chance, are you a Sage";
-		mes "or Scholar? Oh... You're not?";
+		mes "Ah, you're back. I can now";
+		mes "finally teach you about the";
+		mes .@skill$[.@i]+" Elemental Change skill.";
+		mes "This skill has the chance to";
+		mes "permanently change a targeted";
+		mes "monster's attribute to "+.@skill$[.@i]+".";
 		next;
 		mes "[Mishuna]";
-		mes "Oh, that's too bad.";
-		mes "My apologies. But if you";
-		mes "happen to know any, or meet";
-		mes "any in your journeys, please";
-		mes "direct them to me if they haven't heard of the lessons I provide.";
+		mes "Remember that you must";
+		mes "use an elemental converter to";
+		mes "cast this skill, and that it has a success rate, similarly to the";
+		mes "Elemental Converter Creation";
+		mes "skill. So be aware of that.";
 		next;
 		mes "[Mishuna]";
-		mes "I'm sorry to bother";
-		mes "you, and I thank you";
-		mes "for your time. Good";
-		mes "day to you, adventurer.";
+		mes "Now, "+strcharinfo(0)+",";
+		mes "I'm going to cast a spell";
+		mes "that will help you memorize";
+		mes "the "+.@skill$[.@i]+" Elemental Change";
+		mes "skill. Try to stay still...";
+		next;
+		mes "^3355FFMishuna begins to chant";
+		mes "a strange incantation as";
+		mes "a soft blue glow surrounds";
+		mes "his body and slowly grows";
+		mes "brighter and more intense.^000000";
+		specialeffect2 EF_RUWACH;
+		next;
+		mes "[Mishuna]";
+		mes "@#$%^~ Yap!";
+		specialeffect2 EF_BRANDISHSPEAR;
+		delitem .@ReqItem[.@i],20;
+		delitem 1089,1; // Payon Potion
+		delitem 1088,1; // Morocc Potion
+		set SAG_SK,100;
+		skill .@skill[.@i],1,0;
+		next;
+		mes "[Mishuna]";
+		mes strcharinfo(0)+"...";
+		mes "I'm happy to say that you've";
+		mes "successfully memorized the";
+		mes .@skill$[.@i]+" Elemental Change skill.";
+		mes "I hope that it serves you well";
+		mes "in battle. Farewell for now~";
+		close;
+	}
+	else {
+		mes "[Mishuna]";
+		mes "If you have any Sage or";
+		mes "Scholar friends who haven't";
+		mes "learned the skills from Sir";
+		mes "Barmundt's scrolls, then";
+		mes "please refer them to me.";
+		next;
+		mes "[Mishuna]";
+		mes "I trust that you are";
+		mes "finding that these";
+		mes "element based skills";
+		mes "are very useful in battle.";
+		mes "Knowledge truly equates";
+		mes "to power in the long run...";
 		close;
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index bf4fd021d..8f57af3c4 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -1,11 +1,9 @@
-//===== Hercules Script =======================================
+//===== Hercules Script ======================================
 //= Swordsman Skills Quests
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.9
-//===== Compatible With: =====================================
-//= Hercules GIT
+//= 1.8.1
 //===== Description: =========================================
 //= Quests for skills: Fatal Blow, Mobile HP Recovery,
 //  Auto-Berserk
@@ -13,10 +11,144 @@
 //= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.7 Updated to latest available official file. [Masao]
 //= 1.8 Fixed JobLevel requirements. [Euphy]
-//= 1.9 Removed Knight De Thomas. [Streusel]
+//= 1.8.1 Fixed location of Kight De Thomas. [Kisuka]
 //============================================================
 
-prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
+izlude_in,118,175,4	script	Knight De Thomas	4W_M_02,{
+	if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) {
+		mes "[De Thomas]";
+		mes "Oh, no! You must have been hurt! Are you ok?";
+		mes "You must have fought hard to get such serious injuries..";
+		mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
+		next;
+		mes "[De Thomas]";
+		if (Sex == 0) {
+			mes "For these swordsmen and knights, there is a wonderful skill.";
+		}
+		else {
+			mes "For these swordswomen and knights, there is a wonderful skill young lady.";
+		}
+		mes "I present to you - HP Recovery While Moving!";
+		mes "Body moving is a splendid skill";
+		mes "that allows you to regain strength(HP)";
+		mes "while you are moving!";
+		next;
+		mes "[De Thomas]";
+		mes "It is currently under development";
+		mes "so it may not recover that much,";
+		mes "but it will help a little.";
+		mes "What do you think? Would you like to learn this skill?";
+		next;
+		switch (select("What a nice skill! I want to learn it!:No, thank you.")) {
+		case 1:
+			mes "[De Thomas]";
+			mes "Very well. I will tell you what you need to learn this skill.";
+			mes "First, your job level must be higher than ^00880035^000000.";
+			mes "You will also need ^008800200 empty bottles^000000.";
+			mes "Why? Because it is proof that you fought fiercely to have used that many potions.";
+			next;
+			mes "[De Thomas]";
+			mes "Also, the armor you used in battle.";
+			mes "This is also proof of an experienced fighter.";
+			mes "For the armor... your armor is perfect!";
+			mes "Bring your armor!";
+			mes "Last but not least... bring me one ^008800Moth Wing^000000.";
+			next;
+			select("Eh? You need that, too?");
+			mes "[De Thomas]";
+			mes "Not really.. I don't really NEED it.";
+			mes "It's just that my niece has gotten a bug hunting as a holiday task during the summer vacation.";
+			mes "Of course! It would be much easier for me to get it myself.";
+			mes "but I must work here all the time so I don't exactly have the time to go out and get it.";
+			next;
+			mes "[De Thomas]";
+			mes "Don't you think it is pitiful that I have to stay in once place everyday, not being able to go outside?";
+			mes "Please, find me one...*sniffsniff*";
+			mes "If you don't...";
+			set sm_movingrecovery_x,1;
+			mes "You won't get anything! Muahahaha.";
+			close;
+		case 2:
+			mes "[De Thomas]";
+			mes "...";
+			close;
+		}
+	}
+	else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x > 1)) {
+		mes "[De Thomas]";
+		mes "Oh, it's you?";
+		mes "Long time no see!";
+		mes "You seem healthier than before.";
+		mes "Hahahaha!";
+		mes "Take care! See you again!";
+		close;
+	}
+	else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x == 1)) {
+		mes "[De Thomas]";
+		mes "Welcome back...";
+		mes "are you ready to learn Body Movin'?";
+		next;
+		switch (select("Yes.:No, I'm not ready yet.")) {
+		case 1:
+			if ((JobLevel > 34 || (BaseJob == Job_Knight || BaseJob == Job_Crusader)) && (countitem(713) > 199) && (countitem(1058) > 0)) {
+				mes "[De Thomas]";
+				mes "Let's see.....";
+				next;
+				mes "[De Thomas]";
+				mes "Ok! I shall now teach you...";
+				mes "...The Body Movin' skill!";
+				next;
+				delitem 713,200; //Empty_Bottle
+				delitem 1058,1; //Wing_Of_Moth
+				skill "SM_MOVINGRECOVERY",1,0;
+				set sm_movingrecovery_x,2;
+				mes "[De Thomas]";
+				mes "There you go!";
+				mes "Try it yourself.";
+				mes "But don't overdo it.";
+				next;
+				mes "[De Thomas]";
+				mes "Oh yeah, I won't be needing your";
+				mes "armor so you can keep it.";
+				mes "Good luck now!";
+				close;
+			}
+			else if (JobLevel < 35 && (BaseJob != Job_Knight && BaseJob != Job_Crusader)) {
+				mes "[De Thomas]";
+				mes "Wait a second, your Job level isn't above ^00880035^000000!";
+				mes "Come back when it is.";
+				close;
+			}
+			else if ((countitem(713) < 200) || (countitem(1058) < 1)) {
+				mes "[De Thomas]";
+				mes "You do not have all the items I asked for.";
+				next;
+				mes "[De Thomas]";
+				mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+				close;
+			}
+			mes "[De Thomas]";
+			mes "You do not have all the items I asked for.";
+			next;
+			mes "[De Thomas]";
+			mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+			close;
+		case 2:
+			mes "[De Thomas]";
+			mes "Is that so?";
+			mes "Then come when you are prepared.";
+			close;
+		}
+	}
+	mes "[De Thomas]";
+	mes "My name is De Thomas Carlos.";
+	mes "Knight of Prontera's 3rd Calvary.";
+	mes "I have a certain duty these days.";
+	mes "Ehem! Need I say more.";
+	close;
+}
+
+prt_in,75,88,5	script	Leon Von Frich	4_M_03,3,3,{
 
 	if ((BaseClass == Job_Swordman) && (JobLevel >= 25 || (BaseJob == Job_Knight || BaseJob == Job_Crusader))) {
 		if (getskilllv("SM_FATALBLOW") == 1) {
@@ -75,7 +207,7 @@ prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 		mes "[Leon]";
 		mes "Wow, seeing your arm, you must enjoy using bash?";
 		next;
-		menu "Eh, I.. just...",-;
+		select("Eh, I... just...");
 		mes "[Leon]";
 		if (Sex == 0) {
 			mes "No need to be surprised.";
@@ -170,7 +302,7 @@ OnTouch:
 	close;
 }
 
-prt_in,94,57,3	script	Juan	85,4,4,{
+prt_in,94,57,3	script	Juan	4_M_03,4,4,{
 	if (BaseClass == Job_Swordman) {
 		if (getskilllv("SM_AUTOBERSERK") == 1) {
 			mes "[Juan]";
@@ -340,16 +472,16 @@ prt_in,94,57,3	script	Juan	85,4,4,{
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= Fully working
 //= 1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.
+//=     for class checks.
 //= 1.1 Added missing delitem [Lupus]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Updated the NPC to allow subclasses of swordsman to learn the skills, [MasterOfMuppets]
-//=	1.5 Fixed exploits [Lupus]
+//= 1.5 Fixed exploits [Lupus]
 //= 1.5a Fixed some typos [IVBela]
 //============================================================
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 7af4feb42..0f31c7c5e 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -1,22 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Thief Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= Quests for skills: Sand Attack, Back Slide, Find Stone, 
+//===== Description: =========================================
+//= Quests for skills: Sand Attack, Back Slide, Find Stone,
 //= Stone Fling.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.6 Fixed a Exploit for Assassins and Rogues. (bugreport:2332) [Samuray22]
 //= 1.7 Updated to latest available official file. [Masao]
 //= 1.8 Fixed JobLevel requirement for Assassins and Rogues. [Joseph]
-//============================================================ 
+//============================================================
 
-moc_prydb1,154,128,4	script	Alcouskou	118,{
+moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 	if (BaseClass == Job_Thief) {
 		mes "[Alcouskou]";
 		mes "As you live life you will encounter";
@@ -431,7 +429,7 @@ moc_prydb1,154,128,4	script	Alcouskou	118,{
 	close;
 }
 
-payon,91,77,3	script	Bag Seller	99,{
+payon,91,77,3	script	Bag Seller	4W_M_03,{
 	mes "[RuRumuni]";
 	mes "I am a humble merchant here";
 	mes "in Payon. I buy the leather";
@@ -500,18 +498,18 @@ payon,91,77,3	script	Bag Seller	99,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
-//= v1.0 Fully working
-//= v1.1 Changed Sand Attack requirements from 5 Grit to 5 Fine Grit and a
-//= Leather Bag of Infinity.  These are the official RO requirements
-//= Added npc RuRumuni, maker of Leather Bag of Infinity. [kobra_k88]
-//= v1.1a Now using functions found in "Global_Functions.txt" for
-//= class checks.[kobra_k88]
+//============================================================
+//= 1.0 Fully working
+//= 1.1 Changed Sand Attack requirements from 5 Grit to 5 Fine Grit and a
+//=     Leather Bag of Infinity.  These are the official RO requirements
+//=     Added npc RuRumuni, maker of Leather Bag of Infinity. [kobra_k88]
+//= 1.1a Now using functions found in "Global_Functions.txt" for
+//=     class checks.[kobra_k88]
 //= 1.2 Added Baby Class Support [Lupus]
 //= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 1.4 Fixed exploit [Lupus]
 //= 1.4a Fixed some typos [IVBela]
 //= 1.4b changed perm. variables to temp ones [Lupus]
-//============================================================ 
+//============================================================
diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt
index 1d7093a03..9947c3ad0 100644
--- a/npc/quests/skills/wizard_skills.txt
+++ b/npc/quests/skills/wizard_skills.txt
@@ -4,17 +4,15 @@
 //= Lupus, Reddozen
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Quests for skills: Sight Blaster
 //===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
-gef_tower,115,36,4	script	Meow#q_wiz	876,{
+gef_tower,115,36,4	script	Meow#q_wiz	4_CAT,{
 	if (BaseJob == Job_Wizard) {
 		if (WIZ_SK == 100) {
 			if (getskilllv("WZ_SIGHTBLASTER") == 0) {
@@ -353,7 +351,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	876,{
 	}
 }
 
-prt_in,82,98,3	script	Simon Mayace#q_wiz	46,{
+prt_in,82,98,3	script	Simon Mayace#q_wiz	1_ETC_01,{
 	if (WIZ_SK == 1) {
 		mes "[Simon]";
 		mes "Ah, you must be a skilled";
@@ -434,15 +432,15 @@ prt_in,82,98,3	script	Simon Mayace#q_wiz	46,{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
 //= 1.2 Added to correct locations, correct NPC's, fixed
 //= some of the items required and made them into real
-//= quests. [Reddozen] 
+//= quests. [Reddozen]
 //= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 362695bef..408a200ce 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Thanatos Tower Quest
 //===== By: ==================================================
 //= Muad_Dib
 //===== Current Version: =====================================
 //= 1.0a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Episode 13.1 Thanatos Tower quest.
@@ -14,7 +12,7 @@
 //= 1.0a Added 'npcskill' command. [Euphy]
 //============================================================
 
-hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
+hu_fild01,140,163,5	script	Tower Keeper	4_M_EIN_SOLDIER,3,3,{
 	mes "[Gatei]";
 	mes "Greetings, adventurer.";
 	mes "I am Gatei Knumm, keeper";
@@ -94,7 +92,7 @@ hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
 						mes "good work. Ah, and don't";
 						mes "forget: safety first when";
 						mes "you fight those monsters!";
-						set Zeny, Zeny - 3000;
+						Zeny -= 3000;
 						close2;
 						warp "tha_scene01",131,220;
 						end;
@@ -121,7 +119,7 @@ hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
 				mes "you enjoy your visit";
 				mes "to Thanatos Tower~";
 				close2;
-				set Zeny, Zeny - 5000;
+				Zeny -= 5000;
 				warp "tha_scene01",131,220;
 				end;
 			}
@@ -160,7 +158,7 @@ OnTouch:
 	close;
 }
 
-tha_t01,149,78,4	script	Guide	90,{
+tha_t01,149,78,4	script	Guide	4_F_01,{
 	if (thana_tower == 0) {
 		mes "[Ditze]";
 		mes "Welcome to Thanatos Tower.";
@@ -409,7 +407,7 @@ L_Contract:
 	}
 }
 
-tha_t01,140,78,4	script	Guide#reward	831,{
+tha_t01,140,78,4	script	Guide#reward	4_F_ZONDAGIRL,{
 	mes "[Liei]";
 	if (thana_tower == 0) {
 		mes "Good day, I'm";
@@ -457,12 +455,12 @@ tha_t01,140,78,4	script	Guide#reward	831,{
 	mes "you please tell me what kind";
 	mes "of mission proof you brought?";
 	next;
-	setarray .@Items[1],7435,7440,7441,7442;
+	setarray .@items[1],7435,7440,7441,7442;
 	set .@i, select("Golden Ornament:Red Feather:Blue Feather:Cursed Seal");
 	mes "[Liei]";
-	if (!countitem(.@Items[.@i])) {
+	if (!countitem(.@items[.@i])) {
 		mes "I'm sorry, but you are not";
-		mes "carrying any "+getitemname(.@Items[.@i])+"s.";
+		mes "carrying any "+getitemname(.@items[.@i])+"s.";
 		mes "Please check your inventory";
 		mes "one more time, and then come";
 		mes "to me to redeem your items";
@@ -470,15 +468,15 @@ tha_t01,140,78,4	script	Guide#reward	831,{
 		close;
 	}
 	mes "The reward for each";
-	mes getitemname(.@Items[.@i])+" is...";
+	mes getitemname(.@items[.@i])+" is...";
 	mes " ";
 	mes "1,000 zeny";
 	//mes "2,000 EXP";
 	next;
-	set .@zeny_tt,(countitem(.@Items[.@i]) * 1000);
-	//set .@exp_tt,(countitem(.@Items[.@i]) * 2000);
+	set .@zeny_tt,(countitem(.@items[.@i]) * 1000);
+	//set .@exp_tt,(countitem(.@items[.@i]) * 2000);
 	mes "[Liei]";
-	mes countitem(.@Items[.@i])+" "+getitemname(.@Items[.@i])+"s, then";
+	mes countitem(.@items[.@i])+" "+getitemname(.@items[.@i])+"s, then";
 	mes "you will receive a total of...";
 	mes " ";
 	mes ""+.@zeny_tt+" zeny";
@@ -486,7 +484,7 @@ tha_t01,140,78,4	script	Guide#reward	831,{
 	next;
 	mes "[Liei]";
 	mes "Would you like to exchange";
-	mes "all of your "+getitemname(.@Items[.@i])+"s";
+	mes "all of your "+getitemname(.@items[.@i])+"s";
 	mes "for your reward right now?";
 	next;
 	switch(select("Yes:No")) {
@@ -497,8 +495,8 @@ tha_t01,140,78,4	script	Guide#reward	831,{
 			//mes .@exp_tt+" EXP. Thank you,";
 			mes "and please keep up";
 			mes "the good work~";
-			delitem .@Items[.@i], countitem(.@Items[.@i]);
-			set Zeny, Zeny + .@zeny_tt;
+			delitem .@items[.@i], countitem(.@items[.@i]);
+			Zeny += .@zeny_tt;
 			//getexp .@exp_tt,0;
 			close;
 		case 2:
@@ -512,7 +510,7 @@ tha_t01,140,78,4	script	Guide#reward	831,{
 	}
 }
 
-tha_t02,231,161,5	script	Entrance Guide	874,{
+tha_t02,231,161,5	script	Entrance Guide	4_M_ZONDAMAN,{
 	mes "[Burled]";
 	if (thana_tower == 0) {
 		mes "You are in front of the entrance to the 3rd Floor. Only contracted";
@@ -870,7 +868,7 @@ L_Request:
 	return;
 }
 
-tha_t02,227,163,0	script	3rdf_warp#tt	45,1,1,{
+tha_t02,227,163,0	script	3rdf_warp#tt	WARPNPC,1,1,{
 	end;
 OnInit:
 	disablenpc "3rdf_warp#tt";
@@ -889,7 +887,7 @@ OnTimer30000:
 	end;
 }
 
-tha_t03,67,70,0	script	Rune Device#tt1	111,4,4,{
+tha_t03,67,70,0	script	Rune Device#tt1	HIDDEN_NPC,4,4,{
 	if ((countitem(7421) == 0) && (countitem(7426) == 0)) {
 		mes "^3355FFA mysterious field of";
 		mes "energy seems to surround";
@@ -1007,7 +1005,7 @@ L_Key:
 	}
 }
 
-tha_t04,195,195,0	script	Rune Device#tt2	111,3,3,{
+tha_t04,195,195,0	script	Rune Device#tt2	HIDDEN_NPC,3,3,{
 	if ((countitem(7422) == 0) && (countitem(7427) == 0)) {
 		mes "^3355FFYou find a screen";
 		mes "with three tiny panels and";
@@ -1158,7 +1156,7 @@ OnTouch:
 	end;
 }
 
-tha_t05,62,179,0	script	Brilliant Statue#tt3	111,3,3,{
+tha_t05,62,179,0	script	Brilliant Statue#tt3	HIDDEN_NPC,3,3,{
 	if ((countitem(7423) == 0) && (countitem(7428) == 0)) {
 		mes "I can feel some magical power from this beautiful stone statue.";
 		mes "There's a little crack between the wings.";
@@ -1243,7 +1241,7 @@ OnTouch:
 	end;
 }
 
-tha_t06,226,230,0	script	Brilliant Statue#tt4	111,3,3,{
+tha_t06,226,230,0	script	Brilliant Statue#tt4	HIDDEN_NPC,3,3,{
 	if ((countitem(7424) == 0) && (countitem(7429) == 0)) {
 		mes "I can feel some magical power from this brilliant statue.";
 		mes "This must be one of the seals.";
@@ -1515,7 +1513,7 @@ OnTouch:
 	end;
 }
 
-tha_t06,204,181,0	script	Splendid Sword#tt5	111,3,3,{
+tha_t06,204,181,0	script	Splendid Sword#tt5	HIDDEN_NPC,3,3,{
 	if ((countitem(7425) == 0) && (countitem(7430) == 0)) {
 		mes "An old, worn sword hangs above the splendid table.";
 		mes "It emits a gloomy aura.";
@@ -1605,7 +1603,7 @@ OnTouch:
 	end;
 }
 
-tha_t08,1,1,0	script	#Charm Stone Admintt01	844,{
+tha_t08,1,1,0	script	#Charm Stone Admintt01	CLEAR_NPC,{
 	end;
 OnInit:
 OnEnable:
@@ -1656,7 +1654,7 @@ OnTimer2400000:
 	end;
 }
 
-tha_t08,90,153,0	script	Shining Crystal#tt_r1	844,{
+tha_t08,90,153,0	script	Shining Crystal#tt_r1	CLEAR_NPC,{
 	if (countitem(7421) > 0) {
 		mes "The Crystal ball is emitting mysterious power.";
 		next;
@@ -1686,11 +1684,11 @@ OnEnable:
 	enablenpc strnpcinfo(0);
 	end;
 }
-tha_t08,90,62,0	duplicate(Shining Crystal#tt_r1)	Shining Crystal#tt_r2	844
-tha_t08,49,59,0	duplicate(Shining Crystal#tt_r1)	Shining Crystal#tt_r3	844
-tha_t08,49,144,0	duplicate(Shining Crystal#tt_r1)	Shining Crystal#tt_r4	844
+tha_t08,90,62,0	duplicate(Shining Crystal#tt_r1)	Shining Crystal#tt_r2	CLEAR_NPC
+tha_t08,49,59,0	duplicate(Shining Crystal#tt_r1)	Shining Crystal#tt_r3	CLEAR_NPC
+tha_t08,49,144,0	duplicate(Shining Crystal#tt_r1)	Shining Crystal#tt_r4	CLEAR_NPC
 
-tha_t08,49,153,0	script	Shining Crystal#tt_y1	844,{
+tha_t08,49,153,0	script	Shining Crystal#tt_y1	CLEAR_NPC,{
 	if (countitem(7422) > 0) {
 		mes "The Crystal ball is emitting mysterious power.";
 		next;
@@ -1720,11 +1718,11 @@ OnEnable:
 	enablenpc strnpcinfo(0);
 	end;
 }
-tha_t08,90,150,0	duplicate(Shining Crystal#tt_y1)	Shining Crystal#tt_y2	844
-tha_t08,90,59,0	duplicate(Shining Crystal#tt_y1)	Shining Crystal#tt_y3	844
-tha_t08,49,56,0	duplicate(Shining Crystal#tt_y1)	Shining Crystal#tt_y4	844
+tha_t08,90,150,0	duplicate(Shining Crystal#tt_y1)	Shining Crystal#tt_y2	CLEAR_NPC
+tha_t08,90,59,0	duplicate(Shining Crystal#tt_y1)	Shining Crystal#tt_y3	CLEAR_NPC
+tha_t08,49,56,0	duplicate(Shining Crystal#tt_y1)	Shining Crystal#tt_y4	CLEAR_NPC
 
-tha_t08,49,65,0	script	Shining Crystal#tt_b1	844,{
+tha_t08,49,65,0	script	Shining Crystal#tt_b1	CLEAR_NPC,{
 	if (countitem(7423) > 0) {
 		mes "The Crystal ball is emitting mysterious power.";
 		next;
@@ -1754,11 +1752,11 @@ OnEnable:
 	enablenpc strnpcinfo(0);
 	end;
 }
-tha_t08,49,150,0	duplicate(Shining Crystal#tt_b1)	Shining Crystal#tt_b2	844
-tha_t08,90,147,0	duplicate(Shining Crystal#tt_b1)	Shining Crystal#tt_b3	844
-tha_t08,90,56,0	duplicate(Shining Crystal#tt_b1)	Shining Crystal#tt_b4	844
+tha_t08,49,150,0	duplicate(Shining Crystal#tt_b1)	Shining Crystal#tt_b2	CLEAR_NPC
+tha_t08,90,147,0	duplicate(Shining Crystal#tt_b1)	Shining Crystal#tt_b3	CLEAR_NPC
+tha_t08,90,56,0	duplicate(Shining Crystal#tt_b1)	Shining Crystal#tt_b4	CLEAR_NPC
 
-tha_t08,90,65,0	script	Shining Crystal#tt_g1	844,{
+tha_t08,90,65,0	script	Shining Crystal#tt_g1	CLEAR_NPC,{
 	if (countitem(7424) > 0) {
 		mes "The Crystal ball is emitting mysterious power.";
 		next;
@@ -1788,11 +1786,11 @@ OnEnable:
 	enablenpc strnpcinfo(0);
 	end;
 }
-tha_t08,49,62,0	duplicate(Shining Crystal#tt_g1)	Shining Crystal#tt_g2	844
-tha_t08,49,147,0	duplicate(Shining Crystal#tt_g1)	Shining Crystal#tt_g3	844
-tha_t08,90,144,0	duplicate(Shining Crystal#tt_g1)	Shining Crystal#tt_g4	844
+tha_t08,49,62,0	duplicate(Shining Crystal#tt_g1)	Shining Crystal#tt_g2	CLEAR_NPC
+tha_t08,49,147,0	duplicate(Shining Crystal#tt_g1)	Shining Crystal#tt_g3	CLEAR_NPC
+tha_t08,90,144,0	duplicate(Shining Crystal#tt_g1)	Shining Crystal#tt_g4	CLEAR_NPC
 
-tha_t12,161,57,0	script	Gold Religious Statue#tt	111,{
+tha_t12,161,57,0	script	Gold Religious Statue#tt	HIDDEN_NPC,{
 	if ($@thana_summon == 0) {
 		if (countitem(7427) > 0) {
 			mes "It's a statue giving off a golden light.";
@@ -1822,7 +1820,7 @@ tha_t12,161,57,0	script	Gold Religious Statue#tt	111,{
 	close;
 }
 
-tha_t12,154,17,0	script	Green Wiseman Statue#tt	111,{
+tha_t12,154,17,0	script	Green Wiseman Statue#tt	HIDDEN_NPC,{
 	if ($@thana_summon == 1) {
 		if (countitem(7429) > 0) {
 			mes "A statue gives off green light.";
@@ -1852,7 +1850,7 @@ tha_t12,154,17,0	script	Green Wiseman Statue#tt	111,{
 	close;
 }
 
-tha_t12,103,17,0	script	Blue Angel Statue#tt	111,{
+tha_t12,103,17,0	script	Blue Angel Statue#tt	HIDDEN_NPC,{
 	if ($@thana_summon == 2) {
 		if (countitem(7428) > 0) {
 			mes "An angel statue is covered with a blue light.";
@@ -1882,7 +1880,7 @@ tha_t12,103,17,0	script	Blue Angel Statue#tt	111,{
 	close;
 }
 
-tha_t12,96,57,0	script	Bloody Knight Statue#tt	111,{
+tha_t12,96,57,0	script	Bloody Knight Statue#tt	HIDDEN_NPC,{
 	if ($@thana_summon == 3) {
 		if (countitem(7426) > 0) {
 			mes "A statue is shining like blood.";
@@ -1912,7 +1910,7 @@ tha_t12,96,57,0	script	Bloody Knight Statue#tt	111,{
 	close;
 }
 
-tha_t12,129,86,0	script	Dark Devil Statue#tt	111,{
+tha_t12,129,86,0	script	Dark Devil Statue#tt	HIDDEN_NPC,{
 	if ($@thana_summon == 4) {
 		if (countitem(7430) > 0) {
 			mes "A devil statue emits dark light.";
@@ -1946,7 +1944,7 @@ tha_t12,129,86,0	script	Dark Devil Statue#tt	111,{
 	close;
 }
 
-tha_t12,134,52,0	script	#tteffect01	139,{
+tha_t12,134,52,0	script	#tteffect01	HIDDEN_WARP_NPC,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -1966,7 +1964,7 @@ OnTimer3000:
 	end;
 }
 
-tha_t12,132,47,0	script	#tteffect02	139,{
+tha_t12,132,47,0	script	#tteffect02	HIDDEN_WARP_NPC,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -1986,7 +1984,7 @@ OnTimer3000:
 	end;
 }
 
-tha_t12,127,47,0	script	#tteffect03	139,{
+tha_t12,127,47,0	script	#tteffect03	HIDDEN_WARP_NPC,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -2006,7 +2004,7 @@ OnTimer3000:
 	end;
 }
 
-tha_t12,125,52,0	script	#tteffect04	139,{
+tha_t12,125,52,0	script	#tteffect04	HIDDEN_WARP_NPC,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -2026,7 +2024,7 @@ OnTimer3000:
 	end;
 }
 
-tha_t12,129,56,0	script	#tteffect05	139,{
+tha_t12,129,56,0	script	#tteffect05	HIDDEN_WARP_NPC,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -2046,7 +2044,7 @@ OnTimer3000:
 	end;
 }
 
-tha_t12,130,52,0	script	#gateto_thanatos	45,1,1,{
+tha_t12,130,52,0	script	#gateto_thanatos	WARPNPC,1,1,{
 	end;
 OnInit:
 	disablenpc "#gateto_thanatos";
@@ -2080,7 +2078,7 @@ OnTimer3000:
 	end;
 }
 
-thana_boss,217,167,3	script	Memory Seal#tt1	1711,3,3,{
+thana_boss,217,167,3	script	Memory Seal#tt1	G_THA_MAERO,3,3,{
 	end;
 OnEnable:
 	hideoffnpc strnpcinfo(0);
@@ -2159,11 +2157,11 @@ OnMyMobDead:
 		mapwarp "thana_boss","thana_boss",141,228;
 	end;
 }
-thana_boss,202,75,3	duplicate(Memory Seal#tt1)	Memory Seal#tt2	1712,3,3
-thana_boss,80,76,7	duplicate(Memory Seal#tt1)	Memory Seal#tt3	1709,3,3
-thana_boss,62,171,5	duplicate(Memory Seal#tt1)	Memory Seal#tt4	1710,3,3
+thana_boss,202,75,3	duplicate(Memory Seal#tt1)	Memory Seal#tt2	G_THA_DOLOR,3,3
+thana_boss,80,76,7	duplicate(Memory Seal#tt1)	Memory Seal#tt3	G_THA_ODIUM,3,3
+thana_boss,62,171,5	duplicate(Memory Seal#tt1)	Memory Seal#tt4	G_THA_DESPERO,3,3
 
-thana_boss,141,228,0	script	#thanatos_seal	139,3,3,{
+thana_boss,141,228,0	script	#thanatos_seal	HIDDEN_WARP_NPC,3,3,{
 	end;
 OnEnable:
 	enablenpc "#thanatos_seal";
@@ -2202,7 +2200,7 @@ OnTimer16000:
 	end;
 }
 
-thana_boss,141,235,3	script	Memory Seal#tt5	1708,{
+thana_boss,141,235,3	script	Memory Seal#tt5	THANATOS,{
 	end;
 OnInit:
 	disablenpc "Memory Seal#tt5";
@@ -2231,7 +2229,7 @@ OnMyMobDead:
 	end;
 }
 
-thana_boss,1,1,0	script	#cooltime_thana	844,{
+thana_boss,1,1,0	script	#cooltime_thana	CLEAR_NPC,{
 	end;
 OnInit:
 	set $@thana_summon, 0;
@@ -2288,7 +2286,7 @@ OnTimer7200000:
 
 tha_scene01,30,30,0	warp	scene	1,1,tha_scene01,131,220
 tha_t04,81,36,0	warp	to 5th Floor	1,1,tha_t05,62,8
-tha_t06,119,120,0	script	to 7th Floor	45,1,1,{
+tha_t06,119,120,0	script	to 7th Floor	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (eaclass()&(EAJL_2|EAJL_UPPER) || eaclass()&EAJL_THIRD || ((Class == Job_SuperNovice || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Soul_Linker || Class == Job_Ninja || Class == Job_Gunslinger) && BaseLevel > 94)) {
@@ -2312,4 +2310,4 @@ OnTouch:
 	}
 	mes "A mysterious power is blocking my path.";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 588009547..f58fd574d 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -1,17 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= The Sign Quest
-//===== By: ================================================== 
-//= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
-//===== Current Version: ===================================== 
-//= 3.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== By: ==================================================
+//= SinSloth, MasterOfMuppets, Kargha
+//===== Current Version: =====================================
+//= 3.9
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quest for opening the doors to Geffenia.
 //= This script uses sign_01.bmp - sign_04.bmp, these will be
 //= found in the language of your client.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 3.0 Rewritten based on most recent Aegis script. [L0ne_W0lf]
 //=     Due to the incompatabity of the old script with this
 //=     version, variables will attmept to be translated to the
@@ -25,12 +25,13 @@
 //= 3.5 Fixed two bugs. 4230 & 4404 [CalciumKid]
 //= 3.6 Corrected the Level Requirements for 'Standby Room' [tr0n]
 //= 3.7 Massive cleaning/optimization (more can still be done). [Euphy]
-//============================================================ 
+//= 3.8 Corrected an invalid map name. [Joseph]
+//= 3.9 Updated RE/Pre-RE EXP. [Euphy]
+//============================================================
 
-//============================================================ 
 // The Sign (Part 1)
-//============================================================ 
--	script	Sign::TheSign	111,{
+//============================================================
+-	script	Sign::TheSign	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	cutin "sign_01",4;
 	mes "^3355FFNext^000000";
@@ -62,14 +63,14 @@ OnInit:
 	end;
 }
 
-prontera,147,305,0	duplicate(TheSign)	Sign#prontera	111
-geffen,168,175,0	duplicate(TheSign)	Sign#geffen	111
-morocc,168,265,0	duplicate(TheSign)	Sign#morroc	111
-payon,160,183,0	duplicate(TheSign)	Sign#payon	111
-aldebaran,54,223,0	duplicate(TheSign)	Sign#aldebaran	111
-alberta,35,241,0	duplicate(TheSign)	Sign#alberta	111
+prontera,147,305,0	duplicate(TheSign)	Sign#prontera	HIDDEN_NPC
+geffen,168,175,0	duplicate(TheSign)	Sign#geffen	HIDDEN_NPC
+morocc,168,265,0	duplicate(TheSign)	Sign#morroc	HIDDEN_NPC
+payon,160,183,0	duplicate(TheSign)	Sign#payon	HIDDEN_NPC
+aldebaran,54,223,0	duplicate(TheSign)	Sign#aldebaran	HIDDEN_NPC
+alberta,35,241,0	duplicate(TheSign)	Sign#alberta	HIDDEN_NPC
 
-prt_in,227,45,0	script	Archeologist#sign	804,{
+prt_in,227,45,0	script	Archeologist#sign	1_M_SIGN1,{
 	callfunc "F_UpdateSignVars";
 	cutin "mets_alpha",2;
 	mes "[Metz]";
@@ -694,7 +695,7 @@ prt_in,227,45,0	script	Archeologist#sign	804,{
 			mes "You may have had your doubts,";
 			mes "but I'm happy enough to confirm that the Sign really exists. Thanks again, and I hope you stop by and chat from time to time.";
 			set sign_q,142;
-			getexp 200000,0;
+			getexp (checkre(3))?200000:2000000,0;
 		}
 		else {
 			mes "Have you visited";
@@ -727,7 +728,7 @@ prt_in,227,45,0	script	Archeologist#sign	804,{
 		}
 		delitem 7178,1; //Star's_Sob
 		set sign_q,202;
-		getexp 10000,0;
+		getexp (checkre(3))?10000:100000,0;
 		getitem 617,1; //Old_Violet_Box
 	}
 	else if (sign_q > 201) {
@@ -769,7 +770,7 @@ prt_in,227,45,0	script	Archeologist#sign	804,{
 	end;
 }
 
-prt_in,228,26,5	script	Steward#sign	55,{
+prt_in,228,26,5	script	Steward#sign	1_M_JOBTESTER,{
 	callfunc "F_UpdateSignVars";
 	mes "[Vandez]";
 	if (sign_q < 3) {
@@ -961,10 +962,10 @@ prt_in,228,26,5	script	Steward#sign	55,{
 	}
 }
 
-prt_in,248,23,3	script	Maid#sign	1275,{
+prt_in,248,23,3	script	Maid#sign	ALICE,{
 	end;
 }
-prt_in,248,23,0	script	Maid#sign2	111,{
+prt_in,248,23,0	script	Maid#sign2	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	mes "[Elle]";
 	if (sign_q < 3) {
@@ -1203,7 +1204,7 @@ prt_in,248,23,0	script	Maid#sign2	111,{
 	}
 }
 
-morocc_in,115,154,5	script	Rogue#sign	810,{
+morocc_in,115,154,5	script	Rogue#sign	1_M_SIGNROGUE,{
 	callfunc "F_UpdateSignVars";
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second! Right now,";
@@ -1495,11 +1496,19 @@ morocc_in,115,154,5	script	Rogue#sign	810,{
 			mes "you gave Ganaan tell me";
 			mes "you're not a total dumbass.";
 			mes "Now you're supposed to go see Daewoon in Payon. And don't forget to show him this Star thingee.";
-			if (BaseLevel < 60) getexp 300,0;
-			else if (BaseLevel < 70) getexp 750,0;
-			else if (BaseLevel < 80) getexp 1000,0;
-			else if (BaseLevel < 90) getexp 1300,0;
-			else if (BaseLevel < 150) getexp 1800,0;
+			if (checkre(3)) {
+				if (BaseLevel < 60) getexp 300,0;
+				else if (BaseLevel < 70) getexp 750,0;
+				else if (BaseLevel < 80) getexp 1000,0;
+				else if (BaseLevel < 90) getexp 1300,0;
+				else getexp 1800,0;
+			} else {
+				if (BaseLevel < 60) getexp 3000,0;
+				else if (BaseLevel < 70) getexp 7500,0;
+				else if (BaseLevel < 80) getexp 10000,0;
+				else if (BaseLevel < 90) getexp 13000,0;
+				else getexp 18000,0;
+			}
 			set sign_q,14;
 			getitem 7177,1; //Part_Of_Star's_Sob
 			close;
@@ -1526,7 +1535,7 @@ morocc_in,115,154,5	script	Rogue#sign	810,{
 	}
 }
 
-morocc_in,114,162,4	script	Young Man#sign	118,{
+morocc_in,114,162,4	script	Young Man#sign	2_M_THIEFMASTER,{
 	callfunc "F_UpdateSignVars";
 	mes "[Gaanan]";
 	if (sign_q < 11) {
@@ -1692,7 +1701,7 @@ morocc_in,114,162,4	script	Young Man#sign	118,{
 	}
 }
 
-payon,154,170,3	script	Hagin#sign	78,{
+payon,154,170,3	script	Hagin#sign	1_F_ORIENT_04,{
 	mes "[Hagin]";
 	mes "Have you heard?";
 	mes "Payon's most eligible";
@@ -1764,11 +1773,11 @@ payon,154,170,3	script	Hagin#sign	78,{
 	}
 }
 
-payon_in03,81,22,4	script	Maid#a1	1170,{
+payon_in03,81,22,4	script	Maid#a1	SOHEE,{
 	end;
 }
 
-payon_in03,81,22,4	script	Maid#a2	111,{
+payon_in03,81,22,4	script	Maid#a2	HIDDEN_NPC,{
 	mes "[Maid]";
 	mes "Welcome to the";
 	mes "Payon Castle annex";
@@ -1777,11 +1786,11 @@ payon_in03,81,22,4	script	Maid#a2	111,{
 	close;
 }
 
-payon_in03,79,22,4	script	Maid#b1	1404,{
+payon_in03,79,22,4	script	Maid#b1	MIYABI_NINGYO,{
 	end;
 }
 
-payon_in03,79,22,4	script	Maid#b2	111,{
+payon_in03,79,22,4	script	Maid#b2	HIDDEN_NPC,{
 	mes "[Maid]";
 	mes "Welcome.";
 	mes "Are you another";
@@ -1790,11 +1799,11 @@ payon_in03,79,22,4	script	Maid#b2	111,{
 	close;
 }
 
-payon_in03,81,15,1	script	Maid#c1	1170,{
+payon_in03,81,15,1	script	Maid#c1	SOHEE,{
 	end;
 }
 
-payon_in03,81,15,1	script	Maid#c2	111,{
+payon_in03,81,15,1	script	Maid#c2	HIDDEN_NPC,{
 	mes "[Maid]";
 	mes "Greetings.";
 	mes "Welcome to the";
@@ -1804,11 +1813,11 @@ payon_in03,81,15,1	script	Maid#c2	111,{
 	close;
 }
 
-payon_in03,79,15,1	script	Maid#d1	1404,{
+payon_in03,79,15,1	script	Maid#d1	MIYABI_NINGYO,{
 	end;
 }
 
-payon_in03,79,15,1	script	Maid#d2	111,{
+payon_in03,79,15,1	script	Maid#d2	HIDDEN_NPC,{
 	mes "[Maid]";
 	mes "Welcome to the";
 	mes "Payon Castle Annex.";
@@ -1818,11 +1827,11 @@ payon_in03,79,15,1	script	Maid#d2	111,{
 	close;
 }
 
-payon_in03,8,31,4	script	Maid#e1	1416,{
+payon_in03,8,31,4	script	Maid#e1	WICKED_NYMPH,{
 	end;
 }
 
-payon_in03,8,31,4	script	Maid#e2	111,{
+payon_in03,8,31,4	script	Maid#e2	HIDDEN_NPC,{
 	mes "[Chamberlain]";
 	mes "Please refrain";
 	mes "from attacking";
@@ -1838,11 +1847,11 @@ payon_in03,8,31,4	script	Maid#e2	111,{
 	close;
 }
 
-payon_in03,13,31,4	script	Maid#f1	1416,{
+payon_in03,13,31,4	script	Maid#f1	WICKED_NYMPH,{
 	end;
 }
 
-payon_in03,13,31,4	script	Maid#f2	111,{
+payon_in03,13,31,4	script	Maid#f2	HIDDEN_NPC,{
 	mes "[Chamberlain]";
 	mes "Master Daewoon~!";
 	mes "Please try this too!";
@@ -1857,7 +1866,7 @@ payon_in03,13,31,4	script	Maid#f2	111,{
 	close;
 }
 
-payon_in03,11,31,4	script	Daewoon#sign	808,{
+payon_in03,11,31,4	script	Daewoon#sign	1_M_SIGNMONK2,{
 	callfunc "F_UpdateSignVars";
 	mes "[Daewoon]";
 	mes "Mwah ah hah!";
@@ -2357,11 +2366,19 @@ payon_in03,11,31,4	script	Daewoon#sign	808,{
 			if (.@pay_point > 29) {
 				set sign_q,15;
 				getitem 7177,1; //Part_Of_Star's_Sob
-				if (BaseLevel < 60) getexp 300,0;
-				else if (BaseLevel < 70) getexp 700,0;
-				else if (BaseLevel < 80) getexp 1000,0;
-				else if (BaseLevel < 90) getexp 1300,0;
-				else if (BaseLevel < 150) getexp 1800,0;
+				if (checkre(3)) {
+					if (BaseLevel < 60) getexp 300,0;
+					else if (BaseLevel < 70) getexp 750,0;
+					else if (BaseLevel < 80) getexp 1000,0;
+					else if (BaseLevel < 90) getexp 1300,0;
+					else getexp 1800,0;
+				} else {
+					if (BaseLevel < 60) getexp 3000,0;
+					else if (BaseLevel < 70) getexp 7500,0;
+					else if (BaseLevel < 80) getexp 10000,0;
+					else if (BaseLevel < 90) getexp 13000,0;
+					else getexp 18000,0;
+				}
 				emotion e_heh;
 				mes "[Daewoon]";
 				mes "Well, I must say that I've";
@@ -2393,11 +2410,19 @@ payon_in03,11,31,4	script	Daewoon#sign	808,{
 			else if ((.@pay_point > 26) && (.@pay_point < 30)) {
 				set sign_q,15;
 				getitem 7177,1; //Part_Of_Star's_Sob
-				if (BaseLevel < 60) getexp 300,0;
-				else if (BaseLevel < 70) getexp 700,0;
-				else if (BaseLevel < 80) getexp 1000,0;
-				else if (BaseLevel < 90) getexp 1300,0;
-				else if (BaseLevel < 150) getexp 1800,0;
+				if (checkre(3)) {
+					if (BaseLevel < 60) getexp 300,0;
+					else if (BaseLevel < 70) getexp 750,0;
+					else if (BaseLevel < 80) getexp 1000,0;
+					else if (BaseLevel < 90) getexp 1300,0;
+					else getexp 1800,0;
+				} else {
+					if (BaseLevel < 60) getexp 3000,0;
+					else if (BaseLevel < 70) getexp 7500,0;
+					else if (BaseLevel < 80) getexp 10000,0;
+					else if (BaseLevel < 90) getexp 13000,0;
+					else getexp 18000,0;
+				}
 				mes "[Daewoon]";
 				mes "You know, after talking with";
 				mes "you for a while, I now feel fairly comfortable with leaving you this piece of the Sobbing Starlight. Somehow, I think you're strong enough to get all the pieces.";
@@ -2532,7 +2557,7 @@ payon_in03,11,31,4	script	Daewoon#sign	808,{
 	close;
 }
 
-aldeba_in,139,103,5	script	Monograph#sign	111,{
+aldeba_in,139,103,5	script	Monograph#sign	HIDDEN_NPC,{
 	mes "[Sir Jore]";
 	mes "Uwah~!";
 	mes "Stop reading my";
@@ -2541,7 +2566,7 @@ aldeba_in,139,103,5	script	Monograph#sign	111,{
 	close;
 }
 
-aldeba_in,155,101,3	script	Sir Jore#sign	805,7,7,{
+aldeba_in,155,101,3	script	Sir Jore#sign	1_M_SIGNALCHE,7,7,{
 	callfunc "F_UpdateSignVars";
 	if ((gettime(3) > 16) && (gettime(3) < 22)) {
 		if (sign_q == 15) {
@@ -2911,7 +2936,7 @@ OnTouch:
 	end;
 }
 
-aldeba_in,156,118,4	script	Piru Piru#sign	102,{
+aldeba_in,156,118,4	script	Piru Piru#sign	8_F,{
 	callfunc "F_UpdateSignVars";
 	mes "[Piru Piru]";
 	if ((gettime(3) >= 12) && (gettime(3) <= 24)) { //235959
@@ -3032,7 +3057,7 @@ aldeba_in,156,118,4	script	Piru Piru#sign	102,{
 	}
 }
 
-prt_maze02,57,151,1	script	Pleur#warp	91,{
+prt_maze02,57,151,1	script	Pleur#warp	4_F_02,{
 	mes "^3355FFYou catch a glimpse";
 	mes "of a girl heading directly";
 	mes "into a deep forest. You decide";
@@ -3067,11 +3092,11 @@ OnTouch:
 	end;
 }
 
-//prt_maze02,25,161,0	script	#music	-1,7,7,{
-//OnTouch:
-//	soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1;
-//	end;
-//}
+prt_maze02,25,161,0	script	#music	-1,7,7,{
+OnTouch:
+	soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1;
+	end;
+}
 
 prt_maze02,132,132,0	script	#skill	-1,{
 OnEnable:
@@ -3090,7 +3115,7 @@ OnMyMobDead:
 	end;
 }
 
-prt_maze02,16,183,3	script	Pleur#sign	91,{
+prt_maze02,16,183,3	script	Pleur#sign	4_F_02,{
 	callfunc "F_UpdateSignVars";
 	mes "[Pleur]";
 	if (sign_q < 19) {
@@ -3117,7 +3142,7 @@ OnOmg:
 	end;
 }
 
-prt_maze02,14,183,4	script	Gordon#sign	51,{
+prt_maze02,14,183,4	script	Gordon#sign	1_M_BARD,{
 	callfunc "F_UpdateSignVars";
 	mes "[Gordon]";
 	if (sign_q < 18) {
@@ -3401,7 +3426,7 @@ prt_maze02,14,183,4	script	Gordon#sign	51,{
 	}
 }
 
-geffen_in,59,74,4	script	Jesqurienne#sign	803,{
+geffen_in,59,74,4	script	Jesqurienne#sign	1_F_SIGNZISK,{
 	callfunc "F_UpdateSignVars";
 	mes "[Jesqurienne]";
 	if (sign_q < 21) {
@@ -3521,7 +3546,7 @@ geffen_in,59,74,4	script	Jesqurienne#sign	803,{
 				mes "But who's going to";
 				mes "ask us the questions?";
 				next;
-				donpcevent "Aaron#sign::onSmile";
+				donpcevent "Aaron#sign::OnSmile";
 				emotion e_gasp;
 				emotion e_gasp,1;
 				mes "[Aaron]";
@@ -3689,7 +3714,7 @@ OnHo:
 	end;
 }
 
-geffen_in,61,72,7	script	Aaron#sign	754,{
+geffen_in,61,72,7	script	Aaron#sign	4_M_SAGE_A,{
 	callfunc "F_UpdateSignVars";
 	mes "[Aaron]";
 	if (sign_q == 21) {
@@ -4390,7 +4415,7 @@ OnSmile:
 	end;
 }
 
-cmd_in02,88,51,4	script	Strange Guy#sign	806,{
+cmd_in02,88,51,4	script	Strange Guy#sign	1_M_SIGNART,{
 	callfunc "F_UpdateSignVars";
 	mes "[Dearles]";
 	if (sign_q < 25) {
@@ -4413,7 +4438,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 		else {
 			mes "me. It also looks like you got zeny to spare! I think I'll help myself and borrow some of your cash!";
 			mes "^FF0000Yoink!^000000";
-			set zeny,zeny-10000;
+			Zeny -= 10000;
 			specialeffect EF_COIN;
 			close;
 		}
@@ -4495,7 +4520,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 				mes "to me tomorrow night and";
 				mes "we'll start your test...";
 				set sign_q,27;
-				set zeny,zeny-30000;
+				Zeny -= 30000;
 			}
 			close;
 		case 2:
@@ -4615,11 +4640,19 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 				if (countitem(750)) delitem 750,1; //Baphomet_Doll
 				if (countitem(751)) delitem 751,1; //Osiris_Doll
 				set sign_q,30;
-				if (BaseLevel < 60) getexp 300,0;
-				else if (BaseLevel < 70) getexp 500,0;
-				else if (BaseLevel < 80) getexp 800,0;
-				else if (BaseLevel < 90) getexp 1000,0;
-				else if (BaseLevel < 150) getexp 1300,0;
+				if (checkre(3)) {
+					if (BaseLevel < 60) getexp 300,0;
+					else if (BaseLevel < 70) getexp 500,0;
+					else if (BaseLevel < 80) getexp 800,0;
+					else if (BaseLevel < 90) getexp 1000,0;
+					else getexp 1300,0;
+				} else {
+					if (BaseLevel < 60) getexp 3000,0;
+					else if (BaseLevel < 70) getexp 5000,0;
+					else if (BaseLevel < 80) getexp 8000,0;
+					else if (BaseLevel < 90) getexp 10000,0;
+					else getexp 13000,0;
+				}
 				next;
 				warp "cmd_in01",33,29;
 				end;
@@ -4698,11 +4731,19 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			mes "um, ''Bakerlan'' in Alberta.";
 			set sign_q,35;
 			getitem 7177,1; //Part_Of_Star's_Sob
-			if (BaseLevel < 60) getexp 300,0;
-			else if (BaseLevel < 70) getexp 700,0;
-			else if (BaseLevel < 80) getexp 1900,0;
-			else if (BaseLevel < 90) getexp 1200,0;
-			else if (BaseLevel < 150) getexp 1700,0;
+			if (checkre(3)) {
+				if (BaseLevel < 60) getexp 300,0;
+				else if (BaseLevel < 70) getexp 700,0;
+				else if (BaseLevel < 80) getexp 1900,0;
+				else if (BaseLevel < 90) getexp 1200,0;
+				else getexp 1700,0;
+			} else {
+				if (BaseLevel < 60) getexp 3000,0;
+				else if (BaseLevel < 70) getexp 7000,0;
+				else if (BaseLevel < 80) getexp 19000,0;
+				else if (BaseLevel < 90) getexp 12000,0;
+				else getexp 17000,0;
+			}
 			next;
 			mes "[Dearles]";
 			mes "Well, that's it.";
@@ -4727,12 +4768,20 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			mes "um, ''Bakerlan'' in Alberta.";
 			set sign_q,35;
 			getitem 7177,1; //Part_Of_Star's_Sob
-			set zeny,zeny+20000;
-			if (BaseLevel < 60) getexp 300,0;
-			else if (BaseLevel < 70) getexp 700,0;
-			else if (BaseLevel < 80) getexp 1000,0;
-			else if (BaseLevel < 90) getexp 1400,0;
-			else if (BaseLevel < 150) getexp 1900,0;
+			Zeny += 20000;
+			if (checkre(3)) {
+				if (BaseLevel < 60) getexp 300,0;
+				else if (BaseLevel < 70) getexp 700,0;
+				else if (BaseLevel < 80) getexp 1000,0;
+				else if (BaseLevel < 90) getexp 1400,0;
+				else getexp 1900,0;
+			} else {
+				if (BaseLevel < 60) getexp 3000,0;
+				else if (BaseLevel < 70) getexp 7000,0;
+				else if (BaseLevel < 80) getexp 10000,0;
+				else if (BaseLevel < 90) getexp 14000,0;
+				else getexp 19000,0;
+			}
 			next;
 			mes "[Dearles]";
 			mes "Well, that's it.";
@@ -4764,7 +4813,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			mes "me. It also looks like you got zeny to spare! I think I'll help myself and borrow some of your cash!";
 			mes "^FF0000Yoink!^000000";
 			mes "Giggle giggle..";
-			set zeny,zeny-10000;
+			Zeny -= 10000;
 			close;
 		}
 	}
@@ -4777,7 +4826,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			mes "cash. You know, for old";
 			mes "time's sake. ^FF0000Yoink!^000000";
 			emotion e_gg;
-			set zeny,zeny-10000;
+			Zeny -= 10000;
 		}
 		else {
 			mes "I got nothin' for you and";
@@ -4819,7 +4868,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 	}
 }
 
-cmd_in01,33,25,5	script	Examiner#sign	724,{
+cmd_in01,33,25,5	script	Examiner#sign	4_F_07,{
 	callfunc "F_UpdateSignVars";
 	mes "[Lamadin]";
 	if (sign_q == 30) {
@@ -4941,7 +4990,7 @@ cmd_in01,33,25,5	script	Examiner#sign	724,{
 	}
 }
 
-cmd_in01,16,24,0	script	Emergency Exit	111,{
+cmd_in01,16,24,0	script	Emergency Exit	HIDDEN_NPC,{
 	mes "[Exit]";
 	mes "Would you like to go out?";
 	next;
@@ -4959,7 +5008,7 @@ cmd_in01,16,24,0	script	Emergency Exit	111,{
 	}
 }
 
-cmd_in01,33,33,1	script	Standby Room#sign	66,{
+cmd_in01,33,33,1	script	Standby Room#sign	1_F_01,{
 	end;
 
 OnInit:
@@ -4968,14 +5017,14 @@ OnInit:
 	end;
 
 OnStartArena:
-	donpcevent "s_dance_timer::Onbutton_off";
+	donpcevent "s_dance_timer::OnButton_Off";
 	donpcevent "Examiner#sd::OnDisable";
 	warpwaitingpc "cmd_in01",16,15,1;
 	donpcevent "s_dance_timer::OnEnable";
 	disablewaitingroomevent;
 	end;
 
-Onreset:
+OnReset:
 	enablewaitingroomevent;
 	end;
 }
@@ -4989,7 +5038,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onbutton_off:
+OnButton_Off:
 	callsub OnDisableAll;
 	end;
 
@@ -5007,94 +5056,94 @@ OnTimer2000:
 
 OnTimer4000:
 	mapannounce "cmd_in01"," UP LEFT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#up::Onup";
+	donpcevent "s_dance#up::OnUp";
 	donpcevent "s_dance#up::OnEnable";
 	end;
 
 OnTimer6000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#down::Onup";
+	donpcevent "s_dance#down::OnUp";
 	donpcevent "s_dance#down::OnEnable";
 	end;
 
 OnTimer8000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer11000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#down::Onup";
+	donpcevent "s_dance#down::OnUp";
 	donpcevent "s_dance#down::OnEnable";
 	end;
 
 OnTimer13000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP RIGHT & UP LEFT & STAY CENTER",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer18000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & DOWN RIGHT & DOWN LEFT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer21000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN RIGHT & CENTER & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#down::Onup";
+	donpcevent "s_dance#down::OnUp";
 	donpcevent "s_dance#down::OnEnable";
 	end;
 
 OnTimer24000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP LEFT & UP RIGHT & DOWN RIGHT & CENTER",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer30000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP RIGHT & UP LEFT & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer34000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," UP RIGHT & DOWN RIGHT & UP RIGHT & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#right::Onup";
+	donpcevent "s_dance#right::OnUp";
 	donpcevent "s_dance#right::OnEnable";
 	end;
 
 OnTimer38000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," UP LEFT & UP RIGHT & CENTER & UP RIGHT & DOWN LEFT & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#up::Onup";
+	donpcevent "s_dance#up::OnUp";
 	donpcevent "s_dance#up::OnEnable";
 	end;
 
 OnTimer44000:
 	stopnpctimer;
-	donpcevent "s_dance#up::Onreset";
-	donpcevent "s_dance#down::Onreset";
-	donpcevent "s_dance#left::Onreset";
-	donpcevent "s_dance#right::Onreset";
-	donpcevent "s_dance#cen::Onreset";
+	donpcevent "s_dance#up::OnReset";
+	donpcevent "s_dance#down::OnReset";
+	donpcevent "s_dance#left::OnReset";
+	donpcevent "s_dance#right::OnReset";
+	donpcevent "s_dance#cen::OnReset";
 	mapannounce "cmd_in01","Well done.",bc_map,"0xFFFF00";
 	enablenpc "Examiner#sd";
-	donpcevent "Standby Room#sign::Onreset";
+	donpcevent "Standby Room#sign::OnReset";
 	end;
 }
 
-cmd_in01,16,21,0	script	s_dance#up	139,1,3,{
+cmd_in01,16,21,0	script	s_dance#up	HIDDEN_WARP_NPC,1,3,{
 OnInit:
 	disablenpc "s_dance#up";
 	end;
@@ -5109,48 +5158,48 @@ OnDisable:
 	disablenpc "s_dance#up";
 	end;
 
-Onup:
+OnUp:
 	set .s_up,.s_up + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_up,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_up.wav",1;
 	if (.s_up == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 5) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	end;
 }
 
-cmd_in01,16,11,0	script	s_dance#down	139,1,3,{
+cmd_in01,16,11,0	script	s_dance#down	HIDDEN_WARP_NPC,1,3,{
 OnInit:
 	donpcevent "s_dance#down::OnDisable";
 	end;
@@ -5165,68 +5214,68 @@ OnDisable:
 	disablenpc "s_dance#down";
 	end;
 
-Onup:
+OnUp:
 	set .s_down,.s_down + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_down,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_down.wav",1;
 	if (.s_down == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 2) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#left::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#left::OnUp";
 		donpcevent "s_dance#left::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 5) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 6) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 7) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 8) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 9) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 10) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	end;
 }
 
-cmd_in01,11,16,0	script	s_dance#left	139,3,1,{
+cmd_in01,11,16,0	script	s_dance#left	HIDDEN_WARP_NPC,3,1,{
 OnInit:
 	donpcevent "s_dance#left::OnDisable";
 	end;
@@ -5242,60 +5291,60 @@ OnDisable:
 	disablenpc "s_dance#left";
 	end;
 
-Onup:
+OnUp:
 	set .s_left,.s_left + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_left,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_left.wav",1;
 	if (.s_left == 1) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 4) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 5) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#up::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#up::OnUp";
 		donpcevent "s_dance#up::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 6) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent  "s_dance#right::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 7) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	end;
 }
 
-cmd_in01,21,16,0	script	s_dance#right	139,3,1,{
+cmd_in01,21,16,0	script	s_dance#right	HIDDEN_WARP_NPC,3,1,{
 OnInit:
 	donpcevent "s_dance#right::OnDisable";
 	end;
@@ -5310,66 +5359,66 @@ OnDisable:
 	disablenpc "s_dance#right";
 	end;
 
-Onup:
+OnUp:
 	set .s_right,.s_right + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_right,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_right.wav",1;
 	if (.s_right == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#up::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#up::OnUp";
 		donpcevent "s_dance#up::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#up::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#up::OnUp";
 		donpcevent "s_dance#up::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 5) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 6) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 7) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 8) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#left::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#left::OnUp";
 		donpcevent "s_dance#left::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	end;
 }
 
-cmd_in01,16,16,0	script	s_dance#cen	139,1,1,{
+cmd_in01,16,16,0	script	s_dance#cen	HIDDEN_WARP_NPC,1,1,{
 OnInit:
 	donpcevent "s_dance#cen::OnDisable";
 	end;
@@ -5384,33 +5433,33 @@ OnDisable:
 	disablenpc "s_dance#cen";
 	end;
 	
-Onup:
+OnUp:
 	set .s_center,.s_center + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_center,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_center.wav",1;
 	if (.s_center == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#cen::OnDisable";
 	}
 	else if (.s_center == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#cen::OnDisable";
 	}
 	else if (.s_center == 3) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#cen::OnDisable";
 	}
 	else if (.s_center == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#cen::OnDisable";
 	}
@@ -5442,7 +5491,7 @@ OnTouch:
 	donpcevent "Examiner#sd::OnDisable";
 	end;
 
-Onup:
+OnUp:
 	set .s_check,.s_check + 1;
 	end;
 
@@ -5452,7 +5501,7 @@ OnDisable:
 	end;
 }
 
-alberta_in,125,101,5	script	Wealthy-looking Merchant	807,{
+alberta_in,125,101,5	script	Wealthy-looking Merchant	1_M_SIGNMCNT,{
 	callfunc "F_UpdateSignVars";
 	mes "[Bakerlan]";
 	if (sign_q < 35) {
@@ -5591,11 +5640,19 @@ alberta_in,125,101,5	script	Wealthy-looking Merchant	807,{
 		mes "He will tell you what you need to do next.";
 		set sign_q,53;
 		getitem 7177,1; //Part_Of_Star's_Sob
-		if (BaseLevel < 60) getexp 500,0;
-		else if (BaseLevel < 70) getexp 800,0;
-		else if (BaseLevel < 80) getexp 1100,0;
-		else if (BaseLevel < 90) getexp 1500,0;
-		else if (BaseLevel < 150) getexp 2000,0;
+		if (checkre(3)) {
+			if (BaseLevel < 60) getexp 500,0;
+			else if (BaseLevel < 70) getexp 800,0;
+			else if (BaseLevel < 80) getexp 1100,0;
+			else if (BaseLevel < 90) getexp 1500,0;
+			else getexp 2000,0;
+		} else {
+			if (BaseLevel < 60) getexp 5000,0;
+			else if (BaseLevel < 70) getexp 8000,0;
+			else if (BaseLevel < 80) getexp 11000,0;
+			else if (BaseLevel < 90) getexp 15000,0;
+			else getexp 20000,0;
+		}
 		close;
 	}
 	else if (sign_q == 97) {
@@ -5624,7 +5681,7 @@ alberta_in,125,101,5	script	Wealthy-looking Merchant	807,{
 	}
 }
 
-alberta_in,154,171,5	script	Maid#s10	758,{
+alberta_in,154,171,5	script	Maid#s10	4_F_JPN,{
 	callfunc "F_UpdateSignVars";
 	mes "[Seylin]";
 	if (sign_q < 38) {
@@ -5941,7 +5998,7 @@ alberta_in,154,171,5	script	Maid#s10	758,{
 	}
 }
 
-prt_castle,107,58,5	script	Soldier#s11	105,{
+prt_castle,107,58,5	script	Soldier#s11	8W_SOLDIER,{
 	callfunc "F_UpdateSignVars";
 	mes "[Maruin]";
 	if (sign_q < 49) {
@@ -6073,7 +6130,7 @@ prt_castle,107,58,5	script	Soldier#s11	105,{
 	}
 }
 
-alde_alche,169,162,7	script	Alchemist#sign	749,{
+alde_alche,169,162,7	script	Alchemist#sign	4_M_ALCHE_B,{
 	callfunc "F_UpdateSignVars";
 	mes "[Melkaba]";
 	if (sign_q < 46) {
@@ -6282,7 +6339,7 @@ alde_alche,169,162,7	script	Alchemist#sign	749,{
 						mes "just one bottle, but this";
 						mes "stuff is extremely potent!";
 						next;
-						set zeny,zeny-10000;
+						Zeny -= 10000;
 						delitem 526,10; //Royal_Jelly
 						delitem 518,20; //Honey
 						delitem 948,30; //Bear's_Foot
@@ -6382,7 +6439,7 @@ alde_alche,169,162,7	script	Alchemist#sign	749,{
 	}
 }
 
-alberta_in,114,178,5	script	Refined Steward	109,{
+alberta_in,114,178,5	script	Refined Steward	4_M_MANAGER,{
 	callfunc "F_UpdateSignVars";
 	mes "[Mahatra]";
 	if (sign_q < 37) {
@@ -6528,7 +6585,7 @@ alberta_in,114,178,5	script	Refined Steward	109,{
 	}
 }
 
-alberta,98,202,5	script	Guard#s10	105,{
+alberta,98,202,5	script	Guard#s10	8W_SOLDIER,{
 	mes "[Hurubu]";
 	mes "Welcome to the";
 	mes "Alchesh Estate.";
@@ -6575,7 +6632,7 @@ alberta,98,202,5	script	Guard#s10	105,{
 	}
 }
 
-alberta,43,49,5	script	Poor-looking Merchant	89,{
+alberta,43,49,5	script	Poor-looking Merchant	4_M_ORIENT02,{
 	callfunc "F_UpdateSignVars";
 	mes "[Machen]";
 	if (sign_q < 35) {
@@ -6674,7 +6731,7 @@ alberta,43,49,5	script	Poor-looking Merchant	89,{
 	}
 }
 
-yuno,330,100,4	script	Knight#ss	734,{
+yuno,330,100,4	script	Knight#ss	4_M_JOB_KNIGHT2,{
 	callfunc "F_UpdateSignVars";
 	mes "[Leibech]";
 	if (sign_q < 38) {
@@ -6797,11 +6854,19 @@ yuno,330,100,4	script	Knight#ss	734,{
 				delitem2 7049,1,1,0,0,.@sign1,.@sign2,.@sign3,.@sign4;
 				set sign_q,39;
 				getitem 7181,1; //Receipt_01
-				if (BaseLevel < 60) getexp 100,0;
-				else if (BaseLevel < 70) getexp 200,0;
-				else if (BaseLevel < 80) getexp 400,0;
-				else if (BaseLevel < 90) getexp 700,0;
-				else if (BaseLevel < 150) getexp 1100,0;
+				if (checkre(3)) {
+					if (BaseLevel < 60) getexp 100,0;
+					else if (BaseLevel < 70) getexp 200,0;
+					else if (BaseLevel < 80) getexp 400,0;
+					else if (BaseLevel < 90) getexp 700,0;
+					else getexp 1100,0;
+				} else {
+					if (BaseLevel < 60) getexp 1000,0;
+					else if (BaseLevel < 70) getexp 2000,0;
+					else if (BaseLevel < 80) getexp 4000,0;
+					else if (BaseLevel < 90) getexp 7000,0;
+					else getexp 11000,0;
+				}
 				close;
 			}
 		}
@@ -6846,11 +6911,9 @@ yuno,330,100,4	script	Knight#ss	734,{
 	}
 }
 
-//============================================================ 
 // The Sign (Part 2)
-//============================================================ 
-
-geffen_in,159,48,5	script	Lonely-looking Woman	711,{
+//============================================================
+geffen_in,159,48,5	script	Lonely-looking Woman	4_F_05,{
 	callfunc "F_UpdateSignVars";
 	mes "[Brenda Howard]";
 	if (sign_q < 54) {
@@ -6967,7 +7030,7 @@ geffen_in,159,48,5	script	Lonely-looking Woman	711,{
 	}
 }
 
-geffen_in,171,42,3	script	Cute Girl	703,{
+geffen_in,171,42,3	script	Cute Girl	4_F_KID2,{
 	callfunc "F_UpdateSignVars";
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second! Right now,";
@@ -7081,7 +7144,7 @@ geffen_in,171,42,3	script	Cute Girl	703,{
 	}
 }
 
-mjo_dun02,88,295,4	script	Flaming Spirit Man	85,{
+mjo_dun02,88,295,4	script	Flaming Spirit Man	4_M_03,{
 	callfunc "F_UpdateSignVars";
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second! Right now,";
@@ -7107,7 +7170,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	85,{
 				mes "If it weren't for your help,";
 				mes "I'd be in big trouble. I really appreciate you stepping in and volunteering your materials like this.";
 				delitem 1002,1; //Iron_Ore
-				getexp 1,0;
+				getexp 10,0;
 				close;
 			case 2:
 				mes "[Engel]";
@@ -7598,7 +7661,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	85,{
 	}
 }
 
-gef_tower,118,36,4	script	Annoyed Man	64,{
+gef_tower,118,36,4	script	Annoyed Man	1_M_WIZARD,{
 	callfunc "F_UpdateSignVars";
 	mes "[Dhota]";
 	if (sign_q < 72) {
@@ -7682,7 +7745,7 @@ gef_tower,118,36,4	script	Annoyed Man	64,{
 	}
 }
 
-umbala,163,256,3	script	Native#_s	781,{
+umbala,163,256,3	script	Native#_s	4_F_UMGIRL,{
 	callfunc "F_UpdateSignVars";
 	if (event_umbala >= 3) {
 		mes "[Laotan]";
@@ -7758,7 +7821,7 @@ umbala,163,256,3	script	Native#_s	781,{
 	}
 }
 
-um_in,27,23,3	script	Fastidious-Looking Guy	121,{
+um_in,27,23,3	script	Fastidious-Looking Guy	2_M_MOLGENSTEIN,{
 	callfunc "F_UpdateSignVars";
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second! Right now,";
@@ -7948,7 +8011,7 @@ um_in,27,23,3	script	Fastidious-Looking Guy	121,{
 	}
 }
 
-alberta,165,83,4	script	Fastidious Old Man	755,{
+alberta,165,83,4	script	Fastidious Old Man	4_M_SAGE_C,{
 	callfunc "F_UpdateSignVars";
 	if (checkweight(908,200) == 0) {
 		mes "^3355FFWait a second! Right now,";
@@ -8071,7 +8134,7 @@ alberta,165,83,4	script	Fastidious Old Man	755,{
 	}
 }
 
-gef_fild07,182,241,0	script	#Valkyrie Warp	111,1,1,{
+gef_fild07,182,241,0	script	#Valkyrie Warp	HIDDEN_NPC,1,1,{
 	callfunc "F_UpdateSignVars";
 	if ((sign_q == 80) && (countitem(907) > 3) && (countitem(953) > 11) && (countitem(7013) > 364)) {
 		mes "^6B8E23It seems that";
@@ -8125,7 +8188,7 @@ OnTouch:
 	end;
 }
 
-himinn,48,86,5	script	Valkyrie#sign	811,{
+himinn,48,86,5	script	Valkyrie#sign	4_F_VALKYRIE,{
 	callfunc "F_UpdateSignVars";
 	mes "[Valkyrie Sandra]";
 	if (sign_q < 81) {
@@ -8182,15 +8245,27 @@ himinn,48,86,5	script	Valkyrie#sign	811,{
 		mes "one of the hearts there...";
 		set sign_q,82;
 		percentheal 100,100;
-		if (BaseLevel < 56) getexp 900,0;
-		else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 1200,0;
-		else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 2000,0;
-		else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 3500,0;
-		else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 7000,0;
-		else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 12000,0;
-		else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 16000,0;
-		else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 21000,0;
-		else if (BaseLevel > 90) getexp 35000,0;
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 900,0;
+			else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 1200,0;
+			else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 2000,0;
+			else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 3500,0;
+			else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 7000,0;
+			else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 12000,0;
+			else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 16000,0;
+			else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 21000,0;
+			else getexp 35000,0;
+		} else {
+			if (BaseLevel < 56) getexp 9000,0;
+			else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 12000,0;
+			else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 20000,0;
+			else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 35000,0;
+			else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 70000,0;
+			else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 120000,0;
+			else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 160000,0;
+			else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 210000,0;
+			else getexp 350000,0;
+		}
 		close2;
 		warp "geffen",120,100;
 		end;
@@ -8294,11 +8369,9 @@ himinn,48,86,5	script	Valkyrie#sign	811,{
 	}
 }
 
-//============================================================ 
 // The Sign (Part 3)
-//============================================================ 
-
-que_sign01,196,39,4	script	Serin#dummy	90,{
+//============================================================
+que_sign01,196,39,4	script	Serin#dummy	4_F_01,{
 	end;
 
 OnDisable:
@@ -8310,7 +8383,7 @@ OnEnable:
 	enablenpc "Serin#dummy";
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -8334,7 +8407,7 @@ OnTimer13000:
 	end;
 }
 
-que_sign01,196,44,4	script	Dark Lord#serin	737,{
+que_sign01,196,44,4	script	Dark Lord#serin	4_DARKLORD,{
 	end;
 
 OnDisable:
@@ -8347,7 +8420,7 @@ OnEnable:
 	end;
 }
 
-que_sign01,196,39,4	script	Serin#serin	90,{
+que_sign01,196,39,4	script	Serin#serin	4_F_01,{
 	callfunc "F_UpdateSignVars";
 	if (sign_q < 132) {
 		mes "[Serin]";
@@ -8378,7 +8451,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 		delitem 7305,1; //Authority_Of_Nine_World
 		set sign_q,133;
 		donpcevent "Serin#dummy::OnEnable";
-		donpcevent "Serin#dummy::Onstart";
+		donpcevent "Serin#dummy::OnStart";
 		donpcevent "Serin#serin::OnDisable";
 		close;
 	}
@@ -8452,7 +8525,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 				set sign_q,134;
 				donpcevent "Serin#serin::OnDisable";
 				donpcevent "Dark Lord#serin::OnDisable";
-				donpcevent "CallMonster#serin::Oncall";
+				donpcevent "CallMonster#serin::OnCall";
 				close;
 			case 2:
 				mes "[Serin]";
@@ -8462,7 +8535,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 				mes "ask the Dark Lord to spare";
 				mes "you. Thank you so much...";
 				set sign_q,200;
-				getexp 20000,0;
+				getexp (checkre(3))?20000:200000,0;
 				set $@sign_w2,0;
 				donpcevent "Dark Lord#serin::OnDisable";
 				close2;
@@ -8486,7 +8559,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 			set sign_q,134;
 			donpcevent "Serin#serin::OnDisable";
 			donpcevent "Dark Lord#serin::OnDisable";
-			donpcevent "CallMonster#serin::Oncall";
+			donpcevent "CallMonster#serin::OnCall";
 			close;
 		}
 	}
@@ -8584,7 +8657,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 				set sign_q,134;
 				donpcevent "Serin#serin::OnDisable";
 				donpcevent "Dark Lord#serin::OnDisable";
-				donpcevent "CallMonster#serin::Oncall";
+				donpcevent "CallMonster#serin::OnCall";
 				end;
 			}
 		}
@@ -8623,7 +8696,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 				set sign_q,134;
 				donpcevent "Serin#serin::OnDisable";
 				donpcevent "Dark Lord#serin::OnDisable";
-				donpcevent "CallMonster#serin::Oncall";
+				donpcevent "CallMonster#serin::OnCall";
 				end;
 			}
 		}
@@ -8652,7 +8725,7 @@ OnEnable:
 	end;
 }
 
-que_sign01,197,195,4	script	Serin#witch	90,{
+que_sign01,197,195,4	script	Serin#witch	4_F_01,{
 	callfunc "F_UpdateSignVars";
 	if (sign_q < 124) {
 		mes "[Serin]";
@@ -8733,7 +8806,7 @@ que_sign01,197,195,4	script	Serin#witch	90,{
 				mes "ask the Dark Lord to spare";
 				mes "you. Thank you so much...";
 				set sign_q,200;
-				getexp 20000,0;
+				getexp (checkre(3))?20000:200000,0;
 				set $@sign_w1,0;
 				close2;
 				warp "umbala,",132,203;
@@ -8784,7 +8857,7 @@ que_sign01,197,195,4	script	Serin#witch	90,{
 			mes "now! We'll have to battle!";
 			close2;
 			set sign_q,126;
-			donpcevent "CallMonster#witch::Oncall";
+			donpcevent "CallMonster#witch::OnCall";
 			donpcevent "Serin#witch::OnDisable";
 			end;
 		}
@@ -8825,7 +8898,7 @@ que_sign01,197,195,4	script	Serin#witch	90,{
 			mes "now! We'll have to battle!";
 			close2;
 			set sign_q,126;
-			donpcevent "CallMonster#witch::Oncall";
+			donpcevent "CallMonster#witch::OnCall";
 			donpcevent "Serin#witch::OnDisable";
 			end;
 		}
@@ -8933,7 +9006,7 @@ que_sign01,197,195,4	script	Serin#witch	90,{
 				close2;
 				set sign_q,126;
 				donpcevent "Serin#witch::OnDisable";
-				donpcevent "CallMonster#witch::Oncall";
+				donpcevent "CallMonster#witch::OnCall";
 				end;
 			}
 		}
@@ -8980,7 +9053,7 @@ que_sign01,197,195,4	script	Serin#witch	90,{
 				close2;
 				set sign_q,126;
 				donpcevent "Serin#witch::OnDisable";
-				donpcevent "CallMonster#witch::Oncall";
+				donpcevent "CallMonster#witch::OnCall";
 				end;
 			}
 		}
@@ -9012,7 +9085,7 @@ OnEnable:
 	end;
 }
 
-niflheim,313,70,4	script	Pleasant-Featured Lady#s	90,{
+niflheim,313,70,4	script	Pleasant-Featured Lady#s	4_F_01,{
 	callfunc "F_UpdateSignVars";
 	if (sign_q < 82) {
 		mes "[Serin]";
@@ -9479,7 +9552,7 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	90,{
 				mes "the faint smile on her lips tell you that her memories of you";
 				mes "will always remain in her heart.^000000";
 				delitem 2643,1; //Serin's_Gold_Ring_
-				getexp 50000,0;
+				getexp (checkre(3))?50000:500000,0;
 				close;
 			case 2:
 				emotion e_sob;
@@ -9674,7 +9747,7 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	90,{
 	}
 }
 
-que_sign01,122,141,4	script	Witch#s	792,{
+que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 	callfunc "F_UpdateSignVars";
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
@@ -10241,7 +10314,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 				mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason, "+strcharinfo(0)+"...";
 				delitem 7313,5; //Seal_Of_Witch
 				set sign_q,129;
-				getexp 50000,0;
+				getexp (checkre(3))?50000:500000,0;
 				close;
 			}
 		}
@@ -10270,7 +10343,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 				mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason...";
 				delitem 7313,5; //Seal_Of_Witch
 				set sign_q,130;
-				getexp 30000,0;
+				getexp (checkre(3))?30000:300000,0;
 				close;
 			}
 		}
@@ -10296,7 +10369,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 		mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason...";
 		if (countitem(2643) == 1) set sign_q,129;
 		else set sign_q,130;
-		getexp 30000,0;
+		getexp (checkre(3))?30000:300000,0;
 		close;
 	}
 	else if (sign_q == 200) {
@@ -10326,7 +10399,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 		if (countitem(2642) > 0) delitem 2642,1; //Serin's_Gold_Ring
 		if (countitem(7308) > 0) delitem 7308,1; //Witch's_Potion
 		set sign_q,201;
-		getexp 20000,0;
+		getexp (checkre(3))?20000:200000,0;
 		close;
 	}
 	else if (sign_q > 200) {
@@ -10668,7 +10741,7 @@ OnTouch:
 	end;
 }
 
-que_sign01,45,227,4	script	Queen of the Dead	856,{
+que_sign01,45,227,4	script	Queen of the Dead	2_F_SIGN1,{
 	callfunc "F_UpdateSignVars";
 	mes "[Lady Hell]";
 	if (sign_q < 117) {
@@ -10857,7 +10930,7 @@ que_sign01,45,227,4	script	Queen of the Dead	856,{
 	}
 }
 
-niflheim,146,241,0	script	Depressing Man	735,{
+niflheim,146,241,0	script	Depressing Man	4_M_JOB_WIZARD,{
 	callfunc "F_UpdateSignVars";
 	if (sign_q < 80) {
 		mes "[????]";
@@ -11122,7 +11195,7 @@ niflheim,146,241,0	script	Depressing Man	735,{
 	}
 }
 
-nif_in,140,177,0	script	#Switch	111,{
+nif_in,140,177,0	script	#Switch	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	if (countitem(7313) == 1) {
 		warp "que_sign01",115,135;
@@ -11136,7 +11209,7 @@ nif_in,140,177,0	script	#Switch	111,{
 	end;
 }
 
-niflheim,102,54,4	script	Mad Man#s	739,{
+niflheim,102,54,4	script	Mad Man#s	8_DOPPEL,{
 	callfunc "F_UpdateSignVars";
 	mes "[Laichin]";
 	if (sign_q < 82) {
@@ -11297,7 +11370,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 						mes "Heh heh!";
 						close;
 					}
-					set zeny,zeny-40000;
+					Zeny -= 40000;
 					close;
 				case 2:
 					mes "[Laichin]";
@@ -11316,7 +11389,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 						mes "crawling back when";
 						mes "you can't figure out";
 						mes "where the soul pieces are!";
-						set zeny,zeny-40000;
+						Zeny -= 40000;
 						if (.@select_s == 1) set sign_q,97;
 						else if (.@select_s == 2) set sign_q,98;
 						else if (.@select_s == 3) set sign_q,99;
@@ -11352,7 +11425,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 							mes "than the borders of the map.";
 							mes "For very small, you gotta";
 							mes "look near the center. Got it?";
-							set zeny,zeny-60000;
+							Zeny -= 60000;
 							if (.@select_s == 1) set sign_q,101;
 							else if (.@select_s == 2) set sign_q,102;
 							else if (.@select_s == 3) set sign_q,103;
@@ -11391,7 +11464,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 		next;
 		switch(select("Pay him.:Don't pay him.")) {
 		case 1:
-			if (Zeny < 60000) {
+			if (Zeny < 20000) {
 				mes "[Laichin]";
 				mes "What is this?";
 				mes "You tryin to welch";
@@ -11413,7 +11486,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 				mes "than the borders of the map.";
 				mes "For very small, you gotta";
 				mes "look near the center. Got it?";
-				set zeny,zeny-20000;
+				Zeny -= 20000;
 				if (sign_q == 97) set sign_q,101;
 				else if (sign_q == 98) set sign_q,102;
 				else if (sign_q == 99) set sign_q,103;
@@ -11966,7 +12039,7 @@ function	script	F_SignSeal	{
 	return;
 }
 
-gl_dun02,262,265,0	script	Mysterious Energy#1	111,{
+gl_dun02,262,265,0	script	Mysterious Energy#1	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	set .@crash_s,rand(1,1000);
 	if (sign_q == 101) {
@@ -11982,7 +12055,7 @@ gl_dun02,262,265,0	script	Mysterious Energy#1	111,{
 }
 
 // Angrboda's Seal 2 big 4 O'clock 270 198
-gl_dun02,271,100,0	script	Mysterious Energy#2	111,{
+gl_dun02,271,100,0	script	Mysterious Energy#2	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	set .@crash_s,rand(1,1000);
 	if ((sign_q == 102) || (sign_q == 104)) {
@@ -11999,7 +12072,7 @@ gl_dun02,271,100,0	script	Mysterious Energy#2	111,{
 }
 
 // Angrboda's Seal 3 big 5 O'clock 268 32
-gl_dun02,268,32,0	script	Mysterious Energy#3	111,{
+gl_dun02,268,32,0	script	Mysterious Energy#3	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	set .@crash_s,rand(1,1000);
 	if ((sign_q == 103) || (sign_q == 105) || (sign_q == 108)) {
@@ -12017,7 +12090,7 @@ gl_dun02,268,32,0	script	Mysterious Energy#3	111,{
 }
 
 // Angrboda's Seal 4 big 7 O'clock 16 26
-gl_dun02,16,26,0	script	Mysterious Energy#4	111,{
+gl_dun02,16,26,0	script	Mysterious Energy#4	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	set .@crash_s,rand(1,1000);
 	if (sign_q == 109) {
@@ -12033,7 +12106,7 @@ gl_dun02,16,26,0	script	Mysterious Energy#4	111,{
 }
 
 // Angrboda's Seal 5 big 11 O'clock 42 251
-gl_dun02,42,251,0	script	Mysterious Energy#5	111,{
+gl_dun02,42,251,0	script	Mysterious Energy#5	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	set .@crash_s,rand(1,1000);
 	if ((sign_q == 106) || (sign_q == 112)) {
@@ -12050,7 +12123,7 @@ gl_dun02,42,251,0	script	Mysterious Energy#5	111,{
 }
 
 // Angrboda's Seal 6 small 11 O'clock 123 234
-gl_dun02,123,234,0	script	Mysterious Energy#6	111,{
+gl_dun02,123,234,0	script	Mysterious Energy#6	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	set .@crash_s,rand(1,1000);
 	if (sign_q == 107) {
@@ -12070,7 +12143,7 @@ gl_dun02,123,234,0	script	Mysterious Energy#6	111,{
 }
 
 // Angrboda's Seal 7 small 6 O'clock 140 72
-gl_dun02,140,72,0	script	Mysterious Energy#7	111,{
+gl_dun02,140,72,0	script	Mysterious Energy#7	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	set .@crash_s,rand(1,1000);
 	if ((sign_q == 110) || (sign_q == 111)) {
@@ -12091,7 +12164,7 @@ gl_dun02,140,72,0	script	Mysterious Energy#7	111,{
 }
 
 // Angrboda's Seal 8 very small 119 182
-gl_dun02,119,182,0	script	Mysterious Energy#8	111,{
+gl_dun02,119,182,0	script	Mysterious Energy#8	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	set .@crash_s,rand(1,1000);
 	if ((sign_q == 114) || (sign_q == 115)) {
@@ -12105,7 +12178,7 @@ gl_dun02,119,182,0	script	Mysterious Energy#8	111,{
 	}
 }
 
-que_sign01,46,56,0	script	Fountain#sign	111,{
+que_sign01,46,56,0	script	Fountain#sign	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	if (sign_q < 118) {
 		mes "^3355FFThe water in this";
@@ -12158,7 +12231,7 @@ que_sign01,46,56,0	script	Fountain#sign	111,{
 	}
 }
 
-geffen,119,55,0	script	Geffenia Warp	45,1,1,{
+geffen,119,55,0	script	Geffenia Warp	WARPNPC,1,1,{
 OnInit:
 	disablenpc "Geffenia Warp";
 	end;
@@ -12196,7 +12269,7 @@ OnTimer45000:
 	end;
 }
 
-geffen,119,48,0	script	Fountain#s	111,{
+geffen,119,48,0	script	Fountain#s	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
 	if (countitem(7025) > 0) {
 		mes "^3355FFAs you approach the fountain,";
@@ -12229,7 +12302,7 @@ geffen,119,48,0	script	Fountain#s	111,{
 
 que_sign01,196,44,0	script	Starter#serin	-1,32,32,{
 OnTouch:
-	donpcevent "Timer#serin::Onstart";
+	donpcevent "Timer#serin::OnStart";
 	disablenpc "Starter#serin";
 	end;
 
@@ -12254,7 +12327,7 @@ OnEnable:
 }
 
 que_sign01,1,0,0	script	Timer#serin	-1,{
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -12269,13 +12342,13 @@ OnTimer620000:
 	donpcevent "Serin#serin::OnEnable";
 	donpcevent "Dark Lord#serin::OnDisable";
 	donpcevent "Serin#dummy::OnDisable";
-	donpcevent "CallMonster#serin::Onreset";
+	donpcevent "CallMonster#serin::OnReset";
 	stopnpctimer;
 	end;
 }
 
 que_sign01,50,1,0	script	CallMonster#serin	-1,{
-Oncall:
+OnCall:
 	monster "que_sign01",196,44,"Dark Lord Incarnation",1605,1,"CallMonster#serin::OnMyMobDead";
 	end;
 
@@ -12284,13 +12357,13 @@ OnMyMobDead:
 		donpcevent "Serin#serin::OnEnable";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "que_sign01","CallMonster#serin::OnMyMobDead";
 }
 
 que_sign01,197,195,0	script	Starter#witch	-1,32,32,{
 OnTouch:
-	donpcevent "Timer#witch::Onstart";
+	donpcevent "Timer#witch::OnStart";
 	disablenpc "Starter#witch";
 	end;
 
@@ -12300,7 +12373,7 @@ OnEnable:
 }
 
 que_sign01,1,1,0	script	Timer#witch	-1,{
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -12311,7 +12384,7 @@ OnTimer600000:
 OnTimer620000:
 	donpcevent "Starter#witch::OnEnable";
 	donpcevent "Warp#witch::OnDisable";
-	donpcevent "CallMonster#witch::Onreset";
+	donpcevent "CallMonster#witch::OnReset";
 	donpcevent "Serin#witch::OnEnable";
 	set $@sign_w1,0;
 	stopnpctimer;
@@ -12334,7 +12407,7 @@ OnTouch:
 }
 
 que_sign01,1,2,0	script	CallMonster#witch	-1,{
-Oncall:
+OnCall:
 	monster "que_sign01",196,195,"Dark Lord Incarnation",1605,1,"CallMonster#witch::OnMyMobDead";
 	monster "que_sign01",180,180,"Ancient Mummy",1522,1,"CallMonster#witch::OnMyMobDead";
 	monster "que_sign01",210,210,"Ancient Mummy",1522,1,"CallMonster#witch::OnMyMobDead";
@@ -12348,12 +12421,12 @@ Oncall:
 	end;
 
 OnMyMobDead:
-	if (mobcount("gue_sign01","CallMonster#witch::OnMyMobDead") < 1) {
+	if (mobcount("que_sign01","CallMonster#witch::OnMyMobDead") < 1) {
 		donpcevent "Serin#witch::OnEnable";
 	}
 	end;
 
-Onreset:
+OnReset:
 	killmonster "que_sign01","CallMonster#witch::OnMyMobDead";
 	end;
 }
@@ -12368,7 +12441,7 @@ que_sign02,0,0,0,0	monster	Zombie Prisoner	1480,15,0,0,0
 que_sign02,0,0,0,0	monster	Wraith	1475,15,0,0,0
 que_sign02,0,0,0,0	monster	Wraith Dead	1566,8,0,0,0
 
-que_sign02,378,235,0	script	sign_w6	45,1,1,{
+que_sign02,378,235,0	script	sign_w6	WARPNPC,1,1,{
 OnTouch:
 	callfunc "F_UpdateSignVars";
 	if ((countitem(7313) == 1) && ((sign_q != 124) || (sign_q != 125) || (sign_q != 126))) {
@@ -12482,7 +12555,7 @@ function	script	F_UpdateSignVars	{
 		// Because of the horrible way this was scripted, it's incompatable
 		// With the new script, So I am resetting the quest to the start
 		// of this step.
-		if (signlaichin >= 1) { 
+		if (signlaichin >= 1) {
 			mes "^FF0000You stumble and drop the your^000000";
 			if (countitem(7306)) {
 				mes "^FF0000"+getitemname(7306)+"^000000";
@@ -12496,11 +12569,11 @@ function	script	F_UpdateSignVars	{
 			mes "^FF0000pieces on the ground and they vanish! Perhaps you should talk to Lachin.^000000";
 			delitem 7306,countitem(7306); //Fragment_Of_Soul
 			delitem 7307,countitem(7307); //Whisper_Of_Soul
-			set sign_q,rand(97,100); 
+			set sign_q,rand(97,100);
 		}
 
 		// Same BS as above, unable to save pickup time for 'The Sign' from Engel.
-		if (signengelhour) { 
+		if (signengelhour) {
 			mes "^FF0000You see that Engel has forgotten to look at 'The Sign', how you got it back is a mystery too you, but you should remind Engel that he needs to look at it.^000000";
 			getitem 7314,1; //The_Sign
 			set sign_q,139;
@@ -12525,7 +12598,7 @@ function	script	F_UpdateSignVars	{
 		}
 
 		// Unable to save when the Sign should be picked up from Metz
-		if (signmetzhour) { 
+		if (signmetzhour) {
 			mes "^FF0000You see that Metz has forgotten to look at 'The Sign', how you got it back is a mystery too you, but you should remind Metz that he needs to look at it.^000000";
 			getitem 7314,1; //The_Sign
 			set sign_q,138;
@@ -12563,9 +12636,9 @@ function	script	F_UpdateSignVars	{
 	return;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 First version, beware of potential nasty bugs :x [MasterOfMuppets]
 //= 1.1 Finalized for stable, might still contain bugs though. [MasterOfMuppets]
 //= 1.1a moved #aldesignwarp to fix enless warp [Lupus]
@@ -12598,3 +12671,4 @@ function	script	F_UpdateSignVars	{
 //= 2.8 Fixed some bugs with itemids and leftover questitems [Fish0r]
 //= 2.9 Made a delitem causing script to fault use countitem when deleting. [L0ne_W0lf]
 //= 2.9a Added a check for Sign_Branch8A before attempting to run a delitem on items not needed based on Path taken. [Paradox924X]
+//============================================================
diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt
index 67b9e988d..69ba5b115 100644
--- a/npc/re/airports/izlude.txt
+++ b/npc/re/airports/izlude.txt
@@ -1,13 +1,19 @@
 //===== Hercules Script ======================================
 //= Izlude Airport NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Hercules Dev Team
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
 //= Izlude Airport NPCs
-//===== Additional Comments: ================================= 
-//= Official NPCs.
-//= Updated to match the new Izlude Map. [Masao]
-//= Updated to Official coordinates
-//============================================================ 
+//===== Additional Comments: =================================
+//= 1.0 Updated to match the new Izlude Map. [Masao]
+//= 1.1 Added Izlude duplicates. [Euphy]
+//============================================================
 
-izlude,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	90
+izlude,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	4_F_01
+izlude_a,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude_a	4_F_01
+izlude_b,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude_b	4_F_01
+izlude_c,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude_c	4_F_01
+izlude_d,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude_d	4_F_01
diff --git a/npc/re/cities/alberta.txt b/npc/re/cities/alberta.txt
index 9d17acc65..4fb8bab6d 100644
--- a/npc/re/cities/alberta.txt
+++ b/npc/re/cities/alberta.txt
@@ -5,6 +5,7 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
+//= [Official Conversion]
 //= Alberta town NPCs.
 //===== Additional Comments: =================================
 //= 1.0 First Version.
@@ -12,29 +13,29 @@
 
 // cities/amatsu.txt
 //============================================================
-alberta,246,74,3	duplicate(Sea_Captain_amatsu)	Sea Captain#ama1	709
+alberta,246,74,3	duplicate(Sea_Captain_amatsu)	Sea Captain#ama1	4_M_SEAMAN
 
 // cities/ayothaya.txt
 //============================================================
-alberta,246,29,3	duplicate(Aibakthing_ayothaya)	Aibakthing#ayo	843
+alberta,246,29,3	duplicate(Aibakthing_ayothaya)	Aibakthing#ayo	4_M_THAIONGBAK
 
 // cities/gonryun.txt
 //============================================================
-alberta,246,62,3	duplicate(Kunlun_Envoy_gonryun)	Kunlun Envoy#gon	776
+alberta,246,62,3	duplicate(Kunlun_Envoy_gonryun)	Kunlun Envoy#gon	4_M_TWMIDMAN
 
 // cities/louyang.txt
 //============================================================
-alberta,246,40,3	duplicate(Girl_louyang)	Girl#0lou	815
+alberta,246,40,3	duplicate(Girl_louyang)	Girl#0lou	4_F_CHNDRESS1
 
 // cities/moscovia.txt
 //============================================================
-alberta,246,51,4	duplicate(PR_Officer_moscovia)	Moscovia P.R. Officer#1	960
+alberta,246,51,4	duplicate(PR_Officer_moscovia)	Moscovia P.R. Officer#1	4_F_RUSWOMAN2
 
 // quests/quests_alberta.txt
 //============================================================
-alberta,244,118,4	duplicate(Sailor_alberta)	Sailor#tur	709
-alberta,246,114,4	duplicate(Turtle_Scholar_alberta)	Turtle Island Scholar	121
+alberta,244,118,4	duplicate(Sailor_alberta)	Sailor#tur	4_M_SEAMAN
+alberta,246,114,4	duplicate(Turtle_Scholar_alberta)	Turtle Island Scholar	2_M_MOLGENSTEIN
 
 // quests/skills/merchant_skills.txt
 //============================================================
-alberta,232,103,6	duplicate(Gershaun_alberta)	Gershaun	57
+alberta,232,103,6	duplicate(Gershaun_alberta)	Gershaun	1_M_LIBRARYMASTER
diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt
index cde84e954..405ce486c 100644
--- a/npc/re/cities/brasilis.txt
+++ b/npc/re/cities/brasilis.txt
@@ -1,21 +1,23 @@
 //===== Hercules Script ======================================
 //= Brasilis Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Brasilis Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. Transportation and Basic NPCs.
 //= 1.1 Fixed Zeny not being removed for payment. [Kisuka]
 //= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf]
 //= 1.3 Moved Alberta NPC to pre-re/re paths. [Euphy]
-//============================================================ 
+//============================================================
 
+// Brasilis Transportation
+//============================================================
 /* Pre-Renewal coordinates: alberta,247,115,3 */
-alberta,246,82,3	script	Crewman#bra2	100,{
+alberta,246,82,3	script	Crewman#bra2	4W_SAILOR,{
 	mes "[Crewman]";
 	mes "Hey, have you heard of a place called Brasilis?";
 	mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";
@@ -29,7 +31,7 @@ alberta,246,82,3	script	Crewman#bra2	100,{
 		if (Zeny > 9999) {
 			mes "[Crewman]";
 			mes "Cool~!! Let's go~!";
-			set zeny,zeny-10000;
+			Zeny -= 10000;
 			close2;
 			warp "brasilis",314,60;
 			end;
@@ -46,7 +48,7 @@ alberta,246,82,3	script	Crewman#bra2	100,{
 	}
 }
 
-brasilis,316,57,3	script	Crewman#bra1	100,{
+brasilis,316,57,3	script	Crewman#bra1	4W_SAILOR,{
 	mes "[Crewman]";
 	mes "My ship is going to back to Alberta, do you want to join us?";
 	next;
@@ -67,36 +69,38 @@ brasilis,316,57,3	script	Crewman#bra1	100,{
 	}
 }
 
-brasilis,155,165,3	script	Signpost#bra1	858,{
+// Generic Brasilis NPCs
+//============================================================
+brasilis,155,165,3	script	Signpost#bra1	4_BULLETIN_BOARD2,{
 	mes ":: Art Museum ::";
 	close;
 }
 
-brasilis,195,231,3	script	Signpost#bra2	858,{
+brasilis,195,231,3	script	Signpost#bra2	4_BULLETIN_BOARD2,{
 	mes ":: Verass Monument ::";
 	close;
 }
 
-brasilis,240,247,3	script	Signpost#bra3	858,{
+brasilis,240,247,3	script	Signpost#bra3	4_BULLETIN_BOARD2,{
 	mes ":: Market ::";
 	mes " ";
 	mes "- For your Potions and Weaponry -";
 	close;
 }
 
-brasilis,303,309,3	script	Signpost#bra4	858,{
+brasilis,303,309,3	script	Signpost#bra4	4_BULLETIN_BOARD2,{
 	mes ":: Jungle Cable ::";
 	mes "";
 	mes "- Not for the faint of heart -";
 	close;
 }
 
-brasilis,278,137,3	script	Signpost#bra5	858,{
+brasilis,278,137,3	script	Signpost#bra5	4_BULLETIN_BOARD2,{
 	mes ":: Brasilis Hotel ::";
 	close;
 }
 
-brasilis,137,77,5	script	Ice-Cream Maker	85,{
+brasilis,137,77,5	script	Ice-Cream Maker	4_M_03,{
 	mes "[Ice Cream Maker]";
 	mes "Come~come~";
 	mes "Ice cream is the perfect snack for a hot day~";
@@ -141,7 +145,7 @@ brasilis,137,77,5	script	Ice-Cream Maker	85,{
 			mes "Lighten your pack before buying this.";
 			close;
 		}
-		set zeny,zeny-.@icecream_hap;
+		Zeny -= .@icecream_hap;
 		getitem 536,.@input; //Ice_Cream
 		close;
 	case 2:
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 3c5953adf..1205a4de1 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -1,21 +1,75 @@
 //===== Hercules Script ======================================
 //= Dewata Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Gennosuke Kouga, Muad_Dib
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
+//= [Official Conversion]
 //= Dewata Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Standardized. [Euphy]
 //= 1.2 Fixed Zeny check. [Joseph]
 //= 1.3 Updated to match the official script. [Lemongrass/Euphy]
 //============================================================
 
-dewata,221,237,5	script	Young Man#dew-1	536,{
+// Dewata Transportation
+//============================================================
+alberta,212,202,4	script	Dewata Sailor#alberta	4_M_DEWMAN,{
+	mes "[Dewata Sailor]";
+	mes "Do you want to visit ^8B4513Dewata Island^000000?";
+	mes "With it's dazzling waves and charming views it's a great place to relax.";
+	mes "The transit fee is 10,000 Zeny.";
+	next;
+	switch(select("Yes!:No.")) {
+	case 1:
+		if (Zeny >= 10000) {
+			mes "[Dewata Sailor]";
+			mes "^8B4513Dewata^000000 is a beautiful and peaceful island country.";
+			mes "Have a nice trip~";
+			close2;
+			Zeny -= 10000;
+			warp "dewata",232,53;
+			end;
+		} else {
+			mes "[Dewata Sailor]";
+			mes "You don't have the dough, kid.";
+			mes "Come back when you have a bigger wallet.";
+			close;
+		}
+	case 2:
+		mes "[Dewata Sailor]";
+		mes "Let me know";
+		mes "when you're ready to travel~";
+		close;
+	}
+}
+
+dewata,229,49,6	script	Alberta Sailor#dewata	4_M_DEWMAN,{
+	mes "[Alberta Sailor]";
+	mes "Do you want to go back to Alberta?";
+	next;
+	switch(select("Yes.:No.")) {
+	case 1:
+		mes "[Alberta Sailor]";
+		mes "I hope you had a lot of fun on";
+		mes "your trip to ^8B4513Dewata^000000 Island.";
+		mes "Please come again!";
+		close2;
+		warp "alberta",210,198;
+		end;
+	case 2:
+		mes "[Alberta Sailor]";
+		mes "Have some more fun before you go.";
+		mes "^8B4513Dewata^000000 Island still has more to offer.";
+		close;
+	}
+}
+
+// Generic Dewata NPCs
+//============================================================
+dewata,221,237,5	script	Young Man#dew-1	4_M_DEWMAN,{
 	mes "[Fruit Fancier]";
 	mes "What's wrong with your faaaaaace? You must really be clueless!";
 	next;
@@ -111,7 +165,7 @@ dewata,221,237,5	script	Young Man#dew-1	536,{
 	}
 }
 
-dewata,114,243,6	script	Lazy Young Man#dew	536,1,1,{
+dewata,114,243,6	script	Lazy Young Man#dew	4_M_DEWMAN,1,1,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
 		mes "[Lazy Young Man]";
 		mes "Why are you carrying so much? Isn't it heavy?";
@@ -157,7 +211,7 @@ OnTouch:
 	end;
 }
 
-dewata,159,81,4	script	Tourist#dew-1	881,{
+dewata,159,81,4	script	Tourist#dew-1	4_M_SITDOWN,{
 	mes "[Nasolo]";
 	mes "Wow~ Pure ocean, a warm beach...";
 	mes "Perfect for a date with a girlfriend...";
@@ -172,7 +226,7 @@ dewata,159,81,4	script	Tourist#dew-1	881,{
 	close;
 }
 
-dewata,146,109,5	script	Restauranteur#dew	886,{
+dewata,146,109,5	script	Restauranteur#dew	4_COOK,{
 	if (checkweight(11532,1) == 0 || checkweight(11533,1) == 0 || MaxWeight - Weight < 500) {
 		mes "[Restauranteur]";
 		mes "You came to taste my dish? It is always good to eat with an empty stomach.";
@@ -242,7 +296,7 @@ dewata,146,109,5	script	Restauranteur#dew	886,{
 			}
 			mes "[Restauranteur]";
 			mes "Here's your "+getitemname(.@food)+", you won't regret it!";
-			set Zeny, Zeny - 5000;
+			Zeny -= 5000;
 			getitem .@food,1;
 			close;
 		case 2:
@@ -257,7 +311,7 @@ dewata,146,109,5	script	Restauranteur#dew	886,{
 	}
 }
 
-dewata,147,107,6	script	Gourmet#dew	85,{
+dewata,147,107,6	script	Gourmet#dew	4_M_03,{
 	mes "[Gourmet]";
 	mes "Oh... it's like a party in my";
 	mes "mouth... and everyone's invited!";
@@ -273,7 +327,7 @@ dewata,147,107,6	script	Gourmet#dew	85,{
 	close;
 }
 
-dewata,154,107,4	script	Sightseer#dew	86,{
+dewata,154,107,4	script	Sightseer#dew	4_M_04,{
 	mes "[Tourist]";
 	mes "Wow...";
 	mes "How many has he already eaten?";
@@ -287,7 +341,7 @@ dewata,154,107,4	script	Sightseer#dew	86,{
 	close;
 }
 
-dewata,95,203,6	script	Travel Guide#dew	536,{
+dewata,95,203,6	script	Travel Guide#dew	4_M_DEWMAN,{
 	mes "[Guide]";
 	mes "This temple behind me is called Borobudur.";
 	mes "Borobudur temple was built in the 9th century";
@@ -312,7 +366,7 @@ dewata,95,203,6	script	Travel Guide#dew	536,{
 	close;
 }
 
-dewata,97,207,4	script	Tourist#dew1	803,{
+dewata,97,207,4	script	Tourist#dew1	1_F_SIGNZISK,{
 	mes "[Tourist]";
 	mes "Oh, dag-nabbit... I've gone and";
 	mes "picked the wrong tour guide...";
@@ -328,7 +382,7 @@ dewata,97,207,4	script	Tourist#dew1	803,{
 	close;
 }
 
-dewata,100,206,4	script	Tourist#dew2	59,{
+dewata,100,206,4	script	Tourist#dew2	1_M_ORIENT01,{
 	mes "[Tourist]";
 	mes "Hey, let's go there! Hurry up,";
 	mes "while the tour guide is explaining~";
@@ -339,7 +393,7 @@ dewata,100,206,4	script	Tourist#dew2	59,{
 	close;
 }
 
-dewata,101,206,4	script	Tourist#dew3	90,{
+dewata,101,206,4	script	Tourist#dew3	4_F_01,{
 	mes "[Tourist]";
 	mes "Aren't we going to get lost without the guide?";
 	next;
@@ -348,7 +402,7 @@ dewata,101,206,4	script	Tourist#dew3	90,{
 	close;
 }
 
-dewata,99,203,4	script	Tourist#dew4	755,{
+dewata,99,203,4	script	Tourist#dew4	4_M_SAGE_C,{
 	mes "[Tourist]";
 	mes "Oh~ This is very interesting. A";
 	mes "temple that worships the Buddha...";
@@ -364,7 +418,7 @@ dewata,99,203,4	script	Tourist#dew4	755,{
 	close;
 }
 
-dewata,67,186,8	script	Monk#dew1	834,{
+dewata,67,186,8	script	Monk#dew1	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "I am a monk, content to spend my days in religious study.";
 	next;
@@ -376,7 +430,7 @@ dewata,67,186,8	script	Monk#dew1	834,{
 	close;
 }
 
-dewata,65,188,8	script	Monk#dew2	834,{
+dewata,65,188,8	script	Monk#dew2	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "Borobudur temple is one of few temples left for worshiping the Great Buddha.";
 	next;
@@ -385,7 +439,7 @@ dewata,65,188,8	script	Monk#dew2	834,{
 	close;
 }
 
-dewata,63,190,8	script	Monk#dew3	834,{
+dewata,63,190,8	script	Monk#dew3	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "Are you a Tourist? You can make an offering and a wish to one of the shrines.";
 	next;
@@ -394,7 +448,7 @@ dewata,63,190,8	script	Monk#dew3	834,{
 	close;
 }
 
-dewata,62,192,8	script	Monk#dew4	834,{
+dewata,62,192,8	script	Monk#dew4	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "Our great Buddha is the king of souls and the leader of all good Gods.";
 	next;
@@ -406,7 +460,7 @@ dewata,62,192,8	script	Monk#dew4	834,{
 	close;
 }
 
-dewata,89,191,6	script	Small Shrine#dew1	844,{
+dewata,89,191,6	script	Small Shrine#dew1	CLEAR_NPC,{
 	mes "There is a small shrine here. There are many people making wishes.";
 	next;
 	switch(select("Make a donation.:Make a wish.:Walk away.")) {
@@ -455,37 +509,19 @@ dewata,89,191,6	script	Small Shrine#dew1	844,{
 		mes "You make a wish for ^0000FF" + .@wish$ + "^000000 to the small shrine.";
 		next;
 		callsub L_Wish;
-		set Zeny, Zeny - .@input;
-		if (.@stat & 1 && .@bonus){
-			sc_start SC_FOOD_STR,1200000,3;
-			percentheal 5,0;
-			//consumeitem 12043; //Str_Dish03
-		}
-		else if (.@stat & 2 && .@bonus){
-			sc_start SC_FOOD_AGI,1200000,3;
-			percentheal 5,0;
-			//consumeitem 12058; //Agi_Dish03
-		}
-		else if (.@stat & 4 && .@bonus){
-			sc_start SC_FOOD_DEX,1200000,3;
-			percentheal 5,0;
-			//consumeitem 12063; //Dex_Dish03
-		}
-		else if (.@stat & 8 && .@bonus){
-			sc_start SC_FOOD_VIT,1200000,3;
-			percentheal 5,0;
-			//consumeitem 12053; //Vit_Dish03
-		}
-		else if (.@stat & 16 && .@bonus){
-			sc_start SC_FOOD_INT,1200000,3;
-			percentheal 5,0;
-			//consumeitem 12048; //Int_Dish03
-		}
-		else if (.@stat & 32 && .@bonus){
-			sc_start SC_FOOD_LUK,1200000,3;
-			percentheal 5,0;
-			//consumeitem 12068; //Luk_Dish03
-		}
+		Zeny -= .@input;
+		if (.@stat & 1 && .@bonus)
+			consumeitem 12043; //Str_Dish03
+		else if (.@stat & 2 && .@bonus)
+			consumeitem 12058; //Agi_Dish03
+		else if (.@stat & 4 && .@bonus)
+			consumeitem 12063; //Dex_Dish03
+		else if (.@stat & 8 && .@bonus)
+			consumeitem 12053; //Vit_Dish03
+		else if (.@stat & 16 && .@bonus)
+			consumeitem 12048; //Int_Dish03
+		else if (.@stat & 32 && .@bonus)
+			consumeitem 12068; //Luk_Dish03
 		else if (.@stat & 64) {
 			specialeffect2 EF_ANGEL;
 			mes "- A celestial entity gives you a blessing. -";
@@ -523,11 +559,11 @@ L_Wish:
 	next;
 	return;
 }
-dewata,89,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew2	844
-dewata,68,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew3	844
-dewata,68,191,6	duplicate(Small Shrine#dew1)	Small Shrine#dew4	844
+dewata,89,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew2	CLEAR_NPC
+dewata,68,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew3	CLEAR_NPC
+dewata,68,191,6	duplicate(Small Shrine#dew1)	Small Shrine#dew4	CLEAR_NPC
 
-dewata,75,122,6	script	Monk#dewt1	834,{
+dewata,75,122,6	script	Monk#dewt1	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "You are a stranger here. What brings here to this quiet place?";
 	next;
@@ -543,7 +579,7 @@ dewata,75,122,6	script	Monk#dewt1	834,{
 	}
 }
 
-dewata,69,101,6	script	Monk#dewt2	834,{
+dewata,69,101,6	script	Monk#dewt2	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "We have a pagoda for the worship of Buddhas. Each temple has one of these towers, though not many people come here besides other monks.";
 	next;
@@ -578,7 +614,7 @@ dewata,69,101,6	script	Monk#dewt2	834,{
 	}
 }
 
-dewata,71,79,6	script	Monk#dewt3	834,{
+dewata,71,79,6	script	Monk#dewt3	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "This tower is built on the edge of coastal cliff. You can pray with a cool ocean breeze in your hair.";
 	next;
@@ -587,7 +623,7 @@ dewata,71,79,6	script	Monk#dewt3	834,{
 	close;
 }
 
-dewata,211,272,4	script	Lodge Owner#dew	534,2,3,{
+dewata,211,272,4	script	Lodge Owner#dew	4_M_DEWOLDMAN,2,3,{
 OnTouch:
 	mes "[Lodge Owner]";
 	mes "These days, we have many honeymooners visiting here.";
@@ -604,7 +640,7 @@ OnTouch:
 	close;
 }
 
-dewata,245,244,4	script	Lodge Employee#dew	536,2,3,{
+dewata,245,244,4	script	Lodge Employee#dew	4_M_DEWMAN,2,3,{
 OnTouch:
 	mes "[Lodge employee]";
 	mes "Argg~ This is really ticking me off!";
@@ -621,7 +657,7 @@ OnTouch:
 	close;
 }
 
-dewata,233,263,8	script	Sweet Married Couple::smc_dew_01	828,2,3,{
+dewata,233,263,8	script	Sweet Married Couple#1	4_M_ROGUE,2,3,{
 OnTouch:
 	mes "[Sweet Husband]";
 	mes "You are the most beautiful thing in the world baby~";
@@ -641,7 +677,7 @@ OnTouch:
 	close;
 }
 
-dewata,234,263,8	script	Sweet Married Couple::smc_dew_02	727,2,3,{
+dewata,234,263,8	script	Sweet Married Couple#2	4_F_JOB_HUNTER,2,3,{
 OnTouch:
 	mes "[Sweet Wife]";
 	mes "Baby~ You know what flower that is~?";
@@ -672,7 +708,7 @@ OnTouch:
 	close;
 }
 
-dewata,279,213,4	script	Tourist#dew-2	887,2,3,{
+dewata,279,213,4	script	Tourist#dew-2	4_M_LIEMAN,2,3,{
 OnTouch:
 	mes "[Reclining Tourist]";
 	mes "Wow~ This is really comfy~";
@@ -690,7 +726,7 @@ OnTouch:
 	close;
 }
 
-dewata,269,208,4	script	Little Kid in Town#dew	538,2,3,{
+dewata,269,208,4	script	Little Kid in Town#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Kid]";
 	mes "Hey "+((Sex)?"bro":"sis")+", look at that man!";
@@ -707,7 +743,7 @@ OnTouch:
 	close;
 }
 
-dewata,227,129,4	script	Sarr#dew	538,2,3,{
+dewata,227,129,4	script	Sarr#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Sarr]";
 	mes "They're hiding so I should seek.";
@@ -730,7 +766,7 @@ OnTouch:
 	close;
 }
 
-dewata,239,140,4	script	Siyak#dew	539,2,3,{
+dewata,239,140,4	script	Siyak#dew	4_M_DEWGIRL,2,3,{
 OnTouch:
 	mes "[Siyak]";
 	mes "Hey come on, move over~ He's gonna find me~~";
@@ -748,7 +784,7 @@ OnTouch:
 	close;
 }
 
-dewata,193,145,4	script	Sipo#dew	538,2,3,{
+dewata,193,145,4	script	Sipo#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Sipo]";
 	mes "Sarr won't find me here, right?";
@@ -765,7 +801,7 @@ OnTouch:
 	close;
 }
 
-dewata,228,177,4	script	Majya#dew	538,2,3,{
+dewata,228,177,4	script	Majya#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Majya]";
 	mes "I was playing hide-and-seek with my friends...";
@@ -779,7 +815,7 @@ OnTouch:
 	close;
 }
 
-dewata,278,100,4	script	Missing Child#dew	703,2,3,{
+dewata,278,100,4	script	Missing Child#dew	4_F_KID2,2,3,{
 OnTouch:
 	mes "[Ukki]";
 	mes "WaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaa~";
@@ -804,7 +840,7 @@ OnTouch:
 	close;
 }
 
-dewata,249,87,4	script	Mum#dew	101,2,3,{
+dewata,249,87,4	script	Mum#dew	4W_F_01,2,3,{
 OnTouch:
 	mes "[Mum]";
 	mes "Ukki~ Ukki~ Where did she go?";
@@ -819,7 +855,7 @@ OnTouch:
 	close;
 }
 
-dewata,251,85,6	script	Poppa#dew	97,2,3,{
+dewata,251,85,6	script	Poppa#dew	4W_M_01,2,3,{
 OnTouch:
 	mes "[Poppa]";
 	mes "Honey, is Ukki lost again?";
@@ -840,7 +876,7 @@ OnTouch:
 	close;
 }
 
-dewata,278,281,4	script	Happily Married Grandpa::hmg_dew_01	534,{
+dewata,278,281,4	script	Happily Married Grandpa	4_M_DEWOLDMAN,{
 	mes "[Happily Married Grandpa]";
 	mes "Today, I should ask my lady to";
 	mes "cook me some ^006400fried rice^000000.";
@@ -856,7 +892,7 @@ dewata,278,281,4	script	Happily Married Grandpa::hmg_dew_01	534,{
 	close;
 }
 
-dewata,280,277,4	script	Happily Married Grandma::hmg_dew_02	535,{
+dewata,280,277,4	script	Happily Married Grandma	4_M_DEWOLDWOMAN,{
 	mes "[Happily Married Grandma]";
 	mes "In my younger days,";
 	mes "there were many gentleman callers";
@@ -884,7 +920,7 @@ dewata,280,277,4	script	Happily Married Grandma::hmg_dew_02	535,{
 	close;
 }
 
-dewata,165,103,6	script	Adventurer Semangat#dew	534,{
+dewata,165,103,6	script	Adventurer Semangat#dew	4_M_DEWOLDMAN,{
 	mes "[Adventurer Semangat]";
 	mes "I also traveled around the World";
 	mes "When I was young like you.";
@@ -906,7 +942,7 @@ dewata,165,103,6	script	Adventurer Semangat#dew	534,{
 	close;
 }
 
-dewata,139,114,6	script	Semangat's Wife#dew	535,{
+dewata,139,114,6	script	Semangat's Wife#dew	4_M_DEWOLDWOMAN,{
 	mes "[Semangat's Wife]";
 	mes "Where's that old man";
 	mes "gone off to again?";
@@ -941,7 +977,7 @@ dewata,139,114,6	script	Semangat's Wife#dew	535,{
 	}
 }
 
-dewata,181,88,6	script	Young Man#dew-2	536,{
+dewata,181,88,6	script	Young Man#dew-2	4_M_DEWMAN,{
 	mes "[Young Man]";
 	mes "Isn't ^8B4513Dewata^000000 beach";
 	mes "really beautiful?";
@@ -958,7 +994,7 @@ dewata,181,88,6	script	Young Man#dew-2	536,{
 	close;
 }
 
-dewata,179,204,4	script	Young Lady#dew	537,{
+dewata,179,204,4	script	Young Lady#dew	4_M_DEWWOMAN,{
 	mes "[Young Lady]";
 	mes "When you are outside of the town,";
 	mes "and meet ^FF0000Tiger, Monkey, or pig^000000,";
@@ -980,7 +1016,7 @@ dewata,179,204,4	script	Young Lady#dew	537,{
 	close;
 }
 
-dewata,280,236,4	script	Settler#dew	726,{
+dewata,280,236,4	script	Settler#dew	4_F_JOB_BLACKSMITH,{
 	mes "[Settler]";
 	mes "I'm not really from ^8B4513Dewata^000000.";
 	mes "But while traveling,";
@@ -1000,7 +1036,7 @@ dewata,280,236,4	script	Settler#dew	726,{
 	close;
 }
 
-dewata,204,230,6	script	Dieting Lady#dew	537,{
+dewata,204,230,6	script	Dieting Lady#dew	4_M_DEWWOMAN,{
 	if (countitem(11533) == 0) {
 		mes "[Dieting Lady]";
 		mes "Ah~ I'm starving!!";
@@ -1045,7 +1081,7 @@ dewata,204,230,6	script	Dieting Lady#dew	537,{
 	}
 }
 
-dewata,117,156,6	script	Dreaming Kid#dew	538,{
+dewata,117,156,6	script	Dreaming Kid#dew	4_M_DEWBOY,{
 	mes "[Dreaming Kid]";
 	mes "My granny says";
 	mes "There was once a bird named ^FF0000Garuda^000000";
@@ -1063,7 +1099,7 @@ dewata,117,156,6	script	Dreaming Kid#dew	538,{
 	close;
 }
 
-dewata,144,216,4	script	Energetic Kid#dew	538,{
+dewata,144,216,4	script	Energetic Kid#dew	4_M_DEWBOY,{
 	mes "[Energetic Kid]";
 	mes "My parents used to tell me...";
 	next;
@@ -1084,7 +1120,7 @@ dewata,144,216,4	script	Energetic Kid#dew	538,{
 	close;
 }
 
-dewata,127,248,6	script	Wishing Kid#dew	539,{
+dewata,127,248,6	script	Wishing Kid#dew	4_M_DEWGIRL,{
 	mes "[Kid wishing to be an adult]";
 	mes "My family has been brewing";
 	mes "traditional Dewata wine for ages.";
@@ -1104,7 +1140,7 @@ dewata,127,248,6	script	Wishing Kid#dew	539,{
 	close;
 }
 
-dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper::jtg_dew	541,{
+dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper	4_M_DEWZATIMAN,{
 	mes "[Jaty Tribe Gatekeeper]";
 	mes "Welcome to ^FF0000Jaty^000000 town.";
 	mes "Our tribe reveres strength and bravery.";
@@ -1112,7 +1148,7 @@ dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper::jtg_dew	541,{
 	close;
 }
 
-dew_fild01,106,306,4	script	R. Jaty Tribe Warrior	541,{
+dew_fild01,106,306,4	script	R. Jaty Tribe Warrior	4_M_DEWZATIMAN,{
 	mes "[Reserved Jaty Warrior]";
 	mes "I want to be the very best";
 	mes "like no one ever was.";
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index 5fd555b8f..90130c3ab 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -3,19 +3,21 @@
 //===== By: ==================================================
 //= Gennosuke Kouga, Muad_Dib
 //===== Current Version: =====================================
-//= 1.2a
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
 //===== Description: =========================================
+//= [Official Conversion]
 //= El Dicastes Town Script
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Standardized. [Euphy]
 //= 1.2 Updated to match the official script. [Joseph]
 //= 1.2a Moved Guide to a separate file. [Euphy]
+//= 1.3 Updated to match official script. [SkittleNugget]
 //============================================================
 
-dicastes01,194,159,5	script	Excited Galten#a	492,{
+dicastes01,194,159,5	script	Excited Galten#a	4_MAN_GALTUN1,{
 	mes "[Excited Galten]";
 	if (isequipped(2782)) {
 		mes "I can't get beautiful";
@@ -24,7 +26,7 @@ dicastes01,194,159,5	script	Excited Galten#a	492,{
 		mes "As long as we have him,";
 		mes "it will only be a matter of time before Sapha";
 		mes "will rule this land.";
-		close; 
+		close;
 	}
 	mes "¡ø¢²¢£ ¡Ð ¡ò¡ð¡ð";
 	mes "¡÷¡ø¡ñ ¡ü ¡ü";
@@ -34,7 +36,7 @@ dicastes01,194,159,5	script	Excited Galten#a	492,{
 	close;
 }
 
-dicastes01,202,86,3	script	Sentinel#a	492,{
+dicastes01,202,86,3	script	Sentinel#a	4_MAN_GALTUN1,{
 	mes "[Sentinel]";
 	if (isequipped(2782)) {
 		mes "El Dicastes, the";
@@ -47,7 +49,7 @@ dicastes01,202,86,3	script	Sentinel#a	492,{
 		next;
 		mes "[Sentinel]";
 		mes "Hey, you are an outsider!";
-		close; 
+		close;
 	}
 	mes "¡ô¢±¢± ¡û ¡ó¡Ð¡ñ ¢£ ¢¤¡ú";
 	mes "¡ø¡ó¢² ¢¤ ";
@@ -58,16 +60,16 @@ dicastes01,202,86,3	script	Sentinel#a	492,{
 	next;
 	mes "[Sentinel]";
 	mes "¡ñ¡ö¡ï ¡ú ¡ó¢³¡ô";
-	close;	
+	close;
 }
 
-dicastes01,194,95,5	script	Sentinel#b	450,{
+dicastes01,194,95,5	script	Sentinel#b	4_MAN_GALTUN,{
 	mes "[Sentinel]";
 	if (isequipped(2782)) {
 		mes "I permit your entry.";
 		mes "But if you dare to cause trouble";
 		mes "you won't know what hit you. Beware!";
-		close; 
+		close;
 	}
 	mes "¡ø¡ô¡ü ¡ø ¡ó";
 	mes "¡ø¡ï¡û ¡ó ¡û¢¤¢² ¡÷ ¢£";
@@ -75,26 +77,26 @@ dicastes01,194,95,5	script	Sentinel#b	450,{
 	close;
 }
 
-dicastes01,234,158,0	script	Training Galten#a	450,{
+dicastes01,234,158,0	script	Training Galten#a	4_MAN_GALTUN,{
+	mes "[Training Galten]";
 	if (isequipped(2782)) {
-		mes "[Training Galten]";
 		mes "I'll be ready for anything";
 		mes "if I keep up with my training every day.";
 		close;
 	}
-	mes "ø¡ô¡ü ¡¡ø¡ô¡ü ¡ø";
-	mes "ô ¡ø";
+	mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø";
+	mes "¡ô ¡ø";
 	next;
 	mes "Don't know what it means.";
 	close;
 }
 
-dicastes01,244,166,0	script	Training Galten#b	450,{
+dicastes01,244,166,0	script	Training Galten#b	4_MAN_GALTUN,{
+	mes "[Training Galten]";
 	if (isequipped(2782)) {
-		mes "[Training Galten]";
 		mes "I wonder if Ahat knows how";
 		mes "hard I am training.";
-		close; 
+		close;
 	}
 	mes "¡ø¡ô¡ü ¡ø";
 	mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø";
@@ -103,7 +105,7 @@ dicastes01,244,166,0	script	Training Galten#b	450,{
 	close;
 }
 
-dicastes01,272,166,0	script	Training Galten#c	450,{
+dicastes01,272,166,0	script	Training Galten#c	4_MAN_GALTUN,{
 	mes "[Training Galten]";
 	if (isequipped(2782)) {
 		mes "[Training Galten]";
@@ -118,28 +120,42 @@ dicastes01,272,166,0	script	Training Galten#c	450,{
 	close;
 }
 
-dicastes01,248,129,0	script	Training Galten#d	450,{
+dicastes01,248,129,0	script	Training Galten#d	4_MAN_GALTUN,{
 	mes "[Training Galten]";
 	if (isequipped(2782)) {
 		mes "[Training Galten]";
 		mes "I heard this isn't training";
 		mes "equipment but a massager";
 		mes "for trainees like me.";
-		close; 
+		close;
 	}
 	mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü";
-	mes "¡ø¡ô¡ü ¡ø¡ ø¡ô¡ü ¡ø";
+	mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø";
 	next;
 	mes "Don't know what it means.";
 	close;
 }
 
-dic_in01,349,282,4	script	Waiting Galten#in_1	492,{
+/*
+dicastes01,271,152,0	script	Training Galten#e	4_MAN_GALTUN,{
+	mes "[Training Galten]";
+	if (isequipped(2782)) {
+		mes "I will get great results";
+		mes "if I do my best, right?";
+		close;
+	}
+	mes "¡ø¢²¡û ¡ô ¢£¢³¡ô";
+	mes "¡ü¡ô";
+	close;
+}
+*/
+
+dic_in01,349,282,4	script	Waiting Galten#in_1	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Waiting Galten]";
 		mes "Here is the Battle Station.";
 		mes "We are all tensed up to be ready for action.";
-		close;	 
+		close;
 	}
 	mes "[¢²¡Ð¡û ¡ù ¡Ð]";
 	mes "¡ñ¡õ¡ü ¢£ ¡ó";
@@ -147,58 +163,58 @@ dic_in01,349,282,4	script	Waiting Galten#in_1	492,{
 	close;
 }
 
-dic_in01,370,261,1	script	Waiting Galten#in_2	492,{
+dic_in01,370,261,1	script	Waiting Galten#in_2	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Waiting Galten]";
 		mes "Boring.";
-		close; 
+		close;
 	}
 	mes "[¢²¡Ð¡û ¡ù ¡Ð]";
 	mes "¡ù¢¤¢±";
 	close;
 }
 
-dic_in01,381,261,1	script	Waiting Galten#in_3	492,{
+dic_in01,381,261,1	script	Waiting Galten#in_3	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Waiting Galten]";
 		mes "Zzzzz...";
-		close; 
+		close;
 	}
 	mes "[¢²¡Ð¡û ¡ù ¡Ð]";
 	mes "¡ú¡ô";
 	close;
 }
 
-dic_in01,370,282,4	script	Waiting Galten#in_4	492,{
+dic_in01,370,282,4	script	Waiting Galten#in_4	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Waiting Galten]";
 		mes "El Dicastes is the most peaceful place in this world as long as I am here.";
-		close; 
+		close;
 	}
 	mes "[¢²¡Ð¡û ¡ù ¡Ð]";
 	mes "¡ï¡ï¢³ ¡þ ¡ö¢³¢£ ¢± ¢³¡û¡õ ¡ø ¡þ¡ï¡ï ¡ø ¡û";
 	close;
 }
 
-dic_in01,354,219,4	script	Resting Galten#in_5	492,{
+dic_in01,354,219,4	script	Resting Galten#in_5	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Resting Galten]";
 		mes "Resting is always so sweet.";
-		close; 
+		close;
 	}
 	mes "[¡õ¡ø¡ò ¡ü ¢¤]";
 	mes "¡ï¡õ¡ù ¡ö ¡ò¡ð¢² ¢³ ¡ö";
 	close;
 }
 
-dic_in01,365,197,1	script	Resting Galten#in_6	492,{
+dic_in01,365,197,1	script	Resting Galten#in_6	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Resting Galten]";
 		mes "Galten can also rest while standing up like this.";
 		next;
 		mes "[Resting Galten]";
 		mes "You say I don't look like I'm resting? But I'm already used to this.";
-		close; 
+		close;
 	}
 	mes "[¡õ¡ø¡ò ¡ü ¢¤]";
 	mes "¡ô¡ï¢¤ ¡ö ¡ù¡ð¡ñ ¡ü ¡ó¡û¡û";
@@ -206,22 +222,22 @@ dic_in01,365,197,1	script	Resting Galten#in_6	492,{
 	close;
 }
 
-dic_in01,87,102,5	script	Resting Piom#01	454,{
+dic_in01,87,102,5	script	Resting Piom#01	4_MAN_PIOM,{
 	end;
 }
 
-dic_in01,29,119,4	script	Resting Piom#04	489,{
+dic_in01,29,119,4	script	Resting Piom#04	4_MAN_PIOM6,{
 	if (isequipped(2782)) {
 		mes "[Resting Piom]";
 		mes "Why is it so noisy when I'm trying to get rest?";
-		close; 
+		close;
 	}
 	mes "[¢£¡ù¡ò ¢¤ ¡ù]";
 	mes "¡ü¢²¡ð ¡Ð ¡ò¡ø¢² ¡ô ¢²¡õ";
 	close;
 }
 
-dic_in01,91,113,5	script	Suspicious Piom#a	489,{
+dic_in01,91,113,5	script	Suspicious Piom#a	4_MAN_PIOM6,{
 	mes "[Suspicious Piom]";
 	if (isequipped(2782)) {
 		mes "Have you heard of the";
@@ -230,7 +246,7 @@ dic_in01,91,113,5	script	Suspicious Piom#a	489,{
 		if(select("Nope!:You first.") == 1) {
 			mes "[Suspicious Piom]";
 			mes "Never mind.";
-			close; 
+			close;
 		}
 		mes "[Suspicious Piom]";
 		mes "Oh, you do seem to know?";
@@ -242,11 +258,11 @@ dic_in01,91,113,5	script	Suspicious Piom#a	489,{
 			mes "[Suspicious Piom]";
 			mes "I'm only a very curious";
 			mes "ordinary Piom.";
-			close; 
+			close;
 		}
 		mes "[Suspicious Piom]";
 		mes "I am not going to say anything, either!";
-		close; 
+		close;
 	}
 	mes "¡ó¢³¡ó ¡ó ¡ó¡þ¡ö";
 	mes "¡õ ¢³¢²¡÷ ¡ó¡ó";
@@ -254,7 +270,7 @@ dic_in01,91,113,5	script	Suspicious Piom#a	489,{
 	if(select("Can't tell what it means:Is it a curse??") == 2) {
 		mes "[Suspicious Piom]";
 		mes "Too bad.";
-		close; 
+		close;
 	}
 	mes "[Suspicious Piom]";
 	mes "Be on your";
@@ -262,14 +278,14 @@ dic_in01,91,113,5	script	Suspicious Piom#a	489,{
 	close;
 }
 
-dic_in01,168,116,5	script	Tired Piom#c	491,{
+dic_in01,168,116,5	script	Tired Piom#c	4_MAN_PIOM5,{
 	mes "[Tired Piom]";
 	if (isequipped(2782)) {
 		mes "If you need any";
-		mes "information, you'd should try your";
-		mes "luck with the Cat Merchant rather than wander around here.";
+		mes "information, you'd have better";
+		mes "luck with the Cat Merchant than wandering around here.";
 		mes "But of course you'll have to pay the price.";
-		close; 
+		close;
 	}
 	mes "¡þ¡õ¡ð ¢³ ¢³¡þ";
 	mes "¡þ¡ø¡ð ¡ö ¡ñ¡ú¡ð ¡ò";
@@ -278,7 +294,7 @@ dic_in01,168,116,5	script	Tired Piom#c	491,{
 	close;
 }
 
-dic_in01,149,104,5	script	Tired Piom#b	455,{
+dic_in01,149,104,5	script	Tired Piom#b	4_MAN_PIOM2,{
 	mes "[Tired Piom]";
 	if (isequipped(2782)) {
 		mes "I feel so stiff...";
@@ -286,7 +302,7 @@ dic_in01,149,104,5	script	Tired Piom#b	455,{
 		mes "I think the effects are weaker than before,";
 		mes "or is it just me?";
 		emotion e_what;
-		close; 
+		close;
 	}
 	mes "¡ð¡Ð¡ú ¡ø ¢²";
 	mes "¡ö¡õ¡ó ¢¤ ¡ò¡ò¢³ ¡ô ¡ô¡ó¡ñ";
@@ -296,21 +312,22 @@ dic_in01,149,104,5	script	Tired Piom#b	455,{
 	close;
 }
 
-dic_in01,341,113,3	script	Tired Piom#a	491,{
+dic_in01,341,113,3	script	Tired Piom#a	4_MAN_PIOM5,{
 	mes "[Tired Piom]";
 	if (isequipped(2782)) {
-		mes "Ahat is the one";
-		mes "and only Sapha pride.";
-		mes "We have plenty of Bradium";
-		mes "because of him!";
+		mes "[Tired Piom]";
+		mes "I think I look better in";
+		mes "robes than in leather.";
+		mes "I may have to change to knitting.";
+		mes "But mining does seem to suit me.";
 		next;
-		mes "[Thrilled Piom]";
+		mes "[Tired Piom]";
 		mes "...";
 		next;
-		mes "[Thrilled Piom]";
-		mes "You don't feel his";
-		mes "blessing?";
-		close; 
+		emotion e_swt;
+		mes "[Tired Piom]";
+		mes "I'll be rejected again, right?";
+		close;
 	}
 	mes "¡÷¡ò¡û ¡ó ¡ó¡Ð¢±";
 	mes "¡ó¡õ¡ù ¡þ ¡ò¢±¡ñ ¡õ ¢£";
@@ -320,12 +337,13 @@ dic_in01,341,113,3	script	Tired Piom#a	491,{
 	mes "[Tired Piom]";
 	mes "¡þ";
 	next;
+	emotion e_swt;
 	mes "[Tired Piom]";
 	mes "¡ø¡ú¡ø ¢± ¡ö¡ò";
 	close;
 }
 
-dic_in01,252,103,3	script	Eating Adventurer#tre	711,{
+dic_in01,252,103,3	script	Eating Adventurer#tre	4_F_05,{
 	mes "[Eating Adventurer]";
 	mes "Hey, do you have any emergency rations on you from Midgard?";
 	next;
@@ -337,16 +355,16 @@ dic_in01,252,103,3	script	Eating Adventurer#tre	711,{
 	next;
 	mes "[Eating Adventurer]";
 	mes "I really would like a nice hot meal.";
-	mes "I go to this great little restaurant in Geffen often, and I really miss that place now.";
+	mes "I go to this great little restaurant in Geffen often and I really miss that place now.";
 	close;
 }
 
-dic_in01,32,54,5	script	Venknick#el_01	449,{
+dic_in01,32,54,5	script	Venknick#el_01	4_MAN_BENKUNI,{
 	if (isequipped(2782)) {
 		mes "[Venknick]";
 		mes "Oh feels so refreshed.";
 		mes "The refined Bradium was the best ever. Do you want to try some?";
-		close; 
+		close;
 	}
 	mes "[¡ó¡ò¡ð]";
 	mes "¡ù¡ó¢¤ ¢± ¢£";
@@ -354,7 +372,7 @@ dic_in01,32,54,5	script	Venknick#el_01	449,{
 	close;
 }
 
-dic_in01,372,116,3	script	Thrilled Piom#a	490,{
+dic_in01,372,116,3	script	Thrilled Piom#a	4_MAN_PIOM4,{
 	mes "[Thrilled Piom]";
 	if (isequipped(2782)) {
 		mes "Ahat is the one";
@@ -368,7 +386,8 @@ dic_in01,372,116,3	script	Thrilled Piom#a	490,{
 		mes "[Thrilled Piom]";
 		mes "You don't feel his";
 		mes "blessing?";
-		close; }
+		close;
+	}
 	mes "¡ò¡õ¢³ ¡õ ¡ô";
 	mes "¢£¡ó¡ø ¢² ¡ô¡÷";
 	mes "¡ò¡ô¢³ ¡ù ¢±¡ó¢± ¡õ";
@@ -383,13 +402,13 @@ dic_in01,372,116,3	script	Thrilled Piom#a	490,{
 	close;
 }
 
-dic_in01,360,125,5	script	Serious Venknicka	449,{
+dic_in01,360,125,5	script	Serious Venknicka	4_MAN_BENKUNI,{
 	mes "[Serious Venknick]";
 	if (isequipped(2782)) {
 		mes "A sudden increase in Bradium production.";
 		mes "Why?";
 		mes "I will have to get more factory lines running.";
-		close; 
+		close;
 	}
 	mes "¡û¡õ¡ñ ¢² ¢²¢¤¡Ð ¢² ¡ü¡ñ¡õ";
 	mes "¡þ¡ó¡ö ¢²";
@@ -397,9 +416,9 @@ dic_in01,360,125,5	script	Serious Venknicka	449,{
 	close;
 }
 
-dic_in01,42,250,5	script	Guide#diel_1	489,{
+dic_in01,42,250,5	script	Guide#diel_1	4_MAN_PIOM6,{
 	if (isequipped(2782)) {
-		if (ep13_3_invite > 5) {		
+		if (ep13_3_invite > 5) {
 			mes "[Guide]";
 			mes "I'm Dior, your kind guide for El Dicastes.";
 			mes "How can I help you?";
@@ -418,7 +437,7 @@ dic_in01,42,250,5	script	Guide#diel_1	489,{
 			mes "[Guide]";
 			mes "Oh, you didn't ask?";
 			mes "But since I'm Dior, the kind guide. He he.";
-			close; 
+			close;
 		}
 		mes "- The guide looks at you with an alert expression. -";
 		close;
@@ -444,16 +463,16 @@ dic_in01,42,250,5	script	Guide#diel_1	489,{
 	close;
 }
 
-dic_in01,335,34,0	script	Talkative Piom#a	490,{
+dic_in01,335,34,5	script	Talkative Piom#a	4_MAN_PIOM4,{
 	mes "[Talkative Piom]";
-	if (isequipped(2782)) {	
+	if (isequipped(2782)) {
 		mes "At my factory";
 		mes "we not only refine Bradium,";
 		mes "but we also produce various";
 		mes "tools for daily use.";
 		mes "We manufacture war supplies";
 		mes "here too.";
-		close; 
+		close;
 	}
 	mes "¡ü¡ù¢± ¢³";
 	mes "¡÷¡ø¡ï ¡þ ¡ó¡ó";
@@ -464,27 +483,27 @@ dic_in01,335,34,0	script	Talkative Piom#a	490,{
 	close;
 }
 
-dic_in01,387,30,1	script	Manuk Piom#a	454,{
+dic_in01,387,30,1	script	Manuk Piom#a	4_MAN_PIOM,{
 	mes "[Manuk Piom]";
 	if (isequipped(2782)) {
 		mes "You! We met in Manuk, didn't we?";
 		mes "I've come to pick up the weapon I ordered.";
-		close; 
+		close;
 	}
 	mes "¡ü¡ó¡þ ¡ó ¡ï¡ð¢¤ ¡ü ¡ð¢±";
 	mes "¡ù¡ô¡ï ¡ú ¡ñ¡ù¢³ ¡ó ¡ò¡ö¡ó ¡ô¡ô";
 	close;
 }
 
-dicastes01,282,210,4	script	Free Knit#a	453,{
+dicastes01,282,210,4	script	Free Knit#a	4_MAN_NITT,{
 	mes "[Free Knit]";
 	if (isequipped(2782)) {
 		mes "As long as we have a steady";
-		mes "supply of Bradium,";
+		mes "supply of Bradium";
 		mes "Saphas can live forever.";
 		mes "Our childhood lasts 10 years,";
 		mes "which is short.";
-		close; 
+		close;
 	}
 	mes "¡ñ¡þ¡ð ¡ó ¡ü¡ò¡ö ¡÷";
 	mes "¢³¡ð¡ï ¢£ ¡ù¡ô¡ò ¡ô ¡ó¡þ¡ñ ¢² ¡ñ¡û¢£ ¢²";
@@ -494,7 +513,7 @@ dicastes01,282,210,4	script	Free Knit#a	453,{
 	close;
 }
 
-dicastes01,246,210,4	script	Free Venknick#a	449,{
+dicastes01,246,210,3	script	Free Venknick#a	4_MAN_BENKUNI,{
 	mes "[Free Venknick]";
 	if (isequipped(2782)) {
 		mes "At least we have plenty of Bradium.";
@@ -508,7 +527,7 @@ dicastes01,246,210,4	script	Free Venknick#a	449,{
 		mes "[Free Venknick]";
 		mes "The thing rolling around is a gem,";
 		mes "but why are you interested in it?";
-		close; 
+		close;
 	}
 	mes "¡ô¡ï¢£ ¢¤ ¡÷¡õ¢± ¡ü ¡ñ¡õ";
 	mes "¡ü¢³";
@@ -524,13 +543,13 @@ dicastes01,246,210,4	script	Free Venknick#a	449,{
 	close;
 }
 
-dicastes01,235,245,4	script	Excited Piom#a	490,{
+dicastes01,235,245,4	script	Excited Piom#a	4_MAN_PIOM4,{
 	if (isequipped(2782)) {
 		mes "[Excited Piom]";
 		mes "Have you seen Ahat?";
 		emotion e_ho;
 		mes "His popularity here in El Discastes is phenomenal!";
-		close; 
+		close;
 	}
 	mes "[Excited Piom]";
 	mes "¡ú¡þ¡ó ¢³ ¡ü¢²¡ñ ¢±";
@@ -539,17 +558,15 @@ dicastes01,235,245,4	script	Excited Piom#a	490,{
 	close;
 }
 
-dicastes01,284,262,4	script	Favorable Knit#a	453,{
+dicastes01,284,262,3	script	Favorable Knit#a	4_MAN_NITT,{
 	mes "[Favorable Knit]";
 	if (isequipped(2782)) {
-		mes "Unlike the Laphine, we Saphas";
+		mes "Unlike the Raphine, we Saphas";
 		mes "are a very close community.";
 		mes "We start by living together in common facilities after we are born.";
-		next;
-		mes "[Favorable Knit]";
 		mes "That is why all Saphas are like family.";
 		mes "We never have any quarrels between classes.";
-		close; 
+		close;
 	}
 	mes "¡ô¢±¡ó ¡õ ¡ú¡÷¡Ð ¡õ";
 	mes "¡ü¡ï¡Ð ¡õ ¡ô¡ó¡ü ¡ó ¢³";
@@ -559,16 +576,16 @@ dicastes01,284,262,4	script	Favorable Knit#a	453,{
 	close;
 }
 
-dicastes01,164,180,4	script	Limpy Piom#a	489,{
+dicastes01,164,180,4	script	Limpy Piom#a	4_MAN_PIOM6,{
+	mes "[Limpy Piom]";
 	if (isequipped(2782)) {
-		mes "[Limpy Piom]";
 		mes "They say there is a";
 		mes "war going on with the Splendide in Manuk.";
 		mes "I hope everything goes well.";
 		mes "I hope it doesn't come all";
 		mes "the way to the capital city here.";
 		emotion e_dots;
-		close; 
+		close;
 	}
 	mes "¢²¡ô¡þ ¡ù ¡õ¡Ð";
 	mes "¢³¡ô¡û ¡ú ¡ø";
@@ -579,7 +596,7 @@ dicastes01,164,180,4	script	Limpy Piom#a	489,{
 	close;
 }
 
-dicastes01,191,202,4	script	Complaining Galten#fihs	450,{
+dicastes01,191,202,4	script	Complaining Galten#fihs	4_MAN_GALTUN,{
 	if (isequipped(2782)) {
 		mes "[Complaining Galten]";
 		mes "That crazy Vanknick always";
@@ -591,9 +608,9 @@ dicastes01,191,202,4	script	Complaining Galten#fihs	450,{
 		next;
 		if(select("No:Yes") == 1) {
 			mes "[Complaining Galten]";
-			mes "You don't know about the legend behind the statue?";
-			mes "Then I don't know what to talk about it with you.";
-			close; 
+			mes "Then you don't know about the legend behind the statue?";
+			mes "Then, I don't know what to talk about with you.";
+			close;
 		}
 		emotion e_gg,0,"Crazy Venknick#fihsing1";
 		mes "[Complaining Galten]";
@@ -619,7 +636,7 @@ dicastes01,191,202,4	script	Complaining Galten#fihs	450,{
 	close;
 }
 
-dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
+dicastes01,202,197,4	script	Crazy Venknick#fihsing1	4_MAN_BENKUNI,{
 	if (isequipped(2782)) {
 		mes "[Crazy Venknick]";
 		mes "At only 5000 Zeny";
@@ -628,7 +645,7 @@ dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
 		if(select("Give 5000 Zeny.:Don't give 5000 Zeny.") == 2) {
 			mes "[Crazy Venknick]";
 			mes "Don't come back with regrets.";
-			close; 
+			close;
 		}
 		if (Zeny < 5000) {
 			mes "[Crazy Venknick]";
@@ -636,28 +653,31 @@ dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
 			mes "no legend to share with";
 			mes "the poor.";
 			close;
-			close; 
 		}
-		set Zeny, Zeny-5000;
+		Zeny -= 5000;
 		mes "[Crazy Venknick]";
 		mes "Thanks.";
 		emotion e_gg,0,"Complaining Galten#fihs";
 		next;
-		select("What is the sad legend?");
+		mes "["+strcharinfo(0)+"]";
+		mes "What is the sad legend?";
+		next;
 		emotion e_dots;
-		select("I asked what the sad legend is about!");
+		mes "["+strcharinfo(0)+"]";
+		mes "I asked what the sad legend is about!";
 		next;
 		mes "[Crazy Venknick]";
 		mes "I don't believe in legends.";
 		next;
 		emotion e_dots,1;
-		select("Was I tricked?");
-		sc_start SC_Blind,20000,0;
+		mes "["+strcharinfo(0)+"]";
+		mes "Was I tricked?";
+		sc_start SC_BLIND,20000,0;
 		next;
 		mes "You feel outraged at being tricked.";
-		close; 
+		close;
 	}
-	mes "[???¨²?¨´ ¡é3 ]";
+	mes "[¡ö¡ú¡ù ¢³ ]";
 	mes "¢²¡û¡ó ¡ó ¡ù¢¤¡ø";
 	mes "¢¤¡ð¢² ¢± ¡ñ¡ö¢² ¡ø ¡ï¡ö¡ü";
 	next;
@@ -665,7 +685,7 @@ dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
 	close;
 }
 
-dic_in01,98,110,5	script	Worried Piom#a	489,{
+dic_in01,98,110,5	script	Worried Piom#a	4_MAN_PIOM6,{
 	if (isequipped(2782)) {
 		mes "[Worried Piom]";
 		mes "I haven't seen my friends for the last few hours.";
@@ -680,7 +700,7 @@ dic_in01,98,110,5	script	Worried Piom#a	489,{
 	close;
 }
 
-dic_in01,98,96,3	script	Lost Galten#a	492,{
+dic_in01,98,96,3	script	Lost Galten#a	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Lost Galten]";
 		mes "I've been living as a Piom for too long";
@@ -693,4 +713,4 @@ dic_in01,98,96,3	script	Lost Galten#a	492,{
 	mes "¡ü¡ø¡ñ ¢£ ";
 	mes "¡ö¡ï¢² ¡û ¡ö¡ó";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/re/cities/eclage.txt b/npc/re/cities/eclage.txt
new file mode 100644
index 000000000..2ea4e4cd5
--- /dev/null
+++ b/npc/re/cities/eclage.txt
@@ -0,0 +1,485 @@
+//===== Hercules Script ======================================
+//= Eclage Town
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Eclage Town Script
+//===== Additional Comments: =================================
+//= 1.0 Nearly complete iRO town NPCs. [Euphy]
+//============================================================
+
+// Generic Eclage NPCs - Set 1
+//============================================================
+ecl_fild01,92,316,4	script	Tourist#ep14_2f2	4_CAT_SAILOR2,{
+	mes "[Tourist]";
+	mes "I can't believe I have to wait this long......";
+	mes "When is it going to be my turn?";
+	emotion e_sob;
+	close;
+}
+
+ecl_fild01,106,312,4	script	Tourist#ep14_2f3	4_F_RAFLE_VI,{
+	mes "[Tourist]";
+	mes "I'm actually done with my documentation, but I'm just sticking around to appreciate all of these flowers.";
+	emotion e_lv2;
+	next;
+	mes "[Tourist]";
+	mes "I'm just getting through the night with my sleeping bag!";
+	mes "It's alright as long as you can withstand the security guard's annoyance with you.";
+	close;
+}
+
+ecl_fild01,108,320,6	script	Tourist#ep14_2f4	4_F_DST_CHILD,{
+	mes "[Tourist]";
+	mes "I wonder how beautiful of a city Eclage would be.";
+	mes "It just makes my heart beat thinking about it.";
+	emotion e_lv;
+	close;
+}
+
+ecl_fild01,105,320,2	script	Tourist#ep14_2f5	4_F_FAIRYKID,{
+	mes "[Tourist]";
+	mes "No, I'm not a visitor. I'm an Eclage citizen!";
+	emotion e_an;
+	next;
+	mes "[Tourist]";
+	mes "I can't believe I can't even enter because of all these tourists!";
+	emotion e_omg;
+	close;
+}
+
+ecl_fild01,103,319,4	script	Tourist#ep14_2f6	4_M_HUMERCHANT,{
+	mes "[Tourist]";
+	mes "I hear their acorns are delicious without a hint of bitterness.";
+	next;
+	mes "[Tourist]";
+	mes "You could probably make the world's best acorn jello.";
+	emotion e_omg;
+	close;
+}
+
+ecl_fild01,110,316,2	script	Tourist#ep14_2f7	4_M_HUBOY,{
+	mes "[Tourist]";
+	mes "It's important to keep your belongings light when traveling.";
+	next;
+	mes "[Tourist]";
+	mes "It's going to increase as you go along anyways.";
+	next;
+	mes "[Tourist]";
+	mes "Perhaps you could consider it as the weight of life?";
+	emotion e_awsm,0;
+	close;
+}
+
+ecl_fild01,92,318,4	script	Tourist#ep14_2f8	4_M_RAFLE_OLD,{
+	mes "[Tourist]";
+	mes "Cool cool.";
+	close;
+}
+
+ecl_fild01,93,318,2	script	Tourist#ep14_2f9	1_M_PAY_ELDER,{
+	mes "[Tourist]";
+	mes "Snorrrreee....Erhem....";
+	next;
+	mes "[Tourist]";
+	mes "Err.... No.....";
+	mes "Curry.... Curry rice.... Snorrreeeee";
+	emotion e_hlp;
+	close;
+}
+
+ecl_fild01,94,313,4	script	Tourist#ep14_2f10	4_M_PIERROT,{
+	mes "[Tourist]";
+	mes "Oh! Are you also from Midgard?";
+	next;
+	mes "[Tourist]";
+	mes "It's encouraging to see so many Midgard people nowadays.";
+	emotion e_com;
+	close;
+}
+
+ecl_fild01,101,320,4	script	Tourist#ep14_2f11	4_M_RAFLE_OR,{
+	mes "[Tourist]";
+	mes "Ow.... My legs...";
+	mes "You're saying I have to wait after all this traveling through Bifrost?!";
+	emotion e_an;
+	close;
+}
+
+ecl_fild01,88,315,4	script	Tourist#ep14_2f12	4_WHITE_COW,{
+	mes "[Tourist]";
+	mes "Ahh...";
+	mes "Why are there so many people...?";
+	next;
+	mes "[Tourist]";
+	mes "I want to be alone......Sniff!";
+	emotion e_otl;
+	close;
+}
+
+// Generic Eclage NPCs - Set 2
+//============================================================
+ecl_fild01,183,190,4	script	Catering#eclbig	4_M_FAIRYSOLDIER,{
+	mes "[Catering]";
+	mes "Wahahaha! How do you do!";
+	mes "It's perfect weather for a picnic, no?";
+	next;
+	emotion e_wah;
+	mes "[Catering]";
+	mes "You say it's hard to pack for a picnic?";
+	next;
+	emotion e_no1;
+	mes "[Catering]";
+	mes "Don't you worry!";
+	next;
+	emotion e_gasp;
+	mes "[Catering]";
+	mes "This is a specialty combining acorns with 7 different kinds and 7 different levels of flavor collected by squirrels of Eclage!";
+	next;
+	emotion e_cash;
+	mes "[Catering]";
+	mes "This specialty to-go box is only 2,999 coins!!!";
+	next;
+	emotion e_omg;
+	mes "[Catering]";
+	mes "Such a remarkable price!";
+	next;
+	emotion e_lv;
+	mes "[Catering]";
+	mes "If you order now, we also give you a disposable fork that feels like new even with a hundred uses!";
+	close;
+}
+
+ecl_fild01,134,109,4	script	Warao#eclbig	4_M_FAIRYKID5,{
+	mes "[Warao]";
+	mes "Ah~ I'm so hungry. What should I eat today?";
+	next;
+	mes "[Warao]";
+	mes "Come to think of it, I wonder how this foreigner will taste?";
+	next;
+	emotion e_gg;
+	mes "[Warao]";
+	mes "Hey hey, you know I'm kidding, right?";
+	close;
+}
+
+ecl_fild01,70,285,4	script	Giranni#eclbig	4_F_FAIRY2,{
+	mes "[Giranni]";
+	mes "I wonder where he went. It should be around here...";
+	close;
+}
+
+eclage,106,61,4	script	Markoza#eclbig	4_M_FAIRYKID3,{
+	mes "[Markoza]";
+	mes "I also want to visit foreign lands.";
+	next;
+	mes "[Markoza]";
+	mes "But would foreigners leave me be when I am this adorable?";
+	next;
+	emotion e_pif;
+	mes "[Markoza]";
+	mes "Man, wherever I go, my cuteness just complicates everything...";
+	close;
+}
+
+eclage,101,130,5	script	Wutapoa#eclbig	4_F_FAIRY,{
+	mes "[Wutapoa]";
+	mes "I recently moved out of my parent's place!";
+	mes "I am so glad I finally have my own Yai!";
+	next;
+	mes "[Wutapoa]";
+	mes "I'm going to make it the most decorative, beautiful Yai in Eclage!";
+	next;
+	emotion e_heh;
+	mes "[Wutapoa]";
+	mes "Yay, woohoo!!!";
+	close;
+}
+
+eclage,200,272,4	script	Masione#eclbig	4_F_FAIRYKID2,{
+	mes "[Masione]";
+	mes "Whoa! Hey!";
+	mes "Would you please stop appearing out of nowhere?";
+	emotion e_omg;
+	next;
+	mes "[Masione]";
+	mes "I'm a fragile, sensitive being!";
+	close;
+}
+
+ecl_in01,55,25,3	script	Mijani#eclbig	4_F_MORAFINE1,{
+	mes "[Mijani]";
+	mes "You are not from around here?";
+	mes "Welcome.";
+	next;
+	mes "[Mijani]";
+	mes "Of course, as long as you don't disrupt Eclage.";
+	close;
+}
+
+ecl_in01,38,37,4	script	A kneeling boy#eclbig	4_F_FAIRYKID6,{
+	mes "[A kneeling boy]";
+	mes "Why am I kneeling like this?";
+	next;
+	mes "[A kneeling boy]";
+	mes "At first, it was because it was comfortable. Now it's because I can't stretch my legs out anymore.";
+	next;
+	emotion e_sob;
+	mes "[A kneeling boy]";
+	mes "I try to stretch them out, and my legs are all asleep!!";
+	mes "Does that mean I have to fly around with my legs flexed like this?";
+	close;
+}
+
+ecl_in02,168,41,2	script	Pambo#eclbig	4_F_FAIRYKID3,{
+	mes "[Pambo]";
+	mes "Do you like things that twinkle?";
+	next;
+	emotion e_lv2;
+	mes "[Pambo]";
+	mes "I love them so much!";
+	next;
+	mes "[Pambo]";
+	mes "Twinkle twinkle~ Twinkle twinkle~";
+	next;
+	mes "[Pambo]";
+	mes "Twinkle twinkle~ Twinkle twinkle~";
+	mes "Sparkle sparkle~ Sparkle sparkle~";
+	next;
+	mes "[Pambo]";
+	mes "Twinkle twinkle~ Twinkle twinkle~";
+	mes "Sparkle sparkle~ Sparkle sparkle~";
+	mes "Mmhahah~ Hahaha~ Hehehe~";
+	mes "Heh heh heh~ Huhuhe~ Hoho~";
+	mes "Kehehe~ Halala~ Fufu~";
+	next;
+	emotion e_sob;
+	mes "[Pambo]";
+	mes "But there's nothing twinkling here...";
+	close;
+}
+
+ecl_in01,41,103,1	script	A blushing girl#eclbig	4_F_FAIRYKID4,{
+	mes "[A blushing girl]";
+	mes "Do you see this balcony up top?";
+	mes "Mayor Jun appears there everytime there is an important occasion!";
+	next;
+	emotion e_lv2;
+	mes "[A blushing girl]";
+	mes "He's so handome!! Ahhh~";
+	close;
+}
+
+ecl_in01,53,92,4	script	Lafiki#eclbig	4_M_FAIRYKID3,{
+	mes "[Lafiki]";
+	mes "My fashion sense today is excellent as usual. Heh-";
+	next;
+	emotion e_lv2;
+	mes "[Lafiki]";
+	mes "Hello~ My beautiful body~";
+	mes "Every strand of hair is so beautiful!";
+	next;
+	mes "[Dandy]";
+	mes "Yes, it's definitely your garbage fashion sense that wreaks of trash as usual.";
+	emotion e_gg,0,"Dandy#eclbig";
+	close;
+}
+
+ecl_in01,54,91,2	script	Dandy#eclbig	4_M_FAIRYKID2,{
+	mes "[Dandy]";
+	mes "Take a look at me! How's this? Am I not so fabulous?";
+	next;
+	mes "[Dandy]";
+	mes "A Laphine can freely change in between different clothes, but not any Laphine looks this great!";
+	next;
+	mes "[Lafiki]";
+	mes "What nonsensical nonsense are you saying? No matter who looks at it, this region's best looker is me!";
+	emotion e_pif,0,"Lafiki#eclbig";
+	close;
+}
+
+ecl_in01,52,102,4	script	Choir Conductor#eclbig	4_M_FAIRYKID,{
+	mes "[Choir conductor]";
+	mes "We are Eclage's Tree Wing Choir~";
+	mes "We bring you heavenly harmonies~";
+	next;
+	mes "[Choir conductor]";
+	mes "Hello foreigner, we'll give you a taste of our harmony~";
+	next;
+	emotion e_ho;
+	mes "[Choir]";
+	mes "Aaa~";
+	next;
+	emotion e_ho,0,"Choir member#eclbig01";
+	mes "[Choir]";
+	mes "Aaa~~";
+	mes "Aaa~";
+	next;
+	emotion e_ho,0,"Choir member#eclbig02";
+	mes "[Choir]";
+	mes "Aaa~~~";
+	mes "Aaa~~";
+	mes "Aaa~";
+	next;
+	emotion e_ho,0,"Choir member#eclbig03";
+	mes "[Choir]";
+	mes "Aaa~~~~";
+	mes "Aaa~~~";
+	mes "Aaa~~";
+	mes "Aaa~";
+	next;
+	emotion e_ho,0,"Choir member#eclbig04";
+	mes "[Choir]";
+	mes "Aaa~~~~~";
+	mes "Aaa~~~~";
+	mes "Aaa~~~";
+	mes "Aaa~~";
+	mes "Aaa~";
+	next;
+	emotion e_ho,0,"Choir member#eclbig05";
+	mes "[Choir]";
+	mes "Aaa~~~~~~";
+	mes "Aaa~~~~~";
+	mes "Aaa~~~~";
+	mes "Aaa~~~";
+	mes "Aaa~~";
+	mes "Aaa~";
+	next;
+	emotion e_ho;
+	emotion e_ho,0,"Choir member#eclbig01";
+	emotion e_ho,0,"Choir member#eclbig02";
+	emotion e_ho,0,"Choir member#eclbig03";
+	emotion e_ho,0,"Choir member#eclbig04";
+	emotion e_ho,0,"Choir member#eclbig05";
+	mes "[Choir]";
+	mes "Uhhurukukuruhuuhhurukukuruhuuh";
+	mes "Try to feel this~ The melody that flows~";
+	next;
+	mes "[Choir conductor]";
+	mes "How is it!! Our harmony!!";
+	close;
+}
+
+ecl_in01,51,103,4	script	Choir member#eclbig01	4_M_FAIRYKID,{
+	mes "[Choir member]";
+	mes "Aaa~";
+	emotion e_ho;
+	close;
+}
+ecl_in01,53,103,4	duplicate(Choir member#eclbig01)	Choir member#eclbig02	4_M_FAIRYKID
+ecl_in01,50,104,4	duplicate(Choir member#eclbig01)	Choir member#eclbig03	4_M_FAIRYKID
+ecl_in01,52,104,4	duplicate(Choir member#eclbig01)	Choir member#eclbig04	4_M_FAIRYKID
+ecl_in01,54,104,4	duplicate(Choir member#eclbig01)	Choir member#eclbig05	4_M_FAIRYKID
+
+// Generic Eclage NPCs - Set 3
+//============================================================
+ecl_fild01,190,93,4	script	Fili#1	4_M_FAIRYANG,{
+	mes "[Fili]";
+	mes "Looking at this beautiful field, the song sings itself~";
+	emotion e_ho;
+	close;
+}
+
+ecl_fild01,83,263,4	script	Watering Laphine#1	4_M_FAIRYKID3,{
+	mes "[Watering Laphine]";
+	mes "I think the earth is running dry.";
+	close;
+}
+
+ecl_fild01,163,196,4	script	Dancing Laphine#1	4_F_FAIRYKID3,{
+	mes "[Dancing Laphine]";
+	mes "It's important to warm up like this before you start dancing. One, two, three, four....";
+	close;
+}
+
+// Eclage Prison & Clinic
+//============================================================
+ecl_in01,8,71,4	script	Eclage Guard#pri_inn	4_M_FAIRYSOLDIER,{
+	mes "[Eclage Guard]";
+	mes "This path will take you to the lower parts of Eclage. You'll find a prison and a clinic there.";
+	close;
+}
+
+ecl_in02,96,22,2	script	Sign#prison_inn	2_BOARD1,{
+	mes "[North] Prison";
+	mes "[West] Clinic";
+	close;
+}
+
+ecl_in02,164,56,2	script	Receptionist#Laphine	4_F_FAIRYKID2,{
+	mes "[Receptionist]";
+	mes "Welcome to Eclage Clinic.";
+	next;
+	switch(select("Save Location:Rest:Finish the conversation")) {
+	case 1:
+		mes "[Receptionist]";
+		mes "Clinic has been set as your save point. Be careful though~";
+		savepoint "ecl_in02",162,49;
+		close;
+	case 2:
+		mes "[Receptionist]";
+		mes "Restore your mind and body at our clinic. It's filled with Eclage's clean energy.";
+		mes "We charge 1 Splendide Coin normally, but we offer a special discount for travelers. Your total is 5,000 zeny.";
+		next;
+		switch(select("Pay with Splendide Coin:Pay with Zeny:Forget it")) {
+		case 1:
+			if (countitem(6081) == 0) {
+				mes "[Receptionist]";
+				mes "It seems like you don't have enough coins. Would you check your account again, please?";
+				close;
+			}
+			delitem 6081,1; //Splendide_Coin
+			break;
+		case 2:
+			if (Zeny < 5000) {
+				mes "[Receptionist]";
+				mes "It seems like you don't have enough zeny. Would you check your account again, please?";
+				close;
+			}
+			Zeny -= 5000;
+			break;
+		case 3:
+			close;
+		}
+		mes "[Receptionist]";
+		mes "Make yourself at home~";
+		close2;
+		percentheal 100,100;
+		warp "ecl_in02",167,49;
+		end;
+	case 3:
+		close;
+	}
+}
+
+ecl_in02,137,44,2	script	Doctor Laphine#doctor	4_M_FAIRYKID,{
+	mes "[Injured Laphine]";
+	mes "Ooww...";
+	mes "Where...am...I?";
+	next;
+	mes "[Doctor]";
+	mes "You're at a clinic. Don't worry.";
+	mes "We stopped the bleeding and casted emergency spells.";
+	mes "You were bleeding a lot. That was close, you know.";
+	next;
+	mes "[Injured Laphine]";
+	mes "......";
+	mes "What, no, I...I don't feel anything...what's going on?";
+	next;
+	mes "[Doctor]";
+	mes "Umm...the arrow damaged your wing pretty badly...";
+	next;
+	mes "[Injured Laphine]";
+	mes "...what do you mean??";
+	next;
+	mes "[Doctor]";
+	mes "Well...I was going to tell you after you recover, but you should know. You can't decorate the Yai anymore.";
+	mes "In other words, you injured your wing. The arrow went through the most critical part in the wing.";
+	next;
+	mes "[Injured Laphine]";
+	mes "What? No way...please...doctor!! No!!";
+	close;
+}
+ecl_in02,135,45,4	duplicate(Doctor Laphine#doctor)	Injured Laphine	4_F_FAIRYKID6
diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt
index 24390f070..7e37f9de2 100644
--- a/npc/re/cities/izlude.txt
+++ b/npc/re/cities/izlude.txt
@@ -1,98 +1,105 @@
 //===== Hercules Script ======================================
 //= Izlude Town Renewal
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Masao
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= [Official Conversion]
 //= Izlude town NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. Still missing many new NPCs and their dialogues. [Masao]
-//= 1.1 Added bullet NPC duplicates. [Euphy]
-//= 1.2 Added new NPCs, Captain Carew & coordinates  [Streusel]
-//= 1.3 Added some NPC locations [Streusel]
+//= 1.1 Updated to match the official script. [Euphy]
+//= 1.2 Added Channel Warper and Izlude duplicates. [Euphy]
 //============================================================
 
-izlude,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude	100
-izlude,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude	90
-izlude,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude	91
-izlude,174,164,3	duplicate(Cuskoal_izlude)	Cuskoal#izlude	124
-izlude,85,103,4	duplicate(Dega_izlude)	Dega#izlude	84
-izlude,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude	97
-izlude,56,156,2	duplicate(Red_izlude)	Red#izlude	85
-izlude,58,156,2	duplicate(Cebalis_izlude)	Cebalis#izlude	98
-izlude,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude	105
-izlude,158,130,3	duplicate(bdt)	Bullet Dealer Tony#iz	86
-izlude,155,132,3	duplicate(mdk)	Magazine Dealer Kenny	83
-//izlude,198,213,4	duplicate(Captain_Carew)	Captain Carew#izlude	873
-izlude_in,57,92,3	duplicate(Dorian)	Dorian#izlude	878	
-izlude,147,131,6	script	Blacksmith#izlude	726,{
-	end;
-}
-
-prt_fild08,350,219,4	script	Guard#izlude	105,{
-	mes "[Izlude Guard]";
-	mes "Welcome to Izlude.";
-	close;
-}
-
-izlude,136,160,0	script	Traces of Fish#izlude	111,{
-	mes "There are signs of someone digging.";
-	close;
-}
+// Izlude
+//============================================================
+izlude,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude	4W_SAILOR
+izlude_a,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_a	4W_SAILOR
+izlude_b,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_b	4W_SAILOR
+izlude_c,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_c	4W_SAILOR
+izlude_d,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_d	4W_SAILOR
 
-izlude,207,167,3	script	Arena#izlude	858,{
-	mes "";
-	close;
-}
+izlude,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude	4_F_01
+izlude_a,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_a	4_F_01
+izlude_b,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_b	4_F_01
+izlude_c,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_c	4_F_01
+izlude_d,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_d	4_F_01
 
-izlude,45,94,3	script	Milestone#izlude	858,{
-	mes "==== Information  ====";
-	mes "";
-	mes "Access to Prontera Field.";
-	mes "Prontera in the North.";
-	mes "If you wish got to Prontera.";
-	close;
-}
+izlude,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude	4_F_02
+izlude_a,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_a	4_F_02
+izlude_b,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_b	4_F_02
+izlude_c,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_c	4_F_02
+izlude_d,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_d	4_F_02
 
-izlude,179,75,3	script	Non-Process#izlude	858,{
-	mes "====End of Path====";
-	mes "";
-	mes "Airshop to Rachel";
-	mes "";
-	mes "Feel free to explore, however be reminded that you are a guest.";
-	mes "";
-	close;
-}
+izlude,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude	4_F_TELEPORTER
+izlude_a,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_a	4_F_TELEPORTER
+izlude_b,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_b	4_F_TELEPORTER
+izlude_c,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_c	4_F_TELEPORTER
+izlude_d,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_d	4_F_TELEPORTER
 
-izlude,141,251,1	script	Full-Grown Red Plant#iz	1078,{
-	end;
-}
+izlude,85,103,4	duplicate(Dega_izlude)	Dega#izlude	4_M_02
+izlude_a,85,103,4	duplicate(Dega_izlude)	Dega#izlude_a	4_M_02
+izlude_b,85,103,4	duplicate(Dega_izlude)	Dega#izlude_b	4_M_02
+izlude_c,85,103,4	duplicate(Dega_izlude)	Dega#izlude_c	4_M_02
+izlude_d,85,103,4	duplicate(Dega_izlude)	Dega#izlude_d	4_M_02
 
-izlude,102,150,1	script	Sinchon Helper#izlude	71,{
-	end;
-}
+izlude,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude	4W_M_01
+izlude_a,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_a	4W_M_01
+izlude_b,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_b	4W_M_01
+izlude_c,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_c	4W_M_01
+izlude_d,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_d	4W_M_01
 
-izlude,205,155,2	script	Nain#izlude	102,{
-	mes "[Nine]";
-	mes "Swords, no matter how strong";
-	mes "they are once they strike you're";
-	mes "a dead man. And though that's creepy,";
-	mes "I just can't throw them away.";
-	close;
-}
+izlude,57,159,2	duplicate(Red_izlude)	Red#izlude	4_M_03
+izlude_a,57,159,2	duplicate(Red_izlude)	Red#izlude_a	4_M_03
+izlude_b,57,159,2	duplicate(Red_izlude)	Red#izlude_b	4_M_03
+izlude_c,57,159,2	duplicate(Red_izlude)	Red#izlude_c	4_M_03
+izlude_d,57,159,2	duplicate(Red_izlude)	Red#izlude_d	4_M_03
 
-izlude,143,205,7	script	Magpies Adventurer#iz-01	703,{
-	end;
-}
+izlude,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude	4W_M_02
+izlude_a,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_a	4W_M_02
+izlude_b,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_b	4W_M_02
+izlude_c,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_c	4W_M_02
+izlude_d,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_d	4W_M_02
 
+izlude,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude	8W_SOLDIER
+izlude_a,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_a	8W_SOLDIER
+izlude_b,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_b	8W_SOLDIER
+izlude_c,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_c	8W_SOLDIER
+izlude_d,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_d	8W_SOLDIER
 
-izlude,146,205,7	script	Magpies Adventurer#iz-02	706,{
-	end;
+-	script	::Guard_izlude	-1,{
+	mes "[Izlude Guard]";
+	mes "Welcome to Izlude.";
+	close;
 }
+prt_fild08,350,219,4	duplicate(Guard_izlude)	Guard#izlude	8W_SOLDIER
+prt_fild08a,350,219,4	duplicate(Guard_izlude)	Guard#izlude_a	8W_SOLDIER
+prt_fild08b,350,219,4	duplicate(Guard_izlude)	Guard#izlude_b	8W_SOLDIER
+prt_fild08c,350,219,4	duplicate(Guard_izlude)	Guard#izlude_c	8W_SOLDIER
+prt_fild08d,350,219,4	duplicate(Guard_izlude)	Guard#izlude_d	8W_SOLDIER
 
-izlude,120,254,0	script	Siege Monument#izlude	111,{
-	end;
+// Channel Warper
+//============================================================
+function	script	F_IzludeChannel	{
+	mes "[Izlude Copy Warper]";
+	mes "Izlude is a verly lively place is it not?";
+	mes "I am here to help make Izlude feel more smooth!";
+	mes "I can send you to another copy of Izlude.";
+	mes "Do you want to go to another copy?";
+	next;
+	set .@i, select(getarg(0)+":Never mind");
+	if (.@i < 6) {
+		setarray .@maps$[1],"izlude","izlude_a","izlude_b","izlude_c","izlude_d";
+		savepoint .@maps$[.@i],128,98;
+		warp .@maps$[.@i],128,98;
+		end;
+	}
+	close;
 }
+izlude,122,105,5	script	Izlude Copy Warper	1_M_WIZARD,{ callfunc "F_IzludeChannel",":Go to copy 2:Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_a,122,105,5	script	Izlude Copy Warper#_a	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1::Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_b,122,105,5	script	Izlude Copy Warper#_b	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2::Go to copy 4:Go to copy 5"; }
+izlude_c,122,105,5	script	Izlude Copy Warper#_c	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3::Go to copy 5"; }
+izlude_d,122,105,5	script	Izlude Copy Warper#_d	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3:Go to copy 4:"; }
diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt
index a4b584d3a..61f27341c 100644
--- a/npc/re/cities/jawaii.txt
+++ b/npc/re/cities/jawaii.txt
@@ -3,14 +3,18 @@
 //===== By: ==================================================
 //= Daegaladh, Masao
 //===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules GIT
+//= 1.2
 //===== Description: =========================================
+//= [Official Conversion]
 //= Jawaii town NPCs.
 //===== Additional Comments: =================================
-//= 1.0 First Version. Renewal coordinates [Masao]
-//= 1.1 Changed to Official coordinates [Streusel]
+//= 1.0 First Version. Renewal coordinates by Masao.
+//= 1.1 Moved "Honeymoon Helper" NPC.
+//= 1.2 Added Izlude duplicates. [Euphy]
 //============================================================
 
-izlude,180,224,6	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Izlude	71
\ No newline at end of file
+izlude,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Izlude	1_F_LIBRARYGIRL
+izlude_a,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_a	1_F_LIBRARYGIRL
+izlude_b,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_b	1_F_LIBRARYGIRL
+izlude_c,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_c	1_F_LIBRARYGIRL
+izlude_d,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_d	1_F_LIBRARYGIRL
diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt
index 0ee7ca8be..e8cfdb615 100644
--- a/npc/re/cities/malangdo.txt
+++ b/npc/re/cities/malangdo.txt
@@ -1,20 +1,22 @@
 //===== Hercules Script ======================================
 //= Malangdo Town
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
 //= Malangdo Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [Euphy]
 //= 1.1 Added entrance scripts.
-//= 1.2 Added Official coordinates for Odgnalam [Streusel]
+//= 1.2 Moved "Odgnalam" coordinates.
+//= 1.3 Fixed dialogues.
+//= 1.4 Dialogue edits, source iRO.
+//= 1.5 Added Izlude duplicates.
 //============================================================
 
-// Entrance :: malangdo_go
+// Malangdo Transportation :: malangdo_go
 //============================================================
 -	script	Dolangmal	-1,{
 	if (checkquest(5091) == -1) {
@@ -145,44 +147,43 @@
 		close;
 	}
 }
-prontera,114,77,6	duplicate(Dolangmal)	Dolangmal#1	553
-geffen,109,61,6	duplicate(Dolangmal)	Dolangmal#2	553
-payon,200,106,4	duplicate(Dolangmal)	Dolangmal#3	553
-aldebaran,170,104,4	duplicate(Dolangmal)	Dolangmal#4	553
-morocc,168,275,4	duplicate(Dolangmal)	Dolangmal#5	553
-yuno,165,122,4	duplicate(Dolangmal)	Dolangmal#6	553
-rachel,121,126,4	duplicate(Dolangmal)	Dolangmal#7	553
-lighthalzen,254,83,5	duplicate(Dolangmal)	Dolangmal#8	553
-mora,57,150,4	duplicate(Dolangmal)	Dolangmal#9	553
+prontera,114,77,6	duplicate(Dolangmal)	Dolangmal#1	4_CAT_DOWN
+geffen,109,61,6	duplicate(Dolangmal)	Dolangmal#2	4_CAT_DOWN
+payon,200,106,4	duplicate(Dolangmal)	Dolangmal#3	4_CAT_DOWN
+aldebaran,170,104,4	duplicate(Dolangmal)	Dolangmal#4	4_CAT_DOWN
+morocc,168,275,4	duplicate(Dolangmal)	Dolangmal#5	4_CAT_DOWN
+yuno,165,122,4	duplicate(Dolangmal)	Dolangmal#6	4_CAT_DOWN
+rachel,121,126,4	duplicate(Dolangmal)	Dolangmal#7	4_CAT_DOWN
+lighthalzen,254,83,5	duplicate(Dolangmal)	Dolangmal#8	4_CAT_DOWN
+mora,57,150,4	duplicate(Dolangmal)	Dolangmal#9	4_CAT_DOWN
 
-
-izlude,182,218,4	script	Odgnalam#iz	554,{
-	mes "This cat is sleeping in the warm "+strnpcinfo(2)+" sun.";
+-	script	::Odgnalam	-1,{
+	mes "This cat is sleeping in the warm "+((strnpcinfo(2) == "albe")?"Alberta":"Izlude")+" sun.";
 	next;
 	if(select("Let him sleep:Talk to him") == 1) close;
 	mes "[Odgnalam]";
-	mes "Meow? Uh?";
+	mes "Meow? Huh?";
 	next;
 	if (ep13_yong1 == 0) {
 		set .@price,1000;
-		set .@s1$,"Huh!! You are such an annoying person. Let me send you to the heaven of the cat, ^A2314BMalangdo^000000 with ^0000FF1000 Zeny^000000.";
+		set .@s1$,"Huh! You are so annoying. Let me send you to ^A2314BMalangdo^000000 for ^0000FF1000 Zeny^000000.";
 		set .@s2$,"Money? Where is the money? You can't go anywhere without the money. Shame on you.";
 	} else if (ep13_yong1 < 60) {
 		set .@price,999;
-		set .@s1$,"You have a little relationship with fleet of cat. I'll give you special discount price ^0000FF999 Zeny^000000 to the heaven of the cat, ^A2314BMalangdo^000000, because you have relationship with fleet.";
+		set .@s1$,"You have a little relationship with fleet of cat. I'll give you special discount price ^0000FF999 Zeny^000000 to ^A2314BMalangdo^000000, because you have relationship with fleet.";
 		set .@s2$,"Where is the money? You don't have a sense of honor.";
 	} else if (ep13_yong1 > 59 && ep13_yong1 < 80) {
 		set .@price,500;
-		set .@s1$,"You gave several help to our cat's fleet so let me give you special that with 50% discount price ^0000FF500 Zeny^000000. I'll send you to the heaven of the cat, ^A2314BMalangdo^000000.";
+		set .@s1$,"You gave several help to our cat's fleet so let me give you special that with 50% discount price ^0000FF500 Zeny^000000. I'll send you to ^A2314BMalangdo^000000.";
 		set .@s2$,"You don't have any money for paying 50% discount price? I can't believe it.";
 	} else {
 		mes "[Odgnalam]";
 		mes "You are a hero of cat's fleet. Your activity is the legend between us.";
 		next;
 		mes "[Odgnalam]";
-		mes "As you are a hero of the cat fleet let me send you to ^A2314BMeow Meow Island^000000 for free.";
+		mes "As you are a hero of the cat fleet let me send you to ^A2314BMalangdo^000000 for free.";
 		next;
-		if(select("Send me to Meow Meow Island!:Do not go.") == 1) {
+		if(select("Send me to Malangdo!:Do not go.") == 1) {
 			mes "[Odgnalam]";
 			mes "Have a comfortable trip... Alright let's go~";
 			warp "malangdo",217,85;
@@ -192,21 +193,26 @@ izlude,182,218,4	script	Odgnalam#iz	554,{
 	mes "[Odgnalam]";
 	mes .@s1$;
 	next;
-	if(select("Send me to Meow Meow Island!:Do not go.") == 2) close;
+	if(select("Send me to Malangdo!:Do not go.") == 2) close;
 	if (Zeny < .@price) {
 		mes "[Odgnalam]";
 		mes "Money? Where is the money? You can't go anywhere without the money. Shame on you.";
 		close;
 	}
-	set Zeny, Zeny - .@price;
+	Zeny -= .@price;
 	mes "[Odgnalam]";
 	mes "Let me send you right away. Let's go~";
 	warp "malangdo",217,85;
 	close;
 }
-alberta,200,151,4	duplicate(Odgnalam#iz)	Odgnalam#Alberta	554
+alberta,200,151,4	duplicate(Odgnalam)	Odgnalam#albe	4_CAT_REST
+izlude,182,218,4	duplicate(Odgnalam)	Odgnalam#iz	4_CAT_REST	// Old coordinates: (182,192)
+izlude_a,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_a	4_CAT_REST
+izlude_b,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_b	4_CAT_REST
+izlude_c,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_c	4_CAT_REST
+izlude_d,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_d	4_CAT_REST
 
-malangdo,219,86,4	script	Kong#malang	545,{
+malangdo,219,86,4	script	Kong#malang	4_CAT_SAILOR2,{
 	mes "[Kong]";
 	mes "Did you have fun in Malangdo?";
 	mes "The fleet has a service to Izlude and Alberta.";
@@ -258,7 +264,7 @@ malangdo,219,86,4	script	Kong#malang	545,{
 	if (ep13_yong1 > 80) {
 		mes "Have a comfortable trip.";
 		if (.@i == 1)
-			warp "izlude",195,212;
+			warp "izlude",195,212; // Old coordinates: (194,180)
 		else
 			warp "alberta",192,150;
 		close;
@@ -267,7 +273,7 @@ malangdo,219,86,4	script	Kong#malang	545,{
 		mes .@no_money$;
 		close;
 	}
-	set Zeny, Zeny - .@price;
+	Zeny -= .@price;
 	mes .@yes_money$;
 	if (.@i == 1)
 		warp "izlude",195,212;
@@ -276,18 +282,19 @@ malangdo,219,86,4	script	Kong#malang	545,{
 	close;
 }
 
-// Town NPCs :: malang_tre
+// Generic Malangdo NPCs :: malang_tre
 //============================================================
-malangdo,147,117,3	script	Innkeeper#malang	554,{
+malangdo,147,117,3	script	Innkeeper#malang	4_CAT_REST,{
 	mes "You see a lazy cat standing on a chair.";
 	mes "You guess that this is the Innkeeper.";
 	next;
-	switch(select("Umm... can I rest here?:Psst... can I save here?:Leave.")) {
+	switch(select("Umm... Can I rest here?:Psst... Can I save here?:Leave.")) {
 	case 1:
 		mes "[Innkeeper]";
-		mes "You can use the hammock as you want, but give me ^FF00005 Malangdo Canned Specialties^000000. Then you can relax.";
+		mes "Eh?";
+		mes "Uh, sure you can use this hammock if you give me ^FF00005 Malangdo Cans^000000.";
 		next;
-		switch(select("Give the cans.:No need.")) {
+		switch(select("Here you go.:Never mind.")) {
 		case 1:
 			if (countitem(12636) > 4) {
 				delitem 12636,5; //Malang_Sp_Can
@@ -301,11 +308,11 @@ malangdo,147,117,3	script	Innkeeper#malang	554,{
 				close;
 			}
 			mes "[Innkeeper]";
-			mes "It looks like a lack of cans.";
+			mes "This ain't no charity.";
 			close;
 		case 2:
 			mes "[Innkeeper]";
-			mes "You are stronger than your appearance.";
+			mes "Let me know if you want to relax.";
 			close;
 		}
 	case 2:
@@ -315,27 +322,28 @@ malangdo,147,117,3	script	Innkeeper#malang	554,{
 		close;
 	case 3:
 		mes "[Innkeeper]";
-		mes "A busy moment makes you hurry and laziness makes you lazy.";
+		mes "Sometimes you just have to relax.";
 		next;
-		mes "- Wonder if there is work time. -";
+		mes "- Wow, this is the laziest cat ever. -";
 		close;
 	}
 	close;
 }
 
-malangdo,151,120,3	script	Wandering Minstrel#mal	479,{
-	mes "[Wandering Minstrel]";
+malangdo,151,120,3	script	Minstrel#mal	4_M_MINSTREL,{
+	mes "[Minstrel]";
 	mes "Boy, that lazy cat makes me want to just nap all day long.";
 	next;
-	mes "[Wandering Minstrel]";
-	mes "He makes life look so simple";
+	mes "[Minstrel]";
+	mes "He makes life look so simple.";
 	close;
 }
 
-malangdo,149,120,5	script	Wandering Wanderer#mal	485,5,1,{
-	mes "[Wandering Wanderer]";
-	mes "Cats living in here is so energetic.";
-	mes "And it makes me dance~";
+malangdo,149,120,5	script	Wanderer#mal	4_F_WANDERER,5,1,{
+	mes "[Wanderer]";
+	mes "The cats living in here are so energetic.";
+	mes "Is it weird that they make me want to dance all day?";
+	mes "La di dah di dah~!";
 	close;
 OnTouch:
 	switch(rand(5)) {
@@ -351,7 +359,7 @@ OnTouch:
 	case 3:
 		soundeffect "assassin_of_sunset.wav",0;
 		break;
-	case 4: 
+	case 4:
 		emotion e_ho;
 		emotion e_ho,0,"Wandering Minstrel#mal";
 		break;
@@ -359,34 +367,67 @@ OnTouch:
 	end;
 }
 
-malangdo,216,168,3	script	Cat Trainer#mal1	558,0,8,{
+malangdo,216,168,3	script	Cat Trainer#mal1	4_F_ALCHE_A,0,8,{
 	emotion e_awsm;
 	mes "[Cat Trainer]";
-	mes "Phh there is a tail and butt both soft and tender!";
-	mes "Can't stand, this is heaven~~!!";
+	mes "Ooo~ their soft puffy tails and soft fur~";
+	mes "I can't stand it, this is heaven~~!!";
 	next;
 	emotion e_gg;
 	mes "[Cat Trainer]";
-	mes "My hidden card, ^FF0000<Silvervine Fruit>^000000, can make all cats in Malangdo my slaves~ haha!";
+	mes "My hidden card, ^FF0000Silvervine Fruit^000000, can make all cats in Malangdo my slaves~ haha!";
 	next;
-	select("^FF0000<Silvervine Fruit>^000000?");
+	select("^FF0000Silvervine Fruit^000000?");
 	mes "[Cat Trainer]";
-	mes "Silvervine Fruit is a rare item!";
+	mes "It is such a rare item!";
 	mes "I can barely get it.";
-	mes "But every cat loves it with no complaints.";
+	mes "But these cudly cats can't resist it~";
 	next;
-	select("Where can I get ^FF0000<Silvervine Fruit>^000000?");
+	select("Where can I get ^FF0000Silvervine Fruit^000000?");
 	mes "[Cat Trainer]";
-	mes "How would I know if I could barely find it?";
-	mes "This can't be taken even with ^3131FFall the zeny in this world^000000!";
+	mes "Why would I tell you when I can barely get it?";
+	mes "I wouldn't even tell you for all the zeny in the world~!";
 	next;
 	emotion e_gg;
 	mes "[Cat Trainer]";
-	mes "The cats in Malangdo are mine...! As it should be, haha~";
-	mes "^FF0000<Silvervine Fruit>^000000! I can be a king in Malangdo~ ohhhh!!!";
+	mes "All the Malangdo cats are mine~!";
+	mes "Muahahahaha~";
+	mes "With enough ^FF0000Silvervine Fruit^000000 I can be a queen in Malangdo~ ohhhh!!!";
 	close;
 OnTouch:
 	emotion e_flash;
 	end;
 }
-malangdo,164,203,3	duplicate(Cat Trainer#mal1)	Cat Trainer#mal2	853,5,8
\ No newline at end of file
+
+malangdo,164,203,3	script	Cat Trainer#mal2	4_M_YURI,{
+	emotion e_awsm;
+	mes "[Cat Trainer]";
+	mes "Ooo~ their soft puffy tails and soft fur~";
+	mes "I can't stand it, this is heaven~~!!";
+	next;
+	emotion e_gg;
+	mes "[Cat Trainer]";
+	mes "This is my little secret called";
+	mes "^FF0000Silvervine Fruit^000000. I can use";
+	mes "it to make the Malangdo cats my";
+	mes "slaves~ muahahahaha~!";
+	next;
+	select("^FF0000Silvervine Fruit^000000?");
+	mes "[Cat Trainer]";
+	mes "Hmm, I guess it's no wonder you don't know.";
+	mes "These Malangdo cats can't resist it.";
+	mes "But it's too rare of an item to get so you shouldn't bother trying to find it.";
+	next;
+	select("Where can I get ^FF0000Silvervine Fruit^000000?");
+	mes "[Cat Trainer]";
+	mes "Actually, it's simple. You just...";
+	next;
+	mes "[Cat Trainer]";
+	mes "Hey, you almost made me tell my secret.";
+	next;
+	emotion e_gg;
+	mes "[Cat Trainer]";
+	mes "One day these cats will be mine.";
+	mes "I can be a king in Malangdo~ ohhh~!";
+	close;
+}
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index 3daff8526..da19e67c5 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -1,85 +1,58 @@
-//===== Hercules Script ======================================= 
-//= Port Malaya NPC's
-//===== By: ================================================== 
-//= Masao
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= Many Port Malaya NPC's & Quests.
-//===== Additional Comments: ================================= 
-//= 1.0 First Version.
-//============================================================ 
-
-malaya,276,55,4	script	Optamara Crew#malaya	100,{
-
-	if (malaya_hi < 10) {
-		mes "[Optamara Crew]";
-		mes "I think the village is still busy. Done with your visit? There is always a ship heading for Alberta.";
-		next;
-	}
-	else if ((malaya_hi > 9) && (malaya_hi < 20)) {
-		mes "[Optamara Crew]";
-		mes "I think a nameless adventurer helped take a load off the villagers mind. Yahoo! Would you like to go back to Alberta?";
-		next;
-	}
-	else {
-		mes "[Optamara Crew]";
-		mes "Would you like to go back to Alberta with me?";
-		next;
-	}
-	switch (select("Return.:Do not return.")) {
-	case 1:
-		mes "[Optamara Crew]";
-		mes "Great! Lets leave now for Alberta!!";
-		close2;
-		warp "alberta",239,68;
-		end;
-	case 2:
-		mes "[Optamara Crew]";
-		mes "Thats okay. Come here if you ever want to go back to Alberta.";
-		close;
-	}
-}
-
-alberta,237,71,3	script	Optamara Crew#alberta	100,{
-
+//===== Hercules Script ======================================
+//= Port Malaya
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Port Malaya Town Script
+//===== Additional Comments: =================================
+//= 0.1 Alberta sailors only. [Euphy]
+//= 0.2 Adapted from Masao's conversion.
+//= 1.0 Added remaining NPCs.
+//= 1.1 Added Jeepney script. [DeadlySilence]
+//============================================================
+
+// Port Malaya Transportation
+//============================================================
+// Old coordinates: alberta (237,71)
+alberta,196,202,3	script	Optamara Crew#alberta	4W_SAILOR,{
 	mes "[Optamara Crew]";
 	mes "Hey, there!";
-	mes "Its 10,000 Zeny to go to Port Malaya. Interested?";
+	mes "It's 10,000 Zeny to go to Port Malaya. Interested?";
 	next;
-	switch (select("About Port Malaya:Go to Port Malaya.:Cancel.")) {
+	switch(select("About Port Malaya.:Go to Port Malaya.:Cancel.")) {
 	case 1:
 		mes "[Optamara Crew]";
 		mes "Port Malaya is a small village you could reach by sailing southwest from Alberta.";
 		next;
 		mes "[Optamara Crew]";
-		mes "I couldnt visit the village because they had some issues there but now it seems all is clear!";
+		mes "I couldn't visit the village because they had some issues there but now it seems all is clear!";
 		next;
 		mes "[Optamara Crew]";
-		mes "I dont know for sure but it was a village that's like a comfortable and cozy park.";
+		mes "I don't know for sure but it was a village that's like a comfortable and cozy park.";
 		next;
 		mes "[Optamara Crew]";
 		mes "I was this close to not coming back to cozy Alberta again.";
 		next;
 		mes "[Optamara Crew]";
-		mes "Im sure youll feel the same once you reach Port Malaya.";
+		mes "I'm sure you'll feel the same once you reach Port Malaya.";
 		close;
 	case 2:
-		if (Zeny > 9999) {
-			set Zeny, Zeny - 10000;
+		if (Zeny < 10000) {
 			mes "[Optamara Crew]";
-			mes "Great!";
-			mes "Heading for Port Malaya!!";
-			close2;
-			warp "Malaya",271,55;
-			end;
+			mes "Oh God!!";
+			mes "You don't know how far it is from here. Of course it's not free. Please come back with 10,000 Zeny. Sorry!";
+			close;
 		}
 		mes "[Optamara Crew]";
-		mes "Oh God!!";
-		mes "You dont know how far it is from here. Of course its not free. Please come back with 10,000 Zeny. Sorry!";
-		close;
+		mes "Great!";
+		mes "Heading for Port Malaya!!";
+		Zeny -= 10000;
+		close2;
+		warp "malaya",271,55;
+		end;
 	case 3:
 		mes "[Optamara Crew]";
 		mes "Adventurers these days act like they are busy. Come back when you have the time and we could go visit Port Malaya together.";
@@ -87,20 +60,47 @@ alberta,237,71,3	script	Optamara Crew#alberta	100,{
 	}
 }
 
-ma_in01,30,94,4	script	Inn Keeper#ma	583,{
+malaya,276,55,4	script	Optamara Crew#malaya	4W_SAILOR,{
+	if (malaya_hi < 10) {
+		mes "[Optamara Crew]";
+		mes "I think the village is still busy. Done with your visit? There is always a ship heading for Alberta.";
+		next;
+	} else if (malaya_hi < 20) {
+		mes "[Optamara Crew]";
+		mes "I think a nameless adventurer helped take a load off the villagers' minds. Yahoo! Would you like to go back to Alberta?";
+		next;
+	} else {
+		mes "[Optamara Crew]";
+		mes "Would you like to go back to Alberta with me?";
+		next;
+	}
+	switch(select("Return.:Do not return.")) {
+	case 1:
+		mes "[Optamara Crew]";
+		mes "Great! Let's leave now for Alberta!!";
+		close2;
+		warp "alberta",239,68;
+		end;
+	case 2:
+		mes "[Optamara Crew]";
+		mes "That's okay. Come here if you ever want to go back to Alberta.";
+		close;
+	}
+}
 
+// Generic Port Malaya NPCs
+//============================================================
+ma_in01,30,94,4	script	Inn Keeper#ma	4_F_MALAYA,{
 	if (malaya_hi < 10) {
 		mes "[Inn Keeper]";
 		mes "Oh my! Visiting?";
-		mes "What bad timing. The village is a bit unorganized at the moment so Im actually closed. Sorry.";
+		mes "What bad timing. The village is a bit unorganized at the moment so I'm actually closed. Sorry.";
 		close;
-	}
-	else if ((malaya_hi > 9) && (malaya_hi < 20)) {
+	} else if (malaya_hi < 20) {
 		mes "[Inn Keeper]";
 		mes "So you are the adventurer villagers are talking about? I reopened my inn thanks to you. Thank you.";
 		next;
-	}
-	else {
+	} else {
 		mes "[Inn Keeper]";
 		mes "Welcome.";
 		mes "This is Port Malaya's best inn, 'Cabin in the City'.";
@@ -109,7 +109,7 @@ ma_in01,30,94,4	script	Inn Keeper#ma	583,{
 	mes "[Inn Keeper]";
 	mes "Come for a rest? Lodging will be 5,000 Zeny.";
 	next;
-	switch (select("Store.:Lodge. - 5,000z:Cancel.")) {
+	switch(select("Store.:Lodge. - 5,000z:Cancel.")) {
 	case 1:
 		mes "[Inn Keeper]";
 		mes "Successfully stored. See you next time.";
@@ -117,14 +117,14 @@ ma_in01,30,94,4	script	Inn Keeper#ma	583,{
 		close;
 	case 2:
 		if (Zeny < 5000) {
-		mes "[Inn Keeper]";
-		mes "Sorry. I think you are a bit short.";
-		close;
+			mes "[Inn Keeper]";
+			mes "Sorry. I think you are a bit short.";
+			close;
 		}
 		mes "[Inn Keeper]";
 		mes "Hope you enjoy your stay.";
 		close2;
-		set Zeny, Zeny - 5000;
+		Zeny -= 5000;
 		percentheal 100,100;
 		warp "ma_in01",43,98;
 		end;
@@ -133,867 +133,151 @@ ma_in01,30,94,4	script	Inn Keeper#ma	583,{
 	}
 }
 
-ma_fild01,166,214,6	script	Old Man in Dilemma#GA	575,{
-
-	if (MaxWeight - Weight < 600 || checkweight(1201,1) == 0) {
-		mes "Cannot proceed because you have too many items in your possession.";
-		close;
-	}
-	mes "[Old Man in Dilemma]";
-	mes "Oh! Demons are gaining more and more power in this world.";
-	next;
-	switch (select("We need to gather items to fight them off.:Ignore.")) {
-	case 1:
-		if ((countitem(6497) > 2) && (Zeny > 999)) {
-			mes "[Old Man in Dilemma]";
-			mes "You dont seem to be strong enough to fight off demons.";
-			next;
-			mes "[Old Man in Dilemma]";
-			mes "Will you create a Greater Agimat of Ancient Spirit with 3 Lesser Agimats and 1,000 Zeny?";
-			next;
-			switch (select("Create.:No, thank you.")) {
-			case 1:
-				if ((countitem(6497) > 2) && (Zeny > 999)) {
-					specialeffect2 EF_CONE;
-					specialeffect EF_FORESTLIGHT2;
-					set Zeny, Zeny - 1000;
-					getitem 12775,1; //Ancient_Spirit_Amulet
-					mes "[Old Man in Dilemma]";
-					mes "Hope you win the fight with the demon.";
-					close;
-				}
-				mes "[Old Man in Dilemma]";
-				mes "Short on materials.";
-				close;
-			case 2:
-				mes "[Old Man in Dilemma]";
-				mes "Hope you win the fight with the demon.";
-				close;
-			}
-		}
-		mes "[Old Man in Dilemma]";
-		mes "Cant make it now but there is an old way of making it handed down by generations.";
-		next;
-		mes "[Old Man in Dilemma]";
-		mes "You need to call upon the power of Ancient Spirits. But youll need several important materials first.";
-		next;
-		select("What are they?");
-		mes "[Old Man in Dilemma]";
-		mes "3 Lesser Agimats to hold the power of Ancient Spirits here and another special material handed down for generations.";
-		next;
-		mes "[Old Man in Dilemma]";
-		mes "But nobody can get this special item anymore.";
-		next;
-		select("Something money cannot buy?");
-		mes "[Old Man in Dilemma]";
-		mes "No, no... It's this round little thing, you see?";
-		next;
-		select("Are you talking about Zeny?");
-		mes "[Old Man in Dilemma]";
-		mes "Looks similar to the special items handed down from generations.";
-		next;
-		mes "[Old Man in Dilemma]";
-		mes "As long as we have enough of that, we could make the Greater Agimat of Ancient Spirit to fight against the demons.";
-		next;
-		select("Sounds good.");
-		mes "[Old Man in Dilemma]";
-		mes "In case you are too weary to take on the demons";
-		next;
-		mes "[Old Man in Dilemma]";
-		mes "come by with 3 Lesser Agimats and 1,000 of those so called Zeny.";
-		next;
-		mes "[Old Man in Dilemma]";
-		mes "I will make a Greater Agimat of Ancient Spirit that will increase your attacks against demons by 10% for 20 min.";
-		close;
-	case 2:
-	  mes "[Old Man in Dilemma]";
-	  mes "Hope you win the fight with the demon.";
-	  close;
-	}
-}
-
-ma_fild01,238,198,4	script	Tikbalang Expert#malaya	582,{
-
-	if (MaxWeight - Weight < 50 || checkweight(1201,1) == 0) {
-		mes "Cannot proceed because you have too many items in your possession.";
-		close;
-	}
-	mes "[Tikbalang Expert]";
-	mes "Ive spent 90% of my life studying Tikbalang.";
-	next;
-	switch (select("But you look young?:What is Tikbalang?:Teach me how to catch a Tikbalang.")) {
-	case 1:
-		mes "[Tikbalang Expert]";
-		mes "What! I might be imagining things.";
-		next;
-		mes "[Tikbalang Expert]";
-		mes "I look younger than I am because of my baby face. Ha ha ha";
-		next;
-		select("... ... ...");
-		mes "[Tikbalang Expert]";
-		mes "Trust!! They say faith will bring you luck.";
-		close;
-	case 2:
-		mes "[Tikbalang Expert]";
-		mes "Ha ha... You ask the right question.";
-		mes "Im a specialist in that field. Ask me anything.";
-		next;
-		select("Why wont you answer me?");
-		mes "[Tikbalang Expert]";
-		mes "Have you...  ever been fooled by anyone around you? Why cant you believe someones word for it? Really, ask me anything.";
-		next;
-		while (.@loop != 1) {
-			switch (select("I don't have any questions.:Characteristics?:Features?:Rumors?:Habitat?")) {
-			case 1:
-				set .@loop,1;
-				break;
-			case 2:
-				mes "[Tikbalang Expert]";
-				mes "Tikbalangs have a way to confuse travelers when they meet them by making them turn in circles regardless of wherever and how far they travel.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "They are mischievous creatures.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "But of course there is a way to stop their pranks. You know about the Inside-out Shirt? You can either wear your top inside-out.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "Or go on your way quietly without disrupting the Tikbalangs.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "Ha ha ha ha But everyone knows adventurers are never quiet while they travel, right?";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "Never...";
-				set .@loop,2;
-				next;
-				break;
-			case 3:
-				mes "[Tikbalang Expert]";
-				mes "They say Tikbalangs have several distinctions.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "First, they are very tall ^AAAAAA(tsk.. wish I were tall)^000000 and have skinny, imbalanced legs and arms. Looks almost like a human but their knees are higher than their upper body when they sit down,";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "Second, is the standard characteristics acknowledged by the association. They have heads and foot like a horse.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "So with all these appearance treats, Tikbalang is sometimes called the creature from hell.";
-				set .@loop,3;
-				next;
-				break;
-			case 4:
-				mes "[Tikbalang Expert]";
-				mes "There are several fun rumors about Tikbalangs.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "One of them is about Tikbalangs being the guardians of some kingdom that worships nature.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "So the Tikbalangs will trick travelers who come with bad intentions to the kingdom by making them travel in circles.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "Another rumor is that people around here say that 'if it rains on a clear day, then it must be Tikbalang's wedding day'.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "The association speculates that sayings like 'it rains on Bathorys wedding day' or 'it rains on Moonlight Flowers wedding day' might have derived from the Tikbalangs saying.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "Lastly, ancient fairy tales say that Tikbalangs can transform into human form or even make themselves transparent but nobody has verified this yet.";
-				set .@loop,4;
-				next;
-				break;
-			case 5:
-				mes "[Tikbalang Expert]";
-				mes "Tikbalangs usually live in dark, busy places where there arent many people around.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "Hmm... For example, they are known to live beneath bridges, in banana and bamboo forests and beneath large trees.";
-				next;
-				mes "[Tikbalang Expert]";
-				mes "And this is just my opinion but wouldnt you agree that they are living in dark places because it is easier to play pranks on people?";
-				set .@loop,5;
-				next;
-				break;
-			}
-		}
-		mes "[Tikbalang Expert]";
-		mes "I think this is enough explanation for now. You wouldnt understand other highly sophisticated topics with specific terminology and all anyway.";
-		next;
-		mes "[Tikbalang Expert]";
-		mes "Oh! Do you have any other questions?";
-		next;
-		mes "[Tikbalang Expert]";
-		mes "What do you think? Impressed at how much I know? Come by anytime when you have any more questions.";
-		close;
-	case 3:
-		mes "[Tikbalang Expert]";
-		mes "Ha ha ha. Do you now know how great I am?";
-		next;
-		if ((countitem(6496) > 2) && (countitem(6497) > 4)) {
-			mes "[Tikbalang Expert]";
-			mes "Oh! Isnt this material to make 'Tikbalang Belt' used to tame Tikbalangs?";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "The '^F80835Tikbalang Belt ^000000' is used to capture Tikbalangs without the hassle. But that doesnt mean its 100% successful. Interested? Do you want me to make one for you?";
-			next;
-			switch (select("Yes, Im interested.:No, I can capture one myself.")) {
-			case 1:
-				delitem 6496,3; //Tikbalang_Thick_Spine
-				getitem 12699,1; //Tikbalang_Belt
-				mes "[Tikbalang Expert]";
-				mes "Yiiiiiiiiiiii! Yap!";
-				next;
-				specialeffect EF_SONICBLOW2;
-				select("Huh?");
-				mes "[Tikbalang Expert]";
-				mes "The '^F80835Tikbalang Belt ^000000' is already created";
-				close;
-			case 2:
-				mes "[Tikbalang Expert]";
-				mes "You? Ha... You can try if you want to.";
-				close;
-			}
-		}
-		mes "[Tikbalang Expert]";
-		mes "There is the easy way and the hard way to capture Tikbalangs. Which one do you prefer?";
-		next;
-		switch (select("Easy way.:Hard way.")) {
-		case 1:
-			mes "[Tikbalang Expert]";
-			mes "Ha ha. Ive come up with the easy way myself.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "Bring me 3 Tikbalang's Thick Spines and 5 Lesser Agimats to make";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "a '^F80835Tikbalang Belt^000000' to help you easily capture Tikbalangs.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "Ha ha ha ha ha!";
-			mes "I will say it again.";
-			mes "Its 3 Tikbalang's Thick Spines and 5 Lesser Agimats. Understood?";
-			close;
-		case 2:
-			mes "[Tikbalang Expert]";
-			mes "Its easy for me but I dont know about you.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "Tikbalangs have a sharp, pointy mane behind their neck.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "Of course! There are several of them but you must get the three thickest ones.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "These three manes are the weak point. You can tame a Tikbalang by pulling the manes out.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "Now let me explain how to pull these manes out.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "You must fly like a butterfly and land like a bee on the back of a Tikbalang.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "Of course! The Tikbalang will get mad and try to shake you off with all its might.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "All you have to do is hold on until the Tikbalang gets exhausted.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "Then again, itll take 4 days and 3 nights for Tikbalangs to get tired since they are strong creatures. But lets not focus on too much details.";
-			next;
-			mes "[Tikbalang Expert]";
-			mes "Which means!! The Tikbalang is already tamed.";
-			close;
-		}
-	}
-}
-
-ma_fild01,74,367,6	script	Unidentified Creature#01	572,2,2,{
-	end;
-
-OnInit:
-	set .@kafre_who, rand(1,4);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnEnable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else if (.@kafre_who == 3) {
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#03::OnEnable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#04::OnEnable";
-	}
-	end;
-
-OnEnable:
-	hideoffnpc "Unidentified Creature#01";
-	end;
-
-OnDisable:
-	hideonnpc "Unidentified Creature#01";
-	end;
-
-OnBingx2:
-	set .@kafre_who, rand(1,3);
-	if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnEnable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else if (.@kafre_who == 3) {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#03::OnEnable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#04::OnEnable";
-	}
-	end;
-
-OnTouch:
-	if (getcharid(1) != 0) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#01::OnBingx2";
-			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
-			close;
-		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name04$,strcharinfo(0);
-		}
-		donpcevent "Unidentified Creature#01::OnBingx2";
-		mes "The unidentified creature gets a glimpse of you and disappears.";
-		close;
-	}
-	donpcevent "Unidentified Creature#01::OnBingx2";
-	mes "The unidentified creature looks at you and runs away.";
-	close;
-}
-
-ma_fild01,109,116,4	script	Unidentified Creature#02	572,2,2,{
-	end;
-
-OnEnable:
-	hideoffnpc "Unidentified Creature#02";
-	end;
-
-OnDisable:
-	hideonnpc "Unidentified Creature#02";
-	end;
-
-OnBingx2:
-	set .@kafre_who, rand(1,3);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else if (.@kafre_who == 3) {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#03::OnEnable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	}
-	else {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#04::OnEnable";
-	}
-	end;
-
-OnTouch:
-	if (getpartyleader(getcharid(1),1) == getcharid(3)) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#02::OnBingx2";
-			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
-			close;
-		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name04$,strcharinfo(0);
-		}
-		donpcevent "Unidentified Creature#02::OnBingx2";
-		mes "The unidentified creature gets a glimpse of you and disappears.";
-		close;
-	}
-	donpcevent "Unidentified Creature#02::OnBingx2";
-	mes "The unidentified creature looks at you and runs away.";
-	close;
-}
-
-ma_fild01,280,150,6	script	Unidentified Creature#03	572,2,2,{
-	end;
-
-OnEnable:
-	hideoffnpc "Unidentified Creature#03";
-	end;
-
-OnDisable:
-	hideonnpc "Unidentified Creature#03";
-	end;
-
-OnBingx2:
-	set .@kafre_who, rand(1,3);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnEnable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#04::OnEnable";
-	}
-	end;
-
-OnTouch:
-	if ((checkquest(4229,PLAYTIME) > 0) && (checkquest(9223,PLAYTIME) > 0) && (checkquest(12278,PLAYTIME) > 0)) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#03::OnBingx2";
-			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
-			close;
-		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name04$,strcharinfo(0);
-		}
-		donpcevent "Unidentified Creature#03::OnBingx2";
-		mes "The unidentified creature gets a glimpse of you and disappears.";
-		close;
-	}
-	donpcevent "Unidentified Creature#03::OnBingx2";
-	mes "The unidentified creature looks at you and runs away.";
-	close;
-}
-
-ma_fild01,309,221,6	script	Unidentified Creature#04	572,2,2,{
-	end;
-
-OnEnable:
-	hideoffnpc "Unidentified Creature#04";
-	end;
-
-OnDisable:
-	hideonnpc "Unidentified Creature#04";
-	end;
-
-OnBingx2:
-	set .@kafre_who, rand(1,3);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnEnable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#01::OnDisable";
-		donpcevent "Unidentified Creature#02::OnDisable";
-		donpcevent "Unidentified Creature#03::OnEnable";
-		donpcevent "Unidentified Creature#04::OnDisable";
-	}
-	end;
-
-OnTouch:
-	set .@kafre_tok, rand(1,100);
-	if (.@kafre_tok == 7 || .@kafre_tok == 17 || .@kafre_tok == 27 || .@kafre_tok == 37 || .@kafre_tok == 47 || .@kafre_tok == 57 || .@kafre_tok == 67 || .@kafre_tok == 77 || .@kafre_tok == 87 || .@kafre_tok == 97) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#04::OnBingx2";
-			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
-			close;
-		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name04$,strcharinfo(0);
-		}
-		donpcevent "Unidentified Creature#04::OnBingx2";
-		mes "The unidentified creature gets a glimpse of you and disappears.";
-		close;
-	}
-	donpcevent "Unidentified Creature#04::OnBingx2";
-	mes "The unidentified creature looks at you and runs away.";
-	close;
-}
-
-ma_fild02,282,41,4	script	Unidentified Creature#05	572,2,2,{
-	end;
-
-OnInit:
-	set .@kafre_who, rand(1,4);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-	} else if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnEnable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-	} else if (.@kafre_who == 3) {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnEnable";
-	} else {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-		donpcevent "Unidentified Creature#08::OnEnable";
-	}
-	end;
-
-OnEnable:
-	hideoffnpc "Unidentified Creature#05";
-	end;
-
-OnDisable:
-	hideonnpc "Unidentified Creature#05";
-	end;
-
-OnBingx2:
-	set .@kafre_who, rand(1,3);
-	if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnEnable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-	} else if (.@kafre_who == 3) {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnEnable";
-	} else {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-		donpcevent "Unidentified Creature#08::OnEnable";
-	}
-	end;
-
-OnTouch:
-	if (getcharid(1) != 0) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#05::OnBingx2";
-			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
-			close;
-		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name05$,strcharinfo(0);
-		}
-		donpcevent "Unidentified Creature#05::OnBingx2";
-		mes "The unidentified creature gets a glimpse of you and disappears.";
-		close;
-	}
-	donpcevent "Unidentified Creature#05::OnBingx2";
-	mes "The unidentified creature looks at you and runs away.";
-	close;
-}
-
-ma_fild02,246,324,4	script	Unidentified Creature#06	572,2,2,{
-	end;
-
-OnEnable:
-	hideoffnpc "Unidentified Creature#06";
-	end;
-
-OnDisable:
-	hideonnpc "Unidentified Creature#06";
-	end;
-
-OnBingx2:
-	set .@kafre_who, rand(1,3);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-	} else if (.@kafre_who == 3) {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnEnable";
-	} else {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-		donpcevent "Unidentified Creature#08::OnEnable";
-	}
-	end;
-
-OnTouch:
-	if (getpartyleader(getcharid(1),1) == getcharid(3)) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#06::OnBingx2";
-			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
-			close;
-		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name05$,strcharinfo(0);
-		}
-		donpcevent "Unidentified Creature#06::OnBingx2";
-		mes "The unidentified creature gets a glimpse of you and disappears.";
-		close;
-	}
-	donpcevent "Unidentified Creature#06::OnBingx2";
-	mes "The unidentified creature looks at you and runs away.";
-	close;
-}
-
-ma_fild02,71,296,6	script	Unidentified Creature#07	572,2,2,{
-	end;
-
-OnEnable:
-	hideoffnpc "Unidentified Creature#07";
-	end;
-
-OnDisable:
-	hideonnpc "Unidentified Creature#07";
-	end;
-
-OnBingx2:
-	set .@kafre_who, rand(1,3);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-		donpcevent "Unidentified Creature#08::OnDisable";
-	} else if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnEnable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-		donpcevent "Unidentified Creature#08::OnEnable";
-	}
-	end;
-
-OnTouch:
-	if ((checkquest(4229,PLAYTIME) > 0) && (checkquest(9223,PLAYTIME) > 0) && (checkquest(12278,PLAYTIME) > 0)) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#07::OnBingx2";
-			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
-			close;
-		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name05$,strcharinfo(0);
-		}
-		donpcevent "Unidentified Creature#07::OnBingx2";
-		mes "The unidentified creature gets a glimpse of you and disappears.";
-		close;
-	}
-	donpcevent "Unidentified Creature#07::OnBingx2";
-	mes "The unidentified creature looks at you and runs away.";
-	close;
-}
-
-ma_fild02,32,263,4	script	Unidentified Creature#08	572,2,2,{
-	end;
-
-OnEnable:
-	hideoffnpc "Unidentified Creature#08";
-	end;
-
-OnDisable:
-	hideonnpc "Unidentified Creature#08";
-	end;
-
-OnBingx2:
-	set .@kafre_who, rand(1,3);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-	} else if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnEnable";
-		donpcevent "Unidentified Creature#07::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#05::OnDisable";
-		donpcevent "Unidentified Creature#06::OnDisable";
-		donpcevent "Unidentified Creature#07::OnEnable";
-	}
+-	script	Unidentified Creature#i	-1,{
 	end;
-
-OnTouch:
-	set .@kafre_tok, rand(1,100);
-	if (.@kafre_tok == 7 || .@kafre_tok == 17 || .@kafre_tok == 27 || .@kafre_tok == 37 || .@kafre_tok == 47 || .@kafre_tok == 57 || .@kafre_tok == 67 || .@kafre_tok == 77 || .@kafre_tok == 87 || .@kafre_tok == 97) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#08::OnBingx2";
-			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
-			close;
-		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name05$,strcharinfo(0);
-		}
-		donpcevent "Unidentified Creature#08::OnBingx2";
-		mes "The unidentified creature gets a glimpse of you and disappears.";
-		close;
-	}
-	donpcevent "Unidentified Creature#08::OnBingx2";
-	mes "The unidentified creature looks at you and runs away.";
-	close;
-}
-
-ma_scene01,195,92,4	script	Unidentified Creature#09	572,2,2,{
-	end;
-
 OnInit:
-	set .@kafre_who, rand(1,3);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#09::OnEnable";
-		donpcevent "Unidentified Creature#10::OnDisable";
-		donpcevent "Unidentified Creature#11::OnDisable";
-	} else if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#09::OnDisable";
-		donpcevent "Unidentified Creature#10::OnEnable";
-		donpcevent "Unidentified Creature#11::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#09::OnDisable";
-		donpcevent "Unidentified Creature#10::OnDisable";
-		donpcevent "Unidentified Creature#11::OnEnable";
-	}
-	end;
-
-OnEnable:
-	hideoffnpc "Unidentified Creature#09";
-	end;
-
-OnDisable:
-	hideonnpc "Unidentified Creature#09";
-	end;
-
-OnBingx2:
-	set .@kafre_who, rand(1,2);
-	if (.@kafre_who == 2) {
-		donpcevent "Unidentified Creature#09::OnDisable";
-		donpcevent "Unidentified Creature#10::OnEnable";
-		donpcevent "Unidentified Creature#11::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#09::OnDisable";
-		donpcevent "Unidentified Creature#10::OnDisable";
-		donpcevent "Unidentified Creature#11::OnEnable";
-	}
-	end;
-
-OnTouch:
-	if (getcharid(1) != 0) {
-		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#09::OnBingx2";
-			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
-			close;
-		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name06$,strcharinfo(0);
-		}
-		donpcevent "Unidentified Creature#09::OnBingx2";
-		mes "The unidentified creature gets a glimpse of you and disappears.";
-		close;
+	switch(atoi(strnpcinfo(2))) {
+		case 1: setarray .@npc$,"01","02","03","04"; break;
+		case 5: setarray .@npc$,"05","06","07","08"; break;
+		case 9: setarray .@npc$,"09","10","11"; break;
+		default: end;
 	}
-	donpcevent "Unidentified Creature#09::OnBingx2";
-	mes "The unidentified creature looks at you and runs away.";
-	close;
-}
-
-ma_scene01,158,139,4	script	Unidentified Creature#10	572,2,2,{
+	set .@size, getarraysize(.@npc$);
+	set .@rand, rand(.@size);
+	for(set .@i,0; .@i<.@size; set .@i,.@i+1)
+		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
 	end;
-
 OnEnable:
-	hideoffnpc "Unidentified Creature#10";
+	enablenpc strnpcinfo(0);
 	end;
-
 OnDisable:
-	hideonnpc "Unidentified Creature#10";
+	disablenpc strnpcinfo(0);
 	end;
-
 OnBingx2:
-	set .@kafre_who, rand(1,2);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#09::OnEnable";
-		donpcevent "Unidentified Creature#10::OnDisable";
-		donpcevent "Unidentified Creature#11::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#09::OnDisable";
-		donpcevent "Unidentified Creature#10::OnDisable";
-		donpcevent "Unidentified Creature#11::OnEnable";
+	switch(atoi(strnpcinfo(2))) {
+		case 1: setarray .@npc$,"02","03","04"; break;
+		case 5: setarray .@npc$,"06","07","08"; break;
+		case 9: setarray .@npc$,"10","11"; break;
 	}
+	set .@size, getarraysize(.@npc$);
+	set .@rand, rand(.@size);
+	for(set .@i,0; .@i<.@size; set .@i,.@i+1)
+		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
+	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
-
 OnTouch:
-	if (getpartyleader(getcharid(1),1) == getcharid(3)) {
+	if (getcharid(1)) {
 		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#10::OnBingx2";
+			donpcevent strnpcinfo(0)+"::OnBingx2";
 			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
 			close;
 		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name06$,strcharinfo(0);
+		if (rand(1,5)%2) {
+			switch(atoi(strnpcinfo(2))) {
+				case 1: set $ma_name04$,strcharinfo(0); break;
+				case 5: set $ma_name05$,strcharinfo(0); break;
+				case 9: set $ma_name06$,strcharinfo(0); break;
+			}
 		}
-		donpcevent "Unidentified Creature#10::OnBingx2";
+		donpcevent strnpcinfo(0)+"::OnBingx2";
 		mes "The unidentified creature gets a glimpse of you and disappears.";
 		close;
 	}
-	donpcevent "Unidentified Creature#10::OnBingx2";
+	donpcevent strnpcinfo(0)+"::OnBingx2";
 	mes "The unidentified creature looks at you and runs away.";
 	close;
 }
+ma_fild01,74,367,6	duplicate(Unidentified Creature#i)	Unidentified Creature#01	4_MAL_BUDIDAI,2,2
+ma_fild02,282,41,4	duplicate(Unidentified Creature#i)	Unidentified Creature#05	4_MAL_BUDIDAI,2,2
+ma_scene01,195,92,4	duplicate(Unidentified Creature#i)	Unidentified Creature#09	4_MAL_BUDIDAI,2,2
 
-ma_scene01,167,112,6	script	Unidentified Creature#11	572,2,2,{
+-	script	Unidentified Creature#j	-1,{
 	end;
-
 OnEnable:
-	hideoffnpc "Unidentified Creature#11";
+	enablenpc strnpcinfo(0);
 	end;
-
 OnDisable:
-	hideonnpc "Unidentified Creature#11";
+	disablenpc strnpcinfo(0);
 	end;
-
 OnBingx2:
-	set .@kafre_who, rand(1,2);
-	if (.@kafre_who == 1) {
-		donpcevent "Unidentified Creature#09::OnEnable";
-		donpcevent "Unidentified Creature#10::OnDisable";
-	} else {
-		donpcevent "Unidentified Creature#10::OnEnable";
-	}
+	switch(atoi(strnpcinfo(2))) {
+		case 2: setarray .@npc$,"01","03","04"; break;
+		case 3: setarray .@npc$,"01","02","04"; break;
+		case 4: setarray .@npc$,"01","02","03"; break;
+		case 6: setarray .@npc$,"05","07","08"; break;
+		case 7: setarray .@npc$,"05","06","08"; break;
+		case 8: setarray .@npc$,"05","06","07"; break;
+		case 10: setarray .@npc$,"09","11"; break;
+		case 11: setarray .@npc$,"09","10"; break;
+	}
+	set .@size, getarraysize(.@npc$);
+	set .@rand, rand(.@size);
+	for(set .@i,0; .@i<.@size; set .@i,.@i+1)
+		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
+	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
-
 OnTouch:
-	if ((checkquest(4229,PLAYTIME) > 0) && (checkquest(9223,PLAYTIME) > 0) && (checkquest(12278,PLAYTIME) > 0)) {
+	set .@i, atoi(strnpcinfo(2));
+	if (.@i%4 == 2) {
+		if (getcharid(0) == getpartyleader(getcharid(1),2))
+			set .@pass,1;
+	} else if (.@i%4 == 3) {
+		if (checkquest(4229,PLAYTIME) > -1 && checkquest(9223,PLAYTIME) > -1 && checkquest(12278,PLAYTIME) > -1)
+			set .@pass,1;
+	} else if (.@i%4 == 0) {
+		if (rand(1,100)%10 == 7)
+			set .@pass,1;
+	}
+	if (.@pass) {
 		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
-			donpcevent "Unidentified Creature#11::OnBingx2";
+			donpcevent strnpcinfo(0)+"::OnBingx2";
 			mes "The unidentified creature gets a glimpse of you, blushes and then disappears.";
 			close;
 		}
-		set .@slot_name, rand(1,5);
-		if (.@slot_name == 1 || .@slot_name == 3 || .@slot_name == 5) {
-			set $ma_name06$,strcharinfo(0);
+		if (rand(1,5)%2) {
+			switch(.@i) {
+			case 2:
+			case 3:
+			case 4:
+				set $ma_name04$,strcharinfo(0);
+				break;
+			case 6:
+			case 7:
+			case 8:
+				set $ma_name05$,strcharinfo(0);
+				break;
+			case 10:
+			case 11:
+				set $ma_name06$,strcharinfo(0);
+				break;
+			}
 		}
-		donpcevent "Unidentified Creature#11::OnBingx2";
+		donpcevent strnpcinfo(0)+"::OnBingx2";
 		mes "The unidentified creature gets a glimpse of you and disappears.";
 		close;
 	}
-	donpcevent "Unidentified Creature#11::OnBingx2";
+	donpcevent strnpcinfo(0)+"::OnBingx2";
 	mes "The unidentified creature looks at you and runs away.";
 	close;
 }
-
-malaya,227,311,4	script	Grandma#ma01	575,{
-
+ma_fild01,109,116,4	duplicate(Unidentified Creature#j)	Unidentified Creature#02	4_MAL_BUDIDAI,2,2
+ma_fild01,280,150,6	duplicate(Unidentified Creature#j)	Unidentified Creature#03	4_MAL_BUDIDAI,2,2
+ma_fild01,309,221,6	duplicate(Unidentified Creature#j)	Unidentified Creature#04	4_MAL_BUDIDAI,2,2
+ma_fild02,246,324,4	duplicate(Unidentified Creature#j)	Unidentified Creature#06	4_MAL_BUDIDAI,2,2
+ma_fild02,71,296,6	duplicate(Unidentified Creature#j)	Unidentified Creature#07	4_MAL_BUDIDAI,2,2
+ma_fild02,32,263,4	duplicate(Unidentified Creature#j)	Unidentified Creature#08	4_MAL_BUDIDAI,2,2
+ma_scene01,158,139,4	duplicate(Unidentified Creature#j)	Unidentified Creature#10	4_MAL_BUDIDAI,2,2
+ma_scene01,167,112,6	duplicate(Unidentified Creature#j)	Unidentified Creature#11	4_MAL_BUDIDAI,2,2
+
+malaya,227,311,4	script	Grandma#ma01	4_F_BARYO_OLD,{
 	if (malaya_hi < 10) {
 		mes "[Grandma]";
-		mes "Youre not from around here? Take care of yourself.";
+		mes "You're not from around here? Take care of yourself.";
 		next;
 		mes "[Grandma]";
-		mes "Im worried because my daughter-in-law is pregnant. I hope nothing goes wrong.";
+		mes "I'm worried because my daughter-in-law is pregnant. I hope nothing goes wrong.";
 		close;
-	} else if ((malaya_hi > 9) && (malaya_hi < 20)) {
+	} else if (malaya_hi < 20) {
 		mes "[Grandma]";
 		mes "I heard there is an outsider that is helping the village.";
 		next;
@@ -1001,31 +285,16 @@ malaya,227,311,4	script	Grandma#ma01	575,{
 		mes "Then my daughter-in-law will be safe.";
 		close;
 	}
-	set .@name_tak01, rand(1,6);
-	if (.@name_tak01 == 1){
-		set .@name$,$ma_name01$;
-	}else if (.@name_tak01 == 2){
-		set .@name$,$ma_name02$;
-	}else if (.@name_tak01 == 3){
-		set .@name$,$ma_name03$;
-	}else if (.@name_tak01 == 4){
-		set .@name$,$ma_name04$;
-	}else if (.@name_tak01 == 5){
-		set .@name$,$ma_name05$;
-	}else{
-		set .@name$,$ma_name06$;
-	}
-	set .@name_tak02, rand(1,3);
-	if (.@name_tak02 == 2) {
+	if (rand(1,3) == 2) {
 		mes "[Grandma]";
-		mes "Heard there is this" + .@name$ + "that follows Meoneonuncle around.";
+		mes "Heard there is this "+getd("$ma_name0"+rand(1,6)+"$")+" that follows Meoneonuncle around.";
 		next;
 		mes "[Grandma]";
 		mes "I will cheer for their forbidden love.";
 		close;
 	}
 	mes "[Grandma]";
-	mes "Im worried about my pregnant daughter-in-law. Hope Meoneonuncle wont bother her.";
+	mes "I'm worried about my pregnant daughter-in-law. Hope Meoneonuncle won't bother her.";
 	next;
 	select("Meoneonuncle?");
 	mes "[Grandma]";
@@ -1035,7 +304,7 @@ malaya,227,311,4	script	Grandma#ma01	575,{
 	mes "Meoneonuncle was a woman who lived in Port Malaya long ago. She married a decent man and also had a baby.";
 	next;
 	mes "[Grandma]";
-	mes "But happiness never lasts forever, right? The baby was miscarried from an accident,";
+	mes "But happiness never lasts forever, right? The baby was miscarried from an accident...";
 	next;
 	mes "[Grandma]";
 	mes "She eventually passed away after grieving over her lost baby for days.";
@@ -1045,25 +314,24 @@ malaya,227,311,4	script	Grandma#ma01	575,{
 	mes "Meoneonuncle then started to appear in spirit and take away babies from pregnant women in the village.";
 	next;
 	mes "[Grandma]";
-	mes "If you ever walk around Port Malaya at night.";
+	mes "If you ever walk around Port Malaya at night...";
 	next;
 	mes "[Grandma]";
-	mes "and hear either tik-tik or wak-wak, be cautious because that is the sound of Meoneonuncles wings flapping.";
+	mes "And hear either tik-tik or wak-wak, be cautious because that is the sound of Meoneonuncle's wings flapping.";
 	close;
 }
 
-malaya,189,263,4	script	Drumming Young Man #ma02	578,{
-
+malaya,189,263,4	script	Drumming Young Man#ma02	4_M_BARYO_MAN,{
 	if (malaya_hi < 10) {
 		emotion e_omg;
 		mes "[Drumming Young Man]";
-		mes "Ugh... its just like that time before";
+		mes "Ugh... it's just like that time before...";
 		next;
 		emotion e_omg;
 		mes "[Drumming Young Man]";
-		mes "when the moon was swallowed. Argh!";
+		mes "When the moon was swallowed. Argh!";
 		close;
-	} else if ((malaya_hi > 9) && (malaya_hi < 20)) {
+	} else if (malaya_hi < 20) {
 		mes "[Drumming Young Man]";
 		mes "I think the village was saved by a nameless adventurer.";
 		next;
@@ -1072,24 +340,9 @@ malaya,189,263,4	script	Drumming Young Man #ma02	578,{
 		mes "Phew... I thought Bakonawa appeared again.";
 		close;
 	}
-	set .@name_tak01, rand(1,6);
-	if (.@name_tak01 == 1){
-		set .@name$,$ma_name01$;
-	}else if (.@name_tak01 == 2){
-		set .@name$,$ma_name02$;
-	}else if (.@name_tak01 == 3){
-		set .@name$,$ma_name03$;
-	}else if (.@name_tak01 == 4){
-		set .@name$,$ma_name04$;
-	}else if (.@name_tak01 == 5){
-		set .@name$,$ma_name05$;
-	}else{
-		set .@name$,$ma_name06$;
-	}
-	set .@name_tak02, rand(1,3);
-	if (.@name_tak02 == 2) {
+	if (rand(1,3) == 2) {
 		mes "[Drumming Young Man]";
-		mes "" + .@name$ + "is said to have stopped Bakonawa from swallowing the moon. Isnt it awesome? I'm so relieved.";
+		mes getd("$ma_name0"+rand(1,6)+"$")+" is said to have stopped Bakonawa from swallowing the moon. Isn't it awesome? I'm so relieved.";
 		close;
 	}
 	mes "[Drumming Young Man]";
@@ -1108,50 +361,34 @@ malaya,189,263,4	script	Drumming Young Man #ma02	578,{
 	next;
 	select("Wow. What is it?");
 	mes "[Drumming Young Man]";
-	mes "He is sensitive to noise so when hes about to swallow the moon!!";
+	mes "He is sensitive to noise so when he's about to swallow the moon!!";
 	next;
 	mes "[Drumming Young Man]";
-	mes "Thats your chance!! It doesnt matter what kind of noise!! Whether its a caldron, symbol, drum, pot or fry pan, just keep on making noise.";
+	mes "That's your chance!! It doesn't matter what kind of noise!! Whether it's a caldron, symbol, drum, pot or fry pan, just keep on making noise.";
 	next;
 	mes "[Drumming Young Man]";
 	mes "Then Bakonawa will get surprised, spit out the moon and run away!";
 	next;
 	mes "[Drumming Young Man]";
-	mes "Carry a drum around with you. Youll find it handy.";
+	mes "Carry a drum around with you. You'll find it handy.";
 	close;
 }
 
-malaya,270,59,4	script	Port Guard#ma03	570,{
-
+malaya,270,59,4	script	Port Guard#ma03	4_MAL_SOLDIER,{
 	if (malaya_hi < 10) {
 		emotion e_swt2;
 		mes "[Port Guard]";
 		mes "The village is chaotic these days. Is it okay for me to be off like this?";
 		close;
-	} else if ((malaya_hi > 9) && (malaya_hi < 20)) {
+	} else if (malaya_hi < 20) {
 		emotion e_no;
 		mes "[Port Guard]";
 		mes "The village is somewhat stable now but you should still be careful walking around at night.";
 		close;
 	}
-	set .@name_tak01, rand(1,6);
-	if (.@name_tak01 == 1){
-		set .@name$,$ma_name01$;
-	}else if (.@name_tak01 == 2){
-		set .@name$,$ma_name02$;
-	}else if (.@name_tak01 == 3){
-		set .@name$,$ma_name03$;
-	}else if (.@name_tak01 == 4){
-		set .@name$,$ma_name04$;
-	}else if (.@name_tak01 == 5){
-		set .@name$,$ma_name05$;
-	}else{
-		set .@name$,$ma_name06$;
-	}
-	set .@name_tak02, rand(1,3);
-	if (.@name_tak02 == 2) {
+	if (rand(1,3) == 2) {
 		mes "[Port Guard]";
-		mes "" + .@name$ + "is said to escape from Bu waya alive after being captured. This person must be powerful.";
+		mes getd("$ma_name0"+rand(1,6)+"$")+" is said to escape from Buwaya alive after being captured. This person must be powerful.";
 		close;
 	}
 	emotion e_omg;
@@ -1159,89 +396,75 @@ malaya,270,59,4	script	Port Guard#ma03	570,{
 	mes "What!! Port all clear!!";
 	next;
 	mes "[Port Guard]";
-	mes "Huh? Youre not the captain? You scared me. Shoot! Ah, right! I received an official document for travelers.";
+	mes "Huh? You're not the captain? You scared me. Shoot! Ah, right! I received an official document for travelers.";
 	next;
 	select("What document?");
 	mes "[Port Guard]";
 	mes "It says that travelers should be careful of monsters when walking in the village at night.";
 	next;
 	mes "[Port Guard]";
-	mes "Buwaya dont come to the village often but there are cases when they snatch people in the boxes they carry at night.";
+	mes "Buwaya don't come to the village often but there are cases when they snatch people in the boxes they carry at night.";
 	next;
 	mes "[Port Guard]";
 	mes "Huh?! And it says here that a monster named Wokwok especially visits the village often at night and should be avoided.";
 	next;
-	if (select("I see.:Is there any way to prevent them from coming?") == 1) {
+	switch(select("I see.:Is there any way to prevent them from coming?")) {
+	case 1:
 		mes "[Port Guard]";
 		mes "Be careful at night!";
 		close;
+	case 2:
+		mes "[Port Guard]";
+		mes "They say you can attack Buwaya's weak point inside the box they carry if you ever get caught in one.";
+		next;
+		mes "[Port Guard]";
+		mes "And you should run into the nearest building when you hear Wokwoks wings fluttering from afar.";
+		next;
+		emotion e_hmm;
+		mes "[Port Guard]";
+		mes "But if the fluttering sound is small or if you don't hear anything, let's just say you should prepare for attack and wish for luck.";
+		close;
 	}
-	mes "[Port Guard]";
-	mes "They say you can attack Buwayas weak point inside the box they carry if you ever get caught in one.";
-	next;
-	mes "[Port Guard]";
-	mes "And you should run into the nearest building when you hear Wokwoks wings fluttering from afar.";
-	next;
-	emotion e_hmm;
-	mes "[Port Guard]";
-	mes "But if the fluttering sound is small or if you dont hear anything, lets just say you should prepare for attack and with for luck.";
-	close;
 }
 
-malaya,88,252,4	script	Little Girl #ma04	576,{
-
+malaya,88,252,4	script	Little Girl#ma04	4_F_BARYO_GIRL,{
 	if (malaya_hi < 10) {
 		mes "[Little Girl]";
-		mes "Im scared but I have to visit the fairy in the forest.";
+		mes "I'm scared but I have to visit the fairy in the forest.";
 		close;
-	} else if ((malaya_hi > 9) && (malaya_hi < 20)) {
+	} else if (malaya_hi < 20) {
 		mes "[Little Girl]";
 		mes "He he. Father said I can visit the fairy in the forest when the village calms down.";
 		close;
 	}
-	set .@name_tak01, rand(1,6);
-	if (.@name_tak01 == 1){
-		set .@name$,$ma_name01$;
-	}else if (.@name_tak01 == 2){
-		set .@name$,$ma_name02$;
-	}else if (.@name_tak01 == 3){
-		set .@name$,$ma_name03$;
-	}else if (.@name_tak01 == 4){
-		set .@name$,$ma_name04$;
-	}else if (.@name_tak01 == 5){
-		set .@name$,$ma_name05$;
-	}else{
-		set .@name$,$ma_name06$;
-	}
-	set .@name_tak02, rand(1,3);
-	if (.@name_tak02 == 2) {
+	if (rand(1,3) == 2) {
+		set .@name$, getd("$ma_name0"+rand(1,6)+"$");
 		mes "[Little Girl]";
-		mes "A little while ago" + .@name$ + "came and told me a fun story.";
+		mes "A little while ago "+.@name$+" came and told me a fun story.";
 		next;
 		mes "[Little Girl]";
 		mes "'I planted a pair of pear trees in the yard.'";
-		mes "He he. Isnt it fun?" + .@name$ + "seems like a fun person.";
+		mes "He he. Isn't it fun? "+.@name$+" seems like a fun person.";
 		close;
 	}
 	mes "[Little Girl]";
-	mes "Father said I wont catch skin diseases once Im friends with the fairy from the forest.";
+	mes "Father said I won't catch skin diseases once I'm friends with the fairy from the forest.";
 	next;
 	select("What is this fairy?");
 	mes "[Little Girl]";
-	mes "Encanto! Encanto fairies live in big trees or rocks in the forest. There are boy fairies and girl fairies,";
+	mes "Encan'to! Encan'to fairies live in big trees or rocks in the forest. There are boy fairies and girl fairies...";
 	next;
 	mes "[Little Girl]";
-	mes "but boy fairies are prettier. Why is that?";
+	mes "But boy fairies are prettier. Why is that?";
 	close;
 }
 
-malaya,219,92,6	script	Little Kid#ma05	577,{
-
+malaya,219,92,6	script	Little Kid#ma05	4_M_BARYO_BOY,{
 	if (malaya_hi < 10) {
 		mes "[Little Kid]";
 		mes "My mom told me not to play outside because its dangerous. Why?";
 		close;
-	} else if ((malaya_hi > 9) && (malaya_hi < 20)) {
+	} else if (malaya_hi < 20) {
 		mes "[Little Kid]";
 		mes "My mom told me I can play but only in Port Malaya.";
 		next;
@@ -1249,30 +472,15 @@ malaya,219,92,6	script	Little Kid#ma05	577,{
 		mes "He he. But I never thought of going outside of Port Malaya.";
 		close;
 	}
-	set .@name_tak01, rand(1,6);
-	if (.@name_tak01 == 1){
-		set .@name$,$ma_name01$;
-	}else if (.@name_tak01 == 2){
-		set .@name$,$ma_name02$;
-	}else if (.@name_tak01 == 3){
-		set .@name$,$ma_name03$;
-	}else if (.@name_tak01 == 4){
-		set .@name$,$ma_name04$;
-	}else if (.@name_tak01 == 5){
-		set .@name$,$ma_name05$;
-	}else{
-		set .@name$,$ma_name06$;
-	}
-	set .@name_tak02, rand(1,3);
-	if (.@name_tak02 == 2) {
+	if (rand(1,3) == 2) {
 		mes "[Little Kid]";
 		mes "I heard someone took Jejelings hat in Baryo Mahiwaga.";
 		next;
 		mes "[Little Kid]";
-		mes "Why would someone steal a monsters hat?" + .@name$ + "must be desperate.";
+		mes "Why would someone steal a monster's hat? "+getd("$ma_name0"+rand(1,6)+"$")+" must be desperate.";
 		next;
 		mes "[Little Kid]";
-		mes "Oh wait! This was suppose to be a secret. Shsh! Please pretend you didnt hear me.";
+		mes "Oh wait! This was suppose to be a secret. Shsh! Please pretend you didn't hear me.";
 		close;
 	}
 	mes "[Little Kid]";
@@ -1289,8 +497,7 @@ malaya,219,92,6	script	Little Kid#ma05	577,{
 	close;
 }
 
-malaya,363,283,4	script	Local#ma06	582,{
-
+malaya,363,283,4	script	Local#ma06	4_M_MALAYA,{
 	if (malaya_hi < 10) {
 		mes "[Local]";
 		mes "Hmm... is it time to be careful of the witches' curse?";
@@ -1298,7 +505,7 @@ malaya,363,283,4	script	Local#ma06	582,{
 		mes "[Local]";
 		mes "Beware of Mongkukurums needle, foreigner.";
 		close;
-	} else if ((malaya_hi > 9) && (malaya_hi < 20)) {
+	} else if (malaya_hi < 20) {
 		mes "[Local]";
 		mes "Welcome to Port Malaya, foreigner..";
 		next;
@@ -1306,37 +513,27 @@ malaya,363,283,4	script	Local#ma06	582,{
 		mes "The village is chaotic these days. If you see someone with red eyes, try not to stare at their eyes.";
 		close;
 	}
-	set .@name_tak01, rand(1,6);
-	if (.@name_tak01 == 1){
-		set .@name$,$ma_name01$;
-	}else if (.@name_tak01 == 2){
-		set .@name$,$ma_name02$;
-	}else if (.@name_tak01 == 3){
-		set .@name$,$ma_name03$;
-	}else if (.@name_tak01 == 4){
-		set .@name$,$ma_name04$;
-	}else if (.@name_tak01 == 5){
-		set .@name$,$ma_name05$;
-	}else{
-		set .@name$,$ma_name06$;
-	}
-	set .@name_tak02, rand(1,6);
-	if (.@name_tak02 == 1) {
+	set .@name$, getd("$ma_name0"+rand(1,6)+"$");
+	switch(rand(1,6)) {
+	case 1:
 		mes "[Local]";
-		mes "Be careful walking around the village at night." + .@name$ + "was taken down by Wokwok.";
+		mes "Be careful walking around the village at night. "+.@name$+" was taken down by Wokwok.";
 		close;
-	} else if (.@name_tak02 == 2) {
+	case 2:
 		mes "[Local]";
-		mes "" + .@name$ + "is said to successfully tame a Tikbalang. This person must be courageous. Wonder if Ill get to see this tamed Tikbalang? Çѹø º¸°í ½ÍÀºµ¥..";
+		mes .@name$+" is said to have successfully tamed a Tikbalang. This person must be courageous. Wonder if I'll get to see this tamed Tikbalang?";
 		close;
-	} else if (.@name_tak02 == 3) {
+	case 3:
 		mes "[Local]";
-		mes "Have you ever seen Bongisungisu? I heard" + .@name$ + "is hunting down Bongisungisus.";
+		mes "Have you ever seen Bongisungisu? I heard "+.@name$+" is hunting down Bongisungisus.";
 		close;
-	} else if (.@name_tak02 == 4) {
+	case 4:
 		mes "[Local]";
-		mes "If you plan to go out of the village, be careful of Tiucknuc" + .@name$ + "is said to be tricked by Tiucknuc and had to go to the to the hospital.";
+		mes "If you plan to go out of the village, be careful of Tiucknuc. "+.@name$+" is said to be tricked by Tiucknuc and had to go to the hospital.";
 		close;
+	case 5:
+	case 6:
+		break;
 	}
 	mes "[Local]";
 	mes "The village is chaotic these days. Looks like Mongkukurum is back in the village.";
@@ -1363,38 +560,22 @@ malaya,363,283,4	script	Local#ma06	582,{
 	close;
 }
 
-malaya,41,127,6	script	Old Man #ma07	574,{
-
+malaya,41,127,6	script	Old Man #ma07	4_M_BARYO_OLD,{
 	if (malaya_hi < 10) {
 		mes "[Old Man]";
 		mes "Foreigners are not welcomed that much when our village is chaotic like these days.";
 		close;
-	} else if ((malaya_hi > 9) && (malaya_hi < 20)) {
+	} else if (malaya_hi < 20) {
 		mes "[Old Man]";
 		mes "You are out of luck visiting the village at a time like this and not being welcomed.";
 		close;
 	}
-	set .@name_tak01, rand(1,6);
-	if (.@name_tak01 == 1){
-		set .@name$,$ma_name01$;
-	}else if (.@name_tak01 == 2){
-		set .@name$,$ma_name02$;
-	}else if (.@name_tak01 == 3){
-		set .@name$,$ma_name03$;
-	}else if (.@name_tak01 == 4){
-		set .@name$,$ma_name04$;
-	}else if (.@name_tak01 == 5){
-		set .@name$,$ma_name05$;
-	}else{
-		set .@name$,$ma_name06$;
-	}
-	set .@name_tak02, rand(1,3);
-	if (.@name_tak02 == 2) {
+	if (rand(1,3) == 2) {
 		mes "[Old Man]";
-		mes "" + .@name$ + "is said to throw out Jellopy in this village.";
+		mes getd("$ma_name0"+rand(1,6)+"$")+" is said to throw out Jellopy in this village.";
 		next;
 		mes "[Old Man]";
-		mes "Tsk, tsk... Must be a person that isnt worthy of a Jellopy.";
+		mes "Tsk, tsk... Must be a person that isn't worthy of a Jellopy.";
 		close;
 	}
 	mes "[Old Man]";
@@ -1405,82 +586,65 @@ malaya,41,127,6	script	Old Man #ma07	574,{
 	next;
 	select("What happens?");
 	mes "[Old Man]";
-	mes "Well, for a Bangungot, it means losing its home so they get revengeful.";
+	mes "Well, for a Bangungot, it means losing its home so they get vengeful.";
 	next;
 	mes "[Old Man]";
 	mes "When you try to sleep near the pillar, it will keep awake by playing pranks at first.";
 	next;
 	mes "[Old Man]";
-	mes "But as time goes by and their vengeance grow, they sit on top of you until you suffocate.";
+	mes "But as time goes by and their vengeance grows, they sit on top of you until you suffocate.";
 	next;
 	select("Oh, gosh...");
 	mes "[Old Man]";
-	mes "Ha ha ha. There are no Bangungots in normal pillars, so don't lose sleep on it.";
+	mes "Ha ha ha. There are no Bangungots in normal pillars, so don't lose sleep over it.";
 	close;
 }
 
-malaya,63,185,4	script	Woman#ma08	583,{
-
+malaya,63,185,4	script	Woman#ma08	4_F_MALAYA,{
 	if (malaya_hi < 10) {
 		mes "[Woman]";
-		mes "I dont have anything to share with you.";
+		mes "I don't have anything to share with you.";
 		close;
-	} else if ((malaya_hi > 9) && (malaya_hi < 20)) {
+	} else if (malaya_hi < 20) {
 		mes "[Woman]";
-		mes "Im worried about the children. I hope they arent terrified from whats going on in the village.";
+		mes "Im worried about the children. I hope they aren't terrified from whats going on in the village.";
 		close;
 	}
-	set .@name_tak01, rand(1,6);
-	if (.@name_tak01 == 1){
-		set .@name$,$ma_name01$;
-	}else if (.@name_tak01 == 2){
-		set .@name$,$ma_name02$;
-	}else if (.@name_tak01 == 3){
-		set .@name$,$ma_name03$;
-	}else if (.@name_tak01 == 4){
-		set .@name$,$ma_name04$;
-	}else if (.@name_tak01 == 5){
-		set .@name$,$ma_name05$;
-	}else{
-		set .@name$,$ma_name06$;
-	}
-	set .@name_tak02, rand(1,3);
-	if (.@name_tak02 == 2) {
-		set .@nongdum, rand(1,10);
-		if (.@nongdum == 1) {
+	if (rand(1,3) == 2) {
+		set .@name$, getd("$ma_name0"+rand(1,6)+"$");
+		set .@rand, rand(1,10);
+		if (.@rand < 5) {
 			mes "[Woman]";
-			mes "I like fun stories. Not so long ago," + .@name$ + "came and told me a funny story.";
+			mes "I like fun stories. Not so long ago, "+.@name$+" came and told me a funny story.";
 			next;
+		}
+		switch(.@rand) {
+		case 1:
 			mes "[Woman]";
 			mes "'My aunt stepped on an ant.'";
 			next;
-		} else if (.@nongdum == 2) {
-			mes "[Woman]";
-			mes "I like fun stories. Not so long ago" + .@name$ + "came and told me a funny story.";
-			next;
+			break;
+		case 2:
 			mes "[Woman]";
 			mes "'You eat chili on a chilly day.'";
 			next;
-		} else if (.@nongdum == 3) {
-			mes "[Woman]";
-			mes "I like fun stories. Not so long ago" + .@name$ + "came and told me a funny story.";
-			next;
+			break;
+		case 3:
 			mes "[Woman]";
 			mes "'Why are you putting flour on that flower?'";
 			next;
-		} else if (.@nongdum == 4) {
-			mes "[Woman]";
-			mes "I like fun stories. Not so long ago" + .@name$ + "came and told me a funny story.";
-			next;
+			break;
+		case 4:
 			mes "[Woman]";
 			mes "At the Tool Store, 'Ill buy the needle and thread! You buy the hay to lose the needle in.'";
 			next;
 			mes "[Woman]";
-			mes "said that and was kicked out of the Tool Store.";
+			mes .@name$+" said that and was kicked out of the Tool Store.";
 			next;
-		} else if (.@nongdum == 5) {
+			break;
+		case 5:
 			mes "[Woman]";
-			mes "A Kafra Employee Im friends with told me a story about a customer.";
+			mes "A Kafra Employee I'm friends with told me a story about a customer.";
 			next;
 			mes "[Woman]";
 			mes "'Kafra, the wise never marry and when they marry, they become otherwise.'";
@@ -1488,16 +652,16 @@ malaya,63,185,4	script	Woman#ma08	583,{
 			mes "[Woman]";
 			mes "He he... I do like funny stories but a bit difficult for my taste.";
 			close;
-		} else {
+		default:
 			mes "[Woman]";
-			mes "I like fun stories. Oh by the way!" + .@name$ + ", love is photogenic. Dont you agree?";
+			mes "I like fun stories. Oh by the way! "+.@name$+", love is photogenic. Don't you agree?";
 			next;
 			mes "[Woman]";
 			mes "It needs darkness to develop.";
 			next;
 		}
 		mes "[Woman]";
-		mes "He he. Isnt it fun?";
+		mes "He he. Isn't it fun?";
 		close;
 	}
 	mes "[Woman]";
@@ -1512,9 +676,257 @@ malaya,63,185,4	script	Woman#ma08	583,{
 	next;
 	select("Sounds like a sneaky monster.");
 	mes "[Woman]";
-	mes "Yes, this monster is bad to trick the kindness of travelers but,";
+	mes "Yes, this monster is bad to trick the kindness of travelers but...";
 	next;
 	mes "[Woman]";
-	mes "there is rumor that the monster came from the soul of a baby that never been born. So sad.";
+	mes "There is rumor that the monster came from the soul of a baby that never been born. So sad.";
 	close;
-}
\ No newline at end of file
+}
+
+// Jeepneys
+//============================================================
+function	script	F_Malaya_Jeepney	{
+	.@mapname$        = getarg(0);
+	.@passengers      = getarg(1);
+
+	// set the other messages of varying amount)
+	for (.@i = 5; .@i < getargcount(); .@i++) {
+		setd(".@msgJeepneyInfo$[" + (.@i - 5) + "]", getarg(.@i));
+	}
+
+	if (malaya_hi < 10) {
+		mes "[Jeepney Driver]";
+		mes getarg(2);
+		close;
+	} else if ((malaya_hi >= 10) && (malaya_hi < 20)) {
+		mes "[Jeepney Driver]";
+		mes getarg(3);
+		close;
+	} else {
+		mes "[Jeepney Driver]";
+		mes getarg(4);
+		next;
+	}
+	switch(select("Board [Passenger " + getmapusers(.@mapname$) + "/" + .@passengers +"]:Jeepney?:Are there any other Jeepneys?:Ah... Yes...")) {
+	case 1:
+		if (getmapusers(.@mapname$) >= .@passengers) {
+			mes "[Jeepney Driver]";
+			mes "I'm afraid the Jeepney is full.";
+			mes "I'm sorry but how about some other Jeepney?";
+			close;
+		} else {
+			mes "[Jeepney Driver]";
+			mes "Have a nice day.";
+			close2;
+			warp .@mapname$,29,24;
+			end;
+		}
+	case 2:
+		// iterate through all the jeepney information for this specific NPC
+		for (.@i = 0; .@i < getarraysize(.@msgJeepneyInfo$); .@i++) {
+			mes "[Jeepney Driver]";
+			mes getd(".@msgJeepneyInfo$[" + .@i + "]");
+
+			if (.@i < (getarraysize(.@msgJeepneyInfo$) - 1)) {
+				next;
+			}
+		}
+		close;
+	case 3:
+		mes "[Jeepney Driver]";
+		mes "Oh! Other Jeepneys are in operation, of course.";
+		next;
+		mes "[Jeepney Driver]";
+		mes "In Port Malaya there are 12, 30 and 60 passenger Jeepneys with 3 each operating.";
+		next;
+		mes "[Jeepney Driver]";
+		mes "Would you like to know the location of other cars?";
+		next;
+		switch (select("I'd like to know where the 12 passenger car is.:I'd like to know where the 30 passenger car is.:I'd like to know where the 60 passenger car is.")) {
+		case 1:
+			viewpoint 1, 237, 240, 1, 0xF7E009;
+			viewpoint 1, 67 , 44 , 2, 0xF7E009;
+			viewpoint 1, 282, 129, 3, 0xF7E009;
+			set .@zif_in, 12;
+			break;
+		case 2:
+			viewpoint 1, 134, 250, 4, 0xF7E009;
+			viewpoint 1, 341, 153, 5, 0xF7E009;
+			viewpoint 1, 293, 290, 6, 0xF7E009;
+			set .@zif_in, 30;
+			break;
+		case 3:
+			viewpoint 1, 242, 221, 7, 0xF7E009;
+			viewpoint 1, 62 , 245, 8, 0xF7E009;
+			viewpoint 1, 257, 58 , 9, 0xF7E009;
+			set .@zif_in, 60;
+			break;
+		}
+		mes "[Jeepney Driver]";
+		mes .@zif_in+" passenger Jeepney's location has been marked on your map.";
+		next;
+		break;
+	}
+	mes "[Jeepney Driver]";
+	mes "Have a nice trip.";
+	close;
+}
+
+malaya,237,240,4	script	Jeepney Driver#01	4_M_MALAYA,{
+	callfunc(
+		"F_Malaya_Jeepney",
+		"ma_zif01",
+		12,
+
+		// Messages for malaya_hi checks.
+		"UUrgghhhh.... I'm scared... so scared... what happened to this place?",
+		"The place is still a mess... I wonder if I can operate a jeepney here...",
+		"Ha ha ha Welcome. I am ^1561EAVol^000000, operating the 12 man Jeepney here.",
+
+		// Monologues of variable lengths.
+		"Is this your first time in Port Malaya?",
+		"Jeepney drivers here also promote Jeepneys, so let me explain them to you.",
+		"Jeepneys were first developed to transport goods quickly, but are now used as public transport.",
+		"Since everybody has different tastes, you can see those with cool and elaborate decorations.",
+		"Of course you don't need to drive them yourselves, but you can ride them so please feel free to do so."
+	);
+}
+
+malaya,67,44,4	script	Jeepney Driver#02	4_M_MALAYA,{
+	callfunc(
+		"F_Malaya_Jeepney",
+		"ma_zif02",
+		12,
+
+		"Wha... What's... Going on in that hospital...",
+		"I think the moaning coming from the hospital has lessened...",
+		"I'm ^1561EAChui^000000, operating a 12 man Jeepney. Hi there~",
+
+		"Is this your first time in Port Malaya?",
+		"Jeepney drivers here also promote Jeepneys, so let me explain them to you.",
+		"Jeepneys were first developed to transport goods quickly, but are now used as public transport.",
+		"I modified my Jeepney myself...",
+		"For safety reasons there's a limit to the number of passengers, and it's safe so no worries..."
+	);
+}
+
+malaya,282,129,4	script	Jeepney Driver#03	4_M_MALAYA,{
+	callfunc(
+		"F_Malaya_Jeepney",
+		"ma_zif03",
+		12,
+
+		"It's not good for outsiders to have a chat... Perhaps the Mumbaki Leader may have the solution for this.",
+		"Are you the adventurer who recently met Mumbaki? No wait... Then you shouldn't be here... Yes it's a ghost... Arghhhh...",
+		"The name's ^1561EATop^000000, operating one of the 3 12 man Jeepneys in town.",
+
+		"First time in town?",
+		"Jeepney drivers here also promote Jeepneys, so let me explain them to you.",
+		"Jeepneys were first developed to transport goods quickly, but are now used as public transport.",
+		"They all look different depending on their drivers...",
+		"Now it is the fame of Port Malaya."
+	);
+}
+
+malaya,134,250,6	script	Jeepney Driver#04	4_M_MALAYA,{
+	callfunc(
+		"F_Malaya_Jeepney",
+		"ma_zif04",
+		30,
+
+		"G...Go... Go away...",
+		"Arghh... Scared the devil out of me... Go away... Shoo...",
+		"^1561EABrav^000000, 30 man Jeepney driver at your service, driving as safely as I can since I get scared easily.",
+
+		"Is this your first time in Port Malaya?",
+		"Jeepneys were first developed to transport goods quickly, but are now used as public transport.",
+		"The modified cars are decorated by their operators.",
+		"You come to Port Malaya, you must ride a Jeepney.",
+		"Ha ha ha, of course you can't drive it yourself."
+	);
+}
+
+malaya,341,153,4	script	Jeepney Driver#05	4_M_MALAYA,{
+	callfunc(
+		"F_Malaya_Jeepney",
+		"ma_zif05",
+		30,
+
+		"G... Ghosts in town... Hey... Do you have one on you?",
+		"I think there are fewer ghosts now... The town is slightly quieter...",
+		"Hi I'm ^1561EALivil^000000 operator for the 30 man Jeepney. Safety is my priority.",
+
+		"First time in town?",
+		"I'll give you a quick guide as a service.",
+		"Jeepneys were first developed to transport goods quickly, but are now used as public transport.",
+		"For safety reasons, Jeepneys have a limit on the number of passengers.",
+		"Some carried 180 people, but there aren't any of those in Port Malaya today."
+	);
+}
+
+malaya,293,290,6	script	Jeepney Driver#06	4_M_MALAYA,{
+	callfunc(
+		"F_Malaya_Jeepney",
+		"ma_zif06",
+		30,
+
+		"Gu... Guards... What are the guards doing...",
+		"Did the guards finally do something? Phew... What a rush...",
+		"I'm ^1561EAGad^000000, the trustworthy 30 man Jeepney driver.",
+
+		"I see you're new to this town.",
+		"To guide travelers is also my task!! Let me explain.",
+		"Jeepneys were goods transport vehicles, now decorated and modified with Port Malaya's new technology!!",
+		"This Jeepney is my very own handiwork. Ha ha ha... It's cool right? Ha ha ha",
+		"Even though the customer is king, I can't let you drive it... Ha ha ha"
+	);
+}
+
+malaya,242,221,4	script	Jeepney Driver#07	4_M_MALAYA,{
+	callfunc(
+		"F_Malaya_Jeepney",
+		"ma_zif07",
+		60,
+
+		"Oh no... I think the whole village is bewitched by ghosts... Maybe... I should give the Mumbaki Leader a visit...",
+		"Ghost... I'm sure the Mumbaki Leader knows how to get rid of these ghosts...",
+		"^1561EAHott^000000, at your service, the safest 60 man Jeepney Operator.",
+
+		"Jeepney is the public transportation of Port Malaya.",
+		"Therefore they are everywhere. And it's free! I know they all have different passenger limits, but that's no problem because they're everywhere."
+	);
+}
+
+malaya,62,245,6	script	Jeepney Driver#08	4_M_MALAYA,{
+	callfunc(
+		"F_Malaya_Jeepney",
+		"ma_zif08",
+		60,
+
+		"Shoo~ Be gone if you're a ghost, and go away even if you're human~ Shoo~",
+		"Hey... You... Are human right? Right? Huh? Say you are... Please...",
+		"Hullo, I'm ^1561EAMuyan^000000, operator of this 60 man Jeepney. Nice to meet you.",
+
+		"Jeepneys are public transport, so safety is our priority.",
+		"My Jeepney received the best class of Port Malaya, a '60 man Jeepney' certificate.",
+		"Meaning!! That it is perfectly safe!! Don't you worry about the ride."
+	);
+}
+
+malaya,257,58,6	script	Jeepney Driver#09	4_M_MALAYA,{
+	callfunc(
+		"F_Malaya_Jeepney",
+		"ma_zif09",
+		60,
+
+		"...You're an outsider... Don't go touching anything and be careful in town...",
+		"The town is still quite dangerous. Best not touch anything until it is safe.",
+		"Hi there. I'm ^1561EAGramma^000000, Operator of the 60 man Jeepney of Port Malaya.",
+
+		"Is this your first time in Port Malaya?",
+		"We Jeepney drivers here also promote Jeepneys, so let me explain them to you.",
+		"Jeepneys were first developed to transport goods quickly, but are now used as public transport.",
+		"Since everybody have different tastes, you can see those with cool and elaborate decorations.",
+		"Of course you don't need to drive them yourselves, but you can ride them so please feel free to do so."
+	);
+}
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index 80c1af43c..5fefc2059 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -1,321 +1,1186 @@
 //===== Hercules Script ======================================
 //= Mora Village
-//===== By: ================================================== 
-//= SuperHulk
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
+//= [Official Conversion]
 //= Mora Town Script
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [SuperHulk]
 //= 1.1 Translations to English. [Flaid]
 //= 1.1a Standardized. [Euphy]
 //= 1.2 Added new NPCs. [Flaid]
-//============================================================ 
+//= 1.3 Replaced with full iRO town NPCs. [Euphy]
+//= 1.4 Updated to match the official scripts. [Euphy]
+//============================================================
 
-mora,185,163,5	script	Mora Citizen#1	516,{
-	mes "[Scholar Gary]";
-	mes "Hello, traveler!";
-	mes "I'm Gary, the expert about enchantments in this area.";
-	mes "What do you want to know?";
+// Set 1 :: mora_resident
+//============================================================
+mora,52,138,5	script	Mungmung#p	4_M_RAFLE_GR,{
+	mes "[Mungmung]";
+	mes "I'm not the innkeeper!";
+	mes "Why do people want to pay me when they see me?";
+	close;
+}
+
+mora,160,123,3	script	Nemnem#p	4_M_RAFLE_OLD,{
+	mes "[Nemnem]";
+	mes "My pain is getting worse and worse";
+	mes "since the crevice appeared in Bifrost.";
+	mes "Are you responsible for it, young one?";
+	next;
+	switch(select("Of course I am!:That's an unfair accusation!")) {
+	case 1:
+		mes "[Nemnem]";
+		mes "Bra~vo!";
+		emotion e_awsm;
+		close;
+	case 2:
+		mes "[Nemnem]";
+		mes "If not, never mind!";
+		emotion e_swt2,1;
+		close;
+	}
+}
+
+mora,105,104,3	script	Boaster#podo	4_M_DOGTRAVELER2,{
+	mes "[Boaster]";
+	mes "So the situation";
+	mes "was at its worst.";
+	next;
+	mes "[Raffles]";
+	mes "Oh~!";
+	next;
+	mes "[Boaster]";
+	mes "Bored to death, I started to cry.";
+	mes "Then I fell asleep, tired from all the crying.";
+	mes "And when I woke up,";
+	mes "I was even more bored";
+	mes "than before!";
+	next;
+	mes "[Raffles]";
+	mes "Oh, oh!";
+	mes "That's terrible, so terrible.";
+	mes "How could that happen?!";
+	next;
+	mes "[Boaster]";
+	mes "So the situation got";
+	mes "more and more serious...";
+	mes "Now give me some more coins.";
+	emotion e_swt2,1;
+	close;
+}
+
+mora,105,100,1	script	Rangrang#p	4_F_RAFLE_PK,{
+	mes "[Rangrang]";
+	mes "I've never heard such a boring and sad story.";
+	mes "I feel like crying!";
+	close;
+}
+
+/*
+// Disabled due to overlapping with RangRang,
+// and is not clickable on official servers.
+mora,105,100,1	script	Gurgur#p	4_M_RAFLE_GR,{
+      mes "[Gurgur]";
+      mes "He's been crying, falling asleep,";
+      mes "and then waking up for 210 times now.";
+      mes "Isn't it just so original?";
+      mes "I wonder how the story will end.";
+      close;
+}
+*/
+
+mora,99,100,7	script	Decoy#podo	4_F_DOGTRAVELER,{
+	mes "[A Decoy]";
+	mes "Oh~!";
+	mes "That's just so";
+	mes "unbelievable!";
+	mes "I'm so curious, let's give him some coins!";
+	close;
+}
+
+mora,98,104,5	script	Moved Raffle#podo	4_M_RAFLE_GR,{
+	mes "[Moved Raffle]";
+	mes "This is sad, too sad!";
+	mes "I'm not sure why,";
+	mes "but it must be sad";
+	mes "because everybody else says so.";
+	close;
+}
+
+mora,102,107,5	script	Relieved Raffle#podo	4_M_RAFLE_OLD,{
+	mes "[Relieved Raffle]";
+	mes "Wow~!";
+	mes "This is exciting.";
+	mes "He woke up safe and sound again!";
+	mes "Well, I'm sure he will next time!";
+	mes "...";
+	next;
+	mes "[Relieved Raffle]";
+	mes "Eh?";
+	close;
+}
+
+mora,101,107,5	script	Excited Raffle#podo	4_F_RAFLE_PK,{
+	mes "[Excited Raffle]";
+	mes "Wow~";
+	mes "The story is no fun at all.";
+	mes "Wow~!";
+	mes "But it's as if we were singing in chorus -";
+	mes "it's really fun.";
+	mes "Wow~!";
+	close;
+}
+
+mora,103,100,5	script	Impressed Raffle#podo	4_F_RAFLE_PK,{
+	mes "[Impressed Raffle]";
+	mes "Wow! Wow!";
+	close;
+}
+
+mora,123,94,7	script	Visitor to Mora#podo1	4_F_DOGTRAVELER,{
+	mes "[Visitor to Mora]";
+	mes "I'm stuck here because of the crevice, which appeared out of nowhere.";
+	mes "Ha......";
+	close;
+}
+
+mora,155,72,3	script	Visitor to Mora#podo2	4_M_DOGTRAVELER,{
+	mes "[Visitor to Mora]";
+	mes "Isn't this one cheerful village?";
+	mes "With Bifrost blocked like that, I'm thinking of settling here permanently.";
+	close;
+}
+
+mora,184,169,5	script	Worker#mo1	4_M_RAFLE_GR,{
+	mes "[Worker]";
+	mes "I heard that somebody made it out of the Labyrinth Forest alive.";
+	mes "Whoever it is, I want to meet this person myself.";
+	close;
+}
+
+mora,179,155,1	script	Novice Worker#mo	4_M_RAFLE_GR,{
+	mes "[Novice Worker]";
+	mes "I'll come out of the Labyrinth Forest and become a hero!";
+	next;
+	mes "[Indifferent Worker]";
+	mes "I hear somebody already did that.";
+	next;
+	mes "[Novice Worker]";
+	mes "What if I say I'm that somebody?";
+	next;
+	mes "[Indifferent Worker]";
+	mes "Forget it. It's more believable";
+	mes "to say I did it.";
+	next;
+	mes "[Novice Worker]";
+	mes "Well, that's true.";
+	close;
+}
+
+mora,177,157,5	script	Indifferent Worker#mo	4_F_RAFLE_PK,{
+	mes "[Novice Worker]";
+	mes "I'll come out of the Labyrinth Forest and become a hero!";
+	next;
+	mes "[Indifferent Worker]";
+	mes "I hear somebody already did that.";
+	next;
+	mes "[Novice Worker]";
+	mes "What if I say I'm that somebody?";
+	next;
+	mes "[Indifferent Worker]";
+	mes "Forget it. It's more believable";
+	mes "to say I did it.";
+	next;
+	mes "[Novice Worker]";
+	mes "Well, that's true.";
+	close;
+}
+
+mora,108,182,5	script	Worker#mo4	4_M_RAFLE_GR,{
+	mes "[Worker]";
+	mes "Stay clear of the Labyrinth Forest.";
+	mes "Don't ever dream of peeking in out of curiosity.";
+	mes "Lots of travelers have gone missing after going there.";
+	close;
+}
+
+// Set 2 :: npc
+//============================================================
+mora,122,97,6	script	Relaxing Raffle#ep14_1	4_M_RAFLE_OLD,{
+	mes "[Relaxing Rafflesia]";
+	mes "The public bath in the center of the village is a symbol of Mora Village.";
+	next;
+	mes "[Relaxing Rafflesia]";
+	mes "It's not just a simple puddle.";
+	mes "It has tremendous power";
+	mes "to heal wounds.";
+	next;
+	mes "[Relaxing Rafflesia]";
+	mes "Try walking in the bath";
+	mes "if you want to see for yourself.";
+	mes "It will slowly but surely heal your wounds.";
+	close;
+}
+
+mora,174,171,0	script	Warehouse Worker#mo1	4_F_RAFLE_PK,{
+	mes "[Shortffle]";
+	mes "I want to climb the ladder,";
+	mes "but my legs are too short to do that.";
+	emotion e_sob;
 	next;
-	switch(select("Fundamentals of enchantment.:Nothing.")) {
+	mes "[Shortffle]";
+	mes "I wonder who brought it here.";
+	close;
+}
+
+mora,113,185,4	script	Reading Raffle#ep14_1	4_M_RAFLE_GR,{
+	mes "You see a Rafflesia";
+	mes "lost in reading.";
+	next;
+	switch(select("See what he's reading.:Leave him alone.")) {
 	case 1:
-		mes "[Scholar Gary]";
-		mes "Ah, I see that you are interested";
-		mes "in enchantments!";
-		mes "Alright, here are the basics!!";
-		mes "After this you should understand";
-		mes "the mysteries of our enchantments!";
+		mes "Curious about what he's reading,";
+		mes "you quietly approach him from behind.";
+		mes "The Rafflesia is reading in a low voice.";
+		next;
+		mes "[Reading Rafflesia]";
+		mes "Seiren was going to Eremes's.";
+		mes "He was going there to borrow";
+		mes "Eremes's reference books,";
+		next;
+		mes "[Reading Rafflesia]";
+		mes "but he also hoped to see";
+		mes "his beautiful sister, Seiren.";
+		mes "Seiren knocked on Eremes's door";
+		mes "with his heart pounding.";
 		next;
-		mes "[Scholar Gary]";
-		mes "First of all, you must know";
-		mes "that this is magic, not an";
-		mes "exact science.";
+		mes "[Reading Rafflesia]";
+		mes "Knock! Knock! Knock!";
+		mes "Excuse me. Is anybody there?";
+		mes "... ... ...";
+		mes "He doesn't hear anything.";
 		next;
-		mes "[Scholar Gary]";
-		mes "You don't really know what will";
-		mes "happen. You can be lucky or";
-		mes "unlucky, and get a more or";
-		mes "less powerful enchantment.";
+		mes "[Reading Rafflesia]";
+		mes "Is there nobody home?";
+		mes "He knocked again,";
+		mes "afraid that he might have";
+		mes "made the trip for nothing.";
 		next;
-		mes "[Scholar Gary]";
-		mes "You can miss the magic, too!";
-		mes "If this happens while your equip";
-		mes "is being enchanted, you'll lose it";
-		mes "all previous enchantments, cards, and the refine!";
+		mes "[Reading Rafflesia]";
+		mes "Knock! Knock! Knock!";
+		mes "No answer again. Is there nobody home?";
+		mes "He knew it was rude to do that,";
+		mes "but he decided to enter anyway";
+		mes "and wait for Eremes to come back home.";
 		next;
-		mes "[Scholar Gary]";
-		mes "There is also a risk of";
-		mes "breaking your equipment";
-		mes "while trying to enchant";
-		mes "your equip with a second enchantment!";
+		mes "[Reading Rafflesia]";
+		mes "Seiren opened the front door";
+		mes "with his heart throbbing.";
+		mes "*squeak*";
+		mes "The door wasn't locked.";
+		mes "Eremes seems to be away for a while.";
 		next;
-		mes "[Scholar Gary]";
-		mes "Each attempt to enchant will cost";
-		mes "you 1 Mora coin and 100,000 zeny.";
-		mes "If you don't know yet, the money";
-		mes "made with this service goes";
-		mes "straight to the people of Mora!";
+		mes "[Reading Rafflesia]";
+		mes "Seiren entered the house hesitantly.";
+		mes "The moment he stepped into the house,";
+		mes "he heard a sound of water running.";
 		next;
-		mes "[Scholar Gary]";
-		mes "Those were the basics.";
-		mes "Take them to your heart.";
-		mes "For more details, you can";
-		mes "always visit my master,";
-		mes "Gougueulé Tonami!";
+		mes "[Reading Rafflesia]";
+		mes "Seiren suddenly came to his senses,";
+		mes "and turned back to go out.";
+		mes "But right at the moment!!";
+		next;
+		mes "[Reading Rafflesia]";
+		mes "*thud*";
+		mes "The bathroom door opened,";
+		mes "and with white steam pouring out came a foot.";
+		next;
+		mes "[Reading Rafflesia]";
+		mes "Seiren's heart almost stopped";
+		mes "at the sight of it. And a moment later,";
+		mes "somebody came out from the bathroom,";
+		mes "with just a towel around her body.";
+		next;
+		mes "[Reading Rafflesia]";
+		mes "With her body still wet";
+		mes "from the shower...";
+		next;
+		mes "[Reading Rafflesia]";
+		mes "*gasp* Who are you? How long";
+		mes "were you standing there? How rude.";
+		emotion e_omg;
+		next;
+		mes "The Rafflesia closed the book hastily.";
+		mes "You're curious what will happen next,";
+		mes "but you've been rude enough,";
+		mes "so you just give up.";
 		close;
 	case 2:
-		mes "[Scholar Gary]";
-		mes "Goodbye, and good luck!";
+		mes "You leave the place quietly";
+		mes "in order not to disturb";
+		mes "the Rafflesia, who was lost in reading.";
 		close;
 	}
 }
 
-mora,52,138,8	script	Mora Citizen#2	516,{
-	mes "[Valere]";
-	mes "Hello, adventurer!";
-	mes "You look like you're";
-	mes "lost, aren't you!?";
+mora,99,65,6	script	Banana Rafflesia#ep14_1	4_M_RAFLE_GR,{
+	mes "[Banana Rafflesia]";
+	mes "You want a banana?";
 	next;
-	mes "[Valere]";
-	mes "...";
-	mes "Ah, okay.";
-	mes "But you look like you want to";
-	mes "enchant your equipment!";
-	next;
-	mes "[Valere]";
-	mes "I only need to know one thing";
-	mes "before telling you more about";
-	mes "the Mora equipment enchants!";
-	mes "So tell me, what is your class?";
-	next;
-	switch(select("Warlock.:Arch Bishop.:Ranger.:Guillotine Cross.:Rune Knight.:Other.:Goodbye.")) {
+	switch(select("Yes, I do.:No, thanks.")) {
 	case 1:
-		mes "[Valere]";
-		mes "Hmm, you should visit the";
-		mes "Artifact Crafter.";
-		mes "That is our enchantment specialist";
-		mes "for Warlock equipment!";
+		mes "[Banana Rafflesia]";
+		mes "Take it if you can.";
+		mes "If you are successful, you can have it for free.";
+		emotion e_ok;
 		close;
 	case 2:
-		mes "[Valere]";
-		mes "Hmm, you should visit the";
-		mes "Master of Relics.";
-		mes "That is our enchantment specialist";
-		mes "for Arch Bishop equipment!";
-		close;
-	case 3:
-	case 4:
-	case 5:
-		mes "[Valere]";
-		mes "Hmm, you should visit the";
-		mes "Artifact Researcher.";
-		mes "That is our enchantment specialist";
-		mes "for Ranger, Guillotine Cross,";
-		mes "and Rune Knight equipment!";
-		close;
-	case 6:
-		mes "[Valere]";
-		mes "Hmm, there is the Master Tailor";
-		mes "who sells and enchants the 'Army Padding'.";
-		next;
-		mes "[Valere]";
-		mes "There's also the Pendant Crafter";
-		mes "who enchants 'Pendant of Guardian'.";
-		next;
-		mes "[Valere]";
-		mes "And finally the Bulberry Westhood";
-		mes "who enchants 'Loki's muffler'.";
-		close;
-	case 7:
-		mes "[Valere]";
-		mes "Goodbye, and good luck!";
+		mes "[Banana Rafflesia]";
+		mes "Well, I was going to give it for free,";
+		mes "but if you don't want it, it's fine with me.";
+		emotion e_pif;
 		close;
 	}
 }
 
-mora,160,123,5	script	Mora Citizen#3	517,{
-	mes "[Boudril]";
-	mes "Hey, you seem to be";
-	mes "so far from home!";
-	mes "Mora is a remote town.";
-	mes "That's why we have";
-	mes "own currency here!";
+mora,30,128,4	script	Relaxing Traveler#ep14_1	4_M_DOGTRAVELER2,{
+	mes "[Traveler]";
+	mes "The Mora Inn is famous";
+	mes "for its unusual pieces of furniture.";
+	mes "Mushroom closets and apple dressers...";
+	mes "Aren't they so innovative?";
 	next;
-	mes "[Boudril]";
-	mes "Beyond that, our community";
-	mes "developed this craft.";
-	mes "Items found here cannot";
-	mes "be found anywhere else!";
+	select("... ... ...");
+	mes "[Traveler]";
+	mes "Sorry... maybe it's just me...";
+	emotion e_sry;
 	close;
 }
 
-mora,105,100,3	script	Mora Citizen#4	518,{
-	mes "[Buisso]";
-	mes "Hello, my friend.";
-	mes "What brings you to this";
-	mes "place, so far from home?";
-	mes "Are you looking for a challange?";
-	mes "You won't be disappointed here!";
+mora,130,96,4	script	Relaxing Traveler#ep14_2	4_M_DOGTRAVELER,{
+	mes "[Traveler]";
+	mes "The Rafflesia in Mora Village all look alike, so it's so confusing.";
+	mes "It's like looking at centuplets...";
 	next;
-	mes "[Buisso]";
-	mes "We are surrounded by the";
-	mes "Bifrost, an area with powerful";
-	mes "and deceitful monsters...";
-	mes "So cute, but still dangerous.";
+	mes "[Traveler]";
+	mes "However! If you look closely,";
+	mes "you'll find each of them has a personality.";
+	mes "To find it is one of the fun things";
+	mes "you can do in the village.";
 	close;
 }
 
-mora,98,104,4	script	Mora Citizen#5	516,{
-	mes "[Malavida]";
-	mes "...";
-	mes "What!? I look depressed!?";
-	mes "It's normal living here!";
-	mes "My dream was to be like you!";
-	next;
-	mes "[Malavida]";
-	mes "Traveling around the world,";
-	mes "chasing monsters,";
-	mes "hunting treasure...";
-	mes "You have the chance. Use it!";
+mora,43,113,4	script	Wounded Rafflesia#ep14_1	4_M_RAFLE_OLD,{
+	mes "[Wounded Raffle]";
+	mes "Ugghh... What was it";
+	mes "that was in the bath... Arrrghh...";
+	mes "To attack suddenly like that... Be careful...";
+	mes "Whatever it is in there, it's very aggressive.";
 	close;
 }
 
-mora,102,107,6	script	Mora Citizen#6	517,{
-	mes "[Skape]";
-	mes "Have you tasted our dish?";
-	mes "The beef toast!?";
-	mes "This delicious beef only";
-	mes "exists in the Bifrost!";
+mora,168,161,4	script	Warehouse Worker#mo2	4_M_DOGTRAVELER,{
+	mes "[Lively]";
+	mes "The inn over there~";
+	mes "It should've been mine~";
+	next;
+	mes "[Lively]";
+	mes "The store over there~";
+	mes "It should've been mine as well~";
 	next;
-	mes "[Skape]";
-	mes "If you want to taste this";
-	mes "dish, visit our chef.";
-	mes "He makes the best";
-	mes "Mora beef toast!";
+	mes "[Lively]";
+	mes "The warehouse here~";
+	mes "and all the things in it~";
+	mes "All of those should've been mine~";
+	mes "All of those should've been mine~";
+	next;
+	mes "[Lively]";
+	mes "Ahhh... I'd like to make money...";
+	emotion e_sob;
 	close;
 }
 
-mora,101,107,4	script	Mora Citizen#7	518,{
-	mes "[Wouadel Kami]";
-	mes "*Dances*";
-	mes "I'm a choreographer, but";
-	mes "nobody understands me.";
-	mes "*doridori*";
-	mes "*bingbing*";
-	mes "*bangbang*";
+mora,175,161,6	script	Warehouse Worker#mo3	4_F_RAFLE_PK,{
+	mes "[Kuorita]";
+	mes "Oh... this duck...";
+	next;
+	mes "[Kuorita]";
+	mes "Its slender red beak...";
+	mes "and the blush on its cheeks...";
+	mes "and its wings, ready to take off";
+	mes "any moment...";
+	emotion e_shy;
+	next;
+	mes "[Kuorita]";
+	mes "I want to have it badly...";
+	mes "What would happen if I stole it?";
+	emotion e_rice;
 	close;
 }
 
-mora,103,100,6	script	Mora Citizen#8	518,{
-	mes "[Didier Lans]";
-	mes "Yooo gaba gaba!";
-	mes "Hello, my dear. You've heard";
-	mes "about my teachings, have you?";
-	mes "Do not hit your friends!";
-	mes "*makes small steps backwards*";
-	next;
-	mes "[Didier Lans]";
-	mes "Yooo gaba gaba!";
-	mes "Eat your vegetables.";
-	mes "*is the fool*";
-	mes "Be smart, be polite!";
-	mes "Yooo gaba gaba!";
+mora,140,186,3	script	Raffle Philosopher	4_M_RAFLE_OLD,{
+	mes "[Raffle Philosopher]";
+	mes "With a little token of appreciation, I will tell you a quote that will help you in your life.";
+	next;
+	if(select("Give him a token of appreciation.:Can't you just tell me?") == 2) {
+		mes "[Raffle Philosopher]";
+		mes "You don't get something for nothing.";
+		close;
+	}
+	mes "[Raffle Philosopher]";
+	mes "How much are you willing to give me?";
+	mes "You can pay me in the currencies listed below.";
+	mes "Enter the sum you're willing to pay. Enter 0 if you don't want to pay anything.";
+	next;
+	input .@input;
+	if (.@input == 0) {
+		mes "[Raffle Philosopher]";
+		mes "So you don't want to hear a quote, eh?";
+		close;
+	} else if (.@input < 100 || .@input > 1000000) {
+		mes "[Raffle Philosopher]";
+		mes "You can pay between ^FF0000100 and 1000000^000000.";
+		close;
+	} else if (Zeny < .@input) {
+		mes "[Raffle Philosopher]";
+		mes "So you think this is what my time is worth?";
+		close;
+	}
+	mes "[Raffle Philosopher]";
+	mes "The quote I'm going to tell you is...";
+	mes "Let's see... Wait a second.";
+	Zeny -= .@input;
+	next;
+	mes ". . . . . . . . .";
+	next;
+	mes ". . . . . . . . .";
+	next;
+	mes ". . . . . . . . .";
+	next;
+	mes "[Raffle Philosopher]";
+	mes "Okay! I think this is the one for you.";
+	next;
+	mes "[Raffle Philosopher]";
+	mes strcharinfo(0)+", the quote I'm going to tell you is...";
+	switch(rand(1,70)) {
+	case 1:
+		mes "Nothing is more difficult,";
+		mes "and therefore more precious,";
+		mes "than to be able to decide.";
+		mes "- Napoleon Bonaparte -";
+		break;
+	case 2:
+		mes "Sometimes we stare so long at a door that is closing,";
+		mes "that we see too late the one that is open.";
+		mes "- Alexander Graham Bell -";
+		break;
+	case 3:
+		mes "If it's that painful, why do you keep doing it?";
+		mes "The answer's simple.";
+		mes "Because it makes my heart beat,";
+		mes "because it excites me.";
+		mes "My body might suffer, but I'm a lot happier";
+		mes "doing what I have always wanted to do.";
+		mes "- Biya Han -";
+		break;
+	case 4:
+		mes "You cannot persuade anybody";
+		mes "before you change yourself.";
+		mes "- Cheoljong Ko -";
+		break;
+	case 5:
+		mes "Never regret what you have chosen.";
+		mes "- Miyoung Ko -";
+		break;
+	case 6:
+		mes "A man is not finished when he is defeated.";
+		mes "He is finished when he quits.";
+		mes "- Richard Nixon -";
+		break;
+	case 7:
+		mes "Failure is instructive.";
+		mes "The person who really thinks";
+		mes "learns quite as much from his failures";
+		mes "as from his successes.";
+		mes "- John Dewey -";
+		break;
+	case 8:
+		mes "We sow our thoughts, and we reap our actions;";
+		mes "we sow our actions, and we reap our habits;";
+		mes "we sow our habits, and we reap our characters;";
+		mes "we sow our characters, and we reap our destiny.";
+		mes "- Erasmus -";
+		break;
+	case 9:
+		mes "There is no greater folly";
+		mes "in the world";
+		mes "than for a man to despair.";
+		mes "- Miguel de Cervantes -";
+		break;
+	case 10:
+		mes "Humility is the most difficult";
+		mes "of all virtues to achieve,";
+		mes "nothing dies harder than the desire";
+		mes "to think well of oneself.";
+		mes "- T. S. Eliot -";
+		break;
+	case 11:
+		mes "You have to assess your talent...";
+		mes "and ask yourself if this is going to be";
+		mes "an avocation or a job.";
+		mes "- Norma Clayton -";
+		break;
+	case 12:
+		mes "An eye for an eye";
+		mes "only ends up";
+		mes "making the whole world blind.";
+		mes "- Gandhi-";
+		break;
+	case 13:
+		mes "A man of no talent";
+		mes "craves long life,";
+		mes "yet a fool, if offered eternity,";
+		mes "would not know what to do with it.";
+		mes "- Solzhenitsyn -";
+		break;
+	case 14:
+		mes "It is not because the truth is too difficult to see that we make mistakes...";
+		mes "we make mistakes because the easiest and most comfortable course for us";
+		mes "is to seek insight where it accords with our emotions - especially selfish ones.";
+		mes "- Solzhenitsyn -";
+		break;
+	case 15:
+		mes "Beware of a man";
+		mes "of one book.";
+		mes "- English Proverb -";
+		break;
+	case 16:
+		mes "Bees drink water to make honey,";
+		mes "and snakes drink water to make poison.";
+		mes "- English Proverb -";
+		break;
+	case 17:
+		mes "Despair is an illness leading to death.";
+		mes "- Kierkegaard -";
+		break;
+	case 18:
+		mes "To eat bread without hope is";
+		mes "still slowly to starve to death.";
+		mes "- Pearl Buck -";
+		break;
+	case 19:
+		mes "Optimism is the faith that leads to achievement.";
+		mes "Nothing can be done";
+		mes "without hope and confidence.";
+		mes "- Helen Keller -";
+		break;
+	case 20:
+		mes "Look deep into nature,";
+		mes "and then you will understand";
+		mes "everything better.";
+		mes "- Albert Einstein -";
+		break;
+	case 21:
+		mes "Many of life's failures are";
+		mes "people who did not realize";
+		mes "how close they were";
+		mes "to success";
+		mes "when they gave up.";
+		mes "- Thomas Edison -";
+		break;
+	case 22:
+		mes "I have more fun and enjoy more financial success";
+		mes "when I stop trying";
+		mes "to get what I want";
+		mes "and start helping other people ";
+		mes "get what they want.";
+		mes "- Spencer Johnson, Larry Wilson -";
+		break;
+	case 23:
+		mes "Age is like love, it cannot be hid.";
+		mes "- Thomas Dekker -";
+		break;
+	case 24:
+		mes "We can't become";
+		mes "what we need to be";
+		mes "by remaining what we are.";
+		mes "- Oprah Winfrey -";
+		break;
+	case 25:
+		mes "Turn your wounds.";
+		mes "into wisdom.";
+		mes "- Oprah Winfrey -";
+		break;
+	case 26:
+		mes "Pain is the great teacher of mankind.";
+		mes "- Marie E. Eschenbach -";
+		break;
+	case 27:
+		mes "The superior man thinks always";
+		mes "of virtue; the common man";
+		mes "thinks of comfort.";
+		mes "- Confucius -";
+		break;
+	case 28:
+		mes "Pleasure is often spoiled by describing it.";
+		mes "- Stendhal -";
+		break;
+	case 29:
+		mes "The end comes when we";
+		mes "no longer talk with ourselves.";
+		mes "It is the end of genuine thinking";
+		mes "and the beginning of the final loneliness.";
+		mes "- Edward Gibbon -";
+		break;
+	case 30:
+		mes "They who have conquered doubt and fear";
+		mes "have conquered failure.";
+		mes "- James Allen -";
+		break;
+	case 31:
+		mes "Our greatest pride was";
+		mes "not that we never fail, but rather";
+		mes "that we always stand up when we fall.";
+		mes "- Confucius -";
+		break;
+	case 32:
+		mes "When you love a person";
+		mes "all fear disappears.";
+		mes "And when you are afraid all love disappears.";
+		mes "- Osho Rajneesh -";
+		break;
+	case 33:
+		mes "The power of our unconscious mind is enormous;";
+		mes "what we cannot do in our conscious state";
+		mes "we can do with the help";
+		mes "of the unconscious mind";
+		mes "more sensible than the conscious.";
+		mes "- Osho Rajneesh -";
+		break;
+	case 34:
+		mes "Truth is simple. Very simple-";
+		mes "so simple that a child can understand it.";
+		mes "In fact, so simple that only a child can understand it.";
+		mes "Unless you become a child again";
+		mes "you will not be able to understand it.";
+		mes "It is an experience, not speculation.";
+		mes "- Osho Rajneesh -";
+		break;
+	case 35:
+		mes "The best and most beautiful things in the world";
+		mes "cannot be seen or even touched -";
+		mes "they must be felt with the heart.";
+		mes "- Helen Keller -";
+		break;
+	case 36:
+		mes "Never bend your head. Always hold it high.";
+		mes "Look the world straight in the eye.";
+		mes "- Helen Keller -";
+		break;
+	case 37:
+		mes "Alone we can do so little;";
+		mes "together we can do so much.";
+		mes "- Helen Keller -";
+		break;
+	case 38:
+		mes "The highest result of education is tolerance.";
+		mes "- Helen Keller -";
+		break;
+	case 39:
+		mes "We are, each of us";
+		mes "angels with only one wing;";
+		mes "and we can only fly";
+		mes "by embracing one another.";
+		mes "- Luciano de Crescenzo -";
+		break;
+	case 40:
+		mes "He that feeds himself from waiting could die of hunger.";
+		mes "- Danish Proverb -";
+		break;
+	case 41:
+		mes "A bad peace is better";
+		mes "than a good war.";
+		mes "- Russian Proverb -";
+		break;
+	case 42:
+		mes "He who wants to warm himself";
+		mes "in old age must build";
+		mes "a fireplace in his youth.";
+		mes "- German Proverb -";
+		break;
+	case 43:
+		mes "Those who are choosy often pick the worst.";
+		mes "- Ilocano Proverb -";
+		break;
+	case 44:
+		mes "Even a God will lose money";
+		mes "after three days of gambling.";
+		mes "- Chinese Proverb -";
+		break;
+	case 45:
+		mes "I fear not the man";
+		mes "who has practiced 10,000 kicks once,";
+		mes "but I fear the man";
+		mes "who has practiced one kick 10,000 times.";
+		mes "- Bruce Lee -";
+		break;
+	case 46:
+		mes "The best way to be remembered";
+		mes "is to have a life.";
+		mes "worth remembering.";
+		mes "- Bruce Lee -";
+		break;
+	case 47:
+		mes "To know oneself is to study oneself";
+		mes "in action with another person.";
+		mes "- Bruce Lee -";
+		break;
+	case 48:
+		mes "I'm not one of those,";
+		mes "who do not believe";
+		mes "in love at first sight,";
+		mes "but I believe in taking a second look.";
+		mes "- Bruce Lee -";
+		break;
+	case 49:
+		mes "One should never rush marriage.";
+		mes "Unlike fruit, marriage is";
+		mes "always in season.";
+		mes "- Leo Tolstoy -";
+		break;
+	case 50:
+		mes "Those who want to succeed";
+		mes "will find a way, those who";
+		mes "don't will find an excuse.";
+		mes "- Leo Aguila -";
+		break;
+	case 51:
+		mes "Motivation is what gets you started.";
+		mes "Habit is what keeps you going.";
+		mes "- Jim Ryan -";
+		break;
+	case 52:
+		mes "He has achieved success who has lived well,";
+		mes "laughed often, and loved much.";
+		mes "- Bessie Stanley -";
+		break;
+	case 53:
+		mes "A poor person spends his money";
+		mes "and invests the rest.";
+		mes "A rich person invests his money";
+		mes "and spends what's left.";
+		mes "- Jim Rohn -";
+		break;
+	case 54:
+		mes "If you can't find the key to success,";
+		mes "pick the lock.";
+		mes "One of the most important principles of success is";
+		mes "developing the habit of going the extra mile.";
+		mes "- Napoleon Hill -";
+		break;
+	case 55:
+		mes "The human race has";
+		mes "one really effective weapon,";
+		mes "and that is laughter.";
+		mes "- Mark Twain -";
+		break;
+	case 56:
+		mes "A day without laughter is a day wasted.";
+		mes "- Charlie Chaplin -";
+		break;
+	case 57:
+		mes "He who laughs best today,";
+		mes "will also laugh last.";
+		mes "- Nietzsche -";
+		break;
+	case 58:
+		mes "Laughter is the sun that";
+		mes "drives winter from the human face.";
+		mes "- Victor Hugo -";
+		break;
+	case 59:
+		mes "Laugh, and the world laughs";
+		mes "with you; weep, and";
+		mes "you weep alone.";
+		mes "- Ella Wheeler Wilcox -";
+		break;
+	case 60:
+		mes "It is impossible for you to be angry";
+		mes "and laugh at the same time.";
+		mes "Anger and laughter are mutually exclusive";
+		mes "and you have the power to choose either.";
+		mes "- Wayne Dyer -";
+		break;
+	case 61:
+		mes "We don't laugh because we're happy";
+		mes "- we're happy because we laugh.";
+		mes "- William James -";
+		break;
+	case 62:
+		mes "The person who knows how to laugh at himself";
+		mes "will never cease to be amused.";
+		mes "- Shirley MacLaine -";
+		break;
+	case 63:
+		mes "The young man who has not wept is a savage,";
+		mes "and the older man who will not laugh is a fool.";
+		mes "- George Santayana -";
+		break;
+	case 64:
+		mes "I do not have much patience";
+		mes "with a thing of beauty";
+		mes "that must be explained";
+		mes "to be understood.";
+		mes "If it does need additional interpretation";
+		mes "then I question";
+		mes "whether it has fulfilled its purpose.";
+		mes "- Charlie Chaplin -";
+		break;
+	case 65:
+		mes "Life is a tragedy";
+		mes "when seen in close-up,";
+		mes "but a comedy";
+		mes "in long-shot.";
+		mes "- Charlie Chaplin -";
+		break;
+	case 66:
+		mes "The clearest sign of wisdom is continued cheerfulness.";
+		mes "- Michel de Montaigne -";
+		break;
+	case 67:
+		mes "The time you enjoyed wasting";
+		mes "was not wasted.";
+		mes "- John Lennon -";
+		break;
+	case 68:
+		mes "True humor springs not more from the head than from the heart.";
+		mes "It is not contempt; its essence is love.";
+		mes "It issues not in laughter,";
+		mes "but in still smiles, which lie far deeper.";
+		mes "- Thomas Carlyle -";
+		break;
+	case 69:
+		mes "Through humor, you can soften";
+		mes "some of the worst blows";
+		mes "that life delivers.";
+		mes "And once you find laughter,";
+		mes "no matter how painful";
+		mes "your situation might be,";
+		mes "you can survive it.";
+		mes "- Bill Cosby -";
+		break;
+	case 70:
+		mes "My great hope is to laugh";
+		mes "as much as I cry;";
+		mes "to get my work done";
+		mes "and try to love somebody";
+		mes "and have the courage";
+		mes "to accept the love in return.";
+		mes "- Maya Angelou -";
+		break;
+	}
+	next;
+	mes "[Raffle Philosopher]";
+	mes "People take what they hear";
+	mes "differently.";
+	next;
+	mes "[Raffle Philosopher]";
+	mes "I wonder what you think";
+	mes "about what I've told you.";
+	next;
+	input .@inputstr$;
+	mes "[Raffle Philosopher]";
+	mes "So you think that "+.@inputstr$+".";
+	next;
+	mes "[Raffle Philosopher]";
+	mes "... ... ... ...";
+	next;
+	mes "[Raffle Philosopher]";
+	mes "I don't know. There is no one answer";
+	mes "to this question...";
+	mes "Hold onto your thought.";
 	close;
 }
 
-mora,184,169,3	script	Mora Citizen#9	516,{
-	mes "[Moussa Wi]";
-	mes "Bleh, I've been";
-	mes "here for too long.";
-	mes "Living with these dogs...";
-	mes "Having nothing to do...";
-	mes "Hmm, how about you";
-	mes "take care of them?";
+-	script	#mora_traveler	-1,{
+	mes "[Upset Traveler]";
+	mes "You... you dare play a game with me?";
+	emotion e_ag,0,"Traveler#ep14_1_1";
+	next;
+	mes "[Traveler That Posed the Question]";
+	mes "What...? Do you have proof?";
+	mes "Do you have proof?!!";
+	emotion e_an,0,"Traveler#ep14_1_2";
+	next;
+	mes "[Traveler Trying to Stop the Fight]";
+	mes "Look, stop it, just stop it!";
+	mes "I'm afraid it will turn into a big fight...";
+	emotion e_swt2,0,"Traveler#ep14_1_3";
+	next;
+	mes "[Traveler Trying to Stop the Fight]";
+	mes "Oh! Why don't we ask";
+	mes "that person there...?";
+	next;
+	mes "[Upset Traveler]";
+	mes "Oh, yes! That's a great idea.";
+	mes "Well~ Hello there~";
+	mes "You there, traveler!";
+	emotion e_ic,0,"Traveler#ep14_1_1";
+	next;
+	mes "They seem to be calling out to you.";
+	next;
+	if(select("See what the matter is.:I have nothing to do with it.") == 2) {
+		mes "You went on your way";
+		mes "leaving the travelers behind you.";
+		close;
+	}
+	mes "["+strcharinfo(0)+"]";
+	mes "What's happening here?";
+	emotion e_what,1;
+	next;
+	mes "[Upset Traveler]";
+	mes "I'll tell you what.";
+	mes "Rose's mother had 10 sons.";
+	mes "The eldest son is called Roseone,";
+	mes "the second Rosetwo,";
+	mes "the third Rosethree...";
+	mes "the ninth Rosenine...";
+	mes "you get how it works, right?";
+	emotion e_ag,0,"Traveler#ep14_1_1";
+	next;
+	mes "[Traveler That Posed the Question]";
+	mes "Right, that's how it works.";
+	mes "So I asked what the youngest one would be called,";
+	mes "and when I told him the answer,";
+	mes "he got all upset and started cursing me.";
+	emotion e_an,0,"Traveler#ep14_1_2";
+	next;
+	mes "[Upset Traveler]";
+	mes "You... you bastard!";
+	mes "Hey there, what do you think";
+	mes "the answer to the question is?";
+	emotion e_ag,0,"Traveler#ep14_1_1";
+	next;
+	switch(select("Roseten.:Rose.:How would I know that?")) {
+	case 1:
+		mes "["+strcharinfo(0)+"]";
+		mes "The answer to the question is Roseten.";
+		mes "Why are you fighting over such a trivial matter?";
+		next;
+		mes "[Upset Traveler]";
+		mes "See? Even this traveler says";
+		mes "Roseten is the answer.";
+		mes "How dare you try to play tricks on me?";
+		emotion e_gg,0,"Traveler#ep14_1_1";
+		next;
+		mes "[Traveler That Posed the Question]";
+		mes "You idiot... you don't have the slightest clue!";
+		emotion e_an,0,"Traveler#ep14_1_2";
+		break;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "The answer to the question is Rose.";
+		mes "You said Rose's mother had 10 sons.";
+		mes "So even if the other sons' names are";
+		mes "Roseone, Rosetwo, ... Rosenine,";
+		mes "the youngest one must be Rose,";
+		mes "or she wouldn't be called Rose's mother.";
+		next;
+		mes "[Traveler That Posed the Question]";
+		mes "That's exactly what I mean!";
+		mes "I can't hang around with him.";
+		mes "I guess we live in two different worlds.";
+		emotion e_ok,0,"Traveler#ep14_1_2";
+		next;
+		mes "[Upset Traveler]";
+		mes "You bastard... What did you";
+		mes "get from this guy...?";
+		emotion e_ag,0,"Traveler#ep14_1_1";
+		break;
+	case 3:
+		mes "["+strcharinfo(0)+"]";
+		mes "I have no idea.";
+		mes "Try to sort it out yourselves.";
+		next;
+		mes "[Traveler Trying to Stop the Fight]";
+		mes "You good-for-nothing bastard,";
+		mes "you're trying to leave this mess to me?";
+		emotion e_an,0,"Traveler#ep14_1_3";
+		break;
+	}
+	next;
+	mes "*thud*";
+	mes "You feel a sudden impact on the back of your head.";
+	mes "Your sight is going blurry.";
+	specialeffect2 EF_HIT1;
+	sc_start SC_BLIND,20000,0;
+	next;
+	mes "You feel somebody rummaging through your pockets before you pass out.";
+	if (Zeny >= 5000)
+		Zeny -= 5000;
+	else
+		Zeny = 0;
+	close2;
+	percentheal -99,0;
+	warp "mora",31,132;
+	end;
+}
+mora,140,72,4	duplicate(#mora_traveler)	Traveler#ep14_1_1	4_M_DOGTRAVELER	//Upset Traveler
+mora,138,72,6	duplicate(#mora_traveler)	Traveler#ep14_1_2	4_M_DOGTRAVELER	//Traveler That Posed the Question
+mora,139,73,4	duplicate(#mora_traveler)	Traveler#ep14_1_3	4_M_DOGTRAVELER	//Traveler Trying to Stop the Fight
+
+// Set 3 :: tre
+//============================================================
+mora,132,185,5	script	Mora Villager#sleep5	4_F_RAFLE_PK,{
+	mes "[Mora Villager]";
+	mes "Phew~ Phew~";
 	close;
 }
 
-mora,108,182,3	script	Mora Citizen#10	516,{
-	mes "[Yosou Keh]";
-	mes "Hello!";
-	mes "I am Yosou Keh,";
-	mes "a resident of Mora.";
-	mes "The Bifrost is populated";
-	mes "with many strong monsters...";
+mora,133,185,5	script	Mora Villager#sleep2	4_M_RAFLE_VI,{
+	mes "[Mora Villager]";
+	mes "Snore...";
 	close;
 }
 
-mora,113,185,5	script	Mora Citizen#11	516,{
-	mes "[Ninkasi]";
-	mes "Hey, dude.";
-	mes "How are you today, dude?";
-	mes "What can I do for you, dude?";
-	next;
-	switch(select("Why do you call me 'dude'?:Goodbye.")) {
-	case 1:
-		mes "[Ninkasi]";
-		mes "Why not?";
-		mes "Calling others 'dude'";
-		mes "is my brand mark.";
-		mes "Be cool, dude, relax!";
-		mes "Enjoy your life, dude!";
-		close;
-	case 2:
-		mes "[Ninkasi]";
-		mes "See you again, dude!";
-		close;
-	}
+mora,134,185,3	script	Mora Villager#sleep1	4_F_RAFLE_VI,{
+	mes "[Mora Villager]";
+	mes "Snort--";
+	close;
 }
 
-mora,43,127,4	script	Mora Citizen#12	522,{
-	mes "[Glouti Vori]";
-	mes "Mm, I love this beef toast!";
-	mes "That's the only reason I'm";
-	mes "still here! There's nothing";
-	mes "better than Mora beef toast!";
+mora,132,184,5	script	Mora Villager#sleep6	4_M_RAFLE_OR,{
+	mes "[Mora Villager]";
+	mes "Snort--";
 	close;
 }
 
-mora,35,119,7	script	South World Dealer	513,{
-	mes "[South World Dealer]";
-	mes "...";
+mora,133,184,1	script	Mora Villager#sleep4	G_RAFFLESIA,{
+	mes "[Mora Villager]";
+	mes "Moan...";
+	end;
+}
+
+mora,134,184,1	script	Mora Villager#sleep3	4_M_RAFLE_GR,{
+	mes "[Mora Villager]";
+	mes "Phew phew pheeew~";
 	close;
 }
 
-mora,139,102,4	script	Milvida	515,{
-	mes "[Milvida]";
-	mes "Welcome to Mora~";
-	mes "In the center of the city";
-	mes "you can find all the shops";
-	mes "and some enchanters.";
-	next;
-	mes "[Milvida]";
-	mes "Northeast of the city is";
-	mes "where the food is located.";
+mora,132,183,7	script	Mora Villager#sleep7	4_M_RAFLE_VI,{
+	mes "[Mora Villager]";
+	mes "z Z";
 	close;
 }
 
-mora,55,124,2	script	Cat Traveler	495,{
-	mes "[Cat Traveler]";
-	mes "This city is like Malangdo";
-	mes "in several aspects,";
-	mes "don't you think?";
+mora,133,183,7	script	Mora Villager#sleep8	4_F_RAFLE_PK,{
+	mes "[Mora Villager]";
+	mes "z Z";
+	end;
+}
+
+mora,134,183,1	script	Mora Villager#sleep9	4_M_RAFLE_OR,{
+	mes "[Mora Villager]";
+	mes "z Z";
 	close;
 }
 
-mora,131,165,4	script	Bifrost Resident#1	520,{
-	mes "[Bifrost Resident]";
-	mes "Welcome to the workshop";
-	mes "of the west clan. If you";
-	mes "want your Loki Muffler";
-	mes "enchanted, please contact";
-	mes "my boss. He makes miracles!";
+mora,43,127,3	script	Innkeeper#mora_inn	4_M_RAFLE_OR,{
+	mes "[Innkeeper]";
+	mes "Oh~ looks like we have another adventurer.";
+	mes "Where are you from?";
 	next;
-	mes "[Bifrost Resident]";
-	mes "On a side note... I think I'm";
-	mes "really cute, don't you agree?";
-	close;
-}
\ No newline at end of file
+	switch(select("Just save the game.:I'd like to get some rest.:The place I used to live is called...:How can I use the warehouse?")) {
+	case 1:
+		mes "[Innkeeper]";
+		mes "Wow, what's the rush?";
+		mes "You've just come here, and you're already going someplace else?";
+		next;
+		mes "[Innkeeper]";
+		mes "You know, haste makes waste. Tsk tsk.";
+		mes "Well, the game's been saved.";
+		savepoint "mora",56,143;
+		close;
+	case 2:
+		mes "[Innkeeper]";
+		mes "My my, I need some rest also.";
+		mes "The rate is 5000 zeny. Do you want a room?";
+		next;
+		switch(select("Yes:No")) {
+		case 1:
+			if (Zeny < 5000) {
+				mes "[Innkeeper]";
+				mes "The rate is 5000z.";
+				close;
+			}
+			mes "[Innkeeper]";
+			mes "Make yourself at home.";
+			close2;
+			Zeny -= 5000;
+			percentheal 100,100;
+			warp "mora",32,123;
+			end;
+		case 2:
+			mes "[Innkeeper]";
+			mes "If you don't have the money, go soak yourself in the puddle in the center of the village.";
+			mes "It will warm you up.";
+			close;
+		}
+	case 3:
+		input .@inputstr$;
+		mes "["+strcharinfo(0)+"]";
+		mes "I come from a place called "+.@inputstr$+".";
+		next;
+		mes "[Innkeeper]";
+		mes "Oh, I think I've heard about the place before!";
+		next;
+		if (.@inputstr$ == "Shinlim") {
+			mes "[Innkeeper]";
+			mes "I heard there's an old tower where horrible witches put Savages in a giant cauldron and cast evil spells on them, right?";
+			next;
+			mes "[Innkeeper]";
+			mes "What's worse is that whoever takes medicine made out of Savages will come back for more!";
+			mes "And he will wander around looking for the tower, and eventually turn into an enormous Savage!";
+			emotion e_no,1;
+			next;
+		} else {
+			mes "[Innkeeper]";
+			mes "I heard that there are creeps there who won't get up at all even if it rains or snows, or their sweethearts or parents call them!";
+			mes "And that black clouds hover over them all the time, causing a storm!";
+			next;
+		}
+		mes "[Innkeeper]";
+		mes "How terrible!";
+		close;
+	case 4:
+		mes "[Innkeeper]";
+		mes "Search through the vegetable-shaped drawer to my right.";
+		close;
+	}
+}
+
+mora,48,128,0	script	Drawer#mora_warehouse	HIDDEN_NPC,{
+	if(basicskillcheck() && getskilllv("NV_BASIC") < 6) {
+		mes "- You don't remember how to open the warehouse. -";
+		close;
+	}
+	mes "- The figure 1 0 0 is written in small letters on the vegetable-shaped drawer. -";
+	next;
+	switch(select("Insert 100 zeny.:Don't do anything.")) {
+	case 1:
+		if (Zeny < 100) {
+			mes "- You don't seem to have 100 zeny with you. -";
+			close;
+		}
+		Zeny -= 100;
+		openstorage;
+		close;
+	case 2:
+		mes "- You gave up using the warehouse. -";
+		close;
+	}
+}
diff --git a/npc/re/cities/yuno.txt b/npc/re/cities/yuno.txt
new file mode 100644
index 000000000..ac2fb25fb
--- /dev/null
+++ b/npc/re/cities/yuno.txt
@@ -0,0 +1,20 @@
+//===== Hercules Script ======================================
+//= Juno City
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= NPCs for the City of Juno
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+yuno,150,283,4	duplicate(JunoSoldier1)	Juno Soldier#juno	4_M_EIN_SOLDIER
+yuno,165,283,4	duplicate(JunoSoldier2)	Juno Soldier#2juno	4_M_EIN_SOLDIER
+yuno,227,292,4	duplicate(JunoSoldier3)	Juno Soldier#3juno	4_M_EIN_SOLDIER
+yuno,165,228,4	duplicate(JunoSoldier4)	Juno Soldier#4juno	4_M_EIN_SOLDIER
+yuno,150,228,4	duplicate(JunoSoldier5)	Juno Soldier#5juno	4_M_EIN_SOLDIER
+yuno,334,182,4	duplicate(JunoSoldier6)	Juno Soldier#6juno	4_M_EIN_SOLDIER
+yuno,263,320,4	duplicate(JunoSoldier7)	Juno Soldier#7juno	4_M_EIN_SOLDIER
diff --git a/npc/re/guides/guides_alberta.txt b/npc/re/guides/guides_alberta.txt
index 9b1b86a92..94c95279c 100644
--- a/npc/re/guides/guides_alberta.txt
+++ b/npc/re/guides/guides_alberta.txt
@@ -3,23 +3,24 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.1
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Alberta
 //===== Additional Comments: =================================
 //= 1.0 First version, Renewal guides.
+//= 1.1 Navigation system update. [Euphy]
 //============================================================
 
-alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
+alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Alberta Guide]";
 	mes "Welcome to ^8B4513Alberta^000000,";
 	mes "the Port City.";
 	mes "Do you need help navigating the city?";
+	F_Navi("[Alberta Guide]");
 	next;
+	set .@str$,"Would you like to check any other locations?";
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:[ Destination Ports ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
@@ -29,54 +30,54 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 				case 1:
 					mes "[Alberta Guide]";
 					mes "Let me mark the location of the";
-					mes "the ^0000FFTool Shop^000000";
+					mes "the "+F_Navi("Tool Shop","alberta,98,154","^0000FF");
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,98,154,0,0x0A82FF;
 					next;
 					break;
 				case 2:
 					mes "[Alberta Guide]";
-					mes "The ^B9062FForge^000000 is currently";
+					mes "The "+F_Navi("Forge","alberta,35,41","^B9062F")+" is currently";
 					mes "located inside the Merchant Guild building.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,35,41,1,0xFF0000;
 					next;
 					break;
 				case 3:
 					mes "[Alberta Guide]";
 					mes "Let me mark the location of the";
-					mes "the ^FF5400Weapon & Armor Shop^000000";
+					mes "the "+F_Navi("Weapon & Armor Shop","alberta,117,37","^FF5400");
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,117,37,2,0xFFB400;
 					next;
 					break;
 				case 4:
 					mes "[Alberta Guide]";
 					mes "Let me mark the location of the";
-					mes "the ^006400Inn^000000";
+					mes "the "+F_Navi("Inn","alberta,65,233","^006400");
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,65,233,3,0xAAFF00;
 					next;
 					break;
 				case 5:
 					mes "[Alberta Guide]";
 					mes "Let me mark the location of the";
-					mes "the ^7F3300Beauty Salon^000000";
+					mes "the "+F_Navi("Beauty Salon","alberta,48,145","^7F3300");
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,48,145,4,0xD2691E;
 					next;
 					break;
 				case 6:
 					mes "[Alberta Guide]";
-					mes "The Merchant Guild is where";
-					mes "you can change your job to ^800080Merchant.";
+					mes "The "+F_Navi("Merchant Guild","alberta,33,41")+" is where";
+					mes "you can change your job to ^800080Merchant^000000.";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,33,41,5,0xDA70D6;
 					next;
 					break;
@@ -92,10 +93,10 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Cool Event Employee ]:[ Bullet Merchant ]:[ Cooking Ingredient Merchant ]:Previous Menu")) {
 				case 1:
 					mes "[Alberta Guide]";
-					mes "^B9062FEden Teleport Officers^000000 are located in south Alberta";
-					mes "and inside the Merchant Guild building.";
+					mes "^B9062FEden Teleport Officers^000000 are located in "+F_Navi("south Alberta","alberta,121,68");
+					mes "and inside the "+F_Navi("Merchant Guild","alberta,33,41")+" building.";
 					mes "Let me mark their locations on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,33,41,6,0xFF0000;
 					viewpoint 1,121,68,7,0xFF0000;
 					next;
@@ -105,7 +106,7 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 					mes "Let me mark the location of the";
 					mes "^0000FFKafra Employees^000000";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,33,41,8,0x0A82FF;
 					viewpoint 1,113,60,9,0x0A82FF;
 					next;
@@ -113,8 +114,8 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 				case 3:
 					mes "[Alberta Guide]";
 					mes "When you win event items,";
-					mes "you can claim them through the ^FF5400Cool Event Employee^000000.";
-					mes "Would you like to check any other locations?";
+					mes "you can claim them through the "+F_Navi("Cool Event Employee","alberta,148,57","^FF5400")+".";
+					mes .@str$;
 					viewpoint 1,148,57,10,0xFFB400;
 					next;
 					break;
@@ -122,17 +123,17 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 					mes "[Alberta Guide]";
 					mes "The ^7F3300Bullet Merchants^000000 for ^7F3300Gunslingers^000000";
 					mes "are located";
-					mes "near the center of the city.";
-					mes "Would you like to check any other locations?";
+					mes "near the "+F_Navi("center of the city","alberta,117,158")+".";
+					mes .@str$;
 					viewpoint 1,117,158,11,0xD2691E;
 					next;
 					break;
 				case 5:
 					mes "[Alberta Guide]";
-					mes "The ^006400Chef Assistant^000000 in Alberta";
+					mes "The "+F_Navi("Chef Assistant","alberta,167,135","^006400")+" in Alberta";
 					mes "has many regular customers,";
 					mes "especially for his ^006400Delicious Fishes^000000.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,167,135,12,0xAAFF00;
 					next;
 					break;
@@ -145,77 +146,32 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 		case 3:
 			set .@loop,1;
 			while (.@loop) {
-				switch(select("[ Port - Northern Dock ]:[ Port - Brasilis ]:[ Port - Amatsu ]:[ Port - Kunlun ]:[ Port - Moscovia ]:[ Port - Louyang ]:[ Port - Ayothaya ]:Previous Menu")) {
+				switch(select("[ Port - Northern Dock ]:[ Port - Central Dock ]:[ Port - Southern Dock ]:Previous Menu")) {
 				case 1:
 					mes "[Alberta Guide]";
-					mes "You can use";
-					mes "the ^B9062FNorthern Dock^000000";
-					mes "to go to the ^B9062FSunken Ship^000000 or ^B9062FIzlude Marina^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,192,151,13,0xFF0000;
+					mes "You can use the "+F_Navi("Northern Dock","alberta,192,196");
+					mes "to go to ^0000FFPort Malaya^000000 or ^0000FFDewata^000000.";
+					mes .@str$;
+					viewpoint 1,192,196,13,0xFF0000;
 					next;
 					break;
 				case 2:
 					mes "[Alberta Guide]";
-					mes "Please talk to the ^800080Crewman^000000 at the Alberta Port";
-					mes "if you'd like to visit ^800080Brasilis^000000,";
-					mes "the City of Passion.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,82,14,0xDA70D6;
+					mes "You can use the "+F_Navi("Central Dock","alberta,192,151");
+					mes "to go to the ^B9062FSunken Ship^000000 or ^B9062FIzlude Marina^000000.";
+					mes .@str$;
+					viewpoint 1,192,151,14,0xFF0000;
 					next;
 					break;
 				case 3:
 					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "the ^0000FFSea Captain^000000 at the Alberta Port";
-					mes "if you'd like to enjoy viewing cherry blossoms";
-					mes "in ^0000FFAmatsu^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,74,15,0x0A82FF;
+					mes "You can use the "+F_Navi("Southern Dock","alberta,245,86");
+					mes "to go to ^0000FFTurtle Island^000000, ^0000FFBrasilis^000000, ^0000FFAmatsu^000000, ^0000FFKunlun^000000, ^0000FFMoscovia^000000, ^0000FFLouyang^000000, or ^0000FFAyothaya^000000.";
+					mes .@str$;
+					viewpoint 1,245,86,15,0xFF0000;
 					next;
 					break;
 				case 4:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "^B9062FKunlun Envoy^000000 at the Alberta Port";
-					mes "if you'd like to experience the exotic atmosphere of ^B9062FKunlun^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,62,16,0xFF0000;
-					next;
-					break;
-				case 5:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "^FF5400Moscovia P.R. Officer^000000 at the Alberta Port";
-					mes "if you'd like to move to";
-					mes "^FF5400Moscovia^000000,";
-					mes "the Eden on the ocean.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,51,17,0xFFB400;
-					next;
-					break;
-				case 6:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "^7F3300Girl^000000 at the Alberta Port";
-					mes "if you'd like to move to the historical city,";
-					mes "^7F3300Louyang^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,40,18,0xD2691E;
-					next;
-					break;
-				case 7:
-					mes "[Alberta Guide]";
-					mes "Please talk to";
-					mes "^800080Aibakthing^000000 at the Alberta Port";
-					mes "if you'd like to move to";
-					mes "^800080Ayothaya^000000,";
-					mes "the religious city.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,29,19,0xDA70D6;
-					next;
-					break;
-				case 8:
 					set .@loop,0;
 					break;
 				}
@@ -241,10 +197,6 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 			viewpoint 2,1,1,13,0xFFFF00;
 			viewpoint 2,1,1,14,0xFFFF00;
 			viewpoint 2,1,1,15,0xFFFF00;
-			viewpoint 2,1,1,16,0xFFFF00;
-			viewpoint 2,1,1,17,0xFFFF00;
-			viewpoint 2,1,1,18,0xFFFF00;
-			viewpoint 2,1,1,19,0xFFFF00;
 			next;
 			break;
 		case 5:
@@ -256,6 +208,5 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 		}
 	}
 }
-
-alberta,120,60,3	duplicate(AlbertaGuide)	Guide#02alberta	105
-alberta,184,143,4	duplicate(AlbertaGuide)	Guide#03alberta	105
+alberta,120,60,3	duplicate(AlbertaGuide)	Guide#02alberta	8W_SOLDIER
+alberta,184,143,4	duplicate(AlbertaGuide)	Guide#03alberta	8W_SOLDIER
diff --git a/npc/re/guides/guides_aldebaran.txt b/npc/re/guides/guides_aldebaran.txt
index 9593e0b2e..ef47d543d 100644
--- a/npc/re/guides/guides_aldebaran.txt
+++ b/npc/re/guides/guides_aldebaran.txt
@@ -1,25 +1,27 @@
-//===== Hercules Script ====================================== 
+//===== Hercules Script ======================================
 //= Al De Baran Guides
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.1
 //===== Description: =========================================
 //= [Official Conversion]
-//= Guides for the city of Al De baran
+//= Guides for the city of Al De Baran.
 //===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
+//= 1.1 Navigation system update. [Euphy]
+//=     Optimized.
 //============================================================
 
-aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
+aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Al De Baran Guide]";
 	mes "Welcome to ^8B4513Al De Baran^000000,";
 	mes "the Border City.";
 	mes "Do you need help navigating the city?";
+	F_Navi("[Al De Baran Guide]");
 	next;
+	set .@str$,"Would you like to check any other locations?";
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
@@ -27,55 +29,43 @@ aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
 			while (.@loop) {
 				switch(select("[ Kafra Headquarters ]:[ Alchemist Guild ]:[ Clock Tower ]:[ Inn & Tool Shop ]:[ Repair & Buy Equipment ]:[ Tavern ]:Previous Menu")) {
 				case 1:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^B9062FKafra Headquarters^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Kafra Headquarters","aldebaran,61,229","^B9062F");
+					mes .@str$;
 					viewpoint 1,61,229,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^0000FFAlchemist Guild^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Alchemist Guild","aldebaran,60,60","^0000FF");
+					mes .@str$;
 					viewpoint 1,60,60,1,0x0A82FF;
 					next;
 					break;
 				case 3:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^FF5400Clock Tower^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Clock Tower","aldebaran,139,133","^FF5400");
+					mes .@str$;
 					viewpoint 1,139,133,2,0xFFB400;
 					next;
 					break;
 				case 4:
 					mes "[Al De Baran Guide]";
 					mes "Let me mark the location of the";
-					mes "the ^006400Inn^000000 and";
-					mes "the ^006400Tool Shop^000000 building";
+					mes F_Navi("Inn & Tool Shop","aldebaran,197,70","^006400")+" building";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,197,70,3,0xAAFF00;
 					next;
 					break;
 				case 5:
 					mes "[Al De Baran Guide]";
-					mes "If you'd like to ^7F3300Buy or Repair Equipment^000000,";
+					mes "If you'd like to ";
+					mes F_Navi("Buy or Repair Equipment","aldebaran,197,70","^7F3300")+",";
 					mes "then this is the place you'll want to visit.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,72,197,4,0xD2691E;
 					next;
 					break;
 				case 6:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^800080Tavern^000000";
-					mes "on your mini-map.";
+					callsub L_Mark, F_Navi("Tavern","aldebaran,231,106","^800080");
 					viewpoint 1,231,106,5,0xDA70D6;
 					next;
 					break;
@@ -90,38 +80,29 @@ aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
 			while (.@loop) {
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Mr. Claus ]:[ Chef Assistant ]:Previous Menu")) {
 				case 1:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^B9062FEden Teleport Officer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","aldebaran,133,119","^B9062F");
+					mes .@str$;
 					viewpoint 1,133,119,6,0xFF0000;
 					next;
 					break;
 				case 2:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^0000FFKafra Employee^000000";
-					mes "on your mini-map.";
+					callsub L_Mark, "^0000FFKafra Employee^000000";
 					viewpoint 1,143,119,7,0x0A82FF;
 					next;
 					break;
 				case 3:
 					mes "[Al De Baran Guide]";
 					mes "Mr. Claus can teleport";
-					mes "you to ^006400Lutie^000000.";
+					mes "you to "+F_Navi("Lutie","aldebaran,168,168","^006400")+".";
 					mes "Let me mark his location";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,168,168,8,0xAAFF00;
 					next;
 					break;
 				case 4:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^7F3300Chef Assistant^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Chef Assistant","aldebaran,165,107","^7F3300");
+					mes .@str$;
 					viewpoint 1,165,107,9,0xD2691E;
 					next;
 					break;
@@ -156,8 +137,14 @@ aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
 			end;
 		}
 	}
+	end;
+L_Mark:
+	mes "[Al De Baran Guide]";
+	mes "Let me mark the location of the";
+	mes getarg(0);
+	mes "on your mini-map.";
+	return;
 }
-
-aldebaran,243,143,2	duplicate(GuideAldearan)	Guide#02aldebaran	105
-aldebaran,135,243,4	duplicate(GuideAldearan)	Guide#03aldebaran	105
-aldebaran,36,135,6	duplicate(GuideAldearan)	Guide#04aldebaran	105
+aldebaran,243,143,2	duplicate(GuideAldearan)	Guide#02aldebaran	8W_SOLDIER
+aldebaran,135,243,4	duplicate(GuideAldearan)	Guide#03aldebaran	8W_SOLDIER
+aldebaran,36,135,6	duplicate(GuideAldearan)	Guide#04aldebaran	8W_SOLDIER
diff --git a/npc/re/guides/guides_amatsu.txt b/npc/re/guides/guides_amatsu.txt
index 4ab124e27..e08569831 100644
--- a/npc/re/guides/guides_amatsu.txt
+++ b/npc/re/guides/guides_amatsu.txt
@@ -3,18 +3,17 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guide for the city of Amatsu.
 //===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================
 
-amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
+amatsu,202,91,3	script	Amatsu Guide#amatsu	4_F_JPN,{
 	mes "[Amachang]";
 	mes "Welcome to ^8B4513Amatsu^000000,";
 	mes "the town of kind towners";
@@ -27,39 +26,40 @@ amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
 	mes "as Miss Amatsu.";
 	mes "Please tell me";
 	mes "if you want to know something.";
+	F_Navi("[Amachang]");
 	while (1) {
 		next;
 		switch(select("[ Kafra Employee ]:[ Bar ]:[ Weapon Dealer ]:[ Tool Dealer ]:[ Amatsu Palace ]:[ Chef Assistant ]:[ Ninja Guild Building ]:[ Sea Captain ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
-			callsub L_Mark,"^0000FFKafra Employee";
+			callsub L_Mark, "^0000FFKafra Employee^000000";
 			viewpoint 1,102,149,0,0x0A82FF;
 			break;
 		case 2:
-			callsub L_Mark,"^006400Bar";
+			callsub L_Mark, F_Navi("Bar","amatsu,215,116","^006400");
 			viewpoint 1,215,116,1,0xAAFF00;
 			break;
 		case 3:
-			callsub L_Mark,"^008080Weapon Dealer";
+			callsub L_Mark, F_Navi("Weapon Dealer","amatsu,129,117","^008080");
 			viewpoint 1,129,117,2,0x008080;
 			break;
 		case 4:
-			callsub L_Mark,"^FF1493Tool Dealer";
+			callsub L_Mark, F_Navi("Tool Dealer","amatsu,97,117","^FF1493");
 			viewpoint 1,97,117,3,0xFF1493;
 			break;
 		case 5:
-			callsub L_Mark,"^8B4513Amatsu Palace";
+			callsub L_Mark, F_Navi("Amatsu Palace","amatsu,87,235","^8B4513");
 			viewpoint 1,87,235,4,0x8B4513;
 			break;
 		case 6:
-			callsub L_Mark,"^8A2BE2Chef Assistant";
+			callsub L_Mark, F_Navi("Chef Assistant","amatsu,206,150","^8A2BE2");
 			viewpoint 1,206,150,5,0x8A2BE2;
 			break;
 		case 7:
-			callsub L_Mark,"^4B0082Ninja Guild Building";
+			callsub L_Mark, F_Navi("Ninja Guild Building","amatsu,148,137","^4B0082");
 			viewpoint 1,148,137,6,0x4B0082;
 			break;
 		case 8:
-			callsub L_Mark,"^00BFFFSea Captain";
+			callsub L_Mark, F_Navi("Sea Captain","amatsu,195,79","^00BFFF");
 			viewpoint 1,195,79,7,0x00BFFF;
 			break;
 		case 9:
@@ -84,7 +84,7 @@ amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
 	end;
 L_Mark:
 	mes "[Amachang]";
-	mes "The "+getarg(0)+"^000000 is";
+	mes "The "+getarg(0)+" is";
 	mes "marked on your mini-map.";
 	mes "Is there anything else I can do for you?";
 	return;
diff --git a/npc/re/guides/guides_ayothaya.txt b/npc/re/guides/guides_ayothaya.txt
index 135e34671..6d351d4d6 100644
--- a/npc/re/guides/guides_ayothaya.txt
+++ b/npc/re/guides/guides_ayothaya.txt
@@ -3,73 +3,77 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2
 //===== Description: =========================================
 //= [Official Conversion]
-//= Guide for the city of Ayothaya
+//= Guide for the city of Ayothaya.
 //===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Added missing case. [Joseph]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================
 
-ayothaya,203,169,4	script	Ayothaya Guide Noi#01ay	839,{
-	mes "[Noi]";
+ayothaya,203,169,4	script	Ayothaya Guide Noi#01ay	4_F_THAIGIRL,{
+	if (strnpcinfo(0) == "Ayothaya Guide Noi#01ay")
+		set .@n$, "[Noi]";
+	else
+		set .@n$, "[Noa]";
+	mes .@n$;
 	mes "Hello~";
 	mes "Welcome to ^8B4513Ayothaya^000000.";
 	mes "This town is linked to a river through the wild forest.";
 	mes "It's a really calm country.";
 	mes "Take your time to look around.";
+	F_Navi(.@n$);
 	while (1) {
 		next;
 		switch(select("[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Shrine ]:[ Fishing Spot ]:[ Aibakthing ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
-			mes "[Noi]";
-			mes "The ^0000FFWeapon Shop^000000";
+			mes .@n$;
+			mes "The "+F_Navi("Weapon Shop","ayothaya,163,90","^0000FF");
 			mes "in Ayothaya has special weapons.";
 			mes "You can find great weapons there.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,163,90,0,0x0A82FF;
 			break;
 		case 2:
-			mes "[Noi]";
-			mes "Our citizens purchase many products in the ^006400Tool Shop^000000.";
+			mes .@n$;
+			mes "Our citizens purchase many products in the "+F_Navi("Tool Shop","ayothaya,131,86","^006400")+".";
 			mes "Make sure you get all you need there.";
-			mes "Do you need anything else??";
+			mes "Do you need anything else?";
 			viewpoint 1,131,86,1,0xAAFF00;
 			break;
 		case 3:
-			mes "[Noi]";
+			mes .@n$;
 			mes "Part of adventuring is collecting information.";
-			mes "The ^008080Tavern^000000 is crowded with lots of travelers where you can get useful information.";
+			mes "The "+F_Navi("Tavern","ayothaya,229,72","^008080")+" is crowded with lots of travelers where you can get useful information.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,229,72,2,0x008080;
 			break;
 		case 4:
-			mes "[Noi]";
-			mes "To calm your heart, go to the ^FF1493Shrine^000000 and say a prayer.";
+			mes .@n$;
+			mes "To calm your heart, go to the "+F_Navi("Shrine","ayothaya,208,280","^FF1493")+" and say a prayer.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,208,280,3,0xFF1493;
 			break;
 		case 5:
-			mes "[Noi]";
+			mes .@n$;
 			mes "Ayothaya is close to the beach, so most people enjoy fishing.";
 			mes "They really love to fish.";
-			mes "Go ^8B4513fishing^000000 and try to grab a big fish.";
+			mes "Go "+F_Navi("fishing","ayothaya,255,99","^8B4513")+" and try to grab a big fish.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,255,99,4,0x8B4513;
 			break;
 		case 6:
-			mes "[Noi]";
+			mes .@n$;
 			mes "If you want to return home";
-			mes "find ^00BFFFAibakthing^000000";
+			mes "find "+F_Navi("Aibakthing","ayothaya,151,68","^00BFFF");
 			mes "and ask him to send you back.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,151,68,5,0x00BFFF;
 			break;
 		case 7:
-			mes "[Noi]";
+			mes .@n$;
 			mes "I'll remove all marks from your mini-map.";
 			mes "Do you need anything else??";
 			viewpoint 2,1,1,0,0xFFFFFF;
@@ -80,91 +84,10 @@ ayothaya,203,169,4	script	Ayothaya Guide Noi#01ay	839,{
 			viewpoint 2,1,1,5,0xFFFFFF;
 			break;
 		case 8:
-			mes "[Noi]";
-			mes "Enjoy your trip~!";
-			close;
-		}
-	}
-}
-
-ayothaya,146,86,4	script	Ayothaya Guide Noa#01ay	839,{
-	mes "[Noa]";
-	mes "Hello~";
-	mes "Welcome to ^8B4513Ayothaya^000000.";
-	mes "This town is linked to a river through the wild forest.";
-	mes "It's a really calm country.";
-	mes "Take your time to look around.";
-	while (1) {
-		next;
-		switch(select("[ Kafra Employee ]:[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Shrine ]:[ Fishing Spot ]:[ Aibakthing ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			mes "[Noa]";
-			mes "The ^0000FFKafra Employee^000000 is";
-			mes "marked on your mini-map.";
-			mes "Check your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,212,169,0,0x0A82FF;
-			break;
-		case 2:
-			mes "[Noa]";
-			mes "The ^0000FFWeapon Shop^000000";
-			mes "in Ayothaya has special weapons.";
-			mes "You can find great weapons there.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,163,90,1,0xAAFF00;
-			break;
-		case 3:
-			mes "[Noa]";
-			mes "Our citizens purchase many products in the ^006400Tool Shop^000000.";
-			mes "Make sure you get all you need there.";
-			mes "Do you need anything else??";
-			viewpoint 1,131,86,2,0x008080;
-			break;
-		case 4:
-			mes "[Noa]";
-			mes "Part of adventuring is collecting information.";
-			mes "The ^008080Tavern^000000 is crowded with lots of travelers where you can get useful information.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,229,72,3,0xFF1493;
-			break;
-		case 5:
-			mes "[Noa]";
-			mes "To calm your heart, go to the ^FF1493Shrine^000000 and say a prayer.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,208,280,4,0x8B4513;
-			break;
-		case 6:
-			mes "[Noa]";
-			mes "Ayothaya is close to the beach, so most people enjoy fishing.";
-			mes "They really love to fish.";
-			mes "Go ^8B4513fishing^000000 and try to grab a big fish.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,255,99,5,0x9400D3;
-			break;
-		case 7:
-			mes "[Noa]";
-			mes "If you want to return home";
-			mes "find ^00BFFFAibakthing^000000";
-			mes "and ask him to send you back.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,151,68,6,0x00BFFF;
-			break;
-		case 8:
-			mes "[Noa]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Do you need anything else??";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			break;
-		case 9:
-			mes "[Noa]";
+			mes .@n$;
 			mes "Enjoy your trip~!";
 			close;
 		}
 	}
 }
+ayothaya,146,86,4	duplicate(Ayothaya Guide Noi#01ay)	Ayothaya Guide Noa#02ay	4_F_THAIGIRL
diff --git a/npc/re/guides/guides_brasilis.txt b/npc/re/guides/guides_brasilis.txt
index b94dc87f0..05f6a47d7 100644
--- a/npc/re/guides/guides_brasilis.txt
+++ b/npc/re/guides/guides_brasilis.txt
@@ -3,79 +3,73 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2
 //===== Description: =========================================
 //= [Official Conversion]
-//= Guide for the city of Brasilis
+//= Guide for the city of Brasilis.
 //===== Additional Comments: =================================
 //= 1.0 First Version, Renewal guide.
 //= 1.1 Added a missing close.
+//= 1.2 Navigation system update. [Euphy]
 //============================================================
 
-brasilis,219,97,3	script	Brasilis Guide	478,{
+brasilis,219,97,3	script	Brasilis Guide	4_F_BRZ_WOMAN,{
 	mes "[Brasilis Guide]";
 	mes "Welcome to ^8B4513Brasilis^000000, a country as passionate as the sun.";
 	mes "If you have any questions, please ask me.";
+	F_Navi("[Brasilis Guide]");
 	next;
-	mes "[Brasilis Guide]";
-	mes "Where can I guide you?";
-	while (1){
+	switch(select("Ask about locations:Remove Marks from Mini-Map:Cancel")) {
+	case 1:
+		mes "[Brasilis Guide]";
+		mes "Where can I guide you?";
 		next;
-		switch(select("[ Hotel ]:[ Jungle Cable ]:[ Art Museum ]:[ Market ]:[ Verass Monument ]:Remove marks from Mini-Map:Cancel")) {
+		switch(select("[ Hotel ]:[ Jungle Cable ]:[ Art Museum ]:[ Market ]:[ Verass Monument ]")) {
 		case 1:
 			mes "[Brasilis Guide]";
-			mes "The Brasilis Hotel is located just above, ^FF3355+^000000.";
+			mes "The "+F_Navi("Brasilis Hotel","brasilis,274,151")+" is located just above, ^FF3355+^000000.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,274,151,2,0xFF3355;
-			next;
-			break;
+			close;
 		case 2:
 			mes "[Brasilis Guide]";
-			mes "Do you want to go through the rough jungle? You can take a Jungle Cable here ^CE6300+^000000.";
+			mes "Do you want to go through the rough jungle? You can take a ";
+			mes F_Navi("Jungle Cable","brasilis,308,335")+" here ^CE6300+^000000.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,308,335,3,0xCE6300;
-			next;
-			break;
+			close;
 		case 3:
 			mes "[Brasilis Guide]";
-			mes "The pride of Brasilis, the world scale Art Museum is at ^A5BAAD+^000000.";
+			mes "The pride of Brasilis, the world scale "+F_Navi("Art Museum","brasilis,137,167")+" is at ^A5BAAD+^000000.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,137,167,4,0x00FF00;
-			next;
-			break;
+			close;
 		case 4:
 			mes "[Brasilis Guide]";
-			mes "You can buy items for hunting at the Market here ^55FF33+^000000.";
+			mes "You can buy items for hunting at the "+F_Navi("Market","brasilis,254,248")+" here ^55FF33+^000000.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,254,248,5,0x55FF33;
-			next;
-			break;
+			close;
 		case 5:
 			mes "[Brasilis Guide]";
-			mes "The iconic monument of Brasilis, the Verass Monument stands at ^3355FF+^000000.";
+			mes "The iconic monument of Brasilis, the "+F_Navi("Verass Monument","brasilis,195,222")+" stands at ^3355FF+^000000.";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,195,235,6,0x3355FF;
-			next;
-			break;
-		case 6:
-			mes "[Brasilis Guide]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 0,274,151,2,0x00FF00;
-			viewpoint 0,308,335,3,0x00FF00;
-			viewpoint 0,137,167,4,0x00FF00;
-			viewpoint 0,254,248,5,0x00FF00;
-			viewpoint 0,195,235,6,0x00FF00;
-			next;
-			break;
-		case 7:
-			mes "[Brasilis Guide]";
-			mes "Wandering on your own is always the best way to explore. Anyway, take care.";
 			close;
 		}
+	case 2:
+		mes "[Brasilis Guide]";
+		mes "I'll remove all marks from your mini-map.";
+		mes "Is there anything else I can do for you?";
+		viewpoint 0,274,151,2,0x00FF00;
+		viewpoint 0,308,335,3,0x00FF00;
+		viewpoint 0,137,167,4,0x00FF00;
+		viewpoint 0,254,248,5,0x00FF00;
+		viewpoint 0,195,235,6,0x00FF00;
+		close;
+	case 3:
+		mes "[Brasilis Guide]";
+		mes "Wandering on your own is always the best way to explore. Anyway, take care.";
 		close;
-		break;
 	}
 }
diff --git a/npc/re/guides/guides_comodo.txt b/npc/re/guides/guides_comodo.txt
index 59988459e..6b584714e 100644
--- a/npc/re/guides/guides_comodo.txt
+++ b/npc/re/guides/guides_comodo.txt
@@ -3,22 +3,22 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Comodo.
 //===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================
 
-comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
+comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	8_F_GIRL,{
 	mes "[Comodo Guide]";
 	mes "Welcome to ^8B4513Comodo^000000,";
 	mes "the Beach Town of the Rune-Midgarts Kingdom.";
 	mes "Do you need help navigating the town?";
+	F_Navi("[Comodo Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel:About ^8B4513Comodo^000000")) {
@@ -27,57 +27,61 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 			while (.@loop) {
 				switch(select("[ Tavern ]:[ Casino ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Campsite ]:[ Souvenir Vendor ]:[ East Cave Mao ]:[ West Cave Karu ]:[ North Cave Ruanda ]:[ Hula Dance Stage ]:[ Kafra Co. Western Branch ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^FF0000Tavern";
+					callsub L_Mark, F_Navi("Tavern","comodo,161,315","^FF0000");
 					viewpoint 1,166,298,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^FFA500Casino";
+					callsub L_Mark, F_Navi("Casino","comodo,140,111","^FFA500");
 					viewpoint 1,140,98,1,0xFFA500;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^FF4500Weapon & Armor Shop";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","comodo,266,74","^FF4500");
 					viewpoint 1,266,70,2,0xFF4500;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^B8860BTool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","comodo,92,128","^B8860B");
 					viewpoint 1,86,128,3,0xB8860B;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^32CD32Campsite";
+					callsub L_Mark, F_Navi("Campsite","comodo,209,308","^32CD32");
 					viewpoint 1,210,308,4,0x32CD32;
 					next;
 					break;
 				case 6:
-					callsub L_Mark,"^6B8E23Souvenir Vendor";
+					callsub L_Mark, F_Navi("Souvenir Vendor","comodo,293,125","^6B8E23");
 					viewpoint 1,298,124,5,0x6B8E23;
 					next;
 					break;
 				case 7:
-					callsub L_Mark,"^008B8BEast Cave Mao",1;
+					callsub L_Mark, F_Navi("East Cave Mao","comodo,333,175","^008B8B");
 					viewpoint 1,333,175,6,0x008B8B;
 					next;
 					break;
 				case 8:
-					callsub L_Mark,"^1E90FFWest Cave Karu",1;
+					callsub L_Mark, F_Navi("West Cave Karu","comodo,24,214","^1E90FF");
 					viewpoint 1,24,214,7,0x1E90FF;
 					next;
 					break;
 				case 9:
-					callsub L_Mark,"^0000CDNorth Cave Ruanda",1;
+					callsub L_Mark, F_Navi("North Cave Ruanda","comodo,176,358","^0000CD");
 					viewpoint 1,176,358,8,0x0000CD;
 					next;
 					break;
 				case 10:
-					callsub L_Mark,"^C71585Hula Dance Stage";
+					callsub L_Mark, F_Navi("Hula Dance Stage","comodo,188,168","^C71585");
 					viewpoint 1,188,168,9,0xC71585;
 					next;
 					break;
 				case 11:
-					callsub L_Mark,"^DB7093Kafra Corporation Western Branch";
+					mes "[Comodo Guide]";
+					mes "Let me mark the location of the";
+					mes F_Navi("Kafra Corporation Western Branch","comodo,131,195","^DB7093");
+					mes "on your mini-map.";
+					mes "Would you like to check any other locations?";
 					viewpoint 1,136,202,10,0xDB7093;
 					next;
 					break;
@@ -92,26 +96,26 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 			while (.@loop) {
 				switch(select("[ Chief's House ]:[ Bor Robin ]:[ Kafra Employee ]:[ Roaming Bard ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^6495EDChief's House";
+					callsub L_Mark, F_Navi("Chief's House","comodo,115,290","^6495ED");
 					viewpoint 1,114,294,11,0x6495ED;
 					next;
 					break;
 				case 2:
 					mes "[Comodo Guide]";
-					mes "^228B22Bor Robin^000000";
+					mes F_Navi("Bor Robin","comodo,193,151","^228B22");
 					mes "helps adventurers to become ^228B22Dancers^000000.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,193,151,12,0x228B22;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^1E90FFKafra Employee";
+					callsub L_Mark,"^1E90FFKafra Employee^000000";
 					viewpoint 1,195,149,13,0x1E90FF;
 					next;
 					break;
 				case 4:
 					mes "[Comodo Guide]";
-					mes "The ^DB7093Roaming Bard^000000";
+					mes "The "+F_Navi("Roaming Bard","comodo,211,155","^DB7093");
 					mes "helps adventurers to become ^DB7093Bards^000000.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,211,155,14,0xDB7093;
@@ -167,12 +171,11 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 L_Mark:
 	mes "[Comodo Guide]";
 	mes "Let me mark the location of";
-	mes ((getarg(1,0))?"":"the ")+getarg(0)+"^000000";
+	mes "the "+getarg(0);
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	return;
 }
-
-comodo,181,347,4	duplicate(GuideComodo)	Comodo Guide#02comodo	700
-comodo,197,149,3	duplicate(GuideComodo)	Comodo Guide#03comodo	700
-comodo,37,219,4	duplicate(GuideComodo)	Comodo Guide#04comodo	700
+comodo,181,347,4	duplicate(GuideComodo)	Comodo Guide#02comodo	8_F_GIRL
+comodo,197,149,3	duplicate(GuideComodo)	Comodo Guide#03comodo	8_F_GIRL
+comodo,37,219,4	duplicate(GuideComodo)	Comodo Guide#04comodo	8_F_GIRL
diff --git a/npc/re/guides/guides_dewata.txt b/npc/re/guides/guides_dewata.txt
index 28b8696c8..91786f2d6 100644
--- a/npc/re/guides/guides_dewata.txt
+++ b/npc/re/guides/guides_dewata.txt
@@ -1,19 +1,18 @@
 //===== Hercules Script ======================================
 //= Dewata Guide
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guide for the city of Dewata.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [Lemongrass]
-//============================================================ 
+//= 1.1 Navigation system update. [Euphy]
+//============================================================
 
-dewata,202,106,4	script	Dewata Guide#dewata01	535,{
+dewata,202,106,4	script	Dewata Guide#dewata01	4_M_DEWOLDWOMAN,{
 	mes "[Dewata Guide]";
 	mes "Welcome to ^8B4513Dewata Island^000000,";
 	mes "a place with dazzling waves and charming views it's a great place to relax.";
@@ -21,71 +20,63 @@ dewata,202,106,4	script	Dewata Guide#dewata01	535,{
 	next;
 	mes "[Dewata Guide]";
 	mes "Where can I guide you?";
+	F_Navi("[Dewata Guide]");
 	while (1) {
 		next;
-		switch(select("[ Kafra Employee ]:[ Weapon Dealer ]:[ Armor Dealer ]:[ Tool Dealer ]:[ Krakatau Gatekeeper ]:[ Lodge Owner ]:[ Alberta Sailor ]:Remove marks from Mini-Map:Cancel")) {
-			case 1:
-				callsub L_Mark,"^0000FFKafra Employee";
-				viewpoint 1,202,184,0,0x000FFF;
-				break;
-
-			case 2:
-				callsub L_Mark,"^008080Armor Dealer";
-				viewpoint 1,218,163,1,0x008080;
-				break;
-
-			case 3:
-				callsub L_Mark,"^008080Weapon Dealer";
-				viewpoint 1,158,182,2,0x008080;
-				break;
-
-			case 4:
-				callsub L_Mark,"^FF1493Tool Dealer";
-				viewpoint 1,182,164,3,0xFF1493;
-				break;
-
-			case 5:
-				callsub L_Mark,"^FF1493Krakau Gatekeeper";
-				viewpoint 1,232,59,4,0xFF1493;
-				break;
-
-			case 6:
-				callsub L_Mark,"^8A2BE2Lodge Owner";
-				viewpoint 1,195,235,5,0x8A2BE2;
-				break;
-
-			case 7:
-				callsub L_Mark,"^00BFFFAlberta Sailor";
-				viewpoint 1,230,52,6,0x00BFFF;
-				break;
-
-			case 8:
-				mes "[Dewata Guide]";
-				mes "I'll remove all marks from your mini-map.";
-				mes "Is there anything else I can do for you?";
-				viewpoint 2,202,184,0,0xFFFFFF;
-				viewpoint 2,218,163,1,0xFFFFFF;
-				viewpoint 2,158,182,2,0xFFFFFF;
-				viewpoint 2,182,164,3,0xFFFFFF;
-				viewpoint 2,232,59,4,0xFFFFFF;
-				viewpoint 2,195,235,5,0xFFFFFF;
-				viewpoint 2,230,52,6,0xFFFFFF;
-				break;
-
-			case 9:
-				mes "[Dewata Guide]";
-				mes "Enjoy your trip!!";
-				close;
+		switch(select("[ Kafra Employee ]:[ Weapon Dealer ]:[ Armor Dealer ]:[ Tool Dealer ]:[ Restauranteur ]:[ Krakatau Gatekeeper ]:[ Alberta Sailor ]:Remove marks from Mini-Map:Cancel")) {
+		case 1:
+			callsub L_Mark, "^0000FFKafra Employee^000000";
+			viewpoint 1,202,184,0,0x000FFF;
+			break;
+		case 2:
+			callsub L_Mark, F_Navi("Weapon Dealer","dewata,218,164","^008080");
+			viewpoint 1,218,163,1,0x008080;
+			break;
+		case 3:
+			callsub L_Mark, F_Navi("Armor Dealer","dewata,158,182","^008080");
+			viewpoint 1,158,182,2,0x008080;
+			break;
+		case 4:
+			callsub L_Mark, F_Navi("Tool Dealer","dewata,182,164","^FF1493");
+			viewpoint 1,182,164,3,0xFF1493;
+			break;
+		case 5:
+			callsub L_Mark, F_Navi("Restauranteur","dewata,146,109","^FF1493");
+			viewpoint 1,146,109,4,0xFF1493;
+			break;
+		case 6:
+			callsub L_Mark, F_Navi("Krakau Gatekeeper","dewata,235,56","^8A2BE2");
+			viewpoint 1,235,56,5,0x8A2BE2;
+			break;
+		case 7:
+			callsub L_Mark, F_Navi("Alberta Sailor","dewata,229,49","^00BFFF");
+			viewpoint 1,229,49,6,0x00BFFF;
+			break;
+		case 8:
+			mes "[Dewata Guide]";
+			mes "I'll remove all marks from your mini-map.";
+			mes "Is there anything else I can do for you?";
+			viewpoint 2,202,184,0,0xFFFFFF;
+			viewpoint 2,218,163,1,0xFFFFFF;
+			viewpoint 2,158,182,2,0xFFFFFF;
+			viewpoint 2,182,164,3,0xFFFFFF;
+			viewpoint 2,232,59,4,0xFFFFFF;
+			viewpoint 2,195,235,5,0xFFFFFF;
+			viewpoint 2,230,52,6,0xFFFFFF;
+			break;
+		case 9:
+			mes "[Dewata Guide]";
+			mes "Enjoy your trip!!";
+			close;
 		}
 	}
 
 L_Mark:
 	mes "[Dewata Guide]";
-	mes "The "+getarg(0)+"^000000 is";
+	mes "The "+getarg(0)+" is";
 	mes "marked on your mini-map.";
 	mes "Check your mini-map.";
 	mes "Is there anything else I can do for you?";
 	return;
 }
-
-dewata,197,184,4	duplicate(Dewata Guide#dewata01)	Dewata Guide#dewata02	535
+dewata,197,184,4	duplicate(Dewata Guide#dewata01)	Dewata Guide#dewata02	4_M_DEWOLDWOMAN
diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt
index d2e079da8..9feca9df7 100644
--- a/npc/re/guides/guides_dicastes.txt
+++ b/npc/re/guides/guides_dicastes.txt
@@ -1,20 +1,19 @@
 //===== Hercules Script ======================================
 //= El Dicastes Guide
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guide for the city of El Dicastes.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [Joseph]
 //= 1.1 Fixed viewpoint syntax. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
+dicastes01,181,191,5	script	Traveler Ichack#info	4_M_SHADOWCHASER,2,2,{
 	mes "[Traveler Ichack]";
 	mes "Oh!! You are a stranger!";
 	mes "I'm Ichack, the first adventurer that arrived here in El Dicastes!";
@@ -25,6 +24,7 @@ dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
 	mes "[Traveler Ichack]";
 	mes "That's why I will provide a service to guide adventurers from Rune-Midgard.";
 	mes "What would you like to know?";
+	F_Navi("[Traveler Ichack]");
 	next;
 	switch(select("Dicastes Diel:Residential Area:Training Room:Factory:Pub:Cat Hand Caravan")) {
 	case 1:
@@ -33,9 +33,9 @@ dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
 		mes "It's said they discuss important things...";
 		next;
 		mes "[Traveler Ichack]";
-		mes "Please make sure you signed in at the dior, otherwise you'll get in trouble.";
+		mes "Please make sure you signed in at the "+F_Navi("Diel","dicastes01,198,351")+", otherwise you'll get in trouble.";
 		mes "Go directly north from here and you can't miss it.";
-		viewpoint 1,351,198,0,0x00FF00;
+		viewpoint 1,198,351,0,0x00FF00;
 		close;
 	case 2:
 		mes "[Traveler Ichack]";
@@ -46,43 +46,45 @@ dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
 		mes "You won't believe me until you see it! Go see it for yourself!";
 		next;
 		mes "[Traveler Ichack]";
-		mes "The residential area is divided into 2 area's.";
-		mes "The lower residential area is around 7 o'clock and, the upper area is around 1 o'clock.";
-		viewpoint 1,283,280,1,0x01FF01;
-		viewpoint 1,106,136,2,0x0066FF;
+		mes "The residential area is divided into 2 areas.";
+		mes "The "+F_Navi("lower residential area","dicastes01,136,106")+" is around 7 o'clock, and the ";
+		mes F_Navi("upper area","dicastes01,280,283")+" is around 1 o'clock.";
+		viewpoint 1,280,283,1,0x01FF01;
+		viewpoint 1,136,106,2,0x0066FF;
 		close;
 	case 3:
 		mes "[Traveler Ichack]";
-		mes "Because of the dangers here, we need better security..";
-		mes "Have you ever been to the training room? The training guards seem to never sleep!";
-		viewpoint 1,172,255,3,0xFFCCCC;
+		mes "Because of the dangers here, we need better security...";
+		mes "Have you ever been to the ";
+		mes F_Navi("training room","dicastes01,255,172")+"? The training guards seem to never sleep!";
+		viewpoint 1,255,172,3,0xFFCCCC;
 		close;
 	case 4:
 		mes "[Traveler Ichack]";
 		mes "This is one of the most important reasons why they live here.";
-		mes "If you go to factory, you can see the recently refined Bradium.";
-		viewpoint 1,256,97,4,0x0066FF;
+		mes "If you go to the "+F_Navi("factory","dicastes01,97,256")+", you can see the recently refined Bradium.";
+		viewpoint 1,97,256,4,0x0066FF;
 		close;
 	case 5:
 		mes "[Traveler Ichack]";
 		mes "Although I arrived here as the first adventurer, the owner of the pub was the first person here.";
-		mes "Bumen Florine's pub is located underground in the lower residential area.";
+		mes F_Navi("Bumen Florine's pub","dicastes01,136,106")+" is located underground in the lower residential area.";
 		mes "He might have some valuable information for you.";
-		viewpoint 1,106,136,5,0xFF3300;
+		viewpoint 1,136,106,5,0xFF3300;
 		close;
 	case 6:
 		mes "[Traveler Ichack]";
-		mes "The cats seems that don't have good relationship with sapha same as us.";
+		mes "The "+F_Navi("cats","dicastes01,199,39")+" don't seem to have a good relationship with the Sapha like we do.";
 		mes "Perhaps it's because trading is involved.";
 		mes "Poor cats. They must be shivering from the cold out there.";
 		next;
 		mes "[Traveler Ichack]";
 		mes "You can find their caravan just outside the gates.";
-		viewpoint 1,39,199,6,0x9933FF;
+		viewpoint 1,199,39,6,0x9933FF;
 		close;
 	}
 OnTouch:
-	if (ep13_3_invite == 6) 
+	if (ep13_3_invite == 6)
 		emotion e_gasp,0;
 	end;
 }
diff --git a/npc/re/guides/guides_eclage.txt b/npc/re/guides/guides_eclage.txt
new file mode 100644
index 000000000..177813e1c
--- /dev/null
+++ b/npc/re/guides/guides_eclage.txt
@@ -0,0 +1,49 @@
+//===== Hercules Script ======================================
+//= Eclage Guides
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Guides for the city of Eclage.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+ecl_in01,48,60,4	script	Eclage Guard#obb	4_M_FAIRYSOLDIER,{
+	mes "[Eclage Guard]";
+	mes "Welcome, Adventurer. This is the plaza of Eclage, a great and sacred tree. How can I help you?";
+	next;
+	switch(select("Palace:Orb:Store:Prison:Clinic:Residential Area:Finish the conversation")) {
+	case 1:
+		mes "[Eclage Guard]";
+		mes "Our great king, courageous generals, and scholars are all staying at the palace.";
+		mes "The palace is located at the top of Eclage. We usually fly there, but I see you don't have wings. Follow the path on your right then. It will lead you to the palace.";
+		close;
+	case 2:
+		mes "[Eclage Guard]";
+		mes "The Orb behind me is like a symbol of us Laphines.";
+		mes "It's filled with great and mysterious power. We always keep an eye on it and guard it carefully.";
+		close;
+	case 3:
+		mes "[Eclage Guard]";
+		mes "This is the plaza of Eclage. You'll find everything you need around here.";
+		close;
+	case 4:
+		mes "[Eclage Guard]";
+		mes "Prison is a place for criminals. Why would an adventurer like you go there?";
+		mes "Well, it's a little suspicious...but I'll tell you the location. Follow the path on your left. They don't let anyone in though.";
+		close;
+	case 5:
+		mes "[Eclage Guard]";
+		mes "All your pain and weariness melt away in the arms of nature. Restore your mind and body at Eclage Clinic.";
+		mes "Follow the path on your left.";
+		close;
+	case 6:
+		mes "[Eclage Guard]";
+		mes "Haven't you seen our decorations for Yai? Take a trip outside. You'll see our residential area.";
+		close;
+	case 7:
+		close;
+	}
+}
diff --git a/npc/re/guides/guides_einbroch.txt b/npc/re/guides/guides_einbroch.txt
index 6d28cffef..697450f51 100644
--- a/npc/re/guides/guides_einbroch.txt
+++ b/npc/re/guides/guides_einbroch.txt
@@ -1,19 +1,18 @@
 //===== Hercules Script ======================================
-//= Einbroch, and Einbech Guides
-//===== By: ================================================== 
+//= Einbroch and Einbech Guides
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
-//= Guides for the city of Einbroch, and Einbech
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//============================================================ 
+//= Guides for the cities of Einbroch and Einbech.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal guides.
+//= 1.1 Navigation system update. [Euphy]
+//============================================================
 
-einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
+einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	4_M_EIN_SOLDIER,{
 	cutin "ein_soldier",2;
 	mes "[Einbroch Guide]";
 	mes "Welcome";
@@ -21,6 +20,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 	mes "the City of Steel.";
 	mes "Please ask me if you";
 	mes "have any questions.";
+	F_Navi("[Einbroch Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -30,7 +30,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 				switch(select("[ Airport ]:[ Factory ]:[ Plaza ]:[ Hotel ]:[ Train Station ]:[ Weapon Shop ]:[ Laboratory ]:[ Monument ]:[ Blacksmith Guild ]:[ Gunslinger Guild ]:Previous Menu")) {
 				case 1:
 					mes "[Einbroch Guide]";
-					mes "The ^FF0000Airport^000000 is located";
+					mes "The "+F_Navi("Airport","einbroch,64,204","^FF0000")+" is located";
 					mes "in the northwestern part";
 					mes "of the city. There you can";
 					mes "see our city's pride and joy, the Airship. Remember that you must pay admission to board the Airship.";
@@ -39,7 +39,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 				case 2:
 					mes "[Einbroch Guide]";
-					mes "The Factory, perhaps the";
+					mes "The "+F_Navi("Factory","einbroch,129,79")+", perhaps the";
 					mes "most important facility in";
 					mes "Einbroch, is located in the";
 					mes "southern part of the city.";
@@ -48,7 +48,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 				case 3:
 					mes "[Einbroch Guide]";
-					mes "The Plaza, our biggest";
+					mes "The "+F_Navi("Plaza","einbroch,129,79")+", our biggest";
 					mes "shopping district, can be";
 					mes "found just east from the";
 					mes "center of Einbroch.";
@@ -57,7 +57,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 				case 4:
 					mes "[Einbroch Guide]";
-					mes "The Hotel is east of";
+					mes "The "+F_Navi("Hotel","einbroch,254,199")+" is east of";
 					mes "the Plaza and offers top";
 					mes "caliber accomodations.";
 					mes "There, you can enjoy your";
@@ -67,7 +67,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 				case 5:
 					mes "[Einbroch Guide]";
-					mes "The Train Station is";
+					mes "The "+F_Navi("Train Station","einbroch,232,272")+" is";
 					mes "located in the northeast";
 					mes "part of Einbroch. Trains";
 					mes "running between here";
@@ -78,7 +78,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 				case 6:
 					mes "[Einbroch Guide]";
-					mes "The Weapon Shop is";
+					mes "The "+F_Navi("Weapon Shop","einbroch,216,211")+" is";
 					mes "located north from the";
 					mes "Plaza. There you can";
 					mes "purchase weapons for";
@@ -88,7 +88,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 				case 7:
 					mes "[Einbroch Guide]";
-					mes "The Laboratory is an";
+					mes "The "+F_Navi("Laboratory","einbroch,55,52")+" is an";
 					mes "annex of the Factory and";
 					mes "is located in the southwest";
 					mes "sector of Einbroch.";
@@ -98,7 +98,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 				case 8:
 					mes "[Einbroch Guide]";
 					mes "I will mark the location";
-					mes "of the ^808080Monument^000000";
+					mes "of the "+F_Navi("Monument","einbroch,178,173","^808080");
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,178,173,7,0x808080;
@@ -106,7 +106,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 				case 9:
 					mes "[Einbroch Guide]";
-					mes "The Blacksmith Guild is";
+					mes "The "+F_Navi("Blacksmith Guild","einbroch,255,110")+" is";
 					mes "located in the southeast";
 					mes "part of Einbroch. You can";
 					mes "upgrade your equipment";
@@ -117,7 +117,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 				case 10:
 					mes "[Einbroch Guide]";
 					mes "I will mark the location";
-					mes "of the ^008080Gunslinger Guild^000000";
+					mes "of the "+F_Navi("Gunslinger Guild","einbroch,130,197","^008080");
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,130,197,9,0x008080;
@@ -142,7 +142,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					next;
 					mes "[Einbroch Guide]";
 					mes "I will mark the location";
-					mes "of the ^FF1493Armsmith^000000";
+					mes "of the "+F_Navi("Armsmith","einbroch,255,110","^FF1493");
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					next;
@@ -166,7 +166,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					next;
 					mes "[Einbroch Guide]";
 					mes "I will mark the location";
-					mes "of the ^CD1039Eden Teleport Officer^000000";
+					mes "of the "+F_Navi("Eden Teleport Officer","einbroch,130,197","^CD1039");
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					next;
@@ -206,12 +206,11 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 		}
 	}
 }
+einbroch,155,43,4	duplicate(GuideEinbroch)	Einbroch Guide#ein02	4_M_EIN_SOLDIER
+einbroch,162,317,4	duplicate(GuideEinbroch)	Einbroch Guide#ein03	4_M_EIN_SOLDIER
+einbroch,252,320,3	duplicate(GuideEinbroch)	Einbroch Guide#ein04	4_M_EIN_SOLDIER
 
-einbroch,155,43,4	duplicate(GuideEinbroch)	Einbroch Guide#ein02	852
-einbroch,162,317,4	duplicate(GuideEinbroch)	Einbroch Guide#ein03	852
-einbroch,252,320,3	duplicate(GuideEinbroch)	Einbroch Guide#ein04	852
-
-einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
+einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	4_M_EIN_SOLDIER,{
 	cutin "ein_soldier",2;
 	mes "[Einbech Guide]";
 	mes "Welcome to ^8B4513Einbech^000000,";
@@ -219,12 +218,13 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 	mes "here to assist tourists,";
 	mes "so if you have any questions,";
 	mes "please feel free to ask us.";
+	F_Navi("[Einbech Guide]");
 	next;
 	while (1) {
 		switch(select("[ Tavern ]:[ Tool Shop ]:[ Train Station ]:[ Mine ]:[ Kafra Employee ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 			mes "[Einbech Guide]";
-			mes "The Tavern is located";
+			mes "The "+F_Navi("Tavern","einbech,157,106")+" is located";
 			mes "in the southern part of";
 			mes "Einbech. It's a nice place";
 			mes "to relax after a long day.";
@@ -233,8 +233,7 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 			break;
 		case 2:
 			mes "[Einbech Guide]";
-			mes "You can find the Tool";
-			mes "Shop in the center of";
+			mes "You can find the "+F_Navi("Tool Shop","einbech,177,133")+" in the center of";
 			mes "Einbech. There, you can";
 			mes "purchase any tools you";
 			mes "might need for your travels.";
@@ -243,7 +242,7 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 			break;
 		case 3:
 			mes "[Einbech Guide]";
-			mes "The Train Stations are";
+			mes "The "+F_Navi("Train Stations","einbech,39,215")+" are";
 			mes "located in the northwest";
 			mes "and northeast parts of";
 			mes "Einbech. There, you can";
@@ -253,7 +252,7 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 			break;
 		case 4:
 			mes "[Einbech Guide]";
-			mes "The Mine, which is";
+			mes "The "+F_Navi("Mine","einbech,137,248")+", which is";
 			mes "Einbech's major industry,";
 			mes "is located in the northern";
 			mes "part of this town. It's where";
@@ -290,5 +289,4 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 		}
 	}
 }
-
-einbech,48,214,4	duplicate(GuideEinbech)	Einbech Guide#einbech02	852
+einbech,48,214,4	duplicate(GuideEinbech)	Einbech Guide#einbech02	4_M_EIN_SOLDIER
diff --git a/npc/re/guides/guides_geffen.txt b/npc/re/guides/guides_geffen.txt
index de32bf185..3bcd4db5b 100644
--- a/npc/re/guides/guides_geffen.txt
+++ b/npc/re/guides/guides_geffen.txt
@@ -1,25 +1,25 @@
 //===== Hercules Script ======================================
 //= Geffen Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Geffen.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
+geffen,203,116,4	script	Guide#01geffen::GuideGeffen	4_M_GEF_SOLDIER,{
 	cutin "gef_soldier",2;
 	mes "[Geffen Guide]";
 	mes "Welcome to ^8B4513Geffen^000000,";
 	mes "the City of Magic.";
 	mes "Do you need help navigating the city?";
+	F_Navi("[Geffen Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -29,7 +29,7 @@ geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 				switch(select("[ Magic Academy ]:[ Geffen Tower ]:[ Fountain ]:[ Tool Shop ]:[ Buy & Repair Equipment ]:[ Inn ]:[ Tavern ]:[ Christopher's Forge ]:Previous Menu")) {
 				case 1:
 					mes "[Geffen Guide]";
-					mes "The ^B9062FMagic Academy^000000";
+					mes "The "+F_Navi("Magic Academy","geffen,61,180","^B9062F");
 					mes "handles all magic-related affairs,";
 					mes "including job changes.";
 					mes "Let me mark its location";
@@ -39,23 +39,24 @@ geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^0000FFGeffen Tower";
+					callsub L_Mark, F_Navi("Geffen Tower","geffen,120,114","^0000FF");
 					viewpoint 1,120,114,1,0x0000FF;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^FF5400Fountain";
+					callsub L_Mark, F_Navi("Fountain","geffen,126,48","^FF5400");
 					viewpoint 1,126,48,2,0xFFB400;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^006400Tool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","geffen,44,86","^006400");
 					viewpoint 1,44,86,3,0xAAFF00;
 					next;
 					break;
 				case 5:
 					mes "[Geffen Guide]";
-					mes "If you'd like to ^7F3300Buy or Repair Equipment^000000";
+					mes "If you'd like to ";
+					mes F_Navi("Buy or Repair Equipment","geffen,99,140","^7F3300");
 					mes "then this is the place you'll want to visit.";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
@@ -64,18 +65,18 @@ geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 					next;
 					break;
 				case 6:
-					callsub L_Mark,"^800080Inn";
+					callsub L_Mark, F_Navi("Inn","geffen,172,174","^800080");
 					viewpoint 1,172,174,5,0xDA70D6;
 					next;
 					break;
 				case 7:
-					callsub L_Mark,"^B9062FTavern";
+					callsub L_Mark, F_Navi("Tavern","geffen,138,138","^B9062F");
 					viewpoint 1,138,138,6,0xFF0000;
 					next;
 					break;
 				case 8:
 					mes "[Geffen Guide]";
-					mes "^0000FFChristopher's Forge^000000 is";
+					mes F_Navi("Christopher's Forge","geffen,182,59","^0000FF")+" is";
 					mes "where you can purchase";
 					mes "Refining materials.";
 					mes "It used to be the old Blacksmith Guild.";
@@ -93,29 +94,29 @@ geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 			while (.@loop) {
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Dimensional Arcanist Guide ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^B9062FEden Teleport Officers";
+					callsub L_Mark, F_Navi("Eden Teleport Officers","geffen,132,66","^B9062F");
 					viewpoint 1,61,180,7,0xFF0000;
 					viewpoint 1,132,66,8,0xFF0000;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^FF5400Kafra Employees";
+					callsub L_Mark, "^FF5400Kafra Employees^000000";
 					viewpoint 1,203,123,10,0xFFB400;
 					viewpoint 1,120,62,11,0xFFB400;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^006400Pet Groomer";
+					callsub L_Mark, F_Navi("Pet Groomer","geffen,193,152","^006400");
 					viewpoint 1,193,152,12,0xAAFF00;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^7F3300Chef Assistant";
+					callsub L_Mark, F_Navi("Chef Assistant","geffen,196,111","^7F3300");
 					viewpoint 1,196,111,13,0xD2691E;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^800080Dimensional Arcanist Guide";
+					callsub L_Mark, F_Navi("Dimensional Arcanist Guide","geffen,140,196","^800080");
 					viewpoint 1,140,196,14,0xDA70D6;
 					next;
 					break;
@@ -164,6 +165,6 @@ L_Mark:
 	return;
 }
 
-geffen,118,62,0	duplicate(GuideGeffen)	Guide#02geffen	705
-geffen,36,123,6	duplicate(GuideGeffen)	Guide#03geffen	705
-geffen,123,203,4	duplicate(GuideGeffen)	Guide#04geffen	705
+geffen,118,62,0	duplicate(GuideGeffen)	Guide#02geffen	4_M_GEF_SOLDIER
+geffen,36,123,6	duplicate(GuideGeffen)	Guide#03geffen	4_M_GEF_SOLDIER
+geffen,123,203,4	duplicate(GuideGeffen)	Guide#04geffen	4_M_GEF_SOLDIER
diff --git a/npc/re/guides/guides_gonryun.txt b/npc/re/guides/guides_gonryun.txt
index 9aa3e2371..23f842758 100644
--- a/npc/re/guides/guides_gonryun.txt
+++ b/npc/re/guides/guides_gonryun.txt
@@ -1,20 +1,19 @@
 //===== Hercules Script ======================================
 //= Kunlun Guide
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guide for the city of Kunlun.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-gonryun,163,60,4	script	Kunlun Guide#01gonryun	780,{
+gonryun,163,60,4	script	Kunlun Guide#01gonryun	8_M_TWSOLDIER,{
 	mes "[He Yuen Zhe]";
 	mes "Ni Hao!";
 	mes "Welcome to ^8B4513Kunlun^000000~";
@@ -26,35 +25,36 @@ gonryun,163,60,4	script	Kunlun Guide#01gonryun	780,{
 	mes "I am responsible for helping you";
 	mes "with any questions you may have.";
 	mes "Please feel free to ask me anything.";
+	F_Navi("[He Yuen Zhe]");
 	while (1) {
 		next;
 		switch(select("[ Kafra Employee ]:[ Chief's Residence ]:[ Tool Dealer ]:[ Weapon Dealer ]:[ Armor Dealer ]:[ Wine Maker ]:[ Kunlun Envoy ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
-			callsub L_Mark,"^0000FFKafra Employee";
+			callsub L_Mark, "^0000FFKafra Employee^000000";
 			viewpoint 1,159,122,0,0x0A82FF;
 			break;
 		case 2:
-			callsub L_Mark,"^006400Chief's Residence";
+			callsub L_Mark, F_Navi("Chief's Residence","gonryun,110,131","^006400");
 			viewpoint 1,110,131,1,0xAAFF00;
 			break;
 		case 3:
-			callsub L_Mark,"^D8BFD8Tool Dealer";
+			callsub L_Mark, F_Navi("Tool Dealer","gonryun,147,84","^D8BFD8");
 			viewpoint 1,147,84,2,0xD8BFD8;
 			break;
 		case 4:
-			callsub L_Mark,"^FF1493Weapon Dealer";
+			callsub L_Mark, F_Navi("Weapon Dealer","gonryun,174,101","^FF1493");
 			viewpoint 1,174,101,3,0xFF1493;
 			break;
 		case 5:
-			callsub L_Mark,"^8B4513Armor Dealer";
+			callsub L_Mark, F_Navi("Armor Dealer","gonryun,173,84","^8B4513");
 			viewpoint 1,173,84,4,0x8B4513;
 			break;
 		case 6:
-			callsub L_Mark,"^9400DWine Maker";
+			callsub L_Mark, F_Navi("Wine Maker","gonryun,213,115","^9400D3");
 			viewpoint 1,213,115,5,0x9400D3;
 			break;
 		case 7:
-			callsub L_Mark,"^00BFFFKunlun Envoy";
+			callsub L_Mark, F_Navi("Kunlun Envoy","gonryun,161,11","^00BFFF");
 			viewpoint 1,161,11,6,0x00BFFF;
 			break;
 		case 8:
@@ -78,7 +78,7 @@ gonryun,163,60,4	script	Kunlun Guide#01gonryun	780,{
 	end;
 L_Mark:
 	mes "[He Yuen Zhe]";
-	mes "The "+getarg(0)+"^000000 is";
+	mes "The "+getarg(0)+" is";
 	mes "marked on your mini-map.";
 	mes "Check your mini-map.";
 	mes "Is there anything else I can do for you?";
diff --git a/npc/re/guides/guides_hugel.txt b/npc/re/guides/guides_hugel.txt
index e80146ff3..0544ead01 100644
--- a/npc/re/guides/guides_hugel.txt
+++ b/npc/re/guides/guides_hugel.txt
@@ -1,24 +1,24 @@
 //===== Hercules Script ======================================
 //= Hugel Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Hugel.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
+hugel,98,56,3	script	Hugel Guide Granny#hugel	4_F_LGTGRAND,{
 	mes "[Hugel Guide Granny]";
 	mes "Oh, hello~ you are one energetic adventurer.";
 	mes "Welcome to ^8B4513Hugel^000000. I am honored to guide you in this beautiful village.";
 	mes "If this is the first time for you to use the guide services, you should ask a lot of questions.";
+	F_Navi("[Hugel Guide Granny]");
 	next;
 	set .@str$,"Would you like to know more locations?";
 	while (1) {
@@ -29,7 +29,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ ^3131FFHunter Guild^000000 ]:[ Party Supplies Shop ]:[ ^3131FFShrine Expedition^000000 ]:Previous Menu")) {
 				case 1:
 					mes "[Hugel Guide Granny]";
-					mes "Well, to me, this Church is rather like a place for old folks like me, you know...";
+					mes "Well, to me, this "+F_Navi("Church","hugel,159,113")+" is rather like a place for old folks like me, you know...";
 					mes .@str$;
 					viewpoint 1,159,113,0,0xFF0000;
 					next;
@@ -37,14 +37,14 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 2:
 					mes "[Hugel Guide Granny]";
 					mes "Pudding rather than praise.";
-					mes "You'd better unpack your stuff first before you start looking around this village.";
+					mes "You'd better unpack your stuff at the "+F_Navi("Inn","hugel,101,77")+" first before you start looking around this village.";
 					mes .@str$;
 					viewpoint 1,101,77,1,0x8B4513;
 					next;
 					break;
 				case 3:
 					mes "[Hugel Guide Granny]";
-					mes "Yes, when you travel, you want to drop by a Pub and make new friends.";
+					mes "Yes, when you travel, you want to drop by a "+F_Navi("Pub","hugel,126,65")+" and make new friends.";
 					mes "Go east from here, then you will arrive at the pub.";
 					mes .@str$;
 					viewpoint 1,126,65,2,0xDAA520;
@@ -52,7 +52,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					break;
 				case 4:
 					mes "[Hugel Guide Granny]";
-					mes "A while ago, strangers came to the village and built that strange Airport kind of thing...";
+					mes "A while ago, strangers came to the village and built that strange "+F_Navi("Airport","hugel,178,146")+" kind of thing...";
 					mes "What do they call it? Airship?";
 					mes .@str$;
 					viewpoint 1,178,146,3,0xD7567F;
@@ -60,7 +60,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					break;
 				case 5:
 					mes "[Hugel Guide Granny]";
-					mes "Well, we have a Weapon Shop in the center of the village.";
+					mes "Well, we have a "+F_Navi("Weapon Shop","hugel,88,167")+" in the center of the village.";
 					mes "But I don't know if there is any weapon that you find useful.";
 					mes .@str$;
 					viewpoint 1,88,167,4,0xCD5C5C;
@@ -69,7 +69,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 6:
 					mes "[Hugel Guide Granny]";
 					mes "Yes, I love Hugel brand Red Potions. I haven't tasted Red Potions from any other brands yet...hohoho. ";
-					mes "The tool shop is located in the center of village.";
+					mes "The "+F_Navi("Tool Shop","hugel,92,163")+" is located in the center of village.";
 					mes .@str$;
 					viewpoint 1,92,163,5,0x000080;
 					next;
@@ -77,7 +77,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 7:
 					mes "[Hugel Guide Granny]";
 					mes "I will mark the location";
-					mes "of the ^800080Bingo Game Room^000000";
+					mes "of the "+F_Navi("Bingo Game Room","hugel,58,206","^800080");
 					mes "on your mini-map.";
 					mes .@str$;
 					viewpoint 1,58,206,6,0x800080;
@@ -86,7 +86,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 8:
 					mes "[Hugel Guide Granny]";
 					mes "Oh, are you an aspiring Hunter?";
-					mes "Then head northeast following the beach, then you will find the Hunter Guild.";
+					mes "Then head northeast following the beach, then you will find the "+F_Navi("Hunter Guild","hugel,209,224")+".";
 					mes .@str$;
 					viewpoint 1,209,224,7,0xFF1493;
 					next;
@@ -94,7 +94,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 9:
 					mes "[Hugel Guide Granny]";
 					mes "I will mark the location";
-					mes "of the ^483D8BParty Supplies Shop^000000";
+					mes "of the "+F_Navi("Party Supplies Shop","hugel,95,103","^483D8B");
 					mes "on your mini-map.";
 					mes .@str$;
 					viewpoint 1,95,103,8,0x483D8B;
@@ -102,7 +102,8 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					break;
 				case 10:
 					mes "[Hugel Guide Granny]";
-					mes "I heard that the Shrine Expedition is staying in a house at the west.";
+					mes "I heard that the ";
+					mes F_Navi("Shrine Expedition","hugel,52,95")+" is staying in a house at the west.";
 					mes "They have put some kind of sign in the middle of village, so I guess that they are hiring people for something...";
 					mes "I wonder what they are doing in here... hmmm.";
 					mes .@str$;
@@ -169,8 +170,8 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 	}
 }
 
-hugel,187,172,6	script	Guide Rich King#hugel	414,{
-	mes "[Guide Rich King]";
+hugel,187,172,6	script	Guide Rich King#hugel	4_M_CRU_KNT,{
+	mes "[Rich King]";
 	mes "What business do you have";
 	mes "in this countryside village?";
 	next;
@@ -178,6 +179,7 @@ hugel,187,172,6	script	Guide Rich King#hugel	414,{
 	mes "This is ^8B4513Hugel^000000";
 	mes "in the Schwaltzvalt Republic.";
 	mes "You are very honored to receive guidance from a great person like me.";
+	F_Navi("[Rich King]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -186,52 +188,52 @@ hugel,187,172,6	script	Guide Rich King#hugel	414,{
 			while (.@loop) {
 				switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ Hunter Guild ]:[ Party Supplies Shop ]:[ Shrine Expedition ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^FF0000Church";
+					callsub L_Mark, F_Navi("Church","hugel,159,113","^FF0000");
 					viewpoint 1,159,113,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^8B4513Inn";
+					callsub L_Mark, F_Navi("Inn","hugel,101,77","^8B4513");
 					viewpoint 1,101,77,1,0x8B4513;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^DAA520Pub";
+					callsub L_Mark, F_Navi("Pub","hugel,126,65","^DAA520");
 					viewpoint 1,126,65,2,0xDAA520;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^D7567FAirport";
+					callsub L_Mark, F_Navi("Airport","hugel,178,146","^D7567F");
 					viewpoint 1,178,146,3,0xD7567F;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^CD5C5CWeapon Shop";
+					callsub L_Mark, F_Navi("Weapon Shop","hugel,88,167","^CD5C5C");
 					viewpoint 1,88,167,4,0xCD5C5C;
 					next;
 					break;
 				case 6:
-					callsub L_Mark,"^000080Tool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","hugel,92,163","^000080");
 					viewpoint 1,92,163,5,0x000080;
 					next;
 					break;
 				case 7:
-					callsub L_Mark,"^800080Bingo Game Room";
+					callsub L_Mark, F_Navi("Bingo Game Room","hugel,58,206","^800080");
 					viewpoint 1,58,206,6,0x800080;
 					next;
 					break;
 				case 8:
-					callsub L_Mark,"^FF1493Hunter Guild";
+					callsub L_Mark, F_Navi("Hunter Guild","hugel,209,224","^FF1493");
 					viewpoint 1,209,224,7,0xFF1493;
 					next;
 					break;
 				case 9:
-					callsub L_Mark,"^483D8BParty Supplies Shop";
+					callsub L_Mark, F_Navi("Party Supplies Shop","hugel,95,103","^483D8B");
 					viewpoint 1,95,103,8,0x483D8B;
 					next;
 					break;
 				case 10:
-					callsub L_Mark,"^834683Shrine Expedition";
+					callsub L_Mark, F_Navi("Shrine Expedition","hugel,52,95","^834683");
 					viewpoint 1,52,95,9,0x834683;
 					next;
 					break;
@@ -246,12 +248,12 @@ hugel,187,172,6	script	Guide Rich King#hugel	414,{
 			while (.@loop) {
 				switch(select("[ Monster Race Arena ]:[ Cool Event Corp. Staff ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^FF1493Monster Race Arena";
+					callsub L_Mark, "^FF1493Monster Race Arena^000000";
 					viewpoint 1,60,71,10,0xFF1493;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^DA70D6Cool Event Corp. Staff";
+					callsub L_Mark, "^DA70D6Cool Event Corp. Staff^000000";
 					viewpoint 1,88,168,11,0xDA70D6;
 					next;
 					break;
@@ -290,7 +292,7 @@ hugel,187,172,6	script	Guide Rich King#hugel	414,{
 L_Mark:
 	mes "[Rich King]";
 	mes "I will mark the location";
-	mes "of the "+getarg(0)+"^000000.";
+	mes "of the "+getarg(0)+".";
 	mes "Do you want to know more locations?";
 	mes "Are you going to keep bugging me and make me get upset?";
 	return;
diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt
index 6f460ebcc..a3a37537b 100644
--- a/npc/re/guides/guides_izlude.txt
+++ b/npc/re/guides/guides_izlude.txt
@@ -1,83 +1,83 @@
 //===== Hercules Script ======================================
 //= Izlude Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
 //= [Official Conversion]
-//= Guides for the city of Izlude
-//===== Additional Comments: ================================= 
+//= Guides for the city of Izlude.
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Updated to match the new Izlude Map. [Masao]
-//============================================================ 
+//= 1.2 Added Renewal Izlude viewpoint coordinates.
+//= 1.3 Navigation system update. [Euphy]
+//=     Optimized.
+//= 1.4 Added Izlude duplicates. [Euphy]
+//============================================================
 
--	script	Guide#01izlude::GuideIzlude	-1,{
+-	script	::GuideIzlude	-1,{
 	cutin "prt_soldier",2;
 	mes "[Izlude Guide]";
 	mes "Welcome to ^8B4513Izlude^000000,";
 	mes "Prontera's satellite town.";
 	mes "Do you need help navigating the town?";
+	F_Navi("[Izlude Guide]");
 	next;
+	set .@map$, strnpcinfo(4);
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 			set .@loop,1;
 			while (.@loop) {
-				switch(select("[ Marina ]:[ Airport ]:[ Arena ]:[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Swordsman Guild ]:[ Swordsman Association ]:Previous Menu")) {
+				switch(select("[ Cryptura Academy ]:[ Marina ]:[ International Airship ]:[ Arena ]:[ Kit Shop ]:[ Swordsman Guild ]:[ Enchant Association ]:[ Forge ]:Previous Menu")) {
 				case 1:
 					mes "[Izlude Guide]";
-					mes "You can use the northeast ^B9062FMarina^000000";
+					mes "Novice adventurers should go to "+F_Navi("Cryptura Academy","iz_ac01,100,39")+" to receive more information and training!";
+					mes "Would you like to check any other locations?";
+					viewpoint 1,128,260,0,0xD2691E;
+					next;
+					break;
+				case 2:
+					mes "[Izlude Guide]";
+					mes "You can use the "+F_Navi("Marina",.@map$+",197,205","^B9062F");
 					mes "to go to ^8B4513Alberta^000000 or ^8B4513Byalan Island^000000.";
 					mes "Beware of ^8B4513Izlude Dungeon^000000";
 					mes "on Byalan Island since it is";
 					mes "filled with dreadful monsters.";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,197,205,0,0xFF0000;
+					viewpoint 1,197,205,1,0xFF0000;
 					next;
 					break;
-				case 2:
+				case 3:
 					mes "[Izlude Guide]";
-					mes "The ^0000FFInternational Airship^000000 to the southeast";
+					mes "The "+F_Navi("International Airship",.@map$+",202,75","^0000FF");
 					mes "goes to ^8B4513Juno^000000 and ^8B4513Rachel^000000.";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,204,75,1,0x0A82FF;
+					viewpoint 1,210,73,2,0x0A82FF;
 					next;
 					break;
-				case 3:
+				case 4:
 					mes "[Izlude Guide]";
-					mes "The ^FF5400Arena^000000 at the north";
+					mes "The "+F_Navi("Arena",.@map$+",213,161","^FF5400");
 					mes "is a perfect place to";
 					mes "test your combat capabilities.";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,128,255,2,0xFF5400;
-					next;
-					break;
-				case 4:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of the ^006400Tool Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,160,125,3,0xAAFF00;
+					viewpoint 1,213,161,3,0xFF5400;
 					next;
 					break;
 				case 5:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of the ^7F3300Weapon & Armor Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,109,182,4,0xD2691E;
+					callsub L_Mark, F_Navi("Kit Shop",.@map$+",110,182","^006400");
+					viewpoint 1,108,179,4,0xAAFF00;
 					next;
 					break;
 				case 6:
 					mes "[Izlude Guide]";
-					mes "The Swordsman Guild is where you can ^800080change your job to Swordsman.^000000";
+					mes "The "+F_Navi("Swordsman Guild",.@map$+",51,172")+" is where you can ^800080change your job to Swordsman.^000000";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
@@ -85,14 +85,16 @@
 					next;
 					break;
 				case 7:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of the ^B9062FSwordsman Association^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,212,161,6,0xFF0000;
+					callsub L_Mark, F_Navi("Enchant Association",.@map$+",97,125","^B9062F");
+					viewpoint 1,97,125,6,0xDA70D6;
 					next;
 					break;
 				case 8:
+					callsub L_Mark, F_Navi("Forge",.@map$+",153,126");
+					viewpoint 1,153,126,7,0xAAFF00;
+					next;
+					break;
+				case 9:
 					set .@loop,0;
 					break;
 				}
@@ -101,55 +103,48 @@
 		case 2:
 			set .@loop,1;
 			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Newlywed Helper ]:[ Bullet Merchant ]:[ Mercenary Guildsman ]:Previous Menu")) {
+				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Hypnotist ]:[ Newlywed Helper ]:[ Mercenary Guildsman ]:[ Pet Groomer ]:Previous Menu")) {
 				case 1:
 					mes "[Izlude Guide]";
-					mes "The ^0000FFEden Teleport Officer^000000";
+					mes "The "+F_Navi("Eden Teleport Officer",.@map$+",131,148","^0000FF");
 					mes "is currently staying inside";
 					mes "the Swordsman Guild building.";
 					mes "Let me mark his location on your mini-map.";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,131,148,7,0x0A82FF;
+					viewpoint 1,131,148,8,0x0A82FF;
 					next;
 					break;
 				case 2:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of the";
-					mes "^FF5400Kafra Employee^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,128,148,8,0xFF5400;
+					callsub L_Mark, F_Navi("Kafra Employee",.@map$+",128,148","^FF5400"),1;
+					viewpoint 1,128,148,9,0xFF5400;
 					next;
 					break;
 				case 3:
-					mes "[Izlude Guide]";
-					mes "If you'd like to go on a honeymoon to";
-					mes "^8B4513Jawaii^000000, the paradise of newlyweds,";
-					mes "please speak to the ^B9062FNewlywed Helper^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,180,224,9,0xFF0000;
+					callsub L_Mark, F_Navi("Hypnotist",.@map$+",127,175"),1;
+					viewpoint 1,127,175,10,0x006400;
 					next;
 					break;
 				case 4:
 					mes "[Izlude Guide]";
-					mes "The ^7F3300Bullet Merchants^000000 for ^7F3300Gunslingers^000000";
-					mes "is located to the east.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
+					mes "If you'd like to go on a honeymoon to";
+					mes "^8B4513Jawaii^000000, the paradise of newlyweds,";
+					mes "please speak to the ";
+					mes F_Navi("Newlywed Helper",.@map$+",180,224","^B9062F")+".";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,158,130,10,0xD2691E;
+					viewpoint 1,180,224,11,0xFF0000;
 					next;
 					break;
 				case 5:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of ^0000FFFencer Mercenary Manager^000000 and";
-					mes "^0000FFMercenary Goods Merchant^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,56,169,11,0xDA70D6;
+					callsub L_Mark, F_Navi("Mercenary Guildsman",.@map$+",47,170","^0000FF");
+					viewpoint 1,47,170,12,0xDA70D6;
 					next;
 					break;
 				case 6:
+					callsub L_Mark, F_Navi("Pet Groomer","izlude_in,72,98"),1;
+					viewpoint 1,108,179,13,0x006400;
+					next;
+					break;
+				case 7:
 					set .@loop,0;
 					break;
 				}
@@ -171,6 +166,8 @@
 			viewpoint 2,1,1,9,0xFFFF00;
 			viewpoint 2,1,1,10,0xFFFF00;
 			viewpoint 2,1,1,11,0xFFFF00;
+			viewpoint 2,1,1,12,0xFFFF00;
+			viewpoint 2,1,1,13,0xFFFF00;
 			next;
 			break;
 		case 4:
@@ -182,8 +179,29 @@
 			end;
 		}
 	}
+	end;
+L_Mark:
+	mes "[Izlude Guide]";
+	if (getarg(1,0)) {
+		mes "Let me mark the location of the";
+		mes getarg(0);
+	} else
+		mes "Let me mark the location of the "+getarg(0);
+	mes "on your mini-map.";
+	mes "Would you like to check any other locations?";
+	return;
 }
 
-izlude,129,175,4	duplicate(GuideIzlude)	Guide#02izlude	105
-izlude,133,113,4	duplicate(GuideIzlude)	Guide#03izlude	105
-izlude,120,206,4	duplicate(GuideIzlude)	Guide#04izlude	105
+izlude,129,175,4	duplicate(GuideIzlude)	Guide#01izlude	8W_SOLDIER
+izlude_a,129,175,4	duplicate(GuideIzlude)	Guide#01izlude_a	8W_SOLDIER
+izlude_b,129,175,4	duplicate(GuideIzlude)	Guide#01izlude_b	8W_SOLDIER
+izlude_c,129,175,4	duplicate(GuideIzlude)	Guide#01izlude_c	8W_SOLDIER
+izlude_d,129,175,4	duplicate(GuideIzlude)	Guide#01izlude_d	8W_SOLDIER
+
+izlude,133,113,4	duplicate(GuideIzlude)	Guide#02izlude	8W_SOLDIER
+izlude_a,133,113,4	duplicate(GuideIzlude)	Guide#02izlude_a	8W_SOLDIER
+izlude_b,133,113,4	duplicate(GuideIzlude)	Guide#02izlude_b	8W_SOLDIER
+izlude_c,133,113,4	duplicate(GuideIzlude)	Guide#02izlude_c	8W_SOLDIER
+izlude_d,133,113,4	duplicate(GuideIzlude)	Guide#02izlude_d	8W_SOLDIER
+
+//izlude,120,206,4	duplicate(GuideIzlude)	Guide#03izlude	8W_SOLDIER
diff --git a/npc/re/guides/guides_juno.txt b/npc/re/guides/guides_juno.txt
index 8af05d5ae..dc85f0743 100644
--- a/npc/re/guides/guides_juno.txt
+++ b/npc/re/guides/guides_juno.txt
@@ -1,92 +1,96 @@
 //===== Hercules Script ======================================
 //= Juno Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Juno.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
+yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	8_F_GIRL,{
 	mes "[Juno Guide]";
 	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
 	mes "the city of ^8B4513Juno^000000!";
+	F_Navi("[Juno Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove marks from Mini-Map:Cancel")) {
 		case 1:
 			set .@loop,1;
 			while (.@loop) {
-				switch(select("[ Tool Shop ]:[ Forge ]:[ Airport ]:[ Government Building ]:[ Street of Book Stores ]:[ Inn & Pub ]:[ Sage Castle ]:[ Monster Academy ]:[ Library of the Republic ]:[ Weapon & Armor Shop ]:[ Juphero Plaze ]:[ Monster Museum ]:[ Schweicherbil Magic Academy ]:Previous Menu")) {
+				switch(select("[ Tool Shop ]:[ Forge ]:[ Airport ]:[ Government Building ]:[ Street of Book Stores ]:[ Inn & Pub ]:[ Sage Castle ]:[ Monster Academy ]:[ Library of the Republic ]:[ Weapon & Armor Shop ]:[ Juphero Plaza ]:[ Monster Museum ]:[ Schweicherbil Magic Academy ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^FF0000Tool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","yuno,194,140","^FF0000");
 					viewpoint 1,194,140,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^FF4500Forge";
+					callsub L_Mark, F_Navi("Forge","yuno,120,137","^FF4500");
 					viewpoint 1,120,137,1,0xFF4500;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^DAA520Airport";
+					callsub L_Mark, F_Navi("Airport","yuno,16,261","^DAA520");
 					viewpoint 1,16,261,2,0xDAA520;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^008000Government Building";
+					callsub L_Mark, F_Navi("Government Building","yuno,157,317","^008000");
 					viewpoint 1,157,317,3,0x008000;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^0000FFStreet of Book Stores";
+					callsub L_Mark, F_Navi("Street of Book Stores","yuno,172,100","^0000FF");
 					viewpoint 1,172,100,4,0x0000FF;
 					next;
 					break;
 				case 6:
-					callsub L_Mark,"^000080Inn & Pub";
+					callsub L_Mark, F_Navi("Inn & Pub","yuno,51,105","^000080");
 					viewpoint 1,51,105,5,0x000080;
 					next;
 					break;
 				case 7:
-					callsub L_Mark,"^800080Sage Castle";
+					callsub L_Mark, F_Navi("Sage Castle","yuno,90,318","^800080");
 					viewpoint 1,90,318,6,0x800080;
 					next;
 					break;
 				case 8:
-					callsub L_Mark,"^834683Monster Academy";
+					callsub L_Mark, F_Navi("Monster Academy","yuno,95,184","^834683");
 					viewpoint 1,95,184,7,0x834683;
 					next;
 					break;
 				case 9:
-					callsub L_Mark,"^4B0082Juno Library";
+					callsub L_Mark, F_Navi("Juno Library","yuno,338,203","^4B0082");
 					viewpoint 1,338,203,8,0x4B0082;
 					next;
 					break;
 				case 10:
-					callsub L_Mark,"^008080Weapon & Armor Shop";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","yuno,120,137","^008080");
 					viewpoint 1,120,137,9,0x008080;
 					next;
 					break;
 				case 11:
-					callsub L_Mark,"^FF1493Juphero Plaza";
+					callsub L_Mark, F_Navi("Juphero Plaza","yuno,115,57","^FF1493");
 					viewpoint 1,115,157,10,0xFF1493;
 					next;
 					break;
 				case 12:
-					callsub L_Mark,"^DA70D6Monster Museum";
+					callsub L_Mark, F_Navi("Monster Museum","yuno,278,290","^DA70D6");
 					viewpoint 1,278,290,11,0xDA70D6;
 					next;
 					break;
 				case 13:
-					callsub L_Mark,"^CD1039Schweicherbil Magic Academy";
+					mes "[Juno Guide]";
+					mes "I will mark the location of the";
+					mes F_Navi("Schweicherbil Magic Academy","yuno,323,280","^CD1039");
+					mes "on your mini-map.";
+					mes "Would you like to check any other locations?";
 					viewpoint 1,323,280,12,0xCD1039;
 					next;
 					break;
@@ -101,14 +105,14 @@ yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 			while (.@loop) {
 				switch(select("[ Kafra Employees ]:[ Eden Teleport Officer ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^FA8072Kafra Employees";
+					callsub L_Mark, "^FA8072Kafra Employees^000000";
 					viewpoint 1,152,187,13,0xFA8072;
 					viewpoint 1,277,221,14,0xFA8072;
 					viewpoint 1,327,108,15,0xFA8072;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^803232Eden Teleport Officer";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","yuno,144,189","^803232");
 					viewpoint 1,144,189,16,0x803232;
 					next;
 					break;
@@ -151,10 +155,9 @@ yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 L_Mark:
 	mes "[Juno Guide]";
 	mes "I will mark the location";
-	mes "of the "+getarg(0)+"^000000";
+	mes "of the "+getarg(0);
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	return;
 }
-
-yuno,153,47,4	duplicate(GuideJuno)	Juno Guide#yuno02	700
+yuno,153,47,4	duplicate(GuideJuno)	Juno Guide#yuno02	8_F_GIRL
diff --git a/npc/re/guides/guides_lighthalzen.txt b/npc/re/guides/guides_lighthalzen.txt
index fcfd1cca8..d7cd22aae 100644
--- a/npc/re/guides/guides_lighthalzen.txt
+++ b/npc/re/guides/guides_lighthalzen.txt
@@ -1,20 +1,19 @@
 //===== Hercules Script ======================================
 //= Lighthalzen Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Lighthalzen.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
+lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	4_M_EIN_SOLDIER,{
 	cutin "ein_soldier",2;
 	mes "[Lighthalzen Guide]";
 	mes "Welcome to ^8B4513Lighthalzen^000000,";
@@ -31,6 +30,7 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 	mes "of ^8B4513Lighthalzen^000000. Now, please";
 	mes "select the location that you'd";
 	mes "like to learn more about.";
+	F_Navi("[Lighthalzen Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -39,52 +39,52 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 			while (.@loop) {
 				switch(select("[ Hotel ]:[ Bank ]:[ Airport ]:[ Weapon Shop ]:[ Department Store ]:[ Police Station ]:[ Jewelry Store ]:[ Cool Event Corp. ]:[ Somatology Laboratory ]:[ Alchemist Association ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^FF0000Hotel";
+					callsub L_Mark, F_Navi("Hotel","lighthalzen,159,133","^FF0000");
 					viewpoint 1,160,217,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^FF4500Bank";
+					callsub L_Mark, F_Navi("Bank","lighthalzen,203,257","^FF4500");
 					viewpoint 1,203,257,1,0xFF4500;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^DAA520Airport";
+					callsub L_Mark, F_Navi("Airport","lighthalzen,262,75","^DAA520");
 					viewpoint 1,262,75,2,0xDAA520;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^7B68EEWeapon Shop";
+					callsub L_Mark, F_Navi("Weapon Shop","lighthalzen,194,35","^7B68EE");
 					viewpoint 1,194,35,3,0x7B68EE;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^B91A4DDepartment Store";
+					callsub L_Mark, F_Navi("Department Store","lighthalzen,199,164","^B91A4D");
 					viewpoint 1,202,106,4,0xB91A4D;
 					next;
 					break;
 				case 6:
-					callsub L_Mark,"^008000Police Station";
+					callsub L_Mark, F_Navi("Police Station","lighthalzen,234,276","^008000");
 					viewpoint 1,234,276,5,0x008000;
 					next;
 					break;
 				case 7:
-					callsub L_Mark,"^0000FFJewelry Store";
+					callsub L_Mark, F_Navi("Jewelry Store","lighthalzen,96,110","^0000FF");
 					viewpoint 1,96,110,6,0x0000FF;
 					next;
 					break;
 				case 8:
-					callsub L_Mark,"^000080Cool Event Corp.";
+					callsub L_Mark, F_Navi("Cool Event Corp.","lighthalzen,238,217","^000080");
 					viewpoint 1,238,217,7,0x000080;
 					next;
 					break;
 				case 9:
-					callsub L_Mark,"^800080Somatology Laboratory";
+					callsub L_Mark, F_Navi("Somatology Laboratory","lighthalzen,101,243","^800080");
 					viewpoint 1,101,243,8,0x800080;
 					next;
 					break;
 				case 10:
-					callsub L_Mark,"^0A9696Alchemist Association";
+					callsub L_Mark, F_Navi("Alchemist Association","lighthalzen,54,132","^0A9696");
 					viewpoint 1,54,132,9,0x0A9696;
 					next;
 					break;
@@ -105,7 +105,7 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 					mes "on the 1st floor of the Weapon Shop.";
 					viewpoint 1,194,35,10,0x0A9696;
 					next;
-					callsub L_Mark,"^0A9696Armsmith";
+					callsub L_Mark, "^0A9696Armsmith^000000";
 					next;
 					break;
 				case 2:
@@ -116,22 +116,22 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 					mes "of the Weapon Shop.";
 					viewpoint 1,194,35,11,0x4B0082;
 					next;
-					callsub L_Mark,"^4B0082Seiyablem",1;
+					callsub L_Mark, "^4B0082Seiyablem^000000",1;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^FF4500Pet Groomer";
+					callsub L_Mark, F_Navi("Pet Groomer","lighthalzen,222,191","^FF4500");
 					viewpoint 1,222,191,12,0xFF4500;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^008080Kafra Employees";
+					callsub L_Mark, "^008080Kafra Employees^000000";
 					viewpoint 1,164,99,13,0x008080;
 					viewpoint 1,164,99,14,0x008080;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^FF1493Cool Event Corp. Staff";
+					callsub L_Mark, F_Navi("Cool Event Corp. Staff","lighthalzen,94,247","^FF1493");
 					viewpoint 1,94,247,15,0xFF1493;
 					next;
 					break;
@@ -175,12 +175,11 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 L_Mark:
 	mes "[Lighthalzen Guide]";
 	mes "I will mark the location";
-	mes "of "+((getarg(1,0))?"":"the ")+getarg(0)+"^000000";
+	mes "of "+((getarg(1,0))?"":"the ")+getarg(0);
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	return;
 }
-
-lighthalzen,220,310,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz02	852
-lighthalzen,154,100,5	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz03	852
-lighthalzen,307,224,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz04	852
+lighthalzen,220,310,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz02	4_M_EIN_SOLDIER
+lighthalzen,154,100,5	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz03	4_M_EIN_SOLDIER
+lighthalzen,307,224,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz04	4_M_EIN_SOLDIER
diff --git a/npc/re/guides/guides_louyang.txt b/npc/re/guides/guides_louyang.txt
index e5ff1d4c6..f79039e32 100644
--- a/npc/re/guides/guides_louyang.txt
+++ b/npc/re/guides/guides_louyang.txt
@@ -1,19 +1,18 @@
 //===== Hercules Script ======================================
 //= Louyang Guide
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
-//= Guide for the city of Louyang
-//===== Additional Comments: ================================= 
+//= Guide for the city of Louyang.
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
-//============================================================ 
+//= 1.1 Navigation system update. [Euphy]
+//============================================================
 
-louyang,224,104,4	script	Louyang Guide#01louyang	818,{
+louyang,224,104,4	script	Louyang Guide#01louyang	4_F_CHNWOMAN,{
 	mes "[Representative]";
 	mes "Welcome to ^8B4513Louyang^000000,";
 	mes "an ancient land with";
@@ -26,86 +25,88 @@ louyang,224,104,4	script	Louyang Guide#01louyang	818,{
 	mes "[Representative]";
 	mes "^8B4513Louyang^000000 is famous for";
 	mes "its elaborate history, as well as specialties that are unique to this nation. Please take your time and enjoy your stay.";
+	F_Navi("[Representative]");
+	set .@str$,"Is there anything else I can do for you?";
 	while (1) {
 		next;
 		switch(select("[ Dragon Castle ]:[ Doctor's Office ]:[ City Hall ]:[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Observatory ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 			mes "[Representative]";
-			mes "The Dragon Castle is located at ^0A82FF+^000000. It is where all the nobles reside, including our lord.";
+			mes "The "+F_Navi("Dragon Castle","louyang,218,253")+" is located at ^0A82FF+^000000. It is where all the nobles reside, including our lord.";
 			mes "Since you're an outsider, I guess it would be appropriate for you to visit our lord first.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,218,253,0,0x0A82FF;
 			break;
 		case 2:
 			mes "[Representative]";
-			mes "It's a famous ^AAFF00Doctor's Office^000000";
+			mes "It's a famous "+F_Navi("Doctor's Office","louyang,261,93","^AAFF00");
 			mes "according to rumor it can cure all diseases. But I'm not sure if it's true or not.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,261,93,1,0xAAFF00;
 			break;
 		case 3:
 			mes "[Representative]";
-			mes "We have a City Hall where the federal government operates.";
+			mes "We have a "+F_Navi("City Hall","louyang,309,78")+" where the federal government operates.";
 			mes "It is located at ^008080+^000000.";
 			next;
 			mes "[Representative]";
 			mes "If you have any problems,";
 			mes "you should talk with the";
 			mes "employees there.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,309,78,2,0x20B2AA;
 			break;
 		case 4:
 			mes "[Representative]";
-			mes "The Weapon Shop is located at ^55FF33+^000000.";
+			mes "The "+F_Navi("Weapon Shop","louyang,145,172")+" is located at ^55FF33+^000000.";
 			next;
 			mes "[Representative]";
 			mes "You will see";
 			mes "marvelous weapons forged";
 			mes "by the well-experienced";
 			mes "Blacksmiths of Louyang.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,145,172,3,0xFF1493;
 			break;
 		case 5:
 			mes "[Representative]";
-			mes "The Tool Shop is located at ^3355FF+^000000.";
+			mes "The "+F_Navi("Tool Shop","louyang,138,99")+" is located at ^3355FF+^000000.";
 			next;
 			mes "[Representative]";
 			mes "Knowing your enemy";
 			mes "is half the battle!";
 			mes "It's also safer to prepare yourself than to be sorry later. Why don't you go check their supplies?";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,138,99,4,0xFF0000;
 			break;
 		case 6:
 			mes "[Representative]";
-			mes "When you get tired during your trip, I suggest that you visit the Tavern. It's located at ^00FF00+^000000.";
+			mes "When you get tired during your trip, I suggest that you visit the "+F_Navi("Tavern","louyang,280,165")+". It's located at ^00FF00+^000000.";
 			next;
-			mes "[Soldier]";
+			mes "[Representative]";
 			mes "The Tavern is a good place";
 			mes "to meet other tourists, as well as to hear of any news that may be helpful to know.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,280,165,5,0xDAA520;
 			break;
 		case 7:
 			mes "[Representative]";
-			mes "You won't get a better view of the world than you can at the Observatory.";
+			mes "You won't get a better view of the world than you can at the "+F_Navi("Observatory","louyang,136,245")+".";
 			mes "It's a must see here.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,136,245,6,0xD8BFD8;
 			break;
 		case 8:
 			mes "[Representative]";
 			mes "If you want to return to Alberta,";
-			mes "find the ^00BFFFKGirl^000000 outside town on the docks.";
-			mes "Is there anything else I can do for you?";
+			mes "find the "+F_Navi("Girl","louyang,218,22","^00BFFF")+" outside town on the docks.";
+			mes .@str$;
 			viewpoint 1,218,22,7,0x00BFFF;
 			break;
 		case 9:
 			mes "[Representative]";
 			mes "I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 2,1,1,0,0xFFFFFF;
 			viewpoint 2,1,1,1,0xFFFFFF;
 			viewpoint 2,1,1,2,0xFFFFFF;
diff --git a/npc/re/guides/guides_lutie.txt b/npc/re/guides/guides_lutie.txt
index 121744a24..86f283c98 100644
--- a/npc/re/guides/guides_lutie.txt
+++ b/npc/re/guides/guides_lutie.txt
@@ -1,49 +1,49 @@
 //===== Hercules Script ======================================
 //= Lutie Guide
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guide for the city of Lutie.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-xmas,140,137,3	script	Lutie Guide#xmas	717,{
+xmas,140,137,3	script	Lutie Guide#xmas	4_F_KID3,{
 	mes "[Lutie Guide]";
 	mes "Welcome to ^8B4513Lutie^000000,";
 	mes "the Snow Village.";
 	mes "Do you need help navigating the village?";
+	F_Navi("[Lutie Guide]");
 	while (1) {
 		next;
 		switch(select("[ Gift Shop ]:[ Church ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Santa's House ]:[ Toy Factory ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
-			callsub L_Mark,"^008080Gift Shop";
+			callsub L_Mark, F_Navi("Gift Shop","xmas,172,131","^008080");
 			viewpoint 1,172,131,2,0x008080;
 			break;
 		case 2:
-			callsub L_Mark,"^006400Church";
+			callsub L_Mark, F_Navi("Church","xmas,104,287","^006400");
 			viewpoint 1,104,287,1,0xAAFF00;
 			break;
 		case 3:
-			callsub L_Mark,"^FF1493Weapon & Armor Shop";
+			callsub L_Mark, F_Navi("Weapon & Armor Shop","xmas,171,158","^FF1493");
 			viewpoint 1,171,158,3,0xFF1493;
 			break;
 		case 4:
-			callsub L_Mark,"^8B4513Tool Shop";
+			callsub L_Mark, F_Navi("Tool Shop","xmas,122,131","^8B4513");
 			viewpoint 1,122,131,4,0x8B4513;
 			break;
 		case 5:
-			callsub L_Mark,"^B9062FSanta's House",1;
+			callsub L_Mark, F_Navi("Santa's House","xmas,149,237","^B9062F"),1;
 			viewpoint 1,149,237,5,0x9400D3;
 			break;
 		case 6:
-			callsub L_Mark,"^9400D3Toy Factory";
+			callsub L_Mark, F_Navi("Toy Factory","xmas,143,312","^9400D3");
 			viewpoint 1,143,312,6,0xFF0000;
 			break;
 		case 7:
diff --git a/npc/re/guides/guides_malaya.txt b/npc/re/guides/guides_malaya.txt
new file mode 100644
index 000000000..7120d843c
--- /dev/null
+++ b/npc/re/guides/guides_malaya.txt
@@ -0,0 +1,81 @@
+//===== Hercules Script ======================================
+//= Port Malaya Guides
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= Guides for the city of Malaya.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//= 1.1 Navigation system update. [Euphy]
+//============================================================
+
+malaya,71,72,4	script	Port Malaya Guide#01::GuideMalaya	4_F_BARYO_WOMAN,{
+	mes "[Port Malaya Guide]";
+	mes "Welcome to ^8B4513Port Malaya^000000, the Breathing Village.";
+	mes "Where cultures and legends come to life!";
+	mes "Do you need help navigating the village?";
+	F_Navi("[Port Malaya Guide]");
+	while(1) {
+		next;
+		switch(select("[ Kafra Employees ]:[ Inn & Tavern ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Hospital ]:[ Park ]:[ Harbor ]:Remove marks from Mini-Map:Cancel")) {
+		case 1:
+			callsub L_Mark, "^0000FFKafra Employees^000000",1;
+			viewpoint 1,71,79,0,0x0A82FF;
+			viewpoint 1,234,204,1,0x0A82FF;
+			break;
+		case 2:
+			callsub L_Mark, F_Navi("Inn & Tavern","malaya,193,215","^006400");
+			viewpoint 1,193,215,2,0xAAFF00;
+			break;
+		case 3:
+			callsub L_Mark, F_Navi("Weapon & Armor Shop","malaya,114,212","^008080");
+			viewpoint 1,114,212,3,0x4F543C;
+			break;
+		case 4:
+			callsub L_Mark, F_Navi("Tool Shop","malaya,297,167","^FF1493");
+			viewpoint 1,297,167,4,0xFF1493;
+			break;
+		case 5:
+			callsub L_Mark, F_Navi("Hospital","malaya,50,75","^8B4513");
+			viewpoint 1,50,75,5,0x8B4513;
+			break;
+		case 6:
+			callsub L_Mark, F_Navi("Park","malaya,280,371","^8B4513");
+			viewpoint 1,280,371,6,0x8B4513;
+			break;
+		case 7:
+			callsub L_Mark, F_Navi("Harbor","malaya,276,55","^8A2BE2");
+			viewpoint 1,276,55,7,0x8A2BE2;
+			break;
+		case 8:
+			mes "[Port Malaya Guide]";
+			mes "I'll remove all marks from your mini-map.";
+			mes "Is there anything else I can do for you?";
+			viewpoint 2,1,1,0,0xFFFFFF;
+			viewpoint 2,1,1,1,0xFFFFFF;
+			viewpoint 2,1,1,2,0xFFFFFF;
+			viewpoint 2,1,1,3,0xFFFFFF;
+			viewpoint 2,1,1,4,0xFFFFFF;
+			viewpoint 2,1,1,5,0xFFFFFF;
+			viewpoint 2,1,1,6,0xFFFFFF;
+			viewpoint 2,1,1,7,0xFFFFFF;
+			break;
+		case 9:
+			mes "[Port Malaya Guide]";
+			mes "I hope you enjoy your journey.";
+			close;
+		}
+	}
+	end;
+L_Mark:
+	mes "[Port Malaya Guide]";
+	mes "The "+getarg(0)+" "+((getarg(1,0))?"are":"is");
+	mes "marked on your mini-map.";
+	mes "Check your mini-map.";
+	mes "Is there anything else I can do for you?";
+	return;
+}
+malaya,250,83,6	duplicate(GuideMalaya)	Port Malaya Guide#02	4_F_BARYO_WOMAN
+malaya,224,204,6	duplicate(GuideMalaya)	Port Malaya Guide#03	4_F_BARYO_WOMAN
diff --git a/npc/re/guides/guides_mora.txt b/npc/re/guides/guides_mora.txt
index 0cb0db35d..87de33b35 100644
--- a/npc/re/guides/guides_mora.txt
+++ b/npc/re/guides/guides_mora.txt
@@ -1,48 +1,48 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Mora Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Euphy
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= Guides for the city of Mora.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [Euphy]
-//============================================================ 
+//= 1.1 Navigation system update. [Euphy]
+//============================================================
 
-mora,25,158,5	script	Raffle Guide#north	516,{
+mora,25,158,5	script	Raffle Guide#north	4_M_RAFLE_GR,{
 	mes "[Raffoh]";
 	mes "Laoh~!";
 	mes "Welcome to the Village of Mora.";
 	mes "I can tell you whatever you want to know about the village~!";
+	F_Navi("[Raffoh]");
 	next;
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
 	case 1:
 		mes "[Raffoh]";
 		mes "Laoh~!";
-		mes "We have an inn but we can't make travelers sleep like Raffles...";
+		mes "We have an "+F_Navi("Inn","mora,44,138")+" but we can't make travelers sleep like Raffles...";
 		mes "Get some rest!";
 		viewpoint 1,44,134,0,0x0A82FF;
 		close;
 	case 2:
 		mes "[Raffoh]";
 		mes "Laoh~!";
-		mes "This is where Raffles' houses are...";
+		mes F_Navi("This","mora,119,170")+" is where Raffles' houses are...";
 		mes "But keep the noise down because people are asleep~!";
 		viewpoint 1,119,170,1,0xAAFF00;
 		close;
 	case 3:
 		mes "[Raffoh]";
 		mes "Laoh~!";
-		mes "If you are looking for souvenirs, you can buy some in this district.";
+		mes "If you are looking for souvenirs, you can buy some in this "+F_Navi("district","mora,112,110")+".";
 		viewpoint 1,112,110,2,0xDA70D6;
 		close;
 	case 4:
 		mes "[Raffoh]";
 		mes "Laoh~!";
-		mes "This is where they keep all kinds of packages and groceries.";
+		mes F_Navi("This","mora,182,161")+" is where they keep all kinds of packages and groceries.";
 		mes "There are many things that don't belong to the Raffles, so be careful!";
 		viewpoint 1,182,161,3,0xFF1493;
 		close;
@@ -62,37 +62,38 @@ mora,25,158,5	script	Raffle Guide#north	516,{
 	}
 }
 
-mora,167,76,3	script	Raffle Guide#east	522,{
+mora,167,76,3	script	Raffle Guide#east	4_M_RAFLE_OR,{
 	mes "[Raffuh]";
 	mes "Uh...";
 	mes "This, this is the Village of Mora.";
 	mes "Uh... which place do you want to know about?";
+	F_Navi("[Raffuh]");
 	next;
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
 	case 1:
 		mes "[Raffuh]";
 		mes "Uh...";
 		mes "Are, are you sleepy?";
-		mes "You can sleep here uh!! Put your stuff down uh! And-- and---";
+		mes "You can sleep "+F_Navi("here","mora,44,138")+" uh!! Put your stuff down uh! And-- and---";
 		viewpoint 1,44,134,0,0x0A82FF;
 		close;
 	case 2:
 		mes "[Raffuh]";
 		mes "Uh...";
-		mes "Why are you trying to find out where I live--?";
+		mes "Why are you trying to find out "+F_Navi("where","mora,119,170")+" I live--?";
 		mes "Uh, no... I'd like to live with my friends--";
 		viewpoint 1,119,170,1,0xAAFF00;
 		close;
 	case 3:
 		mes "[Raffuh]";
 		mes "Uh...";
-		mes "There are a lot of things in those stores-- oh, there is a hot spring also uh!";
+		mes "There are a lot of things in those "+F_Navi("stores","mora,112,110")+"-- oh, there is a hot spring also uh!";
 		viewpoint 1,112,110,2,0xDA70D6;
 		close;
 	case 4:
 		mes "[Raffuh]";
 		mes "Uh...";
-		mes "You can't just march into the warehouse, or you'll be in trouble--";
+		mes "You can't just march into the "+F_Navi("warehouse","mora,182,161")+", or you'll be in trouble--";
 		mes "Many of the things there are from outside the village-- Raffuh has been in trouble several times--";
 		viewpoint 1,182,161,3,0xFF1493;
 		close;
@@ -112,24 +113,25 @@ mora,167,76,3	script	Raffle Guide#east	522,{
 	}
 }
 
-mora,115,138,5	script	Raffle Guide#center	524,{
+mora,115,138,5	script	Raffle Guide#center	4_M_RAFLE_VI,{
 	mes "[Raffla]";
 	mes "Lala!";
 	mes "Welcome to the Village of Mora la!";
 	mes "If you need to know anything about the village, just ask me la!";
+	F_Navi("[Raffla]");
 	next;
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit.")) {
 	case 1:
 		mes "[Raffla]";
 		mes "Lala!";
-		mes "This is where travelers can rest la!";
+		mes F_Navi("This","mora,44,138")+" is where travelers can rest la!";
 		mes "The innkeeper is very kind, so try to talk to him a lot la!";
 		viewpoint 1,44,134,0,0x0A82FF;
 		close;
 	case 2:
 		mes "[Raffla]";
 		mes "Lala!";
-		mes "This is where Raffles live la!";
+		mes F_Navi("This","mora,119,170")+" is where Raffles live la!";
 		mes "Head over there la!";
 		viewpoint 1,119,170,1,0xAAFF00;
 		close;
@@ -137,13 +139,13 @@ mora,115,138,5	script	Raffle Guide#center	524,{
 		mes "[Raffla]";
 		mes "Lala!";
 		mes "So you want to buy something la?";
-		mes "There are a lot of stores and cafes, so check them out la!";
+		mes "There are a lot of "+F_Navi("stores and cafes","mora,112,110")+", so check them out la!";
 		viewpoint 1,112,110,2,0xDA70D6;
 		close;
 	case 4:
 		mes "[Raffla]";
 		mes "Lala!";
-		mes "The warehouse is where you keep your valuables la!";
+		mes "The "+F_Navi("Warehouse","mora,182,161")+" is where you keep your valuables la!";
 		mes "Be careful so you don't get robbed la!";
 		viewpoint 1,182,161,3,0xFF1493;
 		close;
@@ -163,24 +165,25 @@ mora,115,138,5	script	Raffle Guide#center	524,{
 	}
 }
 
-mora,72,51,3	script	Raffle Guide#south	518,{
+mora,72,51,3	script	Raffle Guide#south	4_F_RAFLE_PK,{
 	mes "[Raffli]";
 	mes "Lali?";
 	mes "Welcome to the Village of Mora.";
 	mes "If you need to know anything about the village, just ask me.";
+	F_Navi("[Raffli]");
 	next;
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
 	case 1:
 		mes "[Raffli]";
 		mes "Lali?";
-		mes "This is where travelers can rest.";
+		mes F_Navi("This","mora,44,138")+" is where travelers can rest.";
 		mes "The innkeeper is very kind, so get to know him.";
 		viewpoint 1,44,134,0,0x0A82FF;
 		close;
 	case 2:
 		mes "[Raffli]";
 		mes "Lali?";
-		mes "This is where Raffles live.";
+		mes F_Navi("This","mora,119,170")+" is where Raffles live.";
 		mes "Are you coming to Raffli's house li? I'm so happy.";
 		viewpoint 1,119,170,1,0xAAFF00;
 		close;
@@ -188,13 +191,13 @@ mora,72,51,3	script	Raffle Guide#south	518,{
 		mes "[Raffli]";
 		mes "Lali?";
 		mes "There are a lot of things I want to buy.";
-		mes "You can find tons of places to eat and shop, and tons of things to buy.";
+		mes "You can find tons of "+F_Navi("places","mora,112,110")+" to eat and shop, and tons of things to buy.";
 		viewpoint 1,112,110,2,0xDA70D6;
 		close;
 	case 4:
 		mes "[Raffli]";
 		mes "Lali?";
-		mes "The warehouse is where you keep your valuables.";
+		mes "The "+F_Navi("Warehouse","mora,182,161")+" is where you keep your valuables.";
 		mes "But don't get robbed.";
 		viewpoint 1,182,161,3,0xFF1493;
 		close;
diff --git a/npc/re/guides/guides_morroc.txt b/npc/re/guides/guides_morroc.txt
index e9e662ecd..55b1ef58e 100644
--- a/npc/re/guides/guides_morroc.txt
+++ b/npc/re/guides/guides_morroc.txt
@@ -1,25 +1,25 @@
 //===== Hercules Script ======================================
 //= Morroc Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Morroc and Morroc Ruins.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
+morocc,153,286,6	script	Guide#01morocc::GuideMorroc	4_M_MOC_SOLDIER,{
 	cutin "moc_soldier",2;
 	mes "[Morroc Guide]";
 	mes "Welcome to ^8B4513Morroc^000000,";
 	mes "the Desert Town.";
 	mes "Do you need help navigating the town?";
+	F_Navi("[Morroc Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -29,7 +29,7 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Oasis Entrance ]:[ Forge ]:[ Weapon & Armor Shop ]:[ Inn ]:[ Tavern ]:Previous Menu")) {
 				case 1:
 					mes "[Morroc Guide]";
-					mes "The ^B9062FThief Guild^000000 is located";
+					mes "The "+F_Navi("Thief Guild","morocc,26,294","^B9062F")+" is located";
 					mes "inside the ^B9062FPyramids^000000";
 					mes "that is near the ^B9062FOasis^000000.";
 					mes "Would you like to check any other locations?";
@@ -38,7 +38,7 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 					break;
 				case 2:
 					mes "[Morroc Guide]";
-					mes "The ^0000FFSphinx Dungeon^000000 is";
+					mes "The "+F_Navi("Sphinx Dungeon","morocc,26,164","^0000FF")+" is";
 					mes "right outside the western gate.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,26,164,1,0x0A82FF;
@@ -46,25 +46,25 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 					break;
 				case 3:
 					mes "[Morroc Guide]";
-					mes "Let me mark the entrance to the ^FF5400Oasis^000000";
+					mes "Let me mark the entrance to the "+F_Navi("Oasis","morocc,26,294","^FF5400");
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,26,294,2,0xFFB400;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^006400Forge";
+					callsub L_Mark, F_Navi("Forge","morocc,47,47","^006400");
 					viewpoint 1,47,47,3,0xAAFF00;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^7F3300Weapon & Armor Shop";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","morocc,253,56","^7F3300");
 					viewpoint 1,253,56,4,0xD2691E;
 					next;
 					break;
 				case 6:
 					mes "[Morroc Guide]";
-					mes "Currently the ^800080Inn^000000";
+					mes "Currently the "+F_Navi("Inn","morocc,273,269","^800080");
 					mes "has been shut down until further notice,";
 					mes "but I'll mark its location";
 					mes "on your mini-map.";
@@ -73,7 +73,7 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 					next;
 					break;
 				case 7:
-					callsub L_Mark,"^B9062FTavern";
+					callsub L_Mark, F_Navi("Tavern","morocc,52,259","^B9062F");
 					viewpoint 1,52,259,6,0xFF0000;
 					next;
 					break;
@@ -88,19 +88,19 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 			while (.@loop) {
 				switch(select("[ Kafra Employee ]:[ Poison Herb Salesman ]:[ Dye Maker ]:[ Seiyablem ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^0000FFKafra Employees";
+					callsub L_Mark,"^0000FFKafra Employees^000000";
 					viewpoint 1,156,97,7,0x0A82FF;
 					viewpoint 1,160,258,8,0x0A82FF;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^006400Poison Herb Salesman";
+					callsub L_Mark, F_Navi("Poison Herb Salesman","morocc,191,94","^006400");
 					viewpoint 1,190,96,9,0xAAFF00;
 					next;
 					break;
 				case 3:
 					mes "[Morroc Guide]";
-					mes "The ^7F3300Dye Maker^000000 is";
+					mes "The "+F_Navi("Dye Maker","morocc,273,269","^7F3300")+" is";
 					mes "currently staying";
 					mes "on the 1st floor of the Inn.";
 					mes "Let me mark his location";
@@ -111,7 +111,7 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 					break;
 				case 4:
 					mes "[Morroc Guide]";
-					mes "^800080Seiyablem^000000";
+					mes F_Navi("Seiyablem","morocc,51,41","^800080");
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "but not all equipment";
@@ -156,22 +156,22 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 L_Mark:
 	mes "[Morroc Guide]";
 	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
+	mes getarg(0);
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	return;
 }
+morocc,154,38,6	duplicate(GuideMorroc)	Guide#02morocc	4_M_MOC_SOLDIER
+morocc,296,213,4	duplicate(GuideMorroc)	Guide#03morocc	4_M_MOC_SOLDIER
+morocc,28,170,5	duplicate(GuideMorroc)	Guide#04morocc	4_M_MOC_SOLDIER
 
-morocc,154,38,6	duplicate(GuideMorroc)	Guide#02morocc	707,{
-morocc,296,213,4	duplicate(GuideMorroc)	Guide#03morocc	707,{
-morocc,28,170,5	duplicate(GuideMorroc)	Guide#04morocc	707,{
-
-moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
+moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	4_M_MOC_SOLDIER,{
 	cutin "moc_soldier",2;
 	mes "[Morroc Guide]";
 	mes "Welcome to ^8B4513Morroc^000000,";
 	mes "the Desert Town.";
 	mes "Do you need help navigating the town?";
+	F_Navi("[Morroc Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -181,7 +181,7 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Morroc Entrance ]:Previous Menu")) {
 				case 1:
 					mes "[Morroc Guide]";
-					mes "The ^B9062FThief Guild^000000 is located";
+					mes "The "+F_Navi("Thief Guild","moc_ruins,56,161","^B9062F")+" is located";
 					mes "inside the ^B9062FPyramids^000000.";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
@@ -191,7 +191,7 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 					break;
 				case 2:
 					mes "[Morroc Guide]";
-					mes "The ^0000FFSphinx Dungeon^000000";
+					mes "The "+F_Navi("Sphinx Dungeon","moc_ruins,71,19","^0000FF");
 					mes "is outside the south entrance of this Oasis.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,71,19,1,0x0A82FF;
@@ -199,7 +199,7 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 					break;
 				case 3:
 					mes "[Morroc Guide]";
-					mes "^FF5400Morroc^000000 is";
+					mes F_Navi("Morroc","moc_ruins,158,40","^FF5400")+" is";
 					mes "right outside the southeast entrance of this Oasis.";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
@@ -218,39 +218,44 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 			while (.@loop) {
 				switch(select("[ Eden Teleport Officer ]:[ Tool Dealer ]:[ Kafra Employee ]:[ Repairman ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Leablem ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^006400Eden Teleport Officer";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","moc_ruins,68,164","^006400");
 					viewpoint 1,68,164,3,0xAAFF00;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^800080Tool Dealers";
+					mes "[Morroc Guide]";
+					mes "Let me mark the location of the";
+					mes F_Navi("Northern Tool Dealer","moc_ruins,92,128","^800080");
+					mes "and "+F_Navi("Southern Tool Dealer","moc_ruins,114,63","^800080");
+					mes "on your mini-map.";
+					mes "Would you like to check any other locations?";
 					viewpoint 1,92,128,5,0xDA70D6;
 					viewpoint 1,114,63,6,0xDA70D6;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^B9062FKafra Employee";
+					callsub L_Mark, "^B9062FKafra Employee^000000";
 					viewpoint 1,59,157,7,0xFF0000;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^0000FFRepairman";
+					callsub L_Mark, F_Navi("Repairman","moc_ruins,107,94","^0000FF");
 					viewpoint 1,107,94,8,0x0A82FF;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^FF5400Pet Groomer";
+					callsub L_Mark, F_Navi("Pet Groomer","moc_ruins,118,170","^FF5400");
 					viewpoint 1,118,170,9,0xFFB400;
 					next;
 					break;
 				case 6:
-					callsub L_Mark,"^006400Chef Assistant";
+					callsub L_Mark, F_Navi("Chef Assistant","moc_ruins,115,123","^006400");
 					viewpoint 1,115,123,10,0xAAFF00;
 					next;
 					break;
 				case 7:
 					mes "[Morroc Guide]";
-					mes "^7F3300Leablem^000000";
+					mes F_Navi("Leablem","moc_ruins,154,86","^7F3300");
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "but not all equipment";
@@ -295,11 +300,10 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 L_Mark:
 	mes "[Morroc Guide]";
 	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
+	mes getarg(0);
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	return;
 }
-
-moc_ruins,70,164,3	duplicate(GuideMocRuins)	Guide#02ruins	707
-moc_ruins,65,44,5	duplicate(GuideMocRuins)	Guide#03ruins	707
+moc_ruins,70,164,3	duplicate(GuideMocRuins)	Guide#02ruins	4_M_MOC_SOLDIER
+moc_ruins,65,44,5	duplicate(GuideMocRuins)	Guide#03ruins	4_M_MOC_SOLDIER
diff --git a/npc/re/guides/guides_moscovia.txt b/npc/re/guides/guides_moscovia.txt
index 6627021f3..05664c06a 100644
--- a/npc/re/guides/guides_moscovia.txt
+++ b/npc/re/guides/guides_moscovia.txt
@@ -1,77 +1,85 @@
 //===== Hercules Script ======================================
 //= Moscovia Guide
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guide for the city of Moscovia.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized (a little bit). [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-moscovia,226,191,4	script	Moscovia Guide#02mosc	959,{
+moscovia,161,76,3	script	Moscovia Guide#01mosc	4_F_RUSWOMAN1,{
 	mes "[Moscovia Guide]";
-	mes "A paradise on the sea";
-	mes "beautiful wave and warm sunshine";
-	mes "^8B4513Moscovia^000000 is waitting for you";
-	mes "welcome to come here.";
+	mes "A paradise on the sea,";
+	mes "beautiful waves and warm sunshine.";
+	mes "^8B4513Moscovia^000000 is waiting for you.";
 	mes "I'm supporting to offer information about here.";
-	mes "if you want to ask anything just feel free tell me.";
+	mes "If you want to ask anything just feel free tell me.";
+	F_Navi("[Moscovia Guide]");
 	set .@str$,"Is there anything else I can do for you?";
 	while (1) {
 		next;
-		switch(select("[ Palace ]:[ Chapel ]:[ Weapon Shop ]:[ Armor Shop ]:[ Tool Shop ]:[ Inn ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
+		switch(select("[ Kafra Employee ]:[ Palace ]:[ Chapel ]:[ Weapon Shop ]:[ Armor Shop ]:[ Tool Shop ]:[ Inn ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 			mes "[Moscovia Guide]";
-			mes "In the ^006400Palace^000000 you will find our Lord the Czar and other servants.";
-			mes .@str$;
-			viewpoint 1,255,140,0,0x0A82FF;
+			mes "The ^0000FFKafra Employee^000000 has";
+			mes "been marked on your mini-map";
+			mes "Check your mini-map.";
+			mes "Do you need anything else?";
+			viewpoint 1,223,191,0,0x0A82FF;
 			break;
 		case 2:
 			mes "[Moscovia Guide]";
-			mes "The ^008080Chapel^000000 is located here.";
+			mes "In the "+F_Navi("Palace","moscovia,255,140","^006400")+" you will find our Lord the Czar and other servants.";
 			mes .@str$;
-			viewpoint 1,253,179,1,0xAAFF00;
+			viewpoint 1,255,140,1,0x0A82FF;
 			break;
 		case 3:
 			mes "[Moscovia Guide]";
-			mes "You can buy weapons from the best craftsmen in Moscovia if you go to ^FF1493Weapon Shop^000000.";
+			mes "The "+F_Navi("Chapel","moscovia,253,179","^008080")+" is located here.";
 			mes .@str$;
-			viewpoint 1,186,191,2,0x008080;
+			viewpoint 1,253,179,2,0xAAFF00;
 			break;
 		case 4:
 			mes "[Moscovia Guide]";
-			mes "You will find only the best gear at the Moscovia ^8B4513Armor Shop^000000.";
+			mes "You can buy weapons from the best craftsmen in Moscovia if you go to the "+F_Navi("Weapon Shop","moscovia,186,191","^FF1493")+".";
 			mes .@str$;
-			viewpoint 1,204,169,3,0xB200FF;
+			viewpoint 1,186,191,3,0x008080;
 			break;
 		case 5:
 			mes "[Moscovia Guide]";
-			mes "The ^FF1493Tool Shop^000000 is located just south from the center of town.";
-			mes "You can find all sorts of things you need for your travels.";
+			mes "You will find only the best gear at the Moscovia "+F_Navi("Armor Shop","moscovia,204,169","^8B4513")+".";
 			mes .@str$;
-			viewpoint 1,221,176,4,0xFF1493;
+			viewpoint 1,204,169,4,0xB200FF;
 			break;
 		case 6:
 			mes "[Moscovia Guide]";
-			mes "The Inn 'Sticky Herb Tree' is just north from the center of town.";
-			mes "If you need to rest, there is no better place to stay.";
+			mes "The "+F_Navi("Tool Shop","moscovia,221,176","^FF1493")+" is located just south from the center of town.";
+			mes "You can find all sorts of things you need for your travels.";
 			mes .@str$;
-			viewpoint 1,227,206,5,0x8B4513;
+			viewpoint 1,221,176,5,0xFF1493;
 			break;
 		case 7:
 			mes "[Moscovia Guide]";
-			mes "You can go back to Alberta at the docks.";
+			mes "The Inn "+F_Navi("Sticky Herb Tree","moscovia,227,206")+" is just north from the center of town.";
+			mes "If you need to rest, there is no better place to stay.";
 			mes .@str$;
-			viewpoint 1,166,53,6,0x00BFFF;
+			viewpoint 1,227,206,6,0x8B4513;
 			break;
 		case 8:
 			mes "[Moscovia Guide]";
+			mes "You can find the";
+			mes F_Navi("Moscovia P.R. Officer","moscovia,166,53")+" at the docks if";
+			mes "you want to return to Alberta.";
+			viewpoint 1,166,53,7,0x00BFFF;
+			break;
+		case 9:
+			mes "[Moscovia Guide]";
 			mes "I'll remove all marks from your mini-map.";
 			mes .@str$;
 			viewpoint 2,1,1,0,0xFFFFFF;
@@ -81,11 +89,13 @@ moscovia,226,191,4	script	Moscovia Guide#02mosc	959,{
 			viewpoint 2,1,1,4,0xFFFFFF;
 			viewpoint 2,1,1,5,0xFFFFFF;
 			viewpoint 2,1,1,6,0xFFFFFF;
+			viewpoint 2,1,1,7,0xFFFFFF;
 			break;
-		case 9:
+		case 10:
 			mes "[Moscovia Guide]";
 			mes "Enjoy your trip~!";
 			close;
 		}
 	}
 }
+moscovia,226,191,4	duplicate(Moscovia Guide#01mosc)	Moscovia Guide#02mosc	4_F_RUSWOMAN1
diff --git a/npc/re/guides/guides_niflheim.txt b/npc/re/guides/guides_niflheim.txt
index 32790bd44..141f14cfa 100644
--- a/npc/re/guides/guides_niflheim.txt
+++ b/npc/re/guides/guides_niflheim.txt
@@ -1,41 +1,45 @@
 //===== Hercules Script ======================================
 //= Niflheim Guide
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
-//= Guide for the city of Niflehim.
-//===== Additional Comments: ================================= 
+//= Guide for the city of Niflheim.
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-niflheim,201,187,3	script	Niflheim Guide#01nif	849,{
+niflheim,201,187,3	script	Niflheim Guide#01nif	4_M_DIEMAN,{
 	mes "[Niflheim Guide]";
 	mes "Welcome to.. ^8B4513Niflheim^000000...";
 	mes "the Realm of the Dead...";
 	mes "Do you need help navigating the realm...?";
+	if (F_Navi() == 0) {
+		next;
+		mes "[Niflheim Guide]";
+		mes "When you click on the.. ^B9062F[location name]^000000... you'll receive the most advanced ^B9062FNavigation^000000 services...!";
+	}
 	while (1) {
 		next;
 		switch(select("[ Tool Shop ]:[ Pub ]:[ Weapon Shop ]:[ Witch's Castle ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
-			callsub L_Mark,"^0000FFTool Shop";
+			callsub L_Mark, F_Navi("Tool Shop","niflheim,218,196","^0000FF");
 			viewpoint 1,218,196,0,0x0A82FF;
 			break;
 		case 2:
-			callsub L_Mark,"^006400Pub";
+			callsub L_Mark, F_Navi("Pub","niflheim,189,208","^006400");
 			viewpoint 1,189,208,1,0xAAFF00;
 			break;
 		case 3:
-			callsub L_Mark,"^800080Weapon Shop";
+			callsub L_Mark, F_Navi("Weapon Shop","niflheim,218,170","^800080");
 			viewpoint 1,218,170,2,0xDA70D6;
 			break;
 		case 4:
-			callsub L_Mark,"^FF1493Witch's Castle";
+			callsub L_Mark, F_Navi("Witch's Castle","niflheim,255,195","^FF1493");
 			viewpoint 1,255,195,3,0xFF1493;
 			break;
 		case 5:
diff --git a/npc/re/guides/guides_payon.txt b/npc/re/guides/guides_payon.txt
index e07ff5bfe..a165ad455 100644
--- a/npc/re/guides/guides_payon.txt
+++ b/npc/re/guides/guides_payon.txt
@@ -1,35 +1,35 @@
 //===== Hercules Script ======================================
 //= Payon Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Payon.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guides.
 //= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//= 1.2 Navigation system update. [Euphy]
+//============================================================
 
-payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
+payon,163,64,3	script	Guide#01payon::GuidePayon	4_M_PAY_SOLDIER,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
 	mes "Welcome to ^8B4513Payon^000000,";
 	mes "the Mountain Village.";
 	mes "Do you need help navigating the village?";
+	F_Navi("[Payon Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 			set .@loop,1;
 			while (.@loop) {
-				switch(select("[ Archer Village ]:[ Tool Shop]:[ Weapon & Armor Shop ]:[ Inn & Tavern ]:[ Central Palace ]:[ Palace Court ]:[ Royal Kitchen ]:Previous Menu")) {
+				switch(select("[ Archer Village ]:[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Inn & Tavern ]:[ Central Palace ]:[ Palace Court ]:[ Royal Kitchen ]:Previous Menu")) {
 				case 1:
 					mes "[Payon Guide]";
-					mes "^B9062FArcher Village^000000 is where";
+					mes F_Navi("Archer Village","payon,227,328","^B9062F")+" is where";
 					mes "the Archer Association resides.";
 					mes "Please use the far north gate to enter the village.";
 					mes "Would you like to check any other locations?";
@@ -37,32 +37,32 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^0000FFTool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","payon,144,85","^0000FF");
 					viewpoint 1,144,85,1,0x0A82FF;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^FF5400Weapon & Armor Shop";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","payon,139,159","^FF5400");
 					viewpoint 1,139,159,2,0xFFB400;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^006400Inn & Tavern";
+					callsub L_Mark, F_Navi("Inn & Tavern","payon,220,117","^006400");
 					viewpoint 1,220,117,3,0xAAFF00;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^7F3300Central Palace";
+					callsub L_Mark, F_Navi("Central Palace","payon,155,245","^7F3300");
 					viewpoint 1,155,245,4,0xD2691E;
 					next;
 					break;
 				case 6:
-					callsub L_Mark,"^800080Palace Court";
+					callsub L_Mark, F_Navi("Palace Court","payon,107,325","^800080");
 					viewpoint 1,107,325,5,0xDA70D6;
 					next;
 					break;
 				case 7:
-					callsub L_Mark,"^B9062FRoyal Kitchen";
+					callsub L_Mark, F_Navi("Royal Kitchen","payon,154,325","^B9062F");
 					viewpoint 1,154,325,6,0xFF0000;
 					next;
 					break;
@@ -75,36 +75,36 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 		case 2:
 			set .@loop,1;
 			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Shop ]:[ Repair / Armsmith ]:[ Kafra Employee]:[ Trap Specialist ]:[ Seiayblem ]:[ Leablem ]:[ Jade ]:[ Pet Groomer ]:[ Chef Assistant ]:Previous Menu")) {
+				switch(select("[ Eden Teleport Officer ]:[ Kafra Shop ]:[ Repair / Armsmith ]:[ Kafra Employee ]:[ Trap Specialist ]:[ Seiayblem ]:[ Leablem ]:[ Jade ]:[ Pet Groomer ]:[ Chef Assistant ]:Previous Menu")) {
 				case 1:
-					callsub L_Mark,"^0000FFEden Teleport Officer";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","payon,177,111","^0000FF");
 					viewpoint 1,177,111,7,0x0A82FF;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^FF5400Kafra Shop Girls";
+					callsub L_Mark, F_Navi("Kafra Shop Girls","payon,164,157","^FF5400");
 					viewpoint 1,164,157,8,0xFFB400;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^006400Repairman & Armsmith";
+					callsub L_Mark, F_Navi("Repairman & Armsmith","payon,144,170","^006400");
 					viewpoint 1,144,170,9,0xAAFF00;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^7F3300Kafra Employees";
+					callsub L_Mark, "^7F3300Kafra Employees^000000";
 					viewpoint 1,181,104,10,0xD2691E;
 					viewpoint 1,175,226,11,0xD2691E;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^800080Trap Specialist";
+					callsub L_Mark, F_Navi("Trap Specialist","payon,123,109","^800080");
 					viewpoint 1,123,109,12,0xDA70D6;
 					next;
 					break;
 				case 6:
 					mes "[Payon Guide]";
-					mes "^B9062FSeiyablem^000000";
+					mes F_Navi("Seiyablem","payon,140,151","^B9062F");
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "but not all equipment";
@@ -115,7 +115,7 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 					break;
 				case 7:
 					mes "[Payon Guide]";
-					mes "^0000FFLeablem^000000";
+					mes F_Navi("Leablem","payon,236,199","^0000FF");
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "but not all equipment";
@@ -126,7 +126,7 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 					break;
 				case 8:
 					mes "[Payon Guide]";
-					mes "^FF5400Jade^000000";
+					mes F_Navi("Jade","payon,173,238","^FF5400");
 					mes "can exchange different types of";
 					mes "^FF5400Gemstones^000000.";
 					mes "Would you like to check any other locations?";
@@ -134,12 +134,12 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 					next;
 					break;
 				case 9:
-					callsub L_Mark,"^006400Pet Groomer";
+					callsub L_Mark, F_Navi("Pet Groomer","payon,177,131","^006400");
 					viewpoint 1,177,131,16,0xAAFF00;
 					next;
 					break;
 				case 10:
-					callsub L_Mark,"^7F3300Chef Assistant";
+					callsub L_Mark, F_Navi("Chef Assistant","payon,206,119","^7F3300");
 					viewpoint 1,206,119,17,0xD2691E;
 					next;
 					break;
@@ -185,22 +185,23 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 L_Mark:
 	mes "[Payon Guide]";
 	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
+	mes getarg(0);
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	return;
 }
 
-payon,151,182,6	duplicate(GuidePayon)	Guide#02payon	708
-payon,221,85,6	duplicate(GuidePayon)	Guide#03payon	708
-payon,233,324,4	duplicate(GuidePayon)	Guide#04payon	708
+payon,151,182,6	duplicate(GuidePayon)	Guide#02payon	4_M_PAY_SOLDIER
+payon,221,85,6	duplicate(GuidePayon)	Guide#03payon	4_M_PAY_SOLDIER
+payon,233,324,4	duplicate(GuidePayon)	Guide#04payon	4_M_PAY_SOLDIER
 
-pay_arche,86,33,4	script	Guide#05payon	708,{
+pay_arche,86,33,4	script	Guide#05payon	4_M_PAY_SOLDIER,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
 	mes "Welcome to ^8B4513Archer Village^000000,";
 	mes "a subsidiary village of Payon.";
 	mes "Do you need help navigating the village?";
+	F_Navi("[Payon Guide]");
 	next;
 	set .@str$,"Would you like to check any other locations?";
 	while (1) {
@@ -208,7 +209,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 		case 1:
 			mes "[Payon Guide]";
 			mes "Let me mark the entrance of";
-			mes "the ^B9062FPayon Dungeon^000000";
+			mes "the "+F_Navi("Payon Dungeon","pay_arche,38,131","^B9062F");
 			mes "on your mini-map.";
 			mes .@str$;
 			viewpoint 1,38,131,0,0xFF0000;
@@ -216,7 +217,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 			break;
 		case 2:
 			mes "[Payon Guide]";
-			mes "The ^0000FFArcher Guild^000000";
+			mes "The "+F_Navi("Archer Guild","pay_arche,143,164","^0000FF");
 			mes "is where you can change";
 			mes "your job to Archer.";
 			mes .@str$;
@@ -226,7 +227,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 		case 3:
 			mes "[Payon Guide]";
 			mes "Let me mark the location of the";
-			mes "^FF5400Tool Shop^000000";
+			mes F_Navi("Tool Shop","pay_arche,72,156","^FF5400");
 			mes "on your mini-map.";
 			mes .@str$;
 			viewpoint 1,72,156,2,0xFFB400;
@@ -243,8 +244,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 		case 5:
 			mes "[Payon Guide]";
 			mes "Let me mark the location of the";
-			mes "^7F3300Bow Mercenary Manager^000000 and";
-			mes "^7F3300Mercenary Goods Merchant^000000";
+			mes F_Navi("Mercenary Guildsman","pay_arche,101,166","^7F3300");
 			mes "on your mini-map.";
 			mes .@str$;
 			viewpoint 1,101,166,4,0xD2691E;
@@ -253,7 +253,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 		case 6:
 			mes "[Payon Guide]";
 			mes "Let me mark the location of the";
-			mes "^800080Alchemist Guildsman^000000";
+			mes F_Navi("Alchemist Guildsman","pay_arche,126,113,","^800080");
 			mes "on your mini-map.";
 			mes .@str$;
 			viewpoint 1,127,113,5,0xDA70D6;
@@ -261,7 +261,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 			break;
 		case 7:
 			mes "[Payon Guide]";
-			mes "The ^0000FFEden Teleport Officer^000000";
+			mes "The "+F_Navi("Eden Teleport Officer","pay_arche,143,164","^0000FF");
 			mes "is currently staying inside";
 			mes "the Archer Guild building.";
 			mes .@str$;
diff --git a/npc/re/guides/guides_prontera.txt b/npc/re/guides/guides_prontera.txt
index f744a7a8c..c3ecea92f 100644
--- a/npc/re/guides/guides_prontera.txt
+++ b/npc/re/guides/guides_prontera.txt
@@ -1,26 +1,28 @@
 //===== Hercules Script ======================================
 //= Prontera Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
-//= Guides for the city of Prontera
-//===== Additional Comments: ================================= 
+//= Guides for the city of Prontera.
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guides.
-//============================================================ 
+//= 1.1 Navigation system update. [Euphy]
+//=     Optimized.
+//============================================================
 
-prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
+prontera,154,187,4	script	Guide#01prontera::GuideProntera	8W_SOLDIER,{
 	cutin "prt_soldier",2;
 	mes "[Prontera Guide]";
 	mes "Welcome to ^8B4513Prontera^000000,";
 	mes "the beautiful capital of the";
 	mes "Rune-Midgarts Kingdom.";
 	mes "Do you need help navigating the city?";
+	F_Navi("[Prontera Guide]");
 	next;
+	set .@str$,"Would you like to check any other locations?";
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
@@ -28,63 +30,53 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 			while (.@loop) {
 				switch(select("[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Forge ]:[ Sanctuary ]:[ Chivalry Office ]:[ Inn ]:[ Tavern ]:[ Library ]:[ Prontera Castle ]:[ Job Agency ]:[ City Hall ]:Previous Menu")) {
 				case 1:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^B9062FTool Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Tool Shop","prontera,134,221","^B9062F");
+					mes .@str$;
 					viewpoint 1,134,221,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^0000FFWeapon & Armor Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","prontera,175,220","^0000FF");
+					mes .@str$;
 					viewpoint 1,175,220,1,0x0A82FF;
 					next;
 					break;
 				case 3:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^FF5400Forge^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Forge","prontera,179,184","^FF5400");
+					mes .@str$;
 					viewpoint 1,179,184,2,0xFFB400;
 					next;
 					break;
 				case 4:
 					mes "[Prontera Guide]";
-					mes "The ^006400Prontera Sanctuary^000000 is";
+					mes "The "+F_Navi("Prontera Sanctuary","prontera,236,316","^006400")+" is";
 					mes "where you can change your job to Acolyte,";
 					mes "its located in the far northeast of Prontera.";
 					mes "Let me mark the location on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,236,316,3,0xAAFF00;
 					next;
 					break;
 				case 5:
 					mes "[Prontera Guide]";
-					mes "The Chivalry Office is";
+					mes "The "+F_Navi("Chivalry Office","prontera,46,345")+" is";
 					mes "where you can change your job to ^7F3300Knight^000000";
 					mes "or apply for the ^7F3300Culvert^000000 Subjugation Party.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,46,345,4,0xD2691E;
 					next;
 					break;
 				case 6:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^800080Inn^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Inn","prontera,203,191","^800080");
+					mes .@str$;
 					viewpoint 1,204,191,5,0xDA70D6;
 					next;
 					break;
 				case 7:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^B9062FTaverns^000000";
-					mes "on your mini-map.";
-					mes "Only the ^B9062Fnorthern^000000 tavern";
+					callsub L_Mark, "^B9062FTaverns^000000";
+					mes "Only the "+F_Navi("northern","prontera,208,154","^B9062F")+" tavern";
 					mes "is open for now.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,208,154,6,0xFF0000;
 					viewpoint 1,46,67,7,0xFF0000;
 					next;
@@ -93,38 +85,36 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 					mes "[Prontera Guide]";
 					mes "The ^0000FFLibrary^000000 is";
 					mes "where you can find useful information, like the Monster Encyclopedia.";
-					mes "There are currently twi libaries available";
-					mes "in the northern area of Prontera.";
-					mes "Would you like to check any other locations?";
+					mes "There are currently two libaries available,";
+					mes "One to the "+F_Navi("northeast","prontera,120,264")+" and the other to the "+F_Navi("northwest","prontera,192,264")+".";
+					mes .@str$;
 					viewpoint 1,120,264,8,0x0A82FF;
 					viewpoint 1,192,264,9,0x0A82FF;
 					next;
 					break;
 				case 9:
 					mes "[Prontera Guide]";
-					mes "The ^FF5400Prontera Castle^000000 is north from here,";
+					mes "The "+F_Navi("Prontera Castle","prontera,156,360","^FF5400")+" is north from here,";
 					mes "and its rear gate is connected to";
 					mes "the northern Prontera Fields.";
 					mes "Let me mark the castle on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,156,360,10,0xFFB400;
 					next;
 					break;
 				case 10:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^006400Job Agency^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Job Agency","prontera,133,183","^006400");
+					mes .@str$;
 					viewpoint 1,133,183,11,0xAAFF00;
 					next;
 					break;
 				case 11:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of ^7F3300City Hall^000000";
+					mes "Let me mark the location of "+F_Navi("City Hall","prontera,75,91","^7F3300");
 					mes "on your mini-map.";
 					mes "There's a hairstylist";
 					mes "there that can change your hair color.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,75,91,12,0xD2691E;
 					next;
 					break;
@@ -137,72 +127,66 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 		case 2:
 			set .@loop,1;
 			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Peco Peco Breeder ]:[ Riding Creature Master ]:[ Magic Gear Master ]:[ Peco Peco Remover ]:[ Rune Salesman ]:[ Mercenary Guildsman ]:[ Hypnotist ]:[ Kafra Employee ]:[ Leablem ]:[ Apprentice Craftsman ]:Previous Menu")) {
+				switch(select("[ Eden Teleport Officer ]:[ Peco Peco Breeder ]:[ Riding Creature Master ]:[ Magic Gear Master ]:[ Peco Peco Remover ]:[ Trading Merchants ]:[ Mercenary Guildsman ]:[ Hypnotist ]:[ Kafra Employee ]:[ Leablem ]:[ Apprentice Craftsman ]:[ Pet Groomer ]:Previous Menu")) {
 				case 1:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the";
-					mes "^800080Eden Teleport Officer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","prontera,124,76","^800080"),1;
+					mes .@str$;
 					viewpoint 1,124,76,13,0xDA70D6;
 					next;
 					break;
 				case 2:
 					mes "[Prontera Guide]";
 					mes "Two ^0000FFPeco Peco Breeders^000000 are available,";
-					mes "one for ^0000FFKnights^000000 to the ^0000FFnorthwest^000000";
-					mes "and the other for ^0000FFCrusaders^000000 to the ^0000FFnortheast^000000.";
-					viewpoint 1,55,350,15,0x0A82FF;
-					viewpoint 1,232,310,16,0x0A82FF;
+					mes "one for ^0000FFKnights^000000 to the "+F_Navi("northwest","prontera,55,350","^0000FF");
+					mes "and the other for ^0000FFCrusaders^000000 to the "+F_Navi("northeast","prontera,232,310","^0000FF")+".";
+					viewpoint 1,55,350,14,0x0A82FF;
+					viewpoint 1,232,310,15,0x0A82FF;
 					next;
 					break;
 				case 3:
 					mes "[Prontera Guide]";
-					mes "The ^FF5400Riding Creature Master^000000 provides services for";
+					mes "The "+F_Navi("Riding Creature Master","prontera,131,213","^FF5400")+" provides services for";
 					mes "^FF5400Rune Knights^000000 and ^FF5400Royal Guards^000000.";
 					mes "Let me mark his location";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,131,213,17,0xFFB400;
+					mes .@str$;
+					viewpoint 1,131,213,16,0xFFB400;
 					next;
 					break;
 				case 4:
 					mes "[Prontera Guide]";
-					mes "The ^006400Magic Gear Master^000000";
+					mes "The "+F_Navi("Magic Gear Master","prontera,163,178","^006400");
 					mes "provides services for";
 					mes "^006400Mechanics^000000.";
 					mes "Let me mark his location";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,163,178,18,0xAAFF00;
+					mes .@str$;
+					viewpoint 1,163,178,17,0xAAFF00;
 					next;
 					break;
 				case 5:
 					mes "[Prontera Guide]";
 					mes "If your beloved Peco Peco refuses";
 					mes "to leave you,";
-					mes "please talk to the ^7F3300Peco Peco Remover^000000";
+					mes "please talk to the "+F_Navi("Peco Peco Remover","prontera,125,208","^7F3300");
 					mes "near the central fountain.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,125,208,19,0xD2691E;
+					mes .@str$;
+					viewpoint 1,125,208,18,0xD2691E;
 					next;
 					break;
 				case 6:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of";
-					mes "the ^800080Rune Salesman^000000";
+					mes "The Rune Merchant, Amatsu Trader, and other";
+					mes F_Navi("Trading Merchants","prontera,178,244","^800080")+" have been marked";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,168,228,20,0xDA70D6;
+					mes .@str$;
+					viewpoint 1,178,244,19,0xDA70D6;
 					next;
 					break;
 				case 7:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of ^0000FFSpear Mercenary Manager^000000 and";
-					mes "^0000FFMercenary Goods Merchant^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,35,337,21,0x0A82FF;
+					callsub L_Mark, F_Navi("Mercenary Guildsman","prontera,35,337","^0000FF"),1;
+					mes .@str$;
+					viewpoint 1,35,337,20,0x0A82FF;
 					next;
 					break;
 				case 8:
@@ -210,46 +194,46 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 					mes "The ^FF5400Hypnotist^000000";
 					mes "helps beginner adventurers";
 					mes "to reset their skills.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
+					mes "He has moved to Izlude, Prontera's satellite town to the southeast.";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,146,232,22,0xFFB400;
+					mes .@str$;
+					//viewpoint 1,146,232,21,0xFFB400;
 					next;
 					break;
 				case 9:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the";
-					mes "^006400Kafra Employees^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,152,326,23,0xAAFF00;
-					viewpoint 1,30,207,24,0xAAFF00;
-					viewpoint 1,282,200,25,0xAAFF00;
-					viewpoint 1,151,29,26,0xAAFF00;
-					viewpoint 1,146,89,27,0xAAFF00;
+					callsub L_Mark, "^006400Kafra Employees^000000",1;
+					mes .@str$;
+					viewpoint 1,152,326,22,0xAAFF00;
+					viewpoint 1,30,207,23,0xAAFF00;
+					viewpoint 1,282,200,24,0xAAFF00;
+					viewpoint 1,151,29,25,0xAAFF00;
+					viewpoint 1,146,89,26,0xAAFF00;
 					next;
 					break;
 				case 10:
 					mes "[Prontera Guide]";
-					mes "^0000FFLeablem^000000";
+					mes F_Navi("Leablem","prontera,244,169","^0000FF");
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "As amazing as it sounds,";
 					mes "not all equipment can be slotted.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,244,169,28,0x0A82FF;
+					mes .@str$;
+					viewpoint 1,244,169,27,0x0A82FF;
 					next;
 					break;
 				case 11:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the";
-					mes "^800080Apprentice Craftsman^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,165,60,29,0xDA70D6;
+					callsub L_Mark, F_Navi("Apprentice Craftsman","prontera,165,60","^800080"),1;
+					mes .@str$;
+					viewpoint 1,165,60,28,0xDA70D6;
 					next;
 					break;
 				case 12:
+					callsub L_Mark, F_Navi("Pet Groomer","prontera,218,211"),1;
+					mes .@str$;
+					viewpoint 1,218,211,29,0xFF0000;
+					next;
+					break;
+				case 13:
 					set .@loop,0;
 					break;
 				}
@@ -280,7 +264,7 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 			viewpoint 2,1,1,18,0xFFFF00;
 			viewpoint 2,1,1,19,0xFFFF00;
 			viewpoint 2,1,1,20,0xFFFF00;
-			viewpoint 2,1,1,21,0xFFFF00;
+			//viewpoint 2,1,1,21,0xFFFF00;
 			viewpoint 2,1,1,22,0xFFFF00;
 			viewpoint 2,1,1,23,0xFFFF00;
 			viewpoint 2,1,1,24,0xFFFF00;
@@ -299,9 +283,18 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 			end;
 		}
 	}
+	end;
+L_Mark:
+	mes "[Prontera Guide]";
+	if (getarg(1,0)) {
+		mes "Let me mark the location of the";
+		mes getarg(0);
+	} else
+		mes "Let me mark the location of the "+getarg(0);
+	mes "on your mini-map.";
+	return;
 }
-
-prontera,282,208,2	duplicate(GuideProntera)	Guide#02prontera	105
-prontera,29,200,6	duplicate(GuideProntera)	Guide#03prontera	105
-prontera,160,29,0	duplicate(GuideProntera)	Guide#04prontera	105
-prontera,151,330,4	duplicate(GuideProntera)	Guide#05prontera	105
+prontera,282,208,2	duplicate(GuideProntera)	Guide#02prontera	8W_SOLDIER
+prontera,29,200,6	duplicate(GuideProntera)	Guide#03prontera	8W_SOLDIER
+prontera,160,29,0	duplicate(GuideProntera)	Guide#04prontera	8W_SOLDIER
+prontera,151,330,4	duplicate(GuideProntera)	Guide#05prontera	8W_SOLDIER
diff --git a/npc/re/guides/guides_rachel.txt b/npc/re/guides/guides_rachel.txt
index e0aac2b8f..f7f1a2c87 100644
--- a/npc/re/guides/guides_rachel.txt
+++ b/npc/re/guides/guides_rachel.txt
@@ -1,22 +1,22 @@
 //===== Hercules Script ======================================
 //= Rachel Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
-//= Guide for the city of Rachel
-//===== Additional Comments: ================================= 
+//= Guide for the city of Rachel.
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
-//============================================================ 
+//= 1.1 Navigation system update. [Euphy]
+//============================================================
 
-rachel,138,146,5	script	Rachel Guide#rachel	934,{
+rachel,138,146,5	script	Rachel Guide#rachel	4_M_RASWORD,{
 	mes "[Rachel Guide]";
 	mes "Welcome to the capital of Arunafeltz, ^8B4513Rachel^000000 where the warm breath of the goddess Freya reaches.";
 	mes "If this is the first time for you to use the guide services, I suggest you ask many questions.";
+	F_Navi("[Rachel Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -26,35 +26,35 @@ rachel,138,146,5	script	Rachel Guide#rachel	934,{
 				switch(select("[ Inn ]:[ Weapon Shop ]:[ Tool Shop ]:[ Airport ]:[ Cheshrumnir ]:[ Priest Zed's Mansion ]:Previous Menu")) {
 				case 1:
 					mes "[Rachel Guide]";
-					mes "You can rest your fatigue of the journey in the Inn. The left building next to me is the Inn of Rachel.";
+					mes "You can rest your fatigue of the journey in the "+F_Navi("Inn","rachel,115,144")+". The left building next to me is the Inn of Rachel.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,115,144,0,0xFF0000;
 					next;
 					break;
 				case 2:
 					mes "[Rachel Guide]";
-					mes "Do you want to check out the weapons that are sold in Rachel? The Weapon Shop is located near the west gate.";
+					mes "Do you want to check out the weapons that are sold in Rachel? The "+F_Navi("Weapon Shop","rachel,42,82")+" is located near the west gate.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,42,82,1,0xFF4500;
 					next;
 					break;
 				case 3:
 					mes "[Rachel Guide]";
-					mes "Rachel's Tool Shop sells the best quality potions. It's located near the west gate.";
+					mes "Rachel's "+F_Navi("Tool Shop","rachel,83,73")+" sells the best quality potions. It's located near the west gate.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,83,73,2,0xDAA520;
 					next;
 					break;
 				case 4:
 					mes "[Rachel Guide]";
-					mes "The Airport is located outside of the east gate.";
+					mes "The "+F_Navi("Airport","rachel,272,125")+" is located outside of the east gate.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,272,125,3,0x008000;
 					next;
 					break;
 				case 5:
 					mes "[Rachel Guide]";
-					mes "Cheshrumnir is a holy ground where pope, the incarnation of goddess Freya stays.";
+					mes F_Navi("Cheshrumnir","rachel,150,243")+" is a holy ground where pope, the incarnation of goddess Freya stays.";
 					mes "Take the road to the north to find the building.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,150,243,4,0x0000FF;
@@ -63,7 +63,7 @@ rachel,138,146,5	script	Rachel Guide#rachel	934,{
 				case 6:
 					mes "[Rachel Guide]";
 					mes "I will mark the location";
-					mes "of the ^000080Priest Zed's Mansion^000000";
+					mes "of the "+F_Navi("Priest Zed's Mansion","rachel,98,238","^000080");
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,98,238,5,0x000080;
@@ -82,7 +82,7 @@ rachel,138,146,5	script	Rachel Guide#rachel	934,{
 				case 1:
 					mes "[Rachel Guide]";
 					mes "I will mark the location";
-					mes "of the ^803232Cool Event Corp. Staff^000000";
+					mes "of the "+F_Navi("Cool Event Corp. Staff","rachel,110,138","^803232");
 					mes "on your mini map.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,110,138,7,0x803232;
@@ -91,7 +91,7 @@ rachel,138,146,5	script	Rachel Guide#rachel	934,{
 				case 2:
 					mes "[Rachel Guide]";
 					mes "I will mark the location";
-					mes "of the ^556B2FEden Teleport Officer^000000";
+					mes "of the "+F_Navi("Eden Teleport Officer","rachel,125,144","^556B2F");
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,125,144,8,0x556B2F;
diff --git a/npc/re/guides/guides_umbala.txt b/npc/re/guides/guides_umbala.txt
index defb6e714..d2d3849ca 100644
--- a/npc/re/guides/guides_umbala.txt
+++ b/npc/re/guides/guides_umbala.txt
@@ -1,25 +1,27 @@
 //===== Hercules Script ======================================
 //= Umbala Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
-//= Guides for the city of Umbala
-//===== Additional Comments: ================================= 
+//= Guides for the city of Umbala.
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guides.
-//============================================================ 
+//= 1.1 Navigation system update. [Euphy]
+//============================================================
 
-umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
+umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	4_F_GON,{
+	mes "[Umbala Guide]";
 	mes "Welcome to ^8B4513Umbala^000000,";
 	mes "the Village of the Utan Tribe.";
 	next;
+	mes "[Umbala Guide]";
 	mes "Since I have been exploring here for several months.";
 	mes "I am familiar with this area's geography and the points of interest in this village.";
 	mes "Do you need help navigating the village?";
+	F_Navi("[Umbala Guide]");
 	while (1) {
 		next;
 		switch(select("[ Kafra Employee ]:[ Chief's House ]:[ Shaman's House ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bungee Jump Area ]:[ Tree of Yggdrasil ]:Remove Marks from Mini-Map:Cancel")) {
@@ -33,21 +35,21 @@ umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
 			break;
 		case 2:
 			mes "[Umbala Guide]";
-			mes "Only the ^006400Chief^000000 knows the language of the outside world.";
+			mes "Only the "+F_Navi("Chief","umbala,68,251","^006400")+" knows the language of the outside world.";
 			mes "So you'd better visit him before anything else.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,68,251,1,0xAAFF00;
 			break;
 		case 3:
 			mes "[Umbala Guide]";
-			mes "The ^008080Shaman^000000 has some sort of mystic power.";
+			mes "The "+F_Navi("Shaman","umbala,219,188","^008080")+" has some sort of mystic power.";
 			mes "People say she can create rough enchanted stones, and divide a pure enchanted stone into rough ones.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,219,188,2,0x008080;
 			break;
 		case 4:
 			mes "[Umbala Guide]";
-			mes "The ^FF1493Weapon Shop^000000 inside Umbala";
+			mes "The "+F_Navi("Weapon Shop","umbala,125,155","^FF1493")+" inside Umbala";
 			mes "supplies the weapons";
 			mes "for defending against their enemies.";
 			mes "Would you like to check any other locations?";
@@ -56,14 +58,14 @@ umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
 		case 5:
 			mes "[Umbala Guide]";
 			mes "There are many useful things for";
-			mes "traveling in the ^8B4513Tool Shop^000000 in Umbala.";
+			mes "traveling in the "+F_Navi("Tool Shop","umbala,136,127","^8B4513")+" in Umbala.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,136,127,4,0x8B4513;
 			break;
 		case 6:
 			mes "[Umbala Guide]";
 			mes "Umbala has a unique locale called";
-			mes "the 'Bungee Jump Area'.";
+			mes "the "+F_Navi("Bungee Jump Area","umbala,138,198")+".";
 			mes "If you're interested in testing";
 			mes "your courage, why don't you try it.";
 			mes "Would you like to check any other locations?";
@@ -71,7 +73,7 @@ umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
 			break;
 		case 7:
 			mes "[Umbala Guide]";
-			mes "There's the Tree of Yggdrasil in the northern part of town.";
+			mes "There's the "+F_Navi("Tree of Yggdrasil","umbala,107,284")+" in the northern part of town.";
 			mes "You should pay it a visit since that's a place I recommend when you visit Umbala.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,107,284,6,0xA52A2A;
@@ -95,5 +97,4 @@ umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
 		}
 	}
 }
-
-umbala,99,158,3	duplicate(GuideUmbala)	Umbala Guide#02umbala	702
+umbala,99,158,3	duplicate(GuideUmbala)	Umbala Guide#02umbala	4_F_GON
diff --git a/npc/re/guides/guides_veins.txt b/npc/re/guides/guides_veins.txt
index 745872235..8c136f623 100644
--- a/npc/re/guides/guides_veins.txt
+++ b/npc/re/guides/guides_veins.txt
@@ -1,28 +1,28 @@
 //===== Hercules Script ======================================
 //= Veins Guides
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Veins
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version, Renewal guides.
-//============================================================ 
+//= 1.1 Navigation system update. [Euphy]
+//============================================================
 
-veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
+veins,210,345,5	script	Veins Guide#veins01::GuideVeins	4_M_RASWORD,{
 	mes "[Veins Guide]";
 	mes "Thank you for coming through the rough sand storms. Welcome to ^8B4513Veins^000000, the Canyon Village.";
 	mes "If this is the first time for you to use the guide services, why don't you check the \"Notice\" menu first?";
+	F_Navi("[Veins Guide]");
 	next;
 	while (1) {
 		switch(select("[ Temple ]:[ Inn ]:[ Pub ]:[ Weapon Shop ]:[ Tool Shop ]:[ Airport ]:[ Geological Research Institute ]:[ Cool Event Corp. Staff ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 			mes "[Veins Guide]";
-			mes "The Temple is always filled with praying the faithful of the incarnation of goddess Freya.";
+			mes "The "+F_Navi("Temple","veins,197,256")+" is always filled with praying the faithful of the incarnation of goddess Freya.";
 			mes "It's located on the North side of Veins.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,197,256,0,0xFF0000;
@@ -30,14 +30,14 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 			break;
 		case 2:
 			mes "[Veins Guide]";
-			mes "You can rest your fatigue of the journey in the Inn. The Inn is located on the North-West side of Veins.";
+			mes "You can rest your fatigue of the journey in the "+F_Navi("Inn","veins,110,278")+". The Inn is located on the North-West side of Veins.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,110,278,1,0xFF4500;
 			next;
 			break;
 		case 3:
 			mes "[Veins Guide]";
-			mes "If you want to talk to the Veins Towners, visit the Veins Pub.";
+			mes "If you want to talk to the Veins Towners, visit the Veins "+F_Navi("Pub","veins,150,215")+".";
 			mes "The pub is located on the west side of Veins.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,150,215,2,0xDAA520;
@@ -46,7 +46,7 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 		case 4:
 			mes "[Veins Guide]";
 			mes "You have to be able to protect your own body.";
-			mes "The Weapon Shop in Veins is selling the good weapons at a reasonable price..";
+			mes "The "+F_Navi("Weapon Shop","veins,150,175")+" in Veins is selling the good weapons at a reasonable price..";
 			mes "It is located on the West side of Veins.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,150,175,3,0x008000;
@@ -54,14 +54,14 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 			break;
 		case 5:
 			mes "[Veins Guide]";
-			mes "The essential items! Check out the Veins Tool Shop in the center of town..";
+			mes "The essential items! Check out the Veins "+F_Navi("Tool Shop","veins,230,161")+" in the center of town..";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,230,161,4,0x0000FF;
 			next;
 			break;
 		case 6:
 			mes "[Veins Guide]";
-			mes "The Airport of Veins is currently only used for Cargo.";
+			mes "The "+F_Navi("Airport","veins,273,287")+" of Veins is currently only used for Cargo.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,273,287,5,0x000080;
 			next;
@@ -69,7 +69,8 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 		case 7:
 			mes "[Veins Guide]";
 			mes "Are you interested in Geology?";
-			mes "If so, please visit the Geological Research Institute at the second floor of Weapon Shop.";
+			mes "If so, please visit the ";
+			mes F_Navi("Geological Research Institute","veins,150,175")+" at the second floor of Weapon Shop.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,150,175,6,0x800080;
 			next;
@@ -77,7 +78,7 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 		case 8:
 			mes "[Veins Guide]";
 			mes "I will mark the location";
-			mes "of the ^808080Cool Event Corp. Staff^000000";
+			mes "of the "+F_Navi("Cool Event Corp. Staff","veins,209,127","^808080");
 			mes "on your mini map.";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,209,127,7,0x808080;
@@ -104,5 +105,4 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 		}
 	}
 }
-
-veins,189,101,5	duplicate(GuideVeins)	Veins Guide#veins02	934
+veins,189,101,5	duplicate(GuideVeins)	Veins Guide#veins02	4_M_RASWORD
diff --git a/npc/re/guides/navigation.txt b/npc/re/guides/navigation.txt
new file mode 100644
index 000000000..b7bde6aab
--- /dev/null
+++ b/npc/re/guides/navigation.txt
@@ -0,0 +1,39 @@
+//===== Hercules Script ======================================
+//= Navigation Functions
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Controls the navigation system for Renewal guides.
+//= Clients before 2011-10-10 do not support navigation
+//= links, so disable the system if this applies to you.
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+function	script	F_Navi	{
+
+	// Uncomment to disable the navigation system.
+	//set .@disabled,1;
+
+	// This function takes 0 ~ 3 parameters.
+	switch(getargcount()) {
+	case 0:	// Check if system is disabled.
+		return .@disabled;
+	case 1:	// Display information message, if enabled.
+		if (!.@disabled) {
+			next;
+			mes getarg(0);
+			mes "When you click on the ^B9062F[location name]^000000, you'll receive the most advanced ^B9062FNavigation^000000 services!";
+		}
+		return;
+	default:	// Display navigation link, if enabled; else set text color, if available.
+		if (!.@disabled)
+			return "<NAVI>[" + getarg(0) + "]<INFO>" + getarg(1) + ",0,000,0</INFO></NAVI>";
+		else if (getargcount() == 3)
+			return getarg(2)+getarg(0)+"^000000";
+		else
+			return getarg(0);
+	}
+}
diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt
index e8c2a011a..50a4e7d35 100644
--- a/npc/re/guild/invest_main.txt
+++ b/npc/re/guild/invest_main.txt
@@ -1,18 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Hall of Abyss - Core Scripts
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 1.1
 //===== Description: =========================================
+//= [Official Conversion]
 //= Expansion for War of Emperium FE.
 //= Invest in each realm to unlock new maps:
 //= - Guild Dungeon F2, total 20,000,000z.
 //= - Hall of Abyss, total 70,000,000z.
 //===== Additional Comments: =================================
 //= 1.0 First version. Missing official times. [Euphy]
+//= 1.1 Added GM management function. [Euphy]
 //============================================================
 
 // Global Variables
@@ -58,7 +58,7 @@ $@vfund_*_extra
 
 // Investment Functions & Controller
 //============================================================
-// Note: The time in this section are almost entirely custom.
+// Note: The times in this section are almost entirely custom.
 
 -	script	#invest_timer	-1,{
 OnClock0000:	// Open investments on Wed (1 hour after WoE)
@@ -163,7 +163,7 @@ function	script	F_Invest_Abyss	{
 		mes getarg(1);
 		mes "You've invested "+.@units+" unit"+((.@units == 1)?"":"s")+" "+((.@units < 100)?.@units:insertchar(""+.@units,",",1))+"0,000 Zeny"+getarg(2,"")+".";
 		mes "Not much but this is a small gift. You can exchange it with items in Malangdo.";
-		set Zeny, Zeny-.@zeny;
+		Zeny -= .@zeny;
 		setd getarg(0), getd(getarg(0)) + .@units;
 		getitem 6488,.@units; //Thanks_Invest_Ticket
 		close;
@@ -224,7 +224,7 @@ function	script	F_Invest_Abyss	{
 
 // Script Core
 //============================================================
-prt_gld,1,1,0	script	#fund_master	844,{
+prt_gld,1,1,0	script	#fund_master	CLEAR_NPC,{
 	end;
 OnInit:
 	set .@invest_status, callfunc("F_Invest_Status");
@@ -386,12 +386,11 @@ OnReset:
 	end;
 }
 
-prt_gld,2,2,0	script	Investment_total#fund00	844,{
-/*
+prt_gld,2,2,0	script	Investment_total#fund00	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "Is this not working properly?";
 	next;
-	input .@input;
-	if (.@input == 1854) {
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
 		mes "If you think the investment timer is dead, please adjust the timer.";
 		next;
 		switch(select("Turn on the timer:Cancel")) {
@@ -407,8 +406,7 @@ prt_gld,2,2,0	script	Investment_total#fund00	844,{
 		mes "I don't need to adjust anything now.";
 		close;
 	}
-*/
-	end;
+
 OnInit:
 	if (callfunc("F_Invest_Status") == 1) {
 		initnpctimer;
@@ -464,7 +462,7 @@ OnTimer3600000:
 	}
 }
 
-prt_gld,164,98,3	script	Revoting Manager#Invest1	421,{
+prt_gld,164,98,3	script	Revoting Manager#Invest1	4_M_BOSSCAT,{
 	mes "[Revoting Manager]";
 	mes "We are not accepting additional votes.";
 	mes "Please wait for our results announcement.";
@@ -554,7 +552,7 @@ OnTimer60000:
 	end;
 }
 
-prt_gld,164,98,3	script	Revoting Manager#Invest2	421,{
+prt_gld,164,98,3	script	Revoting Manager#Invest2	4_M_BOSSCAT,{
 	set .@invest, $2011_agit_invest;
 	if (.@invest < 11) {
 		mes "[Revoting Manager]";
@@ -668,7 +666,7 @@ OnTimer20000:
 }
 
 /*
-prtg_cas01,2,2,0	script	Abrai	55,{
+prtg_cas01,2,2,0	script	Abrai	1_M_JOBTESTER,{
 	mes "I should quit my steward job.";
 	close;
 OnAgitInvest:
@@ -992,7 +990,7 @@ OnAgitInvest:
 		}
 		mes .@n$;
 		mes "I'm sending you to the "+.@realm$+" Agit Dungeon "+.@i+"F.";
-		set Zeny, Zeny-10000;
+		Zeny -= 10000;
 		setd "$fund_"+.@npc$+"_extra", getd("$fund_"+.@npc$+"_extra") + 1;
 		close2;
 		if (compare(strnpcinfo(2),"alde"))
@@ -1147,7 +1145,7 @@ OnAgitInvest:
 		callfunc "F_Invest_Abyss","$fund_"+.@npc$+"0"+.@id,"[Gate Manager]";
 		end;
 	case 2:
-		callsub L_Enter,1,.@realm$;
+		callsub L_Enter,1,.@realm$,.@npc$;
 		mes "[Gate Manager]";
 		mes "You are interested in exploring the "+.@realm$+" Guild Dungeon Deepest Layer (2F).";
 		mes "Let me guide you. Good luck.";
@@ -1187,7 +1185,7 @@ OnAgitInvest:
 		}
 		end;
 	case 3:
-		callsub L_Enter,2,.@realm$;
+		callsub L_Enter,2,.@realm$,.@npc$;
 		mes "[Gate Manager]";
 		mes "Let me guide you to the Abyss Gap connected with "+.@realm$+", the Abyss Gate 'Way of the Warrior'.";
 		close2;
@@ -1235,7 +1233,7 @@ OnAgitInvest:
 L_Enter:
 	set .@invest_status, callfunc("F_Invest_Status");
 	if (.@invest_status == 3) {
-		set .@status, getd("$"+.@npc$+"_invest_result");
+		set .@status, getd("$"+getarg(2)+"_invest_result");
 		if ((getarg(0) == 1 && .@status == 2) || .@status == 3)
 			return;
 		else {
@@ -1261,7 +1259,7 @@ L_Enter:
 
 // Item Investments
 //============================================================
-malangdo,218,126,4	script	Cat Paw Merchants Notice	857,{
+malangdo,218,126,4	script	Cat Paw Merchants Notice	4_BOARD3,{
 	mes "<< Cat Paw Merchants Notice >>";
 	mes "'^C379CEInvest Unused Items for Prizes!^000000'";
 	next;
@@ -1327,7 +1325,7 @@ malangdo,218,126,4	script	Cat Paw Merchants Notice	857,{
 	}
 }
 
-malangdo,218,123,1	script	Namis#invest	545,4,4,{
+malangdo,218,123,1	script	Namis#invest	4_CAT_SAILOR2,4,4,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -1467,7 +1465,7 @@ OnTouch:
 
 // Investment Rewards
 //============================================================
-malangdo,215,119,4	script	Thanks Ticket Machine	564,{
+malangdo,215,119,4	script	Thanks Ticket Machine	2_VENDING_MACHINE1,{
 	if (MaxWeight - Weight < 4500 || checkweight(1201,1) == 0) {
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
diff --git a/npc/re/guild/invest_npc.txt b/npc/re/guild/invest_npc.txt
index 3c6c45ee5..a1d564e00 100644
--- a/npc/re/guild/invest_npc.txt
+++ b/npc/re/guild/invest_npc.txt
@@ -1,12 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Hall of Abyss - NPC Duplicates
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
+//= [Official Conversion]
 //= Expansion for War of Emperium FE.
 //= Invest in each realm to unlock new maps:
 //= - Guild Dungeon F2, total 20,000,000z.
@@ -17,50 +16,50 @@
 
 // Realms - Merchant Guilds, Gate Managers, Status Boards
 //============================================================
-alde_gld,186,157,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Megrez	549
-alde_gld,191,164,3	duplicate(Gate Manager#realm)	Gate Manager#alde_f00	421
-alde_gld,188,158,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Alde	857
+alde_gld,186,157,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Megrez	4_CAT_MERMASTER
+alde_gld,191,164,3	duplicate(Gate Manager#realm)	Gate Manager#alde_f00	4_M_BOSSCAT
+alde_gld,188,158,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Alde	4_BOARD3
 
-gef_fild13,187,208,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Meraq	549
-gef_fild13,189,206,3	duplicate(Gate Manager#realm)	Gate Manager#gef_f00	421
-gef_fild13,190,209,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Gef	857
+gef_fild13,187,208,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Meraq	4_CAT_MERMASTER
+gef_fild13,189,206,3	duplicate(Gate Manager#realm)	Gate Manager#gef_f00	4_M_BOSSCAT
+gef_fild13,190,209,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Gef	4_BOARD3
 
-pay_gld,203,189,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Phecda	549
-pay_gld,206,189,3	duplicate(Gate Manager#realm)	Gate Manager#pay_f00	421
-pay_gld,200,189,5	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Pay	857
+pay_gld,203,189,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Phecda	4_CAT_MERMASTER
+pay_gld,206,189,3	duplicate(Gate Manager#realm)	Gate Manager#pay_f00	4_M_BOSSCAT
+pay_gld,200,189,5	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Pay	4_BOARD3
 
-prt_gld,158,96,5	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Dubae	549
-prt_gld,161,96,3	duplicate(Gate Manager#realm)	Gate Manager#prt_f00	421
-prt_gld,163,99,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Prt	857
+prt_gld,158,96,5	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Dubae	4_CAT_MERMASTER
+prt_gld,161,96,3	duplicate(Gate Manager#realm)	Gate Manager#prt_f00	4_M_BOSSCAT
+prt_gld,163,99,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Prt	4_BOARD3
 
 // Inside Castles - Gate Managers
 //============================================================
-aldeg_cas01,85,105,4	duplicate(Gate Manager#castle)	Gate Manager#alde_f01	421
-aldeg_cas02,124,49,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f02	421
-aldeg_cas03,121,75,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f03	421
-aldeg_cas04,25,67,7	duplicate(Gate Manager#castle)	Gate Manager#alde_f04	421
-aldeg_cas05,54,200,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f05	421
+aldeg_cas01,85,105,4	duplicate(Gate Manager#castle)	Gate Manager#alde_f01	4_M_BOSSCAT
+aldeg_cas02,124,49,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f02	4_M_BOSSCAT
+aldeg_cas03,121,75,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f03	4_M_BOSSCAT
+aldeg_cas04,25,67,7	duplicate(Gate Manager#castle)	Gate Manager#alde_f04	4_M_BOSSCAT
+aldeg_cas05,54,200,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f05	4_M_BOSSCAT
 
-gefg_cas01,39,49,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f01	421
-gefg_cas02,10,65,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f02	421
-gefg_cas03,100,87,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f03	421
-gefg_cas04,35,44,3	duplicate(Gate Manager#castle)	Gate Manager#gef_f04	421
-gefg_cas05,84,46,3	duplicate(Gate Manager#castle)	Gate Manager#gef_f05	421
+gefg_cas01,39,49,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f01	4_M_BOSSCAT
+gefg_cas02,10,65,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f02	4_M_BOSSCAT
+gefg_cas03,100,87,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f03	4_M_BOSSCAT
+gefg_cas04,35,44,3	duplicate(Gate Manager#castle)	Gate Manager#gef_f04	4_M_BOSSCAT
+gefg_cas05,84,46,3	duplicate(Gate Manager#castle)	Gate Manager#gef_f05	4_M_BOSSCAT
 
-payg_cas01,129,59,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f01	421
-payg_cas02,27,277,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f02	421
-payg_cas03,51,266,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f03	421
-payg_cas04,39,264,4	duplicate(Gate Manager#castle)	Gate Manager#pay_f04	421
-payg_cas05,272,252,4	duplicate(Gate Manager#castle)	Gate Manager#pay_f05	421
+payg_cas01,129,59,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f01	4_M_BOSSCAT
+payg_cas02,27,277,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f02	4_M_BOSSCAT
+payg_cas03,51,266,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f03	4_M_BOSSCAT
+payg_cas04,39,264,4	duplicate(Gate Manager#castle)	Gate Manager#pay_f04	4_M_BOSSCAT
+payg_cas05,272,252,4	duplicate(Gate Manager#castle)	Gate Manager#pay_f05	4_M_BOSSCAT
 
-prtg_cas01,114,178,3	duplicate(Gate Manager#castle)	Gate Manager#prt_f01	421
-prtg_cas02,89,63,5	duplicate(Gate Manager#castle)	Gate Manager#prt_f02	421
-prtg_cas03,72,109,3	duplicate(Gate Manager#castle)	Gate Manager#prt_f03	421
-prtg_cas04,29,263,4	duplicate(Gate Manager#castle)	Gate Manager#prt_f04	421
-prtg_cas05,24,23,4	duplicate(Gate Manager#castle)	Gate Manager#prt_f05	421
+prtg_cas01,114,178,3	duplicate(Gate Manager#castle)	Gate Manager#prt_f01	4_M_BOSSCAT
+prtg_cas02,89,63,5	duplicate(Gate Manager#castle)	Gate Manager#prt_f02	4_M_BOSSCAT
+prtg_cas03,72,109,3	duplicate(Gate Manager#castle)	Gate Manager#prt_f03	4_M_BOSSCAT
+prtg_cas04,29,263,4	duplicate(Gate Manager#castle)	Gate Manager#prt_f04	4_M_BOSSCAT
+prtg_cas05,24,23,4	duplicate(Gate Manager#castle)	Gate Manager#prt_f05	4_M_BOSSCAT
 
 // iRO NPC Locations
 //============================================================
-//prt_gld,148,253,4	duplicate(Cat Paw Merchants Notice)	Cat Paw Merchants Notice::CatPawNotice_iRO	857
-//prt_gld,145,255,6	duplicate(Namis#invest)	Namis::Namis_iRO	545,4,4
-//prt_gld,165,50,4	duplicate(Thanks Ticket Machine)	Thanks Ticket Machine::ThanksMachine_iRO	564
+//prt_gld,148,253,4	duplicate(Cat Paw Merchants Notice)	Cat Paw Merchants Notice::CatPawNotice_iRO	4_BOARD3
+//prt_gld,145,255,6	duplicate(Namis#invest)	Namis::Namis_iRO	4_CAT_SAILOR2,4,4
+//prt_gld,165,50,4	duplicate(Thanks Ticket Machine)	Thanks Ticket Machine::ThanksMachine_iRO	2_VENDING_MACHINE1
diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt
new file mode 100644
index 000000000..89ce64ac4
--- /dev/null
+++ b/npc/re/instances/BakonawaLake.txt
@@ -0,0 +1,543 @@
+//===== Hercules Script ======================================
+//= Bakonawa Lake
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Defeat Bakonawa before he eats the moon.
+//= Part of the "Bakonawa Extermination" quest.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//= 1.1 Added GM management NPC. [Euphy]
+//============================================================
+
+1@ma_b	mapflag	src4instance
+//============================================================
+ma_scene01,174,179,4	script	Taho	4_M_DEWZATIMAN,{
+	disable_items;
+	if (checkweight(1201,1) == 0) {
+		mes "You are carrying too many items. Come back after taking off some of them.";
+		close;
+	}
+	if (MaxWeight - Weight < 10000) {
+		mes "You are carrying too much weight. Come back after reducing the weight.";
+		close;
+	}
+	if (BaseLevel < 140) {
+		mes "[Taho]";
+		mes "Hey. This is too dangerous a place for you. You cannot keep yourself safe. Get out of here and go to the village right now!";
+		close;
+	}
+	if (malaya_bakona1 < 7 && malaya_bakona2 < 15) {
+		mes "[Taho]";
+		mes "We are gonna be killed all by that Bakonawa. Ah, we must slay him but unfortunately we are not prepared.";
+		close;
+	}
+
+	set .@party_id,getcharid(1);
+	set .@md_name$, "Bakonawa Lake";
+
+	set .@baku_time, checkquest(12278,PLAYTIME);
+	if (.@baku_time == -1) {
+		if (checkquest(12279) == -1) setquest 12279;
+	}
+	if (!.@party_id) {
+		mes "[Taho]";
+		mes "Isn't there any company who can go with you? Or even if you wanna go alone, come after organizing a party.";
+		close;
+	}
+	if (.@baku_time == -1) {
+		if (getcharid(0) == getpartyleader(.@party_id,2)) {
+			mes "[Taho]";
+			mes "Are you the leader of the Bakonawa slayers? The road is not well so we have to go down the cliff with a rope, is that OK?";
+			next;
+			set .@i, select("Please weave a rope.:Now I will go down.:Cancel.");
+		} else {
+			mes "[Taho]";
+			mes "You came for slaying Bakonawa. The leader of your party has to help me weaving the rope for going down.";
+			next;
+			set .@i, select(":Now I will go down.:Cancel.");
+		}
+		switch(.@i) {
+		case 1:
+			set .@instance,instance_create(.@md_name$,.@party_id);
+			if (.@instance < 0) {
+				mes "[Taho]";
+				mes "Oh, the rope got dropped. I have to make a new one.";
+				close;
+			}
+			if (instance_attachmap("1@ma_b",.@instance) == "") {
+				mes "^0000ff"+.@md_name$+"^000000 - Reservation Failed!";
+				instance_destroy(.@instance);
+				close;
+			}
+			instance_set_timeout 7200,300,.@instance;
+			instance_init(.@instance);
+			mes "[Taho]";
+			mes "Now I'm weaving, so you can go down when I'm done.";
+			close;
+		case 2:
+			if( has_instance("1@ma_b") == "" ) {
+				mes "The memorial dungeon "+.@md_name$+" does not exist.";
+				mes "The party leader did not generate the dungeon yet.";
+				close;
+			} else {
+				mapannounce "ma_scene01","A party memeber, "+strcharinfo(0)+" of the party "+getpartyname(.@party_id)+" is entering the dungeon, "+.@md_name$+".",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+				setquest 12278;
+				warp "1@ma_b",64,51;
+				end;
+			}
+		case 3:
+			close;
+		}
+	} else if (.@baku_time == 0 || .@baku_time == 1) {
+		mes "[Taho]";
+		mes "The rope used for getting to the Lake is already broken. We are now cleaning up the surroundings so come back after some time.";
+		close;
+	} else if (.@baku_time == 2) {
+		mes "[Taho]";
+		mes "It's all cleaned up around here. Now you can go down again after getting a rope.";
+		erasequest 12278;
+		close;
+	}
+}
+
+sec_in02,26,26,4	script	Bakonawa's Rage	4_M_DEWZATIMAN,{
+	callfunc "F_GM_NPC";
+	mes "[Taho]";
+	mes "My name is Minky.";
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
+		erasequest 12278;
+		erasequest 12279;
+		set malaya_bakona1,7;
+		set malaya_bakona2,15;
+	}
+	close;
+}
+
+1@ma_b,62,52,4	script	Taho#nf	4_M_DEWZATIMAN,{
+	mes "[Taho]";
+	mes "Heehee, I could join the Bakonawa hunt, but I'd rather hide behind that rock and cheer you guys on.";
+	next;
+	mes "[Taho]";
+	mes "Bakonawa becomes invincible at some point. When that time comes, listen to my guides carefully. Just trust me and all will be good.";
+	next;
+	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+		mes "[Taho]";
+		mes "Now I will make Bakonawa spring out from the lake.";
+		next;
+		switch(select("Hold on! I'm not ready yet!:Let's do it!")) {
+		case 1:
+			mes "[Taho]";
+			mes "Oh... alright... tell me when you are ready.";
+			close;
+		case 2:
+			mes "[Taho]";
+			mes "Then I will drop a drop of Albopal to this lake.";
+			next;
+			mes "[Taho]";
+			mes "Once Bakonawa tastes this, he will surface...";
+			donpcevent instance_npcname("#Bakonawan1")+"::OnStart";
+			disablenpc instance_npcname("Taho#nf");
+			close;
+		}
+	} else {
+		mes "[Taho]";
+		mes "I am dropping the Alpopal to make Bakonawa mad. Bakonawa can be a good source of protein once we get him.";
+		close;
+	}
+}
+
+1@ma_b,36,111,4	script	#Bakonawan1	CLEAR_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Bakonawan1");
+	end;
+OnStart:
+	enablenpc instance_npcname("#Bakonawan1");
+	set .@map$, instance_mapname("1@ma_b");
+	mapannounce .@map$,"Taho: I can see him there on the surface! ATTACK!!!",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
+	monster .@map$,78,81,"Bakonawa",2320,1,instance_npcname("#Bakonawan1")+"::OnMyMobDead"; //original: (78,83)
+	initnpctimer;
+	end;
+OnFail:
+	killmonster instance_mapname("1@ma_b"),instance_npcname("#Bakonawan1")+"::OnMyMobDead";
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@ma_b");
+	if (mobcount(.@map$,instance_npcname("#Bakonawan1")+"::OnMyMobDead") < 1) {
+		donpcevent instance_npcname("#BakonawaDeadn1")+"::OnStart";
+		killmonster .@map$,instance_npcname("#Bakonawan1")+"::OnMyMobDead";
+		stopnpctimer;
+		disablenpc instance_npcname("#Bakonawan1");
+	}
+	end;
+OnTimer1000:	callsub OnAnnounce,"10 minutes";
+OnTimer60000:	callsub OnAnnounce,"9 minutes";
+OnTimer120000:	callsub OnAnnounce,"8 minutes";
+OnTimer180000:	callsub OnAnnounce,"7 minutes";
+OnTimer240000:	callsub OnAnnounce,"6 minutes";
+OnTimer300000:	callsub OnAnnounce,"5 minutes";
+OnTimer360000:	callsub OnAnnounce,"4 minutes";
+OnTimer420000:	callsub OnAnnounce,"3 minutes";
+OnTimer480000:	callsub OnAnnounce,"2 minutes";
+OnTimer540000:	callsub OnAnnounce,"1 minute";
+OnTimer570000:
+	mapannounce instance_mapname("1@ma_b"),"Time Limit: 30 seconds",bc_map,"0xff4400"; //FW_NORMAL 18 0 0
+	donpcevent instance_npcname("#SummonPuppetsn1")+"::OnStart";
+	end;
+OnTimer600000:
+	set .@map$, instance_mapname("1@ma_b");
+	mapannounce .@map$,"Bakonawa has escaped deep into the lake.",bc_map,"0xffff00"; //FW_NORMAL 20 0 0
+	donpcevent instance_npcname("Taho#Fail")+"::OnStart";
+	donpcevent instance_npcname("#Bakonawan1")+"::OnFail";
+	killmonster .@map$,instance_npcname("#Bakonawan1")+"::OnMyMobDead";
+	stopnpctimer;
+	disablenpc instance_npcname("#Bakonawan1");
+	end;
+OnAnnounce:
+	mapannounce instance_mapname("1@ma_b"),"Time Limit: "+getarg(0),bc_map,"0xff4400"; //FW_NORMAL 15 0 0
+	donpcevent instance_npcname("#SummonPuppetsn1")+"::OnStart";
+	end;
+}
+
+1@ma_b,78,81,0	script	#SummonPuppetsn1	HIDDEN_WARP_NPC,4,5,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#SummonPuppetsn1");
+	end;
+OnStart:
+	stopnpctimer;
+	enablenpc instance_npcname("#SummonPuppetsn1");
+	initnpctimer;
+	end;
+OnTouch:
+	stopnpctimer;
+	disablenpc instance_npcname("#SummonPuppetsn1");
+	end;
+OnTimer5000:
+	setarray .@x[0],79,71,60,61,57,89,95,96,99;
+	setarray .@y[0],71,72,80,90,99,73,82,90,99;
+	set .@map$, instance_mapname("1@ma_b");
+	for(set .@i,0; .@i<9; set .@i,.@i+1) {
+		set .@rand, rand(1,10);
+		if (.@rand > 7)
+			monster .@map$,.@x[.@i],.@y[.@i],"Bakonawa's Will",2337,1,instance_npcname("#SummonPuppetsn1")+"::OnMyMobDead";
+		else if (.@rand < 4)
+			monster .@map$,.@x[.@i],.@y[.@i],"Bakonawa's Will",2343,1,instance_npcname("#SummonPuppetsn1")+"::OnMyMobDead";
+	}
+	end;
+OnTimer50000:
+	killmonster instance_mapname("1@ma_b"),instance_npcname("#SummonPuppetsn1")+"::OnMyMobDead";
+	stopnpctimer;
+	disablenpc instance_npcname("#SummonPuppetsn1");
+	end;
+OnMyMobDead:
+	end;
+}
+
+1@ma_b,1,5,4	script	#BakonawaDeadn1	CLEAR_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#BakonawaDeadn1");
+	end;
+OnStart:
+	enablenpc instance_npcname("#BakonawaDeadn1");
+	initnpctimer;
+	end;
+OnTimer100:
+	mapannounce instance_mapname("1@ma_b"),"Taho: Good! Bakonawa is hidden under water. He will now try to swallow the moon.",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
+	end;
+OnTimer5000:
+	mapannounce instance_mapname("1@ma_b"),"Taho: We must make loud noises with caldron and gong so he can never concentrate on the moon!",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
+	end;
+OnTimer10000:
+	mapannounce instance_mapname("1@ma_b"),"Taho: Do not engage on him even if he come above the surface. Just make loud noises!",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
+	end;
+OnTimer15000:
+	mapannounce instance_mapname("1@ma_b"),"Mission - Destroy 2 caldrons and 2 gongs on left and right sides of the lake.",bc_map,"0xff3300"; //FW_NORMAL 15 0 0
+	donpcevent instance_npcname("#Bakonawan2")+"::OnStart";
+	stopnpctimer;
+	disablenpc instance_npcname("#BakonawaDeadn1");
+	end;
+}
+
+1@ma_b,36,111,4	script	#Bakonawan2	CLEAR_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Bakonawan2");
+	end;
+OnStart:
+	enablenpc instance_npcname("#Bakonawan2");
+	set .@label$, instance_npcname("#Bakonawan2")+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@ma_b");
+	monster .@map$,95,98,"Caldron",2328,1,.@label$;
+	monster .@map$,60,98,"Caldron",2328,1,.@label$;
+	monster .@map$,97,104,"Gong",2328,1,.@label$;
+	monster .@map$,58,104,"Gong",2328,1,.@label$;
+	donpcevent instance_npcname("#Bakonawan2-1")+"::OnStart";
+	initnpctimer;
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@ma_b");
+	set .@mob_dead_num, mobcount(.@map$,instance_npcname("#Bakonawan2")+"::OnMyMobDead");
+	if (.@mob_dead_num < 1) {
+		donpcevent instance_npcname("#Bakonawan2-1")+"::OnEnd";
+		stopnpctimer;
+		disablenpc instance_npcname("#Bakonawan2");
+	} else
+		mapannounce .@map$,"Taho: Good! "+.@mob_dead_num+" left to go!",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
+	 end;
+OnTimer1000:	callsub OnAnnounce,"5 minutes",15,1;
+OnTimer60000:	callsub OnAnnounce,"4 minutes",15,1;
+OnTimer120000:	callsub OnAnnounce,"3 minutes",15,1;
+OnTimer180000:	callsub OnAnnounce,"2 minutes",15,1;
+OnTimer240000:	callsub OnAnnounce,"1 minute",15,1;
+OnTimer270000:	callsub OnAnnounce,"30 seconds",15,0;
+OnTimer280000:	callsub OnAnnounce,"20 seconds",15,0;
+OnTimer290000:	callsub OnAnnounce,"10 seconds",15,0;
+OnTimer295000:	callsub OnAnnounce,"5 seconds",16,0;
+OnTimer296000:	callsub OnAnnounce,"4 seconds",17,0;
+OnTimer297000:	callsub OnAnnounce,"3 seconds",18,0;
+OnTimer298000:	callsub OnAnnounce,"2 seconds",19,0;
+OnTimer299000:	callsub OnAnnounce,"1 second",20,0;
+OnTimer300000:
+	set .@map$, instance_mapname("1@ma_b");
+	mapannounce .@map$,"Bakonawa has escaped deep into the lake.",bc_map,"0xffff00"; //FW_NORMAL 20 0 0
+	donpcevent instance_npcname("Taho#Fail")+"::OnStart";
+	donpcevent instance_npcname("#Bakonawan2-1")+"::OnFail";
+	killmonster .@map$,instance_npcname("#Bakonawan2")+"::OnMyMobDead";
+	stopnpctimer;
+	disablenpc instance_npcname("#Bakonawan2");
+	end;
+OnAnnounce:
+	mapannounce instance_mapname("1@ma_b"),"Time Limit: "+getarg(0),bc_map,"0xff4400"; //FW_NORMAL getarg(1) 0 0
+	if (getarg(2)) donpcevent instance_npcname("#SummonPuppetsn1")+"::OnStart";
+	end;
+}
+
+1@ma_b,36,111,4	script	#Bakonawan2-1	CLEAR_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Bakonawan2-1");
+	end;
+OnStart:
+	enablenpc instance_npcname("#Bakonawan2-1");
+	monster instance_mapname("1@ma_b"),78,81,"Enraged Bakonawa",2321,1,instance_npcname("#Bakonawan2-1")+"::OnMyMobDead"; //original: (78,93)
+	end;
+OnFail:
+	killmonster instance_mapname("1@ma_b"),instance_npcname("#Bakonawan2-1")+"::OnMyMobDead";
+	end;
+OnEnd:
+	enablenpc instance_npcname("#Bakonawan2-1");
+	killmonster instance_mapname("1@ma_b"),instance_npcname("#Bakonawan2-1")+"::OnMyMobDead";
+	initnpctimer;
+	end;
+OnTimer1000:
+	mapannounce instance_mapname("1@ma_b"),"Taho: He is back into the lake again. Is it over?",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
+	end;
+OnTimer5000:
+	mapannounce instance_mapname("1@ma_b"),"Taho: UHM! Something is moving up rapidly under the water! Ba... Bakonawa is coming!!",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
+	end;
+OnTimer10000:
+	mapannounce instance_mapname("1@ma_b"),"Mission - Eliminate Bakonawa who became more fierce.",bc_map,"0xff3300"; //FW_NORMAL 15 0 0
+	donpcevent instance_npcname("#Bakonawan3")+"::OnStart";
+	stopnpctimer;
+	disablenpc instance_npcname("#Bakonawan2-1");
+	end;
+OnMyMobDead:
+	end;
+}
+
+1@ma_b,36,111,4	script	#Bakonawan3	CLEAR_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Bakonawan3");
+	end;
+OnStart:
+	enablenpc instance_npcname("#Bakonawan3");
+	initnpctimer;
+	monster instance_mapname("1@ma_b"),78,81,"Enraged Bakonawa",2322,1,instance_npcname("#Bakonawan3")+"::OnMyMobDead"; //original: (78,83)
+	donpcevent instance_npcname("#Bakonawan3-1")+"::OnStart";
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@ma_b");
+	set .@mob_dead_num, mobcount(.@map$,instance_npcname("#Bakonawan3")+"::OnMyMobDead");
+	if (.@mob_dead_num < 1) {
+		mapannounce .@map$,"Taho: We got him! I can see he has threw up something that looks like a box.",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
+		donpcevent instance_npcname("Taho#Completed")+"::OnStart";
+		donpcevent instance_npcname("#Bakonawan3-1")+"::OnEnd";
+		killmonster .@map$,instance_npcname("#Bakonawan3")+"::OnMyMobDead";
+		stopnpctimer;
+		disablenpc instance_npcname("#Bakonawan3");
+	}
+	end;
+OnTimer1000:
+	callsub OnAnnounce,"10 minutes",15,1;
+	end;
+OnTimer60000:
+OnTimer120000:
+OnTimer180000:
+OnTimer240000:
+	donpcevent instance_npcname("#SummonPuppetsn1")+"::OnStart";
+	end;
+OnTimer300000:	callsub OnAnnounce,"5 minutes",15,1;
+OnTimer360000:	callsub OnAnnounce,"4 minutes",15,1;
+OnTimer420000:	callsub OnAnnounce,"3 minutes",15,1;
+OnTimer480000:	callsub OnAnnounce,"2 minutes",15,1;
+OnTimer540000:	callsub OnAnnounce,"1 minute",15,1;
+OnTimer570000:	callsub OnAnnounce,"30 seconds",15,0;
+OnTimer580000:	callsub OnAnnounce,"20 seconds",15,0;
+OnTimer590000:	callsub OnAnnounce,"10 seconds",15,0;
+OnTimer595000:	callsub OnAnnounce,"5 seconds",16,0;
+OnTimer596000:	callsub OnAnnounce,"4 seconds",17,0;
+OnTimer597000:	callsub OnAnnounce,"3 seconds",18,0;
+OnTimer598000:	callsub OnAnnounce,"2 seconds",19,0;
+OnTimer599000:	callsub OnAnnounce,"1 second",20,0;
+OnTimer600000:
+	set .@map$, instance_mapname("1@ma_b");
+	mapannounce .@map$,"Bakonawa has escaped deep into the lake.",bc_map,"0xffff00"; //FW_NORMAL 20 0 0
+	donpcevent instance_npcname("Taho#Fail")+"::OnStart";
+	killmonster .@map$,instance_npcname("#Bakonawan3")+"::OnMyMobDead";
+	stopnpctimer;
+	disablenpc instance_npcname("#Bakonawan3");
+	end;
+OnAnnounce:
+	mapannounce instance_mapname("1@ma_b"),"Time Limit: "+getarg(0),bc_map,"0xff4400"; //FW_NORMAL getarg(1) 0 0
+	if (getarg(2)) donpcevent instance_npcname("#SummonPuppetsn1")+"::OnStart";
+	end;
+}
+
+1@ma_b,36,111,4	script	#Bakonawan3-1	CLEAR_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Bakonawan3-1");
+	end;
+OnStart:
+	initnpctimer;
+	end;
+OnEnd:
+	killmonster instance_mapname("1@ma_b"),instance_npcname("#Bakonawan3-1")+"::OnMyMobDead";
+	//showdigit 0;
+	stopnpctimer;
+	end;
+OnMyMobDead:
+	showdigit mobcount(instance_mapname("1@ma_b"),instance_npcname("#Bakonawan3-1")+"::OnMyMobDead");
+	end;
+OnTimer120000:	callsub OnMobSpawn,10;
+OnTimer180000:	callsub OnMobSpawn,15;
+OnTimer240000:	callsub OnMobSpawn,20;
+//OnTimer300000:	callsub OnMobSpawn,25;
+OnTimer300000:	callsub OnMobSpawn,30;
+OnTimer360000:	callsub OnMobSpawn,35;
+OnTimer420000:	callsub OnMobSpawn,40;
+OnTimer480000:	callsub OnMobSpawn,45;
+OnTimer540000:	callsub OnMobSpawn,50;
+OnTimer600000:
+	killmonster instance_mapname("1@ma_b"),instance_npcname("#Bakonawan3-1")+"::OnMyMobDead";
+	stopnpctimer;
+	end;
+OnMobSpawn:
+	set .@label$, instance_npcname("#Bakonawan3-1")+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@ma_b");
+	killmonster .@map$,.@label$;
+	set .@mob_dead_num, mobcount(.@map$,.@label$);
+	if (.@mob_dead_num < 50) {
+		set .@mob_rg, 50 - .@mob_dead_num;
+		if (.@mob_rg > getarg(0))
+			set .@mob_rg, getarg(0);
+		while(1) {
+			areamonster .@map$,74,74,82,74,"Bakonawa's Puppet",2334,1,.@label$;
+			set .@mob_dead_num, mobcount(.@map$,.@label$);
+			if (.@mob_dead_num >= .@mob_rg) {
+				break;
+			}
+		}
+	}
+	end;
+}
+
+1@ma_b,62,52,4	script	Taho#Completed	4_M_DEWZATIMAN,{
+	disable_items;
+	if (checkweight(1201,1) == 0) {
+		mes "It seems you are carrying too many different kinds of items. Please try again after reducing it.";
+		close;
+	}
+	if (MaxWeight - Weight < 10000) {
+		mes "It seems you are already carrying items of too much weight. Please try again after reducing the weight.";
+		close;
+              }
+	if (checkquest(12279,HUNTING) == 2) {
+		erasequest 12279;
+		mes "[Taho]";
+		mes "This was found from Bakonawa's corpse. It would be better if you take this.";
+//		if (IsPremiumPcCafe == 10)
+			getitem 6499,7; //Ancient_Grudge
+//		else
+//			getitem 6499,5; //Ancient_Grudge
+		getexp 0,100000;
+		next;
+	}
+	mes "[Taho]";
+	mes "We better hurry and get out of this place. This place is still dangerous even without Bakonawa...";
+	next;
+	mes "[Taho]";
+	mes "Then let's use to the rope to go up!";
+	close2;
+	warp "ma_scene01",175,176;
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("Taho#Completed");
+	end;
+OnStart:
+	enablenpc instance_npcname("Taho#Completed");
+	initnpctimer;
+	end;
+OnTimer1000:
+	monster instance_mapname("1@ma_b"),78,74,"Bakonawa Treasure Box",2335,1;
+	end;
+OnTimer10000:
+	mapannounce instance_mapname("1@ma_b"),"Taho: After opening the treasure box, please visit me at the top of the hill. I've got something to give to you.",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
+	stopnpctimer;
+	end;
+}
+
+1@ma_b,62,52,4	script	Taho#Fail	4_M_DEWZATIMAN,{
+	mes "[Taho]";
+	mes "HMM. We almost got him but he is one fast creature...";
+	next;
+	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+		mes "[Taho]";
+		mes "Are we going to try again?";
+		next;
+		switch(select("Hold on a sec!:Of couse! We cannot stand back now!")) {
+		case 1:
+			mes "[Taho]";
+			mes "AWW... I almost brought him out.";
+			close;
+		case 2:
+			mes "[Taho]";
+			mes "Then I will use Albopal once again to the lake.";
+			next;
+			mes "[Taho]";
+			mes "We are about to see Bakonawa with intenser anger...";
+			disablenpc instance_npcname("Taho#Fail");
+			donpcevent instance_npcname("#Bakonawan1")+"::OnStart";
+			close;
+		}
+		close;
+	} else {
+		mes "[Taho]";
+		mes "I am dropping Albopal like I did a while ago. I hope it pisses him off...";
+		close;
+	}
+
+OnInstanceInit:
+	disablenpc instance_npcname("Taho#Fail");
+	end;
+OnStart:
+	enablenpc instance_npcname("Taho#Fail");
+	end;
+}
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
new file mode 100644
index 000000000..b995092a1
--- /dev/null
+++ b/npc/re/instances/BangungotHospital.txt
@@ -0,0 +1,1101 @@
+//===== Hercules Script ======================================
+//= Bangungot Hospital 2F
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Save the hospital in Port Malaya from Bangungot.
+//= Part of the "Nurse in Port Malaya" quest.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//= 1.1 Added GM management function. [Euphy]
+//============================================================
+
+1@ma_h	mapflag	src4instance
+//============================================================
+
+// Instance Creation
+//============================================================
+ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
+	if (BaseLevel < 100) end;
+
+	set .@party_id,getcharid(1);
+	cutin "malaya_nurseB",2;
+	if (checkquest(9223) == -1) {
+		set .@quest, checkquest(9222);
+		if (.@quest == -1) {
+			if (!.@party_id) {
+				if (malaya_bang == 30)
+					callsub L_Closed,1;
+				else if (malaya_bang == 31)
+					callsub L_Closed,0;
+				else
+					goto L_NoParty;
+			}
+			if (checkquest(11309,HUNTING) < 2) {
+				set .@playtime, checkquest(9224,PLAYTIME);
+				if (.@playtime == -1) {
+					if (malaya_bang == 30)
+						callsub L_Closed,1;
+					else if (malaya_bang == 31)
+						callsub L_Closed,0;
+					else if (malaya_bang > 39)
+						callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,0,0;
+					else {
+						mes "[Nurse Maenne]";
+						mes "..........";
+						close2;
+						cutin "",255;
+						end;
+					}
+				} else if (.@playtime == 0 || .@playtime == 1) {
+					if (checkquest(11309) == -1) {
+						mes "[Nurse Maenne]";
+						mes "This is a fatal situation.";
+						close2;
+						cutin "",255;
+						end;
+					} else {
+						mes "[Nurse Maenne]";
+						mes "Now the entrance";
+						mes "to the second floor";
+						mes "is closed.";
+						next;
+						mes "[Nurse Maenne]";
+						mes "To go up to";
+						mes "the second floor again,";
+						mes "open the gate";
+						mes "after a lapse of time.";
+						close2;
+						cutin "",255;
+						end;
+					}
+				} else {
+					set .@quest2, checkquest(11309);
+					if (.@quest2 == -1) {
+						callsub L_Closed,0;
+					} else if (.@quest2 == 0 || .@quest2 == 1) {
+						callsub L_Complete;
+						completequest 9224;
+						erasequest 9224;
+						close2;
+						cutin "",255;
+						end;
+					} else {
+						//if (!.@party_id) goto L_NoParty; //unneeded
+						if (malaya_bang > 39)
+							callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,1,1;
+						else {
+							mes "[Nurse Maenne]";
+							mes ".......";
+							close2;
+							cutin "",255;
+							end;
+						}
+					}
+				}
+			} else {
+				mes "[Nurse Maenne]";
+				mes "You got rid of Bangungot!"; //?
+				mes "The nurse might be waiting for you";
+				mes "in front of the hospital!";
+				close2;
+				cutin "",255;
+				end;
+			}
+		} else if (.@quest == 0 || .@quest == 1) {
+			if (!.@party_id) goto L_NoParty;
+			if (malaya_bang > 39) {
+				set .@hunting, checkquest(9222,HUNTING);
+				if (.@hunting == 0 || .@hunting == 1) {
+					set .@playtime, checkquest(9224,PLAYTIME);
+					if (.@playtime == 0 || .@playtime == 1) {
+						mes "[Nurse Maenne]";
+						mes "Do you want go up to the second floor again?";
+						next;
+						callsub L_Enter,0,0;
+					} else if (.@playtime == 2) {
+						//if (!.@party_id) goto L_NoParty; //unneeded
+						if (malaya_bang > 39)
+							callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,1,1;
+						else {
+							mes "[Nurse Maenne]";
+							mes ".......";
+							close2;
+							cutin "",255;
+							end;
+						}
+					} else {
+						mes "[Nurse Maenne]";
+						mes "This is a fatal situation.";
+						mes "You can't go up to the 2nd floor.";
+						close2;
+						cutin "",255;
+						end;
+					}
+				} else {
+					if (checkweight(607,1) == 0) {
+						mes "[Nurse Maenne]";
+						mes "You have too much stuff.";
+						mes "Please reduce your stuff and";
+						mes "come to me again.";
+						close2;
+						cutin "",255;
+						end;
+					}
+					if (checkweight(607,11) == 0) {
+						mes "[Nurse Maenne]";
+						mes "It's too heavy.";
+						mes "Please reduce the weight and";
+						mes "come to me again.";
+						close2;
+						cutin "",255;
+						end;
+					}
+					callsub L_Complete;
+					completequest 9222;
+					erasequest 9222;
+					completequest 9224;
+					erasequest 9224;
+					setquest 9223;
+					getexp 500000,0;
+//					if (IsPremiumPcCafe == 10)
+						getitem 6499,7; //Ancient_Grudge
+//					else
+//						getitem 6499,5; //Ancient_Grudge
+					close2;
+					cutin "",255;
+					end;
+				}
+			} else {
+				mes "[Nurse Maenne]";
+				mes ".....?";
+				mes "Now you can't go up";
+				mes "to the 2nd floor.";
+				close2;
+				cutin "",255;
+				end;
+			}
+		} else {
+			callsub L_Complete;
+			completequest 9222;
+			erasequest 9222;
+			completequest 9224;
+			erasequest 9224;
+			setquest 9223;
+			close2;
+			cutin "",255;
+			end;
+		}
+	} else {
+		if (checkquest(9223,PLAYTIME) == 0 || checkquest(9223,PLAYTIME) == 1) {
+			callsub L_Complete;
+			close2;
+			cutin "",255;
+			end;
+		} else {
+			if (!.@party_id) goto L_NoParty;
+			if (malaya_bang > 39)
+				callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,1,1;
+			else {
+				mes "[Nurse Maenne]";
+				mes ".......";
+				close2;
+				cutin "",255;
+				end;
+			}
+		}
+	}
+
+L_Closed:
+	mes "[Nurse Maenne]";
+	mes "- The door is closed to 1st floor";
+	mes "When this Nurse came in?";
+	mes "I call her behind, but";
+	mes "she doesn't respond. -";
+	if (getarg(0)) {
+		set malaya_bang,31;
+		changequest 11302,11303;
+	}
+	close2;
+	cutin "",255;
+	end;
+
+L_NoParty:
+	mes "- I guess...";
+	mes "I can't talk him alone.";
+	mes "After registering a party";
+	mes "let me try to say something. -";
+	close2;
+	cutin "",255;
+	end;
+
+L_Enter:
+	set .@md_name$,"Bangungot Hospital 2F";
+	if (getarg(2) == 0) {
+		mes "[Nurse Maenne]";
+		mes "I already heard that story so";
+		mes "I pretty much know that.";
+		mes "What are you going to do?";
+		mes "Do you want to go up";
+		mes "to the second floor?";
+	} else {
+		mes "[Nurse Maenne]";
+		mes "You are back...";
+		mes "There is bad news.";
+		mes "I heard that";
+		mes "the Bangungot has";
+		mes "appeared again.";
+		next;
+		mes "[Nurse Maenne]";
+		mes strcharinfo(0) + "'s help";
+		mes "is needed again.";
+		mes "Please, could you give me";
+		mes "one more chance?";
+	}
+	next;
+	switch(select(((getarg(0))?"Prepare to enter the second floor.":"")+":Enter the second floor.:Do not enter.")) {
+	case 1:
+		set .@instance, instance_create(.@md_name$,getcharid(1));
+		if (.@instance < 0) {
+			mes "[Nurse Maenne]";
+			mes "A critical situation has happened.";
+			mes "You can't go up to the 2nd floor.";
+			close2;
+			cutin "",255;
+			end;
+		}
+		if (instance_attachmap("1@ma_h",.@instance) == "") {
+			mes "^0000ff"+.@md_name$+"^000000 - Reservation Failed!";
+			instance_destroy(.@instance);
+			close;
+		}
+		instance_set_timeout 3600,300,.@instance;
+		instance_init(.@instance);
+		mes "[Nurse Maenne]";
+		mes "We are preparing to go up";
+		mes "to the second floor.";
+		mes "At the second floor";
+		mes "there is a chaotic rumor that";
+		mes "the dead do not die.";
+		mes "Please refer to this story.";
+		next;
+		mes "[Nurse Maenne]";
+		mes "When you finish everything,";
+		mes "please talk to me again.";
+		mes "I really appreciate it.";
+		close2;
+		cutin "",255;
+		end;
+	case 2:
+		if( has_instance("1@ma_h") == "" ) {
+			mes "The memorial dungeon "+.@md_name$+" does not exist.";
+			mes "The party leader did not generate the dungeon yet.";
+			close;
+		} else {
+			mapannounce "ma_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member entered "+.@md_name$+".",bc_map,"0x00ff99";
+			if (getarg(1)) {
+				if (checkquest(9223) > -1) {
+					completequest 9223;
+					erasequest 9223;
+				}
+				if (checkquest(9222) > -1)
+					erasequest 9222;
+				if (checkquest(9224) > -1)
+					erasequest 9224;
+				setquest 9222;
+			}
+			setquest 9224;
+			cutin "",255;
+			warp "1@ma_h",40,157;
+			end;
+		}
+	case 3:
+		mes "[Nurse Maenne]";
+		mes "Alright.";
+		mes "If you change mind, come back again.";
+		close2;
+		cutin "",255;
+		end;
+	}
+
+L_Complete:
+	mes "[Nurse Maenne]";
+	mes "You returned safely from the Bangungot on the second floor!!";
+	mes "However, it's not";
+	mes "really over yet.";
+	next;
+	mes "[Nurse Maenne]";
+	mes "I'm pretty sure it";
+	mes "never disappears easily.";
+	mes "I don't know what will happen";
+	mes "about Bangungot, so";
+	mes "after a lapse of time";
+	mes "please return to me.";
+	return;
+}
+
+sec_in02,27,30,0	script	Bangungot Gate	2_MONEMUS,{
+	callfunc "F_GM_NPC";
+	mes "Password";
+	next;
+	if (callfunc("F_GM_NPC","1854",1) == 0) {
+		mes "Good Luck.";
+		close;
+	}
+	switch(select("Receive 9222:Receive 9223:Erase 9222:Erase 9223:Receive 9224:Erase 9224:Receive malaya_bang 30:Receive malaya_bang 40:Receive 11309:Erase 11309:Cancel")) {
+		case 1: setquest 9222; close;
+		case 2: setquest 9223; close;
+		case 3: erasequest 9222; close;
+		case 4: erasequest 9223; close;
+		case 5: setquest 9224; close;
+		case 6: erasequest 9224; close;
+		case 7: set malaya_bang,30; close;
+		case 8: set malaya_bang,40; close;
+		case 9: setquest 11309; close;
+		case 10: completequest 11309; close;
+		case 11: close;
+	}
+}
+
+// Instance Scripts
+//============================================================
+1@ma_h,43,157,0	script	#Memorial Start	HIDDEN_WARP_NPC,2,2,{
+	end;
+OnTouch:
+	set .@map$, instance_mapname("1@ma_h");
+	mapannounce .@map$,"Bangungot: You silly "+strcharinfo(0)+" ....",bc_map,"0xFF82FF";
+	mapannounce .@map$,"Bangungot: Get out before you die...",bc_map,"0xFF82FF";
+	areamonster .@map$,44,156,46,158,"Bangungot's Mangkukulam",2339,1,instance_npcname("#Memorial Start")+"::OnMyMobDead";
+	donpcevent instance_npcname("#Memorial Start_time")+"::OnEnable";
+	end;
+OnMyMobDead:
+	initnpctimer;
+	end;
+OnTimer1000:
+	set .@map$, instance_mapname("1@ma_h");
+	if (mobcount(.@map$,instance_npcname("#Memorial Start")+"::OnMyMobDead") < 1) {
+		donpcevent instance_npcname("#Ward1 Entry")+"::OnEnable1";
+		donpcevent instance_npcname("#Memorial Start_time")+"::OnDisable";
+		mapannounce .@map$,"Bangungot: This is where your NIGHTMARE starts...",bc_map,"0xFF82FF";
+		disablenpc instance_npcname("#Memorial Start");
+	}
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,43,157,0	script	#Memorial Start_time	HIDDEN_WARP_NPC,{ //2,2
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Memorial Start_time");
+	end;
+OnEnable:
+	specialeffect EF_BAT2,AREA,instance_npcname("#Memorial Start");
+	initnpctimer;
+	end;
+OnDisable:
+	stopnpctimer;
+	end;
+OnTimer5000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: You cannot help.... you can't defeat me.",bc_map,"0xFF82FF";
+	end;
+OnTimer10000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: HAHAHAHAHAHAHAHA!!!!",bc_map,"0xFF82FF";
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,46,165,0	script	#Ward1 Entry	HIDDEN_WARP_NPC,{ //3,3
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable1:
+	set .@map$, instance_mapname("1@ma_h");
+	set .@label$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	enablenpc instance_npcname(strnpcinfo(0));
+	specialeffect EF_BAT2;
+	switch(atoi(charat(strnpcinfo(2),4))) {
+	case 1:
+		areamonster .@map$,49,171,51,173,"Bangungot's Mangkukulam",2339,1,.@label$;
+		areamonster .@map$,51,171,53,173,"Bangungot's Mangkukulam",2339,1,.@label$;
+		end;
+	case 2:
+		areamonster .@map$,49,137,51,139,"Bangungot's Mangkukulam",2339,1,.@label$;
+		areamonster .@map$,51,137,53,139,"Bangungot's Mangkukulam",2339,1,.@label$;
+		end;
+	case 3:
+		areamonster .@map$,69,171,71,173,"Bangungot's Mangkukulam",2339,1,.@label$;
+		areamonster .@map$,71,171,73,173,"Bangungot's Mangkukulam",2339,1,.@label$;
+		areamonster .@map$,73,171,75,173,"Bangungot's Mangkukulam",2339,1,.@label$;
+		end;
+	case 4:
+		areamonster .@map$,71,139,73,141,"Bangungot's Mangkukulam",2339,1,.@label$;
+		areamonster .@map$,73,139,75,141,"Bangungot's Mangkukulam",2339,1,.@label$;
+		areamonster .@map$,75,139,77,141,"Bangungot's Mangkukulam",2339,1,.@label$;
+		end;
+	case 5:
+		areamonster .@map$,93,173,95,175,"Bangungot's Mangkukulam",2339,1,.@label$;
+		areamonster .@map$,95,173,97,175,"Bangungot's Mangkukulam",2339,1,.@label$;
+		areamonster .@map$,97,173,99,175,"Bangungot's Mangkukulam",2339,1,.@label$;
+		areamonster .@map$,93,175,95,177,"Bangungot's Mangkukulam",2339,1,.@label$;
+		end;
+	}
+/*
+// Not called in official scripts.
+OnEnable2:
+	areamonster instance_mapname("1@ma_h"),140,38,142,40,"Bangungot's Mangkukulam",2339,1,instance_npcname("#Ward1 Entry")+"::OnMyMobDead";
+	end;
+*/
+OnEnable3:
+	set .@i, atoi(charat(strnpcinfo(2),4))+1;
+	donpcevent instance_npcname("#Ward"+.@i+" Entry")+"::OnEnable1";
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnMyMobDead:
+	initnpctimer;
+	end;
+OnTimer1000:
+	set .@map$, instance_mapname("1@ma_h");
+	if (mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) {
+		specialeffect EF_BAT2;
+		donpcevent instance_npcname(strnpcinfo(0))+"::OnEnable3";
+		switch(atoi(charat(strnpcinfo(2),4))) {
+			case 1: set .@str$,"Bangungot: I will let you see the pain and the agony actually be real....."; break;
+			case 2: set .@str$,"Bangungot: Diseased spirits are the source of my energy, and my life..."; break;
+			case 3: set .@str$,"Bangungot: Scream more....and more...... your pain..."; break;
+			case 4: set .@str$,"Bangungot: Deeply and more deeply in pain..."; break;
+			case 5: set .@str$,"Bangungot: Be horrified...be petrified."; break;
+		}
+		mapannounce .@map$,.@str$,bc_map,"0xFF82FF";
+	}
+	stopnpctimer;
+	end;
+}
+1@ma_h,57,147,0	duplicate(#Ward1 Entry)	#Ward2 Entry	HIDDEN_WARP_NPC //3,3
+1@ma_h,67,165,0	duplicate(#Ward1 Entry)	#Ward3 Entry	HIDDEN_WARP_NPC //3,3
+1@ma_h,79,147,0	duplicate(#Ward1 Entry)	#Ward4 Entry	HIDDEN_WARP_NPC //3,3
+1@ma_h,90,165,0	duplicate(#Ward1 Entry)	#Ward5 Entry	HIDDEN_WARP_NPC //3,3
+
+1@ma_h,101,147,0	script	#Ward6 Entry	HIDDEN_WARP_NPC,{ //2,2
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Ward6 Entry");
+	end;
+OnEnable1:
+	set .@map$, instance_mapname("1@ma_h");
+	set .@label$, instance_npcname("#Ward6 Entry")+"::OnMyMobDead";
+	enablenpc instance_npcname("#Ward6 Entry");
+	specialeffect EF_BAT2;
+	areamonster .@map$,93,137,95,139,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,95,137,97,139,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,97,137,99,139,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,93,139,95,141,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,95,139,97,141,"Bangungot's Manananggal",2338,1,.@label$;
+	end;
+/*
+// Not called in official scripts.
+OnEnable2:
+	areamonster instance_mapname("1@ma_h"),140,38,142,40,"Bangungot's Mangkukulam",2339,1,instance_npcname("#Ward6 Entry")+"::OnMyMobDead";
+	end;
+*/
+OnMyMobDead:
+	initnpctimer;
+	end;
+OnTimer3000:
+	set .@map$, instance_mapname("1@ma_h");
+	if (mobcount(.@map$,instance_npcname("#Ward6 Entry")+"::OnMyMobDead") < 1) {
+		specialeffect EF_BAT2;
+		donpcevent instance_npcname("#Summon Boss")+"::OnEnable";
+		mapannounce .@map$,"Bangungot: You had the choice to enter here, but you have no choice to get out as you want...",bc_map,"0xFF82FF";
+	}
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,110,177,0	script	#Summon Boss	HIDDEN_WARP_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Summon Boss");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#Summon Boss");
+	monster instance_mapname("1@ma_h"),143,158,"Bangungot",2317,1,instance_npcname("#Summon Boss")+"::OnMyMobDead";
+	donpcevent instance_npcname("#Boss Room Entry")+"::OnEnableEntry";
+	donpcevent instance_npcname("#Boss Room Entry")+"::OnEnable";
+	end;
+OnMyMobDead:
+	initnpctimer;
+	end;
+OnTimer1000:
+	if (mobcount(instance_mapname("1@ma_h"),instance_npcname("#Summon Boss")+"::OnMyMobDead") < 1) {
+		donpcevent instance_npcname("#Summon Pillar")+"::OnEnable1";
+		mapannounce instance_mapname("1@ma_h"),"Bangungot: I....cannot.....finish...like.......this.",bc_map,"0xFF82FF";
+		disablenpc instance_npcname("#Summon Boss");
+	}
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,147,143,0	script	#Boss Room Entry	HIDDEN_WARP_NPC,10,10,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Boss Room Entry");
+	end;
+OnTouch:
+	specialeffect EF_GHOST;
+	donpcevent instance_npcname("#Boss Room Entry")+"::OnDisableEntry";
+	donpcevent instance_npcname("#Boss Room Entry_time")+"::OnEnable";
+	end;
+OnEnable:
+	enablenpc instance_npcname("#Boss Room Entry");
+	enablenpc instance_npcname("#Boss Room Door");
+	enablenpc instance_npcname("#Boss Room Door1");
+	end;
+OnSpawn:
+	areamonster instance_mapname("1@ma_h"),123,152,137,166,"Bangungot's Manananggal",2338,1,instance_npcname("#Boss Room Entry")+"::OnMyMobDead";
+	end;
+OnReset:
+	killmonster instance_mapname("1@ma_h"),instance_npcname("#Boss Room Entry")+"::OnMyMobDead";
+	end;
+OnMyMobDead:
+	initnpctimer;
+	end;
+OnTimer1000:
+	set .@map$, instance_mapname("1@ma_h");
+	if (mobcount(.@map$,instance_npcname("#Boss Room Entry")+"::OnMyMobDead") < 1)
+		mapannounce .@map$,"Bangungot: HAHAHAH... That's not enough, I will be even stronger....",bc_map,"0xFF82FF";
+	stopnpctimer;
+	end;
+
+// Unofficial labels (to avoid duplicating code).
+OnEnableEntry:
+	enablenpc instance_npcname("#Boss Room Entry");
+	enablenpc instance_npcname("#Boss Room Entry_a");
+	enablenpc instance_npcname("#Boss Room Entry_b");
+	enablenpc instance_npcname("#Boss Room Entry_c");
+	enablenpc instance_npcname("#Boss Room Entry_d");
+	enablenpc instance_npcname("#Boss Room Entry_e");
+	enablenpc instance_npcname("#Boss Room Entry_f");
+	enablenpc instance_npcname("#Boss Room Entry_g");
+	enablenpc instance_npcname("#Boss Room Entry_h");
+	end;
+OnDisableEntry:
+	disablenpc instance_npcname("#Boss Room Entry");
+	disablenpc instance_npcname("#Boss Room Entry_a");
+	disablenpc instance_npcname("#Boss Room Entry_b");
+	disablenpc instance_npcname("#Boss Room Entry_c");
+	disablenpc instance_npcname("#Boss Room Entry_d");
+	disablenpc instance_npcname("#Boss Room Entry_e");
+	disablenpc instance_npcname("#Boss Room Entry_f");
+	disablenpc instance_npcname("#Boss Room Entry_g");
+	disablenpc instance_npcname("#Boss Room Entry_h");
+	end;
+}
+
+1@ma_h,147,143,0	script	#Boss Room Entry_time	HIDDEN_WARP_NPC,{ //10,10
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Boss Room Entry_time");
+	end;
+OnEnable:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: You poor little things. I will invite you to the world of infectious disease...",bc_map,"0xFF82FF";
+	initnpctimer;
+	end;
+OnTimer25000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: You will know what it is...",bc_map,"0xFF82FF";
+	for(set .@i,10; .@i<=22; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer35000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: Real pain! You will know!!",bc_map,"0xFF82FF";
+	for(set .@i,25; .@i<=33; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer45000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: Have you ever heard the patients screaming?",bc_map,"0xFF82FF";
+	end;
+OnTimer55000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: If you haven't, I will let you!!",bc_map,"0xFF82FF";
+	enablenpc instance_npcname("#Summon Ward Mob");
+	donpcevent instance_npcname("#Summon Ward Mob")+"::OnEnable7";
+	end;
+OnTimer60000:
+	for(set .@i,1; .@i<=8; set .@i,.@i+1)
+		enablenpc instance_npcname("#Patternwarp"+.@i);
+	for(set .@i,34; .@i<=38; set .@i,.@i+1)
+		enablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer60500:
+	for(set .@i,41; .@i<=49; set .@i,.@i+1)
+		enablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer90000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: Delight coming from agony is my nutrient.",bc_map,"0xFF82FF";
+	donpcevent instance_npcname("#Boss Room Entry")+"::OnSpawn";
+	end;
+OnTimer110000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: Remain here, cursed disease.....",bc_map,"0xFF82FF";
+	donpcevent instance_npcname("#Boss Room Entry")+"::OnSpawn";
+	end;
+OnTimer125000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: You wanna hang out with me ......?",bc_map,"0xFF82FF";
+	end;
+OnTimer128000:
+	for(set .@i,1; .@i<=8; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	for(set .@i,34; .@i<=38; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer128500:
+	for(set .@i,41; .@i<=49; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer129000:
+	donpcevent instance_npcname("#Boss Room Entry")+"::OnEnableEntry";
+	end;
+OnTimer129500:
+	donpcevent instance_npcname("#Boss Room Entry")+"::OnSpawn";
+	for(set .@i,10; .@i<=22; set .@i,.@i+1)
+		enablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer130000:
+	for(set .@i,25; .@i<=33; set .@i,.@i+1)
+		enablenpc instance_npcname("#Patternwarp"+.@i);
+	stopnpctimer;
+	end;
+OnStopTimer:
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,111,177,0	script	#Boss Room Entry_2	WARPNPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Boss Room Entry_2");
+	end;
+OnEnable:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: You are pretty powerful...",bc_map,"0xFF82FF";
+	initnpctimer;
+	end;
+OnTimer3000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: But can you...",bc_map,"0xFF82FF";
+	end;
+OnTimer6000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: ...defeat me again...?",bc_map,"0xFF82FF";
+	end;
+OnTimer9000:
+	for(set .@i,1; .@i<=8; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	for(set .@i,34; .@i<=38; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer9500:
+	for(set .@i,41; .@i<=49; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer10000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: You stupid persoon....",bc_map,"0xFF82FF";
+	for(set .@i,10; .@i<=22; set .@i,.@i+1)
+		enablenpc instance_npcname("#Patternwarp"+.@i);
+	end;
+OnTimer10500:
+	for(set .@i,25; .@i<=33; set .@i,.@i+1)
+		enablenpc instance_npcname("#Patternwarp"+.@i);
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,118,63,0	script	#Summon Ward Mob	HIDDEN_WARP_NPC,4,4,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Summon Ward Mob");
+	end;
+OnTouch:
+	donpcevent instance_npcname("#Summon Ward Mob_time")+"::OnEnable";
+	specialeffect EF_CURSEATTACK;
+	end;
+OnEnable1:
+	set .@map$, instance_mapname("1@ma_h");
+	set .@label$, instance_npcname("#Summon Ward Mob")+"::OnMyMobDead";
+	areamonster .@map$,47,77,49,79,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,49,77,51,79,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,51,77,53,79,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,47,79,49,81,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,49,79,51,81,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,47,81,49,83,"Bangungot's Tiyanak",2339,1,.@label$;
+	areamonster .@map$,49,81,51,83,"Bangungot's Tiyanak",2339,1,.@label$;
+	end;
+OnEnable2:
+	set .@map$, instance_mapname("1@ma_h");
+	set .@label$, instance_npcname("#Summon Ward Mob")+"::OnMyMobDead";
+	areamonster .@map$,51,45,53,47,"Bangungot's Tiyanak",2339,1,.@label$;
+	areamonster .@map$,53,45,55,47,"Bangungot's Tiyanak",2339,1,.@label$;
+	areamonster .@map$,49,47,51,49,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,53,47,55,49,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,49,49,51,51,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,51,49,53,51,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,53,49,55,51,"Bangungot's Tiyanak",2340,1,.@label$;
+	end;
+OnEnable3:
+	set .@map$, instance_mapname("1@ma_h");
+	set .@label$, instance_npcname("#Summon Ward Mob")+"::OnMyMobDead";
+	areamonster .@map$,69,75,71,77,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,71,75,73,77,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,73,75,75,77,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,69,77,71,79,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,71,77,73,79,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,69,79,71,81,"Bangungot's Tiyanak",2339,1,.@label$;
+	areamonster .@map$,71,79,73,81,"Bangungot's Tiyanak",2339,1,.@label$;
+	end;
+OnEnable4:
+	set .@map$, instance_mapname("1@ma_h");
+	set .@label$, instance_npcname("#Summon Ward Mob")+"::OnMyMobDead";
+	areamonster .@map$,73,45,75,47,"Bangungot's Tiyanak",2339,1,.@label$;
+	areamonster .@map$,75,45,77,47,"Bangungot's Tiyanak",2339,1,.@label$;
+	areamonster .@map$,71,47,73,49,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,75,47,77,49,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,71,49,73,51,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,73,49,75,51,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,75,49,77,51,"Bangungot's Tiyanak",2340,1,.@label$;
+	end;
+OnEnable5:
+	set .@map$, instance_mapname("1@ma_h");
+	set .@label$, instance_npcname("#Summon Ward Mob")+"::OnMyMobDead";
+	areamonster .@map$,93,77,95,79,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,95,77,97,79,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,97,77,99,79,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,93,79,95,81,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,95,79,97,81,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,93,81,95,83,"Bangungot's Tiyanak",2339,1,.@label$;
+	areamonster .@map$,95,81,97,83,"Bangungot's Tiyanak",2339,1,.@label$;
+	end;
+OnEnable6:
+	set .@map$, instance_mapname("1@ma_h");
+	set .@label$, instance_npcname("#Summon Ward Mob")+"::OnMyMobDead";
+	areamonster .@map$,93,43,95,45,"Bangungot's Tiyanak",2339,1,.@label$;
+	areamonster .@map$,95,43,97,45,"Bangungot's Tiyanak",2339,1,.@label$;
+	areamonster .@map$,91,45,93,47,"Bangungot's Mangkukulam",2339,1,.@label$;
+	areamonster .@map$,95,45,97,47,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,91,47,93,49,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,93,47,95,49,"Bangungot's Tiyanak",2340,1,.@label$;
+	areamonster .@map$,95,47,97,49,"Bangungot's Tiyanak",2340,1,.@label$;
+	end;
+OnEnable7:
+	killmonster instance_mapname("1@ma_h"),instance_npcname("#Summon Ward Mob")+"::OnMyMobDead";
+	end;
+OnMyMobDead:
+	initnpctimer;
+	end;
+OnTimer1000:
+	if (mobcount(instance_mapname("1@ma_h"),instance_npcname("#Summon Ward Mob")+"::OnMyMobDead") < 1) {
+		donpcevent instance_npcname("#Boss Room Entry_2")+"::OnEnable";
+		donpcevent instance_npcname("#Boss Room Entry")+"::OnEnableEntry";
+		donpcevent instance_npcname("#Boss Room Entry_time")+"::OnStopTimer";
+	}
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,118,64,0	script	#Summon Ward Mob_time	HIDDEN_WARP_NPC,{ //4,4
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Summon Ward Mob_time");
+	end;
+OnEnable:
+	initnpctimer;
+	disablenpc instance_npcname("#Summon Ward Mob");
+	end;
+OnTimer2000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: My spirit will be with your cursed body...",bc_map,"0xFF82FF";
+	end;
+OnTimer4000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: My inferiors...!! Go!! Go torment the patients in the wards!!",bc_map,"0xFF82FF";
+	end;
+OnTimer6000:
+	mapannounce instance_mapname("1@ma_h"),"- Bangungot's inferiors are bothering patients!! If you don't slay them all, Bangungot will be stronger. -",bc_map,"0xFF8200";
+	end;
+OnTimer10000:
+	setarray .@npc$[1],
+		"Moaning Patient","Screaming Patient","Patient in Pain","Passed Out Patient","Patient with Nightmare","Sick Looking Patient",
+		"Horrified Patient","Patient in Sorrow","Suffering Patient","Wriggling Patient","Patient in Cold Sweat","Howling Patient";
+	enablenpc instance_npcname("#Summon Ward Mob");
+	set .@rand, rand(1,6);
+	donpcevent instance_npcname("#Summon Ward Mob")+"::OnEnable"+.@rand;
+	set .@id, (.@rand*2)-rand(2);
+	donpcevent instance_npcname(.@npc$[.@id]+"#"+.@id)+"::OnEnable";
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,112,177,0	script	#Summon Pillar	HIDDEN_WARP_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Summon Pillar");
+	end;
+OnEnable1:
+	enablenpc instance_npcname("#Summon Pillar");
+	donpcevent instance_npcname("#Boss Room Entry_time")+"::OnStopTimer";
+	donpcevent instance_npcname("#Summon Pillar_time")+"::OnEnable";
+	monster instance_mapname("1@ma_h"),131,157,"Pillar of Spirit",2327,1,instance_npcname("#Summon Pillar")+"::OnMyMobDead";
+	end;
+OnEnable3:
+	enablenpc instance_npcname("#Boss Room Exit");
+	disablenpc instance_npcname("#Summon Pillar");
+	end;
+OnReset:
+	killmonster instance_mapname("1@ma_h"),instance_npcname("#Summon Pillar")+"::OnMyMobDead";
+	end;
+OnMyMobDead:
+	initnpctimer;
+	end;
+OnTimer1000:
+	set .@map$, instance_mapname("1@ma_h");
+	if (mobcount(.@map$,instance_npcname("#Summon Pillar")+"::OnMyMobDead") < 1) {
+		donpcevent instance_npcname("#Summon Pillar_time")+"::OnStopTimer";
+		donpcevent instance_npcname("#Summon Pillar")+"::OnEnable3";
+		donpcevent instance_npcname("#Boss Room Entry")+"::OnReset";
+		mapannounce .@map$,"Bangungot: Oh....cannot believe that I lost...",bc_map,"0xFF4500";
+		mapannounce .@map$,"Bangungot: But don't think this is the end!!",bc_map,"0xFF4500";
+		mapannounce .@map$,"Bangungot: I WILL BE BACK!!!!!",bc_map,"0xFF4500";
+	}
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,112,178,0	script	#Summon Pillar_time	HIDDEN_WARP_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Summon Pillar_time");
+	end;
+OnEnable:
+	initnpctimer;
+	end;
+OnStopTimer:
+	stopnpctimer;
+	end;
+OnTimer1000:
+	mapannounce instance_mapname("1@ma_h"),"- Bangungot's Pillar of Spirit is curing Bangungot. If you don't hunt it now, he will fully recover!! -",bc_map,"0xFF8200";
+	specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
+	end;
+OnTimer7000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: I never die!!!!",bc_map,"0xFF82FF";
+	specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
+	end;
+OnTimer14000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: If you dare, kill me!! I will revive soon!!!",bc_map,"0xFF82FF";
+	specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
+	end;
+OnTimer21000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: I cannot die this way...!!!!",bc_map,"0xFF82FF";
+	specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
+	end;
+OnTimer30000:
+	donpcevent instance_npcname("#Summon Pillar")+"::OnReset";
+	end;
+OnTimer31000:
+	mapannounce instance_mapname("1@ma_h"),"Bangungot: Hahahahaha!! I'm back with the power from the pillar of spirit!!!",bc_map,"0xFF82FF";
+	donpcevent instance_npcname("#Summon Pillar")+"::OnReset";
+	end;
+OnTimer36000:
+	donpcevent instance_npcname("#Boss Room Entry")+"::OnEnableEntry";
+	donpcevent instance_npcname("#Summon Boss")+"::OnEnable";
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,118,171,0	script	#Boss Room Entry_a	HIDDEN_WARP_NPC,10,10,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnTouch:
+	specialeffect EF_GHOST;
+	donpcevent instance_npcname("#Boss Room Entry")+"::OnDisableEntry";
+	donpcevent instance_npcname("#Boss Room Entry_time")+"::OnEnable";
+	end;
+}
+1@ma_h,132,171,0	duplicate(#Boss Room Entry_a)	#Boss Room Entry_b	HIDDEN_WARP_NPC,10,10
+1@ma_h,147,171,0	duplicate(#Boss Room Entry_a)	#Boss Room Entry_c	HIDDEN_WARP_NPC,10,10
+1@ma_h,118,157,0	duplicate(#Boss Room Entry_a)	#Boss Room Entry_d	HIDDEN_WARP_NPC,10,10
+1@ma_h,132,157,0	duplicate(#Boss Room Entry_a)	#Boss Room Entry_e	HIDDEN_WARP_NPC,10,10
+1@ma_h,147,157,0	duplicate(#Boss Room Entry_a)	#Boss Room Entry_f	HIDDEN_WARP_NPC,10,10
+1@ma_h,118,143,0	duplicate(#Boss Room Entry_a)	#Boss Room Entry_g	HIDDEN_WARP_NPC,10,10
+1@ma_h,132,143,0	duplicate(#Boss Room Entry_a)	#Boss Room Entry_h	HIDDEN_WARP_NPC,10,10
+
+1@ma_h,131,62,0	script	#Boss Effect	HIDDEN_WARP_NPC,{ //4,4
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Boss Effect");
+	initnpctimer;
+	end;
+OnTimer3000:
+	specialeffect EF_BARRIER;
+	stopnpctimer;
+	initnpctimer;
+	end;
+}
+
+1@ma_h,43,86,4	script	Moaning Patient#1	4_F_PATIENT,{
+	end;
+OnInstanceInit:
+	monster instance_mapname("1@ma_h"),131,62,"Bangungot",2318,1;
+	end;
+OnEnable:
+	mapannounce instance_mapname("1@ma_h"),"Moaning Patient: aaawwww....",bc_map,"0xFF0000";
+	initnpctimer;
+	end;
+OnTimer5000:
+OnTimer8000:
+OnTimer11000:
+OnTimer14000:
+OnTimer17000:
+OnTimer20000:
+OnTimer23000:
+OnTimer26000:
+	specialeffect EF_POTION_BERSERK;
+	specialeffect EF_CURSEATTACK;
+	end;
+OnTimer30000:
+	specialeffect EF_POTION_BERSERK;
+	specialeffect EF_CURSEATTACK;
+	stopnpctimer;
+	end;
+}
+
+1@ma_h,60,87,4	script	Screaming Patient#2	4_M_PATIENT,{
+	end;
+OnEnable:
+	switch(atoi(strnpcinfo(2))) {
+		case 2: set .@str$,"Screaming Patient: Aaaaargh!!"; break;
+		case 3: set .@str$,"Patient in Pain: Oooooowwww!! It's killing me!!!"; break;
+		case 4: set .@str$,"Passed Out Patient: ........"; break;
+		case 5: set .@str$,"Patient with Nightmare: Help~!!! Save me!!!"; break;
+		case 6: set .@str$,"Sick Looking Patient: Hu..a...aaah.."; break;
+		case 7: set .@str$,"Horrified Patient: Get away!! Please...."; break;
+		case 8: set .@str$,"Patient in Sorrow: crying and crying......"; break;
+		case 9: set .@str$,"Suffering Patient: Stop... please..."; break;
+		case 10: set .@str$,"Wriggling Patient: awwww..."; break;
+		case 11: set .@str$,"Patient in Cold Sweat: Help.....help...."; break;
+		case 12: set .@str$,"Howling Patient: aaaaahhhhhhhhhh!!"; break;
+	}
+	mapannounce instance_mapname("1@ma_h"),.@str$,bc_map,"0xFF0000";
+	initnpctimer;
+	end;
+OnTimer5000:
+OnTimer8000:
+OnTimer11000:
+OnTimer14000:
+OnTimer17000:
+OnTimer20000:
+OnTimer23000:
+OnTimer26000:
+	specialeffect EF_POTION_BERSERK;
+	specialeffect EF_CURSEATTACK;
+	end;
+OnTimer30000:
+	specialeffect EF_POTION_BERSERK;
+	specialeffect EF_CURSEATTACK;
+	stopnpctimer;
+	end;
+}
+1@ma_h,60,39,7	duplicate(Screaming Patient#2)	Patient in Pain#3	4_F_PATIENT
+1@ma_h,43,39,7	duplicate(Screaming Patient#2)	Passed Out Patient#4	4_M_PATIENT
+1@ma_h,77,86,4	duplicate(Screaming Patient#2)	Patient with Nightmare#5	4_F_PATIENT
+1@ma_h,69,87,4	duplicate(Screaming Patient#2)	Sick Looking Patient#6	4_M_PATIENT
+1@ma_h,73,39,7	duplicate(Screaming Patient#2)	Horrified Patient#7	4_F_PATIENT
+1@ma_h,65,51,7	duplicate(Screaming Patient#2)	Patient in Sorrow#8	4_M_PATIENT
+1@ma_h,87,86,4	duplicate(Screaming Patient#2)	Suffering Patient#9	4_F_PATIENT
+1@ma_h,104,86,4	duplicate(Screaming Patient#2)	Wriggling Patient#10	4_M_PATIENT
+1@ma_h,99,39,7	duplicate(Screaming Patient#2)	Patient in Cold Sweat#11	4_F_PATIENT
+1@ma_h,87,39,7	duplicate(Screaming Patient#2)	Howling Patient#12	4_M_PATIENT
+
+1@ma_h,43,181,4	script	Moaning Patient#b	4_F_PATIENT,{ end; }
+1@ma_h,60,182,4	script	Screaming Patient#b	4_M_PATIENT,{ end; }
+1@ma_h,60,132,7	script	Patient in Pain#b	4_F_PATIENT,{ end; }
+1@ma_h,43,132,7	script	Passed Out Patient#b	4_M_PATIENT,{ end; }
+1@ma_h,77,182,4	script	Patient with Nightmare#b	4_F_PATIENT,{ end; }
+1@ma_h,69,182,4	script	Sick Looking Patient#b	4_M_PATIENT,{ end; }
+1@ma_h,73,132,7	script	Horrified Patient#b	4_F_PATIENT,{ end; }
+1@ma_h,65,144,7	script	Patient in Sorrow#b	4_M_PATIENT,{ end; }
+1@ma_h,87,181,4	script	Suffering Patient#b	4_F_PATIENT,{ end; }
+1@ma_h,104,181,4	script	Wriggling Patient#b	4_M_PATIENT,{ end; }
+1@ma_h,99,132,7	script	Patient in Cold Sweat#b	4_F_PATIENT,{ end; }
+1@ma_h,87,132,7	script	Howling Patient#b	4_M_PATIENT,{ end; }
+
+// Warp Portals
+//============================================================
+1@ma_h,35,156,0	warp	#Boss Room Exit	2,2,ma_dun01,150,9
+1@ma_h,105,157,0	warp	#Boss Room Door	2,2,1@ma_h,116,157
+1@ma_h,112,157,0	warp	#Boss Room Door1	2,2,1@ma_h,100,157
+1@ma_h,104,63,0	warp	#Boss Room Door2	2,2,1@ma_h,117,63
+1@ma_h,112,63,0	warp	#Boss Room Door3	2,2,1@ma_h,100,63
+1@ma_h,36,157,0	warp	#Patternwarp1	7,7,1@ma_h,117,63
+1@ma_h,46,157,0	warp	#Patternwarp2	7,7,1@ma_h,117,63
+1@ma_h,57,157,0	warp	#Patternwarp3	7,7,1@ma_h,117,63
+1@ma_h,67,157,0	warp	#Patternwarp4	7,7,1@ma_h,117,63
+1@ma_h,79,157,0	warp	#Patternwarp5	7,7,1@ma_h,117,63
+1@ma_h,89,157,0	warp	#Patternwarp6	7,7,1@ma_h,117,63
+1@ma_h,100,157,0	warp	#Patternwarp7	7,7,1@ma_h,117,63
+1@ma_h,51,173,0	warp	#Patternwarp8	10,10,1@ma_h,117,63
+1@ma_h,52,140,0	warp	#Patternwarp34	10,10,1@ma_h,117,63
+1@ma_h,73,173,0	warp	#Patternwarp35	10,10,1@ma_h,117,63
+1@ma_h,73,140,0	warp	#Patternwarp36	10,10,1@ma_h,117,63
+1@ma_h,95,173,0	warp	#Patternwarp37	10,10,1@ma_h,117,63
+1@ma_h,95,140,0	warp	#Patternwarp38	10,10,1@ma_h,117,63
+//1@ma_h,70,170,0	warp	#Patternwarp39	10,10,1@ma_h,117,63
+//1@ma_h,77,169,0	warp	#Patternwarp40	10,10,1@ma_h,117,63
+1@ma_h,117,171,0	warp	#Patternwarp41	10,10,1@ma_h,117,63
+1@ma_h,131,171,0	warp	#Patternwarp42	10,10,1@ma_h,117,63
+1@ma_h,146,171,0	warp	#Patternwarp43	10,10,1@ma_h,117,63
+1@ma_h,117,157,0	warp	#Patternwarp44	10,10,1@ma_h,117,63
+1@ma_h,131,157,0	warp	#Patternwarp45	10,10,1@ma_h,117,63
+1@ma_h,146,157,0	warp	#Patternwarp46	10,10,1@ma_h,117,63
+1@ma_h,117,143,0	warp	#Patternwarp47	10,10,1@ma_h,117,63
+1@ma_h,131,143,0	warp	#Patternwarp48	10,10,1@ma_h,117,63
+1@ma_h,146,143,0	warp	#Patternwarp49	10,10,1@ma_h,117,63
+1@ma_h,36,63,0	warp	#Patternwarp10	7,7,1@ma_h,116,157
+1@ma_h,46,63,0	warp	#Patternwarp11	7,7,1@ma_h,116,157
+1@ma_h,56,63,0	warp	#Patternwarp12	7,7,1@ma_h,116,157
+1@ma_h,67,63,0	warp	#Patternwarp13	7,7,1@ma_h,116,157
+1@ma_h,78,63,0	warp	#Patternwarp14	7,7,1@ma_h,116,157
+1@ma_h,89,63,0	warp	#Patternwarp15	7,7,1@ma_h,116,157
+1@ma_h,100,63,0	warp	#Patternwarp16	7,7,1@ma_h,116,157
+1@ma_h,51,79,0	warp	#Patternwarp17	10,10,1@ma_h,116,157
+1@ma_h,51,46,0	warp	#Patternwarp18	10,10,1@ma_h,116,157
+1@ma_h,73,80,0	warp	#Patternwarp19	10,10,1@ma_h,116,157
+1@ma_h,73,46,0	warp	#Patternwarp20	10,10,1@ma_h,116,157
+1@ma_h,95,79,0	warp	#Patternwarp21	10,10,1@ma_h,116,157
+1@ma_h,95,46,0	warp	#Patternwarp22	10,10,1@ma_h,116,157
+//1@ma_h,193,82,0	warp	#Patternwarp23	7,7,1@ma_h,116,157
+//1@ma_h,193,82,0	warp	#Patternwarp24	7,7,1@ma_h,116,157
+1@ma_h,117,77,0	warp	#Patternwarp25	10,10,1@ma_h,116,157
+1@ma_h,131,77,0	warp	#Patternwarp26	10,10,1@ma_h,116,157
+1@ma_h,146,77,0	warp	#Patternwarp27	10,10,1@ma_h,116,157
+1@ma_h,117,63,0	warp	#Patternwarp28	10,10,1@ma_h,116,157
+1@ma_h,131,63,0	warp	#Patternwarp29	10,10,1@ma_h,116,157
+1@ma_h,146,63,0	warp	#Patternwarp30	10,10,1@ma_h,116,157
+1@ma_h,117,49,0	warp	#Patternwarp31	10,10,1@ma_h,116,157
+1@ma_h,131,49,0	warp	#Patternwarp32	10,10,1@ma_h,116,157
+1@ma_h,146,49,0	warp	#Patternwarp33	10,10,1@ma_h,116,157
+
+// Disable select warps.
+// Custom, but saves processing and lines.
+1@ma_h,1,1,0	script	#ma_hos_warp_init	CLEAR_NPC,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#Boss Room Exit");
+	disablenpc instance_npcname("#Boss Room Door");
+	disablenpc instance_npcname("#Boss Room Door1");
+	for(set .@i,1; .@i<=8; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	for(set .@i,34; .@i<=38; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	// Skip 39-40 since they're disabled in the official script.
+	for(set .@i,41; .@i<=49; set .@i,.@i+1)
+		disablenpc instance_npcname("#Patternwarp"+.@i);
+	disablenpc instance_npcname("#ma_hos_warp_init");
+	end;
+}
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
new file mode 100644
index 000000000..0a26dab9c
--- /dev/null
+++ b/npc/re/instances/BuwayaCave.txt
@@ -0,0 +1,459 @@
+//===== Hercules Script ======================================
+//= Buwaya Cave
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Defeat Buwaya in his cave.
+//= Part of the "Secret in the Woods" quest.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+1@ma_c	mapflag	src4instance
+//============================================================
+ma_fild02,312,317,5	script	Guard#buwaya_cave	4_MAL_SOLDIER,{
+	if (BaseLevel < 130) {
+		mes "[Guard]";
+		mes "People under ^ff0000level 130^000000";
+		mes "cannot enter this place.";
+		mes "This place is dangerous. Please go back.";
+		close;
+	}
+
+	set .@party_id,getcharid(1);
+	set .@md_name$,"Buwaya Cave";
+
+	if (!.@party_id) {
+		mes "[Guard]";
+		mes "Buwaya is dangerous.";
+		mes "Please come back after you form a";
+		mes "team with other people.";
+		close;
+	}
+	if (getcharid(0) == getpartyleader(.@party_id,2)) {
+		mes "[Guard]";
+		mes "This place is dangerous. Please go back.";
+		mes "If you dont have any business here, please go back.";
+		next;
+		while(1) {
+			switch(select("Why is it so dangerous?:I'm here to hunt down Buwaya.:End conversation.")) {
+			case 1:
+				mes "[Guard]";
+				mes "Recently, there has been a case";
+				mes "where villagers have disappeared.";
+				mes "After investigating the tracks, ";
+				mes "we found out the giant monster Buwaya";
+				mes "was responsible.";
+				next;
+				mes "[Guard]";
+				mes "Soldiers and mercenaries have been dispatched to ";
+				mes "hunt down Buwaya, but were never";
+				mes "completely successful.";
+				next;
+				mes "[Guard]";
+				mes "Buwaya is still kidnapping";
+				mes "the villagers to this day.";
+				mes "Please gather some people to get rid of Buwaya.";
+				next;
+				break;
+			case 2:
+				set .@playtime, checkquest(4229,PLAYTIME);
+				if (.@playtime == -1) {
+					// fall through
+				} else if (.@playtime == 0 || .@playtime == 1) {
+					mes "[Guard]";
+					mes "Buwaya is still hiding.";
+					mes "Even if you enter now, Buwaya will not come out. ";
+					mes "Please come back later.";
+					close;
+				} else {
+					erasequest 4229;
+					// fall through
+				}
+				set .@instance,instance_create(.@md_name$,.@party_id);
+				if (.@instance < 0) {
+					mes "[Guard]";
+					mes "Party name is... "+getpartyname(.@party_id)+".";;
+					mes "Party leader is... "+strcharinfo(0);
+					mes "^0000ff"+.@md_name$+"^000000 cannot be opened now.";
+					mes "Please try a moment later.";
+					close;
+				}
+				if (instance_attachmap("1@ma_c",.@instance) == "") {
+					mes "^0000ff"+.@md_name$+"^000000 - Reservation Failed!";
+					instance_destroy(.@instance);
+					close;
+				}
+				instance_set_timeout 3600,300,.@instance;
+				instance_init(.@instance);
+				
+				mes "[Guard]";
+				mes "I will open up the tunnel to ^0000ff"+.@md_name$+"^000000.";
+				mes "I wish you good luck.";
+				close;
+			case 3:
+				mes "[Guard]";
+				mes "This place is dangerous. You cannot enter.";
+				close;
+			}
+		}
+	} else {
+		mes "[Guard]";
+		mes "Let me talk with the party leader.";
+		mes "Please call forth the leader.";
+		close;
+	}
+}
+
+ma_fild02,315,323,0	script	Cave Entrance#buwaya	WARPNPC,2,2,{
+	end;
+OnTouch:
+	if (BaseLevel < 130) {
+		mes "[Guard]";
+		mes "People under ^ff0000level 130^000000";
+		mes "cannot enter this place.";
+		mes "This place is dangerous. Please go back.";
+		close;
+	}
+	set .@playtime, checkquest(4229,PLAYTIME);
+	if (.@playtime == -1) {
+		// fall through
+	} else if (.@playtime == 0 || .@playtime == 1) {
+		mes "[Guard]";
+		mes "Buwaya is still hiding.";
+		mes "Even if you enter now, Buwaya will not come out.";
+		mes "Please come back later.";
+		close;
+	} else {
+		erasequest 4229;
+		// fall through
+	}
+	switch(select("Enter.:Turn back.")) {
+	case 1:
+		if( has_instance("1@ma_c") == "" ) {
+			mes "The memorial dungeon Buwaya Cave does not exist.";
+			mes "The party leader did not generate the dungeon yet.";
+			close;
+		} else {
+			mapannounce "ma_fild02",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member began hunting Buwaya in Buwaya Cave.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+			setquest 4229;
+			warp "1@ma_c",35,57;
+			end;
+		}
+	case 2:
+		mes "[Guard]";
+		mes "You must value your life.";
+		mes "It is better to think carefully before you act.";
+		close;
+	}
+}
+
+1@ma_c,33,112,0	script	#damage	HIDDEN_WARP_NPC,7,7,{
+	end;
+OnInstanceInit:
+	initnpctimer;
+	disablenpc instance_npcname("#damage");
+	end;
+OnTimer1000:
+	enablenpc instance_npcname("#damage");
+	specialeffect EF_POISONHIT;
+	end;
+OnTimer2000:
+	stopnpctimer;
+	initnpctimer;
+	disablenpc instance_npcname("#damage");
+	end;
+OnTouch:
+	percentheal -10,-10;
+	sc_start SC_BLOODING,60000,0;
+	sc_start SC_POISON,60000,0;
+	end;
+}
+
+1@ma_c,29,110,5	script	Kidnapped People#1	4_F_BARYO_OLD,{
+	mes "[Kidnapped Residents]";
+	mes "Buwaya was running around,";
+	mes "and new people got caught.";
+	mes "We will be stuck in here for the rest of our lives.";
+	next;
+	switch(select("Get me outta here!!:Ca...can't escape?")) {
+	case 1:
+		mes "[Kidnapped Residents]";
+		mes "We don't have enough power to destroy it but Buwaya has a weakness.";
+		mes "Look at the wall over there.";
+		mes "If you knock there, Buywaya will feel pain and spit you out.";
+		donpcevent instance_npcname("#box_mob_call")+"::OnEnable";
+		close2;
+		disablenpc instance_npcname("Kidnapped People#1");
+		end;
+	case 2:
+		mes "[Kidnapped People]";
+		mes "Somthing is wrong here...";
+		mes "Have you experienced this before?";
+		close;
+	}
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("Kidnapped People#1");
+	end;
+OnEnable:
+	enablenpc instance_npcname("Kidnapped People#1");
+	donpcevent instance_npcname("#box_mob_call")+"::OnDisable";
+	end;
+}
+
+1@ma_c,36,110,5	script	Kidnapped People#2	4_M_BARYO_OLD,{
+	mes "[Kidnapped Residents]";
+	mes "Ahaa! I wish I had a little more power...";
+	mes "I know its weakness...";
+	next;
+	switch(select("Tell me.:Do you really know?")) {
+	case 1:
+		mes "[Kidnapped Residents]";
+		mes "Are you sure you can do it...?";
+		mes "Ok, listen carefully,";
+		mes "its weakness is...";
+		next;
+		mes "[Kidnapped Residents]";
+		mes "...behind us on the walls.";
+		sc_start SC_ATKPOTION,60000,45;
+		sc_start SC_MATKPOTION,60000,45;
+		disablenpc instance_npcname("Kidnapped People#2");
+		close;
+	case 2:
+		mes "[Kidnapped Residents]";
+		mes "WHAT?!";
+		mes "Are you ignoring me";
+		mes "because I'm captured in here?";
+		close;
+	}
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("Kidnapped People#2");
+	end;
+OnEnable:
+	enablenpc instance_npcname("Kidnapped People#2");
+	end;
+}
+
+1@ma_c,3,3,0	script	#box_mob_call	HIDDEN_WARP_NPC,1,1,{
+	end;
+OnInstanceInit:
+	setcell instance_mapname("1@ma_c"),30,118,35,118,cell_shootable,1; //custom
+	disablenpc instance_npcname("#box_mob_call");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#box_mob_call");
+	set .@label$, instance_npcname("#box_mob_call")+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@ma_c");
+	monster .@map$,30,118,"Buwaya's Weakness",2333,1,.@label$;
+	monster .@map$,35,118,"Buwaya's Weakness",2333,1,.@label$;
+	end;
+OnDisable:
+	killmonster instance_mapname("1@ma_c"),instance_npcname("#box_mob_call")+"::OnMyMobDead";
+	disablenpc instance_npcname("#box_mob_call");
+	end;
+OnMyMobDead:
+	if (mobcount(instance_mapname("1@ma_c"),instance_npcname("#box_mob_call")+"::OnMyMobDead") < 1)
+		donpcevent instance_npcname("#box_out")+"::OnEnable";
+	end;
+}
+
+1@ma_c,38,118,0	script	#box_out	WARPNPC,2,2,{
+OnInstanceInit:
+OnDisable:
+	disablenpc instance_npcname("#box_out");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#box_out");
+	end;
+OnTouch:
+	set .@x, rand(1,20) + 97;
+	set .@y, rand(1,20) + 74;
+	warp instance_mapname("1@ma_c"),.@x,.@y;
+	end;
+}
+
+1@ma_c,97,74,0	script	#box_call	HIDDEN_WARP_NPC,50,50,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("#box_call");
+	initnpctimer;
+	end;
+OnTimer30000:
+	mapannounce instance_mapname("1@ma_c"),"Buwaya : I will put you in my treasure box!",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+	// Should execute OnTimer33000, but client doesn't render the effect fast enough.
+	for(set .@i,1; .@i<=9; set .@i,.@i+1)
+		donpcevent instance_npcname("#yunobi"+.@i)+"::OnEnable";
+	end;
+OnTimer33000:
+	donpcevent instance_npcname("#box_out")+"::OnDisable";
+	donpcevent instance_npcname("#box_mob_call")+"::OnDisable";
+	donpcevent instance_npcname("Kidnapped People#1")+"::OnEnable";
+	donpcevent instance_npcname("Kidnapped People#2")+"::OnEnable";
+	end;
+OnTimer34000:
+	enablenpc instance_npcname("#box_call");
+	end;
+OnTimer35000:
+	stopnpctimer;
+	initnpctimer;
+	disablenpc instance_npcname("#box_call");
+	end;
+OnTouch:
+	specialeffect2 EF_GUIDEDATTACK;
+	warp instance_mapname("1@ma_c"),33,112;
+	end;
+OnDisable:
+	stopnpctimer;
+	disablenpc instance_npcname("#box_call");
+	end;
+}
+
+1@ma_c,97,74,0	script	#yunobi1	HIDDEN_WARP_NPC,{
+	end;
+OnInstanceInit:
+	hideonnpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable:
+	specialeffect EF_MAPPILLAR2;
+	end;
+}
+1@ma_c,97,94,0	duplicate(#yunobi1)	#yunobi2	HIDDEN_WARP_NPC
+1@ma_c,117,94,0	duplicate(#yunobi1)	#yunobi3	HIDDEN_WARP_NPC
+1@ma_c,117,74,0	duplicate(#yunobi1)	#yunobi4	HIDDEN_WARP_NPC
+1@ma_c,117,54,0	duplicate(#yunobi1)	#yunobi5	HIDDEN_WARP_NPC
+1@ma_c,97,54,0	duplicate(#yunobi1)	#yunobi6	HIDDEN_WARP_NPC
+1@ma_c,77,54,0	duplicate(#yunobi1)	#yunobi7	HIDDEN_WARP_NPC
+1@ma_c,77,74,0	duplicate(#yunobi1)	#yunobi8	HIDDEN_WARP_NPC
+1@ma_c,77,94,0	duplicate(#yunobi1)	#yunobi9	HIDDEN_WARP_NPC
+
+1@ma_c,1,1,0	script	#bunshin	HIDDEN_WARP_NPC,{
+	end;
+OnInstanceInit:
+	initnpctimer;
+	end;
+OnTimer58000:
+	mapannounce instance_mapname("1@ma_c"),"Buwaya : I had enough with this, let's go till the end!",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+	end;
+OnTimer61000:
+	mapannounce instance_mapname("1@ma_c"),"Buwaya : This is!",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+	end;
+OnTimer62000:
+	mapannounce instance_mapname("1@ma_c"),"Buwaya : This is...MY!",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+	end;
+OnTimer63000:
+	mapannounce instance_mapname("1@ma_c"),"Buwaya : This is...MY...Deadly!",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+	end;
+OnTimer64000:
+	mapannounce instance_mapname("1@ma_c"),"Buwaya : This is...MY...Deadly... ATTACK!",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+	end;
+OnTimer65000:
+	set .@label$, instance_npcname("#bunshin")+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@ma_c");
+	areamonster .@map$,112,89,122,99,"Buwaya",2332,1,.@label$;
+	areamonster .@map$,112,49,122,59,"Buwaya",2332,1,.@label$;
+	areamonster .@map$,72,49,82,59,"Buwaya",2332,1,.@label$;
+	areamonster .@map$,72,89,82,99,"Buwaya",2332,1,.@label$;
+	end;
+OnTimer66000:
+	mapannounce instance_mapname("1@ma_c"),"Buwaya : Are you scared?",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+	end;
+OnTimer105000:
+	killmonster instance_mapname("1@ma_c"),instance_npcname("#bunshin")+"::OnMyMobDead";
+	stopnpctimer;
+	initnpctimer;
+	end;
+OnMyMobDead:
+	if (mobcount(instance_mapname("1@ma_c"),instance_npcname("#bunshin")+"::OnMyMobDead") < 1) {
+		stopnpctimer;
+		initnpctimer;
+	}
+	end;
+OnDisable:
+	stopnpctimer;
+	killmonster instance_mapname("1@ma_c"),instance_npcname("#bunshin")+"::OnMyMobDead";
+	disablenpc instance_npcname("#bunshin");
+	end;
+}
+
+1@ma_c,2,2,0	script	#buwaya_con	HIDDEN_WARP_NPC,{
+	end;
+OnInstanceInit:
+	areamonster instance_mapname("1@ma_c"),90,67,104,81,"Buwaya",2319,1,instance_npcname("#buwaya_con")+"::OnMyMobDead";
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@ma_c");
+	if (mobcount(.@map$,instance_npcname("#buwaya_con")+"::OnMyMobDead") < 1) {
+		donpcevent instance_npcname("#box_call")+"::OnDisable";
+		donpcevent instance_npcname("#bunshin")+"::OnDisable";
+		donpcevent instance_npcname("#exit_mob")+"::OnDisable";
+		donpcevent instance_npcname("#cave_out")+"::OnEnable";
+		mapannounce .@map$,"Guard : You did great work. Please hurry up and escape to the way you came in!",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+	}
+	end;
+}
+
+1@ma_c,3,3,0	script	#exit_mob	HIDDEN_WARP_NPC,{
+	end;
+OnInstanceInit:
+	initnpctimer;
+	end;
+OnTimer60000:
+	set .@label$, instance_npcname("#exit_mob")+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@ma_c");
+	if (mobcount(.@map$,.@label$) < 30)
+		set .@amount,10;
+	else
+		set .@amount,1;
+	areamonster .@map$,43,58,47,60,"Water Plant",2331,.@amount,.@label$;
+	areamonster .@map$,43,58,47,60,"Egg",2329,.@amount,.@label$;
+	stopnpctimer;
+	initnpctimer;
+	end;
+OnDisable:
+	stopnpctimer;
+	killmonster instance_mapname("1@ma_c"),instance_npcname("#exit_mob")+"::OnMyMobDead";
+	disablenpc instance_npcname("#exit_mob");
+	end;
+OnMyMobDead:
+	end;
+}
+
+1@ma_c,28,57,0	script	#cave_out	WARPNPC,2,2,{
+OnInstanceInit:
+	disablenpc instance_npcname("#cave_out");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#cave_out");
+	end;
+OnTouch:
+	mes "Would like to go out?";
+	next;
+	if(select("Yes!:No, I will stay.") == 1)
+		warp "ma_fild02",315,315;
+	close;
+}
+
+1@ma_c,1,1,0	script	#buwaya_spawn_mobs	-1,{
+OnInstanceInit:
+	set .@map$, instance_mapname("1@ma_c");
+	areamonster .@map$,73,81,93,101,"Seaweed",2331,18;
+	areamonster .@map$,110,97,116,103,"Seaweed",2331,8;
+	areamonster .@map$,59,63,63,67,"Seaweed",2331,8;
+	areamonster .@map$,73,55,77,59,"Seaweed",2331,4;
+	areamonster .@map$,103,69,107,73,"Seaweed",2331,4;
+	areamonster .@map$,108,45,122,63,"Seaweed",2331,15;
+	areamonster .@map$,73,81,93,101,"Buwaya's Egg",2329,10;
+	areamonster .@map$,110,97,116,103,"Buwaya's Egg",2329,8;
+	areamonster .@map$,59,63,63,67,"Buwaya's Egg",2329,4;
+	areamonster .@map$,73,55,77,59,"Buwaya's Egg",2329,3;
+	areamonster .@map$,103,69,107,73,"Buwaya's Egg",2329,3;
+	areamonster .@map$,108,45,122,63,"Buwaya's Egg",2329,15;
+	monster .@map$,0,0,"Seaweed",2331,5;
+	monster .@map$,0,0,"Buwaya's Slave",2330,5;
+	end;
+}
diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index cecdadd20..0c32c73c6 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -3,20 +3,22 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.1
 //===== Description: =========================================
 //= [Official Conversion]
 //= Cross through the Hazy Forest to reach the Bifrost.
-//= Contains the Wandering Guardian quest.
+//= Contains the "Wandering Guardian" quest.
 //===== Additional Comments: =================================
 //= 1.0 First version. [Euphy]
+//= 1.1 Instance system rewrite. [Euphy]
+//============================================================
+
+1@mist	mapflag	src4instance
 //============================================================
 
 // Instance Creation
 //============================================================
-bif_fild01,158,340,5	script	Laphine Soldier#mist	447,{
+bif_fild01,158,340,5	script	Laphine Soldier#mist	4_M_FAIRYSOLDIER,{
 
 	set .@party_id,getcharid(1);
 	set .@md_name$,"Mistwood Maze";
@@ -79,71 +81,39 @@ bif_fild01,158,340,5	script	Laphine Soldier#mist	447,{
 		next;
 		switch(select("Venture into the Hazy Forest.:Give up.")) {
 		case 1:
-			set .@instance, instance_create(.@md_name$,.@party_id);
-			if (.@instance >= 0) {
-				if (instance_attachmap("1@mist",.@instance) != "") {
-
-					instance_attach(.@instance);
-					instance_set_timeout 7200,300,.@instance;
-					instance_init(.@instance);
-
-					donpcevent instance_npcname("#Whisper_mist", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Tom's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Tomba's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Remi's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Tired Rem's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Ron's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Rover's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Mona's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Namon's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Sad Neoron's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Spyder's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Tito's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Pumba's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Tete's Garden Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("The Gardeners' Tree", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Dragon Herder", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Mysterious Young Man#mis", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Loki#mist", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("Collapsed Girl#mist", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Mist Mobs Respawn1", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Mist Mobs Respawn2", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Mist Mobs Respawn3", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Mist Mobs Respawn4", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Mist Mobs Respawn5", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#Fragments of Memory", instance_id())+"::OnInstanceInit";
-					donpcevent instance_npcname("#mist_warp_init", instance_id())+"::OnInstanceInit";
-
-					mes "[Laphine Soldier]";
-					mes "Party Name "+getpartyname(.@party_id)+"...";
-					mes "Party Leader "+strcharinfo(0)+"...";
-					mes "I've got it. I've written them down on the report here.";
-					next;
-					mes "[Laphine Soldier]";
-					mes "You'll get permission soon.";
-					mes "Now go to the log tunnel, the only way to get into the Hazy Forest.";
-					mes "You understand?";
-					next;
-					mes "[Laphine Soldier]";
-					mes "We can't go against the forest,";
-					mes "but maybe you humans can.";
-					mes "Good luck!";
-					close;
-				} else
-					instance_destroy(.@instance);
-			}
 			mes "[Laphine Soldier]";
 			mes "Party Name "+getpartyname(.@party_id)+"...";
 			mes "Party Leader "+strcharinfo(0)+"...";
-			mes "Hmm...";
-			next;
-			mes "[Laphine Soldier]";
-			if (.@playtime == -1)
-				mes "It's dangerous in the forest.";
-			else
-				mes "The atmosphere is somewhat tense in the forest.";
-			mes "...Why don't you just go back today?";
-			close;
+			set .@instance, instance_create(.@md_name$, .@party_id);
+			if (.@instance < 0) {
+				mes "Hmm...";
+				next;
+				mes "[Laphine Soldier]";
+				if (.@playtime == -1)
+					mes "It's dangerous in the forest.";
+				else
+					mes "The atmosphere is somewhat tense in the forest.";
+				mes "...Why don't you just go back today?";
+				close;
+			}
+			if (instance_attachmap("1@mist",.@instance) != "") {
+				instance_set_timeout 7200,300,.@instance;
+				instance_init(.@instance);
+				mes "I've got it. I've written them down on the report here.";
+				next;
+				mes "[Laphine Soldier]";
+				mes "You'll get permission soon.";
+				mes "Now go to the log tunnel, the only way to get into the Hazy Forest.";
+				mes "You understand?";
+				next;
+				mes "[Laphine Soldier]";
+				mes "We can't go against the forest,";
+				mes "but maybe you humans can.";
+				mes "Good luck!";
+				close;
+			} else {
+				instance_destroy(.@instance);
+			}
 		case 2:
 			mes "[Laphine Soldier]";
 			mes "Well, you've made the right decision.";
@@ -171,21 +141,12 @@ bif_fild01,158,340,5	script	Laphine Soldier#mist	447,{
 	}
 }
 
-bif_fild01,161,355,0	script	Log Tunnel	844,{
+bif_fild01,161,355,0	script	Log Tunnel	CLEAR_NPC,{
 	mes "I see the forest through the log tunnel.";
 	mes "It looks like I can enter the forest through the log tunnel.";
 	next;
 	if(select("Enter the tunnel.:Give up.") == 2)
 		close;
-	// TODO: Add official MD_Enter cases.
-	if (!getcharid(1)) {
-		mes "[Laphine Soldier]";
-		mes "Hey, look!";
-		mes "Are you going alone?";
-		mes "That's impossible. Too rash.";
-		mes "Team up with some friends and go together!";
-		close;
-	}
 	set .@playtime, checkquest(7211,PLAYTIME);
 	if (has_instance("1@mist") == "") {
 		if (.@playtime == 0 || .@playtime == 1) {
@@ -196,347 +157,350 @@ bif_fild01,161,355,0	script	Log Tunnel	844,{
 		mes "The world beyond the log tunnel looks dark and suffocating.";
 		mes "Your instinct is screaming that this forest is dangerous.";
 		close;
+	} else {
+		if (checkquest(7211,PLAYTIME) == 2) erasequest 7211;
+		if (checkquest(7211,PLAYTIME) == -1) setquest 7211;
+		mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+		warp "1@mist",89,29;
+		close;
 	}
-	if (.@playtime == 2) erasequest 7211;
-	if (checkquest(7211,PLAYTIME) == -1) setquest 7211;
-	mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
-	warp "1@mist",89,29;
-	close;
 }
 
 // Instance Scripts
 //============================================================
-1@mist,89,29,0	script	#Whisper_mist	844,1,1,{
+1@mist,89,29,0	script	#Whisper_mist	CLEAR_NPC,1,1,{
 	end;
 OnInstanceInit:
-	enablenpc instance_npcname("#Whisper_mist", instance_id());
+	enablenpc instance_npcname("#Whisper_mist");
 	end;
 OnTouch:
-	disablenpc instance_npcname("#Whisper_mist", instance_id());
+	disablenpc instance_npcname("#Whisper_mist");
 	initnpctimer;
 	end;
 OnTimer10000:
 OnTimer20000:
-	instance_announce 0,"Whisper: Who's this? Who's this!? The forest is open! Tom, Tomba, Tired Rem, Remi! Wake up!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Whisper: Who's this? Who's this!? The forest is open! Tom, Tomba, Tired Rem, Remi! Wake up!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	end;
 OnTimer60000:
-	instance_announce 0,"Loud Whisper: What are the forest keepers doing? What are the gardeners doing??",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Loud Whisper: What are the forest keepers doing? What are the gardeners doing??",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	end;
 OnTimer120000:
-	instance_announce 0,"Loud Whisper: Don't go out, wander around forever, and play with us!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Loud Whisper: Don't go out, wander around forever, and play with us!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	end;
 OnTimer180000:
-	instance_announce 0,"Loud Whisper: Useless, useless. Wandering around and around, you'll meet your end!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Loud Whisper: Useless, useless. Wandering around and around, you'll meet your end!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	stopnpctimer;
 	end;
 }
 
 // callfunc "F_Mora_Mist",<warp to enable>,<success message>,<fail message>{,<end flag>}
 function	script	F_Mora_Mist	{
-	if (mobcount("1@mist",instance_npcname(strnpcinfo(0), instance_id())+"::OnMyMobDead") == 0) {
+	set .@map$, instance_mapname("1@mist");
+	if (mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead") == 0) {
 		mes "Obviously no one is taking care of it.";
 		mes "It seems like you can chop down the garden tree.";
 		next;
 		if(select("Chop down the garden tree.:Give up.") == 2)
 			close;
 		mes "You chop down the tree, which was blocking the path of the maze, "+((getarg(3,0))?"clearing the way out of the forest.":"so now you can continue.");
-		instance_announce 0,getarg(1),bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
-		enablenpc instance_npcname(getarg(0), instance_id());
-		disablenpc instance_npcname(strnpcinfo(0), instance_id());
+		mapannounce .@map$,getarg(1),bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+		enablenpc instance_npcname(getarg(0));
+		disablenpc instance_npcname(strnpcinfo(0));
 		close;
 	} else
-		instance_announce 0,((getarg(3,0))?getarg(2):getarg(2)+"'s Cry: Huh? Who's doing bad things to my tree?!"),bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+		mapannounce .@map$,((getarg(3,0))?getarg(2):getarg(2)+"'s Cry: Huh? Who's doing bad things to my tree?!"),bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	end;
 }
 
-1@mist,251,121,3	script	Tom's Garden	858,{ end; }
-1@mist,247,123,0	script	Tom's Garden Tree	527,{
+1@mist,251,121,3	script	Tom's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,247,123,0	script	Tom's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"a25_a18-1",
 		"Roaring Cry: Tom's bolt is broken! Watch out, Tomba! Watch out, Tomba!",
 		"Tom";
 	end;
 OnInstanceInit:
-	monster "1@mist",249,120,"Tom",2136,1,instance_npcname("Tom's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),249,120,"Tom",2136,1,instance_npcname("Tom's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,226,95,3	script	Tomba's Garden	858,{ end; }
-1@mist,225,98,0	script	Tomba's Garden Tree	527,{
+1@mist,226,95,3	script	Tomba's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,225,98,0	script	Tomba's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"a27-2_af1-2",
 		"Roaring Cry: Tomba's Garden Tree is gone with Tomba. Remi, what are you going to do now?",
 		"Tomba";
 	end;
 OnInstanceInit:
-	monster "1@mist",200,64,"Tomba",2136,1,instance_npcname("Tomba's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),200,64,"Tomba",2136,1,instance_npcname("Tomba's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,157,183,3	script	Remi's Garden	858,{ end; }
-1@mist,159,184,0	script	Remi's Garden Tree	527,{
+1@mist,157,183,3	script	Remi's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,159,184,0	script	Remi's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"a15-2_a4-1",
 		"Roaring Cry: Remi, Remi's Garden Tree was chopped down- Rem, it's your turn next. Poor Rem!",
 		"Remi";
 	end;
 OnInstanceInit:
-	monster "1@mist",154,184,"Remi the Tired",2137,1,instance_npcname("Remi's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),154,184,"Remi the Tired",2137,1,instance_npcname("Remi's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,58,39,3	script	Tired Rem's Garden	858,{ end; }
-1@mist,61,39,0	script	Tired Rem's Garden Tree	527,{
+1@mist,58,39,3	script	Tired Rem's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,61,39,0	script	Tired Rem's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"a4-2_a11",
 		"Rem's Desperate Cry: Argh... Rem will sleep. Rem will sleep now, and won't wake up forever!",
 		"Rem";
 	end;
 OnInstanceInit:
-	monster "1@mist",101,107,"Rem the Gardener",2136,1,instance_npcname("Tired Rem's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),101,107,"Rem the Gardener",2136,1,instance_npcname("Tired Rem's Garden Tree")+"::OnMyMobDead";
 	end;
 OnTimer10000:
-	instance_announce 0,"Whisper of the Forest: So Tom's, Tomba's, Remi's, and Rem's garden trees were all chopped down?",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Whisper of the Forest: So Tom's, Tomba's, Remi's, and Rem's garden trees were all chopped down?",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	end;
 OnTimer15000:
-	instance_announce 0,"Whisper of the Forest: Trouble, trouble, we're in big trouble.",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Whisper of the Forest: Trouble, trouble, we're in big trouble.",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	end;
 OnTimer20000:
-	instance_announce 0,"Loud Whisper: They've come to the second deepest forest. Gardeners of the deep forest, watch out!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Loud Whisper: They've come to the second deepest forest. Gardeners of the deep forest, watch out!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	stopnpctimer;
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,227,179,3	script	Ron's Garden	858,{ end; }
-1@mist,230,179,0	script	Ron's Garden Tree	527,{
+1@mist,227,179,3	script	Ron's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,230,179,0	script	Ron's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b4-2_b2",
 		"Ron the Gardener's Cry: I'm getting off work! Don't look for Ron, the second gardener, any more!!",
 		"Ron";
 	end;
 OnInstanceInit:
-	monster "1@mist",227,178,"Ron the Gardener",2134,1,instance_npcname("Ron's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),227,178,"Ron the Gardener",2134,1,instance_npcname("Ron's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,288,226,3	script	Rover's Garden	858,{ end; }
-1@mist,285,225,0	script	Rover's Garden Tree	527,{
+1@mist,288,226,3	script	Rover's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,285,225,0	script	Rover's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b7_bf1-2",
 		"Roaring Whisper: Ron's, and Rover's trees were chopped down as well. Who is forcing his way into the forest? Who is it?",
 		"Rover";
 	end;
 OnInstanceInit:
-	monster "1@mist",304,237,"Rover the Strutter",2134,1,instance_npcname("Rover's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),304,237,"Rover the Strutter",2134,1,instance_npcname("Rover's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,159,318,3	script	Mona's Garden	858,{ end; }
-1@mist,161,316,0	script	Mona's Garden Tree	527,{
+1@mist,159,318,3	script	Mona's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,161,316,0	script	Mona's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b31_b16",
 		"Clamoring Whisper: Mona the Seedseeker's garden tree is gone! Mona is gone too! Namon will be okay, because he is brave, right? Namon, are you okay?",
 		"Mona";
 	end;
 OnInstanceInit:
-	monster "1@mist",239,253,"Mona the Seedseeker",2133,1,instance_npcname("Mona's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),239,253,"Mona the Seedseeker",2133,1,instance_npcname("Mona's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,205,300,3	script	Namon's Garden	858,{ end; }
-1@mist,204,299,0	script	Namon's Garden Tree	527,{
+1@mist,205,300,3	script	Namon's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,204,299,0	script	Namon's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b27-3_bN-1",
 		"Clamoring Whisper: Brave Namon met his fate not so bravely... *giggle*",
 		"Namon";
 	end;
 OnInstanceInit:
-	monster "1@mist",89,173,"Brave Namon",2134,1,instance_npcname("Namon's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),89,173,"Brave Namon",2134,1,instance_npcname("Namon's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,219,232,3	script	Sad Neoron's Garden	858,{ end; }
-1@mist,221,236,0	script	Sad Neoron's Garden Tree	527,{
+1@mist,219,232,3	script	Sad Neoron's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,221,236,0	script	Sad Neoron's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b6-1_b33",
 		"Lamenting Whisper: Sad Neoron has become cheerful! Spyder the Superior Spider, what are you going to do? What are you going to do now?",
 		"Neoron";
 	end;
 OnInstanceInit:
-	monster "1@mist",143,265,"Sad Neoron",2137,1,instance_npcname("Sad Neoron's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),143,265,"Sad Neoron",2137,1,instance_npcname("Sad Neoron's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,206,202,3	script	Spyder's Garden	858,{ end; }
-1@mist,206,200,0	script	Spyder's Garden Tree	527,{
+1@mist,206,202,3	script	Spyder's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,206,200,0	script	Spyder's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b5_b14",
 		"Depressed Whisper: Now it's all over with the second deepest forest. Gardeners are dying out-",
 		"Spyder";
 	end;
 OnInstanceInit:
-	monster "1@mist",209,200,"Spyder the Eight-Legged",2132,1,instance_npcname("Spyder's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),209,200,"Spyder the Eight-Legged",2132,1,instance_npcname("Spyder's Garden Tree")+"::OnMyMobDead";
 	end;
 OnTimer5000:
-	instance_announce 0,"Roaring Whisper: The path is about to open. The tight bolts have been removed!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Roaring Whisper: The path is about to open. The tight bolts have been removed!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	end;
 OnTimer9000:
-	instance_announce 0,"Roaring Whisper: A forest opened, another opened, and the other is going to open as well. Tito and Pumba, they are heading your way!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Roaring Whisper: A forest opened, another opened, and the other is going to open as well. Tito and Pumba, they are heading your way!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	end;
 OnTimer13000:
-	instance_announce 0,"Roaring Whisper: Where you get after wandering around, around and around, everybody you've met while wandering around, around and around,",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Roaring Whisper: Where you get after wandering around, around and around, everybody you've met while wandering around, around and around,",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	end;
 OnTimer17000:
-	instance_announce 0,"Roaring Whisper: all the gardeners will be waiting for you, with their clippers in their hands-!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Roaring Whisper: all the gardeners will be waiting for you, with their clippers in their hands-!",bc_map,"0xccffcc"; //FW_NORMAL 12 0 0
 	stopnpctimer;
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,96,288,3	script	Tito's Garden	858,{ end; }
-1@mist,95,287,0	script	Tito's Garden Tree	527,{
+1@mist,96,288,3	script	Tito's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,95,287,0	script	Tito's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"c1_c13-1",
 		"Tito's Cry: *sob* *sob* Tito's gone now! Tito's done for! Boo hoo!!",
 		"Tito";
 	end;
 OnInstanceInit:
-	monster "1@mist",264,291,"Tito the Flipper",2133,1,instance_npcname("Tito's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),264,291,"Tito the Flipper",2133,1,instance_npcname("Tito's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,326,325,3	script	Pumba's Garden	858,{ end; }
-1@mist,324,325,0	script	Pumba's Garden Tree	527,{
+1@mist,326,325,3	script	Pumba's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,324,325,0	script	Pumba's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"c13-3_c4",
 		"Roaring Whisper: Tito the Hard Worker was defeated! Stop playing and go to work, Tete! Start working!",
 		"Pumba";
 	end;
 OnInstanceInit:
-	monster "1@mist",309,165,"Diligent Pumba",2134,1,instance_npcname("Pumba's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),309,165,"Diligent Pumba",2134,1,instance_npcname("Pumba's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,278,345,3	script	Tete's Garden	858,{ end; }
-1@mist,280,344,0	script	Tete's Garden Tree	527,{
+1@mist,278,345,3	script	Tete's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,280,344,0	script	Tete's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"c19_c4",
 		"Whisper: They are strong, strong indeed. What are we going to do now? Are there any gardeners left? Are there any?",
 		"Tete";
 	end;
 OnInstanceInit:
-	monster "1@mist",277,343,"Carefree Tete",2136,1,instance_npcname("Tete's Garden Tree", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),277,343,"Carefree Tete",2136,1,instance_npcname("Tete's Garden Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,345,186,0	script	The Gardeners' Tree	527,{
+1@mist,345,186,0	script	The Gardeners' Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"#to_bif02",
 		"Roaring Whisper: The forest will remember you! It will remember you, the one who broke the clippers of all the gardeners!",
 		"Gardeners: We're not dead, yet!!!!",1;
 	end;
 OnInstanceInit:
-	monster "1@mist",318,137,"Baby Tom",2136,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",321,137,"Tomba the Baby",2136,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",324,137,"Exhausted Remi",2137,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",319,135,"Rem the Exhausted",2136,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",323,135,"Ron the Ex-Gardener",2134,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",320,133,"Rover the Strutter",2134,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",323,133,"Mona the Seedpicker",2133,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",317,132,"Timid Namon",2134,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",326,132,"Indifferent Neoron",2137,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",317,129,"Spyder the Seven-Legged",2132,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",320,129,"Tito the Flapper",2133,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",324,129,"Lazy Pumba",2134,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
-	monster "1@mist",327,129,"Careless Tete",2136,1,instance_npcname("The Gardeners' Tree", instance_id())+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@mist");
+	monster .@map$,318,137,"Baby Tom",2136,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,321,137,"Tomba the Baby",2136,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,324,137,"Exhausted Remi",2137,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,319,135,"Rem the Exhausted",2136,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,323,135,"Ron the Ex-Gardener",2134,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,320,133,"Rover the Strutter",2134,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,323,133,"Mona the Seedpicker",2133,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,317,132,"Timid Namon",2134,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,326,132,"Indifferent Neoron",2137,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,317,129,"Spyder the Seven-Legged",2132,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,320,129,"Tito the Flapper",2133,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,324,129,"Lazy Pumba",2134,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
+	monster .@map$,327,129,"Careless Tete",2136,1,instance_npcname("The Gardeners' Tree")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
 	end;
 }
 
-1@mist,73,290,0	script	Mysterious Flower#1	844,{
+1@mist,73,290,0	script	Mysterious Flower#1	CLEAR_NPC,{
 	specialeffect EF_LEVEL99_4;
-	disablenpc instance_npcname(strnpcinfo(0), instance_id());
+	disablenpc instance_npcname(strnpcinfo(0));
 	getitem 12561,1; //Mysterious_Seed
 	end;
 }
-1@mist,69,295,0	duplicate(Mysterious Flower#1)	Mysterious Flower#2	844
-1@mist,62,291,0	duplicate(Mysterious Flower#1)	Mysterious Flower#3	844
-1@mist,54,293,0	duplicate(Mysterious Flower#1)	Mysterious Flower#4	844
-1@mist,48,286,0	duplicate(Mysterious Flower#1)	Mysterious Flower#5	844
-1@mist,54,277,0	duplicate(Mysterious Flower#1)	Mysterious Flower#6	844
-1@mist,52,270,0	duplicate(Mysterious Flower#1)	Mysterious Flower#7	844
-1@mist,62,268,0	duplicate(Mysterious Flower#1)	Mysterious Flower#8	844
-1@mist,72,271,0	duplicate(Mysterious Flower#1)	Mysterious Flower#9	844
-1@mist,72,276,0	duplicate(Mysterious Flower#1)	Mysterious Flower#10	844
-1@mist,118,194,0	duplicate(Mysterious Flower#1)	Mysterious Flower#11	844
-1@mist,122,204,0	duplicate(Mysterious Flower#1)	Mysterious Flower#12	844
-1@mist,137,209,0	duplicate(Mysterious Flower#1)	Mysterious Flower#13	844
-1@mist,144,203,0	duplicate(Mysterious Flower#1)	Mysterious Flower#14	844
-1@mist,146,186,0	duplicate(Mysterious Flower#1)	Mysterious Flower#15	844
-1@mist,142,182,0	duplicate(Mysterious Flower#1)	Mysterious Flower#16	844
-1@mist,132,179,0	duplicate(Mysterious Flower#1)	Mysterious Flower#17	844
-1@mist,123,184,0	duplicate(Mysterious Flower#1)	Mysterious Flower#18	844
-1@mist,194,118,0	duplicate(Mysterious Flower#1)	Mysterious Flower#19	844
-1@mist,188,109,0	duplicate(Mysterious Flower#1)	Mysterious Flower#20	844
-1@mist,193,94,0	duplicate(Mysterious Flower#1)	Mysterious Flower#21	844
-1@mist,205,92,0	duplicate(Mysterious Flower#1)	Mysterious Flower#22	844
-1@mist,213,96,0	duplicate(Mysterious Flower#1)	Mysterious Flower#23	844
-1@mist,216,103,0	duplicate(Mysterious Flower#1)	Mysterious Flower#24	844
-1@mist,212,116,0	duplicate(Mysterious Flower#1)	Mysterious Flower#25	844
-1@mist,207,120,0	duplicate(Mysterious Flower#1)	Mysterious Flower#26	844
-1@mist,169,310,0	duplicate(Mysterious Flower#1)	Mysterious Flower#27	844
-1@mist,172,296,0	duplicate(Mysterious Flower#1)	Mysterious Flower#28	844
-1@mist,191,301,0	duplicate(Mysterious Flower#1)	Mysterious Flower#30	844
-1@mist,195,301,0	duplicate(Mysterious Flower#1)	Mysterious Flower#31	844
-1@mist,192,316,0	duplicate(Mysterious Flower#1)	Mysterious Flower#32	844
-1@mist,187,320,0	duplicate(Mysterious Flower#1)	Mysterious Flower#33	844
-1@mist,174,318,0	duplicate(Mysterious Flower#1)	Mysterious Flower#34	844
-1@mist,308,136,0	duplicate(Mysterious Flower#1)	Mysterious Flower#35	844
-1@mist,314,122,0	duplicate(Mysterious Flower#1)	Mysterious Flower#36	844
-1@mist,321,118,0	duplicate(Mysterious Flower#1)	Mysterious Flower#37	844
-1@mist,331,123,0	duplicate(Mysterious Flower#1)	Mysterious Flower#38	844
-1@mist,335,126,0	duplicate(Mysterious Flower#1)	Mysterious Flower#39	844
-1@mist,332,141,0	duplicate(Mysterious Flower#1)	Mysterious Flower#40	844
-1@mist,328,144,0	duplicate(Mysterious Flower#1)	Mysterious Flower#41	844
-1@mist,314,144,0	duplicate(Mysterious Flower#1)	Mysterious Flower#42	844
-1@mist,238,224,0	duplicate(Mysterious Flower#1)	Mysterious Flower#43	844
-1@mist,244,231,0	duplicate(Mysterious Flower#1)	Mysterious Flower#44	844
-1@mist,257,232,0	duplicate(Mysterious Flower#1)	Mysterious Flower#45	844
-1@mist,262,229,0	duplicate(Mysterious Flower#1)	Mysterious Flower#46	844
-1@mist,265,216,0	duplicate(Mysterious Flower#1)	Mysterious Flower#47	844
-1@mist,260,214,0	duplicate(Mysterious Flower#1)	Mysterious Flower#48	844
-1@mist,252,206,0	duplicate(Mysterious Flower#1)	Mysterious Flower#49	844
-1@mist,244,211,0	duplicate(Mysterious Flower#1)	Mysterious Flower#50	844
+1@mist,69,295,0	duplicate(Mysterious Flower#1)	Mysterious Flower#2	CLEAR_NPC
+1@mist,62,291,0	duplicate(Mysterious Flower#1)	Mysterious Flower#3	CLEAR_NPC
+1@mist,54,293,0	duplicate(Mysterious Flower#1)	Mysterious Flower#4	CLEAR_NPC
+1@mist,48,286,0	duplicate(Mysterious Flower#1)	Mysterious Flower#5	CLEAR_NPC
+1@mist,54,277,0	duplicate(Mysterious Flower#1)	Mysterious Flower#6	CLEAR_NPC
+1@mist,52,270,0	duplicate(Mysterious Flower#1)	Mysterious Flower#7	CLEAR_NPC
+1@mist,62,268,0	duplicate(Mysterious Flower#1)	Mysterious Flower#8	CLEAR_NPC
+1@mist,72,271,0	duplicate(Mysterious Flower#1)	Mysterious Flower#9	CLEAR_NPC
+1@mist,72,276,0	duplicate(Mysterious Flower#1)	Mysterious Flower#10	CLEAR_NPC
+1@mist,118,194,0	duplicate(Mysterious Flower#1)	Mysterious Flower#11	CLEAR_NPC
+1@mist,122,204,0	duplicate(Mysterious Flower#1)	Mysterious Flower#12	CLEAR_NPC
+1@mist,137,209,0	duplicate(Mysterious Flower#1)	Mysterious Flower#13	CLEAR_NPC
+1@mist,144,203,0	duplicate(Mysterious Flower#1)	Mysterious Flower#14	CLEAR_NPC
+1@mist,146,186,0	duplicate(Mysterious Flower#1)	Mysterious Flower#15	CLEAR_NPC
+1@mist,142,182,0	duplicate(Mysterious Flower#1)	Mysterious Flower#16	CLEAR_NPC
+1@mist,132,179,0	duplicate(Mysterious Flower#1)	Mysterious Flower#17	CLEAR_NPC
+1@mist,123,184,0	duplicate(Mysterious Flower#1)	Mysterious Flower#18	CLEAR_NPC
+1@mist,194,118,0	duplicate(Mysterious Flower#1)	Mysterious Flower#19	CLEAR_NPC
+1@mist,188,109,0	duplicate(Mysterious Flower#1)	Mysterious Flower#20	CLEAR_NPC
+1@mist,193,94,0	duplicate(Mysterious Flower#1)	Mysterious Flower#21	CLEAR_NPC
+1@mist,205,92,0	duplicate(Mysterious Flower#1)	Mysterious Flower#22	CLEAR_NPC
+1@mist,213,96,0	duplicate(Mysterious Flower#1)	Mysterious Flower#23	CLEAR_NPC
+1@mist,216,103,0	duplicate(Mysterious Flower#1)	Mysterious Flower#24	CLEAR_NPC
+1@mist,212,116,0	duplicate(Mysterious Flower#1)	Mysterious Flower#25	CLEAR_NPC
+1@mist,207,120,0	duplicate(Mysterious Flower#1)	Mysterious Flower#26	CLEAR_NPC
+1@mist,169,310,0	duplicate(Mysterious Flower#1)	Mysterious Flower#27	CLEAR_NPC
+1@mist,172,296,0	duplicate(Mysterious Flower#1)	Mysterious Flower#28	CLEAR_NPC
+1@mist,191,301,0	duplicate(Mysterious Flower#1)	Mysterious Flower#30	CLEAR_NPC
+1@mist,195,301,0	duplicate(Mysterious Flower#1)	Mysterious Flower#31	CLEAR_NPC
+1@mist,192,316,0	duplicate(Mysterious Flower#1)	Mysterious Flower#32	CLEAR_NPC
+1@mist,187,320,0	duplicate(Mysterious Flower#1)	Mysterious Flower#33	CLEAR_NPC
+1@mist,174,318,0	duplicate(Mysterious Flower#1)	Mysterious Flower#34	CLEAR_NPC
+1@mist,308,136,0	duplicate(Mysterious Flower#1)	Mysterious Flower#35	CLEAR_NPC
+1@mist,314,122,0	duplicate(Mysterious Flower#1)	Mysterious Flower#36	CLEAR_NPC
+1@mist,321,118,0	duplicate(Mysterious Flower#1)	Mysterious Flower#37	CLEAR_NPC
+1@mist,331,123,0	duplicate(Mysterious Flower#1)	Mysterious Flower#38	CLEAR_NPC
+1@mist,335,126,0	duplicate(Mysterious Flower#1)	Mysterious Flower#39	CLEAR_NPC
+1@mist,332,141,0	duplicate(Mysterious Flower#1)	Mysterious Flower#40	CLEAR_NPC
+1@mist,328,144,0	duplicate(Mysterious Flower#1)	Mysterious Flower#41	CLEAR_NPC
+1@mist,314,144,0	duplicate(Mysterious Flower#1)	Mysterious Flower#42	CLEAR_NPC
+1@mist,238,224,0	duplicate(Mysterious Flower#1)	Mysterious Flower#43	CLEAR_NPC
+1@mist,244,231,0	duplicate(Mysterious Flower#1)	Mysterious Flower#44	CLEAR_NPC
+1@mist,257,232,0	duplicate(Mysterious Flower#1)	Mysterious Flower#45	CLEAR_NPC
+1@mist,262,229,0	duplicate(Mysterious Flower#1)	Mysterious Flower#46	CLEAR_NPC
+1@mist,265,216,0	duplicate(Mysterious Flower#1)	Mysterious Flower#47	CLEAR_NPC
+1@mist,260,214,0	duplicate(Mysterious Flower#1)	Mysterious Flower#48	CLEAR_NPC
+1@mist,252,206,0	duplicate(Mysterious Flower#1)	Mysterious Flower#49	CLEAR_NPC
+1@mist,244,211,0	duplicate(Mysterious Flower#1)	Mysterious Flower#50	CLEAR_NPC
 
 // Wandering Guardian Quest
 //============================================================
-1@mist,2,2,0	script	#Dragon Herder	844,{
+1@mist,2,2,0	script	#Dragon Herder	CLEAR_NPC,{
 	end;
 OnInstanceInit:
 	switch(rand(1,6)) {
@@ -547,25 +511,26 @@ OnInstanceInit:
 		case 5: setarray .@c[0],268,183; break;
 		case 6: setarray .@c[0],65,278; break;
 	}
-	monster "1@mist",.@c[0],.@c[1],"Wandering Purple Dragon",2131,1,instance_npcname("#Dragon Herder", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),.@c[0],.@c[1],"Wandering Purple Dragon",2131,1,instance_npcname("#Dragon Herder")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
-	if (mobcount("1@mist",instance_npcname("#Dragon Herder", instance_id())+"::OnMyMobDead") == 0) {
-		donpcevent instance_npcname("Collapsed Girl#mist", instance_id())+"::OnEnable";
-		donpcevent instance_npcname("Mysterious Young Man#mis", instance_id())+"::OnEnable";
-		donpcevent instance_npcname("Loki#mist", instance_id())+"::OnEnable";
-		instance_announce 0,"The Dragon's Cry: Am I being punished... for abandoning the way... of the guardian...?",bc_map,"0xffff00"; //FW_NORMAL 12 0 0
-		disablenpc instance_npcname("#Dragon Herder", instance_id());
+	set .@map$, instance_mapname("1@mist");
+	if (mobcount(.@map$,instance_npcname("#Dragon Herder")+"::OnMyMobDead") == 0) {
+		donpcevent instance_npcname("Collapsed Girl#mist")+"::OnEnable";
+		donpcevent instance_npcname("Mysterious Young Man#mis")+"::OnEnable";
+		donpcevent instance_npcname("Loki#mist")+"::OnEnable";
+		mapannounce .@map$,"The Dragon's Cry: Am I being punished... for abandoning the way... of the guardian...?",bc_map,"0xffff00"; //FW_NORMAL 12 0 0
+		disablenpc instance_npcname("#Dragon Herder");
 		initnpctimer;
 	}
 	end;
 OnTimer3000:
 	stopnpctimer;
-	instance_announce 0,"Voice in your head: ...Will you... save... me... please......?",bc_map,"0xffff00"; //FW_NORMAL 12 0 0
+	mapannounce instance_mapname("1@mist"),"Voice in your head: ...Will you... save... me... please......?",bc_map,"0xffff00"; //FW_NORMAL 12 0 0
 	end;
 }
 
-1@mist,97,30,3	script	Mysterious Young Man#mis	512,{
+1@mist,97,30,3	script	Mysterious Young Man#mis	4_M_ROKI2,{
 	if (BaseLevel < 98) {
 		mes "[Mysterious Young Man]";
 		mes "Huh? Do you plan to pass through here?";
@@ -705,16 +670,15 @@ OnTimer3000:
 		close;
 	}
 	end;
-OnInstanceInit:
 OnEnable:
-	enablenpc instance_npcname("Mysterious Young Man#mis", instance_id());
+	enablenpc instance_npcname("Mysterious Young Man#mis");
 	end;
 OnDisable:
-	disablenpc instance_npcname("Mysterious Young Man#mis", instance_id());
+	disablenpc instance_npcname("Mysterious Young Man#mis");
 	end;
 }
 
-1@mist,183,304,3	script	Loki#mist	512,{
+1@mist,183,304,3	script	Loki#mist	4_M_ROKI2,{
 	if (ep14_1_mistwoods < 2) {
 		mes "[Loki]";
 		mes "An adventurer in the forest.";
@@ -761,27 +725,27 @@ OnDisable:
 	end;
 OnInstanceInit:
 OnDisable:
-	disablenpc instance_npcname("Loki#mist", instance_id());
+	disablenpc instance_npcname("Loki#mist");
 	end;
 OnEnable:
-	enablenpc instance_npcname("Loki#mist", instance_id());
+	enablenpc instance_npcname("Loki#mist");
 	end;
 }
 
-1@mist,181,303,3	script	Collapsed Girl#mist	511,{
+1@mist,181,303,3	script	Collapsed Girl#mist	4_F_NYDHOG2,{
 	mes "You see a girl with mysterious hair collapsed on the ground.";
 	mes "As you approach her, you smell the scent of flowers so strong that it makes you dizzy.";
 	close;
 OnInstanceInit:
 OnDisable:
-	disablenpc instance_npcname("Collapsed Girl#mist", instance_id());
+	disablenpc instance_npcname("Collapsed Girl#mist");
 	end;
 OnEnable:
-	enablenpc instance_npcname("Collapsed Girl#mist", instance_id());
+	enablenpc instance_npcname("Collapsed Girl#mist");
 	end;
 }
 
-mora,46,152,5	script	Flower Smelling Lady	510,{
+mora,46,152,5	script	Flower Smelling Lady	4_F_NYDHOG,{
 	if (ep14_1_mistwoods < 3) {
 		mes "[Flower Smell Lady]";
 		mes "I need rest.";
@@ -836,7 +800,7 @@ mora,46,152,5	script	Flower Smelling Lady	510,{
 	}
 }
 
-mora,48,152,3	script	Sharp Eyed Man	512,{
+mora,48,152,3	script	Sharp Eyed Man	4_M_ROKI2,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- You have too many items to do this quest. -";
 		close;
@@ -905,7 +869,7 @@ mora,48,152,3	script	Sharp Eyed Man	512,{
 		mes "You still have things to do.";
 		next;
 		mes "[Nydhogg the Guardian]";
-		mes "... Oh, yes. It's late, but I have to fulfill my duties as a guardian.";
+		mes "...Oh, yes. It's late, but I have to fulfill my duties as a guardian.";
 		mes "Now I know. I'll destroy Morroc with my own hands.";
 		mes "I will fulfill my duties as a guardian.";
 		next;
@@ -958,77 +922,82 @@ mora,48,152,3	script	Sharp Eyed Man	512,{
 
 // Monster Spawns
 //============================================================
-1@mist,1,1,0	script	#Mist Mobs Respawn1	844,{
+1@mist,1,1,0	script	#Mist Mobs Respawn1	CLEAR_NPC,{
 	end;
 OnInstanceInit:
-	monster "1@mist",0,0,"Miming",2137,15,instance_npcname("#Mist Mobs Respawn1", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),0,0,"Miming",2137,15,instance_npcname("#Mist Mobs Respawn1")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
-	set .@num_mobs, 15 - mobcount("1@mist",instance_npcname("#Mist Mobs Respawn1", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("1@mist");
+	set .@num_mobs, 15 - mobcount(.@map$,instance_npcname("#Mist Mobs Respawn1")+"::OnMyMobDead");
 	if (.@num_mobs > 0)
-		monster "1@mist",0,0,"Miming",2137,.@num_mobs,instance_npcname("#Mist Mobs Respawn1", instance_id())+"::OnMyMobDead";
+		monster .@map$,0,0,"Miming",2137,.@num_mobs,instance_npcname("#Mist Mobs Respawn1")+"::OnMyMobDead";
 	end;
 }
 
-1@mist,1,2,0	script	#Mist Mobs Respawn2	844,{
+1@mist,1,2,0	script	#Mist Mobs Respawn2	CLEAR_NPC,{
 	end;
 OnInstanceInit:
-	monster "1@mist",0,0,"Pom Spider",2132,35,instance_npcname("#Mist Mobs Respawn2", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),0,0,"Pom Spider",2132,35,instance_npcname("#Mist Mobs Respawn2")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
-	set .@num_mobs, 35 - mobcount("1@mist",instance_npcname("#Mist Mobs Respawn2", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("1@mist");
+	set .@num_mobs, 35 - mobcount(.@map$,instance_npcname("#Mist Mobs Respawn2")+"::OnMyMobDead");
 	if (.@num_mobs > 0)
-		monster "1@mist",0,0,"Pom Spider",2132,.@num_mobs,instance_npcname("#Mist Mobs Respawn2", instance_id())+"::OnMyMobDead";
+		monster .@map$,0,0,"Pom Spider",2132,.@num_mobs,instance_npcname("#Mist Mobs Respawn2")+"::OnMyMobDead";
 	end;
 }
 
-1@mist,1,3,0	script	#Mist Mobs Respawn3	844,{
+1@mist,1,3,0	script	#Mist Mobs Respawn3	CLEAR_NPC,{
 	end;
 OnInstanceInit:
-	monster "1@mist",0,0,"Angra Mantis",2133,35,instance_npcname("#Mist Mobs Respawn3", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),0,0,"Angra Mantis",2133,35,instance_npcname("#Mist Mobs Respawn3")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
-	set .@num_mobs, 35 - mobcount("1@mist",instance_npcname("#Mist Mobs Respawn3", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("1@mist");
+	set .@num_mobs, 35 - mobcount(.@map$,instance_npcname("#Mist Mobs Respawn3")+"::OnMyMobDead");
 	if (.@num_mobs > 0)
-		monster "1@mist",0,0,"Angra Mantis",2133,.@num_mobs,instance_npcname("#Mist Mobs Respawn3", instance_id())+"::OnMyMobDead";
+		monster .@map$,0,0,"Angra Mantis",2133,.@num_mobs,instance_npcname("#Mist Mobs Respawn3")+"::OnMyMobDead";
 	end;
 }
 
-1@mist,1,4,0	script	#Mist Mobs Respawn4	844,{
+1@mist,1,4,0	script	#Mist Mobs Respawn4	CLEAR_NPC,{
 	end;
 OnInstanceInit:
-	monster "1@mist",0,0,"Parus",2134,35,instance_npcname("#Mist Mobs Respawn4", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),0,0,"Parus",2134,35,instance_npcname("#Mist Mobs Respawn4")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
-	set .@num_mobs, 35 - mobcount("1@mist",instance_npcname("#Mist Mobs Respawn4", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("1@mist");
+	set .@num_mobs, 35 - mobcount(.@map$,instance_npcname("#Mist Mobs Respawn4")+"::OnMyMobDead");
 	if (.@num_mobs > 0)
-		monster "1@mist",0,0,"Parus",2134,.@num_mobs,instance_npcname("#Mist Mobs Respawn4", instance_id())+"::OnMyMobDead";
+		monster .@map$,0,0,"Parus",2134,.@num_mobs,instance_npcname("#Mist Mobs Respawn4")+"::OnMyMobDead";
 	end;
 }
 
-1@mist,1,5,0	script	#Mist Mobs Respawn5	844,{
+1@mist,1,5,0	script	#Mist Mobs Respawn5	CLEAR_NPC,{
 	end;
 OnInstanceInit:
-	monster "1@mist",0,0,"Little Fatum",2136,15,instance_npcname("#Mist Mobs Respawn5", instance_id())+"::OnMyMobDead";
+	monster instance_mapname("1@mist"),0,0,"Little Fatum",2136,15,instance_npcname("#Mist Mobs Respawn5")+"::OnMyMobDead";
 	end;
 OnMyMobDead:
-	set .@num_mobs, 15 - mobcount("1@mist",instance_npcname("#Mist Mobs Respawn5", instance_id())+"::OnMyMobDead");
+	set .@map$, instance_mapname("1@mist");
+	set .@num_mobs, 15 - mobcount(.@map$,instance_npcname("#Mist Mobs Respawn5")+"::OnMyMobDead");
 	if (.@num_mobs > 0)
-		monster "1@mist",0,0,"Little Fatum",2136,.@num_mobs,instance_npcname("#Mist Mobs Respawn5", instance_id())+"::OnMyMobDead";
+		monster .@map$,0,0,"Little Fatum",2136,.@num_mobs,instance_npcname("#Mist Mobs Respawn5")+"::OnMyMobDead";
 	end;
 }
 
-1@mist,1,6,0	script	#Fragments of Memory	844,{
+1@mist,1,6,0	script	#Fragments of Memory	CLEAR_NPC,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname("#Fragments of Memory", instance_id());
-	monster "1@mist",0,0,"Guardian's Fragments of Memory",2138,15;
+	disablenpc instance_npcname("#Fragments of Memory");
+	monster instance_mapname("1@mist"),0,0,"Guardian's Fragments of Memory",2138,15;
 	end;
 }
 
 // Warp Portals
 //============================================================
-bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	844,{
+bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	CLEAR_NPC,{
 	mes "It's a giant flower with mysterious energy.";
 	if (countitem(12561)) {
 		mes "It's reacting to the Mysterious Flower Seeds you have with you.";
@@ -1053,12 +1022,12 @@ bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	844,{
 
 1@mist,104,23,0	warp	#to_bif01	1,1,bif_fild01,160,352
 
-1@mist,109,70,0	script	a1_a2	45,1,1,{
+1@mist,109,70,0	script	a1_a2	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (checkquest(7211,PLAYTIME) == -1)
 		setquest 7211;
-	warp "1@mist",116,40;
+	warp instance_mapname("1@mist"),116,40;
 	end;
 }
 
@@ -1157,24 +1126,24 @@ OnTouch:
 
 // Disable Garden Tree warps.
 // Custom, but saves processing and lines.
-1@mist,1,1,0	script	#mist_warp_init	844,{
+1@mist,1,1,0	script	#mist_warp_init	CLEAR_NPC,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname("a25_a18-1", instance_id());
-	disablenpc instance_npcname("a27-2_af1-2", instance_id());
-	disablenpc instance_npcname("a15-2_a4-1", instance_id());
-	disablenpc instance_npcname("a4-2_a11", instance_id());
-	disablenpc instance_npcname("b4-2_b2", instance_id());
-	disablenpc instance_npcname("b7_bf1-2", instance_id());
-	disablenpc instance_npcname("b31_b16", instance_id());
-	disablenpc instance_npcname("b27-3_bN-1", instance_id());
-	disablenpc instance_npcname("b6-1_b33", instance_id());
-	disablenpc instance_npcname("b5_b14", instance_id());
-	disablenpc instance_npcname("c1_c13-1", instance_id());
-	disablenpc instance_npcname("c13-3_c4", instance_id());
-	disablenpc instance_npcname("c19_c4", instance_id());
-	disablenpc instance_npcname("#to_bif02", instance_id());
-	disablenpc instance_npcname("#mist_warp_init", instance_id());
+	disablenpc instance_npcname("a25_a18-1");
+	disablenpc instance_npcname("a27-2_af1-2");
+	disablenpc instance_npcname("a15-2_a4-1");
+	disablenpc instance_npcname("a4-2_a11");
+	disablenpc instance_npcname("b4-2_b2");
+	disablenpc instance_npcname("b7_bf1-2");
+	disablenpc instance_npcname("b31_b16");
+	disablenpc instance_npcname("b27-3_bN-1");
+	disablenpc instance_npcname("b6-1_b33");
+	disablenpc instance_npcname("b5_b14");
+	disablenpc instance_npcname("c1_c13-1");
+	disablenpc instance_npcname("c13-3_c4");
+	disablenpc instance_npcname("c19_c4");
+	disablenpc instance_npcname("#to_bif02");
+	disablenpc instance_npcname("#mist_warp_init");
 	end;
 }
 1@mist,247,123,0	warp	a25_a18-1	1,1,1@mist,164,66	//Tom
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
new file mode 100644
index 000000000..f209f409b
--- /dev/null
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -0,0 +1,1051 @@
+//===== Hercules Script ======================================
+//= Malangdo Culvert
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Clean the culverts and defeat the Coelacanth.
+//= Daily and weekly quests are available.
+//= Contains a normal mode and hard mode.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//=     Letters "n" and "h" in NPC names indicate difficulty.
+//= 1.0a There is no minimum party size on official servers.
+//= 1.0b Fixed incorrect use of 'close'. [Joseph]
+//= 1.1 Instance system rewrite. [Euphy]
+//============================================================
+
+1@pump	mapflag	src4instance
+2@pump	mapflag	src4instance
+//============================================================
+
+// Quest NPCs
+//============================================================
+mal_in01,172,28,2	script	Albo#mal	4_CAT_SAILOR5,{
+	if (checkweight(1201,1) == 0) {
+		mes "You have too many kinds of objects. Try to continue after reducing those objects.";
+		close;
+	}
+	if (MaxWeight - Weight < 1000) {
+		mes "You have too many heavy objects. Try to continue after reducing your weight.";
+		close;
+	}
+	if (BaseLevel < 90) {
+		mes "[Albo]";
+		mes "Who are you?";
+		mes "We don't need a weaking!!";
+		close;
+	}
+	setarray .@quests[0],12271,12272,12273,12274;
+	setarray .@names$[0],
+		"General Culvert Daily Service","^990000Hard Culvert Daily Service^000000",
+		"General Culvert Weekly Service","^990000Hard Culvert Weekly Service^000000";
+	set .@menu$,"Why are doing this job?:";
+	for(set .@i,0; .@i<4; set .@i,.@i+1) {
+		if (checkquest(.@quests[.@i],PLAYTIME) > -1) {
+			set .@status[.@i],2;
+			set .@menu$, .@menu$+"^aaaaaa- There is no new task -^000000:";
+		} else if (.@i%2 && BaseLevel < 140) {
+			set .@status[.@i],0;
+			set .@menu$, .@menu$+"^aaaaaaCan't take this job because level is too low^000000:";
+		} else {
+			set .@status[.@i],1;
+			set .@menu$, .@menu$+.@names$[.@i]+":";
+		}
+	}
+	mes "[Albo]";
+	mes "We crossed the sea!";
+	mes "We are great heroes of Culvert! We do not forgive the seafood that aims at Culvert!";
+	next;
+	set .@i, select(.@menu$)-1;
+	if (.@i == 0) {
+		mes "[Albo]";
+		mes "We used to be the henchmen of Mr. Missing! We almost became guards of such a historic site.";
+		next;
+		mes "[Albo]";
+		mes "However, when sea water flooded all precious the resources, my dream... all my dreams melted away...";
+		next;
+		mes "[Albo]";
+		mes "We do not forgive the seafood that invaded our territory. I'll eat them with spicy paste!!!";
+		next;
+		mes "^0000ffAlbo's voice shakes with anger. He smacked his lips when he mentioned spicy paste.^000000";
+		close;
+	}
+	switch(.@status[.@i-1]) {
+	case 0:
+		mes "[Albo]";
+		mes "That task is really hard for you, so I can't tell you about it. Why don't you find another one?";
+		close;
+	case 1:
+		break;
+	case 2:
+		mes "[Albo]";
+		mes "I'm sorry. There is no new task yet! If I find any work, I'll tell you so!";
+		close;
+	}
+	switch(.@i) {
+	case 1: // General Culvert Daily Service
+		switch(rand(1,6)) {
+			case 1: callsub L_GiveQuest,.@i,12255,12271,"Deep Sea Crab";
+			case 2: callsub L_GiveQuest,.@i,12256,12271,"Deep Sea Marse";
+			case 3: callsub L_GiveQuest,.@i,12257,12271,"Deep Sea Vadon";
+			case 4: callsub L_GiveQuest,.@i,12258,12271,"Deep Sea Shellfish";
+			case 5: callsub L_GiveQuest,.@i,12259,12271,"Deep Sea Kukre";
+			case 6: callsub L_GiveQuest,.@i,12260,12271,"Deep Sea Cornutus";
+		}
+	case 2: // Hard Culvert Daily Service
+		switch(rand(1,6)) {
+			case 1: callsub L_GiveQuest,.@i,12261,12272,"Deep Sea Marc";
+			case 2: callsub L_GiveQuest,.@i,12262,12272,"Deep Sea Sword Fish";
+			case 3: callsub L_GiveQuest,.@i,12263,12272,"Deep Sea Strouf";
+			case 4: callsub L_GiveQuest,.@i,12264,12272,"Deep Sea Anolian";
+			case 5: callsub L_GiveQuest,.@i,12265,12272,"Deep Sea Obeanue";
+			case 6: callsub L_GiveQuest,.@i,12266,12272,"Deep Sea Kapha";
+		}
+	case 3: // General Culvert Weekly Service
+		switch(rand(1,2)) {
+			case 1: callsub L_GiveQuest,.@i,12267,12273,"Weird Coelacanth";
+			case 2: callsub L_GiveQuest,.@i,12268,12273,"Gloomy Coelacanth";
+		}
+	case 4: // Hard Culvert Weekly Service
+		switch(rand(1,2)) {
+			case 1: callsub L_GiveQuest,.@i,12269,12274,"Violent Coelacanth";
+			case 2: callsub L_GiveQuest,.@i,12270,12274,"Mutant Coelacanth";
+		}
+	default:
+		mes "[Albo]";
+		mes "Uh!? Where is the task? Let me find that quickly. You must speak with Madeca!";
+		close;
+	}
+	end;
+
+// callsub L_GiveQuest,.@i,<quest 1>,<quest 2>,<monster>;
+L_GiveQuest:
+	setquest getarg(1);
+	setquest getarg(2);
+	mes "[Albo]";
+	mes "Today, the heroes of Culvert!";
+	mes "We raise our voices and set a date for the extermination of ^0000ff"+getarg(3)+"^000000!";
+	next;
+	mes "[Albo]";
+	switch(getarg(0)) {
+	case 1:
+	case 2:
+		mes "Come on, heroes! Don't be afraid of them! Just go on, since it's a one-day mission!";
+		break;
+	case 3:
+		mes "I'll give you one week to finish this job! Terminate all of them in Culvert Dungeon, Normal Mode!";
+		break;
+	case 4:
+		mes "I'll give you one week to finish this job! Terminate all of them in Culvert Dungeon, Hard Mode!";
+		break;
+	}
+	next;
+	mes "You received a request for the Extermination of ^005500"+getarg(3)+"^000000. If you need more details, please check the quest window.";
+	close;
+}
+
+mal_in01,172,26,2	script	Madeca#mal	4_CAT_SAILOR1,{
+	if (checkweight(1201,1) == 0) {
+		mes "You have too many kinds of objects. Try to continue after reducing those objects.";
+		close;
+	}
+	if (MaxWeight - Weight < 1000) {
+		mes "You have too many heavy objects. Try to continue after reducing your weight.";
+		close;
+	}
+	if (BaseLevel < 90) {
+		mes "[Madeca]";
+		mes "Karrrrrrr!!";
+		mes "Let's have some bad seafood that can be boiled or grilled!";
+		next;
+		mes "[Madeca]";
+		mes "Who are you? You are such a totterer. Even seaweed could kill you!";
+		close;
+	}
+	mes "[Madeca]";
+	mes "Oh?";
+	mes "You're the one who took care of my big brother Albo's request. It was a hard job!";
+	next;
+	set .@i, select("What are you doing here?:General Culvert Daily Service Compensation:Hard Culvert Daily Service Compensation:General Culvert Weekly Service Compensation:Hard Culvert Weekly Service Compensation")-1;
+	if (.@i == 0) {
+		mes "[Madeca]";
+		mes "I'm here to help my big brother Albo!";
+		next;
+		mes "[Madeca]";
+		mes "We provide precious materials to humans who make sludge out of the bad seafood in the Culverts!";
+		next;
+		mes "[Madeca]";
+		mes "We provide A~B Grade Coins as compensation for daily service, and the precious Sea God's Wrath as compensation for weekly service.";
+		next;
+		mes "[Madeca]";
+		mes "If you take care of big brother Albo's request, I will see you very often. So, let's stay close!";
+		close;
+	}
+	mes "[Madeca]";
+	mes "I can't give you compensation for an expired request, so let me check if any of yours have expired.";
+	next;
+	specialeffect2 EF_SPHERE;
+	progressbar "0xFFFF00",3;
+	specialeffect2 EF_STEAL;
+	switch(.@i) {
+	case 1: // General Culvert Daily Service
+		if (checkquest(12271,PLAYTIME) == 2)
+			callsub L_EraseQuest,12255,12256,12257,12258,12259,12260,12271;
+		else {
+			// Reward: 2x B Grade Coin
+			callsub L_CheckQuest,12255,"Deep Sea Crab",6419,2;
+			callsub L_CheckQuest,12256,"Deep Sea Marse",6419,2;
+			callsub L_CheckQuest,12257,"Deep Sea Vadon",6419,2;
+			callsub L_CheckQuest,12258,"Deep Sea Shellfish",6419,2;
+			callsub L_CheckQuest,12259,"Deep Sea Kukre",6419,2;
+			callsub L_CheckQuest,12260,"Deep Sea Cornutus",6419,2;
+		}
+		break;
+	case 2: // Hard Culvert Daily Service
+		if (checkquest(12272,PLAYTIME) == 2)
+			callsub L_EraseQuest,12261,12262,12263,12264,12265,12266,12272;
+		else {
+			// Reward: 1x A Grade Coin
+			callsub L_CheckQuest,12261,"Deep Sea Marc",6418,1;
+			callsub L_CheckQuest,12262,"Deep Sea Sword Fish",6418,1;
+			callsub L_CheckQuest,12263,"Deep Sea Strouf",6418,1;
+			callsub L_CheckQuest,12264,"Deep Sea Anolian",6418,1;
+			callsub L_CheckQuest,12265,"Deep Sea Obeaune",6418,1;
+			callsub L_CheckQuest,12266,"Deep Sea Kapha",6418,1;
+		}
+		break;
+	case 3: // General Culvert Weekly Service
+		if (checkquest(12273,PLAYTIME) == 2)
+			callsub L_EraseQuest,12267,12268,12273;
+		else {
+			// Reward: 1x Sea God's Wrath
+			callsub L_CheckQuest,12267,"Weird Coelacanth",6423,1;
+			callsub L_CheckQuest,12268,"Gloomy Coelacanth",6423,1;
+		}
+		break;
+	case 4: // Hard Culvert Weekly Service
+		if (checkquest(12274,PLAYTIME) == 2)
+			callsub L_EraseQuest,12269,12270,12274;
+		else {
+			// Reward: 5x Sea God's Wrath
+			callsub L_CheckQuest,12269,"Violent Coelacanth",6423,5;
+			callsub L_CheckQuest,12270,"Mutant Coelacanth",6423,5;
+		}
+		break;
+	default:
+		mes "[Madeca]";
+		mes "Something is wrong. Please check this again!";
+		close;
+	}
+	mes "[Madeca]";
+	mes "I don't see any completed mission!";
+	close;
+
+L_EraseQuest:
+	for(set .@j,0; .@j<getargcount(); set .@j,.@j+1) {
+		if (checkquest(getarg(.@j)) > -1)
+			erasequest getarg(.@j);
+	}
+	mes "[Madeca]";
+	mes "Um, I'm sorry. You exceeded the time limit, so I can't give you any payment.";
+	close;
+
+// callsub L_CheckQuest,<quest ID>,<monster>,<reward item ID>,<reward item amount>;
+L_CheckQuest:
+	if (checkquest(getarg(0),HUNTING) == 2) {
+		mes "[Madeca]";
+		mes "You've punished ^0000ff"+getarg(1)+"^000000!";
+		mes "Here's your pay!";
+		erasequest getarg(0);
+		specialeffect2 EF_STEAL;
+		getitem getarg(2),getarg(3);
+		close;
+	}
+	return;
+}
+
+// Instance Creation
+//============================================================
+mal_in01,160,34,4	script	Missing, the Cleaner	4_CAT_SAILOR2,{
+	if (BaseLevel < 90) {
+		mes "[Missing, the Cleaner]";
+		mes "Are you talking to me?!";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "I'm not sure what made you come here but you can't enter!";
+		mes "Tomas' orders...";
+		next;
+		mes "^770099You must be Base level 90 to enter.^000000";
+		close;
+	}
+	if (in_canal_n == 0) {
+		mes "[Missing, the Cleaner]";
+		mes "(trembling)";
+		next;
+		mes "^660066This cat looks like it's in bad shape. It is slightly trembling.^000000";
+		next;
+		if(select("Pet the cat:Are you ok?") == 1) {
+			mes "[Missing, the Cleaner]";
+			mes "Are you talking to me?!";
+			next;
+			mes "^660066A trembling cat is looking up at you.^000000";
+			close;
+		}
+		mes "[Missing, the Cleaner]";
+		mes "Achoo!";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "We have had many issues during the";
+		mes "cleaning of the culverts. But a";
+		mes "cat's gotta do it...";
+		next;
+		select("What culvert are you cleaning?");
+		mes "[Missing, the Cleaner]";
+		mes "It might look unfamiliar for an";
+		mes "outsider, but actually this place";
+		mes "is made to keep souvenirs and";
+		mes "luxurious things.";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "After there was a big trembling on";
+		mes "this island, things started leaking";
+		mes "around here. So that's why I became";
+		mes "a cleaner here, though I used";
+		mes "to be a manager.";
+		next;
+		mes "^660066The cat looks like it's been crying...^000000";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "There is a culvert along this way";
+		mes "to the basement. There are many bad";
+		mes "guys who hurt me. I am tired of";
+		mes "fighting with them so many times a";
+		mes "day!";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "Ohh! You touched my fur!";
+		mes "My fur is falling out... it's all";
+		mes "those guys' fault~";
+		next;
+		mes "^660066You just now notice that the cat's fur is missing in some places.^000000";
+		next;
+		select("Why don't you just quit!");
+		mes "[Missing, the Cleaner]";
+		mes "I still have to make a living, don't I?";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "Sometimes I can get a lucky box,";
+		mes "or even better, I can get cans...";
+		next;
+		if(select("Okay, cheers!:I will help if possible...") == 1) {
+			mes "[Missing, the Cleaner]";
+			mes "Thank you. I am going back to pour the water!";
+			close;
+		}
+		mes "[Missing, the Cleaner]";
+		mes "(turns down his voice)";
+		mes "If you really want to help, come closer!";
+		next;
+		select("(get in closer)");
+		mes "[Missing, the Cleaner]";
+		mes "Not everyone can be an assistant";
+		mes "here. But I can't help choosing";
+		mes "anyone at the moment...";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "If you want to go down here, let me get this code.";
+		next;
+		mes "^660066The cat scribbles a memo for code to you.^000000";
+		next;
+		select("Open the memo.");
+		mes "^660000Aragam insulted me.^000000";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "You must be here with friends";
+		mes "because you can't go in alone! And";
+		mes "the password code will be from the";
+		mes "party leader!";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "What is also important is you must";
+		mes "have a Seagod Protection with you.";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "Don't forget! I will not open the";
+		mes "door if you do not have Seagod Protection!";
+		set in_canal_n,1;
+		close;
+	}
+	if (countitem(6436) == 0) {
+		mes "[Missing, the Cleaner]";
+		mes "You don't look like you have Seagod Protection. I can't open door at the moment!";
+		close;
+	}
+	set .@party_id,getcharid(1);
+	set .@md_name$,"Culvert";
+	if (!.@party_id) {
+		mes "^0000ffYou have to organize a party of";
+		mes "more than 1 member or be a member";
+		mes "of the party and come back.^000000";
+		close;
+	}
+	set .@playtime, checkquest(12254,PLAYTIME);
+	if (.@playtime == -1) {
+		if (getcharid(0) == getpartyleader(.@party_id,2)) {
+			mes "[Missing, the Cleaner]";
+			mes "Ummm? What's up? Tell me the password if you're the leader!";
+			next;
+			switch(select("No... nothing.:Aragam insulted me.:Enter the Culvert.")) {
+			case 1:
+				mes "[Missing, the Cleaner]";
+				mes "What a rookie.";
+				close;
+			case 2:
+				set .@instance,instance_create(.@md_name$,.@party_id);
+				if (.@instance < 0) {
+					mes "Party name: "+getpartyname(.@party_id);
+					mes "Party leader: "+strcharinfo(0);
+					mes "^0000ff"+.@md_name$+"^000000 - Reservation Failed!";
+					close;
+				}
+				if (instance_attachmap("1@pump",.@instance) == "" || instance_attachmap("2@pump",.@instance) == "") {
+					mes "^0000ff"+.@md_name$+"^000000 - Reservation Failed!";
+					instance_destroy(.@instance);
+					close;
+				}
+				instance_set_timeout 3600,300,.@instance;
+				instance_init(.@instance);
+				
+				mes "^3333FF"+.@md_name$+"^000000 - Reserving";
+				mes "After making the reservation, you";
+				mes "have to select Enter the Culvert.";
+				close;
+			case 3:
+				callsub L_Enter,0;
+			}
+		}
+		if(select("Enter Culvert:Cancel") == 2)
+			end;
+		callsub L_Enter,1;
+	} else if (.@playtime == 0 || .@playtime == 1) {
+		mes "You can enter the Culvert if the gate is open.";
+		next;
+		if(select("Enter Culvert:Cancel") == 2)
+			close;
+		callsub L_Enter,0;
+	} else if (.@playtime == 2) {
+		mes "^0000ffThe gate to the Culvert is open again.^000000";
+		erasequest 12254;
+		close;
+	}
+	end;
+L_Enter:
+	if (has_instance("1@pump") == "") {
+		if (checkquest(12254,PLAYTIME) == 0 || checkquest(12254,PLAYTIME) == 1) {
+			mes "The gate to the Culvert is still closed.";
+			mes "You must wait until you are able to enter or find a party leader who can create the instance.";
+			close;
+		}
+		mes "The memorial dungeon Culvert does not exist.";
+		mes "The party leader has not reserved entrance to the dungeon yet.";
+		close;
+	}
+	mapannounce "mal_in01", strcharinfo(0)+" of the party "+getpartyname(.@party_id)+" is entering the Culvert.",bc_map,"0x00ff99";
+	if (checkquest(12254) == -1) setquest 12254;
+	warp "1@pump",63,98;
+	end;
+}
+
+// Instance: Common Scripts
+//============================================================
+1@pump,63,100,4	script	Missing, the Cleaner#0	4_CAT_SAILOR2,{
+	if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+		mes "[Missing, the Cleaner]";
+		mes "I am trying to have a conversation with your leader now. Please don't disturb and wait!";
+		close;
+	}
+	mes "[Missing, the Cleaner]";
+	mes "This is the underground culvert where you will clean with your friends!";
+	next;
+	mes "[Missing, the Cleaner]";
+	mes "I'll open the door first. By the way, do you know how to fight?";
+	next;
+	switch(select("I'm pretty good at delivering bread.:I know how to fight.:^ffffffGive me the diamond.^000000")) {
+	case 1:
+		mes "[Missing, the Cleaner]";
+		mes "Ok then, I'll let you clean the culverts here as usual! I will prepare at the right-hand corner, please follow me!";
+		next;
+		if(select("Wait! I changed my mind!:As you wish~") == 1) {
+			mes "[Missing, the Cleaner]";
+			mes "Huh? Not ready yet? Talk to me again when you're ready.";
+			close;
+		}
+		set 'party_id,getcharid(1);
+		mapannounce instance_mapname("1@pump"),"Missing: Move toward the 3 o'clock direction and wait for my next order!",bc_map,"0xff88ff",FW_NORMAL,15;
+		disablenpc instance_npcname("Missing, the Cleaner#0");
+		enablenpc instance_npcname("Missing, the Cleaner#n");
+		close;
+	case 2:
+		if (BaseLevel < 140) {
+			mes "[Missing, the Cleaner]";
+			mes "Hmmm... Missing thinks you're weak! Tell me the truth!!";
+			close;
+		}
+		mes "[Missing, the Cleaner]";
+		mes "Huh? You have some fighting skills? Well, then, there is one place I wasn't able to clean... why don't you go there?!";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "I must tell you that it's been such a long~~ time since we've cleaned that place, so anyone under level 140 cannot even enter! Are you sure you still want to go?";
+		next;
+		if(select("Wait! I changed my mind!:Sure, I'm prepared already~") == 1) {
+			mes "[Missing, the Cleaner]";
+			mes "Hmm? Talk to me again when you're ready.";
+			close;
+		}
+		set 'party_id,getcharid(1);
+		mapannounce instance_mapname("1@pump"),"Missing: I'll go in first, so follow me! I'll open up a gate at the 3 o'clock direction!",bc_map,"0xff88ff",FW_NORMAL,15;
+		disablenpc instance_npcname("Missing, the Cleaner#0");
+		enablenpc instance_npcname("Culvert Entrance#i");
+		close;
+	case 3:
+		mes "[Missing, the Cleaner]";
+		mes "I told you not to play with me~!";
+		close;
+	}
+	end;
+}
+
+1@pump,84,105,0	script	Culvert Entrance#i	WARPNPC,3,3,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("Culvert Entrance#i");
+	end;
+OnTouch:
+	if (BaseLevel >= 140)
+		warp instance_mapname("2@pump"),38,88;
+	else
+		warp instance_mapname("1@pump"),74,105;
+	end;
+}
+
+function	script	F_mal_missing	{
+	mes "[Missing, the Cleaner]";
+	mes "I will tell you how to clean shortly. Can you see the culverts around you?";
+	next;
+	if(select("What culverts??:Yes, I see them.") == 1) {
+		mes "[Missing, the Cleaner]";
+		mes "Huh? Is this your first time seeing culverts? You'll see many buried machines in the ground. You may look around and come back!";
+		close;
+	}
+	mes "[Missing, the Cleaner]";
+	mes "That's right! Those culverts are very important! We must clean the culverts to prevent seaweed from blocking them. This is what we, cleaners, do!";
+	next;
+	mes "[Missing, the Cleaner]";
+	mes "Watch out! Some monsters will be after you while you're cleaning the culverts! But do not yield to them!";
+	next;
+	mes "[Missing, the Cleaner]";
+	mes "And... NEVER let 6 seaweeds stack! Up to 5 is acceptable! If there are 6, I'll drag you out of here!!";
+	next;
+	mes "[Missing, the Cleaner]";
+	mes "I don't care if you get help from your friends or not. I want you to clean up all culverts! Don't forget! I will watch you and give you instructions. Just do what I said!!";
+	next;
+	if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+		mes "[Missing, the Cleaner]";
+		mes "Once your leader finishes preparing, it will begin, so get your hearts ready for it!!";
+		close;
+	}
+	mes "[Missing, the Cleaner]";
+	mes "So, are you ready to clean now?";
+	next;
+	switch(select("Wait! Not yet!:Let's start!")) {
+	case 1:
+		mes "[Missing, the Cleaner]";
+		mes "Huh? Not ready yet? Then talk to me when you're ready.";
+		close;
+	case 2:
+		mes "[Missing, the Cleaner]";
+		mes "OK! Now it begins!";
+		return;
+	}
+}
+
+// Instance: Normal Mode
+//============================================================
+1@pump,84,105,4	script	Missing, the Cleaner#nf	4_CAT_SAILOR2,{
+	mes "[Missing, the Cleaner]";
+	mes "I have the cleaning job for 40 years and I've never seen such a terrible team!!";
+	next;
+	mes "[Missing, the Cleaner]";
+	mes "I see seaweed everywhere because you're wiggling! All the culverts will be blocked with seaweed!";
+	next;
+	if (getcharid(0) != getpartyleader(getcharid(1),2)) {
+		mes "[Missing, the Cleaner]";
+		mes "Once your leader finishes preparing, settlement will be decided so get your hearts ready for it!!";
+		close;
+	}
+	mes "[Missing, the Cleaner]";
+	mes "If you got some guts to challenge again, I'll give you another chance! What's your choice going to be!?";
+	next;
+	switch(select("Wait! Not yet!:Okay, let's start again!")) {
+	case 1:
+		mes "[Missing, the Cleaner]";
+		mes "You're still slow! Talk to me again whenever your're ready.";
+		close;
+	case 2:
+		mes "[Missing, the Cleaner]";
+		mes "Ok! Let's start now!";
+		set .@i$, charat(strnpcinfo(2),0);
+		enablenpc instance_npcname("Missing, the Cleaner#"+.@i$);
+		donpcevent instance_npcname("Missing, the Cleaner#"+.@i$)+"::OnStart";
+		disablenpc instance_npcname("Culvert Entrance#"+.@i$);
+		disablenpc instance_npcname("Missing, the Cleaner#"+.@i$+"o");
+		donpcevent instance_npcname("Monster Hole#"+.@i$)+"::OnClear";
+		disablenpc instance_npcname(strnpcinfo(0));
+		close;
+	}
+	close;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+}
+
+1@pump,84,105,4	script	Missing, the Cleaner#n	4_CAT_SAILOR2,{
+	callfunc "F_mal_missing";
+	donpcevent instance_npcname("Missing, the Cleaner#n")+"::OnStart";
+	close;
+OnInstanceInit:
+	disablenpc instance_npcname("Missing, the Cleaner#n");
+	end;
+OnStart:
+	killmonster instance_mapname("1@pump"),instance_npcname("Missing, the Cleaner#n")+"::OnMyMobDead";
+	disablenpc instance_npcname("Missing, the Cleaner#n");
+	initnpctimer;
+	end;
+OnAddSeaweed:
+	set .@map$, instance_mapname("1@pump");
+	areamonster .@map$,55,99,61,105,"Contaminated Seaweed",2191,1,instance_npcname("Missing, the Cleaner#n")+"::OnMyMobDead";
+	set .@mob_dead_num, mobcount(.@map$,instance_npcname("Missing, the Cleaner#n")+"::OnMyMobDead");
+	if (.@mob_dead_num >= 6)
+		donpcevent instance_npcname("Missing, the Cleaner#n")+"::OnFail";
+	else
+		mapannounce .@map$,"Contaminated Seaweed: "+.@mob_dead_num+" stem",bc_map,"0xff3333",FW_NORMAL,20;
+	end;
+OnMyMobDead:
+	end;
+OnFail:
+	stopnpctimer;
+	donpcevent instance_npcname("Monster Hole#n")+"::OnClear";
+	set .@map$, instance_mapname("1@pump");
+	killmonster .@map$,instance_npcname("Missing, the Cleaner#n")+"::OnMyMobDead";
+	enablenpc instance_npcname("Missing, the Cleaner#nf");
+	mapannounce .@map$,"What is this!! Seaweed is all over the culverts! You're done with cleaning! Get out!!",bc_map,"0xff88ff",FW_NORMAL,15;
+	disablenpc instance_npcname("Missing, the Cleaner#n");
+	end;
+OnTimer100:
+	mapannounce instance_mapname("1@pump"),"First culvert will be opened in 5 sec. Cleaner can find the opened drain and click to start cleaning.",bc_map,"0x00ffcc",FW_NORMAL,15;
+	end;
+OnTimer5500:
+	mapannounce instance_mapname("1@pump"),"The one who's in charge of cleaning the culvert cannot move or be attacked until the casting is over.",bc_map,"0x00ffcc",FW_NORMAL,15;
+	donpcevent instance_npcname("Monster Hole#n")+"::OnSpawn";
+	end;
+OnTimer45000:
+OnTimer95000:
+OnTimer145000:
+OnTimer195000:
+OnTimer245000:
+OnTimer295000:
+OnTimer345000:
+OnTimer395000:
+OnTimer445000:
+	mapannounce instance_mapname("1@pump"),"Next culvert will be opened in 5 sec. Please hurry up and find the position of the next culvert.",bc_map,"0x00ffcc",FW_NORMAL,15;
+	end;
+OnTimer50000:
+OnTimer100000:
+OnTimer150000:
+	donpcevent instance_npcname("Monster Hole#n")+"::OnSpawn";
+	end;
+OnTimer200000:
+OnTimer250000:
+OnTimer300000:
+OnTimer350000:
+OnTimer400000:
+OnTimer450000:
+	set .@mob_dead_num, mobcount(instance_mapname("1@pump"),instance_npcname("Missing, the Cleaner#n")+"::OnMyMobDead");
+	if (.@mob_dead_num >= 6)
+		donpcevent instance_npcname("Missing, the Cleaner#n")+"::OnFail";
+	else
+		donpcevent instance_npcname("Monster Hole#n")+"::OnSpawn";
+	end;
+OnTimer515000:
+	set .@map$, instance_mapname("1@pump");
+	set .@mob_dead_num, mobcount(.@map$,instance_npcname("Missing, the Cleaner#n")+"::OnMyMobDead");
+	mapannounce .@map$,"Contaminated Seaweed: "+.@mob_dead_num+" stem. Missing will come and inspect the results of the cleaning soon.",bc_map,"0xff3333",FW_NORMAL,20;
+	end;
+OnTimer520000:
+	stopnpctimer;
+	set .@mob_dead_num, mobcount(instance_mapname("1@pump"),instance_npcname("Missing, the Cleaner#n")+"::OnMyMobDead");
+	if (.@mob_dead_num >= 6)
+		donpcevent instance_npcname("Missing, the Cleaner#n")+"::OnFail";
+	else
+		donpcevent instance_npcname("Boss Creation#n")+"::OnEnable";
+	end;
+}
+
+1@pump,1,1,4	script	Monster Hole#n	-1,{
+	end;
+OnSpawn:
+	set .@i$, charat(strnpcinfo(2),0);
+	if (.@i$ == "n")
+		set .@n,6;
+	else if (.@i$ == "h")
+		set .@n,10;
+	donpcevent instance_npcname("#Culvert_"+.@i$+rand(1,.@n))+"::OnEnable";
+	end;
+OnClear:
+	set .@i$, charat(strnpcinfo(2),0);
+	if (.@i$ == "n")
+		set .@n,6;
+	else if (.@i$ == "h")
+		set .@n,10;
+	for(set .@i,1; .@i<=.@n; set .@i,.@i+1)
+		donpcevent instance_npcname("#Culvert_"+.@i$+.@n)+"::OnClear";
+	end;
+}
+
+1@pump,36,111,4	script	#Culvert_n1	CLEAR_NPC,14,14,{ //temporary workaround for ALL_SAMEMAP
+	progressbar "0xFFFF00",10;
+	stopnpctimer;
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable:
+	enablenpc instance_npcname(strnpcinfo(0));
+	set .@label$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@pump");
+	set .@index, atoi(charat(strnpcinfo(2),9));
+	switch(.@index) {
+		case 1: setarray .@c[0],32,107,40,115; break;
+		case 2: setarray .@c[0],64,120,72,128; break;
+		case 3: setarray .@c[0],76,110,84,118; break;
+		case 4: setarray .@c[0],36,76,44,84; break;
+		case 5: setarray .@c[0],71,76,79,84; break;
+		case 6: setarray .@c[0],54,97,62,105; break;
+	}
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Abysmal Crab",2176,rand(1,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Abysmal Marse",2175,rand(1,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Ancient Vadon",2174,rand(1,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Abysmal Shellfish",2178,rand(1,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Ancient Kukre",2179,rand(1,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Abysmal Cornutus",2177,rand(1,3),.@label$;
+	specialeffect EF_MAPPILLAR2,ALL_SAMEMAP; //currently broken
+	getmapxy(.@map$,.@x,.@y,1);
+	getpartymember 'party_id,2;
+	copyarray .@partymemberaid[0],$@partymemberaid[0],$@partymembercount;
+	for(set .@i,0; .@i<$@partymembercount; set .@i,.@i+1) {
+		if (attachrid(.@partymemberaid[.@i])) {
+			if (strcharinfo(3) == .@map$)
+				viewpoint 0,.@x,.@y,.@index,0xFFFF00;
+			detachrid;
+		}
+	}
+	initnpctimer;
+	end;
+OnMyMobDead:
+	end;
+OnClear:
+	stopnpctimer;
+	killmonster instance_mapname("1@pump"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	end;
+OnTimer49500:	//OnTimer50000 clashes with the timer in "Missing, the Cleaner#h".
+	donpcevent instance_npcname("Missing, the Cleaner#n")+"::OnAddSeaweed";
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnClear";
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnTouch:
+	specialeffect EF_MAPPILLAR2;
+	end;
+}
+1@pump,68,124,4	duplicate(#Culvert_n1)	#Culvert_n2	CLEAR_NPC,14,14
+1@pump,80,114,4	duplicate(#Culvert_n1)	#Culvert_n3	CLEAR_NPC,14,14
+1@pump,40,80,4	duplicate(#Culvert_n1)	#Culvert_n4	CLEAR_NPC,14,14
+1@pump,75,80,4	duplicate(#Culvert_n1)	#Culvert_n5	CLEAR_NPC,14,14
+1@pump,58,101,4	duplicate(#Culvert_n1)	#Culvert_n6	CLEAR_NPC,14,14
+
+1@pump,1,1,4	script	Boss Creation#n	-1,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable:
+	enablenpc instance_npcname(strnpcinfo(0));
+	initnpctimer;
+	end;
+OnTimer100:
+	set .@i$, charat(strnpcinfo(2),0);
+	if (.@i$ == "n")
+		mapannounce instance_mapname("1@pump"),"Hmm! That wasn't so bad!",bc_map,"0xff88ff",FW_NORMAL,15;
+	else if (.@i$ == "h")
+		mapannounce instance_mapname("2@pump"),"Hmm! You guys are pretty good!!",bc_map,"0xff88ff",FW_NORMAL,15;
+	end;
+OnTimer5000:
+	mapannounce strnpcinfo(4),"Let's pack up and go... WHAT!!?",bc_map,"0xff88ff",FW_NORMAL,15;
+	end;
+OnTimer10000:
+	mapannounce strnpcinfo(4),"I sense something strange!! Don't loosen up-- prepare for a fight!!",bc_map,"0xff88ff",FW_NORMAL,15;
+	end;
+OnTimer20000:
+	stopnpctimer;
+	set .@i$, charat(strnpcinfo(2),0);
+	set .@label$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	if (rand(1,100) > 50) {
+		if (.@i$ == "n")
+			monster instance_mapname("1@pump"),0,0,"Weird Coelacanth",2188,1,.@label$;
+		else if (.@i$ == "h")
+			monster instance_mapname("2@pump"),0,0,"Mutant Coelacanth",2189,1,.@label$;
+		mapannounce strnpcinfo(4),"Something big inside the abyss appears with a huge noise.",bc_map,"0x00ffcc",FW_NORMAL,15;
+	} else {
+		if (.@i$ == "n")
+			monster instance_mapname("1@pump"),0,0,"Gloomy Coelacanth",2187,1,.@label$;
+		else if (.@i$ == "h")
+			monster instance_mapname("2@pump"),0,0,"Violent Coelacanth",2190,1,.@label$;
+		mapannounce strnpcinfo(4),"Something savage inside the abyss appears with a huge noise.",bc_map,"0x00ffcc",FW_NORMAL,15;
+	}
+	end;
+OnMyMobDead:
+	if (mobcount(strnpcinfo(4),instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) {
+		mapannounce strnpcinfo(4),"You've destroyed all monsters in the culverts. There are trophies lying on the ground, please look for them.",bc_map,"0xffff00",FW_NORMAL,15;
+		set .@i$, charat(strnpcinfo(2),0);
+		set .@map$, strnpcinfo(4);
+		enablenpc instance_npcname("Culvert Entrance#"+.@i$);
+		enablenpc instance_npcname("Missing, the Cleaner#"+.@i$+"o");
+		if (.@i$ == "n") {
+			for(set .@i,0; .@i<10; set .@i,.@i+1) {
+				set .@j, rand(1,6401);
+				     if (.@j < 5001) set .@item,12636; //Malang_Sp_Can
+				else if (.@j < 5501) set .@item,12615; //Low_Coin_Pocket
+				else if (.@j < 6001) set .@item,12621; //Egrade_Pocket
+				else if (.@j < 6201) set .@item,12620; //Dgrade_Pocket
+				else if (.@j < 6401) set .@item,12623; //High_Weapon_Box
+				else continue;
+				makeitem .@item,1,.@map$,rand(40,77),rand(87,120);
+			}
+		} else if (.@i$ == "h") {
+			for(set .@i,0; .@i<10; set .@i,.@i+1) {
+				set .@j, rand(1,5001);
+				     if (.@j < 2001) set .@item,12615; //Low_Coin_Pocket
+				else if (.@j < 3001) set .@item,12621; //Egrade_Pocket
+				else if (.@j < 4001) set .@item,12620; //Dgrade_Pocket
+				else if (.@j < 4501) set .@item,12619; //Cgrade_Pocket
+				else if (.@j < 5001) set .@item,12623; //High_Weapon_Box
+				else continue;
+				makeitem .@item,1,.@map$,rand(40,77),rand(87,120);
+			}
+		}
+	} else
+		mapannounce strnpcinfo(4),"There are still monsters alive.",bc_map,"0x00ff99",FW_NORMAL,20;
+	end;
+}
+
+1@pump,84,105,4	script	Missing, the Cleaner#no	4_CAT_SAILOR2,{
+	set .@i$, charat(strnpcinfo(2),0);
+	if (.@i$ == "n") {
+		mes "[Missing, the Cleaner]";
+		mes "I was very surprised!!";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "That funny-looking fish seems to be one of Coelacanths living around here. This is my first time seeing one coming here alone!";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "I'll clean up the remains. Go pack and leave! Enterance is located on the other side, look for it!";
+		next;
+	} else if (.@i$ == "h") {
+		mes "[Missing, the Cleaner]";
+		mes "You've destroyed an immense monster!";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "The one you destroyed was among the variety of Coelacanths. Others have tried to destroy them but failed.";
+		next;
+		mes "[Missing, the Cleaner]";
+		mes "I'll clean up the remains. You go ahead to get trophies and leave!";
+		next;
+	}
+	mes "[Missing, the Cleaner]";
+	mes "One more thing! DO NOT TALK to ANYONE about what you've seen here today!!";
+	next;
+	mes "[Missing, the Cleaner]";
+	mes "If Tomas closes this down, we will lose our jobs!";
+	close;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+}
+
+1@pump,32,100,0	script	Culvert Entrance#n	WARPNPC,3,3,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnTouch:
+	warp "mal_in01",161,32;
+	end;
+}
+
+//MD_Putmob "1@pump" 0 0 0 0 20 HYDRA 0 0 2
+1@pump,1,1,4	script	Hydra#n	-1,{
+OnInstanceInit:
+	monster strnpcinfo(4),0,0,"Hydra",1068,20;
+	end;
+}
+
+// Instance: Hard Mode
+//============================================================
+2@pump,39,88,4	duplicate(Missing, the Cleaner#nf)	Missing, the Cleaner#hf	4_CAT_SAILOR2
+
+2@pump,39,88,4	script	Missing, the Cleaner#h	4_CAT_SAILOR2,{
+	callfunc "F_mal_missing";
+	donpcevent instance_npcname("Missing, the Cleaner#h")+"::OnStart";
+	close;
+OnStart:
+	killmonster instance_mapname("2@pump"),instance_npcname("Missing, the Cleaner#h")+"::OnMyMobDead";
+	disablenpc instance_npcname("Missing, the Cleaner#h");
+	initnpctimer;
+	end;
+OnAddSeaweed:
+	set .@map$, instance_mapname("2@pump");
+	areamonster .@map$,75,78,85,88,"Contaminated Seaweed",2191,1,instance_npcname("Missing, the Cleaner#h")+"::OnMyMobDead";
+	set .@mob_dead_num, mobcount(.@map$,instance_npcname("Missing, the Cleaner#h")+"::OnMyMobDead");
+	if (.@mob_dead_num >= 6)
+		donpcevent instance_npcname("Missing, the Cleaner#h")+"::OnFail";
+	else
+		mapannounce .@map$,"Proliferous Contaminated Seaweed: "+.@mob_dead_num+" stem",bc_map,"0xff3333",FW_NORMAL,20;
+	end;
+OnMyMobDead:
+	end;
+OnFail:
+	stopnpctimer;
+	donpcevent instance_npcname("Monster Hole#h")+"::OnClear";
+	set .@map$, instance_mapname("2@pump");
+	killmonster .@map$, instance_npcname("Missing, the Cleaner#h")+"::OnMyMobDead";
+	enablenpc instance_npcname("Missing, the Cleaner#hf");
+	mapannounce .@map$,"What is this!! Seaweed is all over the culverts! You're done with cleaning! Get out!!",bc_map,"0xff88ff",FW_NORMAL,15;
+	disablenpc instance_npcname("Missing, the Cleaner#h");
+	end;
+OnTimer100:
+	mapannounce instance_mapname("2@pump"),"First culvert will be opened in 5 sec. Cleaner can find the opened drain and click to start cleaning.",bc_map,"0x00ffcc",FW_NORMAL,15;
+	end;
+OnTimer5500:
+	mapannounce instance_mapname("2@pump"),"The one who's in charge of cleaning the culvert cannot move or be attacked until the casting is over.",bc_map,"0x00ffcc",FW_NORMAL,15;
+	donpcevent instance_npcname("Monster Hole#h")+"::OnSpawn";
+	end;
+OnTimer35000:
+OnTimer75000:
+OnTimer115000:
+OnTimer155000:
+OnTimer195000:
+OnTimer235000:
+OnTimer275000:
+OnTimer315000:
+OnTimer355000:
+	mapannounce instance_mapname("2@pump"),"Next culvert will be opened in 5 sec. Please hurry up and find the position of the next culvert.",bc_map,"0x00ffcc",FW_NORMAL,15;
+	end;
+OnTimer40000:
+OnTimer80000:
+OnTimer120000:
+	donpcevent instance_npcname("Monster Hole#h")+"::OnSpawn";
+	end;
+OnTimer160000:
+OnTimer200000:
+OnTimer240000:
+OnTimer280000:
+OnTimer320000:
+OnTimer360000:
+	set .@mob_dead_num, mobcount(instance_mapname("2@pump"),instance_npcname("Missing, the Cleaner#h")+"::OnMyMobDead");
+	if (.@mob_dead_num >= 6)
+		donpcevent instance_npcname("Missing, the Cleaner#h")+"::OnFail";
+	else
+		donpcevent instance_npcname("Monster Hole#h")+"::OnSpawn";
+	end;
+OnTimer420000:
+	mapannounce instance_mapname("2@pump"),"It seems Missing will come and inspect the results of the cleaning soon. Shall we clean up the mess around here?",bc_map,"0xff3333",FW_NORMAL,20;
+	end;
+OnTimer425000:
+	stopnpctimer;
+	set .@mob_dead_num, mobcount(instance_mapname("2@pump"),instance_npcname("Missing, the Cleaner#h")+"::OnMyMobDead");
+	if (.@mob_dead_num >= 6)
+		donpcevent instance_npcname("Missing, the Cleaner#h")+"::OnFail";
+	else
+		donpcevent instance_npcname("Boss Creation#h")+"::OnEnable";
+	end;
+}
+
+2@pump,53,114,4	script	#Culvert_h1	CLEAR_NPC,14,14,{ //temporary workaround for ALL_SAMEMAP
+	progressbar "0xFFFF00",15;
+	stopnpctimer;
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable:
+	enablenpc instance_npcname(strnpcinfo(0));
+	set .@label$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	set .@map$, instance_mapname("2@pump");
+	set .@index, atoi(substr(strnpcinfo(2),9,getstrlen(strnpcinfo(2))-1));
+	switch(.@index) {
+		case 1: setarray .@c[0],49,110,57,118; break;
+		case 2: setarray .@c[0],75,105,83,113; break;
+		case 3: setarray .@c[0],110,110,118,118; break;
+		case 4: setarray .@c[0],94,94,102,102; break;
+		case 5: setarray .@c[0],58,92,66,100; break;
+		case 6: setarray .@c[0],53,66,61,74; break;
+		case 7: setarray .@c[0],43,45,51,53; break;
+		case 8: setarray .@c[0],77,59,85,67; break;
+		case 9: setarray .@c[0],96,70,104,78; break;
+		case 10: setarray .@c[0],111,46,119,54; break;
+	}
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Ancient Marc",2182,rand(2,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Ancient Sword Fish",2181,rand(2,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Ancient Strouf",2180,rand(2,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Mutant Anolian",2183,rand(2,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Abysmal Obeaune",2184,rand(2,3),.@label$;
+	areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Metamorphous Kapha",2185,rand(2,3),.@label$;
+	specialeffect EF_MAPPILLAR2,ALL_SAMEMAP; //currently broken
+	initnpctimer;
+	end;
+OnMyMobDead:
+	end;
+OnClear:
+	stopnpctimer;
+	killmonster instance_mapname("2@pump"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	end;
+OnTimer39500:	//OnTimer40000 clashes with the timer in "Missing, the Cleaner#h".
+	donpcevent instance_npcname("Missing, the Cleaner#h")+"::OnAddSeaweed";
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnClear";
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnTouch:
+	specialeffect EF_MAPPILLAR2;
+	end;
+}
+2@pump,79,109,4	duplicate(#Culvert_h1)	#Culvert_h2	CLEAR_NPC,14,14
+2@pump,114,114,4	duplicate(#Culvert_h1)	#Culvert_h3	CLEAR_NPC,14,14
+2@pump,98,98,4	duplicate(#Culvert_h1)	#Culvert_h4	CLEAR_NPC,14,14
+2@pump,62,96,4	duplicate(#Culvert_h1)	#Culvert_h5	CLEAR_NPC,14,14
+2@pump,57,70,4	duplicate(#Culvert_h1)	#Culvert_h6	CLEAR_NPC,14,14
+2@pump,47,49,4	duplicate(#Culvert_h1)	#Culvert_h7	CLEAR_NPC,14,14
+2@pump,81,63,4	duplicate(#Culvert_h1)	#Culvert_h8	CLEAR_NPC,14,14
+2@pump,100,74,4	duplicate(#Culvert_h1)	#Culvert_h9	CLEAR_NPC,14,14
+2@pump,115,50,4	duplicate(#Culvert_h1)	#Culvert_h10	CLEAR_NPC,14,14
+
+2@pump,1,1,4	duplicate(Monster Hole#n)	Monster Hole#h	-1
+2@pump,1,1,4	duplicate(Boss Creation#n)	Boss Creation#h	-1
+2@pump,39,88,4	duplicate(Missing, the Cleaner#no)	Missing, the Cleaner#ho	4_CAT_SAILOR2
+2@pump,38,100,0	duplicate(Culvert Entrance#n)	Culvert Entrance#h	WARPNPC,3,3
+
+//MD_Putmob "2@pump" 0 0 0 0 20 HYDRA 0 0 2
+2@pump,1,1,4	duplicate(Hydra#n)	Hydra#h	-1
diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt
new file mode 100644
index 000000000..43c2ac66f
--- /dev/null
+++ b/npc/re/instances/OctopusCave.txt
@@ -0,0 +1,712 @@
+//===== Hercules Script ======================================
+//= Octopus Cave
+//===== By: ==================================================
+//= Muad_Dib
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Defeat the Disgusting Octopus.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//= 1.1 Instance system rewrite. [Euphy]
+//============================================================
+
+1@cash	mapflag	src4instance
+//============================================================
+
+// Instance Creation
+//============================================================
+mal_dun01,151,235,5	script	Starfish	4_ASTER,{
+
+	set .@party_id,getcharid(1);
+	set .@md_name$,"Octopus Cave";
+
+	if (!.@party_id) {
+		mes "[Starfish]";
+		mes "You alone is powerless, hehe!";
+		mes "Better get someone to help you out.";
+		mes "Make a party, and come back later.";
+		close;
+	}
+	if (getcharid(0) != getpartyleader(.@party_id,2)) {
+		mes "[Starfish]";
+		mes "Where is your leader, hehe.";
+		mes "I don't talk to some random people.";
+		mes "Bring your boss to me.";
+		close;
+	}
+	mes "[Starfish]";
+	mes "I am guarding here, hehe!";
+	mes "It is just roughly blocked for now.";
+	mes "But someday this cave must be sealed forever, hehe!";
+	next;
+	while(1) {
+		switch(select("Ask what's going on.:Ask to open the gate.:Go to other location.")) {
+		case 1:
+			mes "[Starfish]";
+			mes "Lately, our Starfish lady is";
+			mes "suffering with some issues, ooh ooh.";
+			mes "Something bad happen in this";
+			mes "peaceful place, hehe!";
+			next;
+			mes "[Starfish]";
+			mes "Weird looking limbs came out";
+			mes "from the hole there,";
+			mes "tried to kidnap our lady Starfish.";
+			mes "Ooh Ooh.";
+			next;
+			mes "[Starfish]";
+			mes "It seems those limbs belong to";
+			mes "that ugly octopus.";
+			mes "That monster should be taken care of,";
+			mes "but it's hard for ourselves only to make it happen, hehe.";
+			next;
+			mes "[Starfish]";
+			mes "I want to find someone special,";
+			mes "and ask to punish this ugly octopus.";
+			mes "I hope this octopus won't ever";
+			mes "harass our lady, hehe.";
+			next;
+			mes "[Starfish]";
+			mes "Go catch that octopus and stick it to this pick.";
+			mes "If you bring back the pick, I will";
+			mes "open this gate for a while.";
+			mes "You should challenge if you are interested, hehe.";
+			next;
+			break;
+		case 2:
+			set .@playtime, checkquest(4197,PLAYTIME);
+			if (.@playtime == 0 || .@playtime == 1) {
+				mes "[Starfish]";
+				mes "Octopus is not around now, hehe.";
+				mes "Please come back later.";
+				close;
+			}
+			if (.@playtime == 2) erasequest 4197;
+			if (countitem(6442)) {
+				set .@instance,instance_create(.@md_name$,.@party_id);
+				if (.@instance < 0) {
+					mes "[Starfish]";
+					mes "Party name is... "+getpartyname(.@party_id)+".";
+					mes "Party leader is... "+strcharinfo(0)+".";
+					mes "^0000ff"+.@md_name$+"^000000, I cannot open now, hehe.";
+					mes "Now is not the time, please wait.";
+					close;
+				}
+				if (instance_attachmap("1@cash",.@instance) == "") {
+					mes "^0000ff"+.@md_name$+"^000000 - Reservation Failed!";
+					instance_destroy(.@instance);
+					close;
+				}
+				instance_set_timeout 3600,300,.@instance;
+				instance_init(.@instance);
+				
+				mes "[Starfish]";
+				mes "I will open the gate for a while to ^0000ff"+.@md_name$+"^000000.";
+				mes "Please catch that pervert octopus,";
+				mes "and come back with it sticked to the pick, hehe.";
+				close;
+			}
+			mes "[Starfish]";
+			mes "Prepare a pick first,";
+			mes "so you can thread that octopus";
+			mes "with that pick.";
+			mes "Then, I will let you in for a while, hehe.";
+			close;
+		case 3:
+			mes "[Starfish]";
+			mes "This is not a good location, check someplace else.";
+			close;
+		}
+	}
+}
+
+mal_dun01,153,237,5	script	Weird Entrance	CLEAR_NPC,{
+	mes "There is a strange entrance";
+	mes "blocked roughly with some boards.";
+	next;
+	switch(select("Go in.:Stop.")) {
+	case 1:
+		if (countitem(6442)) {
+			if (has_instance("1@cash") == "") {
+				if (checkquest(4197,PLAYTIME) == 0 || checkquest(4197,PLAYTIME) == 1) {
+					mes "[Starfish]";
+					mes "Ah, now is not the time...";
+					mes "Would you come back later? Hehe.";
+					close;
+				}
+				mes "[Starfish]";
+				mes "Shhh... Weird aura is";
+				mes "coming from that entrance.";
+				mes "Big trouble is waiting, if you go in now.";
+				close;
+			}
+			mapannounce "mal_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member started to hunt the Octopus!",bc_map,"0x00ff99";
+			if (checkquest(4197) == -1) setquest 4197;
+			warp "1@cash",199,99;
+			end;
+		}
+		mes "[Starfish]";
+		mes "You should definitely prepare";
+		mes "hunting stick if you want to";
+		mes "punish the Octopus.";
+		mes "Or I will not let you in! Hehe.";
+		close;
+	case 2:
+		mes "[Starfish]";
+		mes "Yes Yes, you better quit.";
+		close;
+	}
+}
+
+// Instance Scripts
+//============================================================
+1@cash,199,99,0	script	oct_enter	HIDDEN_WARP_NPC,4,4,{
+	end;
+OnTouch:
+	donpcevent instance_npcname("oct_enter_broad")+"::OnEnable";
+	specialeffect EF_BASH;
+	disablenpc instance_npcname("oct_enter");
+	end;
+}
+
+1@cash,1,1,0	script	oct_enter_broad	-1,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("oct_enter_broad")+"::OnDisable";
+	end;
+OnEnable:
+	enablenpc instance_npcname("oct_enter_broad");
+	donpcevent instance_npcname("oct_foot_4")+"::OnEnable";
+	donpcevent instance_npcname("oct_mob_con")+"::OnEnable";
+	initnpctimer;
+	end;
+OnDisable:
+	disablenpc instance_npcname("oct_enter_broad");
+	end;
+OnTimer1000:
+	mapannounce instance_mapname("1@cash"),"Pervert Octopus : How dare you to come inside of my place!",bc_map,"0xFFFF00";
+	end;
+OnTimer4000:
+	mapannounce instance_mapname("1@cash"),"Pervert Octopus : But I blocked all the cave gates!! There is nothing you can do!",bc_map,"0xFFFF00";
+	end;
+OnTimer7000:
+	mapannounce instance_mapname("1@cash"),"Pervert Octopus : My juniors~ There is your toy! Play with it~ kakaka",bc_map,"0xFFFF00";
+	stopnpctimer;
+	donpcevent instance_npcname("oct_enter_broad")+"::OnDisable";
+	end;
+}
+
+1@cash,3,3,0	script	oct_foot_4	-1,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("oct_foot_4")+"::OnDisable";
+	end;
+OnEnable:
+	enablenpc instance_npcname("oct_foot_4");
+	donpcevent instance_npcname("oct_foot1")+"::OnEnable";
+	donpcevent instance_npcname("oct_foot2")+"::OnEnable";
+	donpcevent instance_npcname("oct_foot3")+"::OnEnable";
+	donpcevent instance_npcname("oct_foot4")+"::OnEnable";
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,20,114,"Octopus Leg#1",2193,1,instance_npcname("oct_foot_4")+"::OnMyMobDead";
+	monster .@map$,88,190,"Octopus Leg#2",2193,1,instance_npcname("oct_foot_4")+"::OnMyMobDead";
+	monster .@map$,307,215,"Octopus Leg#3",2193,1,instance_npcname("oct_foot_4")+"::OnMyMobDead";
+	monster .@map$,372,131,"Octopus Leg#4",2193,1,instance_npcname("oct_foot_4")+"::OnMyMobDead";
+	end;
+OnDisable:
+	disablenpc instance_npcname("oct_foot_4");
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@cash");
+	if (mobcount(.@map$,instance_npcname("oct_foot_4")+"::OnMyMobDead") < 1) {
+		donpcevent instance_npcname("oct_boss_con")+"::OnEnable";
+		mapannounce .@map$,"Hey you!! I'll personally take care of you all! Let's bring it on!",bc_map,"0x00ff99";
+		enablenpc instance_npcname("oct_boss_warp");
+		instance_warpall .@map$,199,99;
+		end;
+	}
+	mapannounce .@map$,"Arrgg!! That hurts!!! I need another strategy...",bc_map,"0x00ff99";
+	end;
+}
+
+1@cash,20,114,0	script	oct_foot1	HIDDEN_WARP_NPC,6,6,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
+	end;
+OnEnable:
+	enablenpc instance_npcname(strnpcinfo(0));
+	set .@label$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	set .@i, atoi(charat(strnpcinfo(0),8));
+	set .@map$, instance_mapname("1@cash");
+	switch(.@i) {
+	case 1:
+		areamonster .@map$,34,96,38,100,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,39,90,41,92,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,38,76,40,78,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,39,58,41,60,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,50,38,56,44,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,68,32,72,36,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,83,26,85,28,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,107,28,109,30,"Octopus's Henchman",2192,1,.@label$;
+		areamonster .@map$,123,28,125,30,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,134,31,138,35,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,142,39,146,43,"Octopus's Henchman",2192,2,.@label$;
+		break;
+	case 2:
+		areamonster .@map$,139,113,143,117,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,135,104,137,106,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,123,93,127,97,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,113,90,115,92,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,103,89,105,91,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,89,90,91,92,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,74,104,76,106,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,74,120,76,122,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,83,131,87,135,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,92,142,94,144,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,98,159,100,161,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,94,180,98,184,"Octopus's Henchman",2192,5,.@label$;
+		break;
+	case 3:
+		areamonster .@map$,299,209,303,213,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,292,203,296,207,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,291,186,293,188,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,292,166,294,168,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,293,151,295,153,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,299,137,303,141,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,300,123,304,127,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,300,104,304,108,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,279,101,281,103,"Octopus's Henchman",2192,2,.@label$;
+		monster .@map$,260,103,"Octopus's Henchman",2192,1,.@label$;
+		break;
+	case 4:
+		areamonster .@map$,363,123,367,127,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,364,108,368,112,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,363,93,367,97,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,364,72,366,74,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,364,58,366,60,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,355,44,359,48,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,346,36,350,40,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,319,28,325,34,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,305,27,307,29,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,276,29,280,33,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,258,37,262,41,"Octopus's Henchman",2192,2,.@label$;
+		break;
+	}
+	end;
+OnDisable:
+	killmonster instance_mapname("1@cash"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; // Not in official script.
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnTouch:
+	if (getd("."+strnpcinfo(0)+instance_id())) end;
+	setd "."+strnpcinfo(0)+instance_id(),1;
+	hideonnpc instance_npcname(strnpcinfo(0));
+	mapannounce instance_mapname("1@cash"),"Come out all my babies and help me out!",bc_map,"0xFFFF00";
+	initnpctimer;
+	end;
+OnTimer5000:
+	set .@map$, instance_mapname("1@cash");
+	mapannounce .@map$,"Let's give them a lesson!",bc_map,"0xFFFF00";
+	set .@label$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	set .@i, atoi(charat(strnpcinfo(0),8));
+	switch(.@i) {
+	case 1:
+		areamonster .@map$,18,112,22,116,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,18,112,22,116,"Octopus's Henchman",2192,3,.@label$;
+		break;
+	case 2:
+		areamonster .@map$,86,188,90,192,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,96,98,100,102,"Octopus's Henchman",2192,3,.@label$;
+		break;
+	case 3:
+		areamonster .@map$,305,213,309,217,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,305,213,309,217,"Octopus's Henchman",2192,3,.@label$;
+		break;
+	case 4:
+		areamonster .@map$,370,129,374,133,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,370,129,374,133,"Octopus's Henchman",2192,3,.@label$;
+		break;
+	}
+	end;
+OnTimer30000:
+	setd "."+strnpcinfo(0)+instance_id(),0;
+	stopnpctimer;
+	set .@i, atoi(charat(strnpcinfo(0),8));
+	donpcevent instance_npcname("oct_foot_exit"+.@i)+"::OnEnable";
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@cash");
+	if (mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) {
+		mapannounce .@map$,"You hurt my babies!!? You'll have to pay for this!!!",bc_map,"0x00ff99";
+		setd "."+strnpcinfo(0)+instance_id(),0;
+		stopnpctimer;
+		set .@i, atoi(charat(strnpcinfo(0),8));
+		donpcevent instance_npcname("oct_foot_exit"+.@i)+"::OnEnable";
+		donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
+		end;
+	}
+	end;
+}
+1@cash,88,190,0	duplicate(oct_foot1)	oct_foot2	HIDDEN_WARP_NPC,6,6
+1@cash,307,215,0	duplicate(oct_foot1)	oct_foot3	HIDDEN_WARP_NPC,6,6
+1@cash,372,131,0	duplicate(oct_foot1)	oct_foot4	HIDDEN_WARP_NPC,6,6
+
+1@cash,16,117,0	script	oct_foot_exit1	WARPNPC,2,2,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable:
+	enablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnTouch:
+	warp instance_mapname("1@cash"),198,99;
+	end;
+}
+1@cash,77,193,0	duplicate(oct_foot_exit1)	oct_foot_exit2	WARPNPC,2,2
+1@cash,312,214,0	duplicate(oct_foot_exit1)	oct_foot_exit3	WARPNPC,2,2
+1@cash,370,139,0	duplicate(oct_foot_exit1)	oct_foot_exit4	WARPNPC,2,2
+
+1@cash,15,15,0	script	oct_mob_con	-1,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("oct_mob_con")+"::OnDisable";
+	end;
+OnEnable:
+	set .@map$, instance_mapname("1@cash");
+	enablenpc instance_npcname("oct_mob_con");
+	monster .@map$,32,94,"Hydra",1068,1;
+	monster .@map$,41,101,"Hydra",1068,1;
+	monster .@map$,35,78,"Hydra",1068,1;
+	monster .@map$,35,62,"Hydra",1068,1;
+	monster .@map$,49,54,"Hydra",1068,1;
+	monster .@map$,70,28,"Hydra",1068,1;
+	monster .@map$,83,22,"Hydra",1068,1;
+	monster .@map$,99,23,"Hydra",1068,1;
+	monster .@map$,115,23,"Hydra",1068,1;
+	monster .@map$,132,25,"Hydra",1068,1;
+	monster .@map$,100,185,"Hydra",1068,1;
+	monster .@map$,92,178,"Hydra",1068,1;
+	monster .@map$,92,162,"Hydra",1068,1;
+	monster .@map$,70,121,"Hydra",1068,1;
+	monster .@map$,70,105,"Hydra",1068,1;
+	monster .@map$,105,85,"Hydra",1068,1;
+	monster .@map$,121,84,"Hydra",1068,1;
+	monster .@map$,292,209,"Hydra",1068,1;
+	monster .@map$,303,206,"Hydra",1068,1;
+	monster .@map$,290,163,"Hydra",1068,1;
+	monster .@map$,299,150,"Hydra",1068,1;
+	monster .@map$,308,141,"Hydra",1068,1;
+	monster .@map$,308,125,"Hydra",1068,1;
+	monster .@map$,295,97,"Hydra",1068,1;
+	monster .@map$,279,97,"Hydra",1068,1;
+	monster .@map$,370,111,"Hydra",1068,1;
+	monster .@map$,370,110,"Hydra",1068,1;
+	monster .@map$,371,96,"Hydra",1068,1;
+	monster .@map$,371,80,"Hydra",1068,1;
+	monster .@map$,367,55,"Hydra",1068,1;
+	monster .@map$,343,29,"Hydra",1068,1;
+	monster .@map$,327,24,"Hydra",1068,1;
+	monster .@map$,311,22,"Hydra",1068,1;
+	monster .@map$,295,22,"Hydra",1068,1;
+	monster .@map$,279,22,"Hydra",1068,1;
+	areamonster .@map$,30,67,50,87,"Stapo",1784,1;
+	areamonster .@map$,102,19,122,39,"Stapo",1784,1;
+	areamonster .@map$,89,138,109,158,"Stapo",1784,1;
+	areamonster .@map$,112,83,132,103,"Stapo",1784,1;
+	areamonster .@map$,283,168,303,188,"Stapo",1784,1;
+	areamonster .@map$,292,97,312,117,"Stapo",1784,1;
+	areamonster .@map$,355,64,375,84,"Stapo",1784,1;
+	areamonster .@map$,317,17,337,37,"Stapo",1784,1;
+	donpcevent instance_npcname("oct_backattack1")+"::OnEnable";
+	donpcevent instance_npcname("oct_backattack2")+"::OnEnable";
+	donpcevent instance_npcname("oct_backattack3")+"::OnEnable";
+	donpcevent instance_npcname("oct_backattack4")+"::OnEnable";
+	donpcevent instance_npcname("oct_mob_con")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("oct_mob_con");
+	end;
+}
+
+1@cash,45,53,0	script	oct_backattack1	HIDDEN_WARP_NPC,3,3,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("oct_backattack1");
+	end;
+OnTouch:
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,39,59,"Hydra",1068,1;
+	monster .@map$,40,59,"Hydra",1068,1;
+	monster .@map$,41,59,"Hydra",1068,1;
+	monster .@map$,47,50,"Hydra",1068,1;
+	monster .@map$,48,50,"Hydra",1068,1;
+	monster .@map$,49,50,"Hydra",1068,1;
+	monster .@map$,41,53,"Octopus's Henchman",2192,1;
+	mapannounce .@map$,"Don't let them break through, stop them!!!",bc_map,"0x00ff99";
+	specialeffect EF_BASH;
+	disablenpc instance_npcname("oct_backattack1");
+	end;
+OnEnable:
+	enablenpc instance_npcname("oct_backattack1");
+	end;
+}
+
+1@cash,78,99,0	script	oct_backattack2	HIDDEN_WARP_NPC,3,3,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("oct_backattack2");
+	end;
+OnTouch:
+	if (getd("."+instance_id())) end;
+	setd "."+instance_id(),1;
+	initnpctimer;
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,1;
+	mapannounce .@map$,"Headquarters are empty, GO!!!",bc_map,"0x00ff99";
+	hideonnpc instance_npcname("oct_backattack2");
+	end;
+OnTimer2000:
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,1;
+	mapannounce .@map$,"Run, RUN! Go, GO!!!",bc_map,"0x00ff99";
+	end;
+OnTimer4000:
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,1;
+	mapannounce .@map$,"No time, come out fast!",bc_map,"0x00ff99";
+	end;
+OnTimer6000:
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,3;
+	mapannounce .@map$,"Let's take over the headquarters!!!",bc_map,"0x00ff99";
+	end;
+OnTimer8000:
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,1;
+	mapannounce .@map$,"There is no time to lose, hurry up!!!",bc_map,"0x00ff99";
+	stopnpctimer;
+	end;
+OnEnable:
+	enablenpc instance_npcname("oct_backattack2");
+	end;
+}
+
+1@cash,299,144,0	script	oct_backattack3	HIDDEN_WARP_NPC,3,3,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("oct_backattack3");
+	end;
+OnTouch:
+	if (getd("."+instance_id())) end;
+	setd "."+instance_id(),1;
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,293,153,"Octopus's Henchman ",2192,1;
+	monster .@map$,294,152,"Octopus's Henchman ",2192,1;
+	monster .@map$,292,153,"Octopus's Henchman ",2192,1;
+	monster .@map$,293,151,"Octopus's Henchman ",2192,1;
+	monster .@map$,293,152,"Octopus's Henchman ?",2175,1;
+	mapannounce .@map$,"Kakaka! Suprised??!!",bc_map,"0x00ff99";
+	initnpctimer;
+	hideonnpc instance_npcname("oct_backattack3");
+	end;
+OnTimer5000:
+	mapannounce instance_mapname("1@cash"),"... Looks like we have a spy among us.",bc_map,"0x00ff99";
+	stopnpctimer;
+	end;
+OnEnable:
+	enablenpc instance_npcname("oct_backattack3");
+	end;
+}
+
+1@cash,336,36,0	script	oct_backattack4	HIDDEN_WARP_NPC,3,3,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("oct_backattack4");
+	end;
+OnTouch:
+	if (getd("."+instance_id())) end;
+	setd "."+instance_id(),1;
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,332,37,"Octopus's Henchman ",2192,1;
+	monster .@map$,332,36,"Octopus's Henchman ",2192,1;
+	monster .@map$,332,35,"Octopus's Henchman ",2192,1;
+	monster .@map$,332,34,"Octopus's Henchman ",2192,1;
+	monster .@map$,341,37,"Octopus's Henchman ",2192,1;
+	monster .@map$,341,36,"Octopus's Henchman ",2192,1;
+	monster .@map$,341,35,"Octopus's Henchman ",2192,1;
+	monster .@map$,341,34,"Octopus's Henchman ",2192,1;
+	monster .@map$,260,40,"Mercenary Squid",2175,1;
+	monster .@map$,260,41,"Mercenary Squid",2175,1;
+	monster .@map$,260,39,"Mercenary Squid",2175,1;
+	monster .@map$,259,40,"Mercenary Squid",2175,1;
+	monster .@map$,261,40,"Mercenary Squid",2175,1;
+	mapannounce .@map$,"What a successful pincer tactic! The enemy is strong! Let's not lose yourselves! Anyway, where are all the mercenaries??",bc_map,"0x00ff99";
+	initnpctimer;
+	hideonnpc instance_npcname("oct_backattack4");
+	end;
+OnTimer5000:
+	mapannounce instance_mapname("1@cash"),"Mercenary Squid : eh...eh... wrong direction. No enemies are shown in this direction.",bc_map,"0x00ff99";
+	end;
+OnTimer7000:
+	mapannounce instance_mapname("1@cash"),"Pervert Octopus : Fools! Can't you read the map??!! Useless!!",bc_map,"0x00ff99";
+	stopnpctimer;
+	end;
+OnEnable:
+	enablenpc instance_npcname("oct_backattack4");
+	end;
+}
+
+1@cash,2,2,0	script	oct_boss_con	-1,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("oct_boss_con")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("oct_boss_con");
+	end;
+OnEnable:
+	enablenpc instance_npcname("oct_boss_con");
+	donpcevent instance_npcname("oct_boss_foot")+"::OnEnable";
+	monster instance_mapname("1@cash"),199,188,"Disgusting Octopus",2194,1,instance_npcname("oct_boss_con")+"::OnMyMobDead";
+	initnpctimer;
+	end;
+OnTimer7000:
+	callsub OnAnnounce,
+		"You won't attack the one man.",
+		"I got fired from ink manufacturer last week.",
+		"Disgusting Octopus : Arghhhhh, come on!";
+	end;
+OnTimer14000:
+	callsub OnAnnounce,
+		"Why... why can't you know my heart!",
+		"Do you know how hard it is to live these days because there are not many new adventurers?",
+		"You.. I'll destroy you all...!";
+	end;
+OnTimer21000:
+	callsub OnAnnounce,
+		"What? I'm a disgusting octopus? You're sadists.",
+		"Let's not do this and how about we look for the best solution, huh??",
+		"Even if I fail here, I will keep coming back, forever!!!";
+	end;
+OnTimer28000:
+	callsub OnAnnounce,
+		"Instinct of mating is for males, what did I do wrong?",
+		"Do you really want to solve the problem between humans by violence?? Ah, I'm an octopus...",
+		"That's enough! Back off!";
+	end;
+OnTimer35000:
+	callsub OnAnnounce,
+		"Do I have to spend Christmas alone again...",
+		"Youth unemployment became a big issue these days... You won't get a job if you keep playing with me here.",
+		"This is as far as I can go!";
+	end;
+OnTimer42000:
+	callsub OnAnnounce,
+		"Hand on your heart and think if you come onto anyone...",
+		"Let's not do this here and follow the law!",
+		"You'll keep on doing this til the end, is that it?";
+	end;
+OnTimer49000:
+	callsub OnAnnounce,
+		"errrrrrrrrrrrrrrrrrrrrrrrr... Cough! Cough!",
+		"Disgusting Octopus : Violence cannot be justified in any case.",
+		"This is my place!!!";
+	stopnpctimer;
+	initnpctimer;
+	end;
+OnAnnounce:
+	mapannounce instance_mapname("1@cash"),"Disgusting Octopus : "+getarg(rand(3)),bc_map,"0xFFFF00";
+	return;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@cash");
+	if (mobcount(.@map$,instance_npcname("oct_boss_con")+"::OnMyMobDead") < 1) {
+		mapannounce .@map$,"Disgusting Octopus : That's it for the today! Next time, I will play with you badly!",bc_map,"0xFFFF00";
+		enablenpc instance_npcname("oct_exit_1");
+		enablenpc instance_npcname("oct_exit_2");
+		donpcevent instance_npcname("oct_boss_foot")+"::OnDisable";
+		stopnpctimer;
+		donpcevent instance_npcname("oct_boss_con")+"::OnDisable";
+		end;
+	}
+	end;
+}
+
+1@cash,4,4,0	script	oct_boss_foot	-1,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("oct_boss_foot")+"::OnDisable";
+	end;
+OnEnable:
+	enablenpc instance_npcname("oct_boss_foot");
+	initnpctimer;
+	end;
+OnCall:
+	set .@map$, instance_mapname("1@cash");
+	if (mobcount(.@map$,instance_npcname("oct_boss_foot")+"::OnMyMobDead") < 100) {
+		switch(rand(2)) {
+		case 0:
+			mapannounce .@map$,"Disgusting Octopus : Do you know how many legs octopus have? It doesn't matter, I have unlimited legs!!",bc_map,"0xFFFF00";
+			areamonster .@map$,192,181,206,195,"Octopus Leg",2193,1,instance_npcname("oct_boss_foot")+"::OnMyMobDead";
+			break;
+		case 1:
+			mapannounce .@map$,"Disgusting Octopus : I...cannot..hold anymore, my babies~ please come out and fight!",bc_map,"0xFFFF00";
+			areamonster .@map$,192,181,206,195,"Octopus's Henchman ",2192,5,instance_npcname("oct_boss_foot")+"::OnMyMobDead";
+			break;
+		}
+	}
+	initnpctimer;
+	end;
+OnTimer10000:
+	stopnpctimer;
+	donpcevent instance_npcname("oct_boss_foot")+"::OnCall";
+	end;
+OnDisable:
+	stopnpctimer;
+	killmonster instance_mapname("1@cash"),instance_npcname("oct_boss_foot")+"::OnMyMobDead"; // Not in official script.
+	disablenpc instance_npcname("oct_boss_foot");
+	end;
+OnMyMobDead:
+	end;
+}
+
+1@cash,198,116,0	script	oct_boss_warp	WARPNPC,2,2,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname("oct_boss_warp");
+	end;
+OnTouch:
+	warp instance_mapname("1@cash"),210,172;
+	end;
+}
+
+1@cash,190,208,0	script	oct_exit_1	WARPNPC,2,2,{
+	end;
+OnInstanceInit:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnTouch:
+	mes "Do you want to go out from the octopus dungeon?";
+	next;
+	if(select("No!:Yes!") == 2)
+		warp "mal_dun01",153,233;
+	close;
+}
+1@cash,198,82,0	duplicate(oct_exit_1)	oct_exit_2	WARPNPC,2,2
+// This is never enabled in the official script.
+//1@cash,200,161,0	duplicate(oct_exit_1)	oct_exit_3	WARPNPC,2,2
+
+// Warp Portals
+//============================================================
+1@cash,193,82,0	warp	oct_door1	2,2,1@cash,151,48
+1@cash,154,53,0	warp	oct_door2	2,2,1@cash,197,87
+1@cash,187,99,0	warp	oct_door3	2,2,1@cash,148,128
+1@cash,153,133,0	warp	oct_door4	2,2,1@cash,197,99
+1@cash,209,100,0	warp	oct_door5	2,2,1@cash,250,111
+1@cash,244,118,0	warp	oct_door6	2,2,1@cash,199,100
+1@cash,209,83,0	warp	oct_door7	2,2,1@cash,252,46
+1@cash,246,53,0	warp	oct_door8	2,2,1@cash,203,83
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
new file mode 100644
index 000000000..4be3133bc
--- /dev/null
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -0,0 +1,2059 @@
+//===== Hercules Script ======================================
+//= Old Glast Heim
+//===== By: ==================================================
+//= Ziu, Heris (translation)
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Discover the history of events that took place in the
+//= Glast Heim castle and how it ended up in ruins.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+1@gl_k	mapflag	src4instance
+2@gl_k	mapflag	src4instance
+//============================================================
+glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
+	mes "^ff0000This isn't considered a normal progression dungeon. Please note this point.^000000";
+	next;
+	mes "[Hugin]";
+	mes "Huh? You feel like you have seen me in different places? I see. What can I say?";
+	next;
+	set .@ghins_time, checkquest(12317,PLAYTIME);
+	if (.@ghins_time == -1) {
+
+		set .@party_id,getcharid(1);
+		set .@p_name$,getpartyname(.@party_id);
+		set .@md_name$,"Old Glast Heim";
+
+		if (!instance_check_party(.@party_id,2)) {
+			//custom
+			mes "[Hugin]";
+			mes "Where are your party members?";
+			close;
+		}
+
+		if (getcharid(0) == getpartyleader(.@party_id,2))
+			set .@menu$, "Create the time gap.:Enter the Old Glast Heim.:Cancel.";
+		else
+			set .@menu$, ":Enter the Old Glast Heim.:Cancel.";
+		switch(select(.@menu$)) {
+		case 1:
+			set .@instance, instance_create(.@md_name$,.@party_id);
+			if (.@instance < 0) {
+				mes "Party Name: "+.@p_name$;
+				mes "Party Leader: "+strcharinfo(0);
+				mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
+				close;
+			}
+			if (instance_attachmap("1@gl_k",.@instance) == "" || instance_attachmap("2@gl_k",.@instance) == "") {
+				mes "^0000ff"+.@md_name$+"^000000 - Reservation Failed!";
+				instance_destroy(.@instance);
+				close;
+			}
+			instance_set_timeout 3600,300,.@instance;
+			instance_init(.@instance);
+			mes "[Hugin]";
+			mes "The time gap was created. When you're ready, talk to me again.";
+			close;
+		case 2:
+			if( has_instance("1@gl_k") == "" ) {
+				mes "The memorial dungeon "+.@md_name$+" does not exist.";
+				mes "The party leader did not generate the dungeon yet.";
+				close;
+			} else {
+				mapannounce "glast_01",strcharinfo(0)+", member of the party "+.@p_name$+" entered the instance "+.@md_name$+".",bc_map,"0x00ff99";
+				setquest 12317;
+				setquest 12318;
+				warp "1@gl_k",150,20;
+				end;
+			}
+		case 3:
+			close;
+		}
+	} else if (.@ghins_time == 0 || .@ghins_time == 1) {
+		mes "[Hugin]";
+		mes "Oh, geez.";
+		mes "Your body is still under the effects of time travel. In this state, you will not be able to travel again.";
+		next;
+		mes "[Hugin]";
+		mes "You should rest and come back later for more.";
+		close;
+	} else {
+		mes "^0000ffOld Glast Heim access trail has been cleared. It is now possible to talk to Hugin.^000000";
+		erasequest 12317;
+		if (checkquest(12318) > -1) erasequest 12318;
+		if (checkquest(12319) > -1) erasequest 12319;
+		close;
+	}
+}
+
+// Floor 1
+//============================================================
+1@gl_k,149,41,6	script	Varmunt#ghinstance1	4_M_BARMUND,{
+	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+		mes "Hey ^0000ffguys^000000, were you sent here to help me?";
+		npctalk "Hey guys, were you sent here to help me?";
+		cutin "gl_barmund1",2;
+		next;
+		select("Oh. Well, about that...");
+		mes "["+strcharinfo(0)+"]";
+		mes "Oh yeah, hahaha, we were told to meet someone called Varmunt.";
+		unittalk getcharid(3),"Oh yeah, hahaha, we were told to meet someone called Varmunt.";
+		next;
+		mes "[Varmunt]";
+		mes "We don't have time. We must tell Sir Heinrich about Himmelmez's invasion.";
+		npctalk "We don't have time. We must tell Sir Heinrich about Himmelmez's invasion.";
+		cutin "gl_barmund2",2;
+		next;
+		select("What Himmelmez...");
+		mes "["+strcharinfo(0)+"]";
+		mes "Himmelmez? Who the hell is she?";
+		unittalk getcharid(3),"Himmelmez? Who the hell is she?";
+		next;
+		mes "[Varmunt]";
+		mes "Didn't anybody give you the basic informations?";
+		npctalk "Didn't anybody give you the basic informations?";
+		cutin "gl_barmund3",2;
+		next;
+		mes "[Varmunt]";
+		mes "The Valkyrie of the dead. She's after the Ymir's Heart pieces hidden here.";
+		npctalk "The Valkyrie of the dead. She's after the Ymir's Heart pieces hidden here";
+		cutin "gl_barmund2",2;
+		next;
+		mes "[Varmunt]";
+		mes "She's capable of destroying the whole castle for this purpose.";
+		npctalk "She's capable of destroying the whole castle for this purpose.";
+		next;
+		mes "[Varmunt]";
+		mes "Hurry up! Inform Sir Heinrich that Himmelmez is coming. I will briefly explore the enchantments she made to this place!";
+		npctalk "Hurry up! Inform Sir Heinrich that Himmelmez is coming. I will briefly explore the enchantments she made to this place!";
+		close2;
+		cutin "gl_barmund2",255;
+		donpcevent instance_npcname("Varmunt#ghinstance1")+"::OnDisable2";
+		end;
+	} else {
+		mes "[Varmunt]";
+		mes "Where is he? We";
+		mes "need his help.";
+		cutin "gl_barmund2",2;
+		close2;
+		cutin "gl_barmund2",255;
+		end;
+	}
+OnInstanceInit:
+	donpcevent instance_npcname("Varmunt#ghinstance1")+"::OnEnable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Varmunt#ghinstance1");
+	end;
+OnDisable2:
+	hideonnpc instance_npcname("Varmunt#ghinstance1");
+
+	for(set .@i,1; .@i<=20; set .@i,.@i+4) {
+		hideoffnpc instance_npcname("Khalitzburg Crusader#"+.@i);
+		hideoffnpc instance_npcname("Khalitzburg Crusader#"+(.@i+1));
+		hideoffnpc instance_npcname("White Knight#"+(.@i+2));
+		hideoffnpc instance_npcname("White Knight#"+(.@i+3));
+	}
+	hideoffnpc instance_npcname("Khalitzburg Crusader#21");
+	hideoffnpc instance_npcname("Khalitzburg Crusader#22");
+
+	hideoffnpc instance_npcname("Heinrich#ghinstance1");
+	hideoffnpc instance_npcname("Varmunt#ghinstance2");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Varmunt#ghinstance1");
+	end;
+}
+
+1@gl_k,145,54,6	script	Khalitzburg Crusader#1	4_F_KHALITZBURG,{
+	mes "["+strnpcinfo(1)+"]";
+	switch((atoi(strnpcinfo(2)) + 1) / 2) {
+		case 1: mes "Would I be recruited?"; break;
+		case 2: mes "May I help you?"; break;
+		case 3: mes "..."; break;
+		case 4: mes "I do not like to chit-chat during work."; break;
+		case 5: mes "The aura of the castle has changed, don't you think? Something like a presence seemed to appear a little while ago."; break;
+		case 6: mes "I wonder what commandant Varmunt is doing. I heard people are running away..."; break;
+		case 7: mes "Quiet please."; break;
+		case 8: mes "A fuss seems to be near."; break;
+		case 9: mes "A dream last night really bothered me. My mother used to say that these dreams may come true..."; break;
+		case 10: mes "Is Varmunt going with you? The commandant is waiting for you."; break;
+		case 11: mes "Soon it's time to change shifts. I wonder what happened to the other knights."; break;
+	}
+	close;
+OnInstanceInit:
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable:
+	hideoffnpc instance_npcname(strnpcinfo(0));
+	end;
+}
+1@gl_k,154,54,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#2	4_F_KHALITZBURG
+1@gl_k,145,59,6	duplicate(Khalitzburg Crusader#1)	White Knight#3	4_WHITEKNIGHT
+1@gl_k,154,59,3	duplicate(Khalitzburg Crusader#1)	White Knight#4	4_WHITEKNIGHT
+1@gl_k,145,64,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#5	4_F_KHALITZBURG
+1@gl_k,154,64,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#6	4_F_KHALITZBURG
+1@gl_k,145,69,6	duplicate(Khalitzburg Crusader#1)	White Knight#7	4_WHITEKNIGHT
+1@gl_k,154,69,3	duplicate(Khalitzburg Crusader#1)	White Knight#8	4_WHITEKNIGHT
+1@gl_k,145,74,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#9	4_F_KHALITZBURG
+1@gl_k,154,74,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#10	4_F_KHALITZBURG
+1@gl_k,145,79,6	duplicate(Khalitzburg Crusader#1)	White Knight#11	4_WHITEKNIGHT
+1@gl_k,154,79,3	duplicate(Khalitzburg Crusader#1)	White Knight#12	4_WHITEKNIGHT
+1@gl_k,145,84,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#13	4_F_KHALITZBURG
+1@gl_k,154,84,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#14	4_F_KHALITZBURG
+1@gl_k,145,89,6	duplicate(Khalitzburg Crusader#1)	White Knight#15	4_WHITEKNIGHT
+1@gl_k,154,89,3	duplicate(Khalitzburg Crusader#1)	White Knight#16	4_WHITEKNIGHT
+1@gl_k,145,94,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#17	4_F_KHALITZBURG
+1@gl_k,154,94,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#18	4_F_KHALITZBURG
+1@gl_k,145,99,6	duplicate(Khalitzburg Crusader#1)	White Knight#19	4_WHITEKNIGHT
+1@gl_k,154,99,3	duplicate(Khalitzburg Crusader#1)	White Knight#20	4_WHITEKNIGHT
+1@gl_k,145,104,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#21	4_F_KHALITZBURG
+1@gl_k,154,104,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#22	4_F_KHALITZBURG
+
+1@gl_k,149,100,6	script	Heinrich#ghinstance1	4_M_HEINRICH,{
+	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+		cutin "gl_heinrich2",2;
+		select("Heinrich, about the castle...");
+		mes "["+strcharinfo(0)+"]";
+		mes "Do you know what is happening now in the castle, Heinrich?";
+		unittalk getcharid(3),"Do you know what is happening now in the castle, Heinrich?";
+		next;
+		mes "[Heinrich]";
+		mes "You are the adventurers who have come with Varmunt, right?";
+		npctalk "You are the adventurers who have come with Varmunt, right?";
+		next;
+		mes "[Heinrich]";
+		mes "What can I do for you? Is there something wrong?";
+		npctalk "What can I do for you? Is there something wrong?";
+		next;
+		select("The Ymir's Heart. Himmelmez...");
+		mes "["+strcharinfo(0)+"]";
+		mes "Himmelmez, the Valkyrie of the dead is looking to get a piece of the Ymir's heart hidden in the castle!";
+		unittalk getcharid(3),"Himmelmez, the Valkyrie of the dead is looking to get a piece of the Ymir's heart hidden in the castle!";
+		next;
+		mes "[Heinrich]";
+		mes "Haha. That's a nice joke. Now tell me what brings you here.";
+		npctalk "Haha. That's a nice joke. Now tell me what brings you here.";
+		cutin "gl_heinrich1",2;
+		next;
+		mes "[Varmunt]";
+		mes "I am not joking Heinrich, Sir. Now, if my judgement is correct, she will be here soon.";
+		donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnTalk1";
+		cutin "gl_barmund2",2;
+		next;
+		mes "[Varmunt]";
+		mes "I trust this guy following me. The Ymir's Heart pieces must be hidden in a safe place before Himmelmez takes them!";
+		donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnTalk2";
+		next;
+		select("Even if you do not believe...");
+		mes "["+strcharinfo(0)+"]";
+		mes "Even if you don't believe it, do something. We do not have much time!";
+		unittalk getcharid(3),"Even if you don't believe it, do something. We do not have much time!";
+		cutin "gl_barmund2",255;
+		next;
+		mes "[Heinrich]";
+		mes "I will be glad if you give me two minutes, please. But now the king isn't in his room.";
+		npctalk "I will be glad if you give me two minutes, please. But now the king isn't in his room.";
+		cutin "gl_heinrich1",2;
+		next;
+		mes "[Heinrich]";
+		mes "But I think that with such a busy agenda, he won't be able to take care of this.";
+		npctalk "But I think that with such a busy agenda, he won't be able to take care of this.";
+		donpcevent instance_npcname("Heinrich#ghinstance1")+"::OnDisable";
+		donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnEnable";
+		donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnEnable";
+		donpcevent instance_npcname("#talkinstance1")+"::OnEnable";
+		mapannounce instance_mapname("1@gl_k"), "???? Shout: Ohohohoho~!",bc_map,"0xFFFF00";
+		close2;
+		cutin "gl_heinrich1",255;
+		end;
+	} else {
+		mes "[Heinrich]";
+		mes "Where is your representative?";
+		mes "I need to talk to him.";
+		cutin "gl_heinrich2",2;
+		close2;
+		cutin "gl_heinrich2",255;
+		end;
+	}
+OnInstanceInit:
+	donpcevent instance_npcname("Heinrich#ghinstance1")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Heinrich#ghinstance1");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Heinrich#ghinstance1");
+	end;
+}
+
+1@gl_k,152,97,3	script	Varmunt#ghinstance2	4_M_BARMUND,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Varmunt#ghinstance2");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Varmunt#ghinstance2");
+	end;
+OnTalk1:
+	npctalk "I am not joking Heinrich, Sir. Now, if my judgement is correct, she will be here soon.";
+	end;
+OnTalk2:
+	npctalk "I trust this guy following me. The Ymir's Heart pieces must be hidden in a safe place before Himmelmez takes them!";
+	end;
+OnTalk3:
+	npctalk "Himmelmez!! Through the cracks!";
+	end;
+OnTalk4:
+	npctalk "Unbelievable. My men are...This kind of thing is not possible!";
+	end;
+OnTalk5:
+	npctalk "Heinrich, Sir! I need a quick decision.";
+	end;
+OnTalk6:
+	npctalk "To prevent other attacks, go chase her!";
+	end;
+OnTalk7:
+	npctalk "Now, your help is desperately needed. I hopefully ask you.";
+	end;
+}
+
+1@gl_k,149,97,6	script	Heinrich#ghinstance2	4_M_HEINRICH,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Heinrich#ghinstance2");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Heinrich#ghinstance2");
+	end;
+OnTalk1:
+	npctalk "Who?!";
+	end;
+OnTalk2:
+	npctalk "That who rules the dead? No doubt, a pretty story. Here, some tea will be served to entertain the ladies. Unfortunately, I do not...";
+	end;
+OnTalk3:
+	npctalk "What did you say?";
+	end;
+OnTalk4:
+	npctalk "The King responded to the invitation of the Rune Midgard's Royal Family and hasn't come back yet.";
+	end;
+OnTalk5:
+	npctalk "Just leave before you get in trouble. This is the King's will!";
+	end;
+OnTalk6:
+	npctalk "Damn! She has detected the position of the Ymir's Heart pieces.";
+	end;
+OnTalk7:
+	npctalk "Now, Khalitzburg Crusaders and White Knights, follow me...";
+	end;
+OnTalk8:
+	npctalk "Unbelievable. My men are...This kind of thing is not possible!";
+	end;
+OnTalk9:
+	npctalk "I'm sorry...";
+	end;
+OnTalk10:
+	npctalk "I'm sorry, my lord! Do not forgive me!";
+	end;
+}
+
+1@gl_k,149,100,6	script	Heinrich#ghinstance3	4_M_HEINRICH,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Heinrich#ghinstance3");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Heinrich#ghinstance3");
+	end;
+OnTalk1:
+	npctalk "I cannot believe I killed my men with my own hands!";
+	end;
+OnTalk2:
+	npctalk "Varmunt is right about that. Now is not the time to regret.";
+	end;
+OnTalk3:
+	npctalk "People, gather around and follow my orders.";
+	end;
+OnTalk4:
+	npctalk "Himmelmez is turning into monsters all the people she put to sleep.";
+	end;
+OnTalk5:
+	npctalk "I don't know if there are survivors around here yet.";
+	end;
+OnTalk6:
+	npctalk "If there are survivors from this evil thing, please rescue them.";
+	end;
+OnTalk7:
+	npctalk "With Varmunt by my side, I'm going to chase Himmelmez down.";
+	end;
+OnTalk8:
+	npctalk "Hurry up Varmunt, let's chase her down.";
+	end;
+}
+
+1@gl_k,149,89,1	script	Himmelmez#ghinstance1	4_F_HIMEL,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Himmelmez#ghinstance1");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Himmelmez#ghinstance1");
+	end;
+OnTalk1:
+	npctalk "This~ Did I interrupt your conversation? The thing is, it's been too long since the last guests saw some sadness spread...";
+	end;
+OnTalk2:
+	npctalk "My name is Lisa Kahn Himmelmez. I am called the Valkyrie of the dead, master of the Dullahan.";
+	end;
+OnTalk3:
+	npctalk "There's no need to pretend to be so laid back. Don't bluff about the whereabouts of you Majesty and things will be alright.";
+	end;
+OnTalk4:
+	npctalk "Hohoho, do you have any questions? You're a really mysterious man.";
+	end;
+OnTalk5:
+	npctalk "Not coveting the king's throne, you're such a stupid man, only waiting for his return. Your innocence is true, I love it.";
+	end;
+OnTalk6:
+	npctalk "You make me wish we hadn't met in this situation. Too bad we did.";
+	end;
+OnTalk7:
+	npctalk "Well~ Today, with such a busy commandant, I won't be able to talk as much as I'd love for you to contemplate my explanation~";
+	end;
+OnTalk8:
+	npctalk "I gotta get my job done. Meanwhile why don't you meet my men? Hohoho.";
+	end;
+}
+
+// Control Timer
+//============================================================
+1@gl_k,0,0,0	script	#talkinstance1	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#talkinstance1")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#talkinstance1");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#talkinstance1");
+	initnpctimer;
+	end;
+OnTimer5000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk1";
+	end;
+OnTimer10000:
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk1";
+	end;
+OnTimer15000:
+	donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnTalk3";
+	end;
+OnTimer20000:
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk2";
+	end;
+OnTimer25000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk2";
+	end;
+OnTimer30000:
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk3";
+	end;
+OnTimer35000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk3";
+	end;
+OnTimer45000:
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk4";
+	end;
+OnTimer50000:
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk5";
+	end;
+OnTimer55000:
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk6";
+	end;
+OnTimer60000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk4";
+	end;
+OnTimer65000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk5";
+	end;
+OnTimer70000:
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk7";
+	end;
+OnTimer75000:
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk8";
+	end;
+OnTimer80000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk6";
+	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnDisable";
+	end;
+OnTimer85000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk7";
+	hideonnpc instance_npcname("Varmunt#ghinstance1");
+
+	for(set .@i,1; .@i<=20; set .@i,.@i+4) {
+		hideonnpc instance_npcname("Khalitzburg Crusader#"+.@i);
+		hideonnpc instance_npcname("Khalitzburg Crusader#"+(.@i+1));
+		hideonnpc instance_npcname("White Knight#"+(.@i+2));
+		hideonnpc instance_npcname("White Knight#"+(.@i+3));
+	}
+	hideonnpc instance_npcname("Khalitzburg Crusader#21");
+	hideonnpc instance_npcname("Khalitzburg Crusader#22");
+
+	set .@map$, instance_mapname("1@gl_k");
+	set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead";
+	monster .@map$,145,59,"Abyss Knight",2470,1,.@label$;
+	monster .@map$,154,59,"Abyss Knight",2470,1,.@label$;
+	monster .@map$,145,69,"Abyss Knight",2470,1,.@label$;
+	monster .@map$,154,69,"Abyss Knight",2470,1,.@label$;
+	monster .@map$,145,79,"Abyss Knight",2470,1,.@label$;
+	monster .@map$,154,79,"Abyss Knight",2470,1,.@label$;
+	monster .@map$,145,89,"Abyss Knight",2470,1,.@label$;
+	monster .@map$,154,89,"Abyss Knight",2470,1,.@label$;
+	monster .@map$,145,99,"Abyss Knight",2470,1,.@label$;
+	monster .@map$,154,99,"Abyss Knight",2470,1,.@label$;
+
+	for(set .@i,1; .@i<=22; set .@i,.@i+1)
+		hideoffnpc instance_npcname(".#ghinstance"+.@i);
+
+	donpcevent instance_npcname(".#ghinstance22")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance21")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance18")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance17")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance14")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance13")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance10")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance9")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance6")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance5")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance2")+"::OnTalkK";
+	donpcevent instance_npcname(".#ghinstance1")+"::OnTalkK";
+	end;
+OnTimer88000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk8";
+
+	for(set .@i,1; .@i<=20; set .@i,.@i+4) {
+		hideonnpc instance_npcname(".#ghinstance"+.@i);
+		hideonnpc instance_npcname(".#ghinstance"+(.@i+1));
+		disablenpc instance_npcname(".#ghinstance"+(.@i+2));
+		disablenpc instance_npcname(".#ghinstance"+(.@i+3));
+	}
+	hideonnpc instance_npcname(".#ghinstance21");
+	hideonnpc instance_npcname(".#ghinstance22");
+
+	set .@map$, instance_mapname("1@gl_k");
+	set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead";
+	monster .@map$,145,54,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,154,54,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,145,64,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,154,64,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,145,74,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,154,74,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,145,84,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,154,84,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,145,94,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,154,94,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,145,104,"Khalitzburg",2471,1,.@label$;
+	monster .@map$,154,104,"Khalitzburg",2471,1,.@label$;
+	end;
+OnTimer93000:
+	donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnTalk4";
+	end;
+OnTimer97000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk9";
+	end;
+OnTimer105000:
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnTalk10";
+	mapannounce instance_mapname("1@gl_k"), "Heinrich's Shout: Dead men, dead men all over the place!",bc_map,"0xFFFF00";
+	end;
+OnTimer107000:
+	mapannounce instance_mapname("1@gl_k"), "Heinrich's Shout: Everybody! Go back!",bc_map,"0xFFFF00";
+	end;
+OnTimer110000:
+	donpcevent instance_npcname(".#ghinstance22")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance21")+"::OnEffect1";
+	end;
+OnTimer110500:
+	enablenpc instance_npcname(".#ghinstance20");
+	enablenpc instance_npcname(".#ghinstance19");
+	donpcevent instance_npcname(".#ghinstance20")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance19")+"::OnEffect1";
+	end;
+OnTimer111000:
+	donpcevent instance_npcname(".#ghinstance18")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance17")+"::OnEffect1";
+	end;
+OnTimer111500:
+	enablenpc instance_npcname(".#ghinstance16");
+	enablenpc instance_npcname(".#ghinstance15");
+	donpcevent instance_npcname(".#ghinstance16")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance15")+"::OnEffect1";
+	end;
+OnTimer112000:
+	donpcevent instance_npcname(".#ghinstance14")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance13")+"::OnEffect1";
+	end;
+OnTimer112500:
+	enablenpc instance_npcname(".#ghinstance12");
+	enablenpc instance_npcname(".#ghinstance11");
+	donpcevent instance_npcname(".#ghinstance12")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance11")+"::OnEffect1";
+	end;
+OnTimer113000:
+	donpcevent instance_npcname(".#ghinstance10")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance9")+"::OnEffect1";
+	end;
+OnTimer113500:
+	enablenpc instance_npcname(".#ghinstance8");
+	enablenpc instance_npcname(".#ghinstance7");
+	donpcevent instance_npcname(".#ghinstance8")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance7")+"::OnEffect1";
+	end;
+OnTimer114000:
+	donpcevent instance_npcname(".#ghinstance6")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance5")+"::OnEffect1";
+	end;
+OnTimer114500:
+	enablenpc instance_npcname(".#ghinstance4");
+	enablenpc instance_npcname(".#ghinstance3");
+	donpcevent instance_npcname(".#ghinstance4")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance3")+"::OnEffect1";
+	end;
+OnTimer114750: //custom time
+	disablenpc instance_npcname(".#ghinstance3");
+	disablenpc instance_npcname(".#ghinstance4");
+	disablenpc instance_npcname(".#ghinstance7");
+	disablenpc instance_npcname(".#ghinstance8");
+	disablenpc instance_npcname(".#ghinstance11");
+	disablenpc instance_npcname(".#ghinstance12");
+	disablenpc instance_npcname(".#ghinstance15");
+	disablenpc instance_npcname(".#ghinstance16");
+	disablenpc instance_npcname(".#ghinstance19");
+	disablenpc instance_npcname(".#ghinstance20");
+	end;
+OnTimer115000:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnEnable";
+	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnDisable";
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnTalk1";
+	donpcevent instance_npcname(".#ghinstance2")+"::OnEffect1";
+	donpcevent instance_npcname(".#ghinstance1")+"::OnEffect1";
+	killmonster instance_mapname("1@gl_k"),instance_npcname("#talkinstance1")+"::OnMyMobDead";
+	end;
+OnTimer120000:
+	donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnTalk5";
+	end;
+OnTimer125000:
+	donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnTalk6";
+	end;
+OnTimer130000:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnTalk2";
+	end;
+OnTimer135000:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnTalk3";
+	end;
+OnTimer140000:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnTalk4";
+	end;
+OnTimer145000:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnTalk5";
+	end;
+OnTimer150000:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnTalk6";
+	end;
+OnTimer155000:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnTalk7";
+	end;
+OnTimer160000:
+	donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnTalk7";
+	end;
+OnTimer165000:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnTalk8";
+	end;
+OnTimer167000:
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnDisable";
+	end;
+OnTimer168000:
+	donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnDisable";
+	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnDisable";
+	stopnpctimer;
+	donpcevent instance_npcname("#ghinstancewarp1")+"::OnEnable";
+	donpcevent instance_npcname("#ghinstancewarp2")+"::OnEnable";
+	mapannounce instance_mapname("1@gl_k"), "9 o'clock warp leading to zone 2 is now open.",bc_map,"0xFFFF00";
+	donpcevent instance_npcname("#talkinstance1")+"::OnDisable";
+	donpcevent instance_npcname("#ghmemorialmob01")+"::OnEnable";
+	end;
+OnMyMobDead:
+	end;
+}
+
+1@gl_k,145,54,6	script	.#ghinstance1	MG_KHALITZBURG,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable:
+	hideoffnpc instance_npcname(strnpcinfo(0));
+	end;
+OnEffect1:
+	specialeffect EF_GRANDCROSS;
+	specialeffect EF_LEXAETERNA;
+	end;
+OnTalkK:
+	switch(atoi(replacestr(strnpcinfo(2),"ghinstance",""))) {
+		case 1: npctalk "I do not want to die."; break;
+		case 2: npctalk "Mom..."; break;
+		case 5: npctalk "Help."; break;
+		case 6: npctalk "My stomach hurts..."; break;
+		case 9: npctalk "Heinrich Sir, help!"; break;
+		case 10: npctalk "Ack... Ugh."; break;
+		case 13: npctalk "I'm thirsty."; break;
+		case 14: npctalk "Oh... No... I cannot die..."; break;
+		case 17: npctalk "This is so uncomfortable. Eww!"; break;
+		case 18: npctalk "Who am I..."; break;
+		case 21: npctalk "Uhh... My body."; break;
+		case 22: npctalk "I'm so thirsty!"; break;
+	}
+	end;
+}
+1@gl_k,154,54,3	duplicate(.#ghinstance1)	.#ghinstance2	MG_KHALITZBURG
+1@gl_k,145,64,6	duplicate(.#ghinstance1)	.#ghinstance5	MG_KHALITZBURG
+1@gl_k,154,64,3	duplicate(.#ghinstance1)	.#ghinstance6	MG_KHALITZBURG
+1@gl_k,145,74,6	duplicate(.#ghinstance1)	.#ghinstance9	MG_KHALITZBURG
+1@gl_k,154,74,3	duplicate(.#ghinstance1)	.#ghinstance10	MG_KHALITZBURG
+1@gl_k,145,84,6	duplicate(.#ghinstance1)	.#ghinstance13	MG_KHALITZBURG
+1@gl_k,154,84,3	duplicate(.#ghinstance1)	.#ghinstance14	MG_KHALITZBURG
+1@gl_k,145,94,6	duplicate(.#ghinstance1)	.#ghinstance17	MG_KHALITZBURG
+1@gl_k,154,94,3	duplicate(.#ghinstance1)	.#ghinstance18	MG_KHALITZBURG
+1@gl_k,145,104,6	duplicate(.#ghinstance1)	.#ghinstance21	MG_KHALITZBURG
+1@gl_k,154,104,3	duplicate(.#ghinstance1)	.#ghinstance22	MG_KHALITZBURG
+
+1@gl_k,145,59,6	script	.#ghinstance3	HIDDEN_NPC,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable:
+	hideoffnpc instance_npcname(strnpcinfo(0));
+	end;
+OnEffect1:
+	specialeffect EF_GRANDCROSS;
+	specialeffect EF_LEXAETERNA;
+	end;
+}
+1@gl_k,154,59,3	duplicate(.#ghinstance3)	.#ghinstance4	HIDDEN_NPC
+1@gl_k,145,69,6	duplicate(.#ghinstance3)	.#ghinstance7	HIDDEN_NPC
+1@gl_k,154,69,3	duplicate(.#ghinstance3)	.#ghinstance8	HIDDEN_NPC
+1@gl_k,145,79,6	duplicate(.#ghinstance3)	.#ghinstance11	HIDDEN_NPC
+1@gl_k,154,79,3	duplicate(.#ghinstance3)	.#ghinstance12	HIDDEN_NPC
+1@gl_k,145,89,6	duplicate(.#ghinstance3)	.#ghinstance15	HIDDEN_NPC
+1@gl_k,154,89,3	duplicate(.#ghinstance3)	.#ghinstance16	HIDDEN_NPC
+1@gl_k,145,99,6	duplicate(.#ghinstance3)	.#ghinstance19	HIDDEN_NPC
+1@gl_k,154,99,3	duplicate(.#ghinstance3)	.#ghinstance20	HIDDEN_NPC
+
+1@gl_k,96,80,0	script	#ghinstancewarp1	WARPNPC,1,2,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnEnable:
+	enablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnTouch:
+	set .@map1$, instance_mapname("1@gl_k");
+	set .@map2$, instance_mapname("2@gl_k");
+	switch(atoi(replacestr(strnpcinfo(2),"ghinstancewarp",""))) {
+		case 1: warp .@map1$,80,80; break;
+		case 2: warp .@map1$,105,80; break;
+		case 3: warp .@map1$,215,79; break;
+		case 4: warp .@map1$,195,79; break;
+		case 5: warp .@map1$,215,216; break;
+		case 6: warp .@map1$,235,216; break;
+		case 7: warp .@map2$,150,46; break;
+		case 8: warp .@map2$,126,123; break;
+		case 9: warp .@map2$,150,116; break;
+		case 10: warp .@map2$,174,101; break;
+		case 11: warp .@map2$,150,110; break;
+		case 12: warp .@map2$,150,179; break;
+	}
+	end;
+}
+1@gl_k,90,80,0	duplicate(#ghinstancewarp1)	#ghinstancewarp2	WARPNPC,1,2
+1@gl_k,202,79,0	duplicate(#ghinstancewarp1)	#ghinstancewarp3	WARPNPC,1,2
+1@gl_k,206,79,0	duplicate(#ghinstancewarp1)	#ghinstancewarp4	WARPNPC,1,2
+1@gl_k,228,216,0	duplicate(#ghinstancewarp1)	#ghinstancewarp5	WARPNPC,1,2
+1@gl_k,222,216,0	duplicate(#ghinstancewarp1)	#ghinstancewarp6	WARPNPC,1,2
+1@gl_k,150,284,0	duplicate(#ghinstancewarp1)	#ghinstancewarp7	WARPNPC,1,2
+2@gl_k,145,123,0	duplicate(#ghinstancewarp1)	#ghinstancewarp8	WARPNPC,1,2
+2@gl_k,136,122,0	duplicate(#ghinstancewarp1)	#ghinstancewarp9	WARPNPC,1,2
+2@gl_k,154,101,0	duplicate(#ghinstancewarp1)	#ghinstancewarp10	WARPNPC,1,2
+2@gl_k,165,101,0	duplicate(#ghinstancewarp1)	#ghinstancewarp11	WARPNPC,1,2
+2@gl_k,150,163,0	duplicate(#ghinstancewarp1)	#ghinstancewarp12	WARPNPC,1,2
+
+
+// Sector 1 Mobs
+//============================================================
+1@gl_k,0,0,0	script	#ghmemorialmob01	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob01")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob01");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob01");
+	set .@map$, instance_mapname("1@gl_k");
+	set .@label$, instance_npcname("#ghmemorialmob01")+"::OnMyMobDead";
+	areamonster .@map$,76,99,87,10,"Suffering Chamberlain",2466,15,.@label$;
+	areamonster .@map$,67,39,12,6,"Fallen Monk",2465,20,.@label$;
+	areamonster .@map$,67,39,12,6,"Suffering Chamberlain",2466,3,.@label$;
+	areamonster .@map$,32,75,51,58,"Decayed Butler",2464,6,.@label$;
+	areamonster .@map$,45,84,6,137,"Decayed Butler",2464,12,.@label$;
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@gl_k");
+	set .@label$, instance_npcname("#ghmemorialmob01")+"::OnMyMobDead";
+	set .@mob_dead_num, 56 - mobcount(.@map$,.@label$);
+	if (.@mob_dead_num > 35) {
+		mapannounce .@map$, "Seems like Himmelmez drains the dead's souls. They must be destroyed.",bc_map,"0xFFFFFF";
+		killmonster .@map$,.@label$;
+		donpcevent instance_npcname("Aspiring Butcher#clearGH")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob01")+"::OnDisable";
+	}
+	end;
+}
+
+1@gl_k,17,51,3	script	Aspiring Butcher#clearGH	4_M_KID1,{
+	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+		mes "[Aspiring Butcher]";
+		mes "Help me! Help me!!!";
+		next;
+		select("Hey, wake up! Are there any other survivors?");
+		mes "["+strcharinfo(0)+"]";
+		mes "Hey, wake up! Are you alone?";
+		unittalk getcharid(3),"Hey, wake up! Are you alone?";
+		next;
+		mes "[Aspiring Butcher]";
+		mes "The Chamberlain... the Monk... They've become monsters. I couldn't do anything.";
+		npctalk "The Chamberlain... the Monk... They've become monsters. I couldn't do anything.";
+		next;
+		mes "[Aspiring Butcher]";
+		mes "I just stood still... Nothing, I couldn't do anything...";
+		npctalk "I just stood still... Nothing, I couldn't do anything...";
+		next;
+		select("Wake up!");
+		mes "["+strcharinfo(0)+"]";
+		mes "Wake up kid! Go east along the central passage to the outside! The path is safe!";
+		unittalk getcharid(3),"Wake up kid! Go east along the central passage to the outside! The path is safe!";
+		next;
+		mes "[Aspiring Butcher]";
+		mes "East passage? Alone? How?";
+		npctalk "East passage? Alone? How?";
+		next;
+		select("I can guide you through the path.");
+		mes "["+strcharinfo(0)+"]";
+		mes "I will guide you, perhaps that will help. If you want to close your eyes try not to hit anything.";
+		unittalk getcharid(3),"I will guide you, perhaps that will help. If you want to close your eyes try not to hit anything.";
+		next;
+		mes "[Aspiring Butcher]";
+		mes "Aspiring Butcher: I know, I... I'm trying to.";
+		npctalk "Aspiring Butcher: I know, I... I'm trying to.";
+		donpcevent instance_npcname("Aspiring Butcher#clearGH")+"::OnDisable";
+		donpcevent instance_npcname("#ghmemorialmob02")+"::OnEnable";
+		close;
+	} else {
+		mes "[Aspiring Butcher]";
+		mes "Somebody help me, somebody help me, please.";
+		close;
+	}
+OnInstanceInit:
+	donpcevent instance_npcname("Aspiring Butcher#clearGH")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Aspiring Butcher#clearGH");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Aspiring Butcher#clearGH");
+	end;
+}
+
+// Sector 2 Mobs
+//============================================================
+1@gl_k,291,145,3	script	Hollgrehenn Destroyer	4_F_JOB_BLACKSMITH,{
+	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
+		mes "[Hollgrehenn Destroyer]";
+		mes "Yaaa!! Die!!!";
+		npctalk "Yaaa!! Die!!!";
+		specialeffect EF_CRASHEARTH;
+		next;
+		select("Don't worry!");
+		mes "["+strcharinfo(0)+"]";
+		mes "Don't worry! Mam. Are you alone? No other survivors?";
+		unittalk getcharid(3),"Don't worry! Mam. Are you alone? No other survivors?";
+		next;
+		mes "[Hollgrehenn Destroyer]";
+		mes "I'm the only survivor left";
+		npctalk "I'm the only survivor left";
+		next;
+		select("This is a very dangerous place.");
+		mes "["+strcharinfo(0)+"]";
+		mes "This is a very dangerous place. You know the central passage? Do you think you can move... and get to a safer place?";
+		unittalk getcharid(3),"This is a very dangerous place. You know the central passage? Do you think you can move... and get to a safer place?";
+		next;
+		mes "[Hollgrehenn Destroyer]";
+		mes "Yes, I am able to move. I'll move for my baby's sake.";
+		npctalk "Yes, I am able to move. I'll move for my baby's sake.";
+		next;
+		select("Survive the road...");
+		mes "["+strcharinfo(0)+"]";
+		mes "You and your baby will get out of here safely. But I'm sorry I can't help you more.";
+		unittalk getcharid(3),"You and your baby will get out of here safely. But I'm sorry I can't help you more.";
+		next;
+		mes "[Hollgrehenn Destroyer]";
+		mes "That's ok. Thank you for helping us. I'm good to go alone. Ah and good luck also.";
+		npctalk "That's ok. Thank you for helping us. I'm good to go alone. Ah and good luck also.";
+		donpcevent instance_npcname("Hollgrehenn Destroyer")+"::OnDisable";
+		donpcevent instance_npcname("#ghmemorialmob03")+"::OnEnable";
+		close;
+	} else {
+		mes "[Hollgrehenn Destroyer]";
+		mes "Somebody help me, somebody help me, please";
+		close;
+	}
+OnInstanceInit:
+	donpcevent instance_npcname("Hollgrehenn Destroyer")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Hollgrehenn Destroyer");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Hollgrehenn Destroyer");
+	end;
+}
+
+1@gl_k,0,0,0	script	#ghmemorialmob02	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob02")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob02");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob02");
+	donpcevent instance_npcname("#ghinstancewarp3")+"::OnEnable";
+	donpcevent instance_npcname("#ghinstancewarp4")+"::OnEnable";
+	set .@map$, instance_mapname("1@gl_k");
+	set .@label$, instance_npcname("#ghmemorialmob02")+"::OnMyMobDead";
+	mapannounce .@map$,"3 o'clock warp leading to zone 3 is now open.",bc_map,"0xFFFF00";
+	areamonster .@map$,241,113,291,19,"Suffering Chamberlain",2466,12,.@label$;
+	areamonster .@map$,241,113,291,19,"Decayed Monk",2464,12,.@label$;
+	areamonster .@map$,227,217,291,135,"Suffering Chamberlain",2466,12,.@label$;
+	areamonster .@map$,227,217,291,135,"Decayed Monk",2464,12,.@label$;
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@gl_k");
+	set .@label$, instance_npcname("#ghmemorialmob02")+"::OnMyMobDead";
+	set .@mob_dead_num, 48 - mobcount(.@map$,.@label$);
+	if (.@mob_dead_num > 28) {
+		mapannounce .@map$, "Seems like Himmelmez drains the dead's souls. They must be destroyed.",bc_map,"0xFFFFFF";
+		killmonster .@map$,.@label$;
+		donpcevent instance_npcname("Hollgrehenn Destroyer")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob02")+"::OnDisable";
+	}
+	end;
+}
+
+// Tramp Mobs
+//============================================================
+1@gl_k,221,82,3	script	Breathless Man#GHtramp1	4_M_DIEMAN,4,4,{
+	end;
+OnTouch:
+	set .@i, rand(1,10);
+	if (.@i == 1) set .@mobs,3;
+	else if (.@i == 2) set .@mobs,4;
+	else if (.@i == 3) set .@mobs,5;
+	else if (.@i < 7) set .@mobs,6;
+	else set .@mobs,7;
+	getmapxy(.@map$,.@x,.@y,1);
+	specialeffect EF_VENOMDUST;
+	monster .@map$,.@x,.@y,"Muck Worm",2467,.@mobs,instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnMyMobDead:
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnEnable";
+	end;
+OnEnable:
+	enablenpc instance_npcname(strnpcinfo(0));
+	end;
+OnDisable:
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+}
+1@gl_k,213,63,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp2	4_M_DIEMAN,4,4
+1@gl_k,230,50,2	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp3	4_M_DIEMAN,4,4
+1@gl_k,222,39,2	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp4	4_M_DIEMAN,4,4
+1@gl_k,214,27,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp5	4_M_DIEMAN,4,4
+1@gl_k,223,17,2	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp6	4_M_DIEMAN,4,4
+1@gl_k,235,16,4	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp7	4_M_DIEMAN,4,4
+1@gl_k,251,20,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp8	4_M_DIEMAN,4,4
+1@gl_k,240,43,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp9	4_M_DIEMAN,4,4
+1@gl_k,271,19,1	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp10	4_M_DIEMAN,4,4
+1@gl_k,246,62,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp11	4_M_DIEMAN,4,4
+1@gl_k,282,48,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp12	4_M_DIEMAN,4,4
+1@gl_k,285,81,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp13	4_M_DIEMAN,4,4
+1@gl_k,241,86,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp14	4_M_DIEMAN,4,4
+1@gl_k,249,101,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp15	4_M_DIEMAN,4,4
+1@gl_k,276,106,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp16	4_M_DIEMAN,4,4
+1@gl_k,252,120,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp17	4_M_DIEMAN,4,4
+1@gl_k,258,150,1	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp18	4_M_DIEMAN,4,4
+1@gl_k,255,157,6	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp19	4_M_DIEMAN,4,4
+1@gl_k,261,164,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp20	4_M_DIEMAN,4,4
+1@gl_k,269,173,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp21	4_M_DIEMAN,4,4
+1@gl_k,280,167,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp22	4_M_DIEMAN,4,4
+1@gl_k,293,161,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp23	4_M_DIEMAN,4,4
+1@gl_k,226,96,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp24	4_M_DIEMAN,4,4
+1@gl_k,222,119,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp25	4_M_DIEMAN,4,4
+1@gl_k,233,123,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp26	4_M_DIEMAN,4,4
+2@gl_k,147,203,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp27	4_M_DIEMAN,4,4
+2@gl_k,141,222,1	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp28	4_M_DIEMAN,4,4
+2@gl_k,167,225,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp29	4_M_DIEMAN,4,4
+2@gl_k,145,236,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp30	4_M_DIEMAN,4,4
+2@gl_k,143,260,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp31	4_M_DIEMAN,4,4
+2@gl_k,173,258,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp32	4_M_DIEMAN,4,4
+
+// Sector 3 Mobs
+//============================================================
+1@gl_k,0,0,0	script	#ghmemorialmob03	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob03")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob03");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob03");
+	donpcevent instance_npcname("#ghinstancewarp5")+"::OnEnable";
+	donpcevent instance_npcname("#ghinstancewarp6")+"::OnEnable";
+	set .@map$, instance_mapname("1@gl_k");
+	set .@label$, instance_npcname("#ghmemorialmob03")+"::OnMyMobDead";
+	mapannounce .@map$,"12 o'clock warp leading to the zone 4 was opened.",bc_map,"0xFFFF00";
+	areamonster .@map$,17,259,53,180,"Decayed Guard",2468,11,.@label$;
+	areamonster .@map$,17,259,53,180,"Sharpshooter Ranger",2469,14,.@label$;
+	areamonster .@map$,62,281,73,186,"Decayed Guard",2468,11,.@label$;
+	areamonster .@map$,62,281,73,186,"Sharpshooter Ranger",2469,14,.@label$;
+	areamonster .@map$,74,251,109,224,"Decayed Guard",2468,11,.@label$;
+	areamonster .@map$,74,251,109,224,"Sharpshooter Ranger",2469,14,.@label$;
+	areamonster .@map$,108,281,231,234,"Decayed Guard",2468,11,.@label$;
+	areamonster .@map$,108,281,231,234,"Sharpshooter Ranger",2469,14,.@label$;
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@gl_k");
+	set .@label$, instance_npcname("#ghmemorialmob03")+"::OnMyMobDead";
+	set .@mob_dead_num, 100 - mobcount(.@map$,.@label$);
+	if (.@mob_dead_num > 85) {
+		mapannounce .@map$,"Himmelmez: Nice parry. I thought you were going to die slowly surrounded by the dead I summoned~",bc_map,"0xFFFFFF";
+		killmonster .@map$,.@label$;
+		donpcevent instance_npcname("#GHMclear3")+"::OnEnable";
+		donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnEnable";
+		donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnEnable";
+		donpcevent instance_npcname("Varmunt#ghinstance3")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob03")+"::OnDisable";
+	}
+	end;
+}
+
+// 1st MVP
+//============================================================
+1@gl_k,0,0,0	script	#ghmemorialmob04	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob04")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob04");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob04");
+	monster instance_mapname("1@gl_k"),150,258,"Root of Corruption",2475,1,instance_npcname("#ghmemorialmob04")+"::OnMyMobDead";
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("1@gl_k");
+	if (mobcount(.@map$,instance_npcname("#ghmemorialmob04")+"::OnMyMobDead") < 1) {
+		mapannounce .@map$, "12 o'clock warp leading to the Chivalry's Second Floor is now open.",bc_map,"0xFFFF00";
+		donpcevent instance_npcname("#ghinstancewarp7")+"::OnEnable";
+		donpcevent instance_npcname("Varmunt#ghinstance3")+"::OnTalk2";
+		donpcevent instance_npcname("#effectGH01")+"::OnEnable";
+		donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnEnable";
+		donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob04")+"::OnDisable";
+	}
+	end;
+}
+
+1@gl_k,150,257,3	script	#GHMclear3	HIDDEN_NPC,9,9,{
+	end;
+OnTouch:
+	donpcevent instance_npcname("#controlGH3")+"::OnEnable";
+	specialeffect EF_BASH;
+	donpcevent instance_npcname("#GHMclear3")+"::OnDisable";
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("#GHMclear3")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#GHMclear3");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#GHMclear3");
+	initnpctimer;
+	end;
+OnTimer2000:
+	mapannounce instance_mapname("1@gl_k"), "Himmelmez: You got me tempted to go to the 2nd floor, come to the entrance. I'm curious about how far your luck goes.",bc_map,"0xFFFFFF";
+	stopnpctimer;
+	end;
+}
+
+1@gl_k,0,0,0	script	#controlGH3	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#controlGH3")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#controlGH3");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#controlGH3");
+	initnpctimer;
+	end;
+OnTimer3000:
+	donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnTalk1";
+	end;
+OnTimer6000:
+	donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnTalk2";
+	end;
+OnTimer9000:
+	donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnTalk3";
+	end;
+OnTimer12000:
+	donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnTalk1";
+	end;
+OnTimer15000:
+	donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnTalk4";
+	end;
+OnTimer18000:
+	donpcevent instance_npcname("Varmunt#ghinstance3")+"::OnTalk1";
+	end;
+OnTimer21000:
+	donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnTalk2";
+	end;
+OnTimer24000:
+	donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnTalk5";
+	end;
+OnTimer27000:
+	donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnTalk6";
+	end;
+OnTimer28000:
+	donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnDisable";
+	end;
+OnTimer31000:
+	donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnTalk3";
+	end;
+OnTimer32000:
+	donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnDisable";
+	end;
+OnTimer35000:
+	mapannounce instance_mapname("1@gl_k"), "An eerie echo from the depths can be heard as you get closer.",bc_map,"0xFFFFFF";
+	end;
+OnTimer38000:
+	donpcevent instance_npcname("#ghmemorialmob04")+"::OnEnable";
+	stopnpctimer;
+	donpcevent instance_npcname("#controlGH3")+"::OnDisable";
+	end;
+}
+
+1@gl_k,144,258,6	script	Heinrich#ghinstance4	4_M_HEINRICH,{
+	mes "[Heinrich]";
+	mes "Himmelmez... You made my men get killed and I will never forget that.";
+	cutin "gl_heinrich1",2;
+	close2;
+	cutin "gl_heinrich1",255;
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Heinrich#ghinstance4");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Heinrich#ghinstance4");
+	end;
+OnTalk1:
+	npctalk "Himmelmez! I won't let you take even a single more step here.";
+	end;
+OnTalk2:
+	npctalk "What... is this?!";
+	end;
+OnTalk3:
+	npctalk "Varmunt Sir! Help the adventurers and I'll chase Himmelmez!";
+	end;
+}
+
+1@gl_k,150,257,3	script	Himmelmez#ghinstance2	4_F_HIMEL,{
+	mes "[Himmelmez]";
+	mes "No need to stare at me with so insecure eyes. Soon they'll become relaxed...";
+	cutin "gl_himel2",2;
+	close2;
+	cutin "gl_himel2",255;
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Himmelmez#ghinstance2");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Himmelmez#ghinstance2");
+	end;
+OnTalk1:
+	npctalk "What an awfully lucky, I flew all the way over here and just one of them is really powerful.";
+	end;
+OnTalk2:
+	npctalk "But it doesn't matter to me.";
+	end;
+OnTalk3:
+	npctalk "Now, all of you will die.";
+	end;
+OnTalk4:
+	npctalk "Hahaha, so you guys thought I would come alone?";
+	end;
+OnTalk5:
+	npctalk "This is my new toy to keep you at my feet. Why don't you guys play while I entertain?";
+	end;
+OnTalk6:
+	npctalk "Sincerely~, If I am given the opportunity I'd like to meet you again, Heinrich.";
+	end;
+}
+
+1@gl_k,156,259,3	script	Varmunt#ghinstance3	4_M_BARMUND,{
+	if (checkquest(12318,HUNTING) == 2) {
+		if (checkquest(12319,HUNTING) == -1) {
+			mes "[Varmunt]";
+			mes "There's something unusual about this thing's aura. Maybe someday we will be able to understand what is behind all of this.";
+			cutin "gl_barmund1",2;
+			getitem 6608,1; //Coagulated Spell
+			setquest 12319;
+			close2;
+			cutin "gl_barmund1",255;
+			end;
+		}
+	}
+	mes "[Varmunt]";
+	mes "Even after all this time, it is impossible to prevent from the will of the Transcendent.";
+	cutin "gl_barmund1",2;
+	close2;
+	cutin "gl_barmund2",255;
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Varmunt#ghinstance3")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Varmunt#ghinstance3");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Varmunt#ghinstance3");
+	end;
+OnTalk1:
+	npctalk "Heinrich Sir! Something unknown holds an inexplicably powerful force!";
+	end;
+OnTalk2:
+	npctalk "From the monster I picked up some great stuff. People who are interested, talk to me.";
+	end;
+}
+
+// Floor 2
+//============================================================
+2@gl_k,148,67,1	script	Heinrich#ghinstance5	4_M_HEINRICH,{
+	mes "[Heinrich]";
+	mes "Himmelmez's blocking spells";
+	mes "are everywhere around here...";
+	cutin "gl_heinrich1",2;
+	close2;
+	cutin "gl_heinrich1",255;
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Heinrich#ghinstance5");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Heinrich#ghinstance5");
+	end;
+OnTalk1:
+	npctalk "These things have never been in the castle!";
+	end;
+OnTalk2:
+	npctalk "Trying to break this power with common weapons doesn't work. I tried it.";
+	end;
+OnTalk3:
+	npctalk "It is really unforgivable.";
+	end;
+OnTalk4:
+	npctalk "I, who already was a subordinate of genocide. How much more in the future...";
+	end;
+OnTalk5:
+	npctalk "...";
+	end;
+}
+
+2@gl_k,151,71,7	script	Varmunt#ghinstance4	4_M_BARMUND,{
+	mes "[Varmunt]";
+	mes "Why am I doing this again? Doesn't seem like the first time. I've seen this place repeatedly dozens of times in my dreams. This feeling...";
+	cutin "gl_barmund1",2;
+	close2;
+	cutin "gl_barmund1",255;
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Varmunt#ghinstance4");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Varmunt#ghinstance4");
+	end;
+OnTalk2:
+	npctalk "Himmelmez's enchantment has completely blocked the passage to each section.";
+	end;
+OnTalk3:
+	npctalk "Get out of the way for a moment. I'll try to somehow break the spell with magical powers.";
+	end;
+OnTalk4:
+	npctalk "The enchantment seems to be broken.";
+	end;
+OnTalk5:
+	npctalk "I've never seen this spell before.";
+	end;
+OnTalk6:
+	npctalk "Himmelmez doesn't use a seal on a person's body to turn it into an undead.";
+	end;
+OnTalk7:
+	npctalk "She uses enchantment stones.This way, the spell is probably maintained.";
+	end;
+OnTalk8:
+	npctalk "We should kill the people who have the enchantment stones to break the spell.";
+	end;
+OnTalk9:
+	npctalk "However, we can't identify them. The purification can only be done randomly.";
+	end;
+OnTalk10:
+	npctalk "Commandant...";
+	end;
+OnTalk11:
+	npctalk "Commandant, it seems too loose.";
+	end;
+OnTalk12:
+	npctalk "We are related to all these people, not just a few.";
+	end;
+OnTalk13:
+	npctalk "We can't deny that it's not their fault for what is going on.";
+	end;
+OnTalk14:
+	npctalk "Well, let's do it then.";
+	end;
+OnTalk15:
+	npctalk "You guys are of a great help. Try to follow us.";
+	end;
+OnTalk16:
+	npctalk "There can be a tough fight. Hold on, and it would be nice to eat something.";
+	end;
+OnTalk17:
+	npctalk "Guys. It is time to depart, Heinrich Sir.";
+	end;
+}
+
+2@gl_k,150,67,0	script	#effectGH01	HIDDEN_NPC,10,10,{
+	end;
+OnTouch:
+	specialeffect EF_BASH;
+	donpcevent instance_npcname("#controlGH4")+"::OnEnable";
+	donpcevent instance_npcname("#effectGH01")+"::OnDisable";
+	end;
+OnEffect:
+	specialeffect EF_LORD;
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("#effectGH01")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#effectGH01");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#effectGH01");
+	end;
+}
+
+2@gl_k,0,0,0	script	#controlGH4	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#controlGH4")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#controlGH4");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#controlGH4");
+	initnpctimer;
+	end;
+OnTimer3000:
+	donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnTalk1";
+	donpcevent instance_npcname("#ghmemorialmob05")+"::OnEnable";
+	end;
+OnTimer6000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk2";
+	end;
+OnTimer9000:
+	donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnTalk2";
+	end;
+OnTimer12000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk3";
+	end;
+OnTimer15000:
+	donpcevent instance_npcname("#effectGH01")+"::OnEnable";
+	donpcevent instance_npcname("#effectGH01")+"::OnEffect";
+	end;
+OnTimer18000:
+	donpcevent instance_npcname("#effectGH01")+"::OnDisable";
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk4";
+	end;
+OnTimer21000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk5";
+	end;
+OnTimer24000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk6";
+	end;
+OnTimer27000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk7";
+	end;
+OnTimer30000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk8";
+	end;
+OnTimer33000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk9";
+	end;
+OnTimer36000:
+	donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnTalk3";
+	end;
+OnTimer39000:
+	donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnTalk4";
+	end;
+OnTimer42000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk10";
+	end;
+OnTimer45000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk11";
+	end;
+OnTimer48000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk12";
+	end;
+OnTimer51000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk13";
+	end;
+OnTimer54000:
+	donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnTalk5";
+	end;
+OnTimer57000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk14";
+	end;
+OnTimer60000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk15";
+	end;
+OnTimer63000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk16";
+	end;
+OnTimer66000:
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk17";
+	end;
+OnTimer69000:
+	mapannounce instance_mapname("2@gl_k"), "9 o'clock positioned warp leading to the 1st zone has been opened. Move from the central hallway. A being with an evil aura seems to be appearing in this region.",bc_map,"0xFFFF00";
+	donpcevent instance_npcname("#ghinstancewarp8")+"::OnEnable";
+	donpcevent instance_npcname("#ghinstancewarp9")+"::OnEnable";
+	donpcevent instance_npcname("#ghmemorialmob06")+"::OnEnable";
+	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnDisable";
+	donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnDisable";
+	end;
+OnTimer70000:
+	stopnpctimer;
+	donpcevent instance_npcname("#controlGH4")+"::OnDisable";
+	end;
+}
+
+2@gl_k,0,0,0	script	#ghmemorialmob05	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob05")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob05");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob05");
+	set .@map$, instance_mapname("2@gl_k");
+	set .@label$, instance_npcname("#ghmemorialmob05")+"::OnMyMobDead";
+	areamonster .@map$,124,20,31,162,"Decayed Guard",2468,8,.@label$;
+	areamonster .@map$,124,20,31,162,"Sharpshooter Ranger",2469,8,.@label$;
+	areamonster .@map$,124,20,31,162,"Fallen Abyss Knight",2470,8,.@label$;
+	areamonster .@map$,124,20,31,162,"Suffering Khalitzburg",2471,8,.@label$;
+	areamonster .@map$,124,20,31,162,"Swollen Knight",2472,8,.@label$;
+	set .MyMobs,80;
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("2@gl_k");
+	set .MyMobs, .MyMobs-1;
+	if (.MyMobs == 0) {
+		mapannounce .@map$, "A being with an evil aura seems to be appearing in this region.",bc_map,"0xFFFF00";
+		donpcevent instance_npcname("#ghmemorialmob06")+"::OnDisable2";
+		donpcevent instance_npcname("#ghmemorialmob07")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob05")+"::OnDisable";
+	} else {
+		set .@label$, instance_npcname("#ghmemorialmob05")+"::OnMyMobDead";
+		switch(rand(5)) {
+		case 0:
+			areamonster .@map$,124,20,31,162,"Decayed Guard",2468,1,.@label$;
+			break;
+		case 1:
+			areamonster .@map$,124,20,31,162,"Sharpshooter Ranger",2469,1,.@label$;
+			break;
+		case 2:
+			areamonster .@map$,124,20,31,162,"Fallen Abyss Knight",2470,1,.@label$;
+			break;
+		case 3:
+			areamonster .@map$,124,20,31,162,"Suffering Khalitzburg",2471,1,.@label$;
+			break;
+		case 4:
+			areamonster .@map$,124,20,31,162,"Swollen Knight",2472,1,.@label$;
+			break;
+		}
+	}
+	end;
+}
+
+2@gl_k,0,0,0	script	#ghmemorialmob06	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob06")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob06");
+	end;
+OnDisable2:
+	stopnpctimer;
+	disablenpc instance_npcname("#ghmemorialmob06");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob06");
+	donpcevent instance_npcname("#ghmemorialmob06")+"::OnSpawn";
+	end;
+OnSpawn:
+	initnpctimer;
+	end;
+OnTimer90000:
+	set .@map$, instance_mapname("2@gl_k");
+	set .@label$, instance_npcname("#ghmemorialmob05")+"::OnMyMobDead";
+	setarray .@c[0],
+		114,141,118,139,
+		128,83,131,78,
+		88,53,93,48,
+		54,47,61,40,
+		58,83,63,78,
+		69,138,80,127,
+		34,143,39,138;
+	for(set .@i,0; .@i<getarraysize(.@c); set .@i,.@i+4) {
+		areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Decayed Guard",2468,1,.@label$;
+		areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Sharpshooter Ranger",2469,1,.@label$;
+		areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Fallen Abyss Knight",2470,1,.@label$;
+		areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Suffering Khalitzburg",2471,1,.@label$;
+		areamonster .@map$,.@c[.@i],.@c[.@i+1],.@c[.@i+2],.@c[.@i+3],"Swollen Knight",2472,1,.@label$;
+	}
+	end;
+OnTimer92000:
+	stopnpctimer;
+	donpcevent instance_npcname("#ghmemorialmob06")+"::OnSpawn";
+	end;
+}
+
+2@gl_k,0,0,0	script	#ghmemorialmob07	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob07")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob07");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob07");
+	areamonster instance_mapname("2@gl_k"),124,20,31,162,"The Destruction of the First Captain",2473,1,instance_npcname("#ghmemorialmob07")+"::OnMyMobDead";
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("2@gl_k");
+	if (mobcount(.@map$,instance_npcname("#ghmemorialmob07")+"::OnMyMobDead") < 1) {
+		mapannounce .@map$, "3 o'clock positioned warp leading to the 2nd zone has been opened. Use the central hallway to get there.",bc_map,"0xFFFF00";
+		donpcevent instance_npcname("#ghinstancewarp10")+"::OnEnable";
+		donpcevent instance_npcname("#ghinstancewarp11")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob08")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob07")+"::OnDisable";
+	}
+	end;
+}
+
+2@gl_k,0,0,0	script	#ghmemorialmob08	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob08")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob08");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob08");
+	set .@map$, instance_mapname("2@gl_k");
+	set .@label$, instance_npcname("#ghmemorialmob08")+"::OnMyMobDead";
+	areamonster .@map$,175,163,265,18,"Decayed Guard",2468,7,.@label$;
+	areamonster .@map$,175,163,265,18,"Sharpshooter Ranger",2469,7,.@label$;
+	areamonster .@map$,175,163,265,18,"Fallen Abyss Knight",2470,7,.@label$;
+	areamonster .@map$,175,163,265,18,"Suffering Khalitzburg",2471,7,.@label$;
+	areamonster .@map$,175,163,265,18,"Swollen Knight",2472,7,.@label$;
+	set .MyMobs,35;
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("2@gl_k");
+	set .MyMobs, .MyMobs-1;
+	if (.MyMobs == 0) {
+		mapannounce .@map$, "A being with an evil aura seems to be appearing in this region.",bc_map,"0xFFFF00";
+		donpcevent instance_npcname("#ghmemorialmob09")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob08")+"::OnDisable";
+	} else {
+		set .@label$, instance_npcname("#ghmemorialmob08")+"::OnMyMobDead";
+		switch(rand(5)) {
+		case 0:
+			areamonster .@map$,175,163,265,18,"Decayed Guard",2468,1,.@label$;
+			break;
+		case 1:
+			areamonster .@map$,175,163,265,18,"Sharpshooter Ranger",2469,1,.@label$;
+			break;
+		case 2:
+			areamonster .@map$,175,163,265,18,"Fallen Abyss Knight",2470,1,.@label$;
+			break;
+		case 3:
+			areamonster .@map$,175,163,265,18,"Suffering Khalitzburg",2471,1,.@label$;
+			break;
+		case 4:
+			areamonster .@map$,175,163,265,18,"Swollen Knight",2472,1,.@label$;
+			break;
+		}
+	}
+	end;
+}
+
+2@gl_k,0,0,0	script	#ghmemorialmob09	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob09")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob09");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob09");
+	areamonster instance_mapname("2@gl_k"),175,163,265,18,"The Destruction of the Second Captain",2474,1,instance_npcname("#ghmemorialmob09")+"::OnMyMobDead";
+	end;
+OnMyMobDead:
+	set .@map$, instance_mapname("2@gl_k");
+	if (mobcount(.@map$,instance_npcname("#ghmemorialmob09")+"::OnMyMobDead") < 1) {
+		mapannounce .@map$, "12 o'clock positioned warp leading to the 3rd zone has been opened. Use the central hallway to get there.",bc_map,"0xFFFF00";
+		donpcevent instance_npcname("#ghinstancewarp12")+"::OnEnable";
+		donpcevent instance_npcname("#controlGH6")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob08")+"::OnDisable";
+		donpcevent instance_npcname("#ghmemorialmob09")+"::OnDisable";
+	}
+	end;
+}
+
+2@gl_k,0,0,0	script	#ghmemorialmob10	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#ghmemorialmob10")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#ghmemorialmob10");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#ghmemorialmob10");
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnDisable";
+	monster instance_mapname("2@gl_k"),158,255,"Amdarias",2476,1,instance_npcname("#ghmemorialmob10")+"::OnMyMobDead";
+	end;
+OnMyMobDead:
+	if (mobcount(instance_mapname("2@gl_k"),instance_npcname("#ghmemorialmob10")+"::OnMyMobDead") < 1) {
+		donpcevent instance_npcname("Hugin#ghinstance1")+"::OnEnable";
+		donpcevent instance_npcname("#ghmemorialmob10")+"::OnDisable";
+	}
+	end;
+}
+
+2@gl_k,155,250,7	script	Heinrich#ghinstance6	4_M_HEINRICH,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Heinrich#ghinstance6");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Heinrich#ghinstance6");
+	end;
+OnTalk1:
+	npctalk "Gerhard!";
+	end;
+OnTalk2:
+	npctalk "What are you doing to my men, Himmelmez?!";
+	end;
+OnTalk3:
+	npctalk "Himmelmez! You don't need to make any more sacrifices!";
+	end;
+OnTalk4:
+	npctalk "Let him go! I don't want one more sacrifice!";
+	end;
+OnTalk5:
+	npctalk "I will not forgive you.";
+	end;
+OnTalk6:
+	npctalk "Just leave us alone, Himmelmez!!";
+	end;
+}
+
+2@gl_k,162,250,1	script	Varmunt#ghinstance5	4_M_BARMUND,{
+	mes "[Varmunt]";
+	mes "We can't escape this";
+	mes "eternal confinement...";
+	cutin "gl_barmund2",2;
+	close2;
+	cutin "gl_barmund2",255;
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Varmunt#ghinstance5")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Varmunt#ghinstance5");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Varmunt#ghinstance5");
+	end;
+OnTalk1:
+	npctalk "What? This cannot be. We must prevent Amdarias's attacks!";
+	end;
+}
+
+2@gl_k,158,252,3	script	Himmelmez#ghinstance4	4_F_HIMEL,4,4,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Himmelmez#ghinstance4");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Himmelmez#ghinstance4");
+	end;
+OnTalk1:
+	npctalk "Great~ I thought you wouldn't come near the end...";
+	end;
+OnTalk2:
+	npctalk "Huhu, I have already found a piece of Ymir's Heart, Heinrich.";
+	end;
+OnTalk3:
+	npctalk "It would've been faster if there were no distractions.";
+	end;
+OnTalk4:
+	npctalk "What do you think? Making it look like an accidental disease infected the king and the people around...";
+	end;
+OnTalk5:
+	npctalk "You want that?";
+	end;
+OnTalk6:
+	npctalk "This one is your final blow, Heinrich.";
+	end;
+OnTalk7:
+	npctalk "It is said that stopping me requires a skillfull person.";
+	end;
+OnTalk8:
+	npctalk "Seems like a perfect scenario to make my new monster, Amdarias.";
+	end;
+OnTalk9:
+	npctalk "Booh~ I'm scared.";
+	end;
+OnTalk10:
+	npctalk "Anyway, it was nice talking to you. Maybe we'll have the chance to meet again in the next story.";
+	end;
+OnTalk11:
+	npctalk "Well, make sure you will come back again.";
+	end;
+}
+
+2@gl_k,150,179,0	script	#controlGH6	HIDDEN_NPC,2,2,{
+	end;
+OnTouch:
+	mapannounce instance_mapname("2@gl_k"), "???: Do not come! There are traps everywhere here... Aaaaack!!!!",bc_map,"0xFF0000";
+	specialeffect EF_BASH;
+	donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnEnable";
+	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnEnable";
+	donpcevent instance_npcname("Varmunt#ghinstance5")+"::OnEnable";
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEnable";
+	donpcevent instance_npcname("#controlGH6")+"::OnDisable";
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("#controlGH6")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("#controlGH6");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("#controlGH6");
+	end;
+}
+
+2@gl_k,158,252,1	script	Himmelmez#ghinstance3	4_F_HIMEL,7,7,{
+	end;
+OnTouch:
+	specialeffect EF_BASH;
+	donpcevent instance_npcname("#controlGH5")+"::OnEnable";
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnEnable";
+	donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnDisable";
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("Himmelmez#ghinstance3");
+	end;
+OnEnable:
+	enablenpc instance_npcname("Himmelmez#ghinstance3");
+	end;
+}
+
+2@gl_k,158,255,3	script	Gerhard#ghinstance1	4_LEVITATEMAN,{
+	end;
+OnInstanceInit:
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnDisable";
+	end;
+OnDisable:
+	hideonnpc instance_npcname("Gerhard#ghinstance1");
+	end;
+OnEnable:
+	hideoffnpc instance_npcname("Gerhard#ghinstance1");
+	end;
+OnTalk1:
+	npctalk "Damn it! Run away! I can't withstand anymore!";
+	end;
+OnTalk2:
+	npctalk "Commandant... Come on, you need to run away from here... Ugh.";
+	end;
+OnTalk3:
+	npctalk "Even if you defile my body, I won't let you take my soul, Himmelmez!";
+	end;
+OnEffect1:
+	specialeffect EF_BARRIER;
+	end;
+OnEffect2:
+	specialeffect EF_CHAINCOMBO;
+	end;
+OnEffect3:
+	specialeffect EF_MAPPILLAR2;
+	end;
+OnEffect4:
+	specialeffect EF_MAPPILLAR;
+	end;
+OnEffect5:
+	specialeffect EF_LORD;
+	end;
+}
+
+2@gl_k,0,0,0	script	#controlGH5	-1,{
+OnInstanceInit:
+	donpcevent instance_npcname("#controlGH5")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("#controlGH5");
+	end;
+OnEnable:
+	enablenpc instance_npcname("#controlGH5");
+	initnpctimer;
+	end;
+OnTimer3000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk1";
+	end;
+OnTimer6000:
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnTalk1";
+	end;
+OnTimer9000:
+	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnTalk1";
+	end;
+OnTimer12000:
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnTalk2";
+	end;
+OnTimer15000:
+	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnTalk2";
+	end;
+OnTimer18000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk2";
+	end;
+OnTimer21000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk3";
+	end;
+OnTimer24000:
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnTalk3";
+	end;
+OnTimer27000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk4";
+	end;
+OnTimer30000:
+	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnTalk3";
+	end;
+OnTimer33000:
+	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnTalk4";
+	end;
+OnTimer36000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk5";
+	end;
+OnTimer39000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk6";
+	end;
+OnTimer42000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk7";
+	end;
+OnTimer45000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk8";
+	end;
+OnTimer48000:
+	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnTalk5";
+	end;
+OnTimer51000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk9";
+	end;
+OnTimer54000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk10";
+	end;
+OnTimer57000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnTalk11";
+	end;
+OnTimer60000:
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect1";
+	end;
+OnTimer63000:
+	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable";
+	end;
+OnTimer65000:
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect3";
+	end;
+OnTimer66000:
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect2";
+	end;
+OnTimer67000:
+	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnTalk6";
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect4";
+	end;
+OnTimer70000:
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect3";
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect4";
+	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnDisable";
+	donpcevent instance_npcname("Varmunt#ghinstance5")+"::OnTalk1";
+	end;
+OnTimer73000:
+	mapannounce instance_mapname("2@gl_k"), "Leads toward Gerhard's body.",bc_map,"0xFFFFFF";
+	end;
+OnTimer76000:
+	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnEffect5";
+	end;
+OnTimer80000:
+	donpcevent instance_npcname("#ghmemorialmob10")+"::OnEnable";
+	stopnpctimer;
+	donpcevent instance_npcname("#controlGH5")+"::OnDisable";
+	end;
+}
+
+2@gl_k,158,241,1	script	Hugin#ghinstance1	4_M_SAGE_C,{
+	if (checkquest(12319,HUNTING) == 2) {
+		mes "[Hugin]";
+		mes "Well, you are pretty ridiculous. Beginners shouldn't get the loot Amdarias drops.";
+		erasequest 12318;
+		erasequest 12319;
+		getitem 6608,1; //Coagulated Spell
+		next;
+		mes "[Hugin]";
+		mes "Varmunt, I have arbitrarily stopped time. And soon, the time gap will be gone.";
+		specialeffect2 EF_BLIND,AREA;
+		soundeffect "_blind.wav",0;
+		next;
+		mes "[Hugin]";
+		mes "Poor time travelers.";
+		mes "They will endlessly retry to prevent the tragedy that affected this city.";
+		next;
+		mes "[Hugin]";
+		mes "But the beggining of these time travels won't redempt your actions.";
+		mes "This will continue forever...";
+		next;
+		mes "[Hugin]";
+		mes "Now, I may erase your memory again. Perhaps you will have a different fate next time.";
+		specialeffect2 EF_FREEZE;
+		close2;
+		getmapxy(.@map$,.@x,.@y,0);
+		warp .@map$,.@x,.@y;
+		end;
+	} else {
+		mes "[Hugin]";
+		mes "The gap of time is almost distorted.";
+		mes "Done. There you go. Come!";
+		mes "I have to get out!";
+		next;
+		select("Bah... Soon after you...");
+		mes "[Hugin]";
+		mes "Soon after me? Anyways...";
+		mes "Doesn't matter, soon the gap of time will be closed, I have to get out of here.";
+		next;
+		switch(select("Since I'm here, let's explore more.:Please, send me out.")) {
+		case 1:
+			mes "[Hugin]";
+			mes "..................";
+			close;
+		case 2:
+			close2;
+			warp "glast_01",204,270;
+			end;
+		}
+	}
+OnInstanceInit:
+	donpcevent instance_npcname("Hugin#ghinstance1")+"::OnDisable";
+	end;
+OnDisable:
+	disablenpc instance_npcname("Hugin#ghinstance1");
+	end;
+OnEnable:
+	enablenpc instance_npcname("Hugin#ghinstance1");
+	end;
+}
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
new file mode 100644
index 000000000..70cc81b8f
--- /dev/null
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -0,0 +1,3296 @@
+//===== Hercules Script ========================================================
+//= Wolfchev's Laboratory
+//===== By: ====================================================================
+//= Kisuka (1.0)
+//===== Current Version: =======================================================
+//= 1.0.1
+//===== File Encoding ==========================================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
+//===== Description: ===========================================================
+//= Defeat Wolfchev's human experimentations.
+//===== Additional Comments: ===================================================
+//= 1.0.0 Initial Release. [Kisuka]
+//= 1.0.1 Some Clean-Up and Fixes. [Euphy]
+//==============================================================================
+
+1@lhz	mapflag	src4instance
+
+// Giacomo Girolam
+//==============================================================================
+lighthalzen,303,303,6	script	Giacomo Girolamo#kiup2	4_M_KHMAN,3,3,{
+	if ((MaxWeight - Weight) < 1000 || !checkweight(1201, 1)) {
+		mes "^FF0000 Check up your inventory. You got too many items to carry out the quest. ^000000";
+		close;
+	}
+	if (lhz_boss > 30) {
+		if (!lght_duk01) {
+			if (Sex) {
+				emotion e_pif, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "....a guy....?";
+				next;
+				mes "[Giacomo Girolamo]";
+				mes "Ah! Hey! Man!";
+				next;
+				select("What's up?");
+				emotion e_what, 1;
+				mes "[Giacomo Girolamo]";
+				mes "Have you ever heard of horrific human experimentation committed in Rekenber Corporation whose head office is here in Lighthalzen?";
+				next;
+				select("Whaaat?! human experimentation?");
+				emotion e_omg, 1;
+				mes "[Giacomo Girolamo]";
+				mes "Yea! human experimentation!!";
+				mes "There are a lot of rumors that horrible human experimentation is actually performed, but these people in the slum....don't want to believe that due to the welfare movement from Rekenber.";
+				next;
+				emotion e_swt2, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "Well! and those rich people, seem to know something but they never mention that...";
+				next;
+				mes "[Giacomo Girolamo]";
+				mes "Ahh!! And this is a secret that just SOME PEOPLE know. I heard that from Rekenber Lab.,.. a person named...um...Wol....";
+				next;
+				emotion e_hmm, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "Anyway!! A scientist named Wolf.. something suddenly got sacked. and he must be related with this rumor, I think...";
+				next;
+				select("You mean... Wolfchev?");
+				emotion e_gasp, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "Ohhhh?! yeah Wolfchev!! That's right, the name was Wolfchev.. The mad scientist..";
+				next;
+				emotion e_ok, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "I suppose you can then understand the story faster... I am sure that he's involved in the rumor. I swear.";
+				next;
+				mes "[Giacomo Girolamo]";
+				mes "By the way..what about you? Is there anything that you know about him?";
+				next;
+				if(select("Pretend you know nothing.", "Tell him what you know.") == 1) {
+					mes "["+ strcharinfo(PC_NAME) +"]";
+					mes "Not really. I've ever heard of his name, but I don't know anything about him..";
+					next;
+					mes "[Giacomo Girolamo]";
+					mes "Hm.... You sound suspicious, dude! huh?";
+					next;
+				} else {
+					mes "["+ strcharinfo(PC_NAME) +"]";
+					mes "He happens to research into Human 'Homunculus' without telling that to Rekenber Corp., and there was a whistle-blower who reported to the corp. so he was fired.";
+					next;
+					emotion e_no1, "Giacomo Girolamo#kiup2";
+					mes "[Giacomo Girolamo]";
+					mes "Oh! Man..! You seem to know pretty much! By any chance, are you concerned with Rekenber??";
+					next;
+					emotion e_dots;
+					mes "["+ strcharinfo(PC_NAME) +"]";
+					mes "... .... ...";
+					next;
+				}
+				emotion e_hmm, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "Don't worry. I didn't mean anything.";
+				next;
+				mes "[Giacomo Girolamo]";
+				mes "Well! I am just curious only because some people in the slum and some adventurers were missing,";
+				mes "and I heard that Rekenber was doing human experimentation with those missing people. Hope you don't get me wrong.";
+				next;
+				lght_duk01 = 1;
+				setquest 5109;
+				mes "Actually, it is not a funny rumor.";
+				mes "Should investigate the lab where the experiment was carried out.";
+				close;
+			} else {
+				emotion e_lv, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "Oh! What a beautiful lady!!";
+				next;
+				emotion e_what, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "How come a beauty is here, in a place with dangerous rumor?";
+				next;
+				switch(select("Walking..", "To hang out..", "Shopping..")) {
+				case 1:
+					mes "[Giacomo Girolamo]";
+					mes "Ahh.. Lady, you are so graceful even when you are just walking.....";
+					next;
+					break;
+				case 2:
+					mes "[Giacomo Girolamo]";
+					mes "Lady. You are a dignified lady even if you hang out in this poor town...";
+					next;
+					break;
+				case 3:
+					mes "[Giacomo Girolamo]";
+					mes "Ahh.. Lady.. Shopping in the slum!!.. Are you a type who needs to look around every single shop?";
+					next;
+					break;
+				}
+			}
+			select("... .... ... ....");
+			mes "[Giacomo Girolamo]";
+			mes "Well, how dare I ask you and be interested in what the lady does...";
+			next;
+			emotion e_ok, "Giacomo Girolamo#kiup2";
+			mes "[Giacomo Girolamo]";
+			mes "I just hope that the lady gets out of this town with dangerous rumors..";
+			next;
+			select("Dangerous rumors?");
+			emotion e_what, 1;
+			mes "[Giacomo Girolamo]";
+			mes "Ah... Lady may not have heard of the rumor.";
+			next;
+			mes "[Giacomo Girolamo]";
+			mes "Recently, some people from this town, actually from the slum...and some adventurers are missing...";
+			next;
+			mes "[Giacomo Girolamo]";
+			mes "and then the rumor came up, since disappearance cases happen pretty often, that Rekenber is committing a horrible human experimentation in their secret lab.";
+			next;
+			select("Excuse me?! human experimentation?");
+			emotion e_omg, 1;
+			mes "[Giacomo Girolamo]";
+			mes "Yea! human experimentation!!";
+			mes "There are a lot of rumors that horrible human experimentation is actually performed, but these people in the slum....don't want to believe that due to the welfare movement from Rekenber.";
+			next;
+			mes "[Giacomo Girolamo]";
+			mes "Well! the rich people either want to believe..I think.. Ah!! And couple of weeks ago. um. what's his name? Wolfchev??";
+			next;
+			mes "[Giacomo Girolamo]";
+			mes "Anyway!! that research got fired from the lab. I think he must be involved with this rumor.";
+			next;
+			mes "[Giacomo Girolamo]";
+			mes "So, please, lady. Please don't be in a place like this and stay in safe ways.";
+			next;
+			lght_duk01 = 1;
+			setquest 5109;
+			mes "............ It seems a pretty serious matter.";
+			mes "Should investigate the lab where the experiment was carried out.";
+			close;
+		} else {
+			mes "[Giacomo Girolamo]";
+			if (Sex) {
+				emotion e_paper, "Giacomo Girolamo#kiup2";
+				mes "Take care yourself and don't disappear!";
+			} else {
+				emotion e_lv2, "Giacomo Girolamo#kiup2";
+				mes "Be careful, Lady.";
+			}
+			close;
+		}
+	} else {
+		if (Sex) {
+			emotion e_ho, "Giacomo Girolamo#kiup2";
+			mes "[Giacomo Girolamo]";
+			mes "Only those beautiful ladies are the reason of my life~!";
+			mes "I, Giacomo Girolamo Casanova de Seingalt am never interested in guys like you though!!";
+			next;
+			emotion e_an, "Giacomo Girolamo#kiup2";
+			mes "[Giacomo Girolamo]";
+			mes "but I can listen to you...you wanna say anything to me?";
+			next;
+			switch(select("No..?", "About ladies..", "You Womanizer!!", "Envy you...", "What's the rumor lately?")) {
+			case 1:
+				emotion e_hmm, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "Hey you, get out of my way then..";
+				close;
+			case 2:
+				emotion e_an, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "I don't feel like talking about my precious ladies making fun of them. You do it with your friends.";
+				close;
+			case 3:
+				mes "[Giacomo Girolamo]";
+				mes "Hey.. Excuse me!!! but I'm not a 'Womanizer', I am just a person who adores ladies.";
+				next;
+				emotion e_ok, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "Of course..... Yea... If I'm a womanizer, all the men on earth are too! I'm just Casanova. umhahahaha.";
+				close;
+			case 4:
+				emotion e_what, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "Haa.. Do you....? not have any woman but your sister and mother around you?";
+				next;
+				mes "[Giacomo Girolamo]";
+				mes "... .... ...";
+				next;
+				emotion e_swt2, "Giacomo Girolamo#kiup2";
+				mes "[Giacomo Girolamo]";
+				mes "Oh...... sorry.. I got your point....";
+				close;
+			case 5:
+				mes "[Giacomo Girolamo]";
+				mes "You.. are not like how you seem? Interesting..";
+				next;
+				mes "[Giacomo Girolamo]";
+				mes "Yea, actually recently a lot of people from the slum and some wandering adventurers got disappeared. and I don't know why.";
+				next;
+				mes "[Giacomo Girolamo]";
+				mes "You gotta be careful too..";
+				close;
+			}
+		} else {
+			emotion e_what, "Giacomo Girolamo#kiup2";
+			mes "[Giacomo Girolamo]";
+			mes "Hey, lady?";
+			next;
+			mes "[Giacomo Girolamo]";
+			switch(rand(1,10)) {
+			case 1:
+				mes "Wasn't it painful when you fell down from Heaven, my Angel?";
+				next;
+				break;
+			case 2:
+				mes "You must be tired. Because you are always wandering my mind.";
+				next;
+				break;
+			case 3:
+				mes "Are you not tired of walking around in my dream last night?";
+				next;
+				break;
+			case 4:
+				mes "Excuse me. But I think I lost my heart. Could you please borrow me yours?";
+				next;
+				break;
+			case 5:
+				mes "Do you believe in love at first sight?? Or can we start again..?";
+				next;
+				break;
+			case 6:
+				mes "I am so sorry but, can you kiss with a person who just met?? Noo? Ok then let me introduce myself.";
+				next;
+				break;
+			case 7:
+				mes "I'm so lost here since it's the first time. Can you let me know which is the way to your heart?";
+				next;
+				break;
+			case 8:
+				mes "Give me a map please.. To get a way....I'm fallen in your eyes.";
+				next;
+				break;
+			case 9:
+				mes "Your eyes....I wanna be forever there.";
+				next;
+				break;
+			case 10:
+				mes "I promise that I will be your everything in any case, in any difficult situation.";
+				next;
+				break;
+			}
+			emotion e_lv2, "Giacomo Girolamo#kiup2";
+			mes "[Giacomo Girolamo]";
+			mes "Today is the first day we met, but I love you, Lady <3 ";
+			next;
+			mes "[Giacomo Girolamo]";
+			mes "And I am telling you this because I'm just worried about you. You need to get out of this town which is full of disappearance cases.";
+			close;
+		}
+	}
+
+	OnTouch:
+		if (!lght_duk01)
+			emotion (Sex ? e_pif : e_lv2), "Giacomo Girolamo#kiup2";
+		end;
+}
+
+// Weird Old Man (Rewards)
+//==============================================================================
+lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
+	if ((MaxWeight - Weight) < 2800 || !checkweight(1201, 1)) {
+		mes "^FF0000 Check up your inventory. You got too many items to carry out the quest. ^000000";
+		close;
+	}
+	mes "[Weird old man]";
+	mes "Phew, those young people nowadays, are so rude and have no manners.";
+	next;
+	if(select("Ignore him", "Talk with him") == 1) {
+		mes "[Weird old man]";
+		mes "You, Very bad young man!";
+		close;
+	}
+	mes "["+ strcharinfo(PC_NAME) +"]";
+	mes "Sir, Are you alright??";
+	next;
+	mes "[Weird old man]";
+	mes "....?? You are not like other young people. You have good manners! You know what happened to me..?";
+	next;
+	switch(rand(1,2)) {
+	case 1:
+		mes "[Weird old man]";
+		mes "I was on the way to visit my son who lives in Rune Midgarts. It's really far away, so I took the airplane, and..";
+		next;
+		mes "[Weird old man]";
+		mes "those young people...so noisy.... I was standing but non of them offered me a seat..and they were just talking in loud voices which bothered everyone.";
+		next;
+		mes "[Weird old man]";
+		mes "I could lecture them if I were 10 years younger than now..";
+		next;
+		mes "[Weird old man]";
+		mes "Pffff.. Never like the time passing....";
+		next;
+		mes "[Weird old man]";
+		mes "So, you... what would you do??";
+		next;
+		mes "[Weird old man]";
+		mes "In an open, public place, you are supposed to stay quiet to the destination and offer your seat to the elderly and the infirm.";
+		next;
+		break;
+	case 2:
+		mes "[Weird old man]";
+		mes "I was on the way to visit my son who lives in Rune Midgarts. It's really far away, so I took the airplane, and..";
+		next;
+		mes "[Weird old man]";
+		mes "those young people...so noisy.... I was standing but non of them offered me a seat..and they were just talking in loud voices which bothered everyone.";
+		next;
+		mes "[Weird old man]";
+		mes "I could lecture them if I were 10 years younger than now..";
+		next;
+		mes "[Weird old man]";
+		mes "Pffff.. Never like the time passing....";
+		next;
+		mes "[Weird old man]";
+		mes "So, you... what would you do??";
+		next;
+		mes "[Weird old man]";
+		mes "In an open, public place, you are supposed to stay quiet to the destination and offer your seat to the elderly and the infirm. Right?";
+		next;
+		mes "[Weird old man]";
+		mes "Isn't that right?!";
+		next;
+		switch(rand(1,2)) {
+		case 1:
+			mes "[Weird old man]";
+			mes "Oh, and then! you know what...?";
+			next;
+			mes "[Weird old man]";
+			mes "Once I was walking in the town, and some boy were spitting on the street, and were bothering girls who were passing by...tut tut!";
+			next;
+			mes "[Weird old man]";
+			mes "The world is going to the dogs.. How will it be?? It was even a day time when they were doing it..tut tut.";
+			next;
+			switch(rand(1,2)) {
+			case 1:
+				mes "[Weird old man]";
+				mes "Oh, and then! you know what...?";
+				next;
+				break;
+			case 2:
+				mes "[Weird old man]";
+				mes "Oh, and then! you know what...?";
+				next;
+				mes "[Weird old man]";
+				mes "Lately young people are not so patient!!!!";
+				next;
+				mes "[Weird old man]";
+				mes "That often, they say they will quit.. they say they can't more. How will they live all the lift with that kind of mentality..tut tut.";
+				next;
+				mes "[Weird old man]";
+				mes "It's not easy to find a job, it is very difficult to be hired. But then they even cannot stand a week there, and leave the work already.";
+				next;
+				mes "[Weird old man]";
+				mes "How impatient and irresponsible!!";
+				next;
+				mes "[Weird old man]";
+				mes "Oh, and then! you know what...?";
+				next;
+				break;
+			}
+		case 2:
+			mes "[Weird old man]";
+			mes "Oh, and then! you know what...?";
+			next;
+			break;
+		}
+	}
+	mes "^E7A43DThe old man talked over and over again.^000000";
+	next;
+	mes "[Weird old man]";
+	mes "Hm......You are not like common young people, you seem pretty patient too. I like that!!!";
+	next;
+	mes "[Weird old man]";
+	mes "Now I am just an old, weak man but when I was young, I was a famous merchant in the town.";
+	next;
+	mes "[Weird old man]";
+	mes "It's been a while since I stopped the business,";
+	mes "but a former client of mine contacted me and asked me";
+	next;
+	mes "[Weird old man]";
+	mes "If I could get him some unknown objects named 'Will of Warrior', 'Thirst for Blood', 'Chill of the Dead'.";
+	next;
+	mes "[Weird old man]";
+	mes "I liked your politeness which is not like most of young people, so if you get me those, I will dare to give you some stuffs that I consider as my treasures.";
+	next;
+	while(1) {
+		switch(select("When I gather them, I will come back", "Show me the armors", "Show me the weapons")) {
+		case 1:
+			mes "[Weird old man]";
+			mes "OK, young man. See you later";
+			close;
+		case 2:
+			mes "[Weird old man]";
+			mes "So, you are interested in armors.";
+			next;
+			mes "[Weird old man]";
+			mes "These are the armors I have.";
+			next;
+			for(.@i = 1; .@i < 8; .@i++) {
+				if(((.@i == 1 || .@i == 5) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && (countitem(Goast_Chill) >= 35)) ||
+				((.@i == 2 || .@i == 3) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && (countitem(Goast_Chill) >= 22)) ||
+				((.@i == 4 || .@i == 7) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) && (countitem(Goast_Chill) >= 400)) ||
+				((.@i == 6) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && (countitem(Goast_Chill) >= 30))) {
+					.@armor$[.@i] = "^0000FF";
+				} else {
+					.@armor$[.@i] = "^FF0000";
+				}
+			}
+			while(1) {
+				switch(select(
+					"Show me other items.",
+					""+.@armor$[1]+"Giant Shield^000000",
+					""+.@armor$[2]+"Acient Book of Geffenia-Water^000000",
+					""+.@armor$[3]+"Bible of Promise(2nd Vol.)^000000",
+					""+.@armor$[4]+"Salvage Cape^000000",
+					""+.@armor$[5]+"Assassin's Handcuffs^000000",
+					""+.@armor$[6]+"Green Operating Gown^000000",
+					""+.@armor$[7]+"Ancient Gold Decoration^000000"
+				)) {
+				case 1:
+					mes "[Weird old man]";
+					mes "Have a look.";
+					next;
+					.@break = 1;
+					break;
+				case 2:
+					mes "<<Giant Shield[1]>>";
+					mes "Decrease 5% of Damage from Large Monsters, if Refine Lv is 9, decrease 5% more of the Damage.";
+					mes "Shield / Def 130 / Weight 280 / Required Lv 100 / Socket 1 / for 3rd Swordman Classes";
+					callsub L_Reward, Giant_Shield, 100, 50, 35;
+					break;
+				case 3:
+					mes "<<Acient Book of Geffenia-Water[1]>>";
+					mes "INT + 1, MDEF + 2. If Original INT point is 120, MATK + 10, MHP + 800.";
+					mes "When equipping with Lacryma Stick, the casting % from Storm Gust, Frost Misty and Jack frost will discount equivalent to 4 times Refine Lv.";
+					mes "Shield / Def 30 / Weight 100 / Required Lv 100 / Socket 1 / for Warlock";
+					callsub L_Reward, Geffenia_Book_Water, 100, 50, 22;
+					break;
+				case 4:
+					mes "<<Bible of Promise(2nd Vol.)[1]>>";
+					mes "MDEF + 5, Allow to use 'Odin's Power'(Lv 2). Increase 5% more for Heal skill.";
+					mes "Shield / Def 20 / Weight 50 / Required Lv 140 / Socket 1 / for Archbishop";
+					callsub L_Reward, Bible_Of_Promise2, 100, 50, 22;
+					break;
+				case 5:
+					mes "<<Salvage Cape[0]>>";
+					mes "Allow to use 'Cicada Skin Shed'(Lv 1). Cool time for this skill will be 30 seconds. When equiping it, SP consumption for using any skill will be doubled, When taking it off, SP - 1200.";
+					mes "Garment / Def 1 / Weight 40 / Required Lv 130 / Socket 0 / for Archbishop";
+					callsub L_Reward, Salvage_Cape, 100, 50, 35;
+					break;
+				case 6:
+					mes "<<Assassin's Handcuffs[1]>>";
+					mes "MSP + 20, CRI + 3. When equipping with Krishna, ATK + 50, ATK power from 'Sonic Blow' 50% increased, FLEE - 30. When equipping with Cakram CRI + 4, Critical ATK power 40% increased, MHP - 10%.";
+					mes "Accessory / Def 3 / Weight 40 / Required Lv 100 / Socket 1 / for Guillotine Cross";
+					callsub L_Reward, Assassin_Handcuffs, 300, 300, 400;
+					break;
+				case 7:
+					mes "<<Green Operating Gown[1]>>";
+					mes "DEX + 1, MSP + 30. Equipping with Scalpel will let to drop 'Immortal Heart', 'Alcohol' with a certain chance when hunting Human, Animal type monsters. Refine Lv affects the drop rate.";
+					mes "Armor / Def 66 / Weight 66 / Required Lv 100 / Socket 1 / for Generic";
+					callsub L_Reward, Green_Operation_Coat, 100, 50, 30;
+					break;
+				case 8:
+					mes "<<Green Operating Gown[1]>>";
+					mes "DEX + 1, MSP + 30. Equipping with Scalpel will let to drop 'Immortal Heart', 'Alcohol' with a certain chance when hunting Human, Animal type monsters. Refine Lv affects the drop rate.";
+					mes "Armor / Def 66 / Weight 66 / Required Lv 100 / Socket 1 / for Generic";
+					callsub L_Reward, Ancient_Gold_Deco, 300, 300, 400;
+					break;
+				}
+				if(.@break)
+					break;
+			}
+		case 3:
+			mes "[Weird old man]";
+			mes "So, you are interested in weapons.";
+			next;
+			mes "[Weird old man]";
+			mes "These are the weapons I've got.";
+			next;
+			for(.@i = 1; .@i < 15; .@i++) {
+				if(((.@i == 1) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) &&
+				(countitem(Goast_Chill) >= 10)) ||
+				((.@i == 2) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) &&
+				(countitem(Goast_Chill) >= 85)) ||
+				((.@i == 3 || .@i == 4 || (.@i >= 8 && .@i < 11) || .@i >= 12) && (countitem(Will_Of_Warrior) >= 50) &&
+				(countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 35)) ||
+				((.@i == 5 || .@i == 7 || .@i == 11) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100)
+				&& (countitem(Goast_Chill) >= 40)) ||
+				((.@i == 6) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) &&
+				(countitem(Goast_Chill) >= 400))) {
+						.@weapon$[.@i] = "^0000FF";
+				} else {
+						.@weapon$[.@i] = "^FF0000";
+				}
+		  	}
+			while(1) {
+				switch(select(
+					"Show me other items.",
+					""+.@weapon$[1]+"Agent Katar^000000",
+					""+.@weapon$[2]+"Guillotine Katar^000000",
+					""+.@weapon$[3]+"Ygnus Stale^000000",
+					""+.@weapon$[4]+"End Sektura^000000",
+					""+.@weapon$[5]+"Cannon Spear^000000",
+					""+.@weapon$[6]+"Giant Lance^000000",
+					""+.@weapon$[7]+"Chilly Spell Book^000000",
+					""+.@weapon$[8]+"Recovery Light^000000",
+					""+.@weapon$[9]+"Aztoe Nail^000000",
+					""+.@weapon$[10]+"Scarletto Nail^000000",
+					""+.@weapon$[11]+"Bloody Cross^000000",
+					""+.@weapon$[12]+"Catapult^000000",
+					""+.@weapon$[13]+"Big CrossBow^000000",
+					""+.@weapon$[14]+"Creeper Bow^000000"
+				)) {
+				case 1:
+					mes "[Weird old man]";
+					mes "Have a look.";
+					next;
+					.@break = 1;
+					break;
+				case 2:
+					mes "<<Agent Katar[1]>>";
+					mes "Every 2 Original LUK points gets additional 1 HIT point";
+					mes "Katar / ATK 170 / Weight 120 / Weapon Lv 3 / Required Lv 100 / Socket 1 / for Guillotine Cross";
+					callsub L_Reward, Agent_Katar, 50, 100, 10;
+					break;
+				case 3:
+					mes "<<Guillotine Katar[1]>>";
+					mes "DEX + 2. FLEE - 30. 50% more damage to Human monsters. Add 30% more damage for Cross Impact skill.";
+					mes "Katar / ATK 200 / Weight 150 / Weapon Lv 4 / Required Lv 140 / Socket 1 / for Guillotine Cross";
+					callsub L_Reward, Guillotine_Katar, 50, 100, 85;
+					break;
+				case 4:
+					mes "<<Ygnus Stale[1]>>";
+					// FIXME[Haru]: Anyone knows what ¹ßÈ­ means?
+					mes "When doing short distance attack, cast ¹ßÈ­ to the player and to the enemy with a certain chance.";
+					mes "Two-Handed Axe / ATK 250 / Weight 190 / Fire Property / Weapon Lv 4 / Required Lv 95 / Socket 1 / for High Swordman/Merchant Classes";
+					callsub L_Reward, Ygnus_Stale, 50, 100, 35;
+					break;
+				case 5:
+					mes "<<End Sektura[1]>>";
+					mes "When doing short distance attack, cast Freezing to the player and to the enemy with a certain chance.";
+					mes "Two-Handed Axe / ATK 250 / Weight 190 / Water Property / Weapon Lv 4 / Required Lv 95 / Socket 1 / for High Swordman/Merchant Classes";
+					callsub L_Reward, End_Sektura, 50, 100, 35;
+					break;
+				case 6:
+					mes "<<Cannon Spear[1]>>";
+					mes "MSP - 100, Increases 10% of Damage impacted with Cannon Spear, Additional ATK power of Cannon Spear equivalent to 3 times Refine Lv.";
+					mes "One-Handed Spear / ATK 180 / Weight 160 / Weapon Lv 4 / Required Lv 100 / Socket 1 / for Royal Guard";
+					callsub L_Reward, Cannon_Spear, 50, 100, 40;
+					break;
+				case 7:
+					mes "<<Giant Lance[0]>>";
+					mes "ASPD - 10, When it's taken off, the character gets SP - 600. 20 more seconds of Delay time exists before using back the Clashing Spiral. If the original STR points are 120, + ATK 300.";
+					mes "Two-Handed Lance / ATK 20 / Weight 2000 / Weapon Lv 4 / Required Lv 140 / Socket 0 / for Rune Knight";
+					callsub L_Reward, Giant_Lance, 300, 300, 400;
+					break;
+				case 8:
+					mes "<<Chilly Spell Book[2]>>";
+					mes "MATK + 160, DEX + 1. Increases ATK % of Cold Bolt, Diamond Dust equivalent to 3 times Refine Lv, also SP consumption from those skills increased equivalent to 5 times Refine Lv. Undestroyable.";
+					mes "Book / ATK 100 / Weight 100 / Water Property / Weapon Lv 4 / Required Lv 100 / Socket 2 / for Sorcerer";
+					callsub L_Reward, Chilly_Spell_Book, 50, 100, 40;
+					break;
+				case 9:
+					mes "<<Recovery Light[1]>>";
+					mes "MATK + 160. Depending on its Refine Lv, Heal Ability and SP consumption for the skill increased. Indestructible.";
+					mes "One-Handed Staff / ATK 30 / Weight 40 / Saint Property / Weapon Lv 4 / Required Lv 110 / Socket 1 / for Archbishop.";
+					callsub L_Reward, Recovery_Light, 50, 100, 35;
+					break;
+				case 10:
+					mes "<<Aztoe Nail[0]>>";
+					mes "MATK + 80. For Physical Melee Attack, cast Freezing to the target with a certain chance. The chance is affected by Refine Lv.";
+					mes "Dagger / ATK 160 / Weight 50 / Wind Property / Weapon Lv 4 / Required Lv 110 / Socket 0 / for High Swordman/Merchant/Theif Classes";
+					callsub L_Reward, Aztoe_Nail, 50, 100, 35;
+					break;
+				case 11:
+					mes "<<Scarletto Nail[0]>>";
+					mes "MATK + 80. For Physical Melee Attack, cast Stone curse to the target with a certain chance. The chance is affected by Refine Lv.";
+					mes "Dagger / ATK 160 / Weight 50 / Fire Property / Weapon Lv 4 / Required Lv 110 / Socket 0 / for High Swordman/Merchant/Theif Classes";
+					callsub L_Reward, Scarletto_Nail, 50, 100, 35;
+					break;
+				case 12:
+					mes "<<Bloody Cross[0]>>";
+					mes "For Physical Melee Attack, autocast 'Hell Inferno'(Lv 1) with a certain chance. The chance is affected by Refine Lv.";
+					mes "Mace / ATK 170 / Weight 150 / Darkness Property / Weapon Lv 4 / Required Lv 100 / Socket 0 / for High Acolyte Classes";
+					callsub L_Reward, Bloody_Cross, 50, 100, 40;
+					break;
+				case 13:
+					mes "<<Catapult[2]>>";
+					mes "Increases ATK % of 'Triangle Shot' equivalent to 2 times Refine Lv, Also SP consumption from the skill increased.";
+					mes "Bow / ATK 150 / Weight 110 / Weapon Lv 4 / Required Lv 100 / Socket 2 / for Shadow Chaser";
+					callsub L_Reward, Catapult, 50, 100, 35;
+					break;
+				case 14:
+					mes "<<Big CrossBow[2]>>";
+					mes "Increases ATK % of 'Arrow Storm' equivalent to 5 times Refine Lv. Also SP consumption from the skill increased, If the Original AGI points are 120, ASPD + 1.";
+					mes "Bow / ATK 160 / Weight 90 / Weapon Lv 4 / Required Lv 110 / Socket 2 / for Ranger";
+					callsub L_Reward, Big_CrossBow, 50, 100, 35;
+					break;
+				case 15:
+					mes "<<Creeper Bow[2]>>";
+					mes "DEX + 1, For Physical Attack, auto-cast 'Fiber Lock'(Lv 1) with a certain chance.";
+					mes "Bow / ATK 150 / Weight 150 / Weapon Lv 3 / Required Lv 120 / Socket 2 / for 3rd Archer Classes";
+					callsub L_Reward, Creeper_Bow, 50, 100, 35;
+					break;
+				}
+				if(.@break)
+					break;
+			}
+		}
+	}
+
+	L_Reward:
+		next;
+		mes ""+getarg(1)+" Will of Warrior, "+getarg(2)+" Thirst for Blood, "+getarg(3)+" Chill of the Dead are needed for the exchange";
+		next;
+		if(countitem(Will_Of_Warrior) >= getarg(1) && countitem(Blood_Thirst) >= getarg(2) && countitem(Goast_Chill) >= getarg(3)) {
+			if(select("Don't exchange", "Exchange") == 1) {
+				mes "[Weird old man]";
+				mes "Okay..";
+				close;
+			}
+			emotion e_swt2, "Weird old man#Bio4Reward";
+			progressbar "FF00FF", 2;
+			delitem Will_Of_Warrior, getarg(1);
+			delitem Blood_Thirst, getarg(2);
+			delitem Goast_Chill, getarg(3);
+			getitem getarg(0), 1;
+			mes "[Weird old man]";
+			mes "There you go. Visit me sometimes and we could talk.";
+			close;
+		}
+		return;
+}
+
+// Sorcerer (Rewards)
+//==============================================================================
+lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
+	if ((MaxWeight - Weight) < 1200 || !checkweight(1201, 1)) {
+		mes "^FF0000 Check up your inventory. You got too many items to carry out the quest. ^000000";
+		close;
+	}
+	disable_items;
+	mes "[Pudding]";
+	mes "... .... ...";
+	next;
+	switch(select("Umba umba humbaa", "What are you doing here?", "Which are the equipments found so far?", "Here you are, Sir.")) {
+	case 1:
+		emotion e_an;
+		mes "[Pudding]";
+		mes "Hey, excuse me, but I'm not from Umbala! You are so rude.";
+		close2;
+		enable_items;
+		end;
+	case 2:
+		mes "[Pudding]";
+		mes "As you can see, I'm a training Sorcerer, and my name is Pudding.";
+		next;
+		select("....?");
+		emotion e_an;
+		mes "[Pudding]";
+		mes "... What's that face? I'm starting to feel unpleasant..";
+		next;
+		emotion e_ok;
+		mes "[Pudding]";
+		mes "Couple of days ago, while I was undergoing discipline, I felt a strange, bizzare tinge. So I followed that and it brought me here.";
+		next;
+		select("I see.");
+		mes "[Pudding]";
+		mes "OK, let me continue. I am so bothered if you disturb me while I'm talking.";
+		next;
+		mes "[Pudding]";
+		mes "And I entered to the laboratory here in order to investigate, and oh gosh! I found those monsters which were like doppelgangers from 'Geffen Dungeon'. It was full of them.";
+		next;
+		mes "[Pudding]";
+		mes "From those monsters, I could find rare items like '^F2766EWill of Warrior^000000' '^952420Thirst for Blood^000000' '^88C6F7Chill of the Dead^000000' which you cannot find from any other place.";
+		next;
+		emotion e_what, "Sorcerer#Bio4Reward";
+		mes "[Pudding]";
+		mes "And after many hours of research on my own, I finally figured out a way to use those items. Do you wanna know?";
+		next;
+		switch(select("Oh....pardon?!", "Of course, I really wanna know.")) {
+		case 1:
+			emotion e_omg, 1;
+			emotion e_an, "Sorcerer#Bio4Reward";
+			mes "[Pudding]";
+			mes "Oh my! You fell asleep after you asked me something? Well, anyway I feel lazy to explain again so I will just continue.";
+			next;
+			break;
+		case 2:
+			emotion e_heh, "Sorcerer#Bio4Reward";
+			mes "[Pudding]";
+			mes "Good, I am content that you are listening to my story carefully. Then I will keep explaining.";
+			next;
+			break;
+		}
+		mes "[Pudding]";
+		mes "Those '^F2766EWill of Warrior^000000' and '^952420Thirst for Blood^000000'..... are aggresive but warm materials.";
+		next;
+		mes "[Pudding]";
+		mes "So '^F2766EWill of Warrior^000000' can dwell a special power to the 4th slot of an equipment,";
+		next;
+		mes "[Pudding]";
+		mes "and '^952420Thirst for Blood^000000' can dwell a special power to the 3rd slot.";
+		next;
+		mes "[Pudding]";
+		mes "Whereas!!!";
+		mes "'^88C6F7Chill of the Dead^000000' is a cold type material.";
+		mes "which allows to return the power from '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000' so it let the equipment to be 'ZERO'.";
+		next;
+		mes "[Pudding]";
+		mes "What do you say? Doesn't it sound interesting? But, there's a problem...";
+		next;
+		mes "[Pudding]";
+		mes "Since those materials can only be found from the monsters in the Lab., the special power also can be dwelt into certain equipments which can be obtained from the Lab.";
+		next;
+		select("So what's the conclusion?");
+		emotion e_what, 1;
+		emotion e_an;
+		mes "[Pudding]";
+		mes "Gee.. I told you not to cut while I talk, didn't I? Well, I will answer that becuase that's important.";
+		next;
+		mes "[Pudding]";
+		mes "If you bring me 10 '^F2766EWill of Warrior^000000' or 10 '^952420Thirst for Blood^000000', I will dwell some power to certain equipments that you can find in the Lab..";
+		next;
+		mes "[Pudding]";
+		mes "And if you are not satisfied with the power you got, bring me 10 '^88C6F7Chill of the Dead^000000', and I will take off that power.";
+		next;
+		mes "[Pudding]";
+		mes "WHat do you say? Having both options.....quite nice, huh?";
+		next;
+		mes "[Pudding]";
+		mes "If you obtain '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000', and obtain also equipment which is capable to accept their power, bring them to me. I will be waiting.";
+		close2;
+		enable_items;
+		end;
+	case 3:
+		mes "[Pudding]";
+		mes "Hm.... Equipment which are discovered so far are....";
+		next;
+		mes "- checking -";
+		mes "Pudding takes some paper out from a pocket.";
+		next;
+		mes "[Pudding]";
+		mes "Let me see.. the equipments discovered until now are....";
+		mes "6 Armors, 14 Weapons.";
+		next;
+		while(1) {
+			switch(select("Ok, I don't have to know more.", "6 Armors", "14 Weapons")) {
+			case 1:
+				mes "[Pudding]";
+				mes "If you obtain '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000', and obtain also equipment which is capable to accept their power, bring them to me. I will be waiting.";
+				close2;
+				enable_items;
+				end;
+			case 2:
+				mes "< Armor List >";
+				mes "Giant Shield[1]";
+				mes "Acient Book of Geffenia-Water[1]";
+				mes "Bible of Promise(2nd Vol.)[1]";
+				mes "Salvage Cape[0]";
+				mes "Assassin's Handcuffs[1]";
+				mes "Green Operating Gown[1]";
+				mes "Ancient Gold Decoration[1]";
+				next;
+				mes "[Pudding]";
+				mes "So far these are the Armors discovered. Do you wanna see other things?";
+				next;
+				break;
+			case 3:
+				mes "< Weapon List >";
+				mes "Agent Katar[1]";
+				mes "Guillotine Katar[1]";
+				mes "Ygnus Stale[1]";
+				mes "End Sektura[1]";
+				mes "Cannon Spear[1]";
+				mes "Giant Lance[0]";
+				mes "Chilly Spell Book[2]";
+				mes "Recovery Light[1]";
+				mes "Aztoe Nail[0]";
+				mes "Scarletto Nail[0]";
+				mes "Bloody Cross[0]";
+				mes "Catapult[2]";
+				mes "Big CrossBow[2]";
+				mes "Creeper Bow[2]";
+				next;
+				mes "[Pudding]";
+				mes "So far these are the Weapons discovered. Do you wanna see other things?";
+				next;
+				break;
+			}
+		}
+	case 4:
+		emotion e_flash;
+		mes "[Pudding]";
+		mes "Ohhhhh Have you brought them?";
+		next;
+		break;
+	}
+	mes "[Pudding]";
+	mes "OKAY! In which equipment you want to dwell the power?";
+	next;
+	setarray .@parts[0], EQI_ARMOR, EQI_HAND_L, EQI_HAND_R, EQI_GARMENT, EQI_ACC_L, EQI_ACC_R, EQI_HEAD_LOW;
+	for(.@i = 0; .@i < 7; .@i++) {
+		if(!getequipisequiped(.@parts[.@i])) {
+			switch(.@i) {
+				case 0:
+					.@equipped$[.@i] = "^999999Armor-[Not equipped]^000000";
+					break;
+				case 1:
+					.@equipped$[.@i] = "^999999Left Hand-[Not equipped]^000000";
+					break;
+				case 2:
+					.@equipped$[.@i] = "^999999Right Hand-[Not equipped]^000000";
+					break;
+				case 3:
+					.@equipped$[.@i] = "^999999Garment-[Not equipped]^000000";
+					break;
+				case 4:
+					.@equipped$[.@i] = "^999999Accessory-[Not equipped]^000000";
+					break;
+				case 5:
+					.@equipped$[.@i] = "^999999Accessory-[Not equipped]^000000";
+					break;
+				case 6:
+					.@equipped$[.@i] = "^999999Helm-[Not equipped]^000000";
+					break;
+			}
+		} else {
+			.@equipped$[.@i] = getequipname(.@parts[.@i]);
+		}
+	}
+	switch(select("I changed my mind.", .@equipped$[0], .@equipped$[1], .@equipped$[2], .@equipped$[3], .@equipped$[4],
+	.@equipped$[5], .@equipped$[6])) {
+	case 1:
+		mes "[Pudding]";
+		mes "Well, I was looking forward to doing it, but I cannot help then.";
+		close2;
+		enable_items;
+		end;
+	case 2:
+		if(!getequipisequiped(EQI_ARMOR)) {
+		  mes "[Pudding]";
+		  mes "Hey..Where is the armor?";
+		  close2;
+		  enable_items;
+		  end;
+		}
+		.@position = EQI_ARMOR;
+		break;
+	case 3:
+		if(!getequipisequiped(EQI_HAND_L)) {
+		  mes "[Pudding]";
+		  mes "Well.. You are not equipping anything on the left hand.";
+		  close2;
+		  enable_items;
+		  end;
+		}
+		.@position = EQI_HAND_L;
+		break;
+	case 4:
+		if(!getequipisequiped(EQI_HAND_R)) {
+		  mes "[Pudding]";
+		  mes "Well.. You are not equipping anything on the right hand.";
+		  close2;
+		  enable_items;
+		  end;
+		}
+		.@position = EQI_HAND_R;
+		break;
+	case 5:
+		if(!getequipisequiped(EQI_GARMENT)) {
+		  mes "[Pudding]";
+		  mes "Um.... Where's your robe?";
+		  close2;
+		  enable_items;
+		  end;
+		}
+		.@position = EQI_GARMENT;
+		break;
+	case 6:
+		if(!getequipisequiped(EQI_ACC_L)) {
+		  mes "[Pudding]";
+		  mes ".....Where's the accessory?";
+		  close2;
+		  enable_items;
+		  end;
+		}
+		.@position = EQI_ACC_L;
+		break;
+	case 7:
+		if(!getequipisequiped(EQI_ACC_R)) {
+		  mes "[Pudding]";
+		  mes ".....Where's the accessory?";
+		  close2;
+		  enable_items;
+		  end;
+		}
+		.@position = EQI_ACC_R;
+		break;
+	case 8:
+		if(!getequipisequiped(EQI_HEAD_LOW)) {
+		  mes "[Pudding]";
+		  mes "Hey.. Are you not wearing any Helm?";
+		  close2;
+		  enable_items;
+		  end;
+		}
+		.@position = EQI_HEAD_LOW;
+		break;
+	}
+	.@refine_count = getequiprefinerycnt(.@position);
+	.@equip_item = getequipid(.@position);
+	.@lhz_max_num = 4000;
+	if(.@equip_item == Agent_Katar || .@equip_item == Guillotine_Katar || .@equip_item == Ygnus_Stale ||
+	.@equip_item == End_Sektura || .@equip_item = Cannon_Spear || .@equip_item == Giant_Lance ||
+	.@equip_item == Aztoe_Nail || .@equip_item == Scarletto_Nail || .@equip_item == Bloody_Cross) {
+	  .@type = 1;
+	  if(.@equip_item == Giant_Lance)
+		.@lhz_max_num = 4200;
+	} else if (.@equip_item == Catapult || .@equip_item == Big_CrossBow || .@equip_item == Creeper_Bow) {
+		.@type = 2;
+	} else if (.@equip_item == Chilly_Spell_Book || .@equip_item == Recovery_Light) {
+		.@type = 3;
+	} else if (.@equip_item== Giant_Shield || .@equip_item == Geffenia_Book_Water || .@equip_item == Bible_Of_Promise2 ||
+	.@equip_item == Salvage_Cape || .@equip_item == Assassin_Handcuffs || .@equip_item == Green_Operation_Coat ||
+	.@equip_item == Ancient_Gold_Deco) {
+	  if(.@equip_item == Salvage_Cape || .@equip_item == Ancient_Gold_Deco)
+		.@lhz_max_num = 4200;
+	} else {
+		mes "[Pudding]";
+		mes "Before! I need to check if this equipment can accept the power.";
+		next;
+		specialeffect2 EF_SPHERE;
+		progressbar "ffff00", 2;
+		specialeffect2 EF_SUI_EXPLOSION;
+		emotion e_sob;
+		mes "[Pudding]";
+		mes "Hm.... This equipment cannot accept the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000'.";
+		close2;
+		enable_items;
+		end;
+	}
+	emotion e_ho;
+	mes "[Pudding]";
+	mes "OHHH.. This equipment could accept the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000'.";
+	next;
+	if (countitem(Will_Of_Warrior) >= 10)
+		.@menu_in$[1] = "Dwell the power of '^F2766EWill of Warrior^000000'";
+	else
+		.@menu_in$[1] = "Not enough ^999999'Will of Warrior'^000000";
+
+	if (countitem(Blood_Thirst) >= 10)
+		.@menu_in$[2] = "Dwell the power of '^952420Thirst for Blood^000000'";
+	else
+		.@menu_in$[2] = "Not enough ^999999'Thirst for Blood'^000000";
+
+	if (countitem(Goast_Chill) >= 10)
+		.@menu_in$[3] = "Consume the '^88C6F7Chill of the Dead^000000'";
+	else
+		.@menu_in$[3] = "Not enough ^999999'Chill of the Dead'^000000";
+	mes "[Pudding]";
+	mes "OK! Which power do you want to dwell in your equipment?";
+	next;
+	switch(select("I say no! I don't need that!!", .@menu_in$[1], .@menu_in$[2], .@menu_in$[3])) {
+		case 1:
+			mes "[Pudding]";
+			mes "Ohhh.. I was looking forward to doing it, but it's all up to you......";
+			close2;
+			enable_items;
+			end;
+		case 2:
+			if (countitem(Will_Of_Warrior) < 10) {
+				mes "[Pudding]";
+				mes "Not enough '^F2766EWill of Warrior^000000', You need to bring 10 '^F2766EWill of Warrior^000000'";
+				close2;
+				enable_items;
+				end;
+			}
+			else if (getequipcardid(.@position, 3) > 0) {
+				mes "[Pudding]";
+				mes "This equipment already got the power of '^F2766EWill of Warrior^000000'.";
+				close2;
+				enable_items;
+				end;
+			} else {
+				.@socket_type = 4;
+			}
+			break;
+		case 3:
+			if (countitem(Blood_Thirst) < 10) {
+				mes "[Pudding]";
+				mes "Not enough '^952420Thirst for Blood^000000', You need to bring 10 '^952420Thirst for Blood^000000'";
+				close2;
+				enable_items;
+				end;
+			}
+			else if (getequipcardid(.@position, 2) > 0) {
+				mes "[Pudding]";
+				mes "This equipment already got the power of '^952420Thirst for Blood^000000'.";
+				close2;
+				enable_items;
+				end;
+			} else {
+				.@socket_type = 3;
+			}
+			break;
+		case 4:
+			//---------- Enchant Removal Script ----------//
+			if (countitem(Goast_Chill) < 10) {
+				.@menu_clear$[1] = "^999999Not enough 'Chill of the Dead'^000000";
+				.@menu_clear$[2] = "^999999Not enough 'Chill of the Dead'^000000";
+				.@4thzptsodyd = 1;
+				.@3thzptsodyd = 1;
+			} else {
+				if (getequipcardid(.@position, 3) > 0) {
+					.@menu_clear$[1] = "Remove the power of '^F2766EWill of Warrior^000000'";
+				} else {
+					.@menu_clear$[1] = "^999999There's no power to remove^000000";
+					.@4thzptsodyd = 1;
+				}
+				if (getequipcardid(.@position, 2) > 0) {
+					.@menu_clear$[2] = "Remove the power of '^952420Thirst for Blood^000000'";
+				} else {
+					.@menu_clear$[2] = "^999999There's no power to remove^000000";
+					.@3thzptsodyd = 1;
+				}
+			}
+			mes "[Pudding]";
+			mes "Alright, which power do you want to remove?";
+			next;
+			.@menu = select("No, I don't wannna remove any.", .@menu_clear$[1], .@menu_clear$[2]);
+			switch(.@menu){
+				case 1:
+					mes "[Pudding]";
+					mes "Really? Ok. I got it..";
+					close2;
+					enable_items;
+					end;
+				case 2:
+				case 3:
+					if (countitem(Goast_Chill) < 10) {
+						mes "[Pudding]";
+						mes "Not enough '^88C6F7Chill of the Dead^000000', You need to bring 10 '^88C6F7Chill of the Dead^000000'";
+						close2;
+						enable_items;
+						end;
+					}
+					if ( (.@menu==3 && .@3thzptsodyd == 1) || (.@menu==2 && .@4thzptsodyd == 1) ) {
+						mes "[Pudding]";
+						mes "This equipment didn't get any special power.";
+						close2;
+						enable_items;
+						end;
+					}
+					setarray .@equip_card[0], getequipcardid(.@position,0), getequipcardid(.@position,1), getequipcardid(.@position,2), getequipcardid(.@position,3);
+					if (.@menu==2){ .@equip_card[3] = 0; }
+					else { .@equip_card[2] = 0; }
+					.@equip_item = getequipid(.@position);
+					specialeffect EF_BEGINSPELL2, AREA, "Sorcerer#Bio4Reward";
+					progressbar "ffff00", 2;
+					specialeffect2 EF_FROSTWEAPON;
+					delitem Goast_Chill, 10;
+					delequip .@position;
+					getitem2 .@equip_item, 1, 1, .@refine_count, 0, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3];
+					mes "[Pudding]";
+					if(.@menu==3)
+						mes "The power of '^952420Thirst for Blood^000000' has been perfectly removed.";
+					else
+						mes "The power of '^F2766EWill of Warrior^000000' has been perfectly removed.";
+					close2;
+					enable_items;
+					end;
+			}
+	}
+	mes "[Pudding]";
+	mes "Before I dwell the power, let me explain to you cautions.";
+	next;
+	mes "[Pudding]";
+	mes "While dwelling the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000', the equipment would be not capable to accept that and will be destryed..";
+	next;
+	mes "[Pudding]";
+	mes "^9D2628If the equipment is destroyed, you will also lose the cards you inserted in it, and the refine Lv will be removed too.^000000";
+	next;
+	mes "[Pudding]";
+	mes "Alright. will you really wish to dwell the power into the equipment?";
+	next;
+	if(select("Wait, I will think again.", "Sure, carry on.") == 1) {
+		mes "[Pudding]";
+		mes "OK. I will be hoping to see you again.";
+		close2;
+		enable_items;
+		end;
+	}
+	mes "[Pudding]";
+	mes "I wish you made a correct decision...";
+	next;
+	if(.@socket_type >= 3) {
+		switch(.@type){
+			case 1:
+				// Short Distance
+				.@i = rand(1, .@lhz_max_num);
+				if (.@i < 401)	 .@enchant = Strength1;
+				else if (.@i < 441) .@enchant = Strength2;
+				else if (.@i < 445) .@enchant = Strength3;
+				else if (.@i < 845) .@enchant = Agility1;
+				else if (.@i < 885) .@enchant = Agility2;
+				else if (.@i < 889) .@enchant = Agility3;
+				else if (.@i < 1289) .@enchant = Vitality1;
+				else if (.@i < 1329) .@enchant = Vitality2;
+				else if (.@i < 1333) .@enchant = Vitality3;
+				else if (.@i < 1523) .@enchant = Inteligence1;
+				else if (.@i < 1542) .@enchant = Inteligence2;
+				else if (.@i < 1544) .@enchant = Inteligence3;
+				else if (.@i < 1844) .@enchant = Dexterity1;
+				else if (.@i < 1874) .@enchant = Dexterity2;
+				else if (.@i < 1877) .@enchant = Dexterity3;
+				else if (.@i < 2067) .@enchant = Luck1;
+				else if (.@i < 2086) .@enchant = Luck2;
+				else if (.@i < 2088) .@enchant = Luck3;
+				else if (.@i < 2491) .@enchant = 0;
+				else if (.@i < 2891) .@enchant = Fighting_Spirit1;
+				else if (.@i < 2931) .@enchant = Fighting_Spirit2;
+				else if (.@i < 2935) .@enchant = Fighting_Spirit3;
+				else if (.@i < 3125) .@enchant = Spell1;
+				else if (.@i < 3144) .@enchant = Spell2;
+				else if (.@i < 3146) .@enchant = Spell3;
+				else if (.@i < 3148) .@enchant = Atk_Speed1;
+				else if (.@i < 3348) .@enchant = Sharp1;
+				else if (.@i < 3368) .@enchant = Sharp2;
+				else if (.@i < 3370) .@enchant = Sharp3;
+				else if (.@i < 3560) .@enchant = Expert_Archer1;
+				else if (.@i < 3579) .@enchant = Expert_Archer2;
+				else if (.@i < 3581) .@enchant = Expert_Archer3;
+				else .@enchant = 0;
+				break;
+			case 2:
+				// Long Distance
+				.@i = rand(1, .@lhz_max_num);
+				if (.@i < 191)	 .@enchant = Strength1;
+				else if (.@i < 210) .@enchant = Strength2;
+				else if (.@i < 212) .@enchant = Strength3;
+				else if (.@i < 612) .@enchant = Agility1;
+				else if (.@i < 652) .@enchant = Agility2;
+				else if (.@i < 656) .@enchant = Agility3;
+				else if (.@i < 846) .@enchant = Vitality1;
+				else if (.@i < 865) .@enchant = Vitality2;
+				else if (.@i < 867) .@enchant = Vitality3;
+				else if (.@i < 1167) .@enchant = Inteligence1;
+				else if (.@i < 1197) .@enchant = Inteligence2;
+				else if (.@i < 1200) .@enchant = Inteligence3;
+				else if (.@i < 1600) .@enchant = Dexterity1;
+				else if (.@i < 1640) .@enchant = Dexterity2;
+				else if (.@i < 1644) .@enchant = Dexterity3;
+				else if (.@i < 1834) .@enchant = Luck1;
+				else if (.@i < 1853) .@enchant = Luck2;
+				else if (.@i < 1855) .@enchant = Luck3;
+				else if (.@i < 2258) .@enchant = 0;
+				else if (.@i < 2448) .@enchant = Fighting_Spirit1;
+				else if (.@i < 2467) .@enchant = Fighting_Spirit2;
+				else if (.@i < 2469) .@enchant = Fighting_Spirit3;
+				else if (.@i < 2669) .@enchant = Spell1;
+				else if (.@i < 2689) .@enchant = Spell2;
+				else if (.@i < 2691) .@enchant = Spell3;
+				else if (.@i < 2693) .@enchant = Atk_Speed1;
+				else if (.@i < 3093) .@enchant = Sharp1;
+				else if (.@i < 3133) .@enchant = Sharp2;
+				else if (.@i < 3137) .@enchant = Sharp3;
+				else if (.@i < 3537) .@enchant = Expert_Archer1;
+				else if (.@i < 3577) .@enchant = Expert_Archer2;
+				else if (.@i < 3581) .@enchant = Expert_Archer3;
+				else .@enchant = 0;
+				break;
+			case 3:
+				.@i = rand(1, .@lhz_max_num);
+				if (.@i < 301)	 .@enchant = Strength1;
+				else if (.@i < 331) .@enchant = Strength2;
+				else if (.@i < 334) .@enchant = Strength3;
+				else if (.@i < 534) .@enchant = Agility1;
+				else if (.@i < 554) .@enchant = Agility2;
+				else if (.@i < 556) .@enchant = Agility3;
+				else if (.@i < 956) .@enchant = Vitality1;
+				else if (.@i < 996) .@enchant = Vitality2;
+				else if (.@i < 1000) .@enchant = Vitality3;
+				else if (.@i < 1400) .@enchant = Inteligence1;
+				else if (.@i < 1440) .@enchant = Inteligence2;
+				else if (.@i < 1444) .@enchant = Inteligence3;
+				else if (.@i < 1844) .@enchant = Dexterity1;
+				else if (.@i < 1884) .@enchant = Dexterity2;
+				else if (.@i < 1888) .@enchant = Dexterity3;
+				else if (.@i < 2078) .@enchant = Luck1;
+				else if (.@i < 2097) .@enchant = Luck2;
+				else if (.@i < 2099) .@enchant = Luck3;
+				else if (.@i < 2502) .@enchant = 0;
+				else if (.@i < 2692) .@enchant = Fighting_Spirit1;
+				else if (.@i < 2711) .@enchant = Fighting_Spirit2;
+				else if (.@i < 2713) .@enchant = Fighting_Spirit3;
+				else if (.@i < 3113) .@enchant = Spell1;
+				else if (.@i < 3153) .@enchant = Spell2;
+				else if (.@i < 3157) .@enchant = Spell3;
+				else if (.@i < 3159) .@enchant = Atk_Speed1;
+				else if (.@i < 3349) .@enchant = Sharp1;
+				else if (.@i < 3368) .@enchant = Sharp2;
+				else if (.@i < 3370) .@enchant = Sharp3;
+				else if (.@i < 3560) .@enchant = Expert_Archer1;
+				else if (.@i < 3579) .@enchant = Expert_Archer2;
+				else if (.@i < 3581) .@enchant = Expert_Archer3;
+				else .@enchant = 0;
+				break;
+			case 4:
+				// Armor
+				.@i = rand(1, .@lhz_max_num);
+				if (.@i < 301)	 .@enchant = Strength1;
+				else if (.@i < 331) .@enchant = Strength2;
+				else if (.@i < 334) .@enchant = Strength3;
+				else if (.@i < 634) .@enchant = Agility1;
+				else if (.@i < 664) .@enchant = Agility2;
+				else if (.@i < 667) .@enchant = Agility3;
+				else if (.@i < 967) .@enchant = Vitality1;
+				else if (.@i < 997) .@enchant = Vitality2;
+				else if (.@i < 1000) .@enchant = Vitality3;
+				else if (.@i < 1300) .@enchant = Inteligence1;
+				else if (.@i < 1330) .@enchant = Inteligence2;
+				else if (.@i < 1333) .@enchant = Inteligence3;
+				else if (.@i < 1633) .@enchant = Dexterity1;
+				else if (.@i < 1663) .@enchant = Dexterity2;
+				else if (.@i < 1666) .@enchant = Dexterity3;
+				else if (.@i < 1966) .@enchant = Luck1;
+				else if (.@i < 1996) .@enchant = Luck2;
+				else if (.@i < 1999) .@enchant = Luck3;
+				else if (.@i < 2399) .@enchant = 0;
+				else if (.@i < 2549) .@enchant = Mdef2;
+				else if (.@i < 2599) .@enchant = Mdef4;
+				else if (.@i < 2609) .@enchant = Mdef6;
+				else if (.@i < 2614) .@enchant = Mdef8;
+				else if (.@i < 2616) .@enchant = Mdef10;
+				else if (.@i < 2766) .@enchant = Def3;
+				else if (.@i < 2866) .@enchant = Def6;
+				else if (.@i < 2876) .@enchant = Def9;
+				else if (.@i < 2878) .@enchant = Def12;
+				else if (.@i < 3278) .@enchant = 0;
+				else if (.@i < 3428) .@enchant = Evasion1;
+				else if (.@i < 3478) .@enchant = Evasion3;
+				else if (.@i < 3488) .@enchant = Evasion6;
+				else if (.@i < 3498) .@enchant = SP50;
+				else if (.@i < 3734) .@enchant = HP100;
+				else if (.@i < 3834) .@enchant = HP200;
+				else if (.@i < 3884) .@enchant = HP300;
+				else .@enchant = 0;
+			break;
+		}
+		setarray .@equip_card[0], getequipcardid(.@position,0),getequipcardid(.@position,1),getequipcardid(.@position,2),getequipcardid(.@position,3);
+		.@equip_card[(.@socket_type-1)] = .@enchant;
+		.@equip_item = getequipid(.@position);
+		specialeffect EF_BEGINSPELL3, AREA, "Sorcerer#Bio4Reward";
+		progressbar "ffff00", 2;
+		if (.@socket_type == 3)
+			delitem Blood_Thirst, 10;
+		else
+			delitem Will_Of_Warrior, 10;
+		delequip .@position;
+		if (.@enchant == 0) {
+			specialeffect2 EF_SUI_EXPLOSION;
+			emotion e_otl;
+			mes "[Pudding]";
+			mes "...Well....the equipment could not accept the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" and it got destroyed.";
+			close2;
+			enable_items;
+			end;
+		} else {
+			specialeffect2 EF_FIREHIT;
+			getitem2 .@equip_item, 1, 1, .@refine_count, 0, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3];
+			emotion e_ho;
+			mes "[Pudding]";
+			mes "Fortunately the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" has been dwelt well in your equipment..";
+			close2;
+			enable_items;
+			end;
+		}
+	}
+	enable_items;
+	end;
+}
+
+// Warp portal to the 4th Fl.
+//==============================================================================
+lhz_dun03,239,78,1	script	lhz_dun03_lhz_dun04	WARPNPC,1,1,{
+	end;
+
+	OnTouch:
+		if (lght_duk01 > 0 && lght_duk01 < 6) {
+			mes "In order to investigate human experimentation, I had to go down whilst I didn't want to because of gruesome sound.";
+			close2;
+			if (lght_duk01 < 3) {
+				warp "que_lhz", 245, 56;
+			} else if (lght_duk01 == 3) {
+				warp "que_lhz", 96, 136;
+			} else {
+				warp "que_lhz", 148, 215;
+			}
+		} else {
+			if (lhz_boss < 31) {
+				mes "- Whistling sound -";
+				mes "From below, there comes a gruesome sound mingling with the wind.";
+				close2;
+			}
+			warp "lhz_dun04", 245, 56;
+		}
+		end;
+}
+
+// Warp Portal to the 3rd Fl.
+//==============================================================================
+lhz_dun04,244,61,1	warp	lhz_dun04_lhz_dun03	1,1,lhz_dun03,240,75
+
+// Inside the Lab
+//==============================================================================
+que_lhz,242,50,0	script	#01Startpoint	-1,3,3,{
+	end;
+
+	OnInit:
+		initnpctimer;
+		end;
+
+	OnTimer60000:
+		mapannounce "que_lhz", "Man's whisper: Pl.. please.. save me.. I don't wanna die.. wouaaaa..", bc_map, "0x7DCBF0";
+		end;
+
+	OnTimer120000:
+		mapannounce "que_lhz", "Woman's whisper: .. Save.. aaaah.. us...", bc_map, "0x7DCBF0";
+		end;
+
+	OnTimer180000:
+		mapannounce "que_lhz", "Kid's whisper: Bawwww~ Where am I? Mama......aaaa....", bc_map, "0x7DCBF0";
+		end;
+
+	OnTimer240000:
+		mapannounce "que_lhz", "Oldman's whisper: Kirk...hel...help......", bc_map, "0x7DCBF0";
+		end;
+
+	OnTimer300000:
+		stopnpctimer;
+		initnpctimer;
+		end;
+
+	OnTouch:
+		if (lght_duk01 == 1) {
+			mes "I arrived at a research facility which seems it has been used till these days.";
+			next;
+			mes "There are some destroyed part, but the basic facility seem fine.";
+			next;
+			lght_duk01 = 2;
+			mes "Get around a little more..";
+			close;
+		}
+		end;
+}
+
+// Wolfchev
+//==============================================================================
+que_lhz,206,74,4	script	Researcher#02	4_LGTSCIENCE,3,3,{
+	end;
+
+	OnTouch:
+		if (lght_duk01 == 2) {
+		  emotion e_omg, 1;
+		  mes "["+ strcharinfo(PC_NAME) +"]";
+		  mes "You!!!! are Wolfchev?";
+		  next;
+		  emotion e_gg, "Researcher#02";
+		  mes "[Wolfchev]";
+		  mes "A Human! kaahaha. People tend to hate this place, why are you here?";
+		  next;
+		  mes "["+ strcharinfo(PC_NAME) +"]";
+		  mes "You!!! I heard that you were committing human experimentation. Wolfchev!!";
+		  next;
+		  mes "["+ strcharinfo(PC_NAME) +"]";
+		  mes "And I see that you are still committing that!!!";
+		  next;
+		  emotion e_gg, "Researcher#02";
+		  mes "[Wolfchev]";
+		  mes "Kihihihi. I can see that you know something about me. Is that you who accused me?";
+		  mes "How dare you come back to me after you did that. Kihihih";
+		  next;
+		  mes "[Wolfchev]";
+		  mes "I feel good to see a human";
+		  mes "in a long time, but I gotta go. Kihihihi.";
+		  next;
+		  mes "- Wolfchev ran away giving a awkward laughing sound. -";
+		  next;
+		  erasequest 5109;
+		  setquest 5110;
+		  lght_duk01 = 3;
+		  emotion e_omg, 1;
+		  mes "["+ strcharinfo(PC_NAME) +"]";
+		  mes "Whoa! Wolfchev, stop!";
+		  close2;
+		  warp "que_lhz", 96, 136;
+		}
+		end;
+}
+
+// Wolfchev
+//==============================================================================
+que_lhz,94,119,4	script	Researcher#03	4_LGTSCIENCE,{
+	if ((MaxWeight - Weight) < 1000 || !checkweight(1201, 1)) {
+		mes "^FF0000 Check up your inventory. You got too many items to carry out the quest. ^000000";
+		close;
+	}
+	if (lght_duk01 == 3) {
+		emotion e_swt2, "Researcher#03";
+		mes "[Wolfchev]";
+		mes "(Gasping) Pshaw... you are still following me. Hey, why do you keep following me?";
+		next;
+		mes "["+ strcharinfo(PC_NAME) +"]";
+		mes "Wolfchev.. You said before. that you are doing research for everybody.";
+		next;
+		mes "[Wolfchev]";
+		mes "I might have said that.... so what?";
+		next;
+		mes "["+ strcharinfo(PC_NAME) +"]";
+		mes "But, your experiment seem really dangerous. How come this is what everybody wants?";
+		next;
+		emotion e_gg, "Researcher#03";
+		mes "[Wolfchev]";
+		mes "Everyone has a desire to be stronger and wants to dominate others so those other people obey and admire you. Do you not have that desire?";
+		next;
+		mes "["+ strcharinfo(PC_NAME) +"]";
+		mes "... .... ...";
+		next;
+		mes "[Wolfchev]";
+		mes "If you want to save yourself, should stop following me. Bugger off.";
+		next;
+		mes "Wolfchev is again running away with a strange sound.";
+		next;
+		lght_duk01 = 4;
+		mes "["+ strcharinfo(PC_NAME) +"]";
+		mes "Awwww!! You!! running away again..... Stop!";
+		close2;
+		warp "que_lhz", 148, 215;
+	}
+	end;
+}
+
+// Wolfchev
+//==============================================================================
+que_lhz,147,224,4	script	Researcher#04	4_LGTSCIENCE,{
+	if ((MaxWeight - Weight) < 1000 || !checkweight(1201, 1)) {
+		mes "^FF0000 Check up your inventory. You got too many items to carry out the quest. ^000000";
+		close;
+	}
+	if (lght_duk01 == 4) {
+		mes "[Wolfchev]";
+		mes "You are pretty persistent, aren't you? Or I think.......that you like me, huh? Kihihii.";
+		next;
+		emotion e_dots;
+		mes "["+ strcharinfo(PC_NAME) +"]";
+		mes "... .... ...";
+		next;
+		specialeffect EF_SIGHTRASHER;
+		mes "Wolfchev mocked you at your silence and pressed a button in his hand. Then guinea pigs woken up around him.";
+		next;
+		for(.@i = 1; .@i < 9; .@i++)
+			donpcevent "Human Guinea pig#0"+.@i+"::OnEnable";
+		mes "[Wolfchev]";
+		mes "Again.. it's time to say goodbye.";
+		next;
+		emotion e_gasp, "Researcher#04";
+		mes "[Wolfchev]";
+		mes "Well! May be....";
+		next;
+		mes "[Wolfchev]";
+		mes "If you come to me for the experimentation, I can treat you better.";
+		next;
+		donpcevent "#Eventctrl::OnEnable";
+		progressbar "FF00FF", 5;
+		emotion e_omg, "Researcher#04";
+		mes "[Wolfchev]";
+		mes "Oh my,... What happened?";
+		next;
+		donpcevent "#Eventctrl::OnEnable2";
+		for(.@i = 1; .@i < 9; .@i++)
+			donpcevent "Human Guinea pig#0"+.@i+"::OnDisable";
+		mes "[Wolfchev]";
+		mes "No! Don't come to me! Don't!!";
+		next;
+		lght_duk01 = 5;
+		mes "First of all, I gotta handle those guinea pigs!";
+		close;
+	} else if (lght_duk01 == 5) {
+		.@i = rand(1,3);
+		if (.@i == 2) {
+			mes "Wolfchev is confused and has no idea now since those monsters are attacking him too.";
+			next;
+			specialeffect EF_STUNATTACK;
+			specialeffect EF_STUNATTACK;
+			mes "- Hit him to wake him up -";
+			next;
+			specialeffect EF_DARKBREATH;
+			emotion e_no;
+			mes "["+ strcharinfo(PC_NAME) +"]";
+			mes "Hey Dude! Anyway let's get out of here first! Isn't there any place where they cannot reach?";
+			next;
+			mes "[Wolfchev]";
+			mes "Oooops.. then my....my lab....to my lab...";
+			next;
+			mes "["+ strcharinfo(PC_NAME) +"]";
+			mes "Your lab?? Okay, where's that?";
+			next;
+			mes "[Wolfchev]";
+			mes "to the north....... . Not so far from here..";
+			next;
+			erasequest 5110;
+			setquest 5111;
+			lght_duk01 = 6;
+			mes "Go to '^0000FFWolfchev's Lab^000000' at the 12 o'clock direction...";
+			close;
+		} else {
+			emotion e_spin, "Researcher#04";
+			mes "Wolfchev is confused and has no idea now since those monsters are attacking him too.";
+			close;
+		}
+	} else if (lght_duk01 == 6) {
+		mes "Go to '^0000FFWolfchev's Lab^000000' at the 12 o'clock direction...";
+		close;
+	}
+	end;
+}
+
+// Warp to lhz_dun04 from Wolfchev's Lab
+//==============================================================================
+que_lhz,148,251,0	script	#Move2lab	-1,12,0,{
+	end;
+
+	OnTouch:
+		if (lght_duk01 == 6) {
+			mes "I arrived at '^0000FFWolfchev's Lab^000000'.";
+			close2;
+			warp "lhz_dun04", 148, 269;
+			end;
+		} else {
+			mes "I still have something to do with Wolfchev.";
+			close;
+		}
+}
+
+// Event Controller
+//==============================================================================
+que_lhz,1,1,0	script	#Eventctrl	-1,{
+	end;
+
+	OnEnable:
+		initnpctimer;
+		end;
+
+	OnEnable2:
+		monster "que_lhz", 139, 232, "Human Guinea pig", QUEST_CHEN, 1, "#Eventctrl::OnMyMobDead";
+		monster "que_lhz", 147, 232, "Human Guinea pig", QUEST_CHEN, 1, "#Eventctrl::OnMyMobDead";
+		monster "que_lhz", 156, 232, "Human Guinea pig", QUEST_CHEN, 1, "#Eventctrl::OnMyMobDead";
+		monster "que_lhz", 156, 224, "Human Guinea pig", QUEST_CHEN, 1, "#Eventctrl::OnMyMobDead";
+		monster "que_lhz", 156, 215, "Human Guinea pig", QUEST_CHEN, 1, "#Eventctrl::OnMyMobDead";
+		monster "que_lhz", 147, 215, "Human Guinea pig", QUEST_CHEN, 1, "#Eventctrl::OnMyMobDead";
+		monster "que_lhz", 139, 215, "Human Guinea pig", QUEST_CHEN, 1, "#Eventctrl::OnMyMobDead";
+		monster "que_lhz", 139, 224, "Human Guinea pig", QUEST_CHEN, 1, "#Eventctrl::OnMyMobDead";
+		end;
+
+	OnTimer1000:
+		specialeffect EF_SUI_EXPLOSION,AREA, "#01";
+		specialeffect EF_BEGINASURA, "Human Guinea pig#01";
+		end;
+
+	OnTimer2000:
+		specialeffect EF_SUI_EXPLOSION,AREA, "#02";
+		specialeffect EF_BEGINASURA, "Human Guinea pig#02";
+		end;
+
+	OnTimer3000:
+		specialeffect EF_SUI_EXPLOSION,AREA, "#03";
+		specialeffect EF_BEGINASURA, "Human Guinea pig#03";
+		end;
+
+	OnTimer4000:
+		specialeffect EF_SUI_EXPLOSION,AREA, "#04";
+		specialeffect EF_BEGINASURA, "Human Guinea pig#04";
+		end;
+
+	OnTimer5000:
+		specialeffect EF_SUI_EXPLOSION,AREA, "#05";
+		specialeffect EF_BEGINASURA, "Human Guinea pig#05";
+		end;
+
+	OnTimer6000:
+		specialeffect EF_SUI_EXPLOSION,AREA, "#06";
+		specialeffect EF_BEGINASURA, "Human Guinea pig#06";
+		end;
+
+	OnTimer7000:
+		specialeffect EF_SUI_EXPLOSION,AREA, "#07";
+		specialeffect EF_BEGINASURA, "Human Guinea pig#07";
+		end;
+
+	OnTimer8000:
+		specialeffect EF_SUI_EXPLOSION,AREA, "#08";
+		specialeffect EF_BEGINASURA, "Human Guinea pig#08";
+		stopnpctimer;
+		end;
+
+	OnMyMobDead:
+		if(mobcount("que_lhz", "#Eventctrl::OnMyMobDead") < 4)
+			killmonster "que_lhz", "#Eventctrl::OnMyMobDead";
+}
+
+que_lhz,139,232,0	script	#01	-1,{ end; }
+que_lhz,147,232,0	script	#02	-1,{ end; }
+que_lhz,156,232,0	script	#03	-1,{ end; }
+que_lhz,156,224,0	script	#04	-1,{ end; }
+que_lhz,156,215,0	script	#05	-1,{ end; }
+que_lhz,147,215,0	script	#06	-1,{ end; }
+que_lhz,139,215,0	script	#07	-1,{ end; }
+que_lhz,139,224,0	script	#08	-1,{ end; }
+
+// Human Guinea pigs
+//==============================================================================
+que_lhz,140,231,1	script	Human Guinea pig#01	CHEN,{
+	end;
+
+	OnInit:
+		disablenpc strnpcinfo(0);
+		end;
+
+	OnEnable:
+		enablenpc strnpcinfo(0);
+		end;
+
+	OnDisable:
+		specialeffect EF_FLASHER;
+		disablenpc strnpcinfo(0);
+		end;
+}
+
+que_lhz,147,231,0	duplicate(Human Guinea pig#01)	Human Guinea pig#02	CHEN
+que_lhz,155,231,7	duplicate(Human Guinea pig#01)	Human Guinea pig#03	CHEN
+que_lhz,155,224,6	duplicate(Human Guinea pig#01)	Human Guinea pig#04	CHEN
+que_lhz,155,216,5	duplicate(Human Guinea pig#01)	Human Guinea pig#05	CHEN
+que_lhz,147,216,4	duplicate(Human Guinea pig#01)	Human Guinea pig#06	CHEN
+que_lhz,140,216,3	duplicate(Human Guinea pig#01)	Human Guinea pig#07	CHEN
+que_lhz,140,224,2	duplicate(Human Guinea pig#01)	Human Guinea pig#08	CHEN
+
+// Wolfchev
+//==============================================================================
+lhz_dun04,151,276,3	script	Researcher#memo	4_LGTSCIENCE,{
+	if ((MaxWeight - Weight) < 1000 || !checkweight(1201, 1)) {
+		mes "^FF0000You cannot continue the process due to possessing too many belongings.^000000";
+		close;
+	}
+	.@quest_time = checkquest(5112, PLAYTIME);
+	.@killed_bosses = true;
+	for(.@quest_id = 5113; .@quest_id <= 5125; .@quest_id++) {
+		if(checkquest(.@quest_id, HUNTING) <= 1)
+			.@killed_bosses = false;
+	}
+	if (lght_duk01 < 6) {
+		mes "[Researcher]";
+		mes "What! Do you have any business here?";
+		next;
+		if(select("Yes I do!!", "Umm.. No..") == 1) {
+			mes "[Researcher]";
+			mes "Why don't stop staring at other's laboratory, and be on your way?";
+			close;
+		}
+		mes "[Researcher]";
+		mes "Stop wondering here, and be on your way. Will you? Khh Khh.";
+		close;
+	} else if (lght_duk01 == 6) {
+		mes "It seems experimental creatures cannot come near the laboratory, just like Wolfchev said.";
+		next;
+		mes "["+ strcharinfo(PC_NAME) +"]";
+		mes "Hey, is there any way to stop those creatures? You should know something, you made those things!";
+		next;
+		mes "[Wolfchev]";
+		mes "Urrgg.. I didn't expect them to loose control like that...";
+		next;
+		mes "[Wolfchev]";
+		mes "What is wrong with this whole thing?";
+		next;
+		mes "[Wolfchev]";
+		mes "Urr.. I think they will ruin my whole laboratory!";
+		next;
+		emotion e_loud, 1;
+		mes "["+ strcharinfo(PC_NAME) +"]";
+		mes "Hey! Wolfchev!!";
+		next;
+		mes "[Wolfchev]";
+		mes "You!? Hey, please stop them!";
+		mes "Creatures are ^9f6077organically connected with same job field^000000.";
+		next;
+		mes "[Wolfchev]";
+		mes "There is one special creature being their ^46B951boss position^000000...";
+		mes "If you could deactivate that creature, all ^A1BB44slave creatures^000000 walking around here will stop moving right away.";
+		next;
+		mes "["+ strcharinfo(PC_NAME) +"]";
+		mes "Boss creature?";
+		mes "Hey! Wolfchev! Where is that ^46B951Boss creature^000000?";
+		next;
+		mes "[Wolfchev]";
+		mes "Inside.. of laboratory.. It should be waken up now. It's sad to destroy my life of work, but I can't take this any more.. ...";
+		next;
+		mes "["+ strcharinfo(PC_NAME) +"]";
+		mes "How can I get into the Wolfchev's laboratory?";
+		next;
+		mes "[Wolfchev]";
+		mes "Oh.. Wait!";
+		mes "I will help you get in there.";
+		next;
+		mes "[Wolfchev]";
+		mes "Good news is that boss creatures are not set up to wake up all at once, even though slaves are.";
+		next;
+		erasequest 5111;
+		lght_duk01 = 7;
+		for(.@i = 5113; .@i <= 5125; .@i++)
+			setquest .@i;
+		mes "[Wolfchev]";
+		mes "But still, it is really dangerous since we don't know when they will escape from there.";
+		mes "So, please prepare your party members, and take care of those boss creatures. I'm not sure how long this place can hold.";
+		close;
+	} else if (lght_duk01 > 6) {
+		if (getcharid(1) > 0) {
+			mes "[Wolfchev]";
+			mes "Are you all set there? I will prepare the entrance if you are the leader of that party.";
+			next;
+			switch(select("Any warnings?", "Going into the laboratory", "Do not enter")) {
+			case 1:
+				mes "[Wolfchev]";
+				mes "I didn't know pressing the emergency alarm would cause such problem. The management system seems to be changed to emergency mode.";
+				next;
+				mes "[Wolfchev]";
+				mes "There are so many systems set up inside of the laboratory, so eve I cannot be sure how systems are twisted by now.";
+				next;
+				mes "[Wolfchev]";
+				mes "Ah! If the emergency system is activating, only the leader of party should control everything. It is a lot of pressure I understand.";
+				next;
+				mes "[Wolfchev]";
+				mes "And just so you know, please do not touch random things out of curiosity. I don't want you to get hurt.";
+				close;
+			case 2:
+				if (.@quest_time == 0) {
+					mes "[Wolfchev]";
+					mes "I'm sorry, but it seems you still cannot enter to the laboratory yet. Will you come back later? The system is kind of tricky you know.";
+					close;
+				} else {
+					//if (.@quest_time == 2)
+						//recall_completequest 5112;
+					if (.@quest_time >= 0)
+						erasequest 5112;
+					if (!.@killed_bosses) {
+						if (lght_duk01 == 9) {
+							mes "[Wolfchev]";
+							mes "You came back, Ka Ha Ha.";
+							next;
+							mes "[Wolfchev]";
+							mes "After you left, I was fixing some system parts. And then suddenly strange thing happened.";
+							next;
+							mes "["+ strcharinfo(PC_NAME) +"]";
+							mes "What was that?";
+							next;
+							mes "[Wolfchev]";
+							mes "All those boss creatures you took care of started to regenerate themselves..";
+							next;
+							mes "["+ strcharinfo(PC_NAME) +"]";
+							mes "What.. How is that possible...?!";
+							next;
+							mes "[Wolfchev]";
+							mes "I am also completely lost here.. But, this should not be happening..";
+							next;
+							mes "["+ strcharinfo(PC_NAME) +"]";
+							mes "... .... ...";
+							next;
+							mes "[Wolfchev]";
+							mes "As you can see, you are the only one I can trust. Would you and your party help me once again deactivating those creatures?";
+							next;
+							if(select("I am not sure", "Why not") == 1) {
+								mes "[Wolfchev]";
+								mes "I see. I understand why you are hesitating, and don't want to press you any more. But, still I'm not sure why you want go there anyways,";
+								next;
+							} else {
+								for(.@i = 5113; .@i <= 5125; .@i++) {
+									setquest .@i;
+								}
+								lght_duk01 = 10;
+								mes "[Wolfchev]";
+								mes "Thank you very much. "+strcharinfo(PC_NAME)+"";
+								mes "I will help you get in the laboratory right away.";
+								next;
+							}
+						} else {
+							mes "[Wolfchev]";
+							mes "Hmm.. Those boss creatures regenerating once again..";
+							next;
+							mes "[Wolfchev]";
+							mes "Can you help me just one more time?";
+							next;
+							if(select("I am not sure", "Why not") == 1) {
+								mes "[Wolfchev]";
+								mes "I see. I understand why you are hesitating, and don't want to press you any more. But, still I'm not sure why you want go there anyways,";
+								next;
+							} else {
+								for(.@i = 5113; .@i <= 5125; .@i++) {
+									setquest .@i;
+								}
+								lght_duk01 = 10;
+								mes "[Wolfchev]";
+								mes "Thank you. "+strcharinfo(PC_NAME)+"";
+								mes "You want to get in there fast, right?";
+								next;
+							}
+						}
+					}
+				}
+				if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+					.@instance = instance_create("Worsef", getcharid(1));
+					if (.@instance < 0) {
+						mes "[Wolfchev]";
+						mes "Hmm.. Lab entering system is a bit weird. Would wait for me to check the system?";
+					} else {
+						mes "[Wolfchev]";
+						mes "Please hold on..";
+						next;
+						mes "Wolfchev starts to control certain gear.";
+						next;
+						progressbar "FF00FF", 2;
+						if (instance_attachmap("1@lhz", .@instance) != "") {
+							instance_set_timeout 14400, 300, .@instance;
+							instance_init(.@instance);
+							mes "[Wolfchev]";
+							mes "Alright! I have marked lan entering system code as";
+							mes "^0000ff"+ strcharinfo(1) +"^000000 party leader's name ^0000ff"+ strcharinfo(PC_NAME) +"^000000!!.";
+							next;
+							mes "[Wolfchev]";
+							mes "Now, your party is free to pass the entrance.";
+						} else {
+							instance_destroy(.@instance);
+						}
+					}
+					close;
+				} else {
+					mes "[Wolfchev]";
+					mes "You are not the ^0000ffLeader of the party^000000, are you? Please go get the leader.";
+					close;
+				}
+			case 3:
+				mes "[Wolfchev]";
+				mes "Need more preparation? Please, we don't have all day.";
+				close;
+			}
+		} else {
+			mes "[Wolfchev]";
+			mes "Are you trying to go there along? That is a suicide! Our lab entering system is not as easy as you thinkz`.";
+			close;
+		}
+	} else {
+		mes "[Wolfchev]";
+		mes "Woot! Something weird just happen. If this keep happening, maybe we should try other way..";
+		close;
+	}
+}
+
+//
+//==============================================================================
+lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
+	if ((MaxWeight - Weight) < 1000 || !checkweight(1201, 1)) {
+		mes "^FF0000You cannot continue the process due to possessing too many belongings.^000000";
+		close;
+	}
+	.@lhz_time = checkquest(5112, PLAYTIME);
+	if (lght_duk01 < 7) {
+		mes "It says,";
+		mes "'^0000FF****'s laboratory member only^000000'";
+		close;
+	}
+	if (.@lhz_time == -1) {
+		mes "This is an entrance towards Wolfchev's laboratory. Something is howling over the entrance.";
+		next;
+		if(select("Go inside", "Think one more time") == 2) {
+			mes "You have stopped entering to Wolfchev's laboratory.";
+			close;
+		}
+		if (has_instance("1@lhz") == "") {
+			mes "^FF0000Warning^000000";
+			mes ""+ strcharinfo(PC_NAME) +". . .";
+			mes "^FF0000Unregistered personnel^000000";
+			next;
+			pushpc 0, 10;
+			percentheal -5,0;
+			specialeffect EF_AUTOCOUNTER;
+			specialeffect2 EF_BASH;
+			mes "You have been wounded by laboratory entrance system attack.";
+			close;
+		} else {
+			mapannounce "lhz_dun04","Laboratory entrance system ["+ strcharinfo(1) +"] member ["+ strcharinfo(PC_NAME) +"] access granted..",bc_map,"0x0DF297";
+			setquest 5112;
+			warp "1@lhz.gat", 45, 148;
+			close;
+		}
+	} else if (.@lhz_time == 0) {
+		mes "Di Rit- Di- Di- Dit-";
+		next;
+		mes ""+ strcharinfo(PC_NAME) +". . .";
+		mes "^FF0000Forbidden personnel^000000";
+		next;
+		mes "The system denied your entrance.";
+		close;
+	} else if (.@lhz_time >= 1) {
+		mes "Di Rit- Di- Di- Dit-";
+		next;
+		//if (.@lhz_time == 2)
+			//recall_completequest 5112;
+		erasequest 5112;
+		mes ""+ strcharinfo(PC_NAME) +". . .";
+		mes "^FF0000Access denial has been deactivated.^000000";
+		close;
+	} else {
+		mes "^FF0000Error! Error!^000000";
+		mes "^FF0000Please try again.^000000";
+		close;
+	}
+}
+
+// The Lab No.1 : System 1_1
+//==============================================================================
+1@lhz,35,108,4	script	Lab1#1_1	CLEAR_NPC,{
+	end;
+
+	OnInstanceInit:
+		initnpctimer;
+		end;
+
+	OnDisable:
+		stopnpctimer;
+		end;
+
+	OnType_02:
+		donpcevent instance_npcname("Manual Sheet#1_1")+"::OnEnable";
+		donpcevent instance_npcname("Valve#1_2")+"::OnEnable";
+		donpcevent instance_npcname("Valve#1_3")+"::OnEnable";
+		mapannounce instance_mapname("1@lhz"),"[Security System] the persons concerned, access with the emergency access method.",bc_map,"0xff9977";
+		end;
+
+	OnTimer1000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] This is a warning notice! Warning notice! Intruder Detected.",bc_map,"0xff9977";
+		end;
+
+	OnTimer2000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] In 5 seconds, The Lab No.1's security system will be activated.",bc_map,"0xff9977";
+		end;
+
+	OnTimer7000:
+		donpcevent instance_npcname("MobCtrl1#mob01")+"::OnEnable";
+		end;
+}
+
+// The Lab No.1 Monster Control
+//==============================================================================
+1@lhz,37,108,4	script	MobCtrl1#mob01	CLEAR_NPC,{
+	end;
+
+	OnEnable:
+		.@map$ = instance_mapname("1@lhz");
+		mapannounce .@map$,"[Security System] Security system Activated !! Experimental animals are released. The persons concerned have to evacuate.",bc_map,"0xff9977";
+		areamonster .@map$,35,159,50,169,"Starving Lab animal",MD_DESERT_WOLF,rand(10,15),instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+		initnpctimer;
+		end;
+
+	OnDisable:
+		killmonster instance_mapname("1@lhz"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+		end;
+
+	OnTimer180000:
+		stopnpctimer;
+		if(mobcount(instance_mapname("1@lhz"), instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) {
+			donpcevent instance_npcname("Lab1#1_1")+"::OnType_02";
+			mapannounce instance_mapname("1@lhz"),"[Security System] The Lab No.1's security system has been stopped.",bc_map,"0xff9977";
+		} else {
+			initnpctimer;
+		}
+		end;
+
+	OnMyMobDead:
+		if(mobcount(instance_mapname("1@lhz"), instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) {
+			donpcevent instance_npcname("Lab1#1_1")+"::OnType_02";
+			mapannounce instance_mapname("1@lhz"),"[Security System] The Lab No.1's security system has been stopped.",bc_map,"0xff9977";
+			stopnpctimer;
+		}
+		end;
+}
+
+// Emergency Access Valve Manual
+//==============================================================================
+1@lhz,39,168,0	script	Manual Sheet#1_1	CLEAR_NPC,{
+	mes "There are valve manual sheets littered on the floor.";
+	next;
+	if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+		mes "You the party leader, started to read the manual.";
+		next;
+		mes "[Emergency Access Valve Manual]";
+		switch(lght_duk02) {
+		case 0:
+			switch(rand(1,6)) {
+			case 1:
+				lght_duk02 = 1;
+				mes "Turn the left valve Clockwise twice, Counterclockwise once, Clockwise once";
+				break;
+			case 2:
+				lght_duk02 = 2;
+				mes "Turn the left valve Clockwise once, Counterclockwise twice, Clockwise once";
+				break;
+			case 3:
+				lght_duk02 = 3;
+				mes "Turn the left valve Clockwise once, Counterclockwise once, Clockwise twice";
+				break;
+			case 4:
+				lght_duk02 = 4;
+				mes "Turn the right valve Counterclockwise twice, Clockwise once, Counterclockwise once";
+				break;
+			case 5:
+				lght_duk02 = 5;
+				mes "Turn the right valve Counterclockwise once, Clockwise twice, Counterclockwise once";
+				break;
+			case 6:
+				lght_duk02 = 6;
+				mes "Turn the right valve Counterclockwise once, Clockwise once, Counterclockwise twice";
+				break;
+			default:
+				mes "This is a unknown Error. If you get the same problem after trying one more time, contact GM.";
+				break;
+			}
+			break;
+		case 1:
+			mes "Turn the left valve Clockwise twice, Counterclockwise once, Clockwise once";
+			break;
+		case 2:
+			mes "Turn the left valve Clockwise once, Counterclockwise twice, Clockwise once";
+			break;
+		case 3:
+			mes "Turn the left valve Clockwise once, Counterclockwise once, Clockwise twice";
+			break;
+		case 4:
+			mes "Turn the right valve Counterclockwise twice, Clockwise once, Counterclockwise once";
+			break;
+		case 5:
+			mes "Turn the right valve Counterclockwise once, Clockwise twice, Counterclockwise once";
+			break;
+		case 6:
+			mes "Turn the right valve Counterclockwise once, Clockwise once, Counterclockwise twice";
+			break;
+		default:
+			mes "This is a unknown Error. If you get the same problem after trying one more time, contact GM.";
+			break;
+		}
+	} else {
+		mes "Let your party leader handle the valve.";
+	}
+	close;
+
+	OnInstanceInit:
+		disablenpc instance_npcname("Manual Sheet#1_1");
+		end;
+
+	OnEnable:
+		specialeffect EF_LIGHTSPHERE;
+		enablenpc instance_npcname("Manual Sheet#1_1");
+		end;
+}
+
+// Left Valve
+//==============================================================================
+1@lhz,41,172,0	script	Valve#1_2	CLEAR_NPC,{
+	.@open_portal = 0;
+	mes "This is the left valve for the emergency access.";
+	if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+		next;
+		mes "To which direction do you wish to turn?";
+		next;
+		if(lght_duk02 < 1 || lght_duk02 > 3) {
+			for(.@i = 1; .@i <= 4; .@i++) {
+				select("Clockwise", "Counterclockwise");
+				mes "-A metal sound-";
+				if(.@i != 4)
+					mes "and, to which direction then?";
+				next;
+			}
+		} else {
+			// lght_duk02 == 1 : Clockwise, Clockwise, Counterclockwise, Clockwise
+			// lght_duk02 == 2 : Clockwise, Counterclockwise, Counterclockwise, Clockwise
+			// lght_duk02 == 3 : Clockwise, Counterclockwise, Clockwise, Clockwise
+			for(.@i = 1; .@i <= 4; .@i++) {
+				switch(select("Clockwise", "Counterclockwise")) {
+				case 1:
+					if((.@i == 1 || .@i == 4) || (.@i == 2 && lght_duk02 == 1) || (.@i == 3 && lght_duk02 == 3)) {
+						.@open_portal += 1;
+					}
+				case 2:
+					if((.@i == 2 && lght_duk02 != 1) || (.@i == 3 && lght_duk02 != 3)) {
+						.@open_portal += 1;
+					}
+				}
+				mes "-A metal sound-";
+				if(.@i != 4)
+					mes "and, to which direction then?";
+				next;
+			}
+		}
+		if (.@open_portal == 4) {
+			donpcevent instance_npcname("#potal_01")+"::OnEnable";
+			lght_duk02 = 0;
+			mes "-Door opened-";
+			next;
+			mes "The door which connects to the Lab No.2 is now open.";
+		} else {
+			lght_duk02 = 0;
+			mes "Nothing happened.";
+			next;
+			mes "You need to review the manual.";
+		}
+	}
+	close;
+
+	OnInstanceInit:
+		disablenpc instance_npcname("Valve#1_2");
+		end;
+
+	OnEnable:
+		specialeffect EF_LIGHTSPHERE;
+		enablenpc instance_npcname("Valve#1_2");
+		end;
+}
+
+// Right Valve
+//==============================================================================
+1@lhz,52,172,0	script	Valve#1_3	CLEAR_NPC,{
+	.@open_portal = 0;
+	mes "This is the left valve for the emergency access.";
+	if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+		next;
+		mes "To which direction do you wish to turn?";
+		next;
+		if(lght_duk02 < 4 || lght_duk02 > 6) {
+			for(.@i = 1; .@i <= 4; .@i++) {
+				select("Clockwise", "Counterclockwise");
+				mes "-A metal sound-";
+				if(.@i != 4)
+					mes "and, to which direction then?";
+				next;
+			}
+		} else {
+			// lght_duk02 == 4 : Counterclockwise, Counterclockwise, Clockwise, Counterclockwise
+			// lght_duk02 == 5 : Counterclockwise, Clockwise, Clockwise, Counterclockwise
+			// lght_duk02 == 6 : Counterclockwise, Clockwise, Counterclockwise, Counterclockwise
+			for(.@i = 1; .@i <= 4; .@i++) {
+				switch(select("Clockwise", "Counterclockwise")) {
+				case 1:
+					if((.@i == 2 && lght_duk02 != 4) || (.@i == 3 && lght_duk02 != 6))
+						.@open_portal += 1;
+					break;
+				case 2:
+					if((.@i == 1 || .@i == 4) || (.@i == 2 && lght_duk02 == 4) || (.@i == 3 && lght_duk02 == 6))
+						.@open_portal += 1;
+					break;
+				}
+				mes "-A metal sound-";
+				if(.@i != 4)
+					mes "and, to which direction then?";
+				next;
+			}
+		}
+		if (.@open_portal == 4) {
+			donpcevent instance_npcname("#potal_01")+"::OnEnable";
+			lght_duk02 = 0;
+			mes "-Door opened-";
+			next;
+			mes "The door which connects to the Lab No.2 is now open.";
+		} else {
+			lght_duk02 = 0;
+			mes "Nothing happened.";
+			next;
+			mes "You need to review the manual.";
+		}
+	}
+	close;
+
+	OnInstanceInit:
+		disablenpc instance_npcname("Valve#1_3");
+		end;
+
+	OnEnable:
+		specialeffect EF_LIGHTSPHERE;
+		enablenpc instance_npcname("Valve#1_3");
+		end;
+}
+
+
+// The Lab No.1 >> The Lab No.2 Warp portal
+//==============================================================================
+1@lhz,45,173,0	script	#potal_01	WARPNPC,2,2,{
+	end;
+
+	OnInstanceInit:
+	OnDisable:
+		disablenpc instance_npcname("#potal_01");
+		end;
+
+	OnEnable:
+		mapannounce instance_mapname("1@lhz"),"[Management System] The door which connects to the Lab No.2 is now open.",bc_map,"0xff9977";
+		enablenpc instance_npcname("#potal_01");
+		end;
+
+	OnTouch:
+		warp instance_mapname("1@lhz"), 151, 29;
+		end;
+}
+
+// The Lab No.2
+//==============================================================================
+1@lhz,151,29,0	script	#2_0	-1,1,1,{
+	end;
+
+	OnEnable:
+		enablenpc instance_npcname("#2_0");
+		end;
+
+	OnDisable:
+		disablenpc instance_npcname("#2_0");
+		end;
+
+	OnTouch:
+		donpcevent instance_npcname("Lab2#2_1")+"::OnEnable";
+		donpcevent instance_npcname("#2_0")+"::OnDisable";
+		end;
+}
+
+// The Lab No.2 2_1 System - Control of Monster Wave and Pipe right before exploding
+//==============================================================================
+1@lhz,35,106,4	script	Lab2#2_1	CLEAR_NPC,{
+	end;
+
+	OnInstanceInit:
+	OnDisable:
+		stopnpctimer;
+		end;
+
+	OnEnable:
+		initnpctimer;
+		end;
+
+	OnTimer1000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] This is a warning notice! Warning notice! Intruder Detected in The Lab No.2!!",bc_map,"0xff9977";
+		end;
+
+	OnTimer3000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] In 5 seconds, The Lab No.2 Security system will start working.",bc_map,"0xff9977";
+		end;
+
+	OnTimer5000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Warning! The pipe pressure in the Lab No.2 is too high.",bc_map,"0xff99ff";
+		end;
+
+	OnTimer8000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] First security system activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl2#mob02")+"::On01";
+		end;
+
+	OnTimer10000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Warning! The pipe pressure is too high. Open the valve.",bc_map,"0xff99ff";
+		donpcevent instance_npcname("Lab2#2_2")+"::OnPipePressure";
+		end;
+
+	OnTimer190000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Warning! The pipe pressure is too high. Open the valve.",bc_map,"0xff99ff";
+		donpcevent instance_npcname("Lab2#2_2")+"::OnPipePressure";
+		end;
+
+	OnTimer303000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] In 5 seconds, Second Security system will start working.",bc_map,"0xff9977";
+		end;
+
+	OnTimer308000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] Second security system activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl2#mob02")+"::On02";
+		end;
+
+	OnTimer370000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Warning! The pipe pressure is too high. Open the valve.",bc_map,"0xff99ff";
+		donpcevent instance_npcname("Lab2#2_2")+"::OnPipePressure";
+		end;
+
+	OnTimer550000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Warning! The pipe pressure is too high. Open the valve.",bc_map,"0xff99ff";
+		donpcevent instance_npcname("Lab2#2_2")+"::OnPipePressure";
+		end;
+
+	OnTimer603000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] In 5 seconds, Third Security system will start working.",bc_map,"0xff9977";
+		end;
+
+	OnTimer608000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] Third security system activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl2#mob02")+"::On03";
+		end;
+
+	OnTimer730000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Warning! The pipe pressure is too high. Open the valve.",bc_map,"0xff99ff";
+		donpcevent instance_npcname("Lab2#2_2")+"::OnPipePressure";
+		end;
+
+	OnTimer903000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] In 5 seconds, Fourth Security system will start working.",bc_map,"0xff9977";
+		end;
+
+	OnTimer908000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] Fourth security system activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl2#mob02")+"::On04";
+		end;
+
+	OnTimer910000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Warning! The pipe pressure is too high. Open the valve.",bc_map,"0xff99ff";
+		donpcevent instance_npcname("Lab2#2_2")+"::OnPipePressure";
+		end;
+
+	OnTimer1090000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Warning! The pipe pressure is too high. Open the valve.",bc_map,"0xff99ff";
+		donpcevent instance_npcname("Lab2#2_2")+"::OnPipePressure";
+		end;
+
+	OnTimer1203000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] In 5 seconds, Fifth Security system will start working.",bc_map,"0xff9977";
+		end;
+
+	OnTimer1208000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] Fifth security system activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl2#mob02")+"::On05";
+		end;
+
+	OnTimer1270000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Warning! The pipe pressure is too high. Open the valve.",bc_map,"0xff99ff";
+		donpcevent instance_npcname("Lab2#2_2")+"::OnPipePressure";
+		stopnpctimer;
+		end;
+}
+
+// The Lab No.2 2_2 System - Pipe Operation Control
+// When 3 pipes explode, system will shut down.
+//==============================================================================
+1@lhz,37,106,4	script	Lab2#2_2	CLEAR_NPC,{
+	end;
+
+	OnInstanceInit:
+		'broken_pipes = 0;
+		stopnpctimer;
+		end;
+
+	OnPipePressure:
+		switch(rand(1,6)) {
+		case 1:
+			donpcevent instance_npcname("Valve#2_1")+"::OnEnable";
+			donpcevent instance_npcname("MobCtrl2#mob02")+"::On2_01";
+		case 2:
+			donpcevent instance_npcname("Valve#2_2")+"::OnEnable";
+			donpcevent instance_npcname("MobCtrl2#mob02")+"::On2_02";
+		case 3:
+			donpcevent instance_npcname("Valve#2_3")+"::OnEnable";
+			donpcevent instance_npcname("MobCtrl2#mob02")+"::On2_03";
+		case 4:
+			donpcevent instance_npcname("Valve#2_4")+"::OnEnable";
+			donpcevent instance_npcname("MobCtrl2#mob02")+"::On2_04";
+		case 5:
+			donpcevent instance_npcname("Valve#2_5")+"::OnEnable";
+			donpcevent instance_npcname("MobCtrl2#mob02")+"::On2_05";
+		case 6:
+			donpcevent instance_npcname("Valve#2_6")+"::OnEnable";
+			donpcevent instance_npcname("MobCtrl2#mob02")+"::On2_06";
+		}
+		initnpctimer;
+		end;
+
+	OnDisableValve1:
+		disablenpc instance_npcname("Valve#2_1");
+		stopnpctimer;
+		end;
+
+	OnDisableValve2:
+		disablenpc instance_npcname("Valve#2_2");
+		stopnpctimer;
+		end;
+
+	OnDisableValve3:
+		disablenpc instance_npcname("Valve#2_3");
+		stopnpctimer;
+		end;
+
+	OnDisableValve4:
+		disablenpc instance_npcname("Valve#2_4");
+		stopnpctimer;
+		end;
+
+	OnDisableValve5:
+		disablenpc instance_npcname("Valve#2_5");
+		stopnpctimer;
+		end;
+
+	OnDisableValve6:
+		disablenpc instance_npcname("Valve#2_6");
+		stopnpctimer;
+		end;
+
+	OnTimer63000:
+		for(.@i = 1; .@i < 7; .@i++) {
+			specialeffect EF_SUI_EXPLOSION, AREA, instance_npcname("Valve#2_"+.@i+"");
+			disablenpc instance_npcname("Valve#2_"+.@i+"");
+		}
+		'broken_pipes += 1;
+		if ('broken_pipes == 3) {
+			donpcevent instance_npcname("#2_3")+"::OnEnable";
+			stopnpctimer;
+		} else {
+			mapannounce instance_mapname("1@lhz"),"[Management System] Pipe explosion detected! When "+ (3 - 'broken_pipes) +" more break, the system will stop.",bc_map,"0xff99ff";
+		}
+		end;
+}
+
+// The Lab No.2 2_3 System
+//==============================================================================
+1@lhz,151,48,0	script	#2_3	-1,20,20,{
+	end;
+
+	OnInstanceInit:
+		disablenpc instance_npcname("#2_3");
+		end;
+
+	OnEnable:
+		initnpctimer;
+		end;
+
+	OnTimer1000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] System Freezes! System Freezes! Evacuate from the Lab in 10 seconds.",bc_map,"0xff99ff";
+		end;
+
+	OnTimer11000:
+		mapannounce instance_mapname("1@lhz"),"[Management System] Evacuate!!",bc_map,"0xff99ff";
+		enablenpc instance_npcname("#2_3");
+		end;
+
+	OnTouch:
+		warp "lhz_dun04", 147, 273;
+		end;
+}
+
+// The Lab No.2 Monster Control
+//==============================================================================
+1@lhz,39,106,4	script	MobCtrl2#mob02	CLEAR_NPC,{
+	end;
+
+	On01:
+		.@map$ = instance_mapname("1@lhz");
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster .@map$,139,37,164,58,"Starving Lab animal",MD_DESERT_WOLF,10,.@label$;
+		end;
+
+	On02:
+		.@map$ = instance_mapname("1@lhz");
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster .@map$,139,37,164,58,"Starving Lab animal",MD_DESERT_WOLF,20,.@label$;
+		end;
+
+	On03:
+		.@map$ = instance_mapname("1@lhz");
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster .@map$,139,37,164,58,"Starving Lab animal",MD_DESERT_WOLF,16,.@label$;
+		end;
+
+	On04:
+		.@map$ = instance_mapname("1@lhz");
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster .@map$,139,37,164,58,"Starving Lab animal",MD_DESERT_WOLF,19,.@label$;
+		end;
+
+	On05:
+		.@map$ = instance_mapname("1@lhz");
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster .@map$,139,37,164,58,"Starving Lab animal",MD_DESERT_WOLF,20,.@label$;
+		end;
+
+	On2_01:
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster instance_mapname("1@lhz"),155,43,161,49,"Starving Lab animal",MD_DESERT_WOLF_B,5,.@label$;
+		end;
+
+	On2_02:
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster instance_mapname("1@lhz"),137,40,143,46,"Starving Lab animal",MD_DESERT_WOLF_B,5,.@label$;
+		end;
+
+	On2_03:
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster instance_mapname("1@lhz"),137,51,143,57,"Starving Lab animal",MD_DESERT_WOLF_B,5,.@label$;
+		end;
+
+	On2_04:
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster instance_mapname("1@lhz"),143,56,149,62,"Starving Lab animal",MD_DESERT_WOLF_B,5,.@label$;
+		end;
+
+	On2_05:
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster instance_mapname("1@lhz"),160,48,166,54,"Starving Lab animal",MD_DESERT_WOLF_B,5,.@label$;
+		end;
+
+	On2_06:
+		.@label$ = instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		areamonster instance_mapname("1@lhz"),135,44,141,50,"Starving Lab animal",MD_DESERT_WOLF_B,5,.@label$;
+		end;
+
+	OnDisable:
+		killmonster instance_mapname("1@lhz"),instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead";
+		end;
+
+	OnMyMobDead:
+		if (mobcount(instance_mapname("1@lhz"),instance_npcname("MobCtrl2#mob02")+"::OnMyMobDead") < 1) {
+		  donpcevent instance_npcname("#potal_02")+"::OnEnable";
+		  donpcevent instance_npcname("Lab2#2_1")+"::OnDisable";
+		  mapannounce instance_mapname("1@lhz"),"[Security System] The Security system of The Lab No.2 has been stopped.",bc_map,"0xff9977";
+		}
+		end;
+}
+
+// The Lab No.2 Valves
+//==============================================================================
+-	script	bio4FLab2Valve	-1,{
+	if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+		progressbar "0xffff00", 20;
+		stopnpctimer;
+		donpcevent instance_npcname("Lab2#2_2")+"::OnDisableValve1";
+		disablenpc instance_npcname(strnpcinfo(0));
+		end;
+	} else {
+		mes "Let your party leader handle the valve.";
+		close;
+	}
+
+	OnInstanceInit:
+		disablenpc instance_npcname(strnpcinfo(0));
+		end;
+
+	OnEnable:
+		enablenpc instance_npcname(strnpcinfo(0));
+		initnpctimer;
+		end;
+
+	OnTimer3000:
+		specialeffect EF_DRAGONSMOKE,AREA,instance_npcname(strnpcinfo(0));
+		stopnpctimer;
+		initnpctimer;
+		end;
+}
+
+1@lhz,158,46,0	duplicate(bio4FLab2Valve)	Valve#2_1	CLEAR_NPC
+1@lhz,138,43,0	duplicate(bio4FLab2Valve)	Valve#2_2	CLEAR_NPC
+1@lhz,139,54,0	duplicate(bio4FLab2Valve)	Valve#2_3	CLEAR_NPC
+1@lhz,145,60,0	duplicate(bio4FLab2Valve)	Valve#2_4	CLEAR_NPC
+1@lhz,165,51,0	duplicate(bio4FLab2Valve)	Valve#2_5	CLEAR_NPC
+1@lhz,137,47,0	duplicate(bio4FLab2Valve)	Valve#2_6	CLEAR_NPC
+
+// The Lab No.2 >> The Lab No.3 Warp portal(General)
+//==============================================================================
+1@lhz,151,64,0	script	#potal_02	WARPNPC,2,2,{
+	end;
+
+	OnInstanceInit:
+		disablenpc instance_npcname("#potal_02");
+		end;
+
+	OnEnable:
+		mapannounce instance_mapname("1@lhz"),"[Management System] The door which connects to the Lab No.3 is now open.",bc_map,"0xff99ff";
+		enablenpc instance_npcname("#potal_02");
+		end;
+
+	OnDisable:
+		disablenpc instance_npcname("#potal_02");
+		end;
+
+	OnTouch:
+		warp instance_mapname("1@lhz"), 84, 28;
+		end;
+}
+
+// The Lab No.3
+//==============================================================================
+1@lhz,84,28,0	script	#3_0	-1,1,1,{
+	end;
+
+	OnEnable:
+		enablenpc instance_npcname("#3_0");
+		end;
+
+	OnDisable:
+		disablenpc instance_npcname("#3_0");
+		end;
+
+	OnTouch:
+		donpcevent instance_npcname("Lab3#3_1")+"::OnEnable";
+		donpcevent instance_npcname("#3_0")+"::OnDisable";
+		end;
+}
+
+// The Lab No.3 3_1 System - Monster wave control
+//==============================================================================
+1@lhz,35,104,4	script	Lab3#3_1	CLEAR_NPC,{
+	end;
+
+	OnEnable:
+		initnpctimer;
+		end;
+
+	OnDisable:
+		stopnpctimer;
+		end;
+
+	OnTimer1000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] This is a warning notice! Warning notice!",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl3#mob03")+"::OnDisable";
+		end;
+
+	OnTimer5000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] Intruder Detected in The Lab No.3!!",bc_map,"0xff9977";
+		end;
+
+	OnTimer7000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] In 5 seconds, The Security system of The Lab No.3 will start working.",bc_map,"0xff9977";
+		end;
+
+	OnTimer12000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] First security system of The Lab No.3 activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl3#mob03")+"::On01";
+		end;
+
+	OnTimer192000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] Second security system of The Lab No.3 activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl3#mob03")+"::On02";
+		end;
+
+	OnTimer372000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] Third security system of The Lab No.3 activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl3#mob03")+"::On03";
+		end;
+
+	OnTimer552000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] Fourth security system of The Lab No.3activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl3#mob03")+"::On04";
+		end;
+
+	OnTimer732000:
+		mapannounce instance_mapname("1@lhz"),"[Security System] Fifth security system of The Lab No.3 activated !! The persons concerned have to evacuate.",bc_map,"0xff9977";
+		donpcevent instance_npcname("MobCtrl3#mob03")+"::On05";
+		stopnpctimer;
+		end;
+}
+
+// The Lab No.3 Monster Control
+//==============================================================================
+1@lhz,37,104,4	script	MobCtrl3#mob03	CLEAR_NPC,{
+	end;
+
+	On01:
+		.@map$ = instance_mapname("1@lhz");
+		.@label$ = instance_npcname("MobCtrl3#mob03")+"::OnMyMobDead";
+		monster .@map$,80,60,"Starving Lab animal",MD_DESERT_WOLF,1,.@label$;
+		monster .@map$,81,58,"Starving Lab animal",MD_DESERT_WOLF,1,.@label$;
+		monster .@map$,82,56,"Starving Lab animal",MD_DESERT_WOLF,1,.@label$;
+		monster .@map$,84,60,"Starving Lab animal",MD_DESERT_WOLF,1,.@label$;
+		monster .@map$,85,58,"Starving Lab animal",MD_DESERT_WOLF,1,.@label$;
+		monster .@map$,82,60,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
+		monster .@map$,83,58,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
+		monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
+		monster .@map$,86,60,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
+		monster .@map$,87,58,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
+		end;
+
+	On02:
+		.@map$ = instance_mapname("1@lhz");
+		.@amount1 = rand(1,5);
+		.@amount2 = rand(1,5);
+		.@label$ = instance_npcname("MobCtrl3#mob03")+"::OnMyMobDead";
+		monster .@map$,80,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount1,.@label$;
+		monster .@map$,82,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		monster .@map$,84,60,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount1,.@label$;
+		monster .@map$,86,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		monster .@map$,81,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount1,.@label$;
+		monster .@map$,83,58,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount2,.@label$;
+		monster .@map$,85,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount1,.@label$;
+		monster .@map$,87,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		monster .@map$,82,56,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount1,.@label$;
+		monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		end;
+
+	On03:
+		.@map$ = instance_mapname("1@lhz");
+		.@amount1 = rand(1,5);
+		.@amount2 = rand(1,5);
+		.@amount3 = rand(1,5);
+		.@label$ = instance_npcname("MobCtrl3#mob03")+"::OnMyMobDead";
+		monster .@map$,80,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount1,.@label$;
+		monster .@map$,82,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		monster .@map$,84,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount3,.@label$;
+		monster .@map$,86,60,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount1,.@label$;
+		monster .@map$,81,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		monster .@map$,83,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount3,.@label$;
+		monster .@map$,85,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount1,.@label$;
+		monster .@map$,87,58,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount2,.@label$;
+		monster .@map$,82,56,"Starving Lab animal",MD_DESERT_WOLF,.@amount3,.@label$;
+		monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF,.@amount1,.@label$;
+		end;
+
+	On04:
+		.@map$ = instance_mapname("1@lhz");
+		.@amount1 = rand(1,5);
+		.@amount2 = rand(1,5);
+		.@amount3 = rand(1,5);
+		.@amount4 = rand(1,5);
+		.@label$ = instance_npcname("MobCtrl3#mob03")+"::OnMyMobDead";
+		monster .@map$,80,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount1,.@label$;
+		monster .@map$,82,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		monster .@map$,84,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount3,.@label$;
+		monster .@map$,86,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount4,.@label$;
+		monster .@map$,81,58,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount1,.@label$;
+		monster .@map$,83,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		monster .@map$,85,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount3,.@label$;
+		monster .@map$,87,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount4,.@label$;
+		monster .@map$,82,56,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount1,.@label$;
+		monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		end;
+
+	On05:
+		.@map$ = instance_mapname("1@lhz");
+		.@amount1 = rand(1,5);
+		.@amount2 = rand(1,5);
+		.@amount3 = rand(1,5);
+		.@amount4 = rand(1,5);
+		.@amount5 = rand(1,5);
+		.@label$ = instance_npcname("MobCtrl3#mob03")+"::OnMyMobDead";
+		monster .@map$,80,60,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount1,.@label$;
+		monster .@map$,82,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount2,.@label$;
+		monster .@map$,84,60,"Starving Lab animal",MD_DESERT_WOLF,.@amount3,.@label$;
+		monster .@map$,86,60,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount4,.@label$;
+		monster .@map$,81,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount5,.@label$;
+		monster .@map$,83,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount1,.@label$;
+		monster .@map$,85,58,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount2,.@label$;
+		monster .@map$,87,58,"Starving Lab animal",MD_DESERT_WOLF,.@amount3,.@label$;
+		monster .@map$,82,56,"Starving Lab animal",MD_DESERT_WOLF,.@amount4,.@label$;
+		monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF_B,.@amount5,.@label$;
+		end;
+
+	OnDisable:
+		killmonster instance_mapname("1@lhz"),instance_npcname("MobCtrl3#mob03")+"::OnMyMobDead";
+		end;
+
+	OnMyMobDead:
+		if (mobcount(instance_mapname("1@lhz"),instance_npcname("MobCtrl3#mob03")+"::OnMyMobDead") < 1) {
+			donpcevent instance_npcname("#potal_03")+"::OnEnable";
+			donpcevent instance_npcname("Lab3#3_1")+"::OnDisable";
+			mapannounce instance_mapname("1@lhz"),"[Security System] The Security system of The Lab No.3 has been stopped.",bc_map,"0xff9977";
+		}
+		end;
+}
+
+// The Lab No.3 >> Boss's Room Warp portal
+//==============================================================================
+1@lhz,83,62,0	script	#potal_03	WARPNPC,2,2,{
+  end;
+
+	OnInstanceInit:
+		disablenpc instance_npcname("#potal_03");
+		end;
+
+	OnEnable:
+		mapannounce instance_mapname("1@lhz"),"[Management System] The door which connects to the Lab No.4 is now open.",bc_map,"0x7799ff";
+		enablenpc instance_npcname("#potal_03");
+		end;
+
+	OnDisable:
+		disablenpc instance_npcname("#potal_03");
+		end;
+
+	OnTouch:
+		warp instance_mapname("1@lhz"), 137, 100;
+		end;
+}
+
+// The Lab No.4
+//==============================================================================
+1@lhz,137,100,0	script	#4_0	-1,1,1,{
+	end;
+
+	OnEnable:
+		enablenpc instance_npcname("#4_0");
+		end;
+
+	OnDisable:
+		disablenpc instance_npcname("#4_0");
+		end;
+
+	OnTouch:
+		donpcevent instance_npcname("Lab4#4_1")+"::OnEnable";
+		donpcevent instance_npcname("#4_0")+"::OnEnable";
+		end;
+}
+
+// The Lab No.4 4_1 System - Summon of Boss Monster
+//==============================================================================
+1@lhz,35,102,4	script	Lab4#4_1	CLEAR_NPC,{
+	end;
+
+	OnEnable:
+		initnpctimer;
+		end;
+
+	OnDisable:
+		stopnpctimer;
+		end;
+
+	OnTimer1000:
+		mapannounce instance_mapname("1@lhz"),"Whisper: Who are you....",bc_map,"0x7DCBF0";
+		specialeffect EF_SPHERE,AREA,instance_npcname("Seyren Windsor#boss01");
+		end;
+
+	OnTimer2000:
+		specialeffect EF_SPHERE,AREA,instance_npcname("Cecile Damon#boss02");
+		end;
+
+	OnTimer3000:
+		mapannounce instance_mapname("1@lhz"),"Whisper: Do not approach more...",bc_map,"0x7DCBF0";
+		specialeffect EF_SPHERE,AREA,instance_npcname("Gertie Wie#boss03");
+		end;
+
+	OnTimer4000:
+		specialeffect EF_SPHERE,AREA,instance_npcname("Eremes Guile#boss04");
+		end;
+
+	OnTimer5000:
+		mapannounce instance_mapname("1@lhz"),"Whisper: This is a very dangerous place..",bc_map,"0x7DCBF0";
+		specialeffect EF_SPHERE,AREA,instance_npcname("Trentini#boss05");
+		end;
+
+	OnTimer6000:
+		specialeffect EF_SPHERE,AREA,instance_npcname("Chen Liu#boss06");
+		end;
+
+	OnTimer7000:
+		mapannounce instance_mapname("1@lhz"),"Whisper: You won't go out alive....",bc_map,"0x7DCBF0";
+		specialeffect EF_SPHERE,AREA,instance_npcname("Alphochio Basil#boss07");
+		end;
+
+	OnTimer8000:
+		specialeffect EF_SPHERE,AREA,instance_npcname("Flamel Emul#boss08");
+		end;
+
+	OnTimer9000:
+		mapannounce instance_mapname("1@lhz"),"Whisper: If you don't want to be a part of us....",bc_map,"0x7DCBF0";
+		specialeffect EF_SPHERE,AREA,instance_npcname("Randel Lawrence#boss09");
+		end;
+
+	OnTimer10000:
+		specialeffect EF_SPHERE,AREA,instance_npcname("Celia Alde#boss10");
+		end;
+
+	OnTimer11000:
+		mapannounce instance_mapname("1@lhz"),"Whisper: Leave now....",bc_map,"0x7DCBF0";
+		specialeffect EF_SPHERE,AREA,instance_npcname("Kathryne Keyron#boss11");
+		end;
+
+	OnTimer12000:
+		specialeffect EF_SPHERE,AREA,instance_npcname("Margaretha Sorin#boss12");
+		end;
+
+	OnTimer13000:
+		mapannounce instance_mapname("1@lhz"),"Whisper: Before this place is thoroughly filled with sorrow and pain....",bc_map,"0x7DCBF0";
+		specialeffect EF_SPHERE,AREA,instance_npcname("Howard Alt-Eisen#boss13");
+		end;
+
+	OnTimer14000:
+		specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Gren#boss14");
+		end;
+
+	OnTimer15000:
+		specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Roke#boss15");
+		end;
+
+	OnTimer16000:
+		specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Dree#boss16");
+		end;
+
+	OnTimer17000:
+		mapannounce instance_mapname("1@lhz"),"Whisper: Ah....it....it's too late......",bc_map,"0x7DCBF0";
+		donpcevent instance_npcname("MobCtrl4#mob04")+"::OnEnable";
+		stopnpctimer;
+		end;
+}
+
+// Area No. 4 - Boss Summon Control
+//==============================================================================
+1@lhz,37,102,4	script	MobCtrl4#mob04	CLEAR_NPC,{
+	end;
+
+	OnEnable:
+		switch(rand(1,13)) {
+		case 1:
+			donpcevent instance_npcname("Seyren Windsor#boss01")+"::OnEnable";
+			end;
+		case 2:
+			donpcevent instance_npcname("Cecile Damon#boss02")+"::OnEnable";
+			end;
+		case 3:
+			donpcevent instance_npcname("Gertie Wie#boss03")+"::OnEnable";
+			end;
+		case 4:
+			donpcevent instance_npcname("Eremes Guile#boss04")+"::OnEnable";
+			end;
+		case 5:
+			donpcevent instance_npcname("Trentini#boss05")+"::OnEnable";
+			end;
+		case 6:
+			donpcevent instance_npcname("Chen Liu#boss06")+"::OnEnable";
+			end;
+		case 7:
+			donpcevent instance_npcname("Alphochio Basil#boss07")+"::OnEnable";
+			end;
+		case 8:
+			donpcevent instance_npcname("Flamel Emul#boss08")+"::OnEnable";
+			end;
+		case 9:
+			donpcevent instance_npcname("Randel Lawrence#boss09")+"::OnEnable";
+			end;
+		case 10:
+			donpcevent instance_npcname("Celia Alde#boss10")+"::OnEnable";
+			end;
+		case 11:
+			donpcevent instance_npcname("Kathryne Keyron#boss11")+"::OnEnable";
+			end;
+		case 12:
+			donpcevent instance_npcname("Margaretha Sorin#boss12")+"::OnEnable";
+			end;
+		case 13:
+			donpcevent instance_npcname("Howard Alt-Eisen#boss13")+"::OnEnable";
+			end;
+		}
+
+	OnDisable:
+		//stopnpctimer;
+		end;
+}
+
+// Random Experiments in Tubes
+//==============================================================================
+1@lhz,156,148,3	script	Type_**Gren#boss14	4_M_03,{ end; }
+1@lhz,152,152,3	script	Type_**Roke#boss15	4_M_HUMAN_01,{ end; }
+1@lhz,148,156,3	script	Type_**Dree#boss16	4_M_DWARF,{ end; }
+
+// Bosses
+//==============================================================================
+-	script	bio4FBoss	-1,{
+  end;
+
+  OnEnable:
+	.@map$ = instance_mapname("1@lhz");
+	.@label$ = instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	specialeffect EF_SUI_EXPLOSION;
+	if(strnpcinfo(0) == "Seyren Windsor#boss01") {
+		monster .@map$,129,154,"Load Knight Seyren",B_SEYREN,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Cecile Damon#boss02") {
+		monster .@map$,125,150,"Sniper Cecile",B_SHECIL,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Gertie Wie#boss03") {
+		monster .@map$,121,146,"Stalker Gertie",B_GERTIE,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Eremes Guile#boss04") {
+		monster .@map$,117,142,"Assassin Cross Eremes",B_EREMES,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Trentini#boss05") {
+		monster .@map$,117,125,"Gypsy Trentini",B_TRENTINI,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Chen Liu#boss06") {
+		monster .@map$,121,121,"Champion Chen",B_CHEN,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Alphochio Basil#boss07") {
+		monster .@map$,125,117,"Crown Alphochio",B_ALPHOCCIO,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Flamel Emul#boss08") {
+		monster .@map$,129,113,"Creator Flamel",B_FLAMEL,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Randel Lawrence#boss09") {
+		monster .@map$,146,113,"Paladin Randel",B_RANDEL,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Celia Alde#boss10") {
+		monster .@map$,150,117,"Professor Celia",B_CELIA,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Kathryne Keyron#boss11") {
+		monster .@map$,154,121,"High Wizard Kathryne",B_KATRINN,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Margaretha Sorin#boss12") {
+		monster .@map$,158,125,"High Priest Margaretha",B_MAGALETA,1,.@label$;
+	}
+	if(strnpcinfo(0) == "Howard Alt-Eisen#boss13") {
+		monster .@map$,158,142,"White Smith Howard",B_HARWORD,1,.@label$;
+	}
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+
+  OnDisable:
+	killmonster instance_mapname("1@lhz"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
+	disablenpc instance_npcname(strnpcinfo(0));
+	end;
+
+	OnMyMobDead:
+		if (mobcount(instance_mapname("1@lhz"), instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) {
+			.@map$ = instance_mapname("1@lhz");
+			if(strnpcinfo(0) == "Seyren Windsor#boss01")
+				mapannounce .@map$,"Awww... Where are all my fellows....",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Cecile Damon#boss02")
+				mapannounce .@map$,"Any..one, please help.. please.....",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Gertie Wie#boss03")
+				mapannounce .@map$,".. did I act too.. rashly...?",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Eremes Guile#boss04")
+				mapannounce .@map$,"Ah..... I am absolutely defeated....",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Trentini#boss05")
+				mapannounce .@map$,"ah.. If I.. ever can ... dance and.... sing...happily....",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Chen Liu#boss06")
+				mapannounce .@map$,"I.... am so .. sorry....",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Alphochio Basil#boss07")
+				mapannounce .@map$,"...the new song......was ....for.....her....",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Flamel Emul#boss08")
+				mapannounce .@map$,"Ha...I wanted to show.... the new potion....",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Randel Lawrence#boss09")
+				mapannounce .@map$,"Wooooo.. everyone got defeated.....??",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Celia Alde#boss10")
+				mapannounce .@map$,"No..... this experiment is.....dang...",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Kathryne Keyron#boss11")
+				mapannounce .@map$,"awww.. is everyone Ok....?",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Margaretha Sorin#boss12")
+				mapannounce .@map$,"My good boy.. Don't cry... ah.... our Great Odin.. please save us...",bc_map,"0xFD3B02";
+			else if (strnpcinfo(0) == "Howard Alt-Eisen#boss13")
+				mapannounce .@map$,"oh...no.... can't breath.... and my sister...?? sister!!",bc_map,"0xFD3B02";
+			donpcevent instance_npcname("Wolfchev#last")+"::OnEnable";
+			donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
+		}
+		end;
+}
+
+1@lhz,127,156,5	duplicate(bio4FBoss)	Seyren Windsor#boss01	B_SEYREN
+1@lhz,123,152,5	duplicate(bio4FBoss)	Cecile Damon#boss02	B_SHECIL
+1@lhz,119,148,5	duplicate(bio4FBoss)	Gertie Wie#boss03	B_GERTIE
+1@lhz,115,144,5	duplicate(bio4FBoss)	Eremes Guile#boss04	B_EREMES
+1@lhz,115,123,7	duplicate(bio4FBoss)	Trentini#boss05	B_TRENTINI
+1@lhz,119,119,7	duplicate(bio4FBoss)	Chen Liu#boss06	B_CHEN
+1@lhz,123,115,7	duplicate(bio4FBoss)	Alphochio Basil#boss07	B_ALPHOCCIO
+1@lhz,127,111,7	duplicate(bio4FBoss)	Flamel Emul#boss08	B_FLAMEL
+1@lhz,148,111,1	duplicate(bio4FBoss)	Randel Lawrence#boss09	B_RANDEL
+1@lhz,152,115,1	duplicate(bio4FBoss)	Celia Alde#boss10	B_CELIA
+1@lhz,156,119,1	duplicate(bio4FBoss)	Kathryne Keyron#boss11	B_KATRINN
+1@lhz,160,123,1	duplicate(bio4FBoss)	Margaretha Sorin#boss12	B_MAGALETA
+1@lhz,160,144,3	duplicate(bio4FBoss)	Howard Alt-Eisen#boss13	B_HARWORD
+
+// Wolfchev - Final encounter
+//==============================================================================
+1@lhz,137,156,7	script	Wolfchev#last	4_LGTSCIENCE,{
+	if ((MaxWeight - Weight) < 1000 || !checkweight(1201, 1)) {
+		mes "^FF0000 Check up your inventory. You got too many items to carry out the quest. ^000000";
+		close;
+	}
+	.@all_quests_complete = true;
+	for(.@i = 5113; .@i <= 5125; .@i++) {
+		if(checkquest(.@i, HUNTING) != 2)
+			.@all_quests_complete = false;
+	}
+	if (.@all_quests_complete) {
+		// Quests Complete. Get Rewards.
+		.@reward = rand(1, 1000);
+		if (lght_duk01 == 8) {
+			// First time beating the instance.
+			mes "[Wolfchev]";
+			mes "You finally defeated my Boss creature.";
+			next;
+			mes "[Wolfchev]";
+			mes "Finally. is this the result?? For whom did I experiment? Did they cheat me?";
+			next;
+			mes "[Wolfchev]";
+			mes "The button was supposed to be pressed for an emergency case...but..";
+			next;
+			mes "[Wolfchev]";
+			mes "Hey.. You and I met by a bad connection....";
+			next;
+			mes "[Wolfchev]";
+			mes "But...., you helped me... How could you do that?";
+			next;
+			mes "["+ strcharinfo(PC_NAME) +"]";
+			mes "When I met you for the first time, you seemed mad but sad, even if you could commit those cruel and horrific experiments.";
+			next;
+			mes "["+ strcharinfo(PC_NAME) +"]";
+			mes "But actually, you did that because you was lonely,.. you just concentrated on that for this reason, huh?";
+			next;
+			mes "[Wolfchev]";
+			mes "HAHAHAHa. Loneliness.. You say?";
+			next;
+			mes "[Wolfchev]";
+			mes "It might be seen like that to you. But, it isn't. Loneliness is just a good and easy excuse of the losers.";
+			next;
+			mes "[Wolfchev]";
+			mes "I'm so happy doing experiments pursuing for a perfection, I never feel lonely.";
+			next;
+			mes "[Wolfchev]";
+			mes "Anyway, since I realized that Rekenber betrayed me, I cannot just let them do what they want.";
+			next;
+			mes "[Wolfchev]";
+			mes "For now, I will leave them alone, but I will make them cry and regret for trying to remove Wolfchev.";
+			next;
+			mes "["+ strcharinfo(PC_NAME) +"]";
+			mes "... .... ... ....";
+			next;
+			for(.@i = 5113; .@i <= 5125; .@i++) {
+				erasequest .@i;
+			}
+			lght_duk01 = 9;
+			if (.@reward >= 1 && .@reward < 84) {
+				getitem Salvage_Cape, 1;
+			} else if (.@reward >= 84 && .@reward < 167) {
+				getitem Ancient_Gold_Deco, 1;
+			} else if (.@reward >= 167 && .@reward < 250) {
+				getitem Giant_Lance, 1;
+			} else if (.@reward >= 250 && .@reward < 333) {
+				getitem Bloody_Cross, 1;
+			} else if (.@reward >= 333 && .@reward < 416) {
+				getitem Guillotine_Katar, 1;
+			} else if (.@reward >= 416 && .@reward < 499) {
+				getitem Chilly_Spell_Book, 1;
+			} else if (.@reward >= 499 && .@reward < 582) {
+				getitem Goast_Chill, 10;
+			} else if (.@reward >= 582 && .@reward < 665) {
+				getitem Blood_Thirst, 10;
+			} else if (.@reward >= 665 && .@reward < 748) {
+				getitem Will_Of_Warrior, 10;
+			} else if (.@reward >= 748 && .@reward < 831) {
+				getitem Goast_Chill, 20;
+			} else if (.@reward >= 831 && .@reward < 914) {
+				getitem Blood_Thirst, 20;
+			} else {
+				getitem Will_Of_Warrior, 20;
+			}
+			mes "[Wolfchev]";
+			mes "aaaaaah, "+ strcharinfo(PC_NAME) +" Thank you so much to remove my boys who had gone mad. Not a big gift but I wish you don't deny, I don't need this anymore.";
+			next;
+			mes "[Wolfchev]";
+			mes "And, if you can...hope you to come back often, especially with your friends. I want the place to be with human heart again so the sadness in here gets disappear.";
+			next;
+			mes "I looked at Wolfchev again before leaving his lab. and I could feel that he was not obsessed anymore..";
+			close2;
+			warp "lhz_dun04", 147, 273;
+			end;
+		} else {
+			mes "[Wolfchev]";
+			mes "You did defeat all of the Boss creatures. Thank you again.";
+			next;
+			for(.@i = 5113; .@i <= 5125; .@i++) {
+				erasequest .@i;
+			}
+			if (.@reward >= 1 && .@reward < 84) {
+				getitem Salvage_Cape, 1;
+			} else if (.@reward >= 84 && .@reward < 167) {
+				getitem Ancient_Gold_Deco, 1;
+			} else if (.@reward >= 167 && .@reward < 250) {
+				getitem Giant_Lance, 1;
+			} else if (.@reward >= 250 && .@reward < 333) {
+				getitem Bloody_Cross, 1;
+			} else if (.@reward >= 333 && .@reward < 416) {
+				getitem Guillotine_Katar, 1;
+			} else if (.@reward >= 416 && .@reward < 499) {
+				getitem Chilly_Spell_Book, 1;
+			} else if (.@reward >= 499 && .@reward < 582) {
+				getitem Goast_Chill, 10;
+			} else if (.@reward >= 582 && .@reward < 665) {
+				getitem Blood_Thirst, 10;
+			} else if (.@reward >= 665 && .@reward < 748) {
+				getitem Will_Of_Warrior, 10;
+			} else if (.@reward >= 748 && .@reward < 831) {
+				getitem Goast_Chill, 20;
+			} else if (.@reward >= 831 && .@reward < 914) {
+				getitem Blood_Thirst, 20;
+			} else {
+				getitem Will_Of_Warrior, 20;
+			}
+			mes "[Wolfchev]";
+			mes "I say again, "+ strcharinfo(PC_NAME) +" Thank you so much to remove my boys who had gone mad. Not a big gift but I wish you don't deny, I don't need this anymore.";
+			next;
+			mes "[Wolfchev]";
+			mes "Khahaha, See you again. Do you want to get out of here now?";
+			next;
+			if(select("Not yet", "Yes") == 1) {
+				mes "[Wolfchev]";
+				mes "Then tell me when you want to.";
+				close;
+			}
+			mes "[Wolfchev]";
+			mes "Then I will send you out.";
+			close2;
+			warp "lhz_dun04", 147, 273;
+			end;
+		}
+	} else {
+		if (!.@all_quests_complete) {
+			mes "[Wolfchev]";
+			mes "I was looking at the system.... don't know who made this..... but it's so complicated to get..no idea...";
+			next;
+		} else {
+			mes "[Wolfchev]";
+			mes "kakakaah.. Thank you. You handled those Boss creatures well..";
+			next;
+		}
+		if (lght_duk01 == 7) {
+			lght_duk01 = 8;
+			mes "[Wolfchev]";
+			mes "While you were struggling...";
+			next;
+			mes "[Wolfchev]";
+			mes "I figured out something..and there's a system error which doesn't let us come and go freely, so you could help me in 72 hours... Go somewhere to take rest before you come back..";
+			next;
+			mes "[Wolfchev]";
+			mes "Ah.. and I can send you out of my laboratory. Do you want?";
+			next;
+		} else {
+			mes "[Wolfchev]";
+			mes "Do you want to get out of here now?";
+			next;
+		}
+		if(select("Not yet", "Yes") == 1) {
+			mes "[Wolfchev]";
+			mes "Then tell me when you want to.";
+			close;
+		}
+		mes "[Wolfchev]";
+		mes "Then I will send you out.";
+		close2;
+		warp "lhz_dun04", 147, 273;
+		end;
+	}
+
+	OnInstanceInit:
+	OnDisable:
+		disablenpc instance_npcname("Wolfchev#last");
+		end;
+
+	OnEnable:
+		enablenpc instance_npcname("Wolfchev#last");
+		end;
+}
diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt
index 4ab8837d3..07c37a07c 100644
--- a/npc/re/jobs/1-1/acolyte.txt
+++ b/npc/re/jobs/1-1/acolyte.txt
@@ -1,18 +1,18 @@
 //===== Hercules Script ======================================
 //= Renewal Acolyte Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Job Change to Acolyte Class
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Kisuka]
 //= 1.1 Added back the npcs used for the priest quest.
 //= 1.2 Added Baby Job compatibility [Streusel]
 //= 1.3 Rewrote bits [Euphy]
-//============================================================ 
-prt_church,184,41,4	script	Cleric#aco	60,{
+//============================================================
+prt_church,184,41,4	script	Cleric#aco	1_M_PASTOR,{
 	if (Upper == 1) {
 		if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) {
 			if (Class == Job_Novice_High) {
@@ -110,7 +110,7 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 	}
 }
 
-prt_fild03,365,255,2	script	Ascetic#aco	89,{
+prt_fild03,365,255,2	script	Ascetic#aco	4_M_ORIENT02,{
 	mes "[Father Rubalkabara]";
 	if (BaseJob == Job_Novice) {
 		if (job_acolyte_q == 6) {
@@ -187,7 +187,7 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 	}
 }
 
-moc_fild07,41,355,4	script	Ascetic#2aco	95,{
+moc_fild07,41,355,4	script	Ascetic#2aco	4_F_SISTER,{
 	mes "[Mother Mathilda]";
 	if (BaseJob == Job_Novice) {
 		if (job_acolyte_q == 7) {
@@ -256,7 +256,7 @@ moc_fild07,41,355,4	script	Ascetic#2aco	95,{
 	}
 }
 
-prt_fild00,208,218,6	script	Ascetic#3aco	98,{
+prt_fild00,208,218,6	script	Ascetic#3aco	4W_M_02,{
 	mes "[Father Yosuke]";
 	if (BaseJob == Job_Novice) {
 		if (job_acolyte_q == 8) {
diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt
index 8e8bedc5f..c18d60c5c 100644
--- a/npc/re/jobs/1-1/archer.txt
+++ b/npc/re/jobs/1-1/archer.txt
@@ -1,17 +1,17 @@
 //===== Hercules Script ======================================
 //= Renewal Archer Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Job Change to Archer Class
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Kisuka]
 //= 1.1 Added Baby Job compatibility [Streusel]
 //= 1.2 Rewrote bits [Euphy]
-//============================================================ 
-payon_in02,64,71,4	script	Archer Guildsman#archer	85,{
+//============================================================
+payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 	if (Upper == 1) {
 		if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
 			mes "[Archer Guildsman]";
@@ -39,7 +39,7 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	85,{
 			mes "I know you'll make a great Archer...";
 			next;
 			skill 143,0,0;
-			jobchange Job_Archer_high;
+			jobchange Job_Archer_High;
 			skill 147,1,0;
 			skill 148,1,0;
 			mes "[Archer Guildsman]";
diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt
index 1fce4269e..e87f89328 100644
--- a/npc/re/jobs/1-1/mage.txt
+++ b/npc/re/jobs/1-1/mage.txt
@@ -1,19 +1,17 @@
 //===== Hercules Script ======================================
 //= Renewal Mage Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Job Change to Mage Class
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Kisuka]
 //= 1.1 Added Baby Job compatibility [Streusel]
 //= 1.2 Rewrote bits [Euphy]
-//============================================================ 
-geffen_in,164,124,4	script	Mage Guildsman#mage	123,{
+//============================================================
+geffen_in,164,124,4	script	Mage Guildsman#mage	2_F_MAGICMASTER,{
 	if (Upper == 1) {
 		if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) {
 			if (Class == Job_Novice_High) {
diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt
index 58c13ae17..619a2a465 100644
--- a/npc/re/jobs/1-1/merchant.txt
+++ b/npc/re/jobs/1-1/merchant.txt
@@ -1,19 +1,17 @@
 //===== Hercules Script ======================================
 //= Renewal Merchant Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Job Change to Merchant Class
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Kisuka]
 //= 1.1 Added Baby Job compatibility [Streusel]
 //= 1.2 Rewrote bits [Euphy]
-//============================================================ 
-alberta_in,53,43,6	script	Merchant#mer	86,{
+//============================================================
+alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 	if (Upper == 1) {
 		if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
 			mes "[Chief Mahnsoo]";
diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt
index 0d47f0b3a..d8bd67711 100644
--- a/npc/re/jobs/1-1/swordman.txt
+++ b/npc/re/jobs/1-1/swordman.txt
@@ -1,19 +1,17 @@
 //===== Hercules Script ======================================
 //= Renewal Swordman Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Job Change to Swordman Class
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Kisuka]
 //= 1.1 Added Baby Job compatibility [Streusel]
 //= 1.2 Rewrote bits [Euphy]
-//============================================================ 
-izlude_in,74,172,4	script	Swordman#swd	119,{
+//============================================================
+izlude_in,74,172,4	script	Swordman#swd	2_M_SWORDMASTER,{
 	if (Upper == 1) {
 		if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
 			mes "[Swordman]";
diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt
index 23b23bd96..4b04f9efa 100644
--- a/npc/re/jobs/1-1/thief.txt
+++ b/npc/re/jobs/1-1/thief.txt
@@ -1,19 +1,17 @@
 //===== Hercules Script ======================================
 //= Renewal Thief Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Job Change to Thief Class
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Kisuka]
 //= 1.1 Added Baby Job compatibility [Streusel]
 //= 1.2 Rewrote bits [Euphy]
-//============================================================ 
-moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
+//============================================================
+moc_prydb1,39,129,2	script	Thief Guide#thief	1_F_04,{
 	if (Upper == 1) {
 		if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) {
 			if (Class == Job_Novice_High) {
@@ -42,7 +40,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
 				close;
 			}else{
 				mes "[Thief Guide]";
-				if (sex)
+				if (Sex)
 					mes "Hey, dude.";
 				else
 					mes "Hey, baby~";
@@ -50,7 +48,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
 			}
 		}else{
 			mes "[Thief Guide]";
-			if (sex)
+			if (Sex)
 				mes "Hey, dude.";
 			else
 				mes "Hey, baby.";
@@ -157,7 +155,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
 	close;
 }
 
-moc_prydb1,42,133,2	script	Thief Guildsman#thief	118,{
+moc_prydb1,42,133,2	script	Thief Guildsman#thief	2_M_THIEFMASTER,{
 	if(q_job_thief == 1) {
 		mes "[Thief Guildsman]";
 		mes "Alright. You must have passed the job interview, huh?";
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index c71e2abd3..26782eb94 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -1,10 +1,10 @@
-//===== Hercules Script =======================================
+//===== Hercules Script ======================================
 //= Arch Bishop Job Quest
 //===== By: ==================================================
 //= L0ne_W0lf
 //= Credits: Gepard
 //===== Current Version: =====================================
-//= 1.7a
+//= 1.9
 //===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Priest / High Priest -> Arch Bishop.
@@ -20,9 +20,11 @@
 //= 1.6 Fixed bugs where players unable to continue the quest. [Joseph]
 //= 1.7 Updated script, many bugs fixed. [Euphy]
 //= 1.7a Moved warps to separate file. [Euphy]
+//= 1.8 Bug fixes and corrections. [Euphy]
+//= 1.9 Added GM management function. [Euphy]
 //============================================================
 
-prt_church,103,88,3	script	Praying Minister#arch	60,{
+prt_church,103,88,3	script	Praying Minister#arch	1_M_PASTOR,{
 	if (BaseJob != Job_Priest) {
 		if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Bishop) {
 			mes "[Praying Minister]";
@@ -91,7 +93,7 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 			mes "But, I recommend this.";
 			next;
 			mes "[Praying Minister]";
-			mes "Have you ever heard of a^3131FFHoly Pilgrimage^000000?";
+			mes "Have you ever heard of a ^3131FFHoly Pilgrimage^000000?";
 			mes "A Holy Pilgrimage means going to a holy place to pray to the God Odin for protection and grace.";
 			next;
 			mes "[Praying Minister]";
@@ -160,13 +162,13 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 	close;
 }
 
-umbala,137,227,5	script	Utan Boy#arch	787,{
+umbala,137,227,5	script	Utan Boy#arch	4_M_UMKID,{
 	mes "[Utan Boy]";
 	mes "........";
 	close;
 }
 
-umbala,139,227,3	script	Priest#arch	60,{
+umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 	if (job_arch == 0) {
 		mes "[Priest]";
 		mes "Un...ba... Unba?";
@@ -276,7 +278,7 @@ umbala,139,227,3	script	Priest#arch	60,{
 		mes "And in Asgard, the world of the Gods, there is the Word spring.";
 		next;
 		mes "[Priest Dayan]";
-		mes "Mimir'Â’s spring wells with intelligence, myth says that if Odin lets you have his eye that you will gain all of the knowledge within that spring.";
+		mes "Mimir's spring wells with intelligence, myth says that if Odin lets you have his eye that you will gain all of the knowledge within that spring.";
 		next;
 		mes "[Priest Dayan]";
 		mes Sex?"Brother.":"Sister.";
@@ -412,7 +414,7 @@ umbala,139,227,3	script	Priest#arch	60,{
 	close;
 }
 
-yggdrasil01,220,47,0	script	#arch_pilgrimage	139,5,5,{
+yggdrasil01,220,47,0	script	#arch_pilgrimage	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (job_arch == 2) {
 		mes "[" + strcharinfo(0) + "]";
@@ -571,7 +573,7 @@ OnTouch:
 	end;
 }
 
-hu_in01,205,204,7	script	Praying Nun#benew	79,{
+hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 	if (job_arch == 4) {
 		mes "- There is a nun closing her eyes as she murmurs something which sounds like a prayer. -";
 		next;
@@ -720,14 +722,14 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 	close;
 }
 
-odin_tem02,282,263,0	script	#find_val	139,3,3,{
+odin_tem02,282,263,0	script	#find_val	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if ((job_arch > 4) && (job_arch < 100))
 		hideoffnpc "Valkyrie Illusion#arch";
 	end;
 }
 
-odin_tem02,281,275,3	script	Valkyrie Illusion#arch	403,{
+odin_tem02,281,275,3	script	Valkyrie Illusion#arch	4_F_VALKYRIE2,{
 	if ((job_arch > 4) && (job_arch < 100)) {
 		mes "You can see Valkyrie who has a despairing face.";
 		next;
@@ -752,7 +754,7 @@ OnInit:
 	end;
 }
 
-job3_arch01,29,34,3	script	Valkyrie#arch	403,{
+job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
 		mes "- Wait a Sec !! -";
 		mes "- You are carrying too many items, -";
@@ -774,7 +776,10 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 		mes "You can't progress without using all your skill points. Please use all of your skill points before progressing~";
 		close;
 	}
-	if (Class != Job_Arch_Bishop || Class != Job_Arch_Bishop_T || Class != Job_Baby_Bishop) {
+	if (Class != Job_Priest && Class != Job_High_Priest && Class != Job_Baby_Priest) {
+		warp "odin_tem02",282,263;
+		end;
+	} else if (Class != Job_Arch_Bishop && Class != Job_Arch_Bishop_T && Class != Job_Baby_Bishop) {
 		if (job_arch < 5) {
 			warp "odin_tem02",282,263;
 			end;
@@ -951,7 +956,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 				mes "OK. now I'm going to send you there.";
 				mes "^FF0000When you go there, you have to summon my impersonation with the scroll^000000.";
 				mes "An impersonation will help when you move or attack as you want through ^FF0000ALT+click^000000.";
-				mes "But you have to be careful if an imeprsonation falls down.";
+				mes "But you have to be careful if an impersonation falls down.";
 				close2;
 				nude;
 				if (countitem(2798))
@@ -970,17 +975,17 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 	end;
 OnBc:
 	set $@archbs,0;
-	mapannounce "job3_arch01","Valkyrie: I think someone fell down in the shrine. I can hear the devil's unpleasant laugh.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+	mapannounce "job3_arch01","Valkyrie: I think someone fell down in the shrine. I can hear the devil's unpleasant laugh.",bc_map,"0xFFCE00";
 	hideoffnpc "Valkyrie#arch";
 	end;
 }
 
-job3_arch02,119,49,0	script	#arch_1_start	139,6,6,{
+job3_arch02,119,49,0	script	#arch_1_start	HIDDEN_WARP_NPC,6,6,{
 OnTouch:
 	if (countitem(12381) == 0)
 		getitem 12381,1; //ValkyrieA_Scroll
-	mapannounce "job3_arch02","Whispering of an impersonation: I feel heavy! Set me free!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-	hideonnpc "#arch_1_start";
+	mapannounce "job3_arch02","Whispering of an impersonation: I feel heavy! Set me free!",bc_map,"0xFFCE00";
+	disablenpc "#arch_1_start";
 	end;
 }
 
@@ -988,49 +993,46 @@ OnTouch:
 OnTouch:
 	if (countitem(12381)) {
 		delitem 12381,1; //ValkyrieA_Scroll
-		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-		mapwarp "job3_arch02","job3_arch01",29,29;
-	}
-	if (getmercinfo(1) == 2037) {
+		// fall through
+	} else if (getmercinfo(1) == 2037) {
+		if (strnpcinfo(0) == "#arch_1_10")
+			viewpoint 1,113,327,1,0xFF9900;
 		set .@randht, rand(1,10);
 		if (.@randht < 8)
-			mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits! Be careful!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+			mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits! Be careful!",bc_map,"0xFFCE00";
 		else if ((.@randht == 8) || (.@randht == 9))
-			mapannounce "job3_arch02","Whispering of an impersonation: They are coming!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+			mapannounce "job3_arch02","Whispering of an impersonation: They are coming!",bc_map,"0xFFCE00";
 		end;
 	}
-	mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+	mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00";
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
-job3_arch02,112,73,0	duplicate(archbjcq)	#arch_1_01	139,5,5
-job3_arch02,94,123,0	duplicate(archbjcq)	#arch_1_02	139,5,5
-job3_arch02,93,173,0	duplicate(archbjcq)	#arch_1_03	139,5,5
-job3_arch02,114,186,0	duplicate(archbjcq)	#arch_1_04	139,5,5
-job3_arch02,134,201,0	duplicate(archbjcq)	#arch_1_05	139,5,5
-job3_arch02,154,211,0	duplicate(archbjcq)	#arch_1_06	139,5,5
-job3_arch02,175,227,0	duplicate(archbjcq)	#arch_1_07	139,5,5
-job3_arch02,201,240,0	duplicate(archbjcq)	#arch_1_08	139,5,5
-job3_arch02,223,252,0	duplicate(archbjcq)	#arch_1_09	139,5,5
-job3_arch02,255,268,0	duplicate(archbjcq)	#arch_1_10	139,5,5
-job3_arch02,269,302,0	duplicate(archbjcq)	#arch_1_11	139,5,5
-job3_arch02,245,289,0	duplicate(archbjcq)	#arch_1_12	139,5,5
+job3_arch02,112,73,0	duplicate(archbjcq)	#arch_1_01	HIDDEN_WARP_NPC,5,5
+job3_arch02,94,123,0	duplicate(archbjcq)	#arch_1_02	HIDDEN_WARP_NPC,5,5
+job3_arch02,93,173,0	duplicate(archbjcq)	#arch_1_03	HIDDEN_WARP_NPC,5,5
+job3_arch02,114,186,0	duplicate(archbjcq)	#arch_1_04	HIDDEN_WARP_NPC,5,5
+job3_arch02,134,201,0	duplicate(archbjcq)	#arch_1_05	HIDDEN_WARP_NPC,5,5
+job3_arch02,154,211,0	duplicate(archbjcq)	#arch_1_06	HIDDEN_WARP_NPC,5,5
+job3_arch02,175,227,0	duplicate(archbjcq)	#arch_1_07	HIDDEN_WARP_NPC,5,5
+job3_arch02,201,240,0	duplicate(archbjcq)	#arch_1_08	HIDDEN_WARP_NPC,5,5
+job3_arch02,223,252,0	duplicate(archbjcq)	#arch_1_09	HIDDEN_WARP_NPC,5,5
+job3_arch02,255,268,0	duplicate(archbjcq)	#arch_1_10	HIDDEN_WARP_NPC,5,5
+job3_arch02,269,302,0	duplicate(archbjcq)	#arch_1_11	HIDDEN_WARP_NPC,5,5
+job3_arch02,245,289,0	duplicate(archbjcq)	#arch_1_12	HIDDEN_WARP_NPC,5,5
 
-job3_arch02,203,286,0	script	#arch_1_boss	139,5,5,{
+job3_arch02,203,286,0	script	#arch_1_boss	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (countitem(12381)) {
 		delitem 12381,1; //ValkyrieA_Scroll
-		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		end;
-	}
-	if (getmercinfo(1) == 2037) {
-		mapannounce "job3_arch02","Valkyrie's Nightmare: An incompetent illusion of Valkyrie came here with the assistance of humans. You wanna have that nightmare?",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
+		// fall through
+	} else if (getmercinfo(1) == 2037) {
+		mapannounce "job3_arch02","Valkyrie's Nightmare: An incompetent illusion of Valkyrie came here with the assistance of humans. You wanna have that nightmare?",bc_map,"0xFF0000";
 		donpcevent "mob#arch_1::OnKill";
-	} else {
-		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-		mapwarp "job3_arch02","job3_arch01",29,29;
+		end;
 	}
+	mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00";
+	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
 
@@ -1049,7 +1051,7 @@ OnRed:
 	end;
 }
 
-job3_arch02,390,389,1	script	#arch_val01	844,{
+job3_arch02,390,389,1	script	#arch_val01	CLEAR_NPC,{
 	end;
 OnEnable:
 	areamonster "job3_arch02",111,325,115,329,"Valkyrie's Nightmare",2036,1,"#arch_val01::OnMyMobDead";
@@ -1057,22 +1059,22 @@ OnEnable:
 OnMyMobDead:
 	if (mobcount("job3_arch02","#arch_val01::OnMyMobDead") < 1) {
 		donpcevent "#arch_redcell::OnGreen";
-		mapannounce "job3_arch02","Valkyrie's Nightmare: Your win is only a false image! hahahaha!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
+		mapannounce "job3_arch02","Valkyrie's Nightmare: Your win is only a false image! hahahaha!",bc_map,"0xFF0000";
 		hideoffnpc "Valkyrie#arch_01";
-		hideonnpc "#arch_1_start";
-		hideonnpc "#arch_1_01";
-		hideonnpc "#arch_1_02";
-		hideonnpc "#arch_1_03";
-		hideonnpc "#arch_1_04";
-		hideonnpc "#arch_1_05";
-		hideonnpc "#arch_1_06";
-		hideonnpc "#arch_1_07";
-		hideonnpc "#arch_1_08";
-		hideonnpc "#arch_1_09";
-		hideonnpc "#arch_1_10";
-		hideonnpc "#arch_1_11";
-		hideonnpc "#arch_1_12";
-		hideonnpc "#arch_1_boss";
+		disablenpc "#arch_1_start";
+		disablenpc "#arch_1_01";
+		disablenpc "#arch_1_02";
+		disablenpc "#arch_1_03";
+		disablenpc "#arch_1_04";
+		disablenpc "#arch_1_05";
+		disablenpc "#arch_1_06";
+		disablenpc "#arch_1_07";
+		disablenpc "#arch_1_08";
+		disablenpc "#arch_1_09";
+		disablenpc "#arch_1_10";
+		disablenpc "#arch_1_11";
+		disablenpc "#arch_1_12";
+		disablenpc "#arch_1_boss";
 	}
 	end;
 OnKill:
@@ -1080,16 +1082,16 @@ OnKill:
 	end;
 }
 
-job3_arch02,390,387,1	script	#arch_val02	844,{
+job3_arch02,390,387,1	script	#arch_val02	CLEAR_NPC,{
 	end;
 OnEnable:
 	areamonster "job3_arch02",242,44,246,48,"Valkyrie's Nightmare",2036,1,"#arch_val02::OnMyMobDead";
 	end;
 OnMyMobDead:
 	if (mobcount("job3_arch02","#arch_val02::OnMyMobDead") < 1) {
-		mapannounce "job3_arch02","Valkyrie's Nightmare: You are so childish. I invite you to a devil's party. I'll make sure you have a fun!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
+		mapannounce "job3_arch02","Valkyrie's Nightmare: You are so childish. I invite you to a devil's party. I'll make sure you have a fun!",bc_map,"0xFF0000";
 		hideoffnpc "Valkyrie#arch_02";
-		hideonnpc "#arch_2_boss";
+		disablenpc "#arch_2_boss";
 		viewpoint 1,279,234,1,0xFFFF99;
 	}
 	end;
@@ -1098,7 +1100,7 @@ OnKill:
 	end;
 }
 
-job3_arch02,113,327,5	script	Valkyrie#arch_01	403,{
+job3_arch02,113,327,5	script	Valkyrie#arch_01	4_F_VALKYRIE2,{
 	if (getmercinfo(1)) {
 		mes "[Valkyrie]";
 		mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have.";
@@ -1133,7 +1135,7 @@ job3_arch02,113,327,5	script	Valkyrie#arch_01	403,{
 	end;
 }
 
-job3_arch02,244,46,5	script	Valkyrie#arch_02	403,{
+job3_arch02,244,46,5	script	Valkyrie#arch_02	4_F_VALKYRIE2,{
 	mes "[Valkyrie Anguhilde]";
 	mes "Did you find the rest of the pieces?";
 	next;
@@ -1170,7 +1172,7 @@ job3_arch02,244,46,5	script	Valkyrie#arch_02	403,{
 	end;
 }
 
-job3_arch02,279,234,0	script	#arch_end	139,7,7,{
+job3_arch02,279,234,0	script	#arch_end	HIDDEN_WARP_NPC,7,7,{
 	end;
 OnTouch:
 	donpcevent "#arch_3_01::OnKill";
@@ -1298,18 +1300,18 @@ OnTouch:
 	jobchange roclass(eaclass()|EAJL_THIRD);
 	close;
 OnInit:
-	hideonnpc "#arch_end";
+	disablenpc "#arch_end";
 	end;
 }
 
-job3_arch02,281,232,1	script	Valkyrie Anguhilde#end	403,{
+job3_arch02,281,232,1	script	Valkyrie Anguhilde#end	4_F_VALKYRIE2,{
 	end;
 OnInit:
 	hideonnpc "Valkyrie Anguhilde#end";
 	end;
 }
 
-job3_arch02,273,235,5	script	Valkyrie of the heavens	811,{
+job3_arch02,273,235,5	script	Valkyrie of the heavens	4_F_VALKYRIE,{
 	if (job_arch == 100) {
 		mes "[Valkyrie of the heavens]";
 		mes "Now, go back to your world.";
@@ -1328,11 +1330,11 @@ OnInit:
 	end;
 }
 
-job3_arch02,132,323,0	script	#arch_2_01	139,5,5,{
+job3_arch02,132,323,0	script	#arch_2_01	HIDDEN_WARP_NPC,5,5,{
 	end;
 OnTouch:
 	if (countitem(12382))
-		mapannounce "job3_arch02","Whispering of Valkyrie: I see a new ancient scroll!",bc_map; //FW_NORMAL 12 0 0
+		mapannounce "job3_arch02","Whispering of Valkyrie: I see a new ancient scroll!",bc_map;
 	end;
 }
 
@@ -1340,189 +1342,197 @@ OnTouch:
 OnTouch:
 	if (countitem(12382)) {
 		delitem 12382,1; //ValkyrieB_Scroll
-		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		end;
-	}
-	if (getmercinfo(1) == 2038) {
+		// fall through
+	} else if (getmercinfo(1) == 2038) {
 		set .@randht, rand(1,10);
 		if (.@randht < 8)
-			mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits. Can you hear? The sound of gathering in crowds.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+			mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits. Can you hear? The sound of gathering in crowds.",bc_map,"0xFFCE00";
 		else if ((.@randht == 8) || (.@randht == 9))
-			mapannounce "job3_arch02","Whispering of an impersonation: Combat readiness!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+			mapannounce "job3_arch02","Whispering of an impersonation: Combat readiness!",bc_map,"0xFFCE00";
 		else
-			mapannounce "job3_arch02","Whispering of an impersonation: I can't leave you. Die!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+			mapannounce "job3_arch02","Whispering of an impersonation: I can't leave you. Die!",bc_map,"0xFFCE00";
 		end;
 	}
-	mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+	mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00";
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
-job3_arch02,167,313,0	duplicate(archbjcq2)	#arch_2_02	139,5,5
-job3_arch02,127,304,0	duplicate(archbjcq2)	#arch_2_03	139,5,5
-job3_arch02,207,279,0	duplicate(archbjcq2)	#arch_2_04	139,5,5
-job3_arch02,239,281,0	duplicate(archbjcq2)	#arch_2_05	139,5,5
-job3_arch02,269,303,0	duplicate(archbjcq2)	#arch_2_06	139,5,5
-job3_arch02,288,283,0	duplicate(archbjcq2)	#arch_2_07	139,5,5
-job3_arch02,278,234,0	duplicate(archbjcq2)	#arch_2_08	139,5,5
-job3_arch02,234,179,0	duplicate(archbjcq2)	#arch_2_09	139,5,5
-job3_arch02,227,169,0	duplicate(archbjcq2)	#arch_2_10	139,5,5
-job3_arch02,190,146,0	duplicate(archbjcq2)	#arch_2_11	139,5,5
+job3_arch02,167,313,0	duplicate(archbjcq2)	#arch_2_02	HIDDEN_WARP_NPC,5,5
+job3_arch02,127,304,0	duplicate(archbjcq2)	#arch_2_03	HIDDEN_WARP_NPC,5,5
+job3_arch02,207,279,0	duplicate(archbjcq2)	#arch_2_04	HIDDEN_WARP_NPC,5,5
+job3_arch02,239,281,0	duplicate(archbjcq2)	#arch_2_05	HIDDEN_WARP_NPC,5,5
+job3_arch02,269,303,0	duplicate(archbjcq2)	#arch_2_06	HIDDEN_WARP_NPC,5,5
+job3_arch02,288,283,0	duplicate(archbjcq2)	#arch_2_07	HIDDEN_WARP_NPC,5,5
+job3_arch02,278,234,0	duplicate(archbjcq2)	#arch_2_08	HIDDEN_WARP_NPC,5,5
+job3_arch02,234,179,0	duplicate(archbjcq2)	#arch_2_09	HIDDEN_WARP_NPC,5,5
+job3_arch02,227,169,0	duplicate(archbjcq2)	#arch_2_10	HIDDEN_WARP_NPC,5,5
+job3_arch02,190,146,0	duplicate(archbjcq2)	#arch_2_11	HIDDEN_WARP_NPC,5,5
 
-job3_arch02,252,267,0	script	#arch_2_12	139,5,5,{
+/*
+// Not in official script.
+job3_arch02,252,267,0	script	#arch_2_12	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
-	mapannounce "job3_arch02","Whispering of an impersonation: It's a crossroad. Let's go to the left side. I have to find my pipe.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+	mapannounce "job3_arch02","Whispering of an impersonation: It's a crossroad. Let's go to the left side. I have to find my pipe.",bc_map,"0xFFCE00";
 	end;
 }
 
-job3_arch02,250,290,0	script	#arch_2_13	139,5,5,{
+job3_arch02,250,290,0	script	#arch_2_13	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
-	mapannounce "job3_arch02","Whispering of an impersonation: I can see a ruined shrine. Take a rest in there.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+	mapannounce "job3_arch02","Whispering of an impersonation: I can see a ruined shrine. Take a rest in there.",bc_map,"0xFFCE00";
 	end;
 }
+*/
 
-job3_arch02,206,113,0	script	#arch_2_boss	139,5,5,{
+job3_arch02,206,113,0	script	#arch_2_boss	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (countitem(12382)) {
 		delitem 12382,1; //ValkyrieB_Scroll
-		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-		mapwarp "job3_arch02","job3_arch01",29,29;
-	}
-	if (getmercinfo(1) == 2038)
-		mapannounce "job3_arch02","A shout of devil: You are so childish. I invite you a party of devil. I'll make you have a fun!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
-	else {
-		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-		mapwarp "job3_arch02","job3_arch01",29,29;
+		// fall through
+	} else if (getmercinfo(1) == 2038) {
+		mapannounce "job3_arch02","A shout of devil: You are so childish. I invite you a party of devil. I'll make you have a fun!",bc_map,"0xFF0000";
+		end;
 	}
+	mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00";
+	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
 
-job3_arch02,284,159,0	script	#arch_3_01	139,20,20,{
+job3_arch02,284,159,0	script	#arch_3_01	HIDDEN_WARP_NPC,20,20,{
 OnTouch:
-	if (BaseJob != Job_Priest) {
-		mapannounce "job3_arch02","Frus: Do you want to see God? Okay, I'll send you to the land of the dead by myself!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
-		areamonster "job3_arch02",242,44,246,48,"Frus",1762,1;
+	if (Class != Job_Priest) {
+		mapannounce "job3_arch02","Frus: Do you want to see God? Okay, I'll send you to the land of the dead by myself!",bc_map,"0xFF0000";
+		areamonster "job3_arch02",242,44,246,48,"Frus",1762,1,"#arch_3_01::OnMyMobDead";
 	}
-	hideonnpc "#arch_3_01";
+	disablenpc "#arch_3_01";
+	end;
+OnMyMobDead:
 	end;
 OnKill:
 	killmonster "job3_arch02","#arch_3_01::OnMyMobDead";
 	end;
-OnInit:
-	hideoffnpc "#arch_3_01";
-	end;
+//OnInit:
+//	enablenpc "#arch_3_01";
+//	end;
 }
 
-job3_arch02,307,200,0	script	#arch_3_02	139,5,5,{
+job3_arch02,307,200,0	script	#arch_3_02	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
-		mapannounce "job3_arch02","Skogul: You are my guest!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
-		monster "job3_arch02",307,200,"Skogul",1761,1;
+		mapannounce "job3_arch02","Skogul: You are my guest!",bc_map,"0xFF0000";
+		monster "job3_arch02",307,200,"Skogul",1761,1,"#arch_3_02::OnMyMobDead";
 	}
-	hideonnpc "#arch_3_02";
+	disablenpc "#arch_3_02";
+	end;
+OnMyMobDead:
 	end;
 OnKill:
 	killmonster "job3_arch02","#arch_3_02::OnMyMobDead";
 	end;
-OnInit:
-	hideoffnpc "#arch_3_02";
-	end;
+//OnInit:
+//	enablenpc "#arch_3_02";
+//	end;
 }
 
-job3_arch02,296,216,0	script	#arch_3_03	139,5,5,{
+job3_arch02,296,216,0	script	#arch_3_03	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
-	mapannounce "job3_arch02","Frus: I like your face... Can I steal it?",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
-	monster "job3_arch02",296,216,"Frus",1762,1;
-	hideonnpc "#arch_3_03";
+	mapannounce "job3_arch02","Frus: I like your face... Can I steal it?",bc_map,"0xFF0000";
+	monster "job3_arch02",296,216,"Frus",1762,1,"#arch_3_03::OnMyMobDead";
+	disablenpc "#arch_3_03";
+	end;
+OnMyMobDead:
 	end;
 OnKill:
 	killmonster "job3_arch02","#arch_3_03::OnMyMobDead";
 	end;
 OnInit:
-	hideonnpc "#arch_3_03";
+	disablenpc "#arch_3_03";
 	end;
 }
 
-job3_arch02,389,390,1	script	mob#arch_1	844,{
+job3_arch02,389,390,1	script	mob#arch_1	CLEAR_NPC,{
 	end;
 OnEnable:
-	monster "job3_arch02",100,102,"Shrine Invader",1394,2;
-	monster "job3_arch02",90,131,"Shrine Invader",1394,2;
-	monster "job3_arch02",91,170,"Shrine Invader",1427,1;
-	monster "job3_arch02",104,183,"Shrine Invader",1427,1;
-	monster "job3_arch02",138,205,"Shrine Invader",1394,2;
-	monster "job3_arch02",161,215,"Shrine Invader",1394,2;
-	monster "job3_arch02",165,215,"Shrine Invader",1427,1;
-	monster "job3_arch02",201,236,"Shrine Invader",1394,2;
-	monster "job3_arch02",218,250,"Shrine Invader",1427,1;
-	monster "job3_arch02",254,293,"Shrine Invader",1427,1;
+	monster "job3_arch02",100,102,"Shrine Invader",1394,2,"mob#arch_1::OnMyMobDead";
+	monster "job3_arch02",90,131,"Shrine Invader",1394,2,"mob#arch_1::OnMyMobDead";
+	monster "job3_arch02",91,170,"Shrine Invader",1427,1,"mob#arch_1::OnMyMobDead";
+	monster "job3_arch02",104,183,"Shrine Invader",1427,1,"mob#arch_1::OnMyMobDead";
+	monster "job3_arch02",138,205,"Shrine Invader",1394,2,"mob#arch_1::OnMyMobDead";
+	monster "job3_arch02",161,215,"Shrine Invader",1394,2,"mob#arch_1::OnMyMobDead";
+	monster "job3_arch02",165,215,"Shrine Invader",1427,1,"mob#arch_1::OnMyMobDead";
+	monster "job3_arch02",201,236,"Shrine Invader",1394,2,"mob#arch_1::OnMyMobDead";
+	monster "job3_arch02",218,250,"Shrine Invader",1427,1,"mob#arch_1::OnMyMobDead";
+	monster "job3_arch02",254,293,"Shrine Invader",1427,1,"mob#arch_1::OnMyMobDead";
+	end;
+OnMyMobDead:
 	end;
 OnKill:
 	killmonster "job3_arch02","mob#arch_1::OnMyMobDead";
 	end;
 }
 
-job3_arch02,389,389,1	script	mob#arch_2	844,{
+job3_arch02,389,389,1	script	mob#arch_2	CLEAR_NPC,{
 	end;
 OnEnable:
-	monster "job3_arch02",156,321,"Shrine Invader",1480,2;
-	monster "job3_arch02",170,305,"Shrine Invader",1480,2;
-	monster "job3_arch02",183,293,"Shrine Invader",1453,1;
-	monster "job3_arch02",200,287,"Shrine Invader",1453,1;
-	monster "job3_arch02",256,293,"Shrine Invader",1480,2;
-	monster "job3_arch02",286,284,"Shrine Invader",1480,2;
-	monster "job3_arch02",278,236,"Shrine Invader",1453,1;
-	monster "job3_arch02",292,185,"Shrine Invader",1480,2;
-	monster "job3_arch02",281,170,"Shrine Invader",1453,1;
-	monster "job3_arch02",227,166,"Shrine Invader",1453,1;
-	monster "job3_arch02",190,146,"Shrine Invader",1480,1;
-	monster "job3_arch02",204,177,"Shrine Invader",1453,1;
+	monster "job3_arch02",156,321,"Shrine Invader",1480,2,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",170,305,"Shrine Invader",1480,2,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",183,293,"Shrine Invader",1453,1,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",200,287,"Shrine Invader",1453,1,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",256,293,"Shrine Invader",1480,2,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",286,284,"Shrine Invader",1480,2,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",278,236,"Shrine Invader",1453,1,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",292,185,"Shrine Invader",1480,2,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",281,170,"Shrine Invader",1453,1,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",227,166,"Shrine Invader",1453,1,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",190,146,"Shrine Invader",1480,1,"mob#arch_2::OnMyMobDead";
+	monster "job3_arch02",204,177,"Shrine Invader",1453,1,"mob#arch_2::OnMyMobDead";
+	end;
+OnMyMobDead:
 	end;
 OnKill:
 	killmonster "job3_arch02","mob#arch_2::OnMyMobDead";
 	end;
 }
 
-job3_arch02,389,388,1	script	start#arch	844,{
+job3_arch02,389,388,1	script	start#arch	CLEAR_NPC,{
 	end;
 OnInit:
-	mapwarp "job3_arch02","job3_arch02",29,29;
+	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 OnEnable:
-	mapwarp "job3_arch02","job3_arch02",29,29;
-	hideoffnpc "#arch_1_start";
-	hideoffnpc "#arch_1_01";
-	hideoffnpc "#arch_1_02";
-	hideoffnpc "#arch_1_03";
-	hideoffnpc "#arch_1_04";
-	hideoffnpc "#arch_1_05";
-	hideoffnpc "#arch_1_06";
-	hideoffnpc "#arch_1_07";
-	hideoffnpc "#arch_1_08";
-	hideoffnpc "#arch_1_09";
-	hideoffnpc "#arch_1_10";
-	hideoffnpc "#arch_1_11";
-	hideoffnpc "#arch_1_12";
-	hideoffnpc "#arch_1_boss";
-	hideonnpc "#arch_2_01";
-	hideonnpc "#arch_2_02";
-	hideonnpc "#arch_2_03";
-	hideonnpc "#arch_2_04";
-	hideonnpc "#arch_2_05";
-	hideonnpc "#arch_2_06";
-	hideonnpc "#arch_2_07";
-	hideonnpc "#arch_2_08";
-	hideonnpc "#arch_2_09";
-	hideonnpc "#arch_2_10";
-	hideonnpc "#arch_2_11";
-	hideonnpc "#arch_2_boss";
-	hideonnpc "#arch_3_01";
-	hideonnpc "#arch_3_02";
-	hideonnpc "#arch_3_03";
+	mapwarp "job3_arch02","job3_arch01",29,29;
+	enablenpc "#arch_1_start";
+	enablenpc "#arch_1_01";
+	enablenpc "#arch_1_02";
+	enablenpc "#arch_1_03";
+	enablenpc "#arch_1_04";
+	enablenpc "#arch_1_05";
+	enablenpc "#arch_1_06";
+	enablenpc "#arch_1_07";
+	enablenpc "#arch_1_08";
+	enablenpc "#arch_1_09";
+	enablenpc "#arch_1_10";
+	enablenpc "#arch_1_11";
+	enablenpc "#arch_1_12";
+	enablenpc "#arch_1_boss";
+	disablenpc "#arch_2_01";
+	disablenpc "#arch_2_02";
+	disablenpc "#arch_2_03";
+	disablenpc "#arch_2_04";
+	disablenpc "#arch_2_05";
+	disablenpc "#arch_2_06";
+	disablenpc "#arch_2_07";
+	disablenpc "#arch_2_08";
+	disablenpc "#arch_2_09";
+	disablenpc "#arch_2_10";
+	disablenpc "#arch_2_11";
+	disablenpc "#arch_2_boss";
+	disablenpc "#arch_3_01";
+	disablenpc "#arch_3_02";
+	disablenpc "#arch_3_03";
 	donpcevent "#arch_3_01::OnKill";
 	donpcevent "#arch_3_02::OnKill";
 	donpcevent "#arch_3_03::OnKill";
-	hideonnpc "#arch_end";
+	disablenpc "#arch_end";
 	hideonnpc "Valkyrie#arch_01";
 	hideonnpc "Valkyrie#arch_02";
 	hideonnpc "Valkyrie Anguhilde#end";
@@ -1530,8 +1540,8 @@ OnEnable:
 	donpcevent "#arch_redcell::OnRed";
 	donpcevent "mob#arch_1::OnKill";
 	donpcevent "mob#arch_2::OnKill";
-	donpcevent "start#arch::OnTimeoff";
-	donpcevent "start#arch::OnTimeon";
+	donpcevent "start#arch::OnTimeOff";
+	donpcevent "start#arch::OnTimeOn";
 	donpcevent "#arch_val01::OnKill";
 	donpcevent "#arch_val02::OnKill";
 	donpcevent "mob#arch_1::OnKill";
@@ -1539,10 +1549,10 @@ OnEnable:
 	donpcevent "mob#arch_1::OnEnable";
 	donpcevent "#arch_val01::OnEnable";
 	end;
-OnTimeon:
+OnTimeOn:
 	initnpctimer;
 	end;
-OnTimeoff:
+OnTimeOff:
 	stopnpctimer;
 	end;
 OnTimer60000:
@@ -1561,91 +1571,87 @@ OnTimer540000:
 	}
 	end;
 OnTimer600000:
-	mapannounce "job3_arch02","Valkyrie's Nightmare: I can't stand anymore!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
+	mapannounce "job3_arch02","Valkyrie's Nightmare: I can't stand anymore!",bc_map,"0xFF0000";
 	end;
 OnTimer605000:
-	mapannounce "job3_arch02","Whispering of Valkyrie: No way! I can't let you guys do that. Go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+	mapannounce "job3_arch02","Whispering of Valkyrie: No way! I can't let you guys do that. Go back!",bc_map,"0xFFCE00";
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	donpcevent "Valkyrie#arch::OnBc";
 	stopnpctimer;
 	end;
 }
 
-job3_arch02,390,388,1	script	#arch_2_start	844,{
+job3_arch02,390,388,1	script	#arch_2_start	CLEAR_NPC,{
 	end;
 OnInit:
-	hideonnpc "#arch_2_01";
-	hideonnpc "#arch_2_02";
-	hideonnpc "#arch_2_03";
-	hideonnpc "#arch_2_04";
-	hideonnpc "#arch_2_05";
-	hideonnpc "#arch_2_06";
-	hideonnpc "#arch_2_07";
-	hideonnpc "#arch_2_08";
-	hideonnpc "#arch_2_09";
-	hideonnpc "#arch_2_10";
-	hideonnpc "#arch_2_11";
-	hideonnpc "#arch_2_boss";
+	disablenpc "#arch_2_01";
+	disablenpc "#arch_2_02";
+	disablenpc "#arch_2_03";
+	disablenpc "#arch_2_04";
+	disablenpc "#arch_2_05";
+	disablenpc "#arch_2_06";
+	disablenpc "#arch_2_07";
+	disablenpc "#arch_2_08";
+	disablenpc "#arch_2_09";
+	disablenpc "#arch_2_10";
+	disablenpc "#arch_2_11";
+	disablenpc "#arch_2_boss";
 	end;
 OnEnable:
-	hideoffnpc "#arch_2_01";
-	hideoffnpc "#arch_2_02";
-	hideoffnpc "#arch_2_03";
-	hideoffnpc "#arch_2_04";
-	hideoffnpc "#arch_2_05";
-	hideoffnpc "#arch_2_06";
-	hideoffnpc "#arch_2_07";
-	hideoffnpc "#arch_2_08";
-	hideoffnpc "#arch_2_09";
-	hideoffnpc "#arch_2_10";
-	hideoffnpc "#arch_2_11";
-	hideoffnpc "#arch_2_boss";
+	enablenpc "#arch_2_01";
+	enablenpc "#arch_2_02";
+	enablenpc "#arch_2_03";
+	enablenpc "#arch_2_04";
+	enablenpc "#arch_2_05";
+	enablenpc "#arch_2_06";
+	enablenpc "#arch_2_07";
+	enablenpc "#arch_2_08";
+	enablenpc "#arch_2_09";
+	enablenpc "#arch_2_10";
+	enablenpc "#arch_2_11";
+	enablenpc "#arch_2_boss";
 	donpcevent "#arch_val02::OnEnable";
 	donpcevent "mob#arch_2::OnEnable";
 	end;
 }
 
-job3_arch02,390,386,1	script	#arch_3_start	844,{
+job3_arch02,390,386,1	script	#arch_3_start	CLEAR_NPC,{
 	end;
 OnEnable:
-	hideoffnpc "#arch_3_01";
-	hideoffnpc "#arch_3_02";
-	hideoffnpc "#arch_3_03";
-	hideoffnpc "#arch_end";
-	hideoffnpc "#arch_end_eff";
+	enablenpc "#arch_3_01";
+	enablenpc "#arch_3_02";
+	enablenpc "#arch_3_03";
+	enablenpc "#arch_end";
+	//enablenpc "#arch_end_eff";
 	end;
 }
 
-job3_arch02,290,221,0	script	#arch_end_eff	139,5,5,{
+job3_arch02,290,221,0	script	#arch_end_eff	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	specialeffect EF_MAPPILLAR2,"#arch_end";
 	end;
 }
 
-odin_tem02,30,181,0	script	#wherearch01	139,10,10,{
+/*
+job_arch01,26,25,0	script	#archremove	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
-	if (job_arch == 5)
-		viewpoint 1,282,263,1,0xFFFF99;
+	if (countitem(6154)) delitem 6154, countitem(6154); //Broken_Horn_Pipe
+	if (countitem(12381)) delitem 12381, countitem(12381); //ValkyrieA_Scroll
+	if (countitem(12382)) delitem 12382, countitem(12382); //ValkyrieB_Scroll
+	if (countitem(2798)) delitem 2798, countitem(2798); //Will_Of_Exhausted_Angel
 	end;
 }
+*/
 
-odin_tem02,30,335,0	script	#wherearch02	139,10,10,{
-OnTouch:
-	if (job_arch == 5)
-		viewpoint 1,282,263,1,0xFFFF99;
-	end;
-}
-
-/*
-job3_arch01,1,1,1	script	control#arch	844,{
+job3_arch01,1,1,1	script	control#arch	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "[Troll]";
 	mes "Password please.";
 	next;
-	input .@input;
-	if (.@input == 1854) {
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
 		mes "[Transit]";
 		mes "The GlobalVar is";
-		mes "" + $@archbs + ".";
+		mes $@archbs + ".";
 		mes "Do you want to change it?";
 		next;
 		switch(select("0:1")) {
@@ -1664,4 +1670,17 @@ job3_arch01,1,1,1	script	control#arch	844,{
 		close;
 	}
 }
-*/
\ No newline at end of file
+
+odin_tem02,30,181,0	script	#wherearch01	HIDDEN_WARP_NPC,10,10,{
+OnTouch:
+	if (job_arch == 5)
+		viewpoint 1,282,263,1,0xFFFF99;
+	end;
+}
+
+odin_tem02,30,335,0	script	#wherearch02	HIDDEN_WARP_NPC,10,10,{
+OnTouch:
+	if (job_arch == 5)
+		viewpoint 1,282,263,1,0xFFFF99;
+	end;
+}
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 71769be81..df51c3496 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -1,24 +1,24 @@
 //===== Hercules Script ======================================
 //= Guillotine Cross Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Assassin / Assassin Cross -> Guillotine Cross.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Adapted from original script. [Euphy]
 //= 1.0a Added 'npcskill' command. [Euphy]
 //= 1.0b Moved warps to separate file. [Euphy]
 //= 1.1 Fixed some minor bugs. [Euphy]
 //= 1.2 Moved "Girl" NPC off ve_fild05. [Euphy]
 //= 1.3 Added missing OnMyMobDead labels. [Euphy]
+//= 1.4 Added missing labels. [Joseph]
+//= 1.5 Added GM management function. [Euphy]
 //============================================================
 
-que_job01,75,96,3	script	Guild Member#3rdgc01	997,{
+que_job01,75,96,3	script	Guild Member#3rdgc01	4_M_MOCASS1,{
 	if (job_3rd_gc == 0) {
 		if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
 			if (BaseLevel == 99) {
@@ -222,7 +222,7 @@ function	script	func_3rdgc	{
 	close;
 }
 
-job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
+job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 	mes "[Daora]";
 	if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
 		if (job_3rd_gc < 4) {
@@ -243,7 +243,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 				mes "[Daora]";
 				if (Zeny > 799) {
 					mes "Here you are, take it.";
-					set Zeny, Zeny - 800;
+					Zeny -= 800;
 					getitem 12112,1; //Tropical_Sograt
 					close;
 				}
@@ -253,7 +253,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 				mes "[Daora]";
 				if (Zeny > 799) {
 					mes "Here you are, take it.";
-					set Zeny, Zeny - 800;
+					Zeny -= 800;
 					getitem 12113,1; //Vermilion_The_Beach
 					close;
 				}
@@ -697,7 +697,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 					if (Zeny > 499) {
 						mes "Here you are. Milk.";
 						mes "Then take a rest.";
-						set Zeny, Zeny - 500;
+						Zeny -= 500;
 						getitem 519,1; //Milk
 						close;
 					}
@@ -737,7 +737,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 			mes "[Daora]";
 			if (Zeny > 799) {
 				mes "Here you are, take it.";
-				set Zeny, Zeny - 800;
+				Zeny -= 800;
 				getitem 12112,1; //Tropical_Sograt
 				close;
 			}
@@ -747,7 +747,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 			mes "[Daora]";
 			if (Zeny > 799) {
 				mes "Here you are, take it.";
-				set Zeny, Zeny - 800;
+				Zeny -= 800;
 				getitem 12113,1; //Vermilion_The_Beach
 				close;
 			}
@@ -764,7 +764,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 				if (Zeny > 499) {
 					mes "I feel sorry to take 500 zeny per bottle, but I have to.";
 					mes "It's very hard to get milk in Veins.";
-					set Zeny, Zeny - 500;
+					Zeny -= 500;
 					getitem 519,1; //Milk
 					close;
 				}
@@ -799,7 +799,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 			mes "[Daora]";
 			if (Zeny > 999) {
 				mes "Here you are, take it.";
-				set Zeny, Zeny - 1000;
+				Zeny -= 1000;
 				getitem 12112,1; //Tropical_Sograt
 				close;
 			}
@@ -809,7 +809,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 			mes "[Daora]";
 			if (Zeny > 999) {
 				mes "Here you are, take it.";
-				set Zeny, Zeny - 1000;
+				Zeny -= 1000;
 				getitem 12113,1; //Vermilion_The_Beach
 				close;
 			}
@@ -825,7 +825,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 	}
 }
 
-job3_guil01,16,20,4	script	Mayshell#3rdgc03	894,{
+job3_guil01,16,20,4	script	Mayshell#3rdgc03	4_F_KHELLISIA,{
 	if (!checkweight(1201,2)) {
 		mes "- You can't continue this quest because you have too many items. -";
 		close;
@@ -1097,7 +1097,7 @@ job3_guil01,16,20,4	script	Mayshell#3rdgc03	894,{
 	}
 }
 
-ve_in,228,108,3	script	Waitress#3rdgc04	80,{
+ve_in,228,108,3	script	Waitress#3rdgc04	1_F_PUBGIRL,{
 	mes "[Waitress]";
 	if (job_3rd_gc < 6) {
 		mes "Welcome~";
@@ -1289,7 +1289,7 @@ ve_in,228,108,3	script	Waitress#3rdgc04	80,{
 							mes "[Waitress]";
 							mes "Oh by the way, my name is Madelle.";
 							mes "I hope you remember my name.";
-							set Zeny, Zeny - 5000;
+							Zeny -= 5000;
 							setquest 7112;
 							next;
 							mes "- Madelle's information is attached to a quest board. What information have I collected? -";
@@ -1330,7 +1330,7 @@ ve_in,228,108,3	script	Waitress#3rdgc04	80,{
 	}
 }
 
-ve_in,246,303,3	script	Young Merchant#3rdgc05	930,{
+ve_in,246,303,3	script	Young Merchant#3rdgc05	4_M_RACHMAN2,{
 	if (job_3rd_gc < 6) {
 		mes "[Young Merchant]";
 		mes "If you want to buy stuff, go to this person.";
@@ -1526,7 +1526,7 @@ ve_in,246,303,3	script	Young Merchant#3rdgc05	930,{
 	}
 }
 
-veins,291,215,3	script	Vigilante#3rdgc06	939,{
+veins,291,215,3	script	Vigilante#3rdgc06	4_DST_SOLDIER,{
 	if (job_3rd_gc < 6) {
 		mes "[Vigilante]";
 		mes "Do you have any inconveniences while you are traveling?";
@@ -1690,7 +1690,7 @@ veins,291,215,3	script	Vigilante#3rdgc06	939,{
 	}
 }
 
-veins,187,143,5	script	Peddler#3rdgc07	892,{
+veins,187,143,5	script	Peddler#3rdgc07	4_F_HUGRANMA,{
 	mes "[Peddler]";
 	if (job_3rd_gc < 6) {
 		mes "What a huge sandstorm.";
@@ -1793,7 +1793,7 @@ veins,187,143,5	script	Peddler#3rdgc07	892,{
 	}
 }
 
-veins,235,126,3	script	Old Man#3rdgc07	945,{
+veins,235,126,3	script	Old Man#3rdgc07	4_M_DST_GRAND,{
 	mes "[Old Man]";
 	if (job_3rd_gc < 6) {
 		mes "Haha... I can remember my past when I see a young adventurer like you...";
@@ -1900,7 +1900,7 @@ veins,235,126,3	script	Old Man#3rdgc07	945,{
 	}
 }
 
-veins,223,180,3	script	Girl#3rdgc09	941,{
+veins,223,180,3	script	Girl#3rdgc09	4_F_DST_CHILD,{
 	mes "[Melissa]";
 	if (job_3rd_gc == 8) {
 		mes "Hi?";
@@ -2071,7 +2071,7 @@ veins,223,180,3	script	Girl#3rdgc09	941,{
 	}
 }
 
-veins,337,284,0	script	#ghostestilla_3rdgc	139,3,3,{
+veins,337,284,0	script	#ghostestilla_3rdgc	HIDDEN_WARP_NPC,3,3,{
 	end;
 OnTouch:
 	if (job_3rd_gc == 9) {
@@ -2184,7 +2184,7 @@ OnTouch:
 	end;
 }
 
-veins,341,287,3	script	Estillda#3rdgc10	919,{
+veins,341,287,3	script	Estillda#3rdgc10	4_F_SHABBY,{
 OnInit:
 OnDisable:
 	disablenpc "Estillda#3rdgc10";
@@ -2194,7 +2194,7 @@ OnEnable:
 	end;
 }
 
-job3_guil01,79,15,1	script	Estillda#3rdgc11	919,{
+job3_guil01,79,15,1	script	Estillda#3rdgc11	4_F_SHABBY,{
 	if (job_3rd_gc == 11) {
 		mes "Estillda is looking around with an anxious expression on her face.";
 		next;
@@ -2313,7 +2313,7 @@ job3_guil01,79,15,1	script	Estillda#3rdgc11	919,{
 	end;
 }
 
-veins,206,56,0	script	#3rdgc_battleroom01	139,1,1,{
+veins,206,56,0	script	#3rdgc_battleroom01	HIDDEN_WARP_NPC,1,1,{
 	end;
 OnInit:
 	set $@3rdgc_room01, 0;
@@ -2352,7 +2352,7 @@ OnTouch:
 	end;
 }
 
-job3_guil02,34,44,0	script	#3rdgc_room01_mag01	139,2,2,{
+job3_guil02,34,44,0	script	#3rdgc_room01_mag01	HIDDEN_WARP_NPC,2,2,{
 	end;
 OnEnable:
 	enablenpc "#3rdgc_room01_mag01";
@@ -2397,7 +2397,7 @@ OnTimer300000:
 	end;
 }
 
-job3_guil02,51,43,7	script	A man with black clothes	456,4,4,{
+job3_guil02,51,43,7	script	A man with black clothes	4_M_DSTMAN,4,4,{
 	end;
 OnInit:
 OnDisable:
@@ -2452,7 +2452,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil02,1,1,0	script	#3rdgc_2nd_timer	844,{
+job3_guil02,1,1,0	script	#3rdgc_2nd_timer	CLEAR_NPC,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -2472,7 +2472,7 @@ OnTimer61000:
 	end;
 }
 
-job3_guil02,49,43,5	script	Dandelion#3rdgc12	457,{
+job3_guil02,49,43,5	script	Dandelion#3rdgc12	4_M_DSTMANDEAD,{
 	if (!checkweight(1201,2)) {
 		mes "- You can't continue this quest because you have too many items. -";
 		close;
@@ -2517,7 +2517,7 @@ OnEnable:
 	end;
 }
 
-rachel,115,77,3	script	Girke#3rdgc13	85,{
+rachel,115,77,3	script	Girke#3rdgc13	4_M_03,{
 	mes "[Girke]";
 	mes "Oh~ young man.";
 	mes "I'm Girke Sara.";
@@ -2564,7 +2564,7 @@ rachel,115,77,3	script	Girke#3rdgc13	85,{
 	close;
 }
 
-ra_in01,175,196,3	script	Oresa Rava#3rdgc13	866,{
+ra_in01,175,196,3	script	Oresa Rava#3rdgc13	4_M_LGTGRAND,{
 	mes "[Oresa Rava]";
 	if (job_3rd_gc == 13) {
 		mes "I don't know why you are visiting me, but I'm not crafting anymore.";
@@ -2649,7 +2649,7 @@ ra_in01,175,196,3	script	Oresa Rava#3rdgc13	866,{
 }
 
 //Pre-RE: ve_fild05 (327,308)
-ve_fild02,330,384,3	script	Girl#3rdgc14	466,{
+ve_fild02,330,384,3	script	Girl#3rdgc14	4_F_GUILLOTINE,{
 	if (job_3rd_gc > 14 && job_3rd_gc < 18) {
 		mes "[Renzak]";
 		if (job_3rd_gc == 15) {
@@ -2728,7 +2728,7 @@ OnInit:
 	end;
 }
 
-job3_guil03,22,70,0	script	#3rdgc_event01	139,3,3,{
+job3_guil03,22,70,0	script	#3rdgc_event01	HIDDEN_WARP_NPC,3,3,{
 	end;
 OnEnable:
 	enablenpc "#3rdgc_event01";
@@ -2763,7 +2763,7 @@ OnTimer902000:
 	end;
 }
 
-job3_guil03,1,4,0	script	#3rdgc_event_master	844,{
+job3_guil03,1,4,0	script	#3rdgc_event_master	CLEAR_NPC,{
 	end;
 OnEnable:
 	donpcevent "Barbed-Wire Entanglement::OnEnable";
@@ -2814,7 +2814,7 @@ OnReset:
 }
 
 //Original name: Barbed-Wire Entanglements#3rdgc_door01
-job3_guil03,55,79,0	script	Barbed-Wire Entanglement	844,1,1,{
+job3_guil03,55,79,0	script	Barbed-Wire Entanglement	CLEAR_NPC,1,1,{
 	end;
 OnEnable:
 	enablenpc "Barbed-Wire Entanglement";
@@ -2836,7 +2836,7 @@ OnTouch:
 	close;
 }
 
-job3_guil03,98,46,0	script	#3rdgc_hide01	139,1,4,{
+job3_guil03,98,46,0	script	#3rdgc_hide01	HIDDEN_WARP_NPC,1,4,{
 	end;
 OnStop:
 	killmonster "job3_guil03","#3rdgc_hide01::OnMyMobDead";
@@ -2863,7 +2863,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,98,55,0	script	#3rdgc_hide02	139,1,4,{
+job3_guil03,98,55,0	script	#3rdgc_hide02	HIDDEN_WARP_NPC,1,4,{
 	end;
 OnStop:
 	killmonster "job3_guil03","#3rdgc_hide02::OnMyMobDead";
@@ -2890,7 +2890,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,98,64,0	script	#3rdgc_hide03	139,1,4,{
+job3_guil03,98,64,0	script	#3rdgc_hide03	HIDDEN_WARP_NPC,1,4,{
 	end;
 OnStop:
 	killmonster "job3_guil03","#3rdgc_hide03::OnMyMobDead";
@@ -2917,7 +2917,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,1,2,0	script	#3rdgc_guard	844,{
+job3_guil03,1,2,0	script	#3rdgc_guard	CLEAR_NPC,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -2958,7 +2958,7 @@ OnTimer16000:
 	end;
 }
 
-job3_guil03,1,3,0	script	#3rdgc_guardoff	844,{
+job3_guil03,1,3,0	script	#3rdgc_guardoff	CLEAR_NPC,{
 	end;
 OnDisable:
 	initnpctimer;
@@ -3033,7 +3033,7 @@ OnEnable:
 	end;
 }
 
-job3_guil03,93,35,3	script	Front Gate Guard#g01	456,5,5,{
+job3_guil03,93,35,3	script	Front Gate Guard#g01	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3057,12 +3057,14 @@ OnTouch:
 	monster "job3_guil03",93,33,"Front Gate Guard",1985,1,"Front Gate Guard#g01::OnMyMobDead";
 	monster "job3_guil03",93,32,"Guard Dog",1866,1,"Front Gate Guard#g01::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
-job3_guil03,93,36,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g03	456
-job3_guil03,93,34,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g04	456
-job3_guil03,93,33,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g05	456
+job3_guil03,93,36,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g03	4_M_DSTMAN
+job3_guil03,93,34,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g04	4_M_DSTMAN
+job3_guil03,93,33,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g05	4_M_DSTMAN
 
-job3_guil03,133,52,5	script	Back Gate Guard#g01	456,5,5,{
+job3_guil03,133,52,5	script	Back Gate Guard#g01	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3086,12 +3088,14 @@ OnTouch:
 	monster "job3_guil03",133,50,"Back Gate Guard",1985,1,"Back Gate Guard#g01::OnMyMobDead";
 	monster "job3_guil03",133,49,"Guard Dog",1866,1,"Back Gate Guard#g01::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
-job3_guil03,133,53,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g03	456
-job3_guil03,133,51,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g04	456
-job3_guil03,133,50,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g05	456
+job3_guil03,133,53,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g03	4_M_DSTMAN
+job3_guil03,133,51,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g04	4_M_DSTMAN
+job3_guil03,133,50,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g05	4_M_DSTMAN
 
-job3_guil03,117,51,4	script	Interior Guard#g01	456,5,5,{
+job3_guil03,117,51,4	script	Interior Guard#g01	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3115,12 +3119,14 @@ OnTouch:
 	monster "job3_guil03",117,49,"Interior Guard",1985,1,"Interior Guard#g01::OnMyMobDead";
 	monster "job3_guil03",117,48,"Guard Dog",1866,1,"Interior Guard#g01::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
-job3_guil03,117,52,4	duplicate(#3rdgc_guard00)	Interior Guard#g03	456
-job3_guil03,117,50,4	duplicate(#3rdgc_guard00)	Interior Guard#g04	456
-job3_guil03,117,49,4	duplicate(#3rdgc_guard00)	Interior Guard#g05	456
+job3_guil03,117,52,4	duplicate(#3rdgc_guard00)	Interior Guard#g03	4_M_DSTMAN
+job3_guil03,117,50,4	duplicate(#3rdgc_guard00)	Interior Guard#g04	4_M_DSTMAN
+job3_guil03,117,49,4	duplicate(#3rdgc_guard00)	Interior Guard#g05	4_M_DSTMAN
 
-job3_guil03,88,44,4	script	Exterior Guard#g01	456,5,5,{
+job3_guil03,88,44,4	script	Exterior Guard#g01	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3139,9 +3145,11 @@ OnTouch:
 	monster "job3_guil03",88,43,"Exterior Guard",1985,1,"Exterior Guard#g01::OnMyMobDead";
 	monster "job3_guil03",88,45,"Guard Dog",1866,1,"Exterior Guard#g01::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
 
-job3_guil03,88,55,4	script	Exterior Guard#g02	456,5,5,{
+job3_guil03,88,55,4	script	Exterior Guard#g02	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3160,9 +3168,11 @@ OnTouch:
 	monster "job3_guil03",88,54,"Exterior Guard",1985,1,"Exterior Guard#g02::OnMyMobDead";
 	monster "job3_guil03",88,56,"Guard Dog",1866,1,"Exterior Guard#g02::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
 
-job3_guil03,88,64,4	script	Exterior Guard#g03	456,5,5,{
+job3_guil03,88,64,4	script	Exterior Guard#g03	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3181,9 +3191,11 @@ OnTouch:
 	monster "job3_guil03",88,63,"Exterior Guard",1985,1,"Exterior Guard#g03::OnMyMobDead";
 	monster "job3_guil03",88,65,"Guard Dog",1866,1,"Exterior Guard#g03::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
 
-job3_guil03,73,62,4	script	Exterior Guard#g04	456,5,5,{
+job3_guil03,73,62,4	script	Exterior Guard#g04	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3202,9 +3214,11 @@ OnTouch:
 	monster "job3_guil03",73,61,"Exterior Guard",1985,1,"Exterior Guard#g04::OnMyMobDead";
 	monster "job3_guil03",73,63,"Guard Dog",1866,1,"Exterior Guard#g04::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
 
-job3_guil03,77,51,4	script	Exterior Guard#g05	456,5,5,{
+job3_guil03,77,51,4	script	Exterior Guard#g05	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3223,9 +3237,11 @@ OnTouch:
 	monster "job3_guil03",77,50,"Exterior Guards",1985,1,"Exterior Guard#g05::OnMyMobDead";
 	monster "job3_guil03",77,49,"Guard Dog",1866,1,"Exterior Guard#g05::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
 
-job3_guil03,73,34,4	script	Exterior Guard#g06	456,5,5,{
+job3_guil03,73,34,4	script	Exterior Guard#g06	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3244,9 +3260,11 @@ OnTouch:
 	monster "job3_guil03",73,33,"Exterior guards",1985,1,"Exterior Guard#g06::OnMyMobDead";
 	monster "job3_guil03",73,32,"Guard Dog",1866,1,"Exterior Guard#g06::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
 
-job3_guil03,110,27,3	script	Guard Dog#dog01	1866,3,1,{
+job3_guil03,110,27,3	script	Guard Dog#dog01	HELL_POODLE,3,1,{
 	end;
 OnEnable:
 	enablenpc "Guard Dog#dog01";
@@ -3265,9 +3283,11 @@ OnTouch:
 	monster "job3_guil03",104,27,"Dog Trainer's Assistant",1985,1,"Guard Dog#dog01::OnMyMobDead";
 	monster "job3_guil03",98,27,"Guard",1985,1,"Guard Dog#dog01::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
 
-job3_guil03,119,27,3	script	Guard Dog#dog02	1866,3,1,{
+job3_guil03,119,27,3	script	Guard Dog#dog02	HELL_POODLE,3,1,{
 	end;
 OnEnable:
 	enablenpc "Guard Dog#dog02";
@@ -3286,9 +3306,11 @@ OnTouch:
 	monster "job3_guil03",104,27,"Trainer's Assistant",1985,1,"Guard Dog#dog02::OnMyMobDead";
 	monster "job3_guil03",131,27,"Guard",1985,1,"Guard Dog#dog02::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
 
-job3_guil03,2,1,0	script	#3rdgc_sunchal_nomal	844,{
+job3_guil03,2,1,0	script	#3rdgc_sunchal_nomal	CLEAR_NPC,{
 	end;
 OnEnable:
 	monster "job3_guil03",62,35,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
@@ -3321,9 +3343,11 @@ OnEnable:
 OnReset:
 	killmonster "job3_guil03","#3rdgc_sunchal_nomal::OnMyMobDead";
 	end;
+OnMyMobDead:
+	end;
 }
 
-job3_guil03,2,2,0	script	#3rdgc_sunchal_kill01	844,{
+job3_guil03,2,2,0	script	#3rdgc_sunchal_kill01	CLEAR_NPC,{
 	end;
 OnEnable:
 	set .@i, atoi(charat(strnpcinfo(0),20));
@@ -3353,10 +3377,10 @@ OnTimer10000:
 	stopnpctimer;
 	end;
 }
-job3_guil03,2,3,0	duplicate(#3rdgc_sunchal_kill01)	#3rdgc_sunchal_kill02	844
-job3_guil03,2,4,0	duplicate(#3rdgc_sunchal_kill01)	#3rdgc_sunchal_kill03	844
+job3_guil03,2,3,0	duplicate(#3rdgc_sunchal_kill01)	#3rdgc_sunchal_kill02	CLEAR_NPC
+job3_guil03,2,4,0	duplicate(#3rdgc_sunchal_kill01)	#3rdgc_sunchal_kill03	CLEAR_NPC
 
-job3_guil03,64,68,3	script	#3rdgc_gojung_kill01	456,7,7,{
+job3_guil03,64,68,3	script	#3rdgc_gojung_kill01	4_M_DSTMAN,7,7,{
 	end;
 OnEnable:
 	enablenpc strnpcinfo(0);
@@ -3391,10 +3415,10 @@ OnTimer10000:
 	stopnpctimer;
 	end;
 }
-job3_guil03,86,63,1	duplicate(#3rdgc_gojung_kill01)	#3rdgc_gojung_kill02	456,8,8
-job3_guil03,83,36,5	duplicate(#3rdgc_gojung_kill01)	#3rdgc_gojung_kill03	456,6,6
+job3_guil03,86,63,1	duplicate(#3rdgc_gojung_kill01)	#3rdgc_gojung_kill02	4_M_DSTMAN,8,8
+job3_guil03,83,36,5	duplicate(#3rdgc_gojung_kill01)	#3rdgc_gojung_kill03	4_M_DSTMAN,6,6
 
-job3_guil03,88,71,0	script	#3rdgc_safezone01	139,1,1,{
+job3_guil03,88,71,0	script	#3rdgc_safezone01	HIDDEN_WARP_NPC,1,1,{
 	end;
 OnTouch:
 	mes "It's a good bush to hide yourself.";
@@ -3416,10 +3440,10 @@ OnTimer:
 		donpcevent "#3rdgc_guardoff::OnDisable";
 	end;
 }
-job3_guil03,82,45,0	duplicate(#3rdgc_safezone01)	#3rdgc_safezone02	139,1,1
-job3_guil03,72,53,0	duplicate(#3rdgc_safezone01)	#3rdgc_safezone03	139,1,1
+job3_guil03,82,45,0	duplicate(#3rdgc_safezone01)	#3rdgc_safezone02	HIDDEN_WARP_NPC,1,1
+job3_guil03,72,53,0	duplicate(#3rdgc_safezone01)	#3rdgc_safezone03	HIDDEN_WARP_NPC,1,1
 
-job3_guil03,111,51,7	script	Priest from Rachel	928,{
+job3_guil03,111,51,7	script	Priest from Rachel	4_M_MIDDLE1,{
 	if (!.on) end;
 	mes "[Priest from Rachel]";
 	if (job_3rd_gc == 17) {
@@ -3431,7 +3455,7 @@ job3_guil03,111,51,7	script	Priest from Rachel	928,{
 		next;
 		mes "[Priest from Rachel]";
 		mes "Because of you, you ruined everything!";
-		setnpcdisplay(strnpcinfo(0),2030);
+		setnpcdisplay(strnpcinfo(0), HIDEN_PRIEST);
 		next;
 		mes "[Priest from Rachel]";
 		mes "You want to destroy us forever!";
@@ -3514,7 +3538,7 @@ OnTimer61500:
 	end;
 }
 
-job3_guil03,146,70,3	script	Renzak#3rdgc16	466,{
+job3_guil03,146,70,3	script	Renzak#3rdgc16	4_F_GUILLOTINE,{
 	mes "[Renzak]";
 	if (checkquest(7110,HUNTING) == 2) {
 		mes "My peers will come here to settle this affair.";
@@ -3551,7 +3575,7 @@ OnDisable:
 	end;
 }
 
-job3_guil01,148,53,3	script	Bercasell#3rdgc16	467,{
+job3_guil01,148,53,3	script	Bercasell#3rdgc16	4_M_GUILLOTINE,{
 	if (!checkweight(1201,2)) {
 		mes "- You can't continue this quest because you have too many items. -";
 		close;
@@ -3764,7 +3788,7 @@ L_Info:
 
 // Warp Portals
 //============================================================
-job3_guil01,80,77,0	script	#gate_to_guil05	45,1,1,{
+job3_guil01,80,77,0	script	#gate_to_guil05	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (job_3rd_gc > 3)
@@ -3777,7 +3801,7 @@ OnTouch:
 	}
 	end;
 }
-job3_guil01,51,55,0	script	#gate_to_guil07	45,1,1,{
+job3_guil01,51,55,0	script	#gate_to_guil07	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (job_3rd_gc == 4 || job_3rd_gc == 14 || job_3rd_gc > 17)
@@ -3794,7 +3818,7 @@ OnTouch:
 	}
 	end;
 }
-job3_guil01,51,44,0	script	#gate_to_guil09	45,1,1,{
+job3_guil01,51,44,0	script	#gate_to_guil09	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (job_3rd_gc == 11 || job_3rd_gc == 12)
@@ -3808,12 +3832,11 @@ OnTouch:
 	end;
 }
 
-/*
-job3_guil02,1,3,0	script	#GMhelper01_gc	844,{
+job3_guil02,1,3,0	script	#GMhelper01_gc	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "What can I do for you?";
 	next;
-	input .@input;
-	if (.@input == 1854) {
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
 		set .@room01, $@3rdgc_room01;
 		mes "I check the recent situation.";
 		mes "The battle situation of storage: "+.@room01+"";
@@ -3842,16 +3865,17 @@ job3_guil02,1,3,0	script	#GMhelper01_gc	844,{
 			mes "A management for mansion is in mansion.";
 			close;
 		}
+	} else {
+		mes "-_-.";
+		close;
 	}
-	mes "-_-.";
-	close;
 }
 
-job3_guil03,1,8,0	script	#GMhelper02_gc	844,{
+job3_guil03,1,8,0	script	#GMhelper02_gc	CLEAR_NPC,{
+	callfunc "F_GM_NPC";
 	mes "What can I do for you?";
 	next;
-	input .@input;
-	if (.@input == 1854) {
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
 		set .@room02, $@3rdgc_room02;
 		mes "Check the recent situation.";
 		mes "The battle situation of the mansion is: "+.@room02+"";
@@ -3912,8 +3936,8 @@ job3_guil03,1,8,0	script	#GMhelper02_gc	844,{
 			mes "The management of storage is in a storage.";
 			close;
 		}
+	} else {
+		mes "-_-.";
+		close;
 	}
-	mes "-_-.";
-	close;
 }
-*/
\ No newline at end of file
diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt
index c38d4608f..e34fccc72 100644
--- a/npc/re/jobs/3-1/mechanic.txt
+++ b/npc/re/jobs/3-1/mechanic.txt
@@ -1,21 +1,19 @@
 //===== Hercules Script ======================================
 //= Mechanic Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Jobchange Quest from Blacksmith / Whitesmith -> Mechanic.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
 //= 1.1 Fixed the Door NPC [JayPee].
 //= 1.2 Updated script. [Euphy]
-//============================================================ 
+//============================================================
 
-yuno,129,156,3	script	Chainheart	923,{
+yuno,129,156,3	script	Chainheart	4_M_DOCTOR,{
 	mes "[Chainheart]";
 	if (BaseLevel > 99) {
 		mes "Living as a Mechanic is tough,";
@@ -295,7 +293,7 @@ yuno,129,156,3	script	Chainheart	923,{
 	close;
 }
 
-jupe_cave,37,55,5	script	Scholar#Mechanic	883,{
+jupe_cave,37,55,5	script	Scholar#Mechanic	4_M_ALCHE_D,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 300) {
 		mes "- Your pack is too heavy. -";
 		mes "- Lighten your body first -";
@@ -386,7 +384,7 @@ jupe_cave,37,55,5	script	Scholar#Mechanic	883,{
 	close;
 }
 
-jupe_core2,149,273,3	script	Ghostfire#1	802,{
+jupe_core2,149,273,3	script	Ghostfire#1	4_NFWISP,{
 	mes "[?]";
 	if (job__mechanic == 11) {
 		mes "I've lost my body and all that's left is my spirit in this place.";
@@ -472,7 +470,7 @@ jupe_core2,149,273,3	script	Ghostfire#1	802,{
 	end;
 }
 
-jupe_core2,53,75,3	script	Ghostfire#2	802,{
+jupe_core2,53,75,3	script	Ghostfire#2	4_NFWISP,{
 	mes "[?]";
 	if (job__mechanic > 5) {
 		mes "Juperos... I...";
@@ -534,7 +532,7 @@ jupe_core2,53,75,3	script	Ghostfire#2	802,{
 	end;
 }
 
-jupe_core2,242,62,3	script	Ghostfire#3	802,{
+jupe_core2,242,62,3	script	Ghostfire#3	4_NFWISP,{
 	mes "[?]";
 	if (job__mechanic > 6) {
 		mes "I want to know more about the knowledge...";
@@ -575,7 +573,7 @@ jupe_core2,242,62,3	script	Ghostfire#3	802,{
 	end;
 }
 
-jupe_core2,29,150,0	script	#Foothold	139,1,1,{
+jupe_core2,29,150,0	script	#Foothold	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
 	if (job__mechanic == 8) {
 		percentheal 0,-30;
@@ -614,7 +612,7 @@ OnTouch:
 	end;
 }
 
-jupe_core2,272,149,0	script	#Foothold2	139,1,1,{
+jupe_core2,272,149,0	script	#Foothold2	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
 	if (job__mechanic == 9) {
 		mes "-I had a feeling that power-";
@@ -649,7 +647,7 @@ OnTouch:
 	end;
 }
 
-jupe_core2,288,142,3	script	#Door	844,1,1,{
+jupe_core2,288,142,3	script	#Door	CLEAR_NPC,1,1,{
 	end;
 OnInit:
 OnDisable:
@@ -703,7 +701,7 @@ OnTouch:
 	end;
 }
 
-jupe_core2,149,34,0	script	#Acquiring Knowledge	139,1,0,{
+jupe_core2,149,34,0	script	#Acquiring Knowledge	HIDDEN_WARP_NPC,1,0,{
 OnTouch:
 	if (job__mechanic == 9) {
 		mes "-The moment I stepped on-";
@@ -728,6 +726,6 @@ OnTouch:
 	}
 	end;
 }
-jupe_core2,150,33,0	duplicate(#Acquiring Knowledge)	#Acquiring Knowledge2	139,1,0
+jupe_core2,150,33,0	duplicate(#Acquiring Knowledge)	#Acquiring Knowledge2	HIDDEN_WARP_NPC,1,0
 
-jupe_core2,0,0,0,0	monster	Dimik	1669,100,0,0,0
\ No newline at end of file
+jupe_core2,0,0,0,0	monster	Dimik	1669,100,0,0,0
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 314f199d2..0b52df91f 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -1,15 +1,13 @@
 //===== Hercules Script ======================================
 //= Ranger Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.6
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Hunter / Sniper -> Ranger.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
 //= 1.1 Updated SC_STONE duration from 2 Seconds to 2 Minutes
 //=     and fixed Mercenary check.
@@ -20,9 +18,10 @@
 //= 1.3a Little beauty fix, changed break; to next; . [Masao]
 //= 1.4 Some optimization. [Euphy]
 //= 1.5 Updated script, optimized. [Euphy]
+//= 1.6 Added GM management function. [Euphy]
 //============================================================
 
-tur_dun01,156,36,5	script	Survival Instructor#jr01	59,{
+tur_dun01,156,36,5	script	Survival Instructor#jr01	1_M_ORIENT01,{
 	mes "[Survival Instructor, Rescue]";
 	if (BaseJob == Job_Hunter) {
 		if (job_ranger01 < 1) {
@@ -305,7 +304,7 @@ tur_dun01,156,36,5	script	Survival Instructor#jr01	59,{
 	close;
 }
 
-tur_dun01,91,169,3	script	Test Instructor#jr02	732,{
+tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 	mes "[Test Instructor, Teardrop]";
 	if (BaseJob == Job_Hunter) {
 		if (job_ranger01 < 3) {
@@ -673,7 +672,7 @@ L_Start:
 	end;
 }
 
-job3_rang01,30,44,3	script	Test Waiting Room#jr_03	88,{
+job3_rang01,30,44,3	script	Test Waiting Room#jr_03	4_M_ORIENT01,{
 	mes "[Staff DTS]";
 	mes "Please wait at the practical test waiting room to start the test process.";
 	next;
@@ -799,7 +798,7 @@ OnDisable:
 	end;
 }
 
-job3_rang02,100,95,0	script	Test Supervisor#jr_04	139,{
+job3_rang02,100,95,0	script	Test Supervisor#jr_04	HIDDEN_WARP_NPC,{
 OnInit:
 	set $@job_rang_point01,0;
 	disablenpc "Test Supervisor#jr_04";
@@ -842,7 +841,7 @@ OnTimer18000:
 	end;
 }
 
-job3_rang02,102,95,0	script	First Test Timer#jr_05	139,{
+job3_rang02,102,95,0	script	First Test Timer#jr_05	HIDDEN_WARP_NPC,{
 OnInit:
 	disablenpc "First Test Timer#jr_05";
 	end;
@@ -943,7 +942,7 @@ OnTimer157000:
 	end;
 }
 
-job3_rang02,104,95,0	script	CallCorrectAnswer#jr	139,{
+job3_rang02,104,95,0	script	CallCorrectAnswer#jr	HIDDEN_WARP_NPC,{
 OnInit:
 OnDisable:
 	disablenpc "CallCorrectAnswer#jr";
@@ -970,7 +969,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rang02,106,95,0	script	CallWrongAnswer#jr	139,{
+job3_rang02,106,95,0	script	CallWrongAnswer#jr	HIDDEN_WARP_NPC,{
 OnInit:
 OnDisable:
 	disablenpc "CallWrongAnswer#jr";
@@ -1060,7 +1059,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rang02,100,93,0	script	Second Test Timer#jr_08	139,{
+job3_rang02,100,93,0	script	Second Test Timer#jr_08	HIDDEN_WARP_NPC,{
 OnInit:
 	disablenpc "Second Test Timer#jr_08";
 	end;
@@ -1167,7 +1166,7 @@ OnTimer223000:
 	end;
 }
 
-job3_rang02,111,56,3	script	Staff Rust#jr_09	89,{
+job3_rang02,111,56,3	script	Staff Rust#jr_09	4_M_ORIENT02,{
 	if (job_ranger01 == 6) {
 		if (countitem(12258) < 1) {
 			percentheal 100,0;
@@ -1212,7 +1211,7 @@ OnDisable:
 	end;
 }
 
-job3_rang02,136,21,0	script	Summon Monster#jr_10	139,5,5,{
+job3_rang02,136,21,0	script	Summon Monster#jr_10	HIDDEN_WARP_NPC,5,5,{
 OnInit:
 	disablenpc "Summon Monster#jr_10";
 	end;
@@ -1261,7 +1260,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rang02,180,78,3	script	Test Supervisor#jr_11	882,1,1,{
+job3_rang02,180,78,3	script	Test Supervisor#jr_11	4_F_SITDOWN,1,1,{
 	mes "[Test Supervisor, Caution]";
 	mes "Come, come near, nearer, nearer!!";
 	close;
@@ -1361,7 +1360,7 @@ OnTimer105000:
 	end;
 }
 
-job3_rang02,104,93,0	script	Third Test Timer#jr_12	139,{
+job3_rang02,104,93,0	script	Third Test Timer#jr_12	HIDDEN_WARP_NPC,{
 OnInit:
 	disablenpc "Third Test Timer#jr_12";
 	end;
@@ -1448,7 +1447,7 @@ OnTimer130000:
 	end;
 }
 
-job3_rang02,251,49,3	script	Test Supervisor#jr_13	732,{
+job3_rang02,251,49,3	script	Test Supervisor#jr_13	4_M_JOB_HUNTER,{
 	mes "[Test Supervisor, Freeze]";
 	if (job_ranger01 == 6) {
 		if (checkquest(8261) == -1) {
@@ -1603,23 +1602,23 @@ OnTimer10000:
 	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
 }
-job3_rang02,246,42,0	duplicate(Egg Bomb#0)	Egg Bomb#14	139
-job3_rang02,249,46,0	duplicate(Egg Bomb#0)	Egg Bomb#15	139
-job3_rang02,256,43,0	duplicate(Egg Bomb#0)	Egg Bomb#16	139
-job3_rang02,243,54,0	duplicate(Egg Bomb#0)	Egg Bomb#17	139
-job3_rang02,246,58,0	duplicate(Egg Bomb#0)	Egg Bomb#18	139
-job3_rang02,255,56,0	duplicate(Egg Bomb#0)	Egg Bomb#19	139
-job3_rang02,260,48,0	duplicate(Egg Bomb#0)	Egg Bomb#20	139
-job3_rang02,244,53,0	duplicate(Egg Bomb#0)	Egg Bomb#21	139
-job3_rang02,254,50,0	duplicate(Egg Bomb#0)	Egg Bomb#22	139
-job3_rang02,241,41,0	duplicate(Egg Bomb#0)	Egg Bomb#23	139
-job3_rang02,259,41,0	duplicate(Egg Bomb#0)	Egg Bomb#24	139
-job3_rang02,256,52,0	duplicate(Egg Bomb#0)	Egg Bomb#25	139
-job3_rang02,259,58,0	duplicate(Egg Bomb#0)	Egg Bomb#26	139
-job3_rang02,254,52,0	duplicate(Egg Bomb#0)	Egg Bomb#27	139
-job3_rang02,247,42,0	duplicate(Egg Bomb#0)	Egg Bomb#28	139
+job3_rang02,246,42,0	duplicate(Egg Bomb#0)	Egg Bomb#14	HIDDEN_WARP_NPC
+job3_rang02,249,46,0	duplicate(Egg Bomb#0)	Egg Bomb#15	HIDDEN_WARP_NPC
+job3_rang02,256,43,0	duplicate(Egg Bomb#0)	Egg Bomb#16	HIDDEN_WARP_NPC
+job3_rang02,243,54,0	duplicate(Egg Bomb#0)	Egg Bomb#17	HIDDEN_WARP_NPC
+job3_rang02,246,58,0	duplicate(Egg Bomb#0)	Egg Bomb#18	HIDDEN_WARP_NPC
+job3_rang02,255,56,0	duplicate(Egg Bomb#0)	Egg Bomb#19	HIDDEN_WARP_NPC
+job3_rang02,260,48,0	duplicate(Egg Bomb#0)	Egg Bomb#20	HIDDEN_WARP_NPC
+job3_rang02,244,53,0	duplicate(Egg Bomb#0)	Egg Bomb#21	HIDDEN_WARP_NPC
+job3_rang02,254,50,0	duplicate(Egg Bomb#0)	Egg Bomb#22	HIDDEN_WARP_NPC
+job3_rang02,241,41,0	duplicate(Egg Bomb#0)	Egg Bomb#23	HIDDEN_WARP_NPC
+job3_rang02,259,41,0	duplicate(Egg Bomb#0)	Egg Bomb#24	HIDDEN_WARP_NPC
+job3_rang02,256,52,0	duplicate(Egg Bomb#0)	Egg Bomb#25	HIDDEN_WARP_NPC
+job3_rang02,259,58,0	duplicate(Egg Bomb#0)	Egg Bomb#26	HIDDEN_WARP_NPC
+job3_rang02,254,52,0	duplicate(Egg Bomb#0)	Egg Bomb#27	HIDDEN_WARP_NPC
+job3_rang02,247,42,0	duplicate(Egg Bomb#0)	Egg Bomb#28	HIDDEN_WARP_NPC
 
-job3_rang01,90,43,3	script	Ranger Master#jr_29	832,{
+job3_rang01,90,43,3	script	Ranger Master#jr_29	4_M_REIDIN_KURS,{
 	mes "[Ranger Master, Neveragain]";
 	if (job_ranger01 < 6) {
 		mes "... ...Huh?";
@@ -1757,8 +1756,8 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	832,{
 	}
 }
 
-/*
-job3_rang01,58,1,0	script	Worker#job_ranger	88,{
+job3_rang01,58,1,0	script	Worker#job_ranger	4_M_ORIENT01,{
+	callfunc "F_GM_NPC";
 	switch(select("Enable Waiting Room:Disable Waiting Room:Enable 1st Test:Disable 1st Test:Enable 2nd Test:Disable 2nd Test:Enable 3rd Test:Disable 3rd Test:Cancel")) {
 	case 1:
 		mes "Enabled Waiting Room";
@@ -1803,4 +1802,3 @@ job3_rang01,58,1,0	script	Worker#job_ranger	88,{
 		close;
 	}
 }
-*/
\ No newline at end of file
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index 1255c355e..ffb395e07 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf, Muad_Dib
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Description: =========================================
 //= Job change Quest from Knight / Lord Knight -> Rune Knight.
 //===== Additional Comments: =================================
@@ -13,9 +13,11 @@
 //= 1.3 Updated script, optimized. [Euphy]
 //= 1.3a Added 'npcskill' command. [Euphy]
 //= 1.4 Fixed a few bugs. [Euphy]
+//= 1.4a Moved Kafra to main file. [Euphy]
+//= 1.5 Added GM management function. [Euphy]
 //============================================================
 
-prt_in,162,24,3	script	Splendid-Looking Knight	470,2,2,{
+prt_in,162,24,3	script	Splendid-Looking Knight	4_M_KNIGHT_SILVER,2,2,{
 	mes "[Rune Knight Manuel]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "You are now a member of our select brethren. I can still remember when I first met you.";
@@ -123,7 +125,7 @@ prt_in,162,24,3	script	Splendid-Looking Knight	470,2,2,{
 	close;
 }
 
-glast_01,44,363,3	script	Guide, Jungberg	468,2,2,{
+glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 	mes "[Guide, Jungberg]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Oh, you must be "+strcharinfo(0)+".";
@@ -247,7 +249,7 @@ glast_01,44,363,3	script	Guide, Jungberg	468,2,2,{
 	}
 }
 
-gl_knt02,150,55,3	script	Rune Knight Staff	83,2,2,{
+gl_knt02,150,55,3	script	Rune Knight Staff	4_M_01,2,2,{
 	mes "[Rune Knight Staff]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Welcome, "+strcharinfo(0)+". Are you going to the gathering place?";
@@ -294,7 +296,7 @@ gl_knt02,150,55,3	script	Rune Knight Staff	83,2,2,{
 	close;
 }
 
-job3_rune01,80,60,3	script	Rune Knight Captain	470,2,2,{
+job3_rune01,80,60,3	script	Rune Knight Captain	4_M_KNIGHT_SILVER,2,2,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight.";
 		close;
@@ -572,7 +574,7 @@ L_Warning:
 	return;
 }
 
-job3_rune01,90,50,3	script	Rune Knight Lunarea	469,2,2,{
+job3_rune01,90,50,3	script	Rune Knight Lunarea	4_M_KNIGHT_GOLD,2,2,{
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "She holds up her chin quietly, nods lightly and notices me.";
 		next;
@@ -686,7 +688,7 @@ L_Test:
 	close;
 }
 
-job3_rune01,55,50,3	script	Rune Knight, Renoa	469,2,2,{
+job3_rune01,55,50,3	script	Rune Knight, Renoa	4_M_KNIGHT_GOLD,2,2,{
 	mes "[Rune Knight, Renoa]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Congratulations for becoming one of us. Junior Rune Knight, "+strcharinfo(0)+".";
@@ -902,7 +904,7 @@ job3_rune01,55,50,3	script	Rune Knight, Renoa	469,2,2,{
 	close;
 }
 
-job3_rune01,58,51,1	script	Rune Furnace	844,{
+job3_rune01,58,51,1	script	Rune Furnace	CLEAR_NPC,{
 	if (job_rune_edq < 15) {
 		mes "[Rune Knight Renoa]";
 		mes "You don't want to touch that thing. Believe me, I'm not kidding.";
@@ -974,7 +976,7 @@ job3_rune01,58,51,1	script	Rune Furnace	844,{
 	close;
 }
 
-job3_rune01,40,54,1	script	Runes and Rune Knights	844,{
+job3_rune01,40,54,1	script	Runes and Rune Knights	CLEAR_NPC,{
 	if (job_rune_edq < 8) {
 		mes "[Rune Knight Renoa]";
 		mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1033,7 +1035,7 @@ job3_rune01,40,54,1	script	Runes and Rune Knights	844,{
 	}
 }
 
-job3_rune01,43,44,1	script	The Principles of Runes	844,{
+job3_rune01,43,44,1	script	The Principles of Runes	CLEAR_NPC,{
 	if (job_rune_edq < 8) {
 		mes "[Rune Knight Renoa]";
 		mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1080,7 +1082,7 @@ job3_rune01,43,44,1	script	The Principles of Runes	844,{
 	}
 }
 
-job3_rune01,50,36,1	script	Runes, Make & Use	844,{
+job3_rune01,50,36,1	script	Runes, Make & Use	CLEAR_NPC,{
 	if (job_rune_edq < 8) {
 		mes "[Rune Knight Renoa]";
 		mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1179,7 +1181,7 @@ job3_rune01,50,36,1	script	Runes, Make & Use	844,{
 	}
 }
 
-mid_camp,238,250,3	script	Rune Knight Sage Guard	468,2,2,{
+mid_camp,238,250,3	script	Rune Knight Sage Guard	4_M_KNIGHT_BLACK,2,2,{
 	mes "[Rune Knight Sage Guard]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "The sage Serpeone is the one who has been with us since the beginning of the Rune Knights.";
@@ -1206,7 +1208,7 @@ mid_camp,238,250,3	script	Rune Knight Sage Guard	468,2,2,{
 	close;
 }
 
-mid_camp,13,138,3	script	Dispatched Rune Knight#1	83,2,2,{
+mid_camp,13,138,3	script	Dispatched Rune Knight#1	4_M_01,2,2,{
 	mes "[Dispatched Rune Knight]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Thanks for your work. We will continue our mission for the Rune Knight testers.";
@@ -1234,9 +1236,9 @@ mid_camp,13,138,3	script	Dispatched Rune Knight#1	83,2,2,{
 	mes "Shh... Our mission is not something to be revealed to the public. Please just move along.";
 	close;
 }
-spl_fild01,361,327,3	duplicate(Dispatched Rune Knight#1)	Dispatched Rune Knight#2	83,2,2
+spl_fild01,361,327,3	duplicate(Dispatched Rune Knight#1)	Dispatched Rune Knight#2	4_M_01,2,2
 
-spl_fild02,13,241,0	script	#Barricade1	139,10,10,{
+spl_fild02,13,241,0	script	#Barricade1	HIDDEN_WARP_NPC,10,10,{
 	end;
 OnTouch:
 	if (job_rune_edq > 0 && job_rune_edq < 23) {
@@ -1254,7 +1256,7 @@ OnTouch:
 	end;
 }
 
-mid_camp,235,250,3	script	Sage Serpeone	435,2,2,{
+mid_camp,235,250,3	script	Sage Serpeone	4_F_FAIRY,2,2,{
 	mes "[Sage Serpeone]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Finally you are an honorable Rune Knight. I'm happy to help you.";
@@ -1418,7 +1420,7 @@ mid_camp,235,250,3	script	Sage Serpeone	435,2,2,{
 	close;
 }
 
-job3_rune01,114,50,3	script	Rune Knight Velpino	468,{
+job3_rune01,114,50,3	script	Rune Knight Velpino	4_M_KNIGHT_BLACK,{
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Rune Knight Velpino]";
 		mes "You still smell like a fledging. Bring honor to the Rune Knights and raise your power...";
@@ -1552,7 +1554,7 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	468,{
 	close;
 }
 
-job3_rune02,38,40,0	script	#RK Test Hidden Portal 1	139,15,15,{
+job3_rune02,38,40,0	script	#RK Test Hidden Portal 1	HIDDEN_WARP_NPC,15,15,{
 	end;
 OnEnable:
 	enablenpc "#RK Test Hidden Portal 1";
@@ -1586,7 +1588,7 @@ OnTouch:
 	}
 }
 
-job3_rune02,1,1,0	script	job_rune_edq#1st_tb	139,{
+job3_rune02,1,1,0	script	job_rune_edq#1st_tb	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tb";
@@ -1615,7 +1617,7 @@ OnTimer14000:
 	end;
 }
 
-job3_rune02,1,2,0	script	job_rune_edq#1st_tc	139,{
+job3_rune02,1,2,0	script	job_rune_edq#1st_tc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tc";
@@ -1651,7 +1653,7 @@ OnTimer305000:
 	end;
 }
 
-job3_rune02,3,10,0	script	job_rune_edq#1st_tcmc	139,{
+job3_rune02,3,10,0	script	job_rune_edq#1st_tcmc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tcmc";
@@ -1704,7 +1706,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,3,11,0	script	job_rune_edq#1st_tcmc2	139,{
+job3_rune02,3,11,0	script	job_rune_edq#1st_tcmc2	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tcmc2";
@@ -1754,7 +1756,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,1,10,0	script	job_rune_edq#1st_tcnc	139,{
+job3_rune02,1,10,0	script	job_rune_edq#1st_tcnc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tcnc";
@@ -1800,7 +1802,7 @@ OnTimer60000:
 	end;
 }
 
-job3_rune02,34,46,5	script	Captain Tigris#jrt1	470,2,2,{
+job3_rune02,34,46,5	script	Captain Tigris#jrt1	4_M_KNIGHT_SILVER,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1846,7 +1848,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,43,46,3	script	Rune Knight Lunarea#jrt1	469,2,2,{
+job3_rune02,43,46,3	script	Rune Knight Lunarea#jrt1	4_M_KNIGHT_GOLD,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1891,7 +1893,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,43,34,1	script	Rune Knight Renoa#jrt1	469,2,2,{
+job3_rune02,43,34,1	script	Rune Knight Renoa#jrt1	4_M_KNIGHT_GOLD,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1937,7 +1939,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,34,34,7	script	Rune Knight Velpino#jrt1	468,2,2,{
+job3_rune02,34,34,7	script	Rune Knight Velpino#jrt1	4_M_KNIGHT_BLACK,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1982,7 +1984,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,2,1,0	script	job_rune_edq#3rd_tb	139,{
+job3_rune02,2,1,0	script	job_rune_edq#3rd_tb	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tb";
@@ -2011,7 +2013,7 @@ OnTimer14000:
 	end;
 }
 
-job3_rune02,2,2,0	script	job_rune_edq#3rd_tc	139,{
+job3_rune02,2,2,0	script	job_rune_edq#3rd_tc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc";
@@ -2048,7 +2050,7 @@ OnTimer482000:
 	end;
 }
 
-job3_rune02,2,3,0	script	job_rune_edq#3rd_tc1	139,{
+job3_rune02,2,3,0	script	job_rune_edq#3rd_tc1	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc1";
@@ -2072,7 +2074,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,2,4,0	script	job_rune_edq#3rd_tc2	139,{
+job3_rune02,2,4,0	script	job_rune_edq#3rd_tc2	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc2";
@@ -2096,7 +2098,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,2,5,0	script	job_rune_edq#3rd_tc3	139,{
+job3_rune02,2,5,0	script	job_rune_edq#3rd_tc3	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc3";
@@ -2132,19 +2134,11 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune01,92,62,3	script	Kafra Employee::kaf_rune	114,{
-	cutin "kafra_04",2;
-	callfunc "F_KafSet";
-	callfunc "F_Kafra",0,9,2,80,700;
-	callfunc "F_KafEnd",0,0;
-}
-
-/*
-sec_in02,34,167,3	script	R.Knight Job Manager	470,1,1,{
+sec_in02,34,167,3	script	R.Knight Job Manager	4_M_KNIGHT_SILVER,1,1,{
+	callfunc "F_GM_NPC";
 	mes "Enter the Password.";
 	next;
-	input .@inputstr$;
-	if (.@inputstr$ == "1854") {
+	if (callfunc("F_GM_NPC","1854",1) == 1) {
 		mes "Rune Knight Job Change Managing Module Start";
 		next;
 		switch(select("GlobalVar check:GlobalVar Oneshot Modification")) {
@@ -2160,5 +2154,4 @@ sec_in02,34,167,3	script	R.Knight Job Manager	470,1,1,{
 	}
 	close;
 }
-job3_rune01,1,1,3	duplicate(R.Knight Job Manager)	#renshucheck	844
-*/
+job3_rune01,1,1,3	duplicate(R.Knight Job Manager)	#renshucheck	CLEAR_NPC
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index 9894eae4b..671340a03 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -1,15 +1,13 @@
 //===== Hercules Script ======================================
 //= Warlock Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib, Gepard & L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.3a
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job change Quest from Wizard / High Wizard -> Warlock.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version. [Masao]
 //= 1.1 Fixed some conversion mistakes, replaced numbers with
 //=     constants, added item names in comments.
@@ -18,6 +16,8 @@
 //= 1.2a Fixed a typo. [Euphy]
 //= 1.3 Updated script, optimized. [Euphy]
 //= 1.3a Added temporary coordinate fix #distorted_space_1-1. [Euphy]
+//= 1.3b Added official coordinates. [Euphy]
+//= 1.4 Added GM management function. [Euphy]
 //============================================================
 
 -	script	#distorted_space_	-1,{
@@ -66,11 +66,9 @@ OnTouch:
 	}
 	end;
 }
-morocc,103,144,0	duplicate(#distorted_space_)	#distorted_space_1	139,1,1
-splendide,141,284,0	duplicate(#distorted_space_)	#distorted_space_2	139,1,1
-
-// This is a temporary fix until new official coordinates are found.
-morocc,98,144,0	duplicate(#distorted_space_)	#distorted_space_1-1	139,1,1
+//morocc,103,144,0	duplicate(#distorted_space_)	#distorted_space_1	HIDDEN_WARP_NPC,1,1
+morocc,95,132,0	duplicate(#distorted_space_)	#distorted_space_1	HIDDEN_WARP_NPC,1,1
+splendide,141,284,0	duplicate(#distorted_space_)	#distorted_space_2	HIDDEN_WARP_NPC,1,1
 
 function	script	F_Warlock	{
 	mes "[Assistant]";
@@ -205,7 +203,7 @@ function	script	F_Warlock	{
 	end;
 }
 
-spl_in02,77,107,5	script	Assistant#Warlock1	446,{
+spl_in02,77,107,5	script	Assistant#Warlock1	4_M_FAIRYKID5,{
 	if (job_wl == 0) {
 		callfunc "F_Warlock";
 		end;
@@ -323,7 +321,7 @@ L_Quest:
 	return;
 }
 
-spl_in02,60,231,5	script	Yoop#Warlock	446,{
+spl_in02,60,231,5	script	Yoop#Warlock	4_M_FAIRYKID5,{
 	mes "[Yoop]";
 	if (job_wl < 4) {
 		mes "Who are you?";
@@ -452,7 +450,7 @@ spl_in02,60,231,5	script	Yoop#Warlock	446,{
 	}
 }
 
-spl_in02,84,103,3	script	Assistant#Warlock2	439,{
+spl_in02,84,103,3	script	Assistant#Warlock2	4_F_FAIRYKID4,{
 	if (job_wl == 0) {
 		callfunc "F_Warlock";
 		end;
@@ -543,7 +541,7 @@ spl_in02,84,103,3	script	Assistant#Warlock2	439,{
 	}
 }
 
-spl_in02,78,110,5	script	Assistant#Warlock3	437,{
+spl_in02,78,110,5	script	Assistant#Warlock3	4_F_FAIRYKID2,{
 	if (job_wl == 0) {
 		callfunc "F_Warlock";
 		end;
@@ -570,7 +568,7 @@ spl_in02,78,110,5	script	Assistant#Warlock3	437,{
 	}
 }
 
-spl_in02,80,108,5	script	Guild Master#Warlock	465,{
+spl_in02,80,108,5	script	Guild Master#Warlock	4_F_FAIRY1,{
 	if (job_wl == 0) {
 		callfunc "F_Warlock";
 		end;
@@ -712,14 +710,14 @@ spl_in02,80,108,5	script	Guild Master#Warlock	465,{
 	}
 }
 
-job3_war01,22,22,7	script	Yoop#WRR	439,{
+job3_war01,22,22,7	script	Yoop#WRR	4_F_FAIRYKID4,{
 	mes "[Yoop]";
 	mes "If you ask Ebein to be sent to the magical room, he would send you there.";
 	mes "Wait in the queue to enter the Chamber of Magic.";
 	close;
 }
 
-job3_war01,29,25,0	script	Ebein#WRR	437,{
+job3_war01,29,25,0	script	Ebein#WRR	4_F_FAIRYKID2,{
 	mes "[Ebein]";
 	mes "Would you like to take a test?";
 	mes "If you stand by in the waiting room, you'll be able to go into the Chamber of Magic.";
@@ -744,7 +742,7 @@ job3_war01,29,25,0	script	Ebein#WRR	437,{
 	}
 }
 
-job3_war01,29,25,5	script	The chamber of magic#1	437,{
+job3_war01,29,25,5	script	The chamber of magic#1	4_F_FAIRYKID2,{
 	end;
 OnInit:
 	disablenpc "The chamber of magic#1";
@@ -1056,8 +1054,8 @@ OnTimer6000:
 	end;
 }
 
-/*
-job3_war01,1,2,0	script	Button Girl	66,{
+job3_war01,1,2,0	script	Button Girl#wl	1_F_01,{
+	callfunc "F_GM_NPC";
 	switch(select("Open Arena:Close Arena:Open the Chamber of Magic:Close the Chamber of Magic:Hollow Stone On:Hollow Stone Off:Cancel")) {
 	case 1:
 		mes "Opening the Arena.";
@@ -1093,7 +1091,6 @@ job3_war01,1,2,0	script	Button Girl	66,{
 		close;
 	}
 }
-*/
 
 spl_fild02,0,0,0,0	monster	Bradium Golem	2049,20,5000,0,0
-spl_fild02,0,0,0,0	monster	Naga	2047,20,5000,0,0
\ No newline at end of file
+spl_fild02,0,0,0,0	monster	Naga	2047,20,5000,0,0
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
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index ebefaff48..b7a4bd492 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -1,34 +1,35 @@
-//===== rAthena Script =======================================
-//= New Novice Training Grounds
+//===== Hercules Script ======================================
+//= Renewal Novice Training Grounds
 //===== By: ==================================================
 //= Kisuka
 //===== Current Version: =====================================
-//= 1.4a
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 1.5
 //===== Description: =========================================
-//= New Novice Training Grounds
-//= [Hand Scripted (No Programs or AEGIS Scripts)]
+//= [Official Conversion]
+//= A tutorial for new players starting at new_1-1 (53,111).
+//=
+//= This script was replaced by the Izlude Academy in 2012.
 //===== Additional Comments: =================================
-//= 1.0 First version. [Kisuka]
+//= 1.0 First version, hand scripted from iRO. [Kisuka]
 //= 1.1 Updated warps, savepoints, NPC locations. [Kisuka]
 //= 1.2 Cleaning. [Euphy]
 //= 1.3 Fixed Eden Group Officer's level requirement. [Joseph]
 //= 1.4 Fixed checkquest to check quest accordingly. [Joseph]
 //= 1.4a Added 'npcskill' command. [Euphy]
+//= 1.5 Replaced with the official kRO scripts. [Euphy]
 //============================================================
 
-// Sprakki (Stard of Novice Training Ground, Outside Castle)
+// Main NPCs
 //============================================================
-new_1-1,53,114,4	script	Sprakki#nv1	90,{
-	if(job_novice_q < 1) {
+-	script	Sprakki#newbe01::NvSprakkiA	-1,{
+	if (job_novice_q == 0) {
 		mes "[Sprakki]";
 		mes "Hello there! Welcome to the World of Ragnarok Online. My name is Sprakki and I'm in charge of giving you basic gameplay tips.";
 		mes "Click on the [Next] button or press [Enter] to continue.";
 		next;
 		mes "[Sprakki]";
 		mes "First you need to learn the very basics of controlling your character.";
-		mes "All the basic ^4A4AFFmoves, selection of items, and attacks^000000 use the ^4A4AFFleft click of the mouse^000000.";
+		mes "All the basic ^4d4dffmoves, selection of items, and attacks^000000 use the ^4d4dff left click of the mouse^000000.";
 		next;
 		cutin "tutorial01",3;
 		mes "-! Info !-";
@@ -40,11 +41,11 @@ new_1-1,53,114,4	script	Sprakki#nv1	90,{
 		mes "First off, try moving around.";
 		mes "Do you see that wooden bridge to the right?";
 		next;
-		setquest 7117;
-		set job_novice_q,1;
 		mes "[Sprakki]";
 		mes "Walk over that bridge and there's a castle used as the Training Center.";
 		mes "I will be waiting for you inside of that Castle. Please come to the castle by yourself.";
+		set job_novice_q,1;
+		setquest 7117;
 		next;
 		cutin "tutorial02",3;
 		mes "-! Info !-";
@@ -55,30 +56,43 @@ new_1-1,53,114,4	script	Sprakki#nv1	90,{
 		mes "I will wait inside the Training Center across the bridge.";
 		next;
 		mes "-! Info !-";
-		mes "You can open the Quest Info Window by pressing the ^4A4AFFALT + U^000000 keys at the same time.";
+		mes "You can open the Quest Info Window by pressing the ^4d4dffAlt + U^000000 keys at the same time.";
 		next;
 		cutin "",255;
 		mes "[Sprakki]";
 		mes "Have you checked the Quest Info Window?";
 		mes "I'll be waiting in the castle across the bridge.";
+		close2;
+		cutin "",255;
+		end;
+	} else if (job_novice_q == 1) {
+		mes "[Sprakki]";
+		mes "I will be waiting for you across the Bridge to the east.";
+		close;
+	} else {
+		mes "[Sprakki]";
+		mes "Are you lost?";
+		mes "Have you gone beyond the bridge to the east?";
+		mes "I will guide you further after we meet in the Training Center.";
 		close;
 	}
-	mes "[Sprakki]";
-	mes "I will be waiting for you across the Bridge to the east.";
-	close;
 }
+new_1-1,53,114,3	duplicate(NvSprakkiA)	Sprakki#nv1a	4_F_01
+new_2-1,53,114,3	duplicate(NvSprakkiA)	Sprakki#nv2a	4_F_01
+new_3-1,53,114,3	duplicate(NvSprakkiA)	Sprakki#nv3a	4_F_01
+new_4-1,53,114,3	duplicate(NvSprakkiA)	Sprakki#nv4a	4_F_01
+new_5-1,53,114,3	duplicate(NvSprakkiA)	Sprakki#nv5a	4_F_01
 
-// Sprakki (Inside Castle)
-//============================================================
-new_1-2,100,29,4	script	Sprakki#nv2	90,{
-	if(job_novice_q < 1) {
+-	script	Sprakki#newbe05::NvSprakkiB	-1,{
+	if (job_novice_q == 0) {
 		mes "[Sprakki]";
-		mes "Hello there! Welcome to the World of Ragnarok Online. My name is Sprakki and I'm in charge of giving you basic gameplay tips.";
-		mes "Click on the [Next] button or press [Enter] to continue.";
+		mes "Hello there! Welcome to the World of Ragnarok Online.";
+		mes "My name is Sprakki and I'm in charge of giving you basic gameplay tips.";
+		mes "Click on the [Next] button or press [Enter] key to continue.";
 		next;
 		mes "[Sprakki]";
 		mes "First you need to learn the very basics of controlling your character.";
-		mes "All the basic ^4A4AFFmoves, selection of items, and attacks^000000 use the ^4A4AFFleft click of the mouse^000000.";
+		mes "All the basic ^4d4dffmoves, selection of items, and attacks^000000 use the ^4d4dff left click of the mouse^000000.";
 		next;
 		cutin "tutorial01",3;
 		mes "-! Info !-";
@@ -86,133 +100,247 @@ new_1-2,100,29,4	script	Sprakki#nv2	90,{
 		mes "Attacking monsters and conversations with the people of this world can be done by simply clicking on them.";
 		next;
 		cutin "",255;
-		setquest 7117;
-		set job_novice_q,1;
 		mes "[Sprakki]";
 		mes "Well then, I will give you a quest to talk to me.";
 		mes "After the conversation is over, talk to me again by left-clicking on me.";
+		set job_novice_q,1;
+		setquest 7117;
 		next;
 		cutin "tutorial02",3;
 		mes "-! Info !-";
 		mes "You've received a quest from Sprakki.";
-		mes "You can check the contents of the quest in the Quest Info Window by pressing the ^4A4AFFAlt + U^000000 keys at the same time.";
+		mes "You can check the contents of the quest in the Quest Info Window by pressing the ^4d4dffAlt + U^000000 keys at the same time.";
 		next;
 		cutin "",255;
 		mes "[Sprakki]";
 		mes "Have you checked the Quest Info Window?";
 		mes "Well, talk to me again.";
 		close;
-	}
-	if(job_novice_q == 1) {
-		getexp 300,0;
-		getexp 300,5;
-		completequest 7117;
-		set job_novice_q,2;
+	} else if (job_novice_q < 3) {
+		if (job_novice_q == 1) {
+			mes "[Sprakki]";
+			mes "Great!";
+			mes "Now you know how to move and talk to others, right?";
+			set job_novice_q,2;
+			getexp 600,5;
+			completequest 7117;
+			next;
+		}
+		mes "[Sprakki]";
+		mes "The Training Center is prepared for novices just like you.";
+		mes "You are going to be trained to get used to the basics of the Game.";
+		next;
 		mes "[Sprakki]";
-		mes "Great!";
-		mes "Now you know how to move and talk to others, right?";
+		mes "Of course, this Training Process is optional, if you want to go straight to town, that's also fine.";
+		mes "But, you will miss all the advantages you can get in the Training Center.";
 		next;
+		switch(select("Begin Training.:Start the game right away.")) {
+		case 1:
+			mes "[Sprakki]";
+			mes "I will guide you to the Novice Training Center.";
+			mes "Inside, Instructor 'Brade' will be waiting to speak to you.";
+			next;
+			mes "[Sprakki]";
+			mes "Instructor 'Brade' will help you afterwards.";
+			mes "Please, Go see him.";
+			setquest 7118;
+			next;
+			mes "^4d4dff- You received a quest 'Novice Training Ground -1' from Sprakki.";
+			mes "Please check the Quest Info Window. -^000000";
+			close2;
+			savepoint strnpcinfo(4),100,100;
+			warp strnpcinfo(4),100,100;
+			end;
+		case 2:
+			set nov_1st_cos,0;
+			set nov_2nd_cos,0;
+			set nov_3_swordman,0;
+			set nov_3_archer,0;
+			set nov_3_thief,0;
+			set nov_3_magician,0;
+			set nov_3_acolyte,0;
+			set nov_3_merchant,0;
+			mes "[Sprakki]";
+			mes "Ok, You want to start right away.";
+			mes "Which Town do you want to start at?";
+			next;
+			set .@select, select("Prontera:Morroc:Geffen:Payon:Alberta:Izlude");
+			mes "[Sprakki]";
+			mes "I see.";
+			mes "Go ahead and grow stronger! Look toward a brighter future ahead of you.";
+			callfunc "F_NvErase";
+			close2;
+			switch(.@select) {
+			case 1:
+				savepoint "prontera",273,354;
+				warp "prontera",273,354;
+				break;
+			case 2:
+				savepoint "morocc",160,94;
+				warp "morocc",160,94;
+				break;
+			case 3:
+				savepoint "geffen",120,100;
+				warp "geffen",120,100;
+				break;
+			case 4:
+				savepoint "payon",70,100;
+				warp "payon",70,100;
+				break;
+			case 5:
+				savepoint "alberta",116,57;
+				warp "alberta",116,57;
+				break;
+			case 6: // Old coordinates: (94,103)
+				savepoint "izlude",128,98;
+				warp "izlude",128,98;
+				break;
+			}
+			end;
+		}
+	} else {
+		mes "[Sprakki]";
+		mes "These are the Novice Training Grounds.";
+		mes "I will guide you to the Novice Training Center.";
+		close2;
+		savepoint strnpcinfo(4),100,100;
+		warp strnpcinfo(4),100,100;
+		end;
 	}
-	mes "[Sprakki]";
-	mes "The training Center is prepared for novices just like you.";
-	mes "You are going to be trained to get used to the basics of the Game.";
-	next;
-	select("Begin Training.");
-	mes "[Sprakki]";
-	mes "I will guide you to the Novice Training Center.";
-	mes "Inside, Instructor 'Brade' will be waiting to speak to you.";
-	next;
-	setquest 7118;
-	set job_novice_q,3;
-	mes "[Sprakki]";
-	mes "Instructor 'Brade' will help you afterwards.";
-	mes "Please, Go see him.";
-	next;
-	mes "^4A4AFF- You received a quest 'Novice Training Ground-1' from Sprakki.^000000";
-	mes "^4A4AFFPlease check the Quest Info Window.-^000000";
-	close2;
-	savepoint "new_1-2",100,100;
-	warp "new_1-2",100,100;
-	end;
 }
+new_1-2,100,29,4	duplicate(NvSprakkiB)	Sprakki#nv1b	4_F_01
+new_2-2,100,29,4	duplicate(NvSprakkiB)	Sprakki#nv2b	4_F_01
+new_3-2,100,29,4	duplicate(NvSprakkiB)	Sprakki#nv3b	4_F_01
+new_4-2,100,29,4	duplicate(NvSprakkiB)	Sprakki#nv4b	4_F_01
+new_5-2,100,29,4	duplicate(NvSprakkiB)	Sprakki#nv5b	4_F_01
 
-// Instructor Brade
-//============================================================
-new_1-2,100,105,4	script	Brade#nv	733,{
-	if(job_novice_q < 3) {
+-	script	Brade#newbe02::NvBradeA	-1,{
+	if (job_novice_q < 2) {
 		mes "[Instructor Brade]";
-		mes "How did you get here?";
-		close2;
-		warp "new_1-1",53,111;
-		end;
-	}
-	else if(job_novice_q == 3) {
-		getexp 300,0;
-		getexp 300,0;
-		getexp 300,10;
-		completequest 7118;
-		set job_novice_q,4;
+		mes "Hello there! Welcome to the World of Ragnarok Online.";
+		mes "You have participated on the previous Training Grounds.";
+		mes "The Training Grounds have now come under new management.";
+		next;
 		mes "[Instructor Brade]";
-		mes "Great.";
-		mes "You've completed the given quest successfully, so I will reward you with experience points.";
+		mes "I guess we will just have to start your training all over again.";
 		next;
 		mes "[Instructor Brade]";
-		mes "Experience Points you've earned from hunting or finishing quests can be checked by tracking the EXP Bar, located at the upper-left side of the display.";
+		mes "My name is Instructor Brade and I'm in charge of giving you basic gameplay tips.";
+		mes "Click on the [Next] button or press [Enter] to continue.";
 		next;
 		mes "[Instructor Brade]";
-		mes "Sigh... I will just talk roughly.";
-		mes "...I just can't get used to";
-		mes "'politeness' you know.";
-		mes "Don't look at me like that!";
+		mes "First you need to learn the very basics of controlling your character.";
+		mes "All the basic ^4d4dff moves, selection of items, and attacks^000000 use the ^4d4dff left click of the mouse^000000.";
+		next;
+		cutin "tutorial01",3;
+		mes "-! Info !-";
+		mes "Click on the ground to move the character.";
+		mes "Attacking monsters and conversations with the people of this world can be done by simply clicking on them.";
+		next;
+		cutin "",255;
 		next;
 		mes "[Instructor Brade]";
-		mes "Ok look alive you maggot.";
-		mes "Next up is items and equipment.";
+		mes "First off, try moving around.";
+		mes "After moving around, talk to me again.";
+		set nov_1st_cos,0;
+		set nov_2nd_cos,0;
+		set nov_3_swordman,0;
+		set nov_3_archer,0;
+		set nov_3_thief,0;
+		set nov_3_magician,0;
+		set nov_3_acolyte,0;
+		set nov_3_merchant,0;
+		set treasure_alb,0;
+		set job_novice_q,2;
+		setquest 7118;
 		next;
+		cutin "tutorial02",3;
+		mes "-! Info !-";
+		mes "You've received a quest from Instructor Brade.";
+		mes "You can check the contents of the quest in the Quest Info Window.";
+		next;
+		mes "-! Info !-";
+		mes "You can open the Quest Info Window by pressing the ^4d4dffAlt + U^000000keys at the same time.";
+		next;
+		cutin "",255;
 		mes "[Instructor Brade]";
-		mes "First, take these.";
-		mes "These are very basic equipments and recovery potions.";
-		getitem 2352,1;	// Novice_Plate
-		getitem 2510,1;	// Novice_Hood
-		getitem 2414,1;	// Novice_Boots
-		getitem 5055,1;	// Novice_Egg_Cap
-		getitem 1243,1;	// Novice_Knife
-		getitem 2112,1;	// Novice_Guard
-		getitem 569,300;	// Novice_Potion
+		mes "Have you checked the Quest Info Window?";
+		mes "Well, talk to me again.";
+		close;
+	} else if (job_novice_q < 4) {
+		if (job_novice_q == 2) {
+			mes "[Instructor Brade]";
+			mes "Great.";
+			mes "You've completed the given quest successfully, so I will reward you with experience points.";
+			set job_novice_q,3;
+			getexp 900,10;
+			completequest 7118;
+			next;
+			mes "[Instructor Brade]";
+			mes "Experience Points you've earned from hunting or finishing quests can be checked by tracking the EXP Bar, located at upper-left side of the display.";
+			next;
+			mes "[Instructor Brade]";
+			mes "Sigh... I will just talk roughly.";
+			mes "...I just can't get used to 'politeness' you know.";
+			mes "Don't look at me like that!";
+			next;
+			mes "[Instructor Brade]";
+			mes "Ok look alive you maggot.";
+			mes "Next up is items and equipment.";
+			next;
+			mes "[Instructor Brade]";
+			mes "First, take these.";
+			mes "These are very basic equipments and recovery potions.";
+		} else {
+			mes "[Instructor Brade]";
+			mes "Uh... Where were we? Oh right, let's continue.";
+			mes "It's about items and equipments.";
+			next;
+			mes "[Instructor Brade]";
+			mes "Take these.";
+			mes "Basic equipments and recovery potions.";
+		}
+		set job_novice_q,4;
+		getitem 2352,1; //Novice_Plate
+		getitem 2510,1; //Novice_Hood
+		getitem 2414,1; //Novice_Boots
+		getitem 5055,1; //Novice_Egg_Cap
+		getitem 1243,1; //Novice_Knife
+		getitem 2112,1; //Novice_Guard
+		getitem 569,300; //Novice_Potion
 		setquest 7119;
-		set job_novice_q,5;
 		next;
 		mes "[Instructor Brade]";
-		mes "In the upper left Basic Info Window, press the 'Item' icon to open the Item Window.";
-		mes "The item window has 3 sections...";
+		mes "In the upper left Basic Info. Window, press the 'Item' icon to open the Item Window.";
+		mes "The item window is divided into...";
 		next;
 		mes "[Instructor Brade]";
-		mes "Consumable items, equipment, and other items.";
-		mes "If you want to use or equip items, double-click on the item or drag them into the Equipment Window.";
+		mes "3 sections: consumable items, equipment and other items.";
+		mes "If you want to use or equip items, just double-click on the item or drag them into the Equipment Window.";
 		next;
 		mes "[Instructor Brade]";
-		mes "You can see detailed info of each item by right-clicking on the item.";
-		mes "Do that and the info will pop-up in a separate window.";
+		mes "You can see detailed info. of each item by right-clicking on the item.";
+		mes "Detailed information of the item will pop up.";
 		next;
 		cutin "tutorial04",3;
 		mes "!- Info -!";
-		mes "Double-click on the item to see the detailed information.";
+		mes "Right-click on an item to see detailed information about it.";
 		next;
 		mes "!- Info -!";
-		mes "Right-click on other players to show the Community Menu and you can join a party, request trades, etc.";
+		mes "Right-click on other players to show the Community Menu and you can join a party, or request trade with a player etc.";
 		next;
 		cutin "",255;
 		mes "[Instructor Brade]";
 		mes "Why don't you equip the items I gave you earlier?";
-		mes "^4A4AFFDouble-Click^000000 on the item you want to equip. Let us continue after you are done gearing up.";
+		mes "^4d4dffDouble-Click^000000 on the item you want to equip. Let us continue after you are done gearing up.";
 		next;
 		cutin "tutorial03",3;
 		mes "!- Info -!";
-		mes "Items can be easily equipped or used by simply clicking on them.";
-		mes "The Hot Key to open the Item Window is Alt + E.";
+		mes "Items can be easily equipped or used by simply double-clicking on them.";
+		mes "The Hot Key to open the Inventory Window is ALT + E.";
 		next;
 		mes "!- Info -!";
-		mes "To check on the items that are currently equipped, use the hot key Alt + Q.";
+		mes "To check on the items that are currently equipped, use the Hot Key ALT + Q.";
 		mes "Or, drag the item on to the item slot you want the item to be equipped.";
 		next;
 		mes "!- Info -!";
@@ -220,139 +348,71 @@ new_1-2,100,105,4	script	Brade#nv	733,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if(job_novice_q == 4) {
+	} else if (job_novice_q == 4) {
+		if (isequipped(2414) + isequipped(2352) + isequipped(2510) + isequipped(2112) + isequipped(1243) < 4) {
+			mes "[Instructor Brade]";
+			mes "Try to put on at least 4 of the equipments I gave you.";
+			mes "Put those shoes on, wear those clothes, and arm yourself with that weapon you maggot.";
+			close;
+		}
 		mes "[Instructor Brade]";
-		mes "Uh... Where were we? Oh right, let's continue.";
-		mes "It's about items and equipments.";
+		mes "You are all set.";
+		mes "You are coming along just fine.";
+		set job_novice_q,5;
+		getexp 1200,15;
+		getitem 12323,50; //N_Fly_Wing
+		getitem 12324,20; //N_Butterfly_Wing
+		completequest 7119;
 		next;
 		mes "[Instructor Brade]";
-		mes "Take these.";
-		mes "Basic equipments and recovery potions.";
-		getitem 2352,1;	// Novice_Plate
-		getitem 2510,1;	// Novice_Hood
-		getitem 2414,1;	// Novice_Boots
-		getitem 5055,1;	// Novice_Egg_Cap
-		getitem 1243,1;	// Novice_Knife
-		getitem 2112,1;	// Novice_Guard
-		getitem 569,300;	// Novice_Potion
-		setquest 7119;
-		set job_novice_q,5;
+		mes "Here's some Fly Wings and Butterfly Wings as a reward.";
+		mes "You don't need these in the Training Ground, but they will come in handy later.";
 		next;
 		mes "[Instructor Brade]";
-		mes "In the upper left Basic Info Window, press the 'Item' icon to open the Item Window.";
-		mes "The item window is divided into...";
+		mes "Next, are Hot Keys.";
+		mes "Press the ^4d4dffF12 key^000000 on your keyboard.";
+		mes "A box with 9 slots will pop up.";
 		next;
 		mes "[Instructor Brade]";
-		mes "3 sections: consumable items, equipment and other items.";
-		mes "If you want to use or equip items, double-click on the item or drag them into the Equipment Window.";
+		mes "Drag on the right corner of the Hot Key Window and you will be able to see the other pages of the Hot Key.";
 		next;
 		mes "[Instructor Brade]";
-		mes "You can see detailed info of each item by right-clicking on the item.";
-		mes "Do that and the info will pop-up in a separate window.";
+		mes "The F1 to F9 keys are the designated hotkeys.";
+		mes "Just drag a skill or an item onto the Hot Key Window and press a corresponding key to use them right away.";
 		next;
-		cutin "tutorial04",3;
+		cutin "tutorial05",3;
 		mes "!- Info -!";
-		mes "Double-click on the item to see the detailed information.";
+		mes "You can register a skill or an item to the Hot Key Window by just dragging them onto the Hot Key Slot.";
 		next;
 		mes "!- Info -!";
-		mes "Right-click on other players to show the Community Menu and you can join a party, request trades, etc.";
-		next;
-		cutin "",255;
-		mes "[Instructor Brade]";
-		mes "Why don't you equip the items I gave you earlier?";
-		mes "^4A4AFFDouble-Click^000000 on the item you want to equip. Let us continue after you are done gearing up.";
+		mes "Registered Skills or Items can be used/equipped by just pressing the corresponding key.";
 		next;
-		cutin "tutorial03",3;
 		mes "!- Info -!";
-		mes "Items can be easily equipped or used by simply clicking on them.";
-		mes "The Hot Key to open the Item Window is Alt + E.";
+		mes "You can customize the Hot Key to use any keys you please as the Hot Key by changing the Shortcut configuration in the options menu.";
 		next;
 		mes "!- Info -!";
-		mes "To check on the items that are currently equipped, use the hot key Alt + Q.";
-		mes "Or, drag the item on to the item slot you want the item to be equipped.";
+		mes "Register skills and items that you use often so that you can use them easily.";
 		next;
-		mes "!- Info -!";
-		mes "Equip all of the equipment given by Instructor Brade.";
-		close2;
 		cutin "",255;
-		end;
-	}
-	else if(job_novice_q == 5 || job_novice_q == 6) {
-		for(set .@i,1; .@i<7; set .@i,.@i+1)
-			if (getequipisequiped(.@i)) set .@EquipCheck, .@EquipCheck+1;
-		if(.@EquipCheck >= 4) {
-			if(job_novice_q == 5) {
-				mes "[Instructor Brade]";
-				mes "You are all set.";
-				mes "You are coming along just fine.";
-				getexp 300,0;
-				getexp 300,0;
-				getexp 300,0;
-				getexp 300,15;
-				getitem 12323,50;	// N_Fly_Wing
-				getitem 12324,20;	// N_Butterfly_Wing
-				completequest 7119;
-				set job_novice_q,6;
-				next;
-				mes "[Instructor Brade]";
-				mes "Here's some Fly Wings and Butterfly Wings as a reward.";
-				mes "You don't need these in the Training Ground, but they will come in handy later.";
-				next;
-			}
-			mes "[Instructor Brade]";
-			mes "Next, are Hot Keys.";
-			mes "Press the ^4A4AFF12 key^000000 on your keyboard.";
-			mes "A box with 9 slots will pop up.";
-			next;
-			mes "[Instructor Brade]";
-			mes "Drag on the right corner of the Hot Key Window and you will be able to see the other pages of the Hot Key.";
-			next;
-			mes "[Instructor Brade]";
-			mes "The F1 to F9 keys are the designated hotkeys.";
-			mes "Just drag a skill or an item onto the Hot Key Window and press a corresponding key to use them right away.";
-			next;
-			cutin "tutorial05",3;
-			mes "!- Info -!";
-			mes "You can register a skill or an item to the Hot Key Window by just dragging them onto the Hot Key Slot.";
-			next;
-			mes "!- Info -!";
-			mes "Registered Skills or Items can be used/equipped by just pressing the corresponding key.";
-			next;
-			mes "!- Info -!";
-			mes "You can customize the Hot Key to use any keys you please as the Hot Key by changing the Shortcut configuration in the options menu.";
-			next;
-			mes "!- Info -!";
-			mes "Register skills and items that you use often so that you can use them easily";
-			next;
-			cutin "",255;
-			mes "[Instructor Brade]";
-			mes "The last part is how to use Skills.";
-			mes "But before that, you need to learn something first.";
-			next;
-			setquest 7120;
-			set job_novice_q,7;
-			mes "[Instructor Brade]";
-			mes "Somewhere in this room, there's someone named ^4A4AFFJinha^000000.";
-			mes "Find Jinha and learn the ^4A4AFF[First Aid]^000000 skill from him.";
-			next;
-			mes "[Instructor Brade]";
-			mes "Your lesson is after that.";
-			mes "Go find Jinha and learn the [First Aid] Skill. Then come back to me.";
-			close;
-		}
 		mes "[Instructor Brade]";
-		mes "Try to put on at least 4 of the equipment I gave you.";
-		mes "Put those shoes on, wear those clothes, and arm yourself with that weapon you maggot.";
+		mes "The last part is how to use Skills.";
+		mes "But before that, you need to learn something first.";
+		next;
+		mes "[Instructor Brade]";
+		mes "Somewhere in this room, there's someone named ^4d4dffJinha^000000.";
+		mes "Find Jinha and learn the ^4d4dff[First Aid]^000000 skill from him.";
+		setquest 7120;
+		next;
+		mes "[Instructor Brade]";
+		mes "Your lesson is after that.";
+		mes "Go find Jinha and learn the [First Aid] Skill. Then come back to me.";
 		close;
-	}
-	else if(job_novice_q == 7) {
+	} else if (job_novice_q == 5) {
 		mes "[Instructor Brade]";
-		mes "Somewhere in this room, there's someone named ^4A4AFFJinha^000000.";
-		mes "Find Jinha and learn the ^4A4AFF[First Aid]^000000 skill from him.";
+		mes "Somewhere in this room, there's someone named ^4d4dffJinha^000000.";
+		mes "Find Jinha and learn the ^4d4dff[First Aid]^000000 skill from him.";
 		close;
-	}
-	else if(job_novice_q == 8) {
+	} else if (job_novice_q == 6) {
 		mes "[Instructor Brade]";
 		mes "Now you've learned the [First Aid] Skill.";
 		mes "Just as I told you before, by registering the First Aid Skill onto the Hot Key Window, you can use the skill fast and easy.";
@@ -368,43 +428,64 @@ new_1-2,100,105,4	script	Brade#nv	733,{
 		next;
 		mes "[Instructor Brade]";
 		mes "You've come along fine this far.";
-		mes "This is not much, but that this as a reward.";
-		getitem 2393,1;	// N_Adventurer's_Suit
+		mes "This is not much, but take this as a reward.";
+		set job_novice_q,7;
+		getitem 2393,1; //N_Adventurer's_Suit
 		completequest 7120;
-		set job_novice_q,9;
 		close;
-	}
-	else if(job_novice_q > 8) {
+	} else if (job_novice_q == 7) {
 		mes "[Instructor Brade]";
 		mes "Next step of the Training is done in the room west of here.";
 		mes "If you are lost, I can send you there.";
 		next;
-		if(select("I can get there by myself.:Please, send me to the next room.") == 2) {
+		switch(select("I can get there by myself.:Please, send me to the next room.")) {
+		case 1:
+			mes "[Instructor Brade]";
+			mes "Good. That's the attitude you must have.";
+			mes "You can't just lean on others to help you.";
+			mes "Now, go ahead.";
+			close;
+		case 2:
 			mes "[Instructor Brade]";
 			mes "Oh well.";
 			mes "I think it's better than seeing you lost and wandering about.";
 			mes "Hahahaha...";
 			close2;
-			warp "new_1-2",41,172;
+			warp strnpcinfo(4),41,172;
 			end;
 		}
+	} else {
 		mes "[Instructor Brade]";
-		mes "Good. That's the attitude you must have.";
-		mes "You can't just lean on others to help you.";
-		mes "Now, go ahead.";
-		close;
+		mes "Aren't you done with the courses here?";
+		mes "Or are you just lost?";
+		next;
+		switch(select("Send me to the Combat Training Ground.:I want to go to town.")) {
+		case 1:
+			mes "[Instructor Brade]";
+			mes "Sure.";
+			mes "Be careful not to be lost again.";
+			close2;
+			warp "new_"+charat(strnpcinfo(4),4)+"-3",96,21;
+			end;
+		case 2:
+			mes "[Instructor Brade]";
+			mes "Town... Eh?";
+			mes "In that case, I will send you to where the Kafra Employee is at.";
+			mes "Use ^4d4dffKafra's Warp Service^000000 to go to town.";
+			close2;
+			warp strnpcinfo(4),41,172;
+			end;
+		}
 	}
-	mes "[Instructor Brade]";
-	mes "Why are you still here?";
-	close2;
-	warp "prontera",156,90;
-	end;
 }
+new_1-2,100,105,3	duplicate(NvBradeA)	Brade#nv1a	4_M_JOB_KNIGHT1
+new_2-2,100,105,3	duplicate(NvBradeA)	Brade#nv2a	4_M_JOB_KNIGHT1
+new_3-2,100,105,3	duplicate(NvBradeA)	Brade#nv3a	4_M_JOB_KNIGHT1
+new_4-2,100,105,3	duplicate(NvBradeA)	Brade#nv4a	4_M_JOB_KNIGHT1
+new_5-2,100,105,3	duplicate(NvBradeA)	Brade#nv5a	4_M_JOB_KNIGHT1
 
-// Instructor Jinha
-//============================================================
-new_1-2,115,120,4	script	Jinha#nv	59,{
-	if(job_novice_q < 7) {
+-	script	Jinha#newbe03::NvJinha	-1,{
+	if (job_novice_q < 5) {
 		mes "[Jinha]";
 		mes "What can I help you with?";
 		mes "Hmm? You haven't followed the curriculum correctly.";
@@ -412,99 +493,168 @@ new_1-2,115,120,4	script	Jinha#nv	59,{
 		mes "[Jinha]";
 		mes "You have to see Instructor Brade first before me. I will send you to Instructor Brade.";
 		close2;
-		warp "new_1-2",100,100;
+		warp strnpcinfo(4),100,100;
 		end;
-	}
-	else if(job_novice_q == 7) {
-		mes "[Jinha]";
-		mes "Hello!";
-		mes "How can I help you?";
-		next;
-		select("I want to learn the use the [First Aid] Skill.");
-		mes "[Jinha]";
-		mes "That's right.";
-		mes "First Aid is the skill used to convert SP into HP when you are in danger.";
-		next;
-		specialeffect2 58;
-		specialeffect2 234;
-		mes "[Jinha]";
-		mes "It's recovery amount is small.";
-		mes "Still, it will help you not to faint from a critical hit.";
-		next;
-		skill "NV_FIRSTAID",1,0;	// NV_FIRSTAID
-		set job_novice_q,8;
-		mes "[Jinha]";
-		mes "You can open the Skill Window by pressing the ^4A4AFFskill^000000 button in the Basic Window.";
-		mes "Hot Key is ^4A4AFFALT + S^000000.";
-		mes "Why don't you try the skill?";
-		next;
-		mes "[Jinha]";
-		mes "Good, now you know how to use the First Aid Skill, you have to move on to the next step.";
-		mes "Go back to Instructor Brade and show him what you've learned here.";
-		close;
-	}
-	else if(job_novice_q == 8) {
+	} else if (job_novice_q == 5) {
+		if (getskilllv("NV_FIRSTAID") > 0) {
+			mes "[Jinha]";
+			mes "Hello!";
+			mes "I am responsible for teaching you the [First Aid] skill.";
+			mes "Instructor Brade asked you to learn it right?.";
+			next;
+			mes "[Jinha]";
+			mes "Wow... ...it's amazing!";
+			mes "You already know the First Aid Skill.";
+			mes "There doesn't seem to be anything for me to teach you.";
+			next;
+			mes "[Jinha]";
+			mes "Great. Was your instructor from the previous management Cecil?";
+			mes "Well, you have learned First Aid, I can confirm that.";
+			next;
+			mes "[Jinha]";
+			mes "Well, you can directly go to the next step of the course.";
+			mes "Go back to Instructor Brade.";
+			set job_novice_q,6;
+			close;
+		} else {
+			mes "[Jinha]";
+			mes "Hello!";
+			mes "How can I help you?";
+			next;
+			select("I want to learn to use the [First Aid] Skill.");
+			mes "[Jinha]";
+			mes "That's right.";
+			mes "First Aid is the skill used to convert SP into HP when you are in danger.";
+			next;
+			mes "[Jinha]";
+			mes "It's recovery amount is small.";
+			mes "Still, it will help you not to faint from a critical hit.";
+			specialeffect2 EF_BEGINSPELL6;
+			specialeffect2 EF_SPELLBREAKER;
+			next;
+			mes "[Jinha]";
+			mes "You can open the Skill Window by pressing the ^4d4dffskill^000000 button in the Basic Window.";
+			mes "Hot Key is ^4d4dffALT + S^000000.";
+			mes "Why don't you try the skill?";
+			skill "NV_FIRSTAID",1,0;
+			set skill_nov,3; // Has future uses - do not remove! [Euphy]
+			set job_novice_q,6;
+			next;
+			mes "[Jinha]";
+			mes "Good, now you know how to use the First Aid Skill, you have to move on to the next step.";
+			mes "Go back to Instructor Brade and show him what you've learned here.";
+			close;
+		}
+	} else if (job_novice_q == 6) {
 		mes "[Jinha]";
 		mes "Didn't you learn the First Aid Skill already?";
 		mes "Have it checked by Instructor Brade.";
 		mes "If you don't know how to get to him, I will send you to him.";
 		next;
-		if(select("I'm good by myself.:Please, send me to him.") == 2) {
+		switch(select("I'm good by myself.:Please, send me to him.")) {
+		case 1:
+			mes "[Jinha]";
+			mes "Very Good!";
+			mes "That's the right attitude!";
+			mes "You will be a great adventurer in the future.";
+			close;
+		case 2:
 			mes "[Jinha]";
 			mes "I will send you to Instructor Brade.";
 			close2;
-			warp "new_1-2",100,100;
+			warp strnpcinfo(4),100,100;
 			end;
 		}
-		mes "[Jinha]";
-		mes "Very Good!";
-		mes "That's the right attitude!";
-		mes "You will be a great adventurer in the future.";
-		close;
-	}
-	else if(job_novice_q > 8) {
+	} else {
 		mes "[Jinha]";
 		mes "What can I do for you?";
 		mes "Next course will be continued in the West Room.";
-		mes "Go on to the west room.";
+		mes "Go on into the west room.";
 		close;
 	}
-	mes "[Jinha]";
-	mes "Why are you still here?";
-	close2;
-	warp "prontera",156,90;
-	end;
 }
+new_1-2,115,120,3	duplicate(NvJinha)	Jinha#nv1	1_M_ORIENT01
+new_2-2,115,120,3	duplicate(NvJinha)	Jinha#nv2	1_M_ORIENT01
+new_3-2,115,120,3	duplicate(NvJinha)	Jinha#nv3	1_M_ORIENT01
+new_4-2,115,120,3	duplicate(NvJinha)	Jinha#nv4	1_M_ORIENT01
+new_5-2,115,120,3	duplicate(NvJinha)	Jinha#nv5	1_M_ORIENT01
 
 // People/Services in Ragnarok
 //============================================================
-// ---------- Chocolat ----------
-new_1-2,32,172,4	script	Chocolat#nv	96,{
-	if(job_novice_q < 9) {
+-	script	Chocolat#newbe06::NvChocolat	-1,{
+	if (job_novice_q < 7) {
 		mes "[Chocolat]";
 		mes "Hmm? Strange.";
 		mes "Let me see that Trainee ID for a sec.";
 		next;
-		mes "[Chocolat]";
-		mes "You were still on the basic course.";
-		mes "You should go back to Instructor Brade or Jinha.";
-		next;
-		mes "[Chocolat]";
-		mes "If you don't know how to find them, I can send you to Instructor Brade, How about it?";
-		next;
-		if(select("I will go myself.:Will you do that for me?") == 2) {
+		if (job_novice_q < 2) {
 			mes "[Chocolat]";
-			mes "Sure.";
-			mes "I will see you later.";
-			close2;
-			warp "new_1-2",100,100;
-			end;
+			mes "Oh, really...";
+			mes "You have participated on the previous Training Grounds.";
+			mes "The Training Grounds have now come under new management.";
+			next;
+			mes "[Chocolat]";
+			mes "If you want to do the basic course,";
+			mes "you should go back to Instructor Brade.";
+			next;
+			mes "[Chocolat]";
+			mes "Or you can go ahead and start with theory training.";
+			mes "What would you like to do?";
+			next;
+			switch(select("Send me to Basic Training.:Start Theory Training.")) {
+			case 1:
+				mes "[Chocolat]";
+				mes "Sure.";
+				mes "I will send you to Instructor Brade.";
+				mes "Instructor Brade will start your basic training.";
+				close2;
+				warp strnpcinfo(4),100,100;
+				end;
+			case 2:
+				mes "[Chocolat]";
+				mes "I will tell you about the people you will be seeing in Town.";
+				mes "There are many kinds of people in town and some of them will be helpful to know.";
+				next;
+				mes "[Chocolat]";
+				mes "There are a lot of people in town, but among them, these people are the most important to know.";
+				next;
+				mes "[Chocolat]";
+				mes "They are [Kafra] Employee's standing right behind me and their rival company the [Cool Event Corp].";
+				mes "When you visit a town for the first time, you should talk to the Information [Guide]";
+				next;
+				mes "[Chocolat]";
+				mes "Well then, let's hear from each of them.";
+				mes "Start by talking to the [Kafra] Employee.";
+				set job_novice_q,8;
+				setquest 7121;
+				next;
+				mes "^4d4dff- You've received a quest from Chocolat.";
+				mes "Please check the quest information window. -^000000";
+				close;
+			}
+		} else {
+			mes "[Chocolat]";
+			mes "You were still on the basic course.";
+			mes "You should go back to Instructor Brade or Jinha.";
+			next;
+			mes "[Chocolat]";
+			mes "If you don't know how to find them, I can send you to Instructor Brade, How about it?";
+			next;
+			switch(select("I will go myself.:Will you do that for me?")) {
+			case 1:
+				mes "[Chocolat]";
+				mes "Sure. Go out to the door to the right.";
+				close;
+			case 2:
+				mes "[Chocolat]";
+				mes "Sure.";
+				mes "I will see you later.";
+				close2;
+				warp strnpcinfo(4),100,100;
+				end;
+			}
 		}
-		mes "[Chocolat]";
-		mes "Sure. Go out to the door to the right.";
-		close;
-	}
-	else if(job_novice_q == 9) {
+	} else if (job_novice_q == 7) {
 		mes "[Chocolat]";
 		mes "I will tell you about the people you will be seeing in Town.";
 		mes "There are many kinds of people in town and some of them will be helpful to know.";
@@ -513,46 +663,46 @@ new_1-2,32,172,4	script	Chocolat#nv	96,{
 		mes "There are a lot of people in town, but among them, these people are the most important to know.";
 		next;
 		mes "[Chocolat]";
-		mes "They are [Kafra] Agents standing right behind me and their rival company the [Cool Event].";
-		mes "When you visit a town for the first time, you should talk to Information [Soldier].";
+		mes "They are [Kafra] Employee's standing right behind me and their rival company the [Cool Event Corp].";
+		mes "When you visit a town for the first time, you should talk to Information [Guide]";
 		next;
 		mes "[Chocolat]";
 		mes "Well then, let's hear from each of them.";
-		mes "Start by talking to the [Kafra] agent.";
+		mes "Start by talking to the [Kafra] Employee.";
+		set job_novice_q,8;
 		setquest 7121;
-		set job_novice_q,10;
 		close;
-	}
-	else if(job_novice_q == 10) {
+	} else if (job_novice_q == 8) {
 		mes "[Chocolat]";
 		mes "Here, talk to these guys standing behind me.";
-		mes "Start with the [Kafra] gal behind me.";
+		mes "Start with the [Kafra] Employee behind me.";
 		close;
-	}
-	else if(job_novice_q == 11) {
+	} else if (job_novice_q == 9) {
 		mes "[Chocolat]";
 		mes "You've learned a lot about Kafra service huh?";
-		mes "From now on, you can use the Kafra Server.";
+		mes "From now on, you can use the Kafra Service.";
+		next;
+		mes "[Chocolat]";
+		mes "During the Training Process, if you want to go straight to the town, you can use the Kafra Service to go there.";
+		mes "But, once you leave the Training Center, you can never come back here.";
 		next;
 		mes "[Chocolat]";
-		mes "Next is Kafra's rival, [Cool Event] Staff!";
-		mes "[Cool Event] Staff specialize in events.";
+		mes "Next is the Kafra's rival, [Cool Event Corp.] Staff!";
+		mes "[Cool Event Corp.] Staff specialize in events.";
 		mes "Well, why don't you talk to him yourself?";
 		close;
-	}
-	else if(job_novice_q == 12) {
+	} else if (job_novice_q == 10) {
 		mes "[Chocolat]";
-		mes "After [Kafra] and [Cool Event], are the Information [Soldier]s.";
+		mes "After [Kafra] and [Cool Event Corp.], are the Information [Guide]'s.";
 		mes "They can seem insignificant but they can help you greatly when the time comes.";
 		next;
 		mes "[Chocolat]";
-		mes "I've brought the Information Soldier from the City of Prontera.";
+		mes "I've brought the Information Guide from the City of Prontera.";
 		mes "Ask him what he actually does in town.";
 		close;
-	}
-	else if(job_novice_q == 13) {
+	} else if (job_novice_q == 11) {
 		mes "[Chocolat]";
-		mes "How was the guide of the Information [Soldier]?";
+		mes "How was the explanation of the Information [Guide]?";
 		mes "Last is about using [Inn]s.";
 		mes "There's an Inn located in each town.";
 		next;
@@ -563,16 +713,11 @@ new_1-2,32,172,4	script	Chocolat#nv	96,{
 		next;
 		mes "[Chocolat]";
 		mes "Besides these guys, there's many merchants selling various kind of items, so go check them out.";
+		set job_novice_q,12;
 		completequest 7121;
-		getexp 300,0;
-		getexp 300,0;
-		getexp 300,0;
-		getexp 300,0;
-		getexp 300,0;
-		getexp 300,20;
-		getitem 7059,20;	// Cargo_Free_Ticket
-		getitem 7060,30;	// Warp_Free_Ticket
-		set job_novice_q,14;
+		getexp 1800,20;
+		getitem 7059,20; //Cargo_Free_Ticket
+		getitem 7060,30; //Warp_Free_Ticket
 		next;
 		mes "[Chocolat]";
 		mes "You've completed all the quests I gave you.";
@@ -587,280 +732,423 @@ new_1-2,32,172,4	script	Chocolat#nv	96,{
 		mes "Real Combat Training will be given by Instructor Brade. You met him earlier.";
 		mes "I will send you to the Real Combat Training Field.";
 		close2;
-		savepoint "new_1-3",96,21;
-		warp "new_1-3",96,21;
+		set .@map$, "new_"+charat(strnpcinfo(4),4)+"-3";
+		savepoint .@map$,96,21;
+		warp .@map$,96,21;
 		end;
-	}
-	else if(job_novice_q > 13) {
+	} else {
 		mes "[Chocolat]";
-		mes "What can I do for you?";
+		mes "Are you lost?";
 		next;
-		select("");
-		mes "[Chocolat]";
-		mes "I will send you to the Real Combat Training Field right away.";
-		close2;
-		savepoint "new_1-3",96,21;
-		warp "new_1-3",96,21;
-		end;
+		switch(select("No, just looking around:Yes, send me to the Combat Training Field")) {
+		case 1:
+			mes "[Chocolat]";
+			mes "Okay, come back to me if";
+			mes "you need me to redirect you.";
+			close;
+		case 2:
+			mes "[Chocolat]";
+			mes "I will send you to the Real Combat Training Field.";
+			close2;
+			set .@map$, "new_"+charat(strnpcinfo(4),4)+"-3";
+			savepoint .@map$,96,21;
+			warp .@map$,96,21;
+			end;
+		}
 	}
-	mes "[Chocolat]";
-	mes "Why are you still here?";
-	close2;
-	warp "prontera",156,90;
-	end;
 }
+new_1-2,33,172,4	duplicate(NvChocolat)	Chocolat#nv1	4W_KID
+new_2-2,33,172,4	duplicate(NvChocolat)	Chocolat#nv2	4W_KID
+new_3-2,33,172,4	duplicate(NvChocolat)	Chocolat#nv3	4W_KID
+new_4-2,33,172,4	duplicate(NvChocolat)	Chocolat#nv4	4W_KID
+new_5-2,33,172,4	duplicate(NvChocolat)	Chocolat#nv5	4W_KID
 
-// ---------- Kafra ----------
-new_1-2,29,176,4	script	Kafra#nv	117,{
-	if(job_novice_q < 10) {
-		mes "[Kafra Agent]";
+-	script	Kafra Employee#newbe07::NvKafra	-1,{
+	if (job_novice_q < 8) {
+		mes "[Kafra Employee]";
 		mes "Hello.";
 		mes "I don't think it's my turn yet.";
 		mes "Please talk to 'Chocolat' first.";
 		close;
-	}
-	else if(job_novice_q == 10) {
-		mes "[Kafra Agent]";
+	} else if (job_novice_q == 8) {
+		mes "[Kafra Employee]";
 		mes "Hello.";
-		mes "I've been dispatched by the Kafra Head Office to help Trainees.";
-		mes "The Kafra Corporation is the world's largest company with a long and distinguished history on the Rune Midgard continent.";
+		mes "I've been dispatched by the Kafra Head Office to help trainees.";
+		mes "The Kafra Corporation is the world's largest company with a long and distinguished history on the Rune-Midgard continent.";
 		mes "It's important for you adventurers to be close with us.";
 		next;
-		mes "[Kafra Agent]";
-		mes "I will inform you about the Kafra Services which you will be using most frequently, [Save], [Storage], and [Teleport] Services.";
+		mes "[Kafra Employee]";
+		mes "I will inform you about the Kafra Services which you will be using most frequently, [Save], [Storage] and [Teleport] Services.";
 		next;
-		mes "[Kafra Agent]";
-		mes "When you talk to a Kafra Agent and ask for the Save Service, the location of where you will revive, after being defeated in battle, will be changed.";
+		mes "[Kafra Employee]";
+		mes "When you talk to a Kafra Employee and ask for the Save Service,";
+		mes "the location of where you will revive, after being defeated in battle, will be changed.";
 		next;
-		mes "[Kafra Agent]";
-		mes "Your Respawn Point is always the last place where you have saved.";
-		mes "Using a Butterfly Wing will return you to the place where you last saved.";
+		mes "[Kafra Employee]";
+		mes "Your Respawn Point is always the last place where you have saved. Using a Butterfly Wing will return you to the place where you last saved.";
 		mes "This service is free to use, so feel free to use the Save Service anytime you like.";
 		next;
-		mes "[Kafra Agent]";
-		mes "Next is the Storage Service.";
+		callsub L_Services,2; //Storage
+		next;
+		callsub L_Services,3; //Teleport
+		set job_novice_q,9;
+		next;
+		mes "[Kafra Employee]";
+		mes "Do you want to hear another explanation?";
+		next;
+		while(1) {
+			set .@select, select("About Save:About Storage:About Teleport:About Cart:No More.");
+			if (.@select == 5) {
+				mes "[Kafra Employee]";
+				mes "I hope you are satisfied with my explanation";
+				mes "about the Kafra Service.";
+				close;
+			}
+			callsub L_Services, .@select;
+			next;
+		}
+	} else {
+		mes "[Kafra Employee]";
+		mes "Kafra Service at your service.";
+		mes "What can I do for you?";
+		next;
+		mes "[Kafra Employee]";
+		mes "Let me inform you before you use the Teleport Service.";
+		mes "If you teleport to the village,";
+		mes "^4d4dffyou can NEVER come back to the Novice Training Field.^000000";
+		mes "So keep that in mind.";
+		next;
+		switch(select("Teleport Service:About Kafra Service")) {
+		case 1:
+			mes "[Kafra Employee]";
+			mes "So, you are going straight to town.";
+			mes "Let me give you a brief introduction.";
+			mes "^4d4dffProntera is the Capital City of the Rune-Midgarts Kingdom, and right next to it is Izlude^000000.";
+			next;
+			mes "[Kafra Employee]";
+			mes "^4d4dffMorroc is the Desert City, you can change your job to Thief and Assassin^000000 here.";
+			mes "^4d4dffPayon is the Village in the Mountains, and it is close to the Archer Village^000000.";
+			mes "^4d4dffGeffen is the City of Magic. Go there if you want to become a Mage.^000000";
+			next;
+			mes "[Kafra Employee]";
+			mes "^4d4dffAlberta is the Port City and there you can find the Merchant Guild^000000.";
+			mes "Also, if you are trying to take a boat to go somewhere, you have to go through Alberta first.";
+			mes "Select the town you want to teleport to.";
+			next;
+			switch(select("Prontera:Morroc:Payon:Alberta:Geffen")) {
+			case 1:
+				mes "[Kafra Employee]";
+				mes "Rune-Midgarts' Capital, Prontera.";
+				mes "I will send you to Prontera.";
+				mes "May Freya bless you upon your journey.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "prontera",117,72;
+				warp "prontera",150,50;
+				end;
+			case 2:
+				mes "[Kafra Employee]";
+				mes "The Desert City, Morroc...";
+				mes "It has lost it's former glory...";
+				mes "Do not lose the dream in your heart right now.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "morocc",150,99;
+				warp "morocc",155,110;
+				end;
+			case 3:
+				mes "[Kafra Employee]";
+				mes "Hmm, you want to be an Archer?.";
+				mes "Let's go to Payon.";
+				mes "Let Freya bless you.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "payon",70,100;
+				warp "payon",166,67;
+				end;
+			case 4:
+				mes "[Kafra Employee]";
+				mes "The Port City, Alberta.";
+				mes "Main city for all trades on the Rune-Midgard continent.";
+				mes "If you want to experience other civilizations, you have to visit Alberta first.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "alberta",30,232;
+				warp "alberta",114,58;
+				end;
+			case 5:
+				mes "[Kafra Employee]";
+				mes "The City of Magic!";
+				mes "Geffen Tower is looking nice standing in the middle of Geffen City.";
+				mes "I will send you close to the Geffen fountain.";
+				mes "May Goddess Freya bless you!.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "geffen",119,37;
+				warp "geffen",122,65;
+				end;
+			}
+		case 2:
+			mes "[Kafra Employee]";
+			mes "I will explain about the Kafra Service.";
+			mes "Which Service do you want to be";
+			mes "informed about?";
+			next;
+			while(1) {
+				set .@select, select("About Save:About Storage:About Teleport:About Cart:No More.");
+				if (.@select == 5) {
+					mes "[Kafra Employee]";
+					mes "I hope you are satisfied with my explanation";
+					mes "about the Kafra Service.";
+					close;
+				}
+				callsub L_Services, .@select;
+				next;
+			}
+		}
+	}
+	end;
+
+L_Services:
+	switch(getarg(0)) {
+	case 1:
+		mes "[Kafra Employee]";
+		mes "When you are killed in a battle,";
+		mes "you can revive in the location you saved with this service.";
+		mes "If you save at a Kafra in each village";
+		mes "You can revive in the village you saved.";
+		next;
+		mes "[Kafra Employee]";
+		mes "Saved location is always where";
+		mes "you saved last, and by using a Butterfly Wing,";
+		mes "you can teleport directly to your saved point.";
+		mes "So feel free to use this service.";
+		break;
+	case 2:
+		mes "[Kafra Employee]";
+		mes "Next is about using the Storage Service.";
 		mes "You can store and retrieve your items in any town at your convenience.";
 		next;
-		mes "[Kafra Agent]";
+		mes "[Kafra Employee]";
 		mes "It's unreasonable to carry all of your items with you when you don't need them right away.";
 		mes "Please use our Storage and keep your items safe and secure.";
 		next;
-		mes "[Kafra Agent]";
-		mes "Our convenient Storage Service is provided to our customers for a small fee which is different from town to town.";
-		mes "However, you must be at least ^4A4AFFBasic Skill Level 6^000000 to use the Storage.";
+		mes "[Kafra Employee]";
+		mes "Our convenient Storage Service";
+		mes "is provided to our customers for a small fee which is different from town to town.";
+		mes "However, you must be";
+		mes "at least ^3355FFBasic Skill Level 6^000000";
+		mes "to use the Storage.";
 		next;
-		mes "[Kafra Agent]";
+		mes "[Kafra Employee]";
+		//mes "There are 3 different item sections of the Storage into which items are organized: Consumable, Equipment and Etc.";
 		mes "There are 7 different item sections of the Storage into which items are organized: Consumable, Kafra (Item Mall), Armor, Weapons, Ammo, Cards, and Etc items.";
 		next;
-		mes "[Kafra Agent]";
-		mes "There are a maximum of 600 Inventory Slots in Kafra Storage, meaning you can have up to 600 different kinds of total items in Storage.";
+
+		// VIP System messages.
+		mes "[Kafra Employee]";
+		mes "There are a maximum of 600 Inventory Slots in Kafra Storage, meaning you can have up to 600 different kinds of items in Storage.";
+		next;
+/*
+		mes "[Kafra Employee]";
+		mes "There are a maximum of 300 Inventory Slots in Kafra Storage, meaning you can have up to 300 different kinds of items in Storage.";
 		next;
-		mes "[Kafra Agent]";
+		mes "[Kafra Employee]";
 		mes "If you have a Premium Subscription, the maximum Inventory Slots in Kafra Storage is 600!";
 		mes "Remember though, that in the case of Equipment, each item takes up one Inventory Slot.";
 		mes "The maximum number of items that can be placed in Kafra Storage is 30,000.";
 		next;
-		mes "[Kafra Agent]";
-		mes "Storage is shared by everyone character on one account.";
-		mes "Storage Fees can vary for each Town.";
+*/
+
+		mes "[Kafra Employee]";
+		mes "This Storage is shared by every character on one account.";
+		mes "Storage Fees can be vary for each Town.";
 		mes "So please keep that in mind when you are using our storage service.";
-		next;
-		mes "[Kafra Agent]";
+		break;
+	case 3:
+		mes "[Kafra Employee]";
 		mes "We also provide you with a Teleport Service to make your trips easier when you are trying to move a long distance.";
 		next;
-		mes "[Kafra Agent]";
-		mes "With our veteran teleporter's skill, your trip will be safer and more comfortable.";
+		mes "[Kafra Employee]";
+		mes "With our veteran teleporter's skill,";
+		mes "your trip will be safer and more comfortable.";
 		mes "Oh and remember that the places you can teleport to vary from town to town.";
 		next;
-		mes "[Kafra Agent]";
-		mes "This is all for your never ending support. We are working hard to repay our debt to our customers.";
-		next;
-		mes "[Kafra Agent]";
-		mes "Do you want to hear another explanation?";
-		set job_novice_q,11;
-		next;
-	}
-	else {
-		mes "[Kafra Agent]";
-		mes "Kafra Service at your service";
-		mes "What can I do for you?";
-		next;
-		select("About Kafra Service");
-		mes "[Kafra Agent]";
-		mes "I will explain about the Kafra Service.";
-		mes "Which service do you want to be informed about?";
-		next;
-	}
-	
-	while(1) {
-		switch(select("About Save:About Storage:About Teleport:About Cart:No More.")) {
-			case 1:
-				mes "[Kafra Agent]";
-				mes "When you are killed in battle, you can revive in the location you saved with this service.";
-				mes "If you save at a Kafra in a village, you can revive in the village you saved.";
-				next;
-				mes "[Kafra Agent]";
-				mes "Saved location is always where you saved last, and by using a Butterfly Wing, you can teleport directly to your saved point.";
-				mes "So feel free to use this service.";
-				next;
-				break;
-			case 2:
-				mes "[Kafra Agent]";
-				mes "Next is the Storage Service.";
-				mes "You can store and retrieve your items in any town at your convenience.";
-				next;
-				mes "[Kafra Agent]";
-				mes "It's unreasonable to carry all of your items with you when you don't need them right away.";
-				mes "Please use our Storage and keep your items safe and secure.";
-				next;
-				mes "[Kafra Agent]";
-				mes "Our convenient Storage Service is provided to our customers for a small fee which is different from town to town.";
-				mes "However, you must be at least ^4A4AFFBasic Skill Level 6^000000 to use the Storage.";
-				next;
-				mes "[Kafra Agent]";
-				mes "There are 7 different item sections of the Storage into which items are organized: Consumable, Kafra (Item Mall), Armor, Weapons, Ammo, Cards, and Etc items.";
-				next;
-				mes "[Kafra Agent]";
-				mes "There are a maximum of 600 Inventory Slots in Kafra Storage, meaning you can have up to 600 different kinds of total items in Storage.";
-				next;
-				mes "[Kafra Agent]";
-				mes "If you have a Premium Subscription, the maximum Inventory Slots in Kafra Storage is 600!";
-				mes "Remember though, that in the case of Equipment, each item takes up one Inventory Slot.";
-				mes "The maximum number of items that can be placed in Kafra Storage is 30,000.";
-				next;
-				mes "[Kafra Agent]";
-				mes "Storage is shared by everyone character on one account.";
-				mes "Storage Fees can vary for each Town.";
-				mes "So please keep that in mind when you are using our storage service.";
-				next;
-				break;
-			case 3:
-				mes "[Kafra Agent]";
-				mes "We also provide you with a Teleport Service to make your trips easier when you are trying to move a long distance.";
-				next;
-				mes "[Kafra Agent]";
-				mes "With our veteran teleporter's skill, your trip will be safer and more comfortable.";
-				mes "Oh and remember that the places you can teleport to vary from town to town.";
-				next;
-				mes "[Kafra Agent]";
-				mes "This is all for your never ending support. We are working hard to repay our debt to our customers.";
-				next;
-				break;
-			case 4:
-				mes "[Kafra Agent]";
-				mes "The Kafra corporation provides Cart rental services to customers engaged in commercial business.";
-				mes "Originally this cart rental service had been only provided by the merchant guild in Alberta.";
-				next;
-				mes "[Kafra Agent]";
-				mes "However, since we took over this service, our merchant customers have been able to rent carts from almost anywhere.";
-				mes "The cart rental service is available only for job classes engaged in commercial business such as ^4A4AFFMerchants, Blacksmiths, Alchemists, and Super Novices^000000.";
-				next;
-				mes "[Kafra Agent]";
-				mes "Of course you should learn the 'Pushcart' skill beforehand, otherwise you will not be able to rent a cart from us.";
-				mes "The rental fee varies by town, please keep that in mind.";
-				next;
-				break;
-			case 5:
-				mes "[Kafra Agent]";
-				mes "I hope you are satisfied with my explanation about the Kafra Service.";
-				close;
-		}
+		mes "[Kafra Employee]";
+		mes "This is all for your never ending";
+		mes "support. We are working hard to";
+		mes "repay our dept to our customers.";
+		break;
+	case 4:
+		mes "[Kafra Employee]";
+		mes "The Kafra corporation provides Cart rental services";
+		mes "to customers engaged in commercial business.";
+		mes "Originally this cart rental service had been only provided";
+		mes "by the merchant guild in Alberta";
+		next;
+		mes "[Kafra Employee]";
+		mes "However, since we took over this service";
+		mes "our merchant customers have been able to rent carts from almost anywhere.";
+		mes "The cart rental service is available only for job classes engaged in commercial business";
+		mes "such as ^4d4dffMerchants, Blacksmiths, Alchemists, and Super Novices^000000.";
+		next;
+		mes "[Kafra Employee]";
+		mes "Of course you should learn the 'Pushcart' skill beforehand,";
+		mes "otherwise you will not be able to rent a cart from us.";
+		mes "The rental fee varies by town,";
+		mes "please keep that in mind.";
+		break;
 	}
+	return;
 }
+new_1-2,30,176,4	duplicate(NvKafra)	Kafra Employee#nv1	4_F_KAFRA1
+new_2-2,30,176,4	duplicate(NvKafra)	Kafra Employee#nv2	4_F_KAFRA1
+new_3-2,30,176,4	duplicate(NvKafra)	Kafra Employee#nv3	4_F_KAFRA1
+new_4-2,30,176,4	duplicate(NvKafra)	Kafra Employee#nv4	4_F_KAFRA1
+new_5-2,30,176,4	duplicate(NvKafra)	Kafra Employee#nv5	4_F_KAFRA1
 
-// ---------- Cool Event Staff ----------
-new_1-2,32,176,4	script	Cool Event Staff#nv	874,{
-	if(job_novice_q < 11) {
-		mes "[Cool Event Staff]";
+-	script	Cool Event Corp. Staff::NvCool	-1,{
+	if (job_novice_q < 9) {
+		mes "[Cool Event Corp. Staff]";
 		mes "This is not my turn.";
-		mes "You finished talking to Kafra yet?";
+		mes "have you finished talking to the Kafra Employee yet?";
 		close;
-	}
-	else if(job_novice_q == 11) {
-		mes "[Cool Event Staff]";
+	} else if (job_novice_q == 9) {
+		mes "[Cool Event Corp. Staff]";
 		mes "Hello.";
-		mes "We are working hard to provide events on Rune Midgard similar to the Kafra service.";
+		mes "We are working hard to provide events on Rune-Midgard similar to the Kafra services.";
 		next;
-		mes "[Cool Event Staff]";
-		mes "Our staff is here to support you with [storage], [save], and [teleport] services.";
+		mes "[Cool Event Corp. Staff]";
+		mes "Our staff is here to support you with [storage], [save] and [teleport service].";
 		next;
-		mes "[Cool Event Staff]";
+		mes "[Cool Event Corp. Staff]";
 		mes "If there's no Kafra around you, we're around to help you.";
 		next;
-		mes "[Cool Event Staff]";
+		mes "[Cool Event Corp. Staff]";
 		mes "We are working hard on a network of Events to make your life better.";
 		mes "I hope that you can meet our staff in Alberta.";
 		next;
-		mes "[Cool Event Staff]";
+		mes "[Cool Event Corp. Staff]";
 		mes "Who knows, we might meet outside of this academy.";
 		next;
-		mes "[Cool Event Staff]";
-		mes "Mostly all of us wear red coats in the places that the Kafra Staff don't work for.";
-		set job_novice_q,12;
+		mes "[Cool Event Corp. Staff]";
+		mes "Mostly all of us wear red coats in the places that the Kafra Employee's don't work in.";
+		set job_novice_q,10;
+		close;
+	} else {
+		mes "[Cool Event Corp. Staff]";
+		mes "Most of our services are similar to those of the Kafra Corporation.";
 		close;
 	}
-	mes "[Cool Event Staff]";
-	mes "Most of our services are similar to those of Kafra.";
-	close;
 }
+new_1-2,33,176,4	duplicate(NvCool)	Cool Event Corp. Staff::NvCool1	4_M_ZONDAMAN
+new_2-2,33,176,4	duplicate(NvCool)	Cool Event Corp. Staff::NvCool2	4_M_ZONDAMAN
+new_3-2,33,176,4	duplicate(NvCool)	Cool Event Corp. Staff::NvCool3	4_M_ZONDAMAN
+new_4-2,33,176,4	duplicate(NvCool)	Cool Event Corp. Staff::NvCool4	4_M_ZONDAMAN
+new_5-2,33,176,4	duplicate(NvCool)	Cool Event Corp. Staff::NvCool5	4_M_ZONDAMAN
 
-// ---------- Soldier ----------
-new_1-2,35,176,4	script	Soldier#nv	105,{
-	if(job_novice_q < 12) {
-		mes "[Soldier]";
-		mes "It isn't my turn yet.";
+-	script	Guide::NvGuide	-1,{
+	if (job_novice_q < 10) {
+		mes "[Guide]";
+		mes "It ain't my turn yet.";
 		mes "Listen to Chocolat.";
 		close;
-	}
-	else if(job_novice_q == 12) {
-		mes "[Soldier]";
-		mes "Soldiers are in each town to guide you to useful places.";
-		mes "Ask us where you want to go and we'll mark your mini maps with a ^4A4AFF+^000000.";
+	} else if (job_novice_q == 10) {
+		mes "[Guide]";
+		mes "Guides are in each town to guide you to useful places.";
+		mes "Ask us where you want to go and we'll mark your mini maps with a ^4d4dff+^000000.";
 		mes "Don't hesitate to ask us questions.";
 		next;
-		mes "[Soldier]";
+		mes "[Guide]";
 		mes "We all don't look the same in every town but our roles are the same.";
 		mes "Take note of this whenever you go to a new town.";
 		next;
-		mes "[Soldier]";
-		mes "If you want to go to your first town, you can do so once you have reached Base Level 11 in the training grounds.";
-		set job_novice_q,13;
-		close;
-	}
-	mes "[Soldier]";
-	mes "What can I help you with?";
-	mes "Need me to explain what I do again?";
-	next;
-	if(select("Yes, I need an explanation.:Nope") == 2) {
-		mes "[Soldier]";
-		mes "Ok well talk to Chocolat if you're done talking with us.";
+		mes "[Guide]";
+		mes "If you want to go to your first town, you can ask the Kafra Employee to the left.";
+		mes "You can move there with the Teleport Service.";
+		set job_novice_q,11;
 		close;
+	} else {
+		mes "[Guide]";
+		mes "What can I help you with?";
+		mes "Need me to explain what I do again?";
+		next;
+		switch(select("Yes, I need an explanation.:Nope.")) {
+		case 1:
+			mes "[Guide]";
+			mes "Guides are in each town to guide you to useful places in each town.";
+			mes "Ask us where you want to go and we'll mark your mini maps with a ^4d4dff+^000000.";
+			mes "Don't hesitate to ask us questions.";
+			next;
+			mes "[Guide]";
+			mes "We all don't look the same in every town but our roles are the same.";
+			mes "Take note of this whenever you go to a new town.";
+			next;
+			mes "[Guide]";
+			mes "If you want to go to your first town, you can ask the Kafra Employee to the left.";
+			mes "You can move there with the Teleport Service.";
+			close;
+		case 2:
+			mes "[Guide]";
+			mes "Ok well talk to Chocolat if you're done talking with us.";
+			close;
+		}
 	}
-	mes "[Soldier]";
-	mes "Soldiers are in each town to guide you to useful places.";
-	mes "Ask us where you want to go and we'll mark your mini maps with a ^4A4AFF+^000000.";
-	mes "Don't hesitate to ask us questions.";
-	next;
-	mes "[Soldier]";
-	mes "We all don't look the same in every town but our roles are the same.";
-	mes "Take note of this whenever you go to a new town.";
-	next;
-	mes "[Soldier]";
-	mes "If you want to go to your first town, you can do so once you have reached Base Level 11 in the training grounds.";
-	close;
 }
+new_1-2,36,176,4	duplicate(NvGuide)	Guide#nv1	8W_SOLDIER
+new_2-2,36,176,4	duplicate(NvGuide)	Guide#nv2	8W_SOLDIER
+new_3-2,36,176,4	duplicate(NvGuide)	Guide#nv3	8W_SOLDIER
+new_4-2,36,176,4	duplicate(NvGuide)	Guide#nv4	8W_SOLDIER
+new_5-2,36,176,4	duplicate(NvGuide)	Guide#nv5	8W_SOLDIER
 
-// Instructor Brade (Real Combat Training)
+// Real Combat Training
 //============================================================
--	script	Brade#nv::NvBrade	733,{
-	if(job_novice_q < 14) {
-		mes "[Brade]";
-		mes "How did you get here?";
-		close2;
-		warp "new_1-2",100,100;
-		end;
-	}
-	else if(job_novice_q == 14) {
+-	script	Brade#newbe04::NvBradeB	-1,{
+	if (job_novice_q < 12) {
+		if (job_novice_q < 2) {
+			mes "[Brade]";
+			mes "You have participated on the previous Training Grounds.";
+			mes "The Training Grounds have now come under new management.";
+			next;
+			mes "[Brade]";
+			mes "Do you want to do the basic course,";
+			mes "or do you just want to go through from here?";
+			next;
+			switch(select("Send me to Basic Training.:I'll start from here.")) {
+			case 1:
+				mes "[Brade]";
+				mes "Ok. I'll send you to the basic course.";
+				close2;
+				warp "new_"+charat(strnpcinfo(4),4)+"-2",100,100;
+				end;
+			case 2:
+				mes "[Brade]";
+				mes "Then we will start your training.";
+				mes "I'll write down the registration form.";
+				set job_novice_q,12;
+				close;
+			}
+		} else {
+			mes "[Brade]";
+			mes "I think you came back from theory training course,";
+			mes "can I send you back to there or do you just want to go through from here?";
+			next;
+			switch(select("Send me back to Chocolat.:I'll start from here.")) {
+			case 1:
+				mes "[Brade]";
+				mes "Ok. I'll send you to Chocolat.";
+				close2;
+				warp "new_"+charat(strnpcinfo(4),4)+"-2",41,172;
+				end;
+			case 2:
+				mes "[Brade]";
+				mes "Then we will start your training.";
+				mes "I'll write down the registration form.";
+				set job_novice_q,12;
+				close;
+			}
+		}
+	} else if (job_novice_q == 12) {
 		mes "[Brade]";
 		mes "Welcome.";
 		mes "Now this is real practice.";
@@ -872,113 +1160,163 @@ new_1-2,35,176,4	script	Soldier#nv	105,{
 		next;
 		mes "[Brade]";
 		mes "For convenience,";
-		mes "^4A4AFFIf you hold down the Ctrl key,^000000";
-		mes "while attacking, you will automatically attack.";
+		mes "^4d4dffIf you hold down the Ctrl key,^000000 while attacking, you will automatically attack.";
 		next;
 		mes "[Brade]";
-		mes "You can also set this mode before battle by typing ^4A4AFF[ /nc ]^000000.";
+		mes "You can also set this mode before battle by typing ^4d4dff[ /nc ]^000000.";
 		next;
 		mes "[Brade]";
 		mes "Then, let's go Poring hunting.";
-		mes "Please hunt Poring's on Level 1 of the training grounds.";
+		mes "Please hunt 'Poring's on Level 1 of the training grounds.";
+		set job_novice_q,13;
 		setquest 7122;
-		set job_novice_q,15;
-		getitem 569,100;	// Novice_Potion
+		getitem 569,100; //Novice_Potion
+		savepoint strnpcinfo(4),96,21;
 		next;
-		mes "^4A4AFF- You've received a quest from Instructor Brade.^000000";
-		mes "^4A4AFFPlease check the quest information window. -^000000";
+		mes "^4d4dff- You've received a quest from Instructor Brade.";
+		mes "Please check the quest information window. -^000000";
+		close2;
+	} else if (job_novice_q < 15) {
+		if (job_novice_q == 13) {
+			if (checkquest(7122,HUNTING) == 2) {
+				mes "[Brade]";
+				mes "You can see it is not so hard, huh?";
+				mes "Nice job.";
+				set job_novice_q,14;
+				getitem 13040,1; //N_Cutter
+				getexp 3000,30;
+				completequest 7122;
+				next;
+			} else {
+				mes "[Brade]";
+				mes "Kill enough Porings.";
+				mes "Porings are easy to deal with, so cheer up.";
+				mes "Try again.";
+				npcskill "AL_HEAL",11,99,60;
+				close;
+			}
+		}
+		mes "[Brade]";
+		mes "Now all of the courses are almost done.";
+		mes "You are a Novice, and you can't get any jobs yet.";
+		next;
+		mes "[Brade]";
+		mes "If you acquire all of basic skills with JOB Level 10, you can change your job.";
+		next;
+		mes "[Brade]";
+		mes "The first Job classes are defined into 6 classes.";
+		next;
+		mes "[Brade]";
+		mes "The 6 basic jobs are";
+		mes "Swordman, Thief,";
+		mes "Acolyte, Mage,";
+		mes "Archer and Merchant.";
+		next;
+		mes "[Brade]";
+		mes "Let's experience the basic 6 jobs, Swordman, Thief, Acolyte, Mage, Archer and Merchant and see what those jobs can do.";
+		next;
+		mes "[Brade]";
+		mes "Behind me, there are people dispatched from each of the basic Job Guilds.";
+		mes "These people will give you instruction manuals that allow you to experience some limited skills of each job.";
+		next;
+		mes "[Brade]";
+		mes "Equip a manual of the job which you want to experience, and you will be able to use some basic skills of that corresponding job.";
+		mes "Try those skills and decide which job to choose.";
+		set job_novice_q,15;
 		close;
-	}
-	else if(job_novice_q == 15) {
-		if(checkquest(7122,HUNTING) == 2) {
-			mes "[Brade]";
-			mes "You can see it is not so hard, right?";
-			mes "Nice job.";
-			getitem 13040,1;	// N_Cutter
-			getexp 1000,0;
-			getexp 1000,0;
-			getexp 1000,30;
-			completequest 7122;
-			set job_novice_q,16;
-			next;
-			mes "[Brade]";
-			mes "Now all of the courses are almost done.";
-			mes "You are a Novice, and you can't get any jobs yet.";
-			next;
-			mes "[Brade]";
-			mes "If you acquire all of basic skills with Job Level 10, you can change your job.";
-			next;
-			mes "[Brade]";
-			mes "The first job classes are defined into 6 classes.";
-			next;
+	} else {
+		mes "[Brade]";
+		mes "Have you tried the skills in the Manuals?";
+		mes "If you want to hear information about each job, talk to the people dispatched by the Job Guilds.";
+		next;
+		mes "[Brade]";
+		mes "I think you've learned enough, do you want to quit and go to your first town?";
+		next;
+		switch(select("I will stay little longer.:I want to quit and go to the town.")) {
+		case 1:
 			mes "[Brade]";
-			mes "The 6 basic jobs are";
-			mes "Swordman, Thief,";
-			mes "Acolyte, Mage,";
-			mes "Archer and Merchant.";
+			mes "It's ok to stay here and practice until you think you are ready.";
 			next;
 			mes "[Brade]";
-			mes "Let's experience the basic 6 jobs, Swordman, Thief, Acolyte, Mage, Archer and Merchant and see what those jobs can do.";
-			next;
+			mes "Try using the job manuals to find out the characteristics of each job's skills.";
+			mes "I will restore your HP and SP... Keep it up.";
+			npcskill "AL_HEAL",11,99,60;
+			percentheal 0,100;
+			close;
+		case 2:
 			mes "[Brade]";
-			mes "Behind me, there are people dispatched from each of the basic Job Guilds.";
-			mes "These people will give you instruction manuals that allow you to experience some limited skills of each job.";
+			mes "Looks like you are ready.";
+			mes "I guess you have made up your mind, huh?";
+			mes "Well, where do you want to go?";
 			next;
-			mes "[Brade]";
-			mes "Equip a manual of the job which you want to experience, and you will be able to use some basic skills of that corresponding job.";
-			mes "Try those skills and decide which job to choose.";
-			close;
+			switch(select("Prontera:Morroc:Payon:Alberta:Geffen:Cancel")) {
+			case 1:
+				mes "[Brade]";
+				mes "Prontera, the Capital city of the Rune-Midgarts Kingdom.";
+				mes "Take care and god bless you on your journey.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "prontera",117,72;
+				warp "prontera",150,50;
+				end;
+			case 2:
+				mes "[Brade]";
+				mes "The Desert Town, Morroc...";
+				mes "There's lots of hidden stories within that town.";
+				mes "Take care.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "morocc",150,99;
+				warp "morocc",155,110;
+				end;
+			case 3:
+				mes "[Brade]";
+				mes "You've selected Payon.";
+				mes "God bless you.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "payon",70,100;
+				warp "payon",166,67;
+				end;
+			case 4:
+				mes "[Brade]";
+				mes "Alberta, the Port City.";
+				mes "It's the main hub of all trades.";
+				mes "If you want to meet with other civilizations, you have to go to Alberta first.";
+				mes "Well then, god bless you on your soul.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "alberta",30,232;
+				warp "alberta",114,58;
+				end;
+			case 5:
+				mes "[Brade]";
+				mes "Geffen, the City of Magic.";
+				mes "Geffen Tower in the middle of the city is nice.";
+				mes "I will send you near the Geffen fountain.";
+				mes "May Goddess Freya bless you.";
+				callfunc "F_NvErase";
+				close2;
+				savepoint "geffen",119,37;
+				warp "geffen",122,65;
+				end;
+			case 6:
+				mes "[Brade]";
+				mes "Yeah... Think with prudence.";
+				mes "...Meet up with the people from each guild.";
+				close;
+			}
 		}
-		mes "[Brade]";
-		mes "Kill enough Porings.";
-		mes "Porings are easy to deal with, so cheer up.";
-		mes "Try again.";
-		npcskill "AL_HEAL",10,99,60;
-		close;
-	}
-	mes "[Brade]";
-	mes "Have you tried the skills in the Manuals?";
-	mes "If you want to hear information about each job, talk to the people dispatched by the Job Guilds.";
-	next;
-	mes "[Brade]";
-	mes "I think you've learned enough, if you want to learn more, then speak to the Eden Group girl next to the Trainers.";
-	next;
-	mes "[Brade]";
-	mes "Try using the job manuals to find out the characteristics of each job's skills.";
-	mes "I will restore your HP and SP... Keep it up.";
-	npcskill "AL_HEAL",10,99,60;
-	close;
-}
-
-new_1-3,96,30,4	duplicate(NvBrade)	Brade#nv1	733
-new_2-3,96,30,4	duplicate(NvBrade)	Brade#nv2	733
-new_3-3,96,30,4	duplicate(NvBrade)	Brade#nv3	733
-new_4-3,96,30,4	duplicate(NvBrade)	Brade#nv4	733
-new_5-3,96,30,4	duplicate(NvBrade)	Brade#nv5	733
-
-// Job Guides (Real Combat Training)
-//============================================================
-// --------------------------- Deletion Function ------------------------------
-function	script	F_NvErase	{
-	if (getarg(0,0)) {
-		if (checkquest(7123) == 0 || checkquest(7123) == 1) erasequest 7123;
-		if (checkquest(7124) == 0 || checkquest(7124) == 1) erasequest 7124;
-		if (checkquest(7126) == 0 || checkquest(7126) == 1) erasequest 7126;
-		if (checkquest(7127) == 0 || checkquest(7127) == 1) erasequest 7127;
 	}
-	nude;
-	if (countitem(2819)) delitem 2819,1;	// Swordsman_Manual
-	if (countitem(2820)) delitem 2820,1;	// Thief_Manual
-	if (countitem(2821)) delitem 2821,1;	// Acolyte_Manual
-	if (countitem(2822)) delitem 2822,1;	// Archer_Manual
-	if (countitem(2823)) delitem 2823,1;	// Merchant_Manual
-	if (countitem(2824)) delitem 2824,1;	// Mage_Manual
-	return;
 }
+new_1-3,96,30,4	duplicate(NvBradeB)	Brade#nv1b	4_M_JOB_KNIGHT1
+new_2-3,96,30,4	duplicate(NvBradeB)	Brade#nv2b	4_M_JOB_KNIGHT1
+new_3-3,96,30,4	duplicate(NvBradeB)	Brade#nv3b	4_M_JOB_KNIGHT1
+new_4-3,96,30,4	duplicate(NvBradeB)	Brade#nv4b	4_M_JOB_KNIGHT1
+new_5-3,96,30,4	duplicate(NvBradeB)	Brade#nv5b	4_M_JOB_KNIGHT1
 
-// ---------------------------- Swordman Guide -------------------------------
--	script	Swordman Guide#nv::NvSwd	728,{
-	if(job_novice_q < 16) {
+-	script	Swordman Guide#newbe10::NvSwordman	-1,{
+	if (job_novice_q < 15) {
 		mes "[Swordman Guildsman]";
 		mes "I won't help you until you finish Brade's instructions.";
 		close;
@@ -987,291 +1325,248 @@ function	script	F_NvErase	{
 	mes "Can I help you?";
 	next;
 	switch(select("About Swordman Class.:Job change to Swordman.:Got any quests?:Cancel.")) {
-		case 1:
-			mes "[Swordman Guildsman]";
-			mes "Literally, Swordman means one, who is specialized in wielding swords.";
-			mes "But they can also choose to use spears if they so choose.";
-			next;
+	case 1:
+		mes "[Swordman Guildsman]";
+		mes "Literally, Swordman means one, who";
+		mes "is specialized in wielding swords.";
+		mes "But they can also choose to use spears if they so choose.";
+		next;
+		mes "[Swordman Guildsman]";
+		mes "We possesses strong physical strength.";
+		mes "So naturally we can equip heavy armors and weapons.";
+		mes "Most weapon classes, except for bows and rods,";
+		mes "are equippable by our class.";
+		next;
+		mes "[Swordman Guildsman]";
+		mes "The only weakness of the Swordman class is that they cannot use magic spells.";
+		mes "But we've compensated for that by using elemental weapons.";
+		next;
+		mes "[Swordman Guildsman]";
+		mes "The merits of being a Swordman is the enormous amount of HP we have.";
+		mes "Most of us can bear the grunt of our enemies' attacks with relative ease.";
+		next;
+		mes "[Swordman Guildsman]";
+		mes "And we are unrivaled when it comes to one-on-one melee combat.";
+		next;
+		mes "[Swordman Guildsman]";
+		mes "Anyone who chooses to be a Swordman will likely play the role of the tank. It is our duty to protect the weak.";
+		next;
+		mes "[Swordman Guildsman]";
+		mes "As a Swordman you can advance to a ^8E2323Knight^000000 or ^8E2323Crusader^000000 class as your 2nd class profession.";
+		mes "And just recently third professions have been discovered.";
+		next;
+		if (isequipped(2819) || countitem(2819)) {
 			mes "[Swordman Guildsman]";
-			mes "We possess strong physical strength.";
-			mes "So naturally we can equip heavy armors and weapons.";
-			mes "Most weapon classes, except for bows and rods, are equippable by our class.";
-			next;
+			mes "Try the Swordman skills listed in the manual.";
+			mes "Open your skill menu by pressing Alt + S";
+			mes "Make sure it is in list mode by clicking the minimize button on the top right corner of the Skill Menu.";
+			close;
+		}
+		mes "[Swordman Guildsman]";
+		mes "If you're interested in being a Swordman, I'll offer you this manual.";
+		mes "Do you want to try the skills of a Swordman?";
+		next;
+		switch(select("I'll try the Swordman skills.:No thanks.")) {
+		case 1:
 			mes "[Swordman Guildsman]";
-			mes "The only weakness of the Swordman class is that they cannot use magic spells.";
-			mes "But we've compensated for that by using elemental weapons.";
+			mes "Here is the Swordman manual.";
+			mes "I'll just take any manuals from any other classes you have.";
 			next;
-			mes "[Swordman Guildsman]";
-			mes "The merits of being a Swordman is the enormous amount of HP we have.";
-			mes "Most of us can bear the grunt of our enemies' attacks with relative ease.";
+			callfunc "F_NvErase";
+			getitem 2819,1; //Swordman_Manual
 			next;
 			mes "[Swordman Guildsman]";
-			mes "And we are unrivaled when it comes to one-on-one melee combat.";
-			next;
+			mes "After equipping the Manual, open your Skill menu by pressing ALT+S.";
+			mes "Make sure to minimize your Skill tree by clicking the '-' button on the top right corner of the Skill Tree Window.";
+			close;
+		case 2:
 			mes "[Swordman Guildsman]";
-			mes "Anyone who chooses to be a Swordman will likely play the role of the tank. It is our duty to protect the weak.";
-			next;
+			mes "Hum. Do you think so?";
+			mes "Ok, I agree with you. Choosing a job is very important in our lives.";
+			mes "Just talk to me whenever you want to experience Swordman skills.";
+			close;
+		}
+	case 2:
+		mes "[Swordman Guildsman]";
+		mes "Do you really want to change your job to Swordman?";
+		mes "If you want to be a Swordman, I'll send you to the Swordman Association immediately.";
+		next;
+		mes "[Swordman Guildsman]";
+		mes "I think you have enough job levels, of course, right?";
+		mes "Do you want to stop your training now and go to the Swordman Association?";
+		next;
+		switch(select("I'll consider it again.:I'll go to the Swordman Association.")) {
+		case 1:
 			mes "[Swordman Guildsman]";
-			mes "As a Swordman you can advance to a ^8C2121Knight^000000 or ^8C2121Crusader^000000 class as your 2nd class profession.";
-			mes "And just recently third professions have been discovered.";
-			if(countitem(2819) == 0 && (getequipid(EQI_ACC_L) != 2819 || getequipid(EQI_ACC_R) != 2819)) {
-				next;
-				mes "[Swordman Guildsman]";
-				mes "If you're interested in being a Swordman, I'll offer you this manual.";
-				mes "Do you want to try the skills of a Swordman?";
-				next;
-				if(select("I'll try the Swordman skills.:No Thanks.") == 2) {
-					mes "[Swordman Guildsman]";
-					mes "Hum. Do you think so?";
-					mes "Ok, I agree with you. Choosing a job is very important in our lives.";
-					mes "Just talk to me whenever you want to experience Swordman skills.";
-					close;
-				}
-				mes "[Swordman Guildsman]";
-				mes "Here is the Swordman manual.";
-				mes "I'll just take any manuals from any other classes you have.";
-				callfunc "F_NvErase";
-				getitem 2819,1;	// Swordsman_Manual
-				next;
-				mes "[Swordman Guildsman]";
-				mes "After equipping the Manual, open your Skill menu by pressing ALT+S.";
-				mes "Make sure to minimize your Skill tree by clicking the '-' button on the top right corner of the Skill Tree Window.";
-			}
+			mes "Please try enough instruction manuals from each job class and consider it carefully.";
+			mes "Of course, you're always welcomed.";
 			close;
 		case 2:
 			mes "[Swordman Guildsman]";
-			mes "Do you really want to change your job to Swordman?";
-			mes "If you want to be a Swordman, I'll send you to the Swordman Guild immediately.";
+			mes "I see.";
+			mes "Then I'll end your training process and send you to the Swordman Guild.";
+			callfunc "F_NvErase",1;
+			close2;
+			savepoint "izlude",128,98; // Old coordinates: (95,104)
+			warp "izlude_in",74,167;
+			end;
+		}
+	case 3:
+		set .@quest, checkquest(7123);
+		if (.@quest == -1) {
+			mes "[Swordman Guildsman]";
+			mes "You want me to give you a quest?";
+			mes "Umm. Let me see.";
+			mes "Ok! Hunt a couple of Picky monsters around here?";
+			next;
+			mes "^4d4dffYou received a hunting request from a staff of the Swordman Guild.";
+			mes "You can check the contents of the quest from the quest information window.^000000";
+			setquest 7123;
 			next;
 			mes "[Swordman Guildsman]";
-			mes "I think you have enough job levels, of course, right?";
-			mes "Do you want to stop your training now and go to the Swordman Guild?";
+			mes "Use the 'Bash' skill in the Swordman manual.";
+			mes "Open your Skill Tree by pressing ^4d4dffAlt + S^000000 and minimize the window by pressing the ^4d4dff'-'^000000 button on the top right corner of the window to see the available Swordman skills.";
 			next;
-			if(select("I'll consider it again.:I'll go to the Swordman Guild.") == 2) {
-				mes "[Swordman Guildsman]";
-				mes "I see.";
-				mes "Then I'll end your training process and send you to the Swordman Guild.";
-				close2;
-				callfunc "F_NvErase",1;
-				savepoint "izlude",94,103;
-				warp "izlude_in",74,167;
-				end;
-			}
 			mes "[Swordman Guildsman]";
-			mes "Please try enough instruction manuals from each job class and consider it carefully.";
-			mes "Of course, you're always welcomed.";
+			mes "Talk to Trainer Brutus if you want to fight stronger monsters.";
+			mes "I'll wait for you here.";
+			mes "Wish you a good luck.";
 			close;
-		case 3:
-			set .@quest, checkquest(7123);
-			if (.@quest == -1) {
-				mes "[Swordman Guildsman]";
-				mes "You want me to give you a quest?";
-				mes "Umm. Let me see.";
-				mes "Ok! Hunt a couple of Picky monsters around here.";
-				next;
-				mes "^4d4dffYou received a hunting request from a staff of the Swordman Guild.";
-				mes "You can check the contents of the quest from the quest information window.^000000";
-				setquest 7123;
-				next;
-				mes "[Swordman Guildsman]";
-				mes "Use the 'Bash' skill in the Swordman manual.";
-				mes "Open your Skill Tree by pressing ^4A4AFFAlt + S^000000 and minimize the window by pressing the '-' button on the top right corner of the window to see the available Swordman skills.";
-				next;
+		} else if (.@quest == 0 || .@quest == 1) {
+			if (checkquest(7123,HUNTING) == 2) {
 				mes "[Swordman Guildsman]";
-				mes "Talk to Trainer Brutus if you want to fight stronger monsters.";
-				mes "I'll wait for you here.";
-				mes "Wish you a good luck.";
+				mes "Great.";
+				mes "I think that you're good enough to be a Swordman.";
+				mes "I'll give you some potions as a reward.";
+				completequest 7123;
+				getitem 569,200; //Novice_Potion
+				getexp 5000,100;
 				close;
-			}
-			else if (.@quest == 1) {
-				if (checkquest(7123,HUNTING) == 2) {
-					mes "[Swordman Guildsman]";
-					mes "Great.";
-					mes "I think that you're good enough to be a Swordman.";
-					mes "I'll give you some potions as a reward.";
-					completequest 7123;
-					getitem 569,200;	// Novice_Potion
-					getexp 5000,100;
-					close;
-				}
+			} else {
 				mes "[Swordman Guildsman]";
 				mes "Hunt two Picky monsters.";
 				mes "You can find them in the more difficult training grounds by talking to Trainer Brutus.";
 				close;
 			}
-			else if (.@quest == 2) {
-				mes "[Swordman Guildsman]";
-				mes "I think you finished that quest already, right?";
-				mes "You'll experience more of these quests as you grow as an adventurer in the world.";
-				next;
-				mes "[Swordman Guildsman]";
-				mes "Your training is now complete.";
-				mes "If you choose to become a Swordman I wish you goodluck.";
-				close;
-			}
+		} else if (.@quest == 2) {
 			mes "[Swordman Guildsman]";
-			mes "I'm sorry but I don't have any quests to give you right now.";
+			mes "I think you finished that quest already, right?";
+			mes "You'll experience more of these quests as you grow as an adventurer in the world.";
+			next;
+			mes "[Swordman Guildsman]";
+			mes "Your training is now complete.";
+			mes "If you choose to become a Swordman I wish you good luck.";
 			close;
-		case 4:
+		} else {
 			mes "[Swordman Guildsman]";
-			mes "If you have any questions about the Swordman class, please ask me.";
-			mes "The Swordman Guild is waiting for novices like you.";
+			mes "I'm sorry but I don't have any quests to give you right now.";
 			close;
+		}
+	case 4:
+		mes "[Swordman Guildsman]";
+		mes "If you have any questions about the Swordman class, please ask me.";
+		mes "The Swordman Guild is waiting for novices like you.";
+		close;
 	}
 }
+new_1-3,97,41,3	duplicate(NvSwordman)	Swordman Guide#nv1	4_F_JOB_KNIGHT
+new_2-3,97,41,3	duplicate(NvSwordman)	Swordman Guide#nv2	4_F_JOB_KNIGHT
+new_3-3,97,41,3	duplicate(NvSwordman)	Swordman Guide#nv3	4_F_JOB_KNIGHT
+new_4-3,97,41,3	duplicate(NvSwordman)	Swordman Guide#nv4	4_F_JOB_KNIGHT
+new_5-3,97,41,3	duplicate(NvSwordman)	Swordman Guide#nv5	4_F_JOB_KNIGHT
 
-new_1-3,97,41,4	duplicate(NvSwd)	Swordman Guide#nv1	728
-new_2-3,97,41,4	duplicate(NvSwd)	Swordman Guide#nv2	728
-new_3-3,97,41,4	duplicate(NvSwd)	Swordman Guide#nv3	728
-new_4-3,97,41,4	duplicate(NvSwd)	Swordman Guide#nv4	728
-new_5-3,97,41,4	duplicate(NvSwd)	Swordman Guide#nv5	728
-
-// ---------------------------- Mage Guide ----------------------------------
--	script	Mage Guide#nv::NvMag	123,{
-	if(job_novice_q < 16) {
-		mes "[Mage Guild Member]";
-		mes "You are still in the process of training with Instructor Brade.";
+-	script	Acolyte Guide#newbe10::NvAcolyte	-1,{
+	if (job_novice_q < 15) {
+		mes "[Prontera Acolyte]";
+		mes "You look like you are not done with Instructor Brade's lessons.";
 		close;
 	}
-	mes "[Mage Guild Member]";
-	mes "What can I help you with?";
+	mes "[Prontera Acolyte]";
+	mes "What can I do for you?";
 	next;
-	switch(select("Tell me about Mages:I want to be a Mage:Give me a Quest:Cancel")) {
+	switch(select("What is an Acolyte?:Job change to Acolyte.:Cancel")) {
 	case 1:
-		mes "[Mage Guild Member]";
-		mes "Mages are those who can use magic when they need to protect their friends.";
-		mes "Mages can curse enemies using the elements of fire, water, earth and thunder magic.";
+		mes "[Prontera Acolyte]";
+		mes "An Acolyte is someone who worships the goddess Freya sacrificing themselves to help others.";
 		next;
-		mes "[Mage Guild Member]";
-		mes "However they cannot equip other weapons but staffs and books.";
-		mes "Because they are too delicate to carry heavy weapons.";
+		mes "[Prontera Acolyte]";
+		mes "Acolytes use supportive skills to make combat easier.";
+		mes "It is essential to have an Acolyte in any successful party.";
 		next;
-		mes "[Mage Guild Member]";
-		mes "But they can cover this weakness by their remarkable magic skills.";
-		mes "That is why many people want to become a Mage!";
+		mes "[Prontera Acolyte]";
+		mes "^8E2323As an Acolyte, you can upgrade your future job to Priest or Monk^8E2323.";
 		next;
-		mes "[Mage Guild Member]";
-		mes "Mages have to be in their guild for guild's power and honor.";
-		mes "This is one of the reasons why Mages are popular in any parties and guilds.";
-		mes "Why don't you become a Mage?";
+		if (isequipped(2821) || countitem(2821)) {
+			mes "[Prontera Acolyte]";
+			mes "Try the Acolyte Skills with the manual you have. It will help you understand the job easier.";
+			mes "Open your Skill Tree by pressing ^4d4dffAlt + S^000000 and minimize the window by pressing the ^4d4dff'-'^000000 button on the top right corner of the window to see the available skills.";
+			close;
+		}
+		mes "[Prontera Acolyte]";
+		mes "If you want, I can give you a skill manual to experience what it is like to be an Acolyte.";
+		mes "Would you like to experience the skills of an Acolyte?";
 		next;
-		mes "[Mage Guild Member]";
-		mes "^8C2121Mages can transform to Wizards or Sages as their second job.^000000";
-		if(countitem(2824) == 0 && (getequipid(EQI_ACC_L) != 2824 || getequipid(EQI_ACC_R) != 2824)) {
-			next;
-			mes "[Mage Guild Member]";
-			mes "Do you want to register to experience how it is to be a Mage?";
-			mes "Would you like to test Mage skills?";
-			next;
-			if(select("I want to test Mage skills.:I don't want to test it.") == 2) {
-				mes "[Mage Guild Member]";
-				mes "Hum. Do you think so.";
-				mes "Ok, I agree with you. Choosing a job is very important in our life.";
-				mes "Just talk to me whenever you want to experience Mage skills.";
-				close;
-			}
-			mes "[Mage Guild Member]";
-			mes "Here is the Mage Manual.";
-			mes "I will take the other job registration forms and manuals from you.";
+		switch(select("Yes, please.:No, I'm not interested.")) {
+		case 1:
+			mes "[Prontera Acolyte]";
+			mes "Here you go, the instruction manual of an Acolyte.";
+			mes "I will take away those other job's manuals while you study this one.";
 			next;
-			mes "[Mage Guild Member]";
-			mes "Here is the Mage Manual.";
-			mes "I will take the other job registration forms and manuals from you.";
 			callfunc "F_NvErase";
-			getitem 2824,1;	// Mage_Manual
+			getitem 2821,1; //Acolyte_Manual
 			next;
-			mes "[Mage Guild Member]";
-			mes "After equipping the Manual, open your Skill menu by pressing ALT+S.";
-			mes "Make sure to minimize your Skill tree by clicking the '-' button on the top right corner of the Skill Tree Window.";
+			mes "[Prontera Acolyte]";
+			mes "Make sure to equip the Skill Manual by double-clicking it in the Inventory Window.";
+			mes "Open your Skill Tree by pressing ^4d4dffAlt + S^000000 and minimize the window by pressing the ^4d4dff'-'^000000 button on the top right corner of the window to see the available skills.";
+			close;
+		case 2:
+			mes "[Prontera Acolyte]";
+			mes "Hum. Do you think so.";
+			mes "Ok, I agree with you. Choosing a job is very important in our life.";
+			mes "Just talk to me whenever you want to know about Acolytes.";
+			close;
 		}
-		close;
 	case 2:
-		mes "[Mage Guild Member]";
-		mes "You want to be a Mage?";
-		mes "Ok, then, I will send you to the Mage Guild union in Geffen right away.";
+		mes "[Prontera Acolyte]";
+		mes "Do you really want to become an Acolyte?";
+		mes "If you do, I will send you to Prontera's Sanctuary.";
 		next;
-		mes "[Mage Guild Member]";
-		mes "Wait, have you checked your Job level?";
-		mes "Do you want to complete your Novice training and go straight to the Mage Guild's union?";
+		mes "[Prontera Acolyte]";
+		mes "Of course, I assume you have enough job levels to become an Acolyte right?";
+		mes "Would you like to quit the Training Process and go to the Prontera's Sanctuary?";
 		next;
-		if(select("I will think about it again.:Yes, complete my training.") == 2) {
-			mes "[Mage Guild Member]";
-			mes "Welcome!!";
-			mes "I will send you to the Mage Guilds union after you complete your Novice training.";
-			close2;
+		switch(select("Let me reconsider.:I will go to the Sanctuary.")) {
+		case 1:
+			mes "[Prontera Acolyte]";
+			mes "You should try out each job's manuals.";
+			mes "Go through them thoroughly and decide carefully.";
+			mes "Of course, I will welcome you anytime.";
+			close;
+		case 2:
+			mes "[Prontera Acolyte]";
+			mes "That's great.";
+			mes "Then I will completely end the Training Process and send you to Prontera's Sanctuary.";
 			callfunc "F_NvErase",1;
-			savepoint "geffen",119,38;
-			warp "geffen_in",163,98;
+			close2;
+			savepoint "prontera",117,72;
+			warp "prt_church",172,19;
 			end;
 		}
-		mes "[Mage Guild Member]";
-		mes "Please test what Mage skills are all about before you decide.";
-		mes "We are always welcome to have you!";
-		close;
 	case 3:
-		set .@quest, checkquest(7124);
-		if (.@quest == -1) {
-			mes "[Mage Guild Member]";
-			mes "Huh? Quest?";
-			mes "Hmm... What would be suited for you...?";
-			mes "Would you like to hunt Lunatics by using Bolt skills?";
-			next;
-			mes "^4d4dffYou have received a Hunting quest from the Mage Guide.";
-			mes "You can get more information about the quest from the quest window.^000000";
-			setquest 7124;
-			next;
-			mes "[Mage Guild Member]";
-			mes "You are able to use 'Fire Bolt' skill that is shown on the Mage manual.";
-			mes "I will wait for you here.";
-			mes "Good luck!";
-			close;
-		}
-		else if (.@quest == 1) {
-			if (checkquest(7124,HUNTING) == 2) {
-				mes "[Mage Guild Member]";
-				mes "You have done excellent job.";
-				mes "So, did you find any interests about Mages?";
-				mes "Alright. I will give something...";
-				mes "Here are Novice Butterfly Wings, please take them.";
-				completequest 7124;
-				getitem 12324, 30;	// N_Butterfly_Wing
-				getexp 5000,100;
-				close;
-			}
-			mes "[Mage Guild Member]";
-			mes "The quest is that you have to";
-			mes "hunt Lunatics and bring 5 clovers.";
-			close;
-		}
-		else if (.@quest == 2) {
-			mes "[Mage Guild Member]";
-			mes "You have already completed the quest.";
-			mes "Once you enter the main world, you can get various exciting quests there!";
-			next;
-			mes "[Mage Guild Member]";
-			mes "This should be enough for your training.";
-			close;
-		}
-		mes "[Mage Guild Member]";
-		mes "I'm sorry but I don't have any quests to give you right now.";
-		close;
-	case 4:
-		mes "[Mage Guild Member]";
-		mes "If you have any questions about Mages, feel free to ask me.";
-		mes "I think you could be a intelligent Mage...";
+		mes "[Prontera Acolyte]";
+		mes "If you have any questions about Acolytes, please ask me anytime.";
+		mes "Our God, Odin awaits adventurers like you.";
 		close;
 	}
 }
+new_1-3,101,41,3	duplicate(NvAcolyte)	Acolyte Guide#nv1	4_F_SISTER
+new_2-3,101,41,3	duplicate(NvAcolyte)	Acolyte Guide#nv2	4_F_SISTER
+new_3-3,101,41,3	duplicate(NvAcolyte)	Acolyte Guide#nv3	4_F_SISTER
+new_4-3,101,41,3	duplicate(NvAcolyte)	Acolyte Guide#nv4	4_F_SISTER
+new_5-3,101,41,3	duplicate(NvAcolyte)	Acolyte Guide#nv5	4_F_SISTER
 
-new_1-3,101,41,4	duplicate(NvMag)	Mage Guide#nv1	123
-new_2-3,101,41,4	duplicate(NvMag)	Mage Guide#nv2	123
-new_3-3,101,41,4	duplicate(NvMag)	Mage Guide#nv3	123
-new_4-3,101,41,4	duplicate(NvMag)	Mage Guide#nv4	123
-new_5-3,101,41,4	duplicate(NvMag)	Mage Guide#nv5	123
-
-// ---------------------------- Thief Guide ---------------------------------
--	script	Thief Guide#nv::NvThf	118,{
-	if(job_novice_q < 16) {
+-	script	Thief Guide#newbe10::NvThief	-1,{
+	if (job_novice_q < 15) {
 		mes "[Thief Guild Member]";
 		mes "You look like you are not done with Instructor Brade's lessons.";
 		close;
@@ -1290,39 +1585,41 @@ new_5-3,101,41,4	duplicate(NvMag)	Mage Guide#nv5	123
 		mes "They are also feared for their use of poison, which slowly weakens their enemies.";
 		next;
 		mes "[Thief Guild Member]";
-		mes "In jeopardy, or in the case that thieves do not want to reveal themselves, they can use their skill to hide themselves easily.";
+		mes "In jeopardy, or in the case that thieves do not want to reveal themselves,";
+		mes "they can even use their skill to hide themselves easily.";
 		next;
 		mes "[Thief Guild Member]";
-		mes "Thieves can change their jobs to ^8C2121Assassins^000000 or ^8C2121Rogues.^000000";
-		if(countitem(2820) == 0 && (getequipid(EQI_ACC_L) != 2820 || getequipid(EQI_ACC_R) != 2820)) {
-			next;
+		mes "Thieves can change their jobs to ^8E2323Assassins^000000 or ^8E2323Rogues^000000.";
+		next;
+		if (isequipped(2820) || countitem(2820)) {
 			mes "[Thief Guild Member]";
-			mes "If you want, I'll give you a Thief skill manual.";
-			mes "Would you like to experience the skills of a Thief?";
-			next;
-			if(select("Yes, I would.:No, I don't.") == 2) {
-				mes "[Thief Guild Member]";
-				mes "Oh, are you sure?";
-				mes "Class selection is very important so please consider it carefully.";
-				mes "If you want to ask about Thieves, please talk to me any time.";
-				close;
-			}
+			mes "The class manual can help you understand what it is to be a Thief by using the skills that are essential to all Thieves.";
+			close;
+		}
+		mes "[Thief Guild Member]";
+		mes "If you want, I'll give you a Thief skill manual.";
+		mes "Would you like to experience the skills of a Thief?";
+		next;
+		switch(select("Yes, I would.:No, I don't.")) {
+		case 1:
 			mes "[Thief Guild Member]";
 			mes "Here, please take the Thief manual.";
 			mes "I'll just take the other class manuals while I'm at it.";
 			next;
-			mes "[Thief Guild Member]";
-			mes "Here, please take the Thief manual.";
-			mes "I'll just take the other class manuals while I'm at it.";
 			callfunc "F_NvErase";
-			getitem 2820,1;	// Thief_Manual
+			getitem 2820,1; //Thief_Manual
 			next;
 			mes "[Thief Guild Member]";
 			mes "Make sure to equip the Skill Manual by double-clicking it in the Inventory Window.";
-			mes "Open your Skill Tree by pressing ^4A4AFFAlt + S^000000 and minimize the window by pressing the '-' button on the top right corner of the window to see the available skills.";
+			mes "Open your Skill Tree by pressing ^4d4dffAlt + S^000000 and minimize the window by pressing the ^4d4dff'-'^000000 button on the top right corner of the window to see the available skills.";
+			close;
+		case 2:
+			mes "[Thief Guild Member]";
+			mes "Oh, are you sure?";
+			mes "Class selection is very important so please consider it carefully.";
+			mes "If you want to ask about Thieves, please talk to me any time.";
+			close;
 		}
-		close;
-
 	case 2:
 		mes "[Thief Guild Member]";
 		mes "Do you really want to be a Thief?";
@@ -1332,20 +1629,22 @@ new_5-3,101,41,4	duplicate(NvMag)	Mage Guide#nv5	123
 		mes "You already reached the required job level, didn't you?";
 		mes "Do you want to finish the Novice training and go to the Thief Guild?";
 		next;
-		if(select("Let me consider it again.:Yes, I do.") == 2) {
+		switch(select("Let me consider it again.:Yes, I do.")) {
+		case 1:
+			mes "[Thief Guild Member]";
+			mes "Have you tried all of the class manuals yet?";
+			mes "If you're undecided what job to take on I suggest you try talking to all the Guides first.";
+			close;
+		case 2:
 			mes "[Thief Guild Member]";
 			mes "Ok, I see.";
 			mes "Welcome. Then your Novice training is totally complete and you will be sent to the Thief Guild immediately.";
-			close2;
 			callfunc "F_NvErase",1;
-			savepoint "morocc",150,100;
+			close2;
+			savepoint "morocc",150,99;
 			warp "moc_prydb1",99,185;
 			end;
 		}
-		mes "[Thief Guild Member]";
-		mes "Have you tried all of the class manuals yet?";
-		mes "If you're undecided what job to take on I suggest you try talking to all the Guides first.";
-		close;
 	case 3:
 		set .@quest, checkquest(7127);
 		if (.@quest == -1) {
@@ -1363,52 +1662,50 @@ new_5-3,101,41,4	duplicate(NvMag)	Mage Guide#nv5	123
 			mes "If you equip the Thief manual, you can have the effect of the skill, Double Attack.";
 			mes "Double Attack and Hide are the main skills of the Thief.";
 			close;
-		}
-		else if (.@quest == 1) {
+		} else if (.@quest == 0 || .@quest == 1) {
 			if (checkquest(7127,HUNTING) == 2) {
 				mes "[Thief Guild Member]";
 				mes "You are very strong.";
 				mes "These are not many but let me give you a reward for your effort.";
 				completequest 7127;
-				getitem 12323, 50; // N_Fly_Wing
+				getitem 12323,50; //N_Fly_Wing
 				getexp 5000,100;
 				close;
+			} else {
+				mes "[Thief Guild Member]";
+				mes "Hunt 5 Willows and then come talk to me to finish your quest.";
+				close;
 			}
-			mes "[Thief Guild Member]";
-			mes "Hunt 5 Willows and then come talk to me to finish your quest.";
-			close;
-		}
-		else if (.@quest == 2) {
+		} else if (.@quest == 2) {
 			mes "[Thief Guild Member]";
 			mes "I think you finished that quest already, right?";
 			mes "You'll experience more of these quests as you grow as an adventurer in the world.";
 			next;
 			mes "[Thief Guild Member]";
 			mes "Your training is now complete.";
-			mes "If you choose to become a Thief I wish you goodluck.";
+			mes "If you choose to become a Thief I wish you good luck.";
+			close;
+		} else {
+			mes "[Thief Guild Member]";
+			mes "I'm sorry but I don't have any quests to give you right now.";
 			close;
 		}
-		mes "[Thief Guild Member]";
-		mes "I'm sorry but I don't have any quests to give you right now.";
-		close;
 	case 4:
 		mes "[Thief Guild Member]";
 		mes "If you have something to ask about the Thief job, feel free to ask me.";
 		close;
 	}
 }
+new_1-3,105,41,3	duplicate(NvThief)	Thief Guide#nv1	2_M_THIEFMASTER
+new_2-3,105,41,3	duplicate(NvThief)	Thief Guide#nv2	2_M_THIEFMASTER
+new_3-3,105,41,3	duplicate(NvThief)	Thief Guide#nv3	2_M_THIEFMASTER
+new_4-3,105,41,3	duplicate(NvThief)	Thief Guide#nv4	2_M_THIEFMASTER
+new_5-3,105,41,3	duplicate(NvThief)	Thief Guide#nv5	2_M_THIEFMASTER
 
-new_1-3,105,41,4	duplicate(NvThf)	Thief Guide#nv1	118
-new_2-3,105,41,4	duplicate(NvThf)	Thief Guide#nv2	118
-new_3-3,105,41,4	duplicate(NvThf)	Thief Guide#nv3	118
-new_4-3,105,41,4	duplicate(NvThf)	Thief Guide#nv4	118
-new_5-3,105,41,4	duplicate(NvThf)	Thief Guide#nv5	118
-
-// ---------------------------- Merchant Guide ------------------------------
--	script	Merchant Guide#nv::NvMer	97,{
-	if(job_novice_q < 16) {
+-	script	Merchant Guide#newbe10::NvMerchant	-1,{
+	if (job_novice_q < 15) {
 		mes "[Merchant Guildsman]";
-		mes "You are still in the process of training with sir Brade.";
+		mes "You are still in the process of training with sir Brad.";
 		close;
 	}
 	mes "[Merchant Guildsman]";
@@ -1417,46 +1714,50 @@ new_5-3,105,41,4	duplicate(NvThf)	Thief Guide#nv5	118
 	switch(select("Tell me about Merchants:I want to be a Merchant.:Give me a Quest.:Cancel")) {
 	case 1:
 		mes "[Merchant Guildsman]";
-		mes "Merchant? Simply put, they sell goods and make money.";
+		mes "Merchant? Simply put, he sells goods and makes money.";
 		mes "That's the main focus for any Merchant.";
 		next;
 		mes "[Merchant Guildsman]";
 		mes "We have special skills for making money.";
-		mes "We can buy goods at a lower price and sell them at a higher price.";
+		mes "We can buy goods at a lower price";
+		mes "and sell them at a higher price.";
 		next;
 		mes "[Merchant Guildsman]";
-		mes "Also Merchants can have Carts that we can store lots of items in.";
+		mes "Also Merchants can have Carts";
+		mes "that we can store lots of items in.";
 		next;
 		mes "[Merchant Guildsman]";
-		mes "^8C2121Merchants can transform to a Blacksmith or an Alchemist^000000 as their second job.";
-		if(countitem(2823) == 0 && (getequipid(EQI_ACC_L) != 2823 || getequipid(EQI_ACC_R) != 2823)) {
-			next;
+		mes "^8E2323Merchants can transform to a Blacksmith";
+		mes "^8E2323or an Alchemist^000000 as their second job.";
+		next;
+		if (isequipped(2823) || countitem(2823)) {
 			mes "[Merchant Guildsman]";
-			mes "Do you wan to see what it's like to be a Merchant?";
-			next;
-			if(select("I want to test Merchant skills.:I don't want to test it.") == 2) {
-				mes "[Merchant Guildsman]";
-				mes "Hum. Do you think so?";
-				mes "Ok, I agree with you. Choosing a job is very important in our life.";
-				mes "Just talk to me whenever you want to experience Merchant skills.";
-				close;
-			}
+			mes "I think you should test Merchant skills before you decide what to do.";
+			close;
+		}
+		mes "[Merchant Guildsman]";
+		mes "Do you want to see what it's like to be a Merchant?";
+		next;
+		switch(select("I want to test Merchant skills.:I don't want to test it.")) {
+		case 1:
 			mes "[Merchant Guildsman]";
 			mes "Here is the Merchant skill manual.";
 			mes "I will take other job manuals from you while I'm at it.";
 			next;
-			mes "[Merchant Guildsman]";
-			mes "Here is the Merchant skill manual.";
-			mes "I will take other job manuals from you while I'm at it.";
 			callfunc "F_NvErase";
-			getitem 2823,1;	// Merchant_Manual
+			getitem 2823,1; //Merchant_Manual
 			next;
 			mes "[Merchant Guildsman]";
 			mes "Make sure to equip the Skill Manual by double-clicking it in the Inventory Window.";
-			mes "Open your Skill Tree by pressing ^4A4AFFAlt + S^000000 and minimize the window by pressing the '-' button on the top right corner of the window to see the available skills.";
+			mes "Open your Skill Tree by pressing ^4d4dffAlt + S^000000 and minimize the window by pressing the ^4d4dff'-'^000000 button on the top right corner of the window to see the available skills.";
+			close;
+		case 2:
+			mes "[Merchant Guildsman]";
+			mes "Hum. Do you think so.";
+			mes "Ok, I agree with you. Choosing job is very important in our life.";
+			mes "Just talk to me whenever you want to experience Merchant skills.";
+			close;
 		}
-		close;
-
 	case 2:
 		mes "[Merchant Guildsman]";
 		mes "You want to be a Merchant?";
@@ -1466,20 +1767,22 @@ new_5-3,105,41,4	duplicate(NvThf)	Thief Guide#nv5	118
 		mes "Wait, have you checked your Job level?";
 		mes "Do you want to complete your Novice training and go straight to the Merchant Guild's union?";
 		next;
-		if(select("I will think about it again.:Yes, I want to go to the Merchant Guild's union.") == 2) {
+		switch(select("I will think about it again.:Yes, I want to go to the Merchant Guild's union")) {
+		case 1:
 			mes "[Merchant Guildsman]";
-			mes "Welcome!!";
-			mes "I will send you to the Merchant Guild's union after you complete your Novice training.";
-			close2;
+			mes "Ok, I hope you consider being a Merchant.";
+			mes "We are always welcome to have you!";
+			close;
+		case 2:
+			mes "[Merchant Guildsman]";
+			mes "That's great.";
+			mes "Then I will end the Training Process and send you to the Merchant Guild's union immediately.";
 			callfunc "F_NvErase",1;
-			savepoint "alberta",29,231;
+			close2;
+			savepoint "alberta",30,232;
 			warp "alberta_in",62,44;
 			end;
 		}
-		mes "[Merchant Guildsman]";
-		mes "Ok, I hope you consider being a Merchant.";
-		mes "We are always welcome to have you!";
-		close;
 	case 3:
 		set .@quest, checkquest(7126);
 		if (.@quest == -1) {
@@ -1492,12 +1795,12 @@ new_5-3,105,41,4	duplicate(NvThf)	Thief Guide#nv5	118
 			mes "If you equipped the Merchant manual you have the ability to use the 'Overcharge' and 'Discount' skills.";
 			setquest 7126;
 			next;
+			mes "[Merchant Guildsman]";
 			mes "I will wait for you here.";
 			mes "Good luck!";
 			close;
-		}
-		else if (.@quest == 1) {
-			if (Zeny > 299) {
+		} else if (.@quest == 0 || .@quest == 1) {
+			if (Zeny >= 300) {
 				mes "[Merchant Guildsman]";
 				mes "Excellent!";
 				mes "Zeny is the currency of Rune-Midgard.";
@@ -1513,23 +1816,23 @@ new_5-3,105,41,4	duplicate(NvThf)	Thief Guide#nv5	118
 				mes "Alright! What about Phracon?";
 				mes "Phracon is a metallic element which you can use for refining weapons.";
 				completequest 7126;
-				getitem 1010,7; // Phracon
+				getitem 1010,7; //Phracon
 				getexp 5000,100;
 				close;
+			} else {
+				mes "[Merchant Guildsman]";
+				mes "Zeny is the currency of Rune-Midgard.";
+				mes "You can make zeny by selling loot as well as through making smart business decisions.";
+				next;
+				mes "[Merchant Guildsman]";
+				mes "You can get loot by killing monsters. After hunting monsters, you can sell those loot to make a profit!";
+				mes "What a valuable job it is! Isn't it?";
+				next;
+				mes "[Merchant Guildsman]";
+				mes "Why don't you try to be a Merchant? Making money is not easy but it will be a great experience!";
+				close;
 			}
-			mes "[Merchant Guildsman]";
-			mes "Zeny is the currency of Rune-Midgard.";
-			mes "You can make zeny by selling loot as well as through making smart business decisions.";
-			next;
-			mes "[Merchant Guildsman]";
-			mes "You can get loot by killing monsters. After hunting monsters, you can sell those loot to make a profit!";
-			mes "What a valuable job it is! Isn't it?";
-			next;
-			mes "[Merchant Guildsman]";
-			mes "Why don't you try to be a Merchant? Making money is not easy but it will be a great experience!";
-			close;
-		}
-		else if (.@quest == 2) {
+		} else if (.@quest == 2) {
 			mes "[Merchant Guildsman]";
 			mes "You have already completed the quest.";
 			mes "Once you enter the main world, you can get various exciting quests there!";
@@ -1537,10 +1840,11 @@ new_5-3,105,41,4	duplicate(NvThf)	Thief Guide#nv5	118
 			mes "[Merchant Guildsman]";
 			mes "I think you're strong enough now to change your job right? Hahahaha don't waste too much time here Novice.";
 			close;
+		} else {
+			mes "[Merchant Guildsman]";
+			mes "I'm sorry but I don't have any quests to give you right now.";
+			close;
 		}
-		mes "[Merchant Guildsman]";
-		mes "I'm sorry but I don't have any quests to give you right now.";
-		close;
 	case 4:
 		mes "[Merchant Guildsman]";
 		mes "If you have any questions about Merchants, feel free to ask me.";
@@ -1548,197 +1852,266 @@ new_5-3,105,41,4	duplicate(NvThf)	Thief Guide#nv5	118
 		close;
 	}
 }
+new_1-3,109,41,3	duplicate(NvMerchant)	Merchant Guide#nv1	4W_M_01
+new_2-3,109,41,3	duplicate(NvMerchant)	Merchant Guide#nv2	4W_M_01
+new_3-3,109,41,3	duplicate(NvMerchant)	Merchant Guide#nv3	4W_M_01
+new_4-3,109,41,3	duplicate(NvMerchant)	Merchant Guide#nv4	4W_M_01
+new_5-3,109,41,3	duplicate(NvMerchant)	Merchant Guide#nv5	4W_M_01
 
-new_1-3,109,41,4	duplicate(NvMer)	Merchant Guide#nv1	97
-new_2-3,109,41,4	duplicate(NvMer)	Merchant Guide#nv2	97
-new_3-3,109,41,4	duplicate(NvMer)	Merchant Guide#nv3	97
-new_4-3,109,41,4	duplicate(NvMer)	Merchant Guide#nv4	97
-new_5-3,109,41,4	duplicate(NvMer)	Merchant Guide#nv5	97
-
-// ---------------------------- Archer Guide --------------------------------
--	script	Archer Guide#nv::NvArc	727,{
-	if(job_novice_q < 16) {
-		mes "[Archer Guide]";
+-	script	Archer Guide#newbe10::NvArcher	-1,{
+	if (job_novice_q < 15) {
+		mes "[Archer Guildsman]";
 		mes "You are still in the process of training with sir Brade.";
 		close;
 	}
-	mes "[Archer Guide]";
+	mes "[Archer Guildsman]";
 	mes "What can I help you with?";
 	next;
 	switch(select("Tell me about Archers:I want to be an Archer:Cancel")) {
 	case 1:
-		mes "[Archer Guide]";
+		mes "[Archer Guildsman]";
 		mes "Archers have specialized skills by using a Bow and have a variety of powerful skills.";
 		mes "Archers are good at staying back and picking off their targets.";
 		next;
-		mes "[Archer Guide]";
-		mes "Archers don't have great vitality so they have to keep their distance from enemies.";
+		mes "[Archer Guildsman]";
+		mes "Archers don't have great";
+		mes "vitality so they have to keep";
+		mes "their distance from enemies.";
 		next;
-		mes "[Archer Guide]";
+		mes "[Archer Guildsman]";
 		mes "On the other hand, Archers are attentive and have incredibly accurate eyes.";
 		mes "So once they are ready to attack, they can kill enemies before they're even aware of their presence.";
 		next;
-		mes "[Archer Guide]";
-		mes "^8C2121Archers can transform to many second jobs like a Hunter.^000000";
-		mes "^8C2121Besides Hunters, Archers can transform to a Bard, if they are male.^000000";
-		mes "^8C2121They can transform to a Dancer, if they are female.^000000";
-		if(countitem(2822) == 0 && (getequipid(EQI_ACC_L) != 2822 || getequipid(EQI_ACC_R) != 2822)) {
-			next;
-			mes "[Archer Guide]";
-			mes "Do you want to register to test skill experience?";
-			mes "Would you like to test Archer skills?";
-			next;
-			if(select("I want to test Archer skills.:I don't want to test it.") == 2) {
-				mes "[Archer Guide]";
-				mes "Hum. Do you think so.";
-				mes "Ok, I agree with you. Choosing a job is very important in our life.";
-				mes "Just talk to me whenever you want to experience Archer skills.";
-				close;
-			}
-			mes "[Archer Guide]";
+		mes "[Archer Guildsman]";
+		mes "^8E2323Archers can transform to many second jobs like a Hunter.";
+		mes "Besides Hunters, Archers can transform to a Bard, if they are male.";
+		mes "They can transform to a Dancer, if they are female^000000.";
+		next;
+		if (isequipped(2822) || countitem(2822)) {
+			mes "[Archer Guildsman]";
+			mes "I think you should test Archer skills before you decide what to do.";
+			mes "I can provide you our test skill manual.";
+			close;
+		}
+		mes "[Archer Guildsman]";
+		mes "Do you want to register to test skill experience?";
+		mes "Would like to test Archer skills?";
+		next;
+		switch(select("I want to test Archer skills.:I don't want to test it.")) {
+		case 1:
+			mes "[Archer Guildsman]";
 			mes "Here is the Archer manual.";
 			mes "I will take the other job manuals from you while you test the Archer manual out.";
 			next;
-			mes "[Archer Guide]";
-			mes "I will take the other job manuals from you while you test the Archer manual out.";
 			callfunc "F_NvErase";
-			getitem 2822,1;	// Archer_Manual
+			getitem 2822,1; //Archer_Manual
 			next;
-			mes "[Archer Guide]";
+			mes "[Archer Guildsman]";
 			mes "Make sure to equip the Skill Manual by double-clicking it in the Inventory Window.";
-			mes "Open your Skill Tree by pressing ^4A4AFFAlt + S^000000 and minimize the window by pressing the '-' button on the top right corner of the window to see the available skills.";
+			mes "Open your Skill Tree by pressing ^4d4dffAlt + S^000000 and minimize the window by pressing the ^4d4dff'-'^000000 button on the top right corner of the window to see the available skills.";
+			close;
+		case 2:
+			mes "[Archer Guildsman]";
+			mes "Hum. Do you think so.";
+			mes "Ok, I agree with you. Choosing a job is very important in our life.";
+			mes "Just talk to me whenever you want to experience Archer skills.";
+			close;
 		}
-		close;
 	case 2:
-		mes "[Archer Guide]";
+		mes "[Archer Guildsman]";
 		mes "You want to be an Archer?";
 		mes "Ok, then, I will send you to the Archer Guild right away.";
 		next;
-		mes "[Archer Guide]";
+		mes "[Archer Guildsman]";
 		mes "Wait, have you checked your Job level?";
 		mes "Do you want to complete the Novice training arena and go to the Archer Guild right now?";
 		next;
-		if(select("I will think about it again.:Yes, I want to go to the Archer Guild's union.") == 2) {
-			mes "[Archer Guide]";
-			mes "Welcome!!";
-			mes "I will send you to the Archer Guild after you complete your Novice training.";
-			close2;
+		switch(select("I will think about it again.:Yes, I want to go to the Archer Guilds union")) {
+		case 1:
+			mes "[Archer Guildsman]";
+			mes "Test out all the jobs if you have to but choose Archer because we're the best.";
+			mes "We are always welcome to have you!";
+			close;
+		case 2:
+			mes "[Archer Guildsman]";
+			mes "That's great.";
+			mes "Then I will completely end the Training Process and send you to the Archer Guild.";
 			callfunc "F_NvErase",1;
+			close2;
 			savepoint "payon",256,242;
 			warp "payon_in02",64,65;
 			end;
 		}
-		mes "[Archer Guide]";
-		mes "Test out all the jobs if you have to but choose Archer because we're the best.";
-		mes "We are always welcome to have you!";
-		close;
 	case 3:
-		mes "[Archer Guide]";
+		mes "[Archer Guildsman]";
 		mes "If you have any questions about Archers, feel free to ask me.";
 		mes "I think you could be a strong Archer young Novice.";
 		close;
 	}
 }
+new_1-3,113,41,3	duplicate(NvArcher)	Archer Guide#nv1	4_F_JOB_HUNTER
+new_2-3,113,41,3	duplicate(NvArcher)	Archer Guide#nv2	4_F_JOB_HUNTER
+new_3-3,113,41,3	duplicate(NvArcher)	Archer Guide#nv3	4_F_JOB_HUNTER
+new_4-3,113,41,3	duplicate(NvArcher)	Archer Guide#nv4	4_F_JOB_HUNTER
+new_5-3,113,41,3	duplicate(NvArcher)	Archer Guide#nv5	4_F_JOB_HUNTER
 
-new_1-3,113,41,4	duplicate(NvArc)	Archer Guide#nv1	727
-new_2-3,113,41,4	duplicate(NvArc)	Archer Guide#nv2	727
-new_3-3,113,41,4	duplicate(NvArc)	Archer Guide#nv3	727
-new_4-3,113,41,4	duplicate(NvArc)	Archer Guide#nv4	727
-new_5-3,113,41,4	duplicate(NvArc)	Archer Guide#nv5	727
-
-// ---------------------------- Acolyte Guide -------------------------------
--	script	Acolyte Guide#nv::NvAco	95,{
-	if(job_novice_q < 16) {
-		mes "[Prontera Acolyte]";
-		mes "You look like you are not done with Instructor Brade's lessons.";
+-	script	Mage Guide#newbe10::NvMage	-1,{
+	if (job_novice_q < 15) {
+		mes "[Mage Guild Member]";
+		mes "You are still in the process of training with Instructor Brade.";
 		close;
 	}
-	mes "[Prontera Acolyte]";
-	mes "What can I do for you?";
+	mes "[Mage Guild Member]";
+	mes "What can I help you with?";
 	next;
-	switch(select("What is an Acolyte?:Job change to Acolyte:Cancel")) {
+	switch(select("Tell me about Mages:I want to be a Mage:Give me a Quest:Cancel")) {
 	case 1:
-		mes "[Prontera Acolyte]";
-		mes "An Acolyte is someone who worships the goddess Freya sacrificing themselves to help others.";
+		mes "[Mage Guild Member]";
+		mes "Mages are those who can use magic when they need to protect their friends.";
+		mes "Mages can curse enemies using the elements of fire, water, earth and thunder magic.";
 		next;
-		mes "[Prontera Acolyte]";
-		mes "Acolytes use supportive skills to make combat easier.";
-		mes "It is essential to have an Acolyte in any successful party.";
+		mes "[Mage Guild Member]";
+		mes "However they cannot equip other weapons but staffs and books.";
+		mes "Because they are too delicate";
+		mes "to carry heavy weapons.";
 		next;
-		mes "[Prontera Acolyte]";
-		mes "^8C2121As an Acolyte, you can upgrade your future job to Priest or Monk.^000000";
+		mes "[Mage Guild Member]";
+		mes "But they can cover this weakness";
+		mes "by their remarkable magic skills.";
+		mes "That is why many people want";
+		mes "to become a Mage!";
 		next;
-		mes "[Prontera Acolyte]";
-		if(countitem(2821) == 0 && (getequipid(EQI_ACC_L) != 2821 || getequipid(EQI_ACC_R) != 2821)) {
-			next;
-			mes "[Prontera Acolyte]";
-			mes "If you want, I can give you a skill manual to experience what it is like to be an Acolyte.";
-			mes "Would you like to experience the skills of an Acolyte?";
-			next;
-			if(select("Yes, please.:No I'm not interested.") == 2) {
-				mes "[Prontera Acolyte]";
-				mes "Hum. Do you think so.";
-				mes "Ok, I agree with you. Choosing a job is very important in our life.";
-				mes "Just talk to me whenever you want to know about Acolytes.";
-				close;
-			}
-			mes "[Prontera Acolyte]";
-			mes "Here you go, the instruction manual of an Acolyte.";
-			mes "I will take away those other job's manuals while you study this one.";
+		mes "[Mage Guild Member]";
+		mes "Mages have to be in their guild for guild's power and honor.";
+		mes "This is one of reasons why Mages are popular in any parties and guilds.";
+		mes "Why don't you become a Mage?";
+		next;
+		mes "[Mage Guild Member]";
+		mes "^8E2323Mages can transform to Wizards";
+		mes "^8E2323or Sages as their second job^000000.";
+		next;
+		if (isequipped(2824) || countitem(2824)) {
+			mes "[Mage Guild Member]";
+			mes "I think you should test Mage skills before you decide what to do.";
+			mes "I can provide you with our test skill registration form.";
+			close;
+		}
+		mes "[Mage Guild Member]";
+		mes "Do you want to register to experience how it is to be a Mage?";
+		mes "Would you like to test Mage skills?";
+		next;
+		switch(select("I want to test Mage skills.:I don't want to test it.")) {
+		case 1:
+			mes "[Mage Guild Member]";
+			mes "Here is the Mage Manual.";
+			mes "I will take the other job registration forms and manuals from you.";
 			next;
-			mes "[Prontera Acolyte]";
-			mes "Here you go, the instruction manual of an Acolyte.";
-			mes "I will take away those other job's manuals while you study this one.";
 			callfunc "F_NvErase";
-			getitem 2821,1;	// Acolyte_Manual
+			getitem 2824,1; //Mage_Manual
 			next;
-			mes "[Prontera Acolyte]";
-			mes "Make sure to equip the Skill Manual by double-clicking it in the Inventory Window.";
-			mes "Open your Skill Tree by pressing ^4A4AFFAlt + S^000000 and minimizing the window by pressing the '-' button on the top right corner of the window to see the available skills.";
+			mes "[Mage Guild Member]";
+			mes "After equipping the Manual, open your Skill menu by pressing ALT+S.";
+			mes "Make sure to minimize your Skill tree by clicking the '-' button on the top right corner of the Skill Tree Window.";
+			close;
+		case 2:
+			mes "[Mage Guild Member]";
+			mes "Hum. Do you think so.";
+			mes "Ok, I agree with you. Choosing a job is very important in our life.";
+			mes "Just talk to me whenever you want to experience Mage skills.";
+			close;
 		}
-		close;
 	case 2:
-		mes "[Prontera Acolyte]";
-		mes "Of course, I assume you have enough job levels to become an Acolyte right?";
-		mes "Would you like to quit the Training Process and go to the Cathedral of Prontera?";
+		mes "[Mage Guild Member]";
+		mes "You want to be a Mage?";
+		mes "Ok, then, I will send you to the Mage Guild union in Geffen right away.";
 		next;
-		if(select("Let me reconsider.:I will go to the Cathedral.") == 2) {
-			mes "[Prontera Acolyte]";
+		mes "[Mage Guild Member]";
+		mes "Wait, have you checked your Job level?";
+		mes "Do you want to complete your Novice training and go straight to the Mage Guild's union?";
+		next;
+		switch(select("I will think about it again.:Yes, complete my training.")) {
+		case 1:
+			mes "[Mage Guild Member]";
+			mes "Please test what Mage skills are all about before you decide.";
+			mes "We are always welcome to have you!";
+			close;
+		case 2:
+			mes "[Mage Guild Member]";
 			mes "That's great.";
-			mes "Then I will completely end the Training Process and send you to the Cathedral of Prontera.";
-			close2;
+			mes "Then I will end the Training Process and send you to the Mage Guild union in Geffen right away.";
 			callfunc "F_NvErase",1;
-			savepoint "prontera",117,72;
-			warp "prt_church",172,19;
+			close2;
+			savepoint "geffen",119,37;
+			warp "geffen_in",163,98;
 			end;
 		}
-		mes "[Prontera Acolyte]";
-		mes "You should try out each job's manuals.";
-		mes "Go through them throughly and decide carefully.";
-		mes "Of course, I will welcome you anytime.";
-		close;
 	case 3:
-		mes "[Prontera Acolyte]";
-		mes "If you have any questions about Acolytes, please ask me anytime.";
-		mes "Our God, Odin awaits adventurers like you";
+		set .@quest, checkquest(7124);
+		if (.@quest == -1) {
+			mes "[Mage Guild Member]";
+			mes "Huh? Quest?";
+			mes "Hmm... What would be suited for you...?";
+			mes "Would you like to hunt Lunatics by using Bolt skills?";
+			next;
+			mes "^4d4dffYou have received a Hunting quest from the Mage Guide.";
+			mes "You can get more information about the quest from the quest window.^000000";
+			setquest 7124;
+			next;
+			mes "[Mage Guild Member]";
+			mes "You are able to use 'Fire Bolt' skill that is shown on the Mage manual.";
+			mes "I will wait for you here.";
+			mes "Good luck!";
+			close;
+		} else if (.@quest == 0 || .@quest == 1) {
+			if (checkquest(7124,HUNTING) == 2) {
+				mes "[Mage Guild Member]";
+				mes "You have done an excellent job.";
+				mes "So, did you find any interests about Mages?";
+				mes "Alright. I will give something...";
+				mes "Here are Novice Butterfly Wings, please take them.";
+				completequest 7124;
+				getitem 12324,30; //N_Butterfly_Wing
+				getexp 5000,100;
+				close;
+			} else {
+				mes "[Mage Guild Member]";
+				mes "The quest is that you have to";
+				mes "hunt Lunatics and bring 5 clovers.";
+				close;
+			}
+		} else if (.@quest == 2) {
+			mes "[Mage Guild Member]";
+			mes "You have already completed the quest.";
+			mes "Once you enter the main world, you can get various exciting quests there!";
+			next;
+			mes "[Mage Guild Member]";
+			mes "This should be enough for your training.";
+			close;
+		} else {
+			mes "[Mage Guild Member]";
+			mes "I'm sorry but I don't have any quests to give you right now.";
+			close;
+		}
+	case 4:
+		mes "[Mage Guild Member]";
+		mes "If you have any questions about Mages, feel free to ask me.";
+		mes "I think you could be a intelligent Mage...";
 		close;
 	}
 }
+new_1-3,117,41,3	duplicate(NvMage)	Mage Guide#nv1	2_F_MAGICMASTER
+new_2-3,117,41,3	duplicate(NvMage)	Mage Guide#nv2	2_F_MAGICMASTER
+new_3-3,117,41,3	duplicate(NvMage)	Mage Guide#nv3	2_F_MAGICMASTER
+new_4-3,117,41,3	duplicate(NvMage)	Mage Guide#nv4	2_F_MAGICMASTER
+new_5-3,117,41,3	duplicate(NvMage)	Mage Guide#nv5	2_F_MAGICMASTER
 
-new_1-3,117,41,4	duplicate(NvAco)	Acolyte Guide#nv1	95
-new_2-3,117,41,4	duplicate(NvAco)	Acolyte Guide#nv2	95
-new_3-3,117,41,4	duplicate(NvAco)	Acolyte Guide#nv3	95
-new_4-3,117,41,4	duplicate(NvAco)	Acolyte Guide#nv4	95
-new_5-3,117,41,4	duplicate(NvAco)	Acolyte Guide#nv5	95
-
-// ---------------------------- Bruce (Extended Jobs) -----------------------
--	script	Bruce#nv::NvBruce	57,{
+-	script	Bruce#nv::NvBruce	-1,{
 	mes "[Bruce]";
 	mes "Hello?";
 	mes "I'm here to guide you about extra jobs and special classes.";
 	next;
 	mes "[Bruce]";
-	mes "For special classes, there are Taekwon, Ninja, Super Novice, and Gunslinger.";
+	mes "For special classes, there are Taekwon Boy, Taekwon Girl, Ninja, Supernovice, Gunslinger.";
 	mes "Which job description do you want to hear?";
 	next;
 	while(1) {
@@ -1783,24 +2156,23 @@ new_5-3,117,41,4	duplicate(NvAco)	Acolyte Guide#nv5	95
 			break;
 		case 5:
 			mes "[Bruce]";
-			mes "If you need more information, you can always go to";
-			mes "'iro.ragnarokonline.com'";
+			mes "If you need more information,";
+			mes "you can always go to ^2F4F4F'www.ragnarok.co.kr'^000000";
 			close;
 		}
 	}
 }
+new_1-3,121,41,3	duplicate(NvBruce)	Bruce#nv1	1_M_LIBRARYMASTER
+new_2-3,121,41,3	duplicate(NvBruce)	Bruce#nv2	1_M_LIBRARYMASTER
+new_3-3,121,41,3	duplicate(NvBruce)	Bruce#nv3	1_M_LIBRARYMASTER
+new_4-3,121,41,3	duplicate(NvBruce)	Bruce#nv4	1_M_LIBRARYMASTER
+new_5-3,121,41,3	duplicate(NvBruce)	Bruce#nv5	1_M_LIBRARYMASTER
 
-new_1-3,121,41,4	duplicate(NvBruce)	Bruce#nv1	57
-new_2-3,121,41,4	duplicate(NvBruce)	Bruce#nv2	57
-new_3-3,121,41,4	duplicate(NvBruce)	Bruce#nv3	57
-new_4-3,121,41,4	duplicate(NvBruce)	Bruce#nv4	57
-new_5-3,121,41,4	duplicate(NvBruce)	Bruce#nv5	57
-
-//============================================================================
-// Eden Group Officer (Real Combat Training)
-//============================================================================
--	script	Eden Group Officer#nv::NvEdn	-1,{
-	if(BaseLevel < 10) {
+// Eden Group Officer (iRO only)
+//============================================================
+/*
+-	script	Eden Group Officer::NvEden	-1,{
+	if (BaseLevel < 10) {
 		mes "[Eden Group Officer]";
 		mes "Hello, I am a representative of the Eden Group.";
 		mes "We are here to assist adventurers in Rune Midgard.";
@@ -1815,79 +2187,78 @@ new_5-3,121,41,4	duplicate(NvBruce)	Bruce#nv5	57
 		mes "Speak to me again once you have reached Base Level 10 and I will send you out of the training grounds.";
 		mes "Have you taken the quests from all of the Guides yet?";
 		close;
-	}else{
+	}
+	mes "[Eden Group Officer]";
+	mes "Great! You are ready to take on the challenges of the world.";
+	mes "What would you like to do?";
+	next;
+	switch(select("I want to leave the training grounds:Tell me about the towns.:Cancel")) {
+	case 1:
+		mes "[Eden Group Officer]";
+		mes "Looks like you are ready.";
+		mes "I guess you have made up your mind, huh?";
+		next;
 		mes "[Eden Group Officer]";
-		mes "Great! You are ready to take on the challenges of the world.";
-		mes "What would you like to do?";
+		mes "If you know what job you want to change to, you should ask the ^4A4AFFJob Guides^000000 to send you out of the training grounds.";
+		mes "What town would you like to go to?";
 		next;
-		switch(select("I want to leave the training grounds:Tell me about the towns.:Cancel")) {
+		switch(select("Prontera:Morocc:Payon:Alberta:Geffen:Cancel")) {
 		case 1:
 			mes "[Eden Group Officer]";
-			mes "Looks like you are ready.";
-			mes "I guess you have made up your mind, huh?";
-			next;
-			mes "[Eden Group Officer]";
-			mes "If you know what job you want to change to, you should ask the ^4A4AFFJob Guides^000000 to send you out of the training grounds.";
-			mes "What town would you like to go to?";
-			next;
-			switch(select("Prontera:Morocc:Payon:Alberta:Geffen:Cancel")) {
-			case 1:
-				mes "[Eden Group Officer]";
-				mes "Prontera, the Capital city of the Rune-Midgarts Kingdom.";
-				mes "Take care and may Freya bless you on your journey.";
-				callsub S_Warp,"prontera",121,77,121,76;
-			case 2:
-				mes "[Eden Group Officer]";
-				mes "The desert city of Morocc was recently destroyed.";
-				mes "I will send you to the camp where the survivors are.";
-				callsub S_Warp,"moc_ruins",71,157,70,158;
-			case 3:
-				mes "[Eden Group Officer]";
-				mes "Just north of Payon you'll find the Archer Village.";
-				mes "Good luck on your journeys.";
-				callsub S_Warp,"payon",167,68,172,111;
-			case 4:
-				mes "[Eden Group Officer]";
-				mes "Alberta, the Port City.";
-				mes "It's the main hub of all trades.";
-				mes "If you want to travel to other civilizations, Alberta is the only outlet.";
-				callsub S_Warp,"alberta",115,57,116,58;
-			case 5:
-				mes "[Eden Group Officer]";
-				mes "Geffen, is known as the Magical City of Rune Midgard.";
-				mes "I will send you near the Fountains.";
-				mes "Goddess Freya bless you.";
-				callsub S_Warp,"geffen",118,36,128,66;
-			case 6:
-				mes "[Eden Group Officer]";
-				mes "If you're still not sure what job you want, talk to the Job Guides for more help.";
-				close;
-			}
+			mes "Prontera, the Capital city of the Rune-Midgarts Kingdom.";
+			mes "Take care and may Freya bless you on your journey.";
+			callsub S_Warp,"prontera",121,77,121,76;
 		case 2:
 			mes "[Eden Group Officer]";
-			mes "Prontera is the main capital of the Rune-Midgard Kingdom. Here you will find Merchants selling their items and is a favorite gathering point of adventurers.";
-			next;
-			mes "[Eden Group Officer]";
-			mes "The Acolyte Guild is here at the Prontera Church located to the northwest. The Swordman Guild can be found at Izlude, a town just southeast of Prontera.";
-			next;
-			mes "[Eden Group Officer]";
-			mes "Morocc is a city located in the desert that was recently destroyed due to an evil monster named Satan Morroc. The Thief Guild has been working to restore it to it's former glory.";
-			next;
+			mes "The desert city of Morocc was recently destroyed.";
+			mes "I will send you to the camp where the survivors are.";
+			callsub S_Warp,"moc_ruins",71,157,70,158;
+		case 3:
 			mes "[Eden Group Officer]";
-			mes "Payon is where the Archer Guild has made it's home. You can also find the Kafra Shop Employees selling their Item Mall items near the center of this city.";
-			next;
+			mes "Just north of Payon you'll find the Archer Village.";
+			mes "Good luck on your journeys.";
+			callsub S_Warp,"payon",167,68,172,111;
+		case 4:
 			mes "[Eden Group Officer]";
-			mes "Alberta is the trading hub of Rune Midgard. The Merchant Guild is located here and the docks have ships that will take you to different island cities.";
-			next;
+			mes "Alberta, the Port City.";
+			mes "It's the main hub of all trades.";
+			mes "If you want to travel to other civilizations, Alberta is the only outlet.";
+			callsub S_Warp,"alberta",115,57,116,58;
+		case 5:
 			mes "[Eden Group Officer]";
-			mes "Geffen is known as the magical city of Rune Midgard. The Mage Guild is located here and research for new magic is always being conducted at their headquarters.";
-			next;
+			mes "Geffen, is known as the Magical City of Rune Midgard.";
+			mes "I will send you near the Fountains.";
+			mes "Goddess Freya bless you.";
+			callsub S_Warp,"geffen",118,36,128,66;
+		case 6:
 			mes "[Eden Group Officer]";
-			mes "If you wish to be sent directly to the Job Guilds, then speak to the Job Guides and tell them that you want to change your job.";
-			close;
-		case 3:
+			mes "If you're still not sure what job you want, talk to the Job Guides for more help.";
 			close;
 		}
+	case 2:
+		mes "[Eden Group Officer]";
+		mes "Prontera is the main capital of the Rune-Midgard Kingdom. Here you will find Merchants selling their items and is a favorite gathering point of adventurers.";
+		next;
+		mes "[Eden Group Officer]";
+		mes "The Acolyte Guild is here at the Prontera Church located to the northwest. The Swordman Guild can be found at Izlude, a town just southeast of Prontera.";
+		next;
+		mes "[Eden Group Officer]";
+		mes "Morocc is a city located in the desert that was recently destroyed due to an evil monster named Satan Morroc. The Thief Guild has been working to restore it to it's former glory.";
+		next;
+		mes "[Eden Group Officer]";
+		mes "Payon is where the Archer Guild has made it's home. You can also find the Kafra Shop Employees selling their Item Mall items near the center of this city.";
+		next;
+		mes "[Eden Group Officer]";
+		mes "Alberta is the trading hub of Rune Midgard. The Merchant Guild is located here and the docks have ships that will take you to different island cities.";
+		next;
+		mes "[Eden Group Officer]";
+		mes "Geffen is known as the magical city of Rune Midgard. The Mage Guild is located here and research for new magic is always being conducted at their headquarters.";
+		next;
+		mes "[Eden Group Officer]";
+		mes "If you wish to be sent directly to the Job Guilds, then speak to the Job Guides and tell them that you want to change your job.";
+		close;
+	case 3:
+		close;
 	}
 
 S_Warp:
@@ -1901,26 +2272,16 @@ OnTouch:
 	emotion e_gasp;
 	end;
 }
+new_1-3,97,50,4	duplicate(NvEden)	Eden Group Officer#nv1	4_F_NOVICE,5,5
+new_2-3,97,50,4	duplicate(NvEden)	Eden Group Officer#nv2	4_F_NOVICE,5,5
+new_3-3,97,50,4	duplicate(NvEden)	Eden Group Officer#nv3	4_F_NOVICE,5,5
+new_4-3,97,50,4	duplicate(NvEden)	Eden Group Officer#nv4	4_F_NOVICE,5,5
+new_5-3,97,50,4	duplicate(NvEden)	Eden Group Officer#nv5	4_F_NOVICE,5,5
+*/
 
-new_1-3,97,50,4	duplicate(NvEdn)	Eden Group Officer#nv1	729,5,5
-new_2-3,97,50,4	duplicate(NvEdn)	Eden Group Officer#nv2	729,5,5
-new_3-3,97,50,4	duplicate(NvEdn)	Eden Group Officer#nv3	729,5,5
-new_4-3,97,50,4	duplicate(NvEdn)	Eden Group Officer#nv4	729,5,5
-new_5-3,97,50,4	duplicate(NvEdn)	Eden Group Officer#nv5	729,5,5
-
-// Merchant (Real Combat Training)
-//============================================================
--	shop	Merchant#nv::NvPotato	93,516:15
-
-new_1-3,100,50,4	duplicate(NvPotato)	Merchant#nv1	93
-new_2-3,100,50,4	duplicate(NvPotato)	Merchant#nv2	93
-new_3-3,100,50,4	duplicate(NvPotato)	Merchant#nv3	93
-new_4-3,100,50,4	duplicate(NvPotato)	Merchant#nv4	93
-new_5-3,100,50,4	duplicate(NvPotato)	Merchant#nv5	93
-
-// Trainer (Real Combat Training)
+// Trainer
 //============================================================
--	script	Level 1 Trainer#nv::NvBrutus	84,{
+-	script	::NvBrutus	-1,{
 	mes "[Trainer Brutus]";
 	mes "These monsters are all weak and easy to kill. But be careful, a lot of them are aggressive and out for blood!";
 	next;
@@ -1941,7 +2302,8 @@ new_5-3,100,50,4	duplicate(NvPotato)	Merchant#nv5	93
 			set .@menu$, .@menu$+":";
 		}
 		set .@i, select(.@menu$+"Cancel");
-		if (.@i < 7) warp "new_"+.@i+"-3",96,21;
+		if (.@i < 7)
+			warp "new_"+.@i+"-3",96,21;
 		close;
 	case 2:
 		mes "[Trainer Brutus]";
@@ -1950,23 +2312,23 @@ new_5-3,100,50,4	duplicate(NvPotato)	Merchant#nv5	93
 		next;
 		mes "[Trainer Brutus]";
 		mes "Level 1 has the weakest monsters.";
-		mes "There you'll find Poring, Drops, Lunatics, Fabres, and Chonchons.";
+		mes "There you'll find Porings, Drops, and Lunatics.";
 		next;
 		mes "[Trainer Brutus]";
 		mes "Level 2 is more challenging.";
-		mes "There you'll find Condors, Pickys, Willows, Fabres, and Roda Frogs.";
+		mes "There you'll find Porings, Lunatics, Willows, and Chonchons.";
 		next;
 		mes "[Trainer Brutus]";
-		mes "Level 3 is pretty much the same as Level 2.";
-		mes "There you'll find Condors, Pickys, Willows, Fabres, and Roda Frogs.";
+		mes "Level 3 is the same as Level 2.";
+		mes "There you'll find Porings, Lunatics, Willows, and Chonchons.";
 		next;
 		mes "[Trainer Brutus]";
 		mes "Level 4 has stronger monsters.";
-		mes "There you'll find Rockers, Spores, and Fabres.";
+		mes "There you'll find Willows, Hornets, Pickys, and Fabres.";
 		next;
 		mes "[Trainer Brutus]";
 		mes "Level 5 is the same as Level 4.";
-		mes "There you'll find Rockers, Spores, and Fabres.";
+		mes "There you'll find Willows, Hornets, Pickys, and Fabres.";
 		close;
 	case 3:
 		mes "[Trainer Brutus]";
@@ -1975,46 +2337,92 @@ new_5-3,100,50,4	duplicate(NvPotato)	Merchant#nv5	93
 		close;
 	}
 }
+new_1-3,103,50,4	duplicate(NvBrutus)	Level 1 Trainer#nv1	4_M_02
+new_2-3,103,50,4	duplicate(NvBrutus)	Level 2 Trainer#nv2	4_M_02
+new_3-3,103,50,4	duplicate(NvBrutus)	Level 3 Trainer#nv3	4_M_02
+new_4-3,103,50,4	duplicate(NvBrutus)	Level 4 Trainer#nv4	4_M_02
+new_5-3,103,50,4	duplicate(NvBrutus)	Level 5 Trainer#nv5	4_M_02
 
-new_1-3,103,50,4	duplicate(NvBrutus)	Level 1 Trainer#nv1	84
-new_2-3,103,50,4	duplicate(NvBrutus)	Level 2 Trainer#nv2	84
-new_3-3,103,50,4	duplicate(NvBrutus)	Level 3 Trainer#nv3	84
-new_4-3,103,50,4	duplicate(NvBrutus)	Level 4 Trainer#nv4	84
-new_5-3,103,50,4	duplicate(NvBrutus)	Level 5 Trainer#nv5	84
+// Monster Spawns
+//============================================================
+new_1-3,0,0,0,0	monster	Poring	1002,20,0,0,0
+new_1-3,0,0,0,0	monster	Drops	1113,10,0,0,0
+new_1-3,0,0,0,0	monster	Lunatic	1063,20,0,0,0
+
+new_2-3,0,0,0,0	monster	Chonchon	1011,10,0,0,0
+new_2-3,0,0,0,0	monster	Lunatic	1063,15,0,0,0
+new_2-3,0,0,0,0	monster	Willow	1010,10,0,0,0
+new_2-3,0,0,0,0	monster	Poring	1002,15,0,0,0
+
+new_3-3,0,0,0,0	monster	Chonchon	1011,10,0,0,0
+new_3-3,0,0,0,0	monster	Lunatic	1063,15,0,0,0
+new_3-3,0,0,0,0	monster	Willow	1010,10,0,0,0
+new_3-3,0,0,0,0	monster	Poring	1002,5,0,0,0
+
+new_4-3,0,0,0,0	monster	Hornet	1004,5,0,0,0
+new_4-3,0,0,0,0	monster	Willow	1010,15,0,0,0
+new_4-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
+new_4-3,0,0,0,0	monster	Picky	1049,15,0,0,0
+
+new_5-3,0,0,0,0	monster	Hornet	1004,5,0,0,0
+new_5-3,0,0,0,0	monster	Willow	1010,15,0,0,0
+new_5-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
+new_5-3,0,0,0,0	monster	Picky	1049,15,0,0,0
 
-// Random Stuff (Guards & Bulletin Board)
+// Potato Merchant
 //============================================================
-new_1-1,66,114,4	script	Bulletin Board#nv	111,{
-	mes "^FF0000=================================^000000";
-	mes "^FF0000 ^000000 ^E40CAA[Welcome]^CC0000 to ^FF9000Novice^7FFF00 Training ^00FF00Grounds ^E40CAA[Welcome]^FF0000^000000";
+-	shop	Potato Merchant#newbe09::NvPotato	4_F_04,516:-1
+
+new_1-3,100,50,3	duplicate(NvPotato)	Potato Merchant#nv1	4_F_04
+new_2-3,100,50,3	duplicate(NvPotato)	Potato Merchant#nv2	4_F_04
+new_3-3,100,50,3	duplicate(NvPotato)	Potato Merchant#nv3	4_F_04
+new_4-3,100,50,3	duplicate(NvPotato)	Potato Merchant#nv4	4_F_04
+new_5-3,100,50,3	duplicate(NvPotato)	Potato Merchant#nv5	4_F_04
+
+// Random Stuff
+//============================================================
+-	script	Bulletin Board::NvBulletin	-1,{
+	mes "^FF0000=================================";
+	mes "  ^E40CAA[Welcome] ^CC0000to^FF9000Novice^7FFF00 Training^00FF00 Grounds^E40CAA [Welcome] ";
 	mes "^FF0000=================================^000000";
 	close;
 }
+new_1-1,66,114,4	duplicate(NvBulletin)	Bulletin Board#nv1	HIDDEN_NPC
+new_2-1,66,114,4	duplicate(NvBulletin)	Bulletin Board#nv2	HIDDEN_NPC
+new_3-1,66,114,4	duplicate(NvBulletin)	Bulletin Board#nv3	HIDDEN_NPC
+new_4-1,66,114,4	duplicate(NvBulletin)	Bulletin Board#nv4	HIDDEN_NPC
+new_5-1,66,114,4	duplicate(NvBulletin)	Bulletin Board#nv5	HIDDEN_NPC
 
-new_1-1,144,116,2	script	Guard#nv1	105,{
+-	script	Guard::NvGuardA	-1,{
 	mes "[Training Grounds Guard]";
 	mes "Welcome to the Training Grounds.";
 	mes "You are now in the outer court yard. Please go inside the castle to begin your training.";
 	close;
 }
+new_1-1,144,116,2	duplicate(NvGuardA)	Guard#nv1a	8W_SOLDIER
+new_2-1,144,116,2	duplicate(NvGuardA)	Guard#nv2a	8W_SOLDIER
+new_3-1,144,116,2	duplicate(NvGuardA)	Guard#nv3a	8W_SOLDIER
+new_4-1,144,116,2	duplicate(NvGuardA)	Guard#nv4a	8W_SOLDIER
+new_5-1,144,116,2	duplicate(NvGuardA)	Guard#nv5a	8W_SOLDIER
 
-new_1-1,144,107,2	script	Guard#nv2	105,{
+-	script	Guard::NvGuardB	-1,{
 	mes "[Training Grounds Guard]";
-	if(rand(2)) {
-		mes "Come in!";
-		mes "I would like to welcome you to the Training Grounds!";
-		next;
-		mes "[Training Grounds Guard]";
+	if (rand(2)) {
+		mes "Come in! I would like to welcome you to the Training Grounds!";
 		mes "In here, you can prepare yourself for your future adventures throughout the Ragnarok world!";
-	}
-	else {
+	} else {
 		mes "Go, Novice, go!";
 		mes "Fight, and grow stronger! Look towards a brighter tomorrow!";
 	}
 	close;
 }
+new_1-1,144,107,2	duplicate(NvGuardB)	Guard#nv1b	8W_SOLDIER
+new_2-1,144,107,2	duplicate(NvGuardB)	Guard#nv2b	8W_SOLDIER
+new_3-1,144,107,2	duplicate(NvGuardB)	Guard#nv3b	8W_SOLDIER
+new_4-1,144,107,2	duplicate(NvGuardB)	Guard#nv4b	8W_SOLDIER
+new_5-1,144,107,2	duplicate(NvGuardB)	Guard#nv5b	8W_SOLDIER
 
-new_1-2,161,182,5	script	Instructor#nv	92,{
+-	script	Instructor#Edwin::NvEdwin	-1,{
 	mes "[Edwin]";
 	mes "Eh? Why are you still here?";
 	mes "There are no more courses that you need to take.";
@@ -2023,34 +2431,984 @@ new_1-2,161,182,5	script	Instructor#nv	92,{
 	mes "Well, I will let you out of here.";
 	mes "Go find the instructor, Brade.";
 	close2;
-	warp "new_1-2",100,100;
+	savepoint strnpcinfo(4),100,100;
+	warp strnpcinfo(4),100,100;
 	end;
 }
+new_1-2,161,182,5	duplicate(NvEdwin)	Instructor#nv1	4_F_03
+new_2-2,161,182,5	duplicate(NvEdwin)	Instructor#nv2	4_F_03
+new_3-2,161,182,5	duplicate(NvEdwin)	Instructor#nv3	4_F_03
+new_4-2,161,182,5	duplicate(NvEdwin)	Instructor#nv4	4_F_03
+new_5-2,161,182,5	duplicate(NvEdwin)	Instructor#nv5	4_F_03
+
+function	script	F_NvErase	{
+	if (getarg(0,0)) {
+		if (checkquest(7123) > -1) erasequest 7123;
+		if (checkquest(7124) > -1) erasequest 7124;
+		if (checkquest(7126) > -1) erasequest 7126;
+		if (checkquest(7127) > -1) erasequest 7127;
+	}
+	nude;
+	setarray .@manuals[0],countitem(2819),countitem(2820),countitem(2821),countitem(2822),countitem(2823),countitem(2824);
+	if (.@manuals[0]) delitem 2819,.@manuals[0]; //Swordman_Manual
+	if (.@manuals[1]) delitem 2820,.@manuals[1]; //Thief_Manual
+	if (.@manuals[2]) delitem 2821,.@manuals[2]; //Acolyte_Manual
+	if (.@manuals[3]) delitem 2822,.@manuals[3]; //Archer_Manual
+	if (.@manuals[4]) delitem 2823,.@manuals[4]; //Merchant_Manual
+	if (.@manuals[5]) delitem 2824,.@manuals[5]; //Mage_Manual
+	return;
+}
 
-// Real Combat Training Mobs
+// Pre-Renewal Backwards Compatibility
 //============================================================
-new_1-3,0,0,0,0	monster	ChonChon	1011,10,0,0,0
-new_1-3,0,0,0,0	monster	Drops	1113,10,0,0,0
-new_1-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
-new_1-3,0,0,0,0	monster	Lunatic	1063,10,0,0,0
-new_1-3,0,0,0,0	monster	Poring	1002,10,0,0,0
-new_2-3,0,0,0,0	monster	Condor	1009,10,0,0,0
-new_2-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
-new_2-3,0,0,0,0	monster	Picky	1050,10,0,0,0
-new_2-3,0,0,0,0	monster	Roda Frog	1012,10,0,0,0
-new_2-3,0,0,0,0	monster	Willow	1010,10,0,0,0
-new_3-3,0,0,0,0	monster	Condor	1009,10,0,0,0
-new_3-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
-new_3-3,0,0,0,0	monster	Picky	1050,10,0,0,0
-new_3-3,0,0,0,0	monster	Roda Frog	1012,10,0,0,0
-new_3-3,0,0,0,0	monster	Willow	1010,10,0,0,0
-new_4-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
-new_4-3,0,0,0,0	monster	Rocker	1052,10,0,0,0
-new_4-3,0,0,0,0	monster	Spore	1014,10,0,0,0
-new_4-3,0,0,0,0	monster	Thief Bug	1051,10,0,0,0
-new_4-3,0,0,0,0	monster	Thief Bug	1053,10,0,0,0
-new_5-3,0,0,0,0	monster	Fabre	1184,5,0,0,0
-new_5-3,0,0,0,0	monster	Rocker	1052,10,0,0,0
-new_5-3,0,0,0,0	monster	Spore	1014,1,0,0,0
-new_5-3,0,0,0,0	monster	Thief Bug	1051,1,0,0,0
-new_5-3,0,0,0,0	monster	Thief Bug	1053,1,0,0,0
\ No newline at end of file
+-	script	Final Tester::NvHanson	-1,{
+	if (nov_3_swordman < 40) {
+		mes "[Hanson]";
+		mes "Eh? Weird?";
+		next;
+		mes "[Hanson]";
+		mes "The Training Grounds have come under new management...";
+		mes "You seem to have come from the previous management.";
+		next;
+		mes "[Hanson]";
+		mes "You may continue, you should have enough experience if you made it here.";
+		next;
+		mes "[Hanson]";
+		mes "I will send you to any town that you'd like to go to.";
+		mes "Or do you have a favourite profession?";
+		next;
+		switch(select("Choose Profession.:Go to Towns.")) {
+		case 1:
+			mes "[Hanson]";
+			mes "What profession would you like to perform?";
+			next;
+			switch(select("Swordman:Acolyte:Thief:Merchant:Archer:Mage")) {
+			case 1:
+				mes "[Hanson]";
+				mes "That's a great choice!";
+				mes "After you receive all the supplies, I will teleport you to the Swordman Association.";
+				next;
+				mes "[Hanson]";
+				mes "The town you will be sent to is called Izlude which is a satellite of Prontera. The Swordman Association is located in the West of town. Please remember this.";
+				next;
+				callsub L_Supplies;
+				savepoint "izlude",128,98; // Old coordinates: (95,104)
+				warp "izlude_in",74,167;
+				end;
+			case 2:
+				mes "[Hanson]";
+				mes "You have chosen";
+				mes "to become an Acolyte.";
+				mes "You will be sent to";
+				mes "the town of Prontera.";
+				next;
+				mes "[Hanson]";
+				mes "The Prontera Sanctuary is located to the North-East in Prontera. Please remember this.";
+				next;
+				callsub L_Supplies;
+				savepoint "prontera",117,72;
+				warp "prt_church",172,19;
+				end;
+			case 3:
+				mes "[Hanson]";
+				mes "You have chosen";
+				mes "to become a Thief.";
+				mes "You will be sent to";
+				mes "the town of Morroc.";
+				next;
+				mes "[Hanson]";
+				mes "The Thief guild is in the underground 1st floor of a pyramid which is North-West of town. Please remember this.";
+				next;
+				callsub L_Supplies;
+				savepoint "morocc",150,99;
+				warp "moc_ruins",155,44;
+				end;
+			case 4:
+				mes "[Hanson]";
+				mes "You have chosen";
+				mes "to become a Merchant.";
+				mes "You will be sent to";
+				mes "the town of Alberta.";
+				next;
+				callsub L_Supplies;
+				savepoint "alberta",30,232;
+				warp "alberta_in",62,44;
+				end;
+			case 5:
+				mes "[Hanson]";
+				mes "You have chosen";
+				mes "to become an Archer.";
+				mes "You will be sent to";
+				mes "the town of Payon.";
+				next;
+				mes "[Hanson]";
+				mes "The Archer Guild is located to the North-West in Payon. Please remember this.";
+				next;
+				callsub L_Supplies;
+				savepoint "payon",256,242;
+				warp "payon_in02",64,65;
+				end;
+			case 6:
+				mes "[Hanson]";
+				mes "You have chosen";
+				mes "to become a Mage.";
+				mes "You will be sent to";
+				mes "the town of Geffen.";
+				next;
+				mes "[Hanson]";
+				mes "The Mage Academy is located in the North-West in town. Please remember this.";
+				next;
+				callsub L_Supplies;
+				savepoint "geffen",119,37;
+				warp "geffen_in",163,98;
+				end;
+			}
+		case 2:
+			mes "[Hanson]";
+			mes "To what town do you want to go?";
+			next;
+			callsub L_Warp, select("Prontera:Geffen:Morroc:Payon:Alberta:Never mind");
+			end;
+		}
+	} else {
+		mes "[Hanson]";
+		mes "You have received all the supplies.";
+		mes "To what town do you want to go?";
+		next;
+		callsub L_Warp, select("Prontera:Geffen:Morroc:Payon:Alberta");
+		end;
+	}
+	end;
+
+L_Supplies:
+	mes "[Hanson]";
+	mes "Let me give you";
+	mes "some supplies. Then";
+	mes "you will transported";
+	mes "to the chosen town.";
+	next;
+	mes "^660000List of Supplies^000000";
+	mes "^00003320 Free Tickets for Kafra Storage^000000";
+	mes "^00003330 Free Tickets for Kafra Transportation^000000";
+	mes "^0000331 Novice Cutter^000000";
+	mes "^0000331 Novice Adventurer's Suit^000000";
+	next;
+	mes "[Hanson]";
+	mes "Please check your inventory";
+	mes "to see if you have received all the supplies listed. Let me briefly inform you about the items you've received.";
+	next;
+	mes "[Hanson]";
+	mes "Free tickets for Kafra storage and transportation can be used for Kafra storage and teleport services.";
+	set nov_3_swordman,40;
+	getitem 7059,20; //Cargo_Free_Ticket
+	getitem 7060,30; //Warp_Free_Ticket
+	getitem 2393,1; //N_Adventurer's_Suit
+	getitem 13040,1; //N_Cutter
+	next;
+	mes "[Hanson]";
+	mes "You will now";
+	mes "be teleported.";
+	mes "Good luck,";
+	mes "^A62A2A"+strcharinfo(0)+"^000000";
+	mes "and farewell.";
+	close2;
+	return;
+
+L_Warp:
+	mes "[Hanson]";
+	switch(getarg(0)) {
+	case 1:
+		mes "I will send you to Prontera, the Capital City.";
+		close2;
+		savepoint "prontera",117,72;
+		warp "prontera",150,50;
+		end;
+	case 2:
+		mes "I will send you to Geffen, the City of Magic.";
+		close2;
+		savepoint "geffen",119,37;
+		warp "geffen",122,65;
+		end;
+	case 3:
+		mes "I will send you to Morroc, the Desert Town.";
+		close2;
+		savepoint "morocc",150,99;
+		warp "morocc",155,110;
+		end;
+	case 4:
+		mes "I will send you to Payon, the Mountain Village.";
+		close2;
+		savepoint "payon",70,100;
+		warp "payon",166,67;
+		end;
+	case 5:
+		mes "I will send you to Alberta, the Port City.";
+		close2;
+		savepoint "alberta",30,232;
+		warp "alberta",114,58;
+		end;
+	case 6:
+		mes "[Hanson]";
+		mes "Come back when you've made up your mind.";
+		close;
+	}
+}
+new_1-4,100,29,1	duplicate(NvHanson)	Final Tester#nv1	1_ETC_01
+new_2-4,100,29,1	duplicate(NvHanson)	Final Tester#nv2	1_ETC_01
+new_3-4,100,29,1	duplicate(NvHanson)	Final Tester#nv3	1_ETC_01
+new_4-4,100,29,1	duplicate(NvHanson)	Final Tester#nv4	1_ETC_01
+new_5-4,100,29,1	duplicate(NvHanson)	Final Tester#nv5	1_ETC_01
+
+// Job Test
+//============================================================
+-	script	Job Guide Lark::NvLark	-1,{
+	mes "[Lark]";
+	mes "Have you decided what job you're going to choose?";
+	next;
+	mes "[Lark]";
+	mes "I've prepared a test to see what's the best job for you, according to your answers.";
+	next;
+	mes "[Lark]";
+	mes "How about it?";
+	mes "Would you like to take the test?";
+	next;
+	set .@loop,1;
+	while(.@loop) {
+		switch(select("Take the test.:What's the test for?:No, thank you.")) {
+		case 1:
+			mes "[Lark]";
+			mes "Great!";
+			mes "Let's start the test~";
+			next;
+			set .@loop,0;
+			break;
+		case 2:
+			mes "[Lark]";
+			mes "I will ask you a few simple questions.";
+			mes "Through this test, we will check "+strcharinfo(0)+"'s personality and propensity so that we can find the most appropriate job for you.";
+			next;
+			mes "[Lark]";
+			mes "There are 3 different types of tests and a total of 30 questions.";
+			next;
+			mes "[Lark]";
+			mes "What do you think? Will you take the test?";
+			next;
+			break;
+		case 3:
+			mes "[Lark]";
+			mes "If you haven't decided what job you want yet,";
+			mes "I suggest that you take the test.";
+			close;
+		}
+	}
+	mes "[Lark]";
+	mes "Let's start the first test.";
+	mes "Choose the answer that you like the most.";
+	mes "^FF0000There are 5 questions.^000000";
+	next;
+	mes "[Lark]";
+	mes "In the middle of the dark, you're walking on the streets of Prontera when you suddenly hear someone scream.";
+	next;
+	mes "'Aaaahh!! Don't hurt me ~'";
+	next;
+	mes "You run to the place and see someone surrounded by punks. Because of your sudden appearance, the punks are surprised.";
+	mes "What would be your reaction in this situation?";
+	next;
+	switch(select("Fight against the punks:Cast Magic.:Call for Guards.:Throw rocks at them.")) {
+	case 1:
+		set .@question_01$, "You subdue them easily.";
+		set .@swordman_p, .@swordman_p+1;
+		set .@taekwon_p, .@taekwon_p+1;
+		set .@ninja_p, .@ninja_p+1;
+		break;
+	case 2:
+		set .@question_01$, "You cast a spell on them.";
+		set .@magician_p, .@magician_p+1;
+		break;
+	case 3:
+		set .@question_01$, "You call for help and Guards come to your aid.";
+		set .@acolyte_p, .@acolyte_p+1;
+		break;
+	case 4:
+		set .@question_01$, "You skillfully throw rocks at the punks.";
+		set .@archer_p, .@archer_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes .@question_01$+" You have destroyed the street punks.";
+	mes "After clearing up the mess, you approach the person who was being attacked.";
+	mes "Do you think the person who was surrounded by punks is a man or a woman?";
+	next;
+	switch(select("Man:Woman")) {
+	case 1:
+		set .@question_02_01$, "he";
+		set .@question_02_02$, "son";
+		break;
+	case 2:
+		set .@question_02_01$, "she";
+		set .@question_02_02$, "daughter";
+		break;
+	}
+	mes "[Lark]";
+	mes "You find out that "+.@question_02_01$+" is the "+.@question_02_02$+" of a very rich family in Alberta and Punks attacked while "+.@question_02_01$+" was on an errand for the family.";
+	mes "What kind of errand was "+.@question_02_01$+" doing?";
+	next;
+	switch(select("Delivering an important object:Delivering a small souvenir:Delivering a message")) {
+	case 1:
+		set .@swordman_p, .@swordman_p+1;
+		set .@archer_p, .@archer_p+1;
+		set .@magician_p, .@magician_p+1;
+		break;
+	case 2:
+		set .@thief_p, .@thief_p+1;
+		set .@taekwon_p, .@taekwon_p+1;
+		break;
+	case 3:
+		set .@acolyte_p, .@acolyte_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Thanks to your bravery, "+.@question_02_01$+" becomes your friend and decides to go on a trip.";
+	mes "Where are you going?";
+	next;
+	switch(select("Capital city, Prontera:Mountain city, Payon:Port city, Alberta:Magic city, Geffen:Satelite city, Izlude:Desert city, Morocc:Industrial city, Einbroch:World of natural life, Amatsu:Garden city, Hugel")) {
+	case 1:
+		set .@acolyte_p, .@acolyte_p+1;
+		break;
+	case 2:
+		set .@taekwon_p, .@taekwon_p+1;
+		break;
+	case 3:
+		set .@merchant_p, .@merchant_p+1;
+		break;
+	case 4:
+		set .@magician_p, .@magician_p+1;
+		break;
+	case 5:
+		set .@swordman_p, .@swordman_p+1;
+		break;
+	case 6:
+		set .@thief_p, .@thief_p+1;
+		break;
+	case 7:
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	case 8:
+		set .@ninja_p, .@ninja_p+1;
+		break;
+	case 9:
+		set .@archer_p, .@archer_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "You're having a great time. Do you feel like something will be happening or not?";
+	next;
+	switch(select("Happening:Not happening.")) {
+	case 1:
+		set .@thief_p, .@thief_p+1;
+		set .@swordman_p, .@swordman_p+1;
+		set .@ninja_p, .@ninja_p+1;
+		set .@taekwon_p, .@taekwon_p+1;
+		set .@magician_p, .@magician_p+1;
+		set .@thief_p, .@thief_p+1;
+		break;
+	case 2:
+		set .@acolyte_p, .@acolyte_p+1;
+		set .@merchant_p, .@merchant_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Let's go now for the second test. Choose the best answer in your own opinion.";
+	mes "^FF0000There are 5 questions.^000000";
+	next;
+	switch(select("Study:Exercise:Service:Violence")) {
+	case 1:
+		set .@magician_p, .@magician_p+1;
+		break;
+	case 2:
+		set .@thief_p, .@thief_p+1;
+		set .@swordman_p, .@swordman_p+1;
+		set .@taekwon_p, .@taekwon_p+1;
+		break;
+	case 3:
+		set .@acolyte_p, .@acolyte_p+1;
+		break;
+	case 4:
+		set .@thief_p, .@thief_p+1;
+		set .@ninja_p, .@ninja_p+1;
+		break;
+	}
+	switch(select("Change:Preservation")) {
+	case 1:
+		set .@magician_p, .@magician_p+1;
+		break;
+	case 2:
+		set .@acolyte_p, .@acolyte_p+1;
+		break;
+	}
+	switch(select("Consumer:Seller:Producer")) {
+	case 1:
+		set .@swordman_p, .@swordman_p+1;
+		set .@thief_p, .@thief_p+1;
+		set .@acolyte_p, .@acolyte_p+1;
+		set .@archer_p, .@archer_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	case 2:
+		set .@merchant_p, .@merchant_p+1;
+		break;
+	case 3:
+		set .@magician_p, .@magician_p+1;
+		break;
+	}
+	switch(select("Speed:Caution")) {
+	case 1:
+		set .@thief_p, .@thief_p+1;
+		set .@ninja_p, .@ninja_p+1;
+		break;
+	case 2:
+		set .@archer_p, .@archer_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	}
+	switch(select("Theory:Experience")) {
+	case 1:
+		set .@magician_p, .@magician_p+1;
+		break;
+	case 2:
+		set .@swordman_p, .@swordman_p+1;
+		set .@taekwon_p, .@taekwon_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Let's go now for the third test. Please answer (Yes) or (No) to each question.";
+	mes "^FF0000There are 20 questions.^000000";
+	next;
+	mes "[Lark]";
+	mes "Do you always pick up the money that you find on the ground?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@merchant_p, .@merchant_p+1;
+		set .@ninja_p, .@ninja_p+1;
+		break;
+	case 2:
+		set .@acolyte_p, .@acolyte_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "If you had the same name as someone of the opposite sex, would that make you less attracted to them?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@ninja_p, .@ninja_p+1;
+		set .@archer_p, .@archer_p+1;
+		break;
+	case 2:
+		set .@acolyte_p, .@acolyte_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you like being able to carry a lot of items at once?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@swordman_p, .@swordman_p+1;
+		set .@merchant_p, .@merchant_p+1;
+		break;
+	case 2:
+		set .@magician_p, .@magician_p+1;
+		set .@taekwon_p, .@taekwon_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you like reading books?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@taekwon_p, .@taekwon_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	case 2:
+		set .@ninja_p, .@ninja_p+1;
+		set .@merchant_p, .@merchant_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you read everything in a magazine?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@magician_p, .@magician_p+1;
+		break;
+	case 2:
+		set .@archer_p, .@archer_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you take the time to worry about what you are wearing?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@merchant_p, .@merchant_p+1;
+		set .@ninja_p, .@ninja_p+1;
+		break;
+	case 2:
+		set .@swordman_p, .@swordman_p+1;
+		set .@thief_p, .@thief_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you tell others what kind of fancy foods you've eaten recently?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@thief_p, .@thief_p+1;
+		set .@swordman_p, .@swordman_p+1;
+		break;
+	case 2:
+		set .@acolyte_p, .@acolyte_p+1;
+		set .@taekwon_p, .@taekwon_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you write things down in a notebook often?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@magician_p, .@magician_p+1;
+		set .@merchant_p, .@merchant_p+1;
+		break;
+	case 2:
+		set .@thief_p, .@thief_p+1;
+		set .@archer_p, .@archer_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you consider yourself attractive?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@ninja_p, .@ninja_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	case 2:
+		set .@acolyte_p, .@acolyte_p+1;
+		set .@swordman_p, .@swordman_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you like being in areas where a lot of people gather?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@acolyte_p, .@acolyte_p+1;
+		set .@swordman_p, .@swordman_p+1;
+		break;
+	case 2:
+		set .@archer_p, .@archer_p+1;
+		set .@ninja_p, .@ninja_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you like the idea of living a single life?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@thief_p, .@thief_p+1;
+		set .@ninja_p, .@ninja_p+1;
+		break;
+	case 2:
+		set .@acolyte_p, .@acolyte_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you like keeping your distance from others?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@gunslinger_p, .@gunslinger_p+1;
+		set .@archer_p, .@archer_p+1;
+		break;
+	case 2:
+		set .@taekwon_p, .@taekwon_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you think that having a good hiding space is important in battle?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@magician_p, .@magician_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		set .@archer_p, .@archer_p+1;
+		break;
+	case 2:
+		set .@taekwon_p, .@taekwon_p+1;
+		set .@magician_p, .@magician_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Would you defend your friends even if you knew they were wrong?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@swordman_p, .@swordman_p+1;
+		break;
+	case 2:
+		set .@thief_p, .@thief_p+1;
+		set .@ninja_p, .@ninja_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Would you try to convince an enemy not to fight you with logic?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@archer_p, .@archer_p+1;
+		set .@merchant_p, .@merchant_p+1;
+		break;
+	case 2:
+		set .@acolyte_p, .@acolyte_p+1;
+		set .@archer_p, .@archer_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Can you sit still in the same place for a long time?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@taekwon_p, .@taekwon_p+1;
+		set .@thief_p, .@thief_p+1;
+		break;
+	case 2:
+		set .@archer_p, .@archer_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you think that you can take a punch straight to the gut from an Orc?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@swordman_p, .@swordman_p+1;
+		set .@merchant_p, .@merchant_p+1;
+		break;
+	case 2:
+		set .@magician_p, .@magician_p+1;
+		set .@thief_p, .@thief_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you make up nicknames for your friends?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@gunslinger_p, .@gunslinger_p+1;
+		set .@archer_p, .@archer_p+1;
+		break;
+	case 2:
+		set .@acolyte_p, .@acolyte_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "Do you always have a plan B for various situations?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@thief_p, .@thief_p+1;
+		set .@gunslinger_p, .@gunslinger_p+1;
+		break;
+	case 2:
+		set .@gunslinger_p, .@gunslinger_p+1;
+		set .@merchant_p, .@merchant_p+1;
+		break;
+	}
+	mes "[Lark]";
+	mes "When talking with other people, do you take time so that the others have time to think?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		set .@magician_p, .@magician_p+1;
+		break;
+	case 2:
+		set .@ninja_p, .@ninja_p+1;
+		set .@archer_p, .@archer_p+1;
+		break;
+	}
+
+	// Calculate player's job.
+	// In the official script, higher .@who_job value always wins in a tie.
+	setarray .@points[0],
+		.@swordman_p, .@magician_p, .@archer_p, .@merchant_p, .@thief_p, .@acolyte_p, .@taekwon_p, .@gunslinger_p, .@ninja_p;
+	set .@max, .@points[0];
+	for(set .@i,1; .@i<9; set .@i,.@i+1) {
+		if (.@points[.@i] >= .@max) {
+			set .@max, .@points[.@i];
+			set .@ele, .@i;
+		}
+	}
+	set .@who_job, .@ele+1; // To match the official script's numbering.
+
+	mes "[Lark]";
+	mes "Thank you, have a long life.";
+	mes "The vocational aptitude assessment is finished.";
+	next;
+	mes "[Lark]";
+	mes "... ... the result is an aggregate. ... ...";
+	next;
+	mes "[Lark]";
+	mes "Tabulation is complete.";
+	mes "'^0000FFSo^000000', if you press this button";
+	mes "you can see the results.";
+	next;
+	switch(.@who_job) {
+	case 1:
+		set .@job$, "Swordman";
+		mes "[Lark]";
+		mes "...simple and straightforward...";
+		mes "...strong beliefs can affect the world...";
+		mes "...stands for hope that the people...";
+		mes "...to protect loyalty.";
+		mes "...thrusting you ...";
+		next;
+		break;
+	case 2:
+		set .@job$, "Wizard";
+		mes "[Lark]";
+		mes "...to understand all these things alone deulmyeo...";
+		mes "...hard work and independent thinking...";
+		mes "...type. Excellent judgement, naehyangjeok...";
+		mes "...and analytical, with insight...";
+		mes "...type : he observes everything...";
+		next;
+		break;
+	case 3:
+		set .@job$, "Archer";
+		mes "[Lark]";
+		mes "...immeasurable, have many emotions...";
+		mes "...to people who are trying to understand...";
+		mes "...trying to understand the type to receive. Also,...";
+		mes "...rejects mediocrity, and his true...";
+		mes "...type of life to live. Impressionable...";
+		mes "...rich and romantic ...";
+		next;
+		break;
+	case 4:
+		set .@job$, "Merchant";
+		mes "[Lark]";
+		mes "...to identify people's sense of hearing...";
+		mes "...outstanding determination and goals...";
+		mes "...oriented and a strong type of responsibility...";
+		mes "...seongchwiyok strong...";
+		next;
+		break;
+	case 5:
+		set .@job$, "Thief";
+		mes "[Lark]";
+		mes "...always makes life fun and who wants...";
+		mes "...always trying to find a new job...";
+		mes "...contribution to the world,...";
+		mes "...that type. Adventurer,...";
+		mes "...optimistic.";
+		next;
+		break;
+	case 6:
+		set .@job$, "Acolyte";
+		mes "[Lark]";
+		mes "...mentality makes him warm and considerate for others...";
+		mes "I know I have loved anyone,...";
+		mes "...be of help to others and for others...";
+		mes "...type of well-caring.";
+		mes "...always wants to help others.";
+		next;
+		break;
+	case 7:
+		set .@job$, "Taekwon Boy/Girl";
+		mes "[Lark]";
+		mes "...to believe with a stubborn conviction...";
+		mes "...heart and spirit of the grassland is consistent: it...";
+		mes "...make steps to move forward.";
+		mes "...type of comments or want to understand the beliefs...";
+		mes "...that type of effort to correct through training,...";
+		mes "...to have a sound mind...";
+		next;
+		break;
+	case 8:
+		set .@job$, "Gunslinger";
+		mes "[Lark]";
+		mes "People often praised Justice.";
+		mes "Sometimes fear and confusion may exist...";
+		mes "...that time, the definition of confusion...";
+		mes "...to maintain the balance, you're carrying the burden...";
+		mes "...for you ...";
+		next;
+		break;
+	case 9:
+		set .@job$, "Ninja";
+		mes "[Lark]";
+		mes "...to avoid the type of self-aspiring...";
+		mes "...married to a prominent goal and quietly avoiding...";
+		mes "...step and their goals...";
+		mes "...type of reaching your goal until they're complete...";
+		mes "...I do not regret it as ...";
+		next;
+		break;
+	default:
+		mes "[Lark]";
+		mes "An error has occurred.";
+		close;
+	}
+	mes "[Lark]";
+	mes "^8014EB"+.@job$+" is the job that suits you.^000000";
+	next;
+	mes "[Lark]";
+	mes "Well, "+.@job$+", you can choose among various career pathways.";
+	mes "Do you want to determine the job that suits you?";
+	mes "Do you want to select a job?";
+	next;
+	switch(select(.@job$+".:Any other profession.")) {
+	case 1:
+		mes "[Lark]";
+		mes "The Novice Training Center course is now shut down, "+.@job$+". Would you like to make this occupation your profession?";
+		next;
+		if(select("I will think about it again.:I'll choose the former.") == 1) {
+			mes "[Lark]";
+			mes "You will receive a book corresponding to each job type.";
+			mes "Please have enough experience to determine carefully the job that suits you.";
+			close;
+		}
+		break;
+	case 2:
+		mes "[Lark]";
+		mes "Quit now the Training Center Course. Would you like to make an occupation your career choice?";
+		next;
+		if(select("I will think about it again.:I still want to change my job.") == 1) {
+			mes "[Lark]";
+			mes "Primer of each class would have received.";
+			mes "Have enough experience to determine looked carefully, please.";
+			close;
+		}
+		mes "[Lark]";
+		mes "Yes, sir. Please select your desired job.";
+		next;
+		set .@who_job, select("Swordman:Wizard:Archer:Merchant:Thief:Acolyte:Taekwon Boy/Girl:Gunslinger:Ninja:I'll think again.");
+		if (.@who_job == 10) {
+			mes "[Lark]";
+			mes "The Novice Training Center has a lot of sea experience, please pay attention along the way.";
+			close;
+		}
+		break;
+	}
+	callfunc "F_NvErase",1;
+	set .@str$, "^A62A2A'"+strcharinfo(0)+"^000000'! Take care and may Freya bless you on your journey.";
+	switch(.@who_job) {
+	case 1:
+		mes "[Lark]";
+		mes "We will send you";
+		mes "to the swordman guild in Izlude, the Satelite city.";
+		mes .@str$;
+		mes "Good bye.";
+		close2;
+		savepoint "izlude",128,98; // Old coordinates: (95,104)
+		warp "izlude_in",74,167;
+		end;
+	case 2:
+		mes "[Lark]";
+		mes "We will send you";
+		mes "to the magician guild in Geffen, the Magical City.";
+		mes .@str$;
+		mes "Good bye.";
+		close2;
+		savepoint "geffen",119,37;
+		warp "geffen_in",163,98;
+		end;
+	case 3:
+		mes "[Lark]";
+		mes "We will send you";
+		mes "to the Archer Guild in Payon, the city of mountains.";
+		mes .@str$;
+		mes "Good bye.";
+		close2;
+		savepoint "payon",256,242;
+		warp "payon_in02",64,65;
+		end;
+	case 4:
+		mes "[Lark]";
+		mes "We will send you";
+		mes "to the merchant guild in Alberta, the Port City.";
+		mes .@str$;
+		mes "Good bye.";
+		close2;
+		savepoint "alberta",30,232;
+		warp "alberta_in",62,44;
+		end;
+	case 5:
+		mes "[Lark]";
+		mes "We will send you";
+		mes "to the thief guild in Morocc, the desert city.";
+		mes .@str$;
+		mes "Good bye.";
+		close2;
+		savepoint "morocc",150,99;
+		warp "moc_prydb1",99,185;
+		end;
+	case 6:
+		mes "[Lark]";
+		mes "We will send you";
+		mes "to the Prontera, the capital city of the Rune-Midgarts Kingdom.";
+		mes .@str$;
+		mes "Good bye.";
+		close2;
+		savepoint "prontera",117,72;
+		warp "prt_church",172,19;
+		end;
+	case 7:
+		mes "[Lark]";
+		mes "We will send you";
+		mes "to the Phoenix in Payon, the city of mountains.";
+		mes .@str$;
+		mes "Good bye.";
+		close2;
+		savepoint "payon",164,58;
+		warp "payon",163,141;
+		end;
+	case 8:
+		mes "[Lark]";
+		mes "You will be sent to the flyship";
+		mes "in Izlude, the Satelite city.";
+		mes "You can get on the flyship to go to Einbroch, the city of industries.";
+		mes .@str$;
+		mes "Good bye.";
+		close2;
+		savepoint "izlude",128,98; // Old coordinates: (95,104)
+		warp "izlude",128,67;
+		end;
+	case 9:
+		mes "[Lark]";
+		mes "We will send you";
+		mes "to the captain of the smuggling ship.";
+		mes "You can move to Amatsu";
+		mes "with the captain's help.";
+		mes .@str$;
+		mes "Good bye.";
+		close2;
+		savepoint "alberta",117,56;
+		warp "alberta",171,132;
+		end;
+	default:
+		mes "[Lark]";
+		mes "An error has occurred. If you keep having the same problem, please contact the local GM team.";
+		close;
+	}
+}
+new_1-3,106,50,4	duplicate(NvLark)	Job Guide Lark#01	4_M_KID1
+new_2-3,106,50,4	duplicate(NvLark)	Job Guide Lark#02	4_M_KID1
+new_3-3,106,50,4	duplicate(NvLark)	Job Guide Lark#03	4_M_KID1
+new_4-3,106,50,4	duplicate(NvLark)	Job Guide Lark#04	4_M_KID1
+new_5-3,106,50,4	duplicate(NvLark)	Job Guide Lark#05	4_M_KID1
diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt
index 4a8436dfe..044e386fe 100644
--- a/npc/re/jobs/novice/supernovice_ex.txt
+++ b/npc/re/jobs/novice/supernovice_ex.txt
@@ -1,19 +1,17 @@
 //===== Hercules Script ======================================
 //= Expanded Super Novice Job Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Euphy
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1a
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Job Change quest for Expanded Super Novice class.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 All dialogue is custom, contains some incorrect behaviors.
 //= 1.1 Switched to a translated copy of the official script
 //=     by Gennosuke Kouga, but vastly edited its content. [Euphy]
 //= 1.1a Replaced effect numerics with constants. [Euphy]
-//============================================================ 
+//============================================================
 
 function	script	Esseray_Ex	{
 	if (BaseLevel > 98 && JobLevel > 98) {
@@ -59,7 +57,7 @@ function	script	Esseray_Ex	{
 	else return;
 }
 
-beach_dun2,119,92,4	script	Fishing Novice#sp2	567,{
+beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 	if (checkquest(5092) >= 0) {
 		mes "[Fishing Novice]";
 		mes "Sh --------- !!";
@@ -479,7 +477,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	567,{
 		nude;
 		callfunc "F_ClearJobVar"; // -- Clears all job variables for the current player
 		jobchange roclass(eaclass()|EAJL_THIRD);
-		set EXSUPNOV_Q,5;	
+		set EXSUPNOV_Q,5;
 		emotion e_heh;
 		mes "[Nodor]";
 		mes "Puhahahahahahahahahahah!!";
@@ -589,7 +587,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	567,{
 	close;
 }
 
-airplane,33,47,5	script	Nudor#sp2	729,{
+airplane,33,47,5	script	Nudor#sp2	4_F_NOVICE,{
 	if (checkquest(5099) >= 0) {
 		mes "[Nudor]";
 		mes "Ahhh~ I have no money to buy any food.";
@@ -655,7 +653,7 @@ airplane,33,47,5	script	Nudor#sp2	729,{
 		mes "Woa~!! "+.@n+" Zeny! This helped me so much~ Tehee~";
 		mes "I can't believe it...";
 		changequest 5099,5100;
-		set Zeny, Zeny - .@n;
+		Zeny -= .@n;
 		if (.@i < 5) set EXSUPNOV_Q_, .@i;
 		else {
 			if (.@n > 1000000) set EXSUPNOV_Q_,4;
diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt
new file mode 100644
index 000000000..184f7071f
--- /dev/null
+++ b/npc/re/jobs/repair.txt
@@ -0,0 +1,271 @@
+//===== Hercules Script ======================================
+//= Job Repairs
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= [Official Conversion]
+//= Removes potentially conflicting job data.
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//= 1.1 Added GM management function. [Euphy]
+//= 1.2 Removed pointless comment. [Kisuka]
+//============================================================
+
+prt_in,38,104,4	script	Valerie	4_F_VALKYRIE,{
+	if (checkweight(1201,1) == 0) {
+		mes "I think you have too many items. Let's try it again after you take some out.";
+		close;
+	}
+	if (MaxWeight - Weight < 1000) {
+		mes "You're overweight with items so I don't think we can proceed any further. Challenge me after you've taken some items off.";
+		close;
+	}
+	mes "[Valerie]";
+	mes "I am Valerie; I help those with abnormalities. I am friends with Valkyrie.";
+	next;
+	mes "[Valerie]";
+	mes "If both abnormalities disappear then we must start the test over from scratch. What would you like to do?";
+	next;
+	switch(select("I don't have any abnormalities:I think my body has some abnormalities")) {
+	case 1:
+		mes "[Valerie]";
+		mes "That's a relief. Then please take care.";
+		close;
+	case 2:
+		mes "[Valerie]";
+		mes "Are you sure you want to intialize it and start over?";
+		next;
+		if(select("Nope:Yes, I want to start completely over") == 1) {
+			mes "[Valerie]";
+			mes "I understand. I'll see you next time";
+			close;
+		}
+		mes "[Valerie]";
+		mes "All items related to the existing conditions will disappear. Are you okay with this?";
+		next;
+		if(select("Nope:Yes, I want to start completely over.") == 1) {
+			mes "[Valerie]";
+			mes "I understand. I'll see you next time.";
+			close;
+		}
+		mes "[Valerie]";
+		mes "It seems that there are a sea of people who seemed to be cursed of not being able to get a significant other after going through with this. Are you still okay with this? ";
+		next;
+		if(select("Nope:I still want to intialize.") == 1) {
+			mes "[Valerie]";
+			mes "I understand. I will see you next time.";
+			close;
+		}
+		mes "[Valerie]";
+		mes "In extreme cases, some become crippled and can get ulcers. Do you still want to intilize former processes?";
+		next;
+		if(select("Nope:Please intilize the former processes") == 1) {
+			mes "[Valerie]";
+			mes "I understand. I will see you next time";
+			close;
+		}
+		specialeffect2 EF_INVENOM;
+		progressbar "0xffff00",3;
+
+		// Warlock - quest items
+		if (isequipped(2796) || isequipped(2797)) {
+			mes "[Valerie]";
+			mes "Please unequip the Magical Stone or Magical Stone Ring and try again.";
+			close;
+		}
+		if (countitem(2796) || countitem(2797)) {
+			if (isequipped(2796) || isequipped(2797)) {
+				mes "[Valerie]";
+				mes "Please talk to me after your replace all Magical Stones.";
+				close;
+			}
+			setarray .@items[0], 2796, 2797, 6152, 6151; //Magical_Stone,Magical_Stone_,Glittering_Crystal,Peice_Of_Great_Bradium
+			for(set .@i,0; .@i<4; set .@i,.@i+1) {
+				if (countitem(.@items[.@i]))
+					delitem .@items[.@i], countitem(.@items[.@i]);
+			}
+			mes "[Valerie]";
+			mes "You're carrying something that is unnecessary. I will sort it out for you.";
+			close;
+		}
+
+		// Baby and third job characters meet no further conditions.
+		if (eaclass()&(EAJL_BABY|EAJL_THIRD)) {
+			mes "[Valerie]";
+			mes "I don't think you should have any further business with me.";
+			close;
+		}
+
+		// Rebirth - variable
+		if ((Class >= Job_Swordman && Class <= Job_Crusader2) && ADVJOB != 0) {
+			set ADVJOB,0;
+			mes "[Valerie]";
+			mes "You're carrying big karma- You should erase it.";
+			next;
+			mes "[Valerie]";
+			mes "Please talk to me again as there could be additional problems.";
+			close;
+		}
+
+		// Second job - variable and quests
+		// callsub L_Second, "<variable>", <quest>;
+		if (Class == Job_Swordman) {
+			callsub L_Second, "KNIGHT_Q", 9012;
+			callsub L_Second, "CRUS_Q", 3015;
+		} else if (Class == Job_Archer) {
+			callsub L_Second, "HNTR_Q", 4013;
+			callsub L_Second, "BARD_Q", 3004;
+			callsub L_Second, "DANC_Q", 7006;
+		} else if (Class == Job_Mage) {
+			callsub L_Second, "WIZ_Q", 9018;
+			callsub L_Second, "SAGE_Q", 2052;
+		} else if (Class == Job_Merchant) {
+			callsub L_Second, "BSMITH_Q", 2016;
+			callsub L_Second, "ALCH_Q", 2040;
+		} else if (Class == Job_Thief) {
+			callsub L_Second, "ASSIN_Q", 8008;
+			callsub L_Second, "ROGUE_Q", 2027;
+		} else if (Class == Job_Acolyte) {
+			callsub L_Second, "PRIEST_Q", 8016;
+			callsub L_Second, "MONK_Q", 3032;
+		}
+
+		// Third job - variable and quests
+		// callsub L_Third, "<variable>", <main quest>, <first quest>, <last quest>{, <additional quest>};
+		if (BaseJob == Job_Assassin)
+			callsub L_Third, "job_3rd_gc", 7100, 7091, 7116;
+		else if (BaseJob == Job_Blacksmith)
+			callsub L_Third, "job__mechanic", 10101, 10090, 10101;
+		else if (BaseJob == Job_Hunter)
+			callsub L_Third, "job_ranger01", 8262, 8254, 8262;
+		else if (BaseJob == Job_Knight)
+			callsub L_Third, "job_rune_edq", 3219, 3200, 3220;
+		else if (BaseJob == Job_Priest)
+			callsub L_Third, "job_arch", 2191, 2187, 2191;
+		else if (BaseJob == Job_Wizard)
+			callsub L_Third, "job_wl", 11112, 11106, 11112;
+		else if (BaseJob == Job_Alchemist)
+			callsub L_Third, "job_gen", 2223, 2209, 2217, 2223;
+		else if (BaseJob == Job_Bard)
+			callsub L_Third, "job_min", 11154, 11135, 11154;
+		else if (BaseJob == Job_Crusader)
+			callsub L_Third, "job_royal", 0, 12090, 12094;
+		else if (BaseJob == Job_Dancer)
+			callsub L_Third, "job_wan", 2222, 2218, 2222;
+		else if (BaseJob == Job_Monk)
+			callsub L_Third, "job_shu", 11158, 11155, 11158;
+		else if (BaseJob == Job_Rogue)
+			callsub L_Third, "job_sha", 7180, 7160, 7180;
+		else if (BaseJob == Job_Sage)
+			callsub L_Third, "job_soc", 12098, 12096, 12098;
+
+		mes "[Valerie]";
+		mes "I don't think you should have any further business with me.";
+		close;
+	}
+
+L_Second:
+	if (getd(getarg(0)) != 0) {
+		setd getarg(0),0;
+		if (checkquest(getarg(1)) == 2)
+			erasequest getarg(1);
+		mes "[Valerie]";
+		mes "I will help clear your problems for you that came from your former attempts.";
+		next;
+		mes "[Valerie]";
+		mes "Please talk to me again as there could be additional problems.";
+		close;
+	} else
+		return;
+
+L_Third:
+	if (getd(getarg(0)) != 0) {
+		setd getarg(0),0;
+		if (getarg(1)) {
+			if (checkquest(getarg(1)) == 2)
+				erasequest getarg(1);
+		}
+		for(set .@i,getarg(2); .@i<=getarg(3); set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		if (getarg(4,0)) {
+			if (checkquest(getarg(4)) > -1)
+				erasequest getarg(4);
+		}
+		mes "[Valerie]";
+		mes "I will help clear your problems for you that came from your former attempts.";
+		next;
+		mes "[Valerie]";
+		mes "Please talk to me again as there could be additional problems.";
+		close;
+	} else
+		return;
+}
+
+-	script	Valerie#sign	-1,{
+	mes "^ff00ffI couldn't pay the office rent so I am temporarily relocating to the building across from the Prontera Refinery.^000000";
+	mes " ";
+	mes "^ff00ffValerie^000000";
+	close;
+}
+in_moc_16,17,33,4	duplicate(Valerie#sign)	Valerie#asn	2_BULLETIN_BOARD
+ein_in01,13,28,4	duplicate(Valerie#sign)	Valerie#bls	2_BULLETIN_BOARD
+hu_in01,386,377,4	duplicate(Valerie#sign)	Valerie#hnt	2_BULLETIN_BOARD
+prt_in,88,108,4	duplicate(Valerie#sign)	Valerie#knt	2_BULLETIN_BOARD
+prt_church,19,36,4	duplicate(Valerie#sign)	Valerie#prst	2_BULLETIN_BOARD
+gef_tower,110,30,4	duplicate(Valerie#sign)	Valerie#wiz	2_BULLETIN_BOARD
+comodo,215,155,4	duplicate(Valerie#sign)	Valerie#danc	2_BULLETIN_BOARD
+prt_castle,45,167,4	duplicate(Valerie#sign)	Valerie#cru	2_BULLETIN_BOARD
+prt_monk,59,253,4	duplicate(Valerie#sign)	Valerie#mnk	2_BULLETIN_BOARD
+moc_ruins,90,104,4	duplicate(Valerie#sign)	Valerie#rg	2_BULLETIN_BOARD
+yuno_in02,43,62,4	duplicate(Valerie#sign)	Valerie#sag	2_BULLETIN_BOARD
+prt_church,103,86,4	duplicate(Valerie#sign)	Valerie#arch	2_BULLETIN_BOARD
+que_job01,75,92,4	duplicate(Valerie#sign)	Valerie#gc	2_BULLETIN_BOARD
+yuno,129,150,4	duplicate(Valerie#sign)	Valerie#mech	2_BULLETIN_BOARD
+tur_dun01,159,40,4	duplicate(Valerie#sign)	Valerie#ran	2_BULLETIN_BOARD
+prt_in,167,24,4	duplicate(Valerie#sign)	Valerie#rk	2_BULLETIN_BOARD
+spl_in02,81,102,4	duplicate(Valerie#sign)	Valerie#wl	2_BULLETIN_BOARD
+alde_alche,38,181,4	duplicate(Valerie#sign)	Valerie#alche	2_BULLETIN_BOARD
+alberta,198,129,4	duplicate(Valerie#sign)	Valerie#min	2_BULLETIN_BOARD
+in_rogue,376,104,4	duplicate(Valerie#sign)	Valerie#sc	2_BULLETIN_BOARD
+ve_in,244,122,4	duplicate(Valerie#sign)	Valerie#shu	2_BULLETIN_BOARD
+xmas,166,209,4	duplicate(Valerie#sign)	Valerie#wan	2_BULLETIN_BOARD
+
+sec_in02,12,40,5	script	Job Repair	1_M_LIBRARYMASTER,1,1,{
+	callfunc "F_GM_NPC";
+	mes "Please input your password.";
+	next;
+	if (callfunc("F_GM_NPC","1854",1) == 1) {
+		set job_arch,100;
+		set job_3rd_gc,100;
+		set job__mechanic,100;
+		set job_ranger01,100;
+		set job_rune_edq,100;
+		set job_wl,100;
+		set job_gen,100;
+		set job_min,100;
+		set job_royal,100;
+		set job_sha,100;
+		set job_soc,100;
+		set job_shu,100;
+		set job_wan,100;
+		set KNIGHT_Q,100;
+		set PRIEST_Q,100;
+		set WIZ_Q,100;
+		set BSMITH_Q,100;
+		set ASSIN_Q,100;
+		set HNTR_Q,100;
+		set CRUS_Q,100;
+		set MONK_Q,100;
+		set SAGE_Q,100;
+		set ALCH_Q,100;
+		set ROGUE_Q,100;
+		set BARD_Q,100;
+		set DANC_Q,100;
+		set ADVJOB,15;
+	}
+	close;
+}
diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt
index 2cab9e388..3e94f180d 100644
--- a/npc/re/kafras/kafras.txt
+++ b/npc/re/kafras/kafras.txt
@@ -1,30 +1,32 @@
 //===== Hercules Script ======================================
 //= Kafras (Cities/Dungeons/Fields)
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Joseph
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
+//===== Current Version: =====================================
+//= 1.4
 //===== Description: =========================================
 //= Argument settings for callfunc "F_Kafra":
 //=  arg(0): 0 - Default Kafra message
 //=          1 - Niflhiem Kafra message
 //=          2 - Guild Kafra message
-//=  arg(1): 1 - Disable teleport menu 
+//=  arg(1): 1 - Disable teleport menu
 //=  arg(2): 1 - Disable info menu
 //=  arg(3): Cost of Storage service
 //=  arg(4): Cost of Rent a Pushcart service
-//===== Additional Comments: ================================= 
-//= 0.x Previous Authors: 
+//===== Additional Comments: =================================
+//= 0.x Previous Authors:
 //=     - L0ne_W0lf, Daegaladh
 //= 1.0 Merged and cleaned up Kafras. [Euphy]
 //= 1.1 Added Dewata Kafra. [Lemongrass]
-//============================================================ 
+//= 1.2 Added Port Malaya Kafras. [Euphy]
+//= 1.3 Added Eden Group Kafra. [Euphy]
+//= 1.3a Moved Rune Knight Kafra from job file. [Euphy]
+//= 1.4 Added Izlude duplicates. [Euphy]
+//============================================================
 
 // Brasilis
 //============================================================
-brasilis,197,221,4	script	Kafra Employee::kaf_bra	117,{
+brasilis,197,221,4	script	Kafra Employee::kaf_bra	4_F_KAFRA1,{
 	cutin "kafra_01",2;
 	callfunc "F_Kafra",0,3,0,80,700;
 	savepoint "brasilis",195,259;
@@ -33,14 +35,50 @@ brasilis,197,221,4	script	Kafra Employee::kaf_bra	117,{
 
 // Dewata
 //============================================================
-dewata,202,184,6	script	Kafra Employee::kaf_dewata	117,{
+dewata,202,184,6	script	Kafra Employee::kaf_dewata	4_F_KAFRA1,{
 	cutin "kafra_01",2;
 	callfunc "F_Kafra",0,10,1,40,700;
 	savepoint "dewata",206,174;
 	callfunc "F_KafEnd",0,1,"on Dewata Island";
 }
 
+// Eden Group
+//============================================================
+moc_para01,10,185,4	script	Kafra Employee::kaf_eden	4_F_KAFRA7,{
+	cutin "kafra_07",2;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "I only offer Storage!";
+	callfunc "F_Kafra",5,2,0,80,0;
+}
 
 // Izlude
 //============================================================
-izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee	117
+izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz	4_F_KAFRA1
+izlude_a,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_a	4_F_KAFRA1
+izlude_b,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_b	4_F_KAFRA1
+izlude_c,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_c	4_F_KAFRA1
+izlude_d,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_d	4_F_KAFRA1
+
+// Port Malaya
+//============================================================
+malaya,71,79,4	script	Kafra Employee::kaf_malaya1	4_MAL_KAFRA,{
+	callfunc "F_Kafra",0,3,2,500,700;
+	savepoint "malaya",44,56;
+	callfunc "F_KafEnd",0,1,"in Port Malaya";
+}
+
+malaya,234,204,4	script	Kafra Employee::kaf_malaya2	4_MAL_KAFRA,{
+	callfunc "F_Kafra",0,3,2,500,700;
+	savepoint "malaya",281,212;
+	callfunc "F_KafEnd",0,1,"in Port Malaya";
+}
+
+// Rune Knight
+//============================================================
+job3_rune01,92,62,3	script	Kafra Employee::kaf_rune	4_F_KAFRA4,{
+	cutin "kafra_04",2;
+	callfunc "F_KafSet";
+	callfunc "F_Kafra",0,9,2,80,700;
+}
diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt
index 7c3ca3cac..792b7abd9 100644
--- a/npc/re/merchants/3rd_trader.txt
+++ b/npc/re/merchants/3rd_trader.txt
@@ -1,20 +1,26 @@
 //===== Hercules Script ======================================
 //= 3rd Item Seller
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Masao, Mercurial
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Sells some 3rd Job related items.
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
+//= Sells some 3rd Job related items:
+//= - Poison Herbs, Rune Stones, Rare Herbs, Points
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Optimized Poison Herb Salesman NPC
 //= 1.2 Optimized and standardized. [Euphy]
-//============================================================ 
+//= 1.3 Added Malangdo/Mora Points NPC. [Euphy]
+//= 1.4 Updated to match the official scripts. [Euphy]
+//= 1.5 Added Izlude duplicates. [Euphy]
+//============================================================
 
-job3_guil01,79,96,3	script	Poison Herb Salesman::PHS	877,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 20000) {
+// Poison Herb Merchants (Guillotine Cross)
+//============================================================
+-	script	::phs	-1,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -22,68 +28,65 @@ job3_guil01,79,96,3	script	Poison Herb Salesman::PHS	877,{
 		mes "- after you lose some weight. -";
 		close;
 	}
-	mes "[Poison Herb Salesman]";
+	mes "[Poison Herb Merchant]";
 	mes "I am the professional";
-	mes "poison herb seller.";
-	mes "Which one do you want?";
-	mes "They cost 4,000 zeny each!";
-	set .@i, select("Nerium:Rantana:Makulata:Seratum:Scopolia:Amoena:Poison Kit")-1;
+	mes "Poison Herb merchant.";
+	mes "Each Herb costs 4,000 zeny.";
+	mes "What would you like?";
 	next;
+	set .@i, select("Nerium:Rantana:Makulata:Seratum:Scopolia:Amoena:Poison Kit:Cancel")-1;
+	mes "[Poison Herb Merchant]";
 	if (.@i < 6) {
-		mes "[Poison Herb Salesman]";
-		mes "How many do you want? You can";
-		mes "only buy a maximum of 2000 ea";
-		mes "and if you want to cancel, enter '0'.";
-		next;
-		input .@amount;
-		mes "[Poison Herb Salesman]";
-		if (.@amount == 0) {
-			mes "You've cancelled the trade.";
-			close;
-		}
-		if (.@amount > 2000) {
-			mes "Please check the maximum";
-			mes "amount and then try again.";
-			close;
-		}
-		if (Zeny < .@amount*4000) {
-			mes "Please check the money you have.";
-			mes "It doesn't seem like you have enough money.";
-			close;
-		}
-		set Zeny, Zeny-(.@amount*4000);
-		getitem 7932+.@i,.@amount;
-		mes "Thank you. See you~!";
-		close;
+		set .@item,7932+.@i;
+		set .@price,4000;
+		set .@max,2000;
+		set .@max$,"2,000";
+	} else if (.@i == 6) {
+		set .@item,7931;
+		set .@price,5000;
+		set .@max,500;
+		set .@max$,"500";
+		mes "Each Poison Kit costs 5,000 zeny.";
 	} else {
-		mes "[Poison Herb Salesman]";
-		mes "You can only buy";
-		mes "1 Poison Kit and it costs 5,000 zeny.";
-		mes "Will you buy it?";
-		next;
-		if(select("Yes, I will.:No, I won't.") == 2) {
-			mes "[Poison Herb Salesman]";
-			mes "Well, I see. See you~!";
-			close;
-		}
-		mes "[Poison Herb Salesman]";
-		if (Zeny < 5000) {
-			mes "Please check the money you have.";
-			mes "It doesn't seem like you have enough money.";
-			close;
-		}
-		set Zeny, Zeny-5000;
-		getitem 7931,1;
-		mes "[Poison Herb Salesman]";
-		mes "Thank you. See you~!";
+		mes "Well, I see. Come back again~!";
+		close;
+	}
+	mes "How many do you want?";
+	mes "You can only buy a maximum of '"+.@max+"' ea.";
+	mes "Enter '0' if you want to cancel.";
+	next;
+	input .@amount;
+	if (.@amount == 0) {
+		mes "[Poison Herb Merchant]";
+		mes "You've cancelled the trade.";
+		close;
+	}
+	if (.@amount > .@max) {
+		mes "[Poison Herb Merchant]";
+		mes "The number must be less than "+.@max$+"!";
+		close;
+	}
+	set .@total, .@amount * .@price;
+	if (Zeny < .@total) {
+		mes "[Poison Herb Merchant]";
+		mes "You don't have enough money.";
+		mes "Check how much money you have first.";
 		close;
 	}
+	Zeny -= .@total;
+	getitem .@item, .@amount;
+	mes "[Poison Herb Merchant]";
+	mes "Thank you. Come back again~!";
+	close;
 }
-morocc,190,96,4	duplicate(PHS)	Poison Herb Salesman#moc	877
-lhz_in02,16,205,4	duplicate(PHS)	Poison Herb Salesman#lhz	877
+job3_guil01,79,96,3	duplicate(phs)	Poison Herb Merchant	4_F_YUNYANG
+morocc,191,94,4	duplicate(phs)	Poison Herb Merchant#moc	4_F_YUNYANG	//Official: (190,96) -> in a wall
+lhz_in02,16,205,4	duplicate(phs)	Poison Herb Merchant#lhz	4_F_YUNYANG
 
-job3_rune01,90,62,3	script	Rune Salesman::runesale	853,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 20000) {
+// Rune Stone Merchants (Rune Knight)
+//============================================================
+-	script	::runesale	-1,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -91,57 +94,67 @@ job3_rune01,90,62,3	script	Rune Salesman::runesale	853,{
 		mes "- after you lose some weight. -";
 		close;
 	}
-	mes "[Rune Salesman]";
+	mes "[Rune Merchant]";
 	mes "Hey, do you need Runes?!";
-	mes "I sell all kinds of Rune Stones!";
-	mes "What kind of Rune do you want?";
+	mes "I sell all sorts of Rune Stones!";
+	mes "What would you like?";
 	next;
 	set .@i, select("Buy high-quality Rune Stones.:Buy ordinary Rune Stones.");
-	mes "[Rune Salesman]";
+	mes "[Rune Merchant]";
 	if (.@i == 1) {
 		mes "High-quality Runes!";
 		mes "They cost 2,500 zeny each!";
-		setarray .@rune[0],12734,2500;
+		set .@item,12734; //Runstone_Quality
+		set .@price,2500;
 	} else {
 		mes "Ordinary Rune Stones?";
 		mes "They cost 1,000 zeny each!";
+		set .@item,12737; //Runstone_Ordinary
+		set .@price,1000;
 		setarray .@rune[0],12737,1000;
 	}
-	mes "Tell me how many you want to buy";
+	mes "Tell me how many you want,";
 	mes "and remember, you can only";
-	mes "buy a maximum amount of 2000 ea!";
+	mes "buy a maximum of '2000' ea.";
 	next;
 	input .@amount;
-	mes "[Rune Salesman]";
 	if (.@amount == 0) {
-		mes "You're not buying? Go away!";
+		mes "[Rune Merchant]";
+		mes "You're not buying? Please leave!";
 		close;
 	}
 	if (.@amount > 2000) {
-		mes "Please check the maximum";
-		mes "amount and then come back to me again!";
+		mes "[Rune Merchant]";
+		mes "The number must be less than 2,000!";
 		close;
 	}
-	if (Zeny < .@amount*.@rune[1]) {
-		mes "Money! Money!";
-		mes "You are short of money!";
-		mes "Check the amount of money you have!!";
+	set .@total, .@amount * .@price;
+	if (Zeny < .@total) {
+		mes "[Rune Merchant]";
+		mes "Zeny! Zeny!";
+		mes "You don't have enough money.";
+		mes "Check how much money you have first.";
 		close;
 	}
-	if (!checkweight(.@rune[0],.@amount)) {
-		mes "You're not able to carry it, so why are you trying to buy it?!";
+	if (!checkweight(.@item,.@amount)) {
+		mes "[Rune Merchant]";
+		mes "It doesn't seem like you are able to carry it all, why are you trying it?!";
 		close;
 	}
-	set Zeny, Zeny-(.@amount*.@rune[1]);
-	getitem .@rune[0],.@amount;
-	mes "You can buy more again.";
-	mes "So, see you later.";
+	Zeny -= .@total;
+	getitem .@item, .@amount;
+	mes "[Rune Merchant]";
+	mes "Thank you.";
+	mes "Please come back again~!";
 	close;
 }
-prontera,168,228,3	duplicate(runesale)	Rune Salesman#1	853
+job3_rune01,90,62,3	duplicate(runesale)	Rune Merchant#job3	4_M_YURI
+prontera,168,228,3	duplicate(runesale)	Rune Merchant#prt	4_M_YURI
 
-job3_guil01,91,93,3	script	Rare Herb Collector	49,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 20000) {
+// Rare Herb Merchants (Guillotine Cross)
+//============================================================
+job3_guil01,91,93,3	script	Rare Herb Collector	1_M_03,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -151,27 +164,48 @@ job3_guil01,91,93,3	script	Rare Herb Collector	49,{
 	}
 	if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) {
 		mes "[Rare Poison Herb Collector]";
-		mes "I wander around the world and collect rare poison herbs. Recently, I am dealing in the herb called Izidor. If you are interested, you can buy them.";
+		mes "I wander around the world and collect rare poison herbs. Recently, I started dealing in the herb called Izidor. If you are interested, you can buy them.";
 		next;
-		set .@i, select("How can I buy them?:Exchange it with Animal Blood:Exchange it with a Bitter Herb:Exchange it with a Deadly Noxious Herb:Exchange it with a Frozen Rose:Exchange it with Ment:Exchange it with Hinalle")-1;
-		if (.@i == 0) {
+		set .@i, select("How can I buy them?:Exchange it for Animal Blood:Exchange it for a Bitter Herb:Exchange it for a Deadly Noxious Herb:Exchange it for a Frozen Rose:Exchange it for Ment:Exchange it for Hinalle")-2;
+		if (.@i == -1) {
 			mes "[Rare Poison Herb Collector]";
-			mes "You can buy any of those items for 10,000 zeny: Animal Blood, Bitter Herb, Deadly Noxious Herb, Frozen Rose, Ment or Hinalle. ";
+			mes "You can buy them for 10,000 zeny and one of these rare items, Animal Blood, Bitter Herb, Deadly Noxious Herb, Frozen Rose, Ment or an Hinalle.";
 			next;
 			mes "[Rare Poison Herb Collector]";
-			mes "Why I ask for money? That is just to pay a little respect to a collector like me. Ha ha ha...";
+			mes "Why do I ask money? That's just to pay a little respect to a collector like me. Ha ha ha...";
 			close;
 		} else {
-			setarray .@exchange[1],702,621,631,749,605,703;
+			setarray .@exchange[0],702,621,631,749,605,703;
+			set .@item, .@exchange[.@i];
+			set .@price, 10000;
+
 			mes "[Rare Poison Herb Collector]";
-			if (!countitem(.@exchange[.@i]) || Zeny < 10000) {
-				mes "Hey, try again after you've prepared all the requirements for the exchange.";
+			mes "How many do you want?";
+			mes "You can only buy a maximum of '2000' ea.";
+			mes "Enter '0' if you want to cancel.";
+			next;
+			input .@amount;
+			if (.@amount == 0) {
+				mes "[Rare Poison Herb Collector]";
+				mes "You've cancelled the trade.";
+				close;
+			}
+			if (.@amount > 2000) {
+				mes "[Rare Poison Herb Collector]";
+				mes "The number must be less than 2,000!";
+				close;
+			}
+			set .@total, .@amount * .@price;
+			if (countitem(.@item) < .@amount || Zeny < .@total) {
+				mes "[Rare Poison Herb Collector]";
+				mes "Hey, come back when you have all the requirements for the exchange.";
 				close;
 			}
-			mes "Thank you. I've received your payment.";
-			delitem .@exchange[.@i],1;
-			set Zeny, Zeny-10000;
-			getitem 709,1;
+			mes "[Rare Poison Herb Collector]";
+			mes "Good. I've received the money and the special item.";
+			delitem .@item, .@amount;
+			Zeny -= .@total;
+			getitem 709, .@amount; //Izidor
 			close;
 		}
 	}
@@ -180,8 +214,10 @@ job3_guil01,91,93,3	script	Rare Herb Collector	49,{
 	close;
 }
 
-gef_tower,105,172,5	script	Point Salesman#Sorcerer::pss	700,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 20000) {
+// Point Merchants (Sorcerer)
+//============================================================
+-	script	::pss	-1,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -189,11 +225,11 @@ gef_tower,105,172,5	script	Point Salesman#Sorcerer::pss	700,{
 		mes "- after you lose some weight. -";
 		close;
 	}
-	mes "[Point Salesman]";
+	mes "[Point Merchant]";
 	mes "Hello. I'm selling a catalyst called ^FF0000Points^000000 for Sorcerers. What would you like?";
 	next;
 	set .@i, select("Scarlet Points - 200z:Lime Green Points - 200z:Indigo Points - 200z:Yellow Wish Points - 200z:Cancel")-1;
-	mes "[Point Salesman]";
+	mes "[Point Merchant]";
 	if (.@i == 4) {
 		mes "You can't find the stuff you need?";
 		close;
@@ -205,7 +241,7 @@ gef_tower,105,172,5	script	Point Salesman#Sorcerer::pss	700,{
 	mes "If you want to cancel, enter 0.";
 	next;
 	input .@amount;
-	mes "[Point Salesman]";
+	mes "[Point Merchant]";
 	if (.@amount == 0) {
 		mes "You've cancelled the trade.";
 		close;
@@ -218,11 +254,27 @@ gef_tower,105,172,5	script	Point Salesman#Sorcerer::pss	700,{
 		mes "You don't have enough space in your inventory to buy this amount.";
 		close;
 	}
-	set Zeny, Zeny-(.@amount*200);
+	Zeny -= (.@amount*200);
 	getitem .@itemid[.@i],.@amount;
 	mes "Thank you very much. See you~!";
 	close;
 }
-comodo,241,103,6	duplicate(pss)	Point Salesman#1	700
-alberta,105,52,7	duplicate(pss)	Point Salesman#2	700
-veins,202,128,6	duplicate(pss)	Point Salesman#3	700
\ No newline at end of file
+gef_tower,105,172,5	duplicate(pss)	Point Merchant#Sorcerer	8_F_GIRL
+prt_in,131,66,0	duplicate(pss)	Point Merchant#Prontera	8_F_GIRL
+alberta,105,52,7	duplicate(pss)	Point Merchant#Alberta	8_F_GIRL
+aldebaran,133,114,5	duplicate(pss)	Point Merchant#Aldebaran	8_F_GIRL
+comodo,193,159,5	duplicate(pss)	Point Merchant#Comodo	8_F_GIRL
+geffen,129,49,5	duplicate(pss)	Point Merchant#Geffen	8_F_GIRL
+izlude,138,163,5	duplicate(pss)	Point Merchant#Izlude	8_F_GIRL	// Old coordinates: izlude (135,121)
+izlude_a,138,163,5	duplicate(pss)	Point Merchant#Izlude_a	8_F_GIRL
+izlude_b,138,163,5	duplicate(pss)	Point Merchant#Izlude_b	8_F_GIRL
+izlude_c,138,163,5	duplicate(pss)	Point Merchant#Izlude_c	8_F_GIRL
+izlude_d,138,163,5	duplicate(pss)	Point Merchant#Izlude_d	8_F_GIRL
+malangdo,214,163,5	duplicate(pss)	Point Merchant#Malangdo	8_F_GIRL
+mora,115,118,3	duplicate(pss)	Point Merchant#Mora	8_F_GIRL
+ra_in01,256,273,3	duplicate(pss)	Point Merchant#Rachel	8_F_GIRL
+veins,202,128,5	duplicate(pss)	Point Merchant#Veins	8_F_GIRL
+dicastes01,207,200,5	duplicate(pss)	Point Merchant#Dicastes	8_F_GIRL
+manuk,261,206,3	duplicate(pss)	Point Merchant#Manuk	8_F_GIRL
+splendide,207,160,5	duplicate(pss)	Point Merchant#Splendide	8_F_GIRL
+mid_camp,224,237,3	duplicate(pss)	Point Merchant#Midgard	8_F_GIRL
diff --git a/npc/re/merchants/advanced_refiner.txt b/npc/re/merchants/advanced_refiner.txt
new file mode 100644
index 000000000..ddd48b836
--- /dev/null
+++ b/npc/re/merchants/advanced_refiner.txt
@@ -0,0 +1,196 @@
+//===== Hercules Script ======================================
+//= Advanced Refiner
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Refiner that uses Enriched ores to increase upgrade success.
+//= After a conversation with Doddler, it's been established that
+//= the advanced refiner works similar the the "Bubble Gum" item.
+//= The success percentage is not "increased" however, if it fails
+//= You get a second try. This tries twice at the same time,
+//= effectively giving you a re-roll on your attempt.
+//===== Additional Comments: =================================
+//= 1.0 Added Malangdo Refiner "Holink". [Euphy]
+//============================================================
+
+malangdo,221,174,6	script	Holink#mal_cash	4_CAT_ADV1,{
+	disable_items;
+	mes "[Holink]";
+	mes "I am the meow~ Blacksmith Holink~";
+	mes "Master of refining, Holink~";
+	mes "I am the special cat Holink who learned from Morroc~";
+	mes "My daughter is so proud of me, Holink~";
+	mes "What should Holink~ refine today?";
+	next;
+	setarray .@position$[1],"Head","Body","Left Hand","Right Hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
+	set .@menu$,"";
+	for(set .@i,1; .@i<=10; set .@i,.@i+1)
+		set .@menu$, .@menu$+((getequipisequiped(.@i))?getequipname(.@i):.@position$[.@i]+"-[Empty]")+":";
+	set .@part, select(.@menu$);
+	if (!getequipisequiped(.@part)) {
+		mes "[Holink]";
+		switch(.@part) {
+		case 1:
+			mes "My teacher Aragam said meow~";
+			mes "There's no cure for stupidity...";
+			break;
+		case 2:
+			mes "There's nothing to see here, meow!!";
+			break;
+		case 3:
+			mes "Meow? What do you want me to do with this left hand...?";
+			break;
+		case 4:
+			mes "Meow? What do you want me to do with this right hand...?";
+			break;
+		case 5:
+			mes "Meow? You don't have anything on.";
+			break;
+		case 6:
+			mes "Kyang~! Do not mess with my sensitive olfactory, meow~.";
+			break;
+		case 7:
+		case 8:
+			mes "Meow? Where is the accessory?";
+			break;
+		case 9:
+		case 10:
+			mes "Meow? You talking about the other head parts, meow?~";
+			break;
+		}
+		close;
+	}
+	if (!getequipisenableref(.@part)) {
+		mes "[Holink]";
+		mes "Even Aragam can't refine such a thing, meow.";
+		close;
+	}
+	if (getequiprefinerycnt(.@part) >= 10) {
+		mes "[Holink]";
+		mes "Meow~ Perfect refining. Did Aragam do this, meow?~";
+		close;
+	}
+	mes "[Holink]";
+	switch(getequipweaponlv(.@part)) {
+	default:
+	case 0: // Armor
+		set .@price,15000;
+		set .@material,7619; //Enriched_Elunium
+		set .@type$,"armor";
+		mes "You have chosen an armor, meow~";
+		break;
+	case 1: // Level 1 Weapon
+		set .@price,500;
+		set .@material,7620; //Enriched_Oridecon
+		set .@type$,"weapon";
+		mes "A level 1 weapon...?";
+		break;
+	case 2: // Level 2 Weapon
+		set .@price,2000;
+		set .@material,7620; //Enriched_Oridecon
+		set .@type$,"weapon";
+		mes "Meow, a level 2 weapon...?";
+		break;
+	case 3: // Level 3 Weapon
+		set .@price,20000;
+		set .@material,7620; //Enriched_Oridecon
+		set .@type$,"weapon";
+		mes "Meow Meow~~ A level 3 weapon~~";
+		break;
+	case 4: // Level 4 Weapon
+		set .@price,50000;
+		set .@material,7620; //Enriched_Oridecon
+		set .@type$,"weapon";
+		mes "Me-Meow!... A level 4 weapon...!";
+		mes "I've only seen it twice while";
+		mes "learning from Aragam... Me-Meow!!";
+		break;
+	}
+	mes "You need ^ff9999"+getitemname(.@material)+"^000000 and ^ff9999"+.@price+"^000000 Zeny for this refine, meow~";
+	mes "Want to continue, meow?~";
+	next;
+	if(select("Yes!!:No!!") == 2) {
+		mes "[Holink]";
+		mes "Kyack!!";
+		mes "You don't belive in refine master Holink, meow?~";
+		close;
+	}
+	if (getequippercentrefinery(.@part) < 100) {
+		mes "[Holink]";
+		mes "Meow!!";
+		if (.@type$ == "armor")
+			mes "This armor was already refined so many times, meow.";
+		else {
+			mes "Danger. Danger~";
+			mes "This weapon was refined a lot, meow~";
+			next;
+			mes "[Holink]";
+		}
+		mes "You might break it if you continue";
+		mes "to try refining this item further, meow.";
+		next;
+		mes "[Holink]";
+		mes "Once the "+.@type$+" is broken, you can";
+		mes "never use it again, meow. Not to mention... all current";
+		mes "^ff0000cards and enchantments will vanish for sure^000000.";
+		mes "You still want to try, meow~?";
+		next;
+		if(select("Yes, I do!!:Forget about it!!") == 2) {
+			mes "[Holink]";
+			mes "Meow! Wise choice, meow.";
+			mes "But!!";
+			mes "I am not happy to see you doubting the refine master Holink, meow~";
+			close;
+		}
+	}
+	if (countitem(.@material) == 0 || Zeny < .@price) {
+		mes "[Holink]";
+		mes "You don't have the ingredients.";
+		mes "You need ^ff9999"+getitemname(.@material)+"^000000 and ^ff9999"+.@price+"^000000 Zeny, meow~";
+		mes "Go get it, meow~";
+		close;
+	}
+	delitem .@material,1;
+	Zeny -= .@price;
+	if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+		successrefitem .@part;
+		mes "[Holink]";
+		mes "Me~ Me~ Meow! Fun fun refining~";
+		next;
+		emotion e_kis;
+		mes "[Holink]";
+		mes "Perfect!! Perfect, meow!!";
+		mes "I am the disciple of the refining wizard Aragam~";
+		mes "Holink!!";
+		mes "Another day of successful refining, meow!!";
+		close;
+	}
+	failedrefitem .@part;
+	mes "[Holink]";
+	mes "Meo~ Meow~ Kyaaak!!";
+	next;
+	switch(rand(1,5)) {
+		case 1: emotion e_sob; break;
+		case 2: emotion e_swt2; break;
+		case 3: emotion e_wah; break;
+		case 4: emotion e_hmm; break;
+		case 5: emotion e_lv2; break;
+	}
+	mes "[Holink]";
+	mes "Meow!! Aaaaakk~~!!!!";
+	mes "Kyaaak!! I have failed, meow!!";
+	next;
+	mes "[Holink]";
+	mes "......";
+	mes "......";
+	mes "All~ Everything~ Broken, meow...";
+	next;
+	mes "[Holink]";
+	mes "Meow.... Master Aragam once said,";
+	mes "learn from your failures...";
+	mes "Human, this one failure will be the beginning of your success in the future.";
+	close;
+}
diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt
new file mode 100644
index 000000000..ed2c0c20a
--- /dev/null
+++ b/npc/re/merchants/alchemist.txt
@@ -0,0 +1,117 @@
+//===== Hercules Script ======================================
+//= Alchemist Shop
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Merchants for Alchemist Materials and Manuals.
+//===== Additional Comments: =================================
+//= 1.0 Split Geneticist shop from main file. [Euphy]
+//=     Updated dialogue to match the official script.
+//============================================================
+
+alde_alche,31,186,3	script	Craft Book Merchant#alde	4_M_ALCHE_D,{
+	mes "[Craft Book Merchant]";
+	mes "Welcome.";
+	mes "I'm here to sell";
+	mes "^0000FFspecial craft books^000000 for Geneticists.";
+	next;
+	mes "[Craft Book Merchant]";
+	mes "Geneticists have some skills";
+	mes "that require craft books to activate.";
+	next;
+	mes "[Craft Book Merchant]";
+	mes "The more craft books you have,";
+	mes "the more skills you can use.";
+	next;
+	mes "[Craft Book Merchant]";
+	mes "Please understand that";
+	mes "I specialize in the sale of these special books and";
+	mes "I ^FF0000don't sell other items^000000.";
+	next;
+	mes "[Craft Book Merchant]";
+	mes "Would you like to take a look at my craft books?";
+	next;
+	if(select("Sure.:No.") == 2) {
+		mes "[Craft Book Merchant]";
+		mes "Thank you for visiting my shop.";
+		mes "Please be safe on your travels.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "[Craft Book Merchant]";
+		mes "I'm sorry, but your inventory is almost full.";
+		mes "Please empty your inventory first.";
+		close;
+	}
+	if (MaxWeight - Weight < 2500) {
+		mes "[Craft Book Merchant]";
+		mes "Please empty your inventory first.";
+		close;
+	}
+	mes "[Craft Book Merchant]";
+	mes "Okay then, here's the list of available craft books.";
+	next;
+	switch(select("[Apple Bomb Craft Book] 100,000 zeny:[Pineapple Bomb Craft Book] 100,000 zeny:[Coconut Bomb Craft Book] 100,000 zeny:[Melon Bomb Craft Book] 100,000 zeny:[Banana Bomb Craft Book] 100,000 zeny:[Plant Gene Cultivation Method] 100,000 zeny:[Superior Potion Craft Manual] 100,000 zeny:[Mix Cooking Book] 100,000 zeny:[Health Improvement Research Book] 100,000 zeny:[Vigor Drink Recipe] 100,000 zeny:Close")){
+	case 1: set .@item,6279; break;
+	case 2: set .@item,6280; break;
+	case 3: set .@item,6281; break;
+	case 4: set .@item,6282; break;
+	case 5: set .@item,6283; break;
+	case 6: set .@item,6284; break;
+	case 7: set .@item,6285; break;
+	case 8: set .@item,11022; break;
+	case 9: set .@item,11023; break;
+	case 10: set .@item,11024; break;
+	case 11:
+		mes "[Craft Book Merchant]";
+		mes "Thank you for your patronage.";
+		mes "Please come again.";
+		close;
+	}
+	mes "[Craft Book Merchant]";
+	mes "^0000FF["+getitemname(.@item)+"] costs";
+	mes "100,000 zeny.";
+	mes "How many would you like to purchase?";
+	next;
+	input .@amount;
+	if (.@amount == 0) {
+		mes "[Craft Book Merchant]";
+		mes "Would you like to see some different books?";
+		close;
+	}
+	if (.@amount < 1 || .@amount > 99 ){
+		mes "[Craft Book Merchant]";
+		mes "You cannot purchase more than 100 at a time.";
+		close;
+	}
+	mes "[Craft Book Merchant]";
+	mes "You've entered "+.@amount+"x ^0000FF["+getitemname(.@item)+"]^000000 to be purchased.";
+	mes "Would you like to continue?";
+	next;
+	if (select("Yes:No") == 1) {
+		set .@total, .@amount * 100000;
+		if (Zeny < .@total) {
+			mes "[Craft Book Merchant]";
+			mes "I'm sorry, but you don't have enough money.";
+			close;
+		}
+		if (checkweight(.@item,.@amount) == 0){
+			mes "[Craft Book Merchant]";
+			mes "It doesn't seem like you can carry everything.";
+			mes "Please check the space in your inventory.";
+			close;
+		}
+		mes "[Craft Book Merchant]";
+		mes "Thank you for your patronage.";
+		Zeny -= .@total;
+		getitem .@item,.@amount;
+		close;
+	}
+	mes "[Craft Book Merchant]";
+	mes "Please take your time";
+	mes "before you make your decision.";
+	close;
+}
diff --git a/npc/re/merchants/ammo_boxes.txt b/npc/re/merchants/ammo_boxes.txt
new file mode 100644
index 000000000..432e0c8a4
--- /dev/null
+++ b/npc/re/merchants/ammo_boxes.txt
@@ -0,0 +1,19 @@
+//===== Hercules Script ======================================
+//= Magazine Dealers
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= Turns bullets into magazines/packs.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal duplicates.
+//= 1.1 Added Izlude duplicates. [Euphy]
+//============================================================
+
+que_ng,187,149,3	duplicate(mdk)	Magazine Dealer Kenny#ng	4_M_01
+izlude,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#iz	4_M_01
+izlude_a,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#a	4_M_01
+izlude_b,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#b	4_M_01
+izlude_c,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#c	4_M_01
+izlude_d,74,104,3	duplicate(mdk)	Magazine Dealer Kenny#d	4_M_01
diff --git a/npc/re/merchants/ammo_dealer.txt b/npc/re/merchants/ammo_dealer.txt
new file mode 100644
index 000000000..7abb58421
--- /dev/null
+++ b/npc/re/merchants/ammo_dealer.txt
@@ -0,0 +1,19 @@
+//===== Hercules Script ======================================
+//= Bullet Dealers
+//===== By ===================================================
+//= Euphy
+//===== Version ==============================================
+//= 1.1
+//===== Description ==========================================
+//= Bullet trader.
+//===== Comments =============================================
+//= 1.0 First version, Renewal duplicates.
+//= 1.1 Added Izlude duplicates. [Euphy]
+//============================================================
+
+que_ng,187,156,3	duplicate(bdt)	Bullet Dealer Tony#ng	4_M_04
+izlude,77,104,3	duplicate(bdt)	Bullet Dealer Tony#iz	4_M_04	//Official: (74,106) -> in the water
+izlude_a,77,104,3	duplicate(bdt)	Bullet Dealer Tony#a	4_M_04
+izlude_b,77,104,3	duplicate(bdt)	Bullet Dealer Tony#b	4_M_04
+izlude_c,77,104,3	duplicate(bdt)	Bullet Dealer Tony#c	4_M_04
+izlude_d,77,104,3	duplicate(bdt)	Bullet Dealer Tony#d	4_M_04
diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt
new file mode 100644
index 000000000..bb5dd62d7
--- /dev/null
+++ b/npc/re/merchants/blessed_refiner.txt
@@ -0,0 +1,171 @@
+//===== Hercules Script ======================================
+//= Blessed Refiner
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Refiners that use Blessed ores to refine equipment.
+//= Upon failure, the equipment is not destroyed. The success
+//= rate is identical to that for Enriched ores.
+//= - "Blacksmith Dister" only refines from +6~12.
+//= NOTE: This NPC is currently disabled on official servers.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+-	script	::BlacksmithDister	-1,{
+	disable_items;
+	mes "[Blacksmith Dister]";
+	mes "In this highly competitive society, we must be different in order to survive!";
+	mes "I only refine equipment at the +6 ~ 12 levels.";
+	next;
+	mes "[Blacksmith Dister]";
+	mes "I will need ^ff9999Blessed Weapon Ore^000000 for weapons, and ^ff9999Blessed Armor Ore^000000 for armors.";
+	mes "Failed refines ^FF0000will not break or reduce the refine level^000000.";
+	next;
+	mes "[Blacksmith Dister]";
+	mes "How about it? Do you want to refine?";
+	next;
+	setarray .@position$[1],"Head","Body","Left Hand","Right Hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
+	set .@menu$,"";
+	for(set .@i,1; .@i<=10; set .@i,.@i+1)
+		set .@menu$, .@menu$+((getequipisequiped(.@i))?getequipname(.@i):.@position$[.@i]+"-[Unequipped]")+":";
+	set .@part, select(.@menu$);
+	if (!getequipisequiped(.@part)) {
+		mes "[Blacksmith Dister]";
+		switch(.@part) {
+		case 1:
+			mes "I'm a blacksmith, not a hairstylist.";
+			break;
+		case 2:
+			mes "With my hammer, I will make you a star of the sky.";
+			break;
+		case 3:
+		case 4:
+			mes "Making artificial hands is not my specialty.";
+			break;
+		case 5:
+			mes "Bring out the item so I can refine it!";
+			break;
+		case 6:
+			mes "Where is this weird smell coming from?";
+			break;
+		case 7:
+		case 8:
+			mes "Where is the accessory?";
+			break;
+		case 9:
+			mes "What do you want me to refine?";
+			break;
+		case 10:
+			mes "Huh? What do you want me to do?";
+			break;
+		}
+		close;
+	}
+	if (!getequipisenableref(.@part)) {
+		mes "[Blacksmith Dister]";
+		mes "This item cannot be refined.";
+		close;
+	}
+	set .@equip_refine, getequiprefinerycnt(.@part);
+	if (.@equip_refine < 6 || .@equip_refine > 12) {
+		mes "[Blacksmith Dister]";
+		mes "This equipment has refined to "+.@equip_refine+". I only handle items with refine levels from +6 to +12!";
+		close;
+	}
+	set .@equip_lv, getequipweaponlv(.@part);
+	switch(.@equip_lv) {
+	default:
+	case 0:
+		set .@price,20000;
+		set .@material,6439; //Unbreakable_Def
+		set .@type$,"Armor";
+		break;
+	case 1:
+		set .@price,1000;
+		set .@material,6438; //Unbreakable_Weap
+		set .@type$,"Weapon";
+		break;
+	case 2:
+		set .@price,2000;
+		set .@material,6438; //Unbreakable_Weap
+		set .@type$,"Weapon";
+		break;
+	case 3:
+		set .@price,20000;
+		set .@material,6438; //Unbreakable_Weap
+		set .@type$,"Weapon";
+		break;
+	case 4:
+		set .@price,40000;
+		set .@material,6438; //Unbreakable_Weap
+		set .@type$,"Weapon";
+		break;
+	}
+	set .@ore$,"^ff9999Blessed "+.@type$+" Ore^000000";
+	mes "[Blacksmith Dister]";
+	mes "This "+.@type$+" has been refined to "+.@equip_refine+". To refine it, I need "+.@ore$+" and a "+(.@price/1000)+",000 zeny refining fee.";
+	mes "Do you want to proceed?";
+	next;
+	if(select("Yes:No") == 2) {
+		mes "[Blacksmith Dister]";
+		mes "I am busy, don't joke with me!";
+		close;
+	}
+	if (getequippercentrefinery(.@part) < 100) {
+		mes "[Blacksmith Dister]";
+		mes "This "+.@type$+" has been refined many times. Although it will not disappear upon failure, the "+.@ore$+" will disappear!";
+		next;
+		mes "[Blacksmith Dister]";
+		mes "Of course, the refining fee will not be returned! Do you want to continue?";
+		next;
+		if(select("Yes:No") == 2) {
+			mes "[Blacksmith Dister]";
+			mes "Good. I'd be sad if it failed, too.";
+			close;
+		}
+	}
+	if (countitem(.@material) == 0 || Zeny < .@price) {
+		mes "[Blacksmith Dister]";
+		mes "Materials insufficient.";
+		mes "To refine "+((.@equip_lv)?"a level "+.@equip_lv+" weapon":"armor")+", I need "+.@ore$+" and a "+(.@price/1000)+",000 zeny refining fee.";
+		close;
+	}
+	delitem .@material,1;
+	Zeny -= .@price;
+	mes "[Blacksmith Dister]";
+	mes "Tac! Tac! Tac!";
+	if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+		specialeffect EF_BLESSING;
+		successrefitem .@part;
+		next;
+		mes "[Blacksmith Dister]";
+		mes "Hahahahahaha!!!";
+		next;
+		mes "[Blacksmith Dister]";
+		mes "Refine was a huge success~ Hahaha!";
+		close;
+	}
+	specialeffect EF_CURSEATTACK;
+	specialeffect2 EF_SUI_EXPLOSION;
+	next;
+	emotion (!rand(5))?e_ag:e_omg;
+	mes "[Blacksmith Dister]";
+	mes "Oh my goodness!!!!";
+	next;
+	mes "[Blacksmith Dister]";
+	mes "Oh! Although it was blessed by "+.@ore$+" to retain the equipment...";
+	next;
+	mes "[Blacksmith Dister]";
+	mes "My mood is worse when I fail!!";
+	close;
+}
+prt_in,52,56,3	duplicate(BlacksmithDister)	Blacksmith Dister#prt	4_M_DWARF
+payon,148,172,3	duplicate(BlacksmithDister)	Blacksmith Dister#pay	4_M_DWARF
+alberta_in,20,56,3	duplicate(BlacksmithDister)	Blacksmith Dister#alb	4_M_DWARF
+yuno_in01,175,18,3	duplicate(BlacksmithDister)	Blacksmith Dister#yuno	4_M_DWARF
+ein_in01,26,82,3	duplicate(BlacksmithDister)	Blacksmith Dister#ein	4_M_DWARF
+lhz_in02,280,15,3	duplicate(BlacksmithDister)	Blacksmith Dister#lhz	4_M_DWARF
diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt
index 386474000..9954476ca 100644
--- a/npc/re/merchants/card_separation.txt
+++ b/npc/re/merchants/card_separation.txt
@@ -1,19 +1,18 @@
 //===== Hercules Script ======================================
 //= Card Separation System
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
 //= [Official Conversion]
 //= Separates cards from equipment.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Euphy]
-//============================================================ 
+//= 1.1 Added "Richard" NPC. [Euphy]
+//============================================================
 
-malangdo,215,166,4	script	Jeremy#mal	553,{
+-	script	::CardSeparation_mal	-1,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
@@ -23,19 +22,32 @@ malangdo,215,166,4	script	Jeremy#mal	553,{
 		mes "Can't continue because you have too many heavy objects. Let's try to continue after reducing the weight.";
 		close;
 	}
-	mes "[Jeremy]";
-	mes "Long time no see~";
-	mes "I have learned a new skill that separates cards from Armor, Shoes, Garment and Headgear. Do you want to try it?";
+	if (strnpcinfo(1) == "Jeremy") {
+		set .@Jeremy,1;
+		set .@n$, "[Jeremy]";
+		setarray .@equip_name$[0],  "Armor",  "Shoes",  "Garment", "Upper Hat";
+		setarray .@equip_slot[0], EQI_ARMOR,EQI_SHOES,EQI_GARMENT,EQI_HEAD_TOP;
+
+		mes .@n$;
+		mes "Long time no see~";
+		mes "I have learned a new skill that separates cards from Armor, Shoes, Garment and Headgear. Do you want to try it?";
+	} else {
+		set .@Jeremy,0;
+		set .@n$, "[Richard]";
+		setarray .@equip_name$[0], "Left hand", "Right hand";
+		setarray .@equip_slot[0],   EQI_HAND_L,   EQI_HAND_R;
+
+		mes .@n$;
+		mes "Silly Jeremy does not want to touch weapons and shields because of picking several cards that might be damaged. That is why I prepared a card separaion skill for weapons and shields...";
+	}
 	next;
-	mes "[Jeremy]";
+	mes .@n$;
 	mes "Generally the fee is 1,000,000 Zeny. During the card separation, you can use ^990000special items that reduce the rate of destroying equipment or cards^000000. We don't charge additional zeny for this.";
 	next;
-	mes "[Jeremy]";
+	mes .@n$;
 	mes "There is a possibility of destroying them even using a special item. Also, ^ff0000the refine level might be lost^000000. Do you have any equipment to separate?";
 	next;
 
-	setarray .@equip_name$[0],  "Armor",  "Shoes",  "Garment", "Upper Hat";
-	setarray .@equip_slot[0], EQI_ARMOR,EQI_SHOES,EQI_GARMENT,EQI_HEAD_TOP;
 	for(set .@i,0; .@i<getarraysize(.@equip_slot); set .@i,.@i+1) {
 		if (getequipisequiped(.@equip_slot[.@i]))
 			set .@menu$, .@menu$+getequipname(.@equip_slot[.@i])+":";
@@ -43,62 +55,55 @@ malangdo,215,166,4	script	Jeremy#mal	553,{
 			set .@menu$, .@menu$+"^999999"+.@equip_name$[.@i]+" (empty)^000000:";
 	}
 
-	set .@i, select("Stop the work:How is it possible?:"+.@menu$);
+	set .@i, select("Stop the work:"+((.@Jeremy)?"How is it possible?":"")+":"+.@menu$);
 	switch(.@i) {
 	case 1:
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "Whenever you need the work, visit me here.";
 		close;
 	case 2:
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "You wonder what is so special. Well, I hate to give only a guide, so let me tell you the story...";
 		next;
 		mes "^000099Jeremy is stretching his shoulders and hands. He might be waiting for someone to talk with him.^000000";
 		next;
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "Do you know that Malangdo's specialty is canned food?";
 		next;
 		select("I knew that well. Is it that limited?");
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "Hehe... Everyone loves it. But there were some problems before.";
 		next;
 		select("Problems? Is there any faulty fish?");
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "No, the fish does not have any problem. The problem is lots of fish oil produced after processing. That is such an industrial waste.";
 		next;
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "However, after a revitalizing refining process, this fish oil became valuable to use for old equipment care and industrial lubricant.";
 		next;
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "In addition, this oil is so useful to separate relics from equipped weapons that we can't buy Premium Lubricant and Ordinary Lubricant with Zeny.";
 		next;
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "Well, don't worry about money. Surely the Premium Lubricant is expensive. If you pay some zeny, I can give you cheaper lubricant.";
 		next;
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "I'm not sure about the quality of success. Anyway, this is so cheap, right?";
 		close;
 	default:
 		set .@equip_num, .@equip_slot[.@i-3];
 		if (!getequipisequiped(.@equip_num)) {
-			mes "[Jeremy]";
-			mes "In this part, there is nothing?";
+			mes .@n$;
+			if (.@Jeremy)
+				mes "In this part, there is nothing?";
+			else
+				mes "There is nothing on that part?";
 			close;
 		}
 		break;
 	}
-	setarray .@equip_card[0], getequipcardid(.@equip_num,0),getequipcardid(.@equip_num,1),getequipcardid(.@equip_num,2),getequipcardid(.@equip_num,3);
-	for(set .@i,0; .@i<4; set .@i,.@i+1) {
-		if (.@equip_card[.@i] >= 4700) // Armor Enchant System
-			set .@equip_card[.@i],0;
-	}
-	if (!getarraysize(.@equip_card)) {
-		mes "[Jeremy]";
-		mes "The card is not equipped. Do you want to check again?";
-		close;
-	}
 
-	// Detect MVP cards.
+	setarray .@equip_card[0], getequipcardid(.@equip_num,0),getequipcardid(.@equip_num,1),getequipcardid(.@equip_num,2),getequipcardid(.@equip_num,3);
 	set .@mvp_list$,
 		"|4408|4128|4456|4168|4142"+  //Gloom_Under_Night_Card, Golden_Bug_Card, Nidhogg_Shadow_Card, Dark_Lord_Card, Doppelganger_Card
 		"|4134|4137|4386|4407|4357"+  //Dracula_Card, Drake_Card, Detale_Card, Randgris_Card, B_Seyren_Card
@@ -109,15 +114,64 @@ malangdo,215,166,4	script	Jeremy#mal	553,{
 		"|4403|4399|4376|4441|4302"+  //Kiel_Card, Thanatos_Card, Lady_Tanee_Card, Fallen_Bishop_Card, Tao_Gunka_Card
 		"|4305|4148|4318|4121|4365"+  //Turtle_General_Card, Pharaoh_Card, Knight_Windstorm_Card, Phreeoni_Card, B_Katrinn_Card
 		"|4363|4324|4361|4330|4342|"; //B_Magaleta_Card, Garm_Card, B_Harword_Card, Dark_Snake_Lord_Card, Rsx_0806_Card
-	if ((.@equip_card[0] && compare(.@mvp_list$,"|"+.@equip_card[0]+"|")) ||
-	    (.@equip_card[1] && compare(.@mvp_list$,"|"+.@equip_card[1]+"|")) ||
-	    (.@equip_card[2] && compare(.@mvp_list$,"|"+.@equip_card[2]+"|")) ||
-	    (.@equip_card[3] && compare(.@mvp_list$,"|"+.@equip_card[3]+"|")))
-		set .@boss_chk,1;
 
+	if (.@Jeremy) {
+		for(set .@i,0; .@i<4; set .@i,.@i+1) {
+			if (.@equip_card[.@i] >= 4700) // Armor Enchant System
+				set .@equip_card[.@i],0;
+		}
+		if (!getarraysize(.@equip_card)) {
+			mes .@n$;
+			mes "The card is not equipped. Do you want to check again?";
+			close;
+		}
+		if ((.@equip_card[0] && compare(.@mvp_list$,"|"+.@equip_card[0]+"|")) ||
+			(.@equip_card[1] && compare(.@mvp_list$,"|"+.@equip_card[1]+"|")) ||
+			(.@equip_card[2] && compare(.@mvp_list$,"|"+.@equip_card[2]+"|")) ||
+			(.@equip_card[3] && compare(.@mvp_list$,"|"+.@equip_card[3]+"|")))
+			set .@boss_chk,1;
+	} else {
+		// Official "Richard" script uses a hardcoded list including every possible item.
+		//if (!getequipisequiped(.@equip_num)) {
+		//	mes "[Richard]";
+		//	mes "I'm sorry. We don't provide that equipmnet yet.";
+		//	close;
+		//}
+
+		mes "[Richard]";
+		mes "Which number socket do you want to separate the card? From the left socket, they are sorted 1,2,3,4.";
+		next;
+		set .@menu$,"";
+		for(set .@i,0; .@i<4; set .@i,.@i+1) {
+			if (.@equip_card[.@i] && .@equip_card[.@i] < 4700) // Armor Enchant System
+				set .@menu$, .@menu$+"Socket "+(.@i+1)+" - "+getitemname(.@equip_card[.@i])+":";
+			else
+				set .@menu$, .@menu$+"^777777Socket "+(.@i+1)+" - No card^000000:";
+		}
+		set .@i, select("Stop the work:"+.@menu$);
+		switch(.@i) {
+		case 1:
+			mes .@n$;
+			mes "Whenever you need to work, please come to me.";
+			close;
+		default:
+			set .@slot, .@i-2;
+			if (.@equip_card[.@slot] == 0 || .@equip_card[.@slot] >= 4700) {
+				mes .@n$;
+				mes "This socket is not equipped with any card. Why don't you check again?";
+				close;
+			}
+			break;
+		}
+		if (compare(.@mvp_list$,"|"+.@equip_card[.@slot]+"|"))
+			set .@boss_chk,1;
+	}
 	if (.@boss_chk == 0) {
-		mes "[Jeremy]";
-		mes "Except cards, ^ff0000all enchanted effects will disappear.^000000 If you agree to this, please choose the work type:";
+		mes .@n$;
+		if (.@Jeremy)
+			mes "Except cards, ^ff0000all enchanted effects will disappear.^000000 If you agree to this, please choose the work type:";
+		else
+			mes "Please choose the working fee.";
 		next;
 		set .@menu$,
 			"Next time...:"+
@@ -126,39 +180,39 @@ malangdo,215,166,4	script	Jeremy#mal	553,{
 			((countitem(6440))?"Use Ordinary Lubricant":"^999999Ordinary Lubricant (Insufficient)^000000");
 		switch(select(.@menu$)) {
 		case 1:
-			mes "[Jeremy]";
+			mes .@n$;
 			mes "Whenever you need the work, visit me here.";
 			close;
 		case 2:
 			if (Zeny < 1000000) {
-				mes "[Jeremy]";
+				mes .@n$;
 				mes "You don't have enough zeny. Please come back with enough fees.";
 				close;
 			}
-			mes "[Jeremy]";
+			mes .@n$;
 			mes "This is pretty old equipment. There is a high rate of destroying the cards or equipment during the work. Are you sure you want to continue?";
 			next;
 			if(select("Next time...:Continue") == 1) {
-				mes "[Jeremy]";
+				mes .@n$;
 				mes "Whenever you need the work, visit me here.";
 				close;
 			}
 			set .@sf_c_num,150;
 			set .@sf_r_num,150;
 			set .@sf_w_num,150;
-			set Zeny, Zeny - 1000000;
+			Zeny -= 1000000;
 			break;
 		case 3:
 			if (countitem(6441) == 0) {
-				mes "[Jeremy]";
+				mes .@n$;
 				mes "You don't have Premium Lubricant.";
 				close;
 			}
-			mes "[Jeremy]";
+			mes .@n$;
 			mes "If you use the Premium Lubricant, the rate of destruction will be decreased highly, but I can't give you a 100% guarantee. Are you sure you want to continue?";
 			next;
 			if(select("Next time...:Continue") == 1) {
-				mes "[Jeremy]";
+				mes .@n$;
 				mes "Whenever you need the work, visit me here.";
 				close;
 			}
@@ -169,15 +223,15 @@ malangdo,215,166,4	script	Jeremy#mal	553,{
 			break;
 		case 4:
 			if (countitem(6440) == 0) {
-				mes "[Jeremy]";
+				mes .@n$;
 				mes "You don't have Ordinary Lubricant.";
 				close;
 			}
-			mes "[Jeremy]";
+			mes .@n$;
 			mes "If you use the Ordinary Lubricant, the rate of destruction will be decreased highly, but I can't give you a 100% guarantee. Are you sure you want to continue?";
 			next;
 			if(select("Next time...:Continue") == 1) {
-				mes "[Jeremy]";
+				mes .@n$;
 				mes "Whenever you need the work, visit me here.";
 				close;
 			}
@@ -188,28 +242,34 @@ malangdo,215,166,4	script	Jeremy#mal	553,{
 			break;
 		}
 	} else if (.@boss_chk == 1) {
-		mes "[Jeremy]";
+		mes .@n$;
 		mes "This equipment contains a precious MVP card. This card can't be separated with lubricant. If you bring the super surfactant ^0000ffSillit Pong^000000, I will be able to work.";
 		next;
 		switch(select("Next time...:I have a Sillit Pong.")) {
 		case 1:
-			mes "[Jeremy]";
+			mes .@n$;
 			mes "Whenever you need the work, visit me here.";
 			close;
 		case 2:
 			if (countitem(6443) == 0) {
-				mes "[Jeremy]";
+				mes .@n$;
 				mes "You don't have Sillit Pong.";
 				close;
 			}
 			break;
 		}
-		mes "[Jeremy]";
-		mes "Except cards, ^ff0000all enchanted effects will disappear.^000000 If you agree to this, please choose the work type:";
+		mes .@n$;
+		if (.@Jeremy) {
+			mes "Except cards, ^ff0000all enchanted effects will disappear.^000000 If you agree to this, please choose the work type:";
+			set .@menu$,"Alright, let's do it!";
+		} else {
+			mes "May I continue?";
+			set .@menu$,"I got it. Just do it quickly!";
+		}
 		next;
-		switch(select("Next time...:Alright, let's do it!")) {
+		switch(select("Next time...:"+.@menu$)) {
 		case 1:
-			mes "[Jeremy]";
+			mes .@n$;
 			mes "Whenever you need the work, visit me here.";
 			close;
 		case 2:
@@ -229,20 +289,37 @@ malangdo,215,166,4	script	Jeremy#mal	553,{
 	if (rand(1,.@sf_r_num) >= 61)
 		set .@equip_refine,0;
 
-	// Chance of retaining equipment.
-	if (rand(1,.@sf_w_num) < 61) {
-		set .@equip_safe,1;
-		getitem2 .@equip_id,1,1,.@equip_refine,0,0,0,0,0;
-	}
+	if (.@Jeremy) {
+		// Chance of retaining equipment.
+		if (rand(1,.@sf_w_num) < 61) {
+			set .@equip_safe,1;
+			getitem2 .@equip_id,1,1,.@equip_refine,0,0,0,0,0;
+		}
 
-	// Chance of retaining cards.
-	for(set .@i,0; .@i<4; set .@i,.@i+1) {
-		if (.@equip_card[.@i]) {
-			if (rand(1,.@sf_c_num) < 61)
-				getitem .@equip_card[.@i],1;
-			else
-				set .@card_break,1;
+		// Chance of retaining cards.
+		for(set .@i,0; .@i<4; set .@i,.@i+1) {
+			if (.@equip_card[.@i]) {
+				if (rand(1,.@sf_c_num) < 61)
+					getitem .@equip_card[.@i],1;
+				else
+					set .@card_break,1;
+			}
 		}
+	} else {
+		set .@card, .@equip_card[.@slot];
+		set .@equip_card[.@slot],0;
+
+		// Chance of retaining equipment.
+		if (rand(1,.@sf_w_num) < 61) {
+			set .@equip_safe,1;
+			getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
+		}
+
+		// Chance of retaining card.
+		if (rand(1,.@sf_c_num) < 61)
+			getitem .@card,1;
+		else
+			set .@card_break,1;
 	}
 
 	// Display corresponding effect.
@@ -273,7 +350,9 @@ malangdo,215,166,4	script	Jeremy#mal	553,{
 		mes "Card has been damaged. ^ff0000Unrecoverable.^000000";
 	}
 	next;
-	mes "[Jeremy]";
+	mes .@n$;
 	mes "That is all for the results of the card separation. Please come again.";
 	close;
 }
+malangdo,215,166,4	duplicate(CardSeparation_mal)	Jeremy#pa0829	4_CAT_DOWN
+malangdo,208,166,6	duplicate(CardSeparation_mal)	Richard#pa0829	4_CAT_ADV1
diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt
new file mode 100644
index 000000000..3ef33e953
--- /dev/null
+++ b/npc/re/merchants/catalog.txt
@@ -0,0 +1,106 @@
+//===== Hercules Script ======================================
+//= Catalog Magician
+//===== By: ==================================================
+//= skyiing, Scriptor
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Catalogs allow players to easily search for items in-game,
+//= and to buy/sell directly from the catalog interface.
+//===== Additional Comments: =================================
+//= 1.0 Moved from root directory. [Euphy]
+//= 1.1 Updated dialogue. [Euphy]
+//============================================================
+
+moc_para01,22,16,5	script	Catalog Magician#catal01	4_M_BIBI,{
+	if (!checkweight(1301,3)) {
+		mes "- You have too many items. Please make space. -";
+		close;
+	}
+	set .@ticket_cost, 200;
+	mes "[Catalog Magician]";
+	mes "Look... the Magic Academy";
+	mes "in Geffen is now directly";
+	mes "selling the brand new";
+	mes "^007777Universal Catalog Silver^000000!";
+	next;
+	mes "He is looking at the words";
+	mes "written on his hand.";
+	mes "He seems too busy";
+	mes "to look at you.";
+	next;
+	mes "[Catalog Magician]";
+	mes "A brand new catalog";
+	mes "has just come out!";
+	mes "You can check";
+	mes "what items you can trade";
+	mes "and what items are on sale";
+	mes "from the vendor.";
+	next;
+	mes "[Catalog Magician]";
+	mes "The ^007777Universal Catalog Silver^000000";
+	mes "costs only 200z!";
+	mes "You can buy up to 50 pieces at once!";
+	next;
+	switch(select("Buy a ^007777Universal Catalog Silver^000000:I don't need it!:You don't look like a vendor!")) {
+	case 1:
+		mes "[Catalog Magician]";
+		mes "You... want all 50 pieces?";
+		mes "Or how many do you need?";
+		next;
+		while (1) {
+			input .@input;
+			mes "[Catalog Magician]";
+			if (.@input == 0) {
+				mes "The trade has been stopped!";
+				mes "I don't know what to do next...";
+				mes "What should I do?";
+				emotion e_swt2,1;
+				close;
+			} else if (.@input < 1 || .@input > 50) {
+				mes "It should be less than 50 pieces.";
+				next;
+			} else
+				break;
+		}
+		set .@sell, .@ticket_cost * .@input;
+		mes "The total number of catalog(s) that you're trying to purchase is " + .@input + " pieces.";
+		mes "It costs " + .@sell + " z.";
+		if (Zeny < .@sell) {
+			mes "It seems you don't have enough money.";
+			mes "You can sell your equipment";
+			mes "to make more money... if you want.";
+			close;
+		}
+		mes "Ok, here you go.";
+		Zeny -= .@sell;
+		getitem 12580,.@input; //Vending_Search_Scroll
+		close;
+	case 2:
+		mes "[Catalog Magician]";
+		mes "Argh... you really need this";
+		mes "item... Do you want me to";
+		mes "explain again? I don't know";
+		mes "what to do next...";
+		mes "What should I do?";
+		emotion e_swt2,1;
+		close;
+	case 3:
+		mes "[Catalog Magician]";
+		mes "My real job is a magician.";
+		mes "I was going to ask the merchant";
+		mes "guild to sell them, but they were";
+		mes "trying use them as an appendix";
+		mes "into broom sales. That's why";
+		mes "I'm selling these by myself.";
+		next;
+		mes "[Catalog Magician]";
+		mes "There are many adventurers";
+		mes "here who come and go.";
+		mes "I'm pretty sure that I can sell to all of them soon.";
+		mes "Don't you think so?";
+		mes "So... let's start!! Buy more of them, please! PLEASE...!";
+		close;
+	}
+}
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index 7ee6a53af..fb20726a3 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -3,20 +3,19 @@
 //===== By: ==================================================
 //= Hercules Dev Team
 //===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2
 //===== Description: =========================================
 //= [Official Conversion]
 //= Renewal coin redemption NPCs.
 //===== Additional Comments: =================================
 //= 1.0 First version. [Euphy/Lemongrass]
 //= 1.1 Added remaining Malangdo traders. [Euphy/Lemongrass]
+//= 1.2 Added Eclage traders (not fully complete). [Euphy]
 //============================================================
 
 // Malangdo
 //============================================================
-malangdo,220,167,5	script	Coin Exchanger CX-1	564,{
+malangdo,220,167,5	script	Coin Exchanger CX-1	2_VENDING_MACHINE1,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
 		close;
@@ -107,7 +106,7 @@ malangdo,220,167,5	script	Coin Exchanger CX-1	564,{
 	close;
 }
 
-malangdo,218,165,5	script	Special Vending Machine	562,{
+malangdo,218,165,5	script	Special Vending Machine	2_DROP_MACHINE,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
 		close;
@@ -177,7 +176,7 @@ L_AddItem:
 	}
 }
 
-malangdo,236,179,5	script	Dark Merchant K	554,{
+malangdo,236,179,5	script	Dark Merchant K	4_CAT_REST,{
 	if (checkweight(1201,1) == 0) {
 		mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
 		close;
@@ -222,7 +221,7 @@ malangdo,236,179,5	script	Dark Merchant K	554,{
 	}
 }
 
-malangdo,233,180,3	script	Dark MachineTX100	564,{
+malangdo,233,180,3	script	Dark MachineTX100	2_VENDING_MACHINE1,{
 	if (checkweight(1201,1) == 0) {
 		mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
 		close;
@@ -343,7 +342,7 @@ malangdo,233,180,3	script	Dark MachineTX100	564,{
 	close;
 }
 
-malangdo,175,145,4	script	Can Agency Guard	549,{
+malangdo,175,145,4	script	Can Agency Guard	4_CAT_MERMASTER,{
 	if (checkweight(1201,1) == 0) {
 		mes "You seem to have too many items. Give it a try after sorting out the item kinds.";
 		close;
@@ -434,7 +433,7 @@ function	script	F_mal_coin	{
 			mes "Ahaaa~";
 			mes "If you want to buy this stuff,";
 			mes "you can talk to me";
-			mes "when you grow up little more.";
+			mes "when you grow up a little more.";
 			mes "This stuff is too expensive";
 			mes "for a child~";
 			close;
@@ -568,7 +567,7 @@ function	script	F_mal_coin	{
 		}
 	}
 }
-malangdo,162,146,5	script	Wandering Merchant#mal	495,{
+malangdo,162,146,5	script	Wandering Merchant#mal	4_M_MERCAT1,{
 	callfunc "F_mal_coin",0,"[Wandering Merchant]",1;
 	setarray .@items[1],
 		16743,16747,16741,16745,16749,16751, // 1 hour items.
@@ -699,7 +698,7 @@ malangdo,162,146,5	script	Wandering Merchant#mal	495,{
 	}
 }
 
-malangdo,173,145,4	script	Stinky Merchant	496,{
+malangdo,173,145,4	script	Stinky Merchant	4_M_MERCAT2,{
 	callfunc "F_mal_coin",0,"[Stinky Merchant]",2;
 	setarray .@items[1],2873,16015;
 	setarray .@names$[1],"Cat Hand Glove","Cat Club";
@@ -750,7 +749,7 @@ malangdo,173,145,4	script	Stinky Merchant	496,{
 	}
 }
 
-malangdo,150,135,5	script	Roving Merchant	495,{
+malangdo,150,135,5	script	Roving Merchant	4_M_MERCAT1,{
 	callfunc "F_mal_coin",0,"[Roving Merchant]",3;
 	setarray .@items[1],12639,12637,12638,12640;
 	setarray .@names$[1],"Flying Fish","Sow Bug","Dried Squid","Starfish";
@@ -825,3 +824,350 @@ malangdo,150,135,5	script	Roving Merchant	495,{
 		next;
 	}
 }
+
+// Eclage
+//============================================================
+ecl_in01,66,95,2	script	Armor Merchant Naphara	4_F_FAIRYKID,{
+	mes "[Armor Merchant]";
+	mes "Hello, this is Naphara's store, a place of high class goods.";
+	mes "What would you need?";
+	next;
+	set .@i, select("Str Glove:Int Glove:Agi Glove:Vit Glove:Dex Glove:Luk Glove");
+	mes "[Armor Merchant]";
+	switch(.@i) {
+	case 1: // Str Glove
+		mes "^3131FFStr Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFATK+1 increases for every STR+10^000000";
+		mes "^3131FFATK +1% added above STR 110^000000";
+		set .@item,2917; //Str_Glove
+		break;
+	case 2:
+		mes "^3131FFInt Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFMATK+1 increases for every INT+10^000000";
+		mes "^3131FFMATK +1% added above INT 110^000000";
+		set .@item,2918; //Int_Glove
+		break;
+	case 3:
+		mes "^3131FFAgi Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFFLEE+1 increases for every AGI+10^000000";
+		mes "^3131FFComplete Flee +1 added above AGI 110^000000";
+		set .@item,2919; //Agi_Glove
+		break;
+	case 4:
+		mes "^3131FFVit Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFMHP+50 for every VIT+10^000000";
+		mes "^3131FFMHP+1% added above VIT 110^000000";
+		set .@item,2920; //Vit_Glove
+		break;
+	case 5:
+		mes "^3131FFDex Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFHIT+1 increases for every DEX+10^000000";
+		mes "^3131FFRanged attack power +1% added above DEX 110^000000";
+		set .@item,2921; //Dex_Glove
+		break;
+	case 6:
+		mes "^3131FFLuk Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFCRI+1 increases for every LUK+10^000000";
+		mes "^3131FFCritical damage +1% added above LUK 110^000000";
+		set .@item,2922; //Luk_Glove
+		break;
+	}
+	mes "^3131FFRequired Level: 100^000000";
+	mes "^3131FFSlot: 0^000000";
+	mes "^3131FFWeight: 10^000000";
+	mes "are the characteristic options.";
+	next;
+	mes "[Armor Merchant]";
+	mes "It costs 10 Splendide Coins.";
+	mes "Would you like to buy it?";
+	next;
+	if(select("Buy it.:Don't buy it.") == 2)
+		close;
+	if (countitem(6081) < 10) {
+		mes "[Armor Merchant]";
+		mes "It seems like you don't have enough coins.";
+		close;
+	}
+	mes "[Armor Merchant]";
+	mes "Here you go!"; //custom
+	delitem 6081,10; //Splendide_Coin
+	getitem .@item,1;
+	close;
+}
+
+ecl_in01,64,97,4	script	Slot Expert Nattuer#ecl	4_F_FAIRYKID,{
+	mes "[Slot Expert]";
+	mes "I am Slot Expert Nattuer.";
+	mes "If you bring me an item from my little brother Naphara along with 5 Splendide Coins, I will open up one Slot for you.";
+	next;
+	if(select("Activate a Slot.:Forget it.") == 2)
+		close;
+	mes "[Slot Expert]";
+	mes "Slot activation is an extremely difficult procedure that can fail even with heightened care and the use of a magnifying lens.";
+	next;
+	mes "[Slot Expert]";
+	mes "Of course, if your heart were as big as that flower-filled land, you wouldn't mind. Right? Should I go for it?";
+	next;
+	if(select("Continue.:Forget it.") == 2)
+		close;
+	mes "[Slot Expert]";
+	mes "Which item would you like to activate with a Slot?";
+	next;
+	setarray .@noslots[0],2917,2918,2919,2920,2921,2922;
+	setarray .@slotted[0],2923,2924,2925,2926,2927,2928;
+	set .@i, select("Str Glove:Int Glove:Ag Glove:Vit Glove:Dex Glove:Luk Glove")-1;
+	set .@item, .@noslots[.@i];
+	set .@new_item, .@slotted[.@i];
+	mes "[Slot Expert]";
+	mes "Let's confirm for the last time. Is the one you want "+getitemname(.@item)+"?";
+	next;
+	if(select("Yes:No") == 2) {
+		mes "[Slot Expert]";
+		mes "Why don't you talk to me when you know for sure.";
+		close;
+	}
+	if (countitem(.@item) == 0) {
+		mes "[Slot Expert]";
+		mes "You don't have that item. Why don't you talk to me when you know for sure.";
+		close;
+	}
+	if (countitem(6081) < 5) {
+		mes "[Slot Expert]";
+		mes "You don't have enough coins. Why don't you talk to me when you know for sure."; //custom
+		close;
+	}
+	delitem 6081,5; //Splendide_Coin
+	delitem .@item,1;
+	//custom to the end
+	if (rand(100) < 5) {
+		mes "[Slot Expert]";
+		mes "Oh no, it failed! I'm sorry, but I warned you this could happen. Better luck next time.";
+		close;
+	}
+	mes "[Slot Expert]";
+	mes "Success! I've activated the slot.";
+	getitem .@new_item,1;
+	close;
+}
+
+ecl_in01,67,39,4	script	Replication Expert Palt	4_M_FAIRYKID4,{
+	emotion e_lv;
+	mes "[Paltu]";
+	mes "Woohoo- Greetings. What are you looking for? Lots of goods here.";
+	next;
+	switch(select("No thanks.:Replication?:I know you got lots up your sleeve!")) {
+	case 1:
+		emotion e_an;
+		mes "[Paltu]";
+		mes "Really? Hmm?";
+		close;
+	case 2:
+		mes "[Paltu]";
+		mes "One can say that there's no one better in Eclage than I at utilizing magic resistance.";
+		next;
+		mes "[Paltu]";
+		mes "I'll give you a good price whatever it is. Just trust me.";
+		next;
+		select("Could you do something for me?");
+		emotion e_no1;
+		mes "[Paltu]";
+		mes "Hey, I like your attitude.";
+		next;
+		mes "[Paltu]";
+		mes "Ah- you know the hat you're wearing?";
+		next;
+		emotion e_what;
+		mes "[Paltu]";
+		mes "Don't you have any of those hats lying around in storage that are solid but too ugly to wear? You do, right?";
+		next;
+		select(".........");
+		emotion e_dots,1;
+		emotion e_heh;
+		mes "[Paltu]";
+		mes "See! I knew it. I knew it from the first minute.";
+		next;
+		mes "[Paltu]";
+		mes "If you bring me ^ff0000 50 Splendide Coins and the ingredients^000000, I'll make you a new hat in the same shape but worn as a ^ff0000Costume^000000.";
+		next;
+		mes "[Paltu]";
+		mes "Hmm, what was it...?";
+		mes "I think you adventurers call them ^0571B0Costumes^000000? right?";
+		next;
+		select("Yes~ What do you need?");
+		mes "[Paltu]";
+		mes "I need 1 ^0571B0hat to replicate^000000 and";
+		mes "I need ^E1281E 4 Crystal Mirrors^000000 for magic resistance, ^E1281E 1 Fairy Magic Powder^000000 as the catalyst, and ^E1281E Emerald, Ruby, Sapphire, Topaz, and Zircon, 10 of each^000000, to be used for amplifying the magic power.";
+		next;
+		emotion e_no;
+		mes "[Paltu]";
+		mes "There's quite a lot of ingredients, right? Well, I can't do anything about that. Dealing with magic power is not a joke.";
+		next;
+		select("Which hats can be replicated?");
+		mes "[Paltu]";
+		mes "Oh! You're pretty sharp!";
+		mes "Almost forgot the most important thing.";
+		next;
+		mes "[Paltu]";
+		mes "Hats that I can replicate are:";
+		mes "^0571B0Frog Hat, Romantic Flower, Magestic Goat, Blush, Valkyrie Helm, Deviruchi Hat, Assassin Mask, Elven Ears, Hahoe Mask, and Boys Cap^000000 a total of 10 types.";
+		next;
+		mes "[Paltu]";
+		mes "What do you think? I'll make it happen as long as I have the ingredients and the compensation.";
+		next;
+		if(select("I'll do it later.:Show me what you got!") == 1) {
+			emotion e_dots;
+			mes "[Paltu]";
+			mes "What? Are you kidding me? Please tell me you are!";
+			close;
+		}
+		break;
+	case 3:
+		break;
+	}
+	mes "[Paltu]";
+	mes "Oh wow.";
+	mes "You made the right call. I thought I was going to starve to death because the Laphines have no interest in pretty hats.";
+	next;
+	mes "[Paltu]";
+	mes "I'll make it a great deal for you. You really should know I'm giving you a good deal here.";
+	next;
+	mes "[Paltu]";
+	mes "Is there something you had in mind? Why don't you take a look?";
+	next;
+	setarray .@items[0],
+		5447, //Frog_Cap
+		2269, //Centimental_Flower
+		2256, //Magestic_Goat
+		5040, //Blush
+		5171, //Valkyrie_Helm
+		5038, //Deviruchi_Cap
+		5096, //Assassin_Mask_
+		2286, //Elven_Ears
+		5176, //Hahoe_Mask
+		5016; //Boy's_Cap
+	setarray .@costumes[0],
+		19548, //C_Frog_Cap
+		19552, //C_Centimental_Flower
+		19549, //C_Magestic_Goat
+		19550, //C_Blush
+		19546, //C_Valkyrie_Helm
+		19547, //C_Deviruchi_Cap
+		19553, //C_Assassin_Mask_
+		19551, //C_Elven_Ears
+		0,     //-- not implemented? --
+		19545; //C_Boys_Cap
+	if (countitem(6081) >= 50 && countitem(747) >= 4 && countitem(6395) >= 1 && countitem(721) >= 10 && countitem(723) >= 10 && countitem(726) >= 10 && countitem(728) >= 10 && countitem(729) >= 10)
+		set .@item_check,1;
+	for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+1) {
+		if (.@item_check && countitem(.@items[.@i]))
+			set .@menu$, .@menu$+getitemname(.@items[.@i])+":"; //custom
+		else
+			set .@menu$, .@menu$+getitemname(.@items[.@i])+" (^777777Insufficient ingredients^000000):";
+	}
+	set .@i, select(.@menu$)-1;
+	set .@item, .@items[.@i];
+	set .@new_item, .@costumes[.@i];
+	mes "[Paltu]";
+	mes "Is ^0571B0"+getitemname(.@item)+"^000000 what you wanted?";
+	next;
+	if (.@item_check == 0 || countitem(.@item) == 0) {
+		emotion e_sob;
+		mes "[Paltu]";
+		mes "Ay... Credit purchases are difficult for me.";
+		next;
+		mes "[Paltu]";
+		mes "^0571B0"+getitemname(.@item)+"^000000 and";
+		mes "^E1281E50 Splendide Coins, 4 Crystal Mirrors, 1 Fairy Magic Powder, 10 of each Emerald, Ruby, Sapphire, Topaz, and Zircon^000000 are necessary.";
+		next;
+		mes "[Paltu]";
+		mes "I'm in a tight spot myself. Please consider my situation also.";
+		close;
+	}
+	//custom to the end
+	if(select("Continue.:Forget it.") == 2)
+		close;
+	delitem .@item,1;
+	delitem 6081,50; //Splendide_Coin
+	delitem 747,4; //Crystal_Mirror
+	delitem 6395,1; //Angel_Magic_Power
+	delitem 721,10; //Azure_Jewel
+	delitem 723,10; //Cardinal_Jewel
+	delitem 726,10; //Blue_Jewel
+	delitem 728,10; //Golden_Jewel
+	delitem 729,10; //Bluish_Green_Jewel
+	getitem .@new_item,1;
+	mes "[Paltu]";
+	mes "Thank you so much! As promised, here is your costume.";
+	close;
+}
+
+ecl_in01,33,98,4	script	Herb Merchant Plafina#e	4_M_FAIRYKID2,{
+	mes "[Herb Merchant]";
+	mes "Welcome, this is Plafina's Herb Store where only the freshest herbs are provided~!";
+	next;
+	switch(select("Snow Flip:Peony Mommy:Slapping Herb:Yggdrasil Dust:End conversation")) {
+	case 1:
+		mes "[Herb Merchant]";
+		mes "Snow Flip has special effects on ^3131FFBurning, Bleeding, Deep Sleep, Sleep^000000.";
+		set .@item,12812; //Snow_Flip
+		set .@cost,5;
+		break;
+	case 2:
+		mes "[Herb Merchant]";
+		mes "Peony Mamy has special effects on ^3131FFFrost, Frozen, Freezing^000000.";
+		set .@item,12813; //Peony_Mommy
+		set .@cost,5;
+		break;
+	case 3:
+		mes "[Herb Merchant]";
+		mes "Slapping Herb has special effects on ^3131FFStun, Fear, Chaos, Hallucination^000000.";
+		set .@item,12814; //Slapping_Herb
+		set .@cost,1;
+		break;
+	case 4:
+		mes "[Herb Merchant]";
+		mes "Yggdrasil Dust has special effects on ^3131FFBlind, Curse, Decrease Agility, Reverse Orcish^000000.";
+		set .@item,12815; //Yggdrasil_Dust
+		set .@cost,1;
+		break;
+	case 5:
+		mes "[Herb Merchant]";
+		mes "Come back anytime.";
+		close;
+	}
+	mes "Requires 5 seconds between uses.";
+	mes "It costs "+.@cost+" Splendide Coin"+((.@cost == 1)?"":"s")+" for each.";
+	next;
+	switch(select("Buy 1.:Buy 10.:Don't buy.")) {
+	case 1:
+		set .@amount,1;
+		break;
+	case 2:
+		set .@amount,10;
+		break;
+	case 3:
+		close;
+	}
+	set .@price,.@amount*.@cost;
+	mes "[Herb Merchant]";
+	mes "Would you like to buy "+.@amount+" "+getitemname(.@item)+"?";
+	next;
+	if(select("Buy.:Don't buy.") == 2)
+		close;
+	if (countitem(6081) < .@price) {
+		mes "[Herb Merchant]";
+		mes "You don't have enough coins.";
+		close;
+	}
+	mes "[Herb Merchant]";
+	mes "Here are your herbs."; //custom
+	delitem 6081,.@price; //Splendide_Coin
+	getitem .@item,.@amount;
+	end;
+}
diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt
index fa19f372d..eda1740ca 100644
--- a/npc/re/merchants/diamond.txt
+++ b/npc/re/merchants/diamond.txt
@@ -4,21 +4,19 @@
 //= Z3R0
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Exchanges 17 Carat Diamond
 //===== Additional Comments: =================================
-//= v1.0 First / Optimized Version
-//= v1.1 Adjusted for Missing ; on Line #271 (#15425)
-//= v1.2 Removed Comments per Request (#15426)
-//= v1.3 Changed Emotion # to Const Definition (#15427)
-//= v1.4 Removed Double Space on Line #148 (#15428)
-//= v1.5 Added This Version History (#15429)
+//= 1.0 First / Optimized Version
+//= 1.1 Adjusted for Missing ; on Line #271 (#15425)
+//= 1.2 Removed Comments per Request (#15426)
+//= 1.3 Changed Emotion # to Const Definition (#15427)
+//= 1.4 Removed Double Space on Line #148 (#15428)
+//= 1.5 Added This Version History (#15429)
 //============================================================
 
--	script	RareDiamondMerchant	58,{
+-	script	RareDiamondMerchant	1_M_MERCHANT,{
 
 	set .@npc$, "[Rare Diamond Merchant]";
 
@@ -142,7 +140,7 @@
 					mes "501,000,000 zeny.";
 					mes "Amount has been confirmed.";
 					emotion e_loud;
-					set Zeny, Zeny - 501000000;
+					Zeny -= 501000000;
 					getitem 6024, 1;
 					next;
 
@@ -222,7 +220,7 @@
 				mes "come back anytime with 500 million zeny.";
 				emotion e_thx;
 				delitem 6024, 1;
-				set Zeny, Zeny + 499000000;
+				Zeny += 499000000;
 				close;
 			}
 			else {
@@ -235,10 +233,10 @@
 	}
 }
 
-prontera,165,89,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#1	58
-geffen,106,63,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#2	58
-morocc,146,100,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#3	58
-alberta,129,60,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#4	58
-lighthalzen,163,65,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#5	58
-rachel,106,142,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#6	58
-payon,180,130,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#7	58
+prontera,165,89,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#1	1_M_MERCHANT
+geffen,106,63,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#2	1_M_MERCHANT
+morocc,146,100,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#3	1_M_MERCHANT
+alberta,129,60,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#4	1_M_MERCHANT
+lighthalzen,163,65,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#5	1_M_MERCHANT
+rachel,106,142,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#6	1_M_MERCHANT
+payon,180,130,6	duplicate(RareDiamondMerchant)	Rare Diamond Merchant#7	1_M_MERCHANT
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index c7e182005..24ed71c04 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -4,8 +4,6 @@
 //= Muad_Dib
 //===== Current Version: =====================================
 //= 1.0a
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= [Official Conversion]
 //= Adds enchantments to many high level weapons in exchange
@@ -15,7 +13,7 @@
 //= 1.0a Added 'delequip' command. [Euphy]
 //============================================================
 
-malangdo,213,167,4	script	Mayomayo#mal	555,{
+malangdo,213,167,4	script	Mayomayo#mal	4_CAT_3COLOR,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
@@ -28,10 +26,10 @@ malangdo,213,167,4	script	Mayomayo#mal	555,{
 	mes "[Mayomayo]";
 	mes "Wow welcome. It is new Mayomayo refinement store~ I enchant some luxury weapons including level 4 weapons.";
 	next;
-	switch(select("Any store policy is changes?:Enhance high ranked weapons:Reset reinforcement capability")) {
+	switch(select("Any store policy changes?:Enchant High Ranked Weapon:Initialize Enchant (Need Silvervine Fruit)")) {
 	case 1:
 		mes "[Mayomayo]";
-		mes "When I enchanted weapons, the slotted cards or refined level sometimes dissipated. I hated it. However, one day I found how to do it without any extinction.";
+		mes "When I enchant weapons, the slotted cards or refined level are dissipated sometimes. I hated it. However, one day I found how to do it without any extinction.";
 		next;
 		mes "[Mayomayo]";
 		mes "Have you ever seen a building of person of reinforcement capacity association?";
@@ -42,7 +40,7 @@ malangdo,213,167,4	script	Mayomayo#mal	555,{
 			close;
 		}
 		mes "[Mayomayo]";
-		mes "If you go the place, there is someone who enchants the Archangel Wing. At that time that was amazing, because that was impossible ability by my own skill.";
+		mes "If you go to the place, there is someone who enchants the Archangel Wing. At that time that was amazing, because that was impossible ability by my own skill.";
 		next;
 		mes "[Mayomayo]";
 		mes "Every night I became his butler and did odd jobs. That is how I learned to enchant.";
@@ -67,7 +65,7 @@ malangdo,213,167,4	script	Mayomayo#mal	555,{
 	set @mal_equip_id, getequipid(EQI_HAND_R);
 	set .@equip_type, getiteminfo(@mal_equip_id,11);
 
-	//callsub L_Socket,<cost multiplier>,<type>;
+	//callsub L_Socket,<cost multiplier>,<4-x enchants possible>;
 	switch(.@equip_type) { // Check weapon type first to speed up the checks.
 	case 1: // Daggers
 		switch(@mal_equip_id) {
@@ -305,7 +303,7 @@ malangdo,213,167,4	script	Mayomayo#mal	555,{
 	}
 	mes "[Mayomayo]";
 	if (@mal_enchant_select == 1)
-		mes "This is not suitable equipment for the enchant. Don't forget we only take care of high class weapons, including level 4 weapons~";
+		mes "This is not a suitable equipment for the enchant. Don't forget we only take care of high class weapons, including level 4 weapons~";
 	else
 		mes "This equipment can not be initialized. Don't forget we only handle some luxury weapons, including level 4 weapons~";
 	set @mal_equip_id,0;
diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt
index 8ff8f758d..e35f768a3 100644
--- a/npc/re/merchants/enchan_mora.txt
+++ b/npc/re/merchants/enchan_mora.txt
@@ -1,22 +1,23 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Mora Enchants
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Euphy
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Adds enchantments to various items in exchange for
 //= Mora coins.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Euphy]
-//============================================================ 
+//= 1.1 Optimized. [Euphy]
+//= 1.1a Bug fixes. [Lemongrass]
+//= 1.2 Bug fixes (bugreport:7930) [DeadlySilence]
+//============================================================
 
 // Arch Bishop Enchants :: coin_arc
 //============================================================
-mora,88,89,5	script	Keeper of Secrets#pa082	495,{
+mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -137,7 +138,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	495,{
 	}
 }
 
-mora,96,74,5	script	Master of Relics#pa0829	495,{
+mora,96,74,5	script	Master of Relics#pa0829	4_M_MERCAT1,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -217,70 +218,15 @@ mora,96,74,5	script	Master of Relics#pa0829	495,{
 		switch(.@enchant_type) {
 		case 1:
 			set .@i, rand(1,1487);
-			     if (.@i <= 16) setarray .@enchants[2],4710,.@sp; //Inteligence2 [sp]
-			else if (.@i <= 32) setarray .@enchants[2],4710,4799; //Inteligence2 HP500
-			else if (.@i <= 48) setarray .@enchants[2],4710,4766; //Inteligence2 Atk2
-			else if (.@i <= 64) setarray .@enchants[2],4710,4788; //Inteligence2 Mdef6
-			else if (.@i <= 80) setarray .@enchants[2],4720,.@sp; //Dexterity1 [sp]
-			else if (.@i <= 96) setarray .@enchants[2],4720,4799; //Dexterity1 HP500
-			else if (.@i <= 112) setarray .@enchants[2],4720,4766; //Dexterity1 Atk2
-			else if (.@i <= 128) setarray .@enchants[2],4720,4788; //Dexterity1 Mdef6
-			else if (.@i <= 144) setarray .@enchants[2],4721,.@sp; //Dexterity2 [sp]
-			else if (.@i <= 160) setarray .@enchants[2],4721,4799; //Dexterity2 HP500
-			else if (.@i <= 176) setarray .@enchants[2],4721,4766; //Dexterity2 Atk2
-			else if (.@i <= 192) setarray .@enchants[2],4721,4788; //Dexterity2 Mdef6
-			else if (.@i <= 208) setarray .@enchants[2],4740,.@sp; //Vitality1 [sp]
-			else if (.@i <= 224) setarray .@enchants[2],4740,4799; //Vitality1 HP500
-			else if (.@i <= 240) setarray .@enchants[2],4740,4766; //Vitality1 Atk2
-			else if (.@i <= 256) setarray .@enchants[2],4740,4788; //Vitality1 Mdef6
-			else if (.@i <= 272) setarray .@enchants[2],4710,.@sp; //Inteligence2 [sp]
-			else if (.@i <= 288) setarray .@enchants[2],4710,4799; //Inteligence2 HP500
-			else if (.@i <= 304) setarray .@enchants[2],4710,4766; //Inteligence2 Atk2
-			else if (.@i <= 320) setarray .@enchants[2],4710,4788; //Inteligence2 Mdef6
-			else if (.@i <= 336) setarray .@enchants[2],4720,.@sp; //Dexterity1 [sp]
-			else if (.@i <= 352) setarray .@enchants[2],4720,4799; //Dexterity1 HP500
-			else if (.@i <= 368) setarray .@enchants[2],4720,4766; //Dexterity1 Atk2
-			else if (.@i <= 384) setarray .@enchants[2],4720,4788; //Dexterity1 Mdef6
-			else if (.@i <= 400) setarray .@enchants[2],4721,.@sp; //Dexterity2 [sp]
-			else if (.@i <= 416) setarray .@enchants[2],4721,4799; //Dexterity2 HP500
-			else if (.@i <= 432) setarray .@enchants[2],4721,4766; //Dexterity2 Atk2
-			else if (.@i <= 448) setarray .@enchants[2],4721,4788; //Dexterity2 Mdef6
-			else if (.@i <= 464) setarray .@enchants[2],4740,.@sp; //Vitality1 [sp]
-			else if (.@i <= 480) setarray .@enchants[2],4740,4799; //Vitality1 HP500
-			else if (.@i <= 496) setarray .@enchants[2],4740,4766; //Vitality1 Atk2
-			else if (.@i <= 512) setarray .@enchants[2],4740,4788; //Vitality1 Mdef6
-			else if (.@i <= 528) setarray .@enchants[2],4710,.@sp; //Inteligence2 [sp]
-			else if (.@i <= 544) setarray .@enchants[2],4710,4799; //Inteligence2 HP500
-			else if (.@i <= 560) setarray .@enchants[2],4710,4766; //Inteligence2 Atk2
-			else if (.@i <= 576) setarray .@enchants[2],4710,4788; //Inteligence2 Mdef6
-			else if (.@i <= 592) setarray .@enchants[2],4720,.@sp; //Dexterity1 [sp]
-			else if (.@i <= 608) setarray .@enchants[2],4720,4799; //Dexterity1 HP500
-			else if (.@i <= 624) setarray .@enchants[2],4720,4766; //Dexterity1 Atk2
-			else if (.@i <= 640) setarray .@enchants[2],4720,4788; //Dexterity1 Mdef6
-			else if (.@i <= 656) setarray .@enchants[2],4721,.@sp; //Dexterity2 [sp]
-			else if (.@i <= 672) setarray .@enchants[2],4721,4799; //Dexterity2 HP500
-			else if (.@i <= 688) setarray .@enchants[2],4721,4766; //Dexterity2 Atk2
-			else if (.@i <= 704) setarray .@enchants[2],4721,4788; //Dexterity2 Mdef6
-			else if (.@i <= 720) setarray .@enchants[2],4740,.@sp; //Vitality1 [sp]
-			else if (.@i <= 736) setarray .@enchants[2],4740,4799; //Vitality1 HP500
-			else if (.@i <= 752) setarray .@enchants[2],4740,4766; //Vitality1 Atk2
-			else if (.@i <= 768) setarray .@enchants[2],4740,4788; //Vitality1 Mdef6
-			else if (.@i <= 784) setarray .@enchants[2],4710,.@sp; //Inteligence2 [sp]
-			else if (.@i <= 800) setarray .@enchants[2],4710,4799; //Inteligence2 HP500
-			else if (.@i <= 816) setarray .@enchants[2],4710,4766; //Inteligence2 Atk2
-			else if (.@i <= 832) setarray .@enchants[2],4710,4788; //Inteligence2 Mdef6
-			else if (.@i <= 848) setarray .@enchants[2],4720,.@sp; //Dexterity1 [sp]
-			else if (.@i <= 864) setarray .@enchants[2],4720,4799; //Dexterity1 HP500
-			else if (.@i <= 880) setarray .@enchants[2],4720,4766; //Dexterity1 Atk2
-			else if (.@i <= 896) setarray .@enchants[2],4720,4788; //Dexterity1 Mdef6
-			else if (.@i <= 912) setarray .@enchants[2],4721,.@sp; //Dexterity2 [sp]
-			else if (.@i <= 928) setarray .@enchants[2],4721,4799; //Dexterity2 HP500
-			else if (.@i <= 944) setarray .@enchants[2],4721,4766; //Dexterity2 Atk2
-			else if (.@i <= 960) setarray .@enchants[2],4721,4788; //Dexterity2 Mdef6
-			else if (.@i <= 976) setarray .@enchants[2],4740,.@sp; //Vitality1 [sp]
-			else if (.@i <= 992) setarray .@enchants[2],4740,4799; //Vitality1 HP500
-			else if (.@i <= 1008) setarray .@enchants[2],4740,4766; //Vitality1 Atk2
-			else if (.@i <= 1024) setarray .@enchants[2],4740,4788; //Vitality1 Mdef6
+			if (.@i <= 1024) {
+				// Basic combinations
+				// (raw: .@i increments by 16, 4 repeats)
+				setarray .@enchant_slot2[0],4711,4720,4721,4740; //Inteligence2,Dexterity1,Dexterity2,Vitality1
+				setarray .@enchant_slot3[0],.@sp,4799,4766,4788; //[sp],HP500,Atk2,Mdef6
+				setarray .@enchants[2],
+					.@enchant_slot2[rand(getarraysize(.@enchant_slot2))],
+					.@enchant_slot3[rand(getarraysize(.@enchant_slot3))];
+			}
 			else if (.@i <= 1040) setarray .@enchants[2],.@sp,.@sp; //[sp] [sp]
 			else if (.@i <= 1487) {
 				mes "[Relice]";
@@ -290,70 +236,17 @@ mora,96,74,5	script	Master of Relics#pa0829	495,{
 			break;
 		case 2:
 			set .@i, rand(1,1487);
-			     if (.@i <= 16) setarray .@enchants[1],4710,4711,4764; //Inteligence1 Inteligence2 Critical5
-			else if (.@i <= 32) setarray .@enchants[1],4710,4711,4799; //Inteligence1 Inteligence2 HP500
-			else if (.@i <= 48) setarray .@enchants[1],4710,4711,4766; //Inteligence1 Inteligence2 Atk2
-			else if (.@i <= 64) setarray .@enchants[1],4710,4711,4788; //Inteligence1 Inteligence2 Mdef6
-			else if (.@i <= 80) setarray .@enchants[1],4710,4720,4764; //Inteligence1 Dexterity1 Critical5
-			else if (.@i <= 96) setarray .@enchants[1],4710,4720,4799; //Inteligence1 Dexterity1 HP500
-			else if (.@i <= 112) setarray .@enchants[1],4710,4720,4766; //Inteligence1 Dexterity1 Atk2
-			else if (.@i <= 128) setarray .@enchants[1],4710,4720,4788; //Inteligence1 Dexterity1 Mdef6
-			else if (.@i <= 144) setarray .@enchants[1],4710,4721,4764; //Inteligence1 Dexterity2 Critical5
-			else if (.@i <= 160) setarray .@enchants[1],4710,4721,4799; //Inteligence1 Dexterity2 HP500
-			else if (.@i <= 176) setarray .@enchants[1],4710,4721,4766; //Inteligence1 Dexterity2 Atk2
-			else if (.@i <= 192) setarray .@enchants[1],4710,4721,4788; //Inteligence1 Dexterity2 Mdef6
-			else if (.@i <= 208) setarray .@enchants[1],4710,4740,4764; //Inteligence1 Vitality1 Critical5
-			else if (.@i <= 224) setarray .@enchants[1],4710,4740,4799; //Inteligence1 Vitality1 HP500
-			else if (.@i <= 240) setarray .@enchants[1],4710,4740,4766; //Inteligence1 Vitality1 Atk2
-			else if (.@i <= 256) setarray .@enchants[1],4710,4740,4788; //Inteligence1 Vitality1 Mdef6
-			else if (.@i <= 272) setarray .@enchants[1],4711,4711,4764; //Inteligence2 Inteligence2 Critical5
-			else if (.@i <= 288) setarray .@enchants[1],4711,4711,4799; //Inteligence2 Inteligence2 HP500
-			else if (.@i <= 304) setarray .@enchants[1],4711,4711,4766; //Inteligence2 Inteligence2 Atk2
-			else if (.@i <= 320) setarray .@enchants[1],4711,4711,4788; //Inteligence2 Inteligence2 Mdef6
-			else if (.@i <= 336) setarray .@enchants[1],4711,4720,4764; //Inteligence2 Dexterity1 Critical5
-			else if (.@i <= 352) setarray .@enchants[1],4711,4720,4799; //Inteligence2 Dexterity1 HP500
-			else if (.@i <= 368) setarray .@enchants[1],4711,4720,4766; //Inteligence2 Dexterity1 Atk2
-			else if (.@i <= 384) setarray .@enchants[1],4711,4720,4788; //Inteligence2 Dexterity1 Mdef6
-			else if (.@i <= 400) setarray .@enchants[1],4711,4721,4764; //Inteligence2 Dexterity2 Critical5
-			else if (.@i <= 416) setarray .@enchants[1],4711,4721,4799; //Inteligence2 Dexterity2 HP500
-			else if (.@i <= 432) setarray .@enchants[1],4711,4721,4766; //Inteligence2 Dexterity2 Atk2
-			else if (.@i <= 448) setarray .@enchants[1],4711,4721,4788; //Inteligence2 Dexterity2 Mdef6
-			else if (.@i <= 464) setarray .@enchants[1],4711,4740,4764; //Inteligence2 Vitality1 Critical5
-			else if (.@i <= 480) setarray .@enchants[1],4711,4740,4799; //Inteligence2 Vitality1 HP500
-			else if (.@i <= 496) setarray .@enchants[1],4711,4740,4766; //Inteligence2 Vitality1 Atk2
-			else if (.@i <= 512) setarray .@enchants[1],4711,4740,4788; //Inteligence2 Vitality1 Mdef6
-			else if (.@i <= 528) setarray .@enchants[1],4720,4711,4764; //Dexterity1 Inteligence2 Critical5
-			else if (.@i <= 544) setarray .@enchants[1],4720,4711,4799; //Dexterity1 Inteligence2 HP500
-			else if (.@i <= 560) setarray .@enchants[1],4720,4711,4766; //Dexterity1 Inteligence2 Atk2
-			else if (.@i <= 576) setarray .@enchants[1],4720,4711,4788; //Dexterity1 Inteligence2 Mdef6
-			else if (.@i <= 592) setarray .@enchants[1],4720,4720,4764; //Dexterity1 Dexterity1 Critical5
-			else if (.@i <= 608) setarray .@enchants[1],4720,4720,4799; //Dexterity1 Dexterity1 HP500
-			else if (.@i <= 624) setarray .@enchants[1],4720,4720,4766; //Dexterity1 Dexterity1 Atk2
-			else if (.@i <= 640) setarray .@enchants[1],4720,4720,4788; //Dexterity1 Dexterity1 Mdef6
-			else if (.@i <= 656) setarray .@enchants[1],4720,4721,4764; //Dexterity1 Dexterity2 Critical5
-			else if (.@i <= 672) setarray .@enchants[1],4720,4721,4799; //Dexterity1 Dexterity2 HP500
-			else if (.@i <= 688) setarray .@enchants[1],4720,4721,4766; //Dexterity1 Dexterity2 Atk2
-			else if (.@i <= 704) setarray .@enchants[1],4720,4721,4788; //Dexterity1 Dexterity2 Mdef6
-			else if (.@i <= 720) setarray .@enchants[1],4720,4740,4764; //Dexterity1 Vitality1 Critical5
-			else if (.@i <= 736) setarray .@enchants[1],4720,4740,4799; //Dexterity1 Vitality1 HP500
-			else if (.@i <= 752) setarray .@enchants[1],4720,4740,4766; //Dexterity1 Vitality1 Atk2
-			else if (.@i <= 768) setarray .@enchants[1],4720,4740,4788; //Dexterity1 Vitality1 Mdef6
-			else if (.@i <= 784) setarray .@enchants[1],4721,4711,4764; //Dexterity2 Inteligence2 Critical5
-			else if (.@i <= 800) setarray .@enchants[1],4721,4711,4799; //Dexterity2 Inteligence2 HP500
-			else if (.@i <= 816) setarray .@enchants[1],4721,4711,4766; //Dexterity2 Inteligence2 Atk2
-			else if (.@i <= 832) setarray .@enchants[1],4721,4711,4788; //Dexterity2 Inteligence2 Mdef6
-			else if (.@i <= 848) setarray .@enchants[1],4721,4720,4764; //Dexterity2 Dexterity1 Critical5
-			else if (.@i <= 864) setarray .@enchants[1],4721,4720,4799; //Dexterity2 Dexterity1 HP500
-			else if (.@i <= 880) setarray .@enchants[1],4721,4720,4766; //Dexterity2 Dexterity1 Atk2
-			else if (.@i <= 896) setarray .@enchants[1],4721,4720,4788; //Dexterity2 Dexterity1 Mdef6
-			else if (.@i <= 912) setarray .@enchants[1],4721,4721,4764; //Dexterity2 Dexterity2 Critical5
-			else if (.@i <= 928) setarray .@enchants[1],4721,4721,4799; //Dexterity2 Dexterity2 HP500
-			else if (.@i <= 944) setarray .@enchants[1],4721,4721,4766; //Dexterity2 Dexterity2 Atk2
-			else if (.@i <= 960) setarray .@enchants[1],4721,4721,4788; //Dexterity2 Dexterity2 Mdef6
-			else if (.@i <= 976) setarray .@enchants[1],4721,4740,4764; //Dexterity2 Vitality1 Critical5
-			else if (.@i <= 992) setarray .@enchants[1],4721,4740,4799; //Dexterity2 Vitality1 HP500
-			else if (.@i <= 1008) setarray .@enchants[1],4721,4740,4766; //Dexterity2 Vitality1 Atk2
-			else if (.@i <= 1024) setarray .@enchants[1],4721,4740,4788; //Dexterity2 Vitality1 Mdef6
+			if (.@i <= 1024) {
+				// Basic combinations
+				// (raw: .@i increments by 16)
+				setarray .@enchant_slot1[0],4710,4711,4720,4721; //Inteligence1,Inteligence2,Dexterity1,Dexterity2
+				setarray .@enchant_slot2[0],4711,4720,4721,4740; //Inteligence2,Dexterity1,Dexterity2,Vitality1
+				setarray .@enchant_slot3[0],4764,4799,4766,4788; //Critical5,HP500,Atk2,Mdef6
+				setarray .@enchants[1],
+					.@enchant_slot1[rand(getarraysize(.@enchant_slot1))],
+					.@enchant_slot2[rand(getarraysize(.@enchant_slot2))],
+					.@enchant_slot3[rand(getarraysize(.@enchant_slot3))];
+			}
 			else if (.@i <= 1026) setarray .@enchants[1],4761,4761,4761; //Matk2 Matk2 Matk2
 			else if (.@i <= 1028) setarray .@enchants[1],4712,4713,4713; //Inteligence3 Inteligence4 Inteligence4
 			else if (.@i <= 1030) setarray .@enchants[1],4712,4761,4761; //Inteligence3 Matk2 Matk2
@@ -370,70 +263,15 @@ mora,96,74,5	script	Master of Relics#pa0829	495,{
 			break;
 		case 3:
 			set .@i, rand(1,2852);
-			     if (.@i <= 31) setarray .@enchants[2],4720,4710; //Dexterity1 Inteligence1
-			else if (.@i <= 62) setarray .@enchants[2],4720,4711; //Dexterity1 Inteligence2
-			else if (.@i <= 93) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-			else if (.@i <= 124) setarray .@enchants[2],4720,4760; //Dexterity1 Matk1
-			else if (.@i <= 155) setarray .@enchants[2],4740,4710; //Vitality1 Inteligence1
-			else if (.@i <= 186) setarray .@enchants[2],4740,4711; //Vitality1 Inteligence2
-			else if (.@i <= 217) setarray .@enchants[2],4740,4721; //Vitality1 Dexterity2
-			else if (.@i <= 248) setarray .@enchants[2],4740,4760; //Vitality1 Matk1
-			else if (.@i <= 279) setarray .@enchants[2],4741,4710; //Vitality2 Inteligence1
-			else if (.@i <= 310) setarray .@enchants[2],4741,4711; //Vitality2 Inteligence2
-			else if (.@i <= 341) setarray .@enchants[2],4741,4721; //Vitality2 Dexterity2
-			else if (.@i <= 372) setarray .@enchants[2],4741,4760; //Vitality2 Matk1
-			else if (.@i <= 403) setarray .@enchants[2],4801,4710; //SP100 Inteligence1
-			else if (.@i <= 434) setarray .@enchants[2],4801,4711; //SP100 Inteligence2
-			else if (.@i <= 465) setarray .@enchants[2],4801,4721; //SP100 Dexterity2
-			else if (.@i <= 496) setarray .@enchants[2],4801,4760; //SP100 Matk1
-			else if (.@i <= 527) setarray .@enchants[2],4720,4710; //Dexterity1 Inteligence1
-			else if (.@i <= 558) setarray .@enchants[2],4720,4711; //Dexterity1 Inteligence2
-			else if (.@i <= 589) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-			else if (.@i <= 620) setarray .@enchants[2],4720,4760; //Dexterity1 Matk1
-			else if (.@i <= 651) setarray .@enchants[2],4740,4710; //Vitality1 Inteligence1
-			else if (.@i <= 682) setarray .@enchants[2],4740,4711; //Vitality1 Inteligence2
-			else if (.@i <= 713) setarray .@enchants[2],4740,4721; //Vitality1 Dexterity2
-			else if (.@i <= 744) setarray .@enchants[2],4740,4760; //Vitality1 Matk1
-			else if (.@i <= 775) setarray .@enchants[2],4741,4710; //Vitality2 Inteligence1
-			else if (.@i <= 806) setarray .@enchants[2],4741,4711; //Vitality2 Inteligence2
-			else if (.@i <= 837) setarray .@enchants[2],4741,4721; //Vitality2 Dexterity2
-			else if (.@i <= 868) setarray .@enchants[2],4741,4760; //Vitality2 Matk1
-			else if (.@i <= 899) setarray .@enchants[2],4801,4710; //SP100 Inteligence1
-			else if (.@i <= 930) setarray .@enchants[2],4801,4711; //SP100 Inteligence2
-			else if (.@i <= 961) setarray .@enchants[2],4801,4721; //SP100 Dexterity2
-			else if (.@i <= 992) setarray .@enchants[2],4801,4760; //SP100 Matk1
-			else if (.@i <= 1023) setarray .@enchants[2],4720,4710; //Dexterity1 Inteligence1
-			else if (.@i <= 1054) setarray .@enchants[2],4720,4711; //Dexterity1 Inteligence2
-			else if (.@i <= 1085) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-			else if (.@i <= 1116) setarray .@enchants[2],4720,4760; //Dexterity1 Matk1
-			else if (.@i <= 1147) setarray .@enchants[2],4740,4710; //Vitality1 Inteligence1
-			else if (.@i <= 1178) setarray .@enchants[2],4740,4711; //Vitality1 Inteligence2
-			else if (.@i <= 1209) setarray .@enchants[2],4740,4721; //Vitality1 Dexterity2
-			else if (.@i <= 1240) setarray .@enchants[2],4740,4760; //Vitality1 Matk1
-			else if (.@i <= 1271) setarray .@enchants[2],4741,4710; //Vitality2 Inteligence1
-			else if (.@i <= 1302) setarray .@enchants[2],4741,4711; //Vitality2 Inteligence2
-			else if (.@i <= 1333) setarray .@enchants[2],4741,4721; //Vitality2 Dexterity2
-			else if (.@i <= 1364) setarray .@enchants[2],4741,4760; //Vitality2 Matk1
-			else if (.@i <= 1395) setarray .@enchants[2],4801,4710; //SP100 Inteligence1
-			else if (.@i <= 1426) setarray .@enchants[2],4801,4711; //SP100 Inteligence2
-			else if (.@i <= 1457) setarray .@enchants[2],4801,4721; //SP100 Dexterity2
-			else if (.@i <= 1488) setarray .@enchants[2],4801,4760; //SP100 Matk1
-			else if (.@i <= 1519) setarray .@enchants[2],4720,4710; //Dexterity1 Inteligence1
-			else if (.@i <= 1550) setarray .@enchants[2],4720,4711; //Dexterity1 Inteligence2
-			else if (.@i <= 1581) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-			else if (.@i <= 1612) setarray .@enchants[2],4720,4760; //Dexterity1 Matk1
-			else if (.@i <= 1643) setarray .@enchants[2],4740,4710; //Vitality1 Inteligence1
-			else if (.@i <= 1674) setarray .@enchants[2],4740,4711; //Vitality1 Inteligence2
-			else if (.@i <= 1705) setarray .@enchants[2],4740,4721; //Vitality1 Dexterity2
-			else if (.@i <= 1736) setarray .@enchants[2],4740,4760; //Vitality1 Matk1
-			else if (.@i <= 1767) setarray .@enchants[2],4741,4710; //Vitality2 Inteligence1
-			else if (.@i <= 1798) setarray .@enchants[2],4741,4711; //Vitality2 Inteligence2
-			else if (.@i <= 1829) setarray .@enchants[2],4741,4721; //Vitality2 Dexterity2
-			else if (.@i <= 1860) setarray .@enchants[2],4741,4760; //Vitality2 Matk1
-			else if (.@i <= 1891) setarray .@enchants[2],4801,4710; //SP100 Inteligence1
-			else if (.@i <= 1922) setarray .@enchants[2],4801,4711; //SP100 Inteligence2
-			else if (.@i <= 1953) setarray .@enchants[2],4801,4721; //SP100 Dexterity2
-			else if (.@i <= 1984) setarray .@enchants[2],4801,4760; //SP100 Matk1
+			if (.@i <= 1984) {
+				// Basic combinations
+				// (raw: .@i increments by 31, 4 repeats)
+				setarray .@enchant_slot2[0],4720,4740,4741,4801; //Dexterity1,Vitality1,Vitality2,SP100
+				setarray .@enchant_slot3[0],4710,4711,4721,4760; //Inteligence1,Inteligence2,Dexterity2,Matk1
+				setarray .@enchants[2],
+					.@enchant_slot2[rand(getarraysize(.@enchant_slot2))],
+					.@enchant_slot3[rand(getarraysize(.@enchant_slot3))];
+			}
 			else if (.@i <= 1986) setarray .@enchants[2],4761,4761; //Matk2 Matk2
 			else if (.@i <= 1988) setarray .@enchants[2],4761,4723; //Matk2 Dexterity4
 			else if (.@i <= 1990) setarray .@enchants[2],4761,4714; //Matk2 Inteligence5
@@ -448,70 +286,15 @@ mora,96,74,5	script	Master of Relics#pa0829	495,{
 			break;
 		case 4:
 			set .@i, rand(1,2852);
-			     if (.@i <= 31) setarray .@enchants[2],4720,4700; //Dexterity1 Strength1
-			else if (.@i <= 62) setarray .@enchants[2],4720,4701; //Dexterity1 Strength2
-			else if (.@i <= 93) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-			else if (.@i <= 124) setarray .@enchants[2],4720,4767; //Dexterity1 Atk3
-			else if (.@i <= 155) setarray .@enchants[2],4740,4700; //Vitality1 Strength1
-			else if (.@i <= 186) setarray .@enchants[2],4740,4701; //Vitality1 Strength2
-			else if (.@i <= 217) setarray .@enchants[2],4740,4721; //Vitality1 Dexterity2
-			else if (.@i <= 248) setarray .@enchants[2],4740,4767; //Vitality1 Atk3
-			else if (.@i <= 279) setarray .@enchants[2],4741,4700; //Vitality2 Strength1
-			else if (.@i <= 310) setarray .@enchants[2],4741,4701; //Vitality2 Strength2
-			else if (.@i <= 341) setarray .@enchants[2],4741,4721; //Vitality2 Dexterity2
-			else if (.@i <= 372) setarray .@enchants[2],4741,4767; //Vitality2 Atk3
-			else if (.@i <= 403) setarray .@enchants[2],4701,4700; //Strength2 Strength1
-			else if (.@i <= 434) setarray .@enchants[2],4701,4701; //Strength2 Strength2
-			else if (.@i <= 465) setarray .@enchants[2],4701,4721; //Strength2 Dexterity2
-			else if (.@i <= 496) setarray .@enchants[2],4701,4767; //Strength2 Atk3
-			else if (.@i <= 527) setarray .@enchants[2],4720,4700; //Dexterity1 Strength1
-			else if (.@i <= 558) setarray .@enchants[2],4720,4701; //Dexterity1 Strength2
-			else if (.@i <= 589) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-			else if (.@i <= 620) setarray .@enchants[2],4720,4767; //Dexterity1 Atk3
-			else if (.@i <= 651) setarray .@enchants[2],4740,4700; //Vitality1 Strength1
-			else if (.@i <= 682) setarray .@enchants[2],4740,4701; //Vitality1 Strength2
-			else if (.@i <= 713) setarray .@enchants[2],4740,4721; //Vitality1 Dexterity2
-			else if (.@i <= 744) setarray .@enchants[2],4740,4767; //Vitality1 Atk3
-			else if (.@i <= 775) setarray .@enchants[2],4741,4700; //Vitality2 Strength1
-			else if (.@i <= 806) setarray .@enchants[2],4741,4701; //Vitality2 Strength2
-			else if (.@i <= 837) setarray .@enchants[2],4741,4721; //Vitality2 Dexterity2
-			else if (.@i <= 868) setarray .@enchants[2],4741,4767; //Vitality2 Atk3
-			else if (.@i <= 899) setarray .@enchants[2],4701,4700; //Strength2 Strength1
-			else if (.@i <= 930) setarray .@enchants[2],4701,4701; //Strength2 Strength2
-			else if (.@i <= 961) setarray .@enchants[2],4701,4721; //Strength2 Dexterity2
-			else if (.@i <= 992) setarray .@enchants[2],4701,4767; //Strength2 Atk3
-			else if (.@i <= 1023) setarray .@enchants[2],4720,4700; //Dexterity1 Strength1
-			else if (.@i <= 1054) setarray .@enchants[2],4720,4701; //Dexterity1 Strength2
-			else if (.@i <= 1085) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-			else if (.@i <= 1116) setarray .@enchants[2],4720,4767; //Dexterity1 Atk3
-			else if (.@i <= 1147) setarray .@enchants[2],4740,4700; //Vitality1 Strength1
-			else if (.@i <= 1178) setarray .@enchants[2],4740,4701; //Vitality1 Strength2
-			else if (.@i <= 1209) setarray .@enchants[2],4740,4721; //Vitality1 Dexterity2
-			else if (.@i <= 1240) setarray .@enchants[2],4740,4767; //Vitality1 Atk3
-			else if (.@i <= 1271) setarray .@enchants[2],4741,4700; //Vitality2 Strength1
-			else if (.@i <= 1302) setarray .@enchants[2],4741,4701; //Vitality2 Strength2
-			else if (.@i <= 1333) setarray .@enchants[2],4741,4721; //Vitality2 Dexterity2
-			else if (.@i <= 1364) setarray .@enchants[2],4741,4767; //Vitality2 Atk3
-			else if (.@i <= 1395) setarray .@enchants[2],4701,4700; //Strength2 Strength1
-			else if (.@i <= 1426) setarray .@enchants[2],4701,4701; //Strength2 Strength2
-			else if (.@i <= 1457) setarray .@enchants[2],4701,4721; //Strength2 Dexterity2
-			else if (.@i <= 1488) setarray .@enchants[2],4701,4767; //Strength2 Atk3
-			else if (.@i <= 1519) setarray .@enchants[2],4720,4700; //Dexterity1 Strength1
-			else if (.@i <= 1550) setarray .@enchants[2],4720,4701; //Dexterity1 Strength2
-			else if (.@i <= 1581) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-			else if (.@i <= 1612) setarray .@enchants[2],4720,4767; //Dexterity1 Atk3
-			else if (.@i <= 1643) setarray .@enchants[2],4740,4700; //Vitality1 Strength1
-			else if (.@i <= 1674) setarray .@enchants[2],4740,4701; //Vitality1 Strength2
-			else if (.@i <= 1705) setarray .@enchants[2],4740,4721; //Vitality1 Dexterity2
-			else if (.@i <= 1736) setarray .@enchants[2],4740,4767; //Vitality1 Atk3
-			else if (.@i <= 1767) setarray .@enchants[2],4741,4700; //Vitality2 Strength1
-			else if (.@i <= 1798) setarray .@enchants[2],4741,4701; //Vitality2 Strength2
-			else if (.@i <= 1829) setarray .@enchants[2],4741,4721; //Vitality2 Dexterity2
-			else if (.@i <= 1860) setarray .@enchants[2],4741,4767; //Vitality2 Atk3
-			else if (.@i <= 1891) setarray .@enchants[2],4701,4700; //Strength2 Strength1
-			else if (.@i <= 1922) setarray .@enchants[2],4701,4701; //Strength2 Strength2
-			else if (.@i <= 1953) setarray .@enchants[2],4701,4721; //Strength2 Dexterity2
-			else if (.@i <= 1984) setarray .@enchants[2],4701,4767; //Strength2 Atk3
+			if (.@i <= 1984) {
+				// Basic combinations
+				// (raw: .@i increments by 31, 4 repeats)
+				setarray .@enchant_slot2[0],4720,4740,4741,4701; //Dexterity1,Vitality1,Vitality2,Strength2
+				setarray .@enchant_slot3[0],4700,4701,4721,4767; //Strength1,Strength2,Dexterity2,Atk3
+				setarray .@enchants[2],
+					.@enchant_slot2[rand(getarraysize(.@enchant_slot2))],
+					.@enchant_slot3[rand(getarraysize(.@enchant_slot3))];
+			}
 			else if (.@i <= 1986) setarray .@enchants[2],4767,4767; //Atk3 Atk3
 			else if (.@i <= 1988) setarray .@enchants[2],4767,4723; //Atk3 Dexterity4
 			else if (.@i <= 1990) setarray .@enchants[2],4767,4704; //Atk3 Strength5
@@ -534,7 +317,7 @@ mora,96,74,5	script	Master of Relics#pa0829	495,{
 
 // Warlock Enchants :: coin_warrock
 //============================================================
-mora,104,76,4	script	Guardian of Artifacts#p	495,{
+mora,104,76,4	script	Guardian of Artifacts#p	4_M_MERCAT1,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -607,7 +390,7 @@ mora,104,76,4	script	Guardian of Artifacts#p	495,{
 	close;
 }
 
-mora,99,93,5	script	Artifact Crafter#pa0829	495,{
+mora,99,93,5	script	Artifact Crafter#pa0829	4_M_MERCAT1,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -673,7 +456,7 @@ mora,99,93,5	script	Artifact Crafter#pa0829	495,{
 		break;
 	}
 	set .@item, .@items[(.@select-2)%4];
-	if (countitem(6380) == 0 || countitem(.@item) == 0) {
+	if (countitem(6380) < 2 || countitem(.@item) == 0) {
 		mes "[Artifact Crafter]";
 		mes "You have to have 2 Mora Coins and an item to be reinforced before I can do my work.";
 		close;
@@ -684,70 +467,15 @@ mora,99,93,5	script	Artifact Crafter#pa0829	495,{
 	switch(.@enchant_type) {
 	case 1:
 		set .@i, rand(1,2847);
-		     if (.@i <= 31) setarray .@enchants[2],4720,4786; //Dexterity1 Mdef2
-		else if (.@i <= 62) setarray .@enchants[2],4720,4760; //Dexterity1 Matk1
-		else if (.@i <= 93) setarray .@enchants[2],4720,4711; //Dexterity1 Inteligence2
-		else if (.@i <= 124) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-		else if (.@i <= 155) setarray .@enchants[2],4796,4786; //HP200 Mdef2
-		else if (.@i <= 186) setarray .@enchants[2],4796,4760; //HP200 Matk1
-		else if (.@i <= 217) setarray .@enchants[2],4796,4711; //HP200 Inteligence2
-		else if (.@i <= 248) setarray .@enchants[2],4796,4721; //HP200 Dexterity2
-		else if (.@i <= 279) setarray .@enchants[2],4710,4786; //Inteligence1 Mdef2
-		else if (.@i <= 310) setarray .@enchants[2],4710,4760; //Inteligence1 Matk1
-		else if (.@i <= 341) setarray .@enchants[2],4710,4711; //Inteligence1 Inteligence2
-		else if (.@i <= 372) setarray .@enchants[2],4710,4721; //Inteligence1 Dexterity2
-		else if (.@i <= 403) setarray .@enchants[2],4801,4786; //SP100 Mdef2
-		else if (.@i <= 434) setarray .@enchants[2],4801,4760; //SP100 Matk1
-		else if (.@i <= 465) setarray .@enchants[2],4801,4711; //SP100 Inteligence2
-		else if (.@i <= 496) setarray .@enchants[2],4801,4721; //SP100 Dexterity2
-		else if (.@i <= 527) setarray .@enchants[2],4720,4786; //Dexterity1 Mdef2
-		else if (.@i <= 558) setarray .@enchants[2],4720,4760; //Dexterity1 Matk1
-		else if (.@i <= 589) setarray .@enchants[2],4720,4711; //Dexterity1 Inteligence2
-		else if (.@i <= 620) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-		else if (.@i <= 651) setarray .@enchants[2],4796,4786; //HP200 Mdef2
-		else if (.@i <= 682) setarray .@enchants[2],4796,4760; //HP200 Matk1
-		else if (.@i <= 713) setarray .@enchants[2],4796,4711; //HP200 Inteligence2
-		else if (.@i <= 744) setarray .@enchants[2],4796,4721; //HP200 Dexterity2
-		else if (.@i <= 775) setarray .@enchants[2],4710,4786; //Inteligence1 Mdef2
-		else if (.@i <= 806) setarray .@enchants[2],4710,4760; //Inteligence1 Matk1
-		else if (.@i <= 837) setarray .@enchants[2],4710,4711; //Inteligence1 Inteligence2
-		else if (.@i <= 868) setarray .@enchants[2],4710,4721; //Inteligence1 Dexterity2
-		else if (.@i <= 899) setarray .@enchants[2],4801,4786; //SP100 Mdef2
-		else if (.@i <= 930) setarray .@enchants[2],4801,4760; //SP100 Matk1
-		else if (.@i <= 961) setarray .@enchants[2],4801,4711; //SP100 Inteligence2
-		else if (.@i <= 992) setarray .@enchants[2],4801,4721; //SP100 Dexterity2
-		else if (.@i <= 1023) setarray .@enchants[2],4720,4786; //Dexterity1 Mdef2
-		else if (.@i <= 1054) setarray .@enchants[2],4720,4760; //Dexterity1 Matk1
-		else if (.@i <= 1085) setarray .@enchants[2],4720,4711; //Dexterity1 Inteligence2
-		else if (.@i <= 1116) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-		else if (.@i <= 1147) setarray .@enchants[2],4796,4786; //HP200 Mdef2
-		else if (.@i <= 1178) setarray .@enchants[2],4796,4760; //HP200 Matk1
-		else if (.@i <= 1209) setarray .@enchants[2],4796,4711; //HP200 Inteligence2
-		else if (.@i <= 1240) setarray .@enchants[2],4796,4721; //HP200 Dexterity2
-		else if (.@i <= 1271) setarray .@enchants[2],4710,4786; //Inteligence1 Mdef2
-		else if (.@i <= 1302) setarray .@enchants[2],4710,4760; //Inteligence1 Matk1
-		else if (.@i <= 1333) setarray .@enchants[2],4710,4711; //Inteligence1 Inteligence2
-		else if (.@i <= 1364) setarray .@enchants[2],4710,4721; //Inteligence1 Dexterity2
-		else if (.@i <= 1395) setarray .@enchants[2],4801,4786; //SP100 Mdef2
-		else if (.@i <= 1426) setarray .@enchants[2],4801,4760; //SP100 Matk1
-		else if (.@i <= 1457) setarray .@enchants[2],4801,4711; //SP100 Inteligence2
-		else if (.@i <= 1488) setarray .@enchants[2],4801,4721; //SP100 Dexterity2
-		else if (.@i <= 1519) setarray .@enchants[2],4720,4786; //Dexterity1 Mdef2
-		else if (.@i <= 1550) setarray .@enchants[2],4720,4760; //Dexterity1 Matk1
-		else if (.@i <= 1581) setarray .@enchants[2],4720,4711; //Dexterity1 Inteligence2
-		else if (.@i <= 1612) setarray .@enchants[2],4720,4721; //Dexterity1 Dexterity2
-		else if (.@i <= 1643) setarray .@enchants[2],4796,4786; //HP200 Mdef2
-		else if (.@i <= 1674) setarray .@enchants[2],4796,4760; //HP200 Matk1
-		else if (.@i <= 1705) setarray .@enchants[2],4796,4711; //HP200 Inteligence2
-		else if (.@i <= 1736) setarray .@enchants[2],4796,4721; //HP200 Dexterity2
-		else if (.@i <= 1767) setarray .@enchants[2],4710,4786; //Inteligence1 Mdef2
-		else if (.@i <= 1798) setarray .@enchants[2],4710,4760; //Inteligence1 Matk1
-		else if (.@i <= 1829) setarray .@enchants[2],4710,4711; //Inteligence1 Inteligence2
-		else if (.@i <= 1860) setarray .@enchants[2],4710,4721; //Inteligence1 Dexterity2
-		else if (.@i <= 1891) setarray .@enchants[2],4801,4786; //SP100 Mdef2
-		else if (.@i <= 1922) setarray .@enchants[2],4801,4760; //SP100 Matk1
-		else if (.@i <= 1953) setarray .@enchants[2],4801,4711; //SP100 Inteligence2
-		else if (.@i <= 1984) setarray .@enchants[2],4801,4721; //SP100 Dexterity2
+		if (.@i <= 1984) {
+			// Basic combinations
+			// (raw: .@i increments by 31, 4 repeats)
+			setarray .@enchant_slot2[0],4720,4796,4710,4801; //Dexterity1,HP200,Inteligence1,SP100
+			setarray .@enchant_slot3[0],4786,4760,4711,4721; //Mdef2,Matk1,Inteligence2,Dexterity2
+			setarray .@enchants[2],
+				.@enchant_slot2[rand(getarraysize(.@enchant_slot2))],
+				.@enchant_slot3[rand(getarraysize(.@enchant_slot3))];
+		}
 		else if (.@i <= 1986) setarray .@enchants[2],4713,4761; //Inteligence4 Matk2
 		else if (.@i <= 1988) setarray .@enchants[2],4713,4713; //Inteligence4 Inteligence4
 		else if (.@i <= 1990) setarray .@enchants[2],4761,4761; //Matk2 Matk2
@@ -760,70 +488,17 @@ mora,99,93,5	script	Artifact Crafter#pa0829	495,{
 		break;
 	case 2:
 		set .@i, rand(1,2858);
-		     if (.@i <= 31) setarray .@enchants[1],4710,4720,4786; //Inteligence1 Dexterity1 Mdef2
-		else if (.@i <= 62) setarray .@enchants[1],4710,4720,4760; //Inteligence1 Dexterity1 Matk1
-		else if (.@i <= 93) setarray .@enchants[1],4710,4720,4711; //Inteligence1 Dexterity1 Inteligence2
-		else if (.@i <= 124) setarray .@enchants[1],4710,4720,4721; //Inteligence1 Dexterity1 Dexterity2
-		else if (.@i <= 155) setarray .@enchants[1],4710,4796,4786; //Inteligence1 HP200 Mdef2
-		else if (.@i <= 186) setarray .@enchants[1],4710,4796,4760; //Inteligence1 HP200 Matk1
-		else if (.@i <= 217) setarray .@enchants[1],4710,4796,4711; //Inteligence1 HP200 Inteligence2
-		else if (.@i <= 248) setarray .@enchants[1],4710,4796,4721; //Inteligence1 HP200 Dexterity2
-		else if (.@i <= 279) setarray .@enchants[1],4710,4710,4786; //Inteligence1 Inteligence1 Mdef2
-		else if (.@i <= 310) setarray .@enchants[1],4710,4710,4760; //Inteligence1 Inteligence1 Matk1
-		else if (.@i <= 341) setarray .@enchants[1],4710,4710,4711; //Inteligence1 Inteligence1 Inteligence2
-		else if (.@i <= 372) setarray .@enchants[1],4710,4710,4721; //Inteligence1 Inteligence1 Dexterity2
-		else if (.@i <= 403) setarray .@enchants[1],4710,4801,4786; //Inteligence1 SP100 Mdef2
-		else if (.@i <= 434) setarray .@enchants[1],4710,4801,4760; //Inteligence1 SP100 Matk1
-		else if (.@i <= 465) setarray .@enchants[1],4710,4801,4711; //Inteligence1 SP100 Inteligence2
-		else if (.@i <= 496) setarray .@enchants[1],4710,4801,4721; //Inteligence1 SP100 Dexterity2
-		else if (.@i <= 527) setarray .@enchants[1],4711,4720,4786; //Inteligence2 Dexterity1 Mdef2
-		else if (.@i <= 558) setarray .@enchants[1],4711,4720,4760; //Inteligence2 Dexterity1 Matk1
-		else if (.@i <= 589) setarray .@enchants[1],4711,4720,4711; //Inteligence2 Dexterity1 Inteligence2
-		else if (.@i <= 620) setarray .@enchants[1],4711,4720,4721; //Inteligence2 Dexterity1 Dexterity2
-		else if (.@i <= 651) setarray .@enchants[1],4711,4796,4786; //Inteligence2 HP200 Mdef2
-		else if (.@i <= 682) setarray .@enchants[1],4711,4796,4760; //Inteligence2 HP200 Matk1
-		else if (.@i <= 713) setarray .@enchants[1],4711,4796,4711; //Inteligence2 HP200 Inteligence2
-		else if (.@i <= 744) setarray .@enchants[1],4711,4796,4721; //Inteligence2 HP200 Dexterity2
-		else if (.@i <= 775) setarray .@enchants[1],4711,4710,4786; //Inteligence2 Inteligence1 Mdef2
-		else if (.@i <= 806) setarray .@enchants[1],4711,4710,4760; //Inteligence2 Inteligence1 Matk1
-		else if (.@i <= 837) setarray .@enchants[1],4711,4710,4711; //Inteligence2 Inteligence1 Inteligence2
-		else if (.@i <= 868) setarray .@enchants[1],4711,4710,4721; //Inteligence2 Inteligence1 Dexterity2
-		else if (.@i <= 899) setarray .@enchants[1],4711,4801,4786; //Inteligence2 SP100 Mdef2
-		else if (.@i <= 930) setarray .@enchants[1],4711,4801,4760; //Inteligence2 SP100 Matk1
-		else if (.@i <= 961) setarray .@enchants[1],4711,4801,4711; //Inteligence2 SP100 Inteligence2
-		else if (.@i <= 992) setarray .@enchants[1],4711,4801,4721; //Inteligence2 SP100 Dexterity2
-		else if (.@i <= 1023) setarray .@enchants[1],4720,4720,4786; //Dexterity1 Dexterity1 Mdef2
-		else if (.@i <= 1054) setarray .@enchants[1],4720,4720,4760; //Dexterity1 Dexterity1 Matk1
-		else if (.@i <= 1085) setarray .@enchants[1],4720,4720,4711; //Dexterity1 Dexterity1 Inteligence2
-		else if (.@i <= 1116) setarray .@enchants[1],4720,4720,4721; //Dexterity1 Dexterity1 Dexterity2
-		else if (.@i <= 1147) setarray .@enchants[1],4720,4796,4786; //Dexterity1 HP200 Mdef2
-		else if (.@i <= 1178) setarray .@enchants[1],4720,4796,4760; //Dexterity1 HP200 Matk1
-		else if (.@i <= 1209) setarray .@enchants[1],4720,4796,4711; //Dexterity1 HP200 Inteligence2
-		else if (.@i <= 1240) setarray .@enchants[1],4720,4796,4721; //Dexterity1 HP200 Dexterity2
-		else if (.@i <= 1271) setarray .@enchants[1],4720,4710,4786; //Dexterity1 Inteligence1 Mdef2
-		else if (.@i <= 1302) setarray .@enchants[1],4720,4710,4760; //Dexterity1 Inteligence1 Matk1
-		else if (.@i <= 1333) setarray .@enchants[1],4720,4710,4711; //Dexterity1 Inteligence1 Inteligence2
-		else if (.@i <= 1364) setarray .@enchants[1],4720,4710,4721; //Dexterity1 Inteligence1 Dexterity2
-		else if (.@i <= 1395) setarray .@enchants[1],4720,4801,4786; //Dexterity1 SP100 Mdef2
-		else if (.@i <= 1426) setarray .@enchants[1],4720,4801,4760; //Dexterity1 SP100 Matk1
-		else if (.@i <= 1457) setarray .@enchants[1],4720,4801,4711; //Dexterity1 SP100 Inteligence2
-		else if (.@i <= 1488) setarray .@enchants[1],4720,4801,4721; //Dexterity1 SP100 Dexterity2
-		else if (.@i <= 1519) setarray .@enchants[1],4721,4720,4786; //Dexterity2 Dexterity1 Mdef2
-		else if (.@i <= 1550) setarray .@enchants[1],4721,4720,4760; //Dexterity2 Dexterity1 Matk1
-		else if (.@i <= 1581) setarray .@enchants[1],4721,4720,4711; //Dexterity2 Dexterity1 Inteligence2
-		else if (.@i <= 1612) setarray .@enchants[1],4721,4720,4721; //Dexterity2 Dexterity1 Dexterity2
-		else if (.@i <= 1643) setarray .@enchants[1],4721,4796,4786; //Dexterity2 HP200 Mdef2
-		else if (.@i <= 1674) setarray .@enchants[1],4721,4796,4760; //Dexterity2 HP200 Matk1
-		else if (.@i <= 1705) setarray .@enchants[1],4721,4796,4711; //Dexterity2 HP200 Inteligence2
-		else if (.@i <= 1736) setarray .@enchants[1],4721,4796,4721; //Dexterity2 HP200 Dexterity2
-		else if (.@i <= 1767) setarray .@enchants[1],4721,4710,4786; //Dexterity2 Inteligence1 Mdef2
-		else if (.@i <= 1798) setarray .@enchants[1],4721,4710,4760; //Dexterity2 Inteligence1 Matk1
-		else if (.@i <= 1829) setarray .@enchants[1],4721,4710,4711; //Dexterity2 Inteligence1 Inteligence2
-		else if (.@i <= 1860) setarray .@enchants[1],4721,4710,4721; //Dexterity2 Inteligence1 Dexterity2
-		else if (.@i <= 1891) setarray .@enchants[1],4721,4801,4786; //Dexterity2 SP100 Mdef2
-		else if (.@i <= 1922) setarray .@enchants[1],4721,4801,4760; //Dexterity2 SP100 Matk1
-		else if (.@i <= 1953) setarray .@enchants[1],4721,4801,4711; //Dexterity2 SP100 Inteligence2
-		else if (.@i <= 1984) setarray .@enchants[1],4721,4801,4721; //Dexterity2 SP100 Dexterity2
+		if (.@i <= 1984) {
+			// Basic combinations
+			// (raw: .@i increments by 31)
+			setarray .@enchant_slot1[0],4710,4711,4720,4721; //Inteligence1,Inteligence2,Dexterity1,Dexterity2
+			setarray .@enchant_slot2[0],4720,4796,4710,4801; //Dexterity1,HP200,Inteligence1,SP100
+			setarray .@enchant_slot3[0],4786,4760,4711,4721; //Mdef2,Matk1,Inteligence2,Dexterity2
+			setarray .@enchants[1],
+				.@enchant_slot1[rand(getarraysize(.@enchant_slot1))],
+				.@enchant_slot2[rand(getarraysize(.@enchant_slot2))],
+				.@enchant_slot3[rand(getarraysize(.@enchant_slot3))];
+		}
 		else if (.@i <= 1986) setarray .@enchants[1],4712,4713,4761; //Inteligence3 Inteligence4 Matk2
 		else if (.@i <= 1988) setarray .@enchants[1],4712,4713,4713; //Inteligence3 Inteligence4 Inteligence4
 		else if (.@i <= 1990) setarray .@enchants[1],4712,4761,4761; //Inteligence3 Matk2 Matk2
@@ -847,7 +522,7 @@ mora,99,93,5	script	Artifact Crafter#pa0829	495,{
 
 // Rune Knight, Guillotine Cross, & Ranger Enchants :: new_artifact
 //============================================================
-mora,152,97,5	script	Guardian of Power#pa082	515,{
+mora,152,97,5	script	Guardian of Power#pa082	4_F_DOGTRAVELER,{
 	if (checkweight(1201,1) == 0) {
 		mes "Reduce the amount of items that you have in your inventory before continuing.";
 		close;
@@ -884,12 +559,13 @@ mora,152,97,5	script	Guardian of Power#pa082	515,{
 		close;
 	}
 	mes "[Guardian of Power]";
-	mes .@jobs$[.@job]+"~ which artifact do you want?";
+	mes .@jobs$[.@job]+"?";
+	mes "Which artifact do you want?";
 	next;
 	switch(.@job) {
 	case 0: // Rune Knight
 		setarray .@items[0],2475,2476,2574,2575;
-		set .@i, select("Cancel:Ur's Greaves (Shoes):Peuz Greaves (Shoes):Ur's Manteau (Garment):Peuz Manteau (Garment)")-2;
+		set .@i, select("Cancel:Ur's Greaves (Shoes):Peuz's Greaves (Shoes):Ur's Manteau (Garment):Peuz's Manteau (Garment)")-2;
 		break;
 	case 1: // Guillotine Cross
 		setarray .@items[0],2477,2478,2577,2578;
@@ -917,7 +593,7 @@ mora,152,97,5	script	Guardian of Power#pa082	515,{
 	close;
 }
 
-mora,148,98,3	script	Artifact Researcher#new	521,{
+mora,148,98,3	script	Artifact Researcher#new	4_F_MORAFINE2,{
 	if (checkweight(1201,1) == 0) {
 		mes "Reduce the amount of items that you have in your inventory before continuing.";
 		close;
@@ -957,7 +633,7 @@ mora,148,98,3	script	Artifact Researcher#new	521,{
 	}
 	if (Zeny < 100000 || countitem(6380) == 0) {
 		mes "[Artifact Researcher]";
-		mes "I'm not giving these services out for free pal. 100,000 zeny or 1 Mora Coin. Is that too much to ask?";
+		mes "I'm not giving these services out for free pal. 100,000 zeny and 1 Mora Coin. Is that too much to ask?";
 		close;
 	}
 	mes "[Artifact Researcher]";
@@ -979,7 +655,6 @@ mora,148,98,3	script	Artifact Researcher#new	521,{
 	set .@equip_id, getequipid(.@part);
 	set @mora_equip_part, .@part;
 
-	// @mora_equip_id = enc_type
 	//callsub L_Socket,<enchant type>,<bonus enchant type>,<4-x enchants possible>;
 	// Enchant types:
 	//   [1]ATK [2]CRIT [3]EVA [4]Healer [5]Spell 1 [6]Assist 1 [7]Assist 2 [8]STR [9]Range [10]Physical [11]Spell 2
@@ -1425,7 +1100,7 @@ L_Socket:
 			close;
 		}
 		delitem 6380,1; //Mora_Coin
-		set Zeny, Zeny-100000;
+		Zeny -= 100000;
 		delequip .@part;
 		if (.@enchant == 9) {
 			specialeffect2 EF_SUI_EXPLOSION;
@@ -1460,7 +1135,7 @@ L_Socket:
 		mes "[Artifact Researcher]";
 		mes "The ability to enhance remains.";
 		delitem 6380,1; //Mora_Coin
-		set Zeny, Zeny-100000;
+		Zeny -= 100000;
 		delequip .@part;
 
 //		GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
@@ -1476,7 +1151,7 @@ L_Socket:
 
 // Arch Bishop & Warlock Empowering :: relic_change
 //============================================================
-mora,124,82,4	script	Artifact Collector#blan	522,{
+mora,124,82,4	script	Artifact Collector#blan	4_M_RAFLE_OR,{
 	if (checkweight(1201,1) == 0) {
 		mes "Reduce the amount of items that you have in your inventory before continuing.";
 		close;
@@ -1551,7 +1226,7 @@ mora,124,82,4	script	Artifact Collector#blan	522,{
 		mes "[Artifact Collector]";
 		mes "+1, +2, +3, +4, +5, +6 those refinements are not strong enough to work on my craft.";
 		next;
-		emotion 57,0;
+		emotion e_otl,0;
 		mes "[Artifact Collector]";
 		mes "But +7! +7 is rare and just barely strong enough to work in my crafting attempts.";
 		next;
@@ -1803,294 +1478,17 @@ function	script	F_Mora_Enchant	{
 	delitem 6380,5; //Mora_Coin
 	delitem getarg(0),1;
 	set .@i, rand(1,4568);
-	     if (.@i <= 11) setarray .@enchants[1],4766,4720,4700; //Atk2 Dexterity1 Strength1
-	else if (.@i <= 22) setarray .@enchants[1],4766,4720,4701; //Atk2 Dexterity1 Strength2
-	else if (.@i <= 33) setarray .@enchants[1],4766,4720,4730; //Atk2 Dexterity1 Agility1
-	else if (.@i <= 44) setarray .@enchants[1],4766,4720,4731; //Atk2 Dexterity1 Agility2
-	else if (.@i <= 55) setarray .@enchants[1],4766,4720,4740; //Atk2 Dexterity1 Vitality1
-	else if (.@i <= 66) setarray .@enchants[1],4766,4720,4741; //Atk2 Dexterity1 Vitality2
-	else if (.@i <= 77) setarray .@enchants[1],4766,4721,4700; //Atk2 Dexterity2 Strength1
-	else if (.@i <= 88) setarray .@enchants[1],4766,4721,4701; //Atk2 Dexterity2 Strength2
-	else if (.@i <= 99) setarray .@enchants[1],4766,4721,4730; //Atk2 Dexterity2 Agility1
-	else if (.@i <= 110) setarray .@enchants[1],4766,4721,4731; //Atk2 Dexterity2 Agility2
-	else if (.@i <= 121) setarray .@enchants[1],4766,4721,4740; //Atk2 Dexterity2 Vitality1
-	else if (.@i <= 132) setarray .@enchants[1],4766,4721,4741; //Atk2 Dexterity2 Vitality2
-	else if (.@i <= 143) setarray .@enchants[1],4766,4710,4700; //Atk2 Inteligence1 Strength1
-	else if (.@i <= 154) setarray .@enchants[1],4766,4710,4701; //Atk2 Inteligence1 Strength2
-	else if (.@i <= 165) setarray .@enchants[1],4766,4710,4730; //Atk2 Inteligence1 Agility1
-	else if (.@i <= 176) setarray .@enchants[1],4766,4710,4731; //Atk2 Inteligence1 Agility2
-	else if (.@i <= 187) setarray .@enchants[1],4766,4710,4740; //Atk2 Inteligence1 Vitality1
-	else if (.@i <= 198) setarray .@enchants[1],4766,4710,4741; //Atk2 Inteligence1 Vitality2
-	else if (.@i <= 209) setarray .@enchants[1],4766,4711,4700; //Atk2 Inteligence2 Strength1
-	else if (.@i <= 220) setarray .@enchants[1],4766,4711,4701; //Atk2 Inteligence2 Strength2
-	else if (.@i <= 231) setarray .@enchants[1],4766,4711,4730; //Atk2 Inteligence2 Agility1
-	else if (.@i <= 242) setarray .@enchants[1],4766,4711,4731; //Atk2 Inteligence2 Agility2
-	else if (.@i <= 253) setarray .@enchants[1],4766,4711,4740; //Atk2 Inteligence2 Vitality1
-	else if (.@i <= 264) setarray .@enchants[1],4766,4711,4741; //Atk2 Inteligence2 Vitality2
-	else if (.@i <= 275) setarray .@enchants[1],4766,4750,4700; //Atk2 Luck1 Strength1
-	else if (.@i <= 286) setarray .@enchants[1],4766,4750,4701; //Atk2 Luck1 Strength2
-	else if (.@i <= 297) setarray .@enchants[1],4766,4750,4730; //Atk2 Luck1 Agility1
-	else if (.@i <= 308) setarray .@enchants[1],4766,4750,4731; //Atk2 Luck1 Agility2
-	else if (.@i <= 319) setarray .@enchants[1],4766,4750,4740; //Atk2 Luck1 Vitality1
-	else if (.@i <= 330) setarray .@enchants[1],4766,4750,4741; //Atk2 Luck1 Vitality2
-	else if (.@i <= 341) setarray .@enchants[1],4766,4751,4700; //Atk2 Luck2 Strength1
-	else if (.@i <= 352) setarray .@enchants[1],4766,4751,4701; //Atk2 Luck2 Strength2
-	else if (.@i <= 363) setarray .@enchants[1],4766,4751,4730; //Atk2 Luck2 Agility1
-	else if (.@i <= 374) setarray .@enchants[1],4766,4751,4731; //Atk2 Luck2 Agility2
-	else if (.@i <= 385) setarray .@enchants[1],4766,4751,4740; //Atk2 Luck2 Vitality1
-	else if (.@i <= 396) setarray .@enchants[1],4766,4751,4741; //Atk2 Luck2 Vitality2
-	else if (.@i <= 407) setarray .@enchants[1],4767,4720,4700; //Atk3 Dexterity1 Strength1
-	else if (.@i <= 418) setarray .@enchants[1],4767,4720,4701; //Atk3 Dexterity1 Strength2
-	else if (.@i <= 429) setarray .@enchants[1],4767,4720,4730; //Atk3 Dexterity1 Agility1
-	else if (.@i <= 440) setarray .@enchants[1],4767,4720,4731; //Atk3 Dexterity1 Agility2
-	else if (.@i <= 451) setarray .@enchants[1],4767,4720,4740; //Atk3 Dexterity1 Vitality1
-	else if (.@i <= 462) setarray .@enchants[1],4767,4720,4741; //Atk3 Dexterity1 Vitality2
-	else if (.@i <= 473) setarray .@enchants[1],4767,4721,4700; //Atk3 Dexterity2 Strength1
-	else if (.@i <= 484) setarray .@enchants[1],4767,4721,4701; //Atk3 Dexterity2 Strength2
-	else if (.@i <= 495) setarray .@enchants[1],4767,4721,4730; //Atk3 Dexterity2 Agility1
-	else if (.@i <= 506) setarray .@enchants[1],4767,4721,4731; //Atk3 Dexterity2 Agility2
-	else if (.@i <= 517) setarray .@enchants[1],4767,4721,4740; //Atk3 Dexterity2 Vitality1
-	else if (.@i <= 528) setarray .@enchants[1],4767,4721,4741; //Atk3 Dexterity2 Vitality2
-	else if (.@i <= 539) setarray .@enchants[1],4767,4710,4700; //Atk3 Inteligence1 Strength1
-	else if (.@i <= 550) setarray .@enchants[1],4767,4710,4701; //Atk3 Inteligence1 Strength2
-	else if (.@i <= 561) setarray .@enchants[1],4767,4710,4730; //Atk3 Inteligence1 Agility1
-	else if (.@i <= 572) setarray .@enchants[1],4767,4710,4731; //Atk3 Inteligence1 Agility2
-	else if (.@i <= 583) setarray .@enchants[1],4767,4710,4740; //Atk3 Inteligence1 Vitality1
-	else if (.@i <= 594) setarray .@enchants[1],4767,4710,4741; //Atk3 Inteligence1 Vitality2
-	else if (.@i <= 605) setarray .@enchants[1],4767,4711,4700; //Atk3 Inteligence2 Strength1
-	else if (.@i <= 616) setarray .@enchants[1],4767,4711,4701; //Atk3 Inteligence2 Strength2
-	else if (.@i <= 627) setarray .@enchants[1],4767,4711,4730; //Atk3 Inteligence2 Agility1
-	else if (.@i <= 638) setarray .@enchants[1],4767,4711,4731; //Atk3 Inteligence2 Agility2
-	else if (.@i <= 649) setarray .@enchants[1],4767,4711,4740; //Atk3 Inteligence2 Vitality1
-	else if (.@i <= 660) setarray .@enchants[1],4767,4711,4741; //Atk3 Inteligence2 Vitality2
-	else if (.@i <= 671) setarray .@enchants[1],4767,4750,4700; //Atk3 Luck1 Strength1
-	else if (.@i <= 682) setarray .@enchants[1],4767,4750,4701; //Atk3 Luck1 Strength2
-	else if (.@i <= 693) setarray .@enchants[1],4767,4750,4730; //Atk3 Luck1 Agility1
-	else if (.@i <= 704) setarray .@enchants[1],4767,4750,4731; //Atk3 Luck1 Agility2
-	else if (.@i <= 715) setarray .@enchants[1],4767,4750,4740; //Atk3 Luck1 Vitality1
-	else if (.@i <= 726) setarray .@enchants[1],4767,4750,4741; //Atk3 Luck1 Vitality2
-	else if (.@i <= 737) setarray .@enchants[1],4767,4751,4700; //Atk3 Luck2 Strength1
-	else if (.@i <= 748) setarray .@enchants[1],4767,4751,4701; //Atk3 Luck2 Strength2
-	else if (.@i <= 759) setarray .@enchants[1],4767,4751,4730; //Atk3 Luck2 Agility1
-	else if (.@i <= 770) setarray .@enchants[1],4767,4751,4731; //Atk3 Luck2 Agility2
-	else if (.@i <= 781) setarray .@enchants[1],4767,4751,4740; //Atk3 Luck2 Vitality1
-	else if (.@i <= 792) setarray .@enchants[1],4767,4751,4741; //Atk3 Luck2 Vitality2
-	else if (.@i <= 803) setarray .@enchants[1],4764,4720,4700; //Critical5 Dexterity1 Strength1
-	else if (.@i <= 814) setarray .@enchants[1],4764,4720,4701; //Critical5 Dexterity1 Strength2
-	else if (.@i <= 825) setarray .@enchants[1],4764,4720,4730; //Critical5 Dexterity1 Agility1
-	else if (.@i <= 836) setarray .@enchants[1],4764,4720,4731; //Critical5 Dexterity1 Agility2
-	else if (.@i <= 847) setarray .@enchants[1],4764,4720,4740; //Critical5 Dexterity1 Vitality1
-	else if (.@i <= 858) setarray .@enchants[1],4764,4720,4741; //Critical5 Dexterity1 Vitality2
-	else if (.@i <= 869) setarray .@enchants[1],4764,4721,4700; //Critical5 Dexterity2 Strength1
-	else if (.@i <= 880) setarray .@enchants[1],4764,4721,4701; //Critical5 Dexterity2 Strength2
-	else if (.@i <= 891) setarray .@enchants[1],4764,4721,4730; //Critical5 Dexterity2 Agility1
-	else if (.@i <= 902) setarray .@enchants[1],4764,4721,4731; //Critical5 Dexterity2 Agility2
-	else if (.@i <= 913) setarray .@enchants[1],4764,4721,4740; //Critical5 Dexterity2 Vitality1
-	else if (.@i <= 924) setarray .@enchants[1],4764,4721,4741; //Critical5 Dexterity2 Vitality2
-	else if (.@i <= 935) setarray .@enchants[1],4764,4710,4700; //Critical5 Inteligence1 Strength1
-	else if (.@i <= 946) setarray .@enchants[1],4764,4710,4701; //Critical5 Inteligence1 Strength2
-	else if (.@i <= 957) setarray .@enchants[1],4764,4710,4730; //Critical5 Inteligence1 Agility1
-	else if (.@i <= 968) setarray .@enchants[1],4764,4710,4731; //Critical5 Inteligence1 Agility2
-	else if (.@i <= 979) setarray .@enchants[1],4764,4710,4740; //Critical5 Inteligence1 Vitality1
-	else if (.@i <= 990) setarray .@enchants[1],4764,4710,4741; //Critical5 Inteligence1 Vitality2
-	else if (.@i <= 1001) setarray .@enchants[1],4764,4711,4700; //Critical5 Inteligence2 Strength1
-	else if (.@i <= 1012) setarray .@enchants[1],4764,4711,4701; //Critical5 Inteligence2 Strength2
-	else if (.@i <= 1023) setarray .@enchants[1],4764,4711,4730; //Critical5 Inteligence2 Agility1
-	else if (.@i <= 1034) setarray .@enchants[1],4764,4711,4731; //Critical5 Inteligence2 Agility2
-	else if (.@i <= 1045) setarray .@enchants[1],4764,4711,4740; //Critical5 Inteligence2 Vitality1
-	else if (.@i <= 1056) setarray .@enchants[1],4764,4711,4741; //Critical5 Inteligence2 Vitality2
-	else if (.@i <= 1067) setarray .@enchants[1],4764,4750,4700; //Critical5 Luck1 Strength1
-	else if (.@i <= 1078) setarray .@enchants[1],4764,4750,4701; //Critical5 Luck1 Strength2
-	else if (.@i <= 1089) setarray .@enchants[1],4764,4750,4730; //Critical5 Luck1 Agility1
-	else if (.@i <= 1100) setarray .@enchants[1],4764,4750,4731; //Critical5 Luck1 Agility2
-	else if (.@i <= 1111) setarray .@enchants[1],4764,4750,4740; //Critical5 Luck1 Vitality1
-	else if (.@i <= 1122) setarray .@enchants[1],4764,4750,4741; //Critical5 Luck1 Vitality2
-	else if (.@i <= 1133) setarray .@enchants[1],4764,4751,4700; //Critical5 Luck2 Strength1
-	else if (.@i <= 1144) setarray .@enchants[1],4764,4751,4701; //Critical5 Luck2 Strength2
-	else if (.@i <= 1155) setarray .@enchants[1],4764,4751,4730; //Critical5 Luck2 Agility1
-	else if (.@i <= 1166) setarray .@enchants[1],4764,4751,4731; //Critical5 Luck2 Agility2
-	else if (.@i <= 1177) setarray .@enchants[1],4764,4751,4740; //Critical5 Luck2 Vitality1
-	else if (.@i <= 1188) setarray .@enchants[1],4764,4751,4741; //Critical5 Luck2 Vitality2
-	else if (.@i <= 1199) setarray .@enchants[1],4765,4720,4700; //Critical7 Dexterity1 Strength1
-	else if (.@i <= 1210) setarray .@enchants[1],4765,4720,4701; //Critical7 Dexterity1 Strength2
-	else if (.@i <= 1221) setarray .@enchants[1],4765,4720,4730; //Critical7 Dexterity1 Agility1
-	else if (.@i <= 1232) setarray .@enchants[1],4765,4720,4731; //Critical7 Dexterity1 Agility2
-	else if (.@i <= 1243) setarray .@enchants[1],4765,4720,4740; //Critical7 Dexterity1 Vitality1
-	else if (.@i <= 1254) setarray .@enchants[1],4765,4720,4741; //Critical7 Dexterity1 Vitality2
-	else if (.@i <= 1265) setarray .@enchants[1],4765,4721,4700; //Critical7 Dexterity2 Strength1
-	else if (.@i <= 1276) setarray .@enchants[1],4765,4721,4701; //Critical7 Dexterity2 Strength2
-	else if (.@i <= 1287) setarray .@enchants[1],4765,4721,4730; //Critical7 Dexterity2 Agility1
-	else if (.@i <= 1298) setarray .@enchants[1],4765,4721,4731; //Critical7 Dexterity2 Agility2
-	else if (.@i <= 1309) setarray .@enchants[1],4765,4721,4740; //Critical7 Dexterity2 Vitality1
-	else if (.@i <= 1320) setarray .@enchants[1],4765,4721,4741; //Critical7 Dexterity2 Vitality2
-	else if (.@i <= 1331) setarray .@enchants[1],4765,4710,4700; //Critical7 Inteligence1 Strength1
-	else if (.@i <= 1342) setarray .@enchants[1],4765,4710,4701; //Critical7 Inteligence1 Strength2
-	else if (.@i <= 1353) setarray .@enchants[1],4765,4710,4730; //Critical7 Inteligence1 Agility1
-	else if (.@i <= 1364) setarray .@enchants[1],4765,4710,4731; //Critical7 Inteligence1 Agility2
-	else if (.@i <= 1375) setarray .@enchants[1],4765,4710,4740; //Critical7 Inteligence1 Vitality1
-	else if (.@i <= 1386) setarray .@enchants[1],4765,4710,4741; //Critical7 Inteligence1 Vitality2
-	else if (.@i <= 1397) setarray .@enchants[1],4765,4711,4700; //Critical7 Inteligence2 Strength1
-	else if (.@i <= 1408) setarray .@enchants[1],4765,4711,4701; //Critical7 Inteligence2 Strength2
-	else if (.@i <= 1419) setarray .@enchants[1],4765,4711,4730; //Critical7 Inteligence2 Agility1
-	else if (.@i <= 1430) setarray .@enchants[1],4765,4711,4731; //Critical7 Inteligence2 Agility2
-	else if (.@i <= 1441) setarray .@enchants[1],4765,4711,4740; //Critical7 Inteligence2 Vitality1
-	else if (.@i <= 1452) setarray .@enchants[1],4765,4711,4741; //Critical7 Inteligence2 Vitality2
-	else if (.@i <= 1463) setarray .@enchants[1],4765,4750,4700; //Critical7 Luck1 Strength1
-	else if (.@i <= 1474) setarray .@enchants[1],4765,4750,4701; //Critical7 Luck1 Strength2
-	else if (.@i <= 1485) setarray .@enchants[1],4765,4750,4730; //Critical7 Luck1 Agility1
-	else if (.@i <= 1496) setarray .@enchants[1],4765,4750,4731; //Critical7 Luck1 Agility2
-	else if (.@i <= 1507) setarray .@enchants[1],4765,4750,4740; //Critical7 Luck1 Vitality1
-	else if (.@i <= 1518) setarray .@enchants[1],4765,4750,4741; //Critical7 Luck1 Vitality2
-	else if (.@i <= 1529) setarray .@enchants[1],4765,4751,4700; //Critical7 Luck2 Strength1
-	else if (.@i <= 1540) setarray .@enchants[1],4765,4751,4701; //Critical7 Luck2 Strength2
-	else if (.@i <= 1551) setarray .@enchants[1],4765,4751,4730; //Critical7 Luck2 Agility1
-	else if (.@i <= 1562) setarray .@enchants[1],4765,4751,4731; //Critical7 Luck2 Agility2
-	else if (.@i <= 1573) setarray .@enchants[1],4765,4751,4740; //Critical7 Luck2 Vitality1
-	else if (.@i <= 1584) setarray .@enchants[1],4765,4751,4741; //Critical7 Luck2 Vitality2
-	else if (.@i <= 1595) setarray .@enchants[1],4762,4720,4700; //Evasion6 Dexterity1 Strength1
-	else if (.@i <= 1606) setarray .@enchants[1],4762,4720,4701; //Evasion6 Dexterity1 Strength2
-	else if (.@i <= 1617) setarray .@enchants[1],4762,4720,4730; //Evasion6 Dexterity1 Agility1
-	else if (.@i <= 1628) setarray .@enchants[1],4762,4720,4731; //Evasion6 Dexterity1 Agility2
-	else if (.@i <= 1639) setarray .@enchants[1],4762,4720,4740; //Evasion6 Dexterity1 Vitality1
-	else if (.@i <= 1650) setarray .@enchants[1],4762,4720,4741; //Evasion6 Dexterity1 Vitality2
-	else if (.@i <= 1661) setarray .@enchants[1],4762,4721,4700; //Evasion6 Dexterity2 Strength1
-	else if (.@i <= 1672) setarray .@enchants[1],4762,4721,4701; //Evasion6 Dexterity2 Strength2
-	else if (.@i <= 1683) setarray .@enchants[1],4762,4721,4730; //Evasion6 Dexterity2 Agility1
-	else if (.@i <= 1694) setarray .@enchants[1],4762,4721,4731; //Evasion6 Dexterity2 Agility2
-	else if (.@i <= 1705) setarray .@enchants[1],4762,4721,4740; //Evasion6 Dexterity2 Vitality1
-	else if (.@i <= 1716) setarray .@enchants[1],4762,4721,4741; //Evasion6 Dexterity2 Vitality2
-	else if (.@i <= 1727) setarray .@enchants[1],4762,4710,4700; //Evasion6 Inteligence1 Strength1
-	else if (.@i <= 1738) setarray .@enchants[1],4762,4710,4701; //Evasion6 Inteligence1 Strength2
-	else if (.@i <= 1749) setarray .@enchants[1],4762,4710,4730; //Evasion6 Inteligence1 Agility1
-	else if (.@i <= 1760) setarray .@enchants[1],4762,4710,4731; //Evasion6 Inteligence1 Agility2
-	else if (.@i <= 1771) setarray .@enchants[1],4762,4710,4740; //Evasion6 Inteligence1 Vitality1
-	else if (.@i <= 1782) setarray .@enchants[1],4762,4710,4741; //Evasion6 Inteligence1 Vitality2
-	else if (.@i <= 1793) setarray .@enchants[1],4762,4711,4700; //Evasion6 Inteligence2 Strength1
-	else if (.@i <= 1804) setarray .@enchants[1],4762,4711,4701; //Evasion6 Inteligence2 Strength2
-	else if (.@i <= 1815) setarray .@enchants[1],4762,4711,4730; //Evasion6 Inteligence2 Agility1
-	else if (.@i <= 1826) setarray .@enchants[1],4762,4711,4731; //Evasion6 Inteligence2 Agility2
-	else if (.@i <= 1837) setarray .@enchants[1],4762,4711,4740; //Evasion6 Inteligence2 Vitality1
-	else if (.@i <= 1848) setarray .@enchants[1],4762,4711,4741; //Evasion6 Inteligence2 Vitality2
-	else if (.@i <= 1859) setarray .@enchants[1],4762,4750,4700; //Evasion6 Luck1 Strength1
-	else if (.@i <= 1870) setarray .@enchants[1],4762,4750,4701; //Evasion6 Luck1 Strength2
-	else if (.@i <= 1881) setarray .@enchants[1],4762,4750,4730; //Evasion6 Luck1 Agility1
-	else if (.@i <= 1892) setarray .@enchants[1],4762,4750,4731; //Evasion6 Luck1 Agility2
-	else if (.@i <= 1903) setarray .@enchants[1],4762,4750,4740; //Evasion6 Luck1 Vitality1
-	else if (.@i <= 1914) setarray .@enchants[1],4762,4750,4741; //Evasion6 Luck1 Vitality2
-	else if (.@i <= 1925) setarray .@enchants[1],4762,4751,4700; //Evasion6 Luck2 Strength1
-	else if (.@i <= 1936) setarray .@enchants[1],4762,4751,4701; //Evasion6 Luck2 Strength2
-	else if (.@i <= 1947) setarray .@enchants[1],4762,4751,4730; //Evasion6 Luck2 Agility1
-	else if (.@i <= 1958) setarray .@enchants[1],4762,4751,4731; //Evasion6 Luck2 Agility2
-	else if (.@i <= 1969) setarray .@enchants[1],4762,4751,4740; //Evasion6 Luck2 Vitality1
-	else if (.@i <= 1980) setarray .@enchants[1],4762,4751,4741; //Evasion6 Luck2 Vitality2
-	else if (.@i <= 1991) setarray .@enchants[1],4763,4720,4700; //Evasion12 Dexterity1 Strength1
-	else if (.@i <= 2002) setarray .@enchants[1],4763,4720,4701; //Evasion12 Dexterity1 Strength2
-	else if (.@i <= 2013) setarray .@enchants[1],4763,4720,4730; //Evasion12 Dexterity1 Agility1
-	else if (.@i <= 2024) setarray .@enchants[1],4763,4720,4731; //Evasion12 Dexterity1 Agility2
-	else if (.@i <= 2035) setarray .@enchants[1],4763,4720,4740; //Evasion12 Dexterity1 Vitality1
-	else if (.@i <= 2046) setarray .@enchants[1],4763,4720,4741; //Evasion12 Dexterity1 Vitality2
-	else if (.@i <= 2057) setarray .@enchants[1],4763,4721,4700; //Evasion12 Dexterity2 Strength1
-	else if (.@i <= 2068) setarray .@enchants[1],4763,4721,4701; //Evasion12 Dexterity2 Strength2
-	else if (.@i <= 2079) setarray .@enchants[1],4763,4721,4730; //Evasion12 Dexterity2 Agility1
-	else if (.@i <= 2090) setarray .@enchants[1],4763,4721,4731; //Evasion12 Dexterity2 Agility2
-	else if (.@i <= 2101) setarray .@enchants[1],4763,4721,4740; //Evasion12 Dexterity2 Vitality1
-	else if (.@i <= 2112) setarray .@enchants[1],4763,4721,4741; //Evasion12 Dexterity2 Vitality2
-	else if (.@i <= 2123) setarray .@enchants[1],4763,4710,4700; //Evasion12 Inteligence1 Strength1
-	else if (.@i <= 2134) setarray .@enchants[1],4763,4710,4701; //Evasion12 Inteligence1 Strength2
-	else if (.@i <= 2145) setarray .@enchants[1],4763,4710,4730; //Evasion12 Inteligence1 Agility1
-	else if (.@i <= 2156) setarray .@enchants[1],4763,4710,4731; //Evasion12 Inteligence1 Agility2
-	else if (.@i <= 2167) setarray .@enchants[1],4763,4710,4740; //Evasion12 Inteligence1 Vitality1
-	else if (.@i <= 2178) setarray .@enchants[1],4763,4710,4741; //Evasion12 Inteligence1 Vitality2
-	else if (.@i <= 2189) setarray .@enchants[1],4763,4711,4700; //Evasion12 Inteligence2 Strength1
-	else if (.@i <= 2200) setarray .@enchants[1],4763,4711,4701; //Evasion12 Inteligence2 Strength2
-	else if (.@i <= 2211) setarray .@enchants[1],4763,4711,4730; //Evasion12 Inteligence2 Agility1
-	else if (.@i <= 2222) setarray .@enchants[1],4763,4711,4731; //Evasion12 Inteligence2 Agility2
-	else if (.@i <= 2233) setarray .@enchants[1],4763,4711,4740; //Evasion12 Inteligence2 Vitality1
-	else if (.@i <= 2244) setarray .@enchants[1],4763,4711,4741; //Evasion12 Inteligence2 Vitality2
-	else if (.@i <= 2255) setarray .@enchants[1],4763,4750,4700; //Evasion12 Luck1 Strength1
-	else if (.@i <= 2266) setarray .@enchants[1],4763,4750,4701; //Evasion12 Luck1 Strength2
-	else if (.@i <= 2277) setarray .@enchants[1],4763,4750,4730; //Evasion12 Luck1 Agility1
-	else if (.@i <= 2288) setarray .@enchants[1],4763,4750,4731; //Evasion12 Luck1 Agility2
-	else if (.@i <= 2299) setarray .@enchants[1],4763,4750,4740; //Evasion12 Luck1 Vitality1
-	else if (.@i <= 2310) setarray .@enchants[1],4763,4750,4741; //Evasion12 Luck1 Vitality2
-	else if (.@i <= 2321) setarray .@enchants[1],4763,4751,4700; //Evasion12 Luck2 Strength1
-	else if (.@i <= 2332) setarray .@enchants[1],4763,4751,4701; //Evasion12 Luck2 Strength2
-	else if (.@i <= 2343) setarray .@enchants[1],4763,4751,4730; //Evasion12 Luck2 Agility1
-	else if (.@i <= 2354) setarray .@enchants[1],4763,4751,4731; //Evasion12 Luck2 Agility2
-	else if (.@i <= 2365) setarray .@enchants[1],4763,4751,4740; //Evasion12 Luck2 Vitality1
-	else if (.@i <= 2376) setarray .@enchants[1],4763,4751,4741; //Evasion12 Luck2 Vitality2
-	else if (.@i <= 2387) setarray .@enchants[1],4760,4720,4700; //Matk1 Dexterity1 Strength1
-	else if (.@i <= 2398) setarray .@enchants[1],4760,4720,4701; //Matk1 Dexterity1 Strength2
-	else if (.@i <= 2409) setarray .@enchants[1],4760,4720,4730; //Matk1 Dexterity1 Agility1
-	else if (.@i <= 2420) setarray .@enchants[1],4760,4720,4731; //Matk1 Dexterity1 Agility2
-	else if (.@i <= 2431) setarray .@enchants[1],4760,4720,4740; //Matk1 Dexterity1 Vitality1
-	else if (.@i <= 2442) setarray .@enchants[1],4760,4720,4741; //Matk1 Dexterity1 Vitality2
-	else if (.@i <= 2453) setarray .@enchants[1],4760,4721,4700; //Matk1 Dexterity2 Strength1
-	else if (.@i <= 2464) setarray .@enchants[1],4760,4721,4701; //Matk1 Dexterity2 Strength2
-	else if (.@i <= 2475) setarray .@enchants[1],4760,4721,4730; //Matk1 Dexterity2 Agility1
-	else if (.@i <= 2486) setarray .@enchants[1],4760,4721,4731; //Matk1 Dexterity2 Agility2
-	else if (.@i <= 2497) setarray .@enchants[1],4760,4721,4740; //Matk1 Dexterity2 Vitality1
-	else if (.@i <= 2508) setarray .@enchants[1],4760,4721,4741; //Matk1 Dexterity2 Vitality2
-	else if (.@i <= 2519) setarray .@enchants[1],4760,4710,4700; //Matk1 Inteligence1 Strength1
-	else if (.@i <= 2530) setarray .@enchants[1],4760,4710,4701; //Matk1 Inteligence1 Strength2
-	else if (.@i <= 2541) setarray .@enchants[1],4760,4710,4730; //Matk1 Inteligence1 Agility1
-	else if (.@i <= 2552) setarray .@enchants[1],4760,4710,4731; //Matk1 Inteligence1 Agility2
-	else if (.@i <= 2563) setarray .@enchants[1],4760,4710,4740; //Matk1 Inteligence1 Vitality1
-	else if (.@i <= 2574) setarray .@enchants[1],4760,4710,4741; //Matk1 Inteligence1 Vitality2
-	else if (.@i <= 2585) setarray .@enchants[1],4760,4711,4700; //Matk1 Inteligence2 Strength1
-	else if (.@i <= 2596) setarray .@enchants[1],4760,4711,4701; //Matk1 Inteligence2 Strength2
-	else if (.@i <= 2607) setarray .@enchants[1],4760,4711,4730; //Matk1 Inteligence2 Agility1
-	else if (.@i <= 2618) setarray .@enchants[1],4760,4711,4731; //Matk1 Inteligence2 Agility2
-	else if (.@i <= 2629) setarray .@enchants[1],4760,4711,4740; //Matk1 Inteligence2 Vitality1
-	else if (.@i <= 2640) setarray .@enchants[1],4760,4711,4741; //Matk1 Inteligence2 Vitality2
-	else if (.@i <= 2651) setarray .@enchants[1],4760,4750,4700; //Matk1 Luck1 Strength1
-	else if (.@i <= 2662) setarray .@enchants[1],4760,4750,4701; //Matk1 Luck1 Strength2
-	else if (.@i <= 2673) setarray .@enchants[1],4760,4750,4730; //Matk1 Luck1 Agility1
-	else if (.@i <= 2684) setarray .@enchants[1],4760,4750,4731; //Matk1 Luck1 Agility2
-	else if (.@i <= 2695) setarray .@enchants[1],4760,4750,4740; //Matk1 Luck1 Vitality1
-	else if (.@i <= 2706) setarray .@enchants[1],4760,4750,4741; //Matk1 Luck1 Vitality2
-	else if (.@i <= 2717) setarray .@enchants[1],4760,4751,4700; //Matk1 Luck2 Strength1
-	else if (.@i <= 2728) setarray .@enchants[1],4760,4751,4701; //Matk1 Luck2 Strength2
-	else if (.@i <= 2739) setarray .@enchants[1],4760,4751,4730; //Matk1 Luck2 Agility1
-	else if (.@i <= 2750) setarray .@enchants[1],4760,4751,4731; //Matk1 Luck2 Agility2
-	else if (.@i <= 2761) setarray .@enchants[1],4760,4751,4740; //Matk1 Luck2 Vitality1
-	else if (.@i <= 2772) setarray .@enchants[1],4760,4751,4741; //Matk1 Luck2 Vitality2
-	else if (.@i <= 2783) setarray .@enchants[1],4761,4720,4700; //Matk2 Dexterity1 Strength1
-	else if (.@i <= 2794) setarray .@enchants[1],4761,4720,4701; //Matk2 Dexterity1 Strength2
-	else if (.@i <= 2805) setarray .@enchants[1],4761,4720,4730; //Matk2 Dexterity1 Agility1
-	else if (.@i <= 2816) setarray .@enchants[1],4761,4720,4731; //Matk2 Dexterity1 Agility2
-	else if (.@i <= 2827) setarray .@enchants[1],4761,4720,4740; //Matk2 Dexterity1 Vitality1
-	else if (.@i <= 2838) setarray .@enchants[1],4761,4720,4741; //Matk2 Dexterity1 Vitality2
-	else if (.@i <= 2849) setarray .@enchants[1],4761,4721,4700; //Matk2 Dexterity2 Strength1
-	else if (.@i <= 2860) setarray .@enchants[1],4761,4721,4701; //Matk2 Dexterity2 Strength2
-	else if (.@i <= 2871) setarray .@enchants[1],4761,4721,4730; //Matk2 Dexterity2 Agility1
-	else if (.@i <= 2882) setarray .@enchants[1],4761,4721,4731; //Matk2 Dexterity2 Agility2
-	else if (.@i <= 2893) setarray .@enchants[1],4761,4721,4740; //Matk2 Dexterity2 Vitality1
-	else if (.@i <= 2904) setarray .@enchants[1],4761,4721,4741; //Matk2 Dexterity2 Vitality2
-	else if (.@i <= 2915) setarray .@enchants[1],4761,4710,4700; //Matk2 Inteligence1 Strength1
-	else if (.@i <= 2926) setarray .@enchants[1],4761,4710,4701; //Matk2 Inteligence1 Strength2
-	else if (.@i <= 2937) setarray .@enchants[1],4761,4710,4730; //Matk2 Inteligence1 Agility1
-	else if (.@i <= 2948) setarray .@enchants[1],4761,4710,4731; //Matk2 Inteligence1 Agility2
-	else if (.@i <= 2959) setarray .@enchants[1],4761,4710,4740; //Matk2 Inteligence1 Vitality1
-	else if (.@i <= 2970) setarray .@enchants[1],4761,4710,4741; //Matk2 Inteligence1 Vitality2
-	else if (.@i <= 2981) setarray .@enchants[1],4761,4711,4700; //Matk2 Inteligence2 Strength1
-	else if (.@i <= 2992) setarray .@enchants[1],4761,4711,4701; //Matk2 Inteligence2 Strength2
-	else if (.@i <= 3003) setarray .@enchants[1],4761,4711,4730; //Matk2 Inteligence2 Agility1
-	else if (.@i <= 3014) setarray .@enchants[1],4761,4711,4731; //Matk2 Inteligence2 Agility2
-	else if (.@i <= 3025) setarray .@enchants[1],4761,4711,4740; //Matk2 Inteligence2 Vitality1
-	else if (.@i <= 3036) setarray .@enchants[1],4761,4711,4741; //Matk2 Inteligence2 Vitality2
-	else if (.@i <= 3047) setarray .@enchants[1],4761,4750,4700; //Matk2 Luck1 Strength1
-	else if (.@i <= 3058) setarray .@enchants[1],4761,4750,4701; //Matk2 Luck1 Strength2
-	else if (.@i <= 3069) setarray .@enchants[1],4761,4750,4730; //Matk2 Luck1 Agility1
-	else if (.@i <= 3080) setarray .@enchants[1],4761,4750,4731; //Matk2 Luck1 Agility2
-	else if (.@i <= 3091) setarray .@enchants[1],4761,4750,4740; //Matk2 Luck1 Vitality1
-	else if (.@i <= 3102) setarray .@enchants[1],4761,4750,4741; //Matk2 Luck1 Vitality2
-	else if (.@i <= 3113) setarray .@enchants[1],4761,4751,4700; //Matk2 Luck2 Strength1
-	else if (.@i <= 3124) setarray .@enchants[1],4761,4751,4701; //Matk2 Luck2 Strength2
-	else if (.@i <= 3135) setarray .@enchants[1],4761,4751,4730; //Matk2 Luck2 Agility1
-	else if (.@i <= 3146) setarray .@enchants[1],4761,4751,4731; //Matk2 Luck2 Agility2
-	else if (.@i <= 3157) setarray .@enchants[1],4761,4751,4740; //Matk2 Luck2 Vitality1
-	else if (.@i <= 3168) setarray .@enchants[1],4761,4751,4741; //Matk2 Luck2 Vitality2
+	if (.@i <= 3168) {
+		// Basic combinations
+		// (raw: .@i increments by 11)
+		setarray .@enchant_slot1[0],4766,4767,4764,4765,4762,4763,4760,4761; //Atk2,Atk3,Critical5,Critical7,Evasion6,Evasion12,Matk1,Matk2
+		setarray .@enchant_slot2[0],4720,4721,4710,4711,4750,4751; //Dexterity1,Dexterity2,Inteligence1,Inteligence2,Luck1,Luck2
+		setarray .@enchant_slot3[0],4700,4701,4730,4731,4740,4741; //Strength1,Strength2,Agility1,Agility2,Vitality1,Vitality2
+		setarray .@enchants[1],
+			.@enchant_slot1[rand(getarraysize(.@enchant_slot1))],
+			.@enchant_slot2[rand(getarraysize(.@enchant_slot2))],
+			.@enchant_slot3[rand(getarraysize(.@enchant_slot3))];
+	}
 	else if (.@i <= 3179) setarray .@enchants[1],4761,4720,4700; //Matk2 Dexterity1 Strength1
 	else if (.@i <= 3181) setarray .@enchants[1],4761,4712,4712; //Matk2 Inteligence3 Inteligence3
 	else if (.@i <= 3183) setarray .@enchants[1],4765,4732,4732; //Critical7 Agility3 Agility3
@@ -2106,7 +1504,7 @@ function	script	F_Mora_Enchant	{
 	getitem2 getarg(0),1,1,0,0,0,.@enchants[1],.@enchants[2],.@enchants[3];
 	return 1;
 }
-mora,105,176,4	script	Master Tailor#pa0829	509,{
+mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -2198,7 +1596,7 @@ mora,105,176,4	script	Master Tailor#pa0829	509,{
 	}
 }
 
-mora,123,177,6	script	Pendant Crafter#pa0829	509,{
+mora,123,177,6	script	Pendant Crafter#pa0829	4_ELEPHANT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -2268,7 +1666,7 @@ mora,123,177,6	script	Pendant Crafter#pa0829	509,{
 	}
 }
 
-mora,134,166,4	script	Bulberry Westhood#pa0829	509,{
+mora,134,166,4	script	Bulberry Westhood#pa0829	4_ELEPHANT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
diff --git a/npc/re/merchants/enchan_upg.txt b/npc/re/merchants/enchan_upg.txt
new file mode 100644
index 000000000..abbc0896a
--- /dev/null
+++ b/npc/re/merchants/enchan_upg.txt
@@ -0,0 +1,264 @@
+//===== Hercules Script ======================================
+//= Upgrade Weapon Enchants
+//===== By: ==================================================
+//= Skorm
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Adds enchantments to Upgrade weapons.
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//= 1.1 Standardizing, grammar and bug fixes. [Euphy]
+//============================================================
+
+prt_in,28,73,3	script	Devil Enchant Master#prq	1_M_SMITH,{
+	disable_items;
+	if (checkweight(1201,1) == 0) {
+		mes "You are carrying too many items, please reduce it and come back again!";
+		close;
+	}
+	if (MaxWeight - Weight < 10000) {
+		mes "You are over the weight limit, please reduce it and come back again!";
+		close;
+	}
+	mes "[Devil Enchant Master]";
+	mes "Yes?";
+	mes "You are looking for me?";
+	next;
+	switch(select("This is the first time seeing you!:I heard that you are the best!:Please initialize the enchant.")) {
+	case 1:
+		mes "[Devil Enchant Master]";
+		mes "Ha ha ha~ Of course, I am not the kind of person that simply deals with people.";
+		next;
+		mes "[Devil Enchant Master]";
+		mes "Including you! Even if you offer me plenty of money, I will not simply enchant for you!!";
+		next;
+		mes "[Devil Enchant Master]";
+		mes "Have you seen my title? Very few people have this title for a reason!";
+		next;
+		mes "[Devil Enchant Master]";
+		mes "I will only enchant if you bring an ^0000ffEnchant Book^000000 along!";
+		next;
+		mes "[Devil Enchant Master]";
+		mes "Else, I will not enchant for you....";
+		close;
+	case 2:
+		if (!countitem(6484)) {
+			mes "[Devil Enchant Master]";
+			mes "Are you listening to me? I will only do for you if you bring the Enchant Book!";
+			close;
+		}
+		set .@select,1;
+		break;
+	case 3:
+		mes "[Devil Enchant Master]";
+		if (Zeny < 100000) {
+			mes "Initializing will cost 100,000 zeny. It seems you do not have enough zeny...";
+			close;
+		}
+		mes "Initializing will cost 100,000 zeny and confirming whether the weapon is enchanted!";
+		next;
+		if (select("Let me think about it.:Initialize it now!") == 1) {
+			mes "[Devil Enchant Master]";
+			mes "Come back after you have confirmed!";
+			close;
+		}
+		set .@select,2;
+		break;
+	}
+	set .@part, EQI_HAND_R;
+
+	mes "[Devil Enchant Master]";
+	if (!getequipisequiped(.@part)) {
+		mes "Are you trying to remove the enchanted equipment?";
+		close;
+	}
+	setarray .@equip_card[0], getequipcardid(.@part,0), getequipcardid(.@part,1), getequipcardid(.@part,2), getequipcardid(.@part,3);
+	if (!getequipisequiped(.@part)) {
+		mes "It is dangerous to remove equipment during enchant process!";
+		close;
+	}
+	set .@equip_id, getequipid(.@part);
+	set .@item$, "|1292|1394|1491|1585|2015|13071|13115|16019|18112|21000|";
+	if (!compare(.@item$,"|"+.@equip_id+"|")) {
+		mes "I don't want to touch your equipment now!";
+		close;
+	}
+	set .@equip_refine, getequiprefinerycnt(.@part);
+
+	if (.@select == 1) {
+		if (!countitem(6484)) {
+			mes "Are you listening to me? I will only do for you if you bring the Enchant Book!";
+			close;
+		}
+		mes "Which type of effect do you want to enchant?";
+		next;
+		switch(select("Let me think about it.:Physical Series:Magical Series")) {
+		case 1:
+			mes "[Devil Enchant Master]";
+			mes "Come back again after you change your mind!";
+			close;
+		case 2:
+			set .@enc_type,1;
+			break;
+		case 3:
+			set .@enc_type,2;
+			break;
+		}
+		mes "[Devil Enchant Master]";
+		if (.@equip_card[3]) {
+			mes "This equipment has been enchanted! You need to initialize first before you want to enchant it again.";
+			close;
+		}
+		mes "The enchant process might fail, and ^ff0000it will reduce partial refine level^000000, but the slotted card and weapon will not be broken! Are you sure you want to continue?";
+		next;
+		if (select("Next time!:Start now!") == 1) {
+			mes "[Devil Enchant Master]";
+			mes "Come back again after you have decided!";
+			close;
+		}
+		if (.@equip_card[3]) {
+			mes "[Devil Enchant Master]";
+			mes "It seems there's a problem, let me take a look.";
+			close;
+		}
+
+		if (.@enc_type == 1) { // Physical Series
+			set .@i, rand(1,1300);
+			     if (.@i < 51)    set .@enchant,4734; //Agility5
+			else if (.@i < 76)    set .@enchant,4735; //Agility6
+			else if (.@i < 88)    set .@enchant,4736; //Agility7
+			else if (.@i < 93)    set .@enchant,4737; //Agility8
+			else if (.@i < 95)    set .@enchant,4738; //Agility9
+			else if (.@i < 96)    set .@enchant,4739; //Agility10
+			else if (.@i < 146)   set .@enchant,4724; //Dexterity5
+			else if (.@i < 171)   set .@enchant,4725; //Dexterity6
+			else if (.@i < 183)   set .@enchant,4726; //Dexterity7
+			else if (.@i < 188)   set .@enchant,4727; //Dexterity8
+			else if (.@i < 190)   set .@enchant,4728; //Dexterity9
+			else if (.@i < 191)   set .@enchant,4729; //Dexterity10
+			else if (.@i < 291)   set .@enchant,4704; //Strength5
+			else if (.@i < 341)   set .@enchant,4705; //Strength6
+			else if (.@i < 366)   set .@enchant,4706; //Strength7
+			else if (.@i < 378)   set .@enchant,4707; //Strength8
+			else if (.@i < 383)   set .@enchant,4708; //Strength9
+			else if (.@i < 384)   set .@enchant,4709; //Strength10
+			else if (.@i < 434)   set .@enchant,4754; //Luck5
+			else if (.@i < 459)   set .@enchant,4755; //Luck6
+			else if (.@i < 471)   set .@enchant,4756; //Luck7
+			else if (.@i < 476)   set .@enchant,4757; //Luck8
+			else if (.@i < 478)   set .@enchant,4758; //Luck9
+			else if (.@i < 479)   set .@enchant,4759; //Luck10
+			else if (.@i < 679)   set .@enchant,4744; //Vitality5
+			else if (.@i < 779)   set .@enchant,4745; //Vitality6
+			else if (.@i < 829)   set .@enchant,4746; //Vitality7
+			else if (.@i < 854)   set .@enchant,4747; //Vitality8
+			else if (.@i < 866)   set .@enchant,4748; //Vitality9
+			else if (.@i < 867)   set .@enchant,4749; //Vitality10
+			else if (.@i < 967)   set .@enchant,4808; //Fighting_Spirit4
+			else if (.@i < 992)   set .@enchant,4820; //Fighting_Spirit5
+			else if (.@i < 1092)  set .@enchant,4835; //Expert_Archer4
+			else if (.@i < 1117)  set .@enchant,4836; //Expert_Archer5
+			else if (.@i < 1217)  set .@enchant,4835; //Expert_Archer4
+			else if (.@i < 1242)  set .@enchant,4836; //Expert_Archer5
+			else set .@enchant,0;
+		} else if (.@enc_type == 2) { // Magical Series
+			set .@i, rand(1,1200);
+			     if (.@i < 51)    set .@enchant,4714; //Inteligence5
+			else if (.@i < 76)    set .@enchant,4715; //Inteligence6
+			else if (.@i < 88)    set .@enchant,4716; //Inteligence7
+			else if (.@i < 93)    set .@enchant,4717; //Inteligence8
+			else if (.@i < 95)    set .@enchant,4718; //Inteligence9
+			else if (.@i < 96)    set .@enchant,4719; //Inteligence10
+			else if (.@i < 146)   set .@enchant,4724; //Dexterity5
+			else if (.@i < 171)   set .@enchant,4725; //Dexterity6
+			else if (.@i < 183)   set .@enchant,4726; //Dexterity7
+			else if (.@i < 188)   set .@enchant,4727; //Dexterity8
+			else if (.@i < 190)   set .@enchant,4728; //Dexterity9
+			else if (.@i < 191)   set .@enchant,4729; //Dexterity10
+			else if (.@i < 291)   set .@enchant,4734; //Agility5
+			else if (.@i < 341)   set .@enchant,4735; //Agility6
+			else if (.@i < 366)   set .@enchant,4736; //Agility7
+			else if (.@i < 378)   set .@enchant,4737; //Agility8
+			else if (.@i < 383)   set .@enchant,4738; //Agility9
+			else if (.@i < 384)   set .@enchant,4739; //Agility10
+			else if (.@i < 484)   set .@enchant,4754; //Luck5
+			else if (.@i < 534)   set .@enchant,4755; //Luck6
+			else if (.@i < 559)   set .@enchant,4756; //Luck7
+			else if (.@i < 571)   set .@enchant,4757; //Luck8
+			else if (.@i < 576)   set .@enchant,4758; //Luck9
+			else if (.@i < 577)   set .@enchant,4759; //Luck10
+			else if (.@i < 777)   set .@enchant,4744; //Vitality5
+			else if (.@i < 877)   set .@enchant,4745; //Vitality6
+			else if (.@i < 927)   set .@enchant,4746; //Vitality7
+			else if (.@i < 952)   set .@enchant,4747; //Vitality8
+			else if (.@i < 964)   set .@enchant,4748; //Vitality9
+			else if (.@i < 969)   set .@enchant,4749; //Vitality10
+			else if (.@i < 1069)  set .@enchant,4812; //Spell4
+			else if (.@i < 1094)  set .@enchant,4826; //Spell5
+			else if (.@i < 1119)  set .@enchant,4761; //Matk2
+			else if (.@i < 1124)  set .@enchant,4806; //Matk3
+			else set .@enchant,0;
+		} else {
+			mes "[Devil Enchant Master]";
+			mes "Hmm! This item is having a problem, please check it again!";
+			close;
+		}
+		mes "[Devil Enchant Master]";
+		if (.@equip_card[3]) {
+			mes "This item has been enchanted!";
+			close;
+		}
+		if (!countitem(6484)) {
+			mes "Are you listening to me? I will only do for you if you bring the Enchant Book!";
+			close;
+		}
+		if (.@enchant == 0) {
+			specialeffect EF_SHIELDCHARGE;
+			mes "Oh! Unbelievable!! It failed!! Please come again!";
+			set .@lost_refine, rand(0,.@equip_refine);
+			set .@equip_refine, .@equip_refine - .@lost_refine;
+		} else {
+			specialeffect EF_REPAIRWEAPON;
+			mes "The slot ^9900004^000000 has been enchanted!";
+		}
+		delitem 6484,1; //Enchant_Book
+		delequip .@part;
+
+//		GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@enchant
+		getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@enchant;
+
+		if (.@lost_refine) {
+			next;
+			mes "[Devil Enchant Master]";
+			mes "The failure has reduced the refine by "+.@lost_refine+" level"+((.@lost_refine == 1)?"":"s")+"! Don't be depressed!";
+		}
+		close;
+	} else if (.@select == 2) {
+		if (Zeny < 100000) {
+			mes "You need to bring some money to initialize!!";
+			close;
+		}
+		if (.@equip_card[3] < 4700) { // Armor Enchant System
+			mes "This item is not enchanted!";
+			close;
+		}
+		if (!getequipisequiped(.@part)) {
+			mes "Are you unequipping now?";
+			close;
+		}
+		specialeffect EF_REPAIRWEAPON;
+		mes "I initialized the enchant effects.";
+		Zeny -= 100000;
+		delequip .@part;
+
+//		GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] 0
+		getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],0;
+
+		close;
+	} else {
+		mes "It seems you have chosen the wrong job??";
+		close;
+	}
+}
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt
index 8eb987e08..343308268 100644
--- a/npc/re/merchants/flute.txt
+++ b/npc/re/merchants/flute.txt
@@ -3,20 +3,20 @@
 //===== By: ==================================================
 //= Masao, Muad_Dib, Ziu
 //===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2a
 //===== Description: =========================================
+//= [Official Conversion]
 //= Sells Falcon Flute and Wolf Flute.
 //===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
 //= 1.1 Added Baby Hunter and Baby Ranger check. bugreport:5728 [Masao]
 //= 1.2 Added Wolf Flute trader, optimized. [Euphy]
+//= 1.2a Fixed some conditions. [Euphy]
 //============================================================
 
 -	script	Falcon Flute Trader::fflute	-1,{
 	mes "[Falcon Flute Trader]";
-	if (BaseJob == Job_Hunter || Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
+	if (BaseJob == Job_Hunter) {
 		mes "Do you need a Falcon?";
 		mes "With a magical Flute, you can call your Falcon from anywhere!";
 		next;
@@ -40,14 +40,13 @@
 		mes "[Falcon Flute Trader]";
 		mes "If you need a Falcon Flute I will sell them for 12,500 zeny. Or is that too expensive?";
 		next;
-		if (BaseJob == Job_Hunter)
-			set .@price,12500;
-		else {
+		if (eaclass()&EAJL_THIRD) {
 			mes "[Falcon Flute Trader]";
 			mes "For Rangers, however, I have a special price of 10,000 zeny!";
 			set .@price,10000;
 			next;
-		}
+		} else
+			set .@price,12500;
 		if(select("Don't buy one:Buy a Falcon Flute") == 1) {
 			mes "[Falcon Flute Trader]";
 			mes "That's too bad. If you need one, come back!";
@@ -64,8 +63,8 @@
 			mes "[Falcon Flute Trader]";
 			mes "Here, take this flute.";
 			mes "With it you can whistle for your Falcon from anywhere.";
-		  	set Zeny, Zeny - .@price;
-			getitem 12848,1; // Falcon Flute
+		  	Zeny -= .@price;
+			getitem 12848,1; //Falcon_Flute
 			next;
 			mes "[Falcon Flute Trader]";
 			mes "Just a reminder.";
@@ -76,7 +75,7 @@
 		mes "I'm sorry but you don't have enough money to buy a Falcon Flute, please come back when you have more money!";
 		close;
 	}
-	if (Class == Job_Baby_Archer || Class == Job_Archer) {
+	if (BaseJob == Job_Archer) {
 		mes "Hello, young one!";
 		mes "Currently I can't help you,";
 		mes "but why don't you return to me when you've become a great Hunter and learned how to handle Falcons properly?";
@@ -85,10 +84,10 @@
 	mes "Isn't it a beautiful day today?";
 	close;
 }
-hu_in01,386,306,3	duplicate(fflute)	Falcon Flute Trader#fft	51
-pay_arche,91,134,3	duplicate(fflute)	Falcon Flute Trader#fft2	51
+hu_in01,386,306,3	duplicate(fflute)	Falcon Flute Trader#fft	1_M_BARD
+pay_arche,91,134,3	duplicate(fflute)	Falcon Flute Trader#fft2	1_M_BARD
 
-tur_dun01,89,170,5	script	Expert Flute Crafter	59,{
+tur_dun01,89,170,5	script	Expert Flute Crafter	1_M_ORIENT01,{
 	if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
 		if (countitem(6124)) {
 			mes "[Expert Flute Crafter]";
@@ -116,7 +115,7 @@ tur_dun01,89,170,5	script	Expert Flute Crafter	59,{
 				mes "Here's the new Wolf Flute.";
 				mes "Hope you are ready to use it.";
 				delitem 7150,1; //Bamboo_Cut
-				set Zeny, Zeny-100000;
+				Zeny -= 100000;
 				getitem 6124,1; //Wolf's_Flute
 				close;
 			}
@@ -138,4 +137,4 @@ tur_dun01,89,170,5	script	Expert Flute Crafter	59,{
 	mes "Eeehh? You are not a Ranger?";
 	mes "Then this flute is totally useless for you!";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt
new file mode 100644
index 000000000..0e0f3e081
--- /dev/null
+++ b/npc/re/merchants/hd_refiner.txt
@@ -0,0 +1,306 @@
+//===== Hercules Script ======================================
+//= HD Refiners
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Refiners that use HD ores to refine equipment. Upon
+//= failure, the equipment is not destroyed; rather, its
+//= refine level decreases by 1. The success rate is identical
+//= to that for Enriched ores.
+//= - "Blacksmith Mighty Hammer" only refines from +7~9.
+//= - "Basta" only refines from +10 and up.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+// Blacksmith Mighty Hammer (+7~9)
+//============================================================
+-	script	::MightyHammer	-1,{
+	disable_items;
+	mes "[Blacksmith Mighty Hammer]";
+	mes "Unlike others, I am a blacksmith who refines a very limited number of items.";
+	mes "I refine only items that are ^CC0000+7 to +9^000000.";
+	next;
+	mes "[Blacksmith Mighty Hammer]";
+	mes "My specialty is that even if my refining fails, the refine level decreases by 1 without losing the gear. Isn't it great?";
+	next;
+	mes "[Blacksmith Mighty Hammer]";
+	mes "So lets kick this into overdrive, what d' ya say? What item do you want to refine?";
+	next;
+	setarray .@position$[1],"Head","Body","Left Hand","Right Hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
+	set .@menu$,"";
+	for(set .@i,1; .@i<=10; set .@i,.@i+1)
+		set .@menu$, .@menu$+((getequipisequiped(.@i))?getequipname(.@i):.@position$[.@i]+"-[Not equipped]")+":";
+	set .@part, select(.@menu$);
+	if (!getequipisequiped(.@part)) {
+		mes "[Blacksmith Mighty Hammer]";
+		switch(.@part) {
+		case 1:
+			mes "I'm a blacksmith, not a hairstylist.";
+			break;
+		case 2:
+			mes "With my hammer, I will make you a star of the sky.";
+			break;
+		case 3:
+		case 4:
+			mes "Making artificial hands is not my specialty.";
+			break;
+		case 5:
+			mes "Bring out the item so I can refine it!";
+			break;
+		case 6:
+			mes "Where is this foot odor coming from?";
+			break;
+		case 7:
+		case 8:
+			mes "Where is the accessory?";
+			break;
+		case 9:
+			mes "What do you want me to refine?";
+			break;
+		case 10:
+			mes "Huh? What do you want me to do?";
+			break;
+		}
+		close;
+	}
+	if (!getequipisenableref(.@part)) {
+		mes "[Blacksmith Mighty Hammer]";
+		mes "This item can't be refined.";
+		close;
+	}
+	if (getequiprefinerycnt(.@part) < 7 || getequiprefinerycnt(.@part) > 9) {
+		mes "[Blacksmith Mighty Hammer]";
+		mes "I only handle items with refine levels from +7 to +9.";
+		close;
+	}
+	switch(getequipweaponlv(.@part)) {
+	default:
+	case 0:
+		set .@price,20000;
+		set .@material,6241; //HD_Elunium
+		break;
+	case 1:
+	case 2:
+	case 3:
+	case 4:
+		set .@price,20000;
+		set .@material,6240; //HD_Oridecon
+		break;
+	}
+	mes "[Blacksmith Mighty Hammer]";
+	mes "In order to refine the gear you selected you need ^ff9999"+getitemname(.@material)+"^000000 and 20,000 zeny as a fee.";
+	mes "Do you have them ready?";
+	next;
+	if(select("Yes:No") == 2) {
+		mes "[Blacksmith Mighty Hammer]";
+		mes "I will wait until you are ready.";
+		close;
+	}
+	if (getequippercentrefinery(.@part) < 100) {
+		mes "[Blacksmith Mighty Hammer]";
+		mes "It looks like this item will likely fail to be refined.";
+		mes "Well, even if it fails, it only decreases by 1 refine level.";
+		mes "Would you like to continue refining?";
+		next;
+		if(select("Yes:No") == 2) {
+			mes "[Blacksmith Mighty Hammer]";
+			mes "Only those who overcome fear of failure will obtain a masterpiece.";
+			close;
+		}
+	}
+	if (countitem(.@material) == 0 || Zeny < .@price) {
+		mes "[Blacksmith Mighty Hammer]";
+		mes "Didn't you just say you had everything ready?";
+		close;
+	}
+	delitem .@material,1;
+	Zeny -= .@price;
+	mes "[Blacksmith Mighty Hammer]";
+	mes "Tac! Tac! Tac!";
+	if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+		successrefitem .@part;
+		next;
+		emotion e_no1;
+		mes "[Blacksmith Mighty Hammer]";
+		mes "The sound refreshes my mind everytime I hear it.";
+		mes "Here, have it. Refine succeeded flawlessly!";
+		close;
+	}
+	downrefitem .@part;
+	next;
+	emotion e_omg;
+	mes "[Blacksmith Mighty Hammer]";
+	mes "Oops!!";
+	next;
+	mes "[Blacksmith Mighty Hammer]";
+	mes "I am sure a person like you would never blame me for a decrease in refine level by 1. Hmm.";
+	close;
+}
+prt_in,59,54,3	duplicate(MightyHammer)	Mighty Hammer#prt	4_M_DWARF
+morocc_in,65,30,3	duplicate(MightyHammer)	Mighty Hammer#morocc	4_M_DWARF
+payon,148,176,3	duplicate(MightyHammer)	Mighty Hammer#pay	4_M_DWARF
+alberta_in,16,56,3	duplicate(MightyHammer)	Mighty Hammer#alb	4_M_DWARF
+yuno_in01,171,18,3	duplicate(MightyHammer)	Mighty Hammer#yuno	4_M_DWARF
+ein_in01,22,82,3	duplicate(MightyHammer)	Mighty Hammer#ein	4_M_DWARF
+lhz_in02,280,19,3	duplicate(MightyHammer)	Mighty Hammer#lhz	4_M_DWARF
+
+// iRO NPC locations:
+// moc_para01,38,185,4	duplicate(MightyHammer)	Mighty Hammer#ed	4_M_DWARF
+// payon,174,133,4	duplicate(MightyHammer)	Mighty Hammer#im	4_M_DWARF
+
+// Basta (+10 and up)
+//============================================================
+-	script	::Basta	-1,{
+	disable_items;
+	mes "[Basta]";
+	mes "I'm the best Blacksmith in the whole world, Basta.";
+	mes "But I don't provide a normal refine service.";
+	mes "I only refine equipment ^CC0000over +10^000000.";
+	next;
+	mes "[Basta]";
+	mes "Which equipment do you want to refine?";
+	next;
+	setarray .@position$[1],"Head","Body","Left Hand","Right Hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
+	set .@menu$,"";
+	for(set .@i,1; .@i<=10; set .@i,.@i+1)
+		set .@menu$, .@menu$+((getequipisequiped(.@i))?getequipname(.@i):.@position$[.@i]+"-[Unequipped]")+":";
+	set .@part, select(.@menu$);
+	if (!getequipisequiped(.@part)) {
+		mes "[Basta]";
+		switch(.@part) {
+		case 1:
+			mes "Is your head an equipment?";
+			break;
+		case 2:
+			mes "What do you want me to do?";
+			break;
+		case 3:
+		case 4:
+			mes "Making artificial hands is not my specialty.";
+			break;
+		case 5:
+			mes "Do you even know what a robe is?";
+			break;
+		case 6:
+			mes "If you want to refine your feet, don't come to me, try running a marathon.";
+			break;
+		case 7:
+		case 8:
+			mes "Where is the accessory?";
+			break;
+		case 9:
+			mes "Well... I don't see any equipment worth refining.";
+			break;
+		case 10:
+			mes "I can't make you smart. Go see a school teacher for that.";
+			break;
+		}
+		close;
+	}
+	if (!getequipisenableref(.@part)) {
+		mes "[Basta]";
+		mes "Even I cannot refine this item. There's no way.";
+		close;
+	}
+	if (getequiprefinerycnt(.@part) < 10) {
+		mes "[Basta]";
+		mes "Haven't I told you? I only refine equipments that are +10 and above.";
+		close;
+	}
+	if (getequiprefinerycnt(.@part) == 20) {
+		mes "[Basta]";
+		mes "This weapon is perfect, no need to refine it anymore~";
+		close;
+	}
+	switch(getequipweaponlv(.@part)) {
+	default:
+	case 0:
+		set .@price,100000;
+		set .@material,6225; //HD_Carnium
+		set .@type$,"armor";
+		break;
+	case 1:
+	case 2:
+	case 3:
+	case 4:
+		set .@price,100000;
+		set .@material,6226; //HD_Bradium
+		set .@type$,"weapon";
+		break;
+	}
+	mes "[Basta]";
+	mes "Hmm... is this the one you want to refine?";
+	mes "To refine this equipment, I need 1 ^ff9999"+getitemname(.@material)+"^000000 and 100,000 zeny as a fee.";
+	mes "Do you really want to refine this?";
+	next;
+	if(select("Yes:No") == 2) {
+		mes "[Basta]";
+		mes "Okay. If that's what you want...";
+		close;
+	}
+	if (getequippercentrefinery(.@part) < 100) {
+		mes "[Basta]";
+		mes "This "+.@type$+" has already been refined pretty high.";
+		mes "If you try to refine it more, the refine level could decrease.";
+		next;
+		mes "[Basta]";
+		mes "I am different from the blacksmiths in others places.";
+		mes "It is impossible that the refine level will drop by, say, 3 or 4... that sounds scary.";
+		mes "Here it can only decrease by 1 level.";
+		next;
+		mes "[Basta]";
+		mes "Compared to other blacksmiths, the risk is smaller.";
+		mes "I've given all precautions. Do you want to try it?";
+		next;
+		if(select("Yes:No") == 2) {
+			mes "[Basta]";
+			mes "Well~";
+			mes "Not challenging at all could also be a kind of wisdom in life.";
+			close;
+		}
+	}
+	if (countitem(.@material) == 0 || Zeny < .@price) {
+		mes "[Basta]";
+		mes "Hmm... You didn't bring all the materials needed.";
+		mes "Come back when you have them all.";
+		close;
+	}
+	delitem .@material,1;
+	Zeny -= .@price;
+	mes "Pow! Pow! Pow! Pow!";
+	if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+		successrefitem .@part;
+		next;
+		emotion e_no1;
+		mes "[Basta]";
+		mes "Great! Nicely done!!";
+		mes "I really am the best blacksmith in the whole wide world!";
+		close;
+	}
+	downrefitem .@part;
+	next;
+	emotion (!rand(5))?e_cash:e_omg;
+	mes "[Basta]";
+	mes "Aaaaaaaaaaak!!!";
+	next;
+	mes "[Basta]";
+	mes "Damn it!";
+	mes "Refining failed and refine level has decreased!";
+	mes "Even the best blacksmith in the world doesn't guarantee 100% success!";
+	mes "Too bad.";
+	next;
+	mes "[Basta]";
+	mes "I'll do better next time! Don't worry!";
+	close;
+}
+prt_in,57,54,3	duplicate(Basta)	Basta#prt	4_M_DWARF
+morocc_in,68,30,3	duplicate(Basta)	Basta#morocc	4_M_DWARF
+payon,148,174,3	duplicate(Basta)	Basta#payon	4_M_DWARF
+alberta_in,18,56,3	duplicate(Basta)	Basta#alberta	4_M_DWARF
+yuno_in01,173,18,3	duplicate(Basta)	Basta#yuno	4_M_DWARF
+ein_in01,24,82,3	duplicate(Basta)	Basta#einbroch	4_M_DWARF
+lhz_in02,280,17,3	duplicate(Basta)	Basta#lighthalzen	4_M_DWARF
diff --git a/npc/re/merchants/inn.txt b/npc/re/merchants/inn.txt
index 14e1a2eff..174569b02 100644
--- a/npc/re/merchants/inn.txt
+++ b/npc/re/merchants/inn.txt
@@ -4,8 +4,6 @@
 //= c, L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Inn Npcs, Save and Heal
 //===== Additional Comments: =================================
@@ -15,7 +13,7 @@
 
 // Brasilis
 //============================================================
-bra_in01,27,24,3	script	Hotel Keeper#bra1	478,{
+bra_in01,27,24,3	script	Hotel Keeper#bra1	4_F_BRZ_WOMAN,{
 	mes "[Hotel Keeper]";
 	mes "Welcome to the beautiful Brasilis Hotel.";
 	next;
@@ -40,7 +38,7 @@ bra_in01,27,24,3	script	Hotel Keeper#bra1	478,{
 			mes "[Hotel Keeper]";
 			mes "I will show you a great room.";
 			close2;
-			set zeny,zeny-5000;
+			Zeny -= 5000;
 			percentheal 100,100;
 			warp "bra_in01",144,69;
 			end;
diff --git a/npc/re/merchants/quivers.txt b/npc/re/merchants/quivers.txt
index 45e44401a..03730a04a 100644
--- a/npc/re/merchants/quivers.txt
+++ b/npc/re/merchants/quivers.txt
@@ -1,24 +1,23 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Arrow Quivers
 //===== By: ==================================================
 //= Muad_Dib (Prometheus Project); L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
+//= [Official Conversion]
 //= Turns arrows into Arrow Quivers.
-// Breakdown of Subroutine "S_BuyQuiver"
-// arg(0): Type of Arrow to be packaged (item ID).
-// arg(1): How many of each 'getarg(0)' arrow per quiver.
-// arg(2): The cost of making a 'getarg(0)' quiver.
-// arg(3): The quiver given by the NPC (item ID).
+//= Breakdown of Subroutine "S_BuyQuiver"
+//= arg(0): Type of Arrow to be packaged (item ID).
+//= arg(1): How many of each 'getarg(0)' arrow per quiver.
+//= arg(2): The cost of making a 'getarg(0)' quiver.
+//= arg(3): The quiver given by the NPC (item ID).
 //===== Additional Comments: =================================
 //= 1.0 Added Mora NPC. [Euphy]
 //= 1.1 Updated to match the official scripts. [Euphy]
 //============================================================
 
-mora,106,117,3	script	Quiver Maker#mora	516,{
+mora,106,117,3	script	Quiver Maker#mora	4_M_RAFLE_GR,{
 	if (checkweight(1201,1) == 0) {
 		mes "[Quiver Maker]";
 		mes "You have too many things with you.";
@@ -114,7 +113,7 @@ S_BuyQuiver:
 	mes "There is ^3131FFsomething you need to know^000000 - try to remember it.";
 	mes "^FF0000You can't use quivers when your encumbrance is over 70%.^000000";
 	mes "You'd better keep that in mind, or you might be in trouble later.";
-	set Zeny, Zeny-.@arrow_zeny01;
+	Zeny -= .@arrow_zeny01;
 	delitem getarg(0),.@arrows_used;
 	getitem getarg(3),.@quiver;
 	close;
diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt
index 27a09fce7..db57a1d5d 100644
--- a/npc/re/merchants/refine.txt
+++ b/npc/re/merchants/refine.txt
@@ -3,28 +3,30 @@
 //===== By: ==================================================
 //= Hercules Dev Team
 //===== Current Version: =====================================
-//= 1.0a
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.3
 //===== Description: =========================================
 //= Renewal-specific refining NPCs and material merchants.
 //===== Additional Comments: =================================
 //= 1.0 Moved some scripts to Renewal file, optimized "Austry" NPC. [Euphy]
 //= 1.0a Added 'disable_items' command. [Euphy]
+//= 1.1 Added Malangdo Refiner "Clink". [Euphy]
+//= 1.2 Added official success calculation, thanks to Helvetica.
+//=     The safe/multiple refine feature is now functional. [Euphy]
+//= 1.3 Updated to match the latest official script. [Euphy]
 //============================================================
 
 // +11 and above Refiners
 //============================================================
-prt_in,90,72,5	script	Bestry#prt	826,{
-	callfunc "refinenew","Bestry",0,0;
+prt_in,90,72,5	script	Vestri#prt	4_M_DWARF,{
+	callfunc "refinenew","Vestri",0;
 	end;
 }
-morocc_in,64,41,5	script	Bestry#moc	826,{
-	callfunc "refinenew","Bestry",0,0;
+morocc_in,64,41,5	script	Vestri#moc	4_M_DWARF,{
+	callfunc "refinenew","Vestri",0;
 	end;
 }
-payon_in01,18,132,3	script	Bestry#pay	826,{
-	callfunc "refinenew","Bestry",0,0;
+payon_in01,18,132,3	script	Vestri#pay	4_M_DWARF,{
+	callfunc "refinenew","Vestri",0;
 	end;
 }
 
@@ -36,32 +38,38 @@ payon_in01,18,132,3	script	Bestry#pay	826,{
 //= If you enable this function, be sure to edit the value of
 //= .@safe to the max safe refine in refine_db.txt as well.
 //=
-//= The official script uses a command which seems to generate a
-//= random result upon refining: success, downgrade, or failure.
-//= To enable that feature, set the third argument to '1' in the
-//= function call.  Otherwise, the chance in refine_db.txt is used.
+//= On official servers, if an item is unsuccessfully refined
+//= it will break at a 20% rate and downgrade at an 80% rate.
 //============================================================
 function	script	refinenew	{
 	disable_items;
 	mes "["+ getarg(0) +"]";
-	mes "I am the best Blacksmith ever!";
-	mes "I don't work with normal, boring items.";
-	mes "But only with items that are level 10 or higher!";
+	mes "I am the best Armsmith ever!";
+	mes "I don't refine normal, boring items.";
+	mes "I only refine items that are Level 10 or higher.";
 	next;
 	mes "["+ getarg(0) +"]";
-	mes "Anyway, you may use my services if your item is lv 10 or higher.";
-	mes "What do you want to have refined?";
+	mes "Anyway, you may use my services if your item is Level 10 or higher.";
+	mes "What do you want me to refine?";
 	next;
 
 	setarray .@position$[1],"Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 	set .@menu$,"";
 	for(set .@i,1; .@i<=10; set .@i,.@i+1) {
-		if(getequipisequiped(.@i))
+		if (getequipisequiped(.@i)) {
 			set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
+			set .@equipped,1;
+		}
 		set .@menu$, .@menu$ + ":";
 	}
-	set .@part,select(.@menu$);
-	if(!getequipisequiped(.@part)) {
+	if (.@equipped == 0) {
+		mes "[" + getarg(0) + "]";
+		mes "I don't think I can refine any items you have...";
+		close;
+	}
+	set .@part, select(.@menu$);
+
+	if (!getequipisequiped(.@part)) { //custom check
 		mes "[" + getarg(0) + "]";
 		mes "You're not wearing";
 		mes "anything there that";
@@ -69,30 +77,18 @@ function	script	refinenew	{
 		emotion e_an;
 		close;
 	}
-	//Check if the item is refinable...
-	if(!getequipisenableref(.@part)) {
+	if (!getequipisenableref(.@part)) {
 		mes "[" + getarg(0) + "]";
 		mes "I don't think I can";
 		mes "refine this item at all...";
 		close;
 	}
-	//Check if the item is identified... (Don't know why this is in here... but kept it anyway)
-	if(!getequipisidentify(.@part)) {
-		mes "[" + getarg(0) + "]";
-		mes "You can't refine this";
-		mes "if you haven't appraised";
-		mes "it first. Make sure your";
-		mes "stuff is identified before";
-		mes "I can refine it.";
-		close;
-	}
-	//Check to see if the items is at least +10
-	if(getequiprefinerycnt(.@part) < 10) {
+	if (getequiprefinerycnt(.@part) < 10) {
 		mes "["+ getarg(0) +"]";
-		mes "I said I don't work with Equipment under lv. 10.";
+		mes "I said I don't work with items that are lower than Level 10.";
 		close;
 	}
-	if(getequiprefinerycnt(.@part) >= 20) {
+	if (getequiprefinerycnt(.@part) >= 20) { //custom check
 		mes "["+ getarg(0) +"]";
 		mes "I can't refine this";
 		mes "any more. This is as";
@@ -102,76 +98,74 @@ function	script	refinenew	{
 	set .@refineitemid, getequipid(.@part); // save id of the item
 	set .@refinerycnt, getequiprefinerycnt(.@part); //save refinery count
 	if ((getequipweaponlv(.@part) >= 1) && (getequipweaponlv(.@part) <= 4)) {
-		set .@material,6224;
+		set .@type$,"weapon";
+		set .@material,6224; //Bradium
 		set .@price,100000;
-		set .@safe,10;
+		switch(getequipweaponlv(.@part)) {
+			case 1: set .@safe,10; break;
+			case 2: set .@safe,10; break;
+			case 3: set .@safe,10; break;
+			case 4: set .@safe,10; break;
+		}
 		mes "["+ getarg(0) +"]";
 		mes "Hmm a weapon, is that ok?";
 		mes "If you want to refine this weapon,";
 		mes "I will need 1 ^003366Bradium^000000 and 100,000 zeny.";
-		mes "Are you sure you want to continue?";
 	} else {
-		set .@material,6223;
+		set .@type$,"armor";
+		set .@material,6223; //Carnium
 		set .@price,100000;
 		set .@safe,10;
 		mes "["+ getarg(0) +"]";
 		mes "Hmm an armor, is that ok?";
 		mes "If you want to refine this armor,";
 		mes "I will need 1 ^003366Carnium^000000 and 100,000 zeny.";
-		mes "Are you sure you want to continue?";
 	}
+	mes "Are you sure you want to continue?";
 	next;
 	if(select("Yes:No") == 2){
 		mes "["+ getarg(0) +"]";
-		mes "Well, no challenge is one way...";
-		mes "No risk... that could be wise.";
+		mes "Hm... if you mind... never mind...";
 		close;
 	}
-	if(getarg(1) != 1) {
-		if ((getequipweaponlv(.@part) >= 1) && (getequipweaponlv(.@part) <= 4)) {
+	if (getarg(1) != 1) {
+		if (getequippercentrefinery(.@part) < 100) {
 			mes "["+ getarg(0) +"]";
-			mes "This weapon already has been refined serveral times.";
-			mes "It could be destroyed if you try more.";
-			mes "It won't break 100%, but is has a small chance.";
+			mes "This "+.@type$+" already has been refined serveral times.";
+			mes "It could be destroyed if I try again.";
+			mes "It won't break for sure, but there is has a small chance.";
 			next;
 			mes "["+ getarg(0) +"]";
-			mes "You could have the upgrade level of the weapon decreased,";
+			mes "You could be ^FF0000lowering the upgrade level^000000 of the "+.@type$+",";
 			mes "or if it breaks, you will lose ^FF0000any cards^000000 or special properties added to it.";
-		} else {
-			mes "["+ getarg(0) +"]";
-			mes "This armor already has been refined serveral times.";
-			mes "It could be destroyed if you try more.";
-			mes "It won't break 100%, but is has a small chance.";
 			next;
 			mes "["+ getarg(0) +"]";
-			mes "You could have the upgrade level of the armor decreased,";
-			mes "or if it breaks, you will lose ^FF0000any cards^000000 or special properties added to it.";
-		}
-		next;
-		mes "["+ getarg(0) +"]";
-		mes "Do you want me to refine it?";
-		mes "I think I gave you enough warnings.";
-		next;
-		if(select("Yes.:No.") == 2) {
-			mes "["+ getarg(0) +"]";
-			mes "Well, no challenge is one way..";
-			mes "No risk.. that could be wise.";
-			close;
+			mes "Do you still want me to refine it?";
+			mes "I think I have given you enough warning.";
+			next;
+			if(select("Yes.:No.") == 2) {
+				mes "["+ getarg(0) +"]";
+				mes "Well, no challenge is one way to go...";
+				mes "No risk... that could be wise.";
+				close;
+			}
 		}
-		if(countitem(.@material) < 1 || Zeny < .@price) {
+		if (countitem(.@material) < 1 || Zeny < .@price) {
 			mes "["+ getarg(0) +"]";
-			mes "Hm, it seems you don't have enough materials or money.";
-			mes "Please check it out.";
+			mes "Hm. You don't seem to have enough money or "+getitemname(.@material)+".";
+			mes "Please come back when you have them.";
 			close;
 		}
-		set Zeny,Zeny - .@price;
+		Zeny -= .@price;
 		delitem .@material,1;
-		if(getequipisequiped(.@part) == 0) { // hacker has removed the item (not changed, why?)
+
+		//custom checks
+		if (getequipisequiped(.@part) == 0) { // hacker has removed the item (not changed, why?)
 			mes "[" + getarg(0) + "]";
 			mes "Look here... you don't have any items on...";
 			close;
 		}
-		if(getequiprefinerycnt(.@part) != .@refinerycnt || getequipid(.@part) != .@refineitemid) { // hacker has changed the item
+		if (getequiprefinerycnt(.@part) != .@refinerycnt || getequipid(.@part) != .@refineitemid) { // hacker has changed the item
 			mes "[" + getarg(0) + "]";
 			emotion e_an;
 			mes "Wait a second...";
@@ -179,105 +173,52 @@ function	script	refinenew	{
 			mes "You switched the item while I wasn't looking! Get out of here!";
 			close;
 		}
-		if(getarg(2) == 1){
-			set .@rand,rand(1,3);
-			if (.@rand == 1) {
-				mes "Clang! Clang! Clang! Clang!";
-				successrefitem .@part;
-				next;
-				emotion e_no1;
-				mes "["+ getarg(0) +"]";
-				mes "Good! Succes!!!";
-				mes "I am the best Blacksmith.";
-				close;
-			}
-			if (.@rand == 2) {
+
+		if (getequippercentrefinery(.@part) > rand(100)) {
+			mes "Clang! Clang! Clang! Clang!";
+			successrefitem .@part;
+			next;
+			emotion e_no1;
+			mes "["+ getarg(0) +"]";
+			mes "Good! Succes!!!";
+			mes "I am the best Armsmith.";
+			close;
+		} else {
+			if (rand(100) < 80) {
 				mes "["+ getarg(0) +"]";
 				mes "Clang! Clang! Clang! Clang!";
-				downrefitem .@part;
+				downrefitem .@part, 3; // Failed refine attempts decrease the item's refine level by 3
 				next;
 				emotion (!rand(5))?e_cash:e_omg;
 				mes "["+ getarg(0) +"]";
 				mes "Ahhh!!!";
 				next;
 				mes "["+ getarg(0) +"]";
-				mes "Oh my!";
+				mes "Oh my god!";
 				mes "The upgrade level has dropped...";
-				mes "There could've been made an mistake even though I am the best ever.";
-				mes "It was out of my hands.";
+			} else {
+				mes "["+ getarg(0) +"]";
+				mes "Clang! Clang! Clang!";
+				failedrefitem .@part;
 				next;
+				emotion (!rand(5))?e_cash:e_omg;
 				mes "["+ getarg(0) +"]";
-				mes "I will do a better job next time! Don't worry!";
-				close;
+				mes "Hmmm!";
+				next;
+				mes "["+ getarg(0) +"]";
+				mes "Oh my! I've failed to refine stuff...";
+				mes "I didn't mean it!";
 			}
-			mes "["+ getarg(0) +"]";
-			mes "Clang! Clang! Clang!";
-			failedrefitem .@part;
-			next;
-			emotion (!rand(5))?e_cash:e_omg;
-			mes "["+ getarg(0) +"]";
-			mes "Hmmm!";
-			next;
-			mes "["+ getarg(0) +"]";
-			mes "Oh my! I've failed to refine stuff...";
-			mes "I didn't mean it!";
-			mes "There could've been made an mistake even though I am the best ever.";
-			mes "It was out of my hands.";
-			next;
-			mes "["+ getarg(0) +"]";
-			mes "I will do a better job next time! Don't worry!";
-			close;
-		}
-		set .@rand,rand(100);
-		if (getequippercentrefinery(.@part) > .@rand) {
-			mes "Clang! Clang! Clang! Clang!";
-			successrefitem .@part;
-			next;
-			emotion e_no1;
-			mes "["+ getarg(0) +"]";
-			mes "Good! Succes!!!";
-			mes "I am the best Blacksmith.";
-			close;
-		}
-		if (getequippercentrefinery(.@part) < .@rand) {
-			mes "["+ getarg(0) +"]";
-			mes "Clang! Clang! Clang! Clang!";
-			downrefitem .@part;
-			next;
-			emotion (!rand(5))?e_cash:e_omg;
-			mes "["+ getarg(0) +"]";
-			mes "Ahhh!!!";
-			next;
-			mes "["+ getarg(0) +"]";
-			mes "Oh my!";
-			mes "The upgrade level has dropped...";
-			mes "There could've been made an mistake even though I am the best ever.";
-			mes "It was out of my hands.";
+			mes "I could have made a mistake even though I am the best Armsmith ever.";
+			mes "It just wasn't meant to be.";
 			next;
 			mes "["+ getarg(0) +"]";
 			mes "I will do a better job next time! Don't worry!";
 			close;
 		}
-		mes "["+ getarg(0) +"]";
-		mes "Clang! Clang! Clang!";
-		failedrefitem .@part;
-		next;
-		emotion (!rand(5))?e_cash:e_omg;
-		mes "["+ getarg(0) +"]";
-		mes "Hmmm!";
-		next;
-		mes "["+ getarg(0) +"]";
-		mes "Oh my! I've failed to refine stuff...";
-		mes "I didn't mean it!";
-		mes "There could've been made an mistake even though I am the best ever.";
-		mes "It was out of my hands.";
-		next;
-		mes "["+ getarg(0) +"]";
-		mes "I will do a better job next time! Don't worry!";
-		close;
 	}
 // New +11 and above Refining Functions ========================
-	if(getequiprefinerycnt(.@part) < .@safe) {
+	if (getequiprefinerycnt(.@part) < .@safe) {
 		mes "[" + getarg(0) + "]";
 		mes "I can refine this to the safe limit or a desired number of times. It's your choice.";
 		next;
@@ -285,22 +226,21 @@ function	script	refinenew	{
 	} else
 		set .@menu2,2;
 	switch(.@menu2){
-	case 1: 
+	case 1:
 		set .@refinecnt,.@safe - getequiprefinerycnt(.@part);
 		break;
 	case 2:
-		next;
 		mes "[" + getarg(0) + "]";
 		mes "How many times would you like me to refine your item?";
 		next;
 		input .@refinecnt;
 		set .@refinecheck,.@refinecnt + getequiprefinerycnt(.@part);
-		if (.@refinecnt < 1 || .@refinecheck > 10) {
+		if (.@refinecnt < 1 || .@refinecheck > 20) {
 			mes "[" + getarg(0) + "]";
 			mes "I can't refine this item that many times.";
 			close;
 		}
-		if(.@refinecheck > .@safe) {
+		if (.@refinecheck > .@safe) {
 			set .@refinecheck,.@refinecheck - .@safe;
 			mes "[" + getarg(0) + "]";
 			mes "This will try to refine the equipment " + .@refinecheck + " times past the safe limit. Your equipment may be destroyed... is that ok?";
@@ -313,7 +253,6 @@ function	script	refinenew	{
 		}
 		break;
 	case 3:
-		next;
 		mes "[" + getarg(0) + "]";
 		mes "You said so... So be it.";
 		close;
@@ -322,17 +261,18 @@ function	script	refinenew	{
 	mes "[" + getarg(0) + "]";
 	mes "That will cost you " + .@refinecnt + " " + getitemname(.@material) + " and " + .@fullprice + " Zeny. Is that ok?";
 	next;
-	if(select("Yes","No...") == 2){
+	if(select("Yes:No...") == 2){
 		mes "[" + getarg(0) + "]";
 		mes "You said so... So be it.";
 		close;
 	}
-	if(countitem(.@material) < .@refinecnt || Zeny < .@fullprice) {
+	if (countitem(.@material) < .@refinecnt || Zeny < .@fullprice) {
 		mes "[" + getarg(0) + "]";
-		mes "Is that all you got? Unfortunately I can't work for you at a lower price. Try putting yourself in my shoes.";
+		mes "Hm. You don't seem to have enough money or "+getitemname(.@material)+".";
+		mes "Please come back when you have them.";
 		close;
 	}
-	set Zeny,Zeny - .@fullprice;
+	Zeny -= .@fullprice;
 	delitem .@material,.@refinecnt;
 	while(.@refinecnt){
 		if (getequipisequiped(.@part) == 0) {
@@ -347,113 +287,64 @@ function	script	refinenew	{
 			mes "Get out before I stun you with my Hammer!!";
 			close;
 		}
-		if(getarg(2) == 1){
-			set .@rand,rand(1,3);
-			if (.@rand == 1) {
-				mes "["+ getarg(0) +"]";
-				mes "Clang! Clang! Clang! Clang!";
-				successrefitem .@part;
-				next;
-				emotion e_no1;
-				mes "["+ getarg(0) +"]";
-				mes "Good! Succes!!!";
-				mes "I am the best Blacksmith.";
-				close;
-			}
-			if (.@rand == 2) {
+		if (getequippercentrefinery(.@part) > rand(100)) {
+			mes "Clang! Clang! Clang! Clang!";
+			successrefitem .@part;
+			set .@refinecnt,.@refinecnt - 1;
+			next;
+		} else {
+			if (rand(100) < 80) {
 				mes "["+ getarg(0) +"]";
 				mes "Clang! Clang! Clang! Clang!";
-				downrefitem .@part;
+				downrefitem .@part, 3; // Failed refine attempts decrease the item's refine level by 3
 				next;
 				emotion (!rand(5))?e_cash:e_omg;
 				mes "["+ getarg(0) +"]";
 				mes "Ahhh!!!";
 				next;
 				mes "["+ getarg(0) +"]";
-				mes "Oh my!";
+				mes "Oh my god!";
 				mes "The upgrade level has dropped...";
-				mes "There could've been made an mistake even though I am the best ever.";
-				mes "It was out of my hands.";
+			} else {
+				mes "["+ getarg(0) +"]";
+				mes "Clang! Clang! Clang!";
+				failedrefitem .@part;
 				next;
+				emotion (!rand(5))?e_cash:e_omg;
 				mes "["+ getarg(0) +"]";
-				mes "I will do a better job next time! Don't worry!";
-				close;
+				mes "Hmmm!";
+				next;
+				mes "["+ getarg(0) +"]";
+				mes "Oh my! I've failed to refine stuff...";
+				mes "I didn't mean it!";
 			}
-			mes "["+ getarg(0) +"]";
-			mes "Clang! Clang! Clang!";
-			failedrefitem .@part;
-			next;
-			emotion (!rand(5))?e_cash:e_omg;
-			mes "["+ getarg(0) +"]";
-			mes "Hmmm!";
-			next;
-			mes "["+ getarg(0) +"]";
-			mes "Oh my! I've failed to refine stuff...";
-			mes "I didn't mean it!";
-			mes "There could've been made an mistake even though I am the best ever.";
-			mes "It was out of my hands.";
-			next;
-			mes "["+ getarg(0) +"]";
-			mes "I will do a better job next time! Don't worry!";
-			close;
-		}
-		set .@rand,rand(100);
-		if (getequippercentrefinery(.@part) > .@rand) {
-			mes "Clang! Clang! Clang! Clang!";
-			successrefitem .@part;
-			next;
-			emotion e_no1;
-			mes "["+ getarg(0) +"]";
-			mes "Good! Succes!!!";
-			mes "I am the best Blacksmith.";
-			close;
-		}
-		if (getequippercentrefinery(.@part) < .@rand) {
-			mes "["+ getarg(0) +"]";
-			mes "Clang! Clang! Clang! Clang!";
-			downrefitem .@part;
-			next;
-			emotion (!rand(5))?e_cash:e_omg;
-			mes "["+ getarg(0) +"]";
-			mes "Ahhh!!!";
-			next;
-			mes "["+ getarg(0) +"]";
-			mes "Oh my!";
-			mes "The upgrade level has dropped...";
-			mes "There could've been made an mistake even though I am the best ever.";
-			mes "It was out of my hands.";
+			mes "I could have made a mistake even though I am the best Armsmith ever.";
+			mes "It just wasn't meant to be.";
 			next;
 			mes "["+ getarg(0) +"]";
 			mes "I will do a better job next time! Don't worry!";
 			close;
 		}
-		mes "["+ getarg(0) +"]";
-		mes "Clang! Clang! Clang!";
-		failedrefitem .@part;
-		next;
-		emotion (!rand(5))?e_cash:e_omg;
-		mes "["+ getarg(0) +"]";
-		mes "Hmmm!";
-		next;
-		mes "["+ getarg(0) +"]";
-		mes "Oh my! I've failed to refine stuff...";
-		mes "I didn't mean it!";
-		mes "There could've been made an mistake even though I am the best ever.";
-		mes "It was out of my hands.";
-		next;
-		mes "["+ getarg(0) +"]";
-		mes "I will do a better job next time! Don't worry!";
-		close;
 	}
-	mes "[" + getarg(0) + "]";
-	mes "All finished... Come again soon.";
+	emotion e_no1;
+	mes "["+ getarg(0) +"]";
+	mes "Good! Succes!!!";
+	mes "I am the best Blacksmith.";
 	close;
 }
 
 // Ori/Elu to Carnium/Bradium Refiners
 //============================================================
--	script	Austry#ref	-1,{
-	mes "[Austry]";
+-	script	Austri#ref	-1,{
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait a minute !! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please try again -";
+		mes "- after you lose some weight. -";
+		close;
+	}
+	mes "[Austri]";
 	mes "If you bring me 3";
 	mes "Oridecon or Elunium";
 	mes "I can exchange them for";
@@ -471,31 +362,196 @@ function	script	refinenew	{
 		setarray .@i[0],6090,1,6223; //Purified_Bradium -> Carnium
 		break;
 	case 4:
-		mes "[Austry]";
+		mes "[Austri]";
 		mes "Hmm...";
 		close;
 	}
 	if (countitem(.@i[0]) >= .@i[1] && Zeny >= 50000) {
 		delitem .@i[0],.@i[1];
-		set Zeny, Zeny - 50000;
+		Zeny -= 50000;
 		getitem .@i[2],1;
-		mes "[Austry]";
+		mes "[Austri]";
 		if (.@i[0] == 6090) {
-			mes "Refining with Purified Bradium";
-			mes "is a little expensive. I can";
-			mes "trade it for some Carnium.";
+			mes "Refining with Refined Bradium";
+			mes "can be a little expensive.";
+			mes "I can exchange it for some Carnium.";
 		} else
-			mes "Ok! Here is your "+getitemname(.@i[2])+".";
+			mes "Ok! Here's your "+getitemname(.@i[2])+".";
 		mes "Take it and use it well.";
 		close;
 	}
-	mes "[Austry]";
+	mes "[Austri]";
 	mes "You better not be trying";
 	mes "to cheat me because you";
-	mes "don't have enough zeny";
+	mes "don't have enough money";
 	mes "or "+getitemname(.@i[0])+".";
 	close;
 }
-prt_in,85,71,5	duplicate(Austry#ref)	Austry#prt	826
-payon_in01,14,125,5	duplicate(Austry#ref)	Austry#pay	826
-morocc_in,60,38,5	duplicate(Austry#ref)	Austry#moc	826
+prt_in,85,71,5	duplicate(Austri#ref)	Austri#prt	4_M_DWARF
+payon_in01,14,125,5	duplicate(Austri#ref)	Austri#pay	4_M_DWARF
+morocc_in,60,38,5	duplicate(Austri#ref)	Austri#moc	4_M_DWARF
+
+// Malangdo Refiner
+//============================================================
+malangdo,224,172,6	script	Clink#mal_normal	4_CAT_SAILOR1,{
+	disable_items;
+	mes "[Clink]";
+	mes "My cool dad Holink said I have the world's greatest refine hammer!!";
+	mes "Meow Meow~";
+	mes "Who do you think I am?";
+	mes "Yes!!! You!! You want to refine?";
+	next;
+	setarray .@position$[1],"Head","Body","Left Hand","Right Hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
+	set .@menu$,"";
+	for(set .@i,1; .@i<=10; set .@i,.@i+1)
+		set .@menu$, .@menu$+((getequipisequiped(.@i))?getequipname(.@i):.@position$[.@i]+"-[Empty]")+":";
+	set .@part, select(.@menu$);
+	if (!getequipisequiped(.@part)) {
+		mes "[Clink]";
+		switch(.@part) {
+		case 1:
+			mes "Dad said. There's no cure for stupidity...";
+			break;
+		case 2:
+			mes "There's nothing to see here!!";
+			break;
+		case 3:
+			mes "What an arrogant left hand this is!";
+			break;
+		case 4:
+			mes "What an arrogant right hand this is!";
+			break;
+		case 5:
+			mes "Get that dirty thing off my face!!";
+			break;
+		case 6:
+			mes "Kyaong~! Do not provoke me.";
+			break;
+		case 7:
+		case 8:
+			mes "Where is the accessory?";
+			break;
+		case 9:
+		case 10:
+			mes "Are you talking about the other head part?";
+			break;
+		}
+		close;
+	}
+	if (!getequipisenableref(.@part)) {
+		mes "[Clink]";
+		mes "This can't be refined!!";
+		close;
+	}
+	if (getequiprefinerycnt(.@part) >= 10) {
+		mes "[Clink]";
+		mes "Perfect refining. Did I do this for you?";
+		close;
+	}
+	mes "[Clink]";
+	switch(getequipweaponlv(.@part)) {
+	default:
+	case 0: // Armor
+		set .@price,2000;
+		set .@material,985; //Elunium
+		set .@type$,"armor";
+		mes "Hmm, an armor refine? Someone like you?";
+		break;
+	case 1: // Level 1 Weapon
+		set .@price,50;
+		set .@material,1010; //Phracon
+		set .@type$,"weapon";
+		mes "A level 1 weapon?";
+		mes "Urr... Annoying... Okay, let's try...";
+		break;
+	case 2: // Level 2 Weapon
+		set .@price,200;
+		set .@material,1011; //Emveretarcon
+		set .@type$,"weapon";
+		mes "A level 2 weapon?";
+		break;
+	case 3: // Level 3 Weapon
+		set .@price,20000;
+		set .@material,984; //Oridecon
+		set .@type$,"weapon";
+		mes "Woot!! A level 3 weapon? Impressive~";
+		break;
+	case 4: // Level 4 Weapon
+		set .@price,50000;
+		set .@material,984; //Oridecon
+		set .@type$,"weapon";
+		mes "Wow!... A level 4 weapon~!!";
+		break;
+	}
+	mes "You need ^ff9999"+getitemname(.@material)+"^000000 and ^ff9999"+.@price+"^000000 Zeny. Do you have them?";
+	next;
+	if(select("Yes, I do!!:Forget about it!!") == 2) {
+		mes "[Clink]";
+		mes "I knew it!!";
+		mes "I knew you were not worth trying my magical refining hammer for.";
+		close;
+	}
+	if (getequippercentrefinery(.@part) < 100) {
+		mes "[Clink]";
+		mes "Wow!!";
+		mes "This "+.@type$+" has been refined quite a bit, huh?";
+		mes "You do know that this might break, right?";
+		next;
+		mes "[Clink]";
+		mes "If you break the "+.@type$+", you can never use it again.";
+		mes "Cards and enchant effects...";
+		mes "the ^ff0000whole thing will disappear^000000.";
+		mes "You still up for this~?";
+		next;
+		if(select("Yes, I am!!:Forget about it!!") == 2) {
+			mes "[Clink]";
+			mes "I knew it!!";
+			mes "You can't even take this big step. Don't think about refining...";
+			close;
+		}
+	}
+	if (countitem(.@material) == 0 || Zeny < .@price) {
+		mes "[Clink]";
+		mes "Hey you!! Didn't I tell you";
+		mes "that you need ^ff9999"+getitemname(.@material)+"^000000 and ^ff9999"+.@price+"^000000 Zeny??!!";
+		close;
+	}
+	delitem .@material,1;
+	Zeny -= .@price;
+	if (getequippercentrefinery(.@part) <= rand(100)) {
+		failedrefitem .@part;
+		mes "[Clink]";
+		mes "Cry Hammer!! Cry!!!";
+		next;
+		switch(rand(1,5)) {
+			case 1: emotion e_sob; break;
+			case 2: emotion e_swt2; break;
+			case 3: emotion e_wah; break;
+			case 4: emotion e_hmm; break;
+			case 5: emotion e_lv2; break;
+		}
+		mes "[Clink]";
+		mes "Huh?! I failed?!";
+		next;
+		mes "[Clink]";
+		mes "Arrgg~ It's all~ Broken...? What a pity~";
+		next;
+		mes "[Clink]";
+		mes "Hey...!! Get me another one.";
+		mes "This is not possible.";
+		mes "How can my hammer fail from refining?";
+		close;
+	}
+	successrefitem .@part;
+	mes "[Clink]";
+	mes "Cry Hammer!! Cry!!!";
+	next;
+	emotion e_kis;
+	mes "[Clink]";
+	mes "Ok!! Perfect!!";
+	mes "There's nothing I can't refine";
+	mes "with this special hammer.";
+	mes "You can praise me!!";
+	mes "What a day!!";
+	close;
+}
diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt
index e4f1a02c7..59894c678 100644
--- a/npc/re/merchants/renters.txt
+++ b/npc/re/merchants/renters.txt
@@ -1,18 +1,20 @@
 //===== Hercules Script ======================================
 //= Renters
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Hercules Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.1
-//===== Description: ========================================= 
+//===== Description: =========================================
+//= [Official Conversion]
 //= Renewal-specific breeder NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.1 Moved some renters to a separate renewal file. [Daegaladh]
-//============================================================ 
+//= 2.2 Updated to match the official scripts. [Euphy]
+//============================================================
 
-// Dragon Breeder on the Rune Knight job change map, couldn't find NPC on iRO.
+// Dragon Breeder
 //============================================================
-job3_rune01,88,62,5	script	Dragon Breeder	105,{
+job3_rune01,88,62,5	script	Dragon Breeder	8W_SOLDIER,{
 	mes "[Dragon Breeder]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Welcome. Would you like to rent a Dragon?";
@@ -50,7 +52,7 @@ job3_rune01,88,62,5	script	Dragon Breeder	105,{
 
 // Dragon/Gryphon Master
 //============================================================
-prontera,130,213,5	script	Riding Creature Master	105,{
+prontera,130,213,5	script	Riding Creature Master	8W_SOLDIER,{
 	mes "[Riding Creature Master]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Welcome. Would you like to rent a Dragon?";
@@ -115,7 +117,7 @@ prontera,130,213,5	script	Riding Creature Master	105,{
 
 // Peco removing NPC
 //============================================================
-prontera,125,208,5	script	Peco Peco Remover	105,{
+prontera,125,208,5	script	Peco Peco Remover	8W_SOLDIER,{
 	mes "[Soldier]";
 	mes "If you're unable to dismount from a Peco Peco";
 	mes "for some unknown reason,";
@@ -146,21 +148,35 @@ prontera,125,208,5	script	Peco Peco Remover	105,{
 
 // Magic Gear Renter
 //============================================================
-prontera,163,178,3	script	Magic Gear Master	105,{
+-	script	::mgm	-1,{
 	mes "[Magic Gear Master]";
 	if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) {
-		mes "Welcome. Would you like to rent a Magic Gear?";
+		mes "Welcome, Mechanic.";
+		mes "Would you like to rent a Pushcart or";
+		mes "ride a Magic Gear?";
 		next;
-		switch(select("Yes:No")) {
+		switch(select("Rent a Pushcart:Ride a Magic Gear:Cancel")) {
 		case 1:
-			if (!getskilllv("NC_MADOLICENCE")) {
+			if (checkcart()) {
+				mes "[Magic Gear Master]";
+				mes "I'm sorry, but you already";
+				mes "have a Pushcart.";
+				close;
+			}
+			setcart;
+			mes "[Magic Gear Master]";
+			mes "There you go!";
+			close;
+		case 2:
+			if (checkmadogear()) {
 				mes "[Magic Gear Master]";
-				mes "Please learn how to use a Magic Gear first.";
+				mes "I'm sorry, but you're already";
+				mes "riding a Magic Gear.";
 				close;
 			}
-			else if (checkmadogear()) {
+			else if (!getskilllv("NC_MADOLICENCE")) {
 				mes "[Magic Gear Master]";
-				mes "You already have a Magic Gear.";
+				mes "Please learn the skill to get the Magic Gear License first.";
 				close;
 			}
 			else if(ismounting()) {
@@ -169,10 +185,10 @@ prontera,163,178,3	script	Magic Gear Master	105,{
 				close;
 			}
 			setmadogear;
-			close;
-		case 2:
 			mes "[Magic Gear Master]";
-			mes "I see. Then have a great day.";
+			mes "Have fun, and please come again!";
+			close;
+		case 3:
 			close;
 		}
 	}
@@ -180,3 +196,13 @@ prontera,163,178,3	script	Magic Gear Master	105,{
 	mes "Magic Gears are only available for Mechanics.";
 	close;
 }
+prontera,163,178,3	duplicate(mgm)	Magic Gear Master#prt	8W_SOLDIER
+geffen,103,55,5	duplicate(mgm)	Magic Gear Master#gef	8W_SOLDIER
+payon,166,106,5	duplicate(mgm)	Magic Gear Master#pay	8W_SOLDIER
+aldebaran,133,112,5	duplicate(mgm)	Magic Gear Master#alde	8W_SOLDIER
+yuno,167,187,3	duplicate(mgm)	Magic Gear Master#yuno	8W_SOLDIER
+rachel,106,134,5	duplicate(mgm)	Magic Gear Master#ra	8W_SOLDIER
+dicastes01,187,207,3	duplicate(mgm)	Magic Gear Master#dic	8W_SOLDIER
+manuk,273,212,5	duplicate(mgm)	Magic Gear Master#man	8W_SOLDIER
+splendide,180,174,5	duplicate(mgm)	Magic Gear Master#spl	8W_SOLDIER
+mid_camp,242,243,3	duplicate(mgm)	Magic Gear Master#mid	8W_SOLDIER
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index b27e5cc1d..dcd445361 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -1,111 +1,122 @@
 //===== Hercules Script ======================================
 //= Shops
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Hercules Dev Team
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.7
+//===== Description: =========================================
 //= Renewal-specific town shop NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Moved some merchants to a separate renewal file. [Kenpachi]
 //= 1.1 Added Dicastes merchants. [Joseph]
 //= 1.2 Moved more shops to Renewal file. [Euphy]
 //= 1.3 Added Malangdo tool dealer. [Euphy]
 //= 1.4 Moved Izlude merchants. [Streusel]
 //= 1.5 Added Dewata merchants. [Lemongrass]
-//= 1.6 Added Mora and Porta Malaya merchants. [Euphy]
-//============================================================ 
+//= 1.6 Added Mora and Port Malaya merchants.
+//= 1.7 Added Izlude duplicates. [Euphy]
+//============================================================
 
 //=======================================================
 // Comodo
 //=======================================================
-comodo,106,213,5	shop	Tropic Fruit Dealer	724,6258:-1
-comodo,196,162,3	shop	Harive#candy	479,11513:-1,6144:-1
+comodo,106,213,5	shop	Tropic Fruit Dealer	4_F_07,6258:-1
+comodo,196,162,3	shop	Harive#candy	4_M_MINSTREL,11513:-1,6144:-1
 
 //=======================================================
 // Dewata
 //=======================================================
-dewata,218,164,4	shop	Weapon Dealer	536,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-dewata,182,164,6	shop	Tool Dealer	536,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1,713:-1
-dewata,145,267,6	shop	Fruit Gardener	535,512:-1,513:-1,515:-1,516:-1,535:-1
-dewata,158,182,6	shop	Armor Dealer	536,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+dewata,218,164,4	shop	Weapon Dealer	4_M_DEWMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+dewata,182,164,6	shop	Tool Dealer	4_M_DEWMAN,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1,713:-1
+dewata,145,267,6	shop	Fruit Gardener	4_M_DEWOLDWOMAN,512:-1,513:-1,515:-1,516:-1,535:-1
+dewata,158,182,6	shop	Armor Dealer	4_M_DEWMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
 
 //=======================================================
 // Einbroch
 //=======================================================
-einbroch,122,250,4	shop	Black Marketeer#ein	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+einbroch,122,250,4	shop	Black Marketeer#ein	1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
 
 //=======================================================
 // El Dicastes
 //=======================================================
-dic_in01,238,107,5	shop	Peddler#dic	900,601:-1,602:-1,611:-1,610:-1
-dicastes01,207,200,6	shop	Points Merchant#dic	66,6360:-1,6361:-1,6362:-1,6363:-1
+dic_in01,238,107,5	shop	Peddler#dic	4_M_HUMERCHANT,601:-1,602:-1,611:-1,610:-1
+dicastes01,207,200,6	shop	Points Merchant#dic	1_F_01,6360:-1,6361:-1,6362:-1,6363:-1
 
 //=======================================================
 // Izlude
 //=======================================================
-izlude,160,186,0	shop	Butcher#iz	54,517:-1
-izlude,124,165,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
-izlude,128,158,6	shop	Vendor from Milk Ranch#i	90,519:-1
-izlude_in,72,98,3	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-izlude_in,57,109,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,72,110,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
+izlude,124,165,4	shop	Fruit Gardener#iz	1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1
+izlude_a,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_a	1_M_INNKEEPER
+izlude_b,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_b	1_M_INNKEEPER
+izlude_c,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_c	1_M_INNKEEPER
+izlude_d,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_d	1_M_INNKEEPER
+izlude,160,186,0	shop	Butcher#iz	1_M_JOBGUIDER,517:-1
+izlude_a,160,186,0	duplicate(Butcher#iz)	Butcher#iz_a	1_M_JOBGUIDER
+izlude_b,160,186,0	duplicate(Butcher#iz)	Butcher#iz_b	1_M_JOBGUIDER
+izlude_c,160,186,0	duplicate(Butcher#iz)	Butcher#iz_c	1_M_JOBGUIDER
+izlude_d,160,186,0	duplicate(Butcher#iz)	Butcher#iz_d	1_M_JOBGUIDER
+izlude,128,158,7	shop	Vendor from Milk Ranch#i	4_F_01,519:-1
+izlude_a,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#a	4_F_01
+izlude_b,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#b	4_F_01
+izlude_c,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#c	4_F_01
+izlude_d,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#d	4_F_01
+izlude_in,72,98,4	shop	Pet Groomer#iz	4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,57,110,0	shop	Tool Dealer#iz	1_M_01,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,72,110,3	shop	Trading Merchant#iz	4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
 
 //=======================================================
 // Juno
 //=======================================================
-s_atelier,114,117,1	shop	Part-Timer#sc_yuno	92,6123:-1,6120:-1
+s_atelier,114,117,1	shop	Part-Timer#sc_yuno	4_F_03,6123:-1,6120:-1
 
 //=======================================================
 // Lighthalzen
 //=======================================================
-lighthalzen,337,240,4	shop	Trap Specialist#lhz	66,7940:-1,12341:-1
-lhz_in03,181,17,4	shop	Black Marketeer#lhz	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,15,65,5	shop	Part-Timer#sc_lgt	89,6123:-1,6120:-1
+lighthalzen,337,240,4	shop	Trap Specialist#lhz	1_F_01,7940:-1,12341:-1
+lhz_in03,181,17,4	shop	Black Marketeer#lhz	1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,15,65,5	shop	Part-Timer#sc_lgt	4_M_ORIENT02,6123:-1,6120:-1
 
 //=======================================================
 // Malangdo
 //=======================================================
-malangdo,232,163,5	shop	Tool Dealer Myo	560,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1
+malangdo,232,163,5	shop	Tool Dealer Myo	4_CAT_ADV2,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1
 
 //=======================================================
 // Mora
 //=======================================================
-mora,100,118,4	shop	Tool Dealer#mora	517,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1,713:-1
-mora,138,110,4	shop	Mora Chef	518,11519:-1
+mora,100,118,4	shop	Tool Dealer#mora	4_M_RAFLE_OLD,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1
+mora,138,110,4	shop	Mora Chef	4_F_RAFLE_PK,11519:-1
 
 //=======================================================
 // Mid Camp
 //=======================================================
-mid_camp,129,284,4	shop	Trap Specialist#mid	66,7940:-1,12341:-1
-mid_camp,184,263,4	shop	Black Marketeer#mid	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+mid_camp,129,284,4	shop	Trap Specialist#mid	1_F_01,7940:-1,12341:-1
+mid_camp,184,263,4	shop	Black Marketeer#mid	1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
 
 //=======================================================
 // Payon
 //=======================================================
-payon,123,109,4	shop	Trap Specialist#pay	66,7940:-1,12341:-1
+payon,123,109,4	shop	Trap Specialist#pay	1_F_01,7940:-1,12341:-1
 
 //=======================================================
 // Port Malaya
 //=======================================================
-ma_in01,73,22,3	shop	Weapon Dealer#ma	536,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-ma_in01,22,23,3	shop	Tool Dealer#ma	536,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
-malaya,150,261,3	shop	Fruit Gardener#ma	535,512:-1,513:-1,515:-1,516:-1,535:-1
-ma_in01,67,13,5	shop	Armor Dealer#ma	536,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+ma_in01,73,22,3	shop	Weapon Dealer#ma	4_M_DEWMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+ma_in01,22,23,3	shop	Tool Dealer#ma	4_M_DEWMAN,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
+malaya,150,261,3	shop	Fruit Gardener#ma	4_M_DEWOLDWOMAN,512:-1,513:-1,515:-1,516:-1,535:-1
+ma_in01,67,13,5	shop	Armor Dealer#ma	4_M_DEWMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
 
 //=======================================================
 // Prontera
 //=======================================================
-//prontera,104,88,5	shop	Stuff Gimme	880,616:-1
-prt_in,109,68,4	shop	Trap Specialist#prt	66,7940:-1,12341:-1
-prt_in,175,137,4	shop	Black Marketeer#prt	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,17,110,1	shop	Part-Timer#sc_prt	67,6123:-1,6120:-1
+//prontera,104,88,5	shop	Stuff Gimme	4_M_MASKMAN,616:-1
+prt_in,109,68,4	shop	Trap Specialist#prt	1_F_01,7940:-1,12341:-1
+prt_in,175,137,4	shop	Black Marketeer#prt	1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,17,110,1	shop	Part-Timer#sc_prt	1_F_02,6123:-1,6120:-1
 
 //=======================================================
 // Rachel
 //=======================================================
-ra_in01,263,281,4	shop	Trap Specialist#ra	66,7940:-1,12341:-1
-ra_in01,257,266,4	shop	Black Marketeer#ra	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,137,60,3	shop	Part-Timer#sc_ra	70,6123:-1,6120:-1
+ra_in01,263,281,4	shop	Trap Specialist#ra	1_F_01,7940:-1,12341:-1
+ra_in01,257,266,4	shop	Black Marketeer#ra	1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,137,60,3	shop	Part-Timer#sc_ra	1_F_GYPSY,6123:-1,6120:-1
diff --git a/npc/re/merchants/ticket_refiner.txt b/npc/re/merchants/ticket_refiner.txt
new file mode 100644
index 000000000..d5d4dd59f
--- /dev/null
+++ b/npc/re/merchants/ticket_refiner.txt
@@ -0,0 +1,160 @@
+//===== Hercules Script ======================================
+//= Ticket Refiner
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Refiner that uses +5~9/+11 refine tickets to refine
+//= equipment with no chance of failure.
+//= NOTE: This NPC is currently disabled on official servers.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+prontera,184,177,6	script	Refine Master	4_M_REPAIR,{
+	disable_items;
+	if (countitem(6238) || countitem(6228) || countitem(6229) || countitem(6230) || countitem(6231) || countitem(6456))
+		set .@bWeaponUp,1;
+	if (countitem(6239) || countitem(6232) || countitem(6233) || countitem(6234) || countitem(6235) || countitem(6457))
+		set .@bArmorUp,1;
+	if (!.@bWeaponUp && !.@bArmorUp) {
+		mes "[Refine Master]";
+		mes "Hello!";
+		mes "What's up?";
+		mes "I'm a specialist";
+		mes "for refining items,";
+		mes "but I don't work anymore.";
+		next;
+		switch(select("I'll go on my way.:Hmm... this makes me curious.")) {
+		case 1:
+			mes "[Refine Master]";
+			mes "Take care, adventurer.";
+			close;
+		case 2:
+			mes "[Refine Master]";
+			mes "Actully, I sometimes provide refine services for adventurers with a ^006400Refine Ticket^000000...";
+			mes "Bye bye~!";
+			close;
+		}
+	}
+	emotion e_gasp;
+	mes "[Refine Master]";
+	mes "Greetings!";
+	mes "I can refine an item up to the ^006400same level as your ticket^000000.";
+	mes "You don't have to worry! There's no chance of breaking your item.";
+	next;
+	if(select("I'll come back later.:Refine item with ticket.") == 1) {
+		mes "[Refine Master]";
+		mes "Okay.";
+		mes "You can come again later.";
+		close;
+	}
+	mes "[Refine Master]";
+	mes "Which equipment would you like to refine?";
+	next;
+	setarray .@position$[1],"Head upper","Armor","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head middle","Head lower";
+	set .@menu$,"";
+	for(set .@i,1; .@i<=10; set .@i,.@i+1)
+		set .@menu$, .@menu$+((getequipisequiped(.@i))?getequipname(.@i):.@position$[.@i]+"- [Empty]")+":";
+	set .@part, select(.@menu$);
+	if (!getequipisequiped(.@part)) {
+		mes "[Refine Master]";
+		mes "You have to equip the item you want to refine.";
+		close;
+	}
+	if (!getequipisenableref(.@part)) {
+		emotion e_otl;
+		mes "[Refine Master]";
+		mes "Oh, I'm sorry.";
+		mes "This item is impossible to refine.";
+		close;
+	}
+	switch(getequipweaponlv(.@part)) {
+	default:
+	case 0:
+		setarray .@tickets[0],6457,6235,6234,6233,6232,6239;
+		setarray .@levels[0],5,6,7,8,9,11;
+		set .@type$,"Armor";
+		set .@check,.@bArmorUp;
+		break;
+	case 1:
+	case 2:
+	case 3:
+	case 4:
+		setarray .@tickets[0],6456,6231,6230,6229,6228,6238;
+		setarray .@levels[0],5,6,7,8,9,11;
+		set .@type$,"Weapon";
+		set .@check,.@bWeaponUp;
+		break;
+	}
+	if (!.@check) {
+		emotion e_dots;
+		mes "[Refine Master]";
+		mes "If you want to refine this ^006400"+.@type$+"^000000, please come along with ^006400"+.@type$+" Refine Ticket^000000.";
+		mes "See you later!";
+		close;
+	}
+	mes "[Refine Master]";
+	mes "Please choose which ^006400"+.@type$+" Refine Ticket^000000 you want to use.";
+	next;
+	set .@menu$,"";
+	for(set .@i,0; .@i<getarraysize(.@tickets); set .@i,.@i+1)
+		set .@menu$, .@menu$+getitemname(.@tickets[.@i])+":";
+	set .@select, select(.@menu$)-1;
+	set .@ticket_lv, .@levels[.@select];
+	set .@ticket_id, .@tickets[.@select];
+	if (countitem(.@ticket_id) == 0) {
+		emotion e_what;
+		mes "[Refine Master]";
+		mes getitemname(.@ticket_id)+" is not in your inventory. Did you put it in your storage?";
+		mes "Please check again.";
+		mes "See you later!";
+		close;
+	}
+	if (getequiprefinerycnt(.@part) >= .@ticket_lv) {
+		emotion e_swt2;
+		mes "[Refine Master]";
+		mes "^8B4513This item is already refined as much as your deed.^000000";
+		mes "Please come along with an item refined less than your ticket.";
+		close;
+	}
+	mes "[Refine Master]";
+	mes "I'm going to refine ^006400"+getequipname(.@part)+"^8B4513 up to the +"+.@ticket_lv+" level^000000 with ^006400"+getitemname(.@ticket_id)+"^000000.";
+	mes "May I proceed?";
+	next;
+	if(select("No.:Yes.") == 1) {
+		emotion e_dots;
+		mes "[Refine Master]";
+		mes "Oh, you changed your mind.";
+		mes "Ok.";
+		mes "You can come back later.";
+		close;
+	}
+	mes "[Refine Master]";
+	mes "Great.";
+	mes "As you wish!";
+	mes "I have my own special way to refine...";
+	mes ".......ka boom!";
+	specialeffect EF_SUI_EXPLOSION;
+	if (countitem(.@ticket_id))
+		delitem .@ticket_id,1;
+	else {
+		next;
+		mes "Error!";
+		mes "Please report this.";
+		close;
+	}
+	for(set .@i,getequiprefinerycnt(.@part); .@i<.@ticket_lv; set .@i,.@i+1)
+		successrefitem .@part;
+	next;
+	emotion e_ho;
+	mes "[Refine Master]";
+	mes "Alright, here it is~";
+	mes "Well, ^0000FF"+strcharinfo(0)+"^000000!";
+	mes "Congratulations on your shining "+.@type$+".";
+	mes "You look GREAT!";
+	mes "Farewell~!";
+	close;
+}
diff --git a/npc/re/mobs/citycleaners.txt b/npc/re/mobs/citycleaners.txt
new file mode 100644
index 000000000..279f81a36
--- /dev/null
+++ b/npc/re/mobs/citycleaners.txt
@@ -0,0 +1,29 @@
+//===== Hercules Script ======================================
+//= City Cleaners Monster Spawn Script
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Spawns monsters to clean up cities.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal spawns.
+//============================================================
+
+//==================================================
+// Wild Rose City Spawns
+//==================================================
+brasilis,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+dewata,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+malaya,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+izlude_a,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+izlude_b,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+izlude_c,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+izlude_d,0,0,0,0	monster	Wild Rose	1261,1,7200000,3600000,0
+
+//==================================================
+// Thief Bug Egg City Spawns
+//==================================================
+payon_in02,23,68,5,5	monster	Thief Bug Egg	1048,7,1200000,600000,0
+jawaii_in,73,117,4,4	monster	Thief Bug Egg	1048,1,5400000,3000000,0
+jawaii_in,83,117,5,5	monster	Thief Bug Egg	1048,1,4800000,2400000,0
diff --git a/npc/re/mobs/dungeons/alde_dun.txt b/npc/re/mobs/dungeons/alde_dun.txt
index 5f1570b49..56ed111e7 100644
--- a/npc/re/mobs/dungeons/alde_dun.txt
+++ b/npc/re/mobs/dungeons/alde_dun.txt
@@ -11,13 +11,13 @@
 //============================================================
 
 //==================================================
-// alde_dun01 - Clock Tower B1f 
+// alde_dun01 - Clock Tower B1f
 //==================================================
 alde_dun01,0,0,0,0	monster	Arclouze	1194,50,5000,0,0
 alde_dun01,0,0,0,0	monster	Drainliar	1111,40,5000,0,0
 
 //==================================================
-// alde_dun02 - Clock Tower B2f 
+// alde_dun02 - Clock Tower B2f
 //==================================================
 alde_dun02,0,0,0,0	monster	High Orc	1213,50,5000,0,0
 alde_dun02,0,0,0,0	monster	Brilight	1211,20,5000,0,0
@@ -25,7 +25,7 @@ alde_dun02,0,0,0,0	monster	Arclouze	1194,20,5000,0,0
 alde_dun02,0,0,0,0	monster	Orc Archer	1189,20,5000,0,0
 
 //==================================================
-// alde_dun03 - Clock Tower B3f 
+// alde_dun03 - Clock Tower B3f
 //==================================================
 alde_dun03,0,0,0,0	monster	Penomena	1216,85,5000,0,0
 alde_dun03,0,0,0,0	monster	Cramp	1209,56,5000,0,0
diff --git a/npc/re/mobs/dungeons/beach_dun.txt b/npc/re/mobs/dungeons/beach_dun.txt
index 658444a76..0e4d2ee26 100644
--- a/npc/re/mobs/dungeons/beach_dun.txt
+++ b/npc/re/mobs/dungeons/beach_dun.txt
@@ -12,7 +12,7 @@
 //============================================================
 
 //==================================================
-// beach_dun - Karu, the West cave 
+// beach_dun - Karu, the West cave
 //==================================================
 beach_dun,0,0,0,0	monster	Medusa	1148,60,5000,0,0
 beach_dun,0,0,0,0	monster	Nereid	1255,20,5000,0,0
@@ -21,7 +21,7 @@ beach_dun,0,0,0,0	monster	Merman	1264,3,5000,0,0
 beach_dun,0,0,0,0	boss_monster	Tao Gunka	1583,1,18000000,600000,0
 
 //==================================================
-// beach_dun2 - Ruande the northern cave 
+// beach_dun2 - Ruande the northern cave
 //==================================================
 beach_dun2,0,0,0,0	monster	Stalactic Golem	1278,65,5000,0,0
 beach_dun2,0,0,0,0	monster	Tri Joint	1279,20,5000,0,0
@@ -30,7 +30,7 @@ beach_dun2,0,0,0,0	monster	Hydra	1068,10,5000,0,0
 beach_dun2,0,0,0,0	monster	Nereid	1255,3,5000,0,0
 
 //==================================================
-// beach_dun3 - Mao, the East Cave 
+// beach_dun3 - Mao, the East Cave
 //==================================================
 beach_dun3,0,0,0,0	monster	Thara Frog	1034,50,5000,0,0
 beach_dun3,0,0,0,0	monster	Megalodon	1064,30,5000,0,0
diff --git a/npc/re/mobs/dungeons/dew_dun.txt b/npc/re/mobs/dungeons/dew_dun.txt
index 1080a1cf1..8d71f6387 100644
--- a/npc/re/mobs/dungeons/dew_dun.txt
+++ b/npc/re/mobs/dungeons/dew_dun.txt
@@ -3,27 +3,26 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.1
 //===== Description: =========================================
 //= Official kRO monster spawns
 //===== Additional Comments: =================================
 //= 1.0 First Release
+//= 1.1 Updated spawn delays. [Euphy]
 //============================================================
 
 //==================================================
 // dew_dun01 - Volcanic Island of Krakatoa
 //==================================================
-dew_dun01,0,0,0,0	monster	Ancient Worm	1305,25,0,0,0
-dew_dun01,0,0,0,0	monster	Gullinbursti	1311,10,0,0,0
-dew_dun01,0,0,0,0	monster	Comodo	2152,70,0,0,0
-dew_dun01,0,0,0,0	boss_monster	Leak	2156,1,7200000,600000,1
+dew_dun01,0,0,0,0	monster	Comodo	2152,70,5000,0,0
+dew_dun01,0,0,0,0	monster	Ancient Worm	1305,25,5000,0,0
+dew_dun01,0,0,0,0	monster	Gullinbursti	1311,10,5000,0,0
+dew_dun01,0,0,0,0	boss_monster	Leak	2156,1,7200000,0,0
 
 //==================================================
 // dew_dun02 - Tina Grace Cave
 //==================================================
-dew_dun02,0,0,0,0	monster	Am Mut	1301,20,0,0,0
-dew_dun02,0,0,0,0	monster	Gajomart	1309,30,0,0,0
-dew_dun02,0,0,0,0	monster	Banaspaty	2154,50,0,0,0
-dew_dun02,0,0,0,0	monster	Butoijo	2155,30,0,0,0
+dew_dun02,0,0,0,0	monster	Banaspaty	2154,50,5000,0,0
+dew_dun02,0,0,0,0	monster	Gajomart	1309,30,5000,0,0
+dew_dun02,0,0,0,0	monster	Am Mut	1301,20,5000,0,0
+dew_dun02,0,0,0,0	monster	Butoijo	2155,30,5000,0,0
diff --git a/npc/re/mobs/dungeons/dic_dun.txt b/npc/re/mobs/dungeons/dic_dun.txt
index f173fec0e..2f1bf3997 100644
--- a/npc/re/mobs/dungeons/dic_dun.txt
+++ b/npc/re/mobs/dungeons/dic_dun.txt
@@ -3,42 +3,41 @@
 //===== By: ==================================================
 //= Kisuka
 //===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2
 //===== Description: =========================================
 //= Official monster spawns in El Dicastes Dungeon.
 //===== Additional Comments: =================================
 //= 1.0 Official spawns from Aegis [Kisuka]
 //= 1.1 Added Nightmare Scaraba Hole [Chilly]
+//= 1.2 Updated Nightmare spawns and names. [Euphy]
 //============================================================
 
 //==================================================
 // dic_dun01 - Underground Passage Kamidal Tunnel
 //==================================================
-dic_dun01,0,0,0,0	monster	One-Horned Scarab	2083,50,5000,0,0
-dic_dun01,0,0,0,0	monster	Two-Horned Scarab	2084,45,5000,0,0
-dic_dun01,0,0,0,0	monster	Scarab Egg	2088,15,5000,0,0
-dic_dun01,0,0,0,0	monster	Scarab Egg	2089,15,5000,0,0
+dic_dun01,0,0,0,0	monster	One-Horned Scaraba	2083,50,5000,0,0
+dic_dun01,0,0,0,0	monster	Two-Horned Scaraba	2084,45,5000,0,0
+dic_dun01,0,0,0,0	monster	Scaraba Egg	2088,15,5000,0,0
+dic_dun01,0,0,0,0	monster	Scaraba Egg	2089,15,5000,0,0
 
 //==================================================
-// dic_dun02 - Underground Nest Scarab Hole
+// dic_dun02 - Underground Nest Scaraba Hole
 //==================================================
-dic_dun02,0,0,0,0	monster	Antler Scarab	2085,50,5000,0,0
-dic_dun02,0,0,0,0	monster	Rake Scarab	2086,45,5000,0,0
-dic_dun02,0,0,0,0	monster	Antler Scarab Egg	2090,15,5000,0,0
-dic_dun02,0,0,0,0	monster	Rake Scarab Egg	2091,15,5000,0,0
-dic_dun02,0,0,0,0	boss_monster	Scarab Queen	2087,1,7200000,0,0
+dic_dun02,0,0,0,0	monster	Antler Scaraba	2085,50,5000,0,0
+dic_dun02,0,0,0,0	monster	Rake Scaraba	2086,45,5000,0,0
+dic_dun02,0,0,0,0	monster	Antler Scaraba Egg	2090,15,5000,0,0
+dic_dun02,0,0,0,0	monster	Rake Scaraba Egg	2091,15,5000,0,0
+dic_dun02,0,0,0,0	boss_monster	Scaraba Queen	2087,1,7200000,0,0
 
 //==================================================
 // dic_dun03 - Nightmare Scaraba Hole
 //==================================================
-dic_dun03,0,0,0,0	monster	Gold One-Horn Scaraba	2161,50,0,0,0
-dic_dun03,0,0,0,0	monster	Gold Two-Horn Scaraba	2162,45,0,0,0
-dic_dun03,0,0,0,0	monster	Gold Antler Scaraba	2163,50,0,0,0
-dic_dun03,0,0,0,0	monster	Gold Rake Scaraba	2164,45,0,0,0
-dic_dun03,0,0,0,0	monster	Gold One-Horn Scaraba Egg	2166,15,0,0,0
-dic_dun03,0,0,0,0	monster	Gold Two-Horn Scaraba Egg	2167,15,0,0,0
-dic_dun03,0,0,0,0	monster	Gold Antler Scaraba Egg	2168,15,0,0,0
-dic_dun03,0,0,0,0	monster	Gold Rake Scaraba Egg	2169,15,0,0,0
-dic_dun03,0,0,0,0	boss_monster	Gold Queen Scaraba	2165,1,7200000,600000,1
+dic_dun03,0,0,0,0	monster	Gold One-Horn Scaraba Egg	2166,10,5000,0,0
+dic_dun03,0,0,0,0	monster	Gold Two-Horn Scaraba Egg	2167,10,5000,0,0
+dic_dun03,0,0,0,0	monster	Gold Antler Scaraba Egg	2168,10,5000,0,0
+dic_dun03,0,0,0,0	monster	Gold Rake Scaraba Egg	2169,10,5000,0,0
+dic_dun03,0,0,0,0	monster	Gold One-Horn Scaraba	2161,30,5000,0,0
+dic_dun03,0,0,0,0	monster	Gold Two-Horn Scaraba	2162,30,5000,0,0
+dic_dun03,0,0,0,0	monster	Gold Antler Scaraba	2163,40,5000,0,0
+dic_dun03,0,0,0,0	monster	Gold Rake Scaraba	2164,40,5000,0,0
+dic_dun03,0,0,0,0	boss_monster	Gold Queen Scaraba	2165,1,7200000,0,0
diff --git a/npc/re/mobs/dungeons/ecl_tdun.txt b/npc/re/mobs/dungeons/ecl_tdun.txt
new file mode 100644
index 000000000..0bfd17e0f
--- /dev/null
+++ b/npc/re/mobs/dungeons/ecl_tdun.txt
@@ -0,0 +1,37 @@
+//===== Hercules Script ======================================
+//= Bifrost Tower Monster Spawn Script
+//===== By: ==================================================
+//= refis
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= jRO monster spawns, taken from Auriga.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+//==================================================
+// ecl_tdun01 - Bifrost Tower F1
+//==================================================
+ecl_tdun01.gat,0,0,0,0	monster	Cenere	2365,5,5000,0,0
+ecl_tdun01.gat,0,0,0,0	monster	Antique Book	2366,5,5000,0,0
+ecl_tdun01.gat,0,0,0,0	monster	Blue Lichtern	2367,5,5000,0,0
+
+//==================================================
+// ecl_tdun02 - Bifrost Tower F2
+//==================================================
+ecl_tdun02.gat,0,0,0,0	monster	Cenere	2365,10,5000,0,0
+ecl_tdun02.gat,0,0,0,0	monster	Antique Book	2366,10,5000,0,0
+ecl_tdun02.gat,0,0,0,0	monster	Blue Lichtern	2367,15,5000,0,0
+ecl_tdun02.gat,0,0,0,0	monster	Yellow Lichtern	2368,5,5000,0,0
+
+//==================================================
+// ecl_tdun03 - Bifrost Tower F3
+//==================================================
+ecl_tdun03.gat,0,0,0,0	monster	Cenere	2365,15,5000,0,0
+ecl_tdun03.gat,0,0,0,0	monster	Antique Book	2366,15,5000,0,0
+ecl_tdun03.gat,0,0,0,0	monster	Blue Lichtern	2367,5,5000,0,0
+ecl_tdun03.gat,0,0,0,0	monster	Yellow Lichtern	2368,15,5000,0,0
+ecl_tdun03.gat,0,0,0,0	monster	Red Lichtern	2369,10,5000,0,0
+ecl_tdun03.gat,0,0,0,0	monster	Green Lichtern	2370,15,5000,0,0
+ecl_tdun03.gat,0,0,0,0	monster	Faithful Manager	2371,5,5000,0,0
diff --git a/npc/re/mobs/dungeons/ein_dun.txt b/npc/re/mobs/dungeons/ein_dun.txt
index 3efcd52f6..53d78feff 100644
--- a/npc/re/mobs/dungeons/ein_dun.txt
+++ b/npc/re/mobs/dungeons/ein_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 spawn N and spawn delays aren't yet correct, so I set
 //=     respawn delays quite big for now [Lupus]
diff --git a/npc/re/mobs/dungeons/gef_dun.txt b/npc/re/mobs/dungeons/gef_dun.txt
index d6da72c1c..32967e494 100644
--- a/npc/re/mobs/dungeons/gef_dun.txt
+++ b/npc/re/mobs/dungeons/gef_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 More accurate spawns [Playtester]
diff --git a/npc/re/mobs/dungeons/glastheim.txt b/npc/re/mobs/dungeons/glastheim.txt
index d23154de2..fa746ef29 100644
--- a/npc/re/mobs/dungeons/glastheim.txt
+++ b/npc/re/mobs/dungeons/glastheim.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 [Lupus]
 //= 1.2 Updated to ep 8.5 aegis spawns [MasterOfMuppets]
@@ -37,7 +35,7 @@ gl_cas01,0,0,0,0	monster	Owl Baron	1295,6,5000,0,0
 gl_cas01,0,0,0,0	monster	Alice	1275,1,5000,0,0
 
 //==================================================
-// gl_cas02 - Glast Heim 2f 
+// gl_cas02 - Glast Heim 2f
 //==================================================
 gl_cas02,0,0,0,0	monster	Wanderer	1208,41,5000,0,0
 gl_cas02,0,0,0,0	monster	Raydric	1163,36,5000,0,0
diff --git a/npc/re/mobs/dungeons/gld_dunSE.txt b/npc/re/mobs/dungeons/gld_dunSE.txt
index 52d5bd0e5..568f34ea8 100644
--- a/npc/re/mobs/dungeons/gld_dunSE.txt
+++ b/npc/re/mobs/dungeons/gld_dunSE.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 First version
 //= 1.1 Updated spawns to official. [L0ne_W0lf]
@@ -23,7 +21,7 @@ schg_dun01,0,0,0,0	monster	Cobalt Mineral	1976,15,5000,0,0
 // arug_dun01 - Subterranean Guild Dungeon
 //==================================================
 arug_dun01,0,0,0,0	monster	Banshee Master	1974,22,0,0,0
-arug_dun01,0,0,0,0	monster	Beholder master	1975,22,5000,0,0
+arug_dun01,0,0,0,0	monster	Beholder Master	1975,22,5000,0,0
 arug_dun01,0,0,0,0	monster	Aunoe	1796,22,5000,0,0
 arug_dun01,0,0,0,0	monster	Necromancer	1870,18,0,0,0
 arug_dun01,0,0,0,0	monster	Fanat	1797,5,5000,0,0
diff --git a/npc/re/mobs/dungeons/gld_re.txt b/npc/re/mobs/dungeons/gld_re.txt
index 1280755a7..eff4e892c 100644
--- a/npc/re/mobs/dungeons/gld_re.txt
+++ b/npc/re/mobs/dungeons/gld_re.txt
@@ -4,8 +4,6 @@
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 First version, Hall of Abyss update. [Euphy]
 //============================================================
@@ -16,17 +14,17 @@
 gld_dun01,0,0,0,0	monster	Gullinbursti	1311,30,5000,0,0
 gld_dun01,0,0,0,0	monster	Leib Olmai	1306,55,5000,0,0
 gld_dun01,0,0,0,0	monster	Cat O' Nine Tails	1307,3,1200000,0,0
-gld_dun01,0,0,0,0	boss_monster	Moonlight Flower	1150,1,28800000,600000,1
+gld_dun01,0,0,0,0	boss_monster	Moonlight Flower	1150,1,28800000,600000,1,1
 
 gld_dun01_2,0,0,0,0	monster	Skeleton General	1290,50,5000,0,0
 gld_dun01_2,0,0,0,0	monster	Am Mut	1301,15,5000,0,0
 gld_dun01_2,0,0,0,0	monster	Gajomart	1309,20,5000,0,0
-gld_dun01_2,0,0,0,0	boss_monster	Eddga	1115,1,28800000,600000,1
+gld_dun01_2,0,0,0,0	boss_monster	Eddga	1115,1,28800000,600000,1,1
 
 gld2_pay,0,0,0,0	monster	Skeleton General	1290,60,5000,0,0
 gld2_pay,0,0,0,0	monster	Am Mut	1301,25,5000,0,0
 gld2_pay,0,0,0,0	monster	Gajomart	1309,30,5000,0,0
-gld2_pay,0,0,0,0	boss_monster	General Daehyun	2253,1,28800000,600000,1
+gld2_pay,0,0,0,0	boss_monster	General Daehyun	2253,1,28800000,600000,1,1
 gld2_pay,0,0,0,0	monster	Samurai Soheon	2254,1,1800000,600000,1
 
 //==================================================
@@ -35,17 +33,17 @@ gld2_pay,0,0,0,0	monster	Samurai Soheon	2254,1,1800000,600000,1
 gld_dun02,0,0,0,0	monster	Giant Hornet	1303,30,5000,0,0
 gld_dun02,0,0,0,0	monster	Ancient Worm	1305,25,5000,0,0
 gld_dun02,0,0,0,0	monster	Giant Spider	1304,15,5000,0,0
-gld_dun02,0,0,0,0	boss_monster	Mistress	1059,1,28800000,600000,1
+gld_dun02,0,0,0,0	boss_monster	Mistress	1059,1,28800000,600000,1,1
 
 gld_dun02_2,0,0,0,0	monster	Killer Mantis	1294,30,5000,0,0
 gld_dun02_2,0,0,0,0	monster	Angra Mantis	2133,40,5000,0,0
-gld_dun02_2,0,0,0,0	monster	Maya Purple	1289,3,1200000,600000,0
-gld_dun02_2,0,0,0,0	boss_monster	Maya	1147,1,28800000,600000,1
+gld_dun02_2,0,0,0,0	monster	Maya Purple	1289,3,1200000,0,0
+gld_dun02_2,0,0,0,0	boss_monster	Maya	1147,1,28800000,600000,1,1
 
 gld2_ald,0,0,0,0	monster	Killer Mantis	1294,60,5000,0,0
 gld2_ald,0,0,0,0	monster	Angra Mantis	2133,70,5000,0,0
-gld2_ald,0,0,0,0	monster	Maya Purple	1289,3,1200000,0,0
-gld2_ald,0,0,0,0	boss_monster	Gioia	2251,1,28800000,600000,1
+gld2_ald,0,0,0,0	monster	Maya Purple	1289,3,1200000,600000,0
+gld2_ald,0,0,0,0	boss_monster	Gioia	2251,1,28800000,600000,1,1
 gld2_ald,0,0,0,0	monster	Elvira	2252,1,1800000,600000,1
 
 //==================================================
@@ -53,20 +51,20 @@ gld2_ald,0,0,0,0	monster	Elvira	2252,1,1800000,600000,1
 //==================================================
 gld_dun03,0,0,0,0	monster	Caterpillar	1300,35,5000,0,0
 gld_dun03,0,0,0,0	monster	Creamy Fear	1293,35,5000,0,0
-gld_dun03,0,0,0,0	boss_monster	Baphomet	1039,1,28800000,600000,1
+gld_dun03,0,0,0,0	boss_monster	Baphomet	1039,1,28800000,600000,1,1
 
 gld_dun03_2,0,0,0,0	monster	Dark Axe Kobold	2284,13,5000,0,0
 gld_dun03_2,0,0,0,0	monster	Dark Hammer Kobold	2285,23,5000,0,0
 gld_dun03_2,0,0,0,0	monster	Dark Mace Kobold	2286,23,5000,0,0
 gld_dun03_2,0,0,0,0	monster	Dark Kobold Archer	2287,23,5000,0,0
 gld_dun03_2,0,0,0,0	monster	Kobold Leader	1296,1,14400000,7200000,1
-gld_dun03_2,0,0,0,0	boss_monster	Atroce	1785,1,28800000,600000,1
+gld_dun03_2,0,0,0,0	boss_monster	Atroce	1785,1,28800000,600000,1,1
 
 gld2_prt,0,0,0,0	monster	Dark Axe Kobold	2284,25,5000,0,0
 gld2_prt,0,0,0,0	monster	Dark Hammer Kobold	2285,35,5000,0,0
 gld2_prt,0,0,0,0	monster	Dark Mace Kobold	2286,35,5000,0,0
 gld2_prt,0,0,0,0	monster	Dark Kobold Archer	2287,35,5000,0,0
-gld2_prt,0,0,0,0	boss_monster	Angry Student Pyuriel	2249,1,28800000,600000,1
+gld2_prt,0,0,0,0	boss_monster	Pyuriel	2249,1,28800000,600000,1,1
 gld2_prt,0,0,0,0	monster	Warrior Laura	2250,1,1800000,600000,1
 
 //==================================================
@@ -76,19 +74,19 @@ gld_dun04,0,0,0,0	monster	Mini Demon	1292,10,5000,0,0
 gld_dun04,0,0,0,0	monster	Zombie Master	1298,55,5000,0,0
 gld_dun04,0,0,0,0	monster	Wraith Dead	1291,25,5000,0,0
 gld_dun04,0,0,0,0	monster	Ghostring	1120,1,14400000,7200000,1
-gld_dun04,0,0,0,0	boss_monster	Doppelganger	1046,1,28800000,600000,1
+gld_dun04,0,0,0,0	boss_monster	Doppelganger	1046,1,28800000,600000,1,1
 
 gld_dun04_2,0,0,0,0	monster	Dark Frame	2282,15,5000,0,0
 gld_dun04_2,0,0,0,0	monster	Dark Priest	2283,15,5000,0,0
 gld_dun04_2,0,0,0,0	monster	Dark Shadow	2281,45,5000,0,0
 gld_dun04_2,0,0,0,0	monster	Dark Illusion	1302,1,1200000,0,0
-gld_dun04_2,0,0,0,0	boss_monster	Dark Lord	1272,1,28800000,600000,1
+gld_dun04_2,0,0,0,0	boss_monster	Dark Lord	1272,1,28800000,600000,1,1
 
 gld2_gef,0,0,0,0	monster	Dark Frame	2282,20,5000,0,0
 gld2_gef,0,0,0,0	monster	Dark Priest	2283,20,5000,0,0
 gld2_gef,0,0,0,0	monster	Dark Shadow	2281,80,5000,0,0
 gld2_gef,0,0,0,0	monster	Dark Illusion	1302,1,1200000,0,0
-gld2_gef,0,0,0,0	boss_monster	Dark Guardian Kades	2255,1,28800000,600000,1
+gld2_gef,0,0,0,0	boss_monster	Dead Guardian Kades	2255,1,28800000,600000,1,1
 gld2_gef,0,0,0,0	monster	Rudo	2256,1,1800000,600000,1
 
 //==================================================
diff --git a/npc/re/mobs/dungeons/gon_dun.txt b/npc/re/mobs/dungeons/gon_dun.txt
index 19e7ee3db..51b61ba6c 100644
--- a/npc/re/mobs/dungeons/gon_dun.txt
+++ b/npc/re/mobs/dungeons/gon_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
diff --git a/npc/re/mobs/dungeons/ice_dun.txt b/npc/re/mobs/dungeons/ice_dun.txt
index 11513ecd5..e6cefbf1c 100644
--- a/npc/re/mobs/dungeons/ice_dun.txt
+++ b/npc/re/mobs/dungeons/ice_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 First version from jAthena [Playtester]
 //= 1.1 More accurate spawns [Playtester]
diff --git a/npc/re/mobs/dungeons/in_sphinx.txt b/npc/re/mobs/dungeons/in_sphinx.txt
index c93a13cdc..50db8fdf6 100644
--- a/npc/re/mobs/dungeons/in_sphinx.txt
+++ b/npc/re/mobs/dungeons/in_sphinx.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Replaced Marduk with Anubis on F4 and F5 [Playtester]
diff --git a/npc/re/mobs/dungeons/iz_dun.txt b/npc/re/mobs/dungeons/iz_dun.txt
index 8d4fad684..849e424bd 100644
--- a/npc/re/mobs/dungeons/iz_dun.txt
+++ b/npc/re/mobs/dungeons/iz_dun.txt
@@ -3,13 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.4
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns for 1-4 [Playtester]
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Added Izlude Dungeon F6 spawns [Chilly]
+//= 1.4 Official F6 spawns.
 //============================================================
 
 //==================================================
@@ -112,8 +111,8 @@ iz_dun04,33,115,0,0	monster	Hydra	1068,1,321000,150000,0
 //==================================================
 // iz_dun05 - Undersea Tunnel F6
 //==================================================
-iz_dun05,0,0,0,0	monster	King Dramoh	2198,20,0,0,0
-iz_dun05,0,0,0,0	monster	Sropho	2201,50,0,0,0
-iz_dun05,0,0,0,0	monster	Pot Dofle	2203,30,0,0,0
-iz_dun05,0,0,0,0	monster	Sedora	2204,50,0,0,0
-iz_dun05,0,0,0,0	boss_monster	Kraken	2202,1,7200000,600000,1
+iz_dun05,0,0,0,0	monster	Sropho	2201,50,5000,0,0
+iz_dun05,0,0,0,0	monster	Sedora	2204,60,5000,0,0
+iz_dun05,0,0,0,0	monster	Pot Dofle	2203,30,5000,0,0
+iz_dun05,0,0,0,0	monster	King Dramoh	2198,25,5000,0,0
+iz_dun05,0,0,0,0	boss_monster	Kraken	2202,1,7200000,1800000,0
diff --git a/npc/re/mobs/dungeons/kh_dun.txt b/npc/re/mobs/dungeons/kh_dun.txt
index a882550c8..4e9d1fbf7 100644
--- a/npc/re/mobs/dungeons/kh_dun.txt
+++ b/npc/re/mobs/dungeons/kh_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 First version [MasterOfMuppets]
 //= 1.1 Added official mob types [Playtester]
@@ -14,7 +12,7 @@
 //============================================================
 
 //==================================================
-// kh_dun01 - Robot Factory level 1 
+// kh_dun01 - Robot Factory level 1
 //==================================================
 kh_dun01,0,0,0,0	monster	Aliza	1737,45,5000,0,0
 kh_dun01,0,0,0,0	monster	Alice	1275,25,5000,0,0
@@ -34,7 +32,7 @@ kh_dun02,0,0,0,0	monster	Constant	1745,5,5000,0,0
 kh_dun02,0,0,0,0	boss_monster	Kiel D-01	1734,1,7200000,600000,0
 
 //==================================================
-// kh_kiehl01 - Kiehl's Room 
+// kh_kiehl01 - Kiehl's Room
 //==================================================
 kh_kiehl01,0,0,0,0	monster	Constant	1745,10,5000,0,0
 kh_kiehl01,67,171,5,5	monster	Aliot	1740,1,180000,120000,0
diff --git a/npc/re/mobs/dungeons/lhz_dun.txt b/npc/re/mobs/dungeons/lhz_dun.txt
index d723a8d67..8da7874bf 100644
--- a/npc/re/mobs/dungeons/lhz_dun.txt
+++ b/npc/re/mobs/dungeons/lhz_dun.txt
@@ -6,13 +6,13 @@
 //= 1.9
 //===== Additional Comments: =================================
 //= 08/24/05 : Added 1st version. [Muad_Dib]
-//= 1.1: Some corrections to level 1, 2 as pointed out by
-//=      MasterofMuppets. [Skotlex]
-//= 1.3: Some fixes based on kRO's "RO Map" [Poki#3]
-//=	 I also made the place more Moby ^^
-//= 1.4: Adjusted spawns according to own info from iRO [MasterOfMuppets]
-//= 1.5: More accurate spawn numbers and iRO names thanks to Tharis [Playtester]
-//= 1.6: Official X.3 spawns [Playtester]
+//= 1.1 Some corrections to level 1, 2 as pointed out by
+//=     MasterofMuppets. [Skotlex]
+//= 1.3 Some fixes based on kRO's "RO Map" [Poki#3]
+//=     I also made the place more Moby ^^
+//= 1.4 Adjusted spawns according to own info from iRO [MasterOfMuppets]
+//= 1.5 More accurate spawn numbers and iRO names thanks to Tharis [Playtester]
+//= 1.6 Official X.3 spawns [Playtester]
 //= 1.7 Corrected MVP spawn function to be standard to iRO. [L0ne_W0lf]
 //=	- A random 99 will now be spawned when the MVP spawns.
 //=	- Spare spawn and MVP spawn now spawn in official locations.
@@ -106,20 +106,20 @@ OnMy99Dead:
 //========================================================================================
 // lhz_dun04 - Bio-life Labs 4F
 //========================================================================================
-lhz_dun04,0,0,0,0	monster	Randel	2221,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Flamel	2222,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Celia	2223,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Chen	2224,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Gertie	2225,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Alphoccio	2226,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Trentini	2227,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Paladin Randel	2228,1,2700000,2400000,1
-lhz_dun04,0,0,0,0	monster	Creator Flamel	2229,1,3000000,2700000,1
-lhz_dun04,0,0,0,0	monster	Professor Celia	2230,1,2580000,2340000,1
-lhz_dun04,0,0,0,0	monster	Champion Chen	2231,1,2700000,2500000,1
+lhz_dun04,0,0,0,0	monster	Randel	2221,42,5000,0,0
+lhz_dun04,0,0,0,0	monster	Flamel	2222,42,5000,0,0
+lhz_dun04,0,0,0,0	monster	Celia	2223,81,5000,0,0
+lhz_dun04,0,0,0,0	monster	Chen	2224,42,5000,0,0
+lhz_dun04,0,0,0,0	monster	Gertie	2225,57,5000,0,0
+lhz_dun04,0,0,0,0	monster	Alphoccio	2226,42,5000,0,0
+lhz_dun04,0,0,0,0	monster	Trentini	2227,42,5000,0,0
+lhz_dun04,0,0,0,0	monster	Paladin Randel	2228,1,3300000,3000000,1
+lhz_dun04,0,0,0,0	monster	Creator Flamel	2229,1,3300000,3000000,1
+lhz_dun04,0,0,0,0	monster	Professor Celia	2230,1,3300000,3000000,1
+lhz_dun04,0,0,0,0	monster	Champion Chen	2231,1,3300000,3000000,1
 lhz_dun04,0,0,0,0	monster	Stalker Gertie	2232,1,3300000,3000000,1
-lhz_dun04,0,0,0,0	monster	Clown Alphoccio	2233,1,2580000,2460000,1
-lhz_dun04,0,0,0,0	monster	Gypsy Trentini	2234,1,2580000,2460000,1
+lhz_dun04,0,0,0,0	monster	Clown Alphoccio	2233,1,3300000,3000000,1
+lhz_dun04,0,0,0,0	monster	Gypsy Trentini	2234,1,3300000,3000000,1
 
 lhz_dun04,0,0,0	script	mvp_lhz_dun04	-1,{
 OnTimer6000000: // delay1 = 6000000 ms (100 min)
diff --git a/npc/re/mobs/dungeons/lou_dun.txt b/npc/re/mobs/dungeons/lou_dun.txt
index f5e276757..6f50cebad 100644
--- a/npc/re/mobs/dungeons/lou_dun.txt
+++ b/npc/re/mobs/dungeons/lou_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 Updated by MasterOfMuppets
 //= 1.2 Added Bacsojin and Chung E [MasterOfMuppets]
@@ -13,7 +11,7 @@
 //============================================================
 
 //==================================================
-// lou_dun01 - The Royal Tomb 
+// lou_dun01 - The Royal Tomb
 //==================================================
 lou_dun01,0,0,0,0	monster	Jing Guai	1517,45,5000,0,0
 lou_dun01,0,0,0,0	monster	Grizzly	1381,15,5000,0,0
@@ -33,7 +31,7 @@ lou_dun02,0,0,0,0	monster	Mimic	1191,5,5000,0,0
 lou_dun02,0,0,0,0	monster	Zhu Po Long	1514,5,5000,0,0
 
 //==================================================
-// lou_dun03 - Suei Long Gon 
+// lou_dun03 - Suei Long Gon
 //==================================================
 lou_dun03,0,0,0,0	monster	Zhu Po Long	1514,25,5000,0,0
 lou_dun03,0,0,0,0	monster	Yao Jun	1512,25,5000,0,0
diff --git a/npc/re/mobs/dungeons/ma_dun.txt b/npc/re/mobs/dungeons/ma_dun.txt
index f7028e579..3e0a54b35 100644
--- a/npc/re/mobs/dungeons/ma_dun.txt
+++ b/npc/re/mobs/dungeons/ma_dun.txt
@@ -4,8 +4,6 @@
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Official kRO monster spawns
 //===== Additional Comments: =================================
@@ -15,6 +13,6 @@
 //==================================================
 // ma_dun01 - Bangungot Hospital F1
 //==================================================
-ma_dun01,0,0,0,0	monster	Manananggal	2311,70,0,0,0
-ma_dun01,0,0,0,0	monster	Wakwak	2315,50,0,0,0
-ma_dun01,0,0,0,0	monster	Tiyanak	2314,30,0,0,0
+ma_dun01,0,0,0,0	monster	Manananggal	2311,40,5000,0,0
+ma_dun01,0,0,0,0	monster	Wakwak	2315,30,5000,0,0
+ma_dun01,0,0,0,0	monster	Tiyanak	2314,40,5000,0,0
diff --git a/npc/re/mobs/dungeons/mag_dun.txt b/npc/re/mobs/dungeons/mag_dun.txt
index 562633a5d..d5321ea6c 100644
--- a/npc/re/mobs/dungeons/mag_dun.txt
+++ b/npc/re/mobs/dungeons/mag_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 fixed 2,3,4 tabs instead of 1... and wrong mob names [Lupus]
 //= 1.2 Official jRO 10.3 spawns [Playtester]
diff --git a/npc/re/mobs/dungeons/mal_dun.txt b/npc/re/mobs/dungeons/mal_dun.txt
index 9bcfc8132..40a8255cf 100644
--- a/npc/re/mobs/dungeons/mal_dun.txt
+++ b/npc/re/mobs/dungeons/mal_dun.txt
@@ -3,14 +3,13 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2
 //===== Description: =========================================
 //= Official kRO monster spawns
 //===== Additional Comments: =================================
 //= 1.0 First Release
 //= 1.1 Updated to official script. [Euphy]
+//= 1.2 Added Pouring spawn, source iRO. [Euphy]
 //============================================================
 
 //==================================================
diff --git a/npc/re/mobs/dungeons/mjo_dun.txt b/npc/re/mobs/dungeons/mjo_dun.txt
index 4e100d161..0204a2da7 100644
--- a/npc/re/mobs/dungeons/mjo_dun.txt
+++ b/npc/re/mobs/dungeons/mjo_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //============================================================
diff --git a/npc/re/mobs/dungeons/moc_pryd.txt b/npc/re/mobs/dungeons/moc_pryd.txt
index dcd5197f1..62085e8e1 100644
--- a/npc/re/mobs/dungeons/moc_pryd.txt
+++ b/npc/re/mobs/dungeons/moc_pryd.txt
@@ -1,25 +1,24 @@
 //===== Hercules Script ======================================
-//= Morocc Pryamid Dungeon Monster Spawn Script
+//= Morocc Pyramid Dungeon Monster Spawn Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.4
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.4 Added Nightmare spawns. [Euphy]
 //============================================================
 
 //==================================================
-// moc_pryd01 - Inside Pyramid
+// moc_pryd01 - Inside Pyramid F1
 //==================================================
 moc_pryd01,0,0,0,0	monster	Familiar	1005,50,5000,0,0
 moc_pryd01,0,0,0,0	monster	Poporing	1031,20,5000,0,0
 
 //==================================================
-// moc_pryd02 - Inside Pyramid
+// moc_pryd02 - Inside Pyramid F2
 //==================================================
 moc_pryd02,0,0,0,0	monster	Mummy	1041,30,5000,0,0
 moc_pryd02,0,0,0,0	monster	Soldier Skeleton	1028,30,5000,0,0
@@ -29,7 +28,7 @@ moc_pryd02,0,0,0,0	monster	Poporing	1031,20,5000,0,0
 moc_pryd02,0,0,0,0	monster	Isis	1029,5,5000,0,0
 
 //==================================================
-// moc_pryd03 - Inside Pyramid
+// moc_pryd03 - Inside Pyramid F3
 //==================================================
 moc_pryd03,0,0,0,0	monster	Mummy	1041,70,5000,0,0
 moc_pryd03,0,0,0,0	monster	Verit	1032,20,5000,0,0
@@ -38,7 +37,7 @@ moc_pryd03,0,0,0,0	monster	Drainliar	1111,5,5000,0,0
 moc_pryd03,0,0,0,0	monster	Mimic	1191,5,5000,0,0
 
 //==================================================
-// moc_pryd04 - Inside Pyramid
+// moc_pryd04 - Inside Pyramid F4
 //==================================================
 moc_pryd04,0,0,0,0	monster	Isis	1029,50,5000,0,0
 moc_pryd04,0,0,0,0	monster	Mummy	1041,25,5000,0,0
@@ -48,17 +47,33 @@ moc_pryd04,0,0,0,0	monster	Ancient Mummy	1297,3,5000,0,0
 moc_pryd04,0,0,0,0	boss_monster	Osiris	1038,1,3600000,600000,0
 
 //==================================================
-// moc_pryd05 - Inside Pyramid
+// moc_pryd05 - Inside Pyramid B1
 //==================================================
 moc_pryd05,0,0,0,0	monster	Minorous	1149,60,5000,0,0
 moc_pryd05,0,0,0,0	monster	Verit	1032,50,5000,0,0
 moc_pryd05,0,0,0,0	monster	Mummy	1041,10,5000,0,0
 
 //==================================================
-// moc_pryd06 - Inside Pyramid
+// moc_pryd06 - Inside Pyramid B2
 //==================================================
 moc_pryd06,0,0,0,0	monster	Mimic	1191,30,5000,0,0
 moc_pryd06,0,0,0,0	monster	Verit	1032,30,5000,0,0
 moc_pryd06,0,0,0,0	monster	Arclouze	1194,20,5000,0,0
 moc_pryd06,0,0,0,0	monster	Ancient Mummy	1297,20,5000,0,0
 moc_pryd06,102,85,1,1	boss_monster	Amon Ra	1511,1,3600000,600000,0
+
+//==================================================
+// moc_prydn1 - Nightmare Mode B1
+//==================================================
+moc_prydn1,0,0,0,0	monster	Nightmare Minorous	2353,60,5000,0,0
+moc_prydn1,0,0,0,0	monster	Nightmare Mummy	2354,10,5000,0,0
+moc_prydn1,0,0,0,0	monster	Nightmare Verit	2355,50,5000,0,0
+
+//==================================================
+// moc_prydn2 - Nightmare Mode B2
+//==================================================
+moc_prydn2,0,0,0,0	monster	Nightmare Mimic	2356,30,5000,0,0
+moc_prydn2,0,0,0,0	monster	Nightmare Verit	2355,30,5000,0,0
+moc_prydn2,0,0,0,0	monster	Nightmare Arclouze	2358,20,5000,0,0
+moc_prydn2,0,0,0,0	monster	Nightmare Ancient Mummy	2360,20,5000,0,0
+moc_prydn2,102,85,1,1	boss_monster	Nightmare Amon Ra	2362,1,3600000,600000,0
diff --git a/npc/re/mobs/dungeons/mosk_dun.txt b/npc/re/mobs/dungeons/mosk_dun.txt
index 64dbc9245..9049a88b8 100644
--- a/npc/re/mobs/dungeons/mosk_dun.txt
+++ b/npc/re/mobs/dungeons/mosk_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 Added spawns [Playtester]
 //= 1.1 Swapped named according to mob db. [L0ne_W0lf]
diff --git a/npc/re/mobs/dungeons/nyd_dun.txt b/npc/re/mobs/dungeons/nyd_dun.txt
index 7b8dbd156..7244bc7bd 100644
--- a/npc/re/mobs/dungeons/nyd_dun.txt
+++ b/npc/re/mobs/dungeons/nyd_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 First version
 //============================================================
diff --git a/npc/re/mobs/dungeons/odin.txt b/npc/re/mobs/dungeons/odin.txt
index cf9f046bb..372ab2f57 100644
--- a/npc/re/mobs/dungeons/odin.txt
+++ b/npc/re/mobs/dungeons/odin.txt
@@ -4,8 +4,6 @@
 //= Poki#3 (0.1)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.1 More accurate spawns [Playtester]
diff --git a/npc/re/mobs/dungeons/orcsdun.txt b/npc/re/mobs/dungeons/orcsdun.txt
index 6c0ecee54..6a368305e 100644
--- a/npc/re/mobs/dungeons/orcsdun.txt
+++ b/npc/re/mobs/dungeons/orcsdun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //============================================================
diff --git a/npc/re/mobs/dungeons/pay_dun.txt b/npc/re/mobs/dungeons/pay_dun.txt
index 83639ca2c..a4c1efba8 100644
--- a/npc/re/mobs/dungeons/pay_dun.txt
+++ b/npc/re/mobs/dungeons/pay_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Small spawn update [Playtester]
diff --git a/npc/re/mobs/dungeons/prt_maze.txt b/npc/re/mobs/dungeons/prt_maze.txt
index 6feea8a0a..0cfb71665 100644
--- a/npc/re/mobs/dungeons/prt_maze.txt
+++ b/npc/re/mobs/dungeons/prt_maze.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Some small fixes [Playtester]
diff --git a/npc/re/mobs/dungeons/prt_sew.txt b/npc/re/mobs/dungeons/prt_sew.txt
index 6fd21922d..0ec2fe5dd 100644
--- a/npc/re/mobs/dungeons/prt_sew.txt
+++ b/npc/re/mobs/dungeons/prt_sew.txt
@@ -4,15 +4,13 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
 //============================================================
 
 //==================================================
-// prt_sewb1 - Prontera Culvert 
+// prt_sewb1 - Prontera Culvert
 //==================================================
 prt_sewb1,0,0,0,0	monster	Thief Bug	1051,30,5000,0,0
 prt_sewb1,0,0,0,0	monster	Thief Bug Egg	1048,80,5000,0,0
diff --git a/npc/re/mobs/dungeons/ra_san.txt b/npc/re/mobs/dungeons/ra_san.txt
index b5f764b70..eea77aa0f 100644
--- a/npc/re/mobs/dungeons/ra_san.txt
+++ b/npc/re/mobs/dungeons/ra_san.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 First version with guessed amounts [Playtester]
 //= 1.1 More accurate spawns [Playtester]
@@ -22,7 +20,7 @@ ra_san01,0,0,0,0	monster	Beholder	1633,6,5000,0,0
 ra_san01,0,0,0,0	monster	Hodremlin	1773,6,5000,0,0
 
 //==================================================
-// ra_san02 - Holy Ground 
+// ra_san02 - Holy Ground
 //==================================================
 ra_san02,0,0,0,0	monster	Isilla	1772,85,5000,0,0
 ra_san02,0,0,0,0	monster	Vanberk	1771,30,5000,0,0
diff --git a/npc/re/mobs/dungeons/tha_t.txt b/npc/re/mobs/dungeons/tha_t.txt
index 789a71cdd..efa7cca38 100644
--- a/npc/re/mobs/dungeons/tha_t.txt
+++ b/npc/re/mobs/dungeons/tha_t.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 Real spawns by Poki#3 [Nexon]
 //= 1.1 More official spawns [Playtester]
@@ -87,7 +85,7 @@ tha_t06,0,0,0,0	monster	Plasma	1694,10,5000,0,0
 tha_t06,0,0,0,0	monster	Maero of Thanatos	1706,2,5000,0,0
 
 //==================================================
-// tha_t07 - Thanatos Tower - Upper Level 
+// tha_t07 - Thanatos Tower - Upper Level
 //==================================================
 tha_t07,0,0,0,0	monster	Baroness of Retribution	1702,15,5000,0,0
 tha_t07,0,0,0,0	monster	Death Word	1698,10,5000,0,0
diff --git a/npc/re/mobs/dungeons/thor_v.txt b/npc/re/mobs/dungeons/thor_v.txt
index 2d3867f5b..b882c1b0a 100644
--- a/npc/re/mobs/dungeons/thor_v.txt
+++ b/npc/re/mobs/dungeons/thor_v.txt
@@ -4,8 +4,6 @@
 //= Playtester
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Official monster spawn in Thor Volcano Dungeon.
 //===== Additional Comments: =================================
diff --git a/npc/re/mobs/dungeons/treasure.txt b/npc/re/mobs/dungeons/treasure.txt
index 25d8caf60..b18d5fd62 100644
--- a/npc/re/mobs/dungeons/treasure.txt
+++ b/npc/re/mobs/dungeons/treasure.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
diff --git a/npc/re/mobs/dungeons/tur_dun.txt b/npc/re/mobs/dungeons/tur_dun.txt
index a73fc3d1b..6acbee74d 100644
--- a/npc/re/mobs/dungeons/tur_dun.txt
+++ b/npc/re/mobs/dungeons/tur_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //============================================================
diff --git a/npc/re/mobs/dungeons/xmas_dun.txt b/npc/re/mobs/dungeons/xmas_dun.txt
index f3c6d8859..0d4374f8f 100644
--- a/npc/re/mobs/dungeons/xmas_dun.txt
+++ b/npc/re/mobs/dungeons/xmas_dun.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.1 added Garm Baby according to May 10 patch
 //= 1.2 Official kRO 10.1 spawns [Playtester]
diff --git a/npc/re/mobs/dungeons/yggdrasil.txt b/npc/re/mobs/dungeons/yggdrasil.txt
index 9fb13a6b6..939933aeb 100644
--- a/npc/re/mobs/dungeons/yggdrasil.txt
+++ b/npc/re/mobs/dungeons/yggdrasil.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Additional Comments: =================================
 //= 1.0 Splitted from Nifflheim fields [DracoRPG]
 //= 1.1 Official kRO 10.1 spawns [Playtester]
diff --git a/npc/re/mobs/fields/amatsu.txt b/npc/re/mobs/fields/amatsu.txt
index 86e96f337..e6285ff6f 100644
--- a/npc/re/mobs/fields/amatsu.txt
+++ b/npc/re/mobs/fields/amatsu.txt
@@ -14,7 +14,7 @@
 //==================================================
 // ama_fild01 - Amatsu Field
 //==================================================
-ama_fild01,0,0,0,0	monster	Bigfoot	1060,15,5000,0,0
+ama_fild01,0,0,0,0	monster	Bigfoot	1060,10,5000,0,0
 ama_fild01,0,0,0,0	monster	Karakasa	1400,50,5000,0,0
 ama_fild01,0,0,0,0	monster	Kapha	1406,40,5000,0,0
 ama_fild01,0,0,0,0	monster	Miyabi Doll	1404,2,5000,0,0
@@ -32,4 +32,4 @@ ama_fild01,171,313,0,0	monster	Hydra	1068,1,66000,33000,0
 ama_fild01,171,314,0,0	monster	Hydra	1068,1,69000,34500,0
 ama_fild01,171,315,0,0	monster	Hydra	1068,1,69000,34500,0
 ama_fild01,175,314,0,0	monster	Hydra	1068,1,72000,39000,0
-ama_fild01,169,315,0,0	monster	Hydra	1068,1,72000,39000,0
\ No newline at end of file
+ama_fild01,169,315,0,0	monster	Hydra	1068,1,72000,39000,0
diff --git a/npc/re/mobs/fields/bifrost.txt b/npc/re/mobs/fields/bifrost.txt
index 04667acb0..93f5a26e3 100644
--- a/npc/re/mobs/fields/bifrost.txt
+++ b/npc/re/mobs/fields/bifrost.txt
@@ -8,102 +8,25 @@
 //= Official kRO monster spawns
 //===== Additional Comments: =================================
 //= 1.0 First Release
-//= 1.1 Added more accurate 1@mist monsters
-//= 1.2 Renewal spawn update. [Euphy]
+//= 1.1 Renewal spawn update. [Euphy]
 //============================================================
 
 //==================================================
 // bif_fild01 - Bifrost South
 //==================================================
-bif_fild01,0,0,0,0	monster	Luciola Vespa	1994,29,5000,0,0
-bif_fild01,0,0,0,0	monster	Cornus	1992,17,5000,0,0
-bif_fild01,0,0,0,0	monster	Miming	2137,58,5000,0,0
-bif_fild01,0,0,0,0	monster	Little Fatum	2136,34,5000,0,0
+bif_fild01,0,0,0,0	monster	Luciola Vespa	1994,25,5000,0,0
+bif_fild01,0,0,0,0	monster	Cornus	1992,15,5000,0,0
+bif_fild01,0,0,0,0	monster	Miming	2137,50,5000,0,0
+bif_fild01,0,0,0,0	monster	Little Fatum	2136,30,5000,0,0
 bif_fild01,0,0,0,0	monster	Angra Mantis	2133,5,5000,0,0
 bif_fild01,0,0,0,0	monster	Pom Spider	2132,5,5000,0,0
 
 //==================================================
 // bif_fild02 - Bifrost North
 //==================================================
-bif_fild02,0,0,0,0	monster	Luciola Vespa	1994,27,5000,0,0
-bif_fild02,0,0,0,0	monster	Cornus	1992,16,5000,0,0
-bif_fild02,0,0,0,0	monster	Miming	2137,33,5000,0,0
-bif_fild02,0,0,0,0	monster	Little Fatum	2136,55,5000,0,0
+bif_fild02,0,0,0,0	monster	Luciola Vespa	1994,25,5000,0,0
+bif_fild02,0,0,0,0	monster	Cornus	1992,15,5000,0,0
+bif_fild02,0,0,0,0	monster	Miming	2137,30,5000,0,0
+bif_fild02,0,0,0,0	monster	Little Fatum	2136,50,5000,0,0
 bif_fild02,0,0,0,0	monster	Angra Mantis	2133,5,5000,0,0
 bif_fild02,0,0,0,0	monster	Pom Spider	2132,5,5000,0,0
-
-//==================================================
-// 1@mist - Forest Maze of Mists
-//==================================================
-1@mist,247,124,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,247,124,0,0	monster	Nydhoggur Memory	2138,1,1200000,600000,0
-1@mist,247,124,0,0	monster	Nydhoggur Memory	2139,1,1200000,600000,0
-1@mist,225,98,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,225,98,0,0	monster	Nydhoggur Memory	2138,1,1200000,600000,0
-1@mist,225,98,0,0	monster	Nydhoggur Memory	2139,1,1200000,600000,0
-1@mist,159,184,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,159,184,0,0	monster	Nydhoggur Memory	2138,1,1200000,600000,0
-1@mist,159,184,0,0	monster	Nydhoggur Memory	2139,1,1200000,600000,0
-1@mist,61,39,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,61,39,0,0	monster	Nydhoggur Memory	2138,1,1200000,600000,0
-1@mist,61,39,0,0	monster	Nydhoggur Memory	2139,1,1200000,600000,0
-1@mist,254,151,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,254,151,0,0	monster	Nydhoggur Memory	2138,1,1200000,600000,0
-1@mist,254,151,0,0	monster	Nydhoggur Memory	2139,1,1200000,600000,0
-1@mist,230,179,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,230,179,0,0	monster	Nydhoggur Memory	2140,1,1200000,600000,0
-1@mist,230,179,0,0	monster	Nydhoggur Memory	2141,1,1200000,600000,0
-1@mist,285,225,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,285,225,0,0	monster	Nydhoggur Memory	2140,1,1200000,600000,0
-1@mist,285,225,0,0	monster	Nydhoggur Memory	2141,1,1200000,600000,0
-1@mist,161,316,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,161,316,0,0	monster	Nydhoggur Memory	2140,1,1200000,600000,0
-1@mist,161,316,0,0	monster	Nydhoggur Memory	2141,1,1200000,600000,0
-1@mist,230,324,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,230,324,0,0	monster	Nydhoggur Memory	2140,1,1200000,600000,0
-1@mist,230,324,0,0	monster	Nydhoggur Memory	2141,1,1200000,600000,0
-1@mist,206,200,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,206,200,0,0	monster	Nydhoggur Memory	2140,1,1200000,600000,0
-1@mist,206,200,0,0	monster	Nydhoggur Memory	2141,1,1200000,600000,0
-1@mist,221,236,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,221,236,0,0	monster	Nydhoggur Memory	2142,1,1200000,600000,0
-1@mist,221,236,0,0	monster	Nydhoggur Memory	2143,1,1200000,600000,0
-1@mist,204,299,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,204,299,0,0	monster	Nydhoggur Memory	2142,1,1200000,600000,0
-1@mist,204,299,0,0	monster	Nydhoggur Memory	2143,1,1200000,600000,0
-1@mist,84,273,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,84,273,0,0	monster	Nydhoggur Memory	2142,1,1200000,600000,0
-1@mist,84,273,0,0	monster	Nydhoggur Memory	2143,1,1200000,600000,0
-1@mist,95,287,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,95,287,0,0	monster	Nydhoggur Memory	2142,1,1200000,600000,0
-1@mist,95,287,0,0	monster	Nydhoggur Memory	2143,1,1200000,600000,0
-1@mist,324,325,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,324,325,0,0	monster	Nydhoggur Memory	2142,1,1200000,600000,0
-1@mist,324,325,0,0	monster	Nydhoggur Memory	2143,1,1200000,600000,0
-1@mist,280,343,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,280,343,0,0	monster	Nydhoggur Memory	2142,1,1200000,600000,0
-1@mist,280,343,0,0	monster	Nydhoggur Memory	2143,1,1200000,600000,0
-1@mist,345,186,0,0	monster	Creeper	2135,1,1200000,600000,0
-1@mist,345,186,0,0	monster	Nydhoggur Memory	2142,1,1200000,600000,0
-1@mist,345,186,0,0	monster	Nydhoggur Memory	2143,1,1200000,600000,0
-1@mist,105,105,85,85	monster	Pom Spider	2132,8,1200000,600000,0
-1@mist,105,105,85,85	monster	Angra Mantis	2133,8,1200000,600000,0
-1@mist,105,105,85,85	monster	Parus	2134,8,1200000,600000,0
-1@mist,105,105,85,85	monster	Little Fatum	2136,8,1200000,600000,0
-1@mist,105,105,85,85	monster	Miming	2137,5,1200000,600000,0
-1@mist,105,275,85,85	monster	Pom Spider	2132,10,1200000,600000,0
-1@mist,105,275,85,85	monster	Angra Mantis	2133,10,1200000,600000,0
-1@mist,105,275,85,85	monster	Parus	2134,10,1200000,600000,0
-1@mist,105,275,85,85	monster	Little Fatum	2136,8,1200000,600000,0
-1@mist,105,275,85,85	monster	Miming	2137,5,1200000,600000,0
-1@mist,275,105,85,85	monster	Pom Spider	2132,12,1200000,600000,0
-1@mist,275,105,85,85	monster	Angra Mantis	2133,12,1200000,600000,0
-1@mist,275,105,85,85	monster	Parus	2134,10,1200000,600000,0
-1@mist,275,105,85,85	monster	Little Fatum	2136,8,1200000,600000,0
-1@mist,275,105,85,85	monster	Miming	2137,5,1200000,600000,0
-1@mist,275,275,85,85	monster	Pom Spider	2132,15,1200000,600000,0
-1@mist,275,275,85,85	monster	Angra Mantis	2133,15,1200000,600000,0
-1@mist,275,275,85,85	monster	Parus	2134,10,1200000,600000,0
-1@mist,275,275,85,85	monster	Little Fatum	2136,8,1200000,600000,0
-1@mist,275,275,85,85	monster	Miming	2137,5,1200000,600000,0
-1@mist,325,210,25,150	boss_monster	Lost Dragon	2131,1,1,7200000,600000,1
diff --git a/npc/re/mobs/fields/comodo.txt b/npc/re/mobs/fields/comodo.txt
index ae4ddedeb..d2d4ef236 100644
--- a/npc/re/mobs/fields/comodo.txt
+++ b/npc/re/mobs/fields/comodo.txt
@@ -55,10 +55,6 @@ cmd_fild04,0,0,0,0	monster	Aster	1266,10,5000,0,0
 //==================================================
 // cmd_fild05 - Disabled on Renewal
 //==================================================
-//cmd_fild05,63,158,10,10	monster	Shining Plant	1083,1,1800000,900000,1
-//cmd_fild05,318,277,10,10	monster	Yellow Plant	1081,3,1800000,900000,1
-//cmd_fild05,282,49,20,20	monster	Yellow Plant	1081,3,1800000,900000,1
-//cmd_fild05,0,0,0,0	monster	Green Plant	1080,5,1800000,900000,1
 
 //==================================================
 // cmd_fild06 - Fortress Saint Darmain (West)
@@ -69,7 +65,7 @@ cmd_fild06,293,235,5,5	monster	Yellow Plant	1081,2,1800000,900000,1
 cmd_fild06,84,375,10,10	monster	Yellow Plant	1081,3,1800000,900000,1
 
 //==================================================
-// cmd_fild07 - Beacon Island, Pharos 
+// cmd_fild07 - Beacon Island, Pharos
 //==================================================
 cmd_fild07,0,0,0,0	monster	Raggler	1254,100,5000,0,0
 cmd_fild07,0,0,0,0	monster	Aster	1266,30,5000,0,0
@@ -94,4 +90,4 @@ cmd_fild09,0,0,0,0	monster	Metaller	1058,145,5000,0,0
 cmd_fild09,0,0,0,0	monster	Deniro	1105,15,5000,0,0
 cmd_fild09,0,0,0,0	monster	Piere	1160,15,5000,0,0
 cmd_fild09,0,0,0,0	monster	Andre	1095,15,5000,0,0
-cmd_fild09,0,0,0,0	monster	Ant Egg	1097,10,5000,0,0
\ No newline at end of file
+cmd_fild09,0,0,0,0	monster	Ant Egg	1097,10,5000,0,0
diff --git a/npc/re/mobs/fields/dewata.txt b/npc/re/mobs/fields/dewata.txt
index 58118c4dc..9cb15466c 100644
--- a/npc/re/mobs/fields/dewata.txt
+++ b/npc/re/mobs/fields/dewata.txt
@@ -3,16 +3,17 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Description: =========================================
 //= Official kRO monster spawns
 //===== Additional Comments: =================================
 //= 1.0 First Release
+//= 1.1 Updated spawn delays. [Euphy]
 //============================================================
 
 //==================================================
 // dew_fild01 - Dewata Field Tribal Village
 //==================================================
-dew_fild01,0,0,0,0	monster	Argiope	1099,45,0,0,0
-dew_fild01,0,0,0,0	monster	Alnoldi	2151,60,0,0,0
-dew_fild01,0,0,0,0	monster	Cendrawasih	2153,10,0,0,0
+dew_fild01,0,0,0,0	monster	Alnoldi	2151,60,5000,0,0
+dew_fild01,0,0,0,0	monster	Argiope	1099,45,5000,0,0
+dew_fild01,0,0,0,0	monster	Cendrawasih	2153,10,5000,0,0
diff --git a/npc/re/mobs/fields/eclage.txt b/npc/re/mobs/fields/eclage.txt
new file mode 100644
index 000000000..76c53be2b
--- /dev/null
+++ b/npc/re/mobs/fields/eclage.txt
@@ -0,0 +1,17 @@
+//===== Hercules Script ======================================
+//= Eclage Field Monster Spawn Script
+//===== By: ==================================================
+//= refis
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= jRO monster spawns, taken from Auriga.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+//==================================================
+// ecl_fild01 - Blooming Flower Land
+//==================================================
+ecl_fild01.gat,0,0,0,0	monster	Menblatt	2363,60,5000,0,0
+ecl_fild01.gat,0,0,0,0	monster	Petal	2364,20,5000,0,0
diff --git a/npc/re/mobs/fields/einbroch.txt b/npc/re/mobs/fields/einbroch.txt
index f31395f3b..b06c25f59 100644
--- a/npc/re/mobs/fields/einbroch.txt
+++ b/npc/re/mobs/fields/einbroch.txt
@@ -6,15 +6,15 @@
 //= 1.8
 //===== Additional Comments: =================================
 //= 1.1 correct spawn maps, but not yet exact amount of
-//= monsters [Lupus]
-//= maps, marked with * are correct
+//=     monsters [Lupus]
+//=     maps, marked with * are correct
 //= 1.2 Updated to correct mobs. Many thanks to vicious_pucca
 //=    again for providing the information [MasterOfMuppets]
 //= 1.2a Fixed missing tabs [Lupus]
 //= 1.3 Updated after Episode 10.4 - Hugel [Poki#3]
-//=	Mob quantity is custom.
+//=     Mob quantity is custom.
 //= 1.3b Changed the spawn numbers a bit. [Poki#3]
-//=	Thanks to Playtester and Emperium.org
+//=     Thanks to Playtester and Emperium.org
 //= 1.4 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.5 Adjusted some spawns according to official info [Playtester]
 //= 1.6 More accurate spawns [Playtester]
@@ -104,4 +104,4 @@ ein_fild09,0,0,0,0	monster	Red Mushroom	1085,10,120000,60000,0
 //==================================================
 //ein_fild10,0,0,0,0	monster	Red Plant	1078,20,120000,60000,1
 //ein_fild10,0,0,0,0	monster	Yellow Plant	1081,20,120000,60000,1
-//ein_fild10,0,0,0,0	monster	Blue Plant	1079,20,600000,300000,1
\ No newline at end of file
+//ein_fild10,0,0,0,0	monster	Blue Plant	1079,20,600000,300000,1
diff --git a/npc/re/mobs/fields/geffen.txt b/npc/re/mobs/fields/geffen.txt
index 35ff2e814..0b1c3b3c3 100644
--- a/npc/re/mobs/fields/geffen.txt
+++ b/npc/re/mobs/fields/geffen.txt
@@ -38,8 +38,8 @@ gef_fild02,0,0,0,0	monster	Coco	1104,140,5000,0,0
 gef_fild02,0,0,0,0	monster	Poporing	1031,20,5000,0,0
 gef_fild02,0,0,0,0	monster	Horn	1128,20,5000,0,0
 gef_fild02,0,0,0,0	monster	Elder Willow	1033,20,5000,0,0
-gef_fild02,87,48,6,6	monster	Red Mushroom	1085,5,360000,180000,1
 gef_fild02,227,316,6,6	monster	Green Plant	1080,8,360000,180000,1
+gef_fild02,87,48,6,6	monster	Red Mushroom	1085,5,360000,180000,1
 gef_fild02,215,209,2,1	monster	Blue Plant	1079,2,360000,180000,1
 gef_fild02,207,214,1,1	monster	Blue Plant	1079,1,360000,180000,1
 gef_fild02,220,214,1,1	monster	Blue Plant	1079,1,360000,180000,1
@@ -197,4 +197,4 @@ gef_fild11,283,100,4,1	monster	Black Mushroom	1084,3,360000,180000,1
 
 //==================================================
 // gef_fild14 - Disabled on Renewal
-//==================================================
\ No newline at end of file
+//==================================================
diff --git a/npc/re/mobs/fields/gonryun.txt b/npc/re/mobs/fields/gonryun.txt
index 290524caa..5ffd88921 100644
--- a/npc/re/mobs/fields/gonryun.txt
+++ b/npc/re/mobs/fields/gonryun.txt
@@ -17,4 +17,4 @@ gon_fild01,0,0,0,0	monster	Dumpling Child	1409,55,5000,0,0
 gon_fild01,0,0,0,0	monster	Baby Leopard	1415,40,5000,0,0
 gon_fild01,0,0,0,0	monster	Side Winder	1037,10,5000,0,0
 gon_fild01,0,0,0,0	monster	Green Plant	1080,5,10000,0,1
-gon_fild01,0,0,0,0	monster	Shining Plant	1083,1,10000,0,1
\ No newline at end of file
+gon_fild01,0,0,0,0	monster	Shining Plant	1083,1,10000,0,1
diff --git a/npc/re/mobs/fields/hugel.txt b/npc/re/mobs/fields/hugel.txt
index 852d35e4e..893de3d71 100644
--- a/npc/re/mobs/fields/hugel.txt
+++ b/npc/re/mobs/fields/hugel.txt
@@ -8,9 +8,9 @@
 //= Spawns for hu_fild05 and hu_fild04, numbers may not be correct [MasterOfMuppets]
 //= 0.2 Fixed Petit ID
 //= 0.3 Updated the spawns using kRO's website as info,  [MasterOfMuppets]
-//= 	thanks to battousai90
+//=     thanks to battousai90
 //= 0.4 Updated after Episode 10.4 - Hugel [Poki#3]
-//=	Mob quantity is custom.
+//=     Mob quantity is custom.
 //= 1.0 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.1 Official X.3 spawns [Playtester]
 //= 1.2 Some 11.1 spawn updates [Playtester]
@@ -71,4 +71,4 @@ hu_fild06,234,251,14,120	monster	Yellow Plant	1081,10,600000,0,1
 //==================================================
 // hu_fild07 - Disabled on Renewal
 //==================================================
-//hu_fild07,0,0,0,0	monster	Yellow Plant	1081,20,10000,0,1
\ No newline at end of file
+//hu_fild07,0,0,0,0	monster	Yellow Plant	1081,20,10000,0,1
diff --git a/npc/re/mobs/fields/lighthalzen.txt b/npc/re/mobs/fields/lighthalzen.txt
index 92cbad659..fd083f1e4 100644
--- a/npc/re/mobs/fields/lighthalzen.txt
+++ b/npc/re/mobs/fields/lighthalzen.txt
@@ -8,7 +8,7 @@
 //= 1.0 by Muad_Dib (Prometheus Project)
 //= 1.1 Added Porcellio by MasterOfMuppets
 //= 1.2 Corrected monsters. Many thanks to vicious_pucca for
-//=	the information [MasterOfMuppets]
+//=     the information [MasterOfMuppets]
 //= 1.3 Updated acordingly to Episode 10.4 [Poki#3]
 //= 1.4 Fully updated X.4 spawns [Playtester]
 //= 1.5 More accurate spawns [Playtester]
@@ -45,4 +45,4 @@ lhz_fild03,0,0,0,0	monster	Rafflesia	1162,20,5000,0,0
 lhz_fild03,0,0,0,0	monster	Metaling	1613,20,5000,0,0
 lhz_fild03,0,0,0,0	monster	Demon Pungus	1378,15,5000,0,0
 lhz_fild03,0,0,0,0	monster	Red Plant	1078,10,60000,30000,1
-lhz_fild03,0,0,0,0	monster	Green Plant	1080,10,60000,30000,0
\ No newline at end of file
+lhz_fild03,0,0,0,0	monster	Green Plant	1080,10,60000,30000,0
diff --git a/npc/re/mobs/fields/louyang.txt b/npc/re/mobs/fields/louyang.txt
index 586b49960..6654d835a 100644
--- a/npc/re/mobs/fields/louyang.txt
+++ b/npc/re/mobs/fields/louyang.txt
@@ -18,4 +18,4 @@ lou_fild01,0,0,0,0	monster	Mi Gao	1516,40,5000,0,0
 lou_fild01,0,0,0,0	monster	Mantis	1139,19,5000,0,0
 lou_fild01,0,0,0,0	monster	Geographer	1368,19,5000,0,0
 lou_fild01,0,0,0,0	monster	Black Mushroom	1084,5,5000,0,0
-lou_fild01,0,0,0,0	monster	Yellow Plant	1081,10,10000,0,1
\ No newline at end of file
+lou_fild01,0,0,0,0	monster	Yellow Plant	1081,10,10000,0,1
diff --git a/npc/re/mobs/fields/malaya.txt b/npc/re/mobs/fields/malaya.txt
index 2cf027f44..6b6bcb46d 100644
--- a/npc/re/mobs/fields/malaya.txt
+++ b/npc/re/mobs/fields/malaya.txt
@@ -13,15 +13,15 @@
 //==================================================
 // ma_fild01 - Barrio Maligawa
 //==================================================
-ma_fild01,0,0,0,0	monster	Tikbalang	2313,50,0,0,0
-ma_fild01,0,0,0,0	monster	Tiyanak	2314,40,0,0,0
-ma_fild01,0,0,0,0	monster	Jejeling	2316,20,0,0,0
+ma_fild01,0,0,0,0	monster	Tikbalang	2313,50,5000,0,0
+ma_fild01,0,0,0,0	monster	Tiyanak	2314,50,5000,0,0
+ma_fild01,0,0,0,0	monster	Jejeling	2316,30,5000,0,0
 
 //==================================================
 // ma_fild02 - Malaya Forest
 //==================================================
-ma_fild02,0,0,0,0	monster	Bungisngis	2309,40,0,0,0
-ma_fild02,0,0,0,0	monster	Engkanto	2310,15,0,0,0
-ma_fild02,0,0,0,0	monster	Mangkukulam	2312,20,0,0,0
-ma_fild02,0,0,0,0	monster	Jejeling	2316,10,0,0,0
-ma_fild02,0,0,0,0	monster	Wakwak	2315,25,0,0,0
+ma_fild02,0,0,0,0	monster	Bungisngis	2309,40,5000,0,0
+ma_fild02,0,0,0,0	monster	Engkanto	2310,25,5000,0,0
+ma_fild02,0,0,0,0	monster	Mangkukulam	2312,30,5000,0,0
+ma_fild02,0,0,0,0	monster	Jejeling	2316,20,5000,0,0
+ma_fild02,0,0,0,0	monster	Wakwak	2315,25,5000,0,0
diff --git a/npc/re/mobs/fields/manuk.txt b/npc/re/mobs/fields/manuk.txt
index e27d7f6c6..eddc7169b 100644
--- a/npc/re/mobs/fields/manuk.txt
+++ b/npc/re/mobs/fields/manuk.txt
@@ -31,4 +31,4 @@ man_fild02,0,0,0,0	monster	Tatacho	1986,25,5000,0,0
 man_fild03,0,0,0,0	monster	Hillslion	1989,25,5000,0,0
 man_fild03,0,0,0,0	monster	Tatacho	1986,25,5000,0,0
 man_fild03,0,0,0,0	monster	Centipede	1987,25,5000,0,0
-man_fild03,0,0,0,0	monster	Hardrock Mammoth	1990,1,14400000,0,0
\ No newline at end of file
+man_fild03,0,0,0,0	monster	Hardrock Mammoth	1990,1,14400000,0,0
diff --git a/npc/re/mobs/fields/mjolnir.txt b/npc/re/mobs/fields/mjolnir.txt
index 58fba9422..fddd95c6b 100644
--- a/npc/re/mobs/fields/mjolnir.txt
+++ b/npc/re/mobs/fields/mjolnir.txt
@@ -159,7 +159,7 @@ mjolnir_07,97,210,0,0	monster	Green Plant	1080,1,180000,90000,1
 mjolnir_07,249,214,0,0	monster	Blue Plant	1079,2,360000,180000,1
 
 //==================================================
-// mjolnir_08 - Mt.Mjolnir 
+// mjolnir_08 - Mt.Mjolnir
 //==================================================
 mjolnir_08,0,0,0,0	monster	Beetle King	1494,140,5000,0,0
 mjolnir_08,0,0,0,0	monster	Savage	1166,30,5000,0,0
@@ -200,7 +200,7 @@ mjolnir_10,123,331,10,10	monster	Shining Plant	1083,1,1800000,900000,1
 mjolnir_10,0,0,0,0	monster	Green Plant	1080,10,180000,90000,1
 
 //==================================================
-// mjolnir_11 - Mt.Mjolnir 
+// mjolnir_11 - Mt.Mjolnir
 //==================================================
 mjolnir_11,0,0,0,0	monster	Argiope	1099,130,5000,0,0
 mjolnir_11,0,0,0,0	monster	Argos	1100,35,5000,0,0
@@ -220,8 +220,8 @@ mjolnir_11,282,300,0,0	monster	Green Plant	1080,1,180000,90000,1
 mjolnir_11,295,271,0,0	monster	Green Plant	1080,1,180000,90000,1
 
 //==================================================
-// mjolnir_12 - Mt.Mjolnir 
+// mjolnir_12 - Mt.Mjolnir
 //==================================================
 mjolnir_12,0,0,0,0	monster	Dustiness	1114,130,5000,0,0
 mjolnir_12,0,0,0,0	monster	Hunter Fly	1035,35,5000,0,0
-mjolnir_12,0,0,0,0	monster	Mantis	1139,35,5000,0,0
\ No newline at end of file
+mjolnir_12,0,0,0,0	monster	Mantis	1139,35,5000,0,0
diff --git a/npc/re/mobs/fields/morocc.txt b/npc/re/mobs/fields/morocc.txt
index 3e71b0846..048dda6ba 100644
--- a/npc/re/mobs/fields/morocc.txt
+++ b/npc/re/mobs/fields/morocc.txt
@@ -17,7 +17,7 @@
 //============================================================
 
 //==================================================
-// moc_fild01 - Sograt Desert 
+// moc_fild01 - Sograt Desert
 //==================================================
 moc_fild01,0,0,0,0	monster	Peco Peco	1019,130,5000,0,0
 moc_fild01,0,0,0,0	monster	Muka	1055,50,5000,0,0
@@ -25,7 +25,7 @@ moc_fild01,0,0,0,0	monster	Peco Peco Egg	1047,20,5000,0,0
 moc_fild01,194,51,10,10	monster	Yellow Plant	1081,10,900000,450000,1
 
 //==================================================
-// moc_fild02 - Sograt Desert 
+// moc_fild02 - Sograt Desert
 //==================================================
 moc_fild02,0,0,0,0	monster	Muka	1055,130,5000,0,0
 moc_fild02,0,0,0,0	monster	Peco Peco	1019,60,5000,0,0
@@ -46,7 +46,7 @@ moc_fild02,353,103,0,0	monster	Green Plant	1080,1,180000,90000,1
 moc_fild02,337,35,0,0	monster	Green Plant	1080,1,180000,90000,1
 
 //==================================================
-// moc_fild03 - Sograt Desert 
+// moc_fild03 - Sograt Desert
 //==================================================
 moc_fild03,0,0,0,0	monster	Wolf	1013,140,5000,0,0
 moc_fild03,0,0,0,0	monster	Argos	1100,20,5000,0,0
@@ -72,7 +72,7 @@ moc_fild03,200,263,5,5	monster	Green Plant	1080,2,180000,90000,1
 //==================================================
 
 //==================================================
-// moc_fild07 - Sograt Desert 
+// moc_fild07 - Sograt Desert
 //==================================================
 moc_fild07,0,0,0,0	monster	Drops	1113,140,5000,0,0
 moc_fild07,0,0,0,0	monster	Chonchon	1011,30,5000,0,0
@@ -101,7 +101,7 @@ moc_fild11,0,0,0,0	monster	Condor	1009,30,5000,0,0
 moc_fild11,0,0,0,0	monster	Scorpion	1001,30,5000,0,0
 
 //==================================================
-// moc_fild12 - Sograt Desert 
+// moc_fild12 - Sograt Desert
 //==================================================
 moc_fild12,0,0,0,0	monster	Picky	1049,50,5000,0,0
 moc_fild12,0,0,0,0	monster	Picky	1050,50,5000,0,0
@@ -111,7 +111,7 @@ moc_fild12,0,0,0,0	monster	Condor	1009,30,5000,0,0
 moc_fild12,181,336,40,20	monster	Yellow Plant	1081,10,180000,90000,1
 
 //==================================================
-// moc_fild13 - Sograt Desert 
+// moc_fild13 - Sograt Desert
 //==================================================
 moc_fild13,0,0,0,0	monster	Steel Chonchon	1042,140,5000,0,0
 moc_fild13,0,0,0,0	monster	Wolf	1013,15,5000,0,0
@@ -157,7 +157,7 @@ moc_fild16,0,0,0,0	monster	Hode	1127,30,5000,0,0
 moc_fild16,0,0,0,0	monster	Frilldora	1119,10,5000,0,0
 
 //==================================================
-// moc_fild17 - Sograt Desert 
+// moc_fild17 - Sograt Desert
 //==================================================
 moc_fild17,0,0,0,0	monster	Hode	1127,130,5000,0,0
 moc_fild17,0,0,0,0	monster	Sandman	1165,30,5000,0,0
@@ -192,7 +192,7 @@ moc_fild18,325,272,0,0	monster	Yellow Plant	1081,1,180000,90000,1
 //==================================================
 
 //==================================================
-// moc_fild20 - Sograt Desert - Continental Guard Quarantine 
+// moc_fild20 - Sograt Desert - Continental Guard Quarantine
 //==================================================
 moc_fild20,0,0,0,0	monster	Incarnation of Morroc	1918,1,30000,0,0
 moc_fild20,0,0,0,0	monster	Incarnation of Morroc	1919,1,30000,0,0
@@ -200,7 +200,7 @@ moc_fild20,0,0,0,0	monster	Incarnation of Morroc	1920,1,30000,0,0
 moc_fild20,0,0,0,0	monster	Incarnation of Morroc	1921,1,30000,0,0
 
 //==================================================
-// moc_fild21 - Dimensional Gorge 
+// moc_fild21 - Dimensional Gorge
 //==================================================
 moc_fild21,0,0,0,0	monster	Incarnation of Morroc	1918,46,30000,0,0
 moc_fild21,0,0,0,0	monster	Incarnation of Morroc	1919,46,30000,0,0
@@ -208,10 +208,10 @@ moc_fild21,0,0,0,0	monster	Incarnation of Morroc	1920,46,30000,0,0
 moc_fild21,0,0,0,0	monster	Incarnation of Morroc	1921,34,30000,0,0
 
 //==================================================
-// moc_fild22 - Dimensional Gorge 
+// moc_fild22 - Dimensional Gorge
 //==================================================
 moc_fild22,0,0,0,0	monster	Incarnation of Morroc	1918,60,30000,0,0
 moc_fild22,0,0,0,0	monster	Incarnation of Morroc	1919,60,30000,0,0
 moc_fild22,0,0,0,0	monster	Incarnation of Morroc	1920,60,30000,0,0
 moc_fild22,0,0,0,0	monster	Incarnation of Morroc	1921,25,10000,0,0
-moc_fild22,0,0,0,0	boss_monster	Wounded Morroc	1917,1,43200000,600000,0
\ No newline at end of file
+moc_fild22,0,0,0,0	boss_monster	Wounded Morroc	1917,1,43200000,600000,0
diff --git a/npc/re/mobs/fields/moscovia.txt b/npc/re/mobs/fields/moscovia.txt
index 7ffbd4c28..158fb2d66 100644
--- a/npc/re/mobs/fields/moscovia.txt
+++ b/npc/re/mobs/fields/moscovia.txt
@@ -18,4 +18,4 @@ mosk_fild02,0,0,0,0	monster	Argiope	1099,30,5000,0,0
 mosk_fild02,0,0,0,0	monster	Mantis	1139,10,5000,0,0
 mosk_fild02,0,0,0,0	monster	Geographer	1368,5,5000,0,0
 mosk_fild02,0,0,0,0	monster	Yellow Plant	1081,5,10000,0,1
-mosk_fild02,0,0,0,0	monster	White Plant	1082,5,10000,0,1
\ No newline at end of file
+mosk_fild02,0,0,0,0	monster	White Plant	1082,5,10000,0,1
diff --git a/npc/re/mobs/fields/payon.txt b/npc/re/mobs/fields/payon.txt
index 9736fb31b..473bd2bfd 100644
--- a/npc/re/mobs/fields/payon.txt
+++ b/npc/re/mobs/fields/payon.txt
@@ -36,13 +36,13 @@ pay_fild01,70,246,0,0	monster	Black Mushroom	1084,1,180000,90000,1
 pay_fild01,0,0,0,0	monster	Green Plant	1080,5,180000,90000,1
 
 //==================================================
-// pay_fild02 - Payon Forest 
+// pay_fild02 - Payon Forest
 //==================================================
 pay_fild02,0,0,0,0	monster	Boa	1025,140,5000,0,0
 pay_fild02,0,0,0,0	monster	Wormtail	1024,30,5000,0,0
 pay_fild02,0,0,0,0	monster	Spore	1014,30,5000,0,0
-pay_fild02,105,256,10,10	monster	Red Mushroom	1085,4,360000,180000,1
 pay_fild02,105,256,10,10	monster	Green Plant	1080,4,360000,180000,1
+pay_fild02,105,256,10,10	monster	Red Mushroom	1085,4,360000,180000,1
 
 //==================================================
 // pay_fild03 - Payon Forest
@@ -71,8 +71,6 @@ pay_fild04,254,193,10,10	monster	Green Plant	1080,5,360000,180000,1
 //==================================================
 // pay_fild05 - Disabled on Renewal
 //==================================================
-//pay_fild05,95,147,5,5	monster	Green Plant	1080,4,900000,450000,1
-//pay_fild05,86,90,5,5	monster	Green Plant	1080,4,900000,450000,1
 
 //==================================================
 // pay_fild06 - Payon Forest
@@ -127,4 +125,4 @@ pay_fild10,66,332,10,10	monster	Blue Plant	1079,1,360000,180000,1
 
 //==================================================
 // pay_fild11 - Disabled on Renewal
-//==================================================
\ No newline at end of file
+//==================================================
diff --git a/npc/re/mobs/fields/prontera.txt b/npc/re/mobs/fields/prontera.txt
index 5eec3c925..7968cbdc0 100644
--- a/npc/re/mobs/fields/prontera.txt
+++ b/npc/re/mobs/fields/prontera.txt
@@ -13,7 +13,7 @@
 //============================================================
 
 //==================================================
-// prt_fild00 - Prontera Field 
+// prt_fild00 - Prontera Field
 //==================================================
 prt_fild00,0,0,0,0	monster	Roda Frog	1012,130,5000,0,0
 prt_fild00,0,0,0,0	monster	Ambernite	1094,50,5000,0,0
@@ -22,7 +22,7 @@ prt_fild00,227,212,0,0	monster	Shining Plant	1083,1,1800000,900000,1
 prt_fild00,285,138,10,10	monster	Green Plant	1080,5,360000,180000,1
 
 //==================================================
-// prt_fild01 - Prontera Field 
+// prt_fild01 - Prontera Field
 //==================================================
 prt_fild01,0,0,0,0	monster	Lunatic	1063,140,5000,0,0
 prt_fild01,0,0,0,0	monster	Poring	1002,30,5000,0,0
@@ -31,7 +31,7 @@ prt_fild01,199,266,3,3	monster	Green Plant	1080,3,360000,180000,1
 prt_fild01,199,266,3,3	monster	Blue Plant	1079,1,900000,450000,1
 
 //==================================================
-// prt_fild02 - Prontera Field 
+// prt_fild02 - Prontera Field
 //==================================================
 prt_fild02,0,0,0,0	monster	Stainer	1174,140,5000,0,0
 prt_fild02,0,0,0,0	monster	Creamy	1018,30,5000,0,0
@@ -41,7 +41,7 @@ prt_fild02,339,309,3,3	monster	Shining Plant	1083,1,1800000,900000,1
 prt_fild02,0,0,0,0	monster	Shining Plant	1083,2,1800000,900000,1
 
 //==================================================
-// prt_fild03 - Prontera Field 
+// prt_fild03 - Prontera Field
 //==================================================
 prt_fild03,0,0,0,0	monster	Yoyo	1057,100,5000,0,0
 prt_fild03,0,0,0,0	monster	Poporing	1031,30,5000,0,0
@@ -54,7 +54,7 @@ prt_fild03,147,219,5,5	monster	Green Plant	1080,5,360000,180000,1
 prt_fild03,148,107,5,5	monster	Green Plant	1080,5,360000,180000,1
 
 //==================================================
-// prt_fild04 - Prontera Field 
+// prt_fild04 - Prontera Field
 //==================================================
 prt_fild04,0,0,0,0	monster	Ambernite	1094,80,5000,0,0
 prt_fild04,0,0,0,0	monster	Roda Frog	1012,20,5000,0,0
@@ -62,7 +62,7 @@ prt_fild04,0,0,0,0	monster	Vocal	1088,1,1800000,1200000,0
 prt_fild04,350,114,10,10	monster	Green Plant	1080,5,900000,450000,1
 
 //==================================================
-// prt_fild05 - Prontera Field 
+// prt_fild05 - Prontera Field
 //==================================================
 prt_fild05,0,0,0,0	monster	Hornet	1004,140,5000,0,0
 prt_fild05,0,0,0,0	monster	Thief Bug Egg	1048,30,5000,0,0
@@ -71,7 +71,7 @@ prt_fild05,208,37,10,10	monster	Green Plant	1080,6,900000,450000,1
 prt_fild05,208,37,10,10	monster	Blue Plant	1079,1,900000,450000,1
 
 //==================================================
-// prt_fild06 - Prontera Field 
+// prt_fild06 - Prontera Field
 //==================================================
 prt_fild06,0,0,0,0	monster	Fabre	1007,140,5000,0,0
 prt_fild06,0,0,0,0	monster	Poring	1002,30,5000,0,0
@@ -79,7 +79,7 @@ prt_fild06,0,0,0,0	monster	Lunatic	1063,30,5000,0,0
 prt_fild06,222,30,40,10	monster	Green Plant	1080,15,900000,450000,1
 
 //==================================================
-// prt_fild07 - Prontera Field 
+// prt_fild07 - Prontera Field
 //==================================================
 prt_fild07,0,0,0,0	monster	Rocker	1052,150,5000,0,0
 prt_fild07,0,0,0,0	monster	Savage Babe	1167,50,5000,0,0
@@ -87,21 +87,37 @@ prt_fild07,0,0,0,0	monster	Vocal	1088,1,1800000,1200000,0
 prt_fild07,225,110,5,5	monster	Black Mushroom	1084,3,360000,180000,1
 
 //==================================================
-// prt_fild08 - Prontera Field 
+// prt_fild08 - Prontera Field
 //==================================================
 prt_fild08,0,0,0,0	monster	Poring	1002,140,5000,0,0
 prt_fild08,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
 prt_fild08,0,0,0,0	monster	Fabre	1007,40,5000,0,0
 
 //==================================================
-// prt_fild09 - Prontera Field 
+// prt_fild08 - Duplicates
+//==================================================
+prt_fild08a,0,0,0,0	monster	Poring	1002,140,5000,0,0
+prt_fild08b,0,0,0,0	monster	Poring	1002,140,5000,0,0
+prt_fild08c,0,0,0,0	monster	Poring	1002,140,5000,0,0
+prt_fild08d,0,0,0,0	monster	Poring	1002,140,5000,0,0
+prt_fild08a,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
+prt_fild08b,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
+prt_fild08c,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
+prt_fild08d,0,0,0,0	monster	Lunatic	1063,40,5000,0,0
+prt_fild08a,0,0,0,0	monster	Fabre	1007,40,5000,0,0
+prt_fild08b,0,0,0,0	monster	Fabre	1007,40,5000,0,0
+prt_fild08c,0,0,0,0	monster	Fabre	1007,40,5000,0,0
+prt_fild08d,0,0,0,0	monster	Fabre	1007,40,5000,0,0
+
+//==================================================
+// prt_fild09 - Prontera Field
 //==================================================
 prt_fild09,0,0,0,0	monster	Magnolia	1138,140,5000,0,0
 prt_fild09,0,0,0,0	monster	Metaller	1058,60,5000,0,0
 prt_fild09,237,115,5,5	monster	Yellow Plant	1081,3,360000,180000,1
 
 //==================================================
-// prt_fild10 - Prontera Field 
+// prt_fild10 - Prontera Field
 //==================================================
 prt_fild10,0,0,0,0	monster	Elder Willow	1033,140,5000,0,0
 prt_fild10,0,0,0,0	monster	Poporing	1031,20,5000,0,0
@@ -122,4 +138,4 @@ prt_fild11,0,0,0,0	monster	Goblin	1125,10,5000,0,0
 prt_fild11,0,0,0,0	monster	Goblin	1123,10,5000,0,0
 prt_fild11,0,0,0,0	monster	Goblin	1122,10,5000,0,0
 prt_fild11,0,0,0,0	monster	Panzer Goblin	1308,1,1800000,1200000,0
-prt_fild11,0,0,0,0	monster	Red Mushroom	1085,10,180000,90000,1
\ No newline at end of file
+prt_fild11,0,0,0,0	monster	Red Mushroom	1085,10,180000,90000,1
diff --git a/npc/re/mobs/fields/rachel.txt b/npc/re/mobs/fields/rachel.txt
index 68e34c4c5..d8dd26f42 100644
--- a/npc/re/mobs/fields/rachel.txt
+++ b/npc/re/mobs/fields/rachel.txt
@@ -99,4 +99,4 @@ ra_fild12,0,0,0,0	monster	Red Plant	1078,5,10000,0,1
 
 //==================================================
 // ra_fild13 - Disabled on Renewal
-//==================================================
\ No newline at end of file
+//==================================================
diff --git a/npc/re/mobs/fields/splendide.txt b/npc/re/mobs/fields/splendide.txt
index a9b5c8a1a..d7e3aa3aa 100644
--- a/npc/re/mobs/fields/splendide.txt
+++ b/npc/re/mobs/fields/splendide.txt
@@ -20,8 +20,6 @@ spl_fild01,0,0,0,0	monster	Cornus	1992,25,5000,0,0
 // spl_fild02 - Splendide Field
 //==================================================
 spl_fild02,0,0,0,0	monster	Pinguicula	1995,75,5000,0,0
-spl_fild02,0,0,0,0	monster	Bradium Golem	2024,20,5000,0,0
-spl_fild02,0,0,0,0	monster	Naga	1993,20,5000,0,0
 spl_fild02,0,0,0,0	monster	Luciola Vespa	1994,15,5000,0,0
 
 //==================================================
@@ -30,4 +28,4 @@ spl_fild02,0,0,0,0	monster	Luciola Vespa	1994,15,5000,0,0
 spl_fild03,0,0,0,0	monster	Luciola Vespa	1994,35,5000,0,0
 spl_fild03,0,0,0,0	monster	Cornus	1992,25,5000,0,0
 spl_fild03,0,0,0,0	monster	Naga	1993,20,5000,0,0
-spl_fild03,0,0,0,0	monster	Tendrilion	1991,1,3600000,0,0
\ No newline at end of file
+spl_fild03,0,0,0,0	monster	Tendrilion	1991,1,5000,0,0
diff --git a/npc/re/mobs/fields/umbala.txt b/npc/re/mobs/fields/umbala.txt
index e3bd52469..f33c07db8 100644
--- a/npc/re/mobs/fields/umbala.txt
+++ b/npc/re/mobs/fields/umbala.txt
@@ -1,27 +1,26 @@
-//===== Hercules Script ====================================== 
+//===== Hercules Script ======================================
 //= Umbala Fields Monster Spawn Script
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Darkchild (1.0)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.3 Official kRO 10.1 spawns [Playtester]
 //= 1.4 More accurate spawns [Playtester]
 //= 1.5 Updated spawns to renewal. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 //==================================================
 // um_fild01 - Luluka Forest 
 //==================================================
-um_fild01,0,0,0,0	monster	Dryad	1493,70,5000,0,0
-um_fild01,0,0,0,0	monster	Stone Shooter	1495,15,5000,0,0
+um_fild01,0,0,0,0	monster	Dryad	1493,60,5000,0,0
+um_fild01,0,0,0,0	monster	Stone Shooter	1495,25,5000,0,0
 um_fild01,0,0,0,0	monster	Wootan Shooter	1498,10,5000,0,0
 um_fild01,0,0,0,0	monster	Wootan Fighter	1499,10,5000,0,0
 um_fild01,0,0,0,0	monster	Wooden Golem	1497,10,5000,0,0
 um_fild01,0,0,0,0	monster	Green Plant	1080,10,180000,90000,1
 um_fild01,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,1
 um_fild01,0,0,0,0	monster	Shining Plant	1083,5,180000,90000,1
-um_fild01,0,0,0,0	monster	Shining Plant	1083,1,180000,90000,1
 
 //==================================================
 // um_fild02 - Hoomga Forest 
@@ -48,10 +47,10 @@ um_fild03,0,0,0,0	monster	Shining Plant	1083,2,180000,90000,1
 // um_fild04 - Hoomga Jungle 
 //==================================================
 um_fild04,0,0,0,0	monster	Wild Rose	1261,30,5000,0,0
-um_fild04,0,0,0,0	monster	Stone Shooter	1495,10,5000,0,0
+um_fild04,0,0,0,0	monster	Stone Shooter	1495,15,5000,0,0
 um_fild04,0,0,0,0	monster	Wootan Shooter	1498,5,5000,0,0
 um_fild04,0,0,0,0	monster	Wootan Fighter	1499,5,5000,0,0
 um_fild04,0,0,0,0	monster	Wooden Golem	1497,10,5000,0,0
 um_fild04,0,0,0,0	monster	Choco	1214,2,5000,0,0
 um_fild04,0,0,0,0	monster	Red Plant	1078,5,180000,90000,1
-um_fild04,0,0,0,0	monster	Yellow Plant	1081,5,180000,90000,1
\ No newline at end of file
+um_fild04,0,0,0,0	monster	Yellow Plant	1081,5,180000,90000,1
diff --git a/npc/re/mobs/fields/veins.txt b/npc/re/mobs/fields/veins.txt
index ca8cc431e..54261c8d6 100644
--- a/npc/re/mobs/fields/veins.txt
+++ b/npc/re/mobs/fields/veins.txt
@@ -50,7 +50,7 @@ ve_fild03,200,212,114,60	monster	Red Plant	1078,10,10000,0,1
 ve_fild03,0,0,0,0	monster	Yellow Plant	1081,10,10000,0,1
 
 //==================================================
-// ve_fild04 - Veins Field 
+// ve_fild04 - Veins Field
 //==================================================
 ve_fild04,0,0,0,0	monster	Muscipular	1780,100,5000,0,0
 ve_fild04,0,0,0,0	monster	Drosera	1781,50,5000,0,0
@@ -75,4 +75,4 @@ ve_fild04,288,273,4,4	monster	Blue Plant	1079,3,660000,0,1
 ve_fild07,0,0,0,0	monster	Stapo	1784,100,5000,0,0
 ve_fild07,0,0,0,0	monster	Drosera	1781,50,5000,0,0
 ve_fild07,0,0,0,0	monster	Muscipular	1780,30,5000,0,0
-ve_fild07,0,0,0,0	monster	White Plant	1082,10,600000,0,1
\ No newline at end of file
+ve_fild07,0,0,0,0	monster	White Plant	1082,10,600000,0,1
diff --git a/npc/re/mobs/fields/yuno.txt b/npc/re/mobs/fields/yuno.txt
index 13f1ecb63..3916884ca 100644
--- a/npc/re/mobs/fields/yuno.txt
+++ b/npc/re/mobs/fields/yuno.txt
@@ -9,11 +9,11 @@
 //= 1.2 New/Better Spawn [Muad_Dib]
 //= 1.3 Fix Up [Darkchild]
 //= 1.4 Updated monster spawns. Many thanks to vicious_pucca for
-//=	providing the information [MasterOfMuppets]
+//=     providing the information [MasterOfMuppets]
 //= 1.5 Updated after Episode 10.4 - Hugel [Poki#3]
-//=	Mob quantity is custom.
+//=     Mob quantity is custom.
 //= 1.5b Changed the spawn numbers a bit. [Poki#3]
-//=	Thanks to Playtester and Emperium.org
+//=     Thanks to Playtester and Emperium.org
 //= 1.6 Fixed Yuno Field 10. Mob amount sugested by Playtester [Poki#3]
 //= 1.7 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.8 Added kRO 10.1 spawns where they fit [Playtester]
@@ -23,7 +23,7 @@
 //============================================================
 
 //==================================================
-// yuno_fild01 - Border Posts 
+// yuno_fild01 - Border Posts
 //==================================================
 yuno_fild01,0,0,0,0	monster	Geographer	1368,50,5000,0,0
 yuno_fild01,0,0,0,0	monster	Dustiness	1114,35,5000,0,0
@@ -112,7 +112,7 @@ yuno_fild08,0,0,0,0	monster	Green Plant	1080,10,180000,90000,1
 yuno_fild08,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,1
 
 //==================================================
-// yuno_fild09 - Schwaltzvalt Guards Camp 
+// yuno_fild09 - Schwaltzvalt Guards Camp
 //==================================================
 yuno_fild09,0,0,0,0	monster	Grand Peco	1369,130,5000,0,0
 yuno_fild09,0,0,0,0	monster	Sleeper	1386,30,5000,0,0
@@ -138,4 +138,4 @@ yuno_fild11,0,0,0,0	monster	Yellow Plant	1081,10,180000,90000,1
 // yuno_fild12 - Border Checkpoint
 //==================================================
 yuno_fild12,0,0,0,0	monster	Geographer	1368,60,5000,0,0
-yuno_fild12,0,0,0,0	monster	Mantis	1139,30,5000,0,0
\ No newline at end of file
+yuno_fild12,0,0,0,0	monster	Mantis	1139,30,5000,0,0
diff --git a/npc/re/mobs/towns.txt b/npc/re/mobs/towns.txt
new file mode 100644
index 000000000..a6367d35e
--- /dev/null
+++ b/npc/re/mobs/towns.txt
@@ -0,0 +1,34 @@
+//===== Hercules Script ======================================
+//= Town Monster Spawn Script
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Spawns monsters in towns.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal spawns.
+//============================================================
+
+//==================================================
+// Brasilis, Strange Hydras
+//==================================================
+brasilis,283,88,6,6	monster	Strange Hydra	2081,5,5000,0,0
+brasilis,284,104,6,6	monster	Strange Hydra	2081,4,5000,0,0
+brasilis,215,80,6,6	monster	Strange Hydra	2081,4,5000,0,0
+brasilis,96,50,8,8	monster	Strange Hydra	2081,5,5000,0,0
+
+//==================================================
+// Alberta Ship, Swapping the Deck
+//==================================================
+alb_ship,0,0,0,0	monster	Strange Mouse	2057,25,0,0,0
+
+//==================================================
+// Prontera, Training Dummy Area
+//==================================================
+prontera,251,77,0,0	monster	Dummy Lv50	2409,1,5000,0,0
+prontera,259,77,0,0	monster	Dummy Lv50	2409,1,5000,0,0
+prontera,251,66,0,0	monster	Dummy Lv100	2410,1,5000,0,0
+prontera,259,66,0,0	monster	Dummy Lv100	2410,1,5000,0,0
+prontera,251,55,0,0	monster	Dummy Lv150	2411,1,5000,0,0
+prontera,259,55,0,0	monster	Dummy Lv150	2411,1,5000,0,0
diff --git a/npc/re/other/bulletin_boards.txt b/npc/re/other/bulletin_boards.txt
new file mode 100644
index 000000000..1d0dbb904
--- /dev/null
+++ b/npc/re/other/bulletin_boards.txt
@@ -0,0 +1,37 @@
+//===== Hercules Script ======================================
+//= Bulletin Boards
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Bulletin Boards for beginners.
+//===== Additional Comments: =================================
+//= 1.0 Moved Izlude NPCs to Pre-RE/RE paths.
+//=     Disabled until proper coordinates are found.
+//============================================================
+
+/*
+-	script	::BulletinBoard_iz	-1,{
+	mes "[Izlude: The Satellite City]";
+	mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accomodate its burgeoning population.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "The main buildings here are to accomodate the growth of the Cryptura Academy.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "Points of interest include the Swordman Association building which allows adventurers to change their job to Swordman, and the Battle Area that is East of Izlude.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "At the docks, you may take a ship and travel to ^003399Alberta^000000 or ^660000Byalan Island^000000.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "From Izlude, ^3355FFProntera^000000 is located to the Northwest, and ^006600Payon^000000 is located to the South. Enjoy your travels in the Rune-Midgarts Kingdom.";
+	close;
+}
+izlude,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5	2_BULLETIN_BOARD
+izlude_a,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_a	2_BULLETIN_BOARD
+izlude_b,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_b	2_BULLETIN_BOARD
+izlude_c,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_c	2_BULLETIN_BOARD
+izlude_d,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_d	2_BULLETIN_BOARD
+*/
diff --git a/npc/re/other/item_merge.txt b/npc/re/other/item_merge.txt
new file mode 100644
index 000000000..f823f5c3c
--- /dev/null
+++ b/npc/re/other/item_merge.txt
@@ -0,0 +1,69 @@
+//===== Hercules Script ======================================
+//= Mergician
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Merges items taking up multiple slots in a player's
+//= inventory.
+//===== Additional Comments: =================================
+//= 1.0 First version, currently useless/disabled.
+//============================================================
+
+prontera,146,95,3	script	Mergician#pron	1_M_WIZARD,{
+	if (checkweight(1301,1) == 0) {
+		mes "- Wait a second !! -";
+		mes "- You are carrying too many items -";
+		mes "- or too much weight to proceed. -";
+		mes "- Come back after -";
+		mes "- arranging your inventory. -";
+		close;
+	}
+	mes "[Mergician]";
+	mes "Do you believe in the miracle of Merge god?? If so, repeat my spell loudly as I pronunce it!!!";
+	mes "Merge Merge, Merrrrge!!!";
+	next;
+	switch(select("What is the miracle of Merge?:Merrrrge!!!!:Abandon...")) {
+	case 1:
+		mes "[Mergician]";
+		mes "There is an order which rules the world and keeps the world to go well.";
+		next;
+		mes "[Mergician]";
+		mes "But there has been a bad factor which totally jeopardised this rule!!";
+		next;
+		mes "[Mergician]";
+		mes "Those things which are separated even if they are composed by the same material!!";
+		next;
+		mes "[Mergician]";
+		mes "Have you never experienced this bad incident??";
+		mes "The fact that I had ^3131FFthe same potion, but appearing more than twice in your inventory!!^000000 So unpleasant!!!";
+		next;
+		mes "[Mergician]";
+		mes "Believe in Mergism. That is the truth.";
+		mes "Then I can help you be happy and content.";
+		close;
+	case 2:
+		mes "[Mergician]";
+		mes "This is the total holy ritual to pray to the Great God, Merge! and I am borrowing the power for a while!!";
+		next;
+		mes "[Mergician]";
+		mes "And if you eagerly want to be blessed by Merge, be humble and shout out loud! Merge Merge, Merrrrge!!!";
+		next;
+		switch(select("Merrrrge!:Don't follow what he says.")) {
+		case 1:
+//			MergeItem
+			mes "[Mergician]";
+			mes "Merge just heard your wish and let it be realised!";
+			mes "Open your inventory to check the miracle!";
+			close;
+		case 2:
+			mes "[Mergician]";
+			mes "You jerk!!! You just broke the whole rhythm! Why can't you get my flow and follow me?! Idiot!";
+			close;
+		}
+	case 3:
+		close;
+	}
+}
diff --git a/npc/re/other/mail.txt b/npc/re/other/mail.txt
new file mode 100644
index 000000000..42c26db6f
--- /dev/null
+++ b/npc/re/other/mail.txt
@@ -0,0 +1,19 @@
+//===== Hercules Script ======================================
+//= Mail Boxes
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Pickup and write mail from/to players in game.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal duplicates.
+//============================================================
+
+// Izlude
+//============================================================
+izlude_a,136,94,0	duplicate(MailBox)	Mailbox#iz_a	2_POSTBOX
+izlude_b,136,94,0	duplicate(MailBox)	Mailbox#iz_b	2_POSTBOX
+izlude_c,136,94,0	duplicate(MailBox)	Mailbox#iz_c	2_POSTBOX
+izlude_d,136,94,0	duplicate(MailBox)	Mailbox#iz_d	2_POSTBOX
diff --git a/npc/re/other/mercenary_rent.txt b/npc/re/other/mercenary_rent.txt
index 0e92f8fc2..21f54b46f 100644
--- a/npc/re/other/mercenary_rent.txt
+++ b/npc/re/other/mercenary_rent.txt
@@ -4,14 +4,22 @@
 //= Daegaladh
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Sells Lancer, Sword, and Archer mercenaries,
 //= along with related mercenary items.
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
-izlude,47,169,5	duplicate(Mercenary Manager#main)	Mercenary Manager#Sword	734
-izlude,56,169,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
+izlude,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Sword	4_M_JOB_KNIGHT2
+izlude_a,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_a	4_M_JOB_KNIGHT2
+izlude_b,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_b	4_M_JOB_KNIGHT2
+izlude_c,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_c	4_M_JOB_KNIGHT2
+izlude_d,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_d	4_M_JOB_KNIGHT2
+
+izlude,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	4_F_HUWOMAN
+izlude_a,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_a	4_F_HUWOMAN
+izlude_b,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_b	4_F_HUWOMAN
+izlude_c,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_c	4_F_HUWOMAN
+izlude_d,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_d	4_F_HUWOMAN
diff --git a/npc/re/other/pvp.txt b/npc/re/other/pvp.txt
new file mode 100644
index 000000000..61e0817fa
--- /dev/null
+++ b/npc/re/other/pvp.txt
@@ -0,0 +1,91 @@
+//===== Hercules Script ======================================
+//= PvP NPCs
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= PvP NPCs that are found in the Inns in major cities.
+//= Includes Yoyo Mode, Nightmare Mode, and Event Mode.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal.
+//============================================================
+
+// PVP Warpers
+//============================================================
+pvp_y_room,30,85,4	script	Fight Square Reception#1	8W_SOLDIER,{ //5,5
+	callfunc "F_PVP_FSRS",50,69;
+	end;
+
+OnInit:
+	waitingroom "LV 50 ~ LV 69",0;
+	end;
+}
+
+pvp_y_room,38,85,4	script	Fight Square Reception#2	8W_SOLDIER,{ //5,5
+	callfunc "F_PVP_FSRS",70,89;
+	end;
+
+OnInit:
+	waitingroom "LV 70 ~ LV 89",0;
+	end;
+}
+
+pvp_y_room,46,85,4	script	Fight Square Reception#3	8W_SOLDIER,{ //5,5
+	callfunc "F_PVP_FSRS",90,99;
+	end;
+
+OnInit:
+	waitingroom "LV 90 ~ LV 99",0;
+	end;
+}
+
+pvp_y_room,54,85,4	script	Fight Square Reception#8	8W_SOLDIER,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
+
+pvp_y_room,62,85,4	script	Fight Square Reception#4	8W_SOLDIER,{
+	//if (ADVJOB > 0) {
+	if (Upper == 1) {
+		mes "[PVP Fight Square Reception Staff]";
+		mes "You have been transcended.";
+		mes "You are not allowed to enter.";
+		close;
+	}
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Normal Jobs Only",0;
+	end;
+}
+
+pvp_y_room,70,85,4	script	Fight Square Reception#5	8W_SOLDIER,{
+	//if (ADVJOB == 0) {
+	if (Upper != 1) {
+		mes "[PVP Fight Square Reception Staff]";
+		mes "You have not transcended.";
+		mes "You are not allowed to enter.";
+		close;
+	}
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Trans Jobs Only",0;
+	end;
+}
+
+pvp_n_room,86,85,4	script	Fight Square Reception#n	8W_SOLDIER,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
diff --git a/npc/re/other/resetskill.txt b/npc/re/other/resetskill.txt
new file mode 100644
index 000000000..f3415e6c9
--- /dev/null
+++ b/npc/re/other/resetskill.txt
@@ -0,0 +1,147 @@
+//===== Hercules Script ======================================
+//= Hypnotist
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Stat and skill resetter for expanded first class under
+//= base level 50 and normal first class.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal script.
+//= 1.1 Added Izlude duplicates. [Euphy]
+//============================================================
+
+izlude,127,175,3	script	Hypnotist#novice	4_F_TELEPORTER,{
+	mes "[Hypnotist]";
+	mes "Greetings, adventurer.";
+	mes "I'm a member of the Hypnotist";
+	mes "Academy sent here to Izlude";
+	mes "to provide Skill Reset services";
+	mes "to certain First Class characters for a really good price: free!";
+	next;
+	mes "[Hypnotist]";
+	mes "Although I offer unlimited";
+	mes "stat/skill resets for now, I have";
+	mes "two conditions that must be";
+	mes "fulfilled. First, you must be";
+	mes "lower than ^FF0000Base Level 50^000000.";
+	next;
+	mes "[Hypnotist]";
+	mes "Second, you must be a";
+	mes "^FF0000Swordman, Acolyte, Mage,";
+	mes "Thief, Archer, Merchant,";
+	mes "Taekwon Boy, or Taekwon Girl,";
+	mes "Gunslinger and Ninja^000000";
+	mes "Job character to qualify.";
+	mes "Now, do you have any questions?";
+	next;
+	switch(select("^FF0000Stat/Skill Reset?:Reset stats:Reset skills^000000:Cancel")) {
+	case 1:
+		mes "[Hypnotist]";
+		mes "Stat/Skill Resets allow adventuers";
+		mes "to redistribute their Skill";
+		mes "Points if they are unhappy";
+		mes "with their current skills.";
+		next;
+		mes "[Hypnotist]";
+		mes "Before proceeding with";
+		mes "a Stat/Skill Reset, you must";
+		mes "reduce all of the weight";
+		mes "of all carried items on your";
+		mes "character to 0. You can put";
+		mes "extra items in Kafra Storage.";
+		next;
+		mes "[Hypnotist]";
+		mes "Ah, it's also important";
+		mes "to remove your ^FF0000Pushcart^000000";
+		mes "if you have one equipped.";
+		mes "Otherwise, hypnosis won't";
+		mes "work, or will backfire...";
+		close;
+	case 2:
+		set .@str$,"Stat";
+	case 3:
+		if (.@str$ == "")
+			set .@str$,"Skill";
+		mes "[Hypnotist]";
+		mes "Are you sure that you";
+		mes "want to proceed with";
+		mes "my ^FF0000"+.@str$+" Reset^000000 service?";
+		next;
+		if(select("Yes:Cancel") == 1)
+			break;
+	case 4:
+		mes "[Hypnotist]";
+		mes "Thank you, and good";
+		mes "luck on your adventures.";
+		mes "Please travel in safety~";
+		close;
+	}
+	if ((Class >= Job_Swordman && Class <= Job_Thief) || Class == Job_Taekwon || Class == Job_Gunslinger || Class == Job_Ninja) {
+		if (checkcart()) {
+			mes "[Hypnotist]";
+			mes "Oh! Please remove your";
+			mes "Pushcart before proceeding";
+			mes "with the "+.@str$+" Reset service.";
+			mes "Thanks for cooperating~";
+			close;
+		}
+		if (Weight != 0) {
+			mes "[Hypnotist]";
+			mes "If you're here for my "+.@str$;
+			mes "Reset service, please";
+			mes "remember that you can't";
+			mes "reset your "+.@str$+"s until the";
+			mes "^FF0000weight of your carried items in";
+			mes "your Inventory is reduced to 0^000000.";
+			next;
+			mes "[Hypnotist]";
+			mes "Why don't you place your";
+			mes "things into the Kafra Storage";
+			mes "for now? That way, you can";
+			mes "safely keep all of your goods.";
+			close;
+		}
+		if (BaseLevel >= 50 && (Class == Job_Taekwon || Class == Job_Gunslinger || Class == Job_Ninja)) {
+			mes "[Hypnotist]";
+			mes "I'm sorry, but characters";
+			mes "with Base Levels higher";
+			mes "than 50 are ineligible for the";
+			mes .@str$+" Reset service I provide.";
+			close;
+		}
+		mes "[Hypnotist]";
+		mes "Thank you for using";
+		mes "my "+.@str$+" Redistribution";
+		mes "services. Oh, and best";
+		mes "of luck to you on your";
+		mes "travels, adventurer.";
+		if (.@str$ == "Stat")
+			resetstatus;
+		else
+			resetskill;
+		close;
+	} else {
+		mes "[Hypnotist]";
+		mes "I'm sorry, but your";
+		mes "Job Class doesn't qualify";
+		mes "for the "+.@str$+" Reset service";
+		mes "that I provide. I can only";
+		mes "offer "+.@str$+" Resets to the";
+		mes "following Jobs...";
+		next;
+		mes "[Hypnotist]";
+		mes "^FF0000Swordman, Acolyte,";
+		mes "Mage, Thief, Archer,";
+		mes "Merchant, Taekwon";
+		mes "Boy, Taekwon Girl,";
+		mes "Gunslinder and Ninja^000000.";
+		close;
+	}
+}
+izlude_a,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_a	4_F_TELEPORTER
+izlude_b,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_b	4_F_TELEPORTER
+izlude_c,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_c	4_F_TELEPORTER
+izlude_d,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_d	4_F_TELEPORTER
diff --git a/npc/re/other/stone_change.txt b/npc/re/other/stone_change.txt
new file mode 100644
index 000000000..cfb2aa5eb
--- /dev/null
+++ b/npc/re/other/stone_change.txt
@@ -0,0 +1,59 @@
+//===== Hercules Script ======================================
+//= Stone Changer
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Organizes ores in a player's inventory.
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+geffen_in,99,174,5	script	Ore Tester#sorty	8_F_GIRL,{
+	mes "[Ore Tester Sorty]";
+	mes "Do you have ^3131FFany same type of ores in your inventories^000000 which take many spaces?";
+	mes "I can distinguish your ores and organize them right away~!";
+	next;
+	switch(select("Refine my Ore.:Cancel.")) {
+	case 1:
+		mes "[Ore Tester Sorty]";
+		mes "At the moment I can only distinguish ^FF0000Steel^000000, ^FF0000Iron^000000, ^FF0000Iron Ore^000000, and ^FF0000Rough Oridecon^000000 and organize them.";
+		mes "Please note that ^3131FFother items are unable^000000!";
+		next;
+		mes "[Ore Tester Sorty]";
+		mes "So, would you like me to organize your ores?";
+		next;
+		set .@i, select("Steel, please.:Iron, please.:Iron Ore, please.:Rough Oridecon, please.:No, thanks.");
+		if (.@i == 5) {
+			mes "[Ore Tester Sorty]";
+			mes "Huh, I really hate messy people!";
+			close;
+		}
+		setarray .@ores[0],999,998,1002,756;
+		set .@item, .@ores[.@i-1];
+		if (countitem(.@item) == 0) {
+			mes "[Ore Tester Sorty]";
+			mes "You don't have any "+getitemname(.@item)+"...";
+			close;
+		}
+		while(1) {
+			if (countitem(.@item)) {
+				set .@count, countitem(.@item);
+				set .@total, .@total + .@count;
+				delitem .@item, .@count;
+			} else {
+				getitem .@item, .@total;
+				break;
+			}
+		}
+		mes "[Ore Tester Sorty]";
+		mes "It's done. Looks great! Don't you think so?";
+		close;
+	case 2:
+		mes "[Ore Tester Sorty]";
+		mes "It seems that your bag is clean? Huhu! You might be the master of cleaning!";
+		close;
+	}
+}
diff --git a/npc/re/other/turbo_track.txt b/npc/re/other/turbo_track.txt
new file mode 100644
index 000000000..b975093a8
--- /dev/null
+++ b/npc/re/other/turbo_track.txt
@@ -0,0 +1,14 @@
+//===== Hercules Script ======================================
+//= Turbo Track
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Renewal duplicates.
+//===== Additional Comments: =================================
+//= 1.0 Split Mount Manager NPC.
+//============================================================
+
+alde_gld,181,199,5	duplicate(MountManager_turbo)	Mount Manager	4_F_RACING
diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt
index c2ba9fec7..829ec2dae 100644
--- a/npc/re/quests/cupet.txt
+++ b/npc/re/quests/cupet.txt
@@ -4,17 +4,15 @@
 //= Z3R0
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Exchanges Hunted Items for Tames
 //===== Additional Comments: =================================
-//= v1.0 First / Optimized Version
+//= 1.0 First / Optimized Version
 //============================================================
 
 // 1st NPC
--	script	CPM1	750,{
+-	script	CPM1	4_M_ALCHE_C,{
 	
 	set .@npc$, "[Cute Pet Manager]";
 	
@@ -45,7 +43,7 @@
 }
 
 // 2nd NPC
--	script	CPM2	750,{
+-	script	CPM2	4_M_ALCHE_C,{
 	
 	set .@npc$, "[Cute Pet Manager]";
 	
@@ -77,7 +75,7 @@
 }
 
 // 3rd NPC
--	script	CPM3	750,{
+-	script	CPM3	4_M_ALCHE_C,{
 	
 	set .@npc$, "[Cute Pet Manager]";
 	
@@ -160,7 +158,7 @@ function	script	cute_pet_manager	{
 	next;
 	
 	// Create Menu System
-	for (set .@a, 0; .@a < getarraysize(getarg(0)); set .@a, .@a + 1) { 
+	for (set .@a, 0; .@a < getarraysize(getarg(0)); set .@a, .@a + 1) {
 		set .@menu$, .@menu$ + (.@menu$ == "" ? "" : ":") + getitemname(getelementofarray(getarg(0), .@a));
 	}
 	
@@ -195,7 +193,7 @@ function	script	cute_pet_manager	{
 		mes "Do you want to exchange with me?";
 		next;
 		
-		if  (select("Exchange:Don't Exchange") == 2) { 
+		if  (select("Exchange:Don't Exchange") == 2) {
 			mes "[Cute Pet Manager]";
 			mes "You don't? You will come back again.";
 			close;
@@ -225,18 +223,18 @@ function	script	cute_pet_manager	{
 }
 
 // NPC Duplicates
-prontera,67,212,5	duplicate(CPM1)	Cute Pet Manager#1	750
-prontera,242,92,3	duplicate(CPM2)	Cute Pet Manager#2	750
-prontera,179,92,3	duplicate(CPM3)	Cute Pet Manager#3	750
+prontera,67,212,5	duplicate(CPM1)	Cute Pet Manager#1	4_M_ALCHE_C
+prontera,242,92,3	duplicate(CPM2)	Cute Pet Manager#2	4_M_ALCHE_C
+prontera,179,92,3	duplicate(CPM3)	Cute Pet Manager#3	4_M_ALCHE_C
 
-geffen,180,125,5	duplicate(CPM1)	Cute Pet Manager#4	750
-geffen,152,66,3	duplicate(CPM2)	Cute Pet Manager#5	750
-geffen,197,95,3	duplicate(CPM3)	Cute Pet Manager#6	750
+geffen,180,125,5	duplicate(CPM1)	Cute Pet Manager#4	4_M_ALCHE_C
+geffen,152,66,3	duplicate(CPM2)	Cute Pet Manager#5	4_M_ALCHE_C
+geffen,197,95,3	duplicate(CPM3)	Cute Pet Manager#6	4_M_ALCHE_C
 
-morocc,115,83,5	duplicate(CPM1)	Cute Pet Manager#7	750
-morocc,218,130,3	duplicate(CPM2)	Cute Pet Manager#8	750
-morocc,236,225,3	duplicate(CPM3)	Cute Pet Manager#9	750
+morocc,115,83,5	duplicate(CPM1)	Cute Pet Manager#7	4_M_ALCHE_C
+morocc,218,130,3	duplicate(CPM2)	Cute Pet Manager#8	4_M_ALCHE_C
+morocc,236,225,3	duplicate(CPM3)	Cute Pet Manager#9	4_M_ALCHE_C
 
-payon,109,278,5	duplicate(CPM1)	Cute Pet Manager#10	750
-payon,157,124,3	duplicate(CPM2)	Cute Pet Manager#11	750
-payon,85,237,3	duplicate(CPM3)	Cute Pet Manager#12	750
+payon,109,278,5	duplicate(CPM1)	Cute Pet Manager#10	4_M_ALCHE_C
+payon,157,124,3	duplicate(CPM2)	Cute Pet Manager#11	4_M_ALCHE_C
+payon,85,237,3	duplicate(CPM3)	Cute Pet Manager#12	4_M_ALCHE_C
diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt
index 361f8fb57..200454e81 100644
--- a/npc/re/quests/eden/11-25.txt
+++ b/npc/re/quests/eden/11-25.txt
@@ -12,7 +12,7 @@
 //= 1.2 Optimized. [Euphy]
 //============================================================
 
-moc_para01,36,38,3	script	Mission [11 - 25]#Tuto	857,{
+moc_para01,36,38,3	script	Mission [11 - 25]#Tuto	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "- You need to have an -";
 		mes "- ^4d4dff'Eden Group Mark'^000000 -";
@@ -97,7 +97,7 @@ L_Quest:
 	close;
 }
 
-moc_para01,32,30,6	script	Spike	914,{
+moc_para01,32,30,6	script	Spike	4_F_CHILD,{
 	for(set .@i,11114; .@i<11124; set .@i,.@i+1) {
 		set .@j, checkquest(.@i,HUNTING);
 		if (.@j == 2) switch(.@i) {
diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt
index 5467c773e..a4f0d5637 100644
--- a/npc/re/quests/eden/26-40.txt
+++ b/npc/re/quests/eden/26-40.txt
@@ -12,7 +12,7 @@
 //= 1.2 Optimized. [Euphy]
 //============================================================
 
-moc_para01,38,38,3	script	Mission [26 - 40]	857,{
+moc_para01,38,38,3	script	Mission [26 - 40]	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "You are not a qualified member. You can not use the bulletin board.";
 		close;
@@ -84,7 +84,7 @@ L_Quest:
 		mes "You have declined the "+getarg(2)+" mission.";
 		close;
 	}
-	if (checkquest(getarg(0)) == 1) mes "You are already doing this mission.";
+	if (checkquest(getarg(0)) > -1) mes "You are already doing this mission.";
 	else {
 		setquest getarg(0);
 		mes "You have accepted the "+getarg(2)+" mission.";
@@ -95,7 +95,7 @@ L_Quest:
 	close;
 }
 
-geffen,103,42,5	script	Sponiac	99,{
+geffen,103,42,5	script	Sponiac	4W_M_03,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Sponiac]";
 		mes "Why are you carrying so many items?";
@@ -175,7 +175,7 @@ L_Quest:
 	close;
 }
 
-moc_ruins,173,55,3	script	Dieshin Man	89,{
+moc_ruins,173,55,3	script	Dieshin Man	4_M_ORIENT02,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Dieshin Man]";
 		mes "Why are you carrying so many items?";
@@ -259,7 +259,7 @@ L_Quest:
 	close;
 }
 
-pay_fild07,83,89,7	script	Zoologist	89,{
+pay_fild07,83,89,7	script	Zoologist	4_M_ORIENT02,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Zoologist]";
 		mes "Why are you carrying so many items?";
@@ -324,7 +324,7 @@ pay_fild07,83,89,7	script	Zoologist	89,{
 	close;
 }
 
-prt_fild03,30,254,3	script	Entomologist	83,{
+prt_fild03,30,254,3	script	Entomologist	4_M_01,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Entomologist]";
 		mes "Why are you carrying so many items?";
@@ -389,7 +389,7 @@ prt_fild03,30,254,3	script	Entomologist	83,{
 	close;
 }
 
-xmas_fild01,92,57,3	script	Biologist	97,{
+xmas_fild01,92,57,3	script	Biologist	4W_M_01,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Biologist]";
 		mes "Why are you carrying so many items?";
@@ -454,7 +454,7 @@ xmas_fild01,92,57,3	script	Biologist	97,{
 	close;
 }
 
-payon,179,66,3	script	Dashia	931,{
+payon,179,66,3	script	Dashia	4_M_RACHMAN1,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Dashia]";
 		mes "Why are you carrying so many items?";
diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt
index dc71a6c5a..eb1c22e42 100644
--- a/npc/re/quests/eden/41-55.txt
+++ b/npc/re/quests/eden/41-55.txt
@@ -12,7 +12,7 @@
 //= 1.2 Optimized. [Euphy]
 //============================================================
 
-moc_para01,40,38,3	script	Mission [41 - 55]	857,{
+moc_para01,40,38,3	script	Mission [41 - 55]	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "You are not an Eden group member. You are not qualified to access the bulletin board.";
 		close;
@@ -24,7 +24,7 @@ moc_para01,40,38,3	script	Mission [41 - 55]	857,{
 	}
 	if (checkquest(12088) == -1) {
 		if (BaseLevel < 41 || BaseLevel > 55) {
-			mes "[41 ~ 55 Lv. Mission Board]";
+			mes "Mission bulletin board for Lv41~55 adventurers.";
 			close;
 		}
 		mes "[Mission Board]";
@@ -48,13 +48,13 @@ moc_para01,40,38,3	script	Mission [41 - 55]	857,{
 			case 11: callsub L_Quest,12082,"Don't ask why, but please hunt 30 Shellfish. It is a secret mission!";
 			case 12: callsub L_Quest,12083,"Marine Sphere? Do you know what a Marine Sphere is? I got a mission for you to hunt 15 Marine Sphere, so please do so.";
 			case 13: callsub L_Quest,12084,"The mayor wants to eat a delicious fish dish. Phen will be the perfect ingredient for it. Please hunt 20 Phen!";
-			case 14: callsub L_Quest,12085,"You have accepted the mission. For more details, please press 'alt + u' keys, you can get information from the Quest Window.";
+			case 14: callsub L_Quest,12085,"Dead Orc monsters got back to our town and they've revived as Orc Skeletons. We are in chaos! Please hunt 15 Orc Skeleton.";
 			case 15: callsub L_Quest,12086,"Some weird monsters called Zenorc are attacking us. Please hunt 30 Zenorc.";
 			case 16: callsub L_Quest,12087,"Be prepared! It is a cruel mission! Hunt 15 Mummies!! I tried once, but I couldn't succeed. It is too scary!";
 		}
 		end;
 	}
-	setarray .@Exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250;
+	setarray .@exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250;
 	for(set .@i,0; .@i<16; set .@i,.@i+1)
 		if (checkquest(12072+.@i,HUNTING) == 2) {
 			mes "[Mission Board]";
@@ -63,7 +63,7 @@ moc_para01,40,38,3	script	Mission [41 - 55]	857,{
 			erasequest 12088;
 			erasequest 12072+.@i;
 			specialeffect2 EF_STEAL;
-			getexp .@Exp[.@i],0;
+			getexp .@exp[.@i],0;
 			close;
 		}
 	if ((checkquest(12072,HUNTING) == 0) && (checkquest(12073,HUNTING) == 0) && (checkquest(12074,HUNTING) == 0) && (checkquest(12075,HUNTING) == 0) && (checkquest(12076,HUNTING) == 0) && (checkquest(12077,HUNTING) == 0) && (checkquest(12078,HUNTING) == 0) && (checkquest(12079,HUNTING) == 0) && (checkquest(12080,HUNTING) == 0) && (checkquest(12081,HUNTING) == 0) && (checkquest(12082,HUNTING) == 0) && (checkquest(12083,HUNTING) == 0) && (checkquest(12084,HUNTING) == 0) && (checkquest(12085,HUNTING) == 0) && (checkquest(12086,HUNTING) == 0) && (checkquest(12087,HUNTING) == 0)) {
diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt
index c503a274b..c7e5103a8 100644
--- a/npc/re/quests/eden/56-70.txt
+++ b/npc/re/quests/eden/56-70.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.1
+//= 1.5
 //===== Description: =========================================
 //= Repetable Quests for Players between Baselevel 56 - 70.
 //===== Additional Comments: =================================
@@ -12,11 +12,10 @@
 //= 1.2 Added checkquest confirmation for -1. [Euphy]
 //= 1.3 Fixed Puppet Master's Agony Quest (12217 -> 3259). [Joseph]
 //= 1.4 Fixed invalid check (Magic Wand Quest). [Joseph]
-//= 2.0 Optimised [Zopokx]
-//= 2.1 Fixed some errors using Euphy's reference [Zopokx]
+//= 1.5 Optimized, based on code by Zopokx. [Euphy]
 //============================================================
 
-moc_para01,42,38,3	script	Mission [56 - 70]	857,{
+moc_para01,42,38,3	script	Mission [56 - 70]	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "To get these missions, I need to Join the Eden Group first. I must find Secretary Lime Evenor and become a member.";
 		close;
@@ -25,44 +24,40 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 	next;
 	mes "Lots of missions such as a Monster Hunting, Delivery Goods, Finding People.";
 	next;
-	switch (select("Mission Numbers 1~5:Mission Numbers 6~10:Mission Numbers 11~15")) {
-		case 1:
-			switch (select("What is this Bandage?:Dangerous Alligators.:That wasn't a mermaid...:My country is calling me!")) {
-				case 1: callsub L_HuntingQuest,3250,15000,5000,930,30;
-				case 2: callsub L_HuntingQuest,3251,16000,6000;
-				case 3: callsub L_HuntingQuest,3252,17000,8000;
-				case 4: callsub L_Quest,3254,18000,8000,7043,10,1056,30;
-			}
-			break;
-		case 2:
-			switch (select("Hunt Wild Boar:Preparing the Summer:A Woman's Grudge:Special ingredients:Puppet Master's Agony")) {
-				case 1: callsub L_HuntingQuest,3255,16000,7000;
-				case 2: callsub L_Quest,3256,15000,5000,918,30;
-				case 3: callsub L_HuntingQuest,3257,17000,8000;
-				case 4: callsub L_Quest,3258,16000,7000,7198,40;
-				case 5: callsub L_HuntingQuest,3259,17000,7000,1060,30;
-			}
-			break;
-		case 3:
-			switch (select("Tiresome Flies:Dangerous Munak:Make the World green:Magic Wand")) {
-				case 1: callsub L_HuntingQuest,3260,16000,6000;
-				case 2: callsub L_HuntingQuest,3261,16000,7000;
-				case 3: callsub L_Quest,3262,17000,7000,1032,40;
-				case 4: callsub L_Quest,3263,18000,8000,1021,30,7150,30;
-			}
-			break;
+	switch(select("Mission Numbers 1~5:Mission Numbers 6~10:Mission Numbers 11~15")) {
+	case 1:
+		switch(select("What is this Bandage?:Dangerous Alligators.:That wasn't a mermaid...:My country is calling me!")) {
+			case 1: callsub L_HuntingQuest,3250,15000,5000,930,30;
+			case 2: callsub L_HuntingQuest,3251,16000,6000;
+			case 3: callsub L_HuntingQuest,3252,17000,8000;
+			case 4: callsub L_Quest,3254,18000,8000,7043,10,1056,30;
+		}
+	case 2:
+		switch(select("Hunt Wild Boar:Preparing the Summer:A Woman's Grudge:Special ingredients:Puppet Master's Agony")) {
+			case 1: callsub L_HuntingQuest,3255,16000,7000;
+			case 2: callsub L_Quest,3256,15000,5000,918,30;
+			case 3: callsub L_HuntingQuest,3257,17000,8000;
+			case 4: callsub L_Quest,3258,16000,7000,7198,40;
+			case 5: callsub L_HuntingQuest,3259,17000,7000,1060,30;
+		}
+	case 3:
+		switch(select("Tiresome Flies:Dangerous Munak:Make the World green:Magic Wand")) {
+			case 1: callsub L_HuntingQuest,3260,16000,6000;
+			case 2: callsub L_HuntingQuest,3261,16000,7000;
+			case 3: callsub L_Quest,3262,17000,7000,1032,40;
+			case 4: callsub L_Quest,3263,18000,8000,1021,30,7150,30;
+		}
 	}
 	end;
 
 L_Quest:
-	if (checkquest(getarg(0)) <= 0) {
-		callsub L_CheckDetails, getarg(0);
-		mes " ";
+	if (checkquest(getarg(0)) == -1) {
+		callsub L_Details, getarg(0);
 		next;
 		mes "Would you like to accept this mission?";
 		next;
 		if(select("Accept the mission.:Do not accept the mission.") == 1) {
-			if ((BaseLevel < 56) || (BaseLevel > 70)) {
+			if (BaseLevel < 55 || BaseLevel > 70) {
 				mes "These missions are not fit for my level. I should look for other missions.";
 				close;
 			}
@@ -73,43 +68,41 @@ L_Quest:
 		}
 		close;
 	}
-	if (checkquest(getarg(0)) == 1) {
-		if (getargcount() > 5) {
-			if ((countitem(getarg(3)) >= getarg(4)) && (countitem(getarg(5)) >= getarg(6))) { set .@complete, 1; }
-			else { set .@complete, 0; }
-		} else {
-			if (countitem(getarg(3)) >= getarg(4)) { set .@complete, 1; }
-			else { set .@complete, 0; }
-		}
-		if (.@complete) {
-			mes "I have done pretty well for the mission. Should I report it now?";
-			next;
-			if(select("Report the mission.:Do not report it yet.") == 2) { close; }
+	if (getargcount() > 5) {
+		if (countitem(getarg(5)) < getarg(6))
+			set .@items,1; //incomplete
+		else
+			set .@items,2; //complete
+	}
+	if (checkquest(getarg(0)) < 2 && (countitem(getarg(3)) < getarg(4) || .@items == 1)) {
+		mes "You have an on-going mission. Would you like to check the details?";
+		next;
+		if(select("Check the details.:Cancel.") == 1)
+			callsub L_Details, getarg(0);
+		close;
+	} else {
+		mes "I have done pretty well for the mission. Should I report it now?";
+		next;
+		if(select("Report the mission.:Do not report it yet.") == 1) {
 			delitem getarg(3),getarg(4);
-			if (getarg(5,0) > 0) { delitem getarg(5),getarg(6); }
+			if (.@items)
+				delitem getarg(5),getarg(6);
 			getexp getarg(1),getarg(2);
 			erasequest getarg(0);
 			mes "You have completed the mission. Get rewards.";
-		} else {
-			mes "You have an on-going mission. Would you like to check the details?";
-			next;
-			if(select("Check the details.:Cancel.") == 1)
-				callsub L_CheckDetails, getarg(0);
 		}
+		close;
 	}
-	close;
 	end;
 
 L_HuntingQuest:
-	if (checkquest(getarg(0)) <= 0) {
-		callsub L_CheckDetails, getarg(0);
-		next;
-		mes " ";
+	if (checkquest(getarg(0)) == -1) {
+		callsub L_Details, getarg(0);
 		next;
 		mes "Would you like to accept this mission?";
 		next;
 		if(select("Accept the mission.:Do not accept the mission.") == 1) {
-			if ((BaseLevel < 56) || (BaseLevel > 70)) {
+			if (BaseLevel < 55 || BaseLevel > 70) {
 				mes "These missions are not fit for my level. I should look for other missions.";
 				close;
 			}
@@ -118,249 +111,249 @@ L_HuntingQuest:
 			next;
 			mes "This mission doesn't have time limits.";
 		}
+		close;
+	}
+	if (getargcount() > 3) {
+		if (countitem(getarg(3)) < getarg(4))
+			set .@items,1; //incomplete
+		else
+			set .@items,2; //complete
 	}
-	else if (checkquest(getarg(0),HUNTING) == 1) {
+	if (checkquest(getarg(0),HUNTING) < 2 || .@items == 1) {
 		mes "You have an on-going mission. Would you like to check the details?";
 		next;
 		if(select("Check the details.:Cancel.") == 1)
-			callsub L_CheckDetails, getarg(0);
-	}
-	else if (checkquest(getarg(0),HUNTING) == 2) {
-		if (getargcount() > 3) {
-			if (countitem(getarg(3)) >= getarg(4)) { set .@complete, 1; }
-			else { set .@complete, 0; }
-		} else { set .@complete, 1; }
-		if (.@complete) {
-			mes "I have done pretty well for the mission. Should I report it now?";
-			next;
-			if(select("Report the mission.:Do not report it yet.") == 2) { close; }
-			if (getarg(3,0) > 0) { delitem getarg(3),getarg(4); }
+			callsub L_Details, getarg(0);
+		close;
+	} else if (checkquest(getarg(0),HUNTING) == 2) {
+		mes "I have done pretty well for the mission. Should I report it now?";
+		next;
+		if(select("Report the mission.:Do not report it yet.") == 1) {
+			if (.@items)
+				delitem getarg(3),getarg(4);
 			getexp getarg(1),getarg(2);
 			erasequest getarg(0);
 			mes "You have completed the mission. Get rewards.";
-		} else {
-			mes "I don't have enough "+getitemname(getarg(3))+".";
-			mes "I need to gather "+getarg(4)+" "+getitemname(getarg(3))+" to complete this mission.";
 		}
+		close;
 	}
-	close;
 	end;
 
-L_CheckDetails:
-	switch(getarg(0)){
-		case 3250:
-			mes "This mission is assigned by the Rekenber corporation from Lighthalzen. Below are the details.";
-			next;
-			mes "Rekenber corporation is about to launch a new project called 'Green Medical Center'. For the first product of the project, we are preparing well-being Bandages.";
-			next;
-			mes "Regarding the project, we need to research monster's reactions when they are wrapped with Rotten Bandages.";
-			next;
-			mes "If you are interested, please hunt 30 Mummies and bring 30 Rotten Bandages. You can find them in the Pyramid West of Morroc.";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "- Rekenber corporation chief director 'Julie E Delph' -";
-			break;
-		case 3251:
-			mes "This mission is assigned by the Comodo cooperative society. Below are the details.";
-			next;
-			mes "Alligators have gone wild these days, they attack women and drunken people who hang out near the beach.";
-			next;
-			mes "This is a very shameful situation for us, the most wonderful vacation spot in Rune-Midgard.";
-			next;
-			mes "So, it would be very helpful if you hunt 30 Alligators to clean out this situation.";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			break;
-		case 3252:
-			mes "This mission is assigned by an unknown client from Izlude.";
-			next;
-			mes "I have admired the beach of Izlude, ever since I was born.";
-			next;
-			mes "When I was young, I found a mysterious creature in the Izlude dungeon, I had never seen something like that before...";
-			next;
-			mes "I instantly thought it was a mermaid. I was so supprised, I have studied about mermaids in whole my life.";
-			next;
-			mes "But, as I studied harder, I found that the creature was not a mermaid... yes, It wasn't beautiful at all like other mermaids...";
-			next;
-			mes "I finally tracked down the fact that it was a Merman, not a Mermaid!";
-			next;
-			mes "Merman... I have wasted my life studying this monster! So please hunt 30 Mermans to make me feel better.";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "-- Izlude 'The Lost dream mermaid' --";
-			break;
-		case 3254:
-			mes "This mission is assigned by the government officer of the Rune-Midgarts Kingdom.";
-			next;
-			mes "To prevent a flood in Prontera, we decided to build a huge dam to regulate the water supply.";
-			next;
-			mes "But, we are shorthanded on supplies and we need to collect Fine Sand and Grit.";
-			next;
-			mes "So, we would like to ask for help. People, please bring us 10 Fine Sand and 30 Grit each so we can build the dam.";
-			next;
-			mes "You can get those materials from Sand Man, I wish you good luck!";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "-- Government officer of the Rune-Midgarts Kingdom, Dufre Kent --";
-			break;
-		case 3255:
-			mes "This mission is assigned by the Payon town hall.";
-			next;
-			mes "Wild animals are always annoyances to farmers.";
-			next;
-			mes "They attack our farm and ruin whole crops!! We can't stand it anymore!";
-			next;
-			mes "So, we would like to ask for the help from brave adventurers.";
-			next;
-			mes "Please, hunt 30 Savages to save our crops!";
-			next;
-			mes "You can easily find those monsters around our town and field.";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "-- Payon town hall members --";
-			break;
-		case 3256:
-			mes "This mission is assigned by the Morroc blacksmith Aragham.";
-			next;
-			mes "Hello~~~~, Adventurers! This is Aragham, the hottest blacksmith in Morroc!";
-			next;
-			mes "Anyway, I have a son named Aragam Junior, the cute one. Haha.";
-			next;
-			mes "He will be attending summer camp this summer, but he doesn't know how to swim.";
-			next;
-			mes "I want to teach him, but as you know I am a blacksmith, a far cry from swimming! Hehe.";
-			next;
-			mes "But, I figured that if I make swim fins, it will be great for his confidence~!";
-			next;
-			mes "To make it, I need 30 Sticky Webfoots from a Roda Frog. Can you bring them to me?";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "PS. Do not compare me with Hollgrehenn or Antonio!!!!";
-			next;
-			mes "-- The hottest blacksmith, Morroc blacksmith Aragham --";
-			break;
-		case 3257:
-			mes "This mission is assigned by an inventor Dorian from Izlude.";
-			next;
-			mes "Have you heard the story that if women have a grudge on their mind, it will bring natural disasters.";
-			next;
-			mes "Wow, so guys must watch out for those sensitive women! Make sure they don't have any grudges on you.";
-			next;
-			mes "Women can bring strange phenomenons with them!";
-			next;
-			mes "I am so intrigued with that story that I'm trying to prove that it can be true.";
-			next;
-			mes "So I need to make women upset! Haha, I know what a mean idea, right?";
-			next;
-			mes "But this is seriously just for studying... So please hunt 30 Sohee's who seems to be revived from victimized souls.";
-			next;
-			mes "So I can keep observing the case.";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "-- Elegance inventor Dorian --";
-			break;
-		case 3258:
-			mes "This mission is assigned by Wallah from Payon.";
-			next;
-			mes "Hello, adventurer. How are you? How is your health?";
-			next;
-			mes "I am a pharmacist and I am having a hard time getting special ingredients lately.";
-			next;
-			mes "Because I am a little sensitive girl, how can I possibly get those things by myself.";
-			next;
-			mes "So, please help me. Just bring 40 Huge Leafs to me, that will be enough to complete my special medicine!";
-			next;
-			mes "Please bring it as soon as possible, people need my medicine.";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "-- Wallah --";
-			break;
-		case 3259:
-			mes "This mission is assigned by puppet master Woonute from Geffen.";
-			next;
-			mes "You know being a puppet master is kind of a hard job to satisfy people.";
-			next;
-			mes "People can search and see so many different things on their own thesedays.";
-			next;
-			mes "Their expectations are getting high, I can't satisfy them anymore.";
-			next;
-			mes "But if I can make new toy concepts, like living toys, it will be ground breaking.";
-			next;
-			mes "I heard that there are live dolls called Marionettes. Can you hunt 30 Marionettes for me? And also bring 30 Golden Hair, those will be great materials for the new toys.";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "-- Puppet Master Woonute --";
-			break;
-		case 3260:
-			mes "This mission is assigned by an exterminator from Prontera.";
-			next;
-			mes "As the weather gets warmer, insects multiply more and more. It is already out of control.";
-			next;
-			mes "People in Prontera cannot sleep because of all the bugs in their house.";
-			next;
-			mes "So, please help us, hunt 30 Hunter Flies. Then the flies can be reduced slowly.";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "-- The Prontera exterminator --";
-			break;
-		case 3261:
-			mes "This mission is assigned by Cheese Dongja from Payon.";
-			next;
-			mes "Have you heard about Munak?";
-			next;
-			mes "The ugly monster Munak is threatening people in Payon.";
-			next;
-			mes "So we need brave adventurers like you!";
-			next;
-			mes "Please hunt 30 Munaks then Payon will be in peace.";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "- Payon Cheese Dongja -";
-			break;
-		case 3262:
-			mes "This mission is assigned by a gem dealer, Ibraham from Morroc.";
-			next;
-			mes "A small beautiful flower in the barren desert... What an incredible scene it would be!";
-			next;
-			mes "Planting flowers can make the world green and it will be so pretty everywhere.";
-			next;
-			mes "I plan to plant strong flowers in the Morroc desert so the soil gets better.";
-			next;
-			mes "I need 40 Maneater Blossom from Flora, I know Maneater Blossom is an ugly flower, but still it is a plant.";
-			next;
-			mes "I hope you can hunt Flora and get me 40 Maneater Blossoms. You are making the world green! Be proud!";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "-- Morroc Ibraham --";
-			break;
-		case 3263:
-			mes "This mission is assigned by the Payon blacksmith Antonio.";
-			next;
-			mes "Magic wand! Have you heard about it? It is an incredible wand!";
-			next;
-			mes "If you say the magic words and swing the wand, it will make your wishes come true.";
-			next;
-			mes "So, I decided to make it by myself. Then I will be rich and powerful~! Haha!!";
-			next;
-			mes "To make the wand, I need some special materials.";
-			next;
-			mes "Please bring me 30 Dokebi Horns and 30 Bamboo Cut. If you do so, I will lend you my magic wand once. Haha, good deal?";
-			next;
-			mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-			next;
-			mes "-- Payon blacksmith Antonio --";
-			break;
+L_Details:
+	switch(getarg(0)) {
+	case 3250:
+		mes "This mission is assigned by the Rekenber corporation from Lighthalzen. Below are the details.";
+		next;
+		mes "Rekenber corporation is about to launch a new project called 'Green Medical Center'. For the first product of the project, we are preparing well-being Bandages.";
+		next;
+		mes "Regarding the project, we need to research monster's reactions when they are wrapped with Rotten Bandages.";
+		next;
+		mes "If you are interested, please hunt 30 Mummies and bring 30 Rotten Bandages. You can find them in the Pyramid West of Morroc.";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "- Rekenber corporation chief director 'Julie E Delph' -";
+		break;
+	case 3251:
+		mes "This mission is assigned by the Comodo cooperative society. Below are the details.";
+		next;
+		mes "Alligators have gone wild these days, they attack women and drunken people who hang out near the beach.";
+		next;
+		mes "This is a very shameful situation for us, the most wonderful vacation spot in Rune-Midgard.";
+		next;
+		mes "So, it would be very helpful if you hunt 30 Alligators to clean out this situation.";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		break;
+	case 3252:
+		mes "This mission is assigned by an unknown client from Izlude.";
+		next;
+		mes "I have admired the beach of Izlude, ever since I was born.";
+		next;
+		mes "When I was young, I found a mysterious creature in the Izlude dungeon, I had never seen something like that before...";
+		next;
+		mes "I instantly thought it was a mermaid. I was so supprised, I have studied about mermaids in whole my life.";
+		next;
+		mes "But, as I studied harder, I found that the creature was not a mermaid... yes, It wasn't beautiful at all like other mermaids...";
+		next;
+		mes "I finally tracked down the fact that it was a Merman, not a Mermaid!";
+		next;
+		mes "Merman... I have wasted my life studying this monster! So please hunt 30 Mermans to make me feel better.";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "-- Izlude 'The Lost dream mermaid' --";
+		break;
+	case 3254:
+		mes "This mission is assigned by the government officer of the Rune-Midgarts Kingdom.";
+		next;
+		mes "To prevent a flood in Prontera, we decided to build a huge dam to regulate the water supply.";
+		next;
+		mes "But, we are shorthanded on supplies and we need to collect Fine Sand and Grit.";
+		next;
+		mes "So, we would like to ask for help. People, please bring us 10 Fine Sand and 30 Grit each so we can build the dam.";
+		next;
+		mes "You can get those materials from Sand Man, I wish you good luck!";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "-- Government officer of the Rune-Midgarts Kingdom, Dufre Kent --";
+		break;
+	case 3255:
+		mes "This mission is assigned by the Payon town hall.";
+		next;
+		mes "Wild animals are always annoyances to farmers.";
+		next;
+		mes "They attack our farm and ruin whole crops!! We can't stand it anymore!";
+		next;
+		mes "So, we would like to ask for the help from brave adventurers.";
+		next;
+		mes "Please, hunt 30 Savages to save our crops!";
+		next;
+		mes "You can easily find those monsters around our town and field.";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "-- Payon town hall members --";
+		break;
+	case 3256:
+		mes "This mission is assigned by the Morroc blacksmith Aragham.";
+		next;
+		mes "Hello~~~~, Adventurers! This is Aragham, the hottest blacksmith in Morroc!";
+		next;
+		mes "Anyway, I have a son named Aragam Junior, the cute one. Haha.";
+		next;
+		mes "He will be attending summer camp this summer, but he doesn't know how to swim.";
+		next;
+		mes "I want to teach him, but as you know I am a blacksmith, a far cry from swimming! Hehe.";
+		next;
+		mes "But, I figured that if I make swim fins, it will be great for his confidence~!";
+		next;
+		mes "To make it, I need 30 Sticky Webfoots from a Roda Frog. Can you bring them to me?";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "PS. Do not compare me with Hollgrehenn or Antonio!!!!";
+		next;
+		mes "-- The hottest blacksmith, Morroc blacksmith Aragham --";
+		break;
+	case 3257:
+		mes "This mission is assigned by an inventor Dorian from Izlude.";
+		next;
+		mes "Have you heard the story that if women have a grudge on their mind, it will bring natural disasters.";
+		next;
+		mes "Wow, so guys must watch out for those sensitive women! Make sure they don't have any grudges on you.";
+		next;
+		mes "Women can bring strange phenomenons with them!";
+		next;
+		mes "I am so intrigued with that story that I'm trying to prove that it can be true.";
+		next;
+		mes "So I need to make women upset! Haha, I know what a mean idea, right?";
+		next;
+		mes "But this is seriously just for studying... So please hunt 30 Sohee's who seems to be revived from victimized souls.";
+		next;
+		mes "So I can keep observing the case.";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "-- Elegance inventor Dorian --";
+		break;
+	case 3258:
+		mes "This mission is assigned by Wallah from Payon.";
+		next;
+		mes "Hello, adventurer. How are you? How is your health?";
+		next;
+		mes "I am a pharmacist and I am having a hard time getting special ingredients lately.";
+		next;
+		mes "Because I am a little sensitive girl, how can I possibly get those things by myself.";
+		next;
+		mes "So, please help me. Just bring 40 Huge Leafs to me, that will be enough to complete my special medicine!";
+		next;
+		mes "Please bring it as soon as possible, people need my medicine.";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "-- Wallah --";
+		break;
+	case 3259:
+		mes "This mission is assigned by puppet master Woonute from Geffen.";
+		next;
+		mes "You know being a puppet master is kind of a hard job to satisfy people.";
+		next;
+		mes "People can search and see so many different things on their own thesedays.";
+		next;
+		mes "Their expectations are getting high, I can't satisfy them anymore.";
+		next;
+		mes "But if I can make new toy concepts, like living toys, it will be ground breaking.";
+		next;
+		mes "I heard that there are live dolls called Marionettes. Can you hunt 30 Marionettes for me? And also bring 30 Golden Hair, those will be great materials for the new toys.";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "-- Puppet Master Woonute --";
+		break;
+	case 3260:
+		mes "This mission is assigned by an exterminator from Prontera.";
+		next;
+		mes "As the weather gets warmer, insects multiply more and more. It is already out of control.";
+		next;
+		mes "People in Prontera cannot sleep because of all the bugs in their house.";
+		next;
+		mes "So, please help us, hunt 30 Hunter Flies. Then the flies can be reduced slowly.";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "-- The Prontera exterminator --";
+		break;
+	case 3261:
+		mes "This mission is assigned by Cheese Dongja from Payon.";
+		next;
+		mes "Have you heard about Munak?";
+		next;
+		mes "The ugly monster Munak is threatening people in Payon.";
+		next;
+		mes "So we need brave adventurers like you!";
+		next;
+		mes "Please hunt 30 Munaks then Payon will be in peace.";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "- Payon Cheese Dongja -";
+		break;
+	case 3262:
+		mes "This mission is assigned by a gem dealer, Ibraham from Morroc.";
+		next;
+		mes "A small beautiful flower in the barren desert... What an incredible scene it would be!";
+		next;
+		mes "Planting flowers can make the world green and it will be so pretty everywhere.";
+		next;
+		mes "I plan to plant strong flowers in the Morroc desert so the soil gets better.";
+		next;
+		mes "I need 40 Maneater Blossom from Flora, I know Maneater Blossom is an ugly flower, but still it is a plant.";
+		next;
+		mes "I hope you can hunt Flora and get me 40 Maneater Blossoms. You are making the world green! Be proud!";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "-- Morroc Ibraham --";
+		break;
+	case 3263:
+		mes "This mission is assigned by the Payon blacksmith Antonio.";
+		next;
+		mes "Magic wand! Have you heard about it? It is an incredible wand!";
+		next;
+		mes "If you say the magic words and swing the wand, it will make your wishes come true.";
+		next;
+		mes "So, I decided to make it by myself. Then I will be rich and powerful~! Haha!!";
+		next;
+		mes "To make the wand, I need some special materials.";
+		next;
+		mes "Please bring me 30 Dokebi Horns and 30 Bamboo Cut. If you do so, I will lend you my magic wand once. Haha, good deal?";
+		next;
+		mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
+		next;
+		mes "-- Payon blacksmith Antonio --";
+		break;
 	}
 	return;
 }
diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt
index 9a11bf2b5..57102982c 100644
--- a/npc/re/quests/eden/71-85.txt
+++ b/npc/re/quests/eden/71-85.txt
@@ -3,602 +3,222 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Description: =========================================
 //= Repetable Quests for Players between Baselevel 71 - 85.
 //===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Some little optimization here and there. [Masao]
 //= 1.2 Optimized. [Euphy]
+//= 1.3 Updated to match the official scripts. [Euphy]
 //============================================================
 
-moc_para01,44,38,3	script	Mission [71 - 85]	857,{
+moc_para01,44,38,3	script	Mission [71 - 85]	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "- Only members of the -";
 		mes "- Eden Group can read -";
 		mes "- this bulletin board. -";
 		close;
 	}
-	mes "- Many hunting missions -";
-	mes "- are on the bulletin board. -";
-	next;
-	if ((BaseLevel > 70) && (BaseLevel < 86)) {
-		switch (select("Sphinx Dungeon:Glast Heim:Juno Area:Clock Tower:Localized Islands")) {
-		case 1:
-			mes "- Sphinx Dungeon -";
-			mes "- I am Meidi who lives -";
-			mes "- in Morocc. I want to hunt -";
-			mes "- monsters in the Sphinx -";
-			mes "- Dungeon. I will wait for -";
-			mes "- you in front of the -";
-			mes "- western gate. -";
-			callsub L_Quest,10102,1;
-			mes "- Good. Now go find Meidi -";
-			mes "- at the western gate -";
-			mes "- in Morroc. -";
-			close;
-		case 2:
-			mes "- Glast Heim -";
-			mes "- I am Ancellia. -";
-			mes "- I need some help -";
-			mes "- hunting monsters -";
-			mes "- in Glast Heim.-";
-			mes "- Please help me. -";
-			callsub L_Quest,10103,2;
-			mes "- Look for Ancellia. -";
-			mes "- in Geffen. -";
-			close;
-		case 3:
-			mes "- Juno Area -";
-			mes "- I want to go to Juno, -";
-			mes "- but the monsters on -";
-			mes "- the way there are too -";
-			mes "- strong for me. Come -";
-			mes "- visit me in Al De Baran. -";
-			mes "- My name is Jeanbai. -";
-			callsub L_Quest,10104,3;
-			mes "- Look for Jeanbai -";
-			mes "- in Al De Baran. -";
-			close;
-		case 4:
-			mes "- Clock Tower -";
-			mes "- A Clock is the best thing! -";
-			mes "- I'm asking you to hunt -";
-			mes "- some monster inside of.-";
-			mes "- the Clock Tower, -";
-			mes "- Risingeter. -";
-			callsub L_Quest,10105,4;
-			mes "- Look for Risingeter -";
-			mes "- in front of the -";
-			mes "- Clock Tower. -";
-			close;
-		case 5:
-			mes "- Localized Islands -";
-			mes "- I need someone who -";
-			mes "- can hunt monsters -";
-			mes "- for Funfi in Alberta. -";
-			callsub L_Quest,10106,5;
-			mes "- Loof for Funfi -";
-			mes "- in Alberta. -";
-			close;
-		}
-	}
-	mes "- Only members of the -";
-	mes "- right level can read -";
-	mes "- this bulletin board. -";
-	mes "- Try to find a board -";
-	mes "- that suits your level. -";
-	close;
-L_Quest:
-	next;
-	if(select("Accept mission.:Decline mission.") == 2) {
-		mes "- I don't want to do -";
-		mes "- a mission right now. -";
-		close;
-	}
-	if (slv_quest && slv_quest != getarg(1)) {
-		mes "- You are already on -";
-		mes "- another mission. -";
-		mes "- You can't do multiple -";
-		mes "- missions. Finish your -";
-		mes "- current mission first. -";
-		close;
-	}
-	if (checkquest(getarg(0)) <= 0) {
-		setquest getarg(0);
-		set slv_quest,getarg(1);
-		return;
-	}
-	mes "- You are already on -";
-	mes "- or have recently -";
-	mes "- completed a mission. -";
-	mes "- You can't do anymore -";
-	mes "- missions right now. -";
-	close;
-}
 
-morocc,35,174,5	script	Meidi	729,{
-
-	if ((checkquest(10107) == 2) && (checkquest(10108) == 2) && (checkquest(10109) == 2) && (slv_quest == 6)) {
-		set slv_quest,0;
-		mes "[Meidi]";
-		mes "You have completed the hunting missions.";
-		mes "I don't have anymore missions for you.";
-		mes "Thanks, you did a great job!";
-		close;
-	}
-	if (checkquest(10107) == 1 || checkquest(10108) == 1 || checkquest(10109) == 1) {
-		mes "[Meidi]";
-		mes "Wow! How did you come back so fast?";
-		mes "What monster did you hunt?";
-		next;
-		setarray .@monsters$[0],"Requiem","Marduk","Pasana";
-		set .@i, select(implode(.@monsters$,":"))-1;
-		if (checkquest(10107+.@i,HUNTING) == 2) {
-			mes "[Meidi]";
-			mes "You've hunted all 10 "+.@monsters$[.@i]+".";
-			mes "Thank you very much.";
-			next;
-			mes "[Meidi]";
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it will be helpful to you.";
-			next;
-			completequest 10107+.@i;
-			getexp 48000,0;
-			mes "[Meidi]";
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
+	// Clear the original quest data (no longer used).
+	if (slv_quest) set slv_quest,0;
+	if (checkquest(10102) > -1 || checkquest(10103) > -1 || checkquest(10104) > -1 || checkquest(10105) > -1 || checkquest(10106) > -1) {
+		for(set .@quest,10102; .@quest<=10106; set .@quest,.@quest+1) {
+			if (checkquest(.@quest) > -1)
+				erasequest .@quest;
 		}
-		mes "[Meidi]";
-		mes "You didn't hunt 10 "+.@monsters$[.@i]+" yet.";
-		mes "You should make sure that you hunt all of them.";
-		mes "Can you check again?";
-		close;
-	}
-	if (slv_quest == 6) {
-		mes "[Meidi]";
-		mes "Sphinx Dungeon... many adventurers came back with great injuries.";
-		mes "That place is very dangerous.";
-		mes "Someone should go inside an make it safer for everyone.";
-		mes "Hopefully, very soon!";
-		close;
-	}
-	mes "[Meidi]";
-	mes "Sphinx Dungeon... many adventurers came back with great injuries.";
-	mes "That place is very dangerous.";
-	mes "Someone should go inside an make it safer for everyone.";
-	mes "Hopefully, very soon!";
-	if (slv_quest == 1) {
-		next;
-		mes "[Meidi]";
-		mes "Oh! Are you from the Eden Group?";
-		mes "Are you here for my mission?";
-		mes "You came right on time.";
-		mes "I was worried that noone would accept the mission that I posted.";
+		mes "- Since the client has moved -";
+		mes "- to another place, -";
+		mes "- the application form has been removed. -";
 		next;
-		mes "[Meidi]";
-		mes "So, I need help hunting 3 monsters";
-		mes "inside of the Sphinx Dungeon.";
-		mes "Got it? Its too dangerous for me so that's why I posted the mission.";
-		next;
-		mes "[Meidi]";
-		mes "Requiem, Marduk and Pasana...";
-		mes "I heard they are very dangerous monsters.";
-		mes "Can you hunt 10 of those monsters?";
-		mes "10 of each sounds good enough, right?";
-		next;
-		mes "[Meidi]";
-		mes "If you succeed, I will give you a small reward for your help.";
-		next;
-		switch (select("Accept mission.:Decline mission.")) {
-		case 1:
-			mes "[Meidi]";
-			mes "Oh. Thank you so much.";
-			mes "How can I pay you backf or your effort?";
-			mes "May Freya bless you~";
-			next;
-			completequest 10102;
-			setquest 10107;
-			setquest 10108;
-			setquest 10109;
-			set slv_quest,6;
-			mes "[Meidi]";
-			mes "Requiem, Marduk and Pasana.";
-			mes "Don't forget and good luck.";
-			close;
-		case 2:
-			set slv_quest,0;
-			erasequest 10102;
-			mes "[Meidi]";
-			mes "I see. There is no other way.";
-			mes "I will send a message to the Eden Group.";
-			mes "Don't worry and nevermind.";
-			close;
-		}
 	}
-	close;
-}
 
-geffen,146,132,3	script	Ancellia	906,{
-	if ((checkquest(10110 == 2)) && (checkquest(10111) == 2) && (checkquest(10112) == 2) && (checkquest(10113) == 2) && (slv_quest == 6)) {
-		set slv_quest,0;
-		mes "[Ancellia]";
-		mes "Wow. You've finished all";
-		mes "of my missions. Great!";
-		mes "You are of great help.";
-		mes "I will inform the Eden Group of your assistance.";
-		mes "You can go back, don't worry.";
-		close;
-	}
-	if (checkquest(10110) == 1 || checkquest(10111) == 1 || checkquest(10112) == 1 || checkquest(10113) == 1) {
-		mes "[Ancellia]";
-		mes "You seem to have hunted all of the monsters.";
-		mes "What monster have you hunted?";
-		mes "Do you remember its name?";
-		next;
-		setarray .@monsters$[0],"Dark Frame","Evil Druid","Wraith","Raydric Archer";
-		set .@i, select(implode(.@monsters$,":"))-1;
-		if (checkquest(10110+.@i,HUNTING) == 2) {
-			mes "[Ancellia]";
-			mes "Ah, you've hunted 10 "+.@monsters$[.@i]+"s.";
-			mes "That was pretty difficult!";
-			mes "Thank you very much.";
+	if (BaseLevel < 71) {
+		mes "- Only members of the -";
+		mes "- right level can read -";
+		mes "- this bulletin board. -";
+		mes "- Try to find a board -";
+		mes "- that suits your level. -";
+		close;
+	} else if (BaseLevel > 85) {
+		// Quest IDs: 10107-10123, 5055-5057
+		setarray .@quests[0],
+			10107,10108,10109,
+			10110,10111,10112,10113,
+			10114,10115,10116,10117,
+			10118,10119,10120,
+			10121,10122,10123,5055,5056;
+		for(set .@i,0; .@i<getarraysize(.@quests); set .@i,.@i+1) {
+			if (checkquest(.@quests[.@i],HUNTING) == 2)
+				set .@complete[getarraysize(.@complete)], .@quests[.@i];
+		}
+		if (checkquest(5057) > -1 && countitem(7187) >= 30)
+			set .@complete[getarraysize(.@complete)],5057;
+		if (getarraysize(.@complete)) {
+			mes "You have quests in progress.";
+			mes "Do you want to turn them in?";
 			next;
-			completequest 10110+.@i;
-			getexp 48000,0;
-			mes "[Ancellia]";
-			mes "Perhaps you can hunt the rest as well.";
-			mes "I will wait for you here.";
+			if(select("Of course.:No.") == 2)
+				close;
+			for(set .@i,0; .@i<getarraysize(.@complete); set .@i,.@i+1)
+				callsub L_Quest,.@complete[.@i];
 			close;
 		}
-		mes "[Ancellia]";
-		mes "Hmm... maybe you were confused.";
-		mes "You didn't hunt all 10 "+.@monsters$[.@i]+".";
-		mes "Can you check again?";
-		close;
-	}
-	if (slv_quest == 6) {
-		mes "[Ancellia]";
-		mes "Go to Glast Heim and kill";
-		mes "Dark Frames, Evil Druids,";
-		mes "Wraith and Raydric Archers.";
-		mes "10 of each should do just fine.";
+		mes "- Only members of the -";
+		mes "- right level can read -";
+		mes "- this bulletin board. -";
+		mes "- Try to find a board -";
+		mes "- that suits your level. -";
 		close;
 	}
-	mes "[Ancellia]";
-	mes "Glast Heim is very far away.";
-	mes "I heared that the castle was cursed by the ancient King of Prontera.";
-	mes "There is a another story.";
+	mes "- Choose where you -";
+	mes "- would like to hunt. -";
 	next;
-	mes "[Ancellia]";
-	mes "One day the came out of the castle and attacked a nearby village, it was terrible.";
-	mes "That's why I can't stop worrying.";
-	if (slv_quest == 2) {
-		next;
-		mes "[Ancellia]";
-		mes "Oh, you got my mission";
-		mes "from the Eden Group. Great~!";
-		mes "Thank you very much.";
-		next;
-		mes "[Ancellia]";
-		mes "I already explained.";
-		mes "So I expect you understand.";
-		mes "You need to hurry hunting";
-		mes "Dark Frames, Evil Druids,";
-		mes "Wraith and Raydric Archesr.";
-		next;
-		mes "[Ancellia]";
-		mes "You should hunt them all.";
-		mes "These are dangerous monsters so please take care of yourself.";
-		next;
-		switch (select("Accept mission.:Decline mission.")) {
-		case 1:
-			mes "[Ancellia]";
-			mes "Thanks a lot.";
-			mes "Be careful when you hunt these monsters. Good luck.";
-			next;
-			completequest 10103;
-			setquest 10110;
-			setquest 10111;
-			setquest 10112;
-			setquest 10113;
-			set slv_quest,6;
-			mes "[Ancellia]";
-			mes "Remember, Dark Frames,";
-			mes "Evil Druids, Wraiths";
-			mes "and Raydric Archers.";
-			close;
-		case 2:
-			set slv_quest,0;
-			erasequest 10103;
-			mes "[Ancellia]";
-			mes "Was the mission too hard?";
-			mes "I guess I'll just have to wait for someone else from the Eden Group to help me.";
-			close;
+	switch(select("Sphinx Dungeon:Glast Heim:Juno Area:Clock Tower:Localized Islands")) {
+	case 1:
+		mes "- There are several requests -";
+		mes "- related to the Sphinx Dungeon -";
+		mes "- on this mission Board. -";
+		next;
+		set .@str1$,"The villagers of Morroc are worried by the increasing number of monsters in the Sphinx Dungeon. ";
+		set .@str2$,"- Meidi from Morroc -";
+		switch(select("Hunt Requiem:Hunt Marduk:Hunt Pasana")) {
+			case 1: callsub L_Quest,10107,.@str1$+"Hunt 10 Requiems.",.@str2$;
+			case 2: callsub L_Quest,10108,.@str1$+"Hunt 10 Marduks.",.@str2$;
+			case 3: callsub L_Quest,10109,.@str1$+"Hunt 10 Pasanas.",.@str2$;
 		}
-	}
-	close;
-}
-
-aldebaran,144,230,3	script	Jeanbai	900,{
-	if ((checkquest(10114) == 2) && (checkquest(10115) == 2) && (checkquest(10116) == 2) && (checkquest(10117) == 2) && (slv_quest == 6)) {
-		set slv_quest,0;
-		mes "[Jeanbai]";
-		mes "You've hunted all of the monsters.";
-		mes "I will inform the Eden Group.";
-		mes "Thank you.";
-		close;
-	}
-	if (checkquest(10114) == 1 || checkquest(10115) == 1 || checkquest(10116) == 1 || checkquest(10117) == 1) {
-		mes "[Jeanbai]";
-		mes "Huh? So... fast...";
-		mes "You amaze me!";
-		mes "So what monster did you hunt?";
-		next;
-		setarray .@monsters$[0],"Grand Peco","Sleeper","Goat","Harpy";
-		set .@i, select(implode(.@monsters$,":"))-1;
-		if (checkquest(10114+.@i,HUNTING) == 2) {
-			mes "[Jeanbai]";
-			mes "You've hunted 20 "+.@monsters$[.@i]+"s. Perfect!";
-			mes "Thanks a lot.";
-			next;
-			completequest 10114+.@i;
-			getexp 48000,0;
-			mes "[Jeanbai]";
-			mes "Please hunt the others as soon as possible.";
-			mes "I have faith in you!";
-			close;
+	case 2:
+		mes "- There are several requests -";
+		mes "- related to Glast Heim -";
+		mes "- on this mission Board. -";
+		next;
+		set .@str1$,"I am very afraid that the monsters from Glast Heim will attack us. ";
+		set .@str2$,"- Ancellia from Geffen -";
+		switch(select("Hunt Dark Frame:Hunt Evil Druid:Hunt Wraith:Hunt Raydric Archer")) {
+			case 1: callsub L_Quest,10110,.@str1$+"Hunt 10 Dark Frames.",.@str2$;
+			case 2: callsub L_Quest,10111,.@str1$+"Hunt 10 Evil Druids.",.@str2$;
+			case 3: callsub L_Quest,10112,.@str1$+"Hunt 10 Wraiths.",.@str2$;
+			case 4: callsub L_Quest,10113,.@str1$+"Hunt 10 Raydric Archers.",.@str2$;
 		}
-		mes "[Jeanbai]";
-		mes "What? Maybe you were confused.";
-		mes "You haven't hunted all 20 "+.@monsters$[.@i]+"s.";
-		mes "Please check again.";
-		close;
-	}
-	if (slv_quest == 6) {
-		mes "[Jeanbai]";
-		mes "Grand Pecos, Sleepers, Goats";
-		mes "and Harpies. Hunt 20 of each.";
-		mes "When you're finished hunting, come back to me.";
-		mes "I hope you finish as soon as you can.";
-		close;
-	}
-	mes "[Jeanbai]";
-	mes "I am traveler Jeanbai.";
-	mes "As I said I'm a traveler not a adventurer so, I am not good at fighting.";
-	mes "That's why I can't travel all over the world.";
-	next;
-	mes "[Jeanbai]";
-	mes "Monsters are increasing in numbers so travelers like me have a hard time getting around.";
-	mes "I wish I could travel around without having to worry about that.";
-	if (slv_quest == 3) {
-		next;
-		mes "[Jeanbai]";
-		mes "Oh, did you get my mission from the Eden Group?";
-		mes "Great~! We don't have a lot of time.";
-		mes "Let me explain.";
-		next;
-		mes "[Jeanbai]";
-		mes "The monsters around Juno,";
-		mes "Grand Pecos, Sleepers, Goats";
-		mes "and Harpies. Please hunt 20 of them.";
-		mes "I've been hesitating to visit Juno because of those monsters around there.";
-		next;
-		mes "[Jeanbai]";
-		mes "Will you accept this mission?";
-		mes "I hope you are the right person for the job.";
-		mes "So what do you say?";
-		next;
-		switch (select("Accept mission.:Decline mission.")) {
-		case 1:
-			mes "[Jeanbai]";
-			mes "Great!";
-			mes "You won't regret it.";
-			next;
-			completequest 10104;
-			setquest 10114;
-			setquest 10115;
-			setquest 10116;
-			setquest 10117;
-			set slv_quest,6;
-			mes "[Jeanbai]";
-			mes "When you're finished hunting, come back to me.";
-			mes "I hope you finish as soon as you can.";
-			close;
-		case 2:
-			set slv_quest,0;
-			erasequest 10104;
-			mes "[Jeanbai]";
-			mes "Too bad. I'm disappointed.";
-			mes "I should inform the Eden Group again.";
-			mes "I see, nevermind.";
-			close;
+	case 3:
+		mes "- There are several requests -";
+		mes "- related to the area -";
+		mes "- around Juno. -";
+		next;
+		set .@str1$,"Those who can't fight, like me, find it much more difficult to travel due to the large number of monsters. ";
+		set .@str2$,"- Jeanbai, traveler -";
+		switch(select("Hunt Grand Peco:Hunt Sleeper:Hunt Goat:Hunt Harpy")) {
+			case 1: callsub L_Quest,10114,.@str1$+"Hunt 20 Grand Pecos.",.@str2$;
+			case 2: callsub L_Quest,10115,.@str1$+"Hunt 20 Sleepers.",.@str2$;
+			case 3: callsub L_Quest,10116,.@str1$+"Hunt 20 Goats.",.@str2$;
+			case 4: callsub L_Quest,10117,.@str1$+"Hunt 20 Harpies.",.@str2$;
 		}
-	}
-	close;
-}
-
-aldebaran,105,116,3	script	Risingeter	869,{
-	if ((checkquest(10118) == 2) && (checkquest(10119) == 2) && (checkquest(10120 == 2)) && (slv_quest == 6)) {
-		set slv_quest,0;
-		mes "[Risingeter]";
-		mes "You've completed all of my missions.";
-		mes "Amazing~! I will inform the Eden Group.";
-		mes "of your assistance. Thanks again!";
-		close;
-	}
-	if (checkquest(10118) == 1 || checkquest(10119) == 1 || checkquest(10120) == 1) {
-		mes "[Risingeter]";
-		mes "Wow. Are you done?";
-		mes "So fast~?! Unbelievable~";
-		mes "You were the right person for this mission.";
-		mes "Which monster did you hunt?";
-		next;
-		setarray .@monsters$[0],"Clock","Punk","Rideword";
-		set .@i, select(implode(.@monsters$,":"))-1;
-		if (checkquest(10118+.@i,HUNTING) == 2) {
-			mes "[Risingeter]";
-			mes "Good! You've hunted 15 "+.@monsters$[.@i]+"s.";
-			mes "Ah, now I can hear the clock sound clearly...";
-			mes "Tic!! toc!! tic!! toc!!...";
-			next;
-			completequest 10118+.@i;
-			getexp 48000,0;
-			mes "[Risingeter]";
-			mes "Thanks a lot!";
-			mes "I hope you can hunt the rest as well.";
-			mes "Go as soon as you can!";
-			close;
+	case 4:
+		mes "- There are several requests -";
+		mes "- related to the Clock Tower -";
+		mes "- on this mission Board. -";
+		next;
+		set .@str1$,"I used to love listening to the sweet melody of the Al De Baran Clock Tower but I can't hear anything anymore because of all the noises the monsters are making. ";
+		set .@str2$,"- Rizingsetter, President of the Love Clock community -";
+		switch(select("Hunt Clock:Hunt Punk:Hunt Rideword")) {
+			case 1: callsub L_Quest,10118,.@str1$+"Hunt 15 Clocks before it breaks.",.@str2$;
+			case 2: callsub L_Quest,10119,.@str1$+"Hunt 15 Punks before it breaks.",.@str2$;
+			case 3: callsub L_Quest,10120,.@str1$+"Hunt 15 Ridewords before it breaks.",.@str2$;
 		}
-		mes "[Risingeter]";
-		mes "Uh? Something is wrong.";
-		mes "15 "+.@monsters$[.@i]+"s, right?";
-		mes "You better check how many you've hunted.";
-		close;
-	}
-	if (slv_quest == 6) {
-		mes "[Risingeter]";
-		mes "Hunt 15 Clocks, Punks, and Ridewords.";
-		mes "Please hurry.";
-		close;
-	}
-	mes "[Risingeter]";
-	mes "I like clocks so much.";
-	mes "They move with regular rhythm";
-	mes "making tic toc sounds.";
-	mes "Ahah!! Hail to the clocks!";
-	next;
-	mes "[Risingeter]";
-	mes "That's why I like the Clock Tower so much.";
-	mes "It makes a really nice sound.";
-	mes "I like it so much!";
-	if (slv_quest == 4) {
-		next;
-		mes "[Risingeter]";
-		mes "Uh? Have you come to help me solve my trouble.";
-		mes "You already know I like clocks right?";
-		mes "That's why I need your help to hunt these monsters.";
-		next;
-		mes "[Risingeter]";
-		mes "There are too many monsters inside the Clock Tower.";
-		mes "Their presence is destroying the Clock Tower.";
-		next;
-		mes "[Risingeter]";
-		mes "Anyway. Can you help me?";
-		mes "Please hunt 15 Clocks, Punks and Ridewords before it breaks down.";
-		next;
-		switch (select("Accept mission.:Decline mission.")) {
-		case 1:
-			completequest 10105;
-			setquest 10118;
-			setquest 10119;
-			setquest 10120;
-			set slv_quest,6;
-			mes "[Risingeter]";
-			mes "Ok! I expect you will do the right thing.";
-			mes "Hunt 15 Clocks, Punks and Ridewords.";
-			close;
-		case 2:
-			set slv_quest,0;
-			erasequest 10105;
-			mes "[Risingeter]";
-			mes "You don't understand my love for clocks";
-			mes "I will find another brave adventurer.";
-			mes "I will inform the Eden Group.";
-			close;
+	case 5:
+		mes "- There are several requests -";
+		mes "- related to the Localized Islands -";
+		mes "- on this mission Board. -";
+		next;
+		set .@str1$,"I want to go on an adventure but there are so many things I have to deal with. If I can't, then others can't either! ";
+		set .@str2$,"- Funfy, who wants to go on an adventure -";
+		switch(select("Hunt Kikimora:Hunt Miyabi Doll:Hunt Mi Gao:Hunt Headless Mule:Hunt Tamruan:Gather Festival Masks for the Festival")) {
+			case 1: callsub L_Quest,10121,.@str1$+"Hunt 15 Kikimoras in Moscovia!",.@str2$;
+			case 2: callsub L_Quest,10122,.@str1$+"Hunt 15 Miyabi Dolls in Amatsu!",.@str2$;
+			case 3: callsub L_Quest,10123,.@str1$+"Hunt 15 Mi Gaos in Louyang!",.@str2$;
+			case 4: callsub L_Quest,5055,"I know there are many terrifying monsters outside the city, but what terrifies me are these Headless Mules lurking around. I hope they will never venture into town. Hunt 15 Headless Mules!","- Mariana from Brasilis -";
+			case 5: callsub L_Quest,5056,"Tamruans make a lot of noise. I don't mind in the morning but they keep me from falling asleep at night. I want to sleep. Hunt 15 Tamruans!","- Shaman Pumo from Ayotaya -";
+			case 6: callsub L_Quest,5057,"The Dumpling Childs stole all the masks that I had prepared for the festival. Try to get a hold of 30 masks! I'll owe you~","- SaYumMoon Chief of Kunlun -";
 		}
 	}
-	close;
-}
+	end;
 
-alberta,215,111,5	script	Funfi	828,{
-	if ((checkquest(10121) == 2) && (checkquest(10122) == 2) && (checkquest(10123) == 2) && (slv_quest == 6)) {
-		set slv_quest,0;
-		mes "[Funfi]";
-		mes "Um! Thank you so much for all your efforts!";
-		mes "I will inform, the Eden Group about your assistance, don't worry!";
-		mes "Hahahaha...";
-		close;
-	}
-	if (checkquest(10121) == 1 || checkquest(10122) == 1 || checkquest(10123) == 1) {
-		mes "[Funfi]";
-		mes "Unbelievable~! So fast~!";
-		mes "Which monster did you hunt?";
-		next;
-		setarray .@monsters$[0],"Kikimora","Miyabi Doll","Mi Gao";
-		set .@i, select(implode(.@monsters$,":"))-1;
-		if (checkquest(10121+.@i,HUNTING) == 2) {
-			mes "[Funfi]";
-			mes "Ok! You've hunted 15 "+.@monsters$[.@i]+"!";
-			mes "You're the best!";
+//callsub L_Quest,<quest ID>{,"<description1>","<description2>"};
+L_Quest:
+	set .@quest, getarg(0);
+	switch(.@quest) {
+		case 10107: set .@name$,"Hunt Requiem"; set .@exp,15000; break;
+		case 10108: set .@name$,"Hunt Marduk"; set .@exp,15000; break;
+		case 10109: set .@name$,"Hunt Pasana"; set .@exp,15000; break;
+		case 10110: set .@name$,"Hunt Dark Frame"; set .@exp,20000; break;
+		case 10111: set .@name$,"Hunt Evil Druid"; set .@exp,20000; break;
+		case 10112: set .@name$,"Hunt Wraith"; set .@exp,20000; break;
+		case 10113: set .@name$,"Hunt Raydric Archer"; set .@exp,20000; break;
+		case 10114: set .@name$,"Hunt Grand Peco"; set .@exp,30000; break;
+		case 10115: set .@name$,"Hunt Sleeper"; set .@exp,30000; break;
+		case 10116: set .@name$,"Hunt Goat"; set .@exp,30000; break;
+		case 10117: set .@name$,"Hunt Harpy"; set .@exp,30000; break;
+		case 10118: set .@name$,"Hunt Clock"; set .@exp,25000; break;
+		case 10119: set .@name$,"Hunt Punk"; set .@exp,25000; break;
+		case 10120: set .@name$,"Hunt Rideword"; set .@exp,25000; break;
+		case 10121: set .@name$,"Hunt Kikimora"; set .@exp,30000; break;
+		case 10122: set .@name$,"Hunt Miyabi Doll"; set .@exp,30000; break;
+		case 10123: set .@name$,"Hunt Mi Gao"; set .@exp,30000; break;
+		case 5055: set .@name$,"Hunt Headless Mule"; set .@exp,30000; break;
+		case 5056: set .@name$,"Hunt Tamruan"; set .@exp,30000; break;
+		case 5057: set .@name$,"Gather Festival Masks for the Festival"; set .@exp,30000; break;
+	}
+	if (getargcount() == 1) {
+		mes "'"+.@name$+"' completed. Do you want to turn it in and receive your reward?";
+		next;
+		if(select("Turn in quest.:Cancel.") == 1) {
+			if (.@quest == 5057) delitem 7187,30; //Festival_Mask
+			erasequest .@quest;
+			getexp .@exp,0;
+			mes "You've received EXP for finishing the quest.";
 			next;
-			completequest 10121+.@i;
-			getexp 48000,0;
-			mes "[Funfi]";
-			mes "Please hunt the others as well.";
-			mes "I have faith in you!";
-			close;
+			return;
 		}
-		mes "[Funfi]";
-		mes "Oh~ No no~!!";
-		mes "Listen carefully! Hunt 15 "+.@monsters$[.@i]+".";
 		close;
-	}
-	if (slv_quest == 6) {
-		mes "[Funfi]";
-		mes "Moscovia's Kikimore,";
-		mes "Miyabi Dolls from Amatsu";
-		mes "and Mi Gaos from Louyang.";
-		mes "Please hunt 15 of each of those monsters.";
-		close;
-	}
-	mes "[Funfi]";
-	mes "I am a man who wants to experience adventures. But for some reason I can't...";
-	next;
-	mes "[Funfi]";
-	mes "There are a lot of funny things in the world... Wooo!";
-	if (slv_quest == 5) {
-		next;
-		mes "[Funfi]";
-		mes "Anyway are you from the Eden Group?";
-		mes "You are? Cool! I've been waiting for you~!";
-		next;
-		mes "[Funfi]";
-		mes "No questions! Just do it now!";
-		mes "Hunt Kikimora in Moscovia,";
-		mes "Miyabi Dolls in Amatsu";
-		mes "and Mi Gaos in Louyang!";
-		mes "Hunt 15 each of those monsters!";
-		next;
-		mes "[Funfi]";
-		mes "Please~!! haha.";
-		mes "Hurry up!";
-		next;
-		switch (select("Accept mission.:Decline mission.")) {
-		case 1:
-			completequest 10106;
-			setquest 10121;
-			setquest 10122;
-			setquest 10123;
-			set slv_quest,6;
-			getitem 7167,10; //Mystery_Iron_Bit
-			mes "[Funfi]";
-			mes "Ok! Good! Hurry up.";
-			mes "Hunt the monsters on each of those 3 islands.";
+	} else {
+		if (.@quest == 5057) {
+			// Quest 5057 is the only collection quest, so separate conditions are unnecessary.
+			if (checkquest(5057) == -1)
+				set .@hunting,-1;
+			else if (countitem(7187) >= 30)
+				set .@hunting,2;
+		} else
+			set .@hunting, checkquest(.@quest,HUNTING);
+		if (.@hunting == 0 || .@hunting == 1) {
+			mes getarg(1);
+			mes getarg(2);
 			next;
-			mes "[Funfi]";
-			mes "I will give you some materials for use in Moscovia.";
-			mes "Go as soon as you can!";
-			close;
-		case 2:
-			set slv_quest,0;
-			erasequest 10106;
-			mes "[Funfi]";
-			mes "What? You don't want to work?! Gosh!";
-			mes "I will inform the Eden Group of this!";
-			close;
+			mes "Return here when you've finished the quest.";
+		} else if (.@hunting == 2) {
+			mes "You have completed the quest.";
+			next;
+			if(select("Turn in quest.:Cancel.") == 1) {
+				if (.@quest == 5057) delitem 7187,30; //Festival_Mask
+				erasequest .@quest;
+				getexp .@exp,0;
+				mes "You've received EXP for finishing the quest.";
+			}
+		}/* else if (.@hunting == 3) {
+//			recall_completequest .@quest
+			erasequest .@quest;
+			mes "You have re-accepted the quest '"+.@name$+"'.";
+		}*/ else {
+			mes getarg(1);
+			mes getarg(2);
+			next;
+			mes "Do you want to accept the quest?";
+			next;
+			if(select("Yes.:No.") == 1) {
+				mes "You've received the quest '"+.@name$+"'. View your quest info for more details.";
+				setquest .@quest;
+			}
 		}
+		close;
 	}
-	close;
 }
diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt
index 4ac5bbb19..01c8fec29 100644
--- a/npc/re/quests/eden/86-90.txt
+++ b/npc/re/quests/eden/86-90.txt
@@ -3,109 +3,196 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
 //===== Description: =========================================
 //= Repetable Quests for Players between Baselevel 86 - 90.
 //===== Additional Comments: =================================
 //= 1.0 First Version. [Chilly]
 //= 1.1 Some little improvements here and there. [Masao]
 //= 1.2 Optimized. [Euphy]
+//= 1.3 Updated to match the official script. [Euphy]
 //============================================================
 
-moc_para01,48,175,3	script	Mission [86 - 90]	857,{
+moc_para01,48,175,3	script	86-90 Mission Board	4_BOARD3,{
 	if (countitem(6219) < 1) {
-		mes "- Only members of the -";
-		mes "- Eden Group can read -";
-		mes "- this bulletin board. -";
-		close;
-	}
-	if (BaseLevel < 86) {
-		mes "- This missions can only be -";
-		mes "- read by those who are -";
-		mes "- of the correct level. -";
-		mes "- There might be another -";
-		mes "- board somewhere for -";
-		mes "- my level. -";
-		close;
+		mes "Wait a minute!";
+		mes "-You need to have an-";
+		mes "-^4d4dff'Eden Group Mark'^000000-";
+		mes "-to receive these missions.-";
+		next;
+		switch(select("Just walk away.:^0000FFEden Group^000000 missions?:How can I be a member of the ^0000FFEden Group^000000?")) {
+		case 1:
+			close;
+		case 2:
+			mes "::The Eden Group Missions";
+			mes "::are basically missions";
+			mes "::requested by";
+			mes "::people from all around the kingdom.";
+			mes "::We just categorize them.";
+			next;
+			mes "::In the Eden Group,";
+			mes "::we sorted out the missions";
+			mes "::according to the level of difficulty.";
+			mes "::According to this level,";
+			mes "::you can find";
+			mes "::missions that";
+			mes "::suit you.";
+			next;
+			mes "::When you are done,";
+			mes "::you can come back";
+			mes "::to the mission board.";
+			next;
+			mes "::Then you will be";
+			mes "::rewarded!!";
+			mes "::Simple, isn't it!!";
+			mes "::No commission required!!";
+			close;
+		case 3:
+			mes "::You can become a member";
+			mes "::of the Eden Group";
+			mes "::to ^0000FFLaime Evenor^000000,";
+			mes "::who is waiting on the 1st floor.";
+			next;
+			mes "::If you become a member,";
+			mes "::you will get an";
+			mes "::\"^006400Eden Group Mark^000000\".";
+			mes "::Then you will be able";
+			mes "::to see the mission board.";
+			close;
+		}
 	}
-	if (BaseLevel > 90) {
-		setarray .@Exp[0],76000,82000,82000,72000,76000,72000,117000,82000,120000,72000,72000,72000,86000,80000;
-		setarray .@Mob$[0],"Dragon Tail","Spring Rabbit","Pest","Bathory","Alarm","Baba Yaga","Hyegun","Antique Firelock","Zipper Bear","Earth Petite","Rafflesia","Venomous","Pitman","Yellow Novus";
-		for(set .@i,0; .@i<14; set .@i,.@i+1)
-			if (checkquest(4167+.@i,HUNTING) == 2) {
-				mes "You hunted all 30 "+.@Mob$[.@i]+".";
-				mes "Thank you very much.";
+	if (BaseLevel < 86  || BaseLevel > 90) {
+		// Quest IDs: 4167-4180
+		// Quest cooldown IDs: 4198-4211
+		setarray .@names$[0],
+			"Dragon Tail","Spring Rabbit","Pest",
+			"Bathory","Alarm",
+			"Baba Yaga","Yao Jun","Firelock Soldier","Zipper Bear",
+			"Ground Petite","Rafflesia","Venomous","Pitman","Yellow Novus";
+		setarray .@exp[0],
+			76000,82000,82000,
+			72000,76000,
+			72000,78000,82000,80000,
+			72000,72000,72000,86000,80000;
+		mes "You must be within level 86-90 to accept these missions.";
+		for(set .@quest,4167; .@quest<=4180; set .@quest,.@quest+1) {
+			set .@hunting, checkquest(.@quest,HUNTING);
+			if (.@hunting == 0 || .@hunting == 1) {
 				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
+				mes ":: You cannot proceed in";
+				mes ":: ^0000FF"+.@names$[.@quest-4167]+" Hunting^000000.";
+				mes ":: The registration to the mission";
+				mes ":: is cancelled.";
+				erasequest .@quest;
+				close;
+			} else if (.@hunting == 2) {
 				next;
-				erasequest 4167+.@i;
-				getexp .@Exp[.@i],0;
-				mes "Wooohoo!";
-				mes "Good luck.";
+				mes ":: You added information";
+				mes ":: about the mission";
+				mes ":: ^0000FF"+.@names$[.@quest-4167]+" Hunting^000000";
+				mes ":: on the mission board.";
+				mes ":: You've got a";
+				mes ":: salutary experience.";
+				erasequest .@quest;
+				getexp .@exp[.@quest-4167],0;
 				close;
 			}
-		mes "- This missions can only be -";
-		mes "- read by those who are -";
-		mes "- of the correct level. -";
-		mes "- There might be another -";
-		mes "- board somewhere for -";
-		mes "- my level. -";
+		}
 		close;
 	}
-	mes "- Many hunting missions -";
-	mes "- are on the bulletin board. -";
+	mes "[86-90 Mission Board]";
+	mes "There are several requests on this board.";
 	next;
-	switch(select("Turtle Dungeon Area:Clock Tower Area:Local Area:Other Area")) {
+	switch(select("^8B4513Turtle Island^000000:^8B4513Clock Tower Dungeon^000000:^8B4513Expansion Towns^000000:^8B4513Other Regions^000000")) {
 	case 1:
-		switch(select("Dragon Tail:Spring Rabbit:Pest")) {
-			case 1: callsub L_Quest,4167,"Dragon Tail",76000;
-			case 2: callsub L_Quest,4168,"Spring Rabbit",82000;
-			case 3: callsub L_Quest,4169,"Pest",82000;
+		mes "^8B4513Turtle Island^000000.";
+		mes "Which monster will you hunt or have you finished hunting?";
+		next;
+		switch(select("^0000FFDragon Tail^000000:^0000FFSpring Rabbit^000000:^0000FFPest^000000")) {
+			case 1: callsub L_Quest,4167,"Dragon Tail",76000,"µå·¡°ïÅ×ÀÏÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000.","s";
+			case 2: callsub L_Quest,4168,"Spring Rabbit",82000,"½ºÇÁ¸µ·¡ºøÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000.","s";
+			case 3: callsub L_Quest,4169,"Pest",82000,"Æ佺Ʈīµå","There is a monster that only can be found on ^8B4513Turtle Island^000000.","s";
 		}
 	case 2:
-		switch(select("Bathory:Alarm")) {
-			case 1: callsub L_Quest,4170,"Bathory",72000;
-			case 2: callsub L_Quest,4171,"Alarm",76000;
+		mes "^8B4513Clock Tower Dungeon^000000.";
+		mes "Which monster will you hunt or have you finished hunting?";
+		next;
+		switch(select("^0000FFBathory^000000:^0000FFAlarm^000000")) {
+			case 1: callsub L_Quest,4170,"Bathory",72000,"¹Ù¼Ò¸®Ä«µå","The Clock Tower Dungeon is full of dangerous monsters.";
+			case 2: callsub L_Quest,4171,"Alarm",76000,"¾Ë¶÷Ä«µå","The Clock Tower Dungeon is full of dangerous monsters.";
 		}
 	case 3:
-		switch(select("Baba Yaga:Hyegun:Antique Firelock:Zipper Bear")) {
-			case 1: callsub L_Quest,4172,"Baba Yaga",72000;
-			case 2: callsub L_Quest,4173,"Hyegun",117000;
-			case 3: callsub L_Quest,4174,"Antique Firelock",82000;
-			case 4: callsub L_Quest,4175,"Zipper Bear",120000;
+		mes "^8B4513Expansion Cities^000000";
+		mes "Which monster will you hunt or have you finished hunting?";
+		next;
+		switch(select("^0000FFBaba Yaga^000000:^0000FFYao Jun^000000:^0000FFFirelock Soldier^000000:^0000FFZipper Bear^000000")) {
+			case 1: callsub L_Quest,4172,"Baba Yaga",72000,"","The witch Baba Yaga can be found in the outskirts of Moscovia.";
+			case 2: callsub L_Quest,4173,"Yao Jun",117000,"Çý±ºÄ«µå","There are human-like monsters that roam around the dungeon in Louyang.";
+			case 3: callsub L_Quest,4174,"Firelock Soldier",82000,"±¸½ÄÁ¶ÃѺ´Ä«µå","There are human-like monsters that roam around the dungeon in Amatsu.","s";
+			case 4: callsub L_Quest,4175,"Zipper Bear",120000,"ÁöÆÛº£¾îÄ«µå","There are bear monsters swarming in the Kunlun dungeon.";
 		}
 	case 4:
-		switch(select("Earth Petite:Rafflesia:Venomous:Pitman:Yellow Novus")) {
-			case 1: callsub L_Quest,4176,"Earth Petite",72000;
-			case 2: callsub L_Quest,4177,"Rafflesia",72000;
-			case 3: callsub L_Quest,4178,"Venomous",72000;
-			case 4: callsub L_Quest,4179,"Pitman",86000;
-			case 5: callsub L_Quest,4180,"Yellow Novus",80000;
+		mes "[86-90 Mission Board]";
+		mes "Here is a list of random requests to hunt monsters in other regions of Rune Midgard.";
+		mes "Which monster will you hunt or have you finished hunting?";
+		next;
+		switch(select("^0000FFGround Petite^000000:^0000FFRafflesia^000000:^0000FFVenomous^000000:^0000FFPitman^000000:^0000FFYellow Novus^000000")) {
+			case 1: callsub L_Quest,4176,"Ground Petite",72000,"Áö»ó»Ú¶ìÄ«µå","There are dragon type monsters swarming the western region of Geffen.";
+			case 2: callsub L_Quest,4177,"Rafflesia",72000,"¶óÇ÷¹½Ã¾ÆÄ«µå","There are plant type monsters infesting the fields of Lighthalzen.";
+			case 3: callsub L_Quest,4178,"Venomous",72000,"º£³ë¸Ó½º","There are formless monsters floating around the fields of Einbroch.";
+			case 4: callsub L_Quest,4179,"Pitman",86000,"Ç͸Ç","There are undead monsters pushing a cart around the fields and dungeons of Einbroch.";
+			case 5: callsub L_Quest,4180,"Yellow Novus",80000,"¿»·Î¿ì³ë¹ö½º","There are yellow dragon type monsters terrorizing the fields of Hugel.";
 		}
 	}
 	end;
+
+//callsub L_Quest,<quest ID>,"<monster name>",<reward EXP>,"<cutin image>","<description>"{,"s"};
 L_Quest:
-	if (checkquest(getarg(0),HUNTING) == 2) {
-		mes "You hunted all 30 "+getarg(1)+".";
-		mes "Thank you very much.";
-		next;
-		mes "I know it isn't much but here's a small gift.";
-		mes "I hope that it helps you at least a little bit.";
-		next;
-		erasequest getarg(0);
-		getexp getarg(2),0;
-		mes "Wooohoo!";
-		mes "Good luck.";
+	set .@quest1, getarg(0);
+	set .@quest2, .@quest1+31;
+	set .@playtime, checkquest(.@quest2,PLAYTIME);
+	if (.@playtime == 0 || .@playtime == 1) {
+		mes "[86-90 Mission Board]";
+		mes "You need to wait 3 hours before you can take this mission again.";
 		close;
 	}
-	if (checkquest(getarg(0)) == -1) {
-		setquest getarg(0);
-		mes "Please hunt 30 "+getarg(1)+" and return here.";
+	set .@hunting, checkquest(.@quest1,HUNTING);
+	if (.@hunting == 0 || .@hunting == 1) {
+		mes "[86-90 Mission Board]";
+		mes "Have you finished hunting all 30 "+getarg(1)+getarg(5,"")+" yet?";
+		close;
+	} else if (.@hunting == 2) {
+		mes "[86-90 Mission Board]";
+		mes "You have completed the hunting.";
+		mes "Please accept this reward as a compensation.";
+		erasequest .@quest1;
+		if (.@playtime > -1) erasequest .@quest2;
+		setquest .@quest2;
+		getexp getarg(2),0;
+		close;
+	}/* else if (.@hunting == 3) {
+//		recall_completequest .@quest1
+		erasequest .@quest1;
+		mes "[86-90 Mission Board]";
+		mes "You have re-accepted the "+getarg(1)+" Hunting mission.";
+		close;
+	}*/ else {
+		mes "[86-90 Mission Board]";
+		mes getarg(4);
+		next;
+		if (getarg(3) != "") cutin getarg(3),3;
+		mes "[86-90 Mission Board]";
+		mes "Hunt 30 "+getarg(1)+" monsters there and post your success on this board.";
+		next;
+		if (getarg(3) != "") cutin getarg(3),255;
+		if(select("I'll hunt them.:No thanks.") == 1) {
+			mes "[86-90 Mission Board]";
+			mes "When you have completed the mission, post it on this board and collect your reward.";
+			if (.@playtime > -1) erasequest .@quest2;
+			setquest .@quest1;
+		}
 		close;
 	}
-	mes "Umm? You didn't hunt";
-	mes "all 30 "+getarg(1)+" yet...";
-	mes "Will you check again?";
-	close;
 }
diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt
index bf80c2a7c..e6744e80f 100644
--- a/npc/re/quests/eden/91-99.txt
+++ b/npc/re/quests/eden/91-99.txt
@@ -3,114 +3,213 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
 //===== Description: =========================================
 //= Repetable Quests for Players between Baselevel 91 - 99.
 //===== Additional Comments: =================================
 //= 1.0 First Version. [Chilly]
 //= 1.1 Some little improvements here and there. [Masao]
 //= 1.2 Optimized. [Euphy]
+//= 1.3 Updated to match the official script. [Euphy]
 //============================================================
 
-moc_para01,48,177,3	script	Mission [91 - 99]	857,{
+moc_para01,48,177,3	script	91-99 Mission Board	4_BOARD3,{
 	if (countitem(6219) < 1) {
-		mes "- Only members of the -";
-		mes "- Eden Group can read -";
-		mes "- this bulletin board. -";
-		close;
-	}
-	if (BaseLevel < 91) {
-		mes "- This missions can only be -";
-		mes "- read by those who are -";
-		mes "- of the correct level. -";
-		mes "- There might be another -";
-		mes "- board somewhere for -";
-		mes "- my level. -";
-		close;
+		mes "Wait a minute!";
+		mes "-You need to have an-";
+		mes "-^4d4dff'Eden Group Mark'^000000-";
+		mes "-to receive these missions.-";
+		next;
+		switch(select("Just walk away.:^0000FFEden Group^000000 missions?:How can I be a member of the ^0000FFEden Group^000000?")) {
+		case 1:
+			close;
+		case 2:
+			mes "::The Eden Group Missions";
+			mes "::are basically missions";
+			mes "::requested by";
+			mes "::people from all around the kingdom.";
+			mes "::We just categorize them.";
+			next;
+			mes "::In the Eden Group,";
+			mes "::we sorted out the missions";
+			mes "::according to the level of difficulty.";
+			mes "::According to this level,";
+			mes "::you can find";
+			mes "::missions that";
+			mes "::suit you.";
+			next;
+			mes "::When you are done,";
+			mes "::you can come back";
+			mes "::to the mission board.";
+			next;
+			mes "::Then you will be";
+			mes "::rewarded!!";
+			mes "::Simple, isn't it!!";
+			mes "::No commission required!!";
+			close;
+		case 3:
+			mes "::You can become a member";
+			mes "::of the Eden Group";
+			mes "::to ^0000FFLaime Evenor^000000,";
+			mes "::who is waiting on the 1st floor.";
+			next;
+			mes "::If you become a member,";
+			mes "::you will get an";
+			mes "::\"^006400Eden Group Mark^000000\".";
+			mes "::Then you will be able";
+			mes "::to see the mission board.";
+			close;
+		}
 	}
-	if (BaseLevel > 99) {
-		setarray .@Exp[0],90000,94000,114000,96000,96000,146000,96000,102000,110000,102000,108000,110000,138000,118000,96000,134000;
-		setarray .@Mob$[0],"Solider","Freezer","Heater","Injustice","Rybio","Dark Priest","Stapo","Roween","Siroma","Shinobi","Evil Nymph","Deviruchi","Mineral","Kaho","Neraid","Disguise";
-		for(set .@i,0; .@i<16; set .@i,.@i+1)
-			if (checkquest(4181+.@i,HUNTING) == 2) {
-				mes "You hunted all 30 "+.@Mob$[.@i]+".";
-				mes "Thank you very much.";
+	if (BaseLevel < 91 || BaseLevel > 99) {
+		// Quest IDs: 4181-4196
+		// Quest cooldown IDs: 4212-4227
+		setarray .@names$[0],
+			"Solider","Freezer","Heater",
+			"Injustice","Rybio","Dark Priest",
+			"Stapo","Roween","Siroma",
+			"Shinobi","Evil Nymph",
+			"Deviruchi","Mineral","Kaho","Neraid","Disguise";
+		setarray .@exp[0],
+			90000,94000,114000,
+			96000,96000,146000,
+			96000,102000,110000,
+			102000,108000,
+			110000,138000,118000,96000,134000;
+		mes "You must be within level 91-99 to accept these missions.";
+		for(set .@quest,4181; .@quest<=4196; set .@quest,.@quest+1) {
+			set .@hunting, checkquest(.@quest,HUNTING);
+			if (.@hunting == 0 || .@hunting == 1) {
 				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
+				mes ":: You cannot proceed in";
+				mes ":: ^0000FF"+.@names$[.@quest-4181]+" Hunting^000000.";
+				mes ":: The registration to the mission";
+				mes ":: is cancelled.";
+				erasequest .@quest;
+				close;
+			} else if (.@hunting == 2) {
 				next;
-				erasequest 4181+.@i;
-				getexp .@Exp[.@i],311000;
-				mes "Wooohoo!";
-				mes "Good luck.";
+				mes ":: You added information";
+				mes ":: about the mission";
+				mes ":: ^0000FF"+.@names$[.@quest-4181]+" Hunting^000000";
+				mes ":: on the mission board.";
+				mes ":: You've got a";
+				mes ":: salutary experience.";
+				erasequest .@quest;
+				getexp .@exp[.@quest-4181],0;
 				close;
 			}
-		mes "- This missions can only be -";
-		mes "- read by those who are -";
-		mes "- of the correct level. -";
-		mes "- There might be another -";
-		mes "- board somewhere for -";
-		mes "- my level. -";
+		}
 		close;
 	}
-	mes "- Many hunting missions -";
-	mes "- are on the bulletin board. -";
+	mes "[91-99 Mission Board]";
+	mes "There are several requests on this board.";
 	next;
-	switch(select("Turtle Dungeon Area:Glast Heim Area:Rachel Area:Local Area:Other Area")) {
+	switch(select("^8B4513Turtle Island^000000:^8B4513Glast Heim^000000:^8B4513Rachel / Veins^000000:^8B4513Expansion Cities^000000:^8B4513Other regions^000000")) {
 	case 1:
-		switch(select("Solider:Freezer:Heater")) {
-			case 1: callsub L_Quest,4181,"Solider",90000;
-			case 2: callsub L_Quest,4182,"Freezer",94000;
-			case 3: callsub L_Quest,4183,"Heater",114000;
+		mes "^8B4513Turtle Island^000000.";
+		mes "Which monster will you hunt or have you finished hunting?";
+		next;
+		switch(select("^0000FFSolider^000000:^0000FFFreezer^000000:^0000FFHeater^000000")) {
+			case 1: callsub L_Quest,4181,"Solider",90000,"¼Ö¸®´õÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000.";
+			case 2: callsub L_Quest,4182,"Freezer",94000,"ÇÁ¸®ÀúÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000.";
+			case 3: callsub L_Quest,4183,"Heater",114000,"È÷ÅÍÄ«µå","There is a monster that only can be found on ^8B4513Turtle Island^000000.";
 		}
 	case 2:
-		switch(select("Injustice:Rybio:Dark Priest")) {
-			case 1: callsub L_Quest,4184,"Injustice",96000;
-			case 2: callsub L_Quest,4185,"Rybio",96000;
-			case 3: callsub L_Quest,4186,"Dark Priest",146000;
+		mes "^8B4513Glast Heim^000000.";
+		mes "Which monster will you hunt or have you finished hunting?";
+		next;
+		switch(select("^0000FFInjustice^000000:^0000FFRybio^000000:^0000FFDark Priest^000000")) {
+			case 1: callsub L_Quest,4184,"Injustice",96000,"ÀÎÀú½ºÆ¼½ºÄ«µå","There is a monster only found in ^8B4513Glast Heim prison^000000.";
+			case 2: callsub L_Quest,4185,"Rybio",96000,"¸®ºñ¿ÀÄ«µå","There is a monster only found in ^8B4513Glast Heim prison^000000.";
+			case 3: callsub L_Quest,4186,"Dark Priest",146000,"´ÙÅ©ÇÁ¸®½ºÆ®Ä«µå","There is a monster only found in ^8B4513Glast Heim prison^000000.";
 		}
 	case 3:
-		switch(select("Stapo:Roween:Siroma")) {
-			case 1: callsub L_Quest,4187,"Stapo",96000;
-			case 2: callsub L_Quest,4188,"Roween",102000;
-			case 3: callsub L_Quest,4189,"Siroma",110000;
+		mes "^8B4513Rachel / Veins^000000.";
+		mes "Which monster will you hunt or have you finished hunting?";
+		next;
+		switch(select("^0000FFStapo^000000:^0000FFRoween^000000:^0000FFSiroma^000000")) {
+			case 1: callsub L_Quest,4187,"Stapo",96000,"½ºÅÂÆ÷Ä«µå","There is a monster only found in ^8B4513Veins^000000.";
+			case 2: callsub L_Quest,4188,"Roween",102000,"·Î¿ìÀ©Ä«µå","There is a monster only found in ^8B4513Rachel^000000.";
+			case 3: callsub L_Quest,4189,"Siroma",110000,"½Ã·Î¸¶Ä«µå","There is a monster only found in ^8B4513Ice Dungeon^000000.";
 		}
 	case 4:
-		switch(select("Shinobi:Evil Nymph")) {
-			case 1: callsub L_Quest,4190,"Shinobi",102000;
-			case 2: callsub L_Quest,4191,"Evil Nymph",108000;
+		mes "^8B4513Expansion Cities^000000.";
+		mes "Which monster will you hunt or have you finished hunting?";
+		next;
+		switch(select("^0000FFShinobi^000000:^0000FFEvil Nymph^000000")) {
+			case 1: callsub L_Quest,4190,"Shinobi",102000,"½Ã³ëºñÄ«µå","There is a monster only found in ^8B4513Amatsu Dungeon^000000.";
+			case 2: callsub L_Quest,4191,"Evil Nymph",108000,"¿ä¼±³àÄ«µå","There is a monster only found in ^8B4513Kunlun Dungeon^000000.";
 		}
 	case 5:
-		switch(select("Deviruchi:Mineral:Kaho:Neraid:Disguise")) {
-			case 1: callsub L_Quest,4192,"Deviruchi",110000;
-			case 2: callsub L_Quest,4193,"Mineral",138000;
-			case 3: callsub L_Quest,4194,"Kaho",118000;
-			case 4: callsub L_Quest,4195,"Neraid",96000;
-			case 5: callsub L_Quest,4196,"Disguise",134000;
+		mes "Other Regions.";
+		mes "Which monster will you hunt or have you finished hunting?";
+		next;
+		switch(select("^0000FFDeviruchi^000000:^0000FFMineral^000000:^0000FFKaho^000000:^0000FFNeraid^000000:^0000FFDisguise^000000")) {
+			case 1: callsub L_Quest,4192,"Deviruchi",110000,"µ¥ºñ·çÄ¡Ä«µå","There is a monster only found in ^8B4513Geffen Dungeon^000000.";
+			case 2: callsub L_Quest,4193,"Mineral",138000,"¹Ì³×¶ö","There is a monster only found in ^8B4513Einbech Dungeon^000000.";
+			case 3: callsub L_Quest,4194,"Kaho",118000,"īȣīµå","There is a monster found in ^8B4513Nogg Road Magma 1^000000.";
+			case 4: callsub L_Quest,4195,"Neraid",96000,"³×·¹À̵åÄ«µå","There is a monster only found in ^8B4513Comodo Dungeon^000000.";
+			case 5: callsub L_Quest,4196,"Disguise",134000,"µð½º°¡ÀÌÁîÄ«µå","There is a monster only found in ^8B4513Nifflheim^000000.";
 		}
 	}
 	end;
+
+//callsub L_Quest,<quest ID>,"<monster name>",<reward EXP>,"<cutin image>","<description>"{,"s"};
 L_Quest:
-	if (checkquest(getarg(0),HUNTING) == 2) {
-		mes "You hunted all 30 "+getarg(1)+".";
-		mes "Thank you very much.";
-		next;
-		mes "I know it isn't much but here's a small gift.";
-		mes "I hope that it helps you at least a little bit.";
-		next;
-		erasequest getarg(0);
-		getexp getarg(2),311000;
-		mes "Wooohoo!";
-		mes "Good luck.";
+	set .@quest1, getarg(0);
+	set .@quest2, .@quest1+31;
+	set .@playtime, checkquest(.@quest2,PLAYTIME);
+	if (.@playtime == 0 || .@playtime == 1) {
+		mes "[91-99 Mission Board]";
+		mes "You need to wait 3 hours before you can take this mission again.";
 		close;
 	}
-	if (checkquest(getarg(0)) == -1) {
-		setquest getarg(0);
-		mes "Please hunt 30 "+getarg(1)+" and return here.";
+	set .@hunting, checkquest(.@quest1,HUNTING);
+	if (.@hunting == 0 || .@hunting == 1) {
+		mes "[91-99 Mission Board]";
+		mes "Have you finished hunting all 30 "+getarg(1)+getarg(5,"")+" yet?";
+		close;
+	} else if (.@hunting == 2) {
+		mes "[91-99 Mission Board]";
+		mes "You have completed the hunting.";
+		mes "Please accept this reward as a compensation.";
+		erasequest .@quest1;
+		if (.@playtime > -1) erasequest .@quest2;
+		setquest .@quest2;
+
+		// Job Experience calculation.
+		if (JobLevel > 50 && JobLevel < 56) set .@jexp,67000;
+		else if (JobLevel > 55 && JobLevel < 61) set .@jexp,94000;
+		else if (JobLevel > 60 && JobLevel < 66) set .@jexp,141000;
+		else if (JobLevel > 65 && JobLevel < 69) set .@jexp,212000;
+		else if (JobLevel == 69) set .@jexp,311000;
+
+		getexp getarg(2),.@jexp;
+		close;
+	}/* else if (.@hunting == 3) {
+//		recall_completequest .@quest1
+		erasequest .@quest1;
+		mes "[91-99 Mission Board]";
+		mes "You have re-accepted the "+getarg(1)+" Hunting mission.";
+		close;
+	}*/ else {
+		mes "[91-99 Mission Board]";
+		mes getarg(4);
+		next;
+		if (getarg(3) != "") cutin getarg(3),3;
+		mes "[91-99 Mission Board]";
+		mes "Hunt 30 "+getarg(1)+" monsters there and post your success on this board.";
+		next;
+		if (getarg(3) != "") cutin getarg(3),255;
+		if(select("I'll hunt them.:No thanks.") == 1) {
+			mes "[91-99 Mission Board]";
+			mes "When you have completed the mission, post it on this board and collect your reward.";
+			if (.@playtime > -1) erasequest .@quest2;
+			setquest .@quest1;
+		}
 		close;
 	}
-	mes "Umm? You didn't hunt";
-	mes "all 30 "+getarg(1)+" yet...";
-	mes "Will you check again?";
-	close;
 }
diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt
index 8570fd39e..7c6be1aa4 100644
--- a/npc/re/quests/eden/eden_common.txt
+++ b/npc/re/quests/eden/eden_common.txt
@@ -1,14 +1,12 @@
 //===== Hercules Script ======================================
 //= Eden Group Quests - Common NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.6
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.8
+//===== Description: =========================================
 //= Eden Group Headquarter NPC's.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Removed showevent use, and use of duplicates.
 //=     Commented out warps that should not be active.
@@ -17,10 +15,11 @@
 //= 1.4 Updated to match the new Izlude Map. [Masao]
 //= 1.5 Added some missing Eden Group Teleport Officers. [Masao]
 //= 1.6 Added Izlude RE coordinates. [Euphy]
+//= 1.7 Added Malaya teleporter. [Euphy]
+//= 1.8 Updated to match the latest official script. [Euphy]
 //============================================================
 
-moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
-
+moc_para01,27,35,5	script	Secretary Lime Evenor	4_F_EDEN_OFFICER,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -68,12 +67,12 @@ moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
 					mes "Let me see.";
 					next;
 					mes "[Lime Evenor]";
-					mes "Your name is ^3131FFBo"+.@input$+"Ba^000000..? Is that right?";
+					mes "Your name is ^3131FFBo"+.@input$+"Ba^000000...? Is that right?";
 					mes "Huh? Isn't it??";
 					next;
 					emotion e_swt;
 					mes "[Lime Evenor]";
-					mes "Hmm that isn't what you wrote?.";
+					mes "Hmm, that isn't what you wrote?";
 					mes "Ok, hmm, it seems a bit hard to read.";
 					next;
 					mes "[Lime Evenor]";
@@ -213,33 +212,44 @@ moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
 		close;
 	}
 }
+prontera,124,76,3	duplicate(eto)	Eden Teleport Officer#1	4_F_NOVICE
+moc_ruins,68,164,3	duplicate(eto)	Eden Teleport Officer#2	4_F_NOVICE
+geffen,132,66,3	duplicate(eto)	Eden Teleport Officer#3	4_F_NOVICE
+alberta,124,67,3	duplicate(eto)	Eden Teleport Officer#4	4_F_NOVICE
+aldebaran,133,119,5	duplicate(eto)	Eden Teleport Officer#5	4_F_NOVICE
+izlude_in,68,162,1	duplicate(eto)	Eden Teleport Officer#6	4_F_NOVICE
+prt_church,103,78,3	duplicate(eto)	Eden Teleport Officer#7	4_F_NOVICE
+geffen_in,160,104,5	duplicate(eto)	Eden Teleport Officer#8	4_F_NOVICE
+moc_prydb1,53,126,3	duplicate(eto)	Eden Teleport Officer#9	4_F_NOVICE
+alberta_in,75,39,3	duplicate(eto)	Eden Teleport Officer#10	4_F_NOVICE
+payon_in02,58,58,1	duplicate(eto)	Eden Teleport Officer#11	4_F_NOVICE
+payon,177,111,3	duplicate(eto)	Eden Teleport Officer#12	4_F_NOVICE
+que_ng,33,73,3	duplicate(eto)	Eden Teleport Officer#13	4_F_NOVICE
+que_ng,144,161,5	duplicate(eto)	Eden Teleport Officer#14	4_F_NOVICE
+yuno,144,189,5	duplicate(eto)	Eden Teleport Officer#15	4_F_NOVICE
+rachel,125,144,3	duplicate(eto)	Eden Teleport Officer#16	4_F_NOVICE
+comodo,202,151,4	duplicate(eto)	Eden Teleport Officer#17	4_F_NOVICE
+hugel,93,153,4	duplicate(eto)	Eden Teleport Officer#18	4_F_NOVICE
+veins,220,109,4	duplicate(eto)	Eden Teleport Officer#19	4_F_NOVICE
+einbroch,250,211,4	duplicate(eto)	Eden Teleport Officer#20	4_F_NOVICE
+lighthalzen,164,86,4	duplicate(eto)	Eden Teleport Officer#21	4_F_NOVICE
+amatsu,100,145,5	duplicate(eto)	Eden Teleport Officer#22	4_F_NOVICE
+ayothaya,221,191,3	duplicate(eto)	Eden Teleport Officer#23	4_F_NOVICE
+louyang,224,107,3	duplicate(eto)	Eden Teleport Officer#24	4_F_NOVICE
+gonryun,162,122,5	duplicate(eto)	Eden Teleport Officer#25	4_F_NOVICE
+moscovia,209,197,5	duplicate(eto)	Eden Teleport Officer#26	4_F_NOVICE
+brasilis,191,224,3	duplicate(eto)	Eden Teleport Officer#27	4_F_NOVICE
+dewata,192,193,5	duplicate(eto)	Eden Teleport Officer#28	4_F_NOVICE
+morocc,161,97,5	duplicate(eto)	Eden Teleport Officer#29	4_F_NOVICE
+izlude,131,148,4	duplicate(eto)	Eden Teleport Officer#30	4_F_NOVICE
+izlude_a,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_a	4_F_NOVICE
+izlude_b,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_b	4_F_NOVICE
+izlude_c,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_c	4_F_NOVICE
+izlude_d,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_d	4_F_NOVICE
+umbala,105,158,3	duplicate(eto)	Eden Teleport Officer#31	4_F_NOVICE
+malaya,238,206,6	duplicate(eto)	Eden Teleport Officer#32	4_F_NOVICE
 
-prontera,124,76,3	duplicate(eto)	Eden Teleport Officer#1	729
-moc_ruins,68,164,3	duplicate(eto)	Eden Teleport Officer#2	729
-geffen,132,66,3	duplicate(eto)	Eden Teleport Officer#3	729
-alberta,124,67,3	duplicate(eto)	Eden Teleport Officer#4	729
-aldebaran,133,119,5	duplicate(eto)	Eden Teleport Officer#5	729
-izlude,131,148,4	duplicate(eto)	Eden Teleport Officer#6	729
-prt_church,103,78,3	duplicate(eto)	Eden Teleport Officer#7	729
-geffen_in,160,104,5	duplicate(eto)	Eden Teleport Officer#8	729
-moc_prydb1,53,126,3	duplicate(eto)	Eden Teleport Officer#9	729
-alberta_in,75,39,3	duplicate(eto)	Eden Teleport Officer#10	729
-payon_in02,58,58,1	duplicate(eto)	Eden Teleport Officer#11	729
-payon,177,111,3	duplicate(eto)	Eden Teleport Officer#12	729
-que_ng,33,73,3	duplicate(eto)	Eden Teleport Officer#13	729
-que_ng,144,161,5	duplicate(eto)	Eden Teleport Officer#14	729
-yuno,144,189,5	duplicate(eto)	Eden Teleport Officer#15	729
-rachel,125,144,3	duplicate(eto)	Eden Teleport Officer#16	729
-morocc,161,97,6	duplicate(eto)	Eden Teleport Officer#17	729
-comodo,202,151,4	duplicate(eto)	Eden Teleport Officer#18	729
-umbala,104,158,4	duplicate(eto)	Eden Teleport Officer#19	729
-veins,220,109,4	duplicate(eto)	Eden Teleport Officer#20	729
-lighthalzen,164,86,4	duplicate(eto)	Eden Teleport Officer#21	729
-einbroch,250,211,4	duplicate(eto)	Eden Teleport Officer#22	729
-hugel,93,153,4	duplicate(eto)	Eden Teleport Officer#23	729
-
-moc_para01,30,10,0	script	#eden_out	45,1,1,{
-
+moc_para01,30,10,0	script	#eden_out	WARPNPC,1,1,{
 OnTouch:
 	switch (nak_warp) {
 		case 1: warp "prontera",116,72; end;
@@ -247,7 +257,7 @@ OnTouch:
 		case 3: warp "geffen",120,39; end;
 		case 4: warp "alberta",117,56; end;
 		case 5: warp "aldebaran",168,112; end;
-		case 6: if (checkre(0)) warp "izlude",134,118; else warp "izlude",127,142; end;
+		case 6: warp "izlude_in",73,165; end;
 		case 7: warp "prt_church",99,78; end;
 		case 8: warp "geffen_in",162,99; end;
 		case 9: warp "moc_prydb1",51,118; end;
@@ -258,19 +268,28 @@ OnTouch:
 		case 14: warp "que_ng",144,166; end;
 		case 15: warp "yuno",158,125; end;
 		case 16: warp "rachel",115,125; end;
-		case 17: warp "morocc",156,93; end;
-		case 18: warp "comodo",209,143; end;
-		case 19: warp "umbala",99,155; end;
-		case 20: warp "veins",216,123; end;
-		case 21: warp "lighthalzen",158,92; end;
-		case 22: warp "einbroch",245,210; end;
-		case 23: warp "hugel",95,145; end;
+		case 17: warp "comodo",192,145; end;
+		case 18: warp "hugel",88,148; end;
+		case 19: warp "veins",216,104; end;
+		case 20: warp "einbroch",246,204; end;
+		case 21: warp "lighthalzen",159,95; end;
+		case 22: warp "amatsu",110,150; end;
+		case 23: warp "ayothaya",217,178; end;
+		case 24: warp "louyang",217,103; end;
+		case 25: warp "gonryun",155,120; end;
+		case 26: warp "moscovia",218,198; end;
+		case 27: warp "brasilis",190,220; end;
+		case 28: warp "dewata",192,182; end;
+		case 29: warp "morocc",161,97; end;
+		case 30: warp "izlude",134,118; end;	// Old coordinates: (127,142)
+		case 31: warp "umbala",94,154; end;
+		case 32: warp "malaya",234,199; end;
 		default: warp "prontera",116,72; end;
 	}
 	end;
 }
 
-moc_para01,47,39,3	script	#warp_2_pass	111,{
+moc_para01,47,39,3	script	#warp_2_pass	HIDDEN_NPC,{
 	if (countitem(6219) > 0) {
 		mes "[Lime Evenor]";
 		mes "Oh, it is an exclusive place only for Eden's members.";
@@ -294,7 +313,7 @@ moc_para01,47,39,3	script	#warp_2_pass	111,{
 	close;
 }
 
-moc_para01,16,22,7	script	Old Adventurer#eden	900,{
+moc_para01,16,22,7	script	Old Adventurer#eden	4_M_HUMERCHANT,{
 	mes "[Old Adventurer]";
 	mes "Harsh, I am strong enough even if I look old! What is his name? Lime Evenor? He just ignores me like I am a some kind of old senile bastard.";
 	next;
@@ -304,7 +323,7 @@ moc_para01,16,22,7	script	Old Adventurer#eden	900,{
 	close;
 }
 
-moc_para01,182,48,3	script	Eden's Chief#eden	886,{
+moc_para01,182,48,3	script	Eden's Chief#eden	4_COOK,{
 	set .@eggf,rand(1,118);
 	set .@eggf_1,.@eggf + 1;
 	set .@eggf_2,.@eggf + 2;
@@ -327,7 +346,7 @@ moc_para01,182,48,3	script	Eden's Chief#eden	886,{
 	close;
 }
 
-moc_para01,172,28,5	script	Eden's Intern#eden	883,{
+moc_para01,172,28,5	script	Eden's Intern#eden	4_M_ALCHE_D,{
 	mes "[Eden's Intern]";
 	mes "Actually, I realized that.";
 	next;
@@ -342,7 +361,7 @@ moc_para01,172,28,5	script	Eden's Intern#eden	883,{
 	close;
 }
 
-moc_para01,20,35,5	script	Office Assistant Neede	814,{
+moc_para01,20,35,5	script	Office Assistant Neede	4_F_CHNDOCTOR,{
 	mes "[Neede]";
 	mes "I became a Eden's member several years ago, but it feels like it was yesterday.";
 	mes "I have been doing lots of work, so I didn't even notice how many years I spent here.";
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
new file mode 100644
index 000000000..78107cc46
--- /dev/null
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -0,0 +1,598 @@
+//===== Hercules Script ======================================
+//= Eden iRO NPCs
+//===== By: ==================================================
+//= -SkittleNugget-
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= Eden scripts custom to iRO (disabled by default).
+//= You may need iRO's data.grf to view some of the items.
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//= 1.1 Edited and added more NPCs, lots of placeholders. [Euphy]
+//============================================================
+
+// Acolyte Warper (part of other/acolyte_warp.txt)
+//============================================================
+moc_para01,14,32,5	script	Aperture#acolytewarp	4_F_01,{
+	mes "[Aperture]";
+	mes "Hello there, adventurer.";
+	mes "I've been studying magic from all over Rune-Midgard to upgrade what I believe to be one of the greatest skills available to the acolyte class.";
+	next;
+	mes "[Aperture]";
+	mes "I am the one and only Acolyte that has attained the Level 10 Warp Portal skill!";
+	emotion e_dots,1;
+	next;
+	mes "[Aperture]";
+	mes "That's right! And...";
+	mes "I promise you that I don't forget locations that I have already memorized.";
+	mes "One day I will level up my skills to warp to wherever I please~";
+	next;
+	mes "[Aperture]";
+	mes "I am willing to warp you to the many locations that I have memorized for a small fee.";
+	mes "Would you like to use this service?";
+	next;
+	switch(select("Yes:No")) {
+	case 1:
+		mes "[Aperture]";
+		mes "Where would you like to go to?";
+		mes "I wish you goodluck on your journey.";
+		next;
+
+		setarray .@towns$[0], "Prontera", "Izlude", "Geffen", "Payon", "Morroc", "Alberta", "Al De Baran", "Comodo", "Umbala", "Juno", "Einbroch", "Lighthalzen", "Hugel", "Rachel";
+		setarray .@cost[0],          600,      600,     1200,    1200,     1200,      1800,          2200,     2200,     2200,   1800,       2200,          2200,    2200,     2200;
+
+		set .@size, getarraysize(.@towns$);
+		for(set .@i,0; .@i<.@size; set .@i,.@i+1)
+			set .@menu$, .@menu$+.@towns$[.@i]+" -> "+.@cost[.@i]+"z:";
+		set .@i, select(.@menu$+"Cancel")-1;
+		if (.@i == .@size) {
+			mes "[Aperture]";
+			mes "Come back when you need a warp.";
+			close;
+		}
+		if (Zeny < .@cost[.@i]) {
+			mes "[Aperture]";
+			mes "I'm sorry, but you don't have";
+			mes "enough zeny for the Teleport";
+			mes "Service. The fee to teleport";
+			mes "to "+.@towns$[.@i]+" is "+.@cost[.@i]+" zeny.";
+			close;
+		}
+		specialeffect2 EF_READYPORTAL;
+		specialeffect2 EF_TELEPORTATION;
+		specialeffect2 EF_PORTAL;
+		next;
+		Zeny -= .@cost[.@i];
+		switch(.@i) {
+			case 0: warp "prontera",116,72; break;
+			case 1: warp "izlude",128,98; break;
+			case 2: warp "geffen",120,39; break;
+			case 3: warp "payon",161,58; break;
+			case 4: warp "morocc",156,46; break;
+			case 5: warp "alberta",117,56; break;
+			case 6: warp "aldebaran",168,112; break;
+			case 7: warp "comodo",209,143; break;
+			case 8: warp "umbala",100,154; break;
+			case 9: warp "yuno",158,125; break;
+			case 10: warp "einbroch",67,195; break;
+			case 11: warp "lighthalzen",159,90; break;
+			case 12: warp "hugel",98,150; break;
+			case 13: warp "rachel",119,135; break;
+		}
+		close;
+	case 2:
+		mes "[Aperture]";
+		mes "Come back when you need a warp.";
+		close;
+	}
+}
+
+// Carrot & Red Potion Traders
+//============================================================
+moc_para01,166,51,3	script	Phelix#edco	4_M_03,{
+	mes "[Phelix]";
+	mes "Oh... I see from that look that you want me to work and give you Meat and Carrots...";
+	mes "Well my friend Izaac here has some Red Potions with him, but I only have some Carrots.";
+	mes "So I can trade you ^0000CC1 Carrot for 3 Jellopy^000000.";
+	next;
+	mes "[Phelix]";
+	mes "If you're interested in my offer, get me the Jellopies I mentioned.";
+	next;
+	select("Carrots please.");
+	mes "[Phelix]";
+	mes "Alright, let's see what ya got...";
+	next;
+	if (countitem(909) < 3) {
+		mes "[Phelix]";
+		mes "Hmm, look dude, I said 3 Jellopies for 1 Carrot... got it?";
+		close;
+	}
+	mes "[Phelix]";
+	mes "Not too bad...";
+	mes "How many do you want?";
+	next;
+	switch(select("As many as I can get, please.:I want to choose.:Never mind, I like my Jellopy.")) {
+	case 1:
+		set .@amount, countitem(909) / 3;
+		break;
+	case 2:
+		set .@available, countitem(909) / 3;
+		mes "[Phelix]";
+		mes "How many do you want?";
+		mes "^ff0000You have enough for up to " + .@available + " Carrots.^000000";
+		input .@input;
+		next;
+		if (.@input < 1 || .@input > 10000) {
+			mes "[Phelix]";
+			mes "Don't want to deal? Fair enough...";
+			close;
+		}
+		if (.@input > .@available) {
+			mes "[Phelix]";
+			mes "Dude, I said for every 3 Jellopy I'll give you 1 Carrot.";
+			close;
+		}
+		set .@amount, .@input;
+		break;
+	case 3:
+		mes "[Phelix]";
+		mes "Don't bother me if you don't want to trade.";
+		close;
+	}
+	if (checkweight(515,.@amount) == 0) {
+		mes "[Phelix]";
+		mes "You are overweight.";
+		close;
+	}
+	mes "[Phelix]";
+	mes "There you go~! As I promised.";
+	mes "Try not to stuff yer face.";
+	delitem 909,.@amount*3; //Jellopy
+	getitem 515,.@amount; //Carrot
+	end;
+}
+
+moc_para01,163,51,7	script	Izaac#edco	4_M_04,{
+	mes "[Izaac]";
+	mes "Good day!";
+	mes "Have you collected any weird stuff from monsters?";
+	mes "I want things like Jellopy, Fluff, Shell, Feather of Birds, Tree Root, Worm Peelings, and Chrysalis.";
+	mes "I need those for something.";
+	next;
+	mes "[Izaac]";
+	mes "Of course, I won't ask you to give me that stuff for free. What if I traded the following for ^CC00001 Red Potion^000000:";
+	mes "^00CC005 Shell^000000";
+	mes "^0000CC10 Fluff^000000";
+	mes "^00CC0010 Jellopy^000000";
+	mes "^0000CC6 Tree Root^000000";
+	mes "^00CC001 Worm Peeling^000000";
+	mes "^0000CC7 Feather of Birds^000000";
+	mes "^00CC006 Chrysalis^000000";
+	next;
+	switch(select("Sure!:I think it's a rip-off!:No, thanks.")) {
+	case 1:
+		mes "[Izaac]";
+		mes "So which items do";
+		mes "you want to bring me?";
+		next;
+
+		setarray .@items[0], 935, 914, 909, 902, 955, 916, 915;
+		setarray .@count[0],   5,  10,  10,   6,   1,   7,   6;
+
+		set .@size, getarraysize(.@items);
+		for(set .@i,0; .@i<.@size; set .@i,.@i+1)
+			set .@menu$, .@menu$+getitemname(.@items[.@i])+":";
+		set .@select, select(.@menu$+"Cancel")-1;
+		if (.@select == .@size) {
+			mes "[Izaac]";
+			mes "Sure~";
+			mes "No problem.";
+			close;
+		}
+		set .@item, .@items[.@select];
+		set .@item$, getitemname(.@item);
+		set .@price, .@count[.@select];
+
+		if (countitem(.@item) < .@price) {
+			mes "[Izaac]";
+			mes "Hey, where's all";
+			mes "that "+.@item$+" that";
+			mes "you promised me?";
+			mes "Give me "+.@item$+"!";
+			close;
+		}
+		mes "[Izaac]";
+		mes "Okay, let me check";
+		mes "how much "+.@item$;
+		mes "you have on you.";
+		mes "Hmm...";
+		next;
+		set .@amount, countitem(.@item) / .@price;
+		set .@trade_amount, .@amount * .@price;
+		mes "[Izaac]";
+		mes "You have";
+		mes "a total of "+countitem(.@item)+" "+.@item$+"...";
+		mes "For all those, I can give you";
+		mes "a total of "+.@amount+" Red Potion(s).";
+		next;
+		mes "[Izaac]";
+		mes "What do you say?";
+		mes "Do we have a deal?";
+		next;
+		if(select("Deal.:No deal.") == 2) {
+			mes "[Izaac]";
+			mes "Huh~";
+			mes "Alright.";
+			mes "Though are";
+			mes .@item$ + " more useful";
+			mes "to an adventurer like you?";
+			close;
+		}
+		if (checkweight(501,.@amount) == 0) { //custom check
+			mes "[Izaac]";
+			mes "You are overweight.";
+			close;
+		}
+		delitem .@item,.@trade_amount;
+		getitem 501,.@amount; //Red_Potion
+		mes "[Izaac]";
+		mes "There you go!";
+		mes "Check how many "+.@item$;
+		mes "I've given you, it should be good.";
+		mes "Thanks, that was a good deal~";
+		close;
+	case 2:
+		mes "[Izaac]";
+		mes "A rip-off...?";
+		mes "If you check the market value";
+		mes "of the items being traded, I'm actually the one getting";
+		mes "ripped off here.";
+		close;
+	case 3:
+		mes "[Izaac]";
+		mes "Alright, No problem.";
+		mes "But come back to me if you change your mind.";
+		close;
+	}
+}
+
+// Safe to 7 Certificate Exchanger
+//============================================================
+moc_para01,50,39,4	script	Eve Natalia	4_F_SITDOWN,{
+	mes "[Eve Natalia]";
+	mes "So I'm in town for a while to see if I can strike up some commerce with MVP hunters!";
+	mes "I'm willing to take some MVP gear and give you these upgrade Certificates I have in exchange;";
+	mes "if things go well enough I'll open up further business opportunities!";
+	next;
+	mes "[Eve Natalia]";
+	mes "So do you have any of the gears I'm looking for to get some random Safe to 7 Certificates?";
+	next;
+	switch(select("What gear?:Yes I am!:Never mind.")) {
+	case 1:
+		mes "[Eve Natalia]";
+		mes "Nidhoggur's Shadow Garb 4 Random Safe to 7 Certificates";
+		mes "Valkyrja's Shield 4 Random Safe to 7 Certificates";
+		mes "Valkyrian Armor 5 Random Safe to 7 Certificates";
+		mes "Diabolus Robe 5 Random Safe to 7 Certificates";
+		mes "Diabolus Armor 2 Random Safe to 7 Certificates";
+		mes "Diabolus Boots 2 Random Safe to 7 Certificates";
+		mes "Diabolus Manteau 4 Random Safe to 7 Certificates";
+		mes "Twin Edge of Naght Sieger Blue 2 Random Safe to 7 Certificates";
+		mes "Twin Edge of Naght Sieger Red 2 Random Safe to 7 Certificates";
+		close;
+	case 2:
+		mes "[Eve Natalia]";
+		mes "I'm going to ask you which piece of gear you want to trade in, please verify that the 1st one in your inventory is one you want to give up.";
+		mes "^CC0000So if it is carded, upgraded, enchanted etc, you should put it in storage before we continue.^000000";
+		next;
+		set .@i, select("Wait a minute:Nidhoggur's Shadow Garb 4:Valkyrja's Shield 4:Valkyrian Armor 5:Diabolus Robe 5:Diabolus Armor 2:Diabolus Boots 2:Diabolus Manteau 4:Twin Edge of Naght Sieger Blue 2:Twin Edge of Naght Sieger Red 2")-2;
+		if (.@i == -1)
+			break;
+
+		setarray .@items[0],   2554, 2115, 2357, 2374, 2375, 2433, 2537, 13412, 13413;
+		setarray .@tickets[0],    4,    4,    5,    5,    2,    2,    4,     2,     2;
+
+		set .@item, .@items[.@i];
+		set .@amount, .@tickets[.@i];
+
+		mes "[Eve Natalia]";
+		mes "I see you have "+countitem(.@item)+" "+getitemname(.@item)+".";
+		mes "So do you want to trade the 1st one in your inventory for ^00CC00"+.@amount+" Random Safe to 7 Certificates^000000?";
+		mes "Tell me '1' if you do, or '0' to cancel.";
+		next;
+		input .@input;
+		if (.@input < 0 || .@input > 1) {
+			mes "[Eve Natalia]";
+			mes "It is a 0 or 1, it can't be that difficult.";
+			close;
+		} else if (.@input == 0) {
+			mes "[Eve Natalia]";
+			mes "It's best to be sure before trading, have a good day.";
+			close;
+		}
+		if (countitem(.@item) == 0) {
+			mes "[Eve Natalia]";
+			mes "You don't even have 1... stop wasting my time.";
+			close;
+		}
+		mes "[Eve Natalia]";
+		mes "Oh perfect, you get ^CC0000" + .@amount + "^000000 Safe to 7 Certificates!";
+		delitem .@item,1;
+		for(set .@i,0; .@i<.@amount; set .@i,.@i+1) {
+			// Note: iRO lists item 6235 as "Safe to 7 Headgear Certificate", but it's Guarantee_Armor_6Up in our database.
+			if (rand(2))
+				getitem 6230,1; //Guarantee_Weapon_7Up
+			else
+				getitem 6234,1; //Guarantee_Armor_7Up
+		}
+		close;
+	case 3:
+		break;
+	}
+	mes "[Eve Natalia]";
+	mes "Fair enough, if you have business with me in the future don't be shy!";
+	close;
+}
+
+// Bubble Gum & Battle Manual Exchanger
+//============================================================
+moc_para01,48,184,2	script	Gum & Manual Exchanger	2_DROP_MACHINE,{
+	if (Weight < MaxWeight / 2) {
+		mes "You're carrying too many items right now.";
+		close;
+	}
+	mes "[Trader Machine]";
+	mes "Insert Bubble Gums and/or Battle Manuals to trade for higher efficiency Gums and Manuals.";
+	next;
+	mes "[Trader Machine]";
+	mes "Exchange rate:";
+	mes "2 Bubble Gum -> 1 HE Bubble Gum";
+	mes "2 Battle Manual -> 1 HE Battle Manual";
+	mes "4 HE Battle Manual -> 1 Battle Manual X3";
+	mes "3 Thick Battle Manual -> 2 Battle Manual X3";
+	mes "What would you like to exchange for?";
+	next;
+	switch(select("HE Bubble Gum:HE Battle Manual:1 Battle Manual X3:2 Battle Manual X3:1 Costume Corsair:Nothing")) {
+	case 1:
+		callsub L_Exchange,12210,2,12412,1;
+		break;
+	case 2:
+		callsub L_Exchange,12208,2,12411,1;
+		break;
+	case 3:
+		callsub L_Exchange,12411,4,14545,1;
+		break;
+	case 4:
+		callsub L_Exchange,12312,3,14545,2;
+		break;
+	case 5:
+		mes "[Trader Machine]";
+		mes "I can give you 1 Battle Manual X3 for 1 Costume Corsair.";
+		next;
+		if (countitem(19619) == 0) {
+			mes "[Trader Machine]";
+			mes "You don't have a Costume Corsair hat to make that trade.";
+			close;
+		}
+		next;
+		if(select("Yes, give it to me!:No, wait not yet.") == 2)
+			close;
+		// Unofficial dialogue.
+		mes "[Trader Machine]";
+		mes "You place the required items into the machine...";
+		next;
+		mes "[Trader Machine]";
+		mes "The Machine has given you an item in return!";
+		delitem 19619,1; //C_Corsair
+		getitem 14545,1; //Battle_Manual_X3
+		close;
+	case 6:
+		close;
+	}
+
+//callsub L_Exchange,<Insert Item>,<Amount>,<Return Item>,<Amount>
+L_Exchange:
+	mes "[Trader Machine]";
+	mes "How many "+getitemname(getarg(2))+" do you want?";
+	mes "I can give you up to 60.";
+	mes "Type 0 to cancel.";
+	next;
+	input .@amount;
+	if (.@amount == 0) {
+		mes "[Trader Machine]";
+		mes "Cancelled.";
+		close;
+	} else if (.@amount < 0 || .@amount > 60) {
+		mes "[Trader Machine]";
+		mes "I said only 60 max.";
+		close;
+	}
+	mes "[Trader Machine]";
+	mes "That's a total of "+.@amount;
+	mes getitemname(getarg(2))+".";
+	mes "Is this correct?";
+	next;
+	if(select("Yes, give them to me!:No, wait not yet.") == 2)
+		close;
+	set .@cost, getarg(1) * .@amount;
+	set .@total_amount, getarg(3) * .@amount;
+	if (countitem(getarg(0)) < .@cost) {
+		mes "[Trader Machine]";
+		mes "You don't have enough "+getitemname(getarg(0))+" to make that trade.";
+		close;
+	}
+	delitem getarg(0),.@cost;
+	getitem getarg(2),.@total_amount;
+	close;
+}
+
+// Kafra Stacker
+//============================================================
+moc_para01,41,169,2	script	Kafra Stacker#eden	4_M_ALCHE_B,{
+	mes "[Toma]";
+	mes "I can take your non-stacking Kafra Consumables";
+	mes "and make them fit neatly into stacks!";
+	next;
+	mes "[Toma]";
+	mes "Please understand that I can";
+	mes "only stack 10 groups at a time";
+	mes "so keep talking to me until";
+	mes "you have 1 stack of each!";
+	next;
+	while(1) {
+		if(select("Do it!:Never mind.") == 2)
+			break;
+		// Something strange goes on here, haven't quite figured it out...
+		mes "[Toma]";
+		mes "Ten stack down!";
+		mes "Want to do another?";
+		next;
+	}
+	mes "[Toma]";
+	mes "Ok then, laterz.";
+	close;
+}
+
+// Code Redeemer
+//============================================================
+moc_para01,38,162,2	script	Code the Redeemer#Give1	4_M_YOUNGKNIGHT,{
+	mes "[Code the Redeemer]";
+	mes "Welcome, "+strcharinfo(0)+"!";
+	mes "I've been expecting you.";
+	next;
+	mes "[Code the Redeemer]";
+	mes "I am a distributor of all the";
+	mes "items that adventurers like";
+	mes "yourself purchase on websites";
+	mes "or receive as promotions.";
+	next;
+	mes "[Code the Redeemer]";
+	mes "^0000FFIf the list is empty,";
+	mes "that means that you have";
+	mes "not purchased, or inputted";
+	mes "your serial code from the purchasing website.^000000";
+	next;
+
+	// If you have a code redemption system, write your SQL queries here.
+	select("");
+
+	close;
+}
+
+// Cash Shops
+//============================================================
+/* Due to the irregularity of iRO's databases, some of these sprites may not display properly. */
+
+moc_para01,32,171,4	cashshop	Kafra Headgears#eden1	4_F_KAFRA3,14024:500,14098:150,17081:300,14097:500,14094:1000,14017:400,14099:300
+moc_para01,35,174,2	cashshop	Kafra Dye Shop#dyes2	4_F_KAFRA4,6287:150
+moc_para01,36,170,2	cashshop	Kafra Consumables#eden3	4_F_KAFRA6,13810:5,14167:400,16556:100,14111:75,14075:25,16419:30,14107:70,14104:50,14112:25,14082:30,14091:60,14088:30,14085:60,14169:40,14170:40,14172:40,14173:40,14171:40,14174:40,14159:100,14160:100,14161:100,14162:100,14163:100:14164:100,16420:1500
+moc_para01,32,174,2	cashshop	Kafra Rental Items#eden	4_F_KAFRA7,16683:150,16682:50,14126:250,14125:250,16430:250,14137:250,14127:250,14118:250,14119:250,14132:250,16425:250,14124:250,14133:250,14130:250,16424:250,14136:250,14122:250,16426:250,14135:250,14134:250,14138:250,16428:250,16431:250,14139:250,14131:250,16429:250,16427:250
+moc_para01,36,172,2	cashshop	Kafra Costume#eden5	4_F_KAFRA8,16974:300,16972:600,16973:150,16975:150,16977:150,17014:150,17015:150
+moc_para01,35,168,1	cashshop	Kafra Utility Shop#eden	4_F_KAFRA5,16677:25,13990:400,16396:100,16394:100,17106:500,6241:10,6240:10,6225:15,6226:15,14002:5,6294:500,7776:50,7619:30,7620:30,12208:40,14156:400,12210:40,14158:400,14042:50,14044:50,14046:50,14048:50,14114:50,14166:40,16418:500,16381:400,14165:100,14157:100,14178:100
+
+// Duplicate NPCs
+//============================================================
+/* Technically these NPC names are different, but it's not worth editing the original scripts. */
+
+// Weapon/Armor Refiner "Normalson" (merchants/refine.txt)
+moc_para01,14,185,4	script	Normalson#ed	4_M_DWARF,{
+	callfunc "refinemain","Normalson",0;
+	end;
+}
+
+// Advanced Refiner "Suhnmi" (merchants/advanced_refiner.txt)
+moc_para01,26,185,4	duplicate(Suhnbi#cash)	Suhnmi#eden	4_M_03
+
+// HD Refiner "Blacksmith Mighty Hammer" (re/merchants/hd_refiner.txt)
+// A combination of the +7~9 and +10 and up refiner, currently a placeholder.
+moc_para01,38,185,4	duplicate(MightyHammer)	Mighty Hammer#ed	4_M_DWARF
+
+// Refiner Effect
+-	script	#eden_refine_effect	-1,{
+OnInit:
+	initnpctimer;
+	end;
+OnTimer5000:
+	specialeffect EF_REFINEOK,AREA,"Suhnmi#eden";
+	specialeffect EF_REFINEOK,AREA,"Mighty Hammer#ed";
+	initnpctimer;
+	end;
+}
+
+// Gym Pass Trainer "Ripped Cabus" (other/gympass)
+moc_para01,33,162,4	duplicate(Ripped Cabus#GymPass)	Ripped Callus#ed	4_M_HUMAN_02
+
+// RWC 2012 Enchanter "Goldenthiefberg" (events/RWC_2012.txt)
+// A combination of the slotter and enchanter, currently a placeholder.
+moc_para01,27,179,4	script	RWC Enchanter#new10	4_M_BARBER,{ end; }
+
+// Cash Headgear Dyer "Alora" (merchants/cashheadgear_dye.txt)
+// Also converts some +8 and up headgears into costumes, currently a placeholder.
+moc_para01,21,185,4	duplicate(Alora)	Alora#headgear_dye2	4_F_LGTGIRL
+
+// Stylist "Dinorah Lacostt" (?)
+// Dyes clothing for an Omni Clothing Dye, currently a placeholder.
+moc_para01,33,185,4	script	Dinorah Lacostt#ed	4_F_LGTGIRL,{ end; }
+
+// Commonly Updated NPCs
+//============================================================
+/* These scripts change on a regular basis, so they're mostly just placeholders for now. */
+
+moc_para01,29,35,4	script	Gramps#huntquests	4_M_LGTGRAND,{
+	mes "[Gramps]";
+	mes "When you get to being my";
+	mes "age, you become bitter.";
+	mes "Too long I've done nothing about the monsters that roam around";
+	mes "Rune Midgard.";
+	next;
+	mes "[Gramps]";
+	mes "That's why I'm asking you wippersnappers to help";
+	mes "me hunt some monsters.";
+	mes "Will you help me, young adventurer?";
+	close;
+	//next;
+	//switch(select("Yes, I'll help.:Reward Me!:^ff0000I want to quit hunting^000000:^0000ffCan you warp me?^000000:Can you erase the timer?:What missions are you giving?:Give me Limited 3 day VIP:Tell me more about the VIP Access:No thanks, pops.")) {
+}
+
+moc_para01,13,22,4	script	Merry Badger#xch	4_F_SITDOWN,{
+	mes "[Merry Badger]";
+	mes "Hello there!  I'm Merry Badger and I was hired to exchange the ^00CC00Eden Merit Badges^000000!";
+	next;
+	mes "[Merry Badger]";
+	mes "I can take your Merit Badges and give you some useful stuff, or I can take some of your stuff and give you some Eden Merit Badges.";
+	mes "As I get more authorization I can offer more things to trade with you, so definitely keep me in mind when visiting the Eden Group.";
+	close;
+	//next;
+	//switch(select("Redeem Badges:Trade in FOR badges:Exchange Rates:15 Job Manuals - 1 JM Box")) {
+}
+
+moc_para01,174,33,3	script	Bathory#2012spirits	BATHORY,{
+	mes "[Bathory]";
+	mes "Eheeheeheehee! The spotlight is on Glast Heim this week, so I'm ferrying people there for a mere 1,000z!";
+	next;
+	mes "[Bathory]";
+	mes "How about it? Want to take a ride on a beautiful Bathory's broom?";
+	next;
+	switch(select("Prepare for Takeoff!:No thanks.")) {
+	case 1:
+		if (Zeny < 1000) {
+			mes "[Bathory]";
+			mes "Come on dearie...";
+			mes "You don't even have 1,000 zeny?";
+			close;
+		}
+		mes "[Bathory]";
+		mes "Alright, hold on tight!";
+		close2;
+		Zeny -= 1000;
+		warp "niflheim",194,185;
+		end;
+	case 2:
+		mes "["+strcharinfo(0)+"]";
+		mes "No thanks, maybe later.";
+		close;
+	}
+}
+
+moc_para01,26,174,4	script	Grandma Boxter#boxx	4_F_THAISHAMAN,{ end; }
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index 4a85bdc79..f1b54a9e7 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -3,25 +3,23 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4b
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.5
 //===== Description: =========================================
-//= Eden Group Headquarter NPC's.
+//= Eden Group Headquarter NPCs.
 //===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Removed unencoded comments (Korean -> Gibberish)
 //=     Readded the GM helper NPC, commented out.
 //= 1.2 Some little optimization here and there. [Masao]
 //= 1.3 Added Instructor Ur and the new Quests which come
-//= alongside him. Special thanks to Chilly for the base. [Masao]
+//=     alongside him. Special thanks to Chilly for the base. [Masao]
 //= 1.4 Partial cleaning and bug fixing. [Euphy]
 //= 1.4a Added 'npcskill' command. [Euphy]
 //= 1.4b Added 'disable_items' command. [Euphy]
+//= 1.5 Added GM management function. [Euphy]
 //============================================================
 
-moc_para01,25,35,4	script	Instructor Boya#para01	469,{
-
+moc_para01,25,35,4	script	Instructor Boya#para01	4_M_KNIGHT_GOLD,{
 	if (countitem(6219) > 0) {
 		if (para_suv01 == 0) {
 			mes "[Boya]";
@@ -1091,8 +1089,7 @@ moc_para01,25,35,4	script	Instructor Boya#para01	469,{
 	close;
 }
 
-moc_fild11,180,253,5	script	Talking Dog#para03	972,{
-
+moc_fild11,180,253,5	script	Talking Dog#para03	4_RUS_DWOLF,{
 	if (para_suv01 == 1) {
 		mes "[Talking Dog]";
 		mes "kkkkuuuuahhh.";
@@ -1184,7 +1181,7 @@ moc_fild11,180,253,5	script	Talking Dog#para03	972,{
 		mes "Oh, if you are tired I will help you.";
 		next;
 		mes "-When the dog barked, your HP and SP recovered.-";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1222,7 +1219,7 @@ moc_fild11,180,253,5	script	Talking Dog#para03	972,{
 		mes "Oh, if you are tired I will help you.";
 		next;
 		mes "-When the dog barked, your HP and SP recovered.-";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1278,7 +1275,7 @@ moc_fild11,180,253,5	script	Talking Dog#para03	972,{
 		mes "Oh, if you are tired I will help you.";
 		next;
 		mes "-When the dog barked, your HP and SP recovered.-";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1326,7 +1323,7 @@ moc_fild11,180,253,5	script	Talking Dog#para03	972,{
 	close;
 }
 
-prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
+prt_sewb1,131,262,3	script	Timid Cat#para04	4_M_BABYCAT,{
 	if (para_suv01 < 6) {
 		mes "[Timid Cat]";
 		mes "Meow...";
@@ -1424,8 +1421,8 @@ prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
 		mes "[Timid Cat]";
 		mes "Take care to check your map so you don't get lost.";
 		mes "It's a service meeow.";
-		npcskill "AL_HEAL",10,99,60;
-		percentheal 0,100;
+		npcskill "AL_HEAL",11,99,60;
+		percentheal 100,100;
 		close;
 	}
 	if (para_suv01 == 8) {
@@ -1462,7 +1459,7 @@ prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
 		mes "[Timid Cat]";
 		mes "I will help you a little.";
 		mes "Here, I have recovered your strengh meow..";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1497,8 +1494,8 @@ prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
 		mes "It's the last course so cheer up.";
 		mes "I will help you a little.";
 		mes "Here, I have recovered your strengh meow..";
-		npcskill "AL_HEAL",10,99,60;
-		percentheal 0,100;
+		npcskill "AL_HEAL",11,99,60;
+		percentheal 100,100;
 		close;
 	}
 	if (para_suv01 >= 10) {
@@ -1518,7 +1515,7 @@ prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
 	close;
 }
 
-pay_arche,41,136,3	script	Eden Member Karl#para05	904,{
+pay_arche,41,136,3	script	Eden Member Karl#para05	4_M_KHMAN,{
 	if (para_suv01 < 13) {
 		if (countitem(6219) > 0) {
 			mes "[Karl]";
@@ -1609,7 +1606,7 @@ pay_arche,41,136,3	script	Eden Member Karl#para05	904,{
 		mes "[Karl]";
 		mes "Just in case I will recover all your energy.";
 		mes "It's the last step so be careful.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1640,8 +1637,8 @@ pay_arche,41,136,3	script	Eden Member Karl#para05	904,{
 		mes "[Karl]";
 		mes "Just in case I will recover all your energy.";
 		mes "It's the last step so be careful.";
-		npcskill "AL_HEAL",10,99,60;
-		percentheal 0,100;
+		npcskill "AL_HEAL",11,99,60;
+		percentheal 100,100;
 		close;
 	}
 	if (para_suv01 >= 16) {
@@ -1661,8 +1658,7 @@ pay_arche,41,136,3	script	Eden Member Karl#para05	904,{
 	close;
 }
 
-anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
-
+anthell01,29,264,5	script	Eden Member Cloud#para06	4_M_HUMAN_02,{
 	if (para_suv01 < 17) {
 		if (countitem(6219) > 0) {
 			mes "[Cloud]";
@@ -1763,7 +1759,7 @@ anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
 		mes "What do you think of Ant Hell?";
 		mes "Can you stay longer?";
 		mes "Ok, I will recover your strengh so, keep going.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1802,7 +1798,7 @@ anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
 		mes "[Cloud]";
 		mes "See, to cheer you up I will heal you until you finish the training.";
 		mes "Chin up and cheer up.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1830,7 +1826,7 @@ anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
 		mes "[Cloud]";
 		mes "Just Vitata, isn't that an easy opponent?";
 		mes "If you see Maya just run away.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1852,7 +1848,7 @@ anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
 	close;
 }
 
-in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
+in_orcs01,38,175,3	script	Eden Member Hooksha	1_F_SIGNZISK,{
 	if (para_suv01 < 24) {
 		if (countitem(6219) > 0) {
 			mes "[Hooksha]";
@@ -1945,7 +1941,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "[Hooksha]";
 		mes "You look tired I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1976,7 +1972,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "[Hooksha]";
 		mes "You look tired, I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -2002,7 +1998,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "[Hooksha]";
 		mes "You look tired, I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -2075,7 +2071,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "Can you stay longer?";
 		mes "You look tired, I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -2099,7 +2095,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "Can you stay longer?";
 		mes "You look tired I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -2121,8 +2117,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 	}
 }
 
-iz_dun04,43,46,3	script	Eden Member Callandiva	745,{
-
+iz_dun04,43,46,3	script	Eden Member Callandiva	4_F_CRU,{
 	if (para_suv01 < 33) {
 		if (countitem(6219) > 0) {
 			mes "[Callandiva]";
@@ -2203,8 +2198,8 @@ iz_dun04,43,46,3	script	Eden Member Callandiva	745,{
 		mes "Oh are you tired?";
 		mes "Mermans are not easy opponents.";
 		mes "I will help you recover so cheer up.";
-		npcskill "AL_HEAL",10,99,60;
-		percentheal 0,100;
+		npcskill "AL_HEAL",11,99,60;
+		percentheal 100,100;
 		close;
 	}
 	if (para_suv01 == 35) {
@@ -2237,7 +2232,7 @@ iz_dun04,43,46,3	script	Eden Member Callandiva	745,{
 		mes "Oh are you tired?";
 		mes "Strouf are not easy opponents.";
 		mes "I can help you recover so cheer up.";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -2262,8 +2257,7 @@ iz_dun04,43,46,3	script	Eden Member Callandiva	745,{
 	close;
 }
 
-moc_para01,112,96,5	script	Administrator Michael	967,{
-
+moc_para01,112,96,5	script	Administrator Michael	4_M_RUSMAN1,{
 	mes "[Michael]";
 	mes "Why did you come here?";
 	next;
@@ -2335,7 +2329,7 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 				mes "Make enough space.";
 				close;
 			case 2:
-				if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader){
+				if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader) {
 					mes "[Michael]";
 					mes "What kind of weapon do you want?";
 					mes "We have one and Two-handed swords.";
@@ -2418,21 +2412,72 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 						mes "This is what we strive for.";
 						close;
 					}
-				}	if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Ninja || Class == Job_Novice || Class == Job_Novice_High) {
-						mes "[Michael]";
-						mes "We only have 1 weapon for you.";
-						next;
-						mes "[Michael]";
-						mes "Eden Dagger I: Dagger. MATK+60, attack 124.";
-						mes "It is Lv. 2 and the required level is 26.";
-						next;
+				}
+				if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Ninja || Class == Job_Novice || Class == Job_Novice_High) {
+					mes "[Michael]";
+					mes "We only have 1 weapon for you.";
+					next;
+					mes "[Michael]";
+					mes "Eden Dagger I: Dagger. MATK+60, attack 124.";
+					mes "It is Lv. 2 and the required level is 26.";
+					next;
+					mes "[Michael]";
+					mes "It also can't be traded with other players or be refined.";
+					next;
+					mes "[Michael]";
+					mes "You'll receive the Eden Dagger I.";
+					next;
+					mes "[Michael]";
+					mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
+					next;
+					if (para_suv02 == 0) {
 						mes "[Michael]";
-						mes "It also can't be traded with other players or be refined.";
+						mes "You don't have a record of receiving any supplies";
+						mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
+						set para_suv01,23;
+						set para_suv02,2;
+						getitem 13050,1; //P_Dagger1
+						getitem 2457,1; //Para_Team_Boots2
+						getitem 15010,1; //Para_Team_Uniform2
+						getitem 5583,1; //Para_Team_Hat
+						getitem 2560,1; //Para_Team_Manteau
 						next;
 						mes "[Michael]";
-						mes "You'll receive the Eden Dagger I.";
-						next;
+						mes "Check your supplies again and look after it.";
+						close;
+					}
+					mes "[Michael]";
+					mes "A Dagger, Uniform and Boots all 3 supplies.";
+					mes "Please check it again.";
+					set para_suv01,23;
+					set para_suv02,2;
+					getitem 13050,1; //P_Dagger1
+					getitem 2457,1; //Para_Team_Boots2
+					getitem 15010,1; //Para_Team_Uniform2
+					next;
+					mes "[Michael]";
+					mes "I hope they're useful to you.";
+					mes "This is what we strive for.";
+					close;
+				}
+				if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) {
+					mes "[Michael]";
+					mes "What kind of weapon do you want?";
+					mes "We have a mace and a One-handed sword.";
+					mes "Here are the options.";
+					next;
+					mes "[Michael]";
+					mes "Eden Saber I: One-handed sword. attack 147.";
+					mes "Eden Mace I: Mace. attack 142.";
+					mes "Both are level 2 and the required level is 26.";
+					next;
+					mes "[Michael]";
+					mes "They also can't be traded with other players or be refined.";
+					next;
+					switch (select("Eden Sabre I:Eden Mace I")) {
+					case 1:
 						mes "[Michael]";
+						mes "You've chosen the Eden Sabre I.";
 						mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
 						next;
 						if (para_suv02 == 0) {
@@ -2441,7 +2486,7 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 							mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
 							set para_suv01,23;
 							set para_suv02,2;
-							getitem 13050,1; //P_Dagger1
+							getitem 13423,1; //P_Sabre1
 							getitem 2457,1; //Para_Team_Boots2
 							getitem 15010,1; //Para_Team_Uniform2
 							getitem 5583,1; //Para_Team_Hat
@@ -2452,11 +2497,11 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 							close;
 						}
 						mes "[Michael]";
-						mes "A Dagger, Uniform and Boots all 3 supplies.";
+						mes "A One-handed Sword, Uniform and Boots all 3 supplies.";
 						mes "Please check it again.";
 						set para_suv01,23;
 						set para_suv02,2;
-						getitem 13050,1; //P_Dagger1
+						getitem 13423,1; //P_Sabre1
 						getitem 2457,1; //Para_Team_Boots2
 						getitem 15010,1; //Para_Team_Uniform2
 						next;
@@ -2464,115 +2509,18 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 						mes "I hope they're useful to you.";
 						mes "This is what we strive for.";
 						close;
-					}
-					if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) {
-						mes "[Michael]";
-						mes "What kind of weapon do you want?";
-						mes "We have a mace and a One-handed sword.";
-						mes "Here are the options.";
-						next;
-						mes "[Michael]";
-						mes "Eden Saber I: One-handed sword. attack 147.";
-						mes "Eden Mace I: Mace. attack 142.";
-						mes "Both are level 2 and the required level is 26.";
-						next;
-						mes "[Michael]";
-						mes "They also can't be traded with other players or be refined.";
-						next;
-						switch (select("Eden Sabre I:Eden Mace I")) {
-						case 1:
-							mes "[Michael]";
-							mes "You've chosen the Eden Sabre I.";
-							mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
-							next;
-							if (para_suv02 == 0) {
-								mes "[Michael]";
-								mes "You don't have a record of receiving any supplies";
-								mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
-								set para_suv01,23;
-								set para_suv02,2;
-								getitem 13423,1; //P_Sabre1
-								getitem 2457,1; //Para_Team_Boots2
-								getitem 15010,1; //Para_Team_Uniform2
-								getitem 5583,1; //Para_Team_Hat
-								getitem 2560,1; //Para_Team_Manteau
-								next;
-								mes "[Michael]";
-								mes "Check your supplies again and look after it.";
-								close;
-							}
-							mes "[Michael]";
-							mes "A One-handed Sword, Uniform and Boots all 3 supplies.";
-							mes "Please check it again.";
-							set para_suv01,23;
-							set para_suv02,2;
-							getitem 13423,1; //P_Sabre1
-							getitem 2457,1; //Para_Team_Boots2
-							getitem 15010,1; //Para_Team_Uniform2
-							next;
-							mes "[Michael]";
-							mes "I hope they're useful to you.";
-							mes "This is what we strive for.";
-							close;
-						case 2:
-							mes "[Michael]";
-							mes "You've chosen the Eden Mace I.";
-							mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
-							next;
-							if (para_suv02 == 0) {
-								mes "[Michael]";
-								mes "You don't have a record of receiving any supplies";
-								mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
-								set para_suv01,23;
-								set para_suv02,2;
-								getitem 16004,1; //P_Mace1
-								getitem 2457,1; //Para_Team_Boots2
-								getitem 15010,1; //Para_Team_Uniform2
-								getitem 5583,1; //Para_Team_Hat
-								getitem 2560,1; //Para_Team_Manteau
-								next;
-								mes "[Michael]";
-								mes "Check your supplies again and look after it.";
-								close;
-							}
-							mes "[Michael]";
-							mes "A Mace, Uniform and Boots all 3 supplies.";
-							mes "Please check it again.";
-							set para_suv01,23;
-							set para_suv02,2;
-							getitem 16004,1; //P_Mace1
-							getitem 2457,1; //Para_Team_Boots2
-							getitem 15010,1; //Para_Team_Uniform2
-							next;
-							mes "[Michael]";
-							mes "I hope they're useful to you.";
-							close;
-						}
-					}
-					if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) {
-						mes "[Michael]";
-						mes "We only have 1 weapon for you.";
-						next;
-						mes "[Michael]";
-						mes "Eden Bow I: Bow. attack 82.";
-						mes "It is Lv. 2 and the required level is 26.";
-						next;
-						mes "[Michael]";
-						mes "It also can't be traded with other players or be refined.";
-						next;
-						mes "[Michael]";
-						mes "You'll receive the Eden Bow I.";
-						next;
+					case 2:
 						mes "[Michael]";
+						mes "You've chosen the Eden Mace I.";
 						mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
 						next;
 						if (para_suv02 == 0) {
 							mes "[Michael]";
 							mes "You don't have a record of receiving any supplies";
 							mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
-							set para_suv01, 23;
-							set para_suv02, 2;
-							getitem 1747,1; //P_Bow1
+							set para_suv01,23;
+							set para_suv02,2;
+							getitem 16004,1; //P_Mace1
 							getitem 2457,1; //Para_Team_Boots2
 							getitem 15010,1; //Para_Team_Uniform2
 							getitem 5583,1; //Para_Team_Hat
@@ -2583,11 +2531,11 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 							close;
 						}
 						mes "[Michael]";
-						mes "A Bow, Uniform and Boots all 3 supplies.";
+						mes "A Mace, Uniform and Boots all 3 supplies.";
 						mes "Please check it again.";
 						set para_suv01,23;
 						set para_suv02,2;
-						getitem 1747,1; //P_Bow1
+						getitem 16004,1; //P_Mace1
 						getitem 2457,1; //Para_Team_Boots2
 						getitem 15010,1; //Para_Team_Uniform2
 						next;
@@ -2595,112 +2543,79 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 						mes "I hope they're useful to you.";
 						close;
 					}
-					if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
-						mes "[Michael]";
-						mes "What kind of weapon do you want?";
-						mes "We have a mace and a staff.";
-						mes "Here are the options.";
-						next;
+				}
+				if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) {
+					mes "[Michael]";
+					mes "We only have 1 weapon for you.";
+					next;
+					mes "[Michael]";
+					mes "Eden Bow I: Bow. attack 82.";
+					mes "It is Lv. 2 and the required level is 26.";
+					next;
+					mes "[Michael]";
+					mes "It also can't be traded with other players or be refined.";
+					next;
+					mes "[Michael]";
+					mes "You'll receive the Eden Bow I.";
+					next;
+					mes "[Michael]";
+					mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
+					next;
+					if (para_suv02 == 0) {
 						mes "[Michael]";
-						mes "Eden Mace I: Mace. attack 142.";
-						mes "Eden Staff I: Staff. INT+2, MATK+125, attack 60.";
-						mes "Both are Lv. 2 and the required level is 26.";
+						mes "You don't have a record of receiving any supplies";
+						mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
+						set para_suv01, 23;
+						set para_suv02, 2;
+						getitem 1747,1; //P_Bow1
+						getitem 2457,1; //Para_Team_Boots2
+						getitem 15010,1; //Para_Team_Uniform2
+						getitem 5583,1; //Para_Team_Hat
+						getitem 2560,1; //Para_Team_Manteau
 						next;
 						mes "[Michael]";
-						mes "They also can't be traded with other players or be refined.";
-						next;
-						switch (select("Eden Staff I:Eden Mace I")) {
-						case 1:
-							mes "[Michael]";
-							mes "You've chosen the Eden Staff I.";
-							mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
-							next;
-							if (para_suv02 == 0) {
-								mes "[Michael]";
-								mes "You don't have a record of receiving any supplies";
-								mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
-								set para_suv01,23;
-								set para_suv02,2;
-								getitem 1650,1; //P_Staff1
-								getitem 2457,1; //Para_Team_Boots2
-								getitem 15010,1; //Para_Team_Uniform2
-								getitem 5583,1; //Para_Team_Hat
-								getitem 2560,1; //Para_Team_Manteau
-								next;
-								mes "[Michael]";
-								mes "Check your supplies again and look after it.";
-								close;
-							}
-							mes "[Michael]";
-							mes "A Staff, Uniform and Boots all 3 supplies.";
-							mes "Please check it again.";
-							set para_suv01,23;
-							set para_suv02,2;
-							getitem 1650,1; //P_Staff1
-							getitem 2457,1; //Para_Team_Boots2
-							getitem 15010,1; //Para_Team_Uniform2
-							next;
-							mes "[Michael]";
-							mes "I hope they're useful to you.";
-							close;
-						case 2:
-							mes "[Michael]";
-							mes "You've chosen the Eden Mace I.";
-							mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
-							next;
-							if (para_suv02 == 0) {
-								mes "[Michael]";
-								mes "You don't have a record of receiving any supplies";
-								mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
-								set para_suv01,23;
-								set para_suv02,2;
-								getitem 16004,1; //P_Mace1
-								getitem 2457,1; //Para_Team_Boots2
-								getitem 15010,1; //Para_Team_Uniform2
-								getitem 5583,1; //Para_Team_Hat
-								getitem 2560,1; //Para_Team_Manteau
-								next;
-								mes "[Michael]";
-								mes "Check your supplies again and look after it.";
-								close;
-							}
-							mes "[Michael]";
-							mes "A Mace, Uniform and Boots all 3 supplies.";
-							mes "Please check it again.";
-							set para_suv01,23;
-							set para_suv02,2;
-							getitem 16004,1; //P_Mace1
-							getitem 2457,1; //Para_Team_Boots2
-							getitem 15010,1; //Para_Team_Uniform2
-							next;
-							mes "[Michael]";
-							mes "I hope they're useful to you.";
-							close;
-						}
+						mes "Check your supplies again and look after it.";
+						close;
 					}
-					if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) {
-						mes "[Michael]";
-						mes "We only have 1 weapon for you.";
-						next;
-						mes "[Michael]";
-						mes "Eden Staff I: Staff. INT+2, MATK+125, attack 60.";
-						mes "It is Lv. 2 and the required level is 26.";
-						next;
-						mes "[Michael]";
-						mes "It also can't be traded with other players or be refined.";
-						next;
-						mes "[Michael]";
-						mes "You'll receive the Eden Staff I.";
-						next;
+					mes "[Michael]";
+					mes "A Bow, Uniform and Boots all 3 supplies.";
+					mes "Please check it again.";
+					set para_suv01,23;
+					set para_suv02,2;
+					getitem 1747,1; //P_Bow1
+					getitem 2457,1; //Para_Team_Boots2
+					getitem 15010,1; //Para_Team_Uniform2
+					next;
+					mes "[Michael]";
+					mes "I hope they're useful to you.";
+					close;
+				}
+				if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
+					mes "[Michael]";
+					mes "What kind of weapon do you want?";
+					mes "We have a mace and a staff.";
+					mes "Here are the options.";
+					next;
+					mes "[Michael]";
+					mes "Eden Mace I: Mace. attack 142.";
+					mes "Eden Staff I: Staff. INT+2, MATK+125, attack 60.";
+					mes "Both are Lv. 2 and the required level is 26.";
+					next;
+					mes "[Michael]";
+					mes "They also can't be traded with other players or be refined.";
+					next;
+					switch (select("Eden Staff I:Eden Mace I")) {
+					case 1:
 						mes "[Michael]";
+						mes "You've chosen the Eden Staff I.";
 						mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
 						next;
 						if (para_suv02 == 0) {
 							mes "[Michael]";
 							mes "You don't have a record of receiving any supplies";
 							mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
-							set para_suv01, 23;
-							set para_suv02, 2;
+							set para_suv01,23;
+							set para_suv02,2;
 							getitem 1650,1; //P_Staff1
 							getitem 2457,1; //Para_Team_Boots2
 							getitem 15010,1; //Para_Team_Uniform2
@@ -2723,31 +2638,18 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 						mes "[Michael]";
 						mes "I hope they're useful to you.";
 						close;
-					}
-					if (Class == Job_Gunslinger) {
-						mes "[Michael]";
-						mes "We only have 1 weapon for you.";
-						next;
-						mes "[Michael]";
-						mes "Eden Revolver I: Revolver. HIT-5, attack 44.";
-						mes "It is Lv. 2 and the required level is 26.";
-						next;
-						mes "[Michael]";
-						mes "It also can't be traded with other players or be refined.";
-						next;
-						mes "[Michael]";
-						mes "You'll receive the Eden Revolver I.";
-						next;
+					case 2:
 						mes "[Michael]";
+						mes "You've chosen the Eden Mace I.";
 						mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
 						next;
 						if (para_suv02 == 0) {
 							mes "[Michael]";
 							mes "You don't have a record of receiving any supplies";
 							mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
-							set para_suv01, 23;
-							set para_suv02, 2;
-							getitem 13112,1; //P_Revolver1
+							set para_suv01,23;
+							set para_suv02,2;
+							getitem 16004,1; //P_Mace1
 							getitem 2457,1; //Para_Team_Boots2
 							getitem 15010,1; //Para_Team_Uniform2
 							getitem 5583,1; //Para_Team_Hat
@@ -2758,11 +2660,11 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 							close;
 						}
 						mes "[Michael]";
-						mes "A Revolver, Uniform and Boots all 3 supplies.";
+						mes "A Mace, Uniform and Boots all 3 supplies.";
 						mes "Please check it again.";
 						set para_suv01,23;
 						set para_suv02,2;
-						getitem 13112,1; //P_Revolver1
+						getitem 16004,1; //P_Mace1
 						getitem 2457,1; //Para_Team_Boots2
 						getitem 15010,1; //Para_Team_Uniform2
 						next;
@@ -2770,6 +2672,99 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 						mes "I hope they're useful to you.";
 						close;
 					}
+				}
+				if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) {
+					mes "[Michael]";
+					mes "We only have 1 weapon for you.";
+					next;
+					mes "[Michael]";
+					mes "Eden Staff I: Staff. INT+2, MATK+125, attack 60.";
+					mes "It is Lv. 2 and the required level is 26.";
+					next;
+					mes "[Michael]";
+					mes "It also can't be traded with other players or be refined.";
+					next;
+					mes "[Michael]";
+					mes "You'll receive the Eden Staff I.";
+					next;
+					mes "[Michael]";
+					mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
+					next;
+					if (para_suv02 == 0) {
+						mes "[Michael]";
+						mes "You don't have a record of receiving any supplies";
+						mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
+						set para_suv01, 23;
+						set para_suv02, 2;
+						getitem 1650,1; //P_Staff1
+						getitem 2457,1; //Para_Team_Boots2
+						getitem 15010,1; //Para_Team_Uniform2
+						getitem 5583,1; //Para_Team_Hat
+						getitem 2560,1; //Para_Team_Manteau
+						next;
+						mes "[Michael]";
+						mes "Check your supplies again and look after it.";
+						close;
+					}
+					mes "[Michael]";
+					mes "A Staff, Uniform and Boots all 3 supplies.";
+					mes "Please check it again.";
+					set para_suv01,23;
+					set para_suv02,2;
+					getitem 1650,1; //P_Staff1
+					getitem 2457,1; //Para_Team_Boots2
+					getitem 15010,1; //Para_Team_Uniform2
+					next;
+					mes "[Michael]";
+					mes "I hope they're useful to you.";
+					close;
+				}
+				if (Class == Job_Gunslinger) {
+					mes "[Michael]";
+					mes "We only have 1 weapon for you.";
+					next;
+					mes "[Michael]";
+					mes "Eden Revolver I: Revolver. HIT-5, attack 44.";
+					mes "It is Lv. 2 and the required level is 26.";
+					next;
+					mes "[Michael]";
+					mes "It also can't be traded with other players or be refined.";
+					next;
+					mes "[Michael]";
+					mes "You'll receive the Eden Revolver I.";
+					next;
+					mes "[Michael]";
+					mes "Additionally you'll receive the Eden Group Boots II and Uniform II.";
+					next;
+					if (para_suv02 == 0) {
+						mes "[Michael]";
+						mes "You don't have a record of receiving any supplies";
+						mes "so, you'll receive the Eden Group Hat and Manteau aswell.";
+						set para_suv01, 23;
+						set para_suv02, 2;
+						getitem 13112,1; //P_Revolver1
+						getitem 2457,1; //Para_Team_Boots2
+						getitem 15010,1; //Para_Team_Uniform2
+						getitem 5583,1; //Para_Team_Hat
+						getitem 2560,1; //Para_Team_Manteau
+						next;
+						mes "[Michael]";
+						mes "Check your supplies again and look after it.";
+						close;
+					}
+					mes "[Michael]";
+					mes "A Revolver, Uniform and Boots all 3 supplies.";
+					mes "Please check it again.";
+					set para_suv01,23;
+					set para_suv02,2;
+					getitem 13112,1; //P_Revolver1
+					getitem 2457,1; //Para_Team_Boots2
+					getitem 15010,1; //Para_Team_Uniform2
+					next;
+					mes "[Michael]";
+					mes "I hope they're useful to you.";
+					close;
+				}
 				mes "[Michael]";
 				mes "Let me see... you will receive..";
 				mes "the Eden Group Boots II and Uniform II.";
@@ -3363,6 +3358,7 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 		mes "[Michael]";
 		mes "You mean upgrading equipment, right?";
 		mes "We can only upgrade the Eden Group Hat.";
+		next;
 		if (para_suv02 == 3) {
 			if (countitem(5583) > 0) {
 				disable_items;
@@ -3538,8 +3534,7 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 	}
 }
 
-moc_para01,179,44,3	script	Chef	820,{
-
+moc_para01,179,44,3	script	Chef	4_M_CHNCOOK,{
 	mes "[Chef]";
 	mes "What's up?";
 	mes "Do you want a Meal? Or do you have other business?";
@@ -3627,7 +3622,7 @@ moc_para01,179,44,3	script	Chef	820,{
 					next;
 					mes "- After eating the meal, You feel a little bit full.";
 					mes "You've recovered some HP and SP. -";
-					set Zeny, Zeny - 2700;
+					Zeny -= 2700;
 					percentheal 50,0;
 					percentheal 0,50;
 					close;
@@ -3644,7 +3639,7 @@ moc_para01,179,44,3	script	Chef	820,{
 				next;
 				mes "- After eating the meal, You feel a little bit full.";
 				mes "You've recovered some HP and SP. -";
-				set Zeny, Zeny - 3000;
+				Zeny -= 3000;
 				percentheal 50,0;
 				percentheal 0,50;
 				close;
@@ -3666,7 +3661,7 @@ moc_para01,179,44,3	script	Chef	820,{
 					next;
 					mes "- After eating the meal, You feel a little bit full.";
 					mes "You've recovered some HP and SP. -";
-					set Zeny, Zeny - 3600;
+					Zeny -= 3600;
 					percentheal 75,0;
 					percentheal 0,75;
 					close;
@@ -3683,7 +3678,7 @@ moc_para01,179,44,3	script	Chef	820,{
 				next;
 				mes "- After eating the meal, You feel a little bit full.";
 				mes "You've recovered some HP and SP. -";
-				set Zeny, Zeny - 4000;
+				Zeny -= 4000;
 				percentheal 75,0;
 				percentheal 0,75;
 				close;
@@ -3702,7 +3697,7 @@ moc_para01,179,44,3	script	Chef	820,{
 					mes "- The Rib Eye Roll is grilled on the oak.";
 					mes "- After eating the meal, You feel a little bit full.";
 					mes "You've recovered your HP and SP. -";
-					set Zeny, Zeny - 4500;
+					Zeny -= 4500;
 					percentheal 100,0;
 					percentheal 0,100;
 					close;
@@ -3721,7 +3716,7 @@ moc_para01,179,44,3	script	Chef	820,{
 				mes "- The Rib Eye Roll is grilled on the oak.";
 				mes "- After eating the meal, You feel a little bit full.";
 				mes "You've recovered your HP and SP. -";
-				set Zeny, Zeny - 5000;
+				Zeny -= 5000;
 				percentheal 100,0;
 				percentheal 0,100;
 				close;
@@ -3843,7 +3838,7 @@ moc_para01,179,44,3	script	Chef	820,{
 	}
 }
 
-moc_para01,23,35,4	script	Instructor Ur	468,{
+moc_para01,23,35,4	script	Instructor Ur	4_M_KNIGHT_BLACK,{
 	mes "[Instructor Ur]";
 	if (countitem(6219) > 0) {
 		if (BaseLevel < 60) {
@@ -3990,7 +3985,7 @@ L_Level:
 	close;
 }
 
-comodo,173,354,6	script	Romeo#01	55,{
+comodo,173,354,6	script	Romeo#01	1_M_JOBTESTER,{
 	if ((para_suv01 == 39) && (romeo < 1)) {
 		mes "[Romeo]";
 		mes "Ah, there you are.";
@@ -4036,7 +4031,7 @@ comodo,173,354,6	script	Romeo#01	55,{
 	close;
 }
 
-um_fild01,34,280,6	script	Romeo#02	55,{
+um_fild01,34,280,6	script	Romeo#02	1_M_JOBTESTER,{
 	if (romeo == 2) {
 		if (checkquest(7216,HUNTING) == 2) {
 			mes "[Romeo]";
@@ -4088,7 +4083,7 @@ um_fild01,34,280,6	script	Romeo#02	55,{
 	close;
 }
 
-glast_01,195,131,6	script	Johan	95,{
+glast_01,195,131,6	script	Johan	4_F_SISTER,{
 	if ((para_suv01 == 43) && (johan < 1)) {
 		mes "[Johan]";
 		mes "...";
@@ -4153,7 +4148,7 @@ glast_01,195,131,6	script	Johan	95,{
 	close;
 }
 
-ein_fild08,172,359,4	script	Kiren	989,{
+ein_fild08,172,359,4	script	Kiren	4_M_4THPRIN1,{
 	if ((para_suv01 == 46) && (kiren < 1)) {
 		mes "[Kiren]";
 		mes "Hey there.";
@@ -4220,7 +4215,7 @@ ein_fild08,172,359,4	script	Kiren	989,{
 	close;
 }
 
-ice_dun01,154,13,6	script	Naomi	726,{
+ice_dun01,154,13,6	script	Naomi	4_F_JOB_BLACKSMITH,{
 	if ((para_suv01 == 49) && (naomi < 1)) {
 		mes "[Naomi]";
 		mes "It is so cold in here.";
@@ -4288,7 +4283,7 @@ ice_dun01,154,13,6	script	Naomi	726,{
 	close;
 }
 
-mid_camp,212,229,4	script	Margaret	893,{
+mid_camp,212,229,4	script	Margaret	4_F_HUWOMAN,{
 	if ((para_suv01 == 52) && (margaret < 1)) {
 		mes "[Margaret]";
 		mes "Oh, hello there.";
@@ -4339,7 +4334,7 @@ mid_camp,212,229,4	script	Margaret	893,{
 	close;
 }
 
-man_fild01,43,234,2	script	Paradise Dispatch#01	939,{
+man_fild01,43,234,2	script	Paradise Dispatch#01	4_DST_SOLDIER,{
 	if (margaret == 1) {
 		mes "[Paradise Dispatch]";
 		mes "Hey you, can you help me here?";
@@ -4385,7 +4380,7 @@ man_fild01,43,234,2	script	Paradise Dispatch#01	939,{
 	close;
 }
 
-spl_fild02,377,149,4	script	Paradise Dispatch#02	946,{
+spl_fild02,377,149,4	script	Paradise Dispatch#02	4_M_DST_MASTER,{
 	if (margaret == 4) {
 		mes "[Paradise Dispatch]";
 		mes "So Margaret sent you to help me?";
@@ -4431,7 +4426,7 @@ spl_fild02,377,149,4	script	Paradise Dispatch#02	946,{
 	close;
 }
 
-moc_para01,111,83,3	script	Toren	813,{
+moc_para01,111,83,3	script	Toren	2_M_OLDBLSMITH,{
 	if (checkweight(1101,5) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -4565,12 +4560,12 @@ moc_para01,111,83,3	script	Toren	813,{
 			close;
 		}
 		if (para_suv02 == 14) {
-			setarray .@Check[0],18514,2571,2473,15031;
-			setarray .@Item$[0],"Hat","Mantle","Boots","Uniform";
-			for(set .@i,0; .@i<4; set .@i,.@i+1) 
-				if (countitem(.@Check[.@i]) < 1) {
+			setarray .@check[0],18514,2571,2473,15031;
+			setarray .@item$[0],"Hat","Mantle","Boots","Uniform";
+			for(set .@i,0; .@i<4; set .@i,.@i+1)
+				if (countitem(.@check[.@i]) < 1) {
 					mes "[Toren]";
-					mes "Where is the Paradise "+.@Item$[.@i]+" I gave you?";
+					mes "Where is the Paradise "+.@item$[.@i]+" I gave you?";
 					next;
 					mes "[Toren]";
 					mes "...Fine, I will sell you another one for ^FF0000250,000 Zeny^000000. Don't lose it this time.";
@@ -4585,8 +4580,8 @@ moc_para01,111,83,3	script	Toren	813,{
 						mes "You dont have enough zeny.";
 						close;
 					}
-					set Zeny, Zeny - 250000;
-					getitem .@Check[.@i],1;
+					Zeny -= 250000;
+					getitem .@check[.@i],1;
 					mes "[Toren]";
 					mes "These advanced gears are not easy to make, please take better care of this one.";
 					close;
@@ -4664,14 +4659,14 @@ moc_para01,111,83,3	script	Toren	813,{
 			mes "[Toren]";
 			mes "Now pick which gear you would like me to enchant.";
 			next;
-			setarray .@Item[0],2571,2473,15031;
+			setarray .@item[0],2571,2473,15031;
 			set .@i, select("Paradise Mantle II.:Paradise Boots IV.:Paradise Uniform IV.")-1;
-			if (countitem(.@Item[.@i]) < 1) {
+			if (countitem(.@item[.@i]) < 1) {
 				mes "[Toren]";
 				mes "Bring one and I'll enchant it.";
 				close;
 			}
-			set .@paragearcount, .@Item[.@i];
+			set .@paragearcount, .@item[.@i];
 			mes "[Toren]";
 			mes "Here we go!";
 			close2;
@@ -4697,7 +4692,7 @@ moc_para01,111,83,3	script	Toren	813,{
 			else if (.@enc_paragear < 35) set .@addpart,4787;
 			else if (.@enc_paragear < 39) set .@addpart,4791;
 			else if (.@enc_paragear < 43) set .@addpart,4786;
-			set .@enc_paragear2,4701+(10*rand(6));
+			set .@addpart2,4701+(10*rand(6));
 			delitem .@paragearcount,1;
 			getitem2 .@paragearcount, 1, 1, 0, 0, 0, 0, .@addpart2, .@addpart;
 			set paragearenchant,4;
@@ -4736,7 +4731,7 @@ L_Select:
 	return;
 }
 
-moc_para01,112,79,3	script	Weapons Expert	851,{
+moc_para01,112,79,3	script	Weapons Expert	4_M_REPAIR,{
 	if (checkweight(1101,5) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you are carrying";
@@ -4769,7 +4764,7 @@ moc_para01,112,79,3	script	Weapons Expert	851,{
 					mes "Wait... Your Class doesn't have a weapon.";
 					close;
 				}
-				set Zeny, Zeny - 250000;
+				Zeny -= 250000;
 				if (BaseClass == Job_Swordman) {
 					mes "Swordman Class gets a choice of weapons, would you like to have a sword or a spear?";
 					callsub L_Select,
@@ -5125,30 +5120,22 @@ L_GetWeapon:
 	return;
 }
 
-/* sec_in02,25,33,4	script	Assistant	422,{
+sec_in02,25,33,4	script	Assistant#para_suvquest	4_M_BABYCAT,{
+	callfunc "F_GM_NPC";
 	mes "Password";
 	next;
-	input .@input;
-	if (.@input == 1854) {
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
 		mes "Please select the variable you want to modify.";
 		next;
-		switch (select("para_suv01:para_suv02")) {
-		case 1:
-			mes "Enter the modified value";
-			next;
-			input .@input;
-			mes "Value of para_suv01 has been changed to "+.@input+".";
-			set para_suv01,.@input;
-			close;
-		case 2:
-			mes "Enter the modified value";
-			next;
-			input .@input;
-			mes "Value of para_suv02 has been changed to "+.@input+".";
-			set para_suv02,.@input;
-			close;
-		}
+		set .@var, select("para_suv01:para_suv02");
+		mes "Enter the modified value";
+		next;
+		input .@input,0,9999;
+		mes "Value of para_suv0"+.@var+" has been changed to "+.@input+".";
+		setd "para_suv0"+.@var,.@input;
+		close;
+	} else {
+		mes "......meow wee.";
+		close;
 	}
-	mes "......meow wee.";
-	close;
-}*/
+}
diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt
index fd6e9a47f..544c7b11a 100644
--- a/npc/re/quests/eden/eden_service.txt
+++ b/npc/re/quests/eden/eden_service.txt
@@ -4,8 +4,6 @@
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Paradise Group storage access.
 //===== Additional Comments: =================================
@@ -43,7 +41,7 @@
 						mes "Maybe I am not yet qualified to use Cabinet.";
 						close;
 					}
-					set Zeny, Zeny - 500;
+					Zeny -= 500;
 					close2;
 					openstorage;
 					end;
@@ -60,5 +58,5 @@
 	close;
 }
 
-moc_para01,173,120,0	duplicate(pggc)	Goods Cabinet#01	111
-moc_para01,170,120,0	duplicate(pggc)	Goods Cabinet#02	111
+moc_para01,173,120,0	duplicate(pggc)	Goods Cabinet#01	HIDDEN_NPC
+moc_para01,170,120,0	duplicate(pggc)	Goods Cabinet#02	HIDDEN_NPC
diff --git a/npc/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt
new file mode 100644
index 000000000..92cfb26fd
--- /dev/null
+++ b/npc/re/quests/eden/eden_tutorial.txt
@@ -0,0 +1,1560 @@
+//===== Hercules Script ======================================
+//= Eden Tutorial
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= A series of quests introducing the major features of
+//= Ragnarok Online.
+//===== Additional Comments: =================================
+//= 1.0 First Version. [Euphy]
+//============================================================
+
+moc_para01,34,178,3	script	Tutorial Instructor	4_M_KHMAN,{
+	if (Class == Job_Novice) {
+		// Fall through
+	} else if (checkquest(9167) == -1) {
+	OnStartQuest:
+		if (@tutorial_restart) {
+			set .@tutorial_restart,1;
+			set @tutorial_restart,0;
+		}
+		mes "[Tutorial Instructor]";
+		mes "Lately, it has been said that";
+		mes "they are developing ways to add options";
+		mes "to put in sockets or add statuses";
+		mes "on equipment that normally don't have it.";
+		mes "They call that ^006400Enchant^000000.";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "After seeing that being developed,";
+		mes "I was so inspired by it";
+		mes "that I worked hard to discover";
+		mes "a way to do it and I finally";
+		mes "made my own way to ^006400Enchant^000000!";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "But in order do to this";
+		mes "I need some special materials.";
+		mes "If you're okay with it...";
+		mes "Do you think you can";
+		mes "help me out by gathering them?";
+		next;
+		switch(select("Sure, I can help out!:I'm a little busy right now...")) {
+		case 1:
+			mes "[Tutorial Instructor]";
+			mes "However, looking at you";
+			mes "in your current state makes me";
+			mes "doubt your ability to gather";
+			mes "the items I need...";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "Well, I guess if you employ";
+			mes "a ^006400Mercenary^000000 for this";
+			mes "then I think I can entrust you";
+			mes "with my requests... right?";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "In order to employ a Mercenary,";
+			mes "go find the ^006400Mercenary Guild^000000";
+			mes "which is by the front door of ^8B4513Prontera^000000.";
+			mes "Go to the ^006400Information Agent^000000";
+			mes "and ask them where the ^006400Mercenary Guild Official^000000";
+			mes "is located and they will let you know.";
+			next;
+			if (.@tutorial_restart) {
+				erasequest 9167;
+				erasequest 9168;
+				erasequest 9169;
+				erasequest 9170;
+				erasequest 9171;
+				erasequest 9172;
+				completequest 9173;
+				erasequest 9173;
+			}
+			mes "[Tutorial Instructor]";
+			mes "Now... Hurry and employ";
+			mes "a ^006400Mercenary^000000 and come back to me!";
+			setquest 9167;
+			close;
+		case 2:
+			mes "[Tutorial Instructor]";
+			mes "Well since you said you're busy";
+			mes "I can't be helped...";
+			mes "When you're not so busy, come find me again.";
+			close;
+		}
+	} else if (checkquest(9167) == 0 || checkquest(9167) == 1) {
+		if (!getmercinfo(1)) {
+			mes "[Tutorial Instructor]";
+			mes "You haven't gotten a mercenary yet.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "In order to employ a Mercenary,";
+			mes "go find the ^006400Mercenary Guild^000000";
+			mes "which is by the front door of ^8B4513Prontera^000000.";
+			mes "Go to the ^006400Information Agent^000000";
+			mes "and ask them where the ^006400Mercenary Guild Official^000000";
+			mes "is located and they will let you know.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "Now... Hurry and employ";
+			mes "a ^006400Mercenary^000000 and come back to me!";
+			close;
+		}
+		mes "[Tutorial Instructor]";
+		mes "Seeing you with a ^006400Mercenary^000000 definitely makes me trust you more.";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "If a 006400Mercenary^000000 gives you direct effect";
+		mes "by fighting for you";
+		mes "then a ^006400Pet^000000 helps you indirectly with their";
+		mes "abilities and varied appearances,";
+		mes "and it captures your heart.";
+		mes "Try raising a ^006400Pet^000000 in the future as well.";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "Now, let's see... In order to";
+		mes "get this ^006400Enchant^000000 to succeed";
+		mes "you have to go gather some materials for me...";
+		mes "What I need is...";
+		mes "..............";
+		next;
+		select("I don't think I heard you clearly...");
+		mes "[Tutorial Instructor]";
+		mes "I really don't like to repeat myself..";
+		mes "If you ask me again like that";
+		mes "does it just make your mouth tired?";
+		mes "In these situations, open your ^006400Quest Window^000000";
+		mes "and you can see what is requested of you";
+		mes "and the details of my request.";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "If you look at the top left";
+		mes "in the area with the information,";
+		mes "it says ^006400QUEST^000000";
+		mes "and if you click that";
+		mes "it'll show all information";
+		mes "that pertains to the request.";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "Once you verify what materials";
+		mes "you need go gather from";
+		mes "the ^006400Quest Window^000000,";
+		mes "come find and talk to me again.";
+		completequest 9167;
+		setquest 9168;
+		close;
+	} else if (checkquest(9168) == 0 || checkquest(9168) == 1) {
+		if (checkweight(607,1) == 0) {
+			if (MaxWeight - Weight < getiteminfo(607,6)) {
+				mes "[Tutorial Instructor]";
+				mes "You seemed to be sluggish with a lot of items";
+				mes "in your inventory making you heavy...";
+				mes "It'll be hard to do my request";
+				mes "when you're heavy with all that junk!";
+				mes "Go empty out your inventory and come back to me.";
+				close;
+			} else {
+				mes "[Tutorial Instructor]";
+				mes "It seems that you have";
+				mes "one too many items on you...";
+				mes "If you want to help me out";
+				mes "then you're gonna have to put some";
+				mes "stuff away then come back.";
+				close;
+			}
+		}
+		mes "[Tutorial Instructor]";
+		mes "Did you open your ^006400Quest Window^000000";
+		mes "to verify the materials?";
+		next;
+		switch(select("Yup!:No...:Where is the Quest Window...")) {
+		case 1:
+			mes "[Tutorial Instructor]";
+			mes "Oh yeah? Then shall I test you to see";
+			mes "if you really checked it?";
+			mes "Write down what material I asked you to get.";
+			next;
+			input .@inputstr$;
+			if (.@inputstr$ == "10 Jellopy") {
+				mes "[Tutorial Instructor]";
+				mes "Good, you know.";
+				mes "Now, are you feeling pretty familiar";
+				mes "about the ^006400Quest Window^000000?";
+				mes "But there is an issue...";
+				mes "You know what material to collect,";
+				mes "but gathering that won't be easy.";
+				next;
+				mes "[Tutorial Instructor]";
+				mes "Also, there is one thing";
+				mes "I absolutely think you need to try.";
+				mes "And that is...";
+				mes "the ^006400Universal Silver Catalog^000000.";
+				next;
+				mes "[Tutorial Instructor]";
+				mes "The ^006400Universal Silver Catalog^000000";
+				mes "can be obtained from";
+				mes "the ^0000FFCatalogue Wizard^000000";
+				mes "that is located in South Prontera.";
+				next;
+				mes "[Tutorial Instructor]";
+				mes "Now, go and obtain";
+				mes "a ^006400Universal Silver Catalog^000000";
+				mes "then come back and talk to me.";
+				completequest 9168;
+				setquest 9169;
+				close;
+			}
+			mes "[Tutorial Instructor]";
+			mes "You... still don't seem";
+			mes "to know much about the";
+			mes "^006400Quest Window^000000.";
+			mes "I will inform you again.";
+			next;
+			break;
+		case 2:
+			mes "[Tutorial Instructor]";
+			mes "Hurry and check to see";
+			mes "what materials are required in";
+			mes "your ^006400Quest Window^000000.";
+			close;
+		case 3:
+			break;
+		}
+		mes "[Tutorial Instructor]";
+		mes "If you look at the top left";
+		mes "in the area with the information,";
+		mes "it says ^006400QUEST^000000";
+		mes "and if you click that";
+		mes "it'll show all information";
+		mes "that pertains to the request.";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "Once you verify what materials";
+		mes "you need go gather from";
+		mes "the ^006400Quest Window^000000,";
+		mes "come find and talk to me again.";
+		close;
+	} else if (checkquest(9169) == 0 || checkquest(9169) == 1) {
+		if (countitem(12580) == 0) {
+			mes "[Tutorial Instructor]";
+			mes "Hmm? So I noticed that";
+			mes "you haven't gone and picked up a";
+			mes "^006400Universal Silver Catalog^000000 yet!";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "You can get the";
+			mes "^006400Universal Silver Catalog^000000";
+			mes "from the ^0000FFCatalogue Wizard^000000";
+			mes "who is located in Prontera.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "So, go and get the";
+			mes "^006400Universal Silver Catalog^000000";
+			mes "then come back to me.";
+			close;
+		}
+		mes "[Tutorial Instructor]";
+		mes "Oh! You managed to get a";
+		mes "^006400Universal Silver Catalog^000000!";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "This lets you browse and search";
+		mes "through all the various stores";
+		mes "that are on the same map and";
+		mes "are open for vending.";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "It only costs 200 zeny for one";
+		mes "of these and with it you can";
+		mes "search up to 10 times.";
+		mes "You can say that it's a necessity.";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "So, go to the area you want";
+		mes "and try out the ^006400Universal Silver Catalog^000000";
+		mes "then come and find me";
+		mes "after you've done this.";
+		completequest 9169;
+		setquest 9170;
+		close;
+	} else if (checkquest(9170) == 0 || checkquest(9170) == 1) {
+		if (countitem(12580)) {
+			mes "[Tutorial Instructor]";
+			mes "Hmm... It seems that you still have";
+			mes "the ^006400Universal Silver Catalog^000000 in your inventory.";
+			mes "Since you're saying you forgot how to use it";
+			mes "I'll explain it to you again.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "You see... the ^006400Universal Silver Catalog^000000";
+			mes "lets you browse and search";
+			mes "through all the various stores";
+			mes "that are on the same map and";
+			mes "are open for vending.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "So, go to the area you want";
+			mes "and try out the ^006400Universal Silver Catalog^000000";
+			mes "them come and find me";
+			mes "after you've done this.";
+			close;
+		}
+		mes "[Tutorial Instructor]";
+		mes "How do you feel after trying out";
+		mes "the ^006400Universal Silver Catalog^000000?";
+		mes "It feels a lot easier than";
+		mes "going through each individual";
+		mes "vendor and finding the item";
+		mes "you need, right?";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "Now, go out and gather";
+		mes "the materials I need and";
+		mes "I will make sure to give you";
+		mes "a fantastic ^006400enchant^000000!";
+		mes "I'll be waiting!";
+		completequest 9170;
+		setquest 9171;
+		close;
+	} else if (checkquest(9171) == 0 || checkquest(9171) == 1) {
+		if (countitem(909) < 10) {
+			mes "[Tutorial Instructor]";
+			mes "It seems you didn't bring";
+			mes "enough materials. Did you forget";
+			mes "what you needed to gather?";
+			next;
+			switch(select("Yeah...:Nope!")) {
+			case 1:
+				mes "[Tutorial Instructor]";
+				mes "I've been told that if you click the";
+				mes "thing on the top left that says";
+				mes "^006400QUEST^000000, it'll show you all";
+				mes "the information that you need";
+				mes "that pertains to your requests.";
+				next;
+				mes "[Tutorial Instructor]";
+				mes "Once you gather all the materials";
+				mes "that are listed in your ^006400Quest Window^000000";
+				mes "come and talk to me.";
+				close;
+			case 2:
+				mes "[Tutorial Instructor]";
+				mes "When you gather the items";
+				mes "come to me and I will show you";
+				mes "an awesome ^006400ENCHANT^000000.";
+				mes "I'll be waiting!";
+				close;
+			}
+		}
+		if (checkweight(607,6) == 0) {
+			if (MaxWeight - Weight < getiteminfo(607,6)) {
+				mes "[Tutorial Instructor]";
+				mes "Your inventory seems to be really full";
+				mes "with various stuff... Do you think";
+				mes "you can get anything done when you're so";
+				mes "weighed down? Go put some stuff away";
+				mes "then come back to me.";
+				close;
+			} else {
+				mes "[Tutorial Instructor]";
+				mes "You seem to have too much stuff";
+				mes "in your inventory... Go put some";
+				mes "stuff away then come back to me";
+				mes "when you have less suff on you.";
+				close;
+			}
+		}
+		mes "[Tutorial Instructor]";
+		mes "You got everything I asked for!";
+		mes "So~ Shall we start on the awesome";
+		mes "Enchant that I found and developed?";
+		next;
+		specialeffect EF_BASH3D2;
+		mes "[Tutorial Instructor]";
+		mes "Okay! Now for the first skill!!";
+		mes "To add a new ability to your armor...";
+		mes "^006400HIDDEN SOCKET ENCHANT^000000!!";
+		next;
+		specialeffect EF_BASH3D2;
+		mes "[Tutorial Instructor]";
+		mes "And for the second skill!!";
+		mes "To add a new socket into your";
+		mes "weapon and shield...";
+		mes "^006400SOCKET ENCHANT^000000!!";
+		next;
+		mes "[Tutorial Instructor]";
+		mes "There. The Enchant is done. You can't understand the the process by just watching me, so I'll let you look at the items themselves.";
+		delitem 909,10; //Jellopy
+		completequest 9171;
+		setquest 9172;
+		getitem2 15033,1,1,0,0,0,0,0,4702; //Tutorial_Mattle[Strength3]
+		getitem 15033,1; //Tutorial_Mattle
+		getitem 15034,1; //Tutorial_Mattle_
+		next;
+		mes "[Tutorial Instructor]";
+		mes "Those items cannot be";
+		mes "worn or traded so don't even";
+		mes "think about running away with them.";
+		mes "When you're done looking at them,";
+		mes "give them back to me.";
+		close;
+	} else if (checkquest(9172) == 0 || checkquest(9172) == 1) {
+		if (countitem(15033) == 0 || countitem(15034) == 0) {
+			mes "[Tutorial Instructor]";
+			mes "What did you do with the Enchanted";
+			mes "items I lent to you to look at?";
+			mes "Until you bring back the fruits of";
+			mes "my labor, I don't want to talk to you,";
+			mes "let alone see your face.";
+			close;
+		}
+		mes "[Tutorial Instructor]";
+		mes "Are you done looking over";
+		mes "the items I Enchanted?";
+		next;
+		switch(select("Yes, thank you.:I haven't looked at them yet.")) {
+		case 1:
+			mes "[Tutorial Instructor]";
+			mes "So what did you think after inspecting it? Now that you've looked at an actual Enchanted item, do you understand it?";
+			// Item deletions moved below to prevent errors.
+			next;
+			mes "[Tutorial Instructor]";
+			mes "Thanks to you I was able to see great results of my research and study.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "If you have any questions about anything that I discussed with you, I will tell you everything! Thanks for your hard work!";
+			delitem 15033,2;
+			delitem 15034,1;
+			completequest 9172;
+			setquest 9173;
+			getexp 5000,2500;
+			close;
+		case 2:
+			mes "[Tutorial Instructor]";
+			mes "Take your time to look them over";
+			mes "then bring them back to me.";
+			close;
+		}
+	} else if (checkquest(9173) == 0 || checkquest(9173) == 1) {
+		mes "[Tutorial Instructor]";
+		mes "Do you have any questions?";
+		next;
+		switch(select("Can I do the same quest again?:About the Quest Window...:About ENCHANT...:About Searching Vends...:About Mercenary and Pets...:End Conversation.")) {
+		case 1:
+			if (checkquest(9173,PLAYTIME) == 0 || checkquest(9173,PLAYTIME) == 1) {
+				mes "[Tutorial Instructor]";
+				mes "The one method to do the same quests repeatdedly is to do the ^006400Daily Quests^000000.";
+				next;
+				mes "[Tutorial Instructor]";
+				mes "Once you complete a ^006400Daily Quest^000000 and turn it in, wait about a day then come back to get the request and do it all over again!";
+				mes "[Tutorial Instructor]";
+				mes "If you received a daily quest, look at bottom right of the ^006400Quest Window^000000. There is a section that is called ^006400LIMITED^000000. In that section, it'll tell you how much time needs to pass before you can pick up another daily quest.";
+				next;
+				mes "[Tutorial Instructor]";
+				mes "It seems you still have some time left to wait out after finishing my quest. Wait it out a bit more, then come find me and you can get the same quest again.";
+				close;
+			}
+			mes "[Tutorial Instructor]";
+			mes "It seems that about a day has passed since you've finished my quest. Alright, so like the ^006400Daily Quests^000000, you can get a quest from me. Did you want to proceed?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				set @tutorial_restart,1;
+				goto OnStartQuest;
+			case 2:
+				mes "[Tutorial Instructor]";
+				mes "Okay. But if you change your mind and want to receive a quest, come find me.";
+				close;
+			}
+		case 2:
+			mes "[Tutorial Instructor]";
+			mes "They say that the ^006400Quest Window^000000 details out everything you need to know about your quests.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "If you look at the top left";
+			mes "in the area with the information,";
+			mes "it says ^006400QUEST^000000";
+			mes "and if you click that";
+			mes "it'll show all information";
+			mes "that pertains to the request.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "Using the ^006400Quest Window^000000 will make your life easier. It'll tell you where to go, what items to get or who to find and etc.";
+			close;
+		case 3:
+			mes "[Tutorial Instructor]";
+			mes "006400ENCHANT^000000, in general, is divided into two parts: ^006400SOCKET ENCHANT^000000 and ^006400HIDDEN SOCKET ENCHANT^000000.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "^006400SOCKET ENCHANT^000000 is used to add a SOCKET into equipments and ^006400HIDDEN SOCKET ENCHANT^000000 is used to put in stats into a socket of an armor.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "Of course, in order to do this we are in need of some materials and there is a chance that it may fail, but that's the risk you're taking.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "The people who do the ^006400SOCKET ENCHANT^000000 can be found in ^8B4513Prontera, Morroc, Payon,^000000. ^8B4513Rhitalzen^000000 is in the Refinery and ^0000FFSeiyablem^000000 and ^0000FFReiablem^000000 can be found near the entrance.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "The one who does ^006400HIDDEN SOCKET ENCHANT^000000 is found at the 6 o'clock location of ^8B4513Prontera^000000. Look for the ^0000FFCraftman Apprentice^000000.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "Do you think you understand a little bit more about ^006400ENCHANT^000000?";
+			close;
+		case 4:
+			mes "[Tutorial Instructor]";
+			mes "^006400Vend Search^000000 can be utilized by the ^006400Universal Silver Catalog^000000 item. Since you search through as vends on that map, it'll make it easier for you to find the item that you're looking for.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "The ^006400Universal Silver Catalog^000000";
+			mes "can be obtained from ";
+			mes "the ^0000FFCatalogue Wizard^000000";
+			mes "that is located in South Prontera;";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "It only costs 200 zeny for one";
+			mes "of these and with it you can";
+			mes "search up to 10 times.";
+			mes "You can say that it's a necessity.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "So, are you getting familiar with ^006400Vend Search^000000? Don't just stand there and listen to me. Go ahead and try it for yourself!";
+			close;
+		case 5:
+			mes "[Tutorial Instructor]";
+			mes "Depending on what you need, ^006400Mercenary^000000 and ^006400Pet^000000 can be used in various ways.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "If a 006400Mercenary^000000 gives you direct effect";
+			mes "by fighting for you";
+			mes "then a ^006400Pet^000000 helps you indirectly with their";
+			mes "abilities and varied appearances,";
+			mes "and it captures your heart.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "In order to employ a Mercenary";
+			mes "Go find the ^006400Mercenary Guild^000000";
+			mes "which is by the front door of ^8B4513Prontera^000000.";
+			mes "Go to the ^006400Information Agent^000000";
+			mes "and ask them where the ^006400Mercenary Guild Official^000000";
+			mes "is located and they will let you know.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "In order to get a ^006400Pet^000000, while hunting you will obtain taming items. Use the tame on the monster it's for and you can get a pet.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "Because there is a chance for failure, please use the taming item with great care.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "That aside... you can get a ^006400Mercenary^000000 from the Mercenary Guild and you can get a ^006400Pet^000000 by trading or buying it from another player.";
+			next;
+			mes "[Tutorial Instructor]";
+			mes "Now, do you understand a bit more about using a ^006400Mercenary^000000 and a ^006400Pet^000000? I hope you get a chance to use them in the future.";
+			close;
+		case 6:
+			mes "[Tutorial Instructor]";
+			mes "If you have any questions, come find me again.";
+			close;
+		}
+	}
+	mes "[Tutorial Instructor]";
+	mes "Lately, it has been said that";
+	mes "they are developing ways to add options";
+	mes "to put in sockets or add statuses";
+	mes "on equipment that normally don't have it.";
+	close;
+}
+
+moc_para01,32,179,4	script	Tutorial Goal	4_F_KHELLY,{
+	if (checkweight(608,7) == 0) {
+		if (MaxWeight - Weight < getiteminfo(608,7)) {
+			mes "[Tutorial Goal]";
+			mes "You seem to be overweight with items. Go put some stuff away then come back.";
+			close;
+		} else {
+			mes "[Tutorial Goal]";
+			mes "You have too many items on you. Go put some stuff away then come back.";
+			close;
+		}
+	}
+	if (checkquest(4161) == 0 || checkquest(4161) == 1) {
+		mes "[Tutorial Goal]";
+		mes "Well~ We gotta go challenge the experts right?";
+		mes "Let's start off by finding the ^006400Siege Expert^000000!";
+		close;
+	} else if (checkquest(4162) == 0 || checkquest(4162) == 1) {
+		mes "[Tutorial Goal]";
+		mes "You've passed the ^006400Siege Expert^000000's test! Congrats!";
+		mes "Now, go find the ^006400Party Recruiting Expert^000000!";
+		close;
+	} else if (checkquest(4163) == 0 || checkquest(4163) == 1) {
+		mes "[Tutorial Goal]";
+		mes "Oh! You've passed the ^006400Party Recruiting Expert^000000's test! Congrats!";
+		mes "Now, go find the ^006400Battleground Expert^000000!";
+		close;
+	} else if (checkquest(4164) == 0 || checkquest(4164) == 1) {
+		mes "[Tutorial Goal]";
+		mes "Yay! You passed the test from the ^006400Battleground Expert^000000! Congrats!";
+		mes "Next, go and find the ^006400Memorial Dungeon Expert^000000!";
+		close;
+	} else if (checkquest(4165) == 0 || checkquest(4165) == 1) {
+		mes "[Tutorial Goal]";
+		mes "You passed the test from ^006400Memorial Dungeon Expert^000000! That's great!";
+		mes "Try finding the ^006400Map Expert^000000!";
+		close;
+	} else if (checkquest(4166) == 0 || checkquest(4166) == 1) {
+		mes "[Tutorial Goal]";
+		mes "You passed ^006400Map Expert^000000's test! Congrats!";
+		mes "I'm so glad that you were to pass all the Experts' tests! You're better than I expected!!";
+		next;
+		mes "[Tutorial Goal]";
+		mes "Now, even you are an ^006400Expert^000000!! Such a fitting nick name for you!";
+		mes "Thank you so much for your hard work. As promised, here is a small little reward for you.";
+		next;
+		mes "[Tutorial Goal]";
+		mes "I think it'll be useful to you during your adventures. I wish you luck on your future adventures~";
+		completequest 4166;
+		getitem 510,5; //Blue_Herb
+		getitem 511,5; //Green_Herb
+		getitem 504,5; //White_Potion
+		getitem 608,1; //Seed_Of_Yggdrasil
+		close;
+	} else if (checkquest(4166) == 2) {
+		mes "[Tutorial Goal]";
+		mes "Now, even you are an ^006400Expert^000000!! Such a fitting nick name for you!";
+		mes "Thank you so much for your hard work.";
+		mes "I hope that your future adventures are filled with good luck.";
+		close;
+	}
+	if (Class == Job_Novice) {
+		mes "[Tutorial Goal]";
+		mes "Hmm, I wonder if there is any adventurer that is smart enough to challenge our Experts...";
+		close;
+	}
+	mes "[Tutorial Goal]";
+	mes "Hey you! You look like an adventurer... Though you look a little dull...";
+	next;
+	if(select("What'd you say? I'm smart!:Yeah... I'm dull.") == 1) {
+		mes "[Tutorial Goal]";
+		mes "Serious? Though I don't know if I can believe that. Look at the expert who is in front of me! He took up only one area of study for 16 years and now he is as dignified as can be!";
+		next;
+		mes "[Tutorial Goal]";
+		mes "Well, if you manage to pass all their tests then I will believe in your abilities.";
+		next;
+		mes "[Tutorial Goal]";
+		mes "And I will apologize for calling you dull. How about it, Dull Expert?! Do you want to challenge them?";
+		next;
+		if(select("Ch... Challenge!!:Um... I think I'll just give up now...") == 1) {
+			mes "[Tutorial Goal]";
+			mes "You're braver than you look. You can't go back now that you've decided to challenge!";
+			next;
+			mes "[Tutorial Goal]";
+			mes "Okay~ Start by talking to the ^006400Siege Expert^000000 who's right there in front.";
+			setquest 4161;
+			close;
+		}
+	}
+	mes "[Tutorial Goal]";
+	mes "Well, don't get discouraged... If you change your mind and want to do the challenge, come find me.";
+	close;
+}
+
+moc_para01,24,175,4	script	Siege Master	4_M_JOB_KNIGHT2,{
+	set .@checkquest, checkquest(4161);
+	if (.@checkquest == 2) {
+		mes "[Siege Expert]";
+		mes "Since you've come again, I assume you're curious about ^006400Siege^000000?";
+		next;
+		switch(select("Listen about Siege.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Siege Expert]";
+			mes "Now that you've gone through all of this with an expert, isn't it easy to understand? If you want to go over anything, just come talk to me.";
+			close;
+		case 2:
+			mes "[Siege Expert]";
+			mes "If you want to go over anything, just come talk to me.";
+			close;
+		}
+	} else if (.@checkquest == 0 || .@checkquest == 1) {
+		mes "[Siege Expert]";
+		mes "I am someone who has studied War of Emperium for 16 years! So that makes me an expert! Since you came to find me, I assume you want to learn more about ^006400Siege^000000.";
+		next;
+		mes "[Siege Expert]";
+		mes "You have great desire and enthusiasm. As the Expert of ^006400Siege^000000, you have motivated me! All the other Experts are waiting for you! Go get'em!";
+		next;
+		mes "[Siege Expert]";
+		mes "If I told you that there was a great prize for being able to pass all the Experts' tests~ would you go for the challenge?";
+		next;
+		mes "[Siege Expert]";
+		mes "As the first Expert, I can teach you about ^006400Siege^000000. How about it? Did you wanna learn about ^006400Siege^000000s?";
+		next;
+		switch(select("Listen about Siege.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Siege Expert]";
+			mes "Now that you've gone through all of this with an expert, isn't it easy to understand?";
+			mes "Now I'll give you 3 questions~ get those right and you've passed! Do you want a challenge?";
+			while(1) {
+				set .@correct,0;
+				next;
+				switch(select("Challenge me!:Listen Again:Quit")) {
+				case 1:
+					switch(rand(1,3)) {
+					case 1:
+						mes "[Siege Expert]";
+						mes "A Siege is done in order to take over a [].";
+						mes "It's a war that happens between a [] and another [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Castle, User, Guild:Castle, Guild, Guild:Town, Guild, Guild:Town, User, User") == 2)
+							set .@correct, .@correct+10;
+						mes "[Siege Expert]";
+						mes "What is the wrong Siege time?";
+						next;
+						if(select("WoE 1 Tues 9-11:WoE 1 Sat 4-6:WoE 1 Thurs 8-10") == 3)
+							set .@correct, .@correct+10;
+						mes "[Siege Expert]";
+						mes "When you get a castle, you must raise [] in order to get better benefits.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Commerce Development:Industrial Development:Guild Development:Town Development") == 1)
+							set .@correct, .@correct+10;
+						break;
+					case 2:
+						mes "[Siege Expert]";
+						mes "There are 2 types of Siege.";
+						mes "There is the normal War of Emperium";
+						mes "and then there is [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("War of Emperium MO:War of Emperium NE:War of Emperium SK:War of Emperium SE") == 4)
+							set .@correct, .@correct+10;
+						mes "[Siege Expert]";
+						mes "As the guild that owns a castle, you must protect the [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Emperial:Emperium:Emperiom:Imperial") == 2)
+							set .@correct, .@correct+10;
+						mes "[Siege Expert]";
+						mes "What benefits does the guild get for winning the Siege?";
+						next;
+						if(select("30% off all items when purchasing:Increase experience gained by 20%:Access to Guild Dungeon:Getting Weapons everyday at midnight.") == 3)
+							set .@correct, .@correct+10;
+						break;
+					case 3:
+						mes "[Siege Expert]";
+						mes "What benefits does the guild get for winning the Siege?";
+						next;
+						if(select("Increase experience gained by 20%:30% off all items when purchasing:Access to Guild Field:Treasure Box daily at midnight") == 4)
+							set .@correct, .@correct+10;
+						mes "[Siege Expert]";
+						mes "How many hours does a siege last?";
+						next;
+						if(select("1 Hour:2 Hours:3 Hours:4 Hours") == 2)
+							set .@correct, .@correct+10;
+						mes "[Siege Expert]";
+						mes "When you get a castle, you must raise [] in order to get better benefits.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Town Development:Industry Development:Guild Development:Commerce Development") == 4)
+							set .@correct, .@correct+10;
+						break;
+					}
+					if (.@correct == 30) {
+						mes "[Siege Expert]";
+						mes "Wow! You got all 3 questions correct! So, you feel pretty good about ^006400Siege^000000s? Right?";
+						next;
+						mes "[Siege Expert]";
+						mes "If you ever want to learn about ^006400Siege^000000, come find me.";
+						next;
+						mes "[Siege Expert]";
+						mes "Now, go and find the ^0000FFParty Recruiting Expert^000000. He's waiting for you.";
+						completequest 4161;
+						setquest 4162;
+						getexp 2000,1000;
+						close;
+					}
+					mes "[Siege Expert]";
+					mes "There's only 3 questions and you didn't get them all right! At this rate, you'll fail all the Experts' tests.";
+					next;
+					mes "[Siege Expert]";
+					mes "But when I look at you I know you have potential. Did you want to try to tackle it again?";
+					break;
+				case 2:
+					callsub L_Info;
+					mes "[Siege Expert]";
+					mes "Now that you've gone through all of this with an expert, isn't it easy to understand?";
+					mes "Now I'll give you 3 questions~ get those right and you've passed! Do you want a challenge?";
+					break;
+				case 3:
+					mes "[Siege Expert]";
+					mes "Bah! You're no fun... you give up too easy! If you change your mind, come find me.";
+					close;
+				}
+			}
+			close;
+		case 2:
+			mes "[Siege Expert]";
+			mes "Are you giving up? If you change your mind, come find me.";
+			close;
+		}
+	}
+	mes "[Siege Expert]";
+	mes "If you want to learn something from me, go meet ^006400Tutorial Goal^000000 first.";
+	close;
+
+L_Info:
+	mes "[Siege Expert]";
+	mes "A ^006400Siege^000000 is a ^0000FFGuild vs. Guild^000000 war in hope to occupy a castle!";
+	next;
+	mes "[Siege Expert]";
+	mes "There are 2 different types of ^006400Siege^000000.";
+	mes "There is the standard ^006400War of Emperium^000000 and one that is slightly different which is known as ^006400War of Emperium 2^000000.";
+	next;
+	mes "[Siege Expert]";
+	mes "So during this time, there are two sides of the war.";
+	mes "The ^0000FFGuild That Owns a Castle^000000 tries to protect the ^006400Emperium^000000 and the ^0000FFGuild That Attacks a Castle^000000 tries to break the ^006400Emperium^000000.";
+	next;
+	mes "[Siege Expert]";
+	mes "You can find ^006400Siege^000000 times on our website.";
+	mes "And guilds that win also get a special something-something.";
+	next;
+	mes "[Siege Expert]";
+	mes "Guilds that win during the Siege";
+	mes "get access to a ^006400Guild Dungeon^000000";
+	mes "and the Guild Master gets to open ^006400Treasure Box^000000es at ^0000FFMidnight each day^000000.";
+	mes "Isn't that a great benefit?";
+	next;
+	mes "[Siege Expert]";
+	mes "Another thing you have to do when you win a castle is called ^006400Commerce Development^000000. The more you do it, the better the benefits.";
+	next;
+	return;
+}
+
+moc_para01,21,172,4	script	Party Recruiting Expert	4_M_OILMAN,{
+	set .@checkquest, checkquest(4162);
+	if (.@checkquest == 2) {
+		mes "[Party Recruiting Expert]";
+		mes "Since you've come and found me, it seems you're curious about ^006400Party Recruiting^000000?";
+		next;
+		switch(select("Listen about Party Recruiting.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Party Recruiting Expert]";
+			mes "This expert's explanation was pretty great, huh? If you need a refresher, come find me again.";
+			close;
+		case 2:
+			mes "[Party Recruiting Expert]";
+			mes "Well, if you have any questions, come find me.";
+			close;
+		}
+	} else if (.@checkquest == 0 || .@checkquest == 1) {
+		mes "[Party Recruiting Expert]";
+		mes "I am the ^006400Party Recruiting^000000 expert because I did research about Party Recruting for 16 years! It seems that the ^006400Siege Expert^000000 sent you my way since you passed his tests, hmm?";
+		next;
+		mes "[Party Recruiting Expert]";
+		mes "You may have already heard but if you pass all the Experts' quizzes, you'll get an awesome prize!";
+		next;
+		mes "[Party Recruiting Expert]";
+		mes "As the 2nd expert, I'll tell you all about ^006400Party Recruiting^000000! How about it?";
+		next;
+		switch(select("Listen about Party Recruiting.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Party Recruiting Expert]";
+			mes "Now~ my explanations were smoother than a smooth criminal, right? Now I'm gonna give you a quiz with 3 questions. Get them all right and you've passed. Wanna take the challenge?";
+			while(1) {
+				set .@correct,0;
+				next;
+				switch(select("On to the quiz!:Explain again please?:Give up.")) {
+				case 1:
+					switch(rand(1,3)) {
+					case 1:
+						mes "[Party Recruiting Expert]";
+						mes "Party Recruiting is used to help";
+						mes "users that are looking for []";
+						mes "and those looking for a [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Guild, Guildmate:Club, Club Members:Paris, Party Members:Party, Party Members") == 4)
+							set .@correct, .@correct+10;
+						mes "[Party Recruiting Expert]";
+						mes "The window that is used to help users look and search for a party is called a [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Party List:Party Wanted List:Party Recruiting List:Costume Party List") == 3)
+							set .@correct, .@correct+10;
+						mes "[Party Recruiting Expert]";
+						mes "Which of the choices are not listed as a choice to pick when making a party recruit notice?";
+						next;
+						if(select("LEVEL:SKILL:JOB:MAP") == 2)
+							set .@correct, .@correct+10;
+						break;
+					case 2:
+						mes "[Party Recruiting Expert]";
+						mes "There are 2 types of Party Recruiting.";
+						mes "Registering Party Recruiting is one";
+						mes "and the 2nd one is [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Search for Parties that are Recruiting:Parties that are starting to hunt:Party Recruit and Item Distribution:Party Stuff") == 1)
+							set .@correct, .@correct+10;
+						mes "[Party Recruiting Expert]";
+						mes "In order to start Party Recruiting, you have to click the [] button which is located in the info section of the upper left hand side.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("party:guild:booking:skill") == 3)
+							set .@correct, .@correct+10;
+						mes "[Party Recruiting Expert]";
+						mes "If you want to know more about commands for Party Recruiting, you have to press the [] button on the Party Recruting List window.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Basic Information:Help:Party:Confirm") == 2)
+							set .@correct, .@correct+10;
+						break;
+					case 3:
+						mes "[Party Recruiting Expert]";
+						mes "For Party Recruiting, in order to make the";
+						mes "Party Recruiting Window pop up,";
+						mes "You type in this command [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("/Party Collection Window:/Party Collection:/Party Recruitment Window:/Party Recruitment") == 4)
+							set .@correct, .@correct+10;
+						mes "[Party Recruiting Expert]";
+						mes "When recruiting for a party, you can set 3 parameters. Those 3 are";
+						mes "LEVEL, JOB, and [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("SKILL:GUILD:MAP:OPTION") == 3)
+							set .@correct, .@correct+10;
+						mes "[Party Recruiting Expert]";
+						mes "Party Recruiting is used to help";
+						mes "users that are looking for []";
+						mes "and those looking for a [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Parry, Party Members:Club, Club Members:Party, Party Members:Guild, Guild Members") == 3)
+							set .@correct, .@correct+10;
+						break;
+					}
+					if (.@correct == 30) {
+						mes "[Party Recruiting Expert]";
+						mes "Nice! You got all 3 correct! Now do you feel more confident about ^006400Party Recruiting^000000?";
+						next;
+						mes "[Party Recruiting Expert]";
+						mes "If you ever want to hear more about ^006400Party Recruiting^000000, come find me anytime.";
+						next;
+						mes "[Party Recruiting Expert]";
+						mes "Well, off you go to the ^0000FFBattleground Expert^000000! He is probably waiting for you.";
+						completequest 4162;
+						setquest 4163;
+						getexp 2000,1000;
+						close;
+					}
+					mes "[Party Recruiting Expert]";
+					mes "There's only 3 questions and you didn't get them all right! At this rate, you'll fail all the Experts' tests.";
+					next;
+					mes "[Party Recruiting Expert]";
+					mes "But if you want to retake the quiz! Go for it! I think you have potential! Wanna take the quiz again?";
+					break;
+				case 2:
+					callsub L_Info;
+					mes "[Party Recruiting Expert]";
+					mes "Now~ my explanations were smoother than a smooth criminal, right? Now I'm gonna give you a quiz with 3 questions. Get them all right and you've passed. Wanna take the challenge?";
+					break;
+				case 3:
+					mes "[Party Recruiting Expert]";
+					mes "Don't give up! You can do it! If you change your mind, come talk to me again!";
+					close;
+				}
+			}
+			close;
+		case 2:
+			mes "[Party Recruiting Expert]";
+			mes "You're gonna give up without even listening to me? If you change your mind, come talk to me again!";
+			close;
+		}
+	}
+	mes "[Party Recruiting Expert]";
+	mes "If you want to learn something from me, talk to the ^006400Siege Master^000000 first.";
+	close;
+
+L_Info:
+	mes "[Party Recruiting Expert]";
+	mes "^006400Party Recruiting^000000 is pretty self explanatory. It helps people find party members and it helps people find parties.";
+	next;
+	mes "[Party Recruiting Expert]";
+	mes "There are 2 parts to Party Recruiting.";
+	mes "1st step is ^0000FFRegistering Party Recruiting^000000,";
+	mes "and the 2nd step is ^0000FFParty Search^000000.";
+	next;
+	mes "[Party Recruiting Expert]";
+	mes "In order to look up Party Recruiting, in the info window on the upper left, click the button that says ^006400booking^000000. Then the ^006400Party Recruiting List^000000 will come up.";
+	next;
+	mes "[Party Recruiting Expert]";
+	mes "^006400Party Recruiting List^000000 window shows you the parties that are looking for members that was listed by other users. You can search through it.";
+	next;
+	mes "[Party Recruiting Expert]";
+	mes "In the case that you don't want to join a party, but you want to recruit for one, type in the ^0000FF/Party Recruit^000000 command then in the ^006400Party Recruiting^000000 window, you can do some recruiting!";
+	next;
+	mes "[Party Recruiting Expert]";
+	mes "Once you register your party recruit notice in the ^006400Party Recruiting^000000 window, the users can search out your ^006400Party Recruiting List^000000";
+	next;
+	mes "[Party Recruiting Expert]";
+	mes "In the ^006400Party Recruiting List^000000 and";
+	mes "^006400Party Recruiting^000000 you can put in basic information of what you're going to be doing, or what you're looking for like ";
+	mes "^006400LEVEL^000000, ^006400MAP^000000, ^006400JOB^000000.";
+	mes "Then the users can search using those parameters and utilizing the ^006400Party Recruitment^000000 system.";
+	next;
+	mes "[Party Recruiting Expert]";
+	mes "If you want to learn more commands about ^006400Party Recruiting^000000, click on the ^006400Help^000000 button on the bottom right of the ^006400Party Recruiting list^000000.";
+	next;
+	return;
+}
+
+moc_para01,12,179,6	script	Battleground Master	4_M_KY_HEAD,{
+	set .@checkquest, checkquest(4163);
+	if (.@checkquest == 2) {
+		mes "[Battleground Expert]";
+		mes "Seeing that you sought me out, I guess you want to learn about ^006400Battleground^000000s, eh?";
+		next;
+		switch(select("Learn about Battlegrounds.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Battleground Expert]";
+			mes "There's nothing better than hearing it straight from the expert! If you want to go over it again, just talk to me.";
+			close;
+		case 2:
+			mes "[Battleground Expert]";
+			mes "If you want to go over anything, let me know.";
+			close;
+		}
+	} else if (.@checkquest == 0 || .@checkquest == 1) {
+		mes "[Battleground Expert]";
+		mes "For 16 years, I experienced the intense heat of battle on the ^006400Battleground^000000s... I am the ^006400Battleground^000000 Expert!";
+		mes "It seems that the ^006400Party Recruiting Expert^000000 sent you to me since you passed his quiz.";
+		next;
+		mes "[Battleground Expert]";
+		mes "You may already know but if you get pass all the quizzes from the Experts, you'll get a prize!";
+		next;
+		mes "[Battleground Expert]";
+		mes "I will tell you about the ^006400Battleground^000000s! I will tell you everything I know! How about it? Wanna hear about it?";
+		next;
+		switch(select("Learn about Battlegrounds.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Battleground Expert]";
+			mes "There's nothing better than hearing it straight from the expert! Now, do you wanna take my 3-question quiz? You have to answer all 3 correctly to pass!";
+			while(1) {
+				set .@correct,0;
+				next;
+				switch(select("On to the quiz!:Explain again please?:Give up.")) {
+				case 1:
+					switch(rand(1,3)) {
+					case 1:
+						mes "[Battleground Expert]";
+						mes "For starters, you have to pick either the side of [] Camp or [] Camp in order to to participate in Battleground.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Guillaume, Tierra:Rachel, KVM:Guillaume, Croix:Maroll, KVM") == 3)
+							set .@correct, .@correct+10;
+						mes "[Battleground Expert]";
+						mes "[] can do either 10vs10 and you have to attack the crystals of the opposing team while protecting yours.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Tierra:Flavius:KVM:Maroll") == 2)
+							set .@correct, .@correct+10;
+						mes "[Battleground Expert]";
+						mes "When you complete a battle, you may get a reward! From a KVM battle, you get [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("KVM Badge:Valor Badge:Bravery Badge:Honor Badge") == 1)
+							set .@correct, .@correct+10;
+						break;
+					case 2:
+						mes "[Battleground Expert]";
+						mes "For [], it's 10vs10. You also need to attack the enemies supply depot while protecting your own.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Maroll:KVM:Flavius:Tierra") == 4)
+							set .@correct, .@correct+10;
+						mes "[Battleground Expert]";
+						mes "In order to get into the battlegrounds, which one is not the recruiter you need to find?";
+						next;
+						if(select("Maroll Mercenary Recruiter:KVM Mercenary Recruiter:Tierra Mercenary Recruiter:Flavius Mercenary Recruiter") == 1)
+							set .@correct, .@correct+10;
+						mes "[Battleground Expert]";
+						mes "You can get [] from participating in the Battlegrounds of Tierra.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("KVM Badge:Valor Badge:Bravery Badge:Honor Badge") == 2)
+							set .@correct, .@correct+10;
+						break;
+					case 3:
+						mes "[Battleground Expert]";
+						mes "In every major city, you can find [] to enter the Battlegrounds.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Maroll Battleground Recruiter:Tierra Battleground Recruiter:Flavius Battleground Recruiter:KVM Battleground Recruiter") == 1)
+							set .@correct, .@correct+10;
+						mes "[Battleground Expert]";
+						mes "For [], you go in 5vs5 with the intention of trying to reduce the number of enemies on the opposite side.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Maroll:Flavius:KVM:Tierra") == 3)
+							set .@correct, .@correct+10;
+						mes "[Battleground Expert]";
+						mes "When you complete a battle, you get a prize. The prize from Flavius is called [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("KVM Badge:Valor Badge:Bravery Badge:Honor Badge") == 3)
+							set .@correct, .@correct+10;
+						break;
+					}
+					if (.@correct == 30) {
+						mes "[Battleground Expert]";
+						mes "You got all 3 correct! I think you got a pretty good head on your shoulders. You know a thing or two about ^006400Battleground^000000s.";
+						next;
+						mes "[Battleground Expert]";
+						mes "If you ever want to go over anything about ^006400Battleground^000000s, feel free to come talk to me!";
+						next;
+						mes "[Battleground Expert]";
+						mes "Go on and find and talk to the 0000FFMemorial Dungeon Expert^000000!";
+						completequest 4163;
+						setquest 4164;
+						getexp 2000,1000;
+						close;
+					}
+					mes "[Battleground Expert]";
+					mes "There's only 3 questions and you didn't get them all right! At this rate, you'll fail all the Experts' tests.";
+					next;
+					mes "[Battleground Expert]";
+					mes "But if you want to take it on again, you should.";
+					break;
+				case 2:
+					callsub L_Info;
+					mes "[Battleground Expert]";
+					mes "There's nothing better than hearing it straight from the expert! Now, do you wanna take my 3-question quiz? You have to answer all 3 correctly to pass!";
+					break;
+				case 3:
+					mes "[Battleground Expert]";
+					mes "Don't disappoint me by giving up. If you change your mind, come find me again.";
+					close;
+				}
+			}
+			close;
+		case 2:
+			mes "[Battleground Expert]";
+			mes "You're a coward if you give up even before starting. If you change your mind, come find me again.";
+			close;
+		}
+		close;
+	}
+	mes "[Battleground Expert]";
+	mes "If you want to learn something from me, go get acknowledged by the ^006400Party Recruiting Expert^000000 first.";
+	close;
+
+L_Info:
+	mes "[Battleground Expert]";
+	mes "To explain ^006400Battleground^000000 easily...";
+	mes "You pick either Camp ^006400Guillaume^000000 or Camp ^006400Croix^000000 then you fight each other.";
+	next;
+	mes "[Battleground Expert]";
+	mes "There are 3 types of ^006400Battleground^000000s.";
+	mes "First is ^006400KVM^000000. It is a 5vs5 battle with the goal of reducing the number of people on either side.";
+	next;
+	mes "[Battleground Expert]";
+	mes "The second one is 10vs10. You attack the supply depots of your opponents and in turn, you protect your supply depots. This is called ^006400Tierra^000000.";
+	next;
+	mes "[Battleground Expert]";
+	mes "The third and final one is called ^006400Flavius^000000. This one is also 10vs10. For this one, you attack the crystals of your opponents while trying to protect your own.";
+	next;
+	mes "[Battleground Expert]";
+	mes "To get to ^006400Battleground^000000s, find ^006400Maroll, the Recruiter^000000 who can be found in all major towns.";
+	next;
+	mes "[Battleground Expert]";
+	mes "After you enter, pick if you want to side with Guillaume or Croix, then on their side, pick either...";
+	mes "^006400KVM Mercenary Recruiter^000000,";
+	mes "^006400Tierra Mercenary Recruiter^000000, or";
+	mes "^006400Flavius Mercenary Recruiter^000000,";
+	mes "then you can join the ^006400Battleground^000000s.";
+	next;
+	mes "[Battleground Expert]";
+	mes "Depending on the outcome of the ^006400Battleground^000000 you can get a prize too.";
+	mes "You get KVM Badges from ^006400KVM^000000,";
+	mes "from ^006400Tierra^000000 you obtain Bravery Badges and";
+	mes "you receive Valor Badges ^006400Flavius^000000.";
+	next;
+	mes "[Battleground Expert]";
+	mes "With the rewards from ^006400Battleground^000000s, you can get items that you can't normally get elsewhere.";
+	mes "Each ^006400Battleground^000000 reward you can obtain is different so you'll have to check on it.";
+	next;
+	return;
+}
+
+moc_para01,28,167,3	script	Memorial Dungeon Expert	4_M_LGTGUARD,{
+	set .@checkquest, checkquest(4164);
+	if (.@checkquest == 2) {
+		mes "[Memorial Dungeon Expert]";
+		mes "Since you've come here, it seems you want to learn about the ^006400Memorial Dungeon^000000.";
+		next;
+		switch(select("Listen about Memorial Dungeon.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Memorial Dungeon Expert]";
+			mes "Now that you've listend to an expert, it's easy to understand, right? If you want to hear about it again, come find me.";
+			close;
+		case 2:
+			mes "[Memorial Dungeon Expert]";
+			mes " If you want to hear about it again, come find me.";
+			close;
+		}
+	} else if (.@checkquest == 0 || .@checkquest == 1) {
+		mes "[Memorial Dungeon Expert]";
+		mes "I am the ^006400Memorial Dungeon^000000 Expert! I studied the ^006400Memorial Dungeon^000000 for 16 years!";
+		mes "Since you've sought me out, I assume that you've passed the ^006400Battleground Expert^000000's quiz.";
+		next;
+		mes "[Memorial Dungeon Expert]";
+		mes "As you already know, if you pass all the Experts' quiz you'll get a prize.";
+		next;
+		mes "[Memorial Dungeon Expert]";
+		mes "As the 4th Expert, I will explain everything to you about ^006400Memorial Dungeon^000000.";
+		mes "Want to hear about ^006400Memorial Dungeon^000000?";
+		next;
+		switch(select("Listen about Memorial Dungeon.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Memorial Dungeon Expert]";
+			mes "Now that you've listend to an expert, it's easy to understand, right? If you want to hear about it again, come find me.";
+			mes "Okay, now I'm gonna give you a quiz. You have to get all the questions right to pass. Ready?";
+			while(1) {
+				set .@correct,0;
+				next;
+				switch(select("On to the quiz!:Explain again please?:Give up.")) {
+				case 1:
+					switch(rand(1,3)) {
+					case 1:
+						mes "[Memorial Dungeon Expert]";
+						mes "^006400Memorial Dungeon^000000 isn't a dungeon that is open to all users. It's only available to you and your [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Party Members:Guildmates:Friends:Family") == 1)
+							set .@correct, .@correct+10;
+						mes "[Memorial Dungeon Expert]";
+						mes "If you go to [] and find [], he will give you information about Endless Tower- which is a huge and tall dungeon.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Prontera, Seiyablem:Alberta, Leyablem:Alberta, Captain Jansen:Prontera, Captin Jansen") == 3)
+							set .@correct, .@correct+10;
+						mes "[Memorial Dungeon Expert]";
+						mes "In order to enter Memorial Dungeon the [] must apply and then be on stand-by to enter. You will enter in the order the application was put in.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Guild Member:Guild Leader:Party Leader:Party Member") == 3)
+							set .@correct, .@correct+10;
+						break;
+					case 2:
+						mes "[Memorial Dungeon Expert]";
+						mes "When you're done with the [], you cannot re-enter the same dungeon for a certain period of time.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Buff:Ritual:Exploration:Inspection") == 3)
+							set .@correct, .@correct+10;
+						mes "[Memorial Dungeon Expert]";
+						mes "If you go to the Orc Map where all the orcs live, you will be able to find []. He will probably be able to give you information about the Orc's Memory dungeon.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Insane Scientist:Crazy Scientist:Insane Alchemist:Crazy Alchemist") == 1)
+							set .@correct, .@correct+10;
+						mes "[Memorial Dungeon Expert]";
+						mes "In order to enter Memorial Dungeon, the [] must apply- then you'll be able to enter in order of when your application was turned in.";
+						mes "You have to be on stand-by for this.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Guild Leader:Guildmate:Party Member:Party Leader") == 4)
+							set .@correct, .@correct+10;
+						break;
+					case 3:
+						mes "[Memorial Dungeon Expert]";
+						mes "If you go to the place where you can become a monk, the Capitolina Monastery, you can meet []. He will tell you about the dungeon with the Sealed Baphomet.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Agent Patrick:Patrolman Patrick:Drunken Patrick:Detective Patrick") == 4)
+							set .@correct, .@correct+10;
+						mes "[Memorial Dungeon Expert]";
+						mes "When you're done with the [], you cannot re-enter the same dungeon for a certain period of time.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Exploration:Inspection:Buff:Ritual") == 1)
+							set .@correct, .@correct+10;
+						mes "[Memorial Dungeon Expert]";
+						mes "^006400Memorial Dungeon^000000 is not just open to all users. It is open available for you and your [].";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Friends:Family:Party Members:Guildmates") == 3)
+							set .@correct, .@correct+10;
+						break;
+					}
+					if (.@correct == 30) {
+						mes "[Memorial Dungeon Expert]";
+						mes "You're pretty bright~ seeing that you got all 3 correct. Now do you understand about ^006400Memorial Dungeon^000000?";
+						next;
+						mes "[Memorial Dungeon Expert]";
+						mes "If you ever want to go over things about ^006400Memorial Dungeon^000000, come talk to me any time.";
+						next;
+						mes "[Memorial Dungeon Expert]";
+						mes "Now, off you go to the the ^0000FFMap Expert^000000!";
+						completequest 4164;
+						setquest 4165;
+						getexp 2000,1000;
+						close;
+					}
+					mes "[Memorial Dungeon Expert]";
+					mes "The quiz wasn't that hard...";
+					next;
+					mes "[Memorial Dungeon Expert]";
+					mes "You look like you have potential... you should try again.";
+					break;
+				case 2:
+					callsub L_Info;
+					mes "[Memorial Dungeon Expert]";
+					mes "It's easy to understand since it's coming from an expert like me. Now it's quiz time. You have to get all the answers correct to pass. Are you ready?";
+					break;
+				case 3:
+					mes "[Memorial Dungeon Expert]";
+					mes "Giving up is lame. If you change your mind, come talk to me.";
+					close;
+				}
+			}
+			close;
+		case 2:
+			mes "[Memorial Dungeon Expert]";
+			mes "Giving up without even trying is lame. If you change your mind, come talk to me.";
+			close;
+		}
+		close;
+	}
+	mes "[Memorial Dungeon Expert]";
+	mes "If you want to learn anything from me, talk to the ^006400Battleground Master^000000 first and get acknowledged by him.";
+	close;
+
+L_Info:
+	mes "[Memorial Dungeon Expert]";
+	mes "The ^006400Memorial Dungeon^000000is not a dungeon that is open to everyone. It only opens to ^0000FFYou and your Party Members^000000.";
+	next;
+	mes "[Memorial Dungeon Expert]";
+	mes "Therefore, in order to enter ^006400Memorial Dungeon^000000, the Party Leader must apply to enter. Since you enter in the order you apply, you must be on stand-by to enter.";
+	next;
+	mes "[Memorial Dungeon Expert]";
+	mes "Also, after you explore Memorial Dungeon, you cannot re-enter the same ^006400Memorial Dungeon^000000 for a certain period of time.";
+	next;
+	mes "[Memorial Dungeon Expert]";
+	mes "Many ^006400Memorial Dungeon^000000s exist, but we will give you hints to help you find Memorial Dungeon in the world of Rune Midgard.";
+	next;
+	mes "[Memorial Dungeon Expert]";
+	mes "First, go to ^8B4513Alberta^000000 and find ^006400Captain Jansen^000000.";
+	mes "He will give you information about the really huge and tall dungeon known as ^006400Endless Tower^000000.";
+	next;
+	mes "[Memorial Dungeon Expert]";
+	mes "Second, go to the ^8B4513Orc Map^000000 where all the orcs live and find the ^006400Insane Scientist^000000.";
+	mes "You might be able to get some information about a dungeon that has to do with ^006400Orc's Memory^000000.";
+	next;
+	mes "[Memorial Dungeon Expert]";
+	mes "Third and last, seek out the place where you can become a monk, which is the ^8B4513Capitolina Monastery^000000 and seek out ^006400Detective Patrick^000000.";
+	mes "He will be able to give you information about the dungeon with the ^006400Sealed Baphomet^000000+.";
+	next;
+	mes "[Memorial Dungeon Expert]";
+	mes "Of course there are other locations for Memorial Dungeon but it's best to start where you can find it easily.";
+	mes "As you continue to go on your adventures you will be able to find them more easily.";
+	next;
+	return;
+}
+
+moc_para01,14,168,6	script	Map Expert	2_M_SAGE_OLD,{
+	set .@checkquest, checkquest(4165);
+	if (.@checkquest == 2) {
+		mes "[Map Expert]";
+		mes "Seeing that you came to me, I assume you have some questions about ^006400MAP^000000s?";
+		next;
+		switch(select("List about the Map.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Map Expert]";
+			mes "If you end up in those areas while you're adventuring, be sure to tell me all about it!";
+			mes "And now, since you've passed all the Expert's quizzes, go on and talk to ^006400Tutorial Goal^000000.";
+			close;
+		case 2:
+			mes "[Map Expert]";
+			mes "If you have any more questions, come find me.";
+			close;
+		}
+	} else if (.@checkquest == 0 || .@checkquest == 1) {
+		mes "[Map Expert]";
+		mes "I have been researching and studying ^006400MAP^000000s for 16 years and so now I am the ^006400MAP^000000 Expert!";
+		mes "Since you've sought me out, it seems you've passed ^006400Memorial Dungeon Expert^000000's quiz.";
+		next;
+		mes "[Map Expert]";
+		mes "As you already know, if you pass all the Experts' quiz you'll get a prize.";
+		next;
+		mes "[Map Expert]";
+		mes "As the last Expert, I will try to explain everything about ^006400MAP^000000s to make it easy on you. Ready to start?";
+		next;
+		switch(select("Listen about Maps.:End Conversation.")) {
+		case 1:
+			callsub L_Info;
+			mes "[Map Expert]";
+			mes "How was my explanation? Now I am gonna give you a quick quiz! You have to get all the answers correct in order to pass. Ready?";
+			while(1) {
+				set .@correct,0;
+				next;
+				switch(select("On to the quiz!:Explain again please?:Give up.")) {
+				case 1:
+					switch(rand(1,3)) {
+					case 1:
+						mes "[Map Expert]";
+						mes "You can view the map by clicking on the [] button that is located in the upper left hand side.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("SKILL:GUILD:MAP:BOOKING") == 3)
+							set .@correct, .@correct+10;
+						mes "[Map Expert]";
+						mes "When looking at the map, each area offers the [] and [] information about the monsters. That will take all the guess work out of where you should hunt.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Name, Age:Attributes, Level:Attributes, Tribe:Name, Level") == 4)
+							set .@correct, .@correct+10;
+						mes "[Map Expert]";
+						mes "If you want to stop looking at the map, simple press the shortcut key of [] or ESC and it will close the map for you.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("ALT + F4:CTRL + %:CTRL + M:ALT + ESC") == 2)
+							set .@correct, .@correct+10;
+						break;
+					case 2:
+						mes "[Map Expert]";
+						mes "After you open your map and you";
+						mes "hover your mouse over specific areas";
+						mes "you can see the [] and [] of the region.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Name, Area Details:Name, Monster Attributes:Specialties, Area Details:Specialties, Name") == 1)
+							set .@correct, .@correct+10;
+						mes "[Map Expert]";
+						mes "If you look to the bottom right of the map, you will see a drawing of []. Click on that or press the TAB shortcut key and you can find out various information.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Desert Wolf:Mimic:Siroma:Poring") == 4)
+							set .@correct, .@correct+10;
+						mes "[Map Expert]";
+						mes "While looking at the map, when you press the TAB shortcut key, you will be able to find and locate various dungeons and their Entrance Locations.";
+						mes "You can also find the [] of the monsters in that area.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Name:Level:Attribute:Size") == 2)
+							set .@correct, .@correct+10;
+						break;
+					case 3:
+						mes "[Map Expert]";
+						mes "If you want to stop looking at the map, all you need to do is press the [] to go back to your normal screen.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("O:X:EXIT:ALT") == 2)
+							set .@correct, .@correct+10;
+						mes "[Map Expert]";
+						mes "While looking at the map, when you press the TAB shortcut key, you will be able to find and locate various dungeons and their Entrance Locations.";
+						mes "You can also find the [] of the monsters in that area.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("Level:Name:Size:Attribute") == 1)
+							set .@correct, .@correct+10;
+						mes "[Map Expert]";
+						mes "You can view the map by clicking on the [] button that is located in the upper left hand side.";
+						mes "What words go in the empty spaces of []?";
+						next;
+						if(select("GUILD:SKILL:BOOKING:MAP") == 4)
+							set .@correct, .@correct+10;
+						break;
+					}
+					if (.@correct == 30) {
+						mes "[Map Expert]";
+						mes "Bingo! You got all 3 answers correct! Now, do you feel like you understand stuff about ^006400MAP^000000s more?";
+						next;
+						mes "[Map Expert]";
+						mes "If you ever feel like you want to learn more about ^006400MAP^000000s, come talk to me anytime.";
+						next;
+						mes "[Map Expert]";
+						mes "Congrats on passing all the Experts' quizzes! Now, go find and talk to the ^006400Tutorial Goal^000000!";
+						completequest 4165;
+						setquest 4166;
+						getexp 2000,1000;
+						close;
+					}
+					mes "[Map Expert]";
+					mes "The 3 questions shouldn't have been that hard...";
+					next;
+					mes "[Map Expert]";
+					mes "Well, you seem to be pretty smart so why not try the quiz again?";
+					break;
+				case 2:
+					callsub L_Info;
+					mes "[Map Expert]";
+					mes "How is this Expert's explanations? Now I am gonna give you a quick quiz. You have to get all the answers correct to pass. Want to try it?";
+					break;
+				case 3:
+					mes "[Map Expert]";
+					mes "I'm the last Expert! Dont' give up! Come find me again when you're ready!";
+					close;
+				}
+			}
+			close;
+		case 2:
+			mes "[Map Expert]";
+			mes "You're gonna give up without even trying? But I'm the last Expert! Dont' give up! Come find me again when you're ready!";
+			close;
+		}
+		close;
+	}
+	mes "[Map Expert]";
+	mes "If you want to learn from me, go get acknowledged by the ^006400Memorial Dungeon^000000 first.";
+	close;
+
+L_Info:
+	mes "[Map Expert]";
+	mes "A ^006400MAP^000000 shows you things that is much needed for travelling around the world; such as the lay of the land, major towns and fields and such. It's a very important tool!";
+	next;
+	mes "[Map Expert]";
+	mes "Because of this, it's more important than everything else that you know about ^006400MAP^000000s.";
+	next;
+	mes "[Map Expert]";
+	mes "The map can be accessed by clicking on the button that says ^006400MAP^000000 on the upper left side of your screen.";
+	next;
+	mes "[Map Expert]";
+	mes "When you click on the ^006400MAP^000000 button, a full sized map of Rune Midgards will take up your screen.";
+	mes "When you ^0000FFHover your mouse over specific areas^000000, you can find out more things such as ^006400NAME^000000 and Area Details.";
+	next;
+	mes "[Map Expert]";
+	mes "If you look to the lower right side of your map, there is a ^006400Poring drawing^000000.";
+	mes "If you click on it or press the ^006400TAB^000000 shortcut key, you will be able to various information.";
+	next;
+	mes "[Map Expert]";
+	mes "Firstly, you can find out the ^006400NAME^000000 and ^006400LEVEL^000000 of the monsters in each area. That will take a lot of the guess work out of where you want to go hunt.";
+	next;
+	mes "[Map Expert]";
+	mes "Secondly, You can locate various ^006400DUNGEON^000000s and their";
+	mes "^006400Entrance Location^000000. Plus, it'll also tell you monsters that reside in that area";
+	mes "along with their ^006400LEVEL^000000. It's displayed in red so it's easy to find.";
+	next;
+	mes "[Map Expert]";
+	mes "If you want to stop looking at the map, there are 2 ways to do this.";
+	mes "You can press the shortcut keys which are ^006400CTRL + %^000000 or ^006400ESC^000000";
+	mes "Or at the top right of the map, there is a ^006400X^000000 button. Click that and you will return to your normal game screen.";
+	next;
+	mes "[Map Expert]";
+	mes "Currently, we cannot see places that are beyond Rune Midgards but it has been said that there are a lot of unknown worlds that exist in the beyond.";
+	next;
+	return;
+}
diff --git a/npc/re/quests/first_class/tu_archer.txt b/npc/re/quests/first_class/tu_archer.txt
new file mode 100644
index 000000000..2e8a03180
--- /dev/null
+++ b/npc/re/quests/first_class/tu_archer.txt
@@ -0,0 +1,14 @@
+//===== Hercules Script ======================================
+//= Archer Class Tutorial and Job Specific Quest
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Archer training quest.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+pay_fild08,40,83,5	duplicate(Acolyte_Tu)	Acolyte#tu	4_F_SISTER
diff --git a/npc/re/quests/homu_s.txt b/npc/re/quests/homu_s.txt
deleted file mode 100644
index 66e2b5c3d..000000000
--- a/npc/re/quests/homu_s.txt
+++ /dev/null
@@ -1,144 +0,0 @@
-//===== Hercules Script ======================================
-//= Homunculus S Quest
-//===== By: ================================================== 
-//= Masao
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= Evolves an Homunculus which is at least Level 99 to the
-//= new Homunculus S Class.
-//===== Additional Comments: ================================= 
-//= 1.0 First Version. The actual changing dialog is currently
-//=     customized. [Masao]
-//= 1.1 Cleaning. [Euphy]
-//============================================================ 
-
-job3_gen01,12,44,4	script	Viorel#job3_gen01	542,{
-
-	if((Class != Job_Genetic) && (Class != Job_Genetic_T) && (Class != Job_Baby_Genetic)){
-		mes "[Viorel]";
-		mes "^FF4800Homunculus^000000 research requires a lot of time and funding.";
-		mes "However, I believe passion is the most important factor.";
-		next;
-		switch(select("End conversation.:What are you talking about?:Why are you always standing there?")) {
-		case 1:
-			mes "[Viorel]";
-			mes "So long~!";
-			close;
-		case 2:
-			mes "[Viorel]";
-			mes "You see, ^006400Alchemists^000000 have an inquisitive nature.";
-			mes "People like me, especially, even think of creating life itself.";
-			next;
-			mes "[Viorel]";
-			mes "You'd have to research ^FF4800Homunculus^000000 to understand.";
-			mes "Now, if you'll excuse me~!";
-			close;
-		case 3:
-			emotion 4,0;
-			mes "[Viorel]";
-			mes "What, is it so strange to see an Alchemist in their own lab?";
-			mes "How so?";
-			close;
-		}
-	}
-	mes "[Viorel]";
-	mes "Hello "+strcharinfo(0)+",";
-	mes "what can I do for a fellow Alchemist like you?";
-	next;
-	switch(select("I want to evolve my Homunculus:About Homunculus S:Cancel")){
-	case 1:
-		mes "[Viorel]";
-		if(!getskilllv("AM_BIOETHICS")){
-			mes "I'm sorry, but you must know the Skill Bioethics! Otherwise I can't let your Homunculus evolve into a Homunculus S.";
-			close;
-		}
-		if(!gethominfo(1)){
-			mes "You don't even have a Homunculus!";
-			close;
-		}
-		if(gethominfo(1) < 6009){
-			mes "You must have an evolved Homunculus, or you can't turn it into the new Homunculus S.";
-			close;
-		}
-		if(gethominfo(6) < 99){
-			mes "Your Homunculus must be level 99 to evolve into a Homuculus S!";
-			mes "Come back after you've trained your Homunculus a little bit more.";
-			close;
-		}
-		if(gethominfo(1) == 6048 || gethominfo(1) == 6049 || gethominfo(1) == 6050 || gethominfo(1) == 6051 || gethominfo(1) == 6052){
-			mes "Your Homunculus S looks great!";
-			mes "I hope you will experience many great adventures with it!";
-			close;
-		}
-		mes "Great, it seems like you're all ready to get your Homunculus to the next level!";
-		next;
-		mes "[Viorel]";
-		mes "Now you can either directly change your Homunculus to a random Homunculus S or you can donate a little fee of 50,000z";
-		mes "to the Alchemist Guild. For this you'll be able to change your Homunculus into your desired Homunculus S Class!";
-		mes "So, what do you think?";
-		next;
-		switch(Select("I want to donate.:I don't want to donate.:Cancel")){
-		case 1:
-			if(Zeny < 50000){
-				mes "[Viorel]";
-				mes "Haha, nice try my friend! But you don't even have the 50,000z to donate!";
-				mes "Come back if you have the Zeny.";
-				close;
-			}
-			mes "[Viorel]";
-			mes "Alright, now please tell me which Homunculus you'd like to have:";
-			next;
-			set .@i, select("Eira:Bayeri:Sera:Dieter:Elanor:Cancel");
-			if (.@i == 6) {
-				mes "[Viorel]";
-				mes "So long~!";
-				close;
-			}
-		case 2:
-			mes "[Viorel]";
-			mes "Ok, it's all set! Now just give me a moment!";
-			next;
-			mes "[Viorel]";
-			mes "Abra...";
-			next;
-			mes "[Viorel]";
-			mes "Kadabra...";
-			next;
-			mes "[Viorel]";
-			mes "Simsala!";
-			mes "...";
-			mes "Oh, sorry... wrong game!";
-			next;
-			mes "[Viorel]";
-			mes "Here you go! Your new Homunculus S!";
-			if (.@i) {
-				hommutate 6047+.@i;
-				set Zeny,Zeny - 50000;
-			}
-			else hommutate;
-			close;
-		case 3:
-			mes "[Viorel]";
-			mes "So long~!";
-			close;
-		}
-	case 2:
-		mes "[Viorel]";
-		mes "The Homunculus S are the new and improved versions of the current Homunculus you know.";
-		mes "These new Homunculus have been made because the monsters in our world keep getting stronger and";
-		mes "stronger, and our current Homunculus are just not able to keep up with them anymore.";
-		next;
-		mes "[Viorel]";
-		mes "But since we're Alchemists and we don't want to abandon our precious Homunculus, we've discovered a way";
-		mes "to improve their skills and strength in order to keep them by our side, and joining us once more";
-		mes "in battle! Isn't that great?";
-		close;
-	case 3:
-		mes "[Viorel]";
-		mes "So long~!";
-		close;
-	}
-}
diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt
new file mode 100644
index 000000000..d5abca9fd
--- /dev/null
+++ b/npc/re/quests/homun_s.txt
@@ -0,0 +1,1360 @@
+//===== Hercules Script ======================================
+//= Homunculus S Mutation Quest
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= [Official Conversion]
+//= Genetic quest to mutate a level 99 evolved Homunculus
+//= into a Homunculus S.
+//===== Additional Comments: =================================
+//= 1.0 First Version, entirely custom. [Masao]
+//= 1.1 Cleaning. [Euphy]
+//= 1.2 Replaced with official script. [Euphy]
+//============================================================
+
+// Main NPCs
+//============================================================
+job3_gen01,12,44,3	script	Viorel#job3_gen01	4_M_ALCHE_E,{
+	if (countitem(6415)) {
+		if (Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) {
+			disable_items;
+			if (checkquest(4159) == -1 && checkquest(4160) == -1) {
+				mes "[Viorel]";
+				mes "Why are you here?";
+				mes "Shouldn't you be at ^005DFFJeyna^000000's house?";
+				close2;
+				for(set .@i,4154; .@i<=4160; set .@i,.@i+1) {
+					if (checkquest(.@i) > -1)
+						erasequest .@i;
+				}
+				setquest 4154;
+				setquest 4159;
+				morphembryo;
+				if (countitem(6415) == 0)
+					getitem 6415,1; //Strange_Embryo
+				else if (countitem(6415) > 1)
+					delitem 6415, (countitem(6415) - 1); //Strange_Embryo
+				warp "que_house_s",63,41;
+				end;
+			}
+			enable_items;
+		} else if (Class == Job_Novice_High || Class == Job_Merchant_High || Class == Job_Alchemist || Class == Job_Creator) {
+			emotion e_what;
+			mes "[Viorel]";
+			mes "I don't know what's going on, but the way I remember it you were supposed to be qualified to research ^FF4800Homunculus^000000.";
+			next;
+			mes "[Viorel]";
+			mes "Whatever the reason, you're not able to continue the research on ^FF4800Homunculus^000000.";
+			mes "Come back after you become a ^005DFFGenetic^000000 and have obtained a ^0000FFBioethics^000000.";
+			close;
+		} else {
+			delitem 6415, countitem(6415); //Strange_Embryo
+			mes "[Viorel]";
+			mes "Wait, that embryo you have seems a little strange.";
+			next;
+			mes "[Viorel]";
+			mes "Unless you have a job researching ^FF4800Homunculus^000000....";
+			mes "It will be of no help to you what so ever.";
+			next;
+			mes "[Viorel]";
+			mes "I'm in charge of managing ^0000FFStrange Embryo^000000 so I'll take care of that for you.";
+			mes "No offense, and I'm not doing anything bad here.";
+			close;
+		}
+	}
+	if ((Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) && (checkquest(4154) > -1)) {
+		if ((checkquest(4155) > -1) || (checkquest(4160) > -1)) {
+			mes "[Viorel]";
+			mes "Weather's great.";
+			next;
+			callsub L_CheckHomunculus;
+			mes "[Viorel]";
+			mes "Ready to go to my house?";
+			next;
+			switch(select("Go to ^005DFFViorel^000000's house.:Don't go.")) {
+			case 1:
+				mes "[Viorel]";
+				mes "Good choice.";
+				mes "Now, close your eyes for a second...";
+				close2;
+				warp "que_house_s",19,42;
+				end;
+			case 2:
+				mes "[Viorel]";
+				mes "Come back when you're ready.";
+				mes "You must come with the ^FF4800Homunculus^000000.";
+				close;
+			}
+		} else {
+			mes "[Viorel]";
+			mes "Why are you here?";
+			mes "Shouldn't you be at ^005DFFJeyna^000000's house?";
+			next;
+			callsub L_CheckHomunculus;
+			mes "[Viorel]";
+			mes "Now, ready to go to ^005DFFJeyna^000000?";
+			next;
+			switch(select("Go to ^005DFFJeyna^000000's room.:Don't go.")) {
+			case 1:
+				mes "[Viorel]";
+				mes "Good choice.";
+				mes "Now, close your eyes for a second...";
+				close2;
+				warp "que_house_s",63,41;
+				end;
+			case 2:
+				mes "[Viorel]";
+				mes "Come back when you're ready.";
+				mes "You must come with the ^FF4800Homunculus^000000.";
+				close;
+			}
+		}
+	}
+	if (BaseJob == Job_Merchant) {
+		mes "[Viorel]";
+		mes "I used to be a merchant once, just like you.";
+		mes "I'm researching on ^FF4800Homunculus^000000.";
+		next;
+		mes "[Viorel]";
+		mes "If you're interested in ^FF4800Homunculus^000000, become an ^005DFFAlchemist^000000 or a ^005DFFCreator^000000.";
+		close;
+ 	} else if (BaseJob == Job_Alchemist && Class < Job_Genetic) {
+		mes "[Viorel]";
+		mes "I've spent lots of time and energy on Homunculus.";
+		mes "If you feel like you're at a dead end, come back next time with a ^FF4800Homunculus^000000.";
+		next;
+		mes "[Viorel]";
+		mes "Oh. Of course you need to have the suitable potentials. You could probably prove yourself once you become a ^FF4800Genetic^000000.";
+		close;
+	} else if (Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) {
+		if (gethominfo(6) >= 99 && (gethominfo(1) >= 6009 && gethominfo(1) <= 6016)) { // Level 99+ evolved Homunculus
+			mes "[Viorel]";
+			mes "Oh, great~!";
+			mes "You have a ^FF4800Homunculus^000000.";
+			mes "With passion invested in its research we can make them better.";
+			next;
+			mes "[Viorel]";
+			mes "I must speak to you in private. Would you mind going to my house with me?";
+			next;
+			switch(select("Go to ^005DFFViorel^000000's home.:Stay here.")) {
+			case 1:
+				mes "[Viorel]";
+				mes "Good choice.";
+				mes "Now, close your eyes for a second...";
+				close2;
+				setquest 4154;
+				setquest 4155;
+				warp "que_house_s",19,42;
+				end;
+			case 2:
+				mes "[Viorel]";
+				mes "If you feel like you're at a dead end, come back next time with a ^FF4800Homunculus^000000.";
+				close;
+			}
+		} else if (gethominfo(6) >= 99 && (gethominfo(1) >= 6048 && gethominfo(1) <= 6052)) { // Level 99+ mutated Homunculus-S
+			mes "[Viorel]";
+			mes "Hello again.";
+			mes "Perhaps you may be interested";
+			mes "in the newly created ^FF4800Homunculus^000000,";
+			mes "born from the new ^006400Homunculus Mutation System^000000?";
+			next;
+			switch(select("Nope. Good bye.:Please, I'm busy.:That's exactly what I wanted to hear.:Why are you always standing there?")) {
+			case 1:
+				emotion e_heh;
+				mes "[Viorel]";
+				mes "Okay.";
+				mes "Good seeing you.";
+				mes "Good bye then~!";
+				close;
+			case 2:
+				emotion e_omg;
+				mes "[Viorel]";
+				mes "!!!!";
+				mes "I... I see.";
+				mes "I thought you were here to see me.";
+				close;
+			case 3:
+				emotion e_ic;
+				mes "[Viorel]";
+				mes "Just as I thought.";
+				mes "Let's have a look at the notes my dear friend Jeyna left.";
+				next;
+				playbgm "30.mp3"; // One Step Closer
+				callfunc "F_HomMutateInfo","[Memo Pad Notes]";
+				mes "[Viorel]";
+				mes "Hmm.";
+				mes "Well, that's all there is to it.";
+				mes "It's up to you to find out more.";
+				close2;
+				playbgm "08.mp3"; // Theme of Prontera
+				end;
+			case 4:
+				emotion e_swt;
+				mes "[Viorel]";
+				mes "No, I do not stand here every day.";
+				mes "But why do YOU stand there every day?";
+				next;
+				mes "[Viorel]";
+				mes "What?";
+				mes "No, the way I see it";
+				mes "you seem to be here every time I'm here.";
+				close;
+			}
+		} else {
+			if (gethominfo(1) >= 6009) { // Evolved Homunculus
+				mes "[Viorel]";
+				mes "Hmm, you seem to have a special bond with your ^FF4800Homunculus^000000.";
+				next;
+				mes "[Viorel]";
+				mes "Come back to me when that ^FF4800Homunculus^000000 reaches ^0000FFlevel 99^000000.";
+				close;
+			} else {
+				mes "[Viorel]";
+				mes "You do not yet possess an evolved ^FF4800Homunculus^000000...";
+				mes "As you may well know about evolution:";
+				next;
+				mes "[Viorel]";
+				mes "Using the ^0000FFStone of Sage^000000 when intimacy level is above ^006400Intimate^000000, the ^FF4800Homunculus^000000 goes through ^006400Evolution^000000.";
+				close;
+			}
+		}
+	}
+	mes "[Viorel]";
+	mes "^FF4800Homunculus^000000 research requires a lot of time and funding.";
+	mes "However, I believe passion is the most important factor.";
+	next;
+	switch(select("End conversation.:What are you talking about?:Why are you always standing there?")) {
+	case 1:
+		mes "[Viorel]";
+		mes "So long~!";
+		close;
+	case 2:
+		mes "[Viorel]";
+		mes "You see, ^006400Alchemists^000000 have an inquisitive nature.";
+		mes "People like me, especially, even think of creating life itself.";
+		next;
+		mes "[Viorel]";
+		mes "You'd have to research ^FF4800Homunculus^000000 to understand.";
+		mes "Now, if you'll excuse me~!";
+		close;
+	case 3:
+		emotion e_swt;
+		mes "[Viorel]";
+		mes "What, is it so strange to see an Alchemist in their own lab?";
+		mes "How so?";
+		close;
+	}
+	end;
+L_CheckHomunculus:
+	if (gethominfo(6) < 99 || (gethominfo(1) < 6009 || gethominfo(1) > 6016)) { // Not level 99+ evolved Homunculus
+		mes "[Viorel]";
+		mes "Huh?";
+		mes "Where's the ^FF4800Homunculus^000000 you used to have?";
+		mes "Perhaps I've mistaken it for something else...";
+		next;
+		mes "[Viorel]";
+		mes ".......";
+		mes " ";
+		mes "(Seems to be thinking about something.)";
+		next;
+		emotion e_heh;
+		mes "[Viorel]";
+		mes "Ha ha~";
+		mes "I think I've mistaken you for someone else.";
+		mes "If you'll excuse me.";
+		close;
+	}
+	return;
+}
+
+que_house_s,24,47,3	script	Viorel#homun_s	4_M_ALCHE_E,{
+	if (checkquest(4155) > -1) {
+		emotion e_dum;
+		mes "[Viorel]";
+		mes "Good.";
+		mes "I see that you mean business.";
+		next;
+		playbgm "33.mp3"; // Yuna Song
+		mes "[Viorel]";
+		mes "Maybe you'll agree.";
+		mes "Currently, your ^FF4800Homunculus^000000 is not in its perfect state.";
+		next;
+		mes "[Viorel]";
+		mes "These days, studies on the growth of the ^FF4800Homunculus^000000 are actively taking place.";
+		mes "But, I do believe that I have found something special.";
+		next;
+		mes "[Viorel]";
+		mes "In order to break the current limitations of the ^FF4800Homunculus^000000, mutations need to happen.";
+		next;
+		switch(select("Like, biological experiments...?!:Well, yeah, naturally.:I don't want to hurt my Homunculus!")) {
+		case 1:
+			emotion e_swt2;
+			mes "[Viorel]";
+			mes "Don't look so surprised.";
+			mes "Ethics in biology are kind of blurry right now, right?";
+			mes "I mean...";
+			next;
+			mes "[Viorel]";
+			mes "It's my duty to study the true potential of the ^FF4800Homunculus^000000.";
+			next;
+			mes "[Viorel]";
+			mes "So far, Homunculus haven't demonstrated their full potential, but I know that I am close to a breakthrough.";
+			next;
+			break;
+		case 2:
+			emotion e_sigh;
+			mes "[Viorel]";
+			mes "Yes.";
+			mes "I'm glad you're not upset.";
+			mes "Mutation,";
+			mes "a word that sparks evil in the minds of the ordinary,";
+			mes "which made my research very difficult to proceed with.";
+			next;
+			mes "[Viorel]";
+			mes "Do you remember?";
+			mes "^005DFFKellasus^000000 of ^8B4513Lighthalzen^000000, the pioneer of ^FF4800Homunculus^000000 research.";
+			next;
+			mes "[Viorel]";
+			mes "I believe that this research fulfills the promise made with ^005DFFKellasus^000000, the giver of knowledge and belief.";
+			next;
+			break;
+		case 3:
+			emotion e_swt;
+			mes "[Viorel]";
+			mes "I understand your concern.";
+			mes "But I want to assure you that this Mutation does not harm or hurt your ^FF4800Homunculus^000000.";
+			next;
+			mes "[Viorel]";
+			mes "On the contrary, the ^FF4800Homunculus^000000 of today are in pain from imperfection, unable to live up to their supposed potentials.";
+			mes "Moreover, those ^FF4800Homunculus^000000 were often abandoned.";
+			next;
+			mes "[Viorel]";
+			mes "Don't get me wrong, I study the ^FF4800Homunculus^000000 because I love them.";
+			next;
+			break;
+		}
+		mes "[Viorel]";
+		mes "Well, by the way...";
+		mes "I have found this new mutation to be quite stable.";
+		next;
+		mes "[Viorel]";
+		mes "^006400The technology exists,";
+		mes "and they will likely have new";
+		mes "skills when mutated...^000000";
+		next;
+		mes "[Viorel]";
+		mes "The minor side effect...";
+		mes "^006400Their appearance will change^000000.";
+		mes "But I think you'll find that pretty satisfying.";
+		next;
+		mes "[Viorel]";
+		mes "I quote from ^005DFFKassibian^000000, an expert in ^FF4800Homunculus^000000 techniques,";
+		mes "^006400The truth is not in a single form~!^000000";
+		mes "Ha ha.";
+		next;
+		emotion e_flash;
+		mes "[Viorel]";
+		mes "I know it's a little abrupt, but...";
+		mes "How about changing your ^FF4800Homunculus^000000 into something incredible with my marvelous achievement, the ^006400Homunculus Mutation System^000000?";
+		next;
+		switch(select("Explore the ^006400Homunculus Mutation System^000000.:Cancel.")) {
+		case 1:
+			emotion e_no1;
+			mes "[Viorel]";
+			mes "Good choice.";
+			mes "Success lurks outside the box of conventional thinking, right?";
+			next;
+			mes "[Viorel]";
+			mes "The first person to help with the research is ^005DFFJeyna^000000.";
+			mes "I'll send you to ^005DFFJeyna^000000.";
+			mes "There, you'll learn more about the new ^0000FFHomunculus^000000.";
+			close2;
+			setquest 4156;
+			erasequest 4155;
+			warp "que_house_s",63,41;
+			end;
+		case 2:
+			emotion e_dots;
+			mes "[Viorel]";
+			mes "I don't see why you hesitate.";
+			mes "I am not trying to deceive you.";
+			mes "Maybe you need some time to think about it?";
+			next;
+			switch(select("Think about it.:I'm just going to walk away.")) {
+			case 1:
+				mes "[Viorel]";
+				mes "We'll talk in a bit then.";
+				close;
+			case 2:
+				emotion e_otl;
+				mes "[Viorel]";
+				mes "Shame.";
+				mes "However, I respect your opinion.";
+				mes "I'll send you back to the ^8B4513Laboratory^000000.";
+				close2;
+				erasequest 4154;
+				erasequest 4155;
+				warp "job3_gen01",12,47;
+				end;
+			}
+		}
+	} else if (checkquest(4160) > -1) {
+		playbgm "33.mp3"; // Yuna Song
+		mes "[Viorel]";
+		mes "The ^FF4800Homunculus^000000 I saw before has returned to its ^0000FFembryo^000000 state.";
+		mes "A little strange, but...";
+		mes "You don't have to worry about it.";
+		next;
+		mes "[Viorel]";
+		mes "By the way...";
+		mes "I forgot to tell you something.";
+		mes "In order to stabilize the Mutation process, I need some materials first.";
+		next;
+		mes "[Viorel]";
+		mes "Fortunately, you don't have to find them yourself because I have them here already..";
+		mes "But, I'll need ^FF000050,000 zeny^000000, you know, as a service fee.";
+		next;
+		mes "[Viorel]";
+		mes "I wish that I could do it for free but I'm not exactly made of money, you know.";
+		mes "That and I lack any investors to support my research at the moment.";
+		next;
+		mes "[Viorel]";
+		mes "In fact, if I had enough zeny to continue my research, then I could solve a lot of my problems...";
+		next;
+		mes "[Viorel]";
+		mes "Anyways, you can try to do this with or without the stabilization process. It's all up to you.";
+		next;
+		mes "[Viorel]";
+		mes "If you choose the unstable";
+		mes "mutation, I can't guarentee what kind of Homunculus you're going to get.";
+		mes "Anyways, it's up to you.";
+		next;
+		switch(select("Mutation stabilization (50,000 zeny):Unstable mutation")) {
+		case 1:
+			if (Zeny < 50000) {
+				mes "[Viorel]";
+				mes "I don't think you have ^FF000050 thousand Zeny^000000 with you right now.";
+				mes "Please bring enough Zeny.";
+				mes "I'll be waiting.";
+				mes "Want me to send you back to the ^8B4513Laboratory^000000?";
+				next;
+				switch(select("No thanks.:Yes. Send me back to the Lab.")) {
+				case 1:
+					mes "[Viorel]";
+					mes "Alright.";
+					mes "I'll see you in a bit.";
+					close;
+				case 2:
+					mes "[Viorel]";
+					mes "Alright.";
+					mes "I'll be waiting at the ^8B4513Laboratory^000000.";
+					close2;
+					warp "job3_gen01",12,47;
+					end;
+				}
+			}
+			emotion e_no1;
+			playbgm "19.mp3"; // Under the Ground
+			mes "[Viorel]";
+			mes "Good choice.";
+			mes "Choose from the different types of ^0000FFHomunculus^000000.";
+			next;
+			switch(select("Eira:Sera:Dieter:Bayeri:Eleanor")) {
+			case 1:
+				cutin "Mer_Eira_Card",3;
+				set .@Homunculus,6048; //MER_EIRA
+				break;
+			case 2:
+				cutin "Mer_Sera_Card",3;
+				set .@Homunculus,6050; //MER_SERA
+				break;
+			case 3:
+				cutin "Mer_Dieter_Card",3;
+				set .@Homunculus,6051; //MER_DIETER
+				break;
+			case 4:
+				cutin "Mer_Bayeri_Card",3;
+				set .@Homunculus,6049; //MER_BAYERI
+				break;
+			case 5:
+				cutin "Mer_Eleanor_Card",3;
+				set .@Homunculus,6052; //MER_ELEANOR
+				break;
+			}
+			mes "[Viorel]";
+			mes "Are you sure?";
+			next;
+			if(select("Yes.:No.") == 2) {
+				cutin "",255;
+				playbgm "33.mp3"; // Yuna Song
+				mes "[Viorel]";
+				mes "I see.";
+				mes "Give it more time to think.";
+				close;
+			}
+			cutin "",255;
+			mes "[Viorel]";
+			mes "Excellent!";
+			mes "Let's get on with it.";
+			next;
+			specialeffect2 EF_BASH;
+			mes "[Viorel]";
+			mes "Now focus~!";
+			mes "You... need...";
+			mes "... concentration.";
+			next;
+			specialeffect2 EF_PROVIDENCE;
+			mes "[Viorel]";
+			mes "Good. Almost done!";
+			next;
+			specialeffect2 EF_SUI_EXPLOSION;
+			Zeny -= 50000;
+			hommutate .@Homunculus;
+			break;
+		case 2:
+			emotion e_hmm;
+			mes "[Viorel]";
+			mes "So, your choice is the Unstable Mutation Process.";
+			mes "You believe in destiny?";
+			mes "Seriously...";
+			mes "Do you really wish to proceed";
+			mes "with the process of random outcome?";
+			next;
+			if(select("Go ahead. (Random Mutation):Cancel.") == 2) {
+				playbgm "33.mp3"; // Yuna Song
+				mes "[Viorel]";
+				mes "I see.";
+				mes "Give it more time to think.";
+				close;
+			}
+			emotion e_dots;
+			mes "[Viorel]";
+			mes "Hmm...";
+			mes "The exploration of knowledge";
+			mes "is full of surprises.";
+			mes ".......";
+			next;
+			emotion e_heh;
+			mes "[Viorel]";
+			mes "Ha ha.";
+			mes "Hey, I feel like a Blacksmith!";
+			mes "Now let's get on with it.";
+			next;
+			specialeffect2 EF_BASH;
+			mes "[Viorel]";
+			mes "Now focus~!";
+			mes "You... need...";
+			mes "... concentration.";
+			next;
+			specialeffect2 EF_PRESSURE;
+			mes "[Viorel]";
+			mes "Concentrate a little more!";
+			next;
+			specialeffect2 EF_PROVIDENCE;
+			mes "[Viorel]";
+			mes "Good. Almost done!";
+			next;
+			specialeffect2 EF_SUI_EXPLOSION;
+			hommutate;
+			break;
+		}
+		erasequest 4160;
+		erasequest 4154;
+		emotion e_ho;
+		playbgm "64.mp3"; // One Fine Day
+		mes "[Viorel]";
+		mes "Okay, Mutation Complete.";
+		mes "Phew... Didn't skip a heartbeat, did you?";
+		next;
+		mes "[Viorel]";
+		mes "Remember what ^005DFFKellasus^000000 said?";
+		mes "To the doorstep of the truth...";
+		mes "We must see for ourselves";
+		mes "the path that leads to it.";
+		next;
+		mes "[Viorel]";
+		mes "^0000FF" + strcharinfo(0) + "^000000,";
+		mes "I haven't known you";
+		mes "for a very long time,";
+		mes "but I get the feeling that";
+		mes "you'll achieve great things.";
+		next;
+		mes "[Viorel]";
+		mes "Good luck on you adventures.";
+		mes "I hope that your new ^FF4800Homunculus^000000 will excel under your care.";
+		next;
+		mes "[Viorel]";
+		mes "And don't you forget.";
+		mes "Our research";
+		mes "has only just begun~!";
+		close;
+	} else {
+		for(set .@i,4154; .@i<=4160; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		mes "[Viorel]";
+		mes "Now that all the work is done, I ask you to take your leave.";
+		mes "I need to recuperate.";
+		close2;
+		warp "job3_gen01",12,47;
+		end;
+	}
+}
+
+que_house_s,80,42,3	script	Jeyna#homun_s	4_F_ALCHE_A,{
+	if (checkquest(4156) > -1) {
+		playbgm "28.mp3"; // You're in Ruins
+		emotion e_gasp;
+		mes "[Jeyna]";
+		mes "Welcome.";
+		mes "I just got word from ^005DFFViorel^000000 that you were coming.";
+		next;
+		emotion e_hmm;
+		mes "[Jeyna]";
+		mes "By the way...";
+		mes "Did he convince you to do something...?";
+		mes "He does have a way with words.";
+		next;
+		mes "[Jeyna]";
+		mes "He needs them because Alchemists are such awkward people.";
+		emotion e_sigh;
+		next;
+		mes "[Jeyna]";
+		mes "Anyways~";
+		mes "^0000FF"+strcharinfo(0)+"^000000 and ^005DFFViorel^000000 seem like two peas in a pod.";
+		next;
+		emotion e_heh;
+		mes "[Jeyna]";
+		mes "Hahaha~ No offense.";
+		mes "I think it's a good thing.";
+		mes "Oh, yes.";
+		mes "You're here for the ^FF4800Homunculus^000000 Mutation.";
+		next;
+		mes "[Jeyna]";
+		mes "While I do some preparation,";
+		mes "why don't you take a look at that board?";
+		mes "The ^006400Homunculus Mutation System^000000 has ^0000FF5 different types^000000 of new mutations.";
+		next;
+		emotion e_gasp,0,"Magic Board#homun_s";
+		mes "[Jeyna]";
+		mes "Your ^FF4800Homunculus^000000 can mutate into any of the 5 different forms.";
+		next;
+		emotion e_ic;
+		mes "[Jeyna]";
+		mes "Let's see...";
+		mes "The ^006400Homunculus Mutation System^000000 includes new evolutions of the normal ^0000FFHomunculus^000000.";
+		mes "After they mutate, all previously learned skills will also remain.";
+		next;
+		mes "[Jeyna]";
+		mes "In other words...";
+		mes "Even if you change the magic wielder ^FF4800Vanilmirth^000000 to a fighter type,";
+		mes "skills such as Caprice will be";
+		mes "^006400retained and usable even after Mutation^000000.";
+		next;
+		emotion e_gasp,0,"Magic Board#homun_s";
+		mes "[Jeyna]";
+		mes "Take a look at the Magic Board behind me and decide for yourself.";
+		close2;
+		setquest 4157;
+		erasequest 4156;
+		end;
+	} else if (checkquest(4157) > -1) {
+		emotion e_what;
+		mes "[Jeyna]";
+		mes "Take a look at the board behind me, on the right.";
+		close2;
+		emotion e_gasp,0,"Magic Board#homun_s";
+		end;
+	} else if (checkquest(4158) > -1) {
+		playbgm "28.mp3"; // You're in Ruins
+		disable_items;
+		mes "[Jeyna]";
+		mes "Okay, I'm ready too.";
+		mes "In order to revert the process now, I need the Homunculus in its embryo form.";
+		next;
+		callsub L_CheckHomunculus;
+		if (checkweight(6415,1) == 0) {
+			mes "[Jeyna]";
+			mes "But,";
+			mes "You don't have enough space to carry an ^0000FFembryo^000000.";
+			mes "Please come back with enough space in your bag.";
+			next;
+			mes "[Jeyna]";
+			mes "Please return to the ^8B4513Laboratory^000000.";
+			mes "You can find ^005DFFViorel^000000 at the ^8B4513Laboratory^000000 once you empty your bag.";
+			next;
+			mes "[Jeyna]";
+			mes "When you're done with emptying your bag, ask ^005DFFViorel^000000 to send you back here.";
+			mes "Go on and empty your bag~!";
+			close2;
+			warp "job3_gen01",12,47;
+			end;
+		}
+		mes "[Jeyna]";
+		mes "Now's about time for a decision.";
+		mes "To go through the Mutation to the new ^0000FFHomunculus^000000 with the Homunculus Mutation System,";
+		mes "you need to go through the process of regression to turn the Homunculus back to its ^0000FFembryo^000000 state.";
+		next;
+		mes "[Jeyna]";
+		mes "And...";
+		mes "^006400You cannot use the ability Call Homunculus until the process is complete.^000000";
+		mes "It won't take long, so don't wander off.";
+		next;
+		mes "[Jeyna]";
+		mes "So, please decide.";
+		mes "Do you want to proceed with the new ^0000FFHomunculus Mutation System^000000?";
+		next;
+		switch(select("Yes, I do.:I need to think more.")) {
+		case 1:
+			if (checkhomcall() == 1) {
+				mes "[Jeyna]";
+				mes "Oh, wait a minute.";
+				mes "To proceed with the Mutation, you need to wake up the Homunculus from the state of Vaporization.";
+				next;
+				mes "[Jeyna]";
+				mes "Come back after you've done that.";
+				close;
+			}
+			emotion e_no1;
+			mes "[Jeyna]";
+			mes "Good thinking.";
+			mes "It is unacceptable for Alchemists like us to fear challenge.";
+			next;
+			playbgm "01.mp3"; // Title
+			mes "[Jeyna]";
+			mes "Now I need you to focus.";
+			next;
+			specialeffect2 EF_ABSORBSPIRITS;
+			mes "[Jeyna]";
+			mes "We need to...";
+			mes "Stabilize a little more.";
+			mes ".......";
+			next;
+			specialeffect2 EF_CURE;
+			mes "[Jeyna]";
+			mes "In a few moments, the ^FF4800Homunculus^000000 will return to its embryo state.";
+			next;
+			specialeffect2 EF_HOLYHIT;
+			mes "[Jeyna]";
+			mes "Into a special embryo...";
+			next;
+			callsub L_CheckHomunculus;
+			specialeffect2 EF_BLESSING;
+			morphembryo;
+			setquest 4159;
+			erasequest 4158;
+			emotion e_ho;
+			mes "[Jeyna]";
+			mes "Phew~ All done.";
+			mes "Hmm, its state is a little strange.";
+			next;
+			emotion e_heh;
+			mes "[Jeyna]";
+			mes "I guess it'll be just fine.";
+			mes "Don't lose that ^0000FFStrange Embryo^000000.";
+			mes "Also...";
+			next;
+			mes "[Jeyna]";
+			mes "Don't do anything like changing jobs or anything like that before the process is over.";
+			mes "If so, you, ^0000FF"+strcharinfo(0)+"^000000 might lose all the abilities you have over the Homunculus.";
+			next;
+			mes "[Jeyna]";
+			mes "All that concentration made me tired.";
+			mes "I'll just take a glass of water.";
+			close;
+		case 2:
+			playbgm "28.mp3"; // You're in Ruins
+			emotion e_sigh;
+			mes "[Jeyna]";
+			mes "Maybe I shouldn't have asked in the first place.";
+			close;
+		}
+	} else if (checkquest(4159) > -1 || checkquest(4160) > -1) {
+		playbgm "28.mp3"; // You're in Ruins
+		mes "[Jeyna]";
+		mes "^005DFFViorel^000000 will finish the mutation process.";
+		mes "Now it's my time to say good bye.";
+		next;
+		mes "[Jeyna]";
+		mes "It was short, but it was nice to meet you.";
+		mes "We'll see each other again some time.";
+		next;
+		mes "[Jeyna]";
+		mes "Best of luck~!";
+		close2;
+		setquest 4160;
+		erasequest 4159;
+		warp "que_house_s",19,42;
+		end;
+	} else {
+		if (checkquest(4154) > -1)
+			erasequest 4154;
+		mes "[Jeyna]";
+		mes "Hey, how did you get in here?";
+		mes "Please get out. I'm changing~!";
+		close2;
+		warp "job3_gen01",12,47;
+		end;
+	}
+	end;
+L_CheckHomunculus:
+	if (gethominfo(6) < 99 || (gethominfo(1) < 6009 || gethominfo(1) > 6016)) { // Not level 99+ evolved Homunculus
+		mes "[Jeyna]";
+		mes "Hey, wait.";
+		mes "The condition of the ^FF4800Homunculus^000000 is not suitable.";
+		mes "That was close.";
+		next;
+		mes "[Jeyna]";
+		mes "To use the Homunculus Mutation System";
+		mes "to change to the new";
+		mes "^FF4800Homunculus^000000,";
+		mes "the ^006400Homunculus must be above level 99 and evolved^000000.";
+		next;
+		mes "[Jeyna]";
+		mes "Come back to ^005DFFViorel^000000 when you're ready.";
+		mes "I'll see you later then~!";
+		close2;
+		erasequest 4154;
+		erasequest 4158;
+		warp "job3_gen01",12,47;
+		end;
+	}
+	return;
+}
+
+// Magic Board
+//============================================================
+que_house_s,83,47,3	script	Magic Board#homun_s	4_BOARD3,{
+	playbgm "26.mp3"; // Everlasting Wanderers
+	callfunc "F_HomMutateInfo","[Magic Board Posts]";
+	mes "[Magic Board Posts]";
+	mes ":: ^0000FFHomunculus^000000 research is";
+ 	mes ":: so much fun.";
+	mes ":: Be an Alchemist";
+	mes ":: who always enjoys";
+	mes ":: one's research.";
+	next;
+	mes "[Magic Board Posts]";
+	mes ":: Oh, and Viorel...";
+	mes ":: About what you said";
+	mes "::  yesterday...";
+	mes "::";
+	mes "::";
+	next;
+	mes "--------------------------";
+	mes "The rest is sealed because it seems to be a private message.";
+	close2;
+	if (checkquest(4157) > -1) {
+		setquest 4158;
+		erasequest 4157;
+	}
+	end;
+}
+
+function	script	F_HomMutateInfo	{
+	mes getarg(0);
+	mes ":: The ability of the mutated";
+	mes ":: ^0000FFHomunculus^000000 clearly goes";
+	mes ":: beyond the previous state.";
+	mes ":: In addition, its appearance";
+	mes ":: will evolve as well.";
+	next;
+	mes getarg(0);
+	mes ":: ^0000FFHomunculus^000000 appearances of the";
+	mes ":: new types can be classified";
+	mes ":: based on different species.";
+	mes ":: Creatures of the same species";
+	mes ":: generally have a similar";
+	mes ":: appearance.";
+	next;
+	mes getarg(0);
+	mes ":: The category, appearance and";
+	mes ":: ability of the ^0000FFHomunculus^000000";
+	mes ":: via the Homunculus Mutation";
+	mes ":: System are as follows:";
+	next;
+	cutin "Mer_Eira_Card",3;
+	mes getarg(0);
+	mes ":: The first of the five";
+	mes ":: is called ^FF4800Eira^000000.";
+	mes ":: Beautiful and graceful.";
+	next;
+	mes getarg(0);
+	mes ":: ^FF4800Eira^000000 uses";
+	mes ":: ^006400Wind Element^000000 Magic Attacks and";
+	mes ":: Support Skills.";
+	mes ":: It even has the ability";
+	mes ":: to revive its";
+	mes ":: fallen master.";
+	next;
+	mes getarg(0);
+	mes ":: ^FF4800Eira^000000 eats";
+	mes ":: ^0000FFSmall Snow Flower^000000.";
+	mes ":: Surprising how it survives on";
+	mes ":: such a small amount.";
+	mes ":: ^0000FFSmall Snow Flower^000000 can be bought";
+	mes ":: from ^005DFFTaming Merchants^000000.";
+	next;
+	cutin "",255;
+	cutin "Mer_Sera_Card",3;
+	mes getarg(0);
+	mes ":: The second of the five";
+	mes ":: is known as ^FF4800Sera^000000.";
+	mes ":: It looks just like ^FF0000Mistress^000000 but";
+	mes ":: it doesn't run away.";
+	next;
+	mes getarg(0);
+	mes ":: ^FF4800Sera^000000";
+	mes ":: specializes in ^006400Poison Attacks^000000.";
+	mes ":: Also, it uses distinct";
+	mes ":: Support Skills using poisons.";
+	next;
+	mes getarg(0);
+	mes ":: ^FF4800Sera^000000 eats";
+	mes ":: ^0000FFApple Pudding^000000.";
+	mes ":: It prefers sweet food.";
+	mes ":: ^0000FFApple Pudding^000000 can be bought";
+	mes ":: from ^005DFFTaming Merchants^000000.";
+	next;
+	cutin "",255;
+	cutin "Mer_Dieter_Card",3;
+	mes getarg(0);
+	mes ":: The third of the five";
+	mes ":: is ^FF4800Dieter^000000.";
+	mes ":: It looks unusual but it";
+	mes ":: has a good demeanor.";
+	next;
+	mes getarg(0);
+	mes ":: ^FF4800Dieter^000000 uses";
+	mes ":: ^FF0000Fire^000000 based Attacks and";
+	mes ":: Support Skills.";
+	mes ":: It is just as fragile...";
+	mes ":: ah, reliable, as it looks.";
+	next;
+	mes getarg(0);
+	mes ":: ^FF4800Dieter^000000 eats";
+	mes ":: ^0000FFBig Cell^000000.";
+	mes ":: ^0000FFBig Cell^000000 can be bought";
+	mes ":: from ^005DFFTaming Merchants^000000.";
+	next;
+	cutin "",255;
+	cutin "Mer_Bayeri_Card",3;
+	mes getarg(0);
+	mes ":: The fourth of the five";
+	mes ":: is ^FF4800Bayeri^000000.";
+	mes ":: Bayeri has the form of a";
+	mes ":: unicorn.";
+	next;
+	mes getarg(0);
+	mes ":: It has a powerful dash skill";
+	mes ":: and uses ^006400Holy Element^000000 magic.";
+	mes ":: Unfortunately,";
+	mes ":: they won't let you ride them.";
+	mes ":: Not all four-legged creatures";
+	mes ":: can be ridden.";
+	next;
+	mes getarg(0);
+	mes ":: ^FF4800Bayeri^000000 eats";
+	mes ":: ^0000FFFresh Plant^000000.";
+	mes ":: No matter how hungry it";
+	mes ":: never feeds on rotten greens.";
+	mes ":: ^0000FFFresh Plant^000000 can be bought";
+	mes ":: from ^005DFFTaming Merchants^000000.";
+	next;
+	cutin "",255;
+	cutin "Mer_Eleanor_Card",3;
+	mes getarg(0);
+	mes ":: The last of the five";
+	mes ":: is ^FF4800Eleanor^000000.";
+	mes ":: It has a feminine appearance";
+	mes ":: and outstanding physical skill.";
+	next;
+	mes getarg(0);
+	mes ":: ^FF4800Eleanor^000000";
+	mes ":: uses ^006400Strike or Grapple Attacks^000000";
+	mes ":: sequentially in battle.";
+	mes ":: Absolutely stunning.";
+	next;
+	mes getarg(0);
+	mes ":: ^FF4800Eleanor^000000 eats";
+	mes ":: ^0000FFKid's Dumpling^000000.";
+	mes ":: Don't confuse it with a normal";
+	mes ":: dumpling.";
+	mes ":: ^0000FFKid's Dumpling^000000 can be bought";
+	mes ":: from ^005DFFTaming Merchants^000000.";
+	next;
+	cutin "",255;
+	return;
+}
+
+// Books
+//============================================================
+que_house_s,13,52,3	script	Open Book#01homun_s	HIDDEN_NPC,{
+	switch(rand(1,7)) {
+	case 1:
+		mes "[Bookcase Notes]";
+		mes "Insanity and Genius are the same in concept in that they are both abnormal phenomenon.";
+		mes "Observing the chemist ^005DFFMorgenstein^000000 of ^8B4513Geffen^000000, I consider them equal.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "Once I had to visit...";
+		mes "the strange ^005DFFMorgenstein^000000 for research purposes.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "I had a meat stew before I met ^005DFFMorgenstein^000000,";
+		mes "surprisingly enough, he muttered that he smelled meat even before I was close.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "I never thought that chemists had a great sense of smell.";
+		mes "The next time I give";
+		mes "^005DFFMorgenstein^000000 a visit,";
+		mes "I'll eat some other meal.";
+		close;
+	case 2:
+		mes "[Bookcase Notes]";
+		mes "^005DFFDe Bris^000000 thinks the enthusiasm of Alchemists has lately dropped <Dramatically>...";
+		next;
+		mes "[Bookcase Notes]";
+		mes "He especially didn't like the fact that I was bound tightly to ^FF4800Homunculus^000000 research.";
+		mes "He didn't say such a thing when we studied together in ^8B4513Rune Midgarts^000000.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "One day, I'll show ^005DFFDe Bris^000000 my ^FF4800Homunculus^000000 research data.";
+		mes "I love watching him jump out of his skin.... I look forward to the day.";
+		close;
+	case 3:
+		mes "[Bookcase Notes]";
+		mes "^005DFFDe Bris^000000' passion for the ^57007FGenetic^000000 arts is amazing.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "Recently, the Alchemist Union offered me the chance to join the ^57007FGenetic^000000 through a letter.";
+		mes "I wonder what ^005DFFDe Bris^000000 said to the union...";
+		next;
+		mes "[Bookcase Notes]";
+		mes "Well, I appreciate it...";
+		mes "However, for me right now";
+		mes "my research is of utmost priority.";
+		close;
+	case 4:
+		mes "[Bookcase Notes]";
+		mes "There's something funny ^005DFFDarcia^000000 said to me.";
+		mes "It was about when ^005DFFJeyna^000000 first came to learn about potion combination......";
+		next;
+		mes "[Bookcase Notes]";
+		mes "She did good up to the stage of pouring water into the mixture.";
+		mes "She just had to put it into an empty bottle...";
+		next;
+		mes "[Bookcase Notes]";
+		mes "^005DFFDarcia^000000 watched what she would do with the last stage,";
+		mes "and the confused ^005DFFJeyna^000000 drank the mixture out of the bowl and told her that it healed well.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "To think that even ^005DFFJeyna^000000,";
+		mes "now a master of potion combination,";
+		mes "had her rookie mistakes";
+		mes "shows how hard it is to imagine";
+		mes "and forecast one's past and future.";
+		close;
+	case 5:
+		mes "[Bookcase Notes]";
+		mes "^005DFFVincent^000000, I think I did it.";
+		mes "I will never forget your words of courage ";
+		mes "and I am grateful that I now get to pay you back.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "It was indeed a long process.";
+		mes "When many of the union";
+		mes "considered my research insignificant";
+		mes "... Though I did not lose my belief";
+		mes "it did heart deep inside.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "The few friends who believed me";
+		mes "especially ^005DFFJeyna^000000";
+		mes "and you ^005DFFVincent^000000 ...";
+		mes "I am sincerely thankful with all my soul.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "They say that,";
+		mes "the end justifies the means.";
+		mes "At first,";
+		mes "I did not know what it meant...";
+		next;
+		mes "[Bookcase Notes]";
+		mes "Now I know.";
+		mes "I know how important it is";
+		mes "to follow one's heart.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "I'll drop by very soon.";
+		mes "Be well until then.";
+		close;
+	case 6:
+		mes "[Bookcase Notes]";
+		mes "A game called ^0000FFThe Epic Battle 2^000000, similar to chess, was intriguing.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "Some time ago, I met a ^0000FFFruit Seller^000000 who excelled in The Epic Battle 2.";
+		mes "He even overcame the infamous ^006400Grizzly Shockwave Strategy^000000 and ^006400God of Death Terror^000000 with ease.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "To overcome those in the early stages of the battle of the ^0000FFPriest Faction^000000...";
+		mes "It is difficult for me, since I need to combine the pieces and use some luring skills.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "I wonder when I'll become a 3 Carat Diamond level player.";
+		close;
+	case 7:
+		mes "[Bookcase Notes]";
+		mes "There are many Alchemists who like the ^FF4800Vanilmirth^000000.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "But I prefer the ^FF4800Amistr^000000.";
+		mes "It's cute when it wags its tale with those shiny eyes.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "My Amistr Jonathan is clever and mellow, making it ever so lovable.";
+		mes "We're good friends, aren't we Jonathan?";
+		close;
+	}
+}
+
+que_house_s,16,52,3	script	Open Book#02homun_s	HIDDEN_NPC,{
+	switch(rand(1,8)) {
+	case 1:
+		mes "[Bookcase Notes]";
+		mes "What should I write to ^005DFFDe Bris^000000.";
+		mes ":: To my noted ";
+		mes ":: Genetic friend De Bris.";
+		mes ":: How's Lighthalzen?";
+		mes ":: Do they have enough of those";
+		mes ":: cookies you oh so love?";
+		next;
+		mes "[Bookcase Notes]";
+		mes ":: I'll drop by soon";
+		mes ":: with some cookies.";
+		mes ":: When we meet,";
+		mes ":: I'll introduce you to my";
+		mes ":: ^006400New Homunculus^000000.";
+		next;
+		mes "[Bookcase Notes]";
+		mes ":: No need to be alert.";
+		mes ":: Unlike you,";
+		mes ":: they aren't interested in ";
+		mes ":: what others have to eat.";
+		mes ":: I'll see you soon~!";
+		mes ":: Dare close the door on me.";
+		close;
+	case 2:
+		mes "[Bookcase Notes]";
+		mes "The last time I visited the Alchemist Union, there was an interesting debate on the table.";
+		mes "I think it was something to do with ^006400Negligence of Homunculus in public places^000000.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "While the master dozed off,";
+		mes "one of the ^FF4800Homunculus^000000 off its leash";
+		mes "caused some sort of problem.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "I will make sure that my Homunculus Jonathan...";
+		mes "is trained well not to cause trouble around other people.";
+		close;
+	case 3:
+		mes "[Bookcase Notes]";
+		mes "There's a new toy me and ^005DFFJeyna^000000 have grown fond of.";
+		mes "It's relatively new,";
+		mes "called... ^0000FF'Helo'^000000, I think?";
+		next;
+		mes "[Bookcase Notes]";
+		mes "There was a related song to it, sung by some ^57007FMinstrel^000000.";
+		mes "The lyrics were something like ^006400'Ahhh~Ahh~Ahhhhhhhh'^000000.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "The entertainment itself is fun,";
+		mes "but the music is also excellent,";
+		mes "and when I listen to it";
+		mes "it feels like my SP is restored significantly.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "I must say,";
+		mes "entertainment is crucial when resting";
+		mes "to boost morale for research.";
+		mes "^006400For Homunculus~!^000000";
+		close;
+	case 4:
+		mes "[Bookcase Notes]";
+		mes "From what I heard from the union member";
+		mes "^005DFFParmy^000000,";
+		mes "^005DFFRaspuchin^000000 is still his own weird self.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "It may not be such a good idea";
+		mes "to drive those energetic souls";
+		mes "coming to change jobs";
+		mes "with such enthusiasm.";
+		close;
+	case 5:
+		mes "[Bookcase Notes]";
+		mes "A friend of mine who was into painting,";
+		mes "suggested making a <Graphic Novel> called";
+		mes "^0000FFMUTATIONER^000000";
+		mes "after he heard about my research";
+		mes "and my works.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "The story begins...";
+		mes "With an alien";
+		mes "^FF4800Homunculus^000000";
+		mes "visiting our world.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "The visiting alien";
+		mes "^FF4800Homunculus^000000 can survive";
+		mes "without a master";
+		mes "and it could change into";
+		mes "various creatures that";
+		mes "roam our world.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "These alien^FF4800Homunculus^000000";
+		mes "have two opposing factions";
+		mes "divided by political differences.";
+		mes "In our world, we call them";
+		mes "^006400Aut-homun^000000 and ";
+		mes "^006400Decept-homun^000000";
+		next;
+		mes "[Bookcase Notes]";
+		mes "The ^006400Aut-homun^000000 are our friends.";
+		mes "Their leader,";
+		mes "called ^005DFFOptimus Poring^000000,";
+		mes "is built and so cool";
+		mes "for a poring,";
+		mes "and it summons a cart at will!";
+		next;
+		mes "[Bookcase Notes]";
+		mes "The opposing side, the ^006400Decept-homun^000000,";
+		mes "is led by ^005DFFMegatroll^000000";
+		mes "and they use all means ";
+		mes "to destroy our world.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "The hero of this story";
+		mes "is one from ^8B4513Alberta^000000 called ^005DFFJam Wicky^000000,";
+		mes "who meets ^005DFFOptimus Poring^000000";
+		mes "while shopping for a cart,";
+		mes "as if it was his destiny.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "And so thus";
+		mes "unfolds an epic battle";
+		mes "in the ^8B4513Moroc Desert^000000";
+		mes "where the fate of our world";
+		mes "lies in his hands...";
+		next;
+		mes "[Bookcase Notes]";
+		mes "Enough of that~!";
+		mes "The rest of the story can be";
+		mes "checked in the published copy.";
+		mes "^0000FFMUTATIONER^000000";
+		mes "It's going to be awesome~!";
+		close;
+	case 6:
+		mes "[Bookcase Notes]";
+		mes "The Union sent a special gift to its members.";
+		mes "It's called a ^0000FFHigh Clip 4^000000.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "It is originally used as a tool to allow easy whispering between members, but it also has other useful functions.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "A guild invented this. I recall that their emblem had an image of an apple.";
+		close;
+	case 7:
+		mes "[Bookcase Notes]";
+		mes "Homunculus is indeed worthy.";
+		mes "However, like everyone else, I sometimes question its meaning and future.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "I believe that life given by nature was supposed to be used for oneself.";
+		mes "However...";
+		next;
+		mes "[Bookcase Notes]";
+		mes "The research to give the Homunculus life is, in reality, for the benefit of man.";
+		mes "Perhaps mankind is not ready ethically to create life.";
+		close;
+	case 8:
+		mes "[Bookcase Notes]";
+		mes "Some time ago, ^005DFFJeyna^000000 introduced me to someone.";
+		mes "She is from ^8B4513Geffen^000000,";
+		mes "and she introduced herself as a ^005DFFChicken Researcher^000000.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "She is an expert on something called the ^006400Legendary Bijofnil^000000.";
+		mes "She finds it offensive that people think that the Bijofnil is a hawk.";
+		next;
+		mes "[Bookcase Notes]";
+		mes "She said something about somewhere in ^8B4513Hvergilmir's Fountain^000000";
+		mes "there exists a ^005DFFtalking chicken^000000 and other stories...";
+		mes "Well, it went on like that";
+		mes "and it was interesting.";
+		close;
+	}
+}
+
+// Notifiers
+//============================================================
+que_house_s,11,52,3	script	#03homun_s	HIDDEN_NPC,{
+	end;
+OnInit:
+	initnpctimer;
+	end;
+OnTimer6000:
+	emotion e_gasp;
+	end;
+OnTimer7000:
+	emotion e_gasp,0,"#04homun_s";
+	stopnpctimer;
+	initnpctimer;
+	end;
+}
+
+que_house_s,14,52,3	script	#04homun_s	HIDDEN_NPC,{
+	end;
+}
+
+// Researcher's Pet
+//============================================================
+que_house_s,24,46,3	script	Jonathan#homun_s	MER_AMISTR,{
+	end;
+}
+
+que_house_s,23,46,3	script	#05homun_s	HIDDEN_NPC,{
+	emotion e_no,0,"Jonathan#homun_s";
+	if (gethominfo(1) < 6048 || gethominfo(1) > 6052) { // Not mutated Homunculus-S
+		mes "[Jonathan]";
+		mes "Hwang~ Hwang!";
+		next;
+		mes ":: It seems to be Viorel's";
+		mes ":: Homunculus.";
+		mes ":: It is wearing a small necklace";
+		mes ":: with the name Jonathan engraved";
+		mes ":: on it.";
+		close;
+	} else {
+		mes "[Jonathan]";
+		mes "Hwang~?!";
+		next;
+		emotion e_swt2,0,"Jonathan#homun_s";
+		mes "[Jonathan]";
+		mes "*Sniff* ...";
+		next;
+		mes ":: This Amistr";
+		mes ":: called Jonathan";
+		mes ":: seems to be surprised by my";
+		mes ":: new Homunculus.";
+		close;
+	}
+}
diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt
index 9f9ccec1f..0fd885d8f 100644
--- a/npc/re/quests/magic_books.txt
+++ b/npc/re/quests/magic_books.txt
@@ -1,21 +1,20 @@
 //===== Hercules Script ======================================
 //= Magic Book Seller
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Masao
 //= Credits to Muad_Dib for the translation.
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1a
+//===== Description: =========================================
+//= [Official Conversion]
 //= An NPC which sells you different kinds of Magic Books.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
-//= 1.1 Optimized, 60% size reduction. [Euphy]
-//============================================================ 
-
-geffen_in,176,105,4	script	Magic Book Master Velof	64,{
+//= 1.1 Optimized. [Euphy]
+//= 1.1a Updated NPC name to "Master Velofos". [Euphy]
+//============================================================
 
+geffen_in,176,105,4	script	Master Velofos	1_M_WIZARD,{
 	if (checkweight(1201,1) == 0) {
 		mes "You're carrying too many items. Please make some room in your bag first.";
 		close;
@@ -25,255 +24,251 @@ geffen_in,176,105,4	script	Magic Book Master Velof	64,{
 		close;
 	}
 	if ((Upper == 2) && (Class != Job_Baby_Warlock)) {
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "What are you, a baby?";
 		mes "I'm not here to babysit. Get lost!";
 		close;
 	}
 	if ((Class != Job_Warlock) && (Class != Job_Warlock_T) && (Class != Job_Baby_Warlock)) {
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "Ha ha, are you also seeking new knowledge?";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "I'm sorry, but my knowledge doesn't concern you.";
 		close;
 	}
 	if (getskilllv(2230) < 1) {
-		mes "[Magic Book Master Velof]";
-		mes "Well you've met all the qualifications except one: you need the Release spell.";
+		mes "[Master Velofos]";
+		mes "Well, you've met all the qualifications except one: you need the Release spell.";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "Learn the spell first. I've got so many things to tell you.";
 		close;
 	}
 	if ((getskilllv(2230) > 0) && (Class == Job_Warlock) || (Class == Job_Warlock_T) || (Class == Job_Baby_Warlock)) {
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "Welcome, my friend.";
 		mes "Congratulations on entering a brand new world of magic.";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "We magic practitioners are always thirsty for new knowledge and power.";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "We endure great hardship and pain to achieve what we want. When we finally do, the sense of accomplishment defies description. That's why both you and I have chosen the way of magic.";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "By the way, what brings you to me today?";
 		next;
 		switch (select("Nothing.:Do you know the Reading Spell Book?:What's the Freezing Spell?:Can I have a Magic Book?:Can I use the Reading Spell Book without the Freezing Spell?:About the Ultimate Magic Book")) {
 		case 1:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Hah! You're silly.";
 			close;
 		case 2:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Reading Spell Book literally means 'read a spell book.' Do you know how to use Magic Books?";
 			next;
 			switch (select("Yes, I do.:No, I don't.")) {
 			case 1:
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Well then, you don't need an additional lecture.";
 				close;
 			case 2:
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Magic Books are an advanced type of magic scroll. While spells on scrolls disappear after one use, the ones in Magic Books can be cast multiple times.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Let's compare a spell on a scroll to a wire. When the wire is used to open a door or do something else, it's bent and crushed, losing its original shape. A spell from a Magic Book is more like a shape memory alloy.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Huh, don't you now what shape memory alloy is? Eh, just remember this: a wire made from shape memory alloy restores its shape over time.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Like the alloy, a spell on a Magic Book remains after a use, although reusing the spell has a downtime for its restoration.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "...Oh, I didn't mean to talk for too long. Anyways, you can use Magic Books to cast spells that you've learned. Its concept is different from normal spells.";
 				next;
 				select("What's the difference?");
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Why do you have to write your existing spells in Magic Books, you asked?";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "That's a good question. It's related to Magic Binding.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "You already learned Release, which allows you to hold the energy of the four different elements before the actual casting. Magic Binding is similar to Release.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Since you've learned Release, you're capable of using Magic Binding as well. Well, let's talk about that later.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "You know how to hold an existing spell, and then cast it at a desired timing via Release.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Carrying the globes of the four elements is also related to Magic Binding.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "As you know, the four elements are Fire, Water, Wind, and Earth. Being able to employ them freely is the essential principle of magic.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "We Humans use torches to keep fire, fans to blow wind, and bowls to hold water. We also use clay to make earthenware.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Those activities may differ from magic, but both are the same in the sense of employing the four elements.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "When you use complex magic spells to summon a storm, drop lightning, or burn an area, that consumes a lot of your energy, both physically and mentally.";
 				next;
-				mes "[Magic Book Master Velof]";
-				mes "When you fail to bind such powerful magic spells or fail to control them,";
-				next;
-				mes "[Magic Book Master Velof]";
-				mes "you can receive irreparable damage to your mind and body.";
+				mes "[Master Velofos]";
+				mes "When you fail to bind such powerful magic spells or fail to control them, you can receive irreparable damage to your mind and body.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "That's why we use Magic Books to reduce that burden. It helps summon pre-cast spells while you're focusing on binding their magic power.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "There's one downside though: Magic Books cannot be used for spells that you haven't learned.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "As I said earlier, spells in Magic Books tend to go back to what they are.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "That said, as a Circler, you cannot change or create spells in Magic Books.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Even if you create one, its power will be beyond your capacity.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "In order to use the Reading Spell Book, you must learn the Freezing Spell to bind magic.";
 				close;
 			}
 		case 3:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "The Freezing Spell is used for Magic Binding. It helps you to insert a magic spell to a circle.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Circles of magic work organically with each other. When you use the Freezing Spell to bind a spell, the spell won't activate until you cast the release spell.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Of course, binding a spell continuously consumes your mana, but it consumes less mana than conventional magic spells.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Magic Binding becomes more difficult when you use more powerful magic spells.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "For weak spells, you can bind two to three of them with your circle. For more powerful spells, maybe one or two is possible.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "That all depends on your ability to control your spells. You'll have to try and experience Magic Binding after you first learn it to really understand.";
 			close;
 		case 4:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "I'm sorry, but I only have Magic Books for beginners, but they're obviously not suitable for you. Do you still want one?";
 			next;
 			switch (select("Sure thing.:Where can I find advanced books?")) {
 			case 1:
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Please go talk to [Lea] in the Archive. Tell her that you need one of the Magic Books that I've stored in there.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "For your information, she won't give it to you without anything in return. Expect her to ask you for something!";
 				if (wm_book < 1) set wm_book, 1;
 				close;
 			case 2:
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "I'm sorry, but our management has recently decided to limit the availability of Magic Books for Multi Circlers. It's because their numbers are increasing more quickly than we expected.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "You could find one if you try hard, but I don't have any with me.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "If our management releases the restriction, you'll be the first one to know. Don't worry.";
 				close;
 			}
 		case 5:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Nothing will happen when you try to bind magic without using Magic Binding because you have nothing to hold magic.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "It's like water that needs a bowl to stay in place.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "The problem is when you try to forcefully cast a spell that you haven't learned. It'll definately backfire on you.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Of course, the damage won't be severe: you'll fall asleep or be thrown into confusion. This is all because there's a conflict between your Magic Book and the force of Magic Binding when you're trying to summon and hold a unlearned spell.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Don't try it out just to see what happens for yourself! Falling asleep while casting a spell? There's nothing more humiliating than that to magic practitioners like us.";
 			close;
 		case 6:
 			if ((BaseLevel > 139) && (getskilllv(2217) > 0) || (getskilllv(2213) > 0)) {
-				if(mac_book < 1){
-					mes "[Magic Book Master Velof]";
+				if (mac_book < 1) {
+					mes "[Master Velofos]";
 					mes "I'm sorry, but could you ask someone else? I'm kind of busy right now.";
 					close;
 				}
 				if (mac_book == 1) {
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "Huh, are you looking for the Ultimate Magic Book? Who sent you?";
 					next;
 					select("Ms. Lea.");
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "I'm sorry, but there's not much information left about the Ultimate Magic Book.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "A few scholars in the Midgard Continent once tried to collect ancient Magic Books and reproduce that book, but...";
 					next;
 					select("But what?");
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "Oh yes, perhaps he might know something.";
 					next;
 					select("Yes, I knew this was coming!");
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "My brother is just like you. He's very interested in recreating the Ultimate Magic Book.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "His name is Galfos.";
 					mes "He's been taking a great interest in the ancient Magic Books.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "I didn't support him or give him any advice for his research since I thought he'd give on it pretty quickly, but...";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "If he's discovered anything useful, maybe it can helpful to you.";
 					next;
 					select("Where's Galfos now?");
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "I've heard that he's near the Expedition Camp beyond the Dimensional Rift to seek information about the ancient Magic Books.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "If you want to see him, you should prepare for a long journey.";
 					set mac_book,2;
 					close;
 				}
 				if (mac_book > 1) {
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "Galfos is near the Expedition Camp beyond the Dimensional Rift.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "If you want to see him, you should prepare for a long journey.";
 					close;
 				}
 			}
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Ha ha, I'm sorry, but you should focus on strengthening your body rather than creating Magic Books.";
 			close;
 		}
 	}
-	mes "[Magic Book Master Velof]";
+	mes "[Master Velofos]";
 	mes "Ha ha, are you also seeking new knowledge?";
 	next;
-	mes "[Magic Book Master Velof]";
+	mes "[Master Velofos]";
 	mes "I'm sorry, but my knowledge doesn't concern you.";
 	close;
 }
 
-geffen_in,175,112,4	script	Lea	123,{
-
+geffen_in,175,112,4	script	Lea	2_F_MAGICMASTER,{
 	if (checkweight(1201,1) == 0) {
 		mes "You're carrying too many items. Please make some room in your bag first.";
 		close;
@@ -282,14 +277,14 @@ geffen_in,175,112,4	script	Lea	123,{
 		mes "You're overweight with items. Please lose some item weight first.";
 		close;
 	}
-	if ((wm_book > 0) && (Class == Job_Warlock) || (Class == Job_Warlock_T) || (Class == Job_Baby_Warlock)) {
+	if (wm_book > 0 && (Class == Job_Warlock || Class == Job_Warlock_T || Class == Job_Baby_Warlock)) {
 		mes "[Lea]";
 		mes "You can only read books here. If you'd like to borrow any books, please receive an approval from 1 manager and 1 High Mage.";
 		next;
 		mes "[Lea]";
 		mes "How may I help you?";
 		next;
-		select("Master Velof asked me to bring his Magic Book.");
+		select("Master Velofos asked me to bring his Magic Book.");
 		mes "[Lea]";
 		mes "Are you borrowing a book?";
 		next;
@@ -339,7 +334,7 @@ geffen_in,175,112,4	script	Lea	123,{
 					next;
 					mes "[Lea]";
 					mes "Please try not to lose or damage the book to avoid paying any extra charges.";
-					if (.@Payment == 1) set Zeny, Zeny - 10000;
+					if (.@Payment == 1) Zeny -= 10000;
 					else if (.@Payment == 2) delitem 1006,2; //Old_Magic_Book
 					else delitem 1097,50; //Worn_Out_Page
 					getitem 6188+.@i,1; //Magic_Book_FB, Magic_Book_CB, Magic_Book_LB
@@ -384,7 +379,7 @@ geffen_in,175,112,4	script	Lea	123,{
 					next;
 					mes "[Lea]";
 					mes "The Intermediate and Superior Magic Books must be returned upon borrowing the Ultimate Magic Book. Remember that you're just borrowing them, so make sure you take good care of those books.";
-					if (.@Payment == 1) set Zeny, Zeny - 50000;
+					if (.@Payment == 1) Zeny -= 50000;
 					else if (.@Payment == 2) delitem 603,2; //Old_Blue_Box
 					else delitem 985,9; //Elunium
 					getitem .@Books[.@i-1],1; //Magic_Book_SG, Magic_Book_LOV, Magic_Book_MS, Magic_Book_TS, Magic_Book_JT, Magic_Book_WB, Magic_Book_HD, Magic_Book_ES
@@ -456,11 +451,11 @@ geffen_in,175,112,4	script	Lea	123,{
 					next;
 					mes "[Lea]";
 					mes "The Intermediate and Superior Magic Books must be returned upon borrowing the Ultimate Magic Book. Remember that you're just borrowing them, so make sure you take good care of those books.";
-					if (.@Payment == 1) set Zeny, Zeny - 200000;
+					if (.@Payment == 1) Zeny -= 200000;
 					else if (.@Payment == 2) delitem 7094,12; //Mystery_Piece
 					else if (.@Payment == 3) delitem 984,7; //Oridecon
 					else delitem 617,1; //Old_Violet_Box
-					if (.@Payment > 1) set Zeny, Zeny - 100000;
+					if (.@Payment > 1) Zeny -= 100000;
 					getitem 6201+.@i,1; //Magic_Book_ES_, Magic_Book_CL, Magic_Book_CR, Magic_Book_DL
 					close;
 				}
@@ -481,7 +476,7 @@ geffen_in,175,112,4	script	Lea	123,{
 				mes "Frankly, I've never even seen the Ultimate Magic Book.";
 				next;
 				mes "[Lea]";
-				mes "You should ask Master Velof if you want to know more about that book.";
+				mes "You should ask Master Velofos if you want to know more about that book.";
 				next;
 				mes "[Lea]";
 				mes "I'm sorry that I can't help you more than that.";
@@ -490,7 +485,7 @@ geffen_in,175,112,4	script	Lea	123,{
 			}
 			if ((BaseLevel > 139) && (mac_book > 0) && ((getskilllv(2217) > 0) || (getskilllv(2213) > 0))) {
 				mes "[Lea]";
-				mes "You should ask Master Velof for some information about that book.";
+				mes "You should ask Master Velofos for some information about that book.";
 				close;
 			}
 			mes "[Lea]";
@@ -509,8 +504,7 @@ geffen_in,175,112,4	script	Lea	123,{
 	close;
 }
 
-mid_camp,255,244,4	script	Galfos	735,{
-
+mid_camp,255,244,4	script	Galfos	4_M_JOB_WIZARD,{
 	if (checkweight(1201,1) == 0) {
 		mes "You're carrying too many items. Please make some room in your bag first.";
 		close;
@@ -519,7 +513,7 @@ mid_camp,255,244,4	script	Galfos	735,{
 		mes "You're overweight with items. Please lose some item weight first.";
 		close;
 	}
-	if (Upper == 2) {
+	if ((Upper == 2) && (Class != Job_Baby_Warlock)) {
 		mes "[Galfos]";
 		mes "What are you, a baby?";
 		mes "I'm not here to babysit. Get lost!";
@@ -535,7 +529,7 @@ mid_camp,255,244,4	script	Galfos	735,{
 		mes "Ah, I'll get myself in trouble if I stay here any longer. Maybe I'm already in...";
 		close;
 	}
-	if ((BaseLevel < 140) || (getskilllv(2217) < 1) && (getskilllv(2213) < 1)) {
+	if (BaseLevel < 140 || (getskilllv(2217) < 1 && getskilllv(2213) < 1)) {
 		mes "[Galfos]";
 		mes "I'm sorry, but I don't talk to people that aren't even ready for this.";
 		close;
@@ -556,7 +550,7 @@ mid_camp,255,244,4	script	Galfos	735,{
 		next;
 		select("You're Velof's brother, right?");
 		mes "[Galfos]";
-		mes "Yes, I'm Galfos, and Velof is my brother.";
+		mes "Yes, I'm Galfos, and Velofos is my brother.";
 		next;
 		mes "[Galfos]";
 		mes "Wait a minute,";
@@ -653,7 +647,7 @@ mid_camp,255,244,4	script	Galfos	735,{
 				specialeffect2 EF_DISPELL;
 				progressbar "ffff00",4;
 				specialeffect2 EF_LORD;
-				set Zeny, Zeny - 1000000;
+				Zeny -= 1000000;
 				getitem 6194+.@i,1; //Magic_Book_CM, Magic_Book_TV
 				mes "[Galfos]";
 				mes "Man, I almost lost my control to the incredible magic energy! Here's your Magic Book.";
@@ -673,8 +667,7 @@ mid_camp,255,244,4	script	Galfos	735,{
 	close;
 }
 
-dic_in01,25,190,0	script	Mysterious Documents	844,{
-
+dic_in01,25,190,0	script	Mysterious Documents	CLEAR_NPC,{
 	if (isequipped(2782) < 1) {
 		mes "I better not forget to equip my ring.";
 		close;
@@ -837,9 +830,8 @@ function	script	Magic_Book_Essence	{
 	mes "Someone already used this area.";
 	close;
 }
-
-thor_v02,163,104,0	script	Powerful Lava Energy#33	844,{ callfunc "Magic_Book_Essence",12218,7097,40,"Lava"; end; }
-thor_v01,185,91,0	script	Powerful Flame Energy#33	844,{ callfunc "Magic_Book_Essence",12219,7098,10,"Flame"; end; }
-ice_dun03,137,148,0	script	Powerful Glacier Energy	844,{ callfunc "Magic_Book_Essence",12220,7561,10,"Glacier"; end; }
-ein_dun02,181,124,0	script	Powerful Fossil Energy	844,{ callfunc "Magic_Book_Essence",12221,7312,10,"Fossil"; end; }
-gon_dun02,252,198,0	script	Powerful Storm Energy#33	844,{ callfunc "Magic_Book_Essence",12222,7266,10,"Storm"; end; }
+thor_v02,163,104,0	script	Powerful Lava Energy#33	CLEAR_NPC,{ callfunc "Magic_Book_Essence",12218,7097,40,"Lava"; end; }
+thor_v01,185,91,0	script	Powerful Flame Energy#33	CLEAR_NPC,{ callfunc "Magic_Book_Essence",12219,7098,10,"Flame"; end; }
+ice_dun03,137,148,0	script	Powerful Glacier Energy	CLEAR_NPC,{ callfunc "Magic_Book_Essence",12220,7561,10,"Glacier"; end; }
+ein_dun02,181,124,0	script	Powerful Fossil Energy	CLEAR_NPC,{ callfunc "Magic_Book_Essence",12221,7312,10,"Fossil"; end; }
+gon_dun02,252,198,0	script	Powerful Storm Energy#33	CLEAR_NPC,{ callfunc "Magic_Book_Essence",12222,7266,10,"Storm"; end; }
diff --git a/npc/re/quests/monstertamers.txt b/npc/re/quests/monstertamers.txt
index cc95d3749..4eef32878 100644
--- a/npc/re/quests/monstertamers.txt
+++ b/npc/re/quests/monstertamers.txt
@@ -1,15 +1,13 @@
 //===== Hercules Script =======================================
 //= Monster Tamers
 //===== By: ==================================================
-//= Streusel
+//= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Cute pet quest items
 //===== Additional Comments: =================================
-//= 1.0 Duplicates for Monster Tamer
+//= 1.0 Moved Izlude NPC to pre-re/re paths.
 //============================================================
 
-izlude_in,55,105,4	duplicate(Monster_Tamer#izu)	Monster Tamer#izlude	125
\ No newline at end of file
+izlude_in,55,105,4	duplicate(MonsterTamer_izlude)	Monster Tamer#izu	4_M_TELEPORTER
diff --git a/npc/re/quests/mrsmile.txt b/npc/re/quests/mrsmile.txt
index 029633437..4e728bffa 100644
--- a/npc/re/quests/mrsmile.txt
+++ b/npc/re/quests/mrsmile.txt
@@ -1,16 +1,19 @@
 //===== Hercules Script ======================================
 //= Mr. Smile Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Daegaladh, Masao
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
 //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Updated to match the new Izlude Map. [Masao]
-//============================================================ 
+//= 1.1 Added Izlude duplicates. [Euphy]
+//============================================================
 
-izlude,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz	92
+izlude,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz	4_F_03
+izlude_a,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz_a	4_F_03
+izlude_b,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz_b	4_F_03
+izlude_c,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz_c	4_F_03
+izlude_d,125,175,4	duplicate(SmileHelper)	Smile Assistance#iz_d	4_F_03
diff --git a/npc/re/quests/pile_bunker.txt b/npc/re/quests/pile_bunker.txt
index c2c979430..dbce8d136 100644
--- a/npc/re/quests/pile_bunker.txt
+++ b/npc/re/quests/pile_bunker.txt
@@ -1,18 +1,27 @@
 //===== Hercules Script ======================================
 //= Pile Bunker Quest
-//===== By: ================================================== 
+//===== By: ==================================================
 //= JayPee Mateo
-//===== Current Version: ===================================== 
-//= 2.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 2.2
+//===== Description: =========================================
 //= 1.0 A Pile Bunker quest based on iRO WiKi. [JayPee Mateo]
 //= 2.0 Rewrited the Script a little so it looks a bit better. [Masao]
 //= 2.1 Switched to official script, coded by Gennosuke Kouga. [Euphy]
-//============================================================ 
+//= 2.2 Updated to match the official script. [Euphy]
+//============================================================
 
-yuno,179,174,4	script	Gomer	851,{
+yuno,179,174,4	script	Gomer	4_M_REPAIR,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
+		mes "[Gomer]";
+		mes "You are carrying so much. Drop off some of your luggage and come back to me.";
+		close;
+	}
+	if (countitem(1549)) {
+		mes "[Gomer]";
+		mes "So how's that Pilebuncker working out for you?";
+		close;
+	}
 	if (Class != Job_Mechanic && Class != Job_Mechanic_T && Class != Job_Baby_Mechanic) {
 		mes "[Gomer]";
 		mes "I'm a retired Mechanic and I don't think I have any business with you.";
@@ -73,11 +82,7 @@ yuno,179,174,4	script	Gomer	851,{
 		mes "Lastly, finding a Brocca is very hard, but you should be able to do something about it. Haha, go get it!";
 		close;
 	case 4:
-		if (countitem(1549)) {
-			mes "[Gomer]";
-			mes "So how's that Pile Bunker working out for you?";
-			close;
-		} else if (countitem(1415) < 1 || countitem(999) < 200 || countitem(7325) < 30) {
+		if (countitem(999) < 200 || countitem(7325) < 30 || countitem(1415) < 1) {
 			mes "[Gomer]";
 			mes "You haven't brought all of the materials that I asked for.";
 			next;
@@ -88,7 +93,7 @@ yuno,179,174,4	script	Gomer	851,{
 		} else {
 			mes "[Gomer]";
 			mes "Oh, I've been waiting. You didn't come on time, so I was wondering if you forgot about it. Please wait there a little bit.";
-			specialeffect 101;
+			specialeffect EF_REPAIRWEAPON;
 			next;
 			mes "[Gomer]";
 			mes "It's done. What do you think? Not bad, eh? Although I made it myself, I have to say it's pretty decently done.";
@@ -104,11 +109,11 @@ yuno,179,174,4	script	Gomer	851,{
 			next;
 			mes "[Gomer]";
 			mes "Oh, and it turns out that I didn't need all that Steel after all. So here, take most of it back.";
-			delitem 999,50; // Steel
-			delitem 7325,30; // Flexible Tube
-			delitem 1415,1; // Brocca
-			getitem 1549,1; // Pile Bunker
-			getitem 1360,1; // Two-handed Axe [1]
+			delitem 999,50; //Steel
+			delitem 7325,30; //Tube
+			delitem 1415,1; //Skewer
+			getitem 1549,1; //Pilebuncker
+			getitem 1360,1; //Two_Handed_Axe
 			close;
 		}
 	}
diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt
index 107b7c029..ec208ad97 100644
--- a/npc/re/quests/quests_13_1.txt
+++ b/npc/re/quests/quests_13_1.txt
@@ -1,17 +1,18 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Ash-Vacuum
 //===== By: ==================================================
-//= Streusel
+//= Euphy
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Description: =========================================
-//= [Official Conversion]
-//= Contains:
-//= Promotional Staff Duplicate for Renewal
+//= Contains duplicate NPCs from main script.
 //===== Additional Comments: =================================
-//= 1.0 First Version.
+//= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy]
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
-// Onward to the New World
-//============================================================
-izlude,102,171,6	duplicate(Promotional Staff#iz)	Promotional Staff#izlude	100
\ No newline at end of file
+izlude,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz	4W_SAILOR
+izlude_a,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz_a	4W_SAILOR
+izlude_b,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz_b	4W_SAILOR
+izlude_c,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz_c	4W_SAILOR
+izlude_d,102,171,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz_d	4W_SAILOR
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index e9256047f..33758fe9a 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -1,13 +1,11 @@
 //===== Hercules Script ======================================
-//= Brasilis Qiests
+//= Brasilis Quests
 //===== By ===================================================
 //= L0ne_W0lf
 //===== Version ==============================================
-//= 1.2
-//===== Compatible With ======================================
-//= Hercules
+//= 1.2c
 //===== Description ==========================================
-//= [Translated from the Official]
+//= [Official Conversion]
 //= Lost Puppies (Repeatable, 24 hours.)
 //= Suspicious Beach (Repeatable, 24 hours. iRO/cRO version.)
 //= Guarana Candy Quest
@@ -18,11 +16,15 @@
 //= 1.0 First version.
 //= 1.1 Hydra Ball (12408)
 //= 1.2 Optimization. [Euphy]
+//= 1.2a Added 'consumeitem' command. [Euphy]
+//= 1.2b Updated RE EXP. [Michieru]
+//= 1.2c Put end; before OnTouch events in npcs that
+//= have view id of a mob [Panikon]
 //============================================================
 
-// Lost Puppies, Original file: dogdog.sc
+// Lost Puppies :: dogdog.sc
 //============================================================
-brasilis,297,307,5	script	Angelo#br	50,{
+brasilis,297,307,5	script	Angelo#br	1_M_04,{
 	if (BaseLevel < 40) {
 		mes "[Angelo]";
 		mes "Pets went out the village~!!";
@@ -49,11 +51,12 @@ brasilis,297,307,5	script	Angelo#br	50,{
 		mes "Oh, thank you. You found all of 3 puppies.";
 		mes "Thanks a lot.";
 		mes "I hope this is useful to you. hoho.";
-		getexp 50000,0;
+		set .@randexp,rand(50000,112500);
+		getexp .@randexp,0;
 		erasequest 9031;
 		setquest 9032;
 		specialeffect2 EF_ASSUMPTIO;
-		percentheal 100,100;
+		consumeitem 607; //Yggdrasilberry
 		set .@rand,rand(1,10);
 		if (.@rand > 4 && .@rand < 9) getitem 504,2; //White_Potion
 		else if (.@rand > 8) getitem 608,1; //Seed_Of_Yggdrasil
@@ -129,22 +132,22 @@ OnDisable:
 	end;
 }
 
-bra_fild01,98,96,3	duplicate(Puppy#bra)	Puppy#a1	81
-bra_fild01,59,116,5	duplicate(Puppy#bra)	Puppy#a2	81
-bra_fild01,62,142,3	duplicate(Puppy#bra)	Puppy#a3	81
-bra_fild01,80,163,3	duplicate(Puppy#bra)	Puppy#b1	81
-bra_fild01,73,210,3	duplicate(Puppy#bra)	Puppy#b2	81
-bra_fild01,80,210,3	duplicate(Puppy#bra)	Puppy#b3	81
-bra_fild01,38,235,3	duplicate(Puppy#bra)	Puppy#c1	81
-bra_fild01,307,64,3	duplicate(Puppy#bra)	Puppy#c2	81
-bra_fild01,260,60,3	duplicate(Puppy#bra)	Puppy#c3	81
-bra_fild01,234,101,3	duplicate(Puppy#bra)	Puppy#d1	81
-bra_fild01,200,84,3	duplicate(Puppy#bra)	Puppy#d2	81
-bra_fild01,176,63,5	duplicate(Puppy#bra)	Puppy#d3	81
+bra_fild01,98,96,3	duplicate(Puppy#bra)	Puppy#a1	4_DOG01
+bra_fild01,59,116,5	duplicate(Puppy#bra)	Puppy#a2	4_DOG01
+bra_fild01,62,142,3	duplicate(Puppy#bra)	Puppy#a3	4_DOG01
+bra_fild01,80,163,3	duplicate(Puppy#bra)	Puppy#b1	4_DOG01
+bra_fild01,73,210,3	duplicate(Puppy#bra)	Puppy#b2	4_DOG01
+bra_fild01,80,210,3	duplicate(Puppy#bra)	Puppy#b3	4_DOG01
+bra_fild01,38,235,3	duplicate(Puppy#bra)	Puppy#c1	4_DOG01
+bra_fild01,307,64,3	duplicate(Puppy#bra)	Puppy#c2	4_DOG01
+bra_fild01,260,60,3	duplicate(Puppy#bra)	Puppy#c3	4_DOG01
+bra_fild01,234,101,3	duplicate(Puppy#bra)	Puppy#d1	4_DOG01
+bra_fild01,200,84,3	duplicate(Puppy#bra)	Puppy#d2	4_DOG01
+bra_fild01,176,63,5	duplicate(Puppy#bra)	Puppy#d3	4_DOG01
 
-// Suspicious Beach, original file: Suspicious_Beach.sc
+// Suspicious Beach :: Suspicious_Beach.sc
 //============================================================
-brasilis,192,133,6	script	Lucia#brasilis	478,{
+brasilis,192,133,6	script	Lucia#brasilis	4_F_BRZ_WOMAN,{
 	/* -------------- Hydra Ball -------------------------
 	if (countitem(12408) > 0) {
 		delitem 12408,1; //Leaf_Cat_Ball
@@ -168,7 +171,7 @@ brasilis,192,133,6	script	Lucia#brasilis	478,{
 	else {
 		set .@nQState1,checkquest(9028);
 		set .@nQState2,checkquest(9029);
-		if (.@nQState1 == 0) {
+		if (.@nQState1 == -1) {
 			mes "[Lucia]";
 			mes "Hello.";
 			mes "Have you come here to hunt ^FF0000Strange Hydra^000000s?";
@@ -226,10 +229,10 @@ brasilis,192,133,6	script	Lucia#brasilis	478,{
 					//recall_completequest 9029;
 					if (.@nQState2 > -1) erasequest 9029;
 					setquest 9029;
-					percentheal 100,100;
-					sc_start SC_FOOD_LUK, 1200000, 5; percentheal 5,2;
-					sc_start SC_FOOD_VIT, 1200000, 5; percentheal 10,0;
-					sc_start SC_FOOD_DEX, 1200000, 5; percentheal 5,5;
+					consumeitem 607; //Yggdrasilberry
+					consumeitem 12070; //Luk_Dish05
+					consumeitem 12055; //Vit_Dish05
+					consumeitem 12065; //Dex_Dish05
 					getitem 11502,3; //Light_Blue_Pot
 					close;
 				}
@@ -354,9 +357,9 @@ OnTimer7000:
 	end;
 }
 
-// Guarana Quest, Original file: brazil_tre.sc
+// Guarana Quest :: brazil_tre.sc
 //============================================================
-brasilis,187,162,5	script	Candy Maker	476,{
+brasilis,187,162,5	script	Candy Maker	4_M_BRZ_MAN1,{
 	if (!checkweight(1201,1)) {
 		mes "- You can't start the quest. Please reduce the weight in your inventory. -";
 		close;
@@ -450,7 +453,7 @@ brasilis,187,162,5	script	Candy Maker	476,{
 		set brazil_gua,11;
 		completequest 2200;
 		getitem 12414,1; //Guarana_Candy
-		getexp 700000,100000;
+		getexp 70000,10000;
 		close;
 	}
 	else if (brazil_gua == 11) {
@@ -470,7 +473,7 @@ brasilis,187,162,5	script	Candy Maker	476,{
 			if (Zeny > 3999) {
 				mes "[Candy Maker]";
 				mes "Here is a delicious guarana candy.";
-				set zeny,zeny-4000;
+				Zeny -= 4000;
 				getitem 12414,1; //Guarana_Candy
 				close;
 			}
@@ -494,7 +497,7 @@ brasilis,187,162,5	script	Candy Maker	476,{
 	}
 }
 
-bra_in01,95,179,3	script	Cherto	477,{
+bra_in01,95,179,3	script	Cherto	4_M_BRZ_MAN2,{
 	if (brazil_gua == 0) {
 		mes "[Cherto]";
 		mes "Hmm... hey man, you are from outside, aren't you?";
@@ -654,7 +657,7 @@ bra_in01,95,179,3	script	Cherto	477,{
 	}
 }
 
-brasilis,203,64,3	script	Strange Kid#bra	706,{
+brasilis,203,64,3	script	Strange Kid#bra	4_M_KID1,{
 	if (brazil_gua < 3) {
 		mes "[Strange Kid]";
 		mes "................";
@@ -809,11 +812,11 @@ brasilis,203,64,3	script	Strange Kid#bra	706,{
 	end;
 }
 
-brasilis,56,224,7	script	Mage Paje#bra	704,{
+brasilis,56,224,7	script	Mage Paje#bra	4_M_BIBI,{
 	mes "[Mage Paje]";
 	mes "Abracadabra~";
 	specialeffect EF_POISONHIT,AREA,"Poring#bra";
-	setarray .@display[0],800,876,909;
+	setarray .@display[0], 4_NFCOCK, 4_CAT, 4_PORING;
 	setnpcdisplay "Poring#bra",.@display[rand(3)];
 	if (brazil_gua != 5) close;
 	next;
@@ -856,11 +859,13 @@ brasilis,56,224,7	script	Mage Paje#bra	704,{
 	close;
 }
 
-brasilis,59,226,3	script	Poring#bra	909,{
+brasilis,59,226,3	script	Poring#bra	4_PORING,{
 	end;
 }
 
-bra_fild01,75,83,5	script	Toucan#bra	2073,2,2,{
+bra_fild01,75,83,5	script	Toucan#bra	TOUCAN,2,2,{
+end;
+
 OnTouch:
 	if (brazil_gua == 6) {
 		mes "[Toucan]";
@@ -920,7 +925,9 @@ OnTouch:
 	end;
 }
 
-bra_fild01,34,184,5	script	Jaguar#bra	2072,2,2,{
+bra_fild01,34,184,5	script	Jaguar#bra	JAGUAR,2,2,{
+end;
+
 OnTouch_:
 	if (brazil_gua == 7) {
 		mes "[Jaguar]";
@@ -971,7 +978,7 @@ OnTouch_:
 		set brazil_gua,8;
 		changequest 2197,2198;
 		close2;
-		sc_start SC_MOVHASTE_INFINITY,5000,0;
+		consumeitem 12016; //Speed_Up_Potion
 		end;
 	}
 	else {
@@ -982,11 +989,11 @@ OnTouch_:
 	end;
 }
 
-bra_fild01,245,53,3	script	#Monkeybra	1057,{
+bra_fild01,245,53,3	script	#Monkeybra	YOYO,{
 	end;
 }
 
-bra_fild01,245,52,3	script	Monkey#bra	111,{
+bra_fild01,245,52,3	script	Monkey#bra	HIDDEN_NPC,{
 	if (brazil_gua == 8) {
 		mes "[Monkey]";
 		mes "What is it??!!";
@@ -1032,9 +1039,9 @@ bra_fild01,245,52,3	script	Monkey#bra	111,{
 	}
 }
 
-// Water Lily Quest, Original file: brazil_tre.sc
+// Water Lily Quest :: brazil_tre.sc
 //============================================================
-brasilis,203,286,3	script	Botanist Karmen#bra	893,{
+brasilis,203,286,3	script	Botanist Karmen#bra	4_F_HUWOMAN,{
 	if (brazil_regia == 0) {
 		mes "[Karmen]";
 		mes "Brasilis' climate is special.";
@@ -1088,7 +1095,7 @@ brasilis,203,286,3	script	Botanist Karmen#bra	893,{
 		mes "The water lily must truly be a lucky flower. hahaha";
 		set brazil_regia,10;
 		completequest 2207;
-		getexp 500000,100000;
+		getexp 50000,10000;
 		close;
 	}
 	else {
@@ -1105,7 +1112,7 @@ brasilis,203,286,3	script	Botanist Karmen#bra	893,{
 	}
 }
 
-bra_in01,142,27,5	script	Marta#bra	474,{
+bra_in01,142,27,5	script	Marta#bra	4_F_BRZ_INDOLD,{
 	if (brazil_regia == 1) {
 		mes "[Brasilis Boy]";
 		mes "Grandma! That person has a weird smell.";
@@ -1256,7 +1263,7 @@ bra_in01,142,27,5	script	Marta#bra	474,{
 	}
 }
 
-bra_in01,145,27,3	script	Brasilis Boy#bra	472,{
+bra_in01,145,27,3	script	Brasilis Boy#bra	4_M_BRZ_INDIAN,{
 	if (brazil_regia == 1) {
 		mes "[Brasilis Boy]";
 		mes "Grandma! That person has a weird smell.";
@@ -1407,7 +1414,7 @@ bra_in01,145,27,3	script	Brasilis Boy#bra	472,{
 	}
 }
 
-brasilis,270,145,5	script	Brasilis Girl#bra	473,5,5,{
+brasilis,270,145,5	script	Brasilis Girl#bra	4_F_BRZ_INDIAN,5,5,{
 	if (!checkweight(1201,1)) {
 		mes "- wait a second!! -";
 		mes "- you have too many items -";
@@ -1696,7 +1703,7 @@ OnTouch:
 	end;
 }
 
-bra_dun02,67,205,5	script	Recluse#bra	475,3,3,{
+bra_dun02,67,205,5	script	Recluse#bra	4_M_BRZ_JACI,3,3,{
 	if (brazil_regia == 3) {
 		mes "[Recluse]";
 		mes "Oh, I haven't seen another person in such a long time.";
@@ -1820,7 +1827,7 @@ OnTouchNPC:
 	end;
 }
 
-bra_dun02,71,200,3	script	Water lily#bra	111,{
+bra_dun02,71,200,3	script	Water lily#bra	HIDDEN_NPC,{
 	if (brazil_regia == 4) {
 		mes "An unusual Water lily is blooming here. You can't stop staring at it, knowing that few people have seen this flower bloom.";
 		next;
@@ -1929,9 +1936,9 @@ bra_dun02,71,200,3	script	Water lily#bra	111,{
 	}
 }
 
-// Dungeon Access Quest, Original file: brazil_tre.sc
+// Dungeon Access Quest :: brazil_tre.sc
 //============================================================
-brasilis,185,246,5	script	Pedro#bra	62,{
+brasilis,185,246,5	script	Pedro#bra	1_M_SIZ,{
 	if (brazil_ghost == 0) {
 		OnTalk:
 		mes "[Pedro]";
@@ -2157,7 +2164,7 @@ brasilis,185,246,5	script	Pedro#bra	62,{
 	}
 }
 
-brasilis,187,244,1	script	Mariana#bra	72,{
+brasilis,187,244,1	script	Mariana#bra	1_F_MARIA,{
 	if (brazil_ghost == 0) {
 		doevent "Pedro#bra::OnTalk";
 		end;
@@ -2175,7 +2182,7 @@ brasilis,187,244,1	script	Mariana#bra	72,{
 	}
 }
 
-brasilis,181,250,5	script	Fabio#bra	706,{
+brasilis,181,250,5	script	Fabio#bra	4_M_KID1,{
 	if (brazil_ghost == 0) {
 		doevent "Pedro#bra::OnTalk";
 		end;
@@ -2195,7 +2202,7 @@ brasilis,181,250,5	script	Fabio#bra	706,{
 	}
 }
 
-brasilis,180,249,5	script	Daniel#bra	706,{
+brasilis,180,249,5	script	Daniel#bra	4_M_KID1,{
 	if (brazil_ghost == 0) {
 		doevent "Pedro#bra::OnTalk";
 		end;
@@ -2212,7 +2219,7 @@ brasilis,180,249,5	script	Daniel#bra	706,{
 	}
 }
 
-bra_in01,149,184,3	script	Door#bra	844,{
+bra_in01,149,184,3	script	Door#bra	CLEAR_NPC,{
 	if (brazil_ghost > 0) {
 		mes "- A key is inserted in the locked door.-";
 		next;
@@ -2301,7 +2308,7 @@ bra_in01,149,184,3	script	Door#bra	844,{
 	}
 }
 
-bra_in01,144,187,3	script	Toilet#bra	844,{
+bra_in01,144,187,3	script	Toilet#bra	CLEAR_NPC,{
 	if (brazil_ghost > 0) {
 		mes "- Looks like an ordinary toilet -";
 		next;
@@ -2387,7 +2394,7 @@ bra_in01,144,187,3	script	Toilet#bra	844,{
 	}
 }
 
-bra_in01,134,189,3	script	Faucet#bra	844,{
+bra_in01,134,189,3	script	Faucet#bra	CLEAR_NPC,{
 	if (brazil_ghost > 0) {
 		mes "- It seems like an ordinary faucet -";
 		next;
@@ -2462,7 +2469,7 @@ bra_in01,134,189,3	script	Faucet#bra	844,{
 	}
 }
 
-bra_in01,138,184,3	script	Carpet#bra	844,{
+bra_in01,138,184,3	script	Carpet#bra	CLEAR_NPC,{
 	if (brazil_ghost > 0) {
 		mes "- A carpet with an intricate pattern on it -";
 		next;
@@ -2544,7 +2551,7 @@ bra_in01,138,184,3	script	Carpet#bra	844,{
 	}
 }
 
-bra_in01,151,180,3	script	Mirror#bra	844,{
+bra_in01,151,180,3	script	Mirror#bra	CLEAR_NPC,{
 	if (brazil_ghost > 0) {
 		mes "- You can see a clean mirror without any marks or dust -";
 		next;
@@ -2660,7 +2667,7 @@ bra_in01,151,180,3	script	Mirror#bra	844,{
 	}
 }
 
-bra_in01,136,180,5	script	Ghost#bra	1867,{
+bra_in01,136,180,5	script	Ghost#bra	BANSHEE,{
 	end;
 
 OnInit:
@@ -2668,7 +2675,7 @@ OnInit:
 	end;
 }
 
-bra_in01,7,181,5	script	Curator#bra	477,{
+bra_in01,7,181,5	script	Curator#bra	4_M_BRZ_MAN2,{
 	if (BaseLevel < 40) {
 		mes "[Curator]";
 		mes "I'm sorry but this area is under construction right now.";
@@ -2754,7 +2761,7 @@ bra_in01,7,181,5	script	Curator#bra	477,{
 	}
 }
 
-bra_in01,12,185,0	script	inbathroom#bra	45,1,1,{
+bra_in01,12,185,0	script	inbathroom#bra	WARPNPC,1,1,{
 OnTouch_:
 	if (brazil_ghost > 6)
 		warp "bra_in01",138,176;
@@ -2768,7 +2775,7 @@ OnTouch_:
 bra_in01,138,174,0	warp	outbathroom#bra	1,1,bra_in01,12,183
 bra_in01,206,98,0	warp	tobath#bra	1,1,bra_in01,138,176
 
-bra_in01,206,188,1	script	Open Manhole#todunbra	844,{
+bra_in01,206,188,1	script	Open Manhole#todunbra	CLEAR_NPC,{
 	if (brazil_ghost == 7) {
 		enablenpc "Ghost#bra_end";
 		mes "[Ghost]";
@@ -2796,7 +2803,7 @@ bra_in01,206,188,1	script	Open Manhole#todunbra	844,{
 		set brazil_ghost,8;
 		//completequest 2208;
 		completequest 60355;
-		getexp 900000,0;
+		getexp 90000,0;
 		disablenpc "Ghost#bra_end";
 		close;
 	}
@@ -2805,12 +2812,12 @@ bra_in01,206,188,1	script	Open Manhole#todunbra	844,{
 }
 
 
-bra_dun01,87,43,1	script	Pipe#bra	844,{
+bra_dun01,87,43,1	script	Pipe#bra	CLEAR_NPC,{
 	warp "bra_in01",206,185;
 	end;
 }
 
-bra_fild01,323,136,1	script	Pipe#brafild	844,{
+bra_fild01,323,136,1	script	Pipe#brafild	CLEAR_NPC,{
 	if (brazil_ghost > 6) {
 		mes "You see a rusty pipe. It seems to be linked to somewhere beneath the jungle.";
 		next;
@@ -2831,7 +2838,7 @@ bra_fild01,323,136,1	script	Pipe#brafild	844,{
 	}
 }
 
-bra_in01,206,190,3	script	Ghost#bra_end	1867,{
+bra_in01,206,190,3	script	Ghost#bra_end	BANSHEE,{
 	end;
 
 OnInit:
@@ -2839,9 +2846,9 @@ OnInit:
 	end;
 }
 
-// Iara, Original file: iara.sc
+// Iara :: iara.sc
 //============================================================
-brasilis,315,334,5	script	Shaman#nk	474,{
+brasilis,315,334,5	script	Shaman#nk	4_F_BRZ_INDOLD,{
 	set .@iara_re,checkquest(4135,PLAYTIME);
 	if ((.@iara_re == 0) || (.@iara_re == 1)) {
 		mes "[Anori]";
@@ -2962,22 +2969,19 @@ brasilis,315,334,5	script	Shaman#nk	474,{
 				mes "Could you listen to my stories for a moment.";
 				mes "There's an emergency in our tribe.";
 				next;
-				switch(select("No.:Okay.")) {
-				case 1:
+				if(select("No.:Okay.") == 1) {
 					mes "[Anori]";
 					mes "You are a heartless person...";
 					mes "You don't seem the helpful type.";
 					mes "Just keep on going your way.";
 					close;
-				case 2:
-					mes "[Anori]";
-					mes "Thank you, I met a kind person.";
-					mes "It's a secret of our tribe that";
-					mes "you cannot tell anyone.";
-					next;
-					break;
 				}
 				mes "[Anori]";
+				mes "Thank you, I met a kind person.";
+				mes "It's a secret of our tribe that";
+				mes "you cannot tell anyone.";
+				next;
+				mes "[Anori]";
 				mes "Lately young men from";
 				mes "the tribe are disappearing.";
 				mes "Our entire tribe is being threatened.";
@@ -3044,7 +3048,7 @@ brasilis,315,334,5	script	Shaman#nk	474,{
 	}
 }
 
-bra_dun02,157,74,5	script	Iara#nk	478,2,2,{
+bra_dun02,157,74,5	script	Iara#nk	4_F_BRZ_WOMAN,2,2,{
 	if (countitem(11517) > 0) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Should I use a Purification Potion?";
@@ -3072,12 +3076,12 @@ bra_dun02,157,74,5	script	Iara#nk	478,2,2,{
 			percentheal 100,100;
 			sc_start SC_INCFLEE,3600000,20;
 			sc_start SC_CRITICALPERCENT,3600000,10;
-			sc_start SC_FOOD_STR,1200000,3;
-			sc_start SC_FOOD_DEX,1200000,3;
-			sc_start SC_FOOD_AGI,1200000,3;
-			sc_start SC_FOOD_VIT,1200000,3;
-			sc_start SC_FOOD_INT,1200000,3;
-			sc_start SC_FOOD_LUK,1200000,3; 
+			consumeitem 12043; //Str_Dish03
+			consumeitem 12063; //Dex_Dish03
+			consumeitem 12058; //Agi_Dish03
+			consumeitem 12053; //Vit_Dish03
+			consumeitem 12048; //Int_Dish03
+			consumeitem 12068; //Luk_Dish03
 			next;
 			mes "[Iara]";
 			mes "Ahhh~...";
@@ -3098,11 +3102,10 @@ bra_dun02,157,74,5	script	Iara#nk	478,2,2,{
 		mes "Aaaaaaaaaaaaaaaaaaaaaah.";
 		mes "Eeeeeeeeeeeeeeeeeeeh.";
 		mes "Oooooooooooooooooh.";
-		set .@get_de,rand(1,2);
-		if (.@get_de == 1)
-			sc_start Sc_Curse,60000,0;
+		if (rand(1,2) == 1)
+			sc_start SC_CURSE,60000,0;
 		else
-			sc_start Sc_Confusion,60000,0;
+			sc_start SC_CONFUSION,60000,0;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Ugh! What's this strange voice?";
@@ -3116,11 +3119,10 @@ OnTouch:
 		mes "Aaaaaaaaaaaaaaaaaaaaaah.";
 		mes "Eeeeeeeeeeeeeeeeeeeh.";
 		mes "Oooooooooooooooooh.";
-		set .@get_de,rand(1,2);
-		if (.@get_de == 1)
-			sc_start Sc_Curse,60000,0;
+		if (rand(1,2) == 1)
+			sc_start SC_CURSE,60000,0;
 		else
-			sc_start Sc_Confusion,60000,0;
+			sc_start SC_CONFUSION,60000,0;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Ugh! What's this strange voice?";
@@ -3129,9 +3131,9 @@ OnTouch:
 	end;
 }
 
-bra_fild01,188,301,5	script	Native Warrior#nk	472,{
+bra_fild01,188,301,5	script	Native Warrior#nk	4_M_BRZ_INDIAN,{
 	mes "[Native Warrior]";
-	mes "Ah...the face I would never forget even in my dreams.";
+	mes "Ah... the face I would never forget even in my dreams.";
 	next;
 	mes "[Native Warrior]";
 	mes "When will she come out of the waterfall again...?";
@@ -3143,7 +3145,7 @@ bra_fild01,188,301,5	script	Native Warrior#nk	472,{
 	else {
 		mes "[" + strcharinfo(0) + "]";
 		mes "(This guy will never";
-		mes "get ocer Iara's curse...)";
+		mes "get over Iara's curse...)";
 	}
 	close;
 }
diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt
index f0f6fef1e..e3d1a7302 100644
--- a/npc/re/quests/quests_dewata.txt
+++ b/npc/re/quests/quests_dewata.txt
@@ -4,9 +4,8 @@
 //= Gennosuke Kouga, Muad_Dib
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
+//= [Official Conversion]
 //= Quest NPCs related to Dewata:
 //== "Dewata Legend"
 //== "Help Out the Old Man"
@@ -17,62 +16,9 @@
 //= 1.2 Updated to match the official script. [Lemongrass/Euphy]
 //============================================================
 
-// Entrance
+// Dewata Legend Quest :: dewata_legend
 //============================================================
-alberta,212,202,4	script	Dewata Sailor#alberta	536,{
-	mes "[Dewata Sailor]";
-	mes "Do you want to visit ^8B4513Dewata Island^000000?";
-	mes "With it's dazzling waves and charming views it's a great place to relax.";
-	mes "The transit fee is 10,000 Zeny.";
-	next;
-	switch(select("Yes!:No.")) {
-	case 1:
-		if (Zeny >= 10000) {
-			mes "[Dewata Sailor]";
-			mes "^8B4513Dewata^000000 is a beautiful and peaceful island country.";
-			mes "Have a nice trip~";
-			close2;
-			set Zeny, Zeny - 10000;
-			warp "dewata",232,53;
-			end;
-		} else {
-			mes "[Dewata Sailor]";
-			mes "You don't have the dough, kid.";
-			mes "Come back when you have a bigger wallet.";
-			close;
-		}
-	case 2:
-		mes "[Dewata Sailor]";
-		mes "Let me know";
-		mes "when you're ready to travel~";
-		close;
-	}
-}
-
-dewata,229,49,6	script	Alberta Sailor#dewata	536,{
-	mes "[Alberta Sailor]";
-	mes "Do you want to go back to Alberta?";
-	next;
-	switch(select("Yes.:No.")) {
-	case 1:
-		mes "[Alberta Sailor]";
-		mes "I hope you had a lot of fun on";
-		mes "your trip to ^8B4513Dewata^000000 Island.";
-		mes "Please come again!";
-		close2;
-		warp "alberta",210,198;
-		end;
-	case 2:
-		mes "[Alberta Sailor]";
-		mes "Have some more fun before you go.";
-		mes "^8B4513Dewata^000000 Island still has more to offer.";
-		close;
-	}
-}
-
-// Dewata Legend Quest
-//============================================================
-dew_fild01,57,274,0	script	#hideout_legend	111,6,6,{
+dew_fild01,57,274,0	script	#hideout_legend	HIDDEN_NPC,6,6,{
 OnTouch:
 	if (BaseLevel > 59 && dew_legend < 1) {
 		mes "- You hear a faint conversation going on inside. -";
@@ -106,7 +52,7 @@ OnTouch:
 	end;
 }
 
-dew_in01,15,33,0	script	#hidein_legend	111,5,5,{
+dew_in01,15,33,0	script	#hidein_legend	HIDDEN_NPC,5,5,{
 OnTouch:
 	if (dew_legend == 3) {
 		mes "Kasyapa and Chief Paiko begin talking as you are about to leave...";
@@ -137,7 +83,7 @@ OnTouch:
 	end;
 }
 
-dew_in01,22,48,3	script	Sage Kasyapa#dew	541,{
+dew_in01,22,48,3	script	Sage Kasyapa#dew	4_M_DEWZATIMAN,{
 	if (dew_legend == 0) {
 		mes "[Sage Kasyapa]";
 		mes "Ah, a stranger to our land.";
@@ -270,7 +216,7 @@ dew_in01,22,48,3	script	Sage Kasyapa#dew	541,{
 	}
 }
 
-dew_in01,15,49,4	script	Tribal Chief Paiko#dew	540,{
+dew_in01,15,49,4	script	Tribal Chief Paiko#dew	4_M_DEWZATICHIEF,{
 	if (dew_legend < 2) {
 		mes "[Tribal Chief Paiko]";
 		mes "I am the leader of this tribe";
@@ -569,7 +515,7 @@ L_Delivery:
 	}
 }
 
-dew_fild01,78,288,6	script	Jaty Tribe Warrior#dew	541,{
+dew_fild01,78,288,6	script	Jaty Tribe Warrior#dew	4_M_DEWZATIMAN,{
 	mes "[Jaty Tribe Warrior]";
 	mes "We revere strength and bravery.";
 	mes "We are ^FF0000Jaty^000000 Tribe.";
@@ -607,7 +553,7 @@ dew_fild01,78,288,6	script	Jaty Tribe Warrior#dew	541,{
 	close;
 }
 
-dew_fild01,185,300,6	script	Tribe Manager#dew	541,{
+dew_fild01,185,300,6	script	Tribe Manager#dew	4_M_DEWZATIMAN,{
 	mes "[Tribe Manager]";
 	mes "Keeping our culture and tradition is very important.";
 	if (dew_legend != 11 || !countitem(11533)) {
@@ -660,7 +606,7 @@ dew_fild01,185,300,6	script	Tribe Manager#dew	541,{
 }
 
 //Original name: Gatekeeper of Krakatau Volcano
-dewata,235,56,4	script	Gatekeeper of Krakatau#1	534,{
+dewata,235,56,4	script	Gatekeeper of Krakatau#1	4_M_DEWOLDMAN,{
 	mes "[Gatekeeper of Krakatau Volcano]";
 	mes "^8B4513Krakatau Volcano^000000 is";
 	mes "a very dangerous area";
@@ -728,7 +674,7 @@ dewata,235,56,4	script	Gatekeeper of Krakatau#1	534,{
 }
 
 //Original name: Gatekeeper of Krakatau Volcano
-dew_dun01,292,164,4	script	Gatekeeper of Krakatau#2	541,{
+dew_dun01,292,164,4	script	Gatekeeper of Krakatau#2	4_M_DEWZATIMAN,{
 	mes "[Gatekeeper of Krakatau Volcano]";
 	mes "Want to go back";
 	mes "to Dewata?";
@@ -747,7 +693,7 @@ dew_dun01,292,164,4	script	Gatekeeper of Krakatau#2	541,{
 	}
 }
 
-dewata,78,192,6	script	Borobudur Temple Manager	536,{
+dewata,78,192,6	script	Borobudur Temple Manager	4_M_DEWMAN,{
 	mes "[Borobudur Temple Manager]";
 	mes "The weather today is so beautiful.";
 	if (dew_legend != 15 || !countitem(11533))
@@ -794,9 +740,9 @@ dewata,78,192,6	script	Borobudur Temple Manager	536,{
 	close;
 }
 
-// Help Out the Old Man
+// Help Out the Old Man :: dewata_drink
 //============================================================
-dewata,109,262,4	script	Memo#dew_drink	534,{
+dewata,109,262,4	script	Memo#dew_drink	4_M_DEWOLDMAN,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 5000) {
 		if (dew_drink) {
 			mes "[Memo]";
@@ -1122,7 +1068,7 @@ dewata,109,262,4	script	Memo#dew_drink	534,{
 	}
 }
 
-dew_fild01,114,275,4	script	Lero#dew_drink	536,{
+dew_fild01,114,275,4	script	Lero#dew_drink	4_M_DEWMAN,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 5000) {
 		mes "[Lero]";
 		mes "You're carrying too many things...";
@@ -1383,7 +1329,7 @@ dew_fild01,114,275,4	script	Lero#dew_drink	536,{
 	close;
 }
 
-dew_fild01,259,48,4	script	Poby#dew_drink	538,{
+dew_fild01,259,48,4	script	Poby#dew_drink	4_M_DEWBOY,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
 		if (dew_drink > 0) {
 			mes "[Poby]";
@@ -1675,50 +1621,50 @@ OnTimer300000:
 	donpcevent strnpcinfo(0)+"::OnEnable";
 	end;
 }
-dew_fild01,247,62,0	duplicate(DewataPalm)	Palm Tree#drink01	844
-dew_fild01,276,73,0	duplicate(DewataPalm)	Palm Tree#drink02	844
-dew_fild01,278,63,0	duplicate(DewataPalm)	Palm Tree#drink03	844
-dew_fild01,301,88,0	duplicate(DewataPalm)	Palm Tree#drink04	844
-dew_fild01,314,72,0	duplicate(DewataPalm)	Palm Tree#drink05	844
-dew_fild01,320,68,0	duplicate(DewataPalm)	Palm Tree#drink06	844
-dew_fild01,334,107,0	duplicate(DewataPalm)	Palm Tree#drink07	844
-dew_fild01,345,88,0	duplicate(DewataPalm)	Palm Tree#drink08	844
-dew_fild01,344,71,0	duplicate(DewataPalm)	Palm Tree#drink09	844
-dew_fild01,358,93,0	duplicate(DewataPalm)	Palm Tree#drink10	844
-dew_fild01,338,121,0	duplicate(DewataPalm)	Palm Tree#drink11	844
-dew_fild01,358,136,0	duplicate(DewataPalm)	Palm Tree#drink12	844
-dew_fild01,326,147,0	duplicate(DewataPalm)	Palm Tree#drink13	844
-dew_fild01,307,146,0	duplicate(DewataPalm)	Palm Tree#drink14	844
-dew_fild01,325,159,0	duplicate(DewataPalm)	Palm Tree#drink15	844
-dew_fild01,339,163,0	duplicate(DewataPalm)	Palm Tree#drink16	844
-dew_fild01,346,193,0	duplicate(DewataPalm)	Palm Tree#drink17	844
-dew_fild01,355,193,0	duplicate(DewataPalm)	Palm Tree#drink18	844
-dew_fild01,363,219,0	duplicate(DewataPalm)	Palm Tree#drink19	844
-dew_fild01,341,261,0	duplicate(DewataPalm)	Palm Tree#drink20	844
-dew_fild01,289,302,0	duplicate(DewataPalm)	Palm Tree#drink21	844
-dew_fild01,70,196,0	duplicate(DewataPalm)	Palm Tree#drink22	844
-dew_fild01,97,145,0	duplicate(DewataPalm)	Palm Tree#drink23	844
-dew_fild01,119,42,0	duplicate(DewataPalm)	Palm Tree#drink24	844
-dew_fild01,188,72,0	duplicate(DewataPalm)	Palm Tree#drink25	844
-dew_fild01,238,80,0	duplicate(DewataPalm)	Palm Tree#drink26	844
-dew_fild01,252,97,0	duplicate(DewataPalm)	Palm Tree#drink27	844
-dew_fild01,256,98,0	duplicate(DewataPalm)	Palm Tree#drink28	844
-dew_fild01,279,93,0	duplicate(DewataPalm)	Palm Tree#drink29	844
-dew_fild01,299,107,0	duplicate(DewataPalm)	Palm Tree#drink30	844
-dew_fild01,355,113,0	duplicate(DewataPalm)	Palm Tree#drink31	844
-dew_fild01,278,136,0	duplicate(DewataPalm)	Palm Tree#drink32	844
-dew_fild01,258,128,0	duplicate(DewataPalm)	Palm Tree#drink33	844
-dew_fild01,240,125,0	duplicate(DewataPalm)	Palm Tree#drink34	844
-dew_fild01,225,117,0	duplicate(DewataPalm)	Palm Tree#drink35	844
-dew_fild01,219,121,0	duplicate(DewataPalm)	Palm Tree#drink36	844
-dew_fild01,226,99,0	duplicate(DewataPalm)	Palm Tree#drink37	844
-dew_fild01,209,137,0	duplicate(DewataPalm)	Palm Tree#drink38	844
-dew_fild01,206,156,0	duplicate(DewataPalm)	Palm Tree#drink39	844
-dew_fild01,209,201,0	duplicate(DewataPalm)	Palm Tree#drink40	844
+dew_fild01,247,62,0	duplicate(DewataPalm)	Palm Tree#drink01	CLEAR_NPC
+dew_fild01,276,73,0	duplicate(DewataPalm)	Palm Tree#drink02	CLEAR_NPC
+dew_fild01,278,63,0	duplicate(DewataPalm)	Palm Tree#drink03	CLEAR_NPC
+dew_fild01,301,88,0	duplicate(DewataPalm)	Palm Tree#drink04	CLEAR_NPC
+dew_fild01,314,72,0	duplicate(DewataPalm)	Palm Tree#drink05	CLEAR_NPC
+dew_fild01,320,68,0	duplicate(DewataPalm)	Palm Tree#drink06	CLEAR_NPC
+dew_fild01,334,107,0	duplicate(DewataPalm)	Palm Tree#drink07	CLEAR_NPC
+dew_fild01,345,88,0	duplicate(DewataPalm)	Palm Tree#drink08	CLEAR_NPC
+dew_fild01,344,71,0	duplicate(DewataPalm)	Palm Tree#drink09	CLEAR_NPC
+dew_fild01,358,93,0	duplicate(DewataPalm)	Palm Tree#drink10	CLEAR_NPC
+dew_fild01,338,121,0	duplicate(DewataPalm)	Palm Tree#drink11	CLEAR_NPC
+dew_fild01,358,136,0	duplicate(DewataPalm)	Palm Tree#drink12	CLEAR_NPC
+dew_fild01,326,147,0	duplicate(DewataPalm)	Palm Tree#drink13	CLEAR_NPC
+dew_fild01,307,146,0	duplicate(DewataPalm)	Palm Tree#drink14	CLEAR_NPC
+dew_fild01,325,159,0	duplicate(DewataPalm)	Palm Tree#drink15	CLEAR_NPC
+dew_fild01,339,163,0	duplicate(DewataPalm)	Palm Tree#drink16	CLEAR_NPC
+dew_fild01,346,193,0	duplicate(DewataPalm)	Palm Tree#drink17	CLEAR_NPC
+dew_fild01,355,193,0	duplicate(DewataPalm)	Palm Tree#drink18	CLEAR_NPC
+dew_fild01,363,219,0	duplicate(DewataPalm)	Palm Tree#drink19	CLEAR_NPC
+dew_fild01,341,261,0	duplicate(DewataPalm)	Palm Tree#drink20	CLEAR_NPC
+dew_fild01,289,302,0	duplicate(DewataPalm)	Palm Tree#drink21	CLEAR_NPC
+dew_fild01,70,196,0	duplicate(DewataPalm)	Palm Tree#drink22	CLEAR_NPC
+dew_fild01,97,145,0	duplicate(DewataPalm)	Palm Tree#drink23	CLEAR_NPC
+dew_fild01,119,42,0	duplicate(DewataPalm)	Palm Tree#drink24	CLEAR_NPC
+dew_fild01,188,72,0	duplicate(DewataPalm)	Palm Tree#drink25	CLEAR_NPC
+dew_fild01,238,80,0	duplicate(DewataPalm)	Palm Tree#drink26	CLEAR_NPC
+dew_fild01,252,97,0	duplicate(DewataPalm)	Palm Tree#drink27	CLEAR_NPC
+dew_fild01,256,98,0	duplicate(DewataPalm)	Palm Tree#drink28	CLEAR_NPC
+dew_fild01,279,93,0	duplicate(DewataPalm)	Palm Tree#drink29	CLEAR_NPC
+dew_fild01,299,107,0	duplicate(DewataPalm)	Palm Tree#drink30	CLEAR_NPC
+dew_fild01,355,113,0	duplicate(DewataPalm)	Palm Tree#drink31	CLEAR_NPC
+dew_fild01,278,136,0	duplicate(DewataPalm)	Palm Tree#drink32	CLEAR_NPC
+dew_fild01,258,128,0	duplicate(DewataPalm)	Palm Tree#drink33	CLEAR_NPC
+dew_fild01,240,125,0	duplicate(DewataPalm)	Palm Tree#drink34	CLEAR_NPC
+dew_fild01,225,117,0	duplicate(DewataPalm)	Palm Tree#drink35	CLEAR_NPC
+dew_fild01,219,121,0	duplicate(DewataPalm)	Palm Tree#drink36	CLEAR_NPC
+dew_fild01,226,99,0	duplicate(DewataPalm)	Palm Tree#drink37	CLEAR_NPC
+dew_fild01,209,137,0	duplicate(DewataPalm)	Palm Tree#drink38	CLEAR_NPC
+dew_fild01,206,156,0	duplicate(DewataPalm)	Palm Tree#drink39	CLEAR_NPC
+dew_fild01,209,201,0	duplicate(DewataPalm)	Palm Tree#drink40	CLEAR_NPC
 
-// Traditional Weapon Quest
+// Traditional Weapon Quest :: dewata_weapon
 //============================================================
-dew_fild01,127,240,4	script	Gatti#weapon	813,{
+dew_fild01,127,240,4	script	Gatti#weapon	2_M_OLDBLSMITH,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 10000) {
 		mes "- Hold it right there!! -";
 		mes "- You're carrying too many items and don't have enough inventory space to receive any rewards. -";
@@ -2151,7 +2097,7 @@ dew_fild01,127,240,4	script	Gatti#weapon	813,{
 		}
 		specialeffect2 EF_REPAIRWEAPON;
 		progressbar "0xFFFF00",3;
-		set Zeny, Zeny - 100000;
+		Zeny -= 100000;
 
 		// Socket 3
 		set .@i, rand(4300);
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 20320b078..d17b63267 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -3,10 +3,11 @@
 //===== By: ==================================================
 //= Gennosuke Kouga, Muad_Dib
 //===== Current Version: =====================================
-//= 1.9a
-//===== Compatible With: =====================================
-//= Hercules
+//= 2.3
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
 //===== Description: =========================================
+//= [Official Conversion]
 //= Quest NPCs related to Dewata:
 //== Sapha's Visit, Doha's Secrect Order, Frede's Request,
 //== Department Quests, Document Quests,
@@ -28,11 +29,15 @@
 //= 1.8b Updated "Calyon" NPC and fixed a check. [Euphy]
 //= 1.9 Updated "Fish Tails" with RE coordinates.
 //= 1.9a Minor fix. [Joseph]
+//= 2.0 Fixed variables. [Joseph]
+//= 2.1 Added reset option to "Kareka". [Euphy]
+//= 2.2 Added Izlude duplicates. [Euphy]
+//= 2.3 Added GM management NPCs. [Euphy]
 //============================================================
 
 // Entrance
 //============================================================
-manuk,321,182,5	script	Entrance Manager#ep133	450,{
+manuk,321,182,5	script	Entrance Manager#ep133	4_MAN_GALTUN,{
 	if (!isequipped(2782)) {
 		mes "[Average Galten]";
 		mes "¢¤¡ð¡ú? ¢£ ¡ù¡ð...";
@@ -47,13 +52,13 @@ manuk,321,182,5	script	Entrance Manager#ep133	450,{
 		if(select("Yes.:No.") == 2) {
 			mes "[Entrance Manager]";
 			mes "Then use the tunnel next time.";
-			close; 
+			close;
 		}
 		mes "[Entrance Manager]";
 		mes "Be careful.";
 		close2;
-		warp "dic_dun01",33,212; 
-		end; 
+		warp "dic_dun01",33,212;
+		end;
 	}
 	mes "[Entrance Manager]";
 	mes "Sorry.";
@@ -61,114 +66,127 @@ manuk,321,182,5	script	Entrance Manager#ep133	450,{
 	close;
 }
 
-dic_dun01,266,113,5	script	Curious Sapha#ep13_3_	449,{
+dic_dun01,266,113,5	script	Curious Sapha#ep13_3_	4_MAN_BENKUNI,{
+	if (!isequipped(2782)) {
+		mes "[Curious Sapha]";
+		mes "¡ö¡ñ¡Ð ¡ò ¡õ?";
+		next;
+		mes "- Cannot understand a word. -";
+		close;
+	}
 	mes "[Curious Sapha]";
-	if (isequipped(2782)) {
-		mes "Hello?";
+	mes "Hello?";
+	next;
+	switch(select("What are you doing here?:Buy research items.:Hello!:I want to help your research.")) {
+	case 1:
+		mes "[Curious Sapha]";
+		mes "Do you see that dirty vigilante over there?";
 		next;
-		switch(select("What are you doing here?:Buy research items.:Hello!:I want to help your research.")) {
-			case 1:
-				mes "[Curious Sapha]";
-				mes "Do you see that dirty vigilante over there?";
-				next;
-				mes "[Curious Sapha]";
-				mes "He was attacked by Scarabas after falling into Scaraba Hall.";
-				mes "And he was the only one attacked even with others around him.";
-				next;
-				mes "[Curious Sapha]";
-				mes "I think he slipped and fell on some secretion of the Queen Scaraba. I thought it was an accident was looking into it.";
-				next;
-				mes "[Curious Sapha]";
-				mes "If the research results are correct, the Scarabas are very sensitive to the smell.";
-				mes "Or else say they go crazy over it. Almost as if they were losing it...";
-				next;
-				mes "[Curious Sapha]";
-				mes "I came to research the relationship between the Queen secretion component and the Scarabas.";
-				mes "So I created this into a perfume to carry it easily.";
-				next;
-				mes "[Curious Sapha]";
-				mes "I might be able to use this perfume's reaction to Scarabas and make progress in research.";
-				close;
-			case 2:
-				if (!checkweight(1201,1)) {
-					mes "[Curious Sapha]";
-					mes "You don't seem to have enough space.";
-					close;
-				}
-				if ((MaxWeight - Weight) < 2000) {
-					mes "[Curious Sapha]";
-					mes "Your bags already seem too heavy.";
-					close;
-				}
-				mes "[Curious Sapha]";
-				mes "You want to buy the Scaraba Perfume? A gift for home?";
-				mes "Well, it has become a rare perfume.";
-				next;
-				mes "[Curious Sapha]";
-				mes "I'll give you a deal and sell it by 500 Zeny each. But, try not to carry it with you into Scaraba Hall.";
-				mes "How many do you want? You can buy up to 100.";
-				next;
-				input .@input;
-				set .@deal, 500 * .@input;
-				if (.@deal == 0) {
-					mes "[Curious Sapha]";
-					mes "You changed your mind?";
-					close; 
-				}
-				if (Zeny < .@deal) {
-					mes "[Curious Sapha]";
-					mes "You don't have enough money.";
-					close; 
-				}
-				mes "[Curious Sapha]";
-				mes "Will you buy "+.@input+"?";
-				next;
-				if(select("Yes:No") == 2) {
-					mes "[Curious Sapha]";
-					mes "You changed your mind?";
-					close;
-				}
-				set Zeny, Zeny - .@deal;
-				getitem 6437,.@input; //Scaraba_Perfume
-				mes "[Curious Sapha]";
-				mes "Here you go. Scaraba might flock around you so don't use it near Scaraba Hall.";
-				close;
-			case 3:
-				mes "[Curious Sapha]";
-				mes "Hello? You must be a traveler. This place is dangerous so please find your way out of this tunnel.";
-				close;
-			case 4:
-				mes "[Curious Sapha]";
-				mes "Do you have any useful information?";
-				mes "Please let me know!";
-				input .@str$;
-				next;
-				mes "[Curious Sapha]";
-				mes "It says ^0000FF"+.@str$+"^000000.";
-				next;
-				set .@his_rd_ms, rand(1,3);
-				if (.@his_rd_ms == 1) {
-					mes "[Curious Sapha]";
-					mes "That is great information!";
-					mes "I must start on the research.";
-					close;
-				}
-				else if (.@his_rd_ms == 2) {
-					mes "[Curious Sapha]";
-					mes "I already know about that information but I'm really grateful for you to come all the way here to tell me.";
-					close;
-				}
-				else {
-					mes "[Curious Sapha]";
-					mes "Hmm... do you think so?";
-					mes "I have some doubts about your information. I'll think it over.";
-					close;
-				}
+		mes "[Curious Sapha]";
+		mes "He was attacked by Scarabas after falling into Scaraba Hall.";
+		mes "And he was the only one attacked even with others around him.";
+		next;
+		mes "[Curious Sapha]";
+		mes "I think he slipped and fell on some secretion of the Queen Scaraba. I thought it was an accident was looking into it.";
+		next;
+		mes "[Curious Sapha]";
+		mes "If the research results are correct, the Scarabas are very sensitive to the smell.";
+		mes "Or else say they go crazy over it. Almost as if they were losing it...";
+		next;
+		mes "[Curious Sapha]";
+		mes "I came to research the relationship between the Queen secretion component and the Scarabas.";
+		mes "So I created this into a perfume to carry it easily.";
+		next;
+		mes "[Curious Sapha]";
+		mes "I might be able to use this perfume's reaction to Scarabas and make progress in research.";
+		close;
+	case 2:
+		if (checkweight(1201,1) == 0) {
+			mes "[Curious Sapha]";
+			mes "You don't seem to have enough space.";
+			close;
+		}
+		if (MaxWeight - Weight < 2000) {
+			mes "[Curious Sapha]";
+			mes "Your bags already seem too heavy.";
+			close;
+		}
+		mes "[Curious Sapha]";
+		mes "You want to buy the Scaraba Perfume? A gift for home?";
+		mes "Well, it has become a rare perfume.";
+		next;
+		mes "[Curious Sapha]";
+		mes "I'll give you a deal and sell it by 500 Zeny each. But, try not to carry it with you into Scaraba Hall.";
+		mes "How many do you want? You can buy up to 100.";
+		next;
+		input .@input;
+		set .@deal, 500 * .@input;
+		if (.@deal == 0) {
+			mes "[Curious Sapha]";
+			mes "You changed your mind?";
+			close;
+		}
+		if (Zeny < .@deal) {
+			mes "[Curious Sapha]";
+			mes "You don't have enough money.";
+			close;
+		}
+		mes "[Curious Sapha]";
+		mes "Will you buy "+.@input+"?";
+		next;
+		if(select("Yes:No") == 2) {
+			mes "[Curious Sapha]";
+			mes "You changed your mind?";
+			close;
+		}
+		Zeny -= .@deal;
+		getitem 6437,.@input; //Scaraba_Perfume
+		mes "[Curious Sapha]";
+		mes "Here you go. Scaraba might flock around you so don't use it near Scaraba Hall.";
+		close;
+	case 3:
+		mes "[Curious Sapha]";
+		mes "Hello? You must be a traveler. This place is dangerous so please find your way out of this tunnel.";
+		close;
+	case 4:
+		mes "[Curious Sapha]";
+		mes "Do you have any useful information?";
+		mes "Please let me know!";
+		input .@str$;
+		next;
+		mes "[Curious Sapha]";
+		mes "It says ^0000FF"+.@str$+"^000000.";
+		next;
+		switch(rand(1,3)) {
+		case 1:
+			mes "[Curious Sapha]";
+			mes "That is great information!";
+			mes "I must start on the research.";
+			close;
+		case 2:
+			mes "[Curious Sapha]";
+			mes "I already know about that information but I'm really grateful for you to come all the way here to tell me.";
+			close;
+		case 3:
+			mes "[Curious Sapha]";
+			mes "Hmm... do you think so?";
+			mes "I have some doubts about your information. I'll think it over.";
+			close;
 		}
 	}
-	mes "¡ö¡ñ¡Ð ¡ò ¡õ?";
-	next;
-	mes "- Cannot understand a word. -";
+}
+
+sec_in02,16,43,5	script	Scaraba Dungeon Entrance	4_MAN_BENKUNI,{
+	callfunc "F_GM_NPC";
+	mes "Setting you for dungeon entry.";
+	mes "You will be able to go through if the password is correct.";
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
+		set ep13_3_secret,6;
+		getitem 2782,1; //Ring_Of_Wise_King
+		getitem 6437,2; //Scaraba_Perfume
+		mes "Setting Complete";
+	} else
+		mes "Wrong Password";
 	close;
 }
 
@@ -231,11 +249,11 @@ dic_dun01,266,113,5	script	Curious Sapha#ep13_3_	449,{
 	close;
 
 }
-dic_dun01,286,104,5	duplicate(Vigilante#main)	Vigilante#ep133_23	450
-dic_dun01,294,106,3	duplicate(Vigilante#main)	Vigilante#ep133_24	492
-dic_dun01,30,216,5	duplicate(Vigilante#main)	Vigilante#ep133_26	492
+dic_dun01,286,104,5	duplicate(Vigilante#main)	Vigilante#ep133_23	4_MAN_GALTUN
+dic_dun01,294,106,3	duplicate(Vigilante#main)	Vigilante#ep133_24	4_MAN_GALTUN1
+dic_dun01,30,216,5	duplicate(Vigilante#main)	Vigilante#ep133_26	4_MAN_GALTUN1
 
-dic_dun01,284,102,5	script	Dirty Vigilante#ep13_3	450,{
+dic_dun01,284,102,5	script	Dirty Vigilante#ep13_3	4_MAN_GALTUN,{
 	if (!isequipped(2782)) {
 		mes "[Vigilante]";
 		mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó¢¤¡ö¡ø ¢³ ¡÷¢£¡ü ¡ø ¡Ð¡õ¡û.";
@@ -261,7 +279,7 @@ dic_dun01,284,102,5	script	Dirty Vigilante#ep13_3	450,{
 			next;
 			if (select("Enter after spraying perfume.:Do not enter because it's dangerous.") == 1) {
 				if (!countitem(6437)) {
-					mes "- You Scaraba Perfume disappeared. -";
+					mes "- Your Scaraba Perfume disappeared. -";
 					close;
 				}
 				mes "[Vigilante]";
@@ -278,7 +296,7 @@ dic_dun01,284,102,5	script	Dirty Vigilante#ep13_3	450,{
 		close;
 	}
 	mes "[Vigilante]";
-	mes "Phew, what happened?! Why are they all over me";
+	mes "Phew, what happened?! Why are they all over me?";
 	next;
 	mes "[Vigilante]";
 	mes "I already had bad luck in falling into Scaraba Hall and being drenched with this awful ^FF0000stench^000000 my head is starting to ache!";
@@ -287,7 +305,7 @@ dic_dun01,284,102,5	script	Dirty Vigilante#ep13_3	450,{
 	close;
 }
 
-mid_camp,216,246,0	script	#ep133_event03	139,2,2,{
+mid_camp,216,246,0	script	#ep133_event03	HIDDEN_WARP_NPC,2,2,{
 	end;
 OnTouch:
 	if (ep13_3_secret == 23) {
@@ -316,7 +334,7 @@ OnTouch:
 	end;
 }
 
-mid_camp,218,250,3	script	Suspicious Guy#ep133_	494,{
+mid_camp,218,250,3	script	Suspicious Guy#ep133_	4_M_ROKI,{
 	mes "[Suspicious Guy]";
 	mes ".....";
 	hideonnpc strnpcinfo(0);
@@ -329,14 +347,14 @@ OnEnable:
 	end;
 }
 
--	script	Guard#ep133_11	492,{
+-	script	Guard#ep133_11	4_MAN_GALTUN1,{
 	if (!isequipped(2782)) {
 		mes "[Capital City Guard]";
 		mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó?";
 		mes "¡ð¡ú¢± ¡ô ¡ò¡õ¡ú ¡õ..!";
 		next;
 		mes "- Cannot communicate with him. -";
-		close;	
+		close;
 	}
 	if (ep13_3_invite < 4) {
 		mes "[Capital City Guard]";
@@ -388,10 +406,10 @@ OnEnable:
 	mes "Please inquiry with a GM.";
 	close;
 }
-dic_fild01,146,281,5	duplicate(Guard#ep133_11)	Capital City Guard#1	492
-dic_fild01,153,281,3	duplicate(Guard#ep133_11)	Capital City Guard#2	450
+dic_fild01,146,281,5	duplicate(Guard#ep133_11)	Capital City Guard#1	4_MAN_GALTUN1
+dic_fild01,153,281,3	duplicate(Guard#ep133_11)	Capital City Guard#2	4_MAN_GALTUN
 
-dic_in01,254,119,0	script	Item Storage#01	844,{
+dic_in01,254,119,0	script	Item Storage#01	CLEAR_NPC,{
 	mes "This is the item storage.";
 	mes "There is some writing on the paper.";
 	next;
@@ -408,35 +426,47 @@ dic_in01,254,119,0	script	Item Storage#01	844,{
 	if(select("Use safe:No way.")==2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I will use it later.";
-		close; 
+		close;
 	}
 	if (Zeny < 500) {
 		mes "Not enough Zeny.";
-		close; 
+		close;
 	}
-	set Zeny, Zeny-500;
+	Zeny -= 500;
 	close2;
 	openstorage;
 	end;
 }
 
+sec_in02,10,42,1	script	13.3 Related Reset	4_MAN_BENKUNI,{
+	callfunc "F_GM_NPC";
+	mes "[Reset]";
+	mes "Resets all quest windows including daily and map quests for 13.3.";
+	freeloop(1);
+	for(set .@i,12099; .@i<=12216; set .@i,.@i+1) {
+		if (checkquest(.@i) > -1)
+			erasequest .@i;
+	}
+	freeloop(0);
+	close;
+}
+
 // Civil Services
 //============================================================
-
 function	script	que_dic	{
 	if (!getarg(0)) {
 		if (checkquest(getarg(1),HUNTING) != 2) return;
-		mes getarg(3); 
+		mes getarg(3);
 	}
 	else if (getarg(0) == 1) {
 		if (checkquest(getarg(1)) == -1) return;
 		if (countitem(getarg(3)) < getarg(4)) {
 			mes "It looks like you are short on the amount.";
-			close; 
+			close;
 		}
-		mes getarg(5); 
+		mes getarg(5);
 		mes getarg(6,"");
-		delitem getarg(3), getarg(4); 
+		delitem getarg(3), getarg(4);
 	}
 	else if (getarg(0) == 2) {
 		for(set .@i,1; .@i<getargcount(); set .@i,.@i+1) {
@@ -452,7 +482,7 @@ function	script	que_dic	{
 	close;
 }
 
-dic_in01,48,263,5	script	Hunting Dept. 1 Manager	449,{
+dic_in01,48,263,5	script	Hunting Dept. 1 Manager	4_MAN_BENKUNI,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -522,7 +552,7 @@ dic_in01,48,263,5	script	Hunting Dept. 1 Manager	449,{
 	close;
 }
 
-dic_in01,51,266,6	script	Hunting Dept. 2 Manager	449,{
+dic_in01,51,266,6	script	Hunting Dept. 2 Manager	4_MAN_BENKUNI,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -591,7 +621,7 @@ dic_in01,51,266,6	script	Hunting Dept. 2 Manager	449,{
 	close;
 }
 
-dic_in01,51,270,7	script	Supply Dept. 1 Manager	449,{
+dic_in01,51,270,7	script	Supply Dept. 1 Manager	4_MAN_BENKUNI,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -662,7 +692,7 @@ dic_in01,51,270,7	script	Supply Dept. 1 Manager	449,{
 	close;
 }
 
-dic_in01,48,273,8	script	Supply Dept. 2 Manager	449,{
+dic_in01,48,273,8	script	Supply Dept. 2 Manager	4_MAN_BENKUNI,{
 	if (!checkweight(1201,1)) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -729,7 +759,7 @@ dic_in01,48,273,8	script	Supply Dept. 2 Manager	449,{
 	close;
 }
 
-dic_in01,43,273,1	script	Transport Dept. 1 Mgr	449,{
+dic_in01,43,273,1	script	Transport Dept. 1 Mgr	4_MAN_BENKUNI,{
 	if (!checkweight(1201,1)) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -782,18 +812,18 @@ dic_in01,43,273,1	script	Transport Dept. 1 Mgr	449,{
 	next;
 	mes "[Transport Dept. 1 Manager]";
 	set .@s$, "Quantity check finished. Ahhh, you going to rest? Then why don't you visit the famous pub of the Capital? They have no yummy food though....";
-	que_dic(1,12137,30000,7143,4,.@s);
-	que_dic(1,12138,25000,744,5,.@s);
-	que_dic(1,12139,47500,748,1,.@s);
-	que_dic(1,12140,27500,736,15,.@s);
-	que_dic(1,12141,27000,746,10,.@s);
-	que_dic(1,12142,27500,740,15,.@s);
-	que_dic(1,12143,21600,925,50,.@s);
-	que_dic(1,12144,21400,965,50,.@s);
-	que_dic(1,12145,20900,964,20,.@s);
-	que_dic(1,12146,22400,911,30,.@s);
-	que_dic(1,12147,20800,910,40,.@s);
-	mes "Um......What do you want me to do?";
+	que_dic(1,12137,30000,7143,4,.@s$);
+	que_dic(1,12138,25000,744,5,.@s$);
+	que_dic(1,12139,47500,748,1,.@s$);
+	que_dic(1,12140,27500,736,15,.@s$);
+	que_dic(1,12141,27000,746,10,.@s$);
+	que_dic(1,12142,27500,740,15,.@s$);
+	que_dic(1,12143,21600,925,50,.@s$);
+	que_dic(1,12144,21400,965,50,.@s$);
+	que_dic(1,12145,20900,964,20,.@s$);
+	que_dic(1,12146,22400,911,30,.@s$);
+	que_dic(1,12147,20800,910,40,.@s$);
+	mes "Um...... What do you want me to do?";
 	next;
 	mes "[Transport Dept. 1 Manager]";
 	mes "....";
@@ -803,7 +833,7 @@ dic_in01,43,273,1	script	Transport Dept. 1 Mgr	449,{
 	close;
 }
 
-dic_in01,40,270,2	script	Transport Dept. 2 Mgr	449,{
+dic_in01,40,270,2	script	Transport Dept. 2 Mgr	4_MAN_BENKUNI,{
 	if (!checkweight(1201,1)) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -872,7 +902,7 @@ dic_in01,40,270,2	script	Transport Dept. 2 Mgr	449,{
 }
 
 
-dic_in01,40,193,1	script	Papyrus#0001	453,{
+dic_in01,40,193,1	script	Papyrus#0001	4_MAN_NITT,{
 	if (!checkweight(1201,1)) {
 		mes "You have too many items in your inventory.";
 		close;
@@ -982,7 +1012,6 @@ dic_in01,40,193,1	script	Papyrus#0001	453,{
 
 // Document Packages
 //============================================================
-
 -	script	Document Package#main	-1,{
 	function	eldicastes_dp;
 	if (isequipped(2782) < 1) {
@@ -1015,7 +1044,7 @@ dic_in01,40,193,1	script	Papyrus#0001	453,{
 	} else if (.@doc > 60 && .@doc <= 70) {
 		mes "You suddenly feel nauseated. You feel like this won't go away any time soon. Finding the documents will have to wait.";
 		setquest 12165;
-		close; 
+		close;
 	}
 	else if (.@doc == 1) eldicastes_dp(12209,"Horn","Hard wedge-like horn from some insects. Doesn't have much practical use.","");
 	else if (.@doc == 2) eldicastes_dp(12195,"Horrendous Mouth","Tooth from a dead body.","Important material for research on time of death and health conditions. Useful in discovering human ecology.");
@@ -1080,17 +1109,16 @@ dic_in01,40,193,1	script	Papyrus#0001	453,{
 		mes "You've found a document about ^990099"+getarg(1)+"^000000. Check for details in the ^800080Quest Window^000000.";
 		specialeffect2 EF_STEAL;
 		setquest getarg(0);
-		close; 
+		close;
 	}
 }
-dic_in01,31,192,0	duplicate(Document Package#main)	Document Package#0001	844
-dic_in01,31,187,0	duplicate(Document Package#main)	Document Package#0002	844
-dic_in01,25,192,0	duplicate(Document Package#main)	Document Package#0003	844
-dic_in01,25,187,0	duplicate(Document Package#main)	Document Package#0004	844
+dic_in01,31,192,0	duplicate(Document Package#main)	Document Package#0001	CLEAR_NPC
+dic_in01,31,187,0	duplicate(Document Package#main)	Document Package#0002	CLEAR_NPC
+dic_in01,25,192,0	duplicate(Document Package#main)	Document Package#0003	CLEAR_NPC
+dic_in01,25,187,0	duplicate(Document Package#main)	Document Package#0004	CLEAR_NPC
 
 // Unknown Relics
 //============================================================
-
 function	script	unknown_d	{
 	if (checkquest(getarg(0)) == -1) {
 		mes "You see some traces of digging.";
@@ -1111,57 +1139,62 @@ function	script	unknown_d	{
 	}
 	close;
 }
-prt_fild09,371,255,0	script	Reptile Tongues	844,{ unknown_d(12167,903); }
-prt_fild09,352,241,0	script	Scorpion Tails	844,{ unknown_d(12168,904); }
-pay_fild02,177,108,0	script	Stems	844,{ unknown_d(12169,905); }
-pay_fild02,105,113,0	script	Pointed Scales	844,{ unknown_d(12170,906); }
-pay_fild01,152,171,0	script	Resin	844,{ unknown_d(12171,907); }
-gef_fild01,104,111,0	script	Spawn	844,{ unknown_d(12172,908); }
-prt_fild08,299,332,0	script	Jellopy	844,{ unknown_d(12173,909); }
-izlude,136,160,0	script	Fish Tails	844,{ unknown_d(12174,1023); }	// Pre-RE: izlude (132,136)
-prt_fild05,303,169,0	script	Worm Peelings	844,{ unknown_d(12175,955); }
-iz_dun03,155,165,0	script	Gills	844,{ unknown_d(12176,956); }
-mjo_dun01,222,226,0	script	Tooth of Bat	844,{ unknown_d(12177,913); }
-prt_fild06,182,290,0	script	Fluff	844,{ unknown_d(12178,914); }
-prt_fild06,127,85,0	script	Chrysalis	844,{ unknown_d(12179,915); }
-moc_fild07,201,360,0	script	Feather of Bird	844,{ unknown_d(12180,916); }
-moc_fild12,116,122,0	script	Talons	844,{ unknown_d(12181,917); }
-prt_fild04,315,245,0	script	Sticky Webfoot	844,{ unknown_d(12182,918); }
-mjolnir_08,108,99,0	script	Animal Skin	844,{ unknown_d(12183,919); }
-moc_fild03,175,201,0	script	Wolf Claws	844,{ unknown_d(12184,920); }
-pay_fild08,188,153,0	script	Mushroom Spores	844,{ unknown_d(12185,921); }
-gef_fild03,251,109,0	script	Orc's Fangs	844,{ unknown_d(12186,922); }
-c_tower2,170,9,0	script	Evil Horns	844,{ unknown_d(12187,923); }
-gef_fild05,111,96,0	script	Powder of Butterfly	844,{ unknown_d(12188,924); }
-moc_fild11,237,273,0	script	Bill of Birds	844,{ unknown_d(12189,925); }
-pay_fild06,306,233,0	script	Snake Scales	844,{ unknown_d(12190,926); }
-pay_fild07,126,49,0	script	Insect Feelers	844,{ unknown_d(12191,928); }
-iz_dun02,112,96,0	script	Immortal Hearts	844,{ unknown_d(12192,929); }
-moc_pryd02,134,112,0	script	Rotten Bandages	844,{ unknown_d(12193,930); }
-moc_pryd02,36,75,0	script	Decayed Nails	844,{ unknown_d(12194,957); }
-moc_pryd02,148,184,0	script	Horrendous Mouths	844,{ unknown_d(12195,958); }
-iz_dun01,210,77,0	script	Tentacles	844,{ unknown_d(12196,962); }
-iz_dun01,191,92,0	script	Shells	844,{ unknown_d(12197,935); }
-mjolnir_04,191,154,0	script	Scale Shells	844,{ unknown_d(12198,936); }
-mjolnir_04,162,168,0	script	Venom Canines	844,{ unknown_d(12199,937); }
-prt_fild02,102,97,0	script	Sticky Mucus	844,{ unknown_d(12200,938); }
-mjolnir_09,99,100,0	script	Bee Stings	844,{ unknown_d(12201,939); }
-prt_fild07,76,122,0	script	Grasshopper's Legs	844,{ unknown_d(12202,940); }
-prt_fild03,64,35,0	script	Royal Jelly	844,{ unknown_d(12203,526); }
-prt_fild03,180,163,0	script	Yoyo Tails	844,{ unknown_d(12204,942); }
-prt_fild03,226,170,0	script	Solid Shells	844,{ unknown_d(12205,943); }
-prt_fild03,262,201,0	script	Nice Sweet Potato	844,{ unknown_d(12206,549); }
-prt_fild03,284,190,0	script	Raccoon Leaf	844,{ unknown_d(12207,945); }
-gef_fild09,67,46,0	script	Snail's Shells	844,{ unknown_d(12208,946); }
-prt_fild03,366,237,0	script	Horns	844,{ unknown_d(12209,947); }
-pay_fild07,269,164,0	script	Bear's Footskin	844,{ unknown_d(12210,948); }
-prt_fild02,142,116,0	script	Feathers	844,{ unknown_d(12211,949); }
-prt_fild02,97,209,0	script	Red Herbs	844,{ unknown_d(12212,507); }
-prt_fild02,280,328,0	script	Carrots	844,{ unknown_d(12213,515); }
-moc_fild01,169,62,0	script	Cactus Needles	844,{ unknown_d(12214,952); }
-cmd_fild08,324,163,0	script	Stone Hearts	844,{ unknown_d(12215,953); }
+prt_fild03,144,95,0	script	Tree Roots	CLEAR_NPC,{ unknown_d(12166,902); }
+prt_fild09,371,255,0	script	Reptile Tongues	CLEAR_NPC,{ unknown_d(12167,903); }
+prt_fild09,352,241,0	script	Scorpion Tails	CLEAR_NPC,{ unknown_d(12168,904); }
+pay_fild02,177,108,0	script	Stems	CLEAR_NPC,{ unknown_d(12169,905); }
+pay_fild02,105,113,0	script	Pointed Scales	CLEAR_NPC,{ unknown_d(12170,906); }
+pay_fild01,152,171,0	script	Resin	CLEAR_NPC,{ unknown_d(12171,907); }
+gef_fild01,104,111,0	script	Spawn	CLEAR_NPC,{ unknown_d(12172,908); }
+prt_fild08,299,332,0	script	Jellopy	CLEAR_NPC,{ unknown_d(12173,909); }
+izlude,136,160,0	script	Fish Tails	CLEAR_NPC,{ unknown_d(12174,1023); }	// Old coordinates: (132,136)
+izlude_a,136,160,0	script	Fish Tails#a	CLEAR_NPC,{ unknown_d(12174,1023); }
+izlude_b,136,160,0	script	Fish Tails#b	CLEAR_NPC,{ unknown_d(12174,1023); }
+izlude_c,136,160,0	script	Fish Tails#c	CLEAR_NPC,{ unknown_d(12174,1023); }
+izlude_d,136,160,0	script	Fish Tails#d	CLEAR_NPC,{ unknown_d(12174,1023); }
+prt_fild05,303,169,0	script	Worm Peelings	CLEAR_NPC,{ unknown_d(12175,955); }
+iz_dun03,155,165,0	script	Gills	CLEAR_NPC,{ unknown_d(12176,956); }
+mjo_dun01,222,226,0	script	Tooth of Bat	CLEAR_NPC,{ unknown_d(12177,913); }
+prt_fild06,182,290,0	script	Fluff	CLEAR_NPC,{ unknown_d(12178,914); }
+prt_fild06,127,85,0	script	Chrysalis	CLEAR_NPC,{ unknown_d(12179,915); }
+moc_fild07,201,360,0	script	Feather of Bird	CLEAR_NPC,{ unknown_d(12180,916); }
+moc_fild12,116,122,0	script	Talons	CLEAR_NPC,{ unknown_d(12181,917); }
+prt_fild04,315,245,0	script	Sticky Webfoot	CLEAR_NPC,{ unknown_d(12182,918); }
+mjolnir_08,108,99,0	script	Animal Skin	CLEAR_NPC,{ unknown_d(12183,919); }
+moc_fild03,175,201,0	script	Wolf Claws	CLEAR_NPC,{ unknown_d(12184,920); }
+pay_fild08,188,153,0	script	Mushroom Spores	CLEAR_NPC,{ unknown_d(12185,921); }
+gef_fild03,251,109,0	script	Orc's Fangs	CLEAR_NPC,{ unknown_d(12186,922); }
+c_tower2,170,9,0	script	Evil Horns	CLEAR_NPC,{ unknown_d(12187,923); }
+gef_fild05,111,96,0	script	Powder of Butterfly	CLEAR_NPC,{ unknown_d(12188,924); }
+moc_fild11,237,273,0	script	Bill of Birds	CLEAR_NPC,{ unknown_d(12189,925); }
+pay_fild06,306,233,0	script	Snake Scales	CLEAR_NPC,{ unknown_d(12190,926); }
+pay_fild07,126,49,0	script	Insect Feelers	CLEAR_NPC,{ unknown_d(12191,928); }
+iz_dun02,112,96,0	script	Immortal Hearts	CLEAR_NPC,{ unknown_d(12192,929); }
+moc_pryd02,134,112,0	script	Rotten Bandages	CLEAR_NPC,{ unknown_d(12193,930); }
+moc_pryd02,36,75,0	script	Decayed Nails	CLEAR_NPC,{ unknown_d(12194,957); }
+moc_pryd02,148,184,0	script	Horrendous Mouths	CLEAR_NPC,{ unknown_d(12195,958); }
+iz_dun01,210,77,0	script	Tentacles	CLEAR_NPC,{ unknown_d(12196,962); }
+iz_dun01,191,92,0	script	Shells	CLEAR_NPC,{ unknown_d(12197,935); }
+mjolnir_04,191,154,0	script	Scale Shells	CLEAR_NPC,{ unknown_d(12198,936); }
+mjolnir_04,162,168,0	script	Venom Canines	CLEAR_NPC,{ unknown_d(12199,937); }
+prt_fild02,102,97,0	script	Sticky Mucus	CLEAR_NPC,{ unknown_d(12200,938); }
+mjolnir_09,99,100,0	script	Bee Stings	CLEAR_NPC,{ unknown_d(12201,939); }
+prt_fild07,76,122,0	script	Grasshopper's Legs	CLEAR_NPC,{ unknown_d(12202,940); }
+prt_fild03,64,35,0	script	Royal Jelly	CLEAR_NPC,{ unknown_d(12203,526); }
+prt_fild03,180,163,0	script	Yoyo Tails	CLEAR_NPC,{ unknown_d(12204,942); }
+prt_fild03,226,170,0	script	Solid Shells	CLEAR_NPC,{ unknown_d(12205,943); }
+prt_fild03,262,201,0	script	Nice Sweet Potato	CLEAR_NPC,{ unknown_d(12206,549); }
+prt_fild03,284,190,0	script	Raccoon Leaf	CLEAR_NPC,{ unknown_d(12207,945); }
+gef_fild09,67,46,0	script	Snail's Shells	CLEAR_NPC,{ unknown_d(12208,946); }
+prt_fild03,366,237,0	script	Horns	CLEAR_NPC,{ unknown_d(12209,947); }
+pay_fild07,269,164,0	script	Bear's Footskin	CLEAR_NPC,{ unknown_d(12210,948); }
+prt_fild02,142,116,0	script	Feathers	CLEAR_NPC,{ unknown_d(12211,949); }
+prt_fild02,97,209,0	script	Red Herbs	CLEAR_NPC,{ unknown_d(12212,507); }
+prt_fild02,280,328,0	script	Carrots	CLEAR_NPC,{ unknown_d(12213,515); }
+moc_fild01,169,62,0	script	Cactus Needles	CLEAR_NPC,{ unknown_d(12214,952); }
+cmd_fild08,324,163,0	script	Stone Hearts	CLEAR_NPC,{ unknown_d(12215,953); }
 
-dic_in01,138,225,3	script	Diel Guard#ep133_19	492,{
+dic_in01,138,225,3	script	Diel Guard#ep133_19	4_MAN_GALTUN1,{
 	if (!isequipped(2782)) {
 		mes "[Diel Guard]";
 		mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó?";
@@ -1218,13 +1251,13 @@ dic_in01,138,225,3	script	Diel Guard#ep133_19	492,{
 	close;
 }
 
-dic_in01,242,182,0	script	Elevator#5f_to_4f	844,{
+dic_in01,242,182,0	script	Elevator#5f_to_4f	CLEAR_NPC,{
 	select("Administrative Office");
 	warp "dic_in01",138,221;
 	end;
 }
 
-dic_in01,263,193,3	script	Diel Guard#ep133_20	450,{
+dic_in01,263,193,3	script	Diel Guard#ep133_20	4_MAN_GALTUN,{
 	if (!isequipped(2782)) {
 		mes "[Diel Guard]";
 		mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó?";
@@ -1278,14 +1311,14 @@ dic_in01,263,193,3	script	Diel Guard#ep133_20	450,{
 	close;
 }
 
-dic_in01,299,268,0	script	#ep133_event01	139,4,4,{
+dic_in01,299,268,0	script	#ep133_event01	HIDDEN_WARP_NPC,4,4,{
 	end;
 OnTouch:
 	if (ep13_3_secret == 13) {
 		mes "As soon as you enter the room, someone";
 		mes "pushes down your head to force you to bow.";
 		soundeffect "wander_man_move.wav",0;
-		sc_start SC_Blind,60000,0;
+		sc_start SC_BLIND,60000,0;
 		next;
 		mes "[Ringing Voice]";
 		mes "That is fine, Cheshire.";
@@ -1298,7 +1331,7 @@ OnTouch:
 		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),1;
 		mes "You hold up your head at the sound of Ahat's voice";
 		mes "But you see a human in high-ranking Sapha clothing in front of you.";
-		sc_end SC_Blind;
+		sc_end SC_BLIND;
 		emotion e_omg,1;
 		set ep13_3_secret, 14;
 		erasequest 7198;
@@ -1308,7 +1341,7 @@ OnTouch:
 	end;
 }
 
-dic_in01,294,276,5	script	Secret Adjutant#ep133_2	498,{
+dic_in01,294,276,5	script	Secret Adjutant#ep133_2	4_M_CATMAN2,{
 	// if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) {
 	if ((MaxWeight - Weight) < 1000) {
 		mes "- You can too many items to proceed with the quest. -";
@@ -1472,7 +1505,7 @@ dic_in01,294,276,5	script	Secret Adjutant#ep133_2	498,{
 	end;
 }
 
-dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
+dic_in01,300,280,5	script	Minister Ahat#ep133_21	4_HUMAN_GERUTOO,{
 	// if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) {
 	if ((MaxWeight - Weight) < 1000) {
 		mes "- You can too many items to proceed with the quest. -";
@@ -1490,7 +1523,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 		mes "As soon as you try to approach Ahat, someone";
 		mes "pushes down your head to force you to bow.";
 		soundeffect "wander_man_move.wav",0;
-		SC_Start SC_Blind,60000,0;
+		sc_start SC_BLIND,60000,0;
 		next;
 		mes "[Ringing Voice]";
 		mes "That is fine, Cheshire.";
@@ -1503,7 +1536,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2;
 		mes "You hold up your head at the sound of Ahat's voice";
 		mes "But you see a human in high-ranking Sapha clothing in front of you.";
-		SC_End SC_Blind;
+		sc_end SC_BLIND;
 		emotion e_omg,1;
 		set ep13_3_secret, 14;
 		erasequest 7198;
@@ -1759,7 +1792,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 	end;
 }
 
-dic_in01,138,188,0	script	#ep133_event02	139,4,4,{
+dic_in01,138,188,0	script	#ep133_event02	HIDDEN_WARP_NPC,4,4,{
 OnTouch:
 	if (ep13_3_secret == 19) {
 		if (!isequipped(2782)) {
@@ -1773,12 +1806,12 @@ OnTouch:
 			mes "Just a moment.";
 		}
 		close2;
-		warp "dic_in01",155,188; 
+		warp "dic_in01",155,188;
 	}
 	end;
 }
 
-dic_in01,158,188,3	script	Jarute HesLanta#ep133_2	451,{
+dic_in01,158,188,3	script	Jarute HesLanta#ep133_2	4_MAN_JERUTOO,{
 	if (!isequipped(2782)) {
 		mes "[Jarute HesLanta]";
 		mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó?";
@@ -2281,7 +2314,7 @@ dic_in01,158,188,3	script	Jarute HesLanta#ep133_2	451,{
 	close;
 }
 
-dicastes01,223,190,1	script	Calyon#pa8029	453,{
+dicastes01,223,190,1	script	Calyon#pa8029	4_MAN_NITT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -2454,7 +2487,7 @@ dicastes01,223,190,1	script	Calyon#pa8029	453,{
 	close;
 }
 
-dicastes01,211,178,2	script	Moltuka#pa0829	453,{
+dicastes01,211,178,2	script	Moltuka#pa0829	4_MAN_NITT,{
 	if (!checkweight(1201,1)) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -2678,7 +2711,7 @@ dicastes01,211,178,2	script	Moltuka#pa0829	453,{
 	}
 }
 
-dicastes01,175,217,5	script	Kalipo#pa0829	453,{
+dicastes01,175,217,5	script	Kalipo#pa0829	4_MAN_NITT,{
 	if (!checkweight(1201,1)) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -2820,7 +2853,7 @@ dicastes01,175,217,5	script	Kalipo#pa0829	453,{
 	}
 }
 
-dicastes01,187,230,5	script	Laponte#pa0829	453,{
+dicastes01,187,230,5	script	Laponte#pa0829	4_MAN_NITT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -2991,7 +3024,7 @@ dicastes01,187,230,5	script	Laponte#pa0829	453,{
 	}
 }
 
-dicastes01,208,230,3	script	Pura#pa0829	453,{
+dicastes01,208,230,3	script	Pura#pa0829	4_MAN_NITT,{
 	if (!checkweight(1201,1)) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -3182,7 +3215,7 @@ dicastes01,208,230,3	script	Pura#pa0829	453,{
 	close;
 }
 
-dicastes01,225,211,3	script	Tragis#pa0829	453,{
+dicastes01,225,211,3	script	Tragis#pa0829	4_MAN_NITT,{
 	if (!checkweight(1201,1)) {
 		mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
 		close;
@@ -3354,10 +3387,8 @@ dicastes01,225,211,3	script	Tragis#pa0829	453,{
 
 // Doha's Secret Orders
 //============================================================
-
-mid_campin,168,170,3	script	Inspector Doha#ep133	59,{
-//	if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) {
-	if ((MaxWeight - Weight) < 1000) {
+mid_campin,168,170,3	script	Inspector Doha#ep133	1_M_ORIENT01,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- You can too many items to proceed with the quest. -";
 		close;
 	}
@@ -3636,7 +3667,7 @@ mid_campin,168,170,3	script	Inspector Doha#ep133	59,{
 	close;
 }
 
-dic_in01,245,119,4	script	Shay#ep133_13	884,{
+dic_in01,245,119,4	script	Shay#ep133_13	4_M_ACROSS,{
 	// if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) {
 	if ((MaxWeight - Weight) < 1000) {
 		mes "- You can too many items to proceed with the quest. -";
@@ -3645,11 +3676,11 @@ dic_in01,245,119,4	script	Shay#ep133_13	884,{
 	cutin "ep13_shy",2;
 	mes "[Shay]";
 	switch (rand(1,5)) {
-		Case 1: mes ".. Burman Flone."; break;
-		Case 2: mes "What?"; break;
-		Case 3: mes "Boring. What is it?"; break;
-		Case 4: mes "Sigh... Ready to order?"; break;
-		Case 5:
+		case 1: mes ".. Burman Flone."; break;
+		case 2: mes "What?"; break;
+		case 3: mes "Boring. What is it?"; break;
+		case 4: mes "Sigh... Ready to order?"; break;
+		case 5:
 			mes "Another failure?.";
 			mes "I'm talking to myself. Don't bother.";
 			mes "What do you want?";
@@ -3662,7 +3693,7 @@ dic_in01,245,119,4	script	Shay#ep133_13	884,{
 			mes "What will it be?";
 			mes "I have Tropical Sograt and Vermilion on the Beach flown in from Morroc.";
 			mes "A bit on the expensive side though.";
-			next;		
+			next;
 			if (select("Tropical Sorgrat - 2000z:Vermilion on the Beach - 2000z:Anything else?") == 3) {
 				mes "[Shay]";
 				mes "Here.. ";
@@ -3675,7 +3706,7 @@ dic_in01,245,119,4	script	Shay#ep133_13	884,{
 			if (Zeny > 1999) {
 				mes "[Shay]";
 				mes "Here is your "+.@str$[@menu]+".";
-				set Zeny, Zeny - 2000;
+				Zeny -= 2000;
 				getitem .@item[@menu],1; //Tropical_Sograt
 				break;
 			}
@@ -3808,7 +3839,7 @@ dic_in01,245,119,4	script	Shay#ep133_13	884,{
 				mes "What is it now?";
 				mes "Any luck?";
 				next;
-				setarray .@ward$, 
+				setarray .@ward$,
 					"7188","The Knits at the square are interested in Ahat.",
 					"7189","I heard from Pioms that most of the Saphas are interested in the minister.",
 					"7190","Galtens are interested in the Cat Merchant for their cat ears.";
@@ -4259,7 +4290,7 @@ dic_in01,245,119,4	script	Shay#ep133_13	884,{
 	end;
 }
 
-dicastes01,207,210,5	script	Walking Knit#ep133_15	449,{
+dicastes01,207,210,5	script	Walking Knit#ep133_15	4_MAN_BENKUNI,{
 	if (!isequipped(2782)) {
 		mes "[Knit]";
 		mes "¡õ¢£¡ô";
@@ -4357,7 +4388,7 @@ dicastes01,207,210,5	script	Walking Knit#ep133_15	449,{
 	close2;
 }
 
-dicastes01,112,248,5	script	Resting Piom#ep133_16	491,{
+dicastes01,112,248,5	script	Resting Piom#ep133_16	4_MAN_PIOM5,{
 	mes "[Piom]";
 	if (!isequipped(2782)) {
 		mes "¡ñ¡÷¢¤ ¡ö ¢±¡ñ¡ú?";
@@ -4430,7 +4461,7 @@ dicastes01,112,248,5	script	Resting Piom#ep133_16	491,{
 	close;
 }
 
-dicastes01,249,140,3	script	Training Galten#ep133_17	450,{
+dicastes01,249,140,3	script	Training Galten#ep133_17	4_MAN_GALTUN,{
 	if (!isequipped(2782)) {
 		mes "[Galten]";
 		mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü";
@@ -4502,7 +4533,7 @@ dicastes01,249,140,3	script	Training Galten#ep133_17	450,{
 	close;
 }
 
-dic_fild01,231,174,5	script	BK#ep133_18	496,{
+dic_fild01,231,174,5	script	BK#ep133_18	4_M_MERCAT2,{
 	if (ep13_3_secret < 3) {
 		mes "[BK]";
 		mes "Ha. I'm the information collector of the Cat Merchants.";
@@ -4810,7 +4841,7 @@ dic_fild01,231,174,5	script	BK#ep133_18	496,{
 		set ep13_3_secret, 11;
 		getitem .@item[.@type], 1;
 		erasequest 7193;
-		setquest 7194;		
+		setquest 7194;
 		donpcevent strnpcinfo(0)+"::OnDisable";
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -4871,7 +4902,7 @@ dic_fild01,231,174,5	script	BK#ep133_18	496,{
 			}
 			if (.@npc$[.@type] == "Rock Pile") mes "You collect another stone fragment that emits a strange magical force.";
 			else if (.@npc$[.@type] == "Dirt Pile") mes "You collect another clotted bloodstain from a dirt pile.";
-			else if (.@npc$[.@type] == "Split Earth") mes "You collect another piece of skin frozen in the frost in the crack of the split earth.";	
+			else if (.@npc$[.@type] == "Split Earth") mes "You collect another piece of skin frozen in the frost in the crack of the split earth.";
 			getitem .@item[.@type], 1;
 			donpcevent strnpcinfo(0)+"::OnDisable";
 			close;
@@ -4929,40 +4960,40 @@ OnTimer300000:
 	stopnpctimer;
 	end;
 }
-dic_fild02,269,55,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef1	844
-dic_fild02,236,29,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef2	844
-dic_fild02,220,34,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef3	844
-dic_fild02,228,55,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef4	844
-dic_fild02,228,63,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef5	844
-dic_fild02,210,75,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef6	844
-dic_fild02,213,35,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef7	844
-dic_fild02,171,49,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef8	844
-dic_fild02,266,44,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef9	844
-dic_fild02,174,79,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef10	844
-dic_fild02,215,85,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef1	844
-dic_fild02,207,41,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef2	844
-dic_fild02,232,41,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef3	844
-dic_fild02,245,68,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef4	844
-dic_fild02,184,63,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef5	844
-dic_fild02,207,94,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef6	844
-dic_fild02,230,71,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef7	844
-dic_fild02,188,50,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef8	844
-dic_fild02,248,36,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef9	844
-dic_fild02,206,115,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef10	844	
-dic_fild02,194,86,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef1	844
-dic_fild02,240,51,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef2	844
-dic_fild02,176,65,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef3	844
-dic_fild02,254,45,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef4	844
-dic_fild02,178,119,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef5	844
-dic_fild02,200,81,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef6	844
-dic_fild02,205,54,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef7	844
-dic_fild02,224,74,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef8	844
-dic_fild02,244,59,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef9	844
-dic_fild02,249,43,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef10	844
+dic_fild02,269,55,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef1	CLEAR_NPC
+dic_fild02,236,29,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef2	CLEAR_NPC
+dic_fild02,220,34,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef3	CLEAR_NPC
+dic_fild02,228,55,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef4	CLEAR_NPC
+dic_fild02,228,63,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef5	CLEAR_NPC
+dic_fild02,210,75,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef6	CLEAR_NPC
+dic_fild02,213,35,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef7	CLEAR_NPC
+dic_fild02,171,49,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef8	CLEAR_NPC
+dic_fild02,266,44,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef9	CLEAR_NPC
+dic_fild02,174,79,0	duplicate(ep133_crack#main)	Rock Pile#ep133_ef10	CLEAR_NPC
+dic_fild02,215,85,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef1	CLEAR_NPC
+dic_fild02,207,41,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef2	CLEAR_NPC
+dic_fild02,232,41,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef3	CLEAR_NPC
+dic_fild02,245,68,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef4	CLEAR_NPC
+dic_fild02,184,63,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef5	CLEAR_NPC
+dic_fild02,207,94,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef6	CLEAR_NPC
+dic_fild02,230,71,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef7	CLEAR_NPC
+dic_fild02,188,50,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef8	CLEAR_NPC
+dic_fild02,248,36,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef9	CLEAR_NPC
+dic_fild02,206,115,0	duplicate(ep133_crack#main)	Dirt Pile#ep133_ef10	CLEAR_NPC
+dic_fild02,194,86,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef1	CLEAR_NPC
+dic_fild02,240,51,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef2	CLEAR_NPC
+dic_fild02,176,65,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef3	CLEAR_NPC
+dic_fild02,254,45,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef4	CLEAR_NPC
+dic_fild02,178,119,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef5	CLEAR_NPC
+dic_fild02,200,81,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef6	CLEAR_NPC
+dic_fild02,205,54,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef7	CLEAR_NPC
+dic_fild02,224,74,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef8	CLEAR_NPC
+dic_fild02,244,59,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef9	CLEAR_NPC
+dic_fild02,249,43,0	duplicate(ep133_crack#main)	Split Earth#ep133_ef10	CLEAR_NPC
 
 // Frede's Request
 //============================================================
-dicastes01,117,262,0	script	Frede#13_3	491,2,2,{
+dicastes01,117,262,0	script	Frede#13_3	4_MAN_PIOM5,2,2,{
 	if (isequipped(2782)) {
 		if (ep13_3_invite <= 5) {
 			mes "[Frede]";
@@ -5008,7 +5039,7 @@ dicastes01,117,262,0	script	Frede#13_3	491,2,2,{
 		close;
 	}
 	mes "[Frede]";
-	mes "¢£¡ô¡ñ ¡û"; 
+	mes "¢£¡ô¡ñ ¡û";
 	mes "¡ú¡ö¡ø ¢£ ¡ô";
 	close;
 OnTouch:
@@ -5020,7 +5051,7 @@ OnTouch:
 	end;
 }
 
-dic_in01,165,104,0	script	Frede#13_3_in	454,{
+dic_in01,165,104,0	script	Frede#13_3_in	4_MAN_PIOM,{
 	if (isequipped(2782)) {
 		if (ep13_3_bra < 1) {
 			mes "[Frede]";
@@ -5127,7 +5158,7 @@ dic_in01,165,104,0	script	Frede#13_3_in	454,{
 			mes "Maybe......they forgot?";
 			next;
 			mes "[Frede]";
-			mes "Oh.. what should I do......";
+			mes "Oh... what should I do......";
 			mes "I would run there myself if only my legs would move normally.";
 			next;
 			mes "[Frede]";
@@ -5158,7 +5189,7 @@ dic_in01,165,104,0	script	Frede#13_3_in	454,{
 		}
 		else if (ep13_3_bra == 3) {
 			mes "[Frede]";
-			mes "Oh.. what should I do......";
+			mes "Oh... what should I do......";
 			mes "I would run there myself if only my legs would move normally.";
 			next;
 			mes "[Frede]";
@@ -5318,7 +5349,7 @@ dic_in01,165,104,0	script	Frede#13_3_in	454,{
 	close;
 }
 
-dic_dun01,205,43,5	script	Brian#ep13_3_	490,{
+dic_dun01,205,43,5	script	Brian#ep13_3_	4_MAN_PIOM4,{
 	if (isequipped(2782)) {
 		if (ep13_3_bra < 4) {
 			mes "[Brian]";
@@ -5417,7 +5448,7 @@ dic_dun01,205,43,5	script	Brian#ep13_3_	490,{
 	close;
 }
 
-dic_dun01,153,107,4	script	Tyler#13_3	489,{
+dic_dun01,153,107,4	script	Tyler#13_3	4_MAN_PIOM6,{
 	if (isequipped(2782)) {
 		if (ep13_3_bra < 4) {
 			mes "[Tyler]";
@@ -5543,7 +5574,7 @@ dic_dun01,153,107,4	script	Tyler#13_3	489,{
 	close;
 }
 
-dic_dun01,235,243,0	script	John#13_3	454,{
+dic_dun01,235,243,0	script	John#13_3	4_MAN_PIOM,{
 	if (isequipped(2782)) {
 		if (ep13_3_bra < 4) {
 			mes "[John]";
@@ -5645,7 +5676,7 @@ dic_dun01,235,243,0	script	John#13_3	454,{
 	close;
 }
 
-dic_dun02,110,127,5	script	Rose#13_3	489,{
+dic_dun02,110,127,5	script	Rose#13_3	4_MAN_PIOM6,{
 	if (isequipped(2782)) {
 		if (ep13_3_bra < 4) {
 			mes "[Rose]";
@@ -5744,7 +5775,7 @@ dic_dun02,110,127,5	script	Rose#13_3	489,{
 	close;
 }
 
-dic_dun01,64,107,7	script	Bain#13_3	490,{
+dic_dun01,64,107,7	script	Bain#13_3	4_MAN_PIOM4,{
 	if (isequipped(2782)) {
 		if (ep13_3_bra < 4) {
 			mes "[Bain]";
@@ -5838,7 +5869,7 @@ dic_dun01,64,107,7	script	Bain#13_3	490,{
 	close;
 }
 
-dic_dun01,58,225,4	script	Lash#13_3	491,{
+dic_dun01,58,225,4	script	Lash#13_3	4_MAN_PIOM5,{
 	if (isequipped(2782)) {
 		if (ep13_3_bra < 4) {
 			mes "[Lash]";
@@ -5939,7 +5970,7 @@ dic_dun01,58,225,4	script	Lash#13_3	491,{
 	close;
 }
 
-dic_in01,349,129,5	script	Bouy#13_3	449,{
+dic_in01,349,129,5	script	Bouy#13_3	4_MAN_BENKUNI,{
 	if (isequipped(2782)) {
 		if (ep13_3_bra < 5) {
 			mes "[Bouy]";
@@ -5999,7 +6030,7 @@ dic_in01,349,129,5	script	Bouy#13_3	449,{
 				mes "I've been waiting for the Galtens to return because I'm not accustomed to battle since I'm Venknick. Thank you very much.";
 				next;
 				mes "[Bouy]";
-				mes "Handwork is much faster to refine pieces of Bradium instead of using a machine. I will only need an hour to finish.";
+				mes "Handwork is much faster to refine pieces of Bradium instead of using a machine. I will only need two hours to finish."; //Official: "an hour", but gives 2-hour quest.
 				next;
 				mes "[Bouy]";
 				mes "Please go rest while I get to work.";
@@ -6056,7 +6087,7 @@ dic_in01,349,129,5	script	Bouy#13_3	449,{
 		close;
 	}
 	mes "[Bouy]";
-	mes "¡ø¡ö¡þ ¡ù ¡ú¡ð¡ï ¡ø"; 
+	mes "¡ø¡ö¡þ ¡ù ¡ú¡ð¡ï ¡ø";
 	mes "¡ï¡ú¡ö ¡ù";
 	mes "¡õ¡ï¡õ ¡ò";
 	close;
@@ -6070,7 +6101,7 @@ dic_in01,349,129,5	script	Bouy#13_3	449,{
 			mes "[Maha]";
 			mes "But I do think the Sapha race is overly kind, almost unnaturally.";
 			mes "Guess it'll be fine.";
-			close; 
+			close;
 		}
 		mes "[Ben]";
 		mes "There is nothing strange!";
@@ -6078,7 +6109,7 @@ dic_in01,349,129,5	script	Bouy#13_3	449,{
 		next;
 		mes "[Ben]";
 		mes "I can also visit the Sapha if I work well here, can't I?";
-		close; 
+		close;
 	}
 	mes "[Ben]";
 	mes "Hmm. Hey, Maha,";
@@ -6152,10 +6183,10 @@ dic_in01,349,129,5	script	Bouy#13_3	449,{
 	mes "Try seeing ^4d4dffAello^000000.";
 	close;
 }
-mid_camp,220,246,5	duplicate(Expedition#ep133_is)	Expedition Guard Ben	930
-mid_camp,223,246,4	duplicate(Expedition#ep133_is)	Expedition Guard Maha	868
+mid_camp,220,246,5	duplicate(Expedition#ep133_is)	Expedition Guard Ben	4_M_RACHMAN2
+mid_camp,223,246,4	duplicate(Expedition#ep133_is)	Expedition Guard Maha	4_M_LGTGUARD
 
-mid_campin,93,114,3	script	Guard Aello#ep133_is03	967,{
+mid_campin,93,114,3	script	Guard Aello#ep133_is03	4_M_RUSMAN1,{
 	if (ep13_ryu > 99 || ep13_start > 99) {
 		if (ep13_3_invite == 0) {
 			mes "[Aello]";
@@ -6211,7 +6242,7 @@ mid_campin,93,114,3	script	Guard Aello#ep133_is03	967,{
 	close;
 }
 
-mid_campin,111,120,3	script	Soldier#ep133_is04	852,{
+mid_campin,111,120,3	script	Soldier#ep133_is04	4_M_EIN_SOLDIER,{
 	if (ep13_3_invite == 1) {
 		mes "[Soldier]";
 		mes "Sorry, but this room is currently restricted from visitors.";
@@ -6367,7 +6398,7 @@ function	script	eldicastes_c	{
 				mes "[Vyhannus]";
 				mes "Amazing.";
 				mes "Like with Hound, that ring you humans made...";
-				mes "is like a ring of wisdom."; 
+				mes "is like a ring of wisdom.";
 			}
 			else {
 				mes "[Hound]";
@@ -6382,7 +6413,7 @@ function	script	eldicastes_c	{
 			}
 			mes "[Vyhannus]";
 			mes "Shall we skip to the point?";
-			mes "The reason why I am here..."; 
+			mes "The reason why I am here...";
 			next;
 			mes "[Someone's voice]";
 			mes "Excuse me, hold on a second.";
@@ -6465,7 +6496,7 @@ function	script	eldicastes_c	{
 		}
 }
 
-mid_campin,168,128,3	script	Sapha from Manuk	451,{
+mid_campin,168,128,3	script	Sapha from Manuk	4_MAN_JERUTOO,{
 	if (isequipped(2782)) {
 		if (!ep13_3_invite) {
 			mes "-Looks like the Sapha messenger from Manuk.-";
@@ -6481,7 +6512,7 @@ mid_campin,168,128,3	script	Sapha from Manuk	451,{
 			mes "You just stand there without";
 			mes "knowing what he says, so the";
 			mes "expedition guard next to you starts to talk. -";
-			next;	
+			next;
 			callfunc "eldicastes_c",3;
 		}
 		else if (ep13_3_invite == 2) {
@@ -6491,7 +6522,7 @@ mid_campin,168,128,3	script	Sapha from Manuk	451,{
 			mes "He's name is Galten. He is so quick, you won't notice the weight of his armor.";
 			next;
 			callfunc "eldicastes_c",1;
-		} 
+		}
 		else if (ep13_3_invite == 3) {
 			callfunc "eldicastes_c",2;
 		}
@@ -6502,7 +6533,7 @@ mid_campin,168,128,3	script	Sapha from Manuk	451,{
 			mes "The tunnel might be a little scary.";
 			mes "But I'm sure you will reach the end of it since you are strong.";
 			close;
-		} 
+		}
 		else if (ep13_3_invite == 5) {
 			mes "[Vyhannus]";
 			mes "Oh, the tunnel?";
@@ -6515,8 +6546,8 @@ mid_campin,168,128,3	script	Sapha from Manuk	451,{
 			next;
 			mes "[Vyhannus]";
 			mes "That is it.";
-			close; 
-		} 
+			close;
+		}
 		else if (ep13_3_invite == 6) {
 			mes "[Vyhannus]";
 			mes "You received the Light of El Dicastes.";
@@ -6563,7 +6594,7 @@ mid_campin,168,128,3	script	Sapha from Manuk	451,{
 	close;
 }
 
-mid_campin,168,125,3	script	Hound#ep133_is06	997,{
+mid_campin,168,125,3	script	Hound#ep133_is06	4_M_MOCASS1,{
 	if (!isequipped(2782)) {
 		mes "[Hound]";
 		mes "Where is the interpreter ring?";
@@ -6582,10 +6613,10 @@ mid_campin,168,125,3	script	Hound#ep133_is06	997,{
 	}
 	else if (ep13_3_invite == 2) {
 		callfunc "eldicastes_c",1;
-	} 
+	}
 	else if (ep13_3_invite == 3) {
 		callfunc "eldicastes_c",2;
-	} 
+	}
 	else if (ep13_3_invite == 4) {
 		mes "[Hound]";
 		mes "First thing you need to do when you reach Manuk is to meet General Guard Avalanche.";
@@ -6598,7 +6629,7 @@ mid_campin,168,125,3	script	Hound#ep133_is06	997,{
 		mes "[Hound]";
 		mes "And don't forget what the captain said.";
 		mes "Inspector Doha is in the next room.";
-		close; 
+		close;
 	}
 	else if (ep13_3_invite > 4) {
 		mes "[Hound]";
@@ -6622,23 +6653,23 @@ mid_campin,168,125,3	script	Hound#ep133_is06	997,{
 	close;
 }
 
-mid_campin,165,127,5	script	Hibba Agip#ep133_is07	459,{
+mid_campin,165,127,5	script	Hibba Agip#ep133_is07	4_M_REDSWORD,{
 	mes "[Hibba Agip]";
 	mes "Hmm..?";
 	mes "I should go now.";
 	close2;
 OnInit:
 	disablenpc strnpcinfo(0);
-	end;	
+	end;
 }
 
-man_in01,315,52,3	script	Guard Captain Avalanche	450,{
+man_in01,315,52,3	script	Guard Captain Avalanche	4_MAN_GALTUN,{
 	mes "[Guard Captain Avalanche]";
 	if (!isequipped(2782)) {
 		mes "¢¤¡ð¡ú? ¢£ ¡ù¡ð...";
 		mes "¡ï¡ò¡Ð ¢¤ ?";
 		mes "¡ñ¡ï..?";
-		close;	
+		close;
 	}
 	if (ep13_3_invite == 4) {
 		mes "[Avalanche]";
@@ -6710,7 +6741,7 @@ man_in01,315,52,3	script	Guard Captain Avalanche	450,{
 	close;
 }
 
-dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
+dic_in01,42,264,3	script	Adventurer Clerk#ep133	4_MAN_NITT,{
 	if (!isequipped(2782)) {
 		mes "[Clerk Knit]";
 		mes "¡ð¡ñ¡ô ¡õ ¡ü¢±¢³ ¡ö ¡ò...?";
@@ -6912,7 +6943,6 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 }
 // Enchantment NPCs
 //============================================================
-
 -	script	dic_enc#main	-1,{
 	set .@re$, strnpcinfo(1);
 	set .@n$, "["+.@re$+"]";
@@ -6929,8 +6959,37 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 			mes "[Kareka]";
 			mes "Do you want to upgrade the ^990099Light of El Dicastes^000000 again?";
 			next;
+
+			// The reset feature was disabled in previous versions.
+			//mes "[Kareka]";
+			//mes "Ha ha ha, that is out of the question. This item is very rare and valuable so I cannot give you a new one.";
+			//close;
+
+			mes "[Kareka]";
+			mes "That will cost ^9900996 Sapha Certifications^000000 in order to retry.";
+			mes "And note this, your current Light of El Dicastes will be destroyed along with all of its enchantments.";
+			next;
 			mes "[Kareka]";
-			mes "Ha ha ha, that is out of the question. This item is very rare and valuable so I cannot give you a new one.";
+			mes "Are you sure you want to do this?";
+			next;
+			if(select("No, let me think about it.:Take my Light of El Dicastes.") == 2) {
+				if (countitem(2844) == 0 || countitem(6304) < 6) {
+					mes "[Kareka]";
+					mes "You need to bring the Light of El Dicastes and 6 Sapha Certifications!";
+					mes "Don't try to cheat me!";
+					close;
+				}
+				mes "[Kareka]";
+				mes "Ok, let's get this started.";
+				mes "I'm going to remove all enchantments from your Light of El Dicastes.";
+				mes "Haaap--!";
+				specialeffect2 EF_REPAIRWEAPON;
+				progressbar "ffff00",3;
+				delitem 6304,6; //Sapa_Feat_Cert
+				delitem 2844,1; //El_Dicastes_Light
+				getitem 2844,1; //El_Dicastes_Light
+				set ep13_3_ring2,0;
+			}
 			close;
 		}
 		if (countitem(6304) < 1) {
@@ -6973,21 +7032,21 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 		mes .@n$;
 		set .@cat_hi, rand(1,30);
 		if (.@cat_hi == 1) mes "It is difficult to find fish here. Can't find any so Jahbong would forget that he's busy or angry at the sight of a Fish Tail.";
-		if (.@cat_hi == 2) mes "Grrr... I was punished with a ladle for peeing on my blanket yesterday.";
-		if (.@cat_hi == 3) mes "I dream sometimes of a giant patting me on the head. But I feel more annoyed than afraid.";
-		if (.@cat_hi == 4) mes "Newbie Jarute, Ahat doesn't seem to look like a Sapha.";
-		if (.@cat_hi == 5) mes "Our people say Ahat looks like a beautiful cat.";
-		if (.@cat_hi == 6) mes "I heard there was a superior equipment upgrade craftsman in the capital city of Manuk.";
-		if (.@cat_hi == 7) mes "Grrr... I don't think my voice sounds normal these days. I think it's the weather.";
-		if (.@cat_hi == 8) mes "There are times when I shout out loud but it is only because I am in a good mood. No need to be startled.";
-		if (.@cat_hi == 9) mes "I feel an urge to jump on a pile with my four paws when I see one.";
-		if (.@cat_hi == 10) mes "I must have been a cat in my previous life.";
-		if (.@cat_hi == 11) mes "I dreamt about the giant again. I waved my paws annoyed and he kept on patting me.";
-		if (.@cat_hi == 12) mes "Yup!! Was the rumor true that Ahat looks like a human?! ";
-		if (.@cat_hi == 13) mes "I heard on my way that this Pinqucula Dark has a Withered Flower.";
-		if (.@cat_hi == 14) mes "There is a guy named Pinguicula nearby who has the Sharp Leaf nearby.";
-		if (.@cat_hi == 15) mes "There is a guy named Pinguicula nearby who has the Great Leaf nearby.";
-		if (.@cat_hi == 16) mes "I recommend getting it from the Dracos nearby. But then, they only drop it randomly so you may come back empty handed...";
+		else if (.@cat_hi == 2) mes "Grrr... I was punished with a ladle for peeing on my blanket yesterday.";
+		else if (.@cat_hi == 3) mes "I dream sometimes of a giant patting me on the head. But I feel more annoyed than afraid.";
+		else if (.@cat_hi == 4) mes "Newbie Jarute, Ahat doesn't seem to look like a Sapha.";
+		else if (.@cat_hi == 5) mes "Our people say Ahat looks like a beautiful cat.";
+		else if (.@cat_hi == 6) mes "I heard there was a superior equipment upgrade craftsman in the capital city of Manuk.";
+		else if (.@cat_hi == 7) mes "Grrr... I don't think my voice sounds normal these days. I think it's the weather.";
+		else if (.@cat_hi == 8) mes "There are times when I shout out loud but it is only because I am in a good mood. No need to be startled.";
+		else if (.@cat_hi == 9) mes "I feel an urge to jump on a pile with my four paws when I see one.";
+		else if (.@cat_hi == 10) mes "I must have been a cat in my previous life.";
+		else if (.@cat_hi == 11) mes "I dreamt about the giant again. I waved my paws annoyed and he kept on patting me.";
+		else if (.@cat_hi == 12) mes "Yup!! Was the rumor true that Ahat looks like a human?! ";
+		else if (.@cat_hi == 13) mes "I heard on my way that this Pinqucula Dark has a Withered Flower.";
+		else if (.@cat_hi == 14) mes "There is a guy named Pinguicula nearby who has the Sharp Leaf nearby.";
+		else if (.@cat_hi == 15) mes "There is a guy named Pinguicula nearby who has the Great Leaf nearby.";
+		else if (.@cat_hi == 16) mes "I recommend getting it from the Dracos nearby. But then, they only drop it randomly so you may come back empty handed...";
 		else mes "Hmm... This may not be important to you but.";
 		next;
 		mes .@n$;
@@ -7096,12 +7155,12 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 					mes .@n$;
 					mes "When you are ready,";
 					mes "Please come back again";
-					close; 
+					close;
 				}
 				if (countitem(.@Items_) < 1) {
 					mes .@n$;
 					mes "Then, take the equipment off first.";
-					close; 
+					close;
 				}
 				specialeffect2 EF_OVERTHRUST;
 				mes .@n$;
@@ -7116,7 +7175,7 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 			mes .@n$;
 			mes "But...";
 			mes "you don't seem to be wearing or even carrying equipment to upgrade on you.";
-			close; 
+			close;
 		}
 	}
 	if (getd("ep13_3_"+.@v$) == 0) {
@@ -7142,7 +7201,7 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 		mes .@n$;
 		mes "Second upgrade step requires ^9900992 Exploit Certifications of Sapha^000000. Do you want to proceed?";
 		set .@req, 2;
-	} 
+	}
 	else if (getd("ep13_3_"+.@v$) < 69) {
 		mes .@n$;
 		mes "I'm preparing for the";
@@ -7204,7 +7263,7 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 		mes .@n$;
 		mes "When you are ready,";
 		mes "Please come back again.";
-		close; 
+		close;
 	}
 	if (countitem(6304) < .@req) {
 		mes .@n$;
@@ -7275,7 +7334,7 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 	set .@cri[5], 4764;	set .@cri[7], 4765;
 	set .@atk[2], 4766;	set .@atk[3], 4767;
 	set .@dex[1], 4720;	set .@dex[2], 4721;	set .@dex[3], 4722;
-	set .@int[1], 4710;	set .@int[2], 4711;	set .@int[3], 4712;	
+	set .@int[1], 4710;	set .@int[2], 4711;	set .@int[3], 4712;
 	set .@agi[1], 4730;	set .@agi[2], 4731;	set .@agi[3], 4732;
 	
 	// Enchant attribute is determined by the digit position of variable value (ep13_3_<type>).
@@ -7309,30 +7368,30 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 	setd "ep13_3_"+.@v$, .@var[.@r-1] + getd("ep13_3_"+.@v$);
 	close;
 }
-dic_fild01,240,198,2	duplicate(dic_enc#main)	Jalapeno#pa0829	495
-dic_fild01,251,183,3	duplicate(dic_enc#main)	Brare#pa0829	495
-dic_fild01,259,172,3	duplicate(dic_enc#main)	Mancho#pa0829	495
-dic_in01,353,37,5	duplicate(dic_enc#main)	Kareka#pa0829	454
+dic_fild01,240,198,2	duplicate(dic_enc#main)	Jalapeno#pa0829	4_M_MERCAT1
+dic_fild01,251,183,3	duplicate(dic_enc#main)	Brare#pa0829	4_M_MERCAT1
+dic_fild01,259,172,3	duplicate(dic_enc#main)	Mancho#pa0829	4_M_MERCAT1
+dic_in01,353,37,5	duplicate(dic_enc#main)	Kareka#pa0829	4_MAN_PIOM
 
-dic_fild01,228,159,4	script	Jahbong#pa0829	496,{
+dic_fild01,228,159,4	script	Jahbong#pa0829	4_M_MERCAT2,{
 	mes "[Jahbong]";
 	if (countitem(6304) < 1) {
 		mes "You haven't received a Sapha Certification yet?";
 		next;
 		mes "[Jahbong]";
 		mes "Come back to me once you have one. I'll give you something good in exchange.";
-		close; 
+		close;
 	}
 	set .@cattalkj,rand(1,9);
 	if (.@cattalkj == 1) mes "Don't touch my back! I might bite you unconsciously.";
-		else if (.@cattalkj == 2) mes "Pub owner Shay carried something away to make something strange! Be careful!";
-		else if (.@cattalkj == 3) mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now.";
-		else if (.@cattalkj == 4) mes "I have to be diligent with my grooming to maintain beautiful fur.";
-		else if (.@cattalkj == 5) mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad.";
-		else if (.@cattalkj == 6) mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!";
-		else if (.@cattalkj == 7) mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry.";
-		else if (.@cattalkj == 8) mes "Meow~~~~~~~~~~";
-		else mes "Yarn is a great way to calm a cat.";
+	else if (.@cattalkj == 2) mes "Pub owner Shay carried something away to make something strange! Be careful!";
+	else if (.@cattalkj == 3) mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now.";
+	else if (.@cattalkj == 4) mes "I have to be diligent with my grooming to maintain beautiful fur.";
+	else if (.@cattalkj == 5) mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad.";
+	else if (.@cattalkj == 6) mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!";
+	else if (.@cattalkj == 7) mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry.";
+	else if (.@cattalkj == 8) mes "Meow~~~~~~~~~~";
+	else mes "Yarn is a great way to calm a cat.";
 	next;
 	mes "[Jahbong]";
 	mes "Why are you here?";
@@ -7388,12 +7447,14 @@ dic_fild01,228,159,4	script	Jahbong#pa0829	496,{
 
 // Cat Hand Agent
 //============================================================
-moc_para01,44,19,3	script	Cat Hand Agent#gekk	496,{
+moc_para01,44,19,3	script	Cat Hand Agent#gekk	4_M_MERCAT2,{
 	if (BaseLevel < 70)	{
 		mes "[Cat Hand Agent]";
 		mes "Hey, human! Did you come to make a request, too? When will it be my turn?";
+		next;
 		mes "[Cat Hand Agent]";
 		mes "Our Cat Hand Merchant group really needs any help it can get. But by the looks of all those requests that Ebenor is holding in his hand, Cat Hand Merchant will be closed by the time my request is put up on the board!";
+		next;
 		mes "[Cat Hand Agent]";
 		mes "It breaks my heart to think my colleagues will be shivering in the blizzard. I hope I don't get into trouble since I can't do anything about it, right?";
 		close;
@@ -7481,7 +7542,7 @@ moc_para01,44,19,3	script	Cat Hand Agent#gekk	496,{
 								mes "[Agent Geck]";
 								mes "With this, our contract is now complete.";
 								mes "Geck will help you to get to Ash-Vacuum in one piece.";
-								set Zeny, Zeny - 50000;
+								Zeny -= 50000;
 								set ep13_start, 100;
 								next;
 								mes "[Agent Geck]";
@@ -7521,7 +7582,7 @@ moc_para01,44,19,3	script	Cat Hand Agent#gekk	496,{
 	close;
 }
 
-moc_fild20,368,197,3	script	Cat#to22	876,{
+moc_fild20,368,197,3	script	Cat#to22	4_CAT,{
 	if (ep13_start != 100) {
 		mes "[Cat]";
 		mes "Meow~";
@@ -7545,7 +7606,7 @@ moc_fild20,368,197,3	script	Cat#to22	876,{
 	end;
 }
 
-moc_fild22b,182,179,3	script	Cat Hand Agent#Tat	495,{
+moc_fild22b,182,179,3	script	Cat Hand Agent#Tat	4_M_MERCAT1,{
 	if (ep13_start != 100) {
 		mes "[Cat Hand Agent]";
 		mes "This place as no meaning for us.";
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
new file mode 100644
index 000000000..0bc237d58
--- /dev/null
+++ b/npc/re/quests/quests_eclage.txt
@@ -0,0 +1,1837 @@
+//===== Hercules Script ======================================
+//= Eclage Quest NPCs
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 0.1
+//===== Description: =========================================
+//= Quest NPCs related to Eclage.
+//===== Additional Comments: =================================
+//= 0.1 NPCs are mostly placeholders. [Euphy]
+//============================================================
+
+// Teleport Cats (14.2 Cat Hand Addition)
+//============================================================
+-	script	Teleport Cat#ep14_2	-1,{
+	switch(atoi(charat(strnpcinfo(1),16))) {
+	case 1:
+		setarray .@map$[0],"Entrance to Mora";
+		setarray .@cost[0],15;
+		break;
+	case 2:
+		setarray .@map$[0],"Near Eclage","Near Splendide";
+		setarray .@cost[0],15,55;
+		break;
+	case 3:
+		setarray .@map$[0],"Entrance to Mora","Midgard Allied Forces Post";
+		setarray .@cost[0],55,10;
+		break;
+	case 4:
+		setarray .@map$[0],"Near Splendide","Manuk Field";
+		setarray .@cost[0],10,10;
+		break;
+	case 5:
+		setarray .@map$[0],"Midgard Allied Forces Post","Near El Dicastes";
+		setarray .@cost[0],10,20;
+		break;
+	case 6:
+		setarray .@map$[0],"Manuk Field";
+		setarray .@cost[0],20;
+		break;
+	}
+	mes "[Teleport Cat]";
+	mes "What a nice day, isn't it!";
+	mes "Welcome to Cat Merchant Group. We do anything to please our customers. We would even lie on our back if you want!";
+	next;
+	mes "[Teleport Cat]";
+	mes "We provide teleport service between various regions based on our accumulated knowledge. We accept Malangdo Canned Specialties or Zeny, so you can pay however you like it~";
+	next;
+	set .@menu$,"Forget it:";
+	for(set .@i,0; .@i<getarraysize(.@map$); set .@i,.@i+1) {
+		set .@menu$, .@menu$+
+			.@map$[.@i]+" ("+.@cost[.@i]+" Canned Food):"+
+			.@map$[.@i]+" ("+.@cost[.@i]+",000 Zeny):";
+	}
+	set .@i, select(.@menu$)-2;
+	if (.@i == -1) {
+		mes "[Teleport Cat]";
+		mes "I'll see you later then.";
+		close;
+	}
+	set .@choice$, .@map$[.@i/2];
+	set .@price, .@cost[.@i/2];
+	if (.@i % 2) {
+		set .@price, .@price*1000;
+		if (Zeny < .@price) {
+			mes "[Teleport Cat]";
+			mes "I'm afraid it's not enough. Sorry, but it can't be done for free~";
+			close;
+		}
+		Zeny -= .@price;
+	} else {
+		if (countitem(12636) < .@price) {
+			mes "[Teleport Cat]";
+			mes "I'm afraid it's not enough. Sorry, but it can't be done for free~";
+			close;
+		}
+		delitem 12636,.@price; //Malang_Sp_Can
+	}
+	if (compare(.@choice$,"Midgard Allied Forces Post")) warp "mid_camp",180,247;
+	else if (compare(.@choice$,"Manuk Field")) warp "man_fild02",133,47;
+	else if (compare(.@choice$,"Near Splendide")) warp "spl_fild02",51,240;
+	else if (compare(.@choice$,"Near El Dicastes")) warp "dic_fild01",159,264;
+	else if (compare(.@choice$,"Entrance to Mora")) warp "bif_fild02",291,323;
+	else if (compare(.@choice$,"Near Eclage")) warp "ecl_fild01",116,309;
+	close;
+}
+ecl_fild01,118,311,4	duplicate(Teleport Cat#ep14_2)	Teleport Cat No.1	4_M_BOSSCAT
+bif_fild02,293,325,4	duplicate(Teleport Cat#ep14_2)	Teleport Cat No.2	4_M_BOSSCAT
+spl_fild02,53,242,4	duplicate(Teleport Cat#ep14_2)	Teleport Cat No.3	4_M_BOSSCAT
+mid_camp,207,234,4	duplicate(Teleport Cat#ep14_2)	Teleport Cat No.4	4_M_BOSSCAT
+man_fild02,135,49,4	duplicate(Teleport Cat#ep14_2)	Teleport Cat No.5	4_M_BOSSCAT
+dic_fild01,161,266,4	duplicate(Teleport Cat#ep14_2)	Teleport Cat No.6	4_M_BOSSCAT
+
+// Eclage's Entrance
+//============================================================
+ecl_fild01,97,322,0	script	#ep14_2Entrance	WARPNPC,3,3,{
+OnTouch:
+	if (ep14_2_enter < 3) {
+		mes "[Security Guard]";
+		mes "Please wait a minute.";
+		mes "All first-time visitors to Eclage must fill out the necessary forms before entering.";
+		close;
+	}
+	warp "eclage",100,28;
+	end;
+}
+
+ecl_fild01,94,322,5	script	Security Guard#ep14_2	4_M_FAIRYSOLDIER,{
+	if (ep14_2_enter == 0) {
+		mes "[Security Guard]";
+		mes "All first-time visitors to Eclage must fill out the necessary forms here before entering.";
+		next;
+		mes "[Security Guard]";
+		mes "Please understand because of a recent increase in the influx of people from Midgard through Bifrost, we had to create this process.";
+		next;
+		mes "[Security Guard]";
+		mes "Of course, the documents will be secured away after their use in access regulations, so you don't have to worry.";
+		next;
+		if(select("Fill out the forms.:Forget it.") == 2) {
+			mes "[Security Guard]";
+			mes "Please note that you would not be able to enter the city without filling out the forms.";
+			close;
+		}
+		mes "[Security Guard]";
+		mes "Please fill out your name, occupation, and level here.";
+		next;
+		mes "Write your name.";
+		input .@input1$;
+		next;
+		mes "Write your occupation.";
+		input .@input1$;
+		next;
+		mes "Write your level.";
+		input .@input1$;
+		next;
+		mes "[Security Guard]";
+		mes "If you completed your forms, please submit them to the administrator over there.";
+		mes "There may be some waiting time, so take your time.";
+		set ep14_2_enter,1;
+		setquest 11310;
+		close;
+	} else if (ep14_2_enter == 1) {
+		mes "[Security Guard]";
+		mes "Please submit your forms to the administrator over there after writing in your name, occupation, and level.";
+		mes "There may be some waiting time, so take your time.";
+		close;
+	} else if (ep14_2_enter == 2) {
+		mes "[Security Guard]";
+		mes "Great, you completed the forms.";
+		mes "Welcome to Eclage, the capital of the Laphines.";
+		next;
+		mes "[Security Guard]";
+		mes "Since Eclage is under the influence of Bifrost, there is fluent communication among the races.";
+		next;
+		mes "[Security Guard]";
+		mes "There would be no need for any separate translation, and there are enough bridges for on-foot races, so I hope you have a comfortable visit.";
+		set ep14_2_enter,3;
+		erasequest 11311;
+		close2;
+		warp "eclage",100,28;
+		end;
+	} else {
+		mes "[Security Guard]";
+		mes "Welcome to Eclage, the capital of the Laphines.";
+		next;
+		mes "[Security Guard]";
+		mes "Since Eclage is under the influence of Bifrost, there is fluent communication among the races.";
+		next;
+		mes "[Security Guard]";
+		mes "There would be no need for any separate translation, and there are enough bridges for on-foot races, so I hope you have a comfortable visit.";
+		close;
+	}
+}
+ecl_fild01,100,323,3	duplicate(Security Guard#ep14_2)	Security Guard#ep14_2_2	4_M_FAIRYSOLDIER
+
+ecl_fild01,111,320,2	script	Immigration Officer#ep1	4_M_FAIRYKID4,{
+	if (ep14_2_enter == 0) {
+		mes "[Immigration Officer]";
+		mes "What do you need?";
+		mes "As you can see, I'm really busy here, so unless you need something, please don't bother me.";
+		emotion e_an;
+		close;
+	} else if (ep14_2_enter == 1) {
+		mes "[Immigration Officer]";
+		mes "Whew! I'm sorry to have kept you waiting.";
+		mes "There are just too many visitors.";
+		emotion e_wah;
+		next;
+		mes "[Immigration Officer]";
+		mes "So if you will place your forms here...";
+		next;
+		mes "[???]";
+		mes "Here!! These are my completed forms!!";
+		mes "This time it's all good, right?";
+		mes "Let me through quick!";
+		cutin "bu_du1.bmp",2;
+		emotion e_omg,1;
+		next;
+		cutin "bu_du1.bmp",255;
+		mes "[Immigration Officer]";
+		mes "I'm taking care of visitors in the order they arrived, so please wait for your turn.";
+		emotion e_swt;
+		next;
+		mes "[???]";
+		mes "What are you talking about!";
+		mes "I was waaaay before all of these guys!";
+		cutin "bu_du3.bmp",2;
+		next;
+		cutin "bu_du3.bmp",255;
+		mes "[Immigration Officer]";
+		mes "Well, your turn was delayed because you had to fill out your forms, so you have to wait until later.";
+		emotion e_ag;
+		next;
+		mes "[???]";
+		mes "What?! You just said you take care of visitors in the order they arrived!!!";
+		cutin "bu_du5.bmp",2;
+		next;
+		cutin "bu_du5.bmp",255;
+		mes "[Immigration Officer]";
+		mes "Yes, I did say that but...";
+		next;
+		mes "- SMACK!!! -";
+		next;
+		mes "[???]";
+		mes "OW!! Why did you hit me?";
+		cutin "bu_du4.bmp",2;
+		next;
+		mes "[???]";
+		mes "I'm so sorry.";
+		mes "My stupid friend here is causing trouble.";
+		cutin "bu_mark3.bmp",0;
+		next;
+		mes "[???]";
+		mes "Who are you calling stupid?!";
+		cutin "bu_du5.bmp",2;
+		next;
+		mes "[???]";
+		mes "If you hadn't filled out my name incorrectly in the first place, we wouldn't be waiting like this!";
+		cutin "bu_mark3.bmp",0;
+		next;
+		mes "[???]";
+		mes "Mark Esha or Madrid, they're all the same!";
+		cutin "bu_du3.bmp",2;
+		next;
+		mes "[Mark Esha]";
+		mes "They're not at all the same!";
+		mes "And what's more, how can you not know the name of your friend of 15 years?";
+		cutin "bu_mark4.bmp",0;
+		next;
+		mes "[???]";
+		mes "It's not that I didn't know- I did it on purpose!!";
+		mes "Madrid is just fine! Madrid!";
+		cutin "bu_du3.bmp",2;
+		next;
+		cutin "bu_du3.bmp",255;
+		mes "- SMACK -";
+		next;
+		mes "[Mark Esha]";
+		mes "Hu... I am so sorry that my friend is this stupid.";
+		mes "Please don't mind us and do what you need to do.";
+		cutin "bu_mark3.bmp",0;
+		next;
+		mes "[???]";
+		mes "AHHHH!!!";
+		mes "LET ME IN!!!!";
+		mes "How long do I have to wait out here!!!";
+		cutin "bu_du5.bmp",2;
+		next;
+		mes "[Mark Esha]";
+		mes "Would you stay put just for a second?!!!";
+		mes "Sorry. So sorry.";
+		cutin "bu_mark3.bmp",0;
+		next;
+		cutin "bu_mark3.bmp",255;
+		mes "[Immigration Officer]";
+		mes "Oh wow, this is just so crazy.";
+		mes "Test15696 Here, your documents are processed.";
+		mes "You may enter the city when you go talk to the security guard.";
+		emotion e_go;
+		next;
+		mes "[???]";
+		mes "Shuffle, shuffle";
+		cutin "bu_oliver0.bmp",0;
+		next;
+		cutin "bu_oliver0.bmp",255;
+		mes "[Immigration Officer]";
+		mes "And Mr. Deu Lean, please take your group and enter. It's just way too noisy.";
+		emotion e_an;
+		next;
+		mes "[Du Lian]";
+		mes "Mwahah!!";
+		mes "SEE THAT?!";
+		mes "Thanks to me, we got through faster!";
+		cutin "bu_du1.bmp",2;
+		next;
+		mes "[Mark Esha]";
+		mes "You mean slower...";
+		cutin "bu_mark4.bmp",0;
+		next;
+		mes "[Du Lian]";
+		mes "A real man does not get bogged down by the past!!";
+		mes "I may have been slow with the documentation but I will be the one to enter Eclage first!";
+		mes "Mwahah!";
+		cutin "bu_du2.bmp",2;
+		next;
+		mes "[Mark Esha]";
+		mes "......Whew";
+		mes "I'm so sorry for everything.";
+		cutin "bu_mark2.bmp",0;
+		next;
+		mes "[???]";
+		mes "Well......";
+		mes "Mr. Mark, Mr. Du is already gone.";
+		cutin "bu_maggi3.bmp",2;
+		next;
+		mes "[Mark Esha]";
+		mes "Oh.............";
+		mes "Oh......................";
+		cutin "bu_mark3.bmp",0;
+		next;
+		mes "[Mark Esha]";
+		mes "My goodness......";
+		emotion e_swt2,1;
+		set ep14_2_enter,2;
+		erasequest 11310;
+		setquest 11311;
+		close2;
+		cutin "bu_mark3.bmp",255;
+		end;
+	} else {
+		mes "[Immigration Officer]";
+		mes "Oh wow, this is just so crazy.";
+		mes strcharinfo(0)+".";
+		mes "Here, your documents are processed.";
+		mes "You may enter the city when you go talk to the security guard.";
+		emotion e_go;
+		close;
+	}
+}
+
+// Oliver Wolf Hood
+//============================================================
+eclage,102,32,4	script	Fairy Carpenter#ep14_2	4_M_FAIRYKID2,{
+	if (BaseLevel < 120) {
+		mes "[Fairy Carpenter]";
+		mes "The bridge is kind of broken so please be careful.";
+		emotion e_sob;
+		close;
+	}
+	if (checkquest(11312) == -1) {
+		mes "[Fairy Carpenter]";
+		mes "This area is kind of broken, so be careful.";
+		mes "Otherwise, you'll fall aaaaaall the way down.";
+		next;
+		switch(select("The work being done right now:The reason for the bridge being broken:Forget it.")) {
+		case 1:
+			//missing
+			close;
+		case 2:
+			mes "[Fairy Carpenter]";
+			mes "Oh, just a minute ago, there was a human benig who took a misstep and broke a tree branch while falling.";
+			emotion e_an;
+			next;
+			mes "[Fairy Carpenter]";
+			mes "Being close to the entrance and all, this really needs to be fixed soon.";
+			mes "I'm trying to decide whether I should put up a warning sign, gather the necessary materials for it, and fix it myself."; //custom
+			next;
+			switch(select("Give help.:Don't give help.")) {
+			case 1:
+				mes "[Fairy Carpenter]";
+				mes "Wow!!!";
+				mes "You are going to help me?!";
+				mes "So... so kind...";
+				next;
+				mes "[Fairy Carpenter]";
+				mes "I can't believe there's still this kind of kindness left in the world... Hmm, sweaty eyes...";
+				emotion e_sob;
+				next;
+				mes "[Fairy Carpenter]";
+				mes "Would you then bring me a new bridge to use for repair?";
+				mes "Since other people can get hurt, I'll use my magic to maintain this bridge in the meantime.";
+				emotion e_go;
+				//setquest 11312;
+				close;
+			case 2:
+				//missing
+				close;
+			}
+		case 3:
+			//missing
+			close;
+		}
+	}
+	select("What if you use magic to repair it?");
+	mes "[Fairy Carpenter]";
+	mes "Hmm, it's not impossible, but magic that deals with creation of life requires much magic power and shouldn't be used so freely.";
+	next;
+	mes "[Fairy Carpenter]";
+	mes "If I were to describe how stupid that would be... Well, it's like turning a deliciously baked chocolate cake back into flour.";
+	next;
+	mes "[Fairy Carpenter]";
+	mes "Since the broken part is about 19 meters from here...";
+	next;
+	mes "[Fairy Carpenter]";
+	mes "Ahh! Now that I remember, before we used to be able to order the exact necessary length, but because they are mass-producing them nowadays, they only provide preset lengths.";
+	next;
+	mes "[Fairy Carpenter]";
+	mes "To maximize the stability, it's better to avoid connecting multiple bridge pieces together,";
+	next;
+	mes "[Fairy Carpenter]";
+	mes "and this broken bridge... from here to there it's about 19 meters and the present pieces come in 3 meters, 5 meters, and 10 meters......";
+	emotion e_swt2;
+	next;
+	mes "[Fairy Carpenter]";
+	mes "Hmm.......";
+	next;
+	mes "[Fairy Carpenter]";
+	mes "Hmm.......";
+	mes "......";
+	emotion e_swt2;
+	next;
+	mes "[Fairy Carpenter]";
+	mes "......Hmm.........";
+	emotion e_swt2;
+	next;
+	mes "- It's probably just my imagination that smoke is coming out of his head, right? -";
+	next;
+	mes "[Fairy Carpenter]";
+	mes "Oh ho!";
+	mes "What do you think?";
+	emotion e_heh;
+	next;
+	mes "[Fairy Carpenter]";
+	mes "To make a bridge of 19 meters in length with the fewest number of pieces possible, how many of each 3, 5, or 10 meter length pieces would I need?";
+	emotion e_what;
+	next;
+	mes "[Fairy Carpenter]";
+	mes "Please write the number of pieces necessary for each length. If no pieces for that length are necessary, please write 0.";
+	input .@inputstr$;
+	if (.@inputstr$ != "002") {
+		//missing
+		close;
+	}
+	next;
+	mes "[Fairy Carpenter]";
+	mes "Yeah, that sounds good, right?";
+	mes "Especially since there wouldn't be a need to make them so straight.";
+	emotion e_ic;
+	next;
+	mes "[Fairy Carpenter]";
+	mes "Okay, if you talk to [Golie] who works outside the city near the tower, he will give you the new bridge pieces.";
+	//erasequest 11312;
+	//setquest 11313;
+	close;
+/*
+OnTouch:
+	if (ep14_2_hood == 0) {
+		mes "[Fairy Carpenter]";
+		mes "Hey!!!!!!!";
+		mes "Be careful over there!!";
+		close;
+	}
+	end;
+*/
+}
+
+eclage,283,275,4	script	Glaces#ep14_2	4_F_FAIRYKID3,{
+	mes "[Glaces]";
+	mes "Hm......";
+	mes "The guys are late.";
+	mes "I can only imagine that they would be busy just looking at the number of people visiting Eclage nowadays but...";
+	next;
+	mes "[Glaces]";
+	mes "Why... why do I have so much time at hand...?";
+	mes "Am I the only one with so much free time?";
+	mes "Am I really the only one?";
+	emotion e_omg;
+	close;
+}
+
+eclage,266,216,4	script	Moreng#ep14_2	4_M_FAIRYKID3,{
+	mes "[Moreng]";
+	mes "Eclage is a really nice place to live.";
+	mes "The flowers are always in full bloom and the weather is always comfortable.";
+	next;
+	mes "[Moreng]";
+	mes "If there were a beautiful Yai of my own, it would truly be a paradise!";
+	next;
+	mes "[Moreng]";
+	mes "Yai actually signifies an egg.";
+	mes "And to Laphines, Yai could even signify what is beyond a home...";
+	emotion e_shy;
+	close;
+}
+
+eclage,191,200,4	script	Yube#ep14_2	4_M_FAIRYKID5,{
+	mes "- Shuffle shuffle -";
+	mes "He's working on something.";
+	mes "Let's not bother him.";
+	close;
+}
+
+eclage,292,265,0	script	#ep14_2Yube Entrance	WARPNPC,2,2,{
+OnTouch:
+	mes "- Looks like the door is locked. -";
+	close;
+}
+
+eclage,265,166,4	script	Shul#ep14_2	4_M_FAIRYKID2,{
+	mes "[Shul]";
+	mes "Laphine's put their lives on the line to make Yai beautiful.";
+	mes "I'm a Laphine myself but that kind of priority is difficult to understand.";
+	close;
+}
+
+eclage,137,169,4	script	Tato#ep14_2	4_F_FAIRYKID4,{
+	mes "[Tato]";
+	mes "A friend of mine recently applied to the Splendide unit.";
+	mes "I heard Jotunheim is really cold. I hope he's doing well.";
+	close;
+}
+
+ecl_in01,60,71,4	script	Old Man#ep14_2	4_M_FAIRYKID2,{
+	mes "[Old Man]";
+	mes "Hohoho~!";
+	next;
+	mes "[Old Man]";
+	mes "Looks like there are a lot of interesting visitors nowadays...";
+	mes "When I was young, you had to put your life on the line to go into the foreign lands.";
+	next;
+	mes "[Old Man]";
+	mes "Nowadays, things are much more convenient with de-regulation and all.";
+	mes "And with the warps and flying to all these places, where's all the romance in adventures anymore?";
+	emotion e_pif;
+	next;
+	mes "[Old Man]";
+	mes "Young people nowadays probably don't even know how frog eggs taste like.";
+	next;
+	mes "[Old Man]";
+	mes "It seems like yesterday when I saved enough Jellopies to buy a Tsurugi, but even that Tsurugi is deserted somewhere in storage.";
+	emotion e_sob;
+	close;
+}
+
+ecl_in01,44,53,4	script	Delivery Man#ep14_2	4_M_DOGTRAVELER,{
+	mes "[Delivery Man]";
+	mes "Sigh...";
+	mes "I need to get going in order to make it on time.";
+	next;
+	mes "[Delivery Man]";
+	mes "Wait a minute...";
+	mes "Is it actually better to deliver it later...";
+	mes "I remember seeing so many boxes of pickled Poring in the storage waiting to be delivered...";
+	emotion e_sob;
+	close;
+}
+
+ecl_in01,70,88,4	script	Sack Merchant#ep14_2	4_M_MERCAT1,{
+	mes "[Sack Merchant]";
+	mes "Meow?";
+	mes "Helloeow~";
+	mes "I have a treasure from a place very, very fareow~";
+	mes "Take a lookeow~";
+	mes "I'll give you a good priceow~";
+	close;
+}
+
+ecl_in01,73,51,4	script	Murah#ep14_2	4_M_FAIRYKID,{
+	mes "[Murah]";
+	mes "Hmm... What amazing present should I give?";
+	emotion e_flash;
+	close;
+}
+
+ecl_fild01,192,94,4	script	Golie#ep14_2	4_M_FAIRYKID,{
+	mes "[Golie]";
+	mes "To grow Elder Willow trees,";
+	mes "since Spring, Peco Peco";
+	mes "must have cried as such.";
+	next;
+	mes "[Golie]";
+	mes "To grow Elder Willow trees";
+	mes "the alarm in the clock tower";
+	mes "again must have cried as such.";
+	next;
+	mes "[Golie]";
+	mes "It's a song given to me by a bard from Midgard. The lyrical and nature-oriented words really resonated with me.";
+	next;
+	mes "[Golie]";
+	mes "I would love to hear any songs that you might know also.";
+	close;
+}
+
+ecl_fild01,97,315,4	script	Traveler#ep14_2	4_M_JOB_HUNTER,{
+	mes "[Traveler]";
+	mes "Who are you?";
+	mes "I've never seen you before.";
+	next;
+	mes "[Traveler]";
+	mes "Oh, you came to ask me about the feather, too?";
+	mes "It's just a plain old decoration, but everyone really likes to bother me about it.";
+	next;
+	mes "[Traveler]";
+	mes "If you are thinking about selling it, you should just give up.";
+	mes "I have no wishes to sell it no matter how much you beg.";
+	next;
+	mes "[Traveler]";
+	mes "This feather...";
+	close;
+}
+
+// Wanted to be Big and Beautiful
+//============================================================
+eclage,282,255,4	script	Wuhari#eclbig	4_M_FAIRYKID6,{
+	mes "[Wuhari]";
+	mes "Ah... Is there anyone with more experienced with this...";
+	close;
+}
+
+eclage,163,228,4	script	Goatie#eclbig	4_F_FAIRYKID3,{
+	mes "[Goatie]";
+	mes "Have you ever been to the palace?";
+	mes "They say that it is so much more beautiful than our Yai's could ever be.";
+	next;
+	mes "[Goatie]";
+	mes "I guess people who have nothing can only dream.";
+	close;
+}
+
+eclage,170,195,4	script	Svery#eclbig	4_M_FAIRYKID2,{
+	mes "[Svery]";
+	mes "It's my wife's big wish to visit the palace.";
+	next;
+	mes "[Svery]";
+	mes "I want to grant that wish for her, but how could that ever be possible.";
+	mes "Especially given our situation...";
+	close;
+}
+
+eclage,126,151,4	script	Pompe#eclbig	4_M_FAIRYKID3,{
+	mes "[Pompe]";
+	mes "I saw it!";
+	next;
+	mes "[Pompe]";
+	mes "I really saw it!!";
+	close;
+}
+
+// Mystery Robbery Investigation
+//============================================================
+eclage,164,102,3	script	Cruyan#eclage	4_M_FAIRYKID,{}
+
+eclage,222,131,4	script	Wandering Merchant#ecla	1_M_SIGNMCNT,{
+	mes "[Wandering Merchant]";
+	mes "Go away kids~";
+	close;
+}
+
+// Troublesome Fairie
+//============================================================
+ecl_in01,26,88,4	script	Cecilia#nk	4_F_FAIRYKID5,{
+	mes "[Cecilia]";
+	mes "Mm...mm... what should I do...";
+	next;
+	mes "- She seems too busy to talk to you. -";
+	close;
+}
+
+ecl_in01,80,77,4	script	Dominic#nk	4_M_FAIRYKID4,{
+	mes "[Dominic]";
+	mes "I won't stop you from walking around in Eclage but, don't bother me you outsider!";
+	close;
+}
+
+ecl_in02,160,36,4	script	Eirinn#nk	4_F_FAIRYKID6,{
+	mes "[Eirinn]";
+	mes "Oww, my stomach hurts!!";
+	mes "What are you looking at?";
+	next;
+	mes "[Eirinn]";
+	mes "I haven't really eaten anything unusual these days but why am I getting stomach aches so often!";
+	close;
+}
+
+ecl_in03,175,69,4	script	Bourbon#nk	4_M_FAIRYKID3,{
+	mes "[Bourbon]";
+	mes "How strange. I've been losing my stuff recently like things I put in my pocket or even the things I put away properly.";
+	close;
+}
+
+ecl_in01,82,80,0	script	Monthly Eclage#pa0829	HIDDEN_NPC,{
+	mes "^000099I see a plain-looking journal. It seems to deal with third-rate gossip stories.^000000";
+	close;
+}
+
+ecl_in01,82,78,0	script	Magazine#01	HIDDEN_NPC,{
+	mes "- I saw a book and stretched my hand out to reach for it. I think it's about Midgard. -";
+	next;
+	mes "[Dominic]";
+	mes "Hey, outsider,";
+	mes "who said you can touch my books?";
+	mes "Stay away from my bookshelves!";
+	close;
+}
+ecl_in01,82,79,0	duplicate(Magazine#01)	Magazine#02	HIDDEN_NPC
+ecl_in01,83,81,0	duplicate(Magazine#01)	Exploration of Midgard::ExplorationMidgard1	HIDDEN_NPC
+ecl_in01,82,84,0	duplicate(Magazine#01)	Exploration of Midgard::ExplorationMidgard2	HIDDEN_NPC
+ecl_in01,80,86,0	duplicate(Magazine#01)	Exploration of Midgard::ExplorationMidgard3	HIDDEN_NPC
+
+// Hiel's Workshop
+//============================================================
+eclage,155,91,4	script	#pa0829Hiel's Door10	2_BOARD2,{
+	mes "[Notice]";
+	mes "Pan-galactic ultra genius engineer Hiel's strange and creepy workshop.";
+	mes "Normal Laphines, animals, and Saphas are prohibited.";
+	next;
+	if(select("Continue on my way.:Enter this place.") == 2)
+		warp "ecl_in04",107,213;
+	close;
+}
+
+ecl_in04,108,215,0	script	Supreme Electronic Rope	HIDDEN_NPC,{
+	mes "If you would like to go down, please press the bell~";
+	next;
+	if(select("Forget it.:Go down.") == 2)
+		warp "eclage",152,91;
+	close;
+}
+
+ecl_in04,105,216,0	script	Hiel's Workshop#pa0829	HIDDEN_NPC,{
+	mes "^000099It's a workshop with lots of oddities.^000000";
+	close;
+}
+
+ecl_in04,109,215,2	script	Hiel#pa0829	4_M_FAIRYSCHOLAR,{
+	mes "[Hiel]";
+	mes "It is said that the leaves from home tree have the length X with the average m and standard deviation of 4. If P(m<X<a)=0.3413 ... (Mumble mumble)";
+	next;
+	mes "^0000ffIt doesn't look like I'll understand anything he says. Let's get out of here.^000000";
+	close;
+}
+
+// For Eclage
+//============================================================
+function	script	F_Eclage_Traveler	{
+	if (checkquest(7411) > -1 && checkquest(7412) > -1 && checkquest(7413) > -1) {
+		cutin "minuel01.bmp",4;
+		donpcevent "Eclage Guard#tl01::OnEnable";
+		mes "[Eclage Guard]";
+		mes "Excuse me for a moment.";
+		mes "Is there anyone from Splendide here?";
+		next;
+		select("I am, but why?");
+		mes "[Eclage Guard]";
+		mes "Ah, you are?";
+		mes "There's someone who wants to see you. Do you have time right now?";
+		next;
+		mes "[Eclage Guard]";
+		mes "You don't have to worry. It's nothing suspicious or bad.";
+		mes "We just wanted to ask you about Splendide, so please spare your time for us.";
+		next;
+		mes "[Eclage Guard]";
+		mes "I'll guide you if it's okay.";
+		next;
+		switch(select("Sure. Let's go.:I don't have time for it right now...")) {
+		case 1: //missing
+			break;
+		case 2:
+			mes "[Eclage Guard]";
+			mes "Oh, is that right?";
+			mes "That's too bad.";
+			mes "But if you have some time later, please pay us a visit.";
+			next;
+			break;
+		}
+		mes "[Eclage Guard]";
+		mes "I'll be at the east side of the plaze near the gate.";
+		mes "Please, find me there.";
+		mes "I'll be looking forward to seeing you.";
+		erasequest 7411;
+		erasequest 7412;
+		erasequest 7413;
+		setquest 7414;
+		set ep14_2_tl,1;
+		donpcevent "Eclage Guard#tl01::OnDisable";
+		close2;
+		cutin "minuel01.bmp",255;
+		end;
+	}
+	return;
+}
+
+ecl_in01,32,52,4	script	Traveler Fome#tl01	4_F_DOGTRAVELER,3,3,{
+	if (ep14_2_tl == 0) {
+		if (checkquest(7411) == -1) {
+			mes "[Fome]";
+			mes "Come here and have a talk with us.";
+			mes "My name is Fome and I'm from the central region of Alpheim.";
+			mes "You are...";
+			next;
+			mes "[Fome]";
+			mes "Wait, let me guess!";
+			mes "You're a member of the famous Midgard expedition, right?!";
+			next;
+			select("Yes.:How did he know?");
+			mes "[Fome]";
+			mes "Well, it's simple.";
+			mes "There's no one who looks like you or dresses like you around Eclage.";
+			next;
+			mes "[Fome]";
+			mes "I heard the ways to Bifrost are blocked by a strange rift and soon, travelers who came here through the Hazy Forest started to appear.";
+			next;
+			mes "[Fome]";
+			mes "They are humans who came from Midgard passing through Jotunheim!";
+			mes "Seriously...I'm glad I came to Eclage.";
+			mes "I didn't expect to meet a person from Midgard!";
+			next;
+			mes "[Fome]";
+			mes "Eclage is crowded with travelers, and until recently, most of them were from Alpheim.";
+			mes "It's nice to see you. I was about to talk to you just now.";
+			next;
+			switch(select("Why is Eclage popular among travelers?:What is the main attraction of Eclage?")) {
+			case 1:
+			case 2: //missing
+				mes "[Fome]";
+				mes "Why does this place have so many travelers...?";
+				mes "First of all, I think it's due to the fact that you're able to communicate freely here since Eclage is with Bifrost.";
+				next;
+				mes "[Fome]";
+				mes "Thanks to Bifrost's will, everyone is able to communicate with no problem here just like you and I right now.";
+				next;
+				mes "[Fome]";
+				mes "Second, it's because Eclage is the end and the gateway of Alpheim.";
+				mes "It's the only way to get to Jotunheim.";
+				next;
+				mes "[Fome]";
+				mes "A great number of travelers who admire the unknown world come to Eclage.";
+				mes "Also, they want to see Bifrost, which connects Jotunheim and Alpheim, with their own eyes.";
+				next;
+				mes "[Fome]";
+				mes "Moreover, the biggest reason why Eclage is so crowded recently is...!!!";
+				next;
+				select("It is...?!");
+				emotion e_loud;
+				mes "[Fome]";
+				mes "A new Mayor Jun was born!";
+				next;
+				select("Whosa whatsits?");
+				mes "[Fome]";
+				mes "No, no, Mayor Jun. It's a Laphine name.";
+				mes "It's a...right, it means a 'king.'";
+				mes "The King is born!";
+				next;
+				mes "[Fome]";
+				mes "Although he is pretty old, he became a king.";
+				mes "As the king of Laphines, he is so beautiful.";
+				next;
+				select("When was that?");
+				mes "[Fome]";
+				mes "Mm? Maybe 10 years ago?";
+				mes "5 years ago? Or 15? Anyway, it's less than 100 years.";
+				next;
+				break;
+			}
+			setquest 7411;
+			callfunc "F_Eclage_Traveler";
+			mes "This traveler named Fome is going on forever about the king of Laphines.";
+			mes "It seems as if she doesn't care about others and is sinking into her own world, so it's hard to understand what she's talking about.";
+			mes "Let's talk to other travelers.";
+			close;
+		} else {
+			mes "[Fome]";
+			mes "Oh my, did I talk too much?";
+			mes "But you're really lucky.";
+			mes "If you tell them that you're here to congratulate on the birth of new Mayor Jun, you'll surely meet the great Kardui.";
+			next;
+			mes "[Fome]";
+			mes "Ah...how beautiful.";
+			mes "I heard some bad rumors but I don't believe in them at all~";
+			next;
+			mes "[Fome]";
+			mes "Ha, I almost went too far again.";
+			mes "Did you talk to Litrip and York?";
+			next;
+			mes "[Fome]";
+			mes "When it comes to Bifrost Tower, which is the most popular tourist attraction, Litrip knows the best!";
+			close;
+		}
+	} else if (ep14_2_tl == 1) {
+		mes "[Fome]";
+		mes "An Eclage Guard was looking for you just a minute ago, right?";
+		mes "I think he said he'll be waiting for you at the east gate. Don't you have to go?";
+		next;
+		mes "[Fome]";
+		mes "Since he was very polite and all, I'm sure it's something good.";
+		mes "Sure. The Laphines in Eclage are very generous to travelers.";
+		close;
+	} else {
+		mes "[Fome]";
+		mes "You seem very busy.";
+		mes "I heard so much about you from here and there.";
+		mes "I see that you're friends with Laphines already.";
+		close;
+	}
+OnTouch:
+	if (ep14_2_tl == 0 && checkquest(7411) == -1 && checkquest(7412) == -1 && checkquest(7413) == -1) {
+		mes "A group of travelers of Alpheim are having a conversation.";
+		emotion e_loud;
+		next;
+		if(select("Avoid them.:Join the group.") == 1) {
+			mes "They don't seem to care that much.";
+			close;
+		}
+		mes "When you approach, they stop talking for a second and make a seat for you.";
+		mes "Start a conversation.";
+		close;
+	}
+	end;
+}
+
+ecl_in01,32,51,6	script	Traveler Litrip#tl02	4_M_DOGTRAVELER,{
+	if (ep14_2_tl == 0) {
+		if (checkquest(7412) == -1) {
+			mes "[Litrip]";
+			mes "Oh, look at this strange traveler.";
+			mes "Come here. My name is Litrip.";
+			next;
+			mes "[Litrip]";
+			mes "You're from Mora?";
+			mes "You must have seen Bifrost Tower on the way then?";
+			next;
+			switch(select("I saw it from the outside.:I've gone inside the tower.")) {
+			case 1:
+				mes "[Litrip]";
+				mes "Really? That's too bad.";
+				mes "Well, but it's good to play it safe since there are frightful monsters inside the tower.";
+				mes "It's certainly better than losing your life by being rash.";
+				next;
+				break;
+			case 2:
+				mes "[Litrip]";
+				mes "I see. Wasn't it pretty crazy?";
+				mes "Once upon a time, It used to be a very nice observatory.";
+				next;
+				mes "[Litrip]";
+				mes "Although it's occupied by horrible monsters now.";
+				mes "Seeing that you went into the tower and came out unharmed, I can tell you're pretty skilled.";
+				next;
+				break;
+			}
+			mes "[Litrip]";
+			mes "There's a rumor that a suspicious alchemist resides on top of the tower.";
+			mes "No one knows why, but I heard he's been there for a good while.";
+			next;
+			mes "[Litrip]";
+			mes "If that alchemist is still alive, he could be a living history himself since the tower, the alchemist, and Bifrost have existed even before Eclage was founded.";
+			next;
+			mes "[Litrip]";
+			mes "A good number of people still challenge themselves to find the mysterious legend of Bifrost but so far, none of them succeeded.";
+			next;
+			select("What about Laphines?");
+			mes "[Litrip]";
+			mes "Hmm, Laphines?";
+			mes "For some reason, they're not interested in Bifrost Tower at all.";
+			mes "I think they perceive it just as a natural object.";
+			next;
+			mes "[Litrip]";
+			mes "They're actually more than capable of solving the mystery if they wanted to but I feel like they're just respecting the existence of Bifrost Tower.";
+			next;
+			mes "[Litrip]";
+			mes "However, they don't necessarily stop people from going into the tower, either. So I'm thinking maybe they're just not aware of it.";
+			mes "If you're curious, go challenge yourself and solve the mystery of the tower.";
+			next;
+			setquest 7412;
+			callfunc "F_Eclage_Traveler";
+			mes "[Litrip]";
+			mes "If you ever happen to solve the mystery of Bifrost Tower, let me be the first one to know about it.";
+			mes "You're strong enough to explore the tower.";
+			mes "I only got to the first floor. Haha.";
+			next;
+			mes "[Litrip]";
+			mes "Have you talked to other friends?";
+			mes "Isn't information the most important thing to a traveler?";
+			close;
+		} else {
+			mes "[Litrip]";
+			mes "It's not fun listening to my story only.";
+			mes "You should go talk to Fome and Chiba, too.";
+			next;
+			mes "[Litrip]";
+			mes "And Let me know if you ever solve the mystery of Bifrost Tower.";
+			mes "I'll be looking forward to hearing from you, hahaha.";
+			close;
+		}
+	} else if (ep14_2_tl == 1) {
+		mes "[Litrip]";
+		mes "It seems like Laphines have some official affairs to do with you.";
+		mes "Didn't they tell you to come to the east gate?";
+		mes "You should go.";
+		close;
+	} else {
+		mes "[Litrip]";
+		mes "Since the last time I saw you talking to the guard, I hear your name here and there.";
+		mes "Is it something important? You've become pretty famous here.";
+		close;
+	}
+}
+
+ecl_in01,35,51,2	script	Traveler Chiba#tl03	4_M_DOGTRAVELER2,{
+	if (ep14_2_tl == 0) {
+		if (checkquest(7413) == -1) {
+			mes "[Chiba]";
+			mes "You're human from Midgard.";
+			mes "I'm Chiba.";
+			mes "As you can see, I'm a traveler just like you.";
+			next;
+			mes "[Chiba]";
+			mes "I think local area information is the most important when traveling.";
+			mes "You think so, too?";
+			next;
+			mes "[Chiba]";
+			mes "I heard there's a way to avoid a rift that is blocking Jotunheim...";
+			mes "Do people really travel through Hazy Forest?";
+			next;
+			switch(select("Yes.:By magic!")) {
+			case 1:
+				mes "[Chiba]";
+				mes "So it is.";
+				mes "That's how strong humans are, I guess.";
+				mes "When I was Mora, I heard there are many missing men in Hazy Forest...";
+				next;
+				break;
+			case 2:
+				mes "[Chiba]";
+				mes "Indeed... people who get to Mora first use magic to help others travel?";
+				mes "That's brilliant.";
+				next;
+				break;
+			}
+			mes "[Chiba]";
+			mes "Anyway it's true that there are active interactions thanks to you people.";
+			mes "I should be grateful for that.";
+			next;
+			mes "[Chiba]";
+			mes "Do you want to know something more interesting?";
+			mes "Everyone in Alpheim knows about it, but I'm sure you people have never heard about it.";
+			next;
+			mes "[Chiba]";
+			mes "Among Laphines, have you seen the taller ones with especially bright skin and gorgeous wings?";
+			next;
+			mes "[Chiba]";
+			mes "They're the 'Donas.' By the way, normal-looking Laphines are called 'Papang' in their language.";
+			mes "It sounds like some kind of a snack, but well, we should respect them.";
+			next;
+			mes "[Chiba]";
+			mes "The reason Donas are taller and gorgeous is because they're all candidates for Mayor.";
+			mes "That is, they all have a chance of becoming the king.";
+			next;
+			mes "[Chiba]";
+			mes "We're not talking about upper class or lower class here. They are classified according to their job.";
+			mes "It might not be important, but it's good to know about it as a foreigner.";
+			next;
+			mes "[Chiba]";
+			mes "Anyway, Donas have strong magical powers and they live longer. But since there are not many of them most of them are assigned to important positions.";
+			next;
+			mes "[Chiba]";
+			mes "The throne of the king of Laphines seems to be inherited by blood, but it isn't in reality.";
+			mes "Mayor Jun is known to emerge among the Donas but it's just exactly that.";
+			next;
+			mes "[Chiba]";
+			mes "He literally just emerges without any kind of a formal inheritance process.";
+			mes "Isn't it pretty interesting?";
+			next;
+			setquest 7413;
+			callfunc "F_Eclage_Traveler";
+			mes "[Chiba]";
+			mes "Try talking to the other travelers."; //custom
+			close;
+		} else {
+			mes "[Chiba]";
+			mes "Try talking to the other travelers."; //custom
+			close;
+		}
+	} else if (ep14_2_tl == 1) {
+		mes "[Chiba]";
+		mes "Wasn't there an Eclage Guard looking for you just now?";
+		mes "You'd better respect Laphines as much as possible in order to avoid any discord.";
+		mes "It's the basis of traveling.";
+		close;
+	} else {
+		mes "[Chiba]";
+		mes "So, you weren't a mere traveler after all.";
+		close;
+	}
+}
+
+ecl_in01,82,70,2	script	Eclage Guard#tl02	4_M_FAIRYSOLDIER,{
+	if (ep14_2_tl == 0) {
+		mes "[Eclage Guard]";
+		mes "Welcome to Eclage."; //custom
+		close;
+	} else if (ep14_2_tl == 1) {
+		cutin "minuel02.bmp",2;
+		mes "[Eclage Guard]";
+		mes "Oh, you are here!";
+		mes "May I escort take you to the one who wants to meet you?";
+		next;
+		switch(select("Sure. Let's go.:I don't have time for it right now...")) {
+		case 1:
+			mes "[Eclage Guard]";
+			mes "Please follow me then.";
+			erasequest 7414;
+			setquest 7415;
+			set ep14_2_tl,2;
+			close2;
+			warp "ecl_in03",244,89;
+			cutin "minuel02.bmp",255;
+			end;
+		case 2:
+			mes "[Eclage Guard]";
+			mes "Ah...is that right?";
+			mes "I'll wait then.";
+			next;
+			mes "[Eclage Guard]";
+			mes "Don't worry about me.";
+			mes "I'll just wait here as long as it takes.";
+			mes "Well, it's my job. Don't worry.";
+			close2;
+			cutin "minuel02.bmp",255;
+			end;
+		}
+	} else if (ep14_2_tl == 2) {
+		cutin "minuel01.bmp",2;
+		mes "[Eclage Guard]";
+		mes "I thought you sill had something to do.";
+		mes "May I guide you?";
+		next;
+		switch(select("Yes, please.:No, it's okay.")) {
+		case 1:
+			mes "[Eclage Guard]";
+			mes "Please follow me then.";
+			close2;
+			warp "ecl_in03",244,89;
+			cutin "minuel02.bmp",255;
+			end;
+		case 2:
+			mes "[Eclage Guard]";
+			mes "Is that right?";
+			mes "I see. Come find me whenever you need it.";
+			close2;
+			cutin "minuel02.bmp",255;
+			end;
+		}
+	} else if (ep14_2_tl == 3) {
+		cutin "minuel01.bmp",2;
+		mes "[Eclage Guard]";
+		mes "I see you pretty often.";
+		mes "I was notified in advance that the Chief of Staff requested for an audience.";
+		next;
+		if (checkquest(7416,PLAYTIME) < 2) {
+			mes "[Eclage Guard]";
+			mes "But I'm afraid it's too early.";
+			mes "I think you have to wait for a while.";
+			close2;
+			cutin "minuel02.bmp",255;
+			end;
+		}
+		mes "[Eclage Guard]";
+		mes "I see you pretty often.";
+		mes "I was notified in advance that the Chief of Staff requested for an audience.";
+		next;
+		mes "[Eclage Guard]";
+		mes "Since it's about time, should I lead you in now?";
+		next;
+		switch(select("Yes, please.:I'll come back later.")) {
+		case 1:
+			mes "[Eclage Guard]";
+			mes "Follow me, please.";
+			set ep14_2_tl,4;
+			close2;
+			warp "ecl_in03",58,72;
+			cutin "minuel02.bmp",255;
+			end;
+		case 2:
+			mes "[Eclage Guard]";
+			mes "Do as you wish although Mayor Jun might be upset if you keep him waiting for too long.";
+			close2;
+			cutin "minuel02.bmp",255;
+			end;
+		}
+	} else if (ep14_2_tl == 4) {
+		cutin "minuel01.bmp",2;
+		mes "[Eclage Guard]";
+		mes "May I escort you to the audience chamber?";
+		next;
+		switch(select("Yes, please.:No, it's okay.")) {
+		case 1:
+			mes "[Eclage Guard]";
+			mes "Follow me, please.";
+			close2;
+			warp "ecl_in03",58,72;
+			cutin "minuel02.bmp",255;
+			end;
+		case 2:
+			mes "[Eclage Guard]";
+			mes "Thank you.";
+			mes "I thought you were using me for teleportation since you're here so often.";
+			close2;
+			cutin "minuel02.bmp",255;
+			end;
+		}
+	} else if (ep14_2_tl == 5) {
+		if (checkquest(7418) == -1) {
+			cutin "minuel01.bmp",2;
+			mes "[Eclage Guard]";
+			mes "Eh, good to see you again.";
+			mes "We should have introduced ourselves earlier if we knew we would run into each other so often like this.";
+			next;
+			mes "[Minuel]";
+			mes "I'm Minuel.";
+			mes "It's such a common name. I don't even know what it means.";
+			mes "I think my parents just gave me a name that is easy on the ear.";
+			next;
+			mes "[Minuel]";
+			mes "Come to think of it, I heard the news.";
+			mes "You've decided to work in Eclage...";
+			next;
+			switch(select("It's just a rumor.:Do they have a job for me?")) {
+			case 1:
+				mes "[Minuel]";
+				mes "Eh? Really?";
+				mes "That's too bad. There was a suitable job for you.";
+				mes "Well, I understand.";
+				close2;
+				cutin "minuel02.bmp",255;
+				end;
+			case 2:
+				mes "[Minuel]";
+				mes "Actually I don't have any time for myself since I have to be here all the time.";
+				mes "Not only I, but most Laphines who are in this business are faced with that position, too.";
+				next;
+				mes "[Minuel]";
+				mes "So, we don't have any time to decorate our Yai.";
+				mes "Of course we could buy the materials. But just like any other consumers, we would like to gather them on our own.";
+				next;
+				mes "[Minuel]";
+				mes "Since you're free to go anywhere,";
+				mes "could you gather some decorations for Yai?";
+				next;
+				switch(select("Sure.:No.")) {
+				case 1:
+					mes "[Minuel]";
+					mes "Thank you.";
+					mes "You need to find";
+					mes "5 Horns of Hillslion, 5 Magical Powers, and 5 Horse's Hooves each.";
+					next;
+					mes "[Minuel]";
+					mes "I would like to decorate it with unpolished beauty.";
+					mes "You can get the materials by hunting the monsters near Splendide, where I'm not supoosed to go.";
+					next;
+					mes "[Minuel]";
+					mes "I've heard some rumors about Hillslions, and they seem to appear in Sapha's areas.";
+					mes "Their horns, Mystic Horns of Cornuses that live in the grasslands and something called Horse's Hooves.";
+					next;
+					mes "[Minuel]";
+					mes "I'm sure you would know more about those hooves than I do.";
+					mes "I'll be counting on you!";
+					setquest 7418;
+					close2;
+					cutin "minuel02.bmp",255;
+					end;
+				case 2:
+					mes "[Minuel]";
+					mes "Ha, do you really think so?";
+					mes "You will be coming here again.";
+					mes "Soon, in the near future. Hehehe~";
+					close2;
+					cutin "minuel02.bmp",255;
+					end;
+				}
+			}
+		}
+		mes "[Minuel]";
+		mes "I asked you for 5 Horns of Hillslion, 5 Mystic Horns, and 5 Horse's Hooves.";
+		mes "You'll be able to get Mystic Horns by catching Cornuses near Splendide.";
+		close;
+	}
+}
+
+ecl_in03,245,93,2	script	Chief of Staff#tl01	4_F_FAIRY,{
+	if (ep14_2_tl < 2) {
+		mes "[Chief of Staff]";
+		mes "Sorry, but no unauthorized entry is allowed here.";
+		close;
+	} else if (ep14_2_tl == 2) {
+		mes "[Chief of Staff]";
+		mes "Welcome to Eclage.";
+		mes "I ordered them to lead you here.";
+		next;
+		mes "[Shenime]";
+		mes "I'm in charge of the military supplies that are sent to the outpost of Splendide.";
+		mes "My name is Shenime.";
+		next;
+		mes "[Shenime]";
+		mes "Our supplies sent to Mora Village...";
+		mes "oww...I'm sorry. I've been having this headache recently...";
+		next;
+		mes "[Shenime]";
+		mes "Anyway, I've heard that there are people";
+		mes "who deliver our supplies to Splendide through Hazy Forest.";
+		next;
+		mes "[Shenime]";
+		mes "It's so good to see you in person.";
+		mes "People who are clever enough are already trying hard to build relationships with Eclage.";
+		next;
+		select("So, I'm not the first one?");
+		mes "[Shenime]";
+		mes "Yes, you're not...oww...";
+		mes "But it doesn't matter.";
+		mes "You humans are already doing so much for Splendide and us.";
+		next;
+		mes "[Shenime]";
+		mes "Oh, the reason I'm frowning is because of this headache.";
+		mes "Don't get me wrong.";
+		mes "Um...anyway, to go on with my story...";
+		next;
+		mes "[Shenime]";
+		mes "We are supposed to welcome you.";
+		mes "Should I get to the point now? I mean, the reason why I wanted to meet you.";
+		next;
+		mes "[Shenime]";
+		mes "As you know already, we're disconnected from Splendide due to the accident in Bifrost.";
+		mes "And for us Laphines, it's hard to go against the will of the forest and Bifrost.";
+		next;
+		mes "[Shenime]";
+		mes "I'm sure every fairy in Alpheim feels the same, too.";
+		mes "Anyway, I want to know what's going on in Splendide and Jotunheim nowadays.";
+		next;
+		mes "[Shenime]";
+		mes "I heard the battle against Manuk has recently calmed down to the point of a truce...";
+		mes "and it could have been that they didn't get supplies in time.";
+		next;
+		mes "You've answered Shenime's serious questions and describe the situation as far as you could remember.";
+		next;
+		select("Now that I think about it...");
+		mes "[Shenime]";
+		mes "What is it?";
+		mes "What you've told me is going to be very helpful.";
+		mes "Is there anything else you would like to talk about?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I was told that Sapha made Yggdrasil Tree sick,";
+		mes "and your side started a war in order to protect the tree...";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "...but what I know is a little bit different from that.";
+		mes "Apparently, the cause of the war seems to be the damage given to Yggdrasil Tree caused by Sapha's excessive mining, but...";
+		next;
+		mes "[Shenime]";
+		mes "Wait, stop there.";
+		next;
+		select("What's the matter?");
+		mes "[Shenime]";
+		mes "This war is like a holy war for us.";
+		mes "It's a war that we carry on upon our honor and dignity.";
+		next;
+		mes "[Shenime]";
+		mes "So whatever the truth you know is,";
+		mes "if you're not going to hold responsibility for the backlash it might bring,";
+		mes "don't say anything at all.";
+		next;
+		select("Why are you trying to hide the truth...");
+		mes "[Shenime]";
+		mes "This is a matter between Yggdrasil the world-ash and its protector.";
+		mes "Mayor Jun should be the one listening to your story, not me.";
+		next;
+		select("What?");
+		mes "[Shenime]";
+		mes "My work is done here.";
+		mes "What I'm saying is that I'm not the one to clear up your question.";
+		mes "I'll arrange a meeting with Mayor Jun for you.";
+		next;
+		mes "In the middle of the conversation, Shenime stopped talking and frowned as if he was having a headache again.";
+		mes "After massaging his head for a while, he looked much better and continued to go on.";
+		next;
+		mes "[Shenime]";
+		mes "Promise me that you will not tell anyone";
+		mes "about the truth that you believe.";
+		next;
+		if(select("No!:Yes, I promise.") == 1) {
+			mes "[Shenime]";
+			mes "You put me on the spot.";
+			mes "I don't want you to be the cause of friction.";
+			next;
+			mes "[Shenime]";
+			mes "Can't you just keep it to yourself before discussing the matter with Mayor Jun?";
+			next;
+			switch(select("No, I can't!:Fine, I won't tell anyone.")) {
+			case 1:
+				mes "[Shenime]";
+				mes "Oh well...";
+				mes "It's your loss...";
+				close;
+			case 2:
+				mes "[Shenime]";
+				mes "I see that you've made up your mind.";
+				next;
+				break;
+			}
+		}
+		mes "[Shenime]";
+		mes "I'll arrange a meeting to let Mayor Jun get to know you.";
+		mes "You need to wait a little bit. Please bear with us.";
+		next;
+		mes "[Shenime]";
+		mes "I'll notify the guard that brought you here.";
+		mes "Go find the guard after some time.";
+		mes "He will guide you.";
+		next;
+		mes "[Shenime]";
+		mes "Until then, I hope you have a good time.";
+		mes "I'll send you to the plaza.";
+		mes "By the way, the guard who is going to lead you will be at the east gate. Don't forget the time.";
+		erasequest 7415;
+		setquest 7416;
+		set ep14_2_tl,3;
+		close2;
+		warp "ecl_in01",47,28;
+		end;
+	} else if (ep14_2_tl == 3) {
+		if (checkquest(7416,PLAYTIME) < 2) {
+			mes "[Shenime]";
+			mes "You need to wait a little longer to see Mayor Jun.";
+			mes "He is pretty busy, so please bear with us.";
+			close;
+		}
+		mes "[Shenime]";
+		mes "There's another guard who was supposed to be guiding you...";
+		mes "I can't go anywhere right now.";
+		next;
+		mes "[Shenime]";
+		mes "There's a guard at the east side of the plaza near the gate.";
+		mes "I notified him already, so just ask him to guide you.";
+		close;
+	} else if (ep14_2_tl == 4) {
+		mes "[Shenime]";
+		mes "Did you tell Mayor Jun about what you think?";
+		mes "He should be the one to decide.";
+		next;
+		mes "[Shenime]";
+		mes "It seems like you haven't even met him yet. Ask the guard to guide you.";
+		close;
+	} else if (ep14_2_tl == 5) {
+		mes "[Shenime]";
+		mes "I've heard about you.";
+		mes "You've decided to work for Eclage?";
+		next;
+		mes "[Shenime]";
+		mes "At the starting point of Bifrost, there should be a messenger stamping his feet.";
+		next;
+		mes "[Shenime]";
+		mes "It's a messenger that we sent in an effort to contact Splendide regularly,";
+		mes "but I think it's still difficult to do so.";
+		next;
+		mes "[Shenime]";
+		mes "If you could help us with that, wouldn't other Laphines think better of you?";
+		close;
+	}
+}
+
+ecl_in03,41,90,2	script	Mayor Jun Kardui#tl01	4_M_FARIYKING,{
+	if (ep14_2_tl < 4) {
+		mes "[Kardui]";
+		mes "Mmm...";
+		mes "I don't know who you are, but could you wait until I call you?";
+		mes "I'll have to meet you some day, but now is not the right time.";
+		cutin "kardui01.bmp",1;
+		close2;
+		cutin "kardui01.bmp",255;
+		end;
+	} else if (ep14_2_tl == 4) {
+		mes "[Kardui]";
+		mes "Welcome to Eclage, stranger.";
+		mes "...this was a popular way of greeting each other, but I guess it's not fun anymore.";
+		cutin "kardui01.bmp",1;
+		next;
+		mes "[Kardui]";
+		mes "Anyway, you who came from a long way away";
+		mes "and reconized by the guardian.";
+		mes "There is a truth that you would like to tell me?";
+		next;
+		mes "[Kardui]";
+		mes "If that's the case, you will be very busy from now on.";
+		next;
+		select("What do you mean?");
+		mes "[Kardui]";
+		mes "You have to do a lot of work in order to convince me, the elders, and many other Laphines.";
+		next;
+		mes "[Kardui]";
+		mes "Of couse I could trust everything you say,";
+		mes "but will other Laphines accept a Mayor Jun who is swayed by a word of a foreigner?";
+		next;
+		cutin "kardui03.bmp",1;
+		mes "[Kardui]";
+		mes "Especially when that Mayor Jun is me. Ah...";
+		next;
+		cutin "kardui01.bmp",1;
+		mes "[Kardui]";
+		mes "Don't you understand?";
+		mes "Here, in Eclage, You have to get more recognition from Laphines.";
+		next;
+		if(select("Do I have to make a contribution?:It's about Yggdrasil!") == 1) {
+			mes "[Kardui]";
+			mes "See, you understood it right.";
+			next;
+			select("It's about Yggdrasil!");
+		}
+		cutin "kardui04.bmp",1;
+		mes "[Kardui]";
+		mes "Um.";
+		mes "I know.";
+		next;
+		mes "[Kardui]";
+		mes "You don't have to make a face.";
+		mes "No matter what I look like to you, I am the history and the spirit of Laphines, and also the protector of Yggdrasil.";
+		next;
+		mes "[Kardui]";
+		mes "Do you think I, who inherited the will of Yggdrasil, don't know anything?";
+		mes "I don't blame you since it is ignorance.";
+		next;
+		mes "[Kardui]";
+		mes "The war of Jotunheim will soon be over.";
+		mes "And it will happen not by constraint, but as a result of mutual agreement.";
+		next;
+		cutin "kardui01.bmp",1;
+		mes "[Kardui]";
+		mes "So, stranger,";
+		mes "don't worry about it and do you want to work with me for Eclage?";
+		next;
+		select("Then why do you make war and disregard the truth?");
+		cutin "kardui02.bmp",1;
+		mes "[Kardui]";
+		mes "Hmm...";
+		mes "I'll tell you when we get closer to each other.";
+		mes "I'm not obligated to talk about this important subject with a person I just met.";
+		next;
+		cutin "kardui01.bmp",1;
+		mes "[Kardui]";
+		mes "For now, I will tell the administrative ruler, the elders, and all the guards";
+		mes "about you,";
+		mes "and you will enjoy all the rights in Eclage as a person who works for the king.";
+		next;
+		select("Just hire a worker then!");
+		mes "[Kardui]";
+		mes "It's a part of building relationships with me, the king of a race. You don't like it?";
+		mes "If that's the case, I guess there's no friendship between the two of us.";
+		next;
+		select("What do you mean 'the two of us'?");
+		mes "[Kardui]";
+		mes "Us?";
+		mes "Umm...";
+		mes "Friends who share their secrets from now on?";
+		next;
+		mes "[Kardui]";
+		mes "...Haha...wasn't it funny?";
+		mes "What's up with that face.";
+		mes "Anyway, I allow you to visit anytime.";
+		next;
+		cutin "kardui04.bmp",1;
+		mes "[Kardui]";
+		mes "However, if you don't meet my expectation, you won't get anything.";
+		mes "I'll be looking forward to seeing you, stranger who will be my friend.";
+		erasequest 7416;
+		setquest 7417;
+		set ep14_2_tl,5;
+		close2;
+		cutin "kardui01.bmp",255;
+		end;
+	} else if (ep14_2_tl == 5) {
+		mes "[Kardui]";
+		mes "Now, you who work for the king!";
+		mes "Work your fingers to the bone for me!";
+		next;
+		cutin "kardui04.bmp",1;
+		mes "[Kardui]";
+		mes "...It's a joke.";
+		mes "I truly want you to become an important figure in Eclage.";
+		mes "Even if you don't, I want you to be recognized as a harmless person who gives benefit to Eclage.";
+		next;
+		mes "[Kardui]";
+		mes "It's going to be tough, but think of it as having insurance.";
+		mes "Some day, a person who remembers your name will be a great help to you.";
+		close2;
+		cutin "kardui01.bmp",255;
+		end;
+	}
+}
+
+ecl_in01,31,49,6	script	Eclage Guard#tl01	4_M_FAIRYSOLDIER,{
+	mes "[Eclage Guard]";
+	mes "Oh, I should hurry and go back to where I was.";
+	mes "Excuse me.";
+	close;
+OnInit:
+OnDisable:
+	disablenpc "Eclage Guard#tl01";
+	end;
+OnEnable:
+	enablenpc "Eclage Guard#tl01";
+	end;
+}
+
+ecl_fild01,205,86,4	script	Eclage Messenger Roy#tl	4_M_FAIRYSOLDIER2,{
+	if (ep14_2_tl < 5) {
+		mes "[Roy]";
+		mes "I can make it to Mora Village.";
+		mes "But how can I go through Hazy Forest? All alone?";
+		mes "...Ah... I'm just feeling sorry for myself, so just continue on your way.";
+		close;
+	} else {
+		if (checkquest(7419) == -1) {
+			mes "[Roy]";
+			mes "It's hard.";
+			mes "It really is hard.";
+			mes "The more I think about it, I feel like Shenime has a nasty temper.";
+			emotion e_gasp;
+			next;
+			mes "[Roy]";
+			mes "You, who appeared in this time of crisis.";
+			mes "You, who went through Hazy Forest Maze... Are you the guidance of god? Or a blessing from god?";
+			next;
+			mes "[Roy]";
+			mes "I guess I have no other choice.";
+			mes "They say Laphines are nothing without their pride, but since I value my life over pride,";
+			mes "can I ask you a favor?";
+			next;
+			switch(select("What is it?:No.")) {
+			case 1:
+				mes "[Roy]";
+				mes "It's something difficult for Laphines, but for humans, it's very easy.";
+				mes "That is, brining the news from Splendide!";
+				next;
+				mes "[Roy]";
+				mes "I should take care of it but...";
+				mes "my magical powers are not all that great.";
+				next;
+				mes "[Roy]";
+				mes "...well, you don't need to know the details!";
+				mes "You just need to collect mails from the contact officer in Splendide.";
+				next;
+				mes "[Roy]";
+				mes "There's nothing confidential, so you can do it, too.";
+				mes "Bringing one mail. I'm sure it's easy for you.";
+				next;
+				switch(select("Leave it to me!:I don't want to.")) {
+				case 1:
+					mes "[Roy]";
+					mes "Good!";
+					mes "Go to Splendide and meet the contact officer!";
+					mes "Collect mails that are not confidential and could be a love letter to someone!";
+					mes "and bring them to me, please.";
+					setquest 7419;
+					next;
+					mes "[Roy]";
+					mes "Isn't that easy?";
+					mes "I'll be standing here and waiting for you to bring me that mail.";
+					close;
+				case 2:
+					mes "[Roy]";
+					mes "What? You're saying no after making me talk all this time?";
+					mes "....Well, things happen.";
+					mes "But you'll come back. So I'm not worried.";
+					next;
+					mes "[Roy]";
+					mes "Hehe. I knew it.";
+					mes "From the moment they picked me for this job,";
+					mes "everything is in 'the big invisible hand!!'";
+					close;
+				}
+			case 2:
+				mes "[Roy]";
+				mes "Ah...";
+				mes "It took you less than a second to say no, how clear is that.";
+				mes "Now, I'll erase the memory of this very moment!";
+				next;
+				mes "[Roy]";
+				mes "So that I could ask you again with a renewed mind.";
+				mes "Ahahahah...ha...hahha..hahaa..";
+				close;
+			}
+		}
+		mes "[Roy]";
+		mes "Let me explain again.";
+		mes "Go to Splendide and meet the contact officer!";
+		mes "Collect mails that are not confidential and could be a love letter to someone!";
+		mes "and bring them to me, please.";
+		close;
+	}
+}
+
+eclage,112,40,4	script	Eclage Guard Leo#tl	4_M_FAIRYSOLDIER2,{
+	if (ep14_2_tl < 5) {
+		mes "[Leo]";
+		mes "Welcome to Eclage, the capital of Laphines and a gateway to Alpheim.";
+		mes "I hope you enjoy your trip.";
+		close;
+	} else {
+		if (checkquest(7420) == -1) {
+			mes "[Leo]";
+			mes "Hi, how are you?";
+			emotion e_gasp;
+			next;
+			mes "[Leo]";
+			mes "How are you, really!";
+			next;
+			mes "[Leo]";
+			mes ".....";
+			next;
+			switch(select("Does he want something?:It's a strange fairy!")) {
+			case 1:
+				mes "[Leo]";
+				mes "Mayor Jun told us";
+				mes "that you would do anything for Laphines and Eclage.";
+				next;
+				mes "[Leo]";
+				mes "In order to take care of the urgent matter...";
+				next;
+				switch(select("No, I refuse!:What do you want me to do?")) {
+				case 1:
+					mes "[Leo]";
+					mes "Although you have all the rights to say no, this is what I get...";
+					mes "I understand.";
+					close;
+				case 2:
+					mes "[Leo]";
+					mes "It's nothing more than a request for Pinguicula's pickled fruits and Luciola's honey jam,";
+					mes "which are specialties of Splendide...";
+					next;
+					mes "[Leo]";
+					mes "I know it's something personal...but Hazy Forest is such a huge obstacle...";
+					mes "so I couldn't help but...";
+					next;
+					select("You said it's something urgent!!!");
+					mes "[Leo]";
+					mes "I feel like I might die if I don't eat them!!!";
+					mes "What's more urgent than this?!!?!?";
+					next;
+					mes "[Leo]";
+					mes "You visit Splendide pretty often anyway!";
+					mes "On your way back, just carry one under your arm, another in your hand, please~";
+					mes "I won't ask you anything like this ever again!";
+					next;
+					mes "[Leo]";
+					mes "So...is that yes?";
+					mes "I need 3 jars of Pinguicula's pickled fruits and another 3 jars of Luciola's honey jam~";
+					mes "They are sold inside the base of Splendide.";
+					setquest 7420;
+					next;
+					mes "[Leo]";
+					mes "You might need Splendide Coins to buy pickled fruits and honey jam.";
+					mes "You could earn those coins if you work in Splendide, so...hehe..........";
+					next;
+					mes "[Leo]";
+					mes "Helping out in Splendide is eventually helping Eclage, too.";
+					mes "Now, go for it!";
+					close;
+				}
+			case 2:
+				mes "[Leo]";
+				mes "Oh...no. I'm not a weird Laphine.";
+				mes "You got me wrong. It's a misunderstanding...";
+				close;
+			}
+		}
+		mes "[Leo]";
+		mes "I need 3 jars of Pinguicula's pickled fruits and another 3 jars of Luciola's honey jam~";
+		mes "They are specialties of the base of Splendide.";
+		mes "I'll be counting on you!";
+		close;
+	}
+}
+
+ecl_in03,245,54,2	script	Working Laphine	4_F_FAIRYKID4,{	//Laphine on official duty#tl01
+	mes "[Working Laphine]";
+	mes "This is the office area designated for official business.";
+	mes "You're not supposed to be here.";
+	close;
+}
+
+ecl_in03,244,57,4	script	Resting Laphine#tl01	4_F_FAIRYKID5,{
+	mes "Two Laphines from the upper class are talking about something.";
+	mes "One of them seems to be working and very annoyed.";
+	mes "As if they were aware of my stare, they waved me away with a show of irritation.";
+	close;
+}
+
+ecl_in02,98,32,2	script	Eclage Guard#tl1b	4_M_FAIRYSOLDIER2,{
+	mes "[Eclage Guard]";
+	mes "This the prison where we put criminals.";
+	mes "No outsiders can enter.";
+	close;
+}
+
+eclage,274,294,4	script	Conversing Laphine	4_F_FAIRYKID,{	//Laphines in a conversation#tl02
+	mes "A female Laphine and a male Laphine are talking about something.";
+	mes "But they stopped talking as soon as they saw me.";
+	mes "I think I've interrupted the conversation.";
+	close;
+}
+
+eclage,275,294,2	script	Eclage Resident#tl02	4_M_FAIRYKID4,{
+	mes "[Male Laphine]";
+	mes "You're visiting Eclage?";
+	mes "I hope you have a good time here.";
+	close;
+}
+
+eclage,307,237,0	script	Normal Yai#tllb	CLEAR_NPC,{
+	mes "This is a Laphine's Yai.";
+	mes "The door is locked shut.";
+	cutin "avn_labo.bmp",4;
+	close2;
+	cutin "avn_labo.bmp",255;
+	end;
+}
+
+// Unknown
+//============================================================
+ecl_fild01,173,95,4	script	Diary Frog No. 30#worm	4_FROG,{
+	mes "[Diary Frog No. 30]";
+	mes "As you can see, I am a broken Diary Frog.";
+	mes "Professor Worm threw me out really hard all the way out here.";
+	mes "I didn't even do anything wrong!";
+	close;
+}
+
+eclage,156,56,0	script	Residence Entrance	CLEAR_NPC,{}
diff --git a/npc/re/quests/quests_izlude.txt b/npc/re/quests/quests_izlude.txt
index 0286baca0..9e7b34746 100644
--- a/npc/re/quests/quests_izlude.txt
+++ b/npc/re/quests/quests_izlude.txt
@@ -1,15 +1,19 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Izlude
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Daegaladh, Masao
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= Edgar's Offer
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= Contains:
+//= - Edgar's Offer
+//===== Additional Comments: =================================
 //= 1.0 Updated to match the new Izlude Map. [Masao]
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
-izlude,179,219,4	duplicate(Edgar_izlude)	Edgar#izlude	49
+izlude,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude	1_M_03
+izlude_a,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude_a	1_M_03
+izlude_b,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude_b	1_M_03
+izlude_c,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude_c	1_M_03
+izlude_d,179,219,2	duplicate(Edgar_izlude)	Edgar#izlude_d	1_M_03
diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt
deleted file mode 100644
index 3f029f7f4..000000000
--- a/npc/re/quests/quests_lighthalzen.txt
+++ /dev/null
@@ -1,592 +0,0 @@
-//===== Hercules Script ======================================= 
-//= Quest NPCs located in Lighthalzen
-//===== By: ================================================== 
-//= Ziu, Heris (translation)
-//===== Current Version: ===================================== 
-//= 1.1a
-//===== Compatible With: ===================================== 
-//= Hercules GIT
-//===== Description: ========================================= 
-//= Quests related to Lighthalzen City.
-//===== Additional Comments: ================================= 
-//= 1.0 Updated to match the new Izlude Map. [Masao]
-//= 1.1 Added Somatology Laboratory F4 quest. [Euphy]
-//= 1.1a Coordinate update
-//============================================================ 
-
-// Renewal split [Daegaladh]
-//============================================================
-izlude,172,73,6	duplicate(Scamp)	Scamp#2	853
-
-// Somatology Laboratory F4
-//============================================================
-lighthalzen,303,304,5	script	Jerome Jameson#start	904,{
-	if (lhz_dun04 == 0) {
-		mes "[Jerome Jameson]";
-		mes "Wow, what a "+((Sex)?"strong man!":"beautiful dame!");
-		next;
-		mes "[Jerome Jameson]";
-		mes ((Sex)?"Sir":"Ma'am")+", please take heed -- as soon";
-		mes "as a dangerous rumor aroused about";
-		mes "the endangerment of everyone in";
-		mes "town, the best thing to do is lock";
-		mes "your doors.";
-		
-		// To do: check BaseLevel requirement.
-		if (BaseLevel < 90 || hg_tre < 54) close;
-
-		next;
-		select("Dangerous rumor?");
-		mes "[Jerome Jameson]";
-		mes "Strong rumors have been heard from";
-		mes "Rekenber Investigation Institute";
-		mes "about terrible, secret experiments";
-		mes "with human beings!";
-		next;
-		select("What? Experiments?");
-		mes "[Jerome Jameson]";
-		mes "Yes. Biological experiments!!";
-		mes "Experiments with human beings";
-		mes "conducted in the undergrounds of";
-		mes "these very slums. Apparently, they";
-		mes "have spread the rumors upon being";
-		mes "denied of social benefits.";
-		next;
-		mes "[Jerome Jameson]";
-		mes "This rumor cannot go about";
-		mes "unhandled. The biological";
-		mes "experiments that have been carried";
-		mes "out in this place can be real.";
-		mes "This really needs to be";
-		mes "investigated, and soon!";
-		setquest 5109;
-		set lhz_dun04,1;
-		close;
-	}
-	mes "[Jerome Jameson]";
-	mes "Please investigate the deeper";
-	mes "parts of the laboratory. I hope";
-	mes "to hear from you soon.";
-	close;
-}
-
-// Is this the correct behavior? (limited and conflicting sources)
-// -- iRO: lhz_dun03 warps directly to que_lhz.
-// -- Ziu: NPC in lhz_dun04 warps into que_lhz.
-function	script	lhz4enter	{
-	if (getmapusers("que_lhz") == 0 && mobcount("que_lhz","#controllhz4::OnMyMobDead") < 1) {
-		if (getarg(0) == 0) {
-			mes "- Having Jerome Jameson's orders";
-			mes "in mind, you hold your breath and";
-			mes "descend the flooded flight of";
-			mes "stairs. -";
-		} else {
-			mes "[Researcher]";
-			mes "Who are you?";
-			mes "................";
-			emotion e_omg;
-			next;
-			mes "The man runs away and you go after him.";
-		}
-		if (lhz_dun04 > 1) {
-			changequest 5110,5109;
-			set lhz_dun04,1;
-		}
-		close2;
-		// Check twice because of 'next'.
-		if (getmapusers("que_lhz") == 0 && mobcount("que_lhz","#controllhz4::OnMyMobDead") < 1) {
-			donpcevent "#lhz4mes1::OnEnable";
-			warp "que_lhz",244,52;
-		}
-		end;
-	}
-	mes "Right now there are other people inside. Wait for your turn.";
-	close;
-}
-
-lhz_dun03,239,77,0	script	#warplhz3lhz4	45,1,1,{
-OnTouch:
-	if (lhz_dun04 == 0) {
-		mes "It doesn't make sense to go down these flooded stairs.";
-		close;
-	} else if (lhz_dun04 < 6) {
-		callfunc "lhz4enter",0;
-		end;
-	}
-	warp "lhz_dun04",244,52;
-	end;
-}
-lhz_dun04,245,61,0	warp	#warplhz4lhz3	1,1,lhz_dun03,240,74
-
-// Does this portal exist?
-que_lhz,245,61,0	warp	#warplhzqlhz3	1,1,lhz_dun03,240,74
-
-que_lhz,244,52,0	script	#lhz4mes1	-1,2,2,{
-OnTouch:
-	mes "- You find another flight of";
-	mes "stairs that is raised and deviates";
-	mes "from the flooded path. -";
-	// Missing dialogue.
-	close2;
-	donpcevent "#lhz4mes1::OnDisable";
-	end;
-OnInit:
-OnDisable:
-	disablenpc "#lhz4mes1";
-	end;
-OnEnable:
-	enablenpc "#lhz4mes1";
-	end;
-}
-
-lhz_dun04,151,276,3	script	Researcher#lhz4	865,{
-	if (lhz_dun04 == 0) {
-		mes "[Researcher]";
-		mes "................";
-		close;
-	} else if (lhz_dun04 < 6) {
-		callfunc "lhz4enter",1;
-		end;
-	} else if (lhz_dun04 == 6) {
-		mes "Think twice before saying that these samples are a reason to shut this place down.";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "You're stopping me for doing nothing good? What about the last four men I've created?";
-		next;
-		mes "[Wolfchev]";
-		mes "Hmm. This place will be completely flooded...";
-		next;
-		mes "[Wolfchev]";
-		mes "What is the problem?";
-		next;
-		mes "[Wolfchev]";
-		mes "Hmm... All this burocracy is ruining my laboratory. For God's sake!";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Hey! Wolfchev!!";
-		next;
-		mes "[Wolfchev]";
-		mes "Oh yes? To please them all! ^FF0080The different specimen^000000 are organically connected to each other.";
-		next;
-		mes "[Wolfchev]";
-		mes "Perhaps the boss of these ^00FF00things^000000...";
-		mes "My inability to control my own experiment... Here, are all the ^808000slaves used as decoys^000000 and the laboratory will be shut down.";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Hey, Wolfchev!! This ^00FF00boss^000000 you're talking about. Where is it?";
-		next;
-		mes "[Wolfchev]";
-		mes "...in my laboratory. I awakened it. I tried to use it to destroy them all, but it didn't work... you'll have to do it...";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "How can I get access to your laboratory?";
-		next;
-		mes "[Wolfchev]";
-		mes "Now... One moment!";
-		mes "I will help you.";
-		next;
-		mes "[Wolfchev]";
-		mes "Luckily, the boss hasn't awaken sober, though he's still strong and destructive.";
-		next;
-		mes "[Wolfchev]";
-		mes "But it's still dangerous. He wil release his colleagues and this means we don't have much time here.";
-		set lhz_dun04,7;
-		completequest 5111;
-		setquest 5113;
-		setquest 5114;
-		setquest 5115;
-		setquest 5116;
-		setquest 5117;
-		setquest 5118;
-		setquest 5119;
-		setquest 5120;
-		setquest 5121;
-		setquest 5122;
-		setquest 5123;
-		setquest 5124;
-		setquest 5125;
-		close;
-	} else if (lhz_dun04 == 7) {
-		mes "[Wolfchev]";
-		mes "Are you going alone?";
-		mes "You will need a really good group to bypass the system and defeat the boss.";
-		close;
-	}
-	end;
-}
-
-que_lhz,207,75,3	script	Researcher#ins	865,3,3,{
-OnTouch:
-	if (lhz_dun04 == 1) {
-		mes "[Researcher]";
-		mes "..........";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "You! Are you professor Wolfchev?";
-		emotion e_omg,1;
-		next;
-		mes "[Wolfchev]";
-		mes "Many people come here looking for me. But most of them are reluctant to.";
-		mes "What do you want?";
-		emotion e_gg;
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "I've heard rumors about biological experiments.";
-		mes "Wolfchev!!";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "These experiments...";
-		next;
-		mes "[Wolfchev]";
-		mes "I think I know what you're gonna say. Are you accusing me of something?";
-		mes "I don't want to hear more of that.";
-		mes "You better leave.";
-		emotion e_gg;
-		next;
-		mes "[Wolfchev]";
-		mes "They seem to have cried for a long time... I'm busy, excuse me!";
-		next;
-		mes "From Wolfchev's eyes tears welled and he started laughing before running away.";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Hey! Wolfchev there...";
-		emotion e_omg,1;
-		changequest 5109,5110;
-		set lhz_dun04,2;
-		close2;
-		warp "que_lhz",96,136;
-		end;
-	}
-	mes "[Researcher]";
-	mes "..........";
-	close;
-}
-
-que_lhz,94,119,3	script	Researcher#ins2	865,{
-	if (lhz_dun04 == 2) {
-		mes "[Wolfchev]";
-		mes "Hehehe. You are really persistent. What do you want from someone like me?";
-		emotion e_swt2;
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Wolfchev... You've admitted it's dangerous already. And all these investigations...";
-		next;
-		mes "[Wolfchev]";
-		mes "You're right...hehe.";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Your research is too dangerous. Do you think everybody wants it to keep going?";
-		next;
-		mes "[Wolfchev]";
-		mes "Everyone wants to be strong and dominate the others. Have their obedience, respect and attention. Don't you want that? Hehe.";
-		emotion e_gg;
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "... ... ...";
-		next;
-		mes "[Wolfchev]";
-		mes "With such a dangerous life, avoiding being damaged... Don't you see it?. Hehe.";
-		next;
-		mes "Again, Wolfchev hastily escapes.";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Oh! He's far... and...";
-		set lhz_dun04,3;
-		close2;
-		warp "que_lhz",148,215;
-		end;
-	}
-	mes "[Researcher]";
-	mes "..........";
-	close;
-}
-que_lhz,147,224,3	script	Researcher#ins3	865,{
-	if (lhz_dun04 == 4 || mobcount("que_lhz","#controllhz4::OnMyMobDead") > 0) {
-		mes "[Wolfchev]";
-		mes "Wolfchev is freaking out. He is out of his mind.";
-		emotion e_turn;
-		close;
-	} else if (lhz_dun04 == 3) {
-		mes "[Wolfchev]";
-		mes "You really are a bothersome little";
-		mes "tick, aren't you? Isn't that";
-		mes "apparent to you at all?";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "... ... ...";
-		emotion e_dots,1;
-		next;
-		mes "Wolfchev didn't want to talk to you anymore, so while laughing he pressed a button on his hand. Then he went mad.";
-		specialeffect EF_SIGHTRASHER;
-		next;
-		mes "[Wolfchev]";
-		mes "Unfortunately to you, I will beat you here.";
-		donpcevent "#controllhz4::OnEnable";
-		next;
-		mes "[Wolfchev]";
-		mes "You're such a fool.";
-		emotion e_gasp;
-		next;
-		mes "[Wolfchev]";
-		mes "Look at all these experimental bodies you'll have to deal and see how good they are.";
-		next;
-		donpcevent "#controllhz4::OnEnable2";
-		progressbar "ffff00",6;
-		set lhz_dun04,4;
-		next;
-		mes "[Wolfchev]";
-		mes "NO!! ...Look what you did!! You";
-		mes "wreckless madman!!!";
-		emotion e_omg;
-		next;
-		mes "[Wolfchev]";
-		mes "Go back!";
-		next;
-		mes "First, let's destroy all these experiments!";
-		close;
-	} else if (lhz_dun04 == 5) {
-		mes "Wolfchev is freaking out. He is out of his mind.";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "*Slaps Face* Hey, snap out of it!";
-		mes "We've destroyed them!";
-		specialeffect EF_STUNATTACK;
-		sleep2 1000;
-		specialeffect EF_STUNATTACK;
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Let's get out of here first! Is there a place we can go?";
-		specialeffect EF_DARKBREATH;
-		emotion e_no,1;
-		next;
-		mes "[Wolfchev]";
-		mes "This. My laboratory... My laboratory...";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "The laboratory? Where am I indeed?";
-		next;
-		mes "[Wolfchev]";
-		mes "Back to the beggining... here's when...";
-		next;
-		mes "- Wolfchev weakly points to the 12 o' clock direction. -";
-		next;
-		mes "I have to go to ^0000FF Wolfchev's Laboratory^000000...";
-		changequest 5110,5111;
-		set lhz_dun04,6;
-		donpcevent "#controllhz4d::OnEnable";
-		close;
-	} else if (lhz_dun04 == 6) {
-		mes "I have to go to ^0000FF Wolfchev's Laboratory^000000...";
-		close;
-	}
-	end;
-}
-
--	script	Awake Specimen#lhz	-1,{
-	end;
-OnInit:
-OnDisable:
-	hideonnpc strnpcinfo(0);
-	end;
-OnEnable:
-	hideoffnpc strnpcinfo(0);
-	end;
-OnEffect1:
-	specialeffect EF_SUI_EXPLOSION;
-	end;
-OnEffect2:
-	specialeffect EF_BEGINASURA;
-	end;
-OnEffect3:
-	specialeffect EF_FLASHER;
-	end;
-}
-que_lhz,148,231,0	duplicate(Awake Specimen#lhz)	Awake Specimen#0	2244
-que_lhz,140,231,1	duplicate(Awake Specimen#lhz)	Awake Specimen#1	2244
-que_lhz,140,224,2	duplicate(Awake Specimen#lhz)	Awake Specimen#2	2244
-que_lhz,140,216,3	duplicate(Awake Specimen#lhz)	Awake Specimen#3	2244
-que_lhz,147,216,4	duplicate(Awake Specimen#lhz)	Awake Specimen#4	2244
-que_lhz,155,216,5	duplicate(Awake Specimen#lhz)	Awake Specimen#5	2244
-que_lhz,155,224,6	duplicate(Awake Specimen#lhz)	Awake Specimen#6	2244
-que_lhz,155,231,7	duplicate(Awake Specimen#lhz)	Awake Specimen#7	2244
-
--	script	#controllhz4	-1,{
-OnInit:
-	disablenpc "#controllhz4";
-	end;
-OnEnable:
-	enablenpc "#controllhz4";
-	donpcevent "Awake Specimen#0::OnEnable";
-	donpcevent "Awake Specimen#1::OnEnable";
-	donpcevent "Awake Specimen#2::OnEnable";
-	donpcevent "Awake Specimen#3::OnEnable";
-	donpcevent "Awake Specimen#4::OnEnable";
-	donpcevent "Awake Specimen#5::OnEnable";
-	donpcevent "Awake Specimen#6::OnEnable";
-	donpcevent "Awake Specimen#7::OnEnable";
-	end;
-OnEnable2:
-	initnpctimer;
-	end;
-OnTimer1000:
-	donpcevent "Awake Specimen#0::OnEffect1";
-	end;
-OnTimer2000:
-	donpcevent "Awake Specimen#0::OnEffect2";
-	donpcevent "Awake Specimen#7::OnEffect1";
-	end;
-OnTimer3000:
-	donpcevent "Awake Specimen#7::OnEffect2";
-	donpcevent "Awake Specimen#6::OnEffect1";
-	end;
-OnTimer4000:
-	donpcevent "Awake Specimen#6::OnEffect2";
-	donpcevent "Awake Specimen#5::OnEffect1";
-	end;
-OnTimer5000:
-	donpcevent "Awake Specimen#5::OnEffect2";
-	donpcevent "Awake Specimen#4::OnEffect1";
-	end;
-OnTimer6000:
-	donpcevent "Awake Specimen#4::OnEffect2";
-	donpcevent "Awake Specimen#3::OnEffect1";
-	end;
-OnTimer7000:
-	donpcevent "Awake Specimen#3::OnEffect2";
-	donpcevent "Awake Specimen#2::OnEffect1";
-	end;
-OnTimer8000:
-	donpcevent "Awake Specimen#2::OnEffect2";
-	donpcevent "Awake Specimen#1::OnEffect1";
-	end;
-OnTimer9000:
-	donpcevent "Awake Specimen#1::OnEffect2";
-	end;
-OnTimer11000:
-	donpcevent "Awake Specimen#0::OnEffect3";
-	donpcevent "Awake Specimen#1::OnEffect3";
-	donpcevent "Awake Specimen#2::OnEffect3";
-	donpcevent "Awake Specimen#3::OnEffect3";
-	donpcevent "Awake Specimen#4::OnEffect3";
-	donpcevent "Awake Specimen#5::OnEffect3";
-	donpcevent "Awake Specimen#6::OnEffect3";
-	donpcevent "Awake Specimen#7::OnEffect3";
-	end;
-OnTimer14000:
-	donpcevent "Awake Specimen#0::OnDisable";
-	donpcevent "Awake Specimen#1::OnDisable";
-	donpcevent "Awake Specimen#2::OnDisable";
-	donpcevent "Awake Specimen#3::OnDisable";
-	donpcevent "Awake Specimen#4::OnDisable";
-	donpcevent "Awake Specimen#5::OnDisable";
-	donpcevent "Awake Specimen#6::OnDisable";
-	donpcevent "Awake Specimen#7::OnDisable";
-	end;
-OnTimer16000:
-	monster "que_lhz",148,231,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead";
-	monster "que_lhz",140,231,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead";
-	monster "que_lhz",140,224,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead";
-	monster "que_lhz",140,216,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead";
-	monster "que_lhz",147,216,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead";
-	monster "que_lhz",155,216,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead";
-	monster "que_lhz",155,224,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead";
-	monster "que_lhz",155,231,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead";
-	donpcevent "#controllhz4b::OnEnable";
-	stopnpctimer;
-	end;
-OnMyMobDead:
-	if (mobcount("que_lhz","#controllhz4::OnMyMobDead") < 1) {
-		donpcevent "#controllhz4b::OnStop";
-		donpcevent "#controllhz4c::OnEnable";
-		disablenpc "#controllhz4";
-		end;
-	}
-	end;
-}
-
--	script	#controllhz4b	-1,{
-OnInit:
-OnDisable:
-	disablenpc "#controllhz4b";
-	end;
-OnEnable:
-	enablenpc "#controllhz4b";
-	initnpctimer;
-	end;
-OnStop:
-	stopnpctimer;
-	donpcevent "#controllhz4b::OnDisable";
-	end;
-OnTimer400000:
-	killmonster "que_lhz","#controllhz4::OnMyMobDead";
-	mapwarp "que_lhz","lighthalzen",263,200;
-	disablenpc "#controllhz4";
-	disablenpc "#controllhz4b";
-	stopnpctimer;
-	end;
-}
-
--	script	#controllhz4c	-1,{
-OnInit:
-	disablenpc "#controllhz4c";
-	end;
-OnEnable:
-	enablenpc "#controllhz4c";
-	initnpctimer;
-	end;
-OnTimer10000:
-	mapannounce "que_lhz","Whisper of a man: Help me... Please... Aaah... I don't want to... Die....",bc_map,0x0080C0;
-	donpcevent "#controllhz4d::OnEnable";
-	stopnpctimer;
-	disablenpc "#controllhz4c";
-	end;
-}
-
-que_lhz,147,248,0	script	#controllhz4d	-1,6,4,{
-OnTouch:
-	if (lhz_dun04 == 4) {
-		mes "Looks like it's all done.";
-		set lhz_dun04,5;
-		donpcevent "#controllhz4d::OnDisable";
-		close;
-	} else if (lhz_dun04 == 6) {
-		mes "- Concrete falls from the ceiling";
-		mes "due to the weakened structure of";
-		mes "the lab and you tumble down the";
-		mes "flight of stairs avoiding it. -";
-		close2;
-		warp "lhz_dun04",148,269;
-		donpcevent "#lhz4mes2::OnEnable";
-		donpcevent "#controllhz4d::OnDisable";
-		end;
-	}
-	end;
-OnInit:
-OnDisable:
-	disablenpc "#controllhz4d";
-	end;
-OnEnable:
-	enablenpc "#controllhz4d";
-	end;
-}
-
-lhz_dun04,148,269,0	script	#lhz4mes2	-1,2,2,{
-OnTouch:
-	if (lhz_dun04 == 6) {
-		heal -Hp/2,0; // To do: check HP value.
-		mes "- You awaken injured, hearing the";
-		mes "sounds of footsteps all around";
-		mes "you... -";
-		close2;
-		donpcevent "#lhz4mes2::OnDisable";
-		end;
-	}
-	end;
-OnInit:
-OnDisable:
-	disablenpc "#lhz4mes2";
-	end;
-OnEnable:
-	enablenpc "#lhz4mes2";
-	end;
-}
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 160c3f8a9..0511a1e55 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -1,27 +1,365 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Malangdo Quest NPCs
 //===== By: ==================================================
 //= Muad_Dib
 //===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 1.6
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
 //===== Description: =========================================
+//= [Official Conversion]
 //= Quest NPCs related to Malangdo:
 //== Malangdo Island, Help the Bad Cats in Danger,
-//== Clean the Ship, Help Chef Nyas,
-//== Play with Baby Cats, Archangel Wing Enchants
+//== Clean the Ship, Help Chef Nyas, Play with Baby Cats,
+//== Cat Gamers, Archangel Wing Enchants
 //===== Additional Comments: =================================
 //= 1.0 First version. [Euphy]
 //= 1.1 Added Clean the Ship and Help Chef Nyas.
 //= 1.2 Added Archangel Wing Enchants.
 //= 1.3 Added Play with Baby Cats.
 //= 1.4 Added Malangdo Island.
+//= 1.4a Dialogue edits, source iRO.
+//= 1.5 Added Cat Gamers.
+//=     Added "Investment Cat Helper" and "Storekeeper" NPCs.
+//= 1.6 Added GM management function.
 //============================================================
 
+// Utility NPCs :: cat_merchant
+//============================================================
+mal_in02,134,31,5	script	Investment Cat Helper	4_WHITETIGER,{
+	if (MaxWeight - Weight < 100 || checkweight(1201,1) == 0) {
+		mes "[Investment Cat Helper]";
+		mes "You have a heavy load. Maybe you're a peddler? No peddlers in this area.";
+		close;
+	}
+	if (ep13_yong1 < 10) {
+		mes "[Investment Cat Helper]";
+		mes "Ohh!";
+		mes "You've come here to ask about investing?";
+		mes "You've come to the right place.";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "I am here to invest in the Cat Paw Merchant Association.";
+		mes "Err-- I mean I'm here to help honest people like you.";
+		mes "Hehehe~";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "I can't remember everything because I've been here talking to you humans.";
+		mes "But I want to know first... Hold on.";
+		next;
+		mes "smell... smell...";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "Ah?!";
+		mes "You don't know much about the Cat Paw Merchant Association, do you?";
+		mes "Hmm, you do not really smell like a cat.";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "Good!!";
+		mes "You made the right decision to be here to invest in the Cat Paw Merchant Association~";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "First, you need to have ten pieces of Malangdo cans if you want to open an account.";
+		next;
+		while(1) {
+			switch(select("Open an account:Ask about benefits:Cancel")) {
+			case 1:
+				if (countitem(12636) < 10) {
+					mes "[Investment Cat Helper]";
+					mes "Hmm!";
+					mes "I'd love to give you account for";
+					mes "free but as you know, this is for";
+					mes "advertising investers of the trader group, sorry.";
+					close;
+				}
+				delitem 12636,10; //Malang_Sp_Can
+				set ep13_yong1,10;
+				mes "[Investment Cat Helper]";
+				mes "Good!";
+				mes "Write down here~ and";
+				mes "print your palm there,";
+				mes "ah!~ what's your name?";
+				next;
+				mes "[Investment Cat Helper]";
+				mes strcharinfo(0)+" you are~";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "Name: "+strcharinfo(0);
+				mes "Number of accounts: 10";
+				mes "OK! Registered!";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "You have an account now.";
+				mes "Will get an investment of a certain nunber of cans next time.";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "I wish to get lots of investments";
+				mes "so you can have many services as well.";
+				mes "And, I also hope that we, the Cat Paw Merchant Association, will make much money.";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "See you next investment~";
+				close;
+			case 2:
+				mes "[Investment Cat Helper]";
+				mes "You want to know the benefits of investing?";
+				mes "Actually, we are a small group of cats and we don't think like humans.";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "There are lots of benefits based on how much you've invested in our services.";
+				mes "These include more warps, extra storage locations and price reductions of goods and services.";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "I promise that if our trade is growing you will benefit from it as well.";
+				next;
+				break;
+			case 3:
+				mes "[Investment Cat Helper]";
+				mes "Ahh~ You're just going to leave?";
+				mes "T_T~ Please open an account.";
+				close;
+			}
+		}
+	} else if (ep13_yong1 < 20000) {
+		mes "[Investment Cat Helper]";
+		mes "I can't remember everyone since I meet so many people...";
+		mes "But I want to check first... Hold on.";
+		mes "Excuse me!";
+		next;
+		mes "smell... smell...";
+		next;
+		if (ep13_yong1 < 10000) {
+			set .@cans,10;
+			mes "[Investment Cat Helper]";
+			mes "This is a familiar smell!!";
+			mes "If it's so...!!";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "You are here to invest!!";
+			mes "Good!~~ Good to see you~";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "From your smell~ you are below 10,000 accounts.";
+			mes "Until then, you can get an account by investing ten cans.";
+		} else {
+			set .@cans,20;
+			mes "[Investment Cat Helper]";
+			mes "Such a stong smell!!";
+			mes "Then it must be!!";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "A VIP invester!!!!!!";
+			mes "You're here to invest? Welcome!";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "A VIP invester with over 10,000 accounts";
+			mes "can get another account with 20 cans.";
+			mes "A good investment!";
+		}
+		next;
+		mes "[Investment Cat Helper]";
+		mes "What will you do?";
+		next;
+		switch(select("Invest:Check the number of accounts:Cancel")) {
+		case 1:
+			mes "[Investment Cat Helper]";
+			mes "Ohh~ thank you for investing~";
+			mes "You can get a maximum of 10 accounts at one time.";
+			mes "Isn't it lovely?";
+			mes "How many will you invest in? Enter 0 to cancel.";
+			next;
+			input .@input;
+			if (.@input == 0) {
+				mes "[Investment Cat Helper]";
+				mes "Please invest next time~";
+				close;
+			} else if (.@input > 10) {
+				mes "[Investment Cat Helper]";
+				mes "You can get a maximum of 10 accounts~";
+				close;
+			}
+			set .@required, .@input*.@cans;
+			mes "[Investment Cat Helper]";
+			mes "Total " + .@input + " accounts, right?";
+			mes "The number of cans you need is "+.@required+" pieces.";
+			mes "Do you want to go through with this?";
+			next;
+			if(select("Yes:No") == 2) {
+				mes "[Investment Cat Helper]";
+				mes "Oh? Is that wrong? Weird.";
+				mes "Please check again~";
+				close;
+			}
+			if (countitem(12636) < .@required) {
+				mes "[Investment Cat Helper]";
+				mes "Ahhh!";
+				mes "You don't have enough cans.";
+				mes "I'm a busy cat, you know.";
+				close;
+			}
+			if (ep13_yong1 < 10000) {
+				delitem 12636,.@required; //Malang_Sp_Can
+				set ep13_yong1, ep13_yong1+.@input;
+				mes "[Investment Cat Helper]";
+				mes .@input+" accounts were invested in.";
+				mes "Thank you for your help~";
+				next;
+				mes "[Investment Cat Helper]";
+				mes "Once we get more investments of cans,";
+				mes "our trader group will grow even more.";
+				mes "And you can get services as well~";
+				mes "A win-win strategy?";
+				close;
+			} else {
+				if (.@input + ep13_yong1 > 20000) {
+					delitem 12636,.@required; //Malang_Sp_Can
+					set ep13_yong1,20000;
+					mes "[Investment Cat Helper]";
+					mes "You can have 20,000 accounts max";
+					mes "according to the trader policy...";
+					mes strcharinfo(0)+"'s accounts increase to 20,000.";
+					mes "Thank you so much for your investment~";
+					next;
+					mes "[Investment Cat Helper]";
+					mes "Now, "+strcharinfo(0)+", you can't invest further";
+					mes "but you can still donate some of your cans to the trader group.";
+					mes "Thank you so much~";
+					close;
+				} else {
+					delitem 12636,.@required; //Malang_Sp_Can
+					set ep13_yong1, ep13_yong1+.@input;
+					mes "[Investment Cat Helper]";
+					mes .@input+" accounts have been invested in.";
+					mes "Thank you for your help~";
+					next;
+					mes "[Investment Cat Helper]";
+					mes "With your big investment in cans,";
+					mes "this will help us meet our goals earlier.";
+					mes "Thank you again.";
+					close;
+				}
+			}
+		case 2:
+			mes "[Investment Cat Helper]";
+			mes "You want to check the number of accounts? Hmm, let's see~";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "Name: "+strcharinfo(0);
+			mes "Number of accounts: "+ep13_yong1;
+			next;
+			mes "[Investment Cat Helper]";
+			if (ep13_yong1 < 10000)
+				mes "Got it?";
+			else
+				mes "You've made many investments. Thank you.";
+			close;
+		case 3:
+			mes "[Investment Cat Helper]";
+			mes "Please invest next time~";
+			close;
+		}
+	} else if (ep13_yong1 >= 20000) {
+		mes "[Investment Cat Helper]";
+		mes strcharinfo(0) + ", welcome~";
+		mes strcharinfo(0) + "~ I felt something upon your arrival.";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "Want to donate?";
+		next;
+		if(select("Donate:No") == 2) {
+			mes "[Investment Cat Helper]";
+			mes "Hehe~ then have fun in here~";
+			close;
+		}
+		mes "[Investment Cat Helper]";
+		mes "Wow, thank you, "+strcharinfo(0)+"~!";
+		next;
+		mes "[Investment Cat Helper]";
+		mes strcharinfo(0)+"~ with your help";
+		mes "the cans will be distributed to cats";
+		mes "in the Midgard area with honor~";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "The can donation can range from a minimum of 20 to a maximum of 10,000.";
+		next;
+		input .@input;
+		if (.@input < 20 || .@input > 10000) {
+			mes "[Investment Cat Helper]";
+			mes "The can donation can range from a minimum of 20 to a maximum of 10,000.";
+			close;
+		} else if (countitem(12636) < .@input) { // Malang_Sp_Can
+			mes "[Investment Cat Helper]";
+			mes "Hmm? You don't have enough cans.";
+			close;
+		} else {
+			delitem 12636,.@input; //Malang_Sp_Can
+			mes "[Investment Cat Helper]";
+			mes "Ohh! Thank you~";
+			next;
+			mes "[Investment Cat Helper]";
+			mes "Dear "+strcharinfo(0)+" ~";
+			mes "I have only Increase AGI";
+			mes "and Blessing to give you.";
+			mes "Thank you.";
+			npcskill "AL_INCAGI",10,0,0;
+			npcskill "AL_BLESSING",10,0,0;
+			close;
+		}
+	}
+}
+
+malangdo,184,139,4	script	Storekeeper#mal	4_CAT_ADV2,{
+	mes "[Storekeeper]";
+	mes "Hey, looks like you might be looking to unload some of your stuff from your pack.";
+	mes "Want to open storage? For free?";
+	next;
+	mes "[Storekeeper]";
+	mes "Hahaha~ Just kidding, of course it isn't free.";
+	mes "What do you take me for?";
+	next;
+	if (ep13_yong1 > 999) {
+		set .@cans,1;
+		set .@zeny,1500;
+		set .@i, select("Pay with Can ----- 1 unit:Pay with Zeny ------- 1,500z");
+	} else {
+		set .@cans,2;
+		set .@zeny,3000;
+		set .@i, select("Pay with Can ----- 2units:Pay with Zeny ------- 3,000z");
+	}
+	if (getskilllv("NV_BASIC") < 6) {
+		mes "[Storekeeper]";
+		mes "Ah, hold on!!";
+		mes "You need to have ^FF0000Basic Skill level 6^000000 to use the storage service!!";
+		close;
+	}
+	switch(.@i) {
+	case 1:
+		if (countitem(12636) < .@cans) {
+			mes "[Storekeeper]";
+			mes "You don't have enough cans...";
+			close;
+		}
+		delitem 12636,.@cans; //Malang_Sp_Can
+		break;
+	case 2:
+		if (Zeny < .@zeny) {
+			mes "[Storekeeper]";
+			mes "You don't have enough zeny...";
+			close;
+		}
+		Zeny -= .@zeny;
+		break;
+	}
+	mes "[Storekeeper]";
+	mes "Thank you.";
+	close2;
+	openstorage;
+	end;
+}
+
 // Malangdo Island :: ma_tomas
 //============================================================
-mal_in02,28,56,5	script	Samuel#mal	495,{
+mal_in02,28,56,5	script	Samuel#mal	4_M_MERCAT1,{
 	mes "[Samuel]";
 	mes "Ah, you mean the ad... well, you mean our village chief?";
 	mes "You'd better not bother him, since he's always busy.";
@@ -65,7 +403,7 @@ mal_in02,28,56,5	script	Samuel#mal	495,{
 	}
 }
 
-mal_in02,22,62,3	script	Tomas#mal	556,{
+mal_in02,22,62,3	script	Tomas#mal	4_CAT_ADMIRAL,{
 	if (BaseLevel < 60) {
 		mes "[Tomas, Village Chief]";
 		mes "Ummm... Who are you?";
@@ -292,7 +630,7 @@ mal_in02,22,62,3	script	Tomas#mal	556,{
 	end;
 }
 
-mal_in02,182,61,3	script	President of Meeting#mal	421,{
+mal_in02,182,61,3	script	President of Meeting#mal	4_M_BOSSCAT,{
 	if (ma_tomas == 0) {
 		mes "[President of Meeting]";
 		mes "Please be silent, the regular meeting is getting started a moment later~";
@@ -358,7 +696,7 @@ mal_in02,182,61,3	script	President of Meeting#mal	421,{
 	close;
 }
 
-mal_in02,178,66,5	script	Scottfold#mal	422,{
+mal_in02,178,66,5	script	Scottfold#mal	4_M_BABYCAT,{
 	if (ma_tomas == 0) {
 		mes "[Scottfold]";
 		mes "Attending the meeting is an important thing to do.";
@@ -396,7 +734,7 @@ mal_in02,178,66,5	script	Scottfold#mal	422,{
 	close;
 }
 
-mal_in02,177,58,7	script	Koon#mal	546,{
+mal_in02,177,58,7	script	Koon#mal	4_CAT_SAILOR3,{
 	if (ma_tomas == 0) {
 		mes "[Koon]";
 		mes "Though I'm busy, I always attend this meeting.";
@@ -434,7 +772,7 @@ mal_in02,177,58,7	script	Koon#mal	546,{
 	close;
 }
 
-mal_in02,174,64,5	script	Linguist Devore#mal	549,{
+mal_in02,174,64,5	script	Linguist Devore#mal	4_CAT_MERMASTER,{
 	if (ma_tomas < 4) {
 		mes "[Linguist Devore]";
 		mes "Most of our cats are especially talented in language.";
@@ -608,7 +946,7 @@ mal_in02,174,64,5	script	Linguist Devore#mal	549,{
 	close;
 }
 
-mal_in02,179,57,1	script	Geologist Mali#mal	559,{
+mal_in02,179,57,1	script	Geologist Mali#mal	4_CAT_ADV1,{
 	if (ma_tomas < 5) {
 		mes "[Geologist Mali]";
 		mes "Malangdo is named because the ground here is so soft, mew~";
@@ -809,7 +1147,7 @@ mal_in02,179,57,1	script	Geologist Mali#mal	559,{
 	close;
 }
 
-mal_in02,140,94,0	script	Bob#mal	553,{
+mal_in02,140,94,0	script	Bob#mal	4_CAT_DOWN,{
 	if (ma_tomas < 14) {
 		mes "[Bob]";
 		mes "You bow-wow! bow! wow! I mew! mew! mew!";
@@ -1051,16 +1389,16 @@ OnDisable:
 	disablenpc strnpcinfo(0);
 	end;
 }
-malangdo,114,157,0	duplicate(Crack#mal0)	Crack#mal1	550
-malangdo,284,237,0	duplicate(Crack#mal0)	Crack#mal2	550
-malangdo,134,150,0	duplicate(Crack#mal0)	Crack#mal3	550
-malangdo,173,199,0	duplicate(Crack#mal0)	Crack#mal4	550
-malangdo,233,197,0	duplicate(Crack#mal0)	Crack#mal5	550
-malangdo,137,239,0	duplicate(Crack#mal0)	Crack#mal6	550
-malangdo,239,157,0	duplicate(Crack#mal0)	Crack#mal7	550
-malangdo,221,155,0	duplicate(Crack#mal0)	Crack#mal8	550
-malangdo,217,109,0	duplicate(Crack#mal0)	Crack#mal9	550
-malangdo,162,183,0	duplicate(Crack#mal0)	Crack#mal10	550
+malangdo,114,157,0	duplicate(Crack#mal0)	Crack#mal1	4_CRACK
+malangdo,284,237,0	duplicate(Crack#mal0)	Crack#mal2	4_CRACK
+malangdo,134,150,0	duplicate(Crack#mal0)	Crack#mal3	4_CRACK
+malangdo,173,199,0	duplicate(Crack#mal0)	Crack#mal4	4_CRACK
+malangdo,233,197,0	duplicate(Crack#mal0)	Crack#mal5	4_CRACK
+malangdo,137,239,0	duplicate(Crack#mal0)	Crack#mal6	4_CRACK
+malangdo,239,157,0	duplicate(Crack#mal0)	Crack#mal7	4_CRACK
+malangdo,221,155,0	duplicate(Crack#mal0)	Crack#mal8	4_CRACK
+malangdo,217,109,0	duplicate(Crack#mal0)	Crack#mal9	4_CRACK
+malangdo,162,183,0	duplicate(Crack#mal0)	Crack#mal10	4_CRACK
 
 -	script	Crackt0#mal	-1,{
 	end;
@@ -1094,7 +1432,7 @@ OnTimer30000:
 -	duplicate(Crackt0#mal)	Crackt9#mal	-1
 -	duplicate(Crackt0#mal)	Crackt10#mal	-1
 
-mal_in02,181,55,3	script	Brie#mal	545,{
+mal_in02,181,55,3	script	Brie#mal	4_CAT_SAILOR2,{
 	if (ma_tomas < 6) {
 		mes "[Brie]";
 		mes "Sorry, but I don't feel like talking with you. Please leave me alone.";
@@ -1224,7 +1562,7 @@ mal_in02,181,55,3	script	Brie#mal	545,{
 	close;
 }
 
-mal_in01,114,169,5	script	Rican#mal	547,{
+mal_in01,114,169,5	script	Rican#mal	4_CAT_SAILOR4,{
 	if (ma_tomas < 9) {
 		mes "[Rican]";
 		mes "Woo waa hoohoo...";
@@ -1467,7 +1805,7 @@ mal_in01,114,169,5	script	Rican#mal	547,{
 		mes "If you see my son, please tell him to get back soon~";
 		close;
 	} else if (ma_tomas > 99) {
-		if (checkquest(11238,PLAYTIME) == 0 || checkquest(11238,PLAYTIME) == 1) {
+		if (checkquest(11238) != -1) {
 			if (countitem(6435) < 30) {
 				mes "[Rican]";
 				mes "You need exactly 30 to get a set!";
@@ -1523,7 +1861,7 @@ mal_in01,114,169,5	script	Rican#mal	547,{
 	close;
 }
 
-mal_in01,116,168,0	script	Dry Machine#mal	563,{
+mal_in01,116,168,0	script	Dry Machine#mal	2_SLOT_MACHINE,{
 	if (ma_tomas == 10) {
 		if (countitem(6435) < 30) {
 			mes "[Rican]";
@@ -1554,20 +1892,12 @@ mal_in01,116,168,0	script	Dry Machine#mal	563,{
 
 -	script	Suspicious Sand Pile#0	-1,{
 	if (.off) end;	// Official script uses a 1-second timer to disable sand piles. Added to prevent abuse.
-	if (checkweight(1201,1) == 0) {
-		mes " - Notice !! -";
-		mes " - Since you have too many items - ";
-		mes " - you cannot get the item. - ";
-		mes " - Let your body lighten - ";
-		mes " - and try this again. - ";
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
 		close;
 	}
-	if (MaxWeight - Weight < 1000) {
-		mes " - Notice !! -";
-		mes " - Since your items are too heavy - ";
-		mes " - you cannot get the item. - ";
-		mes " - Let your body lighten - ";
-		mes " - and try this again. - ";
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
 		close;
 	}
 	if (ma_tomas == 9 || checkquest(11238) > -1) {
@@ -1597,16 +1927,16 @@ OnDisable:
 	disablenpc strnpcinfo(0);
 	end;
 }
-malangdo,221,139,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#1	557
-malangdo,208,174,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#2	557
-malangdo,191,223,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#3	557
-malangdo,150,195,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#4	557
-malangdo,116,196,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#5	557
-malangdo,178,145,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#6	557
-malangdo,142,120,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#7	557
-malangdo,136,122,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#8	557
-malangdo,152,143,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#9	557
-malangdo,242,175,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#10	557
+malangdo,221,139,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#1	4_SOIL
+malangdo,208,174,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#2	4_SOIL
+malangdo,191,223,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#3	4_SOIL
+malangdo,150,195,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#4	4_SOIL
+malangdo,116,196,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#5	4_SOIL
+malangdo,178,145,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#6	4_SOIL
+malangdo,142,120,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#7	4_SOIL
+malangdo,136,122,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#8	4_SOIL
+malangdo,152,143,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#9	4_SOIL
+malangdo,242,175,0	duplicate(Suspicious Sand Pile#0)	Suspicious Sand Pile#10	4_SOIL
 
 -	script	Water Sand0#mal	-1,{
 OnInit:
@@ -1639,7 +1969,7 @@ OnTimer30000:
 -	duplicate(Water Sand0#mal)	Water Sand9#mal	-1
 -	duplicate(Water Sand0#mal)	Water Sand10#mal	-1
 
-mal_dun01,136,120,6	script	Linguist Devore#mald	549,{
+mal_dun01,136,120,6	script	Linguist Devore#mald	4_CAT_MERMASTER,{
 	end;
 OnInit:
 	disablenpc "Linguist Devore#mald";
@@ -1657,7 +1987,7 @@ OnTimer100000:
 	end;
 }
 
-mal_dun01,136,122,3	script	Biscuit#mal	551,{
+mal_dun01,136,122,3	script	Biscuit#mal	4_ASTER,{
 	if (ma_tomas < 20) {
 		mes "- There's something strange. -";
 		mes "- It feels like somehow - ";
@@ -2090,7 +2420,7 @@ mal_dun01,136,122,3	script	Biscuit#mal	551,{
 	close;
 }
 
-mal_in02,102,94,3	script	Cleaning Staff#mal	544,2,2,{
+mal_in02,102,94,3	script	Cleaning Staff#mal	4_CAT_SAILOR1,2,2,{
 OnTouch:
 	if (checkweight(1201,1) == 0) {
 		mes " - Notice !! -";
@@ -2140,7 +2470,7 @@ OnTouch:
 	close;
 }
 
-malangdo,246,184,0	script	1st Rate Point	111,{
+malangdo,246,184,0	script	1st Rate Point	HIDDEN_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes " - Notice !! -";
 		mes " - Since you have too many items - ";
@@ -2178,7 +2508,7 @@ malangdo,246,184,0	script	1st Rate Point	111,{
 	}
 }
 
-mal_dun01,133,125,5	script	Star Candy#mal	552,{
+mal_dun01,133,125,5	script	Star Candy#mal	4_F_STARFISHGIRL,{
 	if (ma_tomas == 19) {
 		mes "[Star Candy]";
 		mes "....";
@@ -2345,15 +2675,15 @@ mal_dun01,133,125,5	script	Star Candy#mal	552,{
 		close;
 	}
 }
-mal_dun01,143,137,0	duplicate(#skin_mal)	Dry Skin#29	111
-mal_dun01,131,150,0	duplicate(#skin_mal)	Prickly Skin#30	111
-mal_dun01,116,144,0	duplicate(#skin_mal)	Chapped Skin#31	111
-mal_dun01,120,129,0	duplicate(#skin_mal)	Hard Skin#32	111
+mal_dun01,143,137,0	duplicate(#skin_mal)	Dry Skin#29	HIDDEN_NPC
+mal_dun01,131,150,0	duplicate(#skin_mal)	Prickly Skin#30	HIDDEN_NPC
+mal_dun01,116,144,0	duplicate(#skin_mal)	Chapped Skin#31	HIDDEN_NPC
+mal_dun01,120,129,0	duplicate(#skin_mal)	Hard Skin#32	HIDDEN_NPC
 
-malangdo,190,167,7	script	Portali#mal	546,{
+malangdo,190,167,7	script	Portali#mal	4_CAT_SAILOR3,{
 	if (ma_tomas < 100) {
 		mes "[Portali]";
-		mes "I have no business for a immature fellow!";
+		mes "I have no business for an immature fellow!";
 		close;
 	}
 	mes "[Portali]";
@@ -2423,9 +2753,13 @@ L_Warp:
 
 // Malangdo Island :: mal_ppl
 //============================================================
-malangdo,137,200,6	script	Pipielle	549,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
-		mes "You have too many items, please try again after reducing your weight.";
+malangdo,137,200,6	script	Pipielle	4_CAT_MERMASTER,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
 		close;
 	}
 	if (BaseLevel < 60) {
@@ -2435,14 +2769,14 @@ malangdo,137,200,6	script	Pipielle	549,{
 		mes "[Pipielle]";
 		mes "I would ask for your help, if you were a stronger advanturer...";
 		next;
-		mes "^770099This cat is working on something, but she asks for help above LV60.^000000";
+		mes "^770099This cat is working on something, but she asks for help above level 60.^000000";
 		close;
 	}
-	set .@fish_ss1$, "What are you doing??";
+	set .@fish_ss1$, "What are you doing?";
 	if (countitem(6451) > 29)
 		set .@fish_ss2$, "I caught a lot of strange fishes!";
 	else
-		set .@fish_ss2$, "Remaining " + (30-countitem(6451)) + " of ^bbbbbbUnidentified Fish are required.^000000";
+		set .@fish_ss2$, (30-countitem(6451))+" of ^bbbbbbUnidentified Fish are required.^000000";
 	if (ma_tomas == 100)
 		set .@fish_ss3$, "I met an Admiral Tomas...";
 	mes "[Pipielle]";
@@ -2451,48 +2785,51 @@ malangdo,137,200,6	script	Pipielle	549,{
 	switch(select(.@fish_ss1$,.@fish_ss2$,.@fish_ss3$)) {
 	case 1:
 		mes "[Pipielle]";
-		mes "There are many beautiful fishes around here. So I feel my heart beating as I stand here.";
+		mes "There are many beautiful fish around here. So I feel my heart beating standing here.";
 		next;
-		select("Of course, after seeing such a delicious thing!");
+		select("I think my heart is beating faster...");
 		mes "[Pipielle]";
-		mes "How come you only know about eating?! My heart doesn't beat up because I see something delicious. Don't treat me the same as the others.";
+		mes "How come you only know about eating! My heart doesn't only beat for food.";
 		next;
 		mes "[Pipielle]";
-		mes "I used to study from a scholar from Uno who was human. And I am good at the human language as well. Don't treat me like the others.";
+		mes "I've studied at a human university before and I learned to speak there so don't treat me like some animal.";
 		next;
 		mes "[Pipielle]";
-		mes "I am a scholar who researches fish here. It's a little funny that a cat researches fish, but it's true.";
+		mes "I am a scholar of fish research.";
+		mes "It's important for cats to research fish.";
 		next;
-		select("Were you originally a scholar?");
+		select("How's your research going?");
 		mes "[Pipielle]";
-		mes "Originally I used to be the mate of admiral Tomas. But our ship never went back to sea after we arrived here.";
+		mes "I was a good friend of admiral Thomas but our ship hasn't gone back to sea since we arrived here.";
 		next;
 		mes "[Pipielle]";
-		mes "The mate of a ship that never voyages is lonely.";
+		mes "The shipmates seem to be pretty lonely.";
 		next;
 		mes "[Pipielle]";
-		mes "The scholar from Uno came here for research, and he thought it was amazing that cats spoke the human language. Therefore he started to teach me.";
+		mes "A scholar from the university came here to research us and thought it was amazing to find a cat that speaks his language already.";
+		mes "So he's been helping me teach the others.";
 		next;
-		select("But now everyone speaks the human language.");
+		select("Is that why I understand all the cats?");
 		mes "[Pipielle]";
-		mes "Oh yes, there were only a few cats who spoke the human language. That's why he treated me special.";
+		mes "Yes, exactly!";
+		mes "I was one of the few cats who could talk to humans before that scholar arrived.";
 		next;
 		mes "[Pipielle]";
-		mes "Anyway, now I collect specimens to be an ichthyologist. I hope you can help me.";
+		mes "Anyways, now I'm collecting specimens to study the monsters here. I hope you can help me.";
 		next;
-		if(select("How can I help you?:I would say no.") == 2) {
+		if(select("How can I help you?:I have to decline.") == 2) {
 			mes "[Pipielle]";
 			mes "Oh, okay. If you change your mind, please come again.";
 			close;
 		}
 		mes "[Pipielle]";
-		mes "There is a Pouring who's eating all the fishes in the Octopus and Culvert dungeons.";
+		mes "There is a monster called a Pouring who's eating all fish in the Octopus and Culvert dungeon.";
 		next;
 		mes "[Pipielle]";
-		mes "It didn't use to live there, but might have come here for the winter. Could you collect the specimens of unidentified fish after geting rid of it?";
+		mes "It suddenly appeared during the winter, so could you collect the specimens of Unidentified Fish after getting rid of it?";
 		next;
 		mes "[Pipielle]";
-		mes "You can get identified fishes from Pouring, so please collect about 30 pieces.";
+		mes "You can get Unidentified Fish from the Pouring monsters, so please collect 30 of them.";
 		close;
 	case 2:
 		if (countitem(6451) > 29) {
@@ -2509,7 +2846,7 @@ malangdo,137,200,6	script	Pipielle	549,{
 			close;
 		}
 		mes "[Pipielle]";
-		mes "I'm sorry, but please collect 30 pieces of unidentified fish specimens.";
+		mes "I'm sorry, but please collect 30 Unidentified Fish specimens.";
 		close;
 	case 3:
 		mes "[Pipielle]";
@@ -2548,7 +2885,7 @@ malangdo,137,200,6	script	Pipielle	549,{
 
 // Help the Bad Cats in Danger :: mal_bad_guys
 //============================================================
-malangdo,175,206,3	script	Gobonge#ml	561,{
+malangdo,175,206,3	script	Gobonge#ml	4_CAT_SAILOR5,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Can't go next step due to having too many items. -";
 		close;
@@ -2571,7 +2908,7 @@ malangdo,175,206,3	script	Gobonge#ml	561,{
 	}
 	if (BaseLevel < 60) {
 		mes "[Gobonge]";
-		mes "Are you here to get help";
+		mes "Are you here to help";
 		mes "or to get help?";
 		mes "You look so weak, haha...";
 		mes "Go and hunt more Porings!";
@@ -2752,71 +3089,67 @@ OnDisable:
 	close;
 }
 
-malangdo,181,205,3	script	Gobulee#ml1	547,{
+malangdo,181,205,3	script	Gobulee#ml1	4_CAT_SAILOR4,{
 	mes "[Gobulee]";
-	mes "Why do you come now?";
-	mes "You should have come when we were healthy.";
-	mes "So, you want to me take out what you have?";
+	mes "What a time to show up!";
+	mes "You should come around when we're healthy.";
 	close;
 }
 
-malangdo,180,202,3	script	Gobyungee#ml1	547,{
+malangdo,180,202,3	script	Gobyungee#ml1	4_CAT_SAILOR4,{
 	mes "[Gobyungee]";
-	mes "I can't see other cats because";
-	mes "I could't have time to do bad behavior...";
+	mes "I can't even look another cat in the eye since I'm too sick to be doin' crimes properly.";
 	close;
 }
 
-malangdo,186,201,3	script	Gosigee#ml1	547,{
+malangdo,186,201,3	script	Gosigee#ml1	4_CAT_SAILOR4,{
 	mes "[Gosigee]";
-	mes "I am desperate for pill of stomachache,";
-	mes "cap is only thinking of finding out criminal";
-	mes "and to revenge!";
+	mes "I wish I had some peppy bistmuth pills...";
+	mes "Meanwhile the Captain only thinks about catching the bad guys and getting revenge!";
 	mes "...";
 	next;
 	mes "[Gosigee]";
-	mes "How can we follow him as a cap...!";
+	mes "How can we follow someone so single-minded!";
 	close;
 }
 
-malangdo,177,202,3	script	Gonanee#ml2	547,{
+malangdo,177,202,3	script	Gonanee#ml2	4_CAT_SAILOR4,{
 	mes "[Gonanee]";
-	mes "We are only bad circle in Malangdo";
-	mes "and we are very proud.";
-	mes "Can't just lie in bed.";
+	mes "We are the only violent gang in Malangdo and we are very proud.";
+	mes "I don't feel right just lying in bed.";
 	close;
 }
 
-malangdo,183,202,3	script	Godoree#ml3	547,{
+malangdo,183,202,3	script	Godoree#ml3	4_CAT_SAILOR4,{
 	mes "[Godoree]";
 	mes "I saw unfamiliar cats around";
-	mes "the dock frequently.";
+	mes "the dock recently.";
 	mes "Are they tourists?";
-	mes "We should check their pockets";
-	mes "once I get well...";
+	mes "I should -inspect- their pockets";
+	mes "once I'm better...";
 	close;
 }
 
-malangdo,203,116,5	script	Suspious Dealer#ml	543,{
-	mes "On listening to the story for";
-	mes "a while, he pretends to be indifferent once hearing someone's noise.";
+malangdo,203,116,5	script	Suspious Dealer#ml	4_MASK_SMOKEY,{
+	mes "He appears to be listening intently.";
+	mes "Upon hearing you approach, he pretends to be completely oblivious.";
 	next;
 	mes "[Suspious Dealer]";
-	mes "Oh my body, too much pain...";
+	mes "Oh the pain, oh the pain of it all...";
 	close;
 }
 
-malangdo,205,116,3	script	Very Suspious Dealer#ml1	543,{
+malangdo,205,116,3	script	Very Suspious Dealer#ml1	4_MASK_SMOKEY,{
 	mes "On listening to the story for";
 	mes "a while, he pretends to be indifferent once hearing someone's noise.";
 	next;
-	mes "[Very Suspious Dealer]";
-	mes "The weather is so dirty...";
+	mes "[Suspious Dealer]";
+	mes "Could it BE any smoggier today?";
 	close;
 }
 
-malangdo,197,120,5	script	Foolish Cat#ml	546,{
-	mes "[Foolish Cat]";
+malangdo,197,120,5	script	A Foolish Cat#ml	4_CAT_SAILOR3,{
+	mes "[A Foolish Cat]";
 	mes "If you stay here, you";
 	mes "can hear all they're saying.";
 	mes "Don't know exactly what, but";
@@ -2903,11 +3236,10 @@ OnTouch:
 	end;
 }
 
-malangdo,171,163,3	script	Awfully Suspious Dealer	543,{
+malangdo,171,163,3	script	Awfully Suspious Dealer	4_MASK_SMOKEY,{
 	if (malang_bad_guys < 4) {
 		mes "[Awfully Suspious Dealer]";
-		mes "We quit our sales,";
-		mes "find the other merchant!";
+		mes "We quit selling them, find another merchant!";
 		close;
 	} else if (malang_bad_guys == 4) {
 		mes "[Awfully Suspious Dealer]";
@@ -3034,7 +3366,7 @@ malangdo,171,163,3	script	Awfully Suspious Dealer	543,{
 	close;
 }
 
-mal_in02,184,72,3	script	Gozangee#ml	547,{
+mal_in02,184,72,3	script	Gozangee#ml	4_CAT_SAILOR4,{
 	mes "[Gozangee]";
 	mes "I have too much pain in my stomach...";
 	mes "Should endure myself!";
@@ -3077,7 +3409,7 @@ OnTouch:
 	end;
 }
 
-malangdo,125,147,3	script	Patrol Leader#ml	545,{
+malangdo,125,147,3	script	Patrol Leader#ml	4_CAT_SAILOR2,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Can't go next step due to having too many items. -";
 		close;
@@ -3158,7 +3490,7 @@ malangdo,125,147,3	script	Patrol Leader#ml	545,{
 	close;
 }
 
-malangdo,129,146,3	script	Crime Prevention Staff	545,{
+malangdo,129,146,3	script	Crime Prevention Staff	4_CAT_SAILOR2,{
 	if (malang_bad_guys > 11) {
 		mes "[Crime Prevention Staff]";
 		mes "A work to do means happy things!";
@@ -3181,10 +3513,8 @@ malangdo,129,146,3	script	Crime Prevention Staff	545,{
 	close;
 }
 
-/*
-malangdo,3,1,3	script	Guidance for quest#ml	543,{
-	input .@input,1,9999;
-	if (.@input != 1854) {
+malangdo,3,1,3	script	Guidance for quest#ml	4_MASK_SMOKEY,{
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
 		mes "[Helper]";
 		mes "What is this security code?";
 		mes "Go away!";
@@ -3229,11 +3559,10 @@ malangdo,3,1,3	script	Guidance for quest#ml	543,{
 		close;
 	}
 }
-*/
 
 // Clean the Ship :: mal_day_qook
 //============================================================
-mal_in02,76,63,7	script	Cleanyang	544,{
+mal_in02,76,63,7	script	Cleanyang	4_CAT_SAILOR1,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -3523,11 +3852,11 @@ mal_in02,76,63,7	script	Cleanyang	544,{
 			mes "Recently, there are 9 spot that hided cat's ship biscuit as well.";
 			next;
 			mes "[Cleanyang]";
-			mes "Someone think that good angel took them all as I collected and threw away";
+			mes "Someone think that good angel took them all as I collected and threw away.";
 			mes "He still hide them that place.";
 			next;
 			mes "[Cleanyang]";
-			mes "It is so easy because I don't have to search everywhere, but";
+			mes "It is so easy because I don't have to search everywhere, but...";
 			mes "Please search the 9 spot where hiding frequently.";
 			close;
 		}
@@ -3542,7 +3871,7 @@ mal_in02,76,63,7	script	Cleanyang	544,{
 		case 1:
 			mes "[Cleanyang]";
 			mes "My service to you today.";
-			mes "The inside of ship Navi, home and cat tower too. Don't even miss a blade of grass";
+			mes "The inside of ship Navi, home and cat tower too. Don't even miss a blade of grass.";
 			mes "Search everywhere.";
 			setquest 7268;
 			close;
@@ -3618,7 +3947,7 @@ mal_in02,76,63,7	script	Cleanyang	544,{
 	}
 }
 
-mal_in02,29,67,0	script	#CaptainRoom3	844,{
+mal_in02,29,67,0	script	#CaptainRoom3	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -3697,7 +4026,7 @@ mal_in02,29,67,0	script	#CaptainRoom3	844,{
 	close;
 }
 
-mal_in02,183,49,0	script	#MeetingFloor4	844,{
+mal_in02,183,49,0	script	#MeetingFloor4	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -3744,7 +4073,7 @@ mal_in02,183,49,0	script	#MeetingFloor4	844,{
 	close;
 }
 
-mal_in02,103,22,0	script	#MalBed5	844,{
+mal_in02,103,22,0	script	#MalBed5	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -3789,7 +4118,7 @@ mal_in02,103,22,0	script	#MalBed5	844,{
 	close;
 }
 
-malangdo,141,178,0	script	#Darkweed6	844,{
+malangdo,141,178,0	script	#Darkweed6	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -3826,7 +4155,7 @@ malangdo,141,178,0	script	#Darkweed6	844,{
 	close;
 }
 
-malangdo,133,134,0	script	Strange Pile of Sand#7	557,{
+malangdo,133,134,0	script	Strange Pile of Sand#7	4_SOIL,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -3868,9 +4197,9 @@ malangdo,133,134,0	script	Strange Pile of Sand#7	557,{
 	mes "- That's it... -";
 	close;
 }
-malangdo,197,237,0	duplicate(Strange Pile of Sand#7)	Strange Pile of Sand#12	557
+malangdo,197,237,0	duplicate(Strange Pile of Sand#7)	Strange Pile of Sand#12	4_SOIL
 
-malangdo,232,131,0	script	#UnderStairs8	844,{
+malangdo,232,131,0	script	#UnderStairs8	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -3904,7 +4233,7 @@ malangdo,232,131,0	script	#UnderStairs8	844,{
 	close;
 }
 
-mal_in01,74,20,0	script	#CornerTower9	844,{
+mal_in01,74,20,0	script	#CornerTower9	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -3935,7 +4264,7 @@ mal_in01,74,20,0	script	#CornerTower9	844,{
 	close;
 }
 
-mal_in01,159,225,0	script	#CornerLocker10	844,{
+mal_in01,159,225,0	script	#CornerLocker10	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -3966,7 +4295,7 @@ mal_in01,159,225,0	script	#CornerLocker10	844,{
 	close;
 }
 
-mal_in01,24,72,0	script	#FootholdTower11	844,{
+mal_in01,24,72,0	script	#FootholdTower11	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -4000,7 +4329,7 @@ mal_in01,24,72,0	script	#FootholdTower11	844,{
 
 // Help Chef Nyas :: mal_day_qook
 //============================================================
-mal_in02,187,58,3	script	Chef Nyas	548,{
+mal_in02,187,58,3	script	Chef Nyas	4_CAT_CHEF,{
 	if (checkweight(1201,1) == 0) {
 		mes "- You have too many items so you can't continue the quest. -";
 		close;
@@ -4315,7 +4644,7 @@ mal_in02,187,58,3	script	Chef Nyas	548,{
 
 // Play with Baby Cats :: mal_nyadventurer
 //============================================================
-malangdo,165,223,4	script	Expert Cat#nya_01	561,{
+malangdo,165,223,4	script	Expert Cat#nya_01	4_CAT_SAILOR5,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 4000) {
 		mes "- You have too many items to proceed in this quest. -";
 		close;
@@ -4475,19 +4804,19 @@ malangdo,165,223,4	script	Expert Cat#nya_01	561,{
 	}
 }
 
-malangdo,211,203,4	script	[Meow Team] Charo#nya_11	560,{
+malangdo,211,203,4	script	[Meow Team] Charo#nya_11	4_CAT_ADV2,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 4000) {
 		mes "- You have too many items to proceed in this quest. -";
 		close;
 	}
 	if (nyadven == 0) {
-		mes "There are gathered cats who seems younger than other crews.";
+		mes "There are cats who seem younger than the other crew.";
 		mes "They are having a serious conversation about the weird machine in front of them.";
 		close;
 	} else if (nyadven == 1) {
-		mes "There are gathered cats who seems younger than other crews.";
+		mes "There are cats who seem younger than the other crew.";
 		mes "They are having a serious conversation about the weird machine in front of them.";
-		mes "They are looks like kids who Rato told me.";
+		mes "They look like the kids that Rato told me about.";
 		next;
 		switch(select("Just watch them without a word.:Busy right now.")) {
 		case 1:
@@ -4829,7 +5158,7 @@ malangdo,211,203,4	script	[Meow Team] Charo#nya_11	560,{
 	}
 }
 
-malangdo,214,204,3	script	[Meow Team] Rosy#nya_09	559,{
+malangdo,214,204,3	script	[Meow Team] Rosy#nya_09	4_CAT_ADV1,{
 	if (nyadven < 2) {
 		mes "A young cat with white fur tries so hard with the weird machine.";
 		mes "The machine might be broken.";
@@ -4874,13 +5203,13 @@ malangdo,214,204,3	script	[Meow Team] Rosy#nya_09	559,{
 	}
 }
 
-malangdo,215,201,3	script	[Meow Team] Roku#nya_10	553,{
+malangdo,215,201,3	script	[Meow Team] Roku#nya_10	4_CAT_DOWN,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 4000) {
 		mes "- You have too many items to proceed in this quest. -";
 		close;
 	}
 	if (nyadven < 2) {
-		mes "A young black cat helps a busy white cat.";
+		mes "A young black cat helps the busy white cat.";
 		mes "Maybe the machine is broken.";
 		close;
 	} else if (nyadven == 2) {
@@ -5057,7 +5386,7 @@ malangdo,215,201,3	script	[Meow Team] Roku#nya_10	553,{
 	}
 }
 
-malangdo,212,204,0	script	Beginning Compass#nya_02	844,{
+malangdo,212,204,0	script	Beginning Compass#nya_02	CLEAR_NPC,{
 	if (countitem(6428) == 0) {
 		mes "There is a strange machine.";
 		mes "The kids said this was the ride called Duruduru compass of the Meow Bravery Team.";
@@ -5107,7 +5436,7 @@ malangdo,212,204,0	script	Beginning Compass#nya_02	844,{
 L_Viewpoint:
 	switch(getarg(0)) {
 	case 1: // Order 1: Red, Blue, Yellow, Green, White
-		setarray .@Colors$[1],"^FF0000","^0000FF","^FFFF00","^00FF00","^cccccc";
+		setarray .@colors$[1],"^FF0000","^0000FF","^FFFF00","^00FF00","^cccccc";
 		setarray .@Text$[1],"Red","Blue","Yellow","Green","White";
 		if (getarg(1) <= 1)
 			viewpoint 1,213,89,0,0xFF0000;
@@ -5120,7 +5449,7 @@ L_Viewpoint:
 		viewpoint 1,111,178,4,0xcccccc;
 		break;
 	case 2: // Order 2: Yellow, Blue, White, Green, Red
-		setarray .@Colors$[1],"^FFFF00","^0000FF","^cccccc","^00FF00","^FF0000";
+		setarray .@colors$[1],"^FFFF00","^0000FF","^cccccc","^00FF00","^FF0000";
 		setarray .@Text$[1],"Yellow","Blue","White","Green","Red";
 		if (getarg(1) <= 1)
 			viewpoint 1,73,253,0,0xFFFF00;
@@ -5134,7 +5463,7 @@ L_Viewpoint:
 		break;
 	}
 	for(set .@i,1; .@i<=5; set .@i,.@i+1)
-		set .@str$, .@str$+((.@i >= getarg(1))?.@Colors$[.@i]:"")+.@Text$[.@i]+" ";
+		set .@str$, .@str$+((.@i >= getarg(1))?.@colors$[.@i]:"")+.@Text$[.@i]+" ";
 	if (getarg(1) > 1)
 		mes "After inserting the card and pressing the red button, the path to the destination lit up.";
 	mes "The order will be "+.@str$+"^000000.";
@@ -5249,13 +5578,13 @@ L_Viewpoint:
 	}
 	close;
 }
-malangdo,213,89,0	duplicate(#malangdo_compass)	Red Flame Compass#1	844
-malangdo,128,103,0	duplicate(#malangdo_compass)	Blue Flame Compass#2	844
-malangdo,73,253,0	duplicate(#malangdo_compass)	Gold Flame Compass#3	844
-malangdo,153,146,0	duplicate(#malangdo_compass)	Forest Compass#4	844
-malangdo,111,178,0	duplicate(#malangdo_compass)	Cloud Compass#5	844
+malangdo,213,89,0	duplicate(#malangdo_compass)	Red Flame Compass#1	CLEAR_NPC
+malangdo,128,103,0	duplicate(#malangdo_compass)	Blue Flame Compass#2	CLEAR_NPC
+malangdo,73,253,0	duplicate(#malangdo_compass)	Gold Flame Compass#3	CLEAR_NPC
+malangdo,153,146,0	duplicate(#malangdo_compass)	Forest Compass#4	CLEAR_NPC
+malangdo,111,178,0	duplicate(#malangdo_compass)	Cloud Compass#5	CLEAR_NPC
 
-malangdo,175,163,0	script	Meowbell#nya_12	844,{
+malangdo,175,163,0	script	Meowbell#nya_12	CLEAR_NPC,{
 	if (countitem(6428) == 0) {
 		mes "There is a fancy bell which doesn't fit in with the ship.";
 		mes "This bell is used in a game by the Meow Bravery Team.";
@@ -5330,7 +5659,7 @@ malangdo,175,163,0	script	Meowbell#nya_12	844,{
 	}
 }
 
-malangdo,176,165,3	script	Deckhand Bubi#nya_16	544,{
+malangdo,176,165,3	script	Deckhand Bubi#nya_16	4_CAT_SAILOR1,{
 	mes "[Bubi]";
 	mes "Hey, human adventurer, what are you here for?";
 	mes "Yeah~ this is a beautiful view.";
@@ -5346,7 +5675,7 @@ malangdo,176,165,3	script	Deckhand Bubi#nya_16	544,{
 	close;
 }
 
-malangdo,172,178,7	script	Cat Detective#nya_14	560,{
+malangdo,172,178,7	script	Cat Detective#nya_14	4_CAT_ADV2,{
 	cutin "mal_homnya_n",2;
 	if (nyadven < 6) {
 		mes "[Cat Detective]";
@@ -5750,7 +6079,7 @@ malangdo,172,178,7	script	Cat Detective#nya_14	560,{
 	end;
 }
 
-malangdo,173,177,7	script	Friend of Detective#mal	559,{
+malangdo,173,177,7	script	Friend of Detective#mal	4_CAT_ADV1,{
 	cutin "mal_homnya_n",2;
 	mes "[Nyangson]";
 	mes "I am a friend of Detective Homnya, Nyangson.";
@@ -5764,7 +6093,7 @@ malangdo,173,177,7	script	Friend of Detective#mal	559,{
 	end;
 }
 
-malangdo,174,175,0	script	Noisy Machine#nya_13	844,{
+malangdo,174,175,0	script	Noisy Machine#nya_13	CLEAR_NPC,{
 	if (nyadven < 7) {
 		mes "There is a strange machine.";
 		mes "It has a Red, Blue, Yellow, and Green luminous body with buttons to react,";
@@ -5899,12 +6228,12 @@ L_ShowLights:
 	mes "In that order.";
 	next;
 	mes "Luminous";
-	setarray .@Color$[0],"Red","Blue","Yellow","Green";
+	setarray .@color$[0],"Red","Blue","Yellow","Green";
 	setarray .@Cutin$[0],"nya_red","nya_blue","nya_yellow","nya_green";
 	for(set .@i,0; .@i<getarg(0); set .@i,.@i+1) {
 		set .@rand, rand(4);
 		set .@Lamp[.@i],.@rand;
-		mes .@Color$[.@rand];
+		mes .@color$[.@rand];
 		if (.@i+1 == getarg(0))
 			mes "Shines according to this order.";
 		cutin .@Cutin$[.@rand],4;
@@ -5915,9 +6244,9 @@ L_ShowLights:
 	mes "Stop the machine by pressing the right button within time.";
 	next;
 	set .@pass,0;
-	setarray .@Count$[0],"first","second","third","fourth","fifth","sixth","seventh","eighth";
+	setarray .@count$[0],"first","second","third","fourth","fifth","sixth","seventh","eighth";
 	for(set .@i,0; .@i<getarg(0); set .@i,.@i+1) {
-		mes "Which color button do you want to press "+.@Count$[.@i]+"?";
+		mes "Which color button do you want to press "+.@count$[.@i]+"?";
 		next;
 		// Red <-> Green, Blue <-> Yellow
 		set .@j, select("Red:Blue:Yellow:Green");
@@ -6002,7 +6331,7 @@ function	script	F_Mal_Picture	{
 	}
 }
 
-mal_in02,187,45,0	script	Box#nya01	844,{
+mal_in02,187,45,0	script	Box#nya01	CLEAR_NPC,{
 	switch(callfunc(
 		"F_Mal_Picture",
 		7251,1,
@@ -6028,7 +6357,7 @@ mal_in02,187,45,0	script	Box#nya01	844,{
 	}
 }
 
-mal_in02,170,75,0	script	Book#nya02	844,{
+mal_in02,170,75,0	script	Book#nya02	CLEAR_NPC,{
 	switch(callfunc(
 		"F_Mal_Picture",
 		7252,1,
@@ -6053,7 +6382,7 @@ mal_in02,170,75,0	script	Book#nya02	844,{
 	}
 }
 
-mal_in02,133,98,0	script	Dirty Bed#nya03	844,{
+mal_in02,133,98,0	script	Dirty Bed#nya03	CLEAR_NPC,{
 	switch(callfunc(
 		"F_Mal_Picture",
 		7253,1,
@@ -6080,7 +6409,7 @@ mal_in02,133,98,0	script	Dirty Bed#nya03	844,{
 	}
 }
 
-mal_in02,31,57,0	script	Seashell#nya04	844,{
+mal_in02,31,57,0	script	Seashell#nya04	CLEAR_NPC,{
 	switch(callfunc(
 		"F_Mal_Picture",
 		7254,0,
@@ -6097,7 +6426,7 @@ mal_in02,31,57,0	script	Seashell#nya04	844,{
 	}
 }
 
-mal_in02,114,56,0	script	Ship Pillar#nya05	844,{
+mal_in02,114,56,0	script	Ship Pillar#nya05	CLEAR_NPC,{
 	switch(callfunc(
 		"F_Mal_Picture",
 		7255,1,
@@ -6123,7 +6452,7 @@ mal_in02,114,56,0	script	Ship Pillar#nya05	844,{
 	}
 }
 
-mal_in02,139,30,0	script	Ventilation Window#nya06	844,{
+mal_in02,139,30,0	script	Ventilation Window#nya06	CLEAR_NPC,{
 	switch(callfunc(
 		"F_Mal_Picture",
 		7256,0,
@@ -6144,7 +6473,7 @@ mal_in02,139,30,0	script	Ventilation Window#nya06	844,{
 	}
 }
 
-mal_in02,166,74,4	script	Neat Crew#nyaong01	555,{
+mal_in02,166,74,4	script	Neat Crew#nyaong01	4_CAT_3COLOR,{
 	mes "[Neat Crew]";
 	mes "Please clean up your stuff by yourself.";
 	mes "Especially you guys getting dirty after we came to this island!";
@@ -6161,7 +6490,7 @@ mal_in02,166,74,4	script	Neat Crew#nyaong01	555,{
 	close;
 }
 
-mal_in02,132,95,5	script	Scary Crew#nyaong02	561,{
+mal_in02,132,95,5	script	Scary Crew#nyaong02	4_CAT_SAILOR5,{
 	mes "[Scary Crew]";
 	mes "I try to be nice these days, and kids just take liberties with me.";
 	mes "Will you too?";
@@ -6172,7 +6501,7 @@ mal_in02,132,95,5	script	Scary Crew#nyaong02	561,{
 	close;
 }
 
-mal_in02,109,62,4	script	Picky Crew#nyaong03	545,{
+mal_in02,109,62,4	script	Picky Crew#nyaong03	4_CAT_SAILOR2,{
 	mes "[Picky Crew]";
 	mes "Do not run in the hall!";
 	mes "My fur falls out because of someone who";
@@ -6180,16 +6509,4012 @@ mal_in02,109,62,4	script	Picky Crew#nyaong03	545,{
 	close;
 }
 
+// Cat Gamers :: mal_gamer
+//============================================================
+mal_in01,31,210,2	script	Cat Gamers Director	4_CAT_MERMASTER,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	if (BaseLevel < 60) {
+		mes "A gentle looking cat is whispering to himself.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Hello... Mr. Cat...";
+		next;
+		mes "The cat takes a glance at you and goes back to his whispering as if he didn't even see you.";
+		next;
+		mes "It seems you are not being considered worth talking to.";
+		close;
+	}
+	if (malang_gamer == 0) {
+		mes "A gentle looking cat is whispering to himself.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Man! 10 losses in a row...";
+		emotion e_sigh;
+		next;
+		mes "[Cat Gamers Director]";
+		mes "We are the 'Cat Gamers' Association.";
+		mes "But, we still keep on losing and we have no idea why!";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "We've got to find out the reason for this losing streak.";
+		set malang_gamer,1;
+		next;
+		mes "You are getting interested in the cat's story. Let's hear more.";
+		close;
+	} else if (malang_gamer == 1) {
+		mes "[Cat Gamers Director]";
+		mes "The reason, yes!";
+		mes "This can be one of them.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "^DD2234Giving up so many points!^000000";
+		mes "That's right. No matter how much you score,";
+		mes "we will still lose if we give up so many points.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "For the other reason. Hmm!";
+		mes "This could be related with the previous reason.";
+		mes "No ^DD2234aggresive point betting^000000 at all.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Other teams bet on games that they think will win, and bet low when they are not confident.";
+		mes "I guess we didn't know that.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Hmm, can this be a reason?";
+		mes "For some reason there were ^DD2234players disappearing right before the match up^000000 and I guess this could have effected our game spirit.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Hmm... So the reason of our losing streak will be,";
+		mes "giving up too many points;";
+		mes "aggressive point betting;";
+		mes "and players disappearing?";
+		set malang_gamer,2;
+		next;
+		mes "It seems like the gentle looking cat has finished thinking. Let's interrupt the conversion.";
+		close;
+	} else if (malang_gamer == 2) {
+		mes "[Cat Gamers Director]";
+		mes "Now that I know the reason,";
+		mes "there should be a solution to that.";
+		emotion e_hmm;
+		next;
+		select("Umm... Mr. Cat...");
+		mes "[Cat Gamers Director]";
+		mes "Who's there? Human? You are a human?";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "... ... ... ...";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Oh! Yes! Right!";
+		mes "I remember hearing that";
+		mes "humans have started passing through here recently.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "So good to see you!!";
+		mes "What is your name by the way?";
+		emotion e_gasp;
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "My name is "+strcharinfo(0)+", Mr. Cat.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Oh, ^0000FF"+strcharinfo(0)+"^000000.";
+		mes "How may I help you?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Actually I wanted to help you out since I heard that you've lost 10 games in a row...";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Well, you didn't really have to point it out like that...";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "A weakness is no longer a weakness when you say it out loud.";
+		emotion e_no1,1;
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Hahahaha I like that phrase.";
+		mes "I should remember it and";
+		mes "tell it to my kids. Heh~";
+		next;
+		if (Sex == 0)
+			setarray .@sex$[0],"Mr.","boy";
+		else
+			setarray .@sex$[0],"Miss","girl";
+		mes "[Cat Gamers Director]";
+		mes "I like you, "+.@sex$[0]+" "+strcharinfo(0)+". Will you help us get out of this 10 game losing streak? Ehehe~";
+		next;
+		switch(select("Sorry, I'm a stupid "+.@sex$[1]+".:Sure, I'm a cool "+.@sex$[1]+".")) {
+		case 1:
+			mes "[Cat Gamers Director]";
+			mes "Guess I was wrong about you~";
+			mes "How can a person call themself stupid.";
+			mes "Now I can see how stupid you are.";
+			mes "Good bye~";
+			emotion e_hmm;
+			close;
+		case 2:
+			mes "[Cat Gamers Director]";
+			mes "Wow. I respect you, "+strcharinfo(0)+".";
+			mes "Let me ask you a favor.";
+			mes "Please meet the hard working Manager Cat and ask about our team's attitude these days.";
+			set malang_gamer,3;
+			setquest 5058;
+			next;
+			mes "[Cat Gamers Director]";
+			mes "The Manager Cat must be around here somewhere~";
+			close;
+		}
+	} else if (malang_gamer == 3) {
+		mes "[Cat Gamers Director]";
+		mes "Please meet the hard working";
+		mes "Manager Cat, and ask about our team's attitude these days.";
+		mes "The Manager Cat must be around here somewhere~";
+		close;
+	} else if (malang_gamer == 4) {
+		mes "[Cat Gamers Director]";
+		mes "Ok Ok. So what did the manager cat say about the atmosphere these days?~";
+		emotion e_what;
+		next;
+		mes "You tell him exactly what the Manager Cat said.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "The manager cat said...";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Do not hesitate... Just tell me everything~";
+		emotion e_what;
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Umm... the player cats are afraid of you...";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "What... What did you say?";
+		emotion e_omg;
+		next;
+		mes "Cat Gamers Director seems to be in shock. Let's give him some time to calm down.";
+		set malang_gamer,5;
+		erasequest 5059;
+		setquest 5060;
+		close;
+	} else if (malang_gamer == 5) {
+		if (checkquest(5060,PLAYTIME) == 0 || checkquest(5060,PLAYTIME) == 1) {
+			mes "Cat Gamers Director seems to be in shock. Let's give him some time to calm down.";
+			close;
+		}
+		mes "[Cat Gamers Director]";
+		mes "That is impossible!";
+		mes "There is no other cat that's nicer than I am!";
+		emotion e_sob;
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Am I really that scary?";
+		mes "Are those players who bailed on the practice afraid of me too?";
+		emotion e_swt2;
+		next;
+		mes "[Cat Gamers Director]";
+		mes "It can't be, right? ehehehehe~";
+		next;
+		mes "- He laughs nervously. -";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Is that the truth?";
+		next;
+		mes "[Cat Gamers Director]";
+		mes strcharinfo(0)+", will you help me out?";
+		mes "There are 4 players who ran away from practice saying they were too tired.";
+		mes "Could you check if they ran away because of me? ehehehe~";
+		emotion e_what;
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Their names are Eryu, Stew, Ketchup, and Eff.";
+		mes "They've got to be somewhere around here.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Please find them all~";
+		mes "But, don't ask too directly! Ok?";
+		mes "Just ask them gentle questions~";
+		mes "Ok? Be! Gentle!";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "I appreciate your help, "+strcharinfo(0)+". heh~";
+		set malang_gamer,6;
+		erasequest 5060;
+		setquest 5061;
+		close;
+	} else if (malang_gamer == 6) {
+		if (checkquest(5062) == 2 && checkquest(5063) == 2 && checkquest(5064) == 2 && checkquest(5065) == 2) {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ It seems some humans are scamming cats around this town.";
+			next;
+			mes "[Cat Gamers Director]";
+			mes "What good is it to scam innocent cats?~";
+			emotion e_gg;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Yes, I think that you're right.";
+			emotion e_hmm,1;
+			next;
+			mes "[Cat Gamers Director]";
+			mes "Oh, so you met Eryu, Stew, Ketchup, and Eff.";
+			mes "It is so good to see you again. Heh~";
+			mes "Thank you very much for your effort~. Heh~";
+			next;
+			mes "[Cat Gamers Director]";
+			mes "So what did they say?";
+			mes "They really think I am scary?";
+			next;
+			mes "You tell the Cat Gamers Director what Eryu, Stew, Ketchup, and Eff said.";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "They think you push them too much through the practices. So they are scared.";
+			next;
+			mes "[Cat Gamers Director]";
+			mes "What? Really?";
+			next;
+			mes "The Cat Gamers Director seems to be shocked once again. Better give him more time to calm down.";
+			set malang_gamer,7;
+			erasequest 5061;
+			setquest 5060;
+			close;
+		}
+		mes "[Cat Gamers Director]";
+		mes "Their names are Eryu, Stew, Ketchup, and Eff.";
+		mes "They've got to be somewhere around here.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Please find them all~";
+		mes "But, don't ask too directly! Ok?";
+		mes "Just ask them gentle questions~";
+		mes "Ok? Be! Gentle!";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "I appreciate your help, "+strcharinfo(0)+". heh~";
+		close;
+	} else if (malang_gamer == 7) {
+		if (checkquest(5060,PLAYTIME) == 0 || checkquest(5060,PLAYTIME) == 1) {
+			mes "Cat Gamers Director seems to be in shock once again. Better give more time to calm down.";
+			close;
+		}
+		mes "[Cat Gamers Director]";
+		mes "Ok, I understand.";
+		mes "I was a scary cat after all.";
+		mes "This can't be right!! Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "I need to change my scary cat image. Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "This is my mission now,";
+		mes "so our team can improve";
+		mes "game performance. Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Please go meet our manager cat,";
+		mes "and find out how can I change";
+		mes "this scary cat image of mine. Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ I would much appreciate your help, "+strcharinfo(0)+"~.";
+		set malang_gamer,8;
+		erasequest 5060;
+		setquest 5066;
+		close;
+	} else if (malang_gamer == 8) {
+		mes "[Cat Gamers Director]";
+		mes "Please ask our manager cat how can I change this scary cat image.";
+		mes "Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Please help me out,";
+		mes strcharinfo(0)+"! Heh~";
+		close;
+	} else if (malang_gamer == 9) {
+		mes "[Cat Gamers Director]";
+		mes "You came back!! Heh~";
+		mes "So, what did our manager cat say?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Manager cat asked to prepare a box.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "A box? Heh~ Sure, why not?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Are you going to ask me what is it for?";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Well, I kind of was eavesdropping when "+strcharinfo(0)+" and Manager Cat were talking together. Heh~";
+		emotion e_heh;
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "............";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Now I need to check with our players, see how they really feel.";
+		mes "Heh~ Why don't you come back tomorrow?";
+		mes "Heh~ Let me decide what to do after checking their honest petition letters. Heh~";
+		set malang_gamer,10;
+		erasequest 5067;
+		setquest 5068;
+		close;
+	} else if (malang_gamer == 10) {
+		if (checkquest(5068,PLAYTIME) == 0 || checkquest(5068,PLAYTIME) == 1) {
+			mes "[Cat Gamers Director]";
+			mes "Still receiving petition letters. Heh~";
+			next;
+			mes "[Cat Gamers Director]";
+			mes "I wonder what they really want to say~ Heh~";
+			close;
+		}
+		mes "[Cat Gamers Director]";
+		mes "Heh~ All done with collecting petition letters~";
+		mes "Heh~ Let's see what they wrote here?";
+		next;
+		mes "Reading...~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Let me see... 'Stupid Cat lea...de...'";
+		emotion e_an;
+		next;
+		mes "- Crumpling the paper -";
+		mes "Cat Gamers Director has crumpled the paper and thrown it away.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Wrong paper.";
+		mes "Let's read another one... Heh~";
+		next;
+		mes "~Reading~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Here we go.";
+		mes "'I don't like playing with the same team members over and over.";
+		mes "Please pick new team members,";
+		mes "or get me a practicing partner.'";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ I see.";
+		mes "I can take this positively.";
+		mes "Heh~ Let's move on to another one.";
+		emotion e_ok;
+		next;
+		mes "~Reading~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~";
+		mes "'We need more snacks~ Get us some more snacks~'";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ This one also sounds productive.";
+		mes "Heh~ Petition letters are good, I guess... Heh~";
+		emotion e_ok;
+		next;
+		mes "Reading...~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~";
+		mes "'Elders are bullying me. Help me...'";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Our team is absolutely";
+		mes "like a family here~ Someone is";
+		mes "playing here, you know. Heh~";
+		emotion e_gasp;
+		next;
+		mes "Reading...~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ There are only 4 letters!";
+		mes "Including a prank one...";
+		mes "Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Everyone seems to have a satisfied team life~ Heh~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Not... Really...";
+		next;
+		mes "There are tons of letters piled in the back of the box, but Cat Gamers Director doesn't want to admit the problem.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~";
+		mes "Hey, "+strcharinfo(0)+". What did you say? Heh~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Nothing! Please carry on.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Because of what these players want,";
+		mes "I have a favor to ask you, "+strcharinfo(0)+"...";
+		mes "Heh~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "What is it?";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Will you be our players' practicing partner?";
+		mes "Heh~ I feel strongly that you, "+strcharinfo(0)+", can be trusted for this. Heh~";
+		next;
+		switch(select("No thanks, buddy!:Ok, I'll do it!")) {
+		case 1:
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Are you rejecting me? Heh~";
+			next;
+			mes "[Cat Gamers Director]";
+			mes "I'm sad. Sad~ Heh~";
+			mes "I didn't expect a refusal from a person like you, "+strcharinfo(0)+".";
+			mes "But still, here's some coins for you~";
+			mes "Heh~";
+			emotion e_sob;
+			next;
+			mes "[Cat Gamers Director]";
+			mes "We will always welcome you, "+strcharinfo(0)+", as a guest member of the Cat Gamers.";
+			mes "Heh~";
+			set malang_gamer,11;
+			erasequest 5068;
+			getitem 6422,100; //Egrade_Coin
+			next;
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Please come back if you change your mind.";
+			close;
+		case 2:
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Good choice.";
+			mes "I knew you would help us Cat Gamers... Heh~";
+			emotion e_no1;
+			next;
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Thank you for your help.";
+			mes "Heh~ Here are some coins as a small gift... Heh~";
+			mes "Get yourself some goodies. Heh~";
+			next;
+			mes "[Cat Gamers Director]";
+			mes "Since you will be our team's practicing partner, please come back in an hour.";
+			mes "Then I will give you our '^0000FFCat Gamers Certificate^000000'.";
+			mes "Heh~";
+			set malang_gamer,12;
+			erasequest 5068;
+			setquest 5069;
+			getitem 6422,100; //Egrade_Coin
+			next;
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Ok, "+strcharinfo(0)+". I will see you in an hour. Heh~";
+			close;
+		}
+	} else if (malang_gamer == 11) {
+		mes "[Cat Gamers Director]";
+		mes "Heh~";
+		mes "Aren't you "+strcharinfo(0)+"?";
+		mes "Have you changed your mind yet?";
+		mes "Are you willing to be our team's practicing partner?";
+		next;
+		switch(select("No, I'm just passing through.:I accept your offer.")) {
+		case 1:
+			mes "[Cat Gamers Director]";
+			mes "Heh~ I see.";
+			mes "But, let me tell you once again, "+strcharinfo(0)+".";
+			mes "You are always welcome to be one of our 'Cat Gamers Honorable Members'.";
+			mes "Heh~";
+			close;
+		case 2:
+			mes "[Cat Gamers Director]";
+			mes "Heh~ At last!!";
+			mes strcharinfo(0)+" will become our honorable member!!";
+			mes "I shall make a '^0000FFCat Gamers Certificate^000000' right away. Heh~";
+			emotion e_ho;
+			next;
+			mes "[Cat Gamers Director]";
+			mes "Come back in an hour and I will get you a '^0000FFCat Gamers Certificate^000000'.";
+			mes "Heh~";
+			set malang_gamer,12;
+			setquest 5069;
+			close;
+		}
+	} else if (malang_gamer == 12) {
+		if (checkquest(5069,PLAYTIME) == 0 || checkquest(5069,PLAYTIME) == 1) {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ You want to get the '^0000FFCat Gamers Certificate^000000' faster. Heh~ It's not really easy to get such a certificate easily.";
+			next;
+			mes "[Cat Gamers Director]";
+			mes "So, it's a bit tricky... Heh~ Please come later. Heh~";
+			emotion e_ho;
+			close;
+		}
+		mes "[Cat Gamers Director]";
+		mes "Heh~ I got a message from the workshop that their work on the certificate is done. Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "This is not some ordinary certificate. Heh~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "What do you mean?";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ This is...";
+		next;
+		mes "The Cat Gamers Director's eyes are shining with pride.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ The pure essence of the 'Cat Gamers' tech team's effort!!";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Equip this item, then all of your game playing records will be saved. Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Take this and show us what you've got.";
+		erasequest 5069;
+		set malang_gamer,20;
+		getitem 2872,1; //G_Honor_Certificate
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ I may be worrying too much... But, please wear this '^0000FFCat Gamers Certificate^000000', and play the game. Heh~";
+		close;
+	} else if (malang_gamer == 20) {
+		// fall through
+	} else {
+		mes "[Cat Gamers Director]";
+		mes "This is not possible. Please contact an administrator.";
+		close;
+	}
+	mes "[Cat Gamers Director]";
+	mes "Heh~ Hello, "+strcharinfo(0)+". How is it going practicing with the players?";
+	emotion e_what;
+	next;
+	switch(select("How are the players doing?:Just stopped by to say hi~:Here's the current status...")) {
+	case 1:
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Wow, "+strcharinfo(0)+"! I'm so touched by your care for the players.";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ For 13 years of my life, I've never seen anyone like you, "+strcharinfo(0)+". Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ "+strcharinfo(0)+", which player's condition are you interested in?";
+		next;
+		switch(select("Rock Paper Scissors players:ChamChamCham players:KongNyangKong players:Flag Game players")) {
+		case 1:
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Rock Paper Scissors players are missing practices occasionally, but they are still getting better. Heh~";
+			break;
+		case 2:
+			mes "[Cat Gamers Director]";
+			mes "ChamChamCham players are actually complaining about the practice because you are doing so well with them, very hard to remember the winner. Heh~";
+			break;
+		case 3:
+			mes "[Cat Gamers Director]";
+			mes "Heh~ KongNyangKong players are so happy with the practice. Heh~";
+			break;
+		case 4:
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Flag Game players are always nervous since you make them work so much. Heh~ But, they are really getting better. Heh~";
+			break;
+		}
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Please keep up the good work, "+strcharinfo(0)+". Heh~";
+		close;
+	case 2:
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Hello there~ "+strcharinfo(0)+". You have such good manners~ Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ These days, there are so many cats and humans without proper manners. Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "We also have some of thme in our 'Cat Gamers'. They are so arrogant every time we win the game... Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ There should be more people like you, "+strcharinfo(0)+". Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ Please practice with our players more often~ Heh~ So they can learn some manners from you, "+strcharinfo(0)+". Heh~";
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Keep up the good work~ Heh~";
+		close;
+	case 3:
+		mes "[Cat Gamers Director]";
+		mes "Heh~ What happened to your face, "+strcharinfo(0)+"? Guess you lost from the practice, right? Heh~";
+		emotion e_gg;
+		next;
+		mes "[Cat Gamers Director]";
+		mes "Heh~ I saw players puting notes in the 'Petition box'. Heh~ Guess that was your work. Let me see...";
+		next;
+		break;
+	}
+
+	// Detect quest (ID range 5074~5090)
+	mes "[Cat Gamers Director]";
+	if (checkquest(5074,HUNTING) > -1) {
+		mes "Heh~ It's not like I didn't feed them right... Heh~ I hope it was not too much for you, "+strcharinfo(0)+".";
+		next;
+		if (checkquest(5074,HUNTING) == 2 && countitem(1023) >= 10) {
+			delitem 1023,10; //Fish_Tail
+			callsub L_CompleteQuest,5074,
+				"Heh~ So, you brought 30 Phens and 10 Fish Tails, just as ordered.";
+		} else {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ It says in the note to bring 30 Phens and 10 Fish Tails. Heh~ Maybe you didn't catch enough Phens, or forgot some Fish Tails? Heh~";
+			close;
+		}
+	} else if (checkquest(5075,HUNTING) > -1) {
+		mes "Heh~ Hmm, 50 Marses, and 30 Milk Bottles... Heh~";
+		next;
+		if (checkquest(5075,HUNTING) == 2 && countitem(519) >= 30) {
+			delitem 519,30; //Milk
+			callsub L_CompleteQuest,5075,
+				"Heh~ Guess they wanted some healthy food. Heh~ They should have just told me... Let me show you my skills. Heh~";
+		} else {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ But, where are 50 Marses and 30 Milk Bottles? Heh~ Please see if you haven't missed them...";
+			close;
+		}
+	} else if (checkquest(5076,HUNTING) > -1) {
+		mes "Heh~ Our team must have some grudge over Team 'Dog n Waltz', enough to ask you for this kind of favor...";
+		next;
+		if (checkquest(5076,HUNTING) == 2) {
+			callsub L_CompleteQuest,5076,
+				"Heh~ So you have finished harassing 30 Kobold Archers as noted. Heh~ Outstanding.";
+		} else {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ It says on the note, harass 30 Kobold Archers. Heh~ Please check if you have harassed 30 of them already.";
+			close;
+		}
+	} else if (checkquest(5077,HUNTING) > -1) {
+		mes "Heh~ Ah, quickness training. It's good to see our players trying their best on training.";
+		mes "Heh~ Yes, nothing is better than mouse catching for improving quickness.";
+		next;
+		if (checkquest(5077,HUNTING) == 2) {
+			callsub L_CompleteQuest,5077,
+				"Heh~ Oh, you got some fresh and chubby Cramps. Heh~ Great.";
+		} else {
+			mes "[Cat Gamers Director]";
+			mes "Heh? Where are those 10 Cramps you promised? Heh~ You didn't eat them... did you?";
+			close;
+		}
+	} else if (checkquest(5078,HUNTING) > -1) {
+		mes "Heh~ '50 Peco Peco please!! Let's party.' Hmm... Heh~ 50 Pecos can feed all of our neighbors.";
+		next;
+		if (checkquest(5078,HUNTING) == 2) {
+			callsub L_CompleteQuest,5078,
+				"Heh~ Wow, you did bring 50 Peco Pecos. Heh~ I guess we'll really have a party this evening.";
+		} else {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Where are those Peco Pecos? Still not ready? Heh~";
+			close;
+		}
+	} else if (checkquest(5079) > -1) {
+		mes "Heh~ Hmm... let me see... Heh~ That's right, I was worrying about our team getting so nervous before the actual game... But, they won't even talk to me about it.";
+		next;
+		if (countitem(7038) >= 20) {
+			delitem 7038,20; //Yarn
+			callsub L_CompleteQuest,5079,
+				"Heh~ How could I miss that? I shall give some to my team for sure.";
+		} else {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Where are those 20 yarns? It says 20 on the note, right...? Please check if you have lost them somewhere.";
+			close;
+		}
+	} else if (checkquest(5080) > -1) {
+		mes "Heh~ The note says, get me 30 Rat Tails for a snack.";
+		next;
+		if (countitem(1016) >= 30) {
+			delitem 1016,30; //Rat_Tail
+			callsub L_CompleteQuest,5080,
+				"Heh~ I think I've fed them good snacks... Didn't I? Lately I was little busy, they should have some patience... Heh~ Poor manager...";
+		} else {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Where are those 30 Rat Tails? Please check and come back later.";
+			close;
+		}
+	} else if (checkquest(5081) > -1) {
+		mes "Heh~ It says 5 on the note... 5 of what? What?! Lemons?";
+		next;
+		if (countitem(568) >= 5) {
+			delitem 568,5; //Lemon
+			callsub L_CompleteQuest,5081,
+				"Heh~ Lemon is forbidden before the actual game... heh? They won't eat it at game time, right? Heh~";
+		} else {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Let's just get 5 Lemons for them, will you? Heh~ I am still not sure where they want to use them...";
+			close;
+		}
+	} else if (checkquest(5082) > -1) {
+		mes "Heh~ Give us 10 Ice Pieces or 10 Ice Creams!! Heh~ I personally prefer Ice Cream, just so you know.";
+		next;
+		if (countitem(7066) >= 10) {
+			delitem 7066,10; //Ice_Piece
+			callsub L_CompleteQuest,5082,
+				"Heh~ Oh, you brought Ice Pieces. Heh~ The players will love it.";
+		} else if (countitem(536) >= 10) {
+			delitem 536,10; //Ice_Cream
+			callsub L_CompleteQuest,5082,
+				"Heh~ Oh, you brought Ice Creams. Heh~ The players will love it.";
+		} else {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ Where are the Ice Pieces or Ice Creams? You should get them before they melt...";
+			close;
+		}
+	} else if (checkquest(5083) > -1 || checkquest(5084) > -1) {
+		mes "Heh~ Here, I found the note from our team. Heh~";
+		next;
+		if (checkquest(5083) > -1) {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ It says 'We will meet Eryu together.'. Heh~ Have you met Eryu already? I don't think so... Heh~";
+			close;
+		} else {
+			callsub L_CompleteQuest,5084,
+				"Heh~ Oh, you did meet Eryu. Heh~ I will lecture them later for making you work too much... Heh~";
+		}
+	} else if (checkquest(5085) > -1 || checkquest(5086) > -1) {
+		mes "Heh~ Here, I found the note from our team. Heh~";
+		next;
+		if (checkquest(5085) > -1) {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ It says 'We will meet Stew together.'. Heh~ Have you met Stew already? I don't think so... Heh~";
+			close;
+		} else {
+			callsub L_CompleteQuest,5086,
+				"Heh~ Oh, you did meet Stew. Heh~ I will lecture them later for making you work too much... Heh~";
+		}
+	} else if (checkquest(5087) > -1 || checkquest(5088) > -1) {
+		mes "Heh~ Here, I found the note from our team. Heh~";
+		next;
+		if (checkquest(5087) > -1) {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ It says 'We will meet Ketchup together.'. Heh~ Have you met Ketchup already? I don't think so... Heh~";
+			close;
+		} else {
+			callsub L_CompleteQuest,5088,
+				"Heh~ Oh, you did meet Ketchup. Heh~ I will lecture them later for making you work too much... Heh~";
+		}
+	} else if (checkquest(5089) > -1 || checkquest(5090) > -1) {
+		mes "Heh~ Here, I found the note from our team. Heh~";
+		next;
+		if (checkquest(5089) > -1) {
+			mes "[Cat Gamers Director]";
+			mes "Heh~ It says 'We will meet Eff together.'. Heh~ Have you met Eff already? I don't think so... Heh~";
+			close;
+		} else {
+			callsub L_CompleteQuest,5090,
+				"Heh~ Oh, you did meet Eff. Heh~ I will lecture them later for making you work too much... Heh~";
+		}
+	}
+	mes "[Cat Gamers Director]";
+	mes "Heh?! There's no favor note for you, "+strcharinfo(0)+". Heh~ What do you want to report? Heh~";
+	close;
+
+// callsub L_CompleteQuest,<quest ID>,"<message>";
+L_CompleteQuest:
+	erasequest getarg(0);
+	getitem 12636,3; //Malang_Sp_Can
+	mes "[Cat Gamers Director]";
+	mes getarg(1);
+	next;
+	mes "[Cat Gamers Director]";
+	mes "Heh~ Thanks for coming by, "+strcharinfo(0)+". Heh~ Keep up the good work. Heh~";
+	emotion e_thx;
+	close;
+}
+
+malangdo,127,111,4	script	Strange Cat#gamer	4_CAT_SAILOR4,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	if (malang_gamer < 3) {
+		mes "[Strange Cat]";
+		mes "Meow~ Meo~ Ow Ow~ Meow Meo~ Eow Eow~";
+		next;
+		mes "Some strange cat is here.";
+		close;
+	} else if (malang_gamer == 3) {
+		mes "[Manager Cat]";
+		mes "Meow~ Meo~ Ow Ow~ Meow Meo~ Eow Eow~";
+		next;
+		mes "[Manager Cat]";
+		mes "What do you want?";
+		emotion e_what;
+		next;
+		set .@cat_gam, rand(1,10);
+		select("Ask about the team's attitude...");
+		if (.@cat_gam == 5) {
+			mes "[Manager Cat]";
+			mes "Do not lie to me! How can I trust you and reveal our team secret? Aren't you a spy from the doggy team?";
+			emotion e_ag;
+			next;
+			select("Aww, come on...");
+			mes "You play with a foxtail nearby and then ask again.";
+			next;
+			select("Cat Gamers Director says...");
+			mes "The Manager Cat seems to be interested in the foxtail and starts answering.";
+			emotion e_awsm;
+			next;
+			mes "[Manager Cat]";
+			mes "Players are afraid of the Cat Gamers Director. When they see Cat Gamers Director at the game, they get nervous.";
+			emotion e_lv;
+			next;
+			mes "[Manager Cat]";
+			mes "Can you give me that?";
+			set malang_gamer,4;
+			erasequest 5058;
+			setquest 5059;
+			next;
+			mes "You hand the foxtail to the Manager Cat. Go back to the Cat Gamers Director.";
+			close;
+		} else {
+			mes "[Manager Cat]";
+			mes "Don't lie to me!";
+			mes "Why should I trust you,";
+			mes "and give our team information?";
+			mes "Aren't you a spy from doggy team...?";
+			mes "Go away.";
+			emotion e_ag;
+			next;
+			mes "This cat might hit you.";
+			close;
+		}
+	} else if (malang_gamer < 8) {
+		mes "The Manager Cat is playing with the foxtail you gave him.";
+		mes "He seems to be liking it...";
+		emotion e_lv;
+		close;
+	} else if (malang_gamer == 8) {
+		mes "The Manager Cat is playing with the foxtail you gave him.";
+		mes "He seems to be liking it...";
+		emotion e_lv;
+		next;
+		switch(select("Help~ Fire~:Hey~!:Do you want to hear something?")) {
+		case 1:
+			mes "[Manager Cat]";
+			mes "Don't lie~ We don't use fire that much~";
+			emotion e_an;
+			next;
+			break;
+		case 2:
+			mes "The Manager Cat ignores you, and keeps on playing with the foxtail.";
+			emotion e_lv;
+			close;
+		case 3:
+			mes "[Manager Cat]";
+			mes "Meow~ I want to tell you a story~ Follow me meow~ Let talk over there, meow~";
+			emotion e_gg;
+			next;
+			break;
+		}
+		mes "["+strcharinfo(0)+"]";
+		mes "Haha, I was just kidding. I actually need to tell you that the Cat Gamers Director has an issue...";
+		emotion e_swt2,1;
+		next;
+		mes "You explain the story to the Manager Cat.";
+		emotion e_swt2,1;
+		next;
+		mes "[Manager Cat]";
+		mes "Scary image... Meow, I understand... Cat Gamers Director should feel peace by giving up things.";
+		emotion e_hmm;
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "... ... ...";
+		emotion e_dots,1;
+		next;
+		mes "[Manager Cat]";
+		mes "Meow! Go tell him this, meow~ Prepare a box, meow~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "A box?";
+		emotion e_what,1;
+		next;
+		mes "[Manager Cat]";
+		mes "Petition it is, meow!! There is some place where humans do such things, I think it will help us~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ok, I will go tell it to the Games Director~";
+		emotion e_ok,1;
+		set malang_gamer,9;
+		erasequest 5066;
+		setquest 5067;
+		close;
+	} else if (malang_gamer == 9) {
+		mes "[Manager Cat]";
+		mes "You tell the Cat Gamers Director to prepare a Box for sure!~ I will tell this to my team, meow.";
+		close;
+	} else if (malang_gamer == 10) {
+		mes "[Manager Cat]";
+		mes "The players are excited and writing a bunch of things for the petition box... I wonder what they are writing.";
+		close;
+	} else if (malang_gamer == 11) {
+		mes "[Manager Cat]";
+		mes "You won't help practice? If you help, the Cat Gamers Director will give you food cans... Please reconsider!";
+		close;
+	} else if (malang_gamer == 12) {
+		mes "[Manager Cat]";
+		mes "Meow~ Aren't you "+strcharinfo(0)+"? I heard Cat Gamers Director ordered a special certificate, meow~";
+		next;
+		mes "[Manager Cat]";
+		mes "When practicing, you must equip the '^0000FFCat Gamers Certificate^000000' item~ Don't forget, meow~";
+		close;
+	} else if (malang_gamer == 20) {
+		// fall through
+	} else {
+		mes "[Manager Cat]";
+		mes "This is not possible. Please contact an administrator.";
+		close;
+	}
+	mes "[Manager Cat]";
+	mes "What do you want meow?";
+	next;
+	switch(select("Hi.:Any news?:Help me with playing.")) {
+	case 1:
+		mes "[Manager Cat]";
+		mes "Oh, hi meow~";
+		emotion e_heh;
+		close;
+	case 2:
+		switch(rand(1,7)) {
+		case 1:
+			mes "[Manager Cat]";
+			mes "I tell you this meow~ You don't know Cat Gamers Director's feeling meow~.";
+			next;
+			mes "[Manager Cat]";
+			mes "lol? >> Curious, Admire";
+			mes "Heh~ >> Normal";
+			mes "lol Heh~ >> Happy";
+			mes "lol lol Heh~ >> Crazy meow";
+			emotion e_ok;
+			close;
+		case 2:
+			mes "[Manager Cat]";
+			mes "But, why are you asking me meow? Strange meow...";
+			close;
+		case 3:
+			mes "[Manager Cat]";
+			mes "Some cats use 'meow meow' like me when talking, but some don't.";
+			close;
+		case 4:
+			mes "[Manager Cat]";
+			mes "Cats don't have an honorific phrase, so don't get us wrong as looking down on you meow.~";
+			close;
+		case 5:
+			mes "[Manager Cat]";
+			mes "You should walk around many places and ask for information meow... But, don't bother me please meow~";
+			close;
+		case 6:
+		case 7:
+			mes "[Manager Cat]";
+			mes "No easy way for that... I just breathe meow...";
+			close;
+		}
+	case 3:
+		mes "[Manager Cat]";
+		mes "What game do you want to play?";
+		mes "'Cat Gamers' has players for 4 types of games meow~";
+		mes "The Cat Gamers Director said he will challenge other games later~";
+		next;
+		switch(select("Rock Paper Scissors:KongNyangKong:ChamChamCham:Flag Game")) {
+		case 1:
+			mes "[Manager Cat]";
+			mes "Rock Paper Scissors meow? Nothing special...";
+			next;
+			mes "[Manager Cat]";
+			mes "Scissor beats Paper, meow.";
+			mes "Rock beats Scissors, meow.";
+			mes "Paper beats Rock, meow.";
+			mes "These are basic rules.";
+			next;
+			mes "[Manager Cat]";
+			mes "You play 5 Rock Paper Scissors games with player cats meow.";
+			mes "You play again when you are even meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "You can get a present after 3 times of winning meow.";
+			mes "And you get a big present when you win all 5 matches, meow!!";
+			next;
+			mes "[Manager Cat]";
+			mes "Find Paa or Ser if you want to play the Rock Paper Scissors game.";
+			close;
+		case 2:
+			mes "[Manager Cat]";
+			mes "KongNyangKong is not an easy game meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "When attacking, face your hand the same direction as the opponent meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "When defending, you should face your hand the opposite direction from the opponent meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "If the attack is a success, you can keep on attacking.";
+			mes "But, if you fail, you have to defend meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "If you be careful, you can win without getting hit at all meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "Once you make your opponent's HP 0, you win meow.";
+			mes "Of course there will be a present meow.";
+			mes "Good luck meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "Oh~ right meow~!! Find KungKung if you want to play KongNyangKong.";
+			close;
+		case 3:
+			mes "[Manager Cat]";
+			mes "ChamChamCham is a high level mind game meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "The rules are simple, but you need to think a lot meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "You should direct your hand to where the cat turns its face meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "A present is given for 3 wins in a row meow.";
+			mes "The more wins, the more presents meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "Kuka is smart, and remembers players with many wins meow.";
+			mes "There will be more presents when you take 1st place meow.";
+			close;
+		case 4:
+			mes "[Manager Cat]";
+			mes "Flag Game is way harder than ChamChamCham game meow.";
+			mes "Really~ Really~ Really~";
+			mes "hard mind game meow.";
+			mes "It's 1,000 times harder meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "You get 5 Flag Point when starting meow.";
+			mes "1 point goes away when you wave the flag once meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "You win the game when no other cats are waving flags meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "You can predict if other cats will wave their flags or not meow.";
+			mes "By looking at their actions meow.";
+			next;
+			mes "[Manager Cat]";
+			mes "You must win to get presents meow.";
+			mes "You will get more presents since this is hard game meow~";
+			next;
+			mes "[Manager Cat]";
+			mes "If you want to play Flag Game meow~";
+			mes "Go find the other manager cat who is trying to get the Referee Certificate meow.";
+			close;
+		}
+	}
+}
+
+malangdo,161,197,4	script	Eryu#gamer	4_CAT,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	if (checkquest(5061) == 0 || checkquest(5061) == 1) {
+		if (checkquest(5062) == -1) {
+			mes "You found Eryu the cat, and start talking.";
+			next;
+			mes "[Eryu]";
+			mes "Umm... Who are you?";
+			next;
+			switch(select("The Games Director sent me.:I am a writer for the 'Human' magazine.:Who are you?")) {
+			case 1:
+				mes "[Eryu]";
+				mes "Arrgg. Go away...";
+				mes "I don't know who you're talking about.";
+				emotion e_an;
+				break;
+			case 2:
+				mes "[Eryu]";
+				mes "Umm? 'Human' magazine?";
+				mes "Is there such a thing?";
+				emotion e_what;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "We've been publishing for 10 years.";
+				mes "But, I guess it is possible for cats to not know who we are.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "We are a really famous magazine throughout the World!";
+				mes "Don't you believe me?";
+				next;
+				mes "[Eryu]";
+				mes "Hmm... ok. But, what can I do for you?";
+				emotion e_what;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "I am in the middle of writing an article named 'Game Playing Cats'...'";
+				mes "It is a special piece for me.";
+				mes "And some team named umm... do... umm... wal... not sure...";
+				next;
+				mes "[Eryu]";
+				mes "'Dog n Waltz'?";
+				emotion e_what;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh! Yes!";
+				mes "One of players there 'Dog n Waltz' has recommended Eryu for an interview.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "He says you are a really good player who can help me with the article.";
+				next;
+				mes "[Eryu]";
+				mes "I don't remember anyone from 'Dog n Waltz' that much.";
+				emotion e_dots;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "The person isn't important.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Just answer a few questions for me, ok?";
+				mes "Be yourself and you'll do just fine.";
+				mes "Ok, first question: How much do you practice a day?";
+				emotion e_what,1;
+				next;
+				mes "[Eryu]";
+				mes "Usually for about 8 hours, but I have to tell you that I'm not on the team anymore...";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Wait, what?";
+				mes "You are not with the team now? How come...?";
+				emotion e_omg,1;
+				next;
+				mes "[Eryu]";
+				mes "Well...";
+				mes "The Director Cat was too scary...";
+				mes "I was very sick and had to take a day off...";
+				mes "Just one freaking day...";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "And...?";
+				next;
+				mes "[Eryu]";
+				mes "And then the Director Cat was raging at me!";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Hmm, sounds pretty rough.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "'Cat Gamers' has lost another great player.";
+				mes "I'm sorry to hear that you're not on the team anymore.";
+				mes "I guess this is the end of the interview.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Because this is for current players only.";
+				next;
+				mes "[Eryu]";
+				mes "Oh...";
+				mes "Sorry to make you waste your time.";
+				emotion e_sry;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh, don't worry.";
+				mes "I should say sorry for taking up your precious time.";
+				mes "Have a nice day.";
+				next;
+				mes "You found out the reason why Eryu left the team.";
+				mes "Time to go find the other cats.";
+				setquest 5062;
+				completequest 5062;
+				break;
+			case 3:
+				mes "[Eryu]";
+				mes "Yes, I am Eryu! What do you want, huh, meow~";
+				break;
+			}
+			close2;
+		} else if (checkquest(5062) == 2) {
+			mes "[Eryu]";
+			mes "Aren't you the magazine writer?";
+			mes "What brings you here again...?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Ah!";
+			mes "Sorry, I was trying to interview another cat...";
+			mes "And came back to you by mistake.";
+			mes "I'm sorry.";
+			emotion e_sry,1;
+			next;
+			mes "[Eryu]";
+			mes "Ah... I see. Take care of yourself.";
+			close2;
+		} else {
+			mes "[Eryu]";
+			mes "This is not possible. Please contact an administrator.";
+			close2;
+		}
+	} else if (checkquest(5083) == 0 || checkquest(5083) == 1) {
+		mes "[Eryu]";
+		mes "Who are you?";
+		next;
+		mes "What do you want to say?";
+		next;
+		input .@inputstr$;
+		if (.@inputstr$ == "Come back") {
+			erasequest 5083;
+			setquest 5084;
+			set .@str$, "You've delivered the message, so let's get away.";
+		} else
+			set .@str$, "You didn't deliver the right message, but let's still get away.";
+		mes "[Eryu]";
+		mes "What is this? What do you mean by '"+.@inputstr$+"'...?";
+		mes "Ah... aren't you the writer?";
+		emotion e_an;
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Huh... Who is that..?";
+		next;
+		mes "Eryu seems to recognize you.";
+		mes .@str$;
+		close2;
+	} else if (checkquest(5084) == 0 || checkquest(5084) == 1) {
+		mes "[Eryu]";
+		mes "I think you are the writer...";
+		mes "Hey~ Stop there~";
+		next;
+		mes "You've been found. Let's get away.";
+		close2;
+	} else {
+		if (malang_gamer < 6) {
+			mes "[Eryu]";
+			mes "Dirty 'Cat Gamers'!";
+			mes "I won't go back ever... Who are you?";
+			next;
+			mes "This cat might hit you. Let's get away.";
+			close2;
+		} else {
+			mes "[Eryu]";
+			mes "Aren't you the writer?";
+			emotion e_what;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Huh... Who is that..?";
+			next;
+			mes "Eryu seems to recognize you. Let's get away.";
+			close2;
+		}
+	}
+	donpcevent "Eryu#gamer::OnDisable";
+	end;
+OnEnable:
+	enablenpc "Eryu#gamer";
+	disablenpc "Stew#gamer";
+	disablenpc "Ketchup#gamer";
+	disablenpc "Eff#gamer";
+	end;
+OnDisable:
+	switch(rand(3)) {
+	case 0:
+		donpcevent "Stew#gamer::OnEnable";
+		break;
+	case 1:
+		donpcevent "Ketchup#gamer::OnEnable";
+		break;
+	case 2:
+		donpcevent "Eff#gamer::OnEnable";
+		break;
+	}
+	end;
+}
+
+malangdo,230,197,4	script	Stew#gamer	4_CAT_3COLOR,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	if (checkquest(5061) == 0 || checkquest(5061) == 1) {
+		if (checkquest(5063) == -1) {
+			mes "You found Stew the cat, and start talking.";
+			next;
+			mes "[Stew]";
+			mes "Meow...? Who are you, meow?";
+			emotion e_what;
+			next;
+			switch(select("The 'Cat Gamers' Manager sent me.:Meow~ Grrr~:I'm with the 'Boom Can' Company.")) {
+			case 1:
+				mes "[Stew]";
+				mes "Stew is not interested meow.";
+				mes "Don't come back again meow~";
+				break;
+			case 2:
+				mes "[Stew]";
+				mes "Stew doesn't have time for crazy people.";
+				break;
+			case 3:
+				mes "[Stew]";
+				mes "'Boom Can' Company, meow?";
+				emotion e_what;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "You don't know 'Boom Can' food?";
+				mes "You don't eat canned food at all?";
+				mes "Then, I came to the wrong cat.";
+				next;
+				mes "[Stew]";
+				mes "Yes meow~ Stew likes canned food very much meow~";
+				emotion e_lv;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Ah! Ok then.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "We, the 'Boom Can' Company, have been servicing for over 10 years, so we are doing a survey for better food production.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Let me ask a few questions.";
+				mes "It is very easy.";
+				next;
+				mes "[Stew]";
+				mes "Ok meow~ Go ahead meow~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Thank you! We were right about out cat customers with big hearts.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "I met dog customers last week and they didn't answer me at all...";
+				mes "And they were so rude~ You know.";
+				next;
+				mes "[Stew]";
+				mes "Dogs are natually like that~";
+				mes "You humans know animals~";
+				emotion e_ok;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Thank you! I'm flattered.~";
+				mes "Ok, let me ask you a few things.";
+				mes "What is your job?";
+				next;
+				mes "[Stew]";
+				mes "Job meow? Stew was a pro gamer meow~";
+				mes "But, Stew quit now meow~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Well, how did that happen?";
+				mes "You seem to have good skills.";
+				mes "Fast and big hearted, its a pity that you quit already.";
+				next;
+				mes "[Stew]";
+				mes "Meow~ Meow~ Meow~ Yes, Stew was something meow.";
+				mes "If it was not for that Cat Gamers Director scaring me, Stew would still be playing meow~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "What a bad Director.";
+				next;
+				mes "[Stew]";
+				mes "Not that bad actually meow~";
+				mes "Sometimes.. Stew gets very tired meow.";
+				mes "So, Stew takes it easy while practicing meow.";
+				next;
+				mes "[Stew]";
+				mes "Then the Cat Gamers Director started to get angry and scary meow.";
+				mes "So I quit meow.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Ah! I see.";
+				mes "Ok, the survey is over now.";
+				mes "Thank you for your opinion on our survey for the 'Boom Can' company.";
+				emotion e_thx,1;
+				next;
+				mes "[Stew]";
+				mes "Meow? Did you aks anything meow?";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "I already asked you everything...";
+				mes "Don't you remember?";
+				mes "There were 10 questions!";
+				emotion e_what,1;
+				next;
+				mes "[Stew]";
+				mes "Really meow? Strange meow.";
+				mes "Sorry meow? Don't remember meow.";
+				mes "It didn't felt like an interview meow.";
+				emotion e_sry;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Well you did way better than those dogs.";
+				mes "I don't even want to think about them~ Phew~..";
+				mes "I should get going now.";
+				mes "Have a great day.";
+				next;
+				mes "[Stew]";
+				mes "Really meow? Dogs are always like that meow.";
+				mes "Cats are winners meow~";
+				mes "Ok meow~ Good bye meow~";
+				next;
+				mes "You found out the reason why Stew left the team.";
+				mes "Let's find the other cats.";
+				setquest 5063;
+				completequest 5063;
+				break;
+			}
+			close2;
+		} else if (checkquest(5063) == 2) {
+			mes "[Stew]";
+			mes "Aren't you from the 'Boom Can' Company?";
+			mes "Another survey meow?";
+			emotion e_what;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Oops! I should be meeting other cats.";
+			mes "I am very sorry...";
+			emotion e_sry,1;
+			next;
+			mes "[Stew]";
+			mes "It's ok meow~ Good bye meow~";
+			close2;
+		} else {
+			mes "[Stew]";
+			mes "This is not possible. Please contact an administrator.";
+			close2;
+		}
+	} else if (checkquest(5085) == 0 || checkquest(5085) == 1) {
+		mes "[Stew]";
+		mes "Who are you meow?";
+		emotion e_what;
+		next;
+		mes "What do you want to say?";
+		next;
+		input .@inputstr$;
+		if (.@inputstr$ == "Come back") {
+			erasequest 5085;
+			setquest 5086;
+			set .@str$, "You've delivered the message, so let's get away.";
+		} else
+			set .@str$, "You didn't deliver the right message, but let's still get away.";
+		mes "[Stew]";
+		mes "What is this? What do you mean by '"+.@inputstr$+"'? Meow...";
+		mes "And... Aren't you from the 'Boom Can' Company, meow?";
+		emotion e_what;
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Huh? What's that?";
+		next;
+		mes "Stew seems to recognize you.";
+		mes .@str$;
+		close2;
+	} else if (checkquest(5086) == 0 || checkquest(5086) == 1) {
+		mes "[Stew]";
+		mes "I think you are from the 'Boom Can' Company, meow... Who are you, meow~";
+		next;
+		mes "Stew seems to recognize you. Let's get away.";
+		close2;
+	} else {
+		if (malang_gamer < 6) {
+			mes "[Stew]";
+			mes "Meow Meow~ Good bye to 'Cat Gamer's meow~ Who are you meow?";
+			next;
+			mes "This cat might hit you. Let's get away.";
+			close2;
+		} else {
+			mes "[Stew]";
+			mes "The 'Boom Can' Company!!";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Huh? What's that?";
+			next;
+			mes "Stew seems to recognize you. Let's get away.";
+			close2;
+		}
+	}
+	donpcevent "Stew#gamer::OnDisable";
+	end;
+OnInit:
+	disablenpc "Stew#gamer";
+	end;
+OnEnable:
+	disablenpc "Eryu#gamer";
+	enablenpc "Stew#gamer";
+	disablenpc "Ketchup#gamer";
+	disablenpc "Eff#gamer";
+	end;
+OnDisable:
+	switch(rand(3)) {
+	case 0:
+		donpcevent "Eryu#gamer::OnEnable";
+		break;
+	case 1:
+		donpcevent "Ketchup#gamer::OnEnable";
+		break;
+	case 2:
+		donpcevent "Eff#gamer::OnEnable";
+		break;
+	}
+	end;
+}
+
+malangdo,244,144,4	script	Ketchup#gamer	4_CAT_SAILOR3,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	if (checkquest(5061) == 0 || checkquest(5061) == 1) {
+		if (checkquest(5064) == -1) {
+			mes "You found Ketchup the cat, and start talking.";
+			next;
+			mes "[Ketchup]";
+			mes "Meow...? Who are you?";
+			emotion e_what;
+			next;
+			switch(select("Grrr~ Bow wow~:The Game Director cat sent me.:I'm from 'Cans for Kittens'.")) {
+			case 1:
+				mes "[Ketchup]";
+				mes "What the dog? Hiss~";
+				break;
+			case 2:
+				mes "[Ketchup]";
+				mes "Get away from me, human, before I get really angry~";
+				break;
+			case 3:
+				mes "[Ketchup]";
+				mes "Oh yeah? 'Cans for Kittens'?";
+				emotion e_what;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "I want to share some of our philosophy with you.";
+				mes "Do you believe in giving to others?";
+				emotion e_what,1;
+				next;
+				mes "[Ketchup]";
+				mes "Umm I guess so...";
+				emotion e_slur;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "'Cans for Kittens' is a religion that embraces all felines.";
+				mes "Bow before the Lord of Cans!";
+				next;
+				mes "[Ketchup]";
+				mes "...";
+				next;
+				mes "[Ketchup]";
+				mes "...";
+				mes "......";
+				next;
+				mes "[Ketchup]";
+				mes "...";
+				mes "......";
+				mes ".........";
+				mes "What's the Lord of Cans?";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Your name is Ketchup, right? Don't you know about the Lord of Cans?";
+				mes "He knows everything.";
+				mes "Do not try to fool him and bow!";
+				next;
+				mes "[Ketchup]";
+				mes "Meow?! How can you know my name? Wow...";
+				next;
+				mes "[Ketchup]";
+				mes "I am sorry. Really sorry.";
+				mes "Please forgive me Lord of Cans.";
+				emotion e_sob;
+				next;
+				mes "[Ketchup]";
+				mes "That Director Cat was so scary~!";
+				mes "I said so many bad things when I left the Cat Gamers...";
+				mes "Please forgive.";
+				emotion e_sob;
+				next;
+				emotion e_dots;
+				emotion e_dots,1;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "The Lord of Cans forgives Ketchup's sins.";
+				mes "Our Lord also wants you to stop swearing and live an honest life!";
+				next;
+				mes "[Ketchup]";
+				mes "Thank you Lord of Cans.";
+				mes "I will live a kind cat life from this point on.";
+				next;
+				mes "You found out why did Ketchup left the Cat gamers.";
+				mes "Let's look for the other cats.";
+				setquest 5064;
+				completequest 5064;
+				break;
+			}
+			close2;
+		} else if (checkquest(5064) == 2) {
+			mes "[Ketchup]";
+			mes "You are...";
+			emotion e_omg;
+			next;
+			mes "Ketchup gives you an apologetic look and runs away.";
+			mes "He probably did something bad already.";
+			close2;
+		} else {
+			mes "[Ketchup]";
+			mes "This is not possible. Please contact an administrator.";
+			close2;
+		}
+	} else if (checkquest(5087) == 0 || checkquest(5087) == 1) {
+		mes "[Ketchup]";
+		mes "Who are you?";
+		emotion e_what;
+		next;
+		mes "What do you want to say?";
+		next;
+		input .@inputstr$;
+		if (.@inputstr$ == "Come back") {
+			erasequest 5087;
+			setquest 5088;
+			mes "[Ketchup]";
+			mes "What is this? What do you mean by 'Come back'...?";
+			mes "Can... 'Cans for Kittens'?";
+			emotion e_omg;
+			emotion e_what;
+			next;
+			mes "Ketchup recognized you and ran away.";
+			mes "You've delivered the message.";
+			close2;
+		} else {
+			mes "[Ketchup]";
+			mes "What is this? What do you mean by '"+.@inputstr$+"'...?";
+			mes "Can... 'Cans for Kittens'?";
+			emotion e_omg;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Huh? What's that?";
+			next;
+			mes "Ketchup recognized you and ran away.";
+			mes "It seems you need to find Ketchup one more time.";
+			close2;
+		}
+	} else if (checkquest(5088) == 0 || checkquest(5088) == 1) {
+		mes "[Ketchup]";
+		mes "Can... 'Cans for Kittens'?";
+		emotion e_omg;
+		next;
+		mes "Ketchup ran away once again.";
+		close2;
+	} else {
+		if (malang_gamer < 6) {
+			mes "[Ketchup]";
+			mes "Dirty 'Cat Gamers'!";
+			mes "I will never come back, for sure... Who are you?";
+			next;
+			mes "This cat might hit you. Let's get away.";
+			close2;
+		} else {
+			mes "[Ketchup]";
+			mes "Can... 'Cans for Kittens'?";
+			next;
+			mes "Ketchup ran away.";
+			close2;
+		}
+	}
+	donpcevent "Ketchup#gamer::OnDisable";
+	end;
+OnInit:
+	disablenpc "Ketchup#gamer";
+	end;
+OnEnable:
+	disablenpc "Eryu#gamer";
+	disablenpc "Stew#gamer";
+	enablenpc "Ketchup#gamer";
+	disablenpc "Eff#gamer";
+	end;
+OnDisable:
+	switch(rand(3)) {
+	case 0:
+		donpcevent "Stew#gamer::OnEnable";
+		break;
+	case 1:
+		donpcevent "Eryu#gamer::OnEnable";
+		break;
+	case 2:
+		donpcevent "Eff#gamer::OnEnable";
+		break;
+	}
+	end;
+}
+
+malangdo,181,119,7	script	Eff#gamer	4_CAT_ADV2,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	if (checkquest(5061) == 0 || checkquest(5061) == 1) {
+		if (checkquest(5065) == -1) {
+			mes "You found Eff the cat, and start talking.";
+			next;
+			mes "[Eff]";
+			mes "Who are you meow?";
+			emotion e_what;
+			next;
+			switch(select("I have some good investment news...:A... Cat?:The 'Cat Gamers' Director sent me...")) {
+			case 1:
+				mes "[Eff]";
+				mes "Investment info? Meow~?";
+				mes "What is that? Meow~?";
+				emotion e_what;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Interested, huh?";
+				mes "This is classified information.";
+				mes "You won't get it from any other human.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Haha! You are lucky today.";
+				mes "You heard that land can be a good investment, right?";
+				emotion e_what,1;
+				next;
+				mes "[Eff]";
+				mes "Oh oh~ I think so. Meow~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "You do know about our capital Prontera, don't you?";
+				next;
+				mes "[Eff]";
+				mes "Prontera meow? Yes, I know about it. Meow~";
+				emotion e_heh;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "There are some locations where";
+				mes "Prontera kingdom is secretly selling...";
+				next;
+				mes "[Eff]";
+				mes "And... And...?? Meow~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Hmm, this is top secret.";
+				mes "Something that must not be revealed at all...";
+				mes "Can you really keep this secret...?";
+				emotion e_what,1;
+				next;
+				mes "[Eff]";
+				mes "Well... I've always been known for being a good keeper of secrets meow.";
+				mes "Meow~ Don't worry at all. Meow~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Ok, I believe you, Eff...";
+				mes "Please keep this a secret.";
+				next;
+				mes "[Eff]";
+				mes "I got it. Meow~";
+				emotion e_ok;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Well, I heard that there is a location in Juno where underground big shots will be investing about 10,000,000,000 zeny.";
+				mes "And it is now available for pre-investment.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "If you invest in 1 Can food here, the outcome will be enormous.";
+				next;
+				mes "[Eff]";
+				mes "Enor... mous... meow...?";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "100 Cans!!";
+				mes "You will get 100 cans for investing just 1 can food!";
+				mes "The profit will be X100! X100!!";
+				next;
+				mes "[Eff]";
+				mes "Woot!! 100 Cans~ Meow~";
+				emotion e_omg;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "So, how many cans do you want to invest?";
+				mes "You'll be a part owner so make sure to invest the max that you can afford.";
+				emotion e_what,1;
+				next;
+				mes "[Eff]";
+				mes "I want to invest.";
+				mes "But, I don't have cans with me. Meow~";
+				emotion e_sob;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "You can always get a loan!!";
+				mes "This a like 100 times result for sure!!";
+				mes "How can you loose a chance like this?";
+				mes "You should do whatever it takes!";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "You know what..? They say some careers like pro gamers can get solid loans.";
+				mes "Like about 1,000 can loan at once.";
+				mes "Without a high interest rate!";
+				next;
+				mes "[Eff]";
+				mes "Meow!! 1... 1,000...";
+				mes "Moew~ I am a Pro Gamer.";
+				mes "Meow~ But, I quit~ Meow~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "What!! Why would you quit such good a gig!! Are you crazy?";
+				emotion e_omg,1;
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Let's say we invest 1,000 cans after getting that loan.";
+				mes "One, Ten, Hundred, Tousand. Woot!";
+				mes "I can't believe this.";
+				mes "The result will be 100,000 cans, 100,000!!";
+				next;
+				mes "[Eff]";
+				mes "1... 100,000 cans... Meow~";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "So tell me... Why did you quit such a great job?";
+				mes "Why?";
+				next;
+				mes "[Eff]";
+				mes "I was afraid of the Director Cat there...";
+				mes "Meow~ This one time, I had to take a sick day.";
+				mes "Meow~ And I haven't seen such scary cat my entire life...";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "So you quit because Cat Gamers Director was so scary. Hmm, sorry but I can't let you in on this investment...";
+				mes "I guess... What a waste of time!";
+				mes "Good bye!";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh and don't tell anyone what I just told you!";
+				mes "Bye~";
+				next;
+				mes "You found out why Eff has left the team.";
+				mes "Now, let's find the other cats.";
+				setquest 5065;
+				completequest 5065;
+				break;
+			case 2:
+				mes "[Eff]";
+				mes "Yes. I am a cat.";
+				mes "Meow~ Do you think I am a dog?";
+				mes "Meow~ You are a strange human. Meow~";
+				break;
+			case 3:
+				mes "[Eff]";
+				mes "Seeing as this is like the first time I met you.";
+				mes "I'll forgive you today. Meow.";
+				mes "Meow~ Don't even think about bringing up that name to me again...";
+				break;
+			}
+			close2;
+		} else if (checkquest(5065) == 2) {
+			mes "[Eff]";
+			mes "You are--!!";
+			mes "Meow~ I want to invest. Meow~";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Not without the cans you can't!!";
+			mes "You didn't tell anyone about this deal, right?";
+			next;
+			mes "[Eff]";
+			mes "I didn't. Meow~";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Ok, good cat! Never!!";
+			mes "Tell this to other cats!~";
+			mes "Bye Bye~";
+			close2;
+		} else {
+			mes "[Eff]";
+			mes "This is not possible. Please contact an administrator.";
+			close2;
+		}
+	} else if (checkquest(5089) == 0 || checkquest(5089) == 1) {
+		mes "[Eff]";
+		mes "Who are you, meow?";
+		next;
+		mes "What do you want to say?";
+		next;
+		input .@inputstr$;
+		if (.@inputstr$ == "Come back") {
+			erasequest 5089;
+			setquest 5090;
+			set .@str$, "You've delivered the message, so let's get away.";
+		} else
+			set .@str$, "You didn't deliver the right message, but let's still get away.";
+		mes "[Eff]";
+		mes "What is this? What do you mean by '"+.@inputstr$+"'? Meow...";
+		mes "Meow...? Meow! You! Investor meow?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Huh? Who...?";
+		next;
+		mes "Eff seems to recognize you.";
+		mes .@str$;
+		close2;
+	} else if (checkquest(5090) == 0 || checkquest(5090) == 1) {
+		mes "[Eff]";
+		mes "You are--!!";
+		mes "Meow~ I want to invest. Meow~";
+		next;
+		mes "Eff seems to recognize you, so let's get away.";
+		close2;
+	} else {
+		if (malang_gamer < 6) {
+			mes "[Eff]";
+			mes "Meow Meow~ 'Cat Gamers' can say good bye to me, meow.";
+			mes "Meow... Who are you meow?";
+			next;
+			mes "This cat might hit you. Let's get away.";
+			close2;
+		} else {
+			mes "[Eff]";
+			mes "Meow~ I want to invest. Meow~";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Huh? Who...?";
+			next;
+			mes "Eff seems to recognize you, so let's get away.";
+			close2;
+		}
+	}
+	donpcevent "Eff#gamer::OnDisable";
+	end;
+OnInit:
+	disablenpc "Eff#gamer";
+	end;
+OnEnable:
+	disablenpc "Eryu#gamer";
+	disablenpc "Stew#gamer";
+	disablenpc "Ketchup#gamer";
+	enablenpc "Eff#gamer";
+	end;
+OnDisable:
+	switch(rand(3)) {
+	case 0:
+		donpcevent "Stew#gamer::OnEnable";
+		break;
+	case 1:
+		donpcevent "Ketchup#gamer::OnEnable";
+		break;
+	case 2:
+		donpcevent "Eryu#gamer::OnEnable";
+		break;
+	}
+	end;
+}
+
+mal_in01,91,216,4	script	Ser#gamer	4_CAT_SAILOR1,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	for(set .@i,5074; .@i<=5090; set .@i,.@i+1) {
+		if (checkquest(.@i) > -1) {
+			mes "[Ser]";
+			mes "Hey, ^0000FF"+strcharinfo(0)+"^000000. You haven't done what we asked you for. A promise is a promise, you know.";
+			next;
+			mes "[Ser]";
+			mes "Ah!! When you are done, please get checked by the Cat Gamers Director over there.";
+			close;
+		}
+	}
+	if (malang_gamer < 20) {
+		if (countitem(2872)) {
+			mes "[Ser]";
+			mes "You seem like a first timer! Where did you get the certificate? Someone lost it, I guess.";
+			close;
+		}
+		mes "[Ser]";
+		mes "Rock Paper Scissors is a serious game. When will our practicing partner come?";
+		close;
+	}
+	if (!isequipped(2872)) {
+		mes "[Ser]";
+		mes "Oh, ^0000FF"+strcharinfo(0)+"^000000? Want to play the Rock Paper Scissors game?";
+		next;
+		mes "[Ser]";
+		mes "... ... ...";
+		next;
+		mes "[Ser]";
+		mes "Where is your Cat Gamers Certificate? It seems like nothing, but you can't play this game without it!";
+		next;
+		mes "[Ser]";
+		mes "Please go get the certificate.";
+		close;
+	}
+	if (checkquest(5070,PLAYTIME) == 0 || checkquest(5070,PLAYTIME) == 1) {
+		mes "[Ser]";
+		mes "Is it tomorrow already? I don't think so! Can't you read the time?";
+		close;
+	} else if (checkquest(5070,PLAYTIME) == 2)
+		erasequest 5070;
+	mes "[Ser]";
+	mes "Oh, ^0000FF"+strcharinfo(0)+"^000000? Want to play the Rock Paper Scissors game?";
+	next;
+	switch(select("Play the game.:Say hi.:Ask about the game rules.")) {
+	case 1:
+		mes "[Ser]";
+		mes "Good idea.";
+		next;
+		break;
+	case 2:
+		mes "[Ser]";
+		mes "Oh! Ok, hi? But, why now?";
+		next;
+		mes "[Ser]";
+		mes "Ah... You are bored? Why don't you play a game with me?";
+		next;
+		mes "[Ser]";
+		mes "Hey, you! Don't neglect the Rock Paper Scissors game!!";
+		mes "I've seen many people getting their butts kicked in this game!!";
+		next;
+		mes "[Ser]";
+		mes "You better mark my words, if you don't want to end up like them!~";
+		close;
+	case 3:
+		mes "[Ser]";
+		mes "You don't even know how to play this game?";
+		mes "Let me kindly teach you.";
+		next;
+		mes "[Ser]";
+		mes "Scissors beats Paper,";
+		emotion e_scissors;
+		emotion e_paper,1;
+		next;
+		mes "[Ser]";
+		mes "Paper beats Rock,";
+		emotion e_paper;
+		emotion e_rock,1;
+		next;
+		mes "[Ser]";
+		mes "And Rock beats Scissors.";
+		emotion e_rock;
+		emotion e_scissors,1;
+		next;
+		mes "[Ser]";
+		mes "Ok? Got it now?";
+		next;
+		mes "[Ser]";
+		mes "You must play 5 matches with me.";
+		mes "We go again if the game is even!!";
+		next;
+		mes "[Ser]";
+		mes "I will give you a present if you beat me 3 times. Ok?";
+		next;
+		mes "[Ser]";
+		mes "Ok, then. Go away.";
+		close;
+	}
+	setarray .@rps$[0], "Rock", "Paper", "Scissors";
+	setarray .@emote[0], e_rock, e_paper, e_scissors;
+	setarray .@count$[0],"First","Second","Third","Fourth","Last";
+	while(1) {
+		mes "[Ser]";
+		mes .@count$[.@match]+" match ~~";
+		if (.@tie) {
+			mes "Result is even, so we play again.";
+			set .@tie,0;
+		}
+		mes "Try your best!";
+		next;
+		mes "[Ser & "+strcharinfo(0)+"]";
+		mes "Rock! Paper! Scissors!";
+		next;
+
+		set .@pc,  select("Rock:Paper:Scissors")-1;
+		set .@npc, rand(3);
+		emotion .@emote[.@pc],1;
+		emotion .@emote[.@npc];
+		mes "["+strcharinfo(0)+"] "+.@rps$[.@pc];
+		mes "--------------------------------";
+		mes "[Ser] "+.@rps$[.@npc];
+		if (.@pc == .@npc) {
+			set .@tie,1;
+			set .@result$, "Hmm, we are even. Let's play again.";
+		} else if ((.@pc == 0 && .@npc == 2) || (.@pc == 1 && .@npc == 0) || (.@pc == 2 && .@npc == 1)) {
+			set .@match, .@match+1;
+			set .@win, .@win+1;
+			set .@result$, "I lost!";
+		} else {
+			set .@match, .@match+1;
+			set .@loss, .@loss+1;
+			set .@result$, "So I win!!";
+		}
+		next;
+		mes "[Ser]";
+		mes "You were "+.@rps$[.@pc]+", I was "+.@rps$[.@npc]+"~";
+		mes .@result$;
+		next;
+		if (.@match == 5) break;
+	}
+	mes "[Ser]";
+	mes "All 5 matches are over!!";
+	next;
+	mes "[Ser]";
+	mes "Hmm... Let me see...";
+	mes "I won "+.@loss+" times, and you, "+strcharinfo(0)+", won "+.@win+" times, right?";
+	next;
+	if (.@win > .@loss) {
+		mes "[Ser]";
+		mes strcharinfo(0)+" has won the game.";
+		next;
+		mes "Ser became polite all of a sudden.";
+		next;
+		mes "[Ser]";
+		mes "Great game it was. I admire your enthusiasm for the game. So, I want to give you my precious Can as a present.";
+		next;
+		switch(select("I don't need it!:Thank you.")) {
+		case 1:
+			mes "[Ser]";
+			mes "Just take it!! Do as I say~";
+			break;
+		case 2:
+			mes "[Ser]";
+			mes "You are polite. But, sadly this is all I can give you.";
+			break;
+		}
+		next;
+		mes "[Ser]";
+		mes "Good bye~ Come back tomorrow for more practice~";
+		if (.@win == 5) {
+			mes "Oh! You won all 5 matches. Here are some more extra Cans.";
+			getitem 12636,10; //Malang_Sp_Can
+		} else
+			getitem 12636,5; //Malang_Sp_Can
+		setquest 5070;
+		close;
+	}
+	mes "[Ser]";
+	mes strcharinfo(0)+" has lost. Ha... Ha...";
+	next;
+	mes "Ser became very arrogant.";
+	next;
+	mes "[Ser]";
+	mes "You want to play with me? Ser? With that skill of yours? Meow?";
+	next;
+	mes "[Ser]";
+	mes "What? Present? How can you ask for such a thing when you lose? Go practice more!! Work!! Yes, I should make you do this!!";
+	next;
+	setquest 5070;
+	switch(rand(1,13)) {
+	case 1:
+		setquest 5074;
+		mes "[Ser]";
+		mes "Hmm. Do you know a fish named Phen? Do you? Isn't it a delicious looking fish?";
+		next;
+		mes "- Chrub -";
+		mes "Ser wipes the drool from his mouth.";
+		next;
+		mes "[Ser]";
+		mes "Go catch 30 Phens. And also get me 10 Fish Tails. Get them to our Director cat, and he will make a delicious dish with them.";
+		close;
+	case 2:
+		setquest 5075;
+		mes "[Ser]";
+		mes "Lately, I've felt powerless and that there's too much weight on me. I should take care of my health.";
+		next;
+		mes "[Ser]";
+		mes "Now it's time for some healthy food.";
+		next;
+		mes "[Ser]";
+		mes "Get 50 Marse and 25 Milk to our Cat Gamers Director. He has excellent knowledge on healthy foods.";
+		close;
+	case 3:
+		setquest 5076;
+		mes "[Ser]";
+		mes "Well... we do have a rival, you know. They are 'Dog n Waltz', and everything goes wrong when they come around.";
+		next;
+		mes "[Ser]";
+		mes "I would ask you to bully them, but I suppose that's illegal... So, please at least harass similar looking monsters. What would be a good target?";
+		next;
+		mes "[Ser]";
+		mes "Oh, that archer among Kobolds!! I hate those the most. Go harass 30 Kobold Archers, and report to our Cat Gamers Director.";
+		close;
+	case 4:
+		setquest 5077;
+		mes "[Ser]";
+		mes "What is most important for winning the game? It is quickness. What should we do to get faster?";
+		next;
+		mes "[Ser]";
+		mes "I've been thinking... The best way for us cats is obviously catching rats.";
+		next;
+		mes "[Ser]";
+		mes "You know Cramp, right? That blue chubby creature... Please go catch 10 of them, and report to our Cat Gamers Director.";
+		close;
+	case 5:
+		setquest 5078;
+		mes "[Ser]";
+		mes "Ah... I want some bird cuisine. Which one would be most delicious?";
+		next;
+		mes "[Ser]";
+		mes "Picky? Ah! It's too small. How about Condor? I am not sure... Peco Peco?";
+		next;
+		mes "[Ser]";
+		mes "Alright! Please catch 50 Peco Pecos and get them to our Cat Gamers Director. We shall have a party with bird cuisine tonight.";
+		close;
+	case 6:
+		setquest 5079;
+		mes "[Ser]";
+		mes "I get too nervous before the game. And I don't play well when I'm nervous. I need something to calm down before the game starts.";
+		next;
+		mes "[Ser]";
+		mes "Oh! That's right! Yarn! I used to play with Yarn when I was young. Wasn't able to have that kind of relaxation after joining the 'Cat Gamers'.";
+		next;
+		mes "[Ser]";
+		mes "Please get 20 Yarns for me. Why 20? There are many other cats with the same issue. Our Director should take care of this for you.";
+		close;
+	case 7:
+		setquest 5080;
+		mes "[Ser]";
+		mes "Recently, our Director seems to have been trying to cut some expenses. Or is the manager taking advantage?";
+		next;
+		mes "[Ser]";
+		mes "Regular snacks for our players have been reduced. You should go get 30 Rat Tails, and give them to our Cat Gamers Director.";
+		next;
+		mes "[Ser]";
+		mes "Then, we shall find out if our manager is being greedy or not.";
+		close;
+	case 8:
+		setquest 5081;
+		mes "[Ser]";
+		mes "I am having a slump these days. I can't give my 100% to the game.";
+		next;
+		mes "[Ser]";
+		mes "It is the lemon we need in times like this.";
+		next;
+		mes "[Ser]";
+		mes "Please get 5 lemons for me. Don't forget, I need 5 Lemons... Our Cat Gamers Director should know what to do with them.";
+		close;
+	case 9:
+		setquest 5082;
+		mes "[Ser]";
+		mes "Malangdo is a good place for a cat to live. But, it gets very hot when we play games.";
+		next;
+		mes "[Ser]";
+		mes "When we are playing a lot, it gets really crazy hot, hard for us to bear. You know how hysterical we cats can be, right?";
+		next;
+		mes "[Ser]";
+		mes "Please get us either 10 Ice Pieces or 10 Ice Creams. Our Cat Gamers Director should know what to do with them.";
+		close;
+	case 10:
+		setquest 5083;
+		mes "[Ser]";
+		mes "I can see that you also need some rest. Feel free to relax for a while. How about taking a walk around the village? I insist~!";
+		next;
+		mes "[Ser]";
+		mes "But, it is no fun to just walk around the village. Hmm... Right!! Why don't you go ahead and meet a cat named Eryu?";
+		next;
+		mes "[Ser]";
+		mes "Oh! And when you meet the cat, make sure to say 'Come back'. That is the password. And don't forget to tell our Director I was with you all the time!!";
+		close;
+	case 11:
+		setquest 5085;
+		mes "[Ser]";
+		mes "I can see that you also need some rest. Feel free to relax for a while. How about taking a walk around the village? I insist~!";
+		next;
+		mes "[Ser]";
+		mes "But, it is no fun to just walk around the village. Hmm... Right!! Why don't you go ahead and meet a cat named Stew?";
+		next;
+		mes "[Ser]";
+		mes "Oh! And when you meet the cat, make sure to say 'Come back'. That is the password. And don't forget to tell our Director I was with you all the time!!";
+		close;
+	case 12:
+		setquest 5087;
+		mes "[Ser]";
+		mes "I can see that you also need some rest. Feel free to relax for a while. How about taking a walk around the village? I insist~!";
+		next;
+		mes "[Ser]";
+		mes "But, it is no fun to just walk around the village. Hmm... Right!! Why don't you go ahead and meet a cat named Ketchup?";
+		next;
+		mes "[Ser]";
+		mes "Oh! And when you meet the cat, make sure to say 'Come back'. That is the password. And don't forget to tell our Director I was with you all the time!!";
+		close;
+	case 13:
+		setquest 5089;
+		mes "[Ser]";
+		mes "I can see that you also need some rest. Feel free to relax for a while. How about taking a walk around the village? I insist~!";
+		next;
+		mes "[Ser]";
+		mes "But, it is no fun to just walk around the village. Hmm... Right!! Why don't you go ahead and meet a cat named Eff?";
+		next;
+		mes "[Ser]";
+		mes "Oh! And when you meet the cat, make sure to say 'Come back'. That is the password. And don't forget to tell our Director I was with you all the time!!";
+		close;
+	}
+}
+
+mal_in01,86,222,4	script	Paa#gamer	4_CAT_SAILOR1,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	for(set .@i,5074; .@i<=5090; set .@i,.@i+1) {
+		if (checkquest(.@i) > -1) {
+			mes "[Paa]";
+			mes "You haven't done what we asked you for meow. A promise is a promise, you know meow.";
+			next;
+			mes "[Paa]";
+			mes "When you are done meow, please get checked by the Cat Gamers Director over there meow.";
+			close;
+		}
+	}
+	if (malang_gamer < 20) {
+		if (countitem(2872)) {
+			mes "[Paa]";
+			mes "You seem like a first timer meow! Where did you get the certificate meow? Someone lost it, I guess meow.";
+			close;
+		}
+		mes "[Paa]";
+		mes "When is our practicing partner coming meow? I am bored meow.";
+		close;
+	}
+	if (!isequipped(2872)) {
+		mes "[Paa]";
+		mes "Oh, ^0000FF"+strcharinfo(0)+"^000000 meow? Want to play the Rock Paper Scissors game meow?";
+		next;
+		mes "[Paa]";
+		mes "... ... ...";
+		next;
+		mes "[Paa]";
+		mes "Where is your Cat Gamers Certificate meow? It seems like nothing, but you can't play this game without it meow!";
+		next;
+		mes "[Paa]";
+		mes "Go get the certificate meow.";
+		close;
+	}
+	if (checkquest(5070,PLAYTIME) == 0 || checkquest(5070,PLAYTIME) == 1) {
+		mes "[Paa]";
+		mes "We can only play the game once a day meow. Come tomorrow meow.";
+		close;
+	} else if (checkquest(5070,PLAYTIME) == 2)
+		erasequest 5070;
+	mes "[Paa]";
+	mes "Oh, ^0000FF"+strcharinfo(0)+"^000000 meow? Want to play the Rock Paper Scissors game meow?";
+	next;
+	switch(select("Play the game.:Say hi.:Ask about the game rules.")) {
+	case 1:
+		mes "[Paa]";
+		mes "Good idea meow.";
+		next;
+		break;
+	case 2:
+		mes "[Paa]";
+		mes "Hello meow~ Nice to see you meow~";
+		next;
+		mes "[Paa]";
+		mes "Other games have one cat player. But, we have two for Rock Paper Scissors. You want to know why meow?";
+		next;
+		mes "[Paa]";
+		mes "Paa is kind meow. So, I'll tell you story meow.";
+		next;
+		mes "[Paa]";
+		mes "Ser cat is my twin brother. I was born first, but he always says he is the elder meow. But, I don't fight with Ser meow. I am a good brother meow.";
+		next;
+		mes "[Paa]";
+		mes "Anyways, me and Ser are well known as the pro gamer cat brothers meow. Everyone knows us meow.";
+		next;
+		mes "[Paa]";
+		mes "You are free to admire me, meow. I give you permission meow.";
+		close;
+	case 3:
+		mes "[Paa]";
+		mes "You want to know how to play this game meow? I'll teach you because I am a kind cat meow~";
+		next;
+		mes "[Paa]";
+		mes "You don't seem that stupid meow. So, let's skip the part about what beats what meow.";
+		next;
+		mes "[Paa]";
+		mes "You must play 5 matches with me meow. We go again if the game is even meow.";
+		next;
+		mes "[Paa]";
+		mes "If you win 3 times, I'll give you a present meow~ Cat Gamers Director said so meow.";
+		next;
+		mes "[Paa]";
+		mes "That is all meow~ But it is not an easy game meow. Respect the game meow~";
+		close;
+	}
+	setarray .@rps$[0], "Rock", "Paper", "Scissors";
+	setarray .@emote[0], e_rock, e_paper, e_scissors;
+	setarray .@count$[0],"First","Second","Third","Fourth","Last";
+	while(1) {
+		mes "[Paa]";
+		mes .@count$[.@match]+" match ~~ meow.";
+		if (.@tie) {
+			mes "Result is even, so we play again meow.";
+			set .@tie,0;
+		}
+		mes "Try your best meow!";
+		next;
+		mes "[Ser & "+strcharinfo(0)+"]";
+		mes "Rock! Paper! Scissors!";
+		next;
+
+		set .@pc,  select("Rock:Paper:Scissors")-1;
+		set .@npc, rand(3);
+		emotion .@emote[.@pc],1;
+		emotion .@emote[.@npc];
+		mes "["+strcharinfo(0)+"] "+.@rps$[.@pc];
+		mes "--------------------------------";
+		mes "[Ser] "+.@rps$[.@npc];
+		if (.@pc == .@npc) {
+			set .@tie,1;
+			set .@result$, "Hmm, we are even. Let's play again meow.";
+		} else if ((.@pc == 0 && .@npc == 2) || (.@pc == 1 && .@npc == 0) || (.@pc == 2 && .@npc == 1)) {
+			set .@match, .@match+1;
+			set .@win, .@win+1;
+			set .@result$, "I lost meow!";
+		} else {
+			set .@match, .@match+1;
+			set .@loss, .@loss+1;
+			set .@result$, "So I win meow!!";
+		}
+		next;
+		mes "[Paa]";
+		mes "You were "+.@rps$[.@pc]+", I was "+.@rps$[.@npc]+"~";
+		mes .@result$;
+		next;
+		if (.@match == 5) break;
+	}
+	mes "[Paa]";
+	mes "Meow!! All 5 matches are over meow!!";
+	next;
+	mes "[Paa]";
+	mes "Let me see meow...";
+	mes "I won "+.@loss+" times meow, and you, "+strcharinfo(0)+", won "+.@win+" times, right meow?";
+	next;
+	if (.@win > .@loss) {
+		mes "[Paa]";
+		mes "You won meow.";
+		next;
+		mes "Paa became polite all of a sudden.";
+		next;
+		mes "[Paa]";
+		mes "Great game it was meow. I admire your enthusiasm for the game meow. So, I want to give you my precious Can as a present meow.";
+		next;
+		switch(select("I don't need it!:Thank you.")) {
+		case 1:
+			mes "[Paa]";
+			mes "Just take it meow!! Do as I say meow~";
+			break;
+		case 2:
+			mes "[Paa]";
+			mes "You are polite meow. But, sadly this is all I can give you meow.";
+			break;
+		}
+		next;
+		mes "[Paa]";
+		mes "Good bye meow~ Come back tomorrow for more practice meow~";
+		if (.@win == 5) {
+			mes "Oh! You won all 5 matches meow. Here are some more extra Cans meow!";
+			getitem 12636,10; //Malang_Sp_Can
+		} else
+			getitem 12636,5; //Malang_Sp_Can
+		setquest 5070;
+		close;
+	}
+	mes "[Paa]";
+	mes "You lost. Meow... Meow...";
+	next;
+	mes "Paa became very arrogant.";
+	next;
+	mes "[Paa]";
+	mes "You want to play with me? Paa? With that skill of yours? Meow?";
+	next;
+	mes "[Paa]";
+	mes "What? Present meow? How can you ask for such a thing meow? You lost meow! Go practice more!! Work!! Yes, I should make you do this meow!!";
+	next;
+	setquest 5070;
+	switch(rand(1,13)) {
+	case 1:
+		setquest 5074;
+		mes "[Paa]";
+		mes "Hmm. Do you know a fish named Phen meow? Do you? Isn't it a delicious looking fish meow?";
+		next;
+		mes "- Chrub -";
+		mes "Paa wipes the drool from his mouth.";
+		next;
+		mes "[Paa]";
+		mes "Go catch 30 Phens meow. And also get me 10 Fish Tails meow. Get them to our Director cat, and he will make a delicious dish with them meow.";
+		close;
+	case 2:
+		setquest 5075;
+		mes "[Paa]";
+		mes "Lately, I've felt powerless and that there's too much weight on me meow. I should take care of my health meow.";
+		next;
+		mes "[Paa]";
+		mes "Now it's time for some healthy food meow.";
+		next;
+		mes "[Paa]";
+		mes "Get 50 Marse and 25 Milk to our Cat Gamers Director meow. He has excellent knowledge on healthy foods meow.";
+		close;
+	case 3:
+		setquest 5076;
+		mes "[Paa]";
+		mes "We do have a rival, you know meow. They are 'Dog n Waltz', and everything goes wrong when they come around meow.";
+		next;
+		mes "[Paa]";
+		mes "I would ask you to bully them, but I suppose that's illegal meow... So, I will ask you to harass similar looking monsters meow.";
+		next;
+		mes "[Paa]";
+		mes "Oh, that archer among Kobolds meow!! I hate those the most. Go harass 30 Kobold Archers, and report to our Cat Gamers Director meow.";
+		close;
+	case 4:
+		setquest 5077;
+		mes "[Paa]";
+		mes "What is most important for winning the game meow? It is quickness. What should we do to get faster meow?";
+		next;
+		mes "[Paa]";
+		mes "I've been thinking meow... The best way for us cats is obviously catching rats meow.";
+		next;
+		mes "[Paa]";
+		mes "You know Cramp, right meow? That blue chubby creature meow... Please go catch 10 of them, and report to our Cat Gamers Director meow.";
+		close;
+	case 5:
+		setquest 5078;
+		mes "[Paa]";
+		mes "Chrub... I want some bird cuisine meow. Which one would be most delicious meow?";
+		next;
+		mes "[Paa]";
+		mes "Picky? Ah! It's too small meow. How about Condor? I am not sure... Peco Peco meow?";
+		next;
+		mes "[Paa]";
+		mes "Alright meow! Please catch 50 Peco Pecos and get them to our Cat Gamers Director meow. We shall have a party with bird cuisine tonight meow.";
+		close;
+	case 6:
+		setquest 5079;
+		mes "[Paa]";
+		mes "I get too nervous before the game meow. And I don't play well when I'm nervous meow. I need something to calm down before the game starts meow.";
+		next;
+		mes "[Paa]";
+		mes "Oh! That's right meow! Yarn meow! I used to play with Yarn when I was young meow. Wasn't able to have that kind of relaxation after joining the 'Cat Gamers' meow.";
+		next;
+		mes "[Paa]";
+		mes "Please get 20 Yarns for me meow. Why 20? There are many other cats with the same issue meow. Our Director should take care of this for you meow.";
+		close;
+	case 7:
+		setquest 5080;
+		mes "[Paa]";
+		mes "Recently, our Director seems to have been trying to cut some expenses meow. Or is the manager taking advantage meow?";
+		next;
+		mes "[Paa]";
+		mes "Regular snacks for our players have been reduced meow. You should go get 30 Rat Tails, and give them to our Cat Gamers Director meow.";
+		next;
+		mes "[Paa]";
+		mes "Then, we shall find out if our manager is being greedy or not meow.";
+		close;
+	case 8:
+		setquest 5081;
+		mes "[Paa]";
+		mes "I am having a slump these days meow. I can't give my 100% to the game meow.";
+		next;
+		mes "[Paa]";
+		mes "It is the lemon we need in times like this meow.";
+		next;
+		mes "[Paa]";
+		mes "Get 5 lemons for me meow. Don't forget, I need 5 Lemons meow... Our Cat Gamers Director should know what to do with them meow.";
+		close;
+	case 9:
+		setquest 5082;
+		mes "[Paa]";
+		mes "Malangdo is a good place for a cat to live meow. But, it gets very hot when we play games meow.";
+		next;
+		mes "[Paa]";
+		mes "When we are playing a lot, it gets really crazy hot, hard for us to bear meow. You know how hysterical we cats can be, right meow?";
+		next;
+		mes "[Paa]";
+		mes "Get me either 10 Ice Pieces or 10 Ice Creams. Our Cat Gamers Director should know what to do with them meow.";
+		close;
+	case 10:
+		setquest 5083;
+		mes "[Paa]";
+		mes "I can see that you also need some rest meow. Feel free to relax for a while meow. How about taking a walk around the village meow? I insist meow~!";
+		next;
+		mes "[Paa]";
+		mes "But, it is no fun to just walk around the village meow. Hmm... Right meow!! Why don't you go ahead and meet a cat named Eryu meow?";
+		next;
+		mes "[Paa]";
+		mes "Oh! And when you meet the cat, make sure to say 'Come back' meow. That is the password meow. And don't forget to tell our Director I was with you all the time meow!!";
+		close;
+	case 11:
+		setquest 5085;
+		mes "[Paa]";
+		mes "I can see that you also need some rest meow. Feel free to relax for a while meow. How about taking a walk around the village meow? I insist meow~!";
+		next;
+		mes "[Paa]";
+		mes "But, it is no fun to just walk around the village meow. Hmm... Right meow!! Why don't you go ahead and meet a cat named Stew meow?";
+		next;
+		mes "[Paa]";
+		mes "Oh! And when you meet the cat, make sure to say 'Come back' meow. That is the password meow. And don't forget to tell our Director I was with you all the time meow!!";
+		close;
+	case 12:
+		mes "[Paa]";
+		mes "I can see that you also need some rest meow. Feel free to relax for a while meow. How about taking a walk around the village meow? I insist meow~!";
+		next;
+		mes "[Paa]";
+		mes "But, it is no fun to just walk around the village meow. Hmm... Right meow!! Why don't you go ahead and meet a cat named Ketchup meow?";
+		next;
+		mes "[Paa]";
+		mes "Oh! And when you meet the cat, make sure to say 'Come back' meow. That is the password meow. And don't forget to tell our Director I was with you all the time meow!!";
+		close;
+	case 13:
+		mes "[Paa]";
+		mes "I can see that you also need some rest meow. Feel free to relax for a while meow. How about taking a walk around the village meow? I insist meow~!";
+		next;
+		mes "[Paa]";
+		mes "But, it is no fun to just walk around the village meow. Hmm... Right meow!! Why don't you go ahead and meet a cat named Eff meow?";
+		next;
+		mes "[Paa]";
+		mes "Oh! And when you meet the cat, make sure to say 'Come back' meow. That is the password meow. And don't forget to tell our Director I was with you all the time meow!!";
+		close;
+	}
+}
+
+mal_in01,91,222,4	script	Kuka#gamer	4_M_BABYCAT,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	for(set .@i,5074; .@i<=5090; set .@i,.@i+1) {
+		if (checkquest(.@i) > -1) {
+			mes "[Kuka]";
+			mes "You haven't done what we asked you for yo~. A promise is a promise, you know yo~.";
+			next;
+			mes "[Kuka]";
+			mes "When you are done, please get checked by the Cat Gamers Director over there yo.~";
+			close;
+		}
+	}
+	if (malang_gamer < 20) {
+		if (countitem(2872)) {
+			mes "[Kuka]";
+			mes "You seem like a first timer yo~ Where did you get the certificate yo~ You better give that back yo~";
+			close;
+		}
+		mes "[Kuka]";
+		mes "The Cat Gamers Director said a practicing partner is coming yo~ But, that human didn't show up yo~ I am bored yo~";
+		close;
+	}
+	if (!isequipped(2872)) {
+		mes "[Kuka]";
+		mes "Oh great member you, ^0000FF"+strcharinfo(0)+"^000000~ Let's play ChamChamCham yo~";
+		next;
+		mes "[Kuka]";
+		mes "... ... ...";
+		next;
+		mes "[Kuka]";
+		mes "But, you don't have the certificate yo~ Certificate helps you save the game record yo~ You must have it! yo~";
+		next;
+		mes "[Kuka]";
+		mes "Please go get the certificate yo~";
+		close;
+	}
+	if (checkquest(5071,PLAYTIME) == 0 || checkquest(5071,PLAYTIME) == 1) {
+		mes "[Kuka]";
+		mes "Is it not tomorrow yet yo~ You can play one game a day yo~ Come back tomorrow yo~";
+		close;
+	} else if (checkquest(5071,PLAYTIME) == 2)
+		erasequest 5071;
+	mes "[Kuka]";
+	mes "Oh great member you, ^0000FF"+strcharinfo(0)+"^000000~ Let's play ChamChamCham yo~";
+	next;
+	switch(select("Play the game.:Ask who is 1st place.:Ask about the game rules.")) {
+	case 1:
+		mes "[Kuka]";
+		mes "Good choice yo~";
+		next;
+		break;
+	case 2:
+		// custom condition
+		if (!$malangdo_gamer) {
+			mes "[Kuka]";
+			mes "No one holds a record for the ChamChamCham game yo~";
+			mes "You could be the first yo~";
+			close;
+		}
+		mes "[Kuka]";
+		mes "Current 1st place for the ChamChamCham game is";
+		mes "^0000FF"+$malangdo_gamer$+"^000000 with ^DE2B21"+$malangdo_gamer+"^000000 winning streak yo~";
+		if (strcharinfo(0) == $malangdo_gamer$)
+			mes "Never know when someone else would break the record yo~";
+		else
+			mes "I expect that you, "+strcharinfo(0)+", can beat ^0000FF"+$malangdo_gamer$+"^000000 sometime yo~";
+		close;
+	case 3:
+		mes "[Kuka]";
+		mes "ChamChamCham game rules are very simple yo~";
+		mes "Just direct your hand towards the direction where I direct my face yo~";
+		next;
+		cutin "g_cat_01",4;
+		mes "[Kuka]";
+		mes "Like this yo~";
+		next;
+		cutin "g_cat_03",4;
+		mes "[Kuka]";
+		mes "Or like that yo~";
+		next;
+		cutin "",255;
+		mes "[Kuka]";
+		mes "A present is available for 3 wins yo~";
+		mes "If you beat the previous record, you get a bigger present yo~";
+		next;
+		mes "[Kuka]";
+		mes "See you at the practice yo~";
+		close;
+	}
+	while(1) {
+		cutin "g_cat_00",4;
+		mes "[Kuka & "+strcharinfo(0)+"]";
+		mes "Cham!";
+		next;
+		mes "[Kuka & "+strcharinfo(0)+"]";
+		mes "Cham! Cham!";
+		next;
+		mes "[Kuka & "+strcharinfo(0)+"]";
+		mes "Cham! Cham! Cham!";
+		next;
+		switch(select("Hand towards left:Hand towards right")) {
+		case 1:
+			if (rand(1000) < 500) {
+				cutin "g_cat_01",4;
+				set .@win, .@win+1;
+			} else {
+				cutin "g_cat_02",4;
+				set .@loss,1;
+			}
+			break;
+		case 2:
+			if (rand(1000) < 500) {
+				cutin "g_cat_03",4;
+				set .@win, .@win+1;
+			} else {
+				cutin "g_cat_04",4;
+				set .@loss,1;
+			}
+			break;
+		}
+		if (.@loss) {
+			mes "[Kuka]";
+			mes "Hehe~ I won yo~ I feel good yo~";
+			next;
+			cutin "",255;
+			break;
+		}
+		mes "[Kuka]";
+		mes "Well~ I lost yo~ Let's practice more yo~";
+		next;
+		cutin "",255;
+		mes "[Kuka]";
+		mes strcharinfo(0)+" has won "+.@win+" times yo~ Next game starts yo~";
+		next;
+	}
+	if (.@win == 0) {
+		// fall through
+	} else if (.@win > 0 && .@win < 3) {
+		setquest 5071;
+		mes "[Kuka]";
+		mes "After the practice, "+strcharinfo(0)+" has won "+.@win+" in a row yo~";
+		mes "Present is for 3 wins or more yo~ Nothing for today yo~ But, come again tomorrow yo~";
+		close;
+	} else {
+		set .@name_record$, $malangdo_gamer$;
+		set .@win_record, $malangdo_gamer;
+		set .@win_cnt, .@win-.@win_record;
+		set .@cans, .@win-2;
+		if (.@win > .@win_record) {
+			set $malangdo_gamer$, strcharinfo(0);
+			set $malangdo_gamer, .@win;
+			mes "[Kuka]";
+			mes "Congrats yo~ You won ^DE2B21"+.@win+"^000000 in a row yo~";
+			if (strcharinfo(0) == .@name_record$)
+				mes "You won ^DE2B21"+.@win_cnt+"^000000 more than the recent ^DE2B21"+.@win_record+"^000000 record yo~ Congrats yo~";
+			// custom conditions
+			//else
+			else if (.@win_record)
+				mes "And you have won ^DE2B21"+.@win_cnt+"^000000 more than ^0000FF"+.@name_record$+"^000000's ^DE2B21"+.@win_record+"^000000 winning streak yo~ New record yo~ Congrats yo~";
+			else
+				mes "A new record yo~ Congrats yo~";
+			next;
+			mes "[Kuka]";
+			mes "I'll give you 1 random coin pocket as a special present yo~ Well done yo~ Come back tomorrow yo~";
+			setquest 5071;
+			getitem 12636, .@cans; //Malang_Sp_Can
+			getitem 12621,1; //Egrade_Pocket
+			close;
+		} else {
+			mes "[Kuka]";
+			mes "Congrats yo~ For winning "+.@win+" times I'll give you "+.@cans+" cans yo~ Well done yo~ Come back tomorrow yo~";
+			setquest 5071;
+			getitem 12636, .@cans; //Malang_Sp_Can
+			close;
+		}
+	}
+	mes "[Kuka]";
+	mes strcharinfo(0)+" didn't win at all yo~ You must work it out yo~";
+	next;
+	setquest 5071;
+	switch(rand(1,13)) {
+	case 1:
+		setquest 5074;
+		mes "[Kuka]";
+		mes "Kuka wants you to catch delicious Phens yo~";
+		next;
+		mes "- Chrub -";
+		mes "Kuka wipes the drool from his mouth.";
+		next;
+		mes "[Kuka]";
+		mes "Catch 30 Phens yo~ And also get me 10 Fish Tails yo~ Get them to our Director Cat, and he will make a delicious dish with them yo~";
+		close;
+	case 2:
+		setquest 5075;
+		mes "[Kuka]";
+		mes "Lately, I've felt powerless and that there's too much weight on me yo~ I should take care of my health yo~";
+		next;
+		mes "[Kuka]";
+		mes "Now it's time for some healthy food yo~";
+		next;
+		mes "[Kuka]";
+		mes "Get 50 Marse and 25 Milk to our Cat Gamers Director yo~. He has excellent knowledge on healthy foods yo~.";
+		close;
+	case 3:
+		setquest 5076;
+		mes "[Kuka]";
+		mes "We have a rival yo~ 'Dog n Waltz' yo~";
+		next;
+		mes "[Kuka]";
+		mes "I want to harass similar goons yo~";
+		next;
+		mes "[Kuka]";
+		mes "There is an archer among Kobolds yo~ Harass 30 Kobold Archers and report to our Cat Gamers Director yo~";
+		close;
+	case 4:
+		setquest 5077;
+		mes "[Kuka]";
+		mes "Quickness is very important for winning the game yo~ Work on quickness yo~";
+		next;
+		mes "[Kuka]";
+		mes "Mouse catching is the best work out for quickness training yo~";
+		next;
+		mes "[Kuka]";
+		mes "Catch 10 blue and chubby Cramps, and report to our Cat Gamers Director yo~";
+		close;
+	case 5:
+		setquest 5078;
+		mes "[Kuka]";
+		mes "I crave bird cuisine yo~ Bird cuisine is so delicious yo~";
+		next;
+		mes "[Kuka]";
+		mes "Picky is too small and Condor is not tasty yo~ How about Peco Peco yo~?";
+		next;
+		mes "[Kuka]";
+		mes "Ok yo~ Catch 50 Peco Pecos and report to our Cat Gamers Director yo~ Tonight, we will have a bird cuisine party yo~";
+		close;
+	case 6:
+		setquest 5079;
+		mes "[Kuka]";
+		mes "I get too nervous before the game yo~. And I don't play well when I am nervous yo~. I need something to calm down before the game starts yo~.";
+		next;
+		mes "[Kuka]";
+		mes "Yarn is very useful for relaxing yo~";
+		next;
+		mes "[Kuka]";
+		mes "Get 20 Yarns yo~ There are many other cats with the same issue yo~ The Cat Gamers Director will take care of them yo~";
+		close;
+	case 7:
+		setquest 5080;
+		mes "[Kuka]";
+		mes "Recently, our Director seems to have been trying to cut some expenses yo~ Or maybe the Manager Cat is taking advantage yo~";
+		next;
+		mes "[Kuka]";
+		mes "Regular snacks for our players have been reduced yo~ "+strcharinfo(0)+" should go get 30 Rat Tails, and report to our Cat Gamers Director yo~";
+		next;
+		mes "[Kuka]";
+		mes "Then, we shall find out if our manager is being greedy or not yo~";
+		close;
+	case 8:
+		setquest 5081;
+		mes "[Kuka]";
+		mes "I am having a slump these days yo~ I can't give my 100% to the game.";
+		next;
+		mes "[Kuka]";
+		mes "It is the lemon we need in times like this yo~";
+		next;
+		mes "[Kuka]";
+		mes "Get 5 lemons for me yo~ Don't forget, I need 5 Lemons yo~ Our Cat Gamers Director should know what to do with them yo~";
+		close;
+	case 9:
+		setquest 5082;
+		mes "[Kuka]";
+		mes "Malangdo is a good place for a cat to live yo~ But, it gets very hot when we play games yo~";
+		next;
+		mes "[Kuka]";
+		mes "When we are playing a lot, it gets really crazy hot yo~ Crazy cats are scary yo~ We need Ice Pieces or Ice Cream yo~";
+		next;
+		mes "[Kuka]";
+		mes "Get us either 10 Ice Pieces or 10 Ice Creams, and report to our Cat Gamers Director yo~";
+		close;
+	case 10:
+		setquest 5083;
+		mes "[Kuka]";
+		mes "Cat Gamers Director's order yo~ Find Eryu who is afraid of the Director yo~";
+		next;
+		mes "[Kuka]";
+		mes "You must find Eryu, and tell him 'Come back' yo~ report to our Cat Gamers Director yo~";
+		close;
+	case 11:
+		setquest 5085;
+		mes "[Kuka]";
+		mes "Cat Gamers Director's order yo~ Find Stew who is afraid of the Director yo~";
+		next;
+		mes "[Kuka]";
+		mes "You must find Stew, and tell him 'Come back' yo~ report to our Cat Gamers Director yo~";
+		close;
+	case 12:
+		setquest 5087;
+		mes "[Kuka]";
+		mes "Cat Gamers Director's order yo~ Find Ketchup who is afraid of the Director yo~";
+		next;
+		mes "[Kuka]";
+		mes "You must find Ketchup, and tell him 'Come back' yo~ report to our Cat Gamers Director yo~";
+		close;
+	case 13:
+		setquest 5089;
+		mes "[Kuka]";
+		mes "Cat Gamers Director's order yo~ Find Eff who is afraid of the Director yo~";
+		next;
+		mes "[Kuka]";
+		mes "You must find Eff, and tell him 'Come back' yo~ report to our Cat Gamers Director yo~";
+		close;
+	}
+}
+
+mal_in01,134,221,4	script	KungKung#gamer	4_M_BABYCAT,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	for(set .@i,5074; .@i<=5090; set .@i,.@i+1) {
+		if (checkquest(.@i) > -1) {
+			mes "[KungKung]";
+			mes "You didn't keep your promise. I have no business with you.";
+			close;
+		}
+	}
+	if (malang_gamer < 20) {
+		if (countitem(2872)) {
+			mes "[KungKung]";
+			mes "You are not qualified. Hmm... I am not sure how you got this, but we cannot practice with you. Go back.";
+			close;
+		}
+		mes "[KungKung]";
+		mes "Do not bother me. I am waiting for my practicing partner.";
+		close;
+	}
+	if (!isequipped(2872)) {
+		mes "[KungKung]";
+		mes "Are you the practice partner? You are late. Let's start right away.";
+		next;
+		mes "[KungKung]";
+		mes "... ... ...";
+		next;
+		mes "[KungKung]";
+		mes "Where is your certificate? You cannot practice with us unless you have that certificate. Go get it.";
+		close;
+	}
+	if (checkquest(5072,PLAYTIME) == 0 || checkquest(5072,PLAYTIME) == 1) {
+		mes "[KungKung]";
+		mes "You don't have a watch? Or can't read the time? It's not the time yet.";
+		close;
+	} else if (checkquest(5072,PLAYTIME) == 2)
+		erasequest 5072;
+	mes "[KungKung]";
+	mes "Are you the practice partner? You are late. Let's start right away.";
+	next;
+	switch(select("Play the game.:Ask current 1st place.:Ask about the game rules.")) {
+	case 1:
+		mes "[KungKung]";
+		mes "Before the game, we will decide the turn by rolling a dice.";
+		next;
+		break;
+	case 2:
+		mes "[KungKung]";
+		mes "Why do you want to know the 1st place? KongNyangKong is a brutal and tough match game. Kuka should know such thing!";
+		close;
+	case 3:
+		mes "[KungKung]";
+		mes "You want to learn the game rules?";
+		mes "You seem to have a polite way of asking things.";
+		mes "Listen carefully.";
+		next;
+		mes "[KungKung]";
+		mes "KongNyangKong has different play rules when attacking and defending.";
+		next;
+		mes "[KungKung]";
+		mes "When attacking, you must turn your hand to the same side as your opponent in order to complete the attack.";
+		next;
+		cutin "cat_g_01",4;
+		mes "[KungKung]";
+		mes "If we turn our hands the same way like this, then your attack is successful.";
+		next;
+		cutin "",255;
+		mes "[KungKung]";
+		mes "For defending, you must turn your hand to the opposite side of your opponent in order to defend yourself.";
+		next;
+		cutin "cat_g_06",4;
+		mes "[KungKung]";
+		mes "Yes! If you turn your hand opposite to mine like that, you have succeeded defending yourself.";
+		next;
+		cutin "",255;
+		mes "[KungKung]";
+		mes "If you are clever enough, you should know that the bottom hand is the attacker's hand.";
+		next;
+		mes "[KungKung]";
+		mes "Last!! Most important rule.";
+		mes "Once you succeed attacking, you can continue attacking your opponent.";
+		mes "When you fail, then you are on the defending side.";
+		mes "Do not forget this!";
+		next;
+		mes "[KungKung]";
+		mes "You can ask about the KongNyangKong rules anytime you want!";
+		mes "Our Manager Cat also knows all about the KongNyangKong rules.";
+		mes "That is all!";
+		close;
+	}
+	while(1) {
+		set .@pc_dic,  rand(6);
+		set .@npc_dic, rand(6);
+
+		// Emote[58-63]:
+		// e_dice1, e_dice2, e_dice3, e_dice4, e_dice5, e_dice6
+		emotion 58+.@pc_dic,1;
+		emotion 58+.@npc_dic;
+
+		if (.@pc_dic > .@npc_dic) {
+			mes "[KungKung]";
+			mes "Your dice roll number is higher. You can attack first.";
+			set .@attack_turn,1;
+			next;
+			break;
+		} else if (.@pc_dic < .@npc_dic) {
+			mes "[KungKung]";
+			mes "My dice roll number is higher. I will attack first.";
+			set .@attack_turn,2;
+			next;
+			break;
+		} else {
+			mes "[KungKung]";
+			mes "We have even numbers. Let's roll the dice once again.";
+			next;
+		}
+	}
+	set .@pc_hp,100;
+	set .@npc_hp,100;
+	while(1) {
+		if (!.@pc_hp || !.@npc_hp) break;
+		mes strcharinfo(0)+" (^FF0000"+.@pc_hp+"^000000/100)";
+		mes "--------------------------------";
+		mes "KungKung (^FF0000"+.@npc_hp+"^000000/100)";
+		next;
+		mes "[KungKung & "+strcharinfo(0)+"]";
+		mes "Kong!";
+		emotion e_loud,1;
+		emotion e_loud;
+		next;
+		mes "[KungKung & "+strcharinfo(0)+"]";
+		mes "Kong! Nyang!";
+		emotion e_loud,1;
+		emotion e_loud;
+		next;
+		mes "[KungKung & "+strcharinfo(0)+"]";
+		mes "Kong! Nyang! Kong!";
+		emotion e_loud,1;
+		emotion e_loud;
+		next;
+		set .@cat_hand, rand(1,10);
+		switch(.@attack_turn) {
+		case 1: // Attack
+			mes "How would you like to attack?";
+			mes " ";
+			mes "¡¡ Tip !!";
+			mes "Choose back: ^FF0000You win if the cat shows the back of its paw.^000000";
+			mes "Choose palm: ^FF0000You win if the cat shows the palm of its paw.^000000";
+			next;
+			switch(select("Back:Palm")) {
+			case 1:
+				if (.@cat_hand <= 5) {
+					set .@npc_hp, .@npc_hp-10;
+					cutin "cat_g_01",4;
+					specialeffect EF_BASH;
+					mes "Attack was successful.";
+					mes "You have slapped the back of KungKung's paw.";
+					next;
+					cutin "",255;
+				} else {
+					set .@attack_turn,2;
+					cutin "cat_g_02",4;
+					mes "Attack has failed.";
+					mes "KungKung starts attack now.";
+					next;
+					cutin "",255;
+				}
+				break;
+			case 2:
+				if (.@cat_hand <= 5) {
+					set .@attack_turn,2;
+					cutin "cat_g_03",4;
+					mes "Attack has failed.";
+					mes "KungKung starts attack now.";
+					next;
+					cutin "",255;
+				} else {
+					set .@npc_hp, .@npc_hp-10;
+					cutin "cat_g_04",4;
+					specialeffect EF_BASH;
+					mes "Attack was successful.";
+					mes "You have slapped the back of KungKung's paw.";
+					next;
+					cutin "",255;
+				}
+				break;
+			}
+			break;
+		case 2: // Defend
+			mes "How would you like to defend?";
+			mes " ";
+			mes "¡¡ Tip !!";
+			mes "Choose back: ^FF0000You win if the cat shows the back of its paw.^000000";
+			mes "Choose palm: ^FF0000You win if the cat shows the palm of its paw.^000000";
+			next;
+			switch(select("Back:Palm")) {
+			case 1:
+				if (.@cat_hand <= 5) {
+					set .@pc_hp, .@pc_hp-10;
+					cutin "cat_g_05",4;
+					specialeffect2 EF_BASH;
+					mes "Defending has failed.";
+					mes "KungKung attacks the back of your hand with its sharp claw.";
+					next;
+					cutin "",255;
+				} else {
+					set .@attack_turn,1;
+					cutin "cat_g_06",4;
+					mes "Defending was succesful.";
+					mes "You can start attack now.";
+					next;
+					cutin "",255;
+				}
+				break;
+			case 2:
+				if (.@cat_hand <= 5) {
+					set .@attack_turn,1;
+					cutin "cat_g_07",4;
+					mes "Defending was succesful.";
+					mes "You can start attack now.";
+					next;
+					cutin "",255;
+				} else {
+					set .@pc_hp, .@pc_hp-10;
+					cutin "cat_g_08",4;
+					specialeffect2 EF_BASH;
+					mes "Defending has failed.";
+					mes "KungKung attacks the back of your hand with its sharp claw.";
+					next;
+					cutin "",255;
+				}
+				break;
+			}
+			break;
+		}
+	}
+	if (.@npc_hp == 0) {
+		mes "[KungKung]";
+		mes "I lost. It was good game indeed.";
+		mes "A win would have been better, but I am too busy to look back at the past.";
+		next;
+		cutin "cat_g_lose",4;
+		mes "[KungKung]";
+		mes "Sob...";
+		emotion e_sob;
+		next;
+		cutin "",255;
+		mes "[KungKung]";
+		mes "Hmm... That wasn't necessary, I guess.";
+		mes "This is for you, Human!";
+		setquest 5072;
+		getitem 12636,5; //Malang_Sp_Can
+		next;
+		mes "[KungKung]";
+		mes "Come again tomorrow. I will beat you next time.";
+		close2;
+		cutin "",255;
+		end;
+	}
+	cutin "cat_g_win",4;
+	mes "[KungKung]";
+	mes "I won. It was a boring match.";
+	mes "You need to practice more. Maybe some extra work will help.";
+	next;
+	setquest 5072;
+	switch(rand(1,13)) {
+	case 1:
+		setquest 5074;
+		mes "[KungKung]";
+		mes "Catch the delicious fish Phen.";
+		next;
+		mes "[KungKung]";
+		mes "Go catch 30 Phens. And also get me 10 Fish Tails. Give them to our Director cat, and he will make a delicious dish with them.";
+		break;
+	case 2:
+		setquest 5075;
+		mes "[KungKung]";
+		mes "I may have worked out too much... I feel powerless and that there's too much weight on me. I should take care of my health.";
+		next;
+		mes "[KungKung]";
+		mes "I am already 10 years old, so it's time for some healthy food.";
+		next;
+		mes "[KungKung]";
+		mes "Get 50 Marse and 30 Milk to our Cat Gamers Director. He has excellent knowledge on healthy foods.";
+		break;
+	case 3:
+		setquest 5076;
+		mes "[KungKung]";
+		mes "We have a rival. The 'Dog n Waltz' team... Everything goes wrong when they come around.";
+		next;
+		mes "[KungKung]";
+		mes "I want to ask you to bully them, but that's illegal...";
+		next;
+		mes "[KungKung]";
+		mes "Go harass 30 Kobold Archers instead of 'Dog n Waltz', and report to our Cat Gamers Director.";
+		break;
+	case 4:
+		setquest 5077;
+		mes "[KungKung]";
+		mes "Quickness is most important for winning the game. For better quickness...";
+		next;
+		mes "[KungKung]";
+		mes "Catching mice is best. It's Cramp hunting time.";
+		next;
+		mes "[KungKung]";
+		mes "Catch 10 Cramps, and report to our Cat Gamers Director.";
+		break;
+	case 5:
+		setquest 5078;
+		mes "[KungKung]";
+		mes "I want some bird cuisine. Have you tasted any before?";
+		next;
+		mes "[KungKung]";
+		mes "Peco Peco sounds delicious to me. I don't like eating alone, so...";
+		next;
+		mes "[KungKung]";
+		mes "Catch 50 Peco Pecos, and report to our Cat Gamers Director. We all can have a dinner party with Peco Peco cuisine.";
+		break;
+	case 6:
+		setquest 5079;
+		mes "[KungKung]";
+		mes "Being calm is the key to winning important matches.";
+		next;
+		mes "[KungKung]";
+		mes "There's not a single cat who hasn't played with Yarn when they were young.";
+		next;
+		mes "[KungKung]";
+		mes "Get 20 Yarns, and report to our Cat Gamers Director. It will help improve our team's ability.";
+		break;
+	case 7:
+		setquest 5080;
+		mes "[KungKung]";
+		mes "I have a strong belief that our Manager Cat is taking advantage of our snacks.";
+		next;
+		mes "[KungKung]";
+		mes "All we need is evidence... Get 30 Rat Tails, and report to our Cat Gamers Director.";
+		next;
+		mes "[KungKung]";
+		mes "Then, we shall find out whether or not Manager Cat was doing something wrong.";
+		break;
+	case 8:
+		setquest 5081;
+		mes "[KungKung]";
+		mes "Practice was ok, but I seem to be having a slump these days.";
+		next;
+		mes "[KungKung]";
+		mes "We need to have some Lemon in times like this.";
+		next;
+		mes "[KungKung]";
+		mes "Get 5 Lemons to our Cat Gamers Director. He'll know what to do.";
+		break;
+	case 9:
+		setquest 5082;
+		mes "[KungKung]";
+		mes "Malangdo is a good place for a cat to live. But, it gets hot easily.";
+		next;
+		mes "[KungKung]";
+		mes "On a hot days like this, we could use some Ice Pieces or Ice Cream.";
+		next;
+		mes "[KungKung]";
+		mes "Get either 10 Ice Pieces or 10 Ice Creams. Our Cat Gamers Director should know what to do with them.";
+		break;
+	case 10:
+		setquest 5083;
+		mes "[KungKung]";
+		mes "Our Cat Gamers Director asked this. I should make you do this errand.";
+		next;
+		mes "[KungKung]";
+		mes "Find Eryu the cat from Malangdo, and say 'Come back' loud and clear.";
+		next;
+		mes "[KungKung]";
+		mes "Afterwards, you can report to our Cat Gamers Director. Off you go!!";
+		break;
+	case 11:
+		setquest 5085;
+		mes "[KungKung]";
+		mes "Our Cat Gamers Director asked this. I should make you do this errand.";
+		next;
+		mes "[KungKung]";
+		mes "Find Stew the cat from Malangdo, and say 'Come back' loud and clear.";
+		next;
+		mes "[KungKung]";
+		mes "Afterwards, you can report to our Cat Gamers Director. Off you go!!";
+		break;
+	case 12:
+		setquest 5087;
+		mes "[KungKung]";
+		mes "Our Cat Gamers Director asked this. I should make you do this errand.";
+		next;
+		mes "[KungKung]";
+		mes "Find Ketchup the cat from Malangdo, and say 'Come back' loud and clear.";
+		next;
+		mes "[KungKung]";
+		mes "Afterwards, you can report to our Cat Gamers Director. Off you go!!";
+		break;
+	case 13:
+		setquest 5089;
+		mes "[KungKung]";
+		mes "Our Cat Gamers Director asked this. I should make you do this errand.";
+		next;
+		mes "[KungKung]";
+		mes "Find Eff the cat from Malangdo, and say 'Come back' loud and clear.";
+		next;
+		mes "[KungKung]";
+		mes "Afterwards, you can report to our Cat Gamers Director. Off you go!!";
+		break;
+	}
+	close2;
+	cutin "",255;
+	end;
+}
+
+mal_in01,133,214,6	script	Leader#gamer	4_CAT_SAILOR3,{
+	if (MaxWeight - Weight < 1000) {
+		mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
+		close;
+	}
+	if (checkweight(1201,1) == 0) {
+		mes "Your inventory is too full to proceed. Come back after reducing your load.";
+		close;
+	}
+	for(set .@i,5074; .@i<=5090; set .@i,.@i+1) {
+		if (checkquest(.@i) > -1) {
+			mes "[Leader]";
+			mes "You cannot challenge this Flag Game unless you are done with your assigned work.";
+			close;
+		}
+	}
+	if (malang_gamer < 20) {
+		if (countitem(2872)) {
+			mes "[Leader]";
+			mes "Not everyone can challenge just because they have the certificate.";
+			close;
+		}
+		mes "[Leader]";
+		mes "Ok, let's practice until a challenger comes!!";
+		close;
+	}
+	if (!isequipped(2872)) {
+		mes "[Leader]";
+		mes "Do you want to challege?";
+		next;
+		mes "[Leader]";
+		mes "... ... ...";
+		next;
+		mes "[Leader]";
+		mes "You cannot challenge this Flag Game unless you are wearing our certificate item. Please come back later.";
+		close;
+	}
+	if (checkquest(5073) == 0 || checkquest(5073) == 1) {
+		mes "[Leader]";
+		mes "The Flag Game is only available once a day.";
+		close;
+	} else if (checkquest(5073) == 2)
+		erasequest 5073;
+	mes "[Leader]";
+	mes "Do you want to challege?";
+	next;
+	switch(select("Challenge.:Who are you?:Ask about the rules.")) {
+	case 1:
+		mes "[Leader]";
+		mes "Let's challenge the Flag Game. Please wait while our cats get prepared.";
+		next;
+		break;
+	case 2:
+		mes "[Leader]";
+		mes "Oh! I retired from 'Cat Gamers', and am working on a national game referee license. Licenses are the new trend these days.";
+		next;
+		mes "[Leader]";
+		mes "A referee must use standard language... So it was very hard for me to stop crying meow meow~ like other cats.";
+		next;
+		mes "[Leader]";
+		mes "I know the game rules for players for sure, but refereeing the game is a lot harder than it seems.";
+		next;
+		mes "[Leader]";
+		mes "Sometimes I do make mistakes, and people go crazy like it's the end of world. What a hard job this is.";
+		next;
+		mes "[Leader]";
+		mes "But, I want to finish this course, and be the world's best referee ever.";
+		next;
+		mes "[Leader]";
+		mes "You can bet on it!!";
+		close;
+	case 3:
+		mes "[Leader]";
+		mes "Allow me to explain the rule for the Flag-Waving Game.";
+		next;
+		mes "[Leader]";
+		mes "You play with 5 other cats.";
+		mes "Wait and wave the flag when no others are waving it.";
+		next;
+		mes "[Leader]";
+		mes "You start with 5 Flag Points, and each time you wave the flag 1 point vanishes.";
+		mes "When your points hit 0, the game ends.";
+		next;
+		mes "[Leader]";
+		mes "There's a special rule for this Flag Game. For more thrill, we reduce 1 point if you do not wave your flag for 10 games.";
+		next;
+		mes "[Leader]";
+		mes "You will get bigger presents as you win with less Flag Points used.";
+		next;
+		mes "[Leader]";
+		mes "Come back anytime if you need more help with the game rules. Our Manager Cat is also available for some help with the game rules.";
+		close;
+	}
+
+	// Starting Flag Points (default 5).
+	set .@flag_point,5;
+	setarray .@flag_point_cat[1],5,5,5,5,5;
+
+	// Cat players' names.
+	setarray .@npc_name$[1],
+		"Debong#gamer","Seichi#gamer","Libs#gamer","Row#gamer","YongYong#gamer";
+	setarray .@cat_name$[1],
+		"Debong","Seichi","Annoying Libs","Row","YongYong";
+	setarray .@cat_desc$[1],
+		" who likes to pick hair"," the observer",""," who likes to show off"," who likes to droop";
+
+	// Emotions displayed when cats' flags not waved.
+	setarray .@cat_emote[1],
+		e_ho,e_no,e_an,e_no1,e_spin;
+
+	// .@cat_action[] when cats' flags are not waved.
+	setarray .@cat_emotes$[1],
+		"1|3|5|7",	// Picking hair
+		"2|4|6|8",	// Looking around
+		"1|3|6|8",	// Getting annoyed
+		"2|4|5|7",	// Showing off
+		"3|4|5|6";	// Drooping
+
+	while(1) {
+		for(set .@i,1; .@i<=5; set .@i,.@i+1)
+			set .@cat_action[.@i], ((.@flag_point_cat[.@i])?rand(1,8):0);
+
+		switch(.@cat_action[1]) {
+			case 0: set .@cat_mes$[1], "cannot do anything with all points used"; break;
+			case 1: set .@cat_mes$[1], "focuses on hair picking, careless for the game"; break;
+			case 2: set .@cat_mes$[1], "looks around with round eyes"; break;
+			case 3: set .@cat_mes$[1], "picks out hair around the front paw"; break;
+			case 4: set .@cat_mes$[1], "is getting annoyed at tails smacking on the ground"; break;
+			case 5: set .@cat_mes$[1], "picks his hair while looking around"; break;
+			case 6: set .@cat_mes$[1], "shows off his front paw to the Leader Cat"; break;
+			case 7: set .@cat_mes$[1], "is picking some hair on his belly with a calm mind"; break;
+			case 8: set .@cat_mes$[1], "is drooping down with a pleasant face"; break;
+		}
+		switch(.@cat_action[2]) {
+			case 0: set .@cat_mes$[2], "cannot do anything with all points used"; break;
+			case 1: set .@cat_mes$[2], "picks out hair around the front paw"; break;
+			case 2: set .@cat_mes$[2], "looks around with round eyes"; break;
+			case 3: set .@cat_mes$[2], "is getting annoyed with the Leader Cat"; break;
+			case 4: set .@cat_mes$[2], "observes flies flying around"; break;
+			case 5: set .@cat_mes$[2], "shows off picked hair proudly"; break;
+			case 6: set .@cat_mes$[2], "observes Leader Cat's tail curiously"; break;
+			case 7: set .@cat_mes$[2], "looks at you with drooping eyes"; break;
+			case 8: set .@cat_mes$[2], "is checking you out with a weird glimmer"; break;
+		}
+		switch(.@cat_action[3]) {
+			case 0: set .@cat_mes$[3], "cannot do anything with all points used"; break;
+			case 1: set .@cat_mes$[3], "is getting annoyed at tails smacking on the ground"; break;
+			case 2: set .@cat_mes$[3], "observes Leader Cat's tail curiously"; break;
+			case 3: set .@cat_mes$[3], "is getting annoyed while picking his hair"; break;
+			case 4: set .@cat_mes$[3], "scratches with a drooping face"; break;
+			case 5: set .@cat_mes$[3], "catches a flying fly and shows off"; break;
+			case 6: set .@cat_mes$[3], "is getting irritable with a tired face"; break;
+			case 7: set .@cat_mes$[3], "picks his hair while looking around"; break;
+			case 8: set .@cat_mes$[3], "is getting annoyed with the Leader Cat"; break;
+		}
+		switch(.@cat_action[4]) {
+			case 0: set .@cat_mes$[4], "cannot do anything with all points used"; break;
+			case 1: set .@cat_mes$[4], "is picking some hair on his belly with a calm mind"; break;
+			case 2: set .@cat_mes$[4], "shows off his front paw to the Leader Cat"; break;
+			case 3: set .@cat_mes$[4], "is getting irritable with a tired face"; break;
+			case 4: set .@cat_mes$[4], "catches a flying fly and shows off"; break;
+			case 5: set .@cat_mes$[4], "shows off an attractive tail"; break;
+			case 6: set .@cat_mes$[4], "is drooping and mumbling"; break;
+			case 7: set .@cat_mes$[4], "shows off picked hair proudly"; break;
+			case 8: set .@cat_mes$[4], "is checking you out with a weird glimmer"; break;
+		}
+		switch(.@cat_action[5]) {
+			case 0: set .@cat_mes$[5], "cannot do anything with all points used"; break;
+			case 1: set .@cat_mes$[5], "is fighting with his tail"; break;
+			case 2: set .@cat_mes$[5], "is scratching with his hind foot"; break;
+			case 3: set .@cat_mes$[5], "is drooping down with a pleasant face"; break;
+			case 4: set .@cat_mes$[5], "checks you out with a drooping face"; break;
+			case 5: set .@cat_mes$[5], "scratches with a drooping face"; break;
+			case 6: set .@cat_mes$[5], "is drooping and mumbling"; break;
+			case 7: set .@cat_mes$[5], "is lying around~"; break;
+			case 8: set .@cat_mes$[5], "is doing nothing"; break;
+		}
+
+		switch(rand(3)) {
+			case 0: set .@tip$, "You can predict if the cat will wave the flag or not with 'Observe cats'."; break;
+			case 1: set .@tip$, "1 Flag Point will be deducted if you choose 'Wave flag'."; break;
+			case 2: set .@tip$, "Choosing 'Wait', you can check the results and move on to the next game."; break;
+		}
+		while(1) {
+			mes "[Leader]";
+			mes "Cats are now all prepared.";
+			mes "What will you do?";
+			mes " ";
+			mes "Tip: ^F86A08"+.@tip$+"^000000";
+			next;
+			set .@choice, select("Observe cats:Wave flag:Wait");
+			switch(.@choice) {
+			case 1:
+				mes "Observing cats...";
+				next;
+				for(set .@i,1; .@i<=5; set .@i,.@i+1) {
+					mes "[------ Observing cats ------]";
+					mes .@cat_name$[.@i]+.@cat_desc$[.@i]+" ^FF0000"+.@cat_mes$[.@i]+"^000000.";
+					next;
+				}
+				break;
+			case 2:
+				set .@flag_point, .@flag_point-1;
+				set .@you_flag,1;
+				break;
+			case 3:
+				break;
+			}
+			if (.@choice != 1) break;
+		}
+		set .@round, .@round+1;
+		set .@rounds_nowave, .@rounds_nowave+1;
+		if (.@you_flag == 1) {
+			set .@you_flag$, "You waved the flag";
+			set .@emotion[0], e_korea;
+		} else {
+			set .@you_flag$, "You didn't wave the flag";
+			set .@emotion[0], e_swt2;
+		}
+		for(set .@i,1; .@i<=5; set .@i,.@i+1) {
+			if (.@flag_point_cat[.@i] == 0) {
+				set .@cat_flag$[.@i], "Not enough Flag Points, could not wave";
+				set .@emotion[.@i], e_ho;
+			} else {
+				if (compare(.@cat_emotes$[.@i],""+.@cat_action[.@i])) {
+					set .@cat_flag$[.@i], "Didn't wave";
+					set .@emotion[.@i], .@cat_emote[.@i];
+				} else {
+					set .@cat_flag$[.@i], "Did wave";
+					set .@flag_point_cat[.@i], .@flag_point_cat[.@i]-1;
+					set .@cat_flags_waved, .@cat_flags_waved+1;
+					set .@emotion[.@i], e_korea;
+				}
+			}
+		}
+		mes "[Leader]";
+		mes "Game ^C1653E"+.@round+"^000000 results...";
+		next;
+		mes "[Leader]";
+		mes "~ Flag Game challenger "+strcharinfo(0)+" ~";
+		mes "^FF0000"+.@you_flag$+"^000000 for game ^C1653E"+.@round+"^000000.";
+		mes .@flag_point+" Flag Point remaining.";
+		emotion .@emotion[0],1;
+		next;
+		for(set .@i,1; .@i<=5; set .@i,.@i+1) {
+			mes "[Leader]";
+			mes "~ "+.@cat_name$[.@i]+.@cat_desc$[.@i]+" ~";
+			mes "^FF0000"+.@cat_flag$[.@i]+"^000000 the flag for game ^C1653E"+.@round+"^000000.";
+			mes .@flag_point_cat[.@i]+" Flag Point remaining for "+.@cat_name$[.@i]+".";
+			emotion .@emotion[.@i],0,.@npc_name$[.@i];
+			next;
+		}
+		if (.@you_flag == 1) {
+			set .@rounds_nowave,0;
+			if (.@cat_flags_waved == 0) {
+				// You win.
+				break;
+			} else if (.@flag_point == 0) {
+				// You lose.
+				mes "[Leader]";
+				mes "You have used all your Flag Points.";
+				next;
+				break;
+			} else {
+				set .@you_flag,0;
+				mes "[Leader]";
+				mes "You have failed at flag waving.";
+				mes .@flag_point+" Flag Point remaining.";
+				next;
+				mes "[Leader]";
+				mes "Let's move on to the next game.";
+				next;
+				mes "... ... ... ...";
+				next;
+			}
+		} else {
+			if (.@cat_flags_waved == 5) {
+				mes "[Leader]";
+				mes "Congrats "+strcharinfo(0)+". You have succeed on not waving your flag.";
+				next;
+				mes "[Leader]";
+				mes "But! This is flag waving game, so this doesn't count.";
+				next;
+			} else {
+				if (.@rounds_nowave == 10) {
+					set .@rounds_nowave,0;
+					set .@flag_point, .@flag_point-1;
+					mes "[Leader]";
+					mes "Since you didn't wave your flag for 10 games, 1 Flag Point will be reduced according to the official Flag Game rules.";
+					next;
+					if (.@flag_point == 0) {
+						// You lose.
+						mes "[Leader]";
+						mes "You have used all your Flag Points.";
+						next;
+						break;
+					} else {
+						mes "[Leader]";
+						mes .@flag_point+" Flag Point remaining.";
+						next;
+					}
+				} else {
+					mes "[Leader]";
+					mes "Game "+.@round+" has ended properly. Point penalty will be given after "+(10-.@rounds_nowave)+" more.";
+					next;
+				}
+				mes "[Leader]";
+				mes "Let's move on to the next game.";
+				next;
+				mes "... ... ... ...";
+				next;
+			}
+		}
+		set .@cat_flags_waved,0;
+	}
+	mes "[Leader]";
+	mes "The Flag-Waving Game has ended.";
+	next;
+	mes "[Leader]";
+	mes "Final results!!";
+	mes "After "+.@round+" games, "+strcharinfo(0)+" has "+.@flag_point+" Flag Point left.";
+	mes "... ... ...";
+	next;
+	if (.@you_flag == 1 && .@cat_flags_waved == 0) {
+		setquest 5073;
+		if (.@flag_point_cat[1]+.@flag_point_cat[2]+.@flag_point_cat[3]+.@flag_point_cat[4]+.@flag_point_cat[5] < 5) {
+			getitem 12636,3; //Malang_Sp_Can
+			mes "[Leader]";
+			mes "Congratulations. You have won the Flag-Waving Game.";
+			next;
+			mes "[Leader]";
+			mes "But, only 3 Canned Foods will be given as the present since you didn't take a big part through the game.";
+		} else {
+			switch(.@flag_point) {
+				case 0: set .@cans,5; break;
+				case 1: set .@cans,7; break;
+				case 2: set .@cans,10; break;
+				case 3: set .@cans,15; break;
+				case 4: set .@cans,20; break;
+			}
+			getitem 12636, .@cans; //Malang_Sp_Can
+			mes "[Leader]";
+			mes "Congratulations. You have won the Flag-Waving Game. "+.@cans+" Canned Foods will be given as the present.";
+		}
+		next;
+		mes "[Leader]";
+		mes "Hope you win some more Canned Foods tomorrow.";
+		close;
+	}
+	mes "[Leader]";
+	mes "Flag waving failed...";
+	mes "... ... ... ...";
+	next;
+	setquest 5073;
+	switch(rand(1,13)) {
+		case 1: setquest 5074; break;
+		case 2: setquest 5075; break;
+		case 3: setquest 5076; break;
+		case 4: setquest 5077; break;
+		case 5: setquest 5078; break;
+		case 6: setquest 5079; break;
+		case 7: setquest 5080; break;
+		case 8: setquest 5081; break;
+		case 9: setquest 5082; break;
+		case 10: setquest 5083; break;
+		case 11: setquest 5085; break;
+		case 12: setquest 5087; break;
+		case 13: setquest 5089; break;
+	}
+	mes "Leader gives you a note without hesitation. You must follow the order now.";
+	close;
+}
+
+mal_in01,136,216,2	script	Seichi#gamer	4_CAT_DOWN,{
+	if (malang_gamer == 20) {
+		mes "[Seichi]";
+		mes "Ah~ I'm hungry. Any rats wandering around?";
+		next;
+		mes "[Seichi]";
+		mes "Ah~ I think I could eat 100 cramps at once.";
+		next;
+		mes "[Seichi]";
+		mes "Hey, why don't you look around? Who knows? Maybe we can find a delicious canned food~";
+		emotion e_no;
+		next;
+		mes "[Seichi]";
+		mes "Then, you can give me one. Hehe~";
+		close;
+	} else {
+		mes "[Seichi]";
+		mes "I am hungry~ Any leftover canned food there?";
+		emotion e_no;
+		close;
+	}
+	end;
+}
+
+mal_in01,136,215,2	script	Row#gamer	4_CAT_ADV1,{
+	if (malang_gamer == 20) {
+		mes "[Row]";
+		mes "Hut! Human, you came to see me, Row the Great? What? No?";
+		next;
+		mes "[Row]";
+		mes "What do want then? Get lost. Ah...!!";
+		next;
+		mes "[Row]";
+		mes "You want to play the Flag Game? I see. Show me what you've got.";
+		next;
+		mes "[Row]";
+		mes "But, you know you can never beat me, the great Row.";
+		emotion e_gg;
+		close;
+	} else {
+		mes "[Row]";
+		mes "Flag waving is a serious game. Only special cats like me can compete. Meow~";
+		close;
+	}
+	end;
+}
+
+mal_in01,136,214,2	script	Debong#gamer	4_CAT,{
+	if (malang_gamer == 20) {
+		mes "[Debong]";
+		mes "Hair picking is my best hobby meow.";
+		next;
+		mes "[Debong]";
+		mes "When picking hair meow~";
+		mes "Time really flies meow~";
+		next;
+		mes "[Debong]";
+		mes "Come here, you, meow. I'll pick your hair meow.";
+		emotion e_lv;
+		close;
+	} else {
+		mes "The cat is picking your hair.";
+		close;
+	}
+	end;
+}
+
+mal_in01,136,213,2	script	Libs#gamer	4_M_BOSSCAT,{
+	if (malang_gamer == 20) {
+		mes "[Libs]";
+		mes "Arrgg!! Why should I play this stupid flag waving game here?";
+		emotion e_an;
+		next;
+		mes "[Libs]";
+		mes "Hey you. What do you think? I know you've hearing me!";
+		next;
+		mes "[Libs]";
+		mes "... ... ...";
+		next;
+		mes "[Libs]";
+		mes "Well, I'm sure you won't have a clue why this is happening. I forgive you.";
+		emotion e_ok;
+		next;
+		mes "[Libs]";
+		mes "How can a human understand the overwhelming heart of cats.";
+		emotion e_pif;
+		close;
+	} else {
+		mes "[Libs]";
+		mes "A human? What are you doing here?";
+		next;
+		mes "[Libs]";
+		mes "Oh! I see. Our director is looking a practicing partner, why don't you apply?";
+		close;
+	}
+	end;
+}
+
+mal_in01,136,212,2	script	YongYong#gamer	4_CAT_REST,{
+	if (malang_gamer == 20) {
+		mes "[YongYong]";
+		mes "Meow~ I'm annoyed meow~";
+		emotion e_an;
+		next;
+		mes "[YongYong]";
+		mes "Annoying meow~";
+		emotion e_an;
+		next;
+		mes "[YongYong]";
+		mes "You're annoying meow~";
+		emotion e_an;
+		next;
+		mes "[YongYong]";
+		mes "What are you, a dog? Meow~!";
+		emotion e_an;
+		specialeffect EF_SONICBLOW2;
+		next;
+		mes "[YongYong]";
+		mes "Do not mess with the drooping cat.";
+		mes "Or you will regret it.";
+		close;
+	} else {
+		mes "z..Z..z..Z";
+		mes "The cat is sleeping.";
+		close;
+	}
+	end;
+}
+
+malangdo,120,140,7	script	Sign#Cat G Entrance	4_BULLETIN_BOARD2,{
+	mes "A small sign.";
+	next;
+	mes "[Cat Gamers Headquarters]";
+	mes "- Practicing partner welcome -";
+	mes "- Recruiting 'Cat Gamers' -";
+	mes "Consult with our Cat Gamers Director.";
+	close;
+}
+
+mal_in01,15,221,6	script	Sign#Cat G 1F	4_BULLETIN_BOARD2,{
+	mes "[Cat Gamers Headquarters 1F]";
+	mes "- ~ B 1 ~ -";
+	mes "Rock Paper Scissors practice room";
+	mes "ChamChamCham practice room";
+	close;
+}
+
+mal_in01,77,214,4	script	Sign#Cat G B1	4_BULLETIN_BOARD2,{
+	mes "[Cat Gamers Headquarters B1]";
+	mes "- ~ 1 F ~ -";
+	mes "Consult with the director...";
+	mes "-----------------------------";
+	mes "- ~ B 2 ~ -";
+	mes "KongNyangKong & Flag Game practice room";
+	mes "'Cat Gamers' Tech Team lab";
+	close;
+}
+
+mal_in01,142,220,6	script	Sign#Cat G B2	4_BULLETIN_BOARD2,{
+	mes "[Cat Gamers Headquarters B2]";
+	mes "- ~ B 1 ~ -";
+	mes "Rock Paper Scissors practice room";
+	mes "ChamChamCham practice room";
+	close;
+}
+
+mal_in01,155,222,2	script	Uneet#gamer	4_LAM,{
+	set .@playtime, checkquest(5069,PLAYTIME);
+	if (.@playtime == 0 || .@playtime == 1) {
+		mes "[Uneet]";
+		mes "Wow Wot~ What a busy day~";
+		mes "Oh, you are the one who won the honorable certificate?";
+		next;
+		mes "[Uneet]";
+		mes "There are more orders coming every day. Ahh!! Give me some more manpower!!";
+		close;
+	} else if (.@playtime == 2) {
+		mes "[Uneet]";
+		mes "Nyah~ Ong~ Certificate complete!!";
+		next;
+		mes "[Uneet]";
+		mes "I already gave your certificate to the Cat Gamers Director! Go check it out~";
+		next;
+		mes "[Uneet]";
+		mes "Please... Keep this wherever you go.";
+		close;
+	} else if (malang_gamer < 19) {
+		mes "[Uneet]";
+		mes "I am a cat. Nyah~ Ong~";
+		mes "I look like a sheep because I was so busy I didn't have time to shave.";
+		mes "It is not my fault...";
+		close;
+	} else {
+		mes "[Uneet]";
+		mes "Nyah~ Ong~ Do not interrupt my resting.";
+		mes "Usually, I am very busy...";
+		mes "Don't touch me.";
+		next;
+		mes "[Uneet]";
+		mes "I'm a bit fat now, but you should look at yourself too. Haha...";
+		close;
+	}
+	end;
+}
+
+mal_in01,30,222,4	script	Interview Cat#gamer	4_CAT_ADV2,{
+	mes "[Interview Cat]";
+	mes "I want join 'Cat Gamers'.";
+	mes "But it seems the Cat Gamers Director is busy now. Should I just leave?";
+	next;
+	mes "[Interview Cat]";
+	mes "What? You also want join this group?";
+	close;
+}
+
+mal_in01,19,213,1	script	Waiting Cat#gamer	4_CAT_3COLOR,{
+	mes "[Waiting Cat]";
+	mes "Why did someone put that vase inside of a glass?";
+	mes "The Cat Gamers Director did that?";
+	next;
+	mes "[Waiting Cat]";
+	mes "What strange taste.";
+	mes "Maybe I should rethink joining 'Cat Gamers', huh?";
+	close;
+}
+
 // Archangel Wing Enchants :: enc_angel
 //============================================================
-malangdo,234,153,6	script	Notice Board#mal	837,{
+malangdo,234,153,6	script	Notice Board#mal	2_BULLETIN_BOARD,{
 	mes "^0000FFThere's a hastily written message on this bulletin board.^000000";
 	next;
 	mes "A fallen angel within will unlock a hidden enchantment to Archangel Wings.";
 	close;
 }
 
-mal_in01,15,16,3	script	Fallen Angel#mal	403,{
+mal_in01,15,16,3	script	Fallen Angel#mal	4_F_VALKYRIE2,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "You are carrying too many items, please reduce them and come back!";
@@ -6301,7 +10626,7 @@ mal_in01,15,16,3	script	Fallen Angel#mal	403,{
 		else if (.@i < 854) set .@enchant,4710; //Inteligence1
 		else set .@enchant,0;
 
-		set Zeny, Zeny - 1000000;
+		Zeny -= 1000000;
 		delequip EQI_GARMENT;
 		if (.@enchant == 0) {
 			mes "[Fallen Angel]";
@@ -6356,6 +10681,7 @@ mal_in01,15,16,3	script	Fallen Angel#mal	403,{
 		}
 		set .@equip_refine, getequiprefinerycnt(EQI_GARMENT);
 		setarray .@equip_card[0], getequipcardid(EQI_GARMENT,0),getequipcardid(EQI_GARMENT,1),getequipcardid(EQI_GARMENT,2);
+		delitem 6417,3; //Silvervine
 		delequip EQI_GARMENT;
 		getitem2 2573,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],0; //Archangel_Wing
 		mes "[Fallen Angel]";
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
new file mode 100644
index 000000000..0c9eb2a82
--- /dev/null
+++ b/npc/re/quests/quests_malaya.txt
@@ -0,0 +1,9152 @@
+//===== Hercules Script ======================================
+//= Port Malaya Quest NPCs
+//===== By: ==================================================
+//= Masao
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= [Official Conversion]
+//= Quest NPCs related to Port Malaya:
+//== Cautious Village, Port Malaya Daily Quests,
+//== Secret in the Woods, Bakonawa Extermination
+//== Nurse in Port Malaya, Pintados Festival
+//= Merchants:
+//== Traders, Upgrade Boss Equipment
+//===== Additional Comments: =================================
+//= 0.1 Traders only. Adapted from Masao's conversion. [Euphy]
+//= 0.2 Added Tribe Blacksmith [DeadlySilence]
+//= 0.3 Added "Secret in the Woods" quest [DeadlySilence]
+//= 0.4 Added "Cautious Village" and subsequent quests [DeadlySilence]
+//= 0.5 Added "Bakonawa Extermination" quest. [Euphy]
+//= 1.0 Added "Nurse in Port Malaya" and "Pintados Festival" quests. [Euphy]
+//= 1.1 Added GM management function and NPC. [Euphy]
+//= 1.2 Added item Lost_Belongings to Tiyanak mob & fix wrong item id [Michieru]
+//============================================================
+
+// Cautious Village & Daily Quests :: hi_malaya
+//============================================================
+malaya,266,76,3	script	Rodel the Guard#malaya	4_MAL_SOLDIER,4,4,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if (malaya_hi == 0) {
+		mes "[Rodel the Guard]";
+		mes "Traveling at such confusing times?";
+		mes "Villagers have been feeling more threatened by evil spirits recently.";
+		mes "Villagers are scared and trembling with fear.";
+		next;
+		mes "[Rodel the Guard]";
+		mes "So... the citizens of Port Malaya will feel uncomfortable around you even though there are no hard feelings toward you.";
+		mes "Inns and stops may be closed to outsiders.";
+		next;
+		mes "[Rodel the Guard]";
+		mes "There is no definite solution to this, but you might want to meet Phong in Mumbaki first.";
+		mes "If the village leader gives his confirmation, other people might be less worried.";
+		next;
+		mes "[Rodel the Guard]";
+		mes "I will mark on the map the location of Phong in Mumbaki.";
+		mes "I welcome your visit though the times are harsh.";
+		viewpoint 1, 185, 358, 0, 0x0A82FF;
+		set malaya_hi, 1;
+		setquest 7350;
+		close;
+	} else if (malaya_hi == 1) {
+		mes "[Rodel the Guard]";
+		mes "Meet with Phong in Mumbaki first.";
+		mes "If you are proven to have a pure soul, other villagers will not avoid you.";
+		mes "If you are not sure of the location, I will mark it on your map.";
+		viewpoint 1, 185, 358, 0, 0x0A82FF;
+		close;
+	} else if (malaya_hi >= 20) {
+		if (BaseLevel < 100) {
+			mes "[Rodel the Guard]";
+			mes "How is the life here?";
+			mes "People aren't so bad are they?";
+			mes "If you were a little more skillful, there might be a job for you. Right now, you are little bit below the standard.";
+			next;
+			mes "[Rodel the Guard]";
+			mes "If you become stronger,";
+			mes "I was thinking of giving you the extermination mission that's being carried out in the city. What a shame. ";
+			close;
+		}
+		.@playtime = checkquest(7405, PLAYTIME);
+		if (.@playtime == 0) {
+			mes "[Rodel the Guard]";
+			mes "Whew, thanks to you, I have one less thing to worry about.";
+			mes "I will lose less of my things.";
+			mes "Job well done.";
+			next;
+			mes "[Rodel the Guard]";
+			mes "You can come back if you want.";
+			mes "You understand what I mean right?";
+			close;
+		} else if (.@playtime == 2) {
+			erasequest 7405;
+			mes "[Rodel the Guard]";
+			mes "Oh, about Jejeling that you hunted down before.";
+			mes "People traveling in and out of Baryo are happy about it.";
+			mes "If it's not much too much trouble, I'd like to ask for your help one more time.";
+			next;
+			mes "[Rodel the Guard]";
+			mes "You don't have to do it now, just whenever you are comfortable.";
+			mes "Come and find me when you decide.";
+			close;
+		} else {
+			.@hunting = checkquest(7404, HUNTING);
+			if (.@hunting == -1) {
+				mes "[Rodel the Guard]";
+				switch(rand(1, 6)) {
+				case 1:
+					mes "Recently, there have been a few that gained recognition for their bravery among the villagers." + $malayaNames$[0] + ", " + $malayaNames$[3] + ", " + $malayaNames$[5] + "... Isn't that amazing?";
+					break;
+				case 2:
+					mes "Yesterday, I saw someone who was carried off to the hospital after rolling down the stairs at the park. That person went by the name of " + $malayaNames$[1] + ". I wonder if that person is alright.";
+					break;
+				case 3:
+					mes "The one who contributed the most in the Jejeling hunt was " + $malayaNames$[1] + ".";
+					break;
+				case 4:
+					mes "If you are bored, how about you stand guard for me? This is a heck of a job. You have to keep standing like a statue even till the sun rises up above your head.";
+					break;
+				case 5:
+					mes "Have you been alone with a woman inside a Jeepney? Wow that was awkward...  I'm never going to get married at this rate...";
+					break;
+				case 6:
+					mes "Recently among visitors, one became a close friend to me. Do you know " + $malayaNames$[1] + "? Oh, of course you are a good friend as well.";
+					break;
+				}
+				mes "Oh yes, there is a job for you if you are not too busy. Are you interested?";
+				next;
+				mes "[Rodel the Guard]";
+				mes "We are going to organize an extensive Jejeling hunt this time.";
+				mes "Peddlers going in and out of Baryo are always complaining about Jejelings.";
+				next;
+				if (select("Join the Jejeling hunt.:Refuse.") == 2) {
+					mes "[Rodel the Guard]";
+					mes "Is that so? I'm sorry to hear that.";
+					mes "Things would be so much simpler if we had a person like you around.";
+					close;
+				}
+				mes "[Rodel the Guard]";
+				mes "You just have to hunt 20 jejelings each.";
+				mes "It would be a simple task for you.";
+				setquest 7404;
+				close;
+			} else if (.@hunting == 0) {
+				mes "[Rodel the Guard]";
+				mes "You have to get rid of 20 Jejelings.";
+				mes "20 should be enough to give those Jejelings a good scare.";
+				close;
+			} else if (.@hunting == 1) {
+				mes "[Rodel the Guard]";
+				mes "Oh, the hunt is over, but you haven't killed all the Jejelings.";
+				mes "Come again if you want another try.";
+				erasequest 7404;
+				close;
+			} else {
+				mes "[Rodel the Guard]";
+				mes "Oh, I have confirmed you got rid of 20 Jejelings.";
+				mes "Here, this is a reward for people who participated in the Jejeling hunt.";
+				next;
+				mes "[Rodel the Guard]";
+				mes "I think there will be more Jejeling hunts in the future. Please join us again next time.";
+//				if (IsPremiumPcCafe == 10)
+					getitem 6497, 2; // Lesser_Agimat
+//				else
+//					getitem 6497, 1; // Lesser_Agimat
+				getexp 200000,200000;
+				erasequest 7404;
+				setquest 7405;
+				if (rand(1))
+					$malayaNames$[1] = strcharinfo(0);
+//				SavePPL Jejellopy
+				close;
+			}
+		}
+	} else {
+		mes "[Rodel the Guard]";
+		mes "Please understand even if people look at you warily.";
+		mes "The ghost have been haunting the people around here.";
+		close;
+	}
+OnTouch:
+	emotion e_gasp;
+	end;
+
+OnInit:
+	// if there are no names set, set some default values
+	if (!getarraysize($malayaNames$)) {
+		$malayaNames$[0] = "unknown";
+		$malayaNames$[1] = "unknown";
+		$malayaNames$[2] = "unknown";
+		$malayaNames$[3] = "unknown";
+		$malayaNames$[4] = "unknown";
+		$malayaNames$[5] = "unknown";
+	}
+	end;
+}
+
+malaya,185,358,3	script	Leader Phong in Mumbaki	4_BARYO_CHIEF,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if (malaya_hi < 2) {
+		mes "[Phong in Mumbaki]";
+		mes "Looks like this soul came across a big body of water.";
+		mes "Young friend.";
+		mes "The reason you found me... yes... I see.";
+		next;
+		mes "[Phong in Mumbaki]";
+		mes "You don't have to say it in words.";
+		mes "The people are overly cautious of you.";
+		mes "Rodel was probably concerned about it, so he sent you here.";
+		next;
+		if (malaya_hi == 0) {
+			mes "[Phong in Mumbaki]";
+			mes "No?";
+			mes "Well then maybe there was some kind of a Spiritual bond between us.";
+			next;
+		}
+		mes "[Phong in Mumbaki]";
+		mes "Nonetheless, good to meet you, young friend.";
+		mes "Don't blame the villagers too much for their attitudes toward you.";
+		next;
+		mes "[Phong in Mumbaki]";
+		mes "We are always surrounded by spirits.";
+		mes "We live with them, praying for peace.";
+		mes "But recently, there has been a problem.";
+		next;
+		mes "[Phong in Mumbaki]";
+		mes "For some unknown reason,";
+		mes "Spirits have been running amok, and evil sprits have been haunting the villagers.";
+		next;
+		mes "[Phong in Mumbaki]";
+		mes "This is the shadow that is cast on this beautiful town.";
+		mes "They are cautious because they don't know when the dark shadow will fall on them.";
+		mes "They visit without warning.";
+		next;
+		mes "^4d4dffPhong in Mumbaki turns his head and dark shadows appear.";
+		mes "People are in panic, everyone trembling with fear.^000000";
+		cutin "malaya_ghost01", 4;
+		next;
+		select("Step toward the shadow.:Draw weapon.");
+		mes "[Phong in Mumbaki]";
+		mes "They have followed the trace of the outsider. ";
+		mes "Don't get to close too them.";
+		mes "Your soul can get absorbed.";
+		next;
+		mes "[Phong in Mumbaki]";
+		mes "Hmm? They are responding.";
+		mes "I don't understand? They look scared as if facing a powerful soul.";
+		mes "This feeling... it can't be...";
+		cutin "malaya_ghost02", 4;
+		next;
+		mes "^4d4dffLike words of Phong in Mumbaki, spirits are responding to something, hesitating.";
+		mes "Observing their reaction, you get closer. The spirits are flustered.^000000";
+		next;
+		cutin "", 255;
+		mes "[Phong in Mumbaki]";
+		mes "Amazing. Holder of a soul so strong and pure...!";
+		mes "The dark spirits have disappeared because of your presence.";
+		next;
+		mes "[Phong in Mumbaki]";
+		mes "I think other villagers would treat you differently now...";
+		mes "Haven't we all witnessed this miracle?";
+		next;
+		mes "[Phong in Mumbaki]";
+		mes "Young friend. Your presence is welcomed anywhere.";
+		mes "The light from your pure soul will protect you from the darkness.";
+		set malaya_hi, 10;
+		if (checkquest(7350) > -1)
+			erasequest 7350;
+		close;
+	} else if (malaya_hi == 10) {
+		mes "[Phong in Mumbaki]";
+		mes "Everyone in the village witnessed how strong and pure your soul is.";
+		mes "Do not be afraid of the dark.";
+		close;
+	} else if (malaya_hi == 11) {
+		mes "[Phong in Mumbaki]";
+		mes "Is there something wrong?";
+		mes "You look disturbed.";
+		mes "Your clothes also look messed up. Was there some kind of trouble?";
+		next;
+		switch (select("Explain what happened.:There is nothing to talk about.")) {
+		case 1:
+			mes "[Phong in Mumbaki]";
+			mes "Is that so?";
+			mes "Ha ha... that is a big problem. ";
+			mes "You must've been concerned.";
+			next;
+			mes "[Phong in Mumbaki]";
+			mes "You know, we were preparing a spiritual protection for ";
+			mes "villagers who are afraid of evil spirits...";
+			mes "but preparation is not going well.";
+			next;
+			mes "[Phong in Mumbaki]";
+			mes "As a temporary solution, how about giving them what they want?";
+			mes "Just pick among the items you have that are unimportant and give them to them.";
+			next;
+			mes "[Phong in Mumbaki]";
+			mes "All they want is inner peace anyways.";
+			mes "They give meaning to little things and find peace within that behavior.";
+			next;
+			mes "[Phong in Mumbaki]";
+			mes "What is really important is the belief that you will be safe as long as you carry that item.";
+			mes "If people can stop being afraid by holding on to your old shirt button, then that button is a Spiritual Protection.";
+			next;
+			mes "^4d4dffAs Mumbaki said, giving out some items to serve as a Spiritual Protection would be a good idea.";
+			mes "What would be adequate as a Spiritual Protection..^000000";
+			next;
+			switch (select("Holy Water!:Holy magical item Blue Gemstone?!:Writing utensils or school supplies")) {
+			case 1:
+				mes "[Phong in Mumbaki]";
+				mes "The name itself suggests holiness.";
+				mes "It was blessed by the Holy Water, yes?";
+				mes "Not bad.";
+				mes "Is there another? Something more persuading would be nice.";
+				next;
+				select("Talk about Blue Gemstone.");
+				mes "[Phong in Mumbaki]";
+				mes "Aha... a stone that disappears after absorbing the curse or magical affect instead of the holder.";
+				mes "Used in holy magic?";
+				mes "Sounds good.";
+				next;
+				break;
+			case 2:
+				mes "[Phong in Mumbaki]";
+				mes "Aha... a stone that disappears after absorbing the curse or magical affect instead of the holder.";
+				mes "Used in holy magic?";
+				mes "But it does not sound so holy though.";
+				next;
+				select("Talk about the Holy Water.");
+				mes "[Phong in Mumbaki]";
+				mes "The name itself suggests holiness.";
+				mes "It was blessed by the Holy Water, yes?";
+				mes "Sounds good.";
+				next;
+				break;
+			case 3:
+				mes "[Phong in Mumbaki]";
+				mes "Hmm? It isn't too bad if you are always going to carry it around.";
+				mes "But I think something that looks more persuading would be better.";
+				next;
+				mes "[Phong in Mumbaki]";
+				mes "It would be better is there is a holy feel to it...";
+				mes "Do you have something that was blessed by your god?";
+				next;
+				select("Holy Water or Blue Gemstone?");
+				mes "[Phong in Mumbaki]";
+				mes "The name itself suggests holiness.";
+				mes "It was blessed by the Holy Water, yes?";
+				mes "Stone that protects the bearer...";
+				mes "Sounds perfect.";
+				next;
+				break;
+			}
+			mes "[Phong in Mumbaki]";
+			mes "Can you find Holy Water and Blue Gemstone that you spoke of?";
+			mes "While I'm working on the Spiritual Protection, you can give out the Holy Artifacts.";
+			next;
+			mes "[Phong in Mumbaki]";
+			mes "People's trust toward you will grow stronger if you do that.";
+			mes "They will trust and listen to you.";
+			mes "Yes, because you will become their heart's savior.";
+			next;
+			mes "^4d4dffListening to Phong in Mumbaki, you decided to give out Holy Water and Blue Gemstone to the villagers.";
+			set malaya_hi, 12;
+			erasequest 7358;
+			setquest 7351;
+			close;
+		case 2:
+			mes "[Phong in Mumbaki]";
+			mes "Is that so?";
+			mes "Tell me if anything happens.";
+			mes "For you, it'll be my pleasure to lend you a hand";
+			close;
+		}
+	} else if (malaya_hi == 12) {
+		mes "[Phong in Mumbaki]";
+		mes "Holy Water and Blue Gemstone you spoke of will function well. ";
+		mes "I hope they can set aside their fear and worries this way...";
+		close;
+	} else if (malaya_hi == 13) {
+		mes "[Phong in Mumbaki]";
+		mes "Did you give out your present to everyone?";
+		mes "By doing this, you made friends with everyone in the town.";
+		next;
+		mes "[Phong in Mumbaki]";
+		mes "I found ways to build Spiritual Protection.";
+		mes "My grandchild Imelda will create it.";
+		mes "So don't worry. You don't have to give out any more of your things.";
+		erasequest 7365;
+		set malaya_hi, 20;
+		getexp 200000, 200000;
+//		SavePPL Soul_Protection
+		close;
+	} else {
+		mes "[Phong in Mumbaki]";
+		switch(rand(1, 6)) {
+		case 1:
+			mes "There was a traveler who is as brave as you. The traveler went by the name of " + $malayaNames$[0] + ". Do you know that person?";
+			break;
+		case 2:
+			mes "There is a traveler recently that has been gaining popularity in the village. The traveler's name was " + $malayaNames$[0] + ". Outsiders seem to be very vigorous.";
+			break;
+		case 3:
+			mes "I have never in my life living as a Mumbaki seen a soul as pure and as strong as that of " + $malayaNames$[0] + "'s. Yes, even stronger and purer than yours.";
+			break;
+		case 4:
+			mes "I witnessed a traveler who flipped backward after stepping on a fruit peel. " + $malayaNames$[1] + ". He cried out 'Ouch! Somebody please help~'. We all had a good laugh.";
+			break;
+		case 5:
+			mes "Welcome! Welcome! You are always welcome around here.";
+			break;
+		case 6:
+			mes "I don't know if you are aware of this, but " + $malayaNames$[0] + " even aided Baryo. I feel good to know that there is a one more good soul around.";
+			break;
+		}
+		next;
+		switch (select("Ask for advice.:Bless flowers...")) {
+		case 1:
+			if (malaya_diwata == 2) {
+				mes "[Phong in Mumbaki]";
+				mes "Ferry at the Port?";
+				mes "So that has happened...";
+				mes "Important thing is to first find out why that child is so upset.";
+				next;
+				mes "[Phong in Mumbaki]";
+				mes "In this case, a bribe would work perfectly.";
+				mes "Flowers are always the best choice for seducing woman, right?";
+				next;
+				select("This is not a love consulting.");
+				mes "[Phong in Mumbaki]";
+				mes "I'm just saying.";
+				mes "Dead or alive, that poor soul is just a little girl.";
+				next;
+				mes "[Phong in Mumbaki]";
+				mes "Girls that age will smile even at the falling leaves.";
+				mes "Open her heart with an armful of flowers. ";
+				next;
+				mes "[Phong in Mumbaki]";
+				mes "Let's see...";
+				mes "^4d4dff3 Mystic Flowers, 3 Elegant Flowers, 3 Pretty Flowers^000000 would be enough to make a Bouquet.";
+				next;
+				mes "[Phong in Mumbaki]";
+				mes "Gather these flowers, and I'll make a Bouquet out of it and bless it.";
+				mes "Flowers can be found out side the village.";
+				set malaya_diwata, 3;
+				erasequest 7396;
+				setquest 7397;
+				close;
+			} else if (malaya_diwata == 3) {
+				if ((countitem(6509) < 3) || (countitem(6510) < 3) && (countitem(6511) < 3)) {
+					mes "[Phong in Mumbaki]";
+					mes "There are ^4d4dff3 Mystic Flowers, 3 Elegant Flowers, 3 Pretty Flowers^000000.";
+					mes "Do you understand?";
+					close;
+				}
+				mes "[Phong in Mumbaki]";
+				mes "Oh... I can smell the scent of flowers from here.";
+				mes "I'll gather these and bless them.";
+				next;
+				mes "-Phong in Mumbaki carries out a blessing ceremony after carefully tying flowers into a Bouquet.-";
+				mes "-Just by watching it, holiness overwhelms you.-";
+				next;
+				mes "[Phong in Mumbaki]";
+				mes "Isn't it a beauty?";
+				mes "Not bad for a old man huh?";
+				mes "I made so many Offering Bouquets in the past that I can make one with my eyes closed now.";
+				next;
+				mes "[Phong in Mumbaki]";
+				mes "Now, deliver this to that child.";
+				mes "I hope she opens her heart with this and becomes willing to talk to you.";
+				delitem 6509, 3; // Mysterious_Flower
+				delitem 6510, 3; // Elegant_Flower
+				delitem 6511, 3; // Beautiful_Flower
+				getitem 6506, 1; // Memorial_Bouquet
+				set malaya_diwata, 4;
+				erasequest 7397;
+				setquest 7398;
+				close;
+			} else if (malaya_diwata == 4) {
+				mes "[Phong in Mumbaki]";
+				mes "Take this Bouquet and talk to the spirit that has nested in the boat.";
+				close;
+			} else if (malaya_diwata > 5) {
+				mes "[Phong in Mumbaki]";
+				mes "It is a pity to see a misfortunate spirit... just as with that Ferry incident.";
+				mes "If you are going to offer a Bouquet for a spirit, I'm always willing to help.";
+				close;
+			} else {
+				mes "[Phong in Mumbaki]";
+				mes "There is nothing this old man can tell you.";
+				mes "Nothing can beat staying healthy, right?";
+				close;
+			}
+		case 2:
+			if (checkquest(7402) == -1) {
+				mes "[Phong in Mumbaki]";
+				mes "Who is the floral tribute for?";
+				mes "Don't tell me you're making one in advance cause you're lazy?";
+				mes "A tribute must be sincere. Don't forget that.";
+				close;
+			}
+			if (countitem(6506) > 0) {
+				mes "[Phong in Mumbaki]";
+				mes "Isn't it already made?";
+				mes "What is that in your hand?";
+				mes "Why are you standing around here? Go and give out those flowers.";
+				close;
+			}
+			if ((countitem(6509) < 3) || (countitem(6510) < 3) || (countitem(6511) < 3)) {
+				mes "[Phong in Mumbaki]";
+				mes "Going to Diwata?";
+				mes "You need Mysterious Flowers, Elegant Flowers and Beautiful Flowers, 3 of each, okay?";
+				mes "I'll make it when the flowers are ready.";
+				close;
+			}
+			mes "[Phong in Mumbaki]";
+			mes "Diwata is some woman.";
+			mes "And you going to her every day is something too.";
+			next;
+			mes "[Phong in Mumbaki]";
+			mes "Hey, here's the Bouquet.";
+			mes "Make offerings with your soul and wish for a fruitful day.";
+			delitem 6509, 3; // Mysterious_Flower
+			delitem 6510, 3; // Elegant_Flower
+			delitem 6511, 3; // Beautiful_Flower
+			getitem 6506, 1; // Memorial_Bouquet
+			close;
+		}
+	}
+}
+
+malaya,169,350,5	script	Imelda#malaya	4_M_BRZ_JACI,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if (malaya_hi < 10) {
+		mes "[Imelda]";
+		mes ".... Hmm.";
+		close;
+	} else if (malaya_hi < 20) {
+		mes "[Imelda]";
+		mes "..........";
+		mes "Not bad.";
+		mes "I have my eyes on you. Let's see how you do in this town.. *chuckle*";
+		next;
+		mes "- She is a rather annoying little girl. -";
+		close;
+	} else if (malaya_hi == 20) {
+		mes "[Imelda]";
+		mes "Aren't you the hero who recently got on the villagers good side with the cheap foreign Holy Artifact?";
+		mes "What's up?";
+		next;
+		select ("You want to make a traditional Spiritual Protection?");
+		mes "[Imelda]";
+		mes "Yes. My grandfather found a way.";
+		mes "I'm going to make it.";
+		next;
+		mes "[Imelda]";
+		mes "This is my job and nobody else's.";
+		mes "Protecting traditions is my job.";
+		next;
+		switch (select("Is that so?:Good luck on your own!")) {
+		case 1:
+			if (BaseLevel < 100) {
+				mes "[Imelda]";
+				mes "Of course.";
+				mes "And to get help from someone as... weak as you is not such a good idea.";
+				next;
+				mes "[Imelda]";
+				mes "Getting the materials is not as easy as it sounds.";
+				mes "Maybe when you become stronger, yes, but not now. Never.";
+				close;
+			}
+			mes "[Imelda]";
+			mes "What then?";
+			mes "You're going to get the materials?";
+			mes "Fine I'll accept your proposal.";
+			next;
+			select ("....?!");
+			mes "[Imelda]";
+			mes "If you wanted to help me out so much, why didn't you say so from the beginning?";
+			mes "Or ask my grandfather?";
+			next;
+			mes "[Imelda]";
+			mes "If you are so enthusiastic about making a Spiritual Protection.";
+			mes "I'd have to give up, won't I?";
+			next;
+			mes "[Imelda]";
+			mes "Now, the needed materials are ^4d4dff6 Sharpened Bamboos, 6 Salt bags and 6 Silver Crosses^000000.";
+			next;
+			mes "[Imelda]";
+			mes "You'll have to manufacture the salt yourself at the north western beach.";
+			mes "You'll find the pits I've made there.";
+			next;
+			mes "[Imelda]";
+			mes "Go to Pandoi at the weapon shop for the Silver Crosses.";
+			mes "He promised to make me some.";
+			next;
+			mes "[Imelda]";
+			mes "Sharpened Bamboos you can get at Baryo or from a nearby forest.";
+			mes "You got all that?";
+			next;
+			mes "[Imelda]";
+			mes "Now's the time to prove your prowess!";
+			set malaya_hi, 21;
+			setquest 7366;
+			close;
+		case 2:
+			mes "[Imelda]";
+			mes "Indeed.";
+			mes "I will protect the village!";
+			next;
+			mes "[" + strcharinfo(0) + "]";
+			mes "Now I haven't seen any Spiritual Protections made with those!";
+			mes "Interesting~";
+			mes "I'm sure you'll do just fine~";
+			mes "Ha ha ha ha~";
+			next;
+			mes "[Imelda]";
+			mes "Stop annoying me and go away!";
+			close;
+		}
+	} else if (malaya_hi == 21) {
+		if ((countitem(6501) < 6) || (countitem(6500) < 6) || (countitem(6502) < 6)) {
+			mes "[Imelda]";
+			mes "I'll approve you as worthy if you bring all the materials for the Spiritual Protection!";
+			next;
+			mes "[Imelda]";
+			mes "Manufacture the salt at the north western beach and bamboos grow in Baryo Mahiwaga.";
+			mes "Ask Pandoi to make the Silver Crosses.";
+			mes "Don't forget to get 6 of each.";
+			close;
+		}
+		mes "[Imelda]";
+		mes "... Oh... My, you really did get them?";
+		mes "You're better than I thought.";
+		mes "That was not a compliment at all!";
+		next;
+		mes "[Imelda]";
+		mes "Now I'm going through the holy ritual to make a traditional Spiritual Protection.";
+		mes "Give them to me! And don't bother me during the process!";
+		set malaya_hi, 22;
+		delitem 6500, 6; // Sharp_Bamboo
+		delitem 6501, 6; // Salt_Bag
+		delitem 6502, 6; // Silver_Cross
+		erasequest 7366;
+		setquest 7367;
+		close;
+	} else if (malaya_hi == 22) {
+		.@playtime = checkquest(7367, PLAYTIME);
+		if (.@playtime == 0 || .@playtime == 1) {
+			mes "Imelda is in ritual with a devout aura, compared to when she streamed invectives.";
+			mes "Better not disturb her.";
+			close;
+		} else if (.@playtime == 2) {
+			mes "[Imelda]";
+			mes "Still here?";
+			mes "Of course, you want to see how much better my Spiritual Protection is compared to that cheap Holy Artifact.";
+			next;
+			mes "[Imelda]";
+			mes "Fine.";
+			mes "Now go and give these Spiritual Protections to the people!";
+			mes "You have all the rights to do so!";
+			mes "*Giggles*";
+			next;
+			mes "Took the Spiritual Protection, despite her ridiculous logic and vigor.";
+			mes "Let's give them to the villagers.";
+			set malaya_hi, 23;
+			getitem 6503, 6; // Soul_Protection
+			erasequest 7367;
+			setquest 7368;
+			setquest 7369;
+			setquest 7370;
+			setquest 7371;
+			setquest 7372;
+			setquest 7373;
+			setquest 7374;
+			close;
+		} else {
+			mes "[Imelda]";
+			mes "Don't disturb the ritual and go away.";
+			mes "Please wait while I make the Spiritual Protection.";
+			setquest 7367;
+			close;
+		}
+	} else if (malaya_hi == 23) {
+		mes "[Imelda]";
+		mes "The ones who gets the Spiritual Protections are on the list.";
+		mes "Go and give them the new Spiritual Protections";
+		next;
+		mes "[Imelda]";
+		mes "Such a kind person like yourself  will surely do it, won't you? ";
+		mes "*Smirk*";
+		close;
+	} else if (malaya_hi == 24) {
+		mes "[Imelda]";
+		mes "... You really did what I asked you?";
+		mes "You know what? I give up.";
+		mes "I thought you'd leave after getting something from this town with sweet talk...";
+		next;
+		mes "[Imelda]";
+		mes "I apologize for my rude behavior.";
+		mes "....This is something to go with the apology.";
+		next;
+		mes "[Imelda]";
+		mes "I'd be happy if you could help me, because the Spiritual Protections needs to be made every day.";
+		set malaya_hi, 25;
+		erasequest 7374;
+		erasequest 7379;
+		setquest 7375;
+//		if (IsPremiumPcCafe == 10)
+			getitem 6497, 2; // Lesser_Agimat
+//		else
+//			getitem 6497, 1; // Lesser_Agimat
+		getexp 200000,200000;
+		if (rand(1))
+			$malayaNames$[0] = strcharinfo(0);
+		close;
+	} else {
+		mes "[Imelda]";
+		mes "Hello there.";
+		mes "Did you enjoy the scenery of Malaya?";
+		mes "It's nice to have a chat with friends on a Jeepney.";
+		next;
+		switch (select("I'll help you making Spiritual Protections.:Love and Spiritual Protection for all.")) {
+		case 1:
+			if (checkquest(7380) > -1) {
+				if ((countitem(6501) < 6) || (countitem(6502) < 6) || (countitem(6500) < 6)) {
+					mes "[Imelda]";
+					mes "Materials for making a Spiritual Protection are";
+					mes "Salt Bags, Silver Crosses and Sharpened Bamboos, 6 of each.";
+					next;
+					mes "[Imelda]";
+					mes "Salt form the north western beach, Silver Crosses from Pandoi, and Sharpened Bamboos from near Baryo.";
+					close;
+				}
+				mes "[Imelda]";
+				mes "Yes, you got everything precisely.";
+				mes "Thanks for the help.";
+				next;
+				mes "[Imelda]";
+				mes "It'll be nice if you could help again tomorrow.";
+				mes "Here's something for your trouble.";
+				delitem 6500, 6; // Sharp_Bamboo
+				delitem 6501, 6; // Salt_Bag
+				delitem 6502, 6; // Silver_Cross
+				erasequest 7380;
+				setquest 7381;
+//				if (IsPremiumPcCafe == 10)
+					getitem 6497, 2; // Lesser_Agimat
+//				else
+//					getitem 6497, 1; // Lesser_Agimat
+				getexp 200000,200000;
+				close;
+			} else {
+				.@playtime = checkquest(7381, PLAYTIME);
+				if ((.@playtime == 0) || (.@playtime == 1)) {
+					mes "[Imelda]";
+					mes "I appreciate your kindness, but we have enough for today.";
+					mes "I'll ask for you when I need more materials.";
+					close;
+				} else if (.@playtime == 2) {
+					mes "[Imelda]";
+					mes "Very good timing.";
+					mes "I ran out of materials for today's Spiritual Protections.";
+					mes "Could you go for them now?";
+					erasequest 7381;
+					next;
+					switch (select("Sure.:I need some preparations.")) {
+					case 1:
+						mes "[Imelda]";
+						mes "As usual then.";
+						mes "6 Salt Bags. Silver Crosses and Sharpened Bamboos, please.";
+						setquest 7380;
+						close;
+					case 2:
+						mes "[Imelda]";
+						mes ".......I see.";
+						mes "I'll be waiting then.";
+						close;
+					}
+				} else {
+					mes "[Imelda]";
+					mes "That is great news indeed.";
+					mes "You know what you need for making Spiritual Protections?";
+					mes "Of course, it's not your first time...";
+					next;
+					mes "[Imelda]";
+					mes "I'll leave you to it then.";
+					mes "6 Salt Bags. Silver Crosses and Sharpened Bamboos, please.";
+					setquest 7380;
+					close;
+				}
+			}
+		case 2:
+			if (checkquest(7374) != -1) {
+				if (checkquest(7379) == -1) {
+					mes "[Imelda]";
+					mes "Please deliver these new Spiritual Protections to the villagers.";
+					mes "You know them, right?";
+					close;
+				}
+				mes "[Imelda]";
+				mes "They cannot rely on these Spiritual Protections forever...";
+				mes "It would be much better to have a strong mind such as yours.";
+				next;
+				mes "[Imelda]";
+				mes "Strong spirits are full of light.";
+				mes "Those of the dark cannot approach due the blinding light";
+				next;
+				mes "[Imelda]";
+				mes "I guess that's it for today.";
+				mes "Thank you very much.";
+				setquest 7375;
+				erasequest 7374;
+				erasequest 7379;
+//				if (IsPremiumPcCafe == 10)
+					getitem 6497, 2; // Lesser_Agimat
+//				else
+//					getitem 6497, 1; // Lesser_Agimat
+				getexp 200000,200000;
+				if (rand(1))
+					$malayaNames$[0] = strcharinfo(0);
+				close;
+			} else {
+				.@playtime = checkquest(7375, PLAYTIME);
+				if (.@playtime == 0 || .@playtime == 1) {
+					mes "[Imelda]";
+					mes "The Spiritual Protections given before will still be in effect";
+					mes "It's okay for now.";
+					close;
+				} else if (.@playtime == 2) {
+					mes "[Imelda]";
+					mes "I was wondering when you would drop by.";
+					mes "Could you deliver Spiritual Protections to the folks today?";
+					erasequest 7375;
+					next;
+					if (select("Of course.:Not today.") == 2) {
+						mes "[Imelda]";
+						mes "Yes.";
+						mes "Why not take a stroll in Malaya today?";
+						mes "Of course, you'll still encounter ghosts here and there.";
+						close;
+					}
+					if ((checkquest(7381) == 0) || (checkquest(7381) == 1)) {
+						mes "[Imelda]";
+						mes "Thank you very much.";
+						mes "Come back when you've given them all out.";
+						setquest 7374;
+						setquest 7368;
+						setquest 7369;
+						setquest 7370;
+						setquest 7371;
+						setquest 7372;
+						setquest 7373;
+						getitem 6503, 6; // Soul_Protection
+						close;
+					} else {
+						mes "[Imelda]";
+						mes "Thanks for your concern, but I couldn't make any because I ran out of materials.";
+						mes "Shame, is it not?";
+						mes "I do hope there's somebody willing to get them for me.";
+						close;
+					}
+				} else {
+					mes "[Imelda]";
+					mes "Are you at peace? I could feel your serenity all the way from here.";
+					mes "You want to spend that extra time for me?";
+					next;
+					mes "[Imelda]";
+					mes "Could you give out these Spiritual Protections to the villagers for me?";
+					next;
+					switch (select("Yes.:Not today.") == 2) {
+						mes "[Imelda]";
+						mes "Yes.";
+						mes "Why not take a stroll in Malaya today?";
+						mes "Of course, you'll still encounter ghosts here and there.";
+						close;
+					}
+					if ((checkquest(7381, PLAYTIME) == 0) || (checkquest(7381, PLAYTIME) == 1)) {
+						mes "[Imelda]";
+						mes "Thank you very much.";
+						mes "Come back when you've given them all out.";
+						setquest 7374;
+						setquest 7368;
+						setquest 7369;
+						setquest 7370;
+						setquest 7371;
+						setquest 7372;
+						setquest 7373;
+						getitem 6503, 6; // Soul_Protection
+						close;
+					} else {
+						mes "[Imelda]";
+						mes "Thanks for your concern, but I couldn't make any because I ran out of materials.";
+						mes "Shame, is it not?";
+						mes "I do hope there's somebody willing to get them for me.";
+						close;
+					}
+				}
+			}
+			break;
+		}
+	}
+	end;
+}
+
+malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if (malaya_hi < 10) {
+		mes "[Old Man Nardo]";
+		mes ".......";
+		mes "Not from around here, I see. I have nothing to say.";
+		close;
+	} else if (malaya_hi == 10) {
+		if (checkquest(7353) == 2) {
+			mes "[Old Man Nardo]";
+			mes "How about lending a hand for a poor old man?";
+			mes "I don't care if it's just a sleeve of your shirt, just give me something with your vigor.";
+			next;
+			mes "[Old Man Nardo]";
+			mes "You know, I've not long to go now...";
+			mes "Help me be at peace along the way.";
+			close;
+		} else {
+			mes "[Old Man Nardo]";
+			mes "Y... You!!";
+			mes "You're the young one with such strong spirit to fend off ghosts of darkness?!";
+			mes "Would it be... Possible to share some of your spirit with me?";
+			next;
+			mes "[Old Man Nardo]";
+			mes "I have trouble sleeping because of the mischievous ghosts around town, and my back hurts when it rains.";
+			next;
+			mes "[Old Man Nardo]";
+			mes "Please share that miraculous spirit of yours with me.";
+			mes "How about just a button of yours?";
+			next;
+			mes "-The troubled villagers desire your belongings because you fend off the ghosts. -";
+			setquest 7353;
+			completequest 7353;
+			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+				next;
+				mes "-So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-";
+				set malaya_hi, 11;
+				setquest 7358;
+			}
+			close;
+		}
+	} else if (malaya_hi == 11) {
+		mes "[" + strcharinfo(0) + "]";
+		mes "He'll rake off all my buttons if I talk to him now.";
+		mes "Must counsel with Mumbaki first!";
+		close;
+	} else if (malaya_hi == 12) {
+		if (checkquest(7360) != -1) {
+			mes "[Old Man Nardo]";
+			mes "To be honest, I do not believe that this Holy Artifact has any abilities.";
+			mes "It's just for the peace of mind.";
+			next;
+			mes "[Old Man Nardo]";
+			mes "Nevertheless, I see you differently now";
+			mes "To exclude just because someone's an outsider doesn't seem like a good idea anymore.";
+			mes "I'm sorry I ignored you.";
+			close;
+		}
+		if (!countitem(523) || !countitem(717)) {
+			mes "^4d4dffPrepare and give Blue Gemstone and Holy Water. ^000000";
+			close;
+		}
+		mes "[Old Man Nardo]";
+		mes "So, changed your mind about sharing your spirit?";
+		next;
+		select("Hand over the prepared items.");
+		mes "[Old Man Nardo]";
+		mes "Ahh... Thank you.";
+		mes "Now I can be at peace for some time...";
+		mes "...Peace is always good. Yes.";
+		next;
+		mes "- Gave Holy Water and Blue Gemstone to Old Man Nardo.-";
+		delitem 717, 1; //Blue_Gemstone
+		delitem 523, 1; //Holy_Water
+		setquest 7360;
+		completequest 7360;
+		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+			mes "-With the Old Man as last, enough Holy Artifacts have been given out.-";
+			set malaya_hi, 13;
+			erasequest 7351;
+			setquest 7365;
+		}
+		close;
+	} else if ((malaya_hi > 12) && (malaya_hi < 20)) {
+		mes "[Old Man Nardo]";
+		mes "To be honest, I do not believe that this Holy Artifact has any abilities.";
+		mes "It's just for the peace of mind.";
+		next;
+		mes "[Old Man Nardo]";
+		mes "When you have the time, could you help me out with something?";
+		mes "I'm fine now... I mean later.";
+		close;
+	} else {
+		mes "[Old Man Nardo]";
+		switch(rand(1, 6)) {
+		case 1:
+			mes "Do you know Capre? I hear " + $malayaNames$[1] + " travelers are helping out Capre... Anyhow...";
+			break;
+		case 2:
+			mes "There are plenty of Spiritual Protection these days. " + $malayaNames$[0] + " was keen at giving out Spiritual Protections. Is it a tradition where you come from?";
+			break;
+		case 3:
+			mes "I hear that, between merchants, " + $malayaNames$[1] + "? The name seems to pop up a lot. He seems to be talented in the business.";
+			break;
+		case 4:
+			mes "Once, I saw a traveler who slipped on a piece of fruit. 'Someone help " + $malayaNames$[1] + "~' he shouted, which gave me a good laugh.";
+			break;
+		case 5:
+			mes "Ah, you again? Thanks for the help back then.";
+			break;
+		case 6:
+			mes "I hear that " + $malayaNames$[2] + " is famous in Baryo. Why don't you try for some fame?";
+			break;
+		}
+		mes "What is it?";
+		next;
+		switch (select("Speak.:Give Spiritual Protection.:The Old Man and the Cast Iron Cauldron")) {
+		case 1:
+			mes "[Old Man Nardo]";
+			mes "Port Malaya is a beautiful city.";
+			mes "The old and new are in perfect harmony.";
+			next;
+			mes "[Old Man Nardo]";
+			mes "Of course there's the recent problem with ghosts wondering about...";
+			mes "It relieves me that you and other young people are working hard on it.";
+			mes "Thank you.";
+			close;
+		case 2:
+			if ((checkquest(7374) != -1) && (checkquest(7369) != -1)) {
+				if (!countitem(6503)) {
+					mes "^4d4dffThere's no Spiritual Protection to give to the Old Man.^000000";
+					close;
+				}
+				mes "[Old Man Nardo]";
+				mes "Is this a new Spiritual Protection made from traditional methods?";
+				mes "I am grateful that you'd replace mine with a new one.";
+				mes "I am always in your and Imelda's debt.";
+				next;
+				mes "-Delivered the Spiritual Protection to Old Man Nardo.-";
+				delitem 6503, 1; // Soul_Protection
+				erasequest 7369;
+				setquest 7383;
+				if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+					mes "- With the Old Man as last, all Spiritual Protections have been delivered. Head back to Imelda.-";
+					if (malaya_hi == 23) {
+						set malaya_hi, 24;
+					}
+					setquest 7379;
+					erasequest 7382;
+					erasequest 7383;
+					erasequest 7384;
+					erasequest 7385;
+					erasequest 7386;
+					erasequest 7387;
+				}
+				close;
+			} else {
+				mes "[Old Man Nardo]";
+				mes "What? A new Spiritual Protection?";
+				mes "I'm okay. I still have the one you gave me before.";
+				mes "Could you give me a new one when this one wears out?";
+				close;
+			}
+			break;
+		case 3:
+			if (BaseLevel < 100) {
+				mes "[Old Man Nardo]";
+				mes "Hmm... You don't look strong enough to travel to Baryo.";
+				mes "I'm sorry but I can't let you carry the precious Cast Iron Cauldron.";
+				close;
+			}
+			if ((checkquest(7378, PLAYTIME) == 0) || (checkquest(7378, PLAYTIME) == 1)) {
+				mes "[Old Man Nardo]";
+				mes "You've delivered the Cast Iron Cauldron to Baryo, so that's enough for today.";
+				mes "No matter how strong a cauldron is, even with the toughest cast iron, it only lasts a day.";
+				next;
+				mes "[Old Man Nardo]";
+				mes "Help me out again tomorrow if you can.";
+				close;
+			} else if (checkquest(7378, PLAYTIME) == 2) {
+				mes "[Old Man Nardo]";
+				mes "Hey there!";
+				mes "So, are you well and well fed?";
+				mes "Come back again when you have the time.";
+				next;
+				mes "[Old Man Nardo]";
+				mes "It's about the Cast Iron Cauldron, but it can wait for after your current errand.";
+				erasequest 7378;
+				close;
+			 } else {
+				if (checkquest(7377) != -1) {
+					if (countitem(6503) < 5) {
+						mes "[Old Man Nardo]";
+						mes "Did you deliver the cauldron in one piece?";
+						mes "Kiko in Mumbaki should have given you a Spiritual Protection. Do you have it?";
+						mes "You must have left it somewhere. Go fetch it please.";
+						close;
+					}
+					mes "[Old Man Nardo]";
+					mes "Good. It's the Spiritual Protection promised by Kiko in Mumbaki in return.";
+					mes "I know Imelda makes them and you bring them every day, but more the Spiritual Protections, the better.";
+					next;
+					mes "[Old Man Nardo]";
+					mes "Please stop by again.";
+					mes "I always prepare the Cast Iron Cauldron needed at Baryo.";
+					delitem 6503, 5; // Soul_Protection
+					setquest 7378;
+					erasequest 7377;
+//					if (IsPremiumPcCafe == 10)
+						getitem 6497, 2; // Lesser_Agimat
+//					else
+//						getitem 6497, 1; // Lesser_Agimat
+					getexp 200000,200000;
+					if (!rand(3))
+						$malayaNames$[2] = strcharinfo(0);
+					close;
+				} else {
+					if (checkquest(7376) > -1) {
+						mes "[Old Man Nardo]";
+						mes "Go to Kiko in Mumbaki at Baryo Mahiwaga and deliver the Cast Iron Cauldron.";
+						mes "This should help against the Bakonawa troubles.";
+						close;
+					} else {
+						mes "[Old Man Nardo]";
+						mes "Yes, the Cast Iron Cauldron.";
+						mes "Go to Kiko in Mumbaki at Baryo Mahiwaga and deliver the Cast Iron Cauldron.";
+						mes "I'd like you to do it for me...";
+						next;
+						switch (select("Cast Iron Cauldron??:I'll do it.:I'm busy right now.")) {
+						case 1:
+							mes "[Old Man Nardo]";
+							mes "It's because of the Bakonawa.";
+							mes "Beat the cauldron and the surprised Bakonawa spits back out the moon.";
+							next;
+							mes "[Old Man Nardo]";
+							mes "Baryo Mahiwaga is close to where Bakonawa lives, so they are always prepared for trouble.";
+							next;
+							mes "[Old Man Nardo]";
+							mes "Enough Cast Iron Cauldrons must be prepared for beating.";
+							mes "But the forge is better here.";
+							mes "So I deliver them every day.";
+							close;
+						case 2:
+							mes "[Old Man Nardo]";
+							mes "This is the Cast Iron Cauldron. They have fine blacksmiths in Malaya.";
+							mes "Deliver this to Kiko in Mumbaki at the nearby town of Baryo Mahiwaga.";
+							setquest 7376;
+							getitem 6504, 5; // Cast_Iron_Caldron
+							close;
+						case 3:
+							mes "[Old Man Nardo]";
+							mes "Is that so.";
+							mes "I'm sorry, you must be very busy.";
+							close;
+						}
+					}
+				}
+			}
+			break;
+		}
+	}
+	end;
+}
+
+malaya,224,267,3	script	Romel#malaya	4_M_MAYOR,{
+	if (malaya_hi < 10) {
+		mes "[Romel]";
+		mes ".........";
+		mes " ";
+		mes "(He evades your gaze and ignores you.)";
+		close;
+	} else if (malaya_hi == 10) {
+		if (checkquest(7357) == 2) {
+			mes "[Romel]";
+			mes "....So cold-hearted.";
+			mes "And here we are, always trembling in anxiety...";
+			next;
+			mes "[Romel]";
+			mes "Not even allowed the peace of mind...";
+			close;
+		} else {
+			mes "[Romel]";
+			mes "Ahh....";
+			mes "... You..";
+			mes "I'm sorry I ignored you.";
+			mes "But... you must be the one they're talking about...";
+			next;
+			mes "[Romel]";
+			mes "Are you the one who fends off the ghosts?";
+			mes "If it's okay with you, can I have one of your belongings or some hair?";
+			next;
+			mes "[Romel]";
+			mes "I want to carry it... Like a charm of sort.";
+			next;
+			mes "-The troubled villagers desire your belongings because you fend off the ghosts. -";
+			setquest 7357;
+			completequest 7357;
+			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+				next;
+				mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-";
+				set malaya_hi, 11;
+				setquest 7358;
+			}
+			close;
+		}
+	} else if (malaya_hi == 11) {
+		mes "Romel looks in your way with a sad look.";
+		mes "He'll surely take a hair or pull a sleeve if he had his way!";
+		close;
+	} else if (malaya_hi == 12) {
+		if (checkquest(7364) != -1) {
+			mes "[Romel]";
+			mes "Frankly speaking, it's for the peace of mind.";
+			mes "With it, I could face them with more boldness.";
+			next;
+			mes "[Romel]";
+			mes "I mean, I'm relying on such items,";
+			mes "but I am braver with them.";
+			close;
+		}
+		if (!countitem(523) || !countitem(717)) {
+			mes "^4d4dffPrepare and give Blue Gemstone and Holy Water. ^000000";
+			close;
+		}
+		mes "[Romel]";
+		mes "...What is it?";
+		next;
+		select ("Hand him the prepared items");
+		mes "[Romel]";
+		mes "Oh... Thank you.";
+		mes "I can feel your spirit.";
+		mes "This will keep me safe.";
+		next;
+		mes "[Romel]";
+		mes "Hey... Could you give some for my daughter as well?";
+		next;
+		mes "- Gave Romel the prepared Holy Water and Blue Gemstone.-";
+		delitem 717, 1; //Blue_Gemstone
+		delitem 523, 1; //Holy_Water
+		setquest 7364;
+		completequest 7364;
+		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+			mes "-With Romel as last, I think enough Holy Artifacts have been given.-";
+			set malaya_hi, 13;
+			erasequest 7351;
+			setquest 7365;
+		}
+		close;
+	} else if (malaya_hi == 13) {
+		mes "[Romel]";
+		mes "The Holy Artifact is in good hands.";
+		mes "Same with my daughter.";
+		close;
+	} else {
+		mes "[Romel]";
+		mes "Hello there.";
+		switch(rand(1, 6)) {
+		case 1:
+			mes "Ha ha, I had a dream last night, you see, and there was " + $malayaNames$[0] + " in the dream. Ha ha... Strange indeed...";
+			break;
+		case 2:
+			mes "Sometimes, my wife makes these sounds in her sleep. " + $malayaNames$[0] + "... " + $malayaNames$[0] + "... she says. Who is it? Do you know?! Is she possessed by a ghost?";
+			break;
+		case 3:
+			mes  "It's all thanks to " + $malayaNames$[0] + " for changing the atmosphere of the house. It seems like we were saved by the Holy Artifact and Spiritual Protection.";
+			break;
+		case 4:
+			mes  "The people of the neighboring Baryo Mahiwaga are so strong. Even their children play in the forest. I can't imagine myself doing that.";
+			break;
+		case 5:
+			mes  "Without the slightest doubt, the most famous person in town is " + $malayaNames$[2] + ". Even famous in Baryo they say.";
+			break;
+		case 6:
+			mes  "Merchant Woeon says 'Our " + $malayaNames$[1] + " sir/ma'am' 'we " + $malayaNames$[1] + " sir/ma'am' during drinking. I wonder what happened between the two of them?";
+			break;
+		}
+		next;
+		if (select("Give Spiritual Protection:How are things?") == 2) {
+			mes "[Romel]";
+			mes "I am at peace these days.";
+			close;
+		}
+		if ((checkquest(7374) == -1) || (checkquest(7373) == -1)) {
+			mes "[Romel]";
+			mes "A new Spiritual Protection?";
+			mes "The one you gave me before still works fine.";
+			mes "I'm okay for now.";
+			close;
+		}
+		if (!countitem(6503)) {
+			mes "^4d4dffThere are no Spiritual Protections to give to Romel.^000000";
+			close;
+		}
+		mes "[Romel]";
+		mes "A new Spiritual Protection.";
+		mes "I was thinking this one had worn out... Thanks for coming.";
+		mes "This Spiritual Protection will also protect us.";
+		next;
+		mes "- Delivered Romel his Spiritual Protection.-";
+		delitem 6503, 1; // Soul_Protection
+		erasequest 7373;
+		setquest 7387;
+		if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+			mes "- With Romel as last, all Spiritual Protections have been delivered. Head back to Imelda.-";
+			if (malaya_hi == 23) {
+				set malaya_hi, 24;
+			}
+			setquest 7379;
+			erasequest 7382;
+			erasequest 7383;
+			erasequest 7384;
+			erasequest 7385;
+			erasequest 7386;
+			erasequest 7387;
+		}
+		close;
+	}
+	end;
+}
+
+malaya,223,267,5	script	Talah#malaya	4_F_DST_CHILD,{
+	if (malaya_hi < 10) {
+		mes "[Talah]";
+		mes "..........gasp!";
+		mes " ";
+		mes "(When your eyes met with hers, she ran and hid behind her father.)";
+		close;
+	} else if (malaya_hi == 10) {
+		if (checkquest(7356) == 2) {
+			mes "[Talah]";
+			mes "Talah might be taken away tonight.";
+			mes "Scary kids might come to Talah.";
+			next;
+			mes "When Talah tugs at Romel's shirt, Romel looks at you with a sad gaze.";
+			mes "Better do something before they take a button from you...";
+			close;
+		} else {
+			mes "[Talah]";
+			mes "....I..umm... that.....";
+			mes ".........oh... Daddy....";
+			next;
+			mes "[Romel]";
+			mes "Hey, could you give my daughter a button or some hair of yours?";
+			mes "She has trouble sleeping at night .......";
+			next;
+			mes "[Romel]";
+			mes "Wouldn't she be able to sleep well if she had something from you as a lucky charm?";
+			next;
+			mes "- The troubled villagers desire your belongings because you fend off the ghosts. -";
+			setquest 7356;
+			completequest 7356;
+			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+				next;
+				mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki. -";
+				set malaya_hi, 11;
+				setquest 7358;
+			}
+			close;
+		}
+	} else if (malaya_hi == 11) {
+		mes "Talah looks from you to her father with inquisitive eyes.";
+		close;
+	} else if (malaya_hi == 12) {
+		if (checkquest(7363) != -1) {
+			mes "[Talah]";
+			mes "I dont know for sure";
+			mes "but I get a warm feel from them.";
+			mes "Daddy's braver now and that makes Talah stronger too.";
+			close;
+		}
+		if (!countitem(523) || !countitem(717)) {
+			mes "^4d4dffPrepare and give Blue Gemstone and Holy Water. ^000000";
+			close;
+		}
+		mes "[Talah]";
+		mes ".... Can I say hello?";
+		mes "Hello... there...";
+		next;
+		select("Give the prepared items.");
+		mes "[Talah]";
+		mes "Pretty blue stones...!";
+		mes "Oooooh~ They're beautiful!";
+		mes "Is this stone going to keep Talah safe?";
+		next;
+		mes "- Delivered the Holy Water and Blue Gemstone to Talah. -";
+		delitem 717, 1; //Blue_Gemstone
+		delitem 523, 1; //Holy_Water
+		setquest 7363;
+		completequest 7363;
+		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+			mes "-With Talah as last, I think enough Holy Artifacts have been given.-";
+			set malaya_hi, 13;
+			erasequest 7351;
+			setquest 7365;
+		}
+		close;
+	} else if (malaya_hi == 13) {
+		mes "[Talah]";
+		mes "Daddy told me to hold on to the Holy Artifact really tight.";
+		mes "So it keeps away bad ghosts...";
+		close;
+	} else {
+		mes "[Talah]";
+		mes "Hello...";
+		next;
+		if (select("Give Spiritual Protection.:Hi there?") == 2) {
+			mes "[Talah]";
+			mes "...Hey...Thank you.";
+			mes "You're keeping us safe aren't you?";
+			close;
+		}
+		if ((checkquest(7374) != -1) && (checkquest(7372) != -1)) {
+			if (!countitem(6503)) {
+				mes "^4d4dffThere is no Spiritual Protection to give to Talah.^000000";
+				close;
+			}
+			mes "[Talah]";
+			mes "Is this a new Spiritual Protection?";
+			mes "Thank you.";
+			mes "Talah can sleep well now with the Spiritual Protection.";
+			mes "Daddy likes it too.";
+			next;
+			mes "- Delivered new Spiritual Protection to Talah.-";
+			delitem 6503, 1; // Soul_Protection
+			erasequest 7372;
+			setquest 7386;
+			if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+				mes "- With Talah as last, all Spiritual Protections have been delivered. Head back to Imelda. -";
+				if (malaya_hi == 23) {
+					set malaya_hi, 24;
+				}
+				setquest 7379;
+				erasequest 7382;
+				erasequest 7383;
+				erasequest 7384;
+				erasequest 7385;
+				erasequest 7386;
+				erasequest 7387;
+			}
+			close;
+		} else {
+			mes "[Talah]";
+			mes "Umm...";
+			mes "The one you gave before still keeps Talah safe.";
+			mes "I'm okay.";
+			close;
+		}
+	}
+	end;
+}
+
+malaya,62,274,0	script	Sand Trap#malaya	4_SOIL,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if ((checkquest(7366) == -1) && (checkquest(7380) == -1)) {
+		mes "A device to evaporate sea water is buried in the sand...";
+		close;
+	}
+	if (countitem(6501) >= 6) {
+		mes "There's enough salt.";
+		close;
+	}
+	mes "A device to evaporate sea water is installed in the Sand Trap.";
+	next;
+	mes "Salt can be scraped off the dried leaves";
+	mes "someone scattered on the sea water.";
+	close2;
+	progressbar "0xffff00", 5;
+	disablenpc strnpcinfo(0);
+	initnpctimer;
+	getitem 6501, 1; // Salt_Bag
+	mes "[" + strcharinfo(0) + "]";
+	mes "This should be enough.";
+	close;
+
+OnTimer30000:
+	enablenpc strnpcinfo(0);
+	stopnpctimer;
+	end;
+}
+malaya,66,277,0	duplicate(Sand Trap#malaya)	Sand Trap#malaya01	4_SOIL
+malaya,70,282,0	duplicate(Sand Trap#malaya)	Sand Trap#malaya02	4_SOIL
+
+ma_fild01,178,206,0	script	Black Bamboo#malaya	CLEAR_NPC,4,4,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if ((checkquest(7366) == -1) && (checkquest(7380) == -1)) {
+		mes "There's a short and black bamboo tree.";
+		close;
+	}
+	if (countitem(6500) >= 6) {
+		mes "There's enough Sharpened Bamboos...";
+		close;
+	}
+	mes "There's bamboo here with black cane and leaves.";
+	mes "If some of it is cut off and sharpened, I think it will suffice for the Sharpened Bamboo Imelda wanted.";
+	close2;
+	progressbar "0xffff00", 3;
+	disablenpc strnpcinfo(0);
+	initnpctimer;
+	getitem 6500, 1; //Sharp_Bamboo
+	mes "[" + strcharinfo(0) + "]";
+	mes "I knew I could do this!";
+	close;
+OnTouch:
+	if ((checkquest(7366) != -1) || (checkquest(7380) != -1)) {
+		specialeffect EF_LEVEL99_4;
+	}
+	end;
+OnTimer30000:
+	enablenpc strnpcinfo(0);
+	stopnpctimer;
+	end;
+}
+ma_fild01,225,186,0	duplicate(Black Bamboo#malaya)	Black Bamboo#malaya01	CLEAR_NPC,4,4
+ma_fild01,230,244,0	duplicate(Black Bamboo#malaya)	Black Bamboo#malaya02	CLEAR_NPC,4,4
+ma_fild01,174,238,0	duplicate(Black Bamboo#malaya)	Black Bamboo#malaya03	CLEAR_NPC,4,4
+ma_fild01,180,273,0	duplicate(Black Bamboo#malaya)	Black Bamboo#malaya04	CLEAR_NPC,4,4
+ma_fild01,179,145,0	duplicate(Black Bamboo#malaya)	Black Bamboo#malaya05	CLEAR_NPC,4,4
+
+malaya,295,171,3	script	Collection Dealer Woeon	4_M_MALAYA,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if (malaya_hi < 10) {
+		mes "[Woeon]";
+		mes "Urghh... Urgh... I got a headache...";
+		mes "My headache must have been brought to me by you from out of town!";
+		mes "Go away. Shoo, leave!";
+		close;
+	} else if (malaya_hi == 10) {
+		if (checkquest(7355) == 2) {
+			mes "[Woeon]";
+			mes "Now, look here my friend...";
+			mes "This can all be solved by giving me a button.";
+			mes "It doesn't look so expensive either.";
+			close;
+		} else {
+			mes "[Woeon]";
+			mes "Aha! You're the one they're all talking about!";
+			mes "I was kinda rude right? Forget about it!";
+			mes "Yes, do forget...";
+			next;
+			mes "[Woeon]";
+			mes "If you're in dire need, I could get you a job around here you know..";
+			mes ".... Could you give me some of your things?";
+			next;
+			mes "[Woeon]";
+			mes "I heard the rumors about you shooing away the ghosts!";
+			mes "Can't you see my shaking hands from fear of them ghosts?";
+			mes "I'll feel much better if you could just give me a button off your sleeve...";
+			next;
+			mes "- The troubled villagers desire your belongings because you fend off the ghosts. -";
+			setquest 7355;
+			completequest 7355;
+			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+				next;
+				mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-";
+				set malaya_hi, 11;
+				setquest 7358;
+			}
+			close;
+		}
+	} else if (malaya_hi == 11) {
+		mes "[Woeon]";
+		mes "Sigh... Life is so tough these days.";
+		mes "Why did ghosts come along to bother me so.";
+		mes "I wish I had a lucky charm or something...";
+		next;
+		mes "[Woeon]";
+		mes "Why won't you give me one of your belongings so I could keep as a charm?";
+		mes "Come on, one sock could save a man's life, you know.";
+		mes "Cold hearted son of a...";
+		close;
+	} else if (malaya_hi == 12) {
+		if (checkquest(7362) != -1) {
+			mes "[Woeon]";
+			mes "Hmm. Look at my hands.";
+			mes "Less shaky, eh?";
+			mes "Isn't that so?";
+			close;
+		}
+		if (!countitem(523) || !countitem(717)) {
+			mes "^4d4dffPrepare and give Blue Gemstone and Holy Water. ^000000";
+			close;
+		}
+		mes "[Woeon]";
+		mes "Humph! What do you want?";
+		next;
+		select ("Give the prepared items.");
+		mes "[Woeon]";
+		mes "Oh dear... Forget about the thing back there.";
+		mes "You see, I was haunted by another ghost after you left...";
+		mes "No hard feelings..";
+		next;
+		mes "[Woeon]";
+		mes "Is this the source of your spirit?";
+		mes "It feels kinda cool!";
+		mes "Perhaps this will fend off some of them...";
+		next;
+		mes "[Woeon]";
+		mes "Anyway, thanks a lot.";
+		mes "I'll call for you first when a job opens up for you.";
+		next;
+		mes "- Gave Woeon the Holy Water and Blue Gemstone.-";
+		delitem 717, 1; //Blue_Gemstone
+		delitem 523, 1; //Holy_Water
+		setquest 7362;
+		completequest 7362;
+		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+			mes "-With Woeon as last, I think enough Holy Artifacts have been given.-";
+			set malaya_hi, 13;
+			erasequest 7351;
+			setquest 7365;
+		}
+		close;
+	} else if (malaya_hi == 13) {
+		mes "[Woeon]";
+		mes "Now... Let's get back to business.";
+		mes "Thanks to you, I don't see any of those darn ghosts.";
+		mes "Ha ha ha ha ha";
+		close;
+	} else {
+		mes "[Woeon]";
+		mes "Oh, hi there!";
+		next;
+		if (select("Give Spiritual Protection.:The Dealer and his Collection") == 1) {
+			if (((checkquest(7374) == 0) || (checkquest(7374) == 1)) && ((checkquest(7371) == 0) || (checkquest(7371) == 1))) {
+				if (!countitem(6503)) {
+					mes "^4d4dffThere is no Spiritual Protection to give to Woeon.^000000";
+					close;
+				}
+				mes "[Woeon]";
+				mes "Phew~ A new Spiritual Protection?";
+				mes "Is it an officially made protective charm? Imelda does some fine work.";
+				mes "I'm thankful to you as well, of course.";
+				next;
+				mes "-Delivered Spiritual Protection to Woeon.-";
+				delitem 6503, 1; // Soul_Protection
+				erasequest 7371;
+				setquest 7385;
+				if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+					mes "-With Woeon as last, all Spiritual Protections have been delivered.-";
+					if (malaya_hi == 23) {
+						set malaya_hi, 24;
+					}
+					setquest 7379;
+					erasequest 7382;
+					erasequest 7383;
+					erasequest 7384;
+					erasequest 7385;
+					erasequest 7386;
+					erasequest 7387;
+				}
+				close;
+			} else {
+				mes "[Woeon]";
+				mes "Spiritual Protection?";
+				mes "Mine still works fine.";
+				mes "Very effective indeed.";
+				close;
+			}
+		} else {
+			if (BaseLevel < 100) {
+				mes "[Woeon]";
+				mes "Yes, I collect various by-products from monsters.";
+				mes "In fact, I'm collecting Jejellopys here...";
+				next;
+				mes "[Woeon]";
+				mes "It's too much for you.";
+				mes "Things can get pretty ugly around here, you see.";
+				mes "I'll let you have at it once you're stronger, my friend!";
+				close;
+			}
+			if ((checkquest(7392, PLAYTIME) == 0) || (checkquest(7392, PLAYTIME) == 1)) {
+				mes "[Woeon]";
+				mes "Oh, the Jejellopy collecting?";
+				mes "I have enough for today.";
+				mes "Come back again tomorrow.";
+				close;
+			} else if (checkquest(7392, PLAYTIME) == 2) {
+				mes "[Woeon]";
+				mes "Oh, yes yes.";
+				mes "You're going to collect Jejellopy today as well?";
+				mes "I know it's a difficult job... But you do it so well.";
+				erasequest 7392;
+				next;
+				if (select("I'm too busy today.:Leave it to me!") == 1) {
+					mes "[Woeon]";
+					mes "Is that so? So it is then.";
+					mes "Come stop by when you need some work.";
+					close;
+				}
+				mes "[Woeon]";
+				mes "As usual, bring me 30 Jejellopys, please.";
+				mes "You can get them from the Jejelings.";
+				setquest 7391;
+				close;
+			} else {
+				if ((checkquest(7391) == 0) || (checkquest(7391) == 1)) {
+					if (countitem(6498) < 30) {
+						mes "[Woeon]";
+						mes "Hmm? I don't think you have enough.";
+						mes "I asked you for 30 Jejellopys. Business is business I'm afraid.";
+						close;
+					}
+					mes "[Woeon]";
+					mes "Oh, you have the requested numbers?";
+					mes "I'll take them from here.";
+					mes "You have no need for them, right?";
+					next;
+					mes "[Woeon]";
+					mes "So I have all the Jejellopys...";
+					mes "Come back again!";
+					delitem 6498, countitem(6498); //Jejellopy
+					setquest 7392;
+					erasequest 7391;
+//					if (IsPremiumPcCafe == 10)
+						getitem 6497, 2; // Lesser_Agimat
+//					else
+//						getitem 6497, 1; // Lesser_Agimat
+					getexp 200000,200000;
+					set .@memo_name, rand(1,3);
+					if (!rand(3))
+						$malayaNames$[1] = strcharinfo(0);
+					close;
+				} else {
+					mes "[Woeon]";
+					mes "As you can see, I'm a Collection Dealer.";
+					mes "I trade all kinds of monster or animal by-products.";
+					next;
+					mes "[Woeon]";
+					mes "They're used as materials for manufactured goods.";
+					mes "Of course, the most preferred in Port Malaya is from the monster Jejeling..";
+					next;
+					mes "[Woeon]";
+					mes "Jejellopy can be acquired from the Jejeling.";
+					mes "Can you get me 30 Jejellopys?";
+					next;
+					if (select("Yeah, sure.:Nope.") == 2) {
+						mes "[Woeon]";
+						mes "Is that so. Such a shame.";
+						mes "Come back when you need some work.";
+						close;
+					}
+					mes "[Woeon]";
+					mes "Good, I trust you can do it.";
+					mes "Remember, 30 Jejellopys.";
+					setquest 7391;
+					close;
+				}
+			}
+		}
+	}
+	end;
+}
+
+malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if (malaya_hi < 10) {
+		mes "[Pandoi]";
+		mes "...Gasp!";
+		mes "Go... Go away!";
+		close;
+	} else if (malaya_hi == 10) {
+		if (checkquest(7354) == 2) {
+			mes "[Pandoi]";
+			mes "Please..";
+			mes "Couldn't you help a guy out here, just for the sake of it?";
+			mes "Do you really think ignoring me is the best option?!";
+			next;
+			mes "[Pandoi]";
+			mes "Now look here.";
+			mes "Please give me just a peek..";
+			mes "It's just a button...";
+			close;
+		} else {
+			mes "[Pandoi]";
+			mes "Hello there!";
+			mes "I've heard of your prestige.";
+			mes "I was wondering if I could receive something to prove that I've met you in person...";
+			next;
+			mes "[Pandoi]";
+			mes "Oh... You're surprised because I'm suddenly so nice to you.";
+			mes "I heard the news you fought off the ghosts.";
+			mes "That's brilliant!";
+			next;
+			mes "[Pandoi]";
+			mes "With an item of your spirit, it would scare away the ghosts, wouldn't it?";
+			mes "Please, be generous, I beg you...";
+			next;
+			mes "-The troubled villagers desire your belongings because you fend off the ghosts. -";
+			setquest 7354;
+			completequest 7354;
+			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+				next;
+				mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-";
+				set malaya_hi, 11;
+				setquest 7358;
+			}
+			close;
+		}
+	} else if (malaya_hi == 11) {
+		mes "[Pandoi]";
+		mes "Phew... Life is so tough these days.";
+		mes "Why did ghosts come along to bother me so.";
+		mes "I wish I had a lucky charm or something...";
+		next;
+		mes "[Pandoi]";
+		mes "Please...";
+		mes "Couldn't you help a guy out here, just for the sake of it?";
+		mes "Do you really think ignoring me is the best option?!";
+		close;
+	} else if (malaya_hi == 12) {
+		if (checkquest(7361) != -1) {
+			mes "[Pandoi]";
+			mes "Now that I have confidence, the only thing left for me to do is charge to the hospital or field for material!";
+			mes "Bu... But, I'm too scared...";
+			close;
+		}
+		if (!countitem(523) || !countitem(717)) {
+			mes "^4d4dffPrepare and give Blue Gemstone and Holy Water. ^000000";
+			close;
+		}
+		mes "[Pandoi]";
+		mes "Wh, what, you've finally decided to help me?!";
+		mes "You're going to give Pandoi a gift of peace?!";
+		next;
+		select ("Give the prepared items.");
+		mes "[Pandoi]";
+		mes "Great! I knew you'd come back!";
+		mes "Yes... Now that I have some of your spirit, I can rest well at night.";
+		next;
+		mes "- Gave Pandoi the Holy Water and Blue Gemstone.-";
+		delitem 717, 1; //Blue_Gemstone
+		delitem 523, 1; //Holy_Water
+		setquest 7361;
+		completequest 7361;
+		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+			mes "-With Pandoi as last, I think I've given enough Holy Artifacts.-";
+			set malaya_hi, 13;
+			erasequest 7351;
+			setquest 7365;
+		}
+		close;
+	} else if (malaya_hi == 13) {
+		mes "[Pandoi]";
+		mes "Sil... Silver. I need silver, please.";
+		mes "I thought I could get the silver once the ghosts are gone, but I can't...";
+		close;
+	} else {
+		mes "[Pandoi]";
+		switch(rand(1, 6)) {
+		case 1:
+			mes "You know. " + $malayaNames$[1] + ". You are my hero for becoming stronger. I look up to you!";
+			break;
+		case 2:
+			mes "I've seen you, " + $malayaNames$[1] + " beating those Jejelings outside the town. The energy... I... I was so impressed!";
+			break;
+		case 3:
+			mes "You, " + $malayaNames$[0] + ", lit up my soul. It sparkles, you know. No? You don't?";
+			break;
+		case 4:
+			mes "As far as I can see, recently, " + $malayaNames$[1] + " is the most diligent person around. He's like a god of hard work.";
+			break;
+		case 5:
+			mes $malayaNames$[5] + "made a huge discovery. A dragon, they say.";
+			break;
+		case 6:
+			mes "Hello there?!";
+			break;
+		}
+		next;
+		switch (select("Give Spiritual Protection.:Silver Blade.:Silver Cross")) {
+		case 1:
+			if ((checkquest(7374) == -1) || (checkquest(7370) == -1)) {
+				mes "[Pandoi]";
+				mes "I appreciate you taking care of the expiration dates of my Spiritual Protection.";
+				mes "I think mine's good for now. ";
+				mes "When it wear's out, I'll ask you for another one!";
+				close;
+			}
+			if (!countitem(6503)) {
+				mes "^4d4dffThere is no Spiritual Protection to give to Pandoi.^000000";
+				close;
+			}
+			mes "[Pandoi]";
+			mes "Good. A new Spiritual Protection.";
+			mes "It's always good to know that you won't see those black things again!";
+			next;
+			mes "-Delivered Spiritual Protection to Pandoi.-";
+			delitem 6503, 1; // Soul_Protection
+			erasequest 7370;
+			setquest 7384;
+			if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+				mes "-With Pandoi as last, all Spiritual Protections have been delivered.-";
+				if (malaya_hi == 23) {
+					set malaya_hi, 24;
+				}
+				setquest 7379;
+				erasequest 7382;
+				erasequest 7383;
+				erasequest 7384;
+				erasequest 7385;
+				erasequest 7386;
+				erasequest 7387;
+			}
+			close;
+		case 2:
+			if (BaseLevel < 100) {
+				mes "[Pandoi]";
+				mes "Hmm... To make a Silver Blade, you need silver.";
+				mes "I could melt Silver Bracelets to get silver.";
+				mes "Silver Bracelets can be acquired at the hospital.";
+				next;
+				mes "[Pandoi]";
+				mes "However, I don't think you can make it right now. I'm sorry, it's just too much for you!";
+				mes "If you go in there like that... You'll never make it out alive!";
+				close;
+			}
+			.@hunting = checkquest(7393, HUNTING);
+			if (.@hunting == 2) {
+				if (countitem(6508) < 10) {
+					mes "[Pandoi]";
+					mes "Where are the Silver Bracelets?";
+					mes "I know you're invincible...";
+					mes "But I must have a Silver Bracelet to make a Silver Blade.";
+					next;
+					mes "[Pandoi]";
+					mes "10 Silver Bracelets!";
+					mes "Regardless of how many of them you hinder, I need 10 Silver Bracelets!!";
+					mes "Now it is in your hands!";
+					close;
+				}
+				mes "[Pandoi]";
+				mes "Respect, all the way!";
+				mes "You fought them off and brought the Silver Bracelets as well.";
+				next;
+				mes "[Pandoi]";
+				mes "From this day on, I shall try to smelt a new silver weapon..!!";
+				mes "I will pound and beat at them until I am left with a fine silver blade in my hands...!!";
+				next;
+				mes "[Pandoi]";
+				mes "It's not much, but here's something for the troubles you went through to get the Silver Bracelets.";
+				mes "If I fail... I'll ask of you the task again!";
+				delitem 6508, 10; //Silver_Bracelet
+				setquest 7394;
+				erasequest 7393;
+//				if (IsPremiumPcCafe == 10)
+					getitem 6497, 2; // Lesser_Agimat
+//				else
+//					getitem 6497, 1; // Lesser_Agimat
+				getexp 200000,200000;
+				if (!rand(3))
+					$malayaNames$[1] = strcharinfo(0);
+				close;
+			} else if (.@hunting == 0 || .@hunting == 1) {
+				mes "[Pandoi]";
+				mes "The village hospital holds the most hideous things inside.";
+				mes "I'm not sure what exactly... Whatever's in there, I'm not willing to go near it...";
+				next;
+				mes "[Pandoi]";
+				mes "Please get rid of those rumored monsters and get those Silver Bracelets.";
+				mes "You're the only one I can trust!";
+				close;
+			} else {
+				.@playtime = checkquest(7394, PLAYTIME);
+				if (.@playtime == 0 || .@playtime == 1) {
+					mes "[Pandoi]";
+					mes "I still have some silver to smelt.";
+					mes "I'll request more if I fail again.";
+					close;
+				} else if (.@playtime == 2) {
+					erasequest 7394;
+					mes "[Pandoi]";
+					mes "Oh... what am I to do?";
+					mes "I've wasted the precious materials you brought back for me...";
+					next;
+					mes "[Pandoi]";
+					mes "Maybe I'm not supposed to be a blacksmith!";
+					mes "I'm good with crafting silver, though!";
+					next;
+					if (select("I'll get you the materials. Cheer up.:Give up. It's a lot easier when you do.") == 2) {
+						mes "[Pandoi]";
+						mes "... You're right...";
+						mes "I'll never be able to make a Silver Blade...";
+						mes "Give up... I thought you'd cheer me up.. I'm a little disappointed in you.";
+						close;
+					}
+					mes "[Pandoi]";
+					mes "I knew I could count on you!";
+					mes "I knew I could count on you!";
+					mes "10 Silver Bracelets, please.";
+					setquest 7393;
+					next;
+					mes "[Pandoi]";
+					mes "Pandoi will always smile at you~";
+					mes "*Grin*";
+					close;
+				} else {
+					mes "[Pandoi]";
+					mes "Silver Blade!";
+					mes "It's great. Wonderful! The holy blade to carve all evil with one stroke...!";
+					next;
+					mes "[Pandoi]";
+					mes "I want to be a noted blacksmith by making a Silver Blade.";
+					mes "However, I cannot get the materials.";
+					next;
+					mes "[Pandoi]";
+					mes "I heard that they wore silver bracelets as recognition at the hospital.";
+					mes "But when I got there, it was not the hospital that I used to know.";
+					next;
+					mes "[Pandoi]";
+					mes "Could you slay the horrible creepers and get me the Silver Bracelets?";
+					next;
+					if (select("Indeed!:No. Way.") == 2) {
+						mes "[Pandoi]";
+						mes "... You're right...";
+						mes "I'll never make a Silver Blade...";
+						mes "Such plain expression of disgust. You know what? I hate the idea now.";
+						close;
+					}
+					mes "[Pandoi]";
+					mes "I knew it!";
+					mes "Teach those things at the hospital some manners...";
+					mes "And bring back 10 Silver Bracelets, please.";
+					setquest 7393;
+					next;
+					mes "[Pandoi]";
+					mes "Pandoi will always smile at you~";
+					mes "*Grin*";
+					close;
+				}
+			}
+		case 3:
+			mes "[Pandoi]";
+			mes "You need Silver Crosses?";
+			mes "Pandoi will make them for you!";
+			mes "Still, I cannot create something out of the blue, so I'll be needing some silver.";
+			next;
+			mes "[Pandoi]";
+			mes "I could make one Silver Cross for ^4d4dff2 Silver Bracelets^000000 the monsters hold there...";
+			mes "If you have Silver Bracelets, I could make Silver Crosses with them.";
+			next;
+			switch(select("Make 1 Silver Cross:Make 6 Silver Crosses:Input Number:Quit.")) {
+			case 1:
+				set .@amount,1;
+			case 2:
+				if (!.@amount) set .@amount,6;
+				if (countitem(6508) < (.@amount * 2)) {
+					mes "[Pandoi]";
+					mes "You need at least " + (.@amount * 2) + " Silver Bracelets to make " + .@amount + " Silver " + ((.@amount == 1) ? "Cross" : "Crosses") + ".";
+					close;
+				}
+				set .@time,5;
+				break;
+			case 3:
+				mes "[Pandoi]";
+				mes "How many Silver Crosses do you need?";
+				mes "I can make up to 50 at a time.";
+				next;
+				input .@amount;
+				if (.@amount == 0) {
+					mes "[Pandoi]";
+					mes "Don't need Silver Crosses?";
+					mes "Well, I can take a rest then. Ha ha ha ha~";
+					close;
+				} else if (.@amount > 50) {
+					mes "[Pandoi]";
+					mes "A maximum of 50 at a time!";
+					close;
+				}
+				if (countitem(6508) < (2 * .@amount)) {
+					mes "[Pandoi]";
+					mes "To make " + .@amount + " Silver " + ((.@amount == 1) ? "Cross" : "Crosses") + ", I need at least " + (2 * .@amount) + " Silver Bracelets.";
+					close;
+				}
+				set .@time,15;
+				break;
+			case 4:
+				mes "[Pandoi]";
+				mes "I'll be here if you need me!";
+				close;
+			}
+			mes "[Pandoi]";
+			mes "It'll take just a second.";
+			mes "Pandoi can do it in a jiffy!";
+			close2;
+			progressbar "0xffff00", .@time;
+			delitem 6508, .@amount * 2; //Silver_Bracelet
+			getitem 6502, .@amount; // Silver_Cross
+			mes "[Pandoi]";
+			mes "Look at this!";
+			mes "Very nice indeed.";
+			mes "I should've been a craftsman, not a blacksmith!";
+			close;
+		}
+	}
+	end;
+}
+
+malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if (malaya_hi < 10) {
+		mes "[Pedro the Sailor]";
+		mes "Oh... This ship's not in service.";
+		mes "Or rather, it can't set sail. *Snigger*";
+		mes "I'm seeing ghosts. I think it's my time to die.";
+		close;
+	} else if (malaya_hi == 10) {
+		if (checkquest(7352) == 2) {
+			mes "- Pedro the Sailor seems to have given up, but he can't take his gaze off of me.-";
+			close;
+		}
+		mes "[Pedro the Sailor]";
+		mes "Oh, you're th... The one who fends off ghosts at the wave of a hand?!";
+		mes "Could you stay for a bit and hear me out?!";
+		next;
+		if (select("Sorry.:Sure.") == 1) {
+			mes "[Pedro the Sailor]";
+			mes "Oh, a solid denial.";
+			mes "You just impaled my last glimpse of hope.";
+			mes "Maybe I wasn't persuasive enough...";
+			close;
+		}
+		mes "[Pedro the Sailor]";
+		mes "Straight to the point, this town is a den of ghosts!";
+		mes "Sigh... I've been a sailor for quite a while and went to a lot of places, but this I never experienced before.";
+		next;
+		mes "[Pedro the Sailor]";
+		mes "You see that ship there?";
+		mes "It's a small ferry, but it also stopped service because of these darn ghosts!";
+		next;
+		mes "[Pedro the Sailor]";
+		mes "It looks okay from the outside, but it's full of ghost, I tell ya.";
+		mes "But the way I heard it, they're afraid of you, right?";
+		next;
+		select ("Oh no, you too...:Not my buttons!");
+		mes "[Pedro the Sailor]";
+		mes "I see many have already asked you for some of your stuff for charms, huh.";
+		mes "Can I budge in that line too?";
+		next;
+		mes "[Pedro the Sailor]";
+		mes "I need to have some sincere conversations with that ghost over there.";
+		mes "But the spirit is too strong for me to approach.";
+		next;
+		mes "[Pedro the Sailor]";
+		mes "...........That was a lame story.";
+		mes "And it's not easy to give away your stuff to someone else.";
+		next;
+		mes "- Pedro the Sailor seems to have given up, but he can't take his gaze off of me.-";
+		setquest 7352;
+		completequest 7352;
+		if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+			next;
+			mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki. -";
+			set malaya_hi, 11;
+			setquest 7358;
+		}
+		close;
+	} else if (malaya_hi == 11) {
+		mes "[Pedro the Sailor]";
+		mes "Sigh...";
+		mes "This is so awkward.";
+		close;
+	} else if (malaya_hi == 12) {
+		if (checkquest(7359) != -1) {
+			mes "[Pedro the Sailor]";
+			mes "Anyway, now that I have what they hate...";
+			mes "Now's the time to charge into my ship...!";
+			close;
+		}
+		if (!countitem(523) || !countitem(717)) {
+			mes "^4d4dffPrepare and give Blue Gemstone and Holy Water.^000000";
+			close;
+		}
+		mes "[Pedro the Sailor]";
+		mes "What? I can sense something refreshing in your hands. What is it?";
+		next;
+		mes "[Pedro the Sailor]";
+		mes "You're giving it to me?";
+		mes "Ghosts will hate it?";
+		mes "That's wonderful news!";
+		next;
+		mes "[Pedro the Sailor]";
+		mes "Pedro, at your service!";
+		mes "After you're finished with the ghosts here, I'll take on my ship to the end of the world!";
+		next;
+		mes "- Gave Pedro the Sailor the Holy Water and Blue Gemstone. -";
+		delitem 717, 1; //Blue_Gemstone
+		delitem 523, 1; //Holy_Water
+		setquest 7359;
+		completequest 7359;
+		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+			mes "-With Pedro the Sailor as last, I think I gave enough Holy Artifacts.-";
+			set malaya_hi, 13;
+			erasequest 7351;
+			setquest 7365;
+		}
+		close;
+	} else if (malaya_hi == 13) {
+		mes "[Pedro the Sailor]";
+		mes "Anyway, now that I have what they hate...";
+		mes "Now's the time to charge into my ship...!";
+		next;
+		mes "-Pedro the Sailor looks determined.-";
+		close;
+	} else {
+		mes "[Pedro the Sailor]";
+		mes "Whoa... Did you see that?";
+		mes "Those black souls just came up and disappeared.";
+		mes "Well, living the dream, eh?";
+		next;
+		if (select("Give Spiritual Protection.:About the Ferry Ride") == 1) {
+			if ((checkquest(7374) == -1) || (checkquest(7368) == -1)) {
+				mes "[Pedro the Sailor]";
+				mes "The Spiritual Protection you gave me before works fine.";
+				mes "I'm good for now.";
+				mes "It's still up for the fight!";
+				close;
+			}
+			if (!countitem(6503)) {
+				mes "^4d4dffThere is no Spiritual Protection to give to Pedro the Sailor.^000000";
+				close;
+			}
+			mes "[Pedro the Sailor]";
+			mes "A newly made Spiritual Protection.";
+			mes "Alright. I'll go at them with this one today.";
+			next;
+			mes "-Delivered the Spiritual Protection to Pedro the Sailor.-";
+			delitem 6503, 1; // Soul_Protection
+			erasequest 7368;
+			setquest 7382;
+			if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+				mes "-With Pedro the Sailor as last, all Spiritual Protections have been delivered.-";
+				if (malaya_hi == 23) {
+					set malaya_hi, 24;
+				}
+				setquest 7379;
+				erasequest 7382;
+				erasequest 7383;
+				erasequest 7384;
+				erasequest 7385;
+				erasequest 7386;
+				erasequest 7387;
+			}
+			close;
+		}
+		if (BaseLevel < 100) {
+			mes "[Pedro the Sailor]";
+			mes "Hmm... Don't you remember me talking about ghosts?";
+			mes "The Ferry is full of ghosts.";
+			mes "Wait, was it one or many?";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "Whatever. For you and your current condition, it's out of the question.";
+			mes "Yes. You can't do it. You'll be dragged out in a body bag.";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "Now I'm not going to stand here and wait for that to happen. No way.";
+			close;
+		}
+		if (malaya_diwata == 0) {
+			mes "[Pedro the Sailor]";
+			mes "I'm sorry, but didn't I say something about ghosts over there?";
+			mes "It can't set sail because of that.";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "So what's this whole ghost story about?";
+			mes "Hmmm..........";
+			mes "It's a long story...";
+			next;
+			if (select("I'm listening.:Maybe later.") == 2) {
+				mes "[Pedro the Sailor]";
+				mes "I knew it.";
+				mes "Though, it's not such a boring story.";
+				mes "After all, it is a ghost story.";
+				close;
+			}
+			mes "[Pedro the Sailor]";
+			mes "The story goes back to when I first made port here.";
+			mes "It was a nerve racking first time as a liner manager.";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "I was ready to disembark when I saw something I simply could not believe.";
+			mes "Black haze was swarming to the port from all over town.";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "At first, I thought it was just a very thick smog.";
+			mes "As the days went by, it became clear as to what it was.";
+			mes "It was a swarm of souls.";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "A very unpleasant group of souls indeed.";
+			mes "Some were wailing some horrible cries around the Ferry about to set sail...";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "After that incident, that ship stayed on that spot until this day.";
+			mes "Why? Because they took over the ship! It's haunted!";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "If you don't believe me, see for yourself.";
+			mes "Then you'll believe me.";
+			set malaya_diwata, 1;
+			setquest 7395;
+			close;
+		} else if (malaya_diwata == 1) {
+			mes "[Pedro the Sailor]";
+			mes "If you want to know, go and see for yourself and get on it.";
+			close;
+		} else if (malaya_diwata == 2) {
+			mes "[Pedro the Sailor]";
+			mes "Soul of a Little Girl?";
+			mes "What about all them bullying ones?";
+			mes "They came and went?";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "I don't understand.";
+			mes "Maybe the Leader Mumbaki will know what to do.";
+			close;
+		} else if (malaya_diwata == 3) {
+			mes "[Pedro the Sailor]";
+			mes "Hmm... A floral tribute to soothe the soul....";
+			mes "You want to hear its story after it calms down?";
+			mes "Well... Good luck.";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "It can't be helped for the Ferry to set sail again.";
+			mes "I can't go near it because of those mean ones.";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "Now I'm asking you to do this not because I can't be bothered,";
+			mes "but because I simply can't do it myself.";
+			close;
+		} else if (malaya_diwata == 4) {
+			mes "[Pedro the Sailor]";
+			mes "Did Mumbaki bless the flower?";
+			mes "I hope this works...";
+			mes "I wish you all the luck!!";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "I hope you can negotiate with success!";
+			mes "I'll take care of those rude ones outside the ship the best I can.";
+			close;
+		} else if (malaya_diwata == 5) {
+			mes "[Pedro the Sailor]";
+			mes "I see.";
+			mes "Perhaps the Ferry can move again...";
+			mes "Thank you for all you've done for us.";
+			next;
+			mes "[Pedro the Sailor]";
+			mes "I'd better get ready to set sail then.";
+			mes "It's not much, but this is for you.";
+			mes "If we can get back in business, I'll take you to Izlude for just 1000z.";
+			set malaya_diwata, 6;
+			erasequest 7399;
+			setquest 7401;
+//			if (IsPremiumPcCafe == 10)
+				getitem 6497, 2; // Lesser_Agimat
+//			else
+//				getitem 6497, 1; // Lesser_Agimat
+			getexp 200000,200000;
+			if (!rand(3))
+				$malayaNames$[0] = strcharinfo(0);
+			close;
+		} else {
+			.@playtime = checkquest(7401, PLAYTIME);
+			if (.@playtime == 0 || .@playtime == 1) {
+				mes "[Pedro the Sailor]";
+				mes "If you want to go to Alberta, use the big ship over there.";
+				mes "This little one goes to Izlude.";
+				mes "That will be 1000z.";
+				next;
+				if (select("Use.:That's a rip off!") == 2) {
+					mes "[Pedro the Sailor]";
+					mes "What?!";
+					mes "How much do you pay for the Alberta Liner to get here!?";
+					mes "Call this a rip off... You think I'm doing charity?";
+					close;
+				}
+				if (Zeny < 1000) {
+					mes "[Pedro the Sailor]";
+					mes "The price is 1000 zeny.";
+					mes "I can't help you there~";
+					close;
+				}
+				mes "[Pedro the Sailor]";
+				mes "Thank you~";
+				mes "Let's go before the ghosts come back!";
+				Zeny -= 1000;
+				close2;
+				warp "izlude",195,180;
+				end;
+			} else if (.@playtime == 2) {
+				erasequest 7401;
+				goto L_SetQuest;
+			} else {
+				if (checkquest(7403) == -1) {
+					if (checkquest(7402) == -1) {
+						goto L_SetQuest;
+					}
+					mes "[Pedro the Sailor]";
+					mes "You know what to do.";
+					mes "Gather the flowers and take it to Mumbaki to get an Offering Bouquet made.";
+					next;
+					mes "[Pedro the Sailor]";
+					mes "Give the Bouquet to Miss Diwata to cheer her up.";
+					mes "....Thank you.";
+					close;
+				}
+				mes "[Pedro the Sailor]";
+				mes "Diwata is calm!";
+				mes "I can even feel the difference out here.";
+				mes "I am always in your debt.";
+				next;
+				mes "[Pedro the Sailor]";
+				mes "You know what? Why don't you do this on a more regular basis?";
+				mes "I think you kind of like doing it.";
+				setquest 7401;
+				erasequest 7403;
+//				if (IsPremiumPcCafe == 10)
+					getitem 6497, 2; // Lesser_Agimat
+//				else
+//					getitem 6497, 1; // Lesser_Agimat
+				getexp 200000,200000;
+				if (!rand(3))
+					$malayaNames$[0] = strcharinfo(0);
+				close;
+			}
+		}
+	}
+	end;
+
+L_SetQuest:
+	mes "[Pedro the Sailor]";
+	mes "Ah, the thing is...";
+	mes "We can't go right now..";
+	mes "You see, the ghosts are back...";
+	mes "I'm fed up with nuisance.";
+	next;
+	mes "[Pedro the Sailor]";
+	mes "I mean... Miss Diwata... Isn't feeling very well and, even with the Spiritual Protection";
+	mes "a normal person can't stand it.";
+	next;
+	if (select("I see. Take care then.:How about a Floral Tribute?") == 1) {
+		mes "[Pedro the Sailor]";
+		mes "I'm glad you understand.";
+		mes "Sigh...";
+		close;
+	}
+	mes "[Pedro the Sailor]";
+	mes "Hmmm. That would be nice.";
+	mes "If she can be soothed with flowers...!";
+	mes "Good luck.";
+	setquest 7402;
+	close;
+}
+
+ma_in01,125,107,3	script	Ghost Diwata	G_SKOGUL,4,4,{
+	end;
+OnTouch:
+	if (malaya_diwata == 0) {
+		cutin "malaya_diwata01", 2;
+		mes "- A creepy Little Girl is standing.";
+		mes "As our eyes meet, a chill runs down my spine with goose bumps all over. -";
+		next;
+		mes "[Diwata]";
+		mes "Are you here to bully Diwata too?";
+		mes "I won't have it!";
+		next;
+		cutin "", 255;
+		mes "-I was thrown out after the Little Girl's low creepy voice and flash from her eyes.-";
+		close;
+		warp "malaya", 324, 66;
+		end;
+	} else if (malaya_diwata == 1) {
+		cutin "malaya_diwata01", 2;
+		mes "- A creepy Little Girl is standing.";
+		mes "As our eyes meet, a chill runs down my spine with goose bumps all over. -";
+		next;
+		mes "[Diwata]";
+		mes "Are you here to bully Diwata too?";
+		mes "I won't have it!";
+		next;
+		select ("Wait! I just want to talk!");
+		mes "[Diwata]";
+		mes "Then who are they behind you?";
+		mes "You're one of them!";
+		next;
+		cutin "malaya_ghost01", 4;
+		mes "- Familiar souls are approaching Diwata. -";
+		next;
+		if (select("It's a misunderstanding!:You're from that..!") == 2) {
+			cutin "malaya_ghost02", 4;
+			mes "[" + strcharinfo(0) + "]";
+			mes "Just as I thought! You're afraid of me?!";
+			mes "Stand aside!";
+			mes "I need to talk to her.";
+			next;
+			cutin "malaya_diwata01", 2;
+			mes "[Diwata]";
+			mes "I don't know why they're backing away...";
+			mes "You get out of my sight too!";
+			next;
+			cutin "", 255;
+			mes "-I was thrown out after the Little Girl's annoyed cry and flash from her eyes.-";
+			set malaya_diwata, 2;
+			setquest 7396;
+			erasequest 7395;
+			close2;
+			warp "malaya", 324, 66;
+			end;
+		}
+		cutin "malaya_diwata01",2;
+		mes "[Diwata]";
+		mes "Enough!";
+		next;
+		cutin "", 255;
+		mes "-I was thrown out after the Little Girl's resolute cry and flash from her eyes.-";
+		set malaya_diwata, 2;
+		setquest 7396;
+		erasequest 7395;
+		close2;
+		warp "malaya", 324, 66;
+		end;
+	} else if ((malaya_diwata == 2) || (malaya_diwata == 3)) {
+		cutin "malaya_diwata01", 2;
+		mes "[Diwata]";
+		mes "You crawled back in?";
+		mes "Get out-!!!!!";
+		next;
+		cutin "", 255;
+		mes "-I was thrown out after the Little Girl's screeching cry and flash from her eyes.-";
+		close;
+		warp "malaya", 324, 66;
+		end;
+	} else if (malaya_diwata == 4) {
+		if (!countitem(6506)) {
+			cutin "malaya_diwata01", 2;
+			mes "- The soul of Little Girl Diwata is looking at me fiercely.";
+			mes "No Offering Bouquet...!!!";
+			next;
+			cutin "", 255;
+			mes "-I was thrown out with a remote look from her.-";
+			close;
+			warp "malaya", 324, 66;
+			end;
+		}
+		mes "- The soul of Little Girl Diwata is looking at me fiercely. -";
+		mes "- The Offering Bouquet... -";
+		cutin "malaya_diwata01", 2;
+		next;
+		if (select("Throw it to the Little Girl.:Slide it across on the floor.") == 1) {
+			mes "- I threw the bouquet before she could toss me out, and she catches in surprise...";
+			mes "She won't toss me... far, now that she has the flower.-";
+		} else {
+			mes "- I slid the flower across the floor to her. She looks puzzled. -";
+		}
+		next;
+		mes "[Diwata]";
+		mes "What is the meaning of this?";
+		mes "You're not an enemy?";
+		next;
+		mes "[Diwata]";
+		mes "What? You're an outsider too?";
+		mes "Ha, so live ones are allowed and I'm not?";
+		next;
+		mes "[Diwata]";
+		mes "Now there's the stereotype of countryside people over outsiders.";
+		mes "I am so annoyed. I feel like wiping them off the map.";
+		next;
+		mes "[Diwata]";
+		mes "What? I shouldn't?";
+		mes "Why should I not?";
+		mes "I'm stalling the ship?";
+		next;
+		mes "[Diwata]";
+		mes "I was going to hear you out because of the flowers";
+		mes "but you're telling me lies?!";
+		next;
+		mes "[Diwata]";
+		mes "So you're saying that I brought these hillbillies on this ship";
+		mes "and that fighting with them is causing the stall?";
+		next;
+		mes "[Diwata]";
+		mes "... Hmm... Humph. It wasn't what I was intending to do.";
+		mes "But they're the ones who're getting on my nerves!";
+		next;
+		mes "[Diwata]";
+		mes "... I can't get off anyway.";
+		mes "Which means that I could feel bad again. Got it?";
+		next;
+		mes "[Diwata]";
+		mes "... I'll try to keep it in today.";
+		mes "It's not because I like the flowers or because I like having company!";
+		mes "It's because I was treated the same way as those cheap ghosts!";
+		next;
+		mes "[Diwata]";
+		mes "Now if you'll excuse me.";
+		mes "And I'll be clear. I'm not going to hold my temper for so long.";
+		next;
+		mes "[Diwata]";
+		mes "Now, g... go away!";
+		set malaya_diwata, 5;
+		delitem 6506, 1; // Memorial_Boquet
+		erasequest 7398;
+		setquest 7399;
+		close;
+	} else if (malaya_diwata == 5) {
+		cutin "malaya_diwata02", 2;
+		mes "[Diwata]";
+		mes "I promise I'll be a good little girl if those hillbillies leave me alone.";
+		mes "If they bother me again, however, I won't be.";
+		close;
+	} else {
+		if (checkquest(7402) == -1) {
+			if (checkquest(7403) == -1) {
+				if ((checkquest(7401, PLAYTIME) == 0) || (checkquest(7401, PLAYTIME) == 1)) {
+					cutin "malaya_diwata02", 2;
+					mes "[Diwata]";
+					mes "Surprisingly enough, I'm doing fine.";
+					mes "Of course I'm tense for when they return,";
+					mes "but, as always, I'll win.";
+					next;
+					mes "[Diwata]";
+					mes "Then the poor crew will cry again";
+					mes "I just can't calm myself down after a fight.";
+					next;
+					mes "[Diwata]";
+					mes "The flowers you bring makes me calm down.";
+					mes "....";
+					mes ".. It's not because I miss people or I like the flowers. Don't take it the wrong way.";
+					close;
+				}
+				cutin "malaya_diwata01", 2;
+				mes "[Diwata]";
+				mes "Get lost!";
+				mes "What? Oh, it's you.";
+				mes "Those hillbillies came back again!";
+				mes "I'm going to kill them!";
+				close;
+			}
+			cutin "malaya_diwata02", 2;
+			mes "[Diwata]";
+			mes "It's good to look at flowers from abroad~";
+			mes "Do all flowers from the warm parts of the world smell so nice?";
+			next;
+			mes "[Diwata]";
+			mes "The flowers you bring makes me calm down.";
+			mes "....";
+			mes ".. It's not because I miss people or I like the flowers. Don't take it the wrong way.";
+			close;
+		}
+		cutin "malaya_diwata01", 2;
+		mes "[Diwata]";
+		mes "Darn it! Have you come for more?!";
+		mes "What?";
+		mes "Oh. It's you?";
+		mes "I'm really depressed right now.";
+		next;
+		mes "- Diwata reached her hands out as if expecting something. -";
+		next;
+		if (select("Give the Bouquet.:Hold her hand.") == 2) {
+			mes "[Diwata]";
+			mes "What do you think you're doing?!!??!?!!";
+			mes "Arghhhh - I have enough creeps around here, thank you!!";
+			next;
+			cutin "", 255;
+			mes "-I was tossed out with Diwata's thunderous cry.-";
+			close;
+			warp "malaya", 324, 66;
+			end;
+		}
+		if (!countitem(6506)) {
+			mes "[Diwata]";
+			mes "What? You want me to wave?";
+			mes "You didn't bring it?";
+			mes "You didn't?!?";
+			mes "Arghhh you just can't trust anybody! Anybody!";
+			next;
+			cutin "", 255;
+			mes "-I was tossed out with Diwata's thunderous cry.-";
+			close;
+			warp "malaya", 324, 66;
+			end;
+		}
+		cutin "malaya_diwata02", 2;
+		mes "[Diwata]";
+		mes "... Oh... Just as I thought!";
+		mes "My only happiness, my only peace of mind..!";
+		mes "Flowers from abroad~!";
+		next;
+		mes "-Diwata seems to feel better. The atmosphere shifts to a more refreshing ambience.-";
+		next;
+		mes "[Diwata]";
+		mes "Tell Pedro the Sailor!";
+		mes "Diwata will be a goddess of sea, so set sail in my generosity.";
+		delitem 6506, 1; // Memorial_Boquet
+		setquest 7403;
+		erasequest 7402;
+		close;
+	}
+	cutin "", 255;
+	end;
+}
+
+ma_fild01,261,208,2	script	Kiko in Mumbaki	4_BARYO_CHIEF,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	mes "[Kiko in Mumbaki]";
+	mes "Welcome to Baryo, stranger.";
+	mes "I am the soul guidance, protector of people and souls here at Baryo.";
+	mes "So, I'm a good leader Kiko in Mumbaki.";
+	next;
+	switch (select("Give Cast-Iron Caldron.:Request Purification Ritual.:Exchange Jellopy for gold.")) {
+		case 1:
+			if (checkquest(7376) == -1) {
+				if (checkquest(7377) == -1) {
+					mes "[Kiko in Mumbaki]";
+					mes "What cauldron?";
+					mes "As far as I know, you're not the one bringing it.";
+					next;
+					mes "[Kiko in Mumbaki]";
+					mes "Poor thing.";
+					mes "do not live a life of lies.";
+					close;
+				}
+				mes "[Kiko in Mumbaki]";
+				mes "Baryo is not a great place for smithy work.";
+				mes "So we always ask a favor to the forge of Malaya.";
+				next;
+				mes "[Kiko in Mumbaki]";
+				mes "Bakonawa does not like loud noises.";
+				mes "That's why we beat the sturdy Cast Iron Cauldrons.";
+				next;
+				mes "[Kiko in Mumbaki]";
+				mes "The Spiritual Protection is proof that I've got my cauldron,";
+				mes "so deliver it well. Okay? Good.";
+				close;
+			}
+			if (countitem(6504) < 5) {
+				mes "[Kiko in Mumbaki]";
+				mes "Oh, must be the cauldron I ordered.";
+				mes "But, where is it?";
+				mes "Are you mocking me?!";
+				close;
+			}
+			mes "[Kiko in Mumbaki]";
+			mes "Yes, excellent!";
+			mes "Very Good.";
+			mes "We can aggravate the Bakonawa more with this.";
+			next;
+			mes "[Kiko in Mumbaki]";
+			mes "I'll give you this for the cauldron.";
+			mes "I hear you're having some trouble with souls?";
+			mes "Take this. It will help you.";
+			delitem 6504, 5; // Cast_Iron_Caldron
+			getitem 6503, 5; // Soul_Protection
+			setquest 7377;
+			erasequest 7376;
+			close;
+		case 2:
+			if (checkquest(7406) == -1) {
+				if (checkquest(7407) == -1) {
+					mes "[Kiko in Mumbaki]";
+					mes "The only purification needed in this village is Vantai's food.";
+					mes "There are no rituals where an outsider, like yourself, can take part in.";
+					close;
+				}
+				mes "[Kiko in Mumbaki]";
+				mes "Vantai must be hungry.";
+				mes "Go give it to him.";
+				mes "Quickly now.";
+				close;
+			}
+			if ((countitem(523) < 10) || (countitem(6507) < 10)) {
+				mes "[Kiko in Mumbaki]";
+				mes "Purification of the bones the Guard Dog Vantai needs to gnaw on?";
+				mes "My work here just gets better and better.";
+				next;
+				mes "[Kiko in Mumbaki]";
+				mes "Go into the forest and fetch me ^4d4dff10 Evil Spirit Bones^000000 and ^4d4dff10 Holy Waters^000000 for the purification ritual.";
+				mes "I'll do the ritual myself.";
+				close;
+			}
+			mes "[Kiko in Mumbaki]";
+			mes "Bones from the animals of this forest all have bad spirits within.";
+			mes "Of course it cannot be helped due to the malignant spirits flailing about...";
+			next;
+			mes "[Kiko in Mumbaki]";
+			mes "You do this and do this here and there and...";
+			mes "There. The evil spirit has left and the bone is so pure that you can just chew on it.";
+			next;
+			mes "[Kiko in Mumbaki]";
+			mes "Now, take this back to Dong the Guard.";
+			mes "Vantai will become stronger after eating this purified Evil Spirit Bone.";
+			next;
+			mes "[Kiko in Mumbaki]";
+			mes "Moreover, holding on to Evil Spirit Bones will only do you harm,";
+			mes "so I'll take them all to purify.";
+			delitem 6507, countitem(6507); // Evil_Bone
+			delitem 523, 10; //Holy_Water
+			getitem 6505, 10; //Purified_Bone
+			setquest 7407;
+			erasequest 7406;
+			close;
+		case 3:
+			mes "[Kiko in Mumbaki]";
+			mes "Oh no you don't!";
+			mes "Don't you dare!";
+			close;
+	}
+	end;
+}
+
+ma_fild01,239,253,3	script	Dhong the Guard	4_MAL_SOLDIER,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	mes "[Dhong the Guard]";
+	mes "Hi there!";
+	mes "Welcome to Baryo.";
+	next;
+	if (select("You're job seems so hard~:Guard Dog Vantai") == 1) {
+		mes "[Dhong the Guard]";
+		mes "Not at all. I just watch who comes and goes from here.";
+		mes "Travelers are the ones who go through more hardship.";
+		close;
+	}
+	if (BaseLevel < 100) {
+		mes "[Dhong the Guard]";
+		mes "Vantai is a nice dog.";
+		mes "He's probably stronger than you.";
+		next;
+		mes "[Dhong the Guard]";
+		mes "No offense, but";
+		mes "you look weaker than the original owners of the bones Vantai chews on.";
+		next;
+		mes "[Dhong the Guard]";
+		mes "That means just about as strong as me!";
+		mes "Ha ha ha ha ha ha ha!";
+		close;
+	}
+	.@playtime = checkquest(7408, PLAYTIME);
+	if (.@playtime == 0 || .@playtime == 1) {
+		mes "[Dhong the Guard]";
+		mes "The bones you brought Vantai gave him a feast.";
+		mes "He'll be full and merry for a while now.";
+		mes "Nobody can beat Vantai in recon around here.";
+		next;
+		mes "[Dhong the Guard]";
+		mes "Though it is not nice to say a person is lesser than a dog,";
+		mes "but there are some who are lesser.";
+		close;
+	} else if (.@playtime == 2) {
+		erasequest 7408;
+		mes "[Dhong the Guard]";
+		mes "Vantai?";
+		mes "Always the same.";
+		mes "Now that you mention it, it's almost time for him to get hungry.";
+		next;
+		mes "[Dhong the Guard]";
+		mes "Of course, he eats normal dog food, but he can't go without those.";
+		mes "You know what I mean, right?";
+		mes "Smirk...";
+		next;
+		mes "[Dhong the Guard]";
+		mes "Me and Vantai are always waiting";
+		mes "for the hero to get us some Evil Spirit Bones from the forest.";
+		close;
+	} else {
+		if (checkquest(7406) != -1) {
+			mes "[Dhong the Guard]";
+			mes "What I'm saying is that, to be a good guard dog, he must be able to stand ground against evil spirits.";
+			mes "For that he needs to eat Evil Spirit Bones, but it must be purified before he can eat them.";
+			next;
+			mes "[Dhong the Guard]";
+			mes "You can get Evil Spirit Bones from monsters or animals in the forest.";
+			mes "Kiko in Mumbaki will purify them for you.";
+			close;
+		} else {
+			if (checkquest(7407) == 1) {
+				if (countitem(6505) < 10) {
+					mes "[Dhong the Guard]";
+					mes "Kiko in Mumbaki asked for 10 Purified Spirit Bones.";
+					mes "He needs to have at least 10 at a time. Which of course does not last a day...";
+					close;
+				}
+				mes "[Dhong the Guard]";
+				mes "Hey, Vantai will love these!";
+				mes "It's all in good condition...";
+				mes "An evil bone purified through holy ritual...";
+				next;
+				mes "[Dhong the Guard]";
+				mes "This is the perfect dog food!!";
+				mes "Now he can sense and detect evil spirits,";
+				mes "and since he ate purified ones, he'll get the ability to eradicate them.";
+				next;
+				mes "[Dhong the Guard]";
+				mes "I bet he's the strongest living thing in the village now.";
+				mes "Of course not me. I mean Vantai.";
+				next;
+				mes "[Dhong the Guard]";
+				mes "This is your reward.";
+				mes "It would be very nice if you could help us again tomorrow.";
+				delitem 6505, 10; // Purified_Bone
+				setquest 7408;
+				erasequest 7407;
+//				if (IsPremiumPcCafe == 10)
+					getitem 6497, 2; // Lesser_Agimat
+//				else
+//					getitem 6497, 1; // Lesser_Agimat
+				getexp 200000,200000;
+				if (!rand(0, 2))
+					$malayaNames$[2] = strcharinfo(0);
+				close;
+			} else {
+				mes "[Dhong the Guard]";
+				mes "Vantai is not only a guard dog, but he's also a great detector and recon scout.";
+				mes "But for him to do so, he needs to eat Purified Spirit Bones.";
+				next;
+				mes "[Dhong the Guard]";
+				mes "As you can see, I can't move from here,";
+				mes "so I was wondering if you can get the bones for Vantai...";
+				next;
+				if (select("Alright.:Sorry.") == 2) {
+					mes "[Dhong the Guard]";
+					mes "I see.";
+					mes "Vantai!";
+					mes "No treat for you today..!!";
+					next;
+					mes "- It seems like Vantai's eyes are more moist today. -";
+					close;
+				}
+				mes "[Dhong the Guard]";
+				mes "Bones can be acquired from animals or monsters around here.";
+				mes "Take them to Kiko in Mumbaki for purification, which, in turn, can be given to Vantai to eat.";
+				next;
+				mes "[Dhong the Guard]";
+				mes "Bring us 10 Purified Spirit Bones.";
+				mes "That reminds me. You'll need Holy Water for the purification ritual.";
+				next;
+				mes "[Dhong the Guard]";
+				mes "Take your time.";
+				mes "Look here. Vantai likes it too.";
+				setquest 7406;
+				close;
+			}
+		}
+	}
+	end;
+}
+
+ma_fild01,238,257,2	script	Guard Dog Vantai	4_RUS_DWOLF,{
+	mes "[Vantai]";
+	mes "Grrrrrrr...";
+	mes " ";
+	mes "(He is intimidated by you.)";
+	close;
+}
+
+ma_fild01,200,190,3	script	Maries#malaya	4_F_BARYO_WOMAN,{
+	if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
+		mes "- Cannot proceed with the quest. You are carrying too many items. -";
+		close;
+	}
+	if (BaseLevel < 100) {
+		mes "[Maries]";
+		mes "Umm... Hey...";
+		mes "Oh, no, sorry. You don't look so strong or bold.";
+		mes "I'm sorry. I'm just not quite myself...";
+		close;
+	}
+	if (malaya_hi < 20) {
+		mes "An anxious looking woman is stands.";
+		close;
+	}
+	.@playtime = checkquest(7390, PLAYTIME);
+	if (.@playtime == 0 || .@playtime == 1) {
+		mes "[Maries]";
+		mes "Now that the children know that they can get back home with an Inside-out Shirt,";
+		mes "they play out in the forest recklessly and timelessly.";
+		next;
+		mes "[Maries]";
+		mes "The children will surely get lost again in these conditions.";
+		mes "If it happens again, I'll seek your help again.";
+		close;
+	} else if (.@playtime == 2) {
+		mes "[Maries]";
+		mes "I'm missing a child... again.";
+		mes "Oh my goodness...";
+		erasequest 7390;
+		close;
+	} else {
+		if (checkquest(7389) != -1) {
+			mes "[Maries]";
+			mes "You came back.";
+			mes "Thanks to you, the child has returned home safely.";
+			next;
+			mes "[Maries]";
+			mes "Although the shirt is inside-out, it miraculously brings them back to where they should be.";
+			mes "Thank you for delivering those precious shirts to my children.";
+			setquest 7390;
+			erasequest 7389;
+//			if (IsPremiumPcCafe == 10)
+				getitem 6497, 2; // Lesser_Agimat
+//			else
+//				getitem 6497, 1; // Lesser_Agimat
+			getexp 200000,200000;
+			if (!rand(3))
+				$malayaNames$[2] = strcharinfo(0);
+			close;
+		} else {
+			if (checkquest(7388) != -1) {
+				mes "[Maries]";
+				mes "I'm sure they're lost in the woods because of mischievous spirits.";
+				mes "Please give the child the ^4d4dffInside-out Shirt^000000 when found.";
+				next;
+				mes "[Maries]";
+				mes "The Inside-out Shirts...";
+				mes "You can probably get them from the demons, since they ran away with them.";
+				close;
+			} else {
+				mes "[Maries]";
+				mes "Hello... I'm looking for my child...";
+				mes "My daughter did not return.";
+				mes "Please help, I think she's lost in the forest.";
+				next;
+				switch (select("Of course.:I'm too busy right now.:You have so many children.")) {
+				case 1:
+					mes "[Maries]";
+					mes "I'm sure she's lost in the woods because of mischievous spirits.";
+					next;
+					mes "[Maries]";
+					mes "If she's cursed, it will be difficult to get her out of there.";
+					mes "She'll drift around in the maze so mesmerizing, even for you, in fact.";
+					next;
+					mes "[Maries]";
+					mes "Acquire an ^4d4dffInside-out Shirt^000000 and give it to my daughter.";
+					mes "Although the shirt is inside-out, it miraculously brings them back to where they should be.";
+					next;
+					mes "[Maries]";
+					mes "The Inside-out Shirts...";
+					mes "You can probably get them from the demons, since they ran away with them.";
+					setquest 7388;
+					close;
+				case 2:
+					mes "[Maries]";
+					mes "... Yes... I see.";
+					mes "I'll have to ask someone else.";
+					mes "Alright.";
+					mes "Sigh...";
+					close;
+				case 3:
+					mes "[Maries]";
+					mes "...I ended up having triplets.";
+					mes "Even I sometimes get confused. *Chuckle*";
+					next;
+					mes "[Maries]";
+					mes "They seem to be under a curse because one of them always get's lost in the woods..";
+					mes "Sigh...";
+					close;
+				}
+			}
+		}
+	}
+	end;
+}
+
+ma_fild01,203,189,3	script	Little Girl#malaya	4_F_BARYO_GIRL,{
+	mes "[Little Girl]";
+	mes "He he, the forest is scary, but it's so much fun so I go there often to play~";
+	mes "Strange, how we always get lost.";
+	next;
+	mes "[Little Girl]";
+	mes "But it's okay because I'm not the only one getting lost~";
+	mes "We're triplets~ And we're missing the other two~ Giggle~";
+	close;
+}
+
+ma_fild01,251,93,3	script	Lost Child#malaya01	4_F_BARYO_GIRL,{
+	if (checkquest(7388) > -1) {
+		if (!countitem(12700)) {
+			mes "[Little Kid]";
+			mes "Sigh. Are you lost too?";
+			mes "They are so naughty.";
+			next;
+			mes "[Little Kid]";
+			mes "An Inside-out Shirt is just what I need.";
+			mes "*Chuckle*...";
+			close;
+		}
+		mes "[Little Kid]";
+		mes "Oh, darn them.";
+		mes "They must have tricked me into getting lost again!";
+		next;
+		select ("Do you want to go home?");
+		mes "[Little Kid]";
+		mes "If I don't get back soon, my mom will be worried sick.";
+		mes "Sigh... I wish I had an Inside-out Shirt to go back.";
+		next;
+		select ("Here you are.");
+		mes "[Little Kid]";
+		mes "Really?";
+		mes "It really is the shirt!";
+		mes "This will take me straight home!";
+		next;
+		mes "[Little Kid]";
+		mes "Did mom send you?";
+		mes "She must be worried..!";
+		mes "I'll go home now!";
+		mes "Thanks' a lot!";
+		delitem 12700, 1; // Insideout_Shirt
+		setquest 7389;
+		erasequest 7388;
+		close2;
+		disablenpc strnpcinfo(0);
+		if (strnpcinfo(0) == "Lost Child#malaya01") {
+			enablenpc "Lost Child#malaya02";
+		} else if (strnpcinfo(0) == "Lost Child#malaya01") {
+			enablenpc "Lost Child#malaya03";
+		} else {
+			enablenpc "Lost Child#malaya01";
+		}
+		end;
+	} else {
+		if (checkquest(7389) != -1) {
+			mes "[Little Kid]";
+			mes "I want to play some more.";
+			mes "I can always go back with this shirt.";
+			mes "Mom won't be concerned.";
+			close;
+		} else {
+			mes "[Little Kid]";
+			mes "Hmmm. Am I lost again?";
+			mes "Where am I...";
+			mes "I'm sure I have to head in the direction of sunrise from the third tree to get home... Huh?";
+			next;
+			mes "[Little Kid]";
+			mes "Why~ Do I always go in circles here?";
+			mes "Do you why, " + ((Sex) ? "mister" : "ma'am") + "?";
+			mes "What's with this road?";
+			mes "Is somebody trying to trick me?";
+			close;
+		}
+	}
+	end;
+	
+OnInit:
+	if (strnpcinfo(0) != "Lost Child#malaya01")
+		disablenpc strnpcinfo(0);
+}
+ma_fild01,114,141,3	duplicate(Lost Child#malaya01)	Lost Child#malaya02	4_F_BARYO_GIRL
+ma_fild01,130,314,3	duplicate(Lost Child#malaya01)	Lost Child#malaya03	4_F_BARYO_GIRL
+
+ma_fild02,241,39,5	script	Good Capre Budidai	4_MAL_BUDIDAI,{
+	mes "[Budidai]";
+	mes "Hey hey hey~";
+	mes "I am such a nice Capre~ Hey!";
+	mes "I am going to a fine cafe~YO!";
+	mes "I am better than yesterday~Hey!";
+	mes "I'm a fine rhyming Capre~Oh?";
+	next;
+	mes "[Budidai]";
+	mes "Hey buddy, You here to hear Budidai singing?";
+	next;
+	switch (select("You like songs?:A profound study of one eyed monsters.:See ya!")) {
+	case 1:
+		mes "[Budidai]";
+		mes "Yup, Budidai loves singing.";
+		mes "Cows, horses, goats, roosters, boars all love my songs.";
+		mes "They're all friends.";
+		next;
+		mes "[Budidai]";
+		mes "Except for that one eyed Bongisungisu.";
+		mes "He picks on my friends.";
+		mes "I am annoyed, but Budidai is weak.";
+		next;
+		mes "[Budidai]";
+		mes "I fear it's single gaze, but I fear more the club he flails.";
+		mes "I have to sing my friends some songs, but they don't come because of him.";
+		next;
+		mes "[Budidai]";
+		mes "So Budidai, sings here.";
+		mes "Lots of travelers pass by.";
+		mes "Capre is a wanderer's buddy.";
+		mes "You're a buddy too.";
+		close;
+	case 2:
+		if (BaseLevel < 100) {
+			mes "[Budidai]";
+			mes "You interested in that fiend, my friend?";
+			mes "It's just a bully of the forest!";
+			mes "It picks on my animal friends!";
+			next;
+			mes "[Budidai]";
+			mes "Sadly, singing is all that Budidai is skilled at.";
+			mes "I can't do anything about the scary gaze and the flailing club.";
+			next;
+			mes "[Budidai]";
+			mes "Bongisungisu! I get the chills just by being in the same forest with it...";
+			mes "But Budidai is weak.";
+			next;
+			mes "[Budidai]";
+			mes "You and me, wanderer.";
+			mes "We'll never make it.";
+			close;
+		}
+		.@playtime = checkquest(7410, PLAYTIME);
+		if (.@playtime == 0 || .@playtime == 1) {
+			mes "[Budidai]";
+			mes "Traveler, my friend!";
+			mes "Bongisungisu ran far far away.";
+			mes "Dogs, cows, horse, goat and rooster will come back to me, won't they?";
+			next;
+			mes "[Budidai]";
+			mes "But Budidai is worried.";
+			mes "The one eyed bully will return eventually.";
+			mes "Will you help me out again?";
+			next;
+			mes "[Budidai]";
+			mes "You, friend of Budidai";
+			mes "You won't turn you're back on a good Capre?";
+			close;
+		} else {
+			if (checkquest(7409) != -1) {
+				if (checkquest(7409, HUNTING) == 2) {
+					mes "[Budidai]";
+					mes "Astonishing, wanderer!";
+					mes "I could hear the pitiful wails of Bongisungisu all the way from here!";
+					mes "Budidai can sing again for his friends, yes?";
+					next;
+					mes "[Budidai]";
+					mes "Now, what can Budidai do for the kind wanderer, slayer of the one eyed monster?";
+					mes "Aha! Here's a talisman.";
+					mes "It will be good for you travelers.";
+					next;
+					mes "[Budidai]";
+					mes "Kind Capre is a friend of travelers.";
+					mes "I hope to see you again, wanderer.";
+					mes "This is a blessing for friends. Hey hey hey~";
+					setquest 7410;
+					erasequest 7409;
+//					if (IsPremiumPcCafe == 10)
+						getitem 6497, 2; // Lesser_Agimat
+//					else
+//						getitem 6497, 1; // Lesser_Agimat
+					getexp 200000,200000;
+					if (!rand(3))
+						$malayaNames$[1] = strcharinfo(0);
+					close;
+				} else {
+					mes "[Budidai]";
+					mes "Please slay the destructive libertine Bongisungisu.";
+					mes "For me, a Capre to sing again for one's friends.";
+					close;
+				}
+			} else {
+				if (.@playtime == 2) {
+					mes "[Budidai]";
+					mes "Hey, kind wanderer.";
+					mes "Bongisungisu, the one eyed debauchee is back!";
+					mes "What do I do? What should I do?";
+					next;
+					mes "[Budidai]";
+					mes "He gets angry when I sing.";
+					mes "But the horse, cow, goat, dog and boars love it.";
+					mes "It gives Budidai such a hard time.";
+					erasequest 7410;
+					close;
+				} else {
+					mes "[Budidai]";
+					mes "You interested in that fiend, my friend?";
+					mes "It's just a bully of the forest!";
+					mes "It picks on my animal friends!";
+					next;
+					mes "[Budidai]";
+					mes "Sadly, singing is all that Budidai is skilled at.";
+					mes "I can't do anything about the scary gaze and the flailing club.";
+					next;
+					mes "[Budidai]";
+					mes "Bongisungisu! I get the chills just by being in the same forest with it...";
+					mes "But Budidai is weak.";
+					next;
+					if (select("Shall I take care of it?:That does give the chills.") == 2) {
+						mes "[Budidai]";
+						mes "Don't remind me.";
+						mes "My friends can't come and listen to my songs because of that behemoth.";
+						mes "It is so frustrating.";
+						close;
+					}
+					mes "[Budidai]";
+					mes "You'd teach Bongisungisu a lesson?!";
+					mes "Kind wanderer!!";
+					mes "Kick some libertine butt!!";
+					setquest 7409;
+					close;
+				}
+			}
+		}
+		break;
+	case 3:
+		mes "[Budidai]";
+		mes "Leave me wanderer~";
+		mes "Capre Budidai will sing of wonders~";
+		mes "You best everyone else~";
+		mes "You bring all them beasts~";
+		mes "Just go back to Kafra~";
+		next;
+		mes "[Budidai]";
+		mes "Hey hey hey~";
+		mes "Blessing of the Kind and Good Capre~";
+		mes "A wanderer's friend the gift of Capre~";
+		mes "Hey hey hey~";
+		close;
+	}
+	end;
+}
+
+// Traders :: malaya_npc
+//============================================================
+ma_fild01,166,214,6	script	Old Man in Dilemma#GA	4_F_BARYO_OLD,{
+	if (MaxWeight - Weight < 600 || checkweight(1201,1) == 0) {
+		mes "Cannot proceed because you have too many items in your possession.";
+		close;
+	}
+	mes "[Old Man in Dilemma]";
+	mes "Oh! Demons are gaining more and more power in this world.";
+	next;
+	switch(select("We need to gather items to fight them off.:Ignore.")) {
+	case 1:
+		if (countitem(6497) >= 3 && Zeny >= 1000) {
+			mes "[Old Man in Dilemma]";
+			mes "You don't seem to be strong enough to fight off demons.";
+			next;
+			mes "[Old Man in Dilemma]";
+			mes "Will you create a Greater Agimat of Ancient Spirit with 3 Lesser Agimats and 1,000 Zeny?";
+			next;
+			if(select("Create.:No, thank you.") == 1) {
+				if (countitem(6497) >= 3 && Zeny >= 1000) {
+					specialeffect2 EF_CONE;
+					specialeffect EF_FORESTLIGHT2;
+					Zeny -= 1000;
+					getitem 12775,1; //Ancient_Spirit_Agimat
+				} else {
+					mes "[Old Man in Dilemma]";
+					mes "Short on materials.";
+					close;
+				}
+			}
+			mes "[Old Man in Dilemma]";
+			mes "Hope you win the fight with the demon.";
+			close;
+		}
+		mes "[Old Man in Dilemma]";
+		mes "Can't make it now but there is an old way of making it handed down by generations.";
+		next;
+		mes "[Old Man in Dilemma]";
+		mes "You need to call upon the power of Ancient Spirits. But you'll need several important materials first.";
+		next;
+		select("What are they?");
+		mes "[Old Man in Dilemma]";
+		mes "3 Lesser Agimats to hold the power of Ancient Spirits here and another special material handed down for generations.";
+		next;
+		mes "[Old Man in Dilemma]";
+		mes "But nobody can get this special item anymore.";
+		next;
+		select("Something money cannot buy?");
+		mes "[Old Man in Dilemma]";
+		mes "No, no... It's this round little thing, you see?";
+		next;
+		select("Are you talking about Zeny?");
+		mes "[Old Man in Dilemma]";
+		mes "Looks similar to the special items handed down from generations.";
+		next;
+		mes "[Old Man in Dilemma]";
+		mes "As long as we have enough of that, we could make the Greater Agimat of Ancient Spirit to fight against the demons.";
+		next;
+		select("Sounds good.");
+		mes "[Old Man in Dilemma]";
+		mes "In case you are too weary to take on the demons...";
+		next;
+		mes "[Old Man in Dilemma]";
+		mes "Come by with 3 Lesser Agimats and 1,000 of those so-called Zeny.";
+		next;
+		mes "[Old Man in Dilemma]";
+		mes "I will make a Greater Agimat of Ancient Spirit that will increase your attacks against demons by 10% for 20 min.";
+		close;
+	case 2:
+		mes "[Old Man in Dilemma]";
+		mes "Hope you win the fight with the demon.";
+		close;
+	}
+}
+
+ma_fild01,238,198,4	script	Tikbalang Expert#malaya	4_M_MALAYA,{
+	if (MaxWeight - Weight < 50 || checkweight(1201,1) == 0) {
+		mes "Cannot proceed because you have too many items in your possession.";
+		close;
+	}
+	mes "[Tikbalang Expert]";
+	mes "I spent 90% of my life studying Tikbalang.";
+	next;
+	switch(select("But you look young?:What is Tikbalang?:Teach me how to catch a Tikbalang.")) {
+	case 1:
+		mes "[Tikbalang Expert]";
+		mes "What! I might be imagining things.";
+		next;
+		mes "[Tikbalang Expert]";
+		mes "I look younger than I am because of my baby face. Ha ha ha~";
+		next;
+		select("... ... ...");
+		mes "[Tikbalang Expert]";
+		mes "Trust!! They say faith will bring you luck.";
+		close;
+	case 2:
+		mes "[Tikbalang Expert]";
+		mes "Ha ha... You ask the right question.";
+		mes "I'm a specialist in that field. Ask me anything.";
+		next;
+		select("Why won't you answer me?");
+		mes "[Tikbalang Expert]";
+		mes "Have you... ever been fooled by anyone around you? Why can't you believe someone's word for it? Really, ask me anything.";
+		next;
+		while(1) {
+			switch(select("I don't have any questions.:Characteristics?:Features?:Rumors?:Habitat?")) {
+			case 1:
+				mes "[Tikbalang Expert]";
+				mes "I think this is enough explanation for now. You wouldn't understand other highly sophisticated topics with specific terminology and all anyway.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "Oh! Do you have any other questions?";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "What do you think? Impressed at how much I know? Come by anytime when you have any more questions.";
+				close;
+			case 2:
+				mes "[Tikbalang Expert]";
+				mes "Tikbalangs have a way to confuse travelers when they meet them by making them turn in circles regardless of wherever and how far they travel.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "They are mischievous creatures.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "But of course there is a way to stop their pranks. You know about the Inside-out Shirt? You can either wear your top inside-out.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "Or go on your way quietly without disrupting the Tikbalangs.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "Ha ha ha ha~ But everyone knows adventurers are never quiet while they travel, right?";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "Never...";
+				break;
+			case 3:
+				mes "[Tikbalang Expert]";
+				mes "They say Tikbalangs have several distinctions.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "First, they are very tall ^AAAAAA(tsk... wish I were tall)^000000 and have skinny, imbalanced legs and arms. Looks almost like a human but their knees are higher than their upper body when they sit down.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "Second, is the standard characteristics acknowledged by the association. They have heads and feet like a horse.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "So with all these appearance traits, Tikbalang is sometimes called the creature from hell.";
+				break;
+			case 4:
+				mes "[Tikbalang Expert]";
+				mes "There are several fun rumors about Tikbalangs.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "One of them is about Tikbalangs being the guardians of some kingdom that worships nature.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "So the Tikbalangs will trick travelers who come with bad intentions to the kingdom by making them travel in circles.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "Another rumor is that people around here say that 'if it rains on a clear day, then it must be Tikbalang's wedding day'.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "The association speculates that sayings like 'it rains on Bathory's wedding day' or 'it rains on Moonlight Flower's wedding day' might have derived from the Tikbalang's saying.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "Lastly, ancient fairy tales say that Tikbalangs can transform into human form or even make themselves transparen't but nobody has verified this yet.";
+				break;
+			case 5:
+				mes "[Tikbalang Expert]";
+				mes "Tikbalangs usually live in dark, busy places where there aren't many people around.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "Hmm... For example, they are known to live beneath bridges, in banana and bamboo forests and beneath large trees.";
+				next;
+				mes "[Tikbalang Expert]";
+				mes "And this is just my opinion but wouldn't you agree that they are living in dark places because it is easier to play pranks on people?";
+				break;
+			}
+			next;
+		}
+	case 3:
+		mes "[Tikbalang Expert]";
+		mes "Ha ha ha. Do you now know how great I am?";
+		next;
+		if (countitem(6496) >= 3 && countitem(6497) >= 5) {
+			mes "[Tikbalang Expert]";
+			mes "Oh! Isn't this material to make 'Tikbalang Belt' used to tame Tikbalangs?";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "The '^F80835Tikbalang Belt^000000' is used to capture Tikbalangs without the hassle. But that doesn't mean it's 100% successful. Interested? Do you want me to make one for you?";
+			next;
+			switch(select("Yes, Im interested.:No, I can capture one myself.")) {
+			case 1:
+				delitem 6496,3; //Tikbalang_Thick_Spine
+				getitem 12699,1; //Tikbalang_Belt
+				mes "[Tikbalang Expert]";
+				mes "Yiiiiiiiiiiii! Yap!";
+				next;
+				specialeffect EF_SONICBLOW2;
+				select("Huh?");
+				mes "[Tikbalang Expert]";
+				mes "The '^F80835Tikbalang Belt^000000' is already created.";
+				close;
+			case 2:
+				mes "[Tikbalang Expert]";
+				mes "You? Ha... You can try if you want to.";
+				close;
+			}
+		}
+		mes "[Tikbalang Expert]";
+		mes "There is the easy way and the hard way to capture Tikbalangs. Which one do you prefer?";
+		next;
+		switch(select("Easy way.:Hard way.")) {
+		case 1:
+			mes "[Tikbalang Expert]";
+			mes "Ha ha. I've come up with the easy way myself.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "Bring me 3 Tikbalang's Thick Spines and 5 Lesser Agimats to make a '^F80835Tikbalang Belt^000000' to help you easily capture Tikbalangs.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "Ha ha ha ha ha!";
+			mes "I will say it again.";
+			mes "It's 3 Tikbalang's Thick Spines and 5 Lesser Agimats. Understood?";
+			close;
+		case 2:
+			mes "[Tikbalang Expert]";
+			mes "It's easy for me but I don't know about you.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "Tikbalangs have a sharp, pointy mane behind their neck.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "Of course! There are several of them but you must get the three thickest ones.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "These three manes are the weak point. You can tame a Tikbalang by pulling the manes out.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "Now let me explain how to pull these manes out.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "You must fly like a butterfly and land like a bee on the back of a Tikbalang.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "Of course! The Tikbalang will get mad and try to shake you off with all its might.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "All you have to do is hold on until the Tikbalang gets exhausted.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "Then again, itll take 4 days and 3 nights for Tikbalangs to get tired since they are strong creatures. But let's not focus on too much details.";
+			next;
+			mes "[Tikbalang Expert]";
+			mes "Which means!! The Tikbalang is already tamed.";
+			close;
+		}
+	}
+}
+
+// Upgrade Boss Equipment :: malaya_mvpitem
+//============================================================
+ma_fild01,158,243,6	script	Tribe Blacksmith#malaya	4_M_MALAYA,{
+	mes "[Bayani]";
+	mes "I will upgrade your armor if you bring one that holds enormous power.";
+	next;
+	switch (select("What kind of equipment do upgrade?:What are the required materials?:What will it become after an upgrade?:Please upgrade this.")) {
+	case 1:
+		mes "[Bayani]";
+		mes "Your questions are too simple, but!";
+		next;
+		mes "[Bayani]";
+		mes "Are also important.";
+		next;
+		mes "[Bayani]";
+		mes "^7B4772Bakonawa Scale Armor^000000 made from the scales of the Bakonawa monster known to swallow the moon.";
+		next;
+		mes "[Bayani]";
+		mes "Light but sturdy ^7B4772Kalasag^000000 made from rattan that grows wild around Port Malaya.";
+		next;
+		mes "[Bayani]";
+		mes "^7B4772Buwaya Sack Cloth^000000 made from the sack of the man-eating alligator Buwaya.";
+		next;
+		mes "[Bayani]";
+		mes "^7B4772Bangungot Boots of Nightmare^000000 imbued with the hatred and vengeance of the monster Bangungot.";
+		next;
+		mes "[Bayani]";
+		mes "As just mentioned.";
+		next;
+		mes "[Bayani]";
+		mes "I will make powerful armor out of ONLY the strongest armor dropped from fearful monsters.";
+		close;
+	case 2:
+		mes "[Bayani]";
+		mes "Learned well.";
+		mes "Seems you learned that there is no such thing as free in life.";
+		next;
+		mes "[Bayani]";
+		mes "First thing to remember is that the object to upgrade must be strong itself. At least strong enough to endure ^FF0000+9 Refinement^000000.";
+		next;
+		mes "[Bayani]";
+		mes "Next is true strength that only comes out of power obtained naturally. I need ^FF000020 Ancient Grudges^000000 for protection from evil while Im refining.";
+		next;
+		mes "[Bayani]";
+		mes "When a ^FF0000+9 Refined Strong armor^000000 is combined with ^FF000020 Ancient Grudges^000000 for protection!!";
+		next;
+		mes "[Bayani]";
+		mes "You get a completely new and improved armor from old scraps.";
+		next;
+		mes "[Bayani]";
+		mes "Always look forward to this.";
+		close;
+	case 3:
+		mes "[Bayani]";
+		mes "Listen, because this is a very important question.";
+		next;
+		mes "[Bayani]";
+		mes "It won't matter if I say it more than a 100 times that upgraded armor is powerful.";
+		next;
+		mes "[Bayani]";
+		mes "Unless the one that holds it doesn't believe it is! Ask about what has changed and decide for yourself!";
+		next;
+		while (1) {
+			switch (select("There is no more.:Bakonawa Scale Armor:Kalasag:Buwaya Sack Cloth:Bangungot Boots of Nightmare")) {
+			case 1:
+				mes "[Bayani]";
+				mes "Looks like you ran out of questions.";
+				mes "Don't forget. You'll have to give up something to gain something.";
+				close;
+			case 2:
+				mes "[Bayani]";
+				mes "The Bakonawa Scale Armor adds +1 to all stats for all jobs which is overall great armor for everyone.";
+				next;
+				mes "[Bayani]";
+				mes "But I'm sure the inner you thinks this isn't enough.";
+				next;
+				mes "[Bayani]";
+				mes "That is why +2 can be added to all stats and an extra slot for a card to your socket if upgraded.";
+				next;
+				break;
+			case 3:
+				mes "[Bayani]";
+				mes "Kalasag is a good shield to reduce damage from boss monsters by 1% per 3 refinements.";
+				next;
+				mes "[Bayani]";
+				mes "But not enough. Can't believe that a shield doesnt have a place to equip a card.";
+				next;
+				mes "[Bayani]";
+				mes "That is why I can add an extra slot for a card to your socket if upgraded.";
+				next;
+				break;
+			case 4:
+				mes "[Bayani]";
+				mes "The Buwaya Sack Cloth offers healing capacity and healing item effect increase by 1% per 3 refinements. Not to mention it reduces 10% damage from Water, Earth, Fire, and Wind elemental monsters.";
+				next;
+				mes "[Bayani]";
+				mes "But not enough. Can't believe that these clothes don't come with a place to equip a card. Everyone knows that clothes should have Raydric on them!";
+				next;
+				mes "[Bayani]";
+				mes "Don't worry! I can add an extra slot for a card to your socket if upgraded.";
+				next;
+				break;
+			case 5:
+				mes "[Bayani]";
+				mes "The Bangungot Boots of Nightmare increases +1 MDEF per 1 refinement and speed increases starting at 14 refinement and above.";
+				next;
+				mes "[Bayani]";
+				mes "The speed increase effect from shoes like Moonlight Flower Shoes and Sleipnir items are out of reach for ordinary people.";
+				next;
+				mes "[Bayani]";
+				mes "But of course, +14 refinement isn't easy but there is an easy way to get it.";
+				next;
+				mes "[Bayani]";
+				mes "By upgrading your shoes, you can get speed increase starting from +12 refinement!";
+				next;
+				mes "[Bayani]";
+				mes "And it doesn't end there!!";
+				mes "I will also put in an extra slot in your socket to add a card.";
+				next;
+				break;
+			}
+			mes "[Bayani]";
+			mes "However, you'll have to give up something to gain something.";
+			next;
+			mes "[Bayani]";
+			mes "^0000FFEquipping the Kalasag, Buwaya Sack Cloth, Bakonawa Scale Armor, and Bangungot Boots of Nightmare all at once will lose the ^FF0000Set Effects^0000FF.^000000";
+			next;
+			mes "[Bayani]";
+			mes "Think it through. Next question?";
+			next;
+		}
+	}
+	mes "[Bayani]";
+	mes "Ha ha ha ha ha ha ha! Good!";
+	mes "You've brought the materials, right?";
+	next;
+	if (select("Oh... sorry...:Preparations are complete!!") == 1) {
+		mes "[Bayani]";
+		mes "Oh no!!";
+		mes "I will need an light but sturdy armor with an refinement of +9 or greater and 20 Ancient Grudges!!";
+		close;
+	}
+	if (countitem(6499) < 20) {
+		mes "[Bayani]";
+		mes "You said all preparations are done and you give me this?! I need at least 20 Ancient Grudges to refine your item.";
+		close;
+	}
+	mes "[Bayani]";
+	mes "So what armor will it be?";
+	next;
+	switch (select("Bakonawa Scale Armor:Kalasag:Buwaya Sack Cloth:Bangungot Boots of Nightmare")) {
+	case 1:
+		.@part    = EQI_ARMOR;
+		.@item    = 15051;
+		.@newItem = 15052;
+		break;
+	case 2:
+		.@part    = EQI_HAND_L;
+		.@item    = 2169;
+		.@newItem = 2170;
+		break;
+	case 3:
+		.@part    = EQI_GARMENT;
+		.@item    = 2590;
+		.@newItem = 2591;
+		break;
+	case 4:
+		.@part    = EQI_SHOES;
+		.@item    = 2491;
+		.@newItem = 2492;
+		break;
+	}
+	
+	if (!(.@item)) {
+		mes "[Bayani]";
+		mes "You should wear the equipment to upgrade and not come without it on you.";
+		close;
+	} else if (getequipid(.@part) != .@item) {
+		mes "[Bayani]";
+		mes "What is this! You said you wanted to upgrade " + getitemname(.@item) + " but why are you giving me this? You should be wearing " + getitemname(.@item) + ".";
+		close;
+	} else if (getequiprefinerycnt(.@part) < 9) {
+		mes "[Bayani]";
+		mes "No, the sturdiness of this item has not been tested yet. It'll have to be at least +9 refined for me to say, 'Oh this is pretty sturdy armor.";
+		close;
+	}
+
+	mes "[Bayani]";
+	mes "Looks like you did your homework! Don't see a flaw! Then I have one question to ask before I start refinement.";
+	next;
+	mes "[Bayani]";
+	mes "^0000FFOnce your item is refined, the refinement level will be ^FF00000^0000FF and the item will be upgraded.^000000 You get this part?";
+	next;
+	if (select("No.:Yes.") == 1) {
+		mes "[Bayani]";
+		mes "What? You didn't know this? Then, read through my instructions and come back again.";
+		close;
+	}
+	mes "[Bayani]";
+	mes "Good. Next question. Once refinement is done,";
+	mes "^0000FFEquipping the Kalasag, Buwaya Sack Cloth, Bakonawa Scale Armor, and Bangungot Boots of Nightmare all at once will lose the ^FF0000Set Effects^0000FF.^000000";
+	mes "Do you understand this point?";
+	next;
+	if (select("No.:Yes.") == 1) {
+		mes "[Bayani]";
+		mes "What? You didn't know this? Then, read through my instructions and come back again.";
+		close;
+	}
+	mes "[Bayani]";
+	mes "Awesome! Then let's start refining " + getitemname(.@item) + ".";
+	next;
+	specialeffect EF_SONICBLOW;
+	mes "[Bayani]";
+	mes "Pow!! Wow!! Flip... flop!";
+	next;
+	specialeffect2 EF_TRIPLEATTACK;
+	mes "[Bayani]";
+	mes "BAM!!";
+	next;
+	
+	delitem 6499,20; //Ancient_Grudge
+	delequip .@part;
+	getitem .@newItem, 1;
+	
+	mes "[Bayani]";
+	mes "Ha ha. Perfect.";
+	mes "Congratulations. Your armor is better than ever.";
+	close;
+}
+
+// Secret in the Woods :: malaya_buwaya
+//============================================================
+malaya,305,281,3	script	Guard#buwaya	4_MAL_SOLDIER,7,7,{
+	if (malaya_hi < 10) {
+		mes "- From the wary looks on the guard's face, it is obvious he is at alert at the sight of you. He won't intimidate you but seems he won't even deal with you either. -";
+		next;
+		mes "- Would there be anyone to talk to in the village? -";
+		close;
+	} else if (malaya_hi < 20) {
+		mes "[Guard]";
+		mes "There is a small area called ^3131FFBaryo Mahiwaga^000000 outside of Port Malaya.";
+		mes "The place is closer to mother nature than what we have here.";
+		next;
+		mes "[Guard]";
+		mes "On the other hand, the area is full of fierce monsters. Take care of yourself while you're traveling there.";
+		close;
+	}
+	if (malaya_buwaya == 0) {
+		mes "[Guard]";
+		mes "There are more people leaving the village secretly these days. Are you also heading for the woods to look for the mysterious treasure?";
+		next;
+		if (BaseLevel < 100) {
+			mes "[Guard]";
+			mes "I take that back. On second thought, I don't think a weakling like you would even dare to go there.";
+			next;
+			mes "[Guard]";
+			mes "You'd better hold tight to your mommy's hand if you want to go outside of Port Malaya or else the monsters will eat you alive. Ha ha.";
+			close;
+		}
+		mes "[Guard]";
+		mes "Is that why there are more outsiders here these days? Now don't be sneaky and a know-it-all. How would you know if I'd offered to take you around?";
+		next;
+		if (select("Treasure?:Ignore.") == 2) {
+			mes "[Guard]";
+			mes "Are you ignoring me? Bah.";
+			close;
+		}
+		mes "[Guard]";
+		mes "Oh, so you aren't here to look for treasure?";
+		next;
+		mes "[Guard]";
+		mes "I hear people are talking about a mysterious treasure hidden deep in the woods.";
+		set malaya_buwaya,1;
+		setquest 2271;
+		next;
+	}
+	if (malaya_buwaya == 1) {
+		mes "[Guard]";
+		mes "Do you see that group of people over there? They always gather and talk about it every day.";
+		mes "Try talking to them if you are interested, too.";
+		close;
+	}
+	mes "[Guard]";
+	mes "So the talk about treasure was just a rumor? I'm not asking because I want to be rich overnight. Ha ha.";
+	close;
+OnTouch:
+	if ((malaya_hi > 19) && (malaya_buwaya == 0)) {
+		emotion e_gasp;
+		emotion e_gasp,1;
+	}
+	end;
+}
+malaya,276,288,5	script	Port Malaya Villager::buwaya_A	4_M_MALAYA,{
+	if (malaya_hi < 20) {
+		mes "- Look at you warily while whispering to each other. -";
+		close;
+	} else if (malaya_buwaya == 1) {
+		emotion e_gasp,0,"buwaya_A";
+		mes "[Port Malaya Villager]";
+		mes "No, I heard they got lost in the woods.";
+		mes "Who would hide such a treasure from a small village like ours?";
+		next;
+		emotion e_swt2,0,"buwaya_B";
+		mes "[Port Malaya Villager]";
+		mes "Could it been a monster? My grandma said there is a dragon with a huge head living deep inside the woods.";
+		next;
+		emotion e_no,0,"buwaya_C";
+		mes "[Port Malaya Villager]";
+		mes "No. Listen to me.";
+		next;
+		mes "[Port Malaya Villager]";
+		mes "You all know ^3131FFTotoy^000000? The kid living at the ^3131FFInn^000000.";
+		mes "Well, did you know Totoy came back from the woods recently?";
+		next;
+		emotion e_omg,0,"buwaya_A";
+		emotion e_omg,0,"buwaya_B";
+		mes "[Port Malaya Villager]";
+		mes "Really??? He came back alive?";
+		next;
+		emotion e_gasp,0,"buwaya_C";
+		mes "[Port Malaya Villager]";
+		mes "Yeah. But the strange part is that the troublemaker ^3131FFTotoy^000000 now quietly stays home and never comes out.";
+		next;
+		emotion e_what,0,"buwaya_B";
+		mes "[Port Malaya Villager]";
+		mes "Why?";
+		next;
+		emotion e_gasp,0,"buwaya_C";
+		mes "[Port Malaya Villager]";
+		mes "Don't you get it? Totoy must have found the treasure.";
+		next;
+		emotion e_omg,0,"buwaya_A";
+		emotion e_omg,0,"buwaya_B";
+		mes "[Port Malaya Villager]";
+		mes "What!!!! Then ^3131FFTotoy^000000 is rich now?";
+		next;
+		emotion e_no,0,"buwaya_C";
+		mes "[Port Malaya Villager]";
+		mes "I don't think so.";
+		mes "I saw ^3131FFTotoy^000000 come back home, but Totoy wasn't carrying anything.";
+		mes "But then, I must have missed it because I ran back home right away.";
+		next;
+		emotion e_what,0,"buwaya_B";
+		mes "[Port Malaya Villager]";
+		mes "Then what is ^3131FFTotoy^000000 doing at home?";
+		next;
+		emotion e_dots,0,"buwaya_C";
+		mes "[Port Malaya Villager]";
+		mes "I think Totoy is making a plan to bring the treasure back without us knowing it.";
+		mes "To have the whole treasure for himself, that greedy kid.";
+		next;
+		emotion e_what,0,"buwaya_A";
+		mes "[Port Malaya Villager]";
+		mes "Is that true?";
+		next;
+		emotion e_lv2,0,"buwaya_B";
+		mes "[Port Malaya Villager]";
+		mes "The treasure would be in better hands with me ~";
+		mes "I would clean it every day so it shined and would use it as a beautiful ornament. Ah~~~";
+		next;
+		emotion e_dots,0,"buwaya_C";
+		mes "[Port Malaya Villager]";
+		mes "Then how about we talk to ^3131FFTotoy^000000 to spill the beans on where the treasure is?";
+		next;
+		emotion e_what,0,"buwaya_A";
+		mes "[Port Malaya Villager]";
+		mes "Wow. That is an awesome idea. No wonder you're the leader!";
+		next;
+		emotion e_dots,0,"buwaya_A";
+		mes "[Port Malaya Villager]";
+		mes "But will ^3131FFTotoy^000000 give up the information easily?";
+		mes "Because Totoy was sneaky enough to think of getting away with taking the whole treasure.";
+		next;
+		emotion e_sob,0,"buwaya_B";
+		mes "[Port Malaya Villager]";
+		mes "Then we should convince ^3131FFTotoy^000000 to tell us where the treasure is instead of looking for it ourselves.";
+		next;
+		emotion e_sob,0,"buwaya_B";
+		mes "[Port Malaya Villager]";
+		mes "Ah~~~ it is so hard to get something pretty these days ~~~!!!!";
+		set malaya_buwaya,2;
+		erasequest 2271;
+		setquest 2272;
+		close;
+	} else if (malaya_buwaya == 2) {
+		mes "- Better pay a visit to this Totoy to get more information about the treasure. -";
+		close;
+	} else {
+		mes "- People are talking with serious faces. -";
+		close;
+	}
+}
+malaya,278,288,3	duplicate(buwaya_A)	Port Malaya Villager::buwaya_B	4_F_MALAYA
+malaya,276,286,7	duplicate(buwaya_A)	Port Malaya Villager::buwaya_C	4_M_MALAYA
+
+ma_in01,47,101,3	script	Totoy#buwaya	4_M_BARYO_BOY,7,7,{
+	if ((malaya_hi < 20) || (malaya_buwaya < 2)) {
+		mes "- See someone shaky with dopey eyes. -";
+		close;
+	}
+	if (malaya_buwaya == 2) {
+		mes "- See someone shaky with dopey eyes. -";
+		next;
+		if (select("Tap him on the shoulder.:Ignore him.") == 2)
+			close;
+		emotion e_omg;
+		mes "[Totoy]";
+		mes "Wah! No! Go away! Leave me alone!";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "Hey, are you alright?";
+		next;
+		mes "[Totoy]";
+		mes "Huh... you're a person? Who are you?";
+		next;
+		mes "- He looks you straight in the face but doesn't seem to recognize you. -";
+		next;
+		mes "[Totoy]";
+		mes "Who's there?";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "I am " + strcharinfo(0) + ". You are Totoy, right? People say you've found a treasure. Is it true?";
+		next;
+		mes "[Totoy]";
+		mes "What treasure?";
+		mes "I can't see. I'm blinded. Please help me. I'm tired and frustrated.";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "What happened?";
+		next;
+		mes "[Totoy]";
+		mes "Can't talk long. I need to heal my eyes first.";
+		mes "There should be some ^3131FFGreen Potion^000000 left inside the drawer. Will you take it out for me?";
+		set malaya_buwaya,3;
+		close;
+	} else if (malaya_buwaya == 3) {
+		if (!countitem(506)) {
+			mes "[Totoy]";
+			mes "Can't talk long. I need to heal my eyes first.";
+			mes "There should be some ^3131FFGreen Potion^000000 left inside the drawer. Will you get it for me?";
+			close;
+		}
+		mes "[Totoy]";
+		mes "Hello? Hey, are you still there? What happened to the Green Potion? Jeez, this is driving me crazy.";
+		next;
+		if (select("Hand over the Green Potion.:Do not hand over the potion.") == 2) {
+			mes "[Totoy]";
+			mes "Did you really leave? Hey! Darn!";
+		} else {
+			mes "[Totoy]";
+			mes "Gulp, gulp...";
+			delitem 506,1; //Green_Potion
+			set malaya_buwaya,4;
+		}
+		close;
+	} else if (malaya_buwaya == 4) {
+		emotion e_gasp;
+		mes "[Totoy]";
+		mes "I can see!! My eyes work!!!";
+		mes "Yay! I feel better now!";
+		next;
+		emotion e_dots,1;
+		emotion e_no1;
+		mes "[Totoy]";
+		mes "Wow! You look better than you sounded. Ha ha.";
+		next;
+		mes "[Totoy]";
+		mes "But what did you say? Something about a treasure?";
+		mes "Did you say I found a treasure?";
+		mes "What is that about?";
+		next;
+		select("Tell him what the people are talking about.");
+		emotion e_heh;
+		mes "[Totoy]";
+		mes "WHAT?";
+		mes "Puhaha! Totoy is rich! Became rich overnight! Chief Ed!";
+		next;
+		emotion e_pif;
+		mes "[Totoy]";
+		mes "Sorry but I went to the woods to collect bugs. Wish I saw a treasure while I was at it. Hmph!";
+		next;
+		emotion e_dots;
+		mes "[Totoy]";
+		mes "I did go deep in the woods because I wasn't getting anywhere with collecting bugs. But who would have thought I'd get into this mess?";
+		next;
+		if (select("What Totoy saw:About bugs") == 2) {
+			mes "[Totoy]";
+			mes "I only wanted to show people my collection of cute bugs. Ha ha.";
+			next;
+			emotion e_heh;
+			mes "[Totoy]";
+			mes "Dropping ice or bugs down peoples clothes is just like a daily greeting, isn't it?";
+			next;
+			mes "[Totoy]";
+			mes "I love to see people run around the village like they are in a marathon. He he.";
+			next;
+		}
+		mes "[Totoy]";
+		mes "I thought people wouldn't run away because of an ordinary bug so I went in the woods with Ed.";
+		next;
+		mes "[Totoy]";
+		mes "Ah, Ed is my cute puppy. He's very nice and cuddly. My best friend in the whole wide world.";
+		next;
+		emotion e_dots;
+		mes "[Totoy]";
+		mes "Ed usually barks a lot but I should have looked around when he barked and pulled on my sleeves.";
+		next;
+		mes "[Totoy]";
+		mes "- Totoy bends over and whispers to you as if walls have ears. -";
+		next;
+		mes "[Totoy]";
+		mes "There was a monster with a mouth the size of a house right behind me.";
+		next;
+		select("A monster?!");
+		mes "[Totoy]";
+		mes "Shssh! Be quiet. I've never seen a mouth that big before. It was full of a river of saliva flowing out of spiky teeth. Just the thought of it makes me want to hide.";
+		next;
+		mes "[Totoy]";
+		mes "The scariest part is that the monster has two heads. You won't believe it till you see it.";
+		next;
+		emotion e_sob;
+		mes "[Totoy]";
+		mes "Ed bit the monsters leg with all his might to let me get away. But I don't know what happened to him afterwards. Sniff~";
+		next;
+		mes "[Totoy]";
+		mes "That's when I hurt my eye. To tell you the truth I don't even remember how I came back.";
+		next;
+		select("About the monster");
+		mes "[Totoy]";
+		mes "Don't know. It was the first time I saw a monster like that. Who could live to tell the story?";
+		next;
+		mes "[Totoy]";
+		mes "Wait, maybe the ^FF0000Master of Hunting^000000 might know about the monster. They say he fought with all sorts of monsters.";
+		next;
+		mes "[Totoy]";
+		mes "I need some time alone. I need to make a tombstone for Ed. If you want to meet the ^FF0000Master of Hunting^000000, you'll find him near the Weapon Store.";
+		next;
+		mes "[Totoy]";
+		mes "And tell everyone else to stop spreading rumors about treasure. They don't know what I went through. Sniff! I'm going to put Ancient Worms in everyones clothes!";
+		set malaya_buwaya,5;
+		erasequest 2272;
+		setquest 2273;
+		close;
+	} else if (malaya_buwaya == 5) {
+		mes "[Totoy]";
+		mes "I have to make a grave for Ed. My loyal friend, Ed...";
+		mes "If you want to meet the ^FF0000Master of Hunting^000000, you'll find him near the Weapon Store.";
+		close;
+	} else if (malaya_buwaya == 6) {
+		mes "[Totoy]";
+		mes "Ed!! Eeeeeddddddd!!!";
+		mes "Can't believe you gave your life to save me. Wail!!!";
+		next;
+		mes "- Totoy can't be lying when he's crying his heart out like this. -";
+		close;
+	} else if (malaya_buwaya == 7) {
+		mes "[Totoy]";
+		mes "Where I saw the monster?";
+		next;
+		mes "[Totoy]";
+		mes "Um... Hmm...";
+		mes "I was so busy running away...";
+		next;
+		mes "[Totoy]";
+		mes "It was really deep in the woods. Probably even past Baryo Mahiwaga.";
+		mes "I think I heard the sound of ^3131FFFlowing Water^000000. A large whooshing sound. This is all I remember.";
+		close;
+	} else if ((malaya_buwaya > 7) && (malaya_buwaya < 12)) {
+		mes "[Totoy]";
+		mes "Poor Ed. I miss Ed. Wail!!!!";
+		close;
+	} else if (malaya_buwaya == 12) {
+		emotion e_sob;
+		mes "[Totoy]";
+		mes "Poor Ed. I miss Ed. Wail!!!!";
+		next;
+		enablenpc "Dog#buwaya_totoi";
+		mes "[Dog]";
+		mes "Bark bark!!";
+		next;
+		emotion e_omg;
+		mes "[Totoy]";
+		mes "Ed!!";
+		mes "Ed!!! You're alive!!!";
+		mes "You've come back!!! I'm so happy!!!!";
+		next;
+		mes "[Totoy]";
+		mes "Did you bring Ed back?";
+		mes "Thank you so much!";
+		mes "You didn't see the monster, did you?";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "The monster is called Buwaya. I told the Guard about the monster. You better not go near the place again.";
+		next;
+		mes "[Totoy]";
+		mes "Okay!";
+		mes "He he. Ed, the woods are too dangerous so we can't go there for bugs anymore.";
+		next;
+		mes "[Dog]";
+		mes "Whimper...";
+		next;
+		mes "[Totoy]";
+		mes "But I'm sure we can find a way to keep our reputation with other creepy stuff!";
+		next;
+		mes "[Dog]";
+		mes "Bark bark!!";
+		next;
+		/*
+		// Better translation needed.
+		mes "[Totoy]";
+		mes "Um... hey!";
+		next;
+		select("You are a " + ((Sex) ? "boy" : "girl") + ", aren't you?");
+		emotion e_omg,1;
+		mes "[Totoy]";
+		mes "Huh?";
+		if (!Sex) {
+			mes "Totoy is a girl, and you are a boy.";
+			mes "You're not a boy?";
+		} else {
+			mes "Totoy is a girl, and you are a girl.";
+			mes "You're not a girl?";
+		}
+		next;
+		mes "[Totoy]";
+		mes "Is it because my name, Totoy? But that's the name my parents gave me thinking I would be a boy when I was born. Ha ha!";
+		next;
+		*/
+		mes "[Totoy]";
+		mes "Anyway, thanks for bringing my best friend back.";
+		mes "I don't have much but would like to thank you. Wait, let me see what's inside my drawer. He he-";
+		set malaya_buwaya,13;
+		erasequest 2278;
+		setquest 2279;
+		close;
+	} else if (malaya_buwaya == 13) {
+//		if (IsPremiumPcCafe == 10)
+			.@amount = 10;
+//		else
+//			.@amount = 5;
+		if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
+			mes "- Wait!! -";
+			mes "- You have too many items on you. -";
+			mes "- Cannot receive the item. -";
+			mes "- Clean up your items -";
+			mes "- And please try again. -";
+			close;
+		}
+		mes "- Totoy goes through the drawer, turning it upside down. Making a mess of the room. -";
+		next;
+		mes "[Totoy]";
+		mes "Found it!";
+		next;
+		mes "[Totoy]";
+		mes "Here. My mom gave it to me but I don't know how to use it... He he.";
+		mes "I hope you can use it.";
+		next;
+		mes "[Totoy]";
+		mes "Visit me when you get bored!";
+		mes "Just don't ask about the treasure again~!";
+		next;
+		mes "[Dog]";
+		mes "Woof woof woof!!!!";
+		set malaya_buwaya,14;
+		getitem 6497,5; //Lesser_Agimat
+		disablenpc "Dog#buwaya_totoi";
+		erasequest 2279;
+		setquest 2280;
+		close;
+	} else {
+		mes "[Totoy]";
+		mes "Ed went out to play so I'm alone.";
+		mes "Would there be something awesome to surprise people with?";
+		close;
+	}
+OnTouch:
+	emotion e_omg;
+	end;
+}
+
+ma_in01,43,101,7	script	Dog#buwaya_totoi	4_DOG01,{
+	end;
+OnInit:
+	disablenpc "Dog#buwaya_totoi";
+	end;
+}
+
+ma_in01,44,105,3	script	Drawer#buwaya	CLEAR_NPC,{
+	if (malaya_buwaya == 3) {
+		mes "- You look for the Green Potion in Totoys drawer. -";
+		next;
+		mes "- Rummaging, fumbling. -";
+		next;
+		mes "- Rummaging, fumbling. -";
+		mes "- Rummaging, fumbling. -";
+		next;
+		mes "- Clunk, clank, crunch. -";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "What? I only see an empty potion bottle.";
+		mes "Does this mean I have to get the potion myself? That Totoy is really a troublemaker.";
+		close;
+	}
+	end;
+}
+
+malaya,290,152,5	script	Master of Hunting#buwaya	4_M_BARYO_MAN,{
+	if ((malaya_hi < 20) || (malaya_buwaya < 5)) {
+		mes "[Master of Hunting]";
+		mes "Oh! Ho! Ho!";
+		mes "I am the Master of Hunting! I'm not afraid of anything with just one exception! I'm afraid of outsiders...";
+		close;
+	}
+	if (malaya_buwaya == 5) {
+		mes "[Master of Hunting]";
+		mes "Yo! Ho! Ho!";
+		mes "I went all the way to Rune-Midgarts Kingdom to defeat the Angry Minorous.";
+		next;
+		mes "[Master of Hunting]";
+		mes "And I succeeded in killing Muka, the one with the voice of a demon that disturbs the peace of the world.";
+		mes "Wow! He was really tough. I'm starting to sweat just thinking of him.";
+		next;
+		mes "[Master of Hunting]";
+		mes "Yo! You look like you have a few battle stories yourself. Have you ever seen a Minorous? Ha ha ha!";
+		next;
+		mes "[Master of Hunting]";
+		mes "So you came here to learn all about my excellent hunting skills? Or to ask me to publish an essay on Master of Hunting? Ho!";
+		next;
+		if (select("About Totoys monster:Interrupt.") == 2) {
+			mes "[Master of Hunting]";
+			mes "Oh? Hey! Where are you going?!";
+			close;
+		}
+		mes "[Master of Hunting]";
+		mes "You say someone saw the monster?";
+		next;
+		mes "[Master of Hunting]";
+		mes "There are many monsters in and out of Port Malaya. What is so special about this one?";
+		next;
+		select("About a monster with two heads");
+		mes "[Master of Hunting]";
+		mes "Ho! A monster with two heads, you say? Are you kidding? Where on earth is there a monster with two heads?!";
+		next;
+		mes "[Master of Hunting]";
+		mes "The kid must have been scared by a Condor or something.";
+		mes "There's a saying that someone surprised to see a Permeter, will also be surprised to see a peach tree. Ha ha!";
+		next;
+		mes "[Master of Hunting]";
+		mes "You shouldn't lie to an adult. I understand you want the Master of Huntings attention. Ha ha!";
+		next;
+		if (select("I will prove it.:Suspicious of Totoy.") == 2) {
+			mes "[Master of Hunting]";
+			mes "Kids tell stories for their own reasons. I'm sure Totoy is the same.";
+			set malaya_buwaya,6;
+			close;
+		}
+		mes "[Master of Hunting]";
+		mes "Oh! Really? Bring proof if you really think the kid is telling the truth.";
+		next;
+		mes "[Master of Hunting]";
+		mes "Every living thing leaves some kind of trace behind. You also leave behind traces and scents wherever you go. Especially in private places, I mean. He he!";
+		next;
+		mes "[Master of Hunting]";
+		mes "Try collecting 10 Animal Samples from where the kid saw the monster. I will look for traces of that monster from the samples.";
+		next;
+		mes "[Master of Hunting]";
+		mes (Sex) ? "It won't be pleasant but any brave man could easily do it, don't you agree?" : "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!";
+		set malaya_buwaya,7;
+		erasequest 2273;
+		setquest 2274;
+		close;
+	} else if (malaya_buwaya == 6) {
+		mes "[Master of Hunting]";
+		mes "Oh, you're back!";
+		next;
+		if (select("Let's see if we have a monster in it!:I don't think there is a monster.") == 2) {
+			mes "[Master of Hunting]";
+			mes "It was a kid's joke. Ha ha.";
+			close;
+		}
+		mes "[Master of Hunting]";
+		mes "Oh! Really? Bring proof if you really think the kid is telling the truth.";
+		next;
+		mes "[Master of Hunting]";
+		mes "Every living thing leaves some kind of trace behind. You also leave behind traces and scents wherever you go. Especially in private places, I mean. He he!";
+		next;
+		mes "[Master of Hunting]";
+		mes "Try collecting 10 Animal Samples from where the kid saw the monster. I will look for traces of that monster from the samples.";
+		next;
+		mes "[Master of Hunting]";
+		mes (Sex) ? "It won't be pleasant but any brave man could easily do it, don't you agree?" : "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!";
+		set malaya_buwaya,7;
+		erasequest 2273;
+		setquest 2274;
+		close;
+	} else if (malaya_buwaya == 7) {
+		if (countitem(6519) < 10) {
+			mes "[Master of Hunting]";
+			mes "Bring me back samples if you want to prove there is a monster with two heads.";
+			close;
+		}
+		mes "[Master of Hunting]";
+		mes "Argh! That's so foul.";
+		mes "You've really brought back the samples.";
+		mes "Ho! Leave it there and come back after washing your hands. Even god won't smile down at you with that stench.";
+		delitem 6519,10; //Collected_Sample
+		set malaya_buwaya,8;
+		erasequest 2274;
+		setquest 2275;
+		close;
+	} else if (malaya_buwaya == 8) {
+		mes "[Master of Hunting]";
+		mes "Ho! Shall I?";
+		next;
+		mes "- Rummaging, fumbling. -";
+		next;
+		mes "- Rummaging, fumbling. -";
+		mes "- Wriggling, wiggling. -";
+		next;
+		mes "- Rummaging, fumbling. -";
+		mes "- Wriggling, wiggling. -";
+		mes "- Sway, swag. -";
+		next;
+		mes "[Master of Hunting]";
+		mes "Ho! This is!!";
+		next;
+		mes "[Master of Hunting]";
+		mes "Wow! Ho! Ho! Ho! Awesome!!!!!!";
+		next;
+		mes "[Master of Hunting]";
+		mes "You! Come here and feel this!";
+		set malaya_buwaya,9;
+		enablenpc "#buwaya_soil";
+		close;
+	} else if (malaya_buwaya == 9) {
+		mes "[Master of Hunting]";
+		mes "Don't just stand there. Touch the sample!";
+		enablenpc "#buwaya_soil";
+		close;
+	} else if (malaya_buwaya == 10) {
+		mes "[Master of Hunting]";
+		mes "Hurry and tell the Guard Leader that Buwaya is active again. Hurry! You'll find the Guard Leader at the north of the village.";
+		close;
+	} else {
+		mes "[Master of Hunting]";
+		mes "Snooze...";
+		close;
+	}
+}
+
+malaya,291,152,3	script	#buwaya_soil	4_SOIL,{
+	if (malaya_buwaya == 9) {
+		mes "- Rummaging, fumbling. -";
+		next;
+		mes "- Rummaging, fumbling. -";
+		mes "- Wriggling, wiggling. -";
+		next;
+		mes "- Rummaging, fumbling. -";
+		mes "- Wriggling, wiggling. -";
+		mes "- Sway, swag. -";
+		next;
+		if (rand(1,10) <= 5) {
+			mes "[" + strcharinfo(0) + "]";
+			mes "I don't see anything.";
+			next;
+			mes "[Master of Hunting]";
+			mes "It can't be! Look closer!";
+		} else {
+			mes "- Felt something pointy with the end of your fingers. -";
+			next;
+			mes "[" + strcharinfo(0) + "]";
+			mes "Ouch!";
+			mes "What is this?";
+			next;
+			mes "[Master of Hunting]";
+			mes "Ho! This is huge! And so dense that it can easily scratch steel!";
+			next;
+			mes "[Master of Hunting]";
+			mes "This is ^3131FFBuwaya^000000's tooth!";
+			mes "How could this be!";
+			next;
+			select("Buwaya?");
+			mes "[Master of Hunting]";
+			mes "Ah! Yes! Stop holding it up. It stinks. Go wash your hands.";
+			next;
+			mes "[Master of Hunting]";
+			mes "Hmm. The monster the kid saw must be Buwaya. No doubt about it.";
+			next;
+			mes "[Master of Hunting]";
+			mes "I've heard that the wife of the neighbor of my grandfather's uncle on my mom's side was also killed by Buwaya.";
+			next;
+			mes "[Master of Hunting]";
+			mes "They say no living thing is left after Buwaya passes by.";
+			mes "Totoy is one lucky kid. Wow!";
+			next;
+			mes "[Master of Hunting]";
+			mes "Buwaya was inactive for a long time. Wonder if it was hibernating? Hmm.";
+			next;
+			mes "[Master of Hunting]";
+			mes "Now that I know that a monster like that is out there, I should be cautious, too.";
+			mes "Must tell the villagers not to go too deep into the woods.";
+			next;
+			mes "[Master of Hunting]";
+			mes "Please go and tell the Guard Leader that Buwaya is active again.";
+			mes "I will contact other hunters in the meantime and think of a plan to kill Buwaya.";
+			set malaya_buwaya,10;
+			disablenpc "#buwaya_soil";
+			erasequest 2275;
+			setquest 2276;
+		}
+		close;
+	}
+	end;
+OnInit:
+	disablenpc "#buwaya_soil";
+	end;
+}
+
+-	script	Unknown Trace#buwaya	-1,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
+		mes "- Wait!! -";
+		mes "- You have too many items on you. -";
+		mes "- Cannot receive the item. -";
+		mes "- Clean up your items -";
+		mes "- And please try again. -";
+		close;
+	}
+	if (malaya_buwaya == 7) {
+		if (countitem(6519) >= 10) {
+			mes "- You don't have to collect any more samples. -";
+			close;
+		}
+		mes "- You see something entangled with soil and grass. -";
+		next;
+		if (rand(1,10) <= 2) {
+			mes "- You are nauseous by the foul smell coming from the samples you are collecting. -";
+			sc_start SC_POISON,5000,0;
+			close;
+		}
+		mes "- You slowing and cautiously collect the squashy and slightly warm substance. -";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "It's warm as a mother's bosom.";
+		getitem 6519,1; //Collected_Sample
+		disablenpc strnpcinfo(0);
+		initnpctimer;
+		close;
+	}
+	end;
+OnTimer20000:
+	enablenpc strnpcinfo(0);
+	stopnpctimer;
+	end;
+}
+ma_fild02,155,235,3	duplicate(Unknown Trace#buwaya)	Unknown Trace#buwaya_1	4_SOIL
+ma_fild02,143,142,3	duplicate(Unknown Trace#buwaya)	Unknown Trace#buwaya_2	4_SOIL
+ma_fild02,266,155,3	duplicate(Unknown Trace#buwaya)	Unknown Trace#buwaya_3	4_SOIL
+ma_fild02,221,91,3	duplicate(Unknown Trace#buwaya)	Unknown Trace#buwaya_4	4_SOIL
+ma_fild02,205,85,3	duplicate(Unknown Trace#buwaya)	Unknown Trace#buwaya_5	4_SOIL
+ma_fild02,300,98,3	duplicate(Unknown Trace#buwaya)	Unknown Trace#buwaya_6	4_SOIL
+ma_fild02,100,275,3	duplicate(Unknown Trace#buwaya)	Unknown Trace#buwaya_7	4_SOIL
+
+malaya,290,340,3	script	Guard Leader#buwaya	4_MAL_CAPTAIN,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
+		mes "- Wait!! -";
+		mes "- You have too many items on you. -";
+		mes "- Cannot receive the item. -";
+		mes "- Clean up your items -";
+		mes "- And please try again. -";
+		close;
+	}
+	if (malaya_hi < 20) {
+		mes "- Look at you warily while whispering to each other. -";
+		close;
+	}
+	if (malaya_buwaya <= 10) {
+		mes "[Guard Leader]";
+		mes "We are busy as hell because of Bangungots servants attacking the hospital.";
+		next;
+		mes "[Guard Leader]";
+		mes "We are doing our best in securing the safety of our village so please enjoy your stay in Port Malaya.";
+	}
+	if (malaya_buwaya == 10) {
+		next;
+		if (select("Tell him about Buwaya.:Done with conversation.") == 2) {
+			close;
+		}
+		mes "[Guard Leader]";
+		mes "Buwaya? The merciless creature is back?";
+		next;
+		mes "[Guard Leader]";
+		mes "That's bad news. We are already short-handed by assigning everyone to fight off Bangungot.";
+		next;
+		mes "[Guard Leader]";
+		mes "And villagers need to go to the woods to collect fruits and vegetables.";
+		next;
+		mes "[Guard Leader]";
+		mes "Hmm... will you be able to help Port Malaya?";
+		next;
+		if (select("Leave it to me!:I'm pretty busy myself.") == 2) {
+			mes "[Guard Leader]";
+			mes "Really? That's no good. All the lives of the villagers will be at stake if we don't do something. How can a youth like you be so heartless. Are all outsiders like you? Hmph! Can't trust young people these days. Hmph.";
+			close;
+		}
+		mes "[Guard Leader]";
+		mes "I knew I could count on you.";
+		next;
+		mes "[Guard Leader]";
+		mes "Good. I will trust you.";
+		mes "I need to know where Buwaya will likely appear in order to secure villagers living area.";
+		mes "Guess Buwayas nest will be the best bet.";
+		next;
+		mes "[Guard Leader]";
+		mes "^3131FFShoot a smoke bomb^000000 once you reach the area.";
+		mes "Then we will run to where the smoke bomb was shot.";
+		next;
+		mes "[Guard Leader]";
+		mes "Then take care and good luck.";
+		set malaya_buwaya,11;
+		erasequest 2276;
+		setquest 2277;
+	} else if (malaya_buwaya == 11) {
+		mes "[Guard Leader]";
+		mes "^3131FFShoot a smoke bomb^000000 once you reach the area.";
+		mes "Then we will run to where the smoke bomb was shot.";
+	} else if ((malaya_buwaya == 12) || (malaya_buwaya == 13)) {
+		mes "[" + strcharinfo(0) + "]";
+		mes "Let's first bring Ed to Totoy.";
+	} else if (malaya_buwaya == 14) {
+		mes "[Guard Leader]";
+		mes "The Guard Leader gave you the location of Buwaya's cave.";
+		mes "This can't be happening.";
+		next;
+		mes "[Guard Leader]";
+		mes "I'm way out of men to assign to the Buwaya situation but well have to do something with what we got.";
+		next;
+		mes "[Guard Leader]";
+		mes "Here, this is a symbol of our gratitude.";
+		mes "If you would like to help with Buwaya again, please look for me.";
+		mes "Hope you have a great journey.";
+		set malaya_buwaya,15;
+		getexp 1000000, 600000;
+		completequest 2280;
+	} else {
+		set .@hunting, checkquest(2281,HUNTING);
+		if (.@hunting == -1) {
+			mes "[Guard Leader]";
+			mes "Hear Buwaya appeared from the depth of the Forest.";
+			mes "As everyone knows, all our manpower is dispatched to handle Bangungots servants attacking the hospital recently.";
+			next;
+			mes "[Guard Leader]";
+			mes "That is why we have no choice but to ask an outsider to help eliminate Buwaya.";
+			mes "They say Buwaya is a very strong and ugly monster with two heads.";
+			mes "Will you help us defeat Buwaya?";
+			next;
+			if (select("Of course.:Nope.") == 2) {
+				mes "[Guard Leader]";
+				mes "Buwaya is known to be a very dangerous monster.";
+				mes "There is no shame in rejecting this request.";
+				close;
+			}
+			if (BaseLevel < 130) {
+				mes "[Guard Leader]";
+				mes "This mission will be a dangerous one.";
+				mes "If you want to help get rid of Buwaya, you must be prepared.";
+				mes "Come back once you reach LV 130.";
+				close;
+			}
+			mes "[Guard Leader]";
+			mes "According to the legend, Buwaya kidnaps people and puts them in the sack on its back and then eats them later.";
+			next;
+			mes "[Guard Leader]";
+			mes "Keep this in mind and be cautious at all times.";
+			mes "I recommend asking trustful colleagues for help.";
+			setquest 2281;
+		} else if (.@hunting == 0 || .@hunting == 1) {
+			mes "[Guard Leader]";
+			mes "How is it going with the Buwaya situation?";
+			next;
+			if (select("I give up.:Still fighting.") == 2) {
+				mes "[Guard Leader]";
+				mes "Keep this in mind and be cautious at all times.";
+				mes "I recommend asking trustful colleagues for help.";
+				close;
+			}
+			mes "[Guard Leader]";
+			mes "Buwaya is known to be a very dangerous monster.";
+			mes "There is no shame in rejecting this request.";
+			erasequest 2281;
+		} else if (.@hunting == 2) {
+//			if (IsPremiumPcCafe == 10)
+				.@amount = 10;
+//			else
+//				.@amount = 5;
+			mes "[Guard Leader]";
+			mes "Can't believe you really got rid of Buwaya!";
+			mes "You aren't just any ordinary youth, aren't you? People of Port Malaya can now sleep at night.";
+			next;
+			mes "[Guard Leader]";
+			mes "Good work.";
+			erasequest 2281;
+			getitem 6497, .@amount; //Lesser_Agimat
+			getexp 0,600000;
+		} else {
+			mes "[Guard Leader]";
+			mes "I will not stand down until all of Port Malaya, including Baryo Mahiwaga, is safe from Buwaya. Promise to take care of yourself.";
+			erasequest 2281;
+		}
+	}
+	close;
+}
+
+ma_fild02,307,245,0	script	#buwaya_todog1	HIDDEN_WARP_NPC,3,3,{
+	end;
+OnTouch:
+	if (malaya_buwaya == 11) {
+		enablenpc "Dog#buwaya";
+		//mes "[Here something]";
+		mes "Bark bark!!";
+		close;
+	}
+	end;
+}
+ma_fild02,320,241,0	duplicate(#buwaya_todog1)	#buwaya_todog2	HIDDEN_WARP_NPC,3,3
+ma_fild02,317,250,0	duplicate(#buwaya_todog1)	#buwaya_todog3	HIDDEN_WARP_NPC,7,7
+
+ma_fild02,312,259,3	script	Dog#buwaya	4_DOG01,{
+	if (malaya_buwaya == 11) {
+		mes "[Dog]";
+		mes "Bark bark!!";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "Why is a dog here?";
+		next;
+		if (select("Look closely at the dog.:Ignore it.") == 2) {
+			mes "[" + strcharinfo(0) + "]";
+			mes "Looks like a lost dog.";
+			close;
+		}
+		mes "- Looked real hard at the dirty dog and noticed an old collar on its neck. -";
+		next;
+		mes "- The collar says, 'Forever with Totoy'. -";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "So you are Ed?";
+		next;
+		mes "[Dog]";
+		mes "Bark bark!";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "You didn't get killed by Buwaya. You lucky little dog. Let's go back to your owner.";
+		next;
+		emotion e_ho;
+		mes "[Dog]";
+		mes "Bark bark!!";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "Ah, before we go, do you happen to know where Buwaya's nest is?";
+		next;
+		mes "[Dog]";
+		mes "Woof!";
+		next;
+		mes "- Ed is one smart dog and understood what you asked him. Ed started to bark towards the north. -";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "Buwaya is over there!";
+		mes "Then I should shoot the smoke bomb here.";
+		next;
+		mes "- You take the smoke bomb out of your inventory and shoot towards the sky. -";
+		next;
+		mes "^FF0000- Shoook-^000000";
+		enablenpc "Guard#buwayacave";
+		specialeffect2 EF_MVP;
+		next;
+		mes "[Guard]";
+		mes "Job well done!";
+		mes "So Buwaya lives in remote place like this. I will make sure this information goes to the Guard Leader!";
+		disablenpc "Guard#buwayacave";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "Should I return Ed to Totoy first and then go see the Guard Leader?";
+		next;
+		mes "[Dog]";
+		mes "Bark bark!";
+		set malaya_buwaya,12;
+		disablenpc "Dog#buwaya";
+		erasequest 2277;
+		setquest 2278;
+		close;
+	} else if (malaya_buwaya == 12) {
+		mes "[" + strcharinfo(0) + "]";
+		mes "Lets first bring Ed to Totoy and then go back to the Guard Leader.";
+		close;
+	}
+	end;
+OnInit:
+	disablenpc "Dog#buwaya";
+	end;
+}
+
+ma_fild02,308,262,3	script	Guard#buwayacave	4_MAL_SOLDIER,{
+	end;
+OnInit:
+	disablenpc "Guard#buwayacave";
+	end;
+}
+
+// Bakonawa Extermination :: malaya_bakonawa
+//============================================================
+malaya,280,331,4	script	Singing Man#bako1	4_M_BARYO_MAN,{
+	if (malaya_bakona1 < 5) {
+		mes "[Singing Man]";
+		mes "Story of dragon that lives at a lake~";
+		mes "Story of an old lady";
+		mes "that became a dragon long ago~";
+		next;
+		mes "[Singing Man]";
+		mes "Waiting for the son that left for a foreign land,";
+		mes "my son will return";
+		mes "when that moon sets for the 90th time";
+		next;
+		mes "[Singing Man]";
+		mes "The moon sets for the 89th,";
+		mes "The moon sets for the 90th,";
+		mes "The moon sets for the 191st...";
+		next;
+		mes "[Singing Man]";
+		mes "That moon has taken my son away~";
+		mes "That horrible thing";
+		mes "has swallowed my son,";
+		mes "and I will punish that moon~";
+		next;
+		mes "[Singing Man]";
+		mes "The day the furious moon hides itself from sight,";
+		mes "the whole world will be flooded with rain";
+		mes "with all the villages and people facing death under water~";
+		next;
+		mes "[Singing Man]";
+		mes "The old lady's curse made the moon furious~";
+		mes "Get rid of the old lady to calm the moon~";
+		mes "If only the old lady wasn't here, If only the old lady wasn't here...";
+		next;
+		mes "[Singing Man]";
+		mes "I hear rumors~";
+		mes "The old lady threw herself into the lake~";
+		mes "the old lady, now turned into a dragon, will swallow the moon";
+		mes "and soon swallow the village too~";
+		close;
+	} else {
+		mes "[Singing Man]";
+		mes "You say the legend is all a lie?";
+		mes "You mean my ancestors are all liars";
+		mes "and swindlers?";
+		next;
+		mes "[Singing Man]";
+		mes "This village is built on an old legend";
+		mes "and history.";
+		mes "They are not the kind of people that will be shaken by";
+		mes "foolish words of an imbecile such as yourself.";
+		close;
+	}
+}
+
+malaya,275,333,5	script	Singing Woman#bako1	4_F_BARYO_WOMAN,{
+	if (malaya_bakona1 < 5) {
+		mes "[Singing Woman]";
+		mes "Bakonawa that live at a lake,";
+		mes "story of an old lady that became a dragon.";
+		next;
+		mes "[Singing Woman]";
+		mes "The son that was suppose to return after the moon sets for the 90th time";
+		mes "never did come back even after the moon had set for a few hundred times~";
+		mes "The moon has swallowed the old lady's son~";
+		next;
+		mes "[Singing Woman]";
+		mes "The moon, the moon, you shall receive the old lady's curse~";
+		mes "The whole village was immersed in death";
+		mes "with rain and floods sent by the furious moon~";
+		next;
+		mes "[Singing Woman]";
+		mes "The moon, the moon, be still and be calm,";
+		mes "for the old lady is gone and she is no more~";
+		mes "The old lady has drowned in the lake~";
+		mes "She will transform into Bakonawa and come back...";
+		next;
+		mes "[Singing Woman]";
+		mes "...to swallow you and";
+		mes "punish the village soon~";
+		mes "The day the moon dies";
+		mes "is the day the village dies too~";
+		close;
+	} else {
+		mes "[Singing Woman]";
+		mes "The legends are all a lie?";
+		mes "Why do you say such nonsense?";
+		mes "Is there nothing";
+		mes "that is important for you to protect?";
+		next;
+		mes "[Singing Woman]";
+		mes "Poor Bakonawa...";
+		mes "I would be happy";
+		mes "if she took a big bite out of someone like you!";
+		close;
+	}
+}
+
+malaya,290,329,4	script	Frightened Boy#bako1	4_M_BARYO_BOY,{
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona1 < 5) {
+		mes "[Frightened Boy]";
+		mes "The vicious monster Bakonawa will soon come";
+		mes "to swallow the moon and take vengeance upon the village.";
+		mes "I'm scared, please help...";
+		close;
+	} else {
+		mes "[Frightened Boy]";
+		mes "The legend of Bakonawa is all a lie?";
+		mes "So that means Bakonawa doesn't exist?";
+		mes "I'm going to play with my friends at the lake later.";
+		mes "You told me it was all a lie right?";
+		close;
+	}
+}
+
+malaya,264,338,4	script	Frightened Maiden#bako1	4_F_BARYO_GIRL,{
+	if (malaya_hi < 20) {
+		mes "- She seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona1 < 5) {
+		mes "[Frightened Maiden]";
+		mes "It is said that Bakonawa hates loud noises.";
+		mes "Pound the pot if you want to live!";
+		next;
+		switch(select("Hates loud noises?:What is Bakonawa?")) {
+		case 1:
+			mes "[Frightened Maiden]";
+			mes "You already heard that the old lady";
+			mes "died and became Bakonawa, right?";
+			next;
+			mes "[Frightened Maiden]";
+			mes "The legend has it that";
+			mes "the old lady had very keen hearing";
+			mes "because she was always focusing on";
+			mes "the returning of her traveling son.";
+			next;
+			mes "[Frightened Maiden]";
+			mes "So naturally, Bakonawa also";
+			mes "has very keen hearing.";
+			mes "The reason why everyone is banging";
+			mes "pots and pans is because of this.";
+			close;
+		case 2:
+			mes "[Frightened Maiden]";
+			mes "It is a terrible monster that lives at a lake.";
+			mes "We are all trembling with fear";
+			mes "because we don't know when it might attack the village.";
+			next;
+			mes "[Frightened Maiden]";
+			mes "Some say that it is more obsessed with swallowing the moon";
+			mes "than attacking the village.";
+			mes "if that's the case, I wish it would just swallow the moon";
+			mes "and leave us alone.";
+			close;
+		}
+	} else {
+		mes "[Frightened Maiden]";
+		mes "The villagers hate you now.";
+		mes "You've been saying that legend of Bakonawa";
+		mes "is a lie and they are saying you are more of a monster";
+		mes "than Bakonawa.";
+		close;
+	}
+}
+
+malaya,272,339,5	script	Old Fortune Teller#bako1	4_F_BARYO_OLD,{
+	if (malaya_hi < 20) {
+		mes "- Old Fortune Teller seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona1 < 5) {
+		mes "[Old Fortune Teller]";
+		mes "You must not hate Bakonawa.";
+		mes "The hate against it is only feeding its rage";
+		mes "to grow bigger.";
+		next;
+		mes "[Old Fortune Teller]";
+		mes "To calm the dead lady's anger,";
+		mes "we annually hold a ceremony and prepare food.";
+		mes "But there seems to be no way to calm the";
+		mes "ever growing anger of the old lady.";
+		next;
+		mes "[Old Fortune Teller]";
+		mes "The day is nearing. I can sense it.";
+		mes "Bakonawa will soon swallow the moon";
+		mes "and come to punish the village.";
+		close;
+	} else {
+		mes "[Old Fortune Teller]";
+		mes "How can you say the legend is a lie!";
+		mes "Because of you, the fury of Bakonawa";
+		mes "grew even larger!";
+		mes "If the village perishes,";
+		mes "it is all your fault!";
+		close;
+	}
+}
+
+malaya,285,332,4	script	Old Legend Teller#bako1	4_M_BARYO_OLD,{
+	if (checkweight(1301,3) == 0) {
+		mes "You cannot start the conversation. You are carrying too many items. -";
+		close;
+	}
+	if (BaseLevel < 120) {
+		mes "[Old Legend Teller]";
+		mes "There is something that needs to be done";
+		mes "but you look too fragile";
+		mes "to give me a hand.";
+		next;
+		mes "[Old Legend Teller]";
+		mes "Come back when";
+		mes "your strength grows strong enough";
+		mes "to match Incubus.";
+		close;
+	}
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona1 == 0) {
+		mes "[Old Legend Teller]";
+		mes "The old lady has come back";
+		mes "to life as Bakonawa.";
+		mes "Soon she will come to take vengeance on the village.";
+		mes "We must calm her";
+		mes "if to prevent further destruction...";
+		next;
+		switch(select("Calm Bakonawa?:Further destruction?")) {
+		case 1:
+			mes "[Old Legend Teller]";
+			mes "The old lady faced an unjust death";
+			mes "because of villagers' selfishness.";
+			mes "She was a caring mother who loved her";
+			mes "son dearly.";
+			next;
+			mes "[Old Legend Teller]";
+			mes "If we track the whereabouts of her son and hold a ritual";
+			mes "with her son's belongings,";
+			mes "her restless soul will be calmed";
+			mes "and she will spare us from destruction.";
+			next;
+			mes "[Villagers]";
+			mes "It is no use sir!!";
+			next;
+			mes "[Villagers]";
+			mes "You cannot stop the monster that way!";
+			next;
+			mes "[Old Legend Teller]";
+			mes "Of course, it will not be easy to track down the whereabouts of a person";
+			mes "who has been gone for a hundred years.";
+			mes "...";
+			next;
+			mes "[Old Legend Teller]";
+			mes "Still, don't you think";
+			mes "it is worth a try?";
+			mes "Please help us and save us from our misery.";
+			next;
+			switch(select("It is no use.:I'll help.")) {
+			case 1:
+				mes "[Old Legend Teller]";
+				mes "Yes, you are also right.";
+				mes "You are up against not a human,";
+				mes "but a monster.";
+				mes "Still, I trust in that old lady's";
+				mes "good heart.";
+				close;
+			case 2:
+				mes "[Old Legend Teller]";
+				mes "Will you do it?";
+				mes "According to the legend,";
+				mes "the old lady's son was limping";
+				mes "and was a traveling merchant that sold wooden dolls.";
+				next;
+				mes "[Old Legend Teller]";
+				mes "There is a ^FF0000Slate Piece^000000 he left.";
+				mes "But the piece is small and damaged,";
+				mes "its hard to identify it.";
+				next;
+				mes "[Old Legend Teller]";
+				mes "First, bring it to me.";
+				mes "Down along this path";
+				mes "you will meet my granddaughter near the port.";
+				mes "Get the Slate Piece from there.";
+				set malaya_bakona1,1;
+				setquest 1174;
+				close;
+			}
+		case 2:
+			mes "[Old Legend Teller]";
+			mes "The grudge against the people of";
+			mes "Bakonawa- I mean, the dead old lady.";
+			mes "The moon and this village...";
+			mes "She will try to destroy it.";
+			next;
+			select("Take vengeance? After all these years?");
+			mes "[Old Legend Teller]";
+			mes "For some time, she has";
+			mes "blamed the moon and";
+			mes "resented the villagers.";
+			mes "The feeling grew larger as the time passed.";
+			next;
+			mes "[Old Legend Teller]";
+			mes "Why do you think she became such a monster?";
+			mes "What do you think went through her head";
+			mes "for years and years?";
+			mes "Anger and vengeance.";
+			next;
+			mes "[Old Legend Teller]";
+			mes "Unforgettable grudge";
+			mes "that she was abandoned.";
+			mes "against the moon and the village.";
+			mes "This is why this grudge must be resolved.";
+			close;
+		}
+	} else if (malaya_bakona1 == 1) {
+		mes "[Old Legend Teller]";
+		mes "Please bring the ^FF0000Slate Piece^000000.";
+		mes "Down along this path";
+		mes "you will meet my granddaughter near the port.";
+		mes "Get the Slate Piece from there.";
+		close;
+	} else if (malaya_bakona1 == 2) {
+		mes "[Old Legend Teller]";
+		mes "Good, you have the Slate Piece.";
+		mes "Hold on to it and don't lose it.";
+		mes "It will be of helpful in tracking down the legend.";
+		next;
+		mes "[Old Legend Teller]";
+		mes "I heard there is a man that lives by himself";
+		mes "at the end of northwestern part of Forest Field.";
+		mes "I heard someone saw a wooden doll there.";
+		mes "It is such a remote place that people like us";
+		mes "simply cannot travel there.";
+		mes "Could you visit the place for us?";
+		next;
+		switch(select("Go there yourself!:Your explanation is too vague.:On my way!")) {
+		case 1:
+			mes "[Old Legend Teller]";
+			mes "You twisted youth!";
+			close;
+		case 2:
+			mes "[Old Legend Teller]";
+			mes "You have a point, but";
+			mes "this is the best I can do for now.";
+			mes "The place is at the end of northwestern part of the forest.";
+			mes "After you pass the bridge and travel west,";
+			mes "you will see a person.";
+			break;
+		case 3:
+			mes "[Old Legend Teller]";
+			mes "You have a good heart young man!";
+			mes "The place is at the end of northwestern part of the forest.";
+			mes "After you pass the bridge and travel west,";
+			mes "You will see a ^0000FFMalaya Immigrant^000000.";
+			break;
+		}
+		mes "Good luck to you... for our sake...";
+		erasequest 1175;
+		setquest 1176;
+		set malaya_bakona1,3;
+		close;
+	} else if (malaya_bakona1 == 3) {
+		mes "[Old Legend Teller]";
+		mes "The place is at the end of northwestern part of the forest.";
+		mes "After you pass the bridge and travel west,";
+		mes "you will see a person.";
+		mes "Good luck to you... for our sake...";
+		close;
+	} else if (malaya_bakona1 < 6) {
+		mes "[Old Legend Teller]";
+		mes "The track of the old lady's son";
+		mes "is connected all the way to";
+		mes "Baryo Mahiwaga?";
+		mes "There is a chance he wasn't a merchant...";
+		mes "I'm really curious about who he was...";
+		next;
+		mes "[Old Legend Teller]";
+		mes "Why did you come back here";
+		mes "instead of going straight to";
+		mes "Baryo Mahiwaga?";
+		close;
+	} else if (malaya_bakona1 == 6) {
+		mes "[Old Legend Teller]";
+		mes "Is that really true?";
+		mes "Bakonawa turning into an old lady";
+		mes "and fabricating the legend...";
+		mes "It seems all the villagers up until now";
+		mes "have been manipulated by that terrible monster.";
+		next;
+		mes "[Old Legend Teller]";
+		mes "There is no reason to hesitate then.";
+		mes "You must go into Bakonawa's lair";
+		mes "before it attacks first.";
+		mes "I believe we can trust you to do this, yes?";
+		next;
+		switch(select("Well...:Of course!")) {
+		case 1:
+			mes "[Old Legend Teller]";
+			mes "The atmosphere was really good";
+			mes "but suddenly it's all ruined.";
+			mes "I didn't expect you to be so shy...";
+			close;
+		case 2:
+			mes "[Old Legend Teller]";
+			mes "I will speak to";
+			mes "the village chief for you";
+			mes "so that you can enter the Bakonawa Lake.";
+			mes "Please get rid of this monster for us.";
+			erasequest 1179;
+			set malaya_bakona1,7;
+//			if (IsPremiumPcCafe == 10)
+				getitem 6499,5; //Ancient_Grudge
+//			else
+//				getitem 6499,3; //Ancient_Grudge
+			getexp 500000,200000;
+			close;
+		}
+		close;
+	} else if (malaya_bakona1 == 7) {
+		if (malaya_bakona2 < 15) {
+			mes "[Old Legend Teller]";
+			mes "If you don't mind,";
+			mes "could you lend a hand to the Village Chief?";
+			mes "Nobody cares for each other anymore";
+			mes "because of Bakonawa...";
+			next;
+		}
+		mes "[Old Legend Teller]";
+		mes "The legend that";
+		mes "we believed for a hundred years,";
+		mes "all lies....";
+		mes "Please get rid of this monster for us.";
+		close;
+	}
+}
+
+ma_fild02,40,240,4	script	Malaya Immigrant#bako1	4_M_BARYO_MAN,{
+	if (malaya_bakona1 < 3) {
+		mes "[Malaya Immigrant]";
+		mes "You must have a brave heart";
+		mes "to come to such a remote place.";
+		mes "How is Port Malaya these days?";
+		mes "I heard the monster that lives at the lake, Baknoawa";
+		mes "is threatening the villagers.";
+		mes "I am in the dark about what is going on because I'm here all the time.";
+		close;
+	} else if (malaya_bakona1 == 3) {
+		mes "[Malaya Immigrant]";
+		mes "You must have a brave heart";
+		mes "to come to such a remote place.";
+		mes "How is Port Malaya these days?";
+		mes "I heard the monster that lives at the lake, Baknoawa";
+		mes "is threatening the villagers.";
+		mes "I am in the dark about what is going on because I'm here all the time.";
+		next;
+		mes "[Malaya Immigrant]";
+		mes "Are you the traveling merchant who used to sell Wooden Doll, right?";
+		mes "I don't know about any traveling merchant, but by Wooden Doll";
+		mes "(going through things) do you mean this?";
+		mes "I don't know about the specifics, but";
+		mes "I think it's related to what I heard long time ago.";
+		next;
+		switch(select("What are you doing here?:Do you know about this Slate Piece?:Please tell me the story.:Who is the traveling merchant?")) {
+		case 1:
+			mes "[Malaya Immigrant]";
+			mes "I liked the environment here";
+			mes "so I decided to stay and live.";
+			mes "There is no obligation here.";
+			mes "To me, that's as good as heaven.";
+			close;
+		case 2:
+			mes "[Malaya Immigrant]";
+			mes "It is a very old Slate Piece.";
+			mes "I'm sorry but I never seen this before.";
+			mes "There is some kind of writing here";
+			mes "but I can't make it out.";
+			close;
+		case 3:
+			mes "[Malaya Immigrant]";
+			mes "It's a simple story.";
+			mes "^0000FFA wounded man who I had never seen before^000000";
+			mes "^0000FFcame to my house and asked for help.^000000";
+			mes "^0000FFOnce healed, he made a Wooden Doll^000000";
+			next;
+			mes "[Malaya Immigrant]";
+			mes "^0000FFthat is suppose to chase away evil spirits ^000000";
+			mes "^0000FFas a token of gratitude,^000000";
+			mes "^0000FFand left for Baryo Mahiwaga.^000000";
+			next;
+			select("He left for Baryo Mahiwaga?");
+			mes "[Malaya Immigrant]";
+			mes "According to what I've heard";
+			mes "that's correct. But the story has been";
+			mes "passed on from mouth to mouth for a";
+			mes "long time. I can't be sure.";
+			next;
+			mes "From Baryo Mahiwaga village, using keyword ^0000FFMalaya^000000,";
+			mes "or ^0000FFBakonawa^000000,";
+			mes "maybe I could find out the identity and whereabouts";
+			mes "of the traveling merchant.";
+			erasequest 1176;
+			setquest 1177;
+			set malaya_bakona1,4;
+			close;
+		case 4:
+			mes "[Malaya Immigrant]";
+			mes "Well, there is a lack of information";
+			mes "so I can't make say for sure but";
+			mes "I'm skeptical if he was in fact even a merchant.";
+			mes "Coming to a town with a";
+			mes "critical wound seems too suspicious...";
+			next;
+			mes "[Malaya Immigrant]";
+			mes "And craving a Wooden Doll";
+			mes "could be seen to have some kind of ritualistic meaning.";
+			mes "Protecting one from some evil force...";
+			mes "that kind of thing.";
+			next;
+			mes "Identity of the traveling merchant...";
+			mes "Looks like there is one more";
+			mes "mystery to be solved.";
+			mes "I suppose it will all come to light";
+			mes "soon enough.";
+			close;
+		}
+	} else {
+		mes "[Malaya Immigrant]";
+		mes "I will tell you again slowly";
+		mes "the story that has been passed on.";
+		mes "Listen carefully and repeat...";
+		mes "no, I mean, you don't have repeat it.";
+		next;
+		mes "[Orally Transmitted Story]";
+		mes "^0000FFA wounded man who I had never seen before^000000";
+		mes "^0000FFcame to my house and asked for help.^000000";
+		mes "^0000FFOnce healed, as a token of gratitude, he made a Wooden Doll^000000";
+		mes "^0000FFthat is suppose to chase away evil sprits.^000000";
+		mes "^0000FFThen he left for Baryo Mahiwaga.^000000";
+		next;
+		mes "From Baryo Mahiwaga village, using keyword ^0000FFMalaya^000000,";
+		mes "or ^0000FFBakonawa^000000,";
+		mes "maybe I could find out the identity and whereabouts";
+		mes "of the traveling merchant.";
+		close;
+	}
+}
+
+ma_fild01,165,237,4	script	Malaya Immigrant#bako2	4_M_MALAYA,{
+	if (malaya_bakona1 < 4) {
+		mes "[Malaya Immigrant]";
+		mes "Have you been to";
+		mes "Port Malaya?";
+		mes "I am curious to know";
+		mes "what is going on there";
+		mes "but I can't travel because there are monsters everywhere.";
+		close;
+	} else if (malaya_bakona1 == 4) {
+		mes "[Malaya Immigrant]";
+		mes "Wooden Doll?";
+		mes "There is a tale related to that,";
+		mes "but you didn't come all the way";
+		mes "just to hear some folktale right?";
+		next;
+		switch(select("I just came here to take a break.:Tell me the tale.")) {
+		case 1:
+			mes "[Malaya Immigrant]";
+			mes "You must have a lot of free time on your hands!";
+			mes "I'm no travel agent";
+			mes "so go bother someone else!";
+			close;
+		case 2:
+			mes "[Malaya Immigrant]";
+			mes "It's baloney";
+			mes "so I don't really remember the details.";
+			next;
+			mes "[Summary of the folktale]";
+			mes "Long time ago, 5 swordsmen fought";
+			mes "against the monster Bakonawa.";
+			mes "Four died and one left a critical wound";
+			mes "to the monster but in return";
+			mes "sustained a serious wound in his leg himself.";
+			next;
+			mes "[Summary of the folktale]";
+			mes "After escaping the scene, Bakonawa transformed into a human";
+			mes "and secretly pursued the swordsman.";
+			mes "The swordsman made a Wooden Doll that";
+			mes "can keep the monster from approaching.";
+			next;
+			mes "[Malaya Immigrant]";
+			mes "This is the end of story.";
+			mes "Without any conclusion...";
+			next;
+			mes "[Malaya Immigrant]";
+			mes "I heard there is a record that the swordsman left";
+			mes "but I don't understand why";
+			mes "he would leave it here in such a distant place";
+			mes "here instead of Malaya.";
+			next;
+			select("I wish to see the record.");
+			mes "[Malaya Immigrant]";
+			mes "The record is engraved on the stone ahead.";
+			mes "However, the stone is so badly";
+			mes "damaged and some pieces fell out that";
+			mes "it will be hard to make the words out.";
+			next;
+			mes "Investigate the stone ahead.";
+			erasequest 1177;
+			setquest 1178;
+			set malaya_bakona1,5;
+			close;
+		}
+	} else if (malaya_bakona1 == 5) {
+		mes "[Malaya Immigrant]";
+		mes "The stone ahead holds a record that";
+		mes "a swordsman from a long time ago left.";
+		next;
+		switch(select("Where did this swordsman go after?:Tell me the tale again.")) {
+		case 1:
+			mes "[Malaya Immigrant]";
+			mes "Well, there is no story after that so";
+			mes "I guess nobody would know what happened.";
+			close;
+		case 2:
+			mes "[Summary of the folktale]";
+			mes "Long time ago, 5 swordsmen fought";
+			mes "against the monster Bakonawa.";
+			mes "Four died and one left a critical wound";
+			mes "on the monster but in return";
+			mes "sustained a serious wound in his leg himself.";
+			next;
+			mes "[Summary of the folktale]";
+			mes "After escaping the scene, Bakonawa transformed into a human";
+			mes "and secretly pursued the swordsman.";
+			mes "The swordsman made a Wooden Doll that";
+			mes "can keep the monster from approaching.";
+			close;
+		}
+	} else {
+		mes "[Malaya Immigrant]";
+		mes "I suppose you wish to hear the story again right?";
+		mes "No problem! I can tell this story forever!";
+		next;
+		mes "[Summary of the folktale]";
+		mes "Long time ago, 5 swordsmen fought";
+		mes "against the monster Bakonawa.";
+		mes "Four died and one left a critical wound";
+		mes "on the monster but in return";
+		mes "sustained a serious wound in his leg himself.";
+		next;
+		mes "[Summary of the folktale]";
+		mes "After escaping the scene, Bakonawa transformed into a human";
+		mes "and secretly pursued the swordsman.";
+		mes "The swordsman made a Wooden Doll that";
+		mes "can keep the monster from approaching.";
+		close;
+	}
+}
+
+ma_fild01,171,235,0	script	#bako1	HIDDEN_WARP_NPC,2,2,{
+	end;
+OnTouch:
+	if (malaya_bakona1 == 5) {
+		mes "The damage is so severe";
+		mes "that the record is unidentifiable.";
+		mes "When inserting the Slate Piece";
+		mes "to a hole on the wall, it fits perfectly like a piece of puzzle.";
+		mes "The letters are not clear but you can still read it.";
+		next;
+		callsub L_Record;
+		set malaya_bakona1,6;
+		erasequest 1178;
+		setquest 1179;
+		close;
+	} else if (malaya_bakona1 == 6) {
+		mes "Here is the record left by a swordsman";
+		mes "from a hundred years ago.";
+		next;
+		switch(select("I don't need to read it.:Read the record again.")) {
+		case 1:
+			mes "I remember the story clearly.";
+			mes "Let's tell the ^0000FFOld Legend Teller^000000 in Malaya";
+			mes "about what I discovered.";
+			close;
+		case 2:
+			callsub L_Record;
+			close;
+		}
+	}
+	end;
+
+L_Record:
+	mes "[Record left by a swordsman from a hundred years ago]";
+	mes "After fighting with Bakonawa, I sustained a critical wound";
+	mes "and came to this place.";
+	mes "Only thing I can do is";
+	mes "Place the Wooden Doll in one place";
+	mes "the monster would come.";
+	next;
+	mes "[Record left by a swordsman from a hundred years ago]";
+	mes "^0000FFSometimes transforming into a child, or even a old lady,^000000";
+	mes "I know that ^0000FFBakonawa^000000has been";
+	mes "chasing after me in secret to kill me.";
+	mes "Because of that critical injury the monster * sustained,";
+	next;
+	mes "[Record left by a swordsman from a hundred years ago]";
+	mes "** it will need nearly a hundred years";
+	mes "for Bakonawa to absorb the power of the moon";
+	mes "to fully recover its power.";
+	mes "Beware of the day the moon disappears.";
+	next;
+	mes "[Record left by a swordsman from a hundred years ago]";
+	mes "The day will come when Bakonawa";
+	mes "will run amuck.";
+	mes "But it will take nearly a hundred years to fully recover its power.";
+	mes "There will always be someone better than me";
+	mes "to defeat the vile creature.";
+	next;
+	mes "[Record left by a swordsman from a hundred years ago]";
+	mes "I will place my trust in the one that will replace me ages from now...";
+	next;
+	mes "How could this be...";
+	mes "Lie told by Bakonawa when it turned into an old lady";
+	mes "in order to take revenge on the swordsman";
+	mes "turned into a legend after all these years.";
+	next;
+	mes "I found out that Bakonawa";
+	mes "is nothing but a blood thirsty monster.";
+	mes "I must tell what I know to the ^0000FFOld Legend Teller^000000";
+	mes "in Malaya.";
+	return;
+}
+
+malaya,304,100,4	script	Old Man's Granddaughter	4_F_BARYO_GIRL,{
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona1 == 0) {
+		mes "[Old Man's Granddaughter]";
+		mes "Grandpa believes";
+		mes "Bakonawa can";
+		mes "turn good.";
+		mes "Do you think it's possible?";
+		close;
+	} else if (malaya_bakona1 == 1) {
+		mes "[Old Man's Granddaughter]";
+		mes "^FF0000Slate Piece^000000?";
+		mes "Why would you need something";
+		mes "that is barely recognizable?";
+		mes "I'll give it to you if you want.";
+		next;
+		mes "Let's go to the";
+		mes "^FF0000Old Legend Teller^000000";
+		mes "now that I have the Slate Piece.";
+		erasequest 1174;
+		setquest 1175;
+		set malaya_bakona1,2;
+		close;
+	} else if (malaya_bakona1 == 2) {
+		mes "[Old Man's Granddaughter]";
+		mes "Please take this Slate Piece";
+		mes "and deliver it to my grandpa.";
+		next;
+		mes "Let's go to the";
+		mes "^FF0000Old Legend Teller^000000";
+		mes "now that I have the Slate Piece.";
+		close;
+	} else {
+		mes "[Old Man's Granddaughter]";
+		mes "Because of Bakonawa,";
+		mes "the village is always unpeaceful.";
+		close;
+	}
+}
+
+malaya,286,269,4	script	Angry Man#bako2	4_M_BARYO_MAN,{
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	mes "[Angry Man]";
+	mes "Calm Bakonawa?";
+	mes "Do you know how many people have been";
+	mes "sacrificed by Bakonawa?";
+	mes "I will fight on my own if I have to!";
+	close;
+}
+
+malaya,276,269,5	script	Calm Woman#bako2	4_F_BARYO_WOMAN,{
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	mes "[Calm Little Girl]";
+	mes "It is too dangerous to fight against";
+	mes "Bakonawa. There is a chance";
+	mes "it will get more angry and put children and";
+	mes "elders in danger.";
+	close;
+}
+
+malaya,276,262,4	script	Angry Boy#bako2	4_M_BARYO_BOY,{
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	mes "[Angry Boy]";
+	mes "I lost my father and my friend";
+	mes "to that Bakonawa.";
+	mes "I will surely revenge them!";
+	close;
+}
+
+malaya,283,265,4	script	Village Chief#bako2	4_BARYO_CHIEF,{
+	if (checkweight(1301,3) == 0) {
+		mes "You cannot start the conversation. You are carrying too many items. -";
+		close;
+	}
+	if (BaseLevel < 120) {
+		mes "[Village Chief]";
+		mes "I'm desperate for a helping hand";
+		mes "but you look";
+		mes "too weak and fragile.";
+		next;
+		mes "[Village Chief]";
+		mes "Please come back when";
+		mes "you grow strong enough";
+		mes "to match Incubus.";
+		close;
+	}
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona2 == 0) {
+		if (malaya_bakona1 <= 5) {
+			mes "[Village Chief]";
+			mes "I'm don't know what's the right decision.";
+			mes "To fight against Bakonawa,";
+			mes "or calm it by offering it a sacrificial gift.";
+		} else {
+			mes "[Village Chief]";
+			mes "The legend was all a lie?";
+			mes "It seems all the villagers up until now";
+			mes "were manipulated by that vile monster.";
+			next;
+			mes "[Village Chief]";
+		}
+		mes "Recently, there have been more people that have";
+		mes "been harmed by Bakonawa.";
+		next;
+		mes "[Village Chief]";
+		mes "There are some missing villagers";
+		mes "but I can't find out if";
+		mes "they are simply missing or if they have been";
+		mes "killed by Bakonawa.";
+		next;
+		mes "[Village Chief]";
+		mes "I heard that the belongings of the missing people";
+		mes "are being found at Baryo Mahiwaga Field.";
+		mes "Please go there to find ^0000FFLost Belongings^000000";
+		mes "and give them to the families of";
+		mes "the missing people";
+		mes "in whatever amount they want.";
+		next;
+		mes "[Village Chief]";
+		mes "^0000FFLost Belongings^000000";
+		mes "are said to be carried by";
+		mes "^FF0000Tiucknuc^000000 that roams Baryo Mahiwaga.";
+		next;
+		switch(select("Do it yourself.:I'm on my way.")) {
+		case 1:
+			mes "[Village Chief]";
+			mes "You give me a lot to think about.";
+			mes "Leave the village at once.";
+			close;
+		case 2:
+			mes "[Village Chief]";
+			mes "Let's start then. First,";
+			mes "retrieve two ^FF0000Lost Belongings^000000 from Tiucknuc";
+			mes "and take them to ^0000FFMissing Person's Father^000000";
+			mes "for me.";
+			set malaya_bakona2,1;
+			setquest 1180;
+			close;
+		}
+	} else if (malaya_bakona2 == 1) {
+		mes "[Village Chief]";
+		mes "From Tiucknuc that roams Baryo Mahiwaga Field,";
+		mes "retrieve two ^FF0000Lost Belongings^000000";
+		mes "and deliver them to ^0000FFMissing Person's Father^000000";
+		mes "for me.";
+		close;
+	} else if (malaya_bakona2 == 2) {
+		mes "[Village Chief]";
+		mes "Retrieve Seven ^FF0000Lost Belongings^000000 from Tiucknuc";
+		mes "and deliver them to ^0000FFMissing Person's Friend^000000";
+		mes "for me.";
+		close;
+	} else if (malaya_bakona2 == 3) {
+		mes "[Village Chief]";
+		mes "Retrieve three ^FF0000Lost Belongings^000000 from Tiucknuc";
+		mes "and deliver them to ^0000FFMissing Person's Son^000000";
+		mes "for me.";
+		close;
+	} else if (malaya_bakona2 == 4) {
+		mes "[Village Chief]";
+		mes "Retrieve five ^FF0000Lost Belongings^000000 from Tiucknuc";
+		mes "and deliver them to ^0000FFMissing Person's Mother^000000";
+		mes "for me.";
+		close;
+	} else if (malaya_bakona2 == 5) {
+		mes "[Village Chief]";
+		mes "So it's clear that all the missing people";
+		mes "have been killed by Bakonawa.";
+		next;
+		mes "[Villagers]";
+		mes "Kill Bakonawa!";
+		mes "Let's get rid of the monster ourselves!";
+		next;
+		mes "[Village Chief]";
+		mes "It seems we would no longer be able to";
+		mes "hold rituals to calm Bakonawa.";
+		next;
+		mes "[Village Chief]";
+		mes "Young Fortune Teller is looking for your help";
+		mes "saying that the energy of the moon seems strange.";
+		erasequest 1184;
+		setquest 1185;
+		set malaya_bakona2,6;
+//		if (IsPremiumPcCafe == 10)
+			getitem 12700,7; //Insideout_Shirt
+//		else
+//			getitem 12700,5; //Insideout_Shirt
+		close;
+	} else if (malaya_bakona2 == 6) {
+		mes "[Village Chief]";
+		mes "Young Fortune Teller is looking for your help";
+		mes "saying that the energy of the moon seems strange.";
+		close;
+	} else if (malaya_bakona2 == 7) {
+		mes "[Village Chief]";
+		mes "I know that terrible things happened";
+		mes "long time ago when the moon disappeared.";
+		mes "I hope the moon recovers its strength";
+		mes "with your devoted effort.";
+		close;
+	} else if (malaya_bakona2 == 8) {
+		mes "[Village Chief]";
+		mes "I will tell the";
+		mes "Young Fortune Teller to help you.";
+		mes "But before that, there is";
+		mes "something you must do immediately.";
+		next;
+		mes "[Village Chief]";
+		mes "We never know when Bakonawa will attack";
+		mes "the village so we must set traps near the village";
+		mes "entrance and near the cave.";
+		next;
+		mes "[Village Chief]";
+		mes "I would be grateful if you help us.";
+		mes "I have dispatched workers";
+		mes "near where traps will be set up,";
+		mes "so you just have to visit about 5 places.";
+		next;
+		switch(select("Sounds like too much work.:Sure thing.")) {
+		case 1:
+			mes "[Village Chief]";
+			mes "This operation means life and death to us";
+			mes "yet you refuse it easily as if";
+			mes "it was some kind of a chore...";
+			next;
+			mes "[Village Chief]";
+			mes "What a hero!";
+			close;
+		case 2:
+			mes "[Village Chief]";
+			mes "The first trap will be set up at";
+			mes "Baryo Mahiwaga Field";
+			mes "near the village entrance. ^0000FFGruffy Worker^000000";
+			mes "will be waiting for you. He will be very helpful.";
+			erasequest 1187;
+			setquest 1188;
+			set malaya_bakona2,9;
+			close;
+		}
+	} else if (malaya_bakona2 == 9) {
+		mes "[Village Chief]";
+		mes "The first trap will be set up at";
+		mes "Baryo Mahiwaga Field";
+		mes "near the village entrance. ^0000FFGruffy Worker^000000";
+		mes "will be waiting for you. He will be very helpful.";
+		close;
+	} else if (malaya_bakona2 == 10) {
+		mes "[Village Chief]";
+		mes "The second trap will be set up";
+		mes "near a place where it connects from";
+		mes "Baryo Mahiwaga Field to Bakonawa Lake.";
+		mes "^0000FFGrumpy Worker^000000";
+		mes "will be waiting for you. He will be very helpful.";
+		close;
+	} else if (malaya_bakona2 == 11) {
+		mes "[Village Chief]";
+		mes "The third trap will be set up";
+		mes "near Bakonawa Lake Entrance.";
+		mes "^0000FFCowardly Worker^000000";
+		mes "will be waiting for you. He will be very helpful.";
+		close;
+	} else if (malaya_bakona2 == 12) {
+		mes "[Village Chief]";
+		mes "The fourth trap will be set up";
+		mes "near the entrance of Bakonawa Lake as well.";
+		mes "^0000FFGloomy Worker^000000 will be waiting for you.";
+		mes "He will be very helpful.";
+		close;
+	} else if (malaya_bakona2 == 13) {
+		mes "[Village Chief]";
+		mes "The fifth trap will be set up";
+		mes "near the entrance of Bakonawa Lake too.";
+		mes "^0000FFSentimental Worker^000000";
+		mes "will be waiting for you. He will be very helpful.";
+		close;
+	} else if (malaya_bakona2 == 14) {
+		mes "[Village Chief]";
+		mes "It looks like the traps are all set up.";
+		mes "We just finished our village meeting on";
+		mes "what to do about Bakonawa.";
+		next;
+		mes "[Village Chief]";
+		mes "We have concluded that";
+		mes "we will fight against Bakonawa.";
+		mes "Please help us by";
+		mes "attacking his lair.";
+		erasequest 1193;
+		set malaya_bakona2,15;
+		getexp 1000000,600000;
+//		if (IsPremiumPcCafe == 10)
+			getitem 6497,7; //Lesser_Agimat
+//		else
+//			getitem 6497,5; //Lesser_Agimat
+		close;
+	} else if (malaya_bakona2 == 15) {
+		mes "[Village Chief]";
+		if (malaya_bakona1 < 7) {
+			mes "Would you visit ^0000FFOld Legend Teller^000000";
+			mes "when you have a chance?";
+			mes "I think you would be able to help him.";
+			next;
+			mes "[Village Chief]";
+			mes "Thank you.";
+		}
+		mes "Please think of the countless victims";
+		mes "and defeat Bakonawa";
+		mes "for their sake.";
+		close;
+	}
+}
+
+ma_fild01,1,1,0	script	malaya_ma_fild01_mon	-1,{
+OnInit:
+	enablenpc "malaya_ma_fild01_mon";
+	donpcevent "malaya_ma_fild01_mon::OnEnable";
+	end;
+
+OnEnable:
+	monster "ma_fild01",0,0,"Tiyanak",2314,5,"malaya_ma_fild01_mon::OnMyMobDead";
+	initnpctimer;
+	end;
+
+OnDisable:
+	stopnpctimer;
+	killmonster "ma_fild01","malaya_ma_fild01_mon::OnMyMobDead";
+	disablenpc "malaya_ma_fild01_mon";
+	end;
+
+OnTimer600000:
+	killmonster "ma_fild01","malaya_ma_fild01_mon::OnMyMobDead";
+	stopnpctimer;
+	donpcevent "malaya_ma_fild01_mon::OnEnable";
+	end;
+
+OnMyMobDead:
+	if (mobcount("ma_fild01","malaya_ma_fild01_mon::OnMyMobDead") < 5 && (malaya_bakona2 == 1 || malaya_bakona2 == 2 || malaya_bakona2 == 3 || malaya_bakona2 == 4))
+		getitem 6520,1; //Lost_Belongings
+	end;
+}
+
+malaya,269,267,5	script	Missing Person's Father	4_M_MALAYA,{
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona2 == 0) {
+		mes "[Missing Person's Father]";
+		mes "Please find our";
+		mes "child.";
+		mes "Bakonawa would have not harmed our child.";
+		mes "He must be around here somewhere.";
+		close;
+	} else if (malaya_bakona2 == 1) {
+		if (countitem(6520) < 2) {
+			mes "[Missing Person's Father]";
+			mes "You are looking for two of his ^FF0000Lost Belongings^000000?";
+			mes "Are you confident that";
+			mes "he already died?";
+			close;
+		}
+		mes "[Missing Person's Father]";
+		mes "This... is our child's ^FF0000Lost Belongings^000000";
+		mes "for sure.";
+		mes "The monster got to him after all....";
+		next;
+		mes "The man is unable to continue as he tries to hold back his tears.";
+		mes "Let's continue to find the lost belongings of the missing people.";
+		mes "Let's retrieve them from Tiucknuc that roams Baryo Mahiwaga Field,";
+		mes "seven ^FF0000Lost Belongings^000000";
+		mes "and deliver them to ^0000FFMissing Person's Friend^000000.";
+		delitem 6520,2; //Lost_Belongings
+		erasequest 1180;
+		setquest 1181;
+		set malaya_bakona2,2;
+		close;
+	} else if (malaya_bakona2 == 2) {
+		mes "[Missing Person's Father]";
+		mes "My baby... my poor baby...";
+		next;
+		mes "The man is unable to continue as he tries to hold back his tears.";
+		mes "Let's continue to find the lost belongings of the missing people.";
+		mes "Retrieve seven ^FF0000Lost Belongings^000000 from Tiucknuc";
+		mes "and deliver them to ^0000FFMissing Person's Friend^000000.";
+		close;
+	} else {
+		mes "[Missing Person's Father]";
+		mes "My baby... my poor baby...";
+		close;
+	}
+}
+
+malaya,265,274,5	script	Missing Person's Friend	4_M_BARYO_BOY,{
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona2 < 2) {
+		mes "[Missing Person's Friend]";
+		mes "Please find";
+		mes "my friend.";
+		mes "We were playing ball together";
+		mes "and suddenly my friend disappeared.";
+		next;
+		mes "[Missing Person's Friend]";
+		mes "I'm sure he is alive and well";
+		mes "somewhere.";
+		close;
+	} else if (malaya_bakona2 == 2) {
+		if (countitem(6520) < 7) {
+			mes "[Missing Person's Friend]";
+			mes "You are looking for seven ^FF0000Lost Belongings^000000";
+			mes "of my friend?";
+			mes "My friend is not dead!";
+			close;
+		}
+		mes "[Missing Person's Friend]";
+		mes "These are marbles and toys I gave him...";
+		mes "These are clearly ^FF0000Lost Belongings^000000";
+		mes "of my friend... Where is my friend?";
+		mes "Bring him here, bring him here now!";
+		callsub L_Quest;
+		delitem 6520,7; //Lost_Belongings
+		erasequest 1181;
+		setquest 1182;
+		set malaya_bakona2,3;
+		close;
+	} else {
+		mes "[Missing Person's Friend]";
+		mes "Bring back my friend!";
+		mes "Bring back my friend now!";
+		mes "My friend is alive,";
+		mes "It's all a lie, sob~";
+		if (malaya_bakona2 == 3)
+			callsub L_Quest;
+		close;
+	}
+
+L_Quest:
+	next;
+	mes "Leaving behind the crying boy,";
+	mes "let's continue to find the lost belongings of the missing people.";
+	mes "Retrieve three ^FF0000Lost Belongings^000000 from Tiucknuc";
+	mes "and deliver them to ^0000FFMissing Person's Son^000000.";
+	return;
+}
+
+malaya,270,278,4	script	Missing Person's Son	4_M_BARYO_MAN,{
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona2 < 3) {
+		mes "[Missing Person's Son]";
+		mes "Bakonawa has hurt my father?";
+		mes "I can't believe this.";
+		mes "Please find my father!";
+		close;
+	} else if (malaya_bakona2 == 3) {
+		if (countitem(6520) < 3) {
+			mes "[Missing Person's Son]";
+			mes "You are looking for three ^FF0000Lost Belongings^000000";
+			mes "of my father? Why lost belongings and not my father?";
+			mes "No, that can't be it. He is alive somewhere!";
+			close;
+		}
+		mes "[Missing Person's Son]";
+		mes "These are clearly his clothes and shoes...";
+		mes "These are ^FF0000Lost Belongings^000000 of my father.";
+		mes "Oh dear lord... father!";
+		callsub L_Quest;
+		delitem 6520,3; //Lost_Belongings
+		erasequest 1182;
+		setquest 1183;
+		set malaya_bakona2,4;
+		close;
+	} else {
+		mes "[Missing Person's Son]";
+		mes "Why did such a thing happen....";
+		if (malaya_bakona2 == 4)
+			callsub L_Quest;
+		close;
+	}
+
+L_Quest:
+	next;
+	mes "Man crying in agony.";
+	mes "Let's continue to find the lost belongings of the missing people.";
+	mes "Retrieve five ^FF0000Lost Belongings^000000 from Tiucknuc";
+	mes "and deliver them to ^0000FFMissing Person's Mother^000000.";
+	return;
+}
+
+malaya,265,284,4	script	Missing Person's Mother	4_F_BARYO_WOMAN,{
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona2 < 4) {
+		mes "[Missing Person's Mother]";
+		mes "Please find my child.";
+		mes "I sent her out to do a chore";
+		mes "and she still isn't back.";
+		close;
+	} else if (malaya_bakona2 == 4) {
+		if (countitem(6520) < 5) {
+			mes "[Missing Person's Mother]";
+			mes "You are looking for five ^FF0000Lost Belongings^000000 of my child?";
+			mes "What does this mean?";
+			mes "Are you saying my child is dead?";
+			close;
+		}
+		mes "[Missing Person's Mother]";
+		mes "This is my child's hair comb.";
+		mes "Why do you have five ^FF0000Lost Belongings^000000 of my child?";
+		mes "Why...? She's... dead?";
+		next;
+		mes "[Missing Person's Mother]";
+		mes "No wait... I think I hear her voice.";
+		mes "She's going to be home soon. I should go home now.";
+		mes "I should prepare a dinner for her. She must be starving.";
+		mes "Ha ha...";
+		next;
+		mes "A mother that has gone mad...";
+		mes "Now that I finished finding the missing people,";
+		mes "I should report back to the Village Chief.";
+		delitem 6520,5; //Lost_Belongings
+		erasequest 1183;
+		setquest 1184;
+		set malaya_bakona2,5;
+		close;
+	} else {
+		mes "[Missing Person's Mother]";
+		mes "Ha ha ha... I can hear my child's voice,";
+		mes "just listen closely.";
+		mes "Can't you hear her calling her mother?";
+		mes "Ha ha ha...";
+		next;
+		mes "A mother that has gone mad...";
+		if (malaya_bakona2 == 5) {
+			mes "Now that I finished finding the missing people,";
+			mes "I should report back to the Village Chief.";
+		}
+		close;
+	}
+}
+
+malaya,289,364,4	script	Young Fortune Teller	4_F_MALAYA,{
+	if (checkweight(1301,3) == 0) {
+		mes "You cannot start the conversation. You are carrying too many items. -";
+		close;
+	}
+	if (malaya_hi < 20) {
+		mes "- He seems cautious of you. -";
+		close;
+	}
+	if (malaya_bakona2 < 6) {
+		mes "[Young Fortune Teller]";
+		mes "The energy of the moon grew weak.";
+		mes "The reason there are more monsters,";
+		mes "and the reason there are more victims,";
+		mes "is all because of this.";
+		close;
+	} else if (malaya_bakona2 == 6) {
+		mes "[Young Fortune Teller]";
+		mes "The energy of the moon grew weak for a couple of days.";
+		mes "The reason there are more monsters,";
+		mes "and the reason there are more victims, is all because of this.";
+		next;
+		mes "[Young Fortune Teller]";
+		mes "I'm trying to hold a ritual";
+		mes "that will restore the moon's energy by sacrificing monsters' blood,";
+		mes "so I need you to hunt fifteen ^FF0000Tikbalang^000000";
+		mes "at Baryo Mahiwaga Field.";
+		next;
+		switch(select("It's none of my business.:You can count on me.")) {
+		case 1:
+			mes "[Young Fortune Teller]";
+			mes "You are so selfish!";
+			mes "During the ritual,";
+			mes "I will pray for your bad luck too.";
+			close;
+		case 2:
+			mes "[Young Fortune Teller]";
+			mes "Hurry.";
+			mes "If the moon completely disappears,";
+			mes "there will be a great disaster.";
+			erasequest 1185;
+			setquest 1186;
+			set malaya_bakona2,7;
+			close;
+		}
+	} else if (malaya_bakona2 == 7) {
+		if (checkquest(1186,HUNTING) == 2) {
+			mes "[Young Fortune Teller]";
+			mes "It looks like you took care of ^FF0000Tikbalang^000000";
+			mes "well enough.";
+			mes "I think I can start the ritual now.";
+			mes "There are some items that we need, please go to";
+			mes "the Village Chief for help.";
+			erasequest 1186;
+			setquest 1187;
+			set malaya_bakona2,8;
+//			if (IsPremiumPcCafe == 10)
+				getitem 12699,7; //Tikbalang_Belt
+//			else
+//				getitem 12699,5; //Tikbalang_Belt
+			close;
+		} else {
+			mes "[Young Fortune Teller]";
+			mes "I need you to hunt fifteen ^FF0000Tikbalang^000000";
+			mes "at Baryo Mahiwaga Field.";
+			next;
+			mes "[Young Fortune Teller]";
+			mes "Hurry.";
+			mes "If the moon completely disappears,";
+			mes "there will be a great disaster.";
+			close;
+		}
+	} else if (malaya_bakona2 == 8) {
+		mes "[Young Fortune Teller]";
+		mes "I think I can start the ritual now.";
+		mes "There are some items that we need, please go to";
+		mes "the Village Chief for help.";
+		close;
+	} else {
+		mes "[Young Fortune Teller]";
+		mes "On the day when the moon fully disappears,";
+		mes "the dragon will attack the village.";
+		mes "No one will be safe.";
+		close;
+	}
+	end;
+}
+
+ma_fild01,54,253,4	script	Gruffy Worker#bako2	4_M_MALAYA,{
+	if (malaya_bakona2 < 9) {
+		mes "[Gruffy Worker]";
+		mes "The Village Chief told me to";
+		mes "wait for you here.";
+		close;
+	} else if (malaya_bakona2 == 9) {
+		mes "[Gruffy Worker]";
+		mes "The trap will be set right in front.";
+		mes "Walk forward a little.";
+		close;
+	} else if (malaya_bakona2 == 10) {
+		mes "[Gruffy Worker]";
+		mes "You can find the";
+		mes "Grumpy Worker near where";
+		mes "Baryo Mahiwaga Field connects to Bakonawa Lake.";
+		mes "Go and set up the trap together.";
+		close;
+	} else {
+		mes "[Gruffy Worker]";
+		mes "Are you trying to advertise that";
+		mes "there is a trap here? Step aside.";
+		close;
+	}
+	end;
+}
+
+ma_fild01,54,244,0	script	#bako2	HIDDEN_WARP_NPC,2,2,{
+	end;
+OnTouch:
+	if (malaya_bakona2 == 9) {
+		mes "I should set up the trap";
+		mes "right about here.";
+		next;
+		mes "[Gruffy Worker]";
+		mes "Using the tools like this";
+		mes "bang bang bang!";
+		next;
+		mes "bang bang bang!";
+		next;
+		mes "The trap is now set.";
+		next;
+		mes "[Gruffy Worker]";
+		mes "You can find the";
+		mes "Grumpy Worker near where";
+		mes "Baryo Mahiwaga Field connects to Bakonawa Lake.";
+		mes "Go and set up the trap together.";
+		erasequest 1188;
+		setquest 1189;
+		set malaya_bakona2,10;
+		close;
+	} else if (malaya_bakona2 == 10) {
+		mes "The trap has been set up here.";
+		next;
+		mes "[Gruffy Worker]";
+		mes "This trap is not meant to capture you,";
+		mes "so move.";
+		next;
+		mes "[Gruffy Worker]";
+		mes "You can find the";
+		mes "Grumpy Worker near where";
+		mes "Baryo Mahiwaga Field connects to Bakonawa Lake.";
+		mes "Go there to him.";
+		close;
+	}
+	end;
+}
+
+ma_fild01,236,119,5	script	Grumpy Worker#bako2	4_M_BARYO_BOY,{
+	if (malaya_bakona2 < 10) {
+		mes "[Grumpy Worker]";
+		mes "Village Chief told me to";
+		mes "wait for you here.";
+		mes "Sooo boring!";
+		close;
+	} else if (malaya_bakona2 == 10) {
+		mes "[Grumpy Worker]";
+		mes "A hole needs to be dug up in front of here?";
+		mes "I have to dig too?";
+		mes "Says who?";
+		close;
+	} else if (malaya_bakona2 == 11) {
+		mes "[Grumpy Worker]";
+		mes "Go find the Cowardly Worker";
+		mes "near the entrance of Bakonawa Lake.";
+		mes "Come on, move it!";
+		close;
+	} else {
+		mes "[Grumpy Worker]";
+		mes "I set up the trap";
+		mes "and you are advertising that it's here.";
+		mes "Scram!";
+		close;
+	}
+}
+
+ma_fild01,242,116,0	script	#bako3	HIDDEN_WARP_NPC,2,2,{
+	end;
+OnTouch:
+	if (malaya_bakona2 == 10) {
+		mes "I should set up the trap";
+		mes "right about here.";
+		next;
+		mes "[Grumpy Worker]";
+		mes "I really don't like it here!";
+		mes "...";
+		mes "With this pickax,";
+		mes "dig dig dig!";
+		next;
+		mes "dig dig dig!";
+		next;
+		mes "The trap is now set.";
+		next;
+		mes "[Grumpy Worker]";
+		mes "Go find the Cowardly Worker";
+		mes "near the entrance of Bakonawa Lake.";
+		mes "Come on, move it!";
+		erasequest 1189;
+		setquest 1190;
+		set malaya_bakona2,11;
+		close;
+	} else if (malaya_bakona2 == 11) {
+		mes "The trap has been set up here.";
+		next;
+		mes "[Grumpy Worker]";
+		mes "Are you trying to test";
+		mes "with your body if the trap works?";
+		mes "Move aside!";
+		next;
+		mes "[Grumpy Worker]";
+		mes "Go find the Cowardly Worker";
+		mes "near the entrance of Bakonawa Lake.";
+		mes "Come on, move it!";
+		close;
+	}
+	end;
+}
+
+ma_scene01,177,89,4	script	Cowardly Worker#bako2	4_M_BARYO_MAN,{
+	if (malaya_bakona2 < 11) {
+		mes "[Cowardly Worker]";
+		mes "Village Chief told me to";
+		mes "wait for you here.";
+		mes "Why me? I have a bad feeling about this....";
+		close;
+	} else if (malaya_bakona2 == 11) {
+		mes "[Cowardly Worker]";
+		mes "set up a trap in front of here?";
+		mes "Village Chief said I have to help too?";
+		mes "Can you please do it by yourself?";
+		close;
+	} else if (malaya_bakona2 == 12) {
+		mes "[Cowardly Worker]";
+		mes "Go up and you will";
+		mes "find the Gloomy Worker.";
+		mes "Go! You scare me.";
+		mes "You look like you are going to beat me up.";
+		close;
+	} else {
+		mes "[Cowardly Worker]";
+		mes "Go away!";
+		mes "What if Bakonawa";
+		mes "appears because of you?";
+		mes "I'm scared to death!";
+		close;
+	}
+	end;
+}
+
+ma_scene01,179,85,0	script	#bako4	HIDDEN_WARP_NPC,2,2,{
+	end;
+OnTouch:
+	if (malaya_bakona2 == 11) {
+		mes "I should set up the trap";
+		mes "right about here.";
+		next;
+		mes "[Cowardly Worker]";
+		mes "There is nothing weird";
+		mes "buried here right?";
+		mes "...";
+		mes "Using the shovel, dig dig dig!";
+		next;
+		mes "dig dig dig!";
+		next;
+		mes "The trap is now set.";
+		next;
+		mes "[Cowardly Worker]";
+		mes "Go up and you will";
+		mes "find the Gloomy Worker.";
+		erasequest 1190;
+		setquest 1191;
+		set malaya_bakona2,12;
+		close;
+	} else if (malaya_bakona2 == 12) {
+		mes "The trap has been set up here.";
+		next;
+		mes "[Cowardly Worker]";
+		mes "Step aside immediately!";
+		mes "Bakonawa might find out this is a trap";
+		mes "and come for us.";
+		next;
+		mes "[Cowardly Worker]";
+		mes "Go up and you will";
+		mes "find the Gloomy Worker.";
+		emotion e_swt,1;
+		close;
+	}
+	end;
+}
+
+ma_scene01,141,118,4	script	Gloomy Worker#bako2	4_M_MALAYA,{
+	if (malaya_bakona2 < 12) {
+		mes "[Gloomy Worker]";
+		mes "Village Chief told me to wait for you here.";
+		mes "He must want me to do something.";
+		mes "Whew...";
+		close;
+	} else if (malaya_bakona2 == 12) {
+		mes "[Gloomy Worker]";
+		mes "set up a trap on the left side?";
+		mes "I don't think it will be much use...";
+		mes "Whew, I should've moved away or something...";
+		close;
+	} else if (malaya_bakona2 == 13) {
+		mes "[Gloomy Worker]";
+		mes "We are all gonna die anyway by Bakonawa.";
+		mes "This is pointless.";
+		mes "Just go up the path and you will find";
+		mes "Sentimental Worker.";
+		close;
+	} else {
+		mes "[Gloomy Worker]";
+		mes "Bakonawa is going to attack us anyway.";
+		mes "What pointless work...";
+		close;
+	}
+	end;
+}
+
+ma_scene01,138,122,0	script	#bako5	HIDDEN_WARP_NPC,2,2,{
+	end;
+OnTouch:
+	if (malaya_bakona2 == 12) {
+		mes "I should set up the trap";
+		mes "right about here.";
+		next;
+		mes "[Gloomy Worker]";
+		mes "Just catch this net,";
+		mes "throw throw!";
+		next;
+		mes "throw throw!";
+		next;
+		mes "The trap is now set.";
+		next;
+		mes "[Gloomy Worker]";
+		mes "Just go up the path and you will find";
+		mes "Sentimental Worker.";
+		mes "Though I doubt it will be much help.";
+		erasequest 1191;
+		setquest 1192;
+		set malaya_bakona2,13;
+		close;
+	} else if (malaya_bakona2 == 13) {
+		mes "The trap has been set up here.";
+		next;
+		mes "[Gloomy Worker]";
+		mes "The trap is meaningless.";
+		mes "See? It doesn't even work.";
+		close;
+	}
+	end;
+}
+
+ma_scene01,175,170,5	script	Sentimental Worker#bako2	4_M_BARYO_MAN,{
+	if (malaya_bakona2 < 13) {
+		mes "[Sentimental Worker]";
+		mes "Village Chief told me to wait for you here.";
+		mes "Is there a some kind of surprise event?";
+		mes "My heart is beating faster~";
+		close;
+	} else if (malaya_bakona2 == 13) {
+		mes "[Sentimental Worker]";
+		mes "Wow! So we are going to work together";
+		mes "to set up a trap behind this place?";
+		mes "This is sooo cool!";
+		mes "This is the coolest thing in the world!";
+		close;
+	} else if (malaya_bakona2 == 14) {
+		mes "[Sentimental Worker]";
+		mes "Now that the trap is set,";
+		mes "Are we going to report back to Village Chief?";
+		mes "Oh what fun!";
+		mes "It sounds so exiting!";
+		close;
+	} else {
+		mes "[Sentimental Worker]";
+		mes "More I think about it, more exited I get.";
+		mes "I'm secretly guarding the trap!";
+		mes "I want to hear out loud.";
+		mes "I have a trap in front of me! Ha ha ha ha~";
+		emotion e_swt2,1;
+		close;
+	}
+	end;
+}
+
+ma_scene01,171,174,0	script	#bako6	HIDDEN_WARP_NPC,2,2,{
+	end;
+OnTouch:
+	if (malaya_bakona2 == 13) {
+		mes "I should set up the trap";
+		mes "right about here.";
+		next;
+		mes "[Sentimental Worker]";
+		mes "Wow! This really is a perfect place";
+		mes "to set up a trap.";
+		mes "I'm going to throw the rope!";
+		mes "Here goes the rope!";
+		next;
+		mes "Here goes the rope!";
+		next;
+		mes "The trap is now set.";
+		mes "Let's go to the Village Chief";
+		mes "now that the trap is set.";
+		erasequest 1192;
+		setquest 1193;
+		set malaya_bakona2,14;
+		close;
+	} else if (malaya_bakona2 == 14) {
+		mes "The trap is set here.";
+		next;
+		mes "[Sentimental Worker]";
+		mes "Try out the trap first!";
+		mes "I'm so curious";
+		mes "what would happen!";
+		mes "It's going to be so much fun!";
+		close;
+	}
+	end;
+}
+
+// Original name: "Bakonawa Introduction Quest Helper#bako1"
+sec_in02,10,16,5	script	Bakonawa Intro Helper	4_MASK_SMOKEY,{
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "Seafood and Black Bean Sauce Noodle!";
+		close;
+	}
+	mes "[Briquet Scheme]";
+	mes "Just boldly tell me";
+	mes "what is it that you want!";
+	next;
+	switch(select("Reset all quests:Just before the end of first quest:Reset secondary quest:Distribution of lost belongings:Just after hunting")) {
+	case 1:
+		mes "Here you go!";
+		set malaya_bakona1,0;
+		set malaya_bakona2,0;
+		for(set .@i,1174; .@i<=1193; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		close;
+	case 2:
+		mes "[Briquet Scheme]";
+		mes "Here you go!";
+		set malaya_bakona1,6;
+		for(set .@i,1174; .@i<=1178; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		setquest 1179;
+		close;
+	case 3:
+		mes "[Briquet Scheme]";
+		mes "Here you go!";
+		set malaya_bakona2,0;
+		for(set .@i,1180; .@i<=1193; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		close;
+	case 4:
+		mes "[Briquet Scheme]";
+		mes "Here you go!";
+		getitem 6520,17; //Lost_Belongings
+		close;
+	case 5:
+		mes "[Briquet Scheme]";
+		mes "Here you go!";
+		set malaya_bakona2,8;
+		setquest 1187;
+		for(set .@i,1178; .@i<=1193; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		close;
+	}
+}
+
+// Nurse in Port Malaya :: malaya_bang
+//============================================================
+function	script	F_Malaya_Nurse	{
+	if (malaya_bang == 30) {
+		mes "[Nurse Las]";
+		mes "A talisman?";
+		mes "I think you should search for something else.";
+		cutin "malaya_nurseA01",2;
+		callsub L_Warp, getarg(0);
+	} else if (malaya_bang == 31) {
+		mes "[Nurse Las]";
+		mes "A talisman and a person?";
+		cutin "malaya_nurseA01",2;
+		next;
+		mes "[Nurse Las]";
+		mes "I did see the talisman but I didn't go near it because I got a bad feeling about it.";
+		next;
+		mes "[Nurse Las]";
+		mes "Oh!";
+		mes "Speaking of talismans, wouldn't that old lady know about them, since she put some around the village?";
+		mes "I think it'll be a good idea to ask her.";
+		set malaya_bang,32;
+		changequest 11303,11304;
+		callsub L_Warp, getarg(0), 1;
+	} else if (malaya_bang == 32) {
+		mes "[Nurse Las]";
+		mes "Oh!";
+		mes "Speaking of talismans, wouldn't that old lady know about them, since she put some around the hospital?";
+		mes "I think it'll be a good idea to ask her.";
+		cutin "malaya_nurseA01",2;
+		callsub L_Warp, getarg(0), 1;
+	} else if (malaya_bang == 33) {
+		mes "[Nurse Las]";
+		mes "A shaman... Best if we met her.";
+		cutin "malaya_nurseA01",2;
+		callsub L_Warp, getarg(0), 1;
+	} else if (malaya_bang == 34) {
+		mes "[Nurse Las]";
+		mes "Oh!";
+		mes "You must have met her.";
+		mes "I feel something strong...";
+		cutin "malaya_nurseA01",2;
+		next;
+		select("Tell her about the talisman.");
+		mes "[Nurse Las]";
+		mes "Yes!";
+		mes "I have an idea.";
+		mes "How about we stick that one over the one we saw on the 2nd floor door?";
+		emotion e_ic;
+		next;
+		mes "[Nurse Las]";
+		mes "Maybe it will block the bad energy it's giving out.";
+		set malaya_bang,35;
+		changequest 11306,11307;
+		callsub L_Warp, getarg(0), 1;
+	} else if (malaya_bang == 35) {
+		mes "[Nurse Las]";
+		mes "Yes!";
+		mes "I have an idea.";
+		mes "How about we stick that one over the one we saw on the 2nd floor door?";
+		emotion e_ic;
+		cutin "malaya_nurseA01",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Maybe it will block the bad energy it's giving out.";
+		callsub L_Warp, getarg(0), 1;
+	} else if (malaya_bang == 36) {
+		callsub L_Weight;
+		mes "[Nurse Maenne]";
+		mes "*Sigh*...";
+		mes "I thought it strange when you were standing behind me....";
+		cutin "malaya_nurseB",2;
+		next;
+		mes "[Nurse Maenne]";
+		mes "I didn't think you'd do something like this.";
+		emotion e_dots;
+		next;
+		mes "[Nurse Maenne]";
+		mes "We were just about to enter Bangungot's room, before we were thrown out...";
+		next;
+		switch(select("Bangungot?:Nurse Maenne?")) {
+		case 1:
+			callsub L_Bangungot;
+			select("Nurse Maenne");
+			callsub L_Maenne;
+			break;
+		case 2:
+			callsub L_Maenne;
+			select("Bangungot");
+			callsub L_Bangungot;
+			break;
+		}
+		callsub L_Incomplete;
+		set malaya_bang,42;
+		changequest 11308,11309;
+		callsub L_Reward;
+		callsub L_Warp, getarg(0), 1;
+	} else if (malaya_bang == 40) {
+		callsub L_Weight;
+		if (checkquest(11309,HUNTING) == 2) {
+			callsub L_Complete;
+			set malaya_bang,41;
+			completequest 11309;
+			callsub L_Reward;
+			callsub L_Warp, getarg(0), 1;
+		} else {
+			callsub L_Incomplete;
+			set malaya_bang,42;
+			callsub L_Reward;
+			callsub L_Warp, getarg(0);
+		}
+	} else if (malaya_bang > 40) {
+		if (malaya_bang == 42) {
+			if (checkquest(11309,HUNTING) == 2) {
+				callsub L_Complete;
+				set malaya_bang,41;
+				completequest 11309;
+				callsub L_Warp, getarg(0), 1;
+			} else {
+				callsub L_Incomplete;
+				callsub L_Warp, getarg(0);
+			}
+		}
+		callsub L_Incomplete;
+		switch(getarg(0)) {
+		case 1:
+			next;
+			switch(select("Enter the hospital.:Quit.")) {
+			case 1:
+				callsub L_Warp, getarg(0);
+			case 2:
+				mes "[Nurse Maenne]";
+				mes "Hmmm...";
+				close2;
+				cutin "",255;
+				end;
+			}
+		case 2:
+			callsub L_Warp, getarg(0);
+		}
+	}
+	return;
+
+L_Weight:
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait !! -";
+		mes "- You have too many items. -";
+		mes "- Cannot receive item. -";
+		mes "- Please lighten your bag -";
+		mes "- and try again. -";
+		close;
+	}
+	if (MaxWeight - Weight < 1000) {
+		mes "- Wait !! -";
+		mes "- You are carrying too many items. -";
+		mes "- Cannot receive item. -";
+		mes "- Please lighten your bag -";
+		mes "- and try again. -";
+		close;
+	}
+	return;
+
+L_Warp:
+	switch(getarg(0)) {
+	case 1:
+		close2;
+		cutin "",255;
+		if (getarg(1,0) == 0)
+			warp "ma_dun01",33,110;
+		end;
+	case 2:
+		next;
+		switch(select("Go outside.:Quit.")) {
+		case 1:
+			close2;
+			cutin "",255;
+			warp "malaya",58,76;
+			end;
+		case 2:
+			mes "[Nurse Las]";
+			mes "Tsk...";
+			close2;
+			cutin "",255;
+			end;
+		}
+	}
+
+L_Reward:
+//	if (IsPremiumPcCafe == 10) {
+		getitem 6499,5; //Ancient_Grudge
+		getitem 6497,10; //Lesser_Agimat
+//	} else {
+//		getitem 6499,3; //Ancient_Grudge
+//		getitem 6497,5; //Lesser_Agimat
+//	}
+	getitem 617,1; //Old_Violet_Box
+	getexp 1000000,0;
+	return;
+
+L_Bangungot:
+	mes "[Nurse Maenne]";
+	mes "It's a vicious monster roaming this hospital.";
+	next;
+	mes "[Nurse Maenne]";
+	mes "Hmmmm...";
+	mes "It's not exactly a monster....";
+	mes "More like a curse or disease...";
+	next;
+	mes "[Nurse Maenne]";
+	mes "There's a story saying that it used to be a wood fairy.";
+	next;
+	mes "[Nurse Maenne]";
+	mes "Anyway, it doesnt change the fact that she killed the patients of this hospital and turned them into monsters.";
+	next;
+	return;
+
+L_Maenne:
+	mes "[Nurse Maenne]";
+	mes "Me?";
+	mes "As you can see, I'm the new nurse here.";
+	mes "I'm a nurse who specializes in 'this' kind of work, instead of looking after patients.";
+	cutin "malaya_nurseB",2;
+	next;
+	mes "[Nurse Maenne]";
+	mes "Oh!";
+	mes "The Bangungot pretended to be me?";
+	next;
+	mes "[Nurse Maenne]";
+	mes "Seeing how much it rattled you.";
+	mes "It's a rather smart one.";
+	next;
+	mes "[Nurse Maenne]";
+	mes "Simply said, I cure unnatural phenomenon around hospitals.";
+	next;
+	mes "[Nurse Maenne]";
+	mes "Many things happen in the world.";
+	next;
+	return;
+
+L_Complete:
+	mes "[Nurse Maenne]";
+	mes "She may have rooted here deeper than I thought.";
+	mes "I can still feel her presence.";
+	cutin "malaya_nurseB",2;
+	next;
+	mes "[Nurse Maenne]";
+	mes "What you killed was a part of her...";
+	mes "But, it was a big help since you confused and damaged her at the same time.";
+	next;
+	mes "[Nurse Maenne]";
+	mes "It makes things a lot easier.";
+	mes "Thank you.";
+	return;
+
+L_Incomplete:
+	mes "[Nurse Maenne]";
+	mes "It would've been easier if she was apart from her body, but now that she returned to her room, this is going to be a little tricky.";
+	cutin "malaya_nurseB",2;
+	next;
+	mes "[Nurse Maenne]";
+	mes "Of course, don't you dare walk away from this, since you disturbed my job and led her to her room.";
+	next;
+	mes "[Nurse Maenne]";
+	mes "If you make it to the 2nd floor door, I'll open a small door to her room for you.";
+	mes "After that, she's all yours.";
+	return;
+}
+
+malaya,55,72,4	script	Nurse#ma_n1	4_F_NURSE,{
+	if (malaya_hi < 20) {
+		mes "[Nurse]";
+		mes "People of this town are too cautious of outsiders.";
+		emotion e_ag;
+		cutin "malaya_nurseA01",2;
+		next;
+		mes "[Nurse]";
+		mes "I'm sure they have their reasons, but I wish they'd tell me how to get closer...";
+		close2;
+		cutin "",255;
+		end;
+	}
+	if (BaseLevel < 100) {
+		mes "There's a nurse outside the hospital holding a large bag.";
+		mes "I don't think I can help her.";
+		close;
+	}
+	if (malaya_bang == 0) {
+		mes "[Nurse]";
+		mes "Hey, hold on.";
+		mes "Are you planning on going inside?";
+		cutin "malaya_nurseA01",2;
+		next;
+		switch(select("Yes.:No.")) {
+		case 1:
+			mes "[Nurse]";
+			mes "Oh~";
+			mes "I'm so glad!";
+			mes "I was literally waiting all day for someone to some by.";
+			cutin "malaya_nurseA02",2;
+			next;
+			switch(select("About the hospital:Reason for stalling me:Ignore.")) {
+			case 1:
+				mes "[Nurse]";
+				mes "This hospital is the only one in town.";
+				mes "And it's going to be my new job.";
+				cutin "malaya_nurseA03",2;
+				next;
+				mes "[Nurse]";
+				mes "I heard it was just built, but it seems so creepy....";
+				emotion e_swt;
+				next;
+				mes "[Nurse]";
+				mes "I was surprised when I got here too.";
+				mes "It says 'closed' all around it!";
+				next;
+				select("Reason for stalling me.");
+				mes "[Nurse]";
+				mes "I was told that they needed nurses in this town,";
+				mes "so I came here after turning down numerous proposals.";
+				next;
+				mes "[Nurse]";
+				mes "I'd heard they were really cautious of outsiders...";
+				next;
+				mes "[Nurse]";
+				mes "Not even a soul to welcome me, let alone a party!";
+				mes "Shocking!";
+				emotion e_sob;
+				next;
+				mes "[Nurse]";
+				mes "What's more, I made it here after being lost and now I'm facing a creepy and locked hospital!";
+				next;
+				break;
+			case 2:
+				mes "[Nurse]";
+				mes "I was told that they needed nurses in this town,";
+				mes "so I came here after turning down numerous proposals.";
+				cutin "malaya_nurseA03",2;
+				next;
+				mes "[Nurse]";
+				mes "I'd heard they were really cautious of outsiders...";
+				next;
+				mes "[Nurse]";
+				mes "Not even a soul to welcome me, let alone a party!";
+				mes "Shocking!";
+				emotion e_sob;
+				next;
+				mes "[Nurse]";
+				mes "What's more, I made it here after being lost and now I'm facing a creepy and locked hospital!";
+				next;
+				select("About the hospital");
+				mes "[Nurse]";
+				mes "This hospital is the only one in town.";
+				mes "And it's going to be my new job.";
+				next;
+				mes "[Nurse]";
+				mes "I heard it was just built, but it seems so creepy....";
+				emotion e_swt;
+				next;
+				mes "[Nurse]";
+				mes "I was surprised when I got here too.";
+				mes "It says 'closed' all around it!";
+				next;
+				break;
+			case 3:
+				mes "[Nurse]";
+				mes "Yes, you must be busy.";
+				mes "Oh, well.";
+				mes "I'll let you be on your way.";
+				mes "Don't mind me. *Sob*";
+				emotion e_sob;
+				cutin "malaya_nurseA03",2;
+				close2;
+				cutin "",255;
+				end;
+			}
+			break;
+		case 2:
+			mes "[Nurse]";
+			mes "Oh, I see...";
+			emotion e_sob;
+			close2;
+			cutin "",255;
+			end;
+		}
+		mes "[Nurse]";
+		mes "Now that you say it... If you're going inside, could you take me with you?";
+		cutin "malaya_nurseA04",2;
+		next;
+		mes "[Nurse]";
+		mes "Doors are locked!";
+		mes "My bags are heavy!";
+		mes "And my legs are killing me.";
+		cutin "malaya_nurseA03",2;
+		next;
+		mes "[Nurse]";
+		mes "If I knew this was going to happen, I would've worn ER night-shift shoes instead of first-day shoes... *sniff*";
+		emotion e_sob;
+		next;
+		switch(select("Help.:Don't help.")) {
+		case 1:
+			mes "[Nurse]";
+			mes "*Sob*";
+			mes "I guess this world is still worth living in.";
+			mes "You are too kind.";
+			emotion e_sob;
+			next;
+			mes "[Nurse Las]";
+			mes "I'm 'Las', who's supposed to work in this hospital.";
+			mes "By the looks of it, though, I may become jobless...";
+			next;
+			mes "[Nurse Las]";
+			mes "Let's start by getting inside.";
+			next;
+			mes "[Nurse Las]";
+			mes "Before that....";
+			mes "Could you get something to wrap my feet? I can't put my shoes on because I've got blisters.";
+			emotion e_hlp;
+			cutin "malaya_nurseA04",2;
+			next;
+			mes "[Nurse Las]";
+			mes "2 Rotten Bandages should do to wrap both my feet. They may look dirty, but they have special liquid on them that have amazing effects.";
+			set malaya_bang,1;
+			setquest 11284;
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Nurse]";
+			mes "Yes, you must be busy.";
+			mes "Oh, well.";
+			mes "I'll let you be on your way.";
+			mes "Don't mind me. *Sob*";
+			emotion e_sob;
+			cutin "malaya_nurseA03",2;
+			close2;
+			cutin "",255;
+			end;
+		}
+	} else if (malaya_bang == 1) {
+		if (countitem(930) > 1) {
+			mes "[Nurse Las]";
+			mes "Oh......";
+			mes "I know they're effective but... Not so tempting.";
+			cutin "malaya_nurseA01",2;
+			next;
+			mes "[Nurse Las]";
+			mes "Rotten Bandages... A fit name for something that seems to have been cut fresh from a mummy.";
+			next;
+			mes "[Nurse Las]";
+			mes "I'm having second thoughts looking at them, but as I am to be a professional nurse!!";
+			mes "Here goes nothing!!!";
+			mes "Ewwww!!";
+			next;
+			mes "[Nurse Las]";
+			mes "*Squish*";
+			mes "*Squelch*";
+			delitem 930,2; //Rotten_Bandage
+			set malaya_bang,2;
+			close2;
+			cutin "",255;
+			end;
+		} else {
+			mes "[Nurse Las]";
+			mes "Before that...";
+			mes "Could you get something to wrap my feet? I can't put my shoes on because I've got blisters.";
+			emotion e_hlp;
+			cutin "malaya_nurseA03",2;
+			next;
+			mes "[Nurse Las]";
+			mes "2 Rotten Bandages should do to wrap both my feet. They may look dirty, but they have special liquid on that have with amazing effects.";
+			close2;
+			cutin "",255;
+			end;
+		}
+	} else if (malaya_bang == 2) {
+		mes "[Nurse Las]";
+		mes "Ahhhhh...";
+		mes "My feet feel a lot better now, but it smells funny.";
+		cutin "malaya_nurseA01",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Oh...... the smell......";
+		mes "My new shoes will be ruined...";
+		emotion e_swt2;
+		next;
+		mes "[Nurse Las]";
+		mes "Okay!!!!!!";
+		mes "I don't know if it's locked or stuck, let's try pushing it together!";
+		set malaya_bang,3;
+		changequest 11284,11285;
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 3) {
+		mes "[Nurse Las]";
+		mes "Okay!!!!!!";
+		mes "I don't know if it's locked or stuck, let's try pushing it together!";
+		cutin "malaya_nurseA01",2;
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 4) {
+		mes "["+strcharinfo(0)+"]";
+		mes "We pushed and pulled, but it won't budge.";
+		emotion e_swt2,1;
+		next;
+		mes "[Nurse Las]";
+		mes "Strange~";
+		mes "They wouldn't have sent me to a closed down hospital.";
+		cutin "malaya_nurseA03",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Hmmm!";
+		mes "I can't stand it anymore!";
+		emotion e_an;
+		next;
+		mes "[Nurse Las]";
+		mes "Could you ask the townsfolk about the hospital while I contact HQ?";
+		cutin "malaya_nurseA01",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Hey, why don't you start with that girl over there?";
+		mes "Perhaps she'll tell you something.";
+		set malaya_bang,5;
+		changequest 11286,11287;
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 5) {
+		mes "[Nurse Las]";
+		mes "Could you ask the townsfolk about the hospital while I contact HQ?";
+		cutin "malaya_nurseA01",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Hey, why don't you start with that girl over there?";
+		mes "Perhaps she'll tell you something.";
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 6) {
+		mes "[Nurse Las]";
+		mes "What did she say?";
+		emotion e_what;
+		cutin "malaya_nurseA02",2;
+		next;
+		select("Tell her what she said.");
+		mes "[Nurse Las]";
+		mes "Strange.";
+		mes "HQ confirmed that I am assigned here.";
+		cutin "malaya_nurseA01",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Maybe that girl doesn't know about this place?";
+		mes "HQ couldn't have sent me here and be lying about it. Could you ask someone else in town?";
+		next;
+		mes "[Nurse Las]";
+		mes "I'll contact HQ again for more info.";
+		mes "Hey, why not ask that man over there?";
+		mes "I'm sure he'll know something.";
+		set malaya_bang,7;
+		changequest 11288,11289;
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 7) {
+		mes "[Nurse Las]";
+		mes "I'll contact HQ again for more info.";
+		mes "Hey, why not ask that man over there?";
+		mes "I'm sure he'll know something.";
+		cutin "malaya_nurseA01",2;
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 8) {
+		mes "[Nurse Las]";
+		mes "An inn?";
+		mes "Good gracious!";
+		mes "If they'd have told me earlier I wouldn't have had to stand out here for so long!";
+		emotion e_pif;
+		cutin "malaya_nurseA01",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Ummm......";
+		mes "......";
+		mes "......";
+		next;
+		mes "[Nurse Las]";
+		mes "Hey... you know what...";
+		next;
+		mes "[Nurse Las]";
+		mes "I don't think I can move anymore because of my feet. Could you go to the inn for me?";
+		emotion e_swt2;
+		cutin "malaya_nurseA03",2;
+		next;
+		mes "[Nurse Las]";
+		mes "I can't carry my bags around so I'll stay here and watch over them while I treat my feet.";
+		next;
+		mes "[Nurse Las]";
+		mes "I have to be back here again anyway.";
+		mes "Thank you.";
+		set malaya_bang,9;
+		changequest 11290,11291;
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 9) {
+		mes "[Nurse Las]";
+		mes "I don't think I can move anymore because of my feet. Could you go to the inn for me?";
+		emotion e_swt2;
+		cutin "malaya_nurseA03",2;
+		next;
+		mes "[Nurse Las]";
+		mes "I can't carry my bags around so I'll stay here and watch over them while I treat my feet.";
+		next;
+		mes "[Nurse Las]";
+		mes "I have to be back here again anyway.";
+		mes "Thank you.";
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 10) {
+		mes "[Nurse Las]";
+		mes "Hey~";
+		mes "How'd it go?";
+		cutin "malaya_nurseA02",2;
+		next;
+		select("Hand over the key and message.");
+		mes "[Nurse Las]";
+		mes "Keys?";
+		mes "Well this is one step closer to my goals!";
+		mes "Let's open the door right now!";
+		set malaya_bang,11;
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 11) {
+		mes "[Nurse Las]";
+		mes "Keys?";
+		mes "Well this is one step closer to my goals!";
+		mes "Let's open the door right now!";
+		cutin "malaya_nurseA02",2;
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 12) {
+		mes "[Nurse Las]";
+		mes "That's weird~!";
+		mes "The door's not locked?";
+		mes "How can this be?????";
+		mes "????";
+		emotion e_what;
+		emotion e_what,1;
+		cutin "malaya_nurseA04",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Oh no!!!";
+		mes "Everything's falling apart.";
+		mes "Maybe we should wait for the doctor to come.....";
+		cutin "malaya_nurseA03",2;
+		next;
+		mes "[???]";
+		mes "...";
+		cutin "",255;
+		next;
+		mes "[???]";
+		mes "*Snigger*";
+		emotion e_what,1;
+		emotion e_what;
+		next;
+		mes "[???]";
+		mes "Hey "+((Sex)?"dude":"missy")+",";
+		mes "You're not getting in the hospital.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Who's there?!";
+		next;
+		mes "[???]";
+		mes "*Snigger*";
+		next;
+		mes "[???]";
+		mes "That's a secret~";
+		mes "My mom will kill me if she knew I was here!";
+		next;
+		switch(select("About entering the hospital.:About it's mom.:About ???:Quit.")) {
+		case 1:
+			mes "[???]";
+			mes "A few days ago, the old lady who lives near us went around the hospital sticking some kind of sticks into the ground.";
+			next;
+			mes "[???]";
+			mes "She was mumbling and looking around a lot.";
+			next;
+			mes "[???]";
+			mes "I was well hidden here because I wasn't supposed to be here.";
+			next;
+			break;
+		case 2:
+			mes "[???]";
+			mes "My mom once told me.";
+			mes "The old lady's daughter was hospitalized here.";
+			next;
+			mes "[???]";
+			mes "She never got out of it though...";
+			next;
+			mes "[???]";
+			mes "She wasn't the only one. There were many strange things going on at the hospital.";
+			next;
+			mes "[???]";
+			mes "That's why my mom doesn't want me coming around here.";
+			next;
+			break;
+		case 3:
+			mes "[???]";
+			mes "No way Jose!";
+			mes "I got a spanking last time I was caught around here!";
+			next;
+			mes "[???]";
+			mes "If I'm caught again, it won't end with a spanking....";
+			mes "So scary.";
+			next;
+			break;
+		case 4:
+			mes "[???]";
+			mes "Humph!!";
+			close;
+		}
+		mes "The voice seems to be coming from the bushes near the entrance of the hospital.";
+		specialeffect EF_STEAL,AREA,"Bushes#ma";
+		set malaya_bang,13;
+		changequest 11293,11294;
+		close;
+	} else if (malaya_bang == 13) {
+		mes "The voice seems to be coming from the bushes near the entrance of the hospital.";
+		mes "Let's check around.";
+		specialeffect EF_STEAL,AREA,"Bushes#ma";
+		close;
+	} else if (malaya_bang == 14) {
+		mes "[Nurse Las]";
+		mes "Hmmm... Let's look around the hospital.";
+		cutin "malaya_nurseA01",2;
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 15) {
+		mes "[Nurse Las]";
+		mes "Hey... ummm...";
+		mes "You know...";
+		mes "Could you give that old lady a visit?";
+		cutin "malaya_nurseA04",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Oh, me? I'll look be looking around here.";
+		next;
+		mes "[Nurse Las]";
+		mes "As you know, my feet hurt...";
+		mes "Yes?";
+		mes "Yes?";
+		next;
+		switch(select("Go.:Don't go.")) {
+		case 1:
+			mes "[Nurse Las]";
+			mes "Okay, off you go.";
+			mes "I think she lives on the west side of town.";
+			mes "Go on.";
+			next;
+			mes "[Nurse Las]";
+			mes "Hey you in the bushes, I'll tell on you if you don't go home now!";
+			set malaya_bang,16;
+			changequest 11296,11297;
+			close2;
+			cutin "",255;
+			end;
+		case 2:
+			mes "[Nurse Las]";
+			mes "Why!?";
+			mes "Staying here won't solve anything.";
+			close2;
+			cutin "",255;
+			end;
+		}
+	} else if (malaya_bang == 16 || malaya_bang == 17) {
+		mes "[Nurse Las]";
+		mes "Okay, off you go.";
+		mes "I think she lives on the west side of town.";
+		mes "Go on.";
+		cutin "malaya_nurseA04",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Hey you in the bushes, I'll tell on you if you don't go home now!";
+		emotion e_omg,0,"Bushes#ma";
+		close2;
+		cutin "",255;
+		end;
+	} else if (malaya_bang == 18) {
+		mes "[Nurse Las]";
+		mes "How'd it go?";
+		mes "Did you meet the old lady?";
+		cutin "malaya_nurseA02",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Oh by the way, when ["+strcharinfo(0)+"], you were gone, I tried the door.";
+		mes "It did open...";
+		next;
+		mes "[Nurse Las]";
+		mes "But the way to the 2nd floor was blocked.";
+		mes "I thought the door opening was a break through, but turns out it wasn't.";
+		cutin "malaya_nurseA03",2;
+		next;
+		mes "[Nurse Las]";
+		mes "Anyway, the first floor door is open, so let's go inside.";
+		mes "Everything would be meaningless if the second floor door is not opened.";
+		emotion e_sob;
+		set malaya_bang,19;
+		changequest 11299,11300;
+		close2;
+		cutin "",255;
+		warp "ma_dun01",33,110;
+		end;
+	} else if (malaya_bang == 19) {
+		mes "[Nurse Las]";
+		mes "Anyway, the first floor door is open, so let's go inside.";
+		mes "Everything would be meaningless if the second floor door is not opened.";
+		emotion e_sob;
+		cutin "malaya_nurseA01",2;
+		close2;
+		cutin "",255;
+		warp "ma_dun01",33,110;
+		end;
+	} else if (malaya_bang < 30) {
+		mes "[Nurse Las]";
+		mes "Could you check the 2nd floor door again in case I missed something?";
+		cutin "malaya_nurseA01",2;
+		close2;
+		cutin "",255;
+		warp "ma_dun01",33,110;
+		end;
+	} else {
+		callfunc "F_Malaya_Nurse",1;
+		end;
+	}
+	mes "There's a nurse outside the hospital holding a large bag.";
+	mes "I don't think I can help her.";
+	close;
+}
+
+ma_dun01,35,108,4	script	Nurse#ma_n2	4_F_NURSE,{
+	if (malaya_bang < 19) {
+		// fall through
+	} else if (malaya_bang < 30) {
+		if (malaya_bang == 19) {
+			mes "The hospital is infested with monsters, like the old lady said.";
+			mes "How could she have gone back and forth to the 2nd floor with her feet like that....";
+			next;
+			set malaya_bang,20;
+			changequest 11300,11301;
+		}
+		mes "[Nurse Las]";
+		mes "Could you check the 2nd floor door again in case I missed something?";
+		cutin "malaya_nurseA01",2;
+		next;
+		switch(select("Go outside.:Quit.")) {
+		case 1:
+			close2;
+			cutin "",255;
+			warp "malaya",58,76;
+			end;
+		case 2:
+			mes "[Nurse Las]";
+			mes "Tsk...";
+			close2;
+			cutin "",255;
+			end;
+		}
+	} else {
+		callfunc "F_Malaya_Nurse",2;
+		end;
+	}
+	mes "[Nurse]";
+	mes "I want to be left alone.";
+	mes "Please leave.";
+	close2;
+	warp "malaya",58,76;
+	end;
+}
+
+ma_dun01,152,23,4	script	Suspicious Wooden Stick::MalayaStick0	4_BULLETIN_BOARD2,{
+	if (malaya_bang == 20) {
+		mes "There's a talisman similar to the ones outside the hospital.";
+		mes "Let's look around for something else.";
+		set malaya_bang,30;
+		changequest 11301,11302;
+		close;
+	} else if (malaya_bang == 30) {
+		mes "There's a talisman similar to the ones outside the hospital.";
+		mes "Let's look around for something else.";
+		close;
+	} else if (malaya_bang == 35) {
+		mes "After sticking on the talisman over the other one, the dark feeling lifted away, just like Las said.";
+		next;
+		mes "[Nurse Las]";
+		mes "*Snigger*";
+		cutin "malaya_nurseA05",2;
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "?!";
+		cutin "",255;
+		next;
+		mes "[Nurse Las]";
+		mes "Yes, yes!";
+		cutin "malaya_nurseA05",2;
+		next;
+		mes "[Nurse Las]";
+		mes "The annoying talismans are gone!";
+		next;
+		mes "[Nurse Las]";
+		mes "*Giggle*";
+		next;
+		mes "[Nurse Las]";
+		mes "Human's are so dumb. You show them a pretty little helpless look and they fall for it.";
+		next;
+		mes "[Nurse Las]";
+		mes "*Snigger*";
+		next;
+		mes "[Nurse Las]";
+		mes "For your work, I shall take you to my room...";
+		mes "Darn...";
+		next;
+		mes "[Nurse Las]";
+		mes "......";
+		next;
+		mes "[Nurse Las]";
+		mes "No no no!";
+		mes "You still have those annoying talismans!!!";
+		next;
+		mes "[Nurse Las]";
+		mes "This is your lucky day!";
+		mes "*Snigger*";
+		set malaya_bang,36;
+		changequest 11307,11308;
+		close2;
+		cutin "",255;
+		warp "malaya",58,76;
+		end;
+	} else if (malaya_bang > 35) {
+		mes "Cannot feel anything evil about the talisman.";
+		mes "Only the bitter taste of being fooled around Las remains...";
+		close;
+	} else {
+		mes "No power can be felt.";
+		close;
+	}
+}
+
+malaya,48,76,4	script	Hospital Door#ma_n1	CLEAR_NPC,{
+	if (malaya_bang == 3) {
+		mes "Pushed hard on the door, but it won't open.";
+		mes "It doesn't feel like it's locked or stuck, but encased by a layer of something.";
+		set malaya_bang,4;
+		changequest 11285,11286;
+		close;
+	} else if (malaya_bang == 4) {
+		mes "Pushed hard on the door, but it won't open.";
+		mes "It doesn't feel like it's locked or stuck, but encased by a layer of something.";
+		close;
+	} else if (malaya_bang == 11) {
+		mes "Put the key inside the lock of the hospital door...";
+		mes "But it's not locked as expected.";
+		next;
+		mes "Then why is the door not opening?";
+		set malaya_bang,12;
+		changequest 11292,11293;
+		close;
+	} else if (malaya_bang == 12) {
+		mes "Put the key inside the lock of the hospital door...";
+		mes "But it's not locked as expected.";
+		next;
+		mes "Then why is the door not opening?";
+		close;
+	} else if (malaya_bang > 18) {
+		if(select("Enter the hospital.:Quit.") == 1)
+			warp "ma_dun01",33,110;
+		end;
+	} else {
+		mes "The hospital door seems to be closed.";
+		close;
+	}
+}
+
+malaya,64,78,4	script	Village Woman#mab	4_F_MALAYA,{
+	if (malaya_hi < 20) {
+		mes "[Village Woman]";
+		mes "......";
+		next;
+		mes "Seems very cautious about you.";
+		close;
+	}
+	if (malaya_bang == 5) {
+		mes "[Village Woman]";
+		mes "Oh~Are you an adventurer?";
+		mes "It seems like we have a lot of them in town lately.";
+		next;
+		mes "[Village Woman]";
+		mes "I was born here and never went far away from here, so I always feel like going on my adventures when I hear the stories they bring.";
+		next;
+		switch(select("Ask about the hospital.:End conversation.")) {
+		case 1:
+			mes "[Village Woman]";
+			mes "The hospital?";
+			mes "It's been closed for a very long time.";
+			mes "They don't talk about it around here.";
+			next;
+			mes "[Village Woman]";
+			mes "I never had to go to the hospital.";
+			mes "I've been there once when I had a stomach ache as a child. I remember the place being creepy.";
+			next;
+			mes "[Village Woman]";
+			mes "Children never like hospitals.";
+			next;
+			select("Ask about the nurse.");
+			mes "[Village Woman]";
+			mes "The new nurse?";
+			mes "I don't know.";
+			mes "I haven't given it a thought.";
+			mes "It is strange to have a new nurse coming to a closed hospital.";
+			set malaya_bang,6;
+			changequest 11287,11288;
+			close;
+		case 2:
+			mes "[Village Woman]";
+			mes "Have a nice day~";
+			close;
+		}
+	} else if (malaya_bang == 6) {
+		mes "[Village Woman]";
+		mes "The new nurse?";
+		mes "I don't know.";
+		mes "I haven't given it a thought.";
+		mes "It is strange to have a new nurse coming to a closed hospital.";
+		set malaya_bang,6;
+		changequest 11287,11288;
+		close;
+	} else {
+		mes "[Village Woman]";
+		mes "Oh~Are you an adventurer?";
+		mes "It seems like we have a lot of them in town lately.";
+		next;
+		mes "[Village Woman]";
+		mes "I was born here and never went far away from here, so I always feel like going on my adventures when I hear the stories they bring.";
+		close;
+	}
+}
+
+malaya,62,37,4	script	Village Man#mab	4_M_MALAYA,{
+	if (malaya_hi < 20) {
+		mes "[Village Man]";
+		mes "Hmmm! Haven't seen you around?";
+		mes "What brings you to our town?";
+		next;
+		mes "Seems very cautious about you.";
+		close;
+	}
+	if (malaya_bang == 7) {
+		mes "[Village Man]";
+		mes "*Laughs*";
+		mes "An adventurer, are you?";
+		mes "When you have time, come and take a look around my pineapple farm.";
+		next;
+		mes "[Village Man]";
+		mes "Just a little bit~";
+		mes "far from the village, but I'll give you all the pineapple you want in exchange for a good story of yours!";
+		next;
+		switch(select("Ask about the hospital.:End conversation.")) {
+		case 1:
+			mes "[Village Man]";
+			mes "Ummm......";
+			mes "You mean that hospital?";
+			next;
+			mes "[Village Man]";
+			mes "It was closed down because of an accident.";
+			mes "But I wouldn't trouble an outsider with the details......";
+			mes "There's not much I can tell you.";
+			next;
+			select("Ask about the nurse.");
+			mes "[Village Man]";
+			mes "Oh!!!";
+			mes "Did you meet the nurse?!";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "She was standing in front of the hospital.";
+			mes "Oh!";
+			mes "She must have gone to contact HQ.";
+			next;
+			mes "[Village Man]";
+			mes "We requested 'the nurse', and she's already here! We're saved!";
+			next;
+			select("The nurse?");
+			mes "[Village Man]";
+			mes "She was invited here to save our hospital.";
+			next;
+			mes "[Village Man]";
+			mes "Now I have to spread the good news! Could you bring her to the inn at the center of town?";
+			next;
+			mes "[Village Man]";
+			mes "That's where the doctor is staying.";
+			mes "He's been there ever since the hospital was closed.";
+			set malaya_bang,8;
+			changequest 11289,11290;
+			close;
+		case 2:
+			mes "[Village Man]";
+			mes "Whoopeee!";
+			close;
+		}
+	} else if (malaya_bang == 8) {
+		mes "[Village Man]";
+		mes "Now I have to spread the good news! Could you bring her to the inn at the center of town?";
+		next;
+		mes "[Village Man]";
+		mes "That's where the doctor is staying.";
+		mes "He's been there ever since the hospital was closed.";
+		close;
+	} else {
+		mes "[Village Man]";
+		mes "Whoopeee!";
+		mes "An adventurer, are you?";
+		mes "When you have time, come and take a look around my pineapple farm.";
+		next;
+		mes "[Village Man]";
+		mes "Just a little bit~";
+		mes "far from the village, but I'll give you all the pineapple you want in exchange for a good story of yours!";
+		close;
+	}
+}
+
+malaya,210,200,5	script	Dr. Boon#ma	4_LGTSCIENCE,{
+	if (malaya_hi < 20) {
+		mes "[Dr. Boon]";
+		mes "......";
+		next;
+		mes "Seems very cautious about you.";
+		close;
+	}
+	if (malaya_bang == 9) {
+		mes "[Dr. Boon]";
+		mes "So~ You're the new nurse?";
+		next;
+		switch(select("Yes.:No.")) {
+		case 1:
+			mes "[Dr. Boon]";
+			mes "Nothing's more important for a nurse than their white uniform.";
+			mes "Go get changed!";
+			close;
+		case 2:
+			mes "[Dr. Boon]";
+			mes "Oh! I'm sorry.";
+			mes "We're waiting for a new nurse.";
+			mes "My bad.";
+			next;
+			select("Explain the situation.");
+			mes "[Dr. Boon]";
+			mes "Aha~";
+			mes "So that's what happened.";
+			mes "Oh, dear. I guess there was a misunderstanding.";
+			next;
+			mes "[Dr. Boon]";
+			mes "You see, I've been treating patients at the inn after what happened to the hospital.";
+			next;
+			mes "[Dr. Boon]";
+			mes "Even so, I must apologize for making her stand there so long.";
+			next;
+			mes "[Dr. Boon]";
+			mes "I can't leave right now because I have patients to look after. Why don't you go over and hand over this key?";
+			next;
+			mes "[Dr. Boon]";
+			mes "And give her a message with the key saying, 'I'll leave it to your own discretion'.";
+			next;
+			mes "[Dr. Boon]";
+			mes "I'll be there as soon as I'm done here.";
+			mes "Good luck~";
+			set malaya_bang,10;
+			changequest 11291,11292;
+			close;
+		}
+	} else if (malaya_bang == 10) {
+		mes "[Dr. Boon]";
+		mes "I can't leave right now because I have patients to look after. Why don't you go over and hand over this key?";
+		next;
+		mes "[Dr. Boon]";
+		mes "And give her a message with the key saying, 'I'll leave it to your own discretion'.";
+		next;
+		mes "[Dr. Boon]";
+		mes "I'll be there as soon as I'm done here.";
+		mes "Good luck~";
+		close;
+	} else {
+		mes "[Dr. Boon]";
+		mes "*Sigh*";
+		mes "The work... It never ends...";
+		mes "How am I supposed to handle all these patients on my own?";
+		next;
+		mes "[Dr. Boon]";
+		mes "What? What's a doctor doing in an inn?";
+		mes "Well, why not?";
+		close;
+	}
+}
+
+malaya,53,68,4	script	Bushes#ma	CLEAR_NPC,{
+	if (malaya_bang < 13) {
+		mes "It's just a bush.";
+		mes "A sweet scent of wood rises when shaken.";
+		close;
+	}
+	if (malaya_bang == 13) {
+		mes "[???]";
+		mes "Don't come any closer!";
+		mes "Old "+((Sex)?"man":"lady")+"!";
+		mes "How'd you know I was here?";
+		emotion e_omg;
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I'm not old.";
+		emotion e_an,1;
+		next;
+		switch(select("About entering the hospital.:About its mom.:About ???.:Ask about the old lady.:Ask about the hospital grounds.:Quit.")) {
+		case 1:
+			mes "[???]";
+			mes "A few days ago, the old lady who lives near us went around the hospital sticking some kind of sticks into the ground.";
+			next;
+			mes "[???]";
+			mes "She was mumbling and looking around a lot.";
+			next;
+			mes "[???]";
+			mes "I was well hidden here because I wasn't supposed to be here.";
+			next;
+			break;
+		case 2:
+			mes "[???]";
+			mes "My mom once told me.";
+			mes "The old lady's daughter was hospitalized here.";
+			next;
+			mes "[???]";
+			mes "She never got out of it though...";
+			next;
+			mes "[???]";
+			mes "She wasn't the only one. There were many strange things going on at the hospital.";
+			next;
+			mes "[???]";
+			mes "That's why my mom doesn't want me coming around here.";
+			next;
+			break;
+		case 3:
+			mes "[???]";
+			mes "No way Jose!";
+			mes "I got a spanking last time I was caught around here!";
+			next;
+			mes "[???]";
+			mes "If I'm caught again, it won't end with a spanking....";
+			mes "So scary.";
+			next;
+			break;
+		case 4:
+			mes "[???]";
+			mes "It's the lady who lives next door to us.";
+			next;
+			mes "[???]";
+			mes "I saw her a few days ago doing something around the hospital.";
+			next;
+			mes "[???]";
+			mes "I couldn't see what she was doing from here, but I found some sticks there after she'd left.";
+			set malaya_bang,14;
+			changequest 11294,11295;
+			close;
+		case 5:
+			mes "[???]";
+			mes "I dunno.";
+			mes "Nothing's different except for the sticks.";
+			next;
+			mes "[???]";
+			mes "The old lady comes back once in a while to check on the sticks.";
+			mes "My heart races when that happens!";
+			next;
+			break;
+		case 6:
+			mes "[???]";
+			mes "Humph!!";
+			emotion e_pif;
+			close;
+		}
+		mes "[???]";
+		mes "Promise me you won't tell anyone that you saw me!!!";
+		mes "Promise?!";
+		close;
+	} else if (malaya_bang == 14) {
+		mes "[???]";
+		mes "I couldn't see what she was doing from here, but I found some sticks there after she'd left.";
+		close;
+	} else if (malaya_bang == 15) {
+		mes "[???]";
+		mes "Don't come any closer!";
+		mes "Old "+((Sex)?"man":"lady")+"!";
+		mes "How'd you know I was here?";
+		emotion e_omg;
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I'm not old.";
+		emotion e_an,1;
+		close;
+	} else {
+		mes "There's a trace of a young child.";
+		mes "Think the child's gone home now.";
+		close;
+	}
+}
+
+-	script	Suspicious Wooden Stick::MalayaStick	-1,{
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait !! -";
+		mes "- You have too many items. -";
+		mes "- Cannot receive item. -";
+		mes "- Please lighten your bag -";
+		mes "- and try again. -";
+		close;
+	}
+	if (MaxWeight - Weight < 1000) {
+		mes "- Wait !! -";
+		mes "- You are carrying too many items. -";
+		mes "- Cannot receive item. -";
+		mes "- Please lighten your bag -";
+		mes "- and try again. -";
+		close;
+	}
+	if (malaya_bang == 14) {
+		mes "A strange stick is planted on the ground.";
+		mes "A mysterious force can be felt.";
+		next;
+		switch(select("Pull it out.:Leave it.")) {
+		case 1:
+			if (rand(1,5) == 4) {
+				mes "Pulled out the deeply planted stick.";
+				mes "The hospital seems to have become more gloomy.";
+				if (rand(2)) {
+					set malaya_bang,15;
+					changequest 11295,11296;
+					getitem 6497,1; //Lesser_Agimat
+					donpcevent "Tent"+replacestr(strnpcinfo(3),"MalayaStick","")+"#ma::OnEnable";
+					next;
+					mes "Better show Las the talisman.";
+					close;
+				} else {
+					getitem 6497,1; //Lesser_Agimat
+					donpcevent "Tent"+replacestr(strnpcinfo(3),"MalayaStick","")+"#ma::OnEnable";
+					close;
+				}
+			} else {
+				mes "After pulling out the deeply planted stick, an uneasy feeling washes over.";
+				donpcevent "Tent"+replacestr(strnpcinfo(3),"MalayaStick","")+"#ma::OnEnable";
+				close;
+			}
+		case 2:
+			mes "It looks ominous. Better leave it alone.";
+			close;
+		}
+	} else {
+		mes "There's a strange looking stick.";
+		close;
+	}
+	end;
+OnEnable:
+	enablenpc strnpcinfo(3); // NPC name is too long for strnpcinfo(0).
+	end;
+OnDisable:
+	disablenpc strnpcinfo(3);
+	end;
+}
+malaya,40,52,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick1	4_BULLETIN_BOARD2
+malaya,31,42,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick2	4_BULLETIN_BOARD2
+malaya,34,36,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick3	4_BULLETIN_BOARD2
+malaya,40,32,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick4	4_BULLETIN_BOARD2
+malaya,50,85,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick5	4_BULLETIN_BOARD2
+malaya,46,93,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick6	4_BULLETIN_BOARD2
+malaya,36,98,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick7	4_BULLETIN_BOARD2
+malaya,48,79,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick8	4_BULLETIN_BOARD2
+malaya,50,46,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick9	4_BULLETIN_BOARD2
+malaya,59,84,4	duplicate(MalayaStick)	Suspicious Wooden Stick::MalayaStick10	4_BULLETIN_BOARD2
+
+-	script	Tent#ma	-1,{ //557
+	end;
+OnInit:
+	disablenpc strnpcinfo(0);
+	end;
+OnEnable:
+	enablenpc strnpcinfo(0);
+	initnpctimer;
+	end;
+OnDisable:
+	stopnpctimer;
+	disablenpc strnpcinfo(0);
+	end;
+OnTimer1000:
+	donpcevent "MalayaStick"+replacestr(strnpcinfo(1),"Tent","")+"::OnDisable";
+	end;
+OnTimer30000:
+	donpcevent "MalayaStick"+replacestr(strnpcinfo(1),"Tent","")+"::OnEnable";
+	donpcevent strnpcinfo(0)+"::OnDisable";
+	end;
+}
+-	duplicate(Tent#ma)	Tent1#ma	-1
+-	duplicate(Tent#ma)	Tent2#ma	-1
+-	duplicate(Tent#ma)	Tent3#ma	-1
+-	duplicate(Tent#ma)	Tent4#ma	-1
+-	duplicate(Tent#ma)	Tent5#ma	-1
+-	duplicate(Tent#ma)	Tent6#ma	-1
+-	duplicate(Tent#ma)	Tent7#ma	-1
+-	duplicate(Tent#ma)	Tent8#ma	-1
+-	duplicate(Tent#ma)	Tent9#ma	-1
+-	duplicate(Tent#ma)	Tent10#ma	-1
+
+malaya,114,183,3	script	Bent Old Lady#ma	4_F_BARYO_OLD,{
+	if (malaya_bang == 16) {
+		mes "[Bent Old Lady]";
+		mes "Ho ho ho ho~~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ma'am, excuse me, but can I ask you a question?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Ho ho ho ho~~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ma'am?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Ho ho ho ho~~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ma'am?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Ho ho ho ho~~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ma'am!!!!!!!!!";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Who? What?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Excuse me, but can I ask you something?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "What? I can't hear you.";
+		mes "Speak up!";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I! Have! Something! To! Ask! You!";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Oh~Yes dear~";
+		mes "I'll tell you everything I know, dear~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Do you know anything about the hospital?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Hospital?";
+		mes "........";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Hospital?!?!?!?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "That hospital is cursed!";
+		mes "Something wicked is living there!";
+		next;
+		mes "[Bent Old Lady]";
+		mes "The thing took away my poor little girl.";
+		next;
+		switch(select("Ask about the hospital.:Ask about her daughter.")) {
+		case 1:
+			mes "[Bent Old Lady]";
+			mes "Everybody was happy to hear about the hospital being built.";
+			next;
+			mes "[Bent Old Lady]";
+			mes "We no longer had to go to other towns for medical care.";
+			next;
+			mes "[Bent Old Lady]";
+			mes "But the one they built didn't work out so well.";
+			mes "It couldn't cure people.";
+			mes "I knew this would happen when they chopped down the old tree to build it.";
+			next;
+			mes "[Bent Old Lady]";
+			mes "But the administrator wouldn't listen.";
+			mes "Far from curing people, they started to die.";
+			mes "So did my daughter...";
+			set malaya_bang,17;
+			changequest 11297,11298;
+			close;
+		case 2:
+			mes "[Bent Old Lady]";
+			mes "She suffered from nothing life threatening.";
+			mes "It was...";
+			mes "Just a cold......";
+			next;
+			mes "[Bent Old Lady]";
+			mes "The wicked thing.... My daughter...";
+			mes "There's something in that hospital.";
+			close;
+		}
+	} else if (malaya_bang == 17) {
+		select("Show her the stick.");
+		mes "[Bent Old Lady]";
+		mes "What?";
+		mes "Arghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh";
+		emotion e_omg;
+		next;
+		mes "[Bent Old Lady]";
+		mes "Arghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh";
+		emotion e_omg;
+		next;
+		mes "[Bent Old Lady]";
+		mes "Arghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh";
+		emotion e_omg;
+		next;
+		mes "[Bent Old Lady]";
+		mes "Arghhhhhhhhhh!!!!!!!!!!!";
+		emotion e_omg;
+		next;
+		mes "[Bent Old Lady]";
+		mes "What have you done!";
+		mes "That... That was a talisman to stop the wicked thing!";
+		next;
+		mes "[Bent Old Lady]";
+		mes "If you pull them up, it will go after people again!";
+		next;
+		mes "[Bent Old Lady]";
+		mes "I saw it!";
+		mes "I saw it when they closed the hospital saying that everybody had died.";
+		next;
+		mes "[Bent Old Lady]";
+		mes "But they all knew.";
+		mes "The patients weren't all dead.";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Taken alive...";
+		mes "By the thing that took my daughter...";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Oh dear.";
+		next;
+		mes "Nurse Las may be in danger, standing alone in front of the hospital.";
+		mes "If I don't return quickly...";
+		set malaya_bang,18;
+		changequest 11298,11299;
+		close;
+	} else if (malaya_bang == 18) {
+		mes "Nurse Las may be in danger, standing alone in front of the hospital.";
+		mes "If I don't return quickly...";
+		close;
+	} else if (malaya_bang == 32) {
+		mes "[Bent Old Lady]";
+		mes "Yes? The talisman?";
+		mes "I asked the shaman up north of the village to make them,";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Not famous, but a talented shaman.";
+		set malaya_bang,33;
+		changequest 11304,11305;
+		close;
+	} else {
+		mes "[Bent Old Lady]";
+		mes "Ho ho ho ho~~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ma'am, excuse me, but can I ask you a question?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Ho ho ho ho~~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ma'am?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Ho ho ho ho~~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ma'am?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Ho ho ho ho~~";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ma'am!!!!!!!!!";
+		next;
+		mes "[Bent Old Lady]";
+		mes "Who? What?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Excuse me, but can I ask you something?";
+		next;
+		mes "[Bent Old Lady]";
+		mes "What? I can't hear you.";
+		mes "Speak up!";
+		close;
+	}
+}
+
+malaya,276,367,4	script	Bent Shaman#ma	4_F_UMOLDWOMAN,{
+	if (malaya_hi < 20) {
+		mes "[Bent Shaman]";
+		mes "Urgh Urgh Urghhhhhh";
+		next;
+		mes "Doesn't give even a glance...";
+		close;
+	}
+	mes "[Bent Shaman]";
+	mes "Hmmmm...";
+	mes "I feel, feel....";
+	next;
+	mes "[Bent Shaman]";
+	mes "I feel something bad from you...";
+	if (malaya_bang == 33) {
+		next;
+		mes "[Bent Shaman]";
+		mes "No no...";
+		mes "You need not say anything!";
+		mes "You'll be needing this.";
+		next;
+		mes "[Bent Shaman]";
+		mes "It's okay.";
+		mes "No need for money.";
+		mes "It's the karma this village must face...";
+		set malaya_bang,34;
+		changequest 11305,11306;
+	}
+	close;
+}
+
+// Pintados Festival :: malaya_pintados
+//============================================================
+/*
+Description
+-----------
+The Pintados Festival begins when players have accumulated 1000 Lesser Agimats,
+1000 Silver Crosses, and 300 dyestuffs, and lasts for 7 days. During that time,
+players are able to create a tattoo.
+
+Global Variables
+----------------
+$malaya_pintados_00  - Festival time limit, in 30-minute intervals. (range: 0~344)
+$malaya_pintados_01  - Number of Lesser Agimats collected. (range: 0~1000)
+$malaya_pintados_02  - Number of Silver Crosses collected. (range: 0~1000)
+$malaya_pintados_03  - Number of dyestuffs collected. (range: 0~300)
+$malaya_pintados_04$ - Last player to create a tattoo.
+*/
+
+ma_fild01,1,1,4	script	Pintados Manager#pin	4_F_KHELLISIA,{
+	if (callfunc("F_GM_NPC",1854,0) == 1) {
+		mes "Bingo!";
+		next;
+	} else {
+		mes "Error occurred.";
+		close;
+	}
+	mes "Hi, I'm the Pintados Festival Manager. Please select an item.";
+	mes "Time Value: ("+$malaya_pintados_00+"/344)";
+	mes "Lesser Agimat Value: ("+$malaya_pintados_01+"/1,000)";
+	mes "Cross Value: ("+$malaya_pintados_02+"/1,000)";
+	mes "Dyestuffs Value: ("+$malaya_pintados_03+"/300)";
+	mes "Recent Tattoo Creator: "+$malaya_pintados_04$;
+	next;
+	switch(select("Eastern Medicine Button ? Start & End:Detail Button ? Adjust Value:Start Timer:End Timer")) {
+	case 1:
+		mes "This is the Eastern Medicine Control Button.";
+		mes "You can set the Start or End values for the festival.";
+		next;
+		switch(select("Start Pintados Festival:End Pintados Festival:NPC_ON:NPC_OFF")) {
+		case 1:
+			set $malaya_pintados_00,1;
+			donpcevent "Pintados Manager#pin::OnEnable";
+			mes "Start the Pintados Festival.";
+			close;
+		case 2:
+			donpcevent "Pintados Manager#pin::OnDisable";
+			mes "End the Pintados Festival.";
+			close;
+		case 3:
+			donpcevent "Pintados Manager#pin::OnEnableNPC";
+			mes "Add an NPC.";
+			close;
+		case 4:
+			donpcevent "Pintados Manager#pin::OnDisableNPC";
+			mes "Remove an NPC.";
+			close;
+		}
+	case 2:
+		mes "Adjust the global value. Please select the value to adjust.";
+		next;
+		while(1) {
+			switch(select("Complete Adjustment:Time ("+$malaya_pintados_00+"):Lesser Agimat ("+$malaya_pintados_01+"):Silver Cross ("+$malaya_pintados_02+"):Dyestuffs ("+$malaya_pintados_03+")")) {
+			case 1:
+				mes "Completed global adjustment.";
+				close;
+			case 2:
+				mes "Adjust Time [0~344]";
+				mes "Global Increase by 1/30 min.";
+				mes "1 - 49 -> Day 1";
+				mes "50 - 98 -> Day 2";
+				mes "99 - 147 -> Day 3";
+				mes "148 - 196 -> Day 4";
+				mes "197 - 245 -> Day 5";
+				mes "246 - 294 -> Day 6";
+				mes "295 - 343 -> Day 7";
+				mes "Global 1 = 1 hr.";
+				next;
+				input .@input;
+				if (.@input < 0 || .@input > 344)
+					close;
+				set $malaya_pintados_00, .@input;
+				break;
+			case 3:
+				mes "Adjust the accumulated value for the Lesser Agimat.";
+				mes "Values can be adjusted between 0 to 1000.";
+				next;
+				input .@input;
+				if (.@input < 0 || .@input > 1000)
+					close;
+				set $malaya_pintados_01, .@input;
+				break;
+			case 4:
+				mes "Adjust the accumulated value of the Silver Cross.";
+				mes "Values can be adjusted between 0 to 1000.";
+				next;
+				input .@input;
+				if (.@input < 0 || .@input > 1000)
+					close;
+				set $malaya_pintados_02, .@input;
+				break;
+			case 5:
+				mes "Adjust the accumulated value for the Dyestuff.";
+				mes "Values can be adjusted between 0 to 300.";
+				next;
+				input .@input;
+				if (.@input < 0 || .@input > 300)
+					close;
+				set $malaya_pintados_03, .@input;
+				break;
+			}
+			mes "Time Value: ("+$malaya_pintados_00+"/344)";
+			mes "Lesser Agimat Value: ("+$malaya_pintados_01+"/1,000)";
+			mes "Cross Value: ("+$malaya_pintados_02+"/1,000)";
+			mes "Dyestuffs Value: ("+$malaya_pintados_03+"/300)";
+			mes "This is the current value. Do you want to adjust it?";
+			next;
+		}
+	case 3:
+		initnpctimer;
+		break;
+	case 4:
+		stopnpctimer;
+		break;
+	}
+	end;
+
+// Moved to individual NPCs for smoother processing.
+//OnInit:
+//	if ($malaya_pintados_00 > 0)
+//		donpcevent "Pintados Manager#pin::OnEnableNPC";
+//	end;
+
+OnTimer1800000:
+	set $malaya_pintados_00, $malaya_pintados_00;
+	if ($malaya_pintados_00 > 0 && $malaya_pintados_00 < 344) {
+		set $malaya_pintados_00,$malaya_pintados_00+1;
+		stopnpctimer;
+		initnpctimer;
+	} else {
+		set $malaya_pintados_00,0;
+		donpcevent "Pintados Manager#pin::OnDisable";
+	}
+	end;
+OnEnable:
+	initnpctimer;
+	donpcevent "Pintados Manager#pin::OnEnableNPC";
+	announce "The 'Pintados Festival' will be held for a week in Baryo Mahiwaga.",bc_all,"0xFB9D04",FW_NORMAL,12;
+	end;
+OnDisable:
+	stopnpctimer;
+	set $malaya_pintados_00,0;
+	set $malaya_pintados_01,0;
+	set $malaya_pintados_02,0;
+	set $malaya_pintados_03,0;
+	donpcevent "Pintados Manager#pin::OnDisableNPC";
+	announce "The 'Pintados Festival' ended with great success.",bc_all,"0xFB9D04",FW_NORMAL,12;
+	end;
+OnEnableNPC:
+	set .@str$, "::OnEnable";
+OnDisableNPC:
+	if (.@str$ == "")
+		set .@str$, "::OnDisable";
+	donpcevent "Tourist#pin01"+.@str$;
+	donpcevent "Tourist#pin02"+.@str$;
+	donpcevent "Tourist#pin03"+.@str$;
+	donpcevent "Young Tattooist#pin04"+.@str$;
+	donpcevent "Tourist#pin05"+.@str$;
+	donpcevent "Drumming Young Man#pin06"+.@str$;
+	donpcevent "Drumming Young Man#pin07"+.@str$;
+	donpcevent "Drumming Young Man#pin08"+.@str$;
+	donpcevent "Beat Catching Boy#pin09"+.@str$;
+	donpcevent "Beat Catching Boy#pin10"+.@str$;
+	donpcevent "Beat Catching Boy#pin11"+.@str$;
+	end;
+}
+
+ma_fild01,179,260,2	script	Festival Helper Boy#pin	4_M_BARYO_BOY,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
+		mes "Cannot proceed because you have too many items in your possession.";
+		close;
+	}
+	if ($malaya_pintados_00 == 0) {
+		if ($malaya_pintados_01 > 999 && $malaya_pintados_02 > 999 && $malaya_pintados_03 > 299) {
+			set $malaya_pintados_00,1;
+			donpcevent "Pintados Manager#pin::OnEnable";
+			emotion e_lv;
+			mes "[Isco]";
+			mes "Many adventurers helped find festival items that I returned to the village.";
+			next;
+			emotion e_ho;
+			mes "[Isco]";
+			mes "He he... Now we can hold the '^7A96E0Pintados Festival^000000'.";
+			close;
+		}
+		// fall through
+	} else {
+		mes "[Isco]";
+		mes "He he... The fun '^7A96E0Pintados Festival^000000' is in full swing.";
+		next;
+		if ($malaya_pintados_00 > 0 && $malaya_pintados_00 < 50) {
+			emotion e_ho;
+			mes "[Isco]";
+			mes "Today's the first day of the '^7A96E0Pintados Festival^000000'. The festival is held for 7 days, so have fun.";
+			close;
+		} else if ($malaya_pintados_00 > 49 && $malaya_pintados_00 < 99) {
+			mes "[Isco]";
+			mes "Oh! Did you know?";
+			mes "Village tattooists draw tattoos only during the '^7A96E0Pintados Festival^000000'.";
+			close;
+		} else if ($malaya_pintados_00 > 98 && $malaya_pintados_00 < 148) {
+			mes "[Isco]";
+			mes "Today's the third day of the '^7A96E0Pintados Festival^000000'.";
+			next;
+			mes "[Isco]";
+			mes "Villagers say that an adventurer named "+$malaya_pintados_04$+" got a tattoo at the festival.";
+			close;
+		} else if ($malaya_pintados_00 > 147 && $malaya_pintados_00 < 197) {
+			mes "[Isco]";
+			mes "Villagers say that an adventurer named "+$malaya_pintados_04$+" got a tattoo at the festival.";
+			next;
+			mes "[Isco]";
+			mes "The Tattooist is scary and doesn't draw tattoos for just anyone so the adventurer must be special.";
+			close;
+		} else if ($malaya_pintados_00 > 196 && $malaya_pintados_00 < 246) {
+			mes "[Isco]";
+			mes "An adventurer named "+$malaya_pintados_04$+" is famous in the village.";
+			next;
+			mes "[Isco]";
+			mes "Have you every seen ^FF8440Bakonawa^000000, the monster known to swallow the moon? They say he is really ferocious.";
+			close;
+		} else if ($malaya_pintados_00 > 245 && $malaya_pintados_00 < 295) {
+			emotion e_sob;
+			mes "[Isco]";
+			mes "I'm so sad. Many adventurers helped to hold the '^7A96E0Pintados Festival^000000' and now only one day is left.";
+			close;
+		} else {
+			emotion e_sob;
+			mes "[Isco]";
+			mes "Oh gosh! It's already the last day of the '^7A96E0Pintados Festival^000000'. Can't believe there won't be more festivities.";
+			close;
+		}
+	}
+	emotion e_spin;
+	mes "[Isco]";
+	mes "Oh no. What will we do with the festival coming to an end.";
+	next;
+	switch(select("What is it?:How many did you collect?:Brought back a lost belonging.")) {
+	case 1:
+		mes "[Isco]";
+		mes "There is a traditional festival held since ancient times";
+		mes "in Baryo Mahiwaga called the '^7A96E0Pintados Festival^000000'.";
+		next;
+		emotion e_otl;
+		mes "[Isco]";
+		mes "I don't think I'll make it to the festival this time.";
+		next;
+		select("Why?");
+		mes "[Isco]";
+		mes "I was going back to the village delivering 1000 Lesser Agimats, 1000 Silver Crosses, and 300 Dyestuffs as an errand from Port Malaya.";
+		next;
+		mes "[Isco]";
+		mes "But '^FF8440Bongisungisu^000000' appeared out of nowhere and took the items away from me.";
+		next;
+		select("Are you hurt?");
+		emotion e_sigh;
+		mes "[Isco]";
+		mes "Fortunately not.";
+		next;
+		mes "[Isco]";
+		mes "But I'm in deep trouble. The '^7A96E0Pintados Festival^000000' can't be held without those items. What should I do.";
+		close;
+	case 2:
+		mes "[Isco]";
+		mes "Many adventurers are helping out but only collected...";
+		next;
+		mes "[Isco]";
+		mes "Lesser Agimat "+$malaya_pintados_01+", Silver Cross "+$malaya_pintados_02+", Dyestuff "+$malaya_pintados_03+" so far.";
+		next;
+		emotion e_sigh;
+		mes "[Isco]";
+		mes "Sigh... We are still short of materials to start the '^7A96E0Pintados Festival^000000'.";
+		close;
+	case 3:
+		set .@str$, (Sex)?"Bro":"Sis";
+		break;
+	}
+	emotion e_lv;
+	mes "[Isco]";
+	mes "Oh~ Really? Wow!";
+	mes "Thanks! "+strcharinfo(0)+" "+.@str$+"!!";
+	mes "He he. What did you bring?";
+	next;
+	set .@i, select(
+		"Lesser Agimat (^FF0000"+(($malaya_pintados_01 > 999)?"Collection complete":(1000 - $malaya_pintados_01)+" short")+"^000000):"+
+		"Silver Cross (^FF0000"+(($malaya_pintados_02 > 999)?"Collection complete":(1000 - $malaya_pintados_02)+" short")+"^000000):"+
+		"Dyestuff (^FF0000"+(($malaya_pintados_03 > 299)?"Collection complete":(300 - $malaya_pintados_03)+" short")+"^000000)"
+	);
+	switch(.@i) {
+	case 1:
+		set .@item,6497; //Lesser_Agimat
+		set .@name$,"Lesser Agimats";
+		set .@total,1000;
+		break;
+	case 2:
+		set .@item,6502; //Silver_Cross
+		set .@name$,"Silver Crosses";
+		set .@total,1000;
+		break;
+	case 3:
+		setarray .@items[0],975,976,978,979,980,981,982,983;
+		set .@name$,"Dyestuffs";
+		set .@total,300;
+		break;
+	}
+	mes "[Isco]";
+	mes "Wow! "+.@str$+" You've brought "+.@name$+"!";
+	next;
+	mes "[Isco]";
+	mes "Wait. One... two...";
+	if (getd("$malaya_pintados_0"+.@i) >= .@total) {
+		mes "Eh... oh? I already have all the "+.@name$+" I need. "+.@str$+"! But thank you for helping.";
+		close;
+	}
+	if (.@i < 3) {
+		mes "I am "+(.@total - getd("$malaya_pintados_0"+.@i))+" short of "+.@name$+". How many did you bring?";
+		next;
+		switch(select("One?!:Enter quantity.")) {
+		case 1:
+			set .@amount,1;
+			mes "[Isco]";
+			mes "He he... You've brought back one.";
+			next;
+			break;
+		case 2:
+			mes "[Isco]";
+			mes "He he... I'm slow with numbers. I get lost when it's over 50. How many will you give me?";
+			next;
+			input .@amount;
+			if (.@amount < 1 || .@amount > 50) {
+				mes "[Isco]";
+				mes "Sigh~ I'm lost! I can't count if the numbers are weird.";
+				close;
+			}
+			break;
+		}
+		if (countitem(.@item) < .@amount) {
+			mes "[Isco]";
+			mes "Sigh~ "+.@str$+"! Where is the "+getitemname(.@item)+"?";
+			close;
+		}
+	} else {
+		mes "I am "+(.@total - getd("$malaya_pintados_0"+.@i))+" short of Dyestuffs. What kind of Dyestuff did you bring?";
+		next;
+		for(set .@j,0; .@j<getarraysize(.@items); set .@j,.@j+1)
+			set .@menu$, .@menu$+getitemname(.@items[.@j])+" (^FF0000"+countitem(.@items[.@j])+"^000000):";
+		set .@item, .@items[select(.@menu$)-1];
+		if (countitem(.@item) == 0) {
+			mes "[Isco]";
+			mes "Sigh~ You don't have any "+getitemname(.@item)+".";
+			close;
+		}
+		mes "[Isco]";
+		mes .@str$+"! How many Scarlet Dyestuffs can you give me from the "+countitem(.@item)+" you have?";
+		next;
+		switch(select("Enter Quantity:All")) {
+		case 1:
+			mes "[Isco]";
+			mes "He he... I'm slow with numbers. I get lost when it's over 50. How many will you give me?";
+			next;
+			input .@amount;
+			if (.@amount < 1 || .@amount > 50) {
+				mes "[Isco]";
+				mes "Sigh~ I told you I'm not good with numbers.";
+				close;
+			}
+			break;
+		case 2:
+			set .@amount, countitem(.@item);
+			break;
+		}
+		if (countitem(.@item) < .@amount) {
+			mes "[Isco]";
+			mes "Sigh... I'm short of "+getitemname(.@item)+".";
+			close;
+		}
+	}
+	delitem .@item,.@amount;
+	setd "$malaya_pintados_0"+.@i, getd("$malaya_pintados_0"+.@i)+.@amount;
+	set .@amount_left, .@total - getd("$malaya_pintados_0"+.@i);
+	mes "[Isco]";
+	mes "He he... Thanks. "+.@str$+"!";
+	if (.@amount_left <= 0)
+		mes "Whoa! We've collected all the "+.@name$+" we need. Happy~!";
+	else
+		mes "I only need "+.@amount_left+" more "+.@name$+".";
+	close;
+}
+
+ma_fild01,172,223,6	script	Tattooist#pin	4_M_BARYO_OLD,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
+		mes "Cannot proceed because you have too many items in your possession.";
+		close;
+	}
+	emotion e_what;
+	mes "[Tattooist]";
+	mes "Why do you want a Tattoo?";
+	next;
+	switch(select("What is a Tattoo?:I'm curious about the effect of Tattoos.:I need a Tattoo.")) {
+	case 1:
+		mes "[Tattooist]";
+		mes "A Tattoo of a powerful monster is said to increase the ability of the holder.";
+		next;
+		select("Awesome. How can I get one?");
+		mes "[Tattooist]";
+		mes "Drawing a Tattoo is a very holy task.";
+		next;
+		mes "[Tattooist]";
+		mes "10 Ancient Grudges to protect me while I draw Tattoos.";
+		next;
+		mes "[Tattooist]";
+		mes "1 Doll that looks like a powerful monster.";
+		next;
+		mes "[Tattooist]";
+		mes "And last but not least, 1 Spirit Piece to imbue the energy of a powerful monster into the Tattoo.";
+		next;
+		select("What kind of Tattoo will you draw?");
+		mes "[Tattooist]";
+		mes "I can draw 3 kinds of Tattoos.";
+		next;
+		mes "[Tattooist]";
+		mes "Bangungot Agimat Tattoo for a powerful monster that comes from an old gigantic tree in Port Malaya.";
+		next;
+		mes "[Tattooist]";
+		mes "Bakonawa Agimat Tattoo for a huge monster that can swallow the moon.";
+		next;
+		mes "[Tattooist]";
+		mes "Buwaya Agimat Tattoo for a giant alligator that kidnaps people.";
+		next;
+		select("Where can I get the Spirit Pieces and Doll?");
+		mes "[Tattooist]";
+		mes "You can get these powerful items from Buwaya, Bangungot, and Bakonawa themselves but it won't be an easy task.";
+		next;
+		mes "[Tattooist]";
+		mes "This holy task isn't done every day. Tattoos are drawn only during the '^7A96E0Pintados Festival^000000'.";
+		close;
+	case 2:
+		mes "[Tattooist]";
+		mes "Which Tattoo's effect are you curious about?";
+		next;
+		while(1) {
+			switch (select("Bangungot Agimat Tattoo:Buwaya Agimat Tattoo:Bakonawa Agimat Tattoo:I have no questions.")) {
+			case 1:
+				mes "[Tattooist]";
+				mes "Need 10 Ancient Grudges, 1 Piece of Bangungot's Spirit, and 1 Bangungot Doll to create";
+				next;
+				mes "[Tattooist]";
+				mes "The Bangungot Agimat Tattoo holds the energy of an old gigantic tree in Port Malaya.";
+				next;
+				mes "[Tattooist]";
+				mes "Increases the effect of healing others by 4% and healing from others by 7%.";
+				next;
+				break;
+			case 2:
+				mes "[Tattooist]";
+				mes "Need 10 Ancient Grudges, 1 Piece of Buwaya's Spirit, and 1 Buwaya Doll to create";
+				next;
+				mes "[Tattooist]";
+				mes "The Buwaya Agimat Tattoo contains the energy from a giant alligator.";
+				next;
+				mes "[Tattooist]";
+				mes "Increases MATK by +7% and decreases Fixed Casting by 7%.";
+				next;
+				break;
+			case 3:
+				mes "[Tattooist]";
+				mes "Need 10 Ancient Grudges, 1 Piece of Bakonawa's Spirit, and 1 Bakonawa Doll to create";
+				next;
+				mes "[Tattooist]";
+				mes "The Bakonawa Agimat Tattoo holds the energy from a gigantic monster that can swallow the moon.";
+				next;
+				mes "[Tattooist]";
+				mes "Increases ATK by +7% and ASPD by 10%.";
+				next;
+				break;
+			case 4:
+				mes "[Tattooist]";
+				mes "Looks like you've got all the answers. Hope you enjoy your journey.";
+				close;
+			}
+			mes "[Tattooist]";
+			mes "Do you have any questions about other Tattoo effects?";
+			next;
+		}
+	case 3:
+		break;
+	}
+	if ($malaya_pintados_00 == 0) {
+		mes "[Tattooist]";
+		mes "The holy task of drawing Tattoos is only done during the '^7A96E0Pintados Festival^000000'. Sorry but looks like the festival is not on.";
+		close;
+	}
+	mes "[Tattooist]";
+	mes "You've come right on time during the '^7A96E0Pintados Festival^000000'.";
+	next;
+	mes "[Tattooist]";
+	mes "There is no time like during the holy '^7A96E0Pintados Festival^000000' to draw Tattoos.";
+	next;
+	mes "[Tattooist]";
+	mes "The festival doesn't last long so I should start drawing. What Tattoo do you need?";
+	next;
+	switch(select("I will think it over.:Bangungot Agimat Tattoo:Buwaya Agimat Tattoo:Bakonawa Agimat Tattoo")) {
+	case 1:
+		mes "[Tattooist]";
+		mes "Hope you enjoy the '^7A96E0Pintados Festival^000000'.";
+		close;
+	case 2:
+		set .@tattoo,2911; //Bangungot_Tattoo
+		set .@doll,6517; //Bangungot_Doll
+		set .@spirit,6524; //Bangungot_Spirit_Piece
+		set .@name$,"Bangungot";
+		break;
+	case 3:
+		set .@tattoo,2907; //Buwaya_Tattoo
+		set .@doll,6518; //Buwaya_Doll
+		set .@spirit,6525; //Buwaya_Spirit_Piece
+		set .@name$,"Buwaya";
+		break;
+	case 4:
+		set .@tattoo,2910; //Bakonawa_Tattoo
+		set .@doll,6516; //Bakonawa_Doll
+		set .@spirit,6523; //Bakonawa_Spirit_Piece
+		set .@name$,"Bakonawa";
+		break;
+	}
+	if (countitem(6499) < 10 || countitem(.@spirit) == 0 || countitem(.@doll) == 0) {
+		mes "[Tattooist]";
+		mes "I think you are short on materials.";
+		mes "Need 10 Ancient Grudges, 1 Piece of "+.@name$+"'s Spirit, and 1 "+.@name$+" Doll to create a ^EE1D11"+.@name$+" Agimat Tattoo^000000.";
+		close;
+	}
+	emotion e_flash;
+	mes "[Tattooist]";
+	mes "The materials are full with holy energy. I'm sure we'll get a great Tattoo using these.";
+	next;
+	mes "[Tattooist]";
+	mes "Please don't interrupt while I'm working on drawing a holy Tattoo if you want it to come out right.";
+	next;
+	mes "The Tattooist placed the Ancient Grudges around the workplace.";
+	next;
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#01";
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#02";
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#03";
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#04";
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#05";
+	mes "The Ancient Grudge lit up and tools starts to glow. He smiled satisfyingly at the glowing tools and materials.";
+	next;
+	mes "And then "+.@name$+" stared intensely at the doll as if to remember every detail of it in his head.";
+	next;
+	if(select("Aren't you going to start?:... ... ..") == 1) {
+		emotion e_an;
+		delitem 6499,5; //Ancient_Grudge
+		mes "[Tattooist]";
+		mes "Oh no, now you ruined it.";
+		mes "I cannot draw a Tattoo for someone like you who doesn't understand art. You can take back the remaining materials.";
+		next;
+		mes "Received back 5 Ancient Grudges, "+.@name$+" Doll, and Piece of "+.@name$+"'s Spirit.";
+		close;
+	}
+	emotion e_bzz;
+	mes "Think he will melt the doll with his eyes?";
+	next;
+	specialeffect EF_SONICBLOWHIT;
+	mes "He closed and opened his eyes slowly as if to memorize the doll in his head and then held up a glowing tool to start drawing.";
+	next;
+	mes "The "+.@name$+" Tattoo was completed almost instantly.";
+	next;
+	emotion e_an;
+	mes "But he kept on looking at each corner of the drawing as if he didn't like some of its details.";
+	next;
+	if(select("Looks good to me.:... ... ..") == 1) {
+		emotion e_an;
+		emotion e_ag;
+		delitem 6499,5; //Ancient_Grudge
+		mes "[Tattooist]";
+		mes "Ergh! I told you not to interrupt!";
+		next;
+		mes "The Tattooist ripped up the drawing irritably.";
+		next;
+		mes "[Tattooist]";
+		mes "I can't continue like this. Maybe another time. You can take back the remaining materials.";
+		next;
+		mes "Received back 5 Ancient Grudges, "+.@name$+" Doll, and Piece of "+.@name$+"'s Spirit.";
+		close;
+	}
+	mes "He looked at the drawing intensely for a long time and then nodded with a satisfied smile.";
+	next;
+	mes "Looks like he is satisfied with the "+.@name$+" drawing.";
+	next;
+	emotion e_dum;
+	mes "But now he is staring at the sky without doing anything else. What is he waiting for?";
+	next;
+	if(select("When will it be done?:... ... ..") == 1) {
+		emotion e_an;
+		emotion e_ag;
+		delitem 6499,5; //Ancient_Grudge
+		mes "[Tattooist]";
+		mes "Ergh! I told you not to interrupt!";
+		next;
+		mes "The Tattooist ripped up the drawing irritably.";
+		next;
+		mes "[Tattooist]";
+		mes "I can't continue like this. Maybe another time. You can take back the remaining materials.";
+		next;
+		mes "Received back 5 Ancient Grudges, "+.@name$+" Doll, and Piece of "+.@name$+"'s Spirit.";
+		close;
+	}
+	emotion e_dots;
+	mes "[Tattooist]";
+	mes ".";
+	next;
+	mes "[Tattooist]";
+	mes ". .";
+	next;
+	mes "[Tattooist]";
+	mes ". . .";
+	next;
+	emotion e_dots;
+	mes "[Tattooist]";
+	mes ". . . .";
+	next;
+	mes "[Tattooist]";
+	mes ". . . . .";
+	next;
+	mes "[Tattooist]";
+	mes ". . . . . .";
+	next;
+	mes "[Tattooist]";
+	mes ". . . . . . .";
+	next;
+	emotion e_flash;
+	mes "The Tattooist's eyes started to shine after staring at the sky for awhile, then he broke the Piece of "+.@name$+"'s Spirit with both his hands.";
+	next;
+	specialeffect EF_DETOXICATION;
+	mes "The Piece of "+.@name$+"'s Spirit is shattered into powder. The Tattooist's hands are glowing.";
+	next;
+	if(select("Why did you break the pieces...:... ... ..") == 1) {
+		delitem 6499,5; //Ancient_Grudge
+		delitem .@spirit,1;
+		emotion e_an;
+		emotion e_ag;
+		mes "[Tattooist]";
+		mes "Ergh! I told you not to interrupt!";
+		next;
+		mes "The glowing light from his hands faded away. He starred at his hands for a while and then ripped up the drawing irritably.";
+		next;
+		mes "[Tattooist]";
+		mes "I was this close to completing a wonderful piece but you ruined it. Not in a good mood. You can take the remaining materials.";
+		next;
+		mes "Received back 5 Ancient Grudges and the doll.";
+		close;
+	}
+	mes "He held up the powder in both hands and then blew it onto the drawing.";
+	next;
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#01";
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#02";
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#03";
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#04";
+	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#05";
+	mes "All Ancient Grudges started to burn and then the glowing light from the "+.@name$+" drawing faded away.";
+	next;
+	specialeffect EF_LIGHTSPHERE;
+	mes "Blinking light on top of the drawing.";
+	next;
+	mes "Light faded away and the "+.@name$+" drawing is no longer the simple one it was before.";
+	next;
+	mes "The "+.@name$+" drawing looks as if it is... alive.";
+	next;
+	mes "The Tattooist is finally satisfied and is all smiles.";
+	next;
+	emotion e_heh;
+	mes "[Tattooist]";
+	mes "Ha ha. It came out great.";
+	next;
+	delitem 6499,10; //Ancient_Grudge
+	delitem .@spirit,1;
+	delitem .@doll,1;
+	getitem .@tattoo,1;
+	set $malaya_pintados_04$, strcharinfo(0);
+	mes "[Tattooist]";
+	mes "I'm sorry you had to wait for a long time. But it was worth it cause I haven't created a Tattoo of this quality in a long time.";
+	next;
+	mes "[Tattooist]";
+	mes "The ^EE1D11"+.@name$+" Agimat Tattoo^000000 you've waited for is now completed.";
+	next;
+	mes "[Tattooist]";
+	mes "Hope you enjoy the '^7A96E0Pintados Festival^000000'.";
+	close;
+}
+
+ma_fild01,171,224,0	script	Ancient Grudge#01	HIDDEN_WARP_NPC,{ end; }
+ma_fild01,173,224,0	duplicate(Ancient Grudge#01)	Ancient Grudge#02	HIDDEN_WARP_NPC
+ma_fild01,173,223,0	duplicate(Ancient Grudge#01)	Ancient Grudge#03	HIDDEN_WARP_NPC
+ma_fild01,172,222,0	duplicate(Ancient Grudge#01)	Ancient Grudge#04	HIDDEN_WARP_NPC
+ma_fild01,171,223,0	duplicate(Ancient Grudge#01)	Ancient Grudge#05	HIDDEN_WARP_NPC
+
+ma_fild01,192,200,8	script	Tourist#pin01	1_M_MERCHANT,{
+	mes "[Tourist]";
+	mes "I came from afar and dropped everything to come and enjoy the 'Pintados Festival'.";
+	next;
+	mes "[Tourist]";
+	mes "I don't regret visiting but...";
+	next;
+	mes "[Tourist]";
+	mes "I don't like the Tattoo I got after all I've gone through to get it.";
+	next;
+	mes "[Tourist]";
+	mes "I've looked at it in the light but I think the Tattooist made a mistake.";
+	next;
+	mes "[Tourist]";
+	mes "This ruined my whole visit.";
+	next;
+	mes "[Tourist]";
+	mes "Tsk!";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc "Tourist#pin01";
+	end;
+OnEnable:
+	enablenpc "Tourist#pin01";
+	end;
+OnDisable:
+	disablenpc "Tourist#pin01";
+	end;
+}
+
+ma_fild01,211,200,6	script	Tourist#pin02	4_M_TWMASKMAN,{
+	mes "[Tourist]";
+	mes "I heard of the 'Pintados Festival' and came all the way from Gonryun.";
+	next;
+	mes "[Tourist]";
+	mes "Just in case you might think otherwise, this is a mask on my face and not a tattoo.";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc "Tourist#pin02";
+	end;
+OnEnable:
+	enablenpc "Tourist#pin02";
+	end;
+OnDisable:
+	disablenpc "Tourist#pin02";
+	end;
+}
+
+ma_fild01,251,205,2	script	Tourist#pin03	4_M_CHNOLD,{
+	mes "[Tourist]";
+	mes "Hey, hear me. This isn't the Tattoo I wanted.";
+	next;
+	mes "[Tourist]";
+	mes "I asked for a Bakonawa Tattoo but the more I look at it, this is Bangungot.";
+	next;
+	mes "[Tattooist]";
+	mes "No... you said that you wanted that one. Don't be so difficult.";
+	next;
+	mes "[Tourist]";
+	mes "Don't you know that customer is king? Huh? Do you want a bad reputation?";
+	next;
+	mes "[Tattooist]";
+	mes "Ugh... Can't believe this.";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc "Tourist#pin03";
+	end;
+OnEnable:
+	enablenpc "Tourist#pin03";
+	end;
+OnDisable:
+	disablenpc "Tourist#pin03";
+	end;
+}
+
+ma_fild01,249,206,6	script	Young Tattooist#pin04	4_M_MALAYA,{
+	mes "[Tattooist]";
+	mes "Ah... I can't work with customers like this.";
+	next;
+	mes "[Tattooist]";
+	mes "How many times do I have to tell you, you said you wanted a Bangungot.";
+	next;
+	mes "[Tattooist]";
+	mes "Ouch, my throat... Shouting will get me nowhere.";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc "Young Tattooist#pin04";
+	end;
+OnEnable:
+	enablenpc "Young Tattooist#pin04";
+	end;
+OnDisable:
+	disablenpc "Young Tattooist#pin04";
+	end;
+}
+
+ma_fild01,162,235,6	script	Tourist#pin05	4_F_CHNDRESS1,{
+	mes "[Tourist]";
+	mes "They say the Pintados Festival will only be held for one week.";
+	next;
+	mes "[Tourist]";
+	mes "I came from Louyang without knowing about the festival. Must be my lucky day.";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc "Tourist#pin05";
+	end;
+OnEnable:
+	enablenpc "Tourist#pin05";
+	end;
+OnDisable:
+	disablenpc "Tourist#pin05";
+	end;
+}
+
+ma_fild01,164,234,6	script	Drumming Young Man#pin06	4_M_BARYO_MAN,{
+	mes "ba-dum-DUM- ba-dum-DUM";
+	next;
+	mes "[Drumming Young Man]";
+	mes "The Pintados Festival wouldn't be a festival without a drummer.";
+	next;
+	mes "[Drumming Young Man]";
+	mes "Why don't you join?";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc "Drumming Young Man#pin06";
+	end;
+OnEnable:
+	enablenpc "Drumming Young Man#pin06";
+	end;
+OnDisable:
+	disablenpc "Drumming Young Man#pin06";
+	end;
+}
+
+ma_fild01,170,231,4	script	Drumming Young Man#pin07	4_M_BARYO_MAN,{
+	mes "ba-dum-DUM- ba-dum-DUM";
+	next;
+	mes "[Drumming Young Man]";
+	mes "The Pintados from Pintados Festival means painted in our language.";
+	next;
+	mes "[Drumming Young Man]";
+	mes "So that is probably why we have people drawing special Tattoos during the festival.";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc "Drumming Young Man#pin07";
+	end;
+OnEnable:
+	enablenpc "Drumming Young Man#pin07";
+	end;
+OnDisable:
+	disablenpc "Drumming Young Man#pin07";
+	end;
+}
+
+ma_fild01,164,228,6	script	Drumming Young Man#pin08	4_M_BARYO_MAN,{
+	mes "ba-dum-DUM- ba-dum-DUM";
+	next;
+	mes "[Drumming Young Man]";
+	mes "I don't remember it accurately, but they say the Pintados Festival was to celebrate a rich harvest.";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc "Drumming Young Man#pin08";
+	end;
+OnEnable:
+	enablenpc "Drumming Young Man#pin08";
+	end;
+OnDisable:
+	disablenpc "Drumming Young Man#pin08";
+	end;
+}
+
+ma_fild01,170,234,4	script	Beat Catching Boy#pin09	4_M_BARYO_BOY,{
+	mes "ba-dum-TSH- ba-dum-TSH-";
+	next;
+	mes "[Beat Catching Boy]";
+	mes "I always get energetic when I hear drums and sticks in a rhythmic beat.";
+	next;
+	mes "[Beat Catching Boy]";
+	mes "ba-dum-TSH- ba-dum-TSH- So much fun!";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc "Beat Catching Boy#pin09";
+	end;
+OnEnable:
+	enablenpc "Beat Catching Boy#pin09";
+	end;
+OnDisable:
+	disablenpc "Beat Catching Boy#pin09";
+	end;
+}
+
+ma_fild01,164,231,6	script	Beat Catching Boy#pin10	4_M_BARYO_BOY,{
+	mes "ba-dum-TSH- ba-dum-TSH-";
+	next;
+	mes "[Beat Catching Boy]";
+	mes "I may be using sticks to catch the beat right now but you never know if I'll grow big enough to play the drums, right?";
+	close;
+OnInit:
+	if (!$malaya_pintados_00)
+		disablenpc strnpcinfo(0);
+	end;
+OnEnable:
+	enablenpc strnpcinfo(0);
+	end;
+OnDisable:
+	disablenpc strnpcinfo(0);
+	end;
+}
+ma_fild01,170,228,4	duplicate(Beat Catching Boy#pin10)	Beat Catching Boy#pin11	4_M_BARYO_BOY
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index f1d8e5784..a8697058a 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -1,12 +1,13 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Mora Quest NPCs
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 1.1
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
 //===== Description: =========================================
+//= [Official Conversion]
 //= Quest NPCs related to Mora:
 //== Theore's Request, Chesire's New Day,
 //== Helping Lope and Euridi, Mora Daily Quests,
@@ -14,11 +15,12 @@
 //===== Additional Comments: =================================
 //= 0.1 NPCs are currently placeholders. [Euphy]
 //= 1.0 Implemented all official quests. [Euphy]
+//= 1.1 Added GM management function and NPCs. [Euphy]
 //============================================================
 
-// Theore's Request :: bs
+// Theore's Request :: ep14_1_bs
 //============================================================
-mid_camp,148,222,4	script	Theore#ep14_1_bs	982,3,3,{
+mid_camp,148,222,4	script	Theore#ep14_1_bs	4_F_SCIENCE,3,3,{
 	if (BaseLevel < 100) {
 		mes "- A person with a white gown -";
 		mes "- is pulling at his hair. -";
@@ -444,41 +446,41 @@ OnTimer5000:
 	end;
 }
 
-spl_fild02,79,104,0	duplicate(#mora_bush)	Bush#ep14_1_bs1	111
-spl_fild02,79,104,0	duplicate(#mora_pouch)	#ep14_1_bs1	139,2,2
-spl_fild02,79,104,6	duplicate(#mora_fairy)	Fairy#cmd11	440
-spl_fild02,79,104,6	duplicate(#mora_fairy)	Fairy#cmd12	445
-spl_fild02,79,104,6	duplicate(#mora_fairy)	Fairy#cmd13	439
+spl_fild02,79,104,0	duplicate(#mora_bush)	Bush#ep14_1_bs1	HIDDEN_NPC
+spl_fild02,79,104,0	duplicate(#mora_pouch)	#ep14_1_bs1	HIDDEN_WARP_NPC,2,2
+spl_fild02,79,104,6	duplicate(#mora_fairy)	Fairy#cmd11	4_F_FAIRYKID5
+spl_fild02,79,104,6	duplicate(#mora_fairy)	Fairy#cmd12	4_M_FAIRYKID4
+spl_fild02,79,104,6	duplicate(#mora_fairy)	Fairy#cmd13	4_F_FAIRYKID4
 
-spl_fild02,103,344,0	duplicate(#mora_bush)	Bush#ep14_1_bs2	111
-spl_fild02,103,344,0	duplicate(#mora_pouch)	#ep14_1_bs2	139,2,2
-spl_fild02,103,344,6	duplicate(#mora_fairy)	Fairy#cmd21	440
-spl_fild02,103,344,6	duplicate(#mora_fairy)	Fairy#cmd22	445
-spl_fild02,103,344,6	duplicate(#mora_fairy)	Fairy#cmd23	439
+spl_fild02,103,344,0	duplicate(#mora_bush)	Bush#ep14_1_bs2	HIDDEN_NPC
+spl_fild02,103,344,0	duplicate(#mora_pouch)	#ep14_1_bs2	HIDDEN_WARP_NPC,2,2
+spl_fild02,103,344,6	duplicate(#mora_fairy)	Fairy#cmd21	4_F_FAIRYKID5
+spl_fild02,103,344,6	duplicate(#mora_fairy)	Fairy#cmd22	4_M_FAIRYKID4
+spl_fild02,103,344,6	duplicate(#mora_fairy)	Fairy#cmd23	4_F_FAIRYKID4
 
-spl_fild02,261,323,0	duplicate(#mora_bush)	Bush#ep14_1_bs3	111
-spl_fild02,261,323,0	duplicate(#mora_pouch)	#ep14_1_bs3	139,2,2
-spl_fild02,261,323,6	duplicate(#mora_fairy)	Fairy#cmd31	440
-spl_fild02,261,323,6	duplicate(#mora_fairy)	Fairy#cmd32	445
-spl_fild02,261,323,6	duplicate(#mora_fairy)	Fairy#cmd33	439
+spl_fild02,261,323,0	duplicate(#mora_bush)	Bush#ep14_1_bs3	HIDDEN_NPC
+spl_fild02,261,323,0	duplicate(#mora_pouch)	#ep14_1_bs3	HIDDEN_WARP_NPC,2,2
+spl_fild02,261,323,6	duplicate(#mora_fairy)	Fairy#cmd31	4_F_FAIRYKID5
+spl_fild02,261,323,6	duplicate(#mora_fairy)	Fairy#cmd32	4_M_FAIRYKID4
+spl_fild02,261,323,6	duplicate(#mora_fairy)	Fairy#cmd33	4_F_FAIRYKID4
 
-spl_fild02,137,305,0	duplicate(#mora_bush)	Bush#ep14_1_bs4	111
-spl_fild02,137,305,0	duplicate(#mora_pouch)	#ep14_1_bs4	139,2,2
-spl_fild02,137,305,6	duplicate(#mora_fairy)	Fairy#cmd41	440
-spl_fild02,137,305,6	duplicate(#mora_fairy)	Fairy#cmd42	445
-spl_fild02,137,305,6	duplicate(#mora_fairy)	Fairy#cmd43	439
+spl_fild02,137,305,0	duplicate(#mora_bush)	Bush#ep14_1_bs4	HIDDEN_NPC
+spl_fild02,137,305,0	duplicate(#mora_pouch)	#ep14_1_bs4	HIDDEN_WARP_NPC,2,2
+spl_fild02,137,305,6	duplicate(#mora_fairy)	Fairy#cmd41	4_F_FAIRYKID5
+spl_fild02,137,305,6	duplicate(#mora_fairy)	Fairy#cmd42	4_M_FAIRYKID4
+spl_fild02,137,305,6	duplicate(#mora_fairy)	Fairy#cmd43	4_F_FAIRYKID4
 
-spl_fild02,23,196,0	duplicate(#mora_bush)	Bush#ep14_1_bs5	111
-spl_fild02,23,196,0	duplicate(#mora_pouch)	#ep14_1_bs5	139,2,2
-spl_fild02,23,196,6	duplicate(#mora_fairy)	Fairy#cmd51	440
-spl_fild02,23,196,6	duplicate(#mora_fairy)	Fairy#cmd52	445
-spl_fild02,23,196,6	duplicate(#mora_fairy)	Fairy#cmd53	439
+spl_fild02,23,196,0	duplicate(#mora_bush)	Bush#ep14_1_bs5	HIDDEN_NPC
+spl_fild02,23,196,0	duplicate(#mora_pouch)	#ep14_1_bs5	HIDDEN_WARP_NPC,2,2
+spl_fild02,23,196,6	duplicate(#mora_fairy)	Fairy#cmd51	4_F_FAIRYKID5
+spl_fild02,23,196,6	duplicate(#mora_fairy)	Fairy#cmd52	4_M_FAIRYKID4
+spl_fild02,23,196,6	duplicate(#mora_fairy)	Fairy#cmd53	4_F_FAIRYKID4
 
-spl_fild02,186,260,0	duplicate(#mora_bush)	Bush#ep14_1_bs6	111
-spl_fild02,186,260,0	duplicate(#mora_pouch)	#ep14_1_bs6	139,2,2
-spl_fild02,186,260,6	duplicate(#mora_fairy)	Fairy#cmd61	440
-spl_fild02,186,260,6	duplicate(#mora_fairy)	Fairy#cmd62	445
-spl_fild02,186,260,6	duplicate(#mora_fairy)	Fairy#cmd63	439
+spl_fild02,186,260,0	duplicate(#mora_bush)	Bush#ep14_1_bs6	HIDDEN_NPC
+spl_fild02,186,260,0	duplicate(#mora_pouch)	#ep14_1_bs6	HIDDEN_WARP_NPC,2,2
+spl_fild02,186,260,6	duplicate(#mora_fairy)	Fairy#cmd61	4_F_FAIRYKID5
+spl_fild02,186,260,6	duplicate(#mora_fairy)	Fairy#cmd62	4_M_FAIRYKID4
+spl_fild02,186,260,6	duplicate(#mora_fairy)	Fairy#cmd63	4_F_FAIRYKID4
 
 -	script	#mora_bush_timer	-1,{
 	end;
@@ -501,21 +503,20 @@ OnTimer600000:
 	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
 }
-spl_fild02,180,1,0	duplicate(#mora_bush_timer)	Bush1Timer	440
-spl_fild02,181,1,0	duplicate(#mora_bush_timer)	Bush2Timer	440
-spl_fild02,182,1,0	duplicate(#mora_bush_timer)	Bush3Timer	440
-spl_fild02,183,1,0	duplicate(#mora_bush_timer)	Bush4Timer	440
-spl_fild02,184,1,0	duplicate(#mora_bush_timer)	Bush5Timer	440
-spl_fild02,186,1,0	duplicate(#mora_bush_timer)	Bush6Timer	440
+spl_fild02,180,1,0	duplicate(#mora_bush_timer)	Bush1Timer	4_F_FAIRYKID5
+spl_fild02,181,1,0	duplicate(#mora_bush_timer)	Bush2Timer	4_F_FAIRYKID5
+spl_fild02,182,1,0	duplicate(#mora_bush_timer)	Bush3Timer	4_F_FAIRYKID5
+spl_fild02,183,1,0	duplicate(#mora_bush_timer)	Bush4Timer	4_F_FAIRYKID5
+spl_fild02,184,1,0	duplicate(#mora_bush_timer)	Bush5Timer	4_F_FAIRYKID5
+spl_fild02,186,1,0	duplicate(#mora_bush_timer)	Bush6Timer	4_F_FAIRYKID5
 
-/*
-spl_fild02,187,1,0	script	Field Bush Switch	440,{
+spl_fild02,187,1,0	script	Field Bush Switch	4_F_FAIRYKID5,{
+	callfunc "F_GM_NPC";
 	donpcevent "Bush#ep14_1_bs1::OnEnable";
 	end;
 }
-*/
 
-splendide,183,117,4	script	Tired-looking Fairy	438,{
+splendide,183,117,4	script	Tired-looking Fairy	4_F_FAIRYKID3,{
 	if (!isequipped(2782)) {
 		mes "[Tired-looking Fairy]";
 		mes "VeOsaRiveh No ModAsh";
@@ -619,7 +620,7 @@ splendide,183,117,4	script	Tired-looking Fairy	438,{
 	close;
 }
 
-splendide,119,138,4	script	Kusmi#ep14_1_bs	440,{
+splendide,119,138,4	script	Kusmi#ep14_1_bs	4_F_FAIRYKID5,{
 	if (!isequipped(2782)) {
 		mes "[Kusmi]";
 		mes "DimFusTal Mu Lars";
@@ -814,7 +815,7 @@ splendide,119,138,4	script	Kusmi#ep14_1_bs	440,{
 	close;
 }
 
-splendide,304,295,4	script	Theodore#ep14_1_bs	445,{
+splendide,304,295,4	script	Theodore#ep14_1_bs	4_M_FAIRYKID4,{
 	if (!isequipped(2782)) {
 		mes "[Theodore]";
 		mes "DimFusTal Mu Lars";
@@ -996,7 +997,7 @@ splendide,304,295,4	script	Theodore#ep14_1_bs	445,{
 	close;
 }
 
-splendide,168,301,4	script	Pauchon#ep14_1_bs	439,{
+splendide,168,301,4	script	Pauchon#ep14_1_bs	4_F_FAIRYKID4,{
 	if (!isequipped(2782)) {
 		mes "[Pauchon]";
 		mes "DimFusTal Mu Lars";
@@ -1179,7 +1180,7 @@ splendide,168,301,4	script	Pauchon#ep14_1_bs	439,{
 	close;
 }
 
-splendide,262,376,4	script	Laphine Soldier#ep14_1	447,{
+splendide,262,376,4	script	Laphine Soldier#ep14_1	4_M_FAIRYSOLDIER,{
 	if (!isequipped(2782)) {
 		mes "[Laphine Soldier]";
 		mes "DielFarmar Di RiniIyazser Ha mahAgolAsh U  U ";
@@ -1213,7 +1214,7 @@ splendide,262,376,4	script	Laphine Soldier#ep14_1	447,{
 	close;
 }
 
-mora,185,163,2	script	Warehouse Manager#ep14_1	516,{
+mora,185,163,2	script	Warehouse Manager#ep14_1	4_M_RAFLE_GR,{
 	if (ep14_1_bs < 15) {
 		mes "[Warehouse Manager]";
 		mes "No, sir!";
@@ -1257,7 +1258,7 @@ mora,185,163,2	script	Warehouse Manager#ep14_1	516,{
 	end;
 }
 
-mora,35,119,4	script	Rondo#ep14_1_bs	513,{
+mora,35,119,4	script	Rondo#ep14_1_bs	4_M_DOGTRAVELER,{
 	mes "[Rondo]";
 	mes "Mora is such a mysterious place.";
 	mes "You can understand any language.";
@@ -1275,7 +1276,7 @@ mora,35,119,4	script	Rondo#ep14_1_bs	513,{
 	close;
 }
 
-mora,98,66,4	script	Lilitia#ep14_1_bs	518,{
+mora,98,66,4	script	Lilitia#ep14_1_bs	4_F_RAFLE_PK,{
 	if (ep14_1_bs > 13 && ep14_1_bs2 == 11) {
 		mes "[Lilitia]";
 		mes "Boo!!!";
@@ -1302,7 +1303,7 @@ mora,98,66,4	script	Lilitia#ep14_1_bs	518,{
 	close;
 }
 
-mora,139,102,2	script	Humming#ep14_1_bs	515,{
+mora,139,102,2	script	Humming#ep14_1_bs	4_F_DOGTRAVELER,{
 	if (ep14_1_bs > 13 && ep14_1_bs2 == 12) {
 		mes "[Humming]";
 		mes "Oh!";
@@ -1330,7 +1331,7 @@ mora,139,102,2	script	Humming#ep14_1_bs	515,{
 	close;
 }
 
-mora,55,124,2	script	Jones#ep14_1_bs	495,{
+mora,55,124,2	script	Jones#ep14_1_bs	4_M_MERCAT1,{
 	if (ep14_1_bs < 15) {
 		mes "[Jones]";
 		mes "Oh.... Darn.......";
@@ -1397,7 +1398,7 @@ mora,55,124,2	script	Jones#ep14_1_bs	495,{
 	end;
 }
 
-splendide,121,260,4	script	Daphrer#ep14_1_bs	435,{
+splendide,121,260,4	script	Daphrer#ep14_1_bs	4_F_FAIRY,{
 	if (!isequipped(2782)) {
 		mes "[Daphrer]";
 		mes "DRHSfhsdfGSDH FGkkmvoifk DFG DFHshfeksmn fgg FDbbd fjnnvk n skncki dfgd F FHdfkdfjkmv";
@@ -1443,9 +1444,25 @@ splendide,121,260,4	script	Daphrer#ep14_1_bs	435,{
 	close;
 }
 
-// Chesire's New Day :: cheshir2
+sec_in02,35,175,0	script	Theore Set Guid	4_F_FAIRYKID,{
+	callfunc "F_GM_NPC";
+	switch(select("Set0:Set33:Set2_0")) {
+	case 1:
+		set ep14_1_bs,0;
+		end;
+	case 2:
+		set ep4_1_bs,3;
+		setquest 11183;
+		end;
+	case 3:
+		set ep14_1_bs2,0;
+		end;
+	}
+}
+
+// Chesire's New Day :: ep14_1_cheshir2
 //============================================================
-dic_in01,262,191,0	script	#ep14_1_xq02	139,0,3,{
+dic_in01,262,191,0	script	#ep14_1_xq02	HIDDEN_WARP_NPC,0,3,{
 	end;
 OnTouch:
 	if (ep13_3_secret > 22 && checkquest(7206) == -1) {
@@ -1478,14 +1495,14 @@ OnTouch:
 	end;
 }
 
-dic_in01,260,194,4	script	Cheshire#ep14_1_xq01	498,{
+dic_in01,260,194,4	script	Cheshire#ep14_1_xq01	4_M_CATMAN2,{
 	end;
 OnInit:
 	disablenpc "Cheshire#ep14_1_xq01";
 	end;
 }
 
-dic_dun01,274,114,0	script	Stacked Boxes of Goods	844,{
+dic_dun01,274,114,0	script	Stacked Boxes of Goods	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- You have too many items to do this quest. -";
 		close;
@@ -1539,7 +1556,7 @@ dic_dun01,274,114,0	script	Stacked Boxes of Goods	844,{
 	end;
 }
 
-bif_fild01,335,168,3	script	Cheshire#ep14_1_xq04	497,{
+bif_fild01,335,168,3	script	Cheshire#ep14_1_xq04	4_M_CATMAN1,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- You have too many items to do this quest. -";
 		close;
@@ -1836,7 +1853,7 @@ L_CheckPlaytime:
 		return;
 }
 
-dicastes02,125,192,0	script	#call_cheshir_ep14	139,0,3,{
+dicastes02,125,192,0	script	#call_cheshir_ep14	HIDDEN_WARP_NPC,0,3,{
 	end;
 OnTouch:
 	if (ep13_3_secret > 22) {
@@ -1855,7 +1872,7 @@ OnTouch:
 	end;
 }
 
-dicastes02,103,190,3	script	Cheshire#ep14_extra	497,{
+dicastes02,103,190,3	script	Cheshire#ep14_extra	4_M_CATMAN1,{
 	if (ep13_3_secret > 22) {
 		cutin "ep13_cheshire",1;
 		mes "[Cheshire]";
@@ -1935,9 +1952,9 @@ OnTimer600000:
 	end;
 }
 
-// Helping Lope and Euridi :: rofe
+// Helping Lope and Euridi :: ep14_1_rofe
 //============================================================
-mora,117,66,3	script	Euridi#pa	521,{
+mora,117,66,3	script	Euridi#pa	4_F_MORAFINE2,{
 	if (BaseLevel < 100) {
 		mes "[Euridi]";
 		mes "You are very delicate.";
@@ -2063,7 +2080,11 @@ mora,117,66,3	script	Euridi#pa	521,{
 		mes "Euridi is standing staring blankly like someone who wasn't all there.";
 		mes "Let's go show the letter to Pitt.";
 		changequest 1112,1113;
-		delitem 6383,30; //Clue_Of_Lope
+
+		//delitem 6383,30; //Clue_Of_Lope
+		set .@count, countitem(6383);
+		if (.@count) delitem 6383,((.@count > 30)?30:.@count); //Clue_Of_Lope
+
 		set ep14_1_rope,5;
 		close;
 	} else if (ep14_1_rope == 5) {
@@ -2106,7 +2127,10 @@ mora,117,66,3	script	Euridi#pa	521,{
 			mes "She starts to sing in a strained voice, still crying.";
 			changequest 1116,1117;
 			set ep14_1_rope,10;
-			delitem 6384,1; //Ring_Of_Lope
+
+			//delitem 6384,1; //Ring_Of_Lope
+			if (countitem(6384)) delitem 6384,1; //Ring_Of_Lope
+
 			close;
 		}
 	} else if (ep14_1_rope > 9) {
@@ -2116,7 +2140,7 @@ mora,117,66,3	script	Euridi#pa	521,{
 	}
 }
 
-mora,115,68,3	script	Euridi's Friend#pa	520,{
+mora,115,68,3	script	Euridi's Friend#pa	4_F_MORAFINE1,{
 	if (ep14_1_rope < 2) {
 		mes "[Euridi's Friend]";
 		mes "Please stop Euridi.";
@@ -2216,7 +2240,7 @@ mora,115,68,3	script	Euridi's Friend#pa	520,{
 	}
 }
 
-mora,65,145,3	script	Pitt#pa	519,{
+mora,65,145,3	script	Pitt#pa	4_M_LYINGDOG,{
 	if (ep14_1_rope == 0) {
 		mes "[Pitt]";
 		mes "So you're quite good,";
@@ -2364,7 +2388,7 @@ mora,65,145,3	script	Pitt#pa	519,{
 	}
 }
 
-bif_fild01,132,338,3	script	Lope#pa	461,2,2,{
+bif_fild01,132,338,3	script	Lope#pa	4_M_FAIRYSOLDIER2,2,2,{
 	if (ep14_1_rope < 8) {
 		mes "[Suspicious Man]";
 		mes "......";
@@ -2439,14 +2463,14 @@ bif_fild01,132,338,3	script	Lope#pa	461,2,2,{
 	}
 	end;
 OnEnable:
-	setnpcdisplay "Lope#pa",999;
+	setnpcdisplay "Lope#pa", 4_M_MUT1;
 	end;
 OnDisable:
 	disablenpc "Lope#pa";
 	initnpctimer;
 	end;
 OnReset:
-	setnpcdisplay "Lope#pa",461;
+	setnpcdisplay "Lope#pa", 4_M_FAIRYSOLDIER2;
 	enablenpc "Lope#pa";
 	end;
 OnTimer2000:
@@ -2482,9 +2506,9 @@ OnTouch:
 	}
 }
 
-// Find the Research Tools :: muk
+// Find the Research Tools :: ep14_1_muk
 //============================================================
-mora,31,138,6	script	Raffle Researcher#ep14	522,{
+mora,31,138,6	script	Raffle Researcher#ep14	4_M_RAFLE_OR,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
 		mes "^FF0000- Warning message -";
 		mes "- Hang on there!! -";
@@ -3360,26 +3384,26 @@ L_ShowReport:
 	mes "[Experimental Results]";
 	mes "*** Researcher - Inffle";
 	mes "*** Research Assistant - "+strcharinfo(0);
-	mes "¡¡";
+	mes " ";
 	mes "<Research topic>";
 	mes "*** Bath of Mora Village";
-	mes "¡¡";
+	mes " ";
 	mes "<Aim>";
 	mes "To investigate the mysterious power of the bath water";
 	mes "and to find out ways to better utilize";
 	mes "the water.";
-	mes "¡¡";
+	mes " ";
 	mes "<Methods>";
 	mes "1. Obtained an unidentified DNA sample.";
 	mes "Obtained a sample of an unidentified DNA,";
 	mes "and collected more samples to look further into it.";
-	mes "¡¡";
+	mes " ";
 	mes "2. A comparison analysis on the unidentified DNA";
 	mes "Concluded that the DNA belongs to";
 	mes "an unidentified creature living in the bath water.";
 	mes "combine and result in";
 	mes "from the swordfish DNA.";
-	mes "¡¡";
+	mes " ";
 	mes "3. Research on the puddles around the village";
 	mes "From the four puddles around the village,";
 	mes "confirmed that the testing substances were";
@@ -3387,9 +3411,9 @@ L_ShowReport:
 	mes "It is thought that the four puddles";
 	mes "combine and result in";
 	mes "the mysterious power.";
-	mes "¡¡";
+	mes " ";
 	mes "<Material analysis>";
-	mes "*** Temperature ***** 33.5° ";
+	mes "*** Temperature ***** 33.5¡Æ";
 	mes "*** PH ************ 9.8";
 	mes "*** Solid residues *** 176";
 	mes "*** K+ ************ 0,23";
@@ -3422,7 +3446,7 @@ L_CheckWeight:
 	return;
 }
 
-mora,114,79,0	script	Black Shadow#ep14_muk	844,{
+mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
 		mes "^FF0000- Warning message -";
 		mes "- Hang on there!! -";
@@ -4160,7 +4184,7 @@ OnTimer20000:
 OnTimer30000:
 OnTimer40000:
 OnTimer50000:
-	if (rand(2)) 
+	if (rand(2))
 		donpcevent strnpcinfo(0)+"::OnEnable";
 	end;
 OnTimer60000:
@@ -4187,11 +4211,11 @@ OnTouch:
 		end;
 	}
 }
-mora,108,86,0	duplicate(???#mora)	???#ep14_muk01	844,2,2
-mora,107,82,0	duplicate(???#mora)	???#ep14_muk02	844,2,2
-mora,113,84,0	duplicate(???#mora)	???#ep14_muk03	844,2,2
-mora,116,81,0	duplicate(???#mora)	???#ep14_muk04	844,2,2
-mora,118,86,0	duplicate(???#mora)	???#ep14_muk05	844,2,2
+mora,108,86,0	duplicate(???#mora)	???#ep14_muk01	CLEAR_NPC,2,2
+mora,107,82,0	duplicate(???#mora)	???#ep14_muk02	CLEAR_NPC,2,2
+mora,113,84,0	duplicate(???#mora)	???#ep14_muk03	CLEAR_NPC,2,2
+mora,116,81,0	duplicate(???#mora)	???#ep14_muk04	CLEAR_NPC,2,2
+mora,118,86,0	duplicate(???#mora)	???#ep14_muk05	CLEAR_NPC,2,2
 
 -	script	#mora_puddle	-1,{
 	set .@i, atoi(charat(strnpcinfo(2),9));
@@ -4327,14 +4351,14 @@ mora,118,86,0	duplicate(???#mora)	???#ep14_muk05	844,2,2
 	mes "You see a puddle with a calm surface.";
 	close;
 }
-bif_fild02,315,285,0	duplicate(#mora_puddle)	Puddle#ep14_muk01	844
-bif_fild02,65,109,0	duplicate(#mora_puddle)	Puddle#ep14_muk02	844
-bif_fild02,223,71,0	duplicate(#mora_puddle)	Puddle#ep14_muk03	844
-bif_fild02,113,340,0	duplicate(#mora_puddle)	Puddle#ep14_muk04	844
+bif_fild02,315,285,0	duplicate(#mora_puddle)	Puddle#ep14_muk01	CLEAR_NPC
+bif_fild02,65,109,0	duplicate(#mora_puddle)	Puddle#ep14_muk02	CLEAR_NPC
+bif_fild02,223,71,0	duplicate(#mora_puddle)	Puddle#ep14_muk03	CLEAR_NPC
+bif_fild02,113,340,0	duplicate(#mora_puddle)	Puddle#ep14_muk04	CLEAR_NPC
 
-// Mora Daily Quests :: dealer
+// Mora Daily Quests :: ep14_1_dealer
 //============================================================
-mora,133,80,6	script	Elephantine#pa0829	509,{
+mora,133,80,6	script	Elephantine#pa0829	4_ELEPHANT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -4442,7 +4466,7 @@ mora,133,80,6	script	Elephantine#pa0829	509,{
 	close;
 }
 
-mora,115,98,8	script	Hotcha#pa0829	509,{
+mora,115,98,8	script	Hotcha#pa0829	4_ELEPHANT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -4517,7 +4541,7 @@ mora,115,98,8	script	Hotcha#pa0829	509,{
 	close;
 }
 
-mora,119,103,4	script	Bow-wow#pa0829	513,{
+mora,119,103,4	script	Bow-wow#pa0829	4_M_DOGTRAVELER,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -4625,7 +4649,7 @@ mora,119,103,4	script	Bow-wow#pa0829	513,{
 	close;
 }
 
-mora,119,118,4	script	General Good Dealer#pa0	516,{
+mora,119,118,4	script	General Good Dealer#pa0	4_M_RAFLE_GR,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -4713,7 +4737,7 @@ L_CheckQuest:
 	return;
 }
 
-mora,124,108,7	script	Woof-grrr#pa0829	514,{
+mora,124,108,7	script	Woof-grrr#pa0829	4_M_DOGTRAVELER2,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -4821,7 +4845,7 @@ mora,124,108,7	script	Woof-grrr#pa0829	514,{
 	close;
 }
 
-mora,127,112,4	script	Commodities Dealer#pa08	518,{
+mora,127,112,4	script	Commodities Dealer#pa08	4_F_RAFLE_PK,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -4909,7 +4933,7 @@ L_CheckQuest:
 	return;
 }
 
-mora,170,101,4	script	Soul Guide#pa0829	515,{
+mora,170,101,4	script	Soul Guide#pa0829	4_F_DOGTRAVELER,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -5034,19 +5058,19 @@ mora,170,101,4	script	Soul Guide#pa0829	515,{
 	close;
 }
 
-mora,131,165,7	script	Wandering Customer#pa082	520,{
+mora,131,165,7	script	Wandering Customer#pa082	4_F_MORAFINE1,{
 	mes "[Wandering Customer]";
 	mes "I don't know whether to believe this art dealer... He made me stand here like this for days.... Ah... I feel dizzy.";
 	close;
 }
 
-mora,125,174,2	script	A Random Customer#pa0829	520,{
+mora,125,174,2	script	A Random Customer#pa0829	4_F_MORAFINE1,{
 	mes "[Naive Customer]";
 	mes "I don't know when carving my pendant will be completed. Since he is a reliable art dealer, I suppose he won't break my pendant.";
 	close;
 }
 
-mora,104,172,7	script	Victim#pa0829	520,{
+mora,104,172,7	script	Victim#pa0829	4_F_MORAFINE1,{
 	mes "[Victim]";
 	mes "You Bastard! I want my rugged outwear! That was passed on to me by my father *SOB*";
 	next;
@@ -5054,6 +5078,26 @@ mora,104,172,7	script	Victim#pa0829	520,{
 	close;
 }
 
+sec_in02,29,34,5	script	Initializing Mora Sanjo	4_MAN_NITT,{
+	callfunc "F_GM_NPC";
+	mes "Enter your password";
+	if (callfunc("F_GM_NPC","1854",1) == 0) {
+		mes "Hehe";
+		close;
+	} else {
+		mes "[Initialization]";
+		mes "14.1 Initializing all quest window include related daily quest and map and so on";
+		freeloop(1);
+		for(set .@i,12225; .@i<=12353; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		freeloop(0);
+		set ep14_1_mistwoods,10;
+		close;
+	}
+}
+
 // Mora Daily Quests - Souls :: md_cadaver_in
 //============================================================
 // callfunc "mora_remains",<quest ID>,<NPC name>,<Mora Coin amount>,<reward ID>,<max reward amount>;
@@ -5081,20 +5125,20 @@ function	script	mora_remains	{
 	mes "You see traces of recent digging.";
 	close;
 }
-1@mist,132,100,0	script	Tazaar's Remains#33	844,{ callfunc "mora_remains",12243,"Tazaar",6,526,3; }	//Royal_Jelly
-1@mist,102,242,0	script	Naizar's Remains#33	844,{ callfunc "mora_remains",12244,"Naizar",5,942,17; }	//Yoyo_Tail
-1@mist,145,245,0	script	Meshir's Remains#33	844,{ callfunc "mora_remains",12245,"Meshir",5,943,4; }	//Solid_Shell
-1@mist,196,276,0	script	Noirit's Remains#33	844,{ callfunc "mora_remains",12246,"Noirit",6,549,3; }	//Nice_Sweet_Potato
-1@mist,304,327,0	script	Pajama God's Remains#33	844,{ callfunc "mora_remains",12247,"Pajama God",5,945,18; }	//Raccoon_Leaf
-1@mist,334,287,0	script	Mendel's Remains#33	844,{ callfunc "mora_remains",12248,"Mendel",7,946,31; }	//Snail's_Shell
-1@mist,330,177,0	script	Milebit's Remains#33	844,{ callfunc "mora_remains",12249,"Milebit",5,7008,17; }	//Stiff_Horn
-1@mist,284,84,0	script	Kunmun's Remains#33	844,{ callfunc "mora_remains",12250,"Kunmun",4,6380,20; }	//Mora_Coin
-1@mist,170,54,0	script	Tsaihokin's Remains#33	844,{ callfunc "mora_remains",12251,"Tsaihokin",2,929,5; }	//Immortal_Heart
-1@mist,118,43,0	script	Tuar's Remains#33	844,{ callfunc "mora_remains",12252,"Tuar",3,6380,20; }	//Mora_Coin
+1@mist,132,100,0	script	Tazaar's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12243,"Tazaar",6,526,3; }	//Royal_Jelly
+1@mist,102,242,0	script	Naizar's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12244,"Naizar",5,942,17; }	//Yoyo_Tail
+1@mist,145,245,0	script	Meshir's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12245,"Meshir",5,943,4; }	//Solid_Shell
+1@mist,196,276,0	script	Noirit's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12246,"Noirit",6,549,3; }	//Nice_Sweet_Potato
+1@mist,304,327,0	script	Pajama God's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12247,"Pajama God",5,945,18; }	//Raccoon_Leaf
+1@mist,334,287,0	script	Mendel's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; }	//Snail's_Shell
+1@mist,330,177,0	script	Milebit's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12249,"Milebit",5,7008,17; }	//Stiff_Horn
+1@mist,284,84,0	script	Kunmun's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12250,"Kunmun",4,6380,20; }	//Mora_Coin
+1@mist,170,54,0	script	Tsaihokin's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12251,"Tsaihokin",2,929,5; }	//Immortal_Heart
+1@mist,118,43,0	script	Tuar's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12252,"Tuar",3,6380,20; }	//Mora_Coin
 
-// Knights of the Neighborhood :: mora_knight
+// Knights of the Neighborhood :: ep14_1_mora_knight
 //============================================================
-mora,118,166,6	script	Knights Chief#mo	525,{
+mora,118,166,6	script	Knights Chief#mo	4_F_RAFLE_VI,{
 	mes "[Order of the Knights Chief]";
 	mes "We are the legendary order of the Neighborhood Knights, founded just five minutes ago!";
 	next;
@@ -5110,7 +5154,7 @@ mora,118,166,6	script	Knights Chief#mo	525,{
 	close;
 }
 
-mora,116,165,5	script	Knights Boss#mo	524,{
+mora,116,165,5	script	Knights Boss#mo	4_M_RAFLE_VI,{
 	set .@playtime, checkquest(1119,PLAYTIME);
 	if (.@playtime == 0 || .@playtime == 1) {
 		mes "[Order of the Knights Boss]";
@@ -5172,7 +5216,7 @@ mora,116,165,5	script	Knights Boss#mo	524,{
 	}
 }
 
-mora,114,163,5	script	Knights Head#mo	522,{
+mora,114,163,5	script	Knights Head#mo	4_M_RAFLE_OR,{
 	if (checkweight(6380,1) == 0) {
 		mes "[Order of the Knights Head]";
 		mes "You have a lot of things with you!";
@@ -5300,7 +5344,7 @@ mora,114,163,5	script	Knights Head#mo	522,{
 	end;
 }
 
-mora,112,161,5	script	Knights Leader#mo	523,{
+mora,112,161,5	script	Knights Leader#mo	4_F_RAFLE_YE,{
 	mes "[Order of the Knights Leader]";
 	mes "I'm the Leader of the Order -";
 	mes "you can tell me.";
diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt
new file mode 100644
index 000000000..480618a70
--- /dev/null
+++ b/npc/re/quests/quests_morocc.txt
@@ -0,0 +1,246 @@
+//===== Hercules Script ======================================
+//= Morroc Quest NPCs
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Quest NPCs related to Morroc.
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//= 1.0a Gathered remaining dialogues. [Euphy]
+//= 1.1 Added new warpers for Satan Morroc maps. [Euphy]
+//============================================================
+
+// Resurrection of Satan Morroc
+// ============================================================
+-	script	Continental Guard#man	-1,{
+	mes "[Continental Guard]";
+	mes "We've received orders from Headquarters to block access to this area since an unusual space-time phenomenon has been detected.";
+	next;
+	mes "[Continental Guard]";
+	mes "If you really want to go to the next area, you'll be responsible for your own safety.";
+	next;
+	switch(select("Nevermind.:Enter the Field.")) {
+	case 1:
+		mes "[Continental Guard]";
+		mes "Wise choice.";
+		mes "Have a safe journey.";
+		close;
+	case 2:
+		mes "[Continental Guard]";
+		mes "I see.";
+		mes "I'll send you to the field shortly.";
+		close2;
+		warp "moc_fild20",208,207;
+		end;
+	}
+}
+moc_fild07,380,202,1	duplicate(Continental Guard#man)	Continental Guard#man1	4_M_EIN_SOLDIER
+moc_fild11,189,360,6	duplicate(Continental Guard#man)	Continental Guard#man2	4_M_EIN_SOLDIER
+prt_fild10,263,23,1	duplicate(Continental Guard#man)	Continental Guard#man3	4_M_EIN_SOLDIER
+prt_fild09,95,19,1	duplicate(Continental Guard#man)	Continental Guard#man4	4_M_EIN_SOLDIER
+prt_fild09,246,17,1	duplicate(Continental Guard#man)	Continental Guard#man5	4_M_EIN_SOLDIER
+moc_fild13,32,171,6	duplicate(Continental Guard#man)	Continental Guard#man6	4_M_EIN_SOLDIER
+moc_fild16,124,381,4	duplicate(Continental Guard#man)	Continental Guard#man7	4_M_EIN_SOLDIER
+moc_fild16,333,380,4	duplicate(Continental Guard#man)	Continental Guard#man8	4_M_EIN_SOLDIER
+moc_fild01,84,19,1	duplicate(Continental Guard#man)	Continental Guard#man9	4_M_EIN_SOLDIER
+
+// Pyramids Nightmare Mode
+//============================================================
+moc_prydb1,103,54,3	script	Suspicious Cat#night	4_CAT_SAILOR4,{
+	mes "[Suspicious Cat]";
+	mes "I can't believe a mummy could do this to me. Oh man, it hurts. Nobody should find out about this....";
+	next;
+	if(select("Mummy? What happened?:Pretend not to know anything.") == 2)
+		close;
+	mes "[Suspicious Cat]";
+	mes "You caught me! Darn it...I didn't expect my reputation as a tomb raider would get damaged like this...";
+	next;
+	mes "[Suspicious Cat]";
+	mes "But come on, they're so strange! They're mummies! Just mummies, you know? They shouldn't be that strong!";
+	next;
+	if(select("Strong mummies? Where are they?:End the conversation.") == 2) {
+		mes "[Suspicious Cat]";
+		mes "Whaaat~ you don't want to hear my story? Fine! You'd better not mention my name anywhere else!";
+		close;
+	}
+	mes "[Suspicious Cat]";
+	mes "Haha, it's a secret.";
+	mes "I found out while I was stealing... No, I mean, just walking through the pyramid.";
+	next;
+	mes "[Suspicious Cat]";
+	mes "When I saw a mummy coming toward me, I was like 'whatever' and didn't care. But then he knocked me down with a slap in the face! How could he do that to a cute cat like me! You bandaged freak... you just wait and see!";
+	next;
+	if(select("I would like to go, too.:End the conversation.") == 2)
+		close;
+	mes "[Suspicious Cat]";
+	mes "No way! I spent so much time finding that path!!";
+	next;
+	mes "[Suspicious Cat]";
+	mes "Hmm... but if you insist, just give me 5000 Zeny. I'll lead you.";
+	mes "What~? Don't give me that look! Do you have any idea how hard it is for a cat to survive in Midgard!";
+	next;
+	mes "[Suspicious Cat]";
+	mes "^FF0000But come to think of it, a weakling like you won't survive there. Maybe for a second if you're lucky?^000000";
+	mes "Well, it's none of my business. But I warned you anyway!";
+	next;
+	switch(select("Pay 5,000 zeny and set out.:Forget it.")) {
+	case 1:
+		if (Zeny < 5000) {
+			mes "[Suspicious Cat]";
+			mes "Where do you think you're going! You're so broke!";
+			close;
+		}
+		Zeny -= 5000;
+		mes "[Suspicious Cat]";
+		mes "Bah, what's up with this old money... you don't have anything sparkly or shiny?!";
+		mes "Ahh, just follow me!";
+		close2;
+		warp "moc_prydn1",93,96;
+		end;
+	case 2:
+		mes "[Suspicious Cat]";
+		mes "Gosh, you don't even have 5000 Zeny, do you?";
+		close;
+	}
+}
+
+moc_prydn1,94,98,3	script	Suspicious Cat#night2	4_CAT_SAILOR4,{
+	mes "[Suspicious Cat]";
+	mes "That stupid mummy slapped me again while you were looking away! Sniff sniff... Let's go back, meow!";
+	next;
+	switch(select("Go back to Thief Guild:Eliminate Verit:Eliminate Ancient Mummy:It's nothing")) {
+	case 1:
+		mes "[Suspicious Cat]";
+		mes "Right right... let's go back.";
+		close2;
+		warp "moc_prydb1",100,57;
+		end;
+	case 2:
+		set .@playtime, checkquest(2290,PLAYTIME);
+		if (.@playtime == 0 || .@playtime == 1) {
+			mes "[Suspicious Cat]";
+			mes "Look at that Verit, he's afraid of us! Kyaahaha! We're safe, at least for a while!";
+			close;
+		} else if (.@playtime == 2)
+			erasequest 2290;
+		set .@hunting, checkquest(2289,HUNTING);
+		if (.@hunting == -1) {
+			mes "[Suspicious Cat]";
+			mes "Did you know that cats and dogs don't get along?";
+			next;
+			mes "[Suspicious Cat]";
+			mes "Look at that ugly and hideous Verit. He's scowling, wagging his tail and trying to come closer.";
+			mes "Oh, you don't have a tail, right? He thinks I'm a thorn in his side, and he's trying to start a fight now!";
+			next;
+			mes "[Suspicious Cat]";
+			mes "Look at him, so greedy and drooly... I don't like the way he breathes, either. I can't stand how he's making those gobbling sounds...";
+			mes "It's so obvious that he's waiting to attack me from behind.";
+			next;
+			mes "[Suspicious Cat]";
+			mes "Gosh, I could have scratched his face so hard if it wasn't for my stomachache!";
+			mes "Hey, it's not because I'm afraid of Majoruros!";
+			next;
+			mes "[Suspicious Cat]";
+			mes "If you want to go home, you'd better beat up that ugly doggie! Otherwise, he'll bite you!";
+			next;
+			switch(select("Help him:Stay away")) {
+			case 1:
+				mes "[Suspicious Cat]";
+				mes "Good, the target number is 20! Good luck!";
+				setquest 2289;
+				close;
+			case 2:
+				mes "[Suspicious Cat]";
+				mes "Pah! You don't care about me? Fine, you traitor!";
+				close;
+			}
+		} else if (.@hunting == 0 || .@hunting == 1) {
+			mes "[Suspicious Cat]";
+			mes "Is Verit's training going well?";
+			next;
+			switch(select("Sure.:I want to stop.")) {
+			case 1:
+				mes "[Suspicious Cat]";
+				mes "Good. Keep up the good work!";
+				close;
+			case 2:
+				mes "[Suspicious Cat]";
+				mes "What? You're so irresponsible!";
+				erasequest 2289;
+				close;
+			}
+		} else if (.@hunting == 2) {
+			mes "[Suspicious Cat]";
+			mes "Hey, you're actually useful! Good job!";
+			mes "That Verit wouldn't dare come around here for a while, right? Muhahah!";
+			changequest 2289,2290;
+			getexp 300000,100000;
+			close;
+		}
+	case 3:
+		set .@playtime, checkquest(2291,PLAYTIME);
+		if (.@playtime == 0 || .@playtime == 1) {
+			mes "[Suspicious Cat]";
+			mes "Good, I'll make a good use of the time you gained! But I gotta do something about this stomachache first.....";
+			close;
+		} else if (.@playtime == 2)
+			erasequest 2291;
+		set .@hunting, checkquest(2292,HUNTING);
+		if (.@hunting == -1) {
+			mes "[Suspicious Cat]";
+			mes "Precious treasures are supposed to be hidden in the deep secret places here!";
+			mes "I'm sure the mummy's precious treasures are hidden in the second basement level.";
+			next;
+			mes "[Suspicious Cat]";
+			mes "But Ancient Mummies caught me off guard and hit my head before I knew it!";
+			next;
+			mes "[Suspicious Cat]";
+			mes "I'm sure they're trying to stop me from finding the treasures by decreasing my superior brain cells!!";
+			next;
+			mes "[Suspicious Cat]";
+			mes "They can't stop me! Let's go get rid of Ancient Mummies!!";
+			next;
+			mes "[Suspicious Cat]";
+			mes "Don't ask why! I'm sure you wouldn't want those beautiful treasures to be hidden in the dark either!";
+			next;
+			switch(select("Help him:Stay away")) {
+			case 1:
+				mes "[Suspicious Cat]";
+				mes "Alright, the target number is 20! Good luck!";
+				setquest 2292;
+				close;
+			case 2:
+				mes "[Suspicious Cat]";
+				mes "Bah, you're so cold-hearted.";
+				close;
+			}
+		} else if (.@hunting == 0 || .@hunting == 1) {
+			mes "[Suspicious Cat]";
+			mes "Is fighting Ancient Mummies going well?";
+			next;
+			switch(select("Sure.:I want to stop.")) {
+			case 1:
+				mes "[Suspicious Cat]";
+				mes "Good. Keep up the good work!";
+				close;
+			case 2:
+				mes "[Suspicious Cat]";
+				mes "What? You're so irresponsible!";
+				erasequest 2292;
+				close;
+			}
+		} else if (.@hunting == 2) {
+			mes "[Suspicious Cat]";
+			mes "Hey, you're actually useful! Good job!";
+			mes "That Ancient Mummy wouldn't dare come around here for a while, right? Muhahah!";
+			changequest 2292,2291;
+			getexp 600000,200000;
+			close;
+		}
+	case 4:
+		close;
+	}
+}
diff --git a/npc/re/quests/quests_nameless.txt b/npc/re/quests/quests_nameless.txt
new file mode 100644
index 000000000..04f138d2f
--- /dev/null
+++ b/npc/re/quests/quests_nameless.txt
@@ -0,0 +1,15 @@
+//===== Hercules Script ======================================
+//= Nameless Island Quests
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Contains:
+//= - Muff's Loan
+//===== Additional Comments: =================================
+//= 1.0 Moved Dorian to pre-re/re paths.
+//============================================================
+
+izlude_in,57,92,3	duplicate(Dorian_izlude)	Dorian	4_M_OILMAN,2,2
diff --git a/npc/re/quests/quests_veins.txt b/npc/re/quests/quests_veins.txt
index 3478fe16b..707516b4e 100644
--- a/npc/re/quests/quests_veins.txt
+++ b/npc/re/quests/quests_veins.txt
@@ -1,15 +1,13 @@
 //===== Hercules Script ======================================
 //= Quest NPCs located in Veins
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Euphy
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Quests related to Veins.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
-//============================================================ 
+//============================================================
 
-ve_fild02,337,314,4	duplicate(WincingOldMan_veins)	Wincing Old Man#ve	945
\ No newline at end of file
+ve_fild02,337,314,4	duplicate(WincingOldMan_veins)	Wincing Old Man#ve	4_M_DST_GRAND
diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf
index c1e40dae6..1e5f28ed8 100644
--- a/npc/re/scripts.conf
+++ b/npc/re/scripts.conf
@@ -10,13 +10,16 @@ npc: npc/re/cities/alberta.txt
 npc: npc/re/cities/brasilis.txt
 npc: npc/re/cities/dewata.txt
 npc: npc/re/cities/dicastes.txt
+npc: npc/re/cities/eclage.txt
 npc: npc/re/cities/izlude.txt
 npc: npc/re/cities/jawaii.txt
 npc: npc/re/cities/malangdo.txt
 npc: npc/re/cities/malaya.txt
 npc: npc/re/cities/mora.txt
+npc: npc/re/cities/yuno.txt
 
 // --------------------------- Guides ---------------------------
+npc: npc/re/guides/navigation.txt
 npc: npc/re/guides/guides_alberta.txt
 npc: npc/re/guides/guides_aldebaran.txt
 npc: npc/re/guides/guides_amatsu.txt
@@ -25,6 +28,7 @@ npc: npc/re/guides/guides_brasilis.txt
 npc: npc/re/guides/guides_comodo.txt
 npc: npc/re/guides/guides_dewata.txt
 npc: npc/re/guides/guides_dicastes.txt
+npc: npc/re/guides/guides_eclage.txt
 npc: npc/re/guides/guides_einbroch.txt
 npc: npc/re/guides/guides_geffen.txt
 npc: npc/re/guides/guides_gonryun.txt
@@ -34,6 +38,7 @@ npc: npc/re/guides/guides_juno.txt
 npc: npc/re/guides/guides_lighthalzen.txt
 npc: npc/re/guides/guides_louyang.txt
 npc: npc/re/guides/guides_lutie.txt
+npc: npc/re/guides/guides_malaya.txt
 npc: npc/re/guides/guides_mora.txt
 npc: npc/re/guides/guides_morroc.txt
 npc: npc/re/guides/guides_moscovia.txt
@@ -44,24 +49,51 @@ npc: npc/re/guides/guides_rachel.txt
 npc: npc/re/guides/guides_umbala.txt
 npc: npc/re/guides/guides_veins.txt
 
+// ------------------------ Instances ---------------------------
+npc: npc/re/instances/BakonawaLake.txt
+npc: npc/re/instances/BangungotHospital.txt
+npc: npc/re/instances/BuwayaCave.txt
+npc: npc/re/instances/HazyForest.txt
+npc: npc/re/instances/MalangdoCulvert.txt
+npc: npc/re/instances/OctopusCave.txt
+npc: npc/re/instances/OldGlastHeim.txt
+npc: npc/re/instances/WolfchevLaboratory.txt
+
 // ---------------- Kafras & Cool Event Corp. -------------------
 npc: npc/re/kafras/kafras.txt
 
 // -------------------------- Merchant --------------------------
 npc: npc/re/merchants/3rd_trader.txt
+npc: npc/re/merchants/advanced_refiner.txt
+npc: npc/re/merchants/alchemist.txt
+npc: npc/re/merchants/ammo_boxes.txt
+npc: npc/re/merchants/ammo_dealer.txt
+//npc: npc/re/merchants/blessed_refiner.txt
+npc: npc/re/merchants/card_separation.txt
+npc: npc/re/merchants/catalog.txt
+npc: npc/re/merchants/coin_exchange.txt
 npc: npc/re/merchants/diamond.txt
+npc: npc/re/merchants/enchan_mal.txt
+npc: npc/re/merchants/enchan_mora.txt
 npc: npc/re/merchants/flute.txt
+npc: npc/re/merchants/hd_refiner.txt
 npc: npc/re/merchants/inn.txt
 npc: npc/re/merchants/quivers.txt
 npc: npc/re/merchants/refine.txt
 npc: npc/re/merchants/renters.txt
 npc: npc/re/merchants/shops.txt
-npc: npc/re/merchants/enchan_mal.txt
-npc: npc/re/merchants/enchan_mora.txt
-npc: npc/re/merchants/coin_exchange.txt
+//npc: npc/re/merchants/ticket_refiner.txt
+//npc: npc/re/merchants/enchan_upg.txt
 
 // --------------------------- Others ---------------------------
+npc: npc/re/other/bulletin_boards.txt
+//npc: npc/re/other/item_merge.txt
+npc: npc/re/other/mail.txt
 npc: npc/re/other/mercenary_rent.txt
+npc: npc/re/other/pvp.txt
+npc: npc/re/other/resetskill.txt
+npc: npc/re/other/stone_change.txt
+npc: npc/re/other/turbo_track.txt
 
 // --------------------------- Quests ---------------------------
 // - Eden Group -------------------------------------------------
@@ -75,19 +107,28 @@ npc: npc/re/quests/eden/91-99.txt
 npc: npc/re/quests/eden/eden_common.txt
 npc: npc/re/quests/eden/eden_quests.txt
 npc: npc/re/quests/eden/eden_service.txt
+npc: npc/re/quests/eden/eden_tutorial.txt
+// iRO custom additions.
+//npc: npc/re/quests/eden/eden_iro.txt
+// --------------------------------------------------------------
+// - Quests-Tutorials for basic classes (1st class quests) ------
+npc: npc/re/quests/first_class/tu_archer.txt
 // --------------------------------------------------------------
 //npc: npc/re/quests/cupet.txt
-npc: npc/re/quests/homu_s.txt
+npc: npc/re/quests/homun_s.txt
 npc: npc/re/quests/magic_books.txt
+npc: npc/re/quests/monstertamers.txt
 npc: npc/re/quests/mrsmile.txt
 npc: npc/re/quests/pile_bunker.txt
+npc: npc/re/quests/quests_13_1.txt
 npc: npc/re/quests/quests_brasilis.txt
 npc: npc/re/quests/quests_dewata.txt
 npc: npc/re/quests/quests_dicastes.txt
+npc: npc/re/quests/quests_eclage.txt
 npc: npc/re/quests/quests_izlude.txt
-npc: npc/re/quests/quests_lighthalzen.txt
 npc: npc/re/quests/quests_malangdo.txt
-npc: npc/re/quests/quests_veins.txt
+npc: npc/re/quests/quests_malaya.txt
 npc: npc/re/quests/quests_mora.txt
-npc: npc/re/quests/monstertamers.txt
-npc: npc/re/quests/quests_13_1.txt
+npc: npc/re/quests/quests_morocc.txt
+npc: npc/re/quests/quests_nameless.txt
+npc: npc/re/quests/quests_veins.txt
diff --git a/npc/re/scripts_guild.conf b/npc/re/scripts_guild.conf
new file mode 100644
index 000000000..e5c01e436
--- /dev/null
+++ b/npc/re/scripts_guild.conf
@@ -0,0 +1,8 @@
+// --------------------------------------------------------------
+// -                     Renewal Guild Wars                     -
+// --------------------------------------------------------------
+
+// ----------------------- War of Emperium ----------------------
+// - Hall of Abyss
+npc: npc/re/guild/invest_main.txt
+npc: npc/re/guild/invest_npc.txt
diff --git a/npc/re/scripts_jobs.conf b/npc/re/scripts_jobs.conf
index 14e532bcf..1d6e9f8f9 100644
--- a/npc/re/scripts_jobs.conf
+++ b/npc/re/scripts_jobs.conf
@@ -28,3 +28,5 @@ npc: npc/re/jobs/3-2/wanderer.txt
 // - Novice
 npc: npc/re/jobs/novice/novice.txt
 npc: npc/re/jobs/novice/supernovice_ex.txt
+// - Job Repairs
+npc: npc/re/jobs/repair.txt
diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf
index fd393e5b7..28f514d19 100644
--- a/npc/re/scripts_main.conf
+++ b/npc/re/scripts_main.conf
@@ -1,10 +1,10 @@
 // --------------------------------------------------------------
-// -             Hercules Renewal Primary Scripts File           -
+// -            Hercules Renewal Primary Scripts File           -
 // --------------------------------------------------------------
 // The idea of this new system is to make scripts more organized
 // since the old system was rather messy with all the NPCs in one
 // file. Now scripts are organized in to files arraged by type.
-// Custom scripts are now in scripts_custom.conf, all other 
+// Custom scripts are now in scripts_custom.conf, all other
 // scripts are deemed as 'official'. You should place your NPCs
 // in to scripts_custom.conf to follow the trend.
 //
@@ -35,10 +35,14 @@ import: npc/scripts_warps.conf
 
 // ------------------- Renewal Script Files ---------------------
 import: npc/re/scripts.conf
+import: npc/re/scripts_guild.conf
 import: npc/re/scripts_jobs.conf
 import: npc/re/scripts_monsters.conf
 import: npc/re/scripts_warps.conf
 
+// ----------- Development / Testing Script Files ---------------
+import: npc/scripts_dev.conf
+
 // ------------------- Custom Script Files ----------------------
 // - Your NPCs go in this file!
 import: npc/scripts_custom.conf
diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf
index 46ab419d8..913fac0c0 100644
--- a/npc/re/scripts_monsters.conf
+++ b/npc/re/scripts_monsters.conf
@@ -2,6 +2,9 @@
 // -                   Renewal Monster Scripts                  -
 // --------------------------------------------------------------
 
+npc: npc/re/mobs/citycleaners.txt
+npc: npc/re/mobs/towns.txt
+
 // -------------------------- Dungeons --------------------------
 npc: npc/re/mobs/dungeons/abbey.txt
 npc: npc/re/mobs/dungeons/abyss.txt
@@ -14,12 +17,13 @@ npc: npc/re/mobs/dungeons/bra_dun.txt
 npc: npc/re/mobs/dungeons/c_tower.txt
 npc: npc/re/mobs/dungeons/dew_dun.txt
 npc: npc/re/mobs/dungeons/dic_dun.txt
+npc: npc/re/mobs/dungeons/ecl_tdun.txt
 npc: npc/re/mobs/dungeons/ein_dun.txt
 npc: npc/re/mobs/dungeons/gef_dun.txt
 npc: npc/re/mobs/dungeons/gefenia.txt
 npc: npc/re/mobs/dungeons/glastheim.txt
-npc: npc/re/mobs/dungeons/gld_re.txt
 npc: npc/re/mobs/dungeons/gld_dunSE.txt
+npc: npc/re/mobs/dungeons/gld_re.txt
 npc: npc/re/mobs/dungeons/gon_dun.txt
 npc: npc/re/mobs/dungeons/ice_dun.txt
 npc: npc/re/mobs/dungeons/in_sphinx.txt
@@ -56,11 +60,11 @@ npc: npc/re/mobs/fields/brasilis.txt
 npc: npc/re/mobs/fields/comodo.txt
 npc: npc/re/mobs/fields/dewata.txt
 npc: npc/re/mobs/fields/dicastes.txt
+npc: npc/re/mobs/fields/eclage.txt
 npc: npc/re/mobs/fields/einbroch.txt
 npc: npc/re/mobs/fields/geffen.txt
 npc: npc/re/mobs/fields/gonryun.txt
 npc: npc/re/mobs/fields/hugel.txt
-npc: npc/re/mobs/fields/jawaii.txt
 npc: npc/re/mobs/fields/lighthalzen.txt
 npc: npc/re/mobs/fields/louyang.txt
 npc: npc/re/mobs/fields/lutie.txt
@@ -77,6 +81,3 @@ npc: npc/re/mobs/fields/splendide.txt
 npc: npc/re/mobs/fields/umbala.txt
 npc: npc/re/mobs/fields/veins.txt
 npc: npc/re/mobs/fields/yuno.txt
-
-// --------------------------- Towns ----------------------------
-npc: npc/re/mobs/towns/brasilis.txt
diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf
index f0b95a462..801aac5b4 100644
--- a/npc/re/scripts_warps.conf
+++ b/npc/re/scripts_warps.conf
@@ -18,6 +18,7 @@ npc: npc/re/warps/dungeons/bra_dun.txt
 npc: npc/re/warps/dungeons/dic_dun.txt
 npc: npc/re/warps/dungeons/ecl_dun.txt
 npc: npc/re/warps/dungeons/iz_dun.txt
+npc: npc/re/warps/dungeons/moc_pryd.txt
 
 // --------------------------- Fields ---------------------------
 npc: npc/re/warps/fields/bif_fild.txt
@@ -34,7 +35,9 @@ npc: npc/re/warps/fields/veins_fild.txt
 npc: npc/re/warps/fields/yuno_fild.txt
 
 // --------------------------- Others ---------------------------
+npc: npc/re/warps/other/arena.txt
 npc: npc/re/warps/other/jobquests.txt
 npc: npc/re/warps/other/paradise.txt
 npc: npc/re/warps/other/s_workshop.txt
 npc: npc/re/warps/other/sign.txt
+npc: npc/re/warps/guildcastles.txt
diff --git a/npc/re/warps/cities/brasilis.txt b/npc/re/warps/cities/brasilis.txt
index e5e8a5386..289ab235d 100644
--- a/npc/re/warps/cities/brasilis.txt
+++ b/npc/re/warps/cities/brasilis.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.2
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Brasilis
 //===== Additional Comments: =================================
 //= 1.0 First version.
diff --git a/npc/re/warps/cities/dewata.txt b/npc/re/warps/cities/dewata.txt
index 4e7476ec8..c134df537 100644
--- a/npc/re/warps/cities/dewata.txt
+++ b/npc/re/warps/cities/dewata.txt
@@ -4,8 +4,6 @@
 //= Chilly
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Dewata
 //===== Additional Comments: =================================
@@ -16,7 +14,7 @@
 
 dewata,44,252,0	warp	dewata0001	1,1,dew_fild01,373,212
 dew_fild01,375,212,0	warp	dewata0002	1,1,dewata,46,251
-//dew_fild01,57,273,0	warp	dewata0003	1,1,dew_in01,15,33
-//dew_in01,16,31,0	warp	dewata0004	1,1,dew_fild01,59,273
+dew_fild01,57,273,0	warp	dewata0003	1,1,dew_in01,15,33
+dew_in01,16,31,0	warp	dewata0004	1,1,dew_fild01,59,273
 dew_fild01,48,65,0	warp	dewata0005	1,1,dew_dun02,302,30
 dew_dun02,305,30,0	warp	dewata0006	1,1,dew_fild01,50,65
diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt
index d2c84ad0a..9af35d123 100644
--- a/npc/re/warps/cities/dicastes.txt
+++ b/npc/re/warps/cities/dicastes.txt
@@ -4,14 +4,14 @@
 //= Chilly, Muad_Dib
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
+//===== File Encoding ========================================
+//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
 //===== Description: =========================================
 //= Warp Points for El Dicastes
 //===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Added Elevators.
-//= 1.2 Removed a warp. [Joseph] 
+//= 1.2 Removed a warp. [Joseph]
 //= 1.3 Updated to match official script. [Joseph]
 //============================================================
 
@@ -32,7 +32,7 @@ dicastes02,120,237,0	warp	eldicastes0013	1,1,dic_in01,45,246
 dic_in01,45,244,0	warp	eldicastes0014	1,1,dicastes02,119,235
 dic_in01,299,248,0	warp	eldicastes0015	1,1,dic_in01,262,191
 
-dic_in01,242,182,0	script	#eldicastes0016	844,{
+dic_in01,242,182,0	script	#eldicastes0016	CLEAR_NPC,{
 	if (isequipped(2782)) select("Administrative Office");
 	else select("¡÷¡ú¡ð");
 	warp "dic_in01",138,221;
@@ -59,16 +59,16 @@ dic_in01,242,182,0	script	#eldicastes0016	844,{
 	warp "dic_in01",.@xy[.@m*2],.@xy[.@m*2+1];
 	end;
 }
-dic_in01,46,288,0	duplicate(Elevator#main)	Elevator#1	844
-dic_in01,122,284,0	duplicate(Elevator#main)	Elevator#2	844
-dic_in01,121,203,0	duplicate(Elevator#main)	Elevator#3	844
-dic_in01,35,214,0	duplicate(Elevator#main)	Elevator#4	844
-dic_in01,44,116,0	duplicate(Elevator#main)	Elevator#5	844
-dic_in01,112,108,0	duplicate(Elevator#main)	Elevator#6	844
-dic_in01,180,108,0	duplicate(Elevator#main)	Elevator#7	844
-dic_in01,261,115,0	duplicate(Elevator#main)	Elevator#8	844
-dic_in01,57,48,0	duplicate(Elevator#main)	Elevator#9	844
-dic_in01,137,46,0	duplicate(Elevator#main)	Elevator#10	844
-dic_in01,222,46,0	duplicate(Elevator#main)	Elevator#11	844
-dic_in01,388,272,0	duplicate(Elevator#main)	Elevator#12	844
-dic_in01,389,208,0	duplicate(Elevator#main)	Elevator#13	844
\ No newline at end of file
+dic_in01,46,288,0	duplicate(Elevator#main)	Elevator#1	CLEAR_NPC
+dic_in01,122,284,0	duplicate(Elevator#main)	Elevator#2	CLEAR_NPC
+dic_in01,121,203,0	duplicate(Elevator#main)	Elevator#3	CLEAR_NPC
+dic_in01,35,214,0	duplicate(Elevator#main)	Elevator#4	CLEAR_NPC
+dic_in01,44,116,0	duplicate(Elevator#main)	Elevator#5	CLEAR_NPC
+dic_in01,112,108,0	duplicate(Elevator#main)	Elevator#6	CLEAR_NPC
+dic_in01,180,108,0	duplicate(Elevator#main)	Elevator#7	CLEAR_NPC
+dic_in01,261,115,0	duplicate(Elevator#main)	Elevator#8	CLEAR_NPC
+dic_in01,57,48,0	duplicate(Elevator#main)	Elevator#9	CLEAR_NPC
+dic_in01,137,46,0	duplicate(Elevator#main)	Elevator#10	CLEAR_NPC
+dic_in01,222,46,0	duplicate(Elevator#main)	Elevator#11	CLEAR_NPC
+dic_in01,388,272,0	duplicate(Elevator#main)	Elevator#12	CLEAR_NPC
+dic_in01,389,208,0	duplicate(Elevator#main)	Elevator#13	CLEAR_NPC
diff --git a/npc/re/warps/cities/eclage.txt b/npc/re/warps/cities/eclage.txt
index 0400489f5..dd9e1d55e 100644
--- a/npc/re/warps/cities/eclage.txt
+++ b/npc/re/warps/cities/eclage.txt
@@ -3,19 +3,18 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.0a
 //===== Description: =========================================
 //= Warp Points for Eclage
 //===== Additional Comments: =================================
 //= 1.0 First Version.
+//= 1.0a Disabled quest warp. [Euphy]
 //============================================================
 
 // Town Warps
 bif_fild02,292,351,0	warp	eclage_field0001	1,1,ecl_fild01,205,74
 ecl_fild01,207,72,0	warp	eclage_field0002	1,1,bif_fild02,294,349
-ecl_fild01,97,320,0	warp	eclage_field0003	1,1,eclage,100,28
+//ecl_fild01,97,320,0	warp	eclage_field0003	1,1,eclage,100,28
 eclage,98,26,0	warp	eclage_field0004	1,1,ecl_fild01,97,317
 eclage,299,309,0	warp	eclage_field0005	1,1,ecl_in01,47,11
 ecl_in01,47,8,0	warp	eclage_field0006	1,1,eclage,297,307
diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt
index 4be33317e..8bf26e31d 100644
--- a/npc/re/warps/cities/izlude.txt
+++ b/npc/re/warps/cities/izlude.txt
@@ -3,39 +3,88 @@
 //===== By: ==================================================
 //= Athena (1.0), Nana (1.1)
 //===== Current Version: =====================================
-//= 1.7
-//===== Compatible With: =====================================
-//= Any Athena & Hercules Version
+//= 1.8
 //===== Description: =========================================
 //= Warp Points for Izlude
 //===== Additional Comments: =================================
 //= 1.3 Added warps to Izlude Airship [Justin84]
 //= 1.4 Minor correction on airport warps
 //= 1.5 Updated to match the new Izlude Map. [Masao]
-//= 1.6 Added new warps [Streusel]
-//= 1.7 Removed indoor warps [Streusel]
+//= 1.6 Added new warps. [Streusel]
+//= 1.7 Updated to match the official scripts. [Euphy]
+//= 1.8 Added Izlude & Prontera Field 8 duplicates. [Euphy]
 //============================================================
 
 //= Izlude City ==============================================
-izlude,109,182,0	warp	iz01	3,3,izlude_in,65,87
-izlude,216,162,0	warp	iz03	3,2,izlude_in,151,127
-izlude,21,98,0	warp	iz001	3,3,prt_fild08,367,212
+prt_fild08,371,212,0	warp	prtf005	3,3,izlude,24,98
+izlude,20,98,0	warp	iz001	3,3,prt_fild08,367,212
+izlude_in,116,46,0	warp	iz02-1	3,2,izlude,128,98
+izlude,110,182,0	warp	iz01	2,2,izlude_in,65,87
+izlude_in,65,84,0	warp	iz01-1	2,2,izlude,112,179
 izlude,52,172,0	warp	iz04	2,2,izlude_in,74,161
-izlude,130,257,0	warp	iz09#1	2,2,iz_ac01,99,29
-izlude,125,257,0	warp	iz09#2	2,2,iz_ac01,99,29
-izlude,213,161,0	warp	iz10	2,2,arena_room,100,30
-arena_room,99,24,0	warp	iz_arena	2,2,izlude,209,161
+izlude_in,74,158,0	warp	iz04-1	3,2,izlude,52,168
+izlude_in,43,169,0	warp	w219	2,3,izlude_in,63,169
+izlude_in,87,169,0	warp	iz05-1	2,3,izlude_in,111,169
 izlude_in,108,169,0	warp	iz05	2,3,izlude_in,84,169
-izlude_in,148,127,0	warp	iz03-1	2,5,izlude,207,162
+izlude_in,148,127,0	warp	iz03-1	2,5,izlude,210,161
+izlude_in,172,139,0	warp	iz07	3,2,izlude_in,172,161
+izlude_in,172,158,0	warp	iz07-1	3,2,izlude_in,172,136
+izlude_in,172,116,0	warp	iz06-1	3,2,izlude_in,172,94
+izlude_in,171,97,0	warp	iz06	3,2,izlude_in,172,119
 
-izlude_in,43,169,0	warp	w219	2,3,izlude_in,64,169
-izlude_in,65,84,0	warp	iz01-1	5,2,izlude,113,178
-izlude_in,74,158,0	warp	iz04-1	3,2,izlude,52,166
-izlude_in,87,169,0	warp	iz05-1	2,3,izlude_in,111,169
+//= Izlude & Prontera Field 8 Duplicates =====================
+prt_fild08a,371,212,0	warp	prtf005_a	3,3,izlude_a,24,98
+prt_fild08b,371,212,0	warp	prtf005_b	3,3,izlude_b,24,98
+prt_fild08c,371,212,0	warp	prtf005_c	3,3,izlude_c,24,98
+prt_fild08d,371,212,0	warp	prtf005_d	3,3,izlude_d,24,98
+izlude_a,20,98,0	warp	iz001_a	3,3,prt_fild08a,367,212
+izlude_b,20,98,0	warp	iz001_b	3,3,prt_fild08b,367,212
+izlude_c,20,98,0	warp	iz001_c	3,3,prt_fild08c,367,212
+izlude_d,20,98,0	warp	iz001_d	3,3,prt_fild08d,367,212
+izlude_a,110,182,0	warp	iz01_a	2,2,izlude_in,65,87
+izlude_b,110,182,0	warp	iz01_b	2,2,izlude_in,65,87
+izlude_c,110,182,0	warp	iz01_c	2,2,izlude_in,65,87
+izlude_d,110,182,0	warp	iz01_d	2,2,izlude_in,65,87
+izlude_a,52,172,0	warp	iz04_a	2,2,izlude_in,74,161
+izlude_b,52,172,0	warp	iz04_b	2,2,izlude_in,74,161
+izlude_c,52,172,0	warp	iz04_c	2,2,izlude_in,74,161
+izlude_d,52,172,0	warp	iz04_d	2,2,izlude_in,74,161
+
+//= Izlude Academy ===========================================
+izlude,125,257,0	warp	#to_ac01	2,2,iz_ac01,99,29
+izlude,130,257,0	warp	#to_ac02	2,2,iz_ac01,99,29
+iz_ac01,100,24,0	warp	#to_ac01-1	2,2,izlude,127,253
+iz_ac01,78,25,0	warp	#to_ac2f01	2,2,iz_ac02,104,27
+iz_ac01,122,25,0	warp	#to_ac2f02	2,2,iz_ac02,104,27
+iz_ac02,94,27,0	warp	#to_ac1f01	2,2,iz_ac01,78,28
+iz_ac02,113,27,0	warp	#to_ac1f02	2,2,iz_ac01,122,28
 
-//Izlude Academy
-iz_ac01,100,24,0	warp	iz_ac01	2,2,izlude,127,253
-iz_ac01,122,25,0	warp	iz_ac02	2,2,iz_ac02,104,27
-iz_ac01,78,25,0	warp	iz_ac03	2,2,iz_ac02,104,27
-iz_ac02,113,27,0	warp	iz_ac04	2,2,iz_ac01,122,28
-iz_ac02,94,27,0	warp	iz_ac05	2,2,iz_ac01,78,28
\ No newline at end of file
+//= Izlude Academy Duplicates ================================
+izlude_a,125,257,0	warp	#to_ac01_a	2,2,iz_ac01_a,99,29
+izlude_b,125,257,0	warp	#to_bc01_b	2,2,iz_ac01_b,99,29
+izlude_c,125,257,0	warp	#to_cc01_c	2,2,iz_ac01_c,99,29
+izlude_d,125,257,0	warp	#to_dc01_d	2,2,iz_ac01_d,99,29
+izlude_a,130,257,0	warp	#to_ac02_a	2,2,iz_ac01_a,99,29
+izlude_b,130,257,0	warp	#to_bc02_b	2,2,iz_ac01_b,99,29
+izlude_c,130,257,0	warp	#to_cc02_c	2,2,iz_ac01_c,99,29
+izlude_d,130,257,0	warp	#to_dc02_d	2,2,iz_ac01_d,99,29
+iz_ac01_a,100,24,0	warp	#to_ac01-1_a	2,2,izlude_a,127,253
+iz_ac01_b,100,24,0	warp	#to_bc01-1_b	2,2,izlude_b,127,253
+iz_ac01_c,100,24,0	warp	#to_cc01-1_c	2,2,izlude_c,127,253
+iz_ac01_d,100,24,0	warp	#to_dc01-1_d	2,2,izlude_d,127,253
+iz_ac01_a,78,25,0	warp	#to_ac2f01_a	2,2,iz_ac02_a,104,27
+iz_ac01_b,78,25,0	warp	#to_bc2f01_b	2,2,iz_ac02_b,104,27
+iz_ac01_c,78,25,0	warp	#to_cc2f01_c	2,2,iz_ac02_c,104,27
+iz_ac01_d,78,25,0	warp	#to_dc2f01_d	2,2,iz_ac02_d,104,27
+iz_ac01_a,122,25,0	warp	#to_ac2f02_a	2,2,iz_ac02_a,104,27
+iz_ac01_b,122,25,0	warp	#to_bc2f02_b	2,2,iz_ac02_b,104,27
+iz_ac01_c,122,25,0	warp	#to_cc2f02_c	2,2,iz_ac02_c,104,27
+iz_ac01_d,122,25,0	warp	#to_dc2f02_d	2,2,iz_ac02_d,104,27
+iz_ac02_a,94,27,0	warp	#to_ac1f01_a	2,2,iz_ac01_a,78,28
+iz_ac02_b,94,27,0	warp	#to_bc1f01_b	2,2,iz_ac01_b,78,28
+iz_ac02_c,94,27,0	warp	#to_cc1f01_c	2,2,iz_ac01_c,78,28
+iz_ac02_d,94,27,0	warp	#to_dc1f01_d	2,2,iz_ac01_d,78,28
+iz_ac02_a,113,27,0	warp	#to_ac1f02_a	2,2,iz_ac01_a,122,28
+iz_ac02_b,113,27,0	warp	#to_bc1f02_b	2,2,iz_ac01_b,122,28
+iz_ac02_c,113,27,0	warp	#to_cc1f02_c	2,2,iz_ac01_c,122,28
+iz_ac02_d,113,27,0	warp	#to_dc1f02_d	2,2,iz_ac01_d,122,28
diff --git a/npc/re/warps/cities/malangdo.txt b/npc/re/warps/cities/malangdo.txt
index f2bf50572..501c9e85b 100644
--- a/npc/re/warps/cities/malangdo.txt
+++ b/npc/re/warps/cities/malangdo.txt
@@ -4,8 +4,6 @@
 //= Chilly
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Malangdo Island
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt
index a792c4690..190f1831a 100644
--- a/npc/re/warps/cities/malaya.txt
+++ b/npc/re/warps/cities/malaya.txt
@@ -1,102 +1,146 @@
-//===== Hercules Script ====================================== 
-//= Mayala Port Town Warps
-//===== By: ================================================== 
+//===== Hercules Script ======================================
+//= Port Malaya Warp Script
+//===== By: ==================================================
 //= Chilly
-//===== Current Version: ===================================== 
-//= 1.0a
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
-//= Warps for Mayala Port Town.
-//===== Additional Comments: ================================= 
-//= 1.0 First Version [Chilly].
-//= 1.0a Updated the file with new / missing warps [Masao].
-//============================================================ 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= Warp Points for Port Malaya
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//= 1.1 Updated to match official scripts. [Masao]
+//= 1.2 Added official Jeepney warp scripts. [Euphy]
+//============================================================
 
-malaya,178,211,0	script	malaya_inn	45,1,1,{
-	end;
+// Town Warps
+//============================================================
+ma_in01,86,16,0	warp	mal_in_ws	1,1,malaya,115,212
+ma_in01,24,77,0	warp	mal_in_inn	1,1,malaya,178,208
+malaya,370,277,0	warp	malaya_mal_fild01	1,1,ma_fild01,40,272
+ma_fild01,37,272,0	warp	mal_fild01_malaya	1,1,malaya,367,277
+ma_in01,33,152,0	warp	mal_in_house01	1,1,malaya,52,75
+malaya,309,70,0	warp	malaya_ship_mal_in_ship	1,1,ma_in01,108,92
+ma_in01,105,92,0	warp	mal_in_ship_malaya_ship	1,1,malaya,310,67
+ma_fild01,266,359,0	warp	mafild01_to02	1,1,ma_fild02,248,36
+ma_fild02,248,33,0	warp	mafild02_to01	1,1,ma_fild01,266,356
+ma_fild01,288,52,0	warp	mafild01_tobknw	1,1,ma_scene01,142,78
+ma_scene01,140,80,0	warp	bknw_tofild01	1,1,ma_fild01,288,55
+ma_in01,9,24,0	warp	mal_in_ts	1,1,malaya,296,167
+ma_in01,126,17,0	warp	mal_in_shop_malaya_shop	1,1,malaya,261,237
+ma_fild01,251,190,0	warp	mf_minga_mf_in_minga	1,1,ma_in01,108,160
+ma_in01,105,160,0	warp	mf_in_minga_mf_minga	1,1,ma_fild01,248,190
 
+// Locked Warps
+//============================================================
+malaya,178,211,0	script	malaya_inn	WARPNPC,1,1,{
+	end;
 OnTouch:
 	if (malaya_hi < 10) {
-		mes "Door is closed. It seems keeping its eyes on you.";
+		mes "Door is closed. It seems to be keeping its eyes on you.";
 		close;
-    }
+	}
 	warp "ma_in01",24,80;
 	end;
 }
 
-malaya,112,212,0	script	malaya_ws	45,1,1,{
+malaya,112,212,0	script	malaya_ws	WARPNPC,1,1,{
 	end;
-
 OnTouch:
 	if (malaya_hi < 20) {
-		mes "Door is closed. It seems keeping its eyes on you.";
+		mes "Door is closed. It seems to be keeping its eyes on you.";
 		close;
 	}
 	warp "ma_in01",83,16;
 	end;
 }
 
-malaya,299,167,0	script	malaya_ts	45,1,1,{
+malaya,299,167,0	script	malaya_ts	WARPNPC,1,1,{
 	end;
-
 OnTouch:
 	if (malaya_hi < 20) {
-		mes "Door is closed. It seems keeping its eyes on you.";
+		mes "Door is closed. It seems to be keeping its eyes on you.";
 		close;
 	}
 	warp "ma_in01",12,24;
 	end;
 }
 
-malaya,261,240,0	script	malaya_shop	45,1,1,{
+malaya,261,240,0	script	malaya_shop	WARPNPC,1,1,{
 	end;
-
 OnTouch:
 	if (malaya_hi < 20) {
-		mes "Door is closed. It seems keeping its eyes on you.";
+		mes "Door is closed. It seems to be keeping its eyes on you.";
 		close;
 	}
 	warp "ma_in01",126,20;
 	end;
 }
 
-malaya,300,211,0	script	malaya_house01	45,1,1,{
+malaya,300,211,0	script	malaya_house01	WARPNPC,1,1,{
 	end;
-
 OnTouch:
 	if (malaya_hi < 10) {
-		mes "Door is closed. It seems keeping its eyes on you.";
+		mes "Door is closed. It seems to be keeping its eyes on you.";
 		close;
-    }
+	}
 	warp "ma_in01",36,152;
 	end;
 }
 
-// Town Warps
-ma_in01,86,16,0	warp	mal_in_ws	1,1,malaya,115,212
-ma_in01,24,77,0	warp	mal_in_inn	1,1,malaya,178,208
-malaya,370,277,0	warp	malaya_mal_fild01	1,1,ma_fild01,40,272
-ma_fild01,37,272,0	warp	mal_fild01_malaya	1,1,malaya,367,277
-ma_in01,33,152,0	warp	mal_in_house01	1,1,malaya,52,75
-malaya,309,70,0	warp	malaya_ship_mal_in_ship	1,1,ma_in01,108,92
-ma_in01,105,92,0	warp	mal_in_ship_malaya_ship	1,1,malaya,310,67
-ma_fild01,266,359,0	warp	mafild01_to02	1,1,ma_fild02,248,36
-ma_fild02,248,33,0	warp	mafild02_to01	1,1,ma_fild01,266,356
-ma_fild01,288,52,0	warp	mafild01_tobknw	1,1,ma_scene01,142,78
-ma_scene01,140,80,0	warp	bknw_tofild01	1,1,ma_fild01,288,55
-ma_in01,9,24,0	warp	mal_in_ts	1,1,malaya,296,167
-ma_in01,126,17,0	warp	mal_in_shop_malaya_shop	1,1,malaya,261,237
-ma_fild01,251,190,0	warp	mf_minga_mf_in_minga	1,1,ma_in01,108,160
-ma_in01,105,160,0	warp	mf_in_minga_mf_minga	1,1,ma_fild01,248,190
+// Jeepney Warps
+//============================================================
+function	script	F_Malaya_Warp	{
+	mes "Where would you like to go?";
+	next;
+	set .@i$, getarg(select("Back outside",getarg(1)+" Jeepney",getarg(2)+" Jeepney") - 1);
+	close2;
+	switch(getarg(3)) {
+	case 1: // 12 passenger
+		if (.@i$ == "Center")
+			warp "malaya",241,238;
+		if (.@i$ == "Southwest")
+			warp "malaya",71,43;
+		else if (.@i$ == "Southeast")
+			warp "malaya",284,129;
+		break;
+	case 2: // 30 passenger
+		if (.@i$ == "Northwest")
+			warp "malaya",134,247;
+		else if (.@i$ == "Southeast")
+			warp "malaya",341,150;
+		else if (.@i$ == "Northeast")
+			warp "malaya",294,293;
+		break;
+	case 3: // 60 passenger
+		if (.@i$ == "Center")
+			warp "malaya",239,221;
+		else if (.@i$ == "Northwest")
+			warp "malaya",59,246;
+		else if (.@i$ == "Southeast")
+			warp "malaya",254,68;
+		break;
+	}
+	end;
+}
+
+ma_zif01,30,22,0	script	Town Warp#zif01	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; }
+ma_zif02,30,22,0	script	Town Warp#zif02	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; }
+ma_zif03,30,22,0	script	Town Warp#zif03	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; }
+
+ma_zif04,30,22,0	script	Town Warp#zif04	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; }
+ma_zif05,30,22,0	script	Town Warp#zif05	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; }
+ma_zif06,30,22,0	script	Town Warp#zif06	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; }
+
+ma_zif07,30,22,0	script	Town Warp#zif07	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; }
+ma_zif08,30,22,0	script	Town Warp#zif08	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; }
+ma_zif09,30,22,0	script	Town Warp#zif09	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; }
 
-// Car Warps
-ma_zif01,30,22,0	warp	malaya_car0001	1,1,malaya,241,238
-ma_zif02,30,22,0	warp	malaya_car0002	1,1,malaya,71,43
-ma_zif03,30,22,0	warp	malaya_car0003	1,1,malaya,284,129
-ma_zif04,30,22,0	warp	malaya_car0004	1,1,malaya,134,247
-ma_zif05,30,22,0	warp	malaya_car0005	1,1,malaya,341,150
-ma_zif06,30,22,0	warp	malaya_car0006	1,1,malaya,294,293
-ma_zif07,30,22,0	warp	malaya_car0007	1,1,malaya,239,221
-ma_zif08,30,22,0	warp	malaya_car0008	1,1,malaya,59,246
-ma_zif09,30,22,0	warp	malaya_car0009	1,1,malaya,254,68
\ No newline at end of file
+//ma_zif01,30,22,0	warp	malaya_car0001	1,1,malaya,241,238
+//ma_zif02,30,22,0	warp	malaya_car0002	1,1,malaya,71,43
+//ma_zif03,30,22,0	warp	malaya_car0003	1,1,malaya,284,129
+//ma_zif04,30,22,0	warp	malaya_car0004	1,1,malaya,134,247
+//ma_zif05,30,22,0	warp	malaya_car0005	1,1,malaya,341,150
+//ma_zif06,30,22,0	warp	malaya_car0006	1,1,malaya,294,293
+//ma_zif07,30,22,0	warp	malaya_car0007	1,1,malaya,239,221
+//ma_zif08,30,22,0	warp	malaya_car0008	1,1,malaya,59,246
+//ma_zif09,30,22,0	warp	malaya_car0009	1,1,malaya,254,68
diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt
index eb2b0722f..9ec33e229 100644
--- a/npc/re/warps/cities/rachel.txt
+++ b/npc/re/warps/cities/rachel.txt
@@ -4,19 +4,17 @@
 //= erKURITA & RockmanEXE
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Rachel City, shops & other locations
 //===== Additional Comments: =================================
-//= 1.0 Added the official warps and commented out the 
+//= 1.0 Added the official warps and commented out the
 //= 	  "custom duplicates" for future checkout. Special thanks
 //= 	  to RockmanEXE who provided all the info. [erKURITA]
 //= 1.1 Added warp to Veins Field [Playtester]
 //= 1.2 Fully official rachel warps [Playtester]
 //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf]
 //= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf]
-//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] 
+//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf]
 //= 1.5 Renewal warp adjustments.
 //============================================================
 
diff --git a/npc/re/warps/cities/yggdrasil.txt b/npc/re/warps/cities/yggdrasil.txt
index 3076d22b1..72004882a 100644
--- a/npc/re/warps/cities/yggdrasil.txt
+++ b/npc/re/warps/cities/yggdrasil.txt
@@ -4,8 +4,6 @@
 //= PKGINGO (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Yggdrasil Tree
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/dungeons/bra_dun.txt b/npc/re/warps/dungeons/bra_dun.txt
index de7d1d94f..57210f108 100644
--- a/npc/re/warps/dungeons/bra_dun.txt
+++ b/npc/re/warps/dungeons/bra_dun.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Brasilis Dungeon warp script
 //===== Additional Comments: =================================
 //= 1.0 First version.
diff --git a/npc/re/warps/dungeons/dic_dun.txt b/npc/re/warps/dungeons/dic_dun.txt
index 9016c3e0c..7dde16769 100644
--- a/npc/re/warps/dungeons/dic_dun.txt
+++ b/npc/re/warps/dungeons/dic_dun.txt
@@ -4,8 +4,6 @@
 //= Chilly, Muad_Dib
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Scaraba Hole
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/dungeons/ecl_dun.txt b/npc/re/warps/dungeons/ecl_dun.txt
index 5209c4f25..d3ce45cc7 100644
--- a/npc/re/warps/dungeons/ecl_dun.txt
+++ b/npc/re/warps/dungeons/ecl_dun.txt
@@ -4,8 +4,6 @@
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Eclage Dungeon
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt
index bbe68f8b8..95e20d84c 100644
--- a/npc/re/warps/dungeons/iz_dun.txt
+++ b/npc/re/warps/dungeons/iz_dun.txt
@@ -5,18 +5,16 @@
 //= Nana (1.1)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Bibilyn Island & Undersea Cave
 //===== Additional Comments: =================================
 //= 1.2 Moved common warps to base path. [Euphy]
-//= 1.3 Added Undersea Tunnel 6th floor warper. [L0ne_W0lf]
+//= 1.3 Added Undersea Tunnel 6th floor warper.
 //============================================================
 
 // Undersea Tunnel Warper
 //============================================================
-iz_dun04,130,234,5	script	Gatekeeper#iz_dun	413,{
+iz_dun04,130,234,5	script	Gatekeeper#iz_dun	4_M_CRU_SOLD,{
 	mes "[Gatekeeper]";
 	mes "Halt!";
 	mes "What brings you here, Adventurer?";
@@ -43,7 +41,7 @@ iz_dun04,130,234,5	script	Gatekeeper#iz_dun	413,{
 	}
 }
 
-iz_dun05,142,190,5	script	Guard#iz_dun	413,{
+iz_dun05,142,190,5	script	Guard#iz_dun	4_M_CRU_SOLD,{
 	mes "[Gatekeeper]";
 	mes "So I guess you want to go back to the fifth floor?";
 	next;
@@ -60,4 +58,4 @@ iz_dun05,142,190,5	script	Guard#iz_dun	413,{
 		mes "You're braver than I thought.";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/warps/other/bossnia.txt b/npc/re/warps/dungeons/moc_pryd.txt
index 2566f2479..097b5fc3d 100644
--- a/npc/warps/other/bossnia.txt
+++ b/npc/re/warps/dungeons/moc_pryd.txt
@@ -1,16 +1,14 @@
 //===== Hercules Script ======================================
-//= Bossnia Warps
+//= Morroc Pyramid Nightmare Warp Script
 //===== By: ==================================================
-//= Masao
+//= Euphy
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= Back Warp Points related to the Bossnia event.
+//= Warp Points for Morroc Pyramid Nightmare Mode
 //===== Additional Comments: =================================
 //= 1.0 First Version.
 //============================================================
 
-bossnia_01,204,204,0	warp	bossnia01	1,1,prontera,155,180
-bossnia_02,204,204,0	warp	bossnia02	1,1,prontera,155,180
-bossnia_03,204,204,0	warp	bossnia03	1,1,prontera,155,180
-bossnia_04,204,204,0	warp	bossnia04	1,1,prontera,155,180
+moc_prydn1,223,9,0	warp	PyramidsN1-2	2,2,moc_prydn2,192,8
+moc_prydn2,195,8,0	warp	PyramidsN2-1	2,3,moc_prydn1,220,9
diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt
index ec9de1cf9..5fc888b3c 100644
--- a/npc/re/warps/fields/bif_fild.txt
+++ b/npc/re/warps/fields/bif_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Bifrost Field Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Bifrost Field
 //===== Additional Comments: =================================
@@ -39,6 +37,6 @@ OnTouch:
 	specialeffect EF_LEVEL99_4;
 	end;
 }
-bif_fild02,285,332,0	duplicate(bifrost_field0000)	Small Hole#ep14_mora1	844
-bif_fild02,95,310,0	duplicate(bifrost_field0000)	Small Hole#ep14_mora2	844
-bif_fild02,174,162,0	duplicate(bifrost_field0000)	Small Hole#ep14_mora3	844
+bif_fild02,285,332,0	duplicate(bifrost_field0000)	Small Hole#ep14_mora1	CLEAR_NPC
+bif_fild02,95,310,0	duplicate(bifrost_field0000)	Small Hole#ep14_mora2	CLEAR_NPC
+bif_fild02,174,162,0	duplicate(bifrost_field0000)	Small Hole#ep14_mora3	CLEAR_NPC
diff --git a/npc/re/warps/fields/bra_fild.txt b/npc/re/warps/fields/bra_fild.txt
index c2078cdd2..85edc6c10 100644
--- a/npc/re/warps/fields/bra_fild.txt
+++ b/npc/re/warps/fields/bra_fild.txt
@@ -5,10 +5,11 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Brasilis
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //============================================================
+
 bra_fild01,72,34,0	warp	bra_fild01_brasilis	1,1,brasilis,309,334
 brasilis,308,336,0	warp	brasilis_bra_fild01	1,1,bra_fild01,74,34
diff --git a/npc/re/warps/fields/com_fild.txt b/npc/re/warps/fields/com_fild.txt
index c90257eb3..8e7759504 100644
--- a/npc/re/warps/fields/com_fild.txt
+++ b/npc/re/warps/fields/com_fild.txt
@@ -4,10 +4,8 @@
 //= Nana
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Comodo Fields
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
diff --git a/npc/re/warps/fields/dic_fild.txt b/npc/re/warps/fields/dic_fild.txt
index 41ac07aaf..73edb87fb 100644
--- a/npc/re/warps/fields/dic_fild.txt
+++ b/npc/re/warps/fields/dic_fild.txt
@@ -4,8 +4,6 @@
 //= Chilly, Muad_Dib
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for El Dicastes Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/geffen_fild.txt b/npc/re/warps/fields/geffen_fild.txt
index 289ad3a6c..fbe737906 100644
--- a/npc/re/warps/fields/geffen_fild.txt
+++ b/npc/re/warps/fields/geffen_fild.txt
@@ -4,8 +4,6 @@
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Geffen Field's
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/hugel_fild.txt b/npc/re/warps/fields/hugel_fild.txt
index 309ba8cc1..11f03b489 100644
--- a/npc/re/warps/fields/hugel_fild.txt
+++ b/npc/re/warps/fields/hugel_fild.txt
@@ -4,8 +4,6 @@
 //= Sara-chan (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules; RO Episode 10+
 //===== Description: =========================================
 //= Warp Points for Hugel Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/morroc_fild.txt b/npc/re/warps/fields/morroc_fild.txt
index b256e9413..3b40d2443 100644
--- a/npc/re/warps/fields/morroc_fild.txt
+++ b/npc/re/warps/fields/morroc_fild.txt
@@ -3,9 +3,7 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.4b
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.5
 //===== Description: =========================================
 //= Warp Points for Morroc Fields
 //===== Additional Comments: =================================
@@ -15,11 +13,12 @@
 //= 1.4 Uncommented warp that shouldn't have been commented. [L0ne_W0lf]
 //= 1.4a Uncommented yet ANOTHER warp that was taken out. [L0ne_W0lf]
 //= 1.4b Uncommented ANOTHER warp! Yay! :D [L0ne_W0lf]
+//= 1.5 Commented moc_fild20 warps replaced with new NPCs. [Euphy]
 //============================================================
 
 //= Sograt Dessert ===========================================
 //moc_fild01,101,16,0	warp	mocf01-1	15,3,moc_fild04,317,376
-moc_fild01,101,16,0	warp	mocf01-1	15,3,moc_fild20,210,342
+//moc_fild01,101,16,0	warp	mocf01-1	15,3,moc_fild20,210,342
 moc_fild01,22,242,0	warp	mocf005	2,2,prt_fild09,380,237
 moc_fild01,239,382,0	warp	mocf006	12,1,prt_fild08,233,20
 moc_fild01,301,16,0	warp	mocf02	10,1,moc_fild02,77,338
@@ -43,7 +42,7 @@ moc_fild03,70,341,0	warp	mocf04-1	5,2,moc_fild02,332,23
 //moc_fild04,14,98,0	warp	mocf07	1,11,moc_fild05,378,119
 //moc_fild04,175,18,0	warp	mocf08	3,2,moc_fild08,170,380
 //moc_fild04,19,206,0	warp	mocf09	3,15,moc_fild05,373,208
-//moc_fild04,219,327,0	script	mocf016	45,3,4,{ set @anthell,0; warp "anthell01",35,262; }
+//moc_fild04,219,327,0	script	mocf016	WARPNPC,3,4,{ set @anthell,0; warp "anthell01",35,262; }
 //moc_fild04,292,381,0	warp	mocf01-2	10,1,moc_fild01,76,25
 //moc_fild04,314,381,0	warp	mocf01-3	10,1,moc_fild01,76,25
 //moc_fild04,336,381,0	warp	mocf01-4	10,1,moc_fild01,76,25
@@ -64,7 +63,7 @@ moc_fild03,70,341,0	warp	mocf04-1	5,2,moc_fild02,332,23
 //moc_fild06,377,316,0	warp	mocf10-3	1,15,moc_fild05,24,153
 moc_fild07,198,21,0	warp	mocf001	2,2,morocc,160,294
 //moc_fild07,381,201,0	warp	mocf13-1	2,16,moc_fild06,28,201
-moc_fild07,380,201,0	warp	mocf13-1	2,16,moc_fild20,36,177
+//moc_fild07,380,201,0	warp	mocf13-1	2,16,moc_fild20,36,177
 //moc_fild08,16,207,0	warp	mocf15	2,4,moc_fild09,371,195
 //moc_fild08,170,383,0	warp	mocf08-1	3,2,moc_fild04,175,21
 //moc_fild08,204,16,0	warp	mocf16	4,2,moc_fild14,196,379
@@ -79,7 +78,7 @@ moc_fild07,380,201,0	warp	mocf13-1	2,16,moc_fild20,36,177
 //moc_fild10,208,298,0	warp	mocf14-1	10,2,moc_fild06,207,21
 //moc_fild10,384,258,0	warp	mocf19-1	2,3,moc_fild09,33,162
 //moc_fild11,189,363,0	warp	mocf20-1	3,2,moc_fild10,189,26
-moc_fild11,189,360,0	warp	mocf20-1	3,2,moc_fild20,197,24
+//moc_fild11,189,360,0	warp	mocf20-1	3,2,moc_fild20,197,24
 moc_fild11,212,29,0	warp	mocf21	4,2,moc_fild17,218,366
 moc_fild11,26,161,0	warp	mocf22	2,10,moc_fild12,286,168
 //moc_fild11,379,197,0	warp	mocf23	2,6,moc_fild15,41,105
@@ -89,22 +88,22 @@ moc_fild12,159,381,0	warp	mocf003	2,2,morocc,160,20
 moc_fild12,289,168,0	warp	mocf22-1	2,3,moc_fild11,29,161
 moc_fild13,146,368,0	warp	mocf05-1	5,2,moc_fild02,71,21
 //moc_fild13,29,171,0	warp	mocf17-1	2,4,moc_fild08,380,211
-moc_fild13,32,171,0	warp	mocf17-1	2,4,moc_fild20,349,179
+//moc_fild13,32,171,0	warp	mocf17-1	2,4,moc_fild20,349,179
 moc_fild13,298,370,0	warp	mocf03-1	4,2,moc_fild02,228,32
 moc_fild13,308,49,0	warp	mocf06-1	2,4,moc_fild03,20,37
 //moc_fild14,16,278,0	warp	mocf25	2,6,moc_fild15,364,276
 //moc_fild14,196,382,0	warp	mocf16-1	4,2,moc_fild08,204,19
 //moc_fild15,104,16,0	warp	mocf26	9,2,moc_fild16,125,380
 //moc_fild15,158,363,0	warp	mocf18-1	6,2,moc_fild09,126,23
-//moc_fild15,258,253,0	script	mocf017	45,3,3,{ set @anthell,1; warp "anthell01",35,262; }
+//moc_fild15,258,253,0	script	mocf017	WARPNPC,3,3,{ set @anthell,1; warp "anthell01",35,262; }
 //moc_fild15,348,18,0	warp	mocf27	5,2,moc_fild16,334,379
 //moc_fild15,367,276,0	warp	mocf25-1	2,4,moc_fild14,19,278
 //moc_fild15,38,105,0	warp	mocf23-1	2,4,moc_fild11,376,197
 //moc_fild16,125,383,0	warp	mocf26-1	5,2,moc_fild15,104,19
-moc_fild16,124,381,0	warp	mocf26-1	5,2,moc_fild20,197,24
+//moc_fild16,124,381,0	warp	mocf26-1	5,2,moc_fild20,197,24
 moc_fild16,16,179,0	warp	mocf28	2,6,moc_fild17,366,272
 //moc_fild16,334,382,0	warp	mocf27-1	4,2,moc_fild15,348,21
-moc_fild16,333,380,0	warp	mocf27-1	4,2,moc_fild20,197,24
+//moc_fild16,333,380,0	warp	mocf27-1	4,2,moc_fild20,197,24
 moc_fild17,218,369,0	warp	mocf21-1	5,2,moc_fild11,212,32
 moc_fild17,30,300,0	warp	moc29	2,5,moc_fild18,379,305
 moc_fild17,369,272,0	warp	mocf28-1	2,3,moc_fild16,19,179
diff --git a/npc/re/warps/fields/payon_fild.txt b/npc/re/warps/fields/payon_fild.txt
index 5bec271e8..292aa0785 100644
--- a/npc/re/warps/fields/payon_fild.txt
+++ b/npc/re/warps/fields/payon_fild.txt
@@ -1,18 +1,16 @@
 //===== Hercules Script ======================================
 //= Payon Field Warps
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Nana (1.0)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Payon Field Warps
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Refixed payon field08 -> payon warp
 //= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf]
 //= 1.3 Renewal warp adjustments.
-//============================================================ 
+//============================================================
 
 //= Payon Field's ============================================
 pay_fild01,13,152,0	warp	payf001	2,7,moc_fild03,299,170
diff --git a/npc/re/warps/fields/prontera_fild.txt b/npc/re/warps/fields/prontera_fild.txt
index 2267c298d..d033d4c53 100644
--- a/npc/re/warps/fields/prontera_fild.txt
+++ b/npc/re/warps/fields/prontera_fild.txt
@@ -3,15 +3,16 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.3
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.5
 //===== Description: =========================================
 //= Warp Points for Prontera Field
 //===== Additional Comments: =================================
 //= 1.1 updating according to jA [Lupus]
 //= 1.2 Updated warps for episode 12.1 [L0ne_W0lf]
 //= 1.3 Updated to match the new Izlude Map. [Masao]
+//= 1.3a Moved Izlude warp to other file. [Euphy]
+//= 1.4 Commented moc_fild20 warps replaced with new NPCs. [Euphy]
+//= 1.5 Added Prontera Field 8 duplicates. [Euphy]
 //============================================================
 
 //= Prontera Fields ==========================================
@@ -65,29 +66,50 @@ prt_fild08,16,187,0	warp	prtf15-1	3,17,prt_fild07,380,186
 prt_fild08,16,239,0	warp	prtf14-1	3,15,prt_fild07,379,239
 prt_fild08,170,378,0	warp	prtf004	3,2,prontera,156,26
 prt_fild08,233,16,0	warp	prtf023	12,1,moc_fild01,238,378
-prt_fild08,371,212,0	warp	prtf005	3,3,izlude,26,98
 prt_fild08,55,21,0	warp	prtf024	4,2,moc_fild01,56,380
 prt_fild09,14,124,0	warp	prtf17	2,6,prt_fild10,336,126
 prt_fild09,14,139,0	warp	prtf17-1	2,8,prt_fild10,336,126
 prt_fild09,224,380,0	warp	prtf13-1	4,2,prt_fild07,206,15
 //prt_fild09,246,16,0	warp	prtf025	7,2,moc_fild04,92,378
-prt_fild09,246,17,0	warp	prtf025	7,2,moc_fild20,209,333
+//prt_fild09,246,17,0	warp	prtf025	7,2,moc_fild20,209,333
 prt_fild09,383,223,0	warp	prtf026	2,15,moc_fild01,25,242
 prt_fild09,383,251,0	warp	prtf027	2,15,moc_fild01,25,242
 prt_fild09,87,380,0	warp	prtf16-1	5,2,prt_fild07,84,16
 //prt_fild09,95,16,0	warp	prtf028	7,2,moc_fild05,325,379
-prt_fild09,95,19,0	warp	prtf028	7,2,moc_fild20,209,333
+//prt_fild09,95,19,0	warp	prtf028	7,2,moc_fild20,209,333
 prt_fild10,20,122,0	warp	prtf19	2,4,prt_fild11,359,111
 prt_fild10,20,196,0	warp	prtf20	2,4,prt_fild11,358,184
 prt_fild10,227,299,0	warp	prtf020	5,2,gef_fild02,266,21
 //prt_fild10,263,20,0	warp	prtf029	6,2,moc_fild05,144,372
-prt_fild10,263,22,0	warp	prtf029	6,2,moc_fild20,209,333
+//prt_fild10,263,22,0	warp	prtf029	6,2,moc_fild20,209,333
 prt_fild10,339,126,0	warp	prtf17-2	2,8,prt_fild09,17,133
 prt_fild11,17,281,0	warp	prtf021	2,4,gef_fild11,374,293
 prt_fild11,302,301,0	warp	prtf022	5,2,gef_fild03,312,19
 prt_fild11,361,184,0	warp	prtf20-1	2,5,prt_fild10,23,196
 prt_fild11,362,111,0	warp	prtf19-1	2,6,prt_fild10,23,122
 
+//= Prontera Field 8 Duplicates ==============================
+prt_fild08a,16,187,0	warp	prtf15-1_a	3,17,prt_fild07,380,186
+prt_fild08b,16,187,0	warp	prtf15-1_b	3,17,prt_fild07,380,186
+prt_fild08c,16,187,0	warp	prtf15-1_c	3,17,prt_fild07,380,186
+prt_fild08d,16,187,0	warp	prtf15-1_d	3,17,prt_fild07,380,186
+prt_fild08a,16,239,0	warp	prtf14-1_a	3,15,prt_fild07,379,239
+prt_fild08b,16,239,0	warp	prtf14-1_b	3,15,prt_fild07,379,239
+prt_fild08c,16,239,0	warp	prtf14-1_c	3,15,prt_fild07,379,239
+prt_fild08d,16,239,0	warp	prtf14-1_d	3,15,prt_fild07,379,239
+prt_fild08a,170,378,0	warp	prtf004_a	3,2,prontera,156,26
+prt_fild08b,170,378,0	warp	prtf004_b	3,2,prontera,156,26
+prt_fild08c,170,378,0	warp	prtf004_c	3,2,prontera,156,26
+prt_fild08d,170,378,0	warp	prtf004_d	3,2,prontera,156,26
+prt_fild08a,233,16,0	warp	prtf023_a	12,1,moc_fild01,238,378
+prt_fild08b,233,16,0	warp	prtf023_b	12,1,moc_fild01,238,378
+prt_fild08c,233,16,0	warp	prtf023_c	12,1,moc_fild01,238,378
+prt_fild08d,233,16,0	warp	prtf023_d	12,1,moc_fild01,238,378
+prt_fild08a,55,21,0	warp	prtf024_a	4,2,moc_fild01,56,380
+prt_fild08b,55,21,0	warp	prtf024_b	4,2,moc_fild01,56,380
+prt_fild08c,55,21,0	warp	prtf024_c	4,2,moc_fild01,56,380
+prt_fild08d,55,21,0	warp	prtf024_d	4,2,moc_fild01,56,380
+
 //= St. Capitolina Abbey =====================================
 monk_in,128,46,0	warp	monk03	1,3,monk_in,161,38
 monk_in,128,84,0	warp	monk04	1,3,monk_in,161,90
diff --git a/npc/re/warps/fields/rachel_fild.txt b/npc/re/warps/fields/rachel_fild.txt
index 87d4f16d7..621062377 100644
--- a/npc/re/warps/fields/rachel_fild.txt
+++ b/npc/re/warps/fields/rachel_fild.txt
@@ -4,8 +4,6 @@
 //= Playtester
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Rachel Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/veins_fild.txt b/npc/re/warps/fields/veins_fild.txt
index c1a5cce5a..69c10edf3 100644
--- a/npc/re/warps/fields/veins_fild.txt
+++ b/npc/re/warps/fields/veins_fild.txt
@@ -4,8 +4,6 @@
 //= $ephiroth
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Veins Field
 //===== Additional Comments: =================================
@@ -32,7 +30,7 @@ ve_fild04,115,50,0	warp	ve_fild4-3	1,1,ve_fild06,80,183
 //ve_fild05,359,192,0	warp	ve_fild5-2	1,1,ve_fild06,80,183
 ve_fild06,153,220,0	warp	ve_fild6-1	1,1,veins,218,355
 /*
-ve_fild06,81,177,0	script	ve_fild6-2	45,1,1,{
+ve_fild06,81,177,0	script	ve_fild6-2	WARPNPC,1,1,{
 	if (rand(2))
 		warp "ve_fild04",115,55;
 	else
@@ -45,9 +43,9 @@ ve_fild07,147,371,0	warp	ve_fild7-1	1,1,veins,146,28
 // Renewal Addon
 ve_fild06,81,177,0	warp	VeF06S_VeF04S	1,1,ve_fild04,115,55
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Initial version [$ephiroth]
 //= 1.1 Updated more warps [$ephiroth]
 //= 1.2 Removed some unofficial warps [Playtester]
diff --git a/npc/re/warps/fields/yuno_fild.txt b/npc/re/warps/fields/yuno_fild.txt
index b570fca9e..fe998c843 100644
--- a/npc/re/warps/fields/yuno_fild.txt
+++ b/npc/re/warps/fields/yuno_fild.txt
@@ -4,8 +4,6 @@
 //= Nana (1.0), Sara
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules; RO Episode 5+
 //===== Description: =========================================
 //= Warp Points for Yuno Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/guildcastles.txt b/npc/re/warps/guildcastles.txt
index d8eab7cea..6e0b2adca 100644
--- a/npc/re/warps/guildcastles.txt
+++ b/npc/re/warps/guildcastles.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Guild Castles Warp Script
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Renewal Guild Castles
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/other/arena.txt b/npc/re/warps/other/arena.txt
new file mode 100644
index 000000000..81eac96ed
--- /dev/null
+++ b/npc/re/warps/other/arena.txt
@@ -0,0 +1,18 @@
+//===== Hercules Script ======================================
+//= Arena Warps
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Warp Points related to Izlude Arena.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal warps.
+//============================================================
+
+izlude,213,161,0	warp	welcome_arena	1,1,arena_room,100,30
+izlude_a,213,161,0	warp	welcome_arena_a	1,1,arena_room,100,30
+izlude_b,213,161,0	warp	welcome_arena_b	1,1,arena_room,100,30
+izlude_c,213,161,0	warp	welcome_arena_c	1,1,arena_room,100,30
+izlude_d,213,161,0	warp	welcome_arena_d	1,1,arena_room,100,30
+arena_room,99,24,0	warp	bye_arena	2,2,izlude,209,161
diff --git a/npc/re/warps/other/jobquests.txt b/npc/re/warps/other/jobquests.txt
index 5b62a74a4..cefa5dd5f 100644
--- a/npc/re/warps/other/jobquests.txt
+++ b/npc/re/warps/other/jobquests.txt
@@ -3,17 +3,23 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 2.2
-//===== Compatible With: =====================================
-//= Hercules; RO Version Ep4+
+//= 2.3
 //===== Description: =========================================
 //= Warp Points for Job Quest Maps
 //===== Additional Comments: =================================
 //= 2.1 Added one Shadow Chaser job warp. [Euphy]
 //= 2.2 Moved common warps to base path, added warps. [Euphy]
+//= 2.3 Added exit warps (job_exit) for 2nd class quests. [Euphy]
 //============================================================
 
 //==============================================================================
+//Exit Warps
+//==============================================================================
+job_knt,89,98,0	warp	knt_out	1,1,prt_in,77,99
+job_wiz,49,154,0	warp	wiz_out	1,1,gef_tower,108,29
+job_sage,55,154,0	warp	sage_out	1,1,yuno_in03,169,171
+
+//==============================================================================
 //Arch Bishop
 //==============================================================================
 job3_arch01,29,24,0	warp	#archout	1,1,odin_tem02,282,263
@@ -41,4 +47,4 @@ job3_gen01,71,56,0	warp	#from2to1gen	1,1,job3_gen01,11,60
 //==============================================================================
 //Shadow Chaser
 //==============================================================================
-job3_sha01,71,19,0	warp	shadowc1	1,1,tha_t01,149,224
\ No newline at end of file
+job3_sha01,71,19,0	warp	shadowc1	1,1,tha_t01,149,224
diff --git a/npc/re/warps/other/paradise.txt b/npc/re/warps/other/paradise.txt
index 4d4b241a9..4a7d6c29f 100644
--- a/npc/re/warps/other/paradise.txt
+++ b/npc/re/warps/other/paradise.txt
@@ -4,8 +4,6 @@
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Paradise Group
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/other/s_workshop.txt b/npc/re/warps/other/s_workshop.txt
index bc04509b3..32895ee74 100644
--- a/npc/re/warps/other/s_workshop.txt
+++ b/npc/re/warps/other/s_workshop.txt
@@ -4,8 +4,6 @@
 //= Chilly
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Shadow Workshop
 //===== Additional Comments: =================================
@@ -28,4 +26,4 @@ s_atelier,80,66,0	warp	s_atelier0012	1,1,s_atelier,32,56
 s_atelier,109,129,0	warp	s_atelier0013	1,1,s_atelier,159,125
 s_atelier,160,130,0	warp	s_atelier0014	1,1,s_atelier,114,129
 yuno,278,66,0	warp	s_atelier0015	1,1,s_atelier,111,122
-s_atelier,107,122,0	warp	s_atelier0016	1,1,yuno,274,66
\ No newline at end of file
+s_atelier,107,122,0	warp	s_atelier0016	1,1,yuno,274,66
diff --git a/npc/re/warps/other/sign.txt b/npc/re/warps/other/sign.txt
index 84895c26b..8ecd3a777 100644
--- a/npc/re/warps/other/sign.txt
+++ b/npc/re/warps/other/sign.txt
@@ -4,8 +4,6 @@
 //= MasterOfMuppets
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Hercules; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points related to the Sign Quest will be put here
 //===== Additional Comments: =================================
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 65cfe53f5..d81d76ed7 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -3,7 +3,6 @@
 // --------------------------------------------------------------
 npc: npc/MOTD.txt
 
-
 // --------------------------------------------------------------
 // -                        Core Scripts                        -
 // --------------------------------------------------------------
@@ -86,6 +85,8 @@ npc: npc/cities/yuno.txt
 //npc: npc/events/dumplingfestival.txt
 // - Official Easter (2008) Event (iRO)
 //npc: npc/events/easter_2008.txt
+// - Official Easter (2010) Event
+//npc: npc/events/easter_2010.txt
 // - Official kRO, idRO Skill Reset Event
 //npc: npc/events/event_skill_reset.txt
 // - Events related to WoE SE Guild Dungeons.
@@ -101,6 +102,10 @@ npc: npc/events/god_se_festival.txt
 //npc: npc/events/idul_fitri.txt
 // - Official Lunar New Year (2008) Event (iRO)
 //npc: npc/events/lunar_2008.txt
+// - Official RWC (2011) Golden Poring Event
+//npc: npc/events/RWC_2011.txt
+// - Official RWC (2012) Enchants Event
+//npc: npc/events/RWC_2012.txt
 // - Official Memorial Day (2009) Event (iRO)
 //npc: npc/events/MemorialDay_2008.txt
 // - Official St. Patrick's Day (2008) Event (iRO)
@@ -171,6 +176,7 @@ npc: npc/other/arena/arena_party.txt
 npc: npc/other/arena/arena_point.txt
 npc: npc/other/arena/arena_room.txt
 // --------------------------------------------------------------
+//npc: npc/other/acolyte_warp.txt
 npc: npc/other/auction.txt
 npc: npc/other/books.txt
 npc: npc/other/bulletin_boards.txt
@@ -178,6 +184,7 @@ npc: npc/other/bulletin_boards.txt
 npc: npc/other/comodo_gambling.txt
 npc: npc/other/divorce.txt
 npc: npc/other/fortune.txt
+npc: npc/other/gm_npcs.txt
 npc: npc/other/guildpvp.txt
 npc: npc/other/gympass.txt
 npc: npc/other/hugel_bingo.txt
@@ -191,8 +198,6 @@ npc: npc/other/monster_race.txt
 npc: npc/other/poring_war.txt
 npc: npc/other/powernpc.txt
 npc: npc/other/pvp.txt
-npc: npc/other/resetskill.txt
-npc: npc/other/sealstatus.txt
 // - Turbo Track Arena
 npc: npc/other/turbo_track.txt
 
@@ -214,13 +219,15 @@ npc: npc/quests/newgears/2008_headgears.txt
 //   God Item Second Edition Quests
 npc: npc/quests/okolnir.txt
 // - The God Item Quest -----------------------------------------
-npc: npc/quests/seals/brisingamen_seal.txt
 // - Controller file, allow GMs to change variables.
-//npc: npc/quests/seals/god_global.txt
+npc: npc/quests/seals/god_global.txt
+npc: npc/quests/seals/brisingamen_seal.txt
 npc: npc/quests/seals/god_weapon_creation.txt
 npc: npc/quests/seals/megingard_seal.txt
 npc: npc/quests/seals/mjolnir_seal.txt
 npc: npc/quests/seals/sleipnir_seal.txt
+// - Seal status board.
+npc: npc/quests/seals/seal_status.txt
 // --------------------------------------------------------------
 // - Wandering Minstrel Quest
 npc: npc/quests/bard_quest.txt
@@ -237,6 +244,7 @@ npc: npc/quests/gunslinger_quests.txt
 npc: npc/quests/juice_maker.txt
 npc: npc/quests/kiel_hyre_quest.txt
 npc: npc/quests/lvl4_weapon_quest.txt
+npc: npc/quests/mage_solution.txt
 npc: npc/quests/monstertamers.txt
 npc: npc/quests/mrsmile.txt
 npc: npc/quests/ninja_quests.txt
@@ -272,5 +280,5 @@ npc: npc/quests/quests_yuno.txt
 npc: npc/quests/thana_quest.txt
 // - The Sign Quest
 //   Be sure that the time zone set corresponds with the server's.
-//   For more info, read the comments in npc/quests/The_Sign_Quest.txt
+//   For more info, read the comments in npc/quests/the_sign_quest.txt
 npc: npc/quests/the_sign_quest.txt
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf
index c6e550864..3ed22d749 100644
--- a/npc/scripts_custom.conf
+++ b/npc/scripts_custom.conf
@@ -1,12 +1,13 @@
 // --------------------------------------------------------------
 // -                       Custom Scripts                       -
 // --------------------------------------------------------------
-//      All the custom scripts, remove the '//' to enable...     
+//      All the custom scripts, remove the '//' to enable...
 //      Place your scripts here!
 
 //npc: npc/location/to/script.txt
 
 // ----------------------- Basic Scripts -----------------------
+//npc: npc/custom/itembind.txt
 //npc: npc/custom/warper.txt
 //npc: npc/custom/jobmaster.txt
 //npc: npc/custom/platinum_skills.txt
@@ -41,7 +42,7 @@
 //npc: npc/custom/etc/monster_arena.txt
 // -- Raceway mini-game
 //npc: npc/custom/etc/morroc_raceway.txt
-// -- Random change of Drop/Exp rates 1x ~ 1.5x every 6 hours on your server 
+// -- Random change of Drop/Exp rates 1x ~ 1.5x every 6 hours on your server
 //npc: npc/custom/etc/floating_rates.txt
 // -- Wedding script that supports same-sex marriages
 //npc: npc/custom/etc/marriage.txt
diff --git a/npc/scripts_dev.conf b/npc/scripts_dev.conf
new file mode 100644
index 000000000..ee9bcfc26
--- /dev/null
+++ b/npc/scripts_dev.conf
@@ -0,0 +1,8 @@
+// --------------------------------------------------------------
+// -             Development and Testing Scripts                -
+// --------------------------------------------------------------
+// The scripts listed here are for development or testing purpose.
+// There's little to no reason to enable them in a production server.
+
+// Script engine self-test.
+//npc: npc/dev/test.txt
diff --git a/npc/scripts_guild.conf b/npc/scripts_guild.conf
index 37c1e0f6f..90c066fcb 100644
--- a/npc/scripts_guild.conf
+++ b/npc/scripts_guild.conf
@@ -4,7 +4,7 @@
 
 // ----------------------- War of Emperium ----------------------
 // - Guild WoE time settings
-npc: npc/guild/agit_controller.txt 
+npc: npc/guild/agit_controller.txt
 // - Guild NPC Template file
 npc: npc/guild/agit_main.txt
 // - Al De Baran
diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf
index c0d2787f8..29a72171b 100644
--- a/npc/scripts_mapflags.conf
+++ b/npc/scripts_mapflags.conf
@@ -28,4 +28,5 @@ npc: npc/mapflag/novending.txt
 npc: npc/mapflag/town.txt
 npc: npc/mapflag/reset.txt
 npc: npc/mapflag/skillmodifier.txt
-npc: npc/mapflag/skillduration.txt
\ No newline at end of file
+npc: npc/mapflag/skillduration.txt
+npc: npc/mapflag/notomb.txt
diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf
index 0409db90a..cf3dd4065 100644
--- a/npc/scripts_monsters.conf
+++ b/npc/scripts_monsters.conf
@@ -2,7 +2,7 @@
 // -                      Monster  Scripts                      -
 // --------------------------------------------------------------
 
-npc: npc/mobs/bossnia.txt
 npc: npc/mobs/citycleaners.txt
 npc: npc/mobs/jail.txt
 npc: npc/mobs/pvp.txt
+npc: npc/mobs/towns.txt
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index 75b14bb47..4a42ccfa2 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -80,11 +80,10 @@ npc: npc/warps/fields/umbala_fild.txt
 
 // --------------------------- Others ---------------------------
 npc: npc/warps/other/airplane.txt
-npc: npc/warps/other/bossnia.txt
+npc: npc/warps/other/arena.txt
 npc: npc/warps/other/god.txt
 npc: npc/warps/other/jobquests.txt
 npc: npc/warps/other/kiel.txt
 npc: npc/warps/other/other.txt
-npc: npc/warps/other/arena.txt
 npc: npc/warps/guildcastles.txt
-npc: npc/warps/pvp.txt
\ No newline at end of file
+npc: npc/warps/pvp.txt
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index 26ac52a7b..7be1aa27c 100644
--- a/npc/warps/cities/amatsu.txt
+++ b/npc/warps/cities/amatsu.txt
@@ -6,11 +6,11 @@
 //===== Current Version: =====================================
 //= 1.7
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Warp Points for Amatsu
 //===== Additional Comments: =================================
 //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Renamed warps for ease-of-reading.
+//=     Renamed warps for ease-of-reading.
 //============================================================
 
 amatsu,177,138,0	warp	ama_house1-1	1,1,ama_in01,28,176
@@ -41,9 +41,9 @@ ama_in02,59,160,0	warp	ama_castle4-2	1,1,ama_in02,215,152
 ama_in02,126,164,0	warp	ama_castle5-1	1,1,ama_in02,219,161
 ama_in02,222,161,0	warp	ama_castle5-2	1,1,ama_in02,129,164
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.3 Fixed a warp-back [erKURITA]
 //= 1.4 Added Ninja's Warps. Thanks to RockmanEXE for the info. [erKURITA]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt
index 27f3e4573..3b086bf19 100644
--- a/npc/warps/cities/ayothaya.txt
+++ b/npc/warps/cities/ayothaya.txt
@@ -50,9 +50,9 @@ ayo_in02,100,148,0	warp	ayo_shrine1-2	1,1,ayothaya,208,280
 ayothaya,276,176,0	warp	ayo_fild1-1	1,1,ayo_fild01,37,241
 ayo_fild01,32,240,0	warp	ayo_fild1-2	1,1,ayothaya,273,176
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 Fixed Armory part by massdriller [Thanks to akusarujin]
 //= 1.2 Revised warps, due to official Ayothaya Town NPC [MasterOfMuppets]
 //= 1.3 Fixed swapped Inn Exits, thanks to Sir_Loon [Lupus]
diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt
index c2074660e..3c03ff937 100644
--- a/npc/warps/cities/comodo.txt
+++ b/npc/warps/cities/comodo.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.3
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points Comodo city
 //===== Additional Comments: =================================
 //= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/cities/einbech.txt b/npc/warps/cities/einbech.txt
index fd4292fde..b2f69bfbf 100644
--- a/npc/warps/cities/einbech.txt
+++ b/npc/warps/cities/einbech.txt
@@ -1,14 +1,12 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Einbech Warps
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad Dib (1.0), SSUNNY@YOUNG(1.1)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: ===================================== 
-//= Any rAthena Version
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Einbech Town warps
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Made by Muad_Dib from Prometheus, all credit goes to him.
 //= 1.1 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]
 //============================================================
diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt
index 696e7fa00..bbb562a95 100644
--- a/npc/warps/cities/einbroch.txt
+++ b/npc/warps/cities/einbroch.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Einbroch Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.3), SSUNNY@YOUNG(1.7), erKURITA (1.8)
 //===== Current Version: =====================================
 //= 1.8
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Einbroch
 //===== Additional Comments: =================================
diff --git a/npc/warps/cities/geffen.txt b/npc/warps/cities/geffen.txt
index 77016fb7c..94e4653e8 100644
--- a/npc/warps/cities/geffen.txt
+++ b/npc/warps/cities/geffen.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Geffen Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
 //= Nana (1.1)
 //===== Current Version: =====================================
 //= 1.1a
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Geffen
 //===== Additional Comments: =================================
diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt
index 5a37ed0c7..1f74e02f5 100644
--- a/npc/warps/cities/gonryun.txt
+++ b/npc/warps/cities/gonryun.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Kunlun Town Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Kunlun
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt
index 0daa5219b..3c44d9c75 100644
--- a/npc/warps/cities/hugel.txt
+++ b/npc/warps/cities/hugel.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Garden City Hugel Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.1)
 //===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 10+
 //===== Description: =========================================
 //= Warp Points for Hugel
 //===== Additional Comments: =================================
diff --git a/npc/warps/cities/lighthalzen.txt b/npc/warps/cities/lighthalzen.txt
index 04b9798c6..1f3d4b375 100644
--- a/npc/warps/cities/lighthalzen.txt
+++ b/npc/warps/cities/lighthalzen.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lighthalzen Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
 //===== Current Version: =====================================
 //= 1.9
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Lighthalzen
 //===== Additional Comments: =================================
@@ -95,9 +93,9 @@ lhz_in03,93,21,0	warp	lhz_house3_1-2	1,1,lighthalzen,247,299
 lhz_in03,134,14,0	warp	lhz_house3_2-1	1,1,lhz_in03,125,90
 lhz_in03,120,90,0	warp	lhz_house3_2-2	1,1,lhz_in03,130,14
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.3 Removed fields and dungeons warps from here [DracoRPG]
 //= 1.3a A small fix for a warp [MasterOfMuppets]
 //= 1.4 Lighthalzen warp, taken from korean eA site [Vicious]
diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt
index 11679d3b0..82a9bdd26 100644
--- a/npc/warps/cities/louyang.txt
+++ b/npc/warps/cities/louyang.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lou Yang Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Any Athena Version 6.0+
 //===== Description: =========================================
-//= [Aegis conversion]
+//= [Official Conversion]
 //= Warp Points for Louyang
 //===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
@@ -44,9 +42,9 @@ lou_in01,28,19,0	warp	lou_tower1-2	1,1,louyang,136,245
 
 lou_in01,14,18,0	warp	lou_Towerexit	1,1,louyang,90,254
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 Added 2 escapes from 2 mountains 018,019 [Lupus]
 //=     Some players used to stuck there after warps
 //= 1.2 Added a few missing warps [MasterOfMuppets]
diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt
index 5f232974a..52a0ba3ce 100644
--- a/npc/warps/cities/lutie.txt
+++ b/npc/warps/cities/lutie.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lutie Warp Script
 //===== By: ==================================================
 //= Athena (1.0) Nana (1.1)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Lutie
 //===== Additional Comments: =================================
 //= 1.2a Re-fixed endless warping loop
diff --git a/npc/warps/cities/manuk.txt b/npc/warps/cities/manuk.txt
index c7d63169c..428687383 100644
--- a/npc/warps/cities/manuk.txt
+++ b/npc/warps/cities/manuk.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Manuk warp points.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 13.2+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Manuk
 //===== Additional Comments: =================================
 //= First version.
diff --git a/npc/warps/cities/mid_camp.txt b/npc/warps/cities/mid_camp.txt
index 8cf9d80cb..b1e26b0ae 100644
--- a/npc/warps/cities/mid_camp.txt
+++ b/npc/warps/cities/mid_camp.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Another World Warp Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= [Official Conversion]
 //= Warp Points for Another World
diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt
index 8b95ed497..57aaee338 100644
--- a/npc/warps/cities/morroc.txt
+++ b/npc/warps/cities/morroc.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Morroc Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
 //= Nana (1.2)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Morroc and Assassin Guild
 //===== Additional Comments: =================================
diff --git a/npc/warps/cities/moscovia.txt b/npc/warps/cities/moscovia.txt
index 408753e3a..c292ccde1 100644
--- a/npc/warps/cities/moscovia.txt
+++ b/npc/warps/cities/moscovia.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Moscovia City Warp Script
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Moscovia City
 //===== Additional Comments: =================================
@@ -15,30 +13,30 @@
 //= 1.2 Updated from jA
 //============================================================
 
-// ---[ Mansion ]--- 
+// ---[ Mansion ]---
 moscovia,256,138,0	warp	moskwarp1001	1,1,mosk_in,96,61
 mosk_in,93,61,0	warp	moskwarp1002	1,1,moscovia,255,140
 mosk_in,99,126,0	warp	moskwarp1003	1,1,mosk_in,21,116
 mosk_in,21,113,0	warp	moskwarp1004	1,1,mosk_in,99,123
-// ---[ Weapon House ]--- 
+// ---[ Weapon House ]---
 moscovia,185,188,0	warp	moskwarp1005	1,1,mosk_in,15,179
 mosk_in,12,179,0	warp	moskwarp1006	1,1,moscovia,186,191
 moscovia,203,171,0	warp	moskwarp1007	1,1,mosk_in,86,180
 mosk_in,89,180,0	warp	moskwarp1008	1,1,moscovia,204,169
-// ---[ Instrument House / Tool Dealer ]--- 
+// ---[ Instrument House / Tool Dealer ]---
 moscovia,223,174,0	warp	moskwarp1009	1,1,mosk_in,14,246
 mosk_in,11,246,0	warp	moskwarp1010	1,1,moscovia,222,176
-// ---[ Inn ]--- 
+// ---[ Inn ]---
 moscovia,229,208,0	warp	moskwarp1011	1,1,mosk_in,142,178
 mosk_in,142,175,0	warp	moskwarp1012	1,1,moscovia,227,207
 mosk_in,150,192,0	warp	moskwarp1013	1,1,mosk_in,204,188
 mosk_in,202,188,0	warp	moskwarp1014	1,1,mosk_in,148,192
-// ---[ Mansion ]--- 
+// ---[ Mansion ]---
 moscovia,256,179,0	warp	moskwarp1015	1,1,mosk_in,211,114
 mosk_in,211,111,0	warp	moskwarp1016	1,1,moscovia,253,179
 mosk_in,222,128,0	warp	moskwarp1017	1,1,mosk_in,288,118
 mosk_in,288,116,0	warp	moskwarp1018	1,1,mosk_in,222,126
-// ---[ Private House ]--- 
+// ---[ Private House ]---
 moscovia,205,98,0	warp	moskwarp1021	1,1,mosk_in,214,255
 mosk_in,214,252,0	warp	moskwarp1022	1,1,moscovia,203,96
 mosk_in,220,273,0	warp	moskwarp1023	1,1,mosk_in,152,275
diff --git a/npc/warps/cities/nameless.txt b/npc/warps/cities/nameless.txt
index 3c126e978..89614fd4b 100644
--- a/npc/warps/cities/nameless.txt
+++ b/npc/warps/cities/nameless.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Nameless Island Warp Script
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Nameless Island
 //===== Additional Comments: =================================
diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt
index 62bc29ad2..4e2539904 100644
--- a/npc/warps/cities/niflheim.txt
+++ b/npc/warps/cities/niflheim.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Niflheim Warp Script
 //===== By: ==================================================
 //= PKGINGO (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Niflheim
 //===== Additional Comments: =================================
diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt
index cd0d31f11..0bd5f4039 100644
--- a/npc/warps/cities/payon.txt
+++ b/npc/warps/cities/payon.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Payon Warps
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Muad Dib (1.0)
 //= Darkchild (1.1)
 //= Nana (1.3)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: ===================================== 
-//= Any rAthena Mod
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Payon warps
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Warps Done By Muad Dib, All Credits To Him
 //= 1.2 Removed Duplicated Warp
 //= 1.3 Separated and reorganized field and dungeons
diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt
index 93948e678..7327b2901 100644
--- a/npc/warps/cities/prontera.txt
+++ b/npc/warps/cities/prontera.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Prontera Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
 //= Nana (1.2)
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Prontera
 //===== Additional Comments: =================================
diff --git a/npc/warps/cities/splendide.txt b/npc/warps/cities/splendide.txt
index 4782f4c9f..21dcf744f 100644
--- a/npc/warps/cities/splendide.txt
+++ b/npc/warps/cities/splendide.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Splendide warp points.
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 13.2+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Splendide
 //===== Additional Comments: =================================
 //= First version.
diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt
index fee11e26a..91e006133 100644
--- a/npc/warps/cities/umbala.txt
+++ b/npc/warps/cities/umbala.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Umbala Warp Script
 //===== By: ==================================================
-//= Darkchild (1.0v A) 
+//= Darkchild (1.0v A)
 //= Athena (1.0v B)
 //= 1.1 (Akaru)
 //= Nana (1.2)
 //===== Current Version: =====================================
-//= 1.2 
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
+//= 1.2
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Warp Points for Umbala
 //===== Additional Comments: =================================
 //= 1.3 Rescripted to Aegis 10.3 Standards. [L0nE_W0lf]
@@ -28,7 +26,7 @@ umbala,100,203,0	warp	um_houseA2-1	1,1,um_in,163,69
 um_in,166,69,0	warp	um_houseA2-2	1,1,umbala,102,205
 umbala,107,130,0	warp	um_houseB1-1	1,1,um_in,99,66
 um_in,99,63,0	warp	um_houseB1-2	1,1,umbala,108,127
-umbala,220,189,0	script	um_shaman1-1	45,1,1,{
+umbala,220,189,0	script	um_shaman1-1	WARPNPC,1,1,{
 OnTouch:
 	if (event_umbala == 7) {
 		warp "um_in",32,71;
diff --git a/npc/warps/cities/veins.txt b/npc/warps/cities/veins.txt
index 251b0d14c..465b99d4b 100644
--- a/npc/warps/cities/veins.txt
+++ b/npc/warps/cities/veins.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Veins City Warp Script
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Warp Points for Veins
 //===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf]
@@ -47,9 +45,9 @@ ve_in02,13,19,0	warp	ve_factory1-2	1,1,veins,269,225
 veins,143,25,0	warp	veins1-1	1,1,ve_fild07,147,366
 veins,218,361,0	warp	veins2-1	1,1,ve_fild06,148,225
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Initial version [$ephiroth]
 //= 1.1 Removed Rachel City warp [Playtester]
 //= 1.2 Updated veins warp based on jA info [$ephiroth]
diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index 6503091ce..4d6ebee86 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yuno Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //= Sara-chan (1.1)
 //===== Current Version: =====================================
 //= 1.9
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
 //===== Description: =========================================
 //= Warp Points for Yuno
 //===== Additional Comments: =================================
@@ -90,113 +88,100 @@ yuno,245,147,0	warp	yun65	1,1,yuno_in01,101,88
 yuno_in01,101,85,0	warp	yun66	1,1,yuno,245,144
 
 // Yuno In05 (Entering Random Warps) -------------------------------------------
-yuno_in05,153,141,0	script	#yun63	45,1,1,{
-	if(rand(2)){
+yuno_in05,153,141,0	script	#yun63	WARPNPC,1,1,{
+	if (rand(2))
 		warp "yuno_in05",192,102;
-	} else {
+	else
 		warp "yuno_in05",145,82;
-	}
 	end;
 }
 // Yuno In05 (Random Warps - Cross Shaped) -------------------------------------
-yuno_in05,196,102,0	script	#yun64	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",169,102; end;
-w2:	warp "yuno_in05",128,82;  end;
-w3:	warp "yuno_in05",156,141; end;
+yuno_in05,196,102,0	script	#yun64	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",169,102; end;
+		case 1: warp "yuno_in05",128,82;  end;
+		case 2: warp "yuno_in05",156,141; end;
+	}
 }
-yuno_in05,181,116,0	script	#yun65	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+yuno_in05,181,116,0	script	#yun65	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
-yuno_in05,165,102,0	script	#yun66	45,1,1,{
-	if(rand(2)){
+yuno_in05,165,102,0	script	#yun66	WARPNPC,1,1,{
+	if (rand(2))
 		warp "yuno_in05",192,102;
-	} else {
+	else
 		warp "yuno_in05",145,82;
-	}
 	end;
 }
-yuno_in05,181,91,0	script	#yun67	45,1,1,{
-	if(rand(2)){
+yuno_in05,181,91,0	script	#yun67	WARPNPC,1,1,{
+	if (rand(2))
 		warp "yuno_in05",181,112;
-	} else {
+	else
 		warp "yuno_in05",176,48;
-	}
 	end;
 }
 // Yuno In05 (Random Warps - T-Shaped) -----------------------------------------
-yuno_in05,148,82,0	script	#yun68	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",169,102; end;
-w2:	warp "yuno_in05",128,82;  end;
-w3:	warp "yuno_in05",156,141; end;
+yuno_in05,148,82,0	script	#yun68	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",169,102; end;
+		case 1: warp "yuno_in05",128,82;  end;
+		case 2: warp "yuno_in05",156,141; end;
+	}
 }
-yuno_in05,125,82,0	script	#yun69	45,1,1,{
-	if(rand(2)){
+yuno_in05,125,82,0	script	#yun69	WARPNPC,1,1,{
+	if (rand(2))
 		warp "yuno_in05",192,102;
-	} else {
+	else
 		warp "yuno_in05",145,82;
-	}
 	end;
 }
-yuno_in05,136,71,0	script	#yun70	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,112; end;
-w2:	warp "yuno_in05",16,185;  end;
-w3:	warp "yuno_in05",176,48;  end;
+yuno_in05,136,71,0	script	#yun70	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,112; end;
+		case 1: warp "yuno_in05",16,185;  end;
+		case 2: warp "yuno_in05",176,48;  end;
+	}
 }
 // Yuno In05 (Random Warps - Other) --------------------------------------------
-yuno_in05,16,188,0	script	#yun71	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+yuno_in05,16,188,0	script	#yun71	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
-yuno_in05,176,9,0	script	#yun72	45,1,1,{
-	if(rand(2)){
+yuno_in05,176,9,0	script	#yun72	WARPNPC,1,1,{
+	if (rand(2))
 		warp "yuno_in05",181,112;
-	} else {
+	else
 		warp "yuno_in05",176,48;
-	}
 	end;
 }
-yuno_in05,176,52,0	script	#yun73	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+yuno_in05,176,52,0	script	#yun73	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
 // Yuno In05 (Destination - Room) ----------------------------------------------
-yuno_in05,40,178,0	script	#yun74	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+yuno_in05,40,178,0	script	#yun74	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
-yuno_in05,47,186,0	script	#yun75	45,1,1,{
-	set @warp0,rand(3);
-	if(@warp0==1) goto w2;
-	if(@warp0==2) goto w3;
-	warp "yuno_in05",181,94; end;
-w2:	warp "yuno_in05",176,13; end;
-w3:	warp "yuno_in05",136,75; end;
+yuno_in05,47,186,0	script	#yun75	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "yuno_in05",181,94; end;
+		case 1: warp "yuno_in05",176,13; end;
+		case 2: warp "yuno_in05",136,75; end;
+	}
 }
 // Yuno In05 (Destination - Escaped Random Warps) ------------------------------
 yuno_in05,31,167,0	warp	yun76	1,1,yuno_in05,50,85
diff --git a/npc/warps/dungeons/alde_dun.txt b/npc/warps/dungeons/alde_dun.txt
index c711ecd5c..f74bf7c48 100644
--- a/npc/warps/dungeons/alde_dun.txt
+++ b/npc/warps/dungeons/alde_dun.txt
@@ -26,12 +26,11 @@ alde_dun02,122,169,0	warp	ald006	2,2,c_tower3,47,41
 alde_dun02,187,234,0	warp	ald007	2,2,c_tower3,65,147
 //============================================================
 //= Random B2 ================================================
-alde_dun02,267,41,4	script	ald008r	45,1,1,{
-	if(rand(2)) {
+alde_dun02,267,41,4	script	ald008r	WARPNPC,1,1,{
+	if (rand(2))
 		warp "c_tower3",168,252;
-	} else {
+	else
 		warp "alde_dun02",262,141;
-	}
 	end;
 }
 alde_dun03,12,267,0	warp	aldd09	2,2,alde_dun02,273,250
@@ -41,23 +40,21 @@ alde_dun03,276,48,0	warp	ald012	2,2,c_tower1,235,223
 //============================================================
 //7(npc)
 //= Random B3-1 ================================================
-alde_dun03,130,125,4	script	ald014r	45,1,1,{
-	set @r,rand(3);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-		warp "c_tower2",228,267; end;
-	w2:	warp "alde_dun03",130,130; end;
-	w3:	warp "c_tower3",252,29; end;
+alde_dun03,130,125,4	script	ald014r	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "c_tower2",228,267; end;
+		case 1: warp "alde_dun03",130,130; end;
+		case 2: warp "c_tower3",252,29; end;
+	}
 }
 //============================================================
 //= Random 3-2 ===============================================
-alde_dun03,171,127,4	script	ald015r	45,1,1,{
-	set @r,rand(4);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-		warp "c_tower2",13,282; end;
-	w2:	warp "alde_dun03",175,131; end;
-	w3:	warp "c_tower3",235,7; end;
+alde_dun03,171,127,4	script	ald015r	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "c_tower2",13,282; end;
+		case 1: warp "alde_dun03",175,131; end;
+		case 2: warp "c_tower3",235,7; end;
+	}
 }
 alde_dun04,80,273,0	warp	aldd016	2,2,alde_dun03,263,26
 alde_dun04,207,225,0	warp	ald017	1,1,c_tower3,7,34
@@ -65,14 +62,12 @@ alde_dun04,215,192,0	warp	ald018	1,1,c_tower2,148,283
 alde_dun04,32,74,0	warp	aldd19	1,1,alde_dun02,187,239
 alde_dun04,208,58,0	warp	aldd20	2,2,alde_dun04,268,74
 alde_dun04,272,74,0	warp	aldd021	2,2,alde_dun04,204,62
-alde_dun04,80,34,4	script	ald022r	45,1,1,{
-	set @r,rand(4);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-	if(@r==3) goto w4;
-		warp "c_tower2",13,282; end;
-	w2:	warp "alde_dun03",175,131; end;
-	w3:	warp "c_tower3",235,7; end;
-	w4:	warp "alde_dun04",84,36; end;
+alde_dun04,80,34,4	script	ald022r	WARPNPC,1,1,{
+	switch(rand(4)) {
+		case 0: warp "c_tower2",13,282; end;
+		case 1: warp "alde_dun03",175,131; end;
+		case 2: warp "c_tower3",235,7; end;
+		case 3: warp "alde_dun04",84,36; end;
+	}
 }
 //============================================================
diff --git a/npc/warps/dungeons/ama_dun.txt b/npc/warps/dungeons/ama_dun.txt
index 0356ca8a0..70eab1f02 100644
--- a/npc/warps/dungeons/ama_dun.txt
+++ b/npc/warps/dungeons/ama_dun.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.2
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Amatsu Dungeon
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt
index 68cc30d59..225631b7c 100644
--- a/npc/warps/dungeons/ayo_dun.txt
+++ b/npc/warps/dungeons/ayo_dun.txt
@@ -15,9 +15,9 @@ ayo_dun01,274,14,0	warp	ayo_dun1-2	1,1,ayo_fild02,279,150
 ayo_dun02,24,22,0	warp	ayo_dun2-1	1,1,ayo_dun01,24,279
 ayo_dun02,276,22,0	warp	ayo_dun2-2	1,1,ayo_dun01,24,279
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Splitted 2 files [Lupus]
 //= Should some warps be disabled due to Dungeon Quest?
 //============================================================
diff --git a/npc/warps/dungeons/beach_dun.txt b/npc/warps/dungeons/beach_dun.txt
index d2042a6de..69eb347e0 100644
--- a/npc/warps/dungeons/beach_dun.txt
+++ b/npc/warps/dungeons/beach_dun.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.1
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Comodo Beach Dungeon warp script
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/dungeons/c_tower.txt b/npc/warps/dungeons/c_tower.txt
index 572df52bf..b7b46d16d 100644
--- a/npc/warps/dungeons/c_tower.txt
+++ b/npc/warps/dungeons/c_tower.txt
@@ -22,23 +22,21 @@ c_tower2,273,26,0	warp	clt005	1,1,c_tower1,235,223
 //============================================================
 //= Level 2 ==================================================
 //= Random 2-1 ===============================================
-c_tower2,13,288,4	script	clt006r	45,1,1,{
-	set @r,rand(3);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-		warp "c_tower2",13,282; end;
-	w2:	warp "alde_dun03",175,131; end;
-	w3:	warp "c_tower3",235,7; end;
+c_tower2,13,288,4	script	clt006r	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "c_tower2",13,282; end;
+		case 1: warp "alde_dun03",175,131; end;
+		case 2: warp "c_tower3",235,7; end;
+	}
 }
 //============================================================
 //= Random 2-2 ===============================================
-c_tower2,223,267,4	script	clt007r	45,1,1,{
-	set @r,rand(3);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-		warp "c_tower2",288,267; end;
-	w2:	warp "alde_dun03",130,130; end;
-	w3:	warp "c_tower3",252,29; end;
+c_tower2,223,267,4	script	clt007r	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "c_tower2",288,267; end;
+		case 1: warp "alde_dun03",130,130; end;
+		case 2: warp "c_tower3",252,29; end;
+	}
 }
 //============================================================
 //= Level 3 ==================================================
@@ -49,33 +47,30 @@ c_tower3,42,41,0	warp	clt012	1,1,alde_dun02,127,169
 c_tower3,146,8,0	warp	clt013	1,1,c_tower1,235,223
 //============================================================
 //= Random 3-1 ===============================================
-c_tower3,163,252,4	script	clt014r	45,1,1,{
-	if(rand(2)) {
+c_tower3,163,252,4	script	clt014r	WARPNPC,1,1,{
+	if (rand(2))
 		warp "c_tower3",168,252;
-	} else {
+	else
 		warp "alde_dun02",262,41;
-	}
 	end;
 }
 //============================================================
 //= Random 3-2 ===============================================
-c_tower3,240,7,4	script	clt015r	45,1,1,{
-	set @r,rand(3);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-		warp "c_tower2",13,282; end;
-	w2:	warp "alde_dun03",175,131; end;
-	w3:	warp "c_tower3",235,7; end;
+c_tower3,240,7,4	script	clt015r	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "c_tower2",13,282; end;
+		case 1: warp "alde_dun03",175,131; end;
+		case 2: warp "c_tower3",235,7; end;
+	}
 }
 //============================================================
 //= Random 3-3 ===============================================
-c_tower3,252,24,4	script	clt016r	45,1,1,{
-	set @r,rand(3);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-		warp "c_tower2",228,267; end;
-	w2:	warp "alde_dun03",130,130; end;
-	w3:	warp "c_tower3",252,29; end;
+c_tower3,252,24,4	script	clt016r	WARPNPC,1,1,{
+	switch(rand(3)) {
+		case 0: warp "c_tower2",228,267; end;
+		case 1: warp "alde_dun03",130,130; end;
+		case 2: warp "c_tower3",252,29; end;
+	}
 }
 //============================================================
 //= Level 4 ==================================================
@@ -91,61 +86,51 @@ c_tower4,198,59,0	warp	clt025	1,1,c_tower4,152,98
 c_tower4,204,57,0	warp	clt026	1,1,c_tower4,65,77
 //============================================================
 //= Random 4-1 ===============================================
-c_tower4,75,156,4	script	clt027r	45,0,0,{
-	set @r,rand(4);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-	if(@r==3) goto w4;
-		warp "c_tower3",168,252; end;
-	w2:	warp "alde_dun02",262,41; end;
-	w3:	warp "c_tower4",73,154; end;
-	w4:	warp "c_tower4",140,149; end;
+c_tower4,75,156,4	script	clt027r	WARPNPC,0,0,{
+	switch(rand(4)) {
+		case 0: warp "c_tower3",168,252; end;
+		case 1: warp "alde_dun02",262,41; end;
+		case 2: warp "c_tower4",73,154; end;
+		case 3: warp "c_tower4",140,149; end;
+	}
 }
 //============================================================
 //= Random 4-2 ===============================================
-c_tower4,68,79,4	script	clt028r	45,0,0,{
-	set @r,rand(4);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-	if(@r==3) goto w4;
-		warp "c_tower2",13,282; end;
-	w2:	warp "alde_dun03",175,131; end;
-	w3:	warp "c_tower3",235,7; end;
-	w4:	warp "c_tower4",65,77; end;
+c_tower4,68,79,4	script	clt028r	WARPNPC,0,0,{
+	switch(rand(4)) {
+		case 0: warp "c_tower2",13,282; end;
+		case 1: warp "alde_dun03",175,131; end;
+		case 2: warp "c_tower3",235,7; end;
+		case 3: warp "c_tower4",65,77; end;
+	}
 }
 //============================================================
 //= Random 4-3 ===============================================
-c_tower4,142,151,4	script	clt029r	45,0,0,{
-	set @r,rand(4);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-	if(@r==3) goto w4;
-		warp "c_tower3",168,252; end;
-	w2:	warp "alde_dun02",262,41; end;
-	w3:	warp "c_tower4",73,154; end;
-	w4: warp "c_tower4",140,149; end;
+c_tower4,142,151,4	script	clt029r	WARPNPC,0,0,{
+	switch(rand(4)) {
+		case 0: warp "c_tower3",168,252; end;
+		case 1: warp "alde_dun02",262,41; end;
+		case 2: warp "c_tower4",73,154; end;
+		case 3: warp "c_tower4",140,149; end;
+	}
 }
 //============================================================
 //= Random 4-4 ===============================================
-c_tower4,151,96,4	script	clt030r	45,0,0,{
-	set @r,rand(4);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-	if(@r==3) goto w4;
-		warp "c_tower2",228,267; end;
-	w2:	warp "alde_dun03",130,130; end;
-	w3:	warp "c_tower3",252,29; end;
-	w4:	warp "c_tower4",152,95; end;
+c_tower4,151,96,4	script	clt030r	WARPNPC,0,0,{
+	switch(rand(4)) {
+		case 0: warp "c_tower2",228,267; end;
+		case 1: warp "alde_dun03",130,130; end;
+		case 2: warp "c_tower3",252,29; end;
+		case 3: warp "c_tower4",152,95; end;
+	}
 }
 //============================================================
 //= Random 4-5 ===============================================
-c_tower4,189,40,4	script	clt031r	45,2,2,{
-	set @r,rand(4);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-	if(@r==3) goto w4;
-		warp "c_tower2",228,267; end;
-	w2:	warp "alde_dun03",130,130; end;
-	w3:	warp "c_tower3",252,29; end;
-	w4:	warp "c_tower4",152,95; end;
+c_tower4,189,40,4	script	clt031r	WARPNPC,2,2,{
+	switch(rand(4)) {
+		case 0: warp "c_tower2",228,267; end;
+		case 1: warp "alde_dun03",130,130; end;
+		case 2: warp "c_tower3",252,29; end;
+		case 3: warp "c_tower4",152,95; end;
+	}
 }
diff --git a/npc/warps/dungeons/ein_dun.txt b/npc/warps/dungeons/ein_dun.txt
index c0b1f69be..20de88fad 100644
--- a/npc/warps/dungeons/ein_dun.txt
+++ b/npc/warps/dungeons/ein_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Einbroch Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.3), SSUNNY@YOUNG(1.4)
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Einbroch
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/gef_dun.txt b/npc/warps/dungeons/gef_dun.txt
index 967c91c15..b00943d57 100644
--- a/npc/warps/dungeons/gef_dun.txt
+++ b/npc/warps/dungeons/gef_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Geffen Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Geffen Tower
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt
index 8e02b8a31..829b60dc9 100644
--- a/npc/warps/dungeons/gon_dun.txt
+++ b/npc/warps/dungeons/gon_dun.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Kunlun Dungeon Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Kunlun dungeon
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/dungeons/ice_dun.txt b/npc/warps/dungeons/ice_dun.txt
index dc6983008..cd48a81c1 100644
--- a/npc/warps/dungeons/ice_dun.txt
+++ b/npc/warps/dungeons/ice_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Ice Dungeon Warp Script
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Ice Dungeon
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/in_sphinx.txt b/npc/warps/dungeons/in_sphinx.txt
index 70f1f63f8..24f5e099b 100644
--- a/npc/warps/dungeons/in_sphinx.txt
+++ b/npc/warps/dungeons/in_sphinx.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Morroc Sphinx Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Sphinx Dungeon
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/iz_dun.txt b/npc/warps/dungeons/iz_dun.txt
index 0ccc42db9..e52d7919e 100644
--- a/npc/warps/dungeons/iz_dun.txt
+++ b/npc/warps/dungeons/iz_dun.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Izlude Dungeon Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
 //= Nana (1.1)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Bibilyn Island & Undersea Cave
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/juperos.txt b/npc/warps/dungeons/juperos.txt
index 900b79d86..9ca84315f 100644
--- a/npc/warps/dungeons/juperos.txt
+++ b/npc/warps/dungeons/juperos.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Juperos Dungeon Warp Script
 //===== By: ==================================================
 //= Muad-Dib (1.0)
 //===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: =====================================
-//= rAthena with independant npctimer support; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Juperos Dungeon
 //===== Additional Comments: =================================
@@ -16,7 +14,7 @@
 //= 1.4 Added attachnpctimer to the initnpctimer calls. [Skotlex]
 //= 1.5 Implemented a part of the Juperos quest [MasterOfMuppets]
 //= 1.6 Removed area1 and area2 warps. These are event warps. [L0ne_W0lf]
-//=	Added static warps for gate -> area1/2/elevator.
+//=     Added static warps for gate -> area1/2/elevator.
 //= 1.6a COrrected new warps [L0ne_W0lf]
 //= 1.7 Removed duplicated quest warp portal [Brainstorm]
 //============================================================
diff --git a/npc/warps/dungeons/kh_dun.txt b/npc/warps/dungeons/kh_dun.txt
index c19e324ca..eaee1171a 100644
--- a/npc/warps/dungeons/kh_dun.txt
+++ b/npc/warps/dungeons/kh_dun.txt
@@ -1,18 +1,16 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Kiel Dungeon Warp Script
 //===== By: ==================================================
 //= Lost Kakashi
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= rAthena 1.0
 //===== Description: =========================================
 //= Warp Points for the Kiel Dungeon
 //===== Additional Comments: =================================
 //= 1.1 Added official Kiel Dungeon entrance [Playtester]
 //= 1.2 Changed warps because of Kiel quest [Playtester]
 //= 1.3 Added second floor exit. [L0ne_W0lf]
-//=	Corrected coordinated for some of the other warps.
+//=     Corrected coordinated for some of the other warps.
 //============================================================
 
 //= Kiel Dungeon =============================================
@@ -26,7 +24,7 @@ kh_dun01,63,7,0	warp	kh_dun_02	1,1,kh_dun01,227,176
 kh_dun01,232,176,0	warp	kh_dun_03	1,1,kh_dun01,63,12
 
 //Second Floor -> First floor Random warp
-kh_dun02,43,195,0	script	kh_dun04	45,1,1,{
+kh_dun02,43,195,0	script	kh_dun04	WARPNPC,1,1,{
 OnTouch:
 	if (rand(1,2) == 1) {
 		warp "kh_dun01",41,206;
diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt
index d8d0f7c5e..59277921d 100644
--- a/npc/warps/dungeons/lhz_dun.txt
+++ b/npc/warps/dungeons/lhz_dun.txt
@@ -1,21 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lighthalzen Dungeon Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
 //===== Current Version: =====================================
 //= 2.1b
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Lighthalzen Dungeon
 //===== Additional Comments: =================================
-//= No Comment!
 //= 1.1 Added temp restriction by Azazel [Lupus]
 //= 1.2 Optimized [Lupus]
-//= and fixed 005 and 005a warps coords, thanks to Justin84 
+//=     and fixed 005 and 005a warps coords, thanks to Justin84
 //= 1.3 Fixed entrance condition check, thanx2Daegaladh [Lupus]
 //= 1.4 Added coords of secret dungeon entrance, thanks to Justin84
-//= proved with screenshots [Lupus]
+//=     proved with screenshots [Lupus]
 //= 1.5a thx2 Justin84, some additions and fixes [Lupus]
 //= 1.5b re-enabled main entrance warp [Lupus] <-reverted 1.5c
 //= 1.6 Updated entrances, added Cube room warps, thanx 2 Justin84
@@ -26,8 +23,8 @@
 //= 1.9 Removed duplicates [Toms]
 //= 2.0 Now use MISC_QUEST&512 instead of 'hzdun' [Lupus]
 //= 2.1 Updated all standard dungeon warps. [L0ne_W0lf]
-//=	Updated Sewer pipe dungeon entrance.
-//=	Removed dialog from level 3 entrance warp.
+//=     Updated Sewer pipe dungeon entrance.
+//=     Removed dialog from level 3 entrance warp.
 //= 2.1a Updated 3rd floor warp. Again... [L0ne_W0lf]
 //= 2.1b Fixed reverse level requirement in 3rd floor warp. [L0ne_W0lf]
 //============================================================
@@ -39,7 +36,7 @@ lhz_dun01,149,9,0	warp	lhz_dun3-1	1,1,lhz_dun02,153,19
 lhz_dun02,146,19,0	warp	lhz_dun3-2	1,1,lhz_dun01,144,9
 lhz_dun01,18,145,0	warp	lhz_dun4-1	1,1,lhz_dun02,17,150
 lhz_dun02,17,156,0	warp	lhz_dun4-2	1,1,lhz_dun01,18,150
-lhz_dun02,149,149,4	script	lhz_dun5-1	45,2,2,{
+lhz_dun02,149,149,4	script	lhz_dun5-1	WARPNPC,2,2,{
 OnTouch:
 	if ((Upper != 1 && BaseLevel<95) || (Upper == 1 && BaseLevel<90)) {
 		warp "lhz_dun02",145,149;
@@ -53,7 +50,7 @@ lhz_dun03,139,137,0	warp	lhz_dun5-2	1,1,lhz_dun02,149,142
 
 //--------------------------Sewer Pipe--------------------------
 
-lighthalzen,313,301,0	script	Sewer Pipe#lt	111,{
+lighthalzen,313,301,0	script	Sewer Pipe#lt	HIDDEN_NPC,{
 	if (MISC_QUEST&512) {
 		mes "^3355FFYou found some sort";
 		mes "of large sewage pipe.";
@@ -91,54 +88,54 @@ lhz_cube,177,96,0	warp	lhzcube4	1,1,lighthalzen,310,302
 // -3 are warps facing west.
 // -4 are warps facing north.
 //----------------- Room 66 74 -------------------------------
-lhz_cube,74,74,0	script	cubew01-1	45,1,1,{
+lhz_cube,74,74,0	script	cubew01-1	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 lhz_cube,66,67,0	warp	cubew01-2	2,2,lhz_cube,10,18
-lhz_cube,59,74,0	script	cubew01-3	45,1,1,{
+lhz_cube,59,74,0	script	cubew01-3	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,66,82,0	script	cubew01-4	45,1,1,{
+lhz_cube,66,82,0	script	cubew01-4	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 //----------------- Room 66 136 ------------------------------
 lhz_cube,74,136,0	warp	cubew02-1	2,2,lhz_cube,10,193
-lhz_cube,66,129,0	script	cubew02-2	45,1,1,{
+lhz_cube,66,129,0	script	cubew02-2	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,59,136,0	script	cubew02-3	45,1,1,{
+lhz_cube,59,136,0	script	cubew02-3	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,66,144,0	script	cubew02-4	45,1,1,{
+lhz_cube,66,144,0	script	cubew02-4	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 //----------------- Room 67 193 ------------------------------
-lhz_cube,74,192,0	script	cubew03-1	45,1,1,{
+lhz_cube,74,192,0	script	cubew03-1	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,67,185,0	script	cubew03-2	45,1,1,{
+lhz_cube,67,185,0	script	cubew03-2	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,59,192,0	script	cubew03-3	45,1,1,{
+lhz_cube,59,192,0	script	cubew03-3	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 lhz_cube,67,200,0	warp	cubew03-4	2,2,lhz_cube,10,136
 //----------------- Room 66 18 -------------------------------
-lhz_cube,74,18,0	script	cubew04-1	45,1,1,{
+lhz_cube,74,18,0	script	cubew04-1	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 lhz_cube,66,11,0	warp	cubew04-2	2,2,lhz_cube,10,18
-lhz_cube,59,18,0	script	cubew04-3	45,1,1,{
+lhz_cube,59,18,0	script	cubew04-3	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
@@ -146,61 +143,61 @@ lhz_cube,66,26,0	warp	cubew04-4	2,2,lhz_cube,123,18
 //----------------- Room 66 18 -------------------------------
 lhz_cube,18,18,0	warp	cubew05-1	2,2,lhz_cube,10,193
 lhz_cube,10,11,0	warp	cubew05-2	2,2,lhz_cube,123,18
-lhz_cube,3,18,0	script	cubew05-3	45,1,1,{
+lhz_cube,3,18,0	script	cubew05-3	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,10,26,0	script	cubew05-4	45,1,1,{
+lhz_cube,10,26,0	script	cubew05-4	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 //----------------- Room 10 74 -------------------------------
-lhz_cube,18,74,0	script	cubew06-1	45,1,1,{
+lhz_cube,18,74,0	script	cubew06-1	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 lhz_cube,10,67,0	warp	cubew06-2	2,2,lhz_cube,123,18
 lhz_cube,3,74,0	warp	cubew06-3	2,2,lhz_cube,66,18
-lhz_cube,10,82,0	script	cubew06-4	45,1,1,{
+lhz_cube,10,82,0	script	cubew06-4	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 //----------------- Room 10 136 ------------------------------
 lhz_cube,18,136,0	warp	cubew07-1	2,2,lhz_cube,10,74
-lhz_cube,10,129,0	script	cubew07-2	45,1,1,{
+lhz_cube,10,129,0	script	cubew07-2	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,3,136,0	script	cubew07-3	45,1,1,{
+lhz_cube,3,136,0	script	cubew07-3	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,10,144,0	script	cubew07-4	45,1,1,{
+lhz_cube,10,144,0	script	cubew07-4	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 //----------------- Room 10 193 ------------------------------
-lhz_cube,18,192,0	script	cubew08-1	45,1,1,{
+lhz_cube,18,192,0	script	cubew08-1	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,10,185,0	script	cubew08-2	45,1,1,{
+lhz_cube,10,185,0	script	cubew08-2	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 lhz_cube,3,192,0	warp	cubew08-3	2,2,lhz_cube,10,74
 lhz_cube,10,200,0	warp	cubew08-4	2,2,lhz_cube,66,18
 //----------------- Room 123 18 ------------------------------
-lhz_cube,130,18,0	script	cubew09-1	45,1,1,{
+lhz_cube,130,18,0	script	cubew09-1	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
-lhz_cube,123,11,0	script	cubew09-2	45,1,1,{
+lhz_cube,123,11,0	script	cubew09-2	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
 lhz_cube,115,18,0	warp	cubew09-3	2,2,lhz_cube,248,184
-lhz_cube,123,26,0	script	cubew09-4	45,1,1,{
+lhz_cube,123,26,0	script	cubew09-4	WARPNPC,1,1,{
 	callfunc "randomw";
 	end;
 }
diff --git a/npc/warps/dungeons/lou_dun.txt b/npc/warps/dungeons/lou_dun.txt
index dc4c4a0e7..51afe24f9 100644
--- a/npc/warps/dungeons/lou_dun.txt
+++ b/npc/warps/dungeons/lou_dun.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Louyang Dungeon Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version 6.0+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Louyang
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/dungeons/mag_dun.txt b/npc/warps/dungeons/mag_dun.txt
index b81bad620..58a2f4bae 100644
--- a/npc/warps/dungeons/mag_dun.txt
+++ b/npc/warps/dungeons/mag_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Yuno Dungeon Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
 //===== Description: =========================================
 //= Warp Points for Yuno Dungeon
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/mjo_dun.txt b/npc/warps/dungeons/mjo_dun.txt
index 1c23dc572..66874e71b 100644
--- a/npc/warps/dungeons/mjo_dun.txt
+++ b/npc/warps/dungeons/mjo_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Coal Mine Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Coal Mines
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/moc_pryd.txt b/npc/warps/dungeons/moc_pryd.txt
index fc50e2a14..9c5982ae2 100644
--- a/npc/warps/dungeons/moc_pryd.txt
+++ b/npc/warps/dungeons/moc_pryd.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Morroc Pyramid Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Morroc Pyramid
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt
index 30dc257e7..f9a195d06 100644
--- a/npc/warps/dungeons/mosk_dun.txt
+++ b/npc/warps/dungeons/mosk_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Moscovia Dungeon Warp Script
 //===== By: ==================================================
 //= Kisuka, $ephiroth
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Moscovia Dungeon
 //===== Additional Comments: =================================
@@ -19,7 +17,7 @@ mosk_fild02,190,257,0	warp	moscoviawarp0401	1,1,mosk_dun01,189,45
 mosk_dun01,189,42,0	warp	moscoviawarp0501	1,1,mosk_fild02,190,254
 mosk_in,215,36,0	warp	babayagaout		1,1,mosk_dun02,53,217
 
-mosk_dun02,53,220,4	script	#babayagain	45,1,1,{
+mosk_dun02,53,220,4	script	#babayagain	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (mos_nowinter == 11) {
@@ -117,7 +115,7 @@ OnTouch:
 	}
 }
 
-mosk_dun02,53,215,3	script	Soldier1#mos	966,{
+mosk_dun02,53,215,3	script	Soldier1#mos	4_M_RUSKNIGHT,{
 	mes "[Soldier]";
 	mes "We're the Csar's soldiers.";
 	mes "We're called out for emergencies,";
@@ -133,7 +131,7 @@ OnEnable:
 	end;
 }
 
-mosk_dun02,50,217,3	script	Soldier2#mos	966,{
+mosk_dun02,50,217,3	script	Soldier2#mos	4_M_RUSKNIGHT,{
 	mes "[Soldier]";
 	mes "We're the Csar's soldiers.";
 	mes "We're called out for emergencies,";
@@ -150,7 +148,7 @@ OnEnable:
 }
 
 
-mosk_dun02,56,217,5	script	Soldier3#mos	966,{
+mosk_dun02,56,217,5	script	Soldier3#mos	4_M_RUSKNIGHT,{
 	mes "[Soldier]";
 	mes "We're the Csar's soldiers.";
 	mes "We're called out for emergencies,";
@@ -166,14 +164,14 @@ OnEnable:
 	end;
 }
 
-mosk_dun01,170,164,3	script	Milestone#1	111,{
+mosk_dun01,170,164,3	script	Milestone#1	HIDDEN_NPC,{
 	mes "- There is writing on a big rock. -";
 	next;
 	mes "^3131FF- Those who serve the Sun will die, Go to the North. -^000000";
 	close;
 }
 
-mosk_dun01,207,276,3	script	Milestone#1-2	111,{
+mosk_dun01,207,276,3	script	Milestone#1-2	HIDDEN_NPC,{
 	mes "- There is writing on a big rock. -";
 	next;
 	mes "^3131FF- Those who advance may get hurt but are courageous of heart and those who move back will remain safe.";
@@ -189,7 +187,7 @@ mosk_dun01,207,276,3	script	Milestone#1-2	111,{
 	close;
 }
 
-mosk_dun01,264,191,3	script	Milestone#1-3	111,{
+mosk_dun01,264,191,3	script	Milestone#1-3	HIDDEN_NPC,{
 	mes "- There is writing on a big rock. -";
 	next;
 	mes "^3131FF- Those who advance may get hurt but are brave of heart and those who move back will remain safe.";
@@ -205,7 +203,7 @@ mosk_dun01,264,191,3	script	Milestone#1-3	111,{
 	close;
 }
 
-mosk_dun02,168,28,3	script	Milestone#2-1	111,{
+mosk_dun02,168,28,3	script	Milestone#2-1	HIDDEN_NPC,{
 	mes "- There is writing on a big rock. -";
 	next;
 	mes "^3131FF- Those who advance may get hurt but are valorous of heart and those who move back will remain safe.";
@@ -221,7 +219,7 @@ mosk_dun02,168,28,3	script	Milestone#2-1	111,{
 	close;
 }
 
-mosk_dun02,268,117,3	script	Milestone#2-3	111,{
+mosk_dun02,268,117,3	script	Milestone#2-3	HIDDEN_NPC,{
 	mes "- There is writing on a big rock. -";
 	next;
 	mes "^3131FF- Those who step forward will gain honor but may die, those who step backward will have courage but may still get hurt.";
@@ -237,7 +235,7 @@ mosk_dun02,268,117,3	script	Milestone#2-3	111,{
 	close;
 }
 
-mosk_dun03,27,131,3	script	Milestone#3-2	111,{
+mosk_dun03,27,131,3	script	Milestone#3-2	HIDDEN_NPC,{
 	mes "- There is writing on a big rock. -";
 	next;
 	mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage.";
@@ -253,7 +251,7 @@ mosk_dun03,27,131,3	script	Milestone#3-2	111,{
 	close;
 }
 
-mosk_dun03,119,46,3	script	Milestone#3-1	111,{
+mosk_dun03,119,46,3	script	Milestone#3-1	HIDDEN_NPC,{
 	mes "There is writing on a big rock.";
 	next;
 	mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage.";
@@ -269,14 +267,14 @@ mosk_dun03,119,46,3	script	Milestone#3-1	111,{
 	close;
 }
 
-mosk_dun01,194,43,3	script	Milestone#1-1	111,{
+mosk_dun01,194,43,3	script	Milestone#1-1	HIDDEN_NPC,{
 	mes "- There is writing on a big rock. -";
 	next;
 	mes "- If you want to protect your life, go back -";
 	close;
 }
 
-mosk_fild02,198,53,3	script	Ship#mos_dun	111,{
+mosk_fild02,198,53,3	script	Ship#mos_dun	HIDDEN_NPC,{
 	mes "- You find a ship at anchor. -";
 	next;
 	if(select("Take the ship and go back to the village.:Explore more.") == 1) {
diff --git a/npc/warps/dungeons/odin.txt b/npc/warps/dungeons/odin.txt
index b87aa430f..33cf0272d 100644
--- a/npc/warps/dungeons/odin.txt
+++ b/npc/warps/dungeons/odin.txt
@@ -1,20 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Odin Temple Warp Script
 //===== By: ==================================================
 //= birkiczd  (1.0)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Odin Temple
 //===== Additional Comments: =================================
 //= 1.1 Move the Saylor from Hugel.txt here. [Poki#3]
-//=	Hako's Sprite, cords and price is official. The text is not.
+//=     Hako's Sprite, cords and price is official. The text is not.
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Official warps [Playtester]
 //= 1.4 Moved Sailor to Hugel quest file since he's part of
-//= Odin's Excavation Quest. [SinSloth]
+//=     Odin's Excavation Quest. [SinSloth]
 //============================================================
 
 odin_tem01,378,182,0	warp	odin01	1,1,odin_tem02,28,180
diff --git a/npc/warps/dungeons/orcsdun.txt b/npc/warps/dungeons/orcsdun.txt
index 4f067f6c2..01d40a5b1 100644
--- a/npc/warps/dungeons/orcsdun.txt
+++ b/npc/warps/dungeons/orcsdun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Orc Dungeon Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Orc Dungeon
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/pay_dun.txt b/npc/warps/dungeons/pay_dun.txt
index 5f513e899..e6c041188 100644
--- a/npc/warps/dungeons/pay_dun.txt
+++ b/npc/warps/dungeons/pay_dun.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Payon Cave Warps
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Nana (1.0)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: ===================================== 
-//= Any rAthena Mod
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Payon Dungeon Warps
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1a Fixed 'payd04r' warping players to a non-existant tile [MasterOfMuppets]
-//============================================================ 
+//============================================================
 
 //= Payon Cave ===============================================
 pay_dun00,184,33,0	warp	payd01	2,7,pay_dun01,19,33
@@ -20,15 +18,13 @@ pay_dun01,286,25,0	warp	payd02	2,7,pay_dun02,19,63
 pay_dun02,137,128,0	warp	payd03	4,1,pay_dun03,155,159
 pay_dun02,16,63,0	warp	payd02-1	2,7,pay_dun01,283,28
 pay_dun03,155,161,0	warp	payd03-1	2,1,pay_dun02,137,126
-pay_dun03,127,62,4	script	payd04r	45,2,2,{
-	set @r,rand(4);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-	if(@r==3) goto w4;
-		warp "pay_dun04",201,204; end;
-	w2:	warp "pay_dun04",189,43; end;
-	w3:	warp "pay_dun04",43,40; end;
-	w4:	warp "pay_dun04",34,202; end;
+pay_dun03,127,62,4	script	payd04r	WARPNPC,2,2,{
+	switch(rand(4)) {
+		case 0: warp "pay_dun04",201,204; end;
+		case 1: warp "pay_dun04",189,43; end;
+		case 2: warp "pay_dun04",43,40; end;
+		case 3: warp "pay_dun04",34,202; end;
+	}
 }
 pay_dun04,191,41,0	warp	payd04-2	1,1,pay_dun03,124,62
 pay_dun04,202,206,0	warp	payd04-3	1,1,pay_dun03,124,62
diff --git a/npc/warps/dungeons/prt_maze.txt b/npc/warps/dungeons/prt_maze.txt
index 6cfd23abd..03ca59de5 100644
--- a/npc/warps/dungeons/prt_maze.txt
+++ b/npc/warps/dungeons/prt_maze.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Prontera Dungeons Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Prontera Dungeons
 //===== Additional Comments: =================================
@@ -108,15 +106,13 @@ prt_maze02,100,182,0	warp	mazewarp5202	1,1,prt_maze03,182,88	/*To No.3-15*/
 prt_maze03,22,194,0	warp	mazewarp5301	1,1,prt_maze03,175,48	/*To No.3-20*/
 prt_maze03,5,186,0	warp	mazewarp5302	1,1,prt_maze03,151,134	/*To No.3-9*/
 //3rd Floor No.02
-prt_maze03,58,194,0	script	#mazewarp5303	45,1,1,{
-	set	@w,rand(4);
-	if(@w==1)goto w2;
-	if(@w==2)goto w3;
-	if(@w==3)goto w4;
-		warp "prt_maze03",98,151; end;	/*To No.3-8*/
-	w2:	warp "prt_maze03",137,128; end;	/*To No.3-9*/
-	w3:	warp "prt_maze03",14,71; end;	/*To No.3-16*/
-	w4:	warp "prt_maze03",54,8; end;	/*To No.3-22*/
+prt_maze03,58,194,0	script	#mazewarp5303	WARPNPC,1,1,{
+	switch(rand(4)) {
+		case 0: warp "prt_maze03",98,151; end;	/*To No.3-8*/
+		case 1: warp "prt_maze03",137,128; end;	/*To No.3-9*/
+		case 2: warp "prt_maze03",14,71; end;	/*To No.3-16*/
+		case 3: warp "prt_maze03",54,8; end;	/*To No.3-22*/
+	}
 }
 // 3rd Floor No.03
 prt_maze03,102,165,0	warp	mazewarp5304	1,1,prt_maze03,137,71	/*To No.3-19*/
@@ -168,15 +164,13 @@ prt_maze03,14,74,0	warp	mazewarp5336	1,1,prt_maze03,63,111	/*To No.3-12*/
 prt_maze03,14,45,0	warp	mazewarp5337	1,1,prt_maze03,88,174	/*To No.3-3*/
 prt_maze03,5,58,0	warp	mazewarp5338	1,1,prt_maze03,191,15	/*To No.3-25*/
 // 3rd Floor No.17
-prt_maze03,74,74,0	script	#mazewarp5339	45,1,1,{
-set	@w,rand(4);
-	if(@w==1)goto w2;
-	if(@w==2)goto w3;
-	if(@w==3)goto w4;
-		warp "prt_maze03",98,151; end;	/*To No.3-8*/
-	w2:	warp "prt_maze03",137,128; end;	/*To No.3-9*/
-	w3:	warp "prt_maze03",14,71; end;	/*To No.3-16*/
-	w4:	warp "prt_maze03",54,8; end;	/*To No.3-22*/
+prt_maze03,74,74,0	script	#mazewarp5339	WARPNPC,1,1,{
+	switch(rand(4)) {
+		case 0: warp "prt_maze03",98,151; end;	/*To No.3-8*/
+		case 1: warp "prt_maze03",137,128; end;	/*To No.3-9*/
+		case 2: warp "prt_maze03",14,71; end;	/*To No.3-16*/
+		case 3: warp "prt_maze03",54,8; end;	/*To No.3-22*/
+	}
 }
 prt_maze03,52,45,0	warp	mazewarp5340	1,1,prt_maze03,16,31	/*To No.3-21*/
 // 3rd Floor No.18
@@ -186,15 +180,13 @@ prt_maze03,114,56,0	warp	mazewarp5343	1,1,prt_maze03,8,140	/*To No.3-6*/
 prt_maze03,85,56,0	warp	mazewarp5344	1,1,prt_maze03,176,31	/*To No.3-25*/
 // 3rd Floor No.19
 prt_maze03,137,74,0	warp	mazewarp5345	1,1,prt_maze03,102,168	/*To No.3-3*/
-prt_maze03,139,45,0	script	#mazewarp5346	45,1,1,{
-	set	@w,rand(4);
-	if(@w==1)goto w2;
-	if(@w==2)goto w3;
-	if(@w==3)goto w4;
-		warp "prt_maze03",98,151; end;	/*To No.3-8*/
-	w2:	warp "prt_maze03",137,128; end;	/*To No.3-9*/
-	w3:	warp "prt_maze03",14,71; end;	/*To No.3-16*/
-	w4:	warp "prt_maze03",54,8; end;	/*To No.3-22*/
+prt_maze03,139,45,0	script	#mazewarp5346	WARPNPC,1,1,{
+	switch(rand(4)) {
+		case 0: warp "prt_maze03",98,151; end;	/*To No.3-8*/
+		case 1: warp "prt_maze03",137,128; end;	/*To No.3-9*/
+		case 2: warp "prt_maze03",14,71; end;	/*To No.3-16*/
+		case 3: warp "prt_maze03",54,8; end;	/*To No.3-22*/
+	}
 }
 // 3rd Floor No.20
 prt_maze03,177,74,0	warp	mazewarp5347	1,1,prt_maze03,23,128	/*To No.3-6*/
@@ -212,15 +204,13 @@ prt_maze03,99,34,0	warp	mazewarp5355	1,1,prt_maze03,98,151	/*To No.3-8*/
 prt_maze03,114,22,0	warp	mazewarp5356	1,1,prt_maze03,104,71	/*To No.3-18*/
 prt_maze03,85,13,0	warp	mazewarp5357	1,1,prt_maze03,23,8	/*To No.3-21*/
 // 3rd Floor No.24
-prt_maze03,154,22,0	script	#mazewarp5358	45,1,1,{
-	set	@w,rand(4);
-	if(@w==1)goto w2;
-	if(@w==2)goto w3;
-	if(@w==3)goto w4;
-		warp "prt_maze03",98,151; end;	/*To No.3-8*/
-	w2:	warp "prt_maze03",137,128; end;	/*To No.3-9*/
-	w3:	warp "prt_maze03",14,71; end;	/*To No.3-16*/
-	w4:	warp "prt_maze03",54,8; end;	/*To No.3-22*/
+prt_maze03,154,22,0	script	#mazewarp5358	WARPNPC,1,1,{
+	switch(rand(4)) {
+		case 0: warp "prt_maze03",98,151; end;	/*To No.3-8*/
+		case 1: warp "prt_maze03",137,128; end;	/*To No.3-9*/
+		case 2: warp "prt_maze03",14,71; end;	/*To No.3-16*/
+		case 3: warp "prt_maze03",54,8; end;	/*To No.3-22*/
+	}
 }
 // 3rd Floor No.25
 prt_maze03,176,34,0	warp	mazewarp5359	1,1,prt_maze03,88,56	/*To No.3-18*/
diff --git a/npc/warps/dungeons/ra_san.txt b/npc/warps/dungeons/ra_san.txt
index 6b9076b5f..d6757cf6a 100644
--- a/npc/warps/dungeons/ra_san.txt
+++ b/npc/warps/dungeons/ra_san.txt
@@ -1,22 +1,20 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Rachel Sanctuary Dungeon Warp Script
 //===== By ===================================================
 //= Playtester
-//===== Current Version :=====================================
+//===== Current Version: =====================================
 //= 1.4
-//===== Compatible With :=====================================
-//= Any Athena Version
-//===== Description :=========================================
+//===== Description: =========================================
 //= Warp Points For Rachel Sanctuary Dungeon
-//===== Additional Comment:===================================
+//===== Additional Comment: ==================================
 //= 1.1 Added $ephiroth's warps [Playtester]
 //= 1.2 Replaced old versions with jAthena's [Playtester]
 //= 1.3 Official warps [Playtester]
 //= 1.4 Added quest map warp to random warp. [L0ne_W0lf]
-//=	Added Dungeon exit back into temple.
+//=     Added Dungeon exit back into temple.
 //============================================================
 
-ra_san01,139,13,0	script	sanctuary01	45,1,1,{
+ra_san01,139,13,0	script	sanctuary01	WARPNPC,1,1,{
 	if (ra_tem_q == 21) { warp "que_san04",119,110; end; }
 	switch(rand(3)) {
 		case 1:  warp "ra_san02",213,275; break;
diff --git a/npc/warps/dungeons/tha_t.txt b/npc/warps/dungeons/tha_t.txt
index ab707f62f..bc6925a22 100644
--- a/npc/warps/dungeons/tha_t.txt
+++ b/npc/warps/dungeons/tha_t.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Thanatos Tower Warps
 //===== By: ==================================================
 //= [Ishizu-chan]
 //===== Current Version: =====================================
 //= 1.1 Beta
-//===== Compatible With: =====================================
-//= Any rAthena Version i guess?
 //===== Description: =========================================
-//= It's the Thanatos Tower Warps...
+//= Warp Points for Thanatos Tower
 //===== Additional Comments: =================================
 //= 1.0 - First Release [Ishizu-chan]
 //= 1.1 - Added Entrance Warp Guard
diff --git a/npc/warps/dungeons/thor_v.txt b/npc/warps/dungeons/thor_v.txt
index 342a8bc6d..2a12603df 100644
--- a/npc/warps/dungeons/thor_v.txt
+++ b/npc/warps/dungeons/thor_v.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Thor's Volcano Dungeon Warp Script
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version 
 //===== Description: =========================================
 //= Warp Points for Thor's Volcano Dungeon
 //===== Additional Comments: =================================
@@ -19,10 +17,10 @@ thor_v02,192,60,0	warp	thor_v2-2	1,1,thor_v03,35,262
 thor_v02,73,203,0	warp	thor_v3-1	1,1,thor_v01,196,37
 thor_v03,30,262,0	warp	thor_v3-2	1,1,thor_v02,187,58
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Initial version [$ephiroth]
 //= 1.1 Updated warps, according to Japan site [$ephiroth]
 //= 1.2 Updated more warps to thor_camp [$ephiroth]
-//============================================================ 
+//============================================================
diff --git a/npc/warps/dungeons/treasure.txt b/npc/warps/dungeons/treasure.txt
index 72d93c2eb..606c61e30 100644
--- a/npc/warps/dungeons/treasure.txt
+++ b/npc/warps/dungeons/treasure.txt
@@ -1,11 +1,9 @@
-//==== rAthena Script ========================================
+//===== Hercules Script ======================================
 //= Treasure Island warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Treasure Island
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/tur_dun.txt b/npc/warps/dungeons/tur_dun.txt
index e61147e7d..1c42f75a9 100644
--- a/npc/warps/dungeons/tur_dun.txt
+++ b/npc/warps/dungeons/tur_dun.txt
@@ -1,11 +1,9 @@
-//==== rAthena Script ========================================
+//===== Hercules Script ======================================
 //= Turtle Island warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Turtle Island
 //===== Additional Comments: =================================
diff --git a/npc/warps/dungeons/um_dun.txt b/npc/warps/dungeons/um_dun.txt
index 80b6bbbae..b69df10cb 100644
--- a/npc/warps/dungeons/um_dun.txt
+++ b/npc/warps/dungeons/um_dun.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Umbala Dungeon (Yggdrasil Cave) Warp Script
 //===== By: ==================================================
 //= Darkchild (1.0vA); Athena (1.0vB)
 //===== Current Version: =====================================
 //= 1.4 (Akaru)
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Umbala Dungeon (Yggdrasil Cave)
 //===== Additional Comments: =================================
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
diff --git a/npc/warps/dungeons/xmas_dun.txt b/npc/warps/dungeons/xmas_dun.txt
index 96374f412..8672f520a 100644
--- a/npc/warps/dungeons/xmas_dun.txt
+++ b/npc/warps/dungeons/xmas_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lutie Dungeon (Toy Factory) Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
 //===== Description: =========================================
 //= Warp Points for Toy Factory
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index a210eb12b..3a5fa7754 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -15,7 +15,7 @@
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
-hu_fild05,168,304,0	script	Column#abyss1	111,{
+hu_fild05,168,304,0	script	Column#abyss1	HIDDEN_NPC,{
 
 	mes "^3355FFThere are 3 oddly";
 	mes "shaped grooves on";
@@ -84,7 +84,7 @@ hu_fild05,168,304,0	script	Column#abyss1	111,{
 	close;
 }
 
-hu_fild05,171,211,0	script	Column#abyss2	111,1,1,{
+hu_fild05,171,211,0	script	Column#abyss2	HIDDEN_NPC,1,1,{
 
 	mes "^3355FFThis column looks";
 	mes "very similar to the";
@@ -144,7 +144,7 @@ hu_fild05,171,211,0	script	Column#abyss2	111,1,1,{
 	}
 }
 
-hu_fild05,196,210,1	script	AbyssWarp	45,2,2,{
+hu_fild05,196,210,1	script	AbyssWarp	WARPNPC,2,2,{
 
 OnInit:
 	disablenpc "AbyssWarp";
diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt
index 93c5eccf2..d9f0f5bd3 100644
--- a/npc/warps/fields/amatsu_fild.txt
+++ b/npc/warps/fields/amatsu_fild.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.1
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Warp Points for Amatsu Field
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/fields/ein_fild.txt b/npc/warps/fields/ein_fild.txt
index c83a13b1e..f6a25c4a1 100644
--- a/npc/warps/fields/ein_fild.txt
+++ b/npc/warps/fields/ein_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Einbroch Field Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0), SSUNNY@YOUNG(1.2)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Lighthalzen Field
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/gefenia.txt b/npc/warps/fields/gefenia.txt
index 832bdea74..ce89232e7 100644
--- a/npc/warps/fields/gefenia.txt
+++ b/npc/warps/fields/gefenia.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Gefenia Warp Script
 //===== By: ==================================================
 //= Muad Dib (1.0)
@@ -6,8 +6,6 @@
 //= Nana (1.2)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Gefenia
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt
index e5d2d359b..1edc677e6 100644
--- a/npc/warps/fields/glastheim.txt
+++ b/npc/warps/fields/glastheim.txt
@@ -1,17 +1,16 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Glastheim Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2.x
+//= 1.5
 //===== Description: =========================================
 //= Warp Points for Glastheim
 //===== Additional Comments: =================================
 //= Split off npc_warp.txt, 1.1 added gl18-2 [Lupus]
 //= optimized random warp [Lupus] fixed looped warps
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.5 Fixed random warp coordinates. [Euphy]
 //============================================================
 
 //Glastheim
@@ -52,10 +51,13 @@ gl_knt02,10,138,0	warp	gl14-1	1,1,gl_knt01,7,148
 gl_knt02,157,292,0	warp	gl16-1	1,1,gl_knt01,150,286
 gl_knt02,289,138,0	warp	gl17-1	1,1,gl_knt01,292,144
 gl_prison,149,183,0	warp	gl18-1	1,1,gl_prison1,150,14
-gl_prison,10,70,4	script	gl18-2	45,1,1,{
-if(rand(2)==1) goto w2;
-	warp "gl_cas01",236,192; end;
-w2: warp "gl_cas01",164,191; end;
+gl_prison,11,70,0	script	gl18-2	WARPNPC,1,1,{
+	switch(rand(4)) {
+		case 0: warp "gl_cas01",163,193; end;
+		case 1: warp "gl_cas01",238,192; end;
+		case 2: warp "gl_cas01",144,314; end;
+		case 3: warp "gl_cas01",367,301; end;
+	}
 }
 gl_prison1,150,10,0	warp	gl18	1,1,gl_prison,149,178
 gl_prison1,62,187,0	warp	gl10	1,1,gl_sew01,258,255
diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt
index 024f97c1f..d59563853 100644
--- a/npc/warps/fields/jawaii.txt
+++ b/npc/warps/fields/jawaii.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Jawaii Warp Script
 //===== By: ==================================================
 //= Muad Dib (1.0)
@@ -6,8 +6,6 @@
 //= MasterOfMuppets (1.2)
 //===== Current Version: =====================================
 //= 1.2b
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Jawaii
 //===== Additional Comments: =================================
@@ -21,6 +19,6 @@ jawaii_in,113,61,0	warp	jawaiiwarp002	1,1,jawaii,138,202
 jawaii_in,133,107,0	warp	jawaiiwarp003	1,1,jawaii,111,199
 jawaii_in,88,117,0	warp	jawaiiwarp004	1,1,jawaii,109,186
 jawaii,192,215,0	warp	jawaiiwarp005	1,1,jawaii_in,28,94
-jawaii_in,27,91,4	script	jawaiiwarp006	45,1,1,{
+jawaii_in,27,91,4	script	jawaiiwarp006	WARPNPC,1,1,{
 if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94;
 }
diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt
index 10a5b5d7e..85f06cb87 100644
--- a/npc/warps/fields/lhalzen_fild.txt
+++ b/npc/warps/fields/lhalzen_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lighthalzen Field Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Lighthalzen Field
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt
index 8e944bd81..3fd47b22d 100644
--- a/npc/warps/fields/lutie_fild.txt
+++ b/npc/warps/fields/lutie_fild.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lutie Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Lutie Field
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/fields/man_fild.txt b/npc/warps/fields/man_fild.txt
index 55e799a69..3e355700b 100644
--- a/npc/warps/fields/man_fild.txt
+++ b/npc/warps/fields/man_fild.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Manuk Field Warp Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Manuk Field
 //===== Additional Comments: =================================
 //= 1.0 First Version.
diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt
index 1c49ddc96..efd0bbf57 100644
--- a/npc/warps/fields/mtmjolnir.txt
+++ b/npc/warps/fields/mtmjolnir.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Mt. Mjolnir Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.2a
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Mt. Mjolnir
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/spl_fild.txt b/npc/warps/fields/spl_fild.txt
index 1860636ff..024f76bde 100644
--- a/npc/warps/fields/spl_fild.txt
+++ b/npc/warps/fields/spl_fild.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Splendid Field Warp Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Splendide
 //===== Additional Comments: =================================
 //= 1.0 First Version.
diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt
index 1282257e4..0ed3dc47c 100644
--- a/npc/warps/fields/umbala_fild.txt
+++ b/npc/warps/fields/umbala_fild.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Umbala Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Umbala Field
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
diff --git a/npc/warps/guildcastles.txt b/npc/warps/guildcastles.txt
index f41fc2a5d..a3d00cafb 100644
--- a/npc/warps/guildcastles.txt
+++ b/npc/warps/guildcastles.txt
@@ -4,8 +4,6 @@
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 2.7
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Al de Baran, Payon, Prontera, Geffen,
 //= and Juno Guild Castles
@@ -18,15 +16,14 @@
 //= 2.3 Removed 2nd entrance to Novice Castle Geffen [Lupus]
 //= 2.4 Added Warps between Juno and it's new Castle Satelite map. [L0ne_W0lf]
 //= 2.4a Added more warps between Juno Satellite and Castle Interiors. [L0ne_W0lf]
-//=	castle 1, 4 and 5 entrances are questionable, and will be updated
-//=	as I get more information.
+//=     castle 1, 4 and 5 entrances are questionable, and will be updated
+//=     as I get more information.
 //= 2.4b Corrected Warp points for Juno castles 1, 4 and 5. [L0ne_W0lf]
 //= 2.5 Updated Schwaltzvalt warps and added Arunafeltz. [L0ne_W0lf]
 //= 2.6 Fixed warp position between Juno and Schwaltzvalt Realm. [Gepard]
 //= 2.7 Updated WoE:FE warps. [Masao]
 //============================================================
 
-
 //Prontera Castle Map
 prt_gld,159,298,0	warp	prtg01_NorthField	1,1,prt_fild01,199,30
 prt_gld,159,25,0	warp	prtg02_Castle	1,1,prt_castle,102,178
@@ -369,7 +366,7 @@ aldeg_cas04,21,123,0	warp	aldeg-4-11_aldeg-4-12	1,1,aldeg_cas04,125,168
 aldeg_cas04,121,168,0	warp	aldeg-4-12_aldeg-4-11	1,1,aldeg_cas04,25,123
 aldeg_cas04,156,210,0	warp	aldeg-4-13_aldeg-4-5	1,1,aldeg_cas04,169,97
 aldeg_cas04,108,210,0	warp	aldeg-4-14_aldeg-4-4	1,1,aldeg_cas04,186,92
-aldeg_cas04,132,231,0	script	aldeg-4-15_aldeg-4-	45,1,1,{
+aldeg_cas04,132,231,0	script	aldeg-4-15_aldeg-4-	WARPNPC,1,1,{
 
 OnTouch:
 	switch (rand(1,5)) {
@@ -442,7 +439,7 @@ arug_cas05,141,40,0	warp	arug501	1,1,aru_gld,292,107
 aru_gld,287,107,0	warp	arug502	1,1,arug_cas05,141,45
 arug_cas05,321,52,0	warp	arug503	1,1,arug_cas05,141,45
 
-//==================  4 Novices Guild Castles =============================
+//==================4 Novices Guild Castles =============================
 //Novices Guild: Al de Baran Guild Castles Map
 n_castle,184,16,0	warp	naldg01	1,1,nguild_alde,34,248
 nguild_alde,34,252,0	warp	naldg01-1	1,1,n_castle,187,16
diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt
index 19a5fdc6a..5ab756c96 100644
--- a/npc/warps/other/arena.txt
+++ b/npc/warps/other/arena.txt
@@ -3,16 +3,19 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Description: =========================================
-//= Warp Points related to Izlude Arena && Control Panel
+//= Warp Points related to Izlude Arena & Control Panel
 //===== Additional Comments: =================================
 //= 1.0 First version, done by SinSloth. [MasterOfMuppets]
 //= 1.1 updated welcome_arena warp coords (was 128,126) [Lupus]
 //= 1.2 Made some updates due to Izlude Battle Arena release. [SinSloth]
-//= 1.3 Moved welcome_arena & bye_arena to pre-re [Streusel]
+//= 1.3 Split Izlude warps into Pre-Renewal/Renewal paths. [Euphy]
+//= 1.4 Added GM management function. [Euphy]
 //============================================================
 
+// Main Room Warps
+//============================================================
 arena_room,84,103,0	warp	arn_room_11_1	1,1,arena_room,63,130
 arena_room,63,126,0	warp	arn_room_11_2	1,1,arena_room,87,100
 arena_room,76,87,0	warp	arn_room_9_1	1,1,arena_room,46,87
@@ -25,45 +28,67 @@ arena_room,123,88,0	warp	arn_room_3_1	1,1,arena_room,153,87
 arena_room,150,87,0	warp	arn_room_3_2	1,1,arena_room,120,87
 prt_are_in,54,13,0	warp	toarn_room	1,1,arena_room,100,77
 
-sec_in02,79,180,3	script	#arenacontrol	81,{
+// Acolyte Warps
+//============================================================
+arena_room,135,126,0	warp	byeaco#arena	1,1,arena_room,111,99
+force_5-1,25,44,0	warp	force_01_02#aco	1,1,force_5-1,25,69
+force_5-1,25,134,0	warp	force_02_03#aco	1,1,force_5-1,25,159
+force_5-1,44,174,0	warp	force_03_04#aco	1,1,force_5-1,69,174
+force_5-1,134,174,0	warp	force_04_05#aco	1,1,force_5-1,159,174
+force_5-1,174,155,0	warp	force_05_06#aco	1,1,force_5-1,174,130
+force_5-1,174,65,0	warp	force_06_07#aco	1,1,force_5-1,174,40
+force_5-1,155,26,0	warp	force_07_08#aco	1,1,force_5-1,132,26
+force_5-1,99,54,0	warp	force_08_09#aco	1,1,force_5-1,99,82
+
+// Party Warps
+//============================================================
+force_1-2,85,26,0	warp	force_00_01	1,1,force_1-2,37,26
+force_1-2,114,26,0	warp	force_00_02	1,1,force_1-2,162,26
+force_1-2,99,40,0	warp	force_00_03	1,1,force_1-2,99,66
+force_1-2,41,26,0	warp	force_01_00	1,1,force_1-2,89,26
+force_1-2,158,26,0	warp	force_02_00	1,1,force_1-2,110,26
+force_1-2,99,63,0	warp	force_03_00	1,1,force_1-2,99,36
+force_1-2,84,78,0	warp	force_03_05	1,1,force_1-2,37,78
+force_1-2,115,78,0	warp	force_03_04	1,1,force_1-2,162,78
+force_1-2,158,77,0	warp	force_04_03	1,1,force_1-2,110,78
+force_1-2,41,77,0	warp	force_05_03	1,1,force_1-2,37,78
+force_1-2,25,93,0	warp	force_05_06	1,1,force_1-2,26,118
+force_1-2,49,130,0	warp	force_06_07	1,1,force_1-2,91,125
+force_1-2,107,145,0	warp	force_07_08	1,1,force_1-2,173,118
+force_1-2,158,178,0	warp	force_08_09	1,1,force_1-2,133,178
+force_1-2,55,178,0	warp	force_09_10	1,1,force_1-2,29,178
+force_1-2,33,178,0	warp	force_10_09	1,1,force_1-2,59,178
 
-DLGTEMP:
-	input @input_arena;
-	if (@input_arena < 0 || @input_arena > 2000) goto DLGTEMP;	//CHECK
-	if (@input_arena == 0)
-	{
+// GM Control Panel
+//============================================================
+sec_in02,79,180,3	script	#arenacontrol	4_DOG01,{
+	set .@i, callfunc("F_GM_NPC",1357,0);
+	if (.@i == -1) {
 		mes "Error!";
 		close;
-	}
-	else if (@input_arena == 1357)
-	{
+	} else if (.@i == 0) {
+		mes "Closing control panel.";
+		close;
+	} else {
 		mes "Opening Control Panel";
 		mes "' A - R - E - N - A '";
 		next;
 		mes "Please select a";
 		mes "state for the arena.";
 		next;
-		switch( select( "Open.","Closed.") )
-		{
-			case 1:
-				mes "Currently";
-				mes "opening arena.";
-				misceffect EF_ENHANCE;	//CHECK
-				enablenpc "welcome_arena";
-				next;
-				break;
-			case 2:
-				mes "Currently";
-				mes "closing arena.";
-				misceffect EF_EXIT;	//CHECK
-				disablenpc "welcome_arena";
-				next;
-				break;
+		switch(select("Open.:Closed.")) {
+		case 1:
+			mes "Currently";
+			mes "opening arena.";
+			specialeffect EF_ENHANCE;
+			enablenpc "welcome_arena";
+			close;
+		case 2:
+			mes "Currently";
+			mes "closing arena.";
+			specialeffect EF_EXIT;
+			disablenpc "welcome_arena";
+			close;
 		}
 	}
-	else
-	{
-		mes "Closing control panel.";
-		close;
-	}
 }
diff --git a/npc/warps/other/god.txt b/npc/warps/other/god.txt
index f649b7e57..2ee2faeea 100644
--- a/npc/warps/other/god.txt
+++ b/npc/warps/other/god.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= God Seal Quest Warps
 //===== By: ==================================================
 //= MasterOfMuppets && SinSloth
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//=
 //===== Description: =========================================
 //= Warp Points related to the God Seal Quest.
 //===== Additional Comments: =================================
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
index e3c36ab51..41a433d31 100644
--- a/npc/warps/other/jobquests.txt
+++ b/npc/warps/other/jobquests.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Job Quest Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 2.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Version Ep4+
+//= 2.1
 //===== Description: =========================================
 //= Warp Points for Job Quest Maps
 //===== Additional Comments: =================================
@@ -23,17 +21,42 @@
 //= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.9 Added Gungslinger and Ninja warps. [L0ne_W0lf]
 //= 2.0 Updated Novice warps to use correct maps. [L0ne_W0lf]
+//= 2.1 Added Novice warp duplicates. [Euphy]
 //============================================================
 
 //==============================================================================
 //Novice
 //==============================================================================
-new_1-1,148,112,0	warp	newwarp6001	2,2,new_1-2,100,9
-new_1-2,100,6,0	warp	newwarp6002	2,2,new_1-1,144,112
-new_1-2,126,106,0	warp	newwarp6003	2,2,new_1-2,160,171
-new_1-2,156,171,0	warp	newwarp6004	2,2,new_1-2,123,106
-new_1-2,73,106,0	warp	newwarp6005	2,2,new_1-2,41,172
-new_1-2,46,172,0	warp	newwarp6006	2,2,new_1-2,78,106
+new_1-1,148,112,0	warp	newwarp6001a	2,2,new_1-2,100,9
+new_2-1,148,112,0	warp	newwarp6001b	2,2,new_2-2,100,9
+new_3-1,148,112,0	warp	newwarp6001c	2,2,new_3-2,100,9
+new_4-1,148,112,0	warp	newwarp6001d	2,2,new_4-2,100,9
+new_5-1,148,112,0	warp	newwarp6001e	2,2,new_5-2,100,9
+new_1-2,100,6,0	warp	newwarp6002a	2,2,new_1-1,144,112
+new_2-2,100,6,0	warp	newwarp6002b	2,2,new_2-1,144,112
+new_3-2,100,6,0	warp	newwarp6002c	2,2,new_3-1,144,112
+new_4-2,100,6,0	warp	newwarp6002d	2,2,new_4-1,144,112
+new_5-2,100,6,0	warp	newwarp6002e	2,2,new_5-1,144,112
+new_1-2,126,106,0	warp	newwarp6003a	2,2,new_1-2,160,171
+new_2-2,126,106,0	warp	newwarp6003b	2,2,new_2-2,160,171
+new_3-2,126,106,0	warp	newwarp6003c	2,2,new_3-2,160,171
+new_4-2,126,106,0	warp	newwarp6003d	2,2,new_4-2,160,171
+new_5-2,126,106,0	warp	newwarp6003e	2,2,new_5-2,160,171
+new_1-2,156,171,0	warp	newwarp6004a	2,2,new_1-2,123,106
+new_2-2,156,171,0	warp	newwarp6004b	2,2,new_2-2,123,106
+new_3-2,156,171,0	warp	newwarp6004c	2,2,new_3-2,123,106
+new_4-2,156,171,0	warp	newwarp6004d	2,2,new_4-2,123,106
+new_5-2,156,171,0	warp	newwarp6004e	2,2,new_5-2,123,106
+new_1-2,73,106,0	warp	newwarp6005a	2,2,new_1-2,41,172
+new_2-2,73,106,0	warp	newwarp6005b	2,2,new_2-2,41,172
+new_3-2,73,106,0	warp	newwarp6005c	2,2,new_3-2,41,172
+new_4-2,73,106,0	warp	newwarp6005d	2,2,new_4-2,41,172
+new_5-2,73,106,0	warp	newwarp6005e	2,2,new_5-2,41,172
+new_1-2,46,172,0	warp	newwarp6006a	2,2,new_1-2,78,106
+new_2-2,46,172,0	warp	newwarp6006b	2,2,new_2-2,78,106
+new_3-2,46,172,0	warp	newwarp6006c	2,2,new_3-2,78,106
+new_4-2,46,172,0	warp	newwarp6006d	2,2,new_4-2,78,106
+new_5-2,46,172,0	warp	newwarp6006e	2,2,new_5-2,78,106
 
 //==============================================================================
 //Thief
diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt
index 76df1b28f..3582ecfb9 100644
--- a/npc/warps/other/kiel.txt
+++ b/npc/warps/other/kiel.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Kiel Warp Script (Kiel Buildings)
 //===== By: ==================================================
 //= Playtester; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.6
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for all Kiel Buildings
 //===== Additional Comments: =================================
diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt
index 011494794..69461b8a7 100644
--- a/npc/warps/other/other.txt
+++ b/npc/warps/other/other.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Other Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version;
 //===== Description: =========================================
 //= Warp Points for Other Maps
 //===== Additional Comments: =================================
diff --git a/npc/warps/pvp.txt b/npc/warps/pvp.txt
index 2d28a94d8..c8276ce23 100644
--- a/npc/warps/pvp.txt
+++ b/npc/warps/pvp.txt
@@ -4,8 +4,6 @@
 //= Athena (any)
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Prontera Arena and PvP Maps
 //===== Additional Comments: =================================
@@ -13,7 +11,7 @@
 //= 1.1 Fixed Prontera Arena warp [Yor]
 //= 1.2 Added addition warps for PvP Nightmare Mode maps.
 //= 1.3 Fixed duplicate warp names [Timexy]
-//= 1.4 Disabled removed maps ordeal_*-3 and ordeal_*-4 [Streusel]
+//= 1.4 Disabled ordeal_*-3 and ordeal_*-4 maps.
 //============================================================
 
 //Battle Ordeal Mode
@@ -161,15 +159,6 @@ ordeal_3-2,180,154,0	warp	ord32-8	1,1,ordeal_3-2,284,164
 //ordeal_3-4,172,135,0	warp	ord34-6	1,1,ordeal_3-4,284,24
 //ordeal_3-4,172,172,0	warp	ord34-7	1,1,ordeal_3-4,284,284
 //ordeal_3-4,180,154,0	warp	ord34-8	1,1,ordeal_3-4,284,164
-//This map doesn't even exists. Is it ordeal_a02 or ordea_la00?
-//ordeal_a04,128,154,0	warp	orda1	0,0,ordeal_a04,24,154
-//ordeal_a04,136,136,0	warp	orda2	0,0,ordeal_a04,24,24
-//ordeal_a04,136,172,0	warp	orda3	0,0,ordeal_a04,24,284
-//ordeal_a04,153,128,0	warp	orda4	0,0,ordeal_a04,153,23
-//ordeal_a04,153,180,0	warp	orda5	0,0,ordeal_a04,144,284
-//ordeal_a04,172,135,0	warp	orda6	0,0,ordeal_a04,284,24
-//ordeal_a04,172,172,0	warp	orda7	0,0,ordeal_a04,284,284
-//ordeal_a04,180,154,0	warp	orda8	0,0,ordeal_a04,284,164
 
 // PvP Nightmare More warps
 pvp_n_8-4,33,122,0	warp	Link#pt_link_1-11	0,2,pvp_n_8-4,0,0