-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

32 files changed, 705 insertions, 476 deletions

diff --git a/conf/maps.conf b/conf/maps.conf
index c34b05adf..6d142e634 100644
--- a/conf/maps.conf
+++ b/conf/maps.conf
@@ -1052,6 +1052,8 @@ map: ecl_tdun03
 map: ecl_tdun04
 map: ecl_hub01
 map: que_avan01
+
+// Pyramids Basement Nightmare Mode
 map: moc_prydn1
 map: moc_prydn2
 
@@ -1059,6 +1061,7 @@ map: moc_prydn2
 // New Maps added 2013-02-10 (Thanks Streusel!)
 // Credits to Baneado for reporting some
 // ===============================
+// Izlude Novice Academy & Tutorial
 map: iz_int
 map: iz_int01
 map: iz_int02
@@ -1081,10 +1084,13 @@ map: izlude_d
 map: izlude_c
 map: izlude_b
 map: izlude_a
+
 map: prt_fild08d
 map: prt_fild08c
 map: prt_fild08b
 map: prt_fild08a
+
+// War of Emperium - Third Edition (TE)
 map: te_prt_gld
 map: te_prtcas01
 map: te_prtcas02
@@ -1099,14 +1105,27 @@ map: te_aldecas2
 map: te_aldecas3
 map: te_aldecas4
 map: te_aldecas5
+
+// Glast Heim Memorial & Nightmare
 map: gl_cas02_
 map: gl_chyard_
-map: 2@gl_k
 map: 1@gl_k
+map: 2@gl_k
+
 map: silk_lair
+
+//Wave Mode Memorial Dungeon
+map: 1@def01
 map: 1@def02
 map: 1@def03
 
+// Heroes' Trails - Part 1
+map: 1@gef
+map: 1@face
+map: 1@sara
+map: 1@gef_in
+map: dali
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
 
diff --git a/db/job_db2.txt b/db/job_db2.txt
index ef1b4edbd..1880808fa 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -212,7 +212,7 @@
 // Sura (Regular)
 4070,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5
 // Genetic (Regular)
-4071,4,4,5,0,0,5,4,2,0,0,0,4,5,0,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,0,4,4,1,0,5,2,4,0,0,4,4,0,2,0,0,4
+4071,4,4,5,0,0,5,4,2,0,0,0,4,5,3,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4
 // Shadow Chaser (Regular)
 4072,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0
 // Royal Guard (Trans)
@@ -226,7 +226,7 @@
 // Sura (Trans)
 4077,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5
 // Genetic (Trans)
-4078,4,4,5,0,0,5,4,2,0,0,0,4,5,0,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,0,4,4,1,0,5,2,4,0,0,4,4,0,2,0,0,4
+4078,4,4,5,0,0,5,4,2,0,0,0,4,5,3,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4
 // Shadow Chaser (Trans)
 4079,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0
 // Rune Knight (Dragon) (Regular)
@@ -268,7 +268,7 @@
 // Baby Sura
 4106,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5
 // Baby Genetic
-4107,4,4,5,0,0,5,4,2,0,0,0,4,5,0,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,0,4,4,1,0,5,2,4,0,0,4,4,0,2,0,0,4
+4107,4,4,5,0,0,5,4,2,0,0,0,4,5,3,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4
 // Baby Shadow Chaser
 4108,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0
 // Baby Rune Knight (Dragon)
@@ -285,6 +285,6 @@
 4191,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0
 // Note: Kagerou and Oboro will temporarly use Ninja stat bonuses until official ones are known.
 // Kagerou
-4211,2,2,0,0,5,2,0,0,0,4,2,5,0,4,6,2,5,0,0,6,2,4,5,0,0,0,0,0,0,4,2,6,5,0,0,0,0,0,1,3,2,4,5,6,0,0,0,0,0,0
+4211,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
 // Oboro
-4212,2,2,0,0,5,2,0,0,0,4,2,5,0,4,6,2,5,0,0,6,2,4,5,0,0,0,0,0,0,4,2,6,5,0,0,0,0,0,1,3,2,4,5,6,0,0,0,0,0,0
+4212,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
\ No newline at end of file
diff --git a/db/map_index.txt b/db/map_index.txt
index e2ed76848..d0464356d 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -862,11 +862,6 @@ ecl_hub01
 que_avan01
 moc_prydn1
 moc_prydn2
-
-// ===============================
-// New Maps added 2013-02-10 (Thanks Streusel!)
-// Credits also to Baneado for reporting some
-// ===============================
 iz_int
 iz_int01
 iz_int02
