From 37b30d70f94b8dddfc2b6e4c9e56cfc1517641be Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sat, 17 Nov 2007 03:37:39 +0000 Subject: * Rev. 11742 Renamed several dungeon warp scripts to match their map names, split up a couple files as well. * Moved Ninja and Gunslinger warps to the proper file. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11742 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 + npc/scripts_warps.conf | 47 +++---- npc/warps/cities/amatsu.txt | 13 +- npc/warps/cities/einbroch.txt | 11 -- npc/warps/dungeons/abbey.txt | 22 ++++ npc/warps/dungeons/abbey_dun.txt | 22 ---- npc/warps/dungeons/alberta_duns.txt | 58 --------- npc/warps/dungeons/alde_ct.txt | 217 -------------------------------- npc/warps/dungeons/alde_dun.txt | 80 ++++++++++++ npc/warps/dungeons/ama_dun.txt | 21 ++++ npc/warps/dungeons/amatsu_dun.txt | 21 ---- npc/warps/dungeons/ant_hell.txt | 34 ----- npc/warps/dungeons/anthell.txt | 34 +++++ npc/warps/dungeons/beach_dun.txt | 19 +++ npc/warps/dungeons/c_tower.txt | 153 +++++++++++++++++++++++ npc/warps/dungeons/coal_mine.txt | 22 ---- npc/warps/dungeons/com_dun.txt | 19 --- npc/warps/dungeons/gef_dun.txt | 46 +++++++ npc/warps/dungeons/geffen_dun.txt | 46 ------- npc/warps/dungeons/in_sphinx.txt | 36 ++++++ npc/warps/dungeons/iz_dun.txt | 30 +++++ npc/warps/dungeons/izlude_dun.txt | 30 ----- npc/warps/dungeons/kh_dun.txt | 38 ++++++ npc/warps/dungeons/kiel_dun.txt | 38 ------ npc/warps/dungeons/lhalzen_dun.txt | 213 ------------------------------- npc/warps/dungeons/lhz_dun.txt | 213 +++++++++++++++++++++++++++++++ npc/warps/dungeons/lou_dun.txt | 20 +++ npc/warps/dungeons/louyang_dun.txt | 20 --- npc/warps/dungeons/lutie_dun.txt | 18 --- npc/warps/dungeons/mag_dun.txt | 18 +++ npc/warps/dungeons/mjo_dun.txt | 22 ++++ npc/warps/dungeons/moc_pryd.txt | 40 ++++++ npc/warps/dungeons/morroc_duns.txt | 63 ---------- npc/warps/dungeons/orc_dun.txt | 26 ---- npc/warps/dungeons/orcsdun.txt | 26 ++++ npc/warps/dungeons/pay_dun.txt | 36 ++++++ npc/warps/dungeons/payon_dun.txt | 36 ------ npc/warps/dungeons/prt_dun.txt | 242 ------------------------------------ npc/warps/dungeons/prt_maze.txt | 242 ++++++++++++++++++++++++++++++++++++ npc/warps/dungeons/ra_san.txt | 43 +++++++ npc/warps/dungeons/rachel_dun.txt | 43 ------- npc/warps/dungeons/tha_t.txt | 60 +++++++++ npc/warps/dungeons/thana_dun.txt | 60 --------- npc/warps/dungeons/thor_dun.txt | 24 ---- npc/warps/dungeons/thor_v.txt | 24 ++++ npc/warps/dungeons/treasure.txt | 49 ++++++++ npc/warps/dungeons/tur_dun.txt | 23 ++++ npc/warps/dungeons/um_dun.txt | 33 +++++ npc/warps/dungeons/umbala_dun.txt | 33 ----- npc/warps/dungeons/xmas_dun.txt | 18 +++ npc/warps/dungeons/yuno_dun.txt | 18 --- npc/warps/other/jobquests.txt | 21 ++++ 52 files changed, 1397 insertions(+), 1347 deletions(-) create mode 100644 npc/warps/dungeons/abbey.txt delete mode 100644 npc/warps/dungeons/abbey_dun.txt delete mode 100644 npc/warps/dungeons/alberta_duns.txt delete mode 100644 npc/warps/dungeons/alde_ct.txt create mode 100644 npc/warps/dungeons/alde_dun.txt create mode 100644 npc/warps/dungeons/ama_dun.txt delete mode 100644 npc/warps/dungeons/amatsu_dun.txt delete mode 100644 npc/warps/dungeons/ant_hell.txt create mode 100644 npc/warps/dungeons/anthell.txt create mode 100644 npc/warps/dungeons/beach_dun.txt create mode 100644 npc/warps/dungeons/c_tower.txt delete mode 100644 npc/warps/dungeons/coal_mine.txt delete mode 100644 npc/warps/dungeons/com_dun.txt create mode 100644 npc/warps/dungeons/gef_dun.txt delete mode 100644 npc/warps/dungeons/geffen_dun.txt create mode 100644 npc/warps/dungeons/in_sphinx.txt create mode 100644 npc/warps/dungeons/iz_dun.txt delete mode 100644 npc/warps/dungeons/izlude_dun.txt create mode 100644 npc/warps/dungeons/kh_dun.txt delete mode 100644 npc/warps/dungeons/kiel_dun.txt delete mode 100644 npc/warps/dungeons/lhalzen_dun.txt create mode 100644 npc/warps/dungeons/lhz_dun.txt create mode 100644 npc/warps/dungeons/lou_dun.txt delete mode 100644 npc/warps/dungeons/louyang_dun.txt delete mode 100644 npc/warps/dungeons/lutie_dun.txt create mode 100644 npc/warps/dungeons/mag_dun.txt create mode 100644 npc/warps/dungeons/mjo_dun.txt create mode 100644 npc/warps/dungeons/moc_pryd.txt delete mode 100644 npc/warps/dungeons/morroc_duns.txt delete mode 100644 npc/warps/dungeons/orc_dun.txt create mode 100644 npc/warps/dungeons/orcsdun.txt create mode 100644 npc/warps/dungeons/pay_dun.txt delete mode 100644 npc/warps/dungeons/payon_dun.txt delete mode 100644 npc/warps/dungeons/prt_dun.txt create mode 100644 npc/warps/dungeons/prt_maze.txt create mode 100644 npc/warps/dungeons/ra_san.txt delete mode 100644 npc/warps/dungeons/rachel_dun.txt create mode 100644 npc/warps/dungeons/tha_t.txt delete mode 100644 npc/warps/dungeons/thana_dun.txt delete mode 100644 npc/warps/dungeons/thor_dun.txt create mode 100644 npc/warps/dungeons/thor_v.txt create mode 100644 npc/warps/dungeons/treasure.txt create mode 100644 npc/warps/dungeons/tur_dun.txt create mode 100644 npc/warps/dungeons/um_dun.txt delete mode 100644 npc/warps/dungeons/umbala_dun.txt create mode 100644 npc/warps/dungeons/xmas_dun.txt delete mode 100644 npc/warps/dungeons/yuno_dun.txt (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index f019a2f8c..df0109ffb 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,9 @@ Date Added ====== 2007/11/16 + * Rev. 11742 Renamed several dungeon warp scripts [L0ne_W0lf] + to match their map names, split up a couple files as well. + * Moved Ninja and Gunslinger warps to the proper file. * Rev. 11740 Fixes bugreport:417 and bugreport:418 [L0ne_W0lf] * Really fixed bugreport:407 [ultramage] 2007/11/15 diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index 64ccd79d0..90ca20906 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -42,36 +42,39 @@ npc: npc/warps/cities/veins.txt npc: npc/warps/cities/yggdrasil.txt npc: npc/warps/cities/yuno.txt // -------------------------- Dungeons -------------------------- -npc: npc/warps/dungeons/abbey_dun.txt +npc: npc/warps/dungeons/abbey.txt npc: npc/warps/dungeons/abyss.txt -npc: npc/warps/dungeons/alberta_duns.txt -npc: npc/warps/dungeons/alde_ct.txt -npc: npc/warps/dungeons/amatsu_dun.txt -npc: npc/warps/dungeons/ant_hell.txt +npc: npc/warps/dungeons/alde_dun.txt +npc: npc/warps/dungeons/ama_dun.txt +npc: npc/warps/dungeons/anthell.txt npc: npc/warps/dungeons/ayo_dun.txt -npc: npc/warps/dungeons/coal_mine.txt -npc: npc/warps/dungeons/com_dun.txt +npc: npc/warps/dungeons/beach_dun.txt +npc: npc/warps/dungeons/c_tower.txt npc: npc/warps/dungeons/ein_dun.txt -npc: npc/warps/dungeons/geffen_dun.txt +npc: npc/warps/dungeons/gef_dun.txt npc: npc/warps/dungeons/gon_dun.txt npc: npc/warps/dungeons/ice_dun.txt -npc: npc/warps/dungeons/izlude_dun.txt +npc: npc/warps/dungeons/in_sphinx.txt +npc: npc/warps/dungeons/iz_dun.txt npc: npc/warps/dungeons/juperos.txt -npc: npc/warps/dungeons/kiel_dun.txt -npc: npc/warps/dungeons/lhalzen_dun.txt -npc: npc/warps/dungeons/louyang_dun.txt -npc: npc/warps/dungeons/lutie_dun.txt -npc: npc/warps/dungeons/morroc_duns.txt +npc: npc/warps/dungeons/kh_dun.txt +npc: npc/warps/dungeons/lhz_dun.txt +npc: npc/warps/dungeons/lou_dun.txt +npc: npc/warps/dungeons/mag_dun.txt +npc: npc/warps/dungeons/mjo_dun.txt +npc: npc/warps/dungeons/moc_pryd.txt npc: npc/warps/dungeons/mosk_dun.txt npc: npc/warps/dungeons/odin.txt -npc: npc/warps/dungeons/orc_dun.txt -npc: npc/warps/dungeons/payon_dun.txt -npc: npc/warps/dungeons/prt_dun.txt -npc: npc/warps/dungeons/rachel_dun.txt -npc: npc/warps/dungeons/thana_dun.txt -npc: npc/warps/dungeons/thor_dun.txt -npc: npc/warps/dungeons/umbala_dun.txt -npc: npc/warps/dungeons/yuno_dun.txt +npc: npc/warps/dungeons/orcsdun.txt +npc: npc/warps/dungeons/pay_dun.txt +npc: npc/warps/dungeons/prt_maze.txt +npc: npc/warps/dungeons/ra_san.txt +npc: npc/warps/dungeons/tha_t.txt +npc: npc/warps/dungeons/thor_v.txt +npc: npc/warps/dungeons/treasure.txt +npc: npc/warps/dungeons/tur_dun.txt +npc: npc/warps/dungeons/um_dun.txt +npc: npc/warps/dungeons/xmas_dun.txt // --------------------------- Fields --------------------------- npc: npc/warps/fields/abyss_warper.txt npc: npc/warps/fields/amatsu_fild.txt diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt index e995c8636..6a90860a6 100644 --- a/npc/warps/cities/amatsu.txt +++ b/npc/warps/cities/amatsu.txt @@ -4,7 +4,7 @@ //= Athena (1.0) //= Nana (1.1) //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 6+ //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.3 Fixed a warp-back [erKURITA] //= 1.4 Added Ninja's Warps. Thanks to RockmanEXE for the info. [erKURITA] //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.6 Movves Job Quest related warps to proper file. [L0ne_W0lf] //============================================================ //= Amatsu =================================================== @@ -45,14 +46,4 @@ amatsu,249,160,0 warp warp1966 1,1,ama_in01,79,178 amatsu,40,110,0 warp warp1995 1,1,ama_in01,28,176 amatsu,52,148,0 warp warp1994 1,1,ama_in01,88,97 amatsu,85,235,0 warp warp1972 1,1,ama_in02,224,45 -//removed -//amatsu,95,148,0 warp warp1990 1,1,ama_in01,88,97 amatsu,96,117,0 warp warp1962 1,1,ama_in01,29,23 - -//| Ninja quest warps -amatsu,149,140,0 warp ninja01 1,1,que_ng,20,142 -que_ng,20,138,0 warp ninja02 1,1,amatsu,147,136 -que_ng,10,183,0 warp ninja03 1,1,que_ng,33,64 -que_ng,37,64,0 warp ninja04 1,1,que_ng,15,182 -que_ng,30,37,0 warp ninja05 1,1,que_ng,67,28 -que_ng,63,30,0 warp ninja06 1,1,que_ng,25,37 diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt index 83ddec989..7518a4e65 100644 --- a/npc/warps/cities/einbroch.txt +++ b/npc/warps/cities/einbroch.txt @@ -103,14 +103,3 @@ ein_fild04,184,26,0 warp ein_fd01a 1,1,einbroch,157,327 einbroch,150,25,0 warp ein_fd02 1,1,ein_fild08,164,377 ein_fild08,164,380,0 warp ein_fd02a 1,1,einbroch,150,28 -//========================================================================== -//Einbroch - Gunslinger Map Portion (Ninja's map is the same: que_ng) -//========================================================================== -einbroch,136,199,0 warp gswarp1 1,1,que_ng,138,167 -que_ng,130,166,0 warp gswarp2 1,1,einbroch,130,197 -que_ng,178,162,0 warp gswarp3 1,1,que_ng,172,86 -que_ng,166,85,0 warp gswarp4 1,1,que_ng,182,161 -que_ng,165,137,0 warp gswarp5 1,1,que_ng,177,41 -que_ng,172,42,0 warp gswarp6 1,1,que_ng,160,139 -//This one seems to be wrong -//einbroch,137,149,0 warp gswarp7 1,1,que_ng,138,167 diff --git a/npc/warps/dungeons/abbey.txt b/npc/warps/dungeons/abbey.txt new file mode 100644 index 000000000..5ebef4d3a --- /dev/null +++ b/npc/warps/dungeons/abbey.txt @@ -0,0 +1,22 @@ +//===== eAthena Script ======================================= +//= Abbey Dungeon Warp Script +//===== By: ================================================== +//= $ephiroth +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Abbey Dungeon +//===== Additional Comments: ================================= +//= 1.0 Initial version [$ephiroth] +//============================================================ + +//= Abbey Dungeon ============================================ +abbey01,51,9,0 warp namelesswarp0101 1,1,nameless_n,160,184 +abbey01,87,122,0 warp namelesswarp4001 1,1,abbey01,13,201 +abbey01,13,204,0 warp namelesswarp4002 1,1,abbey01,88,118 +abbey01,321,102,0 warp namelesswarp4003 1,1,abbey02,149,11 +abbey02,149,8,0 warp namelesswarp4004 1,1,abbey01,321,99 +abbey02,149,290,0 warp namelesswarp4005 1,1,abbey03,119,8 +abbey03,119,5,0 warp namelesswarp4006 1,1,abbey02,149,287 diff --git a/npc/warps/dungeons/abbey_dun.txt b/npc/warps/dungeons/abbey_dun.txt deleted file mode 100644 index 5ebef4d3a..000000000 --- a/npc/warps/dungeons/abbey_dun.txt +++ /dev/null @@ -1,22 +0,0 @@ -//===== eAthena Script ======================================= -//= Abbey Dungeon Warp Script -//===== By: ================================================== -//= $ephiroth -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Abbey Dungeon -//===== Additional Comments: ================================= -//= 1.0 Initial version [$ephiroth] -//============================================================ - -//= Abbey Dungeon ============================================ -abbey01,51,9,0 warp namelesswarp0101 1,1,nameless_n,160,184 -abbey01,87,122,0 warp namelesswarp4001 1,1,abbey01,13,201 -abbey01,13,204,0 warp namelesswarp4002 1,1,abbey01,88,118 -abbey01,321,102,0 warp namelesswarp4003 1,1,abbey02,149,11 -abbey02,149,8,0 warp namelesswarp4004 1,1,abbey01,321,99 -abbey02,149,290,0 warp namelesswarp4005 1,1,abbey03,119,8 -abbey03,119,5,0 warp namelesswarp4006 1,1,abbey02,149,287 diff --git a/npc/warps/dungeons/alberta_duns.txt b/npc/warps/dungeons/alberta_duns.txt deleted file mode 100644 index 93d881914..000000000 --- a/npc/warps/dungeons/alberta_duns.txt +++ /dev/null @@ -1,58 +0,0 @@ -//==== eAthena Script ======================================== -//= Alberta Field's Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Treasure Island & Turtle Island -//===== Additional Comments: ================================= -//= Split of Alberta.txt -//============================================================ - -//Treasure Island Warp's -treasure01,112,164,0 warp tre01 1,4,treasure01,97,164 -treasure01,125,161,0 warp tre02 1,3,treasure01,144,161 -treasure01,142,161,0 warp tre02-1 1,3,treasure01,123,161 -treasure01,164,114,0 warp tre03 3,1,treasure01,164,88 -treasure01,164,91,0 warp tre03-1 5,1,treasure01,164,116 -treasure01,99,164,0 warp tre01-1 1,4,treasure01,114,164 -treasure01,76,111,0 warp tre10 1,3,treasure01,100,111 -treasure01,38,164,0 warp tre04-1 1,4,treasure01,25,164 -treasure01,40,111,0 warp tre05 1,3,treasure01,67,112 -treasure01,62,111,0 warp tre05-1 1,3,treasure01,38,111 -treasure01,27,164,0 warp tre04 1,4,treasure01,40,164 -treasure01,69,75,0 warp tre07 2,1,treasure01,69,106 -treasure01,69,125,0 warp tre08 4,1,treasure01,69,142 -treasure01,69,140,0 warp tre08-1 4,1,treasure01,69,123 -treasure01,98,111,0 warp tre10-1 1,3,treasure01,74,111 -treasure01,69,177,0 warp tre002 3,1,treasure02,102,27 -treasure01,41,37,0 warp tre06 1,3,treasure01,61,37 -treasure01,58,37,0 warp tre06-1 1,3,treasure01,39,37 -treasure01,69,102,0 warp tre07-1 2,1,treasure01,69,77 -treasure01,79,37,0 warp tre09 1,3,treasure01,98,37 -treasure01,96,37,0 warp tre09-1 1,3,treasure01,77,37 -treasure01,69,22,0 warp tre001 4,1,alb2trea,85,107 -treasure02,102,103,0 warp tre11 5,1,treasure02,102,120 -treasure02,102,118,0 warp tre11-1 5,1,treasure02,102,101 -treasure02,155,128,0 warp tre13-1 1,1,treasure02,155,97 -treasure02,155,99,0 warp tre13 1,1,treasure02,155,130 -treasure02,49,99,0 warp tre14-1 1,1,treasure02,49,130 -treasure02,102,24,0 warp tre003 3,1,treasure01,69,179 -treasure02,123,72,0 warp tre12 1,4,treasure02,140,72 -treasure02,138,72,0 warp tre12-1 1,4,treasure02,121,72 -treasure02,49,128,0 warp tre14 1,1,treasure02,49,97 -treasure02,65,72,0 warp tre15 1,4,treasure02,82,72 -treasure02,80,72,0 warp tre15-1 1,4,treasure02,63,72 - -//Turtle Island Warp's -tur_dun01,154,241,0 warp ttl01 1,1,tur_dun02,148,264 -tur_dun02,148,268,0 warp ttl01-1 1,1,tur_dun01,154,237 -tur_dun02,167,19,0 warp ttl02 1,1,tur_dun03,132,189 -tur_dun03,132,193,0 warp ttl02-1 1,1,tur_dun02,167,23 -tur_dun03,217,71,0 warp ttl03 1,1,tur_dun04,100,192 -tur_dun04,100,196,0 warp ttl03-1 1,1,tur_dun03,215,75 -tur_dun05,89,69,0 warp ttl05 1,1,tur_dun02,148,264 -tur_dun05,9,45,0 warp ttl06 1,1,tur_dun01,154,237 diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt deleted file mode 100644 index c4c44ec53..000000000 --- a/npc/warps/dungeons/alde_ct.txt +++ /dev/null @@ -1,217 +0,0 @@ -//===== eAthena Script ======================================= -//= Al de Baran Clock Tower Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2+ -//===== Description: ========================================= -//= Warp Points for Clock Tower -//===== Additional Comments: ================================= -//= Split off Aldebaran.txt 1.1 fixed clt007 warp -//= 1.3 Optimized [Lupus] -//= 1.4 Removed Duplicates [Silent] -//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//============================================================ - -//= Al De Baran Clock Tower -aldebaran,139,135,0 warp ald002 1,1,c_tower1,199,159 -c_tower1,200,157,0 warp ald003 1,1,aldebaran,139,131 -c_tower1,235,226,0 warp clt001 1,1,c_tower2,268,26 -c_tower1,123,22,0 warp clt002 1,1,alde_dun01,297,25 -c_tower2,142,283,0 warp clt003 1,1,c_tower3,65,147 -c_tower2,24,24,0 warp clt004 1,1,alde_dun03,277,178 -c_tower2,273,26,0 warp clt005 1,1,c_tower1,235,223 - -//============================================================ -//= Level 2 ================================================== -//= Random 2-1 =============================================== -c_tower2,13,288,4 script clt006r 45,1,1,{ - set @r,rand(3); - if(@r==1) goto w2; - if(@r==2) goto w3; - warp "c_tower2",13,282; end; - w2: warp "alde_dun03",175,131; end; - w3: warp "c_tower3",235,7; end; -} -//============================================================ -//= Random 2-2 =============================================== -c_tower2,223,267,4 script clt007r 45,1,1,{ - set @r,rand(3); - if(@r==1) goto w2; - if(@r==2) goto w3; - warp "c_tower2",288,267; end; - w2: warp "alde_dun03",130,130; end; - w3: warp "c_tower3",252,29; end; -} -//============================================================ -//= Level 3 ================================================== -c_tower3,60,147,0 warp clt009 1,1,c_tower2,148,283 -c_tower3,212,159,0 warp clt010 1,1,alde_dun03,276,53 -c_tower3,7,39,0 warp clt011 1,1,alde_dun01,171,158 -c_tower3,42,41,0 warp clt012 1,1,alde_dun02,127,169 -c_tower3,146,8,0 warp clt013 1,1,c_tower1,235,223 -//============================================================ -//= Random 3-1 =============================================== -c_tower3,163,252,4 script clt014r 45,1,1,{ - if(rand(2)) { - warp "c_tower3",168,252; - } else { - warp "alde_dun02",262,41; - } - end; -} -//============================================================ -//= Random 3-2 =============================================== -c_tower3,240,7,4 script clt015r 45,1,1,{ - set @r,rand(3); - if(@r==1) goto w2; - if(@r==2) goto w3; - warp "c_tower2",13,282; end; - w2: warp "alde_dun03",175,131; end; - w3: warp "c_tower3",235,7; end; -} -//============================================================ -//= Random 3-3 =============================================== -c_tower3,252,24,4 script clt016r 45,1,1,{ - set @r,rand(3); - if(@r==1) goto w2; - if(@r==2) goto w3; - warp "c_tower2",228,267; end; - w2: warp "alde_dun03",130,130; end; - w3: warp "c_tower3",252,29; end; -} -//============================================================ -//= Level 4 ================================================== -c_tower4,37,70,0 warp clt017 1,1,alde_dun03,277,54 -c_tower4,51,156,0 warp clt018 1,1,alde_dun01,171,158 -c_tower4,68,46,0 warp clt019 1,1,c_tower4,73,154 -c_tower4,70,19,0 warp clt020 2,2,c_tower3,151,8 -c_tower4,79,49,0 warp clt021 2,2,c_tower4,204,60 -c_tower4,133,202,0 warp clt022 1,1,c_tower4,140,149 -c_tower4,153,107,0 warp clt023 1,1,c_tower2,228,267 -c_tower4,171,179,0 warp clt024 1,1,alde_dun03,276,53 -c_tower4,198,59,0 warp clt025 1,1,c_tower4,152,98 -c_tower4,204,57,0 warp clt026 1,1,c_tower4,65,77 -//============================================================ -//= Random 4-1 =============================================== -c_tower4,75,156,4 script clt027r 45,0,0,{ - set @r,rand(4); - if(@r==1) goto w2; - if(@r==2) goto w3; - if(@r==3) goto w4; - warp "c_tower3",168,252; end; - w2: warp "alde_dun02",262,41; end; - w3: warp "c_tower4",73,154; end; - w4: warp "c_tower4",140,149; end; -} -//============================================================ -//= Random 4-2 =============================================== -c_tower4,68,79,4 script clt028r 45,0,0,{ - set @r,rand(4); - if(@r==1) goto w2; - if(@r==2) goto w3; - if(@r==3) goto w4; - warp "c_tower2",13,282; end; - w2: warp "alde_dun03",175,131; end; - w3: warp "c_tower3",235,7; end; - w4: warp "c_tower4",65,77; end; -} -//============================================================ -//= Random 4-3 =============================================== -c_tower4,142,151,4 script clt029r 45,0,0,{ - set @r,rand(4); - if(@r==1) goto w2; - if(@r==2) goto w3; - if(@r==3) goto w4; - warp "c_tower3",168,252; end; - w2: warp "alde_dun02",262,41; end; - w3: warp "c_tower4",73,154; end; - w4: warp "c_tower4",140,149; end; -} -//============================================================ -//= Random 4-4 =============================================== -c_tower4,151,96,4 script clt030r 45,0,0,{ - set @r,rand(4); - if(@r==1) goto w2; - if(@r==2) goto w3; - if(@r==3) goto w4; - warp "c_tower2",228,267; end; - w2: warp "alde_dun03",130,130; end; - w3: warp "c_tower3",252,29; end; - w4: warp "c_tower4",152,95; end; -} -//============================================================ -//= Random 4-5 =============================================== -c_tower4,189,40,4 script clt031r 45,2,2,{ - set @r,rand(4); - if(@r==1) goto w2; - if(@r==2) goto w3; - if(@r==3) goto w4; - warp "c_tower2",228,267; end; - w2: warp "alde_dun03",130,130; end; - w3: warp "c_tower3",252,29; end; - w4: warp "c_tower4",152,95; end; -} -//============================================================ -//============================================================ -alde_dun01,292,306,0 warp aldd01 2,1,alde_dun02,43,24 -alde_dun01,167,158,0 warp ald002a 2,2,c_tower2,148,283 -alde_dun01,302,25,0 warp ald003a 2,2,c_tower1,125,22 -alde_dun02,43,20,0 warp aldd04 1,1,alde_dun01,292,300 -alde_dun02,279,250,0 warp aldd05 2,2,alde_dun03,18,267 -alde_dun02,122,169,0 warp ald006 2,2,c_tower3,47,41 -alde_dun02,187,234,0 warp ald007 2,2,c_tower3,65,147 -//============================================================ -//= Random B2 ================================================ -alde_dun02,267,41,4 script ald008r 45,1,1,{ - if(rand(2)) { - warp "c_tower3",168,252; - } else { - warp "alde_dun02",262,141; - } - end; -} -alde_dun03,12,267,0 warp aldd09 2,2,alde_dun02,273,250 -alde_dun03,277,183,0 warp ald010 2,2,c_tower2,27,27 -alde_dun03,191,31,0 warp ald011 2,2,c_tower3,217,159 -alde_dun03,276,48,0 warp ald012 2,2,c_tower1,235,223 -//============================================================ -//7(npc) -//= Random B3-1 ================================================ -alde_dun03,130,125,4 script ald014r 45,1,1,{ - set @r,rand(3); - if(@r==1) goto w2; - if(@r==2) goto w3; - warp "c_tower2",228,267; end; - w2: warp "alde_dun03",130,130; end; - w3: warp "c_tower3",252,29; end; -} -//============================================================ -//= Random 3-2 =============================================== -alde_dun03,171,127,4 script ald015r 45,1,1,{ - set @r,rand(4); - if(@r==1) goto w2; - if(@r==2) goto w3; - warp "c_tower2",13,282; end; - w2: warp "alde_dun03",175,131; end; - w3: warp "c_tower3",235,7; end; -} -alde_dun04,80,273,0 warp aldd016 2,2,alde_dun03,263,26 -alde_dun04,207,225,0 warp ald017 1,1,c_tower3,7,34 -alde_dun04,215,192,0 warp ald018 1,1,c_tower2,148,283 -alde_dun04,32,74,0 warp aldd19 1,1,alde_dun02,187,239 -alde_dun04,208,58,0 warp aldd20 2,2,alde_dun04,268,74 -alde_dun04,272,74,0 warp aldd021 2,2,alde_dun04,204,62 -alde_dun04,80,34,4 script ald022r 45,1,1,{ - set @r,rand(4); - if(@r==1) goto w2; - if(@r==2) goto w3; - if(@r==3) goto w4; - warp "c_tower2",13,282; end; - w2: warp "alde_dun03",175,131; end; - w3: warp "c_tower3",235,7; end; - w4: warp "alde_dun04",84,36; end; -} -//============================================================ diff --git a/npc/warps/dungeons/alde_dun.txt b/npc/warps/dungeons/alde_dun.txt new file mode 100644 index 000000000..95ea751ce --- /dev/null +++ b/npc/warps/dungeons/alde_dun.txt @@ -0,0 +1,80 @@ +//===== eAthena Script ======================================= +//= Al de Baran Dungeon Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.6 +//===== Compatible With: ===================================== +//= Any Athena Version; RO Episode 2+ +//===== Description: ========================================= +//= Warp Points for Al De Baran Dungeon +//===== Additional Comments: ================================= +//= Split off Aldebaran.txt +//= 1.1 fixed clt007 warp +//= 1.3 Optimized [Lupus] +//= 1.4 Removed Duplicates [Silent] +//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.6 Moved Clock Tower warps to unique file. [L0ne_W0lf] +//============================================================ + +//============================================================ +//============================================================ +alde_dun01,292,306,0 warp aldd01 2,1,alde_dun02,43,24 +alde_dun01,167,158,0 warp ald002a 2,2,c_tower2,148,283 +alde_dun01,302,25,0 warp ald003a 2,2,c_tower1,125,22 +alde_dun02,43,20,0 warp aldd04 1,1,alde_dun01,292,300 +alde_dun02,279,250,0 warp aldd05 2,2,alde_dun03,18,267 +alde_dun02,122,169,0 warp ald006 2,2,c_tower3,47,41 +alde_dun02,187,234,0 warp ald007 2,2,c_tower3,65,147 +//============================================================ +//= Random B2 ================================================ +alde_dun02,267,41,4 script ald008r 45,1,1,{ + if(rand(2)) { + warp "c_tower3",168,252; + } else { + warp "alde_dun02",262,141; + } + end; +} +alde_dun03,12,267,0 warp aldd09 2,2,alde_dun02,273,250 +alde_dun03,277,183,0 warp ald010 2,2,c_tower2,27,27 +alde_dun03,191,31,0 warp ald011 2,2,c_tower3,217,159 +alde_dun03,276,48,0 warp ald012 2,2,c_tower1,235,223 +//============================================================ +//7(npc) +//= Random B3-1 ================================================ +alde_dun03,130,125,4 script ald014r 45,1,1,{ + set @r,rand(3); + if(@r==1) goto w2; + if(@r==2) goto w3; + warp "c_tower2",228,267; end; + w2: warp "alde_dun03",130,130; end; + w3: warp "c_tower3",252,29; end; +} +//============================================================ +//= Random 3-2 =============================================== +alde_dun03,171,127,4 script ald015r 45,1,1,{ + set @r,rand(4); + if(@r==1) goto w2; + if(@r==2) goto w3; + warp "c_tower2",13,282; end; + w2: warp "alde_dun03",175,131; end; + w3: warp "c_tower3",235,7; end; +} +alde_dun04,80,273,0 warp aldd016 2,2,alde_dun03,263,26 +alde_dun04,207,225,0 warp ald017 1,1,c_tower3,7,34 +alde_dun04,215,192,0 warp ald018 1,1,c_tower2,148,283 +alde_dun04,32,74,0 warp aldd19 1,1,alde_dun02,187,239 +alde_dun04,208,58,0 warp aldd20 2,2,alde_dun04,268,74 +alde_dun04,272,74,0 warp aldd021 2,2,alde_dun04,204,62 +alde_dun04,80,34,4 script ald022r 45,1,1,{ + set @r,rand(4); + if(@r==1) goto w2; + if(@r==2) goto w3; + if(@r==3) goto w4; + warp "c_tower2",13,282; end; + w2: warp "alde_dun03",175,131; end; + w3: warp "c_tower3",235,7; end; + w4: warp "alde_dun04",84,36; end; +} +//============================================================ diff --git a/npc/warps/dungeons/ama_dun.txt b/npc/warps/dungeons/ama_dun.txt new file mode 100644 index 000000000..68defa5e9 --- /dev/null +++ b/npc/warps/dungeons/ama_dun.txt @@ -0,0 +1,21 @@ +//===== eAthena Script ======================================= +//= Amatsu Dungeon Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= Any Athena Version; RO Episode 6+ +//===== Description: ========================================= +//= Warp Points for Amatsu +//===== Additional Comments: ================================= +//= Split off amatsu.txt +//============================================================ + +//= Amatsu Dungeon =========================================== +//disabled due to amatsu dungeon quest +//ama_dun01,228,6,0 warp warp8007 1,1,ama_test,50,87 +ama_dun01,234,143,0 warp warp8008 1,1,ama_dun02,31,41 +ama_dun02,196,124,0 warp warp8010 1,1,ama_dun03,119,14 +ama_dun02,29,41,0 warp warp8009 1,1,ama_dun01,231,143 +ama_dun03,119,9,0 warp warp8011 1,1,ama_dun02,196,121 diff --git a/npc/warps/dungeons/amatsu_dun.txt b/npc/warps/dungeons/amatsu_dun.txt deleted file mode 100644 index 68defa5e9..000000000 --- a/npc/warps/dungeons/amatsu_dun.txt +++ /dev/null @@ -1,21 +0,0 @@ -//===== eAthena Script ======================================= -//= Amatsu Dungeon Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ -//===== Description: ========================================= -//= Warp Points for Amatsu -//===== Additional Comments: ================================= -//= Split off amatsu.txt -//============================================================ - -//= Amatsu Dungeon =========================================== -//disabled due to amatsu dungeon quest -//ama_dun01,228,6,0 warp warp8007 1,1,ama_test,50,87 -ama_dun01,234,143,0 warp warp8008 1,1,ama_dun02,31,41 -ama_dun02,196,124,0 warp warp8010 1,1,ama_dun03,119,14 -ama_dun02,29,41,0 warp warp8009 1,1,ama_dun01,231,143 -ama_dun03,119,9,0 warp warp8011 1,1,ama_dun02,196,121 diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/ant_hell.txt deleted file mode 100644 index dfc4e2a5c..000000000 --- a/npc/warps/dungeons/ant_hell.txt +++ /dev/null @@ -1,34 +0,0 @@ -//===== eAthena Script ======================================= -//= Ant Hell Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Ant Hell -//===== Additional Comments: ================================= -//= 1.3 Changed var anthell to @anthell. Optimized [Lupus] -//= 1.4 Removed Duplicates [Silent] -//============================================================ - -//= Ant Hell ================================================= -anthell01,35,267,0 script ant001 45,1,1,{ - if(@anthell) { - warp "moc_fild15",251,248; - } else { - warp "moc_fild04",213,327; - } - end; -} -anthell02,171,169,0 script ant002 45,1,2,{ - if(@anthell) { - warp "moc_fild04",213,327; - } else { - warp "moc_fild15",251,248; - } - end; -} -anthell01,253,32,0 warp ant01 2,1,anthell02,34,263 -anthell02,32,267,0 warp ant01-1 2,2,anthell01,253,35 diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt new file mode 100644 index 000000000..dfc4e2a5c --- /dev/null +++ b/npc/warps/dungeons/anthell.txt @@ -0,0 +1,34 @@ +//===== eAthena Script ======================================= +//= Ant Hell Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.4 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Ant Hell +//===== Additional Comments: ================================= +//= 1.3 Changed var anthell to @anthell. Optimized [Lupus] +//= 1.4 Removed Duplicates [Silent] +//============================================================ + +//= Ant Hell ================================================= +anthell01,35,267,0 script ant001 45,1,1,{ + if(@anthell) { + warp "moc_fild15",251,248; + } else { + warp "moc_fild04",213,327; + } + end; +} +anthell02,171,169,0 script ant002 45,1,2,{ + if(@anthell) { + warp "moc_fild04",213,327; + } else { + warp "moc_fild15",251,248; + } + end; +} +anthell01,253,32,0 warp ant01 2,1,anthell02,34,263 +anthell02,32,267,0 warp ant01-1 2,2,anthell01,253,35 diff --git a/npc/warps/dungeons/beach_dun.txt b/npc/warps/dungeons/beach_dun.txt new file mode 100644 index 000000000..ba6e36989 --- /dev/null +++ b/npc/warps/dungeons/beach_dun.txt @@ -0,0 +1,19 @@ +//===== eAthena Script ======================================= +//= Comodo Dungeon Warp +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points Comodo Dungeon +//===== Additional Comments: ================================= +//= No comment! +//============================================================ + +//Beach Dungeon ============================================== +beach_dun,276,67,0 warp cmd004 1,1,comodo,31,215 +beach_dun2,154,13,0 warp cmd005 2,1,comodo,176,353 +beach_dun3,17,265,0 warp cmd007 1,1,comodo,328,175 +beach_dun3,286,57,0 warp cmd006 1,1,cmd_fild01,30,317 diff --git a/npc/warps/dungeons/c_tower.txt b/npc/warps/dungeons/c_tower.txt new file mode 100644 index 000000000..d6f849da1 --- /dev/null +++ b/npc/warps/dungeons/c_tower.txt @@ -0,0 +1,153 @@ +//===== eAthena Script ======================================= +//= Al de Baran Clock Tower Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version; RO Episode 2+ +//===== Description: ========================================= +//= Warp Points for Clock Tower +//===== Additional Comments: ================================= +//= 1.0 Split from combined warp file alberta_duns. [L0ne_W0lf] +//============================================================ + +//= Al De Baran Clock Tower +aldebaran,139,135,0 warp ald002 1,1,c_tower1,199,159 +c_tower1,200,157,0 warp ald003 1,1,aldebaran,139,131 +c_tower1,235,226,0 warp clt001 1,1,c_tower2,268,26 +c_tower1,123,22,0 warp clt002 1,1,alde_dun01,297,25 +c_tower2,142,283,0 warp clt003 1,1,c_tower3,65,147 +c_tower2,24,24,0 warp clt004 1,1,alde_dun03,277,178 +c_tower2,273,26,0 warp clt005 1,1,c_tower1,235,223 + +//============================================================ +//= Level 2 ================================================== +//= Random 2-1 =============================================== +c_tower2,13,288,4 script clt006r 45,1,1,{ + set @r,rand(3); + if(@r==1) goto w2; + if(@r==2) goto w3; + warp "c_tower2",13,282; end; + w2: warp "alde_dun03",175,131; end; + w3: warp "c_tower3",235,7; end; +} +//============================================================ +//= Random 2-2 =============================================== +c_tower2,223,267,4 script clt007r 45,1,1,{ + set @r,rand(3); + if(@r==1) goto w2; + if(@r==2) goto w3; + warp "c_tower2",288,267; end; + w2: warp "alde_dun03",130,130; end; + w3: warp "c_tower3",252,29; end; +} +//============================================================ +//= Level 3 ================================================== +c_tower3,60,147,0 warp clt009 1,1,c_tower2,148,283 +c_tower3,212,159,0 warp clt010 1,1,alde_dun03,276,53 +c_tower3,7,39,0 warp clt011 1,1,alde_dun01,171,158 +c_tower3,42,41,0 warp clt012 1,1,alde_dun02,127,169 +c_tower3,146,8,0 warp clt013 1,1,c_tower1,235,223 +//============================================================ +//= Random 3-1 =============================================== +c_tower3,163,252,4 script clt014r 45,1,1,{ + if(rand(2)) { + warp "c_tower3",168,252; + } else { + warp "alde_dun02",262,41; + } + end; +} +//============================================================ +//= Random 3-2 =============================================== +c_tower3,240,7,4 script clt015r 45,1,1,{ + set @r,rand(3); + if(@r==1) goto w2; + if(@r==2) goto w3; + warp "c_tower2",13,282; end; + w2: warp "alde_dun03",175,131; end; + w3: warp "c_tower3",235,7; end; +} +//============================================================ +//= Random 3-3 =============================================== +c_tower3,252,24,4 script clt016r 45,1,1,{ + set @r,rand(3); + if(@r==1) goto w2; + if(@r==2) goto w3; + warp "c_tower2",228,267; end; + w2: warp "alde_dun03",130,130; end; + w3: warp "c_tower3",252,29; end; +} +//============================================================ +//= Level 4 ================================================== +c_tower4,37,70,0 warp clt017 1,1,alde_dun03,277,54 +c_tower4,51,156,0 warp clt018 1,1,alde_dun01,171,158 +c_tower4,68,46,0 warp clt019 1,1,c_tower4,73,154 +c_tower4,70,19,0 warp clt020 2,2,c_tower3,151,8 +c_tower4,79,49,0 warp clt021 2,2,c_tower4,204,60 +c_tower4,133,202,0 warp clt022 1,1,c_tower4,140,149 +c_tower4,153,107,0 warp clt023 1,1,c_tower2,228,267 +c_tower4,171,179,0 warp clt024 1,1,alde_dun03,276,53 +c_tower4,198,59,0 warp clt025 1,1,c_tower4,152,98 +c_tower4,204,57,0 warp clt026 1,1,c_tower4,65,77 +//============================================================ +//= Random 4-1 =============================================== +c_tower4,75,156,4 script clt027r 45,0,0,{ + set @r,rand(4); + if(@r==1) goto w2; + if(@r==2) goto w3; + if(@r==3) goto w4; + warp "c_tower3",168,252; end; + w2: warp "alde_dun02",262,41; end; + w3: warp "c_tower4",73,154; end; + w4: warp "c_tower4",140,149; end; +} +//============================================================ +//= Random 4-2 =============================================== +c_tower4,68,79,4 script clt028r 45,0,0,{ + set @r,rand(4); + if(@r==1) goto w2; + if(@r==2) goto w3; + if(@r==3) goto w4; + warp "c_tower2",13,282; end; + w2: warp "alde_dun03",175,131; end; + w3: warp "c_tower3",235,7; end; + w4: warp "c_tower4",65,77; end; +} +//============================================================ +//= Random 4-3 =============================================== +c_tower4,142,151,4 script clt029r 45,0,0,{ + set @r,rand(4); + if(@r==1) goto w2; + if(@r==2) goto w3; + if(@r==3) goto w4; + warp "c_tower3",168,252; end; + w2: warp "alde_dun02",262,41; end; + w3: warp "c_tower4",73,154; end; + w4: warp "c_tower4",140,149; end; +} +//============================================================ +//= Random 4-4 =============================================== +c_tower4,151,96,4 script clt030r 45,0,0,{ + set @r,rand(4); + if(@r==1) goto w2; + if(@r==2) goto w3; + if(@r==3) goto w4; + warp "c_tower2",228,267; end; + w2: warp "alde_dun03",130,130; end; + w3: warp "c_tower3",252,29; end; + w4: warp "c_tower4",152,95; end; +} +//============================================================ +//= Random 4-5 =============================================== +c_tower4,189,40,4 script clt031r 45,2,2,{ + set @r,rand(4); + if(@r==1) goto w2; + if(@r==2) goto w3; + if(@r==3) goto w4; + warp "c_tower2",228,267; end; + w2: warp "alde_dun03",130,130; end; + w3: warp "c_tower3",252,29; end; + w4: warp "c_tower4",152,95; end; +} diff --git a/npc/warps/dungeons/coal_mine.txt b/npc/warps/dungeons/coal_mine.txt deleted file mode 100644 index 38d4f163d..000000000 --- a/npc/warps/dungeons/coal_mine.txt +++ /dev/null @@ -1,22 +0,0 @@ -//===== eAthena Script ======================================= -//= Coal Mine Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Coal Mines -//===== Additional Comments: ================================= -//= No Comment! -//============================================================ - -//= Coal Mine ================================================ -mjo_dun01,14,283,0 warp mjod01 2,4,mjo_dun02,381,343 -mjo_dun01,52,14,0 warp mjod001 4,2,mjolnir_02,79,363 -mjo_dun02,31,21,0 warp mjod02 1,1,mjo_dun03,302,262 -mjo_dun02,384,343,0 warp mjod01-1 2,4,mjo_dun01,17,283 -mjo_dun02,39,21,0 warp mjod03 1,1,mjo_dun03,308,262 -mjo_dun03,302,264,0 warp mjod02-1 1,1,mjo_dun02,31,23 -mjo_dun03,308,264,0 warp mjod03-1 1,1,mjo_dun02,39,23 diff --git a/npc/warps/dungeons/com_dun.txt b/npc/warps/dungeons/com_dun.txt deleted file mode 100644 index ba6e36989..000000000 --- a/npc/warps/dungeons/com_dun.txt +++ /dev/null @@ -1,19 +0,0 @@ -//===== eAthena Script ======================================= -//= Comodo Dungeon Warp -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points Comodo Dungeon -//===== Additional Comments: ================================= -//= No comment! -//============================================================ - -//Beach Dungeon ============================================== -beach_dun,276,67,0 warp cmd004 1,1,comodo,31,215 -beach_dun2,154,13,0 warp cmd005 2,1,comodo,176,353 -beach_dun3,17,265,0 warp cmd007 1,1,comodo,328,175 -beach_dun3,286,57,0 warp cmd006 1,1,cmd_fild01,30,317 diff --git a/npc/warps/dungeons/gef_dun.txt b/npc/warps/dungeons/gef_dun.txt new file mode 100644 index 000000000..573032d0d --- /dev/null +++ b/npc/warps/dungeons/gef_dun.txt @@ -0,0 +1,46 @@ +//===== eAthena Script ======================================= +//= Geffen Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Geffen Tower +//===== Additional Comments: ================================= +//= Removed the warp from gef_dun02 to gef_dun03, [MasterOfMuppets] +//= gef_dun03 is just an event map... +//============================================================ + +//= Geffen Tower ============================================= +gef_tower,106,115,0 warp geft01 1,1,gef_tower,106,72 +gef_tower,106,69,0 warp geft01-1 1,1,gef_tower,106,112 +gef_tower,44,36,0 warp geft02 1,1,gef_tower,106,162 +gef_tower,106,158,0 warp geft02-1 1,1,gef_tower,44,33 +gef_tower,118,68,0 warp geft03 1,1,gef_tower,116,28 +gef_tower,116,31,0 warp geft03-1 1,1,gef_tower,118,71 +gef_tower,120,158,0 warp geft04 1,1,gef_tower,118,111 +gef_tower,118,114,0 warp geft04-1 1,1,gef_tower,120,161 +gef_tower,158,104,0 warp geft05 2,2,gef_tower,156,90 +gef_tower,156,93,0 warp geft05-1 2,2,gef_tower,158,107 +gef_tower,158,150,0 warp geft06 1,2,gef_tower,158,124 +gef_tower,158,128,0 warp geft06-1 2,1,gef_tower,158,153 +gef_tower,158,174,0 warp geft07 2,1,gef_tower,52,140 +gef_tower,52,136,0 warp geft07-1 2,1,gef_tower,158,169 +gef_tower,38,160,0 warp geft08 2,1,gef_tower,42,90 +gef_tower,42,86,0 warp geft08-1 1,1,gef_tower,38,157 +gef_tower,66,156,0 warp geft08-2 2,1,gef_tower,42,90 +gef_tower,153,28,0 warp gef005 4,2,gef_dun00,104,99 +gef_tower,52,181,0 warp gef006 4,1,geffen,120,110 +gef_tower,60,32,0 warp geft09 1,1,gef_tower,62,90 +gef_tower,62,87,0 warp geft09-1 1,1,gef_tower,60,30 + +//= Geffen Dungeon ============================================= +gef_dun00,104,103,0 warp gef024 3,3,gef_tower,153,31 +gef_dun00,107,169,0 warp gefd01 2,1,gef_dun01,115,236 +gef_dun01,115,240,0 warp gefd01-1 2,2,gef_dun00,107,165 +gef_dun01,197,38,0 warp gefd02 2,1,gef_dun02,106,132 +gef_dun02,106,134,0 warp gefd02-1 2,1,gef_dun01,197,40 +//gef_dun02,215,67,0 warp gefd03 2,1,gef_dun03,203,200 +gef_dun03,203,204,0 warp gefd03-1 2,1,gef_dun02,215,63 diff --git a/npc/warps/dungeons/geffen_dun.txt b/npc/warps/dungeons/geffen_dun.txt deleted file mode 100644 index 573032d0d..000000000 --- a/npc/warps/dungeons/geffen_dun.txt +++ /dev/null @@ -1,46 +0,0 @@ -//===== eAthena Script ======================================= -//= Geffen Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Geffen Tower -//===== Additional Comments: ================================= -//= Removed the warp from gef_dun02 to gef_dun03, [MasterOfMuppets] -//= gef_dun03 is just an event map... -//============================================================ - -//= Geffen Tower ============================================= -gef_tower,106,115,0 warp geft01 1,1,gef_tower,106,72 -gef_tower,106,69,0 warp geft01-1 1,1,gef_tower,106,112 -gef_tower,44,36,0 warp geft02 1,1,gef_tower,106,162 -gef_tower,106,158,0 warp geft02-1 1,1,gef_tower,44,33 -gef_tower,118,68,0 warp geft03 1,1,gef_tower,116,28 -gef_tower,116,31,0 warp geft03-1 1,1,gef_tower,118,71 -gef_tower,120,158,0 warp geft04 1,1,gef_tower,118,111 -gef_tower,118,114,0 warp geft04-1 1,1,gef_tower,120,161 -gef_tower,158,104,0 warp geft05 2,2,gef_tower,156,90 -gef_tower,156,93,0 warp geft05-1 2,2,gef_tower,158,107 -gef_tower,158,150,0 warp geft06 1,2,gef_tower,158,124 -gef_tower,158,128,0 warp geft06-1 2,1,gef_tower,158,153 -gef_tower,158,174,0 warp geft07 2,1,gef_tower,52,140 -gef_tower,52,136,0 warp geft07-1 2,1,gef_tower,158,169 -gef_tower,38,160,0 warp geft08 2,1,gef_tower,42,90 -gef_tower,42,86,0 warp geft08-1 1,1,gef_tower,38,157 -gef_tower,66,156,0 warp geft08-2 2,1,gef_tower,42,90 -gef_tower,153,28,0 warp gef005 4,2,gef_dun00,104,99 -gef_tower,52,181,0 warp gef006 4,1,geffen,120,110 -gef_tower,60,32,0 warp geft09 1,1,gef_tower,62,90 -gef_tower,62,87,0 warp geft09-1 1,1,gef_tower,60,30 - -//= Geffen Dungeon ============================================= -gef_dun00,104,103,0 warp gef024 3,3,gef_tower,153,31 -gef_dun00,107,169,0 warp gefd01 2,1,gef_dun01,115,236 -gef_dun01,115,240,0 warp gefd01-1 2,2,gef_dun00,107,165 -gef_dun01,197,38,0 warp gefd02 2,1,gef_dun02,106,132 -gef_dun02,106,134,0 warp gefd02-1 2,1,gef_dun01,197,40 -//gef_dun02,215,67,0 warp gefd03 2,1,gef_dun03,203,200 -gef_dun03,203,204,0 warp gefd03-1 2,1,gef_dun02,215,63 diff --git a/npc/warps/dungeons/in_sphinx.txt b/npc/warps/dungeons/in_sphinx.txt new file mode 100644 index 000000000..d403f45f2 --- /dev/null +++ b/npc/warps/dungeons/in_sphinx.txt @@ -0,0 +1,36 @@ +//===== eAthena Script ======================================= +//= Morroc Sphinx Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Sphinx Dungeon +//===== Additional Comments: ================================= +//= 1.0 Split from combined warp file morroc_duns. [L0ne_W0lf] +//============================================================ + +//= Morroc Sphinx ============================================ +in_sphinx1,288,6,0 warp sphx001 5,1,moc_fild19,100,99 +in_sphinx1,80,191,0 warp sphx01 2,1,in_sphinx2,149,81 +in_sphinx2,149,77,0 warp sphx01-1 3,2,in_sphinx1,80,189 +in_sphinx2,276,272,0 warp sphx02 1,3,in_sphinx3,210,54 +in_sphinx3,210,57,0 warp sphx02-1 4,1,in_sphinx2,274,272 +in_sphinx3,35,227,0 warp sphx03 2,4,in_sphinx3,62,227 +in_sphinx3,60,227,0 warp sphx03-1 1,4,in_sphinx3,32,227 +in_sphinx3,70,111,0 warp sphx04 1,1,in_sphinx3,70,81 +in_sphinx3,70,83,0 warp sphx04-1 4,1,in_sphinx3,70,113 +in_sphinx3,12,69,0 warp sphx05 4,1,in_sphinx4,10,222 +in_sphinx4,10,224,0 warp sphx05-1 2,1,in_sphinx3,12,71 +in_sphinx4,120,113,0 warp sphx06 4,2,in_sphinx5,100,99 +in_sphinx5,100,96,0 warp sphx06-1 4,2,in_sphinx4,120,116 +in_sphinx5,11,16,0 warp sphx07 3,1,in_sphinx5,189,181 +in_sphinx5,11,183,0 warp sphx07-1 3,1,in_sphinx5,11,18 +in_sphinx5,189,16,0 warp sphx08-1 3,1,in_sphinx5,11,181 +in_sphinx5,16,188,0 warp sphx08-2 1,3,in_sphinx5,181,188 +in_sphinx5,16,10,0 warp sphx08-3 1,3,in_sphinx5,181,10 +in_sphinx5,183,10,0 warp sphx08-4 1,3,in_sphinx5,18,188 +in_sphinx5,183,188,0 warp sphx08-5 1,3,in_sphinx5,18,10 +in_sphinx5,189,183,0 warp sphx08-6 3,1,in_sphinx5,189,18 diff --git a/npc/warps/dungeons/iz_dun.txt b/npc/warps/dungeons/iz_dun.txt new file mode 100644 index 000000000..199e35116 --- /dev/null +++ b/npc/warps/dungeons/iz_dun.txt @@ -0,0 +1,30 @@ +//===== eAthena Script ======================================= +//= Izlude Dungeon Warp Script +//===== By: ================================================== +//= Athena (1.0) +//= Nana (1.1) +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Bibilyn Island & Undersea Cave +//===== Additional Comments: ================================= +//= No comment! +//============================================================ + +//= Bibilyn Island =========================================== +izlu2dun,108,83,0 warp izd01 3,2,iz_dun00,168,168 + +//= Undersea Cave ============================================ +iz_dun00,168,173,0 warp izd01-1 3,3,izlu2dun,108,88 +iz_dun00,352,342,0 warp izd02 5,2,iz_dun01,253,252 +iz_dun00,39,41,0 warp izd03 5,2,iz_dun01,41,37 +iz_dun01,118,170,0 warp izd04 5,2,iz_dun02,236,204 +iz_dun01,253,258,0 warp izd02-1 2,2,iz_dun00,352,337 +iz_dun01,41,32,0 warp izd03-1 2,2,iz_dun00,39,46 +iz_dun02,236,198,0 warp izd04-1 5,3,iz_dun01,118,165 +iz_dun02,339,331,0 warp izd05 2,2,iz_dun03,32,63 +iz_dun03,264,245,0 warp izd06 1,2,iz_dun04,26,27 +iz_dun03,29,63,0 warp izd05-1 2,2,iz_dun02,339,328 +iz_dun04,26,24,0 warp izd06-1 2,2,iz_dun03,261,245 diff --git a/npc/warps/dungeons/izlude_dun.txt b/npc/warps/dungeons/izlude_dun.txt deleted file mode 100644 index 199e35116..000000000 --- a/npc/warps/dungeons/izlude_dun.txt +++ /dev/null @@ -1,30 +0,0 @@ -//===== eAthena Script ======================================= -//= Izlude Dungeon Warp Script -//===== By: ================================================== -//= Athena (1.0) -//= Nana (1.1) -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Bibilyn Island & Undersea Cave -//===== Additional Comments: ================================= -//= No comment! -//============================================================ - -//= Bibilyn Island =========================================== -izlu2dun,108,83,0 warp izd01 3,2,iz_dun00,168,168 - -//= Undersea Cave ============================================ -iz_dun00,168,173,0 warp izd01-1 3,3,izlu2dun,108,88 -iz_dun00,352,342,0 warp izd02 5,2,iz_dun01,253,252 -iz_dun00,39,41,0 warp izd03 5,2,iz_dun01,41,37 -iz_dun01,118,170,0 warp izd04 5,2,iz_dun02,236,204 -iz_dun01,253,258,0 warp izd02-1 2,2,iz_dun00,352,337 -iz_dun01,41,32,0 warp izd03-1 2,2,iz_dun00,39,46 -iz_dun02,236,198,0 warp izd04-1 5,3,iz_dun01,118,165 -iz_dun02,339,331,0 warp izd05 2,2,iz_dun03,32,63 -iz_dun03,264,245,0 warp izd06 1,2,iz_dun04,26,27 -iz_dun03,29,63,0 warp izd05-1 2,2,iz_dun02,339,328 -iz_dun04,26,24,0 warp izd06-1 2,2,iz_dun03,261,245 diff --git a/npc/warps/dungeons/kh_dun.txt b/npc/warps/dungeons/kh_dun.txt new file mode 100644 index 000000000..ee2337871 --- /dev/null +++ b/npc/warps/dungeons/kh_dun.txt @@ -0,0 +1,38 @@ +//===== eAthena Script ======================================= +//= Kiel Dungeon Warp Script +//===== By: ================================================== +//= Lost Kakashi +//===== Current Version: ===================================== +//= 1.3 +//===== Compatible With: ===================================== +//= eAthena 1.0 +//===== Description: ========================================= +//= Warp Points for the Kiel Dungeon +//===== Additional Comments: ================================= +//= 1.1 Added official Kiel Dungeon entrance [Playtester] +//= 1.2 Changed warps because of Kiel quest [Playtester] +//= 1.3 Added second floor exit. [L0ne_W0lf] +//= Corrected coordinated for some of the other warps. +//============================================================ + +//= Kiel Dungeon ============================================= +kh_dun01,3,234,0 warp kh_dun_00 1,1,yuno_fild08,74,174 + +//Factory Restricted Area Exit +kh_dun01,232,226,0 warp kh_dun_01 1,1,kh_dun01,13,12 + +//Factory side warps +kh_dun01,63,7,0 warp kh_dun_02 1,1,kh_dun01,227,176 +kh_dun01,232,176,0 warp kh_dun_03 1,1,kh_dun01,63,12 + +//Second Floor -> First floor Random warp +kh_dun02,43,195,0 script kh_dun04 45,1,1,{ +OnTouch: + if (rand(1,2) == 1) { + warp "kh_dun01",41,206; + } + else { + warp "kh_dun01",32,199; + } + +} diff --git a/npc/warps/dungeons/kiel_dun.txt b/npc/warps/dungeons/kiel_dun.txt deleted file mode 100644 index ee2337871..000000000 --- a/npc/warps/dungeons/kiel_dun.txt +++ /dev/null @@ -1,38 +0,0 @@ -//===== eAthena Script ======================================= -//= Kiel Dungeon Warp Script -//===== By: ================================================== -//= Lost Kakashi -//===== Current Version: ===================================== -//= 1.3 -//===== Compatible With: ===================================== -//= eAthena 1.0 -//===== Description: ========================================= -//= Warp Points for the Kiel Dungeon -//===== Additional Comments: ================================= -//= 1.1 Added official Kiel Dungeon entrance [Playtester] -//= 1.2 Changed warps because of Kiel quest [Playtester] -//= 1.3 Added second floor exit. [L0ne_W0lf] -//= Corrected coordinated for some of the other warps. -//============================================================ - -//= Kiel Dungeon ============================================= -kh_dun01,3,234,0 warp kh_dun_00 1,1,yuno_fild08,74,174 - -//Factory Restricted Area Exit -kh_dun01,232,226,0 warp kh_dun_01 1,1,kh_dun01,13,12 - -//Factory side warps -kh_dun01,63,7,0 warp kh_dun_02 1,1,kh_dun01,227,176 -kh_dun01,232,176,0 warp kh_dun_03 1,1,kh_dun01,63,12 - -//Second Floor -> First floor Random warp -kh_dun02,43,195,0 script kh_dun04 45,1,1,{ -OnTouch: - if (rand(1,2) == 1) { - warp "kh_dun01",41,206; - } - else { - warp "kh_dun01",32,199; - } - -} diff --git a/npc/warps/dungeons/lhalzen_dun.txt b/npc/warps/dungeons/lhalzen_dun.txt deleted file mode 100644 index c91b04565..000000000 --- a/npc/warps/dungeons/lhalzen_dun.txt +++ /dev/null @@ -1,213 +0,0 @@ -//===== eAthena Script ======================================= -//= Lighthalzen Dungeon Warp Script -//===== By: ================================================== -//= Sara-chan (1.0) -//===== Current Version: ===================================== -//= 2.0 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ -//===== Description: ========================================= -//= Warp Points for Lighthalzen Dungeon -//===== Additional Comments: ================================= -//= No Comment! -//= 1.1 Added temp restriction by Azazel [Lupus] -//= 1.2 Optimized [Lupus] -//= and fixed 005 and 005a warps coords, thanks to Justin84 -//= 1.3 Fixed entrance condition check, thanx2Daegaladh [Lupus] -//= 1.4 Added coords of secret dungeon entrance, thanks to Justin84 -//= proved with screenshots [Lupus] -//= 1.5a thx2 Justin84, some additions and fixes [Lupus] -//= 1.5b re-enabled main entrance warp [Lupus] <-reverted 1.5c -//= 1.6 Updated entrances, added Cube room warps, thanx 2 Justin84 -//= 1.6a Disabled the "Entrance" to lhz_dun01 [Poki#3] -//= 1.6b Updated Sewer Pipe [Vicious] -//= 1.7 Fixed a warp-back -//= 1.8 Some small changes [MasterOfMuppets] -//= 1.9 Removed duplicates [Toms] -//= 2.0 Now use MISC_QUEST&512 instead of 'hzdun' [Lupus] -//============================================================ - -lhz_dun03,140,139,0 warp lhz003 1,1,lhz_dun02,150,145 -lhz_dun02,18,150,0 warp lhz004 1,1,lhz_dun01,18,148 -lhz_dun01,18,146,0 warp lhz004a 1,1,lhz_dun02,18,148 -lhz_dun02,282,155,0 warp lhz005 1,1,lhz_dun01,281,152 -lhz_dun01,281,150,0 warp lhz005a 1,1,lhz_dun02,282,153 -lhz_dun02,148,18,0 warp lhz006 1,1,lhz_dun01,146,10 -lhz_dun01,148,10,0 warp lhz006a 1,1,lhz_dun02,150,18 - -//current entrance -lhz_dun01,150,290,0 warp lhz007 1,1,lhz_in01,23,137 -//lighthalzen,73,52,0 warp lhz007a 1,1,lhz_dun01,150,288 -//This should be only an Exit. This warp doesn't exist on kRO. - -//--------------------------Sewer Pipe-------------------------- - -lighthalzen,313,301,0 script Sewer Pipe 111,{ - mes "You see some pipes for a sewage system."; - if(MISC_QUEST&512){ - mes "You found the way into the lab."; - next; - menu "Go in.",-,"Do not go in.",L_NO; - - warp "lhz_cube",231,17; - end; - } -L_NO: - close; -} - -//--------------------------Warp-------------------------- - -//Cube room <-> Organism test laboratory level 2 -lhz_cube,231,96,0 warp lhzcube1 1,1,lhz_dun02,220,6 -lhz_dun02,224,6,0 warp lhzcube2 1,1,lhz_cube,231,90 - -//Cube room -> Lighthalzen -lhz_cube,231,12,0 warp lhzcube3 1,1,lighthalzen,310,302 -lhz_cube,177,96,0 warp lhzcube4 1,1,lighthalzen,310,302 - -lhz_dun02,150,149,4 script lhz-warp 45,2,2,{ -OnTouch: - if(Upper != 1 && BaseLevel<95)goto s_Noentry0; - if(Upper == 1 && BaseLevel<90)goto s_Noentry1; - warp "lhz_dun03",140,137; - end; - -s_Noentry0: - mes "Non-Advanced class characters must be at least base level 95 to enter level 3 of the Bio Lab Dungeon"; - close; - -s_Noentry1: - mes "Advanced class characters must be at least base level 90 to enter level 3 of the Bio Lab Dungeon"; - close; -} - -//----------------- Cube Room Maze --------------------------- -// -1 are warps facing east. -// -2 the warps facing south. -// -3 are warps facing west. -// -4 are warps facing north. -//----------------- Room 66 74 ------------------------------- -lhz_cube,74,74,0 script cubew01-1 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,66,67,0 warp cubew01-2 2,2,lhz_cube,10,18 -lhz_cube,59,74,0 script cubew01-3 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,66,82,0 script cubew01-4 45,1,1,{ - callfunc "randomw"; - end; -} -//----------------- Room 66 136 ------------------------------ -lhz_cube,74,136,0 warp cubew02-1 2,2,lhz_cube,10,193 -lhz_cube,66,129,0 script cubew02-2 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,59,136,0 script cubew02-3 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,66,144,0 script cubew02-4 45,1,1,{ - callfunc "randomw"; - end; -} -//----------------- Room 67 193 ------------------------------ -lhz_cube,74,192,0 script cubew03-1 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,67,185,0 script cubew03-2 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,59,192,0 script cubew03-3 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,67,200,0 warp cubew03-4 2,2,lhz_cube,10,136 -//----------------- Room 66 18 ------------------------------- -lhz_cube,74,18,0 script cubew04-1 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,66,11,0 warp cubew04-2 2,2,lhz_cube,10,18 -lhz_cube,59,18,0 script cubew04-3 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,66,26,0 warp cubew04-4 2,2,lhz_cube,123,18 -//----------------- Room 66 18 ------------------------------- -lhz_cube,18,18,0 warp cubew05-1 2,2,lhz_cube,10,193 -lhz_cube,10,11,0 warp cubew05-2 2,2,lhz_cube,123,18 -lhz_cube,3,18,0 script cubew05-3 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,10,26,0 script cubew05-4 45,1,1,{ - callfunc "randomw"; - end; -} -//----------------- Room 10 74 ------------------------------- -lhz_cube,18,74,0 script cubew06-1 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,10,67,0 warp cubew06-2 2,2,lhz_cube,123,18 -lhz_cube,3,74,0 warp cubew06-3 2,2,lhz_cube,66,18 -lhz_cube,10,82,0 script cubew06-4 45,1,1,{ - callfunc "randomw"; - end; -} -//----------------- Room 10 136 ------------------------------ -lhz_cube,18,136,0 warp cubew07-1 2,2,lhz_cube,10,74 -lhz_cube,10,129,0 script cubew07-2 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,3,136,0 script cubew07-3 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,10,144,0 script cubew07-4 45,1,1,{ - callfunc "randomw"; - end; -} -//----------------- Room 10 193 ------------------------------ -lhz_cube,18,192,0 script cubew08-1 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,10,185,0 script cubew08-2 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,3,192,0 warp cubew08-3 2,2,lhz_cube,10,74 -lhz_cube,10,200,0 warp cubew08-4 2,2,lhz_cube,66,18 -//----------------- Room 123 18 ------------------------------ -lhz_cube,130,18,0 script cubew09-1 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,123,11,0 script cubew09-2 45,1,1,{ - callfunc "randomw"; - end; -} -lhz_cube,115,18,0 warp cubew09-3 2,2,lhz_cube,248,184 -lhz_cube,123,26,0 script cubew09-4 45,1,1,{ - callfunc "randomw"; - end; -} - -//----- Function for Random Warps ---------------------------- -function script randomw { - set @rdm,rand(3); - if(@rdm==1)goto rdm1; - if(@rdm==2)goto rdm2; - warp "lhz_cube",67,193; end; - rdm1: warp "lhz_cube",66,136; end; - rdm2: warp "lhz_cube",66,74; end; -} diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt new file mode 100644 index 000000000..c91b04565 --- /dev/null +++ b/npc/warps/dungeons/lhz_dun.txt @@ -0,0 +1,213 @@ +//===== eAthena Script ======================================= +//= Lighthalzen Dungeon Warp Script +//===== By: ================================================== +//= Sara-chan (1.0) +//===== Current Version: ===================================== +//= 2.0 +//===== Compatible With: ===================================== +//= Any Athena Version; RO Episode 8+ +//===== Description: ========================================= +//= Warp Points for Lighthalzen Dungeon +//===== Additional Comments: ================================= +//= No Comment! +//= 1.1 Added temp restriction by Azazel [Lupus] +//= 1.2 Optimized [Lupus] +//= and fixed 005 and 005a warps coords, thanks to Justin84 +//= 1.3 Fixed entrance condition check, thanx2Daegaladh [Lupus] +//= 1.4 Added coords of secret dungeon entrance, thanks to Justin84 +//= proved with screenshots [Lupus] +//= 1.5a thx2 Justin84, some additions and fixes [Lupus] +//= 1.5b re-enabled main entrance warp [Lupus] <-reverted 1.5c +//= 1.6 Updated entrances, added Cube room warps, thanx 2 Justin84 +//= 1.6a Disabled the "Entrance" to lhz_dun01 [Poki#3] +//= 1.6b Updated Sewer Pipe [Vicious] +//= 1.7 Fixed a warp-back +//= 1.8 Some small changes [MasterOfMuppets] +//= 1.9 Removed duplicates [Toms] +//= 2.0 Now use MISC_QUEST&512 instead of 'hzdun' [Lupus] +//============================================================ + +lhz_dun03,140,139,0 warp lhz003 1,1,lhz_dun02,150,145 +lhz_dun02,18,150,0 warp lhz004 1,1,lhz_dun01,18,148 +lhz_dun01,18,146,0 warp lhz004a 1,1,lhz_dun02,18,148 +lhz_dun02,282,155,0 warp lhz005 1,1,lhz_dun01,281,152 +lhz_dun01,281,150,0 warp lhz005a 1,1,lhz_dun02,282,153 +lhz_dun02,148,18,0 warp lhz006 1,1,lhz_dun01,146,10 +lhz_dun01,148,10,0 warp lhz006a 1,1,lhz_dun02,150,18 + +//current entrance +lhz_dun01,150,290,0 warp lhz007 1,1,lhz_in01,23,137 +//lighthalzen,73,52,0 warp lhz007a 1,1,lhz_dun01,150,288 +//This should be only an Exit. This warp doesn't exist on kRO. + +//--------------------------Sewer Pipe-------------------------- + +lighthalzen,313,301,0 script Sewer Pipe 111,{ + mes "You see some pipes for a sewage system."; + if(MISC_QUEST&512){ + mes "You found the way into the lab."; + next; + menu "Go in.",-,"Do not go in.",L_NO; + + warp "lhz_cube",231,17; + end; + } +L_NO: + close; +} + +//--------------------------Warp-------------------------- + +//Cube room <-> Organism test laboratory level 2 +lhz_cube,231,96,0 warp lhzcube1 1,1,lhz_dun02,220,6 +lhz_dun02,224,6,0 warp lhzcube2 1,1,lhz_cube,231,90 + +//Cube room -> Lighthalzen +lhz_cube,231,12,0 warp lhzcube3 1,1,lighthalzen,310,302 +lhz_cube,177,96,0 warp lhzcube4 1,1,lighthalzen,310,302 + +lhz_dun02,150,149,4 script lhz-warp 45,2,2,{ +OnTouch: + if(Upper != 1 && BaseLevel<95)goto s_Noentry0; + if(Upper == 1 && BaseLevel<90)goto s_Noentry1; + warp "lhz_dun03",140,137; + end; + +s_Noentry0: + mes "Non-Advanced class characters must be at least base level 95 to enter level 3 of the Bio Lab Dungeon"; + close; + +s_Noentry1: + mes "Advanced class characters must be at least base level 90 to enter level 3 of the Bio Lab Dungeon"; + close; +} + +//----------------- Cube Room Maze --------------------------- +// -1 are warps facing east. +// -2 the warps facing south. +// -3 are warps facing west. +// -4 are warps facing north. +//----------------- Room 66 74 ------------------------------- +lhz_cube,74,74,0 script cubew01-1 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,66,67,0 warp cubew01-2 2,2,lhz_cube,10,18 +lhz_cube,59,74,0 script cubew01-3 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,66,82,0 script cubew01-4 45,1,1,{ + callfunc "randomw"; + end; +} +//----------------- Room 66 136 ------------------------------ +lhz_cube,74,136,0 warp cubew02-1 2,2,lhz_cube,10,193 +lhz_cube,66,129,0 script cubew02-2 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,59,136,0 script cubew02-3 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,66,144,0 script cubew02-4 45,1,1,{ + callfunc "randomw"; + end; +} +//----------------- Room 67 193 ------------------------------ +lhz_cube,74,192,0 script cubew03-1 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,67,185,0 script cubew03-2 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,59,192,0 script cubew03-3 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,67,200,0 warp cubew03-4 2,2,lhz_cube,10,136 +//----------------- Room 66 18 ------------------------------- +lhz_cube,74,18,0 script cubew04-1 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,66,11,0 warp cubew04-2 2,2,lhz_cube,10,18 +lhz_cube,59,18,0 script cubew04-3 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,66,26,0 warp cubew04-4 2,2,lhz_cube,123,18 +//----------------- Room 66 18 ------------------------------- +lhz_cube,18,18,0 warp cubew05-1 2,2,lhz_cube,10,193 +lhz_cube,10,11,0 warp cubew05-2 2,2,lhz_cube,123,18 +lhz_cube,3,18,0 script cubew05-3 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,10,26,0 script cubew05-4 45,1,1,{ + callfunc "randomw"; + end; +} +//----------------- Room 10 74 ------------------------------- +lhz_cube,18,74,0 script cubew06-1 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,10,67,0 warp cubew06-2 2,2,lhz_cube,123,18 +lhz_cube,3,74,0 warp cubew06-3 2,2,lhz_cube,66,18 +lhz_cube,10,82,0 script cubew06-4 45,1,1,{ + callfunc "randomw"; + end; +} +//----------------- Room 10 136 ------------------------------ +lhz_cube,18,136,0 warp cubew07-1 2,2,lhz_cube,10,74 +lhz_cube,10,129,0 script cubew07-2 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,3,136,0 script cubew07-3 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,10,144,0 script cubew07-4 45,1,1,{ + callfunc "randomw"; + end; +} +//----------------- Room 10 193 ------------------------------ +lhz_cube,18,192,0 script cubew08-1 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,10,185,0 script cubew08-2 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,3,192,0 warp cubew08-3 2,2,lhz_cube,10,74 +lhz_cube,10,200,0 warp cubew08-4 2,2,lhz_cube,66,18 +//----------------- Room 123 18 ------------------------------ +lhz_cube,130,18,0 script cubew09-1 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,123,11,0 script cubew09-2 45,1,1,{ + callfunc "randomw"; + end; +} +lhz_cube,115,18,0 warp cubew09-3 2,2,lhz_cube,248,184 +lhz_cube,123,26,0 script cubew09-4 45,1,1,{ + callfunc "randomw"; + end; +} + +//----- Function for Random Warps ---------------------------- +function script randomw { + set @rdm,rand(3); + if(@rdm==1)goto rdm1; + if(@rdm==2)goto rdm2; + warp "lhz_cube",67,193; end; + rdm1: warp "lhz_cube",66,136; end; + rdm2: warp "lhz_cube",66,74; end; +} diff --git a/npc/warps/dungeons/lou_dun.txt b/npc/warps/dungeons/lou_dun.txt new file mode 100644 index 000000000..34462e45c --- /dev/null +++ b/npc/warps/dungeons/lou_dun.txt @@ -0,0 +1,20 @@ +//===== eAthena Script ======================================= +//= Louyang Dungeon Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version 6.0+ +//===== Description: ========================================= +//= Warp Points for Louyang +//===== Additional Comments: ================================= +//= No comment! +//============================================================ + +//= Louyang Dungeon ========================================== +lou_dun01,222,196,0 warp louwarp002a 3,3,louyang,41,270 +lou_dun01,38,205,0 warp louwarp003 3,3,lou_dun02,282,20 +lou_dun02,286,20,0 warp louwarp003a 3,3,lou_dun01,38,209 +lou_dun02,165,270,0 warp louwarp004 3,3,lou_dun03,165,38 +lou_dun03,165,34,0 warp louwarp004a 3,3,lou_dun02,165,266 diff --git a/npc/warps/dungeons/louyang_dun.txt b/npc/warps/dungeons/louyang_dun.txt deleted file mode 100644 index 34462e45c..000000000 --- a/npc/warps/dungeons/louyang_dun.txt +++ /dev/null @@ -1,20 +0,0 @@ -//===== eAthena Script ======================================= -//= Louyang Dungeon Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version 6.0+ -//===== Description: ========================================= -//= Warp Points for Louyang -//===== Additional Comments: ================================= -//= No comment! -//============================================================ - -//= Louyang Dungeon ========================================== -lou_dun01,222,196,0 warp louwarp002a 3,3,louyang,41,270 -lou_dun01,38,205,0 warp louwarp003 3,3,lou_dun02,282,20 -lou_dun02,286,20,0 warp louwarp003a 3,3,lou_dun01,38,209 -lou_dun02,165,270,0 warp louwarp004 3,3,lou_dun03,165,38 -lou_dun03,165,34,0 warp louwarp004a 3,3,lou_dun02,165,266 diff --git a/npc/warps/dungeons/lutie_dun.txt b/npc/warps/dungeons/lutie_dun.txt deleted file mode 100644 index ff14558bb..000000000 --- a/npc/warps/dungeons/lutie_dun.txt +++ /dev/null @@ -1,18 +0,0 @@ -//===== eAthena Script ======================================= -//= Lutie Dungeon (Toy Factory) Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2+ -//===== Description: ========================================= -//= Warp Points for Lutie Dungeon (Toy Factory) -//===== Additional Comments: ================================= -//= 1.1 Fixed endless warping loop -//============================================================ - -//= Toy Factory ============================================== -xmas_dun01,128,133,0 warp xmas15 3,3,xmas_dun02,129,133 -xmas_dun01,205,13,0 warp xmas14-1 3,3,xmas,143,308 -xmas_dun02,129,129,0 warp xmas15-1 3,3,xmas_dun01,128,128 diff --git a/npc/warps/dungeons/mag_dun.txt b/npc/warps/dungeons/mag_dun.txt new file mode 100644 index 000000000..2459241e2 --- /dev/null +++ b/npc/warps/dungeons/mag_dun.txt @@ -0,0 +1,18 @@ +//===== eAthena Script ======================================= +//= Yuno Dungeon Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version; RO Episode 5+ +//===== Description: ========================================= +//= Warp Points for Yuno Dungeon +//===== Additional Comments: ================================= +//= No Comment! +//============================================================ + +//= Magma Dungeon ============================================ +mag_dun01,126,66,0 warp mag01-yunfild 1,1,yuno_fild03,34,139 +mag_dun01,242,241,0 warp mag01-02 1,1,mag_dun02,47,30 +mag_dun02,47,28,0 warp mag02-01 1,1,mag_dun01,242,239 diff --git a/npc/warps/dungeons/mjo_dun.txt b/npc/warps/dungeons/mjo_dun.txt new file mode 100644 index 000000000..38d4f163d --- /dev/null +++ b/npc/warps/dungeons/mjo_dun.txt @@ -0,0 +1,22 @@ +//===== eAthena Script ======================================= +//= Coal Mine Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Coal Mines +//===== Additional Comments: ================================= +//= No Comment! +//============================================================ + +//= Coal Mine ================================================ +mjo_dun01,14,283,0 warp mjod01 2,4,mjo_dun02,381,343 +mjo_dun01,52,14,0 warp mjod001 4,2,mjolnir_02,79,363 +mjo_dun02,31,21,0 warp mjod02 1,1,mjo_dun03,302,262 +mjo_dun02,384,343,0 warp mjod01-1 2,4,mjo_dun01,17,283 +mjo_dun02,39,21,0 warp mjod03 1,1,mjo_dun03,308,262 +mjo_dun03,302,264,0 warp mjod02-1 1,1,mjo_dun02,31,23 +mjo_dun03,308,264,0 warp mjod03-1 1,1,mjo_dun02,39,23 diff --git a/npc/warps/dungeons/moc_pryd.txt b/npc/warps/dungeons/moc_pryd.txt new file mode 100644 index 000000000..a8b8d2a35 --- /dev/null +++ b/npc/warps/dungeons/moc_pryd.txt @@ -0,0 +1,40 @@ +//===== eAthena Script ======================================= +//= Morroc Pyramid Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Morroc Pyramid +//===== Additional Comments: ================================= +//= 1.1 Moved Sphinx warps to unique file. [L0ne_W0lf] +//============================================================ + +//= Morroc Pyramid =========================================== +moc_pryd01,10,195,0 warp mocp01 5,2,moc_pryd02,10,192 +moc_pryd01,195,9,0 warp mocp001 2,5,moc_ruins,60,161 +moc_pryd01,90,109,0 warp mocp02 1,2,moc_prydb1,100,185 +moc_pryd02,10,195,0 warp mocp01-1 5,2,moc_pryd01,10,192 +moc_pryd02,100,99,0 warp mocp03 3,2,moc_pryd03,100,92 +moc_pryd03,100,97,0 warp mocp03-1 3,2,moc_pryd02,100,92 +moc_pryd03,12,15,0 warp mocp04 3,2,moc_pryd04,12,18 +moc_pryd03,15,187,0 warp mocp05 2,3,moc_pryd04,18,187 +moc_pryd03,184,11,0 warp mocp06 2,3,moc_pryd04,181,11 +moc_pryd03,188,184,0 warp mocp07 3,2,moc_pryd04,188,181 +moc_pryd04,12,15,0 warp mocp04-1 3,2,moc_pryd03,12,18 +moc_pryd04,15,187,0 warp mocp05-1 2,3,moc_pryd03,18,187 +moc_pryd04,184,11,0 warp mocp06-1 2,3,moc_pryd03,181,11 +moc_pryd04,188,184,0 warp mocp07-1 3,2,moc_pryd03,188,181 +moc_pryd05,223,9,0 warp mocp08 2,2,moc_pryd06,192,10 +moc_pryd05,94,98,0 warp mocp09 2,1,moc_prydb1,100,57 +moc_pryd06,197,10,0 warp mocp08-1 2,3,moc_pryd05,220,9 +moc_prydb1,100,104,0 warp mocp10 5,2,moc_prydb1,100,74 +moc_prydb1,100,191,0 warp moco02-1 2,2,moc_pryd01,90,105 +moc_prydb1,100,55,0 warp mocp09-1 2,1,moc_pryd05,94,96 +moc_prydb1,100,77,0 warp mocp10-1 5,2,moc_prydb1,100,107 +moc_prydb1,111,115,0 warp mocp11 2,6,moc_prydb1,145,115 +moc_prydb1,142,115,0 warp mocp11-1 2,6,moc_prydb1,108,115 +moc_prydb1,59,115,0 warp mocp12 2,6,moc_prydb1,90,115 +moc_prydb1,87,115,0 warp mocp12-1 2,6,moc_prydb1,56,115 diff --git a/npc/warps/dungeons/morroc_duns.txt b/npc/warps/dungeons/morroc_duns.txt deleted file mode 100644 index c570d4a42..000000000 --- a/npc/warps/dungeons/morroc_duns.txt +++ /dev/null @@ -1,63 +0,0 @@ -//===== eAthena Script ======================================= -//= Morroc Dungeons Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Morroc Dungeons -//===== Additional Comments: ================================= -//= No Comment! -//============================================================ - -//= Morroc Sphinx ============================================ -in_sphinx1,288,6,0 warp sphx001 5,1,moc_fild19,100,99 -in_sphinx1,80,191,0 warp sphx01 2,1,in_sphinx2,149,81 -in_sphinx2,149,77,0 warp sphx01-1 3,2,in_sphinx1,80,189 -in_sphinx2,276,272,0 warp sphx02 1,3,in_sphinx3,210,54 -in_sphinx3,210,57,0 warp sphx02-1 4,1,in_sphinx2,274,272 -in_sphinx3,35,227,0 warp sphx03 2,4,in_sphinx3,62,227 -in_sphinx3,60,227,0 warp sphx03-1 1,4,in_sphinx3,32,227 -in_sphinx3,70,111,0 warp sphx04 1,1,in_sphinx3,70,81 -in_sphinx3,70,83,0 warp sphx04-1 4,1,in_sphinx3,70,113 -in_sphinx3,12,69,0 warp sphx05 4,1,in_sphinx4,10,222 -in_sphinx4,10,224,0 warp sphx05-1 2,1,in_sphinx3,12,71 -in_sphinx4,120,113,0 warp sphx06 4,2,in_sphinx5,100,99 -in_sphinx5,100,96,0 warp sphx06-1 4,2,in_sphinx4,120,116 -in_sphinx5,11,16,0 warp sphx07 3,1,in_sphinx5,189,181 -in_sphinx5,11,183,0 warp sphx07-1 3,1,in_sphinx5,11,18 -in_sphinx5,189,16,0 warp sphx08-1 3,1,in_sphinx5,11,181 -in_sphinx5,16,188,0 warp sphx08-2 1,3,in_sphinx5,181,188 -in_sphinx5,16,10,0 warp sphx08-3 1,3,in_sphinx5,181,10 -in_sphinx5,183,10,0 warp sphx08-4 1,3,in_sphinx5,18,188 -in_sphinx5,183,188,0 warp sphx08-5 1,3,in_sphinx5,18,10 -in_sphinx5,189,183,0 warp sphx08-6 3,1,in_sphinx5,189,18 - -//= Morroc Pyramid =========================================== -moc_pryd01,10,195,0 warp mocp01 5,2,moc_pryd02,10,192 -moc_pryd01,195,9,0 warp mocp001 2,5,moc_ruins,60,161 -moc_pryd01,90,109,0 warp mocp02 1,2,moc_prydb1,100,185 -moc_pryd02,10,195,0 warp mocp01-1 5,2,moc_pryd01,10,192 -moc_pryd02,100,99,0 warp mocp03 3,2,moc_pryd03,100,92 -moc_pryd03,100,97,0 warp mocp03-1 3,2,moc_pryd02,100,92 -moc_pryd03,12,15,0 warp mocp04 3,2,moc_pryd04,12,18 -moc_pryd03,15,187,0 warp mocp05 2,3,moc_pryd04,18,187 -moc_pryd03,184,11,0 warp mocp06 2,3,moc_pryd04,181,11 -moc_pryd03,188,184,0 warp mocp07 3,2,moc_pryd04,188,181 -moc_pryd04,12,15,0 warp mocp04-1 3,2,moc_pryd03,12,18 -moc_pryd04,15,187,0 warp mocp05-1 2,3,moc_pryd03,18,187 -moc_pryd04,184,11,0 warp mocp06-1 2,3,moc_pryd03,181,11 -moc_pryd04,188,184,0 warp mocp07-1 3,2,moc_pryd03,188,181 -moc_pryd05,223,9,0 warp mocp08 2,2,moc_pryd06,192,10 -moc_pryd05,94,98,0 warp mocp09 2,1,moc_prydb1,100,57 -moc_pryd06,197,10,0 warp mocp08-1 2,3,moc_pryd05,220,9 -moc_prydb1,100,104,0 warp mocp10 5,2,moc_prydb1,100,74 -moc_prydb1,100,191,0 warp moco02-1 2,2,moc_pryd01,90,105 -moc_prydb1,100,55,0 warp mocp09-1 2,1,moc_pryd05,94,96 -moc_prydb1,100,77,0 warp mocp10-1 5,2,moc_prydb1,100,107 -moc_prydb1,111,115,0 warp mocp11 2,6,moc_prydb1,145,115 -moc_prydb1,142,115,0 warp mocp11-1 2,6,moc_prydb1,108,115 -moc_prydb1,59,115,0 warp mocp12 2,6,moc_prydb1,90,115 -moc_prydb1,87,115,0 warp mocp12-1 2,6,moc_prydb1,56,115 diff --git a/npc/warps/dungeons/orc_dun.txt b/npc/warps/dungeons/orc_dun.txt deleted file mode 100644 index debd6217c..000000000 --- a/npc/warps/dungeons/orc_dun.txt +++ /dev/null @@ -1,26 +0,0 @@ -//===== eAthena Script ======================================= -//= Orc Dungeon Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Orc Dungeon -//===== Additional Comments: ================================= -//= No comment! -//============================================================ - -//= Orc Dungeon ============================================== -in_orcs01,108,86,0 warp orc001 3,2,gef_fild10,223,203 -in_orcs01,124,171,0 warp orc002 1,3,gef_fild10,138,329 -in_orcs01,162,55,0 warp orc003 4,1,gef_fild10,214,53 -in_orcs01,29,116,0 warp orc004 4,1,gef_fild10,137,286 -in_orcs01,30,154,0 warp orc005 3,2,gef_fild10,65,335 -in_orcs01,30,182,0 warp orc01 2,1,orcsdun01,32,170 -orcsdun01,32,172,0 warp orc01-1 3,1,in_orcs01,30,180 -in_orcs01,108,114,0 warp orc02 2,1,orcsdun02,180,17 -orcsdun02,180,15,0 warp orc02-1 2,1,in_orcs01,108,112 -orcsdun01,183,8,0 warp orc03 4,2,orcsdun02,21,185 -orcsdun02,21,188,0 warp orc03-1 8,2,orcsdun01,183,11 diff --git a/npc/warps/dungeons/orcsdun.txt b/npc/warps/dungeons/orcsdun.txt new file mode 100644 index 000000000..debd6217c --- /dev/null +++ b/npc/warps/dungeons/orcsdun.txt @@ -0,0 +1,26 @@ +//===== eAthena Script ======================================= +//= Orc Dungeon Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Orc Dungeon +//===== Additional Comments: ================================= +//= No comment! +//============================================================ + +//= Orc Dungeon ============================================== +in_orcs01,108,86,0 warp orc001 3,2,gef_fild10,223,203 +in_orcs01,124,171,0 warp orc002 1,3,gef_fild10,138,329 +in_orcs01,162,55,0 warp orc003 4,1,gef_fild10,214,53 +in_orcs01,29,116,0 warp orc004 4,1,gef_fild10,137,286 +in_orcs01,30,154,0 warp orc005 3,2,gef_fild10,65,335 +in_orcs01,30,182,0 warp orc01 2,1,orcsdun01,32,170 +orcsdun01,32,172,0 warp orc01-1 3,1,in_orcs01,30,180 +in_orcs01,108,114,0 warp orc02 2,1,orcsdun02,180,17 +orcsdun02,180,15,0 warp orc02-1 2,1,in_orcs01,108,112 +orcsdun01,183,8,0 warp orc03 4,2,orcsdun02,21,185 +orcsdun02,21,188,0 warp orc03-1 8,2,orcsdun01,183,11 diff --git a/npc/warps/dungeons/pay_dun.txt b/npc/warps/dungeons/pay_dun.txt new file mode 100644 index 000000000..fd9e196d4 --- /dev/null +++ b/npc/warps/dungeons/pay_dun.txt @@ -0,0 +1,36 @@ +//===== eAthena Script ======================================= +//= Payon Cave Warps +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.2 +//===== Compatible With: ===================================== +//= Any eAthena Mod +//===== Description: ========================================= +//= Payon Dungeon Warps +//===== Additional Comments: ================================= +//= 1.1a Fixed 'payd04r' warping players to a non-existant tile [MasterOfMuppets] +//============================================================ + +//= Payon Cave =============================================== +pay_dun00,184,33,0 warp payd01 2,7,pay_dun01,19,33 +pay_dun00,21,186,0 warp pay005 2,2,pay_arche,39,131 +pay_dun01,15,33,0 warp payd01-1 2,6,pay_dun00,181,33 +pay_dun01,286,25,0 warp payd02 2,7,pay_dun02,19,63 +pay_dun02,137,128,0 warp payd03 4,1,pay_dun03,155,159 +pay_dun02,16,63,0 warp payd02-1 2,7,pay_dun01,283,28 +pay_dun03,155,161,0 warp payd03-1 2,1,pay_dun02,137,126 +pay_dun03,127,62,4 script payd04r 45,2,2,{ + set @r,rand(4); + if(@r==1) goto w2; + if(@r==2) goto w3; + if(@r==3) goto w4; + warp "pay_dun04",201,204; end; + w2: warp "pay_dun04",189,43; end; + w3: warp "pay_dun04",43,40; end; + w4: warp "pay_dun04",34,202; end; +} +pay_dun04,191,41,0 warp payd04-2 1,1,pay_dun03,124,62 +pay_dun04,202,206,0 warp payd04-3 1,1,pay_dun03,124,62 +pay_dun04,32,204,0 warp payd04-4 2,1,pay_dun03,124,62 +pay_dun04,40,37,0 warp payd04-1 2,2,pay_dun03,124,62 diff --git a/npc/warps/dungeons/payon_dun.txt b/npc/warps/dungeons/payon_dun.txt deleted file mode 100644 index fd9e196d4..000000000 --- a/npc/warps/dungeons/payon_dun.txt +++ /dev/null @@ -1,36 +0,0 @@ -//===== eAthena Script ======================================= -//= Payon Cave Warps -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= Any eAthena Mod -//===== Description: ========================================= -//= Payon Dungeon Warps -//===== Additional Comments: ================================= -//= 1.1a Fixed 'payd04r' warping players to a non-existant tile [MasterOfMuppets] -//============================================================ - -//= Payon Cave =============================================== -pay_dun00,184,33,0 warp payd01 2,7,pay_dun01,19,33 -pay_dun00,21,186,0 warp pay005 2,2,pay_arche,39,131 -pay_dun01,15,33,0 warp payd01-1 2,6,pay_dun00,181,33 -pay_dun01,286,25,0 warp payd02 2,7,pay_dun02,19,63 -pay_dun02,137,128,0 warp payd03 4,1,pay_dun03,155,159 -pay_dun02,16,63,0 warp payd02-1 2,7,pay_dun01,283,28 -pay_dun03,155,161,0 warp payd03-1 2,1,pay_dun02,137,126 -pay_dun03,127,62,4 script payd04r 45,2,2,{ - set @r,rand(4); - if(@r==1) goto w2; - if(@r==2) goto w3; - if(@r==3) goto w4; - warp "pay_dun04",201,204; end; - w2: warp "pay_dun04",189,43; end; - w3: warp "pay_dun04",43,40; end; - w4: warp "pay_dun04",34,202; end; -} -pay_dun04,191,41,0 warp payd04-2 1,1,pay_dun03,124,62 -pay_dun04,202,206,0 warp payd04-3 1,1,pay_dun03,124,62 -pay_dun04,32,204,0 warp payd04-4 2,1,pay_dun03,124,62 -pay_dun04,40,37,0 warp payd04-1 2,2,pay_dun03,124,62 diff --git a/npc/warps/dungeons/prt_dun.txt b/npc/warps/dungeons/prt_dun.txt deleted file mode 100644 index fc038d31a..000000000 --- a/npc/warps/dungeons/prt_dun.txt +++ /dev/null @@ -1,242 +0,0 @@ -//===== eAthena Script ======================================= -//= Prontera Dungeons Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Prontera Dungeons -//===== Additional Comments: ================================= -//= 1.1 updating according to jA. Optimized scripts [Lupus] -//============================================================ - -//= Hidden Temple ============================================ -// ----- (1st Floor No.03)(1st Floor No.16)(1st Floor No.20) -// 1st Floor No.01 ------------------------------------------------------------- -prt_maze01,22,194,0 warp mazewarp5101 1,1,prt_maze01,16,31 /*To No.1-21*/ -prt_maze01,5,186,0 warp mazewarp5102 1,1,prt_maze01,182,88 /*To No.1-15*/ -// 1st Floor No.02 -prt_maze01,58,194,0 warp mazewarp5103 1,1,prt_maze01,23,128 /*To No.1-6*/ -// 1st Floor No.03 -prt_maze01,102,165,0 warp mazewarp5104 1,1,prt_maze01,99,31 /*To No.1-23*/ -prt_maze01,85,174,0 warp mazewarp5105 1,1,prt_maze02,93,20 -// 1st Floor No.04 -prt_maze01,154,181,0 warp mazewarp5106 1,1,prt_maze01,191,175 /*To No.1-5*/ -prt_maze01,125,171,0 warp mazewarp5107 1,1,prt_maze01,8,186 /*To No.1-1*/ -// 1st Floor No.05 -prt_maze01,175,165,0 warp mazewarp5108 1,1,prt_maze01,48,104 /*To No.1-12*/ -prt_maze01,194,175,0 warp mazewarp5109 1,1,prt_maze01,23,128 /*To No.1-6*/ -// 1st Floor No.06 -prt_maze01,18,154,0 warp mazewarp5110 1,1,prt_maze01,177,71 /*To No.1-20*/ -prt_maze01,23,125,0 warp mazewarp5111 1,1,prt_maze01,151,22 /*To No.1-24*/ -prt_maze01,5,140,0 warp mazewarp5112 1,1,prt_maze01,58,48 /*To No.1-17*/ -// 1st Floor No.07 -prt_maze01,54,154,0 warp mazewarp5113 1,1,prt_maze01,191,175 /*To No.1-5*/ -prt_maze01,63,125,0 warp mazewarp5114 1,1,prt_maze01,182,88 /*To No.1-15*/ -// 1st Floor No.08 -prt_maze01,98,154,0 warp mazewarp5115 1,1,prt_maze01,102,168 /*To No.1-3*/ -prt_maze01,114,145,0 warp mazewarp5116 1,1,prt_maze01,23,128 /*To No.1-6*/ -prt_maze01,85,146,0 warp mazewarp5117 1,1,prt_maze01,142,111 /*To No.1-14*/ -// 1st Floor No.09 -prt_maze01,137,125,0 warp mazewarp5118 1,1,prt_maze01,191,139 /*To No.1-10*/ -prt_maze01,154,134,0 warp mazewarp5119 1,1,prt_maze01,58,191 /*To No.1-2*/ -// 1st Floor No.10 -prt_maze01,194,139,0 warp mazewarp5120 1,1,prt_maze01,22,88 /*To No.1-11*/ -prt_maze01,166,139,0 warp mazewarp5121 1,1,prt_maze01,128,173 /*To No.1-4*/ -// 1st Floor No.11 -prt_maze01,17,114,0 warp mazewarp5122 1,1,prt_maze01,8,186 /*To No.1-1*/ -prt_maze01,22,85,0 warp mazewarp5123 1,1,prt_maze01,137,128 /*To No.1-9*/ -// 1st Floor No.12 -prt_maze01,63,114,0 warp mazewarp5124 1,1,prt_maze01,111,56 /*To No.1-18*/ -prt_maze01,63,85,0 warp mazewarp5125 1,1,prt_maze01,151,22 /*To No.1-24*/ -prt_maze01,74,97,0 warp mazewarp5126 1,1,prt_maze01,71,11 /*To No.1-22*/ -prt_maze01,45,104,0 warp mazewarp5127 1,1,prt_maze01,63,128 /*To No.1-7*/ -// 1st Floor No.13 -prt_maze01,105,114,0 warp mazewarp5128 1,1,prt_maze01,111,145 /*To No.1-8?*/ -prt_maze01,114,95,0 warp mazewarp5129 1,1,prt_maze01,14,48 /*To No.1-16*/ -prt_maze01,85,97,0 warp mazewarp5130 1,1,prt_maze01,63,128 /*To No.1-7*/ -// 1st Floor No.14 -prt_maze01,142,114,0 warp mazewarp5131 1,1,prt_maze01,23,128 /*To No.1-6*/ -prt_maze01,125,105,0 warp mazewarp5132 1,1,prt_maze01,14,48 /*To No.1-16*/ -// 1st Floor No.15 -prt_maze01,182,85,0 warp mazewarp5133 1,1,prt_maze01,58,48 /*To No.1-17*/ -prt_maze01,194,94,0 warp mazewarp5134 1,1,prt_maze01,58,191 /*To No.1-2*/ -prt_maze01,168,94,0 warp mazewarp5135 1,1,prt_maze01,191,139 /*To No.1-10*/ -// 1st Floor No.16 -prt_maze01,14,74,0 warp mazewarp5136 1,1,prt_maze01,151,22 /*To No.1-24*/ -prt_maze01,14,45,0 warp mazewarp5137 1,1,mjolnir_12,44,21 -prt_maze01,5,58,0 warp mazewarp5138 1,1,prt_maze01,48,104 /*To No.1-12*/ -// 1st Floor No.17 -prt_maze01,74,74,0 warp mazewarp5139 1,1,prt_maze01,58,191 /*To No.1-2*/ -prt_maze01,52,45,0 warp mazewarp5140 1,1,prt_maze01,139,48 /*To No.1-19*/ -// 1st Floor No.18 -prt_maze01,104,74,0 warp mazewarp5141 1,1,prt_maze01,14,48 /*To No.1-16*/ -prt_maze01,96,45,0 warp mazewarp5142 1,1,prt_maze01,63,128 /*To No.1-7*/ -prt_maze01,114,56,0 warp mazewarp5143 1,1,prt_maze01,176,8 /*To No.1-25*/ -prt_maze01,85,56,0 warp mazewarp5144 1,1,prt_maze01,105,111 /*To No.1-13*/ -// 1st Floor No.19 -prt_maze01,137,74,0 warp mazewarp5145 1,1,prt_maze01,182,88 /*To No.1-15*/ -prt_maze01,139,45,0 warp mazewarp5146 1,1,prt_maze01,71,11 /*To No.1-22*/ -// 1st Floor No.20 -prt_maze01,177,74,0 warp mazewarp5147 1,1,prt_fild01,136,368 -prt_maze01,175,45,0 warp mazewarp5148 1,1,prt_maze01,58,48 /*To No.1-17*/ -prt_maze01,194,54,0 warp mazewarp5149 1,1,prt_maze01,99,31 /*To No.1-23*/ -// 1st Floor No.21 -prt_maze01,16,34,0 warp mazewarp5150 1,1,prt_maze01,128,173 /*To No.1-4*/ -prt_maze01,23,5,0 warp mazewarp5151 1,1,prt_maze01,176,8 /*To No.1-25*/ -// 1st Floor No.22 -prt_maze01,54,5,0 warp mazewarp5152 1,1,prt_maze01,128,173 /*To No.1-4*/ -prt_maze01,74,12,0 warp mazewarp5153 1,1,prt_maze01,58,48 /*To No.1-17*/ -prt_maze01,45,21,0 warp mazewarp5154 1,1,prt_maze01,142,111 /*To No.1-14*/ -// 1st Floor No.23 -prt_maze01,99,34,0 warp mazewarp5155 1,1,prt_maze01,137,128 /*To No.1-9*/ -prt_maze01,114,22,0 warp mazewarp5156 1,1,prt_maze01,177,71 /*To No.1-20*/ -prt_maze01,85,13,0 warp mazewarp5157 1,1,prt_maze01,22,88 /*To No.1-11*/ -//1st Floor No.24 -prt_maze01,154,22,0 warp mazewarp5158 1,1,prt_maze01,139,48 /*To No.1-19*/ -// 1st Floor No.25 -prt_maze01,176,34,0 warp mazewarp5159 1,1,prt_maze01,8,186 /*To No.1-1*/ -prt_maze01,176,5,0 warp mazewarp5160 1,1,prt_maze01,137,128 /*To No.1-9*/ -prt_maze01,194,15,0 warp mazewarp5161 1,1,prt_maze01,52,48 /*To No.1-17*/ -prt_maze01,165,22,0 warp mazewarp5162 1,1,prt_maze01,63,128 /*To No.1-7*/ -// 2nd Floor ------------------------------------------------------------------- -prt_maze02,93,16,0 warp mazewarp5201 1,1,prt_maze01,102,168 /*To No.1-3*/ -prt_maze02,100,182,0 warp mazewarp5202 1,1,prt_maze03,182,88 /*To No.3-15*/ -// 3rd Floor No.01 ------------------------------------------------------------- -prt_maze03,22,194,0 warp mazewarp5301 1,1,prt_maze03,175,48 /*To No.3-20*/ -prt_maze03,5,186,0 warp mazewarp5302 1,1,prt_maze03,151,134 /*To No.3-9*/ -//3rd Floor No.02 -prt_maze03,58,194,0 script #mazewarp5303 45,1,1,{ - set @w,rand(4); - if(@w==1)goto w2; - if(@w==2)goto w3; - if(@w==3)goto w4; - warp "prt_maze03",98,151; end; /*To No.3-8*/ - w2: warp "prt_maze03",137,128; end; /*To No.3-9*/ - w3: warp "prt_maze03",14,71; end; /*To No.3-16*/ - w4: warp "prt_maze03",54,8; end; /*To No.3-22*/ -} -// 3rd Floor No.03 -prt_maze03,102,165,0 warp mazewarp5304 1,1,prt_maze03,137,71 /*To No.3-19*/ -prt_maze03,85,174,0 warp mazewarp5305 1,1,prt_maze03,14,47 /*To No.3-16*/ -// 3rd Floor No.04 -prt_maze03,154,181,0 warp mazewarp5306 1,1,prt_maze03,139,48 /*To No.3-19*/ -prt_maze03,125,171,0 warp mazewarp5307 1,1,prt_maze03,105,111 /*To No.3-13*/ -// 3rd Floor No.05 -prt_maze03,175,165,0 warp mazewarp5308 1,1,prt_maze03,71,12 /*To No.3-22*/ -prt_maze03,194,175,0 warp mazewarp5309 1,1,prt_maze03,191,139 /*To No.3-10*/ -// 3rd Floor No.06 -prt_maze03,18,154,0 warp mazewarp5310 1,1,prt_maze03,48,21 /*To No.3-22*/ -prt_maze03,23,125,0 warp mazewarp5311 1,1,prt_maze03,177,71 /*To No.3-20*/ -prt_maze03,5,140,0 warp mazewarp5312 1,1,prt_maze03,111,56 /*To No.3-18*/ -// 3rd Floor No.07 -prt_maze03,54,154,0 warp mazewarp5313 1,1,prt_maze03,142,111 /*To No.3-14*/ -prt_maze03,63,125,0 warp mazewarp5314 1,1,prt_maze03,88,97 /*To No.3-13*/ -// 3rd Floor No.08 -prt_maze03,98,154,0 warp mazewarp5315 1,1,prt_maze03,99,31 /*To No.3-23*/ -prt_maze03,114,145,0 warp mazewarp5316 1,1,prt_maze03,168,22 /*To No.3-25*/ -prt_maze03,85,146,0 warp mazewarp5317 1,1,prt_maze03,22,88 /*To No.3-11*/ -// 3rd Floor No.09 -prt_maze03,137,125,0 warp mazewarp5318 1,1,prt_maze03,71,71 /*To No.3-17*/ -prt_maze03,154,134,0 warp mazewarp5319 1,1,prt_maze03,8,186 /*To No.3-1*/ -// 3rd Floor No.10 -prt_maze03,194,139,0 warp mazewarp5320 1,1,prt_maze03,191,175 /*To No.3-5*/ -prt_maze03,166,139,0 warp mazewarp5321 1,1,prt_maze03,63,88 /*To No.3-12*/ -// 3rd Floor No.11 -prt_maze03,17,114,0 warp mazewarp5322 1,1,prt_maze03,128,105 /*To No.3-14*/ -prt_maze03,22,85,0 warp mazewarp5323 1,1,prt_maze03,88,146 /*To No.3-8*/ -// 3rd Floor No.12 -prt_maze03,63,114,0 warp mazewarp5324 1,1,prt_maze03,14,71 /*To No.3-16*/ -prt_maze03,63,85,0 warp mazewarp5325 1,1,prt_maze03,169,139 /*To No.3-10*/ -prt_maze03,74,97,0 warp mazewarp5326 1,1,prt_maze03,54,8 /*To No.3-22*/ -prt_maze03,45,104,0 warp mazewarp5327 1,1,prt_maze03,96,48 /*To No.3-18*/ -// 3rd Floor No.13 -prt_maze03,105,114,0 warp mazewarp5328 1,1,prt_maze03,128,171 /*To No.3-4*/ -prt_maze03,114,95,0 warp mazewarp5329 1,1,prt_maze03,176,8 /*To No.3-25*/ -prt_maze03,85,97,0 warp mazewarp5330 1,1,prt_maze03,63,128 /*To No.3-7*/ -// 3rd Floor No.14 -prt_maze03,142,114,0 warp mazewarp5331 1,1,prt_maze03,54,151 /*To No.3-7*/ -prt_maze03,125,105,0 warp mazewarp5332 1,1,prt_maze03,58,191 /*To No.3-2*/ -// 3rd Floor No.15 -prt_maze03,182,85,0 warp mazewarp5333 1,1,prt_maze02,100,179 -prt_maze03,194,94,0 warp mazewarp5334 1,1,prt_maze03,151,22 /*To No.3-24*/ -prt_maze03,168,94,0 warp mazewarp5335 1,1,prt_maze03,191,54 /*To No.3-20*/ -// 3rd Floor No.16 -prt_maze03,14,74,0 warp mazewarp5336 1,1,prt_maze03,63,111 /*To No.3-12*/ -prt_maze03,14,45,0 warp mazewarp5337 1,1,prt_maze03,88,174 /*To No.3-3*/ -prt_maze03,5,58,0 warp mazewarp5338 1,1,prt_maze03,191,15 /*To No.3-25*/ -// 3rd Floor No.17 -prt_maze03,74,74,0 script #mazewarp5339 45,1,1,{ -set @w,rand(4); - if(@w==1)goto w2; - if(@w==2)goto w3; - if(@w==3)goto w4; - warp "prt_maze03",98,151; end; /*To No.3-8*/ - w2: warp "prt_maze03",137,128; end; /*To No.3-9*/ - w3: warp "prt_maze03",14,71; end; /*To No.3-16*/ - w4: warp "prt_maze03",54,8; end; /*To No.3-22*/ -} -prt_maze03,52,45,0 warp mazewarp5340 1,1,prt_maze03,16,31 /*To No.3-21*/ -// 3rd Floor No.18 -prt_maze03,104,74,0 warp mazewarp5341 1,1,prt_maze03,111,22 /*To No.3-23*/ -prt_maze03,96,45,0 warp mazewarp5342 1,1,prt_maze03,48,104 /*To No.3-12*/ -prt_maze03,114,56,0 warp mazewarp5343 1,1,prt_maze03,8,140 /*To No.3-6*/ -prt_maze03,85,56,0 warp mazewarp5344 1,1,prt_maze03,176,31 /*To No.3-25*/ -// 3rd Floor No.19 -prt_maze03,137,74,0 warp mazewarp5345 1,1,prt_maze03,102,168 /*To No.3-3*/ -prt_maze03,139,45,0 script #mazewarp5346 45,1,1,{ - set @w,rand(4); - if(@w==1)goto w2; - if(@w==2)goto w3; - if(@w==3)goto w4; - warp "prt_maze03",98,151; end; /*To No.3-8*/ - w2: warp "prt_maze03",137,128; end; /*To No.3-9*/ - w3: warp "prt_maze03",14,71; end; /*To No.3-16*/ - w4: warp "prt_maze03",54,8; end; /*To No.3-22*/ -} -// 3rd Floor No.20 -prt_maze03,177,74,0 warp mazewarp5347 1,1,prt_maze03,23,128 /*To No.3-6*/ -prt_maze03,175,45,0 warp mazewarp5348 1,1,prt_maze03,22,191 /*To No.3-1*/ -prt_maze03,194,54,0 warp mazewarp5349 1,1,prt_maze03,171,94 /*To No.3-15*/ -// 3rd Floor No.21 -prt_maze03,16,34,0 warp mazewarp5350 1,1,prt_maze03,52,48 /*To No.3-17*/ -prt_maze03,23,5,0 warp mazewarp5351 1,1,prt_maze03,88,13 /*To No.3-23*/ -// 3rd Floor No.22 -prt_maze03,54,5,0 warp mazewarp5352 1,1,prt_maze03,71,97 /*To No.3-12*/ -prt_maze03,74,12,0 warp mazewarp5353 1,1,prt_maze03,175,168 /*To No.3-5*/ -prt_maze03,45,21,0 warp mazewarp5354 1,1,prt_maze03,18,151 /*To No.3-6*/ -// 3rd Floor No.23 -prt_maze03,99,34,0 warp mazewarp5355 1,1,prt_maze03,98,151 /*To No.3-8*/ -prt_maze03,114,22,0 warp mazewarp5356 1,1,prt_maze03,104,71 /*To No.3-18*/ -prt_maze03,85,13,0 warp mazewarp5357 1,1,prt_maze03,23,8 /*To No.3-21*/ -// 3rd Floor No.24 -prt_maze03,154,22,0 script #mazewarp5358 45,1,1,{ - set @w,rand(4); - if(@w==1)goto w2; - if(@w==2)goto w3; - if(@w==3)goto w4; - warp "prt_maze03",98,151; end; /*To No.3-8*/ - w2: warp "prt_maze03",137,128; end; /*To No.3-9*/ - w3: warp "prt_maze03",14,71; end; /*To No.3-16*/ - w4: warp "prt_maze03",54,8; end; /*To No.3-22*/ -} -// 3rd Floor No.25 -prt_maze03,176,34,0 warp mazewarp5359 1,1,prt_maze03,88,56 /*To No.3-18*/ -prt_maze03,176,5,0 warp mazewarp5360 1,1,prt_maze03,111,95 /*To No.3-13*/ -prt_maze03,194,15,0 warp mazewarp5361 1,1,prt_maze03,8,58 /*To No.3-16*/ -prt_maze03,165,22,0 warp mazewarp5362 1,1,prt_maze03,111,145 /*To No.3-8*/ - -//= Prontera Sewers ============================================== -prt_sewb1,135,248,0 warp prts001 2,2,prt_fild05,274,208 -prt_sewb1,188,247,0 warp prts01 1,3,prt_sewb2,19,19 -prt_sewb2,100,176,0 warp prts02 4,2,prt_sewb2,140,28 -prt_sewb2,140,24,0 warp prts02-1 4,2,prt_sewb2,100,172 -prt_sewb2,180,24,0 warp prts03 4,2,prt_sewb3,180,169 -prt_sewb2,19,12,0 warp prts01-1 2,2,prt_sewb1,192,247 -prt_sewb2,19,175,0 warp prts04 4,2,prt_sewb2,60,28 -prt_sewb2,60,24,0 warp prts04-1 4,2,prt_sewb2,19,171 -prt_sewb3,180,173,0 warp prts03-1 4,2,prt_sewb2,180,28 -prt_sewb3,20,185,0 warp prts05 3,2,prt_sewb4,100,92 -prt_sewb4,100,96,0 warp prts05-1 3,2,prt_sewb3,19,180 diff --git a/npc/warps/dungeons/prt_maze.txt b/npc/warps/dungeons/prt_maze.txt new file mode 100644 index 000000000..fc038d31a --- /dev/null +++ b/npc/warps/dungeons/prt_maze.txt @@ -0,0 +1,242 @@ +//===== eAthena Script ======================================= +//= Prontera Dungeons Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Prontera Dungeons +//===== Additional Comments: ================================= +//= 1.1 updating according to jA. Optimized scripts [Lupus] +//============================================================ + +//= Hidden Temple ============================================ +// ----- (1st Floor No.03)(1st Floor No.16)(1st Floor No.20) +// 1st Floor No.01 ------------------------------------------------------------- +prt_maze01,22,194,0 warp mazewarp5101 1,1,prt_maze01,16,31 /*To No.1-21*/ +prt_maze01,5,186,0 warp mazewarp5102 1,1,prt_maze01,182,88 /*To No.1-15*/ +// 1st Floor No.02 +prt_maze01,58,194,0 warp mazewarp5103 1,1,prt_maze01,23,128 /*To No.1-6*/ +// 1st Floor No.03 +prt_maze01,102,165,0 warp mazewarp5104 1,1,prt_maze01,99,31 /*To No.1-23*/ +prt_maze01,85,174,0 warp mazewarp5105 1,1,prt_maze02,93,20 +// 1st Floor No.04 +prt_maze01,154,181,0 warp mazewarp5106 1,1,prt_maze01,191,175 /*To No.1-5*/ +prt_maze01,125,171,0 warp mazewarp5107 1,1,prt_maze01,8,186 /*To No.1-1*/ +// 1st Floor No.05 +prt_maze01,175,165,0 warp mazewarp5108 1,1,prt_maze01,48,104 /*To No.1-12*/ +prt_maze01,194,175,0 warp mazewarp5109 1,1,prt_maze01,23,128 /*To No.1-6*/ +// 1st Floor No.06 +prt_maze01,18,154,0 warp mazewarp5110 1,1,prt_maze01,177,71 /*To No.1-20*/ +prt_maze01,23,125,0 warp mazewarp5111 1,1,prt_maze01,151,22 /*To No.1-24*/ +prt_maze01,5,140,0 warp mazewarp5112 1,1,prt_maze01,58,48 /*To No.1-17*/ +// 1st Floor No.07 +prt_maze01,54,154,0 warp mazewarp5113 1,1,prt_maze01,191,175 /*To No.1-5*/ +prt_maze01,63,125,0 warp mazewarp5114 1,1,prt_maze01,182,88 /*To No.1-15*/ +// 1st Floor No.08 +prt_maze01,98,154,0 warp mazewarp5115 1,1,prt_maze01,102,168 /*To No.1-3*/ +prt_maze01,114,145,0 warp mazewarp5116 1,1,prt_maze01,23,128 /*To No.1-6*/ +prt_maze01,85,146,0 warp mazewarp5117 1,1,prt_maze01,142,111 /*To No.1-14*/ +// 1st Floor No.09 +prt_maze01,137,125,0 warp mazewarp5118 1,1,prt_maze01,191,139 /*To No.1-10*/ +prt_maze01,154,134,0 warp mazewarp5119 1,1,prt_maze01,58,191 /*To No.1-2*/ +// 1st Floor No.10 +prt_maze01,194,139,0 warp mazewarp5120 1,1,prt_maze01,22,88 /*To No.1-11*/ +prt_maze01,166,139,0 warp mazewarp5121 1,1,prt_maze01,128,173 /*To No.1-4*/ +// 1st Floor No.11 +prt_maze01,17,114,0 warp mazewarp5122 1,1,prt_maze01,8,186 /*To No.1-1*/ +prt_maze01,22,85,0 warp mazewarp5123 1,1,prt_maze01,137,128 /*To No.1-9*/ +// 1st Floor No.12 +prt_maze01,63,114,0 warp mazewarp5124 1,1,prt_maze01,111,56 /*To No.1-18*/ +prt_maze01,63,85,0 warp mazewarp5125 1,1,prt_maze01,151,22 /*To No.1-24*/ +prt_maze01,74,97,0 warp mazewarp5126 1,1,prt_maze01,71,11 /*To No.1-22*/ +prt_maze01,45,104,0 warp mazewarp5127 1,1,prt_maze01,63,128 /*To No.1-7*/ +// 1st Floor No.13 +prt_maze01,105,114,0 warp mazewarp5128 1,1,prt_maze01,111,145 /*To No.1-8?*/ +prt_maze01,114,95,0 warp mazewarp5129 1,1,prt_maze01,14,48 /*To No.1-16*/ +prt_maze01,85,97,0 warp mazewarp5130 1,1,prt_maze01,63,128 /*To No.1-7*/ +// 1st Floor No.14 +prt_maze01,142,114,0 warp mazewarp5131 1,1,prt_maze01,23,128 /*To No.1-6*/ +prt_maze01,125,105,0 warp mazewarp5132 1,1,prt_maze01,14,48 /*To No.1-16*/ +// 1st Floor No.15 +prt_maze01,182,85,0 warp mazewarp5133 1,1,prt_maze01,58,48 /*To No.1-17*/ +prt_maze01,194,94,0 warp mazewarp5134 1,1,prt_maze01,58,191 /*To No.1-2*/ +prt_maze01,168,94,0 warp mazewarp5135 1,1,prt_maze01,191,139 /*To No.1-10*/ +// 1st Floor No.16 +prt_maze01,14,74,0 warp mazewarp5136 1,1,prt_maze01,151,22 /*To No.1-24*/ +prt_maze01,14,45,0 warp mazewarp5137 1,1,mjolnir_12,44,21 +prt_maze01,5,58,0 warp mazewarp5138 1,1,prt_maze01,48,104 /*To No.1-12*/ +// 1st Floor No.17 +prt_maze01,74,74,0 warp mazewarp5139 1,1,prt_maze01,58,191 /*To No.1-2*/ +prt_maze01,52,45,0 warp mazewarp5140 1,1,prt_maze01,139,48 /*To No.1-19*/ +// 1st Floor No.18 +prt_maze01,104,74,0 warp mazewarp5141 1,1,prt_maze01,14,48 /*To No.1-16*/ +prt_maze01,96,45,0 warp mazewarp5142 1,1,prt_maze01,63,128 /*To No.1-7*/ +prt_maze01,114,56,0 warp mazewarp5143 1,1,prt_maze01,176,8 /*To No.1-25*/ +prt_maze01,85,56,0 warp mazewarp5144 1,1,prt_maze01,105,111 /*To No.1-13*/ +// 1st Floor No.19 +prt_maze01,137,74,0 warp mazewarp5145 1,1,prt_maze01,182,88 /*To No.1-15*/ +prt_maze01,139,45,0 warp mazewarp5146 1,1,prt_maze01,71,11 /*To No.1-22*/ +// 1st Floor No.20 +prt_maze01,177,74,0 warp mazewarp5147 1,1,prt_fild01,136,368 +prt_maze01,175,45,0 warp mazewarp5148 1,1,prt_maze01,58,48 /*To No.1-17*/ +prt_maze01,194,54,0 warp mazewarp5149 1,1,prt_maze01,99,31 /*To No.1-23*/ +// 1st Floor No.21 +prt_maze01,16,34,0 warp mazewarp5150 1,1,prt_maze01,128,173 /*To No.1-4*/ +prt_maze01,23,5,0 warp mazewarp5151 1,1,prt_maze01,176,8 /*To No.1-25*/ +// 1st Floor No.22 +prt_maze01,54,5,0 warp mazewarp5152 1,1,prt_maze01,128,173 /*To No.1-4*/ +prt_maze01,74,12,0 warp mazewarp5153 1,1,prt_maze01,58,48 /*To No.1-17*/ +prt_maze01,45,21,0 warp mazewarp5154 1,1,prt_maze01,142,111 /*To No.1-14*/ +// 1st Floor No.23 +prt_maze01,99,34,0 warp mazewarp5155 1,1,prt_maze01,137,128 /*To No.1-9*/ +prt_maze01,114,22,0 warp mazewarp5156 1,1,prt_maze01,177,71 /*To No.1-20*/ +prt_maze01,85,13,0 warp mazewarp5157 1,1,prt_maze01,22,88 /*To No.1-11*/ +//1st Floor No.24 +prt_maze01,154,22,0 warp mazewarp5158 1,1,prt_maze01,139,48 /*To No.1-19*/ +// 1st Floor No.25 +prt_maze01,176,34,0 warp mazewarp5159 1,1,prt_maze01,8,186 /*To No.1-1*/ +prt_maze01,176,5,0 warp mazewarp5160 1,1,prt_maze01,137,128 /*To No.1-9*/ +prt_maze01,194,15,0 warp mazewarp5161 1,1,prt_maze01,52,48 /*To No.1-17*/ +prt_maze01,165,22,0 warp mazewarp5162 1,1,prt_maze01,63,128 /*To No.1-7*/ +// 2nd Floor ------------------------------------------------------------------- +prt_maze02,93,16,0 warp mazewarp5201 1,1,prt_maze01,102,168 /*To No.1-3*/ +prt_maze02,100,182,0 warp mazewarp5202 1,1,prt_maze03,182,88 /*To No.3-15*/ +// 3rd Floor No.01 ------------------------------------------------------------- +prt_maze03,22,194,0 warp mazewarp5301 1,1,prt_maze03,175,48 /*To No.3-20*/ +prt_maze03,5,186,0 warp mazewarp5302 1,1,prt_maze03,151,134 /*To No.3-9*/ +//3rd Floor No.02 +prt_maze03,58,194,0 script #mazewarp5303 45,1,1,{ + set @w,rand(4); + if(@w==1)goto w2; + if(@w==2)goto w3; + if(@w==3)goto w4; + warp "prt_maze03",98,151; end; /*To No.3-8*/ + w2: warp "prt_maze03",137,128; end; /*To No.3-9*/ + w3: warp "prt_maze03",14,71; end; /*To No.3-16*/ + w4: warp "prt_maze03",54,8; end; /*To No.3-22*/ +} +// 3rd Floor No.03 +prt_maze03,102,165,0 warp mazewarp5304 1,1,prt_maze03,137,71 /*To No.3-19*/ +prt_maze03,85,174,0 warp mazewarp5305 1,1,prt_maze03,14,47 /*To No.3-16*/ +// 3rd Floor No.04 +prt_maze03,154,181,0 warp mazewarp5306 1,1,prt_maze03,139,48 /*To No.3-19*/ +prt_maze03,125,171,0 warp mazewarp5307 1,1,prt_maze03,105,111 /*To No.3-13*/ +// 3rd Floor No.05 +prt_maze03,175,165,0 warp mazewarp5308 1,1,prt_maze03,71,12 /*To No.3-22*/ +prt_maze03,194,175,0 warp mazewarp5309 1,1,prt_maze03,191,139 /*To No.3-10*/ +// 3rd Floor No.06 +prt_maze03,18,154,0 warp mazewarp5310 1,1,prt_maze03,48,21 /*To No.3-22*/ +prt_maze03,23,125,0 warp mazewarp5311 1,1,prt_maze03,177,71 /*To No.3-20*/ +prt_maze03,5,140,0 warp mazewarp5312 1,1,prt_maze03,111,56 /*To No.3-18*/ +// 3rd Floor No.07 +prt_maze03,54,154,0 warp mazewarp5313 1,1,prt_maze03,142,111 /*To No.3-14*/ +prt_maze03,63,125,0 warp mazewarp5314 1,1,prt_maze03,88,97 /*To No.3-13*/ +// 3rd Floor No.08 +prt_maze03,98,154,0 warp mazewarp5315 1,1,prt_maze03,99,31 /*To No.3-23*/ +prt_maze03,114,145,0 warp mazewarp5316 1,1,prt_maze03,168,22 /*To No.3-25*/ +prt_maze03,85,146,0 warp mazewarp5317 1,1,prt_maze03,22,88 /*To No.3-11*/ +// 3rd Floor No.09 +prt_maze03,137,125,0 warp mazewarp5318 1,1,prt_maze03,71,71 /*To No.3-17*/ +prt_maze03,154,134,0 warp mazewarp5319 1,1,prt_maze03,8,186 /*To No.3-1*/ +// 3rd Floor No.10 +prt_maze03,194,139,0 warp mazewarp5320 1,1,prt_maze03,191,175 /*To No.3-5*/ +prt_maze03,166,139,0 warp mazewarp5321 1,1,prt_maze03,63,88 /*To No.3-12*/ +// 3rd Floor No.11 +prt_maze03,17,114,0 warp mazewarp5322 1,1,prt_maze03,128,105 /*To No.3-14*/ +prt_maze03,22,85,0 warp mazewarp5323 1,1,prt_maze03,88,146 /*To No.3-8*/ +// 3rd Floor No.12 +prt_maze03,63,114,0 warp mazewarp5324 1,1,prt_maze03,14,71 /*To No.3-16*/ +prt_maze03,63,85,0 warp mazewarp5325 1,1,prt_maze03,169,139 /*To No.3-10*/ +prt_maze03,74,97,0 warp mazewarp5326 1,1,prt_maze03,54,8 /*To No.3-22*/ +prt_maze03,45,104,0 warp mazewarp5327 1,1,prt_maze03,96,48 /*To No.3-18*/ +// 3rd Floor No.13 +prt_maze03,105,114,0 warp mazewarp5328 1,1,prt_maze03,128,171 /*To No.3-4*/ +prt_maze03,114,95,0 warp mazewarp5329 1,1,prt_maze03,176,8 /*To No.3-25*/ +prt_maze03,85,97,0 warp mazewarp5330 1,1,prt_maze03,63,128 /*To No.3-7*/ +// 3rd Floor No.14 +prt_maze03,142,114,0 warp mazewarp5331 1,1,prt_maze03,54,151 /*To No.3-7*/ +prt_maze03,125,105,0 warp mazewarp5332 1,1,prt_maze03,58,191 /*To No.3-2*/ +// 3rd Floor No.15 +prt_maze03,182,85,0 warp mazewarp5333 1,1,prt_maze02,100,179 +prt_maze03,194,94,0 warp mazewarp5334 1,1,prt_maze03,151,22 /*To No.3-24*/ +prt_maze03,168,94,0 warp mazewarp5335 1,1,prt_maze03,191,54 /*To No.3-20*/ +// 3rd Floor No.16 +prt_maze03,14,74,0 warp mazewarp5336 1,1,prt_maze03,63,111 /*To No.3-12*/ +prt_maze03,14,45,0 warp mazewarp5337 1,1,prt_maze03,88,174 /*To No.3-3*/ +prt_maze03,5,58,0 warp mazewarp5338 1,1,prt_maze03,191,15 /*To No.3-25*/ +// 3rd Floor No.17 +prt_maze03,74,74,0 script #mazewarp5339 45,1,1,{ +set @w,rand(4); + if(@w==1)goto w2; + if(@w==2)goto w3; + if(@w==3)goto w4; + warp "prt_maze03",98,151; end; /*To No.3-8*/ + w2: warp "prt_maze03",137,128; end; /*To No.3-9*/ + w3: warp "prt_maze03",14,71; end; /*To No.3-16*/ + w4: warp "prt_maze03",54,8; end; /*To No.3-22*/ +} +prt_maze03,52,45,0 warp mazewarp5340 1,1,prt_maze03,16,31 /*To No.3-21*/ +// 3rd Floor No.18 +prt_maze03,104,74,0 warp mazewarp5341 1,1,prt_maze03,111,22 /*To No.3-23*/ +prt_maze03,96,45,0 warp mazewarp5342 1,1,prt_maze03,48,104 /*To No.3-12*/ +prt_maze03,114,56,0 warp mazewarp5343 1,1,prt_maze03,8,140 /*To No.3-6*/ +prt_maze03,85,56,0 warp mazewarp5344 1,1,prt_maze03,176,31 /*To No.3-25*/ +// 3rd Floor No.19 +prt_maze03,137,74,0 warp mazewarp5345 1,1,prt_maze03,102,168 /*To No.3-3*/ +prt_maze03,139,45,0 script #mazewarp5346 45,1,1,{ + set @w,rand(4); + if(@w==1)goto w2; + if(@w==2)goto w3; + if(@w==3)goto w4; + warp "prt_maze03",98,151; end; /*To No.3-8*/ + w2: warp "prt_maze03",137,128; end; /*To No.3-9*/ + w3: warp "prt_maze03",14,71; end; /*To No.3-16*/ + w4: warp "prt_maze03",54,8; end; /*To No.3-22*/ +} +// 3rd Floor No.20 +prt_maze03,177,74,0 warp mazewarp5347 1,1,prt_maze03,23,128 /*To No.3-6*/ +prt_maze03,175,45,0 warp mazewarp5348 1,1,prt_maze03,22,191 /*To No.3-1*/ +prt_maze03,194,54,0 warp mazewarp5349 1,1,prt_maze03,171,94 /*To No.3-15*/ +// 3rd Floor No.21 +prt_maze03,16,34,0 warp mazewarp5350 1,1,prt_maze03,52,48 /*To No.3-17*/ +prt_maze03,23,5,0 warp mazewarp5351 1,1,prt_maze03,88,13 /*To No.3-23*/ +// 3rd Floor No.22 +prt_maze03,54,5,0 warp mazewarp5352 1,1,prt_maze03,71,97 /*To No.3-12*/ +prt_maze03,74,12,0 warp mazewarp5353 1,1,prt_maze03,175,168 /*To No.3-5*/ +prt_maze03,45,21,0 warp mazewarp5354 1,1,prt_maze03,18,151 /*To No.3-6*/ +// 3rd Floor No.23 +prt_maze03,99,34,0 warp mazewarp5355 1,1,prt_maze03,98,151 /*To No.3-8*/ +prt_maze03,114,22,0 warp mazewarp5356 1,1,prt_maze03,104,71 /*To No.3-18*/ +prt_maze03,85,13,0 warp mazewarp5357 1,1,prt_maze03,23,8 /*To No.3-21*/ +// 3rd Floor No.24 +prt_maze03,154,22,0 script #mazewarp5358 45,1,1,{ + set @w,rand(4); + if(@w==1)goto w2; + if(@w==2)goto w3; + if(@w==3)goto w4; + warp "prt_maze03",98,151; end; /*To No.3-8*/ + w2: warp "prt_maze03",137,128; end; /*To No.3-9*/ + w3: warp "prt_maze03",14,71; end; /*To No.3-16*/ + w4: warp "prt_maze03",54,8; end; /*To No.3-22*/ +} +// 3rd Floor No.25 +prt_maze03,176,34,0 warp mazewarp5359 1,1,prt_maze03,88,56 /*To No.3-18*/ +prt_maze03,176,5,0 warp mazewarp5360 1,1,prt_maze03,111,95 /*To No.3-13*/ +prt_maze03,194,15,0 warp mazewarp5361 1,1,prt_maze03,8,58 /*To No.3-16*/ +prt_maze03,165,22,0 warp mazewarp5362 1,1,prt_maze03,111,145 /*To No.3-8*/ + +//= Prontera Sewers ============================================== +prt_sewb1,135,248,0 warp prts001 2,2,prt_fild05,274,208 +prt_sewb1,188,247,0 warp prts01 1,3,prt_sewb2,19,19 +prt_sewb2,100,176,0 warp prts02 4,2,prt_sewb2,140,28 +prt_sewb2,140,24,0 warp prts02-1 4,2,prt_sewb2,100,172 +prt_sewb2,180,24,0 warp prts03 4,2,prt_sewb3,180,169 +prt_sewb2,19,12,0 warp prts01-1 2,2,prt_sewb1,192,247 +prt_sewb2,19,175,0 warp prts04 4,2,prt_sewb2,60,28 +prt_sewb2,60,24,0 warp prts04-1 4,2,prt_sewb2,19,171 +prt_sewb3,180,173,0 warp prts03-1 4,2,prt_sewb2,180,28 +prt_sewb3,20,185,0 warp prts05 3,2,prt_sewb4,100,92 +prt_sewb4,100,96,0 warp prts05-1 3,2,prt_sewb3,19,180 diff --git a/npc/warps/dungeons/ra_san.txt b/npc/warps/dungeons/ra_san.txt new file mode 100644 index 000000000..052f46529 --- /dev/null +++ b/npc/warps/dungeons/ra_san.txt @@ -0,0 +1,43 @@ +//===== eAthena Script ======================================= +//= Rachel Sanctuary Dungeon Warp Script +//===== By =================================================== +//= Playtester +//===== Current Version :===================================== +//= 1.4 +//===== Compatible With :===================================== +//= Any Athena Version +//===== Description :========================================= +//= Warp Points For Rachel Sanctuary Dungeon +//===== Additional Comment:=================================== +//= 1.1 Added $ephiroth's warps [Playtester] +//= 1.2 Replaced old versions with jAthena's [Playtester] +//= 1.3 Official warps [Playtester] +//= 1.4 Added quest map warp to random warp. [L0ne_W0lf] +//= Added Dungeon exit back into temple. +//============================================================ + +ra_san01,139,13,0 script sanctuary01 45,1,1,{ + if (ra_tem_q == 21) { warp "que_san04",119,110; end; } + switch(rand(3)) { + case 1: warp "ra_san02",213,275; break; + case 2: warp "ra_san03",119,283; break; + default: warp "ra_san04",119,110; break; + } +} + +ra_san02,213,280,0 warp sanctuary02 1,1,ra_san01,140,19 +ra_san03,123,283,0 warp sanctuary03 1,1,ra_san01,140,19 +ra_san04,119,104,0 warp sanctuary04 1,1,ra_san01,140,19 +ra_san03,279,21,0 warp sanctuary05 1,1,ra_san05,282,149 +ra_san03,85,15,0 warp sanctuary06 1,1,ra_san04,203,216 +ra_san04,203,221,0 warp sanctuary07 1,1,ra_san03,85,20 +ra_san04,120,48,0 warp sanctuary08 1,1,ra_san05,150,282 +ra_san05,150,7,0 warp sanctuary09 1,1,ra_temple,119,153 +ra_san02,289,149,0 warp sanctuary10 1,1,ra_san03,10,149 +ra_san03,5,149,0 warp sanctuary11 1,1,ra_san02,284,149 +ra_san02,213,4,0 warp sanctuary12 1,1,ra_san04,35,216 +ra_san04,35,221,0 warp sanctuary13 1,1,ra_san02,213,9 +ra_san02,30,21,0 warp sanctuary14 1,1,ra_san05,14,149 + +//Additional Dungeon warp. (Exit) +ra_san01,139,139,0 warp sanctuary15 1,1,ra_temin,27,314 diff --git a/npc/warps/dungeons/rachel_dun.txt b/npc/warps/dungeons/rachel_dun.txt deleted file mode 100644 index 052f46529..000000000 --- a/npc/warps/dungeons/rachel_dun.txt +++ /dev/null @@ -1,43 +0,0 @@ -//===== eAthena Script ======================================= -//= Rachel Sanctuary Dungeon Warp Script -//===== By =================================================== -//= Playtester -//===== Current Version :===================================== -//= 1.4 -//===== Compatible With :===================================== -//= Any Athena Version -//===== Description :========================================= -//= Warp Points For Rachel Sanctuary Dungeon -//===== Additional Comment:=================================== -//= 1.1 Added $ephiroth's warps [Playtester] -//= 1.2 Replaced old versions with jAthena's [Playtester] -//= 1.3 Official warps [Playtester] -//= 1.4 Added quest map warp to random warp. [L0ne_W0lf] -//= Added Dungeon exit back into temple. -//============================================================ - -ra_san01,139,13,0 script sanctuary01 45,1,1,{ - if (ra_tem_q == 21) { warp "que_san04",119,110; end; } - switch(rand(3)) { - case 1: warp "ra_san02",213,275; break; - case 2: warp "ra_san03",119,283; break; - default: warp "ra_san04",119,110; break; - } -} - -ra_san02,213,280,0 warp sanctuary02 1,1,ra_san01,140,19 -ra_san03,123,283,0 warp sanctuary03 1,1,ra_san01,140,19 -ra_san04,119,104,0 warp sanctuary04 1,1,ra_san01,140,19 -ra_san03,279,21,0 warp sanctuary05 1,1,ra_san05,282,149 -ra_san03,85,15,0 warp sanctuary06 1,1,ra_san04,203,216 -ra_san04,203,221,0 warp sanctuary07 1,1,ra_san03,85,20 -ra_san04,120,48,0 warp sanctuary08 1,1,ra_san05,150,282 -ra_san05,150,7,0 warp sanctuary09 1,1,ra_temple,119,153 -ra_san02,289,149,0 warp sanctuary10 1,1,ra_san03,10,149 -ra_san03,5,149,0 warp sanctuary11 1,1,ra_san02,284,149 -ra_san02,213,4,0 warp sanctuary12 1,1,ra_san04,35,216 -ra_san04,35,221,0 warp sanctuary13 1,1,ra_san02,213,9 -ra_san02,30,21,0 warp sanctuary14 1,1,ra_san05,14,149 - -//Additional Dungeon warp. (Exit) -ra_san01,139,139,0 warp sanctuary15 1,1,ra_temin,27,314 diff --git a/npc/warps/dungeons/tha_t.txt b/npc/warps/dungeons/tha_t.txt new file mode 100644 index 000000000..36f8ab8cd --- /dev/null +++ b/npc/warps/dungeons/tha_t.txt @@ -0,0 +1,60 @@ +//===== eAthena Script ======================================= +//= Thanatos Tower Warps +//===== By: ================================================== +//= [Ishizu-chan] +//===== Current Version: ===================================== +//= 1.1 Beta +//===== Compatible With: ===================================== +//= Any eAthena Version i guess? +//===== Description: ========================================= +//= It's the Thanatos Tower Warps... +//===== Additional Comments: ================================= +//= 1.0 - First Release [Ishizu-chan] +//= 1.1 - Added Entrance Warp Guard +//= 1.2 - Updated warps to official and moved Entrance Guard +//= to proper quest file. [SinSloth] +//============================================================ + +// Thanatos Scene (tha_scene01) +tha_scene01,144,198,0 warp WarpThana0a 1,1,tha_t01,149,38 +tha_t01,149,33,0 warp WarpThana0b 1,1,hu_fild01,140,158 + +// Thanatos Tower Level 1 (tha_t01) +tha_t01,150,150,0 warp WarpThana1a 1,1,tha_t02,149,130 +tha_t02,149,125,0 warp WarpThana1b 1,1,tha_t01,150,145 + +// Thanatos Tower Level 2 (tha_t02) +tha_t03,217,165,0 warp WarpThana2a 1,1,tha_t02,227,157 + +// Thanatos Tower Level 3 (tha_t03) +tha_t03,59,140,0 warp WarpThana3a 1,1,tha_t04,60,142 +tha_t04,60,137,0 warp WarpThana3b 1,1,tha_t03,59,135 + +// Thanatos Tower Level 4 (tha_t04) +tha_t04,81,36,0 warp WarpThana4a 1,1,tha_t05,62,8 + +// Thanatos Tower Level 5 (tha_t05) +tha_t05,62,157,0 warp WarpThana5a 1,1,tha_t05,213,97 +tha_t05,208,97,0 warp WarpThana5b 1,1,tha_t05,62,162 +tha_t05,185,235,0 warp WarpThana5c 1,1,tha_t06,206,11 +thana_step,174,288,0 warp WarpThana6b 1,1,tha_t08,28,43 +thana_step,173,372,0 warp WarpThana6c 1,1,tha_t07,30,166 +tha_t07,114,166,0 warp WarpThana6d 1,1,thana_step,69,287 + +// Thanatos Tower Level 8 (tha_t08) +tha_t08,114,43,0 warp WarpThana8a 1,1,thana_step,30,223 +thana_step,32,166,0 warp WarpThana8b 1,1,tha_t09,20,96 + +// Thanatos Tower Level 9 (tha_t09) +tha_t09,92,146,0 warp WarpThana9b 1,1,thana_step,180,223 + +// Thanatos Tower Level 10 (tha_t10) +thana_step,182,166,0 warp WarpThana10a 1,1,tha_t10,155,100 +tha_t10,170,138,0 warp WarpThana10b 1,1,thana_step,14,73 + +// Thanatos Tower Level 11 (tha_t11) +thana_step,15,15,0 warp WarpThana11a 1,1,tha_t11,50,17 +tha_t11,92,36,0 warp WarpThana11b 1,1,thana_step,180,73 + +// Thanatos Tower Level 12 (tha_t12) +thana_step,181,15,0 warp WarpThana12a 1,1,tha_t12,115,16 diff --git a/npc/warps/dungeons/thana_dun.txt b/npc/warps/dungeons/thana_dun.txt deleted file mode 100644 index 36f8ab8cd..000000000 --- a/npc/warps/dungeons/thana_dun.txt +++ /dev/null @@ -1,60 +0,0 @@ -//===== eAthena Script ======================================= -//= Thanatos Tower Warps -//===== By: ================================================== -//= [Ishizu-chan] -//===== Current Version: ===================================== -//= 1.1 Beta -//===== Compatible With: ===================================== -//= Any eAthena Version i guess? -//===== Description: ========================================= -//= It's the Thanatos Tower Warps... -//===== Additional Comments: ================================= -//= 1.0 - First Release [Ishizu-chan] -//= 1.1 - Added Entrance Warp Guard -//= 1.2 - Updated warps to official and moved Entrance Guard -//= to proper quest file. [SinSloth] -//============================================================ - -// Thanatos Scene (tha_scene01) -tha_scene01,144,198,0 warp WarpThana0a 1,1,tha_t01,149,38 -tha_t01,149,33,0 warp WarpThana0b 1,1,hu_fild01,140,158 - -// Thanatos Tower Level 1 (tha_t01) -tha_t01,150,150,0 warp WarpThana1a 1,1,tha_t02,149,130 -tha_t02,149,125,0 warp WarpThana1b 1,1,tha_t01,150,145 - -// Thanatos Tower Level 2 (tha_t02) -tha_t03,217,165,0 warp WarpThana2a 1,1,tha_t02,227,157 - -// Thanatos Tower Level 3 (tha_t03) -tha_t03,59,140,0 warp WarpThana3a 1,1,tha_t04,60,142 -tha_t04,60,137,0 warp WarpThana3b 1,1,tha_t03,59,135 - -// Thanatos Tower Level 4 (tha_t04) -tha_t04,81,36,0 warp WarpThana4a 1,1,tha_t05,62,8 - -// Thanatos Tower Level 5 (tha_t05) -tha_t05,62,157,0 warp WarpThana5a 1,1,tha_t05,213,97 -tha_t05,208,97,0 warp WarpThana5b 1,1,tha_t05,62,162 -tha_t05,185,235,0 warp WarpThana5c 1,1,tha_t06,206,11 -thana_step,174,288,0 warp WarpThana6b 1,1,tha_t08,28,43 -thana_step,173,372,0 warp WarpThana6c 1,1,tha_t07,30,166 -tha_t07,114,166,0 warp WarpThana6d 1,1,thana_step,69,287 - -// Thanatos Tower Level 8 (tha_t08) -tha_t08,114,43,0 warp WarpThana8a 1,1,thana_step,30,223 -thana_step,32,166,0 warp WarpThana8b 1,1,tha_t09,20,96 - -// Thanatos Tower Level 9 (tha_t09) -tha_t09,92,146,0 warp WarpThana9b 1,1,thana_step,180,223 - -// Thanatos Tower Level 10 (tha_t10) -thana_step,182,166,0 warp WarpThana10a 1,1,tha_t10,155,100 -tha_t10,170,138,0 warp WarpThana10b 1,1,thana_step,14,73 - -// Thanatos Tower Level 11 (tha_t11) -thana_step,15,15,0 warp WarpThana11a 1,1,tha_t11,50,17 -tha_t11,92,36,0 warp WarpThana11b 1,1,thana_step,180,73 - -// Thanatos Tower Level 12 (tha_t12) -thana_step,181,15,0 warp WarpThana12a 1,1,tha_t12,115,16 diff --git a/npc/warps/dungeons/thor_dun.txt b/npc/warps/dungeons/thor_dun.txt deleted file mode 100644 index 97a7be547..000000000 --- a/npc/warps/dungeons/thor_dun.txt +++ /dev/null @@ -1,24 +0,0 @@ -//===== eAthena Script ======================================= -//= Thor's Volcano Dungeon Warp Script -//===== By: ================================================== -//= $ephiroth -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Thor's Volcano Dungeon -//===== Additional Comments: ================================= -//= 1.0 Initial version [$ephiroth] -//= 1.1 Updated warps, according to Japan site [$ephiroth] -//= 1.2 Updated more warps to thor_camp [$ephiroth] -//============================================================ - -//= Thor's Volcano Dungeon==================================== -thor_v01,21,223,0 warp veinswarp0504 1,1,ve_fild03,168,238 -thor_v01,202,34,0 warp veinswarp4001 1,1,thor_v02,74,205 -thor_v02,72,206,0 warp veinswarp4002 1,1,thor_v01,199,34 -thor_v02,191,55,0 warp veinswarp4003 1,1,thor_v03,31,272 -thor_v03,28,272,0 warp veinswarp4004 1,1,thor_v02,190,57 -thor_v02,143,78,0 warp veinswarp4005 1,1,thor_camp,284,289 -thor_camp,288,289,0 warp veinswarp4006 1,1,thor_v02,146,86 diff --git a/npc/warps/dungeons/thor_v.txt b/npc/warps/dungeons/thor_v.txt new file mode 100644 index 000000000..97a7be547 --- /dev/null +++ b/npc/warps/dungeons/thor_v.txt @@ -0,0 +1,24 @@ +//===== eAthena Script ======================================= +//= Thor's Volcano Dungeon Warp Script +//===== By: ================================================== +//= $ephiroth +//===== Current Version: ===================================== +//= 1.2 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Thor's Volcano Dungeon +//===== Additional Comments: ================================= +//= 1.0 Initial version [$ephiroth] +//= 1.1 Updated warps, according to Japan site [$ephiroth] +//= 1.2 Updated more warps to thor_camp [$ephiroth] +//============================================================ + +//= Thor's Volcano Dungeon==================================== +thor_v01,21,223,0 warp veinswarp0504 1,1,ve_fild03,168,238 +thor_v01,202,34,0 warp veinswarp4001 1,1,thor_v02,74,205 +thor_v02,72,206,0 warp veinswarp4002 1,1,thor_v01,199,34 +thor_v02,191,55,0 warp veinswarp4003 1,1,thor_v03,31,272 +thor_v03,28,272,0 warp veinswarp4004 1,1,thor_v02,190,57 +thor_v02,143,78,0 warp veinswarp4005 1,1,thor_camp,284,289 +thor_camp,288,289,0 warp veinswarp4006 1,1,thor_v02,146,86 diff --git a/npc/warps/dungeons/treasure.txt b/npc/warps/dungeons/treasure.txt new file mode 100644 index 000000000..217cd39c6 --- /dev/null +++ b/npc/warps/dungeons/treasure.txt @@ -0,0 +1,49 @@ +//==== eAthena Script ======================================== +//= Treasure Island warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Treasure Island +//===== Additional Comments: ================================= +//= Split of Alberta.txt +//= 1.1 Moved Turtle Island warps to unique file. [L0ne_W0lf] +//============================================================ + +//Treasure Island Warp's +treasure01,112,164,0 warp tre01 1,4,treasure01,97,164 +treasure01,125,161,0 warp tre02 1,3,treasure01,144,161 +treasure01,142,161,0 warp tre02-1 1,3,treasure01,123,161 +treasure01,164,114,0 warp tre03 3,1,treasure01,164,88 +treasure01,164,91,0 warp tre03-1 5,1,treasure01,164,116 +treasure01,99,164,0 warp tre01-1 1,4,treasure01,114,164 +treasure01,76,111,0 warp tre10 1,3,treasure01,100,111 +treasure01,38,164,0 warp tre04-1 1,4,treasure01,25,164 +treasure01,40,111,0 warp tre05 1,3,treasure01,67,112 +treasure01,62,111,0 warp tre05-1 1,3,treasure01,38,111 +treasure01,27,164,0 warp tre04 1,4,treasure01,40,164 +treasure01,69,75,0 warp tre07 2,1,treasure01,69,106 +treasure01,69,125,0 warp tre08 4,1,treasure01,69,142 +treasure01,69,140,0 warp tre08-1 4,1,treasure01,69,123 +treasure01,98,111,0 warp tre10-1 1,3,treasure01,74,111 +treasure01,69,177,0 warp tre002 3,1,treasure02,102,27 +treasure01,41,37,0 warp tre06 1,3,treasure01,61,37 +treasure01,58,37,0 warp tre06-1 1,3,treasure01,39,37 +treasure01,69,102,0 warp tre07-1 2,1,treasure01,69,77 +treasure01,79,37,0 warp tre09 1,3,treasure01,98,37 +treasure01,96,37,0 warp tre09-1 1,3,treasure01,77,37 +treasure01,69,22,0 warp tre001 4,1,alb2trea,85,107 +treasure02,102,103,0 warp tre11 5,1,treasure02,102,120 +treasure02,102,118,0 warp tre11-1 5,1,treasure02,102,101 +treasure02,155,128,0 warp tre13-1 1,1,treasure02,155,97 +treasure02,155,99,0 warp tre13 1,1,treasure02,155,130 +treasure02,49,99,0 warp tre14-1 1,1,treasure02,49,130 +treasure02,102,24,0 warp tre003 3,1,treasure01,69,179 +treasure02,123,72,0 warp tre12 1,4,treasure02,140,72 +treasure02,138,72,0 warp tre12-1 1,4,treasure02,121,72 +treasure02,49,128,0 warp tre14 1,1,treasure02,49,97 +treasure02,65,72,0 warp tre15 1,4,treasure02,82,72 +treasure02,80,72,0 warp tre15-1 1,4,treasure02,63,72 diff --git a/npc/warps/dungeons/tur_dun.txt b/npc/warps/dungeons/tur_dun.txt new file mode 100644 index 000000000..f822cf6cc --- /dev/null +++ b/npc/warps/dungeons/tur_dun.txt @@ -0,0 +1,23 @@ +//==== eAthena Script ======================================== +//= Turtle Island warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Turtle Island +//===== Additional Comments: ================================= +//= 1.0 Split from combined warp file alberta_duns. [L0ne_W0lf] +//============================================================ + +//Turtle Island Warp's +tur_dun01,154,241,0 warp ttl01 1,1,tur_dun02,148,264 +tur_dun02,148,268,0 warp ttl01-1 1,1,tur_dun01,154,237 +tur_dun02,167,19,0 warp ttl02 1,1,tur_dun03,132,189 +tur_dun03,132,193,0 warp ttl02-1 1,1,tur_dun02,167,23 +tur_dun03,217,71,0 warp ttl03 1,1,tur_dun04,100,192 +tur_dun04,100,196,0 warp ttl03-1 1,1,tur_dun03,215,75 +tur_dun05,89,69,0 warp ttl05 1,1,tur_dun02,148,264 +tur_dun05,9,45,0 warp ttl06 1,1,tur_dun01,154,237 diff --git a/npc/warps/dungeons/um_dun.txt b/npc/warps/dungeons/um_dun.txt new file mode 100644 index 000000000..e786b7a0e --- /dev/null +++ b/npc/warps/dungeons/um_dun.txt @@ -0,0 +1,33 @@ +//===== eAthena Script ======================================= +//= Umbala Dungeon (Yggdrasil Cave) Warp Script +//===== By: ================================================== +//= Darkchild (1.0vA); Athena (1.0vB) +//===== Current Version: ===================================== +//= 1.2 (Akaru) +//===== Compatible With: ===================================== +//= Any Athena Version; RO Episode 6+ +//===== Description: ========================================= +//= Warp Points for Umbala Dungeon (Yggdrasil Cave) +//===== Additional Comments: ================================= +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//============================================================ + +//= Dungeon Level 1 ========================================== +umbala,106,286,0 warp umba0011 1,1,um_dun01,42,31 +um_dun01,150,198,0 warp umba0013 1,1,um_dun02,48,30 +um_dun01,42,26,0 warp umba0012 1,1,umbala,111,283 + +//= Dungeon Level 2 ========================================== +um_dun02,103,208,0 warp umba0020 1,1,um_dun02,116,208 +um_dun02,113,208,0 warp umba0019 1,1,um_dun02,100,208 +um_dun02,169,38,0 warp umba0025 1,1,um_dun02,180,38 +um_dun02,177,38,0 warp umba0026 1,1,um_dun02,166,38 +um_dun02,216,77,0 warp umba0018 1,1,um_dun02,217,88 +um_dun02,216,84,0 warp umba0017 1,1,um_dun02,214,74 +um_dun02,222,259,0 warp umba0015 1,1,um_dun02,234,255 +um_dun02,231,255,0 warp umba0016 1,1,um_dun02,219,260 +um_dun02,25,244,0 warp umba0022a 1,1,um_dun02,35,251 +um_dun02,33,249,0 warp umba0021 1,1,um_dun02,23,242 +um_dun02,51,26,0 warp umba0022b 1,1,um_dun01,153,201 +um_dun02,60,88,0 warp umba0023 1,1,um_dun02,66,77 +um_dun02,63,80,0 warp umba0024 1,1,um_dun02,59,92 diff --git a/npc/warps/dungeons/umbala_dun.txt b/npc/warps/dungeons/umbala_dun.txt deleted file mode 100644 index e786b7a0e..000000000 --- a/npc/warps/dungeons/umbala_dun.txt +++ /dev/null @@ -1,33 +0,0 @@ -//===== eAthena Script ======================================= -//= Umbala Dungeon (Yggdrasil Cave) Warp Script -//===== By: ================================================== -//= Darkchild (1.0vA); Athena (1.0vB) -//===== Current Version: ===================================== -//= 1.2 (Akaru) -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ -//===== Description: ========================================= -//= Warp Points for Umbala Dungeon (Yggdrasil Cave) -//===== Additional Comments: ================================= -//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//============================================================ - -//= Dungeon Level 1 ========================================== -umbala,106,286,0 warp umba0011 1,1,um_dun01,42,31 -um_dun01,150,198,0 warp umba0013 1,1,um_dun02,48,30 -um_dun01,42,26,0 warp umba0012 1,1,umbala,111,283 - -//= Dungeon Level 2 ========================================== -um_dun02,103,208,0 warp umba0020 1,1,um_dun02,116,208 -um_dun02,113,208,0 warp umba0019 1,1,um_dun02,100,208 -um_dun02,169,38,0 warp umba0025 1,1,um_dun02,180,38 -um_dun02,177,38,0 warp umba0026 1,1,um_dun02,166,38 -um_dun02,216,77,0 warp umba0018 1,1,um_dun02,217,88 -um_dun02,216,84,0 warp umba0017 1,1,um_dun02,214,74 -um_dun02,222,259,0 warp umba0015 1,1,um_dun02,234,255 -um_dun02,231,255,0 warp umba0016 1,1,um_dun02,219,260 -um_dun02,25,244,0 warp umba0022a 1,1,um_dun02,35,251 -um_dun02,33,249,0 warp umba0021 1,1,um_dun02,23,242 -um_dun02,51,26,0 warp umba0022b 1,1,um_dun01,153,201 -um_dun02,60,88,0 warp umba0023 1,1,um_dun02,66,77 -um_dun02,63,80,0 warp umba0024 1,1,um_dun02,59,92 diff --git a/npc/warps/dungeons/xmas_dun.txt b/npc/warps/dungeons/xmas_dun.txt new file mode 100644 index 000000000..ff14558bb --- /dev/null +++ b/npc/warps/dungeons/xmas_dun.txt @@ -0,0 +1,18 @@ +//===== eAthena Script ======================================= +//= Lutie Dungeon (Toy Factory) Warp Script +//===== By: ================================================== +//= Nana (1.0) +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= Any Athena Version; RO Episode 2+ +//===== Description: ========================================= +//= Warp Points for Lutie Dungeon (Toy Factory) +//===== Additional Comments: ================================= +//= 1.1 Fixed endless warping loop +//============================================================ + +//= Toy Factory ============================================== +xmas_dun01,128,133,0 warp xmas15 3,3,xmas_dun02,129,133 +xmas_dun01,205,13,0 warp xmas14-1 3,3,xmas,143,308 +xmas_dun02,129,129,0 warp xmas15-1 3,3,xmas_dun01,128,128 diff --git a/npc/warps/dungeons/yuno_dun.txt b/npc/warps/dungeons/yuno_dun.txt deleted file mode 100644 index 2459241e2..000000000 --- a/npc/warps/dungeons/yuno_dun.txt +++ /dev/null @@ -1,18 +0,0 @@ -//===== eAthena Script ======================================= -//= Yuno Dungeon Warp Script -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 5+ -//===== Description: ========================================= -//= Warp Points for Yuno Dungeon -//===== Additional Comments: ================================= -//= No Comment! -//============================================================ - -//= Magma Dungeon ============================================ -mag_dun01,126,66,0 warp mag01-yunfild 1,1,yuno_fild03,34,139 -mag_dun01,242,241,0 warp mag01-02 1,1,mag_dun02,47,30 -mag_dun02,47,28,0 warp mag02-01 1,1,mag_dun01,242,239 diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt index 395a881b2..db30f3bd6 100644 --- a/npc/warps/other/jobquests.txt +++ b/npc/warps/other/jobquests.txt @@ -21,6 +21,7 @@ //= 1.6 removed swordman quest map warps. They are now contained in the swordman quest. [L0ne_W0lf] //= 1.7 Updated some 2-2 job quest related warps. [L0ne_W0lf] //= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.9 Added Jungslinger and NInja warps. [L0ne_W0lf] //============================================================ @@ -101,3 +102,23 @@ in_rogue,8,9,0 warp stair_to_ro 1,1,in_rogue,389,389 //Dancer //============================================================================== job_duncer,69,43,0 warp duncer1 1,1,comodo,185,156 + +//============================================================================== +//Gunslinger +//============================================================================== +einbroch,136,199,0 warp gswarp1 1,1,que_ng,138,167 +que_ng,130,166,0 warp gswarp2 1,1,einbroch,130,197 +que_ng,178,162,0 warp gswarp3 1,1,que_ng,172,86 +que_ng,166,85,0 warp gswarp4 1,1,que_ng,182,161 +que_ng,165,137,0 warp gswarp5 1,1,que_ng,177,41 +que_ng,172,42,0 warp gswarp6 1,1,que_ng,160,139 + +//============================================================================== +//Ninja +//============================================================================== +amatsu,149,140,0 warp ninja01 1,1,que_ng,20,142 +que_ng,20,138,0 warp ninja02 1,1,amatsu,147,136 +que_ng,10,183,0 warp ninja03 1,1,que_ng,33,64 +que_ng,37,64,0 warp ninja04 1,1,que_ng,15,182 +que_ng,30,37,0 warp ninja05 1,1,que_ng,67,28 +que_ng,63,30,0 warp ninja06 1,1,que_ng,25,37 -- cgit v1.2.3-60-g2f50