-Updated map_cache.dat

-Updated Izlude
-Added Fly Wing to Lunatic & Poring
-Added new Quests (Thanks Flaid)
--Expanded MAX_QUEST_DB for the newly added quests

Signed-off-by: Streusel

19 files changed, 513 insertions, 418 deletions

diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt
index 57f1fe4d7..283807a46 100644
--- a/npc/guild/agit_controller.txt
+++ b/npc/guild/agit_controller.txt
@@ -4,7 +4,7 @@
 //= kalen (1.0)
 //= 1.1 by Akaru and ho|yAnge|
 //===== Current Version: =====================================
-//= 2.0
+//= 2.0a
 //===== Description: =========================================
 //= Auto Start for War of Emperium
 //=============================================
@@ -29,6 +29,7 @@
 //= 1.9 Rearranged the time-checks so they no longer use goto. [L0ne_W0lf]
 //=	Removed treasure spawning function calls. (No longer needed)
 //= 2.0 Added WoE Battle Log support for broadcasts. [L0ne_W0lf]
+//= 2.0a Removed some brackets
 //============================================================
 //| To know how to set up WoE times, go to doc\woe_time_explanation.txt
 // WoE Start/Stop times
@@ -71,12 +72,10 @@ S_DisplayOwners:
 	setarray .@maps$[10],"payg_cas01","payg_cas02","payg_cas03","payg_cas04","payg_cas05";
 	setarray .@maps$[15],"prtg_cas01","prtg_cas02","prtg_cas03","prtg_cas04","prtg_cas05";
 	for( set .@i, 0; .@i <= 19; set .@i, .@i+1 ) {
-		if (GetCastleData(.@maps$[.@i],1)) {
+		if (GetCastleData(.@maps$[.@i],1))
 			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle has been conquered by the [" + GetGuildName(GetCastleData(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe;
-		}
-		else {
+		else
 			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe;
-		}
 	}
 	end;
 }
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 50bc9b610..b9c47b659 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 3.3
+//= 3.4
 //===== Description: ========================================= 
 //= Town shop NPCs.
 //===== Additional Comments: ================================= 
@@ -35,6 +35,7 @@
 //= 3.1 Moved some merchants to a separate renewal file. [Kenpachi]
 //= 3.2 Added Missing Items to the pet Groomers in prontera, payon, and yuno. BugReport:6680[Spre]
 //= 3.3 Moved more shops to Renewal file. [Euphy]
+//= 3.4 Removed some Izlude shops [Streusel]
 //============================================================ 
 
 //=======================================================
@@ -141,8 +142,6 @@ hu_in01,94,313,3	shop	Armor Dealer#hu	86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1
 //=======================================================
 izlude_in,60,127,4	shop	Weapon Dealer#iz	72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1
 izlude_in,70,127,4	shop	Armor Dealer#iz	62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1
-izlude_in,115,61,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,121,64,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
 
 //=======================================================
 // Jawaii
diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt
index 0c304adaa..950f19abd 100644
--- a/npc/pre-re/cities/izlude.txt
+++ b/npc/pre-re/cities/izlude.txt
@@ -1,16 +1,17 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================= 
 //= Izlude Town Pre-Renewal
 //===== By: ================================================== 
 //= Daegaladh
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
-//= rAthena SVN
+//= Hercules GIT
 //===== Description: ========================================= 
 //= Izlude town NPCs.
 //===== 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
@@ -24,3 +25,4 @@ izlude,58,126,2	duplicate(Cebalis_izlude)	Cebalis#izlude	98
 izlude,124,178,2	duplicate(Soldier_izlude)	Soldier#izlude	105
 izlude,171,133,3	duplicate(bdt)	Bullet Dealer Tony#iz	86
 izlude,171,127,3	duplicate(mdk)	Magazine Dealer Kenny	83
+izlude_in,110,64,3	duplicate(Dorian)	Dorian#izlude	878,2,2,{
\ No newline at end of file
diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index d8fd1d96a..124ea0ef3 100644
--- a/npc/pre-re/merchants/shops.txt
+++ b/npc/pre-re/merchants/shops.txt
@@ -1,15 +1,16 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================= 
 //= Shops
 //===== By: ================================================== 
 //= Daegaladh
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
-//= rAthena SVN
+//= Hercules GIT
 //===== Description: ========================================= 
 //= Pre-renewal-specific town shop NPCs.
 //===== Additional Comments: ================================= 
 //= 1.0 First version.
