Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

143 files changed, 687 insertions, 1193 deletions

diff --git a/npc/pre-re/airports/izlude.txt b/npc/pre-re/airports/izlude.txt
index b2c0ee2d5..29e07da86 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
diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt
index 3643469de..20efaad81 100644
--- a/npc/pre-re/cities/alberta.txt
+++ b/npc/pre-re/cities/alberta.txt
@@ -1,12 +1,13 @@
 //===== 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.
 //============================================================
 
diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt
index 2ad5b16a8..531d8a40c 100644
--- a/npc/pre-re/cities/izlude.txt
+++ b/npc/pre-re/cities/izlude.txt
@@ -1,17 +1,14 @@
-//===== 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
@@ -23,6 +20,3 @@ 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,{
diff --git a/npc/pre-re/cities/jawaii.txt b/npc/pre-re/cities/jawaii.txt
index 1f2d0fb6a..764612d7c 100644
--- a/npc/pre-re/cities/jawaii.txt
+++ b/npc/pre-re/cities/jawaii.txt
@@ -1,14 +1,13 @@
-//===== 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.
 //============================================================
 
diff --git a/npc/pre-re/cities/yuno.txt b/npc/pre-re/cities/yuno.txt
new file mode 100644
index 000000000..944c0e72f
--- /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	105
+yuno,165,283,4	duplicate(JunoSoldier2)	Juno Soldier#2juno	105
+yuno,227,292,4	duplicate(JunoSoldier3)	Juno Soldier#3juno	105
+yuno,165,228,4	duplicate(JunoSoldier4)	Juno Soldier#4juno	105
+yuno,150,228,4	duplicate(JunoSoldier5)	Juno Soldier#5juno	105
+yuno,334,182,4	duplicate(JunoSoldier6)	Juno Soldier#6juno	105
+yuno,263,320,4	duplicate(JunoSoldier7)	Juno Soldier#7juno	105
diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt
index 966e0c364..6cdcc77ab 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
@@ -156,4 +154,4 @@ alberta,23,238,4	script	Guide#alb::AlbGuide	105,{
 	end;
 }
 
-alberta,120,60,3	duplicate(AlbGuide)	Guide#2alb	105
+alberta,120,60,3	duplicate(AlbGuide)	Guide#2alb	105
\ No newline at end of file
diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt
index ba8fd1636..8c68f6b7a 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
diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt
index 100eb9c6a..15129e4ad 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
diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt
index d153cf8d3..b8220873c 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
diff --git a/npc/pre-re/guides/guides_comodo.txt b/npc/pre-re/guides/guides_comodo.txt
index 2cebf8740..f9e068dec 100644
--- a/npc/pre-re/guides/guides_comodo.txt
+++ b/npc/pre-re/guides/guides_comodo.txt
@@ -1,20 +1,19 @@
-//===== 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]
 //============================================================
 
diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt
index c73b37b74..bd4ec75f6 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
diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt
index 28e7232c4..e691f9e53 100644
--- a/npc/pre-re/guides/guides_geffen.txt
+++ b/npc/pre-re/guides/guides_geffen.txt
@@ -1,23 +1,21 @@
-//===== 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,{
diff --git a/npc/pre-re/guides/guides_gonryun.txt b/npc/pre-re/guides/guides_gonryun.txt
index 590bf7bd4..3c8c3ac83 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
diff --git a/npc/pre-re/guides/guides_hugel.txt b/npc/pre-re/guides/guides_hugel.txt
index 27336fcaa..b1d64970f 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.
diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt
index df214fb67..241d5ce40 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
diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt
index d8c08b31e..9475cb0e2 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
diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt
index 466182cd9..1d57d5b10 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
diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt
index 52a87ee32..52e83c4ed 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: =================================
diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt
index f0b5b343b..52dd77cac 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
diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt
index 790e42472..a06e1d8fa 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.
@@ -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..4eb165199 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
@@ -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..5244fb3b7 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
@@ -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..68be56b2e 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
diff --git a/npc/pre-re/guides/guides_rachel.txt b/npc/pre-re/guides/guides_rachel.txt
index d9fc74475..c78068071 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
diff --git a/npc/pre-re/guides/guides_umbala.txt b/npc/pre-re/guides/guides_umbala.txt
index aab2f362d..dee3cf27a 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
diff --git a/npc/pre-re/guides/guides_veins.txt b/npc/pre-re/guides/guides_veins.txt
index 92c5d9558..5d448c635 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
diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index 7b46a6029..f69d4556a 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,7 +26,7 @@
 //= 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,{
 	if (Upper == 1) {
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index 5018bc48f..1b928ff13 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,12 +15,12 @@
 //= 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,{
 	if (Upper == 1) {
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 22aab9052..df53e3440 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,11 +16,12 @@
 //= 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,{
 	if (Upper == 1) {
@@ -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~!";
@@ -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!";
@@ -596,6 +595,13 @@ geffen_in,164,112,4	script	Mixing Machine	111,{
 	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	88,{}
+// moc_ruins,91,150,0	script	Ponka-Hontas	93,{}
+
 geffen_in,177,112,4	script	Bookshelf	111,{
 	mes "[Guide Book]";
 	mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care.";
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 93d502794..531c47df3 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,7 +26,7 @@
 //= 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,{
 	if (Upper == 1) {
@@ -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;
+				set Zeny, 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;
+			set Zeny, 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;
+						set Zeny, 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;
+						set Zeny, 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.";
 					}
@@ -1060,7 +1058,7 @@ prontera,248,42,0	script	Kafra Employee#mer	116,{
 				cutin "",255;
 				end;
 			}
-			set zeny,zeny-600;
+			set Zeny, Zeny-600;
 			set RESRVPTS, RESRVPTS + 37;
 			cutin "",255;
 			warp "izlude",94,103;
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index 36ddc9d21..0887b2027 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,15 +25,15 @@
 //= 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,{
 	if (Upper == 1) {
@@ -296,7 +294,7 @@ 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,{
 	callfunc "F_JobSwdMedic","1st";
@@ -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,7 +364,7 @@ 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
 
@@ -396,7 +394,7 @@ job_sword1,193,168,0	script	Test Hall Staff#swd_9	45,1,3,{
 }
 
 // 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..e1e34b144 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,11 +12,11 @@
 //= 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]
 //============================================================
 
@@ -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.";
@@ -445,7 +443,7 @@ 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;
+		set Zeny, Zeny+.@money_thief;
 		close;
 	}
 }
diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt
index c88795463..909ba2d88 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,7 +21,7 @@
 //= 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,{
@@ -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.";
@@ -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..b5fbbd31e
--- /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	117
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/pre-re/merchants/ammo_boxes.txt b/npc/pre-re/merchants/ammo_boxes.txt
new file mode 100644
index 000000000..28b220e17
--- /dev/null
+++ b/npc/pre-re/merchants/ammo_boxes.txt
@@ -0,0 +1,13 @@
+//===== Hercules Script ======================================
+//= Magazine Dealers
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Turns bullets into magazines/packs.
+//===== Additional Comments: =================================
+//= 1.0 First version, Pre-Renewal duplicates.
+//============================================================
+
+izlude,171,127,3	duplicate(mdk)	Magazine Dealer Kenny#iz	83
diff --git a/npc/pre-re/merchants/ammo_dealer.txt b/npc/pre-re/merchants/ammo_dealer.txt
new file mode 100644
index 000000000..4286121b2
--- /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	86
diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index eb72c44a5..60864123d 100644
--- a/npc/pre-re/merchants/shops.txt
+++ b/npc/pre-re/merchants/shops.txt
@@ -1,17 +1,15 @@
-//===== 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
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..55e9acbfa 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;
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 f8b08fe04..67c054b1e 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
+spl_fild03,0,0,0,0	monster	Tendril Lion	1991,1,3600000,0,0
\ No newline at end of file
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..73577013a 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]
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..d4a50491f
--- /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	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;
+}
diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt
index 26520994b..938c3dfa7 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.
diff --git a/npc/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt
new file mode 100644
index 000000000..01c10e265
--- /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	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;
+}
diff --git a/npc/pre-re/other/pvp.txt b/npc/pre-re/other/pvp.txt
new file mode 100644
index 000000000..de49cfdc3
--- /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	105,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
+
+pvp_n_room,30,85,4	script	Fight Square Reception#n	105,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
diff --git a/npc/pre-re/other/resetskill.txt b/npc/pre-re/other/resetskill.txt
new file mode 100644
index 000000000..698b89e51
--- /dev/null
+++ b/npc/pre-re/other/resetskill.txt
@@ -0,0 +1,142 @@
+//===== Hercules Script ======================================
+//= Hypnotist
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [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.
+//===== Additional Comments: =================================
+//= 1.0 First version. [L0ne_W0lf]
+//============================================================
+
+prontera,146,232,4	script	Hypnotist#2	124,{
+	mes "[Hypnotist]";
+	mes "Greetings, adventurer.";
+	mes "I'm a member of the Hypnotist";
+	mes "Academy sent here to Prontera";
+	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 "skill resets for now, I have";
+	mes "two conditions that must be";
+	mes "fulfilled. First, you must be";
+	mes "lower than ^FF0000Base Level 40^000000.";
+	next;
+	mes "[Hypnotist]";
+	mes "Second, you must be a";
+	mes "^FF0000Swordman, Acolyte, Mage,";
+	mes "Thief, Archer, Merchant,";
+	mes "Taekwon Boy, Taekwon Girl, Gunslinger and Ninja^000000";
+	mes "Job character to qualify.";
+	mes "Now, do you have any questions?";
+	next;
+	switch(select("Skill Reset?:I want a Skill Reset:Nothing")) {
+
+	case 1:
+		mes "[Hypnotist]";
+		mes "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 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:
+		mes "[Hypnotist]";
+		mes "Are you sure that you";
+		mes "want to proceed with";
+		mes "my ^FF0000Skill Reset^000000 service?";
+		next;
+		if (select("Yes:Cancel") == 1) {
+			if (BaseLevel > 40) {
+				mes "[Hypnotist]";
+				mes "I'm sorry, but characters";
+				mes "with Base Levels higher";
+				mes "than 40 are ineligible for the";
+				mes "Skill Reset service I provide.";
+				close;
+			}
+			if ((Class > 0 && Class < 7 && Upper == 0) || (Class == Job_Gunslinger) || (Class == Job_Ninja) || (Class == Job_Taekwon)) {
+				if (checkcart()) {
+					mes "[Hypnotist]";
+					mes "Oh! Please remove your";
+					mes "Pushcart before proceeding";
+					mes "with the Skill Reset service.";
+					mes "Thanks for cooperating~";
+					close;
+				}
+				if (Weight) {
+					mes "[Hypnotist]";
+					mes "If you're here for my Skill";
+					mes "Reset service, please";
+					mes "remember that you can't";
+					mes "reset your skills 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;
+				}
+				mes "[Hypnotist]";
+				mes "Thank you for using";
+				mes "my Skill Redistribution";
+				mes "services. Oh, and best";
+				mes "of luck to you on your";
+				mes "travels, adventurer.";
+				ResetSkill;
+				close;
+			}
+			mes "[Hypnotist]";
+			mes "I'm sorry, but your";
+			mes "Job Class doesn't qualify";
+			mes "for the Skill Reset service";
+			mes "that I provide. I can only";
+			mes "offer Skill Resets to the";
+			mes "following Jobs...";
+			next;
+			mes "[Hypnotist]";
+			mes "^FF0000Swordman, Acolyte,";
+			mes "Mage, Thief, Archer,";
+			mes "Merchant, Taekwon";
+			mes "Boy, Taekwon Girl, Gunslinger and Ninja^000000.";
+			close;
+		}
+		mes "[Hypnotist]";
+		mes "Thank you, and good";
+		mes "luck on your adventures.";
+		mes "Please travel in safety~";
+		close;
+
+	case 3:
+		mes "[Hypnotist]";
+		mes "Thank you, and good";
+		mes "luck on your adventures.";
+		mes "Please travel in safety~";
+		close;
+	}
+
+}
diff --git a/npc/pre-re/other/turbo_track.txt b/npc/pre-re/other/turbo_track.txt
new file mode 100644
index 000000000..24ebea721
--- /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	845
diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt
index 263ea2658..678d93ee3 100644
--- a/npc/pre-re/quests/collection/quest_alligator.txt
+++ b/npc/pre-re/quests/collection/quest_alligator.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt
index 4cb379b71..10020be11 100644
--- a/npc/pre-re/quests/collection/quest_caramel.txt
+++ b/npc/pre-re/quests/collection/quest_caramel.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt
index 0915d3988..e30ea5a6a 100644
--- a/npc/pre-re/quests/collection/quest_coco.txt
+++ b/npc/pre-re/quests/collection/quest_coco.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt
index 4a1844719..de9cb68c7 100644
--- a/npc/pre-re/quests/collection/quest_creamy.txt
+++ b/npc/pre-re/quests/collection/quest_creamy.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt
index 7e659e1ca..1742d9618 100644
--- a/npc/pre-re/quests/collection/quest_demonpungus.txt
+++ b/npc/pre-re/quests/collection/quest_demonpungus.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
index 42ff4800c..1b6f37e28 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.
@@ -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..8648d6c8c 100644
--- a/npc/pre-re/quests/collection/quest_dokebi.txt
+++ b/npc/pre-re/quests/collection/quest_dokebi.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt
index 348dc75f9..fe46a3118 100644
--- a/npc/pre-re/quests/collection/quest_dryad.txt
+++ b/npc/pre-re/quests/collection/quest_dryad.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt
index 9c0c016a1..8687872ad 100644
--- a/npc/pre-re/quests/collection/quest_fabre.txt
+++ b/npc/pre-re/quests/collection/quest_fabre.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt
index f0306d787..8acaee3ae 100644
--- a/npc/pre-re/quests/collection/quest_frilldora.txt
+++ b/npc/pre-re/quests/collection/quest_frilldora.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt
index 64d729386..628b3e26f 100644
--- a/npc/pre-re/quests/collection/quest_goat.txt
+++ b/npc/pre-re/quests/collection/quest_goat.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt
index 882d878dd..41142aaaf 100644
--- a/npc/pre-re/quests/collection/quest_golem.txt
+++ b/npc/pre-re/quests/collection/quest_golem.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt
index 342ba5fc3..6b5a25050 100644
--- a/npc/pre-re/quests/collection/quest_hode.txt
+++ b/npc/pre-re/quests/collection/quest_hode.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt
index 69f313f75..72e17f4f0 100644
--- a/npc/pre-re/quests/collection/quest_leafcat.txt
+++ b/npc/pre-re/quests/collection/quest_leafcat.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_mantis.txt b/npc/pre-re/quests/collection/quest_mantis.txt
index 5e9249a1c..ab540e005 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.
@@ -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..6befd6076 100644
--- a/npc/pre-re/quests/collection/quest_pecopeco.txt
+++ b/npc/pre-re/quests/collection/quest_pecopeco.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt
index b6088a49f..607137cfe 100644
--- a/npc/pre-re/quests/collection/quest_pupa.txt
+++ b/npc/pre-re/quests/collection/quest_pupa.txt
@@ -1,13 +1,11 @@
-//===== 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: =================================
diff --git a/npc/pre-re/quests/collection/quest_zhupolong.txt b/npc/pre-re/quests/collection/quest_zhupolong.txt
index bf3999683..b5a6360bf 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.
@@ -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 6e8c45eba..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;
-}
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..8686b5483
--- /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	95
diff --git a/npc/pre-re/quests/monstertamers.txt b/npc/pre-re/quests/monstertamers.txt
index df1cb6c9d..594a8ed8e 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
+izlude_in,129,64,4	duplicate(MonsterTamer_izlude)	Monster Tamer#izu	125
diff --git a/npc/pre-re/quests/mrsmile.txt b/npc/pre-re/quests/mrsmile.txt
index b03afb770..8b304070d 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
diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt
index 5e61465d8..8effb510b 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
+izlude,101,173,6	duplicate(PromotionalStaff_izlude)	Promotional Staff#iz	100
diff --git a/npc/pre-re/quests/quests_izlude.txt b/npc/pre-re/quests/quests_izlude.txt
index e742332eb..2b12066db 100644
--- a/npc/pre-re/quests/quests_izlude.txt
+++ b/npc/pre-re/quests/quests_izlude.txt
@@ -1,14 +1,12 @@
-//===== 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.
 //============================================================
 
