Merge pull request #201 from Michieru/master

Super-Mega Thanks to Michieru!
NPC Changelog (might be incomplete, did my best)
- npc/battleground/bg_common.txt 
-- 1.4 Added GM management function. [Euphy] 
- npc/battleground/flavius/flavius01.txt 
-- 1.4 Label standardization. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/battleground/flavius/flavius02.txt 
-- 1.5 Label standardization. [Euphy] 
-- 1.6 Added GM management function. [Euphy] 
- npc/battleground/tierra/tierra01.txt 
-- 1.4 Label standardization. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/battleground/tierra/tierra02.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/cities/ayothaya.txt 
-- 1.9 Updated Renewal warp coordinates. 
- npc/cities/izlude.txt 
-- 1.9a A part of Kylick's dialogue is Pre-Renewal only. [Euphy] 
- npc/cities/yuno.txt 
-- 1.5 Added Renewal coordinates for Payon and Izlude. [Euphy] 
- npc/events/bossnia.txt 
-- 1.2 Moved spawns and warps (by Masao) to this file. [Euphy] 
- npc/events/easter_2010.txt 
-- 1.0 First version. [Euphy] 
- npc/events/gdevent_aru.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/events/gdevent_sch.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/events/god_se_festival.txt 
-- 1.1 Added GM management function. [Euphy] 
- npc/jobs/2-2/rogue.txt 
-- impossible get a Gladius [3]. (bugreport:481) [Samuray22] 
- npc/jobs/2-2e/SoulLinker.txt 
-- 1.6 Updated to match the latest official script. [Euphy] 
- npc/kafras/kafras.txt 
-- 1.1a Fixed Pre-RE Call and some leftovers. [Lemongrass] 
-- 1.1b Enabled saving in Izlude duplicates (RE). [Euphy] 
- npc/merchants/alchemist.txt 
-- 1.8 Moved Craft Book Merchant to Renewal path. [Euphy] 
- npc/mobs/citycleaners.txt 
-- 1.2 Split spawns into Pre-RE/RE and Town files. [Euphy] 
- npc/mobs/towns.txt 
-- 1.0 First version. 
- npc/other/Global_Functions.txt 
-- 2.17 Renamed 'F_RandMes' to 'F_Rand'. [Euphy]
-- 2.18 Removed useless 'getJobName' function. [Euphy]
- npc/other/acolyte_warp.txt 
-- 1.0 First version. [Euphy] 
- npc/other/arena/arena_aco.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Script updates, and removed two level restrictions. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/other/arena/arena_lvl50.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates. [Euphy] 
- npc/other/arena/arena_lvl60.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Script updates. [Euphy] 
- npc/other/arena/arena_lvl70.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates. [Euphy] 
- npc/other/arena/arena_lvl80.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates, and removed a level restriction. [Euphy] 
- npc/other/arena/arena_party.txt 
-- 1.4 Label standardization and bug fixes. [Euphy] 
-- 1.5 Script updates, and removed a level restriction. [Euphy] 
- npc/other/arena/arena_room.txt 
-- 1.2 Label standardization, disabled GM NPCs. [Euphy] 
-- 1.2a Added Renewal level checksk. [Euphy] 
-- 1.3 Script updates. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/other/hugel_bingo.txt 
-- 1.9 Some optimization/standardization. [Euphy] 
- npc/other/marriage.txt 
-- 1.3 Changed permanent global variables to temporary ones. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/other/pvp.txt 
-- 2.4 Fixed incorrect use of 'close' and some cleaning. [Joseph] 
-- 2.5 Renewal/Pre-Renewal split. [Euphy] 
- npc/other/turbo_track.txt 
-- 1.1 Updated RE/Pre-RE EXP. [Euphy] 
-- 1.2 Added Renewal features. [Euphy] 
- npc/pre-re/cities/yuno.txt 
-- 1.0 First version. 
- npc/pre-re/kafras/kafras.txt 
-- 1.0 First version. 
- npc/pre-re/merchants/ammo_boxes.txt 
-- 1.0 First version, Pre-Renewal duplicates. 
- npc/pre-re/merchants/ammo_dealer.txt 
-- 1.0 First version, Pre-Renewal duplicates. 
- npc/pre-re/merchants/shops.txt 
-- 1.1 Moved Izlude shops to pre-re/re paths. [Streusel] 
- npc/pre-re/mobs/citycleaners.txt 
-- 1.0 First version, Pre-Renewal spawns. 
- npc/pre-re/other/bulletin_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE/RE paths. 
- npc/pre-re/other/msg_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE path. 
- npc/pre-re/other/pvp.txt 
-- 1.0 First version, Pre-Renewal. 
- npc/pre-re/other/resetskill.txt 
-- 1.0 First version. [L0ne_W0lf] 
- npc/pre-re/other/turbo_track.txt 
-- 1.0 Split Peco Peco Manager NPC. 
- npc/pre-re/quests/first_class/tu_archer.txt 
-- 1.0 First version. [Euphy] 
- npc/pre-re/quests/monstertamers.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. 
- npc/pre-re/quests/quests_13_1.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] 
- npc/pre-re/quests/quests_nameless.txt 
-- 1.0 Moved Dorian to pre-re/re paths. 
- npc/pre-re/quests/quests_veins.txt 
-- 1.0 First version. 
- npc/pre-re/warps/other/arena.txt 
-- 1.0 First version, Pre-Renewal warps. 
- npc/quests/dandelion_request.txt 
-- 1.3 Added GM management function. [Euphy] 
- npc/quests/eye_of_hellion.txt 
-- 2.0 Updated EXP rewards. 
-- 2.1 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/first_class/tu_archer.txt 
-- 1.1 optimized [Lupus] 
-- 1.2 fixed Weight check 
- npc/quests/first_class/tu_magician01.txt 
-- 1.4 Updated to match the official script. [Euphy] 
- npc/quests/first_class/tu_merchant.txt 
-- 1.1 Fixed bugs, optimized [Lupus] 
-- 1.2 fixed Weight check 
- npc/quests/first_class/tu_sword.txt 
-- 1.5 Added Renewal Izlude coordinates. 
-- 1.6 Added Pre-Renewal support. [Euphy] 
- npc/quests/first_class/tu_thief01.txt 
-- 1.5 Added Pre-Renewal support. [Euphy] 
- npc/quests/mage_solution.txt 
-- 1.0 Split from Pre-Renewal Mage job quest. [Zopokx] 
- npc/quests/okolnir.txt 
-- 1.1 Some bug fixes. [Toshiro90/Euphy] 
- npc/quests/partyrelay.txt 
-- 1.2 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/quests_13_1.txt 
-- 3.1 Updated RE/Pre-RE EXP. [Euphy] 
-- 3.2 Updated ep13_start and dialog to match official script. [Joseph] 
-- 3.3 Updated to match the latest official script. [Euphy] 
-- 3.3a Added Izlude RE coordinates. [Euphy] 
-- 3.4 Added GM management function and NPC. [Euphy] 
- npc/quests/quests_alberta.txt 
-- 2.6 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/quests_amatsu.txt 
-- 1.5 Added questlog support. [Euphy] 
- npc/quests/quests_geffen.txt 
-- 1.5 Added Number Match Game. [Euphy] 
- npc/quests/quests_juperos.txt 
-- 1.8 Updated RE/Pre-RE EXP. [Euphy] 
-- 1.9 Added GM management NPC. [Euphy] 
- npc/quests/quests_niflheim.txt 
-- Updated to Aegis 10.3 Standed, added Message Delivery Quest. 
-- 1.6 Added questlog support. [Euphy] 
- npc/quests/quests_veins.txt 
-- Added Veins Thor Volcano Base Quest NPC. [L0ne_W0lf] 
- npc/quests/seals/god_global.txt 
-- 1.2 Renewal script update. [Euphy] 
- npc/quests/seals/god_weapon_creation.txt 
-- 1.3 Renewal script update. [Euphy] 
- npc/quests/seals/seal_status.txt 
-- 1.0 Translated from the official. [L0ne_W0lf] 
-- 1.1 Now checks proper char vars. [L0ne_W0lf] 
-- 1.2 Cleaning. [Euphy] 
-- 1.3 Renewal script update. [Euphy] 
- npc/quests/seals/sleipnir_seal.txt 
-- 1.4 Renewal script update. [Euphy] 
- npc/quests/skills/novice_skills.txt 
-- 1.8 Added Baby support. [Zopokx] 
- npc/quests/skills/rogue_skills.txt 
-- 1.8 Some cleaning. [Euphy] 
- npc/quests/skills/sage_skills.txt 
-- 1.5 Optimized. [Euphy] 
- npc/re/airports/izlude.txt 
-- 1.0 Updated to match the new Izlude Map. [Masao] 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/cities/dicastes.txt 
-- 1.3 Updated to match official script. [SkittleNugget] 
- npc/re/cities/izlude.txt 
-- 1.1 Updated to match the official script. [Euphy] 
-- 1.2 Added Channel Warper and Izlude duplicates. [Euphy] 
- npc/re/cities/jawaii.txt 
-- 1.1 Moved "Honeymoon Helper" NPC. 
-- 1.2 Added Izlude duplicates. [Euphy] 
- npc/re/cities/malangdo.txt 
-- 1.2 Moved "Odgnalam" coordinates. 
-- 1.3 Fixed dialogues. 
-- 1.4 Dialogue edits, source iRO. 
-- 1.5 Added Izlude duplicates. 
- npc/re/cities/malaya.txt 
-- 0.1 Alberta sailors only. [Euphy] 
-- 0.2 Adapted from Masao's conversion. 
-- 1.0 Added remaining NPCs. 
- npc/re/cities/yuno.txt 
-- 1.0 First version. 
- npc/re/guides/guides_alberta.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_aldebaran.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_amatsu.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_ayothaya.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_brasilis.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_comodo.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_dewata.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_dicastes.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_einbroch.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_geffen.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_gonryun.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_hugel.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_izlude.txt 
-- 1.2 Added Renewal Izlude viewpoint coordinates. 
-- 1.3 Navigation system update. [Euphy] 
-- 1.4 Added Izlude duplicates. [Euphy] 
- npc/re/guides/guides_juno.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_lighthalzen.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_louyang.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_lutie.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_malaya.txt 
-- 1.0 First version. [Euphy] 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_mora.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_morroc.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_moscovia.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_niflheim.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_payon.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_prontera.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_rachel.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_umbala.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_veins.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/navigation.txt 
-- 1.0 First version. 
- npc/re/guild/invest_main.txt 
-- 1.1 Added GM management function. [Euphy] 
- npc/re/jobs/3-1/guillotine_cross.txt 
-- 1.4 Added missing labels. [Joseph] 
-- 1.5 Added GM management function. [Euphy] 
- npc/re/jobs/3-2/royal_guard.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/re/jobs/3-2/sura.txt 
-- 1.3 Added GM management function. [Euphy] 
- npc/re/jobs/novice/novice.txt 
-- 1.0 First version, hand scripted from iRO. [Kisuka] 
-- 1.5 Replaced with the official kRO scripts. [Euphy] 
- npc/re/jobs/repair.txt 
-- 1.0 First version. 
-- 1.1 Added GM management function. [Euphy] 
- npc/re/kafras/kafras.txt 
-- 1.2 Added Port Malaya Kafras. [Euphy] 
-- 1.3 Added Eden Group Kafra. [Euphy] 
-- 1.3a Moved Rune Knight Kafra from job file. [Euphy] 
-- 1.4 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/3rd_trader.txt 
-- 1.3 Added Malangdo/Mora Points NPC. [Euphy] 
-- 1.4 Updated to match the official scripts. [Euphy] 
-- 1.5 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/advanced_refiner.txt 
-- 1.0 Added Malangdo Refiner "Holink". [Euphy] 
- npc/re/merchants/alchemist.txt 
-- 1.0 Split Geneticist shop from main file. [Euphy] 
- npc/re/merchants/ammo_boxes.txt 
-- 1.0 First version, Renewal duplicates. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/ammo_dealer.txt 
-- 1.0 First version, Renewal duplicates. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/card_separation.txt 
-- 1.1 Added "Richard" NPC. [Euphy] 
- npc/re/merchants/enchan_mora.txt 
-- 1.2 Bug fixes (bugreport:7930) [DeadlySilence] 
- npc/re/merchants/enchan_upg.txt 
-- 1.0 First version. 
-- 1.1 Standardizing, grammar and bug fixes. [Euphy] 
- npc/re/merchants/flute.txt 
-- 1.2a Fixed some conditions. [Euphy] 
- npc/re/merchants/renters.txt 
-- 2.2 Updated to match the official scripts. [Euphy] 
- npc/re/merchants/shops.txt 
-- 1.7 Added Izlude duplicates. [Euphy] 
- npc/re/mobs/citycleaners.txt 
-- 1.0 First version, Renewal spawns. 
- npc/re/mobs/dungeons/ecl_tdun.txt 
-- 1.0 First version. [Euphy] 
- npc/re/mobs/dungeons/mal_dun.txt 
-- 1.2 Added Pouring spawn, source iRO. [Euphy] 
- npc/re/mobs/fields/eclage.txt 
-- 1.0 First version. [Euphy] 
- npc/re/mobs/towns.txt 
-- 1.0 First version, Renewal spawns. 
- npc/re/other/bulletin_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE/RE paths. 
- npc/re/other/item_merge.txt 
-- 1.0 First version, currently useless/disabled. 
- npc/re/other/mail.txt 
-- 1.0 First version, Renewal duplicates. 
- npc/re/other/mercenary_rent.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/other/pvp.txt 
-- 1.0 First version, Renewal. 
- npc/re/other/resetskill.txt 
-- 1.0 First version, Renewal script. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/other/stone_change.txt 
-- 1.0 First version. 
- npc/re/other/turbo_track.txt 
-- 1.0 Split Mount Manager NPC. 
- npc/re/quests/eden/71-85.txt 
-- 1.3 Updated to match the official scripts. [Euphy] 
- npc/re/quests/eden/eden_iro.txt 
-- 1.0 First version. 
-- 1.1 Edited and added more NPCs, lots of placeholders. [Euphy] 
- npc/re/quests/eden/eden_quests.txt 
-- 1.5 Added GM management function. [Euphy] 
- npc/re/quests/first_class/tu_archer.txt 
-- 1.0 First version. [Euphy] 
- npc/re/quests/homun_s.txt 
-- Genetic quest to mutate a level 99 evolved Homunculus 
-- 1.0 First Version, entirely custom. [Masao] 
- npc/re/quests/magic_books.txt 
-- 1.1 Optimized. [Euphy] 
-- 1.1a Updated NPC name to "Master Velofos". [Euphy] 
- npc/re/quests/monstertamers.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. 
- npc/re/quests/mrsmile.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_13_1.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_izlude.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_lighthalzen.txt 
-- 1.2 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_malangdo.txt 
-- 1.4a Dialogue edits, source iRO. 
-- 1.5 Added Cat Gamers. 
-- 1.6 Added GM management function. 
- npc/re/quests/quests_malaya.txt 
-- 0.4 Added "Cautious Village" and subsequent quests [DeadlySilence] 
-- 0.5 Added "Bakonawa Extermination" quest. [Euphy] 
-- 1.0 Added "Nurse in Port Malaya" and "Pintados Festival" quests. [Euphy] 
-- 1.1 Added GM management function and NPC. [Euphy] 
- npc/re/quests/quests_mora.txt 
-- 1.1 Added GM management function and NPCs. [Euphy] 
- npc/re/quests/quests_morocc.txt 
-- 1.1 Added new warpers for Satan Morroc maps. [Euphy] 
- npc/re/quests/quests_nameless.txt 
-- 1.0 Moved Dorian to pre-re/re paths. 
- npc/re/warps/cities/eclage.txt 
-- 1.0a Disabled quest warp. [Euphy] 
- npc/re/warps/cities/izlude.txt 
-- 1.7 Updated to match the official scripts. [Euphy] 
-- 1.8 Added Izlude & Prontera Field 8 duplicates. [Euphy] 
- npc/re/warps/cities/malaya.txt 
-- 1.1 Updated to match official scripts. [Masao] 
-- 1.2 Added official Jeepney warp scripts. [Euphy] 
- npc/re/warps/fields/prontera_fild.txt 
-- 1.3a Moved Izlude warp to other file. [Euphy] 
-- 1.4 Commented moc_fild20 warps replaced with new NPCs. [Euphy] 
-- 1.5 Added Prontera Field 8 duplicates. [Euphy] 
- npc/re/warps/other/arena.txt 
-- 1.0 First version, Renewal warps. 
- npc/re/warps/other/jobquests.txt 
-- 2.3 Added exit warps (job_exit) for 2nd class quests. [Euphy] 
- npc/warps/fields/glastheim.txt 
-- 1.5 Fixed random warp coordinates. [Euphy] 
- npc/warps/other/arena.txt 
-- 1.3 Split Izlude warps into Pre-Renewal/Renewal paths. [Euphy] 
-- 1.4 Added GM management function. [Euphy]