@@ -907,13 +902,19 @@ te_aldecas2
 te_aldecas3
 te_aldecas4
 te_aldecas5
+1@gl_k
+2@gl_k
 gl_cas02_
 gl_chyard_
-2@gl_k
-1@gl_k
 silk_lair
+1@def01
 1@def02
 1@def03
+1@gef
+1@face
+1@sara
+1@gef_in
+dali
 
 // Only add maps under this line if they are not standard maps!
 
diff --git a/db/pre-re/map_cache.dat b/db/pre-re/map_cache.dat
index 645961065..dea34f052 100644
--- a/db/pre-re/map_cache.dat
+++ b/db/pre-re/map_cache.dat
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
index 892ce938e..90f579a8c 100644
--- a/db/pre-re/skill_cast_db.txt
+++ b/db/pre-re/skill_cast_db.txt
@@ -1072,75 +1072,75 @@
 //==========================================
 
 //===== Rune Knight ======================== 
-//-- RK_ENCHANTBLADE 
+//-- RK_ENCHANTBLADE
 2001,1000,0,0,300000,0,0
-//-- RK_SONICWAVE 
+//-- RK_SONICWAVE
 2002,0,1000,0,0,0,2000
-//-- RK_DEATHBOUND 
+//-- RK_DEATHBOUND
 2003,0,2000,0,2000,0,3000
-//-- RK_HUNDREDSPEAR 
+//-- RK_HUNDREDSPEAR
 2004,1000:900:800:700:600:500:400:300:200:100,500,0,0,0,3000
-//-- RK_WINDCUTTER 
-2005,0,2000,0,0,0,2000
-//-- RK_IGNITIONBREAK 
+//-- RK_WINDCUTTER
+2005,0,0,0,15000,0,2000
+//-- RK_IGNITIONBREAK
 2006,1000,0,0,0,0,2000
 
-//-- RK_DRAGONBREATH 
+//-- RK_DRAGONBREATH
 2008,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,10000,0,0
-//-- RK_DRAGONHOWLING 
+//-- RK_DRAGONHOWLING
 2009,0,0,0,15000,0,10000
 
-//-- RK_MILLENNIUMSHIELD 
+//-- RK_MILLENNIUMSHIELD
 2011,0,1000,0,180000,0,60000
-//-- RK_CRUSHSTRIKE 
+//-- RK_CRUSHSTRIKE
 2012,0,0,0,180000,0,30000
-//-- RK_REFRESH 
+//-- RK_REFRESH
 2013,0,0,0,60000,0,120000
-//-- RK_GIANTGROWTH 
+//-- RK_GIANTGROWTH
 2014,0,0,0,180000,0,0
-//-- RK_STONEHARDSKIN 
+//-- RK_STONEHARDSKIN
 2015,0,0,0,180000,10000,0
-//-- RK_VITALITYACTIVATION 
+//-- RK_VITALITYACTIVATION
 2016,0,0,0,180000,0,0
-//-- RK_STORMBLAST 
-2017,0,0,0,0,0,0
-//-- RK_FIGHTINGSPIRIT 
+//-- RK_STORMBLAST
+2017,0,2000,0,0,0,0
+//-- RK_FIGHTINGSPIRIT
 2018,0,0,0,180000,0,0
-//-- RK_ABUNDANCE 
+//-- RK_ABUNDANCE
 2019,0,0,0,180000,0,0
 //========================================== 
 
 //===== Gillotine Cross ==================== 
-//-- GC_VENOMIMPRESS 
+//-- GC_VENOMIMPRESS
 2021,0,3000:2500:2000:1500:1000,0,10000:20000:30000:40000:50000,0,0
-//-- GC_CROSSIMPACT 
+//-- GC_CROSSIMPACT
 2022,0,2500:2000:1500:1000:500,0,0,0,0
-//-- GC_DARKILLUSION 
+//-- GC_DARKILLUSION
 2023,0,1500,0,0,0,0
 
-//-- GC_CREATENEWPOISON 
+//-- GC_CREATENEWPOISON
 2025,0,500,0,0,0,0
-//-- GC_ANTIDOTE 
+//-- GC_ANTIDOTE
 2026,0,0,0,0,0,0
-//-- GC_POISONINGWEAPON 
+//-- GC_POISONINGWEAPON
 2027,0,1000,0,60000:120000:180000:240000:300000,300000,0
