summaryrefslogtreecommitdiff
path: root/npc/warps/dungeons
diff options
context:
space:
mode:
Diffstat (limited to 'npc/warps/dungeons')
-rw-r--r--npc/warps/dungeons/alberta_duns.txt114
-rw-r--r--npc/warps/dungeons/alde_ct.txt450
-rw-r--r--npc/warps/dungeons/amatsu_dun.txt40
-rw-r--r--npc/warps/dungeons/ant_hell.txt52
-rw-r--r--npc/warps/dungeons/coal_mine.txt42
-rw-r--r--npc/warps/dungeons/com_dun.txt36
-rw-r--r--npc/warps/dungeons/geffen_dun.txt88
-rw-r--r--npc/warps/dungeons/gon_dun.txt80
-rw-r--r--npc/warps/dungeons/izlude_dun.txt58
-rw-r--r--npc/warps/dungeons/louyang_dun.txt38
-rw-r--r--npc/warps/dungeons/lutie_dun.txt34
-rw-r--r--npc/warps/dungeons/morroc_duns.txt126
-rw-r--r--npc/warps/dungeons/orc_dun.txt50
-rw-r--r--npc/warps/dungeons/payon_dun.txt72
-rw-r--r--npc/warps/dungeons/prt_dun.txt306
-rw-r--r--npc/warps/dungeons/umbala_dun.txt64
-rw-r--r--npc/warps/dungeons/yuno_dun.txt36
17 files changed, 843 insertions, 843 deletions
diff --git a/npc/warps/dungeons/alberta_duns.txt b/npc/warps/dungeons/alberta_duns.txt
index 1392cab0f..d7d683104 100644
--- a/npc/warps/dungeons/alberta_duns.txt
+++ b/npc/warps/dungeons/alberta_duns.txt
@@ -1,58 +1,58 @@
-//==== Athena Script ========================================
-//= Alberta Field's Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Treasure Island & Turtle Island
-//===== Additional Comments: =================================
-//= Split of Alberta.txt
-//============================================================
-
-//Treasure Island Warp's
-treasure01.gat,112,164,0 warp tre01 1,4,treasure01.gat,97,164
-treasure01.gat,125,161,0 warp tre02 1,3,treasure01.gat,144,161
-treasure01.gat,142,161,0 warp tre02-1 1,3,treasure01.gat,123,161
-treasure01.gat,164,114,0 warp tre03 3,1,treasure01.gat,164,88
-treasure01.gat,164,91,0 warp tre03-1 5,1,treasure01.gat,164,116
-treasure01.gat,99,164,0 warp tre01-1 1,4,treasure01.gat,114,164
-treasure01.gat,76,111,0 warp tre10 1,3,treasure01.gat,100,111
-treasure01.gat,38,164,0 warp tre04-1 1,4,treasure01.gat,25,164
-treasure01.gat,41,111,0 warp tre05 1,3,treasure01.gat,63,111
-treasure01.gat,62,111,0 warp tre05-1 1,3,treasure01.gat,39,111
-treasure01.gat,27,164,0 warp tre04 1,4,treasure01.gat,40,164
-treasure01.gat,69,75,0 warp tre07 2,1,treasure01.gat,69,106
-treasure01.gat,69,125,0 warp tre08 4,1,treasure01.gat,69,142
-treasure01.gat,69,140,0 warp tre08-1 4,1,treasure01.gat,69,123
-treasure01.gat,98,111,0 warp tre10-1 1,3,treasure01.gat,74,111
-treasure01.gat,69,177,0 warp tre002 3,1,treasure02.gat,102,27
-treasure01.gat,41,37,0 warp tre06 1,3,treasure01.gat,61,37
-treasure01.gat,58,37,0 warp tre06-1 1,3,treasure01.gat,39,37
-treasure01.gat,69,102,0 warp tre07-1 2,1,treasure01.gat,69,77
-treasure01.gat,79,37,0 warp tre09 1,3,treasure01.gat,98,37
-treasure01.gat,96,37,0 warp tre09-1 1,3,treasure01.gat,77,37
-treasure01.gat,69,22,0 warp tre001 4,1,alb2trea.gat,85,107
-treasure02.gat,102,103,0 warp tre11 5,1,treasure02.gat,102,120
-treasure02.gat,102,118,0 warp tre11-1 5,1,treasure02.gat,102,101
-treasure02.gat,155,128,0 warp tre13-1 1,1,treasure02.gat,155,97
-treasure02.gat,155,99,0 warp tre13 1,1,treasure02.gat,155,130
-treasure02.gat,49,99,0 warp tre14-1 1,1,treasure02.gat,49,130
-treasure02.gat,102,24,0 warp tre003 3,1,treasure01.gat,69,179
-treasure02.gat,123,72,0 warp tre12 1,4,treasure02.gat,140,72
-treasure02.gat,138,72,0 warp tre12-1 1,4,treasure02.gat,121,72
-treasure02.gat,49,128,0 warp tre14 1,1,treasure02.gat,49,97
-treasure02.gat,65,72,0 warp tre15 1,4,treasure02.gat,82,72
-treasure02.gat,80,72,0 warp tre15-1 1,4,treasure02.gat,63,72
-
-//Turtle Island Warp's
-tur_dun01.gat,154,241,0 warp ttl01 1,1,tur_dun02.gat,148,264
-tur_dun02.gat,148,268,0 warp ttl01-1 1,1,tur_dun01.gat,154,237
-tur_dun02.gat,167,19,0 warp ttl02 1,1,tur_dun03.gat,132,189
-tur_dun03.gat,132,193,0 warp ttl02-1 1,1,tur_dun02.gat,167,23
-tur_dun03.gat,217,71,0 warp ttl03 1,1,tur_dun04.gat,100,192
-tur_dun04.gat,100,196,0 warp ttl03-1 1,1,tur_dun03.gat,215,75
-tur_dun05.gat,89,69,0 warp ttl05 1,1,tur_dun02.gat,148,264
+//==== Athena Script ========================================
+//= Alberta Field's Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Treasure Island & Turtle Island
+//===== Additional Comments: =================================
+//= Split of Alberta.txt
+//============================================================
+
+//Treasure Island Warp's
+treasure01.gat,112,164,0 warp tre01 1,4,treasure01.gat,97,164
+treasure01.gat,125,161,0 warp tre02 1,3,treasure01.gat,144,161
+treasure01.gat,142,161,0 warp tre02-1 1,3,treasure01.gat,123,161
+treasure01.gat,164,114,0 warp tre03 3,1,treasure01.gat,164,88
+treasure01.gat,164,91,0 warp tre03-1 5,1,treasure01.gat,164,116
+treasure01.gat,99,164,0 warp tre01-1 1,4,treasure01.gat,114,164
+treasure01.gat,76,111,0 warp tre10 1,3,treasure01.gat,100,111
+treasure01.gat,38,164,0 warp tre04-1 1,4,treasure01.gat,25,164
+treasure01.gat,41,111,0 warp tre05 1,3,treasure01.gat,63,111
+treasure01.gat,62,111,0 warp tre05-1 1,3,treasure01.gat,39,111
+treasure01.gat,27,164,0 warp tre04 1,4,treasure01.gat,40,164
+treasure01.gat,69,75,0 warp tre07 2,1,treasure01.gat,69,106
+treasure01.gat,69,125,0 warp tre08 4,1,treasure01.gat,69,142
+treasure01.gat,69,140,0 warp tre08-1 4,1,treasure01.gat,69,123
+treasure01.gat,98,111,0 warp tre10-1 1,3,treasure01.gat,74,111
+treasure01.gat,69,177,0 warp tre002 3,1,treasure02.gat,102,27
+treasure01.gat,41,37,0 warp tre06 1,3,treasure01.gat,61,37
+treasure01.gat,58,37,0 warp tre06-1 1,3,treasure01.gat,39,37
+treasure01.gat,69,102,0 warp tre07-1 2,1,treasure01.gat,69,77
+treasure01.gat,79,37,0 warp tre09 1,3,treasure01.gat,98,37
+treasure01.gat,96,37,0 warp tre09-1 1,3,treasure01.gat,77,37
+treasure01.gat,69,22,0 warp tre001 4,1,alb2trea.gat,85,107
+treasure02.gat,102,103,0 warp tre11 5,1,treasure02.gat,102,120
+treasure02.gat,102,118,0 warp tre11-1 5,1,treasure02.gat,102,101
+treasure02.gat,155,128,0 warp tre13-1 1,1,treasure02.gat,155,97
+treasure02.gat,155,99,0 warp tre13 1,1,treasure02.gat,155,130
+treasure02.gat,49,99,0 warp tre14-1 1,1,treasure02.gat,49,130
+treasure02.gat,102,24,0 warp tre003 3,1,treasure01.gat,69,179
+treasure02.gat,123,72,0 warp tre12 1,4,treasure02.gat,140,72
+treasure02.gat,138,72,0 warp tre12-1 1,4,treasure02.gat,121,72
+treasure02.gat,49,128,0 warp tre14 1,1,treasure02.gat,49,97
+treasure02.gat,65,72,0 warp tre15 1,4,treasure02.gat,82,72
+treasure02.gat,80,72,0 warp tre15-1 1,4,treasure02.gat,63,72
+
+//Turtle Island Warp's
+tur_dun01.gat,154,241,0 warp ttl01 1,1,tur_dun02.gat,148,264
+tur_dun02.gat,148,268,0 warp ttl01-1 1,1,tur_dun01.gat,154,237
+tur_dun02.gat,167,19,0 warp ttl02 1,1,tur_dun03.gat,132,189
+tur_dun03.gat,132,193,0 warp ttl02-1 1,1,tur_dun02.gat,167,23
+tur_dun03.gat,217,71,0 warp ttl03 1,1,tur_dun04.gat,100,192
+tur_dun04.gat,100,196,0 warp ttl03-1 1,1,tur_dun03.gat,215,75
+tur_dun05.gat,89,69,0 warp ttl05 1,1,tur_dun02.gat,148,264
tur_dun05.gat,9,45,0 warp ttl06 1,1,tur_dun01.gat,154,237 \ No newline at end of file
diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt
index 6232ff0e8..2a3301fcb 100644
--- a/npc/warps/dungeons/alde_ct.txt
+++ b/npc/warps/dungeons/alde_ct.txt
@@ -1,226 +1,226 @@
-//===== Athena Script ========================================
-//= Al de Baran Clock Tower Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
-//===== Description: =========================================
-//= Warp Points for Clock Tower
-//===== Additional Comments: =================================
-//= Split off Aldebaran.txt
-//= 1.1 fixed clt007 warp
-//============================================================
-
-//= Al De Baran Clock Tower
-aldebaran.gat,139,135,0 warp ald002 1,1,c_tower1.gat,199,159
-c_tower1.gat,200,157,0 warp ald003 1,1,aldebaran.gat,139,131
-c_tower1.gat,235,226,0 warp clt001 1,1,c_tower2.gat,268,26
-c_tower1.gat,123,22,0 warp clt002 1,1,alde_dun01.gat,297,25
-c_tower2.gat,142,283,0 warp clt003 1,1,c_tower3.gat,65,147
-c_tower2.gat,24,24,0 warp clt004 1,1,alde_dun03.gat,277,178
-c_tower2.gat,273,26,0 warp clt005 1,1,c_tower1.gat,235,223
-
-//============================================================
-//= Level 2 ==================================================
-//= Random 2-1 ===============================================
-c_tower2.gat,13,288,4 script clt006r 45,1,1,{
- set @r,rand(3);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- w1: warp "c_tower2.gat",13,282; break;
- w2: warp "alde_dun03.gat",175,131; break;
- w3: warp "c_tower3.gat",235,7; break;
-}
-//============================================================
-//= Random 2-2 ===============================================
-c_tower2.gat,223,267,4 script clt007r 45,1,1,{
- set @r,rand(3);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- w1: warp "c_tower2.gat",288,267; break;
- w2: warp "alde_dun03.gat",130,130; break;
- w3: warp "c_tower3.gat",252,29; break;
-}
-//============================================================
-//= Level 3 ==================================================
-c_tower3.gat,60,147,0 warp clt009 1,1,c_tower2.gat,148,283
-c_tower3.gat,212,159,0 warp clt010 1,1,alde_dun03.gat,276,53
-c_tower3.gat,7,39,0 warp clt011 1,1,alde_dun01.gat,171,158
-c_tower3.gat,42,41,0 warp clt012 1,1,alde_dun02.gat,127,169
-c_tower3.gat,146,8,0 warp clt013 1,1,c_tower1.gat,235,223
-//============================================================
-//= Random 3-1 ===============================================
-c_tower3.gat,163,252,4 script clt014r 45,1,1,{
- set @r,rand(2);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- w1: warp "c_tower3.gat",168,252; break;
- w2: warp "alde_dun02.gat",262,41; break;
-}
-//============================================================
-//= Random 3-2 ===============================================
-c_tower3.gat,240,7,4 script clt015r 45,1,1,{
- set @r,rand(3);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- w1: warp "c_tower2.gat",13,282; break;
- w2: warp "alde_dun03.gat",175,131; break;
- w3: warp "c_tower3.gat",235,7; break;
-}
-//============================================================
-//= Random 3-3 ===============================================
-c_tower3.gat,252,24,4 script clt016r 45,1,1,{
- set @r,rand(3);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- w1: warp "c_tower2.gat",228,267; break;
- w2: warp "alde_dun03.gat",130,130; break;
- w3: warp "c_tower3.gat",252,29; break;
-}
-//============================================================
-//= Level 4 ==================================================
-c_tower4.gat,37,70,0 warp clt017 1,1,alde_dun03.gat,277,54
-c_tower4.gat,51,156,0 warp clt018 1,1,alde_dun01.gat,171,158
-c_tower4.gat,68,46,0 warp clt019 1,1,c_tower4.gat,73,154
-c_tower4.gat,70,19,0 warp clt020 2,2,c_tower3.gat,151,8
-c_tower4.gat,79,49,0 warp clt021 2,2,c_tower4.gat,204,60
-c_tower4.gat,133,202,0 warp clt022 1,1,c_tower4.gat,140,149
-c_tower4.gat,153,107,0 warp clt023 1,1,c_tower2.gat,228,267
-c_tower4.gat,171,179,0 warp clt024 1,1,alde_dun03.gat,276,53
-c_tower4.gat,198,59,0 warp clt025 1,1,c_tower4.gat,152,98
-c_tower4.gat,204,57,0 warp clt026 1,1,c_tower4.gat,65,77
-//============================================================
-//= Random 4-1 ===============================================
-c_tower4.gat,75,156,4 script clt027r 45,0,0,{
- set @r,rand(4);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- if(@r==3) goto w4;
- w1: warp "c_tower3.gat",168,252; break;
- w2: warp "alde_dun02.gat",262,41; break;
- w3: warp "c_tower4.gat",73,154; break;
- w4: warp "c_tower4.gat",140,149; break;
-}
-//============================================================
-//= Random 4-2 ===============================================
-c_tower4.gat,68,79,4 script clt028r 45,0,0,{
- set @r,rand(4);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- if(@r==3) goto w4;
- w1: warp "c_tower2.gat",13,282; break;
- w2: warp "alde_dun03.gat",175,131; break;
- w3: warp "c_tower3.gat",235,7; break;
- w4: warp "c_tower4.gat",65,77; break;
-}
-//============================================================
-//= Random 4-3 ===============================================
-c_tower4.gat,142,151,4 script clt029r 45,0,0,{
- set @r,rand(4);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- if(@r==3) goto w4;
- w1: warp "c_tower3.gat",168,252; break;
- w2: warp "alde_dun02.gat",262,41; break;
- w3: warp "c_tower4.gat",73,154; break;
- w4: warp "c_tower4.gat",140,149; break;
-}
-//============================================================
-//= Random 4-4 ===============================================
-c_tower4.gat,151,96,4 script clt030r 45,0,0,{
- set @r,rand(4);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- if(@r==3) goto w4;
- w1: warp "c_tower2.gat",228,267; break;
- w2: warp "alde_dun03.gat",130,130; break;
- w3: warp "c_tower3.gat",252,29; break;
- w4: warp "c_tower4.gat",152,95; break;
-}
-//============================================================
-//= Random 4-5 ===============================================
-c_tower4.gat,189,40,4 script clt031r 45,2,2,{
- set @r,rand(4);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- if(@r==3) goto w4;
- w1: warp "c_tower2.gat",228,267; break;
- w2: warp "alde_dun03.gat",130,130; break;
- w3: warp "c_tower3.gat",252,29; break;
- w4: warp "c_tower4.gat",152,95; break;
-}
-//============================================================
-//============================================================
-alde_dun01.gat,292,306,0 warp aldd01 2,1,alde_dun02.gat,43,24
-alde_dun01.gat,167,158,0 warp ald002 2,2,c_tower2.gat,148,283
-alde_dun01.gat,302,25,0 warp ald003 2,2,c_tower1.gat,125,22
-alde_dun02.gat,43,20,0 warp aldd04 1,1,alde_dun01.gat,292,300
-alde_dun02.gat,279,250,0 warp aldd05 2,2,alde_dun03.gat,18,267
-alde_dun02.gat,122,169,0 warp ald006 2,2,c_tower3.gat,47,41
-alde_dun02.gat,187,234,0 warp ald007 2,2,c_tower3.gat,65,147
-//============================================================
-//= Random B2 ================================================
-alde_dun02.gat,267,41,4 script clt008r 45,1,1,{
- set @r,rand(2);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- w1: warp "c_tower3.gat",168,252; break;
- w2: warp "alde_dun02.gat",262,141; break;
-}
-alde_dun03.gat,12,267,0 warp aldd09 2,2,alde_dun02.gat,273,250
-alde_dun03.gat,277,183,0 warp ald010 2,2,c_tower2.gat,27,27
-alde_dun03.gat,191,31,0 warp ald011 2,2,c_tower3.gat,217,159
-alde_dun03.gat,276,48,0 warp ald012 2,2,c_tower1.gat,235,223
-//============================================================
-//7(npc)
-//= Random B3-1 ================================================
-alde_dun03.gat,130,125,4 script clt014r 45,1,1,{
- set @r,rand(3);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- w1: warp "c_tower2.gat",228,267; break;
- w2: warp "alde_dun03.gat",130,130; break;
- w3: warp "c_tower3.gat",252,29; break;
-}
-//============================================================
-//= Random 3-2 ===============================================
-alde_dun03.gat,171,127,4 script clt015r 45,1,1,{
- set @r,rand(4);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- w1: warp "c_tower2.gat",13,282; break;
- w2: warp "alde_dun03.gat",175,131; break;
- w3: warp "c_tower3.gat",235,7; break;
-}
-alde_dun04.gat,80,273,0 warp aldd016 2,2,alde_dun03.gat,263,26
-alde_dun04.gat,207,225,0 warp ald017 1,1,c_tower3.gat,7,34
-alde_dun04.gat,215,192,0 warp ald018 1,1,c_tower2.gat,148,283
-alde_dun04.gat,32,74,0 warp aldd19 1,1,alde_dun02.gat,187,239
-alde_dun04.gat,208,58,0 warp aldd20 2,2,alde_dun04.gat,268,74
-alde_dun04.gat,272,74,0 warp aldd021 2,2,alde_dun04.gat,204,62
-alde_dun04.gat,80,34,4 script clt022r 45,1,1,{
- set @r,rand(4);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- if(@r==3) goto w4;
- w1: warp "c_tower2.gat",13,282; break;
- w2: warp "alde_dun03.gat",175,131; break;
- w3: warp "c_tower3.gat",235,7; break;
- w4: warp "alde_dun04.gat",84,36; break;
-}
-//============================================================
+//===== Athena Script ========================================
+//= Al de Baran Clock Tower Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Clock Tower
+//===== Additional Comments: =================================
+//= Split off Aldebaran.txt
+//= 1.1 fixed clt007 warp
+//============================================================
+
+//= Al De Baran Clock Tower
+aldebaran.gat,139,135,0 warp ald002 1,1,c_tower1.gat,199,159
+c_tower1.gat,200,157,0 warp ald003 1,1,aldebaran.gat,139,131
+c_tower1.gat,235,226,0 warp clt001 1,1,c_tower2.gat,268,26
+c_tower1.gat,123,22,0 warp clt002 1,1,alde_dun01.gat,297,25
+c_tower2.gat,142,283,0 warp clt003 1,1,c_tower3.gat,65,147
+c_tower2.gat,24,24,0 warp clt004 1,1,alde_dun03.gat,277,178
+c_tower2.gat,273,26,0 warp clt005 1,1,c_tower1.gat,235,223
+
+//============================================================
+//= Level 2 ==================================================
+//= Random 2-1 ===============================================
+c_tower2.gat,13,288,4 script clt006r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+}
+//============================================================
+//= Random 2-2 ===============================================
+c_tower2.gat,223,267,4 script clt007r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",288,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+}
+//============================================================
+//= Level 3 ==================================================
+c_tower3.gat,60,147,0 warp clt009 1,1,c_tower2.gat,148,283
+c_tower3.gat,212,159,0 warp clt010 1,1,alde_dun03.gat,276,53
+c_tower3.gat,7,39,0 warp clt011 1,1,alde_dun01.gat,171,158
+c_tower3.gat,42,41,0 warp clt012 1,1,alde_dun02.gat,127,169
+c_tower3.gat,146,8,0 warp clt013 1,1,c_tower1.gat,235,223
+//============================================================
+//= Random 3-1 ===============================================
+c_tower3.gat,163,252,4 script clt014r 45,1,1,{
+ set @r,rand(2);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ w1: warp "c_tower3.gat",168,252; break;
+ w2: warp "alde_dun02.gat",262,41; break;
+}
+//============================================================
+//= Random 3-2 ===============================================
+c_tower3.gat,240,7,4 script clt015r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+}
+//============================================================
+//= Random 3-3 ===============================================
+c_tower3.gat,252,24,4 script clt016r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",228,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+}
+//============================================================
+//= Level 4 ==================================================
+c_tower4.gat,37,70,0 warp clt017 1,1,alde_dun03.gat,277,54
+c_tower4.gat,51,156,0 warp clt018 1,1,alde_dun01.gat,171,158
+c_tower4.gat,68,46,0 warp clt019 1,1,c_tower4.gat,73,154
+c_tower4.gat,70,19,0 warp clt020 2,2,c_tower3.gat,151,8
+c_tower4.gat,79,49,0 warp clt021 2,2,c_tower4.gat,204,60
+c_tower4.gat,133,202,0 warp clt022 1,1,c_tower4.gat,140,149
+c_tower4.gat,153,107,0 warp clt023 1,1,c_tower2.gat,228,267
+c_tower4.gat,171,179,0 warp clt024 1,1,alde_dun03.gat,276,53
+c_tower4.gat,198,59,0 warp clt025 1,1,c_tower4.gat,152,98
+c_tower4.gat,204,57,0 warp clt026 1,1,c_tower4.gat,65,77
+//============================================================
+//= Random 4-1 ===============================================
+c_tower4.gat,75,156,4 script clt027r 45,0,0,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower3.gat",168,252; break;
+ w2: warp "alde_dun02.gat",262,41; break;
+ w3: warp "c_tower4.gat",73,154; break;
+ w4: warp "c_tower4.gat",140,149; break;
+}
+//============================================================
+//= Random 4-2 ===============================================
+c_tower4.gat,68,79,4 script clt028r 45,0,0,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+ w4: warp "c_tower4.gat",65,77; break;
+}
+//============================================================
+//= Random 4-3 ===============================================
+c_tower4.gat,142,151,4 script clt029r 45,0,0,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower3.gat",168,252; break;
+ w2: warp "alde_dun02.gat",262,41; break;
+ w3: warp "c_tower4.gat",73,154; break;
+ w4: warp "c_tower4.gat",140,149; break;
+}
+//============================================================
+//= Random 4-4 ===============================================
+c_tower4.gat,151,96,4 script clt030r 45,0,0,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower2.gat",228,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+ w4: warp "c_tower4.gat",152,95; break;
+}
+//============================================================
+//= Random 4-5 ===============================================
+c_tower4.gat,189,40,4 script clt031r 45,2,2,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower2.gat",228,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+ w4: warp "c_tower4.gat",152,95; break;
+}
+//============================================================
+//============================================================
+alde_dun01.gat,292,306,0 warp aldd01 2,1,alde_dun02.gat,43,24
+alde_dun01.gat,167,158,0 warp ald002 2,2,c_tower2.gat,148,283
+alde_dun01.gat,302,25,0 warp ald003 2,2,c_tower1.gat,125,22
+alde_dun02.gat,43,20,0 warp aldd04 1,1,alde_dun01.gat,292,300
+alde_dun02.gat,279,250,0 warp aldd05 2,2,alde_dun03.gat,18,267
+alde_dun02.gat,122,169,0 warp ald006 2,2,c_tower3.gat,47,41
+alde_dun02.gat,187,234,0 warp ald007 2,2,c_tower3.gat,65,147
+//============================================================
+//= Random B2 ================================================
+alde_dun02.gat,267,41,4 script clt008r 45,1,1,{
+ set @r,rand(2);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ w1: warp "c_tower3.gat",168,252; break;
+ w2: warp "alde_dun02.gat",262,141; break;
+}
+alde_dun03.gat,12,267,0 warp aldd09 2,2,alde_dun02.gat,273,250
+alde_dun03.gat,277,183,0 warp ald010 2,2,c_tower2.gat,27,27
+alde_dun03.gat,191,31,0 warp ald011 2,2,c_tower3.gat,217,159
+alde_dun03.gat,276,48,0 warp ald012 2,2,c_tower1.gat,235,223
+//============================================================
+//7(npc)
+//= Random B3-1 ================================================
+alde_dun03.gat,130,125,4 script clt014r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",228,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+}
+//============================================================
+//= Random 3-2 ===============================================
+alde_dun03.gat,171,127,4 script clt015r 45,1,1,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+}
+alde_dun04.gat,80,273,0 warp aldd016 2,2,alde_dun03.gat,263,26
+alde_dun04.gat,207,225,0 warp ald017 1,1,c_tower3.gat,7,34
+alde_dun04.gat,215,192,0 warp ald018 1,1,c_tower2.gat,148,283
+alde_dun04.gat,32,74,0 warp aldd19 1,1,alde_dun02.gat,187,239
+alde_dun04.gat,208,58,0 warp aldd20 2,2,alde_dun04.gat,268,74
+alde_dun04.gat,272,74,0 warp aldd021 2,2,alde_dun04.gat,204,62
+alde_dun04.gat,80,34,4 script clt022r 45,1,1,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+ w4: warp "alde_dun04.gat",84,36; break;
+}
+//============================================================
//============================================================ \ No newline at end of file
diff --git a/npc/warps/dungeons/amatsu_dun.txt b/npc/warps/dungeons/amatsu_dun.txt
index 123c2634c..981b3cd19 100644
--- a/npc/warps/dungeons/amatsu_dun.txt
+++ b/npc/warps/dungeons/amatsu_dun.txt
@@ -1,21 +1,21 @@
-//===== Athena Script ========================================
-//= Amatsu Dungeon Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
-//===== Description: =========================================
-//= Warp Points for Amatsu
-//===== Additional Comments: =================================
-//= Split off amatsu.txt
-//============================================================
-
-//= Amatsu Dungeon ===========================================
-//disabled due to amatsu dungeon quest
-//ama_dun01.gat,228,6,0 warp warp8007 1,1,ama_test.gat,50,87
-ama_dun01.gat,234,143,0 warp warp8008 1,1,ama_dun02.gat,31,41
-ama_dun02.gat,196,124,0 warp warp8010 1,1,ama_dun03.gat,119,14
-ama_dun02.gat,29,41,0 warp warp8009 1,1,ama_dun01.gat,231,143
+//===== Athena Script ========================================
+//= Amatsu Dungeon Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Amatsu
+//===== Additional Comments: =================================
+//= Split off amatsu.txt
+//============================================================
+
+//= Amatsu Dungeon ===========================================
+//disabled due to amatsu dungeon quest
+//ama_dun01.gat,228,6,0 warp warp8007 1,1,ama_test.gat,50,87
+ama_dun01.gat,234,143,0 warp warp8008 1,1,ama_dun02.gat,31,41
+ama_dun02.gat,196,124,0 warp warp8010 1,1,ama_dun03.gat,119,14
+ama_dun02.gat,29,41,0 warp warp8009 1,1,ama_dun01.gat,231,143
ama_dun03.gat,119,9,0 warp warp8011 1,1,ama_dun02.gat,196,121 \ No newline at end of file
diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/ant_hell.txt
index 847fb5f02..f32615499 100644
--- a/npc/warps/dungeons/ant_hell.txt
+++ b/npc/warps/dungeons/ant_hell.txt
@@ -1,27 +1,27 @@
-//===== Athena Script ========================================
-//= Ant Hell Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Ant Hell
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//= Ant Hell =================================================
-anthell01.gat,35,267,0 script ant001 45,1,1,{
- if( anthell==1) goto moc15;
- moc04: warp "moc_fild04.gat",213,327; break;
- moc15: warp "moc_fild15.gat",251,248; break;
-}
-anthell02.gat,171,169,0 script ant001 45,1,2,{
- if(!anthell==0) goto moc15;
- moc04: warp "moc_fild04.gat",213,327; break;
- moc15: warp "moc_fild15.gat",251,248; break;
-}
-anthell01.gat,253,32,0 warp ant01 2,1,anthell02.gat,34,263
+//===== Athena Script ========================================
+//= Ant Hell Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Ant Hell
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Ant Hell =================================================
+anthell01.gat,35,267,0 script ant001 45,1,1,{
+ if( anthell==1) goto moc15;
+ moc04: warp "moc_fild04.gat",213,327; break;
+ moc15: warp "moc_fild15.gat",251,248; break;
+}
+anthell02.gat,171,169,0 script ant001 45,1,2,{
+ if(!anthell==0) goto moc15;
+ moc04: warp "moc_fild04.gat",213,327; break;
+ moc15: warp "moc_fild15.gat",251,248; break;
+}
+anthell01.gat,253,32,0 warp ant01 2,1,anthell02.gat,34,263
anthell02.gat,32,267,0 warp ant01-1 2,2,anthell01.gat,253,35 \ No newline at end of file
diff --git a/npc/warps/dungeons/coal_mine.txt b/npc/warps/dungeons/coal_mine.txt
index 7ad8ef934..294bd1a6f 100644
--- a/npc/warps/dungeons/coal_mine.txt
+++ b/npc/warps/dungeons/coal_mine.txt
@@ -1,22 +1,22 @@
-//===== Athena Script ========================================
-//= Coal Mine Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Coal Mines
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//= Coal Mine ================================================
-mjo_dun01.gat,14,283,0 warp mjod01 2,4,mjo_dun02.gat,381,343
-mjo_dun01.gat,52,14,0 warp mjod001 4,2,mjolnir_02.gat,79,363
-mjo_dun02.gat,31,21,0 warp mjod02 1,1,mjo_dun03.gat,302,262
-mjo_dun02.gat,384,343,0 warp mjod01-1 2,4,mjo_dun01.gat,17,283
-mjo_dun02.gat,39,21,0 warp mjod03 1,1,mjo_dun03.gat,308,262
-mjo_dun03.gat,302,264,0 warp mjod02-1 1,1,mjo_dun02.gat,31,23
+//===== Athena Script ========================================
+//= Coal Mine Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Coal Mines
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Coal Mine ================================================
+mjo_dun01.gat,14,283,0 warp mjod01 2,4,mjo_dun02.gat,381,343
+mjo_dun01.gat,52,14,0 warp mjod001 4,2,mjolnir_02.gat,79,363
+mjo_dun02.gat,31,21,0 warp mjod02 1,1,mjo_dun03.gat,302,262
+mjo_dun02.gat,384,343,0 warp mjod01-1 2,4,mjo_dun01.gat,17,283
+mjo_dun02.gat,39,21,0 warp mjod03 1,1,mjo_dun03.gat,308,262
+mjo_dun03.gat,302,264,0 warp mjod02-1 1,1,mjo_dun02.gat,31,23
mjo_dun03.gat,308,264,0 warp mjod03-1 1,1,mjo_dun02.gat,39,23 \ No newline at end of file
diff --git a/npc/warps/dungeons/com_dun.txt b/npc/warps/dungeons/com_dun.txt
index faaf38422..93621db03 100644
--- a/npc/warps/dungeons/com_dun.txt
+++ b/npc/warps/dungeons/com_dun.txt
@@ -1,19 +1,19 @@
-//===== Athena Script ========================================
-//= Comodo Dungeon Warp
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points Comodo Dungeon
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//Beach Dungeon ==================================================
-beach_dun.gat,276,67,0 warp cmd004 1,1,comodo.gat,31,215
-beach_dun2.gat,154,13,0 warp cmd005 2,1,comodo.gat,176,353
-beach_dun3.gat,17,265,0 warp cmd007 1,1,comodo.gat,328,175
+//===== Athena Script ========================================
+//= Comodo Dungeon Warp
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points Comodo Dungeon
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//Beach Dungeon ==================================================
+beach_dun.gat,276,67,0 warp cmd004 1,1,comodo.gat,31,215
+beach_dun2.gat,154,13,0 warp cmd005 2,1,comodo.gat,176,353
+beach_dun3.gat,17,265,0 warp cmd007 1,1,comodo.gat,328,175
beach_dun3.gat,286,57,0 warp cmd006 1,1,cmd_fild01.gat,30,317 \ No newline at end of file
diff --git a/npc/warps/dungeons/geffen_dun.txt b/npc/warps/dungeons/geffen_dun.txt
index 05819d167..694a2692a 100644
--- a/npc/warps/dungeons/geffen_dun.txt
+++ b/npc/warps/dungeons/geffen_dun.txt
@@ -1,45 +1,45 @@
-//===== Athena Script ========================================
-//= Geffen Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Geffen Tower
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//= Geffen Tower =============================================
-gef_tower.gat,106,115,0 warp geft01 1,1,gef_tower.gat,106,72
-gef_tower.gat,106,69,0 warp geft01-1 1,1,gef_tower.gat,106,112
-gef_tower.gat,44,36,0 warp geft02 1,1,gef_tower.gat,106,162
-gef_tower.gat,106,158,0 warp geft02-1 1,1,gef_tower.gat,44,33
-gef_tower.gat,118,68,0 warp geft03 1,1,gef_tower.gat,116,28
-gef_tower.gat,116,31,0 warp geft03-1 1,1,gef_tower.gat,118,71
-gef_tower.gat,120,158,0 warp geft04 1,1,gef_tower.gat,118,111
-gef_tower.gat,118,114,0 warp geft04-1 1,1,gef_tower.gat,120,161
-gef_tower.gat,158,104,0 warp geft05 2,2,gef_tower.gat,156,90
-gef_tower.gat,156,93,0 warp geft05-1 2,2,gef_tower.gat,158,107
-gef_tower.gat,158,150,0 warp geft06 1,2,gef_tower.gat,158,124
-gef_tower.gat,158,128,0 warp geft06-1 2,1,gef_tower.gat,158,153
-gef_tower.gat,158,174,0 warp geft07 2,1,gef_tower.gat,52,140
-gef_tower.gat,52,136,0 warp geft07-1 2,1,gef_tower.gat,158,169
-gef_tower.gat,38,160,0 warp geft08 2,1,gef_tower.gat,42,90
-gef_tower.gat,42,86,0 warp geft08-1 1,1,gef_tower.gat,38,157
-gef_tower.gat,66,156,0 warp geft08-2 2,1,gef_tower.gat,42,90
-gef_tower.gat,153,28,0 warp gef005 4,2,gef_dun00.gat,104,99
-gef_tower.gat,52,181,0 warp gef006 4,1,geffen.gat,120,110
-gef_tower.gat,60,32,0 warp geft09 1,1,gef_tower.gat,62,90
-gef_tower.gat,62,87,0 warp geft09-1 1,1,gef_tower.gat,60,30
-
-//= Geffen Dungeon =============================================
-gef_dun00.gat,104,103,0 warp gef024 3,3,gef_tower.gat,153,31
-gef_dun00.gat,107,169,0 warp gefd01 2,1,gef_dun01.gat,115,236
-gef_dun01.gat,115,240,0 warp gefd01-1 2,2,gef_dun00.gat,107,165
-gef_dun01.gat,197,38,0 warp gefd02 2,1,gef_dun02.gat,106,132
-gef_dun02.gat,106,134,0 warp gefd02-1 2,1,gef_dun01.gat,197,40
-gef_dun02.gat,215,67,0 warp gefd03 2,1,gef_dun03.gat,203,200
+//===== Athena Script ========================================
+//= Geffen Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen Tower
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Geffen Tower =============================================
+gef_tower.gat,106,115,0 warp geft01 1,1,gef_tower.gat,106,72
+gef_tower.gat,106,69,0 warp geft01-1 1,1,gef_tower.gat,106,112
+gef_tower.gat,44,36,0 warp geft02 1,1,gef_tower.gat,106,162
+gef_tower.gat,106,158,0 warp geft02-1 1,1,gef_tower.gat,44,33
+gef_tower.gat,118,68,0 warp geft03 1,1,gef_tower.gat,116,28
+gef_tower.gat,116,31,0 warp geft03-1 1,1,gef_tower.gat,118,71
+gef_tower.gat,120,158,0 warp geft04 1,1,gef_tower.gat,118,111
+gef_tower.gat,118,114,0 warp geft04-1 1,1,gef_tower.gat,120,161
+gef_tower.gat,158,104,0 warp geft05 2,2,gef_tower.gat,156,90
+gef_tower.gat,156,93,0 warp geft05-1 2,2,gef_tower.gat,158,107
+gef_tower.gat,158,150,0 warp geft06 1,2,gef_tower.gat,158,124
+gef_tower.gat,158,128,0 warp geft06-1 2,1,gef_tower.gat,158,153
+gef_tower.gat,158,174,0 warp geft07 2,1,gef_tower.gat,52,140
+gef_tower.gat,52,136,0 warp geft07-1 2,1,gef_tower.gat,158,169
+gef_tower.gat,38,160,0 warp geft08 2,1,gef_tower.gat,42,90
+gef_tower.gat,42,86,0 warp geft08-1 1,1,gef_tower.gat,38,157
+gef_tower.gat,66,156,0 warp geft08-2 2,1,gef_tower.gat,42,90
+gef_tower.gat,153,28,0 warp gef005 4,2,gef_dun00.gat,104,99
+gef_tower.gat,52,181,0 warp gef006 4,1,geffen.gat,120,110
+gef_tower.gat,60,32,0 warp geft09 1,1,gef_tower.gat,62,90
+gef_tower.gat,62,87,0 warp geft09-1 1,1,gef_tower.gat,60,30
+
+//= Geffen Dungeon =============================================
+gef_dun00.gat,104,103,0 warp gef024 3,3,gef_tower.gat,153,31
+gef_dun00.gat,107,169,0 warp gefd01 2,1,gef_dun01.gat,115,236
+gef_dun01.gat,115,240,0 warp gefd01-1 2,2,gef_dun00.gat,107,165
+gef_dun01.gat,197,38,0 warp gefd02 2,1,gef_dun02.gat,106,132
+gef_dun02.gat,106,134,0 warp gefd02-1 2,1,gef_dun01.gat,197,40
+gef_dun02.gat,215,67,0 warp gefd03 2,1,gef_dun03.gat,203,200
gef_dun03.gat,203,204,0 warp gefd03-1 2,1,gef_dun02.gat,215,63 \ No newline at end of file
diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt
index 6474ca29e..709e36767 100644
--- a/npc/warps/dungeons/gon_dun.txt
+++ b/npc/warps/dungeons/gon_dun.txt
@@ -1,40 +1,40 @@
-//===== Athena Script ========================================
-//= Gonryun Dungeon Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
-//===== Description: =========================================
-//= Warp Points for Gonryun
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//= Gonryun Dungeon ==========================================
-gon_dun01.gat,153,45,0 warp gon20 1,1,gonryun.gat,159,198
-gon_dun01.gat,162,273,0 warp gon21 1,1,gon_dun02.gat,17,113
-gon_dun02.gat,14,113,0 warp gon22 1,1,gon_dun01.gat,162,270
-gon_dun02.gat,56,119,0 warp gon23 1,1,gon_dun02.gat,47,210/*‘ŠŒÝF*/
-gon_dun02.gat,92,190,0 warp gon24 1,1,gon_dun02.gat,199,20/*‘ŠŒÝE*/
-gon_dun02.gat,44,213,0 warp gon25 1,1,gon_dun02.gat,51,119/*‘ŠŒÝF*/
-gon_dun02.gat,44,166,0 warp gon26 1,1,gon_dun02.gat,97,121/*Šm’è*/
-gon_dun02.gat,94,118,0 warp gon27 1,1,gon_dun02.gat,177,189/*Šm’è*/
-gon_dun02.gat,76,100,0 warp gon28 1,1,gon_dun02.gat,145,62/*Šm’è*/
-gon_dun02.gat,63,66,0 warp gon29 1,1,gon_dun02.gat,203,94/*‘ŠŒÝA*/
-gon_dun02.gat,86,44,0 warp gon30 1,1,gon_dun02.gat,145,233/*Šm’è*/
-gon_dun02.gat,148,236,0 warp gon31 1,1,gon_dun02.gat,234,194/*‘ŠŒÝD*/
-gon_dun02.gat,171,258,0 warp gon32 1,1,gon_dun02.gat,76,96/*Šm’è*/
-gon_dun02.gat,180,189,0 warp gon33 1,1,gon_dun02.gat,170,164/*Šm’è*/
-gon_dun02.gat,165,189,0 warp gon34 1,1,gon_dun02.gat,235,135/*‘ŠŒÝC*/
-gon_dun02.gat,170,161,0 warp gon35 1,1,gon_dun02.gat,89,41/*Šm’è*/
-gon_dun02.gat,168,92,0 warp gon36 1,1,gon_dun02.gat,273,76/*‘ŠŒÝB*/
-gon_dun02.gat,145,66,0 warp gon37 1,1,gon_dun02.gat,199,20/*Šm’è*/
-gon_dun02.gat,234,191,0 warp gon38 1,1,gon_dun02.gat,145,233/*‘ŠŒÝD*/
-gon_dun02.gat,235,138,0 warp gon39 1,1,gon_dun02.gat,168,189/*‘ŠŒÝC*/
-gon_dun02.gat,199,94,0 warp gon40 1,1,gon_dun02.gat,60,70/*‘ŠŒÝA*/
-gon_dun02.gat,276,76,0 warp gon41 1,1,gon_dun02.gat,163,87/*‘ŠŒÝB*/
-gon_dun02.gat,196,20,0 warp gon42 1,1,gon_dun02.gat,95,190/*‘ŠŒÝE*/
-gon_dun02.gat,251,268,0 warp gon43 1,1,gon_dun03.gat,68,9
-gon_dun03.gat,68,6,0 warp gon44 1,1,gon_dun02.gat,251,265
+//===== Athena Script ========================================
+//= Gonryun Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Gonryun
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Gonryun Dungeon ==========================================
+gon_dun01.gat,153,45,0 warp gon20 1,1,gonryun.gat,159,198
+gon_dun01.gat,162,273,0 warp gon21 1,1,gon_dun02.gat,17,113
+gon_dun02.gat,14,113,0 warp gon22 1,1,gon_dun01.gat,162,270
+gon_dun02.gat,56,119,0 warp gon23 1,1,gon_dun02.gat,47,210/*‘ŠŒÝF*/
+gon_dun02.gat,92,190,0 warp gon24 1,1,gon_dun02.gat,199,20/*‘ŠŒÝE*/
+gon_dun02.gat,44,213,0 warp gon25 1,1,gon_dun02.gat,51,119/*‘ŠŒÝF*/
+gon_dun02.gat,44,166,0 warp gon26 1,1,gon_dun02.gat,97,121/*Šm’è*/
+gon_dun02.gat,94,118,0 warp gon27 1,1,gon_dun02.gat,177,189/*Šm’è*/
+gon_dun02.gat,76,100,0 warp gon28 1,1,gon_dun02.gat,145,62/*Šm’è*/
+gon_dun02.gat,63,66,0 warp gon29 1,1,gon_dun02.gat,203,94/*‘ŠŒÝA*/
+gon_dun02.gat,86,44,0 warp gon30 1,1,gon_dun02.gat,145,233/*Šm’è*/
+gon_dun02.gat,148,236,0 warp gon31 1,1,gon_dun02.gat,234,194/*‘ŠŒÝD*/
+gon_dun02.gat,171,258,0 warp gon32 1,1,gon_dun02.gat,76,96/*Šm’è*/
+gon_dun02.gat,180,189,0 warp gon33 1,1,gon_dun02.gat,170,164/*Šm’è*/
+gon_dun02.gat,165,189,0 warp gon34 1,1,gon_dun02.gat,235,135/*‘ŠŒÝC*/
+gon_dun02.gat,170,161,0 warp gon35 1,1,gon_dun02.gat,89,41/*Šm’è*/
+gon_dun02.gat,168,92,0 warp gon36 1,1,gon_dun02.gat,273,76/*‘ŠŒÝB*/
+gon_dun02.gat,145,66,0 warp gon37 1,1,gon_dun02.gat,199,20/*Šm’è*/
+gon_dun02.gat,234,191,0 warp gon38 1,1,gon_dun02.gat,145,233/*‘ŠŒÝD*/
+gon_dun02.gat,235,138,0 warp gon39 1,1,gon_dun02.gat,168,189/*‘ŠŒÝC*/
+gon_dun02.gat,199,94,0 warp gon40 1,1,gon_dun02.gat,60,70/*‘ŠŒÝA*/
+gon_dun02.gat,276,76,0 warp gon41 1,1,gon_dun02.gat,163,87/*‘ŠŒÝB*/
+gon_dun02.gat,196,20,0 warp gon42 1,1,gon_dun02.gat,95,190/*‘ŠŒÝE*/
+gon_dun02.gat,251,268,0 warp gon43 1,1,gon_dun03.gat,68,9
+gon_dun03.gat,68,6,0 warp gon44 1,1,gon_dun02.gat,251,265
diff --git a/npc/warps/dungeons/izlude_dun.txt b/npc/warps/dungeons/izlude_dun.txt
index aa653fb89..69fb8bc5d 100644
--- a/npc/warps/dungeons/izlude_dun.txt
+++ b/npc/warps/dungeons/izlude_dun.txt
@@ -1,30 +1,30 @@
-//===== Athena Script ========================================
-//= Izlude Dungeon Warp Script
-//===== By: ==================================================
-//= Athena (1.0)
-//= Nana (1.1)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Bibilyn Island & Undersea Cave
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//= Bibilyn Island ===========================================
-izlu2dun.gat,108,83,0 warp izd01 3,2,iz_dun00.gat,168,168
-
-//= Undersea Cave ============================================
-iz_dun00.gat,168,173,0 warp izd01-1 3,3,izlu2dun.gat,108,88
-iz_dun00.gat,352,342,0 warp izd02 5,2,iz_dun01.gat,253,252
-iz_dun00.gat,39,41,0 warp izd03 5,2,iz_dun01.gat,41,37
-iz_dun01.gat,118,170,0 warp izd04 5,2,iz_dun02.gat,236,204
-iz_dun01.gat,253,258,0 warp izd02-1 2,2,iz_dun00.gat,352,337
-iz_dun01.gat,41,32,0 warp izd03-1 2,2,iz_dun00.gat,39,46
-iz_dun02.gat,236,198,0 warp izd04-1 5,3,iz_dun01.gat,118,165
-iz_dun02.gat,339,331,0 warp izd05 2,2,iz_dun03.gat,32,63
-iz_dun03.gat,264,245,0 warp izd06 1,2,iz_dun04.gat,26,27
-iz_dun03.gat,29,63,0 warp izd05-1 2,2,iz_dun02.gat,339,328
+//===== Athena Script ========================================
+//= Izlude Dungeon Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Bibilyn Island & Undersea Cave
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Bibilyn Island ===========================================
+izlu2dun.gat,108,83,0 warp izd01 3,2,iz_dun00.gat,168,168
+
+//= Undersea Cave ============================================
+iz_dun00.gat,168,173,0 warp izd01-1 3,3,izlu2dun.gat,108,88
+iz_dun00.gat,352,342,0 warp izd02 5,2,iz_dun01.gat,253,252
+iz_dun00.gat,39,41,0 warp izd03 5,2,iz_dun01.gat,41,37
+iz_dun01.gat,118,170,0 warp izd04 5,2,iz_dun02.gat,236,204
+iz_dun01.gat,253,258,0 warp izd02-1 2,2,iz_dun00.gat,352,337
+iz_dun01.gat,41,32,0 warp izd03-1 2,2,iz_dun00.gat,39,46
+iz_dun02.gat,236,198,0 warp izd04-1 5,3,iz_dun01.gat,118,165
+iz_dun02.gat,339,331,0 warp izd05 2,2,iz_dun03.gat,32,63
+iz_dun03.gat,264,245,0 warp izd06 1,2,iz_dun04.gat,26,27
+iz_dun03.gat,29,63,0 warp izd05-1 2,2,iz_dun02.gat,339,328
iz_dun04.gat,26,24,0 warp izd06-1 2,2,iz_dun03.gat,261,245 \ No newline at end of file
diff --git a/npc/warps/dungeons/louyang_dun.txt b/npc/warps/dungeons/louyang_dun.txt
index 278b0e321..304dedeb1 100644
--- a/npc/warps/dungeons/louyang_dun.txt
+++ b/npc/warps/dungeons/louyang_dun.txt
@@ -1,20 +1,20 @@
-//===== Athena Script ========================================
-//= Lou Yang Dungeon Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version 6.0+
-//===== Description: =========================================
-//= Warp Points for Lou Yang
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//= Loy Yang Dungeon =========================================
-lou_dun01.gat,222,196,0 warp louwarp002a 3,3,louyang.gat,41,270
-lou_dun01.gat,38,205,0 warp louwarp003 3,3,lou_dun02.gat,282,20
-lou_dun02.gat,286,20,0 warp louwarp003a 3,3,lou_dun01.gat,38,209
-lou_dun02.gat,165,270,0 warp louwarp004 3,3,lou_dun03.gat,165,38
+//===== Athena Script ========================================
+//= Lou Yang Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version 6.0+
+//===== Description: =========================================
+//= Warp Points for Lou Yang
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Loy Yang Dungeon =========================================
+lou_dun01.gat,222,196,0 warp louwarp002a 3,3,louyang.gat,41,270
+lou_dun01.gat,38,205,0 warp louwarp003 3,3,lou_dun02.gat,282,20
+lou_dun02.gat,286,20,0 warp louwarp003a 3,3,lou_dun01.gat,38,209
+lou_dun02.gat,165,270,0 warp louwarp004 3,3,lou_dun03.gat,165,38
lou_dun03.gat,165,34,0 warp louwarp004a 3,3,lou_dun02.gat,165,266 \ No newline at end of file
diff --git a/npc/warps/dungeons/lutie_dun.txt b/npc/warps/dungeons/lutie_dun.txt
index 4b8dadd24..217927167 100644
--- a/npc/warps/dungeons/lutie_dun.txt
+++ b/npc/warps/dungeons/lutie_dun.txt
@@ -1,18 +1,18 @@
-//===== Athena Script ========================================
-//= Lutie Dungeon (Toy Factory) Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
-//===== Description: =========================================
-//= Warp Points for Lutie Dungeon (Toy Factory)
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//= Toy Factory ==============================================
-xmas_dun01.gat,128,131,0 warp xmas15 3,3,xmas_dun02.gat,129,133
-xmas_dun01.gat,205,13,0 warp xmas14-1 3,3,xmas.gat,143,311
+//===== Athena Script ========================================
+//= Lutie Dungeon (Toy Factory) Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Lutie Dungeon (Toy Factory)
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Toy Factory ==============================================
+xmas_dun01.gat,128,131,0 warp xmas15 3,3,xmas_dun02.gat,129,133
+xmas_dun01.gat,205,13,0 warp xmas14-1 3,3,xmas.gat,143,311
xmas_dun02.gat,129,129,0 warp xmas15-1 3,3,xmas_dun01.gat,128,129 \ No newline at end of file
diff --git a/npc/warps/dungeons/morroc_duns.txt b/npc/warps/dungeons/morroc_duns.txt
index 0668196cd..6ccade79f 100644
--- a/npc/warps/dungeons/morroc_duns.txt
+++ b/npc/warps/dungeons/morroc_duns.txt
@@ -1,63 +1,63 @@
-//===== Athena Script ========================================
-//= Morroc Dungeons Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Morroc Dungeons
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//= Morroc Sphinx ============================================
-in_sphinx1.gat,288,6,0 warp sphx001 5,1,moc_fild19.gat,100,99
-in_sphinx1.gat,80,191,0 warp sphx01 2,1,in_sphinx2.gat,149,81
-in_sphinx2.gat,149,77,0 warp sphx01-1 3,2,in_sphinx1.gat,80,189
-in_sphinx2.gat,276,272,0 warp sphx02 1,3,in_sphinx3.gat,210,54
-in_sphinx3.gat,210,57,0 warp sphx02-1 4,1,in_sphinx2.gat,274,272
-in_sphinx3.gat,35,227,0 warp sphx03 2,4,in_sphinx3.gat,62,227
-in_sphinx3.gat,60,227,0 warp sphx03-1 1,4,in_sphinx3.gat,32,227
-in_sphinx3.gat,70,111,0 warp sphx04 1,1,in_sphinx3.gat,70,81
-in_sphinx3.gat,70,83,0 warp sphx04-1 4,1,in_sphinx3.gat,70,113
-in_sphinx3.gat,12,69,0 warp sphx05 4,1,in_sphinx4.gat,10,222
-in_sphinx4.gat,10,224,0 warp sphx05-1 2,1,in_sphinx3.gat,12,71
-in_sphinx4.gat,120,113,0 warp sphx06 4,2,in_sphinx5.gat,100,99
-in_sphinx5.gat,100,96,0 warp sphx06-1 4,2,in_sphinx4.gat,120,116
-in_sphinx5.gat,11,16,0 warp sphx07 3,1,in_sphinx5.gat,189,181
-in_sphinx5.gat,11,183,0 warp sphx07-1 3,1,in_sphinx5.gat,11,18
-in_sphinx5.gat,189,16,0 warp sphx08-1 3,1,in_sphinx5.gat,11,181
-in_sphinx5.gat,16,188,0 warp sphx08-2 1,3,in_sphinx5.gat,181,188
-in_sphinx5.gat,16,10,0 warp sphx08-3 1,3,in_sphinx5.gat,181,10
-in_sphinx5.gat,183,10,0 warp sphx08-4 1,3,in_sphinx5.gat,18,188
-in_sphinx5.gat,183,188,0 warp sphx08-5 1,3,in_sphinx5.gat,18,10
-in_sphinx5.gat,189,183,0 warp sphx08-6 3,1,in_sphinx5.gat,189,18
-
-//= Morroc Pyramid ===========================================
-moc_pryd01.gat,10,195,0 warp mocp01 5,2,moc_pryd02.gat,10,192
-moc_pryd01.gat,195,9,0 warp mocp001 2,5,moc_ruins.gat,60,161
-moc_pryd01.gat,90,109,0 warp mocp02 1,2,moc_prydb1.gat,100,185
-moc_pryd02.gat,10,195,0 warp mocp01-1 5,2,moc_pryd01.gat,10,192
-moc_pryd02.gat,100,99,0 warp mocp03 3,2,moc_pryd03.gat,100,92
-moc_pryd03.gat,100,97,0 warp mocp03-1 3,2,moc_pryd02.gat,100,92
-moc_pryd03.gat,12,15,0 warp mocp04 3,2,moc_pryd04.gat,12,18
-moc_pryd03.gat,15,187,0 warp mocp05 2,3,moc_pryd04.gat,18,187
-moc_pryd03.gat,184,11,0 warp mocp06 2,3,moc_pryd04.gat,181,11
-moc_pryd03.gat,188,184,0 warp mocp07 3,2,moc_pryd04.gat,188,181
-moc_pryd04.gat,12,15,0 warp mocp04-1 3,2,moc_pryd03.gat,12,18
-moc_pryd04.gat,15,187,0 warp mocp05-1 2,3,moc_pryd03.gat,18,187
-moc_pryd04.gat,184,11,0 warp mocp06-1 2,3,moc_pryd03.gat,181,11
-moc_pryd04.gat,188,184,0 warp mocp07-1 3,2,moc_pryd03.gat,188,181
-moc_pryd05.gat,223,9,0 warp mocp08 2,2,moc_pryd06.gat,192,8
-moc_pryd05.gat,94,98,0 warp mocp09 2,1,moc_prydb1.gat,100,57
-moc_pryd06.gat,195,8,0 warp mocp08-1 2,3,moc_pryd05.gat,220,9
-moc_prydb1.gat,100,104,0 warp mocp10 5,2,moc_prydb1.gat,100,74
-moc_prydb1.gat,100,191,0 warp moco02-1 2,2,moc_pryd01.gat,90,105
-moc_prydb1.gat,100,55,0 warp mocp09-1 2,1,moc_pryd05.gat,94,96
-moc_prydb1.gat,100,77,0 warp mocp10-1 5,2,moc_prydb1.gat,100,107
-moc_prydb1.gat,111,115,0 warp mocp11 2,6,moc_prydb1.gat,145,115
-moc_prydb1.gat,142,115,0 warp mocp11-1 2,6,moc_prydb1.gat,108,115
-moc_prydb1.gat,59,115,0 warp mocp12 2,6,moc_prydb1.gat,90,115
-moc_prydb1.gat,87,115,0 warp mocp12-1 2,6,moc_prydb1.gat,56,115
+//===== Athena Script ========================================
+//= Morroc Dungeons Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Morroc Dungeons
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Morroc Sphinx ============================================
+in_sphinx1.gat,288,6,0 warp sphx001 5,1,moc_fild19.gat,100,99
+in_sphinx1.gat,80,191,0 warp sphx01 2,1,in_sphinx2.gat,149,81
+in_sphinx2.gat,149,77,0 warp sphx01-1 3,2,in_sphinx1.gat,80,189
+in_sphinx2.gat,276,272,0 warp sphx02 1,3,in_sphinx3.gat,210,54
+in_sphinx3.gat,210,57,0 warp sphx02-1 4,1,in_sphinx2.gat,274,272
+in_sphinx3.gat,35,227,0 warp sphx03 2,4,in_sphinx3.gat,62,227
+in_sphinx3.gat,60,227,0 warp sphx03-1 1,4,in_sphinx3.gat,32,227
+in_sphinx3.gat,70,111,0 warp sphx04 1,1,in_sphinx3.gat,70,81
+in_sphinx3.gat,70,83,0 warp sphx04-1 4,1,in_sphinx3.gat,70,113
+in_sphinx3.gat,12,69,0 warp sphx05 4,1,in_sphinx4.gat,10,222
+in_sphinx4.gat,10,224,0 warp sphx05-1 2,1,in_sphinx3.gat,12,71
+in_sphinx4.gat,120,113,0 warp sphx06 4,2,in_sphinx5.gat,100,99
+in_sphinx5.gat,100,96,0 warp sphx06-1 4,2,in_sphinx4.gat,120,116
+in_sphinx5.gat,11,16,0 warp sphx07 3,1,in_sphinx5.gat,189,181
+in_sphinx5.gat,11,183,0 warp sphx07-1 3,1,in_sphinx5.gat,11,18
+in_sphinx5.gat,189,16,0 warp sphx08-1 3,1,in_sphinx5.gat,11,181
+in_sphinx5.gat,16,188,0 warp sphx08-2 1,3,in_sphinx5.gat,181,188
+in_sphinx5.gat,16,10,0 warp sphx08-3 1,3,in_sphinx5.gat,181,10
+in_sphinx5.gat,183,10,0 warp sphx08-4 1,3,in_sphinx5.gat,18,188
+in_sphinx5.gat,183,188,0 warp sphx08-5 1,3,in_sphinx5.gat,18,10
+in_sphinx5.gat,189,183,0 warp sphx08-6 3,1,in_sphinx5.gat,189,18
+
+//= Morroc Pyramid ===========================================
+moc_pryd01.gat,10,195,0 warp mocp01 5,2,moc_pryd02.gat,10,192
+moc_pryd01.gat,195,9,0 warp mocp001 2,5,moc_ruins.gat,60,161
+moc_pryd01.gat,90,109,0 warp mocp02 1,2,moc_prydb1.gat,100,185
+moc_pryd02.gat,10,195,0 warp mocp01-1 5,2,moc_pryd01.gat,10,192
+moc_pryd02.gat,100,99,0 warp mocp03 3,2,moc_pryd03.gat,100,92
+moc_pryd03.gat,100,97,0 warp mocp03-1 3,2,moc_pryd02.gat,100,92
+moc_pryd03.gat,12,15,0 warp mocp04 3,2,moc_pryd04.gat,12,18
+moc_pryd03.gat,15,187,0 warp mocp05 2,3,moc_pryd04.gat,18,187
+moc_pryd03.gat,184,11,0 warp mocp06 2,3,moc_pryd04.gat,181,11
+moc_pryd03.gat,188,184,0 warp mocp07 3,2,moc_pryd04.gat,188,181
+moc_pryd04.gat,12,15,0 warp mocp04-1 3,2,moc_pryd03.gat,12,18
+moc_pryd04.gat,15,187,0 warp mocp05-1 2,3,moc_pryd03.gat,18,187
+moc_pryd04.gat,184,11,0 warp mocp06-1 2,3,moc_pryd03.gat,181,11
+moc_pryd04.gat,188,184,0 warp mocp07-1 3,2,moc_pryd03.gat,188,181
+moc_pryd05.gat,223,9,0 warp mocp08 2,2,moc_pryd06.gat,192,8
+moc_pryd05.gat,94,98,0 warp mocp09 2,1,moc_prydb1.gat,100,57
+moc_pryd06.gat,195,8,0 warp mocp08-1 2,3,moc_pryd05.gat,220,9
+moc_prydb1.gat,100,104,0 warp mocp10 5,2,moc_prydb1.gat,100,74
+moc_prydb1.gat,100,191,0 warp moco02-1 2,2,moc_pryd01.gat,90,105
+moc_prydb1.gat,100,55,0 warp mocp09-1 2,1,moc_pryd05.gat,94,96
+moc_prydb1.gat,100,77,0 warp mocp10-1 5,2,moc_prydb1.gat,100,107
+moc_prydb1.gat,111,115,0 warp mocp11 2,6,moc_prydb1.gat,145,115
+moc_prydb1.gat,142,115,0 warp mocp11-1 2,6,moc_prydb1.gat,108,115
+moc_prydb1.gat,59,115,0 warp mocp12 2,6,moc_prydb1.gat,90,115
+moc_prydb1.gat,87,115,0 warp mocp12-1 2,6,moc_prydb1.gat,56,115
diff --git a/npc/warps/dungeons/orc_dun.txt b/npc/warps/dungeons/orc_dun.txt
index 594e151f5..6eba23883 100644
--- a/npc/warps/dungeons/orc_dun.txt
+++ b/npc/warps/dungeons/orc_dun.txt
@@ -1,26 +1,26 @@
-//===== Athena Script ========================================
-//= Orc Dungeon Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Orc Dungeon
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//= Orc Dungeon ==============================================
-in_orcs01.gat,108,86,0 warp orc001 3,2,gef_fild10.gat,223,203
-in_orcs01.gat,124,171,0 warp orc002 1,3,gef_fild10.gat,138,329
-in_orcs01.gat,162,55,0 warp orc003 4,1,gef_fild10.gat,214,53
-in_orcs01.gat,29,116,0 warp orc004 4,1,gef_fild10.gat,137,286
-in_orcs01.gat,30,154,0 warp orc005 3,2,gef_fild10.gat,65,335
-in_orcs01.gat,30,182,0 warp orc01 2,1,orcsdun01.gat,32,170
-orcsdun01.gat,32,172,0 warp orc01-1 3,1,in_orcs01.gat,30,180
-in_orcs01.gat,108,114,0 warp orc02 2,1,orcsdun02.gat,180,17
-orcsdun02.gat,180,15,0 warp orc02-1 2,1,in_orcs01.gat,108,112
-orcsdun01.gat,183,8,0 warp orc03 4,2,orcsdun02.gat,21,185
+//===== Athena Script ========================================
+//= Orc Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Orc Dungeon
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Orc Dungeon ==============================================
+in_orcs01.gat,108,86,0 warp orc001 3,2,gef_fild10.gat,223,203
+in_orcs01.gat,124,171,0 warp orc002 1,3,gef_fild10.gat,138,329
+in_orcs01.gat,162,55,0 warp orc003 4,1,gef_fild10.gat,214,53
+in_orcs01.gat,29,116,0 warp orc004 4,1,gef_fild10.gat,137,286
+in_orcs01.gat,30,154,0 warp orc005 3,2,gef_fild10.gat,65,335
+in_orcs01.gat,30,182,0 warp orc01 2,1,orcsdun01.gat,32,170
+orcsdun01.gat,32,172,0 warp orc01-1 3,1,in_orcs01.gat,30,180
+in_orcs01.gat,108,114,0 warp orc02 2,1,orcsdun02.gat,180,17
+orcsdun02.gat,180,15,0 warp orc02-1 2,1,in_orcs01.gat,108,112
+orcsdun01.gat,183,8,0 warp orc03 4,2,orcsdun02.gat,21,185
orcsdun02.gat,21,188,0 warp orc03-1 8,2,orcsdun01.gat,183,11 \ No newline at end of file
diff --git a/npc/warps/dungeons/payon_dun.txt b/npc/warps/dungeons/payon_dun.txt
index c54be1eb7..4a064f5ad 100644
--- a/npc/warps/dungeons/payon_dun.txt
+++ b/npc/warps/dungeons/payon_dun.txt
@@ -1,37 +1,37 @@
-//===== eAthena Script =======================================
-//= Payon Cave Warps
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any eAthena Mod
-//===== Description: =========================================
-//= Payon Dungeon Warps
-//===== Additional Comments: =================================
-//= No Comment
-//============================================================
-
-//= Payon Cave ===============================================
-pay_dun00.gat,184,33,0 warp payd01 2,7,pay_dun01.gat,19,33
-pay_dun00.gat,21,186,0 warp pay005 2,2,pay_arche.gat,39,131
-pay_dun01.gat,15,33,0 warp payd01-1 2,6,pay_dun00.gat,181,33
-pay_dun01.gat,286,25,0 warp payd02 2,7,pay_dun02.gat,19,63
-pay_dun02.gat,137,128,0 warp payd03 4,1,pay_dun03.gat,155,159
-pay_dun02.gat,16,63,0 warp payd02-1 2,7,pay_dun01.gat,283,28
-pay_dun03.gat,155,161,0 warp payd03-1 2,1,pay_dun02.gat,137,126
-pay_dun03.gat,127,62,4 script payd04r 45,2,2,{
- set @r,rand(4);
- if(@r==0) goto w1;
- if(@r==1) goto w2;
- if(@r==2) goto w3;
- if(@r==3) goto w4;
- w1: warp "pay_dun04.gat",201,204; break;
- w2: warp "pay_dun04.gat",193,43; break;
- w3: warp "pay_dun04.gat",43,40; break;
- w4: warp "pay_dun04.gat",34,202; break;
-}
-pay_dun04.gat,191,41,0 warp payd04-2 1,1,pay_dun03.gat,125,62
-pay_dun04.gat,202,206,0 warp payd04-3 1,1,pay_dun03.gat,125,62
-pay_dun04.gat,32,204,0 warp payd04-4 2,1,pay_dun03.gat,125,62
+//===== eAthena Script =======================================
+//= Payon Cave Warps
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any eAthena Mod
+//===== Description: =========================================
+//= Payon Dungeon Warps
+//===== Additional Comments: =================================
+//= No Comment
+//============================================================
+
+//= Payon Cave ===============================================
+pay_dun00.gat,184,33,0 warp payd01 2,7,pay_dun01.gat,19,33
+pay_dun00.gat,21,186,0 warp pay005 2,2,pay_arche.gat,39,131
+pay_dun01.gat,15,33,0 warp payd01-1 2,6,pay_dun00.gat,181,33
+pay_dun01.gat,286,25,0 warp payd02 2,7,pay_dun02.gat,19,63
+pay_dun02.gat,137,128,0 warp payd03 4,1,pay_dun03.gat,155,159
+pay_dun02.gat,16,63,0 warp payd02-1 2,7,pay_dun01.gat,283,28
+pay_dun03.gat,155,161,0 warp payd03-1 2,1,pay_dun02.gat,137,126
+pay_dun03.gat,127,62,4 script payd04r 45,2,2,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "pay_dun04.gat",201,204; break;
+ w2: warp "pay_dun04.gat",193,43; break;
+ w3: warp "pay_dun04.gat",43,40; break;
+ w4: warp "pay_dun04.gat",34,202; break;
+}
+pay_dun04.gat,191,41,0 warp payd04-2 1,1,pay_dun03.gat,125,62
+pay_dun04.gat,202,206,0 warp payd04-3 1,1,pay_dun03.gat,125,62
+pay_dun04.gat,32,204,0 warp payd04-4 2,1,pay_dun03.gat,125,62
pay_dun04.gat,40,37,0 warp payd04-1 2,2,pay_dun03.gat,125,62 \ No newline at end of file
diff --git a/npc/warps/dungeons/prt_dun.txt b/npc/warps/dungeons/prt_dun.txt
index 8e46fbf7b..4ada80997 100644
--- a/npc/warps/dungeons/prt_dun.txt
+++ b/npc/warps/dungeons/prt_dun.txt
@@ -1,154 +1,154 @@
-//===== Athena Script ========================================
-//= Prontera Dungeon's Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Prontera Dungeon's
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//= Hidden Temple ============================================
-prt_maze01.gat,100,35,0 warp prm101 5,2,prt_maze01.gat,139,47
-prt_maze01.gat,102,165,0 warp prm102 5,2,prt_maze01.gat,98,151
-prt_maze01.gat,105,115,0 warp prm103 5,2,prt_maze01.gat,175,168
-prt_maze01.gat,105,75,0 warp prm104 5,2,prt_maze01.gat,54,8
-prt_maze01.gat,115,145,0 warp prm105 2,5,prt_maze01.gat,8,186
-prt_maze01.gat,115,21,0 warp prm106 2,5,prt_maze01.gat,167,22
-prt_maze01.gat,115,56,0 warp prm107 2,5,prt_maze01.gat,7,57
-prt_maze01.gat,115,96,0 warp prm108 2,5,prt_maze01.gat,128,105
-prt_maze01.gat,124,105,0 warp prm108-1 2,5,prt_maze01.gat,111,96
-prt_maze01.gat,124,169,0 warp prm109 2,5,prt_maze01.gat,191,139
-prt_maze01.gat,138,124,0 warp prm110 5,2,prt_maze01.gat,142,111
-prt_maze01.gat,139,44,0 warp prm101-1 5,2,prt_maze01.gat,100,32
-prt_maze01.gat,14,75,0 warp prm111 5,2,prt_maze01.gat,63,128
-prt_maze01.gat,140,75,0 warp prm112 5,2,prt_maze01.gat,96,47
-prt_maze01.gat,142,115,0 warp prm110-1 5,2,prt_maze01.gat,138,128
-prt_maze01.gat,155,133,0 warp prm113 2,5,prt_maze01.gat,8,140
-prt_maze01.gat,155,181,0 warp prm114 2,5,prt_maze01.gat,88,145
-prt_maze01.gat,155,21,0 warp prm115 2,12,prt_maze01.gat,87,13
-prt_maze01.gat,164,140,0 warp prm116 2,5,prt_maze01.gat,70,68
-prt_maze01.gat,164,22,0 warp prm106-1 2,5,prt_maze01.gat,112,21
-prt_maze01.gat,164,93,0 warp prm117 2,5,prt_maze01.gat,72,11
-prt_maze01.gat,17,115,0 warp prm118 5,2,prt_maze01.gat,50,48
-prt_maze01.gat,17,34,0 warp prm119 5,3,prt_maze01.gat,23,128
-prt_maze01.gat,175,164,0 warp prm103-1 5,2,prt_maze01.gat,105,111
-prt_maze01.gat,176,35,0 warp prm120 5,3,prt_maze01.gat,182,88
-prt_maze01.gat,176,4,0 warp prm0001 8,2,prt_fild01.gat,136,368
-prt_maze01.gat,176,44,0 warp prm121 5,2,prt_maze01.gat,18,152
-prt_maze01.gat,18,155,0 warp prm121-1 5,2,prt_maze01.gat,176,47
-prt_maze01.gat,182,84,0 warp prm120-1 5,2,prt_maze01.gat,177,31
-prt_maze01.gat,19,195,0 warp prm2001 10,2,prt_maze02.gat,94,19
-prt_maze01.gat,195,139,0 warp prm109-1 2,5,prt_maze01.gat,129,174
-prt_maze01.gat,195,15,0 warp prm122 2,5,prt_maze01.gat,47,105
-prt_maze01.gat,195,174,0 warp prm113 2,5,prt_maze01.gat,47,23
-prt_maze01.gat,195,55,0 warp prm114 2,5,prt_maze01.gat,87,97
-prt_maze01.gat,195,93,0 warp prm115 2,5,prt_maze01.gat,88,55
-prt_maze01.gat,22,84,0 warp prm116 5,2,prt_maze01.gat,55,151
-prt_maze01.gat,23,124,0 warp prm119-1 5,2,prt_maze01.gat,17,30
-prt_maze01.gat,25,5,0 warp prm117 5,3,prt_maze01.gat,65,113
-prt_maze01.gat,4,140,0 warp prm113-1 2,5,prt_maze01.gat,151,133
-prt_maze01.gat,4,186,0 warp prm105-1 2,5,prt_maze01.gat,111,145
-prt_maze01.gat,4,57,0 warp prm107-1 2,5,prt_maze01.gat,112,56
-prt_maze01.gat,44,105,0 warp prm122-1 2,5,prt_maze01.gat,192,15
-prt_maze01.gat,44,23,0 warp prm113-1 2,5,prt_maze01.gat,192,174
-prt_maze01.gat,50,44,0 warp prm118-1 4,2,prt_maze01.gat,17,111
-prt_maze01.gat,51,195,0 warp prm118 7,2,prt_maze01.gat,63,88
-prt_maze01.gat,54,4,0 warp prm104-1 5,2,prt_maze01.gat,105,71
-prt_maze01.gat,55,155,0 warp prm116-1 5,2,prt_maze01.gat,22,88
-prt_maze01.gat,63,124,0 warp prm111-1 5,2,prt_maze01.gat,14,71
-prt_maze01.gat,63,195,0 warp prm118-1 7,2,prt_maze01.gat,63,88
-prt_maze01.gat,63,84,0 warp prm118-2 6,2,prt_maze01.gat,58,192
-prt_maze01.gat,65,116,0 warp prm117-1 5,2,prt_maze01.gat,23,9
-prt_maze01.gat,70,75,0 warp w624 7,3,prt_maze01.gat,169,140
-prt_maze01.gat,75,11,0 warp prm117-1 2,5,prt_maze01.gat,167,93
-prt_maze01.gat,75,66,0 warp prm116-1 3,10,prt_maze01.gat,169,140
-prt_maze01.gat,75,95,0 warp prm119 2,5,prt_maze01.gat,88,173
-prt_maze01.gat,84,10,0 warp prm115-1 2,5,prt_maze01.gat,152,25
-prt_maze01.gat,84,145,0 warp prm114-1 2,5,prt_maze01.gat,151,181
-prt_maze01.gat,84,173,0 warp prm119-2 2,5,prt_maze01.gat,71,95
-prt_maze01.gat,84,55,0 warp prm115-1 2,5,prt_maze01.gat,191,93
-prt_maze01.gat,84,97,0 warp prm114-1 2,5,prt_maze01.gat,192,55
-prt_maze01.gat,96,44,0 warp prm112-1 5,2,prt_maze01.gat,140,72
-prt_maze01.gat,98,155,0 warp prm102-1 5,2,prt_maze01.gat,102,169
-prt_maze02.gat,103,15,0 warp prm2002 12,2,prt_maze01.gat,22,191
-prt_maze02.gat,108,182,0 warp prm3001 12,2,prt_maze03.gat,23,8
-prt_maze02.gat,80,182,0 warp prm3002 12,2,prt_maze03.gat,23,8
-prt_maze02.gat,84,15,0 warp prm2003 12,2,prt_maze01.gat,22,191
-prt_maze03.gat,100,35,0 warp prm301 4,2,prt_maze03.gat,63,88
-prt_maze03.gat,102,164,0 warp prm302 3,2,prt_maze03.gat,143,111
-prt_maze03.gat,104,115,0 warp prm303 4,2,prt_maze03.gat,22,88
-prt_maze03.gat,105,75,0 warp prm304 6,2,prt_maze03.gat,140,47
-prt_maze03.gat,115,145,0 warp prm305 2,3,prt_maze03.gat,88,173
-prt_maze03.gat,115,21,0 warp prm306 2,4,prt_maze03.gat,128,105
-prt_maze03.gat,115,56,0 warp prm307 2,3,prt_maze03.gat,88,145
-prt_maze03.gat,115,96,0 warp prm308 2,7,prt_maze03.gat,167,22
-prt_maze03.gat,124,105,0 warp prm306-1 2,4,prt_maze03.gat,111,21
-prt_maze03.gat,124,168,0 warp prm309 2,8,prt_maze03.gat,69,69
-prt_maze03.gat,137,124,0 warp prm310 10,2,prt_maze03.gat,177,32
-prt_maze03.gat,14,75,0 warp prm311 5,2,prt_maze03.gat,54,8
-prt_maze03.gat,140,44,0 warp prm304-1 6,2,prt_maze03.gat,105,72
-prt_maze03.gat,140,75,0 warp prm312 3,2,prt_maze03.gat,97,48
-prt_maze03.gat,143,115,0 warp prm302-1 3,2,prt_maze03.gat,102,168
-prt_maze03.gat,155,133,0 warp prm313 2,3,prt_maze03.gat,8,186
-prt_maze03.gat,155,181,0 warp prm314 2,3,prt_maze03.gat,88,56
-prt_maze03.gat,155,21,0 warp prm315 2,15,prt_maze03.gat,48,22
-prt_maze03.gat,164,139,0 warp prm316 2,4,prt_maze03.gat,191,16
-prt_maze03.gat,164,22,0 warp prm308-2 2,8,prt_maze03.gat,111,95
-prt_maze03.gat,17,115,0 warp prm317 8,2,prt_maze03.gat,49,47
-prt_maze03.gat,175,164,0 warp prm318 5,2,prt_maze03.gat,18,30
-prt_maze03.gat,176,35,0 warp prm310-1 5,2,prt_maze03.gat,137,127
-prt_maze03.gat,176,44,0 warp prm319 7,2,prt_maze03.gat,55,151
-prt_maze03.gat,178,75,0 warp prm320 3,2,prt_maze03.gat,182,88
-prt_maze03.gat,18,155,0 warp prm321 4,2,prt_maze03.gat,63,128
-prt_maze03.gat,18,34,0 warp prm318-2 5,3,prt_maze03.gat,175,168
-prt_maze03.gat,182,84,0 warp prm320-1 3,2,prt_maze03.gat,178,71
-prt_maze03.gat,195,139,0 warp prm308-1 2,13,prt_maze03.gat,167,22
-prt_maze03.gat,195,16,0 warp prm316-1 2,4,prt_maze03.gat,168,139
-prt_maze03.gat,195,174,0 warp prm322 2,5,prt_maze03.gat,48,105
-prt_maze03.gat,195,54,0 warp prm323 2,3,prt_maze03.gat,88,96
-prt_maze03.gat,22,195,0 warp prm324 4,2,prt_maze03.gat,65,111
-prt_maze03.gat,22,84,0 warp prm303-1 6,2,prt_maze03.gat,104,111
-prt_maze03.gat,23,124,0 warp prm325 5,2,prt_maze03.gat,98,151
-prt_maze03.gat,25,4,0 warp prm3003 8,3,prt_maze02.gat,95,177
-prt_maze03.gat,4,140,0 warp prm326 2,3,prt_maze03.gat,60,192
-prt_maze03.gat,4,186,0 warp prm313-1 2,4,prt_maze03.gat,151,133
-prt_maze03.gat,4,57,0 warp prm327 2,4,prt_maze03.gat,71,95
-prt_maze03.gat,44,105,0 warp prm322-1 2,4,prt_maze03.gat,191,174
-prt_maze03.gat,44,22,0 warp prm315-1 2,5,prt_maze03.gat,151,25
-prt_maze03.gat,49,44,0 warp prm317-1 10,2,prt_maze03.gat,17,112
-prt_maze03.gat,53,195,0 warp prm326-2 10,2,prt_maze03.gat,7,140
-prt_maze03.gat,54,4,0 warp prm311-1 5,2,prt_maze03.gat,14,71
-prt_maze03.gat,55,155,0 warp prm319-1 3,2,prt_maze03.gat,176,48
-prt_maze03.gat,63,124,0 warp prm321-1 4,2,prt_maze03.gat,18,151
-prt_maze03.gat,63,195,0 warp prm326-1 10,2,prt_maze03.gat,7,140
-prt_maze03.gat,63,84,0 warp prm301-1 4,2,prt_maze03.gat,100,31
-prt_maze03.gat,65,115,0 warp prm324-1 4,2,prt_maze03.gat,22,191
-prt_maze03.gat,71,75,0 warp prm309-1 6,2,prt_maze03.gat,127,173
-prt_maze03.gat,75,12,0 warp prm328 2,5,prt_maze03.gat,88,13
-prt_maze03.gat,75,64,0 warp prm309-2 2,10,prt_maze03.gat,127,173
-prt_maze03.gat,75,95,0 warp prm327-1 2,4,prt_maze03.gat,8,57
-prt_maze03.gat,84,10,0 warp prm328-1 2,5,prt_maze03.gat,71,12
-prt_maze03.gat,84,145,0 warp prm307-1 2,3,prt_maze03.gat,111,56
-prt_maze03.gat,84,173,0 warp prm305-1 2,3,prt_maze03.gat,111,145
-prt_maze03.gat,84,56,0 warp prm314-1 2,3,prt_maze03.gat,151,181
-prt_maze03.gat,84,96,0 warp prm323-1 2,3,prt_maze03.gat,191,54
-prt_maze03.gat,97,44,0 warp prm312-1 3,2,prt_maze03.gat,140,71
-prt_maze03.gat,98,155,0 warp prm325-1 3,2,prt_maze03.gat,23,128
-
-//= Prontera Sewers ==============================================
-prt_sewb1.gat,135,248,0 warp prts001 2,2,prt_fild05.gat,274,208
-prt_sewb1.gat,188,247,0 warp prts01 1,3,prt_sewb2.gat,19,19
-prt_sewb2.gat,100,176,0 warp prts02 4,2,prt_sewb2.gat,140,28
-prt_sewb2.gat,140,24,0 warp prts02-1 4,2,prt_sewb2.gat,100,172
-prt_sewb2.gat,180,24,0 warp prts03 4,2,prt_sewb3.gat,180,169
-prt_sewb2.gat,19,12,0 warp prts01-1 2,2,prt_sewb1.gat,192,247
-prt_sewb2.gat,19,175,0 warp prts04 4,2,prt_sewb2.gat,60,28
-prt_sewb2.gat,60,24,0 warp prts04-1 4,2,prt_sewb2.gat,19,171
-prt_sewb3.gat,180,173,0 warp prts03-1 4,2,prt_sewb2.gat,180,28
-prt_sewb3.gat,20,185,0 warp prts05 3,2,prt_sewb4.gat,100,92
+//===== Athena Script ========================================
+//= Prontera Dungeon's Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera Dungeon's
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Hidden Temple ============================================
+prt_maze01.gat,100,35,0 warp prm101 5,2,prt_maze01.gat,139,47
+prt_maze01.gat,102,165,0 warp prm102 5,2,prt_maze01.gat,98,151
+prt_maze01.gat,105,115,0 warp prm103 5,2,prt_maze01.gat,175,168
+prt_maze01.gat,105,75,0 warp prm104 5,2,prt_maze01.gat,54,8
+prt_maze01.gat,115,145,0 warp prm105 2,5,prt_maze01.gat,8,186
+prt_maze01.gat,115,21,0 warp prm106 2,5,prt_maze01.gat,167,22
+prt_maze01.gat,115,56,0 warp prm107 2,5,prt_maze01.gat,7,57
+prt_maze01.gat,115,96,0 warp prm108 2,5,prt_maze01.gat,128,105
+prt_maze01.gat,124,105,0 warp prm108-1 2,5,prt_maze01.gat,111,96
+prt_maze01.gat,124,169,0 warp prm109 2,5,prt_maze01.gat,191,139
+prt_maze01.gat,138,124,0 warp prm110 5,2,prt_maze01.gat,142,111
+prt_maze01.gat,139,44,0 warp prm101-1 5,2,prt_maze01.gat,100,32
+prt_maze01.gat,14,75,0 warp prm111 5,2,prt_maze01.gat,63,128
+prt_maze01.gat,140,75,0 warp prm112 5,2,prt_maze01.gat,96,47
+prt_maze01.gat,142,115,0 warp prm110-1 5,2,prt_maze01.gat,138,128
+prt_maze01.gat,155,133,0 warp prm113 2,5,prt_maze01.gat,8,140
+prt_maze01.gat,155,181,0 warp prm114 2,5,prt_maze01.gat,88,145
+prt_maze01.gat,155,21,0 warp prm115 2,12,prt_maze01.gat,87,13
+prt_maze01.gat,164,140,0 warp prm116 2,5,prt_maze01.gat,70,68
+prt_maze01.gat,164,22,0 warp prm106-1 2,5,prt_maze01.gat,112,21
+prt_maze01.gat,164,93,0 warp prm117 2,5,prt_maze01.gat,72,11
+prt_maze01.gat,17,115,0 warp prm118 5,2,prt_maze01.gat,50,48
+prt_maze01.gat,17,34,0 warp prm119 5,3,prt_maze01.gat,23,128
+prt_maze01.gat,175,164,0 warp prm103-1 5,2,prt_maze01.gat,105,111
+prt_maze01.gat,176,35,0 warp prm120 5,3,prt_maze01.gat,182,88
+prt_maze01.gat,176,4,0 warp prm0001 8,2,prt_fild01.gat,136,368
+prt_maze01.gat,176,44,0 warp prm121 5,2,prt_maze01.gat,18,152
+prt_maze01.gat,18,155,0 warp prm121-1 5,2,prt_maze01.gat,176,47
+prt_maze01.gat,182,84,0 warp prm120-1 5,2,prt_maze01.gat,177,31
+prt_maze01.gat,19,195,0 warp prm2001 10,2,prt_maze02.gat,94,19
+prt_maze01.gat,195,139,0 warp prm109-1 2,5,prt_maze01.gat,129,174
+prt_maze01.gat,195,15,0 warp prm122 2,5,prt_maze01.gat,47,105
+prt_maze01.gat,195,174,0 warp prm113 2,5,prt_maze01.gat,47,23
+prt_maze01.gat,195,55,0 warp prm114 2,5,prt_maze01.gat,87,97
+prt_maze01.gat,195,93,0 warp prm115 2,5,prt_maze01.gat,88,55
+prt_maze01.gat,22,84,0 warp prm116 5,2,prt_maze01.gat,55,151
+prt_maze01.gat,23,124,0 warp prm119-1 5,2,prt_maze01.gat,17,30
+prt_maze01.gat,25,5,0 warp prm117 5,3,prt_maze01.gat,65,113
+prt_maze01.gat,4,140,0 warp prm113-1 2,5,prt_maze01.gat,151,133
+prt_maze01.gat,4,186,0 warp prm105-1 2,5,prt_maze01.gat,111,145
+prt_maze01.gat,4,57,0 warp prm107-1 2,5,prt_maze01.gat,112,56
+prt_maze01.gat,44,105,0 warp prm122-1 2,5,prt_maze01.gat,192,15
+prt_maze01.gat,44,23,0 warp prm113-1 2,5,prt_maze01.gat,192,174
+prt_maze01.gat,50,44,0 warp prm118-1 4,2,prt_maze01.gat,17,111
+prt_maze01.gat,51,195,0 warp prm118 7,2,prt_maze01.gat,63,88
+prt_maze01.gat,54,4,0 warp prm104-1 5,2,prt_maze01.gat,105,71
+prt_maze01.gat,55,155,0 warp prm116-1 5,2,prt_maze01.gat,22,88
+prt_maze01.gat,63,124,0 warp prm111-1 5,2,prt_maze01.gat,14,71
+prt_maze01.gat,63,195,0 warp prm118-1 7,2,prt_maze01.gat,63,88
+prt_maze01.gat,63,84,0 warp prm118-2 6,2,prt_maze01.gat,58,192
+prt_maze01.gat,65,116,0 warp prm117-1 5,2,prt_maze01.gat,23,9
+prt_maze01.gat,70,75,0 warp w624 7,3,prt_maze01.gat,169,140
+prt_maze01.gat,75,11,0 warp prm117-1 2,5,prt_maze01.gat,167,93
+prt_maze01.gat,75,66,0 warp prm116-1 3,10,prt_maze01.gat,169,140
+prt_maze01.gat,75,95,0 warp prm119 2,5,prt_maze01.gat,88,173
+prt_maze01.gat,84,10,0 warp prm115-1 2,5,prt_maze01.gat,152,25
+prt_maze01.gat,84,145,0 warp prm114-1 2,5,prt_maze01.gat,151,181
+prt_maze01.gat,84,173,0 warp prm119-2 2,5,prt_maze01.gat,71,95
+prt_maze01.gat,84,55,0 warp prm115-1 2,5,prt_maze01.gat,191,93
+prt_maze01.gat,84,97,0 warp prm114-1 2,5,prt_maze01.gat,192,55
+prt_maze01.gat,96,44,0 warp prm112-1 5,2,prt_maze01.gat,140,72
+prt_maze01.gat,98,155,0 warp prm102-1 5,2,prt_maze01.gat,102,169
+prt_maze02.gat,103,15,0 warp prm2002 12,2,prt_maze01.gat,22,191
+prt_maze02.gat,108,182,0 warp prm3001 12,2,prt_maze03.gat,23,8
+prt_maze02.gat,80,182,0 warp prm3002 12,2,prt_maze03.gat,23,8
+prt_maze02.gat,84,15,0 warp prm2003 12,2,prt_maze01.gat,22,191
+prt_maze03.gat,100,35,0 warp prm301 4,2,prt_maze03.gat,63,88
+prt_maze03.gat,102,164,0 warp prm302 3,2,prt_maze03.gat,143,111
+prt_maze03.gat,104,115,0 warp prm303 4,2,prt_maze03.gat,22,88
+prt_maze03.gat,105,75,0 warp prm304 6,2,prt_maze03.gat,140,47
+prt_maze03.gat,115,145,0 warp prm305 2,3,prt_maze03.gat,88,173
+prt_maze03.gat,115,21,0 warp prm306 2,4,prt_maze03.gat,128,105
+prt_maze03.gat,115,56,0 warp prm307 2,3,prt_maze03.gat,88,145
+prt_maze03.gat,115,96,0 warp prm308 2,7,prt_maze03.gat,167,22
+prt_maze03.gat,124,105,0 warp prm306-1 2,4,prt_maze03.gat,111,21
+prt_maze03.gat,124,168,0 warp prm309 2,8,prt_maze03.gat,69,69
+prt_maze03.gat,137,124,0 warp prm310 10,2,prt_maze03.gat,177,32
+prt_maze03.gat,14,75,0 warp prm311 5,2,prt_maze03.gat,54,8
+prt_maze03.gat,140,44,0 warp prm304-1 6,2,prt_maze03.gat,105,72
+prt_maze03.gat,140,75,0 warp prm312 3,2,prt_maze03.gat,97,48
+prt_maze03.gat,143,115,0 warp prm302-1 3,2,prt_maze03.gat,102,168
+prt_maze03.gat,155,133,0 warp prm313 2,3,prt_maze03.gat,8,186
+prt_maze03.gat,155,181,0 warp prm314 2,3,prt_maze03.gat,88,56
+prt_maze03.gat,155,21,0 warp prm315 2,15,prt_maze03.gat,48,22
+prt_maze03.gat,164,139,0 warp prm316 2,4,prt_maze03.gat,191,16
+prt_maze03.gat,164,22,0 warp prm308-2 2,8,prt_maze03.gat,111,95
+prt_maze03.gat,17,115,0 warp prm317 8,2,prt_maze03.gat,49,47
+prt_maze03.gat,175,164,0 warp prm318 5,2,prt_maze03.gat,18,30
+prt_maze03.gat,176,35,0 warp prm310-1 5,2,prt_maze03.gat,137,127
+prt_maze03.gat,176,44,0 warp prm319 7,2,prt_maze03.gat,55,151
+prt_maze03.gat,178,75,0 warp prm320 3,2,prt_maze03.gat,182,88
+prt_maze03.gat,18,155,0 warp prm321 4,2,prt_maze03.gat,63,128
+prt_maze03.gat,18,34,0 warp prm318-2 5,3,prt_maze03.gat,175,168
+prt_maze03.gat,182,84,0 warp prm320-1 3,2,prt_maze03.gat,178,71
+prt_maze03.gat,195,139,0 warp prm308-1 2,13,prt_maze03.gat,167,22
+prt_maze03.gat,195,16,0 warp prm316-1 2,4,prt_maze03.gat,168,139
+prt_maze03.gat,195,174,0 warp prm322 2,5,prt_maze03.gat,48,105
+prt_maze03.gat,195,54,0 warp prm323 2,3,prt_maze03.gat,88,96
+prt_maze03.gat,22,195,0 warp prm324 4,2,prt_maze03.gat,65,111
+prt_maze03.gat,22,84,0 warp prm303-1 6,2,prt_maze03.gat,104,111
+prt_maze03.gat,23,124,0 warp prm325 5,2,prt_maze03.gat,98,151
+prt_maze03.gat,25,4,0 warp prm3003 8,3,prt_maze02.gat,95,177
+prt_maze03.gat,4,140,0 warp prm326 2,3,prt_maze03.gat,60,192
+prt_maze03.gat,4,186,0 warp prm313-1 2,4,prt_maze03.gat,151,133
+prt_maze03.gat,4,57,0 warp prm327 2,4,prt_maze03.gat,71,95
+prt_maze03.gat,44,105,0 warp prm322-1 2,4,prt_maze03.gat,191,174
+prt_maze03.gat,44,22,0 warp prm315-1 2,5,prt_maze03.gat,151,25
+prt_maze03.gat,49,44,0 warp prm317-1 10,2,prt_maze03.gat,17,112
+prt_maze03.gat,53,195,0 warp prm326-2 10,2,prt_maze03.gat,7,140
+prt_maze03.gat,54,4,0 warp prm311-1 5,2,prt_maze03.gat,14,71
+prt_maze03.gat,55,155,0 warp prm319-1 3,2,prt_maze03.gat,176,48
+prt_maze03.gat,63,124,0 warp prm321-1 4,2,prt_maze03.gat,18,151
+prt_maze03.gat,63,195,0 warp prm326-1 10,2,prt_maze03.gat,7,140
+prt_maze03.gat,63,84,0 warp prm301-1 4,2,prt_maze03.gat,100,31
+prt_maze03.gat,65,115,0 warp prm324-1 4,2,prt_maze03.gat,22,191
+prt_maze03.gat,71,75,0 warp prm309-1 6,2,prt_maze03.gat,127,173
+prt_maze03.gat,75,12,0 warp prm328 2,5,prt_maze03.gat,88,13
+prt_maze03.gat,75,64,0 warp prm309-2 2,10,prt_maze03.gat,127,173
+prt_maze03.gat,75,95,0 warp prm327-1 2,4,prt_maze03.gat,8,57
+prt_maze03.gat,84,10,0 warp prm328-1 2,5,prt_maze03.gat,71,12
+prt_maze03.gat,84,145,0 warp prm307-1 2,3,prt_maze03.gat,111,56
+prt_maze03.gat,84,173,0 warp prm305-1 2,3,prt_maze03.gat,111,145
+prt_maze03.gat,84,56,0 warp prm314-1 2,3,prt_maze03.gat,151,181
+prt_maze03.gat,84,96,0 warp prm323-1 2,3,prt_maze03.gat,191,54
+prt_maze03.gat,97,44,0 warp prm312-1 3,2,prt_maze03.gat,140,71
+prt_maze03.gat,98,155,0 warp prm325-1 3,2,prt_maze03.gat,23,128
+
+//= Prontera Sewers ==============================================
+prt_sewb1.gat,135,248,0 warp prts001 2,2,prt_fild05.gat,274,208
+prt_sewb1.gat,188,247,0 warp prts01 1,3,prt_sewb2.gat,19,19
+prt_sewb2.gat,100,176,0 warp prts02 4,2,prt_sewb2.gat,140,28
+prt_sewb2.gat,140,24,0 warp prts02-1 4,2,prt_sewb2.gat,100,172
+prt_sewb2.gat,180,24,0 warp prts03 4,2,prt_sewb3.gat,180,169
+prt_sewb2.gat,19,12,0 warp prts01-1 2,2,prt_sewb1.gat,192,247
+prt_sewb2.gat,19,175,0 warp prts04 4,2,prt_sewb2.gat,60,28
+prt_sewb2.gat,60,24,0 warp prts04-1 4,2,prt_sewb2.gat,19,171
+prt_sewb3.gat,180,173,0 warp prts03-1 4,2,prt_sewb2.gat,180,28
+prt_sewb3.gat,20,185,0 warp prts05 3,2,prt_sewb4.gat,100,92
prt_sewb4.gat,100,96,0 warp prts05-1 3,2,prt_sewb3.gat,19,180 \ No newline at end of file
diff --git a/npc/warps/dungeons/umbala_dun.txt b/npc/warps/dungeons/umbala_dun.txt
index 092f6ae90..611d54832 100644
--- a/npc/warps/dungeons/umbala_dun.txt
+++ b/npc/warps/dungeons/umbala_dun.txt
@@ -1,33 +1,33 @@
-//===== Athena Script ========================================
-//= Umbala Dungeon (Yggdrasil Cave) Warp Script
-//===== By: ==================================================
-//= Darkchild (1.0vA); Athena (1.0vB)
-//===== Current Version: =====================================
-//= 1.1 (Akaru)
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
-//===== Description: =========================================
-//= Warp Points for Umbala Dungeon (Yggdrasil Cave)
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//= Dungeon Level 1 ==========================================
-umbala.gat,106,286,0 warp umba0011 1,1,um_dun01.gat,42,31
-um_dun01.gat,150,198,0 warp umba0013 1,1,um_dun02.gat,48,30
-um_dun01.gat,42,26,0 warp umba0012 1,1,umbala.gat,111,283
-
-//= Dungeon Level 2 ==========================================
-um_dun02.gat,103,208,0 warp umba0020 1,1,um_dun02.gat,116,208
-um_dun02.gat,113,208,0 warp umba0019 1,1,um_dun02.gat,100,208
-um_dun02.gat,169,38,0 warp umba0025 1,1,um_dun02.gat,180,38
-um_dun02.gat,177,38,0 warp umba0026 1,1,um_dun02.gat,166,38
-um_dun02.gat,216,77,0 warp umba0018 1,1,um_dun02.gat,217,88
-um_dun02.gat,216,84,0 warp umba0017 1,1,um_dun02.gat,214,74
-um_dun02.gat,222,259,0 warp umba0015 1,1,um_dun02.gat,234,255
-um_dun02.gat,231,255,0 warp umba0016 1,1,um_dun02.gat,219,260
-um_dun02.gat,25,244,0 warp umba0022 1,1,um_dun02.gat,35,251
-um_dun02.gat,33,249,0 warp umba0021 1,1,um_dun02.gat,23,242
-um_dun02.gat,51,26,0 warp umba0022 1,1,um_dun01.gat,153,201
-um_dun02.gat,60,88,0 warp umba0023 1,1,um_dun02.gat,66,77
+//===== Athena Script ========================================
+//= Umbala Dungeon (Yggdrasil Cave) Warp Script
+//===== By: ==================================================
+//= Darkchild (1.0vA); Athena (1.0vB)
+//===== Current Version: =====================================
+//= 1.1 (Akaru)
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Umbala Dungeon (Yggdrasil Cave)
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Dungeon Level 1 ==========================================
+umbala.gat,106,286,0 warp umba0011 1,1,um_dun01.gat,42,31
+um_dun01.gat,150,198,0 warp umba0013 1,1,um_dun02.gat,48,30
+um_dun01.gat,42,26,0 warp umba0012 1,1,umbala.gat,111,283
+
+//= Dungeon Level 2 ==========================================
+um_dun02.gat,103,208,0 warp umba0020 1,1,um_dun02.gat,116,208
+um_dun02.gat,113,208,0 warp umba0019 1,1,um_dun02.gat,100,208
+um_dun02.gat,169,38,0 warp umba0025 1,1,um_dun02.gat,180,38
+um_dun02.gat,177,38,0 warp umba0026 1,1,um_dun02.gat,166,38
+um_dun02.gat,216,77,0 warp umba0018 1,1,um_dun02.gat,217,88
+um_dun02.gat,216,84,0 warp umba0017 1,1,um_dun02.gat,214,74
+um_dun02.gat,222,259,0 warp umba0015 1,1,um_dun02.gat,234,255
+um_dun02.gat,231,255,0 warp umba0016 1,1,um_dun02.gat,219,260
+um_dun02.gat,25,244,0 warp umba0022 1,1,um_dun02.gat,35,251
+um_dun02.gat,33,249,0 warp umba0021 1,1,um_dun02.gat,23,242
+um_dun02.gat,51,26,0 warp umba0022 1,1,um_dun01.gat,153,201
+um_dun02.gat,60,88,0 warp umba0023 1,1,um_dun02.gat,66,77
um_dun02.gat,63,80,0 warp umba0024 1,1,um_dun02.gat,59,92 \ No newline at end of file
diff --git a/npc/warps/dungeons/yuno_dun.txt b/npc/warps/dungeons/yuno_dun.txt
index 36aac0738..3281c06d4 100644
--- a/npc/warps/dungeons/yuno_dun.txt
+++ b/npc/warps/dungeons/yuno_dun.txt
@@ -1,18 +1,18 @@
-//===== Athena Script ========================================
-//= Yuno Dungeon Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
-//===== Description: =========================================
-//= Warp Points for Yuno Dungeon
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//= Magma Dungeon ============================================
-mag_dun01.gat,126,66,0 warp mag01-yunfild 1,1,yuno_fild03.gat,34,139
-mag_dun01.gat,242,241,0 warp mag01-02 1,1,mag_dun02.gat,47,30
-mag_dun02.gat,47,28,0 warp mag02-01 1,1,mag_dun01.gat,242,239
+//===== Athena Script ========================================
+//= Yuno Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Yuno Dungeon
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Magma Dungeon ============================================
+mag_dun01.gat,126,66,0 warp mag01-yunfild 1,1,yuno_fild03.gat,34,139
+mag_dun01.gat,242,241,0 warp mag01-02 1,1,mag_dun02.gat,47,30
+mag_dun02.gat,47,28,0 warp mag02-01 1,1,mag_dun01.gat,242,239