11 files changed, 46 insertions, 43 deletions

diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt
index ec9de1cf9..b2a9594c0 100644
--- a/npc/re/warps/fields/bif_fild.txt
+++ b/npc/re/warps/fields/bif_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Bifrost Field Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Bifrost Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/com_fild.txt b/npc/re/warps/fields/com_fild.txt
index c90257eb3..8e7759504 100644
--- a/npc/re/warps/fields/com_fild.txt
+++ b/npc/re/warps/fields/com_fild.txt
@@ -4,10 +4,8 @@
 //= Nana
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Comodo Fields
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
diff --git a/npc/re/warps/fields/dic_fild.txt b/npc/re/warps/fields/dic_fild.txt
index 41ac07aaf..73edb87fb 100644
--- a/npc/re/warps/fields/dic_fild.txt
+++ b/npc/re/warps/fields/dic_fild.txt
@@ -4,8 +4,6 @@
 //= Chilly, Muad_Dib
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for El Dicastes Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/geffen_fild.txt b/npc/re/warps/fields/geffen_fild.txt
index 289ad3a6c..fbe737906 100644
--- a/npc/re/warps/fields/geffen_fild.txt
+++ b/npc/re/warps/fields/geffen_fild.txt
@@ -4,8 +4,6 @@
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Geffen Field's
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/hugel_fild.txt b/npc/re/warps/fields/hugel_fild.txt
index 309ba8cc1..11f03b489 100644
--- a/npc/re/warps/fields/hugel_fild.txt
+++ b/npc/re/warps/fields/hugel_fild.txt
@@ -4,8 +4,6 @@
 //= Sara-chan (1.0)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules; RO Episode 10+
 //===== Description: =========================================
 //= Warp Points for Hugel Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/morroc_fild.txt b/npc/re/warps/fields/morroc_fild.txt
