summaryrefslogtreecommitdiff
path: root/npc/re/warps
diff options
context:
space:
mode:
authorshennetsind <shennetsind@users.noreply.github.com>2013-10-24 09:27:15 -0700
committershennetsind <shennetsind@users.noreply.github.com>2013-10-24 09:27:15 -0700
commit418dd821c91ae19723a7b7b531e64b9c4565d555 (patch)
treeb361a1823a08e654e5969dcdea97da05f4f7cd90 /npc/re/warps
parent835d55b07858202198564bc6c2ff0888a7f78d31 (diff)
parente3afdc2af4c5e50c79237ee092e25f39b7428e47 (diff)
downloadhercules-418dd821c91ae19723a7b7b531e64b9c4565d555.tar.gz
hercules-418dd821c91ae19723a7b7b531e64b9c4565d555.tar.bz2
hercules-418dd821c91ae19723a7b7b531e64b9c4565d555.tar.xz
hercules-418dd821c91ae19723a7b7b531e64b9c4565d555.zip
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]
Diffstat (limited to 'npc/re/warps')
-rw-r--r--npc/re/warps/cities/brasilis.txt2
-rw-r--r--npc/re/warps/cities/dewata.txt2
-rw-r--r--npc/re/warps/cities/dicastes.txt4
-rw-r--r--npc/re/warps/cities/eclage.txt7
-rw-r--r--npc/re/warps/cities/izlude.txt95
-rw-r--r--npc/re/warps/cities/malangdo.txt2
-rw-r--r--npc/re/warps/cities/malaya.txt146
-rw-r--r--npc/re/warps/cities/rachel.txt2
-rw-r--r--npc/re/warps/cities/yggdrasil.txt2
-rw-r--r--npc/re/warps/dungeons/bra_dun.txt2
-rw-r--r--npc/re/warps/dungeons/dic_dun.txt2
-rw-r--r--npc/re/warps/dungeons/ecl_dun.txt2
-rw-r--r--npc/re/warps/dungeons/iz_dun.txt4
-rw-r--r--npc/re/warps/dungeons/moc_pryd.txt4
-rw-r--r--npc/re/warps/fields/bif_fild.txt4
-rw-r--r--npc/re/warps/fields/com_fild.txt4
-rw-r--r--npc/re/warps/fields/dic_fild.txt2
-rw-r--r--npc/re/warps/fields/geffen_fild.txt2
-rw-r--r--npc/re/warps/fields/hugel_fild.txt2
-rw-r--r--npc/re/warps/fields/morroc_fild.txt17
-rw-r--r--npc/re/warps/fields/payon_fild.txt12
-rw-r--r--npc/re/warps/fields/prontera_fild.txt36
-rw-r--r--npc/re/warps/fields/rachel_fild.txt2
-rw-r--r--npc/re/warps/fields/veins_fild.txt6
-rw-r--r--npc/re/warps/fields/yuno_fild.txt2
-rw-r--r--npc/re/warps/guildcastles.txt4
-rw-r--r--npc/re/warps/other/arena.txt18
-rw-r--r--npc/re/warps/other/jobquests.txt14
-rw-r--r--npc/re/warps/other/paradise.txt2
-rw-r--r--npc/re/warps/other/s_workshop.txt4
-rw-r--r--npc/re/warps/other/sign.txt2
31 files changed, 251 insertions, 158 deletions
diff --git a/npc/re/warps/cities/brasilis.txt b/npc/re/warps/cities/brasilis.txt
index e5e8a5386..289ab235d 100644
--- a/npc/re/warps/cities/brasilis.txt
+++ b/npc/re/warps/cities/brasilis.txt
@@ -5,7 +5,7 @@
//===== Current Version: =====================================
//= 1.2
//===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
//= Warp Points for Brasilis
//===== Additional Comments: =================================
//= 1.0 First version.
diff --git a/npc/re/warps/cities/dewata.txt b/npc/re/warps/cities/dewata.txt
index 602e40fb4..c134df537 100644
--- a/npc/re/warps/cities/dewata.txt
+++ b/npc/re/warps/cities/dewata.txt
@@ -4,8 +4,6 @@
//= Chilly
//===== Current Version: =====================================
//= 1.2
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warp Points for Dewata
//===== Additional Comments: =================================
diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt
index 1a59f5241..8d43c8edd 100644
--- a/npc/re/warps/cities/dicastes.txt
+++ b/npc/re/warps/cities/dicastes.txt
@@ -4,8 +4,6 @@
//= Chilly, Muad_Dib
//===== Current Version: =====================================
//= 1.3
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warp Points for El Dicastes
//===== Additional Comments: =================================
@@ -71,4 +69,4 @@ dic_in01,57,48,0 duplicate(Elevator#main) Elevator#9 844
dic_in01,137,46,0 duplicate(Elevator#main) Elevator#10 844
dic_in01,222,46,0 duplicate(Elevator#main) Elevator#11 844
dic_in01,388,272,0 duplicate(Elevator#main) Elevator#12 844
-dic_in01,389,208,0 duplicate(Elevator#main) Elevator#13 844
+dic_in01,389,208,0 duplicate(Elevator#main) Elevator#13 844 \ No newline at end of file
diff --git a/npc/re/warps/cities/eclage.txt b/npc/re/warps/cities/eclage.txt
index 0400489f5..dd9e1d55e 100644
--- a/npc/re/warps/cities/eclage.txt
+++ b/npc/re/warps/cities/eclage.txt
@@ -3,19 +3,18 @@
//===== By: ==================================================
//= Chilly
//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.0a
//===== Description: =========================================
//= Warp Points for Eclage
//===== Additional Comments: =================================
//= 1.0 First Version.
+//= 1.0a Disabled quest warp. [Euphy]
//============================================================
// Town Warps
bif_fild02,292,351,0 warp eclage_field0001 1,1,ecl_fild01,205,74
ecl_fild01,207,72,0 warp eclage_field0002 1,1,bif_fild02,294,349
-ecl_fild01,97,320,0 warp eclage_field0003 1,1,eclage,100,28
+//ecl_fild01,97,320,0 warp eclage_field0003 1,1,eclage,100,28
eclage,98,26,0 warp eclage_field0004 1,1,ecl_fild01,97,317
eclage,299,309,0 warp eclage_field0005 1,1,ecl_in01,47,11
ecl_in01,47,8,0 warp eclage_field0006 1,1,eclage,297,307
diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt
index fa888c7fb..8bf26e31d 100644
--- a/npc/re/warps/cities/izlude.txt
+++ b/npc/re/warps/cities/izlude.txt
@@ -3,39 +3,88 @@
//===== By: ==================================================
//= Athena (1.0), Nana (1.1)
//===== Current Version: =====================================
-//= 1.7
-//===== Compatible With: =====================================
-//= Any Athena & Hercules Version
+//= 1.8
//===== Description: =========================================
//= Warp Points for Izlude
//===== Additional Comments: =================================
//= 1.3 Added warps to Izlude Airship [Justin84]
//= 1.4 Minor correction on airport warps
//= 1.5 Updated to match the new Izlude Map. [Masao]
-//= 1.6 Added new warps [Streusel]
-//= 1.7 Removed indoor warps [Streusel]
+//= 1.6 Added new warps. [Streusel]
+//= 1.7 Updated to match the official scripts. [Euphy]
+//= 1.8 Added Izlude & Prontera Field 8 duplicates. [Euphy]
//============================================================
//= Izlude City ==============================================
-izlude,109,182,0 warp iz01 3,3,izlude_in,65,87
-izlude,216,162,0 warp iz03 3,2,izlude_in,151,127
-izlude,21,98,0 warp iz001 3,3,prt_fild08,367,212
+prt_fild08,371,212,0 warp prtf005 3,3,izlude,24,98
+izlude,20,98,0 warp iz001 3,3,prt_fild08,367,212
+izlude_in,116,46,0 warp iz02-1 3,2,izlude,128,98
+izlude,110,182,0 warp iz01 2,2,izlude_in,65,87
+izlude_in,65,84,0 warp iz01-1 2,2,izlude,112,179
izlude,52,172,0 warp iz04 2,2,izlude_in,74,161
-izlude,130,257,0 warp iz09#1 2,2,iz_ac01,99,29
-izlude,125,257,0 warp iz09#2 2,2,iz_ac01,99,29
-izlude,213,161,0 warp iz10 2,2,arena_room,100,30
-arena_room,99,24,0 warp iz_arena 2,2,izlude,209,161
+izlude_in,74,158,0 warp iz04-1 3,2,izlude,52,168
+izlude_in,43,169,0 warp w219 2,3,izlude_in,63,169
+izlude_in,87,169,0 warp iz05-1 2,3,izlude_in,111,169
izlude_in,108,169,0 warp iz05 2,3,izlude_in,84,169
-izlude_in,148,127,0 warp iz03-1 2,5,izlude,207,162
+izlude_in,148,127,0 warp iz03-1 2,5,izlude,210,161
+izlude_in,172,139,0 warp iz07 3,2,izlude_in,172,161
+izlude_in,172,158,0 warp iz07-1 3,2,izlude_in,172,136
+izlude_in,172,116,0 warp iz06-1 3,2,izlude_in,172,94
+izlude_in,171,97,0 warp iz06 3,2,izlude_in,172,119
-izlude_in,43,169,0 warp w219 2,3,izlude_in,64,169
-izlude_in,65,84,0 warp iz01-1 5,2,izlude,113,178
-izlude_in,74,158,0 warp iz04-1 3,2,izlude,52,166
-izlude_in,87,169,0 warp iz05-1 2,3,izlude_in,111,169
+//= Izlude & Prontera Field 8 Duplicates =====================
+prt_fild08a,371,212,0 warp prtf005_a 3,3,izlude_a,24,98
+prt_fild08b,371,212,0 warp prtf005_b 3,3,izlude_b,24,98
+prt_fild08c,371,212,0 warp prtf005_c 3,3,izlude_c,24,98
+prt_fild08d,371,212,0 warp prtf005_d 3,3,izlude_d,24,98
+izlude_a,20,98,0 warp iz001_a 3,3,prt_fild08a,367,212
+izlude_b,20,98,0 warp iz001_b 3,3,prt_fild08b,367,212
+izlude_c,20,98,0 warp iz001_c 3,3,prt_fild08c,367,212
+izlude_d,20,98,0 warp iz001_d 3,3,prt_fild08d,367,212
+izlude_a,110,182,0 warp iz01_a 2,2,izlude_in,65,87
+izlude_b,110,182,0 warp iz01_b 2,2,izlude_in,65,87
+izlude_c,110,182,0 warp iz01_c 2,2,izlude_in,65,87
+izlude_d,110,182,0 warp iz01_d 2,2,izlude_in,65,87
+izlude_a,52,172,0 warp iz04_a 2,2,izlude_in,74,161
+izlude_b,52,172,0 warp iz04_b 2,2,izlude_in,74,161
+izlude_c,52,172,0 warp iz04_c 2,2,izlude_in,74,161
+izlude_d,52,172,0 warp iz04_d 2,2,izlude_in,74,161
+
+//= Izlude Academy ===========================================
+izlude,125,257,0 warp #to_ac01 2,2,iz_ac01,99,29
+izlude,130,257,0 warp #to_ac02 2,2,iz_ac01,99,29
+iz_ac01,100,24,0 warp #to_ac01-1 2,2,izlude,127,253
+iz_ac01,78,25,0 warp #to_ac2f01 2,2,iz_ac02,104,27
+iz_ac01,122,25,0 warp #to_ac2f02 2,2,iz_ac02,104,27
+iz_ac02,94,27,0 warp #to_ac1f01 2,2,iz_ac01,78,28
+iz_ac02,113,27,0 warp #to_ac1f02 2,2,iz_ac01,122,28
-//Izlude Academy
-iz_ac01,100,24,0 warp iz_ac01 2,2,izlude,127,253
-iz_ac01,122,25,0 warp iz_ac02 2,2,iz_ac02,104,27
-iz_ac01,78,25,0 warp iz_ac03 2,2,iz_ac02,104,27
-iz_ac02,113,27,0 warp iz_ac04 2,2,iz_ac01,122,28
-iz_ac02,94,27,0 warp iz_ac05 2,2,iz_ac01,78,28
+//= Izlude Academy Duplicates ================================
+izlude_a,125,257,0 warp #to_ac01_a 2,2,iz_ac01_a,99,29
+izlude_b,125,257,0 warp #to_bc01_b 2,2,iz_ac01_b,99,29
+izlude_c,125,257,0 warp #to_cc01_c 2,2,iz_ac01_c,99,29
+izlude_d,125,257,0 warp #to_dc01_d 2,2,iz_ac01_d,99,29
+izlude_a,130,257,0 warp #to_ac02_a 2,2,iz_ac01_a,99,29
+izlude_b,130,257,0 warp #to_bc02_b 2,2,iz_ac01_b,99,29
+izlude_c,130,257,0 warp #to_cc02_c 2,2,iz_ac01_c,99,29
+izlude_d,130,257,0 warp #to_dc02_d 2,2,iz_ac01_d,99,29
+iz_ac01_a,100,24,0 warp #to_ac01-1_a 2,2,izlude_a,127,253
+iz_ac01_b,100,24,0 warp #to_bc01-1_b 2,2,izlude_b,127,253
+iz_ac01_c,100,24,0 warp #to_cc01-1_c 2,2,izlude_c,127,253
+iz_ac01_d,100,24,0 warp #to_dc01-1_d 2,2,izlude_d,127,253
+iz_ac01_a,78,25,0 warp #to_ac2f01_a 2,2,iz_ac02_a,104,27
+iz_ac01_b,78,25,0 warp #to_bc2f01_b 2,2,iz_ac02_b,104,27
+iz_ac01_c,78,25,0 warp #to_cc2f01_c 2,2,iz_ac02_c,104,27
+iz_ac01_d,78,25,0 warp #to_dc2f01_d 2,2,iz_ac02_d,104,27
+iz_ac01_a,122,25,0 warp #to_ac2f02_a 2,2,iz_ac02_a,104,27
+iz_ac01_b,122,25,0 warp #to_bc2f02_b 2,2,iz_ac02_b,104,27
+iz_ac01_c,122,25,0 warp #to_cc2f02_c 2,2,iz_ac02_c,104,27
+iz_ac01_d,122,25,0 warp #to_dc2f02_d 2,2,iz_ac02_d,104,27
+iz_ac02_a,94,27,0 warp #to_ac1f01_a 2,2,iz_ac01_a,78,28
+iz_ac02_b,94,27,0 warp #to_bc1f01_b 2,2,iz_ac01_b,78,28
+iz_ac02_c,94,27,0 warp #to_cc1f01_c 2,2,iz_ac01_c,78,28
+iz_ac02_d,94,27,0 warp #to_dc1f01_d 2,2,iz_ac01_d,78,28
+iz_ac02_a,113,27,0 warp #to_ac1f02_a 2,2,iz_ac01_a,122,28
+iz_ac02_b,113,27,0 warp #to_bc1f02_b 2,2,iz_ac01_b,122,28
+iz_ac02_c,113,27,0 warp #to_cc1f02_c 2,2,iz_ac01_c,122,28
+iz_ac02_d,113,27,0 warp #to_dc1f02_d 2,2,iz_ac01_d,122,28
diff --git a/npc/re/warps/cities/malangdo.txt b/npc/re/warps/cities/malangdo.txt
index f2bf50572..501c9e85b 100644
--- a/npc/re/warps/cities/malangdo.txt
+++ b/npc/re/warps/cities/malangdo.txt
@@ -4,8 +4,6 @@
//= Chilly
//===== Current Version: =====================================
//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warp Points for Malangdo Island
//===== Additional Comments: =================================
diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt
index 38e67e3e0..b18a1f52d 100644
--- a/npc/re/warps/cities/malaya.txt
+++ b/npc/re/warps/cities/malaya.txt
@@ -1,36 +1,53 @@
-//===== Hercules Script ======================================
-//= Mayala Port Town Warps
-//===== By: ==================================================
+//===== Hercules Script ======================================
+//= Port Malaya Warp Script
+//===== By: ==================================================
//= Chilly
-//===== Current Version: =====================================
-//= 1.0a
-//===== Compatible With: =====================================
-//= Hercules
-//===== Description: =========================================
-//= Warps for Mayala Port Town.
-//===== Additional Comments: =================================
-//= 1.0 First Version [Chilly].
-//= 1.0a Updated the file with new / missing warps [Masao].
-//============================================================
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= Warp Points for Port Malaya
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//= 1.1 Updated to match official scripts. [Masao]
+//= 1.2 Added official Jeepney warp scripts. [Euphy]
+//============================================================
+// Town Warps
+//============================================================
+ma_in01,86,16,0 warp mal_in_ws 1,1,malaya,115,212
+ma_in01,24,77,0 warp mal_in_inn 1,1,malaya,178,208
+malaya,370,277,0 warp malaya_mal_fild01 1,1,ma_fild01,40,272
+ma_fild01,37,272,0 warp mal_fild01_malaya 1,1,malaya,367,277
+ma_in01,33,152,0 warp mal_in_house01 1,1,malaya,52,75
+malaya,309,70,0 warp malaya_ship_mal_in_ship 1,1,ma_in01,108,92
+ma_in01,105,92,0 warp mal_in_ship_malaya_ship 1,1,malaya,310,67
+ma_fild01,266,359,0 warp mafild01_to02 1,1,ma_fild02,248,36
+ma_fild02,248,33,0 warp mafild02_to01 1,1,ma_fild01,266,356
+ma_fild01,288,52,0 warp mafild01_tobknw 1,1,ma_scene01,142,78
+ma_scene01,140,80,0 warp bknw_tofild01 1,1,ma_fild01,288,55
+ma_in01,9,24,0 warp mal_in_ts 1,1,malaya,296,167
+ma_in01,126,17,0 warp mal_in_shop_malaya_shop 1,1,malaya,261,237
+ma_fild01,251,190,0 warp mf_minga_mf_in_minga 1,1,ma_in01,108,160
+ma_in01,105,160,0 warp mf_in_minga_mf_minga 1,1,ma_fild01,248,190
+
+// Locked Warps
+//============================================================
malaya,178,211,0 script malaya_inn 45,1,1,{
end;
-
OnTouch:
if (malaya_hi < 10) {
- mes "Door is closed. It seems keeping its eyes on you.";
+ mes "Door is closed. It seems to be keeping its eyes on you.";
close;
- }
+ }
warp "ma_in01",24,80;
end;
}
malaya,112,212,0 script malaya_ws 45,1,1,{
end;
-
OnTouch:
if (malaya_hi < 20) {
- mes "Door is closed. It seems keeping its eyes on you.";
+ mes "Door is closed. It seems to be keeping its eyes on you.";
close;
}
warp "ma_in01",83,16;
@@ -39,10 +56,9 @@ OnTouch:
malaya,299,167,0 script malaya_ts 45,1,1,{
end;
-
OnTouch:
if (malaya_hi < 20) {
- mes "Door is closed. It seems keeping its eyes on you.";
+ mes "Door is closed. It seems to be keeping its eyes on you.";
close;
}
warp "ma_in01",12,24;
@@ -51,10 +67,9 @@ OnTouch:
malaya,261,240,0 script malaya_shop 45,1,1,{
end;
-
OnTouch:
if (malaya_hi < 20) {
- mes "Door is closed. It seems keeping its eyes on you.";
+ mes "Door is closed. It seems to be keeping its eyes on you.";
close;
}
warp "ma_in01",126,20;
@@ -63,40 +78,69 @@ OnTouch:
malaya,300,211,0 script malaya_house01 45,1,1,{
end;
-
OnTouch:
if (malaya_hi < 10) {
- mes "Door is closed. It seems keeping its eyes on you.";
+ mes "Door is closed. It seems to be keeping its eyes on you.";
close;
- }
+ }
warp "ma_in01",36,152;
end;
}
-// Town Warps
-ma_in01,86,16,0 warp mal_in_ws 1,1,malaya,115,212
-ma_in01,24,77,0 warp mal_in_inn 1,1,malaya,178,208
-malaya,370,277,0 warp malaya_mal_fild01 1,1,ma_fild01,40,272
-ma_fild01,37,272,0 warp mal_fild01_malaya 1,1,malaya,367,277
-ma_in01,33,152,0 warp mal_in_house01 1,1,malaya,52,75
-malaya,309,70,0 warp malaya_ship_mal_in_ship 1,1,ma_in01,108,92
-ma_in01,105,92,0 warp mal_in_ship_malaya_ship 1,1,malaya,310,67
-ma_fild01,266,359,0 warp mafild01_to02 1,1,ma_fild02,248,36
-ma_fild02,248,33,0 warp mafild02_to01 1,1,ma_fild01,266,356
-ma_fild01,288,52,0 warp mafild01_tobknw 1,1,ma_scene01,142,78
-ma_scene01,140,80,0 warp bknw_tofild01 1,1,ma_fild01,288,55
-ma_in01,9,24,0 warp mal_in_ts 1,1,malaya,296,167
-ma_in01,126,17,0 warp mal_in_shop_malaya_shop 1,1,malaya,261,237
-ma_fild01,251,190,0 warp mf_minga_mf_in_minga 1,1,ma_in01,108,160
-ma_in01,105,160,0 warp mf_in_minga_mf_minga 1,1,ma_fild01,248,190
+// Jeepney Warps
+//============================================================
+function script F_Malaya_Warp {
+ mes "Where would you like to go?";
+ next;
+ set .@i$, getarg(select("Back outside",getarg(1)+" Jeepney",getarg(2)+" Jeepney") - 1);
+ close2;
+ switch(getarg(3)) {
+ case 1: // 12 passenger
+ if (.@i$ == "Center")
+ warp "malaya",241,238;
+ if (.@i$ == "Southwest")
+ warp "malaya",71,43;
+ else if (.@i$ == "Southeast")
+ warp "malaya",284,129;
+ break;
+ case 2: // 30 passenger
+ if (.@i$ == "Northwest")
+ warp "malaya",134,247;
+ else if (.@i$ == "Southeast")
+ warp "malaya",341,150;
+ else if (.@i$ == "Northeast")
+ warp "malaya",294,293;
+ break;
+ case 3: // 60 passenger
+ if (.@i$ == "Center")
+ warp "malaya",239,221;
+ else if (.@i$ == "Northwest")
+ warp "malaya",59,246;
+ else if (.@i$ == "Southeast")
+ warp "malaya",254,68;
+ break;
+ }
+ end;
+}
+
+ma_zif01,30,22,0 script Town Warp#zif01 45,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; }
+ma_zif02,30,22,0 script Town Warp#zif02 45,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; }
+ma_zif03,30,22,0 script Town Warp#zif03 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; }
+
+ma_zif04,30,22,0 script Town Warp#zif04 45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; }
+ma_zif05,30,22,0 script Town Warp#zif05 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; }
+ma_zif06,30,22,0 script Town Warp#zif06 45,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; }
+
+ma_zif07,30,22,0 script Town Warp#zif07 45,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; }
+ma_zif08,30,22,0 script Town Warp#zif08 45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; }
+ma_zif09,30,22,0 script Town Warp#zif09 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; }
-// Car Warps
-ma_zif01,30,22,0 warp malaya_car0001 1,1,malaya,241,238
-ma_zif02,30,22,0 warp malaya_car0002 1,1,malaya,71,43
-ma_zif03,30,22,0 warp malaya_car0003 1,1,malaya,284,129
-ma_zif04,30,22,0 warp malaya_car0004 1,1,malaya,134,247
-ma_zif05,30,22,0 warp malaya_car0005 1,1,malaya,341,150
-ma_zif06,30,22,0 warp malaya_car0006 1,1,malaya,294,293
-ma_zif07,30,22,0 warp malaya_car0007 1,1,malaya,239,221
-ma_zif08,30,22,0 warp malaya_car0008 1,1,malaya,59,246
-ma_zif09,30,22,0 warp malaya_car0009 1,1,malaya,254,68
+//ma_zif01,30,22,0 warp malaya_car0001 1,1,malaya,241,238
+//ma_zif02,30,22,0 warp malaya_car0002 1,1,malaya,71,43
+//ma_zif03,30,22,0 warp malaya_car0003 1,1,malaya,284,129
+//ma_zif04,30,22,0 warp malaya_car0004 1,1,malaya,134,247
+//ma_zif05,30,22,0 warp malaya_car0005 1,1,malaya,341,150
+//ma_zif06,30,22,0 warp malaya_car0006 1,1,malaya,294,293
+//ma_zif07,30,22,0 warp malaya_car0007 1,1,malaya,239,221
+//ma_zif08,30,22,0 warp malaya_car0008 1,1,malaya,59,246
+//ma_zif09,30,22,0 warp malaya_car0009 1,1,malaya,254,68
diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt
index eb2b0722f..608e7ec2b 100644
--- a/npc/re/warps/cities/rachel.txt
+++ b/npc/re/warps/cities/rachel.txt
@@ -4,8 +4,6 @@
//= erKURITA & RockmanEXE
//===== Current Version: =====================================
//= 1.5
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warp Points for Rachel City, shops & other locations
//===== Additional Comments: =================================
diff --git a/npc/re/warps/cities/yggdrasil.txt b/npc/re/warps/cities/yggdrasil.txt
index 3076d22b1..72004882a 100644
--- a/npc/re/warps/cities/yggdrasil.txt
+++ b/npc/re/warps/cities/yggdrasil.txt
@@ -4,8 +4,6 @@
//= PKGINGO (1.0)
//===== Current Version: =====================================
//= 1.1
-//===== Compatible With: =====================================
-//= Hercules; RO Episode 6+
//===== Description: =========================================
//= Warp Points for Yggdrasil Tree
//===== Additional Comments: =================================
diff --git a/npc/re/warps/dungeons/bra_dun.txt b/npc/re/warps/dungeons/bra_dun.txt
index de7d1d94f..57210f108 100644
--- a/npc/re/warps/dungeons/bra_dun.txt
+++ b/npc/re/warps/dungeons/bra_dun.txt
@@ -5,7 +5,7 @@
//===== Current Version: =====================================
//= 1.0
//===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
//= Brasilis Dungeon warp script
//===== Additional Comments: =================================
//= 1.0 First version.
diff --git a/npc/re/warps/dungeons/dic_dun.txt b/npc/re/warps/dungeons/dic_dun.txt
index 9016c3e0c..7dde16769 100644
--- a/npc/re/warps/dungeons/dic_dun.txt
+++ b/npc/re/warps/dungeons/dic_dun.txt
@@ -4,8 +4,6 @@
//= Chilly, Muad_Dib
//===== Current Version: =====================================
//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warp Points for Scaraba Hole
//===== Additional Comments: =================================
diff --git a/npc/re/warps/dungeons/ecl_dun.txt b/npc/re/warps/dungeons/ecl_dun.txt
index 5209c4f25..d3ce45cc7 100644
--- a/npc/re/warps/dungeons/ecl_dun.txt
+++ b/npc/re/warps/dungeons/ecl_dun.txt
@@ -4,8 +4,6 @@
//= Chilly
//===== Current Version: =====================================
//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warp Points for Eclage Dungeon
//===== Additional Comments: =================================
diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt
index 7b46b5e2d..9a65e15a7 100644
--- a/npc/re/warps/dungeons/iz_dun.txt
+++ b/npc/re/warps/dungeons/iz_dun.txt
@@ -5,13 +5,11 @@
//= Nana (1.1)
//===== Current Version: =====================================
//= 1.3
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warp Points for Bibilyn Island & Undersea Cave
//===== Additional Comments: =================================
//= 1.2 Moved common warps to base path. [Euphy]
-//= 1.3 Added Undersea Tunnel 6th floor warper. [L0ne_W0lf]
+//= 1.3 Added Undersea Tunnel 6th floor warper.
//============================================================
// Undersea Tunnel Warper
diff --git a/npc/re/warps/dungeons/moc_pryd.txt b/npc/re/warps/dungeons/moc_pryd.txt
index aa2feb937..097b5fc3d 100644
--- a/npc/re/warps/dungeons/moc_pryd.txt
+++ b/npc/re/warps/dungeons/moc_pryd.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Morroc Pyramid Nightmare Warp Script
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
//===== Description: =========================================
//= Warp Points for Morroc Pyramid Nightmare Mode
//===== Additional Comments: =================================
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: =================================
diff --git a/npc/re/warps/guildcastles.txt b/npc/re/warps/guildcastles.txt
index d8eab7cea..6e0b2adca 100644
--- a/npc/re/warps/guildcastles.txt
+++ b/npc/re/warps/guildcastles.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Guild Castles Warp Script
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
//===== Description: =========================================
//= Warp Points for Renewal Guild Castles
//===== Additional Comments: =================================
diff --git a/npc/re/warps/other/arena.txt b/npc/re/warps/other/arena.txt
new file mode 100644
index 000000000..81eac96ed
--- /dev/null
+++ b/npc/re/warps/other/arena.txt
@@ -0,0 +1,18 @@
+//===== Hercules Script ======================================
+//= Arena Warps
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Warp Points related to Izlude Arena.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal warps.
+//============================================================
+
+izlude,213,161,0 warp welcome_arena 1,1,arena_room,100,30
+izlude_a,213,161,0 warp welcome_arena_a 1,1,arena_room,100,30
+izlude_b,213,161,0 warp welcome_arena_b 1,1,arena_room,100,30
+izlude_c,213,161,0 warp welcome_arena_c 1,1,arena_room,100,30
+izlude_d,213,161,0 warp welcome_arena_d 1,1,arena_room,100,30
+arena_room,99,24,0 warp bye_arena 2,2,izlude,209,161
diff --git a/npc/re/warps/other/jobquests.txt b/npc/re/warps/other/jobquests.txt
index 3a2a321fb..39eebc334 100644
--- a/npc/re/warps/other/jobquests.txt
+++ b/npc/re/warps/other/jobquests.txt
@@ -3,17 +3,23 @@
//===== By: ==================================================
//= Athena (1.0)
//===== Current Version: =====================================
-//= 2.2
-//===== Compatible With: =====================================
-//= Hercules; RO Version Ep4+
+//= 2.3
//===== Description: =========================================
//= Warp Points for Job Quest Maps
//===== Additional Comments: =================================
//= 2.1 Added one Shadow Chaser job warp. [Euphy]
//= 2.2 Moved common warps to base path, added warps. [Euphy]
+//= 2.3 Added exit warps (job_exit) for 2nd class quests. [Euphy]
//============================================================
//==============================================================================
+//Exit Warps
+//==============================================================================
+job_knt,89,98,0 warp knt_out 1,1,prt_in,77,99
+job_wiz,49,154,0 warp wiz_out 1,1,gef_tower,108,29
+job_sage,55,154,0 warp sage_out 1,1,yuno_in03,169,171
+
+//==============================================================================
//Arch Bishop
//==============================================================================
job3_arch01,29,24,0 warp #archout 1,1,odin_tem02,282,263
@@ -41,4 +47,4 @@ job3_gen01,71,56,0 warp #from2to1gen 1,1,job3_gen01,11,60
//==============================================================================
//Shadow Chaser
//==============================================================================
-job3_sha01,71,19,0 warp shadowc1 1,1,tha_t01,149,224
+job3_sha01,71,19,0 warp shadowc1 1,1,tha_t01,149,224 \ No newline at end of file
diff --git a/npc/re/warps/other/paradise.txt b/npc/re/warps/other/paradise.txt
index 4d4b241a9..4a7d6c29f 100644
--- a/npc/re/warps/other/paradise.txt
+++ b/npc/re/warps/other/paradise.txt
@@ -4,8 +4,6 @@
//= Chilly
//===== Current Version: =====================================
//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warp Points for Paradise Group
//===== Additional Comments: =================================
diff --git a/npc/re/warps/other/s_workshop.txt b/npc/re/warps/other/s_workshop.txt
index 3f50edb6b..286c63e45 100644
--- a/npc/re/warps/other/s_workshop.txt
+++ b/npc/re/warps/other/s_workshop.txt
@@ -4,8 +4,6 @@
//= Chilly
//===== Current Version: =====================================
//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warp Points for Shadow Workshop
//===== Additional Comments: =================================
@@ -28,4 +26,4 @@ s_atelier,80,66,0 warp s_atelier0012 1,1,s_atelier,32,56
s_atelier,109,129,0 warp s_atelier0013 1,1,s_atelier,159,125
s_atelier,160,130,0 warp s_atelier0014 1,1,s_atelier,114,129
yuno,278,66,0 warp s_atelier0015 1,1,s_atelier,111,122
-s_atelier,107,122,0 warp s_atelier0016 1,1,yuno,274,66
+s_atelier,107,122,0 warp s_atelier0016 1,1,yuno,274,66 \ No newline at end of file
diff --git a/npc/re/warps/other/sign.txt b/npc/re/warps/other/sign.txt
index 84895c26b..8ecd3a777 100644
--- a/npc/re/warps/other/sign.txt
+++ b/npc/re/warps/other/sign.txt
@@ -4,8 +4,6 @@
//= MasterOfMuppets
//===== Current Version: =====================================
//= 1.4
-//===== Compatible With: =====================================
-//= Hercules; RO Episode 8+
//===== Description: =========================================
//= Warp Points related to the Sign Quest will be put here
//===== Additional Comments: =================================