-//-- GC_WEAPONBLOCKING 
+//-- GC_WEAPONBLOCKING
 2028,0,2000,0,180000,0,0
-//-- GC_COUNTERSLASH 
+//-- GC_COUNTERSLASH
 2029,0,2000,0,0,0,0
-//-- GC_WEAPONCRUSH 
+//-- GC_WEAPONCRUSH
 2030,0,1000,0,60000,0,0
-//-- GC_VENOMPRESSURE 
+//-- GC_VENOMPRESSURE
 2031,0,1000,0,0,0,0
-//-- GC_POISONSMOKE 
+//-- GC_POISONSMOKE
 2032,0,2000,0,6000:8000:10000:12000:14000,0,0
-//-- GC_CLOAKINGEXCEED 
+//-- GC_CLOAKINGEXCEED
 2033,0,2000,0,0,0,0
-//-- GC_PHANTOMMENACE 
+//-- GC_PHANTOMMENACE
 2034,0,1000,0,0,0,0
-//-- GC_HALLUCINATIONWALK 
+//-- GC_HALLUCINATIONWALK
 2035,0,0,0,30000:35000:40000:45000:50000,25000,300000
-//-- GC_ROLLINGCUTTER 
+//-- GC_ROLLINGCUTTER
 2036,0,200,0,3000,0,0
 //-- GC_CROSSRIPPERSLASHER 
 2037,0,1000,0,0,0,0
diff --git a/db/quest_db.txt b/db/quest_db.txt
index 50dcc1dc4..7dcf6735b 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -2219,3 +2219,117 @@
 60353,0,0,0,0,0,0,0,"Bathroom Ghost"
 60354,0,0,0,0,0,0,0,"Bathroom Ghost"
 60355,0,0,0,0,0,0,0,"Bathroom Ghost"
