28 files changed, 1798 insertions, 1798 deletions
diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt
index da37d1fa4..87507f2a0 100644
--- a/npc/warps/dungeons/abyss.txt
+++ b/npc/warps/dungeons/abyss.txt
@@ -1,20 +1,20 @@
-//===== Athena Script ========================================
-//= Abyss Lake Dungeon Warp Script
-//===== By: ==================================================
-//= Muad-Dib (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 10+
-//===== Description: =========================================
-//= Warp Points for Abyss Lake Dungeon
-//===== Additional Comments: =================================
-//= 1.0 Thanks to Muad-Dib for the temp warps [Lupus]
-//============================================================
-
-//hu_fild05.gat,197,210,0	warp	abysslakedunwarp001	2,3,abyss_01.gat,264,271
-abyss_01.gat,267,274,0	warp	abysslakedunwarp002	1,1,hu_fild05.gat,192,207
-abyss_01.gat,26,23,0	warp	abysslakedunwarp003	1,1,abyss_02.gat,275,270
-abyss_02.gat,278,270,0	warp	abysslakedunwarp004	1,1,abyss_01.gat,26,26
-abyss_02.gat,145,281,0	warp	abysslakedunwarp005	1,1,abyss_03.gat,116,27
-abyss_03.gat,116,24,0	warp	abysslakedunwarp006	1,1,abyss_02.gat,145,278
+//===== Athena Script ========================================
+//= Abyss Lake Dungeon Warp Script
+//===== By: ==================================================
+//= Muad-Dib (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 10+
+//===== Description: =========================================
+//= Warp Points for Abyss Lake Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Thanks to Muad-Dib for the temp warps [Lupus]
+//============================================================
+
+//hu_fild05.gat,197,210,0	warp	abysslakedunwarp001	2,3,abyss_01.gat,264,271
+abyss_01.gat,267,274,0	warp	abysslakedunwarp002	1,1,hu_fild05.gat,192,207
+abyss_01.gat,26,23,0	warp	abysslakedunwarp003	1,1,abyss_02.gat,275,270
+abyss_02.gat,278,270,0	warp	abysslakedunwarp004	1,1,abyss_01.gat,26,26
+abyss_02.gat,145,281,0	warp	abysslakedunwarp005	1,1,abyss_03.gat,116,27
+abyss_03.gat,116,24,0	warp	abysslakedunwarp006	1,1,abyss_02.gat,145,278
diff --git a/npc/warps/dungeons/alberta_duns.txt b/npc/warps/dungeons/alberta_duns.txt
index e715be196..e083d618a 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,40,111,0	warp	tre05	1,3,treasure01.gat,67,112
-treasure01.gat,62,111,0	warp	tre05-1	1,3,treasure01.gat,38,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,40,111,0	warp	tre05	1,3,treasure01.gat,67,112
+treasure01.gat,62,111,0	warp	tre05-1	1,3,treasure01.gat,38,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 b86949b49..9e10b2ce3 100644
--- a/npc/warps/dungeons/alde_ct.txt
+++ b/npc/warps/dungeons/alde_ct.txt
@@ -1,216 +1,216 @@
-//===== Athena Script ========================================
-//= Al de Baran Clock Tower Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
-//===== Description: =========================================
-//= Warp Points for Clock Tower
-//===== Additional Comments: =================================
-//= Split off Aldebaran.txt 1.1 fixed clt007 warp
-//= 1.3 Optimized [Lupus]
-//= 1.4 Removed Duplicates [Silent]
-//============================================================
-
-//= 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==1) goto w2;
-	if(@r==2) goto w3;
-		warp "c_tower2.gat",13,282; end;
-	w2:	warp "alde_dun03.gat",175,131; end;
-	w3:	warp "c_tower3.gat",235,7; end;
-}
-//============================================================
-//= Random 2-2 ===============================================
-c_tower2.gat,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.gat",288,267; end;
-	w2:	warp "alde_dun03.gat",130,130; end;
-	w3:	warp "c_tower3.gat",252,29; end;
-}
-//============================================================
-//= 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,{
-	if(rand(2)) {
-		warp "c_tower3.gat",168,252;
-	} else {
-		warp "alde_dun02.gat",262,41;
-	}
-	end;
-}
-//============================================================
-//= Random 3-2 ===============================================
-c_tower3.gat,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.gat",13,282; end;
-	w2:	warp "alde_dun03.gat",175,131; end;
-	w3:	warp "c_tower3.gat",235,7; end;
-}
-//============================================================
-//= Random 3-3 ===============================================
-c_tower3.gat,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.gat",228,267; end;
-	w2:	warp "alde_dun03.gat",130,130; end;
-	w3:	warp "c_tower3.gat",252,29; end;
-}
-//============================================================
-//= 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==1) goto w2;
-	if(@r==2) goto w3;
-	if(@r==3) goto w4;
-		warp "c_tower3.gat",168,252; end;
-	w2:	warp "alde_dun02.gat",262,41; end;
-	w3:	warp "c_tower4.gat",73,154; end;
-	w4:	warp "c_tower4.gat",140,149; end;
-}
-//============================================================
-//= Random 4-2 ===============================================
-c_tower4.gat,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.gat",13,282; end;
-	w2:	warp "alde_dun03.gat",175,131; end;
-	w3:	warp "c_tower3.gat",235,7; end;
-	w4:	warp "c_tower4.gat",65,77; end;
-}
-//============================================================
-//= Random 4-3 ===============================================
-c_tower4.gat,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.gat",168,252; end;
-	w2:	warp "alde_dun02.gat",262,41; end;
-	w3:	warp "c_tower4.gat",73,154; end;
-	w4: warp "c_tower4.gat",140,149; end;
-}
-//============================================================
-//= Random 4-4 ===============================================
-c_tower4.gat,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.gat",228,267; end;
-	w2:	warp "alde_dun03.gat",130,130; end;
-	w3:	warp "c_tower3.gat",252,29; end;
-	w4:	warp "c_tower4.gat",152,95; end;
-}
-//============================================================
-//= Random 4-5 ===============================================
-c_tower4.gat,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.gat",228,267; end;
-	w2:	warp "alde_dun03.gat",130,130; end;
-	w3:	warp "c_tower3.gat",252,29; end;
-	w4:	warp "c_tower4.gat",152,95; end;
-}
-//============================================================
-//============================================================
-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	ald008r	45,1,1,{
-	if(rand(2)) {
-		warp "c_tower3.gat",168,252;
-	} else {
-		warp "alde_dun02.gat",262,141;
-	}
-	end;
-}
-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	ald014r	45,1,1,{
-	set @r,rand(3);
-	if(@r==1) goto w2;
-	if(@r==2) goto w3;
-		warp "c_tower2.gat",228,267; end;
-	w2:	warp "alde_dun03.gat",130,130; end;
-	w3:	warp "c_tower3.gat",252,29; end;
-}
-//============================================================
-//= Random 3-2 ===============================================
-alde_dun03.gat,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.gat",13,282; end;
-	w2:	warp "alde_dun03.gat",175,131; end;
-	w3:	warp "c_tower3.gat",235,7; end;
-}
-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	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.gat",13,282; end;
-	w2:	warp "alde_dun03.gat",175,131; end;
-	w3:	warp "c_tower3.gat",235,7; end;
-	w4:	warp "alde_dun04.gat",84,36; end;
-}
-//============================================================
+//===== Athena Script ========================================
+//= Al de Baran Clock Tower Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Clock Tower
+//===== Additional Comments: =================================
+//= Split off Aldebaran.txt 1.1 fixed clt007 warp
+//= 1.3 Optimized [Lupus]
+//= 1.4 Removed Duplicates [Silent]
+//============================================================
+
+//= 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==1) goto w2;
+	if(@r==2) goto w3;
+		warp "c_tower2.gat",13,282; end;
+	w2:	warp "alde_dun03.gat",175,131; end;
+	w3:	warp "c_tower3.gat",235,7; end;
+}
+//============================================================
+//= Random 2-2 ===============================================
+c_tower2.gat,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.gat",288,267; end;
+	w2:	warp "alde_dun03.gat",130,130; end;
+	w3:	warp "c_tower3.gat",252,29; end;
+}
+//============================================================
+//= 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,{
+	if(rand(2)) {
+		warp "c_tower3.gat",168,252;
+	} else {
+		warp "alde_dun02.gat",262,41;
+	}
+	end;
+}
+//============================================================
+//= Random 3-2 ===============================================
+c_tower3.gat,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.gat",13,282; end;
+	w2:	warp "alde_dun03.gat",175,131; end;
+	w3:	warp "c_tower3.gat",235,7; end;
+}
+//============================================================
+//= Random 3-3 ===============================================
+c_tower3.gat,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.gat",228,267; end;
+	w2:	warp "alde_dun03.gat",130,130; end;
+	w3:	warp "c_tower3.gat",252,29; end;
+}
+//============================================================
+//= 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==1) goto w2;
+	if(@r==2) goto w3;
+	if(@r==3) goto w4;
+		warp "c_tower3.gat",168,252; end;
+	w2:	warp "alde_dun02.gat",262,41; end;
+	w3:	warp "c_tower4.gat",73,154; end;
+	w4:	warp "c_tower4.gat",140,149; end;
+}
+//============================================================
+//= Random 4-2 ===============================================
+c_tower4.gat,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.gat",13,282; end;
+	w2:	warp "alde_dun03.gat",175,131; end;
+	w3:	warp "c_tower3.gat",235,7; end;
+	w4:	warp "c_tower4.gat",65,77; end;
+}
+//============================================================
+//= Random 4-3 ===============================================
+c_tower4.gat,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.gat",168,252; end;
+	w2:	warp "alde_dun02.gat",262,41; end;
+	w3:	warp "c_tower4.gat",73,154; end;
+	w4: warp "c_tower4.gat",140,149; end;
+}
+//============================================================
+//= Random 4-4 ===============================================
+c_tower4.gat,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.gat",228,267; end;
+	w2:	warp "alde_dun03.gat",130,130; end;
+	w3:	warp "c_tower3.gat",252,29; end;
+	w4:	warp "c_tower4.gat",152,95; end;
+}
+//============================================================
+//= Random 4-5 ===============================================
+c_tower4.gat,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.gat",228,267; end;
+	w2:	warp "alde_dun03.gat",130,130; end;
+	w3:	warp "c_tower3.gat",252,29; end;
+	w4:	warp "c_tower4.gat",152,95; end;
+}
+//============================================================
+//============================================================
+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	ald008r	45,1,1,{
+	if(rand(2)) {
+		warp "c_tower3.gat",168,252;
+	} else {
+		warp "alde_dun02.gat",262,141;
+	}
+	end;
+}
+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	ald014r	45,1,1,{
+	set @r,rand(3);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+		warp "c_tower2.gat",228,267; end;
+	w2:	warp "alde_dun03.gat",130,130; end;
+	w3:	warp "c_tower3.gat",252,29; end;
+}
+//============================================================
+//= Random 3-2 ===============================================
+alde_dun03.gat,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.gat",13,282; end;
+	w2:	warp "alde_dun03.gat",175,131; end;
+	w3:	warp "c_tower3.gat",235,7; end;
+}
+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	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.gat",13,282; end;
+	w2:	warp "alde_dun03.gat",175,131; end;
+	w3:	warp "c_tower3.gat",235,7; end;
+	w4:	warp "alde_dun04.gat",84,36; end;
+}
+//============================================================
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 1fc483850..383ba2f04 100644
--- a/npc/warps/dungeons/ant_hell.txt
+++ b/npc/warps/dungeons/ant_hell.txt
@@ -1,34 +1,34 @@
-//===== Athena Script ========================================
-//= Ant Hell Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Ant Hell
-//===== Additional Comments: =================================
-//= 1.3 Changed var anthell to @anthell. Optimized [Lupus]
-//= 1.4 Removed Duplicates [Silent]
-//============================================================
-
-//= Ant Hell =================================================
-anthell01.gat,35,267,0	script	ant001	45,1,1,{
-	if(@anthell) {
-		warp "moc_fild15.gat",251,248;
-	} else {
-		warp "moc_fild04.gat",213,327;
-	}
-	end;
-}
-anthell02.gat,171,169,0	script	ant002	45,1,2,{
-	if(@anthell) {
-		warp "moc_fild04.gat",213,327;
-	} else {
-		warp "moc_fild15.gat",251,248;
-	}
-	end;
-}
-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
+//===== Athena Script ========================================
+//= Ant Hell Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Ant Hell
+//===== Additional Comments: =================================
+//= 1.3 Changed var anthell to @anthell. Optimized [Lupus]
+//= 1.4 Removed Duplicates [Silent]
+//============================================================
+
+//= Ant Hell =================================================
+anthell01.gat,35,267,0	script	ant001	45,1,1,{
+	if(@anthell) {
+		warp "moc_fild15.gat",251,248;
+	} else {
+		warp "moc_fild04.gat",213,327;
+	}
+	end;
+}
+anthell02.gat,171,169,0	script	ant002	45,1,2,{
+	if(@anthell) {
+		warp "moc_fild04.gat",213,327;
+	} else {
+		warp "moc_fild15.gat",251,248;
+	}
+	end;
+}
+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
diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt
index 1a3a9cc15..968d13d9d 100644
--- a/npc/warps/dungeons/ayo_dun.txt
+++ b/npc/warps/dungeons/ayo_dun.txt
@@ -1,21 +1,21 @@
-//===== Athena Script ========================================
-//= Ayothaya Dungeon Warp Script
-//===== By: ==================================================
-//= eAthena Team (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 10+
-//===== Description: =========================================
-//= Warp Points for Ayothaya Dungeon
-//===== Additional Comments: =================================
-//= 1.0 Splitted 2 files [Lupus]
-//= Should some warps be disabled due to Dungeon Quest?
-//============================================================
-
-
-//Dungeon 
-ayo_fild02.gat,285,150,0	warp	ayodunwrp001	2,2,ayo_dun01.gat,275,17
-ayo_dun01.gat,275,14,0	warp	ayodunwrp002	2,2,ayo_fild02.gat,282,150
-ayo_dun02.gat,24,21,0	warp	ayodunwrp003	2,2,ayo_dun01.gat,24,281
-ayo_dun02.gat,275,21,0	warp	ayodunwrp004	2,2,ayo_dun01.gat,24,281
+//===== Athena Script ========================================
+//= Ayothaya Dungeon Warp Script
+//===== By: ==================================================
+//= eAthena Team (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 10+
+//===== Description: =========================================
+//= Warp Points for Ayothaya Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Splitted 2 files [Lupus]
+//= Should some warps be disabled due to Dungeon Quest?
+//============================================================
+
+
+//Dungeon 
+ayo_fild02.gat,285,150,0	warp	ayodunwrp001	2,2,ayo_dun01.gat,275,17
+ayo_dun01.gat,275,14,0	warp	ayodunwrp002	2,2,ayo_fild02.gat,282,150
+ayo_dun02.gat,24,21,0	warp	ayodunwrp003	2,2,ayo_dun01.gat,24,281
+ayo_dun02.gat,275,21,0	warp	ayodunwrp004	2,2,ayo_dun01.gat,24,281
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/ein_dun.txt b/npc/warps/dungeons/ein_dun.txt
index 71811e9c9..8b2f440aa 100644
--- a/npc/warps/dungeons/ein_dun.txt
+++ b/npc/warps/dungeons/ein_dun.txt
@@ -1,19 +1,19 @@
-//===== Athena Script ========================================
-//= Einbroch Warp Script
-//===== By: ==================================================
-//= Sara-chan (1.3), SSUNNY@YOUNG(1.4)
-//===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
-//===== Description: =========================================
-//= Warp Points for Einbroch
-//===== Additional Comments: =================================
-//= 1.4 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]
-//============================================================
-
-//Dungeon Warps
-einbech.gat,138,252,0	warp	eib_d01	1,1,ein_dun01.gat,22,14
-ein_dun01.gat,22,11,0	warp	eib_d01a	1,1,einbech.gat,138,249
-ein_dun01.gat,262,256,0	warp	ein012	1,1,ein_dun02.gat,292,290
-ein_dun02.gat,292,292,0	warp	ein012a	1,1,ein_dun01.gat,262,258
+//===== Athena Script ========================================
+//= Einbroch Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.3), SSUNNY@YOUNG(1.4)
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Einbroch
+//===== Additional Comments: =================================
+//= 1.4 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]
+//============================================================
+
+//Dungeon Warps
+einbech.gat,138,252,0	warp	eib_d01	1,1,ein_dun01.gat,22,14
+ein_dun01.gat,22,11,0	warp	eib_d01a	1,1,einbech.gat,138,249
+ein_dun01.gat,262,256,0	warp	ein012	1,1,ein_dun02.gat,292,290
+ein_dun02.gat,292,292,0	warp	ein012a	1,1,ein_dun01.gat,262,258
diff --git a/npc/warps/dungeons/geffen_dun.txt b/npc/warps/dungeons/geffen_dun.txt
index 3e4925550..65342e53e 100644
--- a/npc/warps/dungeons/geffen_dun.txt
+++ b/npc/warps/dungeons/geffen_dun.txt
@@ -1,46 +1,46 @@
-//===== Athena Script ========================================
-//= Geffen Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Geffen Tower
-//===== Additional Comments: =================================
-//= Removed the warp from gef_dun02.gat to gef_dun03.gat, [MasterOfMuppets]
-//= gef_dun03.gat is just an event map...
-//============================================================
-
-//= 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.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen Tower
+//===== Additional Comments: =================================
+//= Removed the warp from gef_dun02.gat to gef_dun03.gat, [MasterOfMuppets]
+//= gef_dun03.gat is just an event map...
+//============================================================
+
+//= 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/ice_dun.txt b/npc/warps/dungeons/ice_dun.txt
index f80e3fe5f..570ca4d09 100644
--- a/npc/warps/dungeons/ice_dun.txt
+++ b/npc/warps/dungeons/ice_dun.txt
@@ -1,6 +1,6 @@
-//Ice Dungeon Warps
-ice_dun01.gat,157,10,0	warp	ice001	1,1,ra_fild01.gat,233,330
-ice_dun01.gat,145,153,0	warp	ice002	1,1,ice_dun02.gat,151,155
-ice_dun02.gat,151,160,0	warp	ice003	1,1,ice_dun01.gat,146,157
-ice_dun02.gat,150,285,0	warp	ice004	1,1,ice_dun03.gat,149,22
+//Ice Dungeon Warps
+ice_dun01.gat,157,10,0	warp	ice001	1,1,ra_fild01.gat,233,330
+ice_dun01.gat,145,153,0	warp	ice002	1,1,ice_dun02.gat,151,155
+ice_dun02.gat,151,160,0	warp	ice003	1,1,ice_dun01.gat,146,157
+ice_dun02.gat,150,285,0	warp	ice004	1,1,ice_dun03.gat,149,22
 ice_dun03.gat,149,18,0	warp	ice005	1,1,ice_dun02.gat,150,281
 \ No newline at end of file
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/juperos.txt b/npc/warps/dungeons/juperos.txt
index fea25e5da..16266d16c 100644
--- a/npc/warps/dungeons/juperos.txt
+++ b/npc/warps/dungeons/juperos.txt
@@ -1,129 +1,129 @@
-//===== Athena Script ========================================
-//= Juperos Dungeon Warp Script
-//===== By: ==================================================
-//= Muad-Dib (1.0)
-//===== Current Version: =====================================
-//= 1.3
-//===== Compatible With: =====================================
-//= eAthena with independant npctimer support; RO Episode 8+
-//===== Description: =========================================
-//= Warp Points for Juperos Dungeon
-//===== Additional Comments: =================================
-//= 1.0 Converted by Dr.Evil [Lupus]
-//= 1.1 More temp warps to Juperos by Justin84 [Lupus]
-//= 1.2 Justin84's fixed elevator scripts
-//= 1.3 Fixed getting stuck when player relogs in. [Lance]
-//= 1.4 Added attachnpctimer to the initnpctimer calls. [Skotlex]
-//= 1.5 Implemented a part of the Juperos quest [MasterOfMuppets]
-//============================================================
-	
-yuno_fild07.gat,207,175,0	warp	jupwrp01	1,1,jupe_cave.gat,143,52
-jupe_cave.gat,148,52,0	warp	jupwrp02	1,1,yuno_fild07.gat,212,175
-jupe_cave.gat,26,52,0	warp	jupwrp03	1,1,juperos_01.gat,53,247
-juperos_01.gat,50,250,0	warp	jupwrp04	1,1,jupe_cave.gat,29,52
-
-juperos_01.gat,99,92,1	script	jupwrp05	-1,0,0,{
-OnTouch:
-
-	mes "^666666[" + strcharinfo(0) + "]";
-	mes "^000000This light...";
-	mes "It feels like...";
-	mes "Its warmth is...";
-	mes "Wrapping all over me...";
-	next;
-	menu "Ah, it's so nice...",s_Nice,"No! This is wrong!",-;
-
-	mes "^666666[" + strcharinfo(0) + "]";
-	mes "^000000N-No! This is";
-	mes "wrong! Something";
-	mes "weird's happening!";
-	mes "I gotta get away!";
-	close2;
-	warp "juperos_01.gat",96,91;
-	end;
-
-s_Nice:
-	specialeffect 309;
-	mes "^666666[" + strcharinfo(0) + "]";
-	mes "^000000Ahhhh...";
-	mes "It feels like";
-	mes "I'm floating...";
-	close2;
-	warp "juperos_02.gat",128,278;
-	end;
-
-}
-
-juperos_02.gat,33,60,0	warp	jupwrp06	1,1,juperos_01.gat,99,88
-jupe_ele_r.gat,49,27,0	warp	jupwrp07	1,1,jupe_gate.gat,49,52
-jupe_gate.gat,49,55,0	warp	jupwrp08	1,1,jupe_ele_r.gat,49,30
-
-jupe_gate.gat,28,30,0	warp	jupwrp11	1,1,jupe_area1.gat,115,158
-jupe_area1.gat,118,158,0	warp	jupwrp12	1,1,jupe_gate.gat,31,30
-jupe_gate.gat,71,30,0	warp	jupwrp13	1,1,jupe_area2.gat,48,158
-jupe_area2.gat,45,158,0	warp	jupwrp14	1,1,jupe_gate.gat,68,30
-jupe_gate.gat,28,146,0	warp	jupwrp15	1,1,jupe_area1.gat,101,222
-jupe_area1.gat,103,222,0	warp	jupwrp16	1,1,jupe_gate.gat,31,146
-jupe_gate.gat,71,146,0	warp	jupwrp17	1,1,jupe_area2.gat,62,222
-jupe_area2.gat,60,222,0	warp	jupwrp18	1,1,jupe_gate.gat,68,146
-
-jupe_area1.gat,84,222,0	warp	jupwrp21	1,1,jupe_area1.gat,45,260
-jupe_area1.gat,48,260,0	warp	jupwrp22	1,1,jupe_area1.gat,86,222
-jupe_area1.gat,22,226,0	warp	jupwrp23	1,1,jupe_area1.gat,22,189
-jupe_area1.gat,22,192,0	warp	jupwrp24	1,1,jupe_area1.gat,22,228
-jupe_area1.gat,34,138,0	warp	jupwrp25	1,1,jupe_area1.gat,34,103
-jupe_area1.gat,34,106,0	warp	jupwrp26	1,1,jupe_area1.gat,34,140
-jupe_area1.gat,58,54,0	warp	jupwrp27	1,1,jupe_area1.gat,86,158
-jupe_area1.gat,84,158,0	warp	jupwrp28	1,1,jupe_area1.gat,55,54
-
-jupe_area2.gat,79,222,0	warp	jupwrp31	1,1,jupe_area2.gat,118,260
-jupe_area2.gat,115,260,0	warp	jupwrp32	1,1,jupe_area2.gat,77,222
-jupe_area2.gat,141,226,0	warp	jupwrp33	1,1,jupe_area2.gat,141,189
-jupe_area2.gat,141,192,0	warp	jupwrp34	1,1,jupe_area2.gat,141,228
-jupe_area2.gat,129,138,0	warp	jupwrp35	1,1,jupe_area2.gat,129,103
-jupe_area2.gat,129,106,0	warp	jupwrp36	1,1,jupe_area2.gat,129,140
-jupe_area2.gat,105,54,0	warp	jupwrp37	1,1,jupe_area2.gat,77,158
-jupe_area2.gat,79,158,0	warp	jupwrp38	1,1,jupe_area2.gat,108,54
-
-juperos_02.gat,129,150,0	script	JupeWarp2	-1,1,1{
-OnInit:
-	disablenpc "JupeWarp2";
-	end;
-OnTouch:
-	warp "jupe_gate.gat",49,162;
-	end;
-}
-
-jupe_gate.gat,49,168,0	script	JupeWarp3	-1,1,1,{
-OnTouch:
-	warp "juperos_02.gat",129,147;
-	end;
-}
-
-jupe_ele_r.gat,50,98,0	script	Juperos Guard	111,{
-	mes "Are you sure you want to enter the Juperos Core?";
-	next;
-	if(select("Yes","No") == 1){
-		attachnpctimer;
-		initnpctimer;
-		soundeffect "jupe_warning.wav",0;
-	}
-	close;
-
-OnTimer5000:
-	stopnpctimer;
-	setnpctimer 0;
-	warp "jupe_core.gat",150,20;
-	end;
-}
-
-jupe_core.gat,150,17,0	script	Juperos Guard#2	111,{
-	mes "Leave Juperos Core?";
-	next;
-	if(select("Yes", "No") == 1){
-		close2;
-		warp "jupe_ele_r",50,94;
-		end;
-	}
-	close;
-}
+//===== Athena Script ========================================
+//= Juperos Dungeon Warp Script
+//===== By: ==================================================
+//= Muad-Dib (1.0)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= eAthena with independant npctimer support; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Juperos Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Converted by Dr.Evil [Lupus]
+//= 1.1 More temp warps to Juperos by Justin84 [Lupus]
+//= 1.2 Justin84's fixed elevator scripts
+//= 1.3 Fixed getting stuck when player relogs in. [Lance]
+//= 1.4 Added attachnpctimer to the initnpctimer calls. [Skotlex]
+//= 1.5 Implemented a part of the Juperos quest [MasterOfMuppets]
+//============================================================
+	
+yuno_fild07.gat,207,175,0	warp	jupwrp01	1,1,jupe_cave.gat,143,52
+jupe_cave.gat,148,52,0	warp	jupwrp02	1,1,yuno_fild07.gat,212,175
+jupe_cave.gat,26,52,0	warp	jupwrp03	1,1,juperos_01.gat,53,247
+juperos_01.gat,50,250,0	warp	jupwrp04	1,1,jupe_cave.gat,29,52
+
+juperos_01.gat,99,92,1	script	jupwrp05	-1,0,0,{
+OnTouch:
+
+	mes "^666666[" + strcharinfo(0) + "]";
+	mes "^000000This light...";
+	mes "It feels like...";
+	mes "Its warmth is...";
+	mes "Wrapping all over me...";
+	next;
+	menu "Ah, it's so nice...",s_Nice,"No! This is wrong!",-;
+
+	mes "^666666[" + strcharinfo(0) + "]";
+	mes "^000000N-No! This is";
+	mes "wrong! Something";
+	mes "weird's happening!";
+	mes "I gotta get away!";
+	close2;
+	warp "juperos_01.gat",96,91;
+	end;
+
+s_Nice:
+	specialeffect 309;
+	mes "^666666[" + strcharinfo(0) + "]";
+	mes "^000000Ahhhh...";
+	mes "It feels like";
+	mes "I'm floating...";
+	close2;
+	warp "juperos_02.gat",128,278;
+	end;
+
+}
+
+juperos_02.gat,33,60,0	warp	jupwrp06	1,1,juperos_01.gat,99,88
+jupe_ele_r.gat,49,27,0	warp	jupwrp07	1,1,jupe_gate.gat,49,52
+jupe_gate.gat,49,55,0	warp	jupwrp08	1,1,jupe_ele_r.gat,49,30
+
+jupe_gate.gat,28,30,0	warp	jupwrp11	1,1,jupe_area1.gat,115,158
+jupe_area1.gat,118,158,0	warp	jupwrp12	1,1,jupe_gate.gat,31,30
+jupe_gate.gat,71,30,0	warp	jupwrp13	1,1,jupe_area2.gat,48,158
+jupe_area2.gat,45,158,0	warp	jupwrp14	1,1,jupe_gate.gat,68,30
+jupe_gate.gat,28,146,0	warp	jupwrp15	1,1,jupe_area1.gat,101,222
+jupe_area1.gat,103,222,0	warp	jupwrp16	1,1,jupe_gate.gat,31,146
+jupe_gate.gat,71,146,0	warp	jupwrp17	1,1,jupe_area2.gat,62,222
+jupe_area2.gat,60,222,0	warp	jupwrp18	1,1,jupe_gate.gat,68,146
+
+jupe_area1.gat,84,222,0	warp	jupwrp21	1,1,jupe_area1.gat,45,260
+jupe_area1.gat,48,260,0	warp	jupwrp22	1,1,jupe_area1.gat,86,222
+jupe_area1.gat,22,226,0	warp	jupwrp23	1,1,jupe_area1.gat,22,189
+jupe_area1.gat,22,192,0	warp	jupwrp24	1,1,jupe_area1.gat,22,228
+jupe_area1.gat,34,138,0	warp	jupwrp25	1,1,jupe_area1.gat,34,103
+jupe_area1.gat,34,106,0	warp	jupwrp26	1,1,jupe_area1.gat,34,140
+jupe_area1.gat,58,54,0	warp	jupwrp27	1,1,jupe_area1.gat,86,158
+jupe_area1.gat,84,158,0	warp	jupwrp28	1,1,jupe_area1.gat,55,54
+
+jupe_area2.gat,79,222,0	warp	jupwrp31	1,1,jupe_area2.gat,118,260
+jupe_area2.gat,115,260,0	warp	jupwrp32	1,1,jupe_area2.gat,77,222
+jupe_area2.gat,141,226,0	warp	jupwrp33	1,1,jupe_area2.gat,141,189
+jupe_area2.gat,141,192,0	warp	jupwrp34	1,1,jupe_area2.gat,141,228
+jupe_area2.gat,129,138,0	warp	jupwrp35	1,1,jupe_area2.gat,129,103
+jupe_area2.gat,129,106,0	warp	jupwrp36	1,1,jupe_area2.gat,129,140
+jupe_area2.gat,105,54,0	warp	jupwrp37	1,1,jupe_area2.gat,77,158
+jupe_area2.gat,79,158,0	warp	jupwrp38	1,1,jupe_area2.gat,108,54
+
+juperos_02.gat,129,150,0	script	JupeWarp2	-1,1,1{
+OnInit:
+	disablenpc "JupeWarp2";
+	end;
+OnTouch:
+	warp "jupe_gate.gat",49,162;
+	end;
+}
+
+jupe_gate.gat,49,168,0	script	JupeWarp3	-1,1,1,{
+OnTouch:
+	warp "juperos_02.gat",129,147;
+	end;
+}
+
+jupe_ele_r.gat,50,98,0	script	Juperos Guard	111,{
+	mes "Are you sure you want to enter the Juperos Core?";
+	next;
+	if(select("Yes","No") == 1){
+		attachnpctimer;
+		initnpctimer;
+		soundeffect "jupe_warning.wav",0;
+	}
+	close;
+
+OnTimer5000:
+	stopnpctimer;
+	setnpctimer 0;
+	warp "jupe_core.gat",150,20;
+	end;
+}
+
+jupe_core.gat,150,17,0	script	Juperos Guard#2	111,{
+	mes "Leave Juperos Core?";
+	next;
+	if(select("Yes", "No") == 1){
+		close2;
+		warp "jupe_ele_r",50,94;
+		end;
+	}
+	close;
+}
diff --git a/npc/warps/dungeons/kiel_dun.txt b/npc/warps/dungeons/kiel_dun.txt
index 754e835aa..09e9bce68 100644
--- a/npc/warps/dungeons/kiel_dun.txt
+++ b/npc/warps/dungeons/kiel_dun.txt
@@ -1,77 +1,77 @@
-//===== Athena Script ========================================
-//= Kiel Dungeon Warp Script
-//===== By: ==================================================
-//= Lost Kakashi
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= eAthena 1.0
-//===== Description: =========================================
-//= Warp Points for the Kiel Dungeon
-//===== Additional Comments: =================================
-//= 1.1 Added official Kiel Dungeon entrance [Playtester]
-//============================================================
-
-//= Kiel Dungeon =============================================
-kh_dun01.gat,3,234,0	warp	khwarp01	1,1,yuno_fild08,69,170
-
-//= Graveyard Switch =========================================
-yuno_fild08.gat,67,169,4	script	Switch#kh	111,1,1,{
-
-  mes "You examine the grave and find a switch!";
-  mes "Do you want to press it?";
-  next;
-
-  menu "Yes.",-,"No.",L_End;
-
-  mes "Suddenly the grave opens and reveals a staircase.";
-  close2;
-
-  warp "kh_dun01",4,229;
-  end;
-
-L_End:
-  mes "You decided not to press it.";
-  close;
-}
-
-//= Elevator to Floor 2 ======================================
-kh_dun01.gat,44,203,4	script	Switch#khe1::khelevator	111,1,1,{
-
-  mes "The elevator seems to be broken.";
-  mes "But you could repair it with";
-  mes "^0000FF40 Hard Pieces of Steel^000000.";
-  next;
-
-  mes "Be careful, though.";
-  mes "This will only work once and there's no turning back.";
-  next;
-
-  mes "Do you want to repair the elevator?";
-  next;
-
-  menu "Yes.",-,"No.",L_End;
-  
-  if(countitem(7507)<40) goto L_NoItem;
-  delitem 7507,40;
-  mes "The elevator starts moving.";
-  mes "You quickly jump into it.";
-  close2;
-  
-  warp "kh_dun02",44,195;
-  end;
-
-L_NoItem:
-  mes "It appears you don't have enough items.";
-L_End:
-  mes "The elevator remains broken.";
-  close;
-}
-
-kh_dun01.gat,36,195,4	duplicate(khelevator)	Switch#khe2	111
-
-//= Custom Kiel Dungeon Warps ================================
-//kh_dun01.gat,3,234,0	warp	warp01	1,1,kh_dun02.gat,42,197
-//kh_dun02.gat,45,194,0	warp	warp02	1,1,kh_dun01.gat,4,229
-//kh_kiehl02.gat,49,52,0	warp	warp05	1,1,kh_dun01.gat,63,10
+//===== Athena Script ========================================
+//= Kiel Dungeon Warp Script
+//===== By: ==================================================
+//= Lost Kakashi
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= eAthena 1.0
+//===== Description: =========================================
+//= Warp Points for the Kiel Dungeon
+//===== Additional Comments: =================================
+//= 1.1 Added official Kiel Dungeon entrance [Playtester]
+//============================================================
+
+//= Kiel Dungeon =============================================
+kh_dun01.gat,3,234,0	warp	khwarp01	1,1,yuno_fild08,69,170
+
+//= Graveyard Switch =========================================
+yuno_fild08.gat,67,169,4	script	Switch#kh	111,1,1,{
+
+  mes "You examine the grave and find a switch!";
+  mes "Do you want to press it?";
+  next;
+
+  menu "Yes.",-,"No.",L_End;
+
+  mes "Suddenly the grave opens and reveals a staircase.";
+  close2;
+
+  warp "kh_dun01",4,229;
+  end;
+
+L_End:
+  mes "You decided not to press it.";
+  close;
+}
+
+//= Elevator to Floor 2 ======================================
+kh_dun01.gat,44,203,4	script	Switch#khe1::khelevator	111,1,1,{
+
+  mes "The elevator seems to be broken.";
+  mes "But you could repair it with";
+  mes "^0000FF40 Hard Pieces of Steel^000000.";
+  next;
+
+  mes "Be careful, though.";
+  mes "This will only work once and there's no turning back.";
+  next;
+
+  mes "Do you want to repair the elevator?";
+  next;
+
+  menu "Yes.",-,"No.",L_End;
+  
+  if(countitem(7507)<40) goto L_NoItem;
+  delitem 7507,40;
+  mes "The elevator starts moving.";
+  mes "You quickly jump into it.";
+  close2;
+  
+  warp "kh_dun02",44,195;
+  end;
+
+L_NoItem:
+  mes "It appears you don't have enough items.";
+L_End:
+  mes "The elevator remains broken.";
+  close;
+}
+
+kh_dun01.gat,36,195,4	duplicate(khelevator)	Switch#khe2	111
+
+//= Custom Kiel Dungeon Warps ================================
+//kh_dun01.gat,3,234,0	warp	warp01	1,1,kh_dun02.gat,42,197
+//kh_dun02.gat,45,194,0	warp	warp02	1,1,kh_dun01.gat,4,229
+//kh_kiehl02.gat,49,52,0	warp	warp05	1,1,kh_dun01.gat,63,10
 //kh_dun01.gat,64,7,0	warp	warp06	1,1,kh_kiehl02.gat,51,49
 \ No newline at end of file