index b256e9413..050c76038 100644
--- a/npc/re/warps/fields/morroc_fild.txt
+++ b/npc/re/warps/fields/morroc_fild.txt
@@ -3,9 +3,7 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.4b
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.5
 //===== Description: =========================================
 //= Warp Points for Morroc Fields
 //===== Additional Comments: =================================
@@ -15,11 +13,12 @@
 //= 1.4 Uncommented warp that shouldn't have been commented. [L0ne_W0lf]
 //= 1.4a Uncommented yet ANOTHER warp that was taken out. [L0ne_W0lf]
 //= 1.4b Uncommented ANOTHER warp! Yay! :D [L0ne_W0lf]
+//= 1.5 Commented moc_fild20 warps replaced with new NPCs. [Euphy]
 //============================================================
 
 //= Sograt Dessert ===========================================
 //moc_fild01,101,16,0	warp	mocf01-1	15,3,moc_fild04,317,376
-moc_fild01,101,16,0	warp	mocf01-1	15,3,moc_fild20,210,342
+//moc_fild01,101,16,0	warp	mocf01-1	15,3,moc_fild20,210,342
 moc_fild01,22,242,0	warp	mocf005	2,2,prt_fild09,380,237
 moc_fild01,239,382,0	warp	mocf006	12,1,prt_fild08,233,20
 moc_fild01,301,16,0	warp	mocf02	10,1,moc_fild02,77,338
