16 files changed, 954 insertions, 954 deletions
diff --git a/npc/warps/cities/alberta.txt b/npc/warps/cities/alberta.txt
index 1ab9241fd..576a2284a 100644
--- a/npc/warps/cities/alberta.txt
+++ b/npc/warps/cities/alberta.txt
@@ -1,58 +1,58 @@
-//===== Athena Script ========================================
-//= Alberta Warp Script
-//===== By: ==================================================
-//= Athena (1.0)
-//= Nana (1.1)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Alberta, Treasure Island & Turtle Island
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//Alberta City
-alberta.gat,15,234,0	warp	alb001	2,5,pay_fild03.gat,388,63
-alberta.gat,117,38,0	warp	alb01	2,2,alberta_in.gat,180,30
-alberta.gat,134,38,0	warp	alb02	1,1,alberta_in.gat,70,141
-alberta.gat,170,170,0	warp	alb03	1,1,alb_ship.gat,26,168
-alberta.gat,178,165,0	warp	alb04	1,2,alb_ship.gat,39,163
-alberta.gat,209,173,0	warp	alb05	1,2,alb_ship.gat,162,171
-alberta.gat,33,42,0	warp	alb06	2,2,alberta_in.gat,74,44
-alberta.gat,65,233,0	warp	alb07	2,2,alberta_in.gat,18,141
-alberta.gat,93,205,0	warp	alb08	2,2,alberta_in.gat,114,134
-alberta.gat,98,153,0	warp	alb09	2,2,alberta_in.gat,185,89
-alberta.gat,99,221,0	warp	alb10	2,2,alberta_in.gat,122,161
-alb_ship.gat,26,166,0	warp	alb03-1	4,1,alberta.gat,170,168
-alb_ship.gat,41,163,0	warp	alb04-1	1,3,alberta.gat,180,165
-alb_ship.gat,160,171,0	warp	alb05-1	1,3,alberta.gat,207,173
-alb_ship.gat,37,174,0	warp	alb20	1,2,alb_ship.gat,70,99
-alb_ship.gat,68,99,0	warp	alb20-1	1,3,alb_ship.gat,35,173
-alberta_in.gat,189,89,0	warp	alb09-1	2,2,alberta.gat,102,153
-alberta_in.gat,114,130,0	warp	alb08-1	2,2,alberta.gat,93,201
-alberta_in.gat,14,141,0	warp	alb07-1	2,3,alberta.gat,61,233
-alberta_in.gat,180,34,0	warp	alb01-1	2,2,alberta.gat,117,42
-alberta_in.gat,73,141,0	warp	alb02-1	2,3,alberta.gat,137,37
-alberta_in.gat,78,44,0	warp	alb06-1	2,5,alberta.gat,37,41
-alberta_in.gat,125,161,0	warp	alb10-1	2,2,alberta.gat,102,222
-alberta_in.gat,114,183,0	warp	alb11	1,1,alberta_in.gat,148,186
-alberta_in.gat,152,186,0	warp	alb11-1	1,1,alberta_in.gat,118,183
-alberta_in.gat,114,49,0	warp	alb12	2,2,alberta_in.gat,155,153
-alberta_in.gat,159,153,0	warp	alb12-1	2,2,alberta_in.gat,117,49
-alberta_in.gat,114,97,0	warp	alb13	2,2,alberta_in.gat,155,175
-alberta_in.gat,159,175,0	warp	alb13-1	2,2,alberta_in.gat,117,97
-alberta_in.gat,22,113,0	warp	alb14	3,2,alberta_in.gat,22,134
-alberta_in.gat,22,130,0	warp	alb14-1	3,2,alberta_in.gat,22,109
-alberta_in.gat,22,153,0	warp	alb15	3,2,alberta_in.gat,22,174
-alberta_in.gat,22,170,0	warp	alb15-1	3,2,alberta_in.gat,22,149
-alberta_in.gat,24,33,0	warp	alb16	3,2,alberta_in.gat,64,35
-alberta_in.gat,64,31,0	warp	alb16-1	3,2,alberta_in.gat,24,29
-alberta_in.gat,24,54,0	warp	alb17	3,2,alberta_in.gat,64,53
-alberta_in.gat,64,57,0	warp	alb17-1	3,2,alberta_in.gat,24,58
-alberta_in.gat,66,113,0	warp	alb18	3,1,alberta_in.gat,66,132
-alberta_in.gat,66,130,0	warp	alb18-1	3,1,alberta_in.gat,66,111
-alberta_in.gat,66,153,0	warp	alb19	3,2,alberta_in.gat,66,173
-alberta_in.gat,66,170,0	warp	alb19-1	3,2,alberta_in.gat,66,149
-alb2trea.gat,88,111,0	warp	alb002	1,1,treasure01.gat,69,24
+//===== Athena Script ========================================
+//= Alberta Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Alberta, Treasure Island & Turtle Island
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//Alberta City
+alberta.gat,15,234,0	warp	alb001	2,5,pay_fild03.gat,388,63
+alberta.gat,117,38,0	warp	alb01	2,2,alberta_in.gat,180,30
+alberta.gat,134,38,0	warp	alb02	1,1,alberta_in.gat,70,141
+alberta.gat,170,170,0	warp	alb03	1,1,alb_ship.gat,26,168
+alberta.gat,178,165,0	warp	alb04	1,2,alb_ship.gat,39,163
+alberta.gat,209,173,0	warp	alb05	1,2,alb_ship.gat,162,171
+alberta.gat,33,42,0	warp	alb06	2,2,alberta_in.gat,74,44
+alberta.gat,65,233,0	warp	alb07	2,2,alberta_in.gat,18,141
+alberta.gat,93,205,0	warp	alb08	2,2,alberta_in.gat,114,134
+alberta.gat,98,153,0	warp	alb09	2,2,alberta_in.gat,185,89
+alberta.gat,99,221,0	warp	alb10	2,2,alberta_in.gat,122,161
+alb_ship.gat,26,166,0	warp	alb03-1	4,1,alberta.gat,170,168
+alb_ship.gat,41,163,0	warp	alb04-1	1,3,alberta.gat,180,165
+alb_ship.gat,160,171,0	warp	alb05-1	1,3,alberta.gat,207,173
+alb_ship.gat,37,174,0	warp	alb20	1,2,alb_ship.gat,70,99
+alb_ship.gat,68,99,0	warp	alb20-1	1,3,alb_ship.gat,35,173
+alberta_in.gat,189,89,0	warp	alb09-1	2,2,alberta.gat,102,153
+alberta_in.gat,114,130,0	warp	alb08-1	2,2,alberta.gat,93,201
+alberta_in.gat,14,141,0	warp	alb07-1	2,3,alberta.gat,61,233
+alberta_in.gat,180,34,0	warp	alb01-1	2,2,alberta.gat,117,42
+alberta_in.gat,73,141,0	warp	alb02-1	2,3,alberta.gat,137,37
+alberta_in.gat,78,44,0	warp	alb06-1	2,5,alberta.gat,37,41
+alberta_in.gat,125,161,0	warp	alb10-1	2,2,alberta.gat,102,222
+alberta_in.gat,114,183,0	warp	alb11	1,1,alberta_in.gat,148,186
+alberta_in.gat,152,186,0	warp	alb11-1	1,1,alberta_in.gat,118,183
+alberta_in.gat,114,49,0	warp	alb12	2,2,alberta_in.gat,155,153
+alberta_in.gat,159,153,0	warp	alb12-1	2,2,alberta_in.gat,117,49
+alberta_in.gat,114,97,0	warp	alb13	2,2,alberta_in.gat,155,175
+alberta_in.gat,159,175,0	warp	alb13-1	2,2,alberta_in.gat,117,97
+alberta_in.gat,22,113,0	warp	alb14	3,2,alberta_in.gat,22,134
+alberta_in.gat,22,130,0	warp	alb14-1	3,2,alberta_in.gat,22,109
+alberta_in.gat,22,153,0	warp	alb15	3,2,alberta_in.gat,22,174
+alberta_in.gat,22,170,0	warp	alb15-1	3,2,alberta_in.gat,22,149
+alberta_in.gat,24,33,0	warp	alb16	3,2,alberta_in.gat,64,35
+alberta_in.gat,64,31,0	warp	alb16-1	3,2,alberta_in.gat,24,29
+alberta_in.gat,24,54,0	warp	alb17	3,2,alberta_in.gat,64,53
+alberta_in.gat,64,57,0	warp	alb17-1	3,2,alberta_in.gat,24,58
+alberta_in.gat,66,113,0	warp	alb18	3,1,alberta_in.gat,66,132
+alberta_in.gat,66,130,0	warp	alb18-1	3,1,alberta_in.gat,66,111
+alberta_in.gat,66,153,0	warp	alb19	3,2,alberta_in.gat,66,173
+alberta_in.gat,66,170,0	warp	alb19-1	3,2,alberta_in.gat,66,149
+alb2trea.gat,88,111,0	warp	alb002	1,1,treasure01.gat,69,24
diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt
index 1e7301d34..8523cf5a8 100644
--- a/npc/warps/cities/aldebaran.txt
+++ b/npc/warps/cities/aldebaran.txt
@@ -1,49 +1,49 @@
-//===== Athena Script ========================================
-//= Al de Baran Warp Script
-//===== By: ==================================================
-//= Athena (1.0)
-//= Nana (1.1)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
-//===== Description: =========================================
-//= Warp Points for Al de Baran
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//===== Al De Baran Warps =====================================
-aldebaran.gat,118,63,0	warp	ald01	1,1,aldeba_in.gat,211,117
-aldebaran.gat,138,34,0	warp	ald001	2,2,mjolnir_12.gat,199,375
-aldebaran.gat,197,70,0	warp	ald02	1,1,aldeba_in.gat,94,41
-aldebaran.gat,225,54,0	warp	ald03	1,1,aldeba_in.gat,149,120
-aldebaran.gat,233,105,0	warp	ald04	1,1,aldeba_in.gat,157,190
-aldebaran.gat,51,218,0	warp	ald05	1,1,aldeba_in.gat,24,227
-aldebaran.gat,61,229,0	warp	ald06	1,1,aldeba_in.gat,148,227
-aldebaran.gat,72,197,0	warp	ald07	1,1,aldeba_in.gat,27,37
-aldebaran.gat,89,234,0	warp	ald08	1,1,aldeba_in.gat,242,237
-aldeba_in.gat,103,157,0	warp	ald09	2,2,aldeba_in.gat,137,237
-aldeba_in.gat,103,61,0	warp	ald10	2,2,aldeba_in.gat,97,105
-aldeba_in.gat,134,237,0	warp	ald09-1	2,2,aldeba_in.gat,100,157
-aldeba_in.gat,144,92,0	warp	ald11	2,2,aldeba_in.gat,149,52
-aldeba_in.gat,148,224,0	warp	ald06-1	2,2,aldebaran.gat,63,227
-aldeba_in.gat,149,123,0	warp	ald03-1	3,2,aldebaran.gat,223,56
-aldeba_in.gat,149,55,0	warp	ald11-1	2,2,aldeba_in.gat,144,95
-aldeba_in.gat,157,193,0	warp	ald04-1	3,2,aldebaran.gat,231,107
-aldeba_in.gat,208,117,0	warp	ald01-1	2,2,aldebaran.gat,116,63
-aldeba_in.gat,217,131,0	warp	ald12	2,2,aldeba_in.gat,217,163
-aldeba_in.gat,217,160,0	warp	ald12-1	2,2,aldeba_in.gat,217,128
-aldeba_in.gat,217,71,0	warp	ald13-1	2,2,aldeba_in.gat,218,107
-aldeba_in.gat,218,104,0	warp	ald13	2,2,aldeba_in.gat,218,68
-aldeba_in.gat,24,224,0	warp	ald05-1	2,2,aldebaran.gat,53,216
-aldeba_in.gat,245,237,0	warp	ald08-1	2,2,aldebaran.gat,91,234
-aldeba_in.gat,27,102,0	warp	ald14-1	2,2,aldeba_in.gat,27,68
-aldeba_in.gat,27,34,0	warp	ald07-1	2,2,aldebaran.gat,72,195
-aldeba_in.gat,27,71,0	warp	ald14	2,2,aldeba_in.gat,27,105
-aldeba_in.gat,37,238,0	warp	ald15	2,2,aldeba_in.gat,67,157
-aldeba_in.gat,64,157,0	warp	ald15-1	2,2,aldeba_in.gat,34,238
-aldeba_in.gat,83,191,0	warp	ald16	2,2,aldeba_in.gat,83,227
-aldeba_in.gat,83,224,0	warp	ald16-1	2,2,aldeba_in.gat,83,188
-aldeba_in.gat,94,38,0	warp	ald02-1	3,2,aldebaran.gat,197,68
-aldeba_in.gat,97,102,0	warp	ald10-1	2,2,aldeba_in.gat,103,58
+//===== Athena Script ========================================
+//= Al de Baran Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Al de Baran
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//===== Al De Baran Warps =====================================
+aldebaran.gat,118,63,0	warp	ald01	1,1,aldeba_in.gat,211,117
+aldebaran.gat,138,34,0	warp	ald001	2,2,mjolnir_12.gat,199,375
+aldebaran.gat,197,70,0	warp	ald02	1,1,aldeba_in.gat,94,41
+aldebaran.gat,225,54,0	warp	ald03	1,1,aldeba_in.gat,149,120
+aldebaran.gat,233,105,0	warp	ald04	1,1,aldeba_in.gat,157,190
+aldebaran.gat,51,218,0	warp	ald05	1,1,aldeba_in.gat,24,227
+aldebaran.gat,61,229,0	warp	ald06	1,1,aldeba_in.gat,148,227
+aldebaran.gat,72,197,0	warp	ald07	1,1,aldeba_in.gat,27,37
+aldebaran.gat,89,234,0	warp	ald08	1,1,aldeba_in.gat,242,237
+aldeba_in.gat,103,157,0	warp	ald09	2,2,aldeba_in.gat,137,237
+aldeba_in.gat,103,61,0	warp	ald10	2,2,aldeba_in.gat,97,105
+aldeba_in.gat,134,237,0	warp	ald09-1	2,2,aldeba_in.gat,100,157
+aldeba_in.gat,144,92,0	warp	ald11	2,2,aldeba_in.gat,149,52
+aldeba_in.gat,148,224,0	warp	ald06-1	2,2,aldebaran.gat,63,227
+aldeba_in.gat,149,123,0	warp	ald03-1	3,2,aldebaran.gat,223,56
+aldeba_in.gat,149,55,0	warp	ald11-1	2,2,aldeba_in.gat,144,95
+aldeba_in.gat,157,193,0	warp	ald04-1	3,2,aldebaran.gat,231,107
+aldeba_in.gat,208,117,0	warp	ald01-1	2,2,aldebaran.gat,116,63
+aldeba_in.gat,217,131,0	warp	ald12	2,2,aldeba_in.gat,217,163
+aldeba_in.gat,217,160,0	warp	ald12-1	2,2,aldeba_in.gat,217,128
+aldeba_in.gat,217,71,0	warp	ald13-1	2,2,aldeba_in.gat,218,107
+aldeba_in.gat,218,104,0	warp	ald13	2,2,aldeba_in.gat,218,68
+aldeba_in.gat,24,224,0	warp	ald05-1	2,2,aldebaran.gat,53,216
+aldeba_in.gat,245,237,0	warp	ald08-1	2,2,aldebaran.gat,91,234
+aldeba_in.gat,27,102,0	warp	ald14-1	2,2,aldeba_in.gat,27,68
+aldeba_in.gat,27,34,0	warp	ald07-1	2,2,aldebaran.gat,72,195
+aldeba_in.gat,27,71,0	warp	ald14	2,2,aldeba_in.gat,27,105
+aldeba_in.gat,37,238,0	warp	ald15	2,2,aldeba_in.gat,67,157
+aldeba_in.gat,64,157,0	warp	ald15-1	2,2,aldeba_in.gat,34,238
+aldeba_in.gat,83,191,0	warp	ald16	2,2,aldeba_in.gat,83,227
+aldeba_in.gat,83,224,0	warp	ald16-1	2,2,aldeba_in.gat,83,188
+aldeba_in.gat,94,38,0	warp	ald02-1	3,2,aldebaran.gat,197,68
+aldeba_in.gat,97,102,0	warp	ald10-1	2,2,aldeba_in.gat,103,58
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index 007422c3e..29a6c80af 100644
--- a/npc/warps/cities/amatsu.txt
+++ b/npc/warps/cities/amatsu.txt
@@ -1,52 +1,52 @@
-//===== Athena Script ========================================
-//= Amatsu Warp Script
-//===== By: ==================================================
-//= Athena (1.0)
-//= Nana (1.1)
-//===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
-//===== Description: =========================================
-//= Warp Points for Amatsu
-//===== Additional Comments: =================================
-//= No Comments!
-//============================================================
-
-//= Amatsu ===================================================
-ama_in01.gat,157,25,0	warp	warp1969	1,1,amatsu.gat,213,116
-ama_in01.gat,161,34,0	warp	warp1970	1,1,ama_in01.gat,166,77
-ama_in01.gat,166,73,0	warp	warp1971	1,1,ama_in01.gat,162,32
-ama_in01.gat,174,120,0	warp	warp2011	1,1,amatsu.gat,217,146
-ama_in01.gat,174,170,0	warp	warp2012	1,1,amatsu.gat,52,144
-ama_in01.gat,31,176,0	warp	warp2010	1,1,amatsu.gat,42,110
-ama_in01.gat,32,24,0	warp	warp1963	1,1,amatsu.gat,98,117
-ama_in01.gat,34,97,0	warp	warp1965	1,1,amatsu.gat,168,178
-ama_in01.gat,77,177,0	warp	warp1967	1,1,amatsu.gat,246,160
-ama_in01.gat,86,23,0	warp	warp2009	1,1,amatsu.gat,130,148
-ama_in01.gat,88,94,0	warp	warp2008	1,1,amatsu.gat,99,148
-ama_in02.gat,127,163,0	warp	warp1980	1,1,ama_in02.gat,220,161
-ama_in02.gat,195,44,0	warp	warp1973	1,1,ama_in02.gat,65,40
-ama_in02.gat,215,150,0	warp	warp1978	1,1,ama_in02.gat,59,156
-ama_in02.gat,222,161,0	warp	warp1979	1,1,ama_in02.gat,130,163
-ama_in02.gat,227,45,0	warp	warp1973	1,1,amatsu.gat,88,235
-ama_in02.gat,56,44,0	warp	warp1975	1,1,ama_in02.gat,59,144
-ama_in02.gat,59,142,0	warp	warp1976	1,1,ama_in02.gat,56,41
-ama_in02.gat,59,159,0	warp	warp1977	1,1,ama_in02.gat,215,152
-ama_in02.gat,65,38,0	warp	warp1974	1,1,ama_in02.gat,195,41
-ama_test.gat,50,16,0	warp	warp8003	1,1,ama_fild01.gat,174,330
-ama_test.gat,50,44,0	warp	warp8004	1,1,ama_test.gat,50,82
-ama_test.gat,50,79,0	warp	warp8005	1,1,ama_test.gat,50,41
-//disabled due to amatsu dungeon quest
-//ama_test.gat,50,90,0	warp	warp8006	1,1,ama_dun01.gat,228,9
-amatsu.gat,133,148,0	warp	warp1989	1,1,ama_in01.gat,88,22
-amatsu.gat,168,180,0	warp	warp1964	1,1,ama_in01.gat,34,99
-amatsu.gat,216,116,0	warp	warp1968	1,1,ama_in01.gat,162,25
-amatsu.gat,217,149,0	warp	warp1987	1,1,ama_in01.gat,174,122
-amatsu.gat,247,290,0	warp	warp1960	1,1,ama_fild01.gat,73,32
-amatsu.gat,249,160,0	warp	warp1966	1,1,ama_in01.gat,79,178
-amatsu.gat,40,110,0	warp	warp1995	1,1,ama_in01.gat,28,176
-amatsu.gat,52,148,0	warp	warp1994	1,1,ama_in01.gat,174,172
-amatsu.gat,85,235,0	warp	warp1972	1,1,ama_in02.gat,224,45
-amatsu.gat,95,148,0	warp	warp1990	1,1,ama_in01.gat,88,97
+//===== Athena Script ========================================
+//= Amatsu Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Amatsu
+//===== Additional Comments: =================================
+//= No Comments!
+//============================================================
+
+//= Amatsu ===================================================
+ama_in01.gat,157,25,0	warp	warp1969	1,1,amatsu.gat,213,116
+ama_in01.gat,161,34,0	warp	warp1970	1,1,ama_in01.gat,166,77
+ama_in01.gat,166,73,0	warp	warp1971	1,1,ama_in01.gat,162,32
+ama_in01.gat,174,120,0	warp	warp2011	1,1,amatsu.gat,217,146
+ama_in01.gat,174,170,0	warp	warp2012	1,1,amatsu.gat,52,144
+ama_in01.gat,31,176,0	warp	warp2010	1,1,amatsu.gat,42,110
+ama_in01.gat,32,24,0	warp	warp1963	1,1,amatsu.gat,98,117
+ama_in01.gat,34,97,0	warp	warp1965	1,1,amatsu.gat,168,178
+ama_in01.gat,77,177,0	warp	warp1967	1,1,amatsu.gat,246,160
+ama_in01.gat,86,23,0	warp	warp2009	1,1,amatsu.gat,130,148
+ama_in01.gat,88,94,0	warp	warp2008	1,1,amatsu.gat,99,148
+ama_in02.gat,127,163,0	warp	warp1980	1,1,ama_in02.gat,220,161
+ama_in02.gat,195,44,0	warp	warp1973	1,1,ama_in02.gat,65,40
+ama_in02.gat,215,150,0	warp	warp1978	1,1,ama_in02.gat,59,156
+ama_in02.gat,222,161,0	warp	warp1979	1,1,ama_in02.gat,130,163
+ama_in02.gat,227,45,0	warp	warp1973	1,1,amatsu.gat,88,235
+ama_in02.gat,56,44,0	warp	warp1975	1,1,ama_in02.gat,59,144
+ama_in02.gat,59,142,0	warp	warp1976	1,1,ama_in02.gat,56,41
+ama_in02.gat,59,159,0	warp	warp1977	1,1,ama_in02.gat,215,152
+ama_in02.gat,65,38,0	warp	warp1974	1,1,ama_in02.gat,195,41
+ama_test.gat,50,16,0	warp	warp8003	1,1,ama_fild01.gat,174,330
+ama_test.gat,50,44,0	warp	warp8004	1,1,ama_test.gat,50,82
+ama_test.gat,50,79,0	warp	warp8005	1,1,ama_test.gat,50,41
+//disabled due to amatsu dungeon quest
+//ama_test.gat,50,90,0	warp	warp8006	1,1,ama_dun01.gat,228,9
+amatsu.gat,133,148,0	warp	warp1989	1,1,ama_in01.gat,88,22
+amatsu.gat,168,180,0	warp	warp1964	1,1,ama_in01.gat,34,99
+amatsu.gat,216,116,0	warp	warp1968	1,1,ama_in01.gat,162,25
+amatsu.gat,217,149,0	warp	warp1987	1,1,ama_in01.gat,174,122
+amatsu.gat,247,290,0	warp	warp1960	1,1,ama_fild01.gat,73,32
+amatsu.gat,249,160,0	warp	warp1966	1,1,ama_in01.gat,79,178
+amatsu.gat,40,110,0	warp	warp1995	1,1,ama_in01.gat,28,176
+amatsu.gat,52,148,0	warp	warp1994	1,1,ama_in01.gat,174,172
+amatsu.gat,85,235,0	warp	warp1972	1,1,ama_in02.gat,224,45
+amatsu.gat,95,148,0	warp	warp1990	1,1,ama_in01.gat,88,97
 amatsu.gat,96,118,0	warp	warp1962	1,1,ama_in01.gat,31,23
 \ No newline at end of file
diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt
index 1433dc4cd..7d8826f32 100644
--- a/npc/warps/cities/comodo.txt
+++ b/npc/warps/cities/comodo.txt
@@ -1,56 +1,56 @@
-//===== Athena Script ========================================
-//= Comodo Warp Script
-//===== By: ==================================================
-//= eAthena dev team
-//===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points Comodo city
-//= Rogue guild
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-
-//Comodo City =====================================================
-comodo.gat,115,291,0	warp	cmd09	1,1,cmd_in02.gat,67,132
-comodo.gat,126,98,0	warp	cmd02	1,1,cmd_in02.gat,144,97
-comodo.gat,130,195,0	warp	cmd05	1,1,cmd_in02.gat,143,173
-comodo.gat,140,111,0	warp	cmd04	1,1,cmd_in02.gat,178,132
-comodo.gat,140,90,0	warp	cmd01	1,1,cmd_in02.gat,74,25
-comodo.gat,145,328,0	warp	cmd11	1,1,cmd_in01.gat,120,71
-comodo.gat,153,97,0	warp	cmd03	1,1,cmd_in02.gat,212,97
-comodo.gat,176,358,0	warp	cmd002	1,1,beach_dun2.gat,154,25
-comodo.gat,192,294,0	warp	cmd17	1,1,cmd_in01.gat,177,123
-comodo.gat,236,298,0	warp	cmd08	1,1,cmd_in01.gat,179,81
-comodo.gat,25,214,0	warp	cmd001	1,1,beach_dun.gat,266,67
-comodo.gat,265,74,0	warp	cmd06	1,1,cmd_in01.gat,123,180
-comodo.gat,271,271,0	warp	cmd10	1,1,cmd_in01.gat,113,125
-comodo.gat,332,175,0	warp	cmd003	1,1,beach_dun3.gat,23,260
-comodo.gat,92,128,0	warp	cmd07	1,1,cmd_in01.gat,85,174
-cmd_in01.gat,109,125,0	warp	cmd10-1	1,1,comodo.gat,269,273
-cmd_in01.gat,120,67,0	warp	cmd11-1	1,1,comodo.gat,145,324
-cmd_in01.gat,123,186,0	warp	cmd06-1	1,1,comodo.gat,265,79
-cmd_in01.gat,183,123,0	warp	cmd17-1	1,1,comodo.gat,195,294
-cmd_in01.gat,183,81,0	warp	cmd08-1	1,1,comodo.gat,239,296
-cmd_in01.gat,90,174,0	warp	cmd07-1	1,1,comodo.gat,97,128
-cmd_in02.gat,139,169,0	warp	cmd05-1	1,1,comodo.gat,127,191
-cmd_in02.gat,139,97,0	warp	cmd02-1	1,1,comodo.gat,122,98
-cmd_in02.gat,168,113,0	warp	cmd15-1	1,1,cmd_in02.gat,63,73
-cmd_in02.gat,178,136,0	warp	cmd04-1	1,1,comodo.gat,140,115
-cmd_in02.gat,187,78,0	warp	cmd14-2	1,1,cmd_in02.gat,84,37
-cmd_in02.gat,208,206,0	warp	cmd16	1,1,cmd_in02.gat,97,211
-cmd_in02.gat,216,97,0	warp	cmd03-1	1,1,comodo.gat,157,97
-cmd_in02.gat,58,74,0	warp	cmd15	1,1,cmd_in02.gat,166,116
-cmd_in02.gat,69,129,0	warp	cmd09-1	4,4,comodo.gat,115,288
-cmd_in02.gat,74,21,0	warp	cmd01-1	1,1,comodo.gat,140,86
-cmd_in02.gat,90,37,0	warp	cmd14	1,1,cmd_in02.gat,191,77
-cmd_in02.gat,98,216,0	warp	cmd16-1	1,1,cmd_in02.gat,207,210
-
-
-
-
-
-
+//===== Athena Script ========================================
+//= Comodo Warp Script
+//===== By: ==================================================
+//= eAthena dev team
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points Comodo city
+//= Rogue guild
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+
+//Comodo City =====================================================
+comodo.gat,115,291,0	warp	cmd09	1,1,cmd_in02.gat,67,132
+comodo.gat,126,98,0	warp	cmd02	1,1,cmd_in02.gat,144,97
+comodo.gat,130,195,0	warp	cmd05	1,1,cmd_in02.gat,143,173
+comodo.gat,140,111,0	warp	cmd04	1,1,cmd_in02.gat,178,132
+comodo.gat,140,90,0	warp	cmd01	1,1,cmd_in02.gat,74,25
+comodo.gat,145,328,0	warp	cmd11	1,1,cmd_in01.gat,120,71
+comodo.gat,153,97,0	warp	cmd03	1,1,cmd_in02.gat,212,97
+comodo.gat,176,358,0	warp	cmd002	1,1,beach_dun2.gat,154,25
+comodo.gat,192,294,0	warp	cmd17	1,1,cmd_in01.gat,177,123
+comodo.gat,236,298,0	warp	cmd08	1,1,cmd_in01.gat,179,81
+comodo.gat,25,214,0	warp	cmd001	1,1,beach_dun.gat,266,67
+comodo.gat,265,74,0	warp	cmd06	1,1,cmd_in01.gat,123,180
+comodo.gat,271,271,0	warp	cmd10	1,1,cmd_in01.gat,113,125
+comodo.gat,332,175,0	warp	cmd003	1,1,beach_dun3.gat,23,260
+comodo.gat,92,128,0	warp	cmd07	1,1,cmd_in01.gat,85,174
+cmd_in01.gat,109,125,0	warp	cmd10-1	1,1,comodo.gat,269,273
+cmd_in01.gat,120,67,0	warp	cmd11-1	1,1,comodo.gat,145,324
+cmd_in01.gat,123,186,0	warp	cmd06-1	1,1,comodo.gat,265,79
+cmd_in01.gat,183,123,0	warp	cmd17-1	1,1,comodo.gat,195,294
+cmd_in01.gat,183,81,0	warp	cmd08-1	1,1,comodo.gat,239,296
+cmd_in01.gat,90,174,0	warp	cmd07-1	1,1,comodo.gat,97,128
+cmd_in02.gat,139,169,0	warp	cmd05-1	1,1,comodo.gat,127,191
+cmd_in02.gat,139,97,0	warp	cmd02-1	1,1,comodo.gat,122,98
+cmd_in02.gat,168,113,0	warp	cmd15-1	1,1,cmd_in02.gat,63,73
+cmd_in02.gat,178,136,0	warp	cmd04-1	1,1,comodo.gat,140,115
+cmd_in02.gat,187,78,0	warp	cmd14-2	1,1,cmd_in02.gat,84,37
+cmd_in02.gat,208,206,0	warp	cmd16	1,1,cmd_in02.gat,97,211
+cmd_in02.gat,216,97,0	warp	cmd03-1	1,1,comodo.gat,157,97
+cmd_in02.gat,58,74,0	warp	cmd15	1,1,cmd_in02.gat,166,116
+cmd_in02.gat,69,129,0	warp	cmd09-1	4,4,comodo.gat,115,288
+cmd_in02.gat,74,21,0	warp	cmd01-1	1,1,comodo.gat,140,86
+cmd_in02.gat,90,37,0	warp	cmd14	1,1,cmd_in02.gat,191,77
+cmd_in02.gat,98,216,0	warp	cmd16-1	1,1,cmd_in02.gat,207,210
+
+
+
+
+
+
diff --git a/npc/warps/cities/geffen.txt b/npc/warps/cities/geffen.txt
index e0beb082c..f4fe16798 100644
--- a/npc/warps/cities/geffen.txt
+++ b/npc/warps/cities/geffen.txt
@@ -1,50 +1,50 @@
-//===== Athena Script ========================================
-//= Geffen Warp Script
-//===== By: ==================================================
-//= Athena (1.0)
-//= Nana (1.1)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Geffen
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//Geffen City
-geffen.gat,119,213,0	warp	gef001	3,2,gef_fild04.gat,187,42
-geffen.gat,120,114,0	warp	gef002	3,1,gef_tower.gat,52,177
-geffen.gat,217,119,0	warp	gef003	2,4,gef_fild00.gat,46,199
-geffen.gat,26,119,0	warp	gef004	2,3,gef_fild07.gat,336,187
-geffen.gat,138,138,0	warp	gef01	1,1,geffen_in.gat,28,110
-geffen.gat,172,174,0	warp	gef02	2,2,geffen_in.gat,70,52
-geffen.gat,182,59,0	warp	gef03	2,2,geffen_in.gat,106,177
-geffen.gat,43,85,0	warp	gef04	2,2,geffen_in.gat,70,138
-geffen.gat,61,180,0	warp	gef05	3,3,geffen_in.gat,162,97
-geffen.gat,98,141,0	warp	gef06	2,2,geffen_in.gat,28,160
-geffen_in.gat,28,156,0	warp	gef06-1	3,1,geffen.gat,101,138
-geffen_in.gat,100,67,0	warp	gef07	2,3,geffen_in.gat,84,65
-geffen_in.gat,87,66,0	warp	gef07-1	2,3,geffen_in.gat,103,67
-geffen_in.gat,104,109,0	warp	gef08	2,2,geffen_in.gat,76,107
-geffen_in.gat,79,107,0	warp	gef08-1	2,2,geffen_in.gat,107,109
-geffen_in.gat,113,163,0	warp	gef09	2,2,geffen_in.gat,139,169
-geffen_in.gat,136,169,0	warp	gef09-1	2,2,geffen_in.gat,110,163
-geffen_in.gat,114,37,0	warp	gef10	1,1,geffen_in.gat,114,63
-geffen_in.gat,114,60,0	warp	gef10-1	1,2,geffen_in.gat,114,34
-geffen_in.gat,138,149,0	warp	gef11	2,2,geffen_in.gat,138,165
-geffen_in.gat,138,162,0	warp	gef11-1	2,2,geffen_in.gat,138,146
-geffen_in.gat,26,60,0	warp	gef12	1,2,geffen_in.gat,26,34
-geffen_in.gat,26,37,0	warp	gef12-1	1,1,geffen_in.gat,26,63
-geffen_in.gat,52,65,0	warp	gef13	2,3,geffen_in.gat,38,67
-geffen_in.gat,41,67,0	warp	gef13-1	2,3,geffen_in.gat,55,65
-geffen_in.gat,70,149,0	warp	gef14	3,2,geffen_in.gat,70,161
-geffen_in.gat,70,158,0	warp	gef14-1	3,2,geffen_in.gat,70,146
-geffen_in.gat,70,83,0	warp	gef15	3,2,geffen_in.gat,72,101
-geffen_in.gat,72,98,0	warp	gef15-1	3,2,geffen_in.gat,70,80
-geffen_in.gat,163,94,0	warp	gef05-1	4,2,geffen.gat,65,176
-geffen_in.gat,70,132,0	warp	gef04-1	3,1,geffen.gat,46,88
-geffen_in.gat,106,181,0	warp	gef03-1	2,2,geffen.gat,180,61
-geffen_in.gat,28,106,0	warp	gef01-1	1,3,geffen.gat,136,136
+//===== Athena Script ========================================
+//= Geffen Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//Geffen City
+geffen.gat,119,213,0	warp	gef001	3,2,gef_fild04.gat,187,42
+geffen.gat,120,114,0	warp	gef002	3,1,gef_tower.gat,52,177
+geffen.gat,217,119,0	warp	gef003	2,4,gef_fild00.gat,46,199
+geffen.gat,26,119,0	warp	gef004	2,3,gef_fild07.gat,336,187
+geffen.gat,138,138,0	warp	gef01	1,1,geffen_in.gat,28,110
+geffen.gat,172,174,0	warp	gef02	2,2,geffen_in.gat,70,52
+geffen.gat,182,59,0	warp	gef03	2,2,geffen_in.gat,106,177
+geffen.gat,43,85,0	warp	gef04	2,2,geffen_in.gat,70,138
+geffen.gat,61,180,0	warp	gef05	3,3,geffen_in.gat,162,97
+geffen.gat,98,141,0	warp	gef06	2,2,geffen_in.gat,28,160
+geffen_in.gat,28,156,0	warp	gef06-1	3,1,geffen.gat,101,138
+geffen_in.gat,100,67,0	warp	gef07	2,3,geffen_in.gat,84,65
+geffen_in.gat,87,66,0	warp	gef07-1	2,3,geffen_in.gat,103,67
+geffen_in.gat,104,109,0	warp	gef08	2,2,geffen_in.gat,76,107
+geffen_in.gat,79,107,0	warp	gef08-1	2,2,geffen_in.gat,107,109
+geffen_in.gat,113,163,0	warp	gef09	2,2,geffen_in.gat,139,169
+geffen_in.gat,136,169,0	warp	gef09-1	2,2,geffen_in.gat,110,163
+geffen_in.gat,114,37,0	warp	gef10	1,1,geffen_in.gat,114,63
+geffen_in.gat,114,60,0	warp	gef10-1	1,2,geffen_in.gat,114,34
+geffen_in.gat,138,149,0	warp	gef11	2,2,geffen_in.gat,138,165
+geffen_in.gat,138,162,0	warp	gef11-1	2,2,geffen_in.gat,138,146
+geffen_in.gat,26,60,0	warp	gef12	1,2,geffen_in.gat,26,34
+geffen_in.gat,26,37,0	warp	gef12-1	1,1,geffen_in.gat,26,63
+geffen_in.gat,52,65,0	warp	gef13	2,3,geffen_in.gat,38,67
+geffen_in.gat,41,67,0	warp	gef13-1	2,3,geffen_in.gat,55,65
+geffen_in.gat,70,149,0	warp	gef14	3,2,geffen_in.gat,70,161
+geffen_in.gat,70,158,0	warp	gef14-1	3,2,geffen_in.gat,70,146
+geffen_in.gat,70,83,0	warp	gef15	3,2,geffen_in.gat,72,101
+geffen_in.gat,72,98,0	warp	gef15-1	3,2,geffen_in.gat,70,80
+geffen_in.gat,163,94,0	warp	gef05-1	4,2,geffen.gat,65,176
+geffen_in.gat,70,132,0	warp	gef04-1	3,1,geffen.gat,46,88
+geffen_in.gat,106,181,0	warp	gef03-1	2,2,geffen.gat,180,61
+geffen_in.gat,28,106,0	warp	gef01-1	1,3,geffen.gat,136,136
 geffen_in.gat,70,48,0	warp	gef02-1	3,2,geffen.gat,168,170
 \ No newline at end of file
diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt
index d13c0ca40..ad5e38c48 100644
--- a/npc/warps/cities/gonryun.txt
+++ b/npc/warps/cities/gonryun.txt
@@ -1,34 +1,34 @@
-//===== Athena Script ========================================
-//= Gonryun Town 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 ==================================================
-gonryun.gat,161,8,0	warp	gon02	1,1,gon_fild01.gat,191,261
-gonryun.gat,195,93,0	warp	gon03	1,1,gon_in.gat,95,23
-gonryun.gat,109,131,0	warp	gon15	1,1,gon_in.gat,44,24
-gonryun.gat,215,114,0	warp	gon05	1,1,gon_in.gat,152,24
-gonryun.gat,107,184,0	warp	gon13	1,1,gon_in.gat,72,70
-gonryun.gat,221,162,0	warp	gon11	1,1,gon_in.gat,112,98
-gonryun.gat,159,201,0	warp	gon19	1,1,gon_dun01.gat,153,48
-gon_in.gat,95,26,0	warp	gon04	1,1,gonryun.gat,195,96
-gon_in.gat,149,24,0	warp	gon06	1,1,gonryun.gat,212,114
-gon_in.gat,184,11,0	warp	gon07	1,1,gon_in.gat,189,85
-gon_in.gat,186,85,0	warp	gon08	1,1,gon_in.gat,181,11
-gon_in.gat,186,107,0	warp	gon09	1,1,gon_in.gat,181,36
-gon_in.gat,184,36,0	warp	gon10	1,1,gon_in.gat,189,107
-gon_in.gat,109,98,0	warp	gon12	1,1,gonryun.gat,218,162
-gon_in.gat,72,67,0	warp	gon14	1,1,gonryun.gat,107,181
-gon_in.gat,47,24,0	warp	gon16	1,1,gonryun.gat,112,131
-gon_in.gat,42,35,0	warp	gon17	1,1,gon_in.gat,34,97
-gon_in.gat,31,97,0	warp	gon18	1,1,gon_in.gat,39,35
+//===== Athena Script ========================================
+//= Gonryun Town 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 ==================================================
+gonryun.gat,161,8,0	warp	gon02	1,1,gon_fild01.gat,191,261
+gonryun.gat,195,93,0	warp	gon03	1,1,gon_in.gat,95,23
+gonryun.gat,109,131,0	warp	gon15	1,1,gon_in.gat,44,24
+gonryun.gat,215,114,0	warp	gon05	1,1,gon_in.gat,152,24
+gonryun.gat,107,184,0	warp	gon13	1,1,gon_in.gat,72,70
+gonryun.gat,221,162,0	warp	gon11	1,1,gon_in.gat,112,98
+gonryun.gat,159,201,0	warp	gon19	1,1,gon_dun01.gat,153,48
+gon_in.gat,95,26,0	warp	gon04	1,1,gonryun.gat,195,96
+gon_in.gat,149,24,0	warp	gon06	1,1,gonryun.gat,212,114
+gon_in.gat,184,11,0	warp	gon07	1,1,gon_in.gat,189,85
+gon_in.gat,186,85,0	warp	gon08	1,1,gon_in.gat,181,11
+gon_in.gat,186,107,0	warp	gon09	1,1,gon_in.gat,181,36
+gon_in.gat,184,36,0	warp	gon10	1,1,gon_in.gat,189,107
+gon_in.gat,109,98,0	warp	gon12	1,1,gonryun.gat,218,162
+gon_in.gat,72,67,0	warp	gon14	1,1,gonryun.gat,107,181
+gon_in.gat,47,24,0	warp	gon16	1,1,gonryun.gat,112,131
+gon_in.gat,42,35,0	warp	gon17	1,1,gon_in.gat,34,97
+gon_in.gat,31,97,0	warp	gon18	1,1,gon_in.gat,39,35
 gon_fild01.gat,192,266,0	warp	gon01	1,1,gonryun.gat,161,11
 \ No newline at end of file