diff --git a/npc/warps/dungeons/lhalzen_dun.txt b/npc/warps/dungeons/lhalzen_dun.txt
index b0e36e552..000f9ed83 100644
--- a/npc/warps/dungeons/lhalzen_dun.txt
+++ b/npc/warps/dungeons/lhalzen_dun.txt
@@ -1,213 +1,213 @@
-//===== Athena Script ========================================
-//= Lighthalzen Dungeon Warp Script
-//===== By: ==================================================
-//= Sara-chan (1.0)
-//===== Current Version: =====================================
-//= 2.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
-//===== Description: =========================================
-//= Warp Points for Lighthalzen Dungeon
-//===== Additional Comments: =================================
-//= No Comment!
-//= 1.1 Added temp restriction by Azazel [Lupus]
-//= 1.2 Optimized [Lupus]
-//= and fixed 005 and 005a warps coords, thanks to Justin84 
-//= 1.3 Fixed entrance condition check, thanx2Daegaladh [Lupus]
-//= 1.4 Added coords of secret dungeon entrance, thanks to Justin84
-//= proved with screenshots [Lupus]
-//= 1.5a thx2 Justin84, some additions and fixes [Lupus]
-//= 1.5b re-enabled main entrance warp [Lupus] <-reverted 1.5c
-//= 1.6 Updated entrances, added Cube room warps, thanx 2 Justin84
-//= 1.6a Disabled the "Entrance" to lhz_dun01 [Poki#3]
-//= 1.6b Updated Sewer Pipe [Vicious]
-//= 1.7 Fixed a warp-back
-//= 1.8 Some small changes [MasterOfMuppets]
-//= 1.9 Removed duplicates [Toms]
-//= 2.0 Now use MISC_QUEST&512 instead of 'hzdun' [Lupus]
-//============================================================
-
-lhz_dun03.gat,140,139,0	warp	lhz003	1,1,lhz_dun02.gat,150,145
-lhz_dun02.gat,18,150,0	warp	lhz004	1,1,lhz_dun01.gat,18,148
-lhz_dun01.gat,18,146,0	warp	lhz004a	1,1,lhz_dun02.gat,18,148
-lhz_dun02.gat,282,155,0	warp	lhz005	1,1,lhz_dun01.gat,281,152
-lhz_dun01.gat,281,150,0	warp	lhz005a	1,1,lhz_dun02.gat,282,153
-lhz_dun02.gat,148,18,0	warp	lhz006	1,1,lhz_dun01.gat,146,10
-lhz_dun01.gat,148,10,0	warp	lhz006a	1,1,lhz_dun02.gat,150,18
-
-//current entrance
-lhz_dun01.gat,150,290,0	warp	lhz007	1,1,lhz_in01.gat,23,137
-//lighthalzen.gat,73,52,0	warp	lhz007a	1,1,lhz_dun01.gat,150,288
-//This should be only an Exit. This warp doesn't exist on kRO.
-
-//--------------------------Sewer Pipe--------------------------
-
-lighthalzen.gat,313,301,0	script	Sewer Pipe	111,{
-	mes "You see some pipes for a sewage system.";
-	if(MISC_QUEST&512){
-		mes "You found the way into the lab.";
-		next;
-		menu "Go in.",-,"Do not go in.",L_NO;
-
-		warp "lhz_cube.gat",231,17;
-		end;
-	}
-L_NO:
-	close;
-}
-
-//--------------------------Warp--------------------------
-
-//Cube room <-> Organism test laboratory level 2
-lhz_cube.gat,231,96,0	warp	lhzcube1	1,1,lhz_dun02.gat,220,6
-lhz_dun02.gat,224,6,0	warp	lhzcube2	1,1,lhz_cube.gat,231,90
-
-//Cube room -> Lighthalzen
-lhz_cube.gat,231,12,0	warp	lhzcube3	1,1,lighthalzen.gat,310,302
-lhz_cube.gat,177,96,0	warp	lhzcube4	1,1,lighthalzen.gat,310,302
-
-lhz_dun02.gat,150,149,4	script	lhz-warp	45,2,2,{
-OnTouch:
-	if(Upper != 1 && BaseLevel<95)goto s_Noentry0;
-	if(Upper == 1 && BaseLevel<90)goto s_Noentry1;
-	warp "lhz_dun03",140,137;
-	end;
-
-s_Noentry0:
-	mes "Non-Advanced class characters must be at least base level 95 to enter level 3 of the Bio Lab Dungeon";
-	close; 
-
-s_Noentry1:
-	mes "Advanced class characters must be at least base level 90 to enter level 3 of the Bio Lab Dungeon";
-	close;
-}
-
-//----------------- Cube Room Maze ---------------------------
-// -1 are warps facing east.
-// -2 the warps facing south.
-// -3 are warps facing west.
-// -4 are warps facing north.
-//----------------- Room 66 74 -------------------------------
-lhz_cube.gat,74,74,0	script	cubew01-1	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,66,67,0	warp	cubew01-2	2,2,lhz_cube.gat,10,18
-lhz_cube.gat,59,74,0	script	cubew01-3	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,66,82,0	script	cubew01-4	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-//----------------- Room 66 136 ------------------------------
-lhz_cube.gat,74,136,0	warp	cubew02-1	2,2,lhz_cube.gat,10,193
-lhz_cube.gat,66,129,0	script	cubew02-2	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,59,136,0	script	cubew02-3	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,66,144,0	script	cubew02-4	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-//----------------- Room 67 193 ------------------------------
-lhz_cube.gat,74,192,0	script	cubew03-1	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,67,185,0	script	cubew03-2	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,59,192,0	script	cubew03-3	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,67,200,0	warp	cubew03-4	2,2,lhz_cube.gat,10,136
-//----------------- Room 66 18 -------------------------------
-lhz_cube.gat,74,18,0	script	cubew04-1	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,66,11,0	warp	cubew04-2	2,2,lhz_cube.gat,10,18
-lhz_cube.gat,59,18,0	script	cubew04-3	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,66,26,0	warp	cubew04-4	2,2,lhz_cube.gat,123,18
-//----------------- Room 66 18 -------------------------------
-lhz_cube.gat,18,18,0	warp	cubew05-1	2,2,lhz_cube.gat,10,193
-lhz_cube.gat,10,11,0	warp	cubew05-2	2,2,lhz_cube.gat,123,18
-lhz_cube.gat,3,18,0	script	cubew05-3	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,10,26,0	script	cubew05-4	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-//----------------- Room 10 74 -------------------------------
-lhz_cube.gat,18,74,0	script	cubew06-1	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,10,67,0	warp	cubew06-2	2,2,lhz_cube.gat,123,18
-lhz_cube.gat,3,74,0	warp	cubew06-3	2,2,lhz_cube.gat,66,18
-lhz_cube.gat,10,82,0	script	cubew06-4	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-//----------------- Room 10 136 ------------------------------
-lhz_cube.gat,18,136,0	warp	cubew07-1	2,2,lhz_cube.gat,10,74
-lhz_cube.gat,10,129,0	script	cubew07-2	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,3,136,0	script	cubew07-3	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,10,144,0	script	cubew07-4	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-//----------------- Room 10 193 ------------------------------
-lhz_cube.gat,18,192,0	script	cubew08-1	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,10,185,0	script	cubew08-2	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,3,192,0	warp	cubew08-3	2,2,lhz_cube.gat,10,74
-lhz_cube.gat,10,200,0	warp	cubew08-4	2,2,lhz_cube.gat,66,18
-//----------------- Room 123 18 ------------------------------
-lhz_cube.gat,130,18,0	script	cubew09-1	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,123,11,0	script	cubew09-2	45,1,1,{
-	callfunc "randomw";
-	end;
-}
-lhz_cube.gat,115,18,0	warp	cubew09-3	2,2,lhz_cube.gat,248,184
-lhz_cube.gat,123,26,0	script	cubew09-4	45,1,1,{
-	callfunc "randomw";
-	end;
-}
- 
-//----- Function for Random Warps ----------------------------
-function	script	randomw	{
-	set @rdm,rand(3);
-	if(@rdm==1)goto rdm1;
-	if(@rdm==2)goto rdm2;
- 	warp "lhz_cube.gat",67,193; end;
-	rdm1: warp "lhz_cube.gat",66,136; end;
-	rdm2: warp "lhz_cube.gat",66,74; end;
+//===== Athena Script ========================================
+//= Lighthalzen Dungeon Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.0)
+//===== Current Version: =====================================
+//= 2.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Lighthalzen Dungeon
+//===== Additional Comments: =================================
+//= No Comment!
+//= 1.1 Added temp restriction by Azazel [Lupus]
+//= 1.2 Optimized [Lupus]
+//= and fixed 005 and 005a warps coords, thanks to Justin84 
+//= 1.3 Fixed entrance condition check, thanx2Daegaladh [Lupus]
+//= 1.4 Added coords of secret dungeon entrance, thanks to Justin84
+//= proved with screenshots [Lupus]
+//= 1.5a thx2 Justin84, some additions and fixes [Lupus]
+//= 1.5b re-enabled main entrance warp [Lupus] <-reverted 1.5c
+//= 1.6 Updated entrances, added Cube room warps, thanx 2 Justin84
+//= 1.6a Disabled the "Entrance" to lhz_dun01 [Poki#3]
+//= 1.6b Updated Sewer Pipe [Vicious]
+//= 1.7 Fixed a warp-back
+//= 1.8 Some small changes [MasterOfMuppets]
+//= 1.9 Removed duplicates [Toms]
+//= 2.0 Now use MISC_QUEST&512 instead of 'hzdun' [Lupus]
+//============================================================
+
+lhz_dun03.gat,140,139,0	warp	lhz003	1,1,lhz_dun02.gat,150,145
+lhz_dun02.gat,18,150,0	warp	lhz004	1,1,lhz_dun01.gat,18,148
+lhz_dun01.gat,18,146,0	warp	lhz004a	1,1,lhz_dun02.gat,18,148
+lhz_dun02.gat,282,155,0	warp	lhz005	1,1,lhz_dun01.gat,281,152
+lhz_dun01.gat,281,150,0	warp	lhz005a	1,1,lhz_dun02.gat,282,153
+lhz_dun02.gat,148,18,0	warp	lhz006	1,1,lhz_dun01.gat,146,10
+lhz_dun01.gat,148,10,0	warp	lhz006a	1,1,lhz_dun02.gat,150,18
+
+//current entrance
+lhz_dun01.gat,150,290,0	warp	lhz007	1,1,lhz_in01.gat,23,137
+//lighthalzen.gat,73,52,0	warp	lhz007a	1,1,lhz_dun01.gat,150,288
+//This should be only an Exit. This warp doesn't exist on kRO.
+
+//--------------------------Sewer Pipe--------------------------
+
+lighthalzen.gat,313,301,0	script	Sewer Pipe	111,{
+	mes "You see some pipes for a sewage system.";
+	if(MISC_QUEST&512){
+		mes "You found the way into the lab.";
+		next;
+		menu "Go in.",-,"Do not go in.",L_NO;
+
+		warp "lhz_cube.gat",231,17;
+		end;
+	}
+L_NO:
+	close;
+}
+
+//--------------------------Warp--------------------------
+
+//Cube room <-> Organism test laboratory level 2
+lhz_cube.gat,231,96,0	warp	lhzcube1	1,1,lhz_dun02.gat,220,6
+lhz_dun02.gat,224,6,0	warp	lhzcube2	1,1,lhz_cube.gat,231,90
+
+//Cube room -> Lighthalzen
+lhz_cube.gat,231,12,0	warp	lhzcube3	1,1,lighthalzen.gat,310,302
+lhz_cube.gat,177,96,0	warp	lhzcube4	1,1,lighthalzen.gat,310,302
+
+lhz_dun02.gat,150,149,4	script	lhz-warp	45,2,2,{
+OnTouch:
+	if(Upper != 1 && BaseLevel<95)goto s_Noentry0;
+	if(Upper == 1 && BaseLevel<90)goto s_Noentry1;
+	warp "lhz_dun03",140,137;
+	end;
+
+s_Noentry0:
+	mes "Non-Advanced class characters must be at least base level 95 to enter level 3 of the Bio Lab Dungeon";
+	close; 
+
+s_Noentry1:
+	mes "Advanced class characters must be at least base level 90 to enter level 3 of the Bio Lab Dungeon";
+	close;
+}
+
+//----------------- Cube Room Maze ---------------------------
+// -1 are warps facing east.
+// -2 the warps facing south.
+// -3 are warps facing west.
+// -4 are warps facing north.
+//----------------- Room 66 74 -------------------------------
+lhz_cube.gat,74,74,0	script	cubew01-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,66,67,0	warp	cubew01-2	2,2,lhz_cube.gat,10,18
+lhz_cube.gat,59,74,0	script	cubew01-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,66,82,0	script	cubew01-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 66 136 ------------------------------
+lhz_cube.gat,74,136,0	warp	cubew02-1	2,2,lhz_cube.gat,10,193
+lhz_cube.gat,66,129,0	script	cubew02-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,59,136,0	script	cubew02-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,66,144,0	script	cubew02-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 67 193 ------------------------------
+lhz_cube.gat,74,192,0	script	cubew03-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,67,185,0	script	cubew03-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,59,192,0	script	cubew03-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,67,200,0	warp	cubew03-4	2,2,lhz_cube.gat,10,136
+//----------------- Room 66 18 -------------------------------
+lhz_cube.gat,74,18,0	script	cubew04-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,66,11,0	warp	cubew04-2	2,2,lhz_cube.gat,10,18
+lhz_cube.gat,59,18,0	script	cubew04-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,66,26,0	warp	cubew04-4	2,2,lhz_cube.gat,123,18
+//----------------- Room 66 18 -------------------------------
+lhz_cube.gat,18,18,0	warp	cubew05-1	2,2,lhz_cube.gat,10,193
+lhz_cube.gat,10,11,0	warp	cubew05-2	2,2,lhz_cube.gat,123,18
+lhz_cube.gat,3,18,0	script	cubew05-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,10,26,0	script	cubew05-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 10 74 -------------------------------
+lhz_cube.gat,18,74,0	script	cubew06-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,10,67,0	warp	cubew06-2	2,2,lhz_cube.gat,123,18
+lhz_cube.gat,3,74,0	warp	cubew06-3	2,2,lhz_cube.gat,66,18
+lhz_cube.gat,10,82,0	script	cubew06-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 10 136 ------------------------------
+lhz_cube.gat,18,136,0	warp	cubew07-1	2,2,lhz_cube.gat,10,74
+lhz_cube.gat,10,129,0	script	cubew07-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,3,136,0	script	cubew07-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,10,144,0	script	cubew07-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 10 193 ------------------------------
+lhz_cube.gat,18,192,0	script	cubew08-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,10,185,0	script	cubew08-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,3,192,0	warp	cubew08-3	2,2,lhz_cube.gat,10,74
+lhz_cube.gat,10,200,0	warp	cubew08-4	2,2,lhz_cube.gat,66,18
+//----------------- Room 123 18 ------------------------------
+lhz_cube.gat,130,18,0	script	cubew09-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,123,11,0	script	cubew09-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube.gat,115,18,0	warp	cubew09-3	2,2,lhz_cube.gat,248,184
+lhz_cube.gat,123,26,0	script	cubew09-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+ 
+//----- Function for Random Warps ----------------------------
+function	script	randomw	{
+	set @rdm,rand(3);
+	if(@rdm==1)goto rdm1;
+	if(@rdm==2)goto rdm2;
+ 	warp "lhz_cube.gat",67,193; end;
+	rdm1: warp "lhz_cube.gat",66,136; end;
+	rdm2: warp "lhz_cube.gat",66,74; end;
 }
 \ 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 f355af847..f67b75269 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.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
-//===== Description: =========================================
-//= Warp Points for Lutie Dungeon (Toy Factory)
-//===== Additional Comments: =================================
-//= 1.1 Fixed endless warping loop
-//============================================================
-
-//= Toy Factory ==============================================
-xmas_dun01.gat,128,133,0	warp	xmas15	3,3,xmas_dun02.gat,129,133
-xmas_dun01.gat,205,13,0	warp	xmas14-1	3,3,xmas.gat,143,308
+//===== Athena Script ========================================
+//= Lutie Dungeon (Toy Factory) Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Lutie Dungeon (Toy Factory)
+//===== Additional Comments: =================================
+//= 1.1 Fixed endless warping loop
+//============================================================
+
+//= Toy Factory ==============================================
+xmas_dun01.gat,128,133,0	warp	xmas15	3,3,xmas_dun02.gat,129,133
+xmas_dun01.gat,205,13,0	warp	xmas14-1	3,3,xmas.gat,143,308
 xmas_dun02.gat,129,129,0	warp	xmas15-1	3,3,xmas_dun01.gat,128,128
 \ No newline at end of file
diff --git a/npc/warps/dungeons/morroc_duns.txt b/npc/warps/dungeons/morroc_duns.txt
index bcdb56807..dfb74bc05 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,10
-moc_pryd05.gat,94,98,0	warp	mocp09	2,1,moc_prydb1.gat,100,57
-moc_pryd06.gat,197,10,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,10
+moc_pryd05.gat,94,98,0	warp	mocp09	2,1,moc_prydb1.gat,100,57
+moc_pryd06.gat,197,10,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/odin.txt b/npc/warps/dungeons/odin.txt
index 4abbbbcad..211601133 100644
--- a/npc/warps/dungeons/odin.txt
+++ b/npc/warps/dungeons/odin.txt
@@ -1,69 +1,69 @@
-//===== Athena Script ========================================
-//= Odin Temple Warp Script
-//===== By: ==================================================
-//= birkiczd  (1.0)
-//===== Current Version: =====================================
-//= 1.2
-//===== 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.
-//= 1.2 Removed Duplicates [Silent]
-//============================================================
-
-odin_tem01.gat,378,181,0	warp	odin01	1,1,odin_tem02.gat,22,181
-odin_tem02.gat,20,181,0	warp	odin02	1,1,odin_tem01.gat,376,181
-odin_tem01.gat,384,334,0	warp	odin03	1,1,odin_tem02.gat,23,334
-odin_tem02.gat,20,334,0	warp	odin04	1,1,odin_tem01.gat,381,334
-odin_tem02.gat,152,350,0	warp	odin05	1,1,odin_tem03.gat,121,51
-odin_tem03.gat,122,48,0	warp	odin06	1,1,odin_tem02.gat,153,347
-odin_tem02.gat,259,374,0	warp	odin07	1,1,odin_tem03.gat,249,35
-odin_tem03.gat,249,33,0	warp	odin08	1,1,odin_tem02.gat,262,371
-
-hugel.gat,209,109,1	script	Sailor Hako#01	709,{
-	mes "[Sailor Hako]";
-	mes "Hello stranger. I'm the only person that offers a unique trip to the cursed Odin Islands.";
-	mes "One of the strongest monsters known to man live there, so no wonder. Ha, ha, ha~!";
-	next;
-	mes "[Sailor Hako]";
-	mes "Anyway I'm planing a trip right now. I'll let you tag along for a measly 800 zeny. You dig?";
-	next;
-	menu "Yeah, I dig.",-,"No, thanks.",L_No;
-	mes "[Sailor Hako]";
-	if (Zeny < 800) goto L_Zeny;
-	set Zeny, Zeny-800;
-	mes "All aboard!";
-	next;
-	warp "odin_tem01.gat",100,145;
-	end;
-
-L_Zeny:
-	mes "Who are ya trying to kid? You're poor like a church mouse!";
-	mes "Come back whey you make some cash, and I'll let you hike along";
-	close;
-
-L_No:
-	mes "[Sailor Hako]";
-	mes "Suit yourself. Se ya!";
-	close;
-}
-
-odin_tem01.gat,93,146,3	script	Sailor Hako#02	709,{
-	mes "[Sailor Hako]";
-	mes "So how is it? Not to hard for ya? Wanna to go back to Hugel?";
-	next;
-	menu "Yeah...",-,"Nope.",L_No;
-	mes "[Sailor Hako]";
-	mes "All aboard!";
-	next;
-	warp "hugel.gat",205,108;
-	end;
-
-L_No:
-	mes "[Sailor Hako]";
-	mes "Suit yourself.";
-	close;
+//===== Athena Script ========================================
+//= Odin Temple Warp Script
+//===== By: ==================================================
+//= birkiczd  (1.0)
+//===== Current Version: =====================================
+//= 1.2
+//===== 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.
+//= 1.2 Removed Duplicates [Silent]
+//============================================================
+
+odin_tem01.gat,378,181,0	warp	odin01	1,1,odin_tem02.gat,22,181
+odin_tem02.gat,20,181,0	warp	odin02	1,1,odin_tem01.gat,376,181
+odin_tem01.gat,384,334,0	warp	odin03	1,1,odin_tem02.gat,23,334
+odin_tem02.gat,20,334,0	warp	odin04	1,1,odin_tem01.gat,381,334
+odin_tem02.gat,152,350,0	warp	odin05	1,1,odin_tem03.gat,121,51
+odin_tem03.gat,122,48,0	warp	odin06	1,1,odin_tem02.gat,153,347
+odin_tem02.gat,259,374,0	warp	odin07	1,1,odin_tem03.gat,249,35
+odin_tem03.gat,249,33,0	warp	odin08	1,1,odin_tem02.gat,262,371
+
+hugel.gat,209,109,1	script	Sailor Hako#01	709,{
+	mes "[Sailor Hako]";
+	mes "Hello stranger. I'm the only person that offers a unique trip to the cursed Odin Islands.";
+	mes "One of the strongest monsters known to man live there, so no wonder. Ha, ha, ha~!";
+	next;
+	mes "[Sailor Hako]";
+	mes "Anyway I'm planing a trip right now. I'll let you tag along for a measly 800 zeny. You dig?";
+	next;
+	menu "Yeah, I dig.",-,"No, thanks.",L_No;
+	mes "[Sailor Hako]";
+	if (Zeny < 800) goto L_Zeny;
+	set Zeny, Zeny-800;
+	mes "All aboard!";
+	next;
+	warp "odin_tem01.gat",100,145;
+	end;
+
+L_Zeny:
+	mes "Who are ya trying to kid? You're poor like a church mouse!";
+	mes "Come back whey you make some cash, and I'll let you hike along";
+	close;
+
+L_No:
+	mes "[Sailor Hako]";
+	mes "Suit yourself. Se ya!";
+	close;
+}
+
+odin_tem01.gat,93,146,3	script	Sailor Hako#02	709,{
+	mes "[Sailor Hako]";
+	mes "So how is it? Not to hard for ya? Wanna to go back to Hugel?";
+	next;
+	menu "Yeah...",-,"Nope.",L_No;
+	mes "[Sailor Hako]";
+	mes "All aboard!";
+	next;
+	warp "hugel.gat",205,108;
+	end;
+
+L_No:
+	mes "[Sailor Hako]";
+	mes "Suit yourself.";
+	close;
 }
 \ No newline at end of file
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 1857a3c86..779714d39 100644
--- a/npc/warps/dungeons/payon_dun.txt
+++ b/npc/warps/dungeons/payon_dun.txt
@@ -1,36 +1,36 @@
-//===== eAthena Script ======================================= 
-//= Payon Cave Warps
-//===== By: ================================================== 
-//= Nana (1.0)
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Compatible With: ===================================== 
-//= Any eAthena Mod
-//===== Description: ========================================= 
-//= Payon Dungeon Warps
-//===== Additional Comments: ================================= 
-//= 1.1a Fixed 'payd04r' warping players to a non-existant tile [MasterOfMuppets]
-//============================================================ 
-
-//= Payon Cave ===============================================
-pay_dun00.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==1) goto w2;
-	if(@r==2) goto w3;
-	if(@r==3) goto w4;
-		warp "pay_dun04.gat",201,204; end;
-	w2:	warp "pay_dun04.gat",189,43; end;
-	w3:	warp "pay_dun04.gat",43,40; end;
-	w4:	warp "pay_dun04.gat",34,202; end;
-}		
-pay_dun04.gat,191,41,0	warp	payd04-2	1,1,pay_dun03.gat,124,62	
-pay_dun04.gat,202,206,0	warp	payd04-3	1,1,pay_dun03.gat,124,62	
-pay_dun04.gat,32,204,0	warp	payd04-4	2,1,pay_dun03.gat,124,62	
-pay_dun04.gat,40,37,0	warp	payd04-1	2,2,pay_dun03.gat,124,62	
+//===== eAthena Script ======================================= 
+//= Payon Cave Warps
+//===== By: ================================================== 
+//= Nana (1.0)
+//===== Current Version: ===================================== 
+//= 1.2
+//===== Compatible With: ===================================== 
+//= Any eAthena Mod
+//===== Description: ========================================= 
+//= Payon Dungeon Warps
+//===== Additional Comments: ================================= 
+//= 1.1a Fixed 'payd04r' warping players to a non-existant tile [MasterOfMuppets]
+//============================================================ 
+
+//= Payon Cave ===============================================
+pay_dun00.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==1) goto w2;
+	if(@r==2) goto w3;
+	if(@r==3) goto w4;
+		warp "pay_dun04.gat",201,204; end;
+	w2:	warp "pay_dun04.gat",189,43; end;
+	w3:	warp "pay_dun04.gat",43,40; end;
+	w4:	warp "pay_dun04.gat",34,202; end;
+}		
+pay_dun04.gat,191,41,0	warp	payd04-2	1,1,pay_dun03.gat,124,62	
+pay_dun04.gat,202,206,0	warp	payd04-3	1,1,pay_dun03.gat,124,62	
+pay_dun04.gat,32,204,0	warp	payd04-4	2,1,pay_dun03.gat,124,62	
+pay_dun04.gat,40,37,0	warp	payd04-1	2,2,pay_dun03.gat,124,62	
diff --git a/npc/warps/dungeons/prt_dun.txt b/npc/warps/dungeons/prt_dun.txt
index 8b8b001d3..abf667485 100644
--- a/npc/warps/dungeons/prt_dun.txt
+++ b/npc/warps/dungeons/prt_dun.txt
@@ -1,242 +1,242 @@
-//===== Athena Script ========================================
-//= Prontera Dungeons Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Prontera Dungeons
-//===== Additional Comments: =================================
-//= 1.1 updating according to jA. Optimized scripts [Lupus]
-//============================================================
-
-//= Hidden Temple ============================================
-// ----- (1st Floor No.03)(1st Floor No.16)(1st Floor No.20)
-// 1st Floor No.01 -------------------------------------------------------------
-prt_maze01.gat,22,194,0	warp	mazewarp5101	1,1,prt_maze01.gat,16,31	/*To No.1-21*/
-prt_maze01.gat,5,186,0	warp	mazewarp5102	1,1,prt_maze01.gat,182,88	/*To No.1-15*/
-// 1st Floor No.02
-prt_maze01.gat,58,194,0	warp	mazewarp5103	1,1,prt_maze01.gat,23,128	/*To No.1-6*/
-// 1st Floor No.03
-prt_maze01.gat,102,165,0	warp	mazewarp5104	1,1,prt_maze01.gat,99,31	/*To No.1-23*/
-prt_maze01.gat,85,174,0	warp	mazewarp5105	1,1,prt_maze02.gat,93,20
-// 1st Floor No.04
-prt_maze01.gat,154,181,0	warp	mazewarp5106	1,1,prt_maze01.gat,191,175	/*To No.1-5*/
-prt_maze01.gat,125,171,0	warp	mazewarp5107	1,1,prt_maze01.gat,8,186	/*To No.1-1*/
-// 1st Floor No.05
-prt_maze01.gat,175,165,0	warp	mazewarp5108	1,1,prt_maze01.gat,48,104	/*To No.1-12*/
-prt_maze01.gat,194,175,0	warp	mazewarp5109	1,1,prt_maze01.gat,23,128	/*To No.1-6*/
-// 1st Floor No.06
-prt_maze01.gat,18,154,0	warp	mazewarp5110	1,1,prt_maze01.gat,177,71	/*To No.1-20*/
-prt_maze01.gat,23,125,0	warp	mazewarp5111	1,1,prt_maze01.gat,151,22	/*To No.1-24*/
-prt_maze01.gat,5,140,0	warp	mazewarp5112	1,1,prt_maze01.gat,58,48	/*To No.1-17*/
-// 1st Floor No.07
-prt_maze01.gat,54,154,0	warp	mazewarp5113	1,1,prt_maze01.gat,191,175	/*To No.1-5*/
-prt_maze01.gat,63,125,0	warp	mazewarp5114	1,1,prt_maze01.gat,182,88	/*To No.1-15*/
-// 1st Floor No.08
-prt_maze01.gat,98,154,0	warp	mazewarp5115	1,1,prt_maze01.gat,102,168	/*To No.1-3*/
-prt_maze01.gat,114,145,0	warp	mazewarp5116	1,1,prt_maze01.gat,23,128	/*To No.1-6*/
-prt_maze01.gat,85,146,0	warp	mazewarp5117	1,1,prt_maze01.gat,142,111	/*To No.1-14*/
-// 1st Floor No.09
-prt_maze01.gat,137,125,0	warp	mazewarp5118	1,1,prt_maze01.gat,191,139	/*To No.1-10*/
-prt_maze01.gat,154,134,0	warp	mazewarp5119	1,1,prt_maze01.gat,58,191	/*To No.1-2*/
-// 1st Floor No.10
-prt_maze01.gat,194,139,0	warp	mazewarp5120	1,1,prt_maze01.gat,22,88	/*To No.1-11*/
-prt_maze01.gat,166,139,0	warp	mazewarp5121	1,1,prt_maze01.gat,128,173	/*To No.1-4*/
-// 1st Floor No.11
-prt_maze01.gat,17,114,0	warp	mazewarp5122	1,1,prt_maze01.gat,8,186	/*To No.1-1*/
-prt_maze01.gat,22,85,0	warp	mazewarp5123	1,1,prt_maze01.gat,137,128	/*To No.1-9*/
-// 1st Floor No.12
-prt_maze01.gat,63,114,0	warp	mazewarp5124	1,1,prt_maze01.gat,111,56	/*To No.1-18*/
-prt_maze01.gat,63,85,0	warp	mazewarp5125	1,1,prt_maze01.gat,151,22	/*To No.1-24*/
-prt_maze01.gat,74,97,0	warp	mazewarp5126	1,1,prt_maze01.gat,71,11	/*To No.1-22*/
-prt_maze01.gat,45,104,0	warp	mazewarp5127	1,1,prt_maze01.gat,63,128	/*To No.1-7*/
-// 1st Floor No.13
-prt_maze01.gat,105,114,0	warp	mazewarp5128	1,1,prt_maze01.gat,111,145	/*To No.1-8?*/
-prt_maze01.gat,114,95,0	warp	mazewarp5129	1,1,prt_maze01.gat,14,48	/*To No.1-16*/
-prt_maze01.gat,85,97,0	warp	mazewarp5130	1,1,prt_maze01.gat,63,128	/*To No.1-7*/
-// 1st Floor No.14
-prt_maze01.gat,142,114,0	warp	mazewarp5131	1,1,prt_maze01.gat,23,128	/*To No.1-6*/
-prt_maze01.gat,125,105,0	warp	mazewarp5132	1,1,prt_maze01.gat,14,48	/*To No.1-16*/
-// 1st Floor No.15
-prt_maze01.gat,182,85,0	warp	mazewarp5133	1,1,prt_maze01.gat,58,48	/*To No.1-17*/
-prt_maze01.gat,194,94,0	warp	mazewarp5134	1,1,prt_maze01.gat,58,191	/*To No.1-2*/
-prt_maze01.gat,168,94,0	warp	mazewarp5135	1,1,prt_maze01.gat,191,139	/*To No.1-10*/
-// 1st Floor No.16
-prt_maze01.gat,14,74,0	warp	mazewarp5136	1,1,prt_maze01.gat,151,22	/*To No.1-24*/
-prt_maze01.gat,14,45,0	warp	mazewarp5137	1,1,mjolnir_12.gat,44,21
-prt_maze01.gat,5,58,0	warp	mazewarp5138	1,1,prt_maze01.gat,48,104	/*To No.1-12*/
-// 1st Floor No.17
-prt_maze01.gat,74,74,0	warp	mazewarp5139	1,1,prt_maze01.gat,58,191	/*To No.1-2*/
-prt_maze01.gat,52,45,0	warp	mazewarp5140	1,1,prt_maze01.gat,139,48	/*To No.1-19*/
-// 1st Floor No.18
-prt_maze01.gat,104,74,0	warp	mazewarp5141	1,1,prt_maze01.gat,14,48	/*To No.1-16*/
-prt_maze01.gat,96,45,0	warp	mazewarp5142	1,1,prt_maze01.gat,63,128	/*To No.1-7*/
-prt_maze01.gat,114,56,0	warp	mazewarp5143	1,1,prt_maze01.gat,176,8	/*To No.1-25*/
-prt_maze01.gat,85,56,0	warp	mazewarp5144	1,1,prt_maze01.gat,105,111	/*To No.1-13*/
-// 1st Floor No.19
-prt_maze01.gat,137,74,0	warp	mazewarp5145	1,1,prt_maze01.gat,182,88	/*To No.1-15*/
-prt_maze01.gat,139,45,0	warp	mazewarp5146	1,1,prt_maze01.gat,71,11	/*To No.1-22*/
-// 1st Floor No.20
-prt_maze01.gat,177,74,0	warp	mazewarp5147	1,1,prt_fild01.gat,136,368
-prt_maze01.gat,175,45,0	warp	mazewarp5148	1,1,prt_maze01.gat,58,48	/*To No.1-17*/
-prt_maze01.gat,194,54,0	warp	mazewarp5149	1,1,prt_maze01.gat,99,31	/*To No.1-23*/
-// 1st Floor No.21
-prt_maze01.gat,16,34,0	warp	mazewarp5150	1,1,prt_maze01.gat,128,173	/*To No.1-4*/
-prt_maze01.gat,23,5,0	warp	mazewarp5151	1,1,prt_maze01.gat,176,8	/*To No.1-25*/
-// 1st Floor No.22
-prt_maze01.gat,54,5,0	warp	mazewarp5152	1,1,prt_maze01.gat,128,173	/*To No.1-4*/
-prt_maze01.gat,74,12,0	warp	mazewarp5153	1,1,prt_maze01.gat,58,48	/*To No.1-17*/
-prt_maze01.gat,45,21,0	warp	mazewarp5154	1,1,prt_maze01.gat,142,111	/*To No.1-14*/
-// 1st Floor No.23
-prt_maze01.gat,99,34,0	warp	mazewarp5155	1,1,prt_maze01.gat,137,128	/*To No.1-9*/
-prt_maze01.gat,114,22,0	warp	mazewarp5156	1,1,prt_maze01.gat,177,71	/*To No.1-20*/
-prt_maze01.gat,85,13,0	warp	mazewarp5157	1,1,prt_maze01.gat,22,88	/*To No.1-11*/
-//1st Floor No.24
-prt_maze01.gat,154,22,0	warp	mazewarp5158	1,1,prt_maze01.gat,139,48	/*To No.1-19*/
-// 1st Floor No.25
-prt_maze01.gat,176,34,0	warp	mazewarp5159	1,1,prt_maze01.gat,8,186	/*To No.1-1*/
-prt_maze01.gat,176,5,0	warp	mazewarp5160	1,1,prt_maze01.gat,137,128	/*To No.1-9*/
-prt_maze01.gat,194,15,0	warp	mazewarp5161	1,1,prt_maze01.gat,52,48	/*To No.1-17*/
-prt_maze01.gat,165,22,0	warp	mazewarp5162	1,1,prt_maze01.gat,63,128	/*To No.1-7*/
-// 2nd Floor -------------------------------------------------------------------
-prt_maze02.gat,93,16,0	warp	mazewarp5201	1,1,prt_maze01.gat,102,168	/*To No.1-3*/
-prt_maze02.gat,100,182,0	warp	mazewarp5202	1,1,prt_maze03.gat,182,88	/*To No.3-15*/
-// 3rd Floor No.01	-------------------------------------------------------------
-prt_maze03.gat,22,194,0	warp	mazewarp5301	1,1,prt_maze03.gat,175,48	/*To No.3-20*/
-prt_maze03.gat,5,186,0	warp	mazewarp5302	1,1,prt_maze03.gat,151,134	/*To No.3-9*/
-//3rd Floor No.02
-prt_maze03.gat,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.gat",98,151; end;	/*To No.3-8*/
-	w2:	warp "prt_maze03.gat",137,128; end;	/*To No.3-9*/
-	w3:	warp "prt_maze03.gat",14,71; end;	/*To No.3-16*/
-	w4:	warp "prt_maze03.gat",54,8; end;	/*To No.3-22*/
-}
-// 3rd Floor No.03
-prt_maze03.gat,102,165,0	warp	mazewarp5304	1,1,prt_maze03.gat,137,71	/*To No.3-19*/
-prt_maze03.gat,85,174,0	warp	mazewarp5305	1,1,prt_maze03.gat,14,47	/*To No.3-16*/
-// 3rd Floor No.04
-prt_maze03.gat,154,181,0	warp	mazewarp5306	1,1,prt_maze03.gat,139,48	/*To No.3-19*/
-prt_maze03.gat,125,171,0	warp	mazewarp5307	1,1,prt_maze03.gat,105,111	/*To No.3-13*/
-// 3rd Floor No.05
-prt_maze03.gat,175,165,0	warp	mazewarp5308	1,1,prt_maze03.gat,71,12	/*To No.3-22*/
-prt_maze03.gat,194,175,0	warp	mazewarp5309	1,1,prt_maze03.gat,191,139	/*To No.3-10*/
-// 3rd Floor No.06
-prt_maze03.gat,18,154,0	warp	mazewarp5310	1,1,prt_maze03.gat,48,21	/*To No.3-22*/
-prt_maze03.gat,23,125,0	warp	mazewarp5311	1,1,prt_maze03.gat,177,71	/*To No.3-20*/
-prt_maze03.gat,5,140,0	warp	mazewarp5312	1,1,prt_maze03.gat,111,56	/*To No.3-18*/
-// 3rd Floor No.07
-prt_maze03.gat,54,154,0	warp	mazewarp5313	1,1,prt_maze03.gat,142,111	/*To No.3-14*/
-prt_maze03.gat,63,125,0	warp	mazewarp5314	1,1,prt_maze03.gat,88,97	/*To No.3-13*/
-// 3rd Floor No.08
-prt_maze03.gat,98,154,0	warp	mazewarp5315	1,1,prt_maze03.gat,99,31	/*To No.3-23*/
-prt_maze03.gat,114,145,0	warp	mazewarp5316	1,1,prt_maze03.gat,168,22	/*To No.3-25*/
-prt_maze03.gat,85,146,0	warp	mazewarp5317	1,1,prt_maze03.gat,22,88	/*To No.3-11*/
-// 3rd Floor No.09
-prt_maze03.gat,137,125,0	warp	mazewarp5318	1,1,prt_maze03.gat,71,71	/*To No.3-17*/
-prt_maze03.gat,154,134,0	warp	mazewarp5319	1,1,prt_maze03.gat,8,186	/*To No.3-1*/
-// 3rd Floor No.10
-prt_maze03.gat,194,139,0	warp	mazewarp5320	1,1,prt_maze03.gat,191,175	/*To No.3-5*/
-prt_maze03.gat,166,139,0	warp	mazewarp5321	1,1,prt_maze03.gat,63,88	/*To No.3-12*/
-// 3rd Floor No.11
-prt_maze03.gat,17,114,0	warp	mazewarp5322	1,1,prt_maze03.gat,128,105	/*To No.3-14*/
-prt_maze03.gat,22,85,0	warp	mazewarp5323	1,1,prt_maze03.gat,88,146	/*To No.3-8*/
-// 3rd Floor No.12
-prt_maze03.gat,63,114,0	warp	mazewarp5324	1,1,prt_maze03.gat,14,71	/*To No.3-16*/
-prt_maze03.gat,63,85,0	warp	mazewarp5325	1,1,prt_maze03.gat,169,139	/*To No.3-10*/
-prt_maze03.gat,74,97,0	warp	mazewarp5326	1,1,prt_maze03.gat,54,8	/*To No.3-22*/
-prt_maze03.gat,45,104,0	warp	mazewarp5327	1,1,prt_maze03.gat,96,48	/*To No.3-18*/
-// 3rd Floor No.13
-prt_maze03.gat,105,114,0	warp	mazewarp5328	1,1,prt_maze03.gat,128,171	/*To No.3-4*/
-prt_maze03.gat,114,95,0	warp	mazewarp5329	1,1,prt_maze03.gat,176,8	/*To No.3-25*/
-prt_maze03.gat,85,97,0	warp	mazewarp5330	1,1,prt_maze03.gat,63,128	/*To No.3-7*/
-// 3rd Floor No.14
-prt_maze03.gat,142,114,0	warp	mazewarp5331	1,1,prt_maze03.gat,54,151	/*To No.3-7*/
-prt_maze03.gat,125,105,0	warp	mazewarp5332	1,1,prt_maze03.gat,58,191	/*To No.3-2*/
-// 3rd Floor No.15
-prt_maze03.gat,182,85,0	warp	mazewarp5333	1,1,prt_maze02.gat,100,179
-prt_maze03.gat,194,94,0	warp	mazewarp5334	1,1,prt_maze03.gat,151,22	/*To No.3-24*/
-prt_maze03.gat,168,94,0	warp	mazewarp5335	1,1,prt_maze03.gat,191,54	/*To No.3-20*/
-// 3rd Floor No.16
-prt_maze03.gat,14,74,0	warp	mazewarp5336	1,1,prt_maze03.gat,63,111	/*To No.3-12*/
-prt_maze03.gat,14,45,0	warp	mazewarp5337	1,1,prt_maze03.gat,88,174	/*To No.3-3*/
-prt_maze03.gat,5,58,0	warp	mazewarp5338	1,1,prt_maze03.gat,191,15	/*To No.3-25*/
-// 3rd Floor No.17
-prt_maze03.gat,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.gat",98,151; end;	/*To No.3-8*/
-	w2:	warp "prt_maze03.gat",137,128; end;	/*To No.3-9*/
-	w3:	warp "prt_maze03.gat",14,71; end;	/*To No.3-16*/
-	w4:	warp "prt_maze03.gat",54,8; end;	/*To No.3-22*/
-}
-prt_maze03.gat,52,45,0	warp	mazewarp5340	1,1,prt_maze03.gat,16,31	/*To No.3-21*/
-// 3rd Floor No.18
-prt_maze03.gat,104,74,0	warp	mazewarp5341	1,1,prt_maze03.gat,111,22	/*To No.3-23*/
-prt_maze03.gat,96,45,0	warp	mazewarp5342	1,1,prt_maze03.gat,48,104	/*To No.3-12*/
-prt_maze03.gat,114,56,0	warp	mazewarp5343	1,1,prt_maze03.gat,8,140	/*To No.3-6*/
-prt_maze03.gat,85,56,0	warp	mazewarp5344	1,1,prt_maze03.gat,176,31	/*To No.3-25*/
-// 3rd Floor No.19
-prt_maze03.gat,137,74,0	warp	mazewarp5345	1,1,prt_maze03.gat,102,168	/*To No.3-3*/
-prt_maze03.gat,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.gat",98,151; end;	/*To No.3-8*/
-	w2:	warp "prt_maze03.gat",137,128; end;	/*To No.3-9*/
-	w3:	warp "prt_maze03.gat",14,71; end;	/*To No.3-16*/
-	w4:	warp "prt_maze03.gat",54,8; end;	/*To No.3-22*/
-}
-// 3rd Floor No.20
-prt_maze03.gat,177,74,0	warp	mazewarp5347	1,1,prt_maze03.gat,23,128	/*To No.3-6*/
-prt_maze03.gat,175,45,0	warp	mazewarp5348	1,1,prt_maze03.gat,22,191	/*To No.3-1*/
-prt_maze03.gat,194,54,0	warp	mazewarp5349	1,1,prt_maze03.gat,171,94	/*To No.3-15*/
-// 3rd Floor No.21
-prt_maze03.gat,16,34,0	warp	mazewarp5350	1,1,prt_maze03.gat,52,48	/*To No.3-17*/
-prt_maze03.gat,23,5,0	warp	mazewarp5351	1,1,prt_maze03.gat,88,13	/*To No.3-23*/
-// 3rd Floor No.22
-prt_maze03.gat,54,5,0	warp	mazewarp5352	1,1,prt_maze03.gat,71,97	/*To No.3-12*/
-prt_maze03.gat,74,12,0	warp	mazewarp5353	1,1,prt_maze03.gat,175,168	/*To No.3-5*/
-prt_maze03.gat,45,21,0	warp	mazewarp5354	1,1,prt_maze03.gat,18,151	/*To No.3-6*/
-// 3rd Floor No.23
-prt_maze03.gat,99,34,0	warp	mazewarp5355	1,1,prt_maze03.gat,98,151	/*To No.3-8*/
-prt_maze03.gat,114,22,0	warp	mazewarp5356	1,1,prt_maze03.gat,104,71	/*To No.3-18*/
-prt_maze03.gat,85,13,0	warp	mazewarp5357	1,1,prt_maze03.gat,23,8	/*To No.3-21*/
-// 3rd Floor No.24
-prt_maze03.gat,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.gat",98,151; end;	/*To No.3-8*/
-	w2:	warp "prt_maze03.gat",137,128; end;	/*To No.3-9*/
-	w3:	warp "prt_maze03.gat",14,71; end;	/*To No.3-16*/
-	w4:	warp "prt_maze03.gat",54,8; end;	/*To No.3-22*/
-}
-// 3rd Floor No.25
-prt_maze03.gat,176,34,0	warp	mazewarp5359	1,1,prt_maze03.gat,88,56	/*To No.3-18*/
-prt_maze03.gat,176,5,0	warp	mazewarp5360	1,1,prt_maze03.gat,111,95	/*To No.3-13*/
-prt_maze03.gat,194,15,0	warp	mazewarp5361	1,1,prt_maze03.gat,8,58	/*To No.3-16*/
-prt_maze03.gat,165,22,0	warp	mazewarp5362	1,1,prt_maze03.gat,111,145	/*To No.3-8*/
-				
-//= 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 Dungeons Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera Dungeons
+//===== Additional Comments: =================================
+//= 1.1 updating according to jA. Optimized scripts [Lupus]
+//============================================================
+
+//= Hidden Temple ============================================
+// ----- (1st Floor No.03)(1st Floor No.16)(1st Floor No.20)
+// 1st Floor No.01 -------------------------------------------------------------
+prt_maze01.gat,22,194,0	warp	mazewarp5101	1,1,prt_maze01.gat,16,31	/*To No.1-21*/
+prt_maze01.gat,5,186,0	warp	mazewarp5102	1,1,prt_maze01.gat,182,88	/*To No.1-15*/
+// 1st Floor No.02
+prt_maze01.gat,58,194,0	warp	mazewarp5103	1,1,prt_maze01.gat,23,128	/*To No.1-6*/
+// 1st Floor No.03
+prt_maze01.gat,102,165,0	warp	mazewarp5104	1,1,prt_maze01.gat,99,31	/*To No.1-23*/
+prt_maze01.gat,85,174,0	warp	mazewarp5105	1,1,prt_maze02.gat,93,20
+// 1st Floor No.04
+prt_maze01.gat,154,181,0	warp	mazewarp5106	1,1,prt_maze01.gat,191,175	/*To No.1-5*/
+prt_maze01.gat,125,171,0	warp	mazewarp5107	1,1,prt_maze01.gat,8,186	/*To No.1-1*/
+// 1st Floor No.05
+prt_maze01.gat,175,165,0	warp	mazewarp5108	1,1,prt_maze01.gat,48,104	/*To No.1-12*/
+prt_maze01.gat,194,175,0	warp	mazewarp5109	1,1,prt_maze01.gat,23,128	/*To No.1-6*/
+// 1st Floor No.06
+prt_maze01.gat,18,154,0	warp	mazewarp5110	1,1,prt_maze01.gat,177,71	/*To No.1-20*/
+prt_maze01.gat,23,125,0	warp	mazewarp5111	1,1,prt_maze01.gat,151,22	/*To No.1-24*/
+prt_maze01.gat,5,140,0	warp	mazewarp5112	1,1,prt_maze01.gat,58,48	/*To No.1-17*/
+// 1st Floor No.07
+prt_maze01.gat,54,154,0	warp	mazewarp5113	1,1,prt_maze01.gat,191,175	/*To No.1-5*/
+prt_maze01.gat,63,125,0	warp	mazewarp5114	1,1,prt_maze01.gat,182,88	/*To No.1-15*/
+// 1st Floor No.08
+prt_maze01.gat,98,154,0	warp	mazewarp5115	1,1,prt_maze01.gat,102,168	/*To No.1-3*/
+prt_maze01.gat,114,145,0	warp	mazewarp5116	1,1,prt_maze01.gat,23,128	/*To No.1-6*/
+prt_maze01.gat,85,146,0	warp	mazewarp5117	1,1,prt_maze01.gat,142,111	/*To No.1-14*/
+// 1st Floor No.09
+prt_maze01.gat,137,125,0	warp	mazewarp5118	1,1,prt_maze01.gat,191,139	/*To No.1-10*/
+prt_maze01.gat,154,134,0	warp	mazewarp5119	1,1,prt_maze01.gat,58,191	/*To No.1-2*/
+// 1st Floor No.10
+prt_maze01.gat,194,139,0	warp	mazewarp5120	1,1,prt_maze01.gat,22,88	/*To No.1-11*/
+prt_maze01.gat,166,139,0	warp	mazewarp5121	1,1,prt_maze01.gat,128,173	/*To No.1-4*/
+// 1st Floor No.11
+prt_maze01.gat,17,114,0	warp	mazewarp5122	1,1,prt_maze01.gat,8,186	/*To No.1-1*/
+prt_maze01.gat,22,85,0	warp	mazewarp5123	1,1,prt_maze01.gat,137,128	/*To No.1-9*/
+// 1st Floor No.12
+prt_maze01.gat,63,114,0	warp	mazewarp5124	1,1,prt_maze01.gat,111,56	/*To No.1-18*/
+prt_maze01.gat,63,85,0	warp	mazewarp5125	1,1,prt_maze01.gat,151,22	/*To No.1-24*/
+prt_maze01.gat,74,97,0	warp	mazewarp5126	1,1,prt_maze01.gat,71,11	/*To No.1-22*/
+prt_maze01.gat,45,104,0	warp	mazewarp5127	1,1,prt_maze01.gat,63,128	/*To No.1-7*/
+// 1st Floor No.13
+prt_maze01.gat,105,114,0	warp	mazewarp5128	1,1,prt_maze01.gat,111,145	/*To No.1-8?*/
+prt_maze01.gat,114,95,0	warp	mazewarp5129	1,1,prt_maze01.gat,14,48	/*To No.1-16*/
+prt_maze01.gat,85,97,0	warp	mazewarp5130	1,1,prt_maze01.gat,63,128	/*To No.1-7*/
+// 1st Floor No.14
+prt_maze01.gat,142,114,0	warp	mazewarp5131	1,1,prt_maze01.gat,23,128	/*To No.1-6*/
+prt_maze01.gat,125,105,0	warp	mazewarp5132	1,1,prt_maze01.gat,14,48	/*To No.1-16*/
+// 1st Floor No.15
+prt_maze01.gat,182,85,0	warp	mazewarp5133	1,1,prt_maze01.gat,58,48	/*To No.1-17*/
+prt_maze01.gat,194,94,0	warp	mazewarp5134	1,1,prt_maze01.gat,58,191	/*To No.1-2*/
+prt_maze01.gat,168,94,0	warp	mazewarp5135	1,1,prt_maze01.gat,191,139	/*To No.1-10*/
+// 1st Floor No.16
+prt_maze01.gat,14,74,0	warp	mazewarp5136	1,1,prt_maze01.gat,151,22	/*To No.1-24*/
+prt_maze01.gat,14,45,0	warp	mazewarp5137	1,1,mjolnir_12.gat,44,21
+prt_maze01.gat,5,58,0	warp	mazewarp5138	1,1,prt_maze01.gat,48,104	/*To No.1-12*/
+// 1st Floor No.17
+prt_maze01.gat,74,74,0	warp	mazewarp5139	1,1,prt_maze01.gat,58,191	/*To No.1-2*/
+prt_maze01.gat,52,45,0	warp	mazewarp5140	1,1,prt_maze01.gat,139,48	/*To No.1-19*/
+// 1st Floor No.18
+prt_maze01.gat,104,74,0	warp	mazewarp5141	1,1,prt_maze01.gat,14,48	/*To No.1-16*/
+prt_maze01.gat,96,45,0	warp	mazewarp5142	1,1,prt_maze01.gat,63,128	/*To No.1-7*/
+prt_maze01.gat,114,56,0	warp	mazewarp5143	1,1,prt_maze01.gat,176,8	/*To No.1-25*/
+prt_maze01.gat,85,56,0	warp	mazewarp5144	1,1,prt_maze01.gat,105,111	/*To No.1-13*/
+// 1st Floor No.19
+prt_maze01.gat,137,74,0	warp	mazewarp5145	1,1,prt_maze01.gat,182,88	/*To No.1-15*/
+prt_maze01.gat,139,45,0	warp	mazewarp5146	1,1,prt_maze01.gat,71,11	/*To No.1-22*/
+// 1st Floor No.20
+prt_maze01.gat,177,74,0	warp	mazewarp5147	1,1,prt_fild01.gat,136,368
+prt_maze01.gat,175,45,0	warp	mazewarp5148	1,1,prt_maze01.gat,58,48	/*To No.1-17*/
+prt_maze01.gat,194,54,0	warp	mazewarp5149	1,1,prt_maze01.gat,99,31	/*To No.1-23*/
+// 1st Floor No.21
+prt_maze01.gat,16,34,0	warp	mazewarp5150	1,1,prt_maze01.gat,128,173	/*To No.1-4*/
+prt_maze01.gat,23,5,0	warp	mazewarp5151	1,1,prt_maze01.gat,176,8	/*To No.1-25*/
+// 1st Floor No.22
+prt_maze01.gat,54,5,0	warp	mazewarp5152	1,1,prt_maze01.gat,128,173	/*To No.1-4*/
+prt_maze01.gat,74,12,0	warp	mazewarp5153	1,1,prt_maze01.gat,58,48	/*To No.1-17*/
+prt_maze01.gat,45,21,0	warp	mazewarp5154	1,1,prt_maze01.gat,142,111	/*To No.1-14*/
+// 1st Floor No.23
+prt_maze01.gat,99,34,0	warp	mazewarp5155	1,1,prt_maze01.gat,137,128	/*To No.1-9*/
+prt_maze01.gat,114,22,0	warp	mazewarp5156	1,1,prt_maze01.gat,177,71	/*To No.1-20*/
+prt_maze01.gat,85,13,0	warp	mazewarp5157	1,1,prt_maze01.gat,22,88	/*To No.1-11*/
+//1st Floor No.24
+prt_maze01.gat,154,22,0	warp	mazewarp5158	1,1,prt_maze01.gat,139,48	/*To No.1-19*/
+// 1st Floor No.25
+prt_maze01.gat,176,34,0	warp	mazewarp5159	1,1,prt_maze01.gat,8,186	/*To No.1-1*/
+prt_maze01.gat,176,5,0	warp	mazewarp5160	1,1,prt_maze01.gat,137,128	/*To No.1-9*/
+prt_maze01.gat,194,15,0	warp	mazewarp5161	1,1,prt_maze01.gat,52,48	/*To No.1-17*/
+prt_maze01.gat,165,22,0	warp	mazewarp5162	1,1,prt_maze01.gat,63,128	/*To No.1-7*/
+// 2nd Floor -------------------------------------------------------------------
+prt_maze02.gat,93,16,0	warp	mazewarp5201	1,1,prt_maze01.gat,102,168	/*To No.1-3*/
+prt_maze02.gat,100,182,0	warp	mazewarp5202	1,1,prt_maze03.gat,182,88	/*To No.3-15*/
+// 3rd Floor No.01	-------------------------------------------------------------
+prt_maze03.gat,22,194,0	warp	mazewarp5301	1,1,prt_maze03.gat,175,48	/*To No.3-20*/
+prt_maze03.gat,5,186,0	warp	mazewarp5302	1,1,prt_maze03.gat,151,134	/*To No.3-9*/
+//3rd Floor No.02
+prt_maze03.gat,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.gat",98,151; end;	/*To No.3-8*/
+	w2:	warp "prt_maze03.gat",137,128; end;	/*To No.3-9*/
+	w3:	warp "prt_maze03.gat",14,71; end;	/*To No.3-16*/
+	w4:	warp "prt_maze03.gat",54,8; end;	/*To No.3-22*/
+}
+// 3rd Floor No.03
+prt_maze03.gat,102,165,0	warp	mazewarp5304	1,1,prt_maze03.gat,137,71	/*To No.3-19*/
+prt_maze03.gat,85,174,0	warp	mazewarp5305	1,1,prt_maze03.gat,14,47	/*To No.3-16*/
+// 3rd Floor No.04
+prt_maze03.gat,154,181,0	warp	mazewarp5306	1,1,prt_maze03.gat,139,48	/*To No.3-19*/
+prt_maze03.gat,125,171,0	warp	mazewarp5307	1,1,prt_maze03.gat,105,111	/*To No.3-13*/
+// 3rd Floor No.05
+prt_maze03.gat,175,165,0	warp	mazewarp5308	1,1,prt_maze03.gat,71,12	/*To No.3-22*/
+prt_maze03.gat,194,175,0	warp	mazewarp5309	1,1,prt_maze03.gat,191,139	/*To No.3-10*/
+// 3rd Floor No.06
+prt_maze03.gat,18,154,0	warp	mazewarp5310	1,1,prt_maze03.gat,48,21	/*To No.3-22*/
+prt_maze03.gat,23,125,0	warp	mazewarp5311	1,1,prt_maze03.gat,177,71	/*To No.3-20*/
+prt_maze03.gat,5,140,0	warp	mazewarp5312	1,1,prt_maze03.gat,111,56	/*To No.3-18*/
+// 3rd Floor No.07
+prt_maze03.gat,54,154,0	warp	mazewarp5313	1,1,prt_maze03.gat,142,111	/*To No.3-14*/
+prt_maze03.gat,63,125,0	warp	mazewarp5314	1,1,prt_maze03.gat,88,97	/*To No.3-13*/
+// 3rd Floor No.08
+prt_maze03.gat,98,154,0	warp	mazewarp5315	1,1,prt_maze03.gat,99,31	/*To No.3-23*/
+prt_maze03.gat,114,145,0	warp	mazewarp5316	1,1,prt_maze03.gat,168,22	/*To No.3-25*/
+prt_maze03.gat,85,146,0	warp	mazewarp5317	1,1,prt_maze03.gat,22,88	/*To No.3-11*/
+// 3rd Floor No.09
+prt_maze03.gat,137,125,0	warp	mazewarp5318	1,1,prt_maze03.gat,71,71	/*To No.3-17*/
+prt_maze03.gat,154,134,0	warp	mazewarp5319	1,1,prt_maze03.gat,8,186	/*To No.3-1*/
+// 3rd Floor No.10
+prt_maze03.gat,194,139,0	warp	mazewarp5320	1,1,prt_maze03.gat,191,175	/*To No.3-5*/
+prt_maze03.gat,166,139,0	warp	mazewarp5321	1,1,prt_maze03.gat,63,88	/*To No.3-12*/
+// 3rd Floor No.11
+prt_maze03.gat,17,114,0	warp	mazewarp5322	1,1,prt_maze03.gat,128,105	/*To No.3-14*/
+prt_maze03.gat,22,85,0	warp	mazewarp5323	1,1,prt_maze03.gat,88,146	/*To No.3-8*/
+// 3rd Floor No.12
+prt_maze03.gat,63,114,0	warp	mazewarp5324	1,1,prt_maze03.gat,14,71	/*To No.3-16*/
+prt_maze03.gat,63,85,0	warp	mazewarp5325	1,1,prt_maze03.gat,169,139	/*To No.3-10*/
+prt_maze03.gat,74,97,0	warp	mazewarp5326	1,1,prt_maze03.gat,54,8	/*To No.3-22*/
+prt_maze03.gat,45,104,0	warp	mazewarp5327	1,1,prt_maze03.gat,96,48	/*To No.3-18*/
+// 3rd Floor No.13
+prt_maze03.gat,105,114,0	warp	mazewarp5328	1,1,prt_maze03.gat,128,171	/*To No.3-4*/
+prt_maze03.gat,114,95,0	warp	mazewarp5329	1,1,prt_maze03.gat,176,8	/*To No.3-25*/
+prt_maze03.gat,85,97,0	warp	mazewarp5330	1,1,prt_maze03.gat,63,128	/*To No.3-7*/
+// 3rd Floor No.14
+prt_maze03.gat,142,114,0	warp	mazewarp5331	1,1,prt_maze03.gat,54,151	/*To No.3-7*/
+prt_maze03.gat,125,105,0	warp	mazewarp5332	1,1,prt_maze03.gat,58,191	/*To No.3-2*/
+// 3rd Floor No.15
+prt_maze03.gat,182,85,0	warp	mazewarp5333	1,1,prt_maze02.gat,100,179
+prt_maze03.gat,194,94,0	warp	mazewarp5334	1,1,prt_maze03.gat,151,22	/*To No.3-24*/
+prt_maze03.gat,168,94,0	warp	mazewarp5335	1,1,prt_maze03.gat,191,54	/*To No.3-20*/
+// 3rd Floor No.16
+prt_maze03.gat,14,74,0	warp	mazewarp5336	1,1,prt_maze03.gat,63,111	/*To No.3-12*/
+prt_maze03.gat,14,45,0	warp	mazewarp5337	1,1,prt_maze03.gat,88,174	/*To No.3-3*/
+prt_maze03.gat,5,58,0	warp	mazewarp5338	1,1,prt_maze03.gat,191,15	/*To No.3-25*/
+// 3rd Floor No.17
+prt_maze03.gat,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.gat",98,151; end;	/*To No.3-8*/
+	w2:	warp "prt_maze03.gat",137,128; end;	/*To No.3-9*/
+	w3:	warp "prt_maze03.gat",14,71; end;	/*To No.3-16*/
+	w4:	warp "prt_maze03.gat",54,8; end;	/*To No.3-22*/
+}
+prt_maze03.gat,52,45,0	warp	mazewarp5340	1,1,prt_maze03.gat,16,31	/*To No.3-21*/
+// 3rd Floor No.18
+prt_maze03.gat,104,74,0	warp	mazewarp5341	1,1,prt_maze03.gat,111,22	/*To No.3-23*/
+prt_maze03.gat,96,45,0	warp	mazewarp5342	1,1,prt_maze03.gat,48,104	/*To No.3-12*/
+prt_maze03.gat,114,56,0	warp	mazewarp5343	1,1,prt_maze03.gat,8,140	/*To No.3-6*/
+prt_maze03.gat,85,56,0	warp	mazewarp5344	1,1,prt_maze03.gat,176,31	/*To No.3-25*/
+// 3rd Floor No.19
+prt_maze03.gat,137,74,0	warp	mazewarp5345	1,1,prt_maze03.gat,102,168	/*To No.3-3*/
+prt_maze03.gat,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.gat",98,151; end;	/*To No.3-8*/
+	w2:	warp "prt_maze03.gat",137,128; end;	/*To No.3-9*/
+	w3:	warp "prt_maze03.gat",14,71; end;	/*To No.3-16*/
+	w4:	warp "prt_maze03.gat",54,8; end;	/*To No.3-22*/
+}
+// 3rd Floor No.20
+prt_maze03.gat,177,74,0	warp	mazewarp5347	1,1,prt_maze03.gat,23,128	/*To No.3-6*/
+prt_maze03.gat,175,45,0	warp	mazewarp5348	1,1,prt_maze03.gat,22,191	/*To No.3-1*/
+prt_maze03.gat,194,54,0	warp	mazewarp5349	1,1,prt_maze03.gat,171,94	/*To No.3-15*/
+// 3rd Floor No.21
+prt_maze03.gat,16,34,0	warp	mazewarp5350	1,1,prt_maze03.gat,52,48	/*To No.3-17*/
+prt_maze03.gat,23,5,0	warp	mazewarp5351	1,1,prt_maze03.gat,88,13	/*To No.3-23*/
+// 3rd Floor No.22
+prt_maze03.gat,54,5,0	warp	mazewarp5352	1,1,prt_maze03.gat,71,97	/*To No.3-12*/
+prt_maze03.gat,74,12,0	warp	mazewarp5353	1,1,prt_maze03.gat,175,168	/*To No.3-5*/
+prt_maze03.gat,45,21,0	warp	mazewarp5354	1,1,prt_maze03.gat,18,151	/*To No.3-6*/
+// 3rd Floor No.23
+prt_maze03.gat,99,34,0	warp	mazewarp5355	1,1,prt_maze03.gat,98,151	/*To No.3-8*/
+prt_maze03.gat,114,22,0	warp	mazewarp5356	1,1,prt_maze03.gat,104,71	/*To No.3-18*/
+prt_maze03.gat,85,13,0	warp	mazewarp5357	1,1,prt_maze03.gat,23,8	/*To No.3-21*/
+// 3rd Floor No.24
+prt_maze03.gat,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.gat",98,151; end;	/*To No.3-8*/
+	w2:	warp "prt_maze03.gat",137,128; end;	/*To No.3-9*/
+	w3:	warp "prt_maze03.gat",14,71; end;	/*To No.3-16*/
+	w4:	warp "prt_maze03.gat",54,8; end;	/*To No.3-22*/
+}
+// 3rd Floor No.25
+prt_maze03.gat,176,34,0	warp	mazewarp5359	1,1,prt_maze03.gat,88,56	/*To No.3-18*/
+prt_maze03.gat,176,5,0	warp	mazewarp5360	1,1,prt_maze03.gat,111,95	/*To No.3-13*/
+prt_maze03.gat,194,15,0	warp	mazewarp5361	1,1,prt_maze03.gat,8,58	/*To No.3-16*/
+prt_maze03.gat,165,22,0	warp	mazewarp5362	1,1,prt_maze03.gat,111,145	/*To No.3-8*/
+				
+//= 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/rachel_dun.txt b/npc/warps/dungeons/rachel_dun.txt
index 314922064..882cdb25d 100644
--- a/npc/warps/dungeons/rachel_dun.txt
+++ b/npc/warps/dungeons/rachel_dun.txt
@@ -1,30 +1,30 @@
-//==== Athena Script =====================================
-//= Rachel Sanctuary Dungeon Warp Script
-//==== By ================================================
-//= Playtester
-//==== Current Version :==================================
-//= 1.2
-//==== Compatible With :==================================
-//= Any Athena Version
-//==== Description :======================================
-//= Warp Points For Rachel Sanctuary Dungeon
-//==== Additional Comment:================================
-//= 1.1 Added $ephiroth's warps [Playtester]
-//= 1.2 Replaced old versions with jAthena's [Playtester]
-//========================================================
-
-// Rachel Sanctuary Dungeon
-ra_san01.gat,140,6,0	warp	rachelwarp4000	1,1,ra_temin.gat,276,318
-ra_san01.gat,140,140,0	warp	rachelwarp4001	1,1,ra_san02.gat,32,21
-ra_san02.gat,30,21,0	warp	rachelwarp4002	1,1,ra_san01.gat,140,138
-ra_san02.gat,291,149,0	warp	rachelwarp4003	1,1,ra_san03.gat,4,149
-ra_san03.gat,2,149,0	warp	rachelwarp4004	1,1,ra_san02.gat,289,149
-ra_san02.gat,214,2,0	warp	rachelwarp4005	1,1,ra_san04.gat,36,221
-ra_san04.gat,36,223,0	warp	rachelwarp4006	1,1,ra_san02.gat,214,4
-ra_san03.gat,86,14,0	warp	rachelwarp4007	1,1,ra_san04.gat,204,220
-ra_san04.gat,204,222,0	warp	rachelwarp4008	1,1,ra_san03.gat,86,16
-ra_san04.gat,120,50,0	warp	rachelwarp4009	1,1,ra_san05.gat,150,9
-ra_san05.gat,150,7,0	warp	rachelwarp4010	1,1,ra_san04.gat,120,48
-ra_san02.gat,214,278,0	warp	rachelwarp4011	1,1,ra_san01.gat,140,138
-ra_san03.gat,124,283,0	warp	rachelwarp4012	1,1,ra_san01.gat,140,138
-ra_san04.gat,120,104,0	warp	rachelwarp4013	1,1,ra_san01.gat,140,138
+//==== Athena Script =====================================
+//= Rachel Sanctuary Dungeon Warp Script
+//==== By ================================================
+//= Playtester
+//==== Current Version :==================================
+//= 1.2
+//==== Compatible With :==================================
+//= Any Athena Version
+//==== Description :======================================
+//= Warp Points For Rachel Sanctuary Dungeon
+//==== Additional Comment:================================
+//= 1.1 Added $ephiroth's warps [Playtester]
+//= 1.2 Replaced old versions with jAthena's [Playtester]
+//========================================================
+
+// Rachel Sanctuary Dungeon
+ra_san01.gat,140,6,0	warp	rachelwarp4000	1,1,ra_temin.gat,276,318
+ra_san01.gat,140,140,0	warp	rachelwarp4001	1,1,ra_san02.gat,32,21
+ra_san02.gat,30,21,0	warp	rachelwarp4002	1,1,ra_san01.gat,140,138
+ra_san02.gat,291,149,0	warp	rachelwarp4003	1,1,ra_san03.gat,4,149
+ra_san03.gat,2,149,0	warp	rachelwarp4004	1,1,ra_san02.gat,289,149
+ra_san02.gat,214,2,0	warp	rachelwarp4005	1,1,ra_san04.gat,36,221
+ra_san04.gat,36,223,0	warp	rachelwarp4006	1,1,ra_san02.gat,214,4
+ra_san03.gat,86,14,0	warp	rachelwarp4007	1,1,ra_san04.gat,204,220
+ra_san04.gat,204,222,0	warp	rachelwarp4008	1,1,ra_san03.gat,86,16
+ra_san04.gat,120,50,0	warp	rachelwarp4009	1,1,ra_san05.gat,150,9
+ra_san05.gat,150,7,0	warp	rachelwarp4010	1,1,ra_san04.gat,120,48
+ra_san02.gat,214,278,0	warp	rachelwarp4011	1,1,ra_san01.gat,140,138
+ra_san03.gat,124,283,0	warp	rachelwarp4012	1,1,ra_san01.gat,140,138
+ra_san04.gat,120,104,0	warp	rachelwarp4013	1,1,ra_san01.gat,140,138
diff --git a/npc/warps/dungeons/thana_custom.txt b/npc/warps/dungeons/thana_custom.txt
index 6eaebdb32..3c4440b8f 100644
--- a/npc/warps/dungeons/thana_custom.txt
+++ b/npc/warps/dungeons/thana_custom.txt
@@ -1,159 +1,159 @@
-//===== Athena Script ========================================
-//= Thanatos Tower Warp Script
-//===== By: ==================================================
-//= Bibilol & Moryagorn  (1.0)
-//===== Current Version: =====================================
-//= 1.6
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 10+
-//===== Description: =========================================
-//= Warp Points for Thanatos Tower
-//===== Additional Comments: =================================
-//= It's just Temp warps [Lupus]
-//= 1.2 Updated to level tha_t12.gat
-//= 1.3 Some warps changes due to official info [Justin84]
-//= 1.4 Fixed 2 warps [Justin84]
-//= 1.5 Added Thanatos entrance warp. Now you can go in [Justin84]
-//= 1.6 Fixed warps: tha_t06,tha_t06a,tha_t06b,tha_t05a
-//=	Added Temp Keys solution [Justin84]
-//============================================================
-
-// Affiliated Files : tha_statues.txt
-// ^^^^ it's in the custom quests
-
-//Hugel Field 01 -> Thanatos Scene 01
-hu_fild01.gat,139,164,0	script	Thanatos Tower Warper	111,{
-	mes "[Thanatos Tower Warper]";
-	mes "There is no turning back.";
-	mes "Are you sure want to go Thanatos Tower?";
-	next;
-	menu "Yes",-,"No",T_CLOSE;
-
-	warp "tha_scene01.gat",131,224;
-	end;
-
-T_CLOSE:
-	close;
-}
-
-//Thanatos Scene 01 -> Thantos Tower F1
-tha_scene01.gat,144,200,0	warp	tha_scene01	1,1,tha_t01.gat,150,39
-tha_t01.gat,150,32,0	warp	tha_scene02	1,1,tha_scene01.gat,142,200
-
-//Thanatos Tower
-tha_scene01.gat,144,200,0	warp	tha_scene03	1,1,tha_t01.gat,150,39
-tha_t01.gat,150,32,0	warp	tha_scene04	1,1,tha_scene01.gat,142,200
-tha_t01.gat,150,149,0	warp	tha_t02	1,1,tha_t02.gat,150,136
-tha_t02.gat,150,129,0	warp	tha_t01	1,1,tha_t01.gat,150,142
-tha_t02.gat,226,161,0	warp	tha_t03	1,1,tha_t03.gat,220,158
-tha_t03.gat,220,165,0	warp	tha_t02a	1,1,tha_t02.gat,226,149
-tha_t03.gat,60,134,0	warp	tha_t04	1,1,tha_t04.gat,59,143
-tha_t04.gat,59,136,0	warp	tha_t03a	1,1,tha_t03.gat,59,126
-tha_t04.gat,83,36,0	warp	tha_t05	1,1,tha_t05.gat,62,11
-//According to official info, 5F it is not possible to return to the 4F, so we disable this warp:
-//tha_t05.gat,62,4,0	warp	tha_t04a	1,1,tha_t04.gat,90,34
-tha_t05.gat,208,96,0	warp	tha_t06	1,1,tha_t06.gat,206,8
-tha_t05.gat,185,232,0	warp	tha_t06a	1,1,tha_t06.gat,206,8
-tha_t05.gat,61,157,0	warp	tha_t06b	1,1,tha_t06.gat,206,8
-tha_t06.gat,206,5,0	warp	tha_t05a	1,1,tha_t05.gat,61,164
-
-//tha_t06.gat,119,120,0	warp	tha_t07	1,1,tha_t07.gat,35,166
-//Thanatos 6F to 7F
-tha_t06.gat,119,120,4	script	tha_t07warp	45,2,2,{
-	mes "You have to gather 4 types of keys to enter the 7th Floor.";
-	mes "Give me the key of red, yellow, blue & green.";
-	next;
-	menu "Give the keys",-,"Leave",T_CLOSE;
-
-	if(countitem(7421) < 1 || countitem(7422) < 1 || countitem(7423) < 1 || countitem(7424) < 1) goto T_1;
-	delitem 7421,1;
-	delitem 7422,1;
-	delitem 7423,1;
-	delitem 7424,1;
-	warp "tha_t07.gat",35,166;
-	end;
-
-T_1:
-	mes "You don't have enough keys.";
-T_CLOSE:
-	close;
-}
-
-
-tha_t07.gat,28,166,0	warp	tha_t06c	1,1,tha_t06.gat,119,127
-tha_t07.gat,112,166,0	warp	tha_t08	1,1,tha_t08.gat,105,44
-tha_t08.gat,112,44,0	warp	tha_t07b	1,1,tha_t07.gat,105,166
-tha_t08.gat,26,44,0	warp	tha_t09	1,1,tha_t09.gat,88,145
-tha_t09.gat,93,145,0	warp	tha_t08	1,1,tha_t08.gat,30,44
-tha_t10.gat,171,138,0	warp	tha_t09	1,1,tha_t09.gat,18,97
-tha_t11.gat,93,36,0	warp	tha_t10	1,1,tha_t10.gat,91,130
-tha_t12.gat,129,51,0	warp	tha_t11	1,1,tha_t11.gat,13,38
-
-//Thana_step
-thana_step.gat,12,73,0	warp	thana_step1	1,1,tha_t12.gat,128,58
-thana_step.gat,16,16,0	warp	thana_step2	1,1,thana_step.gat,32,224
-thana_step.gat,30,224,0	warp	thana_step3	1,1,thana_step.gat,19,16
-thana_step.gat,32,166,0	warp	thana_step4	1,1,thana_step.gat,184,74
-thana_step.gat,180,74,0	warp	thana_step5	1,1,thana_step.gat,36,166
-thana_step.gat,182,16,0	warp	thana_step6	1,1,thana_step.gat,184,224
-thana_step.gat,180,224,0	warp	thana_step7	1,1,thana_step.gat,185,16
-thana_step.gat,182,166,0	warp	thana_step8	1,1,thana_step.gat,73,287
-thana_step.gat,69,287,0	warp	thana_step9	1,1,thana_step.gat,186,166
-thana_step.gat,70,371,0	warp	thana_step10	1,1,thana_step.gat,170,287
-thana_step.gat,174,287,0	warp	thana_step11	1,1,thana_step.gat,74,371
-
-//Thana_boss
-thana_step.gat,169,371,0	warp	thana_boss	1,1,thana_boss.gat,85,76
-thana_boss.gat,80,76,0	warp	thana_step9	1,1,thana_step.gat,163,371
-thana_boss.gat,62,171,0	warp	thana_step10	1,1,thana_step.gat,163,371
-thana_boss.gat,141,217,0	warp	thana_step11	1,1,thana_step.gat,163,371
-thana_boss.gat,202,75,0	warp	thana_step12	1,1,thana_step.gat,163,371
-
-//Temp Plug for KEYS
-tha_t03.gat,139,46,0	script	#TanKey1	111,{
-	if(countitem(7421) < 1) getitem 7421,1;
-	end;
-}
-
-tha_t03.gat,67,70,0	script	#TanKey2	111,{
-	if(countitem(7421) < 1) end;
-	delitem 7421,1;
-	getitem 7426,1;
-	end;
-}
-
-tha_t03.gat,48,143,0	script	#TanKey3	111,{
-	if(countitem(7422) < 1) getitem 7422,1;
-	end;
-}
-
-tha_t03.gat,66,208,0	script	#TanKey4	111,{
-	if(countitem(7422) < 1) end;
-	delitem 7422,1;
-	getitem 7427,1;
-	end;
-}
-
-tha_t03.gat,139,230,0	script	#TanKey5	111,{
-	if(countitem(7423) < 1) getitem 7423,1;
-	end;
-}
-
-tha_t03.gat,208,208,0	script	#TanKey6	111,{
-	if(countitem(7423) < 1) end;
-	delitem 7423,1;
-	getitem 7428,1;
-	end;
-}
-
-tha_t03.gat,230,143,0	script	#TanKey7	111,{
-	if(countitem(7424) < 1) getitem 7424,1;
-	end;
-}
-
-tha_t03.gat,207,70,0	script	#TanKey8	111,{
-	if(countitem(7424) < 1) end;
-	delitem 7424,1;
-	getitem 7429,1;
-	end;
+//===== Athena Script ========================================
+//= Thanatos Tower Warp Script
+//===== By: ==================================================
+//= Bibilol & Moryagorn  (1.0)
+//===== Current Version: =====================================
+//= 1.6
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 10+
+//===== Description: =========================================
+//= Warp Points for Thanatos Tower
+//===== Additional Comments: =================================
+//= It's just Temp warps [Lupus]
+//= 1.2 Updated to level tha_t12.gat
+//= 1.3 Some warps changes due to official info [Justin84]
+//= 1.4 Fixed 2 warps [Justin84]
+//= 1.5 Added Thanatos entrance warp. Now you can go in [Justin84]
+//= 1.6 Fixed warps: tha_t06,tha_t06a,tha_t06b,tha_t05a
+//=	Added Temp Keys solution [Justin84]
+//============================================================
+
+// Affiliated Files : tha_statues.txt
+// ^^^^ it's in the custom quests
+
+//Hugel Field 01 -> Thanatos Scene 01
+hu_fild01.gat,139,164,0	script	Thanatos Tower Warper	111,{
+	mes "[Thanatos Tower Warper]";
+	mes "There is no turning back.";
+	mes "Are you sure want to go Thanatos Tower?";
+	next;
+	menu "Yes",-,"No",T_CLOSE;
+
+	warp "tha_scene01.gat",131,224;
+	end;
+
+T_CLOSE:
+	close;
+}
+
+//Thanatos Scene 01 -> Thantos Tower F1
+tha_scene01.gat,144,200,0	warp	tha_scene01	1,1,tha_t01.gat,150,39
+tha_t01.gat,150,32,0	warp	tha_scene02	1,1,tha_scene01.gat,142,200
+
+//Thanatos Tower
+tha_scene01.gat,144,200,0	warp	tha_scene03	1,1,tha_t01.gat,150,39
+tha_t01.gat,150,32,0	warp	tha_scene04	1,1,tha_scene01.gat,142,200
+tha_t01.gat,150,149,0	warp	tha_t02	1,1,tha_t02.gat,150,136
+tha_t02.gat,150,129,0	warp	tha_t01	1,1,tha_t01.gat,150,142
+tha_t02.gat,226,161,0	warp	tha_t03	1,1,tha_t03.gat,220,158
+tha_t03.gat,220,165,0	warp	tha_t02a	1,1,tha_t02.gat,226,149
+tha_t03.gat,60,134,0	warp	tha_t04	1,1,tha_t04.gat,59,143
+tha_t04.gat,59,136,0	warp	tha_t03a	1,1,tha_t03.gat,59,126
+tha_t04.gat,83,36,0	warp	tha_t05	1,1,tha_t05.gat,62,11
+//According to official info, 5F it is not possible to return to the 4F, so we disable this warp:
+//tha_t05.gat,62,4,0	warp	tha_t04a	1,1,tha_t04.gat,90,34
+tha_t05.gat,208,96,0	warp	tha_t06	1,1,tha_t06.gat,206,8
+tha_t05.gat,185,232,0	warp	tha_t06a	1,1,tha_t06.gat,206,8
+tha_t05.gat,61,157,0	warp	tha_t06b	1,1,tha_t06.gat,206,8
+tha_t06.gat,206,5,0	warp	tha_t05a	1,1,tha_t05.gat,61,164
+
+//tha_t06.gat,119,120,0	warp	tha_t07	1,1,tha_t07.gat,35,166
+//Thanatos 6F to 7F
+tha_t06.gat,119,120,4	script	tha_t07warp	45,2,2,{
+	mes "You have to gather 4 types of keys to enter the 7th Floor.";
+	mes "Give me the key of red, yellow, blue & green.";
+	next;
+	menu "Give the keys",-,"Leave",T_CLOSE;
+
+	if(countitem(7421) < 1 || countitem(7422) < 1 || countitem(7423) < 1 || countitem(7424) < 1) goto T_1;
+	delitem 7421,1;
+	delitem 7422,1;
+	delitem 7423,1;
+	delitem 7424,1;
+	warp "tha_t07.gat",35,166;
+	end;
+
+T_1:
+	mes "You don't have enough keys.";
+T_CLOSE:
+	close;
+}
+
+
+tha_t07.gat,28,166,0	warp	tha_t06c	1,1,tha_t06.gat,119,127
+tha_t07.gat,112,166,0	warp	tha_t08	1,1,tha_t08.gat,105,44
+tha_t08.gat,112,44,0	warp	tha_t07b	1,1,tha_t07.gat,105,166
+tha_t08.gat,26,44,0	warp	tha_t09	1,1,tha_t09.gat,88,145
+tha_t09.gat,93,145,0	warp	tha_t08	1,1,tha_t08.gat,30,44
+tha_t10.gat,171,138,0	warp	tha_t09	1,1,tha_t09.gat,18,97
+tha_t11.gat,93,36,0	warp	tha_t10	1,1,tha_t10.gat,91,130
+tha_t12.gat,129,51,0	warp	tha_t11	1,1,tha_t11.gat,13,38
+
+//Thana_step
+thana_step.gat,12,73,0	warp	thana_step1	1,1,tha_t12.gat,128,58
+thana_step.gat,16,16,0	warp	thana_step2	1,1,thana_step.gat,32,224
+thana_step.gat,30,224,0	warp	thana_step3	1,1,thana_step.gat,19,16
+thana_step.gat,32,166,0	warp	thana_step4	1,1,thana_step.gat,184,74
+thana_step.gat,180,74,0	warp	thana_step5	1,1,thana_step.gat,36,166
+thana_step.gat,182,16,0	warp	thana_step6	1,1,thana_step.gat,184,224
+thana_step.gat,180,224,0	warp	thana_step7	1,1,thana_step.gat,185,16
+thana_step.gat,182,166,0	warp	thana_step8	1,1,thana_step.gat,73,287
+thana_step.gat,69,287,0	warp	thana_step9	1,1,thana_step.gat,186,166
+thana_step.gat,70,371,0	warp	thana_step10	1,1,thana_step.gat,170,287
+thana_step.gat,174,287,0	warp	thana_step11	1,1,thana_step.gat,74,371
+
+//Thana_boss
+thana_step.gat,169,371,0	warp	thana_boss	1,1,thana_boss.gat,85,76
+thana_boss.gat,80,76,0	warp	thana_step9	1,1,thana_step.gat,163,371
+thana_boss.gat,62,171,0	warp	thana_step10	1,1,thana_step.gat,163,371
+thana_boss.gat,141,217,0	warp	thana_step11	1,1,thana_step.gat,163,371
+thana_boss.gat,202,75,0	warp	thana_step12	1,1,thana_step.gat,163,371
+
+//Temp Plug for KEYS
+tha_t03.gat,139,46,0	script	#TanKey1	111,{
+	if(countitem(7421) < 1) getitem 7421,1;
+	end;
+}
+
+tha_t03.gat,67,70,0	script	#TanKey2	111,{
+	if(countitem(7421) < 1) end;
+	delitem 7421,1;
+	getitem 7426,1;
+	end;
+}
+
+tha_t03.gat,48,143,0	script	#TanKey3	111,{
+	if(countitem(7422) < 1) getitem 7422,1;
+	end;
+}
+
+tha_t03.gat,66,208,0	script	#TanKey4	111,{
+	if(countitem(7422) < 1) end;
+	delitem 7422,1;
+	getitem 7427,1;
+	end;
+}
+
+tha_t03.gat,139,230,0	script	#TanKey5	111,{
+	if(countitem(7423) < 1) getitem 7423,1;
+	end;
+}
+
+tha_t03.gat,208,208,0	script	#TanKey6	111,{
+	if(countitem(7423) < 1) end;
+	delitem 7423,1;
+	getitem 7428,1;
+	end;
+}
+
+tha_t03.gat,230,143,0	script	#TanKey7	111,{
+	if(countitem(7424) < 1) getitem 7424,1;
+	end;
+}
+
+tha_t03.gat,207,70,0	script	#TanKey8	111,{
+	if(countitem(7424) < 1) end;
+	delitem 7424,1;
+	getitem 7429,1;
+	end;
 }
 \ No newline at end of file