@@ -64,7 +63,7 @@ moc_fild03,70,341,0	warp	mocf04-1	5,2,moc_fild02,332,23
 //moc_fild06,377,316,0	warp	mocf10-3	1,15,moc_fild05,24,153
 moc_fild07,198,21,0	warp	mocf001	2,2,morocc,160,294
 //moc_fild07,381,201,0	warp	mocf13-1	2,16,moc_fild06,28,201
-moc_fild07,380,201,0	warp	mocf13-1	2,16,moc_fild20,36,177
+//moc_fild07,380,201,0	warp	mocf13-1	2,16,moc_fild20,36,177
 //moc_fild08,16,207,0	warp	mocf15	2,4,moc_fild09,371,195
 //moc_fild08,170,383,0	warp	mocf08-1	3,2,moc_fild04,175,21
 //moc_fild08,204,16,0	warp	mocf16	4,2,moc_fild14,196,379
@@ -79,7 +78,7 @@ moc_fild07,380,201,0	warp	mocf13-1	2,16,moc_fild20,36,177
 //moc_fild10,208,298,0	warp	mocf14-1	10,2,moc_fild06,207,21
 //moc_fild10,384,258,0	warp	mocf19-1	2,3,moc_fild09,33,162
 //moc_fild11,189,363,0	warp	mocf20-1	3,2,moc_fild10,189,26