diff --git a/npc/pre-re/quests/quests_lighthalzen.txt b/npc/pre-re/quests/quests_lighthalzen.txt
index aadb0296d..708045ab1 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	853
diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt
index e272ad43b..fa56dfbd2 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;
-}
+izlude_in,110,64,3	duplicate(Dorian_izlude)	Dorian	878,2,2
diff --git a/npc/pre-re/quests/quests_veins.txt b/npc/pre-re/quests/quests_veins.txt
index ec0636b83..64c4cd3b3 100644
--- a/npc/pre-re/quests/quests_veins.txt
+++ b/npc/pre-re/quests/quests_veins.txt
@@ -1,9 +1,13 @@
 //===== Hercules Script ======================================
-//= Veins Quests
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0 (originally 2.2 prior to being split)
-//============================================================ 
+//= 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	945
\ No newline at end of file
+ve_fild05,257,130,4	duplicate(WincingOldMan_veins)	Wincing Old Man#ve	945
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 47858500f..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;
-}
diff --git a/npc/pre-re/scripts.conf b/npc/pre-re/scripts.conf
index 0dd7d035d..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,12 +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
 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..8c53b586b 100644
--- a/npc/pre-re/scripts_main.conf
+++ b/npc/pre-re/scripts_main.conf
@@ -1,5 +1,5 @@
 // --------------------------------------------------------------
-// -           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
@@ -9,7 +9,7 @@
 // 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
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 55b335078..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/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..df2821535 100644
--- a/npc/pre-re/warps/cities/rachel.txt
+++ b/npc/pre-re/warps/cities/rachel.txt
@@ -1,11 +1,9 @@
-//===== 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: =================================
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..1e8fa0fa5 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: =================================
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..ca93a2266 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: =================================
@@ -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 e8fd938c6..18c91a677 100644
--- a/npc/pre-re/other/arena.txt
+++ b/npc/pre-re/warps/other/arena.txt
@@ -1,14 +1,13 @@
 //===== 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
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: =================================