diff --git a/npc/warps/dungeons/thana_dun.txt b/npc/warps/dungeons/thana_dun.txt
index c999b13bc..b1dabff60 100644
--- a/npc/warps/dungeons/thana_dun.txt
+++ b/npc/warps/dungeons/thana_dun.txt
@@ -1,130 +1,130 @@
-//===== eAthena Script =======================================
-//= Thanatos Tower Warps
-//===== By: ==================================================
-//= [Ishizu-chan]
-//===== Current Version: =====================================
-//= 1.1 Beta
-//===== Compatible With: =====================================
-//= Any eAthena Version i guess?
-//===== Description: =========================================
-//= It's the Thanatos Tower Warps...
-//===== Additional Comments: =================================
-//= 1.0 - First Release [Ishizu-chan]
-//= 1.1 - Added Entrance Warp Guard
-//============================================================
-
-
-// Tour Guide - Thanatos Tower
-hu_fild01.gat,140,163,5	script	Thanatos Tower Guard	852,{
-
-  mes "[Thanatos Tower Guard]";
-  mes "Are you sure you want to go to the Thanatos Tower?";
-  mes "You can't go back, and I'll have to charge 5000 Zeny.";
-  next;
-  menu "Yes.",-,
-       "No.",L_End;
-
-  if (Zeny < 5000) goto L_Zeny;
-  set Zeny, Zeny - 5000;
-  warp "tha_scene01.gat",131,224;
-  end;
-
-  L_Zeny:
-  mes "[Thanatos Tower Guard]";
-  mes "You don't have enough Zeny.";
-  close;
-
-  L_End:
-  mes "[Thanatos Tower Guard]";
-  mes "Goodbye.";
-  close;
-
-}
-
-// Thanatos Scene (tha_scene01.gat)
-tha_scene01.gat,144,200,0	warp	WarpThana0a	1,1,tha_t01.gat,150,39
-tha_t01.gat,150,32,0	warp	WarpThana0b	1,1,tha_scene01.gat,142,200
-
-// Thanatos Tower Level 1 (tha_t01.gat)
-tha_t01.gat,150,149,0	warp	WarpThana1a	1,1,tha_t02.gat,150,129
-tha_t02.gat,150,126,0	warp	WarpThana1b	1,1,tha_t01.gat,150,146
-
-// Thanatos Tower Level 2 (tha_t02.gat)
-tha_t03.gat,218,167,0	warp	WarpThana2a	1,1,tha_t02.gat,227,159
-
-// Thanatos Tower Level 3 (tha_t03.gat)
-tha_t03.gat,60,141,0	warp	WarpThana3a	1,1,tha_t04.gat,60,141
-tha_t04.gat,60,138,0	warp	WarpThana3b	1,1,tha_t03.gat,60,138
-
-// Thanatos Tower Level 4 (tha_t04.gat)
-tha_t04.gat,82,36,0	warp	WarpThana4a	1,1,tha_t05.gat,62,6
-
-// Thanatos Tower Level 5 (tha_t05.gat)
-tha_t05.gat,61,157,0	warp	WarpThana5a	1,1,tha_t05.gat,211,97
-tha_t05.gat,208,97,0	warp	WarpThana5b	1,1,tha_t05.gat,61,162
-tha_t05.gat,186,236,0	warp	WarpThana5c	1,1,tha_t06.gat,207,6
-
-// Thanatos Tower Level 6 (tha_t06.gat)
-tha_t06.gat,119,120,4	script	WarpThana6a	45,2,2,{
-
-  if (ThanaQuest < 31) {
-
-    mes "[Seal]";
-    mes "It seems this portal will only open when 4 Keys are placed in the Keyholes around it.";
-    close;
-
-  }
-
-  warp "thana_step.gat",73,372;
-  end;
-
-}
-thana_step.gat,70,372,0	warp	WarpThana6b	1,1,tha_t06.gat,236,120
-thana_step.gat,173,372,0	warp	WarpThana6c	1,1,tha_t07.gat,28,166
-tha_t07.gat,25,166,0	warp	WarpThana6d	1,1,thana_step.gat,170,372
-
-// Thanatos Tower Level 7 (tha_t07.gat)
-tha_t07.gat,114,166,0	warp	WarpThana7a	1,1,tha_t08.gat,28,44
-tha_t08.gat,25,44,0	warp	WarpThana7b	1,1,tha_t07.gat,111,166
-
-// Thanatos Tower Level 8 (tha_t08.gat)
-tha_t08.gat,114,44,0	warp	WarpThana8a	1,1,thana_step.gat,33,223
-thana_step.gat,30,223,0	warp	WarpThana8b	1,1,tha_t08.gat,111,44
-
-// Thanatos Tower Level 9 (tha_t09.gat)
-thana_step.gat,32,165,0	warp	WarpThana9a	1,1,tha_t09.gat,89,146
-tha_t09.gat,92,146,0	script	WarpThana9b	45,1,1,{
-
-  if (ThanaSteps & 1) warp "thana_step.gat",183,223;
-  else warp "thana_step.gat",35,165;
-  end;
-
-}
-thana_step.gat,180,223,0	warp	WarpThana9c	1,1,tha_t09.gat,89,146
-
-// Thanatos Tower Level 10 (tha_t10.gat)
-thana_step.gat,182,165,0	warp	WarpThana10a	1,1,tha_t10.gat,167,138
-tha_t10.gat,170,138,0	script	WarpThana10b	45,1,1,{
-
-  if (ThanaSteps & 4) warp "thana_step.gat",17,73;
-  else warp "thana_step.gat",185,165;
-  end;
-
-}
-thana_step.gat,14,73,0	warp	WarpThana10c	1,1,tha_t10.gat,167,138
-
-// Thanatos Tower Level 11 (tha_t11.gat)
-thana_step.gat,16,15,0	warp	WarpThana11a	1,1,tha_t11.gat,89,36
-tha_t11.gat,92,36,0	script	WarpThana11b	45,1,1,{
-
-  if (ThanaSteps & 64) warp "thana_step.gat",183,73;
-  else warp "thana_step.gat",19,15;
-  end;
-
-}
-thana_step.gat,180,73,0	warp	WarpThana11c	1,1,tha_t11.gat,89,36
-
-// Thanatos Tower Level 12 (tha_t12.gat)
-thana_step.gat,182,15,0	warp	WarpThana12a	1,1,tha_t12.gat,129,51
-thana_step.gat,70,288,0	warp	WarpThana12b	1,1,tha_t12.gat,129,51
+//===== eAthena Script =======================================
+//= Thanatos Tower Warps
+//===== By: ==================================================
+//= [Ishizu-chan]
+//===== Current Version: =====================================
+//= 1.1 Beta
+//===== Compatible With: =====================================
+//= Any eAthena Version i guess?
+//===== Description: =========================================
+//= It's the Thanatos Tower Warps...
+//===== Additional Comments: =================================
+//= 1.0 - First Release [Ishizu-chan]
+//= 1.1 - Added Entrance Warp Guard
+//============================================================
+
+
+// Tour Guide - Thanatos Tower
+hu_fild01.gat,140,163,5	script	Thanatos Tower Guard	852,{
+
+  mes "[Thanatos Tower Guard]";
+  mes "Are you sure you want to go to the Thanatos Tower?";
+  mes "You can't go back, and I'll have to charge 5000 Zeny.";
+  next;
+  menu "Yes.",-,
+       "No.",L_End;
+
+  if (Zeny < 5000) goto L_Zeny;
+  set Zeny, Zeny - 5000;
+  warp "tha_scene01.gat",131,224;
+  end;
+
+  L_Zeny:
+  mes "[Thanatos Tower Guard]";
+  mes "You don't have enough Zeny.";
+  close;
+
+  L_End:
+  mes "[Thanatos Tower Guard]";
+  mes "Goodbye.";
+  close;
+
+}
+
+// Thanatos Scene (tha_scene01.gat)
+tha_scene01.gat,144,200,0	warp	WarpThana0a	1,1,tha_t01.gat,150,39
+tha_t01.gat,150,32,0	warp	WarpThana0b	1,1,tha_scene01.gat,142,200
+
+// Thanatos Tower Level 1 (tha_t01.gat)
+tha_t01.gat,150,149,0	warp	WarpThana1a	1,1,tha_t02.gat,150,129
+tha_t02.gat,150,126,0	warp	WarpThana1b	1,1,tha_t01.gat,150,146
+
+// Thanatos Tower Level 2 (tha_t02.gat)
+tha_t03.gat,218,167,0	warp	WarpThana2a	1,1,tha_t02.gat,227,159
+
+// Thanatos Tower Level 3 (tha_t03.gat)
+tha_t03.gat,60,141,0	warp	WarpThana3a	1,1,tha_t04.gat,60,141
+tha_t04.gat,60,138,0	warp	WarpThana3b	1,1,tha_t03.gat,60,138
+
+// Thanatos Tower Level 4 (tha_t04.gat)
+tha_t04.gat,82,36,0	warp	WarpThana4a	1,1,tha_t05.gat,62,6
+
+// Thanatos Tower Level 5 (tha_t05.gat)
+tha_t05.gat,61,157,0	warp	WarpThana5a	1,1,tha_t05.gat,211,97
+tha_t05.gat,208,97,0	warp	WarpThana5b	1,1,tha_t05.gat,61,162
+tha_t05.gat,186,236,0	warp	WarpThana5c	1,1,tha_t06.gat,207,6
+
+// Thanatos Tower Level 6 (tha_t06.gat)
+tha_t06.gat,119,120,4	script	WarpThana6a	45,2,2,{
+
+  if (ThanaQuest < 31) {
+
+    mes "[Seal]";
+    mes "It seems this portal will only open when 4 Keys are placed in the Keyholes around it.";
+    close;
+
+  }
+
+  warp "thana_step.gat",73,372;
+  end;
+
+}
+thana_step.gat,70,372,0	warp	WarpThana6b	1,1,tha_t06.gat,236,120
+thana_step.gat,173,372,0	warp	WarpThana6c	1,1,tha_t07.gat,28,166
+tha_t07.gat,25,166,0	warp	WarpThana6d	1,1,thana_step.gat,170,372
+
+// Thanatos Tower Level 7 (tha_t07.gat)
+tha_t07.gat,114,166,0	warp	WarpThana7a	1,1,tha_t08.gat,28,44
+tha_t08.gat,25,44,0	warp	WarpThana7b	1,1,tha_t07.gat,111,166
+
+// Thanatos Tower Level 8 (tha_t08.gat)
+tha_t08.gat,114,44,0	warp	WarpThana8a	1,1,thana_step.gat,33,223
+thana_step.gat,30,223,0	warp	WarpThana8b	1,1,tha_t08.gat,111,44
+
+// Thanatos Tower Level 9 (tha_t09.gat)
+thana_step.gat,32,165,0	warp	WarpThana9a	1,1,tha_t09.gat,89,146
+tha_t09.gat,92,146,0	script	WarpThana9b	45,1,1,{
+
+  if (ThanaSteps & 1) warp "thana_step.gat",183,223;
+  else warp "thana_step.gat",35,165;
+  end;
+
+}
+thana_step.gat,180,223,0	warp	WarpThana9c	1,1,tha_t09.gat,89,146
+
+// Thanatos Tower Level 10 (tha_t10.gat)
+thana_step.gat,182,165,0	warp	WarpThana10a	1,1,tha_t10.gat,167,138
+tha_t10.gat,170,138,0	script	WarpThana10b	45,1,1,{
+
+  if (ThanaSteps & 4) warp "thana_step.gat",17,73;
+  else warp "thana_step.gat",185,165;
+  end;
+
+}
+thana_step.gat,14,73,0	warp	WarpThana10c	1,1,tha_t10.gat,167,138
+
+// Thanatos Tower Level 11 (tha_t11.gat)
+thana_step.gat,16,15,0	warp	WarpThana11a	1,1,tha_t11.gat,89,36
+tha_t11.gat,92,36,0	script	WarpThana11b	45,1,1,{
+
+  if (ThanaSteps & 64) warp "thana_step.gat",183,73;
+  else warp "thana_step.gat",19,15;
+  end;
+
+}
+thana_step.gat,180,73,0	warp	WarpThana11c	1,1,tha_t11.gat,89,36
+
+// Thanatos Tower Level 12 (tha_t12.gat)
+thana_step.gat,182,15,0	warp	WarpThana12a	1,1,tha_t12.gat,129,51
+thana_step.gat,70,288,0	warp	WarpThana12b	1,1,tha_t12.gat,129,51
 thana_step.gat,173,288,0	warp	WarpThana12c	1,1,thana_boss.gat,135,128
 \ 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