diff options
Diffstat (limited to 'npc/warps')
73 files changed, 450 insertions, 588 deletions
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt index 26ac52a7b..7be1aa27c 100644 --- a/npc/warps/cities/amatsu.txt +++ b/npc/warps/cities/amatsu.txt @@ -6,11 +6,11 @@ //===== Current Version: ===================================== //= 1.7 //===== Description: ========================================= -//= [Aegis COnversion] +//= [Official Conversion] //= Warp Points for Amatsu //===== Additional Comments: ================================= //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] -//= Renamed warps for ease-of-reading. +//= Renamed warps for ease-of-reading. //============================================================ amatsu,177,138,0 warp ama_house1-1 1,1,ama_in01,28,176 @@ -41,9 +41,9 @@ ama_in02,59,160,0 warp ama_castle4-2 1,1,ama_in02,215,152 ama_in02,126,164,0 warp ama_castle5-1 1,1,ama_in02,219,161 ama_in02,222,161,0 warp ama_castle5-2 1,1,ama_in02,129,164 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 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] diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt index 27f3e4573..3b086bf19 100644 --- a/npc/warps/cities/ayothaya.txt +++ b/npc/warps/cities/ayothaya.txt @@ -50,9 +50,9 @@ ayo_in02,100,148,0 warp ayo_shrine1-2 1,1,ayothaya,208,280 ayothaya,276,176,0 warp ayo_fild1-1 1,1,ayo_fild01,37,241 ayo_fild01,32,240,0 warp ayo_fild1-2 1,1,ayothaya,273,176 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.1 Fixed Armory part by massdriller [Thanks to akusarujin] //= 1.2 Revised warps, due to official Ayothaya Town NPC [MasterOfMuppets] //= 1.3 Fixed swapped Inn Exits, thanks to Sir_Loon [Lupus] diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt index c2074660e..3c03ff937 100644 --- a/npc/warps/cities/comodo.txt +++ b/npc/warps/cities/comodo.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.3 //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points Comodo city //===== Additional Comments: ================================= //= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] diff --git a/npc/warps/cities/einbech.txt b/npc/warps/cities/einbech.txt index fd4292fde..b2f69bfbf 100644 --- a/npc/warps/cities/einbech.txt +++ b/npc/warps/cities/einbech.txt @@ -1,14 +1,12 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbech Warps -//===== By: ================================================== +//===== By: ================================================== //= Muad Dib (1.0), SSUNNY@YOUNG(1.1) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any rAthena Version -//===== Description: ========================================= +//===== Description: ========================================= //= Einbech Town warps -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= Made by Muad_Dib from Prometheus, all credit goes to him. //= 1.1 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious] //============================================================ diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt index 696e7fa00..bbb562a95 100644 --- a/npc/warps/cities/einbroch.txt +++ b/npc/warps/cities/einbroch.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbroch Warp Script //===== By: ================================================== //= Sara-chan (1.3), SSUNNY@YOUNG(1.7), erKURITA (1.8) //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for Einbroch //===== Additional Comments: ================================= diff --git a/npc/warps/cities/geffen.txt b/npc/warps/cities/geffen.txt index 77016fb7c..94e4653e8 100644 --- a/npc/warps/cities/geffen.txt +++ b/npc/warps/cities/geffen.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Geffen Warp Script //===== By: ================================================== //= Athena (1.0) //= Nana (1.1) //===== Current Version: ===================================== //= 1.1a -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Geffen //===== Additional Comments: ================================= diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt index 5a37ed0c7..1f74e02f5 100644 --- a/npc/warps/cities/gonryun.txt +++ b/npc/warps/cities/gonryun.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kunlun Town Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 5+ //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Kunlun //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt index 0daa5219b..3c44d9c75 100644 --- a/npc/warps/cities/hugel.txt +++ b/npc/warps/cities/hugel.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Garden City Hugel Warp Script //===== By: ================================================== //= Sara-chan (1.1) //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 10+ //===== Description: ========================================= //= Warp Points for Hugel //===== Additional Comments: ================================= diff --git a/npc/warps/cities/lighthalzen.txt b/npc/warps/cities/lighthalzen.txt index 04b9798c6..1f3d4b375 100644 --- a/npc/warps/cities/lighthalzen.txt +++ b/npc/warps/cities/lighthalzen.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen Warp Script //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for Lighthalzen //===== Additional Comments: ================================= @@ -95,9 +93,9 @@ lhz_in03,93,21,0 warp lhz_house3_1-2 1,1,lighthalzen,247,299 lhz_in03,134,14,0 warp lhz_house3_2-1 1,1,lhz_in03,125,90 lhz_in03,120,90,0 warp lhz_house3_2-2 1,1,lhz_in03,130,14 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.3 Removed fields and dungeons warps from here [DracoRPG] //= 1.3a A small fix for a warp [MasterOfMuppets] //= 1.4 Lighthalzen warp, taken from korean eA site [Vicious] diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt index 11679d3b0..82a9bdd26 100644 --- a/npc/warps/cities/louyang.txt +++ b/npc/warps/cities/louyang.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lou Yang Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version 6.0+ //===== Description: ========================================= -//= [Aegis conversion] +//= [Official Conversion] //= Warp Points for Louyang //===== Additional Comments: ================================= //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] @@ -44,9 +42,9 @@ lou_in01,28,19,0 warp lou_tower1-2 1,1,louyang,136,245 lou_in01,14,18,0 warp lou_Towerexit 1,1,louyang,90,254 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.1 Added 2 escapes from 2 mountains 018,019 [Lupus] //= Some players used to stuck there after warps //= 1.2 Added a few missing warps [MasterOfMuppets] diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt index 5f232974a..52a0ba3ce 100644 --- a/npc/warps/cities/lutie.txt +++ b/npc/warps/cities/lutie.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lutie Warp Script //===== By: ================================================== //= Athena (1.0) Nana (1.1) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2+ //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Lutie //===== Additional Comments: ================================= //= 1.2a Re-fixed endless warping loop diff --git a/npc/warps/cities/manuk.txt b/npc/warps/cities/manuk.txt index c7d63169c..428687383 100644 --- a/npc/warps/cities/manuk.txt +++ b/npc/warps/cities/manuk.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Manuk warp points. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 13.2+ //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Manuk //===== Additional Comments: ================================= //= First version. diff --git a/npc/warps/cities/mid_camp.txt b/npc/warps/cities/mid_camp.txt index 8cf9d80cb..b1e26b0ae 100644 --- a/npc/warps/cities/mid_camp.txt +++ b/npc/warps/cities/mid_camp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Another World Warp Script //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= [Official Conversion] //= Warp Points for Another World diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt index 8b95ed497..57aaee338 100644 --- a/npc/warps/cities/morroc.txt +++ b/npc/warps/cities/morroc.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Morroc Warp Script //===== By: ================================================== //= Athena (1.0) //= Nana (1.2) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Morroc and Assassin Guild //===== Additional Comments: ================================= diff --git a/npc/warps/cities/moscovia.txt b/npc/warps/cities/moscovia.txt index 408753e3a..deae51982 100644 --- a/npc/warps/cities/moscovia.txt +++ b/npc/warps/cities/moscovia.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Moscovia City Warp Script //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Moscovia City //===== Additional Comments: ================================= diff --git a/npc/warps/cities/nameless.txt b/npc/warps/cities/nameless.txt index 3c126e978..89614fd4b 100644 --- a/npc/warps/cities/nameless.txt +++ b/npc/warps/cities/nameless.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Nameless Island Warp Script //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Nameless Island //===== Additional Comments: ================================= diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt index 62bc29ad2..4e2539904 100644 --- a/npc/warps/cities/niflheim.txt +++ b/npc/warps/cities/niflheim.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Niflheim Warp Script //===== By: ================================================== //= PKGINGO (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= Warp Points for Niflheim //===== Additional Comments: ================================= diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt index cd0d31f11..0bd5f4039 100644 --- a/npc/warps/cities/payon.txt +++ b/npc/warps/cities/payon.txt @@ -1,16 +1,14 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Payon Warps -//===== By: ================================================== +//===== By: ================================================== //= Muad Dib (1.0) //= Darkchild (1.1) //= Nana (1.3) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= Any rAthena Mod -//===== Description: ========================================= +//===== Description: ========================================= //= Payon warps -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= Warps Done By Muad Dib, All Credits To Him //= 1.2 Removed Duplicated Warp //= 1.3 Separated and reorganized field and dungeons diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt index 93948e678..7327b2901 100644 --- a/npc/warps/cities/prontera.txt +++ b/npc/warps/cities/prontera.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Prontera Warp Script //===== By: ================================================== //= Athena (1.0) //= Nana (1.2) //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Prontera //===== Additional Comments: ================================= diff --git a/npc/warps/cities/splendide.txt b/npc/warps/cities/splendide.txt index 4782f4c9f..21dcf744f 100644 --- a/npc/warps/cities/splendide.txt +++ b/npc/warps/cities/splendide.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Splendide warp points. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 13.2+ //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Splendide //===== Additional Comments: ================================= //= First version. diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt index fee11e26a..f86c90d2c 100644 --- a/npc/warps/cities/umbala.txt +++ b/npc/warps/cities/umbala.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Umbala Warp Script //===== By: ================================================== //= Darkchild (1.0v A) @@ -7,10 +7,8 @@ //= Nana (1.2) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= -//= [Aegis COnversion] +//= [Official Conversion] //= Warp Points for Umbala //===== Additional Comments: ================================= //= 1.3 Rescripted to Aegis 10.3 Standards. [L0nE_W0lf] @@ -28,7 +26,7 @@ umbala,100,203,0 warp um_houseA2-1 1,1,um_in,163,69 um_in,166,69,0 warp um_houseA2-2 1,1,umbala,102,205 umbala,107,130,0 warp um_houseB1-1 1,1,um_in,99,66 um_in,99,63,0 warp um_houseB1-2 1,1,umbala,108,127 -umbala,220,189,0 script um_shaman1-1 45,1,1,{ +umbala,220,189,0 script um_shaman1-1 WARPNPC,1,1,{ OnTouch: if (event_umbala == 7) { warp "um_in",32,71; diff --git a/npc/warps/cities/veins.txt b/npc/warps/cities/veins.txt index 251b0d14c..465b99d4b 100644 --- a/npc/warps/cities/veins.txt +++ b/npc/warps/cities/veins.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Veins City Warp Script //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= -//= [Aegis COnversion] +//= [Official Conversion] //= Warp Points for Veins //===== Additional Comments: ================================= //= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf] @@ -47,9 +45,9 @@ ve_in02,13,19,0 warp ve_factory1-2 1,1,veins,269,225 veins,143,25,0 warp veins1-1 1,1,ve_fild07,147,366 veins,218,361,0 warp veins2-1 1,1,ve_fild06,148,225 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.0 Initial version [$ephiroth] //= 1.1 Removed Rachel City warp [Playtester] //= 1.2 Updated veins warp based on jA info [$ephiroth] diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt index 6503091ce..4d6ebee86 100644 --- a/npc/warps/cities/yuno.txt +++ b/npc/warps/cities/yuno.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Yuno Warp Script //===== By: ================================================== //= Nana (1.0) //= Sara-chan (1.1) //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 5+ //===== Description: ========================================= //= Warp Points for Yuno //===== Additional Comments: ================================= @@ -90,113 +88,100 @@ yuno,245,147,0 warp yun65 1,1,yuno_in01,101,88 yuno_in01,101,85,0 warp yun66 1,1,yuno,245,144 // Yuno In05 (Entering Random Warps) ------------------------------------------- -yuno_in05,153,141,0 script #yun63 45,1,1,{ - if(rand(2)){ +yuno_in05,153,141,0 script #yun63 WARPNPC,1,1,{ + if (rand(2)) warp "yuno_in05",192,102; - } else { + else warp "yuno_in05",145,82; - } end; } // Yuno In05 (Random Warps - Cross Shaped) ------------------------------------- -yuno_in05,196,102,0 script #yun64 45,1,1,{ - set @warp0,rand(3); - if(@warp0==1) goto w2; - if(@warp0==2) goto w3; - warp "yuno_in05",169,102; end; -w2: warp "yuno_in05",128,82; end; -w3: warp "yuno_in05",156,141; end; +yuno_in05,196,102,0 script #yun64 WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "yuno_in05",169,102; end; + case 1: warp "yuno_in05",128,82; end; + case 2: warp "yuno_in05",156,141; end; + } } -yuno_in05,181,116,0 script #yun65 45,1,1,{ - set @warp0,rand(3); - if(@warp0==1) goto w2; - if(@warp0==2) goto w3; - warp "yuno_in05",181,94; end; -w2: warp "yuno_in05",176,13; end; -w3: warp "yuno_in05",136,75; end; +yuno_in05,181,116,0 script #yun65 WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "yuno_in05",181,94; end; + case 1: warp "yuno_in05",176,13; end; + case 2: warp "yuno_in05",136,75; end; + } } -yuno_in05,165,102,0 script #yun66 45,1,1,{ - if(rand(2)){ +yuno_in05,165,102,0 script #yun66 WARPNPC,1,1,{ + if (rand(2)) warp "yuno_in05",192,102; - } else { + else warp "yuno_in05",145,82; - } end; } -yuno_in05,181,91,0 script #yun67 45,1,1,{ - if(rand(2)){ +yuno_in05,181,91,0 script #yun67 WARPNPC,1,1,{ + if (rand(2)) warp "yuno_in05",181,112; - } else { + else warp "yuno_in05",176,48; - } end; } // Yuno In05 (Random Warps - T-Shaped) ----------------------------------------- -yuno_in05,148,82,0 script #yun68 45,1,1,{ - set @warp0,rand(3); - if(@warp0==1) goto w2; - if(@warp0==2) goto w3; - warp "yuno_in05",169,102; end; -w2: warp "yuno_in05",128,82; end; -w3: warp "yuno_in05",156,141; end; +yuno_in05,148,82,0 script #yun68 WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "yuno_in05",169,102; end; + case 1: warp "yuno_in05",128,82; end; + case 2: warp "yuno_in05",156,141; end; + } } -yuno_in05,125,82,0 script #yun69 45,1,1,{ - if(rand(2)){ +yuno_in05,125,82,0 script #yun69 WARPNPC,1,1,{ + if (rand(2)) warp "yuno_in05",192,102; - } else { + else warp "yuno_in05",145,82; - } end; } -yuno_in05,136,71,0 script #yun70 45,1,1,{ - set @warp0,rand(3); - if(@warp0==1) goto w2; - if(@warp0==2) goto w3; - warp "yuno_in05",181,112; end; -w2: warp "yuno_in05",16,185; end; -w3: warp "yuno_in05",176,48; end; +yuno_in05,136,71,0 script #yun70 WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "yuno_in05",181,112; end; + case 1: warp "yuno_in05",16,185; end; + case 2: warp "yuno_in05",176,48; end; + } } // Yuno In05 (Random Warps - Other) -------------------------------------------- -yuno_in05,16,188,0 script #yun71 45,1,1,{ - set @warp0,rand(3); - if(@warp0==1) goto w2; - if(@warp0==2) goto w3; - warp "yuno_in05",181,94; end; -w2: warp "yuno_in05",176,13; end; -w3: warp "yuno_in05",136,75; end; +yuno_in05,16,188,0 script #yun71 WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "yuno_in05",181,94; end; + case 1: warp "yuno_in05",176,13; end; + case 2: warp "yuno_in05",136,75; end; + } } -yuno_in05,176,9,0 script #yun72 45,1,1,{ - if(rand(2)){ +yuno_in05,176,9,0 script #yun72 WARPNPC,1,1,{ + if (rand(2)) warp "yuno_in05",181,112; - } else { + else warp "yuno_in05",176,48; - } end; } -yuno_in05,176,52,0 script #yun73 45,1,1,{ - set @warp0,rand(3); - if(@warp0==1) goto w2; - if(@warp0==2) goto w3; - warp "yuno_in05",181,94; end; -w2: warp "yuno_in05",176,13; end; -w3: warp "yuno_in05",136,75; end; +yuno_in05,176,52,0 script #yun73 WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "yuno_in05",181,94; end; + case 1: warp "yuno_in05",176,13; end; + case 2: warp "yuno_in05",136,75; end; + } } // Yuno In05 (Destination - Room) ---------------------------------------------- -yuno_in05,40,178,0 script #yun74 45,1,1,{ - set @warp0,rand(3); - if(@warp0==1) goto w2; - if(@warp0==2) goto w3; - warp "yuno_in05",181,94; end; -w2: warp "yuno_in05",176,13; end; -w3: warp "yuno_in05",136,75; end; +yuno_in05,40,178,0 script #yun74 WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "yuno_in05",181,94; end; + case 1: warp "yuno_in05",176,13; end; + case 2: warp "yuno_in05",136,75; end; + } } -yuno_in05,47,186,0 script #yun75 45,1,1,{ - set @warp0,rand(3); - if(@warp0==1) goto w2; - if(@warp0==2) goto w3; - warp "yuno_in05",181,94; end; -w2: warp "yuno_in05",176,13; end; -w3: warp "yuno_in05",136,75; end; +yuno_in05,47,186,0 script #yun75 WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "yuno_in05",181,94; end; + case 1: warp "yuno_in05",176,13; end; + case 2: warp "yuno_in05",136,75; end; + } } // Yuno In05 (Destination - Escaped Random Warps) ------------------------------ yuno_in05,31,167,0 warp yun76 1,1,yuno_in05,50,85 diff --git a/npc/warps/dungeons/alde_dun.txt b/npc/warps/dungeons/alde_dun.txt index c711ecd5c..f74bf7c48 100644 --- a/npc/warps/dungeons/alde_dun.txt +++ b/npc/warps/dungeons/alde_dun.txt @@ -26,12 +26,11 @@ 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)) { +alde_dun02,267,41,4 script ald008r WARPNPC,1,1,{ + if (rand(2)) warp "c_tower3",168,252; - } else { + else warp "alde_dun02",262,141; - } end; } alde_dun03,12,267,0 warp aldd09 2,2,alde_dun02,273,250 @@ -41,23 +40,21 @@ 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; +alde_dun03,130,125,4 script ald014r WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "c_tower2",228,267; end; + case 1: warp "alde_dun03",130,130; end; + case 2: 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_dun03,171,127,4 script ald015r WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "c_tower2",13,282; end; + case 1: warp "alde_dun03",175,131; end; + case 2: 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 @@ -65,14 +62,12 @@ 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; +alde_dun04,80,34,4 script ald022r WARPNPC,1,1,{ + switch(rand(4)) { + case 0: warp "c_tower2",13,282; end; + case 1: warp "alde_dun03",175,131; end; + case 2: warp "c_tower3",235,7; end; + case 3: warp "alde_dun04",84,36; end; + } } //============================================================ diff --git a/npc/warps/dungeons/ama_dun.txt b/npc/warps/dungeons/ama_dun.txt index 0356ca8a0..70eab1f02 100644 --- a/npc/warps/dungeons/ama_dun.txt +++ b/npc/warps/dungeons/ama_dun.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.2 //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Amatsu Dungeon //===== Additional Comments: ================================= //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt index 68cc30d59..225631b7c 100644 --- a/npc/warps/dungeons/ayo_dun.txt +++ b/npc/warps/dungeons/ayo_dun.txt @@ -15,9 +15,9 @@ ayo_dun01,274,14,0 warp ayo_dun1-2 1,1,ayo_fild02,279,150 ayo_dun02,24,22,0 warp ayo_dun2-1 1,1,ayo_dun01,24,279 ayo_dun02,276,22,0 warp ayo_dun2-2 1,1,ayo_dun01,24,279 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.0 Splitted 2 files [Lupus] //= Should some warps be disabled due to Dungeon Quest? //============================================================ diff --git a/npc/warps/dungeons/beach_dun.txt b/npc/warps/dungeons/beach_dun.txt index d2042a6de..69eb347e0 100644 --- a/npc/warps/dungeons/beach_dun.txt +++ b/npc/warps/dungeons/beach_dun.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.1 //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Comodo Beach Dungeon warp script //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] diff --git a/npc/warps/dungeons/c_tower.txt b/npc/warps/dungeons/c_tower.txt index 572df52bf..b7b46d16d 100644 --- a/npc/warps/dungeons/c_tower.txt +++ b/npc/warps/dungeons/c_tower.txt @@ -22,23 +22,21 @@ 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; +c_tower2,13,288,4 script clt006r WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "c_tower2",13,282; end; + case 1: warp "alde_dun03",175,131; end; + case 2: 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; +c_tower2,223,267,4 script clt007r WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "c_tower2",288,267; end; + case 1: warp "alde_dun03",130,130; end; + case 2: warp "c_tower3",252,29; end; + } } //============================================================ //= Level 3 ================================================== @@ -49,33 +47,30 @@ 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)) { +c_tower3,163,252,4 script clt014r WARPNPC,1,1,{ + if (rand(2)) warp "c_tower3",168,252; - } else { + 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; +c_tower3,240,7,4 script clt015r WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "c_tower2",13,282; end; + case 1: warp "alde_dun03",175,131; end; + case 2: 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; +c_tower3,252,24,4 script clt016r WARPNPC,1,1,{ + switch(rand(3)) { + case 0: warp "c_tower2",228,267; end; + case 1: warp "alde_dun03",130,130; end; + case 2: warp "c_tower3",252,29; end; + } } //============================================================ //= Level 4 ================================================== @@ -91,61 +86,51 @@ 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; +c_tower4,75,156,4 script clt027r WARPNPC,0,0,{ + switch(rand(4)) { + case 0: warp "c_tower3",168,252; end; + case 1: warp "alde_dun02",262,41; end; + case 2: warp "c_tower4",73,154; end; + case 3: 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; +c_tower4,68,79,4 script clt028r WARPNPC,0,0,{ + switch(rand(4)) { + case 0: warp "c_tower2",13,282; end; + case 1: warp "alde_dun03",175,131; end; + case 2: warp "c_tower3",235,7; end; + case 3: 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; +c_tower4,142,151,4 script clt029r WARPNPC,0,0,{ + switch(rand(4)) { + case 0: warp "c_tower3",168,252; end; + case 1: warp "alde_dun02",262,41; end; + case 2: warp "c_tower4",73,154; end; + case 3: 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; +c_tower4,151,96,4 script clt030r WARPNPC,0,0,{ + switch(rand(4)) { + case 0: warp "c_tower2",228,267; end; + case 1: warp "alde_dun03",130,130; end; + case 2: warp "c_tower3",252,29; end; + case 3: 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; +c_tower4,189,40,4 script clt031r WARPNPC,2,2,{ + switch(rand(4)) { + case 0: warp "c_tower2",228,267; end; + case 1: warp "alde_dun03",130,130; end; + case 2: warp "c_tower3",252,29; end; + case 3: warp "c_tower4",152,95; end; + } } diff --git a/npc/warps/dungeons/ein_dun.txt b/npc/warps/dungeons/ein_dun.txt index c0b1f69be..20de88fad 100644 --- a/npc/warps/dungeons/ein_dun.txt +++ b/npc/warps/dungeons/ein_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbroch Warp Script //===== By: ================================================== //= Sara-chan (1.3), SSUNNY@YOUNG(1.4) //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for Einbroch //===== Additional Comments: ================================= diff --git a/npc/warps/dungeons/gef_dun.txt b/npc/warps/dungeons/gef_dun.txt index 967c91c15..b00943d57 100644 --- a/npc/warps/dungeons/gef_dun.txt +++ b/npc/warps/dungeons/gef_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules 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: ================================= diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt index 8e02b8a31..829b60dc9 100644 --- a/npc/warps/dungeons/gon_dun.txt +++ b/npc/warps/dungeons/gon_dun.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kunlun Dungeon Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 5+ //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Kunlun dungeon //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] diff --git a/npc/warps/dungeons/ice_dun.txt b/npc/warps/dungeons/ice_dun.txt index dc6983008..cd48a81c1 100644 --- a/npc/warps/dungeons/ice_dun.txt +++ b/npc/warps/dungeons/ice_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Ice Dungeon Warp Script //===== By: ================================================== //= Playtester //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Ice Dungeon //===== Additional Comments: ================================= diff --git a/npc/warps/dungeons/in_sphinx.txt b/npc/warps/dungeons/in_sphinx.txt index 70f1f63f8..24f5e099b 100644 --- a/npc/warps/dungeons/in_sphinx.txt +++ b/npc/warps/dungeons/in_sphinx.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules 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: ================================= diff --git a/npc/warps/dungeons/iz_dun.txt b/npc/warps/dungeons/iz_dun.txt index 0ccc42db9..e52d7919e 100644 --- a/npc/warps/dungeons/iz_dun.txt +++ b/npc/warps/dungeons/iz_dun.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules 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: ================================= diff --git a/npc/warps/dungeons/juperos.txt b/npc/warps/dungeons/juperos.txt index 900b79d86..9ca84315f 100644 --- a/npc/warps/dungeons/juperos.txt +++ b/npc/warps/dungeons/juperos.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Juperos Dungeon Warp Script //===== By: ================================================== //= Muad-Dib (1.0) //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena with independant npctimer support; RO Episode 8+ //===== Description: ========================================= //= Warp Points for Juperos Dungeon //===== Additional Comments: ================================= @@ -16,7 +14,7 @@ //= 1.4 Added attachnpctimer to the initnpctimer calls. [Skotlex] //= 1.5 Implemented a part of the Juperos quest [MasterOfMuppets] //= 1.6 Removed area1 and area2 warps. These are event warps. [L0ne_W0lf] -//= Added static warps for gate -> area1/2/elevator. +//= Added static warps for gate -> area1/2/elevator. //= 1.6a COrrected new warps [L0ne_W0lf] //= 1.7 Removed duplicated quest warp portal [Brainstorm] //============================================================ diff --git a/npc/warps/dungeons/kh_dun.txt b/npc/warps/dungeons/kh_dun.txt index c19e324ca..eaee1171a 100644 --- a/npc/warps/dungeons/kh_dun.txt +++ b/npc/warps/dungeons/kh_dun.txt @@ -1,18 +1,16 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kiel Dungeon Warp Script //===== By: ================================================== //= Lost Kakashi //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 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. +//= Corrected coordinated for some of the other warps. //============================================================ //= Kiel Dungeon ============================================= @@ -26,7 +24,7 @@ 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,{ +kh_dun02,43,195,0 script kh_dun04 WARPNPC,1,1,{ OnTouch: if (rand(1,2) == 1) { warp "kh_dun01",41,206; diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt index d8d0f7c5e..b0345b447 100644 --- a/npc/warps/dungeons/lhz_dun.txt +++ b/npc/warps/dungeons/lhz_dun.txt @@ -1,21 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen Dungeon Warp Script //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== //= 2.1b -//===== 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 +//= 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] +//= 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 @@ -26,8 +23,8 @@ //= 1.9 Removed duplicates [Toms] //= 2.0 Now use MISC_QUEST&512 instead of 'hzdun' [Lupus] //= 2.1 Updated all standard dungeon warps. [L0ne_W0lf] -//= Updated Sewer pipe dungeon entrance. -//= Removed dialog from level 3 entrance warp. +//= Updated Sewer pipe dungeon entrance. +//= Removed dialog from level 3 entrance warp. //= 2.1a Updated 3rd floor warp. Again... [L0ne_W0lf] //= 2.1b Fixed reverse level requirement in 3rd floor warp. [L0ne_W0lf] //============================================================ @@ -39,7 +36,7 @@ lhz_dun01,149,9,0 warp lhz_dun3-1 1,1,lhz_dun02,153,19 lhz_dun02,146,19,0 warp lhz_dun3-2 1,1,lhz_dun01,144,9 lhz_dun01,18,145,0 warp lhz_dun4-1 1,1,lhz_dun02,17,150 lhz_dun02,17,156,0 warp lhz_dun4-2 1,1,lhz_dun01,18,150 -lhz_dun02,149,149,4 script lhz_dun5-1 45,2,2,{ +lhz_dun02,149,149,4 script lhz_dun5-1 WARPNPC,2,2,{ OnTouch: if ((Upper != 1 && BaseLevel<95) || (Upper == 1 && BaseLevel<90)) { warp "lhz_dun02",145,149; @@ -53,7 +50,7 @@ lhz_dun03,139,137,0 warp lhz_dun5-2 1,1,lhz_dun02,149,142 //--------------------------Sewer Pipe-------------------------- -lighthalzen,313,301,0 script Sewer Pipe#lt 111,{ +lighthalzen,313,301,0 script Sewer Pipe#lt HIDDEN_NPC,{ if (MISC_QUEST&512) { mes "^3355FFYou found some sort"; mes "of large sewage pipe."; @@ -91,54 +88,54 @@ lhz_cube,177,96,0 warp lhzcube4 1,1,lighthalzen,310,302 // -3 are warps facing west. // -4 are warps facing north. //----------------- Room 66 74 ------------------------------- -lhz_cube,74,74,0 script cubew01-1 45,1,1,{ +lhz_cube,74,74,0 script cubew01-1 WARPNPC,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,{ +lhz_cube,59,74,0 script cubew01-3 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,66,82,0 script cubew01-4 45,1,1,{ +lhz_cube,66,82,0 script cubew01-4 WARPNPC,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,{ +lhz_cube,66,129,0 script cubew02-2 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,59,136,0 script cubew02-3 45,1,1,{ +lhz_cube,59,136,0 script cubew02-3 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,66,144,0 script cubew02-4 45,1,1,{ +lhz_cube,66,144,0 script cubew02-4 WARPNPC,1,1,{ callfunc "randomw"; end; } //----------------- Room 67 193 ------------------------------ -lhz_cube,74,192,0 script cubew03-1 45,1,1,{ +lhz_cube,74,192,0 script cubew03-1 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,67,185,0 script cubew03-2 45,1,1,{ +lhz_cube,67,185,0 script cubew03-2 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,59,192,0 script cubew03-3 45,1,1,{ +lhz_cube,59,192,0 script cubew03-3 WARPNPC,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,{ +lhz_cube,74,18,0 script cubew04-1 WARPNPC,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,{ +lhz_cube,59,18,0 script cubew04-3 WARPNPC,1,1,{ callfunc "randomw"; end; } @@ -146,61 +143,61 @@ 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,{ +lhz_cube,3,18,0 script cubew05-3 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,10,26,0 script cubew05-4 45,1,1,{ +lhz_cube,10,26,0 script cubew05-4 WARPNPC,1,1,{ callfunc "randomw"; end; } //----------------- Room 10 74 ------------------------------- -lhz_cube,18,74,0 script cubew06-1 45,1,1,{ +lhz_cube,18,74,0 script cubew06-1 WARPNPC,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,{ +lhz_cube,10,82,0 script cubew06-4 WARPNPC,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,{ +lhz_cube,10,129,0 script cubew07-2 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,3,136,0 script cubew07-3 45,1,1,{ +lhz_cube,3,136,0 script cubew07-3 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,10,144,0 script cubew07-4 45,1,1,{ +lhz_cube,10,144,0 script cubew07-4 WARPNPC,1,1,{ callfunc "randomw"; end; } //----------------- Room 10 193 ------------------------------ -lhz_cube,18,192,0 script cubew08-1 45,1,1,{ +lhz_cube,18,192,0 script cubew08-1 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,10,185,0 script cubew08-2 45,1,1,{ +lhz_cube,10,185,0 script cubew08-2 WARPNPC,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,{ +lhz_cube,130,18,0 script cubew09-1 WARPNPC,1,1,{ callfunc "randomw"; end; } -lhz_cube,123,11,0 script cubew09-2 45,1,1,{ +lhz_cube,123,11,0 script cubew09-2 WARPNPC,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,{ +lhz_cube,123,26,0 script cubew09-4 WARPNPC,1,1,{ callfunc "randomw"; end; } diff --git a/npc/warps/dungeons/lou_dun.txt b/npc/warps/dungeons/lou_dun.txt index dc4c4a0e7..51afe24f9 100644 --- a/npc/warps/dungeons/lou_dun.txt +++ b/npc/warps/dungeons/lou_dun.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Louyang Dungeon Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version 6.0+ //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Louyang //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] diff --git a/npc/warps/dungeons/mag_dun.txt b/npc/warps/dungeons/mag_dun.txt index b81bad620..58a2f4bae 100644 --- a/npc/warps/dungeons/mag_dun.txt +++ b/npc/warps/dungeons/mag_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules 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: ================================= diff --git a/npc/warps/dungeons/mjo_dun.txt b/npc/warps/dungeons/mjo_dun.txt index 1c23dc572..66874e71b 100644 --- a/npc/warps/dungeons/mjo_dun.txt +++ b/npc/warps/dungeons/mjo_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules 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: ================================= diff --git a/npc/warps/dungeons/moc_pryd.txt b/npc/warps/dungeons/moc_pryd.txt index fc50e2a14..9c5982ae2 100644 --- a/npc/warps/dungeons/moc_pryd.txt +++ b/npc/warps/dungeons/moc_pryd.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules 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: ================================= diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt index 30dc257e7..f9a195d06 100644 --- a/npc/warps/dungeons/mosk_dun.txt +++ b/npc/warps/dungeons/mosk_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Moscovia Dungeon Warp Script //===== By: ================================================== //= Kisuka, $ephiroth //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Moscovia Dungeon //===== Additional Comments: ================================= @@ -19,7 +17,7 @@ mosk_fild02,190,257,0 warp moscoviawarp0401 1,1,mosk_dun01,189,45 mosk_dun01,189,42,0 warp moscoviawarp0501 1,1,mosk_fild02,190,254 mosk_in,215,36,0 warp babayagaout 1,1,mosk_dun02,53,217 -mosk_dun02,53,220,4 script #babayagain 45,1,1,{ +mosk_dun02,53,220,4 script #babayagain WARPNPC,1,1,{ end; OnTouch: if (mos_nowinter == 11) { @@ -117,7 +115,7 @@ OnTouch: } } -mosk_dun02,53,215,3 script Soldier1#mos 966,{ +mosk_dun02,53,215,3 script Soldier1#mos 4_M_RUSKNIGHT,{ mes "[Soldier]"; mes "We're the Csar's soldiers."; mes "We're called out for emergencies,"; @@ -133,7 +131,7 @@ OnEnable: end; } -mosk_dun02,50,217,3 script Soldier2#mos 966,{ +mosk_dun02,50,217,3 script Soldier2#mos 4_M_RUSKNIGHT,{ mes "[Soldier]"; mes "We're the Csar's soldiers."; mes "We're called out for emergencies,"; @@ -150,7 +148,7 @@ OnEnable: } -mosk_dun02,56,217,5 script Soldier3#mos 966,{ +mosk_dun02,56,217,5 script Soldier3#mos 4_M_RUSKNIGHT,{ mes "[Soldier]"; mes "We're the Csar's soldiers."; mes "We're called out for emergencies,"; @@ -166,14 +164,14 @@ OnEnable: end; } -mosk_dun01,170,164,3 script Milestone#1 111,{ +mosk_dun01,170,164,3 script Milestone#1 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who serve the Sun will die, Go to the North. -^000000"; close; } -mosk_dun01,207,276,3 script Milestone#1-2 111,{ +mosk_dun01,207,276,3 script Milestone#1-2 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who advance may get hurt but are courageous of heart and those who move back will remain safe."; @@ -189,7 +187,7 @@ mosk_dun01,207,276,3 script Milestone#1-2 111,{ close; } -mosk_dun01,264,191,3 script Milestone#1-3 111,{ +mosk_dun01,264,191,3 script Milestone#1-3 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who advance may get hurt but are brave of heart and those who move back will remain safe."; @@ -205,7 +203,7 @@ mosk_dun01,264,191,3 script Milestone#1-3 111,{ close; } -mosk_dun02,168,28,3 script Milestone#2-1 111,{ +mosk_dun02,168,28,3 script Milestone#2-1 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who advance may get hurt but are valorous of heart and those who move back will remain safe."; @@ -221,7 +219,7 @@ mosk_dun02,168,28,3 script Milestone#2-1 111,{ close; } -mosk_dun02,268,117,3 script Milestone#2-3 111,{ +mosk_dun02,268,117,3 script Milestone#2-3 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who step forward will gain honor but may die, those who step backward will have courage but may still get hurt."; @@ -237,7 +235,7 @@ mosk_dun02,268,117,3 script Milestone#2-3 111,{ close; } -mosk_dun03,27,131,3 script Milestone#3-2 111,{ +mosk_dun03,27,131,3 script Milestone#3-2 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage."; @@ -253,7 +251,7 @@ mosk_dun03,27,131,3 script Milestone#3-2 111,{ close; } -mosk_dun03,119,46,3 script Milestone#3-1 111,{ +mosk_dun03,119,46,3 script Milestone#3-1 HIDDEN_NPC,{ mes "There is writing on a big rock."; next; mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage."; @@ -269,14 +267,14 @@ mosk_dun03,119,46,3 script Milestone#3-1 111,{ close; } -mosk_dun01,194,43,3 script Milestone#1-1 111,{ +mosk_dun01,194,43,3 script Milestone#1-1 HIDDEN_NPC,{ mes "- There is writing on a big rock. -"; next; mes "- If you want to protect your life, go back -"; close; } -mosk_fild02,198,53,3 script Ship#mos_dun 111,{ +mosk_fild02,198,53,3 script Ship#mos_dun HIDDEN_NPC,{ mes "- You find a ship at anchor. -"; next; if(select("Take the ship and go back to the village.:Explore more.") == 1) { diff --git a/npc/warps/dungeons/odin.txt b/npc/warps/dungeons/odin.txt index b87aa430f..33cf0272d 100644 --- a/npc/warps/dungeons/odin.txt +++ b/npc/warps/dungeons/odin.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Odin Temple Warp Script //===== By: ================================================== //= birkiczd (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Odin Temple //===== Additional Comments: ================================= //= 1.1 Move the Saylor from Hugel.txt here. [Poki#3] -//= Hako's Sprite, cords and price is official. The text is not. +//= Hako's Sprite, cords and price is official. The text is not. //= 1.2 Removed Duplicates [Silent] //= 1.3 Official warps [Playtester] //= 1.4 Moved Sailor to Hugel quest file since he's part of -//= Odin's Excavation Quest. [SinSloth] +//= Odin's Excavation Quest. [SinSloth] //============================================================ odin_tem01,378,182,0 warp odin01 1,1,odin_tem02,28,180 diff --git a/npc/warps/dungeons/orcsdun.txt b/npc/warps/dungeons/orcsdun.txt index 4f067f6c2..01d40a5b1 100644 --- a/npc/warps/dungeons/orcsdun.txt +++ b/npc/warps/dungeons/orcsdun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules 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: ================================= diff --git a/npc/warps/dungeons/pay_dun.txt b/npc/warps/dungeons/pay_dun.txt index 5f513e899..e6c041188 100644 --- a/npc/warps/dungeons/pay_dun.txt +++ b/npc/warps/dungeons/pay_dun.txt @@ -1,16 +1,14 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Payon Cave Warps -//===== By: ================================================== +//===== By: ================================================== //= Nana (1.0) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any rAthena Mod -//===== Description: ========================================= +//===== Description: ========================================= //= Payon Dungeon Warps -//===== Additional Comments: ================================= +//===== 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 @@ -20,15 +18,13 @@ 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_dun03,127,62,4 script payd04r WARPNPC,2,2,{ + switch(rand(4)) { + case 0: warp "pay_dun04",201,204; end; + case 1: warp "pay_dun04",189,43; end; + case 2: warp "pay_dun04",43,40; end; + case 3: 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 diff --git a/npc/warps/dungeons/prt_maze.txt b/npc/warps/dungeons/prt_maze.txt index 6cfd23abd..03ca59de5 100644 --- a/npc/warps/dungeons/prt_maze.txt +++ b/npc/warps/dungeons/prt_maze.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules 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: ================================= @@ -108,15 +106,13 @@ prt_maze02,100,182,0 warp mazewarp5202 1,1,prt_maze03,182,88 /*To No.3-15*/ 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*/ +prt_maze03,58,194,0 script #mazewarp5303 WARPNPC,1,1,{ + switch(rand(4)) { + case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ + case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ + case 2: warp "prt_maze03",14,71; end; /*To No.3-16*/ + case 3: 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*/ @@ -168,15 +164,13 @@ 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,74,74,0 script #mazewarp5339 WARPNPC,1,1,{ + switch(rand(4)) { + case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ + case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ + case 2: warp "prt_maze03",14,71; end; /*To No.3-16*/ + case 3: 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 @@ -186,15 +180,13 @@ 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*/ +prt_maze03,139,45,0 script #mazewarp5346 WARPNPC,1,1,{ + switch(rand(4)) { + case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ + case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ + case 2: warp "prt_maze03",14,71; end; /*To No.3-16*/ + case 3: 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*/ @@ -212,15 +204,13 @@ 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*/ +prt_maze03,154,22,0 script #mazewarp5358 WARPNPC,1,1,{ + switch(rand(4)) { + case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ + case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ + case 2: warp "prt_maze03",14,71; end; /*To No.3-16*/ + case 3: 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*/ diff --git a/npc/warps/dungeons/ra_san.txt b/npc/warps/dungeons/ra_san.txt index 6b9076b5f..d6757cf6a 100644 --- a/npc/warps/dungeons/ra_san.txt +++ b/npc/warps/dungeons/ra_san.txt @@ -1,22 +1,20 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Rachel Sanctuary Dungeon Warp Script //===== By =================================================== //= Playtester -//===== Current Version :===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With :===================================== -//= Any Athena Version -//===== Description :========================================= +//===== Description: ========================================= //= Warp Points For Rachel Sanctuary Dungeon -//===== Additional Comment:=================================== +//===== 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. +//= Added Dungeon exit back into temple. //============================================================ -ra_san01,139,13,0 script sanctuary01 45,1,1,{ +ra_san01,139,13,0 script sanctuary01 WARPNPC,1,1,{ if (ra_tem_q == 21) { warp "que_san04",119,110; end; } switch(rand(3)) { case 1: warp "ra_san02",213,275; break; diff --git a/npc/warps/dungeons/tha_t.txt b/npc/warps/dungeons/tha_t.txt index 6eb983770..bc6925a22 100644 --- a/npc/warps/dungeons/tha_t.txt +++ b/npc/warps/dungeons/tha_t.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Thanatos Tower Warps //===== By: ================================================== //= [Ishizu-chan] //===== Current Version: ===================================== //= 1.1 Beta -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Thanatos Tower //===== Additional Comments: ================================= diff --git a/npc/warps/dungeons/thor_v.txt b/npc/warps/dungeons/thor_v.txt index 342a8bc6d..2a12603df 100644 --- a/npc/warps/dungeons/thor_v.txt +++ b/npc/warps/dungeons/thor_v.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Thor's Volcano Dungeon Warp Script //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Thor's Volcano Dungeon //===== Additional Comments: ================================= @@ -19,10 +17,10 @@ thor_v02,192,60,0 warp thor_v2-2 1,1,thor_v03,35,262 thor_v02,73,203,0 warp thor_v3-1 1,1,thor_v01,196,37 thor_v03,30,262,0 warp thor_v3-2 1,1,thor_v02,187,58 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.0 Initial version [$ephiroth] //= 1.1 Updated warps, according to Japan site [$ephiroth] //= 1.2 Updated more warps to thor_camp [$ephiroth] -//============================================================ +//============================================================ diff --git a/npc/warps/dungeons/treasure.txt b/npc/warps/dungeons/treasure.txt index 72d93c2eb..606c61e30 100644 --- a/npc/warps/dungeons/treasure.txt +++ b/npc/warps/dungeons/treasure.txt @@ -1,11 +1,9 @@ -//==== rAthena Script ======================================== +//===== Hercules 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: ================================= diff --git a/npc/warps/dungeons/tur_dun.txt b/npc/warps/dungeons/tur_dun.txt index e61147e7d..1c42f75a9 100644 --- a/npc/warps/dungeons/tur_dun.txt +++ b/npc/warps/dungeons/tur_dun.txt @@ -1,11 +1,9 @@ -//==== rAthena Script ======================================== +//===== Hercules 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: ================================= diff --git a/npc/warps/dungeons/um_dun.txt b/npc/warps/dungeons/um_dun.txt index 80b6bbbae..b69df10cb 100644 --- a/npc/warps/dungeons/um_dun.txt +++ b/npc/warps/dungeons/um_dun.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Umbala Dungeon (Yggdrasil Cave) Warp Script //===== By: ================================================== //= Darkchild (1.0vA); Athena (1.0vB) //===== Current Version: ===================================== //= 1.4 (Akaru) -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Umbala Dungeon (Yggdrasil Cave) //===== Additional Comments: ================================= //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] diff --git a/npc/warps/dungeons/xmas_dun.txt b/npc/warps/dungeons/xmas_dun.txt index 96374f412..8672f520a 100644 --- a/npc/warps/dungeons/xmas_dun.txt +++ b/npc/warps/dungeons/xmas_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lutie Dungeon (Toy Factory) Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2+ //===== Description: ========================================= //= Warp Points for Toy Factory //===== Additional Comments: ================================= diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt index a210eb12b..3a5fa7754 100644 --- a/npc/warps/fields/abyss_warper.txt +++ b/npc/warps/fields/abyss_warper.txt @@ -15,7 +15,7 @@ //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ -hu_fild05,168,304,0 script Column#abyss1 111,{ +hu_fild05,168,304,0 script Column#abyss1 HIDDEN_NPC,{ mes "^3355FFThere are 3 oddly"; mes "shaped grooves on"; @@ -84,7 +84,7 @@ hu_fild05,168,304,0 script Column#abyss1 111,{ close; } -hu_fild05,171,211,0 script Column#abyss2 111,1,1,{ +hu_fild05,171,211,0 script Column#abyss2 HIDDEN_NPC,1,1,{ mes "^3355FFThis column looks"; mes "very similar to the"; @@ -144,7 +144,7 @@ hu_fild05,171,211,0 script Column#abyss2 111,1,1,{ } } -hu_fild05,196,210,1 script AbyssWarp 45,2,2,{ +hu_fild05,196,210,1 script AbyssWarp WARPNPC,2,2,{ OnInit: disablenpc "AbyssWarp"; diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt index 93c5eccf2..d9f0f5bd3 100644 --- a/npc/warps/fields/amatsu_fild.txt +++ b/npc/warps/fields/amatsu_fild.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.1 //===== Description: ========================================= -//= [Aegis COnversion] +//= [Official Conversion] //= Warp Points for Amatsu Field //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] diff --git a/npc/warps/fields/ein_fild.txt b/npc/warps/fields/ein_fild.txt index c83a13b1e..f6a25c4a1 100644 --- a/npc/warps/fields/ein_fild.txt +++ b/npc/warps/fields/ein_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbroch Field Warp Script //===== By: ================================================== //= Sara-chan (1.0), SSUNNY@YOUNG(1.2) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for Lighthalzen Field //===== Additional Comments: ================================= diff --git a/npc/warps/fields/gefenia.txt b/npc/warps/fields/gefenia.txt index 832bdea74..ce89232e7 100644 --- a/npc/warps/fields/gefenia.txt +++ b/npc/warps/fields/gefenia.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Gefenia Warp Script //===== By: ================================================== //= Muad Dib (1.0) @@ -6,8 +6,6 @@ //= Nana (1.2) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= Warp Points for Gefenia //===== Additional Comments: ================================= diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt index e5d2d359b..1edc677e6 100644 --- a/npc/warps/fields/glastheim.txt +++ b/npc/warps/fields/glastheim.txt @@ -1,17 +1,16 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Glastheim Warp Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2.x +//= 1.5 //===== Description: ========================================= //= Warp Points for Glastheim //===== Additional Comments: ================================= //= Split off npc_warp.txt, 1.1 added gl18-2 [Lupus] //= optimized random warp [Lupus] fixed looped warps //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.5 Fixed random warp coordinates. [Euphy] //============================================================ //Glastheim @@ -52,10 +51,13 @@ gl_knt02,10,138,0 warp gl14-1 1,1,gl_knt01,7,148 gl_knt02,157,292,0 warp gl16-1 1,1,gl_knt01,150,286 gl_knt02,289,138,0 warp gl17-1 1,1,gl_knt01,292,144 gl_prison,149,183,0 warp gl18-1 1,1,gl_prison1,150,14 -gl_prison,10,70,4 script gl18-2 45,1,1,{ -if(rand(2)==1) goto w2; - warp "gl_cas01",236,192; end; -w2: warp "gl_cas01",164,191; end; +gl_prison,11,70,0 script gl18-2 WARPNPC,1,1,{ + switch(rand(4)) { + case 0: warp "gl_cas01",163,193; end; + case 1: warp "gl_cas01",238,192; end; + case 2: warp "gl_cas01",144,314; end; + case 3: warp "gl_cas01",367,301; end; + } } gl_prison1,150,10,0 warp gl18 1,1,gl_prison,149,178 gl_prison1,62,187,0 warp gl10 1,1,gl_sew01,258,255 diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt index 024f97c1f..d59563853 100644 --- a/npc/warps/fields/jawaii.txt +++ b/npc/warps/fields/jawaii.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Jawaii Warp Script //===== By: ================================================== //= Muad Dib (1.0) @@ -6,8 +6,6 @@ //= MasterOfMuppets (1.2) //===== Current Version: ===================================== //= 1.2b -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= Warp Points for Jawaii //===== Additional Comments: ================================= @@ -21,6 +19,6 @@ jawaii_in,113,61,0 warp jawaiiwarp002 1,1,jawaii,138,202 jawaii_in,133,107,0 warp jawaiiwarp003 1,1,jawaii,111,199 jawaii_in,88,117,0 warp jawaiiwarp004 1,1,jawaii,109,186 jawaii,192,215,0 warp jawaiiwarp005 1,1,jawaii_in,28,94 -jawaii_in,27,91,4 script jawaiiwarp006 45,1,1,{ +jawaii_in,27,91,4 script jawaiiwarp006 WARPNPC,1,1,{ if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94; } diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt index 10a5b5d7e..85f06cb87 100644 --- a/npc/warps/fields/lhalzen_fild.txt +++ b/npc/warps/fields/lhalzen_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen Field Warp Script //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for Lighthalzen Field //===== Additional Comments: ================================= diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt index 8e944bd81..3fd47b22d 100644 --- a/npc/warps/fields/lutie_fild.txt +++ b/npc/warps/fields/lutie_fild.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lutie Field Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 2+ //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Lutie Field //===== Additional Comments: ================================= //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] diff --git a/npc/warps/fields/man_fild.txt b/npc/warps/fields/man_fild.txt index 55e799a69..3e355700b 100644 --- a/npc/warps/fields/man_fild.txt +++ b/npc/warps/fields/man_fild.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Manuk Field Warp Script //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Manuk Field //===== Additional Comments: ================================= //= 1.0 First Version. diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt index 1c49ddc96..efd0bbf57 100644 --- a/npc/warps/fields/mtmjolnir.txt +++ b/npc/warps/fields/mtmjolnir.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Mt. Mjolnir Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.2a -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Mt. Mjolnir //===== Additional Comments: ================================= diff --git a/npc/warps/fields/spl_fild.txt b/npc/warps/fields/spl_fild.txt index 1860636ff..024f76bde 100644 --- a/npc/warps/fields/spl_fild.txt +++ b/npc/warps/fields/spl_fild.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Splendid Field Warp Script //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Splendide //===== Additional Comments: ================================= //= 1.0 First Version. diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt index 1282257e4..0ed3dc47c 100644 --- a/npc/warps/fields/umbala_fild.txt +++ b/npc/warps/fields/umbala_fild.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Umbala Field Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Umbala Field //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] diff --git a/npc/warps/guildcastles.txt b/npc/warps/guildcastles.txt index f41fc2a5d..a3d00cafb 100644 --- a/npc/warps/guildcastles.txt +++ b/npc/warps/guildcastles.txt @@ -4,8 +4,6 @@ //= Athena (1.0) //===== Current Version: ===================================== //= 2.7 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for Al de Baran, Payon, Prontera, Geffen, //= and Juno Guild Castles @@ -18,15 +16,14 @@ //= 2.3 Removed 2nd entrance to Novice Castle Geffen [Lupus] //= 2.4 Added Warps between Juno and it's new Castle Satelite map. [L0ne_W0lf] //= 2.4a Added more warps between Juno Satellite and Castle Interiors. [L0ne_W0lf] -//= castle 1, 4 and 5 entrances are questionable, and will be updated -//= as I get more information. +//= castle 1, 4 and 5 entrances are questionable, and will be updated +//= as I get more information. //= 2.4b Corrected Warp points for Juno castles 1, 4 and 5. [L0ne_W0lf] //= 2.5 Updated Schwaltzvalt warps and added Arunafeltz. [L0ne_W0lf] //= 2.6 Fixed warp position between Juno and Schwaltzvalt Realm. [Gepard] //= 2.7 Updated WoE:FE warps. [Masao] //============================================================ - //Prontera Castle Map prt_gld,159,298,0 warp prtg01_NorthField 1,1,prt_fild01,199,30 prt_gld,159,25,0 warp prtg02_Castle 1,1,prt_castle,102,178 @@ -369,7 +366,7 @@ aldeg_cas04,21,123,0 warp aldeg-4-11_aldeg-4-12 1,1,aldeg_cas04,125,168 aldeg_cas04,121,168,0 warp aldeg-4-12_aldeg-4-11 1,1,aldeg_cas04,25,123 aldeg_cas04,156,210,0 warp aldeg-4-13_aldeg-4-5 1,1,aldeg_cas04,169,97 aldeg_cas04,108,210,0 warp aldeg-4-14_aldeg-4-4 1,1,aldeg_cas04,186,92 -aldeg_cas04,132,231,0 script aldeg-4-15_aldeg-4- 45,1,1,{ +aldeg_cas04,132,231,0 script aldeg-4-15_aldeg-4- WARPNPC,1,1,{ OnTouch: switch (rand(1,5)) { @@ -442,7 +439,7 @@ arug_cas05,141,40,0 warp arug501 1,1,aru_gld,292,107 aru_gld,287,107,0 warp arug502 1,1,arug_cas05,141,45 arug_cas05,321,52,0 warp arug503 1,1,arug_cas05,141,45 -//================== 4 Novices Guild Castles ============================= +//==================4 Novices Guild Castles ============================= //Novices Guild: Al de Baran Guild Castles Map n_castle,184,16,0 warp naldg01 1,1,nguild_alde,34,248 nguild_alde,34,252,0 warp naldg01-1 1,1,n_castle,187,16 diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt index 19a5fdc6a..5ab756c96 100644 --- a/npc/warps/other/arena.txt +++ b/npc/warps/other/arena.txt @@ -3,16 +3,19 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Description: ========================================= -//= Warp Points related to Izlude Arena && Control Panel +//= Warp Points related to Izlude Arena & Control Panel //===== Additional Comments: ================================= //= 1.0 First version, done by SinSloth. [MasterOfMuppets] //= 1.1 updated welcome_arena warp coords (was 128,126) [Lupus] //= 1.2 Made some updates due to Izlude Battle Arena release. [SinSloth] -//= 1.3 Moved welcome_arena & bye_arena to pre-re [Streusel] +//= 1.3 Split Izlude warps into Pre-Renewal/Renewal paths. [Euphy] +//= 1.4 Added GM management function. [Euphy] //============================================================ +// Main Room Warps +//============================================================ arena_room,84,103,0 warp arn_room_11_1 1,1,arena_room,63,130 arena_room,63,126,0 warp arn_room_11_2 1,1,arena_room,87,100 arena_room,76,87,0 warp arn_room_9_1 1,1,arena_room,46,87 @@ -25,45 +28,67 @@ arena_room,123,88,0 warp arn_room_3_1 1,1,arena_room,153,87 arena_room,150,87,0 warp arn_room_3_2 1,1,arena_room,120,87 prt_are_in,54,13,0 warp toarn_room 1,1,arena_room,100,77 -sec_in02,79,180,3 script #arenacontrol 81,{ +// Acolyte Warps +//============================================================ +arena_room,135,126,0 warp byeaco#arena 1,1,arena_room,111,99 +force_5-1,25,44,0 warp force_01_02#aco 1,1,force_5-1,25,69 +force_5-1,25,134,0 warp force_02_03#aco 1,1,force_5-1,25,159 +force_5-1,44,174,0 warp force_03_04#aco 1,1,force_5-1,69,174 +force_5-1,134,174,0 warp force_04_05#aco 1,1,force_5-1,159,174 +force_5-1,174,155,0 warp force_05_06#aco 1,1,force_5-1,174,130 +force_5-1,174,65,0 warp force_06_07#aco 1,1,force_5-1,174,40 +force_5-1,155,26,0 warp force_07_08#aco 1,1,force_5-1,132,26 +force_5-1,99,54,0 warp force_08_09#aco 1,1,force_5-1,99,82 + +// Party Warps +//============================================================ +force_1-2,85,26,0 warp force_00_01 1,1,force_1-2,37,26 +force_1-2,114,26,0 warp force_00_02 1,1,force_1-2,162,26 +force_1-2,99,40,0 warp force_00_03 1,1,force_1-2,99,66 +force_1-2,41,26,0 warp force_01_00 1,1,force_1-2,89,26 +force_1-2,158,26,0 warp force_02_00 1,1,force_1-2,110,26 +force_1-2,99,63,0 warp force_03_00 1,1,force_1-2,99,36 +force_1-2,84,78,0 warp force_03_05 1,1,force_1-2,37,78 +force_1-2,115,78,0 warp force_03_04 1,1,force_1-2,162,78 +force_1-2,158,77,0 warp force_04_03 1,1,force_1-2,110,78 +force_1-2,41,77,0 warp force_05_03 1,1,force_1-2,37,78 +force_1-2,25,93,0 warp force_05_06 1,1,force_1-2,26,118 +force_1-2,49,130,0 warp force_06_07 1,1,force_1-2,91,125 +force_1-2,107,145,0 warp force_07_08 1,1,force_1-2,173,118 +force_1-2,158,178,0 warp force_08_09 1,1,force_1-2,133,178 +force_1-2,55,178,0 warp force_09_10 1,1,force_1-2,29,178 +force_1-2,33,178,0 warp force_10_09 1,1,force_1-2,59,178 -DLGTEMP: - input @input_arena; - if (@input_arena < 0 || @input_arena > 2000) goto DLGTEMP; //CHECK - if (@input_arena == 0) - { +// GM Control Panel +//============================================================ +sec_in02,79,180,3 script #arenacontrol 4_DOG01,{ + set .@i, callfunc("F_GM_NPC",1357,0); + if (.@i == -1) { mes "Error!"; close; - } - else if (@input_arena == 1357) - { + } else if (.@i == 0) { + mes "Closing control panel."; + close; + } else { mes "Opening Control Panel"; mes "' A - R - E - N - A '"; next; mes "Please select a"; mes "state for the arena."; next; - switch( select( "Open.","Closed.") ) - { - case 1: - mes "Currently"; - mes "opening arena."; - misceffect EF_ENHANCE; //CHECK - enablenpc "welcome_arena"; - next; - break; - case 2: - mes "Currently"; - mes "closing arena."; - misceffect EF_EXIT; //CHECK - disablenpc "welcome_arena"; - next; - break; + switch(select("Open.:Closed.")) { + case 1: + mes "Currently"; + mes "opening arena."; + specialeffect EF_ENHANCE; + enablenpc "welcome_arena"; + close; + case 2: + mes "Currently"; + mes "closing arena."; + specialeffect EF_EXIT; + disablenpc "welcome_arena"; + close; } } - else - { - mes "Closing control panel."; - close; - } } diff --git a/npc/warps/other/bossnia.txt b/npc/warps/other/bossnia.txt deleted file mode 100644 index 2566f2479..000000000 --- a/npc/warps/other/bossnia.txt +++ /dev/null @@ -1,16 +0,0 @@ -//===== Hercules Script ====================================== -//= Bossnia Warps -//===== By: ================================================== -//= Masao -//===== Current Version: ===================================== -//= 1.0 -//===== Description: ========================================= -//= Back Warp Points related to the Bossnia event. -//===== Additional Comments: ================================= -//= 1.0 First Version. -//============================================================ - -bossnia_01,204,204,0 warp bossnia01 1,1,prontera,155,180 -bossnia_02,204,204,0 warp bossnia02 1,1,prontera,155,180 -bossnia_03,204,204,0 warp bossnia03 1,1,prontera,155,180 -bossnia_04,204,204,0 warp bossnia04 1,1,prontera,155,180 diff --git a/npc/warps/other/god.txt b/npc/warps/other/god.txt index f649b7e57..2ee2faeea 100644 --- a/npc/warps/other/god.txt +++ b/npc/warps/other/god.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= God Seal Quest Warps //===== By: ================================================== //= MasterOfMuppets && SinSloth //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= //===== Description: ========================================= //= Warp Points related to the God Seal Quest. //===== Additional Comments: ================================= diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt index e3c36ab51..41a433d31 100644 --- a/npc/warps/other/jobquests.txt +++ b/npc/warps/other/jobquests.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Job Quest Warp Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 2.0 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Version Ep4+ +//= 2.1 //===== Description: ========================================= //= Warp Points for Job Quest Maps //===== Additional Comments: ================================= @@ -23,17 +21,42 @@ //= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 1.9 Added Gungslinger and Ninja warps. [L0ne_W0lf] //= 2.0 Updated Novice warps to use correct maps. [L0ne_W0lf] +//= 2.1 Added Novice warp duplicates. [Euphy] //============================================================ //============================================================================== //Novice //============================================================================== -new_1-1,148,112,0 warp newwarp6001 2,2,new_1-2,100,9 -new_1-2,100,6,0 warp newwarp6002 2,2,new_1-1,144,112 -new_1-2,126,106,0 warp newwarp6003 2,2,new_1-2,160,171 -new_1-2,156,171,0 warp newwarp6004 2,2,new_1-2,123,106 -new_1-2,73,106,0 warp newwarp6005 2,2,new_1-2,41,172 -new_1-2,46,172,0 warp newwarp6006 2,2,new_1-2,78,106 +new_1-1,148,112,0 warp newwarp6001a 2,2,new_1-2,100,9 +new_2-1,148,112,0 warp newwarp6001b 2,2,new_2-2,100,9 +new_3-1,148,112,0 warp newwarp6001c 2,2,new_3-2,100,9 +new_4-1,148,112,0 warp newwarp6001d 2,2,new_4-2,100,9 +new_5-1,148,112,0 warp newwarp6001e 2,2,new_5-2,100,9 +new_1-2,100,6,0 warp newwarp6002a 2,2,new_1-1,144,112 +new_2-2,100,6,0 warp newwarp6002b 2,2,new_2-1,144,112 +new_3-2,100,6,0 warp newwarp6002c 2,2,new_3-1,144,112 +new_4-2,100,6,0 warp newwarp6002d 2,2,new_4-1,144,112 +new_5-2,100,6,0 warp newwarp6002e 2,2,new_5-1,144,112 +new_1-2,126,106,0 warp newwarp6003a 2,2,new_1-2,160,171 +new_2-2,126,106,0 warp newwarp6003b 2,2,new_2-2,160,171 +new_3-2,126,106,0 warp newwarp6003c 2,2,new_3-2,160,171 +new_4-2,126,106,0 warp newwarp6003d 2,2,new_4-2,160,171 +new_5-2,126,106,0 warp newwarp6003e 2,2,new_5-2,160,171 +new_1-2,156,171,0 warp newwarp6004a 2,2,new_1-2,123,106 +new_2-2,156,171,0 warp newwarp6004b 2,2,new_2-2,123,106 +new_3-2,156,171,0 warp newwarp6004c 2,2,new_3-2,123,106 +new_4-2,156,171,0 warp newwarp6004d 2,2,new_4-2,123,106 +new_5-2,156,171,0 warp newwarp6004e 2,2,new_5-2,123,106 +new_1-2,73,106,0 warp newwarp6005a 2,2,new_1-2,41,172 +new_2-2,73,106,0 warp newwarp6005b 2,2,new_2-2,41,172 +new_3-2,73,106,0 warp newwarp6005c 2,2,new_3-2,41,172 +new_4-2,73,106,0 warp newwarp6005d 2,2,new_4-2,41,172 +new_5-2,73,106,0 warp newwarp6005e 2,2,new_5-2,41,172 +new_1-2,46,172,0 warp newwarp6006a 2,2,new_1-2,78,106 +new_2-2,46,172,0 warp newwarp6006b 2,2,new_2-2,78,106 +new_3-2,46,172,0 warp newwarp6006c 2,2,new_3-2,78,106 +new_4-2,46,172,0 warp newwarp6006d 2,2,new_4-2,78,106 +new_5-2,46,172,0 warp newwarp6006e 2,2,new_5-2,78,106 //============================================================================== //Thief diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt index 76df1b28f..3582ecfb9 100644 --- a/npc/warps/other/kiel.txt +++ b/npc/warps/other/kiel.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kiel Warp Script (Kiel Buildings) //===== By: ================================================== //= Playtester; L0ne_W0lf //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for all Kiel Buildings //===== Additional Comments: ================================= diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt index 011494794..69461b8a7 100644 --- a/npc/warps/other/other.txt +++ b/npc/warps/other/other.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Other Warp Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version; //===== Description: ========================================= //= Warp Points for Other Maps //===== Additional Comments: ================================= diff --git a/npc/warps/pvp.txt b/npc/warps/pvp.txt index 2d28a94d8..c8276ce23 100644 --- a/npc/warps/pvp.txt +++ b/npc/warps/pvp.txt @@ -4,8 +4,6 @@ //= Athena (any) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for Prontera Arena and PvP Maps //===== Additional Comments: ================================= @@ -13,7 +11,7 @@ //= 1.1 Fixed Prontera Arena warp [Yor] //= 1.2 Added addition warps for PvP Nightmare Mode maps. //= 1.3 Fixed duplicate warp names [Timexy] -//= 1.4 Disabled removed maps ordeal_*-3 and ordeal_*-4 [Streusel] +//= 1.4 Disabled ordeal_*-3 and ordeal_*-4 maps. //============================================================ //Battle Ordeal Mode @@ -161,15 +159,6 @@ ordeal_3-2,180,154,0 warp ord32-8 1,1,ordeal_3-2,284,164 //ordeal_3-4,172,135,0 warp ord34-6 1,1,ordeal_3-4,284,24 //ordeal_3-4,172,172,0 warp ord34-7 1,1,ordeal_3-4,284,284 //ordeal_3-4,180,154,0 warp ord34-8 1,1,ordeal_3-4,284,164 -//This map doesn't even exists. Is it ordeal_a02 or ordea_la00? -//ordeal_a04,128,154,0 warp orda1 0,0,ordeal_a04,24,154 -//ordeal_a04,136,136,0 warp orda2 0,0,ordeal_a04,24,24 -//ordeal_a04,136,172,0 warp orda3 0,0,ordeal_a04,24,284 -//ordeal_a04,153,128,0 warp orda4 0,0,ordeal_a04,153,23 -//ordeal_a04,153,180,0 warp orda5 0,0,ordeal_a04,144,284 -//ordeal_a04,172,135,0 warp orda6 0,0,ordeal_a04,284,24 -//ordeal_a04,172,172,0 warp orda7 0,0,ordeal_a04,284,284 -//ordeal_a04,180,154,0 warp orda8 0,0,ordeal_a04,284,164 // PvP Nightmare More warps pvp_n_8-4,33,122,0 warp Link#pt_link_1-11 0,2,pvp_n_8-4,0,0 |