-moc_fild11,189,360,0	warp	mocf20-1	3,2,moc_fild20,197,24
+//moc_fild11,189,360,0	warp	mocf20-1	3,2,moc_fild20,197,24
 moc_fild11,212,29,0	warp	mocf21	4,2,moc_fild17,218,366
 moc_fild11,26,161,0	warp	mocf22	2,10,moc_fild12,286,168
 //moc_fild11,379,197,0	warp	mocf23	2,6,moc_fild15,41,105
@@ -89,7 +88,7 @@ moc_fild12,159,381,0	warp	mocf003	2,2,morocc,160,20
 moc_fild12,289,168,0	warp	mocf22-1	2,3,moc_fild11,29,161
 moc_fild13,146,368,0	warp	mocf05-1	5,2,moc_fild02,71,21
 //moc_fild13,29,171,0	warp	mocf17-1	2,4,moc_fild08,380,211
-moc_fild13,32,171,0	warp	mocf17-1	2,4,moc_fild20,349,179
+//moc_fild13,32,171,0	warp	mocf17-1	2,4,moc_fild20,349,179
 moc_fild13,298,370,0	warp	mocf03-1	4,2,moc_fild02,228,32
 moc_fild13,308,49,0	warp	mocf06-1	2,4,moc_fild03,20,37
 //moc_fild14,16,278,0	warp	mocf25	2,6,moc_fild15,364,276
