summaryrefslogtreecommitdiff
path: root/npc/warps/dungeons
diff options
context:
space:
mode:
Diffstat (limited to 'npc/warps/dungeons')
-rw-r--r--npc/warps/dungeons/alde_dun.txt49
-rw-r--r--npc/warps/dungeons/ama_dun.txt2
-rw-r--r--npc/warps/dungeons/ayo_dun.txt4
-rw-r--r--npc/warps/dungeons/beach_dun.txt2
-rw-r--r--npc/warps/dungeons/c_tower.txt139
-rw-r--r--npc/warps/dungeons/ein_dun.txt4
-rw-r--r--npc/warps/dungeons/gef_dun.txt4
-rw-r--r--npc/warps/dungeons/gon_dun.txt6
-rw-r--r--npc/warps/dungeons/ice_dun.txt4
-rw-r--r--npc/warps/dungeons/in_sphinx.txt4
-rw-r--r--npc/warps/dungeons/iz_dun.txt4
-rw-r--r--npc/warps/dungeons/juperos.txt6
-rw-r--r--npc/warps/dungeons/kh_dun.txt8
-rw-r--r--npc/warps/dungeons/lhz_dun.txt63
-rw-r--r--npc/warps/dungeons/lou_dun.txt6
-rw-r--r--npc/warps/dungeons/mag_dun.txt4
-rw-r--r--npc/warps/dungeons/mjo_dun.txt4
-rw-r--r--npc/warps/dungeons/moc_pryd.txt4
-rw-r--r--npc/warps/dungeons/mosk_dun.txt30
-rw-r--r--npc/warps/dungeons/odin.txt8
-rw-r--r--npc/warps/dungeons/orcsdun.txt4
-rw-r--r--npc/warps/dungeons/pay_dun.txt30
-rw-r--r--npc/warps/dungeons/prt_maze.txt68
-rw-r--r--npc/warps/dungeons/ra_san.txt14
-rw-r--r--npc/warps/dungeons/tha_t.txt6
-rw-r--r--npc/warps/dungeons/thor_v.txt10
-rw-r--r--npc/warps/dungeons/treasure.txt4
-rw-r--r--npc/warps/dungeons/tur_dun.txt4
-rw-r--r--npc/warps/dungeons/um_dun.txt6
-rw-r--r--npc/warps/dungeons/xmas_dun.txt4
30 files changed, 212 insertions, 293 deletions
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..59277921d 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 ab707f62f..bc6925a22 100644
--- a/npc/warps/dungeons/tha_t.txt
+++ b/npc/warps/dungeons/tha_t.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Thanatos Tower Warps
//===== By: ==================================================
//= [Ishizu-chan]
//===== Current Version: =====================================
//= 1.1 Beta
-//===== Compatible With: =====================================
-//= Any rAthena Version i guess?
//===== Description: =========================================
-//= It's the Thanatos Tower Warps...
+//= Warp Points for Thanatos Tower
//===== Additional Comments: =================================
//= 1.0 - First Release [Ishizu-chan]
//= 1.1 - Added Entrance Warp Guard
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: =================================