+
+// Mora
+// Mora Quests
+// Misty Forest Labyrinth
+7211,9000,0,0,0,0,0,0,"Misty Forest Labyrinth Exploration"
+7212,0,0,0,0,0,0,0,"Loki's Search"
+7213,0,0,0,0,0,0,0,"Wandering Protector"
+
+// New Sapha's Honor Quest
+7206,0,0,0,0,0,0,0,"New Day for Cheshire"
+7207,0,0,0,0,0,0,0,"Cheshire's Box"
+7208,82800,0,0,0,0,0,0,"Wait for Cheshire?"
+
+// Roast Beef Quest
+11182,180,0,0,0,0,0,0,"Teohre's Report"
+11183,0,0,0,0,0,0,0,"Teohre's Favor"
+// Theo
+11184,0,0,0,0,0,0,0,"Runaway Laphine"
+11185,0,0,0,0,0,0,0,"Pouch"
+11186,0,0,0,0,0,0,0,"Pouch"
+11187,0,0,0,0,0,0,0,"Pouch"
+11188,0,0,0,0,0,0,0,"Pouch"
+11189,0,0,0,0,0,0,0,"Roast Beef"
+11190,0,0,0,0,0,0,0,"Roast Beef"
+11191,0,0,0,0,0,0,0,"Shortage of Roast Beef"
+
+11198,0,0,0,0,0,0,0,"Mora Village..."
+11199,0,0,0,0,0,0,0,"Theo's Friend"
+// Sonya
+11192,0,0,0,0,0,0,0,"Mora Village..."
+11193,0,0,0,0,0,0,0,"Sonya's Friend"
+
+11194,0,0,0,0,0,0,0,"Runaway Laphine"
+11195,0,0,0,0,0,0,0,"Pouch"
+11196,0,0,0,0,0,0,0,"Pouch"
+11197,0,0,0,0,0,0,0,"Pouch"
+//
+11200,0,0,0,0,0,0,0,"Pouch"
+11201,0,0,0,0,0,0,0,"Roast Beef"
+11202,0,0,0,0,0,0,0,"Roast Beef"
+11203,0,0,0,0,0,0,0,"Shortage of Roast Beef"
+
+11206,0,0,0,0,0,0,0,"Quick Delivery Yoneseu"
+11207,0,0,0,0,0,0,0,"A Very Heavy Burden"
+11208,0,0,0,0,0,0,0,"Daphne"
+
+// Ropewa & Yuridi Quest
+1109,0,0,0,0,0,0,0,"Ropewa & Yuridi - Survivors of the Labyrinth"
+1110,0,0,0,0,0,0,0,"Ropewa & Yuridi - Victims of the Labyrinth"
+1111,0,0,0,0,0,0,0,"Ropewa & Yuridi - Maze in the Labyrinth"
+1112,0,0,0,0,0,0,0,"Ropewa & Yuridi - Lost in the Labyrinth"
+1113,0,0,0,0,0,0,0,"Ropewa & Yuridi - Torn Apart"
+1114,0,0,0,0,0,0,0,"Ropewa & Yuridi - The Cost of Restoration"
+1115,0,0,0,0,0,0,0,"Ropewa & Yuridi - Song of the Abyss"
+1116,0,0,0,0,0,0,0,"Ropewa & Yuridi - Dead Man's Song"
+1117,0,0,0,0,0,0,0,"Ropewa & Yuridi - Eternal Promise, Broken Ring"
+
+// Ropewa Clue Quest
+1118,0,0,0,0,0,0,0,"Neighborhood Knight - I Need Clues"
+
+// Researcher's Quest
+5016,0,0,0,0,0,0,0,"Bring me a Research Tool Bag"
+5017,0,0,0,0,0,0,0,"Revenge of the Reseacher"
+5018,0,0,0,0,0,0,0,"Revenge of the Reseacher"
+5019,0,0,0,0,0,0,0,"Bathroom Sample Studying"
+5020,86400,0,0,0,0,0,0,"Sample Researching"
+5021,0,0,0,0,0,0,0,"Sample Collecting"
+5022,0,0,0,0,0,0,0,"Sample Collecting"
+5023,21600,0,0,0,0,0,0,"Inspection of the Sample"
+5024,0,0,0,0,0,0,0,"Eastern Pool Research"
+5025,0,0,0,0,0,0,0,"Western Pool Research"
+5026,0,0,0,0,0,0,0,"Southern Pool Research"
+5027,0,0,0,0,0,0,0,"Northern Pool Research"
+5028,43200,0,0,0,0,0,0,"Inspection of the Sample"
+5029,3600,0,0,0,0,0,0,"Unidentified Creature"
+
+// Mora Coin Daily Quests
+12225,0,2132,3,0,0,0,0,"Pom Spider Hunting"
+12226,0,2133,4,0,0,0,0,"Angra Mantis Hunting"
+12227,0,2134,5,0,0,0,0,"Parus Hunting"
+12228,0,2136,6,0,0,0,0,"Little Fatam Hunting"
+12229,0,2137,7,0,0,0,0,"Miming Hunting"
+12230,82800,0,0,0,0,0,0,"Mora Monster Hunt"
+12231,0,0,0,0,0,0,0,"Insect Feeler Collecting"
+12232,0,0,0,0,0,0,0,"Immortal Heart Collecting"
+12233,0,0,0,0,0,0,0,"Rotten Bandage Collecting"
+12234,0,0,0,0,0,0,0,"Orcish Voucher Collecting"
+12235,0,0,0,0,0,0,0,"Skeleton Bone Collecting"
+12236,0,0,0,0,0,0,0,"Memento Collecting"
+12237,0,0,0,0,0,0,0,"Shell Collecting"
+12238,0,0,0,0,0,0,0,"Scale Shell Collecting"
+12239,0,0,0,0,0,0,0,"Venom Canine Collecting"
+12240,0,0,0,0,0,0,0,"Sticky Mucus Collecting"
+12241,82800,0,0,0,0,0,0,"Mora Item Request 1"
+12242,82800,0,0,0,0,0,0,"Mora Item Request 2"
+
+// Missing Person Quests
+12243,0,0,0,0,0,0,0,"Missing Information on Tajareu"
+12244,0,0,0,0,0,0,0,"Missing Information on Tokenizer"
+12245,0,0,0,0,0,0,0,"Missing Information on Mesile"
+12246,0,0,0,0,0,0,0,"Missing Information on Noir"
+12247,0,0,0,0,0,0,0,"Missing Information on Pajama God"
+12248,0,0,0,0,0,0,0,"Missing Information on Mendel"
+12249,0,0,0,0,0,0,0,"Missing Information on Miles"
+12250,0,0,0,0,0,0,0,"Missing Information on Kunmune"
+12251,0,0,0,0,0,0,0,"Missing Information on Chayihokin"
+12252,0,0,0,0,0,0,0,"Missing Information on Tuale"
+12253,82800,0,0,0,0,0,0,"Missing Person Search Time Limit"
+
+// New Novice Ground
+2299,0,0,0,0,0,0,0,"Training Center: Talk to Lisa"
+2300,0,0,0,0,0,0,0,"Training Center: Talk to General Reindeer"
+2301,0,0,0,0,0,0,0,"Training Center: Leave the boat"
+2302,0,0,0,0,0,0,0,"Training Center: Formation"
\ No newline at end of file
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index f6bd7dc01..d921689c3 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -147,7 +147,7 @@
 2725:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; }
 2726:2727,{ bonus bUseSPrate,-25; }
 2733:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; }
