summaryrefslogtreecommitdiff
path: root/npc/warps/cities
diff options
context:
space:
mode:
Diffstat (limited to 'npc/warps/cities')
-rw-r--r--npc/warps/cities/alberta.txt84
-rw-r--r--npc/warps/cities/aldebaran.txt66
-rw-r--r--npc/warps/cities/amatsu.txt74
-rw-r--r--npc/warps/cities/ayothaya.txt88
-rw-r--r--npc/warps/cities/comodo.txt66
-rw-r--r--npc/warps/cities/einbech.txt25
-rw-r--r--npc/warps/cities/einbroch.txt102
-rw-r--r--npc/warps/cities/geffen.txt68
-rw-r--r--npc/warps/cities/gonryun.txt38
-rw-r--r--npc/warps/cities/hugel.txt132
-rw-r--r--npc/warps/cities/izlude.txt36
-rw-r--r--npc/warps/cities/lighthalzen.txt168
-rw-r--r--npc/warps/cities/louyang.txt73
-rw-r--r--npc/warps/cities/lutie.txt48
-rw-r--r--npc/warps/cities/morroc.txt174
-rw-r--r--npc/warps/cities/niflheim.txt46
-rw-r--r--npc/warps/cities/payon.txt176
-rw-r--r--npc/warps/cities/prontera.txt164
-rw-r--r--npc/warps/cities/rachel.txt142
-rw-r--r--npc/warps/cities/umbala.txt28
-rw-r--r--npc/warps/cities/veins.txt6
-rw-r--r--npc/warps/cities/yggdrasil.txt8
-rw-r--r--npc/warps/cities/yuno.txt192
23 files changed, 1001 insertions, 1003 deletions
diff --git a/npc/warps/cities/alberta.txt b/npc/warps/cities/alberta.txt
index 576a2284a..4cfa5eb19 100644
--- a/npc/warps/cities/alberta.txt
+++ b/npc/warps/cities/alberta.txt
@@ -14,45 +14,45 @@
//============================================================
//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
+alberta,15,234,0 warp alb001 2,5,pay_fild03,388,63
+alberta,117,38,0 warp alb01 2,2,alberta_in,180,30
+alberta,134,38,0 warp alb02 1,1,alberta_in,70,141
+alberta,170,170,0 warp alb03 1,1,alb_ship,26,168
+alberta,178,165,0 warp alb04 1,2,alb_ship,39,163
+alberta,209,173,0 warp alb05 1,2,alb_ship,162,171
+alberta,33,42,0 warp alb06 2,2,alberta_in,74,44
+alberta,65,233,0 warp alb07 2,2,alberta_in,18,141
+alberta,93,205,0 warp alb08 2,2,alberta_in,114,134
+alberta,98,153,0 warp alb09 2,2,alberta_in,185,89
+alberta,99,221,0 warp alb10 2,2,alberta_in,122,161
+alb_ship,26,166,0 warp alb03-1 4,1,alberta,170,168
+alb_ship,41,163,0 warp alb04-1 1,3,alberta,180,165
+alb_ship,160,171,0 warp alb05-1 1,3,alberta,207,173
+alb_ship,37,174,0 warp alb20 1,2,alb_ship,70,99
+alb_ship,68,99,0 warp alb20-1 1,3,alb_ship,35,173
+alberta_in,189,89,0 warp alb09-1 2,2,alberta,102,153
+alberta_in,114,130,0 warp alb08-1 2,2,alberta,93,201
+alberta_in,14,141,0 warp alb07-1 2,3,alberta,61,233
+alberta_in,180,34,0 warp alb01-1 2,2,alberta,117,42
+alberta_in,73,141,0 warp alb02-1 2,3,alberta,137,37
+alberta_in,78,44,0 warp alb06-1 2,5,alberta,37,41
+alberta_in,125,161,0 warp alb10-1 2,2,alberta,102,222
+alberta_in,114,183,0 warp alb11 1,1,alberta_in,148,186
+alberta_in,152,186,0 warp alb11-1 1,1,alberta_in,118,183
+alberta_in,114,49,0 warp alb12 2,2,alberta_in,155,153
+alberta_in,159,153,0 warp alb12-1 2,2,alberta_in,117,49
+alberta_in,114,97,0 warp alb13 2,2,alberta_in,155,175
+alberta_in,159,175,0 warp alb13-1 2,2,alberta_in,117,97
+alberta_in,22,113,0 warp alb14 3,2,alberta_in,22,134
+alberta_in,22,130,0 warp alb14-1 3,2,alberta_in,22,109
+alberta_in,22,153,0 warp alb15 3,2,alberta_in,22,174
+alberta_in,22,170,0 warp alb15-1 3,2,alberta_in,22,149
+alberta_in,24,33,0 warp alb16 3,2,alberta_in,64,35
+alberta_in,64,31,0 warp alb16-1 3,2,alberta_in,24,29
+alberta_in,24,54,0 warp alb17 3,2,alberta_in,64,53
+alberta_in,64,57,0 warp alb17-1 3,2,alberta_in,24,58
+alberta_in,66,113,0 warp alb18 3,1,alberta_in,66,132
+alberta_in,66,130,0 warp alb18-1 3,1,alberta_in,66,111
+alberta_in,66,153,0 warp alb19 3,2,alberta_in,66,173
+alberta_in,66,170,0 warp alb19-1 3,2,alberta_in,66,149
+alb2trea,88,111,0 warp alb002 1,1,treasure01,69,24 \ No newline at end of file
diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt
index 6545ee9d5..f2911af12 100644
--- a/npc/warps/cities/aldebaran.txt
+++ b/npc/warps/cities/aldebaran.txt
@@ -14,38 +14,38 @@
//============================================================
//===== Al De Baran Warps =====================================
-aldebaran.gat,118,63,0 warp ald01 1,1,aldeba_in.gat,211,117
-aldebaran.gat,139,34,0 warp ald001 3,2,mjolnir_12.gat,199,375
-aldebaran.gat,197,70,0 warp ald02 1,1,aldeba_in.gat,94,41
-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,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
+aldebaran,118,63,0 warp ald01 1,1,aldeba_in,211,117
+aldebaran,139,34,0 warp ald001 3,2,mjolnir_12,199,375
+aldebaran,197,70,0 warp ald02 1,1,aldeba_in,94,41
+aldebaran,233,105,0 warp ald04 1,1,aldeba_in,157,190
+aldebaran,51,218,0 warp ald05 1,1,aldeba_in,24,227
+aldebaran,61,229,0 warp ald06 1,1,aldeba_in,148,227
+aldebaran,72,197,0 warp ald07 1,1,aldeba_in,27,37
+aldebaran,89,234,0 warp ald08 1,1,aldeba_in,242,237
+aldeba_in,103,157,0 warp ald09 2,2,aldeba_in,137,237
+aldeba_in,103,61,0 warp ald10 2,2,aldeba_in,97,105
+aldeba_in,134,237,0 warp ald09-1 2,2,aldeba_in,100,157
+aldeba_in,144,92,0 warp ald11 2,2,aldeba_in,149,52
+aldeba_in,148,224,0 warp ald06-1 2,2,aldebaran,63,227
+aldeba_in,149,55,0 warp ald11-1 2,2,aldeba_in,144,95
+aldeba_in,157,193,0 warp ald04-1 3,2,aldebaran,231,107
+aldeba_in,208,117,0 warp ald01-1 2,2,aldebaran,116,63
+aldeba_in,217,131,0 warp ald12 2,2,aldeba_in,217,163
+aldeba_in,217,160,0 warp ald12-1 2,2,aldeba_in,217,128
+aldeba_in,217,71,0 warp ald13-1 2,2,aldeba_in,218,107
+aldeba_in,218,104,0 warp ald13 2,2,aldeba_in,218,68
+aldeba_in,24,224,0 warp ald05-1 2,2,aldebaran,53,216
+aldeba_in,245,237,0 warp ald08-1 2,2,aldebaran,91,234
+aldeba_in,27,102,0 warp ald14-1 2,2,aldeba_in,27,68
+aldeba_in,27,34,0 warp ald07-1 2,2,aldebaran,72,195
+aldeba_in,27,71,0 warp ald14 2,2,aldeba_in,27,105
+aldeba_in,37,238,0 warp ald15 2,2,aldeba_in,67,157
+aldeba_in,64,157,0 warp ald15-1 2,2,aldeba_in,34,238
+aldeba_in,83,191,0 warp ald16 2,2,aldeba_in,83,227
+aldeba_in,83,224,0 warp ald16-1 2,2,aldeba_in,83,188
+aldeba_in,94,38,0 warp ald02-1 3,2,aldebaran,197,68
+aldeba_in,97,102,0 warp ald10-1 2,2,aldeba_in,103,58
//Turbo Track Room
-alde_gld.gat,183,204,0 warp turbo01 1,1,turbo_room.gat,100,64
-turbo_room.gat,100,61,0 warp turbo02 1,1,alde_gld.gat,183,198 \ No newline at end of file
+alde_gld,183,204,0 warp turbo01 1,1,turbo_room,100,64
+turbo_room,100,61,0 warp turbo02 1,1,alde_gld,183,198 \ No newline at end of file
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index 976e99e5a..0e1bbbd68 100644
--- a/npc/warps/cities/amatsu.txt
+++ b/npc/warps/cities/amatsu.txt
@@ -15,43 +15,43 @@
//============================================================
//= 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,ama_fild01.gat,174,328
-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,129,117
-ama_in01.gat,88,94,0 warp warp2008 1,1,amatsu.gat,52,145
-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
-amatsu.gat,132,117,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,88,97
-amatsu.gat,85,235,0 warp warp1972 1,1,ama_in02.gat,224,45
+ama_in01,157,25,0 warp warp1969 1,1,amatsu,213,116
+ama_in01,161,34,0 warp warp1970 1,1,ama_in01,166,77
+ama_in01,166,73,0 warp warp1971 1,1,ama_in01,162,32
+ama_in01,174,120,0 warp warp2011 1,1,amatsu,217,146
+ama_in01,174,170,0 warp warp2012 1,1,ama_fild01,174,328
+ama_in01,31,176,0 warp warp2010 1,1,amatsu,42,110
+ama_in01,32,24,0 warp warp1963 1,1,amatsu,98,117
+ama_in01,34,97,0 warp warp1965 1,1,amatsu,168,178
+ama_in01,77,177,0 warp warp1967 1,1,amatsu,246,160
+ama_in01,86,23,0 warp warp2009 1,1,amatsu,129,117
+ama_in01,88,94,0 warp warp2008 1,1,amatsu,52,145
+ama_in02,127,163,0 warp warp1980 1,1,ama_in02,220,161
+ama_in02,195,44,0 warp warp1973 1,1,ama_in02,65,40
+ama_in02,215,150,0 warp warp1978 1,1,ama_in02,59,156
+ama_in02,222,161,0 warp warp1979 1,1,ama_in02,130,163
+ama_in02,227,45,0 warp warp1973 1,1,amatsu,88,235
+ama_in02,56,44,0 warp warp1975 1,1,ama_in02,59,144
+ama_in02,59,142,0 warp warp1976 1,1,ama_in02,56,41
+ama_in02,59,159,0 warp warp1977 1,1,ama_in02,215,152
+ama_in02,65,38,0 warp warp1974 1,1,ama_in02,195,41
+amatsu,132,117,0 warp warp1989 1,1,ama_in01,88,22
+amatsu,168,180,0 warp warp1964 1,1,ama_in01,34,99
+amatsu,216,116,0 warp warp1968 1,1,ama_in01,162,25
+amatsu,217,149,0 warp warp1987 1,1,ama_in01,174,122
+amatsu,247,290,0 warp warp1960 1,1,ama_fild01,73,32
+amatsu,249,160,0 warp warp1966 1,1,ama_in01,79,178
+amatsu,40,110,0 warp warp1995 1,1,ama_in01,28,176
+amatsu,52,148,0 warp warp1994 1,1,ama_in01,88,97
+amatsu,85,235,0 warp warp1972 1,1,ama_in02,224,45
//removed
-//amatsu.gat,95,148,0 warp warp1990 1,1,ama_in01.gat,88,97
-amatsu.gat,96,117,0 warp warp1962 1,1,ama_in01.gat,29,23
+//amatsu,95,148,0 warp warp1990 1,1,ama_in01,88,97
+amatsu,96,117,0 warp warp1962 1,1,ama_in01,29,23
//| Ninja quest warps
-amatsu.gat,149,140,0 warp ninja01 1,1,que_ng.gat,20,142
-que_ng.gat,20,138,0 warp ninja02 1,1,amatsu.gat,147,136
-que_ng.gat,10,183,0 warp ninja03 1,1,que_ng.gat,33,64
-que_ng.gat,37,64,0 warp ninja04 1,1,que_ng.gat,15,182
-que_ng.gat,30,37,0 warp ninja05 1,1,que_ng.gat,67,28
-que_ng.gat,63,30,0 warp ninja06 1,1,que_ng.gat,25,37 \ No newline at end of file
+amatsu,149,140,0 warp ninja01 1,1,que_ng,20,142
+que_ng,20,138,0 warp ninja02 1,1,amatsu,147,136
+que_ng,10,183,0 warp ninja03 1,1,que_ng,33,64
+que_ng,37,64,0 warp ninja04 1,1,que_ng,15,182
+que_ng,30,37,0 warp ninja05 1,1,que_ng,67,28
+que_ng,63,30,0 warp ninja06 1,1,que_ng,25,37 \ No newline at end of file
diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt
index a2fcaf548..210cf2895 100644
--- a/npc/warps/cities/ayothaya.txt
+++ b/npc/warps/cities/ayothaya.txt
@@ -17,78 +17,78 @@
//Entrance / Exit
-ayothaya.gat,277,176,0 warp ayothayawarp001 2,2,ayo_fild01.gat,36,239
-ayo_fild01.gat,32,241,0 warp ayothayawarp002 2,2,ayothaya.gat,274,176
+ayothaya,277,176,0 warp ayothayawarp001 2,2,ayo_fild01,36,239
+ayo_fild01,32,241,0 warp ayothayawarp002 2,2,ayothaya,274,176
//Castle
-ayothaya.gat,207,285,0 warp ayothayawarp007 2,2,ayo_in02.gat,99,149
-ayo_in02.gat,99,146,0 warp ayothayawarp008 2,2,ayothaya.gat,207,282
+ayothaya,207,285,0 warp ayothayawarp007 2,2,ayo_in02,99,149
+ayo_in02,99,146,0 warp ayothayawarp008 2,2,ayothaya,207,282
//House
-ayothaya.gat,128,86,0 warp ayothayawarp009 2,2,ayo_in01.gat,27,172
-ayo_in01.gat,29,170,0 warp ayothayawarp010 2,2,ayothaya.gat,132,86
-ayothaya.gat,129,96,0 warp ayothayawarp011 2,2,ayo_in01.gat,44,183
-ayo_in01.gat,47,183,0 warp ayothayawarp012 2,2,ayothaya.gat,131,98
-ayothaya.gat,130,75,0 warp ayothayawarp013 2,2,ayo_in01.gat,17,155
-ayo_in01.gat,17,152,0 warp ayothayawarp014 2,2,ayothaya.gat,132,73
+ayothaya,128,86,0 warp ayothayawarp009 2,2,ayo_in01,27,172
+ayo_in01,29,170,0 warp ayothayawarp010 2,2,ayothaya,132,86
+ayothaya,129,96,0 warp ayothayawarp011 2,2,ayo_in01,44,183
+ayo_in01,47,183,0 warp ayothayawarp012 2,2,ayothaya,131,98
+ayothaya,130,75,0 warp ayothayawarp013 2,2,ayo_in01,17,155
+ayo_in01,17,152,0 warp ayothayawarp014 2,2,ayothaya,132,73
//Restaurant/Bar -- Facing North
-ayothaya.gat,229,70,0 warp ayothayawarp015 2,2,ayo_in01.gat,137,191
-ayo_in01.gat,137,194,0 warp ayothayawarp016 2,2,ayothaya.gat,232,75
+ayothaya,229,70,0 warp ayothayawarp015 2,2,ayo_in01,137,191
+ayo_in01,137,194,0 warp ayothayawarp016 2,2,ayothaya,232,75
//Armory -- East door
-ayothaya.gat,176,90,0 warp ayothayawarp017 2,2,ayo_in01.gat,92,174
-ayo_in01.gat,97,174,0 warp ayothayawarp018 2,2,ayothaya.gat,180,90
+ayothaya,176,90,0 warp ayothayawarp017 2,2,ayo_in01,92,174
+ayo_in01,97,174,0 warp ayothayawarp018 2,2,ayothaya,180,90
//Armory -- South door
-ayothaya.gat,172,77,0 warp ayothayawarp019 2,2,ayo_in01.gat,88,154
-ayo_in01.gat,84,149,0 warp ayothayawarp020 2,2,ayothaya.gat,172,74
+ayothaya,172,77,0 warp ayothayawarp019 2,2,ayo_in01,88,154
+ayo_in01,84,149,0 warp ayothayawarp020 2,2,ayothaya,172,74
//Armory -- West door
-ayothaya.gat,166,90,0 warp ayothayawarp021 2,2,ayo_in01.gat,75,174
-ayo_in01.gat,73,174,0 warp ayothayawarp022 2,2,ayothaya.gat,163,90
+ayothaya,166,90,0 warp ayothayawarp021 2,2,ayo_in01,75,174
+ayo_in01,73,174,0 warp ayothayawarp022 2,2,ayothaya,163,90
//Straw-roof hut -- Middle - Facing West
-//ayothaya.gat,120,164,0 warp ayothayawarp023 2,2,ayo_in01.gat,,
-//ayo_in01.gat,,,0 warp ayothayawarp024 2,2,ayothaya.gat,116,164
+//ayothaya,120,164,0 warp ayothayawarp023 2,2,ayo_in01,,
+//ayo_in01,,,0 warp ayothayawarp024 2,2,ayothaya,116,164
//Straw-roof hut -- On Beach -- Facing South East
-//ayothaya.gat,60,148,0 warp ayothayawarp025 2,2,ayo_in01.gat,,
-//ayo_in01.gat,,,0 warp ayothayawarp026 2,2,ayothaya.gat,61,146
+//ayothaya,60,148,0 warp ayothayawarp025 2,2,ayo_in01,,
+//ayo_in01,,,0 warp ayothayawarp026 2,2,ayothaya,61,146
//Straw-roof hut -- East Side (Middle) -- Facing East
-ayothaya.gat,61,104,0 warp ayothayawarp029 2,2,ayo_in01.gat,191,183
-ayo_in01.gat,194,183,0 warp ayothayawarp030 2,2,ayothaya.gat,66,104
+ayothaya,61,104,0 warp ayothayawarp029 2,2,ayo_in01,191,183
+ayo_in01,194,183,0 warp ayothayawarp030 2,2,ayothaya,66,104
//Straw-roof hut -- East Side (Lower) -- Facing North
-//ayothaya.gat,77,88,0 warp ayothayawarp031 2,2,ayo_in01.gat,,
-//ayo_in01.gat,,,0 warp ayothayawarp032 2,2,ayothaya.gat,77,92
+//ayothaya,77,88,0 warp ayothayawarp031 2,2,ayo_in01,,
+//ayo_in01,,,0 warp ayothayawarp032 2,2,ayothaya,77,92
//Larger Straw-roof hut -- East Side (Middle) -- Facing South
-ayothaya.gat,111,109,0 warp ayothayawarp033 2,2,ayo_in01.gat,180,128
-ayo_in01.gat,177,128,0 warp ayothayawarp034 2,2,ayothaya.gat,111,105
+ayothaya,111,109,0 warp ayothayawarp033 2,2,ayo_in01,180,128
+ayo_in01,177,128,0 warp ayothayawarp034 2,2,ayothaya,111,105
//Inn -- North Door
-ayothaya.gat,202,158,0 warp ayothayawarp035 2,2,ayo_in01.gat,30,107
-ayo_in01.gat,30,110,0 warp ayothayawarp036 2,2,ayothaya.gat,202,161
+ayothaya,202,158,0 warp ayothayawarp035 2,2,ayo_in01,30,107
+ayo_in01,30,110,0 warp ayothayawarp036 2,2,ayothaya,202,161
//Inn -- West Door
-ayothaya.gat,193,149,0 warp ayothayawarp037 2,2,ayo_in01.gat,14,94
-ayo_in01.gat,11,94,0 warp ayothayawarp038 2,2,ayothaya.gat,189,149
+ayothaya,193,149,0 warp ayothayawarp037 2,2,ayo_in01,14,94
+ayo_in01,11,94,0 warp ayothayawarp038 2,2,ayothaya,189,149
//Inn -- South Door
-ayothaya.gat,202,141,0 warp ayothayawarp039 2,2,ayo_in01.gat,30,82
-ayo_in01.gat,30,79,0 warp ayothayawarp040 2,2,ayothaya.gat,202,138
+ayothaya,202,141,0 warp ayothayawarp039 2,2,ayo_in01,30,82
+ayo_in01,30,79,0 warp ayothayawarp040 2,2,ayothaya,202,138
//Inn -- East Door
-ayothaya.gat,211,149,0 warp ayothayawarp041 2,2,ayo_in01.gat,47,94
-ayo_in01.gat,50,94,0 warp ayothayawarp042 2,2,ayothaya.gat,214,149
+ayothaya,211,149,0 warp ayothayawarp041 2,2,ayo_in01,47,94
+ayo_in01,50,94,0 warp ayothayawarp042 2,2,ayothaya,214,149
//Inn Room --Upper Right
-ayo_in01.gat,48,83,0 warp ayothayawarp043 2,2,ayo_in01.gat,61,15
-ayo_in01.gat,59,15,0 warp ayothayawarp044 2,2,ayo_in01.gat,45,83
+ayo_in01,48,83,0 warp ayothayawarp043 2,2,ayo_in01,61,15
+ayo_in01,59,15,0 warp ayothayawarp044 2,2,ayo_in01,45,83
//Inn Room -- Upper Left
-ayo_in01.gat,48,107,0 warp ayothayawarp045 2,2,ayo_in01.gat,177,27
-ayo_in01.gat,175,27,0 warp ayothayawarp046 2,2,ayo_in01.gat,45,107
+ayo_in01,48,107,0 warp ayothayawarp045 2,2,ayo_in01,177,27
+ayo_in01,175,27,0 warp ayothayawarp046 2,2,ayo_in01,45,107
//Inn Room --Bottom Right
-ayo_in01.gat,13,83,0 warp ayothayawarp047 2,2,ayo_in01.gat,19,15
-ayo_in01.gat,22,15,0 warp ayothayawarp048 2,2,ayo_in01.gat,16,83
+ayo_in01,13,83,0 warp ayothayawarp047 2,2,ayo_in01,19,15
+ayo_in01,22,15,0 warp ayothayawarp048 2,2,ayo_in01,16,83
//Inn Room -- Bottom Left
-ayo_in01.gat,13,107,0 warp ayothayawarp049 2,2,ayo_in01.gat,133,27
-ayo_in01.gat,136,27,0 warp ayothayawarp050 2,2,ayo_in01.gat,16,107
+ayo_in01,13,107,0 warp ayothayawarp049 2,2,ayo_in01,133,27
+ayo_in01,136,27,0 warp ayothayawarp050 2,2,ayo_in01,16,107 \ No newline at end of file
diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt
index 25850efaf..815306f66 100644
--- a/npc/warps/cities/comodo.txt
+++ b/npc/warps/cities/comodo.txt
@@ -15,36 +15,36 @@
//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
+comodo,115,291,0 warp cmd09 1,1,cmd_in02,67,132
+comodo,126,98,0 warp cmd02 1,1,cmd_in02,144,97
+comodo,130,195,0 warp cmd05 1,1,cmd_in02,143,173
+comodo,140,111,0 warp cmd04 1,1,cmd_in02,178,132
+comodo,140,90,0 warp cmd01 1,1,cmd_in02,74,25
+comodo,145,328,0 warp cmd11 1,1,cmd_in01,120,71
+comodo,153,97,0 warp cmd03 1,1,cmd_in02,212,97
+comodo,176,358,0 warp cmd002 1,1,beach_dun2,154,25
+comodo,192,294,0 warp cmd17 1,1,cmd_in01,177,123
+comodo,236,298,0 warp cmd08 1,1,cmd_in01,179,81
+comodo,25,214,0 warp cmd001 1,1,beach_dun,266,67
+comodo,265,74,0 warp cmd06 1,1,cmd_in01,123,180
+comodo,271,271,0 warp cmd10 1,1,cmd_in01,113,125
+comodo,332,175,0 warp cmd003 1,1,beach_dun3,23,260
+comodo,92,128,0 warp cmd07 1,1,cmd_in01,85,174
+cmd_in01,109,125,0 warp cmd10-1 1,1,comodo,269,273
+cmd_in01,120,67,0 warp cmd11-1 1,1,comodo,145,324
+cmd_in01,123,186,0 warp cmd06-1 1,1,comodo,265,79
+cmd_in01,183,123,0 warp cmd17-1 1,1,comodo,195,294
+cmd_in01,183,81,0 warp cmd08-1 1,1,comodo,239,296
+cmd_in01,90,174,0 warp cmd07-1 1,1,comodo,97,128
+cmd_in02,139,169,0 warp cmd05-1 1,1,comodo,127,191
+cmd_in02,139,97,0 warp cmd02-1 1,1,comodo,122,98
+cmd_in02,168,113,0 warp cmd15-1 1,1,cmd_in02,63,73
+cmd_in02,178,136,0 warp cmd04-1 1,1,comodo,140,115
+cmd_in02,187,78,0 warp cmd14-2 1,1,cmd_in02,84,37
+cmd_in02,208,206,0 warp cmd16 1,1,cmd_in02,97,211
+cmd_in02,216,97,0 warp cmd03-1 1,1,comodo,157,97
+cmd_in02,58,74,0 warp cmd15 1,1,cmd_in02,166,116
+cmd_in02,69,129,0 warp cmd09-1 4,4,comodo,115,288
+cmd_in02,74,21,0 warp cmd01-1 1,1,comodo,140,86
+cmd_in02,90,37,0 warp cmd14 1,1,cmd_in02,191,77
+cmd_in02,98,216,0 warp cmd16-1 1,1,cmd_in02,207,210 \ No newline at end of file
diff --git a/npc/warps/cities/einbech.txt b/npc/warps/cities/einbech.txt
index 62d2421c6..f89734851 100644
--- a/npc/warps/cities/einbech.txt
+++ b/npc/warps/cities/einbech.txt
@@ -16,32 +16,31 @@
//==========================================================================
//Einbech - Weapon shop
//==========================================================================
-einbech.gat,177,136,0 warp eib_wp01 1,1,ein_in01.gat,190,35
-ein_in01.gat,190,38,0 warp eib_wp01a 1,1,einbech.gat,177,133
+einbech,177,136,0 warp eib_wp01 1,1,ein_in01,190,35
+ein_in01,190,38,0 warp eib_wp01a 1,1,einbech,177,133
//==========================================================================
//Einbech - buildings
//==========================================================================
-einbech.gat,207,135,0 warp eib_hu01 1,1,ein_in01.gat,190,99
-ein_in01.gat,187,99,0 warp eib_hu01a 1,1,einbech.gat,204,135
-einbech.gat,214,121,0 warp eib_hu02 1,1,ein_in01.gat,205,86
-ein_in01.gat,205,83,0 warp eib_hu02a 1,1,einbech.gat,214,118
+einbech,207,135,0 warp eib_hu01 1,1,ein_in01,190,99
+ein_in01,187,99,0 warp eib_hu01a 1,1,einbech,204,135
+einbech,214,121,0 warp eib_hu02 1,1,ein_in01,205,86
+ein_in01,205,83,0 warp eib_hu02a 1,1,einbech,214,118
//==========================================================================
//Einbech - Pub
//==========================================================================
-einbech.gat,154,106,0 warp eib_b01 1,1,ein_in01.gat,285,89
-ein_in01.gat,288,89,0 warp eib_b01a 1,1,einbech.gat,157,106
-einbech.gat,145,112,0 warp eib_b02 1,1,ein_in01.gat,268,104
-ein_in01.gat,265,104,0 warp eib_b02a 1,1,einbech.gat,141,112
+einbech,154,106,0 warp eib_b01 1,1,ein_in01,285,89
+ein_in01,288,89,0 warp eib_b01a 1,1,einbech,157,106
+einbech,145,112,0 warp eib_b02 1,1,ein_in01,268,104
+ein_in01,265,104,0 warp eib_b02a 1,1,einbech,141,112
//=========================================================================
//Einbech - Swordman guild
//=========================================================================
-einbech.gat,256,109,0 warp eib_js01 1,1,ein_in01.gat,148,153
-ein_in01.gat,144,153,0 warp eib_js01a 1,1,einbech.gat,253,109
-
+einbech,256,109,0 warp eib_js01 1,1,ein_in01,148,153
+ein_in01,144,153,0 warp eib_js01a 1,1,einbech,253,109
diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt
index b2523f71f..6a5f5b5bb 100644
--- a/npc/warps/cities/einbroch.txt
+++ b/npc/warps/cities/einbroch.txt
@@ -19,98 +19,98 @@
//==========================================================================
// Einbroch - Factory
//==========================================================================
-einbroch.gat,132,79,0 warp ein_fa01 1,1,ein_in01.gat,17,213
-ein_in01.gat,13,213,0 warp ein_fa01a 1,1,einbroch.gat,129,79
-ein_in01.gat,81,198,0 warp ein_fa02 1,1,einbroch.gat,179,70
-einbroch.gat,179,73,0 warp ein_fa02a 1,1,ein_in01.gat,81,203
+einbroch,132,79,0 warp ein_fa01 1,1,ein_in01,17,213
+ein_in01,13,213,0 warp ein_fa01a 1,1,einbroch,129,79
+ein_in01,81,198,0 warp ein_fa02 1,1,einbroch,179,70
+einbroch,179,73,0 warp ein_fa02a 1,1,ein_in01,81,203
//==========================================================================
//Einbroch - Near Train station
//==========================================================================
-einbroch.gat,214,263,0 warp ein_to01 1,1,einbroch.gat,233,315
-einbroch.gat,233,312,0 warp ein_to01a 1,1,einbroch.gat,214,260
-einbroch.gat,250,263,0 warp ein_to02 1,1,einbroch.gat,269,315
-einbroch.gat,269,312,0 warp ein_to02a 1,1,einbroch.gat,250,260
+einbroch,214,263,0 warp ein_to01 1,1,einbroch,233,315
+einbroch,233,312,0 warp ein_to01a 1,1,einbroch,214,260
+einbroch,250,263,0 warp ein_to02 1,1,einbroch,269,315
+einbroch,269,312,0 warp ein_to02a 1,1,einbroch,250,260
//==========================================================================
//Einbroch - Weapon shop
//==========================================================================
-einbroch.gat,216,214,0 warp ein_wp01 1,1,ein_in01.gat,108,17
-ein_in01.gat,108,13,0 warp ein_wp01a 1,1,einbroch.gat,216,211
+einbroch,216,214,0 warp ein_wp01 1,1,ein_in01,108,17
+ein_in01,108,13,0 warp ein_wp01a 1,1,einbroch,216,211
//=========================================================================
//Einbroch - Hotel
//=========================================================================
-einbroch.gat,257,199,0 warp ein_h01 1,1,ein_in01.gat,198,224
-ein_in01.gat,195,224,0 warp ein_h01a 1,1,einbroch.gat,254,199
-ein_in01.gat,211,216,0 warp ein_h02 1,1,ein_in01.gat,274,218
-ein_in01.gat,271,218,0 warp ein_h02a 1,1,ein_in01.gat,208,216
-ein_in01.gat,211,232,0 warp ein_h03 1,1,ein_in01.gat,274,232
-ein_in01.gat,271,232,0 warp ein_h03a 1,1,ein_in01.gat,208,232
-ein_in01.gat,274,246,0 warp ein_h04 1,1,ein_in01.gat,273,276
-ein_in01.gat,273,273,0 warp ein_h04a 1,1,ein_in01.gat,274,243
-ein_in01.gat,264,246,0 warp ein_h05 1,1,ein_in01.gat,231,276
-ein_in01.gat,231,273,0 warp ein_h05a 1,1,ein_in01.gat,264,243
-ein_in01.gat,274,203,0 warp ein_h06 1,1,ein_in01.gat,274,173
-ein_in01.gat,274,176,0 warp ein_h06a 1,1,ein_in01.gat,274,206
-ein_in01.gat,264,203,0 warp ein_h07 1,1,ein_in01.gat,232,173
-ein_in01.gat,232,176,0 warp ein_h07a 1,1,ein_in01.gat,264,206
-ein_in01.gat,284,224,0 warp ein_h08 1,1,ein_in01.gat,177,277
-ein_in01.gat,180,277,0 warp ein_h08a 1,1,ein_in01.gat,280,224
+einbroch,257,199,0 warp ein_h01 1,1,ein_in01,198,224
+ein_in01,195,224,0 warp ein_h01a 1,1,einbroch,254,199
+ein_in01,211,216,0 warp ein_h02 1,1,ein_in01,274,218
+ein_in01,271,218,0 warp ein_h02a 1,1,ein_in01,208,216
+ein_in01,211,232,0 warp ein_h03 1,1,ein_in01,274,232
+ein_in01,271,232,0 warp ein_h03a 1,1,ein_in01,208,232
+ein_in01,274,246,0 warp ein_h04 1,1,ein_in01,273,276
+ein_in01,273,273,0 warp ein_h04a 1,1,ein_in01,274,243
+ein_in01,264,246,0 warp ein_h05 1,1,ein_in01,231,276
+ein_in01,231,273,0 warp ein_h05a 1,1,ein_in01,264,243
+ein_in01,274,203,0 warp ein_h06 1,1,ein_in01,274,173
+ein_in01,274,176,0 warp ein_h06a 1,1,ein_in01,274,206
+ein_in01,264,203,0 warp ein_h07 1,1,ein_in01,232,173
+ein_in01,232,176,0 warp ein_h07a 1,1,ein_in01,264,206
+ein_in01,284,224,0 warp ein_h08 1,1,ein_in01,177,277
+ein_in01,180,277,0 warp ein_h08a 1,1,ein_in01,280,224
//==========================================================================
//Einbroch - Building behind the hotel
//==========================================================================
-einbroch.gat,278,233,0 warp ein_ho01 1,1,ein_in01.gat,107,95
-ein_in01.gat,103,95,0 warp ein_ho01a 1,1,einbroch.gat,275,233
-ein_in01.gat,126,88,0 warp ein_ho02 1,1,ein_in01.gat,100,139
-ein_in01.gat,100,142,0 warp ein_ho02a 1,1,ein_in01.gat,123,85
-einbroch.gat,290,222,0 warp ein_ho03 1,1,ein_in01.gat,121,80
-ein_in01.gat,121,77,0 warp ein_ho03a 1,1,einbroch.gat,290,219
+einbroch,278,233,0 warp ein_ho01 1,1,ein_in01,107,95
+ein_in01,103,95,0 warp ein_ho01a 1,1,einbroch,275,233
+ein_in01,126,88,0 warp ein_ho02 1,1,ein_in01,100,139
+ein_in01,100,142,0 warp ein_ho02a 1,1,ein_in01,123,85
+einbroch,290,222,0 warp ein_ho03 1,1,ein_in01,121,80
+ein_in01,121,77,0 warp ein_ho03a 1,1,einbroch,290,219
//==========================================================================
//Einbroch - House of Kapetain
//==========================================================================
-einbroch.gat,129,229,0 warp ein_kf01 1,1,ein_in01.gat,14,147
-ein_in01.gat,11,147,0 warp ein_kf01a 1,1,einbroch.gat,126,229
+einbroch,129,229,0 warp ein_kf01 1,1,ein_in01,14,147
+ein_in01,11,147,0 warp ein_kf01a 1,1,einbroch,126,229
//=========================================================================
//Einbroch - Lab
//=========================================================================
-ein_in01.gat,286,25,0 warp ein_lab 1,1,einbroch.gat,54,52
+ein_in01,286,25,0 warp ein_lab 1,1,einbroch,54,52
//=========================================================================
//Einbroch - Blacksmith guild
//=========================================================================
-einbroch.gat,255,107,0 warp ein_jb01 1,1,ein_in01.gat,14,17
-ein_in01.gat,14,14,0 warp ein_jb01a 1,1,einbroch.gat,255,110
-ein_in01.gat,39,36,0 warp ein_jb02 1,1,ein_in01.gat,35,83
-ein_in01.gat,39,85,0 warp ein_jb02a 1,1,ein_in01.gat,36,36
+einbroch,255,107,0 warp ein_jb01 1,1,ein_in01,14,17
+ein_in01,14,14,0 warp ein_jb01a 1,1,einbroch,255,110
+ein_in01,39,36,0 warp ein_jb02 1,1,ein_in01,35,83
+ein_in01,39,85,0 warp ein_jb02a 1,1,ein_in01,36,36
//==========================================================================
//Einbroch - Field related
//==========================================================================
-einbroch.gat,157,331,0 warp ein_fd01 1,1,ein_fild04.gat,184,31
-ein_fild04.gat,184,26,0 warp ein_fd01a 1,1,einbroch.gat,157,327
-einbroch.gat,150,25,0 warp ein_fd02 1,1,ein_fild08.gat,164,377
-ein_fild08.gat,164,380,0 warp ein_fd02a 1,1,einbroch.gat,150,28
+einbroch,157,331,0 warp ein_fd01 1,1,ein_fild04,184,31
+ein_fild04,184,26,0 warp ein_fd01a 1,1,einbroch,157,327
+einbroch,150,25,0 warp ein_fd02 1,1,ein_fild08,164,377
+ein_fild08,164,380,0 warp ein_fd02a 1,1,einbroch,150,28
//==========================================================================
-//Einbroch - Gunslinger Map Portion (Ninja's map is the same: que_ng.gat)
+//Einbroch - Gunslinger Map Portion (Ninja's map is the same: que_ng)
//==========================================================================
-einbroch.gat,136,199,0 warp gswarp1 1,1,que_ng.gat,138,167
-que_ng.gat,130,166,0 warp gswarp2 1,1,einbroch.gat,130,197
-que_ng.gat,178,162,0 warp gswarp3 1,1,que_ng.gat,172,86
-que_ng.gat,166,85,0 warp gswarp4 1,1,que_ng.gat,182,161
-que_ng.gat,165,137,0 warp gswarp5 1,1,que_ng.gat,177,41
-que_ng.gat,172,42,0 warp gswarp6 1,1,que_ng.gat,160,139
+einbroch,136,199,0 warp gswarp1 1,1,que_ng,138,167
+que_ng,130,166,0 warp gswarp2 1,1,einbroch,130,197
+que_ng,178,162,0 warp gswarp3 1,1,que_ng,172,86
+que_ng,166,85,0 warp gswarp4 1,1,que_ng,182,161
+que_ng,165,137,0 warp gswarp5 1,1,que_ng,177,41
+que_ng,172,42,0 warp gswarp6 1,1,que_ng,160,139
//This one seems to be wrong
-//einbroch.gat,137,149,0 warp gswarp7 1,1,que_ng.gat,138,167
+//einbroch,137,149,0 warp gswarp7 1,1,que_ng,138,167 \ No newline at end of file
diff --git a/npc/warps/cities/geffen.txt b/npc/warps/cities/geffen.txt
index f4fe16798..1083e4188 100644
--- a/npc/warps/cities/geffen.txt
+++ b/npc/warps/cities/geffen.txt
@@ -14,37 +14,37 @@
//============================================================
//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
+geffen,119,213,0 warp gef001 3,2,gef_fild04,187,42
+geffen,120,114,0 warp gef002 3,1,gef_tower,52,177
+geffen,217,119,0 warp gef003 2,4,gef_fild00,46,199
+geffen,26,119,0 warp gef004 2,3,gef_fild07,336,187
+geffen,138,138,0 warp gef01 1,1,geffen_in,28,110
+geffen,172,174,0 warp gef02 2,2,geffen_in,70,52
+geffen,182,59,0 warp gef03 2,2,geffen_in,106,177
+geffen,43,85,0 warp gef04 2,2,geffen_in,70,138
+geffen,61,180,0 warp gef05 3,3,geffen_in,162,97
+geffen,98,141,0 warp gef06 2,2,geffen_in,28,160
+geffen_in,28,156,0 warp gef06-1 3,1,geffen,101,138
+geffen_in,100,67,0 warp gef07 2,3,geffen_in,84,65
+geffen_in,87,66,0 warp gef07-1 2,3,geffen_in,103,67
+geffen_in,104,109,0 warp gef08 2,2,geffen_in,76,107
+geffen_in,79,107,0 warp gef08-1 2,2,geffen_in,107,109
+geffen_in,113,163,0 warp gef09 2,2,geffen_in,139,169
+geffen_in,136,169,0 warp gef09-1 2,2,geffen_in,110,163
+geffen_in,114,37,0 warp gef10 1,1,geffen_in,114,63
+geffen_in,114,60,0 warp gef10-1 1,2,geffen_in,114,34
+geffen_in,138,149,0 warp gef11 2,2,geffen_in,138,165
+geffen_in,138,162,0 warp gef11-1 2,2,geffen_in,138,146
+geffen_in,26,60,0 warp gef12 1,2,geffen_in,26,34
+geffen_in,26,37,0 warp gef12-1 1,1,geffen_in,26,63
+geffen_in,52,65,0 warp gef13 2,3,geffen_in,38,67
+geffen_in,41,67,0 warp gef13-1 2,3,geffen_in,55,65
+geffen_in,70,149,0 warp gef14 3,2,geffen_in,70,161
+geffen_in,70,158,0 warp gef14-1 3,2,geffen_in,70,146
+geffen_in,70,83,0 warp gef15 3,2,geffen_in,72,101
+geffen_in,72,98,0 warp gef15-1 3,2,geffen_in,70,80
+geffen_in,163,94,0 warp gef05-1 4,2,geffen,65,176
+geffen_in,70,132,0 warp gef04-1 3,1,geffen,46,88
+geffen_in,106,181,0 warp gef03-1 2,2,geffen,180,61
+geffen_in,28,106,0 warp gef01-1 1,3,geffen,136,136
+geffen_in,70,48,0 warp gef02-1 3,2,geffen,168,170 \ No newline at end of file
diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt
index ad5e38c48..5d8e4ab4a 100644
--- a/npc/warps/cities/gonryun.txt
+++ b/npc/warps/cities/gonryun.txt
@@ -13,22 +13,22 @@
//============================================================
//= 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
+gonryun,161,8,0 warp gon02 1,1,gon_fild01,191,261
+gonryun,195,93,0 warp gon03 1,1,gon_in,95,23
+gonryun,109,131,0 warp gon15 1,1,gon_in,44,24
+gonryun,215,114,0 warp gon05 1,1,gon_in,152,24
+gonryun,107,184,0 warp gon13 1,1,gon_in,72,70
+gonryun,221,162,0 warp gon11 1,1,gon_in,112,98
+gonryun,159,201,0 warp gon19 1,1,gon_dun01,153,48
+gon_in,95,26,0 warp gon04 1,1,gonryun,195,96
+gon_in,149,24,0 warp gon06 1,1,gonryun,212,114
+gon_in,184,11,0 warp gon07 1,1,gon_in,189,85
+gon_in,186,85,0 warp gon08 1,1,gon_in,181,11
+gon_in,186,107,0 warp gon09 1,1,gon_in,181,36
+gon_in,184,36,0 warp gon10 1,1,gon_in,189,107
+gon_in,109,98,0 warp gon12 1,1,gonryun,218,162
+gon_in,72,67,0 warp gon14 1,1,gonryun,107,181
+gon_in,47,24,0 warp gon16 1,1,gonryun,112,131
+gon_in,42,35,0 warp gon17 1,1,gon_in,34,97
+gon_in,31,97,0 warp gon18 1,1,gon_in,39,35
+gon_fild01,192,266,0 warp gon01 1,1,gonryun,161,11 \ No newline at end of file
diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt
index 79862cd4e..d3ca451b0 100644
--- a/npc/warps/cities/hugel.txt
+++ b/npc/warps/cities/hugel.txt
@@ -21,89 +21,89 @@
//= Hugel City ================================================
//Entrance
-hu_fild06.gat,199,373,0 warp hugel01 1,1,hugel.gat,95,34
-hugel.gat,95,32,0 warp hugel02 1,1,hu_fild06.gat,199,371
+hu_fild06,199,373,0 warp hugel01 1,1,hugel,95,34
+hugel,95,32,0 warp hugel02 1,1,hu_fild06,199,371
//Church
-hugel.gat,155,114,0 warp hugel03 1,1,hu_in01.gat,211,177
-hu_in01.gat,211,173,0 warp hugel04 1,1,hugel.gat,159,113
-hu_in01.gat,162,228,0 warp hugel05 1,1,hu_in01.gat,200,220
-hu_in01.gat,194,219,0 warp hugel06 1,1,hu_in01.gat,159,228
-hu_in01.gat,162,168,0 warp hugel07 1,1,hu_in01.gat,199,193
-hu_in01.gat,195,192,0 warp hugel08 1,1,hu_in01.gat,158,168
+hugel,155,114,0 warp hugel03 1,1,hu_in01,211,177
+hu_in01,211,173,0 warp hugel04 1,1,hugel,159,113
+hu_in01,162,228,0 warp hugel05 1,1,hu_in01,200,220
+hu_in01,194,219,0 warp hugel06 1,1,hu_in01,159,228
+hu_in01,162,168,0 warp hugel07 1,1,hu_in01,199,193
+hu_in01,195,192,0 warp hugel08 1,1,hu_in01,158,168
//House
-hugel.gat,153,153,0 warp hugel09 1,1,hu_in01.gat,287,231
-hu_in01.gat,287,227,0 warp hugel10 1,1,hugel.gat,153,149
-hu_in01.gat,263,252,0 warp hugel11 1,1,hu_in01.gat,362,253
-hu_in01.gat,365,253,0 warp hugel12 1,1,hu_in01.gat,268,252
+hugel,153,153,0 warp hugel09 1,1,hu_in01,287,231
+hu_in01,287,227,0 warp hugel10 1,1,hugel,153,149
+hu_in01,263,252,0 warp hugel11 1,1,hu_in01,362,253
+hu_in01,365,253,0 warp hugel12 1,1,hu_in01,268,252
//House
-hugel.gat,92,167,0 warp hugel13 1,1,hu_in01.gat,246,363
-hu_in01.gat,246,359,0 warp hugel14 1,1,hugel.gat,92,165
-hu_in01.gat,244,315,0 warp hugel15 1,1,hu_in01.gat,245,389
-hu_in01.gat,248,388,0 warp hugel16 1,1,hu_in01.gat,250,315
-hu_in01.gat,229,313,0 warp hugel17 1,1,hu_in01.gat,164,315
-hu_in01.gat,168,315,0 warp hugel18 1,1,hu_in01.gat,233,313
-hu_in01.gat,168,307,0 warp hugel19 1,1,hu_in01.gat,167,376
-hu_in01.gat,168,379,0 warp hugel20 1,1,hu_in01.gat,168,312
-hugel.gat,85,181,0 warp hugel21 1,1,hu_in01.gat,231,303
-hu_in01.gat,231,301,0 warp hugel22 1,1,hugel.gat,83,181
+hugel,92,167,0 warp hugel13 1,1,hu_in01,246,363
+hu_in01,246,359,0 warp hugel14 1,1,hugel,92,165
+hu_in01,244,315,0 warp hugel15 1,1,hu_in01,245,389
+hu_in01,248,388,0 warp hugel16 1,1,hu_in01,250,315
+hu_in01,229,313,0 warp hugel17 1,1,hu_in01,164,315
+hu_in01,168,315,0 warp hugel18 1,1,hu_in01,233,313
+hu_in01,168,307,0 warp hugel19 1,1,hu_in01,167,376
+hu_in01,168,379,0 warp hugel20 1,1,hu_in01,168,312
+hugel,85,181,0 warp hugel21 1,1,hu_in01,231,303
+hu_in01,231,301,0 warp hugel22 1,1,hugel,83,181
//House
-hugel.gat,70,157,0 warp hugel23 1,1,hu_in01.gat,110,373
-hu_in01.gat,110,369,0 warp hugel24 1,1,hugel.gat,73,153
-hu_in01.gat,108,390,0 warp hugel25 1,1,hu_in01.gat,107,322
-hu_in01.gat,114,322,0 warp hugel26 1,1,hu_in01.gat,111,390
+hugel,70,157,0 warp hugel23 1,1,hu_in01,110,373
+hu_in01,110,369,0 warp hugel24 1,1,hugel,73,153
+hu_in01,108,390,0 warp hugel25 1,1,hu_in01,107,322
+hu_in01,114,322,0 warp hugel26 1,1,hu_in01,111,390
//House
-hugel.gat,91,104,0 warp hugel27 1,1,hu_in01.gat,30,304
-hu_in01.gat,30,299,0 warp hugel28 1,1,hugel.gat,94,103
-hu_in01.gat,33,318,0 warp hugel29 1,1,hu_in01.gat,34,251
-hu_in01.gat,34,246,0 warp hugel30 1,1,hu_in01.gat,33,314
+hugel,91,104,0 warp hugel27 1,1,hu_in01,30,304
+hu_in01,30,299,0 warp hugel28 1,1,hugel,94,103
+hu_in01,33,318,0 warp hugel29 1,1,hu_in01,34,251
+hu_in01,34,246,0 warp hugel30 1,1,hu_in01,33,314
//House
-hugel.gat,104,79,0 warp hugel31 1,1,hu_in01.gat,235,107
-hu_in01.gat,231,107,0 warp hugel32 1,1,hugel.gat,99,77
-hu_in01.gat,268,123,0 warp hugel33 1,1,hu_in01.gat,265,36
-hu_in01.gat,265,42,0 warp hugel34 1,1,hu_in01.gat,265,123
+hugel,104,79,0 warp hugel31 1,1,hu_in01,235,107
+hu_in01,231,107,0 warp hugel32 1,1,hugel,99,77
+hu_in01,268,123,0 warp hugel33 1,1,hu_in01,265,36
+hu_in01,265,42,0 warp hugel34 1,1,hu_in01,265,123
//Library
-hugel.gat,52,90,0 warp hugel35 1,1,hu_in01.gat,33,90
-hu_in01.gat,37,90,0 warp hugel36 1,1,hugel.gat,54,96
-hu_in01.gat,15,70,0 warp hugel37 1,1,hu_in01.gat,15,27
-hu_in01.gat,15,29,0 warp hugel38 1,1,hu_in01.gat,16,74
-hu_in01.gat,15,108,0 warp hugel39 1,1,hu_in01.gat,15,155
-hu_in01.gat,15,151,0 warp hugel40 1,1,hu_in01.gat,16,104
+hugel,52,90,0 warp hugel35 1,1,hu_in01,33,90
+hu_in01,37,90,0 warp hugel36 1,1,hugel,54,96
+hu_in01,15,70,0 warp hugel37 1,1,hu_in01,15,27
+hu_in01,15,29,0 warp hugel38 1,1,hu_in01,16,74
+hu_in01,15,108,0 warp hugel39 1,1,hu_in01,15,155
+hu_in01,15,151,0 warp hugel40 1,1,hu_in01,16,104
//Hunter Guild
-hugel.gat,206,228,0 warp hugel41 1,1,hu_in01.gat,381,368
-hu_in01.gat,381,363,0 warp hugel42 1,1,hugel.gat,207,225
-hu_in01.gat,380,319,0 warp hugel43 1,1,hu_in01.gat,384,388
-hu_in01.gat,388,388,0 warp hugel44 1,1,hu_in01.gat,385,319
+hugel,206,228,0 warp hugel41 1,1,hu_in01,381,368
+hu_in01,381,363,0 warp hugel42 1,1,hugel,207,225
+hu_in01,380,319,0 warp hugel43 1,1,hu_in01,384,388
+hu_in01,388,388,0 warp hugel44 1,1,hu_in01,385,319
//Other
-hu_in01.gat,149,90,0 warp hugel45 1,1,hu_in01.gat,104,90
-hu_in01.gat,106,90,0 warp hugel46 1,1,hu_in01.gat,151,90
-hu_in01.gat,85,108,0 warp hugel47 1,1,hu_in01.gat,84,153
-hu_in01.gat,84,151,0 warp hugel48 1,1,hu_in01.gat,85,106
-hu_in01.gat,84,71,0 warp hugel49 1,1,hu_in01.gat,86,26
-hu_in01.gat,85,28,0 warp hugel50 1,1,hu_in01.gat,84,73
-hugel.gat,129,65,0 warp hugel51 1,1,hu_in01.gat,347,108
-hu_in01.gat,345,108,0 warp hugel52 1,1,hugel.gat,127,65
-hu_in01.gat,380,118,0 warp hugel53 1,1,hu_in01.gat,378,176
-hu_in01.gat,378,178,0 warp hugel54 1,1,hu_in01.gat,378,118
-hu_in01.gat,314,386,0 warp hugel55 1,1,hu_in01.gat,309,322
-hu_in01.gat,307,322,0 warp hugel56 1,1,hu_in01.gat,312,386
-hugel.gat,80,230,0 warp hugel57 1,1,hu_in01.gat,24,363
-hu_in01.gat,24,361,0 warp hugel58 1,1,hugel.gat,82,230
-hugel.gat,93,201,0 warp hugel60 1,1,hu_in01.gat,303,380
-hu_in01.gat,301,380,0 warp hugel59 1,1,hugel.gat,93,199
+hu_in01,149,90,0 warp hugel45 1,1,hu_in01,104,90
+hu_in01,106,90,0 warp hugel46 1,1,hu_in01,151,90
+hu_in01,85,108,0 warp hugel47 1,1,hu_in01,84,153
+hu_in01,84,151,0 warp hugel48 1,1,hu_in01,85,106
+hu_in01,84,71,0 warp hugel49 1,1,hu_in01,86,26
+hu_in01,85,28,0 warp hugel50 1,1,hu_in01,84,73
+hugel,129,65,0 warp hugel51 1,1,hu_in01,347,108
+hu_in01,345,108,0 warp hugel52 1,1,hugel,127,65
+hu_in01,380,118,0 warp hugel53 1,1,hu_in01,378,176
+hu_in01,378,178,0 warp hugel54 1,1,hu_in01,378,118
+hu_in01,314,386,0 warp hugel55 1,1,hu_in01,309,322
+hu_in01,307,322,0 warp hugel56 1,1,hu_in01,312,386
+hugel,80,230,0 warp hugel57 1,1,hu_in01,24,363
+hu_in01,24,361,0 warp hugel58 1,1,hugel,82,230
+hugel,93,201,0 warp hugel60 1,1,hu_in01,303,380
+hu_in01,301,380,0 warp hugel59 1,1,hugel,93,199
//Bingo
-hugel.gat,55,208,0 warp hugelwarp1051 1,1,que_bingo.gat,49,9
-que_bingo.gat,49,7,0 warp hugelwarp1052 1,1,hugel.gat,57,207
-que_bingo.gat,39,34,0 warp hugelwarp1053 1,1,que_bingo.gat,34,109
-que_bingo.gat,34,105,0 warp hugelwarp1054 1,1,que_bingo.gat,38,28
-que_bingo.gat,53,34,0 warp hugelwarp1055 1,1,que_bingo.gat,49,71
-que_bingo.gat,48,66,0 warp hugelwarp1056 1,1,que_bingo.gat,53,29 \ No newline at end of file
+hugel,55,208,0 warp hugelwarp1051 1,1,que_bingo,49,9
+que_bingo,49,7,0 warp hugelwarp1052 1,1,hugel,57,207
+que_bingo,39,34,0 warp hugelwarp1053 1,1,que_bingo,34,109
+que_bingo,34,105,0 warp hugelwarp1054 1,1,que_bingo,38,28
+que_bingo,53,34,0 warp hugelwarp1055 1,1,que_bingo,49,71
+que_bingo,48,66,0 warp hugelwarp1056 1,1,que_bingo,53,29 \ No newline at end of file
diff --git a/npc/warps/cities/izlude.txt b/npc/warps/cities/izlude.txt
index c427e44cd..e19efeee8 100644
--- a/npc/warps/cities/izlude.txt
+++ b/npc/warps/cities/izlude.txt
@@ -14,21 +14,21 @@
//============================================================
//= Izlude City ==============================================
-izlude.gat,109,151,0 warp iz01 3,3,izlude_in.gat,65,87
-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,64,169
-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
-izlude.gat,149,39,0 warp izair1 1,1,izlude.gat,180,56
-izlude.gat,176,56,0 warp lizair2 1,1,izlude.gat,145,39 \ No newline at end of file
+izlude,109,151,0 warp iz01 3,3,izlude_in,65,87
+izlude,148,148,0 warp iz02 2,2,izlude_in,116,49
+izlude,216,129,0 warp iz03 3,2,izlude_in,151,127
+izlude,30,78,0 warp iz001 3,3,prt_fild08,367,212
+izlude,52,140,0 warp iz04 2,2,izlude_in,74,161
+izlude_in,108,169,0 warp iz05 2,3,izlude_in,84,169
+izlude_in,116,46,0 warp iz02-1 3,2,izlude,145,145
+izlude_in,148,127,0 warp iz03-1 2,5,izlude,212,129
+izlude_in,171,97,0 warp iz06 3,2,izlude_in,172,119
+izlude_in,172,116,0 warp iz06-1 3,2,izlude_in,172,94
+izlude_in,172,139,0 warp iz07 3,2,izlude_in,172,161
+izlude_in,172,158,0 warp iz07-1 3,2,izlude_in,172,136
+izlude_in,43,169,0 warp w219 2,3,izlude_in,64,169
+izlude_in,65,84,0 warp iz01-1 5,2,izlude,113,147
+izlude_in,74,158,0 warp iz04-1 3,2,izlude,52,136
+izlude_in,87,169,0 warp iz05-1 2,3,izlude_in,111,169
+izlude,149,39,0 warp izair1 1,1,izlude,180,56
+izlude,176,56,0 warp lizair2 1,1,izlude,145,39 \ No newline at end of file
diff --git a/npc/warps/cities/lighthalzen.txt b/npc/warps/cities/lighthalzen.txt
index 0447d88b0..d74d24d3e 100644
--- a/npc/warps/cities/lighthalzen.txt
+++ b/npc/warps/cities/lighthalzen.txt
@@ -18,128 +18,128 @@
//= 1.7 Yet more missing warps implemented :P [MasterOfMuppets]
//============================================================
-lighthalzen.gat,196,46,0 warp lhz010 1,1,lhz_in02.gat,282,83
-lhz_in02.gat,282,79,0 warp lhz010a 1,1,lighthalzen.gat,193,47
+lighthalzen,196,46,0 warp lhz010 1,1,lhz_in02,282,83
+lhz_in02,282,79,0 warp lhz010a 1,1,lighthalzen,193,47
-lighthalzen.gat,197,36,0 warp lhz011 1,1,lhz_in02.gat,284,30
-lhz_in02.gat,288,30,0 warp lhz011a 1,1,lighthalzen.gat,194,35
+lighthalzen,197,36,0 warp lhz011 1,1,lhz_in02,284,30
+lhz_in02,288,30,0 warp lhz011a 1,1,lighthalzen,194,35
-lhz_in02.gat,265,14,0 warp lhz012 1,1,lhz_in02.gat,269,82
-lhz_in02.gat,274,82,0 warp lhz012a 1,1,lhz_in02.gat,269,14
+lhz_in02,265,14,0 warp lhz012 1,1,lhz_in02,269,82
+lhz_in02,274,82,0 warp lhz012a 1,1,lhz_in02,269,14
-lhz_in02.gat,108,26,0 warp lhz013 1,1,lighthalzen.gat,98,110
-lighthalzen.gat,92,110,0 warp lhz013a 1,1,lhz_in02.gat,104,26
+lhz_in02,108,26,0 warp lhz013 1,1,lighthalzen,98,110
+lighthalzen,92,110,0 warp lhz013a 1,1,lhz_in02,104,26
-lighthalzen.gat,50,87,0 warp lhz014 1,1,lhz_in03.gat,45,31
-lhz_in03.gat,50,31,0 warp lhz014a 1,1,lighthalzen.gat,54,87
+lighthalzen,50,87,0 warp lhz014 1,1,lhz_in03,45,31
+lhz_in03,50,31,0 warp lhz014a 1,1,lighthalzen,54,87
-lhz_in03.gat,20,99,0 warp lhz015 1,1,lhz_in03.gat,17,31
-lhz_in03.gat,13,31,0 warp lhz015a 1,1,lhz_in03.gat,15,99
+lhz_in03,20,99,0 warp lhz015 1,1,lhz_in03,17,31
+lhz_in03,13,31,0 warp lhz015a 1,1,lhz_in03,15,99
-lighthalzen.gat,159,133,0 warp lhz016 1,1,lhz_in02.gat,232,265
-lhz_in02.gat,232,261,0 warp lhz016a 1,1,lighthalzen.gat,159,129
+lighthalzen,159,133,0 warp lhz016 1,1,lhz_in02,232,265
+lhz_in02,232,261,0 warp lhz016a 1,1,lighthalzen,159,129
-lhz_in02.gat,210,284,0 warp lhz017 1,1,lhz_in02.gat,241,219
-lhz_in02.gat,236,219,0 warp lhz017a 1,1,lhz_in02.gat,206,284
+lhz_in02,210,284,0 warp lhz017 1,1,lhz_in02,241,219
+lhz_in02,236,219,0 warp lhz017a 1,1,lhz_in02,206,284
-lhz_in02.gat,269,212,0 warp lhz018 1,1,lhz_in02.gat,250,212
-lhz_in02.gat,254,212,0 warp lhz018a 1,1,lhz_in02.gat,273,212
+lhz_in02,269,212,0 warp lhz018 1,1,lhz_in02,250,212
+lhz_in02,254,212,0 warp lhz018a 1,1,lhz_in02,273,212
-lhz_in02.gat,231,200,0 warp lhz019 1,1,lhz_in02.gat,212,200
-lhz_in02.gat,216,200,0 warp lhz019a 1,1,lhz_in02.gat,233,200
+lhz_in02,231,200,0 warp lhz019 1,1,lhz_in02,212,200
+lhz_in02,216,200,0 warp lhz019a 1,1,lhz_in02,233,200
-lhz_in02.gat,231,182,0 warp lhz020 1,1,lhz_in02.gat,212,182
-lhz_in02.gat,216,182,0 warp lhz020a 1,1,lhz_in02.gat,235,182
+lhz_in02,231,182,0 warp lhz020 1,1,lhz_in02,212,182
+lhz_in02,216,182,0 warp lhz020a 1,1,lhz_in02,235,182
-lhz_in02.gat,238,169,0 warp lhz021 1,1,lhz_in02.gat,238,150
-lhz_in02.gat,238,154,0 warp lhz021a 1,1,lhz_in02.gat,238,173
+lhz_in02,238,169,0 warp lhz021 1,1,lhz_in02,238,150
+lhz_in02,238,154,0 warp lhz021a 1,1,lhz_in02,238,173
-lhz_in02.gat,261,278,0 warp lhz022 1,1,lhz_in02.gat,246,278
-lhz_in02.gat,250,278,0 warp lhz022a 1,1,lhz_in02.gat,265,278
+lhz_in02,261,278,0 warp lhz022 1,1,lhz_in02,246,278
+lhz_in02,250,278,0 warp lhz022a 1,1,lhz_in02,265,278
-lighthalzen.gat,238,220,0 warp lhz023 1,1,lhz_in02.gat,28,270
-lhz_in02.gat,27,265,0 warp lhz023a 1,1,lighthalzen.gat,238,216
+lighthalzen,238,220,0 warp lhz023 1,1,lhz_in02,28,270
+lhz_in02,27,265,0 warp lhz023a 1,1,lighthalzen,238,216
-lhz_in02.gat,13,284,0 warp lhz024 1,1,lhz_in02.gat,89,285
-lhz_in02.gat,95,285,0 warp lhz024a 1,1,lhz_in02.gat,19,284
+lhz_in02,13,284,0 warp lhz024 1,1,lhz_in02,89,285
+lhz_in02,95,285,0 warp lhz024a 1,1,lhz_in02,19,284
-lhz_in02.gat,114,272,0 warp lhz025 1,1,lhz_in02.gat,153,282
-lhz_in02.gat,149,282,0 warp lhz025a 1,1,lhz_in02.gat,110,272
+lhz_in02,114,272,0 warp lhz025 1,1,lhz_in02,153,282
+lhz_in02,149,282,0 warp lhz025a 1,1,lhz_in02,110,272
-lighthalzen.gat,198,257,0 warp lhz026 1,1,lhz_in02.gat,39,28
-lhz_in02.gat,44,28,0 warp lhz026a 1,1,lighthalzen.gat,203,257
+lighthalzen,198,257,0 warp lhz026 1,1,lhz_in02,39,28
+lhz_in02,44,28,0 warp lhz026a 1,1,lighthalzen,203,257
-lighthalzen.gat,236,276,0 warp lhz027 1,1,lhz_in02.gat,133,199
-lhz_in02.gat,129,199,0 warp lhz027a 1,1,lighthalzen.gat,232,276
+lighthalzen,236,276,0 warp lhz027 1,1,lhz_in02,133,199
+lhz_in02,129,199,0 warp lhz027a 1,1,lighthalzen,232,276
-lighthalzen.gat,251,299,0 warp lhz028 1,1,lhz_in03.gat,97,21
-lhz_in03.gat,93,21,0 warp lhz028a 1,1,lighthalzen.gat,247,299
+lighthalzen,251,299,0 warp lhz028 1,1,lhz_in03,97,21
+lhz_in03,93,21,0 warp lhz028a 1,1,lighthalzen,247,299
-lhz_in03.gat,134,14,0 warp lhz029 1,1,lhz_in03.gat,125,90
-lhz_in03.gat,120,90,0 warp lhz029a 1,1,lhz_in03.gat,130,14
+lhz_in03,134,14,0 warp lhz029 1,1,lhz_in03,125,90
+lhz_in03,120,90,0 warp lhz029a 1,1,lhz_in03,130,14
-lighthalzen.gat,198,163,0 warp lhz030 1,1,lhz_in02.gat,21,195
-lhz_in02.gat,21,191,0 warp lhz030a 1,1,lighthalzen.gat,202,160
+lighthalzen,198,163,0 warp lhz030 1,1,lhz_in02,21,195
+lhz_in02,21,191,0 warp lhz030a 1,1,lighthalzen,202,160
-lhz_in02.gat,39,204,0 warp lhz031 1,1,lhz_in02.gat,41,136
-lhz_in02.gat,36,136,0 warp lhz031a 1,1,lhz_in02.gat,34,204
+lhz_in02,39,204,0 warp lhz031 1,1,lhz_in02,41,136
+lhz_in02,36,136,0 warp lhz031a 1,1,lhz_in02,34,204
-lhz_in02.gat,49,154,0 warp lhz032 1,1,lhz_in02.gat,98,155
-lhz_in02.gat,103,155,0 warp lhz032a 1,1,lhz_in02.gat,44,154
+lhz_in02,49,154,0 warp lhz032 1,1,lhz_in02,98,155
+lhz_in02,103,155,0 warp lhz032a 1,1,lhz_in02,44,154
-lhz_in02.gat,88,144,0 warp lhz033 1,1,lhz_in02.gat,89,212
-lhz_in02.gat,94,212,0 warp lhz033a 1,1,lhz_in02.gat,94,144
+lhz_in02,88,144,0 warp lhz033 1,1,lhz_in02,89,212
+lhz_in02,94,212,0 warp lhz033a 1,1,lhz_in02,94,144
-lhz_in02.gat,79,223,0 warp lhz034 1,1,lhz_in02.gat,17,155
-lhz_in02.gat,13,155,0 warp lhz034a 1,1,lhz_in02.gat,84,223
+lhz_in02,79,223,0 warp lhz034 1,1,lhz_in02,17,155
+lhz_in02,13,155,0 warp lhz034a 1,1,lhz_in02,84,223
-lighthalzen.gat,101,248,0 warp lhz035 1,1,lhz_in01.gat,111,126
-lhz_in01.gat,111,121,0 warp lhz035a 1,1,lighthalzen.gat,101,243
+lighthalzen,101,248,0 warp lhz035 1,1,lhz_in01,111,126
+lhz_in01,111,121,0 warp lhz035a 1,1,lighthalzen,101,243
-lighthalzen.gat,106,248,0 warp lhz036 1,1,lhz_in01.gat,116,126
-lhz_in01.gat,116,121,0 warp lhz036a 1,1,lighthalzen.gat,106,243
+lighthalzen,106,248,0 warp lhz036 1,1,lhz_in01,116,126
+lhz_in01,116,121,0 warp lhz036a 1,1,lighthalzen,106,243
-lhz_in01.gat,88,215,0 warp lhz037 1,1,lhz_in01.gat,106,18
-lhz_in01.gat,106,15,0 warp lhz037a 1,1,lhz_in01.gat,88,211
+lhz_in01,88,215,0 warp lhz037 1,1,lhz_in01,106,18
+lhz_in01,106,15,0 warp lhz037a 1,1,lhz_in01,88,211
-lhz_in01.gat,140,215,0 warp lhz038 1,1,lhz_in01.gat,158,18
-lhz_in01.gat,158,15,0 warp lhz038a 1,1,lhz_in01.gat,140,211
+lhz_in01,140,215,0 warp lhz038 1,1,lhz_in01,158,18
+lhz_in01,158,15,0 warp lhz038a 1,1,lhz_in01,140,211
-lhz_in01.gat,194,55,0 warp lhz039 1,1,lhz_in01.gat,188,250
-lhz_in01.gat,188,254,0 warp lhz039a 1,1,lhz_in01.gat,191,52
+lhz_in01,194,55,0 warp lhz039 1,1,lhz_in01,188,250
+lhz_in01,188,254,0 warp lhz039a 1,1,lhz_in01,191,52
-lhz_in01.gat,230,226,0 warp lhz040 1,1,lhz_in01.gat,257,226
-lhz_in01.gat,251,226,0 warp lhz040a 1,1,lhz_in01.gat,225,226
+lhz_in01,230,226,0 warp lhz040 1,1,lhz_in01,257,226
+lhz_in01,251,226,0 warp lhz040a 1,1,lhz_in01,225,226
-lhz_in01.gat,98,55,0 warp lhz041 1,1,lhz_in01.gat,76,250
-lhz_in01.gat,76,254,0 warp lhz041a 1,1,lhz_in01.gat,100,52
+lhz_in01,98,55,0 warp lhz041 1,1,lhz_in01,76,250
+lhz_in01,76,254,0 warp lhz041a 1,1,lhz_in01,100,52
-lhz_in01.gat,149,179,0 warp lhz042 1,1,lhz_in01.gat,15,24
-lhz_in01.gat,11,24,0 warp lhz042a 1,1,lhz_in01.gat,145,178
+lhz_in01,149,179,0 warp lhz042 1,1,lhz_in01,15,24
+lhz_in01,11,24,0 warp lhz042a 1,1,lhz_in01,145,178
-lighthalzen.gat,346,232,0 warp lhz043 1,1,lhz_in03.gat,188,14
-lhz_in03.gat,188,11,0 warp lhz043a 1,1,lighthalzen.gat,346,229
+lighthalzen,346,232,0 warp lhz043 1,1,lhz_in03,188,14
+lhz_in03,188,11,0 warp lhz043a 1,1,lighthalzen,346,229
-lhz_in03.gat,191,35,0 warp lhz044 1,1,lhz_in03.gat,190,103
-lhz_in03.gat,190,100,0 warp lhz044a 1,1,lhz_in03.gat,189,34
+lhz_in03,191,35,0 warp lhz044 1,1,lhz_in03,190,103
+lhz_in03,190,100,0 warp lhz044a 1,1,lhz_in03,189,34
-lighthalzen.gat,339,240,0 warp lhz045 1,1,lhz_in03.gat,180,87
-lhz_in03.gat,180,90,0 warp lhz045a 1,1,lighthalzen.gat,339,242
+lighthalzen,339,240,0 warp lhz045 1,1,lhz_in03,180,87
+lhz_in03,180,90,0 warp lhz045a 1,1,lighthalzen,339,242
-lhz_in01.gat,40,224,0 warp lhz046 1,1,lhz_in01.gat,19,129
-lhz_in01.gat,15,129,0 warp lhz046a 1,1,lhz_in01.gat,34,224
+lhz_in01,40,224,0 warp lhz046 1,1,lhz_in01,19,129
+lhz_in01,15,129,0 warp lhz046a 1,1,lhz_in01,34,224
-lhz_in01.gat,58,130,0 warp lhz047 1,1,lhz_in01.gat,193,127
-lhz_in01.gat,191,127,0 warp lhz047a 1,1,lhz_in01.gat,56,130
+lhz_in01,58,130,0 warp lhz047 1,1,lhz_in01,193,127
+lhz_in01,191,127,0 warp lhz047a 1,1,lhz_in01,56,130
-lhz_in01.gat,43,115,0 warp lhz048 1,1,lhz_in01.gat,278,130
-lhz_in01.gat,278,132,0 warp lhz048a 1,1,lhz_in01.gat,43,117
+lhz_in01,43,115,0 warp lhz048 1,1,lhz_in01,278,130
+lhz_in01,278,132,0 warp lhz048a 1,1,lhz_in01,43,117
-//lhz_in01.gat,275,235,0 warp lhz049 1,1,lhz_in01.gat,275,242 //not sure
-//lhz_in01.gat,275,238,0 warp lhz049a 1,1,lhz_in01.gat,275,232 //not sure
+//lhz_in01,275,235,0 warp lhz049 1,1,lhz_in01,275,242 //not sure
+//lhz_in01,275,238,0 warp lhz049a 1,1,lhz_in01,275,232 //not sure
-lighthalzen.gat,324,301,0 warp lhz050 1,1,lhz_in03.gat,239,101
-lhz_in03.gat,237,101,0 warp lhz050a 1,1,lighthalzen.gat,324,299
+lighthalzen,324,301,0 warp lhz050 1,1,lhz_in03,239,101
+lhz_in03,237,101,0 warp lhz050a 1,1,lighthalzen,324,299
-lighthalzen.gat,323,322,0 warp lhz051 1,1,lhz_in03.gat,15,162
-lhz_in03.gat,13,162,0 warp lhz051a 1,1,lighthalzen.gat,321,322 \ No newline at end of file
+lighthalzen,323,322,0 warp lhz051 1,1,lhz_in03,15,162
+lhz_in03,13,162,0 warp lhz051a 1,1,lighthalzen,321,322 \ No newline at end of file
diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt
index 3d13f5929..4ca33c483 100644
--- a/npc/warps/cities/louyang.txt
+++ b/npc/warps/cities/louyang.txt
@@ -16,40 +16,39 @@
//============================================================
//= Louyang 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,32
-louyang.gat,263,93,0 warp louwarp018 3,3,lou_in02.gat,246,58
-louyang.gat,133,245,0 warp louwarp020 1,1,lou_in01.gat,25,19
-lou_in01.gat,27,19,0 warp louwarp020a 1,1,louyang.gat,135,245
-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_in01.gat,14,18,0 warp louwarp021 1,1,louyang.gat,90,253
-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 louwarp018a 3,3,louyang.gat,260,93
-lou_in02.gat,80,190,0 warp louwarp012 3,3,lou_in02.gat,74,140
-lou_in02.gat,71,140,0 warp louwarp012a 3,3,lou_in02.gat,77,190
-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
-
+louyang,217,22,0 warp louwarp001 3,3,lou_fild01,232,353
+louyang,37,270,0 warp louwarp002 3,3,lou_dun01,218,196
+louyang,218,253,0 warp louwarp005 3,3,lou_in01,101,122
+louyang,279,168,0 warp louwarp006 3,3,lou_in02,57,174
+louyang,309,80,0 warp louwarp007 3,3,lou_in02,189,78
+louyang,124,121,0 warp louwarp009 3,3,lou_in02,197,162
+louyang,129,121,0 warp louwarp009a 3,3,lou_in02,203,162
+louyang,145,175,0 warp louwarp010 3,3,lou_in02,125,168
+louyang,135,96,0 warp louwarp011 3,3,lou_in02,248,172
+louyang,317,177,0 warp louwarp014 3,3,lou_in02,118,34
+louyang,130,63,0 warp louwarp015 3,3,lou_in02,71,32
+louyang,263,93,0 warp louwarp018 3,3,lou_in02,246,58
+louyang,133,245,0 warp louwarp020 1,1,lou_in01,25,19
+lou_in01,27,19,0 warp louwarp020a 1,1,louyang,135,245
+lou_in01,125,141,0 warp louwarp016 3,3,lou_in01,156,141
+lou_in01,152,141,0 warp louwarp016a 3,3,lou_in01,120,141
+lou_in01,78,141,0 warp louwarp017 3,3,lou_in01,47,141
+lou_in01,51,141,0 warp louwarp017a 3,3,lou_in01,82,141
+lou_in01,101,118,0 warp louwarp005a 3,3,louyang,218,249
+lou_in01,14,18,0 warp louwarp021 1,1,louyang,90,253
+lou_in02,57,170,0 warp louwarp006a 3,3,louyang,279,164
+lou_in02,200,93,0 warp louwarp008 3,3,lou_in02,170,46
+lou_in02,174,46,0 warp louwarp008a 3,3,lou_in02,206,94
+lou_in02,197,158,0 warp louwarp009b 3,3,louyang,124,117
+lou_in02,203,158,0 warp louwarp009c 3,3,louyang,129,117
+lou_in02,125,164,0 warp louwarp010a 3,3,louyang,145,171
+lou_in02,251,175,0 warp louwarp011a 3,3,louyang,140,101
+lou_in02,242,59,0 warp louwarp018a 3,3,louyang,260,93
+lou_in02,80,190,0 warp louwarp012 3,3,lou_in02,74,140
+lou_in02,71,140,0 warp louwarp012a 3,3,lou_in02,77,190
+lou_in02,35,190,0 warp louwarp013 3,3,lou_in02,37,138
+lou_in02,43,138,0 warp louwarp013a 3,3,lou_in02,39,190
+lou_in02,121,32,0 warp louwarp014a 3,3,louyang,317,173
+lou_in02,71,28,0 warp louwarp015a 3,3,louyang,130,57
+lou_in02,189,74,0 warp louwarp007a 3,3,louyang,309,76
+lou_fild01,232,357,0 warp louwarp001a 3,3,louyang,217,26
diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt
index b52e65c38..74b250ed8 100644
--- a/npc/warps/cities/lutie.txt
+++ b/npc/warps/cities/lutie.txt
@@ -12,27 +12,27 @@
//= 1.2a Re-fixed endless warping loop
//============================================================
-xmas.gat,150,41,0 warp xmas2-1 3,3,xmas_fild01.gat,80,246
-xmas.gat,120,131,0 warp xmas3 3,3,xmas_in.gat,41,33
-xmas_in.gat,46,33,0 warp xmas3-1 3,3,xmas.gat,125,131
-xmas.gat,120,161,0 warp xmas4 3,3,xmas_in.gat,33,91
-xmas_in.gat,38,89,0 warp xmas4-1 3,3,xmas.gat,125,159
-xmas.gat,175,132,0 warp xmas5 3,3,xmas_in.gat,158,31
-xmas_in.gat,153,31,0 warp xmas5-1 3,3,xmas.gat,170,132
-xmas.gat,174,161,0 warp xmas6 3,3,xmas_in.gat,166,98
-xmas_in.gat,163,93,0 warp xmas6-1 3,3,xmas.gat,169,158
-xmas.gat,182,169,0 warp xmas7 3,3,xmas_in.gat,174,108
-xmas_in.gat,179,109,0 warp xmas7-1 3,3,xmas.gat,185,168
-xmas.gat,142,240,0 warp xmas8 3,3,xmas_in.gat,95,87
-xmas_in.gat,95,82,0 warp xmas8-1 3,3,xmas.gat,142,235
-xmas.gat,149,240,0 warp xmas9 3,3,xmas_in.gat,105,87
-xmas_in.gat,105,82,0 warp xmas9-1 3,3,xmas.gat,149,235
-xmas.gat,149,256,0 warp xmas10 3,3,xmas_in.gat,105,112
-xmas_in.gat,105,117,0 warp xmas10-1 2,2,xmas.gat,149,261
-xmas.gat,142,256,0 warp xmas11 3,3,xmas_in.gat,96,114
-xmas_in.gat,95,117,0 warp xmas11-1 2,2,xmas.gat,142,261
-xmas.gat,104,290,0 warp xmas12 3,3,xmas_in.gat,30,166
-xmas_in.gat,30,161,0 warp xmas12-1 3,3,xmas.gat,104,285
-xmas.gat,189,279,0 warp xmas13 3,3,xmas_in.gat,168,166
-xmas_in.gat,168,161,0 warp xmas13-1 3,3,xmas.gat,189,274
-xmas.gat,143,313,0 warp xmas14 3,3,xmas_dun01.gat,205,17 \ No newline at end of file
+xmas,150,41,0 warp xmas2-1 3,3,xmas_fild01,80,246
+xmas,120,131,0 warp xmas3 3,3,xmas_in,41,33
+xmas_in,46,33,0 warp xmas3-1 3,3,xmas,125,131
+xmas,120,161,0 warp xmas4 3,3,xmas_in,33,91
+xmas_in,38,89,0 warp xmas4-1 3,3,xmas,125,159
+xmas,175,132,0 warp xmas5 3,3,xmas_in,158,31
+xmas_in,153,31,0 warp xmas5-1 3,3,xmas,170,132
+xmas,174,161,0 warp xmas6 3,3,xmas_in,166,98
+xmas_in,163,93,0 warp xmas6-1 3,3,xmas,169,158
+xmas,182,169,0 warp xmas7 3,3,xmas_in,174,108
+xmas_in,179,109,0 warp xmas7-1 3,3,xmas,185,168
+xmas,142,240,0 warp xmas8 3,3,xmas_in,95,87
+xmas_in,95,82,0 warp xmas8-1 3,3,xmas,142,235
+xmas,149,240,0 warp xmas9 3,3,xmas_in,105,87
+xmas_in,105,82,0 warp xmas9-1 3,3,xmas,149,235
+xmas,149,256,0 warp xmas10 3,3,xmas_in,105,112
+xmas_in,105,117,0 warp xmas10-1 2,2,xmas,149,261
+xmas,142,256,0 warp xmas11 3,3,xmas_in,96,114
+xmas_in,95,117,0 warp xmas11-1 2,2,xmas,142,261
+xmas,104,290,0 warp xmas12 3,3,xmas_in,30,166
+xmas_in,30,161,0 warp xmas12-1 3,3,xmas,104,285
+xmas,189,279,0 warp xmas13 3,3,xmas_in,168,166
+xmas_in,168,161,0 warp xmas13-1 3,3,xmas,189,274
+xmas,143,313,0 warp xmas14 3,3,xmas_dun01,205,17 \ No newline at end of file
diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt
index aa5f2af16..d5a6d97dc 100644
--- a/npc/warps/cities/morroc.txt
+++ b/npc/warps/cities/morroc.txt
@@ -14,94 +14,94 @@
//============================================================
//= 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
+morocc,160,17,0 warp moc001 2,2,moc_fild12,159,378
+morocc,160,183,0 warp moc002 2,1,moc_castle,94,181
+morocc,160,297,0 warp moc003 2,2,moc_fild07,198,25
+morocc,197,66,0 warp moc01 1,1,morocc_in,83,92
+morocc,22,294,0 warp moc02 2,5,moc_ruins,156,42
+morocc,24,164,0 warp moc004 1,2,moc_fild19,164,107
+morocc,253,56,0 warp moc03 2,1,morocc_in,134,74
+morocc,26,297,0 warp moc02-1 5,2,moc_ruins,156,42
+morocc,274,269,0 warp moc04 2,2,morocc_in,138,136
+morocc,283,170,0 warp moc07 2,2,morocc_in,108,176
+morocc,302,207,0 warp moc005 2,2,moc_fild10,22,207
+morocc,46,46,0 warp moc05 2,1,morocc_in,68,72
+morocc,52,259,0 warp moc06 1,2,morocc_in,180,65
+morocc,85,55,0 warp moc08 2,2,morocc_in,44,149
+morocc,98,68,0 warp moc09 1,1,morocc_in,44,175
+morocc_in,105,95,0 warp moc10-1 1,3,morocc_in,90,95
+morocc_in,106,123,0 warp moc11-1 1,3,morocc_in,90,123
+morocc_in,108,179,0 warp moc07-1 2,2,morocc,283,173
+morocc_in,134,77,0 warp moc03-1 3,1,morocc,251,59
+morocc_in,136,136,0 warp moc04-1 1,4,morocc,271,269
+morocc_in,144,109,0 warp moc12-1 3,1,morocc_in,144,125
+morocc_in,144,122,0 warp moc12 3,1,morocc_in,144,106
+morocc_in,144,151,0 warp moc13 3,1,morocc_in,144,169
+morocc_in,144,166,0 warp moc13-1 3,1,morocc_in,144,148
+morocc_in,149,129,0 warp moc14 1,2,morocc_in,169,129
+morocc_in,166,130,0 warp moc14-1 1,3,morocc_in,146,130
+morocc_in,171,37,0 warp moc15-1 4,1,morocc_in,171,52
+morocc_in,171,50,0 warp moc15 4,1,morocc_in,171,35
+morocc_in,174,109,0 warp moc22 3,1,morocc_in,174,125
+morocc_in,174,122,0 warp moc22-1 3,1,morocc_in,174,106
+morocc_in,174,151,0 warp moc16 3,1,morocc_in,174,169
+morocc_in,174,166,0 warp moc16-1 3,1,morocc_in,174,148
+morocc_in,183,65,0 warp moc06-1 2,3,morocc,55,259
+morocc_in,23,161,0 warp moc17 1,2,morocc_in,37,161
+morocc_in,34,161,0 warp moc17-1 1,2,morocc_in,20,161
+morocc_in,44,146,0 warp moc08-1 3,2,morocc,82,52
+morocc_in,44,178,0 warp moc09-1 2,2,morocc,100,70
+morocc_in,55,123,0 warp moc18-1 1,3,morocc_in,71,123
+morocc_in,55,95,0 warp moc19-1 1,3,morocc_in,71,95
+morocc_in,57,161,0 warp moc20 1,3,morocc_in,73,161
+morocc_in,68,123,0 warp moc18 1,3,morocc_in,52,123
+morocc_in,68,42,0 warp moc21-1 2,1,morocc_in,68,65
+morocc_in,68,62,0 warp moc21 2,1,morocc_in,68,38
+morocc_in,68,75,0 warp moc05-1 2,1,morocc,49,49
+morocc_in,68,95,0 warp moc19 1,3,morocc_in,52,95
+morocc_in,70,161,0 warp moc20-1 1,3,morocc_in,54,161
+morocc_in,83,90,0 warp moc01-1 4,1,morocc,199,64
+morocc_in,86,101,0 warp moc23 2,1,morocc_in,86,120
+morocc_in,86,117,0 warp moc23-1 3,1,morocc_in,86,98
+morocc_in,93,123,0 warp moc11 1,3,morocc_in,109,123
+morocc_in,93,95,0 warp moc10 1,3,morocc_in,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
+moc_ruins,161,40,0 warp moc02-2 2,4,morocc,26,293
+moc_ruins,157,37,0 warp moc02-3 5,2,morocc,26,293
+moc_ruins,54,161,0 warp moc006 2,3,moc_pryd01,192,9
+moc_ruins,71,16,0 warp moc007 8,2,moc_fild19,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
+moc_castle,94,183,0 warp mocc001 2,1,morocc,160,185
+moc_castle,107,163,0 warp mocc01 2,3,moc_castle,124,163
+moc_castle,120,163,0 warp mocc01-1 2,3,moc_castle,103,163
+moc_castle,120,75,0 warp mocc02 2,3,moc_castle,56,33
+moc_castle,59,34,0 warp mocc02-1 2,3,moc_castle,124,75
+moc_castle,134,101,0 warp mocc03 1,1,moc_castle,134,128
+moc_castle,134,124,0 warp mocc-03 2,2,moc_castle,134,98
+moc_castle,134,139,0 warp mocc04 1,1,moc_castle,134,160
+moc_castle,134,156,0 warp mocc04-1 2,2,moc_castle,134,136
+moc_castle,149,163,0 warp mocc05 2,3,moc_castle,162,163
+moc_castle,158,163,0 warp mocc05-1 2,3,moc_castle,145,163
+moc_castle,16,131,0 warp mocc06 1,2,moc_castle,16,164
+moc_castle,16,160,0 warp mocc06-1 1,2,moc_castle,16,125
+moc_castle,170,131,0 warp mocc07 2,2,moc_castle,170,163
+moc_castle,170,160,0 warp mocc07-1 1,1,moc_castle,170,128
+moc_castle,29,163,0 warp mocc08 2,2,moc_castle,44,163
+moc_castle,40,163,0 warp mocc08-1 2,2,moc_castle,25,163
+moc_castle,51,114,0 warp mocc09 3,2,moc_castle,54,65
+moc_castle,54,69,0 warp mocc09-1 3,2,moc_castle,52,117
+moc_castle,54,139,0 warp mocc10 2,2,moc_castle,54,160
+moc_castle,54,156,0 warp mocc10-1 2,2,moc_castle,54,134
+moc_castle,63,89,0 warp mocc11 2,3,moc_castle,83,89
+moc_castle,80,89,0 warp mocc11-1 2,3,moc_castle,60,89
+moc_castle,69,163,0 warp mocc12 2,2,moc_castle,86,163
+moc_castle,82,163,0 warp mocc12-1 2,2,moc_castle,66,163
+moc_castle,88,93,0 warp mocc13 1,1,moc_castle,94,119
+moc_castle,94,116,0 warp mocc13-1 1,1,moc_castle,88,90
+moc_castle,96,90,0 warp mocc13-2 1,1,moc_castle,94,119
+moc_castle,92,67,0 warp mocc14 3,2,moc_castle,92,85
+moc_castle,92,82,0 warp mocc14-1 3,2,moc_castle,92,63
+moc_castle,94,143,0 warp mocc15 3,2,moc_castle,94,160
+moc_castle,94,156,0 warp mocc15-1 3,2,moc_castle,94,140 \ No newline at end of file
diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt
index f41626390..bd7d3c091 100644
--- a/npc/warps/cities/niflheim.txt
+++ b/npc/warps/cities/niflheim.txt
@@ -15,38 +15,38 @@
//============================================================
//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
+nif_fild01,345,323,0 warp nwarp7 1,1,nif_fild02,23,312
+nif_fild02,21,312,0 warp nwarp8 1,1,nif_fild01,343,322
+nif_fild02,379,235,0 warp nwarp9 1,1,niflheim,20,153
+niflheim,18,151,0 warp nwarp10 1,1,nif_fild02,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
+niflheim,220,169,0 warp nwarp11 1,1,nif_in,14,88
+nif_in,11,88,0 warp nwarp12 1,1,niflheim,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
+niflheim,219,199,0 warp nwarp13 1,1,nif_in,136,14
+nif_in,134,12,0 warp nwarp14 1,1,niflheim,218,197
//House
-niflheim.gat,190,241,0 warp nwarp19 1,1,nif_in.gat,81,77
-nif_in.gat,78,74,0 warp nwarp20 1,1,niflheim.gat,187,241
+niflheim,190,241,0 warp nwarp19 1,1,nif_in,81,77
+nif_in,78,74,0 warp nwarp20 1,1,niflheim,187,241
//Inn
-niflheim.gat,189,211,0 warp nwarp21 1,1,nif_in.gat,20,14
-nif_in.gat,23,12,0 warp nwarp22 1,1,niflheim.gat,189,207
-nif_in.gat,34,34,0 warp nwarp23 1,1,nif_in.gat,88,31
-nif_in.gat,88,29,0 warp nwarp24 1,1,nif_in.gat,34,31
+niflheim,189,211,0 warp nwarp21 1,1,nif_in,20,14
+nif_in,23,12,0 warp nwarp22 1,1,niflheim,189,207
+nif_in,34,34,0 warp nwarp23 1,1,nif_in,88,31
+nif_in,88,29,0 warp nwarp24 1,1,nif_in,34,31
//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
-
-niflheim.gat,165,162,0 warp nwarp19 1,1,nif_in.gat,156,80
-nif_in.gat,169,82,0 warp nwarp20 1,1,nif_in.gat,189,105
-nif_in.gat,186,105,0 warp nwarp21 1,1,nif_in.gat,167,82
-nif_in.gat,154,78,0 warp nwarp22 1,1,niflheim.gat,167,161
+niflheim,255,194,0 warp nwarp15 1,1,nif_in,20,156
+nif_in,18,154,0 warp nwarp16 1,1,niflheim,254,192
+nif_in,65,168,0 warp nwarp17 1,1,nif_in,141,174
+nif_in,140,171,0 warp nwarp18 1,1,nif_in,65,165
+
+niflheim,165,162,0 warp nwarp19 1,1,nif_in,156,80
+nif_in,169,82,0 warp nwarp20 1,1,nif_in,189,105
+nif_in,186,105,0 warp nwarp21 1,1,nif_in,167,82
+nif_in,154,78,0 warp nwarp22 1,1,niflheim,167,161 \ No newline at end of file
diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt
index e4506b3f4..ca2db2c48 100644
--- a/npc/warps/cities/payon.txt
+++ b/npc/warps/cities/payon.txt
@@ -21,118 +21,118 @@
// == 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,89,0 warp payonwarp005 2,4,pay_fild08.gat,20,74
-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
+payon,16,142,0 warp payonwarp001 1,1,pay_gld,370,149
+pay_gld,374,149,0 warp payonwarp002 1,1,payon,20,142
+payon,122,27,0 warp payonwarp003 5,3,pay_fild01,333,356
+pay_fild01,333,360,0 warp payonwarp004 5,3,payon,122,31
+payon,267,89,0 warp payonwarp005 2,4,pay_fild08,20,74
+payon,228,330,0 warp payonwarp007 4,2,pay_arche,81,22
+pay_arche,81,18,0 warp payonwarp008 5,2,payon,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
+payon,223,117,0 warp payonwarp009 2,2,payon_in01,175,11
+payon_in01,172,11,0 warp payonwarp010 2,2,payon,219,117
+payon_in01,180,43,0 warp payonwarp011 2,2,payon_in01,181,73
+payon_in01,181,70,0 warp payonwarp012 2,2,payon_in01,180,40
+payon_in01,193,92,0 warp payonwarp013 2,2,payon_in01,143,61
+payon_in01,146,61,0 warp payonwarp014 2,2,payon_in01,193,89
+payon_in01,133,42,0 warp payonwarp015 2,2,payon_in01,133,18
+payon_in01,133,21,0 warp payonwarp016 2,2,payon_in01,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
+payon,140,85,0 warp payonwarp017 2,2,payon_in01,14,51
+payon_in01,17,51,0 warp payonwarp018 2,2,payon,143,85
+payon_in01,10,59,0 warp payonwarp019 2,2,payon_in01,10,83
+payon_in01,10,80,0 warp payonwarp021 2,2,payon_in01,10,56
+payon_in01,10,38,0 warp payonwarp022 2,2,payon_in01,10,14
+payon_in01,10,17,0 warp payonwarp023 2,2,payon_in01,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
+payon,135,158,0 warp payonwarp024 2,2,payon_in01,20,129
+payon_in01,23,129,0 warp payonwarp025 2,2,payon,138,158
+payon,130,169,0 warp payonwarp026 2,2,payon_in01,13,136
+payon_in01,13,139,0 warp payonwarp027 2,2,payon,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
+payon,151,127,0 warp payonwarp028 2,2,payon_in01,56,53
+payon_in01,56,50,0 warp payonwarp029 2,2,payon,151,124
// -- Middle Castle --
-payon.gat,155,248,0 warp payonwarp030 4,1,payon_in03.gat,98,117
-payon_in03.gat,98,114,0 warp payonwarp031 5,1,payon.gat,155,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
+payon,155,248,0 warp payonwarp030 4,1,payon_in03,98,117
+payon_in03,98,114,0 warp payonwarp031 5,1,payon,155,245
+payon_in03,90,124,0 warp payonwarp032 2,2,payon_in03,80,124
+payon_in03,83,124,0 warp payonwarp033 2,2,payon_in03,93,124
+payon_in03,99,133,0 warp payonwarp034 2,2,payon_in03,99,151
+payon_in03,99,148,0 warp payonwarp035 2,2,payon_in03,99,130
+payon_in03,107,124,0 warp payonwarp036 2,2,payon_in03,117,124
+payon_in03,114,124,0 warp payonwarp037 2,2,payon_in03,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
+payon,189,233,0 warp payonwarp038 2,2,payon_in03,149,39
+payon_in03,146,39,0 warp payonwarp039 2,2,payon,186,233
+payon_in03,158,32,0 warp payonwarp040 2,2,payon_in03,130,14
+payon_in03,130,17,0 warp payonwarp041 2,2,payon_in03,158,35
+payon_in03,172,32,0 warp payonwarp042 2,2,payon_in03,160,14
+payon_in03,160,17,0 warp payonwarp043 2,2,payon_in03,172,35
+payon_in03,186,32,0 warp payonwarp044 2,2,payon_in03,190,13
+payon_in03,190,17,0 warp payonwarp045 2,2,payon_in03,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
+payon,256,285,0 warp payonwarp046 2,2,payon_in01,45,11
+payon_in01,42,11,0 warp payonwarp047 2,2,payon,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
+pay_arche,36,131,0 warp payonwarp048 2,2,pay_dun00,21,183
+pay_arche,71,156,0 warp payonwarp049 2,2,payon_in02,82,41
+pay_arche,92,170,0 warp payonwarp050 2,2,payon_in02,50,7
+pay_arche,145,165,0 warp payonwarp051 2,2,payon_in02,64,60
+payon_in02,10,25,0 warp payonwarp052 2,2,payon_in02,72,67
+payon_in02,35,67,0 warp payonwarp053 2,2,payon_in02,55,67
+payon_in02,50,4,0 warp payonwarp054 3,1,pay_arche,92,166
+payon_in02,52,67,0 warp payonwarp055 2,2,payon_in02,32,67
+payon_in02,61,33,0 warp payonwarp056 2,2,payon_in02,73,33
+payon_in02,64,56,0 warp payonwarp057 2,2,pay_arche,141,161
+payon_in02,70,33,0 warp payonwarp058 2,2,payon_in02,58,33
+payon_in02,75,67,0 warp payonwarp059 2,2,payon_in02,13,25
+payon_in02,82,45,0 warp payonwarp060 2,2,pay_arche,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
+payon,127,204,0 warp payonwarp061 2,2,payon_in03,81,19
+payon_in03,85,19,0 warp payonwarp062 2,2,payon,131,204
+payon_in03,74,18,0 warp payonwarp063 2,2,payon_in03,62,18
+payon_in03,67,18,0 warp payonwarp064 2,2,payon_in03,78,18
+payon_in03,46,18,0 warp payonwarp065 2,2,payon_in03,35,18
+payon_in03,39,18,0 warp payonwarp066 2,2,payon_in03,51,18
+payon_in03,28,18,0 warp payonwarp067 2,2,payon_in03,17,18
+payon_in03,21,18,0 warp payonwarp068 2,2,payon_in03,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
+payon,155,327,0 warp payonwarp069 2,2,payon_in03,165,143
+payon_in03,165,140,0 warp payonwarp070 2,2,payon,155,324
+payon_in03,185,178,0 warp payonwarp071 2,2,payon_in03,185,149
+payon_in03,185,153,0 warp payonwarp072 2,2,payon_in03,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
+payon,107,327,0 warp payonwarp073 2,2,payon_in03,19,64
+payon_in03,19,60,0 warp payonwarp074 2,2,payon,107,323
+payon_in03,19,73,0 warp payonwarp075 2,2,payon_in03,19,90
+payon_in03,19,86,0 warp payonwarp076 2,2,payon_in03,19,69
+payon_in03,19,103,0 warp payonwarp077 2,2,payon_in03,19,122
+payon_in03,19,118,0 warp payonwarp078 2,2,payon_in03,19,99
+payon_in03,11,131,0 warp payonwarp079 2,2,payon_in03,11,146
+payon_in03,11,142,0 warp payonwarp080 2,2,payon_in03,11,127
+payon_in03,27,131,0 warp payonwarp081 2,2,payon_in03,27,146
+payon_in03,27,142,0 warp payonwarp082 2,2,payon_in03,27,127
+payon_in03,11,161,0 warp payonwarp083 2,2,payon_in03,11,176
+payon_in03,11,172,0 warp payonwarp084 2,2,payon_in03,11,157
+payon_in03,27,161,0 warp payonwarp085 2,2,payon_in03,27,176
+payon_in03,27,172,0 warp payonwarp086 2,2,payon_in03,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,104,71 \ No newline at end of file
+payon_in01,86,9,0 warp payonwarp087 2,2,payon,266,152
+payon,270,152,0 warp payonwarp088 2,2,payon_in01,90,9
+payon_in01,107,71,0 warp payonwarp089 2,2,payon_in01,96,37
+payon_in01,93,37,0 warp payonwarp090 2,2,payon_in01,104,71 \ No newline at end of file
diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt
index 5d780bbe2..3b53b721e 100644
--- a/npc/warps/cities/prontera.txt
+++ b/npc/warps/cities/prontera.txt
@@ -15,91 +15,91 @@
//============================================================
//= 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
-prontera.gat,263,279,0 warp prt15-2 2,2,prt_in.gat,227,18
-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,84,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
-prt_in.gat,227,15,0 warp prt20-2 2,2,prontera.gat,263,275
+prontera,107,215,0 warp prt01 2,2,prt_in,240,139
+prontera,120,267,0 warp prt02 2,2,prt_in,180,97
+prontera,133,183,0 warp prt03 2,2,prt_in,50,105
+prontera,134,221,0 warp prt04 1,1,prt_in,131,71
+prontera,156,22,0 warp prt001 3,2,prt_fild08,170,375
+prontera,156,360,0 warp prt005 4,2,prt_castle,102,20
+prontera,177,221,0 warp prt05 2,2,prt_in,168,128
+prontera,179,184,0 warp prt06 2,2,prt_in,60,73
+prontera,192,267,0 warp prt07 2,2,prt_in,178,55
+prontera,204,192,0 warp prt08 2,2,prt_in,68,134
+prontera,208,154,0 warp prt09 2,2,prt_in,172,29
+prontera,22,203,0 warp prt002 2,3,prt_fild05,367,205
+prontera,237,317,0 warp prt004 2,2,prt_church,100,60
+prontera,289,203,0 warp prt003 2,3,prt_fild06,27,193
+prontera,42,67,0 warp prt10 2,2,prt_in,44,29
+prontera,45,346,0 warp prt11 2,2,prt_in,80,110
+prontera,73,100,0 warp prt12 1,1,prt_in,208,176
+prontera,74,90,0 warp prt13 2,2,prt_in,248,170
+prontera,84,89,0 warp prt14-1 1,1,prt_in,282,176
+prontera,263,279,0 warp prt15-2 2,2,prt_in,227,18
+prt_in,135,71,0 warp prt04-1 1,2,prontera,136,219
+prt_in,168,124,0 warp prt05-1 2,1,prontera,174,218
+prt_in,172,33,0 warp prt09-1 2,1,prontera,205,157
+prt_in,181,55,0 warp prt07-1 1,2,prontera,192,264
+prt_in,183,97,0 warp prt02-1 1,2,prontera,120,264
+prt_in,208,179,0 warp prt12-1 3,1,prontera,76,102
+prt_in,217,163,0 warp prt15 1,3,prt_in,236,163
+prt_in,234,163,0 warp prt15-1 1,3,prt_in,215,163
+prt_in,240,141,0 warp prt01-1 3,1,prontera,107,218
+prt_in,248,173,0 warp prt13-1 3,2,prontera,77,93
+prt_in,254,113,0 warp prt16 3,2,prt_in,256,134
+prt_in,256,131,0 warp prt16-1 2,2,prt_in,254,110
+prt_in,263,163,0 warp prt17 1,3,prt_in,276,163
+prt_in,274,163,0 warp prt17-1 1,3,prt_in,261,163
+//prt_in,280,68,0 warp w472 6,6,prontera,147,287
+//prt_in,281,36,0 warp w473 6,6,prontera,147,287
+//prt_in,282,100,0 warp w471 6,6,prontera,147,287
+prt_in,282,179,0 warp prt14 3,1,prontera,87,91
+//prt_in,285,130,0 warp w470 6,6,prontera,147,287
+prt_in,37,65,0 warp prt18 1,3,prt_in,51,65
+prt_in,47,29,0 warp prt10-1 2,1,prontera,46,67
+prt_in,48,65,0 warp prt18-1 1,3,prt_in,34,65
+prt_in,53,105,0 warp prt03-1 1,2,prontera,136,186
+prt_in,60,77,0 warp prt06-1 2,1,prontera,175,188
+prt_in,68,130,0 warp prt08-1 2,1,prontera,204,188
+prt_in,69,65,0 warp prt19 1,3,prt_in,84,65
+prt_in,70,143,0 warp prt20 2,1,prt_in,70,165
+prt_in,70,162,0 warp prt20-1 2,1,prt_in,70,140
+prt_in,80,113,0 warp prt11-1 2,1,prontera,48,343
+prt_in,82,65,0 warp prt19 1,3,prt_in,66,65
+prt_in,227,15,0 warp prt20-2 2,2,prontera,263,275
//= 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
+prt_church,100,56,0 warp prtch001 7,1,prontera,234,314
+prt_church,109,81,0 warp prtch01 1,2,prt_church,172,19
+prt_church,168,19,0 warp prtch01-1 1,2,prt_church,105,81
+prt_church,31,19,0 warp prtch02 1,2,prt_church,94,81
+prt_church,90,81,0 warp prtch02-1 1,2,prt_church,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
+prt_castle,102,129,0 warp prtca01 3,2,prt_castle,102,143
+prt_castle,102,140,0 warp prtca01-1 3,2,prt_castle,102,126
+prt_castle,102,16,0 warp prtca001 6,2,prontera,156,356
+prt_castle,102,181,0 warp prtca002 6,2,prt_gld,159,28
+prt_castle,102,73,0 warp prtca02 3,2,prt_castle,102,91
+prt_castle,102,88,0 warp prtca02-1 3,2,prt_castle,102,70
+prt_castle,113,107,0 warp prtca03 2,3,prt_castle,134,107
+prt_castle,121,29,0 warp prtca04 1,1,prt_castle,148,29
+prt_castle,130,107,0 warp prtca03-1 2,3,prt_castle,110,107
+prt_castle,135,153,0 warp prtca05 1,1,prt_castle,167,145
+prt_castle,144,29,0 warp prtca04-1 2,2,prt_castle,117,29
+prt_castle,149,113,0 warp prtca06 1,1,prt_castle,175,113
+prt_castle,164,145,0 warp prtca05-1 1,1,prt_castle,132,153
+prt_castle,170,138,0 warp prtca07 3,2,prt_castle,176,118
+prt_castle,172,113,0 warp prtca06-1 1,1,prt_castle,146,113
+prt_castle,176,121,0 warp prtca07-1 3,2,prt_castle,170,141
+prt_castle,28,121,0 warp prtca08 2,2,prt_castle,40,141
+prt_castle,31,113,0 warp prtca09 1,1,prt_castle,58,113
+prt_castle,40,138,0 warp prtca08-1 3,2,prt_castle,28,118
+prt_castle,45,145,0 warp prtca10 1,1,prt_castle,72,153
+prt_castle,54,113,0 warp prtca09-1 1,1,prt_castle,27,113
+prt_castle,59,29,0 warp prtca11 2,2,prt_castle,85,29
+prt_castle,68,153,0 warp prtca10-1 1,1,prt_castle,42,145
+prt_castle,75,107,0 warp prtca12 2,3,prt_castle,95,107
+prt_castle,82,29,0 warp prtca11-1 1,1,prt_castle,56,29
+prt_castle,92,107,0 warp prtca12-1 2,3,prt_castle,72,107 \ No newline at end of file
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index e03acd7a3..cb3510608 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -17,57 +17,57 @@
//| Official warps under this comment. Needs separation though...
//| There are a few warps missing that will be done soon.
-ra_in01.gat,172,392,0 warp rachel01 1,1,rachel.gat,42,114
-rachel.gat,42,87,0 warp rachel02 1,1,ra_in01.gat,171,359
-rachel.gat,42,109,0 warp rachel03 1,1,ra_in01.gat,171,389
-ra_in01.gat,171,355,0 warp rachel04 1,1,rachel.gat,42,82
-rachel.gat,83,78,0 warp rachel05 1,1,ra_in01.gat,249,266
-ra_in01.gat,249,262,0 warp rachel05 1,1,rachel.gat,83,75
-rachel.gat,115,149,0 warp rachel06 1,1,ra_in01.gat,386,43
-ra_in01.gat,386,40,0 warp rachel07 1,1,rachel.gat,115,144
-ra_in01.gat,165,369,0 warp rachel10 1,1,ra_in01.gat,122,334
-ra_in01.gat,126,334,0 warp rachel11 1,1,ra_in01.gat,169,369
-ra_in01.gat,178,370,0 warp rachel12 1,1,ra_in01.gat,113,385
-ra_in01.gat,109,385,0 warp rachel13 1,1,ra_in01.gat,174,370
-ra_in01.gat,357,61,0 warp rachel15 1,1,ra_in01.gat,310,62
-ra_in01.gat,314,62,0 warp rachel16 1,1,ra_in01.gat,361,61
-ra_in01.gat,309,70,0 warp rachel17 1,1,rachel.gat,108,175
-rachel.gat,105,171,0 warp rachel18 1,1,ra_in01.gat,309,65
-ra_in01.gat,297,59,0 warp rachel19 1,1,ra_in01.gat,339,116
-ra_in01.gat,339,120,0 warp rachel20 1,1,ra_in01.gat,297,63
-ra_in01.gat,375,109,0 warp rachel21 1,1,rachel.gat,116,154
-rachel.gat,116,158,0 warp rachel22 1,1,ra_in01.gat,375,114
-ra_in01.gat,135,286,0 warp rachel22 1,1,rachel.gat,216,164
-rachel.gat,216,160,0 warp rachel23 1,1,ra_in01.gat,135,282
-ra_in01.gat,213,79,0 warp rachel24 1,1,rachel.gat,108,195
-rachel.gat,108,200,0 warp rachel25 1,1,ra_in01.gat,213,83
-ra_in01.gat,192,152,0 warp rachel26 1,1,rachel.gat,90,193
-rachel.gat,90,189,0 warp rachel27 1,1,ra_in01.gat,192,148
-rachel.gat,25,125,0 warp rachel28 1,1,ra_fild11.gat,353,226
-rachel.gat,273,125,0 warp rachel29 1,1,ra_fild12.gat,41,225
+ra_in01,172,392,0 warp rachel01 1,1,rachel,42,114
+rachel,42,87,0 warp rachel02 1,1,ra_in01,171,359
+rachel,42,109,0 warp rachel03 1,1,ra_in01,171,389
+ra_in01,171,355,0 warp rachel04 1,1,rachel,42,82
+rachel,83,78,0 warp rachel05 1,1,ra_in01,249,266
+ra_in01,249,262,0 warp rachel05 1,1,rachel,83,75
+rachel,115,149,0 warp rachel06 1,1,ra_in01,386,43
+ra_in01,386,40,0 warp rachel07 1,1,rachel,115,144
+ra_in01,165,369,0 warp rachel10 1,1,ra_in01,122,334
+ra_in01,126,334,0 warp rachel11 1,1,ra_in01,169,369
+ra_in01,178,370,0 warp rachel12 1,1,ra_in01,113,385
+ra_in01,109,385,0 warp rachel13 1,1,ra_in01,174,370
+ra_in01,357,61,0 warp rachel15 1,1,ra_in01,310,62
+ra_in01,314,62,0 warp rachel16 1,1,ra_in01,361,61
+ra_in01,309,70,0 warp rachel17 1,1,rachel,108,175
+rachel,105,171,0 warp rachel18 1,1,ra_in01,309,65
+ra_in01,297,59,0 warp rachel19 1,1,ra_in01,339,116
+ra_in01,339,120,0 warp rachel20 1,1,ra_in01,297,63
+ra_in01,375,109,0 warp rachel21 1,1,rachel,116,154
+rachel,116,158,0 warp rachel22 1,1,ra_in01,375,114
+ra_in01,135,286,0 warp rachel22 1,1,rachel,216,164
+rachel,216,160,0 warp rachel23 1,1,ra_in01,135,282
+ra_in01,213,79,0 warp rachel24 1,1,rachel,108,195
+rachel,108,200,0 warp rachel25 1,1,ra_in01,213,83
+ra_in01,192,152,0 warp rachel26 1,1,rachel,90,193
+rachel,90,189,0 warp rachel27 1,1,ra_in01,192,148
+rachel,25,125,0 warp rachel28 1,1,ra_fild11,353,226
+rachel,273,125,0 warp rachel29 1,1,ra_fild12,41,225
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//~~~~~~~~~~~~~~~~~~~ Custom warps starts here ~~~~~~~~~~~~~~~~~~~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//Rachel Sanctuary Sky Map
-ra_temsky.gat,99,117,0 warp rasky001 1,1,ra_temsky.gat,99,140
-ra_temsky.gat,99,135,0 warp rasky002 1,1,ra_temsky.gat,99,112
-ra_temsky.gat,112,143,0 warp rasky003 1,1,ra_temsky.gat,141,139
-ra_temsky.gat,137,139,0 warp rasky004 1,1,ra_temsky.gat,108,143
-ra_temsky.gat,87,143,0 warp rasky005 1,1,ra_temsky.gat,58,139
-ra_temsky.gat,62,139,0 warp rasky006 1,1,ra_temsky.gat,91,143
+ra_temsky,99,117,0 warp rasky001 1,1,ra_temsky,99,140
+ra_temsky,99,135,0 warp rasky002 1,1,ra_temsky,99,112
+ra_temsky,112,143,0 warp rasky003 1,1,ra_temsky,141,139
+ra_temsky,137,139,0 warp rasky004 1,1,ra_temsky,108,143
+ra_temsky,87,143,0 warp rasky005 1,1,ra_temsky,58,139
+ra_temsky,62,139,0 warp rasky006 1,1,ra_temsky,91,143
//Rachel Temple
-ra_temple.gat,119,21,0 warp rachel002 1,1,rachel.gat,149,244
-ra_temple.gat,119,181,0 warp rachel003 1,1,ra_temin.gat,169,22
-ra_temin.gat,169,17,0 warp rachel004 1,1,ra_temple.gat,119,176
-ra_temin.gat,206,93,0 warp rachel005 1,1,ra_temin.gat,312,257
-ra_temin.gat,312,252,0 warp rachel006 1,1,ra_temin.gat,206,88
-ra_temin.gat,130,93,0 warp rachel007 1,1,ra_temin.gat,238,257
-ra_temin.gat,238,252,0 warp rachel008 1,1,ra_temin.gat,130,88
+ra_temple,119,21,0 warp rachel002 1,1,rachel,149,244
+ra_temple,119,181,0 warp rachel003 1,1,ra_temin,169,22
+ra_temin,169,17,0 warp rachel004 1,1,ra_temple,119,176
+ra_temin,206,93,0 warp rachel005 1,1,ra_temin,312,257
+ra_temin,312,252,0 warp rachel006 1,1,ra_temin,206,88
+ra_temin,130,93,0 warp rachel007 1,1,ra_temin,238,257
+ra_temin,238,252,0 warp rachel008 1,1,ra_temin,130,88
-ra_temin.gat,276,326,0 script Statue#Rachel 111,{
+ra_temin,276,326,0 script Statue#Rachel 111,{
mes "Welcome to the temporary Rachel";
mes "Sanctuary entrance npc!";
mes "Isn't it great?";
@@ -87,41 +87,41 @@ ra_temin.gat,276,326,0 script Statue#Rachel 111,{
}
//== WEAPON SHOP ==========================
-//rachel.gat,42,108,0 warp ra_in001 2,2,ra_in01.gat,171,389
-//ra_in01.gat,171,393,0 warp ra_in001a 2,2,rachel.gat,41,112
-//rachel.gat,42,88,0 warp ra_in002 2,2,ra_in01.gat,171,358
-//ra_in01.gat,171,354,0 warp ra_in002a 2,2,rachel.gat,42,84
-//ra_in01.gat,179,370,0 warp ra_in003 2,2,ra_in01.gat,112,385
-//ra_in01.gat,108,385,0 warp ra_in003a 2,2,ra_in01.gat,175,370
-//ra_in01.gat,164,370,0 warp ra_in004 2,2,ra_in01.gat,123,334
-//ra_in01.gat,127,334,0 warp ra_in004a 2,2,ra_in01.gat,168,370
+//rachel,42,108,0 warp ra_in001 2,2,ra_in01,171,389
+//ra_in01,171,393,0 warp ra_in001a 2,2,rachel,41,112
+//rachel,42,88,0 warp ra_in002 2,2,ra_in01,171,358
+//ra_in01,171,354,0 warp ra_in002a 2,2,rachel,42,84
+//ra_in01,179,370,0 warp ra_in003 2,2,ra_in01,112,385
+//ra_in01,108,385,0 warp ra_in003a 2,2,ra_in01,175,370
+//ra_in01,164,370,0 warp ra_in004 2,2,ra_in01,123,334
+//ra_in01,127,334,0 warp ra_in004a 2,2,ra_in01,168,370
//== ITEM SHOP ============================
-//rachel.gat,83,179,0 warp ra_in005 2,2,ra_in01.gat,249,264
-//ra_in01.gat,249,260,0 warp ra_in005a 2,2,rachel.gat,83,74
-//ra_in01.gat,240,300,0 warp ra_in006 2,2,ra_in01.gat,191,312
-//ra_in01.gat,195,312,0 warp ra_in006a 2,2,ra_in01.gat,244,300
+//rachel,83,179,0 warp ra_in005 2,2,ra_in01,249,264
+//ra_in01,249,260,0 warp ra_in005a 2,2,rachel,83,74
+//ra_in01,240,300,0 warp ra_in006 2,2,ra_in01,191,312
+//ra_in01,195,312,0 warp ra_in006a 2,2,ra_in01,244,300
//== INN ==================================
-//rachel.gat,115,149,0 warp ra_in007 2,2,ra_in01.gat,386,42
-//ra_in01.gat,386,38,0 warp ra_in007a 2,2,rachel.gat,115,145
-//rachel.gat,116,158,0 warp ra_in008 2,2,ra_in01.gat,375,111
-//ra_in01.gat,375,108,0 warp ra_in008a 2,2,rachel.gat,116,155
-//rachel.gat,105,170,0 warp ra_in009 2,2,ra_in01.gat,310,67
-//ra_in01.gat,310,71,0 warp ra_in009a 2,2,rachel.gat,105,175
-//ra_in01.gat,356,61,0 warp ra_in010 2,2,ra_in01.gat,311,62
-//ra_in01.gat,315,62,0 warp ra_in010a 2,2,ra_in01.gat,360,61
-//ra_in01.gat,297,58,0 warp ra_in011 2,2,ra_in01.gat,340,117
-//ra_in01.gat,338,120,0 warp ra_in011a 2,2,ra_in01.gat,297,62
+//rachel,115,149,0 warp ra_in007 2,2,ra_in01,386,42
+//ra_in01,386,38,0 warp ra_in007a 2,2,rachel,115,145
+//rachel,116,158,0 warp ra_in008 2,2,ra_in01,375,111
+//ra_in01,375,108,0 warp ra_in008a 2,2,rachel,116,155
+//rachel,105,170,0 warp ra_in009 2,2,ra_in01,310,67
+//ra_in01,310,71,0 warp ra_in009a 2,2,rachel,105,175
+//ra_in01,356,61,0 warp ra_in010 2,2,ra_in01,311,62
+//ra_in01,315,62,0 warp ra_in010a 2,2,ra_in01,360,61
+//ra_in01,297,58,0 warp ra_in011 2,2,ra_in01,340,117
+//ra_in01,338,120,0 warp ra_in011a 2,2,ra_in01,297,62
//== HOUSES ===============================
-rachel.gat,57,259,0 warp ra_in012 2,2,ra_in01.gat,295,350
-ra_in01.gat,295,346,0 warp ra_in012a 2,2,rachel.gat,57,254
-ra_in01.gat,293,372,0 warp ra_in013 2,2,ra_in01.gat,225,379
-ra_in01.gat,220,379,0 warp ra_in013a 2,2,ra_in01.gat,289,372
-ra_in01.gat,313,374,0 warp ra_in014 2,2,ra_in01.gat,358,373
-ra_in01.gat,354,373,0 warp ra_in014a 2,2,ra_in01.gat,308,374
+rachel,57,259,0 warp ra_in012 2,2,ra_in01,295,350
+ra_in01,295,346,0 warp ra_in012a 2,2,rachel,57,254
+ra_in01,293,372,0 warp ra_in013 2,2,ra_in01,225,379
+ra_in01,220,379,0 warp ra_in013a 2,2,ra_in01,289,372
+ra_in01,313,374,0 warp ra_in014 2,2,ra_in01,358,373
+ra_in01,354,373,0 warp ra_in014a 2,2,ra_in01,308,374
//Entrance to the Temple
-rachel.gat,149,249,0 warp rachel001 1,1,ra_temple.gat,119,28
+rachel,149,249,0 warp rachel001 1,1,ra_temple,119,28 \ No newline at end of file
diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt
index 99e77b75d..f863eb577 100644
--- a/npc/warps/cities/umbala.txt
+++ b/npc/warps/cities/umbala.txt
@@ -17,29 +17,29 @@
//Witch House
//Entrance via the Skeleton Gate Quest
-//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
+//umbala,220,190,0 warp umba0027 1,1,um_in,32,70
+um_in,28,70,0 warp umba0028 1,1,umbala,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
+umbala,125,157,0 warp umba0029 1,1,um_in,155,114
+um_in,155,110,0 warp umba0030 1,1,umbala,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
+umbala,138,129,0 warp umba0031 1,1,um_in,99,114
+um_in,99,110,0 warp umba0032 1,1,umbala,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
+umbala,95,186,0 warp umba0033 1,1,um_in,142,42
+um_in,141,39,0 warp umba0034 1,1,umbala,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
+umbala,100,202,0 warp umba0035 1,1,um_in,163,70
+um_in,166,70,0 warp umba0036 1,1,umbala,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
+umbala,156,249,0 warp umba0037 1,1,um_in,99,67
+um_in,99,63,0 warp umba0038 1,1,umbala,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
+umbala,108,164,0 warp umba0039 1,1,um_in,38,112
+um_in,38,110,0 warp umba0040 1,1,umbala,104,163 \ No newline at end of file
diff --git a/npc/warps/cities/veins.txt b/npc/warps/cities/veins.txt
index 49f2e7f36..7560b3600 100644
--- a/npc/warps/cities/veins.txt
+++ b/npc/warps/cities/veins.txt
@@ -13,6 +13,6 @@
//============================================================
//= Veins City ================================================
-veins.gat,218,361,0 warp veinswarp0501 1,1,ve_fild06.gat,152,221
-veins.gat,146,24,0 warp veinswarp0502 1,1,ve_fild07.gat,148,370
-rachel.gat,130,20,0 warp veinswarp0503 1,1,ve_fild02.gat,196,379 \ No newline at end of file
+veins,218,361,0 warp veinswarp0501 1,1,ve_fild06,152,221
+veins,146,24,0 warp veinswarp0502 1,1,ve_fild07,148,370
+rachel,130,20,0 warp veinswarp0503 1,1,ve_fild02,196,379 \ No newline at end of file
diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt
index 153acfe67..ee9e7d3e4 100644
--- a/npc/warps/cities/yggdrasil.txt
+++ b/npc/warps/cities/yggdrasil.txt
@@ -13,11 +13,11 @@
//============================================================
//Umbala Entrance
-um_dun02.gat,125,163,0 warp nwarp1 1,1,yggdrasil01.gat,40,63
+um_dun02,125,163,0 warp nwarp1 1,1,yggdrasil01,40,63
//Niflheim Exit
-yggdrasil01.gat,249,262,0 warp nwarp5 1,1,nif_fild01.gat,315,66
+yggdrasil01,249,262,0 warp nwarp5 1,1,nif_fild01,315,66
//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
+yggdrasil01,271,51,0 warp nwarp3 1,1,yggdrasil01,26,196
+yggdrasil01,26,193,0 warp nwarp4 1,1,yggdrasil01,269,53 \ No newline at end of file
diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index 4981d9dd0..972fce47e 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -21,76 +21,76 @@
//============================================================
//= Yuno City ================================================
-yuno.gat,158,15,0 warp yun-yunfild 1,1,yuno_fild04.gat,231,284
-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,341,203,0 warp yun15 1,1,yuno_in04.gat,32,58
-yuno_in04.gat,29,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_in01.gat,88,36,0 warp yun59 1,1,yuno_in01.gat,173,34
-yuno_in01.gat,176,34,0 warp yun60 1,1,yuno_in01.gat,91,36
-yuno_in02.gat,82,14,0 warp yun61 1,1,yuno_in05.gat,192,194
-yuno_in05.gat,196,194,0 warp yun62 1,1,yuno_in02.gat,85,14
-yuno.gat,157,320,0 warp yun63 1,1,yuno_pre.gat,69,13
-yuno_pre.gat,69,10,0 warp yun64 1,1,yuno.gat,157,317
-yuno.gat,245,147,0 warp yun65 1,1,yuno_in01.gat,101,88
-yuno_in01.gat,101,85,0 warp yun66 1,1,yuno.gat,245,144
+yuno,158,15,0 warp yun-yunfild 1,1,yuno_fild04,231,284
+yuno,117,135,0 warp yun01 1,1,yuno_in01,116,37
+yuno_in01,116,40,0 warp yun02 1,1,yuno,120,138
+yuno,48,105,0 warp yun03 1,1,yuno_in01,37,176
+yuno_in01,40,176,0 warp yun04 1,1,yuno,51,105
+yuno_in01,32,182,0 warp yun05 1,1,yuno_in01,86,164
+yuno_in01,82,164,0 warp yun06 1,1,yuno_in01,28,182
+yuno,48,151,0 warp yun07 1,1,yuno_in01,30,100
+yuno_in01,34,100,0 warp yun08 1,1,yuno,51,151
+yuno,93,180,0 warp yun09 1,1,yuno_in04,33,127
+yuno_in04,33,130,0 warp yun10 1,1,yuno,95,184
+yuno,196,138,0 warp yun11 1,1,yuno_in01,32,33
+yuno_in01,32,36,0 warp yun12 1,1,yuno,193,142
+yuno,264,87,0 warp yun13 1,1,yuno_in01,168,101
+yuno_in01,168,104,0 warp yun14 1,1,yuno,264,90
+yuno,341,203,0 warp yun15 1,1,yuno_in04,32,58
+yuno_in04,29,58,0 warp yun16 1,1,yuno,338,203
+yuno_in04,52,58,0 warp yun17 1,1,yuno_in04,97,58
+yuno_in04,95,58,0 warp yun18 1,1,yuno_in04,50,58
+yuno_in04,103,64,0 warp yun19 1,1,yuno_in04,103,95
+yuno_in04,103,93,0 warp yun20 1,1,yuno_in04,103,62
+yuno_in04,115,64,0 warp yun21 1,1,yuno_in04,115,95
+yuno_in04,115,93,0 warp yun22 1,1,yuno_in04,115,62
+yuno_in04,115,51,0 warp yun23 1,1,yuno_in04,115,20
+yuno_in04,115,22,0 warp yun24 1,1,yuno_in04,115,53
+yuno_in04,103,51,0 warp yun25 1,1,yuno_in04,103,20
+yuno_in04,103,22,0 warp yun26 1,1,yuno_in04,103,53
+yuno_in04,122,57,0 warp yun27 1,1,yuno_in04,164,110
+yuno_in04,161,110,0 warp yun28 1,1,yuno_in04,120,57
+yuno,323,284,0 warp yun29 1,1,yuno_in03,167,22
+yuno_in03,167,19,0 warp yun30 1,1,yuno,323,280
+yuno_in03,167,72,0 warp yun31 1,1,yuno_in03,179,113
+yuno_in03,179,109,0 warp yun32 1,1,yuno_in03,167,69
+yuno_in03,186,119,0 warp yun33 1,1,yuno_in03,163,174
+yuno_in03,159,174,0 warp yun34 1,1,yuno_in03,183,119
+yuno_in03,186,131,0 warp yun35 1,1,yuno_in03,163,187
+yuno_in03,159,187,0 warp yun36 1,1,yuno_in03,183,131
+yuno_in03,172,118,0 warp yun37 1,1,yuno_in03,120,178
+yuno_in03,124,178,0 warp yun38 1,1,yuno_in03,176,118
+yuno_in03,111,192,0 warp yun39 1,1,yuno_in03,162,132
+yuno_in03,162,129,0 warp yun40 1,1,yuno_in03,111,189
+yuno_in03,153,134,0 warp yun41 1,1,yuno_in03,62,186
+yuno_in03,66,186,0 warp yun42 1,1,yuno_in03,155,134
+yuno,278,293,0 warp yun43 1,1,yuno_in03,25,15
+yuno_in03,25,11,0 warp yun44 1,1,yuno,278,290
+yuno_in03,32,89,0 warp yun45 1,1,yuno_in03,25,53
+yuno_in03,25,56,0 warp yun46 1,1,yuno_in03,32,92
+yuno,284,366,0 warp yun47 1,1,yuno_in03,224,23
+yuno_in03,224,19,0 warp yun48 1,1,yuno,284,363
+yuno_in03,219,50,0 warp yun49 1,1,yuno_in03,104,118
+yuno_in03,104,115,0 warp yun50 1,1,yuno_in03,219,47
+yuno_in03,244,52,0 warp yun51 1,1,yuno_in03,235,94
+yuno_in03,235,91,0 warp yun52 1,1,yuno_in03,244,49
+yuno_in03,231,61,0 warp yun53 1,1,yuno_in03,239,144
+yuno_in03,239,141,0 warp yun54 1,1,yuno_in03,231,57
+yuno_in03,223,167,0 warp yun55 1,1,yuno_in03,96,54
+yuno_in03,96,58,0 warp yun56 1,1,yuno_in03,223,170
+yuno,87,321,0 warp yun57 1,1,yuno_in02,168,61
+yuno_in02,172,61,0 warp yun58 1,1,yuno,90,321
+yuno_in01,88,36,0 warp yun59 1,1,yuno_in01,173,34
+yuno_in01,176,34,0 warp yun60 1,1,yuno_in01,91,36
+yuno_in02,82,14,0 warp yun61 1,1,yuno_in05,192,194
+yuno_in05,196,194,0 warp yun62 1,1,yuno_in02,85,14
+yuno,157,320,0 warp yun63 1,1,yuno_pre,69,13
+yuno_pre,69,10,0 warp yun64 1,1,yuno,157,317
+yuno,245,147,0 warp yun65 1,1,yuno_in01,101,88
+yuno_in01,101,85,0 warp yun66 1,1,yuno,245,144
// Yuno In05 (Entering Random Warps) -------------------------------------------
-yuno_in05.gat,153,141,0 script #yun63 45,1,1,{
+yuno_in05,153,141,0 script #yun63 45,1,1,{
if(rand(2)){
warp "yuno_in05",192,102;
} else {
@@ -99,7 +99,7 @@ yuno_in05.gat,153,141,0 script #yun63 45,1,1,{
end;
}
// Yuno In05 (Random Warps - Cross Shaped) -------------------------------------
-yuno_in05.gat,196,102,0 script #yun64 45,1,1,{
+yuno_in05,196,102,0 script #yun64 45,1,1,{
set @warp0,rand(3);
if(@warp0==1) goto w2;
if(@warp0==2) goto w3;
@@ -107,7 +107,7 @@ yuno_in05.gat,196,102,0 script #yun64 45,1,1,{
w2: warp "yuno_in05",128,82; end;
w3: warp "yuno_in05",156,141; end;
}
-yuno_in05.gat,181,116,0 script #yun65 45,1,1,{
+yuno_in05,181,116,0 script #yun65 45,1,1,{
set @warp0,rand(3);
if(@warp0==1) goto w2;
if(@warp0==2) goto w3;
@@ -115,7 +115,7 @@ yuno_in05.gat,181,116,0 script #yun65 45,1,1,{
w2: warp "yuno_in05",176,13; end;
w3: warp "yuno_in05",136,75; end;
}
-yuno_in05.gat,165,102,0 script #yun66 45,1,1,{
+yuno_in05,165,102,0 script #yun66 45,1,1,{
if(rand(2)){
warp "yuno_in05",192,102;
} else {
@@ -123,7 +123,7 @@ yuno_in05.gat,165,102,0 script #yun66 45,1,1,{
}
end;
}
-yuno_in05.gat,181,91,0 script #yun67 45,1,1,{
+yuno_in05,181,91,0 script #yun67 45,1,1,{
if(rand(2)){
warp "yuno_in05",181,112;
} else {
@@ -132,7 +132,7 @@ yuno_in05.gat,181,91,0 script #yun67 45,1,1,{
end;
}
// Yuno In05 (Random Warps - T-Shaped) -----------------------------------------
-yuno_in05.gat,148,82,0 script #yun68 45,1,1,{
+yuno_in05,148,82,0 script #yun68 45,1,1,{
set @warp0,rand(3);
if(@warp0==1) goto w2;
if(@warp0==2) goto w3;
@@ -140,7 +140,7 @@ yuno_in05.gat,148,82,0 script #yun68 45,1,1,{
w2: warp "yuno_in05",128,82; end;
w3: warp "yuno_in05",156,141; end;
}
-yuno_in05.gat,125,82,0 script #yun69 45,1,1,{
+yuno_in05,125,82,0 script #yun69 45,1,1,{
if(rand(2)){
warp "yuno_in05",192,102;
} else {
@@ -148,7 +148,7 @@ yuno_in05.gat,125,82,0 script #yun69 45,1,1,{
}
end;
}
-yuno_in05.gat,136,71,0 script #yun70 45,1,1,{
+yuno_in05,136,71,0 script #yun70 45,1,1,{
set @warp0,rand(3);
if(@warp0==1) goto w2;
if(@warp0==2) goto w3;
@@ -157,7 +157,7 @@ w2: warp "yuno_in05",16,185; end;
w3: warp "yuno_in05",176,48; end;
}
// Yuno In05 (Random Warps - Other) --------------------------------------------
-yuno_in05.gat,16,188,0 script #yun71 45,1,1,{
+yuno_in05,16,188,0 script #yun71 45,1,1,{
set @warp0,rand(3);
if(@warp0==1) goto w2;
if(@warp0==2) goto w3;
@@ -165,7 +165,7 @@ yuno_in05.gat,16,188,0 script #yun71 45,1,1,{
w2: warp "yuno_in05",176,13; end;
w3: warp "yuno_in05",136,75; end;
}
-yuno_in05.gat,176,9,0 script #yun72 45,1,1,{
+yuno_in05,176,9,0 script #yun72 45,1,1,{
if(rand(2)){
warp "yuno_in05",181,112;
} else {
@@ -173,7 +173,7 @@ yuno_in05.gat,176,9,0 script #yun72 45,1,1,{
}
end;
}
-yuno_in05.gat,176,52,0 script #yun73 45,1,1,{
+yuno_in05,176,52,0 script #yun73 45,1,1,{
set @warp0,rand(3);
if(@warp0==1) goto w2;
if(@warp0==2) goto w3;
@@ -182,7 +182,7 @@ w2: warp "yuno_in05",176,13; end;
w3: warp "yuno_in05",136,75; end;
}
// Yuno In05 (Destination - Room) ----------------------------------------------
-yuno_in05.gat,40,178,0 script #yun74 45,1,1,{
+yuno_in05,40,178,0 script #yun74 45,1,1,{
set @warp0,rand(3);
if(@warp0==1) goto w2;
if(@warp0==2) goto w3;
@@ -190,7 +190,7 @@ yuno_in05.gat,40,178,0 script #yun74 45,1,1,{
w2: warp "yuno_in05",176,13; end;
w3: warp "yuno_in05",136,75; end;
}
-yuno_in05.gat,47,186,0 script #yun75 45,1,1,{
+yuno_in05,47,186,0 script #yun75 45,1,1,{
set @warp0,rand(3);
if(@warp0==1) goto w2;
if(@warp0==2) goto w3;
@@ -199,21 +199,21 @@ w2: warp "yuno_in05",176,13; end;
w3: warp "yuno_in05",136,75; end;
}
// Yuno In05 (Destination - Escaped Random Warps) ------------------------------
-yuno_in05.gat,31,167,0 warp yun76 1,1,yuno_in05.gat,50,85
-yuno_in05.gat,50,88,0 warp yun77 1,1,yuno_in02.gat,85,14
+yuno_in05,31,167,0 warp yun76 1,1,yuno_in05,50,85
+yuno_in05,50,88,0 warp yun77 1,1,yuno_in02,85,14
// Yuno Government Buildings ---------------------------------------------------
-yuno_pre.gat,52,22,0 warp yungvn01 1,1,yuno_pre.gat,37,23
-yuno_pre.gat,87,22,0 warp yungvn02 1,1,yuno_pre.gat,102,22
-yuno_pre.gat,41,23,0 warp yungvn03 1,1,yuno_pre.gat,56,22
-yuno_pre.gat,18,35,0 warp yungvn04 1,1,yuno_pre.gat,18,53
-yuno_pre.gat,98,22,0 warp yungvn05 1,1,yuno_pre.gat,83,22
-yuno_pre.gat,112,35,0 warp yungvn06 1,1,yuno_pre.gat,112,52
-yuno_pre.gat,18,48,0 warp yungvn07 1,1,yuno_pre.gat,18,31
-yuno_pre.gat,18,77,0 warp yungvn08 1,1,yuno_pre.gat,18,96
-yuno_pre.gat,37,69,0 warp yungvn09 1,1,yuno_pre.gat,64,69
-yuno_pre.gat,112,48,0 warp yungvn10 1,1,yuno_pre.gat,112,31
-yuno_pre.gat,94,69,0 warp yungvn11 1,1,yuno_pre.gat,77,69
-yuno_pre.gat,60,69,0 warp yungvn12 1,1,yuno_pre.gat,33,69
-yuno_pre.gat,81,69,0 warp yungvn13 1,1,yuno_pre.gat,98,69
-yuno_pre.gat,18,92,0 warp yungvn14 1,1,yuno_pre.gat,18,73 \ No newline at end of file
+yuno_pre,52,22,0 warp yungvn01 1,1,yuno_pre,37,23
+yuno_pre,87,22,0 warp yungvn02 1,1,yuno_pre,102,22
+yuno_pre,41,23,0 warp yungvn03 1,1,yuno_pre,56,22
+yuno_pre,18,35,0 warp yungvn04 1,1,yuno_pre,18,53
+yuno_pre,98,22,0 warp yungvn05 1,1,yuno_pre,83,22
+yuno_pre,112,35,0 warp yungvn06 1,1,yuno_pre,112,52
+yuno_pre,18,48,0 warp yungvn07 1,1,yuno_pre,18,31
+yuno_pre,18,77,0 warp yungvn08 1,1,yuno_pre,18,96
+yuno_pre,37,69,0 warp yungvn09 1,1,yuno_pre,64,69
+yuno_pre,112,48,0 warp yungvn10 1,1,yuno_pre,112,31
+yuno_pre,94,69,0 warp yungvn11 1,1,yuno_pre,77,69
+yuno_pre,60,69,0 warp yungvn12 1,1,yuno_pre,33,69
+yuno_pre,81,69,0 warp yungvn13 1,1,yuno_pre,98,69
+yuno_pre,18,92,0 warp yungvn14 1,1,yuno_pre,18,73 \ No newline at end of file