@@ -101,10 +100,10 @@ moc_fild13,308,49,0	warp	mocf06-1	2,4,moc_fild03,20,37
 //moc_fild15,367,276,0	warp	mocf25-1	2,4,moc_fild14,19,278
 //moc_fild15,38,105,0	warp	mocf23-1	2,4,moc_fild11,376,197
 //moc_fild16,125,383,0	warp	mocf26-1	5,2,moc_fild15,104,19
-moc_fild16,124,381,0	warp	mocf26-1	5,2,moc_fild20,197,24
+//moc_fild16,124,381,0	warp	mocf26-1	5,2,moc_fild20,197,24
 moc_fild16,16,179,0	warp	mocf28	2,6,moc_fild17,366,272
 //moc_fild16,334,382,0	warp	mocf27-1	4,2,moc_fild15,348,21
-moc_fild16,333,380,0	warp	mocf27-1	4,2,moc_fild20,197,24
+//moc_fild16,333,380,0	warp	mocf27-1	4,2,moc_fild20,197,24
 moc_fild17,218,369,0	warp	mocf21-1	5,2,moc_fild11,212,32
 moc_fild17,30,300,0	warp	moc29	2,5,moc_fild18,379,305
 moc_fild17,369,272,0	warp	mocf28-1	2,3,moc_fild16,19,179