-2747:13061,{ bonus bHit,5; bonus bMatk,5; }
+2747:13061,{ bonus bHit,5; bonus bMatk,5; bonus2 bSkillUseSP,"SC_ENERVATION",20; bonus2 bSkillUseSP,"SC_GROOMY",20;}
 2777:2778:5479,{ bonus bMaxHP,300; bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,5; }
 2779:2780:5482,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; }
 2779:2780:5577,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; }
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index cd79556d3..dea34f052 100644
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index 597547e68..462e2fb26 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -5,7 +5,7 @@
 // Note: Keep the Sprite_Name field as it is in the game client.
 
 1001,SCORPION,Scorpion,Scorpion,16,153,1,108,81,1,33,40,16,5,12,15,10,5,19,5,10,12,0,4,23,0x3191,200,1564,864,576,0,0,0,0,0,0,0,990,70,904,5500,757,57,943,210,7041,100,508,200,625,20,0,0,0,0,4068,1
-1002,PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,0,0,0,0,4001,1
+1002,PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,601,20,0,0,4001,1
 //1003,TESTEGG,Test Egg,Test Egg,2,100000,0,10,10,0,3,9,99,0,1,99,1,1,1,1,10,12,0,4,22,0,512,0,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1004,HORNET,Hornet,Hornet,11,90,1,81,60,1,13,16,7,1,12,24,4,5,6,5,10,12,0,4,24,0x1181,150,1292,792,216,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1
 1005,FARMILIAR,Familiar,Familiar,24,427,1,144,162,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3881,150,1276,576,384,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1
@@ -66,7 +66,7 @@
 1060,BIGFOOT,Bigfoot,Bigfoot,29,587,1,180,203,1,50,62,55,7,18,4,7,0,12,0,10,12,2,2,22,0x91,300,1260,192,192,0,0,0,0,0,0,0,948,9000,2289,5,919,5000,740,80,516,1500,518,450,756,43,0,0,0,0,4074,1
 1061,NIGHTMARE,Nightmare,Nightmare,69,2872,1,501,1032,1,283,345,116,15,57,32,20,15,70,15,10,12,2,6,68,0x3395,150,1816,816,432,0,0,0,0,0,0,0,944,6000,510,500,2608,2,603,30,505,100,1261,1,984,60,0,0,0,0,4127,1
 1062,PORING_,Santa Poring,Santa Poring,3,69,1,4,5,1,12,16,0,0,1,14,3,10,12,90,10,12,1,3,26,0x81,400,1672,672,480,0,0,0,0,0,0,0,529,2000,530,1000,507,1000,512,1000,2236,100,512,7,0,0,0,0,0,0,4005,1
-1063,LUNATIC,Lunatic,Lunatic,3,55,1,36,27,1,11,12,18,0,10,3,3,0,8,5,10,12,0,2,60,0x81,200,1456,456,336,0,0,0,0,0,0,0,705,6500,949,1000,2262,4,512,2000,507,600,515,1100,622,20,0,0,0,0,4006,1
+1063,LUNATIC,Lunatic,Lunatic,3,55,1,36,27,1,11,12,18,0,10,3,3,0,8,5,10,12,0,2,60,0x81,200,1456,456,336,0,0,0,0,0,0,0,705,6500,949,1000,2262,4,512,2000,507,600,515,1100,622,20,601,20,0,0,4006,1
 1064,MEGALODON,Megalodon,Megalodon,46,1335,1,342,386,1,117,149,52,28,35,24,30,28,29,15,10,12,1,1,29,0x81,200,2492,792,432,0,0,0,0,0,0,0,959,5500,932,1500,510,80,717,120,719,10,603,2,624,20,0,0,0,0,4067,1
 1065,STROUF,Strouf,Strouf,61,3052,1,626,705,1,162,192,67,21,49,16,31,20,33,20,10,12,2,5,61,0x3885,150,1872,672,384,0,0,0,0,0,0,0,951,5335,756,115,2315,2,1461,2,949,3000,720,20,956,1500,0,0,0,0,4111,1
 1066,VADON,Vadon,Vadon,45,1252,1,342,386,1,78,103,54,21,35,21,28,20,33,15,10,12,0,5,21,0x91,300,1632,432,540,0,0,0,0,0,0,0,991,40,960,9000,910,3000,2313,5,943,100,757,40,717,50,0,0,0,0,4049,1
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 5b83447bf..0b7a905cf 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1080,7 +1080,7 @@
 //-- RK_HUNDREDSPEAR
 2004,1000:900:800:700:600:500:400:300:200:100,500,0,0,0,3000,-1
 //-- RK_WINDCUTTER