diff --git a/npc/warps/cities/izlude.txt b/npc/warps/cities/izlude.txt
index 704e65b79..4f9936def 100644
--- a/npc/warps/cities/izlude.txt
+++ b/npc/warps/cities/izlude.txt
@@ -1,34 +1,34 @@
-//===== Athena Script ========================================
-//= Izlude Warp Script
-//===== By: ==================================================
-//= Athena (1.0)
-//= Nana (1.1)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Izlude
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//= Izlude City ==============================================
-izlude.gat,109,151,0	warp	iz01	3,3,izlude_in.gat,65,87
-izlude.gat,128,225,0	warp	iz431	1,1,prt_are_in.gat,100,28
-izlude.gat,148,148,0	warp	iz02	2,2,izlude_in.gat,116,49
-izlude.gat,216,129,0	warp	iz03	3,2,izlude_in.gat,151,127
-izlude.gat,30,78,0	warp	iz001	3,3,prt_fild08.gat,367,212
-izlude.gat,52,140,0	warp	iz04	2,2,izlude_in.gat,74,161
-izlude_in.gat,108,169,0	warp	iz05	2,3,izlude_in.gat,84,169
-izlude_in.gat,116,46,0	warp	iz02-1	3,2,izlude.gat,145,145
-izlude_in.gat,148,127,0	warp	iz03-1	2,5,izlude.gat,212,129
-izlude_in.gat,171,97,0	warp	iz06	3,2,izlude_in.gat,172,119
-izlude_in.gat,172,116,0	warp	iz06-1	3,2,izlude_in.gat,172,94
-izlude_in.gat,172,139,0	warp	iz07	3,2,izlude_in.gat,172,161
-izlude_in.gat,172,158,0	warp	iz07-1	3,2,izlude_in.gat,172,136
-izlude_in.gat,43,169,0	warp	w219	2,3,izlude_in.gat,63,169
-izlude_in.gat,62,170,0	warp	w1039	1,1,izlude_in.gat,68,165
-izlude_in.gat,65,84,0	warp	iz01-1	5,2,izlude.gat,113,147
-izlude_in.gat,74,158,0	warp	iz04-1	3,2,izlude.gat,52,136
-izlude_in.gat,87,169,0	warp	iz05-1	2,3,izlude_in.gat,111,169
+//===== Athena Script ========================================
+//= Izlude Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Izlude
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Izlude City ==============================================
+izlude.gat,109,151,0	warp	iz01	3,3,izlude_in.gat,65,87
+izlude.gat,128,225,0	warp	iz431	1,1,prt_are_in.gat,100,28
+izlude.gat,148,148,0	warp	iz02	2,2,izlude_in.gat,116,49
+izlude.gat,216,129,0	warp	iz03	3,2,izlude_in.gat,151,127
+izlude.gat,30,78,0	warp	iz001	3,3,prt_fild08.gat,367,212
+izlude.gat,52,140,0	warp	iz04	2,2,izlude_in.gat,74,161
+izlude_in.gat,108,169,0	warp	iz05	2,3,izlude_in.gat,84,169
+izlude_in.gat,116,46,0	warp	iz02-1	3,2,izlude.gat,145,145
+izlude_in.gat,148,127,0	warp	iz03-1	2,5,izlude.gat,212,129
+izlude_in.gat,171,97,0	warp	iz06	3,2,izlude_in.gat,172,119
+izlude_in.gat,172,116,0	warp	iz06-1	3,2,izlude_in.gat,172,94
+izlude_in.gat,172,139,0	warp	iz07	3,2,izlude_in.gat,172,161
+izlude_in.gat,172,158,0	warp	iz07-1	3,2,izlude_in.gat,172,136
+izlude_in.gat,43,169,0	warp	w219	2,3,izlude_in.gat,63,169
+izlude_in.gat,62,170,0	warp	w1039	1,1,izlude_in.gat,68,165
+izlude_in.gat,65,84,0	warp	iz01-1	5,2,izlude.gat,113,147
+izlude_in.gat,74,158,0	warp	iz04-1	3,2,izlude.gat,52,136
+izlude_in.gat,87,169,0	warp	iz05-1	2,3,izlude_in.gat,111,169
diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt
index 343e9c1f6..c39a8dcf0 100644
--- a/npc/warps/cities/louyang.txt
+++ b/npc/warps/cities/louyang.txt
@@ -1,48 +1,48 @@
-//===== Athena Script ========================================
-//= Lou Yang 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!
-//============================================================
-
-//= Lou Yang Town ============================================
-louyang.gat,217,22,0	warp	louwarp001	3,3,lou_fild01.gat,232,353
-louyang.gat,37,270,0	warp	louwarp002	3,3,lou_dun01.gat,218,196
-louyang.gat,218,253,0	warp	louwarp005	3,3,lou_in01.gat,101,122
-louyang.gat,279,168,0	warp	louwarp006	3,3,lou_in02.gat,57,174
-louyang.gat,309,80,0	warp	louwarp007	3,3,lou_in02.gat,189,78
-louyang.gat,124,121,0	warp	louwarp009	3,3,lou_in02.gat,197,162
-louyang.gat,129,121,0	warp	louwarp009a	3,3,lou_in02.gat,203,162
-louyang.gat,145,175,0	warp	louwarp010	3,3,lou_in02.gat,125,168
-louyang.gat,135,96,0	warp	louwarp011	3,3,lou_in02.gat,248,172
-louyang.gat,317,177,0	warp	louwarp014	3,3,lou_in02.gat,118,34
-louyang.gat,130,63,0	warp	louwarp015	3,3,lou_in02.gat,71,30
-lou_in01.gat,125,141,0	warp	louwarp016	3,3,lou_in01.gat,156,141
-lou_in01.gat,152,141,0	warp	louwarp016a	3,3,lou_in01.gat,120,141
-lou_in01.gat,78,141,0	warp	louwarp017	3,3,lou_in01.gat,47,141
-lou_in01.gat,51,141,0	warp	louwarp017a	3,3,lou_in01.gat,82,141
-lou_in01.gat,101,118,0	warp	louwarp005a	3,3,louyang.gat,218,249
-lou_in02.gat,57,170,0	warp	louwarp006a	3,3,louyang.gat,279,164
-lou_in02.gat,200,93,0	warp	louwarp008	3,3,lou_in02.gat,170,46
-lou_in02.gat,174,46,0	warp	louwarp008a	3,3,lou_in02.gat,206,94
-lou_in02.gat,197,158,0	warp	louwarp009b	3,3,louyang.gat,124,117
-lou_in02.gat,203,158,0	warp	louwarp009c	3,3,louyang.gat,129,117
-lou_in02.gat,125,164,0	warp	louwarp010a	3,3,louyang.gat,145,171
-lou_in02.gat,251,175,0	warp	louwarp011a	3,3,louyang.gat,140,101
-lou_in02.gat,242,59,0	warp	louwarp012	3,3,lou_in02.gat,74,190
-lou_in02.gat,80,190,0	warp	louwarp012a	3,3,lou_in02.gat,246,58
-lou_in02.gat,35,190,0	warp	louwarp013	3,3,lou_in02.gat,37,138
-lou_in02.gat,43,138,0	warp	louwarp013a	3,3,lou_in02.gat,39,190
-lou_in02.gat,121,32,0	warp	louwarp014a	3,3,louyang.gat,317,173
-lou_in02.gat,71,28,0	warp	louwarp015a	3,3,louyang.gat,130,57
-lou_in02.gat,189,74,0	warp	louwarp007a	3,3,louyang.gat,309,76
-lou_fild01.gat,232,357,0	warp	louwarp001a	3,3,louyang.gat,217,26
-
-
+//===== Athena Script ========================================
+//= Lou Yang 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!
+//============================================================
+
+//= Lou Yang Town ============================================
+louyang.gat,217,22,0	warp	louwarp001	3,3,lou_fild01.gat,232,353
+louyang.gat,37,270,0	warp	louwarp002	3,3,lou_dun01.gat,218,196
+louyang.gat,218,253,0	warp	louwarp005	3,3,lou_in01.gat,101,122
+louyang.gat,279,168,0	warp	louwarp006	3,3,lou_in02.gat,57,174
+louyang.gat,309,80,0	warp	louwarp007	3,3,lou_in02.gat,189,78
+louyang.gat,124,121,0	warp	louwarp009	3,3,lou_in02.gat,197,162
+louyang.gat,129,121,0	warp	louwarp009a	3,3,lou_in02.gat,203,162
+louyang.gat,145,175,0	warp	louwarp010	3,3,lou_in02.gat,125,168
+louyang.gat,135,96,0	warp	louwarp011	3,3,lou_in02.gat,248,172
+louyang.gat,317,177,0	warp	louwarp014	3,3,lou_in02.gat,118,34
+louyang.gat,130,63,0	warp	louwarp015	3,3,lou_in02.gat,71,30
+lou_in01.gat,125,141,0	warp	louwarp016	3,3,lou_in01.gat,156,141
+lou_in01.gat,152,141,0	warp	louwarp016a	3,3,lou_in01.gat,120,141
+lou_in01.gat,78,141,0	warp	louwarp017	3,3,lou_in01.gat,47,141
+lou_in01.gat,51,141,0	warp	louwarp017a	3,3,lou_in01.gat,82,141
+lou_in01.gat,101,118,0	warp	louwarp005a	3,3,louyang.gat,218,249
+lou_in02.gat,57,170,0	warp	louwarp006a	3,3,louyang.gat,279,164
+lou_in02.gat,200,93,0	warp	louwarp008	3,3,lou_in02.gat,170,46
+lou_in02.gat,174,46,0	warp	louwarp008a	3,3,lou_in02.gat,206,94
+lou_in02.gat,197,158,0	warp	louwarp009b	3,3,louyang.gat,124,117
+lou_in02.gat,203,158,0	warp	louwarp009c	3,3,louyang.gat,129,117
+lou_in02.gat,125,164,0	warp	louwarp010a	3,3,louyang.gat,145,171
+lou_in02.gat,251,175,0	warp	louwarp011a	3,3,louyang.gat,140,101
+lou_in02.gat,242,59,0	warp	louwarp012	3,3,lou_in02.gat,74,190
+lou_in02.gat,80,190,0	warp	louwarp012a	3,3,lou_in02.gat,246,58
+lou_in02.gat,35,190,0	warp	louwarp013	3,3,lou_in02.gat,37,138
+lou_in02.gat,43,138,0	warp	louwarp013a	3,3,lou_in02.gat,39,190
+lou_in02.gat,121,32,0	warp	louwarp014a	3,3,louyang.gat,317,173
+lou_in02.gat,71,28,0	warp	louwarp015a	3,3,louyang.gat,130,57
+lou_in02.gat,189,74,0	warp	louwarp007a	3,3,louyang.gat,309,76
+lou_fild01.gat,232,357,0	warp	louwarp001a	3,3,louyang.gat,217,26
+
+
diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt
index ee485e24e..c45682d4a 100644
--- a/npc/warps/cities/lutie.txt
+++ b/npc/warps/cities/lutie.txt
@@ -1,41 +1,41 @@
-//===== Athena Script ========================================
-//= Lutie Warp Script
-//===== By: ==================================================
-//= Athena (1.0)
-//= Nana (1.1)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
-//===== Description: =========================================
-//= Warp Points for Lutie
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//= Lutie Town ===============================================
-xmas.gat,104,290,0	warp	xmas12	3,3,xmas_in.gat,30,163
-xmas.gat,120,131,0	warp	xmas3	3,3,xmas_in.gat,44,33
-xmas.gat,120,161,0	warp	xmas4	3,3,xmas_in.gat,36,91
-xmas.gat,142,240,0	warp	xmas8	3,3,xmas_in.gat,95,85
-xmas.gat,142,256,0	warp	xmas11	3,3,xmas_in.gat,95,115
-xmas.gat,143,313,0	warp	xmas14	3,3,xmas_dun01.gat,205,15
-xmas.gat,149,240,0	warp	xmas9	3,3,xmas_in.gat,105,85
-xmas.gat,149,256,0	warp	xmas10	3,3,xmas_in.gat,105,115
-xmas.gat,150,41,0	warp	xmas2-1	3,3,xmas_fild01.gat,80,249
-xmas.gat,174,161,0	warp	xmas6	3,3,xmas_in.gat,165,95
-xmas.gat,175,132,0	warp	xmas5	3,3,xmas_in.gat,155,31
-xmas.gat,182,169,0	warp	xmas7	3,3,xmas_in.gat,177,107
-xmas.gat,189,279,0	warp	xmas13	3,3,xmas_in.gat,168,163
-xmas_in.gat,105,117,0	warp	xmas10-1	2,2,xmas.gat,149,258
-xmas_in.gat,105,82,0	warp	xmas9-1	3,3,xmas.gat,149,238
-xmas_in.gat,153,31,0	warp	xmas5-1	3,3,xmas.gat,173,132
-xmas_in.gat,163,93,0	warp	xmas6-1	3,3,xmas.gat,172,159
-xmas_in.gat,168,161,0	warp	xmas13-1	3,3,xmas.gat,189,277
-xmas_in.gat,179,109,0	warp	xmas7-1	3,3,xmas.gat,184,168
-xmas_in.gat,30,161,0	warp	xmas12-1	3,3,xmas.gat,104,288
-xmas_in.gat,38,89,0	warp	xmas4-1	3,3,xmas.gat,122,159
-xmas_in.gat,46,33,0	warp	xmas3-1	3,3,xmas.gat,122,131
-xmas_in.gat,95,117,0	warp	xmas11-1	2,2,xmas.gat,142,258
-xmas_in.gat,95,82,0	warp	xmas8-1	3,3,xmas.gat,142,238
-
+//===== Athena Script ========================================
+//= Lutie Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Lutie
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Lutie Town ===============================================
+xmas.gat,104,290,0	warp	xmas12	3,3,xmas_in.gat,30,163
+xmas.gat,120,131,0	warp	xmas3	3,3,xmas_in.gat,44,33
+xmas.gat,120,161,0	warp	xmas4	3,3,xmas_in.gat,36,91
+xmas.gat,142,240,0	warp	xmas8	3,3,xmas_in.gat,95,85
+xmas.gat,142,256,0	warp	xmas11	3,3,xmas_in.gat,95,115
+xmas.gat,143,313,0	warp	xmas14	3,3,xmas_dun01.gat,205,15
+xmas.gat,149,240,0	warp	xmas9	3,3,xmas_in.gat,105,85
+xmas.gat,149,256,0	warp	xmas10	3,3,xmas_in.gat,105,115
+xmas.gat,150,41,0	warp	xmas2-1	3,3,xmas_fild01.gat,80,249
+xmas.gat,174,161,0	warp	xmas6	3,3,xmas_in.gat,165,95
+xmas.gat,175,132,0	warp	xmas5	3,3,xmas_in.gat,155,31
+xmas.gat,182,169,0	warp	xmas7	3,3,xmas_in.gat,177,107
+xmas.gat,189,279,0	warp	xmas13	3,3,xmas_in.gat,168,163
+xmas_in.gat,105,117,0	warp	xmas10-1	2,2,xmas.gat,149,258
+xmas_in.gat,105,82,0	warp	xmas9-1	3,3,xmas.gat,149,238
+xmas_in.gat,153,31,0	warp	xmas5-1	3,3,xmas.gat,173,132
+xmas_in.gat,163,93,0	warp	xmas6-1	3,3,xmas.gat,172,159
+xmas_in.gat,168,161,0	warp	xmas13-1	3,3,xmas.gat,189,277
+xmas_in.gat,179,109,0	warp	xmas7-1	3,3,xmas.gat,184,168
+xmas_in.gat,30,161,0	warp	xmas12-1	3,3,xmas.gat,104,288
+xmas_in.gat,38,89,0	warp	xmas4-1	3,3,xmas.gat,122,159
+xmas_in.gat,46,33,0	warp	xmas3-1	3,3,xmas.gat,122,131
+xmas_in.gat,95,117,0	warp	xmas11-1	2,2,xmas.gat,142,258
+xmas_in.gat,95,82,0	warp	xmas8-1	3,3,xmas.gat,142,238
+
diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt
index acac81154..aa5f2af16 100644
--- a/npc/warps/cities/morroc.txt
+++ b/npc/warps/cities/morroc.txt
@@ -1,107 +1,107 @@
-//===== Athena Script ========================================
-//= Morroc Warp Script
-//===== By: ==================================================
-//= Athena (1.0)
-//= Nana (1.2)
-//===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Morroc and Assassin Guild
-//===== Additional Comments: =================================
-//= No Comment
-//============================================================
-
-//= Morroc City ==============================================
-morocc.gat,160,17,0	warp	moc001	2,2,moc_fild12.gat,159,378
-morocc.gat,160,183,0	warp	moc002	2,1,moc_castle.gat,94,181
-morocc.gat,160,297,0	warp	moc003	2,2,moc_fild07.gat,198,25
-morocc.gat,197,66,0	warp	moc01	1,1,morocc_in.gat,83,92
-morocc.gat,22,294,0	warp	moc02	2,5,moc_ruins.gat,156,42
-morocc.gat,24,164,0	warp	moc004	1,2,moc_fild19.gat,164,107
-morocc.gat,253,56,0	warp	moc03	2,1,morocc_in.gat,134,74
-morocc.gat,26,297,0	warp	moc02-1	5,2,moc_ruins.gat,156,42
-morocc.gat,274,269,0	warp	moc04	2,2,morocc_in.gat,138,136
-morocc.gat,283,170,0	warp	moc07	2,2,morocc_in.gat,108,176
-morocc.gat,302,207,0	warp	moc005	2,2,moc_fild10.gat,22,207
-morocc.gat,46,46,0	warp	moc05	2,1,morocc_in.gat,68,72
-morocc.gat,52,259,0	warp	moc06	1,2,morocc_in.gat,180,65
-morocc.gat,85,55,0	warp	moc08	2,2,morocc_in.gat,44,149
-morocc.gat,98,68,0	warp	moc09	1,1,morocc_in.gat,44,175
-morocc_in.gat,105,95,0	warp	moc10-1	1,3,morocc_in.gat,90,95
-morocc_in.gat,106,123,0	warp	moc11-1	1,3,morocc_in.gat,90,123
-morocc_in.gat,108,179,0	warp	moc07-1	2,2,morocc.gat,283,173
-morocc_in.gat,134,77,0	warp	moc03-1	3,1,morocc.gat,251,59
-morocc_in.gat,136,136,0	warp	moc04-1	1,4,morocc.gat,271,269
-morocc_in.gat,144,109,0	warp	moc12-1	3,1,morocc_in.gat,144,125
-morocc_in.gat,144,122,0	warp	moc12	3,1,morocc_in.gat,144,106
-morocc_in.gat,144,151,0	warp	moc13	3,1,morocc_in.gat,144,169
-morocc_in.gat,144,166,0	warp	moc13-1	3,1,morocc_in.gat,144,148
-morocc_in.gat,149,129,0	warp	moc14	1,2,morocc_in.gat,169,129
-morocc_in.gat,166,130,0	warp	moc14-1	1,3,morocc_in.gat,146,130
-morocc_in.gat,171,37,0	warp	moc15-1	4,1,morocc_in.gat,171,52
-morocc_in.gat,171,50,0	warp	moc15	4,1,morocc_in.gat,171,35
-morocc_in.gat,174,109,0	warp	moc22	3,1,morocc_in.gat,174,125
-morocc_in.gat,174,122,0	warp	moc22-1	3,1,morocc_in.gat,174,106
-morocc_in.gat,174,151,0	warp	moc16	3,1,morocc_in.gat,174,169
-morocc_in.gat,174,166,0	warp	moc16-1	3,1,morocc_in.gat,174,148
-morocc_in.gat,183,65,0	warp	moc06-1	2,3,morocc.gat,55,259
-morocc_in.gat,23,161,0	warp	moc17	1,2,morocc_in.gat,37,161
-morocc_in.gat,34,161,0	warp	moc17-1	1,2,morocc_in.gat,20,161
-morocc_in.gat,44,146,0	warp	moc08-1	3,2,morocc.gat,82,52
-morocc_in.gat,44,178,0	warp	moc09-1	2,2,morocc.gat,100,70
-morocc_in.gat,55,123,0	warp	moc18-1	1,3,morocc_in.gat,71,123
-morocc_in.gat,55,95,0	warp	moc19-1	1,3,morocc_in.gat,71,95
-morocc_in.gat,57,161,0	warp	moc20	1,3,morocc_in.gat,73,161
-morocc_in.gat,68,123,0	warp	moc18	1,3,morocc_in.gat,52,123
-morocc_in.gat,68,42,0	warp	moc21-1	2,1,morocc_in.gat,68,65
-morocc_in.gat,68,62,0	warp	moc21	2,1,morocc_in.gat,68,38
-morocc_in.gat,68,75,0	warp	moc05-1	2,1,morocc.gat,49,49
-morocc_in.gat,68,95,0	warp	moc19	1,3,morocc_in.gat,52,95
-morocc_in.gat,70,161,0	warp	moc20-1	1,3,morocc_in.gat,54,161
-morocc_in.gat,83,90,0	warp	moc01-1	4,1,morocc.gat,199,64
-morocc_in.gat,86,101,0	warp	moc23	2,1,morocc_in.gat,86,120
-morocc_in.gat,86,117,0	warp	moc23-1	3,1,morocc_in.gat,86,98
-morocc_in.gat,93,123,0	warp	moc11	1,3,morocc_in.gat,109,123
-morocc_in.gat,93,95,0	warp	moc10	1,3,morocc_in.gat,109,95
-
-//= Morroc Ruins ============================================
-moc_ruins.gat,161,40,0	warp	moc02-2	2,4,morocc.gat,26,293
-moc_ruins.gat,157,37,0	warp	moc02-3	5,2,morocc.gat,26,293
-moc_ruins.gat,54,161,0	warp	moc006	2,3,moc_pryd01.gat,192,9
-moc_ruins.gat,71,16,0	warp	moc007	8,2,moc_fild19.gat,71,167
-
-//= Morroc Castle ===========================================
-moc_castle.gat,94,183,0	warp	mocc001	2,1,morocc.gat,160,185
-moc_castle.gat,107,163,0	warp	mocc01	2,3,moc_castle.gat,124,163
-moc_castle.gat,120,163,0	warp	mocc01-1	2,3,moc_castle.gat,103,163
-moc_castle.gat,120,75,0	warp	mocc02	2,3,moc_castle.gat,56,33
-moc_castle.gat,59,34,0	warp	mocc02-1	2,3,moc_castle.gat,124,75
-moc_castle.gat,134,101,0	warp	mocc03	1,1,moc_castle.gat,134,128
-moc_castle.gat,134,124,0	warp	mocc-03	2,2,moc_castle.gat,134,98
-moc_castle.gat,134,139,0	warp	mocc04	1,1,moc_castle.gat,134,160
-moc_castle.gat,134,156,0	warp	mocc04-1	2,2,moc_castle.gat,134,136
-moc_castle.gat,149,163,0	warp	mocc05	2,3,moc_castle.gat,162,163
-moc_castle.gat,158,163,0	warp	mocc05-1	2,3,moc_castle.gat,145,163
-moc_castle.gat,16,131,0	warp	mocc06	1,2,moc_castle.gat,16,164
-moc_castle.gat,16,160,0	warp	mocc06-1	1,2,moc_castle.gat,16,125
-moc_castle.gat,170,131,0	warp	mocc07	2,2,moc_castle.gat,170,163
-moc_castle.gat,170,160,0	warp	mocc07-1	1,1,moc_castle.gat,170,128
-moc_castle.gat,29,163,0	warp	mocc08	2,2,moc_castle.gat,44,163
-moc_castle.gat,40,163,0	warp	mocc08-1	2,2,moc_castle.gat,25,163
-moc_castle.gat,51,114,0	warp	mocc09	3,2,moc_castle.gat,54,65
-moc_castle.gat,54,69,0	warp	mocc09-1	3,2,moc_castle.gat,52,117
-moc_castle.gat,54,139,0	warp	mocc10	2,2,moc_castle.gat,54,160
-moc_castle.gat,54,156,0	warp	mocc10-1	2,2,moc_castle.gat,54,134
-moc_castle.gat,63,89,0	warp	mocc11	2,3,moc_castle.gat,83,89
-moc_castle.gat,80,89,0	warp	mocc11-1	2,3,moc_castle.gat,60,89
-moc_castle.gat,69,163,0	warp	mocc12	2,2,moc_castle.gat,86,163
-moc_castle.gat,82,163,0	warp	mocc12-1	2,2,moc_castle.gat,66,163
-moc_castle.gat,88,93,0	warp	mocc13	1,1,moc_castle.gat,94,119
-moc_castle.gat,94,116,0	warp	mocc13-1	1,1,moc_castle.gat,88,90
-moc_castle.gat,96,90,0	warp	mocc13-2	1,1,moc_castle.gat,94,119
-moc_castle.gat,92,67,0	warp	mocc14	3,2,moc_castle.gat,92,85
-moc_castle.gat,92,82,0	warp	mocc14-1	3,2,moc_castle.gat,92,63
-moc_castle.gat,94,143,0	warp	mocc15	3,2,moc_castle.gat,94,160
+//===== Athena Script ========================================
+//= Morroc Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Morroc and Assassin Guild
+//===== Additional Comments: =================================
+//= No Comment
+//============================================================
+
+//= Morroc City ==============================================
+morocc.gat,160,17,0	warp	moc001	2,2,moc_fild12.gat,159,378
+morocc.gat,160,183,0	warp	moc002	2,1,moc_castle.gat,94,181
+morocc.gat,160,297,0	warp	moc003	2,2,moc_fild07.gat,198,25
+morocc.gat,197,66,0	warp	moc01	1,1,morocc_in.gat,83,92
+morocc.gat,22,294,0	warp	moc02	2,5,moc_ruins.gat,156,42
+morocc.gat,24,164,0	warp	moc004	1,2,moc_fild19.gat,164,107
+morocc.gat,253,56,0	warp	moc03	2,1,morocc_in.gat,134,74
+morocc.gat,26,297,0	warp	moc02-1	5,2,moc_ruins.gat,156,42
+morocc.gat,274,269,0	warp	moc04	2,2,morocc_in.gat,138,136
+morocc.gat,283,170,0	warp	moc07	2,2,morocc_in.gat,108,176
+morocc.gat,302,207,0	warp	moc005	2,2,moc_fild10.gat,22,207
+morocc.gat,46,46,0	warp	moc05	2,1,morocc_in.gat,68,72
+morocc.gat,52,259,0	warp	moc06	1,2,morocc_in.gat,180,65
+morocc.gat,85,55,0	warp	moc08	2,2,morocc_in.gat,44,149
+morocc.gat,98,68,0	warp	moc09	1,1,morocc_in.gat,44,175
+morocc_in.gat,105,95,0	warp	moc10-1	1,3,morocc_in.gat,90,95
+morocc_in.gat,106,123,0	warp	moc11-1	1,3,morocc_in.gat,90,123
+morocc_in.gat,108,179,0	warp	moc07-1	2,2,morocc.gat,283,173
+morocc_in.gat,134,77,0	warp	moc03-1	3,1,morocc.gat,251,59
+morocc_in.gat,136,136,0	warp	moc04-1	1,4,morocc.gat,271,269
+morocc_in.gat,144,109,0	warp	moc12-1	3,1,morocc_in.gat,144,125
+morocc_in.gat,144,122,0	warp	moc12	3,1,morocc_in.gat,144,106
+morocc_in.gat,144,151,0	warp	moc13	3,1,morocc_in.gat,144,169
+morocc_in.gat,144,166,0	warp	moc13-1	3,1,morocc_in.gat,144,148
+morocc_in.gat,149,129,0	warp	moc14	1,2,morocc_in.gat,169,129
+morocc_in.gat,166,130,0	warp	moc14-1	1,3,morocc_in.gat,146,130
+morocc_in.gat,171,37,0	warp	moc15-1	4,1,morocc_in.gat,171,52
+morocc_in.gat,171,50,0	warp	moc15	4,1,morocc_in.gat,171,35
+morocc_in.gat,174,109,0	warp	moc22	3,1,morocc_in.gat,174,125
+morocc_in.gat,174,122,0	warp	moc22-1	3,1,morocc_in.gat,174,106
+morocc_in.gat,174,151,0	warp	moc16	3,1,morocc_in.gat,174,169
+morocc_in.gat,174,166,0	warp	moc16-1	3,1,morocc_in.gat,174,148
+morocc_in.gat,183,65,0	warp	moc06-1	2,3,morocc.gat,55,259
+morocc_in.gat,23,161,0	warp	moc17	1,2,morocc_in.gat,37,161
+morocc_in.gat,34,161,0	warp	moc17-1	1,2,morocc_in.gat,20,161
+morocc_in.gat,44,146,0	warp	moc08-1	3,2,morocc.gat,82,52
+morocc_in.gat,44,178,0	warp	moc09-1	2,2,morocc.gat,100,70
+morocc_in.gat,55,123,0	warp	moc18-1	1,3,morocc_in.gat,71,123
+morocc_in.gat,55,95,0	warp	moc19-1	1,3,morocc_in.gat,71,95
+morocc_in.gat,57,161,0	warp	moc20	1,3,morocc_in.gat,73,161
+morocc_in.gat,68,123,0	warp	moc18	1,3,morocc_in.gat,52,123
+morocc_in.gat,68,42,0	warp	moc21-1	2,1,morocc_in.gat,68,65
+morocc_in.gat,68,62,0	warp	moc21	2,1,morocc_in.gat,68,38
+morocc_in.gat,68,75,0	warp	moc05-1	2,1,morocc.gat,49,49
+morocc_in.gat,68,95,0	warp	moc19	1,3,morocc_in.gat,52,95
+morocc_in.gat,70,161,0	warp	moc20-1	1,3,morocc_in.gat,54,161
+morocc_in.gat,83,90,0	warp	moc01-1	4,1,morocc.gat,199,64
+morocc_in.gat,86,101,0	warp	moc23	2,1,morocc_in.gat,86,120
+morocc_in.gat,86,117,0	warp	moc23-1	3,1,morocc_in.gat,86,98
+morocc_in.gat,93,123,0	warp	moc11	1,3,morocc_in.gat,109,123
+morocc_in.gat,93,95,0	warp	moc10	1,3,morocc_in.gat,109,95
+
+//= Morroc Ruins ============================================
+moc_ruins.gat,161,40,0	warp	moc02-2	2,4,morocc.gat,26,293
+moc_ruins.gat,157,37,0	warp	moc02-3	5,2,morocc.gat,26,293
+moc_ruins.gat,54,161,0	warp	moc006	2,3,moc_pryd01.gat,192,9
+moc_ruins.gat,71,16,0	warp	moc007	8,2,moc_fild19.gat,71,167
+
+//= Morroc Castle ===========================================
+moc_castle.gat,94,183,0	warp	mocc001	2,1,morocc.gat,160,185
+moc_castle.gat,107,163,0	warp	mocc01	2,3,moc_castle.gat,124,163
+moc_castle.gat,120,163,0	warp	mocc01-1	2,3,moc_castle.gat,103,163
+moc_castle.gat,120,75,0	warp	mocc02	2,3,moc_castle.gat,56,33
+moc_castle.gat,59,34,0	warp	mocc02-1	2,3,moc_castle.gat,124,75
+moc_castle.gat,134,101,0	warp	mocc03	1,1,moc_castle.gat,134,128
+moc_castle.gat,134,124,0	warp	mocc-03	2,2,moc_castle.gat,134,98
+moc_castle.gat,134,139,0	warp	mocc04	1,1,moc_castle.gat,134,160
+moc_castle.gat,134,156,0	warp	mocc04-1	2,2,moc_castle.gat,134,136
+moc_castle.gat,149,163,0	warp	mocc05	2,3,moc_castle.gat,162,163
+moc_castle.gat,158,163,0	warp	mocc05-1	2,3,moc_castle.gat,145,163
+moc_castle.gat,16,131,0	warp	mocc06	1,2,moc_castle.gat,16,164
+moc_castle.gat,16,160,0	warp	mocc06-1	1,2,moc_castle.gat,16,125
+moc_castle.gat,170,131,0	warp	mocc07	2,2,moc_castle.gat,170,163
+moc_castle.gat,170,160,0	warp	mocc07-1	1,1,moc_castle.gat,170,128
+moc_castle.gat,29,163,0	warp	mocc08	2,2,moc_castle.gat,44,163
+moc_castle.gat,40,163,0	warp	mocc08-1	2,2,moc_castle.gat,25,163
+moc_castle.gat,51,114,0	warp	mocc09	3,2,moc_castle.gat,54,65
+moc_castle.gat,54,69,0	warp	mocc09-1	3,2,moc_castle.gat,52,117
+moc_castle.gat,54,139,0	warp	mocc10	2,2,moc_castle.gat,54,160
+moc_castle.gat,54,156,0	warp	mocc10-1	2,2,moc_castle.gat,54,134
+moc_castle.gat,63,89,0	warp	mocc11	2,3,moc_castle.gat,83,89
+moc_castle.gat,80,89,0	warp	mocc11-1	2,3,moc_castle.gat,60,89
+moc_castle.gat,69,163,0	warp	mocc12	2,2,moc_castle.gat,86,163
+moc_castle.gat,82,163,0	warp	mocc12-1	2,2,moc_castle.gat,66,163
+moc_castle.gat,88,93,0	warp	mocc13	1,1,moc_castle.gat,94,119
+moc_castle.gat,94,116,0	warp	mocc13-1	1,1,moc_castle.gat,88,90
+moc_castle.gat,96,90,0	warp	mocc13-2	1,1,moc_castle.gat,94,119
+moc_castle.gat,92,67,0	warp	mocc14	3,2,moc_castle.gat,92,85
+moc_castle.gat,92,82,0	warp	mocc14-1	3,2,moc_castle.gat,92,63
+moc_castle.gat,94,143,0	warp	mocc15	3,2,moc_castle.gat,94,160
 moc_castle.gat,94,156,0	warp	mocc15-1	3,2,moc_castle.gat,94,140
 \ No newline at end of file
diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt
index b76040703..b9446f9c3 100644
--- a/npc/warps/cities/niflheim.txt
+++ b/npc/warps/cities/niflheim.txt
@@ -1,35 +1,35 @@
-//===== Athena Script ========================================
-//= Niflheim Warp Script
-//===== By: ==================================================
-//= PKGINGO (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
-//===== Description: =========================================
-//= Warp Points for Niflheim
-//===== Additional Comments: =================================
-//= Extracted from Vidar -> Athena
-//============================================================
-
-//Niflheim Fields
-nif_fild01.gat,345,323,0	warp	nwarp7	1,1,nif_fild02.gat,23,312
-nif_fild02.gat,21,312,0	warp	nwarp8	1,1,nif_fild01.gat,343,322
-nif_fild02.gat,379,235,0	warp	nwarp9	1,1,niflheim.gat,20,153
-niflheim.gat,18,151,0	warp	nwarp10	1,1,nif_fild02.gat,376,235
-
-//Niflheim Town
-
-//Weapon shop
-niflheim.gat,220,169,0	warp	nwarp11	1,1,nif_in.gat,14,88
-nif_in.gat,11,88,0	warp	nwarp12	1,1,niflheim.gat,218,170
-
-//Item shop: 134,12
-niflheim.gat,219,199,0	warp	nwarp13	1,1,nif_in.gat,136,14
-nif_in.gat,134,12,0	warp	nwarp14	1,1,niflheim.gat,218,197
-
-//House on the hill
-niflheim.gat,255,194,0	warp	nwarp15	1,1,nif_in.gat,20,156
-nif_in.gat,18,154,0	warp	nwarp16	1,1,niflheim.gat,254,192
-nif_in.gat,65,168,0	warp	nwarp17	1,1,nif_in.gat,141,174
+//===== Athena Script ========================================
+//= Niflheim Warp Script
+//===== By: ==================================================
+//= PKGINGO (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Niflheim
+//===== Additional Comments: =================================
+//= Extracted from Vidar -> Athena
+//============================================================
+
+//Niflheim Fields
+nif_fild01.gat,345,323,0	warp	nwarp7	1,1,nif_fild02.gat,23,312
+nif_fild02.gat,21,312,0	warp	nwarp8	1,1,nif_fild01.gat,343,322
+nif_fild02.gat,379,235,0	warp	nwarp9	1,1,niflheim.gat,20,153
+niflheim.gat,18,151,0	warp	nwarp10	1,1,nif_fild02.gat,376,235
+
+//Niflheim Town
+
+//Weapon shop
+niflheim.gat,220,169,0	warp	nwarp11	1,1,nif_in.gat,14,88
+nif_in.gat,11,88,0	warp	nwarp12	1,1,niflheim.gat,218,170
+
+//Item shop: 134,12
+niflheim.gat,219,199,0	warp	nwarp13	1,1,nif_in.gat,136,14
+nif_in.gat,134,12,0	warp	nwarp14	1,1,niflheim.gat,218,197
+
+//House on the hill
+niflheim.gat,255,194,0	warp	nwarp15	1,1,nif_in.gat,20,156
+nif_in.gat,18,154,0	warp	nwarp16	1,1,niflheim.gat,254,192
+nif_in.gat,65,168,0	warp	nwarp17	1,1,nif_in.gat,141,174
 nif_in.gat,140,171,0	warp	nwarp18	1,1,nif_in.gat,65,165
 \ No newline at end of file
diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt
index 63bf950df..0d03800fe 100644
--- a/npc/warps/cities/payon.txt
+++ b/npc/warps/cities/payon.txt
@@ -1,137 +1,137 @@
-//===== eAthena Script ======================================= 
-//= Payon Warps
-//===== By: ================================================== 
-//= Muad Dib (1.0)
-//= Darkchild (1.1)
-//= Nana (1.3)
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= Any eAthena Mod
-//===== Description: ========================================= 
-//= Payon warps
-//===== Additional Comments: ================================= 
-//= Warps Done By Muad Dib, All Credits To Him
-//= 1.2 Removed Duplicated Warp
-//= 1.3 Separated and reorganized field and dungeons
-//============================================================ 
-
-// == Official Warps From kRO Screenshots ==
-
-// -- Entrance / Exit --
-payon.gat,16,142,0		warp	payonwarp001	1,1,pay_gld.gat,370,149
-pay_gld.gat,374,149,0		warp	payonwarp002	1,1,payon.gat,20,142
-payon.gat,122,27,0		warp	payonwarp003	5,3,pay_fild01.gat,333,356
-pay_fild01.gat,333,360,0	warp	payonwarp004	5,3,payon.gat,122,31
-payon.gat,267,90,0		warp	payonwarp005	2,4,pay_fild08.gat,20,74
-pay_fild08.gat,17,74,0		warp	payonwarp006	2,4,payon.gat,264,93
-payon.gat,228,330,0		warp	payonwarp007	4,2,pay_arche.gat,81,22
-pay_arche.gat,81,18,0		warp	payonwarp008	5,2,payon.gat,228,326
-
-// -- Inn --
-payon.gat,223,117,0		warp	payonwarp009	2,2,payon_in01.gat,175,11
-payon_in01.gat,172,11,0		warp	payonwarp010	2,2,payon.gat,219,117
-payon_in01.gat,180,43,0		warp	payonwarp011	2,2,payon_in01.gat,181,73
-payon_in01.gat,181,70,0		warp	payonwarp012	2,2,payon_in01.gat,180,40
-payon_in01.gat,193,92,0		warp	payonwarp013	2,2,payon_in01.gat,143,61
-payon_in01.gat,146,61,0		warp	payonwarp014	2,2,payon_in01.gat,193,89
-payon_in01.gat,133,42,0		warp	payonwarp015	2,2,payon_in01.gat,133,18
-payon_in01.gat,133,21,0		warp	payonwarp016	2,2,payon_in01.gat,133,45
-
-// -- Sort of Mill --
-payon.gat,140,85,0		warp	payonwarp017	2,2,payon_in01.gat,14,51
-payon_in01.gat,17,51,0		warp	payonwarp018	2,2,payon.gat,143,85
-payon_in01.gat,10,59,0		warp	payonwarp019	2,2,payon_in01.gat,10,83
-payon_in01.gat,10,80,0		warp	payonwarp021	2,2,payon_in01.gat,10,56
-payon_in01.gat,10,38,0		warp	payonwarp022	2,2,payon_in01.gat,10,14
-payon_in01.gat,10,17,0		warp	payonwarp023	2,2,payon_in01.gat,10,41
-
-// -- Weaponshop --
-payon.gat,135,158,0		warp	payonwarp024	2,2,payon_in01.gat,20,129
-payon_in01.gat,23,129,0		warp	payonwarp025	2,2,payon.gat,138,158
-payon.gat,130,169,0		warp	payonwarp026	2,2,payon_in01.gat,13,136
-payon_in01.gat,13,139,0		warp	payonwarp027	2,2,payon.gat,130,172
-
-// -- House --
-payon.gat,151,127,0		warp	payonwarp028	2,2,payon_in01.gat,56,53
-payon_in01.gat,56,50,0		warp	payonwarp029	2,2,payon.gat,151,124
-
-// -- Middle Castle --
-payon.gat,156,247,0		warp	payonwarp030	2,2,payon_in03.gat,98,117
-payon_in03.gat,98,114,0		warp	payonwarp031	2,2,payon.gat,156,245
-payon_in03.gat,90,124,0		warp	payonwarp032	2,2,payon_in03.gat,80,124
-payon_in03.gat,83,124,0		warp	payonwarp033	2,2,payon_in03.gat,93,124
-payon_in03.gat,99,133,0		warp	payonwarp034	2,2,payon_in03.gat,99,151
-payon_in03.gat,99,148,0		warp	payonwarp035	2,2,payon_in03.gat,99,130
-payon_in03.gat,107,124,0	warp	payonwarp036	2,2,payon_in03.gat,117,124
-payon_in03.gat,114,124,0	warp	payonwarp037	2,2,payon_in03.gat,104,124
-
-// -- Weapon Storage Building --
-payon.gat,189,233,0		warp	payonwarp038	2,2,payon_in03.gat,149,39
-payon_in03.gat,146,39,0		warp	payonwarp039	2,2,payon.gat,186,233
-payon_in03.gat,158,32,0		warp	payonwarp040	2,2,payon_in03.gat,130,14
-payon_in03.gat,130,17,0		warp	payonwarp041	2,2,payon_in03.gat,158,35
-payon_in03.gat,172,32,0		warp	payonwarp042	2,2,payon_in03.gat,160,14
-payon_in03.gat,160,17,0		warp	payonwarp043	2,2,payon_in03.gat,172,35
-payon_in03.gat,186,32,0		warp	payonwarp044	2,2,payon_in03.gat,190,13
-payon_in03.gat,190,17,0		warp	payonwarp045	2,2,payon_in03.gat,186,35
-
-// -- House --
-payon.gat,256,285,0		warp	payonwarp046	2,2,payon_in01.gat,45,11
-payon_in01.gat,42,11,0		warp	payonwarp047	2,2,payon.gat,253,285
-
-// -- Old Archer Village Warps --
-pay_arche.gat,36,131,0		warp	payonwarp048	2,2,pay_dun00.gat,21,183
-pay_arche.gat,71,156,0		warp	payonwarp049	2,2,payon_in02.gat,82,41
-pay_arche.gat,92,170,0		warp	payonwarp050	2,2,payon_in02.gat,50,7
-pay_arche.gat,145,165,0	 	warp	payonwarp051	2,2,payon_in02.gat,64,60
-payon_in02.gat,10,25,0	 	warp	payonwarp052	2,2,payon_in02.gat,72,67
-payon_in02.gat,35,67,0	 	warp	payonwarp053	2,2,payon_in02.gat,55,67
-payon_in02.gat,50,4,0	 	warp	payonwarp054	3,1,pay_arche.gat,92,166
-payon_in02.gat,52,67,0	 	warp	payonwarp055	2,2,payon_in02.gat,32,67
-payon_in02.gat,61,33,0	 	warp	payonwarp056	2,2,payon_in02.gat,73,33
-payon_in02.gat,64,56,0	 	warp	payonwarp057	2,2,pay_arche.gat,141,161
-payon_in02.gat,70,33,0	 	warp	payonwarp058	2,2,payon_in02.gat,58,33
-payon_in02.gat,75,67,0	 	warp	payonwarp059	2,2,payon_in02.gat,13,25
-payon_in02.gat,82,45,0	 	warp	payonwarp060	2,2,pay_arche.gat,74,153
-
-
-// == Self Made Warps, No Screen Availble ==
-
-// -- Large West House --
-payon.gat,127,204,0		warp	payonwarp061	2,2,payon_in03.gat,81,19
-payon_in03.gat,85,19,0		warp	payonwarp062	2,2,payon.gat,131,204
-payon_in03.gat,74,18,0	 	warp	payonwarp063	2,2,payon_in03.gat,62,18
-payon_in03.gat,67,18,0	 	warp	payonwarp064	2,2,payon_in03.gat,78,18
-payon_in03.gat,46,18,0	 	warp	payonwarp065	2,2,payon_in03.gat,35,18
-payon_in03.gat,39,18,0	 	warp	payonwarp066	2,2,payon_in03.gat,51,18
-payon_in03.gat,28,18,0	 	warp	payonwarp067	2,2,payon_in03.gat,17,18
-payon_in03.gat,21,18,0	 	warp	payonwarp068	2,2,payon_in03.gat,32,18
-
-// -- Big Kitchen --
-payon.gat,155,327,0		warp	payonwarp069	2,2,payon_in03.gat,165,143
-payon_in03.gat,165,140,0	warp	payonwarp070	2,2,payon.gat,155,324
-payon_in03.gat,185,178,0	warp	payonwarp071	2,2,payon_in03.gat,185,149
-payon_in03.gat,185,153,0	warp	payonwarp072	2,2,payon_in03.gat,185,182
-
-// -- Upper Castle --
-payon.gat,107,327,0		warp	payonwarp073	2,2,payon_in03.gat,19,64
-payon_in03.gat,19,60,0		warp	payonwarp074	2,2,payon.gat,107,323
-payon_in03.gat,19,73,0	 	warp	payonwarp075	2,2,payon_in03.gat,19,90
-payon_in03.gat,19,86,0	 	warp	payonwarp076	2,2,payon_in03.gat,19,69
-payon_in03.gat,19,103,0	 	warp	payonwarp077	2,2,payon_in03.gat,19,122
-payon_in03.gat,19,118,0	 	warp	payonwarp078	2,2,payon_in03.gat,19,99
-payon_in03.gat,11,131,0	 	warp	payonwarp079	2,2,payon_in03.gat,11,146
-payon_in03.gat,11,142,0	 	warp	payonwarp080	2,2,payon_in03.gat,11,127
-payon_in03.gat,27,131,0	 	warp	payonwarp081	2,2,payon_in03.gat,27,146
-payon_in03.gat,27,142,0	 	warp	payonwarp082	2,2,payon_in03.gat,27,127
-payon_in03.gat,11,161,0	 	warp	payonwarp083	2,2,payon_in03.gat,11,176
-payon_in03.gat,11,172,0	 	warp	payonwarp084	2,2,payon_in03.gat,11,157
-payon_in03.gat,27,161,0	 	warp	payonwarp085	2,2,payon_in03.gat,27,176
-payon_in03.gat,27,172,0	 	warp	payonwarp086	2,2,payon_in03.gat,27,157
-
-// -- House --
-payon_in01.gat,86,9,0		warp	payonwarp087	2,2,payon.gat,266,152
-payon.gat,270,152,0		warp	payonwarp088	2,2,payon_in01.gat,90,9
-payon_in01.gat,107,71,0		warp	payonwarp089	2,2,payon_in01.gat,96,37
+//===== eAthena Script ======================================= 
+//= Payon Warps
+//===== By: ================================================== 
+//= Muad Dib (1.0)
+//= Darkchild (1.1)
+//= Nana (1.3)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Mod
+//===== Description: ========================================= 
+//= Payon warps
+//===== Additional Comments: ================================= 
+//= Warps Done By Muad Dib, All Credits To Him
+//= 1.2 Removed Duplicated Warp
+//= 1.3 Separated and reorganized field and dungeons
+//============================================================ 
+
+// == Official Warps From kRO Screenshots ==
+
+// -- Entrance / Exit --
+payon.gat,16,142,0		warp	payonwarp001	1,1,pay_gld.gat,370,149
+pay_gld.gat,374,149,0		warp	payonwarp002	1,1,payon.gat,20,142
+payon.gat,122,27,0		warp	payonwarp003	5,3,pay_fild01.gat,333,356
+pay_fild01.gat,333,360,0	warp	payonwarp004	5,3,payon.gat,122,31
+payon.gat,267,90,0		warp	payonwarp005	2,4,pay_fild08.gat,20,74
+pay_fild08.gat,17,74,0		warp	payonwarp006	2,4,payon.gat,264,93
+payon.gat,228,330,0		warp	payonwarp007	4,2,pay_arche.gat,81,22
+pay_arche.gat,81,18,0		warp	payonwarp008	5,2,payon.gat,228,326
+
+// -- Inn --
+payon.gat,223,117,0		warp	payonwarp009	2,2,payon_in01.gat,175,11
+payon_in01.gat,172,11,0		warp	payonwarp010	2,2,payon.gat,219,117
+payon_in01.gat,180,43,0		warp	payonwarp011	2,2,payon_in01.gat,181,73
+payon_in01.gat,181,70,0		warp	payonwarp012	2,2,payon_in01.gat,180,40
+payon_in01.gat,193,92,0		warp	payonwarp013	2,2,payon_in01.gat,143,61
+payon_in01.gat,146,61,0		warp	payonwarp014	2,2,payon_in01.gat,193,89
+payon_in01.gat,133,42,0		warp	payonwarp015	2,2,payon_in01.gat,133,18
+payon_in01.gat,133,21,0		warp	payonwarp016	2,2,payon_in01.gat,133,45
+
+// -- Sort of Mill --
+payon.gat,140,85,0		warp	payonwarp017	2,2,payon_in01.gat,14,51
+payon_in01.gat,17,51,0		warp	payonwarp018	2,2,payon.gat,143,85
+payon_in01.gat,10,59,0		warp	payonwarp019	2,2,payon_in01.gat,10,83
+payon_in01.gat,10,80,0		warp	payonwarp021	2,2,payon_in01.gat,10,56
+payon_in01.gat,10,38,0		warp	payonwarp022	2,2,payon_in01.gat,10,14
+payon_in01.gat,10,17,0		warp	payonwarp023	2,2,payon_in01.gat,10,41
+
+// -- Weaponshop --
+payon.gat,135,158,0		warp	payonwarp024	2,2,payon_in01.gat,20,129
+payon_in01.gat,23,129,0		warp	payonwarp025	2,2,payon.gat,138,158
+payon.gat,130,169,0		warp	payonwarp026	2,2,payon_in01.gat,13,136
+payon_in01.gat,13,139,0		warp	payonwarp027	2,2,payon.gat,130,172
+
+// -- House --
+payon.gat,151,127,0		warp	payonwarp028	2,2,payon_in01.gat,56,53
+payon_in01.gat,56,50,0		warp	payonwarp029	2,2,payon.gat,151,124
+
+// -- Middle Castle --
+payon.gat,156,247,0		warp	payonwarp030	2,2,payon_in03.gat,98,117
+payon_in03.gat,98,114,0		warp	payonwarp031	2,2,payon.gat,156,245
+payon_in03.gat,90,124,0		warp	payonwarp032	2,2,payon_in03.gat,80,124
+payon_in03.gat,83,124,0		warp	payonwarp033	2,2,payon_in03.gat,93,124
+payon_in03.gat,99,133,0		warp	payonwarp034	2,2,payon_in03.gat,99,151
+payon_in03.gat,99,148,0		warp	payonwarp035	2,2,payon_in03.gat,99,130
+payon_in03.gat,107,124,0	warp	payonwarp036	2,2,payon_in03.gat,117,124
+payon_in03.gat,114,124,0	warp	payonwarp037	2,2,payon_in03.gat,104,124
+
+// -- Weapon Storage Building --
+payon.gat,189,233,0		warp	payonwarp038	2,2,payon_in03.gat,149,39
+payon_in03.gat,146,39,0		warp	payonwarp039	2,2,payon.gat,186,233
+payon_in03.gat,158,32,0		warp	payonwarp040	2,2,payon_in03.gat,130,14
+payon_in03.gat,130,17,0		warp	payonwarp041	2,2,payon_in03.gat,158,35
+payon_in03.gat,172,32,0		warp	payonwarp042	2,2,payon_in03.gat,160,14
+payon_in03.gat,160,17,0		warp	payonwarp043	2,2,payon_in03.gat,172,35
+payon_in03.gat,186,32,0		warp	payonwarp044	2,2,payon_in03.gat,190,13
+payon_in03.gat,190,17,0		warp	payonwarp045	2,2,payon_in03.gat,186,35
+
+// -- House --
+payon.gat,256,285,0		warp	payonwarp046	2,2,payon_in01.gat,45,11
+payon_in01.gat,42,11,0		warp	payonwarp047	2,2,payon.gat,253,285
+
+// -- Old Archer Village Warps --
+pay_arche.gat,36,131,0		warp	payonwarp048	2,2,pay_dun00.gat,21,183
+pay_arche.gat,71,156,0		warp	payonwarp049	2,2,payon_in02.gat,82,41
+pay_arche.gat,92,170,0		warp	payonwarp050	2,2,payon_in02.gat,50,7
+pay_arche.gat,145,165,0	 	warp	payonwarp051	2,2,payon_in02.gat,64,60
+payon_in02.gat,10,25,0	 	warp	payonwarp052	2,2,payon_in02.gat,72,67
+payon_in02.gat,35,67,0	 	warp	payonwarp053	2,2,payon_in02.gat,55,67
+payon_in02.gat,50,4,0	 	warp	payonwarp054	3,1,pay_arche.gat,92,166
+payon_in02.gat,52,67,0	 	warp	payonwarp055	2,2,payon_in02.gat,32,67
+payon_in02.gat,61,33,0	 	warp	payonwarp056	2,2,payon_in02.gat,73,33
+payon_in02.gat,64,56,0	 	warp	payonwarp057	2,2,pay_arche.gat,141,161
+payon_in02.gat,70,33,0	 	warp	payonwarp058	2,2,payon_in02.gat,58,33
+payon_in02.gat,75,67,0	 	warp	payonwarp059	2,2,payon_in02.gat,13,25
+payon_in02.gat,82,45,0	 	warp	payonwarp060	2,2,pay_arche.gat,74,153
+
+
+// == Self Made Warps, No Screen Availble ==
+
+// -- Large West House --
+payon.gat,127,204,0		warp	payonwarp061	2,2,payon_in03.gat,81,19
+payon_in03.gat,85,19,0		warp	payonwarp062	2,2,payon.gat,131,204
+payon_in03.gat,74,18,0	 	warp	payonwarp063	2,2,payon_in03.gat,62,18
+payon_in03.gat,67,18,0	 	warp	payonwarp064	2,2,payon_in03.gat,78,18
+payon_in03.gat,46,18,0	 	warp	payonwarp065	2,2,payon_in03.gat,35,18
+payon_in03.gat,39,18,0	 	warp	payonwarp066	2,2,payon_in03.gat,51,18
+payon_in03.gat,28,18,0	 	warp	payonwarp067	2,2,payon_in03.gat,17,18
+payon_in03.gat,21,18,0	 	warp	payonwarp068	2,2,payon_in03.gat,32,18
+
+// -- Big Kitchen --
+payon.gat,155,327,0		warp	payonwarp069	2,2,payon_in03.gat,165,143
+payon_in03.gat,165,140,0	warp	payonwarp070	2,2,payon.gat,155,324
+payon_in03.gat,185,178,0	warp	payonwarp071	2,2,payon_in03.gat,185,149
+payon_in03.gat,185,153,0	warp	payonwarp072	2,2,payon_in03.gat,185,182
+
+// -- Upper Castle --
+payon.gat,107,327,0		warp	payonwarp073	2,2,payon_in03.gat,19,64
+payon_in03.gat,19,60,0		warp	payonwarp074	2,2,payon.gat,107,323
+payon_in03.gat,19,73,0	 	warp	payonwarp075	2,2,payon_in03.gat,19,90
+payon_in03.gat,19,86,0	 	warp	payonwarp076	2,2,payon_in03.gat,19,69
+payon_in03.gat,19,103,0	 	warp	payonwarp077	2,2,payon_in03.gat,19,122
+payon_in03.gat,19,118,0	 	warp	payonwarp078	2,2,payon_in03.gat,19,99
+payon_in03.gat,11,131,0	 	warp	payonwarp079	2,2,payon_in03.gat,11,146
+payon_in03.gat,11,142,0	 	warp	payonwarp080	2,2,payon_in03.gat,11,127
+payon_in03.gat,27,131,0	 	warp	payonwarp081	2,2,payon_in03.gat,27,146
+payon_in03.gat,27,142,0	 	warp	payonwarp082	2,2,payon_in03.gat,27,127
+payon_in03.gat,11,161,0	 	warp	payonwarp083	2,2,payon_in03.gat,11,176
+payon_in03.gat,11,172,0	 	warp	payonwarp084	2,2,payon_in03.gat,11,157
+payon_in03.gat,27,161,0	 	warp	payonwarp085	2,2,payon_in03.gat,27,176
+payon_in03.gat,27,172,0	 	warp	payonwarp086	2,2,payon_in03.gat,27,157
+
+// -- House --
+payon_in01.gat,86,9,0		warp	payonwarp087	2,2,payon.gat,266,152
+payon.gat,270,152,0		warp	payonwarp088	2,2,payon_in01.gat,90,9
+payon_in01.gat,107,71,0		warp	payonwarp089	2,2,payon_in01.gat,96,37
 payon_in01.gat,93,37,0		warp	payonwarp090	2,2,payon_in01.gat,103,71
 \ No newline at end of file
diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt
index 0cd9b6785..42d2438fe 100644
--- a/npc/warps/cities/prontera.txt
+++ b/npc/warps/cities/prontera.txt
@@ -1,102 +1,102 @@
-//===== Athena Script ========================================
-//= Prontera Warp Script
-//===== By: ==================================================
-//= Athena (1.0)
-//= Nana (1.2)
-//===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Warp Points for Prontera
-//===== Additional Comments: =================================
-//= No Comment!
-//============================================================
-
-//= Prontera City ============================================
-prontera.gat,107,215,0	warp	prt01	2,2,prt_in.gat,240,139
-prontera.gat,120,267,0	warp	prt02	2,2,prt_in.gat,180,97
-prontera.gat,133,183,0	warp	prt03	2,2,prt_in.gat,50,105
-prontera.gat,134,221,0	warp	prt04	1,1,prt_in.gat,131,71
-prontera.gat,156,22,0	warp	prt001	3,2,prt_fild08.gat,170,375
-prontera.gat,156,360,0	warp	prt005	4,2,prt_castle.gat,102,20
-prontera.gat,177,221,0	warp	prt05	2,2,prt_in.gat,168,128
-prontera.gat,179,184,0	warp	prt06	2,2,prt_in.gat,60,73
-prontera.gat,192,267,0	warp	prt07	2,2,prt_in.gat,178,55
-prontera.gat,204,192,0	warp	prt08	2,2,prt_in.gat,68,134
-prontera.gat,208,154,0	warp	prt09	2,2,prt_in.gat,172,29
-prontera.gat,22,203,0	warp	prt002	2,3,prt_fild05.gat,367,205
-prontera.gat,237,317,0	warp	prt004	2,2,prt_church.gat,100,60
-prontera.gat,289,203,0	warp	prt003	2,3,prt_fild06.gat,27,193
-prontera.gat,42,67,0	warp	prt10	2,2,prt_in.gat,44,29
-prontera.gat,45,346,0	warp	prt11	2,2,prt_in.gat,80,110
-prontera.gat,73,100,0	warp	prt12	1,1,prt_in.gat,208,176
-prontera.gat,74,90,0	warp	prt13	2,2,prt_in.gat,248,170
-prontera.gat,84,89,0	warp	prt14-1	1,1,prt_in.gat,282,176
-prt_in.gat,135,71,0	warp	prt04-1	1,2,prontera.gat,136,219
-prt_in.gat,168,124,0	warp	prt05-1	2,1,prontera.gat,174,218
-prt_in.gat,172,33,0	warp	prt09-1	2,1,prontera.gat,205,157
-prt_in.gat,181,55,0	warp	prt07-1	1,2,prontera.gat,192,264
-prt_in.gat,183,97,0	warp	prt02-1	1,2,prontera.gat,120,264
-prt_in.gat,208,179,0	warp	prt12-1	3,1,prontera.gat,76,102
-prt_in.gat,217,163,0	warp	prt15	1,3,prt_in.gat,236,163
-prt_in.gat,234,163,0	warp	prt15-1	1,3,prt_in.gat,215,163
-prt_in.gat,240,141,0	warp	prt01-1	3,1,prontera.gat,107,218
-prt_in.gat,248,173,0	warp	prt13-1	3,2,prontera.gat,77,93
-prt_in.gat,254,113,0	warp	prt16	3,2,prt_in.gat,256,134
-prt_in.gat,256,131,0	warp	prt16-1	2,2,prt_in.gat,254,110
-prt_in.gat,263,163,0	warp	prt17	1,3,prt_in.gat,276,163
-prt_in.gat,274,163,0	warp	prt17-1	1,3,prt_in.gat,261,163
-prt_in.gat,280,68,0	warp	w472	6,6,prontera.gat,147,287
-prt_in.gat,281,36,0	warp	w473	6,6,prontera.gat,147,287
-prt_in.gat,282,100,0	warp	w471	6,6,prontera.gat,147,287
-prt_in.gat,282,179,0	warp	prt14	3,1,prontera.gat,87,91
-prt_in.gat,285,130,0	warp	w470	6,6,prontera.gat,147,287
-prt_in.gat,37,65,0	warp	prt18	1,3,prt_in.gat,51,65
-prt_in.gat,47,29,0	warp	prt10-1	2,1,prontera.gat,46,67
-prt_in.gat,48,65,0	warp	prt18-1	1,3,prt_in.gat,34,65
-prt_in.gat,53,105,0	warp	prt03-1	1,2,prontera.gat,136,186
-prt_in.gat,60,77,0	warp	prt06-1	2,1,prontera.gat,175,188
-prt_in.gat,68,130,0	warp	prt08-1	2,1,prontera.gat,204,188
-prt_in.gat,69,65,0	warp	prt19	1,3,prt_in.gat,85,65
-prt_in.gat,70,143,0	warp	prt20	2,1,prt_in.gat,70,165
-prt_in.gat,70,162,0	warp	prt20-1	2,1,prt_in.gat,70,140
-prt_in.gat,80,113,0	warp	prt11-1	2,1,prontera.gat,48,343
-prt_in.gat,82,65,0	warp	prt19	1,3,prt_in.gat,66,65
-
-//= Prontera Church ==========================================
-prt_church.gat,100,56,0	warp	prtch001	7,1,prontera.gat,234,314
-prt_church.gat,109,81,0	warp	prtch01	1,2,prt_church.gat,172,19
-prt_church.gat,168,19,0	warp	prtch01-1	1,2,prt_church.gat,105,81
-prt_church.gat,31,19,0	warp	prtch02	1,2,prt_church.gat,94,81
-prt_church.gat,90,81,0	warp	prtch02-1	1,2,prt_church.gat,27,19
-
-
-
-//= Prontera Castle ===========================================
-prt_castle.gat,102,129,0	warp	prtca01	3,2,prt_castle.gat,102,143
-prt_castle.gat,102,140,0	warp	prtca01-1	3,2,prt_castle.gat,102,126
-prt_castle.gat,102,16,0	warp	prtca001	6,2,prontera.gat,156,356
-prt_castle.gat,102,181,0	warp	prtca002	6,2,prt_gld.gat,159,28
-prt_castle.gat,102,73,0	warp	prtca02	3,2,prt_castle.gat,102,91
-prt_castle.gat,102,88,0	warp	prtca02-1	3,2,prt_castle.gat,102,70
-prt_castle.gat,113,107,0	warp	prtca03	2,3,prt_castle.gat,134,107
-prt_castle.gat,121,29,0	warp	prtca04	1,1,prt_castle.gat,148,29
-prt_castle.gat,130,107,0	warp	prtca03-1	2,3,prt_castle.gat,110,107
-prt_castle.gat,135,153,0	warp	prtca05	1,1,prt_castle.gat,167,145
-prt_castle.gat,144,29,0	warp	prtca04-1	2,2,prt_castle.gat,117,29
-prt_castle.gat,149,113,0	warp	prtca06	1,1,prt_castle.gat,175,113
-prt_castle.gat,164,145,0	warp	prtca05-1	1,1,prt_castle.gat,132,153
-prt_castle.gat,170,138,0	warp	prtca07	3,2,prt_castle.gat,176,118
-prt_castle.gat,172,113,0	warp	prtca06-1	1,1,prt_castle.gat,146,113
-prt_castle.gat,176,121,0	warp	prtca07-1	3,2,prt_castle.gat,170,141
-prt_castle.gat,28,121,0	warp	prtca08	2,2,prt_castle.gat,40,141
-prt_castle.gat,31,113,0	warp	prtca09	1,1,prt_castle.gat,58,113
-prt_castle.gat,40,138,0	warp	prtca08-1	3,2,prt_castle.gat,28,118
-prt_castle.gat,45,145,0	warp	prtca10	1,1,prt_castle.gat,72,153
-prt_castle.gat,54,113,0	warp	prtca09-1	1,1,prt_castle.gat,27,113
-prt_castle.gat,59,29,0	warp	prtca11	2,2,prt_castle.gat,85,29
-prt_castle.gat,68,153,0	warp	prtca10-1	1,1,prt_castle.gat,42,145
-prt_castle.gat,75,107,0	warp	prtca12	2,3,prt_castle.gat,95,107
-prt_castle.gat,82,29,0	warp	prtca11-1	1,1,prt_castle.gat,56,29
+//===== Athena Script ========================================
+//= Prontera Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Prontera City ============================================
+prontera.gat,107,215,0	warp	prt01	2,2,prt_in.gat,240,139
+prontera.gat,120,267,0	warp	prt02	2,2,prt_in.gat,180,97
+prontera.gat,133,183,0	warp	prt03	2,2,prt_in.gat,50,105
+prontera.gat,134,221,0	warp	prt04	1,1,prt_in.gat,131,71
+prontera.gat,156,22,0	warp	prt001	3,2,prt_fild08.gat,170,375
+prontera.gat,156,360,0	warp	prt005	4,2,prt_castle.gat,102,20
+prontera.gat,177,221,0	warp	prt05	2,2,prt_in.gat,168,128
+prontera.gat,179,184,0	warp	prt06	2,2,prt_in.gat,60,73
+prontera.gat,192,267,0	warp	prt07	2,2,prt_in.gat,178,55
+prontera.gat,204,192,0	warp	prt08	2,2,prt_in.gat,68,134
+prontera.gat,208,154,0	warp	prt09	2,2,prt_in.gat,172,29
+prontera.gat,22,203,0	warp	prt002	2,3,prt_fild05.gat,367,205
+prontera.gat,237,317,0	warp	prt004	2,2,prt_church.gat,100,60
+prontera.gat,289,203,0	warp	prt003	2,3,prt_fild06.gat,27,193
+prontera.gat,42,67,0	warp	prt10	2,2,prt_in.gat,44,29
+prontera.gat,45,346,0	warp	prt11	2,2,prt_in.gat,80,110
+prontera.gat,73,100,0	warp	prt12	1,1,prt_in.gat,208,176
+prontera.gat,74,90,0	warp	prt13	2,2,prt_in.gat,248,170
+prontera.gat,84,89,0	warp	prt14-1	1,1,prt_in.gat,282,176
+prt_in.gat,135,71,0	warp	prt04-1	1,2,prontera.gat,136,219
+prt_in.gat,168,124,0	warp	prt05-1	2,1,prontera.gat,174,218
+prt_in.gat,172,33,0	warp	prt09-1	2,1,prontera.gat,205,157
+prt_in.gat,181,55,0	warp	prt07-1	1,2,prontera.gat,192,264
+prt_in.gat,183,97,0	warp	prt02-1	1,2,prontera.gat,120,264
+prt_in.gat,208,179,0	warp	prt12-1	3,1,prontera.gat,76,102
+prt_in.gat,217,163,0	warp	prt15	1,3,prt_in.gat,236,163
+prt_in.gat,234,163,0	warp	prt15-1	1,3,prt_in.gat,215,163
+prt_in.gat,240,141,0	warp	prt01-1	3,1,prontera.gat,107,218
+prt_in.gat,248,173,0	warp	prt13-1	3,2,prontera.gat,77,93
+prt_in.gat,254,113,0	warp	prt16	3,2,prt_in.gat,256,134
+prt_in.gat,256,131,0	warp	prt16-1	2,2,prt_in.gat,254,110
+prt_in.gat,263,163,0	warp	prt17	1,3,prt_in.gat,276,163
+prt_in.gat,274,163,0	warp	prt17-1	1,3,prt_in.gat,261,163
+prt_in.gat,280,68,0	warp	w472	6,6,prontera.gat,147,287
+prt_in.gat,281,36,0	warp	w473	6,6,prontera.gat,147,287
+prt_in.gat,282,100,0	warp	w471	6,6,prontera.gat,147,287
+prt_in.gat,282,179,0	warp	prt14	3,1,prontera.gat,87,91
+prt_in.gat,285,130,0	warp	w470	6,6,prontera.gat,147,287
+prt_in.gat,37,65,0	warp	prt18	1,3,prt_in.gat,51,65
+prt_in.gat,47,29,0	warp	prt10-1	2,1,prontera.gat,46,67
+prt_in.gat,48,65,0	warp	prt18-1	1,3,prt_in.gat,34,65
+prt_in.gat,53,105,0	warp	prt03-1	1,2,prontera.gat,136,186
+prt_in.gat,60,77,0	warp	prt06-1	2,1,prontera.gat,175,188
+prt_in.gat,68,130,0	warp	prt08-1	2,1,prontera.gat,204,188
+prt_in.gat,69,65,0	warp	prt19	1,3,prt_in.gat,85,65
+prt_in.gat,70,143,0	warp	prt20	2,1,prt_in.gat,70,165
+prt_in.gat,70,162,0	warp	prt20-1	2,1,prt_in.gat,70,140
+prt_in.gat,80,113,0	warp	prt11-1	2,1,prontera.gat,48,343
+prt_in.gat,82,65,0	warp	prt19	1,3,prt_in.gat,66,65
+
+//= Prontera Church ==========================================
+prt_church.gat,100,56,0	warp	prtch001	7,1,prontera.gat,234,314
+prt_church.gat,109,81,0	warp	prtch01	1,2,prt_church.gat,172,19
+prt_church.gat,168,19,0	warp	prtch01-1	1,2,prt_church.gat,105,81
+prt_church.gat,31,19,0	warp	prtch02	1,2,prt_church.gat,94,81
+prt_church.gat,90,81,0	warp	prtch02-1	1,2,prt_church.gat,27,19
+
+
+
+//= Prontera Castle ===========================================
+prt_castle.gat,102,129,0	warp	prtca01	3,2,prt_castle.gat,102,143
+prt_castle.gat,102,140,0	warp	prtca01-1	3,2,prt_castle.gat,102,126
+prt_castle.gat,102,16,0	warp	prtca001	6,2,prontera.gat,156,356
+prt_castle.gat,102,181,0	warp	prtca002	6,2,prt_gld.gat,159,28
+prt_castle.gat,102,73,0	warp	prtca02	3,2,prt_castle.gat,102,91
+prt_castle.gat,102,88,0	warp	prtca02-1	3,2,prt_castle.gat,102,70
+prt_castle.gat,113,107,0	warp	prtca03	2,3,prt_castle.gat,134,107
+prt_castle.gat,121,29,0	warp	prtca04	1,1,prt_castle.gat,148,29
+prt_castle.gat,130,107,0	warp	prtca03-1	2,3,prt_castle.gat,110,107
+prt_castle.gat,135,153,0	warp	prtca05	1,1,prt_castle.gat,167,145
+prt_castle.gat,144,29,0	warp	prtca04-1	2,2,prt_castle.gat,117,29
+prt_castle.gat,149,113,0	warp	prtca06	1,1,prt_castle.gat,175,113
+prt_castle.gat,164,145,0	warp	prtca05-1	1,1,prt_castle.gat,132,153
+prt_castle.gat,170,138,0	warp	prtca07	3,2,prt_castle.gat,176,118
+prt_castle.gat,172,113,0	warp	prtca06-1	1,1,prt_castle.gat,146,113
+prt_castle.gat,176,121,0	warp	prtca07-1	3,2,prt_castle.gat,170,141
+prt_castle.gat,28,121,0	warp	prtca08	2,2,prt_castle.gat,40,141
+prt_castle.gat,31,113,0	warp	prtca09	1,1,prt_castle.gat,58,113
+prt_castle.gat,40,138,0	warp	prtca08-1	3,2,prt_castle.gat,28,118
+prt_castle.gat,45,145,0	warp	prtca10	1,1,prt_castle.gat,72,153
+prt_castle.gat,54,113,0	warp	prtca09-1	1,1,prt_castle.gat,27,113
+prt_castle.gat,59,29,0	warp	prtca11	2,2,prt_castle.gat,85,29
+prt_castle.gat,68,153,0	warp	prtca10-1	1,1,prt_castle.gat,42,145
+prt_castle.gat,75,107,0	warp	prtca12	2,3,prt_castle.gat,95,107
+prt_castle.gat,82,29,0	warp	prtca11-1	1,1,prt_castle.gat,56,29
 prt_castle.gat,92,107,0	warp	prtca12-1	2,3,prt_castle.gat,72,107
 \ No newline at end of file
diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt
index 3a3d89c13..ee253386d 100644
--- a/npc/warps/cities/umbala.txt
+++ b/npc/warps/cities/umbala.txt
@@ -1,44 +1,44 @@
-//===== Athena Script ========================================
-//= Umbala Warp Script
-//===== By: ==================================================
-//= Darkchild (1.0v A) 
-//= Athena (1.0v B)
-//= 1.1 (Akaru)
-//= Nana (1.2)
-//===== Current Version: =====================================
-//= 1.2 
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
-//===== Description: =========================================
-//= Warp Points for Umbala
-//===== Additional Comments: =================================
-//= No Comment
-//============================================================
-
-//Witch House
-umbala.gat,220,190,0	warp	umba0027	1,1,um_in.gat,32,70
-um_in.gat,28,70,0	warp	umba0028	1,1,umbala.gat,217,187
-
-//Weapons
-umbala.gat,125,157,0	warp	umba0029	1,1,um_in.gat,155,114
-um_in.gat,155,110,0	warp	umba0030	1,1,umbala.gat,126,152
-
-//Fan Shack
-umbala.gat,138,129,0	warp	umba0031	1,1,um_in.gat,99,114
-um_in.gat,99,110,0	warp	umba0032	1,1,umbala.gat,136,127
-
-//Lower Double Shack 
-umbala.gat,95,186,0	warp	umba0033	1,1,um_in.gat,142,42
-um_in.gat,141,39,0	warp	umba0034	1,1,umbala.gat,95,183
-
-//Upper Double Shack 
-umbala.gat,100,202,0	warp	umba0035	1,1,um_in.gat,163,70
-um_in.gat,166,70,0	warp	umba0036	1,1,umbala.gat,102,204
-
-//Small Shack 
-umbala.gat,156,249,0	warp	umba0037	1,1,um_in.gat,99,67
-um_in.gat,99,63,0	warp	umba0038	1,1,umbala.gat,160,247
-
-//Large Shack 
-umbala.gat,108,164,0	warp	umba0039	1,1,um_in.gat,38,112
+//===== Athena Script ========================================
+//= Umbala Warp Script
+//===== By: ==================================================
+//= Darkchild (1.0v A) 
+//= Athena (1.0v B)
+//= 1.1 (Akaru)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.2 
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Umbala
+//===== Additional Comments: =================================
+//= No Comment
+//============================================================
+
+//Witch House
+umbala.gat,220,190,0	warp	umba0027	1,1,um_in.gat,32,70
+um_in.gat,28,70,0	warp	umba0028	1,1,umbala.gat,217,187
+
+//Weapons
+umbala.gat,125,157,0	warp	umba0029	1,1,um_in.gat,155,114
+um_in.gat,155,110,0	warp	umba0030	1,1,umbala.gat,126,152
+
+//Fan Shack
+umbala.gat,138,129,0	warp	umba0031	1,1,um_in.gat,99,114
+um_in.gat,99,110,0	warp	umba0032	1,1,umbala.gat,136,127
+
+//Lower Double Shack 
+umbala.gat,95,186,0	warp	umba0033	1,1,um_in.gat,142,42
+um_in.gat,141,39,0	warp	umba0034	1,1,umbala.gat,95,183
+
+//Upper Double Shack 
+umbala.gat,100,202,0	warp	umba0035	1,1,um_in.gat,163,70
+um_in.gat,166,70,0	warp	umba0036	1,1,umbala.gat,102,204
+
+//Small Shack 
+umbala.gat,156,249,0	warp	umba0037	1,1,um_in.gat,99,67
+um_in.gat,99,63,0	warp	umba0038	1,1,umbala.gat,160,247
+
+//Large Shack 
+umbala.gat,108,164,0	warp	umba0039	1,1,um_in.gat,38,112
 um_in.gat,38,110,0	warp	umba0040	1,1,umbala.gat,104,163
 \ No newline at end of file
diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt
index 05e3a3745..881ced220 100644
--- a/npc/warps/cities/yggdrasil.txt
+++ b/npc/warps/cities/yggdrasil.txt
@@ -1,25 +1,25 @@
-//===== Athena Script ========================================
-//= Yggdrasil Tree Warp Script
-//===== By: ==================================================
-//= PKGINGO (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
-//===== Description: =========================================
-//= Warp Points for Yggdrasil Tree
-//===== Additional Comments: =================================
-//= Extracted from Vidar -> Athena
-//============================================================
-
-//Umbala Entrance
-um_dun02.gat,125,163,0	warp	nwarp1	1,1,yggdrasil01.gat,40,63
-yggdrasil01.gat,36,62,0	warp	nwarp2	1,1,um_dun02.gat,126,147
-
-//Niflheim Exit
-yggdrasil01.gat,249,262,0	warp	nwarp5	1,1,nif_fild01.gat,315,66
-nif_fild01.gat,315,63,0	warp	nwarp6	1,1,yggdrasil01.gat,247,262
-
-//Yggdrasil Tree
-yggdrasil01.gat,271,51,0	warp	nwarp3	1,1,yggdrasil01.gat,26,196
+//===== Athena Script ========================================
+//= Yggdrasil Tree Warp Script
+//===== By: ==================================================
+//= PKGINGO (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Yggdrasil Tree
+//===== Additional Comments: =================================
+//= Extracted from Vidar -> Athena
+//============================================================
+
+//Umbala Entrance
+um_dun02.gat,125,163,0	warp	nwarp1	1,1,yggdrasil01.gat,40,63
+yggdrasil01.gat,36,62,0	warp	nwarp2	1,1,um_dun02.gat,126,147
+
+//Niflheim Exit
+yggdrasil01.gat,249,262,0	warp	nwarp5	1,1,nif_fild01.gat,315,66
+nif_fild01.gat,315,63,0	warp	nwarp6	1,1,yggdrasil01.gat,247,262
+
+//Yggdrasil Tree
+yggdrasil01.gat,271,51,0	warp	nwarp3	1,1,yggdrasil01.gat,26,196
 yggdrasil01.gat,26,193,0	warp	nwarp4	1,1,yggdrasil01.gat,269,53
 \ No newline at end of file
diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index 7bbfd6823..9232e7f88 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -1,92 +1,92 @@
-//===== Athena Script ========================================
-//= Yuno Warp Script
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 5+
-//===== Description: =========================================
-//= Warp Points for Yuno
-//===== Additional Comments: =================================
-//= No Comment
-//============================================================
-
-//= Yuno City ================================================
-yuno.gat,158,15,0	warp	yun-yunfild	1,1,yuno_fild04.gat,231,209
-yuno.gat,117,135,0	warp	yun01	1,1,yuno_in01.gat,116,37
-yuno_in01.gat,116,40,0	warp	yun02	1,1,yuno.gat,120,138
-yuno.gat,48,105,0	warp	yun03	1,1,yuno_in01.gat,37,176
-yuno_in01.gat,40,176,0	warp	yun04	1,1,yuno.gat,51,105
-yuno_in01.gat,32,182,0	warp	yun05	1,1,yuno_in01.gat,86,164
-yuno_in01.gat,82,164,0	warp	yun06	1,1,yuno_in01.gat,28,182
-yuno.gat,48,151,0	warp	yun07	1,1,yuno_in01.gat,30,100
-yuno_in01.gat,34,100,0	warp	yun08	1,1,yuno.gat,51,151
-yuno.gat,93,180,0	warp	yun09	1,1,yuno_in04.gat,33,127
-yuno_in04.gat,33,130,0	warp	yun10	1,1,yuno.gat,95,184
-yuno.gat,196,138,0	warp	yun11	1,1,yuno_in01.gat,32,33
-yuno_in01.gat,32,36,0	warp	yun12	1,1,yuno.gat,193,142
-yuno.gat,264,87,0	warp	yun13	1,1,yuno_in01.gat,168,101
-yuno_in01.gat,168,104,0	warp	yun14	1,1,yuno.gat,264,90
-yuno.gat,342,203,0	warp	yun15	1,1,yuno_in04.gat,32,58
-yuno_in04.gat,28,58,0	warp	yun16	1,1,yuno.gat,338,203
-yuno_in04.gat,52,58,0	warp	yun17	1,1,yuno_in04.gat,97,58
-yuno_in04.gat,95,58,0	warp	yun18	1,1,yuno_in04.gat,50,58
-yuno_in04.gat,103,64,0	warp	yun19	1,1,yuno_in04.gat,103,95
-yuno_in04.gat,103,93,0	warp	yun20	1,1,yuno_in04.gat,103,62
-yuno_in04.gat,115,64,0	warp	yun21	1,1,yuno_in04.gat,115,95
-yuno_in04.gat,115,93,0	warp	yun22	1,1,yuno_in04.gat,115,62
-yuno_in04.gat,115,51,0	warp	yun23	1,1,yuno_in04.gat,115,20
-yuno_in04.gat,115,22,0	warp	yun24	1,1,yuno_in04.gat,115,53
-yuno_in04.gat,103,51,0	warp	yun25	1,1,yuno_in04.gat,103,20
-yuno_in04.gat,103,22,0	warp	yun26	1,1,yuno_in04.gat,103,53
-yuno_in04.gat,122,57,0	warp	yun27	1,1,yuno_in04.gat,164,110
-yuno_in04.gat,161,110,0	warp	yun28	1,1,yuno_in04.gat,120,57
-yuno.gat,323,284,0	warp	yun29	1,1,yuno_in03.gat,167,22
-yuno_in03.gat,167,19,0	warp	yun30	1,1,yuno.gat,323,280
-yuno_in03.gat,167,72,0	warp	yun31	1,1,yuno_in03.gat,179,113
-yuno_in03.gat,179,109,0	warp	yun32	1,1,yuno_in03.gat,167,69
-yuno_in03.gat,186,119,0	warp	yun33	1,1,yuno_in03.gat,163,174
-yuno_in03.gat,159,174,0	warp	yun34	1,1,yuno_in03.gat,183,119
-yuno_in03.gat,186,131,0	warp	yun35	1,1,yuno_in03.gat,163,187
-yuno_in03.gat,159,187,0	warp	yun36	1,1,yuno_in03.gat,183,131
-yuno_in03.gat,172,118,0	warp	yun37	1,1,yuno_in03.gat,120,178
-yuno_in03.gat,124,178,0	warp	yun38	1,1,yuno_in03.gat,176,118
-yuno_in03.gat,111,192,0	warp	yun39	1,1,yuno_in03.gat,162,132
-yuno_in03.gat,162,129,0	warp	yun40	1,1,yuno_in03.gat,111,189
-yuno_in03.gat,153,134,0	warp	yun41	1,1,yuno_in03.gat,62,186
-yuno_in03.gat,66,186,0	warp	yun42	1,1,yuno_in03.gat,155,134
-yuno.gat,278,293,0	warp	yun43	1,1,yuno_in03.gat,25,15
-yuno_in03.gat,25,11,0	warp	yun44	1,1,yuno.gat,278,290
-yuno_in03.gat,32,89,0	warp	yun45	1,1,yuno_in03.gat,25,53
-yuno_in03.gat,25,56,0	warp	yun46	1,1,yuno_in03.gat,32,92
-yuno.gat,284,366,0	warp	yun47	1,1,yuno_in03.gat,224,23
-yuno_in03.gat,224,19,0	warp	yun48	1,1,yuno.gat,284,363
-yuno_in03.gat,219,50,0	warp	yun49	1,1,yuno_in03.gat,104,118
-yuno_in03.gat,104,115,0	warp	yun50	1,1,yuno_in03.gat,219,47
-yuno_in03.gat,244,52,0	warp	yun51	1,1,yuno_in03.gat,235,94
-yuno_in03.gat,235,91,0	warp	yun52	1,1,yuno_in03.gat,244,49
-yuno_in03.gat,231,61,0	warp	yun53	1,1,yuno_in03.gat,239,144
-yuno_in03.gat,239,141,0	warp	yun54	1,1,yuno_in03.gat,231,57
-yuno_in03.gat,223,167,0	warp	yun55	1,1,yuno_in03.gat,96,54
-yuno_in03.gat,96,58,0	warp	yun56	1,1,yuno_in03.gat,223,170
-yuno.gat,87,321,0	warp	yun57	1,1,yuno_in02.gat,168,61
-yuno_in02.gat,172,61,0	warp	yun58	1,1,yuno.gat,90,321
-yuno_in02.gat,82,14,0	warp	yun59	1,1,yuno_in05.gat,192,194
-yuno_in05.gat,196,194,0	warp	yun60	1,1,yuno_in02.gat,85,14
-yuno_in05.gat,153,142,0	warp	yun61	1,1,yuno_in05.gat,145,83
-yuno_in05.gat,148,83,0	warp	yun62	1,1,yuno_in05.gat,156,142
-yuno_in05.gat,137,71,0	warp	yun63	1,1,yuno_in05.gat,15,185
-yuno_in05.gat,16,188,0	warp	yun64	1,1,yuno_in05.gat,137,74
-yuno_in05.gat,181,91,0	warp	yun65	1,1,yuno_in05.gat,177,49
-yuno_in05.gat,177,52,0	warp	yun66	1,1,yuno_in05.gat,181,94
-yuno_in05.gat,177,9,0	warp	yun67	1,1,yuno_in05.gat,177,49
-yuno_in05.gat,165,103,0	warp	yun68	1,1,yuno_in05.gat,145,83
-yuno_in05.gat,125,83,0	warp	yun69	1,1,yuno_in05.gat,193,102
-yuno_in05.gat,181,116,0	warp	yun70	1,1,yuno_in05.gat,177,12
-yuno_in05.gat,47,185,0	warp	yun71	1,1,yuno_in05.gat,181,94
-yuno_in05.gat,31,167,0	warp	yun72	1,1,yuno_in05.gat,50,85
-yuno_in05.gat,50,87,0	warp	yun73	1,1,yuno_in02.gat,85,14
-yuno_in01.gat,88,36,0	warp	yun74	1,1,yuno_in01.gat,173,34
-yuno_in01.gat,176,34,0	warp	yun75	1,1,yuno_in01.gat,91,36
+//===== Athena Script ========================================
+//= Yuno Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Yuno
+//===== Additional Comments: =================================
+//= No Comment
+//============================================================
+
+//= Yuno City ================================================
+yuno.gat,158,15,0	warp	yun-yunfild	1,1,yuno_fild04.gat,231,209
+yuno.gat,117,135,0	warp	yun01	1,1,yuno_in01.gat,116,37
+yuno_in01.gat,116,40,0	warp	yun02	1,1,yuno.gat,120,138
+yuno.gat,48,105,0	warp	yun03	1,1,yuno_in01.gat,37,176
+yuno_in01.gat,40,176,0	warp	yun04	1,1,yuno.gat,51,105
+yuno_in01.gat,32,182,0	warp	yun05	1,1,yuno_in01.gat,86,164
+yuno_in01.gat,82,164,0	warp	yun06	1,1,yuno_in01.gat,28,182
+yuno.gat,48,151,0	warp	yun07	1,1,yuno_in01.gat,30,100
+yuno_in01.gat,34,100,0	warp	yun08	1,1,yuno.gat,51,151
+yuno.gat,93,180,0	warp	yun09	1,1,yuno_in04.gat,33,127
+yuno_in04.gat,33,130,0	warp	yun10	1,1,yuno.gat,95,184
+yuno.gat,196,138,0	warp	yun11	1,1,yuno_in01.gat,32,33
+yuno_in01.gat,32,36,0	warp	yun12	1,1,yuno.gat,193,142
+yuno.gat,264,87,0	warp	yun13	1,1,yuno_in01.gat,168,101
+yuno_in01.gat,168,104,0	warp	yun14	1,1,yuno.gat,264,90
+yuno.gat,342,203,0	warp	yun15	1,1,yuno_in04.gat,32,58
+yuno_in04.gat,28,58,0	warp	yun16	1,1,yuno.gat,338,203
+yuno_in04.gat,52,58,0	warp	yun17	1,1,yuno_in04.gat,97,58
+yuno_in04.gat,95,58,0	warp	yun18	1,1,yuno_in04.gat,50,58
+yuno_in04.gat,103,64,0	warp	yun19	1,1,yuno_in04.gat,103,95
+yuno_in04.gat,103,93,0	warp	yun20	1,1,yuno_in04.gat,103,62
+yuno_in04.gat,115,64,0	warp	yun21	1,1,yuno_in04.gat,115,95
+yuno_in04.gat,115,93,0	warp	yun22	1,1,yuno_in04.gat,115,62
+yuno_in04.gat,115,51,0	warp	yun23	1,1,yuno_in04.gat,115,20
+yuno_in04.gat,115,22,0	warp	yun24	1,1,yuno_in04.gat,115,53
+yuno_in04.gat,103,51,0	warp	yun25	1,1,yuno_in04.gat,103,20
+yuno_in04.gat,103,22,0	warp	yun26	1,1,yuno_in04.gat,103,53
+yuno_in04.gat,122,57,0	warp	yun27	1,1,yuno_in04.gat,164,110
+yuno_in04.gat,161,110,0	warp	yun28	1,1,yuno_in04.gat,120,57
+yuno.gat,323,284,0	warp	yun29	1,1,yuno_in03.gat,167,22
+yuno_in03.gat,167,19,0	warp	yun30	1,1,yuno.gat,323,280
+yuno_in03.gat,167,72,0	warp	yun31	1,1,yuno_in03.gat,179,113
+yuno_in03.gat,179,109,0	warp	yun32	1,1,yuno_in03.gat,167,69
+yuno_in03.gat,186,119,0	warp	yun33	1,1,yuno_in03.gat,163,174
+yuno_in03.gat,159,174,0	warp	yun34	1,1,yuno_in03.gat,183,119
+yuno_in03.gat,186,131,0	warp	yun35	1,1,yuno_in03.gat,163,187
+yuno_in03.gat,159,187,0	warp	yun36	1,1,yuno_in03.gat,183,131
+yuno_in03.gat,172,118,0	warp	yun37	1,1,yuno_in03.gat,120,178
+yuno_in03.gat,124,178,0	warp	yun38	1,1,yuno_in03.gat,176,118
+yuno_in03.gat,111,192,0	warp	yun39	1,1,yuno_in03.gat,162,132
+yuno_in03.gat,162,129,0	warp	yun40	1,1,yuno_in03.gat,111,189
+yuno_in03.gat,153,134,0	warp	yun41	1,1,yuno_in03.gat,62,186
+yuno_in03.gat,66,186,0	warp	yun42	1,1,yuno_in03.gat,155,134
+yuno.gat,278,293,0	warp	yun43	1,1,yuno_in03.gat,25,15
+yuno_in03.gat,25,11,0	warp	yun44	1,1,yuno.gat,278,290
+yuno_in03.gat,32,89,0	warp	yun45	1,1,yuno_in03.gat,25,53
+yuno_in03.gat,25,56,0	warp	yun46	1,1,yuno_in03.gat,32,92
+yuno.gat,284,366,0	warp	yun47	1,1,yuno_in03.gat,224,23
+yuno_in03.gat,224,19,0	warp	yun48	1,1,yuno.gat,284,363
+yuno_in03.gat,219,50,0	warp	yun49	1,1,yuno_in03.gat,104,118
+yuno_in03.gat,104,115,0	warp	yun50	1,1,yuno_in03.gat,219,47
+yuno_in03.gat,244,52,0	warp	yun51	1,1,yuno_in03.gat,235,94
+yuno_in03.gat,235,91,0	warp	yun52	1,1,yuno_in03.gat,244,49
+yuno_in03.gat,231,61,0	warp	yun53	1,1,yuno_in03.gat,239,144
+yuno_in03.gat,239,141,0	warp	yun54	1,1,yuno_in03.gat,231,57
+yuno_in03.gat,223,167,0	warp	yun55	1,1,yuno_in03.gat,96,54
+yuno_in03.gat,96,58,0	warp	yun56	1,1,yuno_in03.gat,223,170
+yuno.gat,87,321,0	warp	yun57	1,1,yuno_in02.gat,168,61
+yuno_in02.gat,172,61,0	warp	yun58	1,1,yuno.gat,90,321
+yuno_in02.gat,82,14,0	warp	yun59	1,1,yuno_in05.gat,192,194
+yuno_in05.gat,196,194,0	warp	yun60	1,1,yuno_in02.gat,85,14
+yuno_in05.gat,153,142,0	warp	yun61	1,1,yuno_in05.gat,145,83
+yuno_in05.gat,148,83,0	warp	yun62	1,1,yuno_in05.gat,156,142
+yuno_in05.gat,137,71,0	warp	yun63	1,1,yuno_in05.gat,15,185
+yuno_in05.gat,16,188,0	warp	yun64	1,1,yuno_in05.gat,137,74
+yuno_in05.gat,181,91,0	warp	yun65	1,1,yuno_in05.gat,177,49
+yuno_in05.gat,177,52,0	warp	yun66	1,1,yuno_in05.gat,181,94
+yuno_in05.gat,177,9,0	warp	yun67	1,1,yuno_in05.gat,177,49
+yuno_in05.gat,165,103,0	warp	yun68	1,1,yuno_in05.gat,145,83
+yuno_in05.gat,125,83,0	warp	yun69	1,1,yuno_in05.gat,193,102
+yuno_in05.gat,181,116,0	warp	yun70	1,1,yuno_in05.gat,177,12
+yuno_in05.gat,47,185,0	warp	yun71	1,1,yuno_in05.gat,181,94
+yuno_in05.gat,31,167,0	warp	yun72	1,1,yuno_in05.gat,50,85
+yuno_in05.gat,50,87,0	warp	yun73	1,1,yuno_in02.gat,85,14
+yuno_in01.gat,88,36,0	warp	yun74	1,1,yuno_in01.gat,173,34
+yuno_in01.gat,176,34,0	warp	yun75	1,1,yuno_in01.gat,91,36
 yuno_in05.gat,197,102,0	warp	yun76	1,1,yuno_in05.gat,168,103
 \ No newline at end of file