diff --git a/npc/re/warps/fields/payon_fild.txt b/npc/re/warps/fields/payon_fild.txt
index 5bec271e8..292aa0785 100644
--- a/npc/re/warps/fields/payon_fild.txt
+++ b/npc/re/warps/fields/payon_fild.txt
@@ -1,18 +1,16 @@
 //===== Hercules Script ======================================
 //= Payon Field Warps
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Nana (1.0)
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Payon Field Warps
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.1 Refixed payon field08 -> payon warp
 //= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf]
 //= 1.3 Renewal warp adjustments.
-//============================================================ 
+//============================================================
 
 //= Payon Field's ============================================
 pay_fild01,13,152,0	warp	payf001	2,7,moc_fild03,299,170
diff --git a/npc/re/warps/fields/prontera_fild.txt b/npc/re/warps/fields/prontera_fild.txt
index 2267c298d..d033d4c53 100644
--- a/npc/re/warps/fields/prontera_fild.txt
+++ b/npc/re/warps/fields/prontera_fild.txt
@@ -3,15 +3,16 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.3
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.5
 //===== Description: =========================================
 //= Warp Points for Prontera Field
 //===== Additional Comments: =================================
 //= 1.1 updating according to jA [Lupus]
 //= 1.2 Updated warps for episode 12.1 [L0ne_W0lf]
 //= 1.3 Updated to match the new Izlude Map. [Masao]
+//= 1.3a Moved Izlude warp to other file. [Euphy]
+//= 1.4 Commented moc_fild20 warps replaced with new NPCs. [Euphy]
+//= 1.5 Added Prontera Field 8 duplicates. [Euphy]
 //============================================================
 
 //= Prontera Fields ==========================================
@@ -65,29 +66,50 @@ prt_fild08,16,187,0	warp	prtf15-1	3,17,prt_fild07,380,186
 prt_fild08,16,239,0	warp	prtf14-1	3,15,prt_fild07,379,239
 prt_fild08,170,378,0	warp	prtf004	3,2,prontera,156,26
 prt_fild08,233,16,0	warp	prtf023	12,1,moc_fild01,238,378
-prt_fild08,371,212,0	warp	prtf005	3,3,izlude,26,98
 prt_fild08,55,21,0	warp	prtf024	4,2,moc_fild01,56,380
 prt_fild09,14,124,0	warp	prtf17	2,6,prt_fild10,336,126
 prt_fild09,14,139,0	warp	prtf17-1	2,8,prt_fild10,336,126
 prt_fild09,224,380,0	warp	prtf13-1	4,2,prt_fild07,206,15
 //prt_fild09,246,16,0	warp	prtf025	7,2,moc_fild04,92,378
-prt_fild09,246,17,0	warp	prtf025	7,2,moc_fild20,209,333
+//prt_fild09,246,17,0	warp	prtf025	7,2,moc_fild20,209,333
 prt_fild09,383,223,0	warp	prtf026	2,15,moc_fild01,25,242
 prt_fild09,383,251,0	warp	prtf027	2,15,moc_fild01,25,242
 prt_fild09,87,380,0	warp	prtf16-1	5,2,prt_fild07,84,16
 //prt_fild09,95,16,0	warp	prtf028	7,2,moc_fild05,325,379
-prt_fild09,95,19,0	warp	prtf028	7,2,moc_fild20,209,333
+//prt_fild09,95,19,0	warp	prtf028	7,2,moc_fild20,209,333
 prt_fild10,20,122,0	warp	prtf19	2,4,prt_fild11,359,111
 prt_fild10,20,196,0	warp	prtf20	2,4,prt_fild11,358,184
 prt_fild10,227,299,0	warp	prtf020	5,2,gef_fild02,266,21
 //prt_fild10,263,20,0	warp	prtf029	6,2,moc_fild05,144,372
-prt_fild10,263,22,0	warp	prtf029	6,2,moc_fild20,209,333
+//prt_fild10,263,22,0	warp	prtf029	6,2,moc_fild20,209,333
 prt_fild10,339,126,0	warp	prtf17-2	2,8,prt_fild09,17,133
 prt_fild11,17,281,0	warp	prtf021	2,4,gef_fild11,374,293
 prt_fild11,302,301,0	warp	prtf022	5,2,gef_fild03,312,19
 prt_fild11,361,184,0	warp	prtf20-1	2,5,prt_fild10,23,196
 prt_fild11,362,111,0	warp	prtf19-1	2,6,prt_fild10,23,122
 