+//= 1.1 Added Tool Dealer & Trading Merchant [Streusel]
 //============================================================ 
 
 //=======================================================
@@ -19,3 +20,5 @@ izlude,105,99,0	shop	Butcher#iz	54,517:-1
 izlude,94,98,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
 izlude,105,92,7	shop	Vendor from Milk Ranch#i	90,519:-1
 izlude,164,138,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,115,61,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,121,64,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
\ No newline at end of file
diff --git a/npc/pre-re/quests/monstertamer.txt b/npc/pre-re/quests/monstertamer.txt
new file mode 100644
index 000000000..86f118f5a
--- /dev/null
+++ b/npc/pre-re/quests/monstertamer.txt
@@ -0,0 +1,15 @@
+//===== Hercules Script =======================================
+//= Monster Tamers
+//===== By: ==================================================
+//= Streusel
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Hercules
+//===== Description: =========================================
+//= Cute pet quest items
+//===== Additional Comments: =================================
+//= 1.0 Duplicates for Monster Tamer [Streusel]
+//============================================================
+
+izlude_in,129,64,4	duplicate(Monster_Tamer#izu)	Monster Tamer#izlude	125
\ No newline at end of file
diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt
new file mode 100644
index 000000000..b98aa2b95
--- /dev/null
+++ b/npc/pre-re/quests/quests_13_1.txt
@@ -0,0 +1,17 @@
+//===== Hercules Script ======================================
+//= Quest NPCs related to Ash-Vacuum
+//===== By: ==================================================
+//= Streusel
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Contains:
+//= Promotional Staff Duplicate for pre-renewal
+//===== Additional Comments: =================================
+//= 1.0 First Version. [Streusel]
+//============================================================
+
+// Onward to the New World
+//============================================================
+izlude,101,173,6	duplicate(Promotional Staff#iz)	Promotional Staff#izlude	100
\ No newline at end of file
diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt
new file mode 100644
index 000000000..ab5d816dc
--- /dev/null
+++ b/npc/pre-re/quests/quests_nameless.txt
@@ -0,0 +1,391 @@
+//===== Hercules Script ======================================
+//= Nameless Island Quests
+//===== By: ================================================== 
+//= Streusel
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Description: ========================================= 
+//= 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.
+//============================================================ 
+
+izlude_in,113,66,0	script	Strange Machine	111,{
+	if (checkweight(907,200) == 0) {
+		mes "[Dorian]";
+		mes "Ugh, just like a member";
+		mes "of the working class:";
+		mes "hoarding all your items";
+		mes "like a packrat? Have the";
+		mes "decency to relocate your";
+		mes "goods to Kafra Storage, please.";
+		close;
+	}
+	if (diamond_edq) == 10 {
+		set .@bolt_rand,rand(2,5);
+		mes "^3355FFThis must be Dorian's";
+		mes "Mystic Dryer de Elegance.";
+		mes "What do you want to do?^000000";
+		next;
+		while(1) {
+			set .@switch_sound,rand(1,4);
+			switch(select("Check the Machine:Replace the Engine:Tighten the Screw:Press a Switch")) {
+			case 1:
+				if (.@hit_status == 0) {
+					mes "^3355FFThere's no power";
+					mes "in this behemoth";
+					mes "of a machine.^000000";
+					next;
+				}
+				break;
+			case 2:
+				if (.@engine == 0) {
+					mes "^3355FFYou replace the rough";
+					mes "ruby in the ruby engine";
+					mes "with a new rough ruby.";
+					mes "It clicks into place";
+					mes "inside the engine core.^000000";
+					next;
+					set .@engine,.@engine+1;
+				}
+				else if (engine > 0) {
+					mes "^3355FFThe ruby in the";
+					mes "engine has already";
+					mes "been replaced.^000000";
+					next;
+				}
+				break;
+			case 3:
+				if (.@engine <  1) {
+					mes "^3355FFYou probably need";
+					mes "to replace the ruby";
+					mes "in the engine first.^000000";
+					next;
+				}
+				else if ((.@engine == 1) && (.@bolt < .@bolt_rand)) {
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					next;
+					set .@bolt,.@bolt+1;
+				}
+				else if ((.@engine == 1) && (.@bolt == .@bolt_rand)) {
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					mes "^0000FF*Click*^000000";
+					next;
+					set .@bolt,.@bolt+1;
+					set .@bolt_suc,.@bolt_suc+1;
+				}
+				else if ((.@engine == 1) && (.@bolt > .@bolt_rand)) {
+					mes "^3355FF*Krrrr-Krrrrr*^000000";
+					mes "^3355FF*KrrICK-ICK-ICK-KOOM*^000000";
+					next;
+					mes "^3355FFYou tightened the";
+					mes "screw too tightly!";
+					mes "The joint is broken...";
+					mes "You should go back";
+					mes "to Dorian for help.^000000";
+					setquest 3106;
+					set diamond_edq,11;
+					close;
+				}
+				else {
+					mes "^3355FFSomething must have";
+					mes "gone wrong. You'd be";
+					mes "better off starting";
+					mes "from the beginning...^000000";
+					close;
+				}
+				break;
+			case 4:
+				if ((.@engine <  1) && (.@bolt_suc < 1)) {
+					mes "^3355FFYou need to replace";
+					mes "the engine's ruby and";
+					mes "tighten the main screw";
+					mes "before you mess with";
+					mes "these switches.^000000";
+					next;
+				}
+				else if ((.@engine == 1) && (.@bolt_suc < 1)) {
+					mes "^3355FFYou need to tighten";
+					mes "the scren before you can";
+					mes "start the engine safely.";
+					next;
+				}
+				else if ((.@red >= 1) && (.@blue >= 1) && (.@yellow >= 1) && (.@green >= 1)) {
+					mes "^3355FFThe Mystic Dryer de";
+					mes "Elegance started with";
+					mes "a mighty buzz, and the";
+					mes "sound lowers to a calm";
+					mes "hum as it stabilizes.";
+					mes "It looks like you fixed it!^000000";
+					next;
+					mes "^3355FFYou should tell Dorian";
+					mes "first so that you can";
+					mes "use this machine.^000000";
+					setquest 3107;
+					set diamond_edq,12;
+					close;
+				}
+				else if ((.@engine == 1) && (.@bolt_suc == 1)) {
+					if (.@switch_sound == 1) {
+						mes "^3355FF*Buzz Buzz*^000000";
+						mes "^3355FF*Buzz Buzz*^000000";
+						mes "^3355FFThe machine is";
+						mes "vibrating weakly.";
+						mes "Which switch do";
+						mes "you want to press?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 1:
+							if (.@red  >= 0) {
+								mes "^3355FF*Buzzz Buzzz*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@red,.@red+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+					else if (.@switch_sound == 2) {
+						mes "^3355FF*Purr Purr*^000000";
+						mes "^3355FF*Purr Purr*^000000";
+						mes "^3355FFThe machine is vibrating";
+						mes "a little bit more strongly.";
+						mes "Which switch will";
+						mes "you try now?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 2:
+							if (.@blue >= 0) {
+								mes "^3355FF*Purrr Purr*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@blue,.@blue+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+					else if (.@switch_sound == 3) {
+						mes "^3355FF*Bzzz Bzzz*";
+						mes "*Bzzz Bzzz*";
+						mes "The machine's vibrations";
+						mes "are a bit more stable now.";
+						mes "Which switch will you try?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 3:
+							if (.@yellow >= 0) {
+								mes "^3355FF*Bzzzz Bzzzz*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@yellow,.@yellow+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+					else if (.@switch_sound == 4) {
+						next;
+						mes "^3355FF*Pzzzz Pzzz*";
+						mes "*Pzzzz Pzzz*";
+						mes "The machine is vibrating";
+						mes "fairly strongly now. Which";
+						mes "switch will you try?^000000";
+						next;
+						switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) {
+						default:
+							mes "^3355FF*Whiz Whiz*^000000";
+							mes "^3355FF*Whiz Whiz*^000000";
+							next;
+							mes "^3355FFThe machine made some";
+							mes "violent, erratic sounds,";
+							mes "and vibrated violently";
+							mes "before coming to a sudden";
+							mes "stop. That was the wrong";
+							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
+							set diamond_edq,11;
+							close;
+						case 4:
+							if (.@green >= 0) {
+								mes "^3355FFPzzzzz Pzzzz*^000000";
+								mes "^3355FF*Clang...!*^000000";
+								next;
+								mes "^3355FFThe machine's";
+								mes "vibrations have";
+								mes "grown stronger.";
+								mes "It looks like you";
+								mes "chose the right switch.^000000";
+								next;
+								set .@green,.@green+1;
+							}
+							else {
+								mes "^3355FF*Whiz Whiz*^000000";
+								mes "^3355FF*Whiz Whiz*^000000";
+								next;
+								mes "^3355FFThe machine made some";
+								mes "violent, erratic sounds,";
+								mes "and vibrated violently";
+								mes "before coming to a sudden";
+								mes "stop. That was the wrong";
+								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
+								set diamond_edq,11;
+								close;
+							}
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	if (diamond_edq == 12) {
+		mes "[Dorian]";
+		mes "It sounds like you're";
+		mes "done fixing my Mystic";
+		mes "Dryer de Elegance.";
+		mes "Why don't you come";
+		mes "back so I can explain";
+		mes "how you can use it?";
+		close;
+	}
+	if ((diamond_edq == 13) && (countitem(7722) < 1)) {
+		mes "^3355FFYou lift the main";
+		mes "operational switch,";
+		mes "turning on a light and";
+		mes "opening a convenient";
+		mes "slot. You insert the";
+		mes "wet bond of debt.^000000";
+		next;
+		mes "^3355FFThe engine's pistons";
+		mes "and cylinders churn";
+		mes "with a lively din, and";
+		mes "when the heater stops,";
+		mes "the slot reopens.^000000";
+		next;
+		mes "[" + strcharinfo(0) + "]";
+		mes "So this is the original";
+		mes "bond of debt that Muff";
+		mes "lost? It looks... Perfect!";
+		changequest 3108,3109;
+		getitem 7722,1; //Debt_Note
+		close;
+	}
+	else if ((diamond_edq == 13) && (countitem(7722) > 0)) {
+		mes "You already used this";
+		mes "machine to restore the";
+		mes "bond of debt. There's no";
+		mes "need to mess around";
+		mes "with it any longer.";
+		close;
+	}
+	mes "[Dorian]";
+	mes "Who are you?";
+	mes "Don't you dare lay";
+	mes "a hand on my precious";
+	mes "masterpiece inventions! ";
+	close;
+}
\ No newline at end of file
diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf
index 875900bda..fa2d6de8f 100644
--- a/npc/pre-re/scripts_athena.conf
+++ b/npc/pre-re/scripts_athena.conf
@@ -79,3 +79,6 @@ npc: npc/pre-re/other/mercenary_rent.txt
 npc: npc/pre-re/quests/mrsmile.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
\ No newline at end of file
diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt
index 75bc84b1b..b5fa9a8a9 100644
--- a/npc/quests/monstertamers.txt
+++ b/npc/quests/monstertamers.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Monster Tamers
 //===== By: ==================================================
 //= kobra_k88, Darkchild, x[tsk]
 //===== Current Version: =====================================
-//= 1.4b
+//= 1.5
 //===== Compatible With: =====================================
-//= rAthena 1.0
+//= Hercules
 //===== Description: =========================================
 //= Cute pet quest items
 //===== Additional Comments: =================================
@@ -16,6 +16,7 @@
 //= 1.4 Updated Monster taming item quests. [L0ne_W0lf]
 //= 1.4a FIXED item requirement for stellar hairpin. [L0ne_W0lf]
 //= 1.4b Fixed the delitem assosiated with the last uptate. [L0ne_W0lf]
+//= 1.5 Renamed Izlude Monster Tamer to function with Renewal [Streusel]
 //============================================================
 
 alberta_in,173,76,4	script	Monster Tamer#alb	125,{
@@ -464,7 +465,7 @@ aldeba_in,168,175,4	script	Monster Tamer#alde	125,{
 	}
 }
 
-izlude_in,129,64,4	script	Monster Tamer#izu	125,{
+-	script	::Monster_Tamer#izu	-1,{
 	mes "[Shogo]";
 	mes "Are you pre-occupied with";
 	mes "gathering items for monsters";
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index c8cc1d29a..1fe7d0bb9 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
 //= Quest NPCs related to Ash-Vacuum
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.7
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Contains Quests:
 //= Onward to the Other World
@@ -22,7 +22,7 @@
 //= - Contains Custom translated dialog.
 // Persuing Rayan Moore
 //= - Contains Custom translated dialog.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [L0ne_W0lf]
 //= 1.1 I missed an end in one of the lhz guards. [L0ne_W0lf]
 //= 1.2 Fixed missing ends, wrong label and some typos [Gepard]
@@ -44,10 +44,10 @@
 //= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy]
 //= 2.6a Added 'npcskill' command. [Euphy]
 //= 2.7 Updated incorrect EXP values & added checkre() checks
-//============================================================ 
+//============================================================
 
 // Onward to the New World
-//============================================================ 
+//============================================================
 prontera,163,53,3	script	Promotional Staff#prt	100,{
 	mes "[Promotional Staff]";
 	mes "We are looking for adventurers who are super curious and extremely brave.";
@@ -679,7 +679,7 @@ geffen,90,67,3	script	Promotional Staff#gef	100,{
 	}
 }
 
-izlude,101,173,6	script	Promotional Staff#iz	100,{
+-	script	::Promotional Staff#iz	-1,{
 	if (ep13_ryu > 8) {
 		mes "[Promotional Staff]";
 		mes "I bless you for your future! May it be full of happiness!";
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index b6e740a93..ae37edcea 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.2a
+//= 2.3
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Collection of Nameless Island Quests
@@ -58,6 +58,7 @@
 //=     - Broken Diamond
 //=     - Z-Gang Quest
 //= 2.2a Fixed a few job constant typos. [Euphy]
+//= 2.3 Removed Strange Machine [Streusel]
 //============================================================ 
 
 // Nameless Island and Cursed Monestary Access Quest
@@ -3642,7 +3643,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 	close;
 }
 
-izlude_in,110,64,3	script	Dorian	878,2,2,{
+-	script	::Dorian	-1,{
 	if (checkweight(907,200) == 0) {
 		mes "[Dorian]";
 		mes "Ugh, just like a member";
@@ -4148,382 +4149,6 @@ OnTouch:
 	end;
 }
 
-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;
-}
-
 // Broken Diamond
 //============================================================ 
 moc_ruins,152,147,5	script	Ibrahim	732,3,3,{
diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt
index 42ec73fe8..bf5cabdf3 100644
--- a/npc/re/airports/izlude.txt
+++ b/npc/re/airports/izlude.txt
@@ -7,6 +7,7 @@
 //===== Additional Comments: ================================= 
 //= Official NPCs.
 //= Updated to match the new Izlude Map. [Masao]
+//= Updated to Official coordinates
 //============================================================ 
 
-izlude,204,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	90
+izlude,202,75,3	duplicate(Airship_Staff_izlude)	Airship Staff#izlude	90
diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt
index f6e6f70ec..a4b584d3a 100644
--- a/npc/re/cities/jawaii.txt
+++ b/npc/re/cities/jawaii.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Jawaii Town Renewal
 //===== By: ==================================================
 //= Daegaladh, Masao
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules GIT
 //===== Description: =========================================
 //= Jawaii town NPCs.
 //===== Additional Comments: =================================
@@ -13,4 +13,4 @@
 //= 1.1 Changed to Official coordinates [Streusel]
 //============================================================
 
-izlude,180,224,6	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Izlude	71
+izlude,180,224,6	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Izlude	71
\ No newline at end of file
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 9c0692bdb..77f1f8d68 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -11,6 +11,7 @@
 //= 1.1 Added Dicastes merchants. [Joseph]
 //= 1.2 Moved more shops to Renewal file. [Euphy]
 //= 1.3 Added Malangdo tool dealer. [Euphy]
+//= 1.4 Moved Izlude merchants to Official coordinates [Streusel]
 //============================================================ 
 
 //=======================================================
@@ -33,10 +34,12 @@ dicastes01,207,200,6	shop	Points Merchant#dic	66,6360:-1,6361:-1,6362:-1,6363:-1
 //=======================================================
 // Izlude
 //=======================================================
-izlude,97,146,0	shop	Butcher#iz	54,517:-1
+izlude,160,186,0	shop	Butcher#iz	54,517:-1
 izlude,124,165,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
-izlude,95,145,6	shop	Vendor from Milk Ranch#i	90,519:-1
-izlude,174,164,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude,128,158,6	shop	Vendor from Milk Ranch#i	90,519:-1
+izlude_in,72,98,3	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,57,109,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,72,110,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
 
 //=======================================================
 // Juno
diff --git a/npc/re/quests/monstertamers.txt b/npc/re/quests/monstertamers.txt
new file mode 100644
index 000000000..cc95d3749
--- /dev/null
+++ b/npc/re/quests/monstertamers.txt
@@ -0,0 +1,15 @@
+//===== Hercules Script =======================================
+//= Monster Tamers
+//===== By: ==================================================
+//= Streusel
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Hercules
+//===== Description: =========================================
+//= Cute pet quest items
+//===== Additional Comments: =================================
+//= 1.0 Duplicates for Monster Tamer
+//============================================================
+
+izlude_in,55,105,4	duplicate(Monster_Tamer#izu)	Monster Tamer#izlude	125
\ No newline at end of file
diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt
new file mode 100644
index 000000000..107b7c029
--- /dev/null
+++ b/npc/re/quests/quests_13_1.txt
@@ -0,0 +1,17 @@
+//===== Hercules Script ======================================
+//= Quest NPCs related to Ash-Vacuum
+//===== By: ==================================================
+//= Streusel
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Contains:
+//= Promotional Staff Duplicate for Renewal
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+// Onward to the New World
+//============================================================
+izlude,102,171,6	duplicate(Promotional Staff#iz)	Promotional Staff#izlude	100
\ No newline at end of file
diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt
index a68fcb632..3f029f7f4 100644
--- a/npc/re/quests/quests_lighthalzen.txt
+++ b/npc/re/quests/quests_lighthalzen.txt
@@ -1,21 +1,22 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================= 
 //= Quest NPCs located in Lighthalzen
 //===== By: ================================================== 
 //= Ziu, Heris (translation)
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.1a
 //===== Compatible With: ===================================== 
-//= rAthena SVN
+//= Hercules GIT
 //===== Description: ========================================= 
 //= Quests related to Lighthalzen City.
 //===== Additional Comments: ================================= 
 //= 1.0 Updated to match the new Izlude Map. [Masao]
 //= 1.1 Added Somatology Laboratory F4 quest. [Euphy]
+//= 1.1a Coordinate update
 //============================================================ 
 
 // Renewal split [Daegaladh]
 //============================================================
-izlude,171,73,6	duplicate(Scamp)	Scamp#2	853
+izlude,172,73,6	duplicate(Scamp)	Scamp#2	853
 
 // Somatology Laboratory F4
 //============================================================
diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf
index cc12ddceb..30bf67476 100644
--- a/npc/re/scripts_athena.conf
+++ b/npc/re/scripts_athena.conf
@@ -80,4 +80,6 @@ npc: npc/re/quests/quests_dicastes.txt
 npc: npc/re/quests/quests_izlude.txt
 npc: npc/re/quests/quests_lighthalzen.txt
 npc: npc/re/quests/quests_malangdo.txt
-npc: npc/re/quests/quests_veins.txt
\ No newline at end of file
+npc: npc/re/quests/quests_veins.txt
+npc: npc/re/quests/monstertamers.txt
+npc: npc/re/quests/quests_13_1.txt
\ No newline at end of file
diff --git a/npc/warps/pvp.txt b/npc/warps/pvp.txt
index e9440aeb9..c0e6b09a3 100644
--- a/npc/warps/pvp.txt
+++ b/npc/warps/pvp.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Prontera Arena & PvP Warp Script
 //===== By: ==================================================
 //= Athena (any)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Hercules GIT
 //===== Description: =========================================
 //= Warp Points for Prontera Arena and PvP Maps
 //===== Additional Comments: =================================
@@ -13,6 +13,7 @@
 //= 1.1 Fixed Prontera Arena warp [Yor]
 //= 1.2 Added addition warps for PvP Nightmare Mode maps.
 //= 1.3 Fixed duplicate warp names [Timexy]
+//= 1.4 Disabled removed maps ordeal_*-3 and ordeal_*-4 [Streusel]
 //============================================================
 
 //Battle Ordeal Mode