-2005,0,2000,0,0,0,2000,-1
+2005,0,0,0,15000,0,2000,-1
 //-- RK_IGNITIONBREAK
 2006,1000,0,0,0,0,2000,-1
 
@@ -1102,7 +1102,7 @@
 //-- RK_VITALITYACTIVATION
 2016,0,0,0,180000,0,0,-1
 //-- RK_STORMBLAST 
-2017,0,0,0,0,0,0,2000
+2017,0,2000,0,0,0,0,-1
 //-- RK_FIGHTINGSPIRIT
 2018,0,0,0,180000,0,0,-1
 //-- RK_ABUNDANCE
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index acb879442..1659d9aac 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -678,15 +678,15 @@
 //****
 // RK Rune Knight
 //****
-2001,1,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,	RK_ENCHANTBLADE,Enchant Blade
+2001,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,	RK_ENCHANTBLADE,Enchant Blade
 2002,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RK_SONICWAVE,Sonic Wave
 2003,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,	RK_DEATHBOUND,Death Bound
 2004,1,8,1,-1,0,0,10,-5,no,0,0,0,weapon,0,	RK_HUNDREDSPEAR,Hundred Spear
 2005,1,6,2,4,0x2,2,5,1,no,0,0,0,weapon,3,	RK_WINDCUTTER,Wind Cutter
 2006,0,6,4,-1,0x2,5,5,1,no,0,0,0,weapon,0,	RK_IGNITIONBREAK,Ignition Break
 2007,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,		RK_DRAGONTRAINING,Dragon Training
-2008,9,6,2,3,0xC2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,misc,0,	RK_DRAGONBREATH,Dragon Breath //CHECK May have to change this back to a weapon type attack.
-2009,0,6,4,0,0x3,3:4:5:6:7,5,1,yes,0,0,0,weapon,0,	RK_DRAGONHOWLING,Dragon Howling
+2008,9,6,2,3,0xC2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,misc,0,	RK_DRAGONBREATH,Dragon Breath
+2009,0,6,4,0,0x3,3:4:5:6:7,5,1,yes,0,0,0,none,0,	RK_DRAGONHOWLING,Dragon Howling
 2010,0,0,0,0,0,0,10,0,no,0,0,0,none,0,		RK_RUNEMASTERY,Rune Mastery
 2011,0,6,4,0,0x1,0,1,1,yes,0,0,0,none,0,	RK_MILLENNIUMSHIELD,Millenium Shield
 2012,1,6,4,-1,0,0x8,1,1,yes,0,0,0,weapon,0,	RK_CRUSHSTRIKE,Crush Strike
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index e1759966f..a5ba6e065 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -1,4 +1,4 @@
-//===== Hercules Documentation ================================
+//===== Hercules Documentation ================================
 //= Hercules Script Commands
 //===== By: ==================================================
 //= Hercules Dev Team
@@ -6435,7 +6435,7 @@ placement of the illustration and takes following values:
     3 - middle of screen in a movable window with an empty title bar 
     4 - middle of screen without the window header, but still movable 
 
-The picture is read from data\texture\???????\illust, from both the GRF archive
+The picture is read from data\texture\유저인터페이스\illust, from both the GRF archive
 and data folder, and is required to be a bitmap. The file extension .bmp can be
 omitted. Magenta color (#ff00ff) is considered transparent. There is no limit
 placed on the size of the illustrations by the client, although loading of large
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
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 2ef9789f2..7b492bc90 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -97,7 +97,7 @@
 #define MAX_GUILDSKILL	15 // increased max guild skills because of new skills [Sara-chan]
 #define MAX_GUILDLEVEL 50
 #define MAX_GUARDIANS 8	//Local max per castle. [Skotlex]
-#define MAX_QUEST_DB 2200 //Max quests that the server will load
+#define MAX_QUEST_DB 2300 //Max quests that the server will load
 #define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest
 
 // for produce