+//= Prontera Field 8 Duplicates ==============================
+prt_fild08a,16,187,0	warp	prtf15-1_a	3,17,prt_fild07,380,186
+prt_fild08b,16,187,0	warp	prtf15-1_b	3,17,prt_fild07,380,186
+prt_fild08c,16,187,0	warp	prtf15-1_c	3,17,prt_fild07,380,186
+prt_fild08d,16,187,0	warp	prtf15-1_d	3,17,prt_fild07,380,186
+prt_fild08a,16,239,0	warp	prtf14-1_a	3,15,prt_fild07,379,239
+prt_fild08b,16,239,0	warp	prtf14-1_b	3,15,prt_fild07,379,239
+prt_fild08c,16,239,0	warp	prtf14-1_c	3,15,prt_fild07,379,239
+prt_fild08d,16,239,0	warp	prtf14-1_d	3,15,prt_fild07,379,239
+prt_fild08a,170,378,0	warp	prtf004_a	3,2,prontera,156,26
+prt_fild08b,170,378,0	warp	prtf004_b	3,2,prontera,156,26
+prt_fild08c,170,378,0	warp	prtf004_c	3,2,prontera,156,26
+prt_fild08d,170,378,0	warp	prtf004_d	3,2,prontera,156,26
+prt_fild08a,233,16,0	warp	prtf023_a	12,1,moc_fild01,238,378
+prt_fild08b,233,16,0	warp	prtf023_b	12,1,moc_fild01,238,378
+prt_fild08c,233,16,0	warp	prtf023_c	12,1,moc_fild01,238,378
+prt_fild08d,233,16,0	warp	prtf023_d	12,1,moc_fild01,238,378
+prt_fild08a,55,21,0	warp	prtf024_a	4,2,moc_fild01,56,380
+prt_fild08b,55,21,0	warp	prtf024_b	4,2,moc_fild01,56,380
+prt_fild08c,55,21,0	warp	prtf024_c	4,2,moc_fild01,56,380
+prt_fild08d,55,21,0	warp	prtf024_d	4,2,moc_fild01,56,380
+
 //= St. Capitolina Abbey =====================================
 monk_in,128,46,0	warp	monk03	1,3,monk_in,161,38
 monk_in,128,84,0	warp	monk04	1,3,monk_in,161,90
diff --git a/npc/re/warps/fields/rachel_fild.txt b/npc/re/warps/fields/rachel_fild.txt
index 87d4f16d7..621062377 100644
--- a/npc/re/warps/fields/rachel_fild.txt
+++ b/npc/re/warps/fields/rachel_fild.txt
@@ -4,8 +4,6 @@
 //= Playtester
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Rachel Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/veins_fild.txt b/npc/re/warps/fields/veins_fild.txt
index c1a5cce5a..255ce637c 100644
--- a/npc/re/warps/fields/veins_fild.txt
+++ b/npc/re/warps/fields/veins_fild.txt
@@ -4,8 +4,6 @@
 //= $ephiroth
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Warp Points for Veins Field
 //===== Additional Comments: =================================
@@ -45,9 +43,9 @@ ve_fild07,147,371,0	warp	ve_fild7-1	1,1,veins,146,28
 // Renewal Addon
 ve_fild06,81,177,0	warp	VeF06S_VeF04S	1,1,ve_fild04,115,55
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 Initial version [$ephiroth]
 //= 1.1 Updated more warps [$ephiroth]
 //= 1.2 Removed some unofficial warps [Playtester]
diff --git a/npc/re/warps/fields/yuno_fild.txt b/npc/re/warps/fields/yuno_fild.txt
index b570fca9e..fe998c843 100644
--- a/npc/re/warps/fields/yuno_fild.txt
+++ b/npc/re/warps/fields/yuno_fild.txt
@@ -4,8 +4,6 @@
 //= Nana (1.0), Sara
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Hercules; RO Episode 5+
 //===== Description: =========================================
 //= Warp Points for Yuno Field
 //===== Additional Comments: =================================